Repository navigation
Seed Claude transcripts into the target project dir on fork/resume #5943
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,161 @@ | ||
| import CMUXAgentLaunch | ||
| import Darwin | ||
| import Foundation | ||
|
|
||
| /// Seeds a Claude Code session transcript into the project dir of a new working | ||
| /// directory before a `claude --resume <id>` launch. Claude scopes resume | ||
| /// lookups to `<config>/projects/<encoded-cwd>/`, so forking or restoring a | ||
| /// conversation into a different directory fails with "No conversation found" | ||
| /// unless the transcript is copied there first. | ||
| /// https://github.com/manaflow-ai/cmux/issues/5941 | ||
| enum ClaudeSessionTranscriptSeeder { | ||
| /// Claude Code project dir name for a working directory: the absolute path | ||
| /// with every non-alphanumeric character replaced by `-`. Claude resolves | ||
| /// symlinks before encoding (Node `process.cwd()`), so `/tmp/x` is stored | ||
| /// as `-private-tmp-x`. | ||
| static func encodedProjectDirName(forWorkingDirectory workingDirectory: String) -> String { | ||
| let resolved = symlinkResolvedAbsolutePath(workingDirectory) | ||
| return String(resolved.map { character in | ||
| character.isASCII && (character.isLetter || character.isNumber) ? character : "-" | ||
| }) | ||
| } | ||
|
|
||
| /// Config dirs the session transcript may live in, most specific first. | ||
| /// The FIRST candidate is authoritative: the launch snapshot's captured | ||
| /// CLAUDE_CONFIG_DIR (re-applied via `env` on resume) when present, else | ||
| /// this process's CLAUDE_CONFIG_DIR, else `~/.claude`. Each value goes | ||
| /// through the same legacy-path preference the launch environment policy | ||
| /// applies (`ClaudeConfigDirectoryPath.preferredPath`), so the seeded root | ||
| /// is the root the resumed claude actually reads. | ||
| static func defaultConfigDirCandidates( | ||
| launchEnvironment: [String: String]?, | ||
| processEnvironment: [String: String] = ProcessInfo.processInfo.environment, | ||
| homeDirectory: URL = FileManager.default.homeDirectoryForCurrentUser, | ||
| fileManager: FileManager = .default | ||
| ) -> [URL] { | ||
| var seenPaths = Set<String>() | ||
| var candidates: [URL] = [] | ||
| func add(_ path: String?) { | ||
| guard let path, !path.trimmingCharacters(in: .whitespaces).isEmpty else { return } | ||
| let preferred = ClaudeConfigDirectoryPath.preferredPath( | ||
| path, | ||
| fileManager: fileManager, | ||
| homeDirectory: homeDirectory.path | ||
| ) | ||
| let url = URL(fileURLWithPath: preferred) | ||
| if seenPaths.insert(url.standardizedFileURL.path).inserted { | ||
| candidates.append(url) | ||
| } | ||
| } | ||
| add(launchEnvironment?["CLAUDE_CONFIG_DIR"]) | ||
| add(processEnvironment["CLAUDE_CONFIG_DIR"]) | ||
| add(homeDirectory.appendingPathComponent(".claude").path) | ||
| return candidates | ||
|
cursor[bot] marked this conversation as resolved.
|
||
| } | ||
|
|
||
| /// Copies `projects/<source>/<id>.jsonl` (and the optional `<id>/` sidecar | ||
| /// dir) into `projects/<encoded-target-cwd>/` of the FIRST candidate (the | ||
| /// config root the resumed claude reads); later candidates are searched as | ||
| /// source fallbacks only, never written to. No-op when the authoritative | ||
| /// target project dir already has the transcript. A copy rather than a | ||
| /// hardlink so concurrent resumes of the same id from two cwds cannot | ||
| /// interleave appends into one inode. Returns true when the transcript is | ||
| /// present in the authoritative target project dir after the call. | ||
| /// Best-effort: copy failures must never block the launch. | ||
| @discardableResult | ||
| static func seedIfNeeded( | ||
| sessionId: String, | ||
| targetWorkingDirectory: String, | ||
| configDirCandidates: [URL], | ||
| fileManager: FileManager = .default | ||
| ) -> Bool { | ||
| guard isPlausibleSessionId(sessionId), | ||
| let targetConfigDir = configDirCandidates.first else { | ||
| return false | ||
| } | ||
| let targetName = encodedProjectDirName(forWorkingDirectory: targetWorkingDirectory) | ||
| guard !targetName.isEmpty else { return false } | ||
| let transcriptName = "\(sessionId).jsonl" | ||
| let targetDir = targetConfigDir | ||
| .appendingPathComponent("projects") | ||
| .appendingPathComponent(targetName) | ||
| let targetTranscript = targetDir.appendingPathComponent(transcriptName) | ||
| if fileManager.fileExists(atPath: targetTranscript.path) { | ||
| return true | ||
| } | ||
|
|
||
| for configDir in configDirCandidates { | ||
| let projects = configDir.appendingPathComponent("projects") | ||
| guard let projectDirs = try? fileManager.contentsOfDirectory( | ||
| at: projects, includingPropertiesForKeys: nil) else { | ||
| continue | ||
| } | ||
| for projectDir in projectDirs { | ||
| let sourceTranscript = projectDir.appendingPathComponent(transcriptName) | ||
|
Comment on lines
+87
to
+94
There was a problem hiding this comment.
After this copy-based seeding runs once, the same Claude session id can exist in multiple Useful? React with 👍 / 👎. |
||
| guard sourceTranscript.standardizedFileURL.path != targetTranscript.standardizedFileURL.path, | ||
| isFile(at: sourceTranscript, fileManager: fileManager) else { | ||
| continue | ||
| } | ||
| do { | ||
| try fileManager.createDirectory(at: targetDir, withIntermediateDirectories: true) | ||
| try fileManager.copyItem(at: sourceTranscript, to: targetTranscript) | ||
| } catch { | ||
| continue | ||
| } | ||
| let sidecar = projectDir.appendingPathComponent(sessionId) | ||
| let sidecarTarget = targetDir.appendingPathComponent(sessionId) | ||
| if isDirectory(at: sidecar, fileManager: fileManager), | ||
| !fileManager.fileExists(atPath: sidecarTarget.path) { | ||
| try? fileManager.copyItem(at: sidecar, to: sidecarTarget) | ||
| } | ||
| return true | ||
| } | ||
| } | ||
|
Comment on lines
+87
to
+113
Contributor
There was a problem hiding this comment.
Concrete failure: original session used the default The fix is to copy into |
||
| return false | ||
|
Comment on lines
+87
to
+114
Contributor
There was a problem hiding this comment.
Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time! |
||
| } | ||
|
|
||
| /// Session ids are UUID-shaped (hex + dashes). Refusing anything else keeps | ||
| /// untrusted ids from path-escaping the projects dir. | ||
| private static func isPlausibleSessionId(_ sessionId: String) -> Bool { | ||
| !sessionId.isEmpty && sessionId.allSatisfy { character in | ||
| character == "-" || (character.isASCII && (character.isLetter || character.isNumber)) | ||
| } | ||
| } | ||
|
|
||
| private static func isFile(at url: URL, fileManager: FileManager) -> Bool { | ||
| var isDirectory: ObjCBool = false | ||
| return fileManager.fileExists(atPath: url.path, isDirectory: &isDirectory) | ||
| && !isDirectory.boolValue | ||
| } | ||
|
|
||
| private static func isDirectory(at url: URL, fileManager: FileManager) -> Bool { | ||
| var isDirectory: ObjCBool = false | ||
| return fileManager.fileExists(atPath: url.path, isDirectory: &isDirectory) | ||
| && isDirectory.boolValue | ||
| } | ||
|
|
||
| /// realpath(3)-style resolution matching Node's `process.cwd()` (keeps the | ||
| /// `/private` prefix, unlike `URL.resolvingSymlinksInPath()` which strips | ||
| /// it). When the full path does not exist, resolves the deepest existing | ||
| /// ancestor and reattaches the remaining components. | ||
| private static func symlinkResolvedAbsolutePath(_ path: String) -> String { | ||
| let standardized = URL(fileURLWithPath: path).standardized.path | ||
| var current = standardized | ||
| var unresolvedComponents: [String] = [] | ||
| while !current.isEmpty, current != "/" { | ||
| if let resolved = realpathString(current) { | ||
| return unresolvedComponents.reversed().reduce(resolved) { $0 + "/" + $1 } | ||
| } | ||
| let url = URL(fileURLWithPath: current) | ||
| unresolvedComponents.append(url.lastPathComponent) | ||
| current = url.deletingLastPathComponent().path | ||
| } | ||
| return standardized | ||
| } | ||
|
|
||
| private static func realpathString(_ path: String) -> String? { | ||
| guard let resolved = realpath(path, nil) else { return nil } | ||
| defer { free(resolved) } | ||
| return String(cString: resolved) | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For target cwd paths containing other non-alphanumeric characters such as underscores or spaces, this new encoder seeds the transcript under a different directory than the rest of cmux still treats as Claude's project directory (
RestorableAgentSessionIndex.encodeClaudeProjectDirand its tests only replace/and.). In that case the startup command stillcds into the target cwd, but the copied transcript is placed in the mismatchedprojects/<new-encoding>/bucket, soclaude --resumecan continue to report no conversation found. Please share one encoder/contract (or update all call sites/tests together) so the seed location matches the resume lookup location.Useful? React with 👍 / 👎.