refactor(question): collapse Question.ask state machine into tool-call lifecycle

.gitattributes

@@ -3,30 +3,3 @@
 # `core.autocrlf` flips line endings on checkout and breaks the snapshot
 # fixture in `packages/opencode/test/server/models-snapshot-fixture.ts`.
 packages/opencode/src/provider/models-snapshot.js text eol=lf
-
-# PawWork UI carve-out (issue #440 slice #01).
-# These paths are permanently forked from upstream opencode and must never
-# be overwritten by an upstream sync.  When both sides modify a file on these
-# paths, git invokes the named driver instead of the default three-way merge.
-#
-# The driver is registered with:
-#   git config merge.pawwork-keep-ours.driver "true"
-# which exits 0 and leaves the worktree file (= HEAD = our version) intact.
-# NOTE: the driver only fires when both sides change a file; a one-sided
-# upstream change will still clean-merge.  Always review the upstream-sync
-# PR diff to confirm no carve-out paths were silently updated.
-# Run `packages/ui/script/verify-merge-driver.sh` on a fresh clone to confirm
-# the driver is active before performing an upstream sync.
-packages/ui/**                                      merge=pawwork-keep-ours
-packages/app/src/app.tsx                            merge=pawwork-keep-ours
-packages/app/src/components/**                      merge=pawwork-keep-ours
-packages/app/src/context/**                         merge=pawwork-keep-ours
-packages/app/src/index.css                          merge=pawwork-keep-ours
-packages/app/src/pages/**                           merge=pawwork-keep-ours
-packages/app/src/styles/**                          merge=pawwork-keep-ours
-packages/app/src/theme/**                           merge=pawwork-keep-ours
-packages/app/src/i18n/**                            merge=pawwork-keep-ours
-packages/app/src/utils/**                           merge=pawwork-keep-ours
-packages/app/index.html                             merge=pawwork-keep-ours
-packages/desktop-electron/src/renderer/index.html  merge=pawwork-keep-ours
-packages/desktop-electron/src/renderer/loading.html merge=pawwork-keep-ours

packages/app/e2e/actions.ts

@@ -749,32 +749,44 @@ export async function seedSessionQuestion(
     "After calling the tool, wait for the user response.",
   ].join("\n")
 
+  // Poll session messages for a running `question` tool part with
+  // externalResultReady=true; the new tool flow drives the dock via
+  // session messages, not a separate Question.ask state machine.
   const result = await seed({
     sdk,
     sessionID: input.sessionID,
     prompt: text,
     timeout: 30_000,
     probe: async () => {
-      const list = await sdk.question.list().then((x) => x.data ?? [])
-      return list.find((item) => item.sessionID === input.sessionID && item.questions[0]?.header === first.header)
+      const messages = await sdk.session.messages({ sessionID: input.sessionID, limit: 50 }).then((x) => x.data ?? [])
+      for (const message of messages) {
+        for (const part of message.parts) {
+          if (part.type !== "tool") continue
+          if (part.tool !== "question") continue
+          if (!("state" in part) || !part.state || typeof part.state !== "object") continue
+          const state = part.state as { status?: string; input?: { questions?: Array<{ header?: string }> }; metadata?: { externalResultReady?: boolean } }
+          if (state.status !== "running") continue
+          if (state.metadata?.externalResultReady !== true) continue
+          const header = state.input?.questions?.[0]?.header
+          if (header !== first.header) continue
+          return { id: `${part.messageID}:${part.callID}`, messageID: part.messageID, callID: part.callID }
+        }
+      }
+      return undefined
     },
   })
 
   if (!result) {
-    const [questions, status] = await Promise.all([
-      sdk.question.list().then((x) => x.data ?? []).catch((error) => ({ error: String(error) })),
-      sdk.session.status().then((x) => x.data ?? {}).catch((error) => ({ error: String(error) })),
-    ])
+    const status = await sdk.session.status().then((x) => x.data ?? {}).catch((error) => ({ error: String(error) }))
     throw new Error(
       `Timed out seeding question request: ${JSON.stringify({
         sessionID: input.sessionID,
         wantedHeader: first.header,
-        questions,
         status,
       })}`,
     )
   }
-  return { id: result.id }
+  return result
 }
 
 export async function seedSessionTask(
@@ -836,19 +848,16 @@ export async function seedSessionTask(
 }
 
 export async function clearSessionDockSeed(sdk: ReturnType<typeof createSdk>, sessionID: string) {
-  const [questions, permissions] = await Promise.all([
-    sdk.question.list().then((x) => x.data ?? []),
-    sdk.permission.list().then((x) => x.data ?? []),
-  ])
-
-  await Promise.all([
-    ...questions
-      .filter((item) => item.sessionID === sessionID)
-      .map((item) => sdk.question.reject({ requestID: item.id }).catch(() => undefined)),
-    ...permissions
+  const permissions = await sdk.permission.list().then((x) => x.data ?? [])
+  await Promise.all(
+    permissions
       .filter((item) => item.sessionID === sessionID)
       .map((item) => sdk.permission.reply({ requestID: item.id, reply: "reject" }).catch(() => undefined)),
-  ])
+  )
+
+  // The question tool resolves naturally when its session is aborted (the
+  // ExternalResult Deferred is rejected). Cleanup runs from withDockSession
+  // which removes the session — no extra dismiss call needed.
 
   return true
 }