Skip to content

Fix Claude resume cwd for project paths with spaces #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aytzey merged 1 commit into from
Jul 9, 2026
Merged

Fix Claude resume cwd for project paths with spaces #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions internal/session/claude.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,9 @@ func parseClaude(path string) (Row, bool) {
}
if record.CWD != "" {
cwd = record.CWD
if launchCWD == "" {
launchCWD = existingDir(record.CWD)
}
if claudeProjectDir(record.CWD) == projectDir {
launchCWD = record.CWD
}
Expand Down
31 changes: 31 additions & 0 deletions internal/session/session_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,37 @@ func TestClaudeResumeUsesProjectBucketCWD(t *testing.T) {
}
}

func TestClaudeResumeUsesObservedCWDWhenProjectSlugIsLossy(t *testing.T) {
root := t.TempDir()
claudeHome := filepath.Join(root, "claude")
project := filepath.Join(root, "fable is arama")
if err := os.MkdirAll(project, 0o755); err != nil {
t.Fatal(err)
}
t.Setenv("CODEX_HOME", filepath.Join(root, "empty-codex"))
t.Setenv("CLAUDE_HOME", claudeHome)
t.Setenv("JCODE_HOME", filepath.Join(root, "empty-jcode"))
t.Setenv("OPENCODE_DATA_HOME", filepath.Join(root, "empty-opencode"))
t.Setenv("GEMINI_CLI_HOME", filepath.Join(root, "empty-gemini"))

sessionID := "cccccccc-1111-2222-3333-dddddddddddd"
projectDir := strings.ReplaceAll(claudeProjectDir(project), " ", "-")
writeFile(t, filepath.Join(claudeHome, "projects", projectDir, sessionID+".jsonl"), `
{"type":"user","message":{"role":"user","content":"started in project"},"timestamp":"2026-06-02T10:00:00Z","cwd":"`+project+`","sessionId":"`+sessionID+`"}
`)

rows := Discover()
if len(rows) != 1 {
t.Fatalf("expected one row, got %d", len(rows))
}
if rows[0].CWD != project {
t.Fatalf("display cwd = %q, want latest cwd %q", rows[0].CWD, project)
}
if rows[0].resumeCWD() != project {
t.Fatalf("resume cwd = %q, want observed cwd %q", rows[0].resumeCWD(), project)
}
}

func TestCodexUsesLatestTurnContextCWD(t *testing.T) {
root := t.TempDir()
codexHome := filepath.Join(root, "codex")
Expand Down