nolo-cli 0.149.0-alpha.1 → 0.151.0-alpha.3

package/{chunk-ZUEK6A6C.js → chunk-TTH4HOJD.js}

@@ -1,6 +1,6 @@
 import {
   findPotentialSecrets
-} from "./chunk-VJVNU77E.js";
+} from "./chunk-6QDYSCPW.js";
 import {
   buildLocalRunEnv,
   isFullstackCodingAgentRef,
@@ -9,14 +9,16 @@ import {
   resolveRawAgentInput,
   resolveServerUrl,
   writeUsage
-} from "./chunk-BIDGLJQ3.js";
+} from "./chunk-IK2TSJQA.js";
+import {
+  getReadableCliDb
+} from "./chunk-P5QACQDK.js";
 import {
-  agentRunCardLabels,
   createCliLocalRuntimeAdapter,
   detectCurrentMachineId,
-  getCliLocale,
   isBuiltinNoloAgentRef,
   isCliProviderAgentConfig,
+  isDockerRuntimeKey,
   isLiveAgentRunObservation,
   isMachineBoundLocalhostCustomProvider,
   isSubtaskRun,
@@ -24,151 +26,203 @@ import {
   resolveAuthToken as resolveAuthToken2,
   resolveBoundMachineId,
   resolveFileWriteGateEnabled,
-  resolveLocalUserId,
-  t,
-  toolLabel,
-  toolLabelVariants
-} from "./chunk-XYJSY4KG.js";
+  resolveLocalUserId
+} from "./chunk-PKZKOVA5.js";
 import {
   clearCredentialAvailability,
   readCredentialEntry,
   recordCredentialProbe
-} from "./chunk-62IL3KQV.js";
+} from "./chunk-6MXDOUMH.js";
 import {
-  getReadableCliDb
-} from "./chunk-CTUQJVQM.js";
+  agentRunCardLabels,
+  getCliLocale,
+  t,
+  toolLabel,
+  toolLabelVariants
+} from "./chunk-SW4S4XYB.js";
 import {
-  resolveMachineId
-} from "./chunk-ESHYE7WU.js";
+  _appendEntityBatch,
+  _appendEvidenceBatch,
+  _appendRelationBatch,
+  _appendRetiredStateBatch,
+  _appendStateBatch,
+  getMemoryEntityVNext,
+  getMemoryEvidenceVNext,
+  getMemoryEvidenceVNextStrict,
+  getMemoryStateVNext,
+  listMemoryStatesForEntityVNext,
+  loadMemoryVNextCatalog,
+  putMemoryEvidenceVNext
+} from "./chunk-TY3TIUJK.js";
 import {
   readDbRecord,
   resolveAgentRecordFromHybridStore
-} from "./chunk-ALGORS6Y.js";
+} from "./chunk-ZF6526IQ.js";
 import {
   isLocalCliAgentKey
-} from "./chunk-SV5IJK6K.js";
-import {
-  extractGoogleValidationLink
-} from "./chunk-BMQ2MJUK.js";
-import {
-  createRunActivityTracker,
-  popSingleQueueMessage,
-  readRunRecord,
-  resolveRunQueuePath,
-  settleRunTerminalAuthoritatively,
-  spawnLocalBackgroundRun
-} from "./chunk-CFT5HBGW.js";
-import {
-  isCliAuthorityBrokerProtocolError,
-  isCliAuthorityBrokerTimeoutError,
-  isCliAuthorityBrokerUnavailableError
-} from "./chunk-EXAJ6DCR.js";
-import {
-  getDefaultCliLocalRuntimeDb
-} from "./chunk-ZOVKKMF6.js";
+} from "./chunk-NBTY7YJF.js";
 import {
   CliProviderQuotaError
-} from "./chunk-4XEYAFLY.js";
+} from "./chunk-VL5KOY2C.js";
+import {
+  resolveMachineId
+} from "./chunk-S73EPYNC.js";
 import {
-  applyModelLayerOverride,
-  buildModelLayerOverride
-} from "./chunk-LTRXGFMS.js";
+  extractGoogleValidationLink
+} from "./chunk-BMQ2MJUK.js";
 import {
-  formatAgentListCard
-} from "./chunk-ID7LNBWR.js";
+  resolveCliLocalRuntimeKeyCapability
+} from "./chunk-3T4ZG6AC.js";
 import {
   isTransientFetchError
-} from "./chunk-5UTFL4QJ.js";
+} from "./chunk-I2ZMGXXF.js";
+import {
+  parseUiCard,
+  uiCardFallback
+} from "./chunk-ROCUB2H2.js";
 import {
   isGatewayHttpStatus
 } from "./chunk-NF64D32W.js";
 import {
-  formatFinishedRunCard,
-  formatListRunsCard,
-  formatNotFoundRunCard,
-  formatStartRunCard,
-  formatStatusRunCard,
-  formatStopRunCard,
-  isAgentRunTerminalStatus
-} from "./chunk-4JMDLJAD.js";
+  parsePositiveFiniteNumberOrFallback
+} from "./chunk-XPWGOTBQ.js";
 import {
   buildMemorySubjectsForAgent,
   chooseMemoryOwners,
   loadMemoryCandidatesFromDb,
   resolveAgentMemoryPolicy
-} from "./chunk-OMRJYNCI.js";
+} from "./chunk-AG7MCDLR.js";
 import {
   API_REPORTED_COST_MULTIPLIER,
   parseUiAskChoiceContent
-} from "./chunk-ACQD6YI2.js";
+} from "./chunk-U5ICMAFV.js";
 import {
   isOAuthApiKeyRef
-} from "./chunk-YYLHWIW6.js";
-import {
-  buildSkillDiscoveryContextLayer
-} from "./chunk-5GVBDNTO.js";
+} from "./chunk-UKZX3NHN.js";
 import {
   parseExternalSkillMarkdown,
   parseSkillDocProtocol
-} from "./chunk-AUDNYVRC.js";
+} from "./chunk-XETG4RIX.js";
 import {
   LOCAL_AGENT_CONFIG_MISSING_CODE,
   LOCAL_TURN_ABORTED_CODE,
   readActionGate
-} from "./chunk-4H22P2JV.js";
+} from "./chunk-AUIJZACN.js";
 import {
+  devinChannelContextWindow,
   resolveAgentRuntimeConfigFromRecord
-} from "./chunk-OHOVNO7I.js";
+} from "./chunk-UOKFKFPO.js";
+import {
+  isDevinOAuthAgent
+} from "./chunk-5ZUL4CUO.js";
 import {
   createThinkParserState,
   flushThinkParser,
   processThinkChunk
-} from "./chunk-N7J63Q6C.js";
+} from "./chunk-56GBUMO5.js";
+import {
+  ATTACHMENT_PART_TYPE,
+  ATTACHMENT_PART_VERSION,
+  describeAttachmentForModel,
+  normalizeAttachmentPart
+} from "./chunk-WJZOQR2J.js";
 import {
+  PROBE_INTERVAL_MS,
   QUOTA_ERROR_PATTERNS,
   isQuotaExhaustedError,
   isQuotaLimited403Body,
   mergeAvailabilityDeadline,
   resolveCooldownGate,
   resolveCredentialKeyWithFallback
-} from "./chunk-H6A6X4EK.js";
+} from "./chunk-3MZAGMYY.js";
 import {
-  isAntigravityOAuthAgent
-} from "./chunk-S5XGT6GB.js";
-import {
-  resolveClientVersion
-} from "./chunk-27ONFIEY.js";
-import {
-  DEFAULT_CONTEXT_WINDOW,
-  getModelContextWindow,
   normalizeUsage
-} from "./chunk-AKG5W4LG.js";
+} from "./chunk-6CCFTVBP.js";
+import {
+  findModelContextWindow
+} from "./chunk-BPMPOFWP.js";
 import {
   clipCompactText
-} from "./chunk-RYZINGPM.js";
+} from "./chunk-5MMAK75Q.js";
 import {
   compactWhitespace
 } from "./chunk-DWLEOOGR.js";
 import {
-  toErrorMessage
-} from "./chunk-HNMXYYJR.js";
+  normalizeRuntimeToolPolicyOverride,
+  resolveEffectiveRuntimeToolPolicy
+} from "./chunk-LIQJTQRN.js";
+import {
+  BUILTIN_NOLO_AGENT_KEY,
+  BUILTIN_NOLO_AGENT_NAME,
+  builtinAgentCatalogEntryById,
+  parseBuiltinPlatformAgentId
+} from "./chunk-EZVK3N5L.js";
+import {
+  parsePublicAgentId
+} from "./chunk-M2EJHDJP.js";
+import {
+  createMemoryKey,
+  ulid
+} from "./chunk-5EMSBTQ6.js";
+import {
+  isAntigravityOAuthAgent
+} from "./chunk-XZNCX52W.js";
+import {
+  createRunActivityTracker,
+  createShellApprovalChild,
+  getRunResultHeaderMeta,
+  popSingleQueueMessage,
+  readRunRecord,
+  recordRunResultHeaderMeta,
+  resolveResultServerMeta,
+  resolveRunQueuePath,
+  serverOriginForDialog,
+  settleRunTerminalAuthoritatively,
+  spawnLocalBackgroundRun
+} from "./chunk-YVLQXTUB.js";
+import {
+  formatAgentListCard,
+  formatFinishedRunCard,
+  formatListRunsCard,
+  formatNotFoundRunCard,
+  formatStartRunCard,
+  formatStatusRunCard,
+  formatStopRunCard,
+  isAgentRunTerminalStatus
+} from "./chunk-PJNFNEJE.js";
+import {
+  estimateTokenCount
+} from "./chunk-PSCNXBYA.js";
+import {
+  resolveClientVersion
+} from "./chunk-K2AER7RX.js";
 import {
   findModelConfig
-} from "./chunk-3BXNTXYI.js";
+} from "./chunk-I4SN4NUQ.js";
 import {
-  buildAgentsMdLayer,
-  buildMemoryOverlayLayer,
-  buildMemoryUseGuidanceLayer,
-  partitionScopedBlocks,
-  renderTurnContextBlocksWithScope
-} from "./chunk-HDLLCBRF.js";
+  asTrimmedString
+} from "./chunk-3EUW3WEO.js";
+import {
+  isCliAuthorityBrokerProtocolError,
+  isCliAuthorityBrokerTimeoutError,
+  isCliAuthorityBrokerUnavailableError
+} from "./chunk-EXAJ6DCR.js";
+import {
+  toErrorMessage
+} from "./chunk-HNMXYYJR.js";
+import {
+  getDefaultCliLocalRuntimeDb
+} from "./chunk-FY4SDK2E.js";
 import {
   getLogger,
   normalizeError
-} from "./chunk-UNYJU5L6.js";
+} from "./chunk-EYLGAEB4.js";
 import {
   resolveAuthToken
 } from "./chunk-A7GB5UGH.js";
+import {
+  asOptionalTrimmedString
+} from "./chunk-G3SUCT4W.js";
 import {
   readPipeText,
   spawnProcess
@@ -177,34 +231,242 @@ import {
   CLIENT_VERSION_TOO_OLD_CODE,
   NOLO_CLIENT_VERSION_HEADER,
   buildClientVersionUpgradeMessage
-} from "./chunk-Y3PMXGLH.js";
-import {
-  parsePositiveFiniteNumberOrFallback
-} from "./chunk-Y5GCAMGP.js";
-import {
-  createMemoryKey,
-  ulid
-} from "./chunk-3AH7LNUB.js";
+} from "./chunk-CHCS6XPJ.js";
 import {
   asTrimmedLowercaseString
 } from "./chunk-QSJ3HFEF.js";
 import {
-  isLevelNotFoundError
-} from "./chunk-OW765XBU.js";
-import {
-  BUILTIN_NOLO_AGENT_KEY,
-  BUILTIN_NOLO_AGENT_NAME,
-  builtinAgentCatalogEntryById
-} from "./chunk-BNGW5ASC.js";
-import {
-  parsePublicAgentId
-} from "./chunk-M2EJHDJP.js";
-import {
-  asTrimmedString
-} from "./chunk-3EUW3WEO.js";
+  buildSkillDiscoveryContextLayer
+} from "./chunk-AU7AXHUL.js";
 import {
-  asOptionalTrimmedString
-} from "./chunk-G3SUCT4W.js";
+  buildAgentsMdLayer,
+  buildMemoryOverlayLayer,
+  buildMemoryUseGuidanceLayer,
+  partitionScopedBlocks,
+  renderTurnContextBlocksWithScope
+} from "./chunk-VEA7H5FG.js";
+
+// packages/agent-runtime/modelLayerOverride.ts
+var MODEL_LAYER_KEYS = [
+  "provider",
+  "model",
+  "apiSource",
+  "cliProvider",
+  "useServerProxy",
+  "apiKey",
+  "apiKeyRef",
+  "apiKeyHeader",
+  "customProviderUrl",
+  "credentialRef",
+  "credentialSynced",
+  "temperature",
+  "top_p",
+  "frequency_penalty",
+  "presence_penalty",
+  "max_tokens",
+  "reasoning_effort",
+  "enableThinking",
+  "thinkingBudget"
+];
+function mergeReferences(base, extra) {
+  const safeBase = Array.isArray(base) ? base : [];
+  const safeExtra = Array.isArray(extra) ? extra : [];
+  const seen = /* @__PURE__ */ new Set();
+  const merged = [];
+  for (const item of [...safeBase, ...safeExtra]) {
+    const key = item?.dbKey;
+    if (key && seen.has(key)) continue;
+    if (key) seen.add(key);
+    if (item) merged.push(item);
+  }
+  return merged;
+}
+var asNonEmptyString = (value) => typeof value === "string" && value.trim().length > 0;
+function buildModelLayerOverride(agent) {
+  if (!agent || !asNonEmptyString(agent.provider) || !asNonEmptyString(agent.model)) {
+    return null;
+  }
+  const override = {
+    provider: agent.provider,
+    model: agent.model
+  };
+  for (const key of MODEL_LAYER_KEYS) {
+    if (key === "provider" || key === "model") continue;
+    const value = agent[key];
+    if (value !== void 0) {
+      override[key] = value;
+    }
+  }
+  if (Array.isArray(agent.references) && agent.references.length > 0) {
+    override.references = agent.references;
+  }
+  return override;
+}
+function applyModelLayerOverride(base, override) {
+  const next = { ...base };
+  for (const key of MODEL_LAYER_KEYS) {
+    delete next[key];
+  }
+  for (const key of MODEL_LAYER_KEYS) {
+    const value = override[key];
+    if (value !== void 0) {
+      next[key] = value;
+    }
+  }
+  const merged = mergeReferences(
+    base.references,
+    override.references
+  );
+  if (merged.length > 0) {
+    next.references = merged;
+  } else {
+    delete next.references;
+  }
+  return next;
+}
+
+// packages/cli/tui/localAttachmentParts.ts
+import { statSync } from "node:fs";
+import path from "node:path";
+var EXT_MIME = {
+  jpg: "image/jpeg",
+  jpeg: "image/jpeg",
+  png: "image/png",
+  gif: "image/gif",
+  webp: "image/webp",
+  bmp: "image/bmp",
+  tif: "image/tiff",
+  tiff: "image/tiff",
+  heic: "image/heic",
+  heif: "image/heif",
+  svg: "image/svg+xml",
+  mp3: "audio/mpeg",
+  m4a: "audio/mp4",
+  wav: "audio/wav",
+  ogg: "audio/ogg",
+  oga: "audio/ogg",
+  opus: "audio/opus",
+  flac: "audio/flac",
+  aac: "audio/aac",
+  amr: "audio/amr",
+  wma: "audio/x-ms-wma",
+  mp4: "video/mp4",
+  m4v: "video/x-m4v",
+  mov: "video/quicktime",
+  mkv: "video/x-matroska",
+  webm: "video/webm",
+  avi: "video/x-msvideo",
+  wmv: "video/x-ms-wmv",
+  mpg: "video/mpeg",
+  mpeg: "video/mpeg",
+  "3gp": "video/3gpp",
+  flv: "video/x-flv",
+  pdf: "application/pdf",
+  txt: "text/plain",
+  md: "text/markdown",
+  json: "application/json",
+  csv: "text/csv",
+  zip: "application/zip",
+  apk: "application/vnd.android.package-archive"
+};
+var mimeTypeForLocalPath = (filePath) => {
+  const ext = path.extname(filePath).slice(1).toLowerCase();
+  return EXT_MIME[ext] ?? "application/octet-stream";
+};
+var defaultStatSize = (filePath) => {
+  try {
+    const stat = statSync(filePath);
+    return stat.isFile() ? stat.size : null;
+  } catch {
+    return null;
+  }
+};
+var buildLocalAttachments = (input) => {
+  const machineId = typeof input.machineId === "string" ? input.machineId.trim() : "";
+  const workspaceRoot = typeof input.workspaceRoot === "string" ? input.workspaceRoot.trim() : "";
+  const statSize = input.statSize ?? defaultStatSize;
+  const mimeTypeOf = input.mimeTypeOf ?? mimeTypeForLocalPath;
+  const parts = [];
+  const skipped = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const raw of input.paths) {
+    const filePath = typeof raw === "string" ? raw.trim() : "";
+    if (!filePath || seen.has(filePath)) continue;
+    seen.add(filePath);
+    if (!machineId) {
+      skipped.push({ path: filePath, reason: "machine-unbound" });
+      continue;
+    }
+    const size = statSize(filePath);
+    if (size === null || !Number.isFinite(size) || size < 0) {
+      skipped.push({ path: filePath, reason: "unreadable" });
+      continue;
+    }
+    const normalized = normalizeAttachmentPart({
+      type: ATTACHMENT_PART_TYPE,
+      v: ATTACHMENT_PART_VERSION,
+      source: {
+        kind: "local-file",
+        path: filePath,
+        machineId,
+        ...workspaceRoot ? { workspaceRoot } : {}
+      },
+      name: path.basename(filePath),
+      mimeType: mimeTypeOf(filePath),
+      size
+    });
+    if (normalized.status !== "valid") {
+      skipped.push({ path: filePath, reason: "invalid-part" });
+      continue;
+    }
+    parts.push(normalized.attachment);
+  }
+  const cardText = parts.map((part) => describeAttachmentForModel(part)).join("\n");
+  return { parts, skipped, cardText };
+};
+var appendAttachmentCard = (message, cardText) => {
+  if (!cardText) return message;
+  return message.trim() ? `${message}
+
+${cardText}` : cardText;
+};
+
+// packages/chat/messages/attachmentWriteRollout.ts
+var ENABLE_REMOTE_ATTACHMENT_PART_WRITES = false;
+
+// packages/ai/context/contextOccupancy.ts
+function estimateMessagesTokens(messages) {
+  return messages.reduce((total, message) => {
+    const content = typeof message.content === "string" ? message.content : message.content == null ? "" : JSON.stringify(message.content);
+    return total + estimateTokenCount(content) + 4;
+  }, 0);
+}
+function historyTokensBeforeLatestAssistant(messages) {
+  const total = estimateMessagesTokens(messages);
+  const latest = messages[messages.length - 1];
+  if (latest?.role !== "assistant") return total;
+  return Math.max(0, total - estimateMessagesTokens([latest]));
+}
+function resolveOccupancy(input) {
+  if (input.authoritativeInput !== void 0 && input.authoritativeInput > 0) {
+    const generated = Math.max(0, input.generatedSinceAuthority ?? 0);
+    return {
+      tokens: input.authoritativeInput + generated,
+      estimated: generated > 0
+    };
+  }
+  return {
+    tokens: Math.max(0, input.baselineEstimate ?? 0),
+    estimated: true
+  };
+}
+function resolveOccupancyWindow(ref) {
+  if (!ref.model) return void 0;
+  if (isDevinOAuthAgent(ref)) {
+    return devinChannelContextWindow(ref.model) ?? findModelContextWindow(ref.model, ref.provider);
+  }
+  return findModelContextWindow(ref.model, ref.provider);
+}
 
 // packages/cli/client/tokenUsage.ts
 var PLATFORM_CREDIT_UNIT = "credits";
@@ -216,7 +478,9 @@ function resolveEffectiveModel(opts) {
   if (isUsableModelId(opts.model)) return opts.model;
   const agentKey = opts.agentKey?.trim();
   if (!agentKey) return void 0;
-  return builtinAgentCatalogEntryById(parsePublicAgentId(agentKey))?.model;
+  return builtinAgentCatalogEntryById(
+    parseBuiltinPlatformAgentId(agentKey) ?? parsePublicAgentId(agentKey)
+  )?.model;
 }
 function resolveAgentModelIdentity(opts) {
   const model = resolveEffectiveModel(opts);
@@ -229,11 +493,32 @@ function resolveAgentModelIdentity(opts) {
 }
 function resolveAgentContextWindow(opts) {
   const model = resolveEffectiveModel(opts);
-  if (model) return getModelContextWindow(model);
-  if (opts.agentName?.trim()) {
-    return getModelContextWindow(opts.agentName);
+  if (model) return resolveContextWindow(model);
+  const byName = opts.agentName?.trim() ? resolveOccupancyWindow({ model: opts.agentName }) : void 0;
+  if (byName !== void 0) return byName;
+  const candidates = [
+    ...modelSlugCandidates(opts.agentKey, 2),
+    ...modelSlugCandidates(opts.agentName, 1)
+  ];
+  for (const candidate of candidates) {
+    const window = resolveOccupancyWindow({ model: candidate });
+    if (window !== void 0) return window;
+  }
+  return void 0;
+}
+var AGENT_KEY_PREFIX = /^agent-[a-z0-9]+-/i;
+function modelSlugCandidates(source, maxDrop) {
+  const raw = source?.trim();
+  if (!raw) return [];
+  const base = raw.replace(/\s+/g, "-").toLowerCase();
+  const seed = base.replace(AGENT_KEY_PREFIX, "");
+  const out = [seed];
+  if (seed !== base) out.push(base);
+  const segments = seed.split("-");
+  for (let drop = 1; drop <= maxDrop && drop < segments.length; drop++) {
+    out.push(segments.slice(drop).join("-"));
   }
-  return DEFAULT_CONTEXT_WINDOW;
+  return [...new Set(out.filter(Boolean))];
 }
 var PROVIDER_LOOKUP_ORDER = [
   "openrouter",
@@ -271,7 +556,7 @@ function resolveContextWindow(model) {
     const config = findModelConfig(provider, raw);
     if (config?.contextWindow) return config.contextWindow;
   }
-  return getModelContextWindow(raw);
+  return resolveOccupancyWindow({ model: raw });
 }
 function buildTurnTokenUsage(usage, model) {
   const parsed = parseUsageRecord(usage);
@@ -324,11 +609,66 @@ function formatTokenCount(value) {
   const compact = value / 1e6;
   return compact >= 100 ? `${Math.round(compact)}M` : `${compact.toFixed(1).replace(/\.0$/, "")}M`;
 }
-function renderTokenStatus(tokens) {
-  if (!tokens) return "in \u2014 out \u2014 left \u2014";
-  const left = tokens.remaining != null ? formatTokenCount(tokens.remaining) : tokens.contextWindow ? "\u2014" : "\u2014";
-  const cache = tokens.cacheRead != null && tokens.cacheRead > 0 ? ` (cache ${formatTokenCount(tokens.cacheRead)})` : "";
-  return `in ${formatTokenCount(tokens.input)}${cache} out ${formatTokenCount(tokens.output)} left ${left}`;
+function resolveAuthorityTurnCount(turns) {
+  if (turns.length === 0) return 0;
+  const latest = turns[turns.length - 1];
+  if (latest?.role === "assistant") {
+    return Math.max(0, turns.length - 1);
+  }
+  return turns.length;
+}
+function computeBaselineContextTokens(options) {
+  const { authoritativeInput, lastAuthorityTurnCount, turns, fallbackEstimate } = options;
+  if (authoritativeInput !== void 0 && authoritativeInput > 0 && lastAuthorityTurnCount !== void 0 && lastAuthorityTurnCount >= 0) {
+    const turnsSinceAuthority = turns.slice(lastAuthorityTurnCount);
+    const addedTokens = estimateMessagesTokens(turnsSinceAuthority);
+    return authoritativeInput + addedTokens;
+  }
+  return typeof fallbackEstimate === "function" ? fallbackEstimate() : fallbackEstimate;
+}
+function resolveContextUsage(opts = {}) {
+  const tokens = opts.tokens;
+  const contextWindow = tokens?.contextWindow ?? opts.fallbackContextWindow;
+  const authoritativeInput = tokens && tokens.input > 0 ? tokens.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({
+    authoritativeInput,
+    baselineEstimate: authoritativeInput === void 0 && baselineEstimate !== void 0 ? baselineEstimate + (generatedSinceAuthority ?? 0) : baselineEstimate,
+    generatedSinceAuthority
+  });
+  const hasInputSignal = authoritativeInput !== void 0 || baselineEstimate !== void 0 || generatedSinceAuthority !== void 0;
+  const used = hasInputSignal ? occupancy.tokens : void 0;
+  const usage = { estimated: occupancy.estimated };
+  if (used !== void 0) usage.used = used;
+  if (contextWindow != null) usage.contextWindow = contextWindow;
+  if (used !== void 0 && contextWindow != null && contextWindow > 0) {
+    usage.left = Math.max(0, contextWindow - used);
+    usage.pct = used / contextWindow * 100;
+  }
+  return usage;
+}
+function renderTokenStatus(tokens, fallback) {
+  const usage = resolveContextUsage({
+    tokens,
+    fallbackContextWindow: fallback?.contextWindow,
+    estimatedContextTokens: fallback?.estimatedContextTokens,
+    turnEstimatedTokens: fallback?.turnEstimatedTokens
+  });
+  const cache = tokens?.cacheRead != null && tokens.cacheRead > 0 ? ` (cache ${formatTokenCount(tokens.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";
+    return `in ${inStr}${cache} out ${outStr} left \u2014`;
+  }
+  if (!tokens) {
+    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}`;
 }
 function shouldShowUsage(env) {
   return env.NOLO_DEBUG === "1" || env.NOLO_SHOW_USAGE === "1";
@@ -1013,11 +1353,17 @@ function wrapTranscriptLineWithLayout(line, columns, hangingIndent = "", lineSou
       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 (tokens.slice(start).every((token) => token.kind === "sgr")) {
-      if (rows.length > 0) break;
-    }
+    if (start > lastContentTokenIndex && rows.length > 0) break;
     const openingStyles = [...activeStyles];
     const isContinuation = rows.length > 0;
     const currentPrefixWidth = isContinuation ? visibleWidth(hangingIndent) : prefixWidth;
@@ -1065,13 +1411,7 @@ function wrapTranscriptLineWithLayout(line, columns, hangingIndent = "", lineSou
     let segSourceEnd = lineSourceStart;
     let foundFirst = false;
     const rowMapping = [];
-    let plainCharIndex = 0;
-    for (let i = 0; i < start; i++) {
-      const tok = tokens[i];
-      if (tok.kind === "char" && tok.charIndex >= prefixCharCount) {
-        plainCharIndex += tok.value.length;
-      }
-    }
+    let plainCharIndex = plainCharIndexAtStart;
     for (let i = start; i < segmentEnd; i++) {
       const tok = tokens[i];
       if (tok.kind === "char" && tok.charIndex >= prefixCharCount) {
@@ -1108,6 +1448,7 @@ function wrapTranscriptLineWithLayout(line, columns, hangingIndent = "", lineSou
     if (start >= tokens.length && rawLineLength !== void 0) {
       segSourceEnd = lineSourceStart + rawLineLength;
     }
+    plainCharIndexAtStart = plainCharIndex;
     rows.push({
       rendered: rowRendered,
       sourceStart: segSourceStart,
@@ -1527,6 +1868,19 @@ function surfaceBackgroundSequence(env = process.env, brightness = resolveTuiBri
   if (!supportsTruecolor(env)) return "";
   return hexToBgSgr((SURFACE_HEX[activeThemeName] ?? SURFACE_HEX.trail)[brightness]);
 }
+function composerSurfaceBackgroundSequence(env = process.env, brightness = resolveTuiBrightness(env)) {
+  if (!supportsTruecolor(env)) return "";
+  if (resolveTuiThemeMode(env) === "terminal" && activeTerminalBaseHex === null && detectColorFgBgBrightness(env) === null) {
+    return "";
+  }
+  const base = resolveTerminalBaseHex(brightness);
+  const channels = readHexChannels(base.replace(/^#/, "").toUpperCase());
+  const baseLuma = channels ? (0.299 * channels[0] + 0.587 * channels[1] + 0.114 * channels[2]) / 255 : null;
+  const darkCanvas = baseLuma === null ? brightness === "dark" : baseLuma < 0.5;
+  const tint = darkCanvas ? "FFFFFF" : "000000";
+  const weight = darkCanvas ? 0.1 : 0.07;
+  return hexToBgSgr(blendHex(tint, base, weight));
+}
 function userSurfaceBackgroundSequence(env = process.env, brightness = resolveTuiBrightness(env)) {
   if (!supportsTruecolor(env)) return "";
   if (resolveTuiThemeMode(env) === "terminal" && activeTerminalBaseHex === null && detectColorFgBgBrightness(env) === null) {
@@ -8462,6 +8816,68 @@ function styleRichMarkdownLine(line, brightness) {
   }
   return styleInlineMarkdown(line, brightness);
 }
+var FenceTracker = class {
+  inFence = false;
+  inMermaid = false;
+  fenceLang = "unknown";
+  mermaidBody = [];
+  isInFence() {
+    return this.inFence;
+  }
+  isInMermaid() {
+    return this.inMermaid;
+  }
+  processLine(line) {
+    if (isCodeFenceLine(line)) {
+      if (this.inMermaid) {
+        const body = this.mermaidBody;
+        this.mermaidBody = [];
+        this.inMermaid = false;
+        this.inFence = false;
+        this.fenceLang = "unknown";
+        return { kind: "close-mermaid", body };
+      }
+      if (this.inFence) {
+        this.inFence = false;
+        this.fenceLang = "unknown";
+        return { kind: "close-code" };
+      }
+      const lang = readFenceLanguage(line);
+      this.fenceLang = normalizeCodeLang(lang);
+      this.inFence = true;
+      if (/^mermaid$/i.test(lang)) {
+        this.inMermaid = true;
+        this.mermaidBody = [];
+        return { kind: "open" };
+      }
+      return { kind: "open" };
+    }
+    if (this.inMermaid) {
+      this.mermaidBody.push(line);
+      return { kind: "mermaid-body" };
+    }
+    if (this.inFence) {
+      return { kind: "code-line", lang: this.fenceLang };
+    }
+    return { kind: "outside" };
+  }
+  /**
+   * Take unclosed mermaid body lines if currently inside a mermaid block.
+   * Resets mermaid and fence state. Returns null if not in a mermaid block.
+   */
+  flushMermaid(extraLines) {
+    if (!this.inMermaid) return null;
+    if (extraLines && extraLines.length > 0) {
+      this.mermaidBody.push(...extraLines);
+    }
+    const body = this.mermaidBody;
+    this.mermaidBody = [];
+    this.inMermaid = false;
+    this.inFence = false;
+    this.fenceLang = "unknown";
+    return body;
+  }
+};
 function renderMermaidBody(bodyLines, brightness) {
   const body = bodyLines.join("\n");
   const rendered = renderMermaidBlock(body, brightness, true);
@@ -8476,52 +8892,27 @@ function formatAssistantDisplay(text, options = {}) {
   const lines = polished.split("\n");
   const out = [];
   let i = 0;
-  let inFence = false;
-  let fenceLang = "unknown";
-  let inMermaid = false;
-  let mermaidBody = null;
-  const flushMermaid = () => {
-    if (mermaidBody !== null) {
-      out.push(renderMermaidBody(mermaidBody, brightness));
-      mermaidBody = null;
-    }
-  };
+  const tracker = new FenceTracker();
   while (i < lines.length) {
     const line = lines[i];
-    if (isCodeFenceLine(line)) {
-      const lang = readFenceLanguage(line);
-      if (inMermaid) {
-        flushMermaid();
-        inMermaid = false;
-        inFence = false;
-        out.push(`${STYLE.dim}${line}${STYLE.reset}`);
-        i++;
-        continue;
-      }
-      if (inFence) {
-        fenceLang = "unknown";
-        inFence = false;
-        out.push(`${STYLE.dim}${line}${STYLE.reset}`);
-        i++;
-        continue;
-      }
-      inFence = true;
-      fenceLang = normalizeCodeLang(lang);
-      if (/^mermaid$/i.test(lang)) {
-        inMermaid = true;
-        mermaidBody = [];
-      }
+    const event = tracker.processLine(line);
+    if (event.kind === "close-mermaid") {
+      out.push(renderMermaidBody(event.body, brightness));
       out.push(`${STYLE.dim}${line}${STYLE.reset}`);
       i++;
       continue;
     }
-    if (inMermaid && mermaidBody !== null) {
-      mermaidBody.push(line);
+    if (event.kind === "open" || event.kind === "close-code") {
+      out.push(`${STYLE.dim}${line}${STYLE.reset}`);
       i++;
       continue;
     }
-    if (inFence) {
-      out.push(highlightCodeLine(line, fenceLang, brightness));
+    if (event.kind === "mermaid-body") {
+      i++;
+      continue;
+    }
+    if (event.kind === "code-line") {
+      out.push(highlightCodeLine(line, event.lang, brightness));
       i++;
       continue;
     }
@@ -8562,7 +8953,10 @@ function formatAssistantDisplay(text, options = {}) {
     out.push(styleRichMarkdownLine(line, brightness));
     i++;
   }
-  flushMermaid();
+  const unclosed = tracker.flushMermaid();
+  if (unclosed !== null) {
+    out.push(renderMermaidBody(unclosed, brightness));
+  }
   return out.join("\n");
 }
 function emitFormattedAssistantBlock(write, text, trailingNewline = false) {
@@ -8598,10 +8992,7 @@ function needsListProseBreath(prev, next, prevLine = "") {
 function createRenderAwareStreamWriter(args) {
   const brightness = resolveTuiBrightness();
   let buffer = "";
-  let inFence = false;
-  let fenceLang = "unknown";
-  let inMermaid = false;
-  let mermaidBody = [];
+  const tracker = new FenceTracker();
   let lastKind = null;
   let lastLine = "";
   let pendingBlankRow = false;
@@ -8615,7 +9006,7 @@ function createRenderAwareStreamWriter(args) {
     if (needsListProseBreath(lastKind, nextKind, lastLine)) args.write("\n");
   };
   const flushPartialProse = () => {
-    if (inFence || buffer.length < PARTIAL_FLUSH_THRESHOLD) return;
+    if (tracker.isInFence() || buffer.length < PARTIAL_FLUSH_THRESHOLD) return;
     const firstLine = buffer.split("\n", 1)[0] ?? "";
     if (isTableRow(firstLine) || classifyStreamLine(firstLine) !== "prose") return;
     const Segmenter = Intl.Segmenter;
@@ -8638,34 +9029,19 @@ function createRenderAwareStreamWriter(args) {
       const lines = buffer.split("\n");
       if (lines.length < 2) break;
       const firstLine = lines[0] ?? "";
-      if (isCodeFenceLine(firstLine)) {
-        if (inMermaid) {
-          const diagram = renderMermaidBody(mermaidBody, brightness);
-          args.write(diagram + "\n");
-          mermaidBody = [];
-          inMermaid = false;
-          inFence = false;
-          fenceLang = "unknown";
-          emitBreathIfNeeded("fence");
-          args.write(`${STYLE.dim}${firstLine}${STYLE.reset}
+      const event = tracker.processLine(firstLine);
+      if (event.kind === "close-mermaid") {
+        const diagram = renderMermaidBody(event.body, brightness);
+        args.write(diagram + "\n");
+        emitBreathIfNeeded("fence");
+        args.write(`${STYLE.dim}${firstLine}${STYLE.reset}
 `);
-          lastKind = "fence";
-          lastLine = firstLine;
-          buffer = lines.slice(1).join("\n");
-          continue;
-        }
-        if (inFence) {
-          fenceLang = "unknown";
-          inFence = false;
-        } else {
-          const lang = readFenceLanguage(firstLine);
-          fenceLang = normalizeCodeLang(lang);
-          if (/^mermaid$/i.test(lang)) {
-            inMermaid = true;
-            mermaidBody = [];
-          }
-          inFence = true;
-        }
+        lastKind = "fence";
+        lastLine = firstLine;
+        buffer = lines.slice(1).join("\n");
+        continue;
+      }
+      if (event.kind === "open" || event.kind === "close-code") {
         emitBreathIfNeeded("fence");
         args.write(`${STYLE.dim}${firstLine}${STYLE.reset}
 `);
@@ -8674,13 +9050,12 @@ function createRenderAwareStreamWriter(args) {
         buffer = lines.slice(1).join("\n");
         continue;
       }
-      if (inMermaid) {
-        mermaidBody.push(firstLine);
+      if (event.kind === "mermaid-body") {
         buffer = lines.slice(1).join("\n");
         continue;
       }
-      if (inFence) {
-        args.write(`${highlightCodeLine(firstLine, fenceLang, brightness)}
+      if (event.kind === "code-line") {
+        args.write(`${highlightCodeLine(firstLine, event.lang, brightness)}
 `);
         lastKind = "fence";
         lastLine = firstLine;
@@ -8688,7 +9063,7 @@ function createRenderAwareStreamWriter(args) {
         continue;
       }
       const trimmedFirst = firstLine.trim();
-      if ((trimmedFirst.startsWith("$$") || trimmedFirst.startsWith("\\[")) && !inFence) {
+      if ((trimmedFirst.startsWith("$$") || trimmedFirst.startsWith("\\[")) && !tracker.isInFence()) {
         const isBracket = trimmedFirst.startsWith("\\[");
         const closeMarker = isBracket ? "\\]" : "$$";
         if (trimmedFirst.length > 2 && trimmedFirst.endsWith(closeMarker)) {
@@ -8772,16 +9147,17 @@ function createRenderAwareStreamWriter(args) {
       flushPartialProse();
     },
     flush() {
-      if (inMermaid) {
-        if (buffer) mermaidBody.push(...buffer.split("\n"));
-        args.write(renderMermaidBody(mermaidBody, brightness) + "\n");
-        mermaidBody = [];
-        inMermaid = false;
+      if (tracker.isInMermaid()) {
+        const extra = buffer ? buffer.split("\n") : void 0;
+        const unclosed = tracker.flushMermaid(extra);
+        if (unclosed !== null) {
+          args.write(renderMermaidBody(unclosed, brightness) + "\n");
+        }
         buffer = "";
         return;
       }
       if (!buffer) return;
-      if (inFence) {
+      if (tracker.isInFence()) {
         args.write(buffer);
       } else {
         emitFormattedAssistantBlock(args.write, buffer);
@@ -8806,17 +9182,45 @@ function redactSecrets(text) {
   );
 }
 
-// node_modules/diff/libesm/diff/base.js
-var Diff = class {
-  diff(oldStr, newStr, options = {}) {
-    let callback;
-    if (typeof options === "function") {
-      callback = options;
-      options = {};
-    } else if ("callback" in options) {
-      callback = options.callback;
-    }
-    const oldString = this.castInput(oldStr, options);
+// 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();
+}
+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");
+}
+
+// node_modules/diff/libesm/diff/base.js
+var Diff = class {
+  diff(oldStr, newStr, options = {}) {
+    let callback;
+    if (typeof options === "function") {
+      callback = options;
+      options = {};
+    } else if ("callback" in options) {
+      callback = options.callback;
+    }
+    const oldString = this.castInput(oldStr, options);
     const newString = this.castInput(newStr, options);
     const oldTokens = this.removeEmpty(this.tokenize(oldString, options));
     const newTokens = this.removeEmpty(this.tokenize(newString, options));
@@ -8906,16 +9310,16 @@ var Diff = class {
       }
     }
   }
-  addToPath(path, added, removed, oldPosInc, options) {
-    const last = path.lastComponent;
+  addToPath(path2, added, removed, oldPosInc, options) {
+    const last = path2.lastComponent;
     if (last && !options.oneChangePerToken && last.added === added && last.removed === removed) {
       return {
-        oldPos: path.oldPos + oldPosInc,
+        oldPos: path2.oldPos + oldPosInc,
         lastComponent: { count: last.count + 1, added, removed, previousComponent: last.previousComponent }
       };
     } else {
       return {
-        oldPos: path.oldPos + oldPosInc,
+        oldPos: path2.oldPos + oldPosInc,
         lastComponent: { count: 1, added, removed, previousComponent: last }
       };
     }
@@ -9060,14 +9464,14 @@ function tokenize(value, options) {
 import { homedir as osHomedir } from "node:os";
 
 // packages/core/foldHomePath.ts
-function foldHomePath(path, home) {
-  if (!path) return path;
+function foldHomePath(path2, home) {
+  if (!path2) return path2;
   if (home) {
     const cleanHome = home.endsWith("/") ? home.slice(0, -1) : home;
-    if (path === cleanHome) return "~";
-    if (path.startsWith(cleanHome + "/")) return `~${path.slice(cleanHome.length)}`;
+    if (path2 === cleanHome) return "~";
+    if (path2.startsWith(cleanHome + "/")) return `~${path2.slice(cleanHome.length)}`;
   }
-  return path.replace(/^(\/Users\/[^/]+|\/home\/[^/]+)(\/|$)/, "~$2");
+  return path2.replace(/^(\/Users\/[^/]+|\/home\/[^/]+)(\/|$)/, "~$2");
 }
 
 // packages/cli/client/formatReadPathTree.ts
@@ -9094,10 +9498,10 @@ function clipPathAware(value, max = 72) {
   if (filenameOnly.length <= max) return filenameOnly;
   return clipCompactText(value, max, "\u2026");
 }
-function formatHomePath(path, customHomedir) {
-  if (!path) return "";
+function formatHomePath(path2, customHomedir) {
+  if (!path2) return "";
   const home = customHomedir || (typeof process !== "undefined" ? process.env?.HOME : void 0) || (typeof osHomedir === "function" ? osHomedir() : "");
-  return foldHomePath(path, home);
+  return foldHomePath(path2, home);
 }
 function formatReadItemPath(rawPath, metadata, customHomedir) {
   const inputPath = rawPath || (typeof metadata?.path === "string" ? metadata.path : void 0) || (typeof metadata?.filePath === "string" ? metadata.filePath : void 0) || "file";
@@ -9117,10 +9521,10 @@ function formatReadItemPath(rawPath, metadata, customHomedir) {
   const clippedPath = clipPathAware(formattedPath, 72);
   return `${clippedPath}${rangePart}`;
 }
-function formatSearchItemQuery(query, path, customHomedir) {
+function formatSearchItemQuery(query, path2, customHomedir) {
   let text = (query || "").trim();
-  if (path) {
-    const formattedPath = formatHomePath(path, customHomedir);
+  if (path2) {
+    const formattedPath = formatHomePath(path2, customHomedir);
     if (formattedPath) {
       text = text ? `${text} in ${formattedPath}` : formattedPath;
     }
@@ -9176,7 +9580,7 @@ function parseUiAskChoiceForCli(event) {
     label: String(parsed.selected.label ?? "").trim(),
     userMessage: String(parsed.selected.userMessage ?? "").trim()
   } : void 0;
-  const answers = Array.isArray(parsed.answers) ? parsed.answers : void 0;
+  const answers = Array.isArray(parsed.answers) ? parsed.answers.filter((a) => Boolean(a && typeof a === "object")) : void 0;
   const cancelled = Boolean(parsed.cancelled);
   const resolved = Boolean(
     event.metadata?.resolved || selected || cancelled || answers && answers.length > 0
@@ -9197,7 +9601,7 @@ function formatUiAskChoiceBlock(event, colorEnabled) {
   if (!parsed) return null;
   const lines = [];
   lines.push("");
-  const questionText = parsed.question || "";
+  const questionText = safeAskText(parsed.question, 200);
   if (colorEnabled) {
     lines.push(`${themeText("\u2753 ", "info", true)}${styleCliText(questionText, "cyan", true)}`);
   } else {
@@ -9212,7 +9616,8 @@ function formatUiAskChoiceBlock(event, colorEnabled) {
       return `${lines.join("\n")}
 `;
     }
-    const selectedLabel = parsed.selected?.label || parsed.selected?.userMessage || (parsed.answers ? parsed.answers.map((a) => a.userMessage).filter(Boolean).join(", ") : "");
+    const rawSelected = parsed.selected?.label || parsed.selected?.userMessage;
+    const selectedLabel = rawSelected ? safeAskText(rawSelected, 160) : parsed.answers ? parsed.answers.map((a) => safeAskText(a.userMessage, 160)).filter(Boolean).join(", ") : "";
     const marker = t("askChoiceHistorySelected");
     const displayLabel = selectedLabel || "\u2014";
     if (colorEnabled) {
@@ -9225,8 +9630,9 @@ function formatUiAskChoiceBlock(event, colorEnabled) {
     if (parsed.answers && parsed.answers.length > 1) {
       for (const answer of parsed.answers) {
         if (!answer.userMessage) continue;
+        const answerText = safeAskText(answer.userMessage, 160);
         lines.push(
-          colorEnabled ? `    ${themeText("\xB7", "chrome", true)} ${answer.userMessage}` : `    \xB7 ${answer.userMessage}`
+          colorEnabled ? `    ${themeText("\xB7", "chrome", true)} ${answerText}` : `    \xB7 ${answerText}`
         );
       }
     }
@@ -9235,7 +9641,7 @@ function formatUiAskChoiceBlock(event, colorEnabled) {
   }
   parsed.choices.forEach((choice, i) => {
     const num = String(i + 1);
-    const label = choice.label;
+    const label = safeAskText(choice.label, 160);
     if (colorEnabled) {
       lines.push(
         `  ${themeText(num + ".", "chrome", true)} ${label}`
@@ -9251,6 +9657,87 @@ function formatUiAskChoiceBlock(event, colorEnabled) {
     lines.push(`  ${hint}`);
   }
   return `${lines.join("\n")}
+`;
+}
+function formatShowInteractionBlock(event, colorEnabled) {
+  const label = toolLabel(event.toolName || "show_interaction");
+  let parsedPayload;
+  if (typeof event.content === "string") {
+    try {
+      parsedPayload = JSON.parse(event.content);
+    } catch {
+      const metadata = event.metadata ?? {};
+      const rawMetaError = metadata.error ?? metadata.errorMessage;
+      const rawMessage = event.message?.trim();
+      const rawContent = event.content.trim();
+      let reason = "";
+      if (typeof rawMetaError === "string" && rawMetaError.trim()) {
+        reason = rawMetaError.trim();
+      } else if (rawMessage) {
+        reason = rawMessage;
+      } else if (/^\[工具\s*"[^"]+"\s*执行失败:\s*[^\]]+\]$/.test(rawContent)) {
+        reason = rawContent;
+      }
+      const detail = reason ? clip(redactSecrets(cleanUserText(reason)), 96) : "invalid card payload";
+      return formatToolTraceLine(`\u25B8 ${label}  \u2717 ${detail}`, colorEnabled, "error");
+    }
+  } else if (event.content && typeof event.content === "object") {
+    parsedPayload = event.content;
+  } else {
+    const metadata = event.metadata ?? {};
+    const rawMetaError = metadata.error ?? metadata.errorMessage;
+    const reason = typeof rawMetaError === "string" && rawMetaError.trim() || event.message?.trim() || "";
+    const detail = reason ? clip(redactSecrets(cleanUserText(reason)), 96) : "invalid card payload";
+    return formatToolTraceLine(`\u25B8 ${label}  \u2717 ${detail}`, colorEnabled, "error");
+  }
+  if (parsedPayload && typeof parsedPayload === "object" && parsedPayload.error) {
+    const detail = typeof parsedPayload.detail === "string" && parsedPayload.detail.trim() ? clip(redactSecrets(cleanUserText(parsedPayload.detail)), 96) : "card error";
+    return formatToolTraceLine(`\u25B8 ${label}  \u2717 ${detail}`, colorEnabled, "error");
+  }
+  const rawCard = parsedPayload && typeof parsedPayload === "object" && (parsedPayload.type === "show_interaction" || parsedPayload.card !== void 0) ? parsedPayload.card : parsedPayload;
+  const parsedCard = parseUiCard(rawCard);
+  if (!parsedCard.ok) {
+    const errorText = clip(redactSecrets(cleanUserText(parsedCard.error)), 96);
+    return formatToolTraceLine(`\u25B8 ${label}  \u2717 ${errorText}`, colorEnabled, "error");
+  }
+  const fallback = uiCardFallback(parsedCard.value);
+  const maxLines = 12;
+  const maxDisplayWidth = 400;
+  const rawLines = fallback.split("\n");
+  const clippedLines = [];
+  let currentWidth = 0;
+  let wasClipped = false;
+  for (let i = 0; i < rawLines.length; i++) {
+    if (clippedLines.length >= maxLines) {
+      wasClipped = true;
+      break;
+    }
+    const cleanLine = redactSecrets(cleanUserText(rawLines[i]));
+    const lineWidth = displayWidth(cleanLine);
+    const separatorWidth = clippedLines.length > 0 ? 1 : 0;
+    if (currentWidth + lineWidth + separatorWidth > maxDisplayWidth) {
+      const remainingWidth = maxDisplayWidth - currentWidth - separatorWidth;
+      if (remainingWidth > 0) {
+        clippedLines.push(truncateByDisplayWidth(cleanLine, remainingWidth));
+      }
+      wasClipped = true;
+      break;
+    }
+    clippedLines.push(cleanLine);
+    currentWidth += lineWidth + separatorWidth;
+  }
+  if (clippedLines.length === 0 && rawLines.length > 0 && maxDisplayWidth > 0) {
+    const cleanLine = redactSecrets(cleanUserText(rawLines[0]));
+    clippedLines.push(truncateByDisplayWidth(cleanLine, maxDisplayWidth));
+    wasClipped = true;
+  }
+  if (wasClipped) {
+    clippedLines.push("\u2026");
+  }
+  const cleanLines = clippedLines.map((l) => colorEnabled ? themeText(l, "muted", true) : l);
+  return `
+${cleanLines.join("\n")}
+
 `;
 }
 function formatToolTraceLine(text, colorEnabled, accent = "none") {
@@ -9273,6 +9760,7 @@ function renderRunCard(snapshot, opts) {
     ...snapshot,
     agentName: snapshot.agentName ? cleanUserText(snapshot.agentName) : snapshot.agentName,
     taskPreview: snapshot.taskPreview ? cleanUserText(snapshot.taskPreview) : snapshot.taskPreview,
+    title: snapshot.title ? cleanUserText(snapshot.title) : snapshot.title,
     lastAssistantText: snapshot.lastAssistantText ? cleanUserText(snapshot.lastAssistantText) : snapshot.lastAssistantText,
     lastToolNames: snapshot.lastToolNames?.map(cleanUserText)
   } : snapshot;
@@ -9283,6 +9771,7 @@ function renderRunCard(snapshot, opts) {
   } : { errorMessage: source.errorMessage, logLines: source.logLines };
   const body = isAgentRunTerminalStatus(snapshot.status) ? formatFinishedRunCard(name, snapshot.status, {
     runId: snapshot.runId,
+    ...snapshot.title ? { title: snapshot.title } : {},
     toolCallCount: source.toolCallCount,
     lastToolNames: source.lastToolNames,
     lastAssistantText: source.lastAssistantText,
@@ -9292,6 +9781,7 @@ function renderRunCard(snapshot, opts) {
     labels
   }) : formatStatusRunCard(name, snapshot.status, {
     runId: snapshot.runId,
+    ...snapshot.title ? { title: snapshot.title } : {},
     toolCallCount: source.toolCallCount,
     lastToolNames: source.lastToolNames,
     lastAssistantText: source.lastAssistantText,
@@ -9312,7 +9802,10 @@ function recoverOrchestrationCard(event, toolName, opts) {
     try {
       const parsed = JSON.parse(trimmed);
       const agents = Array.isArray(parsed.agents) ? parsed.agents : [];
-      return formatAgentListCard(agents);
+      const card = formatAgentListCard(agents);
+      const lines = card.split("\n");
+      lines[0] = t("agentsListLabel", String(agents.length));
+      return lines.join("\n");
     } catch {
       return null;
     }
@@ -9336,9 +9829,11 @@ function recoverOrchestrationCard(event, toolName, opts) {
   if (kind === "start") {
     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
     });
   }
@@ -9436,8 +9931,8 @@ function commandFullGist(command, max) {
   if (!oneLine) return "";
   return truncateByDisplayWidth(redactSecrets(oneLine), max);
 }
-function pathBasenameGist(path) {
-  const segments = path.split(/[\\/]/).filter((segment) => segment.length > 0);
+function pathBasenameGist(path2) {
+  const segments = path2.split(/[\\/]/).filter((segment) => segment.length > 0);
   const base = segments.pop();
   return base ? gistClip(base) : "";
 }
@@ -9593,8 +10088,8 @@ function normalToolGistRaw(event) {
   const metadata = event.metadata ?? {};
   const toolName = event.toolName || "";
   if (toolName === "readFile") {
-    const path2 = typeof metadata.path === "string" ? metadata.path : typeof metadata.filePath === "string" ? metadata.filePath : "";
-    if (path2) return gistClip(formatReadItemPath(path2, metadata), 52);
+    const path3 = typeof metadata.path === "string" ? metadata.path : typeof metadata.filePath === "string" ? metadata.filePath : "";
+    if (path3) return gistClip(formatReadItemPath(path3, metadata), 52);
   }
   if (toolName === "fetchWebpage") {
     const url = typeof metadata.url === "string" ? metadata.url : "";
@@ -9602,8 +10097,8 @@ function normalToolGistRaw(event) {
   }
   if (toolName === "exa_search") {
     const query2 = typeof metadata.query === "string" ? metadata.query : typeof metadata.pattern === "string" ? metadata.pattern : "";
-    const path2 = typeof metadata.path === "string" ? metadata.path : void 0;
-    if (query2 || path2) return formatSearchItemQuery(query2, path2);
+    const path3 = typeof metadata.path === "string" ? metadata.path : void 0;
+    if (query2 || path3) return formatSearchItemQuery(query2, path3);
   }
   if (isRunToolName(toolName)) {
     const command2 = typeof metadata.command === "string" ? metadata.command : "";
@@ -9613,26 +10108,14 @@ function normalToolGistRaw(event) {
   }
   const memoryGist = memoryToolGist(toolName, metadata);
   if (memoryGist) return memoryGist;
-  const path = typeof metadata.path === "string" ? metadata.path : "";
-  if (path) return pathBasenameGist(path);
+  const path2 = typeof metadata.path === "string" ? metadata.path : "";
+  if (path2) return pathBasenameGist(path2);
   const command = typeof metadata.command === "string" ? metadata.command : "";
   if (command) return commandFullGist(command, normalRunGistMaxWidth());
   const query = typeof metadata.query === "string" ? metadata.query : "";
   if (query) return clipCompactText(query, 64, "\u2026");
   return "";
 }
-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 normalToolGist(event) {
   return withholdIfSecretLike(normalToolGistRaw(event));
 }
@@ -9644,8 +10127,6 @@ function formatNormalToolDuration(elapsedMs) {
 function formatNormalToolLine(event, pending, colorEnabled) {
   if (event.type === "tool-call") return "";
   const toolName = event.toolName || pending?.toolName || "tool";
-  const todoBlock = formatTodoListForCli(event, colorEnabled);
-  if (todoBlock) return todoBlock;
   if (event.type === "tool-result" && (event.toolName === "ask_user" || event.metadata?.uiAskChoice)) {
     const block = formatUiAskChoiceBlock(event, colorEnabled);
     if (block) return block;
@@ -9656,6 +10137,9 @@ function formatNormalToolLine(event, pending, colorEnabled) {
   if (event.type === "tool-result" && toolName === "loadSkill") {
     return formatLoadSkillBlock(event, colorEnabled, { safe: true }) ?? "";
   }
+  if (event.type === "tool-result" && toolName === "show_interaction") {
+    return formatShowInteractionBlock(event, colorEnabled);
+  }
   const label = toolLabel(toolName);
   if (readActionGate(event.metadata?.actionGate)) {
     return formatToolTraceLine(`\u25B8 ${label}  ! ${t("toolNeedsAction")}`, colorEnabled, "error");
@@ -9708,39 +10192,6 @@ function resolveLoadSkillName(event) {
   if (match?.[1]) return match[1];
   return argName || "skill";
 }
-function formatTodoListForCli(event, colorEnabled) {
-  if (event.type !== "tool-result" || event.toolName !== "setTodoList") {
-    return void 0;
-  }
-  let raw = event.metadata?.displayData;
-  let parsed = typeof raw === "object" && raw !== null;
-  if (typeof raw === "string") {
-    try {
-      raw = JSON.parse(raw);
-      parsed = true;
-    } catch {
-      raw = void 0;
-    }
-  }
-  if (!parsed && typeof event.content === "string") {
-    try {
-      raw = JSON.parse(event.content);
-      parsed = true;
-    } catch {
-      raw = void 0;
-    }
-  }
-  const todos = Array.isArray(raw?.todos) ? raw.todos : void 0;
-  if (!todos) return void 0;
-  if (todos.length === 0) return "\u2611 Todo\n  (empty)\n";
-  const lines = todos.map((todo) => {
-    const status = todo?.status === "done" ? "\u2713" : todo?.status === "in_progress" ? "\u25D0" : "\u25CB";
-    const title = typeof todo?.title === "string" ? todo.title : "Untitled task";
-    return `  ${status} ${title}`;
-  });
-  const text = [`\u2611 Todo (${todos.length})`, ...lines].join("\n") + "\n";
-  return colorEnabled ? themeText(text, "chrome") : text;
-}
 function formatLoadSkillBlock(event, colorEnabled, opts) {
   if (event.type !== "tool-result" || event.toolName !== "loadSkill") return null;
   const skillName = resolveLoadSkillName(event);
@@ -10385,6 +10836,12 @@ var describeClientVersionTooOldFailure = (message, rawError) => {
 };
 
 // packages/cli/client/agentRunStream.ts
+function isMalformedFunctionCallFailure(message) {
+  return message.includes("MALFORMED_FUNCTION_CALL");
+}
+function shouldAppendStreamRawErrorDetail(env) {
+  return env?.NOLO_DEBUG === "1" || env?.NOLO_CLI_DEBUG_DETAIL === "1";
+}
 async function readStreamingAgentRun(options, res, existingSpinner) {
   const reader = res.body?.getReader();
   if (!reader) {
@@ -10493,15 +10950,18 @@ async function readStreamingAgentRun(options, res, existingSpinner) {
       };
     }
     const message = toErrorMessage(error);
+    const malformedToolCall = isMalformedFunctionCallFailure(message);
+    const rawDetail = shouldAppendStreamRawErrorDetail(options.env) ? t("agentRunStream.rawErrorDetail", message) : null;
     if (dialogId) {
-      options.output.write(
-        `
-[nolo] Agent stream transport interrupted after dialog ${dialogId} was created: ${message}
-`
-      );
-      options.output.write(
-        "[nolo] The agent run may still finish on the server; read the dialog before retrying.\n"
-      );
+      if (malformedToolCall) {
+        options.output.write(`
+${t("agentRunStream.malformedToolCallRejected", dialogId)}
+`);
+        if (rawDetail) options.output.write(rawDetail);
+        return { exitCode: 0, dialogId, streamInterrupted: true };
+      }
+      options.output.write(t("agentRunStream.interruptedAfterDialog", dialogId, message));
+      options.output.write(t("agentRunStream.mayStillFinishOnServer"));
       return { exitCode: 0, dialogId, streamInterrupted: true };
     }
     if (isClientVersionTooOldFailure(message, error)) {
@@ -10509,9 +10969,14 @@ async function readStreamingAgentRun(options, res, existingSpinner) {
 ${describeClientVersionTooOldFailure(message, error)}`);
       return { exitCode: 1 };
     }
-    options.output.write(`
-[nolo] Agent stream failed: ${message}
+    if (malformedToolCall) {
+      options.output.write(`
+${t("agentRunStream.malformedToolCallRejectedNoDialog")}
 `);
+      if (rawDetail) options.output.write(rawDetail);
+      return { exitCode: 1 };
+    }
+    options.output.write(t("agentRunStream.failed", message));
     return { exitCode: 1 };
   }
   if (options.abortSignal?.aborted && !sawDone) {
@@ -10532,6 +10997,9 @@ ${describeClientVersionTooOldFailure(message, error)}`);
   return {
     exitCode: 0,
     ...dialogId ? { dialogId } : {},
+    // 结论载体与 local / 非流式 HTTP 路径同契约：流式分支已经把 assistant
+    // 正文累加在 content 里，不随行则 server 流式 run 的结算也拿不到结论。
+    ...content ? { finalText: content } : {},
     turnTokens: buildTurnTokenUsage(usage, options.agentKey),
     ...turnCredits !== void 0 ? { turnCredits } : {}
   };
@@ -10738,8 +11206,46 @@ function findCollapsedPasteSpanAt(buffer, pos, opts = {}) {
 
 // packages/cli/client/agentRun.ts
 import { ulid as ulid2 } from "ulid";
+
+// packages/cli/client/balanceErrorPatterns.ts
+var ZERO_WIDTH_RE = /[\u200b-\u200d\u2060\ufeff]/g;
+function stripZeroWidthChars(text) {
+  return text.replace(ZERO_WIDTH_RE, "");
+}
+var CONTROL_CHAR_RE = /[\u0000-\u0008\u000b\u000c\u000e-\u001f\u007f]/g;
+function stripControlChars(text) {
+  return text.replace(CONTROL_CHAR_RE, "");
+}
+var BALANCE_ERROR_PATTERNS = [
+  /UPSTREAM_402/i,
+  // 裸 HTTP 402 本身就是「Payment Required」：报文里没有任何余额关键词（如只有
+  // `{"error":{}}` 空壳）时也必须走余额块，而不是落进通用 4xx 长文案。
+  // `\b` 保证 `HTTP 4020` 不误命中。
+  /\bHTTP\s*402\b/i,
+  // `insufficient balance` / `insufficient_balance` / `insufficient-balance` /
+  // `Insufficient  Balance`（分隔符重复也要认：alpha 里的旧 `/insufficient\s+balance/`
+  // 能覆盖双空格，收窄成 `?` 会回退）。
+  /insufficient[_\s-]+balance/i,
+  /余额不足/,
+  /wallet\s+balance\s+is\s+insufficient/i,
+  /top\s+up\s+your\s+wallet/i,
+  /payment[_ ]required/i
+];
+var CODING_PLAN_EXHAUSTED_RE = /coding[_\s-]?plan[_\s-]?exhausted/i;
+function matchesBalanceError(message) {
+  if (!message) return false;
+  const normalized = stripZeroWidthChars(message);
+  return BALANCE_ERROR_PATTERNS.some((pattern) => pattern.test(normalized));
+}
+function isBalanceExhaustedError(error) {
+  if (!error) return false;
+  const message = error instanceof Error ? error.message : typeof error === "string" ? error : String(error?.message ?? "");
+  return matchesBalanceError(message);
+}
+
+// packages/cli/client/agentRun.ts
 async function loadRunLocalAgentTurn() {
-  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-AK2QVJHY.js");
+  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-KKSQJMTE.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();
@@ -10763,25 +11269,7 @@ function parseEmbeddedBalanceDetails(message) {
   const jsonStart = message.indexOf('{"error"');
   if (jsonStart < 0) return void 0;
   try {
-    let depth = 0;
-    let inString = false;
-    let escaped = false;
-    let jsonEnd = -1;
-    for (let i = jsonStart; i < message.length; i += 1) {
-      const char = message[i];
-      if (inString) {
-        if (escaped) escaped = false;
-        else if (char === "\\") escaped = true;
-        else if (char === '"') inString = false;
-      } else if (char === '"') {
-        inString = true;
-      } else if (char === "{") {
-        depth += 1;
-      } else if (char === "}" && --depth === 0) {
-        jsonEnd = i + 1;
-        break;
-      }
-    }
+    const jsonEnd = findJsonObjectEnd(message, jsonStart);
     if (jsonEnd < 0) return void 0;
     const parsed = JSON.parse(message.slice(jsonStart, jsonEnd));
     if (!parsed || typeof parsed !== "object") return void 0;
@@ -10825,6 +11313,7 @@ function resolveRequestedRuntimeMode(options) {
     return envMode;
   return "auto";
 }
+var MACHINE_SHELL_LOCAL_REFUSAL_MESSAGE = "[nolo] --machine-shell can only run on the machine bound in the agent record (runtimeBinding.machineId): a local run cannot honor it, and it never executes on this computer.\n[nolo] Retry without --local / NOLO_RUNTIME_MODE=local, or drop --machine-shell to run on this computer.\n";
 function canResolveCollapsedPasteReference(store, content) {
   const expand = (text) => expandCollapsedPastes(text, store) !== text;
   if (typeof content === "string") return expand(content);
@@ -10837,15 +11326,31 @@ function buildDefaultLocalRuntimeAdapter(options) {
     fetchImpl: options.fetchImpl,
     cwd: options.localRuntimeCwd,
     output: options.output,
+    // TUI 显式注入的真实会话身份；缺省时 adapter 内仍回退 parentDialogId。
+    ...options.originSession ? { originSession: options.originSession } : {},
+    // 分享 OAuth agent 的 shell 会话授权（块 D）：仅 owner-required 场景生效。
+    ...options.shellGrant ? { shellGrant: options.shellGrant } : {},
+    ...options.shellApprovalSession ? { shellApprovalSession: options.shellApprovalSession } : {},
+    ...options.execShellApproval ? { execShellApproval: options.execShellApproval } : {},
+    // 运行位置展示（块 D）：TUI 消费 projectToolExecutionLocation 渲染工具实际
+    // 执行设备/工作区；非 owner-required 场景 adapter 不回调。
+    ...options.onToolExecutionLocation ? { onToolExecutionLocation: options.onToolExecutionLocation } : {},
     ...options.confirmDestructiveAction ? { confirmDestructiveAction: options.confirmDestructiveAction } : {},
     ...options.requestUserChoice ? { requestUserChoice: options.requestUserChoice } : {},
     ...options.pastedTextStore?.items.size ? { pastedTextStore: options.pastedTextStore } : {},
-    ...options.activityReporter ? { activityReporter: options.activityReporter } : {}
+    ...options.activityReporter ? { activityReporter: options.activityReporter } : {},
+    // runtimeKey 接线：不传下去则本地 run 的 runtimeKey 在 agentRun 层就断了
+    // ——adapter 收不到 → docker workload 永不创建，非 docker 云后端也不会
+    // fail-closed（死代码）。
+    ...options.runtimeKey ? { runtimeKey: options.runtimeKey } : {}
   });
 }
 function resolveLocalRuntimeAdapter(options) {
   return options.localRuntimeAdapter || options.localRuntimeAdapterFactory?.(options.env, {
-    cwd: options.localRuntimeCwd
+    cwd: options.localRuntimeCwd,
+    // 与 buildDefaultLocalRuntimeAdapter 同口径：注入式 factory 也必须拿到
+    // runtimeKey，否则注入了 adapter 的本地 run 会静默丢掉 docker 语义。
+    ...options.runtimeKey ? { runtimeKey: options.runtimeKey } : {}
   }) || buildDefaultLocalRuntimeAdapter(options);
 }
 function wrapAdapterEphemeral(adapter) {
@@ -10874,7 +11379,7 @@ function wrapLoadAgentConfigWithModelOverride(adapter, targetAgentKey, override)
     }
   };
 }
-var oauthChannelSkipReportedOutputs = /* @__PURE__ */ new WeakSet();
+var oauthChannelSkipReportedAgentKeys = /* @__PURE__ */ new Set();
 function resolveOAuthChannelOwnerSkip(agentConfig, options) {
   if (!agentConfig) return null;
   const apiKeyRef = typeof agentConfig.apiKeyRef === "string" ? agentConfig.apiKeyRef : void 0;
@@ -10886,8 +11391,8 @@ function resolveOAuthChannelOwnerSkip(agentConfig, options) {
   if (!ownerUserId) return null;
   const localUserId = resolveLocalUserId(options.env);
   if (ownerUserId === localUserId) return null;
-  return `[nolo] auto runtime: skipping local runtime because ${options.agentKey} runs on its owner's OAuth subscription channel (owner ${ownerUserId}, this machine runs as ${localUserId}). Use --local explicitly to force this machine's own subscription.
-`;
+  const agentName = asOptionalTrimmedString(agentConfig.name) ?? asOptionalTrimmedString(options.agentName) ?? t("agentRun.sharedAgentFallbackName");
+  return t("agentRun.oauthChannelOwnerSkip", agentName) + "\n";
 }
 async function shouldSkipAutoLocalForServerPlatformTools(options) {
   if (isBuiltinNoloAgentRef(options.agentKey)) return false;
@@ -10903,13 +11408,13 @@ async function shouldSkipAutoLocalForServerPlatformTools(options) {
   }
   const oauthChannelOwnerSkip = resolveOAuthChannelOwnerSkip(agentConfig, options);
   if (oauthChannelOwnerSkip) {
-    if (!options.output || typeof options.output !== "object" || !oauthChannelSkipReportedOutputs.has(options.output)) {
+    if (!options.output || typeof options.output !== "object" || !oauthChannelSkipReportedAgentKeys.has(options.agentKey)) {
       if (options.output && typeof options.output === "object") {
-        oauthChannelSkipReportedOutputs.add(options.output);
+        oauthChannelSkipReportedAgentKeys.add(options.agentKey);
       }
       options.output.write(oauthChannelOwnerSkip);
     }
-    return true;
+    return false;
   }
   if (options.localRuntimeCwd) {
     return false;
@@ -10948,14 +11453,15 @@ async function shouldSkipAutoLocalForServerPlatformTools(options) {
   );
   return true;
 }
-function buildUserInputContent(message, imageUrls = []) {
-  if (imageUrls.length === 0) return message;
+function buildUserInputContent(message, imageUrls = [], attachmentParts = []) {
+  if (imageUrls.length === 0 && attachmentParts.length === 0) return message;
   return [
     ...message.trim() ? [{ type: "text", text: message }] : [],
     ...imageUrls.map((url) => ({
       type: "image_url",
       image_url: { url }
-    }))
+    })),
+    ...attachmentParts
   ];
 }
 function buildSubjectRefs(options) {
@@ -11000,8 +11506,8 @@ function isMissingLocalAgentConfigError(error, agentRef) {
     error && typeof error === "object" && "code" in error && error.code === LOCAL_AGENT_CONFIG_MISSING_CODE && error.agentRef === agentRef
   );
 }
-var PROVIDER_HTTP_FAILED_RE = /(.+?) provider failed:\s*HTTP\s+(\d+)\b/i;
-var PLATFORM_TRANSPORT_RE = /\bplatform provider failed\b/i;
+var PROVIDER_HTTP_FAILED_RE = /(.+?)(?:\s+provider|\s+proxy) failed:\s*HTTP\s+(\d+)\b/i;
+var PLATFORM_TRANSPORT_RE = /\b(?:platform provider failed|owner-required proxy failed)\b/i;
 var EXTRA_RATE_LIMIT_TEXT_RE = /\brate[\s_-]?limit(?:ed|ing|s)?\b|\bresource[_\s-]?exhausted\b|\bmax_concurrent_reached\b/i;
 function looksLikeRateLimitedText(message) {
   return EXTRA_RATE_LIMIT_TEXT_RE.test(message) || QUOTA_ERROR_PATTERNS.some((pattern) => pattern.test(message));
@@ -11048,7 +11554,6 @@ function classifyLocalRunError(message) {
       kind: "rate-limit",
       transport,
       status: 429,
-      statusInferred: true,
       ...quotaExhausted ? { quotaExhausted: true } : {}
     };
   }
@@ -11059,7 +11564,8 @@ function classifyLocalRunError(message) {
   }
   return { kind: "generic" };
 }
-var HISTORY_REPLAY_REJECTION_RE = /invalid_request_error|invalid\s+tool\s+call\s+arguments?/i;
+var HISTORY_REPLAY_REJECTION_RE = /invalid\s+tool\s+call\s+arguments?/i;
+var REASONING_REPLAY_CONTRACT_RE = /reasoning_content[^.]*must be passed back/i;
 var RUN_UNAVAILABLE_PREFIX = "[nolo] auto runtime: local run unavailable";
 var NO_FALLBACK = "Not falling back to server.";
 var SERVER_FALLBACK_HINT = "or use --server to run on the server explicitly.";
@@ -11094,39 +11600,268 @@ function buildAuthFailure(ctx) {
   Detail: ${ctx.message} ${NO_FALLBACK} Use --server to run on the server explicitly.
 `;
   }
-  return `${RUN_UNAVAILABLE_PREFIX} (${ctx.where} returned HTTP ${ctx.status}, auth rejected). Detail: ${ctx.message} ${NO_FALLBACK} ${fix}, ${SERVER_FALLBACK_HINT}.
+  if (ctx.status === 403 && ctx.message.includes("owner-required proxy failed") && /"code"\s*:\s*"owner_origin_mismatch"/i.test(ctx.message)) {
+    return `${RUN_UNAVAILABLE_PREFIX} (${ctx.where} returned HTTP ${ctx.status}, this run's origin device could not be verified \u2014 no live connector connection for this machine on this server/account; owner_origin_mismatch).
+    \xB7 Start the connector on this machine: \`nolo connect --daemon\` (\`nolo machine status\` shows whether it is online and connected to the same server)
+    \xB7 Force a fully local run with --local (needs a local credential for this agent), or run on the server: --server
+  Detail: ${ctx.message} ${NO_FALLBACK} ${SERVER_FALLBACK_HINT}
+`;
+  }
+  return `${RUN_UNAVAILABLE_PREFIX} (${ctx.where} returned HTTP ${ctx.status}, auth rejected). Detail: ${ctx.message} ${NO_FALLBACK} ${fix}, ${SERVER_FALLBACK_HINT}
 `;
 }
 function isAuthNoTokenBody(message) {
   return /"authCode"\s*:\s*"AUTH_NO_TOKEN"/i.test(message) || /no authentication token provided/i.test(message);
 }
 function buildRejectedPayloadFailure(ctx) {
-  const looksLikeHistoryReplay = HISTORY_REPLAY_REJECTION_RE.test(ctx.message);
-  const cause = looksLikeHistoryReplay ? ` This usually happens when the dialog history contains tool_calls or reasoning produced by a different model/provider (e.g. after /switch); the new provider rejects that history. Start a fresh dialog, or clean the offending history.` : "";
+  const looksLikeReasoningReplay = REASONING_REPLAY_CONTRACT_RE.test(ctx.message);
+  const looksLikeHistoryReplay = !looksLikeReasoningReplay && HISTORY_REPLAY_REJECTION_RE.test(ctx.message);
+  const cause = looksLikeReasoningReplay ? ` This is a thinking-mode replay contract violation: the history contains an assistant tool-call turn without reasoning_content, but this model requires every such turn to pass reasoning back to the API. The upstream may not have returned reasoning for that turn, or the history came from a different model.` : looksLikeHistoryReplay ? ` This usually happens when the dialog history contains tool_calls or reasoning produced by a different model/provider (e.g. after /switch); the new provider rejects that history. Start a fresh dialog, or clean the offending history.` : "";
   return `${RUN_UNAVAILABLE_PREFIX} (${ctx.where} returned HTTP ${ctx.status}, the provider rejected the request body \u2014 this is NOT a local credential/config issue). Detail: ${ctx.message}${cause} ${NO_FALLBACK} Use --server to run on the server explicitly, or start a fresh dialog.
 `;
 }
-var RATE_LIMIT_RESET_HINT_RE = /retry[-_\s]?after\s*[:=]?\s*\d[\w:-]*|resets?\s+(?:in|at)\s+\d[\w:-]*(?:[ T]\d[\w:-]*)?/i;
+var RESET_HINT_UNIT = String.raw`(?:d(?:ays?)?|h(?:ours?|rs?)?|m(?:in(?:ute)?s?)?|s(?:ec(?:ond)?s?)?)`;
+var RESET_HINT_DURATION = String.raw`\d+(?:\.\d+)?(?:\s*${RESET_HINT_UNIT})?(?:\s*\d+(?:\.\d+)?\s*${RESET_HINT_UNIT})*`;
+var RATE_LIMIT_RESET_HINT_RE = new RegExp(
+  String.raw`retry[-_\s]?after\s*[:=]?\s*\d[\w:.-]*` + String.raw`|resets?\s+at\s+\d[\w:.-]*` + String.raw`|resets?\s+in\s+${RESET_HINT_DURATION}`,
+  "i"
+);
+function findRateLimitResetHint(message) {
+  const match = RATE_LIMIT_RESET_HINT_RE.exec(message);
+  if (!match) return void 0;
+  const end = match.index + match[0].length;
+  if (/^[a-z:-]/i.test(message[end] ?? "")) return void 0;
+  return { raw: match[0], text: match[0].trim(), index: match.index };
+}
 function extractRateLimitResetHint(message) {
-  const match = message.match(RATE_LIMIT_RESET_HINT_RE);
-  return match ? match[0].trim() : void 0;
+  return findRateLimitResetHint(message)?.text;
+}
+function isStandaloneResetSentence(text, index) {
+  const before = text.slice(0, index).replace(/\s+$/, "");
+  return before === "" || /[.。!！?？;；]$/.test(before);
+}
+var RATE_LIMIT_DETAIL_MAX_CHARS = 140;
+var UPSTREAM_TAG_MAX_CHARS = 64;
+function findJsonObjectEnd(text, from) {
+  const open = text[from];
+  if (open !== "{" && open !== "[") return -1;
+  const close = open === "{" ? "}" : "]";
+  let depth = 0;
+  let inString = false;
+  let escaped = false;
+  for (let i = from; i < text.length; i += 1) {
+    const ch = text[i];
+    if (inString) {
+      if (escaped) escaped = false;
+      else if (ch === "\\") escaped = true;
+      else if (ch === '"') inString = false;
+      continue;
+    }
+    if (ch === '"') inString = true;
+    else if (ch === open) depth += 1;
+    else if (ch === close) {
+      depth -= 1;
+      if (depth === 0) return i + 1;
+    }
+  }
+  return -1;
+}
+function stripRateLimitDetailsArray(message) {
+  const KEY = "details=";
+  let out = message;
+  let searchFrom = 0;
+  for (; ; ) {
+    const keyIndex = out.indexOf(KEY, searchFrom);
+    if (keyIndex === -1) return out;
+    let openIndex = keyIndex + KEY.length;
+    while (openIndex < out.length && /\s/.test(out[openIndex])) openIndex += 1;
+    if (out[openIndex] !== "[") {
+      searchFrom = keyIndex + KEY.length;
+      continue;
+    }
+    const endIndex = findJsonObjectEnd(out, openIndex);
+    if (endIndex === -1) return out;
+    out = `${out.slice(0, keyIndex)} ${out.slice(endIndex)}`;
+    searchFrom = keyIndex;
+  }
+}
+function stripRateLimitTransportPrefix(message) {
+  let out = message.trim();
+  const localPrefix = /^local(?:\s+\S+)?\s+provider failed:\s*/i.exec(out);
+  if (localPrefix) {
+    out = out.slice(localPrefix[0].length);
+  } else {
+    const proxyPrefix = /^server chat proxy[^:]*:\s*/i.exec(out);
+    if (proxyPrefix) out = out.slice(proxyPrefix[0].length);
+  }
+  return out.replace(/^HTTP\s+\d{3}\b[\s:,-]*/i, "").trim();
+}
+function describeUpstreamTag(ctx) {
+  const source = stripZeroWidthChars(ctx.message);
+  const clean2 = (value) => {
+    if (value === void 0) return void 0;
+    const normalized = stripControlChars(value).replace(/\s+/g, " ").trim();
+    if (!normalized) return void 0;
+    return normalized.length > UPSTREAM_TAG_MAX_CHARS ? `${normalized.slice(0, UPSTREAM_TAG_MAX_CHARS - 1).trimEnd()}\u2026` : normalized;
+  };
+  const provider = clean2(/^local\s+(\S+)\s+provider failed/i.exec(source)?.[1]);
+  const model = clean2(/"model"\s*:\s*"([^"]+)"/.exec(source)?.[1]);
+  const parts = [provider, model].filter((part) => Boolean(part));
+  return parts.length > 0 ? parts.join(" \xB7 ") : ctx.where;
+}
+function sanitizeRateLimitDetail(message, stripResetSentence) {
+  const withoutNoise = stripRateLimitTransportPrefix(
+    // 控制字符（ESC 清屏 / 光标移动）是 provider 可控文本，先剥再进用户文案。
+    stripControlChars(stripRateLimitDetailsArray(stripDebugNoise(message)))
+  );
+  const collapse = (text) => text.replace(/\s+/g, " ").replace(/([.。!！?？])\s+(?=[.。!！?？])/g, "").replace(/([.。!！?？])\1+/g, "$1").replace(/[\s,;:，；：]+$/, "").trim();
+  const hint = stripResetSentence ? findRateLimitResetHint(withoutNoise) : void 0;
+  const stripped = hint && isStandaloneResetSentence(withoutNoise, hint.index) ? `${withoutNoise.slice(0, hint.index)} ${withoutNoise.slice(hint.index + hint.raw.length)}` : withoutNoise;
+  const detail = collapse(stripped) || collapse(withoutNoise);
+  return detail.length > RATE_LIMIT_DETAIL_MAX_CHARS ? `${detail.slice(0, RATE_LIMIT_DETAIL_MAX_CHARS - 1).trimEnd()}\u2026` : detail;
+}
+function formatCooldownUntilLocal(iso, now = /* @__PURE__ */ new Date()) {
+  const at = new Date(iso);
+  if (Number.isNaN(at.getTime())) return iso;
+  const pad = (value) => String(value).padStart(2, "0");
+  const time = `${pad(at.getHours())}:${pad(at.getMinutes())}`;
+  const sameDay = at.getFullYear() === now.getFullYear() && at.getMonth() === now.getMonth() && at.getDate() === now.getDate();
+  return sameDay ? time : `${pad(at.getMonth() + 1)}-${pad(at.getDate())} ${time}`;
+}
+var RESET_HINT_VALUE_RE = /^(?:resets?\s+(?:in|at)\s*|retry[-_\s]?after\s*[:=]?\s*(?:in\s+)?)(.*)$/i;
+var RESET_HINT_DURATION_RE = /^(?:(\d+)\s*d(?:ays?)?)?\s*(?:(\d+)\s*h(?:ours?|rs?)?)?\s*(?:(\d+)\s*m(?:in(?:ute)?s?)?)?\s*(?:(\d+)\s*s(?:ec(?:ond)?s?)?)?$/i;
+var RESET_HINT_ABSOLUTE_RE = /^\d{4}-\d{2}-\d{2}[T ]\d{2}:\d{2}/;
+var RESET_HINT_IN_BRANCH_RE = /^resets?\s+in\b/i;
+var RESET_HINT_UNIT_IN_VALUE_RE = new RegExp(String.raw`\d\s*${RESET_HINT_UNIT}`, "i");
+function parseResetHintSeconds(value) {
+  if (/^\d+$/.test(value)) return Number(value);
+  const match = RESET_HINT_DURATION_RE.exec(value);
+  if (!match || !match.slice(1).some(Boolean)) return void 0;
+  const [days, hours, minutes, seconds] = match.slice(1).map((part) => Number(part ?? 0));
+  return days * 86400 + hours * 3600 + minutes * 60 + seconds;
+}
+function formatRateLimitResetHint(hint, locale) {
+  const value = (RESET_HINT_VALUE_RE.exec(hint.trim())?.[1] ?? hint).trim();
+  if (!value) return void 0;
+  if (RESET_HINT_IN_BRANCH_RE.test(hint.trim()) && !RESET_HINT_UNIT_IN_VALUE_RE.test(value)) {
+    return void 0;
+  }
+  if (RESET_HINT_ABSOLUTE_RE.test(value)) return formatCooldownUntilLocal(value);
+  const seconds = parseResetHintSeconds(value);
+  if (seconds === void 0) return value;
+  const minutes = Math.round(seconds / 60);
+  const zh = locale === "zh";
+  if (minutes < 1) return zh ? "<1 \u5206\u949F" : "<1m";
+  const days = Math.floor(minutes / 1440);
+  const hours = Math.floor(minutes % 1440 / 60);
+  const rest = minutes % 60;
+  const parts = [];
+  if (days > 0) parts.push(zh ? `${days} \u5929` : `${days}d`);
+  if (hours > 0) parts.push(zh ? `${hours} \u5C0F\u65F6` : `${hours}h`);
+  if (rest > 0) parts.push(zh ? `${rest} \u5206` : `${rest}m`);
+  return parts.join(" ");
 }
 function buildRateLimitFailure(ctx) {
-  const cooldownNote = ctx.cooldownUntil ? ` \u5DF2\u6807\u8BB0\u51B7\u5374\u81F3 ${ctx.cooldownUntil}\uFF0C\u5230\u671F\u524D\u6D3E\u53D1\u4F1A\u88AB\u51B7\u5374\u95E8\u63A7\u62E6\u622A\uFF08\u5230\u671F\u81EA\u52A8 probe \u6062\u590D\uFF09\u3002` : "";
-  const headline = ctx.statusInferred ? `${ctx.where} hit an upstream rate-limit/quota error` : `${ctx.where} returned HTTP ${ctx.status}, rate limited`;
-  const cause = ctx.quotaExhausted ? "The upstream quota/balance for this agent is exhausted \u2014 NOT a local credential/config issue" : "This agent is being throttled by the upstream provider \u2014 NOT a local credential/config issue";
-  const reset = extractRateLimitResetHint(ctx.message);
-  const advice = ctx.quotaExhausted ? `Retry after the upstream quota resets${reset ? ` (${reset})` : ""}` : `Retry shortly${reset ? ` (${reset})` : ""}`;
-  return `${RUN_UNAVAILABLE_PREFIX} (${headline}). Detail: ${ctx.message} ${NO_FALLBACK} ${cause}. ${advice}, switch to another agent (\`nolo agent list\`), ${SERVER_FALLBACK_HINT}${cooldownNote}
+  const headlineKey = ctx.quotaExhausted ? "localRunRateLimitQuota" : "localRunRateLimitThrottled";
+  const lines = [
+    t(
+      headlineKey,
+      describeUpstreamTag(ctx),
+      sanitizeRateLimitDetail(ctx.message, Boolean(ctx.cooldownUntil))
+    )
+  ];
+  const cooldownUntil = ctx.cooldownUntil;
+  if (cooldownUntil) {
+    const resetValue = formatRateLimitResetHint(
+      extractRateLimitResetHint(ctx.message) ?? "",
+      getCliLocale()
+    );
+    lines.push(
+      t(
+        "localRunRateLimitCooldown",
+        formatCooldownUntilLocal(cooldownUntil),
+        resetValue ? t("localRunRateLimitResetNote", resetValue) : "",
+        String(Math.round(PROBE_INTERVAL_MS / 6e4))
+      )
+    );
+  }
+  lines.push(t("localRunRateLimitExits"));
+  return `${lines.join("\n")}
+`;
+}
+var BALANCE_DETAIL_MAX_CHARS = RATE_LIMIT_DETAIL_MAX_CHARS;
+function stripEmbeddedErrorJson(message) {
+  const KEY = '{"error"';
+  let out = message;
+  let searchFrom = 0;
+  for (; ; ) {
+    const keyIndex = out.indexOf(KEY, searchFrom);
+    if (keyIndex === -1) return out;
+    const endIndex = findJsonObjectEnd(out, keyIndex);
+    if (endIndex === -1) return out;
+    out = `${out.slice(0, keyIndex)} ${out.slice(endIndex)}`;
+    searchFrom = keyIndex;
+  }
+}
+function sanitizeBalanceDetail(message) {
+  const withoutNoise = stripEmbeddedErrorJson(stripDebugNoise(message));
+  const detail = stripControlChars(
+    stripZeroWidthChars(stripRateLimitTransportPrefix(withoutNoise))
+  ).replace(/(\d{3})\[/g, "$1 [").replace(/\s+/g, " ").replace(/([.。!！?？])\s+(?=[.。!！?？])/g, "").replace(/([.。!！?？])\1+/g, "$1").replace(/[\s,;:，；：]+$/, "").trim();
+  return detail.length > BALANCE_DETAIL_MAX_CHARS ? `${detail.slice(0, BALANCE_DETAIL_MAX_CHARS - 1).trimEnd()}\u2026` : detail;
+}
+function extractBalanceErrorMarker(message) {
+  const bodyStart = message.indexOf('{"error"');
+  const body = bodyStart === -1 ? message : message.slice(bodyStart);
+  const match = /"(?:code|type|status)"\s*:\s*"([^"\\]{1,60})"/.exec(body);
+  const marker = match?.[1].trim();
+  return marker ? marker : void 0;
+}
+function extractBalanceResetAt(message) {
+  const text = stripZeroWidthChars(message);
+  const iso = /"reset_at"\s*:\s*"([^"]+)"/.exec(text)?.[1];
+  if (iso) {
+    const at2 = new Date(iso.trim());
+    return Number.isNaN(at2.getTime()) ? void 0 : at2.getTime();
+  }
+  const epoch = /"reset_at"\s*:\s*(\d{9,16})/.exec(text)?.[1];
+  if (!epoch) return void 0;
+  const value = Number(epoch);
+  if (!Number.isFinite(value)) return void 0;
+  const at = new Date(value >= 1e12 ? value : value * 1e3);
+  return Number.isNaN(at.getTime()) ? void 0 : at.getTime();
+}
+function buildBalanceFailure(ctx) {
+  const normalized = stripZeroWidthChars(ctx.message);
+  const balanceDetails = parseEmbeddedBalanceDetails(normalized);
+  const reason = balanceDetails ? t("balanceInsufficientReason", balanceDetails.required, balanceDetails.current) : sanitizeBalanceDetail(extractEmbeddedErrorMessage(normalized) ?? ctx.message) || extractBalanceErrorMarker(normalized) || t("localRunBalanceUnknownReason");
+  const lines = [
+    t(
+      CODING_PLAN_EXHAUSTED_RE.test(normalized) ? "localRunBalanceCodingPlan" : "localRunBalanceExhausted",
+      describeUpstreamTag(ctx),
+      reason
+    )
+  ];
+  const resetAt = extractBalanceResetAt(normalized);
+  if (resetAt !== void 0 && resetAt > Date.now()) {
+    lines.push(
+      t(
+        "localRunBalanceReset",
+        formatCooldownUntilLocal(new Date(resetAt).toISOString())
+      )
+    );
+  }
+  lines.push(t("localRunBalanceExits"));
+  return `${lines.join("\n")}
 `;
 }
 function buildTransientFailure(ctx) {
-  return `${RUN_UNAVAILABLE_PREFIX} (${ctx.where} returned HTTP ${ctx.status}; this is an upstream/gateway issue, not your local credential or config). Detail: ${ctx.message} ${NO_FALLBACK} Retry shortly, ${SERVER_FALLBACK_HINT}.
+  return `${RUN_UNAVAILABLE_PREFIX} (${ctx.where} returned HTTP ${ctx.status}; this is an upstream/gateway issue, not your local credential or config). Detail: ${ctx.message} ${NO_FALLBACK} Retry shortly, ${SERVER_FALLBACK_HINT}
 `;
 }
 function buildUpstreamFailure(ctx) {
   const fix = ctx.where === "server chat proxy" ? `Check the agent's provider/api-key settings on nolo.chat` : `Check the agent's endpoint/model settings`;
-  return `${RUN_UNAVAILABLE_PREFIX} (${ctx.where} returned HTTP ${ctx.status}). Detail: ${ctx.message} ${NO_FALLBACK} ${fix}, ${SERVER_FALLBACK_HINT}.
+  return `${RUN_UNAVAILABLE_PREFIX} (${ctx.where} returned HTTP ${ctx.status}). Detail: ${ctx.message} ${NO_FALLBACK} ${fix}, ${SERVER_FALLBACK_HINT}
 `;
 }
 function formatLocalTurnFailureLine(error) {
@@ -11137,6 +11872,17 @@ function formatLocalTurnFailureLine(error) {
     return `[nolo] ${t("llmRequestTimedOut", deadline)}
 `;
   }
+  const cls = classifyLocalRunError(message);
+  if (cls.kind === "rate-limit") {
+    const rawCooldownUntil = error && typeof error === "object" ? error.cooldownUntil : void 0;
+    return buildRateLimitFailure({
+      message,
+      where: "local provider",
+      status: cls.status,
+      ...cls.quotaExhausted ? { quotaExhausted: true } : {},
+      ...typeof rawCooldownUntil === "string" && rawCooldownUntil ? { cooldownUntil: rawCooldownUntil } : {}
+    });
+  }
   return `[nolo] Local agent run failed: ${message}
 `;
 }
@@ -11167,22 +11913,11 @@ function describeLocalRunFailure(message, rawError) {
     return `${RUN_UNAVAILABLE_PREFIX} \u670D\u52A1\u5668\u7D27\u5F20${shown !== "\u670D\u52A1\u5668\u7D27\u5F20" ? ` (${shown})` : ""} (PLATFORM_LLM_BUSY)${cleanedBusyDetail ? `: ${cleanedBusyDetail}` : ""}. ${NO_FALLBACK} \u5E73\u53F0\u6A21\u578B\u4E0A\u6E38\u7E41\u5FD9\uFF0C\u7A0D\u540E\u91CD\u8BD5\u6216\u6362\u4E2A\u6A21\u578B\u3002Retry shortly, ${SERVER_FALLBACK_HINT}
 `;
   }
-  if (/UPSTREAM_402|Insufficient Balance|余额不足|insufficient\s+balance/i.test(
-    message
-  )) {
-    const cleanedMessage = stripDebugNoise(message);
-    const fallback = cleanedMessage.replace(
-      /^[^:]*provider failed: HTTP \d{3}\s*/,
-      ""
-    );
-    const balanceDetails = parseEmbeddedBalanceDetails(cleanedMessage);
-    const shownMessage = balanceDetails ? t(
-      "balanceInsufficientReason",
-      balanceDetails.required,
-      balanceDetails.current
-    ) : extractEmbeddedErrorMessage(cleanedMessage) ?? fallback;
-    return `[nolo] ${shownMessage}
-`;
+  if (matchesBalanceError(message)) {
+    return buildBalanceFailure({
+      message,
+      where: PLATFORM_TRANSPORT_RE.test(message) ? "server chat proxy" : "local provider"
+    });
   }
   if (/maximum context length/i.test(message)) {
     const details = parseContextLengthDetails(message);
@@ -11192,31 +11927,39 @@ function describeLocalRunFailure(message, rawError) {
   }
   if (isCliAuthorityBrokerTimeoutError(rawError) || /CLI authority broker .* timed out/i.test(message)) {
     const cleaned = stripDebugNoise(message);
-    return `${RUN_UNAVAILABLE_PREFIX} (${cleaned}). ${NO_FALLBACK} The local authority broker timed out and did not respond in time (an existing broker process may be unresponsive). Check the local broker process or retry, ${SERVER_FALLBACK_HINT}.
+    return `${RUN_UNAVAILABLE_PREFIX} (${cleaned}). ${NO_FALLBACK} The local authority broker timed out and did not respond in time (an existing broker process may be unresponsive). Check the local broker process or retry, ${SERVER_FALLBACK_HINT}
 `;
   }
   if (/CLI authority broker could not attach or take ownership/i.test(message)) {
     const cleaned = stripDebugNoise(message);
-    return `${RUN_UNAVAILABLE_PREFIX} (${cleaned}). ${NO_FALLBACK} The local runtime could not attach to an existing broker or take database ownership. Check running broker processes holding the local authority store or retry, ${SERVER_FALLBACK_HINT}.
+    if (/EADDRINUSE/i.test(message)) {
+      return `${RUN_UNAVAILABLE_PREFIX} (${cleaned}). ${NO_FALLBACK} Use --server to run on the server explicitly.
+`;
+    }
+    return `${RUN_UNAVAILABLE_PREFIX} (${cleaned}). ${NO_FALLBACK} The local runtime could not attach to an existing broker or take database ownership. Check running broker processes holding the local authority store or retry, ${SERVER_FALLBACK_HINT}
 `;
   }
   if (isCliAuthorityBrokerUnavailableError(rawError) || /CLI authority broker unavailable at/i.test(message)) {
     const cleaned = stripDebugNoise(message);
-    return `${RUN_UNAVAILABLE_PREFIX} (${cleaned}). ${NO_FALLBACK} The local authority broker is unavailable. Start or restart the local authority broker and retry, ${SERVER_FALLBACK_HINT}.
+    return `${RUN_UNAVAILABLE_PREFIX} (${cleaned}). ${NO_FALLBACK} The local authority broker is unavailable. Start or restart the local authority broker and retry, ${SERVER_FALLBACK_HINT}
 `;
   }
   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}.
+    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}
 `;
   }
   const cls = classifyLocalRunError(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}
+`;
+    }
     if (isTransientFetchError(message)) {
       return `${RUN_UNAVAILABLE_PREFIX} (${message}). ${NO_FALLBACK} The upstream connection dropped mid-request (transient network/gateway issue \u2014 not a local credential or config problem). Send again (or say "continue") to retry in the same conversation.
 `;
     }
-    return `${RUN_UNAVAILABLE_PREFIX} (${message}). ${NO_FALLBACK} Fix the local credential/config and retry, ${SERVER_FALLBACK_HINT}.
+    return `${RUN_UNAVAILABLE_PREFIX} (${message}). ${NO_FALLBACK} Fix the local credential/config and retry, ${SERVER_FALLBACK_HINT}
 `;
   }
   const cooldownUntil = rawError && typeof rawError === "object" ? rawError.cooldownUntil : void 0;
@@ -11224,7 +11967,6 @@ function describeLocalRunFailure(message, rawError) {
     message,
     where: cls.transport === "platform" ? "server chat proxy" : "local provider",
     status: cls.status,
-    ...cls.statusInferred ? { statusInferred: true } : {},
     ...cls.quotaExhausted ? { quotaExhausted: true } : {},
     ...cooldownUntil ? { cooldownUntil } : {},
     ...credentialAccountId ? { credentialAccountId } : {}
@@ -11321,8 +12063,10 @@ async function runHttpAgentTurn(options, authToken) {
       ...options.dialogAgentMode ? { dialogAgentMode: options.dialogAgentMode } : {},
       ...subjectRefs ? { subjectRefs } : {},
       ...blockedToolNames !== void 0 ? { blockedToolNames } : {},
-      ...allowedToolNames !== void 0 ? { allowedToolNames } : {}
+      ...allowedToolNames !== void 0 ? { allowedToolNames } : {},
+      ...options.runtimeToolPolicyOverride ? { runtimeToolPolicyOverride: options.runtimeToolPolicyOverride } : {}
     },
+    ...options.strictContinueHistory ? { strictContinueHistory: true } : {},
     ...options.continueDialogId ? { continueDialogId: options.continueDialogId } : {},
     ...options.spaceId ? { spaceId: options.spaceId } : {},
     ...options.category ? { category: options.category } : {},
@@ -11330,6 +12074,7 @@ async function runHttpAgentTurn(options, authToken) {
     ...options.parentDialogId ? { parentDialogId: options.parentDialogId } : {},
     ...options.background ? { background: true } : {},
     ...options.ephemeral ? { ephemeral: true } : {},
+    ...options.runtimeKey ? { runtimeKey: options.runtimeKey } : {},
     ...typeof options.timeoutMs === "number" ? { timeoutMs: options.timeoutMs } : {},
     ...options.modelOverride ? { runtimeOptions: { quickChatModelOverride: options.modelOverride } } : {},
     ...serverContextBlockScopes ? { contextBlockScopes: serverContextBlockScopes } : {},
@@ -11440,15 +12185,24 @@ ${options.agentName} > (no text response)
   const turnCredits = platformCreditsFromUsage(
     data?.usage
   );
-  return {
+  const serverResult = {
     exitCode: 0,
     ...typeof data?.dialogId === "string" && data.dialogId ? { dialogId: data.dialogId } : {},
+    // 结论载体与 local 路径同契约（server 模式 / 本地配置缺失时的兜底通道）：
+    // 结算点只认 result.finalText，HTTP 派发不给就等于这批 run 没有结论载体，
+    // status 里既无 lastAssistantText 也无 resultFile。content 已在上面算好。
+    ...content ? { finalText: content } : {},
     turnTokens: buildTurnTokenUsage(
       data?.usage,
       typeof data?.model === "string" ? data.model : options.agentKey
     ),
     ...turnCredits !== void 0 ? { turnCredits } : {}
   };
+  recordRunResultHeaderMeta(serverResult, {
+    model: typeof data?.model === "string" ? data.model : void 0,
+    dialogServer: serverOriginForDialog(options.serverUrl)
+  });
+  return serverResult;
 }
 async function runInjectedLocalAgentTurn(options) {
   return runLocalAgentTurnForCli(options, { reportFailure: true });
@@ -11459,8 +12213,40 @@ async function refreshMissingLocalAgentConfig(options) {
   const agentConfig = await adapter.loadAgentConfig(options.agentKey);
   return Boolean(agentConfig);
 }
+async function releaseAdapterSandboxWorkload(adapter) {
+  const release = adapter?.releaseLocalSandboxWorkload;
+  if (typeof release !== "function") return;
+  try {
+    await release.call(adapter);
+  } catch {
+  }
+}
 async function runLocalAgentTurnForCli(options, settings) {
   const resolvedBaseAdapter = resolveLocalRuntimeAdapter(options);
+  try {
+    if (options.runtimeKey) {
+      const prepare = resolvedBaseAdapter?.prepareLocalRuntimeWorkload;
+      if (typeof prepare === "function") {
+        try {
+          await prepare.call(resolvedBaseAdapter);
+        } catch (error) {
+          const message = error instanceof Error ? error.message : String(error);
+          options.output.write(`[nolo] ${message}
+`);
+          return { exitCode: 1, localError: error };
+        }
+      }
+    }
+    return await runLocalAgentTurnForCliWithAdapter(
+      options,
+      settings,
+      resolvedBaseAdapter
+    );
+  } finally {
+    await releaseAdapterSandboxWorkload(resolvedBaseAdapter);
+  }
+}
+async function runLocalAgentTurnForCliWithAdapter(options, settings, resolvedBaseAdapter) {
   const baseAdapter = (() => {
     let adapter2 = resolvedBaseAdapter && options.modelOverride ? wrapLoadAgentConfigWithModelOverride(
       resolvedBaseAdapter,
@@ -11483,15 +12269,17 @@ async function runLocalAgentTurnForCli(options, settings) {
   const blockedToolNames = options.blockedToolNames?.filter(
     (name) => name.trim()
   );
-  const runtimeContext = subjectRefs || allowedToolNames !== void 0 || blockedToolNames !== void 0 || options.parentWakeOnTerminal || options.dialogAgentMode ? {
+  const runtimeContext = subjectRefs || allowedToolNames !== void 0 || blockedToolNames !== void 0 || options.runtimeToolPolicyOverride || options.parentWakeOnTerminal || options.dialogAgentMode ? {
     ...subjectRefs ? { subjectRefs } : {},
     ...options.dialogAgentMode ? { dialogAgentMode: options.dialogAgentMode } : {},
     ...allowedToolNames !== void 0 ? { allowedToolNames } : {},
     ...blockedToolNames !== void 0 ? { blockedToolNames } : {},
+    ...options.runtimeToolPolicyOverride ? { runtimeToolPolicyOverride: options.runtimeToolPolicyOverride } : {},
     ...options.parentWakeOnTerminal ? { parentWakeOnTerminal: true } : {},
     ...options.parentDialogId ? { parentThreadId: options.parentDialogId } : {}
   } : void 0;
   const currentDialogId = options.continueDialogId ?? ulid2();
+  const freshDialog = options.freshDialog ?? !options.continueDialogId;
   const turnId = `turn-${ulid2()}`;
   const runtimeContextWithOwnership = {
     ...runtimeContext ?? {},
@@ -11507,26 +12295,44 @@ async function runLocalAgentTurnForCli(options, settings) {
   });
   turnOutput.spinner.start();
   try {
+    const localAttachmentPaths = (options.localAttachmentPaths ?? []).filter(
+      (p) => typeof p === "string" && p.trim().length > 0
+    );
+    const { cardText: localAttachmentCard, parts: localAttachmentParts } = buildLocalAttachments({
+      paths: localAttachmentPaths,
+      machineId: localAttachmentPaths.length > 0 ? await resolveCurrentMachineId(options) : void 0,
+      ...options.localRuntimeCwd ? { workspaceRoot: options.localRuntimeCwd } : {}
+    });
+    const messageForLocal = appendAttachmentCard(options.message, localAttachmentCard);
+    const durableAttachmentParts = ENABLE_REMOTE_ATTACHMENT_PART_WRITES ? localAttachmentParts : [];
+    const hasDurableAttachments = durableAttachmentParts.length > 0;
     const runLocalAgentTurn = await loadRunLocalAgentTurn();
     const result = await runLocalAgentTurn({
       adapter,
       agentRef: options.agentKey,
       userLanguage: options.userLanguage ?? options.env.NOLO_LANG ?? null,
-      input: buildUserInputContent(options.message, options.imageUrls),
-      ...expandedMessage !== options.message ? {
-        persistedInput: buildUserInputContent(
+      input: buildUserInputContent(messageForLocal, options.imageUrls),
+      ...expandedMessage !== options.message || localAttachmentCard !== "" ? {
+        persistedInput: hasDurableAttachments ? buildUserInputContent(
           expandedMessage,
+          options.imageUrls,
+          durableAttachmentParts
+        ) : buildUserInputContent(
+          appendAttachmentCard(expandedMessage, localAttachmentCard),
           options.imageUrls
         ),
-        persistedInputReference: buildUserInputContent(
+        persistedInputReference: hasDurableAttachments ? buildUserInputContent(
           options.message,
-          options.imageUrls
-        )
+          options.imageUrls,
+          durableAttachmentParts
+        ) : buildUserInputContent(messageForLocal, options.imageUrls)
       } : {},
       ...options.pastedTextStore ? {
         contextReferenceResolver: (reference) => canResolveCollapsedPasteReference(options.pastedTextStore, reference)
       } : {},
       continueDialogId: currentDialogId,
+      ...options.strictContinueHistory ? { strictContinueHistory: true } : {},
+      ...freshDialog ? { freshDialog: true } : {},
       fileWriteSessionId: currentDialogId,
       fileWriteGateEnabled: resolveFileWriteGateEnabled(options.env),
       spaceId: options.spaceId,
@@ -11585,9 +12391,10 @@ async function runLocalAgentTurnForCli(options, settings) {
     });
     turnOutput.finish(result.content);
     const turnCredits = sumPlatformCredits(result.usageRecords);
-    return {
+    const turnResult = {
       exitCode: 0,
       dialogId: result.dialogId,
+      ...typeof result.content === "string" && result.content.trim() ? { finalText: result.content } : {},
       title: result.title,
       ...result.titlePatchPromise ? { titlePatchPromise: result.titlePatchPromise } : {},
       ...pickEmptyAssistantFlags(result),
@@ -11599,6 +12406,17 @@ async function runLocalAgentTurnForCli(options, settings) {
       ...turnCredits !== void 0 ? { turnCredits } : {},
       ...result.usageRecords?.length ? { usageRecords: result.usageRecords } : {}
     };
+    const serverMeta = resolveResultServerMeta({
+      env: options.env ?? {},
+      userId: resolveLocalUserId(options.env ?? {}),
+      hasSubjectRefs: (buildSubjectRefs(options)?.length ?? 0) > 0
+    });
+    recordRunResultHeaderMeta(turnResult, {
+      model: result.model,
+      dialogServer: serverMeta.server,
+      serverSync: serverMeta.serverSync
+    });
+    return turnResult;
   } catch (error) {
     turnOutput.spinner.stop();
     turnOutput.cancel({
@@ -11633,12 +12451,6 @@ async function runLocalAgentTurnForCli(options, settings) {
       } else {
         options.output.write(failureLine);
       }
-      if (cooldownUntil) {
-        options.output.write(
-          `[nolo] \u5DF2\u6807\u8BB0\u51B7\u5374\u81F3 ${cooldownUntil}\uFF0C\u5230\u671F\u524D\u6D3E\u53D1\u8BE5 agent \u4F1A\u88AB\u51B7\u5374\u95E8\u63A7\u62E6\u622A\u3002
-`
-        );
-      }
     }
     return {
       exitCode: 1,
@@ -11650,6 +12462,7 @@ async function runLocalAgentTurnForCli(options, settings) {
   }
 }
 async function checkLocalAvailabilityBeforeHttpDispatch(options) {
+  if (options.runtimeKey && !isDockerRuntimeKey(options.runtimeKey)) return null;
   const adapter = resolveLocalRuntimeAdapter(options);
   if (!adapter || typeof adapter.loadAgentConfig !== "function") return null;
   let config;
@@ -11688,14 +12501,19 @@ async function checkLocalAvailabilityBeforeHttpDispatch(options) {
   }
   if (gateDecision !== "blocked") return { credentialKey };
   options.output.write(
-    `[nolo] Agent ${options.agentName || options.agentKey} is temporarily unavailable (429 cooldown) until ${new Date(Number(effectiveNextAvailableAt)).toISOString()}.
-Dispatch aborted before reaching the server. Pick another agent via listAgents, or retry after the cooldown.
+    `${t(
+      "agentCooldownBlocked",
+      options.agentName || options.agentKey,
+      formatCooldownUntilLocal(
+        new Date(Number(effectiveNextAvailableAt)).toISOString()
+      )
+    )}
 `
   );
   return { exitCode: 1 };
 }
 function foldLocalResultForTui(localResult) {
-  return {
+  const folded = {
     exitCode: localResult.exitCode,
     ...localResult.dialogId ? { dialogId: localResult.dialogId } : {},
     title: localResult.title,
@@ -11712,16 +12530,57 @@ function foldLocalResultForTui(localResult) {
     // 漏过 turnCredits（fix/tui-session-credits），usageRecords 是同坑位新字段。
     ...localResult.usageRecords?.length ? { usageRecords: localResult.usageRecords } : {},
     ...localResult.streamInterrupted ? { streamInterrupted: localResult.streamInterrupted } : {},
-    ...localResult.pendingToolName ? { pendingToolName: localResult.pendingToolName } : {}
+    ...localResult.pendingToolName ? { pendingToolName: localResult.pendingToolName } : {},
+    // 结论正文必须随行：auto→local 是本函数的唯一出口（runAgentTurn 的两处
+    // 成功分支都 return foldLocalResultForTui(...)），漏掉它 = 默认派发路径
+    // 上 finalText 永远到不了结算点 → agentRunCommand 的 settleRunTerminal-
+    // Authoritatively 拿不到 lastAssistantText → `.result.md` 不写、status 无
+    // resultFile，编排者只能去啃带 ANSI 的 .log（同坑位历史：turnCredits）。
+    ...localResult.finalText ? { finalText: localResult.finalText } : {}
   };
+  const headerMeta = getRunResultHeaderMeta(localResult);
+  recordRunResultHeaderMeta(folded, headerMeta);
+  return folded;
 }
 async function runAgentTurn(options) {
   const authToken = resolveAuthToken2(options.env);
-  const runtimeMode = resolveRequestedRuntimeMode(options);
+  const requestedRuntimeMode = resolveRequestedRuntimeMode(options);
+  if (options.requireRemoteDispatch && requestedRuntimeMode === "local") {
+    options.output.write(MACHINE_SHELL_LOCAL_REFUSAL_MESSAGE);
+    return { exitCode: 1 };
+  }
+  const runtimeMode = options.requireRemoteDispatch ? "server" : requestedRuntimeMode;
   if (runtimeMode === "local") {
+    const runtimeKeyIsLocallyFulfillable = resolveCliLocalRuntimeKeyCapability(options.runtimeKey).fulfillableByCliLocal;
+    if (options.runtimeKey && !runtimeKeyIsLocallyFulfillable) {
+      options.output.write("[nolo] \u672C\u5730 run \u7531\u672C\u673A\u6C99\u76D2\u51B3\u5B9A\uFF0C\u4E0D\u652F\u6301\u6307\u5B9A\u4E91\u540E\u7AEF\n");
+      return { exitCode: 1 };
+    }
     return runInjectedLocalAgentTurn(options);
   }
-  if (runtimeMode === "auto" && shouldAttemptAutoLocal(options)) {
+  if (runtimeMode === "auto" && !options.runtimeKey && shouldAttemptAutoLocal(options)) {
+    const rawAdapter = resolveLocalRuntimeAdapter(options);
+    let config;
+    const invalidateConfig = () => {
+      config = void 0;
+    };
+    if (rawAdapter) {
+      options = {
+        ...options,
+        localRuntimeAdapter: {
+          ...rawAdapter,
+          loadAgentConfig: async (agentRef) => {
+            if (agentRef !== options.agentKey) {
+              return rawAdapter.loadAgentConfig(agentRef);
+            }
+            if (config) return config;
+            const loaded = await rawAdapter.loadAgentConfig(agentRef);
+            if (loaded) config = loaded;
+            return loaded;
+          }
+        }
+      };
+    }
     const skipLocal = await shouldSkipAutoLocalForServerPlatformTools(options);
     if (!skipLocal) {
       const localResult = await runLocalAgentTurnForCli(options, {
@@ -11730,6 +12589,7 @@ async function runAgentTurn(options) {
       if (localResult.exitCode === 0) {
         return foldLocalResultForTui(localResult);
       }
+      invalidateConfig();
       if (isMissingLocalAgentConfigError(localResult.localError, options.agentKey)) {
         options.output.write(
           `[nolo] Local agent config was missing; refreshing local config and retrying local once.
@@ -11744,8 +12604,10 @@ async function runAgentTurn(options) {
             if (retriedLocalResult.exitCode === 0) {
               return foldLocalResultForTui(retriedLocalResult);
             }
+            invalidateConfig();
           }
         } catch {
+          invalidateConfig();
         }
       }
       const localErrorMessage = localResult.localError ? toErrorMessage(localResult.localError) : "local runtime failed";
@@ -11783,23 +12645,204 @@ async function runAgentTurn(options) {
   return httpResult;
 }
 
+// packages/cli/client/terminalProgramStatus.ts
+var TERMINAL_PROGRAM_STATUS_APP = "nolo";
+var KNOWN_STATES = /* @__PURE__ */ new Set([
+  "idle",
+  "working",
+  "blocked",
+  "done",
+  "error"
+]);
+var KNOWN_KINDS = /* @__PURE__ */ new Set([
+  "permission",
+  "question",
+  "auth"
+]);
+function encodeTerminalProgramStatus(report) {
+  const state2 = report?.state;
+  if (typeof state2 !== "string" || !KNOWN_STATES.has(state2)) return null;
+  const pairs = [`state=${state2}`, `app=${TERMINAL_PROGRAM_STATUS_APP}`];
+  if (state2 === "blocked" && typeof report.kind === "string" && KNOWN_KINDS.has(report.kind)) {
+    pairs.push(`kind=${report.kind}`);
+  }
+  return `\x1B]7501;${pairs.join(":")}\x1B\\`;
+}
+function emitTerminalProgramStatus(output, report) {
+  if (!output || typeof output.write !== "function") return false;
+  if (output.isTTY !== true) return false;
+  const sequence2 = encodeTerminalProgramStatus(report);
+  if (sequence2 === null) return false;
+  try {
+    output.write(sequence2);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+// packages/cli/client/terminalRunStatus.ts
+var FAILED_EMPTY_ASSISTANT_REASONS = /* @__PURE__ */ new Set([
+  "length_truncated",
+  "stream_truncated",
+  "repetition_loop",
+  "stagnant_tool_calls"
+]);
+var isRunResultStalledOrTruncated = (result) => !result.emptyAssistantOutputUsable && FAILED_EMPTY_ASSISTANT_REASONS.has(result.emptyAssistantFallbackReason ?? "");
+function resolveTerminalProgramStatusState(input) {
+  if (input.interrupted) return "idle";
+  if (input.stalledOrTruncated || input.exitCode !== 0) return "error";
+  return "done";
+}
+
+// packages/cli/client/oneShotTerminalStatus.ts
+function resolveOneShotTerminalState(result) {
+  return resolveTerminalProgramStatusState({
+    exitCode: result.exitCode,
+    interrupted: result.streamInterrupted,
+    stalledOrTruncated: result.stalledOrTruncated
+  });
+}
+function createOneShotTerminalStatus(output) {
+  let last;
+  let terminal = false;
+  const report = (state2) => {
+    if (!output || terminal || last === state2) return;
+    last = state2;
+    if (state2 === "done" || state2 === "error") terminal = true;
+    emitTerminalProgramStatus(output, { state: state2 });
+  };
+  return {
+    working: () => report("working"),
+    settle: (result) => report(resolveOneShotTerminalState(result)),
+    fail: () => report("error")
+  };
+}
+
 // packages/cli/agentRunCommand.ts
 import * as nodeFs from "node:fs";
 
 // packages/cli/client/autoModelRouter.ts
 var CLI_AUTO_ROUTE_AGENT_KEY = BUILTIN_NOLO_AGENT_KEY;
 
-// packages/agent-runtime/agentsMd.ts
+// packages/agent-runtime/hostEnvironment.ts
 import { existsSync, readFileSync } from "node:fs";
+import os from "node:os";
+function parseLinuxOsRelease(content) {
+  let prettyName;
+  let name;
+  let version;
+  for (const line of content.split("\n")) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#")) continue;
+    const eqIdx = trimmed.indexOf("=");
+    if (eqIdx === -1) continue;
+    const key = trimmed.slice(0, eqIdx).trim();
+    let val = trimmed.slice(eqIdx + 1).trim();
+    if (val.startsWith('"') && val.endsWith('"') || val.startsWith("'") && val.endsWith("'")) {
+      val = val.slice(1, -1);
+    }
+    if (key === "PRETTY_NAME") {
+      prettyName = val;
+    } else if (key === "NAME") {
+      name = val;
+    } else if (key === "VERSION") {
+      version = val;
+    }
+  }
+  if (prettyName) return prettyName;
+  if (name && version) return `${name} ${version}`;
+  return name;
+}
+function probeHostEnvironment(options) {
+  const platform = options?.platform ?? process.platform;
+  const arch = options?.arch ?? os.arch();
+  const release = options?.release ?? os.release();
+  const env = options?.env ?? process.env;
+  let osName = `${platform} ${release}`;
+  if (platform === "linux") {
+    let osReleaseText = options?.osReleaseContent;
+    if (osReleaseText === void 0) {
+      try {
+        if (existsSync("/etc/os-release")) {
+          osReleaseText = readFileSync("/etc/os-release", "utf8");
+        } else if (existsSync("/usr/lib/os-release")) {
+          osReleaseText = readFileSync("/usr/lib/os-release", "utf8");
+        }
+      } catch {
+      }
+    }
+    if (osReleaseText) {
+      const parsed = parseLinuxOsRelease(osReleaseText);
+      if (parsed) {
+        osName = parsed;
+      } else {
+        osName = `Linux ${release}`;
+      }
+    } else {
+      osName = `Linux ${release}`;
+    }
+  } else if (platform === "darwin") {
+    osName = `macOS (${release})`;
+  } else if (platform === "win32") {
+    osName = `Windows (${release})`;
+  }
+  const desktop = env.XDG_CURRENT_DESKTOP || env.XDG_SESSION_DESKTOP || env.DESKTOP_SESSION || void 0;
+  const sessionType = env.XDG_SESSION_TYPE || void 0;
+  const shell = env.SHELL || (platform === "win32" ? env.COMSPEC || "PowerShell" : void 0);
+  return {
+    platform,
+    osName,
+    arch,
+    desktop,
+    sessionType,
+    shell
+  };
+}
+function formatHostEnvironmentContent(details) {
+  const lines = ["--- \u5BBF\u4E3B\u73AF\u5883\uFF08Host Environment\uFF09---"];
+  lines.push(`\u64CD\u4F5C\u7CFB\u7EDF: ${details.osName} (${details.arch})`);
+  if (details.desktop || details.sessionType) {
+    const desktopParts = [];
+    if (details.desktop) desktopParts.push(details.desktop);
+    if (details.sessionType) desktopParts.push(details.sessionType);
+    lines.push(`\u684C\u9762\u73AF\u5883: ${desktopParts.join(" / ")}`);
+  }
+  if (details.shell) {
+    lines.push(`\u9ED8\u8BA4 Shell: ${details.shell}`);
+  }
+  return lines.join("\n");
+}
+var cachedLayer = null;
+function buildHostEnvironmentLayer(options) {
+  if (!options && cachedLayer) {
+    return cachedLayer;
+  }
+  const details = probeHostEnvironment(options);
+  const content = formatHostEnvironmentContent(details);
+  const layer = {
+    id: "host-environment",
+    owner: "runtime",
+    cacheScope: "session",
+    content
+  };
+  if (!options) {
+    cachedLayer = layer;
+  }
+  return layer;
+}
+
+// packages/agent-runtime/agentsMd.ts
+import { existsSync as existsSync2, readFileSync as readFileSync2 } from "node:fs";
 import { join } from "node:path";
 var AGENTS_MD_MAX_BYTES = 8192;
 var AGENTS_MD_CANDIDATES = ["AGENTS.md", "CLAUDE.md"];
 function readAgentsMdLayerFromDisk(cwd) {
   for (const name of AGENTS_MD_CANDIDATES) {
     const filePath = join(cwd, name);
-    if (!existsSync(filePath)) continue;
+    if (!existsSync2(filePath)) continue;
     try {
-      let content = readFileSync(filePath, "utf8").trim();
+      let content = readFileSync2(filePath, "utf8").trim();
       if (!content) continue;
       if (Buffer.byteLength(content, "utf8") > AGENTS_MD_MAX_BYTES) {
         content = Buffer.from(content, "utf8").subarray(0, AGENTS_MD_MAX_BYTES).toString("utf8") + "\n\n<!-- AGENTS.md truncated -->";
@@ -11869,14 +12912,14 @@ function runDoDCommands(commands, cwd, deps = {}) {
 }
 
 // packages/cli/agentRunPrompts.ts
-import { existsSync as existsSync2, readFileSync as readFileSync2, readdirSync, statSync } from "node:fs";
+import { existsSync as existsSync3, readFileSync as readFileSync3, readdirSync, statSync as statSync2 } from "node:fs";
 import { dirname, extname, isAbsolute, join as join2, relative as relativePath, resolve, 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 = resolve(cwd, normalized);
-    if (existsSync2(directPath)) return directPath;
+    if (existsSync3(directPath)) return directPath;
   }
   const fileName = normalized.replace(/[^a-zA-Z0-9一-鿿]+/g, "-").replace(/^-+|-+$/g, "");
   return resolve(cwd, "docs", "workflows", `${fileName}.md`);
@@ -11889,21 +12932,21 @@ function skillRefToCandidatePath(cwd, ref) {
   if (!normalized) return "";
   if (normalized.endsWith(".md") || normalized.includes("/") || normalized.includes("\\")) {
     const directPath = resolve(cwd, normalized);
-    if (existsSync2(directPath)) return directPath;
+    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 = resolve(cwd, dir, fileName, "SKILL.md");
-    if (existsSync2(skillMdPath)) return skillMdPath;
+    if (existsSync3(skillMdPath)) return skillMdPath;
   }
   return resolve(cwd, ".agents", "skills", fileName, "SKILL.md");
 }
 async function resolveWorkflowReference(ref, cwd = process.cwd()) {
-  const path = workflowRefToCandidatePath(cwd, ref);
-  if (!path || !existsSync2(path)) {
+  const path2 = workflowRefToCandidatePath(cwd, ref);
+  if (!path2 || !existsSync3(path2)) {
     throw new Error(`Workflow reference not found: ${ref}`);
   }
-  const markdown = readFileSync2(path, "utf8");
+  const markdown = readFileSync3(path2, "utf8");
   const parsed = parseSkillDocProtocol(markdown);
   return {
     ref,
@@ -11920,8 +12963,8 @@ function inlineRelativeRefs(body, skillDir) {
     const absPath = resolve(skillDir, cleaned);
     const relative = relativePath(normalizedSkillDir, absPath);
     if (relative.startsWith("..") || isAbsolute(relative)) return match;
-    if (!existsSync2(absPath) || !absPath.endsWith(".md")) return match;
-    const refContent = readFileSync2(absPath, "utf8");
+    if (!existsSync3(absPath) || !absPath.endsWith(".md")) return match;
+    const refContent = readFileSync3(absPath, "utf8");
     return `
 
 ### ${label}
@@ -11933,7 +12976,7 @@ ${refContent}
 }
 function listSkillScripts(skillDir) {
   const scriptsDir = join2(skillDir, "scripts");
-  if (!existsSync2(scriptsDir) || !statSync(scriptsDir).isDirectory()) return null;
+  if (!existsSync3(scriptsDir) || !statSync2(scriptsDir).isDirectory()) return null;
   const entries = readdirSync(scriptsDir).filter((e) => !e.startsWith("."));
   if (entries.length === 0) return null;
   return [
@@ -11959,13 +13002,13 @@ async function resolveSkillReference(ref, options = {}) {
     markdown = String(contentText);
   } else {
     const cwd = options.cwd ?? process.cwd();
-    const path = skillRefToCandidatePath(cwd, ref);
-    if (!path || !existsSync2(path)) {
+    const path2 = skillRefToCandidatePath(cwd, ref);
+    if (!path2 || !existsSync3(path2)) {
       throw new Error(`Skill reference not found: ${ref}`);
     }
-    markdown = readFileSync2(path, "utf8");
-    filePath = path;
-    skillDir = dirname(path);
+    markdown = readFileSync3(path2, "utf8");
+    filePath = path2;
+    skillDir = dirname(path2);
   }
   const parsed = parseSkillDocProtocol(markdown);
   const name = parsed.meta?.skillConfig?.name;
@@ -12068,12 +13111,12 @@ function prependSubjectDialogMarker(message, subjectDialogKey) {
 function normalizeCliImageInput(input) {
   if (/^(https?:|data:|file:)/i.test(input)) return input;
   const absolutePath = resolve(input);
-  if (!existsSync2(absolutePath)) return input;
-  const base64 = readFileSync2(absolutePath).toString("base64");
+  if (!existsSync3(absolutePath)) return input;
+  const base64 = readFileSync3(absolutePath).toString("base64");
   return `data:${imageMimeTypeForPath(absolutePath)};base64,${base64}`;
 }
-function imageMimeTypeForPath(path) {
-  switch (extname(path).toLowerCase()) {
+function imageMimeTypeForPath(path2) {
+  switch (extname(path2).toLowerCase()) {
     case ".jpg":
     case ".jpeg":
       return "image/jpeg";
@@ -12495,8 +13538,8 @@ var scoreMemoryItem = (item, query, nowMs = Date.now(), context) => {
   const confidence = item.confidence ?? 0;
   const typeFit = typeFitScore(item);
   const understanding = understandingScore(item);
-  const path = pathScore(item, context);
-  return 0.25 * queryMatch + 0.2 * identifierMatch + 0.2 * path + 0.09 * retrieval + // weak retrieval signal, NOT successful-use reinforcement
+  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) => {
@@ -12512,75 +13555,52 @@ var rankMemoryCandidates = (items, query, context) => {
   });
 };
 
-// packages/ai/memory/vnext/store.ts
-var enc = (value) => encodeURIComponent(value).replace(/-/g, "%2D");
-var rangeOf = (prefix) => ({ gte: prefix, lte: `${prefix}\uFFFF` });
-var entityKey = (ownerId, id) => `mem2-e-${enc(ownerId)}-${enc(id)}`;
-var entityOwnerPrefix = (ownerId) => `mem2-e-${enc(ownerId)}-`;
-var stateKey = (ownerId, id) => `mem2-s-${enc(ownerId)}-${enc(id)}`;
-var stateEntityIndexKey = (ownerId, entityId, stateId) => `mem2-si-${enc(ownerId)}-${enc(entityId)}-${enc(stateId)}`;
-var stateEntityIndexPrefix = (ownerId, entityId) => `mem2-si-${enc(ownerId)}-${enc(entityId)}-`;
-var evidenceKey = (ownerId, id) => `mem2-v-${enc(ownerId)}-${enc(id)}`;
-var relationKey = (ownerId, id) => `mem2-r-${enc(ownerId)}-${enc(id)}`;
-var relationFromIndexKey = (ownerId, from, relationId) => `mem2-rf-${enc(ownerId)}-${enc(from)}-${enc(relationId)}`;
-var relationToIndexKey = (ownerId, to, relationId) => `mem2-rt-${enc(ownerId)}-${enc(to)}-${enc(relationId)}`;
-var readIndexed = async (db, prefix) => {
-  const refs = [];
-  for await (const [, value] of db.iterator({ ...rangeOf(prefix), reverse: false })) {
-    if (typeof value?.key === "string") refs.push(value.key);
-  }
-  const rows = await Promise.all(refs.map((key) => db.get(key).catch(() => null)));
-  return rows.filter((row) => !!row);
-};
-var getMemoryEntityVNext = async (db, ownerId, entityId) => db.get(entityKey(ownerId, entityId)).catch(() => null);
-var listMemoryEntitiesVNext = async (db, ownerId) => {
-  const rows = [];
-  for await (const [, value] of db.iterator({
-    ...rangeOf(entityOwnerPrefix(ownerId)),
-    reverse: false
-  })) {
-    if (value) rows.push(value);
-  }
-  return rows;
-};
-var loadMemoryVNextCatalog = async (db, ownerId) => {
-  const entities = await listMemoryEntitiesVNext(db, ownerId);
-  const states = (await Promise.all(entities.map((entity) => listMemoryStatesForEntityVNext(db, ownerId, entity.id)))).flat();
-  return { entities, states };
-};
-var getMemoryStateVNext = async (db, ownerId, stateId) => db.get(stateKey(ownerId, stateId)).catch(() => null);
-var listMemoryStatesForEntityVNext = (db, ownerId, entityId) => readIndexed(db, stateEntityIndexPrefix(ownerId, entityId));
-var putMemoryEvidenceVNext = async (db, evidence) => {
-  await db.put(evidenceKey(evidence.ownerId, evidence.id), evidence);
-};
-var getMemoryEvidenceVNext = async (db, ownerId, evidenceId) => db.get(evidenceKey(ownerId, evidenceId)).catch(() => null);
-var getMemoryEvidenceVNextStrict = async (db, ownerId, evidenceId) => {
-  try {
-    return await db.get(evidenceKey(ownerId, evidenceId));
-  } catch (error) {
-    if (isLevelNotFoundError(error)) return null;
-    throw error;
-  }
-};
-var _appendEntityBatch = (batch, entity) => {
-  batch.put(entityKey(entity.ownerId, entity.id), entity);
-};
-var _appendEvidenceBatch = (batch, evidence) => {
-  batch.put(evidenceKey(evidence.ownerId, evidence.id), evidence);
-};
-var _appendStateBatch = (batch, state2) => {
-  const key = stateKey(state2.ownerId, state2.id);
-  batch.put(key, state2);
-  batch.put(stateEntityIndexKey(state2.ownerId, state2.entityId, state2.id), { key });
-};
-var _appendRetiredStateBatch = (batch, state2) => {
-  batch.put(stateKey(state2.ownerId, state2.id), state2);
-};
-var _appendRelationBatch = (batch, relation) => {
-  const key = relationKey(relation.ownerId, relation.id);
-  batch.put(key, relation);
-  batch.put(relationFromIndexKey(relation.ownerId, relation.from, relation.id), { key });
-  batch.put(relationToIndexKey(relation.ownerId, relation.to, relation.id), { key });
+// packages/ai/memory/vnext/detachedThrottle.ts
+var DEFAULT_DETACHED_MEMORY_COOLDOWN_MS = 10 * 60 * 1e3;
+var MAX_COOLDOWN_KEYS = 512;
+var readMsEnv = (raw, fallback, allowZero) => {
+  if (raw === void 0 || raw.trim() === "") return fallback;
+  const parsed = Number(raw);
+  if (!Number.isFinite(parsed) || parsed < 0) return fallback;
+  if (parsed === 0 && !allowZero) return fallback;
+  return parsed;
+};
+var createDetachedThrottle = (input) => {
+  let inFlight2 = false;
+  const lastStartedAt = /* @__PURE__ */ new Map();
+  const resolveCooldownMs = (env = typeof process !== "undefined" ? process.env : {}) => readMsEnv(env[input.cooldownEnvKey], input.defaultCooldownMs, true);
+  const rememberStart = (key, clockMs) => {
+    lastStartedAt.delete(key);
+    lastStartedAt.set(key, clockMs);
+    while (lastStartedAt.size > MAX_COOLDOWN_KEYS) {
+      lastStartedAt.delete(lastStartedAt.keys().next().value);
+    }
+  };
+  return {
+    name: input.name,
+    defaultCooldownMs: input.defaultCooldownMs,
+    cooldownEnvKey: input.cooldownEnvKey,
+    resolveCooldownMs,
+    tryAcquire(key, clockMs, cooldownMs) {
+      if (inFlight2) return "busy";
+      const interval = cooldownMs ?? resolveCooldownMs();
+      const lastStarted = lastStartedAt.get(key);
+      if (interval > 0 && lastStarted !== void 0 && clockMs - lastStarted < interval) {
+        return "cooldown";
+      }
+      inFlight2 = true;
+      rememberStart(key, clockMs);
+      return "run";
+    },
+    release() {
+      inFlight2 = false;
+    },
+    isInFlight: () => inFlight2,
+    reset() {
+      inFlight2 = false;
+      lastStartedAt.clear();
+    }
+  };
 };
 
 // packages/ai/memory/vnext/recall.ts
@@ -12743,6 +13763,20 @@ var buildLegacyMemoryEvidence = (item) => {
 // packages/ai/memory/vnext/shadowRead.ts
 var SHADOW_TIMEOUT_MS = 2e4;
 var ERROR_MESSAGE_MAX = 120;
+var MEMORY_VNEXT_SHADOW_READ_COOLDOWN_ENV = "NOLO_MEMORY_VNEXT_SHADOW_READ_COOLDOWN_MS";
+var DEFAULT_SHADOW_READ_COOLDOWN_MS = DEFAULT_DETACHED_MEMORY_COOLDOWN_MS;
+var shadowReadThrottle = createDetachedThrottle({
+  name: "shadow_read",
+  defaultCooldownMs: DEFAULT_SHADOW_READ_COOLDOWN_MS,
+  cooldownEnvKey: MEMORY_VNEXT_SHADOW_READ_COOLDOWN_ENV
+});
+var resolveShadowReadCooldownMs = (env) => shadowReadThrottle.resolveCooldownMs(env);
+var shadowReadThrottleKey = (owners) => owners.map(
+  (owner) => resolveLegacyMemoryPrincipal({
+    ownerType: owner.ownerType,
+    ownerId: owner.ownerId
+  }).principalId
+).sort().join("
");
 var normalizeTextKey = (text) => text.trim().replace(/\s+/g, " ").toLowerCase();
 var legacyItemKeys = (item) => {
   const keys = [normalizeTextKey(item.content ?? "")];
@@ -12779,14 +13813,35 @@ var withTimeout = async (promise, timeoutMs, label) => {
 };
 var runMemoryVNextShadowRead = async (input) => {
   const now = input.ctx.now ?? (() => performance.now());
-  const defaultEmit = (observation2) => {
+  const defaultEmit = (observation) => {
     const payload = {
       event: "memory_vnext_shadow_read",
-      ...observation2
+      ...observation
     };
     console.info("[memory] vnext shadow read", payload);
   };
   const emit = input.emit ?? defaultEmit;
+  const throttle = shadowReadThrottle.tryAcquire(
+    shadowReadThrottleKey(input.ctx.owners),
+    now(),
+    input.ctx.cooldownMs ?? resolveShadowReadCooldownMs()
+  );
+  if (throttle !== "run") {
+    const skippedObservation = {
+      legacyHitCount: input.legacyItems.length,
+      vnextHitCount: 0,
+      overlapCount: null,
+      legacyOnlyCount: null,
+      vnextOnlyCount: null,
+      legacyLatencyMs: input.legacyLatencyMs,
+      vnextLatencyMs: 0,
+      legacyContextChars: input.legacyContextChars,
+      vnextContextChars: 0,
+      skipped: throttle === "busy" ? "skipped_busy" : "skipped_cooldown"
+    };
+    emit(skippedObservation);
+    return skippedObservation;
+  }
   const legacyKeys = new Set(
     input.legacyItems.flatMap((item) => legacyItemKeys(item))
   );
@@ -12823,31 +13878,35 @@ var runMemoryVNextShadowRead = async (input) => {
   } catch (error) {
     vnextError = shortError(error);
   }
-  const vnextLatencyMs = Math.round((now() - vnextStartedAt) * 10) / 10;
-  let overlapCount = null;
-  let legacyOnlyCount = null;
-  let vnextOnlyCount = null;
-  if (!vnextError) {
-    let overlap = 0;
-    for (const key of vnextKeys) if (legacyKeys.has(key)) overlap += 1;
-    overlapCount = overlap;
-    legacyOnlyCount = Math.max(0, legacyKeys.size - overlap);
-    vnextOnlyCount = Math.max(0, vnextKeys.size - overlap);
-  }
-  const observation = {
-    legacyHitCount: input.legacyItems.length,
-    vnextHitCount,
-    overlapCount,
-    legacyOnlyCount,
-    vnextOnlyCount,
-    legacyLatencyMs: input.legacyLatencyMs,
-    vnextLatencyMs,
-    legacyContextChars: input.legacyContextChars,
-    vnextContextChars: vnextChars,
-    ...vnextError ? { vnextError } : {}
-  };
-  emit(observation);
-  return observation;
+  try {
+    const vnextLatencyMs = Math.round((now() - vnextStartedAt) * 10) / 10;
+    let overlapCount = null;
+    let legacyOnlyCount = null;
+    let vnextOnlyCount = null;
+    if (!vnextError) {
+      let overlap = 0;
+      for (const key of vnextKeys) if (legacyKeys.has(key)) overlap += 1;
+      overlapCount = overlap;
+      legacyOnlyCount = Math.max(0, legacyKeys.size - overlap);
+      vnextOnlyCount = Math.max(0, vnextKeys.size - overlap);
+    }
+    const observation = {
+      legacyHitCount: input.legacyItems.length,
+      vnextHitCount,
+      overlapCount,
+      legacyOnlyCount,
+      vnextOnlyCount,
+      legacyLatencyMs: input.legacyLatencyMs,
+      vnextLatencyMs,
+      legacyContextChars: input.legacyContextChars,
+      vnextContextChars: vnextChars,
+      ...vnextError ? { vnextError } : {}
+    };
+    emit(observation);
+    return observation;
+  } finally {
+    shadowReadThrottle.release();
+  }
 };
 var isMemoryVNextShadowReadEnabled = (env = typeof process !== "undefined" ? process.env : {}) => env.NOLO_MEMORY_VNEXT_SHADOW_READ === "1" || env.NOLO_MEMORY_VNEXT_SHADOW_READ === "true";
 
@@ -13507,6 +14566,31 @@ var shortError2 = (error) => {
   const message = error instanceof Error ? `${error.name}: ${error.message}` : String(error);
   return message.length > ERROR_MESSAGE_MAX2 ? `${message.slice(0, ERROR_MESSAGE_MAX2)}\u2026` : message;
 };
+var DEFAULT_LAZY_PROMOTION_COOLDOWN_MS = DEFAULT_DETACHED_MEMORY_COOLDOWN_MS;
+var DEFAULT_LAZY_PROMOTION_TIMEOUT_MS = 2e4;
+var MEMORY_VNEXT_LAZY_PROMOTION_COOLDOWN_ENV = "NOLO_MEMORY_VNEXT_LAZY_PROMOTION_COOLDOWN_MS";
+var MEMORY_VNEXT_LAZY_PROMOTION_TIMEOUT_ENV = "NOLO_MEMORY_VNEXT_LAZY_PROMOTION_TIMEOUT_MS";
+var promotionThrottle = createDetachedThrottle({
+  name: "lazy_promotion",
+  defaultCooldownMs: DEFAULT_LAZY_PROMOTION_COOLDOWN_MS,
+  cooldownEnvKey: MEMORY_VNEXT_LAZY_PROMOTION_COOLDOWN_ENV
+});
+var resolveLazyPromotionTimeoutMs = (env = typeof process !== "undefined" ? process.env : {}) => readMsEnv(
+  env[MEMORY_VNEXT_LAZY_PROMOTION_TIMEOUT_ENV],
+  DEFAULT_LAZY_PROMOTION_TIMEOUT_MS,
+  false
+);
+var withTimeout2 = async (promise, timeoutMs, label) => {
+  let timer;
+  const timeout = new Promise((_, reject) => {
+    timer = setTimeout(() => reject(new Error(label)), timeoutMs);
+  });
+  try {
+    return await Promise.race([promise, timeout]);
+  } finally {
+    if (timer) clearTimeout(timer);
+  }
+};
 var loadExistingContext = async (db, ownerId) => {
   const { entities, states } = await loadMemoryVNextCatalog(db, ownerId);
   return { entityIds: entities.map((entity) => entity.id), states };
@@ -13610,6 +14694,17 @@ var runMemoryVNextLazyPromotion = async (input) => {
   if (inFlight.has(flightKey)) {
     return finish({ status: "in_flight" });
   }
+  const throttle = promotionThrottle.tryAcquire(
+    deterministicEvidence.ownerId,
+    clock(),
+    input.cooldownMs
+  );
+  if (throttle === "busy") {
+    return finish({ status: "skipped_busy" });
+  }
+  if (throttle === "cooldown") {
+    return finish({ status: "skipped_cooldown" });
+  }
   inFlight.add(flightKey);
   try {
     const evidenceResult = await applyLegacyMemoryEvidence(input.db, input.item);
@@ -13625,14 +14720,19 @@ var runMemoryVNextLazyPromotion = async (input) => {
     if (alreadyCovered) {
       return finish({ status: "already_covered" });
     }
-    const interpreted = await runLegacyMemoryMigrationShadow({
-      item: input.item,
-      provider: input.provider,
-      existing,
-      ...input.timeoutMs === void 0 ? {} : { timeoutMs: input.timeoutMs },
-      ...input.now === void 0 ? {} : { now: input.now },
-      ...input.nextId ? { nextId: input.nextId } : {}
-    });
+    const timeoutMs = input.timeoutMs ?? resolveLazyPromotionTimeoutMs();
+    const interpreted = await withTimeout2(
+      runLegacyMemoryMigrationShadow({
+        item: input.item,
+        provider: input.provider,
+        existing,
+        timeoutMs,
+        ...input.now === void 0 ? {} : { now: input.now },
+        ...input.nextId ? { nextId: input.nextId } : {}
+      }),
+      timeoutMs,
+      `memory vnext lazy promotion interpreter timed out after ${timeoutMs}ms`
+    );
     const semanticMutation = withoutImportedEvidence(interpreted.mutation, evidence.id);
     if (!hasWrites(semanticMutation)) {
       recordNoOpSuppression(
@@ -13648,6 +14748,7 @@ var runMemoryVNextLazyPromotion = async (input) => {
     return finish({ status: "error", error: shortError2(error) });
   } finally {
     inFlight.delete(flightKey);
+    promotionThrottle.release();
   }
 };
 var isMemoryVNextLazyPromotionEnabled = (env = typeof process !== "undefined" ? process.env : {}) => env.NOLO_MEMORY_VNEXT_LAZY_PROMOTION === "1" || env.NOLO_MEMORY_VNEXT_LAZY_PROMOTION === "true";
@@ -13733,9 +14834,9 @@ async function resolvePureVNextRuntime(input) {
     });
     const entityById = new Map(catalog.entities.map((e) => [e.id, e]));
     for (const hit of hits) {
-      const stateKey2 = `${hit.state.ownerId}\0${hit.state.id}`;
-      if (seenStateKeys.has(stateKey2)) continue;
-      seenStateKeys.add(stateKey2);
+      const stateKey = `${hit.state.ownerId}\0${hit.state.id}`;
+      if (seenStateKeys.has(stateKey)) continue;
+      seenStateKeys.add(stateKey);
       selectedItems.push(
         buildSynthesizedStateItem(hit.state, entityById.get(hit.state.entityId), owner.ownerType, owner.ownerId)
       );
@@ -14134,8 +15235,9 @@ function fingerprintFor(kind, detail) {
 function sanitizeFp(s) {
   return s.replace(/\s+/g, " ").slice(0, 80);
 }
-var queryRemoteMemory = async (serverUrl, authToken, agentKey, userInput, spaceId) => {
+var queryRemoteMemory = async (serverUrl, authToken, agentKey, userInput, spaceId, signal) => {
   try {
+    if (signal?.aborted) throw signal.reason ?? new DOMException("Aborted", "AbortError");
     const response = await fetch(`${serverUrl}/api/memory/query`, {
       method: "POST",
       headers: {
@@ -14147,7 +15249,7 @@ var queryRemoteMemory = async (serverUrl, authToken, agentKey, userInput, spaceI
         userInput,
         ...spaceId ? { spaceId } : {}
       }),
-      signal: AbortSignal.timeout(5e3)
+      signal: signal ? AbortSignal.any([signal, AbortSignal.timeout(5e3)]) : AbortSignal.timeout(5e3)
     });
     if (!response.ok) {
       logDeduped(
@@ -14161,6 +15263,7 @@ var queryRemoteMemory = async (serverUrl, authToken, agentKey, userInput, spaceI
     const block = typeof payload?.promptBlock === "string" ? payload.promptBlock.trim() : "";
     return block || null;
   } catch (error) {
+    if (signal?.aborted) throw error;
     logDeduped(
       "info",
       fingerprintFor("remote-failed", error instanceof Error ? error.name : void 0),
@@ -14184,17 +15287,21 @@ var queryLocalMemory = async (env, agentKey, userInput, spaceId) => {
   return resolution.promptBlock;
 };
 var resolveCliMemory = async (input) => {
+  if (input.signal?.aborted) throw input.signal.reason ?? new DOMException("Aborted", "AbortError");
   if (input.authToken && input.serverUrl) {
     const remoteBlock = await queryRemoteMemory(
       input.serverUrl,
       input.authToken,
       input.agentKey,
       input.userInput,
-      input.spaceId
+      input.spaceId,
+      input.signal
     );
     if (remoteBlock) return remoteBlock;
   }
+  if (input.signal?.aborted) throw input.signal.reason ?? new DOMException("Aborted", "AbortError");
   try {
+    if (input.signal?.aborted) throw input.signal.reason ?? new DOMException("Aborted", "AbortError");
     return await queryLocalMemory(
       input.env,
       input.agentKey,
@@ -14202,6 +15309,7 @@ var resolveCliMemory = async (input) => {
       input.spaceId
     );
   } catch (error) {
+    if (input.signal?.aborted) throw error;
     logDeduped(
       "warn",
       fingerprintFor("local-failed", error instanceof Error ? error.name : void 0),
@@ -14231,13 +15339,6 @@ function resolveRunOutcome(input) {
     }
   }
 }
-var FAILED_EMPTY_ASSISTANT_REASONS = /* @__PURE__ */ new Set([
-  "length_truncated",
-  "stream_truncated",
-  "repetition_loop",
-  "stagnant_tool_calls"
-]);
-var isRunResultStalledOrTruncated = (result) => !result.emptyAssistantOutputUsable && FAILED_EMPTY_ASSISTANT_REASONS.has(result.emptyAssistantFallbackReason ?? "");
 var resolveRunSettlementNote = (result) => {
   const reason = result.emptyAssistantFallbackReason;
   if (!reason || !FAILED_EMPTY_ASSISTANT_REASONS.has(reason)) return {};
@@ -14260,6 +15361,18 @@ async function resolveAgentRunAgentKey(args) {
   });
   return resolved?.agentKey;
 }
+var MACHINE_SHELL_REQUESTED_POLICY = { runtimeTools: ["execShell"] };
+async function resolveAgentBoundMachineIdFromRecord(args) {
+  const db = await getReadableCliDb(args.output);
+  const record = await resolveAgentRecordFromHybridStore({
+    agentInput: args.agentKey,
+    cliArgs: args.cliArgs,
+    env: args.env,
+    db,
+    fetchImpl: fetch
+  }).catch(() => null);
+  return resolveBoundMachineId(record) || void 0;
+}
 async function runAgentRunCommand(args, deps) {
   const env = deps.env ?? process.env;
   const output = deps.output ?? {
@@ -14270,7 +15383,14 @@ async function runAgentRunCommand(args, deps) {
     writeUsage(output, deps.commandPath);
     return 0;
   }
-  const parsed = parseAgentRunArgs(args, { commandPath: deps.commandPath });
+  let parsed;
+  try {
+    parsed = parseAgentRunArgs(args, { commandPath: deps.commandPath });
+  } catch (error) {
+    output.write(`[nolo] ${toErrorMessage(error)}
+`);
+    return 1;
+  }
   if (!parsed) {
     writeUsage(output, deps.commandPath);
     return 1;
@@ -14307,7 +15427,19 @@ async function runAgentRunCommand(args, deps) {
   const watchdogFailure = armStallWatchdog || armTimeoutWatchdog ? new Promise((_, reject) => {
     rejectOnWatchdogFailure = reject;
   }) : void 0;
-  const raceWithWatchdog = (work) => watchdogFailure ? Promise.race([work, watchdogFailure]) : work;
+  const terminalStatus = createOneShotTerminalStatus(
+    parsed.eventsMode || parsed.background || hasRegistry ? null : deps.output ? deps.output : {
+      write: (chunk) => process.stdout.write(chunk),
+      isTTY: process.stdout.isTTY === true
+    }
+  );
+  const raceWithWatchdog = (work) => {
+    const raced = watchdogFailure ? Promise.race([work, watchdogFailure]) : work;
+    return raced.catch((error) => {
+      terminalStatus.fail();
+      throw error;
+    });
+  };
   const exitFromWatchdog = (code) => {
     try {
       processExit(code);
@@ -14352,6 +15484,7 @@ async function runAgentRunCommand(args, deps) {
         const note = `stalled: no progress for ${stallTimeoutMs}ms`;
         output.write(`[nolo] local run ${note}
 `);
+        terminalStatus.fail();
         const outcome = resolveRunOutcome({ kind: "stall" });
         const currentActivity = activityTracker?.getActivity();
         await finalizeWatchdogOutcome(outcome, note, {
@@ -14370,6 +15503,7 @@ async function runAgentRunCommand(args, deps) {
       const note = `timed out after ${parsed.timeoutMs}ms`;
       output.write(`[nolo] local run ${note}
 `);
+      terminalStatus.fail();
       const outcome = resolveRunOutcome({ kind: "timeout" });
       await finalizeWatchdogOutcome(outcome, note);
       rejectOnWatchdogFailure?.(new Error(`[nolo] local run ${note}`));
@@ -14380,7 +15514,16 @@ async function runAgentRunCommand(args, deps) {
   const rawAgentInput = resolveRawAgentInput(args, deps.commandPath) ?? parsed.agentKey;
   const fullstackLocal = isFullstackCodingAgentRef(rawAgentInput, parsed.agentKey);
   const explicitLocalCli = isLocalCliAgentKey(parsed.agentKey);
-  const isLocalRun = parsed.runtimeMode === "local" || !parsed.runtimeMode && (fullstackLocal || explicitLocalCli || args.includes("--dangerously-allow-shell"));
+  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")) {
+    output.write(
+      "[nolo] runtimeKey=local \u4F1A\u5728**\u5BBF\u4E3B\u6587\u4EF6\u7CFB\u7EDF**\u4E0A\u6267\u884C\u5E76\u5199\u5165\uFF0C\u5FC5\u987B\u663E\u5F0F\u52A0 --allow-host-writes \u786E\u8BA4\uFF1B\u8981\u9694\u79BB\u6267\u884C\u8BF7\u7701\u7565 --runtime-key\uFF08\u9ED8\u8BA4\u8FDB docker \u6C99\u76D2\uFF09\u3002\n"
+    );
+    return 1;
+  }
+  const isLocalRun = (dockerRuntimeLocal || instaboxRuntimeLocal || hostRuntimeLocal || !parsed.runtimeKey) && (parsed.runtimeMode === "local" || hostRuntimeLocal || !parsed.runtimeMode && (fullstackLocal || explicitLocalCli || args.includes("--dangerously-allow-shell")));
   if (wantsFallbackSuggestions && !isLocalRun) {
     output.write("[nolo] --fallback-agent (suggestions) is only supported for local CLI runs (use --local)\n");
     return 1;
@@ -14391,13 +15534,47 @@ async function runAgentRunCommand(args, deps) {
 
 [Quota fallback context for agent decision: If this execution for ${parsed.agentKey} hits subscription quota, YOU (the agent) must decide the next agent to use. Do not rely on automatic wrapper. Reason based on the specific task (complexity, length, domain), agent strengths, cost, previous attempt results. Suggested alternatives: ${parsed.fallbackAgentKeys.join(", ")}. Update the task row with attempt history and dispatch the chosen next (via startAgentRun \u5F02\u6B65\u6D3E\u53D1)).]`;
   }
-  const resolvedAgentKey = parsed.runtimeMode !== "local" ? await (deps.resolveAgentRunAgentKey ?? resolveAgentRunAgentKey)({
+  const resolvedAgentKey = parsed.runtimeMode !== "local" && !hostRuntimeLocal ? await (deps.resolveAgentRunAgentKey ?? resolveAgentRunAgentKey)({
     agentInput: resolveRawAgentInput(args, deps.commandPath) ?? parsed.agentKey,
     cliArgs: args,
     env,
     output
   }).catch(() => void 0) : void 0;
   const agentKey = resolvedAgentKey ?? parsed.agentKey;
+  let machineShellOverride;
+  if (parsed.machineShell) {
+    const envRuntimeMode = env.NOLO_RUNTIME_MODE;
+    const requestedRuntimeMode = parsed.runtimeMode ? parsed.runtimeMode : envRuntimeMode === "local" || envRuntimeMode === "server" || envRuntimeMode === "auto" ? envRuntimeMode : void 0;
+    if (requestedRuntimeMode === "local") {
+      output.write(MACHINE_SHELL_LOCAL_REFUSAL_MESSAGE);
+      return 1;
+    }
+    const machineId = await (deps.resolveAgentBoundMachineId ?? resolveAgentBoundMachineIdFromRecord)({
+      agentKey,
+      cliArgs: args,
+      env,
+      output
+    }).catch(() => void 0);
+    if (!machineId) {
+      output.write(
+        `[nolo] --machine-shell requires ${agentKey} to be bound to a machine (runtimeBinding.machineId); none found.
+[nolo] bind it with \`nolo agent bind-current ${agentKey}\` on the target computer, then retry.
+`
+      );
+      return 1;
+    }
+    machineShellOverride = normalizeRuntimeToolPolicyOverride(
+      MACHINE_SHELL_REQUESTED_POLICY
+    );
+    const baselinePolicy = resolveEffectiveRuntimeToolPolicy({
+      agentConfig: { runtimeToolPolicy: machineShellOverride },
+      host: "web"
+    });
+    output.write(
+      `[nolo] machine-shell: dispatch=server(required) machine=${machineId} runtimeTools=${(machineShellOverride?.runtimeTools ?? []).join(",") || "-"} sandbox=${baselinePolicy?.isolation?.mode ?? "-"} approval=${baselinePolicy?.shell?.commandPolicy ?? "-"} networkPolicy=${baselinePolicy?.shell?.networkPolicy ?? "-"} policySource=web-runtime-safety-baseline
+`
+    );
+  }
   let effectiveAgentKey = agentKey;
   let modelOverride = null;
   const autoRouteRequested = deps.commandPath?.join(" ") === "chat" && !parsed.continueDialogId && (args.includes("--auto-route") || env.NOLO_AUTO_ROUTE === "1") && env.NOLO_AUTO_ROUTE !== "0";
@@ -14415,13 +15592,12 @@ async function runAgentRunCommand(args, deps) {
     }
     if (hasExplicitAgent && !modelOverride) {
       output.write(
-        "[nolo] auto-route: \u8986\u76D6\u6E90 agent \u8BFB\u53D6\u5931\u8D25\uFF0C\u6309\u539F\u6837\u76F4\u8DD1\u6240\u9009 agent\u3002\n"
+        t("agentRun.autoRouteOverrideFailed")
       );
     } else {
       effectiveAgentKey = CLI_AUTO_ROUTE_AGENT_KEY;
       if (modelOverride) {
-        output.write(`[nolo] auto-route: model \u5C42\u8986\u76D6\u4E3A ${agentKey}
-`);
+        output.write(t("agentRun.autoRouteModelOverride", agentKey));
       }
     }
   }
@@ -14477,7 +15653,7 @@ async function runAgentRunCommand(args, deps) {
     }
   }
   let localRuntimeCwd = parsed.cwd;
-  if (!localRuntimeCwd && parsed.runtimeMode === "local") {
+  if (!localRuntimeCwd && (parsed.runtimeMode === "local" || hostRuntimeLocal)) {
     localRuntimeCwd = process.cwd();
   }
   const runEnv = buildLocalRunEnv({
@@ -14504,7 +15680,8 @@ async function runAgentRunCommand(args, deps) {
         spawn: deps.spawn,
         fs: deps.fs,
         now: deps.now,
-        generateRunId: deps.generateRunId
+        generateRunId: deps.generateRunId,
+        shellApprovalHost: deps.shellApprovalHost
       }
     );
     output.write(`[nolo] runId=${runId}
@@ -14533,6 +15710,7 @@ async function runAgentRunCommand(args, deps) {
     if (agentsMdLayer) scopedLayers.push(agentsMdLayer);
     skillContentBlocks.push(...buildSkillContextBlocks(skillReferences));
     scopedLayers.push(buildSkillDiscoveryContextLayer(cliCwd));
+    scopedLayers.push(buildHostEnvironmentLayer());
     if (!deps.memoryRecallDisabled) {
       try {
         memoryPromptBlock = await resolveCliMemory({
@@ -14561,6 +15739,14 @@ async function runAgentRunCommand(args, deps) {
     );
     extraContextBlocks.push(...contextBlockScopes.map((block) => block.content));
   }
+  const runRecordParentDialogId = !parsed.parentDialogId && typeof childRunId === "string" && childRunId.length > 0 ? asOptionalTrimmedString(
+    (deps.readRunRecord ?? readRunRecord)(childRunId, {
+      env,
+      homedir: deps.homedir,
+      fs: deps.fs
+    })?.parentDialogId
+  ) : void 0;
+  const effectiveParentDialogId = parsed.parentDialogId ?? runRecordParentDialogId;
   const formatTurnMessage = (msg) => prependWorkflowReferencePrompt(
     prependSubjectDialogMarker(
       prependFeatureWorktreeInstruction(
@@ -14571,239 +15757,263 @@ async function runAgentRunCommand(args, deps) {
     ),
     workflowReference
   );
-  const buildRunOptions = (targetAgentKey, turnMessage = effectiveMessage) => ({
-    agentName: targetAgentKey,
-    agentKey: targetAgentKey,
-    serverUrl: resolveServerUrl(env),
-    message: formatTurnMessage(turnMessage),
-    imageUrls: parsed.imageUrls.map(normalizeCliImageInput),
-    scriptDir: deps.scriptDir,
-    env: runEnv,
-    output,
-    ...deps.localRuntimeAdapterFactory ? { localRuntimeAdapterFactory: deps.localRuntimeAdapterFactory } : {},
-    ...localRuntimeCwd ? { localRuntimeCwd } : {},
-    ...parsed.runtimeMode ? { runtimeMode: parsed.runtimeMode } : {},
-    ...parsed.continueDialogId ? { continueDialogId: parsed.continueDialogId } : {},
-    ...parsed.spaceId ? { spaceId: parsed.spaceId } : {},
-    ...parsed.category ? { category: parsed.category } : {},
-    ...parsed.inheritedFromDialogKey ? { inheritedFromDialogKey: parsed.inheritedFromDialogKey } : {},
-    ...parsed.parentDialogId ? { parentDialogId: parsed.parentDialogId } : {},
-    ...parsed.parentWakeOnTerminal ? { parentWakeOnTerminal: true } : {},
-    ...parsed.subjectDialogKey ? { subjectDialogKey: parsed.subjectDialogKey } : {},
-    ...parsed.subjectRefs?.length ? { subjectRefs: parsed.subjectRefs } : {},
-    ...skillAllowedToolOverride !== void 0 ? { allowedToolNames: skillAllowedToolOverride } : parsed.allowedToolNames?.length ? { allowedToolNames: parsed.allowedToolNames } : {},
-    ...parsed.blockedToolNames?.length ? { blockedToolNames: parsed.blockedToolNames } : {},
-    ...activityTracker ? { onLoopEvent: activityTracker.onLoopEvent } : {},
-    background: parsed.background,
-    noStream: parsed.noStream,
-    ephemeral: parsed.ephemeral,
-    ...typeof parsed.timeoutMs === "number" ? { timeoutMs: parsed.timeoutMs } : {},
-    traceTools: parsed.traceTools,
-    ...parsed.eventsMode ? { eventsMode: parsed.eventsMode } : {},
-    ...parsed.taskEvidence ? { taskEvidence: parsed.taskEvidence } : {},
-    ...contextBlockScopes.length > 0 ? { contextBlockScopes } : extraContextBlocks.length > 0 ? { extraContextBlocks } : {}
-  });
-  let result = await raceWithWatchdog(
-    runner({
-      ...buildRunOptions(effectiveAgentKey),
-      ...modelOverride ? { modelOverride } : {}
-    })
-  );
-  clearWatchdogs();
-  let runCreditsTotal = result.turnCredits;
-  if (result.exitCode !== 0 && isQuotaExhaustedError(result.localError) && isLocalRun && parsed.fallbackAgentKeys && parsed.fallbackAgentKeys.length > 0) {
-    const fallbackAgentKey = parsed.fallbackAgentKeys[0];
-    output.write(
-      `[nolo] quota exhausted on ${agentKey}, falling back to ${fallbackAgentKey}
-`
-    );
-    const fallbackResult = await raceWithWatchdog(
+  const shellApprovalChild = process.connected && typeof process.send === "function" ? createShellApprovalChild(process) : void 0;
+  try {
+    const buildRunOptions = (targetAgentKey, turnMessage = effectiveMessage) => ({
+      ...shellApprovalChild ? { execShellApproval: targetAgentKey === agentKey ? shellApprovalChild.authority : {
+        request: async () => {
+          throw new Error("Shell approval agent binding mismatch");
+        },
+        consume: () => {
+          throw new Error("Shell approval agent binding mismatch");
+        }
+      } } : {},
+      agentName: targetAgentKey,
+      agentKey: targetAgentKey,
+      serverUrl: resolveServerUrl(env),
+      message: formatTurnMessage(turnMessage),
+      imageUrls: parsed.imageUrls.map(normalizeCliImageInput),
+      scriptDir: deps.scriptDir,
+      env: runEnv,
+      output,
+      ...deps.localRuntimeAdapterFactory ? { localRuntimeAdapterFactory: deps.localRuntimeAdapterFactory } : {},
+      ...localRuntimeCwd ? { localRuntimeCwd } : {},
+      // `--machine-shell` 强制锁定 server 派发：绑定校验通过后 runtimeMode 一律为
+      // "server"（+ requireRemoteDispatch 在派发层再兜一次），既不给 auto→local 早退
+      // 留口子，也不受 NOLO_RUNTIME_MODE=local 覆盖（resolveRequestedRuntimeMode 以
+      // options.runtimeMode 优先）。这是在唯一构造 runner 参数的入口做的，quota
+      // fallback / 重试等复用 buildRunOptions 的路径同样被锁住。
+      // 非 machine-shell 时保留本地通道判定：显式 runtimeMode 优先，其次
+      // docker/host 本地目标在本地 run 上回落 runtimeMode=local。
+      ...parsed.machineShell ? { runtimeMode: "server", requireRemoteDispatch: true } : parsed.runtimeMode ? { runtimeMode: parsed.runtimeMode } : (dockerRuntimeLocal || instaboxRuntimeLocal || hostRuntimeLocal) && isLocalRun ? { runtimeMode: "local" } : {},
+      // runtimeKey 与 machine-shell 的组合已在 parseAgentRunArgs 入口显式拒绝，
+      // 这里直接透传即可（不再静默丢弃参数）。
+      ...parsed.runtimeKey ? { runtimeKey: parsed.runtimeKey } : {},
+      ...parsed.continueDialogId ? { continueDialogId: parsed.continueDialogId } : {},
+      ...parsed.strictContinueHistory ? { strictContinueHistory: true } : {},
+      ...parsed.spaceId ? { spaceId: parsed.spaceId } : {},
+      ...parsed.category ? { category: parsed.category } : {},
+      ...parsed.inheritedFromDialogKey ? { inheritedFromDialogKey: parsed.inheritedFromDialogKey } : {},
+      ...effectiveParentDialogId ? { parentDialogId: effectiveParentDialogId } : {},
+      ...parsed.parentWakeOnTerminal ? { parentWakeOnTerminal: true } : {},
+      ...parsed.subjectDialogKey ? { subjectDialogKey: parsed.subjectDialogKey } : {},
+      ...parsed.subjectRefs?.length ? { subjectRefs: parsed.subjectRefs } : {},
+      ...skillAllowedToolOverride !== void 0 ? { allowedToolNames: skillAllowedToolOverride } : parsed.allowedToolNames?.length ? { allowedToolNames: parsed.allowedToolNames } : {},
+      ...parsed.blockedToolNames?.length ? { blockedToolNames: parsed.blockedToolNames } : {},
+      ...machineShellOverride ? { runtimeToolPolicyOverride: machineShellOverride } : {},
+      ...activityTracker ? { onLoopEvent: activityTracker.onLoopEvent } : {},
+      background: parsed.background,
+      noStream: parsed.noStream,
+      ephemeral: parsed.ephemeral,
+      ...typeof parsed.timeoutMs === "number" ? { timeoutMs: parsed.timeoutMs } : {},
+      traceTools: parsed.traceTools,
+      ...parsed.eventsMode ? { eventsMode: parsed.eventsMode } : {},
+      ...parsed.taskEvidence ? { taskEvidence: parsed.taskEvidence } : {},
+      ...contextBlockScopes.length > 0 ? { contextBlockScopes } : extraContextBlocks.length > 0 ? { extraContextBlocks } : {}
+    });
+    terminalStatus.working();
+    let result = await raceWithWatchdog(
       runner({
-        ...buildRunOptions(fallbackAgentKey),
-        ...result.dialogId ? { continueDialogId: result.dialogId } : {}
+        ...buildRunOptions(effectiveAgentKey),
+        ...modelOverride ? { modelOverride } : {}
       })
     );
     clearWatchdogs();
-    if (fallbackResult.exitCode === 0) {
-      result = fallbackResult;
-    }
-    if (fallbackResult.turnCredits !== void 0) {
-      runCreditsTotal = (runCreditsTotal ?? 0) + fallbackResult.turnCredits;
-    }
-    if (fallbackResult.exitCode !== 0) {
-      result = {
-        ...fallbackResult,
-        ...fallbackResult.dialogId || result.dialogId ? { dialogId: fallbackResult.dialogId ?? result.dialogId } : {}
-      };
+    let runCreditsTotal = result.turnCredits;
+    if (result.exitCode !== 0 && isQuotaExhaustedError(result.localError) && isLocalRun && parsed.fallbackAgentKeys && parsed.fallbackAgentKeys.length > 0) {
+      const fallbackAgentKey = parsed.fallbackAgentKeys[0];
       output.write(
-        `[nolo] fallback to ${fallbackAgentKey} also failed: ${fallbackResult.localError instanceof Error ? fallbackResult.localError.message : String(fallbackResult.localError ?? "unknown error")}
+        `[nolo] quota exhausted on ${agentKey}, falling back to ${fallbackAgentKey}
 `
       );
-    }
-  } else if (result.localError instanceof CliProviderQuotaError) {
-    output.write(`
+      const fallbackResult = await raceWithWatchdog(
+        runner({
+          ...buildRunOptions(fallbackAgentKey),
+          ...result.dialogId ? { continueDialogId: result.dialogId } : {}
+        })
+      );
+      clearWatchdogs();
+      if (fallbackResult.exitCode === 0) {
+        result = fallbackResult;
+      }
+      if (fallbackResult.turnCredits !== void 0) {
+        runCreditsTotal = (runCreditsTotal ?? 0) + fallbackResult.turnCredits;
+      }
+      if (fallbackResult.exitCode !== 0) {
+        result = {
+          ...fallbackResult,
+          ...fallbackResult.dialogId || result.dialogId ? { dialogId: fallbackResult.dialogId ?? result.dialogId } : {}
+        };
+        output.write(
+          `[nolo] fallback to ${fallbackAgentKey} also failed: ${fallbackResult.localError instanceof Error ? fallbackResult.localError.message : String(fallbackResult.localError ?? "unknown error")}
+`
+        );
+      }
+    } else if (result.localError instanceof CliProviderQuotaError) {
+      output.write(`
 [nolo] Quota limit hit for ${parsed.agentKey} (CliProviderQuotaError).
 `);
-    if (parsed.fallbackAgentKeys && parsed.fallbackAgentKeys.length > 0) {
-      output.write(`Suggested alternatives for your decision: ${parsed.fallbackAgentKeys.join(", ")}
+      if (parsed.fallbackAgentKeys && parsed.fallbackAgentKeys.length > 0) {
+        output.write(`Suggested alternatives for your decision: ${parsed.fallbackAgentKeys.join(", ")}
 `);
-    }
-    output.write(`As the orchestrating agent, decide next based on task and re-dispatch (update task state with this attempt).
-`);
-  }
-  const queueFilePath = parsed.queueFile ?? (childRunId ? resolveRunQueuePath(childRunId, env, deps.homedir) : void 0);
-  const queueFs = deps.fs ?? nodeFs;
-  if (queueFilePath && queueFs.existsSync(queueFilePath) && result.dialogId && result.exitCode === 0) {
-    const MAX_DRAIN_TURNS = 200;
-    let drainTurns = 0;
-    const popSingle = deps.popSingleQueueMessage ?? popSingleQueueMessage;
-    while (drainTurns < MAX_DRAIN_TURNS && queueFs.existsSync(queueFilePath)) {
-      const nextEntry = await popSingle(queueFilePath, deps);
-      if (!nextEntry) {
-        break;
       }
-      drainTurns += 1;
-      try {
-        const turnResult = await raceWithWatchdog(
-          runner({
-            ...buildRunOptions(effectiveAgentKey, nextEntry.text),
-            continueDialogId: result.dialogId,
-            ...modelOverride ? { modelOverride } : {}
-          })
-        );
-        clearWatchdogs();
-        result = turnResult;
-        if (turnResult.turnCredits !== void 0) {
-          runCreditsTotal = (runCreditsTotal ?? 0) + turnResult.turnCredits;
+      output.write(`As the orchestrating agent, decide next based on task and re-dispatch (update task state with this attempt).
+`);
+    }
+    const queueFilePath = parsed.queueFile ?? (childRunId ? resolveRunQueuePath(childRunId, env, deps.homedir) : void 0);
+    const queueFs = deps.fs ?? nodeFs;
+    if (queueFilePath && queueFs.existsSync(queueFilePath) && result.dialogId && result.exitCode === 0) {
+      const MAX_DRAIN_TURNS = 200;
+      let drainTurns = 0;
+      const popSingle = deps.popSingleQueueMessage ?? popSingleQueueMessage;
+      while (drainTurns < MAX_DRAIN_TURNS && queueFs.existsSync(queueFilePath)) {
+        const nextEntry = await popSingle(queueFilePath, deps);
+        if (!nextEntry) {
+          break;
         }
-        if (result.exitCode !== 0) {
+        drainTurns += 1;
+        try {
+          const turnResult = await raceWithWatchdog(
+            runner({
+              ...buildRunOptions(effectiveAgentKey, nextEntry.text),
+              continueDialogId: result.dialogId,
+              ...modelOverride ? { modelOverride } : {}
+            })
+          );
+          clearWatchdogs();
+          result = turnResult;
+          if (turnResult.turnCredits !== void 0) {
+            runCreditsTotal = (runCreditsTotal ?? 0) + turnResult.turnCredits;
+          }
+          if (result.exitCode !== 0) {
+            break;
+          }
+        } catch (drainError) {
+          clearWatchdogs();
+          console.error(`[nolo] queue turn failed with exception: ${toErrorMessage(drainError)}`);
+          result = {
+            ...result,
+            exitCode: 1,
+            localError: drainError
+          };
           break;
         }
-      } catch (drainError) {
-        clearWatchdogs();
-        console.error(`[nolo] queue turn failed with exception: ${toErrorMessage(drainError)}`);
-        result = {
-          ...result,
-          exitCode: 1,
-          localError: drainError
-        };
-        break;
+      }
+      if (drainTurns >= MAX_DRAIN_TURNS) {
+        console.error(
+          `[nolo] Warning: queue drain loop reached defensive limit of ${MAX_DRAIN_TURNS} turns, stopping.`
+        );
       }
     }
-    if (drainTurns >= MAX_DRAIN_TURNS) {
-      console.error(
-        `[nolo] Warning: queue drain loop reached defensive limit of ${MAX_DRAIN_TURNS} turns, stopping.`
-      );
-    }
-  }
-  if (result.dialogId) {
-    if (parsed.background) {
-      output.write(`
+    terminalStatus.settle({
+      exitCode: result.exitCode,
+      streamInterrupted: result.streamInterrupted,
+      stalledOrTruncated: isRunResultStalledOrTruncated(result)
+    });
+    if (result.dialogId) {
+      if (parsed.background) {
+        output.write(`
 [nolo] background dialog ${result.dialogId}
 `);
-      output.write(`[nolo] read: nolo dialog read ${result.dialogId}
+        output.write(`[nolo] read: nolo dialog read ${result.dialogId}
 `);
-    } else {
-      output.write(`
+      } else {
+        output.write(`
 [nolo] dialog ${result.dialogId}
 `);
+      }
     }
-  }
-  if (shouldPrintLocalRunSummary({ parsed, localRuntimeCwd })) {
-    try {
-      const inspect = deps.inspectLocalRunWorkspace ?? inspectLocalRunWorkspace;
-      const inspection = await inspect(localRuntimeCwd);
-      output.write(formatLocalRunSummary({
-        dialogId: result.dialogId,
-        inspection
-      }));
-    } catch (error) {
-      output.write(
-        `
+    if (shouldPrintLocalRunSummary({ parsed, localRuntimeCwd })) {
+      try {
+        const inspect = deps.inspectLocalRunWorkspace ?? inspectLocalRunWorkspace;
+        const inspection = await inspect(localRuntimeCwd);
+        output.write(formatLocalRunSummary({
+          dialogId: result.dialogId,
+          inspection
+        }));
+      } catch (error) {
+        output.write(
+          `
 [nolo] local run summary unavailable: ${toErrorMessage(error)}
 `
-      );
-    }
-  }
-  if (typeof childRunId === "string" && childRunId.length > 0) {
-    const childRecordForDoD = (deps.readRunRecord ?? readRunRecord)(childRunId, {
-      env,
-      homedir: deps.homedir,
-      fs: deps.fs
-    });
-    const isStalledOrTruncated = isRunResultStalledOrTruncated(result);
-    const truncationNote = resolveRunSettlementNote(result);
-    const outcome = resolveRunOutcome({
-      kind: "result",
-      exitCode: result.exitCode,
-      isStalledOrTruncated
-    });
-    let dodResults;
-    try {
-      dodResults = (deps.runDoDCommands ?? runDoDCommands)(
-        childRecordForDoD?.dodCommands,
-        childRecordForDoD?.cwd
-      );
-    } catch (dodError) {
-      console.warn(`[nolo] DoD verification failed to run for ${childRunId}:`, dodError);
-    }
-    let failureReason;
-    let toolCallCount;
-    if (outcome.status === "failed") {
-      if (result.emptyAssistantFallbackReason === "repetition_loop" || result.emptyAssistantFallbackReason === "stagnant_tool_calls") {
-        failureReason = "stalled";
-      } else if (result.localError && isQuotaExhaustedError(result.localError)) {
-        failureReason = "provider_rate_limited";
-      } else if (result.localError) {
-        const errMsg = toErrorMessage(result.localError).toLowerCase();
-        if (errMsg.includes("config_unresolved") || errMsg.includes("unresolved config")) {
-          failureReason = "config_unresolved";
-        } else {
-          failureReason = "provider_error";
-        }
-      }
-      const currentActivity = activityTracker?.getActivity();
-      const rawToolCount = currentActivity?.counters?.toolCalls ?? childRecordForDoD?.activity?.counters?.toolCalls;
-      if (typeof rawToolCount === "number" && rawToolCount > 0) {
-        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 } : {},
-        ...failureReason ? { failureReason } : {},
-        ...toolCallCount !== void 0 ? { toolCallCount } : {},
-        ...truncationNote
-      },
-      {
+    if (typeof childRunId === "string" && childRunId.length > 0) {
+      const childRecordForDoD = (deps.readRunRecord ?? readRunRecord)(childRunId, {
         env,
         homedir: deps.homedir,
-        fs: deps.fs,
-        now: deps.now,
-        sleep: deps.sleep
-      },
-      deps.transitionRunToTerminal
-    );
+        fs: deps.fs
+      });
+      const isStalledOrTruncated = isRunResultStalledOrTruncated(result);
+      const truncationNote = resolveRunSettlementNote(result);
+      const outcome = resolveRunOutcome({
+        kind: "result",
+        exitCode: result.exitCode,
+        isStalledOrTruncated
+      });
+      let dodResults;
+      try {
+        dodResults = (deps.runDoDCommands ?? runDoDCommands)(
+          childRecordForDoD?.dodCommands,
+          childRecordForDoD?.cwd
+        );
+      } catch (dodError) {
+        console.warn(`[nolo] DoD verification failed to run for ${childRunId}:`, dodError);
+      }
+      let failureReason;
+      let toolCallCount;
+      if (outcome.status === "failed") {
+        if (result.emptyAssistantFallbackReason === "repetition_loop" || result.emptyAssistantFallbackReason === "stagnant_tool_calls") {
+          failureReason = "stalled";
+        } else if (result.localError && isQuotaExhaustedError(result.localError)) {
+          failureReason = "provider_rate_limited";
+        } else if (result.localError) {
+          const errMsg = toErrorMessage(result.localError).toLowerCase();
+          if (errMsg.includes("config_unresolved") || errMsg.includes("unresolved config")) {
+            failureReason = "config_unresolved";
+          } else {
+            failureReason = "provider_error";
+          }
+        }
+        const currentActivity = activityTracker?.getActivity();
+        const rawToolCount = currentActivity?.counters?.toolCalls ?? childRecordForDoD?.activity?.counters?.toolCalls;
+        if (typeof rawToolCount === "number" && rawToolCount > 0) {
+          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 } : {},
+          ...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
+      );
+    }
+    return result.exitCode;
+  } finally {
+    shellApprovalChild?.close();
+    if (shellApprovalChild && process.connected) process.disconnect();
   }
-  return result.exitCode;
-}
-var BALANCE_ERROR_PATTERNS = [
-  /UPSTREAM_402/i,
-  /Insufficient Balance/i,
-  /insufficient\s+balance/i,
-  /余额不足/
-];
-function isBalanceExhaustedError(error) {
-  if (!error) return false;
-  const message = error instanceof Error ? error.message : typeof error === "string" ? error : String(error?.message ?? "");
-  return BALANCE_ERROR_PATTERNS.some((pattern) => pattern.test(message));
 }
 
 export {
@@ -14839,6 +16049,7 @@ export {
   applyDetectedBackground,
   renderSurfaceLine,
   surfaceBackgroundSequence,
+  composerSurfaceBackgroundSequence,
   userSurfaceBackgroundSequence,
   themeText,
   tuiRenderThemeFingerprint,
@@ -14846,12 +16057,16 @@ export {
   polishBreathInsertsBlankBetween,
   formatAssistantDisplay,
   redactSecrets,
+  safeAskText,
   TUI_TREE_MARKER,
+  estimateMessagesTokens,
+  historyTokensBeforeLatestAssistant,
   resolveAgentModelIdentity,
   resolveAgentContextWindow,
   platformCreditsFromUsage,
   formatCreditsChip,
-  formatTokenCount,
+  resolveAuthorityTurnCount,
+  computeBaselineContextTokens,
   renderTokenStatus,
   COLLAPSED_PASTE_PLACEHOLDER_RE,
   shouldCollapsePaste,
@@ -14863,18 +16078,22 @@ export {
   releaseCollapsedPasteReferences,
   expandRangeToCollapsedPasteChips,
   findCollapsedPasteSpanAt,
+  emitTerminalProgramStatus,
+  isBalanceExhaustedError,
   runAgentTurn,
   resolveWorkflowReference,
   resolveSkillReference,
   buildSkillContextBlocks,
   prependSubjectDialogMarker,
   normalizeCliImageInput,
+  buildHostEnvironmentLayer,
   readAgentsMdLayerFromDisk,
   resolveCliMemory,
+  FAILED_EMPTY_ASSISTANT_REASONS,
+  isRunResultStalledOrTruncated,
+  resolveTerminalProgramStatusState,
   inspectLocalRunWorkspace,
   resolveRunOutcome,
-  isRunResultStalledOrTruncated,
   resolveRunSettlementNote,
-  runAgentRunCommand,
-  isBalanceExhaustedError
+  runAgentRunCommand
 };