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

package/{chunk-U6QQLXWI.js → chunk-2X5S4IBZ.js}

@@ -7,7 +7,7 @@ import {
 import {
   patch,
   selectById
-} from "./chunk-23KKIMD5.js";
+} from "./chunk-WVGEBWA6.js";
 import {
   __toESM
 } from "./chunk-4VNS5WPM.js";

package/{chunk-MJWX4JQO.js → chunk-3EEK7T3D.js}

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

package/{chunk-UNHKVD2N.js → chunk-43CXXVJD.js}

@@ -4,7 +4,7 @@ import {
 
 // packages/cli/agentCommandSupport.ts
 async function getDefaultCliDb() {
-  const { getDefaultCliLocalRuntimeDb } = await import("./localRuntimeDb-N3H3HQ7G.js");
+  const { getDefaultCliLocalRuntimeDb } = await import("./localRuntimeDb-PF7CFKDL.js");
   return getDefaultCliLocalRuntimeDb();
 }
 function createNullCliDb() {

package/{chunk-WRP5TTM6.js → chunk-4MXGXSYN.js}

@@ -1,12 +1,12 @@
 import {
   MODEL_LOOKUP_MAP
-} from "./chunk-C6ELZQ7H.js";
+} from "./chunk-OZVGA4SY.js";
 import {
   ALL_MODELS
-} from "./chunk-FTM4KUOZ.js";
+} from "./chunk-7XTC3KRG.js";
 import {
   PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY
-} from "./chunk-XT73C4VH.js";
+} from "./chunk-Z5NW3O7V.js";
 
 // packages/ai/llm/getModelContextWindow.ts
 var DEFAULT_CONTEXT_WINDOW = 256e3;
@@ -115,6 +115,76 @@ var getModelInfo = (modelName) => {
   return map.get(modelName) || map.get(modelName.toLowerCase()) || null;
 };
 
+// packages/agent-runtime/emptyAssistantRepair.ts
+var EMPTY_ASSISTANT_REPAIR_PROMPT = "\u8BF7\u7ED9\u51FA\u660E\u786E\u7684\u6587\u5B57\u56DE\u7B54\u6216\u6267\u884C\u4E0B\u4E00\u6B65\uFF1A\u5982\u679C\u4EFB\u52A1\u5DF2\u5B8C\u6210\uFF0C\u8BF7\u76F4\u63A5\u603B\u7ED3\u7ED3\u679C\uFF1B\u5982\u679C\u9700\u8981\u8C03\u7528\u5DE5\u5177\uFF0C\u8BF7\u76F4\u63A5\u8F93\u51FA tool_calls\u3002\u8BF7\u5207\u52FF\u8FD4\u56DE\u7A7A\u5185\u5BB9\u3002";
+var EMPTY_ASSISTANT_FALLBACK_MESSAGE = "\u6A21\u578B\u8FDE\u7EED\u8FD4\u56DE\u7A7A\u6D88\u606F\uFF0C\u5F53\u524D\u4EFB\u52A1\u672A\u5B8C\u6210\u3002\u8BF7\u91CD\u8BD5\u5F53\u524D\u6B65\u9AA4\uFF0C\u6216\u7ED9\u51FA\u66F4\u5177\u4F53\u7684\u4FEE\u6539\u8303\u56F4\u3002";
+var LENGTH_TRUNCATED_FALLBACK_MESSAGE = "\u8F93\u51FA\u8FBE\u5230\u957F\u5EA6\u4E0A\u9650\u88AB\u622A\u65AD\uFF0C\u5EFA\u8BAE\u7F29\u77ED\u4EFB\u52A1\u6216\u63D0\u9AD8\u8F93\u51FA\u4E0A\u9650\u3002";
+var STREAM_TRUNCATED_FALLBACK_MESSAGE = "\u4E0A\u6E38\u54CD\u5E94\u6D41\u5728\u6536\u5C3E\u524D\u88AB\u4E2D\u65AD\uFF08\u672A\u6536\u5230\u7ED3\u675F\u6807\u8BB0\uFF09\uFF0C\u672C\u8F6E\u8F93\u51FA\u4E0D\u5B8C\u6574\u3002\u8BF7\u91CD\u8BD5\u5F53\u524D\u6B65\u9AA4\u3002";
+var REPETITION_LOOP_FALLBACK_MESSAGE = "\u68C0\u6D4B\u5230\u6A21\u578B\u9677\u5165\u91CD\u590D\u8F93\u51FA\u6B7B\u5FAA\u73AF\uFF0C\u5DF2\u81EA\u52A8\u7194\u65AD\u7EC8\u6B62\u5F53\u524D\u4EFB\u52A1\u3002";
+var STAGNANT_TOOL_CALLS_FALLBACK_MESSAGE = "\u68C0\u6D4B\u5230\u8FDE\u7EED\u591A\u6B21\u76F8\u540C\u5DE5\u5177\u8C03\u7528\u4E14\u65E0\u5B9E\u8D28\u8FDB\u5C55\uFF0C\u5DF2\u81EA\u52A8\u7194\u65AD\u7EC8\u6B62\u5F53\u524D\u4EFB\u52A1\u3002";
+var MAX_REASONING_ONLY_REPAIRS = 2;
+function resolveEmptyAssistantOutcome(args) {
+  if (args.hasVisibleOutput && !args.hasToolCalls && !args.finishReason && !args.streamComplete) {
+    return { kind: "ok_with_warning", reason: "stream_truncated" };
+  }
+  if (args.hasToolCalls || args.hasVisibleOutput) return { kind: "ok" };
+  if (args.finishReason === "length") return { kind: "fallback", reason: "length_truncated" };
+  if (!args.finishReason && !args.streamComplete) {
+    if (!args.repairUsed) return { kind: "repair" };
+    return { kind: "fallback", reason: "stream_truncated" };
+  }
+  if (args.hasReasoning && (args.reasoningRepairCount ?? 0) < MAX_REASONING_ONLY_REPAIRS) {
+    return { kind: "repair" };
+  }
+  if (!args.repairUsed) return { kind: "repair" };
+  return { kind: "fallback", reason: "empty_completion" };
+}
+function resolveEmptyAssistantFallbackMessage(reason) {
+  if (reason === "length_truncated") return LENGTH_TRUNCATED_FALLBACK_MESSAGE;
+  if (reason === "stream_truncated") return STREAM_TRUNCATED_FALLBACK_MESSAGE;
+  if (reason === "repetition_loop") return REPETITION_LOOP_FALLBACK_MESSAGE;
+  if (reason === "stagnant_tool_calls") return STAGNANT_TOOL_CALLS_FALLBACK_MESSAGE;
+  return EMPTY_ASSISTANT_FALLBACK_MESSAGE;
+}
+function hasAssistantVisibleOutput(content) {
+  if (typeof content === "string") return content.trim().length > 0;
+  if (!Array.isArray(content)) return false;
+  return content.some((part) => {
+    if (part?.type === "text" && String(part.text ?? "").trim()) return true;
+    if (part?.type === "image_url") {
+      const url = part?.image_url?.url;
+      return typeof url === "string" && url.trim().length > 0;
+    }
+    return false;
+  });
+}
+var LENGTH_TRUNCATED_REASONING_MARKER = "[length_truncated_reasoning_tail]";
+var STREAM_TRUNCATED_REASONING_MARKER = "[stream_truncated_reasoning_tail]";
+var MAX_TRUNCATED_REASONING_CHARS = 2e3;
+function formatReasoningTailWithMarker(reasoning_content, marker, maxChars) {
+  if (typeof reasoning_content !== "string") return null;
+  const trimmed = reasoning_content.trim();
+  if (trimmed.length === 0) return null;
+  const tail = trimmed.length > maxChars ? trimmed.slice(-maxChars) : trimmed;
+  return `[nolo] ${marker}
+${tail}`;
+}
+function formatLengthTruncatedReasoningTail(reasoning_content, maxChars = MAX_TRUNCATED_REASONING_CHARS) {
+  return formatReasoningTailWithMarker(reasoning_content, LENGTH_TRUNCATED_REASONING_MARKER, maxChars);
+}
+function formatStreamTruncatedReasoningTail(reasoning_content, maxChars = MAX_TRUNCATED_REASONING_CHARS) {
+  return formatReasoningTailWithMarker(reasoning_content, STREAM_TRUNCATED_REASONING_MARKER, maxChars);
+}
+function resolveTruncatedReasoningTailLog(reason, reasoning_content) {
+  if (reason === "length_truncated") {
+    return formatLengthTruncatedReasoningTail(reasoning_content);
+  }
+  if (reason === "stream_truncated") {
+    return formatStreamTruncatedReasoningTail(reasoning_content);
+  }
+  return null;
+}
+
 // packages/agent-runtime/autoExecutionProfiles.ts
 var createProfile = (input) => ({
   id: input.id,
@@ -156,6 +226,16 @@ export {
   DEFAULT_CONTEXT_WINDOW,
   getModelContextWindow,
   getModelInfo,
+  EMPTY_ASSISTANT_REPAIR_PROMPT,
+  EMPTY_ASSISTANT_FALLBACK_MESSAGE,
+  LENGTH_TRUNCATED_FALLBACK_MESSAGE,
+  STREAM_TRUNCATED_FALLBACK_MESSAGE,
+  REPETITION_LOOP_FALLBACK_MESSAGE,
+  STAGNANT_TOOL_CALLS_FALLBACK_MESSAGE,
+  resolveEmptyAssistantOutcome,
+  resolveEmptyAssistantFallbackMessage,
+  hasAssistantVisibleOutput,
+  resolveTruncatedReasoningTailLog,
   DEFAULT_AUTO_EXECUTION_PROFILE,
   resolveAutoExecutionProfile
 };

package/{chunk-2KO5QQFV.js → chunk-5IQX2XPA.js}

@@ -1,11 +1,11 @@
 import {
   TOOL_PACKS,
   buildCodeWorkDiscipline
-} from "./chunk-IIOHYLIG.js";
+} from "./chunk-LGUQHYAL.js";
 import {
   buildSkillDocMarkdown,
   resolvePageSkillMetadata
-} from "./chunk-AETZ7AD6.js";
+} from "./chunk-EY7V7REW.js";
 import {
   canonicalizeToolNames
 } from "./chunk-O6OSWFZQ.js";

package/{chunk-ARFXKWJH.js → chunk-5PFBRLJN.js}

@@ -1,22 +1,22 @@
 import {
   BUILTIN_SUMMARY_LLM_CONFIG
-} from "./chunk-RCFIB45Q.js";
+} from "./chunk-EVBFYPDC.js";
 import {
   buildDialogAttachmentPlan,
   extractFileContentIds
-} from "./chunk-JIADXJYU.js";
+} from "./chunk-H2G6JXTR.js";
 import {
   isOAuthApiKeyRef
 } from "./chunk-YYLHWIW6.js";
+import {
+  runLlm
+} from "./chunk-XOFZEJGM.js";
 import {
   getApproxPricePerImage
 } from "./chunk-AGGIDPCZ.js";
-import {
-  runLlm
-} from "./chunk-CVXDBLYH.js";
 import {
   cleanupCliSessionForDialog
-} from "./chunk-MGIHZ5CJ.js";
+} from "./chunk-HAPCUPEO.js";
 import {
   getActiveDialogAgentId,
   getDialogAgentIds,
@@ -43,10 +43,15 @@ import {
 import {
   DEFAULT_AUTO_EXECUTION_PROFILE,
   DEFAULT_CONTEXT_WINDOW,
+  EMPTY_ASSISTANT_FALLBACK_MESSAGE,
+  LENGTH_TRUNCATED_FALLBACK_MESSAGE,
+  REPETITION_LOOP_FALLBACK_MESSAGE,
+  STAGNANT_TOOL_CALLS_FALLBACK_MESSAGE,
+  STREAM_TRUNCATED_FALLBACK_MESSAGE,
   getModelContextWindow,
   getModelInfo,
   resolveAutoExecutionProfile
-} from "./chunk-WRP5TTM6.js";
+} from "./chunk-4MXGXSYN.js";
 import {
   COMPACTION_SUMMARY_SYSTEM_PROMPT,
   buildCompactionMetricsFromPlan,
@@ -58,26 +63,26 @@ import {
   normalizeAssistantContentBuffer,
   planCompression,
   serializeMessageContent
-} from "./chunk-FGLKRJDI.js";
+} from "./chunk-GK74OOFT.js";
 import {
   findModelConfig,
   getModelConfig
-} from "./chunk-C6ELZQ7H.js";
+} from "./chunk-OZVGA4SY.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
 import {
   fetchMessages
-} from "./chunk-WRN7L5CS.js";
+} from "./chunk-FA4SY4F5.js";
 import {
   getPlatformHostedDeepSeekV4Price,
   isPlatformHostedDeepSeekV4Model,
   isPlatformHostedImageModel,
   isPlatformHostedOpenAIImageModel
-} from "./chunk-X6EN3KJX.js";
+} from "./chunk-ENYDQKOB.js";
 import {
   nolotusId
-} from "./chunk-B6H5XCT2.js";
+} from "./chunk-EMEUU5IY.js";
 import {
   asRecordOrEmpty
 } from "./chunk-KX6YBIHG.js";
@@ -87,7 +92,7 @@ import {
   remove,
   selectById,
   write
-} from "./chunk-23KKIMD5.js";
+} from "./chunk-WVGEBWA6.js";
 import {
   buildDialogAgentListIndexDeleteOps,
   createDialogMessageKeyAndId,
@@ -98,13 +103,13 @@ import {
   isDialogRecordKey,
   isPageKey,
   isTableMetaKey
-} from "./chunk-2WKUUY2E.js";
-import {
-  asTrimmedNonEmptyStringArray
-} from "./chunk-I42VC5KR.js";
+} from "./chunk-SVEUG45B.js";
 import {
   asOptionalFiniteNumber
 } from "./chunk-WWC7I6TA.js";
+import {
+  asTrimmedNonEmptyStringArray
+} from "./chunk-I42VC5KR.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
@@ -112,7 +117,7 @@ import {
   builtinAgentCatalogEntryById,
   builtinRuntimeFallbackEntries,
   isBuiltinPlatformAgentKey
-} from "./chunk-XT73C4VH.js";
+} from "./chunk-Z5NW3O7V.js";
 import {
   extractCustomId,
   extractUserId,
@@ -1432,6 +1437,38 @@ var updateDialogSummaryAction = async (args, thunkApi) => {
   }
 };
 
+// packages/chat/messages/normalizeHistoricalReasoning.ts
+var HISTORICAL_REASONING_FALLBACK_MESSAGES = /* @__PURE__ */ new Set([
+  EMPTY_ASSISTANT_FALLBACK_MESSAGE,
+  LENGTH_TRUNCATED_FALLBACK_MESSAGE,
+  STREAM_TRUNCATED_FALLBACK_MESSAGE,
+  REPETITION_LOOP_FALLBACK_MESSAGE,
+  STAGNANT_TOOL_CALLS_FALLBACK_MESSAGE
+]);
+function normalizeHistoricalReasoningMessage(message) {
+  if (!message || typeof message !== "object") {
+    return message;
+  }
+  if (message.role !== "assistant") {
+    return message;
+  }
+  if (typeof message.thinkContent === "string" && message.thinkContent.trim().length > 0) {
+    return message;
+  }
+  const reasoning = message.reasoning_content;
+  if (typeof reasoning !== "string" || reasoning.trim().length === 0) {
+    return message;
+  }
+  const content = message.content;
+  if (typeof content !== "string" || !HISTORICAL_REASONING_FALLBACK_MESSAGES.has(content.trim())) {
+    return message;
+  }
+  return {
+    ...message,
+    thinkContent: reasoning
+  };
+}
+
 // packages/chat/messages/messageContract.ts
 function separateThinkContent(contentBuffer) {
   let thinkContent = "";
@@ -1907,16 +1944,27 @@ function resolveStreamEndBillingUsages(input) {
   const { agentConfig, totalUsage, finalVisibleContent } = input;
   const imageGenerationCount = countImageGenerationOutputsInContent(finalVisibleContent);
   const billedUsage = isOpenAIBuiltInImageGenerationAgent(agentConfig) ? withImageGenerationCount(totalUsage, imageGenerationCount) : totalUsage;
-  const estimatedUsage = estimateMissingUsage({
+  const rawEstimatedUsage = estimateMissingUsage({
     content: finalVisibleContent
   });
+  const providerCallId = typeof totalUsage === "object" && totalUsage !== null ? totalUsage.provider_call_id : void 0;
+  const estimatedUsage = providerCallId ? { ...rawEstimatedUsage, provider_call_id: providerCallId } : rawEstimatedUsage;
   const billedEstimatedUsage = isOpenAIBuiltInImageGenerationAgent(agentConfig) ? withImageGenerationCount(estimatedUsage, imageGenerationCount) : estimatedUsage;
   const titleEligibleContent = serializeMessageContent(finalVisibleContent, "[\u56FE\u7247]") ?? "";
+  const hasReportedTokens = Boolean(
+    totalUsage && typeof totalUsage === "object" && ([
+      "prompt_tokens",
+      "completion_tokens",
+      "total_tokens",
+      "input_tokens",
+      "output_tokens"
+    ].some((field) => Object.prototype.hasOwnProperty.call(totalUsage, field)) || Object.prototype.hasOwnProperty.call(totalUsage, "cost") && typeof totalUsage.cost === "number")
+  );
   return {
     imageGenerationCount,
     billedUsage,
     billedEstimatedUsage,
-    hasReportedUsage: Boolean(totalUsage),
+    hasReportedUsage: hasReportedTokens,
     titleEligible: titleEligibleContent.trim() !== ""
   };
 }
@@ -2474,8 +2522,8 @@ function resolveStreamEndFinalMetadata(input) {
 
 // packages/chat/messages/messageStreamEndPostWritePolicy.ts
 function resolveStreamEndPostWritePolicy(input) {
-  const { hasReportedUsage, agentProvider, titleEligible, textContent, toolCalls } = input;
-  const billingMode = hasReportedUsage ? "reported" : agentProvider && agentProvider !== "custom" ? "estimated" : "skip";
+  const { hasReportedUsage, billingFailed, skipBilling, agentProvider, titleEligible, textContent, toolCalls } = input;
+  const billingMode = billingFailed || skipBilling ? "skip" : hasReportedUsage ? "reported" : agentProvider && agentProvider !== "custom" ? "estimated" : "skip";
   const hasText = textContent.trim() !== "";
   const noTools = !toolCalls || toolCalls.length === 0;
   return {
@@ -2503,7 +2551,8 @@ async function dispatchStreamEndBilling(input) {
   } = input;
   try {
     if (billingMode === "reported") {
-      const usageRecords = billingUsageRecords?.length ? billingUsageRecords : [{ callId: void 0, usage: billedUsage }];
+      const fallbackCallId = typeof billedUsage?.provider_call_id === "string" && billedUsage.provider_call_id.trim() ? billedUsage.provider_call_id.trim() : void 0;
+      const usageRecords = billingUsageRecords?.length ? billingUsageRecords : [{ callId: fallbackCallId, usage: billedUsage }];
       for (const usageRecord of usageRecords) {
         await dispatch(
           updateTokensAction2({
@@ -2790,13 +2839,22 @@ var findDialogIdByMessageDbKey = (state, dbKey) => {
   return inferDialogIdFromDbKey(dbKey);
 };
 var upsertOneMessage = (dialogState, message) => {
-  dialogState.msgs = messagesAdapter.upsertOne(dialogState.msgs, message);
+  dialogState.msgs = messagesAdapter.upsertOne(
+    dialogState.msgs,
+    normalizeHistoricalReasoningMessage(message)
+  );
 };
 var upsertManyMessages = (dialogState, messages) => {
-  dialogState.msgs = messagesAdapter.upsertMany(dialogState.msgs, messages);
+  dialogState.msgs = messagesAdapter.upsertMany(
+    dialogState.msgs,
+    messages.map(normalizeHistoricalReasoningMessage)
+  );
 };
 var addOneMessage = (dialogState, message) => {
-  dialogState.msgs = messagesAdapter.addOne(dialogState.msgs, message);
+  dialogState.msgs = messagesAdapter.addOne(
+    dialogState.msgs,
+    normalizeHistoricalReasoningMessage(message)
+  );
 };
 var updateOneMessage = (dialogState, payload) => {
   dialogState.msgs = messagesAdapter.updateOne(dialogState.msgs, payload);
@@ -2811,7 +2869,10 @@ var removeAllMessages = (dialogState) => {
   dialogState.msgs = messagesAdapter.removeAll(dialogState.msgs);
 };
 var setAllMessages = (dialogState, messages) => {
-  dialogState.msgs = messagesAdapter.setAll(dialogState.msgs, messages);
+  dialogState.msgs = messagesAdapter.setAll(
+    dialogState.msgs,
+    messages.map(normalizeHistoricalReasoningMessage)
+  );
 };
 var messageActions;
 var messageSlice = createSliceWithThunks({
@@ -3231,7 +3292,9 @@ var messageSlice = createSliceWithThunks({
           messageId,
           reasoningBuffer,
           toolCalls,
-          finishReason
+          finishReason,
+          billingFailed,
+          skipBilling
         } = payload;
         const spaceId = payload.spaceId;
         const rawAgentName = asTrimmedString(agentConfig?.name);
@@ -3318,6 +3381,8 @@ var messageSlice = createSliceWithThunks({
           addRefs
         } = resolveStreamEndPostWritePolicy({
           hasReportedUsage,
+          billingFailed,
+          skipBilling,
           agentProvider: agentConfig?.provider,
           titleEligible,
           textContent,
@@ -3519,7 +3584,7 @@ var messageSlice = createSliceWithThunks({
             runtimeOptions: args.runtimeOptions
           });
           if (agentKeyToUse) {
-            const { streamAgentChatTurn } = await import("./agentSlice-LAILHBMM.js");
+            const { streamAgentChatTurn } = await import("./agentSlice-B5O3RTRP.js");
             await dispatch(
               streamAgentChatTurn({
                 agentKey: agentKeyToUse,
@@ -4088,12 +4153,13 @@ var normalizeUsage = (usage) => {
       output_tokens: 0,
       total_tokens: 0,
       cache_creation_input_tokens: 0,
-      cache_read_input_tokens: 0
+      cache_read_input_tokens: 0,
+      cost: 0
     };
   }
   const inputTokens = "input_tokens" in usage ? usage.input_tokens ?? 0 : "prompt_tokens" in usage ? usage.prompt_tokens : 0;
   const outputTokens = "output_tokens" in usage ? usage.output_tokens ?? 0 : "completion_tokens" in usage ? usage.completion_tokens : 0;
-  const cacheCreationInputTokens = "cache_creation_input_tokens" in usage ? usage.cache_creation_input_tokens ?? 0 : "prompt_cache_miss_tokens" in usage ? usage.prompt_cache_miss_tokens : 0;
+  const cacheCreationInputTokens = "cache_creation_input_tokens" in usage ? usage.cache_creation_input_tokens ?? 0 : "prompt_cache_miss_tokens" in usage ? usage.prompt_cache_miss_tokens ?? 0 : 0;
   const cacheReadInputTokens = finiteTokenCount(usage.cache_read_input_tokens) ?? finiteTokenCount(usage.prompt_cache_hit_tokens) ?? readNestedTokenCount(usage, ["input_tokens_details", "cached_tokens"]) ?? readNestedTokenCount(usage, ["prompt_tokens_details", "cached_tokens"]) ?? 0;
   let cost = 0;
   const providedCost = readFiniteNumberField(usage, "cost");
@@ -4120,6 +4186,7 @@ var normalizeUsage = (usage) => {
   return {
     input_tokens: inputTokens,
     output_tokens: outputTokens,
+    total_tokens: finiteTokenCount(usage.total_tokens) ?? inputTokens + outputTokens,
     cache_creation_input_tokens: cacheCreationInputTokens,
     cache_read_input_tokens: cacheReadInputTokens,
     cost,
@@ -4317,7 +4384,9 @@ function normalizeDayStats(prev, userId, timeKey) {
       models: {},
       providers: {},
       agents: {},
-      entryPaths: {}
+      entryPaths: {},
+      categories: {},
+      modelCategories: {}
     };
   }
   const normalizeMap = (m) => {
@@ -4326,13 +4395,37 @@ function normalizeDayStats(prev, userId, timeKey) {
     for (const [k, v] of Object.entries(m)) out[k] = normalizeStats(v);
     return out;
   };
+  const normalizedTotal = normalizeStats(prev.total);
+  const normalizedModels = normalizeMap(prev.models);
+  const normalizedProviders = normalizeMap(prev.providers);
+  const normalizedAgents = normalizeMap(prev.agents);
+  const normalizedEntryPaths = normalizeMap(prev.entryPaths);
+  let categories = normalizeMap(prev.categories);
+  let modelCategories = normalizeMap(prev.modelCategories);
+  const hasCategories = Object.keys(categories).length > 0;
+  const hasModelCategories = Object.keys(modelCategories).length > 0;
+  if (!hasCategories) {
+    const hasActivity = normalizedTotal.count > 0 || normalizedTotal.failedCount > 0 || normalizedTotal.cost > 0 || normalizedTotal.tokens.input > 0 || normalizedTotal.tokens.output > 0;
+    if (hasActivity) {
+      categories = { platform: { ...normalizedTotal } };
+    }
+  }
+  if (!hasModelCategories && Object.keys(normalizedModels).length > 0) {
+    const legacyModelCats = {};
+    for (const [modelKey, modelStat] of Object.entries(normalizedModels)) {
+      legacyModelCats[`${modelKey}:::platform`] = { ...modelStat };
+    }
+    modelCategories = legacyModelCats;
+  }
   return {
     ...prev,
-    total: normalizeStats(prev.total),
-    models: normalizeMap(prev.models),
-    providers: normalizeMap(prev.providers),
-    agents: normalizeMap(prev.agents),
-    entryPaths: normalizeMap(prev.entryPaths)
+    total: normalizedTotal,
+    models: normalizedModels,
+    providers: normalizedProviders,
+    agents: normalizedAgents,
+    entryPaths: normalizedEntryPaths,
+    categories,
+    modelCategories
   };
 }
 function applyTokenUsageToDayStats(prev, delta) {
@@ -4342,6 +4435,8 @@ function applyTokenUsageToDayStats(prev, delta) {
   const cacheRead = delta.cache_read_input_tokens ?? 0;
   const cacheCreation = delta.cache_creation_input_tokens ?? 0;
   const isFailed = delta.status === "failed";
+  const category = delta.billingCategory || "platform";
+  const modelCategoryKey = `${modelName}:::${category}`;
   const inc = (s) => {
     const n = normalizeStats(s);
     if (isFailed) {
@@ -4358,7 +4453,9 @@ function applyTokenUsageToDayStats(prev, delta) {
         cacheRead: n.tokens.cacheRead + cacheRead,
         cacheCreation: n.tokens.cacheCreation + cacheCreation
       },
-      cost: Number((n.cost + delta.cost).toFixed(6)),
+      // 非计费记录（订阅/OAuth/CLI，billable=false）不向平台积分统计贡献 cost：
+      // 订阅已付费、不按 token 计费，若不归零，图表「成本」视图会把订阅用量误显示为积分消耗。
+      cost: Number((n.cost + (category === "subscription" ? 0 : delta.cost)).toFixed(6)),
       failedCount: n.failedCount
     };
   };
@@ -4372,6 +4469,14 @@ function applyTokenUsageToDayStats(prev, delta) {
     providers: {
       ...base.providers,
       [providerName]: inc(base.providers[providerName])
+    },
+    categories: {
+      ...base.categories,
+      [category]: inc(base.categories?.[category])
+    },
+    modelCategories: {
+      ...base.modelCategories,
+      [modelCategoryKey]: inc(base.modelCategories?.[modelCategoryKey])
     }
   };
   if (delta.agentId !== void 0) {
@@ -4443,7 +4548,8 @@ var updateStats = async (data, existingStats, key, thunkApi) => {
       cache_read_input_tokens: data.cache_read_input_tokens,
       cache_creation_input_tokens: data.cache_creation_input_tokens,
       agentId: data.agentId ?? data.cybotId,
-      entry_path: data.entry_path
+      entry_path: data.entry_path,
+      billingCategory: data.billable ? "platform" : "subscription"
     });
     await thunkApi.dispatch(
       write({
@@ -4516,8 +4622,8 @@ var updateTokensAction = async ({ dialogId, dialogKey, usage: legacyUsage, usage
     currentAccountUserId: currentUser?.userId ?? null
   });
   const timestamp = Date.now();
-  const callId = typeof usageRecord?.callId === "string" && usageRecord.callId ? usageRecord.callId : void 0;
   const usageRaw = usageRecord?.usage ?? legacyUsage;
+  const callId = (typeof usageRecord?.callId === "string" && usageRecord.callId.trim() ? usageRecord.callId.trim() : void 0) ?? (typeof usageRaw?.provider_call_id === "string" && usageRaw.provider_call_id.trim() ? usageRaw.provider_call_id.trim() : void 0);
   const usageWithStableCallId = callId && !usageRaw?.provider_call_id ? { ...usageRaw, provider_call_id: callId } : usageRaw;
   const callAgentConfig = {
     ...agentConfig,
@@ -4742,7 +4848,7 @@ var deleteDialogThunk = async (payload, thunkApi) => {
   }
   if (isCurrentDialog) {
     await thunkApi.dispatch(resetMsgs());
-    const { clearPendingAttachments: clearPendingAttachments2 } = await import("./dialogSlice-YJV3AVFM.js");
+    const { clearPendingAttachments: clearPendingAttachments2 } = await import("./dialogSlice-YHGPDBAZ.js");
     dispatch(clearPendingAttachments2());
   }
   return { dialogKey, isCurrentDialog, attachmentPlan };
@@ -4750,39 +4856,39 @@ var deleteDialogThunk = async (payload, thunkApi) => {
 
 // packages/chat/dialog/dialogSlice.ts
 var runCreateDialogAction = async (args, thunkApi) => {
-  const { createDialogAction } = await import("./createDialogAction-H75NDXYH.js");
+  const { createDialogAction } = await import("./createDialogAction-EOQFCM3K.js");
   return createDialogAction(args, thunkApi);
 };
 var runCreateAgentAutomationAction = async (args, thunkApi) => {
-  const { createAgentAutomationAction } = await import("./createAgentAutomationAction-767ZITQJ.js");
+  const { createAgentAutomationAction } = await import("./createAgentAutomationAction-TQ7PYONU.js");
   return createAgentAutomationAction(args, thunkApi);
 };
 var runUpdateDialogTitleAction = async (args, thunkApi) => {
-  const { updateDialogTitleAction } = await import("./updateDialogTitleAction-OTYEQJAK.js");
+  const { updateDialogTitleAction } = await import("./updateDialogTitleAction-XAGMXHW5.js");
   return updateDialogTitleAction(args, thunkApi);
 };
 var runAddDialogAgentAction = async (args, thunkApi) => {
-  const { addDialogAgentAction } = await import("./addDialogAgentAction-ILSDCMYL.js");
+  const { addDialogAgentAction } = await import("./addDialogAgentAction-W3JGU4F7.js");
   return addDialogAgentAction(args, thunkApi);
 };
 var runRemoveDialogAgentAction = async (args, thunkApi) => {
-  const { removeDialogAgentAction } = await import("./removeDialogAgentAction-KG5WMJRZ.js");
+  const { removeDialogAgentAction } = await import("./removeDialogAgentAction-DNONRKST.js");
   return removeDialogAgentAction(args, thunkApi);
 };
 var runSetPrimaryDialogAgentAction = async (args, thunkApi) => {
-  const { setPrimaryDialogAgentAction } = await import("./setPrimaryDialogAgentAction-FYYUY7PB.js");
+  const { setPrimaryDialogAgentAction } = await import("./setPrimaryDialogAgentAction-6C2HYNEC.js");
   return setPrimaryDialogAgentAction(args, thunkApi);
 };
 var runSwitchDialogAgentAction = async (args, thunkApi) => {
-  const { switchDialogAgentAction } = await import("./switchDialogAgentAction-GH5P6Q3Z.js");
+  const { switchDialogAgentAction } = await import("./switchDialogAgentAction-HP57XYFP.js");
   return switchDialogAgentAction(args, thunkApi);
 };
 var runSetDialogExtraReferencesAction = async (args, thunkApi) => {
-  const { setDialogExtraReferencesAction } = await import("./setDialogExtraReferencesAction-O2NLXMSM.js");
+  const { setDialogExtraReferencesAction } = await import("./setDialogExtraReferencesAction-ERHUPT3F.js");
   return setDialogExtraReferencesAction(args, thunkApi);
 };
 var runHandleSendMessageAction = async (args, thunkApi) => {
-  const { handleSendMessageAction } = await import("./handleSendMessageAction-DGL6H4E4.js");
+  const { handleSendMessageAction } = await import("./handleSendMessageAction-WT4FDMQS.js");
   return handleSendMessageAction(args, thunkApi);
 };
 function clearDialogState() {
@@ -4795,7 +4901,7 @@ var createPageAndAddReference = createAsyncThunk(
   async (payload, { dispatch, getState, rejectWithValue }) => {
     const { slateData, jsonData, title, type, fileId, groupId, dialogKey } = payload;
     try {
-      const { createDocState } = await import("./docStore-JOODSWDW.js");
+      const { createDocState } = await import("./docStore-WIKRGVQJ.js");
       const pageKey = await createDocState(
         { slateData, title },
         { dispatch, getState }

package/{chunk-W445DPVT.js → chunk-5QRCPERU.js}

@@ -1,7 +1,7 @@
 import {
   generatePkcePair,
   startCallbackServer
-} from "./chunk-IZNJDUJ4.js";
+} from "./chunk-I4JISVWK.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";