contextswitch 0.1.7 → 0.1.8

package/dist/{chunk-GBKMEML7.js → chunk-7GF2GND2.js}

@@ -251,7 +251,11 @@ ${psScript}`);
   /**
    * Get the Claude executable path (public accessor)
    */
-  getClaudeExecutable() {
+  getClaudeExecutable(configClaudePath) {
+    if (configClaudePath && existsSync(configClaudePath)) {
+      debug("process", `Using claudePath from config: ${configClaudePath}`);
+      return configClaudePath;
+    }
     return this.findClaudeExecutable();
   }
   /**
@@ -395,9 +399,26 @@ ${psScript}`);
     try {
       if (this.platform === "win32") {
         const output = execSync("where claude", { encoding: "utf-8" }).trim();
-        const firstLine = output.split("\n")[0];
-        debug("process", `Found Claude via 'where': ${firstLine}`);
-        return firstLine || null;
+        const candidates = output.split(/\r?\n/).map((l) => l.trim()).filter(Boolean);
+        debug("process", `'where claude' returned ${candidates.length} result(s): ${candidates.join(", ")}`);
+        const cliIndicators = ["npm", "node_modules", "bun", "nvm", ".volta", "Roaming"];
+        const guiIndicators = ["Program Files", "AppData\\Local\\claude", "AppData\\Local\\Programs\\claude"];
+        for (const candidate of candidates) {
+          const isLikelyCLI = cliIndicators.some((ind) => candidate.toLowerCase().includes(ind.toLowerCase()));
+          if (isLikelyCLI) {
+            debug("process", `Selected CLI candidate: ${candidate}`);
+            return candidate;
+          }
+        }
+        for (const candidate of candidates) {
+          const isLikelyGUI = guiIndicators.some((ind) => candidate.toLowerCase().includes(ind.toLowerCase()));
+          if (!isLikelyGUI) {
+            debug("process", `Selected non-GUI candidate: ${candidate}`);
+            return candidate;
+          }
+        }
+        debug("process", `Falling back to first 'where' result: ${candidates[0]}`);
+        return candidates[0] || null;
       } else {
         const output = execSync("which claude", { encoding: "utf-8" }).trim();
         debug("process", `Found Claude via 'which': ${output}`);
@@ -406,11 +427,13 @@ ${psScript}`);
     } catch {
       debug("process", "Claude not found via PATH, checking common install locations");
       const commonPaths = this.platform === "win32" ? [
-        join(process.env.LOCALAPPDATA || "", "Programs", "Claude Code", "claude.exe"),
-        join(process.env.PROGRAMFILES || "C:\\Program Files", "Claude Code", "claude.exe"),
-        join(process.env.PROGRAMFILES || "C:\\Program Files", "Claude", "claude.exe"),
-        "C:\\Program Files\\Claude Code\\claude.exe",
-        "C:\\Program Files\\Claude\\claude.exe"
+        // npm global installs
+        join(process.env.APPDATA || "", "npm", "claude.cmd"),
+        join(process.env.APPDATA || "", "npm", "claude"),
+        // bun installs
+        join(process.env.USERPROFILE || "", ".bun", "bin", "claude.exe"),
+        // Volta
+        join(process.env.USERPROFILE || "", ".volta", "bin", "claude.exe")
       ] : [
         "/usr/local/bin/claude",
         "/usr/bin/claude",

package/dist/cli.js

@@ -24,7 +24,7 @@ function getVersion() {
     const packageJson = JSON.parse(readFileSync(packagePath, "utf-8"));
     return packageJson.version;
   } catch {
-    return "0.1.7";
+    return "0.1.8";
   }
 }
 function processSessionFallbackMarker() {
@@ -193,7 +193,7 @@ program.command("switch <domain>").description("Switch to a domain and launch Cl
     console.error(pc.red(`\u274C Invalid launch mode '${options.mode}'. Must be: window, tab, or inline`));
     process.exit(1);
   }
-  const { switchCommand } = await import("./switch-RRK6CHOB.js");
+  const { switchCommand } = await import("./switch-HUW2NAZD.js");
   await switchCommand(domain, options);
 });
 program.command("reset <domain>").description("Reset a domain session (archives current session by default)").option("--skip-archive", "Skip archiving the current session").option("-f, --force", "Skip confirmation prompt").action(async (domain, options) => {
@@ -299,7 +299,7 @@ domainCmd.command("remove <name>").alias("rm").description("Remove a domain from
   }
 });
 program.command("doctor").description("Check system configuration and diagnose issues").action(async () => {
-  const { processManager } = await import("./process-7O6IL3T4.js");
+  const { processManager } = await import("./process-AKHWPKQE.js");
   console.log(pc.cyan("\u{1FA7A} Running diagnostics...\n"));
   const failures = [];
   const claudeInstalled = processManager.verifyClaudeInstalled();

package/dist/{process-7O6IL3T4.js → process-AKHWPKQE.js}

@@ -1,7 +1,7 @@
 import {
   ProcessManager,
   processManager
-} from "./chunk-GBKMEML7.js";
+} from "./chunk-7GF2GND2.js";
 import "./chunk-F36TGFK2.js";
 export {
   ProcessManager,

package/dist/{switch-RRK6CHOB.js → switch-HUW2NAZD.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-MGIXKKM6.js";
 import {
   processManager
-} from "./chunk-GBKMEML7.js";
+} from "./chunk-7GF2GND2.js";
 import {
   LAUNCH_MODES,
   configManager,
@@ -79,10 +79,10 @@ async function switchCommand(domainName, options = {}) {
     if (!isNewSession) {
       const fallbackSessionId = SessionManager.generateSessionId(domainName, true);
       debug("switch", `Resume with fallback: resume=${sessionId.substring(0, 8)}, fallback=${fallbackSessionId.substring(0, 8)}`);
-      spawnClaudeWithFallback(domain, sessionId, fallbackSessionId, launchMode);
+      spawnClaudeWithFallback(domain, sessionId, fallbackSessionId, launchMode, globalConfig.claudePath);
     } else {
       debug("switch", `New session: ${sessionId.substring(0, 8)}`);
-      spawnClaudeNewSession(domain, sessionId, launchMode);
+      spawnClaudeNewSession(domain, sessionId, launchMode, globalConfig.claudePath);
     }
     const newState = {
       ...state,
@@ -191,8 +191,8 @@ function buildEnvLines(env) {
   }
   return lines.join("\n");
 }
-function spawnClaudeNewSession(domain, sessionId, mode = "window") {
-  const claudeCmd = processManager.getClaudeExecutable();
+function spawnClaudeNewSession(domain, sessionId, mode = "window", configClaudePath) {
+  const claudeCmd = processManager.getClaudeExecutable(configClaudePath);
   if (!claudeCmd) {
     throw new Error("Claude CLI not found");
   }
@@ -207,8 +207,8 @@ function spawnClaudeNewSession(domain, sessionId, mode = "window") {
   ].join("\n");
   return processManager.spawnTerminalScript(script, cwd, mode);
 }
-function spawnClaudeWithFallback(domain, resumeSessionId, fallbackSessionId, mode = "window") {
-  const claudeCmd = processManager.getClaudeExecutable();
+function spawnClaudeWithFallback(domain, resumeSessionId, fallbackSessionId, mode = "window", configClaudePath) {
+  const claudeCmd = processManager.getClaudeExecutable(configClaudePath);
   if (!claudeCmd) {
     throw new Error("Claude CLI not found");
   }
@@ -251,13 +251,17 @@ function getSessionFallbackPath() {
 }
 function printClaudeInstallHelp() {
   console.error(pc.red("\u274C Claude Code CLI not found\n"));
-  console.log(pc.white("ContextSwitch requires the Claude Code CLI to be installed.\n"));
-  console.log(pc.cyan("Install via npm (recommended):"));
+  console.log(pc.white("ContextSwitch requires the Claude Code CLI (not the desktop app).\n"));
+  console.log(pc.cyan("Install via npm:"));
   console.log(pc.gray("  npm install -g @anthropic-ai/claude-code\n"));
   console.log(pc.cyan("Or see the official docs:"));
   console.log(pc.gray("  https://docs.anthropic.com/en/docs/claude-code\n"));
   console.log(pc.white("After installing, verify it works:"));
-  console.log(pc.gray("  claude --version\n"));
+  console.log(pc.gray("  claude --version"));
+  console.log(pc.gray('  (should show "Claude Code" not the desktop app)\n'));
+  console.log(pc.white('If "claude" opens the desktop GUI instead, set the CLI path explicitly:'));
+  console.log(pc.gray("  Edit your config.yml and add:"));
+  console.log(pc.gray("    claudePath: /path/to/claude-code/claude\n"));
   console.log(pc.gray("Then try your command again."));
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contextswitch",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "Domain-based context management for Claude Code CLI",
   "main": "dist/cli.js",
   "type": "module",