nolo-cli 0.67.0 → 0.68.0-alpha.2

package/{chunk-MN2XJEWL.js → chunk-7NG5APVZ.js}

@@ -55,7 +55,7 @@ import {
 import {
   inlineImageUrlsForCustomProvider,
   prepareTools
-} from "./chunk-UNAVSDC5.js";
+} from "./chunk-XHNOCBUU.js";
 import {
   getServerProviderSecret
 } from "./chunk-HS7MLR74.js";
@@ -72,7 +72,7 @@ import {
   rememberMemoryFunctionSchema,
   resolveAgentRequiredPackIds,
   setTodoListFunc
-} from "./chunk-5DUAG5G7.js";
+} from "./chunk-K4326DRU.js";
 import {
   fetchWithTransientRetry,
   isTransientFetchError
@@ -92,17 +92,16 @@ import {
 import {
   applyBuiltinAgentRuntimeOverride,
   applyTokenUsageToDayStats,
-  normalizeUsage,
   prepareTokenUsageData,
   resolveBuiltinPlatformAgentConfig,
   runKeyed
-} from "./chunk-CLZYOOI3.js";
+} from "./chunk-XNO3T6RB.js";
 import {
   BUILTIN_TITLE_LLM_CONFIG
 } from "./chunk-EVBFYPDC.js";
 import {
   fetchServerSyncedCredential
-} from "./chunk-OHJWIXXW.js";
+} from "./chunk-RLZ6HZSX.js";
 import {
   require_date_fns
 } from "./chunk-M76ECQRD.js";
@@ -154,7 +153,7 @@ import {
   resolveOpenAiCompatibleProviderConfig,
   shouldUseGeminiNativeToolRoute,
   summarizeToolArguments
-} from "./chunk-RCNQCXPM.js";
+} from "./chunk-5JTJG4OG.js";
 import {
   PlatformStreamInterruptedError,
   buildPlatformChatCompletionRequest,
@@ -166,7 +165,7 @@ import {
   readSseDataValues,
   resolvePlatformChatProviderConfig,
   shouldUsePlatformChatProvider
-} from "./chunk-M3HN7RBV.js";
+} from "./chunk-ZCVO2HLZ.js";
 import {
   resolveAgentRuntimeConfigFromRecord,
   resolveHistoricalToolContentCap
@@ -197,13 +196,16 @@ import {
   buildDialogFallbackTitleFromUserInput,
   normalizeDialogTitle
 } from "./chunk-2MBTWINN.js";
+import {
+  normalizeUsage
+} from "./chunk-2XENHR3P.js";
 import {
   clipCompactText,
   createProviderCallTimingTracker,
   finalizeProviderCallTiming,
   observeMeaningfulProviderResponseAt,
   withProviderCallTimingFields
-} from "./chunk-TDTSQVDX.js";
+} from "./chunk-3E67YXGD.js";
 import {
   estimateTokenCount
 } from "./chunk-PSCNXBYA.js";
@@ -9611,7 +9613,7 @@ async function resolveLocalProvider(ctx) {
 }
 
 // packages/cli/client/localRuntimeAdapter.ts
-import { dirname as dirname2, extname, join as join4 } from "node:path";
+import { dirname as dirname2, extname, join as join3 } from "node:path";
 import { fileURLToPath } from "node:url";
 
 // packages/cli/client/providerStreamRetry.ts
@@ -10622,12 +10624,12 @@ var nodeFs = {
   readFileSync,
   existsSync
 };
-function resolveNoloHome(env, homedir3) {
+function resolveNoloHome(env, homedir2) {
   const custom = env?.NOLO_HOME;
   if (custom && custom.trim()) return custom.trim();
   const ambient = process.env.NOLO_HOME?.trim();
   if (ambient) return ambient;
-  return join(homedir3(), ".nolo");
+  return join(homedir2(), ".nolo");
 }
 function ensureDir(dir, fs) {
   fs.mkdirSync(dir, { recursive: true });
@@ -10646,9 +10648,9 @@ function writeJson(path, data, fs) {
 }
 function createFileSystemTodoStore(opts = {}) {
   const env = opts.env ?? process.env;
-  const homedir3 = opts.homedir ?? nodeHomedir;
+  const homedir2 = opts.homedir ?? nodeHomedir;
   const fs = opts.fs ?? nodeFs;
-  const noloHome = resolveNoloHome(env, homedir3);
+  const noloHome = resolveNoloHome(env, homedir2);
   const filePath = opts.filePath ?? join(noloHome, "agent_run_todos.json");
   const oldFilePath = join(noloHome, "todos.json");
   const loadMap = () => {
@@ -12230,14 +12232,12 @@ async function loadCliDialogSummary(args) {
   const summary = typeof record.summary === "string" ? record.summary.trim() : "";
   if (!summary) return null;
   const summarizedBeforeId = record.summarizedBeforeId;
-  const stubbedBeforeId = record.stubbedBeforeId;
   const sourceHash = record.sourceHash;
   const sourceCount = record.sourceCount;
   const schemaVersion = record.schemaVersion;
   return {
     summary,
     ...typeof summarizedBeforeId === "string" && summarizedBeforeId ? { summarizedBeforeId } : {},
-    ...typeof stubbedBeforeId === "string" && stubbedBeforeId ? { stubbedBeforeId } : {},
     ...typeof sourceHash === "string" && sourceHash ? { sourceHash } : {},
     ...typeof sourceCount === "number" && sourceCount > 0 ? { sourceCount } : {},
     ..."schemaVersion" in record ? { schemaVersion } : {}
@@ -12256,14 +12256,10 @@ async function saveCliDialogSummary(args) {
     userId: args.userId,
     summary: args.summary,
     ...args.summarizedBeforeId !== void 0 ? { summarizedBeforeId: args.summarizedBeforeId } : {},
-    // 始终写入 stubbedBeforeId（包括 undefined → 清空旧 stub），保证
-    // 摘要路径生成新 summary 后旧 stub 边界被正确清除。
-    stubbedBeforeId: args.stubbedBeforeId,
     ...args.sourceHash !== void 0 ? { sourceHash: args.sourceHash } : {},
     ...args.sourceCount !== void 0 ? { sourceCount: args.sourceCount } : {},
     ...args.schemaVersion !== void 0 ? { schemaVersion: args.schemaVersion } : {},
     compressionCount,
-    summaryPending: false,
     updatedAt: (/* @__PURE__ */ new Date()).toISOString()
   });
 }
@@ -12287,119 +12283,12 @@ function parseTitleUpdatedAtMs(existingDialog) {
   return 0;
 }
 
-// packages/cli/client/turnBillingAudit.ts
-import {
-  appendFileSync as appendFileSync2,
-  closeSync,
-  mkdirSync as mkdirSync3,
-  openSync,
-  readSync,
-  statSync
-} from "node:fs";
-import { homedir as homedir2 } from "node:os";
-import { join as join3 } from "node:path";
-function projectUsageForAudit(usage) {
-  if (!usage || typeof usage !== "object") return null;
-  const normalized = normalizeUsage(usage);
-  const projected = {
-    input_tokens: normalized.input_tokens,
-    output_tokens: normalized.output_tokens,
-    cache_read_input_tokens: normalized.cache_read_input_tokens,
-    cache_creation_input_tokens: normalized.cache_creation_input_tokens
-  };
-  if (typeof usage.cost === "number" && Number.isFinite(usage.cost)) {
-    projected.cost = usage.cost;
-  }
-  if (typeof usage.billing_unit === "string" && usage.billing_unit.trim()) {
-    projected.billing_unit = usage.billing_unit;
-  }
-  if (typeof usage.provider_call_id === "string" && usage.provider_call_id.trim()) {
-    projected.provider_call_id = usage.provider_call_id.trim();
-  }
-  return projected;
-}
-function resolveTurnBillingAuditLogPath(env = process.env) {
-  const noloHome = env.NOLO_HOME?.trim() || join3(homedir2(), ".nolo");
-  return join3(noloHome, "logs", "turn-billing.jsonl");
-}
-function appendTurnBillingAudit(input) {
-  try {
-    if (process.env.NOLO_TURN_BILLING_AUDIT === "0") return;
-    const calls = (input.usageRecords ?? []).map((record) => {
-      const usage = projectUsageForAudit(record?.usage);
-      if (!usage) return null;
-      return {
-        ...record?.callId ? { callId: record.callId } : {},
-        ...record?.model ? { model: record.model } : {},
-        ...record?.provider ? { provider: record.provider } : {},
-        ...usage
-      };
-    }).filter((call) => call !== null);
-    if (calls.length === 0 && (input.turnCredits === void 0 || input.turnCredits === null)) {
-      return;
-    }
-    const row = {
-      ts: Date.now(),
-      ...input.dialogId ? { dialogId: input.dialogId } : {},
-      ...input.agentKey ? { agentKey: input.agentKey } : {},
-      ...input.turnCredits !== void 0 && input.turnCredits !== null ? { turnCredits: input.turnCredits } : {},
-      ...input.aborted ? { aborted: true } : {},
-      calls
-    };
-    const logPath = resolveTurnBillingAuditLogPath();
-    mkdirSync3(join3(logPath, ".."), { recursive: true });
-    appendFileSync2(logPath, `${JSON.stringify(row)}
-`);
-  } catch {
-  }
-}
-function readLastTurnBillingInputTokens(dialogId, env = process.env) {
-  if (!dialogId || typeof dialogId !== "string") return void 0;
-  try {
-    const logPath = resolveTurnBillingAuditLogPath(env);
-    const stat = statSync(logPath, { throwIfNoEntry: false });
-    if (!stat || !stat.isFile() || stat.size === 0) return void 0;
-    const maxBytesToRead = 64 * 1024;
-    const bytesToRead = Math.min(stat.size, maxBytesToRead);
-    const buffer = Buffer.alloc(bytesToRead);
-    const fd = openSync(logPath, "r");
-    try {
-      readSync(fd, buffer, 0, bytesToRead, stat.size - bytesToRead);
-    } finally {
-      closeSync(fd);
-    }
-    const text = buffer.toString("utf-8");
-    const lines = text.split("\n");
-    for (let i = lines.length - 1; i >= 0; i--) {
-      const line = lines[i].trim();
-      if (!line) continue;
-      try {
-        const parsed = JSON.parse(line);
-        if (parsed && typeof parsed === "object" && parsed.dialogId === dialogId) {
-          if (Array.isArray(parsed.calls) && parsed.calls.length > 0) {
-            for (let j = parsed.calls.length - 1; j >= 0; j--) {
-              const call = parsed.calls[j];
-              if (call && typeof call.input_tokens === "number" && Number.isFinite(call.input_tokens) && call.input_tokens > 0) {
-                return call.input_tokens;
-              }
-            }
-          }
-        }
-      } catch {
-      }
-    }
-    return void 0;
-  } catch {
-    return void 0;
-  }
-}
-
 // packages/cli/client/localRuntimeAdapter.ts
 var currentMetaFile = fileURLToPath(import.meta.url);
 var isJsBundle = extname(currentMetaFile) === ".js";
 var SOURCE_CLI_DIR = isJsBundle ? dirname2(currentMetaFile) : dirname2(dirname2(currentMetaFile));
 var CLI_DIR = isCompiledBinary() ? dirname2(process.execPath) : SOURCE_CLI_DIR;
-var CLI_ENTRYPOINT = isCompiledBinary() ? process.execPath : isJsBundle ? currentMetaFile : join4(SOURCE_CLI_DIR, "index.ts");
+var CLI_ENTRYPOINT = isCompiledBinary() ? process.execPath : isJsBundle ? currentMetaFile : join3(SOURCE_CLI_DIR, "index.ts");
 async function recordLocalAvailabilityForAgent(args) {
   const now = args.now ?? Date.now;
   const { deps, status } = args;
@@ -12592,7 +12481,6 @@ function createCliLocalRuntimeAdapter(deps) {
       dialogId: input.dialogId,
       summary: input.summary,
       summarizedBeforeId: input.summarizedBeforeId,
-      stubbedBeforeId: input.stubbedBeforeId,
       sourceHash: input.sourceHash,
       sourceCount: input.sourceCount,
       schemaVersion: input.schemaVersion
@@ -12606,10 +12494,6 @@ function createCliLocalRuntimeAdapter(deps) {
       if (fromDialog?.inputTokens) {
         return fromDialog;
       }
-      const fromAudit = readLastTurnBillingInputTokens(dialogId, deps.env);
-      if (typeof fromAudit === "number" && fromAudit > 0) {
-        return { inputTokens: fromAudit };
-      }
       return null;
     },
     saveTurn: async (input) => writeDialog({
@@ -12829,6 +12713,5 @@ export {
   t,
   toolLabel,
   agentRunCardLabels,
-  appendTurnBillingAudit,
   createCliLocalRuntimeAdapter
 };

package/{chunk-UZXOOSHF.js → chunk-AUA5DTWI.js}

@@ -27,7 +27,7 @@ import {
   resolveLocalUserId,
   t,
   toolLabel
-} from "./chunk-MN2XJEWL.js";
+} from "./chunk-7NG5APVZ.js";
 import {
   createRunActivityTracker,
   popSingleQueueMessage,
@@ -63,7 +63,7 @@ import {
 } from "./chunk-LTRXGFMS.js";
 import {
   formatAgentListCard
-} from "./chunk-5DUAG5G7.js";
+} from "./chunk-K4326DRU.js";
 import {
   isTransientFetchError
 } from "./chunk-5XTOKQLW.js";
@@ -84,12 +84,11 @@ import {
   chooseMemoryOwners,
   loadMemoryCandidatesFromDb,
   resolveAgentMemoryPolicy
-} from "./chunk-FPT2E44F.js";
+} from "./chunk-VHADFQCI.js";
 import {
   API_REPORTED_COST_MULTIPLIER,
-  normalizeUsage,
   parseUiAskChoiceContent
-} from "./chunk-CLZYOOI3.js";
+} from "./chunk-XNO3T6RB.js";
 import {
   isOAuthApiKeyRef
 } from "./chunk-YYLHWIW6.js";
@@ -112,7 +111,7 @@ import {
   LOCAL_AGENT_CONFIG_MISSING_CODE,
   LOCAL_TURN_ABORTED_CODE,
   readActionGate
-} from "./chunk-RCNQCXPM.js";
+} from "./chunk-5JTJG4OG.js";
 import {
   resolveAgentRuntimeConfigFromRecord
 } from "./chunk-Y7PULBIA.js";
@@ -135,11 +134,12 @@ import {
 } from "./chunk-CJCJF5XB.js";
 import {
   DEFAULT_CONTEXT_WINDOW,
-  getModelContextWindow
-} from "./chunk-HQ3ZLBSI.js";
+  getModelContextWindow,
+  normalizeUsage
+} from "./chunk-2XENHR3P.js";
 import {
   clipCompactText
-} from "./chunk-TDTSQVDX.js";
+} from "./chunk-3E67YXGD.js";
 import {
   findModelConfig
 } from "./chunk-TQC77XVE.js";
@@ -4574,11 +4574,12 @@ function appendThinkingPreview(current, chunk, limit = THINKING_PREVIEW_BUFFER_L
 }
 function formatCompactionSummaryLine(event) {
   if (!event) return "";
-  const action = event.reason === "tool_stub" ? "stub \u5DE5\u5177\u8F93\u51FA" : "\u751F\u6210\u5386\u53F2\u6458\u8981";
-  let detail = action;
-  if (typeof event.stubbedCount === "number") {
-    detail = `stub ${event.stubbedCount} \u6761\u5DE5\u5177\u8F93\u51FA`;
+  if (event.failed) {
+    const reason = event.detail ? `\uFF1A${event.detail}` : "";
+    return `${STYLE2.dim}\u81EA\u52A8\u4E0A\u4E0B\u6587\u538B\u7F29\u5931\u8D25${reason}\uFF0C\u672C\u8F6E\u4EE5\u672A\u538B\u7F29\u4E0A\u4E0B\u6587\u7EE7\u7EED\u3002\u82E5\u53CD\u590D\u51FA\u73B0\u53EF\u624B\u52A8 /compact\u3002${STYLE2.reset}
+`;
   }
+  let detail = "\u751F\u6210\u5386\u53F2\u6458\u8981";
   const saved = typeof event.savedTokens === "number" ? event.savedTokens : void 0;
   let line = `\u5DF2\u538B\u7F29\u4E0A\u4E0B\u6587\uFF1A${detail}`;
   if (saved !== void 0) {
@@ -5176,7 +5177,7 @@ function findCollapsedPasteSpanAt(buffer, pos, opts = {}) {
 // packages/cli/client/agentRun.ts
 import { ulid } from "ulid";
 async function loadRunLocalAgentTurn() {
-  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-BD7R3OJL.js");
+  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-2ENB2B2Z.js");
   return runLocalAgentTurn;
 }
 var stripDebugNoise = (s) => s.replace(/\s*raw="[\s\S]*"/g, "").replace(/\s*raw=\S+/g, "").replace(/\s*headers=\[[^\]]*\]/g, "").replace(/\s*headers=\S+/g, "").trim();

package/{chunk-HPRMNGAM.js → chunk-IX6H4NKR.js}

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

package/{chunk-UBWLW3KY.js → chunk-IY2BLZKO.js}

@@ -1,13 +1,13 @@
 import {
   createCliLocalRuntimeAdapter,
   summarizeEndpoint
-} from "./chunk-MN2XJEWL.js";
+} from "./chunk-7NG5APVZ.js";
 import {
   clipMultilineText
-} from "./chunk-5DUAG5G7.js";
+} from "./chunk-K4326DRU.js";
 import {
   runLocalAgentTurn
-} from "./chunk-RCNQCXPM.js";
+} from "./chunk-5JTJG4OG.js";
 import {
   applyToolSurfaceConstraints
 } from "./chunk-V3ZKNK5D.js";