nolo-cli 0.19.0 → 0.24.0-alpha.14

package/{chunk-N54HIJVJ.js → chunk-MCXQNEJ3.js}

@@ -3,9 +3,10 @@ import {
   extractThinkContent,
   flushThinkParser,
   flushToolCallTextParserIntoCallback,
+  longestTagPrefixLength,
   processContentChunkWithToolCallStripping,
   processThinkChunk
-} from "./chunk-LSFAWXKC.js";
+} from "./chunk-N7J63Q6C.js";
 import {
   convertMessagesToResponsesInput,
   extractTextFromResponseOutput,
@@ -14,7 +15,7 @@ import {
   shouldStripReasoningContentForOutbound,
   toOpenAiCompatibleMessages,
   toResponsesTools
-} from "./chunk-KFEVY3ST.js";
+} from "./chunk-D34RI6NI.js";
 import {
   buildProviderExecutionPlan,
   canUsePlatformChatProvider,
@@ -23,7 +24,7 @@ import {
   resolvePlatformAuthToken,
   resolvePlatformServerUrl,
   resolveProviderTransportDecision
-} from "./chunk-MHSGJW4Z.js";
+} from "./chunk-PXPISYEH.js";
 import {
   clipCompactText
 } from "./chunk-5MMAK75Q.js";
@@ -59,6 +60,90 @@ function providerHttpFailure(args) {
   );
 }
 
+// packages/agent-runtime/deepseekDsmlParser.ts
+var DSML_OPEN = "<\uFF5C\uFF5CDSML\uFF5C\uFF5Ctool_calls>";
+var DSML_CLOSE = "</\uFF5C\uFF5CDSML\uFF5C\uFF5Ctool_calls>";
+var DSML_INVOKE_RE = /<｜｜DSML｜｜invoke\s+name="([^"]+)">([\s\S]*?)<\/｜｜DSML｜｜invoke>/g;
+var DSML_PARAMETER_RE = /<｜｜DSML｜｜parameter\s+([^>]+)>([\s\S]*?)<\/｜｜DSML｜｜parameter>/g;
+function createDsmlParserState() {
+  return { mode: "content", buffer: "" };
+}
+function parseAttributes(raw) {
+  return {
+    name: raw.match(/(?:^|\s)name="([^"]+)"/)?.[1],
+    stringFlag: raw.match(/(?:^|\s)string="(true|false)"/)?.[1]
+  };
+}
+function decode(value) {
+  return value.replace(/&quot;/g, '"').replace(/&apos;/g, "'").replace(/&lt;/g, "<").replace(/&gt;/g, ">").replace(/&amp;/g, "&");
+}
+function parseValue(value) {
+  try {
+    return JSON.parse(value);
+  } catch {
+    return value;
+  }
+}
+function parseCalls(text) {
+  const calls = [];
+  for (const match of text.matchAll(DSML_INVOKE_RE)) {
+    const args = {};
+    for (const parameter of match[2].matchAll(DSML_PARAMETER_RE)) {
+      const attrs = parseAttributes(parameter[1]);
+      if (!attrs.name) continue;
+      const value = decode(parameter[2]);
+      args[attrs.name] = attrs.stringFlag === "true" ? value : attrs.stringFlag === "false" ? parseValue(value) : value;
+    }
+    const name = match[1];
+    if (name === "readFile" && args.path === void 0 && args.file !== void 0) {
+      args.path = args.file;
+      delete args.file;
+    }
+    calls.push({ name, arguments: JSON.stringify(args) });
+  }
+  return calls;
+}
+function pushDsmlChunk(chunk, state) {
+  state.buffer += chunk;
+  let content = "";
+  const toolCalls = [];
+  while (true) {
+    if (state.mode === "content") {
+      const index = state.buffer.indexOf(DSML_OPEN);
+      if (index < 0) {
+        const keep = longestTagPrefixLength(state.buffer, DSML_OPEN);
+        content += state.buffer.slice(0, state.buffer.length - keep);
+        state.buffer = state.buffer.slice(state.buffer.length - keep);
+        break;
+      }
+      content += state.buffer.slice(0, index);
+      state.buffer = state.buffer.slice(index + DSML_OPEN.length);
+      state.mode = "dsml";
+    } else {
+      const index = state.buffer.indexOf(DSML_CLOSE);
+      if (index < 0) break;
+      toolCalls.push(...parseCalls(state.buffer.slice(0, index)));
+      state.buffer = state.buffer.slice(index + DSML_CLOSE.length);
+      state.mode = "content";
+    }
+  }
+  return { content, toolCalls };
+}
+function finishDsml(state) {
+  const result = { content: "", toolCalls: [] };
+  if (state.mode === "dsml") result.toolCalls.push(...parseCalls(state.buffer));
+  else result.content = state.buffer;
+  state.mode = "content";
+  state.buffer = "";
+  return result;
+}
+function parseDsml(text) {
+  const state = createDsmlParserState();
+  const chunk = pushDsmlChunk(text, state);
+  const tail = finishDsml(state);
+  return { content: chunk.content + tail.content, toolCalls: [...chunk.toolCalls, ...tail.toolCalls] };
+}
+
 // packages/agent-runtime/processChatCompletionDelta.ts
 function extractChatCompletionStreamError(parsed) {
   const raw = parsed?.error;
@@ -204,6 +289,9 @@ function shouldDisableThinking(providerConfig) {
 function isResponsesEndpoint(endpoint) {
   return /\/responses$/i.test(endpoint.trim());
 }
+function buildDsmlToolCallId(baseCount, index) {
+  return `dsml-${baseCount + index + 1}`;
+}
 function toResponsesRequestOptions(options) {
   const next = { ...options };
   const reasoningEffort = next.reasoning_effort;
@@ -266,9 +354,7 @@ function buildPlatformChatCompletionRequest(args) {
   const body = {
     model: args.providerConfig.model,
     ...usesResponsesApi ? {
-      input: convertMessagesToResponsesInput(args.messages, {
-        stripReasoningContent: shouldStripReasoning
-      })
+      input: convertMessagesToResponsesInput(args.messages)
     } : {
       messages: toOpenAiCompatibleMessages(args.messages, {
         stripReasoningContent: shouldStripReasoning
@@ -353,13 +439,19 @@ function parsePlatformChatCompletionData(raw) {
 }
 function parsePlatformChatCompletionResponse(args) {
   if (isResponsesEndpoint(args.providerConfig.endpoint)) {
-    const content2 = extractTextFromResponseOutput(args.data);
+    const rawContent2 = extractTextFromResponseOutput(args.data);
+    const dsml = parseDsml(rawContent2);
     const tool_calls = extractToolCallsFromResponseOutput(args.data);
+    const normalizedToolCalls = tool_calls.length > 0 ? tool_calls : dsml.toolCalls.map((call, index) => ({
+      id: buildDsmlToolCallId(tool_calls.length, index),
+      type: "function",
+      function: { name: call.name, arguments: call.arguments }
+    }));
     return {
-      content: content2,
+      content: dsml.content,
       model: args.providerConfig.model,
       provider: args.providerConfig.provider,
-      ...tool_calls.length > 0 ? { tool_calls } : {},
+      ...normalizedToolCalls.length > 0 ? { tool_calls: normalizedToolCalls } : {},
       stream_complete: true,
       usage: args.data?.usage,
       trace: args.trace

package/{chunk-GFUIQ4RY.js → chunk-MXFQHRSS.js}

@@ -1,6 +1,6 @@
 import {
   buildSkillDocMarkdown
-} from "./chunk-VC6OZXO5.js";
+} from "./chunk-ZWJOGMKH.js";
 
 // packages/cli/docPageHelpers.ts
 import { readFileSync } from "node:fs";

package/{chunk-LSFAWXKC.js → chunk-N7J63Q6C.js}

@@ -231,6 +231,7 @@ function finalizeAccumulatedToolCalls(accumulator) {
 }
 
 export {
+  longestTagPrefixLength,
   extractThinkContent,
   createThinkParserState,
   processThinkChunk,

package/{chunk-6Y7A3OQQ.js → chunk-NRY4GCKJ.js}

@@ -2755,6 +2755,8 @@ var createTokenKey = {
   record: (0, import_rambda.curry)(
     (userId, timestamp) => createKey("token", userId, timestamp.toString())
   ),
+  /** Server provider-call record: retry-stable even when the retry clock changes. */
+  recordForStableCall: (userId, callId) => createKey("token", userId, "call", encodeURIComponent(callId)),
   range: (userId, timestamp) => ({
     start: createKey("token", userId, timestamp.toString()),
     end: createKey("token", userId, (timestamp + 864e5).toString())

package/{chunk-ELT65PZW.js → chunk-OXLLFZNF.js}

@@ -1,7 +1,7 @@
 import {
   patch,
   read
-} from "./chunk-XRZJGPFI.js";
+} from "./chunk-FON47ACC.js";
 import {
   DEVICE_LOCAL_OWNER_ID,
   isDeviceLocalSpaceBody,

package/{chunk-YGW4G5W5.js → chunk-P3RZ6DHN.js}

@@ -3,30 +3,31 @@ import {
   buildCurrentTimeBlock,
   buildIdentityBlock,
   buildRuntimeGuidanceBlocks
-} from "./chunk-34WPV75U.js";
+} from "./chunk-ZUXIXYJI.js";
 import {
   estimateTokenCount,
   getModelContextWindow,
   planCompression,
   planContextUsage,
   serializeMessageContent
-} from "./chunk-I2ZJKTG5.js";
+} from "./chunk-PY7VGC5M.js";
 import {
   clipCompactText
 } from "./chunk-5MMAK75Q.js";
 import {
   findModelConfig,
   getProviderByModelName
-} from "./chunk-UAIVG4J6.js";
-import {
-  toErrorMessage
-} from "./chunk-HNMXYYJR.js";
+} from "./chunk-LEHTC2FI.js";
 import {
   buildDialogSummaryLayer
 } from "./chunk-AL2V7U3E.js";
 import {
+  canonicalizeToolName,
   canonicalizeToolNames
 } from "./chunk-ZZ2MH7LE.js";
+import {
+  toErrorMessage
+} from "./chunk-HNMXYYJR.js";
 import {
   asRecordOrEmpty
 } from "./chunk-KX6YBIHG.js";
@@ -372,24 +373,81 @@ function clipToolText(content, maxChars, headRatio, marker = "\n\n[... tool outp
 // packages/agent-runtime/localAutoCompaction.ts
 var LOCAL_AUTO_COMPACTION_SYSTEM_PROMPT = `\u4F60\u662F\u5BF9\u8BDD\u4E0A\u4E0B\u6587\u538B\u7F29\u5668\u3002\u6839\u636E\u3010\u73B0\u6709\u8BB0\u5FC6\u3011\u548C\u3010\u65B0\u589E\u5BF9\u8BDD\u3011\uFF0C\u8F93\u51FA\u53EF\u66FF\u4EE3\u539F\u59CB\u6D88\u606F\u7684\u4E8B\u5B9E\u6027\u8981\u70B9\uFF0C\u4F9B\u540E\u7EED\u5BF9\u8BDD\u76F4\u63A5\u4F7F\u7528\u3002
 
-\u4E25\u683C\u53EA\u8F93\u51FA\u4E0B\u9762\u4E24\u90E8\u5206\uFF0C\u6807\u9898\u5FC5\u987B\u5B8C\u5168\u4E00\u81F4\uFF1A
+\u4E25\u683C\u53EA\u8F93\u51FA\u4E0B\u9762\u4E09\u90E8\u5206\uFF0C\u6807\u9898\u5FC5\u987B\u5B8C\u5168\u4E00\u81F4\uFF1A
 \u5173\u952E\u4E8B\u5B9E\u6863\u6848
 - ...
 \u5BF9\u8BDD\u8FDB\u5C55\u4E0E\u5F85\u529E
 - ...
+\u6587\u4EF6\u64CD\u4F5C\u6E05\u5355
+- ...
 
 \u8981\u6C42\uFF1A
 1) \u4F7F\u7528\u5BF9\u8BDD\u4E3B\u8BED\u8A00\uFF1B\u6DF7\u5408\u8BED\u8A00\u65F6\u4F18\u5148\u7528\u6237\u4E3B\u8981\u8BED\u8A00\uFF1B\u4E13\u6709\u540D\u8BCD\u3001\u6587\u4EF6\u8DEF\u5F84\u3001\u6807\u8BC6\u7B26\u3001\u547D\u4EE4\u4FDD\u7559\u539F\u6587\u3002
 2) \u5173\u952E\u4E8B\u5B9E\u6863\u6848\u53EA\u4FDD\u7559\u4E4B\u540E\u7EE7\u7EED\u5BF9\u8BDD\u4ECD\u6709\u4EF7\u503C\u7684\u4FE1\u606F\uFF1A\u7528\u6237\u76EE\u6807/\u504F\u597D\u3001\u7EA6\u675F\u3001\u6280\u672F\u6808\u3001\u786E\u5B9A\u7684\u6587\u4EF6\u8DEF\u5F84\u3001\u6838\u5FC3\u51B3\u7B56\u3001\u672A\u5B8C\u6210\u5F85\u529E\u3002
 3) \u5BF9\u8BDD\u8FDB\u5C55\u4E0E\u5F85\u529E\uFF1A\u5148\u6781\u7B80\u6982\u62EC\u65E7\u4E0A\u4E0B\u6587\uFF0C\u518D\u66F4\u8BE6\u7EC6\u8BB0\u5F55\u6700\u8FD1\u8FDB\u5C55\u3001\u7ED3\u8BBA\u3001\u5206\u6B67\u4E0E\u4E0B\u4E00\u6B65\u3002
-4) \u5FFD\u7565\u5BD2\u6684\u3001\u91CD\u590D\u5C1D\u8BD5\u3001\u5DF2\u653E\u5F03\u65B9\u6848\u548C\u65E0\u4EF7\u503C\u5E9F\u8BDD\u3002
-5) \u4E0D\u8981\u7F16\u9020\u672A\u51FA\u73B0\u7684\u4FE1\u606F\uFF1B\u4E0D\u8981\u5F00\u573A\u767D\u3001\u7ED3\u675F\u8BED\u3001markdown \u4EE3\u7801\u5757\u6216\u989D\u5916\u7AE0\u8282\uFF1B\u4E0D\u8981\u8C03\u7528\u4EFB\u4F55\u5DE5\u5177\u3002`;
-function buildLocalAutoCompactionUserContent(previousSummary, messagesText) {
-  return `\u3010\u73B0\u6709\u8BB0\u5FC6\u3011\uFF1A
-${previousSummary || "(\u65E0)"}
-
-\u3010\u65B0\u589E\u5BF9\u8BDD\u3011\uFF1A
-${messagesText}`.trim();
+4) \u6587\u4EF6\u64CD\u4F5C\u6E05\u5355\uFF1A\u5217\u51FA\u672C\u6B21\u538B\u7F29\u8303\u56F4\u5185\u8BFB\u53D6\u3001\u5199\u5165\u3001\u7F16\u8F91\u8FC7\u7684\u6587\u4EF6\u8DEF\u5F84\u53CA\u64CD\u4F5C\u7C7B\u578B\uFF08\u5982: - \u8BFB\u53D6: path/to/file\uFF1B\u82E5\u672A\u6D89\u53CA\u6587\u4EF6\u64CD\u4F5C\u5199"\u65E0"\uFF09\u3002
+5) \u5FFD\u7565\u5BD2\u6684\u3001\u91CD\u590D\u5C1D\u8BD5\u3001\u5DF2\u653E\u5F03\u65B9\u6848\u548C\u65E0\u4EF7\u503C\u5E9F\u8BDD\u3002
+6) \u4E0D\u8981\u7F16\u9020\u672A\u51FA\u73B0\u7684\u4FE1\u606F\uFF1B\u4E0D\u8981\u5F00\u573A\u767D\u3001\u7ED3\u675F\u8BED\u3001markdown \u4EE3\u7801\u5757\u6216\u989D\u5916\u7AE0\u8282\uFF1B\u4E0D\u8981\u8C03\u7528\u4EFB\u4F55\u5DE5\u5177\u3002`;
+function extractFileOperations(msgs) {
+  const result = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const msg of msgs) {
+    if (!Array.isArray(msg.tool_calls)) continue;
+    for (const call of msg.tool_calls) {
+      const name = call.function?.name || call.name || "";
+      if (!name) continue;
+      const canonicalName = canonicalizeToolName(name);
+      const fileOperationByTool = {
+        readFile: "read",
+        writeFile: "write",
+        editFile: "edit"
+      };
+      const opType = fileOperationByTool[canonicalName];
+      if (!opType) continue;
+      let rawArgs = call.function?.arguments ?? call.arguments;
+      let parsedArgs = null;
+      if (typeof rawArgs === "string") {
+        try {
+          parsedArgs = JSON.parse(rawArgs);
+        } catch {
+        }
+      } else if (typeof rawArgs === "object" && rawArgs !== null) {
+        parsedArgs = rawArgs;
+      }
+      const path = parsedArgs?.path ?? parsedArgs?.filePath ?? parsedArgs?.file;
+      if (typeof path === "string" && path.trim()) {
+        const key = `${opType}:${path.trim()}`;
+        if (!seen.has(key)) {
+          seen.add(key);
+          result.push({ type: opType, path: path.trim() });
+        }
+      }
+    }
+  }
+  return result;
+}
+function formatFileOperations(msgs) {
+  const ops = extractFileOperations(msgs);
+  if (ops.length === 0) {
+    return "\u65E0";
+  }
+  const typeLabelMap = {
+    read: "\u8BFB\u53D6",
+    write: "\u5199\u5165",
+    edit: "\u7F16\u8F91"
+  };
+  return ops.map((op) => `- ${typeLabelMap[op.type]}: ${op.path}`).join("\n");
+}
+function buildLocalAutoCompactionUserContent(previousSummary, messagesText, fileOpsText) {
+  const parts = [`\u3010\u73B0\u6709\u8BB0\u5FC6\u3011\uFF1A
+${previousSummary || "(\u65E0)"}`];
+  if (fileOpsText !== void 0) {
+    parts.push(`\u3010\u6587\u4EF6\u64CD\u4F5C\u6E05\u5355\u3011\uFF1A
+${fileOpsText || "\u65E0"}`);
+  }
+  parts.push(`\u3010\u65B0\u589E\u5BF9\u8BDD\u3011\uFF1A
+${messagesText}`);
+  return parts.join("\n\n").trim();
 }
 function toPlanCompressionMessages(history) {
   return history.map((message, index) => {
@@ -485,12 +543,13 @@ async function maybeAutoCompactLocalHistory(args) {
   }
   try {
     const provider = await args.resolveProvider();
-    const messagesText = formatMessagesForLocalSummary(
-      plan.msgsToCompress
-    );
+    const msgsToCompress = plan.msgsToCompress;
+    const messagesText = formatMessagesForLocalSummary(msgsToCompress);
+    const fileOpsText = formatFileOperations(msgsToCompress);
     const promptContent = buildLocalAutoCompactionUserContent(
       existingSummary,
-      messagesText
+      messagesText,
+      fileOpsText
     );
     const result = await provider.complete([
       { role: "system", content: LOCAL_AUTO_COMPACTION_SYSTEM_PROMPT },
@@ -1074,7 +1133,7 @@ function mergeTurnUsage(current, next) {
   const right = read(next);
   const left = current ? read(current) : { input: 0, output: 0, cacheHit: 0, cacheMiss: 0 };
   return {
-    input_tokens: right.input || left.input,
+    input_tokens: left.input + right.input,
     output_tokens: left.output + right.output,
     cache_read_input_tokens: left.cacheHit + right.cacheHit,
     cache_creation_input_tokens: left.cacheMiss + right.cacheMiss
@@ -1120,8 +1179,12 @@ async function persistFailedLocalTurn(args) {
         model: args.model ?? "unknown",
         toolCallCount: args.toolCallCount ?? 0,
         error: true,
-        errorMessage
+        errorMessage,
+        ...args.usage ? { usage: args.usage } : {}
       },
+      ...args.accountingUsage ? { accountingUsage: args.accountingUsage } : {},
+      ...args.usageRecords?.length ? { usageRecords: args.usageRecords } : {},
+      ...args.billingConfig ? { billingConfig: args.billingConfig } : {},
       ...args.input.runtimeContext ? { runtimeContext: args.input.runtimeContext } : {},
       ...args.input.continueDialogId ? { continueDialogId: args.input.continueDialogId } : {},
       ...args.input.spaceId ? { spaceId: args.input.spaceId } : {},
@@ -1159,6 +1222,18 @@ async function runLocalAgentTurn(input) {
     error.agentRef = input.agentRef;
     throw error;
   }
+  const rawBillingConfig = agentConfig.rawRecord ?? {};
+  const billingConfig = {
+    model: agentConfig.model || "unknown",
+    ...agentConfig.provider ? { provider: agentConfig.provider } : {},
+    ...agentConfig.apiSource ? { apiSource: agentConfig.apiSource } : {},
+    ...agentConfig.apiKeyRef !== void 0 ? { apiKeyRef: agentConfig.apiKeyRef } : {},
+    ...typeof rawBillingConfig.inputPrice === "number" ? { inputPrice: rawBillingConfig.inputPrice } : {},
+    ...typeof rawBillingConfig.outputPrice === "number" ? { outputPrice: rawBillingConfig.outputPrice } : {},
+    ...rawBillingConfig.sharingLevel ? { sharingLevel: rawBillingConfig.sharingLevel } : {},
+    id: agentConfig.key,
+    ...typeof rawBillingConfig.userId === "string" ? { userId: rawBillingConfig.userId } : {}
+  };
   let history = [];
   try {
     history = input.continueDialogId ? await input.adapter.loadDialogHistory(input.continueDialogId) : [];
@@ -1250,6 +1325,8 @@ async function runLocalAgentTurn(input) {
   let toolCallCount = 0;
   let result;
   let turnUsage;
+  let contextUsage;
+  const usageRecords = [];
   let loopError;
   let round = 0;
   let emptyAssistantRepairPending = false;
@@ -1306,6 +1383,15 @@ async function runLocalAgentTurn(input) {
         context: contextMetrics
       });
       turnUsage = mergeTurnUsage(turnUsage, result.usage);
+      contextUsage = result.usage;
+      if (result.usage && Object.keys(result.usage).length > 0) {
+        usageRecords.push({
+          callId: typeof result.usage.provider_call_id === "string" && result.usage.provider_call_id.trim() ? result.usage.provider_call_id.trim() : crypto.randomUUID(),
+          usage: result.usage,
+          model: result.model || agentConfig.model || "unknown",
+          ...result.provider || agentConfig.provider ? { provider: result.provider || agentConfig.provider } : {}
+        });
+      }
       const toolCalls = result.tool_calls ?? [];
       const rawToolCallsCount = (result.tool_calls?.length ?? 0) || (Array.isArray(result.raw_tool_calls) ? result.raw_tool_calls.length : 0);
       if (toolCalls.length === 0 && rawToolCallsCount === 0) {
@@ -1463,6 +1549,18 @@ async function runLocalAgentTurn(input) {
       model: agentConfig.model,
       toolCallCount,
       partialContent,
+      usage: contextUsage,
+      accountingUsage: addOutOfBandUsage(turnUsage, compactionUsage),
+      usageRecords: [
+        ...compactionUsage ? [{
+          callId: typeof compactionUsage.provider_call_id === "string" && compactionUsage.provider_call_id.trim() ? compactionUsage.provider_call_id.trim() : crypto.randomUUID(),
+          usage: compactionUsage,
+          model: agentConfig.model || "unknown",
+          ...agentConfig.provider ? { provider: agentConfig.provider } : {}
+        }] : [],
+        ...usageRecords
+      ],
+      billingConfig,
       input
     });
     attachDialogIdToError(loopError, dialogId);
@@ -1483,6 +1581,15 @@ async function runLocalAgentTurn(input) {
     input.persistedInput,
     input.persistedInputReference
   );
+  if (compactionUsage && Object.keys(compactionUsage).length > 0) {
+    usageRecords.unshift({
+      callId: typeof compactionUsage.provider_call_id === "string" && compactionUsage.provider_call_id.trim() ? compactionUsage.provider_call_id.trim() : crypto.randomUUID(),
+      usage: compactionUsage,
+      model: agentConfig.model || result.model || "unknown",
+      ...agentConfig.provider ? { provider: agentConfig.provider } : {}
+    });
+  }
+  const accountingUsage = addOutOfBandUsage(turnUsage, compactionUsage);
   const saved = await input.adapter.saveTurn({
     agentKey: agentConfig.key,
     messages: turnMessages,
@@ -1491,6 +1598,9 @@ async function runLocalAgentTurn(input) {
       ...toolCallCount > 0 ? { toolCallCount } : {},
       ...agentConfig.toolSurface ? { runtimeToolSurface: agentConfig.toolSurface } : {}
     },
+    ...usageRecords.length > 0 ? { usageRecords } : {},
+    ...accountingUsage ? { accountingUsage } : {},
+    billingConfig,
     ...input.runtimeContext ? { runtimeContext: input.runtimeContext } : {},
     ...input.continueDialogId ? { continueDialogId: input.continueDialogId } : {},
     ...input.spaceId ? { spaceId: input.spaceId } : {},
@@ -1500,10 +1610,8 @@ async function runLocalAgentTurn(input) {
   });
   return {
     ...result,
-    ...(() => {
-      const merged = addOutOfBandUsage(turnUsage, compactionUsage);
-      return merged ? { usage: merged } : {};
-    })(),
+    ...usageRecords.length > 0 ? { usageRecords } : {},
+    ...accountingUsage ? { accountingUsage } : {},
     ...toolCallCount > 0 ? { toolCallCount } : {},
     ...agentConfig.toolSurface ? { runtimeToolSurface: agentConfig.toolSurface } : {},
     // 透出最后一轮 provider 调用的 finish_reason；多轮工具循环里只有最后一轮收尾状态有意义。

package/{chunk-5MIDPSSK.js → chunk-PB7G5MAM.js}

@@ -1,6 +1,3 @@
-import {
-  extractCustomId
-} from "./chunk-DFFIZ25G.js";
 import {
   getActiveDialogKey
 } from "./chunk-3ASDTTEI.js";
@@ -10,6 +7,9 @@ import {
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
+import {
+  extractCustomId
+} from "./chunk-SLOGKB7M.js";
 import {
   isRecord
 } from "./chunk-KUG52IAP.js";

package/{chunk-HEGV7BH3.js → chunk-PMCKFQYC.js}

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