Skip to content

Commit 8afbc40

Browse files
committed
feat: allow new thread creation through project breadcrumbs
1 parent f4c3943 commit 8afbc40

4 files changed

Lines changed: 68 additions & 10 deletions

File tree

‎apps/web/src/components/ChatView.logic.test.ts‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import {
2525
reconcileRetainedMountedThreadIds,
2626
resolveThreadMetadataUpdateForNextTurn,
2727
resolveSendEnvMode,
28+
startNewThreadForProject,
2829
shouldShowBranchMismatchBanner,
2930
shouldWriteThreadErrorToCurrentServerThread,
3031
} from "./ChatView.logic";
@@ -445,6 +446,33 @@ describe("shouldWriteThreadErrorToCurrentServerThread", () => {
445446
});
446447
});
447448

449+
describe("startNewThreadForProject", () => {
450+
it("starts a thread through the supplied shared handler for the active project", () => {
451+
const calls: Array<{ environmentId: EnvironmentId; projectId: ProjectId }> = [];
452+
const projectRef = { environmentId, projectId };
453+
454+
expect(
455+
startNewThreadForProject(projectRef, (nextProjectRef) => {
456+
calls.push(nextProjectRef);
457+
return Promise.resolve();
458+
}),
459+
).toBe(true);
460+
expect(calls).toEqual([projectRef]);
461+
});
462+
463+
it("does nothing when the active project is unavailable", () => {
464+
let called = false;
465+
466+
expect(
467+
startNewThreadForProject(null, () => {
468+
called = true;
469+
return Promise.resolve();
470+
}),
471+
).toBe(false);
472+
expect(called).toBe(false);
473+
});
474+
});
475+
448476
describe("hasServerAcknowledgedLocalDispatch", () => {
449477
it("does not acknowledge unchanged server state", () => {
450478
const localDispatch = createLocalDispatchSnapshot(

‎apps/web/src/components/ChatView.logic.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
type ModelSelection,
66
type ProviderDriverKind,
77
type ServerProvider,
8+
type ScopedProjectRef,
89
type ScopedThreadRef,
910
type ThreadId,
1011
type TurnId,
@@ -27,6 +28,16 @@ export const MAX_HIDDEN_MOUNTED_PREVIEW_THREADS = 3;
2728

2829
export const LastInvokedScriptByProjectSchema = Schema.Record(ProjectId, Schema.String);
2930

31+
export function startNewThreadForProject(
32+
projectRef: ScopedProjectRef | null,
33+
handleNewThread: (projectRef: ScopedProjectRef) => Promise<void>,
34+
): boolean {
35+
if (projectRef === null) return false;
36+
void handleNewThread(projectRef);
37+
38+
return true;
39+
}
40+
3041
export function resolveThreadMetadataUpdateForNextTurn(input: {
3142
currentModelSelection: ModelSelection;
3243
nextModelSelection?: ModelSelection;

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ import { getProviderModelCapabilities, resolveSelectableProvider } from "../prov
168168
import { NO_PROVIDER_MODEL_SELECTION } from "../providerInstances";
169169
import { useClientSettings, useEnvironmentSettings } from "../hooks/useSettings";
170170
import { useNowMinute } from "../hooks/useNowMinute";
171+
import { useNewThreadHandler } from "../hooks/useHandleNewThread";
171172
import { resolveAppModelSelectionForInstance } from "../modelSelection";
172173
import { getTerminalFocusOwner } from "../lib/terminalFocus";
173174
import { resolveNewDraftStartFromOrigin } from "../lib/chatThreadActions";
@@ -271,6 +272,7 @@ import {
271272
resolveSendEnvMode,
272273
revokeBlobPreviewUrl,
273274
revokeUserMessagePreviewUrls,
275+
startNewThreadForProject,
274276
waitForStartedServerThread,
275277
} from "./ChatView.logic";
276278
import { useLocalStorage } from "~/hooks/useLocalStorage";
@@ -1130,6 +1132,7 @@ function ChatViewContent(props: ChatViewProps) {
11301132
forceExpandedMobileComposer = false,
11311133
} = props;
11321134
const draftId = routeKind === "draft" ? props.draftId : null;
1135+
const handleNewThread = useNewThreadHandler();
11331136
const routeThreadRef = useMemo(
11341137
() => scopeThreadRef(environmentId, threadId),
11351138
[environmentId, threadId],
@@ -1583,6 +1586,9 @@ function ChatViewContent(props: ChatViewProps) {
15831586
? scopeProjectRef(activeThread.environmentId, activeThread.projectId)
15841587
: null;
15851588
const activeProject = useProject(activeProjectRef);
1589+
const handleNewThreadInActiveProject = useCallback(() => {
1590+
startNewThreadForProject(activeProjectRef, handleNewThread);
1591+
}, [activeProjectRef, handleNewThread]);
15861592
const activeEnvironmentShell = useEnvironmentQuery(
15871593
activeThread ? environmentShell.stateAtom(activeThread.environmentId) : null,
15881594
);
@@ -5674,6 +5680,7 @@ function ChatViewContent(props: ChatViewProps) {
56745680
availableEditors={availableEditors}
56755681
rightPanelOpen={rightPanelOpen}
56765682
gitCwd={gitCwd}
5683+
onNewThreadInProject={handleNewThreadInActiveProject}
56775684
onRunProjectScript={runProjectScript}
56785685
onAddProjectScript={saveProjectScript}
56795686
onUpdateProjectScript={updateProjectScript}

‎apps/web/src/components/chat/ChatHeader.tsx‎

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ interface ChatHeaderProps {
3434
availableEditors: ReadonlyArray<EditorId>;
3535
rightPanelOpen: boolean;
3636
gitCwd: string | null;
37+
onNewThreadInProject: () => void;
3738
onRunProjectScript: (script: ProjectScript) => void;
3839
onAddProjectScript: (input: NewProjectScriptInput) => Promise<ProjectScriptActionResult>;
3940
onUpdateProjectScript: (
@@ -69,6 +70,7 @@ export const ChatHeader = memo(function ChatHeader({
6970
availableEditors,
7071
rightPanelOpen,
7172
gitCwd,
73+
onNewThreadInProject,
7274
onRunProjectScript,
7375
onAddProjectScript,
7476
onUpdateProjectScript,
@@ -92,16 +94,26 @@ export const ChatHeader = memo(function ChatHeader({
9294
doesn't answer it. */}
9395
{activeProjectName ? (
9496
<span className="inline-flex shrink-0 items-center gap-2">
95-
<span className="inline-flex min-w-0 items-center gap-1.5">
96-
<ProjectFavicon
97-
environmentId={activeThreadEnvironmentId}
98-
cwd={activeProjectCwd ?? ""}
99-
className="size-3.5"
100-
/>
101-
<span className="max-w-40 truncate text-sm font-medium text-muted-foreground">
102-
{activeProjectName}
103-
</span>
104-
</span>
97+
<Tooltip>
98+
<TooltipTrigger
99+
render={
100+
<button
101+
type="button"
102+
aria-label={`New thread in ${activeProjectName}`}
103+
onClick={onNewThreadInProject}
104+
className="inline-flex min-w-0 cursor-pointer items-center gap-1.5 rounded-sm text-muted-foreground transition-colors hover:text-foreground focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring"
105+
/>
106+
}
107+
>
108+
<ProjectFavicon
109+
environmentId={activeThreadEnvironmentId}
110+
cwd={activeProjectCwd ?? ""}
111+
className="size-3.5"
112+
/>
113+
<span className="max-w-40 truncate text-sm font-medium">{activeProjectName}</span>
114+
</TooltipTrigger>
115+
<TooltipPopup side="top">New thread in {activeProjectName}</TooltipPopup>
116+
</Tooltip>
105117
<span aria-hidden className="text-muted-foreground/40">
106118
/
107119
</span>

0 commit comments

Comments
 (0)