fix(gateway): include session label in deriveSessionTitle fallback chain (#98841)

SunnyShu0925 · claude · steipete · web-flow · commit 68e06b9ea148 · 2026-07-03T02:09:31.000-07:00
* fix(gateway): include session label in deriveSessionTitle fallback chain When a session is renamed with /name, the user-provided label is persisted in sessions.json but was ignored by deriveSessionTitle. This caused the TUI session picker and other derived-title consumers to show auto-generated or UUID-based names instead of the user's label. Add entry.label to the deriveSessionTitle fallback chain after displayName and subject, before the auto-derived firstUserMessage and sessionId fallbacks. This aligns with the existing ACP translator precedence (derivedTitle ?? displayName ?? label ?? key). Related to #98742 Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * test(gateway): tighten session label precedence coverage * fix(gateway): prioritize explicit session labels * fix(commands): preserve named-session suggestions --------- Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com> Co-authored-by: Peter Steinberger <steipete@gmail.com>
diff --git a/src/auto-reply/reply/commands-name.test.ts b/src/auto-reply/reply/commands-name.test.ts
@@ -170,13 +170,15 @@ describe("name command", () => {
         totalTokens: 0,
         totalTokensFresh: true,
         label: "Billing rework",
+        displayName: "Dashboard session",
       },
     });
 
     const params = buildNameParams("/name", storePath);
     const result = await handleNameCommand(params, true);
 
     expect(result?.reply?.text).toContain("Current session name: Billing rework");
+    expect(result?.reply?.text).toContain("Suggested name: Dashboard session");
   });
 
   it("seeds a brand-new native session entry that is not yet persisted", async () => {
diff --git a/src/auto-reply/reply/commands-name.ts b/src/auto-reply/reply/commands-name.ts
@@ -83,7 +83,8 @@ export const handleNameCommand: CommandHandler = async (params, allowTextCommand
       getSessionEntry({ sessionKey: params.sessionKey, storePath: params.storePath }) ??
       params.sessionEntry;
     const current = normalizeOptionalString(entry?.label);
-    const suggestion = deriveSessionTitle(entry);
+    const suggestionEntry = entry ? { ...entry, label: undefined } : undefined;
+    const suggestion = deriveSessionTitle(suggestionEntry);
     const lines: string[] = [];
     lines.push(
       current ? `Current session name: ${current}` : "This session has no custom name yet.",
diff --git a/src/gateway/session-utils.test.ts b/src/gateway/session-utils.test.ts
@@ -2510,6 +2510,34 @@ describe("deriveSessionTitle", () => {
     } as SessionEntry;
     expect(deriveSessionTitle(entry)).toBe("Actual Subject");
   });
+
+  test.each([
+    {
+      name: "uses a label before the first user message",
+      fields: { label: "Label via /name" },
+      firstUserMessage: "Hello, what can you do?",
+      expected: "Label via /name",
+    },
+    {
+      name: "prefers an explicit label over display and group metadata",
+      fields: {
+        displayName: "Display Name",
+        subject: "Group Subject",
+        label: "Label via /name",
+      },
+      firstUserMessage: undefined,
+      expected: "Label via /name",
+    },
+    {
+      name: "ignores a blank label",
+      fields: { label: "   " },
+      firstUserMessage: "Hello!",
+      expected: "Hello!",
+    },
+  ])("$name", ({ fields, firstUserMessage, expected }) => {
+    const entry = { sessionId: "abc123", updatedAt: Date.now(), ...fields } as SessionEntry;
+    expect(deriveSessionTitle(entry, firstUserMessage)).toBe(expected);
+  });
 });
 
 describe("resolveGatewayModelSupportsImages", () => {
diff --git a/src/gateway/session-utils.ts b/src/gateway/session-utils.ts
@@ -244,6 +244,11 @@ export function deriveSessionTitle(
     return undefined;
   }
 
+  const label = normalizeOptionalString(entry.label);
+  if (label) {
+    return label;
+  }
+
   if (normalizeOptionalString(entry.displayName)) {
     return normalizeOptionalString(entry.displayName);
   }

Original file line number	Diff line number	Diff line change
`@@ -244,6 +244,11 @@ export function deriveSessionTitle(`
`244`	`244`	`return undefined;`
`245`	`245`	`}`
`246`	`246`
	`247`	`+ const label = normalizeOptionalString(entry.label);`
	`248`	`+ if (label) {`
	`249`	`+ return label;`
	`250`	`+ }`
	`251`	`+`
`247`	`252`	`if (normalizeOptionalString(entry.displayName)) {`
`248`	`253`	`return normalizeOptionalString(entry.displayName);`
`249`	`254`	`}`