nolo-cli 0.16.0-alpha.5 → 0.16.0-alpha.7

package/{chunk-N7Y6Y4WV.js → chunk-6EFJQCL6.js}

@@ -8,7 +8,7 @@ import {
   buildLocalAgentLookupKeys,
   normalizeAgentHandle,
   shouldReadAgentKeyRemotely
-} from "./chunk-QEZOL2ES.js";
+} from "./chunk-QSWWWYGA.js";
 import {
   LOCAL_CODEX_AGENT_ID,
   LOCAL_CODEX_AGENT_KEY,
@@ -76,9 +76,10 @@ import {
   executeLocalToolWithPolicy,
   executeOpenAiCompatibleChatCompletion,
   parseSseDataLineJson,
+  parseSseDataLineObject,
   readOpenAiCompatibleSseCompletion,
   resolveOpenAiCompatibleProviderConfig
-} from "./chunk-GYJSDXGN.js";
+} from "./chunk-C2BYYSAO.js";
 import {
   buildPlatformChatCompletionRequest,
   canUsePlatformChatProvider,
@@ -93,9 +94,12 @@ import {
   resolveAgentRuntimeConfigFromRecord
 } from "./chunk-OIQPORYI.js";
 import {
-  parseToolArgumentsJson,
   summarizeToolArguments
 } from "./chunk-ZTRZ2O5B.js";
+import {
+  convertMessagesToResponsesInput,
+  toResponsesTools
+} from "./chunk-KFEVY3ST.js";
 import {
   resolvePlatformAuthToken
 } from "./chunk-LJIJWXIT.js";
@@ -152,9 +156,6 @@ import {
 import {
   DEFAULT_NOLO_SERVER_URL
 } from "./chunk-OLZBQWZU.js";
-import {
-  asRecordOrEmpty
-} from "./chunk-KX6YBIHG.js";
 import {
   createTokenKey,
   createUserKey,
@@ -166,6 +167,9 @@ import {
 import {
   asOptionalFiniteNumber
 } from "./chunk-WWC7I6TA.js";
+import {
+  asTrimmedLowercaseString
+} from "./chunk-QSJ3HFEF.js";
 import {
   BUILTIN_NOLO_AGENT_KEY,
   PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY,
@@ -2431,19 +2435,22 @@ function resolveAntigravityWireModel(logicalModelId) {
   return { wireModelId: id };
 }
 
-// packages/agent-runtime/antigravityCloudCodeProvider.ts
-var STREAM_PATH = "/v1internal:streamGenerateContent?alt=sse";
+// packages/agent-runtime/geminiNativeShared.ts
 var SKIP_THOUGHT_SIGNATURE = "skip_thought_signature_validator";
-function isGemini3WireModel(modelId) {
+function isGemini3Model(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] };
 }
@@ -2460,7 +2467,7 @@ function extractInlineDataParts(content) {
   }
   return parts;
 }
-function convertOpenAiMessagesToCca(messages, options) {
+function convertOpenAiMessagesToGemini(messages, options) {
   const contents = [];
   const systemTexts = [];
   const toolNamesById = /* @__PURE__ */ new Map();
@@ -2476,9 +2483,11 @@ function convertOpenAiMessagesToCca(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);
   };
@@ -2487,13 +2496,17 @@ function convertOpenAiMessagesToCca(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
       );
@@ -2507,7 +2520,9 @@ function convertOpenAiMessagesToCca(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) {
@@ -2517,17 +2532,20 @@ function convertOpenAiMessagesToCca(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);
-        parts.push({
+        const isFirstFunctionCallPart = !parts.some(
+          (p) => "functionCall" in p
+        );
+        const signature = realSignature ?? (options.attachSkipThoughtSignature && isFirstFunctionCallPart ? SKIP_THOUGHT_SIGNATURE : void 0);
+        const part = {
           functionCall: {
             name,
-            args: parseToolArgumentsJson(call.function?.arguments),
-            id
+            args: parseToolArgs(call.function?.arguments),
+            ...id ? { id } : {}
           },
-          ...realSignature ? { thoughtSignature: realSignature } : options.attachSkipThoughtSignature && isFirstFunctionCallPart ? { thoughtSignature: SKIP_THOUGHT_SIGNATURE } : {}
-        });
+          ...signature ? { thoughtSignature: signature } : {}
+        };
+        parts.push(part);
       }
-      if (parts.length === 0) continue;
       pushOrMergeContent("model", parts);
       continue;
     }
@@ -2552,7 +2570,22 @@ function convertOpenAiMessagesToCca(messages, options) {
   flushPendingFunctionCalls();
   return { contents, systemTexts };
 }
-function convertOpenAiTools(tools) {
+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) {
   if (!Array.isArray(tools) || tools.length === 0) return void 0;
   const declarations = [];
   for (const tool of tools) {
@@ -2569,6 +2602,97 @@ function convertOpenAiTools(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) {
@@ -2579,8 +2703,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 { contents, systemTexts } = convertOpenAiMessagesToCca(rawMessages, {
-    attachSkipThoughtSignature: isGemini3WireModel(model)
+  const { contents, systemTexts } = convertOpenAiMessagesToGemini(rawMessages, {
+    attachSkipThoughtSignature: isGemini3Model(model)
   });
   if (contents.length === 0) {
     throw new Error("Antigravity Cloud Code Assist request has no user/model contents.");
@@ -2594,7 +2718,7 @@ function buildCloudCodeAssistPayload(args) {
       parts: systemTexts.map((text) => ({ text }))
     };
   }
-  const tools = convertOpenAiTools(
+  const tools = convertOpenAiToolsToGemini(
     Array.isArray(args.openAiBody.tools) ? args.openAiBody.tools : void 0
   );
   if (tools) {
@@ -2641,63 +2765,6 @@ 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);
 }
@@ -2722,7 +2789,7 @@ async function fetchAntigravityCloudCodeCompletion(args) {
     };
   }
   const chunks = await readSseJsonChunks(response);
-  const { text, toolCalls, usage } = accumulateCcaChunks(chunks);
+  const { text, toolCalls, usage } = accumulateGeminiChunks(chunks);
   const message = {
     role: "assistant",
     content: text || null
@@ -9021,6 +9088,234 @@ 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 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 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,
+    prompt_cache_key: identity.sessionId,
+    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");
@@ -10218,6 +10513,74 @@ 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) {
@@ -10287,6 +10650,101 @@ 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,