fix(dispatch): close selected dispatch agent

src/renderer/src/app/App.tsx

@@ -32,6 +32,7 @@ import { DispatchLayout } from '@renderer/workspace/dispatch/DispatchLayout'
 import { useAppStore } from '@renderer/app-state/hooks'
 import { applyTheme } from '@renderer/app-state/settings/theme'
 import { useKeybinds } from '@renderer/workspace/tile-tree/useKeybinds'
+import { commandTargetSessionId } from '@renderer/workspace/hook/selectors/commandTargetSessionId'
 import { useWorkspace } from '@renderer/workspace/workspaceStore'
 
 // App — thin shell around the workspace hook.
@@ -260,6 +261,7 @@ export default function App() {
   useKeybinds(workspace, onNewTabRequest, onResumeRequest, toggleCommandPalette)
 
   const { state, activeTab } = workspace
+  const commandTargetId = commandTargetSessionId(workspace)
   const buriedPromptMeta = buryPromptSessionId
     ? workspace.state.sessions[buryPromptSessionId] ?? null
     : null
@@ -363,8 +365,8 @@ export default function App() {
         {gitBarOpen && (
           <GitBar
             cwd={
-              activeTab
-                ? workspace.state.sessions[activeTab.focusedSessionId]?.cwd ?? null
+              commandTargetId
+                ? workspace.state.sessions[commandTargetId]?.cwd ?? null
                 : null
             }
             onClose={toggleGitBar}
@@ -374,45 +376,45 @@ export default function App() {
         {worktreesBarOpen && (
           <WorktreesBar
             cwd={
-              activeTab
-                ? workspace.state.sessions[activeTab.focusedSessionId]?.cwd ?? null
+              commandTargetId
+                ? workspace.state.sessions[commandTargetId]?.cwd ?? null
                 : null
             }
             workspace={workspace}
             onClose={toggleWorktreesBar}
           />
         )}
 
-        {debugPanelOpen && activeTab && (
+        {debugPanelOpen && commandTargetId && (
           <DebugPanel
-            sessionId={activeTab.focusedSessionId}
-            runtime={workspace.getRuntime(activeTab.focusedSessionId)}
-            kind={workspace.state.sessions[activeTab.focusedSessionId]?.kind ?? 'claude'}
+            sessionId={commandTargetId}
+            runtime={workspace.getRuntime(commandTargetId)}
+            kind={workspace.state.sessions[commandTargetId]?.kind ?? 'claude'}
             onClose={toggleDebugPanel}
           />
         )}
 
-        {feedDebugPanelOpen && activeTab && (
+        {feedDebugPanelOpen && commandTargetId && (
           <FeedDebugPanel
-            sessionId={activeTab.focusedSessionId}
-            runtime={workspace.getRuntime(activeTab.focusedSessionId)}
-            kind={workspace.state.sessions[activeTab.focusedSessionId]?.kind ?? 'claude'}
+            sessionId={commandTargetId}
+            runtime={workspace.getRuntime(commandTargetId)}
+            kind={workspace.state.sessions[commandTargetId]?.kind ?? 'claude'}
             onClose={toggleFeedDebugPanel}
           />
         )}
 
-        {proxyDebugPanelOpen && activeTab && (
+        {proxyDebugPanelOpen && commandTargetId && (
           <ProxyDebugPanel
-            sessionId={activeTab.focusedSessionId}
-            kind={workspace.state.sessions[activeTab.focusedSessionId]?.kind ?? 'claude'}
+            sessionId={commandTargetId}
+            kind={workspace.state.sessions[commandTargetId]?.kind ?? 'claude'}
             onClose={toggleProxyDebugPanel}
           />
         )}
 
-        {htmlDebugPanelOpen && activeTab && (
+        {htmlDebugPanelOpen && commandTargetId && (
           <HtmlDebugPanel
-            sessionId={activeTab.focusedSessionId}
-            kind={workspace.state.sessions[activeTab.focusedSessionId]?.kind ?? 'claude'}
+            sessionId={commandTargetId}
+            kind={workspace.state.sessions[commandTargetId]?.kind ?? 'claude'}
             onClose={toggleHtmlDebugPanel}
           />
         )}

src/renderer/src/features/command-palette/ui/CommandPalette.tsx

@@ -10,6 +10,7 @@ import {
   updateCustomPromptTemplate,
   type PromptTemplate,
 } from '@renderer/features/prompt-templates/templates'
+import { commandTargetSessionId } from '@renderer/workspace/hook/selectors/commandTargetSessionId'
 import type { Workspace } from '@renderer/workspace/workspaceStore'
 
 // CommandPalette — VS Code-style ⌘⇧P command menu.
@@ -167,8 +168,9 @@ export function CommandPalette({
   const inputRef = useRef<HTMLInputElement>(null)
   const listRef = useRef<HTMLDivElement>(null)
 
-  const focusedMeta = workspace.activeTab
-    ? workspace.state.sessions[workspace.activeTab.focusedSessionId]
+  const focusedSessionId = commandTargetSessionId(workspace)
+  const focusedMeta = focusedSessionId
+    ? workspace.state.sessions[focusedSessionId]
     : null
   const focusedCwd = focusedMeta?.cwd ?? null
   const focusedProvider = focusedMeta?.kind ?? 'claude'
@@ -231,9 +233,9 @@ export function CommandPalette({
   }, [])
 
   const enterSavePromptTemplateMode = useCallback(() => {
-    const tab = workspace.activeTab
-    if (!tab) return
-    const draft = workspace.getRuntime(tab.focusedSessionId).draftInput.trim()
+    const sessionId = commandTargetSessionId(workspace)
+    if (!sessionId) return
+    const draft = workspace.getRuntime(sessionId).draftInput.trim()
     if (!draft) return
     setPromptTemplateForm({ id: null, title: '', body: draft })
     setMode('save-prompt-template')
@@ -475,9 +477,8 @@ export function CommandPalette({
 
   const executePromptTemplate = useCallback(
     async (template: PromptTemplate) => {
-      const tab = workspace.activeTab
-      if (!tab) return
-      const sessionId = tab.focusedSessionId
+      const sessionId = commandTargetSessionId(workspace)
+      if (!sessionId) return
 
       try {
         const body = template.buildBody
@@ -508,8 +509,7 @@ export function CommandPalette({
     const body = promptTemplateForm.body.trim()
     if (!title || !body) return
 
-    const tab = workspace.activeTab
-    const sessionId = tab?.focusedSessionId ?? null
+    const sessionId = commandTargetSessionId(workspace)
     const template = promptTemplateForm.id
       ? updateCustomPromptTemplate(promptTemplateForm.id, title, body)
       : saveCustomPromptTemplate(title, body)

src/renderer/src/features/copy-assistant/commands/copyAssistantCommands.ts

@@ -1,4 +1,5 @@
 import type { CommandDef } from '@renderer/features/command-palette/types'
+import { commandTargetSessionId } from '@renderer/workspace/hook/selectors/commandTargetSessionId'
 
 // "Copy Assistant Message" — opens the picker on the focused pane.
 // All navigation (Up/Down/Enter/Esc) is handled by useKeybinds when
@@ -11,11 +12,11 @@ export const copyAssistantCommands: CommandDef[] = [
     id: 'copy-assistant-message',
     title: 'Copy Assistant Message…',
     keywords: ['copy', 'assistant', 'message', 'response', 'pick'],
-    when: ({ workspace }) => workspace.activeTab !== null,
+    when: ({ workspace }) => commandTargetSessionId(workspace) !== null,
     run: ({ workspace }) => {
-      const tab = workspace.activeTab
-      if (!tab) return
-      workspace.pickerEnter(tab.focusedSessionId)
+      const sessionId = commandTargetSessionId(workspace)
+      if (!sessionId) return
+      workspace.pickerEnter(sessionId)
     },
   },
 ]

src/renderer/src/features/debug/saveDebugBundle.ts

@@ -1,6 +1,7 @@
 import type { Workspace } from '@renderer/workspace/workspaceStore'
 import type { SessionRuntime } from '@renderer/workspace/workspaceState'
 import { sanitizeHtml } from '@renderer/lib/sanitizeHtml'
+import { commandTargetSessionId } from '@renderer/workspace/hook/selectors/commandTargetSessionId'
 import {
   exportDebugTraceFiles,
   recordHtmlTraceSnapshot,
@@ -368,9 +369,8 @@ export async function autosaveActiveAgentDebugBundles(
 // this logic is reusable if we ever surface the command elsewhere
 // (e.g. a keybinding or a right-click menu).
 export async function runSaveDebugBundleCommand(workspace: Workspace): Promise<void> {
-  const tab = workspace.activeTab
-  if (!tab) return
-  const sessionId = tab.focusedSessionId
+  const sessionId = commandTargetSessionId(workspace)
+  if (!sessionId) return
   const meta = workspace.state.sessions[sessionId]
   const runtime = workspace.getRuntime(sessionId)
   const kind = meta?.kind ?? 'claude'

src/renderer/src/features/prompt-templates/commands/promptTemplateCommands.ts

@@ -1,11 +1,12 @@
 import type { CommandDef } from '@renderer/features/command-palette/types'
+import { commandTargetSessionId } from '@renderer/workspace/hook/selectors/commandTargetSessionId'
 import type { Workspace } from '@renderer/workspace/workspaceStore'
 
 function focusedAgentSessionId(workspace: Workspace): string | null {
-  const tab = workspace.activeTab
-  if (!tab) return null
-  const kind = workspace.state.sessions[tab.focusedSessionId]?.kind ?? 'claude'
-  return kind === 'terminal' ? null : tab.focusedSessionId
+  const sessionId = commandTargetSessionId(workspace)
+  if (!sessionId) return null
+  const kind = workspace.state.sessions[sessionId]?.kind ?? 'claude'
+  return kind === 'terminal' ? null : sessionId
 }
 
 export const promptTemplateCommands: CommandDef[] = [

src/renderer/src/features/workspace/commands/paneCommands.ts

@@ -1,5 +1,6 @@
 import { extractLastAssistantText } from '@renderer/lib/copyAssistant'
 import type { CommandDef } from '@renderer/features/command-palette/types'
+import { commandTargetSessionId } from '@renderer/workspace/hook/selectors/commandTargetSessionId'
 
 export const paneCommands: CommandDef[] = [
   {
@@ -145,29 +146,29 @@ export const paneCommands: CommandDef[] = [
     id: 'toggle-tail',
     title: 'Tail',
     getState: ({ workspace }) => {
-      const tab = workspace.activeTab
-      const tailMode = tab
-        ? workspace.getRuntime(tab.focusedSessionId).tailMode
+      const sessionId = commandTargetSessionId(workspace)
+      const tailMode = sessionId
+        ? workspace.getRuntime(sessionId).tailMode
         : false
       return {
         label: tailMode ? 'On' : 'Off',
         tone: tailMode ? 'accent' : 'neutral',
       }
     },
     run: ({ workspace }) => {
-      const tab = workspace.activeTab
-      if (!tab) return
-      workspace.toggleTailMode(tab.focusedSessionId)
+      const sessionId = commandTargetSessionId(workspace)
+      if (!sessionId) return
+      workspace.toggleTailMode(sessionId)
     },
   },
   {
     id: 'jump-latest-message',
     title: 'Jump to Latest Message',
     shortcut: 'End',
     when: ({ workspace }) => {
-      const tab = workspace.activeTab
-      if (!tab) return false
-      const kind = workspace.state.sessions[tab.focusedSessionId]?.kind ?? 'claude'
+      const sessionId = commandTargetSessionId(workspace)
+      if (!sessionId) return false
+      const kind = workspace.state.sessions[sessionId]?.kind ?? 'claude'
       return kind !== 'terminal'
     },
     run: ({ workspace }) => {
@@ -178,9 +179,8 @@ export const paneCommands: CommandDef[] = [
     id: 'copy-last-assistant',
     title: 'Copy Last Response',
     run: ({ workspace }) => {
-      const tab = workspace.activeTab
-      if (!tab) return
-      const sessionId = tab.focusedSessionId
+      const sessionId = commandTargetSessionId(workspace)
+      if (!sessionId) return
       const runtime = workspace.getRuntime(sessionId)
       const kind = workspace.state.sessions[sessionId]?.kind ?? 'claude'
       const text = extractLastAssistantText(runtime.entries, kind)