nolo-cli 0.10.0 → 0.11.0

package/{chunk-6KUOUWMP.js → chunk-BX6U3ETE.js}

@@ -5,10 +5,10 @@ import {
   readSseFrames,
   throwIfChatCompletionStreamFailed,
   toOpenAiCompatibleMessages
-} from "./chunk-5KLGBAAR.js";
+} from "./chunk-ZPRK73XY.js";
 import {
   parseToolArgumentsJson
-} from "./chunk-6SLCD4RB.js";
+} from "./chunk-S3GS2PRL.js";
 import {
   createThinkParserState,
   extractThinkContent
@@ -16,15 +16,12 @@ import {
 import {
   buildProviderAuthHeaders,
   buildProviderExecutionPlan
-} from "./chunk-JRKKFRAV.js";
+} from "./chunk-YTBMA7NO.js";
 import {
   canonicalizeToolName,
   createGlob,
   resolveExecutableOnPath
-} from "./chunk-AUQ747NZ.js";
-import {
-  toErrorMessage
-} from "./chunk-HNMXYYJR.js";
+} from "./chunk-4SOKXIW4.js";
 import {
   asRecordOrEmpty
 } from "./chunk-KX6YBIHG.js";
@@ -40,21 +37,24 @@ import {
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
+import {
+  toErrorMessage
+} from "./chunk-HNMXYYJR.js";
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
 import {
   asOptionalPositiveFiniteNumber
 } from "./chunk-U6VC4MU4.js";
+import {
+  isRecord
+} from "./chunk-KUG52IAP.js";
 import {
   normalizeServerOrigin
 } from "./chunk-CF7PE763.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
-import {
-  isRecord
-} from "./chunk-KUG52IAP.js";
 
 // packages/agent-runtime/kimiUserAgent.ts
 var KIMI_CODE_CLI_VERSION = "0.29.2";
@@ -878,7 +878,14 @@ var DEFAULT_LOCAL_TOOLS = /* @__PURE__ */ new Set([
   "searchFiles",
   "execShell",
   "launchProcess",
-  "listProcesses"
+  "listProcesses",
+  // Scheduling tools: forking/observing sub-agents is a declared capability
+  // of capable agents, and the blast radius is strictly narrower than
+  // execShell (already default-enabled). Requiring an env allowlist for these
+  // while execShell is open by default inverted the risk model and forced every
+  // new local user to hand-edit .env files before sub-agent tasks worked.
+  "startAgentRun",
+  "controlAgentRun"
 ]);
 function parseToolAllowlist(value) {
   return (value ?? "").split(",").flatMap((item) => {
@@ -951,7 +958,7 @@ function resolveLocalToolPolicy(args) {
   return {
     allowed: false,
     toolName,
-    reason: `${toolName} is not enabled for local runtime runs. Set NOLO_LOCAL_ALLOWED_TOOLS and make sure the agent declares the tool before using it locally.`
+    reason: `${toolName} is not enabled for local runtime runs. The agent must declare the tool in its manifest; in restricted mode (NOLO_LOCAL_TOOL_MODE=restricted) non-default tools also require adding to NOLO_LOCAL_ALLOWED_TOOLS (e.g. NOLO_LOCAL_ALLOWED_TOOLS=someCustomTool) and restarting the session so the env var loads.`
   };
 }
 async function executeLocalToolWithPolicy(args) {

package/{chunk-CDTLMEB3.js → chunk-C2MDQQ4O.js}

@@ -1,7 +1,7 @@
 import {
   buildAgentRuntimeAgentLookupKeys,
   shouldFetchAgentRuntimeRecordRemotely
-} from "./chunk-6KUOUWMP.js";
+} from "./chunk-BX6U3ETE.js";
 
 // packages/cli/client/localAgentRecords.ts
 var buildLocalAgentLookupKeys = buildAgentRuntimeAgentLookupKeys;

package/{chunk-SL35K7AH.js → chunk-C4FTUXVF.js}

@@ -2,85 +2,6 @@ import {
   MEMORY_USE_GUIDANCE
 } from "./chunk-KKY4B2Q2.js";
 
-// packages/agent-runtime/modelLayerOverride.ts
-var MODEL_LAYER_KEYS = [
-  "provider",
-  "model",
-  "apiSource",
-  "cliProvider",
-  "useServerProxy",
-  "apiKey",
-  "apiKeyRef",
-  "apiKeyHeader",
-  "customProviderUrl",
-  "credentialRef",
-  "credentialSynced",
-  "temperature",
-  "top_p",
-  "frequency_penalty",
-  "presence_penalty",
-  "max_tokens",
-  "reasoning_effort",
-  "enableThinking",
-  "thinkingBudget"
-];
-function mergeReferences(base, extra) {
-  const safeBase = Array.isArray(base) ? base : [];
-  const safeExtra = Array.isArray(extra) ? extra : [];
-  const seen = /* @__PURE__ */ new Set();
-  const merged = [];
-  for (const item of [...safeBase, ...safeExtra]) {
-    const key = item?.dbKey;
-    if (key && seen.has(key)) continue;
-    if (key) seen.add(key);
-    if (item) merged.push(item);
-  }
-  return merged;
-}
-var asNonEmptyString = (value) => typeof value === "string" && value.trim().length > 0;
-function buildModelLayerOverride(agent) {
-  if (!agent || !asNonEmptyString(agent.provider) || !asNonEmptyString(agent.model)) {
-    return null;
-  }
-  const override = {
-    provider: agent.provider,
-    model: agent.model
-  };
-  for (const key of MODEL_LAYER_KEYS) {
-    if (key === "provider" || key === "model") continue;
-    const value = agent[key];
-    if (value !== void 0) {
-      override[key] = value;
-    }
-  }
-  if (Array.isArray(agent.references) && agent.references.length > 0) {
-    override.references = agent.references;
-  }
-  return override;
-}
-function applyModelLayerOverride(base, override) {
-  const next = { ...base };
-  for (const key of MODEL_LAYER_KEYS) {
-    delete next[key];
-  }
-  for (const key of MODEL_LAYER_KEYS) {
-    const value = override[key];
-    if (value !== void 0) {
-      next[key] = value;
-    }
-  }
-  const merged = mergeReferences(
-    base.references,
-    override.references
-  );
-  if (merged.length > 0) {
-    next.references = merged;
-  } else {
-    delete next.references;
-  }
-  return next;
-}
-
 // packages/agent-runtime/turnContext.ts
 var DEFAULT_RECENT_CONTENT_LIMIT = 10;
 var asTrimmed = (value) => typeof value === "string" ? value.trim() : "";
@@ -160,7 +81,8 @@ var buildSkillDiscoveryLayer = (skills, boundFolder) => {
   const lines = [
     "--- \u53EF\u7528\u6280\u80FD\uFF08Skills\uFF09---",
     `\u5DE5\u4F5C\u533A ${boundFolder} \u4E2D\u53D1\u73B0\u4E86 ${skills.length} \u4E2A\u6280\u80FD\uFF08SKILL.md\uFF09\uFF1A`,
-    "\u6A21\u578B\u53EF\u6309\u9700\u7528 readFile \u8BFB\u53D6\u4EE5\u4E0B\u6587\u4EF6\u83B7\u53D6\u8BE6\u7EC6\u6307\u4EE4\uFF1A",
+    "\u6A21\u578B\u53EF\u6309\u9700\u7528 loadSkill \u5DE5\u5177\u6309\u540D\u52A0\u8F7D\uFF0C\u628A SKILL.md \u5168\u6587\u62C9\u8FDB\u4E0A\u4E0B\u6587\u540E\u9075\u5FAA\u5176\u6307\u4EE4\uFF1B",
+    "\u5982 loadSkill \u4E0D\u53EF\u7528\u6216\u60F3\u76F4\u63A5\u8BFB\u53D6\u6587\u4EF6\uFF0C\u4E0B\u65B9 path \u4ECD\u53EF\u7528 readFile \u4F5C\u4E3A fallback\uFF1A",
     "",
     ...skills.map(
       (s) => `- ${s.name}: ${s.description}
@@ -216,8 +138,6 @@ var buildMemoryUseGuidanceLayer = (args) => {
 };
 
 export {
-  buildModelLayerOverride,
-  applyModelLayerOverride,
   buildSpaceContextLayer,
   buildSkillDiscoveryLayer,
   buildLinkedSpacesSection,

package/{chunk-GAKEBQD6.js → chunk-D6OQHXVG.js}

@@ -1,3 +1,11 @@
+// packages/core/drainReason.ts
+var CORE_DRAIN_REASON = "core_draining";
+
+// packages/core/gatewayHttpStatus.ts
+function isGatewayHttpStatus(status) {
+  return status === 502 || status === 503 || status === 504;
+}
+
 // packages/core/retryAfterMs.ts
 function normalizeNonNegativeMs(value, fallbackMs) {
   const parsed = Number(value);
@@ -18,13 +26,9 @@ function parseRetryAfterHeaderMs(value, nowMs = Date.now()) {
   return null;
 }
 
-// packages/core/gatewayHttpStatus.ts
-function isGatewayHttpStatus(status) {
-  return status === 502 || status === 503 || status === 504;
-}
-
 export {
+  CORE_DRAIN_REASON,
+  isGatewayHttpStatus,
   normalizeNonNegativeMs,
-  parseRetryAfterHeaderMs,
-  isGatewayHttpStatus
+  parseRetryAfterHeaderMs
 };

package/{chunk-WPE4F4Z6.js → chunk-DWGAEFJL.js}

@@ -2,7 +2,7 @@ import {
   deleteDbRecord,
   queryUserRecords,
   readDbRecord
-} from "./chunk-OR2XR25C.js";
+} from "./chunk-AEZAORLG.js";
 import {
   mergeAndDedupUserData
 } from "./chunk-KQHGZWSV.js";

package/{chunk-HJGEVL7C.js → chunk-E4HNJSHC.js}

@@ -1,16 +1,23 @@
-import {
-  chooseMemoryOwners,
-  loadMemoryCandidatesFromDb
-} from "./chunk-XENYHRUE.js";
 import {
   addContentToSpace,
   prepareAndPersistMessage,
   uiAskChoiceFunc,
   uiAskChoiceFunctionSchema
-} from "./chunk-PIVFPOW6.js";
+} from "./chunk-5MOUAAMK.js";
 import {
   require_date_fns
 } from "./chunk-M76ECQRD.js";
+import {
+  read,
+  readAndWait,
+  removeCachedEntity,
+  upsertSSREntity,
+  write
+} from "./chunk-O26GI2JP.js";
+import {
+  chooseMemoryOwners,
+  loadMemoryCandidatesFromDb
+} from "./chunk-XENYHRUE.js";
 import {
   PLATFORM_HOSTED_GLM_52_MODEL,
   PLATFORM_HOSTED_GLM_PRICE
@@ -18,37 +25,30 @@ import {
 import {
   PLATFORM_HOSTED_KIMI_PROVIDER
 } from "./chunk-IWX4UW2E.js";
-import {
-  extractCustomId
-} from "./chunk-DFFIZ25G.js";
-import {
-  read,
-  readAndWait,
-  removeCachedEntity,
-  upsertSSREntity,
-  write
-} from "./chunk-BE2OOJ5P.js";
 import {
   createAgentKey,
   createDialogKey,
   createKey,
   dialogMessageRange
 } from "./chunk-O4BU24WZ.js";
+import {
+  extractCustomId
+} from "./chunk-DFFIZ25G.js";
 import {
   selectIdentityUserId
-} from "./chunk-UTLZINAP.js";
+} from "./chunk-OOM6SJNR.js";
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
 import {
   asOptionalPositiveFiniteNumber
 } from "./chunk-U6VC4MU4.js";
-import {
-  asOptionalTrimmedString
-} from "./chunk-G3SUCT4W.js";
 import {
   isRecord
 } from "./chunk-KUG52IAP.js";
+import {
+  asOptionalTrimmedString
+} from "./chunk-G3SUCT4W.js";
 import {
   __toESM
 } from "./chunk-4VNS5WPM.js";

package/{chunk-TNPIMII7.js → chunk-EVZKZF32.js}

@@ -1,54 +1,59 @@
-import {
-  MEMORY_USE_GUIDANCE,
-  wrapHistoricalSummaryWithReplayGuard
-} from "./chunk-KKY4B2Q2.js";
 import {
   ANTIGRAVITY_CLOUD_CODE_BASE_URL,
   isAntigravityOAuthAgent
-} from "./chunk-C3RUNRHT.js";
+} from "./chunk-FXXSGWAJ.js";
 import {
   clipMultilineText,
   fetchAndSerializeTable
-} from "./chunk-TYSCFY6S.js";
+} from "./chunk-2W2VYVI5.js";
 import {
+  CORE_DRAIN_REASON,
+  isGatewayHttpStatus,
   normalizeNonNegativeMs,
   parseRetryAfterHeaderMs
-} from "./chunk-GAKEBQD6.js";
+} from "./chunk-D6OQHXVG.js";
 import {
   slateToSimplifiedMarkdown
-} from "./chunk-AS4PVWA4.js";
+} from "./chunk-QNMFBBZK.js";
 import {
   extractCategorizedMentions
 } from "./chunk-VP4WJWKW.js";
 import {
   resolvePageSkillMetadata
-} from "./chunk-ZQ2UM4KG.js";
+} from "./chunk-VC6OZXO5.js";
 import {
   estimateTokenCount,
   fetchAndCacheMessages,
   shouldUseServerProxy
-} from "./chunk-PIVFPOW6.js";
+} from "./chunk-5MOUAAMK.js";
 import {
   fetchServerSyncedCredential
-} from "./chunk-I5URP43I.js";
+} from "./chunk-Q3UKJVU4.js";
 import {
   createSpaceKey
 } from "./chunk-UAD2WT54.js";
+import {
+  read
+} from "./chunk-O26GI2JP.js";
+import {
+  MEMORY_USE_GUIDANCE,
+  wrapHistoricalSummaryWithReplayGuard
+} from "./chunk-KKY4B2Q2.js";
 import {
   buildCurrentTimeBlock,
   buildIdentityBlock,
   buildRuntimeGuidanceBlocks
-} from "./chunk-PAKN26FP.js";
+} from "./chunk-OUI3ZHYD.js";
 import {
   OPENAI_RESPONSES_ENDPOINT,
   buildProviderAuthHeaders,
   convertMessagesToResponsesInput,
   isOpenAiResponsesModel,
   resolvePlatformChatCompletionsEndpoint
-} from "./chunk-JRKKFRAV.js";
+} from "./chunk-YTBMA7NO.js";
 import {
   canonicalizeToolNames
-} from "./chunk-AUQ747NZ.js";
+} from "./chunk-4SOKXIW4.js";
 import {
   getModelConfig,
   isModelSupportReasoningEffort
@@ -61,36 +66,33 @@ import {
   isFireworksKimiModel,
   resolveFireworksKimiModel
 } from "./chunk-IWX4UW2E.js";
-import {
-  extractCustomId
-} from "./chunk-DFFIZ25G.js";
-import {
-  toErrorMessage
-} from "./chunk-HNMXYYJR.js";
-import {
-  read
-} from "./chunk-BE2OOJ5P.js";
 import {
   asNonEmptyStringArray
 } from "./chunk-I42VC5KR.js";
+import {
+  extractCustomId
+} from "./chunk-DFFIZ25G.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
+import {
+  toErrorMessage
+} from "./chunk-HNMXYYJR.js";
 import {
   getRuntimeServerContext
-} from "./chunk-UTLZINAP.js";
+} from "./chunk-OOM6SJNR.js";
 import {
   isAbortError
 } from "./chunk-OOSFSFMA.js";
+import {
+  asTrimmedString
+} from "./chunk-3EUW3WEO.js";
 import {
   isLoopbackUrl
 } from "./chunk-4SN6J65J.js";
 import {
   API_ENDPOINTS
 } from "./chunk-LCBAMY2M.js";
-import {
-  asTrimmedString
-} from "./chunk-3EUW3WEO.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
@@ -707,6 +709,12 @@ var CONTEXT_USAGE_INSTRUCTIONS = `\u53C2\u8003\u8D44\u6599\u4F7F\u7528\u8BF4\u66
 - \u5982\u679C\u8D44\u6599\u4E2D\u6CA1\u6709\u5305\u542B\u7B54\u6848\uFF0C\u5E94\u8BF4\u660E\u8FD9\u4E00\u70B9\uFF0C\u7136\u540E\u518D\u4F7F\u7528\u4F60\u7684\u901A\u7528\u77E5\u8BC6\u8FDB\u884C\u56DE\u7B54\u3002
 - \u5982\u679C\u4F60\u5728\u8D44\u6599\u4E2D\u53D1\u73B0\u76F8\u4E92\u77DB\u76FE\u7684\u4FE1\u606F\uFF0C\u4E5F\u8981\u5728\u56DE\u7B54\u4E2D\u6307\u51FA\u8FD9\u4E00\u70B9\u3002
 - \u5F53\u901A\u7528\u6307\u4EE4\u4E0E\u66F4\u5177\u4F53\u7684"\u6309 Agent / \u6309\u6587\u6863"\u7684\u89C4\u5219\u53D1\u751F\u51B2\u7A81\u65F6\uFF0C\u5FC5\u987B\u4F18\u5148\u9075\u5B88\u66F4\u5177\u4F53\u3001\u4F18\u5148\u7EA7\u66F4\u9AD8\u7684\u89C4\u5219\u3002`;
+var AGENT_ORCHESTRATION_RUN_INSTRUCTIONS = `--- \u591A Agent \u7F16\u6392\uFF08\u540E\u53F0 Run\uFF09 ---
+\u4F60\u53EF\u7528 startAgentRun \u540E\u53F0\u542F\u52A8\u5B50 Agent\uFF08fork+exec\uFF0C\u8FD4\u56DE runId\uFF09\uFF0C\u7528 controlAgentRun \u89C2\u5BDF/\u505C\u6B62\uFF08wait+signal+proc\uFF09\u3002\u6838\u5FC3\u7EAA\u5F8B\uFF08\u53CD\u9762\u6559\u6750\uFF1A\u5B50\u4EE3\u7406\u5D29\u6E83/\u6302\u8D77\u800C\u7F16\u6392\u5668\u6BEB\u65E0\u5BDF\u89C9\uFF09\uFF1A
+1. \u6D3E\u53D1\u540E\u5FC5\u987B\u8F6E\u8BE2\u3002startAgentRun \u62FF\u5230 runId \u540E\uFF0C\u7528 controlAgentRun(action:"status", runId, tailLines:30) \u8F6E\u8BE2\uFF08\u5EFA\u8BAE 5\u201310s \u4E00\u6B21\uFF09\uFF0C\u4E0D\u8981\u53EA\u9760\u804A\u5929\u590D\u8FF0\u7ED3\u679C\u3002\u4E0D\u8F6E\u8BE2 = \u6CA1\u7F16\u6392\u3002
+2. \u8BFB\u65E5\u5FD7\u786E\u8BA4\u8FDB\u5C55\u3002tailLines>0 \u8BFB\u5B9E\u9645\u8F93\u51FA/\u5DE5\u5177\u8C03\u7528\uFF0C\u4E0D\u53EA\u770B status=running\u2014\u2014\u540E\u53F0\u76D1\u89C6\u5668\u53EF\u80FD\u7A7A\u8F6C\u3002
+3. stop \u524D\u5148\u770B\u65E5\u5FD7\u3002\u7528 status \u5224\u65AD\u662F\u771F\u5361\u6B7B\u8FD8\u662F\u6B63\u5E38\u8DD1\uFF0C\u786E\u8BA4\u9700\u8981\u53EB\u505C\u518D controlAgentRun(action:"stop", runId)\uFF1B\u7528 list/status \u786E\u8BA4 run \u771F\u5B9E\u5B58\u5728\u4E14\u975E\u7EC8\u6001\uFF0C\u522B\u5047\u8BBE"\u6D3E\u53D1\u4E86\u5C31\u5728\u8DD1"\u3002
+\u5DE5\u5177\u9009\u62E9\uFF1A\u5B50\u4EFB\u52A1 <100s \u4E14\u8981\u7ACB\u5373\u62FF\u7ED3\u679C \u2192 callAgent\uFF08\u540C\u6B65\uFF09\uFF1B\u957F\u4EFB\u52A1 / \u5E76\u884C / \u9700\u8981\u89C2\u5BDF\u6216\u53EB\u505C \u2192 startAgentRun\uFF08\u672C\u6BB5\uFF09\u3002`;
 var MENU_USAGE_INSTRUCTIONS = `--- \u4EA4\u4E92\u8BF4\u660E ---
 \u6240\u6709\u7528\u6237\u8F93\u5165\u5747\u4E3A\u7EAF\u6587\u672C\u6D88\u606F\uFF0C\u76F4\u63A5\u7406\u89E3\u5373\u53EF\uFF0C\u4E0D\u8981\u5728\u56DE\u590D\u4E2D\u63D0\u53CA\u6309\u94AE\u3001\u83DC\u5355\u3001\u754C\u9762\u7B49 UI \u5143\u7D20\u3002
 
@@ -797,10 +805,16 @@ var isBrowser = typeof window !== "undefined";
 var TOOL_GUIDED_SECTIONS = [
   {
     id: "agentOrchestration",
-    triggerTools: ["callAgent", "runStreamingAgent"],
+    triggerTools: [
+      "callAgent",
+      "runStreamingAgent",
+      "startAgentRun",
+      "controlAgentRun"
+    ],
     build: (tools) => [
       AGENT_ORCHESTRATION_INSTRUCTIONS,
-      tools.includes("runStreamingAgent") ? PAGE_BUILDER_HANDOFF_INSTRUCTIONS : ""
+      tools.includes("runStreamingAgent") ? PAGE_BUILDER_HANDOFF_INSTRUCTIONS : "",
+      tools.includes("startAgentRun") || tools.includes("controlAgentRun") ? AGENT_ORCHESTRATION_RUN_INSTRUCTIONS : ""
     ].filter(Boolean).join("\n\n")
   },
   { id: "menuUsage", triggerTools: ["ui_ask_choice"], build: () => MENU_USAGE_INSTRUCTIONS },
@@ -1348,11 +1362,21 @@ var generateRequestBody = ({
 };
 
 // packages/ai/chat/serverProxyRetry.ts
-var RETRYABLE_SERVER_PROXY_STATUSES = /* @__PURE__ */ new Set([502, 503, 504]);
 var DEFAULT_SERVER_PROXY_RETRY_AFTER_MS = 1500;
 var MAX_SERVER_PROXY_RETRIES = 2;
 var MAX_STATUS_RETRIES = 1;
-var resolveServerProxyRetryAfterMs = (response) => parseRetryAfterHeaderMs(response.headers.get("Retry-After")) ?? DEFAULT_SERVER_PROXY_RETRY_AFTER_MS;
+var MAX_SERVER_DRAIN_STATUS_RETRIES = 30;
+var readRetryableResponseBody = async (response) => {
+  try {
+    return await response.clone().json();
+  } catch {
+    return null;
+  }
+};
+var resolveServerProxyRetryAfterMs = (response, body) => parseRetryAfterHeaderMs(response.headers.get("Retry-After")) ?? normalizeNonNegativeMs(
+  body?.retryAfterMs,
+  DEFAULT_SERVER_PROXY_RETRY_AFTER_MS
+);
 var isRetryableServerProxyFetchError = (error) => {
   if (!error || isAbortError(error)) return false;
   const message = typeof error?.message === "string" ? error.message : String(error);
@@ -1387,23 +1411,33 @@ var performServerProxyFetchWithRetry = async ({
   signal,
   logPrefix = "[fetchWithServerProxy]"
 }) => {
-  for (let attempt = 0; attempt <= MAX_SERVER_PROXY_RETRIES; attempt += 1) {
+  let networkRetries = 0;
+  let statusRetries = 0;
+  while (true) {
     try {
       const response = await execute();
-      if (attempt < MAX_STATUS_RETRIES && RETRYABLE_SERVER_PROXY_STATUSES.has(response.status)) {
-        const retryAfterMs = resolveServerProxyRetryAfterMs(response);
+      const responseBody = response.status === 503 ? await readRetryableResponseBody(response) : null;
+      const isCoreDraining = response.status === 503 && responseBody?.reason === CORE_DRAIN_REASON;
+      const maxStatusRetries = isCoreDraining ? MAX_SERVER_DRAIN_STATUS_RETRIES : MAX_STATUS_RETRIES;
+      if (statusRetries < maxStatusRetries && isGatewayHttpStatus(response.status)) {
+        statusRetries += 1;
+        const retryAfterMs = resolveServerProxyRetryAfterMs(
+          response,
+          responseBody
+        );
         console.warn(
-          `${logPrefix} \u68C0\u6D4B\u5230${response.status}\u72B6\u6001\uFF0C${retryAfterMs}ms\u540E\u91CD\u8BD5\u4E00\u6B21...`
+          `${logPrefix} \u68C0\u6D4B\u5230${response.status}\u72B6\u6001\uFF0C${retryAfterMs}ms\u540E\u91CD\u8BD5...`
         );
         await waitForServerProxyRetry(retryAfterMs, signal);
         continue;
       }
       return response;
     } catch (error) {
-      if (attempt < MAX_SERVER_PROXY_RETRIES && isRetryableServerProxyFetchError(error)) {
-        const retryDelay = (attempt + 1) * 1e3;
+      if (networkRetries < MAX_SERVER_PROXY_RETRIES && isRetryableServerProxyFetchError(error)) {
+        networkRetries += 1;
+        const retryDelay = networkRetries * 1e3;
         console.warn(
-          `${logPrefix} \u68C0\u6D4B\u5230\u7F51\u7EDC\u77AC\u65AD\uFF0C${retryDelay}ms\u540E\u91CD\u8BD5(\u7B2C${attempt + 1}\u6B21)...`,
+          `${logPrefix} \u68C0\u6D4B\u5230\u7F51\u7EDC\u77AC\u65AD\uFF0C${retryDelay}ms\u540E\u91CD\u8BD5(\u7B2C${networkRetries}\u6B21)...`,
           error
         );
         await waitForServerProxyRetry(retryDelay, signal);
@@ -1412,7 +1446,6 @@ var performServerProxyFetchWithRetry = async ({
       throw error;
     }
   }
-  throw new Error("server proxy retry exhausted unexpectedly");
 };
 
 // packages/ai/chat/resolveDirectRequestApiKey.ts

package/{chunk-C3RUNRHT.js → chunk-FXXSGWAJ.js}

@@ -1,6 +1,6 @@
 import {
   trimTrailingSlash
-} from "./chunk-JRKKFRAV.js";
+} from "./chunk-YTBMA7NO.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";

package/{chunk-7KNKFIRO.js → chunk-GBDSZATH.js}

@@ -1,12 +1,12 @@
 import {
   selectCurrentServer
-} from "./chunk-4SIMLBEU.js";
+} from "./chunk-3NSIQZZ6.js";
 import {
   patch
-} from "./chunk-BE2OOJ5P.js";
+} from "./chunk-O26GI2JP.js";
 import {
   selectIdentityToken
-} from "./chunk-UTLZINAP.js";
+} from "./chunk-OOM6SJNR.js";
 import {
   getIsDesktopApp
 } from "./chunk-OOSFSFMA.js";

package/{chunk-7U44LYTR.js → chunk-IPYUUY4E.js}

@@ -1,7 +1,7 @@
 import {
   getRuntimeServerContext,
   scheduleDeleteReplication
-} from "./chunk-UTLZINAP.js";
+} from "./chunk-OOM6SJNR.js";
 import {
   fetchFromClientDb
 } from "./chunk-OOSFSFMA.js";

package/{chunk-QAALPJS7.js → chunk-KJR5KAUQ.js}

@@ -1,6 +1,6 @@
 import {
   clearCliLocalRuntimePreparedAgentCache
-} from "./chunk-EXXFGKF7.js";
+} from "./chunk-X2S7JTIG.js";
 import {
   getReadableCliDb
 } from "./chunk-W4NVOSFF.js";
@@ -12,7 +12,7 @@ import {
   resolveAgentRecordFromHybridStore,
   sanitizeAgentRecordForCliOutput,
   writeAgentRecord
-} from "./chunk-OR2XR25C.js";
+} from "./chunk-AEZAORLG.js";
 import {
   resolveCliAgentKeyInput
 } from "./chunk-VHBWHNVT.js";

package/{chunk-OZMMKDBI.js → chunk-KQQVGRA3.js}

@@ -3,13 +3,13 @@ import {
 } from "./chunk-JEXVIMYZ.js";
 import {
   prepareTools
-} from "./chunk-2O4IZNTG.js";
+} from "./chunk-PXQN7IBQ.js";
+import {
+  performFetchRequest
+} from "./chunk-EVZKZF32.js";
 import {
   getPublicImageAgentMode
 } from "./chunk-VIDPVFP3.js";
-import {
-  performFetchRequest
-} from "./chunk-TNPIMII7.js";
 import {
   createSSEParser,
   createToolRunId,
@@ -20,7 +20,7 @@ import {
   toolRunSetPending,
   toolRunStarted,
   toolRunSucceeded
-} from "./chunk-TYSCFY6S.js";
+} from "./chunk-2W2VYVI5.js";
 import {
   addToolMessage,
   getModelInfo,
@@ -28,13 +28,19 @@ import {
   messageStreaming,
   selectCurrentSpaceId,
   updateToolMessage
-} from "./chunk-PIVFPOW6.js";
+} from "./chunk-5MOUAAMK.js";
 import {
   streamAgentChatTurn
-} from "./chunk-I5URP43I.js";
+} from "./chunk-Q3UKJVU4.js";
+import {
+  selectCurrentServer
+} from "./chunk-3NSIQZZ6.js";
+import {
+  write
+} from "./chunk-O26GI2JP.js";
 import {
   EMPTY_ASSISTANT_REPAIR_PROMPT
-} from "./chunk-6SLCD4RB.js";
+} from "./chunk-S3GS2PRL.js";
 import {
   createThinkParserState,
   flushThinkParser,
@@ -46,6 +52,11 @@ import {
 import {
   isNoloHostedProvider
 } from "./chunk-IWX4UW2E.js";
+import {
+  createDialogMessageKeyAndId,
+  dialogMessageKey,
+  toTrimmedString
+} from "./chunk-O4BU24WZ.js";
 import {
   extractCustomId
 } from "./chunk-DFFIZ25G.js";
@@ -57,33 +68,22 @@ import {
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
-import {
-  selectCurrentServer
-} from "./chunk-4SIMLBEU.js";
-import {
-  write
-} from "./chunk-BE2OOJ5P.js";
-import {
-  createDialogMessageKeyAndId,
-  dialogMessageKey,
-  toTrimmedString
-} from "./chunk-O4BU24WZ.js";
 import {
   createAsyncThunk,
   selectIdentityToken
-} from "./chunk-UTLZINAP.js";
+} from "./chunk-OOM6SJNR.js";
 import {
   isAbortError
 } from "./chunk-OOSFSFMA.js";
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
-import {
-  asOptionalTrimmedString
-} from "./chunk-G3SUCT4W.js";
 import {
   isRecord
 } from "./chunk-KUG52IAP.js";
+import {
+  asOptionalTrimmedString
+} from "./chunk-G3SUCT4W.js";
 
 // packages/integrations/openai/filterAndCleanMessages.ts
 var isValidMessagePart = (part) => {