@kaitranntt/ccs 2.4.1 → 2.4.3

package/VERSION

@@ -1 +1 @@
-2.4.1
+2.4.3

package/bin/ccs.js

@@ -11,6 +11,30 @@ 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,
+    windowsHide: true  // Hide the console window on Windows
+  };
+}
+
+// Helper: Escape arguments for shell execution to prevent security vulnerabilities
+function escapeShellArg(arg) {
+  if (process.platform !== 'win32') {
+    // Unix-like systems: escape single quotes and wrap in single quotes
+    return "'" + arg.replace(/'/g, "'\"'\"'") + "'";
+  } else {
+    // Windows: escape double quotes and wrap in double quotes
+    return '"' + arg.replace(/"/g, '""') + '"';
+  }
+}
+
 // Special command handlers
 function handleVersionCommand() {
   console.log(`CCS (Claude Code Switch) version ${CCS_VERSION}`);
@@ -28,8 +52,25 @@ function handleVersionCommand() {
 function handleHelpCommand(remainingArgs) {
   const claudeCli = detectClaudeCli();
 
+  // Check if claude was found
+  if (!claudeCli) {
+    showClaudeNotFoundError();
+    process.exit(1);
+  }
+
   // Execute claude --help
-  const child = spawn(claudeCli, ['--help', ...remainingArgs], { stdio: 'inherit' });
+  const spawnOpts = getSpawnOptions(claudeCli);
+  let claudeArgs, child;
+
+  if (spawnOpts.shell) {
+    // When shell is required, escape arguments properly
+    claudeArgs = [claudeCli, '--help', ...remainingArgs].map(escapeShellArg).join(' ');
+    child = spawn(claudeArgs, spawnOpts);
+  } else {
+    // When no shell needed, use arguments array directly
+    claudeArgs = ['--help', ...remainingArgs];
+    child = spawn(claudeCli, claudeArgs, spawnOpts);
+  }
 
   child.on('exit', (code, signal) => {
     if (signal) {
@@ -111,8 +152,25 @@ function main() {
   if (profile === 'default') {
     const claudeCli = detectClaudeCli();
 
+    // Check if claude was found
+    if (!claudeCli) {
+      showClaudeNotFoundError();
+      process.exit(1);
+    }
+
     // Execute claude with args
-    const child = spawn(claudeCli, remainingArgs, { stdio: 'inherit' });
+    const spawnOpts = getSpawnOptions(claudeCli);
+    let claudeArgs, child;
+
+    if (spawnOpts.shell) {
+      // When shell is required, escape arguments properly
+      claudeArgs = [claudeCli, ...remainingArgs].map(escapeShellArg).join(' ');
+      child = spawn(claudeArgs, spawnOpts);
+    } else {
+      // When no shell needed, use arguments array directly
+      claudeArgs = remainingArgs;
+      child = spawn(claudeCli, claudeArgs, spawnOpts);
+    }
 
     child.on('exit', (code, signal) => {
       if (signal) {
@@ -136,9 +194,26 @@ function main() {
   // Detect Claude CLI
   const claudeCli = detectClaudeCli();
 
+  // Check if claude was found
+  if (!claudeCli) {
+    showClaudeNotFoundError();
+    process.exit(1);
+  }
+
   // Execute claude with --settings
-  const claudeArgs = ['--settings', settingsPath, ...remainingArgs];
-  const child = spawn(claudeCli, claudeArgs, { stdio: 'inherit' });
+  const claudeArgsList = ['--settings', settingsPath, ...remainingArgs];
+  const spawnOpts = getSpawnOptions(claudeCli);
+  let claudeArgs, child;
+
+  if (spawnOpts.shell) {
+    // When shell is required, escape arguments properly
+    claudeArgs = [claudeCli, ...claudeArgsList].map(escapeShellArg).join(' ');
+    child = spawn(claudeArgs, spawnOpts);
+  } else {
+    // When no shell needed, use arguments array directly
+    claudeArgs = claudeArgsList;
+    child = spawn(claudeCli, claudeArgs, spawnOpts);
+  }
 
   child.on('exit', (code, signal) => {
     if (signal) {

package/bin/claude-detector.js

@@ -1,6 +1,7 @@
 'use strict';
 
 const fs = require('fs');
+const { execSync } = require('child_process');
 const { showError, expandPath } = require('./helpers');
 
 // Detect Claude CLI executable
@@ -17,19 +18,62 @@ function detectClaudeCli() {
     console.warn('    Falling back to system PATH lookup...');
   }
 
-  // Priority 2: Use 'claude' from PATH (trust the system)
-  // This is the standard case - if user installed Claude CLI, it's in their PATH
-  return 'claude';
+  // 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';
+
+  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
+  }
+
+  // Priority 3: Claude not found
+  return null;
 }
 
-// Show Claude not found error
+// Show Claude not found error with diagnostics
 function showClaudeNotFoundError() {
   const isWindows = process.platform === 'win32';
+  const pathDirs = (process.env.PATH || '').split(isWindows ? ';' : ':');
 
   const errorMsg = `Claude CLI not found in PATH
 
 CCS requires Claude CLI to be installed and available in your PATH.
 
+[i] Diagnostic Info:
+    Platform: ${process.platform}
+    PATH directories: ${pathDirs.length}
+    Looking for: claude${isWindows ? '.exe' : ''}
+
 Solutions:
   1. Install Claude CLI:
      https://docs.claude.com/en/docs/claude-code/installation

package/lib/ccs

@@ -2,7 +2,7 @@
 set -euo pipefail
 
 # Version (updated by scripts/bump-version.sh)
-CCS_VERSION="2.4.1"
+CCS_VERSION="2.4.3"
 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.1"
+$CcsVersion = "2.4.3"
 $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.1",
+  "version": "2.4.3",
   "description": "Claude Code Switch - Instant profile switching between Claude Sonnet 4.5 and GLM 4.6",
   "keywords": [
     "cli",