fix(session-sync): back up Claude sessions from CLAUDE_CONFIG_DIR

.changeset/session-sync-claude-config-dir.md

@@ -0,0 +1,16 @@
+---
+"@prover-coder-ai/docker-git-session-sync": patch
+---
+
+Back up Claude Code sessions from the resolved `CLAUDE_CONFIG_DIR` (issue #422).
+
+docker-git points Claude Code at a custom `CLAUDE_CONFIG_DIR`
+(`~/.docker-git/.orch/auth/claude/<label>`), so Claude writes chat transcripts to
+`$CLAUDE_CONFIG_DIR/projects` instead of `~/.claude/projects`. The session backup
+only scanned the home-relative paths, so the `.claude` folder in the
+`docker-git-sessions` backup repo stayed empty.
+
+The backup now resolves each session root from its agent environment override
+(`CLAUDE_CONFIG_DIR` for Claude, `CODEX_HOME` for Codex) and falls back to the
+home-relative directory when the override is unset, keeping the logical
+`.claude/projects` / `.codex/sessions` names stable in the backup repo.

packages/app/src/docker-git/api-client-auth.ts

@@ -18,11 +18,11 @@ import { request, requestTextStream, requestVoid } from "./api-http.js"
 import { asObject, type JsonRequest, type JsonValue } from "./api-json.js"
 import type { ControllerRuntime } from "./controller.js"
 import type {
+  AuthClaudeStatusCommand,
   AuthCodexImportCommand,
   AuthCodexLoginCommand,
   AuthCodexLogoutCommand,
   AuthCodexStatusCommand,
-  AuthClaudeStatusCommand,
   AuthGithubLoginCommand,
   AuthGithubLogoutCommand,
   AuthGithubStatusCommand,

packages/app/src/docker-git/api-client.ts

@@ -24,11 +24,11 @@ import type {
 import type { ApiRequestError } from "./host-errors.js"
 
 export {
+  claudeStatus,
   codexImport,
   codexLogin,
   codexLogout,
   codexStatus,
-  claudeStatus,
   githubLogin,
   githubLogout,
   githubStatus,

packages/app/src/docker-git/controller-compose-files.ts

@@ -133,5 +133,10 @@ export const composeFilesForGpuMode = (
   gpuMode === "none"
     ? Effect.succeed({ composePath, extraOverlayPath: null, gpuOverlayPath: null, runtimeOverlayPath: null })
     : requireGpuOverlayPath(composePath).pipe(
-      Effect.map((gpuOverlayPath) => ({ composePath, extraOverlayPath: null, gpuOverlayPath, runtimeOverlayPath: null }))
+      Effect.map((gpuOverlayPath) => ({
+        composePath,
+        extraOverlayPath: null,
+        gpuOverlayPath,
+        runtimeOverlayPath: null
+      }))
     )

packages/app/src/docker-git/controller-compose.ts

@@ -5,9 +5,9 @@ import * as Path from "@effect/platform/Path"
 import { Duration, Effect } from "effect"
 
 import {
+  composeFilesForGpuMode,
   type ControllerComposeFiles,
   type ControllerGpuMode,
-  composeFilesForGpuMode,
   controllerGpuModeEnvKey,
   loadControllerComposeExtraPath
 } from "./controller-compose-files.js"

packages/app/src/docker-git/program-auth.ts

@@ -2,11 +2,11 @@ import { Effect, Match, pipe } from "effect"
 
 import {
   type ApiTerminalSession,
+  claudeStatus,
   codexImport,
   codexLogin,
   codexLogout,
   codexStatus,
-  claudeStatus,
   createAuthTerminalSession,
   githubLogin,
   githubLogout,

packages/app/tests/docker-git/controller-compose.test.ts

@@ -17,13 +17,13 @@ import {
 import { runCompose } from "../../src/docker-git/controller-docker.js"
 import { controllerDockerRuntimeEnvKey } from "../../src/docker-git/controller-runtime.js"
 import {
-  type ControllerBuildSkillerFixtureMode,
-  type PrepareRevisionFixture,
-  type PreparedRevision,
   assertControllerComposeProperty,
+  type ControllerBuildSkillerFixtureMode,
   controllerDockerRuntimeEnvFixtureModeArbitrary,
   controllerRevisionPattern,
   expectedSkillerSubmoduleCommand,
+  type PreparedRevision,
+  type PrepareRevisionFixture,
   prepareRevisionFixtureArbitrary,
   prepareRevisionInTemporaryRoot,
   recordedCommandExecutorLayer,

packages/docker-git-session-sync/src/backup.ts

@@ -15,6 +15,8 @@
   isPathWithinParent,
   isChatTranscriptPath,
   sessionDirNames,
+  sessionRootCandidatePaths,
+  sessionRootSpecs,
   sessionWalkIgnoreDirNames,
   shouldIgnoreSessionPath,
   sortSessionFiles,
@@ -235,9 +237,16 @@
 
 const getAllowedSessionRoots = (): ReadonlyArray<SessionDir> => {
   const homeDir = os.homedir()
-  return sessionDirNames
-    .map((dirName) => ({ name: dirName, path: path.join(homeDir, dirName) }))
-    .filter((entry) => fs.existsSync(entry.path))
+  const roots: Array<SessionDir> = []
+  for (const spec of sessionRootSpecs) {
+    const existing = sessionRootCandidatePaths(spec, homeDir, process.env).find((candidatePath) =>
+      fs.existsSync(candidatePath)
+    )
+    if (existing !== undefined) {
+      roots.push({ name: spec.name, path: existing })
+    }
+  }
+  return roots
 }
 
 const resolveAllowedSessionDir = (
@@ -311,7 +320,7 @@
       if (!entry.isFile()) {
         continue
       }
       try {
         const stats = fs.statSync(fullPath)
         const logicalName = path.posix.join(baseName, logicalRelPath)
         if (!isChatTranscriptPath(logicalName)) {
@@ -493,7 +502,7 @@
 ): number => {
   const verbose = context.verbose
   const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "session-sync-repo-"))
   try {
     const sessionDirs = findSessionDirs(context.sessionDir, verbose, output)
     if (sessionDirs.length === 0) {
       logVerbose(verbose, output, "No session directories found")
@@ -594,7 +603,7 @@
   if (readyFilePath === null) {
     return
   }
   try {
     fs.writeFileSync(readyFilePath, `${JSON.stringify(state)}\n`, "utf8")
   } catch {
     // The parent process also has a timeout fallback; failure to write this
@@ -647,7 +656,7 @@
     args.push("--verbose")
   }
   const command = entrypoint === null ? "docker-git-session-sync" : process.execPath
   try {
     const child = spawn(command, args, {
       cwd: context.cwd,
       detached: true,
@@ -692,7 +701,7 @@
     return 1
   }
   const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), "session-sync-repo-"))
   try {
     const sessionDirs = findSessionDirs(options.sessionDir, verbose, output)
     const sessionFiles = sessionDirs.flatMap((dir) => collectSessionFiles(dir.path, dir.name, verbose, output))
     const prepared = prepareUploadArtifacts(
@@ -787,7 +796,7 @@
 export const uploadFromContext = (options: UploadOptions, cwd: string, output: Output): number => {
   const contextPath = path.resolve(cwd, options.contextPath)
   const readyFilePath = options.readyFilePath === null ? null : path.resolve(cwd, options.readyFilePath)
   try {
     const parsed = parseUploadContext(JSON.parse(fs.readFileSync(contextPath, "utf8")))
     if (parsed === null) {
       writeBackgroundReadyState(readyFilePath, { state: "failed", message: "Invalid upload context" })

packages/docker-git-session-sync/src/cli.ts

@@ -12,7 +12,7 @@ const usageText = `Usage:
   docker-git-session-sync download <snapshot-ref> [options]
 
 Options:
-  --session-dir <path>    Path under ~/.codex/sessions or ~/.claude/projects
+  --session-dir <path>    Path under \${CODEX_HOME:-~/.codex}/sessions or \${CLAUDE_CONFIG_DIR:-~/.claude}/projects
   --pr-number <number>    Open PR number to post comment to
   --repo <owner/repo>     Source repository or list filter
   --limit <number>        Maximum snapshots to list (default: 20)

packages/docker-git-session-sync/src/core.ts

@@ -16,7 +16,51 @@ export const backupDefaultBranch = "main"
 export const chunkManifestSuffix = ".chunks.json"
 export const maxRepoFileSize = 20 * 1000 * 1000
 export const maxPushBatchBytes = 50 * 1000 * 1000
-export const sessionDirNames: ReadonlyArray<string> = [".codex/sessions", ".claude/projects"]
+// CHANGE: Resolve session roots from agent env overrides (CLAUDE_CONFIG_DIR / CODEX_HOME).
+// WHY: docker-git points Claude Code at a custom CLAUDE_CONFIG_DIR, so chat transcripts land in
+//      "$CLAUDE_CONFIG_DIR/projects" rather than "~/.claude/projects". The backup only scanned the
+//      home-relative paths, so the Claude folder in the backup repo stayed empty (issue #422).
+// QUOTE(ТЗ): "Почему сессии от claude code не созраняются ... Папка claude вообще пустая"
+// REF: issue-422
+// SOURCE: n/a
+// FORMAT THEOREM: ∀spec,home,env: candidatePaths(spec) prefers env override base then home base.
+// PURITY: CORE
+// EFFECT: none
+// INVARIANT: logical session name is stable regardless of which physical base is used.
+// COMPLEXITY: O(1)
+export interface SessionRootSpec {
+  // Logical name used inside the backup repo (e.g. ".claude/projects").
+  readonly name: string
+  // Environment variable that overrides the base directory, when set and non-empty.
+  readonly envVar: string | null
+  // Sub-directory holding chat transcripts within the base directory.
+  readonly subDir: string
+  // Base directory relative to the user home when the env override is absent.
+  readonly homeBase: string
+}
+
+export const sessionRootSpecs: ReadonlyArray<SessionRootSpec> = [
+  { name: ".codex/sessions", envVar: "CODEX_HOME", subDir: "sessions", homeBase: ".codex" },
+  { name: ".claude/projects", envVar: "CLAUDE_CONFIG_DIR", subDir: "projects", homeBase: ".claude" }
+]
+
+export const sessionDirNames: ReadonlyArray<string> = sessionRootSpecs.map((spec) => spec.name)
+
+export const sessionRootCandidatePaths = (
+  spec: SessionRootSpec,
+  homeDir: string,
+  env: Readonly<Record<string, string | undefined>>
+): ReadonlyArray<string> => {
+  const homePath = path.join(homeDir, spec.homeBase, spec.subDir)
+  const override = spec.envVar === null ? undefined : env[spec.envVar]
+  const trimmed = typeof override === "string" ? override.trim() : ""
+  if (trimmed.length === 0) {
+    return [homePath]
+  }
+  const overridePath = path.join(trimmed, spec.subDir)
+  return overridePath === homePath ? [homePath] : [overridePath, homePath]
+}
+
 export const sessionWalkIgnoreDirNames: ReadonlySet<string> = new Set([".git", "node_modules", "tmp"])
 export const githubEnvKeys: ReadonlyArray<string> = ["GITHUB_TOKEN", "GH_TOKEN"]
 

packages/docker-git-session-sync/src/snapshots.ts

@@ -183,7 +183,7 @@ export const downloadSnapshot = (options: DownloadOptions, cwd: string, output:
 
   output.out(`Downloaded snapshot to: ${outputPath}`)
   output.out("\nTo restore session files, copy them to the appropriate location:")
-  output.out("  - .codex/sessions/... -> ~/.codex/sessions/")
-  output.out("  - .claude/projects/... -> ~/.claude/projects/")
+  output.out("  - .codex/sessions/... -> ${CODEX_HOME:-~/.codex}/sessions/")
+  output.out("  - .claude/projects/... -> ${CLAUDE_CONFIG_DIR:-~/.claude}/projects/")
   return 0
 }

packages/docker-git-session-sync/tests/session-files.test.ts

@@ -11,6 +11,8 @@ import {
   formatTokenReduction,
   isChatTranscriptPath,
   maxRepoFileSize,
+  sessionRootCandidatePaths,
+  sessionRootSpecs,
   shouldIgnoreSessionPath,
   summarizeTokenReduction
 } from "../src/core.js"
@@ -146,6 +148,61 @@ describe("session path filtering", () => {
   })
 })
 
+describe("session root resolution", () => {
+  const codexSpec = sessionRootSpecs.find((spec) => spec.name === ".codex/sessions")
+  const claudeSpec = sessionRootSpecs.find((spec) => spec.name === ".claude/projects")
+
+  it("resolves Claude session roots from CLAUDE_CONFIG_DIR (issue #422)", () => {
+    expect(claudeSpec).toBeDefined()
+    if (claudeSpec === undefined) {
+      return
+    }
+    const configDir = path.join(tmpDir, ".docker-git", ".orch", "auth", "claude", "default")
+    const candidates = sessionRootCandidatePaths(claudeSpec, "/home/dev", {
+      CLAUDE_CONFIG_DIR: configDir
+    })
+
+    // The env override wins, but the home-relative path stays as a fallback.
+    expect(candidates).toEqual([
+      path.join(configDir, "projects"),
+      path.join("/home/dev", ".claude", "projects")
+    ])
+  })
+
+  it("falls back to the home directory when the env override is empty", () => {
+    expect(codexSpec).toBeDefined()
+    if (codexSpec === undefined || claudeSpec === undefined) {
+      return
+    }
+    expect(sessionRootCandidatePaths(codexSpec, "/home/dev", {})).toEqual([
+      path.join("/home/dev", ".codex", "sessions")
+    ])
+    expect(sessionRootCandidatePaths(claudeSpec, "/home/dev", { CLAUDE_CONFIG_DIR: "   " })).toEqual([
+      path.join("/home/dev", ".claude", "projects")
+    ])
+  })
+
+  it("resolves Codex session roots from CODEX_HOME", () => {
+    if (codexSpec === undefined) {
+      return
+    }
+    const codexHome = path.join(tmpDir, "codex-home")
+    expect(sessionRootCandidatePaths(codexSpec, "/home/dev", { CODEX_HOME: codexHome })).toEqual([
+      path.join(codexHome, "sessions"),
+      path.join("/home/dev", ".codex", "sessions")
+    ])
+  })
+
+  it("collapses to a single candidate when the override matches the home path", () => {
+    if (claudeSpec === undefined) {
+      return
+    }
+    expect(
+      sessionRootCandidatePaths(claudeSpec, "/home/dev", { CLAUDE_CONFIG_DIR: "/home/dev/.claude" })
+    ).toEqual([path.join("/home/dev", ".claude", "projects")])
+  })
+})
+
 describe("snapshot refs", () => {
   it("uses stable current refs for PR and branch snapshots", () => {
     expect(buildSnapshotRef("org/repo", 230, "issue-230")).toBe("org/repo/pr-230/current")