generated from nhcarrigan/template
fix: read/write global CLAUDE.md via WSL on Windows
dirs::home_dir() returns the Windows home (C:\Users\accou) on Windows builds, but the global CLAUDE.md lives in the WSL home directory. Route both get_global_claude_md and save_global_claude_md through WSL on Windows, matching the pattern used by list_skills and list_memory_files.
This commit is contained in:
@@ -2618,10 +2618,67 @@ pub async fn open_binary_file(app: AppHandle, path: String) -> Result<(), String
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Read `~/.claude/CLAUDE.md` via WSL (for Windows).
|
||||||
|
/// Returns an empty string if the file does not exist.
|
||||||
|
#[cfg(target_os = "windows")]
|
||||||
|
async fn get_global_claude_md_via_wsl() -> Result<String, String> {
|
||||||
|
use std::process::Command;
|
||||||
|
|
||||||
|
let output = Command::new("wsl")
|
||||||
|
.hide_window()
|
||||||
|
.args(["-e", "bash", "-l", "-c", "cat ~/.claude/CLAUDE.md 2>/dev/null || true"])
|
||||||
|
.output()
|
||||||
|
.map_err(|e| format!("Failed to execute WSL command: {}", e))?;
|
||||||
|
|
||||||
|
Ok(String::from_utf8_lossy(&output.stdout).to_string())
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Write content to `~/.claude/CLAUDE.md` via WSL (for Windows).
|
||||||
|
/// Creates the file (and `~/.claude/` directory) if they do not exist.
|
||||||
|
#[cfg(target_os = "windows")]
|
||||||
|
async fn save_global_claude_md_via_wsl(content: String) -> Result<(), String> {
|
||||||
|
use std::io::Write;
|
||||||
|
use std::process::{Command, Stdio};
|
||||||
|
|
||||||
|
let mut child = Command::new("wsl")
|
||||||
|
.hide_window()
|
||||||
|
.args([
|
||||||
|
"-e",
|
||||||
|
"bash",
|
||||||
|
"-l",
|
||||||
|
"-c",
|
||||||
|
"mkdir -p ~/.claude && cat > ~/.claude/CLAUDE.md",
|
||||||
|
])
|
||||||
|
.stdin(Stdio::piped())
|
||||||
|
.spawn()
|
||||||
|
.map_err(|e| format!("Failed to execute WSL command: {}", e))?;
|
||||||
|
|
||||||
|
if let Some(stdin) = child.stdin.as_mut() {
|
||||||
|
stdin
|
||||||
|
.write_all(content.as_bytes())
|
||||||
|
.map_err(|e| format!("Failed to write content to WSL stdin: {}", e))?;
|
||||||
|
}
|
||||||
|
|
||||||
|
let status = child
|
||||||
|
.wait()
|
||||||
|
.map_err(|e| format!("Failed to wait for WSL command: {}", e))?;
|
||||||
|
|
||||||
|
if !status.success() {
|
||||||
|
return Err("Failed to save CLAUDE.md via WSL".to_string());
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
/// Read the contents of `~/.claude/CLAUDE.md`.
|
/// Read the contents of `~/.claude/CLAUDE.md`.
|
||||||
/// Returns an empty string if the file does not exist.
|
/// Returns an empty string if the file does not exist.
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn get_global_claude_md() -> Result<String, String> {
|
pub async fn get_global_claude_md() -> Result<String, String> {
|
||||||
|
#[cfg(target_os = "windows")]
|
||||||
|
return get_global_claude_md_via_wsl().await;
|
||||||
|
|
||||||
|
#[cfg(not(target_os = "windows"))]
|
||||||
|
{
|
||||||
let path = dirs::home_dir()
|
let path = dirs::home_dir()
|
||||||
.ok_or_else(|| "Could not determine home directory".to_string())?
|
.ok_or_else(|| "Could not determine home directory".to_string())?
|
||||||
.join(".claude")
|
.join(".claude")
|
||||||
@@ -2633,11 +2690,17 @@ pub async fn get_global_claude_md() -> Result<String, String> {
|
|||||||
|
|
||||||
std::fs::read_to_string(&path).map_err(|e| format!("Failed to read CLAUDE.md: {}", e))
|
std::fs::read_to_string(&path).map_err(|e| format!("Failed to read CLAUDE.md: {}", e))
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Write content to `~/.claude/CLAUDE.md`.
|
/// Write content to `~/.claude/CLAUDE.md`.
|
||||||
/// Creates the file (and `~/.claude/` directory) if they do not exist.
|
/// Creates the file (and `~/.claude/` directory) if they do not exist.
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn save_global_claude_md(content: String) -> Result<(), String> {
|
pub async fn save_global_claude_md(content: String) -> Result<(), String> {
|
||||||
|
#[cfg(target_os = "windows")]
|
||||||
|
return save_global_claude_md_via_wsl(content).await;
|
||||||
|
|
||||||
|
#[cfg(not(target_os = "windows"))]
|
||||||
|
{
|
||||||
let claude_dir = dirs::home_dir()
|
let claude_dir = dirs::home_dir()
|
||||||
.ok_or_else(|| "Could not determine home directory".to_string())?
|
.ok_or_else(|| "Could not determine home directory".to_string())?
|
||||||
.join(".claude");
|
.join(".claude");
|
||||||
@@ -2650,6 +2713,7 @@ pub async fn save_global_claude_md(content: String) -> Result<(), String> {
|
|||||||
let path = claude_dir.join("CLAUDE.md");
|
let path = claude_dir.join("CLAUDE.md");
|
||||||
std::fs::write(&path, content).map_err(|e| format!("Failed to write CLAUDE.md: {}", e))
|
std::fs::write(&path, content).map_err(|e| format!("Failed to write CLAUDE.md: {}", e))
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
|
|||||||
Reference in New Issue
Block a user