cc-claw 0.16.0 → 0.16.2

package/dist/cli.js

@@ -33,7 +33,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = true ? "0.16.0" : (() => {
+    VERSION = true ? "0.16.2" : (() => {
       try {
         return JSON.parse(readFileSync(join(process.cwd(), "package.json"), "utf-8")).version ?? "unknown";
       } catch {
@@ -3339,16 +3339,16 @@ var init_gemini_slots = __esm({
 function getBackendSlots(backend2) {
   return getDb().prepare(`
     SELECT ${SLOT_COLUMNS}
-    FROM backend_credentials WHERE backend = ? ORDER BY priority ASC, id ASC
+    FROM backend_credentials bc WHERE bc.backend = ? ORDER BY bc.priority ASC, bc.id ASC
   `).all(backend2);
 }
 function getEligibleBackendSlots(backend2) {
   return getDb().prepare(`
     SELECT ${SLOT_COLUMNS}
-    FROM backend_credentials
-    WHERE backend = ? AND enabled = 1
-      AND (cooldown_until IS NULL OR cooldown_until <= datetime('now'))
-    ORDER BY priority ASC, last_used ASC NULLS FIRST
+    FROM backend_credentials bc
+    WHERE bc.backend = ? AND bc.enabled = 1
+      AND (bc.cooldown_until IS NULL OR bc.cooldown_until <= datetime('now'))
+    ORDER BY bc.priority ASC, bc.last_used ASC NULLS FIRST
   `).all(backend2);
 }
 function getChatBackendSlotId(chatId, backend2) {
@@ -3425,9 +3425,9 @@ var init_backend_slots = __esm({
     "use strict";
     init_store5();
     SLOT_COLUMNS = `
-  id, backend, slot_type AS slotType, label, api_key AS apiKey, config_home AS configHome,
-  priority, enabled, cooldown_until AS cooldownUntil, last_used AS lastUsed,
-  consecutive_errors AS consecutiveErrors, created_at AS createdAt
+  bc.id, bc.backend, bc.slot_type AS slotType, bc.label, bc.api_key AS apiKey, bc.config_home AS configHome,
+  bc.priority, bc.enabled, bc.cooldown_until AS cooldownUntil, bc.last_used AS lastUsed,
+  bc.consecutive_errors AS consecutiveErrors, bc.created_at AS createdAt
 `;
   }
 });
@@ -9932,11 +9932,11 @@ var init_evolve = __esm({
         const body = JSON.parse(await readBody(req));
         const { setReflectionStatus: setReflectionStatus2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
         const { existsSync: fileExists, readFileSync: fileRead } = await import("fs");
-        const { join: join28 } = await import("path");
+        const { join: join29 } = await import("path");
         const { CC_CLAW_HOME: home } = await Promise.resolve().then(() => (init_paths(), paths_exports));
         const chatId = body.chatId || (process.env.ALLOWED_CHAT_ID ?? "").split(",")[0]?.trim() || "default";
-        const soulPath = join28(home, "identity/SOUL.md");
-        const userPath = join28(home, "identity/USER.md");
+        const soulPath = join29(home, "identity/SOUL.md");
+        const userPath = join29(home, "identity/USER.md");
         const soul = fileExists(soulPath) ? fileRead(soulPath, "utf-8") : "";
         const user = fileExists(userPath) ? fileRead(userPath, "utf-8") : "";
         setReflectionStatus2(getDb(), chatId, "active", soul, user);
@@ -13697,7 +13697,9 @@ var init_guard = __esm({
       /\bnpm\s+(start|run\s+dev)\b/,
       // daemon-starting npm commands
       // CC-Claw config mutation — agents must not silently change backend/model/permissions
-      /\bcc-claw\s+(backend|model|permissions)\s+set\b/
+      /\bcc-claw\s+(backend|model|permissions)\s+set\b/,
+      // Direct database access — agents must use the CLI/API, never raw SQL
+      /\bsqlite3\b.*\bcc-claw\b/
     ];
     pendingCommands = /* @__PURE__ */ new Map();
     PENDING_TTL_MS = 5 * 60 * 1e3;
@@ -15902,13 +15904,13 @@ async function handleEvolveCallback(chatId, data, channel) {
       const { getReflectionStatus: getReflectionStatus2, setReflectionStatus: setReflectionStatus2 } = await Promise.resolve().then(() => (init_store4(), store_exports4));
       const current = getReflectionStatus2(getDb(), chatId);
       if (current === "frozen") {
-        const { readFileSync: readFileSync21, existsSync: existsSync49 } = await import("fs");
-        const { join: join28 } = await import("path");
+        const { readFileSync: readFileSync22, existsSync: existsSync49 } = await import("fs");
+        const { join: join29 } = await import("path");
         const { CC_CLAW_HOME: CC_CLAW_HOME3 } = await Promise.resolve().then(() => (init_paths(), paths_exports));
-        const soulPath = join28(CC_CLAW_HOME3, "identity/SOUL.md");
-        const userPath = join28(CC_CLAW_HOME3, "identity/USER.md");
-        const soul = existsSync49(soulPath) ? readFileSync21(soulPath, "utf-8") : "";
-        const user = existsSync49(userPath) ? readFileSync21(userPath, "utf-8") : "";
+        const soulPath = join29(CC_CLAW_HOME3, "identity/SOUL.md");
+        const userPath = join29(CC_CLAW_HOME3, "identity/USER.md");
+        const soul = existsSync49(soulPath) ? readFileSync22(soulPath, "utf-8") : "";
+        const user = existsSync49(userPath) ? readFileSync22(userPath, "utf-8") : "";
         setReflectionStatus2(getDb(), chatId, "active", soul, user);
         const { logActivity: logActivity2 } = await Promise.resolve().then(() => (init_store3(), store_exports3));
         logActivity2(getDb(), { chatId, source: "telegram", eventType: "reflection_unfrozen", summary: "Reflection enabled" });
@@ -20041,6 +20043,8 @@ var init_telegram2 = __esm({
           { command: "claude", description: "Switch to Claude backend" },
           { command: "gemini", description: "Switch to Gemini backend" },
           { command: "gemini_accounts", description: "Manage Gemini credentials & rotation" },
+          { command: "claude_accounts", description: "Manage Claude credentials & rotation" },
+          { command: "codex_accounts", description: "Manage Codex credentials & rotation" },
           { command: "codex", description: "Switch to Codex backend" },
           { command: "cursor", description: "Switch to Cursor backend" },
           { command: "model", description: "Switch model for active backend" },
@@ -21395,11 +21399,11 @@ async function main() {
   bootstrapSkills().catch((err) => error("[cc-claw] Skill bootstrap failed:", err));
   try {
     const { generateAiSkill: generateAiSkill2 } = await Promise.resolve().then(() => (init_ai_skill(), ai_skill_exports));
-    const { writeFileSync: writeFileSync12, mkdirSync: mkdirSync16 } = await import("fs");
-    const { join: join28 } = await import("path");
-    const skillDir = join28(SKILLS_PATH, "cc-claw-cli");
-    mkdirSync16(skillDir, { recursive: true });
-    writeFileSync12(join28(skillDir, "SKILL.md"), generateAiSkill2(), "utf-8");
+    const { writeFileSync: writeFileSync12, mkdirSync: mkdirSync17 } = await import("fs");
+    const { join: join29 } = await import("path");
+    const skillDir = join29(SKILLS_PATH, "cc-claw-cli");
+    mkdirSync17(skillDir, { recursive: true });
+    writeFileSync12(join29(skillDir, "SKILL.md"), generateAiSkill2(), "utf-8");
     log("[cc-claw] AI skill updated");
   } catch {
   }
@@ -22284,8 +22288,8 @@ async function doctorCommand(globalOpts, localOpts) {
   }
   if (existsSync25(ERROR_LOG_PATH)) {
     try {
-      const { readFileSync: readFileSync21 } = await import("fs");
-      const logContent = readFileSync21(ERROR_LOG_PATH, "utf-8");
+      const { readFileSync: readFileSync22 } = await import("fs");
+      const logContent = readFileSync22(ERROR_LOG_PATH, "utf-8");
       const recentLines = logContent.split("\n").filter(Boolean).slice(-100);
       const last24h = Date.now() - 864e5;
       const recentErrors = recentLines.filter((line) => {
@@ -22711,6 +22715,7 @@ var init_gemini2 = __esm({
 // src/cli/commands/backend-cmd-factory.ts
 var backend_cmd_factory_exports = {};
 __export(backend_cmd_factory_exports, {
+  makeAddAccount: () => makeAddAccount,
   makeAddKey: () => makeAddKey,
   makeDisable: () => makeDisable,
   makeEnable: () => makeEnable,
@@ -22720,7 +22725,8 @@ __export(backend_cmd_factory_exports, {
   makeReorder: () => makeReorder,
   registerBackendSlotCommands: () => registerBackendSlotCommands
 });
-import { existsSync as existsSync28 } from "fs";
+import { existsSync as existsSync28, mkdirSync as mkdirSync13, readFileSync as readFileSync18 } from "fs";
+import { join as join26 } from "path";
 import { createInterface as createInterface6 } from "readline";
 function requireDb2() {
   if (!existsSync28(DB_PATH)) {
@@ -22757,7 +22763,7 @@ function makeList(backend2, displayName) {
     readDb.close();
     if (slots.length === 0) {
       output({ slots: [] }, () => `No ${displayName} credential slots configured.
-Add one with: cc-claw ${backend2} add-key`);
+Add one with: cc-claw ${backend2} add-account  or  cc-claw ${backend2} add-key`);
       return;
     }
     output(slots, (data) => {
@@ -22804,6 +22810,62 @@ function makeAddKey(backend2, displayName) {
     );
   };
 }
+function makeAddAccount(backend2, displayName) {
+  return async function addAccount(_globalOpts, opts) {
+    const config2 = ADD_ACCOUNT_CONFIGS[backend2];
+    if (!config2) {
+      outputError("UNSUPPORTED", `add-account is not supported for ${displayName}. Use add-key instead.`);
+      process.exit(1);
+    }
+    await requireWriteDb2();
+    const slotsDir = join26(CC_CLAW_HOME, config2.slotsSubdir);
+    if (!existsSync28(slotsDir)) mkdirSync13(slotsDir, { recursive: true });
+    const tempId = Date.now();
+    const slotDir = join26(slotsDir, `slot-${tempId}`);
+    mkdirSync13(slotDir, { recursive: true, mode: 448 });
+    if (config2.preSetup) config2.preSetup(slotDir);
+    console.log("");
+    console.log(`  Opening ${displayName} CLI for sign-in...`);
+    console.log(`  Sign in with the account you want for this slot.`);
+    console.log(`  After sign-in completes, return here.`);
+    console.log("");
+    const { execSync: execSync8 } = await import("child_process");
+    const loginEnv = {
+      ...process.env,
+      [config2.envKey]: config2.envValue(slotDir),
+      ...config2.envOverrides
+    };
+    try {
+      execSync8(config2.loginCommand.join(" "), {
+        stdio: "inherit",
+        env: loginEnv,
+        cwd: slotDir
+      });
+    } catch {
+    }
+    if (!config2.verifyCredentials(slotDir)) {
+      console.log(error2(`
+  No credentials found. Sign-in may have failed.`));
+      console.log(`  The slot directory is preserved at: ${slotDir}`);
+      console.log(`  Re-run: cc-claw ${backend2} add-account
+`);
+      process.exit(1);
+    }
+    const accountLabel = opts.label || config2.extractLabel(slotDir);
+    const { addBackendSlot: addBackendSlot2 } = await Promise.resolve().then(() => (init_store5(), store_exports5));
+    const id = addBackendSlot2({
+      backend: backend2,
+      slotType: "oauth",
+      label: accountLabel,
+      configHome: slotDir,
+      priority: opts.priority ? parseInt(opts.priority, 10) : 0
+    });
+    output(
+      { id, type: "oauth", backend: backend2, label: accountLabel, configHome: slotDir },
+      () => success(`Added ${displayName} subscription slot #${id} (${accountLabel})`)
+    );
+  };
+}
 function makeRemove(backend2, displayName) {
   return async function remove(_globalOpts, idOrLabel) {
     await requireWriteDb2();
@@ -22906,13 +22968,88 @@ function registerBackendSlotCommands(parentCommand, backend2, displayName, globa
   });
   return cmd;
 }
-var dbInitialized2;
+var dbInitialized2, ADD_ACCOUNT_CONFIGS;
 var init_backend_cmd_factory = __esm({
   "src/cli/commands/backend-cmd-factory.ts"() {
     "use strict";
     init_format2();
     init_paths();
     dbInitialized2 = false;
+    ADD_ACCOUNT_CONFIGS = {
+      claude: {
+        slotsSubdir: "claude-slots",
+        loginCommand: ["claude", "auth", "login", "--claudeai"],
+        envKey: "HOME",
+        envValue: (slotDir) => slotDir,
+        envOverrides: { ANTHROPIC_API_KEY: void 0 },
+        preSetup: (slotDir) => {
+          mkdirSync13(join26(slotDir, ".claude"), { recursive: true });
+        },
+        verifyCredentials: (slotDir) => {
+          const claudeJson = join26(slotDir, ".claude.json");
+          const claudeJsonNested = join26(slotDir, ".claude", ".claude.json");
+          if (existsSync28(claudeJson)) {
+            try {
+              const data = JSON.parse(readFileSync18(claudeJson, "utf-8"));
+              return Boolean(data.oauthAccount);
+            } catch {
+              return false;
+            }
+          }
+          if (existsSync28(claudeJsonNested)) {
+            try {
+              const data = JSON.parse(readFileSync18(claudeJsonNested, "utf-8"));
+              return Boolean(data.oauthAccount);
+            } catch {
+              return false;
+            }
+          }
+          return false;
+        },
+        extractLabel: (slotDir) => {
+          try {
+            const { execSync: execSync8 } = __require("child_process");
+            const out = execSync8("claude auth status", {
+              encoding: "utf-8",
+              env: { ...process.env, HOME: slotDir, ANTHROPIC_API_KEY: void 0 },
+              timeout: 1e4
+            });
+            const parsed = JSON.parse(out);
+            if (parsed.email) return parsed.email;
+          } catch {
+          }
+          try {
+            const claudeJson = join26(slotDir, ".claude.json");
+            if (existsSync28(claudeJson)) {
+              const data = JSON.parse(readFileSync18(claudeJson, "utf-8"));
+              if (data.oauthAccount?.emailAddress) return data.oauthAccount.emailAddress;
+            }
+          } catch {
+          }
+          return "subscription";
+        }
+      },
+      codex: {
+        slotsSubdir: "codex-slots",
+        loginCommand: ["codex", "login"],
+        envKey: "CODEX_HOME",
+        envValue: (slotDir) => slotDir,
+        envOverrides: { OPENAI_API_KEY: void 0 },
+        verifyCredentials: (slotDir) => {
+          return existsSync28(join26(slotDir, "auth.json"));
+        },
+        extractLabel: (slotDir) => {
+          try {
+            const authData = JSON.parse(readFileSync18(join26(slotDir, "auth.json"), "utf-8"));
+            if (authData.email) return authData.email;
+            if (authData.account_name) return authData.account_name;
+            if (authData.user?.email) return authData.user.email;
+          } catch {
+          }
+          return "subscription";
+        }
+      }
+    };
   }
 });
 
@@ -23608,7 +23745,7 @@ __export(db_exports, {
   dbPath: () => dbPath,
   dbStats: () => dbStats
 });
-import { existsSync as existsSync34, statSync as statSync8, copyFileSync as copyFileSync2, mkdirSync as mkdirSync13 } from "fs";
+import { existsSync as existsSync34, statSync as statSync8, copyFileSync as copyFileSync2, mkdirSync as mkdirSync14 } from "fs";
 import { dirname as dirname5 } from "path";
 async function dbStats(globalOpts) {
   if (!existsSync34(DB_PATH)) {
@@ -23659,7 +23796,7 @@ async function dbBackup(globalOpts, destPath) {
   }
   const dest = destPath ?? `${DB_PATH}.backup-${(/* @__PURE__ */ new Date()).toISOString().replace(/[:.]/g, "-")}`;
   try {
-    mkdirSync13(dirname5(dest), { recursive: true });
+    mkdirSync14(dirname5(dest), { recursive: true });
     copyFileSync2(DB_PATH, dest);
     const walPath = DB_PATH + "-wal";
     if (existsSync34(walPath)) copyFileSync2(walPath, dest + "-wal");
@@ -23883,7 +24020,7 @@ __export(config_exports2, {
   configList: () => configList,
   configSet: () => configSet
 });
-import { existsSync as existsSync36, readFileSync as readFileSync18 } from "fs";
+import { existsSync as existsSync36, readFileSync as readFileSync19 } from "fs";
 async function configList(globalOpts) {
   if (!existsSync36(DB_PATH)) {
     outputError("DB_NOT_FOUND", "Database not found.");
@@ -23969,7 +24106,7 @@ async function configEnv(_globalOpts) {
     outputError("ENV_NOT_FOUND", `No .env file at ${ENV_PATH}. Run cc-claw setup.`);
     process.exit(1);
   }
-  const content = readFileSync18(ENV_PATH, "utf-8");
+  const content = readFileSync19(ENV_PATH, "utf-8");
   const entries = {};
   const secretPatterns = /TOKEN|KEY|SECRET|PASSWORD|CREDENTIALS/i;
   for (const line of content.split("\n")) {
@@ -24718,11 +24855,11 @@ __export(chat_exports2, {
   chatSend: () => chatSend
 });
 import { request as httpRequest2 } from "http";
-import { readFileSync as readFileSync19, existsSync as existsSync46 } from "fs";
+import { readFileSync as readFileSync20, existsSync as existsSync46 } from "fs";
 function getToken2() {
   if (process.env.CC_CLAW_API_TOKEN) return process.env.CC_CLAW_API_TOKEN;
   try {
-    if (existsSync46(TOKEN_PATH2)) return readFileSync19(TOKEN_PATH2, "utf-8").trim();
+    if (existsSync46(TOKEN_PATH2)) return readFileSync20(TOKEN_PATH2, "utf-8").trim();
   } catch {
   }
   return null;
@@ -25001,8 +25138,8 @@ var completion_exports = {};
 __export(completion_exports, {
   completionCommand: () => completionCommand
 });
-import { writeFileSync as writeFileSync10, mkdirSync as mkdirSync14 } from "fs";
-import { join as join26 } from "path";
+import { writeFileSync as writeFileSync10, mkdirSync as mkdirSync15 } from "fs";
+import { join as join27 } from "path";
 import { homedir as homedir9 } from "os";
 async function completionCommand(opts) {
   const shell = opts.shell ?? detectShell();
@@ -25018,10 +25155,10 @@ async function completionCommand(opts) {
     process.exit(1);
   }
   if (opts.install) {
-    const dir = join26(homedir9(), ".config", "cc-claw", "completions");
-    mkdirSync14(dir, { recursive: true });
+    const dir = join27(homedir9(), ".config", "cc-claw", "completions");
+    mkdirSync15(dir, { recursive: true });
     const filename = shell === "zsh" ? "_cc-claw" : shell === "fish" ? "cc-claw.fish" : "cc-claw.bash";
-    const filepath = join26(dir, filename);
+    const filepath = join27(dir, filename);
     writeFileSync10(filepath, script, "utf-8");
     console.log(`\u2713 Completion script written to ${filepath}
 `);
@@ -25610,10 +25747,10 @@ var init_evolve3 = __esm({
 
 // src/setup.ts
 var setup_exports = {};
-import { existsSync as existsSync48, writeFileSync as writeFileSync11, readFileSync as readFileSync20, copyFileSync as copyFileSync3, mkdirSync as mkdirSync15, statSync as statSync9 } from "fs";
+import { existsSync as existsSync48, writeFileSync as writeFileSync11, readFileSync as readFileSync21, copyFileSync as copyFileSync3, mkdirSync as mkdirSync16, statSync as statSync9 } from "fs";
 import { execFileSync as execFileSync5 } from "child_process";
 import { createInterface as createInterface8 } from "readline";
-import { join as join27 } from "path";
+import { join as join28 } from "path";
 function divider2() {
   console.log(dim("\u2500".repeat(55)));
 }
@@ -25688,20 +25825,20 @@ async function setup() {
   }
   console.log("");
   for (const dir of [CC_CLAW_HOME, DATA_PATH, LOGS_PATH, SKILLS_PATH, RUNNERS_PATH, AGENTS_PATH]) {
-    if (!existsSync48(dir)) mkdirSync15(dir, { recursive: true });
+    if (!existsSync48(dir)) mkdirSync16(dir, { recursive: true });
   }
   const env = {};
   const envSource = existsSync48(ENV_PATH) ? ENV_PATH : existsSync48(".env") ? ".env" : null;
   if (envSource) {
     console.log(yellow(`  Found existing config at ${envSource} \u2014 your values will be preserved`));
     console.log(yellow("  unless you enter new ones. Just press Enter to keep existing values.\n"));
-    const existing = readFileSync20(envSource, "utf-8");
+    const existing = readFileSync21(envSource, "utf-8");
     for (const line of existing.split("\n")) {
       const match = line.match(/^([^#=]+)=(.*)$/);
       if (match) env[match[1].trim()] = match[2].trim();
     }
   }
-  const cwdDb = join27(process.cwd(), "cc-claw.db");
+  const cwdDb = join28(process.cwd(), "cc-claw.db");
   if (existsSync48(cwdDb) && !existsSync48(DB_PATH)) {
     const { size } = statSync9(cwdDb);
     console.log(yellow(`  Found existing database at ${cwdDb} (${(size / 1024).toFixed(0)}KB)`));
@@ -26087,6 +26224,10 @@ function registerUnifiedSlotCommands(parentCmd, backendId, displayName) {
     const { makeAddKey: makeAddKey2 } = await Promise.resolve().then(() => (init_backend_cmd_factory(), backend_cmd_factory_exports));
     await makeAddKey2(backendId, displayName)(program.opts(), opts);
   });
+  cmd.command("add-account").description("Add a subscription/OAuth slot (opens browser for sign-in)").option("--label <name>", "Friendly label for this slot").option("--priority <n>", "Priority (lower = preferred)", "0").action(async (opts) => {
+    const { makeAddAccount: makeAddAccount2 } = await Promise.resolve().then(() => (init_backend_cmd_factory(), backend_cmd_factory_exports));
+    await makeAddAccount2(backendId, displayName)(program.opts(), opts);
+  });
   cmd.command("remove <id-or-label>").description("Remove a credential slot (by ID or label)").action(async (id) => {
     const { makeRemove: makeRemove2 } = await Promise.resolve().then(() => (init_backend_cmd_factory(), backend_cmd_factory_exports));
     await makeRemove2(backendId, displayName)(program.opts(), id);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-claw",
-  "version": "0.16.0",
+  "version": "0.16.2",
   "description": "CC-Claw: Personal AI assistant on Telegram — multi-backend (Claude, Gemini, Codex, Cursor), sub-agent orchestration, MCP management",
   "type": "module",
   "main": "dist/cli.js",