cc-claw 0.6.1 → 0.7.0

package/dist/cli.js

@@ -55,7 +55,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = true ? "0.6.1" : (() => {
+    VERSION = true ? "0.7.0" : (() => {
       try {
         return JSON.parse(readFileSync(join2(process.cwd(), "package.json"), "utf-8")).version ?? "unknown";
       } catch {
@@ -964,12 +964,14 @@ __export(store_exports3, {
   getBackendLimit: () => getBackendLimit,
   getBackendUsageInWindow: () => getBackendUsageInWindow,
   getBookmark: () => getBookmark,
+  getChatGeminiSlotId: () => getChatGeminiSlotId,
   getChatIdByAlias: () => getChatIdByAlias,
   getChatUsageByModel: () => getChatUsageByModel,
   getCwd: () => getCwd,
   getDb: () => getDb,
   getEligibleGeminiSlots: () => getEligibleGeminiSlots,
   getEnabledTools: () => getEnabledTools,
+  getGeminiRotationMode: () => getGeminiRotationMode,
   getGeminiSlots: () => getGeminiSlots,
   getHeartbeatConfig: () => getHeartbeatConfig,
   getJobById: () => getJobById,
@@ -1028,6 +1030,7 @@ __export(store_exports3, {
   setBootTime: () => setBootTime,
   setChatAlias: () => setChatAlias,
   setCwd: () => setCwd,
+  setGeminiRotationMode: () => setGeminiRotationMode,
   setGeminiSlotEnabled: () => setGeminiSlotEnabled,
   setHeartbeatConfig: () => setHeartbeatConfig,
   setMode: () => setMode,
@@ -2406,17 +2409,24 @@ function getGeminiSlots() {
     FROM gemini_credentials ORDER BY priority ASC, id ASC
   `).all();
 }
-function getEligibleGeminiSlots() {
+function getEligibleGeminiSlots(mode) {
+  if (mode === "off") return [];
+  const slotTypeFilter = mode === "accounts" ? "AND slot_type = 'oauth'" : mode === "keys" ? "AND slot_type = 'api_key'" : "";
   return db.prepare(`
     SELECT id, 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
     FROM gemini_credentials
     WHERE enabled = 1 AND (cooldown_until IS NULL OR cooldown_until <= datetime('now'))
+    ${slotTypeFilter}
     ORDER BY priority ASC, last_used ASC NULLS FIRST
   `).all();
 }
-function getNextGeminiSlot(chatId) {
+function getChatGeminiSlotId(chatId) {
+  const row = db.prepare("SELECT slot_id FROM chat_gemini_slot WHERE chat_id = ?").get(chatId);
+  return row?.slot_id ?? null;
+}
+function getNextGeminiSlot(chatId, mode) {
   const pinned = db.prepare(`
     SELECT gc.id, gc.slot_type AS slotType, gc.label, gc.api_key AS apiKey, gc.config_home AS configHome,
            gc.priority, gc.enabled, gc.cooldown_until AS cooldownUntil, gc.last_used AS lastUsed,
@@ -2426,7 +2436,7 @@ function getNextGeminiSlot(chatId) {
       AND (gc.cooldown_until IS NULL OR gc.cooldown_until <= datetime('now'))
   `).get(chatId);
   if (pinned) return pinned;
-  const eligible = getEligibleGeminiSlots();
+  const eligible = getEligibleGeminiSlots(mode);
   return eligible.length > 0 ? eligible[0] : null;
 }
 function markSlotExhausted(slotId, quotaClass) {
@@ -2473,6 +2483,13 @@ function setGeminiSlotEnabled(id, enabled) {
 function reorderGeminiSlot(id, priority) {
   db.prepare("UPDATE gemini_credentials SET priority = ? WHERE id = ?").run(priority, id);
 }
+function getGeminiRotationMode() {
+  const row = db.prepare("SELECT value FROM meta WHERE key = 'gemini_rotation_mode'").get();
+  return row?.value ?? "all";
+}
+function setGeminiRotationMode(mode) {
+  db.prepare("INSERT OR REPLACE INTO meta (key, value) VALUES ('gemini_rotation_mode', ?)").run(mode);
+}
 function getAgentMode(chatId) {
   const row = db.prepare("SELECT mode FROM chat_agent_mode WHERE chat_id = ?").get(chatId);
   return row?.mode ?? "auto";
@@ -2911,17 +2928,25 @@ var init_gemini = __esm({
           thinking: "adjustable",
           thinkingLevels: ["low", "high"],
           defaultThinkingLevel: "high"
+        },
+        "gemini-3.1-flash-lite-preview": {
+          label: "Gemini 3.1 Flash Lite \u2014 lightest, cheapest",
+          thinking: "adjustable",
+          thinkingLevels: ["low", "high"],
+          defaultThinkingLevel: "low"
         }
       };
       defaultModel = "gemini-3.1-pro-preview";
-      summarizerModel = "gemini-3-flash-preview";
+      summarizerModel = "gemini-3.1-flash-lite-preview";
       pricing = {
         "gemini-3.1-pro-preview": { in: 1.25, out: 10, cache: 0.32 },
-        "gemini-3-flash-preview": { in: 0.15, out: 0.6, cache: 0.04 }
+        "gemini-3-flash-preview": { in: 0.15, out: 0.6, cache: 0.04 },
+        "gemini-3.1-flash-lite-preview": { in: 0.04, out: 0.15, cache: 0.01 }
       };
       contextWindow = {
         "gemini-3.1-pro-preview": 1e6,
-        "gemini-3-flash-preview": 1e6
+        "gemini-3-flash-preview": 1e6,
+        "gemini-3.1-flash-lite-preview": 1e6
       };
       _resolvedPath = "";
       getExecutablePath() {
@@ -3024,8 +3049,8 @@ var init_gemini = __esm({
        * OAuth slots set GEMINI_CLI_HOME for isolated config and unset GEMINI_API_KEY so
        * the CLI uses OAuth instead. Returns the slot used (or null for default behavior).
        */
-      getEnvForSlot(chatId, thinkingOverrides) {
-        const slot = getNextGeminiSlot(chatId);
+      getEnvForSlot(chatId, thinkingOverrides, mode) {
+        const slot = getNextGeminiSlot(chatId, mode);
         const env = this.getEnv(thinkingOverrides);
         if (!slot) return { env, slot: null };
         if (slot.slotType === "api_key" && slot.apiKey) {
@@ -4073,7 +4098,7 @@ Key details: ${keyDetails}`;
     return false;
   }
 }
-async function summarizeWithFallbackChain(chatId, targetBackendId) {
+async function summarizeWithFallbackChain(chatId, targetBackendId, excludeBackend) {
   const pairCount = getMessagePairCount(chatId);
   if (pairCount < MIN_PAIRS) {
     clearLog(chatId);
@@ -4082,6 +4107,10 @@ async function summarizeWithFallbackChain(chatId, targetBackendId) {
   const entries = getLog(chatId);
   if (entries.length === 0) return false;
   const tried = /* @__PURE__ */ new Set();
+  if (excludeBackend) {
+    const excluded = getAdapter(excludeBackend);
+    tried.add(`${excluded.id}:${excluded.summarizerModel}`);
+  }
   try {
     const config2 = getSummarizer(chatId);
     if (config2.backend !== "off") {
@@ -4193,6 +4222,9 @@ Be specific. The new assistant has no prior context. Cover any domain \u2014 per
 
 // src/gemini/quota.ts
 function classifyGeminiQuota(errorText) {
+  for (const p of CAPACITY_PATTERNS) {
+    if (p.test(errorText)) return "rate_limited";
+  }
   for (const p of RATE_LIMITED_PATTERNS) {
     if (p.test(errorText)) return "rate_limited";
   }
@@ -4204,7 +4236,7 @@ function classifyGeminiQuota(errorText) {
   }
   return "unknown";
 }
-var RATE_LIMITED_PATTERNS, BILLING_PATTERNS, DAILY_QUOTA_PATTERNS, GEMINI_SLOTS_EXHAUSTED_MSG;
+var RATE_LIMITED_PATTERNS, BILLING_PATTERNS, DAILY_QUOTA_PATTERNS, CAPACITY_PATTERNS, GEMINI_SLOTS_EXHAUSTED_MSG, GEMINI_NO_SLOTS_FOR_MODE_MSG, GEMINI_ALL_SLOTS_COOLDOWN_MSG;
 var init_quota = __esm({
   "src/gemini/quota.ts"() {
     "use strict";
@@ -4227,7 +4259,13 @@ var init_quota = __esm({
       /RESOURCE_EXHAUSTED/,
       /exhausted.*quota/i
     ];
+    CAPACITY_PATTERNS = [
+      /MODEL_CAPACITY_EXHAUSTED/,
+      /No capacity available/i
+    ];
     GEMINI_SLOTS_EXHAUSTED_MSG = "Gemini usage limit \u2014 all credential slots exhausted";
+    GEMINI_NO_SLOTS_FOR_MODE_MSG = "Gemini rotation \u2014 no eligible slots for current rotation mode";
+    GEMINI_ALL_SLOTS_COOLDOWN_MSG = "Gemini rotation \u2014 all eligible slots in cooldown";
   }
 });
 
@@ -6737,22 +6775,23 @@ function spawnQuery(adapter, config2, model2, cancelState, thinkingLevel, timeou
     });
   });
 }
-async function spawnGeminiWithRotation(chatId, adapter, config2, model2, cancelState, thinkingLevel, timeoutMs, maxTurns, opts, onSlotRotation) {
+async function spawnGeminiWithRotation(chatId, adapter, baseConfig, configWithSession, model2, cancelState, thinkingLevel, timeoutMs, maxTurns, rotationMode, opts, onSlotRotation) {
   const geminiAdapter = adapter;
-  const slots = getEligibleGeminiSlots();
+  const slots = getEligibleGeminiSlots(rotationMode);
   if (slots.length === 0) {
-    return spawnQuery(adapter, config2, model2, cancelState, thinkingLevel, timeoutMs, maxTurns, opts);
+    return spawnQuery(adapter, configWithSession, model2, cancelState, thinkingLevel, timeoutMs, maxTurns, opts);
   }
   const maxAttempts = Math.min(slots.length, 10);
   let lastError;
   for (let i = 0; i < maxAttempts; i++) {
-    const { env, slot } = geminiAdapter.getEnvForSlot(chatId, void 0);
+    const { env, slot } = geminiAdapter.getEnvForSlot(chatId, void 0, rotationMode);
     if (!slot) break;
     const slotLabel = slot.label || `slot-${slot.id}`;
     log(`[agent:gemini-rotation] Trying ${slotLabel} (${slot.slotType}, attempt ${i + 1}/${maxAttempts})`);
     if (i === 0) pinChatGeminiSlot(chatId, slot.id);
+    const effectiveConfig = i === 0 ? configWithSession : baseConfig;
     try {
-      const result = await spawnQuery(adapter, config2, model2, cancelState, thinkingLevel, timeoutMs, maxTurns, { ...opts, envOverride: env });
+      const result = await spawnQuery(adapter, effectiveConfig, model2, cancelState, thinkingLevel, timeoutMs, maxTurns, { ...opts, envOverride: env });
       const combinedText = result.resultText || "";
       if (combinedText && /RESOURCE.?EXHAUSTED|resource has been exhausted/i.test(combinedText)) {
         throw new Error(combinedText);
@@ -6770,11 +6809,11 @@ async function spawnGeminiWithRotation(chatId, adapter, config2, model2, cancelS
       markSlotExhausted(slot.id, effectiveClass);
       lastError = err instanceof Error ? err : new Error(errMsg);
       try {
-        await summarizeWithFallbackChain(chatId);
+        await summarizeWithFallbackChain(chatId, void 0, "gemini");
         clearSession(chatId);
       } catch {
       }
-      const nextSlot = getEligibleGeminiSlots()[0];
+      const nextSlot = getEligibleGeminiSlots(rotationMode)[0];
       if (nextSlot && onSlotRotation) {
         const nextLabel = nextSlot.label || `slot-${nextSlot.id}`;
         onSlotRotation(slotLabel, nextLabel);
@@ -6782,6 +6821,20 @@ async function spawnGeminiWithRotation(chatId, adapter, config2, model2, cancelS
       }
     }
   }
+  const allSlotsForMode = getGeminiSlots().filter((s) => {
+    if (!s.enabled) return false;
+    if (rotationMode === "accounts") return s.slotType === "oauth";
+    if (rotationMode === "keys") return s.slotType === "api_key";
+    return true;
+  });
+  if (allSlotsForMode.length === 0) {
+    throw new Error(GEMINI_NO_SLOTS_FOR_MODE_MSG);
+  }
+  const soonest = allSlotsForMode.filter((s) => s.cooldownUntil).map((s) => new Date(s.cooldownUntil).getTime()).sort((a, b) => a - b)[0];
+  if (soonest) {
+    const hoursLeft = Math.max(1, Math.ceil((soonest - Date.now()) / 36e5));
+    throw new Error(`${GEMINI_ALL_SLOTS_COOLDOWN_MSG}|${hoursLeft}h`);
+  }
   throw new Error(GEMINI_SLOTS_EXHAUSTED_MSG);
 }
 function askAgent(chatId, userMessage, opts) {
@@ -6833,11 +6886,12 @@ async function askAgentImpl(chatId, userMessage, opts) {
   const spawnOpts = { onStream, onToolAction, onSubagentActivity };
   const resolvedModel = model2 ?? adapter.defaultModel;
   let result = { resultText: "", sessionId: void 0, input: 0, output: 0, cacheRead: 0, sawToolEvents: false, sawResultEvent: false };
-  const useGeminiRotation = adapter.id === "gemini" && getEligibleGeminiSlots().length > 0;
+  const rotationMode = adapter.id === "gemini" ? getGeminiRotationMode() : "off";
+  const useGeminiRotation = rotationMode !== "off" && getEligibleGeminiSlots(rotationMode).length > 0;
   try {
     if (useGeminiRotation) {
       const rotationCb = onSlotRotation ? (from, to) => onSlotRotation(chatId, from, to) : void 0;
-      result = await spawnGeminiWithRotation(chatId, adapter, configWithSession, resolvedModel, cancelState, thinkingLevel, timeoutMs, maxTurns, spawnOpts, rotationCb);
+      result = await spawnGeminiWithRotation(chatId, adapter, baseConfig, configWithSession, resolvedModel, cancelState, thinkingLevel, timeoutMs, maxTurns, rotationMode, spawnOpts, rotationCb);
     } else {
       result = await spawnQuery(adapter, configWithSession, resolvedModel, cancelState, thinkingLevel, timeoutMs, maxTurns, spawnOpts);
     }
@@ -6848,7 +6902,7 @@ async function askAgentImpl(chatId, userMessage, opts) {
       clearSession(chatId);
       if (useGeminiRotation) {
         const rotationCb = onSlotRotation ? (from, to) => onSlotRotation(chatId, from, to) : void 0;
-        result = await spawnGeminiWithRotation(chatId, adapter, baseConfig, resolvedModel, cancelState, thinkingLevel, timeoutMs, maxTurns, spawnOpts, rotationCb);
+        result = await spawnGeminiWithRotation(chatId, adapter, baseConfig, baseConfig, resolvedModel, cancelState, thinkingLevel, timeoutMs, maxTurns, rotationMode, spawnOpts, rotationCb);
       } else {
         result = await spawnQuery(adapter, baseConfig, resolvedModel, cancelState, thinkingLevel, timeoutMs, maxTurns, spawnOpts);
       }
@@ -6877,7 +6931,10 @@ async function askAgentImpl(chatId, userMessage, opts) {
     if (pairCount >= AUTO_SUMMARIZE_THRESHOLD) {
       log(`[agent] Auto-summarizing chat ${chatId} after ${pairCount} turns`);
       summarizeWithFallbackChain(chatId).then((saved) => {
-        if (saved) opts?.onCompaction?.(chatId);
+        if (saved) {
+          clearSession(chatId);
+          opts?.onCompaction?.(chatId);
+        }
       }).catch((err) => {
         warn(`[agent] Auto-summarize failed for chat ${chatId}: ${err}`);
       });
@@ -10588,7 +10645,7 @@ async function handleCommand(msg, channel) {
     case "help":
       await channel.sendText(
         chatId,
-        "Hey! I'm CC-Claw \u2014 your personal AI assistant on Telegram.\n\nI use AI coding CLIs (Claude, Gemini, Codex) as my brain. Just send me a message to get started.\n\nCommands:\n/backend [name] - Switch AI backend (or /claude /gemini /codex)\n/model - Switch model for active backend\n/summarizer - Configure session summarization model\n/status - Show session, model, backend, and usage\n/cost - Show estimated API cost (use /cost all for all-time)\n/usage - Show usage per backend with limits\n/limits - Configure usage limits per backend\n/newchat - Start a fresh conversation\n/summarize - Save session to memory (without resetting)\n/summarize all - Summarize all pending sessions (pre-restart)\n/cwd <path> - Set working directory\n/cwd - Show current working directory\n/memory - List stored memories\n/remember <text> - Save a memory\n/forget <keyword> - Remove a memory\n/voice - Toggle voice responses\n/voice_config - Configure voice provider and voice\n/imagine <prompt> - Generate an image (or /image)\n/cron <description> - Schedule a task (or /schedule)\n/cron - List scheduled jobs (or /jobs)\n/cron cancel <id> - Cancel a job\n/cron pause <id> - Pause a job\n/cron resume <id> - Resume a job\n/cron run <id> - Trigger a job now\n/cron runs [id] - View run history\n/cron edit <id> - Edit a job\n/cron health - Scheduler health\n/skills - List skills from all backends\n/skill-install <url> - Install a skill from GitHub\n/setup-profile - Set up your user profile\n/chats - List authorized chats and aliases\n/heartbeat - Proactive awareness (on/off/interval/hours)\n/history - List recent session summaries\n/stop - Cancel the current running task\n/tools - Configure which tools the agent can use\n/permissions - Switch permission mode (yolo/safe/plan)\n/verbose - Tool visibility (off/normal/verbose)\n/model_signature - Toggle model+thinking signature on responses\n/intent <msg> - Test intent classifier (chat vs agentic)\n/agents - List active sub-agents\n/agents mode [auto|native|claw] - Set agent mode (native vs orchestrated)\n/agents history - Native sub-agent activity (24h)\n/tasks - Show task board for current orchestration\n/stopagent <id> - Cancel a specific sub-agent\n/stopall - Cancel all sub-agents in this chat\n/runners - List registered CLI runners\n/mcps - List registered MCP servers\n/help - Show this message",
+        "Hey! I'm CC-Claw \u2014 your personal AI assistant on Telegram.\n\nI use AI coding CLIs (Claude, Gemini, Codex) as my brain. Just send me a message to get started.\n\nCommands:\n/backend [name] - Switch AI backend (or /claude /gemini /codex)\n/model - Switch model for active backend\n/gemini slot - Select Gemini credential (account/key)\n/summarizer - Configure session summarization model\n/status - Show session, model, backend, and usage\n/cost - Show estimated API cost (use /cost all for all-time)\n/usage - Show usage per backend with limits\n/limits - Configure usage limits per backend\n/newchat - Start a fresh conversation\n/summarize - Save session to memory (without resetting)\n/summarize all - Summarize all pending sessions (pre-restart)\n/cwd <path> - Set working directory\n/cwd - Show current working directory\n/memory - List stored memories\n/remember <text> - Save a memory\n/forget <keyword> - Remove a memory\n/voice - Toggle voice responses\n/voice_config - Configure voice provider and voice\n/imagine <prompt> - Generate an image (or /image)\n/cron <description> - Schedule a task (or /schedule)\n/cron - List scheduled jobs (or /jobs)\n/cron cancel <id> - Cancel a job\n/cron pause <id> - Pause a job\n/cron resume <id> - Resume a job\n/cron run <id> - Trigger a job now\n/cron runs [id] - View run history\n/cron edit <id> - Edit a job\n/cron health - Scheduler health\n/skills - List skills from all backends\n/skill-install <url> - Install a skill from GitHub\n/setup-profile - Set up your user profile\n/chats - List authorized chats and aliases\n/heartbeat - Proactive awareness (on/off/interval/hours)\n/history - List recent session summaries\n/stop - Cancel the current running task\n/tools - Configure which tools the agent can use\n/permissions - Switch permission mode (yolo/safe/plan)\n/verbose - Tool visibility (off/normal/verbose)\n/model_signature - Toggle model+thinking signature on responses\n/intent <msg> - Test intent classifier (chat vs agentic)\n/agents - List active sub-agents\n/agents mode [auto|native|claw] - Set agent mode (native vs orchestrated)\n/agents history - Native sub-agent activity (24h)\n/tasks - Show task board for current orchestration\n/stopagent <id> - Cancel a specific sub-agent\n/stopall - Cancel all sub-agents in this chat\n/runners - List registered CLI runners\n/mcps - List registered MCP servers\n/help - Show this message",
         "plain"
       );
       break;
@@ -10751,12 +10808,24 @@ Tap to toggle:`,
       const iStats = getIntentStats();
       const iTotal = iStats.chat + iStats.agentic;
       const intentLine = iTotal > 0 ? `\u26A1 ${iStats.chat} chat \xB7 ${iStats.agentic} agentic (${(iStats.chat / iTotal * 100).toFixed(0)}% fast-path)` : `\u26A1 No messages classified yet`;
+      let geminiSlotInfo = "";
+      if ((backendId ?? "claude") === "gemini") {
+        try {
+          const active = getNextGeminiSlot(chatId);
+          const totalSlots = getEligibleGeminiSlots().length;
+          if (active) {
+            const label2 = active.label || `slot-${active.id}`;
+            geminiSlotInfo = ` \xB7 \u{1F511} ${label2} (${totalSlots} slots)`;
+          }
+        } catch {
+        }
+      }
       const lines = [
         `\u{1F43E} CC-Claw v${VERSION}`,
         `\u23F1 Uptime: ${uptimeStr}`,
         ``,
         `\u2501\u2501 Engine \u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501\u2501`,
-        `\u{1F9E0} ${adapter?.displayName ?? backendId ?? "not set"} \xB7 ${formatModelShort(model2)}`,
+        `\u{1F9E0} ${adapter?.displayName ?? backendId ?? "not set"} \xB7 ${formatModelShort(model2)}${geminiSlotInfo}`,
         `\u{1F4AD} Think: ${thinking2} \xB7 Mode: ${mode}`,
         `\u{1F916} Agents: ${getAgentMode(chatId)}`,
         `\u{1F507} Voice: ${voice2 ? "on" : "off"} \xB7 Sig: ${modelSig}`,
@@ -10800,7 +10869,6 @@ Tap to toggle:`,
       break;
     }
     case "claude":
-    case "gemini":
     case "codex": {
       const backendId = command;
       if (getAllBackendIds().includes(backendId)) {
@@ -10810,6 +10878,56 @@ Tap to toggle:`,
       }
       break;
     }
+    case "gemini_accounts": {
+      const slots = getGeminiSlots();
+      if (slots.length === 0) {
+        await channel.sendText(chatId, "No Gemini credentials configured.\nAdd with: <code>cc-claw gemini add-key</code> or <code>cc-claw gemini add-account</code>", "html");
+        break;
+      }
+      if (typeof channel.sendKeyboard === "function") {
+        const currentMode = getGeminiRotationMode();
+        const pinnedSlotId = getChatGeminiSlotId(chatId);
+        const slotButtons = slots.filter((s) => s.enabled).map((s) => {
+          const label2 = s.label || `slot-${s.id}`;
+          const icon = s.slotType === "oauth" ? "\u{1F468}\u{1F3FD}\u200D\u{1F4BB}" : "\u{1F511}";
+          const marker = pinnedSlotId === s.id ? " \u2713" : "";
+          return { label: `${icon} ${label2}${marker}`, data: `gslot:${s.id}` };
+        });
+        const rows = [];
+        for (let i = 0; i < slotButtons.length; i += 2) {
+          rows.push(slotButtons.slice(i, i + 2));
+        }
+        rows.push([{ label: "\u{1F504} Auto (rotation)", data: "gslot:auto" }]);
+        const modeLabels = { off: "Off", all: "All", accounts: "\u{1F468}\u{1F3FD}\u200D\u{1F4BB} Only", keys: "\u{1F511} Only" };
+        const modeButtons = ["off", "all", "accounts", "keys"].map((m) => ({
+          label: `${m === currentMode ? "\u2713 " : ""}${modeLabels[m]}`,
+          data: `grotation:${m}`
+        }));
+        rows.push(modeButtons);
+        await channel.sendKeyboard(chatId, "Gemini Accounts & Rotation:", rows);
+      } else {
+        const currentMode = getGeminiRotationMode();
+        const list = slots.filter((s) => s.enabled).map((s) => {
+          const icon = s.slotType === "oauth" ? "\u{1F468}\u{1F3FD}\u200D\u{1F4BB}" : "\u{1F511}";
+          return `${icon} ${s.label || `slot-${s.id}`} (#${s.id})`;
+        }).join("\n");
+        await channel.sendText(chatId, `Slots:
+${list}
+
+Rotation mode: ${currentMode}
+Use: /gemini_accounts <name> to pin`, "plain");
+      }
+      break;
+    }
+    case "gemini": {
+      const backendId = command;
+      if (getAllBackendIds().includes(backendId)) {
+        await sendBackendSwitchConfirmation(chatId, backendId, channel);
+      } else {
+        await channel.sendText(chatId, `Backend "${command}" is not available.`, "plain");
+      }
+      break;
+    }
     case "model": {
       let adapter;
       try {
@@ -12125,7 +12243,12 @@ async function handleText(msg, channel) {
         });
       },
       onSlotRotation: (cid, from, to) => {
-        channel.sendText(cid, `\u{1F511} Gemini quota reached on ${from} \u2014 continuing on ${to}. Context saved.`).catch(() => {
+        const slots = getGeminiSlots();
+        const fromSlot = slots.find((s) => (s.label || `slot-${s.id}`) === from);
+        const toSlot = slots.find((s) => (s.label || `slot-${s.id}`) === to);
+        const fromIcon = fromSlot?.slotType === "oauth" ? "\u{1F468}\u{1F3FD}\u200D\u{1F4BB}" : "\u{1F511}";
+        const toIcon = toSlot?.slotType === "oauth" ? "\u{1F468}\u{1F3FD}\u200D\u{1F4BB}" : "\u{1F511}";
+        channel.sendText(cid, `\u26A0\uFE0F Quota reached on ${fromIcon} ${from} \u2014 switched to ${toIcon} ${to}. Context saved.`, "plain").catch(() => {
         });
       }
     });
@@ -12165,6 +12288,32 @@ async function handleText(msg, channel) {
   } catch (err) {
     error("[router] Error:", err);
     const errMsg = errorMessage(err);
+    if (errMsg.includes(GEMINI_NO_SLOTS_FOR_MODE_MSG)) {
+      const mode = getGeminiRotationMode();
+      const modeLabel = mode === "accounts" ? "\u{1F468}\u{1F3FD}\u200D\u{1F4BB} Only" : mode === "keys" ? "\u{1F511} Only" : mode;
+      if (typeof channel.sendKeyboard === "function") {
+        const rows = [
+          [{ label: "Claude", data: "backend:claude" }, { label: "Codex", data: "backend:codex" }],
+          [{ label: "\u2699\uFE0F Change rotation mode", data: "gopen:accounts" }]
+        ];
+        await channel.sendKeyboard(chatId, `\u26A0\uFE0F No eligible slots for rotation mode (${modeLabel}). Switch backend?`, rows);
+      } else {
+        await channel.sendText(chatId, `\u26A0\uFE0F No eligible slots for rotation mode (${modeLabel}).`, "plain");
+      }
+      return;
+    } else if (errMsg.includes(GEMINI_ALL_SLOTS_COOLDOWN_MSG)) {
+      const timeLeft = errMsg.split("|")[1] || "?";
+      if (typeof channel.sendKeyboard === "function") {
+        const rows = [
+          [{ label: "Claude", data: "backend:claude" }, { label: "Codex", data: "backend:codex" }],
+          [{ label: "\u2699\uFE0F Change rotation mode", data: "gopen:accounts" }]
+        ];
+        await channel.sendKeyboard(chatId, `\u26A0\uFE0F All eligible slots in cooldown. Next available in ~${timeLeft}. Switch backend?`, rows);
+      } else {
+        await channel.sendText(chatId, `\u26A0\uFE0F All eligible slots in cooldown. Next available in ~${timeLeft}.`, "plain");
+      }
+      return;
+    }
     const errorClass = classifyError(err);
     if (errorClass === "exhausted") {
       if (await handleResponseExhaustion(errMsg, chatId, msg, channel)) return;
@@ -12771,6 +12920,73 @@ ${PERM_MODES[chosen]}`,
       await channel.sendText(chatId, `Agent mode set to <b>${mode}</b>. Session cleared.`, "html");
     }
     return;
+  } else if (data.startsWith("grotation:")) {
+    const mode = data.split(":")[1];
+    const validModes = ["off", "all", "accounts", "keys"];
+    if (!validModes.includes(mode)) return;
+    if (mode === "accounts") {
+      const oauthSlots = getGeminiSlots().filter((s) => s.enabled && s.slotType === "oauth");
+      if (oauthSlots.length === 0) {
+        await channel.sendText(chatId, "\u26A0\uFE0F No OAuth accounts configured. Add one with <code>cc-claw gemini add-account</code> or choose a different mode.", "html");
+        return;
+      }
+    } else if (mode === "keys") {
+      const keySlots = getGeminiSlots().filter((s) => s.enabled && s.slotType === "api_key");
+      if (keySlots.length === 0) {
+        await channel.sendText(chatId, "\u26A0\uFE0F No API keys configured. Add one with <code>cc-claw gemini add-key</code> or choose a different mode.", "html");
+        return;
+      }
+    }
+    setGeminiRotationMode(mode);
+    const modeLabels = { off: "Off", all: "All", accounts: "\u{1F468}\u{1F3FD}\u200D\u{1F4BB} Accounts only", keys: "\u{1F511} Keys only" };
+    await channel.sendText(chatId, `Rotation mode set to <b>${modeLabels[mode]}</b>.`, "html");
+    return;
+  } else if (data.startsWith("gslot:")) {
+    const val = data.split(":")[1];
+    if (val === "auto") {
+      clearChatGeminiSlot(chatId);
+      await channel.sendText(chatId, "Gemini slot set to <b>\u{1F504} auto rotation</b>.", "html");
+    } else {
+      const slotId = parseInt(val, 10);
+      const slots = getGeminiSlots();
+      const slot = slots.find((s) => s.id === slotId);
+      if (slot) {
+        pinChatGeminiSlot(chatId, slotId);
+        const label2 = slot.label || `slot-${slot.id}`;
+        const icon = slot.slotType === "oauth" ? "\u{1F468}\u{1F3FD}\u200D\u{1F4BB}" : "\u{1F511}";
+        await channel.sendText(chatId, `Pinned to ${icon} <b>${label2}</b>`, "html");
+      }
+    }
+    return;
+  } else if (data === "gopen:accounts") {
+    const slots = getGeminiSlots();
+    if (slots.length === 0) {
+      await channel.sendText(chatId, "No Gemini credentials configured.\nAdd with: <code>cc-claw gemini add-key</code> or <code>cc-claw gemini add-account</code>", "html");
+      return;
+    }
+    if (typeof channel.sendKeyboard === "function") {
+      const currentMode = getGeminiRotationMode();
+      const pinnedSlotId = getChatGeminiSlotId(chatId);
+      const slotButtons = slots.filter((s) => s.enabled).map((s) => {
+        const label2 = s.label || `slot-${s.id}`;
+        const icon = s.slotType === "oauth" ? "\u{1F468}\u{1F3FD}\u200D\u{1F4BB}" : "\u{1F511}";
+        const marker = pinnedSlotId === s.id ? " \u2713" : "";
+        return { label: `${icon} ${label2}${marker}`, data: `gslot:${s.id}` };
+      });
+      const rows = [];
+      for (let i = 0; i < slotButtons.length; i += 2) {
+        rows.push(slotButtons.slice(i, i + 2));
+      }
+      rows.push([{ label: "\u{1F504} Auto (rotation)", data: "gslot:auto" }]);
+      const modeLabels = { off: "Off", all: "All", accounts: "\u{1F468}\u{1F3FD}\u200D\u{1F4BB} Only", keys: "\u{1F511} Only" };
+      const modeButtons = ["off", "all", "accounts", "keys"].map((m) => ({
+        label: `${m === currentMode ? "\u2713 " : ""}${modeLabels[m]}`,
+        data: `grotation:${m}`
+      }));
+      rows.push(modeButtons);
+      await channel.sendKeyboard(chatId, "Gemini Accounts & Rotation:", rows);
+    }
+    return;
   } else if (data.startsWith("model_sig:")) {
     const value = data.slice(10);
     setModelSignature(chatId, value);
@@ -13033,6 +13249,7 @@ var init_router = __esm({
     init_format_time();
     init_agent();
     init_retry();
+    init_quota();
     init_classify();
     init_version();
     init_image_gen();
@@ -14787,8 +15004,8 @@ async function doctorCommand(globalOpts, localOpts) {
   }
   if (existsSync20(ERROR_LOG_PATH)) {
     try {
-      const { readFileSync: readFileSync18 } = await import("fs");
-      const logContent = readFileSync18(ERROR_LOG_PATH, "utf-8");
+      const { readFileSync: readFileSync19 } = await import("fs");
+      const logContent = readFileSync19(ERROR_LOG_PATH, "utf-8");
       const recentLines = logContent.split("\n").filter(Boolean).slice(-100);
       const last24h = Date.now() - 864e5;
       const recentErrors = recentLines.filter((line) => {
@@ -14963,9 +15180,10 @@ __export(gemini_exports, {
   geminiEnable: () => geminiEnable,
   geminiList: () => geminiList,
   geminiRemove: () => geminiRemove,
-  geminiReorder: () => geminiReorder
+  geminiReorder: () => geminiReorder,
+  geminiRotation: () => geminiRotation
 });
-import { existsSync as existsSync22, mkdirSync as mkdirSync9, writeFileSync as writeFileSync7, chmodSync } from "fs";
+import { existsSync as existsSync22, mkdirSync as mkdirSync9, writeFileSync as writeFileSync7, readFileSync as readFileSync15, chmodSync } from "fs";
 import { join as join20 } from "path";
 import { createInterface as createInterface4 } from "readline";
 function requireDb() {
@@ -14982,12 +15200,32 @@ async function requireWriteDb() {
     dbInitialized = true;
   }
 }
+async function resolveSlotId(idOrLabel) {
+  const numeric = parseInt(idOrLabel, 10);
+  if (!isNaN(numeric)) return numeric;
+  const { getGeminiSlots: getGeminiSlots2 } = await Promise.resolve().then(() => (init_store4(), store_exports3));
+  const match = getGeminiSlots2().find(
+    (s) => s.label?.toLowerCase() === idOrLabel.toLowerCase()
+  );
+  return match?.id ?? null;
+}
+function resolveOAuthEmail(configHome) {
+  if (!configHome) return null;
+  try {
+    const accountsPath = join20(configHome, ".gemini", "google_accounts.json");
+    if (!existsSync22(accountsPath)) return null;
+    const accounts = JSON.parse(readFileSync15(accountsPath, "utf-8"));
+    return accounts.active || null;
+  } catch {
+    return null;
+  }
+}
 async function geminiList(globalOpts) {
   requireDb();
   const { openDatabaseReadOnly: openDatabaseReadOnly2 } = await Promise.resolve().then(() => (init_store4(), store_exports3));
   const readDb = openDatabaseReadOnly2();
   const slots = readDb.prepare(`
-    SELECT id, slot_type, label, priority, enabled, cooldown_until, last_used, consecutive_errors, created_at
+    SELECT id, slot_type, label, config_home, priority, enabled, cooldown_until, last_used, consecutive_errors, created_at
     FROM gemini_credentials ORDER BY priority ASC, id ASC
   `).all();
   readDb.close();
@@ -14995,7 +15233,11 @@ async function geminiList(globalOpts) {
     output({ slots: [] }, () => "No Gemini credential slots configured.\nAdd one with: cc-claw gemini add-key  or  cc-claw gemini add-account");
     return;
   }
-  output(slots, (data) => {
+  const enriched = slots.map((s) => ({
+    ...s,
+    email: s.slot_type === "oauth" ? resolveOAuthEmail(s.config_home) : null
+  }));
+  output(enriched, (data) => {
     const list = data;
     const lines = ["", divider("Gemini Credential Slots"), ""];
     for (const s of list) {
@@ -15003,8 +15245,9 @@ async function geminiList(globalOpts) {
       const inCooldown = s.cooldown_until && s.cooldown_until > now;
       const icon = !s.enabled ? error2("\u25CB disabled") : inCooldown ? warning("\u25D1 cooldown") : success("\u25CF active");
       const label2 = s.label || `slot-${s.id}`;
-      const type = s.slot_type === "oauth" ? "OAuth" : "API key";
-      lines.push(`  ${icon}  ${label2} ${muted(`(${type}, #${s.id}, priority ${s.priority})`)}`);
+      const type = s.slot_type === "oauth" ? "\u{1F468}\u{1F3FD}\u200D\u{1F4BB}" : "\u{1F511}";
+      const emailStr = s.email ? ` ${muted(s.email)}` : "";
+      lines.push(`  ${icon}  ${label2}${emailStr} ${muted(`(${type}, #${s.id}, priority ${s.priority})`)}`);
       if (inCooldown) lines.push(`         Cooldown until: ${warning(s.cooldown_until)}`);
       if (s.consecutive_errors > 0) lines.push(`         Consecutive errors: ${warning(String(s.consecutive_errors))}`);
       if (s.last_used) lines.push(`         Last used: ${muted(s.last_used)}`);
@@ -15087,37 +15330,78 @@ async function geminiAddAccount(globalOpts, opts) {
   Added OAuth slot #${id} (${accountEmail})`)
   );
 }
-async function geminiRemove(globalOpts, id) {
+async function geminiRemove(globalOpts, idOrLabel) {
   await requireWriteDb();
+  const slotId = await resolveSlotId(idOrLabel);
+  if (!slotId) {
+    outputError("NOT_FOUND", `Slot "${idOrLabel}" not found.`);
+    return;
+  }
   const { removeGeminiSlot: removeGeminiSlot2 } = await Promise.resolve().then(() => (init_store4(), store_exports3));
-  const removed = removeGeminiSlot2(parseInt(id, 10));
+  const removed = removeGeminiSlot2(slotId);
   if (removed) {
-    output({ removed: true, id: parseInt(id, 10) }, () => success(`Removed slot #${id}`));
+    output({ removed: true, id: slotId }, () => success(`Removed slot "${idOrLabel}" (#${slotId})`));
   } else {
-    outputError("NOT_FOUND", `Slot #${id} not found.`);
+    outputError("NOT_FOUND", `Slot "${idOrLabel}" not found.`);
   }
 }
-async function geminiEnable(globalOpts, id) {
+async function geminiEnable(globalOpts, idOrLabel) {
   await requireWriteDb();
+  const slotId = await resolveSlotId(idOrLabel);
+  if (!slotId) {
+    outputError("NOT_FOUND", `Slot "${idOrLabel}" not found.`);
+    return;
+  }
   const { setGeminiSlotEnabled: setGeminiSlotEnabled2 } = await Promise.resolve().then(() => (init_store4(), store_exports3));
-  setGeminiSlotEnabled2(parseInt(id, 10), true);
-  output({ id: parseInt(id, 10), enabled: true }, () => success(`Enabled slot #${id}`));
+  setGeminiSlotEnabled2(slotId, true);
+  output({ id: slotId, enabled: true }, () => success(`Enabled slot "${idOrLabel}" (#${slotId})`));
 }
-async function geminiDisable(globalOpts, id) {
+async function geminiDisable(globalOpts, idOrLabel) {
   await requireWriteDb();
+  const slotId = await resolveSlotId(idOrLabel);
+  if (!slotId) {
+    outputError("NOT_FOUND", `Slot "${idOrLabel}" not found.`);
+    return;
+  }
   const { setGeminiSlotEnabled: setGeminiSlotEnabled2 } = await Promise.resolve().then(() => (init_store4(), store_exports3));
-  setGeminiSlotEnabled2(parseInt(id, 10), false);
-  output({ id: parseInt(id, 10), enabled: false }, () => warning(`Disabled slot #${id}`));
+  setGeminiSlotEnabled2(slotId, false);
+  output({ id: slotId, enabled: false }, () => warning(`Disabled slot "${idOrLabel}" (#${slotId})`));
 }
-async function geminiReorder(globalOpts, id, priority) {
+async function geminiReorder(globalOpts, idOrLabel, priority) {
   await requireWriteDb();
+  const slotId = await resolveSlotId(idOrLabel);
+  if (!slotId) {
+    outputError("NOT_FOUND", `Slot "${idOrLabel}" not found.`);
+    return;
+  }
   const { reorderGeminiSlot: reorderGeminiSlot2 } = await Promise.resolve().then(() => (init_store4(), store_exports3));
-  reorderGeminiSlot2(parseInt(id, 10), parseInt(priority, 10));
+  reorderGeminiSlot2(slotId, parseInt(priority, 10));
   output(
-    { id: parseInt(id, 10), priority: parseInt(priority, 10) },
-    () => success(`Slot #${id} priority set to ${priority}`)
+    { id: slotId, priority: parseInt(priority, 10) },
+    () => success(`Slot "${idOrLabel}" (#${slotId}) priority set to ${priority}`)
   );
 }
+async function geminiRotation(globalOpts, mode) {
+  const validModes = ["off", "all", "accounts", "keys"];
+  if (!mode) {
+    requireDb();
+    const { openDatabaseReadOnly: openDatabaseReadOnly2 } = await Promise.resolve().then(() => (init_store4(), store_exports3));
+    const readDb = openDatabaseReadOnly2();
+    const row = readDb.prepare("SELECT value FROM meta WHERE key = 'gemini_rotation_mode'").get();
+    readDb.close();
+    const current = row?.value ?? "all";
+    output({ mode: current }, () => `Gemini rotation mode: ${success(current)}`);
+    return;
+  }
+  if (!validModes.includes(mode)) {
+    outputError("INVALID_MODE", `Invalid mode: "${mode}". Valid modes: ${validModes.join(", ")}`);
+    process.exit(1);
+  }
+  await requireWriteDb();
+  const { setGeminiRotationMode: setGeminiRotationMode2 } = await Promise.resolve().then(() => (init_store4(), store_exports3));
+  setGeminiRotationMode2(mode);
+  output({ mode }, () => success(`Gemini rotation mode set to "${mode}"`));
+}
 var dbInitialized;
 var init_gemini2 = __esm({
   "src/cli/commands/gemini.ts"() {
@@ -16116,7 +16400,7 @@ __export(config_exports, {
   configList: () => configList,
   configSet: () => configSet
 });
-import { existsSync as existsSync30, readFileSync as readFileSync15 } from "fs";
+import { existsSync as existsSync30, readFileSync as readFileSync16 } from "fs";
 async function configList(globalOpts) {
   if (!existsSync30(DB_PATH)) {
     outputError("DB_NOT_FOUND", "Database not found.");
@@ -16202,7 +16486,7 @@ async function configEnv(_globalOpts) {
     outputError("ENV_NOT_FOUND", `No .env file at ${ENV_PATH}. Run cc-claw setup.`);
     process.exit(1);
   }
-  const content = readFileSync15(ENV_PATH, "utf-8");
+  const content = readFileSync16(ENV_PATH, "utf-8");
   const entries = {};
   const secretPatterns = /TOKEN|KEY|SECRET|PASSWORD|CREDENTIALS/i;
   for (const line of content.split("\n")) {
@@ -16860,11 +17144,11 @@ __export(chat_exports, {
   chatSend: () => chatSend
 });
 import { request as httpRequest2 } from "http";
-import { readFileSync as readFileSync16, existsSync as existsSync38 } from "fs";
+import { readFileSync as readFileSync17, existsSync as existsSync38 } from "fs";
 function getToken2() {
   if (process.env.CC_CLAW_API_TOKEN) return process.env.CC_CLAW_API_TOKEN;
   try {
-    if (existsSync38(TOKEN_PATH2)) return readFileSync16(TOKEN_PATH2, "utf-8").trim();
+    if (existsSync38(TOKEN_PATH2)) return readFileSync17(TOKEN_PATH2, "utf-8").trim();
   } catch {
   }
   return null;
@@ -17290,7 +17574,7 @@ var init_completion = __esm({
 
 // src/setup.ts
 var setup_exports = {};
-import { existsSync as existsSync39, writeFileSync as writeFileSync8, readFileSync as readFileSync17, copyFileSync as copyFileSync3, mkdirSync as mkdirSync11, statSync as statSync6 } from "fs";
+import { existsSync as existsSync39, writeFileSync as writeFileSync8, readFileSync as readFileSync18, copyFileSync as copyFileSync3, mkdirSync as mkdirSync11, statSync as statSync6 } from "fs";
 import { execFileSync as execFileSync4 } from "child_process";
 import { createInterface as createInterface6 } from "readline";
 import { join as join21 } from "path";
@@ -17374,7 +17658,7 @@ async function setup() {
   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 = readFileSync17(envSource, "utf-8");
+    const existing = readFileSync18(envSource, "utf-8");
     for (const line of existing.split("\n")) {
       const match = line.match(/^([^#=]+)=(.*)$/);
       if (match) env[match[1].trim()] = match[2].trim();
@@ -17732,22 +18016,26 @@ gemini.command("add-account").description("Add an OAuth account slot (opens brow
   const { geminiAddAccount: geminiAddAccount2 } = await Promise.resolve().then(() => (init_gemini2(), gemini_exports));
   await geminiAddAccount2(program.opts(), opts);
 });
-gemini.command("remove <id>").description("Remove a credential slot").action(async (id) => {
+gemini.command("remove <id-or-label>").description("Remove a credential slot (by ID or label)").action(async (id) => {
   const { geminiRemove: geminiRemove2 } = await Promise.resolve().then(() => (init_gemini2(), gemini_exports));
   await geminiRemove2(program.opts(), id);
 });
-gemini.command("enable <id>").description("Re-enable a disabled slot").action(async (id) => {
+gemini.command("enable <id-or-label>").description("Re-enable a disabled slot (by ID or label)").action(async (id) => {
   const { geminiEnable: geminiEnable2 } = await Promise.resolve().then(() => (init_gemini2(), gemini_exports));
   await geminiEnable2(program.opts(), id);
 });
-gemini.command("disable <id>").description("Disable a slot (skip during rotation)").action(async (id) => {
+gemini.command("disable <id-or-label>").description("Disable a slot (by ID or label)").action(async (id) => {
   const { geminiDisable: geminiDisable2 } = await Promise.resolve().then(() => (init_gemini2(), gemini_exports));
   await geminiDisable2(program.opts(), id);
 });
-gemini.command("reorder <id> <priority>").description("Set slot priority (lower = preferred)").action(async (id, priority) => {
+gemini.command("reorder <id-or-label> <priority>").description("Set slot priority (by ID or label, lower = preferred)").action(async (id, priority) => {
   const { geminiReorder: geminiReorder2 } = await Promise.resolve().then(() => (init_gemini2(), gemini_exports));
   await geminiReorder2(program.opts(), id, priority);
 });
+gemini.command("rotation [mode]").description("Get or set rotation mode (off, all, accounts, keys)").action(async (mode) => {
+  const { geminiRotation: geminiRotation2 } = await Promise.resolve().then(() => (init_gemini2(), gemini_exports));
+  await geminiRotation2(program.opts(), mode);
+});
 var backend = program.command("backend").description("Manage AI backend");
 backend.command("list").description("Available backends with status").action(async () => {
   const { backendList: backendList2 } = await Promise.resolve().then(() => (init_backend(), backend_exports));

package/package.json

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