nolo-cli 0.32.0 → 0.33.0-alpha.11

package/{chunk-GAF5X6B7.js → chunk-5QW3O3ET.js}

@@ -4,166 +4,194 @@ import {
   refreshAntigravityOAuthToken,
   refreshOpenAiCodexToken,
   xaiRefresh
-} from "./chunk-SFWZUTCI.js";
-import {
-  ackRunRecord,
-  checkStaleRun,
-  claimRunRecord,
-  commitRunRecordClaim,
-  finalizeRunRecord,
-  findRunRecord,
-  gcRunRecords,
-  queryRunRecords,
-  releaseRunRecordAck,
-  spawnLocalBackgroundRun,
-  terminateRunProcess
-} from "./chunk-7KNERA53.js";
-import {
-  CliProviderQuotaError,
-  executeCli
-} from "./chunk-JDSUTNYY.js";
-import {
-  getDefaultCliLocalRuntimeDb
-} from "./chunk-Q3CSL43H.js";
+} from "./chunk-VBUQYOX7.js";
 import {
   buildLocalAgentLookupKeys
-} from "./chunk-VVEH6XUE.js";
+} from "./chunk-X2DAEZ3X.js";
 import {
   LOCAL_CODEX_AGENT_ID,
   LOCAL_CODEX_AGENT_KEY,
   NOLO_DEFAULT_AGENT_ID,
   NOLO_DEFAULT_AGENT_KEY
-} from "./chunk-K6QEHQZ3.js";
+} from "./chunk-EKLRRZIN.js";
+import {
+  inferCaptureIntent
+} from "./chunk-RPRRIFXV.js";
+import {
+  inlineImageUrlsForCustomProvider,
+  prepareTools
+} from "./chunk-LUIHOUZC.js";
+import {
+  getServerProviderSecret
+} from "./chunk-HS7MLR74.js";
+import {
+  getAntigravityUserAgent,
+  isAntigravityOAuthAgent,
+  readAntigravityProjectId,
+  resolveAntigravityCloudCodeBaseUrl
+} from "./chunk-SCUETSRP.js";
 import {
-  buildAgentRuntimeDialogWritePlan,
+  readXPostFunc,
+  readXPostFunctionSchema,
+  readXhsProfileFunc,
+  readXhsProfileFunctionSchema,
+  rememberMemoryFunctionSchema,
+  resolveAgentRequiredPackIds,
+  setTodoListFunc
+} from "./chunk-MDIAECHA.js";
+import {
+  createDrainExhaustedResponse,
+  isCoreDrainingBody,
+  normalizeNonNegativeMs,
+  parseRetryAfterHeaderMs
+} from "./chunk-RQSOAMPJ.js";
+import {
+  getDefaultCliLocalRuntimeDb
+} from "./chunk-N4XRDM26.js";
+import {
+  applyTokenUsageToDayStats,
+  prepareTokenUsageData,
+  runKeyed
+} from "./chunk-DDVIBKIB.js";
+import {
+  BUILTIN_TITLE_LLM_CONFIG
+} from "./chunk-RCFIB45Q.js";
+import {
+  fetchServerSyncedCredential
+} from "./chunk-66CWPJK2.js";
+import {
+  require_date_fns
+} from "./chunk-M76ECQRD.js";
+import {
+  aggregateResponsesStream,
   buildLoadSkillExecutor,
+  buildLocalDialogWritePlan,
   buildLocalWorkspaceOpenAiTools,
   buildLocalWorkspaceToolset,
   buildNoloWorkspaceCliToolExecutors,
+  codexStreamFailureStatus,
   createHybridRecordStore,
   createLocalWorkspaceToolExecutors,
-  dialogMessageRecordToAgentRuntimeMessage,
   executeLocalToolWithPolicy,
   executeOpenAiCompatibleChatCompletion,
   filterRetainedLedgerRecords,
   isAgentCoolingDown,
   isLineRangeCovered,
+  localDialogMessageRecordToRuntimeMessage,
   parseSseDataLineJson,
   parseSseDataLineObject,
   parseSyncServersEnv,
-  readOpenAiCompatibleSseCompletion,
   resolveAgentNextAvailableAt,
   resolveOpenAiCompatibleProviderConfig
-} from "./chunk-DLWCWUNW.js";
+} from "./chunk-64OVNZXE.js";
 import {
   buildPlatformChatCompletionRequest,
   canUsePlatformChatProvider,
   hasDirectOpenAiCompatibleProvider,
   parsePlatformChatCompletionData,
   parsePlatformChatCompletionResponse,
+  readPlatformChatSseCompletion,
   readSseDataValues,
   resolvePlatformChatProviderConfig,
-  shouldUsePlatformChatProvider
-} from "./chunk-7S54ZGF6.js";
-import {
-  buildCliPrompt
-} from "./chunk-ATNTHIZI.js";
+  shouldUsePlatformChatProvider,
+  streamSseDataValues
+} from "./chunk-RJKIB55Y.js";
 import {
   resolveAgentRuntimeConfigFromRecord
 } from "./chunk-OIQPORYI.js";
 import {
-  inlineImageUrlsForCustomProvider,
-  prepareTools
-} from "./chunk-XDHHF73Q.js";
-import {
-  inferCaptureIntent,
   resolveHistoricalToolContentCap,
   summarizeToolArguments
-} from "./chunk-AYMOSAHE.js";
-import {
-  getAntigravityUserAgent,
-  isAntigravityOAuthAgent,
-  readAntigravityProjectId,
-  resolveAntigravityCloudCodeBaseUrl
-} from "./chunk-YHGHADBQ.js";
+} from "./chunk-BFPSVRCQ.js";
 import {
   convertMessagesToResponsesInput,
   toResponsesTools
-} from "./chunk-D34RI6NI.js";
+} from "./chunk-NNWHHCVP.js";
 import {
   resolvePlatformAuthToken
-} from "./chunk-UDA3ZYLW.js";
-import {
-  buildDialogFallbackTitleFromUserInput,
-  normalizeDialogTitle
-} from "./chunk-2MBTWINN.js";
-import {
-  readXPostFunc,
-  readXPostFunctionSchema,
-  readXhsProfileFunc,
-  readXhsProfileFunctionSchema,
-  rememberMemoryFunctionSchema,
-  setTodoListFunc
-} from "./chunk-MITD7CON.js";
-import {
-  createDrainExhaustedResponse,
-  isCoreDrainingBody,
-  normalizeNonNegativeMs,
-  parseRetryAfterHeaderMs
-} from "./chunk-Z5MXSEOJ.js";
-import {
-  TASK_PREVIEW_MAX,
-  formatListRunsCard,
-  formatNotFoundRunCard,
-  formatStartRunCard,
-  formatStatusRunCard,
-  formatStopRunCard,
-  isAgentNameFallback,
-  isAgentRunTerminalStatus,
-  resolveRunLabel,
-  shortRunId
-} from "./chunk-KXKQO4Q6.js";
+} from "./chunk-7YYHKBJP.js";
 import {
   buildNoloWorkspaceOpenAiTools,
   parseNoloWorkspaceToolArguments,
-  resolveAgentRequiredPackIds,
   resolveRuntimeToolSurfaceForAgent
-} from "./chunk-D2BPX6DQ.js";
+} from "./chunk-ADLYMQB6.js";
 import {
-  applyTokenUsageToDayStats,
-  prepareTokenUsageData,
-  resolveBuiltinPlatformAgentConfig,
-  runKeyed
-} from "./chunk-3GZT3L6F.js";
+  buildDialogFallbackTitleFromUserInput,
+  normalizeDialogTitle
+} from "./chunk-2MBTWINN.js";
+import {
+  applyBuiltinAgentRuntimeOverride,
+  resolveBuiltinPlatformAgentConfig
+} from "./chunk-GJXRIOLS.js";
 import {
-  BUILTIN_TITLE_LLM_CONFIG,
   clipCompactText
-} from "./chunk-BGTUGS3T.js";
+} from "./chunk-DKMOY3QI.js";
+import {
+  isAdaptiveThinkingModelId
+} from "./chunk-DFUPZE6V.js";
 import {
   createFileCredentialBroker,
-  fetchServerSyncedCredential,
   resolveCurrentRunRuntimeToolPolicy,
   resolveLocalWorkspaceExecutorOptionsFromPolicy,
   resolveRequestedRuntimeToolNames
-} from "./chunk-ODS2MVMU.js";
+} from "./chunk-RQFO3CAF.js";
 import {
   createOAuthTokenStore,
   isTokenExpired,
   readOAuthCredential,
   resolveFreshAccessToken
-} from "./chunk-JZPBVBIY.js";
+} from "./chunk-QTZD6HBK.js";
 import {
-  require_date_fns
-} from "./chunk-M76ECQRD.js";
+  FORCED_TOOLS,
+  addDefaultLightWebToolsForConfiguredAgents,
+  addDefaultSystemCapabilityTools,
+  appendEnabledPackPromptPatches,
+  applyDisabledTools,
+  applySystemBuiltinSkillFilter,
+  expandEnabledPacks,
+  resolveEffectiveEnabledPacks
+} from "./chunk-WLH5BAKX.js";
 import {
-  toErrorMessage
-} from "./chunk-HNMXYYJR.js";
+  canonicalizeToolNames
+} from "./chunk-ZZ2MH7LE.js";
 import {
   compactWhitespace
 } from "./chunk-DWLEOOGR.js";
 import {
-  isAdaptiveThinkingModelId
-} from "./chunk-2K4NDPT5.js";
+  ackRunRecord,
+  checkStaleRun,
+  claimRunRecord,
+  commitRunRecordClaim,
+  finalizeRunRecord,
+  findRunRecord,
+  gcRunRecords,
+  queryRunRecords,
+  releaseRunRecordAck,
+  spawnLocalBackgroundRun,
+  terminateRunProcess
+} from "./chunk-7KNERA53.js";
+import {
+  TASK_PREVIEW_MAX,
+  formatListRunsCard,
+  formatNotFoundRunCard,
+  formatStartRunCard,
+  formatStatusRunCard,
+  formatStopRunCard,
+  isAgentNameFallback,
+  isAgentRunTerminalStatus,
+  resolveRunLabel,
+  shortRunId
+} from "./chunk-KXKQO4Q6.js";
+import {
+  CliProviderQuotaError,
+  executeCli
+} from "./chunk-SAQQLJZ5.js";
+import {
+  buildCliPrompt
+} from "./chunk-ATNTHIZI.js";
+import {
+  toErrorMessage
+} from "./chunk-HNMXYYJR.js";
 import {
   isCompiledBinary,
   parseUserIdFromAuthToken
@@ -171,12 +199,24 @@ import {
 import {
   DEFAULT_NOLO_SERVER_URL
 } from "./chunk-OLZBQWZU.js";
+import {
+  createTokenKey,
+  createTokenStatsKey,
+  createUserKey,
+  dialogMessageRange
+} from "./chunk-KMSZPTM6.js";
+import {
+  asTrimmedNonEmptyStringArray
+} from "./chunk-I42VC5KR.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
 import {
   isSystemBuiltinTrustedAgentKey
-} from "./chunk-ZJH3LKEW.js";
+} from "./chunk-IR6W62Q6.js";
+import {
+  isRecord
+} from "./chunk-KUG52IAP.js";
 import {
   NOLO_CLUSTER_SERVERS
 } from "./chunk-LCBAMY2M.js";
@@ -186,31 +226,6 @@ import {
 import {
   normalizeServerOrigin
 } from "./chunk-CF7PE763.js";
-import {
-  createTokenKey,
-  createTokenStatsKey,
-  createUserKey,
-  dialogMessageRange
-} from "./chunk-WHLVPK32.js";
-import {
-  isRecord
-} from "./chunk-KUG52IAP.js";
-import {
-  canonicalizeToolNames
-} from "./chunk-3AUWC6EM.js";
-import {
-  FORCED_TOOLS,
-  addDefaultLightWebToolsForConfiguredAgents,
-  addDefaultSystemCapabilityTools,
-  appendEnabledPackPromptPatches,
-  applyDisabledTools,
-  applySystemBuiltinSkillFilter,
-  expandEnabledPacks,
-  resolveEffectiveEnabledPacks
-} from "./chunk-CF7S2RYZ.js";
-import {
-  asTrimmedNonEmptyStringArray
-} from "./chunk-I42VC5KR.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
@@ -806,6 +821,18 @@ var STRINGS = {
     zh: "\u2713 \u5DF2\u5206\u53C9\u5BF9\u8BDD {0} \u2192 {1}\uFF0C\u8017\u65F6 {2}\uFF08\u65E0\u9700\u538B\u7F29\uFF09\u3002"
   },
   agentCurrent: { en: "Current agent: {0} ({1})", zh: "\u5F53\u524D agent\uFF1A{0}\uFF08{1}\uFF09" },
+  agentPinnedUnaudited: {
+    en: "No audit record for it \u2014 an older build wrote it; see agent-selection.log.",
+    zh: "\u8FD9\u6761\u8BB0\u5F55\u6CA1\u6709\u5BA1\u8BA1\u8BB0\u5F55\uFF0C\u662F\u65E7\u7248\u672C\u5199\u7684\uFF1B\u8BE6\u89C1 agent-selection.log\u3002"
+  },
+  agentPinnedAuditRotated: {
+    en: "The audit log has no entry for it \u2014 it aged out, or another session wrote it.",
+    zh: "\u5BA1\u8BA1\u65E5\u5FD7\u91CC\u6CA1\u6709\u5B83\u7684\u8BB0\u5F55\u2014\u2014\u53EF\u80FD\u5DF2\u88AB\u8F6E\u8F6C\uFF0C\u6216\u662F\u522B\u7684\u4F1A\u8BDD\u5199\u7684\u3002"
+  },
+  agentPinnedFromProfile: {
+    en: 'Agent "{0}" restored from {1} (saved selection). /switch nolo to go back to the default.',
+    zh: "agent\u201C{0}\u201D\u6765\u81EA {1} \u91CC\u4FDD\u5B58\u7684\u9009\u62E9\u3002/switch nolo \u53EF\u5207\u56DE\u9ED8\u8BA4\u6863\u3002"
+  },
   agentUnknown: {
     en: `I don't know agent "{0}" yet.
 Use /switch, /switch list, /switch minimax-m3, or a full agent key.`,
@@ -1046,9 +1073,13 @@ var SUBTASK_REMOVED_GIT_TOOL_NAMES = /* @__PURE__ */ new Set([
   "gitCreateBranch",
   "commitWorkspace"
 ]);
+var INTERACTION_REQUIRED_TOOL_NAMES = /* @__PURE__ */ new Set([
+  "ask_user"
+]);
 var SUBTASK_REMOVED_TOOL_NAMES = /* @__PURE__ */ new Set([
   ...ORCHESTRATION_TOOL_NAMES,
-  ...SUBTASK_REMOVED_GIT_TOOL_NAMES
+  ...SUBTASK_REMOVED_GIT_TOOL_NAMES,
+  ...INTERACTION_REQUIRED_TOOL_NAMES
 ]);
 function isSubtaskRun(env) {
   if (!env) return false;
@@ -1545,23 +1576,6 @@ function assertWithinLocalToolBudget(args) {
   );
 }
 
-// packages/cli/client/localDialogRecords.ts
-var localDialogMessageRecordToRuntimeMessage = dialogMessageRecordToAgentRuntimeMessage;
-function buildLocalDialogWritePlan(args) {
-  return buildAgentRuntimeDialogWritePlan({
-    input: args.input,
-    userId: args.userId,
-    now: args.now,
-    createId: args.createId,
-    existingDialog: args.existingDialog,
-    runtimeHost: "cli",
-    runtimeMetadata: {
-      ...args.cwd ? { worktreePath: args.cwd } : {}
-    },
-    ...args.titleOverride ? { titleOverride: args.titleOverride } : {}
-  });
-}
-
 // packages/cli/client/cliLocalAgentRecordReader.ts
 function resolveBuiltinLocalCliAgentConfig(agentRef, userId) {
   const normalized = agentRef.trim();
@@ -1573,7 +1587,7 @@ function resolveBuiltinLocalCliAgentConfig(agentRef, userId) {
       apiSource: "cli",
       provider: "cli",
       cliProvider: "codex",
-      toolNames: ["readFile", "searchFiles", "execShell", "fetchWebpage", "exa_search"],
+      toolNames: ["readFile", "execShell", "fetchWebpage", "exa_search"],
       rawRecord: {
         dbKey: LOCAL_CODEX_AGENT_KEY,
         id: LOCAL_CODEX_AGENT_ID,
@@ -1592,7 +1606,10 @@ async function readAgentFromStore(args) {
   for (const key of buildLocalAgentLookupKeys(args)) {
     const record = await args.store.read(key);
     if (!record || typeof record !== "object") continue;
-    return resolveAgentRuntimeConfigFromRecord(key, record);
+    return applyBuiltinAgentRuntimeOverride(
+      args.agentRef,
+      resolveAgentRuntimeConfigFromRecord(key, record)
+    );
   }
   return resolveBuiltinPlatformAgentConfig(args.agentRef);
 }
@@ -2256,6 +2273,8 @@ var nodeFs = {
 function resolveNoloHome(env, homedir) {
   const custom = env?.NOLO_HOME;
   if (custom && custom.trim()) return custom.trim();
+  const ambient = process.env.NOLO_HOME?.trim();
+  if (ambient) return ambient;
   return join(homedir(), ".nolo");
 }
 function ensureDir(dir, fs) {
@@ -3242,61 +3261,90 @@ 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;
+function createGeminiAccumulatorState() {
+  return {
+    text: "",
+    toolCalls: []
+  };
+}
+function applyGeminiChunk(chunk, state, options) {
+  if (!chunk || typeof chunk !== "object") return;
+  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;
+    state.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;
+      const isThought = Boolean(part.thought);
+      if ("text" in part && typeof part.text === "string") {
+        const piece = part.text;
+        if (!isThought) {
+          state.text += piece;
+          if (piece && options?.onTextDelta) {
+            options.onTextDelta(piece);
+          }
+        } else {
+          if (piece && options?.onReasoningDelta) {
+            options.onReasoningDelta(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 } : {}
-          });
         }
       }
+      if (isThought && typeof partSignature === "string" && partSignature) {
+        state.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}_${state.toolCalls.length}`;
+        const argsObj = call.args && typeof call.args === "object" ? call.args : {};
+        const resolvedSignature = typeof partSignature === "string" && partSignature ? partSignature : state.pendingThoughtSignature;
+        state.pendingThoughtSignature = void 0;
+        state.toolCalls.push({
+          id,
+          type: "function",
+          function: { name, arguments: JSON.stringify(argsObj) },
+          ...typeof resolvedSignature === "string" && resolvedSignature ? { thought_signature: resolvedSignature } : {}
+        });
+      }
     }
   }
-  return { text, toolCalls, usage };
+}
+function accumulateGeminiChunks(chunks, options) {
+  const state = createGeminiAccumulatorState();
+  for (const chunk of chunks) {
+    applyGeminiChunk(chunk, state, options);
+  }
+  return {
+    text: state.text,
+    toolCalls: state.toolCalls,
+    usage: state.usage
+  };
+}
+async function accumulateGeminiStream(stream, options) {
+  const state = createGeminiAccumulatorState();
+  for await (const chunk of stream) {
+    applyGeminiChunk(chunk, state, options);
+  }
+  return {
+    text: state.text,
+    toolCalls: state.toolCalls,
+    usage: state.usage
+  };
 }
 function shouldUseGeminiNativeToolRoute(provider, model, tools, isImageModel) {
   return provider === "google" && !isImageModel(model) && isGemini3Model(model) && Array.isArray(tools) && tools.length > 0;
@@ -3405,9 +3453,6 @@ function buildCloudCodeAssistPayload(args) {
     }
   };
 }
-async function readSseJsonChunks(response) {
-  return readSseDataValues(response, parseSseDataLineJson);
-}
 async function fetchAntigravityCloudCodeCompletion(args) {
   const fetchImpl = args.fetchImpl ?? fetch;
   const { url, envelope } = buildCloudCodeAssistPayload(args);
@@ -3428,8 +3473,11 @@ async function fetchAntigravityCloudCodeCompletion(args) {
       body: { error: { message: errorText || response.statusText } }
     };
   }
-  const chunks = await readSseJsonChunks(response);
-  const { text, toolCalls, usage } = accumulateGeminiChunks(chunks);
+  const chunkStream = streamSseDataValues(response, parseSseDataLineJson);
+  const { text, toolCalls, usage } = await accumulateGeminiStream(chunkStream, {
+    onTextDelta: args.onTextDelta,
+    onReasoningDelta: args.onReasoningDelta
+  });
   const message = {
     role: "assistant",
     content: text || null
@@ -9974,85 +10022,9 @@ function buildCodexRequestBody(args, identity = createCodexRequestIdentity()) {
   }
   return body;
 }
-function codexStreamFailureStatus(failure) {
-  const marker = `${failure.code ?? ""} ${failure.type ?? ""}`.toLowerCase();
-  if (marker.includes("overload") || marker.includes("service_unavailable")) return 503;
-  if (marker.includes("rate_limit") || marker.includes("usage_limit")) return 429;
-  return 502;
-}
 var RETRYABLE_CODEX_STREAM_STATUSES = /* @__PURE__ */ new Set([503]);
 var CODEX_STREAM_MAX_ATTEMPTS = 3;
 var CODEX_STREAM_RETRY_BASE_DELAY_MS = 500;
-function toStreamFailure(raw) {
-  if (!raw || typeof raw !== "object") return void 0;
-  const err = raw;
-  const reason = typeof err.reason === "string" ? err.reason : void 0;
-  const message = typeof err.message === "string" && err.message ? err.message : reason ? `Codex upstream ended incomplete: ${reason}.` : "";
-  if (!message) return void 0;
-  const code = typeof err.code === "string" ? err.code : reason;
-  return {
-    ...code ? { code } : {},
-    ...typeof err.type === "string" ? { type: err.type } : {},
-    message
-  };
-}
-function aggregateResponsesStream(events) {
-  let text = "";
-  const toolCalls = [];
-  let usage;
-  let failure;
-  for (const ev of events) {
-    const type = String(ev.type ?? "");
-    if (type === "error") {
-      failure = failure ?? toStreamFailure(ev.error);
-      continue;
-    }
-    if (type === "response.failed" || type === "response.incomplete") {
-      const response = ev.response;
-      failure = failure ?? toStreamFailure(response?.error) ?? toStreamFailure(response?.incomplete_details) ?? {
-        code: type === "response.incomplete" ? "response_incomplete" : "response_failed",
-        message: `Codex upstream ended with ${type}.`
-      };
-      continue;
-    }
-    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, failure };
-}
 async function readSseEvents(response) {
   return readSseDataValues(response, (line) => {
     const ev = parseSseDataLineObject(line);
@@ -10296,13 +10268,10 @@ function buildOpenAiTools(args) {
   ];
 }
 var CLI_DEFAULT_TOOLS = ["exa_search", "fetchWebpage"];
-function addDefaultCliCoreTools(toolNames, env, options) {
+function addDefaultCliCoreTools(toolNames, env) {
   const declaredOnly = env && shouldUseDeclaredOnlyLocalWorkspaceTools(env);
-  const forcedTools = options?.hasUserChoice === true ? FORCED_TOOLS : FORCED_TOOLS.filter((name) => name !== "ask_user");
-  const injected = declaredOnly ? [...forcedTools] : [...forcedTools, ...CLI_DEFAULT_TOOLS];
-  const combined = [...toolNames, ...injected];
-  const filtered = options?.hasUserChoice === true ? combined : combined.filter((name) => name !== "ask_user");
-  return [...new Set(filtered)];
+  const injected = declaredOnly ? [...FORCED_TOOLS] : [...FORCED_TOOLS, ...CLI_DEFAULT_TOOLS];
+  return [.../* @__PURE__ */ new Set([...toolNames, ...injected])];
 }
 function resolveCliEffectiveEnabledPacks(args) {
   return resolveEffectiveEnabledPacks({
@@ -10327,7 +10296,7 @@ function withRuntimeEnabledPacksAndPrompt(config) {
     ...prompt ? { prompt } : {}
   };
 }
-function resolveCliRequestedToolNames(agentConfig, env, systemBuiltinSkills, options) {
+function resolveCliRequestedToolNames(agentConfig, env, systemBuiltinSkills) {
   const declaredOnly = shouldUseDeclaredOnlyLocalWorkspaceTools(env);
   const expanded = addDefaultLightWebToolsForConfiguredAgents(
     addDefaultCliCoreTools(
@@ -10341,8 +10310,7 @@ function resolveCliRequestedToolNames(agentConfig, env, systemBuiltinSkills, opt
           resolveRequestedRuntimeToolNames({ agentConfig })
         )
       ),
-      env,
-      options
+      env
     ),
     agentConfig
   );
@@ -10360,10 +10328,10 @@ function resolveCliRequestedToolNames(agentConfig, env, systemBuiltinSkills, opt
   );
   return filterToolNamesForRunKind(afterDisabled, isSubtaskRun(env));
 }
-function resolveProviderOpenAiToolBundle(agentConfig, env, buildTools = buildOpenAiTools, additionalToolNames = [], options) {
+function resolveProviderOpenAiToolBundle(agentConfig, env, buildTools = buildOpenAiTools, additionalToolNames = []) {
   const requestedToolNames = [
     .../* @__PURE__ */ new Set([
-      ...resolveCliRequestedToolNames(agentConfig, env, null, options),
+      ...resolveCliRequestedToolNames(agentConfig, env, null),
       ...additionalToolNames
     ])
   ];
@@ -10869,20 +10837,22 @@ async function writeDialog(args) {
   if (titlePromise) {
     const dialogKey = `dialog-${args.userId}-${plan.dialogId}`;
     titlePatchPromise = titlePromise.then(async (resolvedTitle) => {
-      if (!resolvedTitle) return;
+      if (!resolvedTitle) return null;
       try {
         const existing = await args.store.read(dialogKey);
-        if (!existing || typeof existing !== "object") return;
-        if (existing?.titleSource === "manual") return;
+        if (!existing || typeof existing !== "object") return null;
+        if (existing?.titleSource === "manual") return null;
         const existingTitleUpdatedAtMs = parseTitleUpdatedAtMs(existing);
-        if (existingTitleUpdatedAtMs > nowMs) return;
+        if (existingTitleUpdatedAtMs > nowMs) return null;
         await args.store.write(dialogKey, {
           ...existing,
           title: resolvedTitle,
           titleSource: "auto",
           titleUpdatedAt: new Date(nowMs).toISOString()
         });
+        return resolvedTitle;
       } catch {
+        return null;
       }
     });
   }
@@ -11016,12 +10986,10 @@ function createCliLocalRuntimeAdapter(deps) {
         deps.env
       );
       const agentConfig = baseAgentConfig ? withRuntimeEnabledPacksAndPrompt(baseAgentConfig) : baseAgentConfig;
-      const hasUserChoice = Boolean(deps.requestUserChoice);
       const requestedToolNames = agentConfig ? resolveCliRequestedToolNames(
         agentConfig,
         deps.env,
-        systemBuiltinSkills,
-        { hasUserChoice }
+        systemBuiltinSkills
       ) : [];
       activeAgentToolNames = buildLocalPolicyToolNames({
         agentKey: agentConfig?.key,
@@ -11156,6 +11124,14 @@ function createCliLocalRuntimeAdapter(deps) {
       const authToken = asOptionalTrimmedString(deps.env.AUTH_TOKEN);
       const syncFetcher = authToken ? async (ref) => {
         try {
+          if (ref.startsWith("provider-key:")) {
+            const presetId = ref.slice("provider-key:".length);
+            return await getServerProviderSecret({
+              serverOrigin: serverUrl,
+              token: authToken,
+              presetId
+            });
+          }
           return await fetchServerSyncedCredential(
             { currentServer: serverUrl, authToken },
             ref
@@ -11180,8 +11156,7 @@ function createCliLocalRuntimeAdapter(deps) {
           agentConfig,
           deps.env,
           buildProviderOpenAiTools,
-          additionalToolNames,
-          { hasUserChoice: Boolean(deps.requestUserChoice) }
+          additionalToolNames
         );
         logLocalRuntimeDiagnostic("provider.selected", {
           agentKey: agentConfig.key,
@@ -11216,6 +11191,9 @@ function createCliLocalRuntimeAdapter(deps) {
               accessToken,
               metadata: credential?.metadata ?? null,
               openAiBody,
+              signal: options?.signal,
+              onTextDelta: options?.onTextDelta,
+              onReasoningDelta: options?.onReasoningDelta,
               fetchImpl: (url, init) => fetchWithTransientRetry(fetchImpl, url, init, {
                 sleep: deps.sleep,
                 loopbackRequest
@@ -11232,9 +11210,6 @@ function createCliLocalRuntimeAdapter(deps) {
             const message = choice?.message ?? {};
             const content = typeof message.content === "string" ? message.content : message.content == null ? "" : 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: "antigravity-cloud-code",
@@ -11268,8 +11243,7 @@ function createCliLocalRuntimeAdapter(deps) {
           agentConfig,
           deps.env,
           buildProviderOpenAiTools,
-          additionalToolNames,
-          { hasUserChoice: Boolean(deps.requestUserChoice) }
+          additionalToolNames
         );
         logLocalRuntimeDiagnostic("provider.selected", {
           agentKey: agentConfig.key,
@@ -11343,8 +11317,7 @@ function createCliLocalRuntimeAdapter(deps) {
           agentConfig,
           deps.env,
           buildProviderOpenAiTools,
-          additionalToolNames,
-          { hasUserChoice: Boolean(deps.requestUserChoice) }
+          additionalToolNames
         );
         logLocalRuntimeDiagnostic("provider.selected", {
           agentKey: agentConfig.key,
@@ -11418,8 +11391,7 @@ function createCliLocalRuntimeAdapter(deps) {
           agentConfig,
           deps.env,
           buildProviderOpenAiTools,
-          additionalToolNames,
-          { hasUserChoice: Boolean(deps.requestUserChoice) }
+          additionalToolNames
         );
         logLocalRuntimeDiagnostic("provider.selected", {
           agentKey: agentConfig.key,
@@ -11488,8 +11460,7 @@ function createCliLocalRuntimeAdapter(deps) {
           agentConfig,
           deps.env,
           buildProviderOpenAiTools,
-          additionalToolNames,
-          { hasUserChoice: Boolean(deps.requestUserChoice) }
+          additionalToolNames
         );
         if (tools2.length > 0 && providerConfig2.apiKey && shouldUseGeminiNativeToolRoute(
           agentConfig.provider ?? "",
@@ -11597,19 +11568,19 @@ function createCliLocalRuntimeAdapter(deps) {
           agentConfig,
           deps.env,
           buildProviderOpenAiTools,
-          additionalToolNames,
-          { hasUserChoice: Boolean(deps.requestUserChoice) }
+          additionalToolNames
         );
         return {
           model: providerConfig2.model,
           complete: async (messages, options) => {
             const usesResponsesApi = providerConfig2.endpoint.includes("/responses");
-            const stream = Boolean(options?.onTextDelta) && !usesResponsesApi;
+            const stream = Boolean(options?.onTextDelta);
             const request = buildPlatformChatCompletionRequest({
               providerConfig: providerConfig2,
               messages,
               tools: tools2,
-              stream
+              stream,
+              ...options?.dialogId ? { dialogId: options.dialogId } : {}
             });
             logLocalRuntimeDiagnostic("provider.request.start", {
               agentKey: agentConfig.key,
@@ -11663,9 +11634,11 @@ function createCliLocalRuntimeAdapter(deps) {
             const contentType = res.headers.get("content-type") ?? "";
             const shouldStream = Boolean(stream && options?.onTextDelta) && contentType.includes("text/event-stream");
             if (shouldStream && options?.onTextDelta) {
-              const streamed = await readOpenAiCompatibleSseCompletion({
+              const streamed = await readPlatformChatSseCompletion({
                 response: res,
-                onTextDelta: options.onTextDelta
+                usesResponsesApi,
+                onTextDelta: options.onTextDelta,
+                onReasoningDelta: options.onReasoningDelta
               });
               logLocalRuntimeDiagnostic("provider.request.result", {
                 agentKey: agentConfig.key,
@@ -11682,6 +11655,8 @@ function createCliLocalRuntimeAdapter(deps) {
                 ...streamed.tool_calls ? { tool_calls: streamed.tool_calls } : {},
                 ...streamed.reasoning_content ? { reasoning_content: streamed.reasoning_content } : {},
                 ...streamed.usage ? { usage: streamed.usage } : {},
+                ...streamed.finish_reason ? { finish_reason: streamed.finish_reason } : {},
+                ...streamed.stream_complete ? { stream_complete: streamed.stream_complete } : {},
                 trace: messages
               };
             }
@@ -11727,8 +11702,7 @@ function createCliLocalRuntimeAdapter(deps) {
         agentConfig,
         deps.env,
         buildProviderOpenAiTools,
-        additionalToolNames,
-        { hasUserChoice: Boolean(deps.requestUserChoice) }
+        additionalToolNames
       );
       return {
         model: providerConfig.model,