From bfa959847f2ef3aa782390c7784fc0529902c8a7 Mon Sep 17 00:00:00 2001
From: Aiden Cline <aidenpcline@gmail.com>
Date: Fri, 3 Jul 2026 17:37:04 -0500
Subject: [PATCH] fix(plugin): preserve question state compatibility

---
 packages/core/src/plugin/internal.ts | 4 ----
 packages/plugin/src/tui.ts           | 2 ++
 packages/tui/src/plugin/adapters.tsx | 3 +++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/core/src/plugin/internal.ts b/packages/core/src/plugin/internal.ts
index 2afa17bee12..d00f883a6cf 100644
--- a/packages/core/src/plugin/internal.ts
+++ b/packages/core/src/plugin/internal.ts
@@ -29,7 +29,6 @@ import { Npm } from "../npm"
 import { PluginV2 } from "../plugin"
 import { PluginRuntime } from "../plugin/runtime"
 import { PermissionV2 } from "../permission"
-import { QuestionV2 } from "../question"
 import { Reference } from "../reference"
 import { Ripgrep } from "../ripgrep"
 import { SessionInstructions } from "../session/instructions"
@@ -82,7 +81,6 @@ export type Requirements =
   | Npm.Service
   | PermissionV2.Service
   | PluginRuntime.Service
-  | QuestionV2.Service
   | ReadToolFileSystem.Service
   | Reference.Service
   | Ripgrep.Service
@@ -125,7 +123,6 @@ const layer = Layer.effectDiscard(
       Context.make(FileMutation.Service, yield* FileMutation.Service),
       Context.make(Image.Service, yield* Image.Service),
       Context.make(PermissionV2.Service, yield* PermissionV2.Service),
-      Context.make(QuestionV2.Service, yield* QuestionV2.Service),
       Context.make(ReadToolFileSystem.Service, yield* ReadToolFileSystem.Service),
       Context.make(SessionInstructions.Service, yield* SessionInstructions.Service),
       Context.make(SessionTodo.Service, yield* SessionTodo.Service),
@@ -199,7 +196,6 @@ export const node = makeLocationNode({
     Global.node,
     httpClient,
     PermissionV2.node,
-    QuestionV2.node,
     ReadToolFileSystem.node,
     SessionInstructions.node,
     SessionTodo.node,
diff --git a/packages/plugin/src/tui.ts b/packages/plugin/src/tui.ts
index 9141abb74cd..f218f8ec3f0 100644
--- a/packages/plugin/src/tui.ts
+++ b/packages/plugin/src/tui.ts
@@ -10,6 +10,7 @@ import type {
   Part,
   Provider,
   PermissionRequest,
+  QuestionRequest,
   Session,
   SessionStatus,
   TextPart,
@@ -390,6 +391,7 @@ export type TuiState = {
     messages: (sessionID: string) => ReadonlyArray<Message>
     status: (sessionID: string) => SessionStatus | undefined
     permission: (sessionID: string) => ReadonlyArray<PermissionRequest>
+    question: (sessionID: string) => ReadonlyArray<QuestionRequest>
   }
   part: (messageID: string) => ReadonlyArray<Part>
   lsp: () => ReadonlyArray<TuiSidebarLspItem>
diff --git a/packages/tui/src/plugin/adapters.tsx b/packages/tui/src/plugin/adapters.tsx
index b7aeab72e34..6f429049580 100644
--- a/packages/tui/src/plugin/adapters.tsx
+++ b/packages/tui/src/plugin/adapters.tsx
@@ -196,6 +196,9 @@ function stateApi(sync: ReturnType<typeof useSync>, data: ReturnType<typeof useD
           tool: request.source?.type === "tool" ? { messageID: request.source.messageID, callID: request.source.callID } : undefined,
         }))
       },
+      question(sessionID) {
+        return sync.data.question[sessionID] ?? []
+      },
     },
     part(messageID) {
       return sync.data.part[messageID] ?? []