From 47667e80f5b874f04656a0cf0800e33d8e3ac653 Mon Sep 17 00:00:00 2001 From: netcatty-bot <308658023+netcatty-bot@users.noreply.github.com> Date: Wed, 2 Sep 2026 09:36:07 +0000 Subject: [PATCH] fix: address Codex review on PR #3250 --- application/state/useSessionState.ts | 15 ++++++++++++++- domain/sessionTabTitle.test.ts | 9 +++++++++ domain/sessionTabTitle.ts | 13 ++++++++++--- 3 files changed, 33 insertions(+), 4 deletions(-) diff --git a/application/state/useSessionState.ts b/application/state/useSessionState.ts index 8b8452ddb..94018a14f 100644 --- a/application/state/useSessionState.ts +++ b/application/state/useSessionState.ts @@ -277,7 +277,20 @@ export const useSessionState = ({ let changed = false; const next = prev.map(ws => { if (!ws.generatedTitle) return ws; - const members = sessions.filter(s => s.workspaceId === ws.id); + // Order members by the workspace's pane tree (base/join or split + // layout), not by global session creation order — merging a newer tab + // onto an older one must keep the merged title as created (e.g. + // "02/01"), while `sessions.filter` would rewrite it to "01/02". + const rootIds = collectSessionIds(ws.root); + const members = [ + ...rootIds + .map(id => sessions.find(s => s.id === id)) + .filter((s): s is TerminalSession => Boolean(s)), + // Safety net for transient membership: any session assigned to this + // workspace whose pane has not landed in `root` yet keeps its + // previous (creation-order) position after the pane-tree members. + ...sessions.filter(s => s.workspaceId === ws.id && !rootIds.includes(s.id)), + ]; const recomputed = buildMergedWorkspaceTitleFromSessions(members) ?? DEFAULT_WORKSPACE_TITLE; if (recomputed === ws.title) return ws; changed = true; diff --git a/domain/sessionTabTitle.test.ts b/domain/sessionTabTitle.test.ts index 57eb4e9f0..80fccf19e 100644 --- a/domain/sessionTabTitle.test.ts +++ b/domain/sessionTabTitle.test.ts @@ -246,4 +246,13 @@ test('buildMergedWorkspaceTitleFromSessions recomputes from live membership', () '01', ); assert.equal(buildMergedWorkspaceTitleFromSessions([]), null); + // A third pane whose label duplicates a non-adjacent member is collapsed too. + assert.equal( + buildMergedWorkspaceTitleFromSessions([ + sessions[0], + sessions[1], + { ...sessions[0], id: 'd' }, + ]), + '01/02', + ); }); diff --git a/domain/sessionTabTitle.ts b/domain/sessionTabTitle.ts index 331018fe5..4a881835c 100644 --- a/domain/sessionTabTitle.ts +++ b/domain/sessionTabTitle.ts @@ -44,15 +44,22 @@ type WorkspaceTabLabelSession = Pick { - let title: string | null = null; + const labels: string[] = []; for (const session of sessions) { - title = buildMergedWorkspaceTitle(title ?? '', getSessionConnectionLabel(session)); + const label = getSessionConnectionLabel(session).trim(); + if (!label || labels.includes(label)) continue; + labels.push(label); } - return title; + if (labels.length === 0) return null; + return labels.join('/'); }; /**