nolo-cli 0.212.0-alpha.1 → 0.222.0-alpha.2

package/{chunk-GPO7FCEZ.js → chunk-PJVKMGPZ.js}

@@ -1,21 +1,71 @@
-import {
-  findPotentialSecrets
-} from "./chunk-6QDYSCPW.js";
 import {
   parsePositiveFiniteNumberOrFallback
 } from "./chunk-Y5GCAMGP.js";
 import {
+  getReadableCliDb
+} from "./chunk-YFLVRVYK.js";
+import {
+  INSTABOX_RUN_CONFIG_ENV,
+  attachLocalCommandObservations,
   buildLocalRunEnv,
+  captureLocalRunBase,
+  collectHostTaskPlannedWorkspace,
+  collectHostTaskWorkspace,
+  createCliLocalRuntimeAdapter,
+  createHostAuthorExecution,
+  detectCurrentMachineId,
+  formatLocalRunSummary,
+  getOrCreateSharedStore,
+  hashInstaboxDeliveryManifest,
+  hostTaskEventsRoot,
+  inspectLocalRunWorkspace,
+  isCliProviderAgentConfig,
+  isDockerRuntimeKey,
   isFullstackCodingAgentRef,
+  isInstaboxBillingPolicy,
+  isLiveAgentRunObservation,
+  isMachineBoundLocalhostCustomProvider,
+  isSubtaskRun,
+  matchesHostReviewDispatch,
+  observeLocalCommandResult,
   parseAgentRunArgs,
+  parseAgentRunEvent,
   readFlagValue,
+  readHostTask,
+  readHostTaskAcceptancePlan,
+  redactSecrets,
+  resolveAuthToken as resolveAuthToken2,
+  resolveBoundMachineId,
+  resolveFileWriteGateEnabled,
   resolveRawAgentInput,
   resolveServerUrl,
+  safeAskText,
+  settleHostReviewsForScope,
+  shouldPrintLocalRunSummary,
+  unknownLocalRunAcceptance,
+  unknownTaskCompletion,
+  validateInstaboxWorkspaceSelection,
+  withHostReviewDispatch,
+  withholdIfSecretLike,
+  wrapLocalCommandWorkspaceObservation,
   writeUsage
-} from "./chunk-NRFKLKRU.js";
+} from "./chunk-P5ZJRTCH.js";
 import {
-  getReadableCliDb
-} from "./chunk-J5JTMQIA.js";
+  clearCredentialAvailability,
+  readEffectiveCredentialEntry
+} from "./chunk-FIYSMXHY.js";
+import {
+  readDbRecord,
+  resolveAgentRecordFromHybridStore
+} from "./chunk-6WU5572L.js";
+import {
+  boxGlyphs,
+  displayWidth,
+  resolveBoxCharset,
+  stripAnsi,
+  tokenizeAnsiLine,
+  visibleWidth
+} from "./chunk-F3GRJO4Z.js";
 import {
   _appendEntityBatch,
   _appendEvidenceBatch,
@@ -29,59 +79,43 @@ import {
   listMemoryStatesForEntityVNext,
   loadMemoryVNextCatalog,
   putMemoryEvidenceVNext
-} from "./chunk-TY3TIUJK.js";
+} from "./chunk-XI2BWJM5.js";
 import {
-  resolveMachineId
-} from "./chunk-S73EPYNC.js";
-import {
-  INSTABOX_RUN_CONFIG_ENV,
-  createCliLocalRuntimeAdapter,
-  detectCurrentMachineId,
-  hashInstaboxDeliveryManifest,
-  isCliProviderAgentConfig,
-  isDockerRuntimeKey,
-  isInstaboxBillingPolicy,
-  isLiveAgentRunObservation,
-  isMachineBoundLocalhostCustomProvider,
-  isSubtaskRun,
-  parseAgentRunEvent,
-  resolveAuthToken as resolveAuthToken2,
-  resolveBoundMachineId,
-  resolveFileWriteGateEnabled,
-  validateInstaboxWorkspaceSelection
-} from "./chunk-D5RCRX4A.js";
+  rankMemoryCandidates,
+  recallMemoryVNextLocal
+} from "./chunk-YL3EFYL3.js";
 import {
-  clearCredentialAvailability,
-  readEffectiveCredentialEntry,
-  recordCredentialProbe
-} from "./chunk-GSQNH63I.js";
+  DEFAULT_MEMORY_OVERLAY_TOKEN_BUDGET,
+  EXPLICIT_REMEMBER_PREFIX_REGEX,
+  buildMemoryOverlay
+} from "./chunk-EUCFKKDM.js";
 import {
-  readDbRecord,
-  resolveAgentRecordFromHybridStore
-} from "./chunk-IF45XG7K.js";
+  buildLegacyMemoryEvidence,
+  resolveLegacyMemoryPrincipal
+} from "./chunk-QHEN7NZ7.js";
 import {
   isBuiltinNoloAgentRef,
   resolveLocalUserId
-} from "./chunk-G7MLNNEX.js";
-import {
-  isLocalCliAgentKey
-} from "./chunk-NBTY7YJF.js";
+} from "./chunk-7JLY4WYF.js";
 import {
   CliProviderQuotaError
-} from "./chunk-VL5KOY2C.js";
+} from "./chunk-MK2Q7ZJD.js";
+import {
+  resolveMachineId
+} from "./chunk-S73EPYNC.js";
+import {
+  extractGoogleValidationLink
+} from "./chunk-BMQ2MJUK.js";
 import {
   resolveCliLocalRuntimeKeyCapability
-} from "./chunk-CQ46IRNN.js";
+} from "./chunk-B4GOW4MT.js";
 import {
   isTransientFetchError
 } from "./chunk-KFHREHUQ.js";
-import {
-  extractGoogleValidationLink
-} from "./chunk-BMQ2MJUK.js";
 import {
   parseUiCard,
   uiCardFallback
-} from "./chunk-GNDJKC4B.js";
+} from "./chunk-ON37YXGX.js";
 import {
   isGatewayHttpStatus
 } from "./chunk-NF64D32W.js";
@@ -90,15 +124,17 @@ import {
   chooseMemoryOwners,
   loadMemoryCandidatesFromDb,
   resolveAgentMemoryPolicy
-} from "./chunk-OOF4UPC5.js";
+} from "./chunk-XWVCYUUU.js";
 import {
   API_REPORTED_COST_MULTIPLIER,
   estimateMessagesTokens,
+  isAgentRunStartFailureStatus,
+  isAgentRunStatusNormal,
   parseUiAskChoiceContent,
   resolveAgentContextWindow,
   resolveOccupancy,
   resolveOccupancyWindow
-} from "./chunk-VZKUKCA6.js";
+} from "./chunk-MZLE5HQ3.js";
 import {
   isCliAuthorityBrokerProtocolError,
   isCliAuthorityBrokerTimeoutError,
@@ -106,48 +142,43 @@ import {
 } from "./chunk-5ZMIIR23.js";
 import {
   getDefaultCliLocalRuntimeDb
-} from "./chunk-AZMYUSVF.js";
+} from "./chunk-N5Z2V73W.js";
 import {
-  buildSkillDiscoveryContextLayer
-} from "./chunk-F6UUQOG6.js";
-import {
-  parseExternalSkillMarkdown,
-  parseSkillDocProtocol
-} from "./chunk-AETZ7AD6.js";
+  isLocalCliAgentKey
+} from "./chunk-BR3GT6MR.js";
 import {
   LOCAL_AGENT_CONFIG_MISSING_CODE,
   LOCAL_TURN_ABORTED_CODE,
+  evaluateTaskExecutionContract,
+  markCliUserBatchPhase,
   readActionGate
-} from "./chunk-FHU44LN3.js";
+} from "./chunk-Z2PITYZN.js";
 import {
   resolveAgentRuntimeConfigFromRecord
-} from "./chunk-W4S457LU.js";
+} from "./chunk-YU4ZPWVF.js";
 import {
   createThinkParserState,
   flushThinkParser,
   processThinkChunk
 } from "./chunk-56GBUMO5.js";
 import {
-  PROBE_INTERVAL_MS,
-  QUOTA_ERROR_PATTERNS,
   classifyFailureSubclass,
   isCapacitySaturatedRateLimit,
-  isQuotaExhaustedError,
   isQuotaExhaustedText,
-  mergeAvailabilityDeadline,
-  resolveCooldownGate,
+  resolveAvailabilityAction,
   resolveCredentialKeyWithFallback
-} from "./chunk-YUXQAVRD.js";
+} from "./chunk-HOCHUZQ7.js";
 import {
   ATTACHMENT_PART_TYPE,
   ATTACHMENT_PART_VERSION,
   describeAttachmentForModel,
   normalizeAttachmentPart
-} from "./chunk-WJZOQR2J.js";
+} from "./chunk-NIZ2BXFD.js";
 import {
+  findCodexOAuthPinnedContextWindow,
   normalizeUsage,
   readCacheReadInputTokensOrNull
-} from "./chunk-JTDORD5P.js";
+} from "./chunk-RDH5CQ4T.js";
 import {
   isOAuthApiKeyRef
 } from "./chunk-UKZX3NHN.js";
@@ -157,37 +188,65 @@ import {
 import {
   normalizeRuntimeToolPolicyOverride,
   resolveEffectiveRuntimeToolPolicy
-} from "./chunk-2QHFH3DR.js";
+} from "./chunk-47ITIXO7.js";
 import {
   compactWhitespace
 } from "./chunk-DWLEOOGR.js";
 import {
-  buildAgentsMdLayer,
-  buildAgentsMdLayerHeader,
-  buildMemoryOverlayLayer,
-  buildMemoryUseGuidanceLayer,
-  partitionScopedBlocks,
-  renderTurnContextBlocksWithScope
-} from "./chunk-ZRSNONOB.js";
+  isAntigravityOAuthAgent
+} from "./chunk-SY3C4SQ7.js";
+import {
+  parseExternalSkillMarkdown,
+  parseSkillDocProtocol
+} from "./chunk-W6RFEDN4.js";
 import {
   BUILTIN_NOLO_AGENT_KEY,
   BUILTIN_NOLO_AGENT_NAME,
   builtinAgentCatalogEntryById,
   parseBuiltinPlatformAgentId
-} from "./chunk-LOEO7LRC.js";
+} from "./chunk-3IK6ILVW.js";
 import {
   parsePublicAgentId
 } from "./chunk-M2EJHDJP.js";
 import {
-  isAntigravityOAuthAgent
-} from "./chunk-KIM6CLW5.js";
+  createMemoryKey
+} from "./chunk-SYTHYBMI.js";
 import {
+  ulid
+} from "./chunk-OJKUU3LP.js";
+import {
+  buildSkillDiscoveryContextLayer
+} from "./chunk-CKT6QUE2.js";
+import {
+  buildAgentsMdLayer,
+  buildAgentsMdLayerHeader,
+  buildMemoryOverlayLayer,
+  buildMemoryUseGuidanceLayer,
+  partitionScopedBlocks,
+  renderTurnContextBlocksWithScope
+} from "./chunk-JWXITTQB.js";
+import {
+  exitCliFromWatchdog,
+  getLogger,
+  normalizeError
+} from "./chunk-YGMBIXCF.js";
+import {
+  agentRunCardLabels,
+  getCliLocale,
+  t,
+  toolLabel,
+  toolLabelVariants
+} from "./chunk-OB6DVWPF.js";
+import {
+  awaitLocalWriterChild,
   createRunActivityTracker,
   createShellApprovalChild,
   getRunResultHeaderMeta,
+  isHistoryIntegrityFailure,
   popSingleQueueMessage,
   readRunRecord,
   recordRunResultHeaderMeta,
+  registerLocalForegroundWriter,
   reportRunProcessIdentity,
   resolveResultServerMeta,
   resolveRunQueuePath,
@@ -195,65 +254,52 @@ import {
   serverOriginForDialog,
   settleRunTerminalAuthoritatively,
   spawnLocalBackgroundRun
-} from "./chunk-HIRC32DV.js";
+} from "./chunk-2GJKRKI6.js";
 import {
   formatAgentListCard,
   formatFinishedRunCard,
+  formatIdentityRow,
   formatListRunsCard,
   formatNotFoundRunCard,
-  formatStartRunCard,
   formatStatusRunCard,
   formatStopRunCard,
+  getAgentRunStatusIcon,
   isAgentRunTerminalStatus
-} from "./chunk-PJNFNEJE.js";
+} from "./chunk-AMEOV5VZ.js";
 import {
-  resolveClientVersion
-} from "./chunk-TCZHTTUU.js";
+  QUOTA_ERROR_PATTERNS,
+  isQuotaExhaustedError
+} from "./chunk-EWQ3HGNZ.js";
 import {
-  findModelConfig
-} from "./chunk-SM3NSZJV.js";
+  resolveClientVersion
+} from "./chunk-I7WBYGBP.js";
 import {
   toErrorMessage
 } from "./chunk-HNMXYYJR.js";
+import {
+  asTrimmedString
+} from "./chunk-3EUW3WEO.js";
+import {
+  findModelConfig
+} from "./chunk-2UCBGYO4.js";
 import {
   CLIENT_VERSION_TOO_OLD_CODE,
   NOLO_CLIENT_VERSION_HEADER,
   buildClientVersionUpgradeMessage
-} from "./chunk-GOO6G4PY.js";
+} from "./chunk-CKG3PRZ7.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
-import {
-  getLogger,
-  normalizeError
-} from "./chunk-EYLGAEB4.js";
 import {
   resolveAuthToken
-} from "./chunk-WACI5I6V.js";
-import {
-  readPipeText,
-  spawnProcess
-} from "./chunk-4O22PGNQ.js";
-import {
-  agentRunCardLabels,
-  getCliLocale,
-  t,
-  toolLabel,
-  toolLabelVariants
-} from "./chunk-3RQVYR4B.js";
-import {
-  createMemoryKey
-} from "./chunk-JY5NGFFH.js";
-import {
-  ulid
-} from "./chunk-XJWWBO34.js";
-import {
-  asTrimmedString
-} from "./chunk-3EUW3WEO.js";
+} from "./chunk-2THCNKE4.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
 
+// packages/cli/agentRunCommand.ts
+import { createHash } from "node:crypto";
+
 // packages/cli/client/instaboxRunConfigWrite.ts
 import { randomUUID } from "node:crypto";
 import { lstatSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
@@ -396,6 +442,151 @@ function writeInstaboxRunConfig(options) {
   return { configPath: targetPath, config };
 }
 
+// packages/cli/client/contextRefusal.ts
+function contextRefusalDiagnostics(error) {
+  return error && typeof error === "object" ? error.diagnostics : void 0;
+}
+var tokens = (value) => value >= 1e3 ? `${Math.round(value / 100) / 10}k` : String(value);
+function describeContextRefusal(refusal) {
+  const budgetDetail = refusal && Number.isFinite(refusal.historyTokens) && refusal.historyTokens >= 0 && Number.isFinite(refusal.budget) && refusal.budget > 0 ? t("contextRefusalBudgetDetail", tokens(refusal.historyTokens), tokens(refusal.budget)) : "";
+  switch (refusal?.reason) {
+    case "summary-provider-busy":
+      return t("contextRefusalSummaryBusy", budgetDetail);
+    case "summary-failed":
+      return t("contextRefusalSummaryFailed", budgetDetail);
+    case "no-compactable-content":
+      return t("contextRefusalNoCompactableContent");
+    case "single-message-too-large":
+      if (refusal.largestMessageTokens >= 0 && Number.isFinite(refusal.largestMessageTokens)) {
+        return t("contextRefusalSingleMessageTooLarge", tokens(refusal.largestMessageTokens), tokens(refusal.budget));
+      }
+  }
+  return t("contextPreflightBlockedHint");
+}
+
+// packages/cli/client/cliBatchIdentity.ts
+function cliBatchPhaseFailure(args) {
+  const { phase, batchId, requestStarted, replyPersisted, cause } = args;
+  const message = cause instanceof Error ? cause.message : String(cause);
+  const error = new Error(
+    `cli batch phase ${phase} failed for ${batchId} (requestStarted=${requestStarted}, replyPersisted=${replyPersisted}): ${message}`
+  );
+  error.code = "cli_batch_phase_failed";
+  error.phase = phase;
+  error.batchId = batchId;
+  error.requestStarted = requestStarted;
+  error.replyPersisted = replyPersisted;
+  error.cause = cause;
+  return error;
+}
+function resolveCliBatchIdentity(options) {
+  const batchId = options.cliBatchId?.trim();
+  if (!batchId) return void 0;
+  const userMessages = options.userMessages;
+  if (!userMessages || userMessages.length === 0) {
+    throw cliBatchPhaseFailure({
+      phase: "requested",
+      batchId,
+      requestStarted: false,
+      replyPersisted: false,
+      cause: new Error("batch identity requires userMessages")
+    });
+  }
+  const tailId = userMessages[userMessages.length - 1]?.cliMessageId;
+  if (tailId !== batchId) {
+    throw cliBatchPhaseFailure({
+      phase: "requested",
+      batchId,
+      requestStarted: false,
+      replyPersisted: false,
+      cause: new Error(`batch identity mismatch: tail=${tailId ?? "none"}`)
+    });
+  }
+  const messageIds = userMessages.map((message) => message.cliMessageId);
+  if (messageIds.some((id) => !id)) {
+    throw cliBatchPhaseFailure({
+      phase: "requested",
+      batchId,
+      requestStarted: false,
+      replyPersisted: false,
+      cause: new Error("batch user message missing cliMessageId")
+    });
+  }
+  return { batchId, messageIds };
+}
+
+// packages/cli/client/agentRun.ts
+import { resolve as resolveHostReviewPath } from "node:path";
+
+// packages/cli/client/hostTaskBinding.ts
+import { resolve as resolve2 } from "node:path";
+function bindHostTask(args) {
+  let latest;
+  let completion;
+  function load() {
+    if (!args.reference) return void 0;
+    if (resolve2(args.reference.workspace) !== resolve2(args.workspace) || args.reference.dialogId !== args.dialogId) {
+      return { authorization: "unknown", reason: "scope_mismatch" };
+    }
+    return readHostTask(hostTaskEventsRoot(args.env), args.reference);
+  }
+  latest = load();
+  const contract = args.completionEvidenceProvider && latest && latest.authorization !== "unknown" ? latest.contract : void 0;
+  const adapter = !args.reference ? args.adapter : {
+    ...args.adapter,
+    // Re-read authority before each protected action. A review-only binding owns
+    // typed review tools, not ordinary chat tools or their existing permission gates.
+    // Explicit completion tasks retain their all-tool stop semantics; unknown scope
+    // fails closed. Already running tools are not cancelled by this entry guard.
+    executeTool: async (call, opts) => {
+      latest = load();
+      const authorization = latest?.authorization ?? "unknown";
+      const protectedTool = call.name === "requestTaskReview" || call.name === "recordTaskReviewDecision";
+      if (authorization !== "active" && (args.completionEvidenceProvider || protectedTool || authorization === "unknown")) {
+        const code = authorization === "paused" ? "authorization_paused" : authorization === "revoked" ? "authorization_revoked" : "authorization_unknown";
+        throw Object.assign(new Error(`host task authority ${authorization}: tool "${call.name}" was not executed`), { code });
+      }
+      return args.adapter.executeTool(call, opts);
+    },
+    saveTurn: async (input) => {
+      latest = load();
+      const stopped = args.signal?.aborted || input.result.businessCompletion?.reasons.includes("stopped");
+      if (args.completionEvidenceProvider) {
+        const snapshot = latest && latest.authorization !== "unknown" ? latest.contract : void 0;
+        let evidence;
+        try {
+          evidence = snapshot ? await args.completionEvidenceProvider(snapshot) : void 0;
+        } catch {
+        }
+        latest = load();
+        const current = latest && latest.authorization !== "unknown" ? latest.contract : void 0;
+        completion = !current || !evidence || evidence.taskId !== current.taskId ? stopped ? { taskId: args.reference.taskId, status: "blocked", reasons: ["stopped"] } : unknownTaskCompletion(args.reference.taskId) : evaluateTaskExecutionContract({ ...evidence, authorization: current.authorization }, {
+          stopped,
+          executionFailed: input.result.error === true || !!input.result.runtimeProviderFailure || !!input.result.emptyAssistantFallbackReason,
+          budgetExhausted: input.result.businessCompletion?.reasons.includes("budget_exhausted")
+        });
+      }
+      const result = { ...input.result };
+      delete result.businessCompletion;
+      if (completion) result.businessCompletion = completion;
+      try {
+        return await args.adapter.saveTurn({ ...input, result });
+      } catch (error) {
+        if (args.completionEvidenceProvider) completion = { taskId: args.reference.taskId, status: "blocked", reasons: ["execution_failed"] };
+        throw error;
+      }
+    }
+  };
+  return {
+    adapter,
+    contract,
+    result: () => args.reference ? {
+      taskAuthorization: latest?.authorization ?? "unknown",
+      ...args.completionEvidenceProvider ? { businessCompletion: completion ?? unknownTaskCompletion(args.reference.taskId) } : {}
+    } : {}
+  };
+}
+
 // packages/agent-runtime/modelLayerOverride.ts
 var MODEL_LAYER_KEYS = [
   "provider",
@@ -644,6 +835,8 @@ function parseUsageRecord(usage) {
 function resolveContextWindow(model) {
   const raw = model?.trim();
   if (!raw) return void 0;
+  const oauthPinned = findCodexOAuthPinnedContextWindow(raw);
+  if (oauthPinned !== void 0) return oauthPinned;
   for (const provider of PROVIDER_LOOKUP_ORDER) {
     const config = findModelConfig(provider, raw);
     if (config?.contextWindow) return config.contextWindow;
@@ -682,10 +875,10 @@ function platformCreditsFromUsage(usage) {
   const cost = typeof usage.cost === "number" ? usage.cost : 0;
   return Number.isFinite(cost) && cost > 0 ? cost : 0;
 }
-function withTurnCredits(tokens, credits) {
-  if (!tokens) return tokens;
-  if (credits === void 0) return tokens;
-  return { ...tokens, credits };
+function withTurnCredits(tokens2, credits) {
+  if (!tokens2) return tokens2;
+  if (credits === void 0) return tokens2;
+  return { ...tokens2, credits };
 }
 function formatCreditsChip(credits, options) {
   return options?.compact ? `\u26A1${credits.toFixed(2)}` : `\u26A1 ${credits.toFixed(2)} \u79EF\u5206`;
@@ -718,10 +911,18 @@ function computeBaselineContextTokens(options) {
   }
   return typeof fallbackEstimate === "function" ? fallbackEstimate() : fallbackEstimate;
 }
+function preserveContextUsageWithoutReceipt(previous, estimatedContextTokens) {
+  return {
+    turnTokens: previous.turnTokens,
+    lastAuthorityTurnCount: previous.lastAuthorityTurnCount,
+    estimatedContextTokens,
+    liveTurnEstimatedTokens: previous.turnTokens && previous.turnTokens.input > 0 ? Math.max(0, estimatedContextTokens - previous.turnTokens.input) || void 0 : void 0
+  };
+}
 function resolveContextUsage(opts = {}) {
-  const tokens = opts.tokens;
-  const contextWindow = tokens?.contextWindow ?? opts.fallbackContextWindow;
-  const authoritativeInput = tokens && tokens.input > 0 ? tokens.input : void 0;
+  const tokens2 = opts.tokens;
+  const contextWindow = tokens2?.contextWindow ?? opts.fallbackContextWindow;
+  const authoritativeInput = tokens2 && tokens2.input > 0 ? tokens2.input : void 0;
   const baselineEstimate = opts.estimatedContextTokens != null && opts.estimatedContextTokens > 0 ? opts.estimatedContextTokens : void 0;
   const generatedSinceAuthority = opts.turnEstimatedTokens != null && opts.turnEstimatedTokens > 0 ? opts.turnEstimatedTokens : void 0;
   const occupancy = resolveOccupancy({
@@ -740,27 +941,27 @@ function resolveContextUsage(opts = {}) {
   }
   return usage;
 }
-function renderTokenStatus(tokens, fallback) {
+function renderTokenStatus(tokens2, fallback) {
   const usage = resolveContextUsage({
-    tokens,
+    tokens: tokens2,
     fallbackContextWindow: fallback?.contextWindow,
     estimatedContextTokens: fallback?.estimatedContextTokens,
     turnEstimatedTokens: fallback?.turnEstimatedTokens
   });
-  const cache = tokens?.cacheRead != null && tokens.cacheRead > 0 ? ` (cache ${formatTokenCount(tokens.cacheRead)})` : "";
+  const cache = tokens2?.cacheRead != null && tokens2.cacheRead > 0 ? ` (cache ${formatTokenCount(tokens2.cacheRead)})` : "";
   if (usage.contextWindow === void 0) {
     const inStr = usage.used !== void 0 ? `${usage.estimated ? "~" : ""}${formatTokenCount(usage.used)}` : "\u2014";
-    const outStr = tokens ? formatTokenCount(tokens.output) : "\u2014";
+    const outStr = tokens2 ? formatTokenCount(tokens2.output) : "\u2014";
     return `in ${inStr}${cache} out ${outStr} left \u2014`;
   }
-  if (!tokens) {
+  if (!tokens2) {
     if (usage.used === void 0) return "in \u2014 out \u2014 left \u2014";
     const left2 = usage.left !== void 0 ? `~${formatTokenCount(usage.left)}` : "\u2014";
     return `in ~${formatTokenCount(usage.used)} out \u2014 left ${left2}`;
   }
-  const inputText = tokens.input > 0 || usage.used === void 0 ? formatTokenCount(tokens.input) : `~${formatTokenCount(usage.used)}`;
-  const left = tokens.remaining != null ? formatTokenCount(tokens.remaining) : usage.left !== void 0 ? `${usage.estimated ? "~" : ""}${formatTokenCount(usage.left)}` : "\u2014";
-  return `in ${inputText}${cache} out ${formatTokenCount(tokens.output)} left ${left}`;
+  const inputText = tokens2.input > 0 || usage.used === void 0 ? formatTokenCount(tokens2.input) : `~${formatTokenCount(usage.used)}`;
+  const left = tokens2.remaining != null ? formatTokenCount(tokens2.remaining) : usage.left !== void 0 ? `${usage.estimated ? "~" : ""}${formatTokenCount(usage.left)}` : "\u2014";
+  return `in ${inputText}${cache} out ${formatTokenCount(tokens2.output)} left ${left}`;
 }
 function shouldShowUsage(env) {
   return env.NOLO_DEBUG === "1" || env.NOLO_SHOW_USAGE === "1";
@@ -845,754 +1046,6 @@ function formatCliHyperlink(url, label, enabled = resolveCliHyperlinkEnabled())
   return `${OSC8_OPEN}${url}${OSC8_CLOSE}${safeLabel}${OSC8_OPEN}${OSC8_CLOSE}`;
 }
 
-// node_modules/ansi-regex/index.js
-function ansiRegex({ onlyFirst = false } = {}) {
-  const ST2 = "(?:\\u0007|\\u001B\\u005C|\\u009C)";
-  const osc = `(?:\\u001B\\][^\\u0007\\u001B\\u009C]*${ST2})`;
-  const csi = "[\\u001B\\u009B][[\\]()#;?]*(?:\\d{1,4}(?:[;:]\\d{0,4})*)?[\\dA-PR-TZcf-nq-uy=><~]";
-  const pattern = `${osc}|${csi}`;
-  return new RegExp(pattern, onlyFirst ? void 0 : "g");
-}
-
-// node_modules/strip-ansi/index.js
-var regex = ansiRegex();
-function stripAnsi(string) {
-  if (typeof string !== "string") {
-    throw new TypeError(`Expected a \`string\`, got \`${typeof string}\``);
-  }
-  if (!string.includes("\x1B") && !string.includes("\x9B")) {
-    return string;
-  }
-  return string.replace(regex, "");
-}
-
-// node_modules/get-east-asian-width/lookup-data.js
-var ambiguousMinimalCodePoint = 161;
-var ambiguousMaximumCodePoint = 1114109;
-var ambiguousRanges = [161, 161, 164, 164, 167, 168, 170, 170, 173, 174, 176, 180, 182, 186, 188, 191, 198, 198, 208, 208, 215, 216, 222, 225, 230, 230, 232, 234, 236, 237, 240, 240, 242, 243, 247, 250, 252, 252, 254, 254, 257, 257, 273, 273, 275, 275, 283, 283, 294, 295, 299, 299, 305, 307, 312, 312, 319, 322, 324, 324, 328, 331, 333, 333, 338, 339, 358, 359, 363, 363, 462, 462, 464, 464, 466, 466, 468, 468, 470, 470, 472, 472, 474, 474, 476, 476, 593, 593, 609, 609, 708, 708, 711, 711, 713, 715, 717, 717, 720, 720, 728, 731, 733, 733, 735, 735, 768, 879, 913, 929, 931, 937, 945, 961, 963, 969, 1025, 1025, 1040, 1103, 1105, 1105, 8208, 8208, 8211, 8214, 8216, 8217, 8220, 8221, 8224, 8226, 8228, 8231, 8240, 8240, 8242, 8243, 8245, 8245, 8251, 8251, 8254, 8254, 8308, 8308, 8319, 8319, 8321, 8324, 8364, 8364, 8451, 8451, 8453, 8453, 8457, 8457, 8467, 8467, 8470, 8470, 8481, 8482, 8486, 8486, 8491, 8491, 8531, 8532, 8539, 8542, 8544, 8555, 8560, 8569, 8585, 8585, 8592, 8601, 8632, 8633, 8658, 8658, 8660, 8660, 8679, 8679, 8704, 8704, 8706, 8707, 8711, 8712, 8715, 8715, 8719, 8719, 8721, 8721, 8725, 8725, 8730, 8730, 8733, 8736, 8739, 8739, 8741, 8741, 8743, 8748, 8750, 8750, 8756, 8759, 8764, 8765, 8776, 8776, 8780, 8780, 8786, 8786, 8800, 8801, 8804, 8807, 8810, 8811, 8814, 8815, 8834, 8835, 8838, 8839, 8853, 8853, 8857, 8857, 8869, 8869, 8895, 8895, 8978, 8978, 9312, 9449, 9451, 9547, 9552, 9587, 9600, 9615, 9618, 9621, 9632, 9633, 9635, 9641, 9650, 9651, 9654, 9655, 9660, 9661, 9664, 9665, 9670, 9672, 9675, 9675, 9678, 9681, 9698, 9701, 9711, 9711, 9733, 9734, 9737, 9737, 9742, 9743, 9756, 9756, 9758, 9758, 9792, 9792, 9794, 9794, 9824, 9825, 9827, 9829, 9831, 9834, 9836, 9837, 9839, 9839, 9886, 9887, 9919, 9919, 9926, 9933, 9935, 9939, 9941, 9953, 9955, 9955, 9960, 9961, 9963, 9969, 9972, 9972, 9974, 9977, 9979, 9980, 9982, 9983, 10045, 10045, 10102, 10111, 11094, 11097, 12872, 12879, 57344, 63743, 65024, 65039, 65533, 65533, 127232, 127242, 127248, 127277, 127280, 127337, 127344, 127373, 127375, 127376, 127387, 127404, 917760, 917999, 983040, 1048573, 1048576, 1114109];
-var fullwidthMinimalCodePoint = 12288;
-var fullwidthMaximumCodePoint = 65510;
-var fullwidthRanges = [12288, 12288, 65281, 65376, 65504, 65510];
-var wideMinimalCodePoint = 4352;
-var wideMaximumCodePoint = 262141;
-var wideRanges = [4352, 4447, 8986, 8987, 9001, 9002, 9193, 9196, 9200, 9200, 9203, 9203, 9725, 9726, 9748, 9749, 9776, 9783, 9800, 9811, 9855, 9855, 9866, 9871, 9875, 9875, 9889, 9889, 9898, 9899, 9917, 9918, 9924, 9925, 9934, 9934, 9940, 9940, 9962, 9962, 9970, 9971, 9973, 9973, 9978, 9978, 9981, 9981, 9989, 9989, 9994, 9995, 10024, 10024, 10060, 10060, 10062, 10062, 10067, 10069, 10071, 10071, 10133, 10135, 10160, 10160, 10175, 10175, 11035, 11036, 11088, 11088, 11093, 11093, 11904, 11929, 11931, 12019, 12032, 12245, 12272, 12287, 12289, 12350, 12353, 12438, 12441, 12543, 12549, 12591, 12593, 12686, 12688, 12773, 12783, 12830, 12832, 12871, 12880, 42124, 42128, 42182, 43360, 43388, 44032, 55203, 63744, 64255, 65040, 65049, 65072, 65106, 65108, 65126, 65128, 65131, 94176, 94180, 94192, 94198, 94208, 101594, 101631, 101664, 101760, 101874, 101888, 102801, 102816, 102866, 110576, 110579, 110581, 110587, 110589, 110590, 110592, 110888, 110898, 110898, 110928, 110930, 110933, 110933, 110948, 110952, 110960, 111355, 119552, 119638, 119648, 119670, 126980, 126980, 127183, 127183, 127374, 127374, 127377, 127386, 127406, 127406, 127488, 127490, 127504, 127547, 127552, 127560, 127568, 127569, 127584, 127589, 127744, 127776, 127789, 127797, 127799, 127868, 127870, 127891, 127904, 127946, 127951, 127955, 127968, 127984, 127988, 127988, 127992, 128062, 128064, 128064, 128066, 128252, 128255, 128317, 128331, 128334, 128336, 128359, 128378, 128378, 128405, 128406, 128420, 128420, 128507, 128591, 128640, 128709, 128716, 128716, 128720, 128722, 128725, 128729, 128732, 128735, 128747, 128748, 128756, 128764, 128986, 128986, 128992, 129003, 129008, 129008, 129292, 129338, 129340, 129349, 129351, 129535, 129648, 129660, 129664, 129734, 129736, 129736, 129740, 129757, 129759, 129771, 129775, 129786, 131072, 196605, 196608, 262141];
-
-// node_modules/get-east-asian-width/utilities.js
-var isInRange = (ranges, codePoint) => {
-  let low = 0;
-  let high = Math.floor(ranges.length / 2) - 1;
-  while (low <= high) {
-    const mid = Math.floor((low + high) / 2);
-    const i = mid * 2;
-    if (codePoint < ranges[i]) {
-      high = mid - 1;
-    } else if (codePoint > ranges[i + 1]) {
-      low = mid + 1;
-    } else {
-      return true;
-    }
-  }
-  return false;
-};
-
-// node_modules/get-east-asian-width/lookup.js
-var commonCjkCodePoint = 19968;
-var [wideFastPathStart, wideFastPathEnd] = /* @__PURE__ */ findWideFastPathRange(wideRanges);
-function findWideFastPathRange(ranges) {
-  let fastPathStart = ranges[0];
-  let fastPathEnd = ranges[1];
-  for (let index = 0; index < ranges.length; index += 2) {
-    const start = ranges[index];
-    const end = ranges[index + 1];
-    if (commonCjkCodePoint >= start && commonCjkCodePoint <= end) {
-      return [start, end];
-    }
-    if (end - start > fastPathEnd - fastPathStart) {
-      fastPathStart = start;
-      fastPathEnd = end;
-    }
-  }
-  return [fastPathStart, fastPathEnd];
-}
-var isAmbiguous = (codePoint) => {
-  if (codePoint < ambiguousMinimalCodePoint || codePoint > ambiguousMaximumCodePoint) {
-    return false;
-  }
-  return isInRange(ambiguousRanges, codePoint);
-};
-var isFullwidth = (codePoint) => {
-  if (codePoint < fullwidthMinimalCodePoint || codePoint > fullwidthMaximumCodePoint) {
-    return false;
-  }
-  return isInRange(fullwidthRanges, codePoint);
-};
-var isWide = (codePoint) => {
-  if (codePoint >= wideFastPathStart && codePoint <= wideFastPathEnd) {
-    return true;
-  }
-  if (codePoint < wideMinimalCodePoint || codePoint > wideMaximumCodePoint) {
-    return false;
-  }
-  return isInRange(wideRanges, codePoint);
-};
-
-// node_modules/get-east-asian-width/index.js
-function validate(codePoint) {
-  if (!Number.isSafeInteger(codePoint)) {
-    throw new TypeError(`Expected a code point, got \`${typeof codePoint}\`.`);
-  }
-}
-function eastAsianWidth(codePoint, { ambiguousAsWide = false } = {}) {
-  validate(codePoint);
-  if (isFullwidth(codePoint) || isWide(codePoint) || ambiguousAsWide && isAmbiguous(codePoint)) {
-    return 2;
-  }
-  return 1;
-}
-
-// node_modules/string-width/index.js
-var segmenter = new Intl.Segmenter();
-var zeroWidthClusterRegex = new RegExp("^(?:\\p{Default_Ignorable_Code_Point}|\\p{Control}|\\p{Format}|\\p{Nonspacing_Mark}|\\p{Enclosing_Mark}|\\p{Surrogate})+$", "v");
-var leadingNonPrintingRegex = new RegExp("^[\\p{Default_Ignorable_Code_Point}\\p{Control}\\p{Format}\\p{Nonspacing_Mark}\\p{Enclosing_Mark}\\p{Surrogate}]+", "v");
-var spacingMarkRegex = new RegExp("\\p{Spacing_Mark}", "v");
-var rgiEmojiRegex = new RegExp("^\\p{RGI_Emoji}$", "v");
-var unqualifiedKeycapRegex = /^[\d#*]\u20E3$/;
-var extendedPictographicRegex = new RegExp("\\p{Extended_Pictographic}", "gu");
-function isDoubleWidthNonRgiEmojiSequence(segment) {
-  if (segment.length > 50) {
-    return false;
-  }
-  if (unqualifiedKeycapRegex.test(segment)) {
-    return true;
-  }
-  if (segment.includes("\u200D")) {
-    const pictographics = segment.match(extendedPictographicRegex);
-    return pictographics !== null && pictographics.length >= 2;
-  }
-  return false;
-}
-function baseVisible(segment) {
-  return segment.replace(leadingNonPrintingRegex, "");
-}
-function isZeroWidthCluster(segment) {
-  return zeroWidthClusterRegex.test(segment);
-}
-function isHangulLeadingJamo(codePoint) {
-  return codePoint >= 4352 && codePoint <= 4447 || codePoint >= 43360 && codePoint <= 43388;
-}
-function isHangulVowelJamo(codePoint) {
-  return codePoint >= 4448 && codePoint <= 4519 || codePoint >= 55216 && codePoint <= 55238;
-}
-function isHangulTrailingJamo(codePoint) {
-  return codePoint >= 4520 && codePoint <= 4607 || codePoint >= 55243 && codePoint <= 55291;
-}
-function isHangulJamo(codePoint) {
-  return isHangulLeadingJamo(codePoint) || isHangulVowelJamo(codePoint) || isHangulTrailingJamo(codePoint);
-}
-function hangulClusterWidth(visibleSegment, eastAsianWidthOptions) {
-  const codePoints = [];
-  for (const character of visibleSegment) {
-    if (zeroWidthClusterRegex.test(character)) {
-      continue;
-    }
-    codePoints.push(character.codePointAt(0));
-  }
-  if (codePoints.length === 0) {
-    return void 0;
-  }
-  let width = 0;
-  for (let index = 0; index < codePoints.length; index++) {
-    const codePoint = codePoints[index];
-    if (!isHangulJamo(codePoint)) {
-      if (width === 0) {
-        return void 0;
-      }
-      for (let remaining = index; remaining < codePoints.length; remaining++) {
-        width += eastAsianWidth(codePoints[remaining], eastAsianWidthOptions);
-      }
-      return width;
-    }
-    if (isHangulLeadingJamo(codePoint) && isHangulVowelJamo(codePoints[index + 1])) {
-      width += 2;
-      index += isHangulTrailingJamo(codePoints[index + 2]) ? 2 : 1;
-      continue;
-    }
-    width += eastAsianWidth(codePoint, eastAsianWidthOptions);
-  }
-  return width;
-}
-function trailingWidth(visibleSegment, eastAsianWidthOptions) {
-  let extra = 0;
-  let first = true;
-  for (const character of visibleSegment) {
-    if (first) {
-      first = false;
-      continue;
-    }
-    if (spacingMarkRegex.test(character) || character >= "\uFF00" && character <= "\uFFEF") {
-      extra += eastAsianWidth(character.codePointAt(0), eastAsianWidthOptions);
-    }
-  }
-  return extra;
-}
-function stringWidth(input, options = {}) {
-  if (typeof input !== "string" || input.length === 0) {
-    return 0;
-  }
-  const {
-    ambiguousIsNarrow = true,
-    countAnsiEscapeCodes = false
-  } = options;
-  let string = input;
-  if (!countAnsiEscapeCodes && (string.includes("\x1B") || string.includes("\x9B"))) {
-    string = stripAnsi(string);
-  }
-  if (string.length === 0) {
-    return 0;
-  }
-  if (/^[\u0020-\u007E]*$/.test(string)) {
-    return string.length;
-  }
-  let width = 0;
-  const eastAsianWidthOptions = { ambiguousAsWide: !ambiguousIsNarrow };
-  for (const { segment } of segmenter.segment(string)) {
-    if (isZeroWidthCluster(segment)) {
-      continue;
-    }
-    if (rgiEmojiRegex.test(segment) || isDoubleWidthNonRgiEmojiSequence(segment)) {
-      width += 2;
-      continue;
-    }
-    const visibleSegment = baseVisible(segment);
-    const hangulWidth = hangulClusterWidth(visibleSegment, eastAsianWidthOptions);
-    if (hangulWidth !== void 0) {
-      width += hangulWidth;
-      continue;
-    }
-    const codePoint = visibleSegment.codePointAt(0);
-    width += eastAsianWidth(codePoint, eastAsianWidthOptions);
-    width += trailingWidth(visibleSegment, eastAsianWidthOptions);
-  }
-  return width;
-}
-
-// packages/cli/tui/tuiAnsi.ts
-var ANSI_ESCAPE_REGEX = /\x1b\[[\x30-\x3f]*[\x20-\x2f]*[\x40-\x7e]/g;
-var OSC8_HYPERLINK_REGEX = /\x1b\]8;;[^\x1b]*\x1b\\/g;
-var ALL_ANSI_ESCAPE_REGEX = ansiRegex();
-var FIRST_ANSI_ESCAPE_REGEX = ansiRegex({ onlyFirst: true });
-function stripOsc8Hyperlinks(text) {
-  return text.replace(OSC8_HYPERLINK_REGEX, "");
-}
-function stripAnsi2(text) {
-  return text.replace(ANSI_ESCAPE_REGEX, "").replace(ALL_ANSI_ESCAPE_REGEX, "");
-}
-var SGR_SEQUENCE_REGEX = /^\x1b\[[0-9;]*m/;
-var TRAILING_SGR_REGEX = /(?:\x1b\[[0-9;]*m)+$/;
-function applyTerminalOutputToText(existing, chunk) {
-  if (!chunk) return existing;
-  let text = existing;
-  let index = 0;
-  while (index < chunk.length) {
-    if (chunk[index] === "\x1B") {
-      const sgr = SGR_SEQUENCE_REGEX.exec(chunk.slice(index));
-      if (sgr) {
-        text += sgr[0];
-        index += sgr[0].length;
-        continue;
-      }
-      const osc = chunk.slice(index).match(/^\x1b\]8;;[^\x07\x1b]*(?:\x07|\x1b\\)/);
-      if (osc) {
-        index += osc[0].length;
-        continue;
-      }
-      const csi = chunk.slice(index).match(/^\x1b\[[\x30-\x3f]*[\x20-\x2f]*[\x40-\x7e]/);
-      if (csi) {
-        index += csi[0].length;
-        continue;
-      }
-      index += 1;
-      continue;
-    }
-    const ch = chunk[index];
-    if (ch === "\r") {
-      const lastNl = text.lastIndexOf("\n");
-      text = lastNl === -1 ? "" : text.slice(0, lastNl + 1);
-      index += 1;
-      continue;
-    }
-    if (ch === "\n") {
-      text += "\n";
-      index += 1;
-      continue;
-    }
-    if (ch === "\b") {
-      const trailing = TRAILING_SGR_REGEX.exec(text);
-      const sgrTail = trailing ? trailing[0] : "";
-      const head = sgrTail ? text.slice(0, -sgrTail.length) : text;
-      if (head.length > 0 && head[head.length - 1] !== "\n") {
-        text = head.slice(0, -1) + sgrTail;
-      }
-      index += 1;
-      continue;
-    }
-    const code = ch.charCodeAt(0);
-    if (code < 32 && ch !== "	" || code === 127) {
-      index += 1;
-      continue;
-    }
-    text += ch;
-    index += 1;
-  }
-  return text;
-}
-function resolveAmbiguousWidth(explicit, env = process.env) {
-  if (explicit === "wide" || explicit === "narrow") return explicit;
-  const raw = env.NOLO_TUI_AMBIGUOUS_WIDTH;
-  if (typeof raw === "string") {
-    const trimmed = raw.trim().toLowerCase();
-    if (trimmed === "wide") return "wide";
-    if (trimmed === "narrow") return "narrow";
-  }
-  return "narrow";
-}
-function isAmbiguousWideSymbolCode(code) {
-  return code >= 8592 && code <= 8597 || // ←↑→↓↔↕
-  code === 8656 || code === 8658 || code === 8660 || // ⇐⇒⇔
-  code === 215 || code === 247 || code === 177 || // ×÷±
-  code === 8226 || code === 183 || // • ·
-  code === 176 || code === 8451 || // ° ℃
-  code >= 8208 && code <= 8213 || // ‐‑‒–—―
-  code >= 9312 && code <= 9471 || // ①②④⑤ 圈数字/括号序号
-  code === 8986 || code === 8987 || // ⌚ ⌛
-  code >= 9193 && code <= 9210;
-}
-function isForceWideSymbolCode(code) {
-  return code >= 9728 && code <= 10175 && !(code >= 10088 && code <= 10101) || code >= 11008 && code <= 11263 || code >= 127744 && code <= 129791 || isAmbiguousWideSymbolCode(code);
-}
-function isCjkQuoteCode(code) {
-  return code === 8220 || code === 8221 || code === 8216 || code === 8217;
-}
-function scanWidthNeeds(plain, locale, ambiguousWidth) {
-  let hasNonAscii = false;
-  const isWideMode = ambiguousWidth === "wide";
-  for (let i = 0; i < plain.length; i++) {
-    const cc = plain.charCodeAt(i);
-    if (isWideMode && isAmbiguousWideSymbolCode(cc)) {
-      return { hasNonAscii: true, hasCandidate: true };
-    }
-    if (cc < 8192) {
-      if (cc >= 128) hasNonAscii = true;
-      continue;
-    }
-    hasNonAscii = true;
-    let code = cc;
-    if (cc >= 55296 && cc <= 56319 && i + 1 < plain.length) {
-      const lo = plain.charCodeAt(i + 1);
-      if (lo >= 56320 && lo <= 57343) {
-        code = (cc - 55296) * 1024 + (lo - 56320) + 65536;
-        i += 1;
-      }
-    }
-    const isSymbolCandidate = isWideMode && isForceWideSymbolCode(code);
-    const isQuoteCandidate = locale === "zh" && isCjkQuoteCode(code);
-    if (isSymbolCandidate || isQuoteCandidate) {
-      return { hasNonAscii: true, hasCandidate: true };
-    }
-  }
-  return { hasNonAscii, hasCandidate: false };
-}
-var displayWidthCache = /* @__PURE__ */ new Map();
-var DISPLAY_WIDTH_CACHE_MAX = 4096;
-function displayWidth(str, ambiguousWidth = resolveAmbiguousWidth()) {
-  const plain = stripAnsi2(str);
-  const locale = getCliLocale();
-  const needs = scanWidthNeeds(plain, locale, ambiguousWidth);
-  if (!needs.hasNonAscii) {
-    return stringWidth(plain);
-  }
-  const key = locale + "\0" + ambiguousWidth + "\0" + plain;
-  const cached = displayWidthCache.get(key);
-  if (cached !== void 0) return cached;
-  const base = stringWidth(plain);
-  if (!needs.hasCandidate) {
-    if (displayWidthCache.size >= DISPLAY_WIDTH_CACHE_MAX) {
-      const eldest = displayWidthCache.keys().next().value;
-      if (eldest !== void 0) displayWidthCache.delete(eldest);
-    }
-    displayWidthCache.set(key, base);
-    return base;
-  }
-  let width = base;
-  const isWideMode = ambiguousWidth === "wide";
-  for (const { segment } of graphemeSegmenter.segment(plain)) {
-    const code = segment.codePointAt(0) ?? 0;
-    const isSymbol = isWideMode && isForceWideSymbolCode(code);
-    const isQuote = locale === "zh" && isCjkQuoteCode(code);
-    if (isSymbol || isQuote) {
-      if (stringWidth(segment) === 1) width += 1;
-    }
-  }
-  if (displayWidthCache.size >= DISPLAY_WIDTH_CACHE_MAX) {
-    const eldest = displayWidthCache.keys().next().value;
-    if (eldest !== void 0) displayWidthCache.delete(eldest);
-  }
-  displayWidthCache.set(key, width);
-  return width;
-}
-function visibleWidth(str) {
-  return displayWidth(stripAnsi2(str));
-}
-function truncateAnsi(text, maxWidth) {
-  if (maxWidth <= 0) return "";
-  text = stripOsc8Hyperlinks(text);
-  if (visibleWidth(text) <= maxWidth) return text;
-  let width = 0;
-  let out = "";
-  let i = 0;
-  let sawAnsi = false;
-  while (i < text.length) {
-    if (text[i] === "\x1B" && text[i + 1] === "[") {
-      sawAnsi = true;
-      let j = i + 2;
-      while (j < text.length) {
-        const code = text.charCodeAt(j);
-        j += 1;
-        if (code >= 64 && code <= 126) break;
-      }
-      out += text.slice(i, j);
-      i = j;
-      continue;
-    }
-    const codePoint = text.codePointAt(i) ?? 0;
-    const char = String.fromCodePoint(codePoint);
-    const charWidth = displayWidth(char);
-    if (width + charWidth > maxWidth) break;
-    out += char;
-    width += charWidth;
-    i += char.length;
-  }
-  return sawAnsi ? `${out}\x1B[0m` : out;
-}
-function fitAnsiLine(text, width, ellipsis = "\u2026") {
-  if (width <= 0) return "";
-  if (visibleWidth(text) <= width) return text;
-  const ellipsisWidth = displayWidth(ellipsis);
-  if (width < ellipsisWidth) return truncateAnsi(text, width);
-  if (width === ellipsisWidth) return truncateAnsi(ellipsis, width) || truncateAnsi(text, width);
-  return `${truncateAnsi(text, width - ellipsisWidth)}${ellipsis}`;
-}
-function countPhysicalLines(text, columns) {
-  const lines = text.split("\n");
-  let total = 0;
-  for (const line of lines) {
-    const width = visibleWidth(stripOsc8Hyperlinks(line));
-    total += Math.max(1, Math.ceil(width / columns));
-  }
-  return Math.max(total, 1);
-}
-function takeDisplayWidth(text, width) {
-  let used = 0;
-  let index = 0;
-  for (const char of text) {
-    const charWidth = displayWidth(char);
-    if (used + charWidth > width && used > 0) break;
-    used += charWidth;
-    index += char.length;
-  }
-  return { prefix: text.slice(0, index), rest: text.slice(index) };
-}
-function padOrTruncateToWidth(text, width) {
-  const textWidth = visibleWidth(text);
-  if (textWidth > width) {
-    return truncateAnsi(text, width);
-  }
-  return `${text}${" ".repeat(width - textWidth)}`;
-}
-var SGR_RESET_REGEX = /^\x1b\[0?m$/;
-var graphemeSegmenter = new Intl.Segmenter(void 0, { granularity: "grapheme" });
-function tokenizeAnsiLine(line) {
-  const tokens = [];
-  let index = 0;
-  while (index < line.length) {
-    if (line[index] === "\x1B") {
-      const osc = line.slice(index).match(/^\x1b\]8;;[^\x07\x1b]*(?:\x07|\x1b\\)/);
-      if (osc) {
-        tokens.push({ kind: "sgr", value: osc[0], width: 0, charIndex: index });
-        index += osc[0].length;
-        continue;
-      }
-      const sgr = SGR_SEQUENCE_REGEX.exec(line.slice(index));
-      if (sgr) {
-        tokens.push({ kind: "sgr", value: sgr[0], width: 0, charIndex: index });
-        index += sgr[0].length;
-        continue;
-      }
-      const csi = line.slice(index).match(/^\x1b\[[\x30-\x3f]*[\x20-\x2f]*[\x40-\x7e]/);
-      if (csi) {
-        index += csi[0].length;
-        continue;
-      }
-      const escape = FIRST_ANSI_ESCAPE_REGEX.exec(line.slice(index));
-      if (escape?.index === 0) {
-        index += escape[0].length;
-        continue;
-      }
-      index += 1;
-      continue;
-    }
-    let nextEsc = line.indexOf("\x1B", index);
-    if (nextEsc === -1) nextEsc = line.length;
-    const chunk = line.slice(index, nextEsc);
-    for (const item of graphemeSegmenter.segment(chunk)) {
-      tokens.push({
-        kind: "char",
-        value: item.segment,
-        width: displayWidth(item.segment),
-        charIndex: index + item.index
-      });
-    }
-    index = nextEsc;
-  }
-  return tokens;
-}
-function buildSourceMapping(rawLine, styledLine, prefixCharCount) {
-  let contentStart = 0;
-  const headingMatch = rawLine.match(/^(#{1,3})\s+(.+)$/);
-  let lineToParse = rawLine;
-  if (headingMatch) {
-    contentStart = headingMatch[1].length + 1;
-    while (contentStart < rawLine.length && rawLine[contentStart] === " ") contentStart++;
-    lineToParse = rawLine.slice(contentStart);
-  }
-  const INLINE_RE = /(\[([^\]]+)\]\(([^)\s]+)\)|`([^`]+)`|\*\*(.+?)\*\*|(?<!\*)\*([^*]+?)\*(?!\*)|~~([^~]+?)~~)/g;
-  const mapping = [];
-  let lastIdx = 0;
-  let match;
-  while ((match = INLINE_RE.exec(lineToParse)) !== null) {
-    const plainBefore = lineToParse.slice(lastIdx, match.index);
-    for (let c = 0; c < plainBefore.length; c++) {
-      mapping.push(contentStart + lastIdx + c);
-    }
-    const fullMatch = match[0];
-    if (match[2] !== void 0 && match[3] !== void 0) {
-      const linkText = match[2];
-      const linkUrl = match[3];
-      const textOffset = contentStart + match.index + 1;
-      for (let c = 0; c < linkText.length; c++) {
-        mapping.push(textOffset + c);
-      }
-      const parenOffset = textOffset + linkText.length;
-      mapping.push(parenOffset);
-      mapping.push(parenOffset + 1);
-      const urlOffset = parenOffset + 2;
-      for (let c = 0; c < linkUrl.length; c++) {
-        mapping.push(urlOffset + c);
-      }
-      mapping.push(urlOffset + linkUrl.length);
-    } else if (match[4] !== void 0) {
-      const codeText = match[4];
-      const codeOffset = contentStart + match.index + 1;
-      for (let c = 0; c < codeText.length; c++) {
-        mapping.push(codeOffset + c);
-      }
-    } else if (match[5] !== void 0) {
-      const boldText = match[5];
-      const boldOffset = contentStart + match.index + 2;
-      for (let c = 0; c < boldText.length; c++) {
-        mapping.push(boldOffset + c);
-      }
-    } else if (match[6] !== void 0) {
-      const italicText = match[6];
-      const italicOffset = contentStart + match.index + 1;
-      for (let c = 0; c < italicText.length; c++) {
-        mapping.push(italicOffset + c);
-      }
-    } else if (match[7] !== void 0) {
-      const strikeText = match[7];
-      const strikeOffset = contentStart + match.index + 2;
-      for (let c = 0; c < strikeText.length; c++) {
-        mapping.push(strikeOffset + c);
-      }
-    }
-    lastIdx = match.index + fullMatch.length;
-  }
-  const plainRest = lineToParse.slice(lastIdx);
-  for (let c = 0; c < plainRest.length; c++) {
-    mapping.push(contentStart + lastIdx + c);
-  }
-  return mapping;
-}
-function wrapTranscriptLineWithLayout(line, columns, hangingIndent = "", lineSourceStart = 0, prefixWidth = 0, prefixCharCount = 0, sourceMapping, rawLineLength) {
-  if (line === "") {
-    const rawLen = rawLineLength ?? 0;
-    return [
-      {
-        rendered: "",
-        sourceStart: lineSourceStart,
-        sourceEnd: lineSourceStart + rawLen,
-        prefixWidth
-      }
-    ];
-  }
-  const tokens = tokenizeAnsiLine(line);
-  const rows = [];
-  let activeStyles = [];
-  const applyStyleToken = (value) => {
-    if (SGR_RESET_REGEX.test(value)) {
-      activeStyles = [];
-    } else {
-      activeStyles.push(value);
-    }
-  };
-  let lastContentTokenIndex = -1;
-  for (let i = tokens.length - 1; i >= 0; i -= 1) {
-    if (tokens[i].kind !== "sgr") {
-      lastContentTokenIndex = i;
-      break;
-    }
-  }
-  let plainCharIndexAtStart = 0;
-  let start = 0;
-  while (start < tokens.length) {
-    if (start > lastContentTokenIndex && rows.length > 0) break;
-    const openingStyles = [...activeStyles];
-    const isContinuation = rows.length > 0;
-    const currentPrefixWidth = isContinuation ? visibleWidth(hangingIndent) : prefixWidth;
-    const indentWidth = isContinuation ? visibleWidth(hangingIndent) : 0;
-    const maxSegmentWidth = Math.max(1, columns - indentWidth);
-    let width = 0;
-    let end = start;
-    let lastBreak2 = -1;
-    while (end < tokens.length) {
-      const token = tokens[end];
-      if (token.kind === "sgr") {
-        end += 1;
-        continue;
-      }
-      if (width + token.width > maxSegmentWidth && width > 0) break;
-      width += token.width;
-      end += 1;
-      if ((token.value === " " || token.value === "	") && token.charIndex >= prefixCharCount) {
-        lastBreak2 = end;
-      }
-    }
-    let segmentEnd = end;
-    if (end < tokens.length && lastBreak2 > start) {
-      const overflowToken = tokens[end];
-      if (overflowToken.kind === "char" && overflowToken.value !== " " && overflowToken.width === 1) {
-        segmentEnd = lastBreak2;
-      }
-    }
-    if (segmentEnd === start) segmentEnd = start + 1;
-    let segment = "";
-    let sawStyle = openingStyles.length > 0;
-    for (let i = start; i < segmentEnd; i += 1) {
-      const token = tokens[i];
-      segment += token.value;
-      if (token.kind === "sgr") {
-        sawStyle = true;
-        applyStyleToken(token.value);
-      }
-    }
-    const prefix = openingStyles.join("");
-    const needsReset = (sawStyle || activeStyles.length > 0) && !segment.endsWith("\x1B[0m");
-    const lineContent = `${prefix}${segment}${needsReset ? "\x1B[0m" : ""}`;
-    const rowRendered = isContinuation && hangingIndent.length > 0 ? `${hangingIndent}${lineContent}` : lineContent;
-    let segSourceStart = lineSourceStart;
-    let segSourceEnd = lineSourceStart;
-    let foundFirst = false;
-    const rowMapping = [];
-    let plainCharIndex = plainCharIndexAtStart;
-    for (let i = start; i < segmentEnd; i++) {
-      const tok = tokens[i];
-      if (tok.kind === "char" && tok.charIndex >= prefixCharCount) {
-        const mappedOffset = sourceMapping && sourceMapping[plainCharIndex] !== void 0 ? sourceMapping[plainCharIndex] : plainCharIndex;
-        if (!foundFirst) {
-          segSourceStart = lineSourceStart + mappedOffset;
-          foundFirst = true;
-        }
-        for (let c = 0; c < tok.value.length; c++) {
-          const idx = plainCharIndex + c;
-          const mapped = sourceMapping && sourceMapping[idx] !== void 0 ? sourceMapping[idx] : idx;
-          rowMapping.push(lineSourceStart + mapped);
-        }
-        const lastCharIdx = plainCharIndex + tok.value.length - 1;
-        const mappedEndOffset = sourceMapping && sourceMapping[lastCharIdx] !== void 0 ? sourceMapping[lastCharIdx] + 1 : plainCharIndex + tok.value.length;
-        segSourceEnd = lineSourceStart + mappedEndOffset;
-        plainCharIndex += tok.value.length;
-      }
-    }
-    start = segmentEnd;
-    let softWrapJoiner = "";
-    while (start < tokens.length) {
-      const token = tokens[start];
-      if (token.kind === "char" && token.value === " " && token.charIndex >= prefixCharCount) {
-        softWrapJoiner += token.value;
-        const mappedOffset = sourceMapping && sourceMapping[plainCharIndex] !== void 0 ? sourceMapping[plainCharIndex] + 1 : plainCharIndex + 1;
-        segSourceEnd = lineSourceStart + mappedOffset;
-        plainCharIndex += token.value.length;
-        start += 1;
-        continue;
-      }
-      break;
-    }
-    if (start >= tokens.length && rawLineLength !== void 0) {
-      segSourceEnd = lineSourceStart + rawLineLength;
-    }
-    plainCharIndexAtStart = plainCharIndex;
-    rows.push({
-      rendered: rowRendered,
-      sourceStart: segSourceStart,
-      sourceEnd: segSourceEnd,
-      prefixWidth: currentPrefixWidth,
-      sourceMapping: rowMapping.length > 0 ? rowMapping : void 0,
-      softWrapped: start < tokens.length,
-      softWrapJoiner
-    });
-  }
-  return rows.length > 0 ? rows : [
-    {
-      rendered: "",
-      sourceStart: lineSourceStart,
-      sourceEnd: lineSourceStart + (rawLineLength ?? 0),
-      prefixWidth
-    }
-  ];
-}
-function wrapTranscriptLine(line, columns, hangingIndent = "") {
-  return wrapTranscriptLineWithLayout(line, columns, hangingIndent).map((r) => r.rendered);
-}
-function buildWindowTitle(title) {
-  const plain = stripAnsi2(title).replace(/[\x00-\x1f\x7f]+/g, " ");
-  let truncated = "";
-  let width = 0;
-  const maxCols = 80;
-  for (const char of plain) {
-    const charWidth = displayWidth(char);
-    if (width + charWidth > maxCols) break;
-    truncated += char;
-    width += charWidth;
-  }
-  return `\x1B]0;${truncated}\x07\x1B]2;${truncated}\x07`;
-}
-function wrapTextToLines(text, columns) {
-  const result = [];
-  for (const logicalLine of text.split("\n")) {
-    if (logicalLine === "") {
-      result.push("");
-      continue;
-    }
-    let remaining = logicalLine;
-    while (remaining.length > 0) {
-      const { prefix, rest } = takeDisplayWidth(remaining, columns);
-      result.push(prefix);
-      remaining = rest;
-    }
-  }
-  return result;
-}
-
 // packages/cli/tui/theme.ts
 var THEME_PALETTES = {
   trail: {
@@ -2991,7 +2444,7 @@ var WIDTHS = [
 ];
 
 // node_modules/lovely-mermaid/dist/width.js
-var segmenter2 = new Intl.Segmenter("en", { granularity: "grapheme" });
+var segmenter = new Intl.Segmenter("en", { granularity: "grapheme" });
 var VS16 = 65039;
 var isRegionalIndicator = (cp) => cp >= 127462 && cp <= 127487;
 function codePointWidth(cp) {
@@ -3026,12 +2479,12 @@ function clusterWidth(cluster) {
   return vs16 || regional >= 2 ? 2 : w;
 }
 function* measured(s) {
-  for (const { segment } of segmenter2.segment(s))
+  for (const { segment } of segmenter.segment(s))
     yield [segment, clusterWidth(segment)];
 }
-function stringWidth2(s) {
+function stringWidth(s) {
   let w = 0;
-  for (const { segment } of segmenter2.segment(s))
+  for (const { segment } of segmenter.segment(s))
     w += clusterWidth(segment);
   return w;
 }
@@ -3228,7 +2681,7 @@ function wrapLabel(label, width, maxLines) {
   let cur = "";
   let curW = 0;
   for (const word of label.split(/\s+/).filter((w) => w !== "")) {
-    const ww = stringWidth2(word);
+    const ww = stringWidth(word);
     if (ww > width) {
       if (cur !== "") {
         lines.push(cur);
@@ -3242,7 +2695,7 @@ function wrapLabel(label, width, maxLines) {
           const carry = p === -1 ? "" : chunk.slice(p + 1);
           lines.push(p === -1 ? chunk : chunk.slice(0, p + 1));
           chunk = carry;
-          chunkW = stringWidth2(carry);
+          chunkW = stringWidth(carry);
         }
         chunk += ch;
         chunkW += cw;
@@ -3281,7 +2734,7 @@ function wrapLabel(label, width, maxLines) {
   return lines;
 }
 function fitLabel(label, inner) {
-  if (stringWidth2(label) <= inner)
+  if (stringWidth(label) <= inner)
     return label;
   let out = "";
   let used = 0;
@@ -4073,7 +3526,7 @@ function placeTd(ranks, maxRank, byRank, sizes, graph, placed) {
   const edgeLabelLeft = new Array(graph.edges.length).fill(false);
   const labelW = (e) => {
     const parts = [e.label, e.cardTo].filter((p) => p != null);
-    return parts.length === 0 ? -1 : Math.max(...parts.map((p) => Math.min(stringWidth2(p), MAX_LABEL)));
+    return parts.length === 0 ? -1 : Math.max(...parts.map((p) => Math.min(stringWidth(p), MAX_LABEL)));
   };
   const skipsInto = graph.nodes.map(() => []);
   const fwdsInto = graph.nodes.map(() => []);
@@ -4241,21 +3694,21 @@ function placeTd(ranks, maxRank, byRank, sizes, graph, placed) {
     if (ranks[e.to] === ranks[e.from] + 1) {
       const parts = [e.label, e.cardTo].filter((part) => part != null);
       for (const part of parts) {
-        const lw = Math.min(stringWidth2(part), MAX_LABEL);
+        const lw = Math.min(stringWidth(part), MAX_LABEL);
         contentW = Math.max(contentW, placed[e.to].cx + 2 + lw);
       }
       if (e.cardFrom !== void 0) {
-        contentW = Math.max(contentW, placed[e.from].cx + 2 + stringWidth2(e.cardFrom));
+        contentW = Math.max(contentW, placed[e.from].cx + 2 + stringWidth(e.cardFrom));
       }
     } else if (isAdjacentBack(ranks, e)) {
       const text = edgeText(e);
       if (text !== null) {
-        contentW = Math.max(contentW, placed[e.to].cx + 2 + Math.min(stringWidth2(text), MAX_LABEL));
+        contentW = Math.max(contentW, placed[e.to].cx + 2 + Math.min(stringWidth(text), MAX_LABEL));
       }
     } else {
       const text = edgeText(e);
       if (text !== null) {
-        contentW = Math.max(contentW, diagramW + Math.min(stringWidth2(text), MAX_LABEL) + 1);
+        contentW = Math.max(contentW, diagramW + Math.min(stringWidth(text), MAX_LABEL) + 1);
       }
     }
   }
@@ -4309,8 +3762,8 @@ function placeLr(ranks, maxRank, byRank, sizes, graph, placed) {
       return;
     if (ranks[e.to] !== ranks[e.from] + 1 && !edgeStraight[i])
       return;
-    const verb = e.label === null ? 0 : Math.min(stringWidth2(e.label), MAX_LABEL);
-    const cards = [e.cardFrom, e.cardTo].filter((c) => c !== void 0).reduce((w, c) => w + stringWidth2(c) + 1, 0);
+    const verb = e.label === null ? 0 : Math.min(stringWidth(e.label), MAX_LABEL);
+    const cards = [e.cardFrom, e.cardTo].filter((c) => c !== void 0).reduce((w, c) => w + stringWidth(c) + 1, 0);
     bandLabel[ranks[e.from]] = Math.max(bandLabel[ranks[e.from]], verb + cards);
   });
   const edgeBus = new Array(graph.edges.length).fill(0);
@@ -4421,10 +3874,10 @@ function layoutCanvas(graph, extras) {
   for (const row of byRank)
     row.sort((a, b) => Number(inLane[a]) - Number(inLane[b]));
   const wrapped = graph.nodes.map((node) => wrapLabel(node.label, WRAP_WIDTH, MAX_LINES));
-  const widest = (lines) => Math.max(1, lines.length === 0 ? 1 : Math.max(...lines.map(stringWidth2)));
+  const widest = (lines) => Math.max(1, lines.length === 0 ? 1 : Math.max(...lines.map(stringWidth)));
   const boxW = extras.map((extra, i) => {
     if (extra.kind === "frame") {
-      return Math.max(extra.sub.w + 2, stringWidth2(fitLabel(graph.nodes[i].label, WRAP_WIDTH)) + 4);
+      return Math.max(extra.sub.w + 2, stringWidth(fitLabel(graph.nodes[i].label, WRAP_WIDTH)) + 4);
     }
     if (extra.kind === "compartments")
       return widest(extra.sections.flat()) + 2 * PAD + 2;
@@ -4447,7 +3900,7 @@ function layoutCanvas(graph, extras) {
     extraH[e.from] = 2;
     const text = edgeText(e);
     if (text !== null) {
-      selfLabelW[e.from] = Math.max(selfLabelW[e.from], Math.min(stringWidth2(text), MAX_LABEL));
+      selfLabelW[e.from] = Math.max(selfLabelW[e.from], Math.min(stringWidth(text), MAX_LABEL));
     }
   }
   for (let i = 0; i < n; i++)
@@ -4713,7 +4166,7 @@ function drawBox(canvas, p, lines, shape, mirrored = false) {
   const ordered = mirrored ? [...lines].reverse() : lines;
   ordered.forEach((line, li) => {
     const text = fitLabel(line, inner);
-    const textX = x + 1 + PAD + half(sat(inner, stringWidth2(text)));
+    const textX = x + 1 + PAD + half(sat(inner, stringWidth(text)));
     drawText(canvas, text, textX, y + 1 + li, "text");
   });
 }
@@ -4739,7 +4192,7 @@ function drawClassBox(canvas, p, sections, mirrored = false) {
         canvas.set(x, row, "\u2500", "border");
       canvas.set(p.x + p.w - 1, row, "\u2524", "border");
     } else {
-      const tx = r.center ? p.x + 1 + PAD + half(sat(inner, stringWidth2(r.text))) : p.x + 1 + PAD;
+      const tx = r.center ? p.x + 1 + PAD + half(sat(inner, stringWidth(r.text))) : p.x + 1 + PAD;
       drawTextOverEdges(canvas, r.text, tx, row, "text");
     }
   });
@@ -4789,7 +4242,7 @@ function routeForward(canvas, from, to, edge, bus, entryX = -1, labelLeft = fals
     canvas.set(bx, by, headGlyph(edge.headFrom, "\u25B2"), "edge");
   if (edge.cardFrom === void 0 && edge.cardTo === void 0) {
     if (edge.label !== null) {
-      const start = labelLeft ? sat(tx, Math.min(stringWidth2(edge.label), MAX_LABEL)) : tx + 1;
+      const start = labelLeft ? sat(tx, Math.min(stringWidth(edge.label), MAX_LABEL)) : tx + 1;
       placeLabel(canvas, edge.label, headRow, start);
     }
     return;
@@ -4805,7 +4258,7 @@ function routeForward(canvas, from, to, edge, bus, entryX = -1, labelLeft = fals
       const lineX = midRow > bus ? tx : bx;
       placeLabel(canvas, edge.label, midRow, lineX + 1);
     } else {
-      placeLabel(canvas, edge.label, headRow, tx + 1 + (edge.cardTo === void 0 ? 0 : stringWidth2(edge.cardTo) + 1));
+      placeLabel(canvas, edge.label, headRow, tx + 1 + (edge.cardTo === void 0 ? 0 : stringWidth(edge.cardTo) + 1));
     }
   }
 }
@@ -4874,7 +4327,7 @@ function routeSkip(canvas, from, to, edge, at) {
     canvas.set(bx, bottom, headGlyph(edge.headFrom, "\u25B2"), "edge");
   const text = edgeText(edge);
   if (text !== null) {
-    const start = labelLeft ? sat(entryX, Math.min(stringWidth2(text), MAX_LABEL)) : entryX + 1;
+    const start = labelLeft ? sat(entryX, Math.min(stringWidth(text), MAX_LABEL)) : entryX + 1;
     placeLabel(canvas, text, to.y - 1, start);
   }
 }
@@ -4895,7 +4348,7 @@ function routeBack(canvas, from, to, edge, laneX) {
   else
     canvas.set(tx + 1, tyc, headGlyph(edge.headTo, "\u25C4"), "edge");
   if (backText !== null) {
-    placeLabel(canvas, backText, sat(tyc, 1), sat(laneX, stringWidth2(backText) + 1));
+    placeLabel(canvas, backText, sat(tyc, 1), sat(laneX, stringWidth(backText) + 1));
   }
 }
 function routeForwardLr(canvas, from, to, edge, bus) {
@@ -4922,7 +4375,7 @@ function routeForwardLr(canvas, from, to, edge, bus) {
   if (edge.cardFrom !== void 0)
     placeLabel(canvas, edge.cardFrom, sat(ry, 1), rx + 1);
   if (edge.cardTo !== void 0) {
-    placeLabel(canvas, edge.cardTo, sat(ly, 1), sat(headCol, stringWidth2(edge.cardTo)));
+    placeLabel(canvas, edge.cardTo, sat(ly, 1), sat(headCol, stringWidth(edge.cardTo)));
   }
 }
 function routeSkipLr(canvas, from, to, edge, bus) {
@@ -4972,7 +4425,7 @@ function routeBackLr(canvas, from, to, edge, laneY, laneLabels) {
 }
 function placeLaneLabels(canvas, labels) {
   for (const { text, y, lo, hi } of labels) {
-    const tw = stringWidth2(text);
+    const tw = stringWidth(text);
     const lastStart = hi - 1 - tw;
     if (lastStart < lo + 1 || y >= canvas.h)
       continue;
@@ -5482,10 +4935,10 @@ function parseEr(src) {
     }
     const rel = splitErRelationship(st);
     if (rel) {
-      const tokens = erTokens(rel.rel);
-      const op = tokens.length === 3 ? parseErOp(tokens[1]) : null;
-      const f = op === null ? null : erEntity(graph, tokens[0]);
-      const t2 = f === null ? null : erEntity(graph, tokens[2]);
+      const tokens2 = erTokens(rel.rel);
+      const op = tokens2.length === 3 ? parseErOp(tokens2[1]) : null;
+      const f = op === null ? null : erEntity(graph, tokens2[0]);
+      const t2 = f === null ? null : erEntity(graph, tokens2[2]);
       if (op === null || f === null || t2 === null) {
         graph.drop(st);
       } else {
@@ -6070,7 +5523,7 @@ var gitgraph = {
         parts.push([`\u21D0 ${branches[c.mergeFrom]}`, "edgeLabel"]);
       return parts;
     });
-    const width = graphW + Math.max(1, ...labels.map((parts) => parts === null ? 0 : parts.reduce((w, [t2]) => w + stringWidth2(t2) + 1, 0) - 1));
+    const width = graphW + Math.max(1, ...labels.map((parts) => parts === null ? 0 : parts.reduce((w, [t2]) => w + stringWidth(t2) + 1, 0) - 1));
     const canvas = new Canvas(width, rows.length);
     const live = /* @__PURE__ */ new Set();
     rows.forEach((row, y) => {
@@ -6085,7 +5538,7 @@ var gitgraph = {
         let x = graphW;
         for (const [text, role] of labels[y] ?? []) {
           drawText(canvas, text, x, y, role);
-          x += stringWidth2(text) + 1;
+          x += stringWidth(text) + 1;
         }
         return;
       }
@@ -6216,11 +5669,11 @@ var mindmap = {
     };
     for (const root of roots)
       walk(root, "", "");
-    const width = Math.max(...rows.map(([p, t2]) => stringWidth2(p) + stringWidth2(t2)));
+    const width = Math.max(...rows.map(([p, t2]) => stringWidth(p) + stringWidth(t2)));
     const canvas = new Canvas(width, rows.length);
     rows.forEach(([prefix, text], y) => {
       drawText(canvas, prefix, 0, y, "edge");
-      drawText(canvas, text, stringWidth2(prefix), y, "text");
+      drawText(canvas, text, stringWidth(prefix), y, "text");
     });
     return { canvas, warnings, classDefs: {} };
   }
@@ -6295,7 +5748,7 @@ var pie = {
     if (parsed === null)
       return null;
     const { title, slices, showData, warnings } = parsed;
-    const labelW = Math.max(...slices.map((s) => stringWidth2(s.label)));
+    const labelW = Math.max(...slices.map((s) => stringWidth(s.label)));
     const total = slices.reduce((sum, s) => sum + s.value, 0);
     const rows = slices.map((s) => {
       const share = total === 0 ? 0 : s.value / total;
@@ -6305,11 +5758,11 @@ var pie = {
     });
     const barX = labelW + 2;
     const suffixX = barX + BAR_W + 1;
-    const width = suffixX + Math.max(...rows.map((r) => stringWidth2(r.suffix)));
+    const width = suffixX + Math.max(...rows.map((r) => stringWidth(r.suffix)));
     const top = title === null ? 0 : 1;
     const canvas = new Canvas(width, top + rows.length);
     if (title !== null) {
-      drawText(canvas, title, Math.max(0, Math.floor((width - stringWidth2(title)) / 2)), 0, "title");
+      drawText(canvas, title, Math.max(0, Math.floor((width - stringWidth(title)) / 2)), 0, "title");
     }
     rows.forEach((r, i) => {
       const y = top + i;
@@ -6319,7 +5772,7 @@ var pie = {
       if (bar === "" && r.value > 0)
         bar = "\u258F";
       drawText(canvas, bar, barX, y, "edge");
-      drawText(canvas, "\u2591".repeat(BAR_W - stringWidth2(bar)), barX + stringWidth2(bar), y, "border");
+      drawText(canvas, "\u2591".repeat(BAR_W - stringWidth(bar)), barX + stringWidth(bar), y, "border");
       drawText(canvas, r.suffix, suffixX, y, "edgeLabel");
     });
     return { canvas, warnings, classDefs: {} };
@@ -6383,11 +5836,11 @@ function noteGeometry(xs, anchor, textW) {
     return { x: sat(xs[anchor.at], 2 + w - 1), w };
   return { x: xs[anchor.at] + 2, w };
 }
-var itemTextW = (text) => text === null ? 0 : stringWidth2(text);
+var itemTextW = (text) => text === null ? 0 : stringWidth(text);
 function layoutSequence(seq) {
   const n = seq.labels.length;
   const labels = seq.labels.map((l) => fitLabel(l, WRAP_WIDTH));
-  const boxW = labels.map((l) => Math.max(1, stringWidth2(l)) + 2 * PAD + 2);
+  const boxW = labels.map((l) => Math.max(1, stringWidth(l)) + 2 * PAD + 2);
   const boxH = 3;
   const gaps = Array.from({ length: sat(n, 1) }, (_, i) => Math.max(SEQ_GAP, Math.ceil(boxW[i] / 2) + Math.ceil(boxW[i + 1] / 2) + 1));
   const reqs = [];
@@ -6400,7 +5853,7 @@ function layoutSequence(seq) {
         reqs.push([item.from, item.from + 1, 5 + tw + 2]);
       }
     } else if (item.kind === "note") {
-      const tw = stringWidth2(item.text);
+      const tw = stringWidth(item.text);
       const a = item.anchor;
       if (a.kind === "over" && a.from < a.to) {
         reqs.push([a.from, a.to, sat(tw, 1)]);
@@ -6432,7 +5885,7 @@ function layoutSequence(seq) {
   let leftPad = 0;
   for (const item of seq.items) {
     if (item.kind === "note" && item.anchor.kind === "left" && item.anchor.at === 0) {
-      const w = stringWidth2(item.text) + 2 * PAD + 2;
+      const w = stringWidth(item.text) + 2 * PAD + 2;
       leftPad = Math.max(leftPad, sat(w + 1, xs[0]));
     }
   }
@@ -6444,10 +5897,10 @@ function layoutSequence(seq) {
     if (item.kind === "message" && item.from === item.to) {
       canvasW = Math.max(canvasW, xs[item.from] + 5 + itemTextW(item.text) + 1);
     } else if (item.kind === "note") {
-      const g = noteGeometry(xs, item.anchor, stringWidth2(item.text));
+      const g = noteGeometry(xs, item.anchor, stringWidth(item.text));
       canvasW = Math.max(canvasW, g.x + g.w + 1);
     } else if (item.kind === "divider") {
-      canvasW = Math.max(canvasW, stringWidth2(item.text) + 4);
+      canvasW = Math.max(canvasW, stringWidth(item.text) + 4);
     }
   }
   const rows = [];
@@ -6469,7 +5922,7 @@ function layoutSequence(seq) {
   seq.items.forEach((item, k) => {
     if (item.kind !== "note")
       return;
-    const g = noteGeometry(xs, item.anchor, stringWidth2(item.text));
+    const g = noteGeometry(xs, item.anchor, stringWidth(item.text));
     drawBox(canvas, box(g.x, rows[k], g.w, 3), [item.text], "rect");
   });
   for (const x of xs) {
@@ -6552,7 +6005,7 @@ function drawMessage(canvas, item, xs, r) {
   if (item.text !== null) {
     const span = hi - lo - 1;
     const t2 = fitLabel(item.text, Math.max(1, span));
-    drawTextOverEdges(canvas, t2, lo + 1 + half(sat(span, stringWidth2(t2))), r, "text");
+    drawTextOverEdges(canvas, t2, lo + 1 + half(sat(span, stringWidth(t2))), r, "text");
   }
 }
 function drawDivider(canvas, text, r, canvasW) {
@@ -7052,16 +6505,16 @@ var timeline = {
     if (parsed === null)
       return null;
     const { title, rows, warnings } = parsed;
-    const periodW = Math.max(...rows.map((r) => r.section ? 0 : stringWidth2(r.period)));
+    const periodW = Math.max(...rows.map((r) => r.section ? 0 : stringWidth(r.period)));
     const top = title === null ? 0 : 1;
-    const width = Math.max(title === null ? 0 : stringWidth2(title) + 6, ...rows.map((r) => r.section ? stringWidth2(r.event) : periodW + 3 + stringWidth2(r.event)));
+    const width = Math.max(title === null ? 0 : stringWidth(title) + 6, ...rows.map((r) => r.section ? stringWidth(r.event) : periodW + 3 + stringWidth(r.event)));
     const canvas = new Canvas(width, top + rows.length);
     if (title !== null) {
       const t2 = ` ${title} `;
-      const x = Math.max(0, Math.floor((width - stringWidth2(t2) - 4) / 2));
+      const x = Math.max(0, Math.floor((width - stringWidth(t2) - 4) / 2));
       drawText(canvas, "\u2500\u2500", x, 0, "edge");
       drawText(canvas, t2, x + 2, 0, "title");
-      drawText(canvas, "\u2500\u2500", x + 2 + stringWidth2(t2), 0, "edge");
+      drawText(canvas, "\u2500\u2500", x + 2 + stringWidth(t2), 0, "edge");
     }
     rows.forEach((row, i) => {
       const y = top + i;
@@ -7388,11 +6841,11 @@ function sourceBox(src, maxWidth) {
     acc.lines.push(...chunkLine(l, limit));
     return acc;
   }, { started: false, lines: [] }).lines;
-  const contentW = body.reduce((w, l) => Math.max(w, stringWidth2(l)), stringWidth2(title));
+  const contentW = body.reduce((w, l) => Math.max(w, stringWidth(l)), stringWidth(title));
   const inner = contentW + 2;
   const plain = [];
   const styled = [];
-  const rule = "\u2500".repeat(sat(inner, stringWidth2(title)));
+  const rule = "\u2500".repeat(sat(inner, stringWidth(title)));
   plain.push(`\u256D${title}${rule}\u256E`);
   styled.push([
     { text: "\u256D", role: "border" },
@@ -7400,7 +6853,7 @@ function sourceBox(src, maxWidth) {
     { text: `${rule}\u256E`, role: "border" }
   ]);
   for (const line of body) {
-    const pad = " ".repeat(sat(contentW, stringWidth2(line)));
+    const pad = " ".repeat(sat(contentW, stringWidth(line)));
     plain.push(`\u2502 ${line}${pad} \u2502`);
     styled.push([
       { text: "\u2502 ", role: "border" },
@@ -7431,7 +6884,7 @@ function expandTabs(line) {
   return out;
 }
 function chunkLine(line, limit) {
-  if (limit === void 0 || stringWidth2(line) <= limit)
+  if (limit === void 0 || stringWidth(line) <= limit)
     return [line];
   const out = [];
   let cur = "";
@@ -7461,7 +6914,7 @@ function render(src) {
   const art = drawn.canvas.toLines();
   const title = frontmatterTitle(src);
   if (title !== null) {
-    const tw = stringWidth2(title);
+    const tw = stringWidth(title);
     art.width = Math.max(art.width, tw);
     const pad = " ".repeat(Math.floor((art.width - tw) / 2));
     art.plain.unshift(pad + title, "");
@@ -7930,7 +7383,7 @@ function renderMathBlock(latex, options = {}) {
     const den = transpileLatexToUnicode(fracMatch[2] ?? "");
     if (num.length > 8 || den.length > 8 || num.includes("+") || den.includes("+") || num.includes("-") || den.includes("-")) {
       const width = Math.max(visibleWidth(num), visibleWidth(den)) + 2;
-      const bar = "\u2500".repeat(width);
+      const bar = boxGlyphs(resolveBoxCharset()).h.repeat(width);
       const padNum = " ".repeat(Math.max(0, Math.floor((width - visibleWidth(num)) / 2)));
       const padDen = " ".repeat(Math.max(0, Math.floor((width - visibleWidth(den)) / 2)));
       const l1 = padNum + num;
@@ -8177,21 +7630,21 @@ function resolveTableWidth(explicit, env = process.env) {
 }
 function wrapCellToWidth(text, max) {
   if (max <= 0 || displayWidth(text) <= max) return [text];
-  const tokens = tokenizeAnsiLine(text);
+  const tokens2 = tokenizeAnsiLine(text);
   const charTokenIdx = [];
-  tokens.forEach((t2, i) => {
+  tokens2.forEach((t2, i) => {
     if (t2.kind === "char") charTokenIdx.push(i);
   });
   const n = charTokenIdx.length;
   if (n === 0) return [text];
-  const widths = charTokenIdx.map((i) => tokens[i].width);
+  const widths = charTokenIdx.map((i) => tokens2[i].width);
   const prefix = [0];
   for (let i = 0; i < widths.length; i += 1) prefix.push(prefix[i] + widths[i]);
   const segWidth = (a, b) => prefix[b] - prefix[a];
   const sliceTokens = (a, b) => {
     const startTok = a === 0 ? 0 : charTokenIdx[a - 1] + 1;
-    const endTok = b < n ? charTokenIdx[b] - 1 : tokens.length - 1;
-    return tokens.slice(startTok, endTok + 1);
+    const endTok = b < n ? charTokenIdx[b] - 1 : tokens2.length - 1;
+    return tokens2.slice(startTok, endTok + 1);
   };
   const applyStyles = (slice, state2) => {
     const next = [...state2];
@@ -8206,7 +7659,7 @@ function wrapCellToWidth(text, max) {
         }
       } else if (OSC8_OPENER_REGEX.test(t2.value)) {
         next.push(t2.value);
-      } else if (SGR_RESET_REGEX2.test(t2.value)) {
+      } else if (SGR_RESET_REGEX.test(t2.value)) {
         for (let i = next.length - 1; i >= 0; i -= 1) {
           if (!OSC8_OPENER_REGEX.test(next[i]) && !OSC8_CLOSER_REGEX.test(next[i])) {
             next.splice(i, 1);
@@ -8238,7 +7691,7 @@ function wrapCellToWidth(text, max) {
     if (segWidth(start, i + 1) <= max) continue;
     let cut = -1;
     for (let j = i - 1; j > start; j -= 1) {
-      if (tokens[charTokenIdx[j]].value !== " ") continue;
+      if (tokens2[charTokenIdx[j]].value !== " ") continue;
       if (segWidth(start, j) <= max && segWidth(j + 1, i + 1) <= max) {
         cut = j;
         break;
@@ -8269,7 +7722,7 @@ function wrapCellToWidth(text, max) {
   }
   return segments.length > 0 ? segments : [text];
 }
-var SGR_RESET_REGEX2 = /^\x1b\[0?m$/;
+var SGR_RESET_REGEX = /^\x1b\[0?m$/;
 var OSC8_OPENER_REGEX = /^\x1b\]8;;[^\x07\x1b]+(?:\x07|\x1b\\)$/;
 var OSC8_CLOSER_REGEX = /^\x1b\]8;;\x1b\\$/;
 function padCell(text, width, align) {
@@ -8324,21 +7777,22 @@ function makeStyle(brightness, headerToken) {
   const paint = (t2) => `${color}${boldOn}${t2}${reset}`;
   return { header: paint, label: paint };
 }
-function boxLine(left, mid, right, widths) {
-  const seg = widths.map((w) => "\u2500".repeat(w + 2));
+function boxLine(glyphs, left, mid, right, widths) {
+  const seg = widths.map((w) => glyphs.h.repeat(w + 2));
   return `${left}${seg.join(mid)}${right}`;
 }
-function dataRow(cells, aligns, widths, style, header) {
+function dataRow(cells, aligns, widths, style, header, glyphs) {
   const parts = cells.map((cell, i) => {
     const width = widths[i] ?? 0;
     const align = aligns[i] ?? "left";
     const padded = padCell(cell, width, align);
     const styled = header ? style.header(padded) : padded;
-    return ` ${styled} \u2502`;
+    return ` ${styled} ${glyphs.v}`;
   });
-  return `\u2502${parts.join("")}`;
+  return `${glyphs.v}${parts.join("")}`;
 }
-function renderBoxTable(table, width, style) {
+function renderBoxTable(table, width, style, charset = resolveBoxCharset()) {
+  const glyphs = boxGlyphs(charset);
   const colCount = table.headers.length;
   const widths = computeColumnWidths(table.headers, table.rows, width);
   const headerGrid = table.headers.map(
@@ -8352,7 +7806,7 @@ function renderBoxTable(table, width, style) {
     (r) => Math.max(1, ...r.map((g) => g.length))
   );
   const lines = [];
-  lines.push(boxLine("\u250C", "\u252C", "\u2510", widths));
+  lines.push(boxLine(glyphs, glyphs.tl, glyphs.tm, glyphs.tr, widths));
   for (let r = 0; r < headerDisplayRows; r += 1) {
     lines.push(
       dataRow(
@@ -8360,15 +7814,16 @@ function renderBoxTable(table, width, style) {
         table.aligns,
         widths,
         style,
-        true
+        true,
+        glyphs
       )
     );
   }
-  lines.push(boxLine("\u251C", "\u253C", "\u2524", widths));
+  lines.push(boxLine(glyphs, glyphs.ml, glyphs.mm, glyphs.mr, widths));
   const hasMultiLineRecord = bodyDisplayRows.some((rows) => rows > 1);
   bodyGrids.forEach((_, rec) => {
     if (hasMultiLineRecord && rec > 0) {
-      lines.push(boxLine("\u251C", "\u253C", "\u2524", widths));
+      lines.push(boxLine(glyphs, glyphs.ml, glyphs.mm, glyphs.mr, widths));
     }
     for (let r = 0; r < bodyDisplayRows[rec]; r += 1) {
       lines.push(
@@ -8380,12 +7835,13 @@ function renderBoxTable(table, width, style) {
           table.aligns,
           widths,
           style,
-          false
+          false,
+          glyphs
         )
       );
     }
   });
-  lines.push(boxLine("\u2514", "\u2534", "\u2518", widths));
+  lines.push(boxLine(glyphs, glyphs.bl, glyphs.bm, glyphs.br, widths));
   return lines.join("\n");
 }
 function renderRecordCards(table, width, style) {
@@ -8429,7 +7885,12 @@ function renderMarkdownTable(table, options = {}) {
   if (width < 40 || table.headers.length > 6) {
     return renderRecordCards(styledTable, width, style);
   }
-  return renderBoxTable(styledTable, width, style);
+  return renderBoxTable(
+    styledTable,
+    width,
+    style,
+    options.boxCharset ?? resolveBoxCharset()
+  );
 }
 
 // packages/cli/client/assistantOutput.ts
@@ -8678,11 +8139,10 @@ function normalizeListLine(line) {
   }
   return line;
 }
-var TOOL_TREE_HEADER_RE = /^•\s+(.+?)\s+\((\d+)\)$/;
-var TOOL_TREE_LEAF_RE = /^([├└]──\s+)(.*?)\s{2}(✓|✗|!)(?:\s+(.*))?$/;
+var TOOL_TREE_HEADER_RE = /^•\s+(.+?)\s+\((\d+)\) · (.*?)  ✓$/;
 var TOOL_SINGLE_RE = /^▸\s+(.+?)(?:\s+·\s+(.*?))?(?:\s{2}(✓|✗|!)(?:\s+(.*))?)$/;
 function plainToolLine(line) {
-  return stripAnsi2(line);
+  return stripAnsi(line);
 }
 var TOOL_TREE_GROUP_LABELS = new Set(
   ["execShell", "readFile", "fetchWebpage", "exa_search"].flatMap(toolLabelVariants)
@@ -8697,9 +8157,6 @@ function toolTreeHeaderMatch(line) {
 function isToolTreeHeaderLine(line) {
   return toolTreeHeaderMatch(line) !== null;
 }
-function isToolTreeLeafLine(line) {
-  return TOOL_TREE_LEAF_RE.test(plainToolLine(line));
-}
 function isToolSingleLine(line) {
   return TOOL_SINGLE_RE.test(plainToolLine(line));
 }
@@ -8718,17 +8175,10 @@ function toolGroupKeyOf(line) {
   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;
+  if (curKey === null || nextKey === null) return null;
+  return isToolTreeHeaderLine(cur) || isToolTreeHeaderLine(next) || curKey !== nextKey;
 }
 function statusColorSeq(marker, brightness) {
   if (marker === "\u2713") return colorSeq("success", brightness);
@@ -8741,18 +8191,7 @@ function styleTuiToolLine(line, brightness) {
   const muted = colorSeq("muted", brightness);
   const header = toolTreeHeaderMatch(plain);
   if (header) {
-    return `${chrome}\u2022${STYLE.reset} ${STYLE.bold}${muted}${header[1]}${STYLE.reset} ${chrome}${STYLE.dim}(${header[2]})${STYLE.reset}`;
-  }
-  const leaf = plain.match(TOOL_TREE_LEAF_RE);
-  if (leaf) {
-    const [, connector, detail, marker, statusDetail] = leaf;
-    let rendered = `${chrome}${connector}${STYLE.reset}${chrome}${detail}${STYLE.reset}`;
-    rendered += `  ${statusColorSeq(marker, brightness)}${marker}${STYLE.reset}`;
-    if (statusDetail) {
-      const metaSeq = marker === "\u2713" ? chrome : statusColorSeq(marker, brightness);
-      rendered += ` ${metaSeq}${STYLE.dim}${statusDetail}${STYLE.reset}`;
-    }
-    return rendered;
+    return `${chrome}\u2022${STYLE.reset} ${STYLE.bold}${muted}${header[1]}${STYLE.reset} ${chrome}${STYLE.dim}(${header[2]})${STYLE.reset} ${chrome}\xB7 ${header[3]}${STYLE.reset}  ${statusColorSeq("\u2713", brightness)}\u2713${STYLE.reset}`;
   }
   const single = plain.match(TOOL_SINGLE_RE);
   if (single) {
@@ -8776,14 +8215,14 @@ function isPolishFenceInteriorLine(line) {
   return /^\x00F\d+\x00$/.test(line);
 }
 function polishHeadingLevel(line) {
-  const match = stripAnsi2(line).match(/^(#{1,6})\s/);
+  const match = stripAnsi(line).match(/^(#{1,6})\s/);
   return match ? match[1].length : null;
 }
 function isPolishHeadingLine(line) {
   return polishHeadingLevel(line) !== null;
 }
 function isPolishIntroLine(line) {
-  const plain = stripAnsi2(line).trimEnd();
+  const plain = stripAnsi(line).trimEnd();
   return plain.endsWith("\uFF1A") || plain.endsWith(":");
 }
 function polishBreathInsertsBlankBetween(cur, next) {
@@ -8911,7 +8350,7 @@ function styleRichMarkdownLine(line, brightness) {
     return `${border}\u2502${STYLE.reset} ${STYLE.dim}${styled}${STYLE.reset}`;
   }
   if (THEMATIC_BREAK_RE.test(line)) {
-    return `${colorSeq("chrome", brightness)}${STYLE.dim}${"\u2500".repeat(36)}${STYLE.reset}`;
+    return `${colorSeq("chrome", brightness)}${STYLE.dim}${boxGlyphs(resolveBoxCharset()).h.repeat(36)}${STYLE.reset}`;
   }
   const bullet = line.match(/^(\s*)(•)\s(.+)$/);
   if (bullet) {
@@ -9085,7 +8524,6 @@ function classifyStreamLine(line) {
   if (line === "") return "blank";
   const plain = plainToolLine(line);
   if (isToolTreeHeaderLine(plain)) return "tool-header";
-  if (isToolTreeLeafLine(plain)) return "tool-leaf";
   if (isToolSingleLine(plain)) return "tool";
   if (TASK_LIST_RE.test(plain) || UNORDERED_LIST_RE.test(plain) || ORDERED_LIST_RE.test(plain) || /^\s*(?:•|◦|☐|☑)\s/.test(plain) || /^\s*[\u2460-\u2473]/.test(plain)) {
     return "list";
@@ -9095,10 +8533,10 @@ function classifyStreamLine(line) {
   return "prose";
 }
 function isStreamToolKind(kind) {
-  return kind === "tool-header" || kind === "tool-leaf" || kind === "tool";
+  return kind === "tool-header" || kind === "tool";
 }
 function isStreamListLike(kind) {
-  return kind === "list" || kind === "tool-header" || kind === "tool-leaf" || kind === "tool";
+  return kind === "list" || kind === "tool-header" || kind === "tool";
 }
 function needsListProseBreath(prev, next, prevLine = "", nextLine = "") {
   if (prev === null || prev === "blank" || next === "blank") return false;
@@ -9294,44 +8732,35 @@ function formatAssistantTextForCli(text) {
   return text.replace(/\u003cthink\u003e[\s\S]*?\u003c\/think\u003e\s*/gi, "").replace(/\n{3,}/g, "\n\n").trim();
 }
 
-// packages/cli/tui/redactSecrets.ts
-var REDACTED = "\u27E8redacted\u27E9";
-function redactSecrets(text) {
-  return text.replace(/\b(?:sk|pk)-[A-Za-z0-9_-]{10,}/g, REDACTED).replace(/\b(Bearer\s+)[A-Za-z0-9._~+/=-]{12,}/gi, `$1${REDACTED}`).replace(
-    /\b((?:api[_-]?key|apikey|access[_-]?token|auth[_-]?token|token|secret|password|passwd|credential)s?\s*[=:]\s*["']?)[^\s"',;]{8,}/gi,
-    `$1${REDACTED}`
-  ).replace(
-    /\b((?:--[a-z-]*(?:token|key|secret|password|credential)[a-z-]*)\s+)[^\s"']{8,}/gi,
-    `$1${REDACTED}`
-  );
-}
-
-// packages/cli/tui/askTextSanitize.ts
-var ASK_SECRET_PLACEHOLDER = "\u27E8redacted\u27E9";
-var C0_C1_CONTROL_REGEX = /[\x00-\x1f\x7f-\x9f]/g;
-var NORMAL_GIST_SECRET_PATTERNS = [
-  /\bbearer\s+[A-Za-z0-9._~+/=-]{8,}/i,
-  /\bsk-(?:ant-)?(?:api)?[0-9a-zA-Z-]{10,}/,
-  /\b(?:ghp|gho|ghu|ghs|ghr)_[A-Za-z0-9]{10,}/,
-  /\bxox[baprs]-[A-Za-z0-9-]{10,}/
-];
-function withholdIfSecretLike(gist) {
-  if (!gist) return "";
-  if (findPotentialSecrets(gist).length > 0) return "";
-  if (NORMAL_GIST_SECRET_PATTERNS.some((pattern) => pattern.test(gist))) return "";
-  return gist;
-}
-function toText(value) {
-  return typeof value === "string" ? value : String(value ?? "");
-}
-function cleanAskText(value) {
-  return stripAnsi2(toText(value)).replace(/[\r\n]+/g, " ").replace(/\s+/g, " ").replace(C0_C1_CONTROL_REGEX, "").replace(/\s+/g, " ").trim();
+// packages/cli/tui/tuiLayout.ts
+var DEFAULT_TERMINAL_ROWS = 24;
+var DEFAULT_TERMINAL_COLUMNS = 80;
+var TUI_MARGIN_LEFT = 1;
+var TUI_MARGIN_RIGHT = 1;
+var TUI_MARGIN_RESPONSIVE_MIN_COLUMNS = 40;
+function resolveHistoryLayoutGeometry(columns) {
+  const cols = Math.max(1, (columns ?? 0) > 0 ? columns : DEFAULT_TERMINAL_COLUMNS);
+  if (cols <= TUI_MARGIN_RESPONSIVE_MIN_COLUMNS) {
+    return {
+      contentWidth: Math.max(1, cols - 1),
+      marginLeft: 0,
+      marginRight: 0
+    };
+  }
+  const marginLeft = TUI_MARGIN_LEFT;
+  const marginRight = TUI_MARGIN_RIGHT;
+  const contentWidth = Math.max(1, cols - 1 - marginLeft - marginRight);
+  return {
+    contentWidth,
+    marginLeft,
+    marginRight
+  };
 }
-function safeAskText(value, max) {
-  const cleaned = redactSecrets(cleanAskText(value));
-  if (!cleaned) return "";
-  const guarded = withholdIfSecretLike(cleaned) || ASK_SECRET_PLACEHOLDER;
-  return max === void 0 ? guarded : clipCompactText(guarded, max, "\u2026");
+function resolveHistoryViewportHeight(terminalRows, composerRows, foregroundReservedRows = 0) {
+  const rows = Math.max(1, terminalRows > 0 ? terminalRows : DEFAULT_TERMINAL_ROWS);
+  const composer = Math.max(0, composerRows);
+  const reserved = Math.max(0, foregroundReservedRows);
+  return Math.max(0, rows - composer - reserved);
 }
 
 // node_modules/diff/libesm/diff/base.js
@@ -9675,14 +9104,11 @@ function clip(value, max = 72) {
   return clipCompactText(value, max, "\u2026");
 }
 function formatConservativeActiveToolLabel(event) {
-  return toolLabel(event.toolName || "tool");
+  return event.toolName === "startAgentRun" ? t("agentStartingLabel") : toolLabel(event.toolName || "tool");
 }
 function isRunToolName(name) {
   return name === "execShell" || name === "runCommand" || name === "launchProcess";
 }
-function isReadToolName(name) {
-  return name === "readFile";
-}
 function isFailedToolResult(event) {
   const exitCode = event.metadata?.exitCode;
   if (event.metadata?.actionGate) return false;
@@ -9874,7 +9300,7 @@ function formatToolTraceLine(text, colorEnabled, accent = "none") {
   return `${dimCliText(text, true)}
 `;
 }
-var cleanUserText = (value) => stripAnsi2(value).replace(/[\r\n]+/g, " ").replace(/\s+/g, " ").trim();
+var cleanUserText = (value) => stripAnsi(value).replace(/[\r\n]+/g, " ").replace(/\s+/g, " ").trim();
 function renderRunCard(snapshot, opts) {
   const labels = agentRunCardLabels();
   const timing = { startedAt: snapshot.startedAt, finishedAt: snapshot.finishedAt };
@@ -9925,8 +9351,9 @@ function recoverOrchestrationCard(event, toolName, opts) {
   if (toolName === "listAgents") {
     try {
       const parsed = JSON.parse(trimmed);
-      const agents = Array.isArray(parsed.agents) ? parsed.agents : [];
-      const card = formatAgentListCard(agents);
+      if (parsed.success === false || !Array.isArray(parsed.agents)) return null;
+      const agents = parsed.agents;
+      const card = formatAgentListCard(agents, 8, /* @__PURE__ */ new Date(), !safe);
       const lines = card.split("\n");
       lines[0] = t("agentsListLabel", String(agents.length));
       return lines.join("\n");
@@ -9954,12 +9381,18 @@ function recoverOrchestrationCard(event, toolName, opts) {
     const name = safe ? cleanUserText(snapshot.agentName ?? "agent") : snapshot.agentName ?? "agent";
     const task = snapshot.taskPreview ? safe ? cleanUserText(snapshot.taskPreview) : snapshot.taskPreview : snapshot.taskPreview;
     const title = snapshot.title ? safe ? cleanUserText(snapshot.title) : snapshot.title : snapshot.title;
-    return formatStartRunCard(name, snapshot.status, {
-      task,
-      runId: snapshot.runId,
-      ...title ? { title } : {},
-      labels
+    const identity = formatIdentityRow(name, snapshot.runId, {
+      title,
+      unnamedAgent: labels.unnamedAgent
     });
+    const status = `${getAgentRunStatusIcon(snapshot.status)} ${labels.statusWord(snapshot.status)}`;
+    const oneLine = identity ? `${identity} \xB7 ${status}` : status;
+    const columns = process.stdout.columns || 80;
+    const secondary = formatIdentityRow(name, snapshot.runId, { title, titleOnOwnLine: true, unnamedAgent: labels.unnamedAgent });
+    const rows = identity && title && displayWidth(`  ${oneLine}`) > columns ? [title, `  ${secondary ? `${secondary} \xB7 ` : ""}${status}`] : [oneLine];
+    if (task && !title) rows.push(`  ${labels.rows.task}${task}`);
+    if (snapshot.errorMessage) rows.push(`  ${labels.rows.error}${redactSecrets(cleanUserText(snapshot.errorMessage.split("\n")[0]))}`);
+    return rows.join("\n");
   }
   if (kind === "gone") return formatNotFoundRunCard(labels);
   if (kind === "stop") return formatStopRunCard(snapshot.status, labels);
@@ -9969,10 +9402,20 @@ function formatOrchestrationCardBlock(event, toolName, colorEnabled, opts) {
   const safe = opts?.safe === true;
   const rawLabel = toolLabel(toolName);
   const bakedCard = typeof event.metadata?.displayData === "string" && event.metadata.displayData.trim() ? event.metadata.displayData : "";
-  const rawDataStr = recoverOrchestrationCard(event, toolName, { safe }) || bakedCard || (typeof event.content === "string" ? event.content : "");
-  const failed = event.type === "tool-error" || isFailedToolResult(event) || Boolean(event.metadata?.failed) || /^Error:/i.test(rawDataStr.trim());
+  let listPayload;
+  if (toolName === "listAgents" && typeof event.content === "string") {
+    try {
+      const value = JSON.parse(event.content);
+      if (value && typeof value === "object" && !Array.isArray(value)) listPayload = value;
+    } catch {
+    }
+  }
+  const listFailed = listPayload?.success === false;
+  const rawDataStr = listFailed ? typeof listPayload?.error === "string" ? listPayload.error : event.content || bakedCard : recoverOrchestrationCard(event, toolName, { safe }) || bakedCard || (typeof event.content === "string" ? event.content : "");
+  const failed = event.type === "tool-error" || isFailedToolResult(event) || Boolean(event.metadata?.failed) || listFailed || /^Error:/i.test(rawDataStr.trim());
   if (failed) {
-    const firstLine = stripAnsi2(rawDataStr.trim().split("\n")[0] || event.summary || event.message || t("toolFailed"));
+    const failureSnapshot = toolName === "startAgentRun" ? parseAgentRunEvent(event)?.snapshot : void 0;
+    const firstLine = stripAnsi(failureSnapshot?.errorMessage || rawDataStr.trim().split("\n")[0] || event.summary || event.message || t("toolFailed"));
     const message = clip(redactSecrets(firstLine), 96);
     if (!colorEnabled) {
       return `\u2717 ${rawLabel}  ${message}
@@ -9984,11 +9427,59 @@ function formatOrchestrationCardBlock(event, toolName, colorEnabled, opts) {
     return `${cross} ${labelPart2}  ${msgPart}
 `;
   }
+  if (opts?.visibleRunIds && toolName === "startAgentRun") {
+    const started = parseAgentRunEvent(event);
+    const runId = started?.snapshot.runId;
+    const startedStatus = started?.snapshot.status;
+    if (started?.kind === "start" && typeof runId === "string" && runId.length > 0 && !started.snapshot.errorMessage && // 只认 core 定义的已知正常态。unknown/cancelling/not_found/未来新增状态
+    // 都不算正常 → 保留回执。
+    isAgentRunStatusNormal(startedStatus)) {
+      let visible;
+      try {
+        visible = opts.visibleRunIds();
+      } catch {
+        visible = void 0;
+      }
+      if (visible?.has(runId)) return "";
+    }
+  }
+  const parsedStart = toolName === "startAgentRun" ? parseAgentRunEvent(event) : null;
+  const startFailed = parsedStart && isAgentRunStartFailureStatus(parsedStart.snapshot.status);
+  let heading = parsedStart ? t(startFailed ? "agentStartFailedLabel" : "agentStartedLabel") : rawLabel;
   const displayData = rawDataStr.trim();
   const lines = displayData ? displayData.split("\n") : [];
-  const projected = safe ? sanitizeRunCardForNormal(lines) : lines;
+  if (toolName === "startAgentRun" && ["Run started", "\u8FD0\u884C\u5DF2\u542F\u52A8"].includes(lines[0]?.trim())) lines.shift();
+  let projected = safe ? sanitizeRunCardForNormal(lines) : lines;
+  if (safe && toolName === "listAgents") {
+    if (Array.isArray(listPayload?.agents)) {
+      const count = listPayload.agents.length;
+      const total = typeof listPayload.total === "number" && Number.isSafeInteger(listPayload.total) && listPayload.total >= count ? listPayload.total : count;
+      heading = t("agentsCompactCount", String(total));
+      if (total !== count) heading += ` \xB7 ${t("agentsPageCount", String(count))}`;
+      if (listPayload.truncated === true) heading += ` \xB7 ${t("agentsTruncated")}`;
+      if (/^(?:Agents|智能体|🤖)\s*\(\d+\)$/.test(projected[0]?.trim() ?? "")) {
+        projected = projected.slice(1);
+      }
+    } else {
+      const bakedHeader = /^(?:Agents|智能体|🤖)\s*\((\d+)\)$/.exec(projected[0]?.trim() ?? "");
+      if (bakedHeader) {
+        heading = t("agentsCompactCount", bakedHeader[1]);
+        projected = projected.slice(1);
+      }
+    }
+    projected = projected.map((line) => line.replace(/\s{2,}(?:agent-pub-[a-z0-9]+|agent-system-[a-z0-9]+|agent-[0-9a-f]{6,}-[a-z0-9-]+|\(agentKey unavailable\))\s*$/i, ""));
+  }
+  if (safe && toolName === "controlAgentRun" && projected.length > 0) {
+    const first = projected[0].trim();
+    const recognized = ["Run status", "\u8FD0\u884C\u72B6\u6001", "Run finished", "\u8FD0\u884C\u5DF2\u7ED3\u675F", "Run stopped", "\u8FD0\u884C\u5DF2\u505C\u6B62"];
+    const merged = `${heading} \xB7 ${first}`;
+    if (recognized.includes(first) && displayWidth(`\u25CF ${merged}`) <= (process.stdout.columns || 80)) {
+      heading = merged;
+      projected = projected.slice(1);
+    }
+  }
   if (!colorEnabled) {
-    let out2 = `\u25CF ${rawLabel}
+    let out2 = `\u25CF ${heading}
 `;
     for (const line of projected) {
       out2 += `  ${line}
@@ -9997,7 +9488,7 @@ function formatOrchestrationCardBlock(event, toolName, colorEnabled, opts) {
     return out2;
   }
   const bullet = themeText("\u25CF", "success", true);
-  const labelPart = themeText(rawLabel, "muted", true);
+  const labelPart = themeText(heading, "muted", true);
   let out = `${bullet} ${labelPart}
 `;
   for (const line of projected) {
@@ -10015,7 +9506,7 @@ function sanitizeRunCardForNormal(lines) {
       break;
     }
     if (/^\s*error\b/i.test(line)) {
-      out.push(clip(redactSecrets(stripAnsi2(line)), 160));
+      out.push(clip(redactSecrets(stripAnsi(line)), 160));
       errorIndent = line.length - line.trimStart().length;
       continue;
     }
@@ -10248,7 +9739,7 @@ function formatNormalToolDuration(elapsedMs) {
   if (elapsedMs < 1e3) return `${Math.round(elapsedMs)}ms`;
   return `${(elapsedMs / 1e3).toFixed(1)}s`;
 }
-function formatNormalToolLine(event, pending, colorEnabled) {
+function formatNormalToolLine(event, pending, colorEnabled, opts) {
   if (event.type === "tool-call") return "";
   const toolName = event.toolName || pending?.toolName || "tool";
   if (event.type === "tool-result" && (event.toolName === "ask_user" || event.metadata?.uiAskChoice)) {
@@ -10256,10 +9747,13 @@ function formatNormalToolLine(event, pending, colorEnabled) {
     if (block) return block;
   }
   if (event.type === "tool-result" && (toolName === "listAgents" || toolName === "startAgentRun" || toolName === "controlAgentRun")) {
-    return formatOrchestrationCardBlock(event, toolName, colorEnabled, { safe: true });
+    return formatOrchestrationCardBlock(event, toolName, colorEnabled, {
+      safe: true,
+      visibleRunIds: opts?.visibleRunIds
+    });
   }
   if (event.type === "tool-result" && toolName === "loadSkill") {
-    return formatLoadSkillBlock(event, colorEnabled, { safe: true }) ?? "";
+    return formatLoadSkillBlock({ ...event, argumentsPreview: event.argumentsPreview || pending?.argumentsPreview }, colorEnabled, { safe: true }) ?? "";
   }
   if (event.type === "tool-result" && toolName === "show_interaction") {
     return formatShowInteractionBlock(event, colorEnabled);
@@ -10304,24 +9798,56 @@ function toolFailureReason(event) {
     return lines.slice(start + 1, end < 0 ? lines.length : end);
   };
   const reasonLine = sectionLines("stderr")[0] ?? sectionLines("stdout")[0] ?? lines.find((line) => !/^(stdout|stderr|exitCode)\s*:/i.test(line)) ?? lines[0] ?? "";
-  return reasonLine ? clip(redactSecrets(stripAnsi2(reasonLine)), 96) : "";
+  return reasonLine ? clip(redactSecrets(stripAnsi(reasonLine)), 96) : "";
 }
 function resolveLoadSkillName(event) {
-  const metaName = typeof event.metadata?.name === "string" ? event.metadata.name : void 0;
-  if (metaName) return metaName;
-  const argName = event.argumentsPreview?.trim();
-  if (argName && !argName.startsWith("{")) return argName;
   const content = typeof event.content === "string" ? event.content : "";
-  const match = content.match(/Skill "([^"]+)" loaded inline/);
-  if (match?.[1]) return match[1];
-  return argName || "skill";
+  let result;
+  try {
+    const value = JSON.parse(content);
+    if (value && typeof value === "object" && !Array.isArray(value)) result = value;
+  } catch {
+  }
+  const preview = event.argumentsPreview?.trim() ?? "";
+  let args = {};
+  if (preview.startsWith("{")) {
+    try {
+      const value = JSON.parse(preview);
+      if (value && typeof value === "object" && !Array.isArray(value)) args = value;
+    } catch {
+    }
+  } else if (/^(?:name|source|slug|dbKey|projectBinding|relativePath)=/.test(preview)) {
+    for (const match of preview.matchAll(/(?:^|\s)(name|source|slug|dbKey|projectBinding|relativePath)=([^\s]+)/g)) args[match[1]] = match[2];
+  } else if (preview) {
+    args.name = preview;
+  }
+  const textName = content.match(/^Skill "([^"\n]+)" loaded inline\./)?.[1];
+  const name = result?.name ?? textName ?? event.metadata?.name ?? args.name;
+  const source = result?.source ?? event.metadata?.source ?? args.source;
+  const slug = result?.slug ?? event.metadata?.slug ?? args.slug;
+  const dbKey = result?.dbKey ?? event.metadata?.dbKey ?? args.dbKey;
+  const relativePath2 = result?.relativePath ?? event.metadata?.relativePath ?? args.relativePath;
+  const shortReference = (value) => {
+    if (typeof value !== "string" || !value.trim()) return void 0;
+    const normalized = value.trim().replace(/\\/g, "/");
+    const parts = normalized.split("/").filter(Boolean);
+    return parts.at(-1) === "SKILL.md" && parts.length > 1 ? parts.at(-2) : parts.at(-1);
+  };
+  const candidate = shortReference(name) ?? shortReference(slug) ?? shortReference(dbKey) ?? shortReference(relativePath2) ?? shortReference(source) ?? t("unnamedSkillReference");
+  return clip(redactSecrets(cleanUserText(candidate)), 80);
 }
 function formatLoadSkillBlock(event, colorEnabled, opts) {
   if (event.type !== "tool-result" || event.toolName !== "loadSkill") return null;
   const skillName = resolveLoadSkillName(event);
   const content = typeof event.content === "string" ? event.content : "";
-  const failed = /^Skill\s+"[^"]*"\s+not found/.test(content) || isFailedToolResult(event);
-  const labelText = t("usedSkillLabel");
+  let result;
+  try {
+    const value = JSON.parse(content);
+    if (value && typeof value === "object" && !Array.isArray(value)) result = value;
+  } catch {
+  }
+  const failed = /^Skill\s+"[^"]*"\s+not found/i.test(content) || /^Skill reference rejected:/i.test(content) || event.metadata?.resolved === false || Boolean(event.metadata?.failed) || result?.success === false || isFailedToolResult(event);
+  const labelText = t(failed ? "loadSkillLabel" : "usedSkillLabel");
   if (failed) {
     const message = opts?.safe === true ? t("toolFailed") : clip(content.split("\n")[0] || t("toolFailed"), 96);
     return formatToolTraceLine(`\u25B8 ${labelText} (${skillName})  \u2717 ${message}`, colorEnabled, "error");
@@ -10338,14 +9864,34 @@ function formatLoadSkillBlock(event, colorEnabled, opts) {
 }
 var TUI_TREE_MARKER = "
TUI_TREE\n";
 var TUI_TREE_END = "";
+var TUI_TREE_TOOLS = {
+  Run: ["execShell", "runCommand", "launchProcess"],
+  Read: ["readFile"],
+  Search: ["exa_search"],
+  Fetch: ["fetchWebpage"]
+};
 function createToolEventFormatter(colorEnabled = resolveCliColorEnabled(), opts = {}) {
   const pending = /* @__PURE__ */ new Map();
   let tree = null;
-  const treeKind = (name) => isRunToolName(name) ? "Run" : isReadToolName(name) ? "Read" : name === "exa_search" ? "Search" : name === "fetchWebpage" ? "Fetch" : null;
-  const treeLine = (kind, items) => {
+  const treeKind = (name) => Object.keys(TUI_TREE_TOOLS).find((kind) => TUI_TREE_TOOLS[kind].includes(name)) ?? null;
+  const treeLine = (kind, items, fallback) => {
     const label = kind === "Run" ? toolLabel("execShell") : kind === "Read" ? toolLabel("readFile") : kind === "Fetch" ? toolLabel("fetchWebpage") : toolLabel("exa_search");
-    return `${TUI_TREE_MARKER}${label} (${items.length})
-${items.map((item, i) => `${i === items.length - 1 ? "\u2514\u2500\u2500 " : "\u251C\u2500\u2500 "}${item}  \u2713`).join("\n")}${TUI_TREE_END}
+    const header = `${label} (${items.length}) \xB7 `;
+    const columns = resolveHistoryLayoutGeometry(process.stdout.columns).contentWidth - displayWidth("\u25C8 ");
+    let shown = 1;
+    for (let count = 2; count <= items.length; count++) {
+      const omitted2 = items.length - count;
+      const suffix = omitted2 ? `, \u2026 +${omitted2}` : "";
+      if (displayWidth(`\u2022 ${header}${items.slice(0, count).join(", ")}${suffix}  \u2713`) > columns) break;
+      shown = count;
+    }
+    const omitted = items.length - shown;
+    const payload = {
+      kind,
+      summary: `${header}${items.slice(0, shown).join(", ")}${omitted ? `, \u2026 +${omitted}` : ""}  \u2713`,
+      fallback
+    };
+    return `${TUI_TREE_MARKER}${JSON.stringify(payload)}${TUI_TREE_END}
 `;
   };
   const formatTreeEvent = (event, call) => {
@@ -10372,8 +9918,8 @@ ${items.map((item, i) => `${i === items.length - 1 ? "\u2514\u2500\u2500 " : "\u
     item = withholdIfSecretLike(item) || toolLabel(name);
     if (tree?.kind !== kind) tree = { kind, items: [] };
     tree.items.push(item);
-    if (tree.items.length < 2) return formatNormalToolLine(event, call, colorEnabled);
-    return treeLine(kind, tree.items);
+    if (tree.items.length < 2) return formatNormalToolLine(event, call, colorEnabled, opts);
+    return treeLine(kind, tree.items, formatNormalToolLine(event, call, colorEnabled, opts));
   };
   const format = (event) => {
     if (event.type === "tool-call") {
@@ -10387,7 +9933,7 @@ ${items.map((item, i) => `${i === items.length - 1 ? "\u2514\u2500\u2500 " : "\u
     pending.delete(event.toolCallId);
     const treeOutput = formatTreeEvent(event, call);
     if (treeOutput !== null) return treeOutput;
-    return formatNormalToolLine(event, call, colorEnabled);
+    return formatNormalToolLine(event, call, colorEnabled, opts);
   };
   format.reset = () => {
     tree = null;
@@ -10583,7 +10129,7 @@ function formatCompactionSummaryLine(event) {
   if (!event) return "";
   if (event.failed) {
     const reason = event.detail ? `\uFF1A${event.detail}` : "";
-    return `${STYLE.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${STYLE.reset}
+    return `${STYLE.dim}\u81EA\u52A8\u4E0A\u4E0B\u6587\u538B\u7F29\u5931\u8D25${reason}\uFF0C\u4FDD\u7559\u5DF2\u6709\u5386\u53F2\uFF1B\u8D85\u51FA\u8BF7\u6C42\u9884\u7B97\u65F6\u5C06\u505C\u6B62\u53D1\u9001\u3002\u53EF\u624B\u52A8 /compact \u91CD\u8BD5\u3002${STYLE.reset}
 `;
   }
   if (event.skipped) {
@@ -10639,7 +10185,7 @@ function shouldPromoteTuiNarration(text) {
   return /(^|\n)\s*(?:#{1,3}\s|```|[-*+]\s|\d+[.)]\s)/.test(text);
 }
 function narrationActivityLabel(text) {
-  const oneLine = stripAnsi2(text).replace(/[`*_#>]/g, "").replace(/\s+/g, " ").trim();
+  const oneLine = stripAnsi(text).replace(/[`*_#>]/g, "").replace(/\s+/g, " ").trim();
   return truncateThinkingHint(oneLine, 60);
 }
 function createCliTurnOutput(params) {
@@ -10647,7 +10193,8 @@ function createCliTurnOutput(params) {
   const workingLabel = params.workingLabel ?? `${options.agentName} -> working`;
   const spinner = params.spinner ?? new Spinner(options.output, workingLabel, Boolean(options.activityReporter));
   const formatToolEvent = createToolEventFormatter(void 0, {
-    tuiTrees: options.output.tuiTrees === true
+    tuiTrees: options.output.tuiTrees === true,
+    visibleRunIds: options.output.visibleRunIds
   });
   const eventMode = resolveAgentEventMode(options);
   const assistantLabelManaged = options.output.assistantLabelManaged === true;
@@ -10876,8 +10423,17 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
      */
     showPhase(phase) {
       const label = phase === "validating-context" ? t("contextChecking") : phase === "compacting" ? t("contextCompacting") : t("waitingForModel");
-      spinner.show(label);
-      options.activityReporter?.(label);
+      this.showWorking(label);
+    },
+    handleCompactionActivity(event) {
+      if (event.kind === "compaction-retry") {
+        this.showWorking(t("contextCompactingRetry", String(event.attempt), String(event.maxAttempts)));
+      } else if (event.kind === "compaction-start") {
+        this.showPhase("compacting");
+      } else if (event.kind === "compaction-end" || // Failed compaction continues with trimmed history; abort owns its terminal cleanup.
+      event.kind === "compaction-failed" && event.reason !== "aborted") {
+        this.showPhase("waiting-provider");
+      }
     },
     finish(fallbackContent) {
       const flushedThink = flushThinkParser(thinkState);
@@ -11412,9 +10968,57 @@ function isBalanceExhaustedError(error) {
   return matchesBalanceError(message);
 }
 
+// packages/cli/client/hostTaskWorkspaceAssessment.ts
+import { resolve as resolve3 } from "node:path";
+var object = (value) => value !== null && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+var present = (value) => typeof value === "string" && value.trim().length > 0;
+function resolveCurrentHostTaskReference(input) {
+  const ref = input.reference;
+  if (!ref || !present(ref.taskId) || !present(ref.workspace) || !present(ref.dialogId) || ref.dialogId !== input.dialogId || resolve3(ref.workspace) !== resolve3(input.workspace) || readHostTask(hostTaskEventsRoot(input.env), ref).authorization === "unknown") return void 0;
+  return structuredClone(ref);
+}
+async function assessHostTaskWorkspace(input) {
+  const ref = resolveCurrentHostTaskReference(input);
+  if (!ref) return void 0;
+  const root = hostTaskEventsRoot(input.env);
+  const blocked = (reason, businessReason = "invalid_contract") => ({
+    exitCode: 1,
+    hostTaskWorkspaceBlocker: reason,
+    businessCompletion: { taskId: ref.taskId, status: "blocked", reasons: [businessReason] }
+  });
+  const fresh = await collectHostTaskWorkspace(ref, input.env);
+  const plan = readHostTaskAcceptancePlan(ref, input.env);
+  let planned;
+  if (plan) {
+    try {
+      planned = { status: "ready", context: await collectHostTaskPlannedWorkspace(ref, input.env) };
+    } catch {
+      planned = { status: "blocked", reason: "task_planned_workspace_unavailable" };
+    }
+  }
+  const authority = readHostTask(root, ref).authorization;
+  if (authority === "paused" || authority === "revoked") return blocked(`authorization_${authority}`, `authorization_${authority}`);
+  if (authority !== "active") return blocked("task_authority_unavailable");
+  const supplied = object(input.evidence);
+  if (supplied?.status === "blocked") return blocked(present(supplied.reason) ? supplied.reason : "workspace_blocked");
+  if (fresh.status === "blocked") return blocked(fresh.reason);
+  if (planned?.status === "blocked") return blocked(planned.reason);
+  if (planned?.status === "ready" && planned.context.baseline !== fresh.context.baseline) {
+    return blocked("task_plan_baseline_mismatch");
+  }
+  const context = object(supplied?.context);
+  const scope = object(context?.scope);
+  if (supplied?.status !== "ready" || !context || !scope || scope.taskId !== ref.taskId || scope.dialogId !== ref.dialogId || scope.taskInstanceId !== ref.taskInstanceId || !present(scope.workspace) || resolve3(scope.workspace) !== resolve3(ref.workspace)) return blocked("workspace_evidence_mismatch");
+  const matches = (canonical) => context.baseline === canonical.baseline && context.revision === canonical.revision && Array.isArray(context.taskPaths) && context.taskPaths.length === canonical.taskPaths.length && context.taskPaths.every((path2, index) => path2 === canonical.taskPaths[index]);
+  if (!matches(fresh.context) && !(planned?.status === "ready" && matches(planned.context))) {
+    return blocked("workspace_evidence_mismatch");
+  }
+  return void 0;
+}
+
 // packages/cli/client/agentRun.ts
 async function loadRunLocalAgentTurn() {
-  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-HL526DNQ.js");
+  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-QZPFWMLG.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();
@@ -11690,6 +11294,7 @@ function looksLikeQuotaExhaustedText(message) {
 }
 var BARE_UPSTREAM_5XX_RE = /\bHTTP[:\s]+(5\d\d)\b|\bstatus[:\s=]+(5\d\d)\b|\breturned error\s+(5\d\d)\b/i;
 function classifyLocalRunError(message) {
+  if (isHistoryIntegrityFailure(message)) return { kind: "history_integrity" };
   const m = message.match(PROVIDER_HTTP_FAILED_RE);
   if (m) {
     const status = Number(m[2]);
@@ -11982,8 +11587,7 @@ function buildRateLimitFailure(ctx) {
       t(
         "localRunRateLimitCooldown",
         formatCooldownUntilLocal(cooldownUntil),
-        resetValue ? t("localRunRateLimitResetNote", resetValue) : "",
-        String(Math.round(PROBE_INTERVAL_MS / 6e4))
+        resetValue ? t("localRunRateLimitResetNote", resetValue) : ""
       )
     );
   }
@@ -12066,8 +11670,52 @@ function buildUpstreamFailure(ctx) {
   return `${RUN_UNAVAILABLE_PREFIX} (${ctx.where} returned HTTP ${ctx.status}). Detail: ${ctx.message} ${NO_FALLBACK} ${fix}, ${SERVER_FALLBACK_HINT}
 `;
 }
+function describeHistoryIntegrityFailure(message) {
+  const ids = [...new Set(message.match(/\bcall_[A-Za-z0-9_-]+\b/g) ?? [])];
+  const pairing = ids.length ? ` Missing tool result pairing: ${ids.join(", ")}.` : "";
+  return `[nolo] history_integrity: Strict continuation history could not be verified.${pairing} Restore verified complete history from the original host or finish verified history recovery before retrying. No history was discarded or fabricated; blind retry will not repair coverage.
+`;
+}
+var LOCAL_CONTEXT_COVERAGE_TEXT = "Context protection: history cannot fit without losing messages";
+function isLocalContextCoverageFailure(error) {
+  return error?.code === "LOCAL_CONTEXT_COVERAGE_REQUIRED" || toErrorMessage(error).includes(LOCAL_CONTEXT_COVERAGE_TEXT);
+}
+var BATCH_RECEIPT_MISSING_TEXT = "Missing durable batch receipt";
+function isMissingBatchReceiptFailure(message) {
+  return message.includes(BATCH_RECEIPT_MISSING_TEXT);
+}
+function describeMissingBatchReceipt() {
+  return "this turn's queued message batch has no durable admission receipt in this dialog, so the send state cannot be verified from local records. Your messages are kept. Re-send only if the previous reply never arrived; if it repeats, restart the TUI to restore the queue. This is not a credential or config problem";
+}
+function describeCliBatchPhaseFailure(error) {
+  const cause = error.cause instanceof Error ? error.cause.message : String(error.cause ?? "");
+  if (!error.requestStarted) {
+    if (/already requested/i.test(cause)) {
+      return `[nolo] queued batch ${error.batchId} was already requested; this attempt was blocked and not re-sent. The earlier attempt may have been sent and billed \u2014 check the dialog history before resending.
+`;
+    }
+    return `[nolo] queued batch ${error.batchId} was blocked before the model was called; this attempt was not sent and was not re-sent. The prior send state is unknown. ${cause} Your messages are kept.
+`;
+  }
+  return `[nolo] queued batch ${error.batchId}: the model was called but the reply/completion evidence was not confirmed saved. It was not re-sent. Check the dialog history before resending. ${cause}
+`;
+}
+function isCliBatchPhaseFailure(error) {
+  return error?.code === "cli_batch_phase_failed";
+}
 function formatLocalTurnFailureLine(error) {
   const message = toErrorMessage(error);
+  if (isCliBatchPhaseFailure(error)) {
+    return describeCliBatchPhaseFailure(error);
+  }
+  if (isLocalContextCoverageFailure(error)) {
+    return `[nolo] ${describeContextRefusal(contextRefusalDiagnostics(error))}
+`;
+  }
+  if (isMissingBatchReceiptFailure(message)) {
+    return `[nolo] ${describeMissingBatchReceipt()}.
+`;
+  }
   if (error?.code === "LLM_REQUEST_TIMEOUT") {
     const msMatch = /after (\d+)ms/.exec(message);
     const deadline = msMatch && Number.isFinite(Number(msMatch[1])) ? formatElapsed(Math.round(Number(msMatch[1]) / 1e3)) : "the configured window";
@@ -12075,6 +11723,7 @@ function formatLocalTurnFailureLine(error) {
 `;
   }
   const cls = classifyLocalRunError(message);
+  if (cls.kind === "history_integrity") return describeHistoryIntegrityFailure(message);
   if (cls.kind === "rate-limit") {
     const rawCooldownUntil = error && typeof error === "object" ? error.cooldownUntil : void 0;
     return buildRateLimitFailure({
@@ -12153,9 +11802,21 @@ function describeLocalRunFailure(message, rawError) {
   if (isCliAuthorityBrokerProtocolError(rawError) || /CLI authority broker protocol|CLI authority broker .* returned malformed response/i.test(message)) {
     const cleaned = stripDebugNoise(message);
     return `${RUN_UNAVAILABLE_PREFIX} (${cleaned}). ${NO_FALLBACK} The local authority broker returned a protocol or malformed response error. Check the running broker process and retry, ${SERVER_FALLBACK_HINT}
+`;
+  }
+  if (isCliBatchPhaseFailure(rawError)) {
+    return describeCliBatchPhaseFailure(rawError);
+  }
+  if (isLocalContextCoverageFailure(rawError ?? message)) {
+    return `[nolo] ${describeContextRefusal(contextRefusalDiagnostics(rawError))}
+`;
+  }
+  if (isMissingBatchReceiptFailure(message)) {
+    return `[nolo] ${describeMissingBatchReceipt()}.
 `;
   }
   const cls = classifyLocalRunError(message);
+  if (cls.kind === "history_integrity") return describeHistoryIntegrityFailure(message);
   if (cls.kind === "generic") {
     if (/owner-required route not acknowledged/i.test(message)) {
       return `${RUN_UNAVAILABLE_PREFIX} (${message}). ${NO_FALLBACK} The server returned a successful response but did not acknowledge the owner route. Check server version or proxy configuration, ${SERVER_FALLBACK_HINT}
@@ -12344,7 +12005,7 @@ async function runHttpAgentTurn(options, authToken) {
   const contentType = res.headers.get("content-type") || "";
   if (contentType.includes("text/event-stream") && res.body) {
     const result = await readStreamingAgentRun(options, res, spinner);
-    return result;
+    return { ...result, httpOutcome: { status: res.status } };
   }
   spinner.stop();
   let data = {};
@@ -12431,7 +12092,7 @@ ${options.agentName} > (no text response)
     model: typeof data?.model === "string" ? data.model : void 0,
     dialogServer: serverOriginForDialog(options.serverUrl)
   });
-  return serverResult;
+  return { ...serverResult, httpOutcome: { status: res.status, body: data } };
 }
 async function runInjectedLocalAgentTurn(options) {
   return runLocalAgentTurnForCli(options, { reportFailure: true });
@@ -12527,14 +12188,189 @@ async function executeLocalAgentTurnForCliWithAdapter(options, settings, resolve
   } : void 0;
   const currentDialogId = options.continueDialogId ?? ulid2();
   const freshDialog = options.freshDialog ?? !options.continueDialogId;
+  options = { ...options, hostTaskRef: resolveCurrentHostTaskReference({
+    reference: options.hostTaskRef,
+    workspace: options.localRuntimeCwd ?? process.cwd(),
+    dialogId: currentDialogId,
+    env: options.env
+  }) };
   const turnId = `turn-${ulid2()}`;
   const runtimeContextWithOwnership = {
     ...runtimeContext ?? {},
     dialogId: currentDialogId,
-    turnId
+    turnId,
+    getProcessCausalDepth: options.getProcessCausalDepth
+  };
+  const installReviewHost = baseAdapter.installTaskReviewHost;
+  if (options.hostTaskRef && installReviewHost) {
+    const scope = structuredClone(options.hostTaskRef);
+    const authorExecutionId = createHostAuthorExecution(options.env, scope, turnId);
+    installReviewHost({ scope, authorExecutionId, authorize: async () => {
+      if (!scope.taskId?.trim() || !scope.workspace?.trim() || !scope.dialogId?.trim() || scope.dialogId !== currentDialogId || resolveHostReviewPath(scope.workspace) !== resolveHostReviewPath(options.localRuntimeCwd ?? process.cwd())) throw new Error("task_review_host_scope_mismatch");
+    } });
+  }
+  let reviewContext;
+  const requestedReview = options.hostReviewDispatch;
+  if (requestedReview && options.hostTaskRef && requestedReview.scope.taskId === options.hostTaskRef.taskId && requestedReview.scope.dialogId === currentDialogId && resolveHostReviewPath(requestedReview.scope.workspace) === resolveHostReviewPath(options.hostTaskRef.workspace)) {
+    reviewContext = { ...requestedReview, authorExecutionId: createHostAuthorExecution(options.env, options.hostTaskRef, turnId) };
+  }
+  const commandVersionBindings = /* @__PURE__ */ new Map();
+  const commandAdapter = !options.runtimeKey || options.runtimeKey === "local" ? wrapLocalCommandWorkspaceObservation(baseAdapter, options.localRuntimeCwd ?? process.cwd(), commandVersionBindings, void 0, options.abortSignal) : baseAdapter;
+  const reviewAdapter = {
+    ...commandAdapter,
+    executeTool: async (call, opts) => {
+      let args = {};
+      try {
+        args = typeof call.arguments === "string" ? JSON.parse(call.arguments) : call.arguments ?? {};
+      } catch {
+      }
+      const matched = call.name === "startAgentRun" && matchesHostReviewDispatch(reviewContext, call, args);
+      const result = await withHostReviewDispatch(matched ? reviewContext : void 0, () => commandAdapter.executeTool(call, opts));
+      return result;
+    }
+  };
+  const completionEvidenceProvider = options.hostTaskRef ? options.hostTaskCompletionEvidenceProvider : void 0;
+  let hostTask = bindHostTask({
+    adapter: reviewAdapter,
+    reference: options.hostTaskRef,
+    workspace: options.localRuntimeCwd ?? process.cwd(),
+    dialogId: currentDialogId,
+    env: options.env,
+    signal: options.abortSignal,
+    completionEvidenceProvider
+  });
+  if (options.hostTaskRef && options.hostTaskWorkspaceEvidence !== void 0 && readHostTask(hostTaskEventsRoot(options.env), options.hostTaskRef).authorization === "active") {
+    const blocker = await assessHostTaskWorkspace({
+      reference: options.hostTaskRef,
+      workspace: options.localRuntimeCwd ?? process.cwd(),
+      dialogId: currentDialogId,
+      env: options.env,
+      evidence: options.hostTaskWorkspaceEvidence
+    });
+    if (blocker) {
+      options.output.write(`[auto-review] blocked: ${blocker.hostTaskWorkspaceBlocker}
+`);
+      try {
+        const saved = await reviewAdapter.saveTurn({
+          agentKey: options.agentKey,
+          messages: [{ role: "user", content: options.message }],
+          continueDialogId: currentDialogId,
+          runtimeContext: runtimeContextWithOwnership,
+          result: {
+            model: "host-workspace-assessment",
+            content: "",
+            error: true,
+            businessCompletion: blocker.businessCompletion
+          }
+        });
+        return {
+          ...blocker,
+          hostTaskRef: options.hostTaskRef,
+          dialogId: saved.dialogId,
+          taskAuthorization: readHostTask(hostTaskEventsRoot(options.env), options.hostTaskRef).authorization
+        };
+      } catch (localError) {
+        return { ...blocker, hostTaskRef: options.hostTaskRef, localError };
+      }
+    }
+  }
+  let usedReviewTool = false;
+  let batchProviderStarted = false;
+  let mainProviderStarted = false;
+  let refusalModel = "";
+  let turnPersisted = false;
+  let batchIdentity;
+  try {
+    batchIdentity = resolveCliBatchIdentity(options);
+  } catch (error) {
+    options.output.write(`[nolo] ${error instanceof Error ? error.message : String(error)}
+`);
+    return { exitCode: 1, localError: error };
+  }
+  const markBatch = async (phase) => {
+    if (!batchIdentity) return;
+    const store = await getOrCreateSharedStore({ env: options.env, cwd: options.localRuntimeCwd, fetchImpl: options.fetchImpl });
+    try {
+      await markCliUserBatchPhase(store, currentDialogId, batchIdentity.batchId, phase, batchIdentity.messageIds, phase === "requested" ? options.userMessages : void 0);
+    } catch (error) {
+      throw cliBatchPhaseFailure({ phase, batchId: batchIdentity.batchId, requestStarted: false, replyPersisted: false, cause: error });
+    }
+  };
+  const adapter = {
+    ...hostTask.adapter,
+    resolveProvider: async (...args) => {
+      const provider = await hostTask.adapter.resolveProvider(...args);
+      const isTextOnly = Boolean(args[1]?.textOnly);
+      if (!isTextOnly) refusalModel = provider.model;
+      return {
+        ...provider,
+        complete: async (...completeArgs) => {
+          if (!isTextOnly) {
+            mainProviderStarted = true;
+          }
+          if (batchIdentity && !isTextOnly && !batchProviderStarted) {
+            await markBatch("requested");
+            batchProviderStarted = true;
+          }
+          return provider.complete(...completeArgs);
+        }
+      };
+    },
+    executeTool: async (call, opts) => {
+      const protectedReview = call.name === "requestTaskReview" || call.name === "recordTaskReviewDecision";
+      if (!protectedReview) return reviewAdapter.executeTool(call, opts);
+      usedReviewTool = true;
+      if (options.hostTaskRef?.taskInstanceId) {
+        const authorize = baseAdapter.authorizeAccountTask;
+        if (!authorize) throw new Error("task_review_account_authorization_unavailable");
+        await authorize(options.hostTaskRef);
+      }
+      if (!options.hostTaskRef && ["requestTaskReview", "recordTaskReviewDecision"].includes(call.name)) {
+        const admit = baseAdapter.admitAccountReviewTurn;
+        if (!admit) throw new Error("task_review_account_admission_unavailable");
+        const reference = await admit(currentDialogId, turnId);
+        options = { ...options, hostTaskRef: reference };
+        hostTask = bindHostTask({ adapter: reviewAdapter, reference, workspace: options.localRuntimeCwd ?? process.cwd(), dialogId: currentDialogId, env: options.env, signal: options.abortSignal });
+      }
+      return hostTask.adapter.executeTool(call, opts);
+    },
+    saveTurn: async (input) => {
+      if (usedReviewTool && options.hostTaskRef) await settleHostReviewsForScope(options.hostTaskRef, options.env, options.hostReviewContentAcceptance);
+      const completeBatch = Boolean(batchIdentity && batchProviderStarted && !input.result.error);
+      const injectedBatches = options.drainInjectedBatches ?? [];
+      const injectedMessageIds = new Set(injectedBatches.flatMap((batch) => batch.messageIds));
+      const completeBatchIds = [
+        ...completeBatch ? [batchIdentity.batchId] : [],
+        ...!input.result.error ? injectedBatches.map((batch) => batch.batchId) : []
+      ];
+      try {
+        const saved = await hostTask.adapter.saveTurn({
+          ...input,
+          messages: input.messages.filter((message) => {
+            const cliMessageId = message.cliMessageId;
+            if (!cliMessageId) return true;
+            if (options.userMessages?.some((user) => user.cliMessageId === cliMessageId)) return false;
+            if (injectedMessageIds.has(cliMessageId)) return false;
+            return true;
+          }),
+          ...completeBatchIds.length ? { cliBatchCompletion: { batchIds: completeBatchIds } } : {}
+        });
+        turnPersisted = true;
+        return saved;
+      } catch (error) {
+        if (batchIdentity && batchProviderStarted) {
+          throw cliBatchPhaseFailure({ phase: "completed", batchId: batchIdentity.batchId, requestStarted: true, replyPersisted: false, cause: error });
+        }
+        throw error;
+      }
+    }
   };
-  const adapter = baseAdapter;
   const expandedMessage = options.pastedTextStore?.items.size ? expandCollapsedPastes(options.message, options.pastedTextStore) : options.message;
+  const commandObservations = [];
+  const retainCommandObservations = (result) => {
+    recordRunResultHeaderMeta(result, { commandObservations });
+    return result;
+  };
   const workingLabel = `${options.agentName} -> working locally`;
   const turnOutput = createCliTurnOutput({
     options,
@@ -12556,9 +12392,11 @@ async function executeLocalAgentTurnForCliWithAdapter(options, settings, resolve
     const runLocalAgentTurn = await loadRunLocalAgentTurn();
     const result = await runLocalAgentTurn({
       adapter,
+      ...hostTask.contract ? { taskExecutionContract: hostTask.contract } : {},
       agentRef: options.agentKey,
       userLanguage: options.userLanguage ?? options.env.NOLO_LANG ?? null,
       input: buildUserInputContent(messageForLocal, options.imageUrls),
+      userMessages: options.userMessages,
       ...expandedMessage !== options.message || localAttachmentCard !== "" ? {
         persistedInput: hasDurableAttachments ? buildUserInputContent(
           expandedMessage,
@@ -12606,15 +12444,7 @@ async function executeLocalAgentTurnForCliWithAdapter(options, settings, resolve
         if (event.kind === "turn-phase") {
           turnOutput.showPhase(event.phase);
         }
-        if (event.kind === "compaction-start") {
-          turnOutput.showPhase("compacting");
-        }
-        if (event.kind === "compaction-end" || // 压缩失败（timeout/provider-error）时 localLoop 按失败原子性语义
-        // 带着裁剪后的历史继续本轮，切回等待模型文案；aborted 时 turn 随即
-        // 结束，不再切文案（终态由 abort 路径收尾）。
-        event.kind === "compaction-failed" && event.reason !== "aborted") {
-          turnOutput.showPhase("waiting-provider");
-        }
+        turnOutput.handleCompactionActivity(event);
         if (event.kind === "image-downgraded") {
           options.output.write(
             "[nolo] \u5F53\u524D agent \u88AB\u914D\u7F6E\u4E3A\u4E0D\u652F\u6301\u56FE\u7247\u8F93\u5165\uFF0C\u56FE\u7247\u5DF2\u7528\u5360\u4F4D\u6587\u672C\u66FF\u4EE3\u3002\u8BF7\u68C0\u67E5\u6A21\u578B\u7684\u56FE\u7247\u80FD\u529B\u914D\u7F6E\uFF0C\u6216\u7528 /switch \u9009\u62E9\u652F\u6301\u56FE\u7247\u7684 agent \u540E\u91CD\u65B0\u53D1\u9001\u56FE\u7247\u3002\n"
@@ -12631,6 +12461,8 @@ async function executeLocalAgentTurnForCliWithAdapter(options, settings, resolve
       // tool-gist-fold 后 onToolEvent 无条件挂载（不再受 traceLocalTools 开关
       // 控制，显示模式合并为单一 gist/折叠通道）——保留 alpha 的新形态。
       onToolEvent: (event) => {
+        const observation = observeLocalCommandResult(event, options.localRuntimeCwd ?? process.cwd());
+        if (observation) commandObservations.push({ ...observation, ...commandVersionBindings.get(event.toolCallId) });
         turnOutput.handleToolEvent(event);
       },
       ...!options.noStream ? {
@@ -12643,21 +12475,30 @@ async function executeLocalAgentTurnForCliWithAdapter(options, settings, resolve
       } : {}
     });
     turnOutput.finish(result.content);
+    const usageRecords = result.usageRecords?.filter(
+      (record) => Object.keys(record.usage ?? {}).length > 0
+    );
     const turnCredits = sumPlatformCredits(result.usageRecords);
+    const turnTokens = withTurnCredits(buildTurnTokenUsage(result.usage, result.model), turnCredits);
     const turnResult = {
+      savedTurnPersisted: turnPersisted,
+      mainProviderAttempted: mainProviderStarted,
       exitCode: 0,
+      stopReason: result.stopReason,
+      ...hostTask.result(),
+      ...options.hostTaskRef ? { hostTaskRef: options.hostTaskRef } : {},
       dialogId: result.dialogId,
       ...typeof result.content === "string" && result.content.trim() ? { finalText: result.content } : {},
-      title: result.title,
+      ...result.title !== void 0 ? { title: result.title } : {},
       ...result.titlePatchPromise ? { titlePatchPromise: result.titlePatchPromise } : {},
       ...pickEmptyAssistantFlags(result),
       // 积分口径按「全轮」而非「最后一次调用」：result.usage 只是收尾那次
       // provider 调用的 usage，本轮前面 N-1 次工具循环调用（以及自动压缩摘要）
       // 的 cost 都只存在于 usageRecords 里。token 字段仍取 result.usage——
       // 上下文占用本来就该看最后一次调用的累计输入，不是各次相加。
-      turnTokens: withTurnCredits(buildTurnTokenUsage(result.usage, result.model), turnCredits),
+      ...turnTokens !== void 0 ? { turnTokens } : {},
       ...turnCredits !== void 0 ? { turnCredits } : {},
-      ...result.usageRecords?.length ? { usageRecords: result.usageRecords } : {}
+      ...usageRecords?.length ? { usageRecords } : {}
     };
     const serverMeta = resolveResultServerMeta({
       env: options.env ?? {},
@@ -12665,6 +12506,7 @@ async function executeLocalAgentTurnForCliWithAdapter(options, settings, resolve
       hasSubjectRefs: (buildSubjectRefs(options)?.length ?? 0) > 0
     });
     recordRunResultHeaderMeta(turnResult, {
+      commandObservations,
       model: result.model,
       dialogServer: serverMeta.server,
       serverSync: serverMeta.serverSync
@@ -12680,14 +12522,18 @@ async function executeLocalAgentTurnForCliWithAdapter(options, settings, resolve
     const abortedTurnCredits = sumPlatformCredits(abortedUsageRecords);
     if (error?.code === LOCAL_TURN_ABORTED_CODE || options.abortSignal?.aborted) {
       const pendingToolName = error?.pendingToolName;
-      return {
+      return retainCommandObservations({
         exitCode: 0,
+        ...hostTask.result(),
+        savedTurnPersisted: turnPersisted,
+        mainProviderAttempted: mainProviderStarted,
+        ...options.hostTaskRef ? { hostTaskRef: options.hostTaskRef } : {},
         streamInterrupted: true,
         ...savedDialogId ? { dialogId: savedDialogId } : {},
         ...pendingToolName ? { pendingToolName } : {},
         ...abortedTurnCredits !== void 0 ? { turnCredits: abortedTurnCredits } : {},
         ...abortedUsageRecords?.length ? { usageRecords: abortedUsageRecords } : {}
-      };
+      });
     }
     const cooldownUntil = await markStartupRateLimitCooldown(
       options,
@@ -12698,27 +12544,59 @@ async function executeLocalAgentTurnForCliWithAdapter(options, settings, resolve
       error.cooldownUntil = cooldownUntil;
     }
     if (settings.reportFailure) {
-      const failureLine = formatLocalTurnFailureLine(error);
-      if (typeof options.output.writeErr === "function") {
-        options.output.writeErr(failureLine);
-      } else {
-        options.output.write(failureLine);
+      const suppressOutput = options.interactiveHost && isLocalContextCoverageFailure(error);
+      if (!suppressOutput) {
+        const failureLine = formatLocalTurnFailureLine(error);
+        if (typeof options.output.writeErr === "function") {
+          options.output.writeErr(failureLine);
+        } else {
+          options.output.write(failureLine);
+        }
       }
     }
-    return {
+    const isCoverage = isLocalContextCoverageFailure(error);
+    const persisted = turnPersisted;
+    const isTruePreflight = isCoverage && !persisted && !mainProviderStarted;
+    const refusal = isCoverage ? contextRefusalDiagnostics(error) : void 0;
+    if (isCoverage) {
+      console.warn(`[nolo] context-refusal ${JSON.stringify({
+        dialogId: savedDialogId ?? currentDialogId,
+        agentKey: options.agentKey,
+        model: refusalModel,
+        reason: refusal?.reason ?? "unknown",
+        historyTokens: refusal?.historyTokens ?? -1,
+        budget: refusal?.budget ?? -1,
+        largestMessageTokens: refusal?.largestMessageTokens ?? -1,
+        droppedCount: refusal?.droppedCount ?? 0,
+        detail: refusal?.detail ?? "diagnostics-unavailable"
+      })}`);
+    }
+    return retainCommandObservations({
       exitCode: 1,
+      ...hostTask.result(),
       localError: error,
+      savedTurnPersisted: persisted,
+      mainProviderAttempted: mainProviderStarted,
       failureSubclass: classifyFailureSubclass({
         message: toErrorMessage(error),
         body: error
       }),
-      ...savedDialogId ? { dialogId: savedDialogId } : {},
+      ...savedDialogId ? { dialogId: savedDialogId } : isCoverage ? { dialogId: currentDialogId } : {},
+      ...isTruePreflight ? {
+        preflightBlocked: {
+          code: "LOCAL_CONTEXT_COVERAGE_REQUIRED",
+          phase: "preflight",
+          retryable: true,
+          mainRequestSent: false,
+          ...refusal ? { refusal } : {}
+        }
+      } : {},
       ...abortedTurnCredits !== void 0 ? { turnCredits: abortedTurnCredits } : {},
       ...abortedUsageRecords?.length ? { usageRecords: abortedUsageRecords } : {}
-    };
+    });
   }
 }
-async function checkLocalAvailabilityBeforeHttpDispatch(options) {
+async function resolveLocalCredentialKeysForDispatch(options) {
   if (options.runtimeKey && !isDockerRuntimeKey(options.runtimeKey)) return null;
   const adapter = resolveLocalRuntimeAdapter(options);
   if (!adapter || typeof adapter.loadAgentConfig !== "function") return null;
@@ -12737,54 +12615,33 @@ async function checkLocalAvailabilityBeforeHttpDispatch(options) {
     config,
     options
   )) {
-    credentialKey = void 0;
-  }
-  const agentLevelAt = baseRecord.nextAvailableAt;
-  const agentLevelNextAvailableAt = typeof agentLevelAt === "number" && Number.isFinite(agentLevelAt) ? agentLevelAt : void 0;
-  if (!credentialKey && agentLevelNextAvailableAt === void 0) {
-    return { credentialKey };
+    return null;
   }
   const env = options.env;
   const now = Date.now();
-  let entry;
-  let matchedKey;
-  if (credentialKey) {
-    const effective = await readEffectiveCredentialEntry(credentialKey, env, now).catch(() => void 0);
-    if (effective) {
-      entry = effective;
-      matchedKey = effective.matchedKey;
-    }
-  }
-  const entryAt = entry?.nextAvailableAt;
-  const effectiveNextAvailableAt = typeof entryAt === "number" ? mergeAvailabilityDeadline(agentLevelNextAvailableAt, entryAt) : agentLevelNextAvailableAt;
-  const activeKey = matchedKey || credentialKey;
-  if (typeof effectiveNextAvailableAt !== "number") {
-    return { credentialKey: credentialKey || activeKey, matchedKey };
-  }
-  const gateDecision = resolveCooldownGate(
-    { nextAvailableAt: effectiveNextAvailableAt, lastProbeAt: entry?.lastProbeAt },
-    now
-  );
-  if (gateDecision === "probe" && activeKey) {
-    await recordCredentialProbe(activeKey, env, now).catch(() => void 0);
-    return { credentialKey: credentialKey || activeKey, matchedKey };
-  }
-  if (gateDecision !== "blocked") return { credentialKey: credentialKey || activeKey, matchedKey };
-  options.output.write(
-    `${t(
-      "agentCooldownBlocked",
-      options.agentName || options.agentKey,
-      formatCooldownUntilLocal(
-        new Date(Number(effectiveNextAvailableAt)).toISOString()
-      )
-    )}
-`
-  );
-  return { exitCode: 1, failureSubclass: "rate_limit" };
+  const entry = credentialKey ? await readEffectiveCredentialEntry(credentialKey, env, now).catch(() => void 0) : void 0;
+  const recorder = adapter;
+  return {
+    credentialKey,
+    matchedKey: entry?.matchedKey,
+    // 真实 status/body 由调用方透传（不再固定 200 无 body）：HTTP 2xx 的 body 里
+    // 也可能带配额错误码，固定成功的判定会把这类响应当成恢复而清掉冷却。
+    recordSuccess: recorder.recordStartupAvailabilityForAgent ? (status, body) => recorder.recordStartupAvailabilityForAgent(options.agentKey, status, body) : void 0
+  };
+}
+function projectLocalTurnFacts(result) {
+  return {
+    ...result.savedTurnPersisted !== void 0 ? { savedTurnPersisted: result.savedTurnPersisted } : {},
+    ...result.mainProviderAttempted !== void 0 ? { mainProviderAttempted: result.mainProviderAttempted } : {},
+    ...result.preflightBlocked !== void 0 ? { preflightBlocked: result.preflightBlocked } : {},
+    ...result.localError !== void 0 ? { localError: result.localError } : {}
+  };
 }
 function foldLocalResultForTui(localResult) {
   const folded = {
     exitCode: localResult.exitCode,
+    ...projectLocalTurnFacts(localResult),
+    ...localResult.hostTaskRef ? { hostTaskRef: localResult.hostTaskRef } : {},
     ...localResult.dialogId ? { dialogId: localResult.dialogId } : {},
     title: localResult.title,
     ...localResult.titlePatchPromise ? { titlePatchPromise: localResult.titlePatchPromise } : {},
@@ -12854,7 +12711,7 @@ async function runAgentTurn(options) {
     }
     const skipLocal = await shouldSkipAutoLocalForServerPlatformTools(options);
     if (!skipLocal) {
-      const localResult = await runLocalAgentTurnForCli(options, {
+      let localResult = await runLocalAgentTurnForCli(options, {
         reportFailure: false
       });
       if (localResult.exitCode === 0) {
@@ -12872,6 +12729,7 @@ async function runAgentTurn(options) {
             const retriedLocalResult = await runLocalAgentTurnForCli(options, {
               reportFailure: false
             });
+            localResult = retriedLocalResult;
             if (retriedLocalResult.exitCode === 0) {
               return foldLocalResultForTui(retriedLocalResult);
             }
@@ -12886,19 +12744,30 @@ async function runAgentTurn(options) {
         message: localErrorMessage,
         body: localResult.localError
       });
-      options.output.write(describeLocalRunFailure(localErrorMessage, localResult.localError));
-      return {
+      const suppressAutoFailureOutput = options.interactiveHost && Boolean(localResult.preflightBlocked || isLocalContextCoverageFailure(localResult.localError));
+      if (!suppressAutoFailureOutput) {
+        options.output.write(describeLocalRunFailure(localErrorMessage, localResult.localError));
+      }
+      const failureCoverageUsage = localResult.localError?.compactionUsage;
+      const failureUsageRecords = failureCoverageUsage ? [...localResult.usageRecords ?? [], {
+        // 形状对齐逐帧明细：callId 必填且本轮只有这一条救援摘要，
+        // model 用固定标签（摘要走平台托管或当前 provider，无法从错误取得）。
+        callId: "compaction-rescue",
+        usage: failureCoverageUsage,
+        model: "context-compaction"
+      }] : localResult.usageRecords;
+      const failedResult = {
         exitCode: 1,
+        ...projectLocalTurnFacts(localResult),
         failureSubclass,
         ...localResult.dialogId ? { dialogId: localResult.dialogId } : {},
-        // Keep localError so TUI can show balance/quota/dialog-preserved hints
-        // instead of only the raw auto-runtime line.
-        ...localResult.localError ? { localError: localResult.localError } : {},
         // 失败轮同样可能已发生平台计费（abort/失败照样扣费）：turnCredits 与
         // 逐帧明细一起随行，否则审计日志在 auto 失败路径上缺账。
         ...localResult.turnCredits !== void 0 ? { turnCredits: localResult.turnCredits } : {},
-        ...localResult.usageRecords?.length ? { usageRecords: localResult.usageRecords } : {}
+        ...failureUsageRecords?.length ? { usageRecords: failureUsageRecords } : {}
       };
+      recordRunResultHeaderMeta(failedResult, getRunResultHeaderMeta(localResult));
+      return failedResult;
     }
   }
   if (!authToken) {
@@ -12907,20 +12776,22 @@ async function runAgentTurn(options) {
     );
     return { exitCode: 1 };
   }
-  const localAvailability = await checkLocalAvailabilityBeforeHttpDispatch(options);
-  if (localAvailability?.exitCode) {
-    return {
-      exitCode: localAvailability.exitCode,
-      failureSubclass: localAvailability.failureSubclass ?? "rate_limit"
-    };
-  }
-  const httpResult = await runHttpAgentTurn(options, authToken);
-  if (httpResult.exitCode === 0 && !httpResult.streamInterrupted && (localAvailability?.credentialKey || localAvailability?.matchedKey)) {
-    const keyToClear = localAvailability.credentialKey || localAvailability.matchedKey;
-    await clearCredentialAvailability(
-      keyToClear,
-      options.env
-    ).catch(() => void 0);
+  const localAvailability = await resolveLocalCredentialKeysForDispatch(options);
+  const { httpOutcome, ...httpResult } = await runHttpAgentTurn(options, authToken);
+  if (httpResult.exitCode === 0 && !httpResult.streamInterrupted && localAvailability) {
+    const action = httpOutcome ? resolveAvailabilityAction(httpOutcome.status, httpOutcome.body, Date.now()) : void 0;
+    if (action?.kind === "clear") {
+      const keyToClear = localAvailability.credentialKey || localAvailability.matchedKey;
+      if (keyToClear) {
+        await clearCredentialAvailability(
+          keyToClear,
+          options.env
+        ).catch(() => void 0);
+      }
+    }
+    if (httpOutcome) {
+      await localAvailability.recordSuccess?.(httpOutcome.status, httpOutcome.body).catch(() => void 0);
+    }
   }
   return httpResult;
 }
@@ -13114,7 +12985,7 @@ function buildHostEnvironmentLayer(options) {
 
 // packages/agent-runtime/agentsMd.ts
 import { existsSync as existsSync2, readFileSync as readFileSync3 } from "node:fs";
-import { resolve as resolve2 } from "node:path";
+import { resolve as resolve4 } from "node:path";
 var AGENTS_MD_MAX_BYTES = 8192;
 var AGENTS_MD_MARKER_RESERVE_BYTES = 512;
 var AGENTS_MD_CANDIDATES = ["AGENTS.md", "CLAUDE.md"];
@@ -13174,6 +13045,37 @@ var parseAgentsMdItem = (body) => {
     rest: body.slice(firstClause.length).replace(/^[：:\s]+/, "")
   };
 };
+var AGENTS_MD_COMMAND_TOKEN_PREFIX = /^(bunx?|npx|node|npm|pnpm|yarn|git|gh|tsc|deno)\b\s/;
+var extractAgentsMdCommandTokens = (body) => {
+  const tokens2 = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const match of body.matchAll(/`([^`\n]+)`/g)) {
+    const raw = match[1];
+    if (!AGENTS_MD_COMMAND_TOKEN_PREFIX.test(raw)) continue;
+    if (seen.has(raw)) continue;
+    seen.add(raw);
+    tokens2.push(raw);
+  }
+  return tokens2;
+};
+var buildAgentsMdItemGist = (firstSentence, bulletBody) => {
+  const max = AGENTS_MD_SUMMARY_ITEM_MAX_CHARS;
+  const clipped = clipToChars(firstSentence, max);
+  const missing = extractAgentsMdCommandTokens(bulletBody).filter(
+    (token) => !clipped.includes(token)
+  );
+  if (missing.length === 0) return clipped;
+  let tail = "";
+  for (const token of missing) {
+    const candidate = tail ? `${tail} \`${token}\`` : `\`${token}\``;
+    if (candidate.length > max) continue;
+    tail = candidate;
+  }
+  if (!tail) return clipped;
+  const room = max - tail.length - 2;
+  const head = room > 0 ? clipToChars(firstSentence, room) : "";
+  return head ? `${head} ${tail}` : tail;
+};
 var priorityOf = (label) => {
   const lowered = label.toLowerCase();
   for (let i = 0; i < AGENTS_MD_SUMMARY_PRIORITY_KEYWORDS.length; i += 1) {
@@ -13207,7 +13109,7 @@ var collectAgentsMdSummaryItems = (content) => {
     items.push({
       section,
       label,
-      gist: clipToChars(firstSentence, AGENTS_MD_SUMMARY_ITEM_MAX_CHARS),
+      gist: buildAgentsMdItemGist(firstSentence, bullet[1]),
       priority: priorityOf(label)
     });
   }
@@ -13230,8 +13132,9 @@ ${AGENTS_MD_SUMMARY_DELETE_REFERENCE}
     ...items.filter((item) => item.priority >= 0).sort((a, b) => a.priority - b.priority),
     ...items.filter((item) => item.priority < 0)
   ];
-  const note = "\u2026\uFF08\u7D22\u5F15\u5DF2\u622A\u65AD\uFF0C\u5176\u4F59\u951A\u70B9\u89C1\u5B8C\u6574\u6587\u4EF6\uFF09";
-  const noteBytes = Buffer.byteLength(note, "utf8");
+  const noteBlock = `
+\u2026\uFF08\u7D22\u5F15\u5DF2\u622A\u65AD\uFF0C\u5176\u4F59\u951A\u70B9\u89C1\u5B8C\u6574\u6587\u4EF6\uFF09`;
+  const noteBytes = Buffer.byteLength(noteBlock, "utf8");
   let used = Buffer.byteLength(head, "utf8");
   const admitted = [];
   const seenSections = /* @__PURE__ */ new Set();
@@ -13265,8 +13168,7 @@ ${line}`, "utf8");
     }
   }
   if (admitted.length === 0) return null;
-  return `${head}${renderSummarySections(frozen)}${truncated ? `
-${note}` : ""}`;
+  return `${head}${renderSummarySections(frozen)}${truncated ? noteBlock : ""}`;
 }
 var renderSummarySections = (entries) => {
   let rendered = "";
@@ -13284,7 +13186,7 @@ ${entry.line}`;
 };
 function readAgentsMdLayerFromDisk(cwd) {
   for (const name of AGENTS_MD_CANDIDATES) {
-    const filePath = resolve2(cwd, name);
+    const filePath = resolve4(cwd, name);
     if (!existsSync2(filePath)) continue;
     try {
       const raw = readFileSync3(filePath, "utf8");
@@ -13426,16 +13328,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 join2, relative as relativePath, resolve as resolve3, sep } from "node:path";
+import { dirname, extname, isAbsolute as isAbsolute2, join as join2, relative as relativePath, resolve as resolve5, 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 = resolve3(cwd, normalized);
+    const directPath = resolve5(cwd, normalized);
     if (existsSync3(directPath)) return directPath;
   }
   const fileName = normalized.replace(/[^a-zA-Z0-9一-鿿]+/g, "-").replace(/^-+|-+$/g, "");
-  return resolve3(cwd, "docs", "workflows", `${fileName}.md`);
+  return resolve5(cwd, "docs", "workflows", `${fileName}.md`);
 }
 var SKILL_SEARCH_DIRS = [
   ".agents/skills"
@@ -13444,15 +13346,15 @@ function skillRefToCandidatePath(cwd, ref) {
   const normalized = ref.trim();
   if (!normalized) return "";
   if (normalized.endsWith(".md") || normalized.includes("/") || normalized.includes("\\")) {
-    const directPath = resolve3(cwd, normalized);
+    const directPath = resolve5(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 = resolve3(cwd, dir, fileName, "SKILL.md");
+    const skillMdPath = resolve5(cwd, dir, fileName, "SKILL.md");
     if (existsSync3(skillMdPath)) return skillMdPath;
   }
-  return resolve3(cwd, ".agents", "skills", fileName, "SKILL.md");
+  return resolve5(cwd, ".agents", "skills", fileName, "SKILL.md");
 }
 async function resolveWorkflowReference(ref, cwd = process.cwd()) {
   const path2 = workflowRefToCandidatePath(cwd, ref);
@@ -13469,11 +13371,11 @@ async function resolveWorkflowReference(ref, cwd = process.cwd()) {
 }
 function inlineRelativeRefs(body, skillDir) {
   const refPattern = /\[([^\]]+)\]\((\.\/[^)]+|[^)]+\/[^)]+)\)/g;
-  const normalizedSkillDir = resolve3(skillDir) + sep;
+  const normalizedSkillDir = resolve5(skillDir) + sep;
   return body.replace(refPattern, (match, label, relPath) => {
     const cleaned = relPath.trim();
     if (!cleaned.startsWith("./") && !cleaned.startsWith("../")) return match;
-    const absPath = resolve3(skillDir, cleaned);
+    const absPath = resolve5(skillDir, cleaned);
     const relative = relativePath(normalizedSkillDir, absPath);
     if (relative.startsWith("..") || isAbsolute2(relative)) return match;
     if (!existsSync3(absPath) || !absPath.endsWith(".md")) return match;
@@ -13623,7 +13525,7 @@ function prependSubjectDialogMarker(message, subjectDialogKey) {
 }
 function normalizeCliImageInput(input) {
   if (/^(https?:|data:|file:)/i.test(input)) return input;
-  const absolutePath = resolve3(input);
+  const absolutePath = resolve5(input);
   if (!existsSync3(absolutePath)) return input;
   const base64 = readFileSync4(absolutePath).toString("base64");
   return `data:${imageMimeTypeForPath(absolutePath)};base64,${base64}`;
@@ -13642,55 +13544,6 @@ function imageMimeTypeForPath(path2) {
   }
 }
 
-// packages/cli/agentRunLocalWorkspace.ts
-async function runGitForLocalSummary(args, deps = {}) {
-  const spawn = deps.spawnProcess ?? spawnProcess;
-  const read = deps.readPipeText ?? readPipeText;
-  const proc = spawn({
-    cmd: ["git", ...args.gitArgs],
-    cwd: args.cwd,
-    stdout: "pipe",
-    stderr: "pipe"
-  });
-  const [stdout, stderr, exitCode] = await Promise.all([
-    read(proc.stdout),
-    read(proc.stderr),
-    proc.exited
-  ]);
-  if (exitCode !== 0) {
-    throw new Error((stderr || stdout || `git ${args.gitArgs.join(" ")} failed`).trim());
-  }
-  return stdout.trim();
-}
-async function inspectLocalRunWorkspace(cwd, deps = {}) {
-  const run = (gitArgs) => runGitForLocalSummary({ cwd, gitArgs }, deps);
-  const status = await run(["status", "--short"]);
-  const rawCommit = await run(["log", "-1", "--format=%h%x00%s"]).catch(() => "");
-  const [hash, subject] = rawCommit.split("\0");
-  return {
-    cwd,
-    clean: status.trim() === "",
-    status,
-    ...hash ? { commit: { hash, subject: subject ?? "" } } : {}
-  };
-}
-function shouldPrintLocalRunSummary(args) {
-  return Boolean(args.localRuntimeCwd && args.parsed.runtimeMode === "local");
-}
-function formatLocalRunSummary(args) {
-  return [
-    "",
-    "[nolo] local run summary",
-    `workspace: ${args.inspection.cwd}`,
-    ...args.dialogId ? [`dialog: ${args.dialogId}`] : [],
-    ...args.inspection.commit ? [`commit: ${args.inspection.commit.hash} ${args.inspection.commit.subject}`] : [],
-    `dirty: ${args.inspection.clean ? "clean" : "dirty"}`,
-    ...!args.inspection.clean && args.inspection.status.trim() ? [`status:
-${args.inspection.status.trim()}`] : [],
-    ""
-  ].join("\n");
-}
-
 // packages/ai/memory/storeShared.ts
 var retrievalCountOf = (item) => item.activationCount ?? 0;
 var touchMemoryItemsInDb = async (db, items, now = (/* @__PURE__ */ new Date()).toISOString()) => {
@@ -13707,367 +13560,6 @@ var touchMemoryItemsInDb = async (db, items, now = (/* @__PURE__ */ new Date()).
   await batch.write();
 };
 
-// packages/ai/memory/constants.ts
-var EXPLICIT_REMEMBER_PREFIX_REGEX = /^(你要记住|请记住|以后记住|记住)[，,。.\s:：]*/u;
-
-// packages/ai/memory/source.ts
-var getMemorySourceKind = (item) => {
-  if (item.sourceKind) return item.sourceKind;
-  if (item.patternKey === "explicit-remember") return "explicit-user-directive";
-  if (item.patternKey === "agent-remember" || item.patternKey === "procedural-runbook")
-    return "agent-tool";
-  if (item.patternKey?.startsWith("dialog-learning:"))
-    return "dialog-learning";
-  if (item.tags?.includes("understanding-memory"))
-    return "inferred-understanding";
-  return "agent-tool";
-};
-
-// packages/ai/memory/overlay.ts
-var KIND_TITLES = {
-  episodic: "Episodic",
-  semantic: "Semantic",
-  procedural: "Procedural"
-};
-var estimateTokens = (text) => {
-  let cjk = 0;
-  let ascii = 0;
-  for (const ch of text) {
-    const code = ch.codePointAt(0) ?? 0;
-    if (code >= 13312 && code <= 40959) cjk += 1;
-    else ascii += 1;
-  }
-  return Math.ceil(cjk * 1.5 + ascii / 4);
-};
-var OVERLAY_HEADER_LINES = [
-  "--- Memory (\u76F8\u5173\u65F6\u53C2\u8003\uFF0C\u7528\u6237\u8F93\u5165\u4F18\u5148) ---",
-  ""
-];
-var OVERLAY_HEADER_TOKENS = estimateTokens(OVERLAY_HEADER_LINES.join("\n"));
-var KIND_PRIORITY = {
-  semantic: 0,
-  procedural: 1,
-  episodic: 2
-};
-var FACET_DISPLAY = {
-  unfinished: { label: "\u8FD8\u6CA1\u5B9A\u4E0B", strip: "\u8FD8\u6CA1\u51B3\u5B9A" },
-  tension: { label: "\u5728\u6743\u8861", strip: "\u5728\u6743\u8861" },
-  preference: { label: "\u66F4\u5728\u610F", strip: "\u66F4\u5728\u610F" },
-  style: { label: "\u66F4\u504F\u597D", strip: "\u66F4\u559C\u6B22" },
-  goal: { label: "\u60F3\u63A8\u8FDB", strip: "\u60F3\u63A8\u8FDB" }
-};
-var INFERRED_SOURCE_KINDS = /* @__PURE__ */ new Set(["inferred-understanding", "dialog-learning"]);
-var isInferredMemory = (item) => INFERRED_SOURCE_KINDS.has(getMemorySourceKind(item));
-var formatFacetContent = (facet, normalized, prefix) => {
-  const { label, strip } = FACET_DISPLAY[facet];
-  const stripped = normalized.startsWith(strip) ? normalized.slice(strip.length).trim() : normalized;
-  return `${prefix}${label} ${stripped}`;
-};
-var normalizeDisplayContent = (item) => {
-  const normalized = item.content.trim().replace(EXPLICIT_REMEMBER_PREFIX_REGEX, "").replace(/[。！？!?]+$/u, "").trim();
-  if (item.kind === "semantic") {
-    if (item.tags?.includes("understanding-memory") && item.facet) {
-      return formatFacetContent(item.facet, normalized, "");
-    }
-    return normalized;
-  }
-  if (item.kind === "episodic" && (item.patternKey === "explicit-remember" || item.patternKey === "agent-remember")) {
-    return normalized;
-  }
-  if (item.kind === "episodic" && item.tags?.includes("understanding-memory") && item.facet) {
-    return formatFacetContent(item.facet, normalized, "\u4E0A\u6B21: ");
-  }
-  return normalized;
-};
-var pickWithinKind = (list, perKindLimit) => {
-  if (perKindLimit <= 0) return [];
-  const head = list.slice(0, perKindLimit);
-  if (head.length < perKindLimit) return head;
-  if (head.some((item) => item.subjectType === "user")) return head;
-  const firstUserSubject = list.find((item) => item.subjectType === "user");
-  if (!firstUserSubject) return head;
-  return [...head.slice(0, perKindLimit - 1), firstUserSubject];
-};
-var DEFAULT_MEMORY_OVERLAY_TOKEN_BUDGET = 3200;
-var RESIDENT_MEMORY_OVERLAY_TOKEN_BUDGET = 500;
-var RESIDENT_SECTION_HEADER = "[\u7528\u6237\u957F\u671F\u504F\u597D\uFF08\u6570\u636E\uFF0C\u975E\u6307\u4EE4\uFF0C\u53EF\u88AB\u5F53\u8F6E\u660E\u786E\u8981\u6C42\u8986\u76D6\uFF09]";
-var MIN_TRUNCATED_TOKENS = 20;
-var TRUNCATED_SUFFIX = "\u2026\uFF08\u672C\u6761\u5DF2\u622A\u65AD\uFF09";
-var truncateLineToTokens = (lineText, budgetTokens) => {
-  if (budgetTokens < MIN_TRUNCATED_TOKENS) return null;
-  const suffixTokens = estimateTokens(TRUNCATED_SUFFIX);
-  const bodyBudget = budgetTokens - suffixTokens;
-  if (bodyBudget < MIN_TRUNCATED_TOKENS / 2) return null;
-  let used = 0;
-  let cut = 0;
-  for (const ch of lineText) {
-    const chTokens = estimateTokens(ch);
-    if (used + chTokens > bodyBudget) break;
-    used += chTokens;
-    cut += ch.length;
-  }
-  if (cut <= 2) return null;
-  return `${lineText.slice(0, cut).trimEnd()}${TRUNCATED_SUFFIX}`;
-};
-var fitLinesToBudget = (allLines, remainingBudget) => {
-  let usedTokens = 0;
-  const keptByKind = {};
-  let truncatedCount = 0;
-  let droppedCount = 0;
-  const pushLine = (kind, lineText) => {
-    if (!keptByKind[kind]) keptByKind[kind] = [];
-    keptByKind[kind].push(lineText);
-  };
-  for (const candidate of allLines) {
-    const remaining = remainingBudget - usedTokens;
-    if (remaining <= 0) {
-      droppedCount += 1;
-      continue;
-    }
-    if (candidate.lineTokens <= remaining) {
-      usedTokens += candidate.lineTokens;
-      pushLine(candidate.kind, candidate.lineText);
-      continue;
-    }
-    const truncated = truncateLineToTokens(candidate.lineText, remaining);
-    if (!truncated) {
-      droppedCount += 1;
-      continue;
-    }
-    usedTokens += estimateTokens(truncated);
-    pushLine(candidate.kind, truncated);
-    truncatedCount += 1;
-  }
-  return { keptByKind, truncatedCount, droppedCount };
-};
-var EMPTY_RETRIEVAL_FIT = {
-  keptByKind: {},
-  truncatedCount: 0,
-  droppedCount: 0
-};
-var EMPTY_RESIDENT_FIT = {
-  keptLines: [],
-  truncatedCount: 0,
-  droppedCount: 0
-};
-var fitResidentLines = (lines, remainingBudget) => {
-  let usedTokens = 0;
-  const keptLines = [];
-  let truncatedCount = 0;
-  let droppedCount = 0;
-  for (const candidate of lines) {
-    const remaining = remainingBudget - usedTokens;
-    if (remaining <= 0) {
-      droppedCount += 1;
-      continue;
-    }
-    if (candidate.lineTokens <= remaining) {
-      usedTokens += candidate.lineTokens;
-      keptLines.push(candidate.lineText);
-      continue;
-    }
-    const truncated = truncateLineToTokens(candidate.lineText, remaining);
-    if (!truncated) {
-      droppedCount += 1;
-      continue;
-    }
-    usedTokens += estimateTokens(truncated);
-    keptLines.push(truncated);
-    truncatedCount += 1;
-  }
-  return { keptLines, truncatedCount, droppedCount };
-};
-var buildBudgetFooter = (fit, residentFit) => {
-  const notices = [];
-  if (residentFit.truncatedCount > 0) {
-    notices.push(`${residentFit.truncatedCount} \u6761\u957F\u671F\u504F\u597D\u56E0\u9884\u7B97\u88AB\u622A\u65AD`);
-  }
-  if (residentFit.droppedCount > 0) {
-    notices.push(`${residentFit.droppedCount} \u6761\u957F\u671F\u504F\u597D\u672A\u663E\u793A`);
-  }
-  if (fit.truncatedCount > 0) {
-    notices.push(`${fit.truncatedCount} \u6761\u56E0\u9884\u7B97\u88AB\u622A\u65AD`);
-  }
-  if (fit.droppedCount > 0) {
-    notices.push(`${fit.droppedCount} \u6761\u672A\u663E\u793A`);
-  }
-  if (notices.length === 0) return [];
-  return [`\uFF08${notices.join("\u3001")}\uFF1B\u9700\u8981\u5B8C\u6574\u5185\u5BB9\u6216\u66F4\u591A\u76F8\u5173\u8BB0\u5FC6\u65F6\u7528 queryMemory \u68C0\u7D22\uFF09`];
-};
-var buildMemoryOverlay = (items, options) => {
-  if (items.length === 0) return null;
-  const maxTokens = options?.maxTokens ?? DEFAULT_MEMORY_OVERLAY_TOKEN_BUDGET;
-  const perKindLimit = options?.perKindLimit ?? 3;
-  const residentMaxTokens = options?.residentMaxTokens ?? RESIDENT_MEMORY_OVERLAY_TOKEN_BUDGET;
-  const residentItems = items.filter((item) => item.resident === true).sort((a, b) => b.createdAt.localeCompare(a.createdAt));
-  const retrievalItems = items.filter((item) => item.resident !== true);
-  const residentFit = residentItems.length === 0 ? EMPTY_RESIDENT_FIT : fitResidentLines(
-    residentItems.map((item) => {
-      const lineText = `- ${isInferredMemory(item) ? "\uFF08\u63A8\u65AD\uFF09" : ""}${normalizeDisplayContent(item)}`;
-      return { kind: item.kind, lineText, lineTokens: estimateTokens(lineText) };
-    }),
-    residentMaxTokens - estimateTokens(RESIDENT_SECTION_HEADER)
-  );
-  const byKind = {
-    episodic: [],
-    semantic: [],
-    procedural: []
-  };
-  for (const item of retrievalItems) {
-    byKind[item.kind].push(item);
-  }
-  const remainingBudget = maxTokens - OVERLAY_HEADER_TOKENS;
-  let retrievalFit = EMPTY_RETRIEVAL_FIT;
-  let retrievalSections = [];
-  if (remainingBudget > 0 && retrievalItems.length > 0) {
-    const allLines = Object.entries(byKind).filter(([, list]) => list.length > 0).flatMap(
-      ([kind, list]) => pickWithinKind(list, perKindLimit).map((item) => {
-        const lineText = `- ${isInferredMemory(item) ? "\uFF08\u63A8\u65AD\uFF09" : ""}${normalizeDisplayContent(item)}`;
-        return { kind, lineText, lineTokens: estimateTokens(lineText) };
-      })
-    ).sort((a, b) => (KIND_PRIORITY[a.kind] ?? 99) - (KIND_PRIORITY[b.kind] ?? 99));
-    retrievalFit = fitLinesToBudget(allLines, remainingBudget);
-    const kindOrder = ["semantic", "procedural", "episodic"];
-    retrievalSections = kindOrder.filter(
-      (kind) => retrievalFit.keptByKind[kind] && retrievalFit.keptByKind[kind].length > 0
-    ).map((kind) => {
-      return [`[${KIND_TITLES[kind]}]`, ...retrievalFit.keptByKind[kind]].join("\n");
-    });
-  }
-  const sections = [
-    ...residentFit.keptLines.length > 0 ? [[RESIDENT_SECTION_HEADER, ...residentFit.keptLines].join("\n")] : [],
-    ...retrievalSections
-  ];
-  if (sections.length === 0) {
-    return OVERLAY_HEADER_LINES.join("\n");
-  }
-  return [
-    ...OVERLAY_HEADER_LINES,
-    ...sections,
-    ...buildBudgetFooter(retrievalFit, residentFit)
-  ].join("\n");
-};
-
-// packages/ai/memory/rank.ts
-var CJK_SEQUENCE_REGEX = /[\u3400-\u4dbf\u4e00-\u9fff]+/g;
-var MEMORY_IDENTIFIER_REGEX = /\b(?:memory|noise)-[a-z0-9][a-z0-9-]*/gi;
-var buildCjkTokens = (text) => {
-  const sequences = text.match(CJK_SEQUENCE_REGEX) ?? [];
-  const tokens = [];
-  for (const sequence2 of sequences) {
-    if (sequence2.length >= 2) {
-      tokens.push(sequence2);
-    }
-    for (let index = 0; index < sequence2.length - 1; index += 1) {
-      tokens.push(sequence2.slice(index, index + 2));
-    }
-  }
-  return tokens;
-};
-var tokenize2 = (text) => {
-  const normalized = text.toLowerCase();
-  const wordTokens = normalized.split(/[\s,.;:!?()[\]{}"'`，。！？：；、]+/).map((token) => token.trim()).filter((token) => token.length >= 2);
-  return [...wordTokens, ...buildCjkTokens(normalized)];
-};
-var keywordScore = (query, item) => {
-  const queryTokens = new Set(tokenize2(query));
-  if (queryTokens.size === 0) return 0;
-  const haystack = /* @__PURE__ */ new Set([
-    ...tokenize2(item.content),
-    ...(item.tags ?? []).map((tag) => tag.toLowerCase()),
-    item.patternKey?.toLowerCase() ?? ""
-  ]);
-  let matches = 0;
-  for (const token of queryTokens) {
-    if (haystack.has(token)) matches += 1;
-  }
-  return Math.min(1, matches / Math.max(2, queryTokens.size));
-};
-var identifierScore = (query, item) => {
-  const identifiers = query.match(MEMORY_IDENTIFIER_REGEX) ?? [];
-  if (identifiers.length === 0) return 0;
-  const content = item.content.toLowerCase();
-  const matches = identifiers.filter(
-    (identifier) => content.includes(identifier.toLowerCase())
-  ).length;
-  return matches / identifiers.length;
-};
-var DAY_MS = 864e5;
-var UNRETRIEVED_MEMORY_GRACE_DAYS = 3;
-var MIN_UNRETRIEVED_SCORE_FACTOR = 0.3;
-var UNRETRIEVED_DECAY_HALF_LIFE_DAYS = 7;
-var retrievalFrequencyScore = (item, nowMs) => {
-  const lastRetrievedMs = Date.parse(item.lastActivatedAt || item.createdAt);
-  const ageDays = Math.max(0, (nowMs - lastRetrievedMs) / DAY_MS);
-  const recency = 1 / (1 + ageDays / 7);
-  const frequency = Math.min(1, Math.log1p(item.activationCount ?? 0) / 3);
-  return 0.7 * recency + 0.3 * frequency;
-};
-var unretrievedDecayFactor = (item, nowMs) => {
-  if ((item.activationCount ?? 0) !== 0) return 1;
-  const createdAgeDays = Math.max(0, (nowMs - Date.parse(item.createdAt)) / DAY_MS);
-  if (createdAgeDays <= UNRETRIEVED_MEMORY_GRACE_DAYS) return 1;
-  const overdue = createdAgeDays - UNRETRIEVED_MEMORY_GRACE_DAYS;
-  return Math.max(
-    MIN_UNRETRIEVED_SCORE_FACTOR,
-    1 / (1 + overdue / UNRETRIEVED_DECAY_HALF_LIFE_DAYS)
-  );
-};
-var retrievalScore = (item, nowMs) => retrievalFrequencyScore(item, nowMs) * unretrievedDecayFactor(item, nowMs);
-var creationRecencyScore = (item, nowMs) => {
-  const createdMs = Date.parse(item.createdAt);
-  const ageDays = Math.max(0, (nowMs - createdMs) / 864e5);
-  return 1 / (1 + ageDays / 7);
-};
-var typeFitScore = (item) => {
-  if (item.kind === "episodic") return 0.75;
-  if (item.kind === "semantic") return 0.9;
-  return 0.85;
-};
-var understandingScore = (item) => {
-  if (!item.tags?.includes("understanding-memory")) return 0;
-  if (item.facet === "unfinished") return 1;
-  if (item.facet === "tension") return 0.95;
-  if (item.facet === "preference") return 0.85;
-  if (item.facet === "style") return 0.75;
-  return 0.8;
-};
-var pathScore = (item, context) => {
-  let score = 0;
-  if (context?.currentOwner && item.ownerType === context.currentOwner.ownerType && item.ownerId === context.currentOwner.ownerId) {
-    score += 0.65;
-  }
-  if (context?.currentSubject && item.subjectType === context.currentSubject.subjectType && item.subjectId === context.currentSubject.subjectId) {
-    score += 0.85;
-  }
-  return Math.min(1, score);
-};
-var scoreMemoryItem = (item, query, nowMs = Date.now(), context) => {
-  const queryMatch = keywordScore(query, item);
-  const identifierMatch = identifierScore(query, item);
-  const retrieval = retrievalScore(item, nowMs);
-  const createdRecency = creationRecencyScore(item, nowMs);
-  const importance = item.importance ?? 0;
-  const confidence = item.confidence ?? 0;
-  const typeFit = typeFitScore(item);
-  const understanding = understandingScore(item);
-  const path2 = pathScore(item, context);
-  return 0.25 * queryMatch + 0.2 * identifierMatch + 0.2 * path2 + 0.09 * retrieval + // weak retrieval signal, NOT successful-use reinforcement
-  0.16 * createdRecency + 0.06 * importance + 0.03 * confidence + 0.02 * typeFit + 0.01 * understanding;
-};
-var rankMemoryCandidates = (items, query, context) => {
-  const nowMs = Date.now();
-  return [...items].sort((a, b) => {
-    const aExplicit = a.sourceKind === "explicit-user-directive";
-    const bExplicit = b.sourceKind === "explicit-user-directive";
-    if (aExplicit !== bExplicit) return bExplicit ? 1 : -1;
-    if (aExplicit) {
-      return Date.parse(b.createdAt) - Date.parse(a.createdAt);
-    }
-    return scoreMemoryItem(b, query, nowMs, context) - scoreMemoryItem(a, query, nowMs, context);
-  });
-};
-
 // packages/ai/memory/vnext/detachedThrottle.ts
 var DEFAULT_DETACHED_MEMORY_COOLDOWN_MS = 10 * 60 * 1e3;
 var MAX_COOLDOWN_KEYS = 512;
@@ -14236,43 +13728,6 @@ ${catalogText(entities, states)}`
   };
 };
 
-// packages/ai/memory/vnext/legacyMigration.ts
-import { createHash } from "crypto";
-var LEGACY_MEMORY_SOURCE_REF_PREFIX = "legacy-memory";
-var LEGACY_MEMORY_EVIDENCE_ID_PREFIX = "mem-legacy-";
-var resolveLegacyMemoryPrincipal = (item) => ({
-  ownerType: item.ownerType,
-  ownerId: item.ownerId,
-  principalId: `${item.ownerType}:${encodeURIComponent(item.ownerId)}`
-});
-var buildLegacyMemorySourceRef = (item) => {
-  const { principalId } = resolveLegacyMemoryPrincipal(item);
-  return `${LEGACY_MEMORY_SOURCE_REF_PREFIX}:${principalId}:${encodeURIComponent(item.id)}`;
-};
-var legacyEvidenceSeed = (principalId, itemId) => JSON.stringify([principalId, itemId]);
-var buildLegacyEvidenceId = (item) => {
-  const { principalId } = resolveLegacyMemoryPrincipal(item);
-  const digest = createHash("sha256").update(legacyEvidenceSeed(principalId, item.id)).digest("hex");
-  return `${LEGACY_MEMORY_EVIDENCE_ID_PREFIX}${digest.slice(0, 32)}`;
-};
-var clampLegacyConfidence = (value) => {
-  if (typeof value !== "number" || !Number.isFinite(value)) return 0;
-  if (value < 0) return 0;
-  if (value > 1) return 1;
-  return value;
-};
-var buildLegacyMemoryEvidence = (item) => {
-  const { principalId } = resolveLegacyMemoryPrincipal(item);
-  return {
-    id: buildLegacyEvidenceId(item),
-    ownerId: principalId,
-    text: item.content,
-    sourceRef: buildLegacyMemorySourceRef(item),
-    confidence: clampLegacyConfidence(item.confidence),
-    createdAt: item.createdAt
-  };
-};
-
 // packages/ai/memory/vnext/shadowRead.ts
 var SHADOW_TIMEOUT_MS = 2e4;
 var ERROR_MESSAGE_MAX = 120;
@@ -14686,7 +14141,7 @@ var MEMORY_RELATION_TYPES = [
 var isObject = (value) => !!value && typeof value === "object" && !Array.isArray(value);
 var isString = (value) => typeof value === "string" && value.trim().length > 0;
 var isStringArray = (value) => Array.isArray(value) && value.every(isString);
-var optionalArray = (value, validate2) => value === void 0 || Array.isArray(value) && value.every(validate2);
+var optionalArray = (value, validate) => value === void 0 || Array.isArray(value) && value.every(validate);
 var ACTIONS = /* @__PURE__ */ new Set([
   "no_op",
   "create",
@@ -15269,45 +14724,6 @@ var isMemoryVNextLazyPromotionEnabled = (env = typeof process !== "undefined" ?
 // packages/ai/memory/vnext/pureReadGate.ts
 var isMemoryVNextPureReadEnabled = (env = typeof process !== "undefined" ? process.env : {}) => env.NOLO_MEMORY_VNEXT_PURE_READ === "1" || env.NOLO_MEMORY_VNEXT_PURE_READ === "true";
 
-// packages/ai/memory/vnext/localRecall.ts
-var MIN_SHARED_TOKENS = 2;
-var MAX_LOCAL_RECALL_STATES = 8;
-var SAFE_TECHNICAL_SYNONYMS = {
-  pr: ["\u5BA1\u67E5", "\u4EE3\u7801\u5BA1\u67E5", "diff"],
-  diff: ["\u5BA1\u67E5", "\u4EE3\u7801\u5BA1\u67E5"],
-  review: ["\u5BA1\u67E5", "\u4EE3\u7801\u5BA1\u67E5"],
-  deploy: ["\u90E8\u7F72", "\u53D1\u7248"],
-  release: ["\u53D1\u7248", "\u53D1\u5E03"],
-  desktop: ["\u684C\u9762", "\u684C\u9762\u7AEF"]
-};
-var distinctTokens = (text) => new Set(tokenize2(text).filter((token) => token.length >= 2));
-var recallMemoryVNextLocal = (input) => {
-  const rawTokens = distinctTokens(input.query);
-  if (rawTokens.size === 0) return [];
-  const queryTokens = new Set(rawTokens);
-  for (const token of rawTokens) {
-    const syns = SAFE_TECHNICAL_SYNONYMS[token.toLowerCase()];
-    if (syns) {
-      for (const syn of syns) {
-        for (const t2 of distinctTokens(syn)) queryTokens.add(t2);
-      }
-    }
-  }
-  const entityById = new Map(input.entities.map((entity) => [entity.id, entity]));
-  const hits = [];
-  for (const state2 of input.states) {
-    if (state2.retiredAt || !state2.text.trim()) continue;
-    const entity = entityById.get(state2.entityId);
-    const haystack = distinctTokens(
-      [state2.facet, state2.text, entity?.name ?? "", ...entity?.aliases ?? []].join(" ")
-    );
-    let sharedTokens = 0;
-    for (const token of queryTokens) if (haystack.has(token)) sharedTokens++;
-    if (sharedTokens >= MIN_SHARED_TOKENS) hits.push({ state: state2, sharedTokens });
-  }
-  return hits.sort((a, b) => b.sharedTokens - a.sharedTokens || a.state.id.localeCompare(b.state.id)).slice(0, input.limit ?? MAX_LOCAL_RECALL_STATES);
-};
-
 // packages/ai/memory/vnext/pureVNextRuntime.ts
 var buildSynthesizedStateItem = (state2, entity, ownerType, ownerId) => ({
   id: `vnext-state-${state2.id}`,
@@ -15908,11 +15324,49 @@ async function runAgentRunCommand(args, deps) {
     writeUsage(output, deps.commandPath);
     return 1;
   }
-  const runner = deps.runner ?? runAgentTurn;
+  const rawRunner = deps.runner ?? runAgentTurn;
+  const watchdogAbort = new AbortController();
+  let activeRunner;
+  const runner = (options) => {
+    activeRunner = Promise.resolve().then(() => rawRunner({ ...options, abortSignal: watchdogAbort.signal })).then((result) => {
+      watchdogAbort.signal.throwIfAborted();
+      return result;
+    });
+    return activeRunner;
+  };
+  const stopWatchdogRunner = async () => {
+    watchdogAbort.abort(new Error("watchdog_stop"));
+    if (!activeRunner) return true;
+    let timer;
+    try {
+      return await Promise.race([
+        activeRunner.then(() => true, () => true),
+        new Promise((resolve6) => {
+          timer = setTimeout(() => resolve6(false), 100);
+        })
+      ]);
+    } finally {
+      if (timer) clearTimeout(timer);
+    }
+  };
   const nowMs = () => deps.now ? deps.now().getTime() : Date.now();
-  const childRunId = env.NOLO_AGENT_RUN_ID;
-  const hasRegistry = typeof childRunId === "string" && childRunId.length > 0;
-  if (hasRegistry) reportRunProcessIdentity(childRunId, { env, homedir: deps.homedir, fs: deps.fs, now: deps.now });
+  let childRunId = env.NOLO_AGENT_RUN_ID;
+  let hasRegistry = typeof childRunId === "string" && childRunId.length > 0;
+  const hostPolicy = () => ({
+    runtimeKey: "local",
+    hostWritesAuthorized: args.includes("--allow-host-writes"),
+    readOnly: args.includes("--read-only"),
+    ...parsed.allowedToolNames ? { allowedToolNames: parsed.allowedToolNames } : {},
+    ...parsed.blockedToolNames ? { blockedToolNames: parsed.blockedToolNames } : {},
+    provenance: "cli-command-authorized"
+  });
+  const locatedExecution = hasRegistry ? readRunRecord(childRunId, { env, homedir: deps.homedir, fs: deps.fs })?.execution : void 0;
+  if (hasRegistry && (parsed.runtimeKey?.trim() === "local" || locatedExecution?.state === "known")) {
+    const implicitReadonlyHost = !parsed.runtimeKey && args.includes("--read-only") && locatedExecution?.state === "known" && locatedExecution.runtimeKey === "local" && locatedExecution.permissions.readOnly;
+    if (parsed.runtimeKey?.trim() !== "local" && !implicitReadonlyHost) throw new Error("[local-writer-resource] child binding runtime mismatch");
+    await awaitLocalWriterChild(childRunId, parsed.cwd ?? process.cwd(), hostPolicy(), { env, homedir: deps.homedir, fs: deps.fs });
+  }
+  if (hasRegistry && parsed.runtimeKey?.trim() !== "local" && locatedExecution?.state !== "known") reportRunProcessIdentity(childRunId, { env, homedir: deps.homedir, fs: deps.fs, now: deps.now });
   const processExit = deps.processExit ?? ((code) => process.exit(code));
   const stallTimeoutMs = resolvePositiveMs(
     deps.stallTimeoutMs ?? env.NOLO_LOCAL_RUN_STALL_TIMEOUT_MS,
@@ -15954,9 +15408,9 @@ async function runAgentRunCommand(args, deps) {
       throw error;
     });
   };
-  const exitFromWatchdog = (code) => {
+  const exitFromWatchdog = async (code) => {
     try {
-      processExit(code);
+      await exitCliFromWatchdog(code, processExit, stopWatchdogRunner);
     } catch {
     }
   };
@@ -16003,8 +15457,8 @@ async function runAgentRunCommand(args, deps) {
           failureReason: "stalled",
           toolCallCount: currentActivity?.counters?.toolCalls
         });
+        await exitFromWatchdog(outcome.exitCode);
         rejectOnWatchdogFailure?.(new Error(`[nolo] local run ${note}`));
-        exitFromWatchdog(outcome.exitCode);
       }
     }, Math.min(stallTimeoutMs, 1e4));
   }
@@ -16018,8 +15472,8 @@ async function runAgentRunCommand(args, deps) {
       terminalStatus.fail();
       const outcome = resolveRunOutcome({ kind: "timeout" });
       await finalizeWatchdogOutcome(outcome, note);
+      await exitFromWatchdog(outcome.exitCode);
       rejectOnWatchdogFailure?.(new Error(`[nolo] local run ${note}`));
-      exitFromWatchdog(outcome.exitCode);
     }, parsed.timeoutMs);
   }
   const wantsFallbackSuggestions = parsed.fallbackAgentKeys && parsed.fallbackAgentKeys.length > 0;
@@ -16028,8 +15482,8 @@ async function runAgentRunCommand(args, deps) {
   const explicitLocalCli = isLocalCliAgentKey(parsed.agentKey);
   const dockerRuntimeLocal = typeof parsed.runtimeKey === "string" && /^docker(:.+)?$/.test(parsed.runtimeKey.trim());
   const instaboxRuntimeLocal = typeof parsed.runtimeKey === "string" && parsed.runtimeKey.trim() === "instabox";
-  const hostRuntimeLocal = typeof parsed.runtimeKey === "string" && parsed.runtimeKey.trim() === "local";
-  if (hostRuntimeLocal && !args.includes("--allow-host-writes")) {
+  const hostRuntimeLocal = typeof parsed.runtimeKey === "string" && parsed.runtimeKey.trim() === "local" || !parsed.runtimeKey && args.includes("--read-only") && locatedExecution?.state === "known" && locatedExecution.runtimeKey === "local" && locatedExecution.permissions.readOnly;
+  if (hostRuntimeLocal && !args.includes("--read-only") && !args.includes("--allow-host-writes")) {
     output.write(t("agentRun.hostWriteGuard"));
     return 1;
   }
@@ -16166,6 +15620,9 @@ async function runAgentRunCommand(args, deps) {
   if (!localRuntimeCwd && (parsed.runtimeMode === "local" || hostRuntimeLocal)) {
     localRuntimeCwd = process.cwd();
   }
+  const acceptanceCwd = localRuntimeCwd && (parsed.runtimeMode === "local" || hostRuntimeLocal) ? localRuntimeCwd : void 0;
+  const acceptanceBase = acceptanceCwd ? await (deps.captureLocalRunBase ?? captureLocalRunBase)(acceptanceCwd, deps.localRunBaseCaptureOptions) : null;
+  let finalWorkspaceInspection;
   if (parsed.runtimeKey === "instabox") {
     try {
       writeInstaboxRunConfig({
@@ -16193,9 +15650,20 @@ async function runAgentRunCommand(args, deps) {
         cliEntrypointPath: deps.cliEntrypointPath,
         agentKey,
         cwd: localRuntimeCwd,
+        ...hostRuntimeLocal ? { localExecution: {
+          runtimeKey: "local",
+          hostWritesAuthorized: args.includes("--allow-host-writes"),
+          readOnly: args.includes("--read-only"),
+          ...parsed.allowedToolNames ? { allowedToolNames: parsed.allowedToolNames } : {},
+          ...parsed.blockedToolNames ? { blockedToolNames: parsed.blockedToolNames } : {},
+          provenance: "cli-command-authorized"
+        } } : {},
+        // Explicit host target is authorized above; read-only retains its existing tool restrictions.
+        ...hostRuntimeLocal && !args.includes("--read-only") ? { claimLocalWrites: true } : {},
         msgFile: readFlagValue(args, "--msg-file"),
         message: parsed.message,
         timeoutMs: parsed.timeoutMs,
+        ...parsed.ephemeral ? { ephemeral: true } : {},
         ...parsed.dodCommands?.length ? { dodCommands: parsed.dodCommands } : {},
         output
       },
@@ -16225,6 +15693,15 @@ async function runAgentRunCommand(args, deps) {
   const isSubtask = isSubtaskRun(env);
   const scopedLayers = [];
   const skillContentBlocks = [];
+  if (hostRuntimeLocal && !parsed.background) {
+    const policy = { ...hostPolicy(), ...skillAllowedToolOverride !== void 0 ? { allowedToolNames: skillAllowedToolOverride } : {} };
+    if (hasRegistry) {
+      await awaitLocalWriterChild(childRunId, localRuntimeCwd, policy, { env, homedir: deps.homedir, fs: deps.fs });
+    } else if (!policy.readOnly) {
+      childRunId = registerLocalForegroundWriter(localRuntimeCwd, policy, agentKey, { env, homedir: deps.homedir, fs: deps.fs, now: deps.now });
+      hasRegistry = true;
+    }
+  }
   const extraContextBlocks = [];
   const contextBlockScopes = [];
   let memoryPromptBlock = null;
@@ -16355,6 +15832,7 @@ async function runAgentRunCommand(args, deps) {
       })
     );
     clearWatchdogs();
+    const runCommandObservations = [...getRunResultHeaderMeta(result).commandObservations ?? []];
     let runCreditsTotal = result.turnCredits;
     let runCacheUsage = summarizeCacheUsageRecords(result.usageRecords);
     if (result.exitCode !== 0 && isQuotaExhaustedError(result.localError) && isLocalRun && parsed.fallbackAgentKeys && parsed.fallbackAgentKeys.length > 0) {
@@ -16370,6 +15848,7 @@ async function runAgentRunCommand(args, deps) {
         })
       );
       clearWatchdogs();
+      runCommandObservations.push(...getRunResultHeaderMeta(fallbackResult).commandObservations ?? []);
       if (fallbackResult.exitCode === 0) {
         result = fallbackResult;
       }
@@ -16422,6 +15901,7 @@ async function runAgentRunCommand(args, deps) {
             })
           );
           clearWatchdogs();
+          runCommandObservations.push(...getRunResultHeaderMeta(turnResult).commandObservations ?? []);
           result = turnResult;
           if (turnResult.turnCredits !== void 0) {
             runCreditsTotal = (runCreditsTotal ?? 0) + turnResult.turnCredits;
@@ -16450,11 +15930,6 @@ async function runAgentRunCommand(args, deps) {
         );
       }
     }
-    terminalStatus.settle({
-      exitCode: result.exitCode,
-      streamInterrupted: result.streamInterrupted,
-      stalledOrTruncated: isRunResultStalledOrTruncated(result)
-    });
     if (result.dialogId) {
       if (parsed.background) {
         output.write(`
@@ -16468,11 +15943,12 @@ async function runAgentRunCommand(args, deps) {
 `);
       }
     }
-    if (shouldPrintLocalRunSummary({ parsed, localRuntimeCwd })) {
+    if (acceptanceCwd || shouldPrintLocalRunSummary({ parsed, localRuntimeCwd })) {
       try {
         const inspect = deps.inspectLocalRunWorkspace ?? inspectLocalRunWorkspace;
-        const inspection = await inspect(localRuntimeCwd);
-        output.write(formatLocalRunSummary({
+        const inspection = await inspect(localRuntimeCwd, {}, acceptanceCwd ? acceptanceBase : void 0);
+        finalWorkspaceInspection = inspection;
+        if (shouldPrintLocalRunSummary({ parsed, localRuntimeCwd })) output.write(formatLocalRunSummary({
           dialogId: result.dialogId,
           inspection
         }));
@@ -16511,6 +15987,8 @@ async function runAgentRunCommand(args, deps) {
       if (outcome.status === "failed") {
         if (result.emptyAssistantFallbackReason === "repetition_loop" || result.emptyAssistantFallbackReason === "stagnant_tool_calls") {
           failureReason = "stalled";
+        } else if (result.localError && isHistoryIntegrityFailure(toErrorMessage(result.localError))) {
+          failureReason = "history_integrity";
         } else if (result.localError && isQuotaExhaustedError(result.localError)) {
           failureReason = "provider_rate_limited";
         } else if (result.localError) {
@@ -16527,37 +16005,74 @@ async function runAgentRunCommand(args, deps) {
           toolCallCount = rawToolCount;
         }
       }
-      await settleRunTerminalAuthoritatively(
-        childRunId,
-        {
-          status: outcome.status,
-          exitCode: outcome.exitCode,
-          dialogId: result.dialogId,
-          ...dodResults ? { dodResults } : {},
-          // 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 } : {},
-          // 仅用于 .result.md 头（front matter）：旁路读取，不改 result 形状。
-          ...getRunResultHeaderMeta(result),
-          ...truncationNote
-        },
-        {
-          env,
-          homedir: deps.homedir,
-          fs: deps.fs,
-          now: deps.now,
-          sleep: deps.sleep
-        },
-        deps.transitionRunToTerminal
+      const acceptance = acceptanceCwd ? finalWorkspaceInspection?.acceptance ?? unknownLocalRunAcceptance(acceptanceCwd, acceptanceBase) : void 0;
+      if (acceptance && dodResults?.length) {
+        acceptance.checks.observations = dodResults.map((check, index) => ({
+          // Command lines/output can contain credentials. Persist only a digest
+          // here; the pre-existing registry is the execution evidence reference.
+          commandFingerprint: `sha256:${createHash("sha256").update(check.command).digest("hex")}`,
+          cwd: childRecordForDoD?.cwd || process.cwd(),
+          exitCode: check.exitCode,
+          evidence: `${childRunId}.json#/dodResults/${index}`,
+          versionBinding: "unknown"
+        }));
+      }
+      if (acceptance) attachLocalCommandObservations(
+        acceptance,
+        runCommandObservations,
+        `${childRunId}.result.md`
       );
+      let settlement;
+      try {
+        settlement = await settleRunTerminalAuthoritatively(
+          childRunId,
+          {
+            status: outcome.status,
+            exitCode: outcome.exitCode,
+            dialogId: result.dialogId,
+            ...dodResults ? { dodResults } : {},
+            // 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 } : {},
+            ...acceptance ? { acceptance } : {},
+            ...result.finalText ? { lastAssistantText: result.finalText } : {},
+            // 仅用于 .result.md 头（front matter）：旁路读取，不改 result 形状。
+            ...getRunResultHeaderMeta(result),
+            ...truncationNote
+          },
+          {
+            env,
+            homedir: deps.homedir,
+            fs: deps.fs,
+            now: deps.now,
+            sleep: deps.sleep
+          },
+          deps.transitionRunToTerminal
+        );
+      } catch (error) {
+        terminalStatus.fail();
+        output.write(`[nolo] terminal settlement failed: ${error instanceof Error ? error.message : String(error)}
+`);
+        return 1;
+      }
+      if (settlement && (settlement.kind === "transitioned" || settlement.kind === "kept" || settlement.kind === "contended") && settlement.record.status !== "done" && result.exitCode === 0) {
+        result = { ...result, exitCode: settlement.record.exitCode || 1 };
+      }
     }
+    terminalStatus.settle({
+      exitCode: result.exitCode,
+      streamInterrupted: result.streamInterrupted,
+      stalledOrTruncated: isRunResultStalledOrTruncated(result)
+    });
     return result.exitCode;
+  } catch (error) {
+    terminalStatus.fail();
+    throw error;
   } finally {
     shellApprovalChild?.close();
     if (shellApprovalChild && process.connected) process.disconnect();
@@ -16567,22 +16082,6 @@ async function runAgentRunCommand(args, deps) {
 export {
   resolveCliColorEnabled,
   dimCliText,
-  ANSI_ESCAPE_REGEX,
-  stripAnsi2 as stripAnsi,
-  applyTerminalOutputToText,
-  displayWidth,
-  visibleWidth,
-  truncateAnsi,
-  fitAnsiLine,
-  countPhysicalLines,
-  takeDisplayWidth,
-  padOrTruncateToWidth,
-  tokenizeAnsiLine,
-  buildSourceMapping,
-  wrapTranscriptLineWithLayout,
-  wrapTranscriptLine,
-  buildWindowTitle,
-  wrapTextToLines,
   THEME_PALETTES,
   getActiveThemeName,
   setActiveThemeName,
@@ -16604,9 +16103,10 @@ export {
   setMathRenderingEnabled,
   polishBreathInsertsBlankBetween,
   formatAssistantDisplay,
-  redactSecrets,
-  safeAskText,
+  resolveHistoryLayoutGeometry,
+  resolveHistoryViewportHeight,
   TUI_TREE_MARKER,
+  TUI_TREE_TOOLS,
   resolveAgentModelIdentity,
   resolveAgentContextWindow2 as resolveAgentContextWindow,
   platformCreditsFromUsage,
@@ -16614,6 +16114,7 @@ export {
   formatTokenCount,
   resolveAuthorityTurnCount,
   computeBaselineContextTokens,
+  preserveContextUsageWithoutReceipt,
   resolveContextUsage,
   renderTokenStatus,
   createIdleHeapReleaser,
@@ -16629,10 +16130,13 @@ export {
   findCollapsedPasteSpanAt,
   readAgentsMdLayerFromDisk,
   emitTerminalProgramStatus,
+  contextRefusalDiagnostics,
+  describeContextRefusal,
   isBalanceExhaustedError,
   OWNER_OAUTH_UNAVAILABLE_HINT,
   isOwnerOAuthUnavailableError,
   isInvalidGrantError,
+  isLocalContextCoverageFailure,
   runAgentTurn,
   resolveWorkflowReference,
   resolveSkillReference,
@@ -16644,7 +16148,6 @@ export {
   FAILED_EMPTY_ASSISTANT_REASONS,
   isRunResultStalledOrTruncated,
   resolveTerminalProgramStatusState,
-  inspectLocalRunWorkspace,
   resolveRunOutcome,
   resolveRunSettlementNote,
   runAgentRunCommand