Skip to content

fix(dispatch): close selected dispatch row #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Juliusolsson05 merged 1 commit into from
May 5, 2026
Merged

fix(dispatch): close selected dispatch row #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions src/renderer/src/workspace/hook/actions/pane.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,18 +494,35 @@ export function usePaneActions(
// onto the undo-close stack so the user can restore the pane (or
// tab) with a single command within the next 2 minutes.
const closeFocused = useCallback(async () => {
const dispatchTargetId = refs.stateRef.current.dispatchMode?.focusedSessionId
const snapshot = refs.stateRef.current
const activeTab = snapshot.tabs.find(t => t.id === snapshot.activeTabId)
const dispatchRows = snapshot.dispatchMode
? flattenDispatchRows(buildDispatchGroups(snapshot))
: []
const dispatchTargetId = snapshot.dispatchMode
? (
dispatchRows.find(row => row.sessionId === snapshot.dispatchMode?.focusedSessionId)?.sessionId ??
dispatchRows.find(row => row.sessionId === activeTab?.focusedSessionId)?.sessionId ??
dispatchRows[0]?.sessionId
)
: null
if (dispatchTargetId) {
// WHY Dispatch Mode delegates by explicit id:
// WHY Dispatch Mode delegates by the visible row's explicit id:
//
// Tab.focusedSessionId is intentionally grid-only. Dispatch selection can
// point at a detached agent that has no tile-tree leaf, or at a grid
// agent without mutating the underlying tab focus. The old close path
// always read activeTab.focusedSessionId, so closing from Dispatch could
// kill whichever grid pane happened to be focused underneath the visible
// dispatch row. `closeSession` already owns the explicit-id close
// semantics for both detached and grid sessions, so Dispatch close must
// go through that path.
// semantics for both detached and grid sessions.
//
// We still cannot trust dispatchMode.focusedSessionId blindly: after a
// scope switch, rehydrate miss, or rapid close, it may point at an id that
// is no longer present in the visible Dispatch rows. DispatchLayout falls
// back to grid focus and then the first visible row in that case, so close
// must use the same row-derived target or the highlighted pane and the
// destructive target diverge again.
await closeSessionRef.current?.(dispatchTargetId)
return
}
Expand Down