nolo-cli 0.38.0-alpha.3 → 0.47.0-alpha.2

package/{chunk-IZCHPD7T.js → chunk-TNPCQNGQ.js}

@@ -1,13 +1,13 @@
 import {
   asRecordOrEmpty
 } from "./chunk-KX6YBIHG.js";
+import {
+  asOptionalFiniteNumber
+} from "./chunk-WWC7I6TA.js";
 import {
   asNonEmptyStringArray,
   asTrimmedNonEmptyStringArray
 } from "./chunk-I42VC5KR.js";
-import {
-  asOptionalFiniteNumber
-} from "./chunk-WWC7I6TA.js";
 import {
   isOwnedAgentKey,
   ownedAgentKey,
@@ -191,7 +191,11 @@ var AGENT_SELECTION_PRIORITY_INSTRUCTIONS = `   - \u4F18\u5148\u7EA7\u5951\u7EA6
    - \u9009\u4EBA\u4E0E\u4EFB\u52A1\u5339\u914D\u53C2\u8003\uFF1A
      * **\u80FD\u529B\u5339\u914D**\uFF1A\u82E5\u4EFB\u52A1\u660E\u786E\u9700\u8981\u7279\u5B9A\u989D\u5916\u80FD\u529B\uFF08\u6D4F\u89C8\u5668/\u56FE\u7247/\u8868\u683C/\u90AE\u4EF6/\u6570\u636E\u5E93\uFF09\uFF0C\u4F18\u5148\u7B5B\u9009 tools \u5B57\u6BB5\u8986\u76D6\u5BF9\u5E94\u80FD\u529B\u7684\u5019\u9009\uFF1B
      * **\u6210\u672C\u4E0E\u914D\u989D**\uFF1A\u5728\u6EE1\u8DB3\u80FD\u529B\u7684\u540C\u6863\u5019\u9009\u4E2D\uFF0C\u4F18\u5148\u9009\u62E9\u6210\u672C\u4F4E\uFF08\u4F4E inputPrice\uFF09\u6216\u8D70\u7528\u6237\u81EA\u5EFA/\u79C1\u6709\u51ED\u636E\u7684\u901A\u9053\uFF1B
-     * **tools \u5B57\u6BB5\u53EA\u53CD\u6620\u989D\u5916\u80FD\u529B\uFF0C\u4E0D\u53CD\u6620 coding \u80FD\u529B**\uFF1AwriteFile/editFile/execBash/applyEdit/gitCommit \u7B49\u4EE3\u7801\u5DE5\u5177\u7531 host \u81EA\u52A8\u6CE8\u5165\uFF0Ctools=[] \u4E0D\u4EE3\u8868\u4E0D\u80FD\u5199\u4EE3\u7801\uFF0C\u4E0D\u8981\u636E\u6B64\u6392\u9664\u5019\u9009\u3002`;
+     * **tools \u5B57\u6BB5\u53EA\u53CD\u6620\u989D\u5916\u80FD\u529B\uFF0C\u4E0D\u53CD\u6620 coding \u80FD\u529B**\uFF1AwriteFile/editFile/execBash/applyEdit/gitCommit \u7B49\u4EE3\u7801\u5DE5\u5177\u7531 host \u81EA\u52A8\u6CE8\u5165\uFF0Ctools=[] \u4E0D\u4EE3\u8868\u4E0D\u80FD\u5199\u4EE3\u7801\uFF0C\u4E0D\u8981\u636E\u6B64\u6392\u9664\u5019\u9009\u3002
+   - 429 \u9650\u6D41\u4E0E\u77E5\u60C5\u6743\u5951\u7EA6\uFF1A
+     * \u4EFB\u4F55\u7528\u6237\u79C1\u6709\u51ED\u636E\u4E0E\u81EA\u5EFA Agent\uFF08\u5373\u6EE1\u8DB3 isOwned=true\u3001isOAuth=true \u6216 apiSource="custom" \u4E4B\u4E00\uFF0C\u542B\u6536\u85CF\u4E0E\u672A\u6536\u85CF\uFF09\u82E5\u51FA\u73B0\u5728 listAgents \u8FD4\u56DE\u7684 unavailableAgents \u4E2D\uFF08429 \u9650\u6D41\u51B7\u5374\u671F\uFF09\uFF0C\u7981\u6B62\u9759\u9ED8\u8DF3\u8FC7\uFF1B
+     * \u6539\u6D3E\u5E73\u53F0 Agent\uFF08\u6D88\u8017\u5E73\u53F0\u79EF\u5206\uFF09\u524D\u5FC5\u987B\u5728\u56DE\u590D\u4E2D\u544A\u77E5\u7528\u6237\uFF1A\u54EA\u4E2A\u8BA2\u9605/\u81EA\u5EFA agent \u9650\u6D41\u3001\u9884\u8BA1\u4F55\u65F6\u6062\u590D\uFF08nextAvailableAt\uFF09\u3001\u672C\u6B21\u5C06\u6263\u5E73\u53F0\u79EF\u5206\uFF1B
+     * \u82E5\u4EFB\u52A1\u4E0D\u7D27\u6025\uFF0C\u5EFA\u8BAE\u7B49\u6062\u590D\u6216\u8BE2\u95EE\u7528\u6237\u3002`;
 
 // packages/agent-runtime/noloWorkspaceTools.ts
 var NOLO_WORKSPACE_TOOL_NAMES = [
@@ -274,9 +278,10 @@ function buildNoloWorkspaceOpenAiTools(args) {
       description: "Confirmed dialog ids or dbKeys to delete."
     }
   }, ["query"]);
-  add("listAgents", "List the current user's agents with runnable agentKey for delegation. Copy the agentKey verbatim; do not infer it from the display name.", {
+  add("listAgents", "List the current user's agents with runnable agentKey for delegation. Copy the agentKey verbatim; do not infer it from the display name. Agents currently rate-limited (429) are hidden by default and summarized in `unavailableAgents` with `unavailableCount`; pass showUnavailable: true to include them in `agents`.", {
     space: stringToolParam("Optional space id or URL."),
-    publicOnly: { type: "boolean", description: "Only show public agents." }
+    publicOnly: { type: "boolean", description: "Only show public agents." },
+    showUnavailable: { type: "boolean", description: "Include agents currently rate-limited (429). Default false." }
   });
   add("readAgent", "Read one agent's full config by exact agentKey returned by listAgents (agent-<userId>-<id> or agent-pub-<id>); do not use the display name.", {
     agent: stringToolParam("Exact agentKey from listAgents (preferred; copy verbatim; plain id or URL are compatibility fallbacks).")

package/{chunk-4DMPISV6.js → chunk-URBGEE42.js}

@@ -6,10 +6,10 @@ import {
 } from "./chunk-AGGIDPCZ.js";
 import {
   getModelConfig
-} from "./chunk-C6ELZQ7H.js";
+} from "./chunk-OZVGA4SY.js";
 import {
   isPlatformHostedImageModel
-} from "./chunk-X6EN3KJX.js";
+} from "./chunk-ENYDQKOB.js";
 import {
   asOptionalFiniteNumber
 } from "./chunk-WWC7I6TA.js";

package/{chunk-2KO5QQFV.js → chunk-V2IPBG5U.js}

@@ -1,7 +1,7 @@
 import {
   TOOL_PACKS,
   buildCodeWorkDiscipline
-} from "./chunk-IIOHYLIG.js";
+} from "./chunk-LGUQHYAL.js";
 import {
   buildSkillDocMarkdown,
   resolvePageSkillMetadata

package/{chunk-B6YYACBT.js → chunk-WPFNAEIW.js}

@@ -1,7 +1,7 @@
 import {
   fetchReferenceContents,
   resolveReferenceAssets
-} from "./chunk-XVVNNJAA.js";
+} from "./chunk-5BPZLBFB.js";
 
 // packages/ai/agent/fetchAgentContexts.ts
 async function fetchAgentContexts(references, dispatch) {

package/{chunk-23KKIMD5.js → chunk-WVGEBWA6.js}

@@ -3,7 +3,7 @@ import {
   fileKey,
   getFileIdFromKey,
   ulid
-} from "./chunk-2WKUUY2E.js";
+} from "./chunk-SVEUG45B.js";
 import {
   loadFileFromIndexedDb,
   removeAction,
@@ -13,7 +13,7 @@ import {
   readAction,
   readRequestManager,
   resolveAgentReadServers
-} from "./chunk-XT73C4VH.js";
+} from "./chunk-Z5NW3O7V.js";
 import {
   asyncThunkCreator,
   buildCreateSlice,
@@ -707,7 +707,7 @@ var dbSlice = createSliceWithThunks({
     // 动态 import 在调用期解析，避开 TDZ/求值顺序问题（同下方 share）。
     read: create.asyncThunk(
       async (payload, thunkApi) => {
-        const { readAction: readAction2 } = await import("./read-6C2XD3YZ.js");
+        const { readAction: readAction2 } = await import("./read-DQQ75VI3.js");
         return readAction2(payload, thunkApi);
       },
       {
@@ -781,7 +781,7 @@ var dbSlice = createSliceWithThunks({
     // 这里改成动态 import，运行期才解析，彻底断开这条边。
     share: create.asyncThunk(
       async (config, thunkApi) => {
-        const { shareResourceAction } = await import("./action-KMBZ3LCZ.js");
+        const { shareResourceAction } = await import("./action-FLLC2SIX.js");
         return shareResourceAction(config, thunkApi);
       }
     ),

package/{chunk-KU6CDTZ5.js → chunk-XMI3APSU.js}

@@ -5,14 +5,14 @@ import {
   inlineImageUrlsForCustomProvider,
   prepareTools,
   shouldInlineImageUrlsForAgent
-} from "./chunk-Y5MMUI3L.js";
+} from "./chunk-IWUPQUWA.js";
 import {
   INVALID_TOOL_ARGS_REPLACEMENT,
   buildInvalidToolCallSelfHealResult,
   parseToolCallArguments,
   performFetchRequest,
   sanitizeOutboundMessages
-} from "./chunk-XVVNNJAA.js";
+} from "./chunk-5BPZLBFB.js";
 import {
   createSSEParser,
   createToolRunId,
@@ -23,30 +23,27 @@ import {
   toolRunSetPending,
   toolRunStarted,
   toolRunSucceeded
-} from "./chunk-UWGWUOVN.js";
+} from "./chunk-YNOGNUBC.js";
 import {
   getPublicImageAgentMode
 } from "./chunk-VIDPVFP3.js";
 import {
   getCurrentSpaceId
-} from "./chunk-IKGHZMK2.js";
+} from "./chunk-H2JQB6B6.js";
 import {
   addToolMessage,
   messageStreamEnd,
   messageStreaming,
   updateToolMessage
-} from "./chunk-4WVNHL3V.js";
+} from "./chunk-FAWK6DBF.js";
 import {
   streamAgentChatTurn
-} from "./chunk-46VPXYIV.js";
+} from "./chunk-6LYUN76O.js";
 import {
   addActiveController,
   removeActiveController,
   tokenUsageLiveUpdate
 } from "./chunk-MRWGHF56.js";
-import {
-  EMPTY_ASSISTANT_REPAIR_PROMPT
-} from "./chunk-P66M7LSQ.js";
 import {
   accumulateToolCallDelta,
   createThinkParserState,
@@ -57,25 +54,26 @@ import {
   processThinkChunk
 } from "./chunk-N7J63Q6C.js";
 import {
+  EMPTY_ASSISTANT_REPAIR_PROMPT,
   getModelInfo
-} from "./chunk-WRP5TTM6.js";
+} from "./chunk-4MXGXSYN.js";
 import {
   getApiEndpoint
-} from "./chunk-C6ELZQ7H.js";
+} from "./chunk-OZVGA4SY.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
 import {
   selectCurrentServer
-} from "./chunk-B6H5XCT2.js";
+} from "./chunk-EMEUU5IY.js";
 import {
   write
-} from "./chunk-23KKIMD5.js";
+} from "./chunk-WVGEBWA6.js";
 import {
   createDialogMessageKeyAndId,
   dialogMessageKey,
   toTrimmedString
-} from "./chunk-2WKUUY2E.js";
+} from "./chunk-SVEUG45B.js";
 import {
   extractCustomId
 } from "./chunk-BJIRLHJR.js";
@@ -313,10 +311,18 @@ function updateTotalUsage(currentUsage, newUsageChunk) {
     return currentUsage;
   }
   if (!currentUsage) {
+    const hasExplicitTokenField = [
+      "prompt_tokens",
+      "completion_tokens",
+      "total_tokens",
+      "input_tokens",
+      "output_tokens"
+    ].some((field) => Object.prototype.hasOwnProperty.call(newUsageChunk, field));
     const first = {
-      completion_tokens: 0,
-      prompt_tokens: 0,
-      total_tokens: 0,
+      // Do not synthesize zero token fields for metadata-only events such as
+      // `{provider_call_id}`. Explicit provider zeros remain real reported
+      // usage; only pure metadata is eligible for estimated fallback.
+      ...hasExplicitTokenField ? { completion_tokens: 0, prompt_tokens: 0, total_tokens: 0 } : {},
       ...newUsageChunk
     };
     applyResponsesUsageFields(first, newUsageChunk);
@@ -356,6 +362,10 @@ function updateTotalUsage(currentUsage, newUsageChunk) {
   if (billingModel) {
     updatedUsage.billing_model = billingModel;
   }
+  const providerCallId = asOptionalTrimmedString(newUsageChunk.provider_call_id);
+  if (providerCallId) {
+    updatedUsage.provider_call_id = providerCallId;
+  }
   return updatedUsage;
 }
 function applyResponsesUsageFields(target, chunk) {
@@ -1017,9 +1027,24 @@ function createInitialStreamState() {
     hasHandedOff: false,
     hasProcessedToolCalls: false,
     alreadyFinalized: false,
-    finishReason: null
+    finishReason: null,
+    billingFailed: false,
+    skipBilling: false
   };
 }
+function shouldSkipBillingForUserAbort(error, totalUsage) {
+  if (!isAbortError(error)) return false;
+  if (!totalUsage || typeof totalUsage !== "object") return true;
+  const hasTokenField = [
+    "prompt_tokens",
+    "completion_tokens",
+    "total_tokens",
+    "input_tokens",
+    "output_tokens"
+  ].some((field) => Object.prototype.hasOwnProperty.call(totalUsage, field));
+  const hasCost = Object.prototype.hasOwnProperty.call(totalUsage, "cost") && typeof totalUsage.cost === "number";
+  return !(hasTokenField || hasCost);
+}
 function buildRequestBodyWithTools(bodyData, agentConfig, disableToolsForThisRequest) {
   const messagesForBody = Array.isArray(bodyData?.messages) ? sanitizeOutboundMessages(bodyData.messages) : bodyData?.messages;
   const baseBody = messagesForBody !== bodyData?.messages ? { ...bodyData, messages: messagesForBody } : bodyData;
@@ -1079,7 +1104,9 @@ async function finalizeStream(state, ctx) {
       reasoningBuffer: state.reasoningBuffer,
       messageMetadata: ctx.messageMetadata,
       toolCalls: state.assistantToolCalls,
-      spaceId: ctx.spaceId
+      spaceId: ctx.spaceId,
+      billingFailed: state.billingFailed,
+      skipBilling: state.skipBilling
     })
   );
   return {
@@ -1099,7 +1126,8 @@ function markEmptyCompletionAsError(state, ctx) {
     contentBuffer: appendTextChunk(
       state.contentBuffer,
       `[\u9519\u8BEF: ${EMPTY_UPSTREAM_STREAM_MESSAGE}]`
-    )
+    ),
+    billingFailed: true
   };
 }
 function markStreamMessageAborted(ctx, errorMessage) {
@@ -1435,7 +1463,7 @@ async function handleStreamCompletion(state, ctx, finalizeCtx) {
     };
   }
   if (!state.hasProcessedToolCalls && state.accumulatedToolCalls.length > 0) {
-    if (state.totalUsage) {
+    if (state.totalUsage && !state.billingFailed) {
       ctx.dispatch(tokenUsageLiveUpdate({
         input_tokens: state.totalUsage.prompt_tokens ?? state.totalUsage.input_tokens,
         output_tokens: state.totalUsage.completion_tokens ?? state.totalUsage.output_tokens,
@@ -1532,7 +1560,8 @@ var sendOpenAICompletionsRequest = async ({
     hasHandedOff: hasHandedOffOverall,
     finishReason: lastFinishReason,
     messageId,
-    usage: streamState.totalUsage ?? void 0
+    usage: streamState.totalUsage ?? void 0,
+    billingFailed: streamState.billingFailed
   });
   try {
     if (!parentMessageId) {
@@ -1615,7 +1644,8 @@ var sendOpenAICompletionsRequest = async ({
         contentBuffer: appendTextChunk(
           streamState.contentBuffer,
           `[\u9519\u8BEF: ${errorMessage}]`
-        )
+        ),
+        billingFailed: true
       };
       streamState = await finalizeStream(streamState, finalizeCtx);
       return buildMeta();
@@ -1711,7 +1741,8 @@ var sendOpenAICompletionsRequest = async ({
                 streamState.contentBuffer,
                 `
 [API Error] ${errorMsg}`
-              )
+              ),
+              billingFailed: true
             };
             await reader.cancel();
             break;
@@ -1744,29 +1775,6 @@ var sendOpenAICompletionsRequest = async ({
             streamState.finishReason = finishReason;
             if (finishReason === "tool_calls") {
               throttler.flush();
-              if (streamState.totalUsage) {
-                dispatch(tokenUsageLiveUpdate({
-                  input_tokens: streamState.totalUsage.prompt_tokens ?? streamState.totalUsage.input_tokens,
-                  output_tokens: streamState.totalUsage.completion_tokens ?? streamState.totalUsage.output_tokens,
-                  cost: streamState.totalUsage.cost,
-                  dialogKey
-                }));
-              }
-              const toolResult = await processAccumulatedToolCalls(
-                streamState,
-                {
-                  dispatch,
-                  agentConfig,
-                  dialogId,
-                  dialogKey,
-                  messageId,
-                  messageMetadata
-                }
-              );
-              streamState = toolResult.state;
-              hasHandedOffOverall ||= toolResult.hasHandedOff;
-              hasPendingInteractionOverall ||= toolResult.hasPendingInteraction;
-              streamState = await finalizeStream(streamState, finalizeCtx);
             } else if (finishReason !== "stop") {
               const finishErrorMessage = finishReason === "error" ? getChoiceFinishErrorMessage(data, choice) : null;
               streamState = {
@@ -1776,7 +1784,8 @@ var sendOpenAICompletionsRequest = async ({
                   finishErrorMessage ? `
 [API Error] Error: ${finishErrorMessage}` : finishReason === "error" ? "\n[API Error] Error: \u6A21\u578B\u54CD\u5E94\u4EE5 error \u7ED3\u675F\uFF0C\u4F46\u4E0A\u6E38\u672A\u8FD4\u56DE\u5177\u4F53\u9519\u8BEF\u3002\u8BF7\u91CD\u8BD5\uFF0C\u6216\u5207\u6362\u5230\u5176\u4ED6\u652F\u6301\u56FE\u7247\u8F93\u5165\u7684\u6A21\u578B\u3002" : `
 [\u6D41\u7ED3\u675F\u539F\u56E0: ${finishReason}]`
-                )
+                ),
+                ...finishReason === "error" ? { billingFailed: true } : {}
               };
             }
           }
@@ -1787,6 +1796,7 @@ var sendOpenAICompletionsRequest = async ({
     throttler.flush();
     let errorText;
     const isAbort = isAbortError(error);
+    const skipBilling = shouldSkipBillingForUserAbort(error, streamState.totalUsage);
     if (isAbort) {
       errorText = "\n[\u7528\u6237\u4E2D\u65AD]";
     } else {
@@ -1796,7 +1806,9 @@ var sendOpenAICompletionsRequest = async ({
     console.error("[SSE] sendOpenAICompletionsRequest error:", error);
     streamState = {
       ...streamState,
-      contentBuffer: appendTextChunk(streamState.contentBuffer, errorText)
+      contentBuffer: appendTextChunk(streamState.contentBuffer, errorText),
+      billingFailed: isAbort ? streamState.billingFailed : true,
+      skipBilling: streamState.skipBilling || skipBilling
     };
     if (!isAbort) {
       markStreamMessageAborted(

package/{chunk-64KIQZA2.js → chunk-XO3G35OV.js}

@@ -1,7 +1,7 @@
 import {
   findModelConfig,
   getProviderByModelName
-} from "./chunk-C6ELZQ7H.js";
+} from "./chunk-OZVGA4SY.js";
 import {
   asOptionalFiniteNumber
 } from "./chunk-WWC7I6TA.js";