nolo-cli 0.16.0-alpha.9 → 0.16.0

package/{chunk-XECKIDGJ.js → chunk-DPAB4FQ7.js}

@@ -3,12 +3,12 @@ import {
   refreshAntigravityOAuthToken,
   refreshOpenAiCodexToken,
   refreshXaiOAuthToken
-} from "./chunk-J3VQSU5W.js";
+} from "./chunk-EHLHSX7R.js";
 import {
   buildLocalAgentLookupKeys,
   normalizeAgentHandle,
   shouldReadAgentKeyRemotely
-} from "./chunk-WVDAUR2S.js";
+} from "./chunk-M43KDE25.js";
 import {
   LOCAL_CODEX_AGENT_ID,
   LOCAL_CODEX_AGENT_KEY,
@@ -21,13 +21,13 @@ import {
 import {
   inlineImageUrlsForCustomProvider,
   prepareTools
-} from "./chunk-PEDT43JF.js";
+} from "./chunk-FRV6A633.js";
 import {
   getAntigravityUserAgent,
   isAntigravityOAuthAgent,
   readAntigravityProjectId,
   resolveAntigravityCloudCodeBaseUrl
-} from "./chunk-HSLJ7QER.js";
+} from "./chunk-55NSNCFM.js";
 import {
   FORCED_TOOLS,
   addDefaultLightWebToolsForConfiguredAgents,
@@ -48,7 +48,7 @@ import {
   rememberMemoryFunctionSchema,
   resolveEffectiveEnabledPacks,
   resolveRunLabel
-} from "./chunk-7HECYFOI.js";
+} from "./chunk-ZQBL7LIC.js";
 import {
   createDrainExhaustedResponse,
   isCoreDrainingBody,
@@ -60,13 +60,13 @@ import {
 } from "./chunk-OWOHNGCN.js";
 import {
   prepareTokenUsageData
-} from "./chunk-LSHKV3S7.js";
+} from "./chunk-NSCHQQPU.js";
 import {
   BUILTIN_TITLE_LLM_CONFIG
 } from "./chunk-XOIF2TNF.js";
 import {
   fetchServerSyncedCredential
-} from "./chunk-BHVBFI6B.js";
+} from "./chunk-S2LXHNHG.js";
 import {
   buildAgentRuntimeDialogWritePlan,
   buildLocalWorkspaceOpenAiTools,
@@ -77,10 +77,9 @@ import {
   executeLocalToolWithPolicy,
   executeOpenAiCompatibleChatCompletion,
   parseSseDataLineJson,
-  parseSseDataLineObject,
   readOpenAiCompatibleSseCompletion,
   resolveOpenAiCompatibleProviderConfig
-} from "./chunk-AFNJWHKL.js";
+} from "./chunk-7UKFVQ5W.js";
 import {
   buildPlatformChatCompletionRequest,
   canUsePlatformChatProvider,
@@ -89,20 +88,17 @@ import {
   readSseDataValues,
   resolvePlatformChatProviderConfig,
   shouldUsePlatformChatProvider
-} from "./chunk-4N7QA72L.js";
+} from "./chunk-AVVZUXXC.js";
 import {
   resolveAgentRuntimeConfigFromRecord
 } from "./chunk-OIQPORYI.js";
 import {
+  parseToolArgumentsJson,
   summarizeToolArguments
-} from "./chunk-LZYEWFPK.js";
-import {
-  convertMessagesToResponsesInput,
-  toResponsesTools
-} from "./chunk-KFEVY3ST.js";
+} from "./chunk-GSINCD4P.js";
 import {
   resolvePlatformAuthToken
-} from "./chunk-ZVDRAEZL.js";
+} from "./chunk-6EVITP2G.js";
 import {
   buildLoadSkillExecutor,
   buildNoloWorkspaceCliToolExecutors,
@@ -110,7 +106,7 @@ import {
   canonicalizeToolNames,
   parseNoloWorkspaceToolArguments,
   resolveRuntimeToolSurfaceForAgent
-} from "./chunk-B4KT7RN2.js";
+} from "./chunk-JTMNCCWF.js";
 import {
   clipCompactText
 } from "./chunk-5MMAK75Q.js";
@@ -156,6 +152,9 @@ import {
 import {
   DEFAULT_NOLO_SERVER_URL
 } from "./chunk-OLZBQWZU.js";
+import {
+  asRecordOrEmpty
+} from "./chunk-KX6YBIHG.js";
 import {
   createTokenKey,
   createUserKey,
@@ -167,9 +166,6 @@ import {
 import {
   asOptionalFiniteNumber
 } from "./chunk-WWC7I6TA.js";
-import {
-  asTrimmedLowercaseString
-} from "./chunk-QSJ3HFEF.js";
 import {
   BUILTIN_NOLO_AGENT_KEY,
   PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY,
@@ -298,10 +294,6 @@ var STRINGS = {
     en: "Agent switch cancelled.",
     zh: "\u5DF2\u53D6\u6D88\u5207\u6362 agent\u3002"
   },
-  agentPickerLoading: {
-    en: "Loading agents\u2026",
-    zh: "\u6B63\u5728\u52A0\u8F7D agent \u5217\u8868\u2026"
-  },
   historyPickerTitle: {
     en: "Resume dialog (\u2191\u2193 Enter Esc)",
     zh: "\u6062\u590D\u5BF9\u8BDD\uFF08\u2191\u2193 \u79FB\u52A8 \xB7 Enter \u9009\u62E9 \xB7 Esc \u53D6\u6D88\uFF09"
@@ -621,6 +613,10 @@ var STRINGS = {
     en: "tools",
     zh: "\u5DE5\u5177"
   },
+  contextFieldThinking: {
+    en: "thinking",
+    zh: "\u601D\u8003"
+  },
   contextFieldServer: {
     en: "server",
     zh: "\u670D\u52A1\u7AEF"
@@ -658,6 +654,7 @@ var STRINGS = {
       "  /context              Show workspace context and next actions",
       "  /runtime <mode>       Use auto, local, or server runtime",
       "  /tools <mode>         Control tool trace: hide, compact, verbose",
+      "  /thinking <mode>      Control thinking output: hide, marker, show",
       "  /switch               Pick an agent interactively (\u2191\u2193, Enter)",
       "  /switch list          List agents as text",
       "  /switch <name>        Switch directly by name, alias, or key (alias: /agent)",
@@ -694,6 +691,7 @@ var STRINGS = {
       "  /context              \u67E5\u770B\u5DE5\u4F5C\u533A\u4E0A\u4E0B\u6587\u4E0E\u540E\u7EED\u64CD\u4F5C",
       "  /runtime <mode>       \u5207\u6362 runtime\uFF1Aauto\u3001local\u3001server",
       "  /tools <mode>         \u5DE5\u5177\u8F68\u8FF9\u663E\u793A\uFF1Ahide\u3001compact\u3001verbose",
+      "  /thinking <mode>      \u601D\u8003\u8FC7\u7A0B\u663E\u793A\uFF1Ahide\u3001marker\u3001show",
       "  /switch               \u4EA4\u4E92\u5F0F\u9009\u62E9 agent\uFF08\u2191\u2193 \u79FB\u52A8\uFF0CEnter \u786E\u8BA4\uFF09",
       "  /switch list          \u4EE5\u6587\u672C\u5217\u51FA\u5168\u90E8 agent",
       "  /switch <name>        \u6309\u540D\u79F0\u3001\u522B\u540D\u6216 key \u76F4\u63A5\u5207\u6362\uFF08\u522B\u540D\uFF1A/agent\uFF09",
@@ -738,6 +736,12 @@ var STRINGS = {
   },
   toolsUsage: { en: "Usage: /tools <hide|compact|verbose>", zh: "\u7528\u6CD5\uFF1A/tools <hide|compact|verbose>" },
   toolsSet: { en: "Tool display: {0}", zh: "\u5DE5\u5177\u663E\u793A\uFF1A{0}" },
+  thinkingCurrent: {
+    en: "Thinking display: {0} (hide | marker | show)",
+    zh: "\u601D\u8003\u663E\u793A\uFF1A{0}\uFF08hide | marker | show\uFF09"
+  },
+  thinkingUsage: { en: "Usage: /thinking <hide|marker|show>", zh: "\u7528\u6CD5\uFF1A/thinking <hide|marker|show>" },
+  thinkingSet: { en: "Thinking display: {0}", zh: "\u601D\u8003\u663E\u793A\uFF1A{0}" },
   tasksRunning: { en: "Running processes ({0}):", zh: "\u8FD0\u884C\u4E2D\u7684\u8FDB\u7A0B\uFF08{0}\uFF09\uFF1A" },
   tasksStopped: { en: "Stopped/exited ({0}):", zh: "\u5DF2\u505C\u6B62/\u5DF2\u9000\u51FA\uFF08{0}\uFF09\uFF1A" },
   tasksNone: { en: "No processes.", zh: "\u6CA1\u6709\u8FD0\u884C\u4E2D\u7684\u8FDB\u7A0B\u3002" },
@@ -2056,7 +2060,16 @@ function createCliStartAgentRunExecutor(deps = {}) {
 
 --- \u9644\u52A0\u8F93\u5165 ---
 ${JSON.stringify(args.input)}`;
-    const rawArgs = ["--agent", agentKey, "--msg-file", "PLACEHOLDER", "--bg"];
+    const rawArgs = [
+      "--agent",
+      agentKey,
+      "--msg-file",
+      "PLACEHOLDER",
+      "--bg",
+      // 非持久化派发（review 等一次性任务）：透传 --ephemeral，run 完成后不留
+      // dialog 记录。与 web 端 runAgentBackground 的 ephemeral: true 对齐。
+      ...args.ephemeral === true ? ["--ephemeral"] : []
+    ];
     const agentName = typeof args.agentName === "string" && args.agentName.trim() ? args.agentName.trim() : typeof args.name === "string" && args.name.trim() ? args.name.trim() : void 0;
     const { runId } = await spawnLocalBackgroundRun(
       {
@@ -2435,22 +2448,19 @@ function resolveAntigravityWireModel(logicalModelId) {
   return { wireModelId: id };
 }
 
-// packages/agent-runtime/geminiNativeShared.ts
+// packages/agent-runtime/antigravityCloudCodeProvider.ts
+var STREAM_PATH = "/v1internal:streamGenerateContent?alt=sse";
 var SKIP_THOUGHT_SIGNATURE = "skip_thought_signature_validator";
-function isGemini3Model(modelId) {
+function isGemini3WireModel(modelId) {
   return modelId.includes("gemini-3");
 }
 function messageText(content) {
   if (typeof content === "string") return content;
   if (!Array.isArray(content)) return "";
-  return content.filter(
-    (part) => part?.type === "text"
-  ).map((part) => part.text).join("\n").trim();
+  return content.filter((part) => part?.type === "text").map((part) => part.text).join("\n").trim();
 }
 function parseDataUrlToInlineData(url) {
-  const match = /^data:([A-Za-z0-9.+-]+\/[A-Za-z0-9.+-]+);base64,([A-Za-z0-9+/=]*)$/.exec(
-    url
-  );
+  const match = /^data:([A-Za-z0-9.+-]+\/[A-Za-z0-9.+-]+);base64,([A-Za-z0-9+/=]*)$/.exec(url);
   if (!match) return null;
   return { mimeType: match[1], data: match[2] };
 }
@@ -2467,7 +2477,7 @@ function extractInlineDataParts(content) {
   }
   return parts;
 }
-function convertOpenAiMessagesToGemini(messages, options) {
+function convertOpenAiMessagesToCca(messages, options) {
   const contents = [];
   const systemTexts = [];
   const toolNamesById = /* @__PURE__ */ new Map();
@@ -2483,11 +2493,9 @@ function convertOpenAiMessagesToGemini(messages, options) {
   };
   const flushPendingFunctionCalls = () => {
     if (pendingFunctionCalls.length === 0) return;
-    const dummyResponses = pendingFunctionCalls.map(
-      ({ name }) => ({
-        functionResponse: { name, response: { output: "{}" } }
-      })
-    );
+    const dummyResponses = pendingFunctionCalls.map(({ name }) => ({
+      functionResponse: { name, response: { output: "{}" } }
+    }));
     pendingFunctionCalls = [];
     pushOrMergeContent("user", dummyResponses);
   };
@@ -2496,17 +2504,13 @@ function convertOpenAiMessagesToGemini(messages, options) {
     const role = String(raw.role);
     const content = "content" in raw ? raw.content : null;
     if (role === "system") {
-      const text = messageText(
-        content
-      );
+      const text = messageText(content);
       if (text) systemTexts.push(text);
       continue;
     }
     if (role === "user") {
       flushPendingFunctionCalls();
-      const text = messageText(
-        content
-      );
+      const text = messageText(content);
       const imageParts = extractInlineDataParts(
         content
       );
@@ -2520,9 +2524,7 @@ function convertOpenAiMessagesToGemini(messages, options) {
     if (role === "assistant") {
       flushPendingFunctionCalls();
       const parts = [];
-      const text = messageText(
-        content
-      );
+      const text = messageText(content);
       if (text) parts.push({ text });
       const toolCalls = "tool_calls" in raw && Array.isArray(raw.tool_calls) ? raw.tool_calls ?? [] : [];
       for (const call of toolCalls) {
@@ -2532,20 +2534,17 @@ function convertOpenAiMessagesToGemini(messages, options) {
         toolNamesById.set(id, name);
         pendingFunctionCalls.push({ name, id });
         const realSignature = typeof call.thought_signature === "string" && call.thought_signature ? call.thought_signature : void 0;
-        const isFirstFunctionCallPart = !parts.some(
-          (p) => "functionCall" in p
-        );
-        const signature = realSignature ?? (options.attachSkipThoughtSignature && isFirstFunctionCallPart ? SKIP_THOUGHT_SIGNATURE : void 0);
-        const part = {
+        const isFirstFunctionCallPart = !parts.some((p) => "functionCall" in p);
+        parts.push({
           functionCall: {
             name,
-            args: parseToolArgs(call.function?.arguments),
-            ...id ? { id } : {}
+            args: parseToolArgumentsJson(call.function?.arguments),
+            id
           },
-          ...signature ? { thoughtSignature: signature } : {}
-        };
-        parts.push(part);
+          ...realSignature ? { thoughtSignature: realSignature } : options.attachSkipThoughtSignature && isFirstFunctionCallPart ? { thoughtSignature: SKIP_THOUGHT_SIGNATURE } : {}
+        });
       }
+      if (parts.length === 0) continue;
       pushOrMergeContent("model", parts);
       continue;
     }
@@ -2563,39 +2562,14 @@ function convertOpenAiMessagesToGemini(messages, options) {
       }
       const output = messageText(content) || "{}";
       pushOrMergeContent("user", [
-        {
-          functionResponse: {
-            name,
-            response: { output },
-            // 保留 OpenAI tool_call_id：antigravity Cloud Code Assist 网关把
-            // Gemini contents 转成 Claude messages 时需要 functionResponse →
-            // tool_result 的 tool_use_id；缺 id 时网关报
-            // "tool_result.tool_use_id: Field required"（HTTP 400）。
-            ...toolCallId ? { id: toolCallId } : {}
-          }
-        }
+        { functionResponse: { name, response: { output } } }
       ]);
     }
   }
   flushPendingFunctionCalls();
   return { contents, systemTexts };
 }
-function parseToolArgs(raw) {
-  if (typeof raw === "string") {
-    try {
-      const parsed = JSON.parse(raw);
-      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
-        return parsed;
-      }
-    } catch {
-    }
-  }
-  if (raw && typeof raw === "object" && !Array.isArray(raw)) {
-    return raw;
-  }
-  return {};
-}
-function convertOpenAiToolsToGemini(tools) {
+function convertOpenAiTools(tools) {
   if (!Array.isArray(tools) || tools.length === 0) return void 0;
   const declarations = [];
   for (const tool of tools) {
@@ -2612,97 +2586,6 @@ function convertOpenAiToolsToGemini(tools) {
   if (declarations.length === 0) return void 0;
   return [{ functionDeclarations: declarations }];
 }
-function accumulateGeminiChunks(chunks) {
-  let text = "";
-  const toolCalls = [];
-  let usage;
-  let pendingThoughtSignature;
-  for (const chunk of chunks) {
-    if (!chunk || typeof chunk !== "object") continue;
-    const response = "response" in chunk && chunk.response && typeof chunk.response === "object" ? chunk.response : chunk;
-    if ("usageMetadata" in response && response.usageMetadata && typeof response.usageMetadata === "object") {
-      const meta = response.usageMetadata;
-      const prompt = typeof meta.promptTokenCount === "number" ? meta.promptTokenCount : 0;
-      const candidates2 = typeof meta.candidatesTokenCount === "number" ? meta.candidatesTokenCount : 0;
-      const total = typeof meta.totalTokenCount === "number" ? meta.totalTokenCount : prompt + candidates2;
-      usage = {
-        prompt_tokens: prompt,
-        completion_tokens: candidates2,
-        total_tokens: total
-      };
-    }
-    const candidates = Array.isArray(response.candidates) ? response.candidates : [];
-    for (const candidate of candidates) {
-      if (!candidate || typeof candidate !== "object") continue;
-      const parts = Array.isArray(
-        candidate.content?.parts
-      ) ? candidate.content.parts : [];
-      for (const part of parts) {
-        if (!part || typeof part !== "object") continue;
-        const partSignature = part.thoughtSignature;
-        if ("text" in part && typeof part.text === "string") {
-          const piece = part.text;
-          if (!part.thought) {
-            text += piece;
-          }
-        }
-        if (part.thought && typeof partSignature === "string" && partSignature) {
-          pendingThoughtSignature = partSignature;
-        }
-        if ("functionCall" in part && part.functionCall) {
-          const call = part.functionCall;
-          const name = typeof call.name === "string" ? call.name : "tool";
-          const id = typeof call.id === "string" ? call.id : `${name}_${toolCalls.length}`;
-          const argsObj = call.args && typeof call.args === "object" ? call.args : {};
-          const resolvedSignature = typeof partSignature === "string" && partSignature ? partSignature : pendingThoughtSignature;
-          pendingThoughtSignature = void 0;
-          toolCalls.push({
-            id,
-            type: "function",
-            function: { name, arguments: JSON.stringify(argsObj) },
-            ...typeof resolvedSignature === "string" && resolvedSignature ? { thought_signature: resolvedSignature } : {}
-          });
-        }
-      }
-    }
-  }
-  return { text, toolCalls, usage };
-}
-function shouldUseGeminiNativeToolRoute(provider, model, tools, isImageModel) {
-  return provider === "google" && !isImageModel(model) && isGemini3Model(model) && Array.isArray(tools) && tools.length > 0;
-}
-function buildGeminiGenerateContentRequest(args) {
-  const { contents, systemTexts } = convertOpenAiMessagesToGemini(
-    args.messages,
-    { attachSkipThoughtSignature: args.attachSkipThoughtSignature }
-  );
-  const request = { contents };
-  if (systemTexts.length > 0) {
-    request.systemInstruction = {
-      role: "user",
-      parts: systemTexts.map((text) => ({ text }))
-    };
-  }
-  const toolsResult = convertOpenAiToolsToGemini(args.tools);
-  if (toolsResult) {
-    request.tools = toolsResult;
-    request.toolConfig = { functionCallingConfig: { mode: "VALIDATED" } };
-  }
-  const generationConfig = {};
-  if (typeof args.maxTokens === "number" && args.maxTokens > 0) {
-    generationConfig.maxOutputTokens = args.maxTokens;
-  }
-  if (typeof args.temperature === "number") {
-    generationConfig.temperature = args.temperature;
-  }
-  if (Object.keys(generationConfig).length > 0) {
-    request.generationConfig = generationConfig;
-  }
-  return request;
-}
-
-// packages/agent-runtime/antigravityCloudCodeProvider.ts
-var STREAM_PATH = "/v1internal:streamGenerateContent?alt=sse";
 function buildCloudCodeAssistPayload(args) {
   const projectId = readAntigravityProjectId(args.metadata);
   if (!projectId) {
@@ -2713,9 +2596,8 @@ function buildCloudCodeAssistPayload(args) {
   const logicalModel = asOptionalTrimmedString(args.openAiBody.model) ?? asOptionalTrimmedString(args.agentConfig.model) ?? "gemini-3.1-pro";
   const { wireModelId: model, profile } = resolveAntigravityWireModel(logicalModel);
   const rawMessages = Array.isArray(args.openAiBody.messages) ? args.openAiBody.messages : [];
-  const isClaude = model.toLowerCase().includes("claude");
-  const { contents, systemTexts } = convertOpenAiMessagesToGemini(rawMessages, {
-    attachSkipThoughtSignature: isGemini3Model(model)
+  const { contents, systemTexts } = convertOpenAiMessagesToCca(rawMessages, {
+    attachSkipThoughtSignature: isGemini3WireModel(model)
   });
   if (contents.length === 0) {
     throw new Error("Antigravity Cloud Code Assist request has no user/model contents.");
@@ -2729,7 +2611,7 @@ function buildCloudCodeAssistPayload(args) {
       parts: systemTexts.map((text) => ({ text }))
     };
   }
-  const tools = convertOpenAiToolsToGemini(
+  const tools = convertOpenAiTools(
     Array.isArray(args.openAiBody.tools) ? args.openAiBody.tools : void 0
   );
   if (tools) {
@@ -2752,6 +2634,7 @@ function buildCloudCodeAssistPayload(args) {
   const trajectoryId = randomUUID();
   const step = 2;
   const requestId = `agent/${agentId}/${Date.now()}/${trajectoryId}/${step}`;
+  const isClaude = model.toLowerCase().includes("claude");
   const labels = {
     trajectory_id: trajectoryId,
     last_step_index: String(step - 1),
@@ -2775,6 +2658,63 @@ function buildCloudCodeAssistPayload(args) {
     }
   };
 }
+function accumulateCcaChunks(chunks) {
+  let text = "";
+  const toolCalls = [];
+  let usage;
+  let pendingThoughtSignature;
+  for (const chunk of chunks) {
+    if (!chunk || typeof chunk !== "object") continue;
+    const response = "response" in chunk && chunk.response && typeof chunk.response === "object" ? chunk.response : chunk;
+    if ("usageMetadata" in response && response.usageMetadata && typeof response.usageMetadata === "object") {
+      const meta = response.usageMetadata;
+      const prompt = typeof meta.promptTokenCount === "number" ? meta.promptTokenCount : 0;
+      const candidates2 = typeof meta.candidatesTokenCount === "number" ? meta.candidatesTokenCount : 0;
+      const total = typeof meta.totalTokenCount === "number" ? meta.totalTokenCount : prompt + candidates2;
+      usage = {
+        prompt_tokens: prompt,
+        completion_tokens: candidates2,
+        total_tokens: total
+      };
+    }
+    const candidates = Array.isArray(response.candidates) ? response.candidates : [];
+    for (const candidate of candidates) {
+      if (!candidate || typeof candidate !== "object" || !("content" in candidate)) continue;
+      const content = candidate.content;
+      if (!content || typeof content !== "object" || !("parts" in content)) continue;
+      const parts = content.parts;
+      if (!Array.isArray(parts)) continue;
+      for (const part of parts) {
+        if (!part || typeof part !== "object") continue;
+        const partSignature = part.thoughtSignature;
+        if ("text" in part && typeof part.text === "string") {
+          const piece = part.text;
+          if (!part.thought) {
+            text += piece;
+          }
+        }
+        if (part.thought && typeof partSignature === "string" && partSignature) {
+          pendingThoughtSignature = partSignature;
+        }
+        if ("functionCall" in part && part.functionCall) {
+          const call = part.functionCall;
+          const name = typeof call.name === "string" ? call.name : "tool";
+          const id = typeof call.id === "string" ? call.id : `${name}_${toolCalls.length}`;
+          const argsObj = asRecordOrEmpty(call.args);
+          const resolvedSignature = typeof partSignature === "string" && partSignature ? partSignature : pendingThoughtSignature;
+          pendingThoughtSignature = void 0;
+          toolCalls.push({
+            id,
+            type: "function",
+            function: { name, arguments: JSON.stringify(argsObj) },
+            ...typeof resolvedSignature === "string" && resolvedSignature ? { thought_signature: resolvedSignature } : {}
+          });
+        }
+      }
+    }
+  }
+  return { text, toolCalls, usage };
+}
 async function readSseJsonChunks(response) {
   return readSseDataValues(response, parseSseDataLineJson);
 }
@@ -2799,7 +2739,7 @@ async function fetchAntigravityCloudCodeCompletion(args) {
     };
   }
   const chunks = await readSseJsonChunks(response);
-  const { text, toolCalls, usage } = accumulateGeminiChunks(chunks);
+  const { text, toolCalls, usage } = accumulateCcaChunks(chunks);
   const message = {
     role: "assistant",
     content: text || null
@@ -2838,11 +2778,6 @@ var CLAUDE_CODE_IDENTITY_PATTERNS = [
 function stringValue(value) {
   return typeof value === "string" && value.length > 0 ? value : void 0;
 }
-function isCacheControl(value) {
-  return Boolean(
-    value && typeof value === "object" && !Array.isArray(value) && typeof value.type === "string"
-  );
-}
 function toAnthropicContent(content) {
   if (typeof content === "string") {
     return content.length > 0 ? [{ type: "text", text: content }] : [];
@@ -2853,23 +2788,17 @@ function toAnthropicContent(content) {
     if (!raw || typeof raw !== "object") continue;
     const part = raw;
     if ((part.type === "text" || part.type === "input_text") && typeof part.text === "string") {
-      if (part.text.length > 0) {
-        const block2 = { type: "text", text: part.text };
-        if (isCacheControl(part.cache_control)) block2.cache_control = part.cache_control;
-        blocks.push(block2);
-      }
+      if (part.text.length > 0) blocks.push({ type: "text", text: part.text });
       continue;
     }
     if (part.type !== "image_url") continue;
     const imageUrl = typeof part.image_url === "string" ? part.image_url : stringValue(part.image_url?.url);
     if (!imageUrl) continue;
     const dataMatch = imageUrl.match(/^data:([^;,]+);base64,(.+)$/s);
-    const block = {
+    blocks.push({
       type: "image",
       source: dataMatch ? { type: "base64", media_type: dataMatch[1], data: dataMatch[2] } : { type: "url", url: imageUrl }
-    };
-    if (isCacheControl(part.cache_control)) block.cache_control = part.cache_control;
-    blocks.push(block);
+    });
   }
   return blocks;
 }
@@ -2903,15 +2832,7 @@ function buildAnthropicMessagesBody(args) {
     const message = raw;
     const role = String(message.role ?? "");
     if (role === "system" || role === "developer") {
-      const stablePrefixChars = Number(message.stable_prefix_chars);
-      if (typeof message.content === "string" && Number.isFinite(stablePrefixChars) && stablePrefixChars > 0 && stablePrefixChars <= message.content.length) {
-        const stable = message.content.slice(0, stablePrefixChars);
-        const dynamic = message.content.slice(stablePrefixChars);
-        system.push({ type: "text", text: stable, cache_control: { type: "ephemeral" } });
-        if (dynamic) system.push({ type: "text", text: dynamic });
-      } else {
-        system.push(...toAnthropicContent(message.content));
-      }
+      system.push(...toAnthropicContent(message.content));
       continue;
     }
     if (role === "tool") {
@@ -2953,9 +2874,6 @@ function buildAnthropicMessagesBody(args) {
   if (!hasClaudeCodeIdentity(system)) {
     system.unshift({ type: "text", text: CLAUDE_CODE_SYSTEM_INSTRUCTION });
   }
-  if (system.length > 0 && !system.some((block) => isCacheControl(block.cache_control))) {
-    system[system.length - 1].cache_control = { type: "ephemeral" };
-  }
   const tools = Array.isArray(args.openAiBody.tools) ? args.openAiBody.tools.flatMap((raw) => {
     if (!raw || typeof raw !== "object") return [];
     const fn = raw.function;
@@ -2970,16 +2888,6 @@ function buildAnthropicMessagesBody(args) {
   const model = stringValue(args.openAiBody.model) ?? args.agentConfig.model ?? "claude-sonnet-5";
   const maxTokensRaw = args.openAiBody.max_completion_tokens ?? args.openAiBody.max_tokens ?? args.agentConfig.max_tokens;
   const maxTokens = typeof maxTokensRaw === "number" && Number.isFinite(maxTokensRaw) ? Math.max(1, Math.floor(maxTokensRaw)) : 8192;
-  if (messages.length > 0) {
-    const lastMessage = messages[messages.length - 1];
-    const content = Array.isArray(lastMessage.content) ? lastMessage.content : [];
-    if (content.length > 0) {
-      const lastBlock = content[content.length - 1];
-      if (!isCacheControl(lastBlock.cache_control)) {
-        lastBlock.cache_control = { type: "ephemeral" };
-      }
-    }
-  }
   return {
     model,
     messages,
@@ -3011,8 +2919,6 @@ function mapAnthropicMessageToOpenAi(payload) {
   }
   const usage = payload.usage ?? {};
   const inputTokens = (typeof usage.input_tokens === "number" ? usage.input_tokens : 0) + (typeof usage.cache_creation_input_tokens === "number" ? usage.cache_creation_input_tokens : 0) + (typeof usage.cache_read_input_tokens === "number" ? usage.cache_read_input_tokens : 0);
-  const cacheCreationInputTokens = typeof usage.cache_creation_input_tokens === "number" ? usage.cache_creation_input_tokens : 0;
-  const cacheReadInputTokens = typeof usage.cache_read_input_tokens === "number" ? usage.cache_read_input_tokens : 0;
   const outputTokens = typeof usage.output_tokens === "number" ? usage.output_tokens : 0;
   const stopReason = String(payload.stop_reason ?? "");
   const message = { role: "assistant", content: text || null };
@@ -3028,16 +2934,9 @@ function mapAnthropicMessageToOpenAi(payload) {
       finish_reason: toolCalls.length > 0 || stopReason === "tool_use" ? "tool_calls" : stopReason === "max_tokens" ? "length" : "stop"
     }],
     usage: {
-      // prompt_tokens/input_tokens are total input, including cache read/write.
-      // Preserve Anthropic's components so normalization and billing can apply
-      // the correct cache prices without double-counting them.
       prompt_tokens: inputTokens,
-      input_tokens: inputTokens,
       completion_tokens: outputTokens,
-      output_tokens: outputTokens,
-      total_tokens: inputTokens + outputTokens,
-      cache_creation_input_tokens: cacheCreationInputTokens,
-      cache_read_input_tokens: cacheReadInputTokens
+      total_tokens: inputTokens + outputTokens
     }
   };
 }
@@ -9112,262 +9011,6 @@ function isCursorOAuthAgent(agent) {
   return agent.apiKeyRef?.trim().toLowerCase() === "cursor";
 }
 
-// packages/agent-runtime/codexResponsesProvider.ts
-import { randomUUID as randomUUID4 } from "node:crypto";
-var CODEX_RESPONSES_URL = "https://chatgpt.com/backend-api/codex/responses";
-var CODEX_CLIENT_VERSION = "0.144.1";
-var CODEX_ORIGINATOR = "codex_cli_rs";
-var CODEX_OPENAI_BETA = "responses=experimental";
-var OPENAI_AUTH_CLAIM = "https://api.openai.com/auth";
-var CODEX_INSTALLATION_ID = randomUUID4();
-function decodeCodexAccountId(accessToken) {
-  const parts = accessToken.split(".");
-  if (parts.length < 2) return void 0;
-  try {
-    const payload = JSON.parse(
-      Buffer.from(parts[1], "base64").toString("utf8")
-    );
-    const claim = payload[OPENAI_AUTH_CLAIM];
-    const value = claim && typeof claim === "object" ? claim.chatgpt_account_id : void 0;
-    return typeof value === "string" && value ? value : void 0;
-  } catch {
-    return void 0;
-  }
-}
-function createCodexRequestIdentity(installationId = CODEX_INSTALLATION_ID) {
-  const sessionId = randomUUID4();
-  const threadId = randomUUID4();
-  const windowId = randomUUID4();
-  const turnId = randomUUID4();
-  const turnMetadata = {
-    installation_id: installationId,
-    session_id: sessionId,
-    thread_id: threadId,
-    turn_id: turnId,
-    window_id: windowId,
-    request_kind: "turn",
-    turn_started_at_unix_ms: Date.now()
-  };
-  const turnMetadataJson = JSON.stringify(turnMetadata);
-  return {
-    sessionId,
-    threadId,
-    windowId,
-    turnId,
-    turnMetadataJson,
-    clientMetadata: {
-      "x-codex-installation-id": installationId,
-      session_id: sessionId,
-      thread_id: threadId,
-      "x-codex-window-id": windowId,
-      turn_id: turnId,
-      "x-codex-turn-metadata": turnMetadataJson
-    }
-  };
-}
-function buildCodexCompatibilityHeaders(identity, accountId) {
-  return {
-    Authorization: "",
-    // filled by caller with bearer token
-    "Content-Type": "application/json",
-    Accept: "text/event-stream",
-    "chatgpt-account-id": accountId,
-    "OpenAI-Beta": CODEX_OPENAI_BETA,
-    originator: CODEX_ORIGINATOR,
-    version: CODEX_CLIENT_VERSION,
-    session_id: identity.sessionId,
-    conversation_id: identity.sessionId,
-    "x-client-request-id": identity.sessionId,
-    "session-id": identity.sessionId,
-    "thread-id": identity.threadId,
-    "x-codex-window-id": identity.windowId,
-    "x-codex-turn-metadata": identity.turnMetadataJson
-  };
-}
-function collectInstructions(messages, agentPrompt) {
-  const systemTexts = [];
-  const prompt = agentPrompt?.trim();
-  if (prompt) systemTexts.push(prompt);
-  for (const raw of messages) {
-    if (!raw || typeof raw !== "object") continue;
-    const role = String(raw.role ?? "");
-    if (role !== "system" && role !== "developer") continue;
-    const content = raw.content;
-    const stringContent = asOptionalTrimmedString(content);
-    if (stringContent) {
-      systemTexts.push(stringContent);
-    } else if (Array.isArray(content)) {
-      const text = content.filter(
-        (p) => !!p && p.type === "text"
-      ).map((p) => p.text).join("\n").trim();
-      if (text) systemTexts.push(text);
-    }
-  }
-  return systemTexts.join("\n\n");
-}
-function collectStableInstructions(messages, fallbackPrompt) {
-  const systemTexts = [];
-  if (fallbackPrompt?.trim()) systemTexts.push(fallbackPrompt.trim());
-  for (const raw of messages) {
-    if (!raw || typeof raw !== "object") continue;
-    const message = raw;
-    const role = String(message.role ?? "");
-    if (role !== "system" && role !== "developer") continue;
-    if (typeof message.content === "string") {
-      const boundary = Number(message.stable_prefix_chars);
-      const text = Number.isFinite(boundary) && boundary > 0 ? message.content.slice(0, boundary) : message.content;
-      if (text.trim()) systemTexts.push(text.trim());
-    }
-  }
-  return systemTexts.join("\n\n");
-}
-function stablePromptCacheKey(parts) {
-  const value = JSON.stringify(parts);
-  let hash = 2166136261;
-  for (let index = 0; index < value.length; index += 1) {
-    hash ^= value.charCodeAt(index);
-    hash = Math.imul(hash, 16777619) >>> 0;
-  }
-  return `nolo-codex-${hash.toString(16).padStart(8, "0")}`;
-}
-function buildCodexRequestBody(args, identity = createCodexRequestIdentity()) {
-  const rawMessages = Array.isArray(args.openAiBody.messages) ? args.openAiBody.messages : [];
-  const nonSystem = rawMessages.filter((m) => {
-    const role = m && typeof m === "object" ? String(m.role) : "";
-    return role !== "system" && role !== "developer";
-  });
-  const input = convertMessagesToResponsesInput(nonSystem);
-  const instructions = collectInstructions(rawMessages, args.agentConfig.prompt);
-  const stableInstructions = collectStableInstructions(rawMessages, args.agentConfig.prompt);
-  const model = asOptionalTrimmedString(args.openAiBody.model) ?? asOptionalTrimmedString(args.agentConfig.model) ?? "gpt-5.5";
-  const tools = toResponsesTools(
-    Array.isArray(args.openAiBody.tools) ? args.openAiBody.tools : void 0
-  );
-  const body = {
-    model,
-    input,
-    stream: true,
-    store: false,
-    // Keep routing stable across turns and request UUIDs. Growing input/history
-    // is intentionally excluded; only stable request-prefix material belongs.
-    prompt_cache_key: stablePromptCacheKey([model, stableInstructions, tools ?? []]),
-    client_metadata: identity.clientMetadata
-  };
-  if (instructions) body.instructions = instructions;
-  if (tools && tools.length > 0) {
-    body.tools = tools;
-    body.tool_choice = "auto";
-    body.parallel_tool_calls = true;
-  }
-  return body;
-}
-function aggregateResponsesStream(events) {
-  let text = "";
-  const toolCalls = [];
-  let usage;
-  for (const ev of events) {
-    const type = String(ev.type ?? "");
-    if (type === "response.output_text.delta" && typeof ev.delta === "string") {
-      text += ev.delta;
-      continue;
-    }
-    if (type === "response.output_item.done") {
-      const item = ev.item;
-      if (item && item.type === "function_call") {
-        const name = typeof item.name === "string" ? item.name : "";
-        if (name) {
-          toolCalls.push({
-            id: typeof item.call_id === "string" && item.call_id ? item.call_id : `${name}_${toolCalls.length}`,
-            type: "function",
-            function: {
-              name,
-              arguments: typeof item.arguments === "string" ? item.arguments : "{}"
-            }
-          });
-        }
-      }
-      continue;
-    }
-    if (type === "response.completed") {
-      const response = ev.response;
-      const u = response?.usage;
-      if (u) {
-        const prompt = typeof u.input_tokens === "number" ? u.input_tokens : 0;
-        const completion = typeof u.output_tokens === "number" ? u.output_tokens : 0;
-        const total = typeof u.total_tokens === "number" ? u.total_tokens : prompt + completion;
-        usage = {
-          prompt_tokens: prompt,
-          completion_tokens: completion,
-          total_tokens: total
-        };
-      }
-    }
-  }
-  return { text, toolCalls, usage };
-}
-async function readSseEvents(response) {
-  return readSseDataValues(response, (line) => {
-    const ev = parseSseDataLineObject(line);
-    return ev && !Array.isArray(ev) ? ev : null;
-  });
-}
-async function fetchCodexResponsesCompletion(args) {
-  const fetchImpl = args.fetchImpl ?? fetch;
-  const accountId = args.accountId?.trim() || decodeCodexAccountId(args.accessToken);
-  if (!accountId) {
-    return {
-      status: 401,
-      body: {
-        error: {
-          message: "ChatGPT Codex credential is missing chatgpt_account_id. Re-run `nolo auth chatgpt`."
-        }
-      }
-    };
-  }
-  const identity = createCodexRequestIdentity();
-  const body = buildCodexRequestBody(args, identity);
-  const headers = buildCodexCompatibilityHeaders(identity, accountId);
-  headers.Authorization = `Bearer ${args.accessToken}`;
-  const response = await fetchImpl(CODEX_RESPONSES_URL, {
-    method: "POST",
-    headers,
-    body: JSON.stringify(body),
-    signal: args.signal
-  });
-  if (!response.ok) {
-    const errorText = await response.text();
-    return {
-      status: response.status,
-      body: { error: { message: errorText || response.statusText } }
-    };
-  }
-  const events = await readSseEvents(response);
-  const { text, toolCalls, usage } = aggregateResponsesStream(events);
-  const message = {
-    role: "assistant",
-    content: text || null
-  };
-  if (toolCalls.length > 0) message.tool_calls = toolCalls;
-  return {
-    status: 200,
-    body: {
-      choices: [
-        {
-          index: 0,
-          message,
-          finish_reason: toolCalls.length > 0 ? "tool_calls" : "stop"
-        }
-      ],
-      ...usage ? { usage } : {}
-    }
-  };
-}
-function isCodexOAuthAgent(agentConfig) {
-  if (!agentConfig) return false;
-  const apiKeyRef = asTrimmedLowercaseString(agentConfig.apiKeyRef);
-  return apiKeyRef === "chatgpt";
-}
-
 // packages/agent-runtime/oauthProviders.ts
 var XAI_ACCESS_TOKEN_CLIENT_SKEW_MS = 5 * 60 * 1e3;
 var decodeBase64 = (s) => Buffer.from(s, "base64").toString("utf8");
@@ -10565,74 +10208,6 @@ function createCliLocalRuntimeAdapter(deps) {
           }
         };
       }
-      if (isCodexOAuthAgent(agentConfig)) {
-        const accessToken = await apiKeyRefResolver("chatgpt");
-        if (!accessToken) {
-          throw new Error(
-            'OAuth credential for "chatgpt" not found locally. Run `nolo auth chatgpt`.'
-          );
-        }
-        const credential = readOAuthCredential("chatgpt");
-        const accountId = credential?.accountId;
-        const { requestedToolNames: requestedToolNames2, tools: tools2 } = resolveProviderOpenAiToolBundle(
-          agentConfig,
-          deps.env,
-          buildProviderOpenAiTools,
-          additionalToolNames,
-          { hasUserChoice: Boolean(deps.requestUserChoice) }
-        );
-        logLocalRuntimeDiagnostic("provider.selected", {
-          agentKey: agentConfig.key,
-          transport: "codex-responses",
-          provider: "openai",
-          model: agentConfig.model ?? "gpt-5.6-sol",
-          hasApiKey: true
-        });
-        return {
-          model: agentConfig.model || "gpt-5.6-sol",
-          complete: async (messages, options) => {
-            const result = await fetchCodexResponsesCompletion({
-              agentConfig,
-              accessToken,
-              ...accountId ? { accountId } : {},
-              openAiBody: {
-                model: agentConfig.model || "gpt-5.6-sol",
-                messages,
-                stream: false,
-                ...tools2.length > 0 ? { tools: tools2 } : {}
-              },
-              fetchImpl: (url, init) => fetchWithTransientRetry(fetchImpl, url, init, {
-                sleep: deps.sleep,
-                loopbackRequest
-              })
-            });
-            if (result.status < 200 || result.status >= 300) {
-              const errMsg = result.body?.error && typeof result.body.error === "object" && typeof result.body.error.message === "string" ? result.body.error.message : JSON.stringify(result.body);
-              throw new Error(
-                `local Codex OAuth provider failed: HTTP ${result.status} ${errMsg}`
-              );
-            }
-            const choice = Array.isArray(result.body.choices) ? result.body.choices[0] : void 0;
-            const message = choice?.message ?? {};
-            const content = typeof message.content === "string" ? message.content : "";
-            const tool_calls = Array.isArray(message.tool_calls) ? message.tool_calls : void 0;
-            if (content && options?.onTextDelta) options.onTextDelta(content);
-            logLocalRuntimeDiagnostic("provider.request.result", {
-              agentKey: agentConfig.key,
-              transport: "codex-responses",
-              ok: true,
-              contentChars: content.length,
-              toolCallCount: tool_calls?.length ?? 0,
-              requestedToolNames: requestedToolNames2
-            });
-            return {
-              content,
-              ...tool_calls ? { tool_calls } : {},
-              trace: messages
-            };
-          }
-        };
-      }
       if (isCursorOAuthAgent(agentConfig)) {
         const accessToken = await apiKeyRefResolver("cursor");
         if (!accessToken) {
@@ -10702,101 +10277,6 @@ function createCliLocalRuntimeAdapter(deps) {
           }
         };
       }
-      if (shouldUsePlatformChatProvider(deps.env, agentConfig) && isGemini3Model(agentConfig.model ?? "") && agentConfig.provider === "google") {
-        const providerConfig2 = await resolvePlatformChatProviderConfig({
-          agentConfig,
-          env: deps.env,
-          apiKeyRefResolver,
-          credentialBroker,
-          syncFetcher
-        });
-        const { requestedToolNames: requestedToolNames2, tools: tools2 } = resolveProviderOpenAiToolBundle(
-          agentConfig,
-          deps.env,
-          buildProviderOpenAiTools,
-          additionalToolNames,
-          { hasUserChoice: Boolean(deps.requestUserChoice) }
-        );
-        if (tools2.length > 0 && providerConfig2.apiKey && shouldUseGeminiNativeToolRoute(
-          agentConfig.provider ?? "",
-          agentConfig.model ?? "",
-          tools2,
-          () => false
-          // CLI 端不区分 image 模型
-        )) {
-          logLocalRuntimeDiagnostic("provider.selected", {
-            agentKey: agentConfig.key,
-            transport: "gemini-native-tool",
-            apiSource: agentConfig.apiSource ?? null,
-            provider: providerConfig2.provider,
-            model: providerConfig2.model,
-            hasApiKey: Boolean(providerConfig2.apiKey)
-          });
-          return {
-            model: providerConfig2.model,
-            complete: async (messages, options) => {
-              const requestBody = buildGeminiGenerateContentRequest({
-                messages,
-                tools: tools2,
-                maxTokens: typeof agentConfig.max_tokens === "number" ? agentConfig.max_tokens : void 0,
-                temperature: typeof agentConfig.temperature === "number" ? agentConfig.temperature : void 0,
-                attachSkipThoughtSignature: true
-              });
-              const model = providerConfig2.model;
-              const url = `https://generativelanguage.googleapis.com/v1beta/models/${model}:streamGenerateContent?alt=sse`;
-              logLocalRuntimeDiagnostic("provider.request.start", {
-                agentKey: agentConfig.key,
-                transport: "gemini-native-tool",
-                model,
-                messageCount: messages.length,
-                toolCount: tools2.length,
-                requestedToolNames: requestedToolNames2
-              });
-              const res = await fetchImpl(url, {
-                method: "POST",
-                headers: {
-                  "Content-Type": "application/json",
-                  "x-goog-api-key": providerConfig2.apiKey ?? ""
-                },
-                body: JSON.stringify(requestBody),
-                signal: AbortSignal.timeout(12e4)
-              });
-              if (!res.ok) {
-                const errText = await res.text();
-                logLocalRuntimeDiagnostic("provider.request.failed", {
-                  agentKey: agentConfig.key,
-                  transport: "gemini-native-tool",
-                  status: res.status,
-                  error: errText.slice(0, 200)
-                });
-                throw new Error(
-                  `gemini native tool provider failed: HTTP ${res.status} ${errText.slice(0, 500)}`
-                );
-              }
-              const chunks = await readSseDataValues(res, parseSseDataLineJson);
-              const { text, toolCalls, usage } = accumulateGeminiChunks(chunks);
-              if (text && options?.onTextDelta) {
-                options.onTextDelta(text);
-              }
-              const result = {
-                content: text,
-                model,
-                tool_calls: toolCalls.length > 0 ? toolCalls : void 0,
-                ...usage ? { usage } : {},
-                trace: messages
-              };
-              logLocalRuntimeDiagnostic("provider.request.result", {
-                agentKey: agentConfig.key,
-                transport: "gemini-native-tool",
-                ok: true,
-                contentChars: text.length,
-                toolCallCount: toolCalls.length
-              });
-              return result;
-            }
-          };
-        }
-      }
       if (shouldUsePlatformChatProvider(deps.env, agentConfig)) {
         const providerConfig2 = await resolvePlatformChatProviderConfig({
           agentConfig,