fix(core): revert form service and mcp elicitation (#35080)

packages/tui/src/context/data.tsx

@@ -8,6 +8,7 @@ import type {
   PermissionSavedInfo,
   PermissionV2Request,
   ProviderV2Info,
+  QuestionV2Request,
   ReferenceInfo,
   SessionMessage,
   SessionMessageAssistant,
@@ -18,16 +19,12 @@ import type {
   Shell,
   SkillV2Info,
   V2Event,
-  FormFormInfo,
-  FormUrlInfo,
 } from "@opencode-ai/sdk/v2"
 import { createStore, produce } from "solid-js/store"
 import { createSimpleContext } from "./helper"
 import { useSDK } from "./sdk"
 import { createSignal, onCleanup } from "solid-js"
 
-type FormInfo = FormFormInfo | FormUrlInfo
-
 export type DataSessionStatus = "idle" | "running"
 
 type LocationData = {
@@ -38,7 +35,6 @@ type LocationData = {
   model?: ModelV2Info[]
   provider?: ProviderV2Info[]
   reference?: ReferenceInfo[]
-  form?: FormInfo[]
   // Currently running shell commands for this location, keyed by shell id. Entries are removed
   // once the command exits or is deleted, so this only ever holds in-flight shells.
   shell?: Record<string, Shell>
@@ -55,7 +51,7 @@ type Data = {
     status: Record<string, DataSessionStatus>
     message: Record<string, SessionMessage[]>
     permission: Record<string, PermissionV2Request[]>
-    form: Record<string, FormInfo[]>
+    question: Record<string, QuestionV2Request[]>
   }
   project: {
     permission: Record<string, PermissionSavedInfo[]>
@@ -89,7 +85,7 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
         status: {},
         message: {},
         permission: {},
-        form: {},
+        question: {},
       },
       project: {
         permission: {},
@@ -185,21 +181,17 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
       const info = store.session.info[sessionID]
       if (!info) return
       const rootID = resolveRoot(sessionID)
-      setStore(
-        "session",
-        "family",
-        produce((draft) => {
-          if (sessionID !== rootID && draft[sessionID]) {
-            const members = (draft[rootID] ??= [])
-            for (const id of draft[sessionID]) {
-              if (!members.includes(id)) members.push(id)
-            }
-            delete draft[sessionID]
+      setStore("session", "family", produce((draft) => {
+        if (sessionID !== rootID && draft[sessionID]) {
+          const members = draft[rootID] ??= []
+          for (const id of draft[sessionID]) {
+            if (!members.includes(id)) members.push(id)
           }
-          const family = (draft[rootID] ??= [])
-          if (!family.includes(sessionID)) family.push(sessionID)
-        }),
-      )
+          delete draft[sessionID]
+        }
+        const family = draft[rootID] ??= []
+        if (!family.includes(sessionID)) family.push(sessionID)
+      }))
     }
 
     function handleEvent(event: V2Event) {
@@ -575,40 +567,22 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             ),
           )
           break
-        case "form.created":
-          if (event.data.form.sessionID === "global") {
-            const key = locationKey(event.location ?? defaultLocation())
-            if (store.location[key]?.form?.some((request) => request.id === event.data.form.id)) break
-            setStore("location", key, (data) => ({ ...data, form: [...(data?.form ?? []), event.data.form] }))
-            break
-          }
-          if (store.session.form[event.data.form.sessionID]?.some((request) => request.id === event.data.form.id)) break
-          setStore("session", "form", event.data.form.sessionID, [
-            ...(store.session.form[event.data.form.sessionID] ?? []),
-            event.data.form,
+        case "question.v2.asked":
+          if (store.session.question[event.data.sessionID]?.some((request) => request.id === event.data.id)) break
+          setStore("session", "question", event.data.sessionID, [
+            ...(store.session.question[event.data.sessionID] ?? []),
+            event.data,
           ])
           break
-        case "form.replied":
-        case "form.cancelled":
+        case "question.v2.replied":
+        case "question.v2.rejected":
           setStore(
             "session",
-            "form",
+            "question",
             event.data.sessionID,
-            (store.session.form[event.data.sessionID] ?? []).filter((request) => request.id !== event.data.id),
-          )
-          if (event.location) {
-            setStore("location", locationKey(event.location), (data) => ({
-              ...data,
-              form: (data?.form ?? []).filter((request) => request.id !== event.data.id),
-            }))
-            break
-          }
-          setStore(
-            "location",
-            produce((draft) => {
-              for (const data of Object.values(draft))
-                data.form = data.form?.filter((request) => request.id !== event.data.id)
-            }),
+            (store.session.question[event.data.sessionID] ?? []).filter(
+              (request) => request.id !== event.data.requestID,
+            ),
           )
           break
         case "shell.created":
@@ -716,7 +690,8 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
                 return liveByID.get(message.id) ?? message
               }),
               ...live.filter((message) => !loadedIDs.has(message.id)),
-            ].toSorted((a, b) => a.time.created - b.time.created)
+            ]
+              .toSorted((a, b) => a.time.created - b.time.created)
             messageIndex.set(sessionID, new Map(messages.map((message, index) => [message.id, index])))
             setStore("session", "message", sessionID, messages)
           },
@@ -729,20 +704,12 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             setStore("session", "permission", sessionID, mutable(await sdk.api.permission.list({ sessionID })))
           },
         },
-        form: {
-          list(sessionID: string) {
-            return store.session.form[sessionID]
-          },
-          async refresh(sessionID: string) {
-            setStore("session", "form", sessionID, mutable((await sdk.api.form.list({ sessionID })).data))
-          },
-        },
         question: {
           list(sessionID: string) {
-            return store.session.form[sessionID]
+            return store.session.question[sessionID]
           },
           async refresh(sessionID: string) {
-            setStore("session", "form", sessionID, mutable((await sdk.api.form.list({ sessionID })).data))
+            setStore("session", "question", sessionID, mutable(await sdk.api.question.list({ sessionID })))
           },
         },
       },
@@ -833,22 +800,6 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
             setStore("location", key, { ...store.location[key], mcp: result.data.data })
           },
         },
-        form: {
-          list(location?: LocationRef) {
-            return store.location[locationKey(location ?? defaultLocation())]?.form
-          },
-          async refresh(ref?: LocationRef) {
-            const result = await sdk.client.v2.form.request.list(
-              { location: locationQuery(ref) },
-              { throwOnError: true },
-            )
-            const key = locationKey(result.data.location)
-            setStore("location", key, {
-              ...store.location[key],
-              form: result.data.data.filter((form) => form.sessionID === "global"),
-            })
-          },
-        },
         model: {
           list(location?: LocationRef) {
             return store.location[locationKey(location ?? defaultLocation())]?.model
@@ -925,7 +876,6 @@ export const { use: useData, provider: DataProvider } = createSimpleContext({
         result.location.agent.refresh(),
         result.location.integration.refresh(),
         result.location.mcp.refresh(),
-        result.location.form.refresh(),
         result.location.model.refresh(),
         result.location.provider.refresh(),
         result.location.reference.refresh(),