ros/automaker
1
0
Fork 0
mirror of https://github.com/AutoMaker-Org/automaker.git synced 2026-02-04 21:23:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #129 from leonvanzyl/main

Browse Source 
fix: add Windows support for Claude CLI detection
This commit is contained in:
Web Dev Cody
2025-12-16 11:13:58 -05:00
committed by GitHub
parent fad3ed1aae 2ce4e02ada
commit 0d088962a0
1 changed files with 54 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
apps/server/src/routes/setup/get-claude-status.ts
View File

@@ -17,12 +17,15 @@ export async function getClaudeStatus() {
let cliPath = ""; let cliPath = "";
let method = "none"; let method = "none";
// Try to find Claude CLI const isWindows = process.platform === "win32";
// Try to find Claude CLI using platform-specific command
try { try {
const { stdout } = await execAsync( // Use 'where' on Windows, 'which' on Unix-like systems
"which claude || where claude 2>/dev/null" const findCommand = isWindows ? "where claude" : "which claude";
); const { stdout } = await execAsync(findCommand);
cliPath = stdout.trim(); // 'where' on Windows can return multiple paths - take the first one
cliPath = stdout.trim().split(/\r?\n/)[0];
installed = true; installed = true;
method = "path"; method = "path";
@@ -34,8 +37,21 @@ export async function getClaudeStatus() {
// Version command might not be available // Version command might not be available
} }
} catch { } catch {
// Not in PATH, try common locations // Not in PATH, try common locations based on platform
const commonPaths = [ const commonPaths = isWindows
? (() => {
const appData = process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming");
return [
// Windows-specific paths
path.join(os.homedir(), ".local", "bin", "claude.exe"),
path.join(appData, "npm", "claude.cmd"),
path.join(appData, "npm", "claude"),
path.join(appData, ".npm-global", "bin", "claude.cmd"),
path.join(appData, ".npm-global", "bin", "claude"),
];
})()
: [
// Unix (Linux/macOS) paths
path.join(os.homedir(), ".local", "bin", "claude"), path.join(os.homedir(), ".local", "bin", "claude"),
path.join(os.homedir(), ".claude", "local", "claude"), path.join(os.homedir(), ".claude", "local", "claude"),
"/usr/local/bin/claude", "/usr/local/bin/claude",
@@ -124,8 +140,14 @@ export async function getClaudeStatus() {
// Settings file doesn't exist // Settings file doesn't exist
} }
// Check for credentials file (OAuth tokens from claude login) - legacy/alternative auth // Check for credentials file (OAuth tokens from claude login)
const credentialsPath = path.join(claudeDir, "credentials.json"); // Note: Claude CLI may use ".credentials.json" (hidden) or "credentials.json" depending on version/platform
const credentialsPaths = [
path.join(claudeDir, ".credentials.json"),
path.join(claudeDir, "credentials.json"),
];
for (const credentialsPath of credentialsPaths) {
try { try {
const credentialsContent = await fs.readFile(credentialsPath, "utf-8"); const credentialsContent = await fs.readFile(credentialsPath, "utf-8");
const credentials = JSON.parse(credentialsContent); const credentials = JSON.parse(credentialsContent);
@@ -142,8 +164,10 @@ export async function getClaudeStatus() {
auth.authenticated = true; auth.authenticated = true;
auth.method = "api_key"; // Stored API key in credentials file auth.method = "api_key"; // Stored API key in credentials file
} }
break; // Found and processed credentials file
} catch { } catch {
// No credentials file or invalid format // No credentials file at this path or invalid format
}
} }
// Environment variables override stored credentials (higher priority) // Environment variables override stored credentials (higher priority)