fix(session): filter by header cwd instead of changing directory encoding

liuhao1024 · liuhao1024 · commit 539152e6f417 · 2026-06-29T10:41:26.000+08:00
Revert the ~D escape scheme in getDefaultSessionDir and instead fix
cross-project session collision by filtering on the session header's
cwd field in continueRecent and list. This preserves existing session
directory paths during upgrade while preventing sessions from one
project from leaking into another when the directory encoding collides.

- Revert getDefaultSessionDir to original encoding (preserves existing dirs)
- Keep cwd verification in continueRecent (skips mismatched sessions)
- Add cwd filtering in list (excludes sessions from other projects)
- Add regression tests for list cwd filtering and legacy empty-cwd sessions
- Remove injective encoding tests (encoding unchanged from shipped behavior)
diff --git a/src/agents/sessions/session-manager.test.ts b/src/agents/sessions/session-manager.test.ts
@@ -12,7 +12,6 @@ import { repairSessionFileIfNeeded } from "../session-file-repair.js";
 import {
   CURRENT_SESSION_VERSION,
   findMostRecentSession,
-  getDefaultSessionDir,
   loadEntriesFromFile,
   SessionManager,
   type SessionEntry,
@@ -2518,30 +2517,6 @@ function buildMessageEntry(index: number, parentId: string | null): SessionEntry
   };
 }
 
-describe("getDefaultSessionDir encoding", () => {
-  it("produces distinct dirs for paths differing only by separator", async () => {
-    const agentDir = await makeTempDir();
-    const dirA = getDefaultSessionDir("/home/alice/dev/client/app", agentDir);
-    const dirB = getDefaultSessionDir("/home/alice/dev/client-app", agentDir);
-    expect(dirA).not.toBe(dirB);
-  });
-
-  it("produces distinct dirs for paths differing by trailing separator", async () => {
-    const agentDir = await makeTempDir();
-    const dirA = getDefaultSessionDir("/home/alice/dev", agentDir);
-    const dirB = getDefaultSessionDir("/home/alice/dev/", agentDir);
-    // Trailing separator is stripped, so these should be the same
-    expect(dirA).toBe(dirB);
-  });
-
-  it("is deterministic for the same input", async () => {
-    const agentDir = await makeTempDir();
-    const dir1 = getDefaultSessionDir("/home/alice/dev/client/app", agentDir);
-    const dir2 = getDefaultSessionDir("/home/alice/dev/client/app", agentDir);
-    expect(dir1).toBe(dir2);
-  });
-});
-
 describe("SessionManager.continueRecent cwd verification", () => {
   it("skips session whose header cwd does not match requested cwd", async () => {
     const agentDir = await makeTempDir();
@@ -2575,3 +2550,46 @@ describe("SessionManager.continueRecent cwd verification", () => {
     expect(sm.getSessionId()).toBe("sess-a");
   });
 });
+
+describe("SessionManager.list cwd filtering", () => {
+  it("filters out sessions whose header cwd does not match requested cwd", async () => {
+    const agentDir = await makeTempDir();
+    const sessionDir = path.join(agentDir, "sessions", "test-list-filter");
+    await fs.mkdir(sessionDir, { recursive: true });
+
+    // Write two sessions in the same directory with different cwds
+    const headerA = buildSessionHeader("/project-a", "sess-a");
+    const fileA = path.join(sessionDir, "2026-06-24T10-00-00_A.jsonl");
+    writeFileSync(fileA, JSON.stringify(headerA) + "\n");
+
+    const headerB = buildSessionHeader("/project-b", "sess-b");
+    const fileB = path.join(sessionDir, "2026-06-24T11-00-00_B.jsonl");
+    writeFileSync(fileB, JSON.stringify(headerB) + "\n");
+
+    // List with cwd = "/project-a" — should only see sess-a
+    const sessions = await SessionManager.list("/project-a", sessionDir);
+    expect(sessions).toHaveLength(1);
+    expect(sessions[0].id).toBe("sess-a");
+  });
+
+  it("includes sessions with empty cwd for backward compatibility", async () => {
+    const agentDir = await makeTempDir();
+    const sessionDir = path.join(agentDir, "sessions", "test-list-legacy");
+    await fs.mkdir(sessionDir, { recursive: true });
+
+    // Write a session without a cwd field (legacy session)
+    const header = {
+      type: "session",
+      version: CURRENT_SESSION_VERSION,
+      id: "legacy-sess",
+      timestamp: "2026-06-24T10:00:00.000Z",
+    };
+    const file = path.join(sessionDir, "2026-06-24T10-00-00_L.jsonl");
+    writeFileSync(file, JSON.stringify(header) + "\n");
+
+    // List should include legacy sessions (empty cwd is accepted)
+    const sessions = await SessionManager.list("/any-cwd", sessionDir);
+    expect(sessions).toHaveLength(1);
+    expect(sessions[0].id).toBe("legacy-sess");
+  });
+});
diff --git a/src/agents/sessions/session-manager.ts b/src/agents/sessions/session-manager.ts
@@ -437,15 +437,7 @@ export function buildSessionContext(
  * Encodes cwd into a safe directory name under ~/.openclaw/agent/sessions/.
  */
 export function getDefaultSessionDir(cwd: string, agentDir: string = getDefaultAgentDir()): string {
-  // Use an injective encoding so that paths differing only by separator
-  // (e.g. client/app vs client-app) produce distinct session directories.
-  // Strip leading/trailing separators, escape literal "--", then replace
-  // internal separators with "--".
-  const safePath = `--${cwd
-    .replace(/^[/\\\\]/, "")
-    .replace(/[/\\\\]$/, "")
-    .replace(/--/g, "~D")
-    .replace(/[/\\\\:]/g, "--")}--`;
+  const safePath = `--${cwd.replace(/^[/\\]/, "").replace(/[/\\:]/g, "-")}--`;
   const sessionDir = join(agentDir, "sessions", safePath);
   if (!existsSync(sessionDir)) {
     mkdirSync(sessionDir, { recursive: true });
@@ -3013,8 +3005,13 @@ export class SessionManager {
   ): Promise<SessionInfo[]> {
     const dir = sessionDir ?? getDefaultSessionDir(cwd);
     const sessions = await listSessionsFromDir(dir, onProgress);
-    sessions.sort((a, b) => b.modified.getTime() - a.modified.getTime());
-    return sessions;
+    // Filter out sessions whose header cwd does not match the requested cwd.
+    // The default session directory encoding is not injective (e.g. client/app
+    // and client-app share the same directory), so cwd-aware filtering prevents
+    // cross-project session leakage.
+    const filtered = sessions.filter((s) => !s.cwd || s.cwd === cwd);
+    filtered.sort((a, b) => b.modified.getTime() - a.modified.getTime());
+    return filtered;
   }
 
   /**
