Skip to content

Commit 13b47b6

Browse files
committed
fix(web): keep unsent threads with an open terminal in the sidebar
A new thread that only runs a project script had no composer content, so the sidebar hid it and remapping or persisting drafts deleted it, leaving the script running with no way back. Treat an open terminal like an open preview when keeping drafts, list such drafts as "Terminal open", and let their discard button work without composer content. Fixes #25194
1 parent 888a3d4 commit 13b47b6

6 files changed

Lines changed: 158 additions & 38 deletions

File tree

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
import { EnvironmentId, ProjectId, ThreadId } from "@t3tools/contracts";
2+
import { scopeProjectRef, scopeThreadRef } from "@t3tools/client-runtime/environment";
3+
import { describe, expect, it, vi } from "vite-plus/test";
4+
5+
import { render } from "../../../test/render";
6+
import { DraftId, useComposerDraftStore } from "../../composerDraftStore";
7+
import { useTerminalUiStateStore } from "../../terminalUiStateStore";
8+
import { SidebarDraftBlock } from "./SidebarDraftBlock";
9+
10+
const environmentId = EnvironmentId.make("environment-local");
11+
const projectRef = scopeProjectRef(environmentId, ProjectId.make("project-1"));
12+
const draftId = DraftId.make("draft-1");
13+
const threadRef = scopeThreadRef(environmentId, ThreadId.make("thread-1"));
14+
15+
describe("SidebarDraftBlock", () => {
16+
it("lists an unsent draft whose only content is an open terminal", async () => {
17+
using _stores = {
18+
[Symbol.dispose]: () => {
19+
useComposerDraftStore.setState({
20+
draftsByThreadKey: {},
21+
draftThreadsByThreadKey: {},
22+
logicalProjectDraftThreadKeyByLogicalProjectKey: {},
23+
});
24+
useTerminalUiStateStore.setState({
25+
terminalUiStateByThreadKey: {},
26+
suppressedTerminalIdsByThreadKey: {},
27+
});
28+
},
29+
};
30+
useComposerDraftStore.getState().setProjectDraftThreadId(projectRef, draftId, {
31+
threadId: threadRef.threadId,
32+
});
33+
useTerminalUiStateStore.getState().newTerminal(threadRef, "terminal-1");
34+
35+
await using screen = await render(
36+
<SidebarDraftBlock
37+
projectByKey={new Map()}
38+
projectDisplayNameByKey={new Map()}
39+
scopedProjectKeys={null}
40+
routeDraftId={null}
41+
onNavigateToDraft={vi.fn()}
42+
onDraftContextMenu={vi.fn()}
43+
/>,
44+
);
45+
46+
await expect.element(screen.getByRole("button", { name: /Terminal open/ })).toBeVisible();
47+
});
48+
});

‎apps/web/src/components/sidebar/SidebarDraftBlock.tsx‎

Lines changed: 38 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import {
77
type KeyboardEvent as ReactKeyboardEvent,
88
type MouseEvent as ReactMouseEvent,
99
} from "react";
10+
import { scopeThreadRef } from "@t3tools/client-runtime/environment";
1011
import type { EnvironmentProject } from "@t3tools/client-runtime/state/shell";
1112
import { cn } from "~/lib/utils";
1213
import { resolveSidebarRowAccessibility } from "../Sidebar.logic";
@@ -19,11 +20,12 @@ import {
1920
type ComposerThreadDraftState,
2021
type DraftSessionState,
2122
} from "../../composerDraftStore";
23+
import { selectThreadTerminalUiState, useTerminalUiStateStore } from "../../terminalUiStateStore";
2224
import { draftPenClassName, draftSurfaceClassName } from "./SidebarThreadRow";
2325

2426
const SidebarDraftRow = memo(function SidebarDraftRow(props: {
2527
draftId: DraftId;
26-
composer: ComposerThreadDraftState;
28+
composer: ComposerThreadDraftState | null;
2729
project: ProjectFaviconProject | null;
2830
projectDisplayName: string | null;
2931
isActive: boolean;
@@ -32,22 +34,26 @@ const SidebarDraftRow = memo(function SidebarDraftRow(props: {
3234
onContextMenu: (draftId: DraftId, position: { x: number; y: number }) => void;
3335
}) {
3436
const { composer, draftId, onContextMenu, onDiscard, onNavigate } = props;
35-
const promptPreview =
36-
replaceComposerContextReferences(composer.prompt, (occurrence) => occurrence.label)
37-
.trim()
38-
.split("\n", 1)[0] ?? "";
37+
const promptPreview = composer
38+
? (replaceComposerContextReferences(composer.prompt, (occurrence) => occurrence.label)
39+
.trim()
40+
.split("\n", 1)[0] ?? "")
41+
: "";
3942
// images mirrors persistedAttachments once rehydration finishes; before
4043
// that only the persisted list is populated, hence max not sum.
41-
const attachmentCount =
42-
Math.max(composer.images.length, composer.persistedAttachments.length) +
43-
composer.files.length +
44-
composer.terminalContexts.length +
45-
composer.previewAnnotations.length +
46-
composer.reviewComments.length;
44+
const attachmentCount = composer
45+
? Math.max(composer.images.length, composer.persistedAttachments.length) +
46+
composer.files.length +
47+
composer.terminalContexts.length +
48+
composer.previewAnnotations.length +
49+
composer.reviewComments.length
50+
: 0;
4751
const preview =
4852
promptPreview.length > 0
4953
? promptPreview
50-
: `${attachmentCount} attachment${attachmentCount === 1 ? "" : "s"}`;
54+
: attachmentCount > 0
55+
? `${attachmentCount} attachment${attachmentCount === 1 ? "" : "s"}`
56+
: "Terminal open";
5157
const accessibility = resolveSidebarRowAccessibility({
5258
title: preview,
5359
statusLabel: "Unsent draft",
@@ -134,7 +140,7 @@ const SidebarDraftRow = memo(function SidebarDraftRow(props: {
134140
interface SidebarDraftRowData {
135141
draftId: DraftId;
136142
session: DraftSessionState;
137-
composer: ComposerThreadDraftState;
143+
composer: ComposerThreadDraftState | null;
138144
}
139145

140146
export const SidebarDraftBlock = memo(function SidebarDraftBlock(props: {
@@ -147,6 +153,17 @@ export const SidebarDraftBlock = memo(function SidebarDraftBlock(props: {
147153
}) {
148154
const draftThreadsByThreadKey = useComposerDraftStore((store) => store.draftThreadsByThreadKey);
149155
const draftsByThreadKey = useComposerDraftStore((store) => store.draftsByThreadKey);
156+
const terminalUiStateByThreadKey = useTerminalUiStateStore(
157+
(store) => store.terminalUiStateByThreadKey,
158+
);
159+
// A script run from a draft opens a terminal without touching the composer;
160+
// hiding that draft would leave its process running with no way back to it.
161+
const isListed = (session: DraftSessionState, composer: ComposerThreadDraftState | undefined) =>
162+
composerDraftHasUserContent(composer) ||
163+
selectThreadTerminalUiState(
164+
terminalUiStateByThreadKey,
165+
scopeThreadRef(session.environmentId, session.threadId),
166+
).terminalIds.length > 0;
150167
const [frozenActive, setFrozenActive] = useState<{
151168
routeDraftId: string | null;
152169
row: SidebarDraftRowData | null;
@@ -158,8 +175,8 @@ export const SidebarDraftBlock = memo(function SidebarDraftBlock(props: {
158175
const session = draftThreadsByThreadKey[draftId];
159176
const composer = draftsByThreadKey[draftId];
160177
row =
161-
session && session.promotedTo == null && composer && composerDraftHasUserContent(composer)
162-
? { draftId, session, composer }
178+
session && session.promotedTo == null && isListed(session, composer)
179+
? { draftId, session, composer: composer ?? null }
163180
: null;
164181
}
165182
setFrozenActive({ routeDraftId: props.routeDraftId, row });
@@ -183,10 +200,14 @@ export const SidebarDraftBlock = memo(function SidebarDraftBlock(props: {
183200
continue;
184201
}
185202
const composer = draftsByThreadKey[draftKey];
186-
if (!composer || !composerDraftHasUserContent(composer)) {
203+
if (!isListed(session, composer)) {
187204
continue;
188205
}
189-
rows.push({ draftId: DraftId.make(draftKey), session, composer });
206+
rows.push({
207+
draftId: DraftId.make(draftKey),
208+
session,
209+
composer: composer ?? null,
210+
});
190211
}
191212
rows.sort((left, right) => right.session.createdAt.localeCompare(left.session.createdAt));
192213
return rows;

‎apps/web/src/composerDraftStore.test.ts‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ import {
9898
import { formatTerminalContextReference, type TerminalContextDraft } from "./lib/terminalContext";
9999
import { createDeferredStorage } from "./lib/storage";
100100
import { applyPreviewServerSnapshot, resetPreviewStateForTests } from "./previewStateStore";
101+
import { useTerminalUiStateStore } from "./terminalUiStateStore";
101102

102103
function makeImage(input: {
103104
id: string;
@@ -930,6 +931,26 @@ describe("composerDraftStore project draft thread mapping", () => {
930931
}
931932
});
932933

934+
it("keeps a draft with an open terminal when remapping a project to a new draft thread", () => {
935+
const store = useComposerDraftStore.getState();
936+
store.setProjectDraftThreadId(projectRef, draftId, { threadId });
937+
useTerminalUiStateStore
938+
.getState()
939+
.newTerminal(scopeThreadRef(TEST_ENVIRONMENT_ID, threadId), "terminal-1");
940+
try {
941+
store.setProjectDraftThreadId(projectRef, otherDraftId, { threadId: otherThreadId });
942+
943+
expect(useComposerDraftStore.getState().getDraftThread(draftId)?.threadId).toBe(threadId);
944+
const persisted = partializeComposerDraftStoreState(useComposerDraftStore.getState());
945+
expect(persisted.draftThreadsByThreadKey[draftId]?.threadId).toBe(threadId);
946+
} finally {
947+
useTerminalUiStateStore.setState({
948+
terminalUiStateByThreadKey: {},
949+
suppressedTerminalIdsByThreadKey: {},
950+
});
951+
}
952+
});
953+
933954
it("keeps invested composer drafts alive unmapped when remapping a project to a new draft thread", () => {
934955
const store = useComposerDraftStore.getState();
935956
store.setProjectDraftThreadId(projectRef, draftId, { threadId });

‎apps/web/src/composerDraftStore.ts‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ import type {
5151
} from "@t3tools/client-runtime/state/shell";
5252
import { getLocalStorageItem } from "./hooks/useLocalStorage";
5353
import { readThreadPreviewState } from "./previewStateStore";
54+
import { selectThreadTerminalUiState, useTerminalUiStateStore } from "./terminalUiStateStore";
5455
import { resolveAppModelSelection, resolveAppModelSelectionForInstance } from "./modelSelection";
5556
import {
5657
DEFAULT_INTERACTION_MODE,
@@ -1368,6 +1369,15 @@ function draftThreadHasOpenPreview(draftThread: DraftThreadState | undefined): b
13681369
return Object.keys(readThreadPreviewState(ref).sessions).length > 0;
13691370
}
13701371

1372+
function draftThreadHasOpenTerminal(draftThread: DraftThreadState | undefined): boolean {
1373+
if (draftThread === undefined) return false;
1374+
const ref = scopeThreadRef(draftThread.environmentId, draftThread.threadId);
1375+
return (
1376+
selectThreadTerminalUiState(useTerminalUiStateStore.getState().terminalUiStateByThreadKey, ref)
1377+
.terminalIds.length > 0
1378+
);
1379+
}
1380+
13711381
function isComposerThreadKeyInUse(mappings: Record<string, string>, threadKey: string): boolean {
13721382
return Object.values(mappings).includes(threadKey);
13731383
}
@@ -1982,7 +1992,8 @@ export function partializeComposerDraftStoreState(
19821992
mappedDraftKeys.has(threadKey) ||
19831993
isDraftThreadPromoting(draftThread) ||
19841994
composerDraftHasUserContent(state.draftsByThreadKey[threadKey]) ||
1985-
draftThreadHasOpenPreview(draftThread),
1995+
draftThreadHasOpenPreview(draftThread) ||
1996+
draftThreadHasOpenTerminal(draftThread),
19861997
)
19871998
.map(([threadKey]) => threadKey),
19881999
);
@@ -2566,7 +2577,8 @@ const composerDraftStore = create<ComposerDraftStoreState>()(
25662577
!composerDraftHasUserContent(
25672578
state.draftsByThreadKey[previousThreadKeyForLogicalProject],
25682579
) &&
2569-
!draftThreadHasOpenPreview(previousDraftThread)
2580+
!draftThreadHasOpenPreview(previousDraftThread) &&
2581+
!draftThreadHasOpenTerminal(previousDraftThread)
25702582
) {
25712583
delete nextDraftThreadsByThreadKey[previousThreadKeyForLogicalProject];
25722584
if (state.draftsByThreadKey[previousThreadKeyForLogicalProject] !== undefined) {

‎apps/web/src/lib/discardComposerDraft.test.ts‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ import { useThreadUndoNotice } from "../hooks/showThreadUndoNotice";
88
import { releaseDraftAttachments } from "./attachmentUploadQueue";
99
import { discardComposerDraft } from "./discardComposerDraft";
1010

11-
vi.mock("./attachmentUploadQueue", () => ({ releaseDraftAttachments: vi.fn() }));
11+
vi.mock("./attachmentUploadQueue", () => ({
12+
releaseDraftAttachments: vi.fn(),
13+
}));
1214

1315
const environmentId = EnvironmentId.make("environment-local");
1416
const projectRef = scopeProjectRef(environmentId, ProjectId.make("project-1"));
@@ -58,6 +60,17 @@ describe("discardComposerDraft", () => {
5860
expect(releaseDraftAttachments).not.toHaveBeenCalled();
5961
});
6062

63+
it("discards and restores a new-thread draft with no composer content", async () => {
64+
useComposerDraftStore.getState().setProjectDraftThreadId(projectRef, draftId);
65+
const session = useComposerDraftStore.getState().getDraftSession(draftId);
66+
67+
discardComposerDraft(draftId);
68+
expect(useComposerDraftStore.getState().getDraftSession(draftId)).toBeNull();
69+
70+
await undoNotice().undo();
71+
expect(useComposerDraftStore.getState().getDraftSession(draftId)).toEqual(session);
72+
});
73+
6174
it("keeps text typed after the discard and releases the old uploads", async () => {
6275
useComposerDraftStore.getState().setPrompt(threadRef, "old reply");
6376
discardComposerDraft(threadRef);

‎apps/web/src/lib/discardComposerDraft.ts‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@ import { releaseDraftAttachments } from "./attachmentUploadQueue";
1414
export function discardComposerDraft(target: ComposerThreadTarget): void {
1515
const store = useComposerDraftStore.getState();
1616
const key = resolveComposerDraftKey(store, target);
17-
const draft = key === null ? undefined : store.draftsByThreadKey[key];
18-
if (key === null || !draft) return;
17+
if (key === null) return;
18+
const draft = store.draftsByThreadKey[key];
1919
const session = store.draftThreadsByThreadKey[key];
20+
const discardsSession = typeof target === "string";
21+
if (!draft && !(discardsSession && session)) return;
2022
const logicalProjectKeys = Object.entries(store.logicalProjectDraftThreadKeyByLogicalProjectKey)
2123
.filter(([, draftKey]) => draftKey === key)
2224
.map(([logicalProjectKey]) => logicalProjectKey);
23-
const discardsSession = typeof target === "string";
2425

2526
const claim = ThreadUndo.begin("discard", key);
2627
if (discardsSession) {
@@ -36,7 +37,7 @@ export function discardComposerDraft(target: ComposerThreadTarget): void {
3637
undo: async () => {
3738
const current = useComposerDraftStore.getState().draftsByThreadKey[key];
3839
if (current && composerDraftHasUserContent(current)) {
39-
releaseDraftAttachments([...draft.images, ...draft.files]);
40+
if (draft) releaseDraftAttachments([...draft.images, ...draft.files]);
4041
return AsyncResult.failure(Cause.fail(new Error("The draft has new content.")));
4142
}
4243
useComposerDraftStore.setState((state) => {
@@ -47,19 +48,21 @@ export function discardComposerDraft(target: ComposerThreadTarget): void {
4748
logicalProjectDraftThreadKeyByLogicalProjectKey[logicalProjectKey] ??= key;
4849
}
4950
return {
50-
draftsByThreadKey: {
51-
...state.draftsByThreadKey,
52-
[key]: discardsSession
53-
? {
54-
...draft,
55-
images: draft.images.map((image) =>
56-
image.previewUrl.startsWith("blob:")
57-
? { ...image, previewUrl: URL.createObjectURL(image.file) }
58-
: image,
59-
),
60-
}
61-
: draft,
62-
},
51+
draftsByThreadKey: !draft
52+
? state.draftsByThreadKey
53+
: {
54+
...state.draftsByThreadKey,
55+
[key]: discardsSession
56+
? {
57+
...draft,
58+
images: draft.images.map((image) =>
59+
image.previewUrl.startsWith("blob:")
60+
? { ...image, previewUrl: URL.createObjectURL(image.file) }
61+
: image,
62+
),
63+
}
64+
: draft,
65+
},
6366
draftThreadsByThreadKey: session
6467
? { ...state.draftThreadsByThreadKey, [key]: session }
6568
: state.draftThreadsByThreadKey,
@@ -68,6 +71,8 @@ export function discardComposerDraft(target: ComposerThreadTarget): void {
6871
});
6972
return AsyncResult.success(undefined);
7073
},
71-
commit: () => releaseDraftAttachments([...draft.images, ...draft.files]),
74+
commit: () => {
75+
if (draft) releaseDraftAttachments([...draft.images, ...draft.files]);
76+
},
7277
});
7378
}

0 commit comments

Comments
 (0)