claude-manager 1.5.3 → 1.5.4

package/README.md

@@ -2,7 +2,7 @@
 
 A powerful terminal app for managing Claude Code settings, profiles, MCP servers, and skills. Switch between different AI providers, models, and configurations with a single command.
 
-![Version](https://img.shields.io/badge/version-1.4.0-blue)
+![Version](https://img.shields.io/badge/version-1.5.3-blue)
 ![License](https://img.shields.io/badge/license-MIT-green)
 
 ## Features
@@ -19,12 +19,27 @@ A powerful terminal app for managing Claude Code settings, profiles, MCP servers
 
 ## Installation
 
+### Option 1: Homebrew (macOS)
+
+```bash
+brew tap faisalnazir/claude-manager
+brew install claude-manager
+```
+
+### Option 2: npm
+
+```bash
+npm install -g claude-manager
+```
+
+### Option 3: curl
+
 ```bash
 curl -fsSL https://raw.githubusercontent.com/faisalnazir/claude-manager/main/install.sh | bash
 ```
 
 ### Requirements
-- [Bun](https://bun.sh) (auto-installed if missing)
+- [Node.js 18+](https://nodejs.org) (for npm install)
 - [Claude Code](https://docs.anthropic.com/en/docs/claude-code)
 
 ## Quick Start
@@ -171,6 +186,9 @@ cm edit 1
 
 # Check what's installed
 cm status
+
+# Update cm via npm
+npm update -g claude-manager
 ```
 
 ## How It Works

package/dist/cli.js

@@ -1,88 +1,119 @@
 #!/usr/bin/env node
+// src/cli.js
 import React, { useState, useEffect, useMemo } from "react";
 import { render, Box, Text, useInput, useApp } from "ink";
 import SelectInput from "ink-select-input";
 import TextInput from "ink-text-input";
-import fs from "fs";
-import path from "path";
-import os from "os";
-import { execSync, spawnSync } from "child_process";
-import { createInterface } from "readline";
+import { spawnSync, execSync as execSync2 } from "child_process";
+import fs2 from "fs";
+import path3 from "path";
 import Fuse from "fuse.js";
-const VERSION = "1.5.3";
-const LOGO = `\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2557      \u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2557   \u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557
+
+// src/constants.js
+import os from "os";
+import path from "path";
+var VERSION = "1.5.4";
+var LOGO = `\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2557      \u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2557   \u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557
 \u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2551     \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D
 \u2588\u2588\u2551     \u2588\u2588\u2551     \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551\u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2557
 \u2588\u2588\u2551     \u2588\u2588\u2551     \u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2551\u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u255D
 \u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2551  \u2588\u2588\u2551\u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557
  \u255A\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u255D  \u255A\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D`;
-const MCP_REGISTRY_URL = "https://registry.modelcontextprotocol.io/v0/servers";
-const PROFILES_DIR = path.join(os.homedir(), ".claude", "profiles");
-const SETTINGS_PATH = path.join(os.homedir(), ".claude", "settings.json");
-const CLAUDE_JSON_PATH = path.join(os.homedir(), ".claude.json");
-const LAST_PROFILE_PATH = path.join(os.homedir(), ".claude", ".last-profile");
-const args = process.argv.slice(2);
-const cmd = args[0];
-if (!fs.existsSync(PROFILES_DIR)) fs.mkdirSync(PROFILES_DIR, { recursive: true });
-if (args.includes("-v") || args.includes("--version")) {
-  console.log(`cm v${VERSION}`);
-  process.exit(0);
-}
-if (args.includes("-h") || args.includes("--help")) {
-  console.log(`cm v${VERSION} - Claude Settings Manager
-
-Usage: cm [command] [options]
-
-Commands:
-  (none)          Select profile interactively
-  new             Create a new profile
-  edit <n>        Edit profile (by name or number)
-  copy <n> <new>  Copy/duplicate a profile
-  delete <n>      Delete profile (by name or number)
-  status          Show current settings
-  list            List all profiles
-  config          Open Claude settings.json in editor
-  mcp [query]     Search and add MCP servers
-  mcp remove      Remove MCP server from profile
-  skills          Browse and add Anthropic skills
-  skills list     List installed skills
-  skills remove   Remove an installed skill
+var PROFILES_DIR = path.join(os.homedir(), ".claude", "profiles");
+var SETTINGS_PATH = path.join(os.homedir(), ".claude", "settings.json");
+var CLAUDE_JSON_PATH = path.join(os.homedir(), ".claude.json");
+var LAST_PROFILE_PATH = path.join(os.homedir(), ".claude", ".last-profile");
+var SKILLS_DIR = path.join(os.homedir(), ".claude", "skills");
+var MCP_REGISTRY_URL = "https://registry.modelcontextprotocol.io/v0/servers";
+var SKILL_SOURCES = [
+  { url: "https://api.github.com/repos/anthropics/skills/contents/skills", base: "https://github.com/anthropics/skills/tree/main/skills" },
+  { url: "https://api.github.com/repos/Prat011/awesome-llm-skills/contents/skills", base: "https://github.com/Prat011/awesome-llm-skills/tree/main/skills" },
+  { url: "https://api.github.com/repos/skillcreatorai/Ai-Agent-Skills/contents/skills", base: "https://github.com/skillcreatorai/Ai-Agent-Skills/tree/main/skills" }
+];
+var PROVIDERS = [
+  { label: "Anthropic (Direct)", value: "anthropic", url: "", needsKey: true },
+  { label: "Amazon Bedrock", value: "bedrock", url: "", needsKey: false },
+  { label: "Z.AI", value: "zai", url: "https://api.z.ai/api/anthropic", needsKey: true },
+  { label: "MiniMax", value: "minimax", url: "https://api.minimax.io/anthropic", needsKey: true },
+  { label: "Custom", value: "custom", url: "", needsKey: true }
+];
+var FETCH_TIMEOUT = 1e4;
+var NPM_OUTDATED_TIMEOUT = 5e3;
+var GIT_CLONE_TIMEOUT = 3e4;
+var GIT_SPARSE_TIMEOUT = 1e4;
+var GIT_MOVE_TIMEOUT = 5e3;
+var GIT_CLEANUP_TIMEOUT = 5e3;
+var MCP_PAGE_SIZE = 50;
+var SKILLS_PAGE_SIZE = 50;
+var DEFAULT_SETTINGS = {
+  env: {},
+  model: "opus",
+  alwaysThinkingEnabled: true,
+  defaultMode: "bypassPermissions"
+};
+var API_TIMEOUT_MS = "3000000";
+var FUSE_THRESHOLD = 0.3;
 
-Options:
-  --last, -l      Use last profile without menu
-  --skip-update   Skip update check
-  --yolo          Run claude with --dangerously-skip-permissions
-  --force, -f     Skip confirmation prompts (e.g., for delete)
-  -v, --version   Show version
-  -h, --help      Show help`);
-  process.exit(0);
-}
-const skipUpdate = args.includes("--skip-update");
-const useLast = args.includes("--last") || args.includes("-l");
-const dangerMode = args.includes("--dangerously-skip-permissions") || args.includes("--yolo");
-const loadProfiles = () => {
+// src/utils.js
+import fs from "fs";
+import path2 from "path";
+import { execSync } from "child_process";
+import { createInterface } from "readline";
+var ensureProfilesDir = () => {
+  if (!fs.existsSync(PROFILES_DIR)) {
+    fs.mkdirSync(PROFILES_DIR, { recursive: true });
+  }
+};
+var logError = (context, error) => {
+  if (process.env.DEBUG || process.env.CM_DEBUG) {
+    console.error(`[${context}]`, error?.message || error);
+  }
+};
+var safeParseInt = (value, defaultValue = null) => {
+  const parsed = parseInt(value, 10);
+  return Number.isNaN(parsed) ? defaultValue : parsed;
+};
+var sanitizeProfileName = (name) => {
+  return name.toLowerCase().replace(/[^a-z0-9-_]/g, "-").replace(/-+/g, "-").replace(/^-|-$/g, "");
+};
+var sanitizeFilePath = (filename, baseDir) => {
+  const sanitized = path2.basename(filename);
+  const resolved = path2.resolve(baseDir, sanitized);
+  if (!resolved.startsWith(baseDir)) {
+    return null;
+  }
+  return sanitized;
+};
+var loadProfiles = () => {
   const profiles = [];
-  if (fs.existsSync(PROFILES_DIR)) {
-    for (const file of fs.readdirSync(PROFILES_DIR).sort()) {
-      if (file.endsWith(".json")) {
-        try {
-          const content = JSON.parse(fs.readFileSync(path.join(PROFILES_DIR, file), "utf8"));
-          profiles.push({
-            label: content.name || file.replace(".json", ""),
-            value: file,
-            key: file,
-            group: content.group || null,
-            data: content
-          });
-        } catch {
-        }
-      }
+  ensureProfilesDir();
+  if (!fs.existsSync(PROFILES_DIR)) {
+    return profiles;
+  }
+  const files = fs.readdirSync(PROFILES_DIR).sort();
+  for (const file of files) {
+    if (!file.endsWith(".json")) continue;
+    const filePath = path2.join(PROFILES_DIR, file);
+    try {
+      const content = JSON.parse(fs.readFileSync(filePath, "utf8"));
+      profiles.push({
+        label: content.name || file.replace(".json", ""),
+        value: file,
+        key: file,
+        group: content.group || null,
+        data: content
+      });
+    } catch (error) {
+      logError("loadProfiles", error);
     }
   }
   return profiles;
 };
-const applyProfile = (filename) => {
-  const profilePath = path.join(PROFILES_DIR, filename);
+var applyProfile = (filename) => {
+  const profilePath = path2.join(PROFILES_DIR, filename);
+  if (!fs.existsSync(profilePath)) {
+    throw new Error(`Profile not found: ${filename}`);
+  }
   const profile = JSON.parse(fs.readFileSync(profilePath, "utf8"));
   const { name, group, mcpServers, ...settings } = profile;
   fs.writeFileSync(SETTINGS_PATH, JSON.stringify(settings, null, 2));
@@ -91,32 +122,33 @@ const applyProfile = (filename) => {
       const claudeJson = fs.existsSync(CLAUDE_JSON_PATH) ? JSON.parse(fs.readFileSync(CLAUDE_JSON_PATH, "utf8")) : {};
       claudeJson.mcpServers = mcpServers;
       fs.writeFileSync(CLAUDE_JSON_PATH, JSON.stringify(claudeJson, null, 2));
-    } catch {
+    } catch (error) {
+      logError("applyProfile-mcp", error);
     }
   }
   fs.writeFileSync(LAST_PROFILE_PATH, filename);
   return name || filename;
 };
-const getLastProfile = () => {
+var getLastProfile = () => {
   try {
-    return fs.readFileSync(LAST_PROFILE_PATH, "utf8").trim();
-  } catch {
+    const content = fs.readFileSync(LAST_PROFILE_PATH, "utf8");
+    return content.trim() || null;
+  } catch (error) {
     return null;
   }
 };
-const checkProjectProfile = () => {
-  const localProfile = path.join(process.cwd(), ".claude-profile");
+var checkProjectProfile = () => {
+  const localProfile = path2.join(process.cwd(), ".claude-profile");
   if (fs.existsSync(localProfile)) {
-    return fs.readFileSync(localProfile, "utf8").trim();
+    try {
+      return fs.readFileSync(localProfile, "utf8").trim();
+    } catch (error) {
+      logError("checkProjectProfile", error);
+    }
   }
   return null;
 };
-const logError = (context, error) => {
-  if (process.env.DEBUG || process.env.CM_DEBUG) {
-    console.error(`[${context}]`, error?.message || error);
-  }
-};
-const confirm = async (message) => {
+var confirm = async (message) => {
   const rl = createInterface({
     input: process.stdin,
     output: process.stdout
@@ -124,11 +156,12 @@ const confirm = async (message) => {
   return new Promise((resolve) => {
     rl.question(`${message} (y/N): `, (answer) => {
       rl.close();
-      resolve(answer.toLowerCase() === "y" || answer.toLowerCase() === "yes");
+      const normalized = answer.toLowerCase().trim();
+      resolve(normalized === "y" || normalized === "yes");
     });
   });
 };
-const validateProfile = (profile) => {
+var validateProfile = (profile) => {
   const errors = [];
   if (!profile.name || profile.name.trim().length === 0) {
     errors.push("Profile name is required");
@@ -163,28 +196,41 @@ const validateProfile = (profile) => {
   }
   return { valid: errors.length === 0, errors };
 };
-const getInstalledSkills = () => {
-  const skillsDir = path.join(os.homedir(), ".claude", "skills");
-  if (!fs.existsSync(skillsDir)) return [];
-  return fs.readdirSync(skillsDir).filter((f) => {
-    const p = path.join(skillsDir, f);
-    return fs.statSync(p).isDirectory() && !f.startsWith(".");
-  });
+var getInstalledSkills = () => {
+  if (!fs.existsSync(SKILLS_DIR)) return [];
+  try {
+    return fs.readdirSync(SKILLS_DIR).filter((f) => {
+      const p = path2.join(SKILLS_DIR, f);
+      try {
+        return fs.statSync(p).isDirectory() && !f.startsWith(".");
+      } catch {
+        return false;
+      }
+    });
+  } catch (error) {
+    logError("getInstalledSkills", error);
+    return [];
+  }
 };
-const removeSkill = (skillName) => {
-  const skillPath = path.join(os.homedir(), ".claude", "skills", skillName);
+var removeSkill = (skillName) => {
+  const skillPath = path2.join(SKILLS_DIR, skillName);
   if (!fs.existsSync(skillPath)) {
     return { success: false, message: "Skill not found" };
   }
-  fs.rmSync(skillPath, { recursive: true, force: true });
-  return { success: true };
+  try {
+    fs.rmSync(skillPath, { recursive: true, force: true });
+    return { success: true };
+  } catch (error) {
+    logError("removeSkill", error);
+    return { success: false, message: "Failed to remove skill" };
+  }
 };
-const checkForUpdate = async () => {
-  if (skipUpdate) return { needsUpdate: false };
+var checkForUpdate = async (skipUpdate2) => {
+  if (skipUpdate2) return { needsUpdate: false };
+  const { exec } = await import("child_process");
+  const { promisify } = await import("util");
+  const execAsync = promisify(exec);
   try {
-    const { exec } = await import("child_process");
-    const { promisify } = await import("util");
-    const execAsync = promisify(exec);
     const versionResult = await execAsync("claude --version 2>/dev/null").catch(() => ({ stdout: "" }));
     const current = versionResult.stdout.match(/(\d+\.\d+\.\d+)/)?.[1];
     if (!current) return { needsUpdate: false };
@@ -197,7 +243,7 @@ const checkForUpdate = async () => {
       const npmListResult = await execAsync("npm list -g @anthropic-ai/claude-code 2>/dev/null").catch(() => ({ stdout: "" }));
       if (npmListResult.stdout.includes("@anthropic-ai/claude-code")) {
         try {
-          const npmOutdated = await execAsync("npm outdated -g @anthropic-ai/claude-code --json 2>/dev/null || true", { timeout: 5e3 });
+          const npmOutdated = await execAsync("npm outdated -g @anthropic-ai/claude-code --json 2>/dev/null || true", { timeout: NPM_OUTDATED_TIMEOUT });
           needsUpdate = npmOutdated.stdout.length > 0;
         } catch {
           needsUpdate = true;
@@ -210,35 +256,222 @@ const checkForUpdate = async () => {
     return { needsUpdate: false };
   }
 };
-const launchClaude = () => {
+var launchClaude = (dangerMode2) => {
   try {
-    const claudeArgs = dangerMode ? "--dangerously-skip-permissions" : "";
+    const claudeArgs = dangerMode2 ? "--dangerously-skip-permissions" : "";
     execSync(`claude ${claudeArgs}`, { stdio: "inherit" });
   } catch (e) {
     process.exit(e.status || 1);
   }
   process.exit(0);
 };
+var searchMcpServers = async (query, offset = 0) => {
+  const controller = new AbortController();
+  const timeout = setTimeout(() => controller.abort(), FETCH_TIMEOUT);
+  try {
+    const res = await fetch(`${MCP_REGISTRY_URL}?limit=200`, { signal: controller.signal });
+    if (!res.ok) throw new Error(`HTTP ${res.status}`);
+    const data = await res.json();
+    const seen = /* @__PURE__ */ new Set();
+    const filtered = data.servers.filter((s) => {
+      if (seen.has(s.server.name)) return false;
+      seen.add(s.server.name);
+      const isLatest = s._meta?.["io.modelcontextprotocol.registry/official"]?.isLatest !== false;
+      const matchesQuery = !query || s.server.name.toLowerCase().includes(query.toLowerCase()) || s.server.description?.toLowerCase().includes(query.toLowerCase());
+      return isLatest && matchesQuery;
+    });
+    const MCP_PAGE_SIZE2 = 50;
+    return {
+      servers: filtered.slice(offset, offset + MCP_PAGE_SIZE2),
+      total: filtered.length,
+      hasMore: offset + MCP_PAGE_SIZE2 < filtered.length,
+      offset
+    };
+  } catch (error) {
+    logError("searchMcpServers", error);
+    return { servers: [], total: 0, hasMore: false, offset: 0 };
+  } finally {
+    clearTimeout(timeout);
+  }
+};
+var addMcpToProfile = (server, profileFile) => {
+  const sanitizedFile = sanitizeFilePath(profileFile, PROFILES_DIR);
+  if (!sanitizedFile) {
+    throw new Error("Invalid profile file");
+  }
+  const profilePath = path2.join(PROFILES_DIR, sanitizedFile);
+  const profile = JSON.parse(fs.readFileSync(profilePath, "utf8"));
+  if (!profile.mcpServers) profile.mcpServers = {};
+  const s = server.server;
+  const name = s.name.split("/").pop();
+  if (s.remotes?.[0]) {
+    const remote = s.remotes[0];
+    profile.mcpServers[name] = {
+      type: remote.type === "streamable-http" ? "http" : remote.type,
+      url: remote.url
+    };
+  } else if (s.packages?.[0]) {
+    const pkg = s.packages[0];
+    if (pkg.registryType === "npm") {
+      profile.mcpServers[name] = {
+        type: "stdio",
+        command: "npx",
+        args: ["-y", pkg.identifier]
+      };
+    } else if (pkg.registryType === "pypi") {
+      profile.mcpServers[name] = {
+        type: "stdio",
+        command: "uvx",
+        args: [pkg.identifier]
+      };
+    }
+  }
+  fs.writeFileSync(profilePath, JSON.stringify(profile, null, 2));
+  return name;
+};
+var fetchSkills = async () => {
+  const seen = /* @__PURE__ */ new Set();
+  const skills = [];
+  const promises = SKILL_SOURCES.map(async (source) => {
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), FETCH_TIMEOUT);
+    try {
+      const res = await fetch(source.url, {
+        signal: controller.signal,
+        headers: { "Accept": "application/vnd.github.v3+json" }
+      });
+      if (!res.ok) throw new Error(`HTTP ${res.status}`);
+      const data = await res.json();
+      if (Array.isArray(data)) {
+        for (const s of data.filter((s2) => s2.type === "dir")) {
+          if (!seen.has(s.name)) {
+            seen.add(s.name);
+            skills.push({
+              label: s.name,
+              value: `${source.base}/${s.name}`,
+              key: s.name
+            });
+          }
+        }
+      }
+    } catch (error) {
+      logError(`fetchSkills(${source.url})`, error);
+    } finally {
+      clearTimeout(timeout);
+    }
+  });
+  await Promise.all(promises);
+  return skills.sort((a, b) => a.label.localeCompare(b.label));
+};
+var addSkillToClaudeJson = (skillName, skillUrl) => {
+  try {
+    if (!fs.existsSync(SKILLS_DIR)) fs.mkdirSync(SKILLS_DIR, { recursive: true });
+    const skillPath = path2.join(SKILLS_DIR, skillName);
+    if (fs.existsSync(skillPath)) {
+      return { success: false, message: "Skill already installed" };
+    }
+    const match = skillUrl.match(/github\.com\/([^\/]+)\/([^\/]+)\/tree\/([^\/]+)\/(.+)/);
+    if (!match) return { success: false, message: "Invalid skill URL" };
+    const [, owner, repo, branch, skillSubPath] = match;
+    const tempDir = `/tmp/skill-clone-${Date.now()}`;
+    const sanitizedTempDir = sanitizeFilePath(`skill-clone-${Date.now()}`, "/tmp");
+    const finalTempDir = path2.join("/tmp", sanitizedTempDir || "skill-clone");
+    execSync(`git clone --depth 1 --filter=blob:none --sparse "https://github.com/${owner}/${repo}.git" "${finalTempDir}" 2>/dev/null`, { timeout: GIT_CLONE_TIMEOUT });
+    execSync(`cd "${finalTempDir}" && git sparse-checkout set "${skillSubPath}" 2>/dev/null`, { timeout: GIT_SPARSE_TIMEOUT });
+    const sourcePath = path2.join(finalTempDir, skillSubPath);
+    if (fs.existsSync(sourcePath)) {
+      execSync(`mv "${sourcePath}" "${skillPath}"`, { timeout: GIT_MOVE_TIMEOUT });
+    }
+    execSync(`rm -rf "${finalTempDir}"`, { timeout: GIT_CLEANUP_TIMEOUT });
+    return { success: true };
+  } catch (e) {
+    logError("addSkillToClaudeJson", e);
+    return { success: false, message: "Failed to download skill" };
+  }
+};
+var createDefaultSettings = () => {
+  if (!fs.existsSync(SETTINGS_PATH)) {
+    fs.writeFileSync(SETTINGS_PATH, JSON.stringify(DEFAULT_SETTINGS, null, 2));
+  }
+};
+var buildProfileData = (name, provider, apiKey, model, group, providers) => {
+  const prov = providers.find((p) => p.value === provider);
+  return {
+    name,
+    group: group || void 0,
+    env: {
+      ...apiKey && { ANTHROPIC_AUTH_TOKEN: apiKey },
+      ...model && { ANTHROPIC_MODEL: model },
+      ...prov?.url && { ANTHROPIC_BASE_URL: prov.url },
+      API_TIMEOUT_MS
+    },
+    model: "opus",
+    alwaysThinkingEnabled: true,
+    defaultMode: "bypassPermissions"
+  };
+};
+
+// src/cli.js
+ensureProfilesDir();
+var args = process.argv.slice(2);
+var cmd = args[0];
+if (args.includes("-v") || args.includes("--version")) {
+  console.log(`cm v${VERSION}`);
+  process.exit(0);
+}
+if (args.includes("-h") || args.includes("--help")) {
+  console.log(`cm v${VERSION} - Claude Settings Manager
+
+Usage: cm [command] [options]
+
+Commands:
+  (none)          Select profile interactively
+  new             Create a new profile
+  edit <n>        Edit profile (by name or number)
+  copy <n> <new>  Copy/duplicate a profile
+  delete <n>      Delete profile (by name or number)
+  status          Show current settings
+  list            List all profiles
+  config          Open Claude settings.json in editor
+  mcp [query]     Search and add MCP servers
+  mcp remove      Remove MCP server from profile
+  skills          Browse and add Anthropic skills
+  skills list     List installed skills
+  skills remove   Remove an installed skill
+
+Options:
+  --last, -l      Use last profile without menu
+  --skip-update   Skip update check
+  --yolo          Run claude with --dangerously-skip-permissions
+  --force, -f     Skip confirmation prompts (e.g., for delete)
+  -v, --version   Show version
+  -h, --help      Show help`);
+  process.exit(0);
+}
+var skipUpdate = args.includes("--skip-update");
+var useLast = args.includes("--last") || args.includes("-l");
+var dangerMode = args.includes("--dangerously-skip-permissions") || args.includes("--yolo");
 if (useLast) {
   const last = getLastProfile();
-  if (last && fs.existsSync(path.join(PROFILES_DIR, last))) {
+  const lastPath = last ? path3.join(PROFILES_DIR, last) : null;
+  if (last && lastPath && fs2.existsSync(lastPath)) {
     const name = applyProfile(last);
     console.log(`\x1B[32m\u2713\x1B[0m Applied: ${name}
 `);
-    launchClaude();
+    launchClaude(dangerMode);
   } else {
     console.log("\x1B[31mNo last profile found\x1B[0m");
     process.exit(1);
   }
 }
-const projectProfile = checkProjectProfile();
+var projectProfile = checkProjectProfile();
 if (projectProfile && !cmd) {
   const profiles = loadProfiles();
   const match = profiles.find((p) => p.label === projectProfile || p.value === projectProfile + ".json");
   if (match) {
     console.log(`\x1B[36mUsing project profile: ${match.label}\x1B[0m`);
     applyProfile(match.value);
-    launchClaude();
+    launchClaude(dangerMode);
   }
 }
 if (cmd === "status") {
@@ -260,36 +493,29 @@ Profile MCP Servers (${Object.keys(mcpServers).length}):`);
   } else {
     console.log("No profile active");
   }
-  const skillsDir = path.join(os.homedir(), ".claude", "skills");
-  try {
-    if (fs.existsSync(skillsDir)) {
-      const installedSkills = fs.readdirSync(skillsDir).filter((f) => {
-        const p = path.join(skillsDir, f);
-        return fs.statSync(p).isDirectory() && !f.startsWith(".");
-      });
-      if (installedSkills.length > 0) {
-        console.log(`
+  const installedSkills = getInstalledSkills();
+  if (installedSkills.length > 0) {
+    console.log(`
 Installed Skills (${installedSkills.length}):`);
-        installedSkills.forEach((s) => console.log(`  - ${s}`));
-      }
-    }
-  } catch {
+    installedSkills.forEach((s) => console.log(`  - ${s}`));
   }
   try {
-    const claudeJson = JSON.parse(fs.readFileSync(CLAUDE_JSON_PATH, "utf8"));
+    const claudeJson = JSON.parse(fs2.readFileSync(CLAUDE_JSON_PATH, "utf8"));
     const globalMcp = claudeJson.mcpServers || {};
     if (Object.keys(globalMcp).length > 0) {
       console.log(`
 Global MCP Servers (${Object.keys(globalMcp).length}):`);
       Object.keys(globalMcp).forEach((s) => console.log(`  - ${s}`));
     }
-  } catch {
+  } catch (error) {
+    logError("status-mcp", error);
   }
   try {
-    const ver = execSync("claude --version 2>/dev/null", { encoding: "utf8" }).trim();
+    const ver = execSync2("claude --version 2>/dev/null", { encoding: "utf8" }).trim();
     console.log(`
 Claude: ${ver}`);
-  } catch {
+  } catch (error) {
+    logError("status-version", error);
   }
   process.exit(0);
 }
@@ -305,34 +531,35 @@ if (cmd === "list") {
 }
 if (cmd === "config") {
   const editor = process.env.EDITOR || "nano";
-  const configPath = SETTINGS_PATH;
-  if (!fs.existsSync(configPath)) {
-    console.log(`\x1B[33mSettings file not found. Creating default settings...\x1B[0m`);
-    fs.writeFileSync(configPath, JSON.stringify({
-      env: {},
-      model: "opus",
-      alwaysThinkingEnabled: true,
-      defaultMode: "bypassPermissions"
-    }, null, 2));
-  }
-  console.log(`Opening ${configPath} in ${editor}...`);
-  spawnSync(editor, [configPath], { stdio: "inherit" });
+  createDefaultSettings();
+  console.log(`Opening ${SETTINGS_PATH} in ${editor}...`);
+  spawnSync(editor, [SETTINGS_PATH], { stdio: "inherit" });
   process.exit(0);
 }
 if (cmd === "delete") {
   const forceDelete = args.includes("--force") || args.includes("-f");
   const profiles = loadProfiles();
   const target = args[1];
-  const idx = parseInt(target) - 1;
-  const match = profiles[idx] || profiles.find((p) => p.label.toLowerCase() === target?.toLowerCase());
+  if (!target) {
+    console.log("\x1B[31mUsage: cm delete <profile>\x1B[0m");
+    console.log("  profile: Profile name or number");
+    process.exit(1);
+  }
+  const idx = safeParseInt(target, -1);
+  const match = idx > 0 && idx <= profiles.length ? profiles[idx - 1] : profiles.find((p) => p.label.toLowerCase() === target?.toLowerCase());
   if (!match) {
     console.log(`\x1B[31mProfile not found: ${target}\x1B[0m`);
     process.exit(1);
   }
   const shouldDelete = forceDelete || await confirm(`Delete profile "${match.label}"?`);
   if (shouldDelete) {
-    fs.unlinkSync(path.join(PROFILES_DIR, match.value));
-    console.log(`\x1B[32m\u2713\x1B[0m Deleted: ${match.label}`);
+    const filePath = path3.join(PROFILES_DIR, match.value);
+    if (fs2.existsSync(filePath)) {
+      fs2.unlinkSync(filePath);
+      console.log(`\x1B[32m\u2713\x1B[0m Deleted: ${match.label}`);
+    } else {
+      console.log(`\x1B[31mProfile file not found: ${match.value}\x1B[0m`);
+    }
   } else {
     console.log("\x1B[33mCancelled\x1B[0m");
   }
@@ -341,11 +568,21 @@ if (cmd === "delete") {
 if (cmd === "edit") {
   const profiles = loadProfiles();
   const target = args[1];
-  const idx = parseInt(target) - 1;
-  const match = profiles[idx] || profiles.find((p) => p.label.toLowerCase() === target?.toLowerCase());
+  if (!target) {
+    console.log("\x1B[31mUsage: cm edit <profile>\x1B[0m");
+    console.log("  profile: Profile name or number");
+    process.exit(1);
+  }
+  const idx = safeParseInt(target, -1);
+  const match = idx > 0 && idx <= profiles.length ? profiles[idx - 1] : profiles.find((p) => p.label.toLowerCase() === target?.toLowerCase());
   if (match) {
     const editor = process.env.EDITOR || "nano";
-    spawnSync(editor, [path.join(PROFILES_DIR, match.value)], { stdio: "inherit" });
+    const filePath = path3.join(PROFILES_DIR, match.value);
+    if (fs2.existsSync(filePath)) {
+      spawnSync(editor, [filePath], { stdio: "inherit" });
+    } else {
+      console.log(`\x1B[31mProfile file not found: ${match.value}\x1B[0m`);
+    }
   } else {
     console.log(`\x1B[31mProfile not found: ${target}\x1B[0m`);
   }
@@ -361,87 +598,29 @@ if (cmd === "copy") {
     console.log("  new-name: Name for the copied profile");
     process.exit(1);
   }
-  const idx = parseInt(target) - 1;
-  const match = profiles[idx] || profiles.find((p) => p.label.toLowerCase() === target?.toLowerCase());
+  const idx = safeParseInt(target, -1);
+  const match = idx > 0 && idx <= profiles.length ? profiles[idx - 1] : profiles.find((p) => p.label.toLowerCase() === target?.toLowerCase());
   if (!match) {
     console.log(`\x1B[31mProfile not found: ${target}\x1B[0m`);
     process.exit(1);
   }
-  const profile = JSON.parse(fs.readFileSync(path.join(PROFILES_DIR, match.value), "utf8"));
+  const sourcePath = path3.join(PROFILES_DIR, match.value);
+  const profile = JSON.parse(fs2.readFileSync(sourcePath, "utf8"));
   profile.name = newName;
-  const newFilename = newName.toLowerCase().replace(/\s+/g, "-") + ".json";
-  if (fs.existsSync(path.join(PROFILES_DIR, newFilename))) {
+  const newFilename = sanitizeProfileName(newName) + ".json";
+  const destPath = path3.join(PROFILES_DIR, newFilename);
+  if (fs2.existsSync(destPath)) {
     const shouldOverwrite = await confirm(`Profile "${newName}" already exists. Overwrite?`);
     if (!shouldOverwrite) {
       console.log("\x1B[33mCancelled\x1B[0m");
       process.exit(0);
     }
   }
-  fs.writeFileSync(path.join(PROFILES_DIR, newFilename), JSON.stringify(profile, null, 2));
+  fs2.writeFileSync(destPath, JSON.stringify(profile, null, 2));
   console.log(`\x1B[32m\u2713\x1B[0m Copied "${match.label}" to "${newName}"`);
   process.exit(0);
 }
-const MCP_PAGE_SIZE = 50;
-const searchMcpServers = async (query, offset = 0) => {
-  const controller = new AbortController();
-  const timeout = setTimeout(() => controller.abort(), 1e4);
-  try {
-    const res = await fetch(`${MCP_REGISTRY_URL}?limit=200`, { signal: controller.signal });
-    if (!res.ok) throw new Error(`HTTP ${res.status}`);
-    const data = await res.json();
-    const seen = /* @__PURE__ */ new Set();
-    const filtered = data.servers.filter((s) => {
-      if (seen.has(s.server.name)) return false;
-      seen.add(s.server.name);
-      const isLatest = s._meta?.["io.modelcontextprotocol.registry/official"]?.isLatest !== false;
-      const matchesQuery = !query || s.server.name.toLowerCase().includes(query.toLowerCase()) || s.server.description?.toLowerCase().includes(query.toLowerCase());
-      return isLatest && matchesQuery;
-    });
-    return {
-      servers: filtered.slice(offset, offset + MCP_PAGE_SIZE),
-      total: filtered.length,
-      hasMore: offset + MCP_PAGE_SIZE < filtered.length,
-      offset
-    };
-  } catch (error) {
-    logError("searchMcpServers", error);
-    return { servers: [], total: 0, hasMore: false, offset: 0 };
-  } finally {
-    clearTimeout(timeout);
-  }
-};
-const addMcpToProfile = (server, profileFile) => {
-  const profilePath = path.join(PROFILES_DIR, profileFile);
-  const profile = JSON.parse(fs.readFileSync(profilePath, "utf8"));
-  if (!profile.mcpServers) profile.mcpServers = {};
-  const s = server.server;
-  const name = s.name.split("/").pop();
-  if (s.remotes?.[0]) {
-    const remote = s.remotes[0];
-    profile.mcpServers[name] = {
-      type: remote.type === "streamable-http" ? "http" : remote.type,
-      url: remote.url
-    };
-  } else if (s.packages?.[0]) {
-    const pkg = s.packages[0];
-    if (pkg.registryType === "npm") {
-      profile.mcpServers[name] = {
-        type: "stdio",
-        command: "npx",
-        args: ["-y", pkg.identifier]
-      };
-    } else if (pkg.registryType === "pypi") {
-      profile.mcpServers[name] = {
-        type: "stdio",
-        command: "uvx",
-        args: [pkg.identifier]
-      };
-    }
-  }
-  fs.writeFileSync(profilePath, JSON.stringify(profile, null, 2));
-  return name;
-};
-const McpSearch = () => {
+var McpSearch = () => {
   const { exit } = useApp();
   const [step, setStep] = useState(args[1] ? "loading" : "search");
   const [query, setQuery] = useState(args[1] || "");
@@ -519,9 +698,14 @@ const McpSearch = () => {
       {
         items: profileItems,
         onSelect: (item) => {
-          const name = addMcpToProfile(selectedServer, item.value);
-          console.log(`
+          try {
+            const name = addMcpToProfile(selectedServer, item.value);
+            console.log(`
 \x1B[32m\u2713\x1B[0m Added ${name} to ${item.label}`);
+          } catch (error) {
+            console.log(`
+\x1B[31m\u2717\x1B[0m ${error.message}`);
+          }
           exit();
         }
       }
@@ -529,72 +713,11 @@ const McpSearch = () => {
   }
   return null;
 };
-const SKILL_SOURCES = [
-  { url: "https://api.github.com/repos/anthropics/skills/contents/skills", base: "https://github.com/anthropics/skills/tree/main/skills" },
-  { url: "https://api.github.com/repos/Prat011/awesome-llm-skills/contents/skills", base: "https://github.com/Prat011/awesome-llm-skills/tree/main/skills" },
-  { url: "https://api.github.com/repos/skillcreatorai/Ai-Agent-Skills/contents/skills", base: "https://github.com/skillcreatorai/Ai-Agent-Skills/tree/main/skills" }
-];
-const fetchSkills = async () => {
-  const seen = /* @__PURE__ */ new Set();
-  const skills = [];
-  const promises = SKILL_SOURCES.map(async (source) => {
-    const controller = new AbortController();
-    const timeout = setTimeout(() => controller.abort(), 1e4);
-    try {
-      const res = await fetch(source.url, {
-        signal: controller.signal,
-        headers: { "Accept": "application/vnd.github.v3+json" }
-      });
-      if (!res.ok) throw new Error(`HTTP ${res.status}`);
-      const data = await res.json();
-      if (Array.isArray(data)) {
-        for (const s of data.filter((s2) => s2.type === "dir")) {
-          if (!seen.has(s.name)) {
-            seen.add(s.name);
-            skills.push({
-              label: s.name,
-              value: `${source.base}/${s.name}`,
-              key: s.name
-            });
-          }
-        }
-      }
-    } catch (error) {
-      logError(`fetchSkills(${source.url})`, error);
-    } finally {
-      clearTimeout(timeout);
-    }
-  });
-  await Promise.all(promises);
-  return skills.sort((a, b) => a.label.localeCompare(b.label));
-};
-const SKILLS_DIR = path.join(os.homedir(), ".claude", "skills");
-const addSkillToClaudeJson = (skillName, skillUrl) => {
-  try {
-    if (!fs.existsSync(SKILLS_DIR)) fs.mkdirSync(SKILLS_DIR, { recursive: true });
-    const skillPath = path.join(SKILLS_DIR, skillName);
-    if (fs.existsSync(skillPath)) {
-      return { success: false, message: "Skill already installed" };
-    }
-    const match = skillUrl.match(/github\.com\/([^\/]+)\/([^\/]+)\/tree\/([^\/]+)\/(.+)/);
-    if (!match) return { success: false, message: "Invalid skill URL" };
-    const [, owner, repo, branch, skillSubPath] = match;
-    const tempDir = `/tmp/skill-clone-${Date.now()}`;
-    execSync(`git clone --depth 1 --filter=blob:none --sparse "https://github.com/${owner}/${repo}.git" "${tempDir}" 2>/dev/null`, { timeout: 3e4 });
-    execSync(`cd "${tempDir}" && git sparse-checkout set "${skillSubPath}" 2>/dev/null`, { timeout: 1e4 });
-    execSync(`mv "${tempDir}/${skillSubPath}" "${skillPath}"`, { timeout: 5e3 });
-    execSync(`rm -rf "${tempDir}"`, { timeout: 5e3 });
-    return { success: true };
-  } catch (e) {
-    return { success: false, message: "Failed to download skill" };
-  }
-};
-const SkillsBrowser = () => {
+var SkillsBrowser = () => {
   const { exit } = useApp();
   const [allSkills, setAllSkills] = useState([]);
   const [loading, setLoading] = useState(true);
   const [offset, setOffset] = useState(0);
-  const SKILLS_PAGE_SIZE = 50;
   useEffect(() => {
     const loadSkills = async () => {
       const s = await fetchSkills();
@@ -662,8 +785,8 @@ if (cmd === "skills") {
       process.exit(1);
     }
     const installed = getInstalledSkills();
-    const idx = parseInt(target) - 1;
-    const match = installed[idx] || installed.find((s) => s.toLowerCase() === target?.toLowerCase());
+    const idx = safeParseInt(target, -1);
+    const match = idx > 0 && idx <= installed.length ? installed[idx - 1] : installed.find((s) => s.toLowerCase() === target?.toLowerCase());
     if (!match) {
       console.log(`\x1B[31mSkill not found: ${target}\x1B[0m`);
       console.log('Run "cm skills list" to see installed skills');
@@ -699,14 +822,18 @@ if (cmd === "skills") {
       console.log("  profile: Profile name or number");
       process.exit(1);
     }
-    const idx = parseInt(targetProfile) - 1;
-    const profileMatch = profiles[idx] || profiles.find((p) => p.label.toLowerCase() === targetProfile?.toLowerCase());
+    const idx = safeParseInt(targetProfile, -1);
+    const profileMatch = idx > 0 && idx <= profiles.length ? profiles[idx - 1] : profiles.find((p) => p.label.toLowerCase() === targetProfile?.toLowerCase());
     if (!profileMatch) {
       console.log(`\x1B[31mProfile not found: ${targetProfile}\x1B[0m`);
       process.exit(1);
     }
-    const profilePath = path.join(PROFILES_DIR, profileMatch.value);
-    const profile = JSON.parse(fs.readFileSync(profilePath, "utf8"));
+    const profilePath = path3.join(PROFILES_DIR, profileMatch.value);
+    if (!fs2.existsSync(profilePath)) {
+      console.log(`\x1B[31mProfile file not found: ${profileMatch.value}\x1B[0m`);
+      process.exit(1);
+    }
+    const profile = JSON.parse(fs2.readFileSync(profilePath, "utf8"));
     const mcpServers = profile.mcpServers || {};
     if (Object.keys(mcpServers).length === 0) {
       console.log(`\x1B[33mNo MCP servers configured in "${profileMatch.label}"\x1B[0m`);
@@ -721,7 +848,7 @@ if (cmd === "skills") {
     if (shouldRemove) {
       delete mcpServers[serverName];
       profile.mcpServers = mcpServers;
-      fs.writeFileSync(profilePath, JSON.stringify(profile, null, 2));
+      fs2.writeFileSync(profilePath, JSON.stringify(profile, null, 2));
       console.log(`\x1B[32m\u2713\x1B[0m Removed "${serverName}" from "${profileMatch.label}"`);
     } else {
       console.log("\x1B[33mCancelled\x1B[0m");
@@ -739,43 +866,23 @@ if (cmd === "skills") {
     const [model, setModel] = useState("");
     const [group, setGroup] = useState("");
     const [validationErrors, setValidationErrors] = useState([]);
-    const providers = [
-      { label: "Anthropic (Direct)", value: "anthropic", url: "", needsKey: true },
-      { label: "Amazon Bedrock", value: "bedrock", url: "", needsKey: false },
-      { label: "Z.AI", value: "zai", url: "https://api.z.ai/api/anthropic", needsKey: true },
-      { label: "MiniMax", value: "minimax", url: "https://api.minimax.io/anthropic", needsKey: true },
-      { label: "Custom", value: "custom", url: "", needsKey: true }
-    ];
     const handleSave = () => {
-      const prov = providers.find((p) => p.value === provider);
-      const profile = {
-        name,
-        group: group || void 0,
-        env: {
-          ...apiKey && { ANTHROPIC_AUTH_TOKEN: apiKey },
-          ...model && { ANTHROPIC_MODEL: model },
-          ...prov?.url && { ANTHROPIC_BASE_URL: prov.url },
-          API_TIMEOUT_MS: "3000000"
-        },
-        model: "opus",
-        alwaysThinkingEnabled: true,
-        defaultMode: "bypassPermissions"
-      };
+      const profile = buildProfileData(name, provider, apiKey, model, group, PROVIDERS);
       const validation = validateProfile(profile);
       if (!validation.valid) {
         setStep("error");
         setValidationErrors(validation.errors);
         return;
       }
-      const filename = name.toLowerCase().replace(/\s+/g, "-") + ".json";
-      fs.writeFileSync(path.join(PROFILES_DIR, filename), JSON.stringify(profile, null, 2));
+      const filename = sanitizeProfileName(name) + ".json";
+      fs2.writeFileSync(path3.join(PROFILES_DIR, filename), JSON.stringify(profile, null, 2));
       console.log(`
 \x1B[32m\u2713\x1B[0m Created: ${name}`);
       exit();
     };
     const handleProviderSelect = (item) => {
       setProvider(item.value);
-      const prov = providers.find((p) => p.value === item.value);
+      const prov = PROVIDERS.find((p) => p.value === item.value);
       setStep(prov.needsKey ? "apikey" : "model");
     };
     useInput((input, key) => {
@@ -784,7 +891,7 @@ if (cmd === "skills") {
         setValidationErrors([]);
       }
     });
-    return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React.createElement(Text, { bold: true, color: "cyan" }, "New Profile"), /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"), step === "name" && /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, null, "Name: "), /* @__PURE__ */ React.createElement(TextInput, { value: name, onChange: setName, onSubmit: () => setStep("provider") })), step === "provider" && /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, null, "Provider:"), /* @__PURE__ */ React.createElement(SelectInput, { items: providers, onSelect: handleProviderSelect })), step === "apikey" && /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, null, "API Key: "), /* @__PURE__ */ React.createElement(TextInput, { value: apiKey, onChange: setApiKey, onSubmit: () => setStep("model"), mask: "*" })), step === "model" && /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, null, "Model ID (optional): "), /* @__PURE__ */ React.createElement(TextInput, { value: model, onChange: setModel, onSubmit: () => setStep("group") })), step === "group" && /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, null, "Group (optional): "), /* @__PURE__ */ React.createElement(TextInput, { value: group, onChange: setGroup, onSubmit: handleSave })), step === "error" && /* @__PURE__ */ React.createElement(Box, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React.createElement(Text, { color: "red" }, "Validation errors:"), validationErrors.map((err, i) => /* @__PURE__ */ React.createElement(Text, { key: i, color: "yellow" }, "  \u2022 ", err)), /* @__PURE__ */ React.createElement(Text, { marginTop: 1 }, "Press any key to go back and fix...")));
+    return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React.createElement(Text, { bold: true, color: "cyan" }, "New Profile"), /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"), step === "name" && /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, null, "Name: "), /* @__PURE__ */ React.createElement(TextInput, { value: name, onChange: setName, onSubmit: () => setStep("provider") })), step === "provider" && /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, null, "Provider:"), /* @__PURE__ */ React.createElement(SelectInput, { items: PROVIDERS, onSelect: handleProviderSelect })), step === "apikey" && /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, null, "API Key: "), /* @__PURE__ */ React.createElement(TextInput, { value: apiKey, onChange: setApiKey, onSubmit: () => setStep("model"), mask: "*" })), step === "model" && /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, null, "Model ID (optional): "), /* @__PURE__ */ React.createElement(TextInput, { value: model, onChange: setModel, onSubmit: () => setStep("group") })), step === "group" && /* @__PURE__ */ React.createElement(Box, { marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, null, "Group (optional): "), /* @__PURE__ */ React.createElement(TextInput, { value: group, onChange: setGroup, onSubmit: handleSave })), step === "error" && /* @__PURE__ */ React.createElement(Box, { marginTop: 1, flexDirection: "column" }, /* @__PURE__ */ React.createElement(Text, { color: "red" }, "Validation errors:"), validationErrors.map((err, i) => /* @__PURE__ */ React.createElement(Text, { key: i, color: "yellow" }, "  \u2022 ", err)), /* @__PURE__ */ React.createElement(Text, { marginTop: 1 }, "Press any key to go back and fix...")));
   };
   render(/* @__PURE__ */ React.createElement(NewProfileWizard, null));
 } else {
@@ -818,9 +925,9 @@ if (cmd === "skills") {
       { label: "/skills", description: "Browse and install skills", action: () => render(/* @__PURE__ */ React.createElement(SkillsBrowser, null)) },
       { label: "/mcp", description: "Search and add MCP servers", action: () => render(/* @__PURE__ */ React.createElement(McpSearch, null)) },
       { label: "/new", description: "Create new profile", action: () => setStep("newProfile") },
-      { label: "/list", description: "List all profiles", action: () => execSync("cm list", { stdio: "inherit" }) },
-      { label: "/status", description: "Show current settings", action: () => execSync("cm status", { stdio: "inherit" }) },
-      { label: "/config", description: "Edit Claude settings", action: () => execSync("cm config", { stdio: "inherit" }) },
+      { label: "/list", description: "List all profiles", action: () => execSync2("cm list", { stdio: "inherit" }) },
+      { label: "/status", description: "Show current settings", action: () => execSync2("cm status", { stdio: "inherit" }) },
+      { label: "/config", description: "Edit Claude settings", action: () => execSync2("cm config", { stdio: "inherit" }) },
       { label: "/help", description: "Show keyboard shortcuts", action: () => setShowHelp(true) },
       { label: "/quit", description: "Exit cm", action: () => process.exit(0) }
     ];
@@ -828,8 +935,7 @@ if (cmd === "skills") {
       if (!filter) return profiles;
       const fuse = new Fuse(profiles, {
         keys: ["label", "group"],
-        threshold: 0.3,
-        // Lower = more strict matching
+        threshold: FUSE_THRESHOLD,
         ignoreLocation: true,
         includeScore: true
       });
@@ -840,7 +946,7 @@ if (cmd === "skills") {
       const search = commandInput.toLowerCase().replace(/^\//, "");
       const fuse = new Fuse(commands, {
         keys: ["label", "description"],
-        threshold: 0.3,
+        threshold: FUSE_THRESHOLD,
         ignoreLocation: true
       });
       return fuse.search(search).map((r) => r.item);
@@ -848,7 +954,7 @@ if (cmd === "skills") {
     useEffect(() => {
       setTimeout(() => setStep("select"), 1500);
       if (!skipUpdate) {
-        checkForUpdate().then(setUpdateInfo);
+        checkForUpdate(skipUpdate).then(setUpdateInfo);
       }
     }, []);
     useInput((input, key) => {
@@ -880,24 +986,24 @@ if (cmd === "skills") {
         return;
       }
       if (step === "select") {
-        const num = parseInt(input);
+        const num = safeParseInt(input, -1);
         if (num >= 1 && num <= 9 && num <= filteredProfiles.length) {
           const profile = filteredProfiles[num - 1];
           applyProfile(profile.value);
           console.log(`
 \x1B[32m\u2713\x1B[0m Applied: ${profile.label}
 `);
-          launchClaude();
+          launchClaude(dangerMode);
         }
         if (input === "u" && updateInfo?.needsUpdate) {
           console.log("\n\x1B[33mUpdating Claude...\x1B[0m\n");
           try {
             if (process.platform === "darwin") {
-              execSync("brew upgrade claude-code", { stdio: "inherit" });
+              execSync2("brew upgrade claude-code", { stdio: "inherit" });
             } else {
-              execSync("npm update -g @anthropic-ai/claude-code", { stdio: "inherit" });
+              execSync2("npm update -g @anthropic-ai/claude-code", { stdio: "inherit" });
             }
-            console.log("\n\x1B[32m\u2713 Updated!\x1B[0m\n");
+            console.log("\x1B[32m\u2713 Updated!\x1B[0m\n");
             setUpdateInfo({ ...updateInfo, needsUpdate: false });
           } catch (error) {
             console.log("\x1B[31m\u2717 Update failed\x1B[0m\n");
@@ -923,17 +1029,9 @@ if (cmd === "skills") {
         }
         if (input === "c") {
           const editor = process.env.EDITOR || "nano";
-          const configPath = SETTINGS_PATH;
-          if (!fs.existsSync(configPath)) {
-            fs.writeFileSync(configPath, JSON.stringify({
-              env: {},
-              model: "opus",
-              alwaysThinkingEnabled: true,
-              defaultMode: "bypassPermissions"
-            }, null, 2));
-          }
+          createDefaultSettings();
           console.clear();
-          spawnSync(editor, [configPath], { stdio: "inherit" });
+          spawnSync(editor, [SETTINGS_PATH], { stdio: "inherit" });
           console.log("\n\x1B[36mConfig edited. Press Enter to continue...\x1B[0m");
         }
       }
@@ -970,9 +1068,9 @@ if (cmd === "skills") {
       console.log(`
 \x1B[32m\u2713\x1B[0m Applied: ${item.label.replace(/^\d+\.\s*/, "")}
 `);
-      launchClaude();
+      launchClaude(dangerMode);
     };
-    return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React.createElement(Text, { bold: true, color: "cyan" }, LOGO), /* @__PURE__ */ React.createElement(Text, { bold: true, color: "magenta" }, "MANAGER v", VERSION), /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"), updateInfo?.current && /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "Claude v", updateInfo.current), updateInfo?.needsUpdate && /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "\u26A0 Update available! Press 'u' to upgrade"), filter && /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "Filter: ", filter), /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, null, "Select Profile: ", /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "(1-9 select, / commands, ? help, c config", updateInfo?.needsUpdate ? ", u update" : "", ")")), /* @__PURE__ */ React.createElement(
+    return /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", padding: 1 }, /* @__PURE__ */ React.createElement(Text, { bold: true, color: "cyan" }, LOGO), /* @__PURE__ */ React.createElement(Text, { bold: true, color: "magenta" }, "MANAGER v", VERSION), /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500"), updateInfo?.current && /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "Claude v", updateInfo.current), updateInfo?.needsUpdate && /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "Update available! Press 'u' to upgrade"), filter && /* @__PURE__ */ React.createElement(Text, { color: "yellow" }, "Filter: ", filter), /* @__PURE__ */ React.createElement(Box, { flexDirection: "column", marginTop: 1 }, /* @__PURE__ */ React.createElement(Text, null, "Select Profile: ", /* @__PURE__ */ React.createElement(Text, { dimColor: true }, "(1-9 select, / commands, ? help, c config", updateInfo?.needsUpdate ? ", u update" : "", ")")), /* @__PURE__ */ React.createElement(
       SelectInput,
       {
         items: groupedItems,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-manager",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "Terminal app for managing Claude Code settings, profiles, MCP servers, and skills",
   "type": "module",
   "bin": {
@@ -8,7 +8,7 @@
     "claude-manager": "./dist/cli.js"
   },
   "scripts": {
-    "build": "esbuild src/cli.js --platform=node --format=esm --loader:.js=jsx --outfile=dist/cli.js --packages=external && echo '#!/usr/bin/env node' | cat - dist/cli.js > dist/tmp && mv dist/tmp dist/cli.js && chmod +x dist/cli.js",
+    "build": "esbuild src/cli.js --platform=node --format=esm --loader:.js=jsx --bundle --outfile=dist/cli.js --packages=external && echo '#!/usr/bin/env node' | cat - dist/cli.js > dist/tmp && mv dist/tmp dist/cli.js && chmod +x dist/cli.js",
     "prepublishOnly": "npm run build"
   },
   "files": [