Skip to content

Fix Windows path resolution for claude-trace and claude-bridge #58

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
kerwin612 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Windows path resolution for claude-trace and claude-bridge #58

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
98 changes: 86 additions & 12 deletions apps/claude-bridge/src/cli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,6 +410,60 @@ function validateProviderAndModel(provider?: string, model?: string): { provider
return { provider, model };
}

/**
* Convert MSYS2/Git Bash style paths to Windows paths
* E.g., /c/Users/name/path -> C:\Users\name\path
*/
function convertMsys2Path(inputPath: string): string {
// Check if it's a MSYS2/Git Bash style path (e.g., /c/users/...)
const msys2Match = inputPath.match(/^\/([a-zA-Z])\/(.*)/);
if (msys2Match) {
const drive = msys2Match[1].toUpperCase();
const rest = msys2Match[2];
return `${drive}:\\${rest.replace(/\//g, "\\")}`;
}
return inputPath;
}

/**
* Extract JS file path from npm bash shim script
* Looks for patterns like: $basedir/...cli.js or "path/to/cli.js"
*/
function extractJsFromBashScript(scriptContent: string, baseDir: string): string | null {
// Try to find JS file reference patterns
const patterns = [
// Pattern 1: basedir/node_modules/.../cli.js
/\$basedir\/(.+?\.js)/,
// Pattern 2: Direct quoted paths
/"([^"]+\.js)"/,
// Pattern 3: Unquoted paths
/([a-zA-Z]:\/[^\s]+\.js)/,
/([a-zA-Z]:\\[^\s]+\.js)/,
];

for (const pattern of patterns) {
const match = scriptContent.match(pattern);
if (match && match[1]) {
let jsPath = match[1];

// If it's a basedir reference, resolve it
if (jsPath.includes("$basedir")) {
jsPath = jsPath.replace(/\$basedir/, baseDir);
}

// Convert to Windows path if needed
jsPath = convertMsys2Path(jsPath);

// Verify the file exists
if (fs.existsSync(jsPath)) {
return jsPath;
}
}
}

return null;
}

function resolveToJsFile(filePath: string): string {
try {
// First, resolve any symlinks
Expand Down Expand Up @@ -470,22 +524,41 @@ function findClaudeExecutable(customPath?: string): string {
encoding: "utf-8",
}).trim();

// Convert MSYS2/Git Bash style paths to Windows paths if necessary
claudePath = convertMsys2Path(claudePath);

// Handle shell aliases (e.g., "claude: aliased to /path/to/claude")
const aliasMatch = claudePath.match(/:\s*aliased to\s+(.+)$/);
if (aliasMatch && aliasMatch[1]) {
claudePath = aliasMatch[1];
claudePath = convertMsys2Path(aliasMatch[1]);
}

// Check if the path is a bash wrapper
if (fs.existsSync(claudePath)) {
const content = fs.readFileSync(claudePath, "utf-8");
if (content.startsWith("#!/bin/bash")) {
// Parse bash wrapper to find actual executable
const execMatch = content.match(/exec\s+"([^"]+)"/);
if (execMatch && execMatch[1]) {
const actualPath = execMatch[1];
// Resolve any symlinks to get the final JS file
return resolveToJsFile(actualPath);
if (content.startsWith("#!/bin/bash") || content.startsWith("#!/bin/sh")) {
// Extract the base directory from the bash script
const baseDir = path.dirname(claudePath);

// Try to extract JS file path from bash script
const jsPath = extractJsFromBashScript(content, baseDir);
if (jsPath && fs.existsSync(jsPath)) {
return resolveToJsFile(jsPath);
}

// Fallback: look for common npm locations
const npmGlobalDir = baseDir;
const possiblePaths = [
path.join(npmGlobalDir, "node_modules", "@anthropic-ai", "claude-code", "dist", "cli.js"),
path.join(npmGlobalDir, "node_modules", "@anthropic-ai", "claude-code", "cli.js"),
path.join(npmGlobalDir, "node_modules", "claude", "bin", "cli.js"),
path.join(npmGlobalDir, "node_modules", "claude", "dist", "cli.js"),
];

for (const possiblePath of possiblePaths) {
if (fs.existsSync(possiblePath)) {
return resolveToJsFile(possiblePath);
}
}
}
}
Expand All @@ -497,10 +570,11 @@ function findClaudeExecutable(customPath?: string): string {

if (fs.existsSync(localClaudeWrapper)) {
const content = fs.readFileSync(localClaudeWrapper, "utf-8");
if (content.startsWith("#!/bin/bash")) {
const execMatch = content.match(/exec\s+"([^"]+)"/);
if (execMatch && execMatch[1]) {
return resolveToJsFile(execMatch[1]);
if (content.startsWith("#!/bin/bash") || content.startsWith("#!/bin/sh")) {
const baseDir = path.dirname(localClaudeWrapper);
const jsPath = extractJsFromBashScript(content, baseDir);
if (jsPath && fs.existsSync(jsPath)) {
return resolveToJsFile(jsPath);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion apps/claude-trace/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"typescript": "^5.0.0"
},
"dependencies": {
"@anthropic-ai/claude-code": "^1.0.0",
"@anthropic-ai/claude-code": "^2.1.29",
"@anthropic-ai/sdk": "^0.52.0",
"@mariozechner/claude-trace": "^1.0.3"
},
Expand Down
98 changes: 86 additions & 12 deletions apps/claude-trace/src/cli.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,60 @@ For more information, visit: https://github.com/mariozechner/claude-trace
`);
}

/**
* Convert MSYS2/Git Bash style paths to Windows paths
* E.g., /c/Users/name/path -> C:\Users\name\path
*/
function convertMsys2Path(inputPath: string): string {
// Check if it's a MSYS2/Git Bash style path (e.g., /c/users/...)
const msys2Match = inputPath.match(/^\/([a-zA-Z])\/(.*)/);
if (msys2Match) {
const drive = msys2Match[1].toUpperCase();
const rest = msys2Match[2];
return `${drive}:\\${rest.replace(/\//g, "\\")}`;
}
return inputPath;
}

/**
* Extract JS file path from npm bash shim script
* Looks for patterns like: $basedir/...cli.js or "path/to/cli.js"
*/
function extractJsFromBashScript(scriptContent: string, baseDir: string): string | null {
// Try to find JS file reference patterns
const patterns = [
// Pattern 1: basedir/node_modules/.../cli.js
/\$basedir\/(.+?\.js)/,
// Pattern 2: Direct quoted paths
/"([^"]+\.js)"/,
// Pattern 3: Unquoted paths
/([a-zA-Z]:\/[^\s]+\.js)/,
/([a-zA-Z]:\\[^\s]+\.js)/,
];

for (const pattern of patterns) {
const match = scriptContent.match(pattern);
if (match && match[1]) {
let jsPath = match[1];

// If it's a basedir reference, resolve it
if (jsPath.includes("$basedir")) {
jsPath = jsPath.replace(/\$basedir/, baseDir);
}

// Convert to Windows path if needed
jsPath = convertMsys2Path(jsPath);

// Verify the file exists
if (fs.existsSync(jsPath)) {
return jsPath;
}
}
}

return null;
}

function resolveToJsFile(filePath: string): string {
try {
// First, resolve any symlinks
Expand Down Expand Up @@ -167,22 +221,41 @@ function getClaudeAbsolutePath(customPath?: string): string {
})
.trim();

// Convert MSYS2/Git Bash style paths to Windows paths if necessary
claudePath = convertMsys2Path(claudePath);

// Handle shell aliases (e.g., "claude: aliased to /path/to/claude")
const aliasMatch = claudePath.match(/:\s*aliased to\s+(.+)$/);
if (aliasMatch && aliasMatch[1]) {
claudePath = aliasMatch[1];
claudePath = convertMsys2Path(aliasMatch[1]);
}

// Check if the path is a bash wrapper
if (fs.existsSync(claudePath)) {
const content = fs.readFileSync(claudePath, "utf-8");
if (content.startsWith("#!/bin/bash")) {
// Parse bash wrapper to find actual executable
const execMatch = content.match(/exec\s+"([^"]+)"/);
if (execMatch && execMatch[1]) {
const actualPath = execMatch[1];
// Resolve any symlinks to get the final JS file
return resolveToJsFile(actualPath);
if (content.startsWith("#!/bin/bash") || content.startsWith("#!/bin/sh")) {
// Extract the base directory from the bash script
const baseDir = path.dirname(claudePath);

// Try to extract JS file path from bash script
const jsPath = extractJsFromBashScript(content, baseDir);
if (jsPath && fs.existsSync(jsPath)) {
return resolveToJsFile(jsPath);
}

// Fallback: look for common npm locations
const npmGlobalDir = baseDir;
const possiblePaths = [
path.join(npmGlobalDir, "node_modules", "@anthropic-ai", "claude-code", "dist", "cli.js"),
path.join(npmGlobalDir, "node_modules", "@anthropic-ai", "claude-code", "cli.js"),
path.join(npmGlobalDir, "node_modules", "claude", "bin", "cli.js"),
path.join(npmGlobalDir, "node_modules", "claude", "dist", "cli.js"),
];

for (const possiblePath of possiblePaths) {
if (fs.existsSync(possiblePath)) {
return resolveToJsFile(possiblePath);
}
}
}
}
Expand All @@ -195,10 +268,11 @@ function getClaudeAbsolutePath(customPath?: string): string {

if (fs.existsSync(localClaudeWrapper)) {
const content = fs.readFileSync(localClaudeWrapper, "utf-8");
if (content.startsWith("#!/bin/bash")) {
const execMatch = content.match(/exec\s+"([^"]+)"/);
if (execMatch && execMatch[1]) {
return resolveToJsFile(execMatch[1]);
if (content.startsWith("#!/bin/bash") || content.startsWith("#!/bin/sh")) {
const baseDir = path.dirname(localClaudeWrapper);
const jsPath = extractJsFromBashScript(content, baseDir);
if (jsPath && fs.existsSync(jsPath)) {
return resolveToJsFile(jsPath);
}
}
}
Expand Down
Loading