nolo-cli 0.201.0-alpha.2 → 0.202.0-alpha.1

package/{chunk-K6TZSON4.js → chunk-WTKYP6QO.js}

@@ -3,7 +3,7 @@ import {
 } from "./chunk-5ZUL4CUO.js";
 import {
   getModelContextWindow
-} from "./chunk-JIFYXQRD.js";
+} from "./chunk-BTYQAODF.js";
 import {
   normalizeTimingMs
 } from "./chunk-H57T64RA.js";
@@ -124,17 +124,30 @@ var topLevel = (field) => (usage) => {
   return finiteTokenCount(usage[field]);
 };
 var nested = (path) => (usage) => readNested(usage, path);
-var readCacheReadInputTokens = (usage) => firstPositive(usage, [
+var firstPresentAsNumber = (usage, readers) => {
+  let sawField = false;
+  for (const read of readers) {
+    const value = read(usage);
+    if (value === void 0) continue;
+    sawField = true;
+    if (value !== 0) return value;
+  }
+  return sawField ? 0 : null;
+};
+var CACHE_READ_READERS = [
   topLevel("cache_read_input_tokens"),
   topLevel("prompt_cache_hit_tokens"),
   nested(["input_tokens_details", "cached_tokens"]),
   nested(["prompt_tokens_details", "cached_tokens"])
-]);
-var readCacheCreationInputTokens = (usage) => firstPositive(usage, [
+];
+var CACHE_CREATION_READERS = [
   topLevel("cache_creation_input_tokens"),
   topLevel("prompt_cache_miss_tokens"),
   nested(["input_tokens_details", "cache_write_tokens"])
-]);
+];
+var readCacheReadInputTokens = (usage) => firstPositive(usage, CACHE_READ_READERS);
+var readCacheReadInputTokensOrNull = (usage) => firstPresentAsNumber(usage, CACHE_READ_READERS);
+var readCacheCreationInputTokens = (usage) => firstPositive(usage, CACHE_CREATION_READERS);
 
 // packages/ai/token/normalizeUsage.ts
 var normalizeStringArray = (value) => {
@@ -382,6 +395,7 @@ export {
   DEFAULT_AUTO_EXECUTION_PROFILE,
   resolveAutoExecutionProfile,
   readCacheReadInputTokens,
+  readCacheReadInputTokensOrNull,
   readCacheCreationInputTokens,
   devinChannelContextWindow,
   resolveAgentContextWindow,

package/{chunk-FEKMTBKJ.js → chunk-XW6B2RJW.js}

@@ -9,7 +9,7 @@ import {
   resolveRawAgentInput,
   resolveServerUrl,
   writeUsage
-} from "./chunk-H7NIQGTU.js";
+} from "./chunk-RS66RJLA.js";
 import {
   parsePositiveFiniteNumberOrFallback
 } from "./chunk-Y5GCAMGP.js";
@@ -19,7 +19,7 @@ import {
 import {
   readDbRecord,
   resolveAgentRecordFromHybridStore
-} from "./chunk-6WZQGT5X.js";
+} from "./chunk-CJ37ZMCQ.js";
 import {
   INSTABOX_RUN_CONFIG_ENV,
   createCliLocalRuntimeAdapter,
@@ -38,7 +38,7 @@ import {
   resolveFileWriteGateEnabled,
   resolveLocalUserId,
   validateInstaboxWorkspaceSelection
-} from "./chunk-RRHJJUA3.js";
+} from "./chunk-2PI4QFAL.js";
 import {
   clearCredentialAvailability,
   readEffectiveCredentialEntry,
@@ -72,14 +72,14 @@ import {
 } from "./chunk-BMQ2MJUK.js";
 import {
   resolveCliLocalRuntimeKeyCapability
-} from "./chunk-H44LQSZ2.js";
+} from "./chunk-HKWGI3TM.js";
 import {
   isTransientFetchError
 } from "./chunk-KFHREHUQ.js";
 import {
   parseUiCard,
   uiCardFallback
-} from "./chunk-KORCRPLO.js";
+} from "./chunk-C7PKPHK6.js";
 import {
   isGatewayHttpStatus
 } from "./chunk-NF64D32W.js";
@@ -88,7 +88,7 @@ import {
   chooseMemoryOwners,
   loadMemoryCandidatesFromDb,
   resolveAgentMemoryPolicy
-} from "./chunk-Z646E5YH.js";
+} from "./chunk-ASG7VWPK.js";
 import {
   API_REPORTED_COST_MULTIPLIER,
   estimateMessagesTokens,
@@ -96,7 +96,7 @@ import {
   resolveAgentContextWindow,
   resolveOccupancy,
   resolveOccupancyWindow
-} from "./chunk-EOLPKHSB.js";
+} from "./chunk-326HCB6L.js";
 import {
   isCliAuthorityBrokerProtocolError,
   isCliAuthorityBrokerTimeoutError,
@@ -107,7 +107,7 @@ import {
 } from "./chunk-P64WRQYV.js";
 import {
   buildSkillDiscoveryContextLayer
-} from "./chunk-7KWPNGVJ.js";
+} from "./chunk-CTZ4O3XD.js";
 import {
   parseExternalSkillMarkdown,
   parseSkillDocProtocol
@@ -116,10 +116,10 @@ import {
   LOCAL_AGENT_CONFIG_MISSING_CODE,
   LOCAL_TURN_ABORTED_CODE,
   readActionGate
-} from "./chunk-BUXH3H5M.js";
+} from "./chunk-FWMOJTGR.js";
 import {
   resolveAgentRuntimeConfigFromRecord
-} from "./chunk-N7E3LQ4A.js";
+} from "./chunk-MZXWSY4E.js";
 import {
   createThinkParserState,
   flushThinkParser,
@@ -143,8 +143,9 @@ import {
   normalizeAttachmentPart
 } from "./chunk-WJZOQR2J.js";
 import {
-  normalizeUsage
-} from "./chunk-K6TZSON4.js";
+  normalizeUsage,
+  readCacheReadInputTokensOrNull
+} from "./chunk-WTKYP6QO.js";
 import {
   isOAuthApiKeyRef
 } from "./chunk-UKZX3NHN.js";
@@ -160,11 +161,12 @@ import {
 } from "./chunk-DWLEOOGR.js";
 import {
   buildAgentsMdLayer,
+  buildAgentsMdLayerHeader,
   buildMemoryOverlayLayer,
   buildMemoryUseGuidanceLayer,
   partitionScopedBlocks,
   renderTurnContextBlocksWithScope
-} from "./chunk-Q6RMLYSA.js";
+} from "./chunk-CMLBKYEI.js";
 import {
   BUILTIN_NOLO_AGENT_KEY,
   BUILTIN_NOLO_AGENT_NAME,
@@ -176,10 +178,7 @@ import {
 } from "./chunk-M2EJHDJP.js";
 import {
   isAntigravityOAuthAgent
-} from "./chunk-QU3TLYBR.js";
-import {
-  toErrorMessage
-} from "./chunk-HNMXYYJR.js";
+} from "./chunk-VEUSD6OF.js";
 import {
   createRunActivityTracker,
   createShellApprovalChild,
@@ -194,7 +193,7 @@ import {
   serverOriginForDialog,
   settleRunTerminalAuthoritatively,
   spawnLocalBackgroundRun
-} from "./chunk-BTBT2566.js";
+} from "./chunk-MNUOMXJH.js";
 import {
   formatAgentListCard,
   formatFinishedRunCard,
@@ -207,10 +206,13 @@ import {
 } from "./chunk-PJNFNEJE.js";
 import {
   resolveClientVersion
-} from "./chunk-4YMD7B4Y.js";
+} from "./chunk-WPOKOKZA.js";
 import {
   findModelConfig
-} from "./chunk-GC64WGMD.js";
+} from "./chunk-SM3NSZJV.js";
+import {
+  toErrorMessage
+} from "./chunk-HNMXYYJR.js";
 import {
   getLogger,
   normalizeError
@@ -228,7 +230,7 @@ import {
   t,
   toolLabel,
   toolLabelVariants
-} from "./chunk-UNOILAZP.js";
+} from "./chunk-CLTGWJVT.js";
 import {
   createMemoryKey
 } from "./chunk-ECX3NKRD.js";
@@ -245,7 +247,7 @@ import {
   CLIENT_VERSION_TOO_OLD_CODE,
   NOLO_CLIENT_VERSION_HEADER,
   buildClientVersionUpgradeMessage
-} from "./chunk-5KTQVMCX.js";
+} from "./chunk-GOO6G4PY.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
@@ -8699,8 +8701,32 @@ function isToolTreeLeafLine(line) {
 function isToolSingleLine(line) {
   return TOOL_SINGLE_RE.test(plainToolLine(line));
 }
-function isToolGroupBoundary(cur, next) {
-  return isToolTreeLeafLine(cur) && isToolTreeHeaderLine(next);
+function toolGroupKeyOf(line) {
+  const plain = plainToolLine(line);
+  const flat = plain.match(TOOL_SINGLE_RE);
+  if (flat) {
+    const label = (flat[1] ?? "").replace(/\s*×\d+$/, "").trim();
+    return label ? `flat:${label}` : null;
+  }
+  const header = toolTreeHeaderMatch(plain);
+  if (header) {
+    const label = (header[1] ?? "").replace(/\s*×\d+$/, "").trim();
+    return label ? `tree:${label}` : null;
+  }
+  return null;
+}
+function toolRowBoundary(cur, next) {
+  const curLeaf = isToolTreeLeafLine(cur);
+  const curHeader = isToolTreeHeaderLine(cur);
+  const nextLeaf = isToolTreeLeafLine(next);
+  const curKey = toolGroupKeyOf(cur);
+  const nextKey = toolGroupKeyOf(next);
+  if (curKey === null && !curLeaf) return null;
+  if (nextKey === null && !nextLeaf) return null;
+  if (curLeaf) return !nextLeaf;
+  if (curHeader && nextLeaf) return false;
+  if (curKey !== null && nextKey !== null) return curKey !== nextKey;
+  return true;
 }
 function statusColorSeq(marker, brightness) {
   if (marker === "\u2713") return colorSeq("success", brightness);
@@ -8766,7 +8792,8 @@ function polishBreathInsertsBlankBetween(cur, next) {
   if (isPolishIntroLine(cur) && isPolishListLikeLine(next)) return false;
   if (isPolishHeadingLine(cur) || isPolishHeadingLine(next)) return false;
   if (isCodeFenceLine(cur) !== isCodeFenceLine(next)) return true;
-  if (isToolGroupBoundary(cur, next)) return true;
+  const toolBoundary = toolRowBoundary(cur, next);
+  if (toolBoundary !== null) return toolBoundary;
   return isPolishListLikeLine(cur) !== isPolishListLikeLine(next);
 }
 function convertMarkdownTablesForTerminal(text) {
@@ -9065,16 +9092,22 @@ function classifyStreamLine(line) {
   if (polishHeadingLevel(plain) !== null) return "heading";
   return "prose";
 }
+function isStreamToolKind(kind) {
+  return kind === "tool-header" || kind === "tool-leaf" || kind === "tool";
+}
 function isStreamListLike(kind) {
   return kind === "list" || kind === "tool-header" || kind === "tool-leaf" || kind === "tool";
 }
-function needsListProseBreath(prev, next, prevLine = "") {
+function needsListProseBreath(prev, next, prevLine = "", nextLine = "") {
   if (prev === null || prev === "blank" || next === "blank") return false;
   if (next === "heading") return true;
   if (prev === "heading") return (polishHeadingLevel(prevLine) ?? 7) <= 2;
   if (prev === "fence" !== (next === "fence")) return true;
   if (isStreamListLike(next) && isPolishIntroLine(prevLine)) return false;
-  if (prev === "tool-leaf" && next === "tool-header") return true;
+  if (isStreamToolKind(prev) && isStreamToolKind(next)) {
+    const boundary = toolRowBoundary(prevLine, nextLine);
+    if (boundary !== null) return boundary;
+  }
   return isStreamListLike(prev) !== isStreamListLike(next);
 }
 function createRenderAwareStreamWriter(args) {
@@ -9085,13 +9118,13 @@ function createRenderAwareStreamWriter(args) {
   let lastLine = "";
   let pendingBlankRow = false;
   const PARTIAL_FLUSH_THRESHOLD = 48;
-  const emitBreathIfNeeded = (nextKind) => {
+  const emitBreathIfNeeded = (nextKind, nextLine = "") => {
     if (pendingBlankRow) {
       args.write("\n");
       pendingBlankRow = false;
       lastKind = "blank";
     }
-    if (needsListProseBreath(lastKind, nextKind, lastLine)) args.write("\n");
+    if (needsListProseBreath(lastKind, nextKind, lastLine, nextLine)) args.write("\n");
   };
   const flushPartialProse = () => {
     if (tracker.isInFence() || buffer.length < PARTIAL_FLUSH_THRESHOLD) return;
@@ -9220,7 +9253,7 @@ function createRenderAwareStreamWriter(args) {
         buffer = lines.slice(1).join("\n");
         continue;
       }
-      emitBreathIfNeeded(kind);
+      emitBreathIfNeeded(kind, firstLine);
       emitFormattedAssistantBlock(args.write, firstLine, true);
       lastKind = kind;
       lastLine = firstLine;
@@ -9248,6 +9281,7 @@ function createRenderAwareStreamWriter(args) {
       if (tracker.isInFence()) {
         args.write(buffer);
       } else {
+        emitBreathIfNeeded(classifyStreamLine(buffer), buffer);
         emitFormattedAssistantBlock(args.write, buffer);
       }
       buffer = "";
@@ -11378,7 +11412,7 @@ function isBalanceExhaustedError(error) {
 
 // packages/cli/client/agentRun.ts
 async function loadRunLocalAgentTurn() {
-  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-XLLWFAVI.js");
+  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-YXHJV65L.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();
@@ -12031,7 +12065,11 @@ var FAILURE_BUILDERS = {
 function describeLocalRunFailure(message, rawError) {
   const credentialAccountId = rawError && typeof rawError === "object" && typeof rawError.credentialAccountId === "string" ? rawError.credentialAccountId.trim() || void 0 : void 0;
   if (rawError && typeof rawError === "object" && "code" in rawError && rawError.code === "PLATFORM_STREAM_INTERRUPTED") {
-    return "[nolo] The platform LLM stream was interrupted before the turn completed. Your conversation was preserved. Send another message to continue.\n";
+    const detail = rawError;
+    const phaseMessage = detail.phase === "pre-headers" ? "The platform LLM request failed before response headers arrived." : detail.phase === "streaming" ? "The platform LLM stream was interrupted before the turn completed." : "The platform LLM request was interrupted before the turn completed.";
+    const saveMessage = detail.failedTurnPersistence?.status === "saved" ? "The failed turn was saved. Send another message to continue." : detail.failedTurnPersistence?.status === "failed" ? "The failed turn could not be saved. Check your conversation before continuing." : "Saving the failed turn could not be confirmed. Check your conversation before continuing.";
+    return `[nolo] ${phaseMessage} ${saveMessage}
+`;
   }
   if (isClientVersionTooOldFailure(message, rawError)) {
     return describeClientVersionTooOldFailure(message, rawError);
@@ -12525,6 +12563,9 @@ async function executeLocalAgentTurnForCliWithAdapter(options, settings, resolve
       ...options.contextBlockScopes?.length ? { contextBlockScopes: options.contextBlockScopes } : options.extraContextBlocks?.length ? { contextBlocks: options.extraContextBlocks } : {},
       ...typeof options.timeoutMs === "number" ? { timeoutMs: options.timeoutMs } : {},
       ...options.actionGateHandler ? { onActionGate: options.actionGateHandler } : {},
+      ...options.onPartialText ? { onObservationEvent: (event) => {
+        if (event.kind === "text-delta") options.onPartialText?.(event.chunk);
+      } } : {},
       onLoopEvent: (event) => {
         if (event.kind === "llm-start") {
           turnOutput.showWorking();
@@ -13040,26 +13081,109 @@ function buildHostEnvironmentLayer(options) {
 
 // packages/agent-runtime/agentsMd.ts
 import { existsSync as existsSync2, readFileSync as readFileSync3 } from "node:fs";
-import { join as join2 } from "node:path";
+import { resolve as resolve2 } from "node:path";
 var AGENTS_MD_MAX_BYTES = 8192;
+var AGENTS_MD_MARKER_RESERVE_BYTES = 512;
 var AGENTS_MD_CANDIDATES = ["AGENTS.md", "CLAUDE.md"];
+function truncateAgentsMdContent(content, maxBytes = AGENTS_MD_MAX_BYTES) {
+  const buf = Buffer.from(content, "utf8");
+  if (buf.byteLength <= maxBytes) {
+    return content;
+  }
+  let boundary = Math.min(maxBytes, buf.byteLength);
+  while (boundary > 0 && boundary < buf.byteLength && (buf[boundary] & 192) === 128) {
+    boundary--;
+  }
+  const boundarySlice = buf.subarray(0, boundary).toString("utf8");
+  const slice = buf.subarray(0, maxBytes);
+  const lastNewline = slice.lastIndexOf(10);
+  if (lastNewline > 0) {
+    const lineCandidate = slice.subarray(0, lastNewline).toString("utf8");
+    const lineBytes = Buffer.byteLength(lineCandidate, "utf8");
+    const boundaryBytes = Buffer.byteLength(boundarySlice, "utf8");
+    if (lineCandidate.trim().length > 0 && lineBytes * 2 >= boundaryBytes) {
+      return lineCandidate.replace(/\r$/, "");
+    }
+  }
+  return boundarySlice.replace(/\r$/, "");
+}
 function readAgentsMdLayerFromDisk(cwd) {
   for (const name of AGENTS_MD_CANDIDATES) {
-    const filePath = join2(cwd, name);
+    const filePath = resolve2(cwd, name);
     if (!existsSync2(filePath)) continue;
     try {
-      let content = readFileSync3(filePath, "utf8").trim();
+      const raw = readFileSync3(filePath, "utf8");
+      const content = raw.trim();
       if (!content) continue;
-      if (Buffer.byteLength(content, "utf8") > AGENTS_MD_MAX_BYTES) {
-        content = Buffer.from(content, "utf8").subarray(0, AGENTS_MD_MAX_BYTES).toString("utf8") + "\n\n<!-- AGENTS.md truncated -->";
+      const totalBytes = Buffer.byteLength(raw, "utf8");
+      const trimmedBytes = Buffer.byteLength(content, "utf8");
+      const headerBytes = Buffer.byteLength(buildAgentsMdLayerHeader(name), "utf8");
+      if (headerBytes + trimmedBytes <= AGENTS_MD_MAX_BYTES) {
+        return buildAgentsMdLayer(content, name);
+      }
+      const buildMarker = (omitted2, withPath) => {
+        const pathPart = withPath ? `\u5B8C\u6574\u6587\u4EF6\uFF1A${filePath}` : `\u5B8C\u6574\u6587\u4EF6\uFF1A\u5DE5\u4F5C\u533A\u6839\u76EE\u5F55\u7684 ${name}`;
+        return `<!-- AGENTS.md truncated: \u539F\u6587\u4EF6 ${totalBytes} \u5B57\u8282\uFF0C\u6CE8\u5165\u9884\u7B97 ${AGENTS_MD_MAX_BYTES} \u5B57\u8282\uFF0C\u5DF2\u7701\u7565 ${omitted2} \u5B57\u8282\uFF08\u4E0A\u6587\u53EF\u80FD\u7F3A\u5C11\u6587\u4EF6\u672B\u5C3E\u7684 commit/review \u95E8\u7981\u7EC6\u5219\uFF0C\u63D0\u4EA4/\u8BC4\u5BA1\u524D\u8BF7\u8BFB\u5B8C\u6574\u6587\u4EF6\uFF09\u3002${pathPart} -->`;
+      };
+      const bodyBudget = AGENTS_MD_MAX_BYTES - AGENTS_MD_MARKER_RESERVE_BYTES - 2 - headerBytes;
+      const body = truncateAgentsMdContent(content, bodyBudget);
+      const bodyBytes = Buffer.byteLength(body, "utf8");
+      const omitted = Math.max(0, totalBytes - bodyBytes);
+      let marker = buildMarker(omitted, true);
+      if (Buffer.byteLength(marker, "utf8") > AGENTS_MD_MARKER_RESERVE_BYTES) {
+        marker = buildMarker(omitted, false);
       }
-      return buildAgentsMdLayer(content, name);
+      return buildAgentsMdLayer(`${body}
+
+${marker}`, name);
     } catch {
     }
   }
   return null;
 }
 
+// packages/ai/token/cacheRunSummary.ts
+var finiteCount = (value) => typeof value === "number" && Number.isFinite(value) ? Math.max(0, Math.floor(value)) : void 0;
+var isUsageObject = (usage) => Boolean(usage) && typeof usage === "object";
+var readInputTokens = (usage) => finiteCount(usage.input_tokens) ?? finiteCount(usage.prompt_tokens) ?? 0;
+var computeCacheHitRatio = (inputTokens, cachedTokens) => {
+  if (cachedTokens === null) return null;
+  if (!Number.isFinite(inputTokens) || inputTokens <= 0) return 0;
+  return Math.round(cachedTokens / inputTokens * 1e4) / 1e4;
+};
+var withRatio = (inputTokens, cachedTokens) => ({
+  input_tokens: inputTokens,
+  cached_tokens: cachedTokens,
+  cache_hit_ratio: computeCacheHitRatio(inputTokens, cachedTokens)
+});
+var summarizeCacheUsage = (usage) => {
+  if (!isUsageObject(usage)) return void 0;
+  if (Object.keys(usage).length === 0) return void 0;
+  return withRatio(readInputTokens(usage), readCacheReadInputTokensOrNull(usage));
+};
+var summarizeCacheUsageRecords = (records) => {
+  if (!records || records.length === 0) return void 0;
+  let inputTokens = 0;
+  let cachedTokens = 0;
+  let sawUsage = false;
+  for (const record of records) {
+    const summary = summarizeCacheUsage(record?.usage);
+    if (!summary) continue;
+    sawUsage = true;
+    inputTokens += summary.input_tokens;
+    cachedTokens = cachedTokens === null || summary.cached_tokens === null ? null : cachedTokens + summary.cached_tokens;
+  }
+  if (!sawUsage) return void 0;
+  return withRatio(inputTokens, cachedTokens);
+};
+var mergeCacheUsageSummaries = (left, right) => {
+  if (!left) return right;
+  if (!right) return left;
+  const inputTokens = left.input_tokens + right.input_tokens;
+  const cachedTokens = left.cached_tokens === null || right.cached_tokens === null ? null : left.cached_tokens + right.cached_tokens;
+  return withRatio(inputTokens, cachedTokens);
+};
+
 // packages/cli/agentRunDoD.ts
 import { spawnSync as nodeSpawnSync } from "node:child_process";
 var DOD_COMMAND_TIMEOUT_MS = 12e4;
@@ -13119,16 +13243,16 @@ function runDoDCommands(commands, cwd, deps = {}) {
 
 // packages/cli/agentRunPrompts.ts
 import { existsSync as existsSync3, readFileSync as readFileSync4, readdirSync, statSync as statSync2 } from "node:fs";
-import { dirname, extname, isAbsolute as isAbsolute2, join as join3, relative as relativePath, resolve as resolve2, sep } from "node:path";
+import { dirname, extname, isAbsolute as isAbsolute2, join as join2, relative as relativePath, resolve as resolve3, sep } from "node:path";
 function workflowRefToCandidatePath(cwd, ref) {
   const normalized = ref.trim();
   if (!normalized) return "";
   if (normalized.endsWith(".md") || normalized.includes("/") || normalized.includes("\\")) {
-    const directPath = resolve2(cwd, normalized);
+    const directPath = resolve3(cwd, normalized);
     if (existsSync3(directPath)) return directPath;
   }
   const fileName = normalized.replace(/[^a-zA-Z0-9一-鿿]+/g, "-").replace(/^-+|-+$/g, "");
-  return resolve2(cwd, "docs", "workflows", `${fileName}.md`);
+  return resolve3(cwd, "docs", "workflows", `${fileName}.md`);
 }
 var SKILL_SEARCH_DIRS = [
   ".agents/skills"
@@ -13137,15 +13261,15 @@ function skillRefToCandidatePath(cwd, ref) {
   const normalized = ref.trim();
   if (!normalized) return "";
   if (normalized.endsWith(".md") || normalized.includes("/") || normalized.includes("\\")) {
-    const directPath = resolve2(cwd, normalized);
+    const directPath = resolve3(cwd, normalized);
     if (existsSync3(directPath)) return directPath;
   }
   const fileName = normalized.replace(/[^a-zA-Z0-9一-鿿]+/g, "-").replace(/^-+|-+$/g, "");
   for (const dir of SKILL_SEARCH_DIRS) {
-    const skillMdPath = resolve2(cwd, dir, fileName, "SKILL.md");
+    const skillMdPath = resolve3(cwd, dir, fileName, "SKILL.md");
     if (existsSync3(skillMdPath)) return skillMdPath;
   }
-  return resolve2(cwd, ".agents", "skills", fileName, "SKILL.md");
+  return resolve3(cwd, ".agents", "skills", fileName, "SKILL.md");
 }
 async function resolveWorkflowReference(ref, cwd = process.cwd()) {
   const path2 = workflowRefToCandidatePath(cwd, ref);
@@ -13162,11 +13286,11 @@ async function resolveWorkflowReference(ref, cwd = process.cwd()) {
 }
 function inlineRelativeRefs(body, skillDir) {
   const refPattern = /\[([^\]]+)\]\((\.\/[^)]+|[^)]+\/[^)]+)\)/g;
-  const normalizedSkillDir = resolve2(skillDir) + sep;
+  const normalizedSkillDir = resolve3(skillDir) + sep;
   return body.replace(refPattern, (match, label, relPath) => {
     const cleaned = relPath.trim();
     if (!cleaned.startsWith("./") && !cleaned.startsWith("../")) return match;
-    const absPath = resolve2(skillDir, cleaned);
+    const absPath = resolve3(skillDir, cleaned);
     const relative = relativePath(normalizedSkillDir, absPath);
     if (relative.startsWith("..") || isAbsolute2(relative)) return match;
     if (!existsSync3(absPath) || !absPath.endsWith(".md")) return match;
@@ -13181,7 +13305,7 @@ ${refContent}
   });
 }
 function listSkillScripts(skillDir) {
-  const scriptsDir = join3(skillDir, "scripts");
+  const scriptsDir = join2(skillDir, "scripts");
   if (!existsSync3(scriptsDir) || !statSync2(scriptsDir).isDirectory()) return null;
   const entries = readdirSync(scriptsDir).filter((e) => !e.startsWith("."));
   if (entries.length === 0) return null;
@@ -13316,7 +13440,7 @@ function prependSubjectDialogMarker(message, subjectDialogKey) {
 }
 function normalizeCliImageInput(input) {
   if (/^(https?:|data:|file:)/i.test(input)) return input;
-  const absolutePath = resolve2(input);
+  const absolutePath = resolve3(input);
   if (!existsSync3(absolutePath)) return input;
   const base64 = readFileSync4(absolutePath).toString("base64");
   return `data:${imageMimeTypeForPath(absolutePath)};base64,${base64}`;
@@ -15677,15 +15801,13 @@ async function runAgentRunCommand(args, deps) {
     stallTimer = setInterval(async () => {
       if (timedOut || stalled) return;
       const activity = activityTracker?.getActivity();
-      const lastEventAtMs = activity ? new Date(activity.lastEventAt).getTime() : nowMs();
-      const elapsedSinceEvent = nowMs() - lastEventAtMs;
       if (activity?.inFlight?.kind === "tool") {
         return;
       }
-      if (activity?.inFlight?.kind === "llm" && elapsedSinceEvent < stallTimeoutMs) {
-        return;
-      }
-      if (elapsedSinceEvent >= stallTimeoutMs) {
+      const lastProgressAt = activity?.lastProgressAt ?? activity?.lastEventAt;
+      const lastProgressAtMs = lastProgressAt ? new Date(lastProgressAt).getTime() : nowMs();
+      const elapsedSinceProgress = nowMs() - lastProgressAtMs;
+      if (elapsedSinceProgress >= stallTimeoutMs) {
         stalled = true;
         clearWatchdogs();
         const note = `stalled: no progress for ${stallTimeoutMs}ms`;
@@ -16028,7 +16150,10 @@ async function runAgentRunCommand(args, deps) {
       ...skillAllowedToolOverride !== void 0 ? { allowedToolNames: skillAllowedToolOverride } : parsed.allowedToolNames?.length ? { allowedToolNames: parsed.allowedToolNames } : {},
       ...parsed.blockedToolNames?.length ? { blockedToolNames: parsed.blockedToolNames } : {},
       ...machineShellOverride ? { runtimeToolPolicyOverride: machineShellOverride } : {},
-      ...activityTracker ? { onLoopEvent: activityTracker.onLoopEvent } : {},
+      ...activityTracker ? {
+        onLoopEvent: activityTracker.onLoopEvent,
+        onPartialText: activityTracker.onPartialText
+      } : {},
       background: parsed.background,
       noStream: parsed.noStream,
       ephemeral: parsed.ephemeral,
@@ -16047,6 +16172,7 @@ async function runAgentRunCommand(args, deps) {
     );
     clearWatchdogs();
     let runCreditsTotal = result.turnCredits;
+    let runCacheUsage = summarizeCacheUsageRecords(result.usageRecords);
     if (result.exitCode !== 0 && isQuotaExhaustedError(result.localError) && isLocalRun && parsed.fallbackAgentKeys && parsed.fallbackAgentKeys.length > 0) {
       const fallbackAgentKey = parsed.fallbackAgentKeys[0];
       output.write(
@@ -16066,6 +16192,10 @@ async function runAgentRunCommand(args, deps) {
       if (fallbackResult.turnCredits !== void 0) {
         runCreditsTotal = (runCreditsTotal ?? 0) + fallbackResult.turnCredits;
       }
+      runCacheUsage = mergeCacheUsageSummaries(
+        runCacheUsage,
+        summarizeCacheUsageRecords(fallbackResult.usageRecords)
+      );
       if (fallbackResult.exitCode !== 0) {
         result = {
           ...fallbackResult,
@@ -16112,6 +16242,10 @@ async function runAgentRunCommand(args, deps) {
           if (turnResult.turnCredits !== void 0) {
             runCreditsTotal = (runCreditsTotal ?? 0) + turnResult.turnCredits;
           }
+          runCacheUsage = mergeCacheUsageSummaries(
+            runCacheUsage,
+            summarizeCacheUsageRecords(turnResult.usageRecords)
+          );
           if (result.exitCode !== 0) {
             break;
           }
@@ -16219,6 +16353,9 @@ async function runAgentRunCommand(args, deps) {
           // run 级累计的平台积分（主轮 + fallback + drain 轮）：dock 行据此显示
           // 「⚡ x.xx」，让派发任务的消耗可见。undefined = 全程无平台计费。
           ...runCreditsTotal !== void 0 ? { credits: runCreditsTotal } : {},
+          // run 级缓存命中汇总：只进 .result.md 的 front matter（cached_tokens
+          // 为 null 表示 provider 未报缓存指标，与「命中 0」严格区分）。
+          ...runCacheUsage ? { cacheUsage: runCacheUsage } : {},
           ...failureReason ? { failureReason } : {},
           ...toolCallCount !== void 0 ? { toolCallCount } : {},
           ...result.finalText ? { lastAssistantText: result.finalText } : {},

package/{chunk-ZSO5B6SW.js → chunk-Y2WUYX4I.js}

@@ -48,6 +48,15 @@ var fetchMessages = async (db, dialogId, options = {}) => {
     let count = 0;
     for await (const [key, value] of iterator) {
       count++;
+      if (count % 32 === 0) {
+        await new Promise((resolve) => {
+          if (typeof setImmediate === "function") {
+            setImmediate(resolve);
+          } else {
+            setTimeout(resolve, 0);
+          }
+        });
+      }
       if (!includeDeleted && isTombstoneRecord(value)) {
         continue;
       }