Skip to content

graff — a fast agentic coding harness in Zig: multi-provider, MCP, workflows, DGM evolution loop, TS/Python SDKs

Python

GUI: show project identity for generated worktree chats

yxlyxca8fedfe3a79
diff --git a/apps/native/components/primitives/SidebarNav.tsx b/apps/native/components/primitives/SidebarNav.tsx
index d6f5f1a0..a19bc909 100644
--- a/apps/native/components/primitives/SidebarNav.tsx
+++ b/apps/native/components/primitives/SidebarNav.tsx
@@ -21,6 +21,7 @@ import GlideMenu from "@/components/primitives/GlideMenu";
import { useCommandGlyph } from "@/lib/shortcut-glyph";
import ActionMenu from "./ActionMenu";
import WorkspaceMenu from "./WorkspaceMenu";
+import type { WorkspaceDisplay } from "@/lib/workspaces";
/* ─────────────────────────────────────────────────────────
* SIDEBAR NAV
@@ -87,6 +88,7 @@ type SidebarNavProps = {
variant?: string;
/** The active workspace (the folder graff runs in); the demo shows a placeholder. */
workspace?: SidebarWorkspace;
+ workspaceDisplay?: WorkspaceDisplay;
/** Every workspace the switcher offers, the active one included. */
workspaces?: SidebarWorkspace[];
onSwitchWorkspace?: (path: string) => void;
@@ -190,6 +192,7 @@ export default function SidebarNav({
footerTitle,
recents = DEFAULT_RECENTS,
workspace,
+ workspaceDisplay,
workspaces = [],
onSwitchWorkspace,
onNewWorkspace,
@@ -297,8 +300,9 @@ export default function SidebarNav({
<CodeGraffMark size={20} />
</span>
<span className="sidebar-copy ml-1.5 min-w-0 flex-1 truncate text-[14px] font-medium text-ink-2" title={workspace?.path}>
- {workspace?.name ?? WORKSPACE.name}
+ {workspaceDisplay?.project ?? workspace?.name ?? WORKSPACE.name}
</span>
+ {workspaceDisplay?.worktree && <span className="sidebar-copy shrink-0 rounded bg-inset px-1 text-[10px] text-ink-3">worktree</span>}
<span className="sidebar-copy ml-1 flex shrink-0 text-ink-3">
<IconChevronDownSmall size={16} />
</span>
diff --git a/apps/native/components/site/ChatSplitLayout.tsx b/apps/native/components/site/ChatSplitLayout.tsx
index 8b402210..66efd034 100644
--- a/apps/native/components/site/ChatSplitLayout.tsx
+++ b/apps/native/components/site/ChatSplitLayout.tsx
@@ -7,11 +7,12 @@ import SplitDivider from "./SplitDivider";
import paneStyles from "./chat-pane.module.css";
import {flatSplit,pruneSplit,splitGeometry,paneStyle,type SplitTree} from "@/lib/split-tree";
import { useCommandGlyph } from "@/lib/shortcut-glyph";
+import type { WorkspaceDisplay } from "@/lib/workspaces";
export default function ChatSplitLayout({ threads, liveChatIds, activeId, direction, layout, onLayoutChange, onFocus, onClose, folder, body, split, claims = [] }: {
threads: Chat[]; activeId: number; direction: "row" | "column"; layout?: SplitTree;
liveChatIds?: number[];
onLayoutChange(tree:SplitTree):void; onFocus(id: number): void; onClose(id: number): void;
- folder(thread: Chat): { name: string; path?: string }; body(thread: Chat): ReactNode; split: boolean;
+ folder(thread: Chat): WorkspaceDisplay & { path?: string }; body(thread: Chat): ReactNode; split: boolean;
claims?: { kind: string; key: string; session: string }[];
}) {
const mod = useCommandGlyph();
@@ -40,8 +41,9 @@ export default function ChatSplitLayout({ threads, liveChatIds, activeId, direct
const tree=useMemo(()=>layout?pruneSplit(layout,new Set(threads.map(thread=>thread.id)))!:flatSplit(threads.map(thread=>thread.id),direction),[layout,shownKey,direction]);
const geometry=useMemo(()=>splitGeometry(tree),[tree]);
return <div data-chat-layout className="relative flex min-h-0 min-w-0 flex-1" style={{flexDirection:direction}}>
- {threads.map((thread,index)=>
- <section key={thread.id} data-chat={thread.id} data-focused={thread.id===activeId}
+ {threads.map((thread,index)=>{
+ const place = folder(thread);
+ return <section key={thread.id} data-chat={thread.id} data-focused={thread.id===activeId}
data-glass={split && thread.id !== activeId ? "true" : undefined}
aria-label={`Chat pane ${index+1}`}
onPointerDownCapture={()=>{if(thread.id!==activeId)onFocus(thread.id);}}
@@ -54,12 +56,12 @@ export default function ChatSplitLayout({ threads, liveChatIds, activeId, direct
{claims.filter(claim => claim.session === thread.session).slice(0, 1).map(claim =>
<span key={`${claim.kind}:${claim.key}`} title={`${claim.kind} ${claim.key}`} className="max-w-[45%] truncate rounded-full bg-inset px-2 py-0.5 text-[10px] text-ink-3">{claim.kind === "pull_request" ? `PR ${claim.key}` : claim.kind === "issue" ? `#${claim.key}` : claim.key}</span>
)}
- {split && <span title={folder(thread).path} className="flex min-w-0 max-w-[40%] items-center gap-1 text-[11px] text-ink-3"><IconFolder size={13}/><span className="truncate">{folder(thread).name}</span></span>}
+ {split && <span title={place.path} aria-label={`Project ${place.project}${place.worktree ? ", worktree" : ""}`} className="flex min-w-0 max-w-[50%] items-center gap-1 text-[11px] text-ink-3"><IconFolder size={13}/><span className="truncate">{place.project}</span>{place.worktree && <span className="shrink-0 rounded bg-inset px-1 text-[10px]">worktree</span>}</span>}
{split && <button type="button" aria-label="Close this split" title={`Close this chat (${mod}W)`} onClick={()=>onClose(thread.id)} className="flex size-6 shrink-0 items-center justify-center rounded text-ink-3 hover:bg-hover hover:text-ink">×</button>}
</header>}
<ComposerDraftContext.Provider value={draftFor(thread.id)}>{body(thread)}</ComposerDraftContext.Provider>
- </section>
- )}
+ </section>;
+ })}
{geometry.dividers.map(({node,box},index)=><SplitDivider key={node.key} node={node} box={box} tree={tree} onChange={onLayoutChange} index={index}/>)}
</div>;
}
diff --git a/apps/native/components/site/GraffHarness.tsx b/apps/native/components/site/GraffHarness.tsx
index c2183659..5343337a 100644
--- a/apps/native/components/site/GraffHarness.tsx
+++ b/apps/native/components/site/GraffHarness.tsx
@@ -50,11 +50,7 @@ import { usePromptQueue, steerOrInterrupt } from "./usePromptQueue";
import { useChatClose } from "./useChatClose";
import { type StoredSession } from "@/lib/sessions";
import { loadHistory, mergeHistory } from "@/lib/prompt-history";
-import {
- basename,
- findWorkspace,
- type Workspace,
-} from "@/lib/workspaces";
+import { basename, displayWorkspace, findWorkspace, type Workspace } from "@/lib/workspaces";
export default function GraffHarness() {
const navigation = useResponsiveNavigation();
@@ -354,12 +350,9 @@ export default function GraffHarness() {
const recents = sidebarRecents(stored, chats, unread);
- // The folder chip is the tab's workspace. New chat opens there.
+ // Display the project separately from the checkout where this chat runs.
const cwdOf = (thread: Chat) => thread.cwd ?? activePath ?? health?.cwd;
- const workspaceNameOf = (thread: Chat) => {
- const dir = cwdOf(thread);
- return findWorkspace(workspaces, dir)?.name ?? (dir ? basename(dir) : "workspace");
- };
+ const workspaceOf = (thread: Chat) => displayWorkspace(cwdOf(thread), workspaces);
const chatCwd = cwdOf(chatThread);
useEffect(() => {
let alive = true;
@@ -374,11 +367,11 @@ export default function GraffHarness() {
const id = setInterval(tick, 5000);
return () => { alive = false; clearInterval(id); };
}, [chatCwd]);
- const chatWorkspace = findWorkspace(workspaces, chatCwd);
- const workspaceName = chatWorkspace?.name ?? (chatCwd ? basename(chatCwd) : "workspace");
+ const chatWorkspaceDisplay = workspaceOf(chatThread);
const pinCount = (pinsByChat[chatThread.id] ?? []).length;
const activeWorkspace = findWorkspace(workspaces, activePath);
const sidebarWorkspace = activeWorkspace ?? (activePath ? { path: activePath, name: basename(activePath) } : undefined);
+ const sidebarWorkspaceDisplay = sidebarWorkspace ? chatWorkspaceDisplay : undefined;
const resumeQueue = (chatId: number) => void resumeQueuedPrompt(chatId, {
pending: queueResumesRef.current,
@@ -495,7 +488,7 @@ export default function GraffHarness() {
setBrowserOpen(key === "browser");
setConversationsOpen(key === "conversations");
}}
- workspace={sidebarWorkspace}
+ workspace={sidebarWorkspace} workspaceDisplay={sidebarWorkspaceDisplay}
workspaces={workspaces}
onSwitchWorkspace={switchWorkspace}
onArchiveRecent={(id) => dropStored(id, true)}
@@ -510,7 +503,7 @@ export default function GraffHarness() {
<HarnessChrome sidebarVisible={navigation.sidebarVisible} navigationToggle={navigation.trigger} unreadIds={unread} onTabPointerDown={tabDrag.begin} onTabClickCapture={tabDrag.suppressClick} chats={groups.tabs} activeId={groups.activeTab} busyIds={new Set(groups.groups.filter(group => group.ids.some(id => busyIds.has(id))).map(group => group.ids[0]))} focusChat={id => focusChat(groups.focusOf(id))} closeChat={closeTab} newChat={newChat}
conversationsOpen={conversationsOpen} openConversations={openConversations} split={panes.length > 0} toggleSplit={toggleSplit}
filesOpen={filesOpen} onFiles={() => { setAgentsOpen(false); setFileRequest(null); setProjectsOpen(false); setBrowserOpen(false); setConversationsOpen(false); setFilesOpen(fileRequest?.changes ? true : !filesOpen); }}
- chatCwd={chatCwd} workspaceName={workspaceName} onFolder={() => setDialog({ mode: "new" })} openChanges={toggleChanges} changesOpen={!!(filesOpen && fileRequest?.changes)}
+ chatCwd={chatCwd} workspaceDisplay={chatWorkspaceDisplay} onFolder={() => setDialog({ mode: "new" })} openChanges={toggleChanges} changesOpen={!!(filesOpen && fileRequest?.changes)}
reviewsOpen={reviewsOpen} onReviews={() => { setAgentsOpen(false); setProjectsOpen(false); setBrowserOpen(false); setConversationsOpen(false); setFilesOpen(false); setReviewsOpen(open => !open); }}
browserOpen={browserOpen} onBrowser={() => { setAgentsOpen(false); setProjectsOpen(false); setConversationsOpen(false); setFilesOpen(false); setBrowserOpen(open => !open); }} pinCount={pinCount}
terminalVisible={terminalVisible} toggleTerminal={toggleTerminal} agentsOpen={agentsOpen}
@@ -540,7 +533,7 @@ export default function GraffHarness() {
) : null}
<div className="min-h-0 min-w-0 flex-1" style={{ display: projectsOpen || conversationsOpen || agentsOpen ? "none" : "flex" }}>
<ChatSplitLayout threads={columns} liveChatIds={chats.map(chat => chat.id)} activeId={activeId} direction={splitDirection} layout={groups.tree} onLayoutChange={groups.setTree}
- onFocus={id => focusChat(id, false)} onClose={closeChat} folder={thread => ({name: workspaceNameOf(thread), path: cwdOf(thread)})}
+ onFocus={id => focusChat(id, false)} onClose={closeChat} folder={thread => ({...workspaceOf(thread), path: cwdOf(thread)})}
body={columnBody} split={columnIds.length > 1} claims={claims} />
</div>
diff --git a/apps/native/components/site/HarnessChrome.tsx b/apps/native/components/site/HarnessChrome.tsx
index 4356716b..289d38f5 100644
--- a/apps/native/components/site/HarnessChrome.tsx
+++ b/apps/native/components/site/HarnessChrome.tsx
@@ -8,6 +8,7 @@ import type { Chat } from "./harness-types";
import reviewStyles from "./ChangesPane.module.css";
import { archiveTaskWorkspace, createTaskWorkspace, gcTaskWorkspaces, landTaskWorkspace, runTaskWorkspace, updateTaskWorkspace } from "./harness-task-workspace";
import { useCommandGlyph } from "@/lib/shortcut-glyph";
+import type { WorkspaceDisplay } from "@/lib/workspaces";
type Props = {
navigationToggle?: ReactNode; sidebarVisible?: boolean;
@@ -16,7 +17,7 @@ type Props = {
chats: (Pick<Chat, "id" | "title"> & { paneIds?: number[]; direction?: "row" | "column"; tree?: SplitTree })[]; activeId: number; busyIds: ReadonlySet<number>;
focusChat(id: number): void; closeChat(id: number): void; newChat(): void;
conversationsOpen: boolean; openConversations(): void; split: boolean; toggleSplit(): void;
- filesOpen: boolean; onFiles(): void; chatCwd?: string; workspaceName: string; onFolder(): void;
+ filesOpen: boolean; onFiles(): void; chatCwd?: string; workspaceDisplay: WorkspaceDisplay; onFolder(): void;
openChanges(): void; changesOpen?: boolean; reviewsOpen?: boolean; onReviews?: () => void; browserOpen: boolean; onBrowser(): void; pinCount: number;
terminalVisible: boolean; toggleTerminal(): void; agentsOpen: boolean; onAgents(): void; workingAgents?: number;
tasksOpen?: boolean; taskCount?: number; onTasks?: () => void; splitNotice?: string | null;
@@ -28,7 +29,7 @@ function paneBtn(pressed: boolean) {
export default function HarnessChrome({navigationToggle, sidebarVisible = false, unreadIds, chats, activeId, busyIds, focusChat, closeChat, newChat,
conversationsOpen, openConversations, split, toggleSplit, filesOpen, onFiles, chatCwd,
- workspaceName, onFolder, openChanges, changesOpen = false, reviewsOpen = false, onReviews, browserOpen, onBrowser, pinCount, terminalVisible,
+ workspaceDisplay, onFolder, openChanges, changesOpen = false, reviewsOpen = false, onReviews, browserOpen, onBrowser, pinCount, terminalVisible,
toggleTerminal, agentsOpen, onAgents, workingAgents = 0, tasksOpen = false, taskCount = 0, onTasks, splitNotice, onTabPointerDown, onTabClickCapture}: Props) {
const mod = useCommandGlyph();
return (
@@ -52,7 +53,10 @@ export default function HarnessChrome({navigationToggle, sidebarVisible = false,
<div className={`${reviewStyles.actions} flex shrink-0 items-center gap-1 ${sidebarVisible ? "justify-end" : "min-h-10 border-t border-line px-2 py-1"}`}>
{navigationToggle}
<button type="button" aria-pressed={filesOpen && !changesOpen} onClick={onFiles} title={`${chatCwd ?? "Workspace"}\nShow this chat's files`}
- className={`max-w-48 truncate lg:hidden ${paneBtn(filesOpen && !changesOpen)}`}>{workspaceName}</button>
+ className={`flex max-w-48 items-center gap-1 lg:hidden ${paneBtn(filesOpen && !changesOpen)}`}>
+ <span className="min-w-0 flex-1 truncate">{workspaceDisplay.project}</span>
+ {workspaceDisplay.worktree && <span className="shrink-0 text-[10px] text-ink-3">worktree</span>}
+ </button>
<div className={`ml-auto flex items-center gap-1 ${sidebarVisible ? "rounded-[14px] border border-line bg-page px-2 py-0.5" : ""}`}>
<ActionMenu label="Workspace tools" text="Tools" className="shrink-0">
<button type="button" aria-label="Review workspace changes" aria-pressed={changesOpen} onClick={openChanges}>Review</button>
diff --git a/apps/native/electron/navigation-visual.cjs b/apps/native/electron/navigation-visual.cjs
index 6da33504..2578aef2 100644
--- a/apps/native/electron/navigation-visual.cjs
+++ b/apps/native/electron/navigation-visual.cjs
@@ -23,10 +23,16 @@ async function runNavigationVisuals({win:fixtureWindow,origin,output}) {
const pressEnter=async()=>{await testDesktop.pressEnter(wc);await sleep(50);};
const input=async text=>{await js(`(()=>{const e=document.querySelector('textarea[aria-label="Prompt"]');e.focus();Object.getOwnPropertyDescriptor(HTMLTextAreaElement.prototype,'value').set.call(e,${JSON.stringify(text)});e.dispatchEvent(new Event('input',{bubbles:true}));})()`);await sleep(100);};
const tabs=()=>js(`document.querySelectorAll('[aria-label="Close tab"]').length`);
+ const worktreeSetup=process.env.GRAFF_VISUAL_SUITE==='session-navigation' ? `
+ localStorage.setItem('graff.native.workspace','/demo/field-notes/.graff/worktrees/session-visual');
+ localStorage.setItem('graff.native.workspaces',JSON.stringify([...JSON.parse(localStorage.getItem('graff.native.workspaces')),
+ {path:'/demo/field-notes',name:'Field Notes',source:'history'},
+ {path:'/demo/field-notes/.graff/worktrees/session-visual',name:'session-visual',source:'history'}]));` : '';
try {
fixtureWindow.hide();await wc.loadURL('about:blank');testDesktop.attachTestDebugger(wc);await wc.debugger.sendCommand('Page.enable');
await wc.debugger.sendCommand('Page.addScriptToEvaluateOnNewDocument',{source:`(${installGalleryFixture.toString()})();
localStorage.setItem('graff.native.workspaces',JSON.stringify(Array.from({length:50},(_,i)=>({name:'Project '+(i%10),path:'/demo/folder-'+i}))));
+ ${worktreeSetup}
const commands=[{name:'compact',description:'Compact conversation context'},...Array.from({length:100},(_,i)=>({name:'command-'+i,description:'Command '+i}))];
const galleryFetch=window.fetch;window.fetch=async(input,options)=>{const response=await galleryFetch(input,options);if(options?.body&&JSON.parse(options.body).method==='bootstrap')return new Response(JSON.stringify({sessionId:'demo',commands}),{headers:{'content-type':'application/json'}});if(String(input).includes('/api/models')){const data=await response.json();data.result.commands=commands;data.result.current.model='${['tab-drag','session-navigation'].includes(process.env.GRAFF_VISUAL_SUITE) ? 'Graff' : 'example-model-with-a-long-name'}';data.result.models[0].name=data.result.current.model;return new Response(JSON.stringify(data),{headers:{'content-type':'application/json'}});}return response;};`});
await wc.loadURL(origin);testDesktop.present(win);await wait(`!!document.querySelector('[data-workspace-ready="true"] textarea[aria-label="Prompt"]')`);
diff --git a/apps/native/electron/session-navigation-visual.cjs b/apps/native/electron/session-navigation-visual.cjs
index a41778ed..132b8f75 100644
--- a/apps/native/electron/session-navigation-visual.cjs
+++ b/apps/native/electron/session-navigation-visual.cjs
@@ -33,6 +33,14 @@ async function runSessionNavigation({ win, output }) {
await wait(`!!document.querySelector('[role="dialog"][aria-label="Appearance"]')`);
};
await wait(`!!document.querySelector('[data-session-navigation="sidebar"]')`);
+ const sidebarLabel = () => js(`document.querySelector('[data-workspace-trigger]')?.textContent`);
+ assert.match(await sidebarLabel(),/Field Notes.*worktree/,'sidebar names the project and labels the checkout');
+ assert.doesNotMatch(await sidebarLabel(),/session-visual/);
+ await shortcut('t',['meta']);
+ await wait(`document.querySelectorAll('[data-tab-id]').length===2`);
+ assert.match(await sidebarLabel(),/Field Notes.*worktree/,'Cmd+T keeps the project label');
+ await shortcut('w',['meta']);
+ await wait(`document.querySelectorAll('[data-tab-id]').length===1`);
assert.equal(await js(`document.querySelector('[data-session-tab-strip]')?.getBoundingClientRect().height ?? 0`),0);
await openAppearance('[aria-label="Workspace navigation"] button[aria-label="Settings"]');
const appearance = await js(`(()=>{const d=document.querySelector('[role="dialog"][aria-label="Appearance"]');const r=d.getBoundingClientRect();const h=[...d.querySelectorAll('strong')].find(el=>el.textContent==='Appearance');const hr=h.getBoundingClientRect();return {left:r.left,right:r.right,top:r.top,headingTop:hr.top,headingVisible:hr.bottom>0&&hr.top<innerHeight,vw:innerWidth};})()`);
@@ -87,6 +95,9 @@ async function runSessionNavigation({ win, output }) {
await capture('tabs-only');
wc.send('desktop-action','split-right');
await wait(`document.querySelectorAll('[data-chat]').length===2`);
+ const folderLabels = await js(`Array.from(document.querySelectorAll('[data-chat] [aria-label^="Project "]'),e=>e.textContent)`);
+ assert.equal(folderLabels.length,2);
+ assert.ok(folderLabels.every(label=>label.includes('Field Notes')&&label.includes('worktree')&&!label.includes('session-visual')),'split headers identify the project, not a session-shaped folder');
const splitIds = await js(`Array.from(document.querySelectorAll('[data-chat]'),e=>Number(e.dataset.chat))`);
await click('[aria-label="Expand sidebar"]');
await wait(`!!document.querySelector('[data-session-navigation="sidebar"]')`);
@@ -104,7 +115,10 @@ async function runSessionNavigation({ win, output }) {
await click('[aria-label="Close navigation"]');
await wait(`!!document.querySelector('[data-session-navigation="tabs"]')`);
assert.equal(await js(`document.querySelectorAll('[data-session-navigation]').length`),1);
+ const compactLabel = await js(`(()=>{const e=document.querySelector('[data-workspace-toolbar] button[title*="Show this chat"]');return e&&e.getClientRects().length?e.textContent:null})()`);
+ assert.match(compactLabel,/Field Notes.*worktree/,'narrow toolbar names the project and checkout');
+ assert.doesNotMatch(compactLabel,/session-visual/);
assert.equal(await js(`document.querySelector('[data-chat="${drafted}"] textarea').value`),'Keep this draft');
- console.log('Session navigation passed: one surface, unsaved chats, drafts, vertical reorder, split groups and narrow popover.');
+ console.log('Session navigation passed: project/worktree labels, new tabs, split groups, drafts and narrow toolbar.');
}
module.exports = { runSessionNavigation };
diff --git a/apps/native/lib/workspaces.test.ts b/apps/native/lib/workspaces.test.ts
index 59c39cc3..ea0c9346 100644
--- a/apps/native/lib/workspaces.test.ts
+++ b/apps/native/lib/workspaces.test.ts
@@ -2,6 +2,7 @@ import { describe, it } from "node:test";
import assert from "node:assert/strict";
import {
basename,
+ displayWorkspace,
restoreWorkspaceSelection,
findWorkspace,
loadActiveWorkspace,
@@ -39,6 +40,22 @@ describe("basename / monogram", () => {
});
});
+describe("displayWorkspace", () => {
+ const workspaces: Workspace[] = [
+ { path: "/repo", name: "Codegraff" },
+ { path: "/repo/.graff/worktrees/session-one", name: "session-one" },
+ ];
+ it("shows the project and worktree status, not a generated checkout name", () => {
+ assert.deepEqual(displayWorkspace("/repo", workspaces), { project: "Codegraff", worktree: false });
+ assert.deepEqual(displayWorkspace("/repo/.graff/worktrees/session-one", workspaces), { project: "Codegraff", worktree: true });
+ assert.deepEqual(displayWorkspace("/repo/.graff/worktrees/session-one/.graff/worktrees/session-two", workspaces), { project: "Codegraff", worktree: true });
+ });
+ it("keeps ordinary folders and fallback names unchanged", () => {
+ assert.deepEqual(displayWorkspace("/other/project", workspaces), { project: "project", worktree: false });
+ assert.deepEqual(displayWorkspace(null, workspaces), { project: "workspace", worktree: false });
+ });
+});
+
describe("upsertWorkspace", () => {
it("adds a row, defaulting the name to the folder", () => {
const list = upsertWorkspace([], { path: "/a/b/", name: " " });
diff --git a/apps/native/lib/workspaces.ts b/apps/native/lib/workspaces.ts
index 66a4af75..21cacd22 100644
--- a/apps/native/lib/workspaces.ts
+++ b/apps/native/lib/workspaces.ts
@@ -70,6 +70,21 @@ export function findWorkspace(list: readonly Workspace[], path: string | null |
return list.find((w) => w.path === p);
}
+export type WorkspaceDisplay = { project: string; worktree: boolean };
+
+/** Generated checkouts are still separate working folders, but their GUI label
+ * names the owning project rather than a session-shaped directory. */
+export function displayWorkspace(cwd: string | null | undefined, list: readonly Workspace[]): WorkspaceDisplay {
+ if (!cwd) return { project: "workspace", worktree: false };
+ const path = normalizePath(cwd);
+ const checkout = /[/\\]\.graff[/\\]worktrees[/\\][^/\\]+(?=$|[/\\])/.exec(path);
+ const projectPath = checkout ? path.slice(0, checkout.index) || path[0] : path;
+ return {
+ project: findWorkspace(list, projectPath)?.name ?? basename(projectPath.replace(/\\/g, "/")),
+ worktree: checkout !== null,
+ };
+}
+
/** Preserve chosen rows, including a full list, when showing startup context. */
export function restoreWorkspaceSelection(saved: readonly Workspace[], remembered: string | null, root: string) {
const list = [...saved];