sync: merge upstream v1.1.19 into integration

Upstream changes:
- feat: add plan mode with enter/exit tools (anomalyco#8281)
- feat: Add GitLab Duo Agentic Chat Provider Support (anomalyco#7333)
- feat(desktop): Ask Question Tool Support (anomalyco#8232)
- feat: add Undertale and Deltarune built-in themes (anomalyco#8240)
- fix: Add Plugin Mocks to Provider Tests (anomalyco#8276)
- fix: update User-Agent string to latest Chrome version in webfetch (anomalyco#8284)
- fix(prompt-input): handle Shift+Enter before IME check
- fix(state): delete key from recordsByKey on instance disposal
- fix(mcp): close existing client before reassignment to prevent leaks

Resolved conflicts:
- bun.lock: regenerated with fork dependencies
- global-sync.tsx: adopted upstream variable naming (question instead of request)
- session/index.tsx: merged upstream workdir display with fork's ANSI terminal emulation
- amazon-bedrock.test.ts: added all mock modules (fork + upstream)
- vscode/package.json: kept fork branding, updated version

Fork commits included:
- refactor(tui): use SDK client for tool list dialog
- chore: update lockfile with fork dependencies

Author: shuv1337

bun.lock

@@ -1,6 +1,6 @@
 {
   "nodeModules": {
-    "x86_64-linux": "sha256-UCPTTk4b7d2bets7KgCeYBHWAUwUAPUyKm+xDYkSexE=",
-    "aarch64-darwin": "sha256-Y3o6lovahSWoG9un/l1qxu7hCmIlZXm2LxOLKNiPQfQ="
+    "x86_64-linux": "sha256-x6A/XT1i3bjakfAj0A1wV4n2s9rpflMDceTeppdP6tE=",
+    "aarch64-darwin": "sha256-RkamQYbpjJqpHHf76em9lPgeI9k4/kaCf7T+4xHaizY="
   }
 }

nix/hashes.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/app",
-  "version": "1.1.18",
+  "version": "1.1.19",
   "description": "",
   "type": "module",
   "exports": {

packages/app/package.json

@@ -7,8 +7,6 @@ import { Button } from "@opencode-ai/ui/button"
 import { Tag } from "@opencode-ai/ui/tag"
 import { Dialog } from "@opencode-ai/ui/dialog"
 import { List } from "@opencode-ai/ui/list"
-import { ProviderIcon } from "@opencode-ai/ui/provider-icon"
-import type { IconName } from "@opencode-ai/ui/icons/provider"
 import { DialogSelectProvider } from "./dialog-select-provider"
 import { DialogManageModels } from "./dialog-manage-models"
 
@@ -37,12 +35,6 @@ const ModelList: Component<{
       filterKeys={["provider.name", "name", "id"]}
       sortBy={(a, b) => a.name.localeCompare(b.name)}
       groupBy={(x) => x.provider.name}
-      groupHeader={(group) => (
-        <div class="flex items-center gap-x-3">
-          <ProviderIcon data-slot="list-item-extra-icon" id={group.items[0].provider.id as IconName} />
-          <span>{group.category}</span>
-        </div>
-      )}
       sortGroupsBy={(a, b) => {
         if (a.category === "Recent" && b.category !== "Recent") return -1
         if (b.category === "Recent" && a.category !== "Recent") return 1
@@ -60,8 +52,7 @@ const ModelList: Component<{
       }}
     >
       {(i) => (
-        <div class="w-full flex items-center gap-x-3 pl-1 text-13-regular">
-          <ProviderIcon data-slot="list-item-extra-icon" id={i.provider.id as IconName} />
+        <div class="w-full flex items-center gap-x-2 text-13-regular">
           <span class="truncate">{i.name}</span>
           <Show when={i.provider.id === "opencode" && (!i.cost || i.cost?.input === 0)}>
             <Tag>Free</Tag>

packages/app/src/components/dialog-select-model.tsx

@@ -364,6 +364,12 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
     if (!isFocused()) setStore("popover", null)
   })
 
+  // Safety: reset composing state on focus change to prevent stuck state
+  // This handles edge cases where compositionend event may not fire
+  createEffect(() => {
+    if (!isFocused()) setComposing(false)
+  })
+
   type AtOption = { type: "agent"; name: string; display: string } | { type: "file"; path: string; display: string }
 
   const agentList = createMemo(() =>
@@ -892,6 +898,14 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
       }
     }
 
+    // Handle Shift+Enter BEFORE IME check - Shift+Enter is never used for IME input
+    // and should always insert a newline regardless of composition state
+    if (event.key === "Enter" && event.shiftKey) {
+      addPart({ type: "text", content: "\n", start: 0, end: 0 })
+      event.preventDefault()
+      return
+    }
+
     if (event.key === "Enter" && isImeComposing(event)) {
       return
     }
@@ -955,11 +969,7 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
       return
     }
 
-    if (event.key === "Enter" && event.shiftKey) {
-      addPart({ type: "text", content: "\n", start: 0, end: 0 })
-      event.preventDefault()
-      return
-    }
+    // Note: Shift+Enter is handled earlier, before IME check
     if (event.key === "Enter" && !event.shiftKey) {
       handleSubmit(event)
     }

packages/app/src/components/prompt-input.tsx

@@ -230,28 +230,28 @@ function createGlobalSync() {
           }),
           sdk.question.list().then((x) => {
             const grouped: Record<string, QuestionRequest[]> = {}
-            for (const request of x.data ?? []) {
-              if (!request?.id || !request.sessionID) continue
-              const existing = grouped[request.sessionID]
+            for (const question of x.data ?? []) {
+              if (!question?.id || !question.sessionID) continue
+              const existing = grouped[question.sessionID]
               if (existing) {
-                existing.push(request)
+                existing.push(question)
                 continue
               }
-              grouped[request.sessionID] = [request]
+              grouped[question.sessionID] = [question]
             }
 
             batch(() => {
               for (const sessionID of Object.keys(store.question)) {
                 if (grouped[sessionID]) continue
                 setStore("question", sessionID, [])
               }
-              for (const [sessionID, requests] of Object.entries(grouped)) {
+              for (const [sessionID, questions] of Object.entries(grouped)) {
                 setStore(
                   "question",
                   sessionID,
                   reconcile(
-                    requests
-                      .filter((request) => !!request?.id)
+                    questions
+                      .filter((q) => !!q?.id)
                       .slice()
                       .sort((a, b) => a.id.localeCompare(b.id)),
                     { key: "id" },
@@ -448,38 +448,40 @@ function createGlobalSync() {
         )
         break
       }
-      case "question.replied":
-      case "question.rejected": {
-        const requests = store.question[event.properties.sessionID]
-        if (!requests) break
-        const result = Binary.search(requests, event.properties.requestID, (r) => r.id)
-        if (!result.found) break
+      case "question.asked": {
+        const sessionID = event.properties.sessionID
+        const questions = store.question[sessionID]
+        if (!questions) {
+          setStore("question", sessionID, [event.properties])
+          break
+        }
+
+        const result = Binary.search(questions, event.properties.id, (q) => q.id)
+        if (result.found) {
+          setStore("question", sessionID, result.index, reconcile(event.properties))
+          break
+        }
+
         setStore(
           "question",
-          event.properties.sessionID,
+          sessionID,
           produce((draft) => {
-            draft.splice(result.index, 1)
+            draft.splice(result.index, 0, event.properties)
           }),
         )
         break
       }
-      case "question.asked": {
-        const request = event.properties
-        const requests = store.question[request.sessionID]
-        if (!requests) {
-          setStore("question", request.sessionID, [request])
-          break
-        }
-        const result = Binary.search(requests, request.id, (r) => r.id)
-        if (result.found) {
-          setStore("question", request.sessionID, result.index, reconcile(request))
-          break
-        }
+      case "question.replied":
+      case "question.rejected": {
+        const questions = store.question[event.properties.sessionID]
+        if (!questions) break
+        const result = Binary.search(questions, event.properties.requestID, (q) => q.id)
+        if (!result.found) break
         setStore(
           "question",
-          request.sessionID,
+          event.properties.sessionID,
           produce((draft) => {
-            draft.splice(result.index, 0, request)
+            draft.splice(result.index, 1)
           }),
         )
         break

packages/app/src/context/global-sync.tsx

@@ -7,6 +7,7 @@ import { LocalProvider } from "@/context/local"
 import { base64Decode } from "@opencode-ai/util/encode"
 import { DataProvider } from "@opencode-ai/ui/context"
 import { iife } from "@opencode-ai/util/iife"
+import type { QuestionAnswer } from "@opencode-ai/sdk/v2"
 
 export default function Layout(props: ParentProps) {
   const params = useParams()
@@ -27,6 +28,11 @@ export default function Layout(props: ParentProps) {
               response: "once" | "always" | "reject"
             }) => sdk.client.permission.respond(input)
 
+            const replyToQuestion = (input: { requestID: string; answers: QuestionAnswer[] }) =>
+              sdk.client.question.reply(input)
+
+            const rejectQuestion = (input: { requestID: string }) => sdk.client.question.reject(input)
+
             const navigateToSession = (sessionID: string) => {
               navigate(`/${params.dir}/session/${sessionID}`)
             }
@@ -36,6 +42,8 @@ export default function Layout(props: ParentProps) {
                 data={sync.data}
                 directory={directory()}
                 onPermissionRespond={respond}
+                onQuestionReply={replyToQuestion}
+                onQuestionReject={rejectQuestion}
                 onNavigateToSession={navigateToSession}
               >
                 <LocalProvider>{props.children}</LocalProvider>

packages/app/src/pages/directory-layout.tsx

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-app",
-  "version": "1.1.18",
+  "version": "1.1.19",
   "type": "module",
   "license": "MIT",
   "scripts": {

packages/console/app/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
   "name": "@opencode-ai/console-core",
-  "version": "1.1.18",
+  "version": "1.1.19",
   "private": true,
   "type": "module",
   "license": "MIT",

packages/console/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-ai/console-function",
-  "version": "1.1.18",
+  "version": "1.1.19",
   "$schema": "https://json.schemastore.org/package.json",
   "private": true,
   "type": "module",