cc-hub-cli 1.1.4 → 1.1.6

package/dist/index.js

@@ -8,14 +8,110 @@ import { createRequire } from "module";
 import { Command as Command2 } from "commander";
 
 // src/config.ts
-import fs3 from "fs";
-import path3 from "path";
-import os2 from "os";
+import fs4 from "fs";
+import path4 from "path";
+import os3 from "os";
 
 // src/platform/desktop-app.ts
+import fs2 from "fs";
+import path2 from "path";
+import os2 from "os";
+
+// src/logger.ts
 import fs from "fs";
 import path from "path";
 import os from "os";
+var LOG_DIR = path.join(os.homedir(), ".claude", "cc-hub", "logs");
+var LEVEL_PRIORITY = {
+  DEBUG: 0,
+  INFO: 1,
+  WARN: 2,
+  ERROR: 3
+};
+var currentLevel = "INFO";
+function setLogLevel(level) {
+  const upper = level.toUpperCase();
+  if (upper in LEVEL_PRIORITY) {
+    currentLevel = upper;
+  }
+}
+function shouldLog(level) {
+  return LEVEL_PRIORITY[level] >= LEVEL_PRIORITY[currentLevel];
+}
+function ensureLogDir() {
+  if (!fs.existsSync(LOG_DIR)) {
+    fs.mkdirSync(LOG_DIR, { recursive: true });
+  }
+}
+function logFilePath() {
+  const date = (/* @__PURE__ */ new Date()).toISOString().slice(0, 10);
+  return path.join(LOG_DIR, `cc-hub-${date}.log`);
+}
+function formatLine(level, message) {
+  const ts = (/* @__PURE__ */ new Date()).toISOString();
+  return `[${ts}] [${level}] ${message}
+`;
+}
+function write(level, message, err) {
+  if (!shouldLog(level)) return;
+  ensureLogDir();
+  let line = formatLine(level, message);
+  if (err instanceof Error) {
+    line += formatLine(level, err.stack || err.message);
+  } else if (err !== void 0) {
+    line += formatLine(level, String(err));
+  }
+  try {
+    fs.appendFileSync(logFilePath(), line, "utf-8");
+  } catch {
+  }
+}
+function error(message, err) {
+  write("ERROR", message, err);
+}
+function warn(message, err) {
+  write("WARN", message, err);
+}
+function info(message) {
+  write("INFO", message);
+}
+function debug(message) {
+  write("DEBUG", message);
+}
+function installGlobalExceptionHandlers() {
+  process.on("uncaughtException", (err) => {
+    error("Uncaught exception", err);
+    console.error("Unexpected error:", err.message);
+    process.exit(1);
+  });
+  process.on("unhandledRejection", (reason) => {
+    error("Unhandled rejection", reason instanceof Error ? reason : new Error(String(reason)));
+    console.error("Unhandled promise rejection:", reason);
+    process.exit(1);
+  });
+}
+function safeAction(fn) {
+  return ((...args) => {
+    info(`Executing: ${process.argv.slice(2).join(" ")}`);
+    try {
+      const result = fn(...args);
+      if (result && typeof result.then === "function") {
+        return result.catch((err) => {
+          error(`Command failed: ${err instanceof Error ? err.message : String(err)}`, err);
+          console.error("Error:", err instanceof Error ? err.message : String(err));
+          process.exit(1);
+        });
+      }
+      return result;
+    } catch (err) {
+      error(`Command failed: ${err instanceof Error ? err.message : String(err)}`, err);
+      console.error("Error:", err instanceof Error ? err.message : String(err));
+      process.exit(1);
+    }
+  });
+}
+
+// src/platform/desktop-app.ts
 function sortSemverDesc(a, b) {
   const parse = (v) => v.split(".").map((n) => parseInt(n, 10));
   const av = parse(a);
@@ -28,58 +124,61 @@ function sortSemverDesc(a, b) {
   return 0;
 }
 var MacOSDesktopApp = class {
-  supportDir = path.join(os.homedir(), "Library/Application Support/Claude-3p");
+  supportDir = path2.join(os2.homedir(), "Library/Application Support/Claude-3p");
   isInstalled() {
-    return fs.existsSync(this.supportDir);
+    return fs2.existsSync(this.supportDir);
   }
   getSupportDir() {
     return this.isInstalled() ? this.supportDir : void 0;
   }
   getSessionsDir() {
-    return this.isInstalled() ? path.join(this.supportDir, "local-agent-mode-sessions") : void 0;
+    return this.isInstalled() ? path2.join(this.supportDir, "local-agent-mode-sessions") : void 0;
   }
   getConfigLibrary() {
     if (!this.isInstalled()) return void 0;
-    const configLib = path.join(this.supportDir, "configLibrary");
-    if (fs.existsSync(path.join(configLib, "_meta.json"))) return configLib;
-    if (fs.existsSync(configLib)) return configLib;
+    const configLib = path2.join(this.supportDir, "configLibrary");
+    if (fs2.existsSync(path2.join(configLib, "_meta.json"))) return configLib;
+    if (fs2.existsSync(configLib)) return configLib;
     return configLib;
   }
   findBinary() {
-    const claudeCodeDir = path.join(this.supportDir, "claude-code");
-    if (!fs.existsSync(claudeCodeDir)) return void 0;
+    debug(`desktop-app: searching for binary in ${this.supportDir}`);
+    const claudeCodeDir = path2.join(this.supportDir, "claude-code");
+    if (!fs2.existsSync(claudeCodeDir)) return void 0;
     let versions;
     try {
-      versions = fs.readdirSync(claudeCodeDir).filter(
-        (d) => fs.existsSync(path.join(claudeCodeDir, d, "claude.app", "Contents", "MacOS", "claude"))
+      versions = fs2.readdirSync(claudeCodeDir).filter(
+        (d) => fs2.existsSync(path2.join(claudeCodeDir, d, "claude.app", "Contents", "MacOS", "claude"))
       );
     } catch {
       return void 0;
     }
     if (versions.length === 0) return void 0;
     versions.sort(sortSemverDesc);
-    return path.join(claudeCodeDir, versions[0], "claude.app", "Contents", "MacOS", "claude");
+    const binary = path2.join(claudeCodeDir, versions[0], "claude.app", "Contents", "MacOS", "claude");
+    debug(`desktop-app: found macOS binary ${binary}`);
+    return binary;
   }
 };
 var WindowsDesktopApp = class {
   _buildCandidates() {
     const candidates = [
-      path.join(process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming"), "Claude-3p"),
-      path.join(process.env.APPDATA || path.join(os.homedir(), "AppData", "Roaming"), "Claude"),
-      path.join(process.env.LOCALAPPDATA || path.join(os.homedir(), "AppData", "Local"), "Claude-3p"),
-      path.join(process.env.LOCALAPPDATA || path.join(os.homedir(), "AppData", "Local"), "Claude")
+      path2.join(process.env.APPDATA || path2.join(os2.homedir(), "AppData", "Roaming"), "Claude-3p"),
+      path2.join(process.env.APPDATA || path2.join(os2.homedir(), "AppData", "Roaming"), "Claude"),
+      path2.join(process.env.LOCALAPPDATA || path2.join(os2.homedir(), "AppData", "Local"), "Claude-3p"),
+      path2.join(process.env.LOCALAPPDATA || path2.join(os2.homedir(), "AppData", "Local"), "Claude")
     ];
-    const packagesDir = path.join(
-      process.env.LOCALAPPDATA || path.join(os.homedir(), "AppData", "Local"),
+    const packagesDir = path2.join(
+      process.env.LOCALAPPDATA || path2.join(os2.homedir(), "AppData", "Local"),
       "Packages"
     );
-    if (fs.existsSync(packagesDir)) {
+    if (fs2.existsSync(packagesDir)) {
       try {
-        const entries = fs.readdirSync(packagesDir);
+        const entries = fs2.readdirSync(packagesDir);
         for (const entry of entries) {
           if (entry.startsWith("Claude_")) {
-            candidates.push(path.join(packagesDir, entry, "LocalCache", "Roaming", "Claude-3p"));
-            candidates.push(path.join(packagesDir, entry, "LocalCache", "Roaming", "Claude"));
+            candidates.push(path2.join(packagesDir, entry, "LocalCache", "Roaming", "Claude-3p"));
+            candidates.push(path2.join(packagesDir, entry, "LocalCache", "Roaming", "Claude"));
           }
         }
       } catch {
@@ -89,7 +188,7 @@ var WindowsDesktopApp = class {
   }
   _findSupportDir() {
     for (const dir of this._buildCandidates()) {
-      if (fs.existsSync(dir)) return dir;
+      if (fs2.existsSync(dir)) return dir;
     }
     return void 0;
   }
@@ -102,34 +201,34 @@ var WindowsDesktopApp = class {
   getConfigLibrary() {
     const candidates = this._buildCandidates();
     for (const dir2 of candidates) {
-      const configLib = path.join(dir2, "configLibrary");
-      if (fs.existsSync(path.join(configLib, "_meta.json"))) {
+      const configLib = path2.join(dir2, "configLibrary");
+      if (fs2.existsSync(path2.join(configLib, "_meta.json"))) {
         return configLib;
       }
     }
     for (const dir2 of candidates) {
-      const configLib = path.join(dir2, "configLibrary");
-      if (fs.existsSync(configLib)) {
+      const configLib = path2.join(dir2, "configLibrary");
+      if (fs2.existsSync(configLib)) {
         return configLib;
       }
     }
     const dir = this._findSupportDir();
-    return dir ? path.join(dir, "configLibrary") : void 0;
+    return dir ? path2.join(dir, "configLibrary") : void 0;
   }
   getSessionsDir() {
     const candidates = this._buildCandidates();
     for (const dir2 of candidates) {
-      const sessionsDir = path.join(dir2, "local-agent-mode-sessions");
-      if (fs.existsSync(sessionsDir)) {
+      const sessionsDir = path2.join(dir2, "local-agent-mode-sessions");
+      if (fs2.existsSync(sessionsDir)) {
         return sessionsDir;
       }
     }
     const dir = this._findSupportDir();
-    return dir ? path.join(dir, "local-agent-mode-sessions") : void 0;
+    return dir ? path2.join(dir, "local-agent-mode-sessions") : void 0;
   }
   findBinary() {
-    const win32Binary = path.join(process.env.LOCALAPPDATA || "", "Programs", "Claude", "Claude.exe");
-    if (fs.existsSync(win32Binary)) return win32Binary;
+    const win32Binary = path2.join(process.env.LOCALAPPDATA || "", "Programs", "Claude", "Claude.exe");
+    if (fs2.existsSync(win32Binary)) return win32Binary;
     return void 0;
   }
 };
@@ -152,8 +251,8 @@ var NoOpDesktopApp = class {
 };
 
 // src/platform/profile-syncer.ts
-import fs2 from "fs";
-import path2 from "path";
+import fs3 from "fs";
+import path3 from "path";
 import { randomUUID } from "crypto";
 function toDesktopProfile(p) {
   const models = p.models || (p.model ? [p.model] : []);
@@ -182,9 +281,10 @@ var DesktopProfileSyncer = class {
   }
   sync(name, p) {
     const configLib = this.app.getConfigLibrary();
+    debug(`profile-syncer: sync '${name}' to ${configLib || "(none)"}`);
     if (!configLib) return;
-    if (!fs2.existsSync(configLib)) {
-      fs2.mkdirSync(configLib, { recursive: true });
+    if (!fs3.existsSync(configLib)) {
+      fs3.mkdirSync(configLib, { recursive: true });
     }
     const meta = this.readMeta();
     const entries = meta.entries || [];
@@ -207,9 +307,11 @@ var DesktopProfileSyncer = class {
     meta.entries = entries;
     this.writeMeta(meta);
     this.writeProfile(id, configLib, toDesktopProfile(p));
+    debug(`profile-syncer: synced '${name}' id=${id}`);
   }
   remove(name, p) {
     const configLib = this.app.getConfigLibrary();
+    debug(`profile-syncer: remove '${name}' id=${p.desktopId || "(none)"} from ${configLib || "(none)"}`);
     if (!configLib || !p.desktopId) return;
     const meta = this.readMeta();
     if (meta.entries) {
@@ -219,13 +321,14 @@ var DesktopProfileSyncer = class {
       delete meta.appliedId;
     }
     this.writeMeta(meta);
-    const filePath = path2.join(configLib, `${p.desktopId}.json`);
-    if (fs2.existsSync(filePath)) {
-      fs2.unlinkSync(filePath);
+    const filePath = path3.join(configLib, `${p.desktopId}.json`);
+    if (fs3.existsSync(filePath)) {
+      fs3.unlinkSync(filePath);
     }
   }
   setActive(p) {
     const configLib = this.app.getConfigLibrary();
+    debug(`profile-syncer: setActive id=${p.desktopId || "(none)"} in ${configLib || "(none)"}`);
     if (!configLib || !p.desktopId) return;
     const meta = this.readMeta();
     meta.appliedId = p.desktopId;
@@ -238,11 +341,11 @@ var DesktopProfileSyncer = class {
   }
   metaFile() {
     const configLib = this.app.getConfigLibrary();
-    return configLib ? path2.join(configLib, "_meta.json") : void 0;
+    return configLib ? path3.join(configLib, "_meta.json") : void 0;
   }
   readMeta() {
     const file = this.metaFile();
-    if (!file || !fs2.existsSync(file)) return {};
+    if (!file || !fs3.existsSync(file)) return {};
     try {
       return readJson(file);
     } catch {
@@ -254,7 +357,7 @@ var DesktopProfileSyncer = class {
     if (file) writeJson(file, meta);
   }
   writeProfile(id, configLib, data) {
-    writeJson(path2.join(configLib, `${id}.json`), data);
+    writeJson(path3.join(configLib, `${id}.json`), data);
   }
 };
 
@@ -266,21 +369,25 @@ var SystemBinaryResolver = class {
   }
   app;
   resolve() {
+    debug("binary-resolver: trying global 'claude' command");
     try {
       const result = spawnSync("claude", ["--version"], {
         shell: process.platform === "win32",
         encoding: "utf-8"
       });
       if (result.status === 0) {
+        debug("binary-resolver: found global 'claude'");
         return "claude";
       }
     } catch {
     }
+    debug("binary-resolver: trying desktop app binary");
     const desktopBinary = this.app.findBinary();
-    if (desktopBinary) return desktopBinary;
-    console.error("Error: Could not find Claude Code CLI.");
-    console.error("Install it globally or install the Claude Code desktop app.");
-    process.exit(1);
+    if (desktopBinary) {
+      debug(`binary-resolver: found desktop binary at ${desktopBinary}`);
+      return desktopBinary;
+    }
+    throw new Error("Could not find Claude Code CLI. Install it globally or install the Claude Code desktop app.");
   }
 };
 
@@ -324,30 +431,33 @@ function createPathCodec() {
 }
 
 // src/config.ts
-var CLAUDE_DIR = process.env.CLAUDE_DIR || path3.join(os2.homedir(), ".claude");
-var PROFILES_FILE = process.env.CLAUDE_PROFILES_FILE || path3.join(CLAUDE_DIR, "profiles.json");
-var SETTINGS_FILE = process.env.CLAUDE_SETTINGS_FILE || path3.join(CLAUDE_DIR, "settings.json");
-var CLAUDE_JSON = path3.join(os2.homedir(), ".claude.json");
-var PROJECTS_DIR = path3.join(CLAUDE_DIR, "projects");
-var SESSIONS_DIR = path3.join(CLAUDE_DIR, "sessions");
+var CLAUDE_DIR = process.env.CLAUDE_DIR || path4.join(os3.homedir(), ".claude");
+var PROFILES_FILE = process.env.CLAUDE_PROFILES_FILE || path4.join(CLAUDE_DIR, "profiles.json");
+var SETTINGS_FILE = process.env.CLAUDE_SETTINGS_FILE || path4.join(CLAUDE_DIR, "settings.json");
+var CLAUDE_JSON = path4.join(os3.homedir(), ".claude.json");
+var PROJECTS_DIR = path4.join(CLAUDE_DIR, "projects");
+var SESSIONS_DIR = path4.join(CLAUDE_DIR, "sessions");
 var desktopApp = createDesktopApp();
 var DESKTOP_CONFIG_LIBRARY = desktopApp.getConfigLibrary() || "";
-var DESKTOP_META_FILE = DESKTOP_CONFIG_LIBRARY ? path3.join(DESKTOP_CONFIG_LIBRARY, "_meta.json") : "";
+var DESKTOP_META_FILE = DESKTOP_CONFIG_LIBRARY ? path4.join(DESKTOP_CONFIG_LIBRARY, "_meta.json") : "";
 var DESKTOP_SESSIONS_DIR = desktopApp.getSessionsDir() || "";
 function isDesktopAppInstalled() {
   return desktopApp.isInstalled();
 }
 function ensureFile(filePath, defaultContent) {
-  if (!fs3.existsSync(filePath)) {
-    fs3.mkdirSync(path3.dirname(filePath), { recursive: true });
-    fs3.writeFileSync(filePath, defaultContent, "utf-8");
+  if (!fs4.existsSync(filePath)) {
+    debug(`ensureFile: creating ${filePath}`);
+    fs4.mkdirSync(path4.dirname(filePath), { recursive: true });
+    fs4.writeFileSync(filePath, defaultContent, "utf-8");
   }
 }
 function readJson(filePath) {
-  return JSON.parse(fs3.readFileSync(filePath, "utf-8"));
+  debug(`readJson: ${filePath}`);
+  return JSON.parse(fs4.readFileSync(filePath, "utf-8"));
 }
 function writeJson(filePath, data) {
-  fs3.writeFileSync(filePath, JSON.stringify(data, null, 2) + "\n", "utf-8");
+  debug(`writeJson: ${filePath}`);
+  fs4.writeFileSync(filePath, JSON.stringify(data, null, 2) + "\n", "utf-8");
 }
 function ensureProfilesFile() {
   ensureFile(PROFILES_FILE, '{"profiles":{}}\n');
@@ -356,12 +466,12 @@ function ensureSettingsFile() {
   ensureFile(SETTINGS_FILE, "{}\n");
 }
 function fixJsonFile(filePath, fallback = {}) {
-  if (!fs3.existsSync(filePath)) return;
-  const backupPath = path3.join(CLAUDE_DIR, path3.basename(filePath) + ".backup");
-  const raw = fs3.readFileSync(filePath, "utf-8");
+  if (!fs4.existsSync(filePath)) return;
+  const backupPath = path4.join(CLAUDE_DIR, path4.basename(filePath) + ".backup");
+  const raw = fs4.readFileSync(filePath, "utf-8");
   try {
     JSON.parse(raw);
-    fs3.copyFileSync(filePath, backupPath);
+    fs4.copyFileSync(filePath, backupPath);
     return;
   } catch {
   }
@@ -386,15 +496,18 @@ function fixJsonFile(filePath, fallback = {}) {
   if (openCurly > 0) text += "}".repeat(openCurly);
   try {
     JSON.parse(text);
-    fs3.writeFileSync(filePath, text + "\n", "utf-8");
-    console.error(`Fixed invalid JSON in ${path3.basename(filePath)}.`);
+    fs4.writeFileSync(filePath, text + "\n", "utf-8");
+    warn(`Fixed invalid JSON in ${path4.basename(filePath)}.`);
+    console.error(`Fixed invalid JSON in ${path4.basename(filePath)}.`);
   } catch {
-    if (fs3.existsSync(backupPath)) {
-      fs3.copyFileSync(backupPath, filePath);
-      console.error(`Restored ${path3.basename(filePath)} from backup.`);
+    if (fs4.existsSync(backupPath)) {
+      fs4.copyFileSync(backupPath, filePath);
+      warn(`Restored ${path4.basename(filePath)} from backup.`);
+      console.error(`Restored ${path4.basename(filePath)} from backup.`);
     } else {
       writeJson(filePath, fallback);
-      console.error(`Could not fix ${path3.basename(filePath)}, no backup found, reset to default.`);
+      error(`Could not fix ${path4.basename(filePath)}, no backup found, reset to default.`);
+      console.error(`Could not fix ${path4.basename(filePath)}, no backup found, reset to default.`);
     }
   }
 }
@@ -414,6 +527,7 @@ function sanitizeToolId(id) {
   return sanitized;
 }
 function transformAnthropicToOpenAI(body) {
+  debug(`transform: anthropic -> openai model=${body.model} messages=${(body.messages ?? []).length}`);
   const messages = [];
   if (body.system) {
     if (typeof body.system === "string") {
@@ -444,17 +558,26 @@ function transformAnthropicToOpenAI(body) {
         });
       }
       const contentParts = msg.content.filter(
-        (b) => b.type === "text" && b.text || b.type === "image" && b.source
+        (b) => b.type === "text" && b.text || b.type === "image" && (b.source?.type === "base64" && b.source.media_type && b.source.data || b.source?.type === "url" && b.source.url)
       );
       if (contentParts.length > 0) {
         const converted = contentParts.map((part) => {
           if (part.type === "image") {
-            const url = part.source?.type === "base64" ? `data:${part.source.media_type};base64,${part.source.data}` : part.source?.url ?? "";
-            return { type: "image_url", image_url: { url } };
+            if (part.source?.type === "base64" && part.source.media_type && part.source.data) {
+              const url = `data:${part.source.media_type};base64,${part.source.data}`;
+              debug(`transform: converting base64 image (${part.source.media_type}, ${part.source.data.length} chars)`);
+              return { type: "image_url", image_url: { url } };
+            } else if (part.source?.type === "url" && part.source.url) {
+              debug(`transform: converting image url (${part.source.url.slice(0, 80)}...)`);
+              return { type: "image_url", image_url: { url: part.source.url } };
+            }
+            warn(`transform: skipping invalid image block (missing source fields)`);
+            return null;
           }
           return { type: "text", text: part.text };
-        });
-        if (converted.every((p) => p.type === "text")) {
+        }).filter(Boolean);
+        if (converted.length === 0) {
+        } else if (converted.every((p) => p.type === "text")) {
           messages.push({
             role: "user",
             content: converted.map((p) => p.text).join("")
@@ -495,6 +618,7 @@ function transformAnthropicToOpenAI(body) {
   if (body.max_tokens != null) result.max_tokens = body.max_tokens;
   if (body.temperature != null) result.temperature = body.temperature;
   if (body.tools?.length) {
+    debug(`transform: mapping ${body.tools.length} tool(s)`);
     result.tools = body.tools.map((t) => ({
       type: "function",
       function: {
@@ -518,6 +642,7 @@ function transformAnthropicToOpenAI(body) {
   return result;
 }
 function transformOpenAIResponseToAnthropic(openaiResponse, originalModel) {
+  debug(`transform: openai -> anthropic model=${openaiResponse.model ?? originalModel} choices=${openaiResponse.choices?.length ?? 0}`);
   const choice = openaiResponse.choices?.[0];
   if (!choice) throw new Error("No choices in OpenAI response");
   const content = [];
@@ -622,6 +747,7 @@ import http from "http";
 async function startOpenAIProxy(targetUrl, apiKey, model, models = []) {
   const base = targetUrl.replace(/\/+$/, "");
   const server = http.createServer(async (req, res) => {
+    debug(`Proxy request: ${req.method} ${req.url}`);
     try {
       if (req.method === "GET" && req.url === "/v1/models") {
         res.writeHead(200, { "Content-Type": "application/json" });
@@ -663,6 +789,7 @@ async function startOpenAIProxy(targetUrl, apiKey, model, models = []) {
             });
             if (!upstream2.ok) {
               const errText = await upstream2.text();
+              error(`Upstream streaming error: ${upstream2.status} ${errText}`);
               res.write(`event: error
 data: ${errText}
 
@@ -691,6 +818,7 @@ data: ${errText}
         });
         if (!upstream.ok) {
           const errText = await upstream.text();
+          error(`Upstream error: ${upstream.status} ${errText}`);
           res.writeHead(upstream.status, { "Content-Type": "application/json" });
           res.end(errText);
           return;
@@ -704,6 +832,7 @@ data: ${errText}
       res.writeHead(404, { "Content-Type": "application/json" });
       res.end(JSON.stringify({ error: { type: "not_found", message: "endpoint not found" } }));
     } catch (err) {
+      error("Proxy request handler error", err);
       if (!res.headersSent) {
         res.writeHead(500, { "Content-Type": "application/json" });
         res.end(JSON.stringify({ error: { type: "internal_error", message: String(err) } }));
@@ -714,9 +843,13 @@ data: ${errText}
     server.listen(0, "127.0.0.1", () => {
       const addr = server.address();
       const baseUrl = `http://127.0.0.1:${addr.port}`;
+      debug(`OpenAI proxy listening on ${baseUrl}`);
       resolve({
         baseUrl,
-        stop: () => server.close()
+        stop: () => {
+          debug("OpenAI proxy stopped");
+          server.close();
+        }
       });
     });
     server.on("error", reject);
@@ -744,14 +877,14 @@ var PROVIDERS = [
 ];
 function providerCommand() {
   const cmd = new Command("provider").description("Manage provider types");
-  cmd.command("list").description("List available provider types").action(() => {
+  cmd.command("list").description("List available provider types").action(safeAction(() => {
     const fmt = (name, desc) => `${name.padEnd(12)}  ${desc}`;
     console.log(fmt("NAME", "DESCRIPTION"));
     console.log(fmt("----", "-----------"));
     for (const p of PROVIDERS) {
       console.log(fmt(p.name, p.description));
     }
-  });
+  }));
   return cmd;
 }
 
@@ -760,11 +893,12 @@ function resolveClaudeBinary() {
   return createBinaryResolver().resolve();
 }
 function updateSettingsForProfile(p) {
+  debug(`updateSettingsForProfile: reading ${SETTINGS_FILE}`);
   ensureSettingsFile();
-  const settings = readJson(SETTINGS_FILE);
+  const settings2 = readJson(SETTINGS_FILE);
   const models = p.models || (p.model ? [p.model] : []);
-  delete settings.model;
-  delete settings.availableModels;
+  delete settings2.model;
+  delete settings2.availableModels;
   const envVarsToClean = [
     "ANTHROPIC_DEFAULT_OPUS_MODEL",
     "ANTHROPIC_DEFAULT_OPUS_MODEL_NAME",
@@ -777,13 +911,14 @@ function updateSettingsForProfile(p) {
     "ANTHROPIC_DEFAULT_HAIKU_MODEL_DESCRIPTION",
     "ANTHROPIC_CUSTOM_MODEL_OPTION"
   ];
-  if (settings.env) {
-    const env = settings.env;
+  if (settings2.env) {
+    const env = settings2.env;
     for (const key of envVarsToClean) {
       delete env[key];
     }
   }
-  writeJson(SETTINGS_FILE, settings);
+  writeJson(SETTINGS_FILE, settings2);
+  debug(`updateSettingsForProfile: wrote ${SETTINGS_FILE}`);
 }
 function execClaude(profileName, p, extraArgs) {
   updateSettingsForProfile(p);
@@ -819,9 +954,10 @@ function execClaude(profileName, p, extraArgs) {
     env.ANTHROPIC_CUSTOM_MODEL_OPTION = models[0];
   }
   delete env.ANTHROPIC_API_KEY;
-  console.error(`Using profile '${profileName}': model=${firstModel || "(default)"} url=${p.url || "(default)"} provider=${p.provider || "anthropic"}`);
+  info(`Launching Claude with profile '${profileName}': model=${firstModel || "(default)"} url=${p.url || "(default)"} provider=${p.provider || "anthropic"} binary=${binary}`);
   if (p.provider === "openai") {
     const allModels = p.models || (p.model ? [p.model] : []);
+    debug(`execClaude: starting OpenAI proxy for ${allModels.length} model(s)`);
     startOpenAIProxy(
       p.url || "https://api.openai.com",
       p.token || "",
@@ -829,12 +965,14 @@ function execClaude(profileName, p, extraArgs) {
       allModels
     ).then(({ baseUrl, stop }) => {
       env.ANTHROPIC_BASE_URL = baseUrl;
+      debug(`execClaude: proxy running at ${baseUrl}`);
       const child = spawn(cmd[0], cmd.slice(1), { stdio: "inherit", env, shell: process.platform === "win32" });
       child.on("close", (code) => {
         stop();
         process.exit(code ?? 1);
       });
     }).catch((err) => {
+      error("Failed to start OpenAI proxy", err);
       console.error("Failed to start OpenAI proxy:", err);
       process.exit(1);
     });
@@ -890,11 +1028,10 @@ function collect(value, previous) {
 function profileCommand() {
   const profile = new Command2("profile").description("Manage Claude CLI profiles");
   const syncer = createProfileSyncer();
-  profile.command("add").description("Add or update a profile").argument("<name>", "Profile name").option("-m, --model <model>", "Model ID - can be used multiple times (max 3)", collect, []).option("-t, --token <token>", "API key / token").option("-u, --url <url>", "Base URL").option("-p, --provider <provider>", "Provider type: anthropic (default) or openai").action((name, opts) => {
+  profile.command("add").description("Add or update a profile").argument("<name>", "Profile name").option("-m, --model <model>", "Model ID - can be used multiple times (max 3)", collect, []).option("-t, --token <token>", "API key / token").option("-u, --url <url>", "Base URL").option("-p, --provider <provider>", "Provider type: anthropic (default) or openai").action(safeAction((name, opts) => {
     const models = opts.model && opts.model.length > 0 ? opts.model : void 0;
     if (models && models.length > 3) {
-      console.error("Error: A profile can have at most 3 models.");
-      process.exit(1);
+      throw new Error("Error: A profile can have at most 3 models.");
     }
     ensureProfilesFile();
     const data = readJson(PROFILES_FILE);
@@ -907,16 +1044,17 @@ function profileCommand() {
     if (opts.url) profile2.url = opts.url;
     if (opts.provider) profile2.provider = opts.provider;
     data.profiles[name] = profile2;
+    debug(`profile add: syncing profile '${name}' to desktop`);
     syncer.sync(name, profile2);
     writeJson(PROFILES_FILE, data);
+    debug(`profile add: wrote ${PROFILES_FILE}`);
     console.log(`Profile '${name}' saved.`);
-  });
-  profile.command("update").description("Update fields of an existing profile").argument("<name>", "Profile name (must already exist)").option("-m, --model <model>", "Model ID - can be used multiple times", collect, []).option("-d, --delete-model <model>", "Remove model ID - can be used multiple times", collect, []).option("-t, --token <token>", "API key / token").option("-u, --url <url>", "Base URL").option("-p, --provider <provider>", "Provider type").action((name, opts) => {
+  }));
+  profile.command("update").description("Update fields of an existing profile").argument("<name>", "Profile name (must already exist)").option("-m, --model <model>", "Model ID - can be used multiple times", collect, []).option("-d, --delete-model <model>", "Remove model ID - can be used multiple times", collect, []).option("-t, --token <token>", "API key / token").option("-u, --url <url>", "Base URL").option("-p, --provider <provider>", "Provider type").action(safeAction((name, opts) => {
     ensureProfilesFile();
     const data = readJson(PROFILES_FILE);
     if (!data.profiles[name]) {
-      console.error(`Profile '${name}' not found. Use 'profile add' to create it.`);
-      process.exit(1);
+      throw new Error(`Profile '${name}' not found. Use 'profile add' to create it.`);
     }
     const p = data.profiles[name];
     const providedModels = opts.model && opts.model.length > 0 ? opts.model : void 0;
@@ -962,17 +1100,18 @@ function profileCommand() {
     }
     const finalModels = p.models || (p.model ? [p.model] : []);
     if (finalModels.length > 3) {
-      console.error("Error: A profile can have at most 3 models.");
-      process.exit(1);
+      throw new Error("Error: A profile can have at most 3 models.");
     }
     if (opts.token) p.token = opts.token;
     if (opts.url) p.url = opts.url;
     if (opts.provider) p.provider = opts.provider;
+    debug(`profile update: syncing profile '${name}' to desktop`);
     syncer.sync(name, p);
     writeJson(PROFILES_FILE, data);
+    debug(`profile update: wrote ${PROFILES_FILE}`);
     console.log(`Profile '${name}' updated.`);
-  });
-  profile.command("list").description("List all profiles").action(() => {
+  }));
+  profile.command("list").description("List all profiles").action(safeAction(() => {
     ensureProfilesFile();
     const data = readJson(PROFILES_FILE);
     const profiles = data.profiles;
@@ -999,14 +1138,13 @@ function profileCommand() {
         p.url || "(default)"
       ));
     }
-  });
-  profile.command("view").description("View full details of a profile (token unmasked)").argument("<name>", "Profile name").option("-j, --json", "Output as JSON").action((name, opts) => {
+  }));
+  profile.command("view").description("View full details of a profile (token unmasked)").argument("<name>", "Profile name").option("-j, --json", "Output as JSON").action(safeAction((name, opts) => {
     ensureProfilesFile();
     const data = readJson(PROFILES_FILE);
     const p = data.profiles[name];
     if (!p) {
-      console.error(`Profile '${name}' not found.`);
-      process.exit(1);
+      throw new Error(`Profile '${name}' not found.`);
     }
     if (opts.json) {
       const { desktopId, ...rest } = p;
@@ -1034,29 +1172,28 @@ function profileCommand() {
       console.log(`URL:      ${p.url || "(default)"}`);
       console.log(`Provider: ${p.provider || "anthropic"}`);
     }
-  });
-  profile.command("remove").description("Remove a profile").argument("<name>", "Profile name").action((name) => {
+  }));
+  profile.command("remove").description("Remove a profile").argument("<name>", "Profile name").action(safeAction((name) => {
     ensureProfilesFile();
     const data = readJson(PROFILES_FILE);
     if (!data.profiles[name]) {
-      console.error(`Profile '${name}' not found.`);
-      process.exit(1);
+      throw new Error(`Profile '${name}' not found.`);
     }
+    debug(`profile remove: removing profile '${name}' from desktop sync`);
     syncer.remove(name, data.profiles[name]);
     delete data.profiles[name];
     writeJson(PROFILES_FILE, data);
+    debug(`profile remove: wrote ${PROFILES_FILE}`);
     console.log(`Profile '${name}' removed.`);
-  });
-  profile.command("rename").description("Rename a profile").argument("<oldName>", "Current profile name").argument("<newName>", "New profile name").action((oldName, newName) => {
+  }));
+  profile.command("rename").description("Rename a profile").argument("<oldName>", "Current profile name").argument("<newName>", "New profile name").action(safeAction((oldName, newName) => {
     ensureProfilesFile();
     const data = readJson(PROFILES_FILE);
     if (!data.profiles[oldName]) {
-      console.error(`Profile '${oldName}' not found.`);
-      process.exit(1);
+      throw new Error(`Profile '${oldName}' not found.`);
     }
     if (data.profiles[newName]) {
-      console.error(`Profile '${newName}' already exists. Choose a different name.`);
-      process.exit(1);
+      throw new Error(`Profile '${newName}' already exists. Choose a different name.`);
     }
     data.profiles[newName] = data.profiles[oldName];
     delete data.profiles[oldName];
@@ -1065,23 +1202,23 @@ function profileCommand() {
     }
     writeJson(PROFILES_FILE, data);
     console.log(`Profile '${oldName}' renamed to '${newName}'.`);
-  });
-  profile.command("default").description("Set the default profile").argument("<name>", "Profile name to set as default").action((name) => {
+  }));
+  profile.command("default").description("Set the default profile").argument("<name>", "Profile name to set as default").action(safeAction((name) => {
     ensureProfilesFile();
     const data = readJson(PROFILES_FILE);
     if (!data.profiles[name]) {
-      console.error(`Profile '${name}' not found.`);
-      process.exit(1);
+      throw new Error(`Profile '${name}' not found.`);
     }
     data.default = name;
+    debug(`profile default: setting active desktop profile to '${name}'`);
     syncer.setActive(data.profiles[name]);
     writeJson(PROFILES_FILE, data);
+    debug(`profile default: wrote ${PROFILES_FILE}`);
     console.log(`Default profile set to '${name}'.`);
-  });
-  profile.command("sync").description("Synchronize all CLI profiles to the Claude desktop app").action(() => {
+  }));
+  profile.command("sync").description("Synchronize all CLI profiles to the Claude desktop app").action(safeAction(() => {
     if (!syncer.isSupported()) {
-      console.error("Claude desktop app is not installed.");
-      process.exit(1);
+      throw new Error("Claude desktop app is not installed.");
     }
     ensureProfilesFile();
     const data = readJson(PROFILES_FILE);
@@ -1092,30 +1229,33 @@ function profileCommand() {
     }
     for (const name of names) {
       const p = data.profiles[name];
+      debug(`profile sync: syncing '${name}' to desktop`);
       syncer.sync(name, p);
     }
     writeJson(PROFILES_FILE, data);
+    debug(`profile sync: wrote ${PROFILES_FILE}`);
     console.log(`Synced ${names.length} profile(s) to the desktop app.`);
-  });
+  }));
   return profile;
 }
 function useCommand() {
   const syncer = createProfileSyncer();
-  return new Command2("use").description("Set a profile as the default").argument("<name>", "Profile name").action((name) => {
+  return new Command2("use").description("Set a profile as the default").argument("<name>", "Profile name").action(safeAction((name) => {
     ensureProfilesFile();
     const data = readJson(PROFILES_FILE);
     if (!data.profiles[name]) {
-      console.error(`Profile '${name}' not found.`);
-      process.exit(1);
+      throw new Error(`Profile '${name}' not found.`);
     }
     data.default = name;
+    debug(`use: setting active desktop profile to '${name}'`);
     syncer.setActive(data.profiles[name]);
     writeJson(PROFILES_FILE, data);
+    debug(`use: wrote ${PROFILES_FILE}`);
     console.log(`Default profile set to '${name}'.`);
-  });
+  }));
 }
 function runCommand() {
-  return new Command2("run").description("Launch Claude Code using the default or a specified profile").allowUnknownOption().argument("[args...]", "Optional profile name followed by extra arguments").action((args) => {
+  return new Command2("run").description("Launch Claude Code using the default or a specified profile").allowUnknownOption().argument("[args...]", "Optional profile name followed by extra arguments").action(safeAction((args) => {
     fixJsonFile(CLAUDE_JSON);
     ensureProfilesFile();
     const data = readJson(PROFILES_FILE);
@@ -1129,12 +1269,12 @@ function runCommand() {
       claudeArgs = args;
     }
     if (!profileName) {
-      console.error("No default profile set. Use 'cc-hub use <name>' first.");
-      process.exit(1);
+      throw new Error("No default profile set. Use 'cc-hub use <name>' first.");
     }
     const p = data.profiles[profileName];
+    debug(`run: launching claude with profile '${profileName}', args=[${claudeArgs.join(", ")}]`);
     execClaude(profileName, p, claudeArgs);
-  });
+  }));
 }
 
 // src/hooks/commands.ts
@@ -1196,12 +1336,15 @@ function displayHookList(data) {
 }
 function hooksCommand() {
   const hooks = new Command3("hook").description("Manage Claude Code hooks in settings.json");
-  hooks.command("list").description("List all hooks").action(() => {
+  hooks.command("list").description("List all hooks").action(safeAction(() => {
+    debug("hook list: reading settings");
     ensureSettingsFile();
     const data = readJson(SETTINGS_FILE);
+    debug(`hook list: found ${Object.keys(data.hooks || {}).length} event types`);
     displayHookList(data);
-  });
-  hooks.command("add").description("Add a hook to settings.json").requiredOption("-e, --event <event>", "Hook event (PreToolUse|PostToolUse|Notification|Stop|UserPromptSubmit|PermissionRequest)").option("-m, --matcher <matcher>", "Tool name matcher (omit for catch-all)").requiredOption("-c, --command <command>", "Shell command to run").option("-a, --async", "Run the hook asynchronously").action((opts) => {
+  }));
+  hooks.command("add").description("Add a hook to settings.json").requiredOption("-e, --event <event>", "Hook event (PreToolUse|PostToolUse|Notification|Stop|UserPromptSubmit|PermissionRequest)").option("-m, --matcher <matcher>", "Tool name matcher (omit for catch-all)").requiredOption("-c, --command <command>", "Shell command to run").option("-a, --async", "Run the hook asynchronously").action(safeAction((opts) => {
+    debug(`hook add: event=${opts.event} matcher=${opts.matcher || "(any)"}`);
     ensureSettingsFile();
     const data = readJson(SETTINGS_FILE);
     const hooksRoot = data.hooks || (data.hooks = {});
@@ -1219,16 +1362,17 @@ function hooksCommand() {
     if (opts.async) newHook.async = true;
     targetGroup.hooks.push(newHook);
     writeJson(SETTINGS_FILE, data);
+    debug(`hook add: wrote settings with new hook seq=${seq}`);
     console.log(`Hook added to event '${opts.event}'${matcher ? ` matcher='${matcher}'` : ""}.`);
-  });
-  hooks.command("remove").description("Remove a hook by its global index (see 'hooks list')").requiredOption("-i, --index <index>", "Global index from 'hooks list'", parseInt).action((opts) => {
+  }));
+  hooks.command("remove").description("Remove a hook by its global index (see 'hooks list')").requiredOption("-i, --index <index>", "Global index from 'hooks list'", parseInt).action(safeAction((opts) => {
+    debug(`hook remove: index=${opts.index}`);
     ensureSettingsFile();
     const data = readJson(SETTINGS_FILE);
     const rows = buildFlat(data);
     const target = opts.index;
     if (target < 0 || target >= rows.length) {
-      console.error(`Index ${target} out of range (0-${rows.length - 1}).`);
-      process.exit(1);
+      throw new Error(`Index ${target} out of range (0-${rows.length - 1}).`);
     }
     const r = rows[target];
     if (r.active) {
@@ -1242,13 +1386,15 @@ function hooksCommand() {
       if (pool.length === 0) delete data._cc_hub_disabled;
     }
     writeJson(SETTINGS_FILE, data);
+    debug(`hook remove: wrote settings after removing hook ${target}`);
     console.log(`Hook ${target} removed.`);
-  });
+  }));
   hooks.command("enable").description("Enable one or more disabled hooks").requiredOption("-i, --index <indexes...>", "Global index from 'hooks list' (repeatable)", (v, prev) => {
     prev = prev || [];
     prev.push(parseInt(v));
     return prev;
-  }).action((opts) => {
+  }).action(safeAction((opts) => {
+    debug(`hook enable: indexes=[${opts.index.join(", ")}]`);
     ensureSettingsFile();
     const data = readJson(SETTINGS_FILE);
     const rows = buildFlat(data);
@@ -1259,8 +1405,7 @@ function hooksCommand() {
       else if (rows[t].active) errors.push(`Index ${t} is already active.`);
     }
     if (errors.length > 0) {
-      for (const e of errors) console.error(e);
-      process.exit(1);
+      throw new Error(errors.join("\n"));
     }
     const hooksRoot = data.hooks || (data.hooks = {});
     const pool = data._cc_hub_disabled;
@@ -1292,14 +1437,16 @@ function hooksCommand() {
     data._cc_hub_disabled = remaining;
     if (remaining.length === 0) delete data._cc_hub_disabled;
     writeJson(SETTINGS_FILE, data);
+    debug(`hook enable: wrote settings after restoring ${toRestore.length} hook(s)`);
     console.log("");
     displayHookList(data);
-  });
+  }));
   hooks.command("disable").description("Disable one or more hooks (removes from active)").requiredOption("-i, --index <indexes...>", "Global index from 'hooks list' (repeatable)", (v, prev) => {
     prev = prev || [];
     prev.push(parseInt(v));
     return prev;
-  }).action((opts) => {
+  }).action(safeAction((opts) => {
+    debug(`hook disable: indexes=[${opts.index.join(", ")}]`);
     ensureSettingsFile();
     const data = readJson(SETTINGS_FILE);
     const rows = buildFlat(data);
@@ -1310,8 +1457,7 @@ function hooksCommand() {
       else if (!rows[t].active) errors.push(`Index ${t} is already disabled.`);
     }
     if (errors.length > 0) {
-      for (const e of errors) console.error(e);
-      process.exit(1);
+      throw new Error(errors.join("\n"));
     }
     const hooksRoot = data.hooks;
     const pool = data._cc_hub_disabled || (data._cc_hub_disabled = []);
@@ -1330,32 +1476,37 @@ function hooksCommand() {
       console.log(`Hook ${t} (${r.event}) disabled.`);
     }
     writeJson(SETTINGS_FILE, data);
+    debug(`hook disable: wrote settings after disabling ${targets.length} hook(s)`);
     console.log("");
     displayHookList(data);
-  });
+  }));
   return hooks;
 }
 
 // src/sessions/codec.ts
 function encodePath(p) {
-  return createPathCodec().encode(p);
+  const encoded = createPathCodec().encode(p);
+  debug(`codec: encode "${p}" -> "${encoded}"`);
+  return encoded;
 }
-function decodePath(encoded) {
-  return createPathCodec().decode(encoded);
+function decodePath2(encoded) {
+  const decoded = createPathCodec().decode(encoded);
+  debug(`codec: decode "${encoded}" -> "${decoded}"`);
+  return decoded;
 }
 
 // src/sessions/stats.ts
-import fs4 from "fs";
-import path4 from "path";
+import fs5 from "fs";
+import path5 from "path";
 function getDirSize(dir) {
   let total = 0;
   try {
-    for (const entry of fs4.readdirSync(dir, { withFileTypes: true })) {
-      const fullPath = path4.join(dir, entry.name);
+    for (const entry of fs5.readdirSync(dir, { withFileTypes: true })) {
+      const fullPath = path5.join(dir, entry.name);
       if (entry.isDirectory()) {
         total += getDirSize(fullPath);
       } else {
-        total += fs4.statSync(fullPath).size;
+        total += fs5.statSync(fullPath).size;
       }
     }
   } catch {
@@ -1374,19 +1525,24 @@ function formatSize(bytes) {
 }
 
 // src/sessions/utils.ts
-import fs5 from "fs";
-import path5 from "path";
+import fs6 from "fs";
+import path6 from "path";
 function formatTimestamp(ms) {
   const d = new Date(ms);
   const pad = (n) => String(n).padStart(2, "0");
   return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`;
 }
 function findProjectDir(query) {
+  debug(`sessions: findProjectDir query="${query}"`);
   const encoded = encodePath(query);
-  if (fs5.existsSync(path5.join(PROJECTS_DIR, encoded))) return encoded;
+  if (fs6.existsSync(path6.join(PROJECTS_DIR, encoded))) {
+    debug(`sessions: findProjectDir exact match ${encoded}`);
+    return encoded;
+  }
   try {
-    const dirs = fs5.readdirSync(PROJECTS_DIR);
+    const dirs = fs6.readdirSync(PROJECTS_DIR);
     const match = dirs.find((d) => d.toLowerCase().includes(query.toLowerCase()));
+    if (match) debug(`sessions: findProjectDir partial match ${match}`);
     return match || null;
   } catch {
     return null;
@@ -1397,7 +1553,7 @@ function parseSessionMeta(filePath) {
   let slug = "";
   let customTitle = "";
   try {
-    const lines = fs5.readFileSync(filePath, "utf-8").split("\n");
+    const lines = fs6.readFileSync(filePath, "utf-8").split("\n");
     for (const line of lines) {
       if (!line.trim()) continue;
       try {
@@ -1449,40 +1605,84 @@ function snippet(text, query, width = 150) {
   const suffix = end < text.length ? "..." : "";
   return prefix + text.slice(start, end) + suffix;
 }
+function findSessionFile(sessionQuery, projectQuery) {
+  debug(`sessions: findSessionFile query="${sessionQuery}" project=${projectQuery || "(any)"}`);
+  let searchDirs = [];
+  if (projectQuery) {
+    const projDir = findProjectDir(projectQuery);
+    if (!projDir) {
+      throw new Error(`No project matched: ${projectQuery}`);
+    }
+    searchDirs.push(path6.join(PROJECTS_DIR, projDir));
+  } else {
+    try {
+      searchDirs = fs6.readdirSync(PROJECTS_DIR).map((d) => path6.join(PROJECTS_DIR, d));
+    } catch {
+      throw new Error(`No projects directory found at ${PROJECTS_DIR}`);
+    }
+  }
+  const matches = [];
+  for (const dir of searchDirs) {
+    let files;
+    try {
+      files = fs6.readdirSync(dir).filter((f) => f.endsWith(".jsonl"));
+    } catch {
+      continue;
+    }
+    for (const file of files) {
+      const sessionId = file.replace(/\.jsonl$/, "");
+      if (sessionId.toLowerCase().includes(sessionQuery.toLowerCase())) {
+        matches.push({ filePath: path6.join(dir, file), project: path6.basename(dir) });
+      }
+    }
+  }
+  if (matches.length === 0) {
+    return null;
+  }
+  if (matches.length > 1) {
+    const lines = matches.map((m) => `  ${path6.basename(m.filePath)} in ${decodePath(m.project)}`).join("\n");
+    throw new Error(`Multiple sessions matched '${sessionQuery}':
+${lines}
+Use --project to disambiguate.`);
+  }
+  return matches[0];
+}
 
 // src/sessions/commands.ts
 import { Command as Command4 } from "commander";
-import fs6 from "fs";
-import path6 from "path";
+import fs7 from "fs";
+import path7 from "path";
+import { spawnSync as spawnSync3 } from "child_process";
 function sessionCommand() {
   const session = new Command4("session").description("Manage Claude Code sessions");
   const desktopApp2 = createDesktopApp();
   const DESKTOP_SESSIONS_DIR2 = desktopApp2.getSessionsDir() || "";
-  session.command("list").description("List all Claude Code project sessions").option("-n, --limit <n>", "Max number of projects to show", "30").option("-s, --short", "Show encoded names only (no decoding)").option("-j, --json", "Output as JSON lines").action((opts) => {
+  session.command("list").description("List all Claude Code project sessions").option("-n, --limit <n>", "Max number of projects to show", "30").option("-s, --short", "Show encoded names only (no decoding)").option("-j, --json", "Output as JSON lines").action(safeAction((opts) => {
+    debug(`session list: reading projects from ${PROJECTS_DIR}, limit=${opts.limit}`);
     const limit = parseInt(opts.limit, 10);
     let dirs;
     try {
-      dirs = fs6.readdirSync(PROJECTS_DIR);
+      dirs = fs7.readdirSync(PROJECTS_DIR);
     } catch {
       console.log("No projects directory found.");
       return;
     }
     dirs.sort((a, b) => {
-      const statA = fs6.statSync(path6.join(PROJECTS_DIR, a));
-      const statB = fs6.statSync(path6.join(PROJECTS_DIR, b));
+      const statA = fs7.statSync(path7.join(PROJECTS_DIR, a));
+      const statB = fs7.statSync(path7.join(PROJECTS_DIR, b));
       return statB.mtimeMs - statA.mtimeMs;
     });
     let count = 0;
     for (const projDir of dirs) {
       if (count >= limit) break;
-      const fullPath = path6.join(PROJECTS_DIR, projDir);
+      const fullPath = path7.join(PROJECTS_DIR, projDir);
       let nSessions = 0;
       try {
-        nSessions = fs6.readdirSync(fullPath).filter((f) => f.endsWith(".jsonl")).length;
+        nSessions = fs7.readdirSync(fullPath).filter((f) => f.endsWith(".jsonl")).length;
       } catch {
       }
-      const stat = fs6.statSync(fullPath);
-      const decoded = decodePath(projDir);
+      const stat = fs7.statSync(fullPath);
+      const decoded = decodePath2(projDir);
       if (opts.json) {
         console.log(JSON.stringify({ project: decoded, sessions: nSessions, modified: Math.floor(stat.mtimeMs) }));
       } else if (opts.short) {
@@ -1492,15 +1692,15 @@ function sessionCommand() {
       }
       count++;
     }
-  });
-  session.command("show").description("Show session files for a project").argument("<project>", "Project path or encoded name (partial match ok)").option("-v, --verbose", "Show first user message of each session").action((project, opts) => {
+  }));
+  session.command("show").description("Show session files for a project").argument("<project>", "Project path or encoded name (partial match ok)").option("-v, --verbose", "Show first user message of each session").action(safeAction((project, opts) => {
+    debug(`session show: project=${project} verbose=${!!opts.verbose}`);
     const projDir = findProjectDir(project);
     if (!projDir) {
-      console.error(`No project matched: ${project}`);
-      process.exit(1);
+      throw new Error(`No project matched: ${project}`);
     }
-    const fullPath = path6.join(PROJECTS_DIR, projDir);
-    console.log(`Project: ${decodePath(projDir)}`);
+    const fullPath = path7.join(PROJECTS_DIR, projDir);
+    console.log(`Project: ${decodePath2(projDir)}`);
     console.log(`Dir:     ${fullPath}`);
     console.log("");
     const fmt = (sid, name, started, msgs) => `${sid.padEnd(36)}  ${name.padEnd(30)}  ${started.padEnd(17)}  ${msgs}`;
@@ -1508,16 +1708,16 @@ function sessionCommand() {
     console.log(fmt("----------", "----", "-------", "--------"));
     let files;
     try {
-      files = fs6.readdirSync(fullPath).filter((f) => f.endsWith(".jsonl"));
+      files = fs7.readdirSync(fullPath).filter((f) => f.endsWith(".jsonl"));
     } catch {
       return;
     }
     for (const file of files) {
-      const filePath = path6.join(fullPath, file);
+      const filePath = path7.join(fullPath, file);
       const sessionId = file.replace(/\.jsonl$/, "");
       let msgCount = 0;
       try {
-        const content = fs6.readFileSync(filePath, "utf-8");
+        const content = fs7.readFileSync(filePath, "utf-8");
         msgCount = content ? content.split("\n").filter((l) => l.trim()).length : 0;
       } catch {
       }
@@ -1525,7 +1725,7 @@ function sessionCommand() {
       console.log(fmt(sessionId, slug || "-", started, String(msgCount)));
       if (opts.verbose) {
         try {
-          const lines = fs6.readFileSync(filePath, "utf-8").split("\n");
+          const lines = fs7.readFileSync(filePath, "utf-8").split("\n");
           for (const line of lines) {
             if (!line.trim()) continue;
             try {
@@ -1551,8 +1751,9 @@ function sessionCommand() {
         }
       }
     }
-  });
-  session.command("search").description("Search conversation history across all projects").argument("<query>", "Text to search for").option("-p, --project <project>", "Filter to a specific project (partial match)").option("-n, --limit <n>", "Max number of matching files to show", "20").option("-i, --ignore-case", "Case-insensitive search").action((query, opts) => {
+  }));
+  session.command("search").description("Search conversation history across all projects").argument("<query>", "Text to search for").option("-p, --project <project>", "Filter to a specific project (partial match)").option("-n, --limit <n>", "Max number of matching files to show", "20").option("-i, --ignore-case", "Case-insensitive search").action(safeAction((query, opts) => {
+    debug(`session search: query="${query}" project=${opts.project || "(all)"} limit=${opts.limit} ignoreCase=${!!opts.ignoreCase}`);
     let searchRoots = [{ root: PROJECTS_DIR, label: "" }];
     if (isDesktopAppInstalled()) {
       searchRoots.push({ root: DESKTOP_SESSIONS_DIR2, label: "[desktop] " });
@@ -1560,10 +1761,9 @@ function sessionCommand() {
     if (opts.project) {
       const projDir = findProjectDir(opts.project);
       if (!projDir) {
-        console.error(`No project matched: ${opts.project}`);
-        process.exit(1);
+        throw new Error(`No project matched: ${opts.project}`);
       }
-      searchRoots = [{ root: path6.join(PROJECTS_DIR, projDir), label: "" }];
+      searchRoots = [{ root: path7.join(PROJECTS_DIR, projDir), label: "" }];
     }
     const limit = parseInt(opts.limit, 10);
     let count = 0;
@@ -1571,18 +1771,18 @@ function sessionCommand() {
       if (count >= limit) return;
       let entries;
       try {
-        entries = fs6.readdirSync(dir, { withFileTypes: true });
+        entries = fs7.readdirSync(dir, { withFileTypes: true });
       } catch {
         return;
       }
       for (const entry of entries) {
         if (count >= limit) break;
-        const fullPath = path6.join(dir, entry.name);
+        const fullPath = path7.join(dir, entry.name);
         if (entry.isDirectory()) {
           searchDir(fullPath, label, baseDir);
         } else if (entry.name.endsWith(".jsonl")) {
           try {
-            const content = fs6.readFileSync(fullPath, "utf-8");
+            const content = fs7.readFileSync(fullPath, "utf-8");
             const lines = content.split("\n");
             let found = false;
             for (let lineno = 0; lineno < lines.length; lineno++) {
@@ -1591,10 +1791,10 @@ function sessionCommand() {
               const match = opts.ignoreCase ? line.toLowerCase().includes(query.toLowerCase()) : line.includes(query);
               if (match) {
                 if (!found) {
-                  const relPath = path6.relative(baseDir, fullPath);
-                  const projEnc = relPath.split(path6.sep)[0];
-                  const sessionId = path6.basename(fullPath, ".jsonl");
-                  const projName = label ? projEnc : decodePath(projEnc);
+                  const relPath = path7.relative(baseDir, fullPath);
+                  const projEnc = relPath.split(path7.sep)[0];
+                  const sessionId = path7.basename(fullPath, ".jsonl");
+                  const projName = label ? projEnc : decodePath2(projEnc);
                   console.log(`${label}[${projName}  \u2192  ${sessionId}]`);
                   found = true;
                   count++;
@@ -1626,11 +1826,12 @@ function sessionCommand() {
     for (const { root, label } of searchRoots) {
       searchDir(root, label, root);
     }
-  });
-  session.command("ps").description("Show active Claude Code processes").action(() => {
+  }));
+  session.command("ps").description("Show active Claude Code processes").action(safeAction(() => {
+    debug(`session ps: reading sessions from ${SESSIONS_DIR}`);
     let files;
     try {
-      files = fs6.readdirSync(SESSIONS_DIR).filter((f) => f.endsWith(".json"));
+      files = fs7.readdirSync(SESSIONS_DIR).filter((f) => f.endsWith(".json"));
     } catch {
       console.log("(no session files found)");
       return;
@@ -1644,7 +1845,7 @@ function sessionCommand() {
     console.log(fmt("---", "----------", "-------", "---", ""));
     for (const file of files) {
       try {
-        const data = JSON.parse(fs6.readFileSync(path6.join(SESSIONS_DIR, file), "utf-8"));
+        const data = JSON.parse(fs7.readFileSync(path7.join(SESSIONS_DIR, file), "utf-8"));
         const pid = String(data.pid || "?");
         const sessionId = data.sessionId || "?";
         const cwd = data.cwd || "?";
@@ -1659,8 +1860,9 @@ function sessionCommand() {
       } catch {
       }
     }
-  });
-  session.command("stats").description("Show summary statistics across all Claude Code sessions").action(() => {
+  }));
+  session.command("stats").description("Show summary statistics across all Claude Code sessions").action(safeAction(() => {
+    debug(`session stats: scanning ${PROJECTS_DIR} and ${DESKTOP_SESSIONS_DIR2 || "(no desktop)"}`);
     let nProjects = 0;
     let nSessions = 0;
     let totalMsgs = 0;
@@ -1670,8 +1872,8 @@ function sessionCommand() {
     const walk = (dir) => {
       const results = [];
       try {
-        for (const entry of fs6.readdirSync(dir, { withFileTypes: true })) {
-          const fullPath = path6.join(dir, entry.name);
+        for (const entry of fs7.readdirSync(dir, { withFileTypes: true })) {
+          const fullPath = path7.join(dir, entry.name);
           if (entry.isDirectory()) results.push(...walk(fullPath));
           else if (entry.name.endsWith(".jsonl")) results.push(fullPath);
         }
@@ -1680,7 +1882,7 @@ function sessionCommand() {
       return results;
     };
     try {
-      nProjects = fs6.readdirSync(PROJECTS_DIR).length;
+      nProjects = fs7.readdirSync(PROJECTS_DIR).length;
     } catch {
     }
     try {
@@ -1688,7 +1890,7 @@ function sessionCommand() {
       nSessions = sessionFiles.length;
       for (const f of sessionFiles) {
         try {
-          const content = fs6.readFileSync(f, "utf-8");
+          const content = fs7.readFileSync(f, "utf-8");
           totalMsgs += content ? content.split("\n").filter((l) => l.trim()).length : 0;
         } catch {
         }
@@ -1701,7 +1903,7 @@ function sessionCommand() {
         nDesktopSessions = desktopFiles.length;
         for (const f of desktopFiles) {
           try {
-            const content = fs6.readFileSync(f, "utf-8");
+            const content = fs7.readFileSync(f, "utf-8");
             nDesktopMsgs += content ? content.split("\n").filter((l) => l.trim()).length : 0;
           } catch {
           }
@@ -1710,7 +1912,7 @@ function sessionCommand() {
       }
     }
     try {
-      nActive = fs6.readdirSync(SESSIONS_DIR).filter((f) => f.endsWith(".json")).length;
+      nActive = fs7.readdirSync(SESSIONS_DIR).filter((f) => f.endsWith(".json")).length;
     } catch {
     }
     console.log(`Projects:        ${nProjects}`);
@@ -1733,8 +1935,9 @@ function sessionCommand() {
     if (desktopSize) {
       console.log(`  Desktop:       ${desktopSize}`);
     }
-  });
-  session.command("clean").description("Delete session JSONL files older than N days").option("-d, --days <n>", "Delete files older than this many days", "30").option("--dry-run", "Show what would be deleted without deleting").action((opts) => {
+  }));
+  session.command("clean").description("Delete session JSONL files older than N days").option("-d, --days <n>", "Delete files older than this many days", "30").option("--dry-run", "Show what would be deleted without deleting").action(safeAction((opts) => {
+    debug(`session clean: days=${opts.days} dryRun=${!!opts.dryRun}`);
     const days = parseInt(opts.days, 10);
     const cutoffMs = Date.now() - days * 24 * 60 * 60 * 1e3;
     let deleted = 0;
@@ -1742,23 +1945,23 @@ function sessionCommand() {
     const walk = (dir) => {
       let entries;
       try {
-        entries = fs6.readdirSync(dir, { withFileTypes: true });
+        entries = fs7.readdirSync(dir, { withFileTypes: true });
       } catch {
         return;
       }
       for (const entry of entries) {
-        const fullPath = path6.join(dir, entry.name);
+        const fullPath = path7.join(dir, entry.name);
         if (entry.isDirectory()) {
           walk(fullPath);
         } else if (entry.name.endsWith(".jsonl")) {
           try {
-            const stat = fs6.statSync(fullPath);
+            const stat = fs7.statSync(fullPath);
             if (stat.mtimeMs < cutoffMs) {
               const size = stat.size;
               if (opts.dryRun) {
                 console.log(`[dry-run] would delete: ${fullPath}  (${Math.floor(size / 1024)}KB)`);
               } else {
-                fs6.unlinkSync(fullPath);
+                fs7.unlinkSync(fullPath);
                 console.log(`Deleted: ${fullPath}`);
               }
               deleted++;
@@ -1776,7 +1979,39 @@ function sessionCommand() {
     console.log("");
     const verb = opts.dryRun ? "Would delete" : "Deleted";
     console.log(`${verb} ${deleted} file(s) (~${Math.floor(freed / 1024)}KB freed)`);
-  });
+  }));
+  session.command("troubleshoot").description("Launch Claude Code to troubleshoot a session file").argument("<session>", "Session ID or partial match").option("-i, --interactive", "Open an interactive Claude Code window instead of a one-shot prompt").action(safeAction((sessionId, opts) => {
+    debug(`session troubleshoot: session=${sessionId} interactive=${!!opts.interactive}`);
+    console.log(`Searching for session '${sessionId}'...`);
+    const match = findSessionFile(sessionId);
+    if (!match) {
+      throw new Error(`Session '${sessionId}' not found.`);
+    }
+    if (!fs7.existsSync(match.filePath)) {
+      throw new Error(`Session file no longer exists: ${match.filePath}`);
+    }
+    console.log(`Found session file: ${match.filePath}`);
+    const nodeBinary = process.argv[0];
+    const scriptPath = process.argv[1];
+    let args;
+    const promptText = `Please analyze this Claude Code session file: ${match.filePath}
+
+The file contains a JSONL conversation history. Review it for any errors, anomalies, or issues (truncated responses, failed tool calls, error messages, corrupted data, etc.). Summarize what happened in the session and identify any problems that need attention. If the file is very large, focus on the most recent turns and any lines containing "error", "exception", "failed", or non-JSON content.`;
+    if (opts.interactive) {
+      console.log("Launching Claude Code (interactive)...");
+      info(`session troubleshoot: launching cc-hub run (interactive) for ${match.filePath}`);
+      args = ["run", promptText];
+    } else {
+      console.log("Launching Claude Code with prompt...");
+      info(`session troubleshoot: launching cc-hub run -p "${promptText}"`);
+      args = ["run", "-p", promptText];
+    }
+    const result = spawnSync3(nodeBinary, [scriptPath, ...args], {
+      stdio: "inherit",
+      shell: process.platform === "win32"
+    });
+    process.exit(result.status ?? 1);
+  }));
   return session;
 }
 
@@ -1834,6 +2069,7 @@ _cc-hub() {
     'ps:Show active Claude Code processes'
     'stats:Show summary statistics'
     'clean:Delete session JSONL files older than N days'
+    'troubleshoot:Launch Claude Code to troubleshoot a session file'
   )
 
   _cc_hub_profiles() {
@@ -1911,6 +2147,8 @@ _cc-hub() {
         session)
           if (( CURRENT == 2 )); then
             _describe -t session-subcmds 'session subcommand' session_subcmds
+          elif [[ $words[2] == "troubleshoot" ]]; then
+            _arguments -C -S               '(-i --interactive)'{-i,--interactive}'[Open an interactive Claude Code window instead of a one-shot prompt]'
           fi
           ;;
       esac
@@ -1970,7 +2208,7 @@ _cc-hub() {
   local provider_subcmds="list"
   local provider_types="anthropic openai"
   local hooks_subcmds="list add remove enable disable"
-  local session_subcmds="list show search ps stats clean"
+  local session_subcmds="list show search ps stats clean troubleshoot"
 
   # Top-level command
   if [[ \${COMP_CWORD} -eq 1 ]]; then
@@ -2021,6 +2259,13 @@ _cc-hub() {
     session)
       if [[ \${COMP_CWORD} -eq 2 ]]; then
         COMPREPLY=($(compgen -W "$session_subcmds" -- "$cur"))
+      elif [[ "\${COMP_WORDS[2]}" == "troubleshoot" ]]; then
+        if [[ "$prev" == "--interactive" || "$prev" == "-i" ]]; then
+          :
+        else
+          local troubleshoot_opts="--interactive -i"
+          COMPREPLY=($(compgen -W "$troubleshoot_opts" -- "$cur"))
+        fi
       fi
       ;;
   esac
@@ -2048,7 +2293,7 @@ var POWERSHELL_COMPLETION = `Register-ArgumentCompleter -Native -CommandName cc-
 
   $profileSubcmds = @('add', 'update', 'list', 'view', 'remove', 'rename', 'default', 'sync')
   $hookSubcmds = @('list', 'add', 'remove', 'enable', 'disable')
-  $sessionSubcmds = @('list', 'show', 'search', 'ps', 'stats', 'clean')
+  $sessionSubcmds = @('list', 'show', 'search', 'ps', 'stats', 'clean', 'troubleshoot')
   $providerSubcmds = @('list')
 
   $tokens = $commandAst.CommandElements | ForEach-Object { $_.ToString() }
@@ -2090,7 +2335,7 @@ var POWERSHELL_COMPLETION = `Register-ArgumentCompleter -Native -CommandName cc-
 
 // src/complete/index.ts
 function completionCommand() {
-  return new Command5("completion").description("Print shell completion script").addArgument(new Argument("<shell>", "Shell type: bash, zsh, or powershell").choices(["bash", "zsh", "powershell"])).action((shell) => {
+  return new Command5("completion").description("Print shell completion script").addArgument(new Argument("<shell>", "Shell type: bash, zsh, or powershell").choices(["bash", "zsh", "powershell"])).action(safeAction((shell) => {
     switch (shell) {
       case "zsh":
         process.stdout.write(ZSH_COMPLETION);
@@ -2105,12 +2350,16 @@ function completionCommand() {
         console.error(`Unsupported shell: ${shell}. Use 'bash', 'zsh', or 'powershell'.`);
         process.exit(1);
     }
-  });
+  }));
 }
 
 // src/index.ts
 var _require = createRequire(import.meta.url);
 var { version } = _require("../package.json");
+ensureSettingsFile();
+var settings = readJson(SETTINGS_FILE);
+setLogLevel(settings._cc_hub_logLevel || "INFO");
+installGlobalExceptionHandlers();
 var program = new Command6();
 program.name("cc-hub").description("Manage Claude CLI profiles, hooks, and sessions").version(version);
 program.addCommand(profileCommand());
@@ -2120,4 +2369,9 @@ program.addCommand(hooksCommand());
 program.addCommand(sessionCommand());
 program.addCommand(completionCommand());
 program.addCommand(providerCommand());
-program.parse();
+try {
+  program.parse();
+} catch (err) {
+  console.error("Unexpected error:", err instanceof Error ? err.message : String(err));
+  process.exit(1);
+}