fix(session): keep shipped session dir key, rely on cwd verification

krissding · claude · krissding · commit 7a83b0cfe85c · 2026-06-30T10:03:50.000+08:00
Revert the percent-encoding change of the default session directory key. Changing the key would make existing project transcripts invisible after upgrade without migration. Literal percent-escapes in cwd paths (e.g. /home/a%2Fb) would also collide with the encoded separators. The continueRecent cwd-verification guard already prevents wrong-project resume when two cwds map to the same safe-path — keep the shipped key and let the header.cwd check handle collisions. ClawSweeper: keep shipped key, cwd verify (#96906) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
diff --git a/src/agents/sessions/session-manager.ts b/src/agents/sessions/session-manager.ts
@@ -437,14 +437,10 @@ export function buildSessionContext(
  * Encodes cwd into a safe directory name under ~/.openclaw/agent/sessions/.
  */
 export function getDefaultSessionDir(cwd: string, agentDir: string = getDefaultAgentDir()): string {
-  // Percent-encode path separators so distinct cwds never collide on encoding.
-  // Previously '/' '\\' ':' all mapped to '-', causing /home/a/b-c and
-  // /home/a/b/c to share one session directory (#96542).
-  const safePath = `--${cwd.replace(/^[/\\]/, "").replace(/[/\\:]/g, (ch) => {
-    if (ch === "/") return "%2F";
-    if (ch === "\\") return "%5C";
-    return "%3A";
-  })}--`;
+  // Pairwise-cwd collisions (e.g. /home/a/b-c vs /home/a/b/c mapping to the
+  // same safe-path) are caught by the header-cwd verification in continueRecent,
+  // so the session directory key does not need to be injective (#96542).
+  const safePath = `--${cwd.replace(/^[/\\]/, "").replace(/[/\\:]/g, "-")}--`;
   const sessionDir = join(agentDir, "sessions", safePath);
   if (!existsSync(sessionDir)) {
     mkdirSync(sessionDir, { recursive: true });
