nolo-cli 0.32.0 → 0.33.0-alpha.2

package/{chunk-3GZT3L6F.js → chunk-73GINUCW.js}

@@ -1,22 +1,22 @@
 import {
-  BUILTIN_SUMMARY_LLM_CONFIG,
-  COMPACTION_SUMMARY_SYSTEM_PROMPT,
-  buildCompactionMetricsFromPlan,
-  buildCompactionUserContent,
-  estimateTokenCount,
-  formatCompactionMetricsLog,
-  formatFileOperationsFromMessages,
-  formatMessagesForSummaryWithTruncation,
-  normalizeAssistantContentBuffer,
-  planCompression,
-  serializeMessageContent
-} from "./chunk-BGTUGS3T.js";
+  BUILTIN_SUMMARY_LLM_CONFIG
+} from "./chunk-RCFIB45Q.js";
 import {
-  cleanupCliSessionForDialog
-} from "./chunk-ATK5WJOA.js";
+  buildDialogAttachmentPlan,
+  extractFileContentIds
+} from "./chunk-EGRJC4ZN.js";
+import {
+  isOAuthApiKeyRef
+} from "./chunk-YYLHWIW6.js";
+import {
+  getApproxPricePerImage
+} from "./chunk-CWMSB67P.js";
 import {
   runLlm
-} from "./chunk-ODS2MVMU.js";
+} from "./chunk-ZJMME4DS.js";
+import {
+  cleanupCliSessionForDialog
+} from "./chunk-JZ5AMMXU.js";
 import {
   getActiveDialogAgentId,
   getDialogAgentIds,
@@ -26,8 +26,32 @@ import {
   require_date_fns
 } from "./chunk-M76ECQRD.js";
 import {
-  toErrorMessage
-} from "./chunk-HNMXYYJR.js";
+  fetchMessages
+} from "./chunk-KSRFVP36.js";
+import {
+  DEFAULT_AUTO_EXECUTION_PROFILE,
+  DEFAULT_CONTEXT_WINDOW,
+  getModelContextWindow,
+  getModelInfo,
+  resolveAutoExecutionProfile,
+  resolveBuiltinPlatformAgentRecord
+} from "./chunk-2H3XIBY4.js";
+import {
+  COMPACTION_SUMMARY_SYSTEM_PROMPT,
+  buildCompactionMetricsFromPlan,
+  buildCompactionUserContent,
+  estimateTokenCount,
+  formatCompactionMetricsLog,
+  formatFileOperationsFromMessages,
+  formatMessagesForSummaryWithTruncation,
+  normalizeAssistantContentBuffer,
+  planCompression,
+  serializeMessageContent
+} from "./chunk-AOXVOC6D.js";
+import {
+  findModelConfig,
+  getModelConfig
+} from "./chunk-DFUPZE6V.js";
 import {
   abortActiveControllers,
   addPageReferenceToRuntime,
@@ -42,25 +66,17 @@ import {
   selectCurrentDialogKey,
   setActiveDialogKey,
   setDialogConfigError
-} from "./chunk-3ASDTTEI.js";
+} from "./chunk-MRWGHF56.js";
 import {
-  ALL_MODELS
-} from "./chunk-WTGCTVJG.js";
-import {
-  getApproxPricePerImage
-} from "./chunk-CWMSB67P.js";
-import {
-  MODEL_LOOKUP_MAP,
-  findModelConfig,
-  getModelConfig
-} from "./chunk-2K4NDPT5.js";
+  toErrorMessage
+} from "./chunk-HNMXYYJR.js";
 import {
   getPlatformHostedDeepSeekV4Price,
   isPlatformHostedDeepSeekV4Model
-} from "./chunk-CAENRKNJ.js";
+} from "./chunk-OR2HNLVO.js";
 import {
   nolotusId
-} from "./chunk-G5GVZAXF.js";
+} from "./chunk-CLP2K7U4.js";
 import {
   asRecordOrEmpty
 } from "./chunk-KX6YBIHG.js";
@@ -70,19 +86,27 @@ import {
   remove,
   selectById,
   write
-} from "./chunk-LAXMH7JY.js";
+} from "./chunk-57QJXIB6.js";
 import {
-  asTrimmedLowercaseString
-} from "./chunk-QSJ3HFEF.js";
+  buildDialogAgentListIndexDeleteOps,
+  createDialogMessageKeyAndId,
+  createKey,
+  createTokenKey,
+  createTokenStatsKey,
+  dialogMessageKey,
+  isDialogRecordKey,
+  isPageKey,
+  isTableMetaKey
+} from "./chunk-KMSZPTM6.js";
 import {
-  PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY,
-  builtinRuntimeFallbackEntries
-} from "./chunk-ZJH3LKEW.js";
+  asOptionalFiniteNumber
+} from "./chunk-WWC7I6TA.js";
 import {
-  extractCustomId,
-  extractUserId,
-  publicAgentKey
-} from "./chunk-TOW4E763.js";
+  asTrimmedNonEmptyStringArray
+} from "./chunk-I42VC5KR.js";
+import {
+  asTrimmedLowercaseString
+} from "./chunk-QSJ3HFEF.js";
 import {
   asyncThunkCreator,
   buildCreateSlice,
@@ -93,28 +117,11 @@ import {
   parseOwnerUserIdFromDbKey,
   scheduleDeleteReplication,
   selectIdentityUserId
-} from "./chunk-2IJAKBK2.js";
+} from "./chunk-X664KVEV.js";
 import {
   createClientLogger,
   isAbortError
-} from "./chunk-5RDLGLAP.js";
-import {
-  fetchMessages
-} from "./chunk-L3GCUVOH.js";
-import {
-  buildDialogAgentListIndexDeleteOps,
-  createDialogMessageKeyAndId,
-  createKey,
-  createTokenKey,
-  createTokenStatsKey,
-  dialogMessageKey,
-  isDialogRecordKey,
-  isPageKey,
-  isTableMetaKey
-} from "./chunk-WHLVPK32.js";
-import {
-  asOptionalFiniteNumber
-} from "./chunk-WWC7I6TA.js";
+} from "./chunk-WJSW43QZ.js";
 import {
   isTombstoneRecord,
   shouldReplaceWithNextRecord
@@ -122,12 +129,13 @@ import {
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
+import {
+  extractCustomId,
+  extractUserId
+} from "./chunk-BJIRLHJR.js";
 import {
   isRecord
 } from "./chunk-KUG52IAP.js";
-import {
-  asTrimmedNonEmptyStringArray
-} from "./chunk-I42VC5KR.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
@@ -1224,112 +1232,6 @@ var fetchAndCacheMessages = async (options) => {
   return remotePromise;
 };
 
-// packages/ai/llm/getModelContextWindow.ts
-var DEFAULT_CONTEXT_WINDOW = 256e3;
-var QWEN_3_6_CONTEXT_WINDOW = 262144;
-var GLM_5_2_CONTEXT_WINDOW = 1e6;
-var ANTIGRAVITY_EFFORT_SUFFIXES = [
-  "-tiered",
-  "-extra-low",
-  "-low",
-  "-medium",
-  "-high"
-];
-function stripEffortSuffix(model) {
-  for (const suffix of ANTIGRAVITY_EFFORT_SUFFIXES) {
-    if (model.endsWith(suffix) && model.length > suffix.length) {
-      return model.slice(0, -suffix.length);
-    }
-  }
-  return model;
-}
-function stripPreviewSuffix(model) {
-  const suffix = "-preview";
-  if (model.endsWith(suffix) && model.length > suffix.length) {
-    return model.slice(0, -suffix.length);
-  }
-  return model;
-}
-var fullModelMap = null;
-var getFullModelMap = () => {
-  if (!fullModelMap) {
-    fullModelMap = /* @__PURE__ */ new Map();
-    for (const [provider, models] of Object.entries(MODEL_LOOKUP_MAP)) {
-      for (const model of models) {
-        const entry = { ...model, provider };
-        fullModelMap.set(model.name, entry);
-        if (model.displayName) {
-          fullModelMap.set(model.displayName.toLowerCase(), entry);
-        }
-      }
-    }
-  }
-  return fullModelMap;
-};
-var legacyModelMap = null;
-var getLegacyModelMap = () => {
-  if (!legacyModelMap) {
-    legacyModelMap = /* @__PURE__ */ new Map();
-    for (const model of ALL_MODELS) {
-      legacyModelMap.set(model.name, model);
-      if (model.displayName) {
-        legacyModelMap.set(model.displayName.toLowerCase(), model);
-      }
-    }
-  }
-  return legacyModelMap;
-};
-function fuzzyContextWindow(normalizedName) {
-  if (normalizedName.includes("qwen-long") || normalizedName.includes("qwen3-long")) return 10485760;
-  if (normalizedName.includes("qwen-coder") || normalizedName.includes("qwen3-coder")) return 1048576;
-  if (normalizedName.includes("qwen3.8") || normalizedName.includes("qwen3p8")) return 1e6;
-  if (normalizedName.includes("minimax-m3") || normalizedName.includes("minimax_m3")) return 1e6;
-  if (normalizedName.includes("glm-5.2") || normalizedName.includes("glm5.2")) return GLM_5_2_CONTEXT_WINDOW;
-  if (normalizedName.includes("deepseek")) return 1e6;
-  if (normalizedName.includes("gpt-5") || normalizedName.includes("gpt-4.1")) return 1047576;
-  if (normalizedName.startsWith("cursor-grok-4.5")) return 1e6;
-  if (normalizedName.includes("claude-4.6")) return 1e6;
-  if (normalizedName.includes("gemini-3.1")) return 1e6;
-  if (normalizedName.includes("gemini")) return 1048576;
-  if (normalizedName.includes("qwen3.6") || normalizedName.includes("qwen3p6")) return QWEN_3_6_CONTEXT_WINDOW;
-  if (normalizedName.includes("qwen3.7") || normalizedName.includes("qwen3p7")) return 262144;
-  if (normalizedName.includes("minimax-m2") || normalizedName.includes("minimax_m2")) return 262144;
-  if (normalizedName.includes("claude")) return 2e5;
-  return void 0;
-}
-var getModelContextWindow = (modelName) => {
-  if (!modelName) return DEFAULT_CONTEXT_WINDOW;
-  const normalizedName = modelName.toLowerCase();
-  const map = getFullModelMap();
-  const candidates = [modelName, normalizedName];
-  const strippedEffort = stripEffortSuffix(modelName);
-  if (strippedEffort !== modelName) {
-    candidates.push(strippedEffort, strippedEffort.toLowerCase());
-  }
-  const strippedPreview = stripPreviewSuffix(modelName);
-  if (strippedPreview !== modelName) {
-    candidates.push(strippedPreview, strippedPreview.toLowerCase());
-  }
-  if (strippedEffort !== modelName) {
-    const strippedBoth = stripPreviewSuffix(strippedEffort);
-    if (strippedBoth !== strippedEffort) {
-      candidates.push(strippedBoth, strippedBoth.toLowerCase());
-    }
-  }
-  for (const candidate of candidates) {
-    const model = map.get(candidate);
-    if (model?.contextWindow) {
-      return typeof model.contextWindow === "number" ? model.contextWindow : DEFAULT_CONTEXT_WINDOW;
-    }
-  }
-  return fuzzyContextWindow(normalizedName) ?? DEFAULT_CONTEXT_WINDOW;
-};
-var getModelInfo = (modelName) => {
-  if (!modelName) return null;
-  const map = getLegacyModelMap();
-  return map.get(modelName) || map.get(modelName.toLowerCase()) || null;
-};
-
 // packages/chat/messages/parseJsonRecord.ts
 function asOptionalJsonRecord(value) {
   if (typeof value === "string") {
@@ -1741,84 +1643,6 @@ var buildPersonalizationDialogPolicyContext = () => [
   "\u9664\u975E\u7528\u6237\u660E\u786E\u8981\u6C42\uFF0C\u5426\u5219\u4E0D\u8981\u521B\u5EFA\u6587\u6863\uFF0C\u4E0D\u8981\u521B\u5EFA\u6216\u4FEE\u6539\u4EFB\u4F55 agent\u3002"
 ].join("\n");
 
-// packages/agent-runtime/autoExecutionProfiles.ts
-var createProfile = (input) => ({
-  id: input.id,
-  tier: input.tier,
-  legacyAgentKey: input.legacyAgentKey,
-  key: input.legacyAgentKey,
-  name: input.name,
-  provider: "nolo",
-  model: input.model,
-  apiSource: "platform",
-  useServerProxy: true,
-  rawRecord: {
-    dbKey: input.legacyAgentKey,
-    isPublic: true,
-    provider: "nolo",
-    model: input.model,
-    apiSource: "platform",
-    useServerProxy: true
-  }
-});
-var FLASH_PROFILE = createProfile({
-  id: "builtin:auto:deepseek-v4-flash",
-  tier: "flash",
-  legacyAgentKey: PUBLIC_DEEPSEEK_V4_FLASH_AGENT_KEY,
-  name: "DeepSeek V4 Flash",
-  model: "deepseek-v4-flash"
-});
-var AUTO_EXECUTION_PROFILES = {
-  flash: FLASH_PROFILE,
-  balanced: { ...FLASH_PROFILE, tier: "balanced" },
-  quality: { ...FLASH_PROFILE, tier: "quality" },
-  image: { ...FLASH_PROFILE, tier: "image" }
-};
-var DEFAULT_AUTO_EXECUTION_TIER = "flash";
-var DEFAULT_AUTO_EXECUTION_PROFILE = AUTO_EXECUTION_PROFILES[DEFAULT_AUTO_EXECUTION_TIER];
-var resolveAutoExecutionProfile = (tier) => AUTO_EXECUTION_PROFILES[tier ?? DEFAULT_AUTO_EXECUTION_TIER] ?? DEFAULT_AUTO_EXECUTION_PROFILE;
-
-// packages/agent-runtime/builtinPlatformAgentConfigs.ts
-function buildConfig(e) {
-  const key = publicAgentKey(e.id);
-  const rawRecord = {
-    dbKey: key,
-    isPublic: true,
-    provider: e.provider,
-    model: e.model,
-    apiSource: e.apiSource ?? "platform",
-    useServerProxy: e.useServerProxy ?? true
-  };
-  if (e.hasImageOutput) rawRecord.hasImageOutput = true;
-  if (e.imageModel) rawRecord.imageModel = e.imageModel;
-  if (e.imageWorkflow) rawRecord.imageWorkflow = e.imageWorkflow;
-  if (e.imageConfig) rawRecord.imageConfig = e.imageConfig;
-  return {
-    key,
-    name: e.name,
-    provider: e.provider,
-    model: e.model,
-    apiSource: e.apiSource ?? "platform",
-    useServerProxy: e.useServerProxy ?? true,
-    rawRecord
-  };
-}
-var BUILTIN_PLATFORM_AGENT_CONFIGS = Object.fromEntries(
-  builtinRuntimeFallbackEntries().map((e) => [publicAgentKey(e.id), buildConfig(e)])
-);
-function resolveBuiltinPlatformAgentConfig(agentRef) {
-  return BUILTIN_PLATFORM_AGENT_CONFIGS[agentRef] ?? null;
-}
-function resolveBuiltinPlatformAgentRecord(agentRef) {
-  const config = resolveBuiltinPlatformAgentConfig(agentRef);
-  if (!config) return null;
-  return {
-    ...config.rawRecord,
-    dbKey: agentRef,
-    ...config.name ? { name: config.name } : {}
-  };
-}
-
 // packages/chat/dialog/dialogAgentPolicy.ts
 var resolveDialogAgentMode = (dialog) => {
   if (dialog?.agentMode === "auto") return "auto";
@@ -1882,13 +1706,13 @@ function assemblePersistedUserMessage(input) {
     dialogKey,
     currentAccountUserId
   });
-  const { key: messageDbKey2, messageId } = createDialogMessageKeyAndId(
+  const { key: messageDbKey, messageId } = createDialogMessageKeyAndId(
     dialogId
   );
   const fullMessage = {
     ...message,
     id: messageId,
-    dbKey: messageDbKey2,
+    dbKey: messageDbKey,
     userId
   };
   return { fullMessage, dialogId, dialogKey };
@@ -2589,6 +2413,60 @@ function resolveStreamEndPostWritePolicy(input) {
   };
 }
 
+// packages/chat/messages/messageStreamEndBillingDispatch.ts
+async function dispatchStreamEndBilling(input) {
+  const {
+    dispatch,
+    updateTokensAction: updateTokensAction2,
+    billingMode,
+    billingUsageRecords,
+    billedUsage,
+    billedEstimatedUsage,
+    dialogId,
+    dialogKey,
+    agentConfig
+  } = input;
+  try {
+    if (billingMode === "reported") {
+      const usageRecords = billingUsageRecords?.length ? billingUsageRecords : [{ callId: void 0, usage: billedUsage }];
+      for (const usageRecord of usageRecords) {
+        await dispatch(
+          updateTokensAction2({
+            dialogId,
+            dialogKey,
+            usageRecord,
+            agentConfig
+          })
+        ).unwrap();
+      }
+    } else if (billingMode === "estimated") {
+      await dispatch(
+        updateTokensAction2({
+          dialogId,
+          dialogKey,
+          usage: billedEstimatedUsage,
+          agentConfig
+        })
+      ).unwrap();
+      console.warn(
+        "[billing] Missing usage at messageStreamEnd; using estimated token update",
+        {
+          dialogId,
+          dialogKey,
+          provider: agentConfig.provider,
+          model: agentConfig.model,
+          endpointKey: agentConfig.endpointKey
+        }
+      );
+    }
+  } catch (billingError) {
+    console.error(
+      "[billing] updateTokens failed (best-effort, message already saved):",
+      billingError
+    );
+  }
+}
+
 // packages/chat/messages/messageStreamEndPersistPrep.ts
 function prepareStreamEndPersistInputs(input) {
   const { totalUsage, agentConfig, messageMetadata } = input;
@@ -3370,35 +3248,17 @@ var messageSlice = createSliceWithThunks({
           textContent,
           toolCalls
         });
-        if (billingMode === "reported") {
-          const usageRecords = billingUsageRecords?.length ? billingUsageRecords : [{ callId: void 0, usage: billedUsage }];
-          for (const usageRecord of usageRecords) {
-            await dispatch(
-              updateTokens({
-                dialogId,
-                dialogKey,
-                usageRecord,
-                agentConfig
-              })
-            ).unwrap();
-          }
-        } else if (billingMode === "estimated") {
-          await dispatch(
-            updateTokens({
-              dialogId,
-              dialogKey,
-              usage: billedEstimatedUsage,
-              agentConfig
-            })
-          ).unwrap();
-          console.warn("[billing] Missing usage at messageStreamEnd; using estimated token update", {
-            dialogId,
-            dialogKey,
-            provider: agentConfig.provider,
-            model: agentConfig.model,
-            endpointKey: agentConfig.endpointKey
-          });
-        }
+        await dispatchStreamEndBilling({
+          dispatch,
+          updateTokensAction: updateTokens,
+          billingMode,
+          billingUsageRecords,
+          billedUsage,
+          billedEstimatedUsage,
+          dialogId,
+          dialogKey,
+          agentConfig
+        });
         if (updateTitle) {
           dispatch(updateDialogTitle({ dialogKey, agentConfig }));
         }
@@ -3584,7 +3444,7 @@ var messageSlice = createSliceWithThunks({
             runtimeOptions: args.runtimeOptions
           });
           if (agentKeyToUse) {
-            const { streamAgentChatTurn } = await import("./agentSlice-4XWW344Y.js");
+            const { streamAgentChatTurn } = await import("./agentSlice-TNMFQQOV.js");
             await dispatch(
               streamAgentChatTurn({
                 agentKey: agentKeyToUse,
@@ -3977,7 +3837,7 @@ var calculateOpenRouterFallbackCost = (resolvedPrice, usage, externalPrice) => {
   }
   return calculateSimpleCost(resolvedPrice, usage, externalPrice);
 };
-var API_REPORTED_COST_MULTIPLIER = 7;
+var API_REPORTED_COST_MULTIPLIER = 8;
 var zeroCostBreakdown = () => ({
   regular: 0,
   charge: 0,
@@ -4027,8 +3887,10 @@ var calculateBasicCost = (model, usage, provider, externalPrice, billingServiceT
     case "deepinfra":
       return calculateCacheBasedCost(resolvedPrice, usage, externalPrice);
     // nolo/crof: honor inputCacheHit only when the model defines it (K3 has
-    // inputCacheHit=2). Models without it (e.g. K2.6) keep simple full-price
-    // billing so cached tokens are not priced at 0.
+    // inputCacheHit=2, K2.6 has 0.32 from its OpenRouter upstream). Models
+    // without it keep simple full-price billing so cached tokens are not
+    // priced at 0 — but a platform-hosted model用于 agentic 循环时必须补上
+    // 这一项，否则每轮重放的上下文会被按 input 原价重复计费。
     case "nolo":
     case "crof":
       return typeof resolvedPrice.inputCacheHit === "number" ? calculateCacheBasedCost(resolvedPrice, usage, externalPrice) : calculateSimpleCost(resolvedPrice, usage, externalPrice);
@@ -4265,47 +4127,42 @@ var resolveBillingTarget = ({
   };
 };
 
-// packages/agent-runtime/serverProxyPolicy.ts
-var OAUTH_APIKEY_REFS = /* @__PURE__ */ new Set([
-  "antigravity",
-  "xai",
-  "chatgpt",
-  "claude",
-  "cursor"
-]);
-function isGoogleFamilyProvider(provider) {
-  const normalized = asTrimmedLowercaseString(provider);
-  return normalized === "google" || normalized.startsWith("google-");
-}
-function isOAuthApiKeyRef(value) {
-  const ref = asTrimmedLowercaseString(value);
-  return ref.length > 0 && OAUTH_APIKEY_REFS.has(ref);
-}
-function shouldUseServerProxy(agentConfig, requestProvider) {
-  const effectiveProvider = (requestProvider || agentConfig.provider || "").toLowerCase();
-  if (isGoogleFamilyProvider(effectiveProvider)) {
-    return true;
-  }
-  if (isOAuthApiKeyRef(agentConfig.apiKeyRef)) {
-    return true;
-  }
-  if (agentConfig.apiSource === "custom" && isRemoteCustomEndpoint(agentConfig.customProviderUrl)) {
-    return true;
-  }
-  return !!agentConfig.useServerProxy;
-}
-var LOCAL_HOSTS = /* @__PURE__ */ new Set(["127.0.0.1", "localhost", "::1", "0.0.0.0"]);
-function isRemoteCustomEndpoint(url) {
-  if (typeof url !== "string") return false;
-  try {
-    const host = new URL(url).hostname.toLowerCase();
-    return !LOCAL_HOSTS.has(host);
-  } catch {
-    return false;
-  }
-}
-
 // packages/ai/token/prepareTokenUsageData.ts
+function resolveTokenUsagePricing(args) {
+  const { rawUsage, agentConfig, nowMs } = args;
+  const usage = normalizeUsage(rawUsage);
+  const billingTarget = resolveBillingTarget({
+    usage,
+    fallbackProvider: agentConfig.provider,
+    fallbackModel: agentConfig.model
+  });
+  const billedProvider = billingTarget.provider;
+  const billedModel = billingTarget.model;
+  const billedServiceTier = billingTarget.serviceTier;
+  const hasExternalPrice = agentConfig.inputPrice !== void 0 && agentConfig.inputPrice > 0 || agentConfig.outputPrice !== void 0 && agentConfig.outputPrice > 0;
+  const { cost, pay } = calculatePrice({
+    provider: billedProvider,
+    modelName: billedModel,
+    billingServiceTier: billedServiceTier,
+    usage,
+    externalPrice: hasExternalPrice ? {
+      input: agentConfig.inputPrice ?? 0,
+      output: agentConfig.outputPrice ?? 0,
+      creatorId: agentConfig.userId ?? (agentConfig.id ? extractUserId(agentConfig.id) : "")
+    } : void 0,
+    sharingLevel: agentConfig.sharingLevel,
+    nowMs
+  });
+  return {
+    usage,
+    billedProvider,
+    billedModel,
+    billedServiceTier,
+    cost,
+    pay,
+    hasExternalPrice
+  };
+}
 function resolveBillable(input) {
   const uid = input.userId?.trim();
   if (!uid || uid === "local") return false;
@@ -4318,6 +4175,18 @@ function resolveBillable(input) {
   if (apiSource == null || apiSource === "") return true;
   return false;
 }
+function resolveBillableForAgent(input) {
+  const { usage, cost, userId, agentConfig } = input;
+  const hasExternalPrice = input.hasExternalPrice ?? (agentConfig.inputPrice !== void 0 && agentConfig.inputPrice > 0 || agentConfig.outputPrice !== void 0 && agentConfig.outputPrice > 0);
+  return resolveBillable({
+    usage,
+    userId,
+    apiSource: agentConfig.apiSource,
+    apiKeyRef: agentConfig.apiKeyRef,
+    cost,
+    hasExternalPrice
+  });
+}
 var prepareTokenUsageData = ({
   rawUsage,
   agentConfig,
@@ -4337,36 +4206,17 @@ var prepareTokenUsageData = ({
       "prepareTokenUsageData requires a non-empty agentId or cybotId"
     );
   }
-  const usage = normalizeUsage(rawUsage);
-  const billingTarget = resolveBillingTarget({
-    usage,
-    fallbackProvider: agentConfig.provider,
-    fallbackModel: agentConfig.model
-  });
-  const billedProvider = billingTarget.provider;
-  const billedModel = billingTarget.model;
-  const billedServiceTier = billingTarget.serviceTier;
-  const recordProvider = billedProvider ?? agentConfig.provider ?? "unknown";
-  const hasExternalPrice = agentConfig.inputPrice !== void 0 && agentConfig.inputPrice > 0 || agentConfig.outputPrice !== void 0 && agentConfig.outputPrice > 0;
-  const { cost, pay } = calculatePrice({
-    provider: billedProvider,
-    modelName: billedModel,
-    billingServiceTier: billedServiceTier,
-    usage,
-    externalPrice: hasExternalPrice ? {
-      input: agentConfig.inputPrice ?? 0,
-      output: agentConfig.outputPrice ?? 0,
-      creatorId: agentConfig.userId ?? (agentConfig.id ? extractUserId(agentConfig.id) : "")
-    } : void 0,
-    sharingLevel: agentConfig.sharingLevel,
+  const { usage, billedProvider, billedModel, billedServiceTier, cost, pay, hasExternalPrice } = resolveTokenUsagePricing({
+    rawUsage,
+    agentConfig,
     nowMs: timestamp
   });
-  const billable = resolveBillable({
+  const recordProvider = billedProvider ?? agentConfig.provider ?? "unknown";
+  const billable = resolveBillableForAgent({
     usage,
-    userId,
-    apiSource: agentConfig.apiSource,
-    apiKeyRef: agentConfig.apiKeyRef,
     cost,
+    userId,
+    agentConfig,
     hasExternalPrice
   });
   return {
@@ -4397,27 +4247,83 @@ var prepareTokenUsageData = ({
 };
 
 // packages/ai/token/applyTokenUsageToDayStats.ts
-var ZERO_STATS = { count: 0, tokens: { input: 0, output: 0 }, cost: 0 };
-function applyTokenUsageToDayStats(prev, delta) {
-  const base = prev ?? {
-    userId: delta.userId,
-    period: "day",
-    timeKey: delta.timeKey,
-    total: { ...ZERO_STATS },
-    models: {},
-    providers: {}
-  };
-  const modelName = delta.model || "unknown";
-  const providerName = delta.provider || "unknown";
-  const inc = (s) => ({
-    count: (s?.count ?? 0) + 1,
+var ZERO_STATS = {
+  count: 0,
+  tokens: { input: 0, output: 0, cacheRead: 0, cacheCreation: 0 },
+  cost: 0,
+  failedCount: 0
+};
+function normalizeStats(s) {
+  if (!s) return { ...ZERO_STATS };
+  const t = s.tokens;
+  return {
+    count: s.count ?? 0,
     tokens: {
-      input: (s?.tokens.input ?? 0) + delta.input_tokens,
-      output: (s?.tokens.output ?? 0) + delta.output_tokens
+      input: t?.input ?? 0,
+      output: t?.output ?? 0,
+      cacheRead: t?.cacheRead ?? t?.cache_read ?? 0,
+      cacheCreation: t?.cacheCreation ?? t?.cache_creation ?? 0
     },
-    cost: Number(((s?.cost ?? 0) + delta.cost).toFixed(6))
-  });
+    cost: s.cost ?? 0,
+    failedCount: s.failedCount ?? 0
+  };
+}
+function normalizeDayStats(prev, userId, timeKey) {
+  if (!prev) {
+    return {
+      userId,
+      period: "day",
+      timeKey,
+      total: { ...ZERO_STATS },
+      models: {},
+      providers: {},
+      agents: {},
+      entryPaths: {}
+    };
+  }
+  const normalizeMap = (m) => {
+    if (!m) return {};
+    const out = {};
+    for (const [k, v] of Object.entries(m)) out[k] = normalizeStats(v);
+    return out;
+  };
   return {
+    ...prev,
+    total: normalizeStats(prev.total),
+    models: normalizeMap(prev.models),
+    providers: normalizeMap(prev.providers),
+    agents: normalizeMap(prev.agents),
+    entryPaths: normalizeMap(prev.entryPaths)
+  };
+}
+function applyTokenUsageToDayStats(prev, delta) {
+  const base = normalizeDayStats(prev, delta.userId, delta.timeKey);
+  const modelName = delta.model || "unknown";
+  const providerName = delta.provider || "unknown";
+  const cacheRead = delta.cache_read_input_tokens ?? 0;
+  const cacheCreation = delta.cache_creation_input_tokens ?? 0;
+  const isFailed = delta.status === "failed";
+  const inc = (s) => {
+    const n = normalizeStats(s);
+    if (isFailed) {
+      return {
+        ...n,
+        failedCount: n.failedCount + 1
+      };
+    }
+    return {
+      count: n.count + 1,
+      tokens: {
+        input: n.tokens.input + delta.input_tokens,
+        output: n.tokens.output + delta.output_tokens,
+        cacheRead: n.tokens.cacheRead + cacheRead,
+        cacheCreation: n.tokens.cacheCreation + cacheCreation
+      },
+      cost: Number((n.cost + delta.cost).toFixed(6)),
+      failedCount: n.failedCount
+    };
+  };
+  const result = {
     ...base,
     total: inc(base.total),
     models: {
@@ -4429,6 +4335,21 @@ function applyTokenUsageToDayStats(prev, delta) {
       [providerName]: inc(base.providers[providerName])
     }
   };
+  if (delta.agentId !== void 0) {
+    const agentKey = delta.agentId || "unknown";
+    result.agents = {
+      ...base.agents,
+      [agentKey]: inc(base.agents[agentKey])
+    };
+  }
+  if (delta.entry_path !== void 0) {
+    const entryKey = delta.entry_path || "unknown";
+    result.entryPaths = {
+      ...base.entryPaths,
+      [entryKey]: inc(base.entryPaths[entryKey])
+    };
+  }
+  return result;
 }
 
 // packages/core/keyedTaskQueue.ts
@@ -4479,7 +4400,11 @@ var updateStats = async (data, existingStats, key, thunkApi) => {
       provider: data.provider || "unknown",
       input_tokens: data.input_tokens,
       output_tokens: data.output_tokens,
-      cost: data.cost
+      cost: data.cost,
+      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
     });
     await thunkApi.dispatch(
       write({
@@ -4565,7 +4490,11 @@ var updateTokensAction = async ({ dialogId, dialogKey, usage: legacyUsage, usage
     agentConfig: callAgentConfig,
     userId: ownerUserId,
     username: currentUser?.username,
-    agentId: agentConfig.id,
+    // agentConfig.id is the canonical ulid; dbKey (agent-<userId>-<id>) is
+    // always present on db records. Quick-chat may construct agentConfig with
+    // only dbKey, so fall back to keep billing working (matches serverTokenWriter
+    // which passes agentKey = dbKey directly).
+    agentId: agentConfig.id || agentConfig.dbKey,
     dialogId,
     timestamp,
     entry_path: "web-chat"
@@ -4634,83 +4563,6 @@ var mergeDialogTokenStats = (dialogConfig, runtimeTokens) => ({
   totalCost: (dialogConfig?.totalCost ?? 0) + runtimeTokens.totalCost
 });
 
-// packages/core/chat/dialogAttachmentCleanup.ts
-var FILE_CONTENT_RE = /(?:https?:\/\/[^/"'\s]+)?\/api\/v1\/db\/file\/content\/([^?#"'\s)]+)/g;
-function extractFileContentIds(value) {
-  const ids = /* @__PURE__ */ new Set();
-  const visit = (input) => {
-    if (typeof input === "string") {
-      for (const match of input.matchAll(FILE_CONTENT_RE)) {
-        const fileId = decodeURIComponent(match[1] ?? "").trim();
-        if (fileId) ids.add(fileId);
-      }
-      return;
-    }
-    if (Array.isArray(input)) {
-      for (const item of input) visit(item);
-      return;
-    }
-    if (input && typeof input === "object") {
-      for (const item of Object.values(input)) visit(item);
-    }
-  };
-  visit(value);
-  return [...ids];
-}
-function messageDbKey(dialogId, message) {
-  const dbKey = asOptionalTrimmedString(message.dbKey);
-  if (dbKey) return dbKey;
-  const id = asOptionalTrimmedString(message.id);
-  if (id) return dialogMessageKey(dialogId, id);
-  return null;
-}
-function asText(value) {
-  return asOptionalTrimmedString(value) ?? null;
-}
-function buildDialogAttachmentPlan(args) {
-  const messageKeys = new Set(
-    args.messages.map((message) => messageDbKey(args.dialogId, message)).filter((key) => Boolean(key))
-  );
-  const referencedFileIds = [
-    ...new Set(args.messages.flatMap((message) => extractFileContentIds(message)))
-  ];
-  const candidates = referencedFileIds.map((fileId) => {
-    const metadata = args.metadataByFileId[fileId];
-    const ownerType = asText(metadata?.ownerType);
-    const ownerId = asText(metadata?.ownerId);
-    const ownerDbKey = asText(metadata?.ownerDbKey);
-    const fileDbKey = asText(metadata?.dbKey);
-    const source = asText(metadata?.source);
-    const ownedByDialog = ownerType === "dialog" && ownerId === args.dialogId;
-    const ownedByMessage = Boolean(ownerDbKey && messageKeys.has(ownerDbKey));
-    const userOwnedReferenced = args.includeUserOwnedReferenced === true && Boolean(args.ownerId) && ownerType === "user" && ownerId === args.ownerId;
-    const canDelete = Boolean(fileDbKey && (ownedByDialog || ownedByMessage || userOwnedReferenced));
-    return {
-      fileId,
-      fileDbKey,
-      size: asOptionalFiniteNumber(metadata?.size) ?? null,
-      ownerType,
-      ownerId,
-      ownerDbKey,
-      source,
-      status: canDelete ? "delete" : "retain",
-      reason: canDelete ? ownedByMessage ? "ownerDbKey matches a message in this dialog" : userOwnedReferenced ? "user-owned file is referenced by this dialog and explicit referenced-attachment deletion is enabled" : "ownerType/ownerId matches this dialog" : fileDbKey ? "file ownership is not exclusive to this dialog" : "file metadata not found"
-    };
-  });
-  const deleteCandidates = candidates.filter((candidate) => candidate.status === "delete");
-  const retainedCandidates = candidates.filter((candidate) => candidate.status === "retain");
-  return {
-    dialogId: args.dialogId,
-    messageCount: args.messages.length,
-    referencedFileIds,
-    candidates,
-    deleteCandidates,
-    retainedCandidates,
-    bytesToDelete: deleteCandidates.reduce((sum, candidate) => sum + (candidate.size ?? 0), 0),
-    metadataReadFailures: args.metadataReadFailures ?? []
-  };
-}
-
 // packages/chat/dialog/deleteDialogOrchestration.ts
 var collectKeys = async (prefix, db) => {
   const keys = [];
@@ -4789,7 +4641,7 @@ var deleteOwnedDialogAttachments = async (args) => {
     metadataReadFailures
   });
   if (!plan.deleteCandidates.length) return plan;
-  const { deleteFileAction } = await import("./deleteFile-RJTEPOT4.js");
+  const { deleteFileAction } = await import("./deleteFile-XQXPBFFB.js");
   for (const candidate of plan.deleteCandidates) {
     if (candidate.fileDbKey) {
       await deleteFileAction(candidate.fileDbKey, args.thunkApi);
@@ -4851,7 +4703,7 @@ var deleteDialogThunk = async (payload, thunkApi) => {
   }
   if (isCurrentDialog) {
     await thunkApi.dispatch(resetMsgs());
-    const { clearPendingAttachments: clearPendingAttachments2 } = await import("./dialogSlice-N4HPG6HM.js");
+    const { clearPendingAttachments: clearPendingAttachments2 } = await import("./dialogSlice-DOWKOILN.js");
     dispatch(clearPendingAttachments2());
     clearWorkflow();
   }
@@ -4860,39 +4712,39 @@ var deleteDialogThunk = async (payload, thunkApi) => {
 
 // packages/chat/dialog/dialogSlice.ts
 var runCreateDialogAction = async (args, thunkApi) => {
-  const { createDialogAction } = await import("./createDialogAction-Y6YV64QB.js");
+  const { createDialogAction } = await import("./createDialogAction-LDCPDI73.js");
   return createDialogAction(args, thunkApi);
 };
 var runCreateAgentAutomationAction = async (args, thunkApi) => {
-  const { createAgentAutomationAction } = await import("./createAgentAutomationAction-WLRNE7C4.js");
+  const { createAgentAutomationAction } = await import("./createAgentAutomationAction-INQT23LX.js");
   return createAgentAutomationAction(args, thunkApi);
 };
 var runUpdateDialogTitleAction = async (args, thunkApi) => {
-  const { updateDialogTitleAction } = await import("./updateDialogTitleAction-BBDSWHNG.js");
+  const { updateDialogTitleAction } = await import("./updateDialogTitleAction-XPJZRJEL.js");
   return updateDialogTitleAction(args, thunkApi);
 };
 var runAddDialogAgentAction = async (args, thunkApi) => {
-  const { addDialogAgentAction } = await import("./addDialogAgentAction-RCY4ECF4.js");
+  const { addDialogAgentAction } = await import("./addDialogAgentAction-W44ZCEHB.js");
   return addDialogAgentAction(args, thunkApi);
 };
 var runRemoveDialogAgentAction = async (args, thunkApi) => {
-  const { removeDialogAgentAction } = await import("./removeDialogAgentAction-NEKVAMSH.js");
+  const { removeDialogAgentAction } = await import("./removeDialogAgentAction-E7H557UO.js");
   return removeDialogAgentAction(args, thunkApi);
 };
 var runSetPrimaryDialogAgentAction = async (args, thunkApi) => {
-  const { setPrimaryDialogAgentAction } = await import("./setPrimaryDialogAgentAction-LDJOYC4F.js");
+  const { setPrimaryDialogAgentAction } = await import("./setPrimaryDialogAgentAction-FWBKKLVA.js");
   return setPrimaryDialogAgentAction(args, thunkApi);
 };
 var runSwitchDialogAgentAction = async (args, thunkApi) => {
-  const { switchDialogAgentAction } = await import("./switchDialogAgentAction-XVWGKR2Z.js");
+  const { switchDialogAgentAction } = await import("./switchDialogAgentAction-US6QNL3N.js");
   return switchDialogAgentAction(args, thunkApi);
 };
 var runSetDialogExtraReferencesAction = async (args, thunkApi) => {
-  const { setDialogExtraReferencesAction } = await import("./setDialogExtraReferencesAction-WTOHQDIV.js");
+  const { setDialogExtraReferencesAction } = await import("./setDialogExtraReferencesAction-RMMGBR5F.js");
   return setDialogExtraReferencesAction(args, thunkApi);
 };
 var runHandleSendMessageAction = async (args, thunkApi) => {
-  const { handleSendMessageAction } = await import("./handleSendMessageAction-IN5XX5U7.js");
+  const { handleSendMessageAction } = await import("./handleSendMessageAction-C3TSDWKH.js");
   return handleSendMessageAction(args, thunkApi);
 };
 function clearDialogState() {
@@ -4905,7 +4757,7 @@ var createPageAndAddReference = createAsyncThunk(
   async (payload, { dispatch, getState, rejectWithValue }) => {
     const { slateData, jsonData, title, type, fileId, groupId, dialogKey } = payload;
     try {
-      const { createDocState } = await import("./docStore-B5AHDNW5.js");
+      const { createDocState } = await import("./docStore-UAWSKZ2Y.js");
       const pageKey = await createDocState(
         { slateData, title },
         { dispatch, getState }
@@ -5066,41 +4918,24 @@ var selectCurrentDialogTokens = createSelector(
 var selectTotalDialogTokens = selectCurrentDialogTokens;
 
 export {
-  resolveBuiltinPlatformAgentConfig,
-  resolveBuiltinPlatformAgentRecord,
-  fetchAndCacheMessages,
   isAssistantToolStub,
-  isOAuthApiKeyRef,
-  shouldUseServerProxy,
-  setWorkflow,
-  updateStep,
-  incrementStepsExecuted,
-  incrementFailedSteps,
-  toast,
+  fetchAndCacheMessages,
+  extractReferenceKeysFromMessage,
+  normalizeAppRouteId,
   uiAskChoiceFunctionSchema,
   uiAskChoiceFunc,
   parseUiAskChoiceContent,
-  resolveDialogRuntimeAgentKey,
-  normalizeAppRouteId,
-  DEFAULT_CONTEXT_WINDOW,
-  getModelContextWindow,
-  getModelInfo,
-  API_REPORTED_COST_MULTIPLIER,
-  normalizeUsage,
-  prepareTokenUsageData,
-  applyTokenUsageToDayStats,
-  runKeyed,
-  updateTokensAction,
-  extractReferenceKeysFromMessage,
-  estimateMissingUsage,
   PERSONALIZATION_DIALOG_CATEGORY,
   buildPersonalizationDialogPolicyContext,
+  resolveDialogRuntimeAgentKey,
   resolveHandleSendMessageContext,
+  estimateMissingUsage,
   selectCurrentDialogId,
   selectAllMsgs,
   selectMsgById,
   addUserMessage,
   messageStreaming,
+  resetMsgs,
   removeTransientMessage,
   finalizeTransientMessageOnError,
   prepareAndPersistMessage,
@@ -5108,8 +4943,18 @@ export {
   messageStreamEnd,
   addToolMessage,
   updateToolMessage,
-  extractFileContentIds,
-  buildDialogAttachmentPlan,
+  setWorkflow,
+  updateStep,
+  incrementStepsExecuted,
+  incrementFailedSteps,
+  clearWorkflow,
+  toast,
+  API_REPORTED_COST_MULTIPLIER,
+  normalizeUsage,
+  prepareTokenUsageData,
+  applyTokenUsageToDayStats,
+  runKeyed,
+  updateTokensAction,
   clearDialogState,
   createPageAndAddReference,
   deleteDialog,