cc-claw 0.15.0 → 0.15.2

package/dist/cli.js

@@ -33,7 +33,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = true ? "0.15.0" : (() => {
+    VERSION = true ? "0.15.2" : (() => {
       try {
         return JSON.parse(readFileSync(join(process.cwd(), "package.json"), "utf-8")).version ?? "unknown";
       } catch {
@@ -10745,8 +10745,18 @@ async function askAgentImpl(chatId, userMessage, opts) {
       const downgradeCb = onModelDowngrade ? (from, to, reason) => onModelDowngrade(chatId, from, to, reason) : void 0;
       result = await spawnGeminiWithRotation(chatId, adapter, baseConfig, configWithSession, resolvedModel, cancelState, thinkingLevel, timeoutMs, maxTurns, rotationMode, spawnOpts, rotationCb, settingsSourceChatId, downgradeCb);
     } else {
+      const slotSpawnOpts = (() => {
+        if (adapter.id !== "gemini") return spawnOpts;
+        const geminiAdapter = adapter;
+        const { env, slot } = geminiAdapter.getEnvForSlot(chatId);
+        if (slot) {
+          log(`[agent] rotation=off, using pinned slot: ${slot.label || `slot-${slot.id}`} (${slot.slotType})`);
+          return { ...spawnOpts, envOverride: env };
+        }
+        return spawnOpts;
+      })();
       try {
-        result = await spawnQuery(adapter, configWithSession, resolvedModel, cancelState, thinkingLevel, timeoutMs, maxTurns, spawnOpts);
+        result = await spawnQuery(adapter, configWithSession, resolvedModel, cancelState, thinkingLevel, timeoutMs, maxTurns, slotSpawnOpts);
       } catch (err) {
         const errMsg = err instanceof Error ? err.message : String(err);
         const isTimeout = errMsg.startsWith(FIRST_RESPONSE_TIMEOUT_ERROR);
@@ -10769,7 +10779,7 @@ async function askAgentImpl(chatId, userMessage, opts) {
           if (mcpConfigPath) {
             fallbackConfig.args = injectMcpConfig(adapter.id, fallbackConfig.args, mcpConfigPath);
           }
-          result = await spawnQuery(adapter, fallbackConfig, fallbackModel, cancelState, thinkingLevel, timeoutMs, maxTurns, spawnOpts);
+          result = await spawnQuery(adapter, fallbackConfig, fallbackModel, cancelState, thinkingLevel, timeoutMs, maxTurns, slotSpawnOpts);
           result.resolvedModel = fallbackModel;
         } else {
           throw err;
@@ -10786,7 +10796,14 @@ async function askAgentImpl(chatId, userMessage, opts) {
         const downgradeCb = onModelDowngrade ? (from, to, reason) => onModelDowngrade(chatId, from, to, reason) : void 0;
         result = await spawnGeminiWithRotation(chatId, adapter, baseConfig, baseConfig, resolvedModel, cancelState, thinkingLevel, timeoutMs, maxTurns, rotationMode, spawnOpts, rotationCb, settingsSourceChatId, downgradeCb);
       } else {
-        result = await spawnQuery(adapter, baseConfig, resolvedModel, cancelState, thinkingLevel, timeoutMs, maxTurns, spawnOpts);
+        const retryOpts = (() => {
+          if (adapter.id !== "gemini") return spawnOpts;
+          const geminiAdapter = adapter;
+          const { env, slot } = geminiAdapter.getEnvForSlot(chatId);
+          if (slot) return { ...spawnOpts, envOverride: env };
+          return spawnOpts;
+        })();
+        result = await spawnQuery(adapter, baseConfig, resolvedModel, cancelState, thinkingLevel, timeoutMs, maxTurns, retryOpts);
       }
     }
   } catch (spawnErr) {
@@ -10799,7 +10816,14 @@ async function askAgentImpl(chatId, userMessage, opts) {
         const downgradeCb = onModelDowngrade ? (from, to, reason) => onModelDowngrade(chatId, from, to, reason) : void 0;
         result = await spawnGeminiWithRotation(chatId, adapter, baseConfig, baseConfig, resolvedModel, cancelState, thinkingLevel, timeoutMs, maxTurns, rotationMode, spawnOpts, rotationCb, settingsSourceChatId, downgradeCb);
       } else {
-        result = await spawnQuery(adapter, baseConfig, resolvedModel, cancelState, thinkingLevel, timeoutMs, maxTurns, spawnOpts);
+        const retryOpts = (() => {
+          if (adapter.id !== "gemini") return spawnOpts;
+          const geminiAdapter = adapter;
+          const { env, slot } = geminiAdapter.getEnvForSlot(chatId);
+          if (slot) return { ...spawnOpts, envOverride: env };
+          return spawnOpts;
+        })();
+        result = await spawnQuery(adapter, baseConfig, resolvedModel, cancelState, thinkingLevel, timeoutMs, maxTurns, retryOpts);
       }
     } else {
       if (!isSyntheticChatId(chatId)) {
@@ -15321,7 +15345,9 @@ async function doBackendSwitch(chatId, backendId, channel) {
   clearSession(chatId);
   clearModel(chatId);
   clearThinkingLevel(chatId);
-  clearChatGeminiSlot(chatId);
+  if (backendId !== "gemini") {
+    clearChatGeminiSlot(chatId);
+  }
   setBackend(chatId, backendId);
   logActivity(getDb(), { chatId, source: "telegram", eventType: "config_changed", summary: `Backend switched to ${targetAdapter.displayName}`, detail: { field: "backend", value: backendId } });
   if (typeof channel.sendKeyboard === "function") {
@@ -15871,7 +15897,6 @@ Tap to toggle:`,
       const exchangeCount = getMessagePairCount(chatId);
       const summarized = await summarizeSession(chatId);
       clearSession(chatId);
-      clearChatGeminiSlot(chatId);
       setSessionStartedAt(chatId);
       logActivity(getDb(), { chatId, source: "telegram", eventType: "config_changed", summary: "New session started", detail: { field: "session", action: "reset", summarized } });
       if (typeof channel.sendKeyboard === "function" && oldSessionId) {

package/package.json

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