@kaitranntt/ccs 2.4.0 → 2.4.2

package/VERSION

@@ -1 +1 @@
-2.4.0
+2.4.2

package/bin/ccs.js

@@ -5,12 +5,24 @@ const { spawn } = require('child_process');
 const path = require('path');
 const fs = require('fs');
 const { showError, colors } = require('./helpers');
-const { detectClaudeCli, validateClaudeCli, showClaudeNotFoundError } = require('./claude-detector');
+const { detectClaudeCli, showClaudeNotFoundError } = require('./claude-detector');
 const { getSettingsPath } = require('./config-manager');
 
 // Version (sync with package.json)
 const CCS_VERSION = require('../package.json').version;
 
+// Helper: Get spawn options for claude execution
+// On Windows, .cmd/.bat/.ps1 files need shell: true
+function getSpawnOptions(claudePath) {
+  const isWindows = process.platform === 'win32';
+  const needsShell = isWindows && /\.(cmd|bat|ps1)$/i.test(claudePath);
+
+  return {
+    stdio: 'inherit',
+    shell: needsShell  // Required for .cmd files on Windows
+  };
+}
+
 // Special command handlers
 function handleVersionCommand() {
   console.log(`CCS (Claude Code Switch) version ${CCS_VERSION}`);
@@ -26,23 +38,17 @@ function handleVersionCommand() {
 }
 
 function handleHelpCommand(remainingArgs) {
-  // Detect and validate Claude CLI
   const claudeCli = detectClaudeCli();
 
+  // Check if claude was found
   if (!claudeCli) {
     showClaudeNotFoundError();
     process.exit(1);
   }
 
-  try {
-    validateClaudeCli(claudeCli);
-  } catch (e) {
-    showError(e.message);
-    process.exit(1);
-  }
-
   // Execute claude --help
-  const child = spawn(claudeCli, ['--help', ...remainingArgs], { stdio: 'inherit' });
+  const spawnOpts = getSpawnOptions(claudeCli);
+  const child = spawn(claudeCli, ['--help', ...remainingArgs], spawnOpts);
 
   child.on('exit', (code, signal) => {
     if (signal) {
@@ -53,7 +59,7 @@ function handleHelpCommand(remainingArgs) {
   });
 
   child.on('error', (err) => {
-    console.error(`Error executing claude --help: ${err.message}`);
+    showClaudeNotFoundError();
     process.exit(1);
   });
 }
@@ -124,20 +130,15 @@ function main() {
   if (profile === 'default') {
     const claudeCli = detectClaudeCli();
 
+    // Check if claude was found
     if (!claudeCli) {
       showClaudeNotFoundError();
       process.exit(1);
     }
 
-    try {
-      validateClaudeCli(claudeCli);
-    } catch (e) {
-      showError(e.message);
-      process.exit(1);
-    }
-
     // Execute claude with args
-    const child = spawn(claudeCli, remainingArgs, { stdio: 'inherit' });
+    const spawnOpts = getSpawnOptions(claudeCli);
+    const child = spawn(claudeCli, remainingArgs, spawnOpts);
 
     child.on('exit', (code, signal) => {
       if (signal) {
@@ -148,7 +149,7 @@ function main() {
     });
 
     child.on('error', (err) => {
-      console.error(`Error executing claude: ${err.message}`);
+      showClaudeNotFoundError();
       process.exit(1);
     });
 
@@ -161,22 +162,16 @@ function main() {
   // Detect Claude CLI
   const claudeCli = detectClaudeCli();
 
+  // Check if claude was found
   if (!claudeCli) {
     showClaudeNotFoundError();
     process.exit(1);
   }
 
-  // Validate Claude CLI path
-  try {
-    validateClaudeCli(claudeCli);
-  } catch (e) {
-    showError(e.message);
-    process.exit(1);
-  }
-
   // Execute claude with --settings
   const claudeArgs = ['--settings', settingsPath, ...remainingArgs];
-  const child = spawn(claudeCli, claudeArgs, { stdio: 'inherit' });
+  const spawnOpts = getSpawnOptions(claudeCli);
+  const child = spawn(claudeCli, claudeArgs, spawnOpts);
 
   child.on('exit', (code, signal) => {
     if (signal) {
@@ -187,7 +182,7 @@ function main() {
   });
 
   child.on('error', (err) => {
-    console.error(`Error executing claude: ${err.message}`);
+    showClaudeNotFoundError();
     process.exit(1);
   });
 }

package/bin/claude-detector.js

@@ -1,156 +1,102 @@
 'use strict';
 
 const fs = require('fs');
-const path = require('path');
 const { execSync } = require('child_process');
-const { showError, expandPath, isPathSafe } = require('./helpers');
+const { showError, expandPath } = require('./helpers');
 
 // Detect Claude CLI executable
 function detectClaudeCli() {
-  // Priority 1: CCS_CLAUDE_PATH environment variable
+  // Priority 1: CCS_CLAUDE_PATH environment variable (if user wants custom path)
   if (process.env.CCS_CLAUDE_PATH) {
     const ccsPath = expandPath(process.env.CCS_CLAUDE_PATH);
-    if (fs.existsSync(ccsPath) && isExecutable(ccsPath)) {
+    // Basic validation: file exists
+    if (fs.existsSync(ccsPath)) {
       return ccsPath;
     }
-    // Invalid CCS_CLAUDE_PATH - continue to fallbacks
+    // Invalid CCS_CLAUDE_PATH - show warning and fall back to PATH
+    console.warn('[!] Warning: CCS_CLAUDE_PATH is set but file not found:', ccsPath);
+    console.warn('    Falling back to system PATH lookup...');
   }
 
-  // Priority 2: Check if claude in PATH
-  try {
-    const claudePath = execSync(
-      process.platform === 'win32' ? 'where claude' : 'which claude',
-      { encoding: 'utf8', stdio: ['pipe', 'pipe', 'ignore'] }
-    ).trim().split('\n')[0];
-
-    if (claudePath && fs.existsSync(claudePath)) {
-      return claudePath;
-    }
-  } catch (e) {
-    // Not in PATH, continue to common locations
-  }
-
-  // Priority 3: Check common installation locations
-  const commonLocations = getCommonLocations();
+  // Priority 2: Resolve 'claude' from PATH using which/where.exe
+  // This fixes Windows npm installation where spawn() can't resolve bare command names
+  // SECURITY: Commands are hardcoded literals with no user input - safe from injection
+  const isWindows = process.platform === 'win32';
 
-  for (const location of commonLocations) {
-    const expandedPath = expandPath(location);
-    if (fs.existsSync(expandedPath) && isExecutable(expandedPath)) {
-      return expandedPath;
+  try {
+    const cmd = isWindows ? 'where.exe claude' : 'which claude';
+    const result = execSync(cmd, {
+      encoding: 'utf8',
+      stdio: ['ignore', 'pipe', 'ignore'],
+      timeout: 5000  // 5 second timeout to prevent hangs
+    }).trim();
+
+    // where.exe may return multiple lines (all matches in PATH order)
+    const matches = result.split('\n').map(p => p.trim()).filter(p => p);
+
+    if (isWindows) {
+      // On Windows, prefer executables with extensions (.exe, .cmd, .bat)
+      // where.exe often returns file without extension first, then the actual .cmd wrapper
+      const withExtension = matches.find(p => /\.(exe|cmd|bat|ps1)$/i.test(p));
+      const claudePath = withExtension || matches[0];
+
+      if (claudePath && fs.existsSync(claudePath)) {
+        return claudePath;
+      }
+    } else {
+      // On Unix, first match is fine
+      const claudePath = matches[0];
+
+      if (claudePath && fs.existsSync(claudePath)) {
+        return claudePath;
+      }
     }
+  } catch (err) {
+    // Command failed - claude not in PATH
+    // Fall through to return null
   }
 
-  // Not found
+  // Priority 3: Claude not found
   return null;
 }
 
-// Get platform-specific common locations
-function getCommonLocations() {
-  const home = require('os').homedir();
-
-  if (process.platform === 'win32') {
-    return [
-      path.join(process.env.LOCALAPPDATA || '', 'Claude', 'claude.exe'),
-      path.join(process.env.PROGRAMFILES || '', 'Claude', 'claude.exe'),
-      'C:\\Program Files\\Claude\\claude.exe',
-      'D:\\Program Files\\Claude\\claude.exe',
-      path.join(home, '.local', 'bin', 'claude.exe')
-    ];
-  } else if (process.platform === 'darwin') {
-    return [
-      '/usr/local/bin/claude',
-      path.join(home, '.local/bin/claude'),
-      '/opt/homebrew/bin/claude'
-    ];
-  } else {
-    return [
-      '/usr/local/bin/claude',
-      path.join(home, '.local/bin/claude'),
-      '/usr/bin/claude'
-    ];
-  }
-}
-
-// Check if file is executable
-function isExecutable(filePath) {
-  try {
-    fs.accessSync(filePath, fs.constants.X_OK);
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-
-// Validate Claude CLI path
-function validateClaudeCli(claudePath) {
-  // Check 1: Empty path
-  if (!claudePath) {
-    throw new Error('No path provided');
-  }
-
-  // Check 2: File exists
-  if (!fs.existsSync(claudePath)) {
-    throw new Error(`File not found: ${claudePath}`);
-  }
-
-  // Check 3: Is regular file (not directory)
-  const stats = fs.statSync(claudePath);
-  if (!stats.isFile()) {
-    throw new Error(`Path is a directory: ${claudePath}`);
-  }
-
-  // Check 4: Is executable
-  if (!isExecutable(claudePath)) {
-    throw new Error(`File is not executable: ${claudePath}\n\nTry: chmod +x ${claudePath}`);
-  }
-
-  // Check 5: Path safety (prevent injection)
-  if (!isPathSafe(claudePath)) {
-    throw new Error(`Path contains unsafe characters: ${claudePath}\n\nAllowed: alphanumeric, path separators, spaces, hyphens, underscores, dots`);
-  }
-
-  return true;
-}
-
-// Show Claude not found error
+// Show Claude not found error with diagnostics
 function showClaudeNotFoundError() {
-  const envVarStatus = process.env.CCS_CLAUDE_PATH || '(not set)';
   const isWindows = process.platform === 'win32';
+  const pathDirs = (process.env.PATH || '').split(isWindows ? ';' : ':');
+
+  const errorMsg = `Claude CLI not found in PATH
 
-  const errorMsg = `Claude CLI not found
+CCS requires Claude CLI to be installed and available in your PATH.
 
-Searched:
-  - CCS_CLAUDE_PATH: ${envVarStatus}
-  - System PATH: not found
-  - Common locations: not found
+[i] Diagnostic Info:
+    Platform: ${process.platform}
+    PATH directories: ${pathDirs.length}
+    Looking for: claude${isWindows ? '.exe' : ''}
 
 Solutions:
-  1. Add Claude CLI to PATH:
+  1. Install Claude CLI:
+     https://docs.claude.com/en/docs/claude-code/installation
 
-     ${isWindows
-       ? '# Find where Claude is installed\n     Get-ChildItem -Path C:\\,D:\\ -Filter claude.exe -Recurse\n\n     # Add to PATH\n     $env:Path += \';D:\\path\\to\\claude\\directory\'\n     [Environment]::SetEnvironmentVariable(\'Path\', $env:Path, \'User\')'
-       : '# Find where Claude is installed\n     sudo find / -name claude 2>/dev/null\n\n     # Add to PATH\n     export PATH="/path/to/claude/bin:$PATH"\n     echo \'export PATH="/path/to/claude/bin:$PATH"\' >> ~/.bashrc\n     source ~/.bashrc'
-     }
+  2. Verify installation:
+     ${isWindows ? 'Get-Command claude' : 'command -v claude'}
 
-  2. Or set custom path:
+  3. If installed but not in PATH, add it:
+     # Find Claude installation
+     ${isWindows ? 'where.exe claude' : 'which claude'}
 
+     # Or set custom path
      ${isWindows
-       ? '$env:CCS_CLAUDE_PATH = \'D:\\full\\path\\to\\claude.exe\'\n     [Environment]::SetEnvironmentVariable(\'CCS_CLAUDE_PATH\', \'D:\\full\\path\\to\\claude.exe\', \'User\')'
-       : 'export CCS_CLAUDE_PATH="/full/path/to/claude"\n     echo \'export CCS_CLAUDE_PATH="/full/path/to/claude"\' >> ~/.bashrc\n     source ~/.bashrc'
+       ? '$env:CCS_CLAUDE_PATH = \'C:\\path\\to\\claude.exe\''
+       : 'export CCS_CLAUDE_PATH=\'/path/to/claude\''
      }
 
-  3. Or install Claude CLI:
-
-     https://docs.claude.com/en/docs/claude-code/installation
-
-Verify installation:
-  ccs --version`;
+Restart your terminal after installation.`;
 
   showError(errorMsg);
 }
 
 module.exports = {
   detectClaudeCli,
-  validateClaudeCli,
   showClaudeNotFoundError
 };

package/lib/ccs

@@ -2,7 +2,7 @@
 set -euo pipefail
 
 # Version (updated by scripts/bump-version.sh)
-CCS_VERSION="2.4.0"
+CCS_VERSION="2.4.1"
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
 # --- Color/Format Functions ---

package/lib/ccs.ps1

@@ -72,7 +72,7 @@ Restart your terminal after installation.
 }
 
 # Version (updated by scripts/bump-version.sh)
-$CcsVersion = "2.4.0"
+$CcsVersion = "2.4.1"
 $ScriptDir = Split-Path -Parent $MyInvocation.MyCommand.Path
 
 # Installation function for commands and skills

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaitranntt/ccs",
-  "version": "2.4.0",
+  "version": "2.4.2",
   "description": "Claude Code Switch - Instant profile switching between Claude Sonnet 4.5 and GLM 4.6",
   "keywords": [
     "cli",