nolo-cli 0.54.0 → 0.61.0-alpha.3

package/{chunk-UOWXD4VN.js → chunk-VHO3TMQZ.js}

@@ -9,58 +9,61 @@ import {
   resolveRawAgentInput,
   resolveServerUrl,
   writeUsage
-} from "./chunk-LYGNQHUW.js";
-import {
-  resolveMachineId
-} from "./chunk-ESHYE7WU.js";
+} from "./chunk-JYYZCK2Z.js";
 import {
   agentRunCardLabels,
   createCliLocalRuntimeAdapter,
+  detectCurrentMachineId,
   getCliLocale,
   isBuiltinNoloAgentRef,
+  isCliProviderAgentConfig,
+  isLiveAgentRunObservation,
+  isMachineBoundLocalhostCustomProvider,
   isSubtaskRun,
   parseAgentRunEvent,
+  resolveAuthToken as resolveAuthToken2,
+  resolveBoundMachineId,
+  resolveFileWriteGateEnabled,
+  resolveLocalUserId,
   t,
   toolLabel
-} from "./chunk-5FCIPEKT.js";
+} from "./chunk-Z5MHFBJZ.js";
+import {
+  createRunActivityTracker,
+  popSingleQueueMessage,
+  readRunRecord,
+  resolveRunQueuePath,
+  settleRunTerminalAuthoritatively,
+  spawnLocalBackgroundRun
+} from "./chunk-45YO6H7P.js";
 import {
   readCredentialEntry,
   recordCredentialProbe,
   resolveCredentialKeyWithFallback
-} from "./chunk-NI2BS6UD.js";
+} from "./chunk-DWUCB2A3.js";
 import {
   getReadableCliDb
-} from "./chunk-43CXXVJD.js";
+} from "./chunk-RXX4GDIH.js";
 import {
-  normalizeAgentHandle,
   readDbRecord,
   resolveAgentRecordFromHybridStore
-} from "./chunk-SYYUU7EV.js";
+} from "./chunk-FHAGENAS.js";
 import {
-  NOLO_PROJECT_MANAGER_AGENT_KEY,
   isLocalCliAgentKey
-} from "./chunk-EKLRRZIN.js";
-import {
-  generateRunReport
-} from "./chunk-HJTAGT3W.js";
+} from "./chunk-SPAQ4PVV.js";
 import {
   CliProviderQuotaError
-} from "./chunk-JDSUTNYY.js";
+} from "./chunk-MP64VFGD.js";
 import {
-  createRunActivityTracker,
-  finalizeRunRecord,
-  popSingleQueueMessage,
-  readRunRecord,
-  resolveRunQueuePath,
-  spawnLocalBackgroundRun
-} from "./chunk-SSXTSPSG.js";
+  resolveMachineId
+} from "./chunk-ESHYE7WU.js";
 import {
   applyModelLayerOverride,
   buildModelLayerOverride
 } from "./chunk-LTRXGFMS.js";
 import {
   formatAgentListCard
-} from "./chunk-TR4DXUYX.js";
+} from "./chunk-CQ2OZMLQ.js";
 import {
   isTransientFetchError
 } from "./chunk-5XTOKQLW.js";
@@ -75,60 +78,71 @@ import {
   formatStatusRunCard,
   formatStopRunCard,
   isAgentRunTerminalStatus
-} from "./chunk-KXKQO4Q6.js";
+} from "./chunk-NTW5GWDM.js";
 import {
   buildMemorySubjectsForAgent,
   chooseMemoryOwners,
   loadMemoryCandidatesFromDb,
   resolveAgentMemoryPolicy
-} from "./chunk-FJHMLRDQ.js";
+} from "./chunk-DWYSDNOH.js";
 import {
   API_REPORTED_COST_MULTIPLIER,
   normalizeUsage,
   parseUiAskChoiceContent
-} from "./chunk-YBFJQC2M.js";
+} from "./chunk-TBHAHL33.js";
+import {
+  isOAuthApiKeyRef
+} from "./chunk-YYLHWIW6.js";
+import {
+  isCliAuthorityBrokerProtocolError,
+  isCliAuthorityBrokerTimeoutError,
+  isCliAuthorityBrokerUnavailableError
+} from "./chunk-TRV2MIDW.js";
 import {
   getDefaultCliLocalRuntimeDb
-} from "./chunk-IA3A5373.js";
+} from "./chunk-C3FZR5EC.js";
 import {
   buildSkillDiscoveryContextLayer
-} from "./chunk-SUEIAK5N.js";
+} from "./chunk-E4MARS3Q.js";
 import {
   parseExternalSkillMarkdown,
   parseSkillDocProtocol
-} from "./chunk-EY7V7REW.js";
+} from "./chunk-AETZ7AD6.js";
 import {
   LOCAL_AGENT_CONFIG_MISSING_CODE,
   LOCAL_TURN_ABORTED_CODE,
   readActionGate
-} from "./chunk-EJE33XNR.js";
+} from "./chunk-KSCXMC6U.js";
 import {
   resolveAgentRuntimeConfigFromRecord
-} from "./chunk-A65UV3M5.js";
+} from "./chunk-XOKOSO35.js";
 import {
   createThinkParserState,
   flushThinkParser,
   processThinkChunk
 } from "./chunk-N7J63Q6C.js";
 import {
-  resolveClientVersion,
-  resolvePlatformAuthToken
-} from "./chunk-KLIBF3BY.js";
+  isAntigravityOAuthAgent
+} from "./chunk-QEW2MFDQ.js";
+import {
+  resolveClientVersion
+} from "./chunk-RDBARW6T.js";
 import {
   isQuotaExhaustedError,
+  isQuotaLimited403Body,
   mergeAvailabilityDeadline,
   resolveCooldownGate
-} from "./chunk-IWUMSAQF.js";
+} from "./chunk-CJCJF5XB.js";
 import {
   DEFAULT_CONTEXT_WINDOW,
   getModelContextWindow
-} from "./chunk-K4NISKOR.js";
+} from "./chunk-5ZYA4JJ3.js";
 import {
   clipCompactText
-} from "./chunk-BBTN4NQD.js";
+} from "./chunk-Z4QSJILV.js";
 import {
   findModelConfig
-} from "./chunk-SVDMVX4G.js";
+} from "./chunk-MMZ6ZTVO.js";
 import {
   compactWhitespace
 } from "./chunk-DWLEOOGR.js";
@@ -153,7 +167,7 @@ import {
   CLIENT_VERSION_TOO_OLD_CODE,
   NOLO_CLIENT_VERSION_HEADER,
   buildClientVersionUpgradeMessage
-} from "./chunk-HPW5MNDQ.js";
+} from "./chunk-22BTGNSP.js";
 import {
   parsePositiveFiniteNumberOrFallback
 } from "./chunk-Y5GCAMGP.js";
@@ -167,16 +181,13 @@ import {
   BUILTIN_NOLO_AGENT_KEY,
   BUILTIN_NOLO_AGENT_NAME,
   builtinAgentCatalogEntryById
-} from "./chunk-2WBFJHQA.js";
+} from "./chunk-L7B47JXR.js";
 import {
   parsePublicAgentId
 } from "./chunk-BJIRLHJR.js";
 import {
   asTrimmedString
 } from "./chunk-3EUW3WEO.js";
-import {
-  isLoopbackUrl
-} from "./chunk-4SN6J65J.js";
 import {
   asOptionalTrimmedString
 } from "./chunk-G3SUCT4W.js";
@@ -1132,7 +1143,7 @@ var THEME_PALETTES = {
       // denser slate — 687584 read too blue in dense prose (inline code/tool labels); 5E6A78 pulls blue down while staying darker than the old value
     },
     dark: {
-      accent: { hex: "5BA3D9", ansiFallback: "\x1B[34m" },
+      accent: { hex: "5BA3D9", ansiFallback: "\x1B[94m" },
       // trail dark primary (was wrongly copied from catppuccin 89B4FA)
       chrome: { hex: "6C7086", ansiFallback: "\x1B[90m" },
       success: { hex: "5CB87A", ansiFallback: "\x1B[32m" },
@@ -1158,7 +1169,7 @@ var THEME_PALETTES = {
       muted: { hex: "6E7781", ansiFallback: "\x1B[90m" }
     },
     dark: {
-      accent: { hex: "89B4FA", ansiFallback: "\x1B[34m" },
+      accent: { hex: "89B4FA", ansiFallback: "\x1B[94m" },
       // Catppuccin Mocha Blue
       chrome: { hex: "6C7086", ansiFallback: "\x1B[90m" },
       success: { hex: "A6E3A1", ansiFallback: "\x1B[32m" },
@@ -1180,7 +1191,7 @@ var THEME_PALETTES = {
       muted: { hex: "716E61", ansiFallback: "\x1B[90m" }
     },
     dark: {
-      accent: { hex: "7E9CD8", ansiFallback: "\x1B[34m" },
+      accent: { hex: "7E9CD8", ansiFallback: "\x1B[94m" },
       // crystalBlue
       chrome: { hex: "727169", ansiFallback: "\x1B[90m" },
       success: { hex: "98BB6C", ansiFallback: "\x1B[32m" },
@@ -1201,7 +1212,7 @@ var THEME_PALETTES = {
       muted: { hex: "6E6A8A", ansiFallback: "\x1B[90m" }
     },
     dark: {
-      accent: { hex: "8B9CF4", ansiFallback: "\x1B[34m" },
+      accent: { hex: "8B9CF4", ansiFallback: "\x1B[94m" },
       chrome: { hex: "5A5772", ansiFallback: "\x1B[90m" },
       success: { hex: "26BD6C", ansiFallback: "\x1B[32m" },
       warning: { hex: "F5A623", ansiFallback: "\x1B[33m" },
@@ -1221,7 +1232,7 @@ var THEME_PALETTES = {
       muted: { hex: "797593", ansiFallback: "\x1B[90m" }
     },
     dark: {
-      accent: { hex: "EB6F92", ansiFallback: "\x1B[35m" },
+      accent: { hex: "EB6F92", ansiFallback: "\x1B[95m" },
       chrome: { hex: "6E6A86", ansiFallback: "\x1B[90m" },
       success: { hex: "9CCFD8", ansiFallback: "\x1B[32m" },
       warning: { hex: "F6C177", ansiFallback: "\x1B[33m" },
@@ -1305,6 +1316,9 @@ function detectSystemBrightnessFromEnv(env = process.env) {
   return null;
 }
 function resolveTuiBrightness(env = process.env) {
+  return resolveTuiBrightnessSignal(env) ?? "dark";
+}
+function resolveTuiBrightnessSignal(env = process.env) {
   const explicit = (env.NOLO_TUI_THEME ?? "").trim().toLowerCase();
   if (explicit === "light") return "light";
   if (explicit === "dark") return "dark";
@@ -1317,9 +1331,7 @@ function resolveTuiBrightness(env = process.env) {
     if (!Number.isNaN(bg) && bg >= 0 && bg <= 6) return "dark";
     if (!Number.isNaN(bg) && bg >= 7 && bg <= 15) return "light";
   }
-  const sys = detectSystemBrightnessFromEnv(env);
-  if (sys) return sys;
-  return "dark";
+  return detectSystemBrightnessFromEnv(env);
 }
 function resolveTuiThemeMode(env = process.env, fallback = activeThemeMode) {
   const explicit = (env.NOLO_TUI_THEME ?? "").trim().toLowerCase();
@@ -4374,6 +4386,17 @@ ${items.map((item, i) => `${i === items.length - 1 ? "\u2514\u2500\u2500 " : "\u
   format.reset = () => {
     tree = null;
   };
+  format.consume = (event) => {
+    if (event.type === "tool-call") {
+      pending.set(event.toolCallId, {
+        toolName: event.toolName,
+        argumentsPreview: event.argumentsPreview
+      });
+      return;
+    }
+    pending.delete(event.toolCallId);
+    tree = null;
+  };
   return format;
 }
 function createSseToolEventAdapter(onEvent) {
@@ -4542,6 +4565,13 @@ ${this.text}
 
 // packages/cli/client/agentRunOutput.ts
 var IDENTITY_LABEL_SEPARATOR = " > ";
+var THINKING_PREVIEW_BUFFER_LIMIT = 512;
+function appendThinkingPreview(current, chunk, limit = THINKING_PREVIEW_BUFFER_LIMIT) {
+  if (limit <= 0) return "";
+  const combined = current + chunk;
+  if (combined.length <= limit) return combined;
+  return combined.slice(combined.length - limit);
+}
 function formatCompactionSummaryLine(event) {
   if (!event) return "";
   const action = event.reason === "tool_stub" ? "stub \u5DE5\u5177\u8F93\u51FA" : "\u751F\u6210\u5386\u53F2\u6458\u8981";
@@ -4602,19 +4632,35 @@ function createCliTurnOutput(params) {
   let printedAssistantLabel = false;
   let thinkState = createThinkParserState();
   let thinkingFirstAt = null;
-  let thinkingLastAt = 0;
-  const markThinkingActivity = () => {
-    const now = Date.now();
-    if (thinkingFirstAt === null) thinkingFirstAt = now;
-    thinkingLastAt = now;
+  let thinkingPreview = "";
+  const markThinkingDelta = (chunk) => {
+    if (!showThinking) return;
+    if (streamedAssistantText) return;
+    if (thinkingFirstAt === null) {
+      thinkingFirstAt = Date.now();
+      thinkingPreview = "";
+    }
+    thinkingPreview = appendThinkingPreview(thinkingPreview, chunk);
+    spinner.setThinkingHint(thinkingPreview);
+    reportThinkingProgress();
+  };
+  const reportThinkingProgress = () => {
+    if (!showThinking) return;
+    const preview = truncateThinkingHint(thinkingPreview, 60);
+    const label = preview ? t("thinkingActivePreview", preview) : t("thinkingActive");
+    options.activityReporter?.(label);
   };
-  const writeThinkingTrace = () => {
+  const endThinkingPhase = () => {
     if (thinkingFirstAt === null) return;
-    const seconds = Math.max(0, Math.round((thinkingLastAt - thinkingFirstAt) / 1e3));
+    const seconds = Math.max(0, Math.round((Date.now() - thinkingFirstAt) / 1e3));
     thinkingFirstAt = null;
-    if (seconds < 1) return;
-    options.output.write(`${dimCliText(t("thinkingTraceLine", formatElapsed(seconds)))}
+    thinkingPreview = "";
+    spinner.stop();
+    options.activityReporter?.(null);
+    if (seconds >= 1) {
+      options.output.write(`${dimCliText(t("thinkingTraceLine", formatElapsed(seconds)))}
 `);
+    }
   };
   let compactionEvent = null;
   const assistantLabelManaged = options.output.assistantLabelManaged === true;
@@ -4635,14 +4681,11 @@ function createCliTurnOutput(params) {
     const parsed = processThinkChunk(chunk, thinkState);
     thinkState = parsed.state;
     if (!parsed.content && !parsed.reasoning) return;
-    if (showThinking && parsed.reasoning) {
-      markThinkingActivity();
-      spinner.setThinkingHint(parsed.reasoning);
+    if (parsed.reasoning) {
+      markThinkingDelta(parsed.reasoning);
     }
     if (!parsed.content) return;
-    writeThinkingTrace();
-    spinner.stop();
-    options.activityReporter?.(null);
+    endThinkingPhase();
     if (!printedAssistantLabel) {
       if (!assistantLabelManaged) {
         options.output.write(`
@@ -4655,34 +4698,44 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
     renderWriter.push(parsed.content);
   };
   const handleToolEvent = (event) => {
-    const chunk = eventMode === "jsonl" ? formatToolJsonEvent(event) : formatToolEvent(event);
     if (eventMode === "jsonl") {
-      options.output.write(chunk);
+      const chunk2 = formatToolJsonEvent(event);
+      options.output.write(chunk2);
+      if (options.onAgentRunStatus) {
+        const parsed = parseAgentRunEvent(event);
+        if (parsed) {
+          options.onAgentRunStatus(parsed.snapshot);
+        }
+      }
       return;
     }
     if (event.type === "tool-call") {
       renderWriter.flush();
+      formatToolEvent(event);
+      endThinkingPhase();
+      if (streamedAssistantText) {
+        options.output.write("\n");
+        streamedAssistantText = false;
+      }
+      const activeLabel = formatConservativeActiveToolLabel(event);
+      spinner.show(activeLabel);
+      options.activityReporter?.(activeLabel);
+      return;
+    }
+    const parsedRunEvent = parseAgentRunEvent(event);
+    if (options.onAgentRunStatus && parsedRunEvent) {
+      options.onAgentRunStatus(parsedRunEvent.snapshot);
     }
     spinner.stop();
     options.activityReporter?.(null);
-    if (event.type === "tool-call" && streamedAssistantText) {
-      options.output.write("\n");
-      streamedAssistantText = false;
+    if (isLiveAgentRunObservation(event, parsedRunEvent)) {
+      formatToolEvent.consume?.(event);
+      return;
     }
+    const chunk = formatToolEvent(event);
     if (chunk) {
       writeToolOutput(chunk);
     }
-    if (event.type === "tool-call") {
-      const activeLabel = formatConservativeActiveToolLabel(event);
-      spinner.show(activeLabel);
-      options.activityReporter?.(activeLabel);
-    }
-    if (options.onAgentRunStatus) {
-      const parsed = parseAgentRunEvent(event);
-      if (parsed) {
-        options.onAgentRunStatus(parsed.snapshot);
-      }
-    }
   };
   return {
     spinner,
@@ -4691,10 +4744,7 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
       writeVisibleAssistantChunk(chunk);
     },
     pushThinking(chunk) {
-      if (showThinking) {
-        markThinkingActivity();
-        spinner.setThinkingHint(chunk);
-      }
+      markThinkingDelta(chunk);
     },
     handleToolEvent,
     /** 记录一条 compaction 观测事件（TUI 在 turn 结束时渲染一行 dim 摘要）。 */
@@ -4707,14 +4757,14 @@ ${options.agentName}${IDENTITY_LABEL_SEPARATOR}`);
       options.activityReporter?.(activeLabel);
     },
     finish(fallbackContent) {
-      spinner.stop();
-      options.activityReporter?.(null);
-      writeThinkingTrace();
       const flushedThink = flushThinkParser(thinkState);
       thinkState = flushedThink.state;
       if (flushedThink.content) {
         writeVisibleAssistantChunk(flushedThink.content);
       }
+      endThinkingPhase();
+      spinner.stop();
+      options.activityReporter?.(null);
       if (streamedAssistantText) {
         renderWriter.flush();
         options.output.write("\n");
@@ -4924,51 +4974,6 @@ ${describeClientVersionTooOldFailure(message, error)}`);
   };
 }
 
-// packages/cli/client/agentRunTypes.ts
-function resolveAuthToken2(env) {
-  return resolvePlatformAuthToken(env);
-}
-function resolveFileWriteGateEnabled(env) {
-  const raw = (env.NOLO_CLI_WRITE_GATE ?? "").trim().toLowerCase();
-  return raw !== "off" && raw !== "0" && raw !== "false";
-}
-function isMachineBoundLocalhostCustomProvider(agentConfig) {
-  const machineId = agentConfig?.runtimeBinding && typeof agentConfig.runtimeBinding === "object" ? String(agentConfig.runtimeBinding.machineId ?? "").trim() : "";
-  const providerUrl = asTrimmedString(agentConfig?.customProviderUrl);
-  if (!machineId || !providerUrl) return false;
-  return isLoopbackUrl(providerUrl);
-}
-function resolveBoundMachineId(agentConfig) {
-  return agentConfig?.runtimeBinding && typeof agentConfig.runtimeBinding === "object" ? String(agentConfig.runtimeBinding.machineId ?? "").trim() : "";
-}
-var CLI_PROVIDER_NAMES = /* @__PURE__ */ new Set([
-  "agy",
-  "claude",
-  "codex",
-  "copilot",
-  "gemini",
-  "grok",
-  "kimi",
-  "opencode",
-  "qoder"
-]);
-function isCliProviderAgentConfig(agentConfig) {
-  const cliProvider = asTrimmedLowercaseString(agentConfig?.cliProvider);
-  const provider = asTrimmedLowercaseString(agentConfig?.provider);
-  return Boolean(cliProvider) || CLI_PROVIDER_NAMES.has(provider);
-}
-async function detectCurrentMachineId(env) {
-  const fromEnv = (env.NOLO_CURRENT_MACHINE_ID || env.NOLO_MACHINE_ID || "").trim();
-  if (fromEnv) return fromEnv;
-  try {
-    const { detectMachineInfo } = await import("./machineInfo-66ZFUMLE.js");
-    const machine = await detectMachineInfo({ probeLaunchable: true });
-    return asOptionalTrimmedString(machine?.machineId);
-  } catch {
-    return void 0;
-  }
-}
-
 // packages/cli/client/agentRunPlatformTools.ts
 var SERVER_PLATFORM_TOOL_NAMES = /* @__PURE__ */ new Set([
   "addTableRow",
@@ -4978,28 +4983,6 @@ var SERVER_PLATFORM_TOOL_NAMES = /* @__PURE__ */ new Set([
   "updateTableRow",
   "updateTableRows"
 ]);
-var KNOWN_SERVER_PLATFORM_AGENT_KEYS = /* @__PURE__ */ new Set([NOLO_PROJECT_MANAGER_AGENT_KEY]);
-var KNOWN_SERVER_PLATFORM_AGENT_ALIASES = /* @__PURE__ */ new Set([
-  "code-review",
-  "frontend",
-  "frontend-agent",
-  "frontend-implementer",
-  "full-stack",
-  "fullstack",
-  "nolo code review",
-  "nolo fullstack",
-  "nolo project manager",
-  "nolo reviewer",
-  "nolo-code-review",
-  "nolo-fullstack",
-  "nolo-pm",
-  "nolo-project-manager",
-  "nolo-reviewer",
-  "pm",
-  "project-manager",
-  "review",
-  "reviewer"
-]);
 function findServerPlatformTools(toolNames) {
   if (!Array.isArray(toolNames)) return [];
   return toolNames.filter(
@@ -5012,13 +4995,6 @@ function resolveServerPlatformToolNames(agentConfig) {
     ...Array.isArray(agentConfig?.runtimeToolPolicy?.agentTools) ? agentConfig.runtimeToolPolicy.agentTools : []
   ]);
 }
-function isKnownServerPlatformAgent(options) {
-  if (KNOWN_SERVER_PLATFORM_AGENT_KEYS.has(options.agentKey)) return true;
-  const normalizedKey = normalizeAgentHandle(options.agentKey);
-  return Boolean(
-    normalizedKey && KNOWN_SERVER_PLATFORM_AGENT_ALIASES.has(normalizedKey)
-  );
-}
 
 // packages/core/collapsedPaste.ts
 var COLLAPSE_PASTE_MIN_LINES = 8;
@@ -5200,7 +5176,7 @@ function findCollapsedPasteSpanAt(buffer, pos, opts = {}) {
 // packages/cli/client/agentRun.ts
 import { ulid } from "ulid";
 async function loadRunLocalAgentTurn() {
-  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-K327ELSL.js");
+  const { runLocalAgentTurn } = await import("./agentRuntimeLocal-QBK4H3T2.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();
@@ -5322,25 +5298,44 @@ function wrapLoadAgentConfigWithModelOverride(adapter, targetAgentKey, override)
     }
   };
 }
+var oauthChannelSkipReportedOutputs = /* @__PURE__ */ new WeakSet();
+function resolveOAuthChannelOwnerSkip(agentConfig, options) {
+  if (!agentConfig) return null;
+  const apiKeyRef = typeof agentConfig.apiKeyRef === "string" ? agentConfig.apiKeyRef : void 0;
+  if (!isOAuthApiKeyRef(apiKeyRef) && !isAntigravityOAuthAgent(agentConfig)) {
+    return null;
+  }
+  const rawRecord = agentConfig.rawRecord ?? {};
+  const ownerUserId = asOptionalTrimmedString(rawRecord.userId) ?? asOptionalTrimmedString(rawRecord.ownerUserId);
+  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.
+`;
+}
 async function shouldSkipAutoLocalForServerPlatformTools(options) {
   if (isBuiltinNoloAgentRef(options.agentKey)) return false;
-  if (options.localRuntimeCwd) {
+  const adapter = resolveLocalRuntimeAdapter(options);
+  if (!adapter) {
     return false;
   }
-  const knownServerPlatformAgent = isKnownServerPlatformAgent(options);
-  const adapter = resolveLocalRuntimeAdapter(options);
-  if (!adapter) return knownServerPlatformAgent;
   let agentConfig;
   try {
     agentConfig = await adapter.loadAgentConfig(options.agentKey);
   } catch {
-    if (knownServerPlatformAgent) {
-      options.output.write(
-        `[nolo] auto runtime: skipping local runtime because ${options.agentKey} is a known platform agent. Use --local explicitly to force local workspace tools.
-`
-      );
-      return true;
+    return false;
+  }
+  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") {
+        oauthChannelSkipReportedOutputs.add(options.output);
+      }
+      options.output.write(oauthChannelOwnerSkip);
     }
+    return true;
+  }
+  if (options.localRuntimeCwd) {
     return false;
   }
   if (isCliProviderAgentConfig(agentConfig)) {
@@ -5353,10 +5348,12 @@ async function shouldSkipAutoLocalForServerPlatformTools(options) {
     );
     return true;
   }
-  if (knownServerPlatformAgent) {
+  if (resolveBoundMachineId(agentConfig)) {
+    const currentMachineId = (await resolveCurrentMachineId(options))?.trim() || "";
+    const boundMachineId = resolveBoundMachineId(agentConfig);
+    if (currentMachineId && currentMachineId === boundMachineId) return false;
     options.output.write(
-      `[nolo] auto runtime: skipping local runtime because ${options.agentKey} is a known platform agent. Use --local explicitly to force local workspace tools.
-`
+      `[nolo] auto runtime: skipping local runtime because ${options.agentKey} is a platform agent bound to machine ${boundMachineId}` + (currentMachineId ? ` (this machine is ${currentMachineId}).` : ".") + " The server will dispatch it to the bound machine connector.\n"
     );
     return true;
   }
@@ -5434,9 +5431,12 @@ function classifyLocalRunError(message) {
   if (!m) return { kind: "generic" };
   const status = Number(m[2]);
   const transport = PLATFORM_TRANSPORT_RE.test(message) ? "platform" : "local";
-  if (status === 401 || status === 403) {
+  if (status === 401) {
     return { kind: "auth", transport, status };
   }
+  if (status === 403) {
+    return isQuotaLimited403Body(message) ? { kind: "rate-limit", transport, status } : { kind: "auth", transport, status };
+  }
   if (status === 400 || status === 422) {
     return { kind: "rejected-payload", transport, status };
   }
@@ -5453,10 +5453,14 @@ 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.";
 function buildAuthFailure(ctx) {
-  const fix = ctx.where === "server chat proxy" ? `Check the agent's provider/api-key settings on nolo.chat` : `Fix the local credential/config and retry`;
+  const platformNoToken = ctx.where === "server chat proxy" && isAuthNoTokenBody(ctx.message);
+  const fix = platformNoToken ? `This install is not logged in \u2014 run \`nolo login\`, or set AUTH_TOKEN / NOLO_SERVER` : ctx.where === "server chat proxy" ? `Check the agent's provider/api-key settings on nolo.chat` : `Fix the local credential/config and retry`;
   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.` : "";
@@ -5485,6 +5489,9 @@ var FAILURE_BUILDERS = {
   upstream: buildUpstreamFailure
 };
 function describeLocalRunFailure(message, rawError) {
+  if (rawError && typeof rawError === "object" && "code" in rawError && rawError.code === "PLATFORM_STREAM_INTERRUPTED") {
+    return "[nolo] The platform LLM stream was interrupted before the turn completed. Your conversation was preserved. Send another message to continue.\n";
+  }
   if (isClientVersionTooOldFailure(message, rawError)) {
     return describeClientVersionTooOldFailure(message, rawError);
   }
@@ -5515,6 +5522,26 @@ function describeLocalRunFailure(message, rawError) {
       balanceDetails.current
     ) : extractEmbeddedErrorMessage(cleanedMessage) ?? fallback;
     return `[nolo] ${shownMessage}
+`;
+  }
+  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}.
+`;
+  }
+  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 (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}.
+`;
+  }
+  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}.
 `;
   }
   const cls = classifyLocalRunError(message);
@@ -5559,7 +5586,7 @@ function shouldAttemptAutoLocal(options) {
   if (options.env.NOLO_DISABLE_CLI_WORKSPACE_TOOLS !== "1" && isBuiltinNoloAgentRef(options.agentKey) && resolveAuthToken2(options.env)) {
     return true;
   }
-  if (options.env.NOLO_DISABLE_CLI_WORKSPACE_TOOLS !== "1" && resolveAuthToken2(options.env) && !isKnownServerPlatformAgent(options)) {
+  if (options.env.NOLO_DISABLE_CLI_WORKSPACE_TOOLS !== "1" && resolveAuthToken2(options.env)) {
     return true;
   }
   return Boolean(
@@ -5601,9 +5628,6 @@ async function runHttpAgentTurn(options, authToken) {
   const fetchImpl = options.fetchImpl ?? fetch;
   const clientVersionHeader = resolveClientVersion(options.env ?? {});
   const subjectRefs = buildSubjectRefs(options);
-  const allowedChildAgentKeys = options.allowedChildAgentKeys?.filter(
-    (key) => key.trim()
-  );
   const allowedToolNames = options.allowedToolNames?.filter(
     (name) => name.trim()
   );
@@ -5627,9 +5651,8 @@ async function runHttpAgentTurn(options, authToken) {
       capabilities: ["text-io", "streaming", "slash-commands"],
       ...options.dialogAgentMode ? { dialogAgentMode: options.dialogAgentMode } : {},
       ...subjectRefs ? { subjectRefs } : {},
-      ...allowedChildAgentKeys?.length ? { allowedChildAgentKeys } : {},
-      ...blockedToolNames?.length ? { blockedToolNames } : {},
-      ...allowedToolNames?.length ? { allowedToolNames } : {}
+      ...blockedToolNames !== void 0 ? { blockedToolNames } : {},
+      ...allowedToolNames !== void 0 ? { allowedToolNames } : {}
     },
     ...options.continueDialogId ? { continueDialogId: options.continueDialogId } : {},
     ...options.spaceId ? { spaceId: options.spaceId } : {},
@@ -5785,21 +5808,17 @@ async function runLocalAgentTurnForCli(options, settings) {
     return { exitCode: 1 };
   }
   const subjectRefs = buildSubjectRefs(options);
-  const allowedChildAgentKeys = options.allowedChildAgentKeys?.filter(
-    (key) => key.trim()
-  );
   const allowedToolNames = options.allowedToolNames?.filter(
     (name) => name.trim()
   );
   const blockedToolNames = options.blockedToolNames?.filter(
     (name) => name.trim()
   );
-  const runtimeContext = subjectRefs || allowedChildAgentKeys?.length || allowedToolNames?.length || blockedToolNames?.length || options.parentWakeOnTerminal || options.dialogAgentMode ? {
+  const runtimeContext = subjectRefs || allowedToolNames !== void 0 || blockedToolNames !== void 0 || options.parentWakeOnTerminal || options.dialogAgentMode ? {
     ...subjectRefs ? { subjectRefs } : {},
     ...options.dialogAgentMode ? { dialogAgentMode: options.dialogAgentMode } : {},
-    ...allowedChildAgentKeys?.length ? { allowedChildAgentKeys } : {},
-    ...allowedToolNames?.length ? { allowedToolNames } : {},
-    ...blockedToolNames?.length ? { blockedToolNames } : {},
+    ...allowedToolNames !== void 0 ? { allowedToolNames } : {},
+    ...blockedToolNames !== void 0 ? { blockedToolNames } : {},
     ...options.parentWakeOnTerminal ? { parentWakeOnTerminal: true } : {},
     ...options.parentDialogId ? { parentThreadId: options.parentDialogId } : {}
   } : void 0;
@@ -5839,6 +5858,8 @@ async function runLocalAgentTurnForCli(options, settings) {
       category: options.category,
       inheritedFromDialogKey: options.inheritedFromDialogKey,
       parentDialogId: options.parentDialogId,
+      runtimeContext,
+      runKind: options.env.NOLO_AGENT_RUN_CHILD === "1" ? "subtask" : "interactive",
       background: options.background,
       noStream: options.noStream,
       ...runtimeContext ? { runtimeContext } : {},
@@ -5851,7 +5872,7 @@ async function runLocalAgentTurnForCli(options, settings) {
         }
         if (event.kind === "image-downgraded") {
           options.output.write(
-            "[nolo] \u5F53\u524D agent \u4E0D\u652F\u6301\u56FE\u7247\u8F93\u5165\uFF0C\u5DF2\u7528\u5360\u4F4D\u6587\u672C\u66FF\u4EE3\u3002\u8981\u5B8C\u6574\u56FE\u7247\u7406\u89E3\u53EF /switch \u5230 Kimi K2.6\u3002\n"
+            "[nolo] \u5F53\u524D agent \u88AB\u914D\u7F6E\u4E3A\u4E0D\u652F\u6301\u56FE\u7247\u8F93\u5165\uFF0C\u56FE\u7247\u5DF2\u7528\u5360\u4F4D\u6587\u672C\u66FF\u4EE3\u3002\u8BF7\u68C0\u67E5\u6A21\u578B\u7684\u56FE\u7247\u80FD\u529B\u914D\u7F6E\uFF0C\u6216\u7528 /switch \u9009\u62E9\u652F\u6301\u56FE\u7247\u7684 agent \u540E\u91CD\u65B0\u53D1\u9001\u56FE\u7247\u3002\n"
           );
         }
         if (event.kind === "compaction") {
@@ -5948,7 +5969,13 @@ async function checkLocalAvailabilityBeforeHttpDispatch(options) {
   }
   if (!config || typeof config !== "object") return null;
   const baseRecord = config.rawRecord ?? config;
-  const credentialKey = resolveCredentialKeyWithFallback(baseRecord);
+  let credentialKey = resolveCredentialKeyWithFallback(baseRecord);
+  if (credentialKey && resolveOAuthChannelOwnerSkip(
+    config,
+    options
+  )) {
+    credentialKey = void 0;
+  }
   const agentLevelAt = baseRecord.nextAvailableAt;
   const agentLevelNextAvailableAt = typeof agentLevelAt === "number" && Number.isFinite(agentLevelAt) ? agentLevelAt : void 0;
   if (!credentialKey && agentLevelNextAvailableAt === void 0) return null;
@@ -6084,6 +6111,63 @@ function readAgentsMdLayerFromDisk(cwd) {
   return null;
 }
 
+// packages/cli/agentRunDoD.ts
+import { spawnSync as nodeSpawnSync } from "node:child_process";
+var DOD_COMMAND_TIMEOUT_MS = 12e4;
+function extractTailLines(text, count) {
+  if (!text) return [];
+  const lines = String(text).split("\n");
+  while (lines.length > 0 && lines[lines.length - 1].trim() === "") lines.pop();
+  return lines.slice(-count);
+}
+function executeDoDCommand(cmd, cwd, deps = {}) {
+  const spawnSync = deps.spawnSync ?? nodeSpawnSync;
+  try {
+    const res = spawnSync(cmd, {
+      shell: true,
+      cwd: cwd || process.cwd(),
+      timeout: DOD_COMMAND_TIMEOUT_MS,
+      maxBuffer: 10 * 1024 * 1024,
+      encoding: "utf8"
+    });
+    if (res.error) {
+      const errCode = res.error.code;
+      const timedOut = errCode === "ETIMEDOUT" || res.signal === "SIGTERM" || res.signal === "SIGKILL";
+      return {
+        command: cmd,
+        exitCode: timedOut ? "timeout" : "error",
+        stdoutTail: extractTailLines(res.stdout, 20),
+        stderrTail: extractTailLines(res.stderr || res.error.message, 10)
+      };
+    }
+    if (res.status === null && (res.signal === "SIGTERM" || res.signal === "SIGKILL")) {
+      return {
+        command: cmd,
+        exitCode: "timeout",
+        stdoutTail: extractTailLines(res.stdout, 20),
+        stderrTail: extractTailLines(res.stderr, 10)
+      };
+    }
+    return {
+      command: cmd,
+      exitCode: typeof res.status === "number" ? res.status : "error",
+      stdoutTail: extractTailLines(res.stdout, 20),
+      stderrTail: extractTailLines(res.stderr, 10)
+    };
+  } catch (err) {
+    return {
+      command: cmd,
+      exitCode: "error",
+      stdoutTail: [],
+      stderrTail: extractTailLines(err instanceof Error ? err.message : String(err), 10)
+    };
+  }
+}
+function runDoDCommands(commands, cwd, deps = {}) {
+  if (!commands || commands.length === 0) return void 0;
+  return commands.map((cmd) => executeDoDCommand(cmd, cwd, deps));
+}
+
 // packages/cli/agentRunPrompts.ts
 import { existsSync as existsSync2, readFileSync as readFileSync2, readdirSync, statSync } from "node:fs";
 import { dirname, extname, isAbsolute, join as join2, relative as relativePath, resolve, sep } from "node:path";
@@ -6352,14 +6436,16 @@ ${args.inspection.status.trim()}`] : [],
 }
 
 // packages/ai/memory/storeShared.ts
+var retrievalCountOf = (item) => item.activationCount ?? 0;
 var touchMemoryItemsInDb = async (db, items, now = (/* @__PURE__ */ new Date()).toISOString()) => {
   if (items.length === 0) return;
   const batch = db.batch();
   for (const item of items) {
     batch.put(createMemoryKey(item.ownerType, item.ownerId, item.id), {
       ...item,
+      // retrieval bookkeeping on legacy storage names — see doc comment above
       lastActivatedAt: now,
-      activationCount: (item.activationCount ?? 0) + 1
+      activationCount: retrievalCountOf(item) + 1
     });
   }
   await batch.write();
@@ -6588,27 +6674,27 @@ var identifierScore = (query, item) => {
   return matches / identifiers.length;
 };
 var DAY_MS = 864e5;
-var UNPROVEN_MEMORY_GRACE_DAYS = 3;
-var MIN_UNPROVEN_SCORE_FACTOR = 0.3;
-var UNPROVEN_DECAY_HALF_LIFE_DAYS = 7;
-var provenActivationScore = (item, nowMs) => {
-  const lastActivatedMs = Date.parse(item.lastActivatedAt || item.createdAt);
-  const ageDays = Math.max(0, (nowMs - lastActivatedMs) / DAY_MS);
+var UNRETRIEVED_MEMORY_GRACE_DAYS = 3;
+var MIN_UNRETRIEVED_SCORE_FACTOR = 0.3;
+var UNRETRIEVED_DECAY_HALF_LIFE_DAYS = 7;
+var retrievalFrequencyScore = (item, nowMs) => {
+  const lastRetrievedMs = Date.parse(item.lastActivatedAt || item.createdAt);
+  const ageDays = Math.max(0, (nowMs - lastRetrievedMs) / DAY_MS);
   const recency = 1 / (1 + ageDays / 7);
-  const reinforcement = Math.min(1, Math.log1p(item.activationCount ?? 0) / 3);
-  return 0.7 * recency + 0.3 * reinforcement;
+  const frequency = Math.min(1, Math.log1p(item.activationCount ?? 0) / 3);
+  return 0.7 * recency + 0.3 * frequency;
 };
-var unprovenDecayFactor = (item, nowMs) => {
+var unretrievedDecayFactor = (item, nowMs) => {
   if ((item.activationCount ?? 0) !== 0) return 1;
   const createdAgeDays = Math.max(0, (nowMs - Date.parse(item.createdAt)) / DAY_MS);
-  if (createdAgeDays <= UNPROVEN_MEMORY_GRACE_DAYS) return 1;
-  const overdue = createdAgeDays - UNPROVEN_MEMORY_GRACE_DAYS;
+  if (createdAgeDays <= UNRETRIEVED_MEMORY_GRACE_DAYS) return 1;
+  const overdue = createdAgeDays - UNRETRIEVED_MEMORY_GRACE_DAYS;
   return Math.max(
-    MIN_UNPROVEN_SCORE_FACTOR,
-    1 / (1 + overdue / UNPROVEN_DECAY_HALF_LIFE_DAYS)
+    MIN_UNRETRIEVED_SCORE_FACTOR,
+    1 / (1 + overdue / UNRETRIEVED_DECAY_HALF_LIFE_DAYS)
   );
 };
-var activationScore = (item, nowMs) => provenActivationScore(item, nowMs) * unprovenDecayFactor(item, nowMs);
+var retrievalScore = (item, nowMs) => retrievalFrequencyScore(item, nowMs) * unretrievedDecayFactor(item, nowMs);
 var creationRecencyScore = (item, nowMs) => {
   const createdMs = Date.parse(item.createdAt);
   const ageDays = Math.max(0, (nowMs - createdMs) / 864e5);
@@ -6640,14 +6726,15 @@ var pathScore = (item, context) => {
 var scoreMemoryItem = (item, query, nowMs = Date.now(), context) => {
   const queryMatch = keywordScore(query, item);
   const identifierMatch = identifierScore(query, item);
-  const activation = activationScore(item, nowMs);
+  const retrieval = retrievalScore(item, nowMs);
   const createdRecency = creationRecencyScore(item, nowMs);
   const importance = item.importance ?? 0;
   const confidence = item.confidence ?? 0;
   const typeFit = typeFitScore(item);
   const understanding = understandingScore(item);
   const path = pathScore(item, context);
-  return 0.25 * queryMatch + 0.2 * identifierMatch + 0.2 * path + 0.09 * activation + 0.16 * createdRecency + 0.06 * importance + 0.03 * confidence + 0.02 * typeFit + 0.01 * understanding;
+  return 0.25 * queryMatch + 0.2 * identifierMatch + 0.2 * path + 0.09 * retrieval + // weak retrieval signal, NOT successful-use reinforcement
+  0.16 * createdRecency + 0.06 * importance + 0.03 * confidence + 0.02 * typeFit + 0.01 * understanding;
 };
 var rankMemoryCandidates = (items, query, context) => {
   const nowMs = Date.now();
@@ -6665,6 +6752,8 @@ var rankMemoryCandidates = (items, query, context) => {
 // packages/ai/memory/runtime.ts
 var COLD_STORAGE_CONFIDENCE = 0.3;
 var MEMORY_OVERLAY_TOKEN_BUDGET = DEFAULT_MEMORY_OVERLAY_TOKEN_BUDGET;
+var DEFAULT_MEMORY_RUNTIME_OWNER_LIMIT = 20;
+var CORROBORATED_PROCEDURAL_RESERVE = 5;
 var normalizeSelectedContent = (text) => text.trim().replace(EXPLICIT_REMEMBER_PREFIX_REGEX, "").replace(/[。！？!?]+$/u, "").trim();
 var STACK_TERMS = [
   "typescript",
@@ -6792,8 +6881,9 @@ var resolveMemoryRuntime = async (input) => {
       policy
     }),
     kinds: ["episodic", "semantic", "procedural"],
-    ownerLimit: 20,
-    ownerFallback: policy.ownerFallback
+    ownerLimit: input.ownerLimit ?? DEFAULT_MEMORY_RUNTIME_OWNER_LIMIT,
+    ownerFallback: policy.ownerFallback,
+    corroboratedProceduralReserve: input.corroboratedProceduralReserve ?? CORROBORATED_PROCEDURAL_RESERVE
   });
   const rankContext = {
     currentOwner: input.spaceId ? { ownerType: "space", ownerId: input.spaceId } : input.userId ? { ownerType: "user", ownerId: input.userId } : null,
@@ -6981,16 +7071,18 @@ async function runAgentRunCommand(args, deps) {
     } catch {
     }
   };
-  const finalizeWatchdogOutcome = (outcome, note) => {
+  const finalizeWatchdogOutcome = async (outcome, note) => {
     if (!hasRegistry) return;
-    (deps.finalizeRunRecord ?? finalizeRunRecord)(
+    await settleRunTerminalAuthoritatively(
       childRunId,
       { status: outcome.status, exitCode: outcome.exitCode, note },
-      { env, homedir: deps.homedir, fs: deps.fs, now: deps.now }
+      { env, homedir: deps.homedir, fs: deps.fs, now: deps.now, sleep: deps.sleep },
+      // Test seam: stubbed transitions keep their single-attempt semantics.
+      deps.transitionRunToTerminal
     );
   };
   if (armStallWatchdog) {
-    stallTimer = setInterval(() => {
+    stallTimer = setInterval(async () => {
       if (timedOut || stalled) return;
       const activity = activityTracker?.getActivity();
       const lastEventAtMs = activity ? new Date(activity.lastEventAt).getTime() : nowMs();
@@ -7008,21 +7100,21 @@ async function runAgentRunCommand(args, deps) {
         output.write(`[nolo] local run ${note}
 `);
         const outcome = resolveRunOutcome({ kind: "stall" });
-        finalizeWatchdogOutcome(outcome, note);
+        await finalizeWatchdogOutcome(outcome, note);
         rejectOnWatchdogFailure?.(new Error(`[nolo] local run ${note}`));
         exitFromWatchdog(outcome.exitCode);
       }
     }, Math.min(stallTimeoutMs, 1e4));
   }
   if (armTimeoutWatchdog) {
-    timeoutTimer = setTimeout(() => {
+    timeoutTimer = setTimeout(async () => {
       timedOut = true;
       clearWatchdogs();
       const note = `timed out after ${parsed.timeoutMs}ms`;
       output.write(`[nolo] local run ${note}
 `);
       const outcome = resolveRunOutcome({ kind: "timeout" });
-      finalizeWatchdogOutcome(outcome, note);
+      await finalizeWatchdogOutcome(outcome, note);
       rejectOnWatchdogFailure?.(new Error(`[nolo] local run ${note}`));
       exitFromWatchdog(outcome.exitCode);
     }, parsed.timeoutMs);
@@ -7121,7 +7213,7 @@ async function runAgentRunCommand(args, deps) {
         (acc, tools) => acc.filter((t2) => tools.includes(t2))
       );
       if (skillAllowed.length === 0) {
-        output.write(`[nolo] warning: attached skills declare incompatible allowed-tools; no tool restriction enforced
+        output.write(`[nolo] warning: attached skills declare incompatible allowed-tools; this run has no tools
 `);
       }
       skillAllowedToolOverride = parsed.allowedToolNames?.length ? parsed.allowedToolNames.filter((t2) => skillAllowed.includes(t2)) : skillAllowed;
@@ -7242,7 +7334,6 @@ async function runAgentRunCommand(args, deps) {
     ...parsed.parentWakeOnTerminal ? { parentWakeOnTerminal: true } : {},
     ...parsed.subjectDialogKey ? { subjectDialogKey: parsed.subjectDialogKey } : {},
     ...parsed.subjectRefs?.length ? { subjectRefs: parsed.subjectRefs } : {},
-    ...parsed.allowedChildAgentKeys?.length ? { allowedChildAgentKeys: parsed.allowedChildAgentKeys } : {},
     ...skillAllowedToolOverride !== void 0 ? { allowedToolNames: skillAllowedToolOverride } : parsed.allowedToolNames?.length ? { allowedToolNames: parsed.allowedToolNames } : {},
     ...parsed.blockedToolNames?.length ? { blockedToolNames: parsed.blockedToolNames } : {},
     ...activityTracker ? { onLoopEvent: activityTracker.onLoopEvent } : {},
@@ -7378,6 +7469,11 @@ async function runAgentRunCommand(args, deps) {
     }
   }
   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({
@@ -7385,12 +7481,22 @@ async function runAgentRunCommand(args, deps) {
       exitCode: result.exitCode,
       isStalledOrTruncated
     });
-    await (deps.finalizeRunRecord ?? finalizeRunRecord)(
+    let dodResults;
+    try {
+      dodResults = (deps.runDoDCommands ?? runDoDCommands)(
+        childRecordForDoD?.dodCommands,
+        childRecordForDoD?.cwd
+      );
+    } catch (dodError) {
+      console.warn(`[nolo] DoD verification failed to run for ${childRunId}:`, dodError);
+    }
+    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 } : {},
@@ -7400,26 +7506,11 @@ async function runAgentRunCommand(args, deps) {
         env,
         homedir: deps.homedir,
         fs: deps.fs,
-        now: deps.now
-      }
+        now: deps.now,
+        sleep: deps.sleep
+      },
+      deps.transitionRunToTerminal
     );
-    try {
-      const record = (deps.readRunRecord ?? readRunRecord)(childRunId, {
-        env,
-        homedir: deps.homedir,
-        fs: deps.fs
-      });
-      if (record) {
-        await (deps.generateRunReport ?? generateRunReport)(record, {
-          env,
-          homedir: deps.homedir,
-          fs: deps.fs,
-          now: deps.now
-        });
-      }
-    } catch (reportError) {
-      console.warn(`[nolo] failed to generate run report for ${childRunId}:`, reportError);
-    }
   }
   return result.exitCode;
 }
@@ -7438,6 +7529,7 @@ function isBalanceExhaustedError(error) {
 export {
   resolveAgentModelIdentity,
   resolveAgentContextWindow,
+  platformCreditsFromUsage,
   formatCreditsChip,
   formatTokenCount,
   renderTokenStatus,
@@ -7466,7 +7558,7 @@ export {
   setActiveThemeMode,
   setActiveBrightness,
   detectSystemBrightnessFromEnv,
-  resolveTuiBrightness,
+  resolveTuiBrightnessSignal,
   resolveTuiThemeMode,
   resetWorkspaceThemeState,
   applyDetectedBackground,