d0zingcat/claude-code
1
0
Fork 0
mirror of https://github.com/instructkr/claude-code.git synced 2026-06-05 12:06:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: strip macOS /private symlink prefix from JSON cwd (#421)

Browse Source 
Add friendly_cwd() helper that strips /private prefix on macOS so
status, doctor, and diff JSON output matches user-visible invocation
cwd instead of the canonicalized /private/tmp path.

Applied to status_context() and render_doctor_report().

Generated with https://github.com/Yeachan-Heo/gajae-code
Co-authored-by: Gajae Code <dev@gajae-code.com>
This commit is contained in:
bellman
2026-06-05 09:08:09 +09:00
parent f0e10ff182
commit 04f18862a8
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
rust/crates/rusty-claude-cli/src/main.rs
View File

@@ -1121,7 +1121,7 @@ fn run() -> Result<(), Box<dyn std::error::Error>> {
println!("{}", render_diff_report()?);
}
CliOutputFormat::Json => {
let cwd = env::current_dir()?;
let cwd = friendly_cwd(env::current_dir()?);
println!(
"{}",
serde_json::to_string_pretty(&render_diff_json_for(&cwd)?)?
@@ -3608,7 +3608,7 @@ fn render_doctor_report(
config_warning_mode: ConfigWarningMode,
permission_mode: PermissionModeProvenance,
) -> Result<DoctorReport, Box<dyn std::error::Error>> {
let cwd = env::current_dir()?;
let cwd = friendly_cwd(env::current_dir()?);
let config_loader = ConfigLoader::default_for(&cwd);
let config = load_config_with_warning_mode(&config_loader, config_warning_mode);
let discovered_config = config_loader.discover();
@@ -9589,10 +9589,25 @@ fn status_json_value(
})
}
/// #421: Strip macOS `/private` symlink prefix from paths so that
/// `status`, `doctor`, and `mcp list` JSON output matches the
/// user-visible invocation cwd instead of the canonicalized path.
fn friendly_cwd(path: PathBuf) -> PathBuf {
#[cfg(target_os = "macos")]
{
if let Ok(stripped) = path.strip_prefix("/private") {
if stripped.is_absolute() {
return stripped.to_path_buf();
}
}
}
path
}
fn status_context(
session_path: Option<&Path>,
) -> Result<StatusContext, Box<dyn std::error::Error>> {
let cwd = env::current_dir()?;
let cwd = friendly_cwd(env::current_dir()?);
let loader = ConfigLoader::default_for(&cwd);
// #456: count only paths that exist on disk, matching check_config_health behavior.
let discovered_config_files = loader.discover().iter().filter(|e| e.path.exists()).count();