fix session metadata id normalization

joshavant · joshavant · commit 453b08f66965 · 2026-05-16T01:55:28.000-05:00
diff --git a/src/config/sessions/sessions.test.ts b/src/config/sessions/sessions.test.ts
@@ -473,6 +473,23 @@ describe("session store writer queue", () => {
     expect(store["agent:main:unsafe-id"]).toBeUndefined();
   });
 
+  it("keeps metadata-only canonical sessions without treating their ids as transcript ids", async () => {
+    const { storePath } = await makeTmpStore({
+      "agent:main:metadata": {
+        sessionId: "agent:main:metadata",
+        updatedAt: Date.now(),
+        groupActivation: "always",
+      },
+    } as unknown as Record<string, SessionEntry>);
+
+    const store = loadSessionStore(storePath, { skipCache: true });
+
+    expect(store["agent:main:metadata"]).toMatchObject({
+      groupActivation: "always",
+    });
+    expect(store["agent:main:metadata"]?.sessionId).toBeUndefined();
+  });
+
   it("skips session store disk writes when payload is unchanged", async () => {
     const key = "agent:main:no-op-save";
     const { storePath } = await makeTmpStore({
diff --git a/src/config/sessions/store-entry-shape.ts b/src/config/sessions/store-entry-shape.ts
@@ -1,3 +1,4 @@
+import { validateSessionId } from "./paths.js";
 import type { SessionEntry } from "./types.js";
 
 function isRecord(value: unknown): value is Record<string, unknown> {
@@ -18,6 +19,14 @@ function isSafeSessionId(value: unknown): value is string {
   return /^[A-Za-z0-9][A-Za-z0-9._:@-]*$/.test(trimmed);
 }
 
+function normalizeTranscriptSessionId(value: string): string | undefined {
+  try {
+    return validateSessionId(value);
+  } catch {
+    return undefined;
+  }
+}
+
 function normalizeOptionalTimestamp(value: unknown): number | undefined {
   if (value === undefined) {
     return undefined;
@@ -31,12 +40,17 @@ export function normalizePersistedSessionEntryShape(value: unknown): SessionEntr
   }
 
   let next = value as unknown as SessionEntry;
+  const sessionFile = typeof value.sessionFile === "string" ? value.sessionFile.trim() : undefined;
   if (value.sessionId !== undefined) {
     if (!isSafeSessionId(value.sessionId)) {
       return undefined;
     }
     const sessionId = value.sessionId.trim();
-    if (sessionId !== value.sessionId) {
+    const transcriptSessionId = normalizeTranscriptSessionId(sessionId);
+    if (!transcriptSessionId && !sessionFile) {
+      const { sessionId: _dropSessionId, ...rest } = next;
+      next = rest as SessionEntry;
+    } else if (sessionId !== value.sessionId) {
       next = { ...next, sessionId };
     }
   }
