Skip to content

fix: handle missing ~/.claude directory and canonicalization errors gracefully #344

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −4
Open

fix: handle missing ~/.claude directory and canonicalization errors gracefully #344

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
21 changes: 17 additions & 4 deletions src-tauri/src/commands/claude.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,24 @@ fn find_claude_binary(app_handle: &AppHandle) -> Result<String, String> {

/// Gets the path to the ~/.claude directory
fn get_claude_dir() -> Result<PathBuf> {
dirs::home_dir()
let claude_path = dirs::home_dir()
.context("Could not find home directory")?
.join(".claude")
.canonicalize()
.context("Could not find ~/.claude directory")
.join(".claude");

// First check if the directory exists
if !claude_path.exists() {
return Err(anyhow::anyhow!("~/.claude directory does not exist"));
}

// Try to canonicalize, but fall back to the original path if it fails
match claude_path.canonicalize() {
Ok(canonical_path) => Ok(canonical_path),
Err(_) => {
// If canonicalize fails but the directory exists, use the original path
log::warn!("Could not canonicalize ~/.claude path, using original path");
Ok(claude_path)
}
}
}

/// Gets the actual project path by reading the cwd from the first JSONL entry
Expand Down