Skip to content

fix(desktop): prevent setFocusedPane from clearing loading state #1373

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
Kitenite merged 1 commit into from
Feb 10, 2026
Merged

fix(desktop): prevent setFocusedPane from clearing loading state #1373

Show file tree
Hide file tree
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
27 changes: 8 additions & 19 deletions apps/desktop/src/renderer/stores/tabs/store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type { MosaicNode } from "react-mosaic-component";
import { updateTree } from "react-mosaic-component";
import { trpcTabsStorage } from "renderer/lib/trpc-storage";
import { acknowledgedStatus } from "shared/tabs-types";
import { create } from "zustand";
import { devtools, persist } from "zustand/middleware";
import { movePaneToNewTab, movePaneToTab } from "./actions/move-pane";
Expand Down Expand Up @@ -325,17 +326,11 @@ export const useTabsStore = create<TabsStore>()(
const newPanes = { ...state.panes };
let hasChanges = false;
for (const paneId of tabPaneIds) {
const currentStatus = newPanes[paneId]?.status;
if (currentStatus === "review") {
// User acknowledged completion
newPanes[paneId] = { ...newPanes[paneId], status: "idle" };
hasChanges = true;
} else if (currentStatus === "permission") {
// Assume permission granted, agent is now working
newPanes[paneId] = { ...newPanes[paneId], status: "working" };
const resolved = acknowledgedStatus(newPanes[paneId]?.status);
if (resolved !== (newPanes[paneId]?.status ?? "idle")) {
newPanes[paneId] = { ...newPanes[paneId], status: resolved };
hasChanges = true;
}
// "working" status is NOT cleared by click - persists until Stop
}

set({
Expand Down Expand Up @@ -811,7 +806,7 @@ export const useTabsStore = create<TabsStore>()(
set({
panes: {
...state.panes,
[paneId]: { ...pane, status: "idle" },
[paneId]: { ...pane, status: acknowledgedStatus(pane.status) },
},
focusedPaneIds: {
...state.focusedPaneIds,
Expand Down Expand Up @@ -881,17 +876,11 @@ export const useTabsStore = create<TabsStore>()(
const newPanes = { ...state.panes };
let hasChanges = false;
for (const paneId of workspacePaneIds) {
const currentStatus = newPanes[paneId]?.status;
if (currentStatus === "review") {
// User acknowledged completion
newPanes[paneId] = { ...newPanes[paneId], status: "idle" };
hasChanges = true;
} else if (currentStatus === "permission") {
// Assume permission granted, Claude is now working
newPanes[paneId] = { ...newPanes[paneId], status: "working" };
const resolved = acknowledgedStatus(newPanes[paneId]?.status);
if (resolved !== (newPanes[paneId]?.status ?? "idle")) {
newPanes[paneId] = { ...newPanes[paneId], status: resolved };
hasChanges = true;
}
// "working" status is NOT cleared by click - persists until Stop
}

if (hasChanges) {
Expand Down
15 changes: 15 additions & 0 deletions apps/desktop/src/shared/tabs-types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,21 @@ export function getHighestPriorityStatus(
return highest === "idle" ? null : highest;
}

/**
* Resolve what a pane's status should become when the user acknowledges it
* (e.g. clicking a tab, focusing a pane, selecting a workspace).
*
* - "review" → "idle" (user saw the completion)
* - "permission" → "working" (user saw the prompt; assume granted)
* - "working" → unchanged (persists until agent stops)
* - "idle" → unchanged
*/
export function acknowledgedStatus(status: PaneStatus | undefined): PaneStatus {
if (status === "review") return "idle";
if (status === "permission") return "working";
return status ?? "idle";
}

/**
* File viewer display modes
*/
Expand Down
Loading