cc-claw 0.13.1 → 0.13.2

package/dist/cli.js

@@ -72,7 +72,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = true ? "0.13.1" : (() => {
+    VERSION = true ? "0.13.2" : (() => {
       try {
         return JSON.parse(readFileSync(join2(process.cwd(), "package.json"), "utf-8")).version ?? "unknown";
       } catch {
@@ -9684,6 +9684,9 @@ function stopAgent(chatId) {
   }
   return true;
 }
+function getGeminiFallback(model2) {
+  return GEMINI_FALLBACK_CHAIN[model2] ?? null;
+}
 function spawnQuery(adapter, config2, model2, cancelState, thinkingLevel, timeoutMs, maxTurns, opts) {
   const effectiveTimeout = timeoutMs ?? SPAWN_TIMEOUT_MS;
   return new Promise((resolve, reject) => {
@@ -9952,12 +9955,14 @@ async function spawnGeminiWithRotation(chatId, adapter, baseConfig, configWithSe
       const isTimeout = errMsg.startsWith(FIRST_RESPONSE_TIMEOUT_ERROR);
       const isExhausted = /RESOURCE.?EXHAUSTED|resource has been exhausted/i.test(errMsg);
       if ((isTimeout || isExhausted) && GEMINI_DOWNGRADE_MODELS.has(model2)) {
+        const fallbackModel = getGeminiFallback(model2);
         const reason = isTimeout ? "No response within timeout" : "Resource exhausted";
-        warn(`[agent:gemini-rotation] ${reason} on ${model2} (${slotLabel}) \u2014 downgrading to ${GEMINI_FALLBACK_MODEL}`);
-        onModelDowngrade?.(model2, GEMINI_FALLBACK_MODEL, `${reason} \u2014 model likely overloaded`);
+        warn(`[agent:gemini-rotation] ${reason} on ${model2} (${slotLabel}) \u2014 downgrading to ${fallbackModel}`);
+        onModelDowngrade?.(model2, fallbackModel, `${reason} \u2014 model likely overloaded`);
+        setModel(chatId, fallbackModel);
         const fallbackConfig = adapter.buildSpawnConfig({
           prompt: effectiveConfig.args[effectiveConfig.args.indexOf("-p") + 1],
-          model: GEMINI_FALLBACK_MODEL,
+          model: fallbackModel,
           permMode: "yolo",
           allowedTools: [],
           cwd: effectiveConfig.cwd,
@@ -9974,8 +9979,8 @@ async function spawnGeminiWithRotation(chatId, adapter, baseConfig, configWithSe
             }
           }
         }
-        const fallbackResult = await spawnQuery(adapter, fallbackConfig, GEMINI_FALLBACK_MODEL, cancelState, thinkingLevel, timeoutMs, maxTurns, { ...opts, envOverride: env, firstResponseTimeoutMs: 0 });
-        fallbackResult.resolvedModel = GEMINI_FALLBACK_MODEL;
+        const fallbackResult = await spawnQuery(adapter, fallbackConfig, fallbackModel, cancelState, thinkingLevel, timeoutMs, maxTurns, { ...opts, envOverride: env });
+        fallbackResult.resolvedModel = fallbackModel;
         return fallbackResult;
       }
       const quotaClass = classifyGeminiQuota(errMsg);
@@ -10088,12 +10093,14 @@ async function askAgentImpl(chatId, userMessage, opts) {
         const isTimeout = errMsg.startsWith(FIRST_RESPONSE_TIMEOUT_ERROR);
         const isExhausted = /RESOURCE.?EXHAUSTED|resource has been exhausted/i.test(errMsg);
         if (adapter.id === "gemini" && (isTimeout || isExhausted) && GEMINI_DOWNGRADE_MODELS.has(resolvedModel)) {
+          const fallbackModel = getGeminiFallback(resolvedModel);
           const reason = isTimeout ? "No response within timeout" : "Resource exhausted";
-          warn(`[agent] ${reason} on ${resolvedModel} (no rotation) \u2014 downgrading to ${GEMINI_FALLBACK_MODEL}`);
-          onModelDowngrade?.(chatId, resolvedModel, GEMINI_FALLBACK_MODEL, `${reason} \u2014 model likely overloaded`);
+          warn(`[agent] ${reason} on ${resolvedModel} (no rotation) \u2014 downgrading to ${fallbackModel}`);
+          onModelDowngrade?.(chatId, resolvedModel, fallbackModel, `${reason} \u2014 model likely overloaded`);
+          setModel(chatId, fallbackModel);
           const fallbackConfig = adapter.buildSpawnConfig({
             prompt: configWithSession.args[configWithSession.args.indexOf("-p") + 1],
-            model: GEMINI_FALLBACK_MODEL,
+            model: fallbackModel,
             permMode: mode,
             allowedTools,
             cwd: resolvedCwd,
@@ -10103,8 +10110,8 @@ async function askAgentImpl(chatId, userMessage, opts) {
           if (mcpConfigPath) {
             fallbackConfig.args = injectMcpConfig(adapter.id, fallbackConfig.args, mcpConfigPath);
           }
-          result = await spawnQuery(adapter, fallbackConfig, GEMINI_FALLBACK_MODEL, cancelState, thinkingLevel, timeoutMs, maxTurns, { ...spawnOpts, firstResponseTimeoutMs: 0 });
-          result.resolvedModel = GEMINI_FALLBACK_MODEL;
+          result = await spawnQuery(adapter, fallbackConfig, fallbackModel, cancelState, thinkingLevel, timeoutMs, maxTurns, spawnOpts);
+          result.resolvedModel = fallbackModel;
         } else {
           throw err;
         }
@@ -10190,7 +10197,7 @@ function injectMcpConfig(adapterId, args, mcpConfigPath) {
   if (!flag) return args;
   return [...args, ...flag, mcpConfigPath];
 }
-var activeChats, chatLocks, SPAWN_TIMEOUT_MS, FIRST_RESPONSE_TIMEOUT_MS, FIRST_RESPONSE_TIMEOUT_ERROR, GEMINI_FALLBACK_MODEL, GEMINI_DOWNGRADE_MODELS, MCP_CONFIG_FLAG;
+var activeChats, chatLocks, SPAWN_TIMEOUT_MS, FIRST_RESPONSE_TIMEOUT_MS, FIRST_RESPONSE_TIMEOUT_ERROR, GEMINI_FALLBACK_CHAIN, GEMINI_DOWNGRADE_MODELS, MCP_CONFIG_FLAG;
 var init_agent = __esm({
   "src/agent.ts"() {
     "use strict";
@@ -10215,8 +10222,11 @@ var init_agent = __esm({
     SPAWN_TIMEOUT_MS = 10 * 60 * 1e3;
     FIRST_RESPONSE_TIMEOUT_MS = parseInt(process.env.GEMINI_FIRST_RESPONSE_TIMEOUT_MS ?? "30000", 10);
     FIRST_RESPONSE_TIMEOUT_ERROR = "FIRST_RESPONSE_TIMEOUT";
-    GEMINI_FALLBACK_MODEL = "gemini-2.5-pro";
-    GEMINI_DOWNGRADE_MODELS = /* @__PURE__ */ new Set(["gemini-3.1-pro-preview"]);
+    GEMINI_FALLBACK_CHAIN = {
+      "gemini-3.1-pro-preview": "gemini-2.5-pro",
+      "gemini-2.5-pro": "gemini-3.1-flash-preview"
+    };
+    GEMINI_DOWNGRADE_MODELS = new Set(Object.keys(GEMINI_FALLBACK_CHAIN));
     MCP_CONFIG_FLAG = {
       claude: ["--mcp-config"]
     };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cc-claw",
-  "version": "0.13.1",
+  "version": "0.13.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",