From 9e1e16feb2dd8c853aa8af201ed8642f41bc4b01 Mon Sep 17 00:00:00 2001
From: Shantur Rathore <i@shantur.com>
Date: Sat, 16 May 2026 19:14:24 +0100
Subject: [PATCH 1/2] fix(ui): surface pending interruptions

Auto-open the permission/question center when an active instance receives pending interruptions so an earlier permission cannot remain hidden while a later question shows Waiting for earlier responses.

Keep question message-store attachments deduplicated when a request moves from a global fallback entry to a resolved tool part, and order active question state by enqueue time to match the permission flow. Queued permission actions are disabled to preserve the same active-interruption ordering as questions.

Validation: npm run typecheck --workspace @codenomad/ui; node --import tsx --test packages/ui/src/stores/message-v2/instance-store.test.ts
---
 .../components/instance/instance-shell2.tsx   | 19 +++++++++--
 .../components/permission-approval-modal.tsx  |  6 ++--
 .../components/tool-call/permission-block.tsx |  6 ++--
 .../stores/message-v2/instance-store.test.ts  | 33 +++++++++++++++++++
 .../src/stores/message-v2/instance-store.ts   | 16 +++++++--
 5 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/packages/ui/src/components/instance/instance-shell2.tsx b/packages/ui/src/components/instance/instance-shell2.tsx
index c2689fdb4..5cff0ab50 100644
--- a/packages/ui/src/components/instance/instance-shell2.tsx
+++ b/packages/ui/src/components/instance/instance-shell2.tsx
@@ -340,10 +340,25 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
     return t("instanceShell.connection.unknown")
   }
 
-  const hasPendingRequests = createMemo(() => {
+  const pendingRequestCount = createMemo(() => {
     const permissions = getPermissionQueueLength(props.instance.id)
     const questions = getQuestionQueueLength(props.instance.id)
-    return permissions + questions > 0
+    return permissions + questions
+  })
+  const hasPendingRequests = createMemo(() => {
+    return pendingRequestCount() > 0
+  })
+
+  let previousPendingRequestCount = 0
+  let previousIsActiveInstance = props.isActiveInstance !== false
+  createEffect(() => {
+    const count = pendingRequestCount()
+    const isActiveInstance = props.isActiveInstance !== false
+    if (isActiveInstance && count > 0 && (previousPendingRequestCount === 0 || !previousIsActiveInstance)) {
+      setPermissionModalOpen(true)
+    }
+    previousPendingRequestCount = count
+    previousIsActiveInstance = isActiveInstance
   })
 
   const activePromptInputApi = createMemo(() => {
diff --git a/packages/ui/src/components/permission-approval-modal.tsx b/packages/ui/src/components/permission-approval-modal.tsx
index 4e2aff614..032292758 100644
--- a/packages/ui/src/components/permission-approval-modal.tsx
+++ b/packages/ui/src/components/permission-approval-modal.tsx
@@ -375,7 +375,7 @@ const PermissionApprovalModal: Component<PermissionApprovalModalProps> = (props)
                                       <button
                                         type="button"
                                         class="tool-call-permission-button"
-                                        disabled={permissionSubmitting().has(item.id)}
+                                        disabled={!isActive() || permissionSubmitting().has(item.id)}
                                         onClick={() => void handlePermissionDecision(item.payload as PermissionRequestLike, "once")}
                                       >
                                         {t("permissionApproval.actions.allowOnce")}
@@ -383,7 +383,7 @@ const PermissionApprovalModal: Component<PermissionApprovalModalProps> = (props)
                                       <button
                                         type="button"
                                         class="tool-call-permission-button"
-                                        disabled={permissionSubmitting().has(item.id)}
+                                        disabled={!isActive() || permissionSubmitting().has(item.id)}
                                         onClick={() => void handlePermissionDecision(item.payload as PermissionRequestLike, "always")}
                                       >
                                         {t("permissionApproval.actions.alwaysAllow")}
@@ -391,7 +391,7 @@ const PermissionApprovalModal: Component<PermissionApprovalModalProps> = (props)
                                       <button
                                         type="button"
                                         class="tool-call-permission-button"
-                                        disabled={permissionSubmitting().has(item.id)}
+                                        disabled={!isActive() || permissionSubmitting().has(item.id)}
                                         onClick={() => void handlePermissionDecision(item.payload as PermissionRequestLike, "reject")}
                                       >
                                         {t("permissionApproval.actions.deny")}
diff --git a/packages/ui/src/components/tool-call/permission-block.tsx b/packages/ui/src/components/tool-call/permission-block.tsx
index a8493f7ab..398dbe4e9 100644
--- a/packages/ui/src/components/tool-call/permission-block.tsx
+++ b/packages/ui/src/components/tool-call/permission-block.tsx
@@ -81,7 +81,7 @@ export function PermissionToolBlock(props: PermissionToolBlockProps) {
                 <button
                   type="button"
                   class="tool-call-permission-button"
-                  disabled={props.submitting()}
+                  disabled={!props.active() || props.submitting()}
                   onClick={() => respond("once")}
                 >
                   {t("toolCall.permission.actions.allowOnce")}
@@ -89,7 +89,7 @@ export function PermissionToolBlock(props: PermissionToolBlockProps) {
                 <button
                   type="button"
                   class="tool-call-permission-button"
-                  disabled={props.submitting()}
+                  disabled={!props.active() || props.submitting()}
                   onClick={() => respond("always")}
                 >
                   {t("toolCall.permission.actions.alwaysAllow")}
@@ -97,7 +97,7 @@ export function PermissionToolBlock(props: PermissionToolBlockProps) {
                 <button
                   type="button"
                   class="tool-call-permission-button"
-                  disabled={props.submitting()}
+                  disabled={!props.active() || props.submitting()}
                   onClick={() => respond("reject")}
                 >
                   {t("toolCall.permission.actions.deny")}
diff --git a/packages/ui/src/stores/message-v2/instance-store.test.ts b/packages/ui/src/stores/message-v2/instance-store.test.ts
index ee9f36e0d..7b49fe7c0 100644
--- a/packages/ui/src/stores/message-v2/instance-store.test.ts
+++ b/packages/ui/src/stores/message-v2/instance-store.test.ts
@@ -35,3 +35,36 @@ describe("message-v2 permission state", () => {
     assert.equal(store.getPermissionState(undefined, "permission-2")?.active, true)
   })
 })
+
+describe("message-v2 question state", () => {
+  it("keeps one question attachment when a duplicate moves from global to a tool part", () => {
+    const store = createInstanceMessageStore("instance-1")
+
+    store.upsertQuestion({
+      request: { id: "question-1", questions: [] } as any,
+      enqueuedAt: 1_000,
+    })
+    store.upsertQuestion({
+      request: { id: "question-1", questions: [] } as any,
+      messageId: "message-1",
+      partId: "part-1",
+      enqueuedAt: 2_000,
+    })
+
+    assert.equal(store.state.questions.queue.length, 1)
+    assert.equal(store.getQuestionState(undefined, "question-1"), null)
+    assert.equal(store.getQuestionState("message-1", "part-1")?.entry.request.id, "question-1")
+    assert.equal(store.getQuestionState("message-1", "part-1")?.active, true)
+  })
+
+  it("uses enqueue time when recalculating the active question", () => {
+    const store = createInstanceMessageStore("instance-1")
+
+    store.upsertQuestion({ request: { id: "question-2", questions: [] } as any, enqueuedAt: 2_000 })
+    store.upsertQuestion({ request: { id: "question-1", questions: [] } as any, enqueuedAt: 1_000 })
+
+    assert.equal(store.state.questions.active?.request.id, "question-1")
+    assert.equal(store.getQuestionState(undefined, "question-1")?.active, true)
+    assert.equal(store.getQuestionState(undefined, "question-2")?.active, false)
+  })
+})
diff --git a/packages/ui/src/stores/message-v2/instance-store.ts b/packages/ui/src/stores/message-v2/instance-store.ts
index 3373a4cdf..5fda3f4d5 100644
--- a/packages/ui/src/stores/message-v2/instance-store.ts
+++ b/packages/ui/src/stores/message-v2/instance-store.ts
@@ -990,6 +990,17 @@ export function createInstanceMessageStore(instanceId: string, hooks?: MessageSt
     setState(
       "questions",
       produce((draft) => {
+        Object.keys(draft.byMessage).forEach((existingMessageKey) => {
+          const partEntries = draft.byMessage[existingMessageKey]
+          Object.keys(partEntries).forEach((existingPartKey) => {
+            if (partEntries[existingPartKey].request.id === entry.request.id) {
+              delete partEntries[existingPartKey]
+            }
+          })
+          if (Object.keys(partEntries).length === 0) {
+            delete draft.byMessage[existingMessageKey]
+          }
+        })
         draft.byMessage[messageKey] = draft.byMessage[messageKey] ?? {}
         draft.byMessage[messageKey][partKey] = entry
         const existingIndex = draft.queue.findIndex((item) => item.request.id === entry.request.id)
@@ -998,9 +1009,8 @@ export function createInstanceMessageStore(instanceId: string, hooks?: MessageSt
         } else {
           draft.queue[existingIndex] = entry
         }
-        if (!draft.active || draft.active.request.id === entry.request.id) {
-          draft.active = entry
-        }
+        draft.queue.sort((left, right) => left.enqueuedAt - right.enqueuedAt)
+        draft.active = draft.queue[0] ?? null
       }),
     )
   }

From de2caa82917acbfedc6998f844589023de440387 Mon Sep 17 00:00:00 2001
From: Shantur Rathore <i@shantur.com>
Date: Sat, 16 May 2026 19:40:16 +0100
Subject: [PATCH 2/2] fix(ui): keep interruption center closed

Remove the automatic opening behavior for the permission/question center when pending interruptions arrive. Users can still see the pending-request banner and open the center manually, while the existing interruption ordering behavior remains intact.

Validated with npm run typecheck --workspace @codenomad/ui.
---
 .../ui/src/components/instance/instance-shell2.tsx   | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/packages/ui/src/components/instance/instance-shell2.tsx b/packages/ui/src/components/instance/instance-shell2.tsx
index 5cff0ab50..4e0a27aac 100644
--- a/packages/ui/src/components/instance/instance-shell2.tsx
+++ b/packages/ui/src/components/instance/instance-shell2.tsx
@@ -349,18 +349,6 @@ const InstanceShell2: Component<InstanceShellProps> = (props) => {
     return pendingRequestCount() > 0
   })
 
-  let previousPendingRequestCount = 0
-  let previousIsActiveInstance = props.isActiveInstance !== false
-  createEffect(() => {
-    const count = pendingRequestCount()
-    const isActiveInstance = props.isActiveInstance !== false
-    if (isActiveInstance && count > 0 && (previousPendingRequestCount === 0 || !previousIsActiveInstance)) {
-      setPermissionModalOpen(true)
-    }
-    previousPendingRequestCount = count
-    previousIsActiveInstance = isActiveInstance
-  })
-
   const activePromptInputApi = createMemo(() => {
     const sessionId = activeSessionIdForInstance()
     if (!sessionId || sessionId === "info") return null