nolo-cli 0.50.0-alpha.1 → 0.50.0

package/{chunk-S3HB4CQY.js → chunk-GKNGRBE6.js}

@@ -7,7 +7,7 @@ import {
   providerHttpFailure,
   readSseFrames,
   throwIfChatCompletionStreamFailed
-} from "./chunk-XB7ACJFH.js";
+} from "./chunk-IPTZ5TVU.js";
 import {
   FRESH_TOOL_OUTPUT_MAX_CHARS,
   MAX_HISTORICAL_TOOL_CONTENT_CHARS,
@@ -17,10 +17,12 @@ import {
   resolveHistoricalToolContentCap,
   resolveToolOutputProfile,
   stripImagePartsFromMessages
-} from "./chunk-VKSBVRGP.js";
+} from "./chunk-LVCAWHI5.js";
 import {
+  downgradeUnparsableToolCalls,
+  hasParsableObjectArguments,
   sanitizeForOutbound
-} from "./chunk-T27IEBNQ.js";
+} from "./chunk-2QDDKFG5.js";
 import {
   createThinkParserState,
   createToolCallAccumulator,
@@ -29,6 +31,7 @@ import {
   finalizeAccumulatedToolCalls
 } from "./chunk-N7J63Q6C.js";
 import {
+  TOOL_GUIDED_SECTION_ORDER,
   buildCurrentTimeBlock,
   buildIdentityBlock,
   buildRuntimeGuidanceBlocks,
@@ -36,7 +39,7 @@ import {
   requiresBareImageUrl,
   resolveToolGuidedSections,
   toBareImageUrlMessages
-} from "./chunk-HMMOAG2I.js";
+} from "./chunk-DXOELY7S.js";
 import {
   convertMessagesToResponsesInput,
   extractReasoningFromResponseOutput,
@@ -46,11 +49,11 @@ import {
   shouldStripReasoningContentForOutbound,
   toOpenAiCompatibleMessages,
   toResponsesTools
-} from "./chunk-6BYAXNH5.js";
+} from "./chunk-3QOCS5IF.js";
 import {
   buildProviderAuthHeaders,
   buildProviderExecutionPlan
-} from "./chunk-JBL24PK6.js";
+} from "./chunk-DEIGUGP6.js";
 import {
   NOLO_WORKSPACE_TOOL_NAMES,
   buildNoloWorkspaceCommandArgs,
@@ -58,7 +61,7 @@ import {
   noloStringArg,
   parseNoloWorkspaceToolArguments,
   resolveNoloDialogInput
-} from "./chunk-TNPCQNGQ.js";
+} from "./chunk-YEFRCO5N.js";
 import {
   buildDialogFallbackTitleFromUserInput
 } from "./chunk-2MBTWINN.js";
@@ -69,7 +72,7 @@ import {
   resolveEmptyAssistantFallbackMessage,
   resolveEmptyAssistantOutcome,
   resolveTruncatedReasoningTailLog
-} from "./chunk-F22JQTSX.js";
+} from "./chunk-UEV5WVQV.js";
 import {
   COMPACTION_SUMMARY_SCHEMA_VERSION,
   COMPACTION_SUMMARY_SYSTEM_PROMPT,
@@ -83,7 +86,7 @@ import {
   formatMessagesForSummaryWithTruncation,
   planCompression,
   planContextUsage
-} from "./chunk-HR5XDXYM.js";
+} from "./chunk-G5SQVIFZ.js";
 import {
   resolveNoloStateDir
 } from "./chunk-FD36SCCD.js";
@@ -92,10 +95,10 @@ import {
 } from "./chunk-HNMXYYJR.js";
 import {
   buildDialogSummaryLayer
-} from "./chunk-3AOLVADY.js";
+} from "./chunk-DVINR3PL.js";
 import {
   buildUserResponseLanguageContext
-} from "./chunk-7CH6U3FL.js";
+} from "./chunk-2GRGFCF6.js";
 import {
   canonicalizeToolName,
   canonicalizeToolNames
@@ -116,15 +119,15 @@ import {
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
-import {
-  isRecord
-} from "./chunk-KUG52IAP.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";
@@ -174,6 +177,26 @@ function readTitleParams(value) {
   return Object.fromEntries(entries);
 }
 
+// packages/agent-runtime/fileWritePolicy.ts
+function evaluateFileWritePolicy(args) {
+  if (args.sessionApproved) return { permissionDecision: "allow" };
+  return {
+    permissionDecision: "ask",
+    permissionRequest: {
+      id: "permission-file-write-session",
+      tool: args.tool,
+      action: "file_write",
+      title: "\u786E\u8BA4\u5199\u5165\u6587\u4EF6",
+      body: `\u672C\u4F1A\u8BDD\u9996\u6B21\u5199\u5165\u6587\u4EF6\uFF1A${args.path}\u3002\u6279\u51C6\u540E\u672C\u4F1A\u8BDD\u540E\u7EED\u5199\u5165\u4E0D\u518D\u9010\u6B21\u786E\u8BA4\u3002`,
+      command: args.path,
+      suggestedRule: {
+        scope: "session",
+        pattern: { capability: "file_write", target: "session" }
+      }
+    }
+  };
+}
+
 // packages/agent-runtime/toolCallPairing.ts
 function readToolCallId(message) {
   if (typeof message.tool_call_id === "string" && message.tool_call_id) {
@@ -339,6 +362,9 @@ import { existsSync, mkdirSync, readdirSync, renameSync, statSync, unlinkSync, u
 import { isAbsolute, join, relative } from "node:path";
 var DEFAULT_MAX_SPILL_DIR_BYTES = 50 * 1024 * 1024;
 var DEFAULT_SPILL_TTL_MS = 24 * 60 * 60 * 1e3;
+var SPILL_CLEANUP_THROTTLE_MS = 60 * 1e3;
+var SPILL_THROTTLE_MAX_DIRS = 64;
+var lastSpillCleanupAtMsByDir = /* @__PURE__ */ new Map();
 function resolveSpillDirectory(options) {
   if (options?.baseDir) {
     return options.baseDir;
@@ -360,6 +386,16 @@ function countLines(text) {
 }
 function cleanupExpiredSpills(spillDir, options) {
   if (!existsSync(spillDir)) return;
+  const throttleMs = options?.throttleMs ?? 0;
+  if (throttleMs > 0) {
+    const now2 = Date.now();
+    const last = lastSpillCleanupAtMsByDir.get(spillDir);
+    if (last !== void 0 && now2 - last < throttleMs) return;
+    if (lastSpillCleanupAtMsByDir.size >= SPILL_THROTTLE_MAX_DIRS) {
+      lastSpillCleanupAtMsByDir.clear();
+    }
+    lastSpillCleanupAtMsByDir.set(spillDir, now2);
+  }
   const maxAge = options?.maxAgeMs ?? DEFAULT_SPILL_TTL_MS;
   const maxBytes = options?.maxTotalBytes ?? DEFAULT_MAX_SPILL_DIR_BYTES;
   const now = Date.now();
@@ -410,7 +446,8 @@ function spillToolOutput(options) {
   }
   cleanupExpiredSpills(spillDir, {
     maxAgeMs: options.ttlMs,
-    maxTotalBytes: options.maxRetentionBytes
+    maxTotalBytes: options.maxRetentionBytes,
+    throttleMs: SPILL_CLEANUP_THROTTLE_MS
   });
   const hash = createHash("sha256").update(content).digest("hex").slice(0, 12);
   const safeToolName = (options.toolName || "tool").replace(/[^a-zA-Z0-9_-]/g, "_").slice(0, 24);
@@ -916,6 +953,34 @@ function createLocalLoopProgressGuard(config, env) {
 }
 
 // packages/agent-runtime/localLoop.ts
+var LOOP_TIMING_ENABLED = typeof process !== "undefined" && process.env?.NOLO_LOOP_TIMING === "1";
+var LOOP_TIMING_FILE = typeof process !== "undefined" ? process.env?.NOLO_LOOP_TIMING_FILE : void 0;
+var loopTimingRows = [];
+var loopTimingLastMark;
+function loopTimingMark(phase, round) {
+  if (!LOOP_TIMING_ENABLED) return;
+  const now = performance.now();
+  if (loopTimingLastMark !== void 0) {
+    loopTimingRows.push({ phase, round, durationMs: now - loopTimingLastMark });
+  }
+  loopTimingLastMark = now;
+}
+async function loopTimingFlush() {
+  if (!LOOP_TIMING_ENABLED) return;
+  const lines = loopTimingRows.map((row) => JSON.stringify(row)).join("\n");
+  loopTimingRows = [];
+  loopTimingLastMark = void 0;
+  if (!lines) return;
+  if (LOOP_TIMING_FILE) {
+    try {
+      const { appendFileSync } = await import("node:fs");
+      appendFileSync(LOOP_TIMING_FILE, lines + "\n");
+    } catch {
+    }
+  } else {
+    process.stderr.write(lines + "\n");
+  }
+}
 var LOCAL_AGENT_CONFIG_MISSING_CODE = "LOCAL_AGENT_CONFIG_MISSING";
 function formatToolExecutionError(args) {
   const message = toErrorMessage(args.error);
@@ -1417,18 +1482,21 @@ function buildMessages(args) {
     const dynamicParts = blocks2.filter((b) => b.cacheScope === "turn").map((b) => b.content).map((block) => block.trim()).filter(Boolean);
     const stableContent = stableParts.join("\n\n");
     const dynamicContent = dynamicParts.join("\n\n");
-    const systemContent2 = dynamicContent ? `${stableContent}
+    const userContent = dynamicContent ? typeof args.input === "string" ? `${dynamicContent}
 
-${dynamicContent}` : stableContent;
+${args.input}` : [
+      { type: "text", text: dynamicContent },
+      ...Array.isArray(args.input) ? args.input : args.input ? [args.input] : []
+    ] : args.input;
     return {
       messages: [
-        ...systemContent2 ? [{
+        ...stableContent ? [{
           role: "system",
-          content: systemContent2,
+          content: stableContent,
           ...stableContent ? { stable_prefix_chars: stableContent.length } : {}
         }] : [],
         ...prepareHistoryForNextTurn(args.history, args.contextReferenceResolver),
-        { role: "user", content: args.input }
+        { role: "user", content: userContent }
       ],
       stableContextChars: stableContent.length,
       dynamicContextChars: dynamicContent.length
@@ -1540,7 +1608,43 @@ function applyPersistedTurnInput(messages, persistedInput, persistedInputReferen
     };
   });
 }
+var fileWriteSessionApproval = /* @__PURE__ */ new WeakMap();
+var fileWriteSessionKeys = /* @__PURE__ */ new Map();
+function getFileWriteSessionApproval(input) {
+  if (input.fileWriteSessionId) {
+    let key2 = fileWriteSessionKeys.get(input.fileWriteSessionId);
+    if (!key2) {
+      key2 = {};
+      fileWriteSessionKeys.set(input.fileWriteSessionId, key2);
+    }
+    const existing2 = fileWriteSessionApproval.get(key2);
+    if (existing2) return existing2;
+    const created2 = { approved: false };
+    fileWriteSessionApproval.set(key2, created2);
+    return created2;
+  }
+  const key = input.adapter;
+  const existing = fileWriteSessionApproval.get(key);
+  if (existing) return existing;
+  const created = { approved: false };
+  fileWriteSessionApproval.set(key, created);
+  return created;
+}
+function readToolPathForWriteGate(argumentsValue) {
+  try {
+    const parsed = JSON.parse(argumentsValue);
+    return typeof parsed.path === "string" && parsed.path.trim() ? parsed.path.trim() : "the requested file";
+  } catch {
+    return "the requested file";
+  }
+}
+function isCompletedActionGateResult(value) {
+  return Boolean(
+    value && typeof value === "object" && value.status === "completed"
+  );
+}
 async function runLocalAgentTurn(input) {
+  loopTimingMark("turnStart", 0);
   const agentConfig = await input.adapter.loadAgentConfig(input.agentRef);
   if (!agentConfig) {
     const error = new Error(
@@ -1577,6 +1681,7 @@ async function runLocalAgentTurn(input) {
     attachDialogIdToError(error, dialogId);
     throw error;
   }
+  loopTimingMark("loadDialogHistory", 0);
   const identityBlock = buildIdentityBlock({
     agentName: agentConfig.name,
     agentId: agentConfig.key,
@@ -1592,7 +1697,9 @@ async function runLocalAgentTurn(input) {
     guidanceBlocks.startupProtocol,
     guidanceBlocks.contextLayerContract,
     guidanceBlocks.emailRegistrationWorkflow,
-    ...Object.values(toolGuidedSections)
+    // 注入顺序遵循 TOOL_GUIDED_SECTION_ORDER（与 buildSystemPrompt 的显式
+    // layer 列表同源），禁止用 Object.values 自行定序。
+    ...TOOL_GUIDED_SECTION_ORDER.map((id) => toolGuidedSections[id] ?? "")
   ].map((content) => content.trim()).filter((content) => content.length > 0).map((content) => ({ content, cacheScope: "session" }));
   const currentTimeScope = [
     { content: buildCurrentTimeBlock(/* @__PURE__ */ new Date(), void 0), cacheScope: "turn" }
@@ -1607,6 +1714,7 @@ async function runLocalAgentTurn(input) {
     ...currentTimeScope,
     ...callerScopes
   ];
+  loopTimingMark("buildContextBlocks", 0);
   let resolvedProvider;
   const resolveProviderOnce = async () => {
     if (!resolvedProvider) {
@@ -1641,10 +1749,12 @@ async function runLocalAgentTurn(input) {
   } catch (error) {
     console.warn("[localLoop] auto-compaction unexpected error:", error);
   }
+  loopTimingMark("maybeAutoCompactLocalHistory", 0);
   const trimmedHistory = trimHistoryToContextBudget(history, agentConfig.model);
   if (trimmedHistory.droppedCount > 0) {
     history = trimmedHistory.history;
   }
+  loopTimingMark("trimHistoryToContextBudget", 0);
   const hasContextBlocks = callerScopes.some((block) => block.content.trim()) || mergedContextBlockScopes.some((block) => block.content.trim());
   const promptMessageCount = agentConfig.prompt?.trim() || hasContextBlocks ? 1 : 0;
   const turnStartIndex = promptMessageCount + history.length;
@@ -1656,6 +1766,14 @@ async function runLocalAgentTurn(input) {
     contextReferenceResolver: input.adapter.host === "cli" ? input.contextReferenceResolver : void 0
   });
   let messages = builtMessages.messages;
+  loopTimingMark("buildMessages", 0);
+  const poisonDowngrade = downgradeUnparsableToolCalls(messages);
+  if (poisonDowngrade.downgraded > 0) {
+    messages = poisonDowngrade.messages;
+    console.warn(
+      `[nolo] downgraded ${poisonDowngrade.downgraded} tool_call(s) with unparsable JSON arguments from outbound history (suspected upstream stream truncation); persisted history untouched`
+    );
+  }
   const supportsImages = resolveAgentImageInputSupport({
     apiSource: agentConfig.apiSource,
     provider: agentConfig.provider,
@@ -1686,9 +1804,28 @@ async function runLocalAgentTurn(input) {
   const progressGuard = createLocalLoopProgressGuard(input.progressGuardConfig);
   try {
     const provider = await resolveProviderOnce();
+    const applyPendingInjections = () => {
+      if (!input.drainInjections) return false;
+      let pending = [];
+      try {
+        pending = input.drainInjections() ?? [];
+      } catch (error) {
+        console.warn("[localLoop] drainInjections failed:", error);
+        return false;
+      }
+      let injected = false;
+      for (const text of pending) {
+        if (typeof text !== "string" || !text.trim()) continue;
+        messages.push({ role: "user", content: text });
+        injected = true;
+      }
+      return injected;
+    };
     while (true) {
       partialContent = "";
       throwIfAborted(input);
+      loopTimingMark("roundStart", round);
+      applyPendingInjections();
       const preparedMessages = prepareMessagesForProviderCall(messages);
       const baseRequestMessages = filterImagePartsFromMessages(
         preparedMessages.messages,
@@ -1706,6 +1843,7 @@ async function runLocalAgentTurn(input) {
         dynamicContextChars: builtMessages.dynamicContextChars
       };
       emptyAssistantRepairPending = false;
+      loopTimingMark("prepareMessagesForProviderCall", round);
       result = await runCompleteWithTimeout({
         provider,
         messages: requestMessages,
@@ -1733,6 +1871,7 @@ async function runLocalAgentTurn(input) {
         providerName: agentConfig.provider,
         model: provider.model
       });
+      loopTimingMark("llmCall", round);
       turnUsage = mergeTurnUsage(turnUsage, result.usage);
       contextUsage = result.usage;
       if (result.usage && Object.keys(result.usage).length > 0) {
@@ -1762,6 +1901,7 @@ async function runLocalAgentTurn(input) {
       }
       const toolCalls = result.tool_calls ?? [];
       const rawToolCallsCount = (result.tool_calls?.length ?? 0) || (Array.isArray(result.raw_tool_calls) ? result.raw_tool_calls.length : 0);
+      loopTimingMark("postLlmProcessing", round);
       if (toolCalls.length === 0 && rawToolCallsCount === 0) {
         const outcome = resolveEmptyAssistantOutcome({
           hasToolCalls: rawToolCallsCount > 0,
@@ -1807,6 +1947,20 @@ ${reasoningTailLog}
           };
           break;
         }
+        if (input.drainInjections) {
+          const assistantMessage = {
+            role: "assistant",
+            content: result.content,
+            ...result.reasoning_content ? { reasoning_content: result.reasoning_content } : {}
+          };
+          messages.push(assistantMessage);
+          if (applyPendingInjections()) {
+            loopTimingMark("roundEnd", round);
+            round += 1;
+            continue;
+          }
+          messages.pop();
+        }
         break;
       }
       const outputBlocks = result.output ?? [];
@@ -1840,11 +1994,13 @@ ${reasoningTailLog}
         tool_calls: toolCalls
       });
       const executedToolResults = [];
+      loopTimingMark("toolLoopStart", round);
       for (const toolCall of toolCalls) {
         throwIfAborted(input);
         const toolName = toolCall.function.name;
         let toolResult;
         const startedAt = Date.now();
+        loopTimingMark("toolCallStart", round);
         const argumentsPreview = summarizeToolArguments(toolName, toolCall.function.arguments);
         emitLoopEvent(
           input,
@@ -1865,25 +2021,68 @@ ${reasoningTailLog}
           }
         );
         try {
-          const executePromise = input.adapter.executeTool({
-            id: toolCall.id,
-            name: toolName,
-            arguments: toolCall.function.arguments,
-            ...userInputText ? { userInput: userInputText } : {},
-            ...input.runtimeContext ? { runtimeContext: input.runtimeContext } : {},
-            ...input.abortSignal ? { abortSignal: input.abortSignal } : {}
-          }, {
-            ...input.abortSignal ? { abortSignal: input.abortSignal } : {},
-            ...input.runtimeContext ? { runtimeContext: input.runtimeContext } : {}
-          });
-          toolResult = await raceWithAbort(input, executePromise, toolName);
+          const rawPoisonArguments = toolCall.function?.arguments;
+          if (typeof rawPoisonArguments === "string" && rawPoisonArguments.trim() !== "" && !hasParsableObjectArguments(rawPoisonArguments)) {
+            throw new Error(
+              `\u6A21\u578B\u751F\u6210\u7684 tool_call arguments \u4E0D\u662F\u5408\u6CD5 JSON\uFF08\u7591\u4F3C\u4E0A\u6E38\u6D41\u5F0F\u622A\u65AD\uFF0C\u539F\u59CB\u957F\u5EA6 ${rawPoisonArguments.length}\uFF09\u3002\u8BF7\u91CD\u65B0\u5B8C\u6574\u8C03\u7528 ${toolName}\uFF0C\u786E\u4FDD arguments \u662F\u95ED\u5408\u7684 JSON \u5BF9\u8C61\u3002`
+            );
+          }
+          const writeTool = toolName === "writeFile" || toolName === "editFile";
+          if (writeTool && input.onActionGate && input.fileWriteGateEnabled !== false) {
+            const writeSession = getFileWriteSessionApproval(input);
+            const policy = evaluateFileWritePolicy({
+              tool: toolName,
+              path: readToolPathForWriteGate(toolCall.function.arguments),
+              sessionApproved: writeSession.approved
+            });
+            if (policy.permissionDecision === "ask") {
+              const gate = {
+                ...policy.permissionRequest,
+                id: `${policy.permissionRequest.id}-${toolCall.id}`,
+                kind: "confirm",
+                toolName,
+                toolCallId: toolCall.id
+              };
+              const replacement = await raceWithAbort(
+                input,
+                input.onActionGate(gate),
+                `${toolName} confirmation`
+              );
+              const gateResult = replacement?.metadata?.actionGateResult;
+              if (replacement !== void 0 && isCompletedActionGateResult(gateResult)) {
+                writeSession.approved = true;
+              } else {
+                toolResult = replacement ?? {
+                  content: `${toolName} cancelled: user declined file write confirmation.`,
+                  metadata: {
+                    cancelled: true,
+                    actionGateResult: { gateId: gate.id, status: "cancelled" }
+                  }
+                };
+              }
+            }
+          }
+          if (!toolResult) {
+            const executePromise = input.adapter.executeTool({
+              id: toolCall.id,
+              name: toolName,
+              arguments: toolCall.function.arguments,
+              ...userInputText ? { userInput: userInputText } : {},
+              ...input.runtimeContext ? { runtimeContext: input.runtimeContext } : {},
+              ...input.abortSignal ? { abortSignal: input.abortSignal } : {}
+            }, {
+              ...input.abortSignal ? { abortSignal: input.abortSignal } : {},
+              ...input.runtimeContext ? { runtimeContext: input.runtimeContext } : {}
+            });
+            toolResult = await raceWithAbort(input, executePromise, toolName);
+          }
           const actionGate = buildActionGate({
             toolName,
             toolCallId: toolCall.id,
             metadata: toolResult.metadata
           });
           if (actionGate && input.onActionGate) {
-            const replacement = await input.onActionGate(actionGate);
+            const replacement = await raceWithAbort(input, input.onActionGate(actionGate), `${toolName} action gate`);
             if (replacement) {
               toolResult = replacement;
             }
@@ -1891,6 +2090,7 @@ ${reasoningTailLog}
           const finishedAt = Date.now();
           const summary = summarizeToolResult(toolResult.content, toolResult.metadata);
           const safeMetadata = projectSafeToolObservationMetadata(toolResult.metadata);
+          loopTimingMark("toolExecute", round);
           emitLoopEvent(
             input,
             {
@@ -1899,7 +2099,7 @@ ${reasoningTailLog}
               toolCallId: toolCall.id,
               toolName,
               atMs: finishedAt,
-              ok: true,
+              ok: toolResult.metadata?.cancelled !== true && toolResult.metadata?.actionGateResult?.status !== "cancelled" && toolResult.metadata?.actionGateResult?.status !== "failed",
               elapsedMs: Math.max(0, finishedAt - startedAt),
               ...summary ? { summary } : {},
               ...safeMetadata ? { metadata: safeMetadata } : {}
@@ -1957,6 +2157,7 @@ ${reasoningTailLog}
           content: toolResult.content,
           metadata: toolResult.metadata
         });
+        loopTimingMark("toolResultFormat", round);
         messages.push({
           role: "tool",
           content: formatToolMessageContent({
@@ -1989,6 +2190,7 @@ ${reasoningTailLog}
         };
         break;
       }
+      loopTimingMark("roundEnd", round);
       round += 1;
     }
   } catch (error) {
@@ -2023,6 +2225,7 @@ ${reasoningTailLog}
       input
     });
     attachDialogIdToError(loopError, dialogId);
+    await loopTimingFlush();
     throw loopError;
   }
   result = result;
@@ -2054,6 +2257,7 @@ ${reasoningTailLog}
     });
   }
   const accountingUsage = addOutOfBandUsage(turnUsage, compactionUsage);
+  loopTimingMark("saveTurnStart", round);
   const saved = await input.adapter.saveTurn({
     agentKey: agentConfig.key,
     messages: turnMessages,
@@ -2072,6 +2276,8 @@ ${reasoningTailLog}
     ...input.inheritedFromDialogKey ? { inheritedFromDialogKey: input.inheritedFromDialogKey } : {},
     ...input.parentDialogId ? { parentDialogId: input.parentDialogId } : {}
   });
+  loopTimingMark("saveTurn", round);
+  await loopTimingFlush();
   return {
     ...result,
     ...usageRecords.length > 0 ? { usageRecords } : {},
@@ -2304,7 +2510,10 @@ function buildOpenAiCompatibleChatCompletionRequest(args) {
     stream: args.stream ?? false,
     ...args.providerConfig.requestOptions,
     ...args.tools && args.tools.length > 0 ? { tools: args.tools } : {},
-    ...!isResponses && args.stream ? getUsageRequestOptions(args.providerConfig.usageProvider ?? args.providerConfig.provider, { api: "chat-completions" }) : {}
+    ...!isResponses && args.stream ? getUsageRequestOptions(args.providerConfig.usageProvider ?? args.providerConfig.provider, {
+      api: "chat-completions",
+      endpoint: args.providerConfig.endpoint
+    }) : {}
   };
   const body = isResponses ? buildResponsesRequestBody(rawBody, args.providerConfig.model) : normalizeChatCompletionsBodyForProvider({
     body: rawBody,
@@ -3008,19 +3217,24 @@ function parseSyncServersEnv(env) {
   if (!raw) return [];
   return raw.split(",").map((value) => value.trim()).filter((value) => value.length > 0);
 }
+var DEFAULT_HYBRID_READ_TIMEOUT_MS = 250;
 function createHybridRecordStore(deps) {
   const fetchImpl = deps.fetchImpl ?? fetch;
+  const requestTimeoutMs = deps.requestTimeoutMs ?? DEFAULT_HYBRID_READ_TIMEOUT_MS;
   return {
     read: async (dbKey, options) => {
       const localRecord = await readHybridLocalRecord(deps.db, dbKey);
       const normalizedLocalRecord = normalizeHybridRecord(dbKey, localRecord);
       if (normalizedLocalRecord && options?.remote !== true) return normalizedLocalRecord;
       if (options?.remote === false) return null;
+      const fallbackDeadlineMs = requestTimeoutMs > 0 ? Date.now() + requestTimeoutMs : null;
       for (const server of resolveHybridServers(
         deps.defaultServer,
         options?.preferredServerOrigin,
         deps.fallbackServers
       )) {
+        const remainingMs = fallbackDeadlineMs === null ? null : fallbackDeadlineMs - Date.now();
+        if (remainingMs !== null && remainingMs <= 0) break;
         let remoteRecord = null;
         try {
           remoteRecord = await fetchHybridRemoteRecord({
@@ -3028,7 +3242,7 @@ function createHybridRecordStore(deps) {
             server,
             authToken: deps.authToken,
             fetchImpl,
-            ...deps.requestTimeoutMs ? { signal: AbortSignal.timeout(deps.requestTimeoutMs) } : {}
+            ...remainingMs !== null ? { signal: AbortSignal.timeout(remainingMs) } : {}
           });
         } catch {
           continue;
@@ -6894,10 +7108,10 @@ function buildLoadSkillExecutor(args) {
         metadata: { loadSkill: true, resolved: false }
       };
     }
-    const { resolveSkillByName } = await import("./skillDiscovery-COX56OBO.js");
+    const { resolveSkillByName } = await import("./skillDiscovery-CYUCJMAG.js");
     const resolved = resolveSkillByName(args.cwd, name);
     if (!resolved) {
-      const { resolveCodingBuiltinSlug, buildCodingSkillContentBySlug } = await import("./codingSkills-BYQI6EPT.js");
+      const { resolveCodingBuiltinSlug, buildCodingSkillContentBySlug } = await import("./codingSkills-FQPCEIWL.js");
       const builtinSlug = resolveCodingBuiltinSlug(name);
       if (builtinSlug) {
         const body = buildCodingSkillContentBySlug(builtinSlug);
@@ -6932,7 +7146,7 @@ ${body}`,
   };
 }
 async function formatUnknownSkillMessage(cwd, requestedName) {
-  const { discoverSkills } = await import("./skillDiscovery-COX56OBO.js");
+  const { discoverSkills } = await import("./skillDiscovery-CYUCJMAG.js");
   let available = [];
   try {
     available = discoverSkills(cwd).map((s) => s.name);
@@ -6950,6 +7164,7 @@ Available skills: ${available.join(", ")}`;
 export {
   readCommandActionGatePayload,
   readActionGate,
+  evaluateFileWritePolicy,
   summarizeToolArguments,
   LOCAL_AGENT_CONFIG_MISSING_CODE,
   LOCAL_TURN_ABORTED_CODE,
@@ -6967,6 +7182,7 @@ export {
   buildAgentRuntimeDialogWritePlan,
   shouldCacheHybridRemoteRecord,
   parseSyncServersEnv,
+  DEFAULT_HYBRID_READ_TIMEOUT_MS,
   createHybridRecordStore,
   isDestructiveShellCommand,
   evaluateShellCommandPolicy,

package/{chunk-Q24S4NDF.js → chunk-HQTK2SFT.js}

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

package/{chunk-XB7ACJFH.js → chunk-IPTZ5TVU.js}

@@ -1,6 +1,6 @@
 import {
   sanitizeForOutbound
-} from "./chunk-T27IEBNQ.js";
+} from "./chunk-2QDDKFG5.js";
 import {
   accumulateToolCallDelta,
   createThinkParserState,
@@ -23,7 +23,7 @@ import {
   shouldStripReasoningContentForOutbound,
   toOpenAiCompatibleMessages,
   toResponsesTools
-} from "./chunk-6BYAXNH5.js";
+} from "./chunk-3QOCS5IF.js";
 import {
   buildProviderExecutionPlan,
   canUsePlatformChatProvider,
@@ -33,13 +33,13 @@ import {
   resolvePlatformAuthToken,
   resolvePlatformServerUrl,
   resolveProviderTransportDecision
-} from "./chunk-JBL24PK6.js";
+} from "./chunk-DEIGUGP6.js";
 import {
   clipCompactText
-} from "./chunk-HR5XDXYM.js";
+} from "./chunk-G5SQVIFZ.js";
 import {
   NOLO_CLIENT_VERSION_HEADER
-} from "./chunk-VFN256RI.js";
+} from "./chunk-G4WSLTQF.js";
 import {
   isRecord
 } from "./chunk-KUG52IAP.js";
@@ -477,7 +477,8 @@ function buildPlatformChatCompletionRequest(args) {
     },
     stream: args.stream ?? false,
     ...args.stream ? getUsageRequestOptions(args.providerConfig.usageProvider ?? args.providerConfig.provider, {
-      api: usesResponsesApi ? "responses" : "chat-completions"
+      api: usesResponsesApi ? "responses" : "chat-completions",
+      endpoint: usesResponsesApi ? null : args.providerConfig.endpoint
     }) : {},
     ...requestOptions,
     ...args.tools && args.tools.length > 0 ? {