fix(gateway): rotate already-stale generated transcript filename on /reset (#93496)

harjothkhara · vincentkoc · web-flow · commit d7cebdc215bf · 2026-06-16T14:32:38.000+08:00
Merged via squash. Prepared head SHA: 6ae356c Co-authored-by: harjothkhara <48686985+harjothkhara@users.noreply.github.com> Co-authored-by: vincentkoc <25068+vincentkoc@users.noreply.github.com> Reviewed-by: @vincentkoc
diff --git a/src/gateway/drain-active-sessions-for-shutdown.test.ts b/src/gateway/drain-active-sessions-for-shutdown.test.ts
@@ -29,6 +29,7 @@ vi.mock("../plugins/hook-runner-global.js", () => ({
 }));
 
 vi.mock("./session-transcript-files.fs.js", () => ({
+  extractGeneratedTranscriptSessionId: vi.fn(() => undefined),
   resolveStableSessionEndTranscript: vi.fn(() => ({
     sessionFile: undefined,
     transcriptArchived: false,
diff --git a/src/gateway/server.sessions.reset-models.test.ts b/src/gateway/server.sessions.reset-models.test.ts
@@ -372,6 +372,56 @@ test("sessions.reset rotates generated topic transcript files with the new sessi
   expect(path.basename(persistedEntry?.sessionFile ?? "")).toBe(`${nextSessionId}-topic-456.jsonl`);
 });
 
+test("sessions.reset rotates an already-stale generated transcript file to the new session id", async () => {
+  const { dir, storePath } = await createSessionStoreDir();
+  // Post-upgrade state: the stored sessionFile still embeds an OLDER generated id
+  // that no longer matches the entry's logical sessionId, so rotation must key off
+  // the file's embedded id rather than the current sessionId (issue #77770).
+  const staleFileSessionId = "11111111-1111-4111-8111-111111111111";
+  const currentSessionId = "22222222-2222-4222-8222-222222222222";
+  const staleSessionFile = path.join(dir, `${staleFileSessionId}.jsonl`);
+  await fs.writeFile(staleSessionFile, `${JSON.stringify({ role: "user", content: "old" })}\n`);
+
+  await writeSessionStore({
+    entries: {
+      main: sessionStoreEntry(currentSessionId, {
+        sessionFile: staleSessionFile,
+      }),
+    },
+  });
+
+  const reset = await directSessionReq<{
+    ok: true;
+    key: string;
+    entry: {
+      sessionId: string;
+      sessionFile?: string;
+    };
+  }>("sessions.reset", { key: "main" });
+
+  expect(reset.ok).toBe(true);
+  const nextSessionId = reset.payload?.entry.sessionId;
+  const nextSessionFile = reset.payload?.entry.sessionFile;
+  if (!nextSessionId || !nextSessionFile) {
+    throw new Error("expected reset session id and file");
+  }
+  expect(nextSessionId).not.toBe(currentSessionId);
+  // The new session must adopt the new session id, not keep the stale generated name.
+  expect(path.basename(nextSessionFile)).toBe(`${nextSessionId}.jsonl`);
+  expect(path.basename(nextSessionFile)).not.toBe(`${staleFileSessionId}.jsonl`);
+
+  const store = JSON.parse(await fs.readFile(storePath, "utf-8")) as Record<
+    string,
+    {
+      sessionId?: string;
+      sessionFile?: string;
+    }
+  >;
+  const persistedEntry = store["agent:main:main"];
+  expect(persistedEntry?.sessionId).toBe(nextSessionId);
+  expect(path.basename(persistedEntry?.sessionFile ?? "")).toBe(`${nextSessionId}.jsonl`);
+});
+
 test("sessions.reset preserves legacy explicit model overrides without modelOverrideSource", async () => {
   await expectMainResetModelFields({
     defaultPrimary: "openai/gpt-test-a",
diff --git a/src/gateway/session-reset-service.ts b/src/gateway/session-reset-service.ts
@@ -61,6 +61,7 @@ import {
 import { findDirectChildSessionsForParent } from "./session-child-sessions.js";
 import {
   archiveSessionTranscriptsDetailed,
+  extractGeneratedTranscriptSessionId,
   resolveStableSessionEndTranscript,
   type ArchivedSessionTranscript,
 } from "./session-transcript-files.fs.js";
@@ -82,12 +83,16 @@ function resolveResetSessionFile(params: {
   agentId: string;
 }): string {
   const currentEntry = params.currentEntry;
-  // Preserve explicit session-file placement across reset while swapping the
-  // embedded session id, so linked runtimes keep writing beside old transcripts.
-  const rewrittenSessionFile = currentEntry?.sessionId
+  // Rotate generated transcript names by the file's *embedded* id, not the logical
+  // session id: a post-upgrade sessionFile can embed a stale id, so keying off
+  // currentEntry.sessionId would orphan the reset session on the old file. Explicit
+  // custom placements have no embedded id and stay preserved.
+  const rotationPreviousSessionId =
+    extractGeneratedTranscriptSessionId(currentEntry?.sessionFile) ?? currentEntry?.sessionId;
+  const rewrittenSessionFile = rotationPreviousSessionId
     ? rewriteSessionFileForNewSessionId({
-        sessionFile: currentEntry.sessionFile,
-        previousSessionId: currentEntry.sessionId,
+        sessionFile: currentEntry?.sessionFile,
+        previousSessionId: rotationPreviousSessionId,
         nextSessionId: params.nextSessionId,
       })
     : undefined;
diff --git a/src/gateway/session-transcript-files.fs.ts b/src/gateway/session-transcript-files.fs.ts
@@ -106,7 +106,7 @@ function classifySessionTranscriptCandidate(
   return transcriptSessionId === sessionId ? "current" : "stale";
 }
 
-function extractGeneratedTranscriptSessionId(sessionFile?: string): string | undefined {
+export function extractGeneratedTranscriptSessionId(sessionFile?: string): string | undefined {
   const trimmed = sessionFile?.trim();
   if (!trimmed) {
     return undefined;

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ function classifySessionTranscriptCandidate(`
`106`	`106`	`return transcriptSessionId === sessionId ? "current" : "stale";`
`107`	`107`	`}`
`108`	`108`
`109`		`-function extractGeneratedTranscriptSessionId(sessionFile?: string): string \| undefined {`
	`109`	`+export function extractGeneratedTranscriptSessionId(sessionFile?: string): string \| undefined {`
`110`	`110`	`const trimmed = sessionFile?.trim();`
`111`	`111`	`if (!trimmed) {`
`112`	`112`	`return undefined;`