@buildaharness/aielia 0.3.7 → 0.3.9

package/dist/{bin-C_hgDdSf.js → bin-CCwDFxDe.js}

@@ -7,8 +7,8 @@ import { createInterface } from "node:readline";
 import { rename, stat, realpath, readdir, mkdir, unlink, writeFile, readFile } from "node:fs/promises";
 import { homedir, tmpdir } from "node:os";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { OPENROUTER_DEFAULT_MODEL, OPENAI_DEFAULT_MODEL, ANTHROPIC_DEFAULT_MODEL, InMemoryReminderStore, FileSystemAdapter, FileSystemExperienceStore, defaultModelForBackend, LLMClient, OpenAICompatibleLLMClient, OPENROUTER_EXTRA_HEADERS, OPENROUTER_BASE_URL, OPENAI_BASE_URL, AnthropicLLMClient } from "@buildaharness/runtime";
-import { Y as buildClaudePrompt, bK as stripJsonCodeFence, bo as recallToolEnabled, aZ as lexicalOffEnvValue, a as ALREADY_STAGED_ACTION_TOOL, bJ as stagedActionInput, bi as parseClaudeCliOutput, bL as stripMcpToolPrefix, bp as redactUrlCredentials, b5 as memoryStatusChecks, bh as normalizePlanNodes, P as PROVIDER_SETUP, a4 as cleanApiKey, _ as checkApiKeyFormat, ag as envOverridesFromProcessEnv, bs as resolveConfig, bH as shouldLaunchTuiApp, n as DEFAULT_TUI_MODE, T as applyLayerSettings, bF as sanitizeLayerChoices, bQ as testApiKey, bT as validateConfig, ao as findInvalidNumericSettings, c as ConfigValidationError, aH as formatSpendCapStatus, aU as isPlanGraphEnabled, bM as stripTerminalControls, B as PersonalAssistant, aR as isGoalGraphSuggestEnabled, aQ as isGoalGraphEnabled, bn as planToSnapshot, X as braveSearch, a8 as createSmtpSender, a7 as createResendSender, aW as isQuitCommand, y as LiveSteeringChannel, aE as formatNextSteps, $ as classifyError, b8 as nodeToLayer, L as LAYER_DISPLAY_NAME, b7 as nodeDisplayName, ai as estimateCostUsd, aq as formatConfigListing, aP as isConfigKey, C as CONFIG_KEYS, E as ENV_VAR_FOR_CONFIG_KEY, bj as parseConfigValue, d as ConfigValueParseError, as as formatDoctorReport, ar as formatCostSummary, au as formatGoalGraphState, aG as formatSearchResults, az as formatMemoryHistory, aC as formatMemoryStatus, aB as formatMemoryPendingOutcome, ax as formatMemoryArchive, aK as formatUndoLogListing, ab as defaultExportFilename, aJ as formatTranscriptMarkdown, aI as formatStatus, av as formatHelp, r as LAYER_ORDER, aw as formatLayerListing, bU as withLayerChoice, x as LayerSettingError, aA as formatMemoryInjection, Z as buildWhyChain, t as LAYER_SHORT_CODE, ac as defaultMemoryExportFilename, ay as formatMemoryExport, b4 as memoryAuditLogEnabled, aD as formatMemorySummary } from "./provider-setup-wX2IBw2X.js";
+import { OPENROUTER_DEFAULT_MODEL, OPENAI_DEFAULT_MODEL, ANTHROPIC_DEFAULT_MODEL, InMemoryReminderStore, FileSystemAdapter, FileSystemExperienceStore } from "@buildaharness/runtime";
+import { af as buildClaudePrompt, co as stripJsonCodeFence, c2 as recallToolEnabled, bw as lexicalOffEnvValue, a as ALREADY_STAGED_ACTION_TOOL, cn as stagedActionInput, bT as parseClaudeCliOutput, cp as stripMcpToolPrefix, bE as memoryStatusChecks, bR as normalizePlanNodes, V as PROVIDER_SETUP, ao as cleanApiKey, ah as checkApiKeyFormat, aG as envOverridesFromProcessEnv, c6 as resolveConfig, cl as shouldLaunchTuiApp, t as DEFAULT_TUI_MODE, a8 as applyLayerSettings, cj as sanitizeLayerChoices, cu as testApiKey, cx as validateConfig, aW as findInvalidNumericSettings, f as ConfigValidationError, be as formatSpendCapStatus, br as isPlanGraphEnabled, X as PersonalAssistant, ae as buildAssistantOptions, cq as stripTerminalControls, bn as isGoalGraphEnabled, b$ as planToSnapshot, ar as createLlmClient, au as createSmtpSender, at as createResendSender, aZ as formatConfigListing, bm as isConfigKey, e as CONFIG_KEYS, x as ENV_VAR_FOR_CONFIG_KEY, bU as parseConfigValue, g as ConfigValueParseError, ai as checkProxyHealth, a$ as formatDoctorReport, a_ as formatCostSummary, bW as parseProjectCommand, b1 as formatGoalGraphState, bd as formatSearchResults, b6 as formatMemoryHistory, b9 as formatMemoryStatus, b8 as formatMemoryPendingOutcome, b4 as formatMemoryArchive, bY as parseUndoActionCommand, bh as formatUndoLogListing, c0 as planUndo, ax as defaultExportFilename, bg as formatTranscriptMarkdown, aj as classifyError, bf as formatStatus, b2 as formatHelp, aS as explainSteps, aR as explainSources, aP as explainLayers, b3 as formatLayerListing, cA as withLayerChoice, O as LayerSettingError, aT as explainWhy, bt as isQuitCommand, P as LiveSteeringChannel, ay as defaultMemoryExportFilename, b5 as formatMemoryExport, bD as memoryAuditLogEnabled, ba as formatMemorySummary, aa as approvalLabels, U as NO_TRACE, R as MISSING_PLAN_APPROVAL_ID_REASON, c1 as presentTurnResult, bb as formatNextSteps, aQ as explainPlan, bH as nodeToLayer, L as LAYER_DISPLAY_NAME, bG as nodeDisplayName, j as DEFAULT_CLARIFICATION_REASON, aE as emptyDraft, aC as draftToAnswer, bS as orderedOptions, cz as withCostEstimate, C as CLI_FEATURES, ad as braveSearch } from "./provider-setup-Cy9dwqrd.js";
 import { spawn } from "node:child_process";
 import { createServer, connect } from "node:net";
 import { createRequire } from "node:module";
@@ -129,7 +129,7 @@ function createNodeFsBackend() {
     }
   };
 }
-const CLI_VERSION = "0.3.7";
+const CLI_VERSION = "0.3.9";
 function seaCacheDir(version, home = homedir()) {
   return join(home, ".buildaharness", "personal-assistant", "sea-cache", version);
 }
@@ -699,22 +699,6 @@ class NodeConfigStore {
   }
 }
 const DOCTOR_CHECK_TIMEOUT_MS = 3e3;
-async function checkProxyHealth(proxyUrl) {
-  const label = `proxy reachable (${redactUrlCredentials(proxyUrl)}/health)`;
-  const controller = new AbortController();
-  const timeout = setTimeout(() => controller.abort(), DOCTOR_CHECK_TIMEOUT_MS);
-  try {
-    const res = await fetch(`${proxyUrl}/health`, { signal: controller.signal });
-    if (!res.ok) return { label, ok: false, detail: `HTTP ${res.status}` };
-    const body = await res.json().catch(() => void 0);
-    return (body == null ? void 0 : body.status) === "ok" ? { label, ok: true } : { label, ok: false, detail: "unexpected response body" };
-  } catch (err) {
-    const timedOut = err instanceof Error && err.name === "AbortError";
-    return { label, ok: false, detail: timedOut ? "timed out" : err instanceof Error ? err.message : String(err) };
-  } finally {
-    clearTimeout(timeout);
-  }
-}
 function checkClaudeCli(claudePath) {
   const label = `claude binary (${claudePath})`;
   return new Promise((resolvePromise) => {
@@ -3475,84 +3459,47 @@ function buildEmailSender(config) {
   return void 0;
 }
 function buildLlmClient(config, workspaceRoot, remindersFile) {
-  switch (config.llmBackend) {
-    case "claude-cli":
-      return new ClaudeCliLLMClient({
-        fileTools: { workspaceRoot },
-        remindersFile,
-        shellTools: config.enableShell ? { workspaceRoot } : void 0,
-        webTools: config.enableWeb ? { braveApiKey: config.braveApiKey } : void 0,
-        actionTools: config.enableEmail ? { workspaceRoot } : void 0
-      });
-    case "anthropic":
-      return new AnthropicLLMClient({ apiKey: config.apiKey ?? "" });
-    case "openai":
-      return new OpenAICompatibleLLMClient({ apiKey: config.apiKey ?? "", baseUrl: OPENAI_BASE_URL, defaultModel: OPENAI_DEFAULT_MODEL });
-    case "openrouter":
-      return new OpenAICompatibleLLMClient({
-        apiKey: config.apiKey ?? "",
-        baseUrl: OPENROUTER_BASE_URL,
-        defaultModel: OPENROUTER_DEFAULT_MODEL,
-        extraHeaders: OPENROUTER_EXTRA_HEADERS
-      });
-    case "proxy":
-      return new LLMClient({ proxyUrl: config.proxyUrl, authToken: config.authToken });
-  }
+  return createLlmClient(config, {
+    claudeCli: () => new ClaudeCliLLMClient({
+      fileTools: { workspaceRoot },
+      remindersFile,
+      shellTools: config.enableShell ? { workspaceRoot } : void 0,
+      webTools: config.enableWeb ? { braveApiKey: config.braveApiKey } : void 0,
+      actionTools: config.enableEmail ? { workspaceRoot } : void 0
+    })
+  });
 }
 async function buildAssistant(config, { backend, dataDir, remindersFile }) {
   const workspaceRoot = config.workspaceRoot ?? process.cwd();
   if (backend === defaultBackend) excludeAieliaStateFromGit(workspaceRoot);
   const search = (query) => braveSearch(query, config.braveApiKey);
   const llmClient = buildLlmClient(config, workspaceRoot, remindersFile);
-  return PersonalAssistant.create({
-    llmClient,
-    // Name the backend's real default when none is set, so spend tracking prices the model that actually runs (not the Anthropic default).
-    model: config.model ?? defaultModelForBackend(config.llmBackend),
-    // config.activeProject (set via /project <name>) overrides the default of "the workspace
-    // I'm running in" — see PersonalAssistantOptions.activeProject's doc comment.
-    activeProject: config.activeProject || workspaceRoot,
-    memoryBudgetChars: config.memoryBudgetChars,
-    memoryWriteMode: config.memoryWriteMode,
-    // M5: consolidation proposals are staged for /memory consolidate; the CLI has the controls, so it may raise them on /new.
-    consolidateOnNewSession: true,
-    memory: new FileSystemAdapter({ backend, baseDir: dataDir, namespace: "transcripts" }),
-    experienceStore: await FileSystemExperienceStore.create({ backend, baseDir: dataDir, namespace: "experience" }),
-    checkpointStore: new FileSystemAdapter({ backend, baseDir: dataDir, namespace: "checkpoints" }),
-    reminderStore: new InMemoryReminderStore(new FileSystemAdapter({ backend, baseDir: dataDir, namespace: "reminders" })),
-    fileTools: { backend, workspaceRoot },
-    webTools: config.enableWeb ? { search } : void 0,
-    // executeCommand is the real child_process.spawn-based implementation (shell-executor.ts) —
-    // wired in here, not inside assistant.ts, so the browser build never needs node:child_process.
-    shellTools: config.enableShell ? { backend, workspaceRoot, timeoutMs: config.shellTimeoutMs, networkAllowlist: config.shellNetworkAllowlist, executeCommand: runApprovedShellCommand } : void 0,
-    // The Resend/SMTP transport is wired in here, not inside assistant.ts, so the browser build
-    // never needs nodemailer or a mail server — same split as shellTools' executeCommand.
-    actionTools: (() => {
-      const sendEmail = buildEmailSender(config);
-      return sendEmail ? { backend, workspaceRoot, sendEmail } : void 0;
-    })(),
-    dangerouslySkipPermissions: config.dangerouslySkipPermissions,
-    // Opt-in durable record of tool calls/results and approvals (see activity-log.ts).
-    onDebugLog: activityLogEnabled(process.env) ? createActivityLogger(join(dataDir, "activity-log.jsonl")) : void 0,
-    spendCap: config.sessionCostLimitUsd !== void 0 || config.sessionCallLimit !== void 0 ? { sessionCostLimitUsd: config.sessionCostLimitUsd, sessionCallLimit: config.sessionCallLimit } : void 0,
-    // Resolved through the shared config seam (cli-config.ts's envOverridesFromProcessEnv reads
-    // ASSISTANT_ONE_LOOP into config.oneLoopMode; /config set oneLoopMode persists it) so the CLI,
-    // chat-ui, and the Tauri desktop build all decide this the same way. Undefined here means
-    // PersonalAssistant falls back to DEFAULT_ONE_LOOP_MODE.
-    oneLoopMode: config.oneLoopMode,
-    layerPolicyMode: config.layerPolicyMode,
-    // R7: turn-end next-step options and DONE-thread suggestions. Undefined config means the
-    // package default (enabled); PersonalAssistant itself defaults to disabled, so this is where
-    // the front end opts in.
-    goalGraphSuggestMode: isGoalGraphSuggestEnabled(config.goalGraphSuggestMode) ? "enabled" : "disabled",
-    // P11 of the internal plan — resolved through the same shared config
-    // seam as oneLoopMode above (ASSISTANT_PLAN_MODE / `/config set planMode`). Undefined here
-    // means PersonalAssistant falls back to DEFAULT_PLAN_MODE ('legacy').
-    planMode: config.planMode,
-    ambiguityGuardMode: config.ambiguityGuardMode
-  });
+  return PersonalAssistant.create(
+    buildAssistantOptions(config, {
+      llmClient,
+      workspaceRoot,
+      features: CLI_FEATURES,
+      memory: new FileSystemAdapter({ backend, baseDir: dataDir, namespace: "transcripts" }),
+      experienceStore: await FileSystemExperienceStore.create({ backend, baseDir: dataDir, namespace: "experience" }),
+      checkpointStore: new FileSystemAdapter({ backend, baseDir: dataDir, namespace: "checkpoints" }),
+      reminderStore: new InMemoryReminderStore(new FileSystemAdapter({ backend, baseDir: dataDir, namespace: "reminders" })),
+      fileTools: { backend, workspaceRoot },
+      webTools: config.enableWeb ? { search } : void 0,
+      // executeCommand is the real child_process.spawn-based implementation (shell-executor.ts) —
+      // wired in here, not inside assistant.ts, so the browser build never needs node:child_process.
+      shellTools: config.enableShell ? { backend, workspaceRoot, timeoutMs: config.shellTimeoutMs, networkAllowlist: config.shellNetworkAllowlist, executeCommand: runApprovedShellCommand } : void 0,
+      // The Resend/SMTP transport is wired in here, not inside assistant.ts, so the browser build
+      // never needs nodemailer or a mail server — same split as shellTools' executeCommand.
+      actionTools: (() => {
+        const sendEmail = buildEmailSender(config);
+        return sendEmail ? { backend, workspaceRoot, sendEmail } : void 0;
+      })(),
+      // Opt-in durable record of tool calls/results and approvals (see activity-log.ts).
+      onDebugLog: activityLogEnabled(process.env) ? createActivityLogger(join(dataDir, "activity-log.jsonl")) : void 0
+    })
+  );
 }
 async function runCli(options = {}) {
-  printSafe("Aielia is alpha software — expect rough edges and breaking changes. It uses AI models and can make mistakes; verify anything important.\n");
   const dataDir = options.dataDir ?? defaultDataDir;
   const configStore = options.configStore ?? defaultConfigStore;
   const backend = options.backend ?? defaultBackend;
@@ -3620,25 +3567,39 @@ Fix it by setting the missing value (in the config file under ${dataDir}, or via
     openai: OPENAI_DEFAULT_MODEL,
     openrouter: OPENROUTER_DEFAULT_MODEL
   };
-  printSafe(`backend: ${config.llmBackend} (${config.model ?? backendDisplayModel[config.llmBackend]})`);
+  const backendLine = `${config.llmBackend} · ${config.model ?? backendDisplayModel[config.llmBackend]}`;
   const enabledCapabilities = [];
   if (config.enableWeb) enabledCapabilities.push("web search/fetch (brave)");
   if (config.enableShell) enabledCapabilities.push(`shell commands (${config.dangerouslySkipPermissions ? "NOT approval-gated" : "approval-gated"})`);
-  const capabilitySuffix = enabledCapabilities.length > 0 ? ` — enabled: ${enabledCapabilities.join(", ")}` : "";
-  const dangerBanner = config.dangerouslySkipPermissions ? "\n⚠ dangerouslySkipPermissions is ON — every approval prompt (risky messages, file writes, shell commands) is skipped automatically.\n" : "";
-  const nonInteractiveBanner = nonInteractiveApprovalMode === "decline" ? "\nASSISTANT_NON_INTERACTIVE_APPROVAL=decline is set — every approval prompt auto-declines.\n" : "";
+  const capabilityRow = enabledCapabilities.length > 0 ? `
+  tools     ${enabledCapabilities.join(", ")}` : "";
+  const dangerBanner = config.dangerouslySkipPermissions ? "\n  ⚠ dangerouslySkipPermissions is ON — every approval prompt is skipped automatically." : "";
+  const nonInteractiveBanner = nonInteractiveApprovalMode === "decline" ? "\n  ⚠ ASSISTANT_NON_INTERACTIVE_APPROVAL=decline — every approval prompt auto-declines." : "";
   const startupUndoLogEntries = await assistant.listUndoLogEntries();
   const undoableFromBefore = startupUndoLogEntries.filter((e) => e.undoable).length;
   const undoBanner = undoableFromBefore > 0 ? `
-${undoableFromBefore} action${undoableFromBefore === 1 ? "" : "s"} from earlier sessions ${undoableFromBefore === 1 ? "is" : "are"} still revertible — see /undo-action.
-` : "";
-  printSafe(`Aielia — your personal assistant on the 11-layer harness, one turn at a time. Ctrl+C to exit.${capabilitySuffix}
-${dangerBanner}${nonInteractiveBanner}${undoBanner}`);
-  printSafe("Type /help to see all commands, /config to view settings.\n");
+  undo      ${undoableFromBefore} earlier action${undoableFromBefore === 1 ? "" : "s"} can be reverted with /undo-action` : "";
+  const startupSpend = await assistant.getSpendState("cli");
+  const fmtUsage = (input, output, cost) => `↑${input.toLocaleString()} ↓${output.toLocaleString()} tokens (~$${cost.toFixed(4)})`;
+  const totalUsageRow = `
+  total     ${fmtUsage(startupSpend.cumulativeInputTokens, startupSpend.cumulativeOutputTokens, startupSpend.cumulativeCostUsd)} across all sessions`;
+  printSafe(
+    [
+      `Aielia v${CLI_VERSION}`,
+      "Your personal assistant, one turn at a time.",
+      " ",
+      `  backend   ${backendLine}${capabilityRow}${undoBanner}${totalUsageRow}${dangerBanner}${nonInteractiveBanner}`,
+      " ",
+      "  /help commands   /config settings   Ctrl+C exit",
+      "  Alpha software: it can make mistakes, so verify anything important.",
+      " "
+    ].join("\n")
+  );
   void assistant.proposeMemoryConsolidation("cli").catch(() => void 0);
   rl.prompt();
   let lastTrace;
   let lastSources;
+  let lastAnswerClaim;
   let lastPlanStatus;
   let pendingPlanApproval;
   let lastTurnUsage;
@@ -3651,33 +3612,17 @@ ${dangerBanner}${nonInteractiveBanner}${undoBanner}`);
     { key: "a", label: "Yes, don't ask again this session" },
     { key: "n", label: "No" }
   ];
-  function withCostEstimate(usage) {
-    if (config.llmBackend === "claude-cli" || usage.costUsd !== void 0) return usage;
-    const estimated = estimateCostUsd(config.model ?? ANTHROPIC_DEFAULT_MODEL, usage);
-    return estimated !== void 0 ? { ...usage, costUsd: estimated } : usage;
-  }
-  const PLAN_TASK_STATUS_ICON = {
-    PENDING: "○",
-    RUNNING: "▶",
-    COMPLETE: "✓",
-    FAILED: "✗",
-    BLOCKED: "✗",
-    HUMAN_REQUIRED: "~"
-  };
-  function printPlan() {
+  function priceUsage(usage) {
+    return withCostEstimate(usage, { backend: config.llmBackend, model: config.model });
+  }
+  function printPlan(goalGraph) {
     if (!lastPlanStatus) {
-      printSafe("\nNo active plan for this session.\n");
+      printSafe(`
+${explainPlan({ ...lastTurnExplainInput(), goalGraph }).join("\n")}
+`);
       return;
     }
-    const lines = [
-      PLAN_LINE_PREFIX,
-      `Plan: ${lastPlanStatus.templateName ?? "custom plan"} (${lastPlanStatus.completionPct.toFixed(1)}% complete)`,
-      ...lastPlanStatus.tasks.flatMap((task) => [
-        `  ${PLAN_TASK_STATUS_ICON[task.status] ?? "?"} [${task.status}] ${task.id} — ${task.description}`,
-        ...task.note ? [`      not accepted as done: ${task.note}`] : []
-      ]),
-      `Success criteria: ${lastPlanStatus.successCriteria}`
-    ];
+    const lines = [PLAN_LINE_PREFIX, ...explainPlan(lastTurnExplainInput())];
     console.log(stripTerminalControls(`
 ${lines.join("\n")}
 `));
@@ -3692,7 +3637,7 @@ ${lines.join("\n")}
     const result = await assistant.sketchPlan("cli", request);
     console.log(stripTerminalControls(`Aielia> ${result.reply ?? "(no reply)"}
 `));
-    if (result.usage) lastTurnUsage = withCostEstimate(result.usage);
+    if (result.usage) lastTurnUsage = priceUsage(result.usage);
   }
   const PLAN_APPROVAL_OPTIONS = [
     { key: "y", label: "Approve" },
@@ -3757,7 +3702,7 @@ ${lines.join("\n")}
     }
     pendingPlanApproval = void 0;
     lastTrace = void 0;
-    lastNoTraceReason = `No harness trace — the last turn staged a plan that was ${decision === "decline" ? "declined" : "approved"} before the harness ran.`;
+    lastNoTraceReason = NO_TRACE.planApproval(decision === "decline" ? "declined" : "approved");
     await handleTurn(message, false, void 0, void 0, void 0, id, decision, edits);
   }
   async function loadPlanGraphNodes(live, threadId) {
@@ -3825,86 +3770,38 @@ ${result.lines.join("\n")}
       printPlanApproval(pendingPlanApproval.snapshot);
       return;
     }
-    printPlan();
-  }
-  function verificationHealthLabel({ strength, feasibility }) {
-    const confidence = Math.min(strength, feasibility);
-    if (confidence >= 0.7) return "High confidence";
-    if (confidence >= 0.4) return "Reasonably confident";
-    return "Worth double-checking";
+    printPlan(lastPlanStatus ? void 0 : await assistant.getGoalGraphState("cli"));
   }
-  function batchBudgetSummaryLine(batchBudget) {
-    const found = batchBudget.perItemOutcomes.filter((o) => o.status === "found").length;
-    const notFound = batchBudget.perItemOutcomes.filter((o) => o.status === "not_found").length;
-    const truncated = batchBudget.perItemOutcomes.filter((o) => o.status === "truncated_while_productive").length;
-    return `Batch: ${batchBudget.itemCount} items — ${found} found, ${notFound} not found, ${truncated} truncated (${batchBudget.totalCallsUsed} calls used, projected ~${Math.ceil(batchBudget.projectedTotal)})`;
+  function lastTurnExplainInput() {
+    return {
+      trace: lastTrace,
+      noTraceReason: lastNoTraceReason,
+      answerClaim: lastAnswerClaim,
+      memoryInjection: assistant.getLastMemoryInjection(),
+      sources: lastSources,
+      toolSteps: lastTurnToolSteps,
+      planStatus: lastPlanStatus
+    };
   }
   function printWhy() {
-    const memoryLine = formatMemoryInjection(assistant.getLastMemoryInjection());
-    if (!lastTrace) {
-      printSafe(`
-${lastNoTraceReason ?? "No harness trace for the last turn (nothing to explain yet, or it took the fast path)."}
-${memoryLine}
-`);
-      return;
-    }
     printSafe(`
-${verificationHealthLabel(lastTrace.verificationHealth)}`);
-    const chain = buildWhyChain(lastTrace.layerActivity);
-    if (chain.length > 0) {
-      printSafe("  " + chain.map((item) => `${LAYER_SHORT_CODE[item.layer]} (${item.reason})`).join(" > "));
-    }
-    if (lastTrace.batchBudget) {
-      printSafe("  " + batchBudgetSummaryLine(lastTrace.batchBudget));
-    }
-    printSafe(memoryLine);
-    printSafe("");
+${explainWhy(lastTurnExplainInput()).join("\n")}
+`);
   }
   function printLayers() {
-    if (!lastTrace) {
-      printSafe(`
-${lastNoTraceReason ?? "No harness trace for the last turn (nothing to explain yet, or it took the fast path)."}
+    printSafe(`
+${explainLayers(lastTurnExplainInput()).join("\n")}
 `);
-      return;
-    }
-    printSafe("");
-    const byLayer = new Map(lastTrace.layerActivity.map((e) => [e.layer, e]));
-    for (const layer of LAYER_ORDER) {
-      const e = byLayer.get(layer);
-      const mark = (e == null ? void 0 : e.fired) ? "✓" : "·";
-      const reason = (e == null ? void 0 : e.reason) ?? "not evaluated this turn";
-      printSafe(`  [${mark}] ${LAYER_DISPLAY_NAME[layer].padEnd(22)} ${reason}`);
-    }
-    if (lastTrace.batchBudget) {
-      printSafe("");
-      printSafe(`  ${batchBudgetSummaryLine(lastTrace.batchBudget)}`);
-      const STATUS_MARK = {
-        found: "✓",
-        not_found: "✗",
-        truncated_while_productive: "~"
-      };
-      for (const outcome of lastTrace.batchBudget.perItemOutcomes) {
-        printSafe(`    [${STATUS_MARK[outcome.status]}] ${outcome.item.padEnd(30)} ${outcome.status} (${outcome.callsUsed} calls)`);
-      }
-    }
-    printSafe("");
   }
-  const SOURCE_TOOL_LABEL = {
-    read_file: "Read",
-    list_directory: "Listed",
-    web_search: "Searched",
-    fetch_url: "Fetched"
-  };
   function printSources() {
-    if (!lastSources || lastSources.length === 0) {
-      printSafe("\nNo sources for the last turn (it used no file/web tool calls).\n");
-      return;
-    }
-    printSafe("");
-    for (const source of lastSources) {
-      printSafe(`  - ${SOURCE_TOOL_LABEL[source.tool]} ${source.path}`);
-    }
-    printSafe("");
+    printSafe(`
+${explainSources(lastTurnExplainInput()).join("\n")}
+`);
+  }
+  function printSteps() {
+    printSafe(`
+${explainSteps(lastTurnExplainInput()).join("\n")}
+`);
   }
   function printHelp() {
     printSafe(`
@@ -3979,12 +3876,12 @@ ${formatStatus({ config, overriddenKeys, transcriptLength: transcript.length, pl
     }
   }
   async function handleUndo() {
-    const transcriptBefore = await assistant.getTranscript("cli");
-    if (transcriptBefore.length === 0) {
+    const plan = planUndo(await assistant.getTranscript("cli"));
+    if (plan.nothingToUndo) {
       printSafe("\nNothing to undo.\n");
       return;
     }
-    const wasPendingApproval = transcriptBefore[transcriptBefore.length - 1].role !== "assistant";
+    const { wasPendingApproval } = plan;
     const undoneReminders = lastTurnToolSteps.filter((s) => s.tool === "create_reminder");
     const result = await assistant.undoLastTurn("cli");
     if (!result.undone) {
@@ -4003,14 +3900,15 @@ ${formatStatus({ config, overriddenKeys, transcriptLength: transcript.length, pl
     );
   }
   async function handleUndoAction(args) {
-    if (args.length === 0) {
+    const command = parseUndoActionCommand(args);
+    if (command.kind === "list") {
       const entries = await assistant.listUndoLogEntries();
       printSafe(`
 ${formatUndoLogListing(entries)}
 `);
       return;
     }
-    const staged = await assistant.stageUndoAction(args[0]);
+    const staged = await assistant.stageUndoAction(command.id);
     if (staged.status === "error") {
       printSafe(`
 ✗ ${staged.message}
@@ -4021,7 +3919,7 @@ ${formatUndoLogListing(entries)}
 [needs approval — revert] ${staged.reason}`));
     const confirmed = await askYesNo("Apply this revert? (y/N) ");
     lastTrace = void 0;
-    lastNoTraceReason = `No harness trace — the last turn was a staged revert that was ${confirmed ? "approved" : "declined"} before the harness ran.`;
+    lastNoTraceReason = NO_TRACE.stagedAction("revert", confirmed ? "approved" : "declined");
     await handleTurn("", confirmed, staged.pendingActionId);
   }
   async function printMemory() {
@@ -4240,24 +4138,8 @@ ${formatDoctorReport(checks)}
     }
     lastTurnToolSteps.push(step);
   }
-  function emptyClarificationDraft() {
-    return { selectedLabels: [], editText: "", freeText: "" };
-  }
-  function orderedAskOptions(question) {
-    const options2 = question.options ?? [];
-    return options2.map((option, index) => ({ option, index })).sort((a, b) => Number(b.option.recommended ?? false) - Number(a.option.recommended ?? false) || a.index - b.index).map(({ option }) => option);
-  }
-  function clarificationDraftToAnswer(questionId, draft) {
-    if (draft.selectedLabels.length > 0) {
-      return draft.editText.trim() ? { questionId, kind: "selected_with_edit", selectedLabels: draft.selectedLabels, editText: draft.editText.trim() } : { questionId, kind: "selected", selectedLabels: draft.selectedLabels };
-    }
-    if (draft.freeText.trim()) {
-      return { questionId, kind: "free_text", freeText: draft.freeText.trim() };
-    }
-    return null;
-  }
   function printClarificationQuestion(question, draft, index, total) {
-    const options2 = orderedAskOptions(question);
+    const options2 = orderedOptions(question);
     const allowFreeText = question.allowFreeText !== false;
     printSafe("");
     if (question.header) console.log(stripTerminalControls(`[${question.header}]`));
@@ -4287,9 +4169,10 @@ ${formatDoctorReport(checks)}
     const pendingClarificationId = result.pendingClarificationId;
     if (questions.length === 0 || !pendingClarificationId) {
       lastTrace = void 0;
-      lastNoTraceReason = `No harness trace — the last turn needed clarification (${result.reason ?? "no further detail"}) but had no answerable questions.`;
+      const unanswerable = presentTurnResult(result);
+      lastNoTraceReason = unanswerable.noTraceReason;
       console.log(stripTerminalControls(`
-[needs clarification] ${result.reason ?? "This request needs clarification."}
+[needs clarification] ${unanswerable.kind === "escalation" ? unanswerable.reason : DEFAULT_CLARIFICATION_REASON}
 `));
       return;
     }
@@ -4306,7 +4189,7 @@ ${formatDoctorReport(checks)}
     }
     printSafe(`
 [needs clarification] ${questions.length} question${questions.length === 1 ? "" : "s"} to answer.`);
-    const drafts = new Map(questions.map((q2) => [q2.id, emptyClarificationDraft()]));
+    const drafts = new Map(questions.map((q2) => [q2.id, emptyDraft()]));
     let index = 0;
     while (true) {
       const question = questions[index];
@@ -4321,7 +4204,7 @@ ${formatDoctorReport(checks)}
         return;
       }
       if (lower === "s" || lower === "submit") {
-        const answers = questions.map((q2) => clarificationDraftToAnswer(q2.id, drafts.get(q2.id)));
+        const answers = questions.map((q2) => draftToAnswer(q2.id, drafts.get(q2.id)));
         const missing = questions.filter((q2, i) => answers[i] === null);
         if (missing.length > 0) {
           printSafe(`
@@ -4356,7 +4239,7 @@ Still need an answer for: ${missing.map((q2) => q2.question).join("; ")}
       }
       const editMatch = /^e(\d+)$/i.exec(token);
       if (editMatch) {
-        const options2 = orderedAskOptions(question);
+        const options2 = orderedOptions(question);
         const option = options2[Number(editMatch[1]) - 1];
         if (!option) {
           printSafe(`
@@ -4376,7 +4259,7 @@ Select option ${editMatch[1]} first, then add a note with e${editMatch[1]}.
       }
       const toggleMatch = /^t(\d+)$/i.exec(token) ?? /^(\d+)$/.exec(token);
       if (toggleMatch) {
-        const options2 = orderedAskOptions(question);
+        const options2 = orderedOptions(question);
         const option = options2[Number(toggleMatch[1]) - 1];
         if (!option) {
           printSafe(`
@@ -4447,8 +4330,7 @@ Unrecognized input "${token}".
       });
       if (!streamedAnyTokens) clearProgress();
       if (result.status === "needs_approval" && result.pendingActionId) {
-        const kindLabel = result.pendingActionKind === "shell" ? "shell command" : result.pendingActionKind === "email" ? "send email" : result.pendingActionKind === "batch" ? "batch research" : "write";
-        const promptText = result.pendingActionKind === "shell" ? "Run this command?" : result.pendingActionKind === "email" ? "Send this email?" : result.pendingActionKind === "batch" ? "Continue?" : "Apply this write?";
+        const { kindLabel, promptText } = approvalLabels(result.pendingActionKind);
         console.log(stripTerminalControls(`
 [needs approval — ${kindLabel}] ${result.reason}`));
         let confirmed;
@@ -4461,7 +4343,7 @@ Unrecognized input "${token}".
           if (decision === "a" && result.pendingActionKind) rememberedActionKinds.add(result.pendingActionKind);
         }
         lastTrace = void 0;
-        lastNoTraceReason = `No harness trace — the last turn was a staged ${kindLabel} that was ${confirmed ? "approved" : "declined"} before the harness ran.`;
+        lastNoTraceReason = NO_TRACE.stagedAction(kindLabel, confirmed ? "approved" : "declined");
         await handleTurn(message, confirmed, result.pendingActionId);
         return;
       }
@@ -4482,7 +4364,7 @@ Unrecognized input "${token}".
           await handleTurn(message, true);
         } else {
           lastTrace = void 0;
-          lastNoTraceReason = "No harness trace — the last turn was blocked on an approval gate and declined before the harness ran.";
+          lastNoTraceReason = NO_TRACE.messageApproval("declined");
           await assistant.recordDeclinedRequest("cli", message, result.reason ?? "This request needed approval.");
           printSafe("Cancelled.\n");
         }
@@ -4495,7 +4377,7 @@ Unrecognized input "${token}".
       if (result.status === "needs_plan_approval") {
         if (!result.planApprovalId) {
           printSafe(`
-[needs plan approval] ${result.reason ?? "A plan is awaiting approval, but its approval id is missing."}
+[needs plan approval] ${result.reason ?? MISSING_PLAN_APPROVAL_ID_REASON}
 `);
           return;
         }
@@ -4506,7 +4388,7 @@ ${result.reason}`);
         if (snapshot) printPlanApproval(snapshot);
         pendingPlanApproval = { id, message, snapshot };
         lastTrace = void 0;
-        lastNoTraceReason = "No harness trace — the last turn staged a plan for approval (pending /plan approve|decline|edit).";
+        lastNoTraceReason = NO_TRACE.planApproval(void 0, " (pending /plan approve|decline|edit)");
         if (!snapshot) {
           printSafe("Decide with /plan approve or /plan decline.\n");
           return;
@@ -4529,44 +4411,48 @@ ${result.reason}`);
         } else {
           decision = "decline";
         }
-        lastNoTraceReason = `No harness trace — the last turn staged a plan that was ${decision === "decline" ? "declined" : "approved"} before the harness ran.`;
+        lastNoTraceReason = NO_TRACE.planApproval(decision === "decline" ? "declined" : "approved");
         await handleTurn(message, false, void 0, void 0, void 0, id, decision, edits);
         return;
       }
       if (result.status === "escalated") {
         lastTrace = void 0;
-        lastNoTraceReason = `No harness trace — the last turn escalated (${result.reason}) before completing.`;
+        const escalation = presentTurnResult(result);
+        lastNoTraceReason = escalation.noTraceReason;
         console.log(stripTerminalControls(`
-[escalated] ${result.reason}
+[escalated] ${escalation.kind === "escalation" ? escalation.reason : result.reason}
 `));
         return;
       }
       if (!pendingActionId) {
         lastTrace = result.harnessSkipped ? void 0 : result.trace;
-        lastNoTraceReason = result.harnessSkipped ? "No harness trace — the last turn was a simple, self-contained question answered directly without activating the harness (fast path)." : void 0;
+        lastAnswerClaim = result.answerClaim;
+        lastNoTraceReason = result.harnessSkipped ? NO_TRACE.fastPath : void 0;
       }
       lastSources = result.sources;
       if (!pendingActionId && (!result.harnessSkipped || result.planStatus)) lastPlanStatus = result.planStatus;
-      lastTurnUsage = result.usage ? withCostEstimate(result.usage) : void 0;
+      lastTurnUsage = result.usage ? priceUsage(result.usage) : void 0;
+      const shown = presentTurnResult(result);
+      const hints = shown.kind === "reply" ? shown.hints : {};
       const riskSuffix = result.riskLevel && result.riskLevel !== "LOW" ? ` [risk: ${result.riskLevel}]` : "";
-      const sourcesHint = result.sources && result.sources.length > 0 ? ` (${result.sources.length} source${result.sources.length > 1 ? "s" : ""} — /sources)` : "";
-      const planHint = result.planStatus ? ` (plan: ${result.planStatus.completionPct.toFixed(0)}% — /plan)` : "";
-      const contradictionNotice = result.contradictionNotice ? `
+      const sourcesHint = hints.sourcesCount ? ` (${hints.sourcesCount} source${hints.sourcesCount > 1 ? "s" : ""} — /sources)` : "";
+      const planHint = hints.planCompletionPct !== void 0 ? ` (plan: ${hints.planCompletionPct.toFixed(0)}% — /plan)` : "";
+      const contradictionNotice = hints.contradictionNotice ? `
 
-${result.contradictionNotice}` : "";
-      const reviewNotice = (result.reviewNotice ? `
+${hints.contradictionNotice}` : "";
+      const reviewNotice = (hints.reviewNotice ? `
 
-${result.reviewNotice}` : "") + (result.auditNotice ? `
+${hints.reviewNotice}` : "") + (hints.auditNotice ? `
 
-${result.auditNotice}` : "");
-      lastNextSteps = result.nextSteps && result.nextSteps.length > 0 ? result.nextSteps : void 0;
+${hints.auditNotice}` : "");
+      lastNextSteps = hints.nextSteps;
       const nextStepsBlock = lastNextSteps ? `
 
 ${formatNextSteps(lastNextSteps)}` : "";
       if (streamedAnyTokens) {
-        const pausedNoteText = result.pausedNote ? `
+        const pausedNoteText = hints.pausedNote ? `
 
-${result.pausedNote}` : "";
+${hints.pausedNote}` : "";
         process.stdout.write(stripTerminalControls(`${pausedNoteText}${riskSuffix}${sourcesHint}${planHint}${contradictionNotice}${reviewNotice}${nextStepsBlock}
 
 `));
@@ -4788,17 +4674,12 @@ ${config.model ?? "(using each backend's default)"}
     await handleConfigCommand(["set", "model", args.join(" ")]);
   }
   async function handleProject(args) {
-    if (args.length === 0) {
-      printSafe(`
-${assistant.getActiveProject() || "(none)"}
+    const command = parseProjectCommand(args, assistant.getActiveProject());
+    if (command.kind === "show") printSafe(`
+${command.message}
 `);
-      return;
-    }
-    if (args[0] === "clear") {
-      await handleConfigCommand(["reset", "activeProject"]);
-      return;
-    }
-    await handleConfigCommand(["set", "activeProject", args.join(" ")]);
+    else if (command.kind === "clear") await handleConfigCommand(["reset", "activeProject"]);
+    else await handleConfigCommand(["set", "activeProject", command.project]);
   }
   let turnInProgress = false;
   let lastNextSteps;
@@ -4808,6 +4689,7 @@ ${assistant.getActiveProject() || "(none)"}
     // Bare /layers is the last-turn fired/skipped view; its subcommands (settings/on/off/reset) edit the on/off choices.
     "/layers": (args) => args.length === 0 ? printLayers() : handleLayers(args),
     "/sources": () => printSources(),
+    "/steps": () => printSteps(),
     "/plan": (args) => handlePlan(args),
     "/help": () => printHelp(),
     "/clear": () => handleClear(),
@@ -4897,6 +4779,7 @@ ${assistant.getActiveProject() || "(none)"}
   });
   rl.resume();
   return {
+    commandNames: Object.keys(commands),
     dispatchLine: async (line) => {
       const message = line.trim();
       if (!message) return;
@@ -4912,7 +4795,11 @@ ${assistant.getActiveProject() || "(none)"}
       indicators.push(`Model: ${config.model ?? backendDisplayModel[config.llmBackend]}`);
       const spendState = await assistant.getSpendState("cli");
       indicators.push(
-        `↑${spendState.cumulativeInputTokens.toLocaleString()} ↓${spendState.cumulativeOutputTokens.toLocaleString()} tokens (~$${spendState.cumulativeCostUsd.toFixed(4)})`
+        `This session: ${fmtUsage(
+          spendState.cumulativeInputTokens - startupSpend.cumulativeInputTokens,
+          spendState.cumulativeOutputTokens - startupSpend.cumulativeOutputTokens,
+          spendState.cumulativeCostUsd - startupSpend.cumulativeCostUsd
+        )}`
       );
       const spendCapLine = formatSpendCapStatus(spendState, { sessionCostLimitUsd: config.sessionCostLimitUsd, sessionCallLimit: config.sessionCallLimit });
       if (spendCapLine) indicators.push(spendCapLine);
@@ -4956,7 +4843,7 @@ async function mainInner(argv) {
     });
   }
   if (shouldLaunchTuiApp(config.tuiMode ?? DEFAULT_TUI_MODE, Boolean(process.stdout.isTTY), Boolean(process.stdin.isTTY))) {
-    const { runTuiApp } = await import("./tui-app-C0J6HRzv.js");
+    const { runTuiApp } = await import("./tui-app-Dt72u8vZ.js");
     await runTuiApp();
     return;
   }
@@ -4983,4 +4870,4 @@ export {
   sanitizeLabel as s,
   toLines as t
 };
-//# sourceMappingURL=bin-C_hgDdSf.js.map
+//# sourceMappingURL=bin-CCwDFxDe.js.map