diff --git a/application/state/useSessionState.ts b/application/state/useSessionState.ts index adbef1646..8b8452ddb 100644 --- a/application/state/useSessionState.ts +++ b/application/state/useSessionState.ts @@ -62,6 +62,7 @@ import { normalizeCodingCliDynamicTitleForStorage } from '../../domain/codingCli import { DEFAULT_WORKSPACE_TITLE, buildMergedWorkspaceTitle, + buildMergedWorkspaceTitleFromSessions, getSessionConnectionLabel, } from '../../domain/sessionTabTitle'; import { cleanupClosedTerminalSessions } from './aiStateSnapshots'; @@ -264,6 +265,28 @@ export const useSessionState = ({ } }, [initialRestoreState.activeTabId]); + // Keep generated merged-workspace titles (e.g. "01/02" after dragging tab + // "02" onto "01") synchronized with the workspace's current membership and + // each pane's connection label. `autoTitle: false` makes + // resolveWorkspaceTabLabel treat the composed title as a user-chosen name, + // so without this pass a pane rename or a pane being added/removed would + // leave the label stale. Runs off session changes and only touches + // workspaces still flagged `generatedTitle` (a user rename clears it). + useEffect(() => { + setWorkspaces(prev => { + let changed = false; + const next = prev.map(ws => { + if (!ws.generatedTitle) return ws; + const members = sessions.filter(s => s.workspaceId === ws.id); + const recomputed = buildMergedWorkspaceTitleFromSessions(members) ?? DEFAULT_WORKSPACE_TITLE; + if (recomputed === ws.title) return ws; + changed = true; + return { ...ws, title: recomputed }; + }); + return changed ? next : prev; + }); + }, [sessions]); + useEffect(() => { const handleRestorePreviousSessionChanged = (key?: string) => { if (key !== STORAGE_KEY_RESTORE_PREVIOUS_SESSION) return; @@ -626,11 +649,16 @@ export const useSessionState = ({ }, []); const submitWorkspaceRename = useCallback((workspaceId?: string, name?: string) => { + // A user rename takes ownership of the title: clear `generatedTitle` so a + // previously synthesized merged title ("01/02") stops being auto-updated. + const applyRename = (w: Workspace, trimmed: string): Workspace => ( + { ...w, title: trimmed, autoTitle: false, generatedTitle: false } + ); if (workspaceId !== undefined && name !== undefined) { const trimmed = name.trim(); if (!trimmed) return; setWorkspaces(prev => prev.map(w => ( - w.id === workspaceId ? { ...w, title: trimmed, autoTitle: false } : w + w.id === workspaceId ? applyRename(w, trimmed) : w ))); return; } @@ -641,7 +669,7 @@ export const useSessionState = ({ setWorkspaceRenameTarget(prevTarget => { if (!prevTarget) return prevTarget; - setWorkspaces(prev => prev.map(w => w.id === prevTarget.id ? { ...w, title: trimmed, autoTitle: false } : w)); + setWorkspaces(prev => prev.map(w => w.id === prevTarget.id ? applyRename(w, trimmed) : w)); return null; }); @@ -737,7 +765,9 @@ export const useSessionState = ({ // "01/02") so the window title and the rename dialog show the merged // identity instead of the generic "Workspace". Falls back to the default // auto title when neither tab has a label. The explicit `autoTitle: false` - // makes tab labels use this composed name too. + // makes tab labels use this composed name too; `generatedTitle: true` + // marks it as synthesized so it keeps tracking membership/renames (see the + // generated-title sync effect below) instead of going stale. const baseSession = sessionsRef.current.find(s => s.id === baseSessionId); const joiningSession = sessionsRef.current.find(s => s.id === joiningSessionId); const mergedTitle = buildMergedWorkspaceTitle( @@ -746,7 +776,7 @@ export const useSessionState = ({ ); const created = createWorkspaceEntity(baseSessionId, joiningSessionId, hint); const newWorkspace = mergedTitle - ? { ...created, title: mergedTitle, autoTitle: false } + ? { ...created, title: mergedTitle, autoTitle: false, generatedTitle: true } : created; setSessions((prevSessions) => { diff --git a/domain/models/workspace.ts b/domain/models/workspace.ts index afdd818b2..a297cf25a 100644 --- a/domain/models/workspace.ts +++ b/domain/models/workspace.ts @@ -39,4 +39,9 @@ export interface Workspace { // Absent on legacy workspaces — the tab falls back to the default-title // string check for those. See resolveWorkspaceTabLabel. autoTitle?: boolean; + // `title` was composed from the panes' connection labels (e.g. a merged + // workspace "01/02"), not chosen by the user. The store keeps such titles + // synchronized with the workspace's membership and pane renames until the + // user renames the workspace (which clears this flag). + generatedTitle?: boolean; } diff --git a/domain/sessionRestore.ts b/domain/sessionRestore.ts index aca795cb4..d41638f64 100644 --- a/domain/sessionRestore.ts +++ b/domain/sessionRestore.ts @@ -392,6 +392,7 @@ const restoreWorkspace = (workspace: Workspace, root: WorkspaceNode, sessionIds: // Preserve explicit-title state across restore; the boolean guard keeps a // deliberate `autoTitle: false` (a user-named workspace) from being dropped. ...(typeof workspace.autoTitle === "boolean" ? { autoTitle: workspace.autoTitle } : {}), + ...(workspace.generatedTitle ? { generatedTitle: true } : {}), }; }; diff --git a/domain/sessionTabTitle.test.ts b/domain/sessionTabTitle.test.ts index a5fc0a7dc..57eb4e9f0 100644 --- a/domain/sessionTabTitle.test.ts +++ b/domain/sessionTabTitle.test.ts @@ -3,6 +3,7 @@ import test from 'node:test'; import { DEFAULT_WORKSPACE_TITLE, buildMergedWorkspaceTitle, + buildMergedWorkspaceTitleFromSessions, getSessionConnectionLabel, resolveCodingCliProviderIconUpdate, resolveSessionTabTitle, @@ -218,3 +219,31 @@ test('buildMergedWorkspaceTitle falls back to the labeled side', () => { test('buildMergedWorkspaceTitle returns null when neither tab has a label', () => { assert.equal(buildMergedWorkspaceTitle('', ''), null); }); + +test('buildMergedWorkspaceTitleFromSessions recomputes from live membership', () => { + const sessions = [ + { id: 'a', customName: '01', hostLabel: '01', hostId: 'h1' }, + { id: 'b', customName: '02', hostLabel: '02', hostId: 'h2' }, + ]; + assert.equal(buildMergedWorkspaceTitleFromSessions(sessions), '01/02'); + // After renaming pane "02" the composed title follows. + assert.equal( + buildMergedWorkspaceTitleFromSessions([ + sessions[0], + { ...sessions[1], customName: 'prod', hostLabel: 'prod' }, + ]), + '01/prod', + ); + // After removing a pane the title collapses to the remaining label. + assert.equal(buildMergedWorkspaceTitleFromSessions([sessions[1]]), '02'); + // Identical labels still collapse; unlabeled panes are skipped. + assert.equal( + buildMergedWorkspaceTitleFromSessions([ + sessions[0], + { id: 'c', customName: '', hostLabel: '', hostId: 'h3' }, + { ...sessions[0], id: 'd' }, + ]), + '01', + ); + assert.equal(buildMergedWorkspaceTitleFromSessions([]), null); +}); diff --git a/domain/sessionTabTitle.ts b/domain/sessionTabTitle.ts index f01921376..331018fe5 100644 --- a/domain/sessionTabTitle.ts +++ b/domain/sessionTabTitle.ts @@ -39,6 +39,22 @@ export const buildMergedWorkspaceTitle = ( type WorkspaceTabLabelSession = Pick; +/** + * Recompute a merged workspace's composed title from its *current* member + * sessions. Unlike the one-shot `buildMergedWorkspaceTitle` call at merge + * time, this runs over live membership, so pane renames and panes being + * added or removed are reflected. Returns null when no member has a label. + */ +export const buildMergedWorkspaceTitleFromSessions = ( + sessions: readonly WorkspaceTabLabelSession[], +): string | null => { + let title: string | null = null; + for (const session of sessions) { + title = buildMergedWorkspaceTitle(title ?? '', getSessionConnectionLabel(session)); + } + return title; +}; + /** * Resolve the label shown on a split-workspace tab. When the user has renamed * the workspace, that name wins. Otherwise derive it from the focused session's