@buildaharness/aielia 0.3.5 → 0.3.7

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

@@ -1,20 +1,83 @@
 var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+import { existsSync, readFileSync, mkdirSync, appendFileSync, statSync, chmodSync, writeFileSync, renameSync, rmSync, createWriteStream, createReadStream, realpathSync } from "node:fs";
+import { join, dirname, resolve, isAbsolute } from "node:path";
 import { createInterface } from "node:readline";
 import { rename, stat, realpath, readdir, mkdir, unlink, writeFile, readFile } from "node:fs/promises";
-import { existsSync, mkdirSync, writeFileSync, renameSync, rmSync, createWriteStream, chmodSync, readFileSync, realpathSync } from "node:fs";
 import { homedir, tmpdir } from "node:os";
-import { join, dirname, resolve } from "node:path";
 import { fileURLToPath, pathToFileURL } from "node:url";
-import { OPENROUTER_DEFAULT_MODEL, OPENAI_DEFAULT_MODEL, ANTHROPIC_DEFAULT_MODEL, InMemoryReminderStore, FileSystemAdapter, FileSystemExperienceStore, LLMClient, OpenAICompatibleLLMClient, OPENROUTER_EXTRA_HEADERS, OPENROUTER_BASE_URL, OPENAI_BASE_URL, AnthropicLLMClient } from "@buildaharness/runtime";
-import { X as buildClaudePrompt, bH as stripJsonCodeFence, bm as recallToolEnabled, aX as lexicalOffEnvValue, a as ALREADY_STAGED_ACTION_TOOL, bG as stagedActionInput, bg as parseClaudeCliOutput, bI as stripMcpToolPrefix, b3 as memoryStatusChecks, bf as normalizePlanNodes, P as PROVIDER_SETUP, a3 as cleanApiKey, Z as checkApiKeyFormat, af as envOverridesFromProcessEnv, bp as resolveConfig, bE as shouldLaunchTuiApp, Q as applyLayerSettings, bC as sanitizeLayerChoices, bL as testApiKey, bO as validateConfig, c as ConfigValidationError, aF as formatSpendCapStatus, aS as isPlanGraphEnabled, z as PersonalAssistant, aP as isGoalGraphSuggestEnabled, aO as isGoalGraphEnabled, bl as planToSnapshot, V as braveSearch, a7 as createSmtpSender, a6 as createResendSender, aU as isQuitCommand, x as LiveSteeringChannel, aC as formatNextSteps, _ as classifyError, b6 as nodeToLayer, L as LAYER_DISPLAY_NAME, b5 as nodeDisplayName, ah as estimateCostUsd, ao as formatConfigListing, aN as isConfigKey, C as CONFIG_KEYS, E as ENV_VAR_FOR_CONFIG_KEY, bh as parseConfigValue, d as ConfigValueParseError, aq as formatDoctorReport, ap as formatCostSummary, as as formatGoalGraphState, aE as formatSearchResults, ax as formatMemoryHistory, aA as formatMemoryStatus, az as formatMemoryPendingOutcome, av as formatMemoryArchive, aI as formatUndoLogListing, aa as defaultExportFilename, aH as formatTranscriptMarkdown, aG as formatStatus, at as formatHelp, q as LAYER_ORDER, au as formatLayerListing, bP as withLayerChoice, w as LayerSettingError, ay as formatMemoryInjection, Y as buildWhyChain, s as LAYER_SHORT_CODE, ab as defaultMemoryExportFilename, aw as formatMemoryExport, b2 as memoryAuditLogEnabled, aB as formatMemorySummary } from "./provider-setup-LFsaTkpf.js";
+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 { spawn } from "node:child_process";
 import { createServer, connect } from "node:net";
 import { createRequire } from "node:module";
 import { randomBytes, createHash } from "node:crypto";
 import { Readable } from "node:stream";
 import { pipeline } from "node:stream/promises";
+const AIELIA_STATE_DIRS = [".pending-actions", ".undo-log", ".buildaharness"];
+function findGitDir(start) {
+  let dir = resolve(start);
+  for (; ; ) {
+    const dotGit = join(dir, ".git");
+    if (existsSync(dotGit)) {
+      const stat2 = statSync(dotGit);
+      if (stat2.isDirectory()) return dotGit;
+      const line = readFileSync(dotGit, "utf8").split("\n").find((l) => l.startsWith("gitdir:"));
+      if (!line) return void 0;
+      const target = line.slice("gitdir:".length).trim();
+      const gitDir = isAbsolute(target) ? target : resolve(dir, target);
+      const commonFile = join(gitDir, "commondir");
+      if (existsSync(commonFile)) return resolve(gitDir, readFileSync(commonFile, "utf8").trim());
+      return gitDir;
+    }
+    const parent = dirname(dir);
+    if (parent === dir) return void 0;
+    dir = parent;
+  }
+}
+function excludeAieliaStateFromGit(workspaceRoot) {
+  try {
+    const gitDir = findGitDir(workspaceRoot);
+    if (!gitDir) return [];
+    const excludeFile = join(gitDir, "info", "exclude");
+    const existing = existsSync(excludeFile) ? readFileSync(excludeFile, "utf8") : "";
+    const present = new Set(existing.split("\n").map((l) => l.trim()));
+    const missing = AIELIA_STATE_DIRS.map((d) => `${d}/`).filter((entry) => !present.has(entry) && !present.has(entry.slice(0, -1)));
+    if (missing.length === 0) return [];
+    mkdirSync(dirname(excludeFile), { recursive: true });
+    const prefix = existing === "" || existing.endsWith("\n") ? "" : "\n";
+    appendFileSync(excludeFile, `${prefix}# Aielia state (added automatically)
+${missing.join("\n")}
+`);
+    return missing;
+  } catch {
+    return [];
+  }
+}
+function activityLogEnabled(env) {
+  return /^(1|true|on|yes|enabled)$/i.test(env.ASSISTANT_ACTIVITY_LOG ?? "");
+}
+function createActivityLogger(filePath, now = () => /* @__PURE__ */ new Date()) {
+  let ready = false;
+  return (entry) => {
+    try {
+      if (!ready) {
+        mkdirSync(dirname(filePath), { recursive: true, mode: 448 });
+      }
+      appendFileSync(filePath, JSON.stringify({ at: now().toISOString(), sessionId: entry.sessionId, kind: entry.kind, content: entry.content }) + "\n", { mode: 384 });
+      if (!ready) {
+        try {
+          chmodSync(filePath, 384);
+        } catch {
+        }
+        ready = true;
+      }
+    } catch (err) {
+      console.error("[activity-log] could not write an entry:", err);
+    }
+  };
+}
 function isEnoent$1(err) {
   return (err == null ? void 0 : err.code) === "ENOENT";
 }
@@ -66,7 +129,7 @@ function createNodeFsBackend() {
     }
   };
 }
-const CLI_VERSION = "0.3.5";
+const CLI_VERSION = "0.3.7";
 function seaCacheDir(version, home = homedir()) {
   return join(home, ".buildaharness", "personal-assistant", "sea-cache", version);
 }
@@ -130,19 +193,15 @@ function invokeClaudeStreaming(claudePath, args, onToolStep) {
     let buffer = "";
     let stderr = "";
     let finalResultLine;
-    proc.stdout.on("data", (chunk) => {
+    const handleLine = (line) => {
       var _a;
-      buffer += chunk.toString("utf-8");
-      let newlineIndex;
-      while ((newlineIndex = buffer.indexOf("\n")) !== -1) {
-        const line = buffer.slice(0, newlineIndex);
-        buffer = buffer.slice(newlineIndex + 1);
-        if (!line.trim()) continue;
+      {
+        if (!line.trim()) return;
         let event;
         try {
           event = JSON.parse(line);
         } catch {
-          continue;
+          return;
         }
         if (event.type === "assistant" && onToolStep) {
           for (const block of ((_a = event.message) == null ? void 0 : _a.content) ?? []) {
@@ -154,6 +213,15 @@ function invokeClaudeStreaming(claudePath, args, onToolStep) {
           finalResultLine = line;
         }
       }
+    };
+    proc.stdout.on("data", (chunk) => {
+      buffer += chunk.toString("utf-8");
+      let newlineIndex;
+      while ((newlineIndex = buffer.indexOf("\n")) !== -1) {
+        const line = buffer.slice(0, newlineIndex);
+        buffer = buffer.slice(newlineIndex + 1);
+        handleLine(line);
+      }
     });
     proc.stderr.on("data", (chunk) => {
       stderr += chunk;
@@ -164,6 +232,8 @@ function invokeClaudeStreaming(claudePath, args, onToolStep) {
         reject(new Error(stderr.trim() || `claude exited with code ${code}`));
         return;
       }
+      handleLine(buffer);
+      buffer = "";
       resolvePromise(parseClaudeCliOutput(finalResultLine ?? ""));
     });
   });
@@ -171,6 +241,8 @@ function invokeClaudeStreaming(claudePath, args, onToolStep) {
 function startToolGateServer(onToolProposal, onToolResult, onToolExecute) {
   return new Promise((resolvePromise, reject) => {
     const server = createServer((socket) => {
+      socket.on("error", () => {
+      });
       let buffer = "";
       socket.on("data", (chunk) => {
         buffer += chunk.toString("utf-8");
@@ -283,7 +355,7 @@ class ClaudeCliLLMClient {
     ];
     const model = options.model ?? this.model;
     if (model) args.push("--model", model);
-    args.push(prompt);
+    args.push("--", prompt);
     const { reply, usage, model: resolved } = await invokeClaude(this.claudePath, args);
     if (resolved) this.resolvedModelId = resolved;
     if (usage) (_a = options.onUsage) == null ? void 0 : _a.call(options, usage);
@@ -369,7 +441,7 @@ class ClaudeCliLLMClient {
       ];
       const model = options.model ?? this.model;
       if (model) args.push("--model", model);
-      args.push(prompt);
+      args.push("--", prompt);
       const callStartedAt = Date.now();
       const { reply, usage, model: resolved } = await invokeClaudeStreaming(this.claudePath, args, options.onToolStep);
       if (resolved) this.resolvedModelId = resolved;
@@ -408,9 +480,14 @@ class ClaudeCliLLMClient {
     for (const name of names) {
       if (!name.endsWith(".json")) continue;
       const filePath = `${dir}/${name}`;
-      const stats = await stat(filePath);
-      if (stats.mtimeMs < startTimeMs - 1e3) continue;
-      const record = JSON.parse(await readFile(filePath, "utf-8"));
+      let record;
+      try {
+        const stats = await stat(filePath);
+        if (stats.mtimeMs < startTimeMs - 1e3) continue;
+        record = JSON.parse(await readFile(filePath, "utf-8"));
+      } catch {
+        continue;
+      }
       if (!earliest || record.stagedAt < earliest.stagedAt) earliest = record;
     }
     return earliest;
@@ -444,6 +521,7 @@ function handleConnection(clientSocket, allowlist) {
       return;
     }
     clientSocket.removeListener("data", onData);
+    clientSocket.pause();
     const headerText = buffered.slice(0, headerEnd).toString("utf-8");
     const requestLine = headerText.split("\r\n")[0] ?? "";
     const isConnect = /^CONNECT\s/i.test(requestLine);
@@ -464,6 +542,7 @@ function handleConnection(clientSocket, allowlist) {
       upstream.pipe(clientSocket);
     });
     upstream.on("error", () => clientSocket.destroy());
+    clientSocket.on("close", () => upstream.destroy());
   };
   clientSocket.on("data", onData);
   clientSocket.on("error", () => clientSocket.destroy());
@@ -539,7 +618,18 @@ const runApprovedShellCommand = async (command, cwd, options = {}) => {
     let output = "";
     let timedOut = false;
     let settled = false;
+    const finish = (exitCode) => {
+      if (settled) return;
+      settled = true;
+      clearTimeout(timer);
+      resolvePromise({
+        output: truncateOutput(output, maxOutputBytes),
+        exitCode: timedOut ? null : exitCode,
+        timedOut
+      });
+    };
     const timer = setTimeout(() => {
+      var _a2, _b2;
       timedOut = true;
       try {
         if (proc.pid) process.kill(-proc.pid, "SIGKILL");
@@ -547,29 +637,25 @@ const runApprovedShellCommand = async (command, cwd, options = {}) => {
       } catch {
         proc.kill("SIGKILL");
       }
+      (_b2 = (_a2 = setTimeout(() => {
+        var _a3, _b3;
+        (_a3 = proc.stdout) == null ? void 0 : _a3.destroy();
+        (_b3 = proc.stderr) == null ? void 0 : _b3.destroy();
+        finish(null);
+      }, 2e3)).unref) == null ? void 0 : _b2.call(_a2);
     }, timeoutMs);
-    (_a = proc.stdout) == null ? void 0 : _a.on("data", (chunk) => {
-      output += chunk.toString("utf-8");
-    });
-    (_b = proc.stderr) == null ? void 0 : _b.on("data", (chunk) => {
-      output += chunk.toString("utf-8");
-    });
+    const append = (chunk) => {
+      if (output.length <= maxOutputBytes * 2) output += chunk.toString("utf-8");
+    };
+    (_a = proc.stdout) == null ? void 0 : _a.on("data", append);
+    (_b = proc.stderr) == null ? void 0 : _b.on("data", append);
     proc.on("error", (err) => {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
       reject(err);
     });
-    proc.on("close", (exitCode) => {
-      if (settled) return;
-      settled = true;
-      clearTimeout(timer);
-      resolvePromise({
-        output: truncateOutput(output, maxOutputBytes),
-        exitCode: timedOut ? null : exitCode,
-        timedOut
-      });
-    });
+    proc.on("close", (exitCode) => finish(exitCode));
   });
 };
 function isEnoent(err) {
@@ -589,7 +675,9 @@ class NodeConfigStore {
       throw err;
     }
     try {
-      return JSON.parse(raw);
+      const parsed = JSON.parse(raw);
+      if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) throw new Error("not an object");
+      return parsed;
     } catch {
       console.error(`Warning: ${this.path} is not valid JSON — ignoring it and falling back to defaults.`);
       return {};
@@ -604,15 +692,15 @@ class NodeConfigStore {
   async writePatch(patch) {
     const existing = await this.load();
     const merged = { ...existing, ...patch };
-    await mkdir(dirname(this.path), { recursive: true });
+    await mkdir(dirname(this.path), { recursive: true, mode: 448 });
     const tempPath = `${this.path}.tmp-${process.pid}-${randomBytes(6).toString("hex")}`;
-    await writeFile(tempPath, JSON.stringify(merged, null, 2), "utf-8");
+    await writeFile(tempPath, JSON.stringify(merged, null, 2), { encoding: "utf-8", mode: 384 });
     await rename(tempPath, this.path);
   }
 }
 const DOCTOR_CHECK_TIMEOUT_MS = 3e3;
 async function checkProxyHealth(proxyUrl) {
-  const label = `proxy reachable (${proxyUrl}/health)`;
+  const label = `proxy reachable (${redactUrlCredentials(proxyUrl)}/health)`;
   const controller = new AbortController();
   const timeout = setTimeout(() => controller.abort(), DOCTOR_CHECK_TIMEOUT_MS);
   try {
@@ -3183,8 +3271,13 @@ function parseGithubReleases(releases, allowInsecureHttp) {
   }
   return best;
 }
-async function getJson(fetchFn, url, headers = {}) {
-  return fetchFn(url, { headers, signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS), redirect: "follow" });
+function assertFinalUrlHttps(res, allowInsecureHttp) {
+  if (res.url) assertHttps(res.url, allowInsecureHttp);
+}
+async function getJson(fetchFn, url, headers = {}, allowInsecureHttp = false) {
+  const res = await fetchFn(url, { headers, signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS), redirect: "follow" });
+  assertFinalUrlHttps(res, allowInsecureHttp);
+  return res;
 }
 async function fetchLatestRelease(options, etag) {
   const fetchFn = options.fetchFn ?? fetch;
@@ -3195,7 +3288,7 @@ async function fetchLatestRelease(options, etag) {
   assertHttps(apiUrl, insecure);
   let manifestError;
   try {
-    const res2 = await getJson(fetchFn, manifestUrl);
+    const res2 = await getJson(fetchFn, manifestUrl, {}, insecure);
     if (res2.ok) return { release: parseManifest(await res2.json(), insecure) };
     manifestError = new Error(`manifest HTTP ${res2.status}`);
   } catch (err) {
@@ -3203,7 +3296,7 @@ async function fetchLatestRelease(options, etag) {
   }
   const headers = { Accept: "application/vnd.github+json" };
   if (etag) headers["If-None-Match"] = etag;
-  const res = await getJson(fetchFn, apiUrl, headers);
+  const res = await getJson(fetchFn, apiUrl, headers, insecure);
   if (res.status === 304 && etag) return { notModified: true };
   if (!res.ok) {
     throw new Error(`Could not check for updates (manifest: ${(manifestError == null ? void 0 : manifestError.message) ?? manifestError}; GitHub: HTTP ${res.status})`);
@@ -3264,10 +3357,12 @@ function replaceBinary(execPath, newFile, platform = process.platform) {
   chmodSync(newFile, 493);
   renameSync(newFile, execPath);
 }
-async function downloadTo(fetchFn, url, dest) {
+async function downloadTo(fetchFn, url, dest, allowInsecureHttp = false) {
   const res = await fetchFn(url, { signal: AbortSignal.timeout(DOWNLOAD_TIMEOUT_MS), redirect: "follow" });
   if (!res.ok || !res.body) throw new Error(`Download failed: HTTP ${res.status} for ${url}`);
+  if (res.url) assertHttps(res.url, allowInsecureHttp);
   const hash = createHash("sha256");
+  rmSync(dest, { force: true });
   await pipeline(
     Readable.fromWeb(res.body),
     async function* (source) {
@@ -3276,13 +3371,18 @@ async function downloadTo(fetchFn, url, dest) {
         yield chunk;
       }
     },
-    createWriteStream(dest)
+    createWriteStream(dest, { flags: "wx" })
   );
   return hash.digest("hex");
 }
-async function fetchSidecarHash(fetchFn, assetUrl) {
+async function sha256OfFile(path) {
+  const hash = createHash("sha256");
+  for await (const chunk of createReadStream(path)) hash.update(chunk);
+  return hash.digest("hex");
+}
+async function fetchSidecarHash(fetchFn, assetUrl, allowInsecureHttp = false) {
   try {
-    const res = await getJson(fetchFn, `${assetUrl}.sha256`);
+    const res = await getJson(fetchFn, `${assetUrl}.sha256`, {}, allowInsecureHttp);
     if (!res.ok) return null;
     const m = /[0-9a-fA-F]{64}/.exec(await res.text());
     return m ? m[0].toLowerCase() : null;
@@ -3330,10 +3430,12 @@ async function runUpdateCommand(input = {}) {
   try {
     assertHttps(asset.url, insecure);
     log(`Downloading aielia ${release.version} (${key})…`);
-    const actual = await downloadTo(fetchFn, asset.url, tmp);
-    const sidecar = await fetchSidecarHash(fetchFn, asset.url);
+    const actual = await downloadTo(fetchFn, asset.url, tmp, insecure);
+    const sidecar = await fetchSidecarHash(fetchFn, asset.url, insecure);
     const expected = asset.sha256 ?? sidecar;
     if (!expected) throw new Error("No checksum available for this release — refusing to install an unverified binary");
+    const onDisk = await sha256OfFile(tmp);
+    if (onDisk !== actual) throw new Error("Downloaded file changed on disk during verification — download discarded");
     if (actual !== expected) throw new Error(`Checksum mismatch (expected ${expected}, got ${actual}) — download discarded`);
     if (asset.sha256 && sidecar && sidecar !== asset.sha256) {
       throw new Error("Checksum sidecar disagrees with the release manifest — download discarded");
@@ -3348,6 +3450,9 @@ async function runUpdateCommand(input = {}) {
     return 1;
   }
 }
+function printSafe(...args) {
+  console.log(...args.map((a) => typeof a === "string" ? stripTerminalControls(a) : a));
+}
 const defaultDataDir = join(homedir(), ".buildaharness", "personal-assistant");
 const defaultConfigStore = new NodeConfigStore(join(defaultDataDir, "config.json"));
 const defaultRemindersFile = join(defaultDataDir, "reminders", "reminders.json");
@@ -3396,11 +3501,13 @@ function buildLlmClient(config, workspaceRoot, remindersFile) {
 }
 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,
-    model: config.model,
+    // 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,
@@ -3424,6 +3531,8 @@ async function buildAssistant(config, { backend, dataDir, remindersFile }) {
       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,
@@ -3443,7 +3552,7 @@ async function buildAssistant(config, { backend, dataDir, remindersFile }) {
   });
 }
 async function runCli(options = {}) {
-  console.log("Aielia is alpha software — expect rough edges and breaking changes. It uses AI models and can make mistakes; verify anything important.\n");
+  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;
@@ -3483,22 +3592,25 @@ async function runCli(options = {}) {
   }
   try {
     validateConfig({}, config);
+    const numericProblems = findInvalidNumericSettings(config);
+    if (numericProblems.length > 0) throw new ConfigValidationError(numericProblems.join(" "));
   } catch (err) {
     if (!(err instanceof ConfigValidationError)) throw err;
-    console.error(err.message);
-    process.exit(1);
+    throw new StartupError(
+      `Aielia cannot start with this configuration: ${err.message}
+Fix it by setting the missing value (in the config file under ${dataDir}, or via the matching ASSISTANT_* environment variable), or by turning that feature off, then start again.`
+    );
   }
   if (nonInteractiveApprovalMode === "require-tty" && !process.stdin.isTTY) {
-    console.error(
+    throw new StartupError(
       `ASSISTANT_NON_INTERACTIVE_APPROVAL=require-tty is set, but stdin is not a real TTY (piped/scripted input). Refusing to start rather than fail confusingly at the first approval prompt — see README.md's "Non-interactive / scripted use" section for the alternative (ASSISTANT_NON_INTERACTIVE_APPROVAL=decline).`
     );
-    process.exit(1);
   }
   let assistant = options.assistant ?? await buildAssistant(config, { dataDir, backend, remindersFile });
   const rl = createInterface({ input: options.input ?? process.stdin, output: options.output ?? process.stdout, prompt: "you> " });
   rl.pause();
   rl.on("SIGINT", () => {
-    console.log("\nExiting.");
+    printSafe("\nExiting.");
     process.exit(0);
   });
   const backendDisplayModel = {
@@ -3508,7 +3620,7 @@ async function runCli(options = {}) {
     openai: OPENAI_DEFAULT_MODEL,
     openrouter: OPENROUTER_DEFAULT_MODEL
   };
-  console.log(`backend: ${config.llmBackend} (${config.model ?? backendDisplayModel[config.llmBackend]})`);
+  printSafe(`backend: ${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"})`);
@@ -3520,9 +3632,9 @@ async function runCli(options = {}) {
   const undoBanner = undoableFromBefore > 0 ? `
 ${undoableFromBefore} action${undoableFromBefore === 1 ? "" : "s"} from earlier sessions ${undoableFromBefore === 1 ? "is" : "are"} still revertible — see /undo-action.
 ` : "";
-  console.log(`Aielia — your personal assistant on the 11-layer harness, one turn at a time. Ctrl+C to exit.${capabilitySuffix}
+  printSafe(`Aielia — your personal assistant on the 11-layer harness, one turn at a time. Ctrl+C to exit.${capabilitySuffix}
 ${dangerBanner}${nonInteractiveBanner}${undoBanner}`);
-  console.log("Type /help to see all commands, /config to view settings.\n");
+  printSafe("Type /help to see all commands, /config to view settings.\n");
   void assistant.proposeMemoryConsolidation("cli").catch(() => void 0);
   rl.prompt();
   let lastTrace;
@@ -3554,7 +3666,7 @@ ${dangerBanner}${nonInteractiveBanner}${undoBanner}`);
   };
   function printPlan() {
     if (!lastPlanStatus) {
-      console.log("\nNo active plan for this session.\n");
+      printSafe("\nNo active plan for this session.\n");
       return;
     }
     const lines = [
@@ -3566,20 +3678,20 @@ ${dangerBanner}${nonInteractiveBanner}${undoBanner}`);
       ]),
       `Success criteria: ${lastPlanStatus.successCriteria}`
     ];
-    console.log(`
+    console.log(stripTerminalControls(`
 ${lines.join("\n")}
-`);
+`));
   }
   async function handlePlanSketch(args) {
     const request = args.join(" ").trim();
     if (!request) {
-      console.log("\nUsage: /plan sketch <request>\n");
+      printSafe("\nUsage: /plan sketch <request>\n");
       return;
     }
-    console.log("\nSketching a plan (read-only grounding only, nothing staged)...\n");
+    printSafe("\nSketching a plan (read-only grounding only, nothing staged)...\n");
     const result = await assistant.sketchPlan("cli", request);
-    console.log(`Aielia> ${result.reply ?? "(no reply)"}
-`);
+    console.log(stripTerminalControls(`Aielia> ${result.reply ?? "(no reply)"}
+`));
     if (result.usage) lastTurnUsage = withCostEstimate(result.usage);
   }
   const PLAN_APPROVAL_OPTIONS = [
@@ -3598,9 +3710,9 @@ ${lines.join("\n")}
       ...snapshot.tasks.map((task) => `  ${task.riskLevel === "HIGH" ? "!" : task.riskLevel === "MEDIUM" ? "·" : "○"} [${task.riskLevel ?? "LOW"}] ${task.id} — ${task.description}`),
       ...snapshot.reviewNotes && snapshot.reviewNotes.length > 0 ? ["Review notes:", ...snapshot.reviewNotes.map((note) => `  - ${note}`)] : []
     ];
-    console.log(`
+    console.log(stripTerminalControls(`
 ${lines.join("\n")}
-`);
+`));
   }
   async function promptPlanEdits(snapshot) {
     const knownIds = new Set(snapshot.tasks.map((task) => task.id));
@@ -3614,7 +3726,7 @@ ${lines.join("\n")}
     const validCancels = cancelTaskIds.filter((id) => knownIds.has(id));
     const validEdits = parsedEdits.filter((edit) => knownIds.has(edit.id) && edit.description);
     const unknown = [...cancelTaskIds.filter((id) => !knownIds.has(id)), ...parsedEdits.filter((e) => !knownIds.has(e.id)).map((e) => e.id)];
-    if (unknown.length > 0) console.log(`  [ignoring unknown task id(s): ${[...new Set(unknown)].join(", ")}]`);
+    if (unknown.length > 0) printSafe(`  [ignoring unknown task id(s): ${[...new Set(unknown)].join(", ")}]`);
     return {
       ...validCancels.length > 0 ? { cancelTaskIds: validCancels } : {},
       ...validEdits.length > 0 ? { editedTasks: validEdits } : {}
@@ -3622,7 +3734,7 @@ ${lines.join("\n")}
   }
   async function handlePlanApprovalCommand(sub) {
     if (!pendingPlanApproval) {
-      console.log("\nNo plan is awaiting approval.\n");
+      printSafe("\nNo plan is awaiting approval.\n");
       return;
     }
     const { id, message, snapshot } = pendingPlanApproval;
@@ -3634,7 +3746,7 @@ ${lines.join("\n")}
       decision = "approve_trusted";
     } else if (sub === "edit") {
       if (!snapshot) {
-        console.log("\n[tasks unavailable for editing — /plan approve or /plan decline]\n");
+        printSafe("\n[tasks unavailable for editing — /plan approve or /plan decline]\n");
         return;
       }
       printPlanApproval(snapshot);
@@ -3658,7 +3770,7 @@ ${lines.join("\n")}
   async function handlePlanGraph(args) {
     const nodes = await loadPlanGraphNodes(void 0, args[0]);
     if (!nodes) {
-      console.log(args[0] ? `
+      printSafe(args[0] ? `
 No plan graph for thread "${args[0]}".
 ` : "\nNo active plan for this session.\n");
       return;
@@ -3669,7 +3781,7 @@ No plan graph for thread "${args[0]}".
         options.openPlanGraph(nodes);
         return;
       }
-      console.log(`
+      printSafe(`
 [plan graph unavailable: ${probe.message}] showing the checklist instead.`);
       printPlan();
       return;
@@ -3678,20 +3790,20 @@ No plan graph for thread "${args[0]}".
     const color = Boolean(process.stdout.isTTY) && !process.env.NO_COLOR;
     const result = renderPlan(nodes, { maxCols: cols, color });
     if (!result.ok) {
-      console.log(`
+      printSafe(`
 [plan graph unavailable: ${result.message}] showing the checklist instead.`);
       printPlan();
       return;
     }
     if (!result.fits) {
-      console.log(`
+      printSafe(`
 [plan graph is wider than ${cols} columns] dependency list:
 `);
-      for (const n of nodes) console.log(`  [${n.status}] ${n.id} — ${n.label}${n.deps.length ? `  (after: ${n.deps.join(", ")})` : ""}`);
-      console.log("");
+      for (const n of nodes) printSafe(`  [${n.status}] ${n.id} — ${n.label}${n.deps.length ? `  (after: ${n.deps.join(", ")})` : ""}`);
+      printSafe("");
       return;
     }
-    console.log(`
+    printSafe(`
 ${result.lines.join("\n")}
 `);
   }
@@ -3730,52 +3842,52 @@ ${result.lines.join("\n")}
   function printWhy() {
     const memoryLine = formatMemoryInjection(assistant.getLastMemoryInjection());
     if (!lastTrace) {
-      console.log(`
+      printSafe(`
 ${lastNoTraceReason ?? "No harness trace for the last turn (nothing to explain yet, or it took the fast path)."}
 ${memoryLine}
 `);
       return;
     }
-    console.log(`
+    printSafe(`
 ${verificationHealthLabel(lastTrace.verificationHealth)}`);
     const chain = buildWhyChain(lastTrace.layerActivity);
     if (chain.length > 0) {
-      console.log("  " + chain.map((item) => `${LAYER_SHORT_CODE[item.layer]} (${item.reason})`).join(" > "));
+      printSafe("  " + chain.map((item) => `${LAYER_SHORT_CODE[item.layer]} (${item.reason})`).join(" > "));
     }
     if (lastTrace.batchBudget) {
-      console.log("  " + batchBudgetSummaryLine(lastTrace.batchBudget));
+      printSafe("  " + batchBudgetSummaryLine(lastTrace.batchBudget));
     }
-    console.log(memoryLine);
-    console.log("");
+    printSafe(memoryLine);
+    printSafe("");
   }
   function printLayers() {
     if (!lastTrace) {
-      console.log(`
+      printSafe(`
 ${lastNoTraceReason ?? "No harness trace for the last turn (nothing to explain yet, or it took the fast path)."}
 `);
       return;
     }
-    console.log("");
+    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";
-      console.log(`  [${mark}] ${LAYER_DISPLAY_NAME[layer].padEnd(22)} ${reason}`);
+      printSafe(`  [${mark}] ${LAYER_DISPLAY_NAME[layer].padEnd(22)} ${reason}`);
     }
     if (lastTrace.batchBudget) {
-      console.log("");
-      console.log(`  ${batchBudgetSummaryLine(lastTrace.batchBudget)}`);
+      printSafe("");
+      printSafe(`  ${batchBudgetSummaryLine(lastTrace.batchBudget)}`);
       const STATUS_MARK = {
         found: "✓",
         not_found: "✗",
         truncated_while_productive: "~"
       };
       for (const outcome of lastTrace.batchBudget.perItemOutcomes) {
-        console.log(`    [${STATUS_MARK[outcome.status]}] ${outcome.item.padEnd(30)} ${outcome.status} (${outcome.callsUsed} calls)`);
+        printSafe(`    [${STATUS_MARK[outcome.status]}] ${outcome.item.padEnd(30)} ${outcome.status} (${outcome.callsUsed} calls)`);
       }
     }
-    console.log("");
+    printSafe("");
   }
   const SOURCE_TOOL_LABEL = {
     read_file: "Read",
@@ -3785,17 +3897,17 @@ ${lastNoTraceReason ?? "No harness trace for the last turn (nothing to explain y
   };
   function printSources() {
     if (!lastSources || lastSources.length === 0) {
-      console.log("\nNo sources for the last turn (it used no file/web tool calls).\n");
+      printSafe("\nNo sources for the last turn (it used no file/web tool calls).\n");
       return;
     }
-    console.log("");
+    printSafe("");
     for (const source of lastSources) {
-      console.log(`  - ${SOURCE_TOOL_LABEL[source.tool]} ${source.path}`);
+      printSafe(`  - ${SOURCE_TOOL_LABEL[source.tool]} ${source.path}`);
     }
-    console.log("");
+    printSafe("");
   }
   function printHelp() {
-    console.log(`
+    printSafe(`
 ${formatHelp()}
 `);
   }
@@ -3807,12 +3919,12 @@ ${formatHelp()}
     pendingPlanApproval = void 0;
     lastTurnUsage = void 0;
     lastNoTraceReason = void 0;
-    console.log("\n✓ Started a fresh conversation.\n");
+    printSafe("\n✓ Started a fresh conversation.\n");
   }
   async function handleCheckpoint(args) {
     if (args[0] === "clear") {
       const result = await assistant.clearCheckpoint("cli");
-      console.log(
+      printSafe(
         result.cleared ? `
 ✓ Cleared the stuck checkpoint (was at step ${result.stepsUsed}, node "${result.currentNode}"). Conversation history is untouched — your next message starts a fresh harness run.
 ` : "\nNo checkpoint to clear — the last turn either completed normally or there was nothing in progress.\n"
@@ -3821,11 +3933,11 @@ ${formatHelp()}
     }
     const status = await assistant.getCheckpointStatus("cli");
     if (!status.present) {
-      console.log("\nNo checkpoint present — the last turn completed normally or there was nothing in progress.\n");
+      printSafe("\nNo checkpoint present — the last turn completed normally or there was nothing in progress.\n");
       return;
     }
     const attemptsNote = status.failedResumeAttempts > 0 ? ` — failed to resume ${status.failedResumeAttempts} time${status.failedResumeAttempts === 1 ? "" : "s"} in a row so far` : "";
-    console.log(
+    printSafe(
       `
 A checkpoint is present: step ${status.stepsUsed}, last node "${status.currentNode}"${attemptsNote}.
 Your next message will try to resume it automatically. Run /checkpoint clear to discard it and start fresh instead.
@@ -3836,7 +3948,7 @@ Your next message will try to resume it automatically. Run /checkpoint clear to
     const transcript = await assistant.getTranscript("cli");
     const undoLogEntries = await assistant.listUndoLogEntries();
     const spendCapLine = await spendCapStatusLine();
-    console.log(
+    printSafe(
       `
 ${formatStatus({ config, overriddenKeys, transcriptLength: transcript.length, planActive: lastPlanStatus !== void 0, undoLogEntries, spendCapLine })}
 `
@@ -3850,18 +3962,18 @@ ${formatStatus({ config, overriddenKeys, transcriptLength: transcript.length, pl
   async function handleExport(args) {
     const transcript = await assistant.getTranscript("cli");
     if (transcript.length === 0) {
-      console.log("\nNothing to export yet.\n");
+      printSafe("\nNothing to export yet.\n");
       return;
     }
-    const filename = resolve(process.cwd(), args[0] ?? defaultExportFilename());
+    const filename = resolve(process.cwd(), args.length > 0 ? args.join(" ") : defaultExportFilename());
     try {
       await writeFile(filename, formatTranscriptMarkdown(transcript), "utf-8");
-      console.log(`
+      printSafe(`
 ✓ Exported ${transcript.length} message${transcript.length === 1 ? "" : "s"} to ${filename}
 `);
     } catch (err) {
       const { message } = classifyError(err);
-      console.log(`
+      printSafe(`
 [error] ${message}
 `);
     }
@@ -3869,14 +3981,14 @@ ${formatStatus({ config, overriddenKeys, transcriptLength: transcript.length, pl
   async function handleUndo() {
     const transcriptBefore = await assistant.getTranscript("cli");
     if (transcriptBefore.length === 0) {
-      console.log("\nNothing to undo.\n");
+      printSafe("\nNothing to undo.\n");
       return;
     }
     const wasPendingApproval = transcriptBefore[transcriptBefore.length - 1].role !== "assistant";
     const undoneReminders = lastTurnToolSteps.filter((s) => s.tool === "create_reminder");
     const result = await assistant.undoLastTurn("cli");
     if (!result.undone) {
-      console.log("\nNothing to undo.\n");
+      printSafe("\nNothing to undo.\n");
       return;
     }
     lastTrace = void 0;
@@ -3884,7 +3996,7 @@ ${formatStatus({ config, overriddenKeys, transcriptLength: transcript.length, pl
     lastPlanStatus = void 0;
     lastTurnToolSteps = [];
     const caveat = undoneReminders.length > 0 ? ` Note: ${undoneReminders.length === 1 ? "a reminder" : `${undoneReminders.length} reminders`} created in that exchange (${undoneReminders.map((s) => `"${s.input.text}"`).join(", ")}) ${undoneReminders.length === 1 ? "is" : "are"} still active — /undo only removes chat history, not that side effect.` : "";
-    console.log(
+    printSafe(
       `
 ✓ Removed ${wasPendingApproval ? "the pending message awaiting approval" : "the last exchange (1 user message, 1 assistant reply)"}.${caveat}
 `
@@ -3893,20 +4005,20 @@ ${formatStatus({ config, overriddenKeys, transcriptLength: transcript.length, pl
   async function handleUndoAction(args) {
     if (args.length === 0) {
       const entries = await assistant.listUndoLogEntries();
-      console.log(`
+      printSafe(`
 ${formatUndoLogListing(entries)}
 `);
       return;
     }
     const staged = await assistant.stageUndoAction(args[0]);
     if (staged.status === "error") {
-      console.log(`
+      printSafe(`
 ✗ ${staged.message}
 `);
       return;
     }
-    console.log(`
-[needs approval — revert] ${staged.reason}`);
+    console.log(stripTerminalControls(`
+[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.`;
@@ -3918,7 +4030,7 @@ ${formatUndoLogListing(entries)}
     const digestLine = digests.length > 0 ? `
 Session digests stored: ${digests.length} (/memory forget digest [id] erases them; /memory export includes them).
 ` : "";
-    console.log(`
+    printSafe(`
 ${formatMemoryStatus(await assistant.getMemoryStatus("cli"))}
 
 ${formatMemorySummary(summary)}
@@ -3926,15 +4038,15 @@ ${digestLine}`);
   }
   async function handleMemoryExport(args) {
     const data = await assistant.exportMemory("cli");
-    const filename = resolve(process.cwd(), args[0] ?? defaultMemoryExportFilename());
+    const filename = resolve(process.cwd(), args.length > 0 ? args.join(" ") : defaultMemoryExportFilename());
     try {
       await writeFile(filename, formatMemoryExport(data), "utf-8");
-      console.log(`
+      printSafe(`
 ✓ Exported learned memory to ${filename}
 `);
     } catch (err) {
       const { message } = classifyError(err);
-      console.log(`
+      printSafe(`
 [error] ${message}
 `);
     }
@@ -3942,26 +4054,26 @@ ${digestLine}`);
   async function handleMemoryPending(action, args) {
     const selector = args[0];
     if (!selector) {
-      console.log(`
+      printSafe(`
 Usage: /memory ${action} <n> or /memory ${action} <category>
 `);
       return;
     }
     const outcome = action === "confirm" ? await assistant.confirmPendingFact(selector) : await assistant.rejectPendingFact(selector);
-    console.log(`
+    printSafe(`
 ${formatMemoryPendingOutcome(action === "confirm" ? "confirmed" : "rejected", outcome)}
 `);
   }
   async function handleMemoryForget(args) {
     const selector = args[0];
     if (!selector) {
-      console.log("\nUsage: /memory forget <n> [erase]\n");
+      printSafe("\nUsage: /memory forget <n> [erase]\n");
       return;
     }
     const erase = args[1] === "erase";
     const outcome = await assistant.forgetFact(selector, "cli", erase);
     const note = outcome.ok && !erase && memoryAuditLogEnabled() ? " The audit log still holds its text (see /memory history); use `/memory forget <n> erase` to remove that too." : "";
-    console.log(`
+    printSafe(`
 ${formatMemoryPendingOutcome("forgotten", outcome)}${note}
 `);
   }
@@ -3976,7 +4088,7 @@ ${formatMemoryPendingOutcome("forgotten", outcome)}${note}
     }
     if (args[0] === "forget" && (args[1] === "digest" || args[1] === "digests")) {
       const removed = await assistant.forgetDigests(args[2]);
-      console.log(`
+      printSafe(`
 Forgot ${removed} session digest${removed === 1 ? "" : "s"}.
 `);
       return;
@@ -3986,13 +4098,13 @@ Forgot ${removed} session digest${removed === 1 ? "" : "s"}.
       return;
     }
     if (args[0] === "history") {
-      console.log(`
+      printSafe(`
 ${formatMemoryHistory(await assistant.memoryHistory())}
 `);
       return;
     }
     if (args[0] === "status") {
-      console.log(`
+      printSafe(`
 ${formatMemoryStatus(await assistant.getMemoryStatus("cli"))}
 `);
       return;
@@ -4000,31 +4112,31 @@ ${formatMemoryStatus(await assistant.getMemoryStatus("cli"))}
     if (args[0] === "archive") {
       if (args[1] === "forget") {
         const outcome = await assistant.forgetArchivedFact(args[2] ?? "");
-        console.log(`
+        printSafe(`
 ${formatMemoryPendingOutcome("forgotten", outcome)}
 `);
         return;
       }
       if (args[1] === "restore") {
         const outcome = await assistant.restoreArchivedMemory(args[2] ?? "", "cli");
-        console.log(`
+        printSafe(`
 ${outcome.message}
 `);
         return;
       }
-      console.log(`
+      printSafe(`
 ${formatMemoryArchive(await assistant.listArchivedFacts(), await assistant.restorableArchiveCount())}
 `);
       return;
     }
     if (args[0] === "off" || args[0] === "on") {
       await assistant.setMemoryEnabled(args[0] === "on");
-      console.log(args[0] === "off" ? "\nMemory writes are OFF for this install: nothing new will be saved (facts, pending guesses, digests). What is already stored stays readable; /memory forget and /memory reject still work. /memory on resumes.\n" : "\nMemory writes are on.\n");
+      printSafe(args[0] === "off" ? "\nMemory writes are OFF for this install: nothing new will be saved (facts, pending guesses, digests). What is already stored stays readable; /memory forget and /memory reject still work. /memory on resumes.\n" : "\nMemory writes are on.\n");
       return;
     }
     if (args[0] === "undo") {
       const outcome = await assistant.undoMemoryChange(args[1] ?? "", "cli");
-      console.log(`
+      printSafe(`
 ${outcome.message}
 `);
       return;
@@ -4038,7 +4150,7 @@ ${outcome.message}
   async function handleMemoryConsolidate(args) {
     if (args[0] === "accept" || args[0] === "dismiss") {
       const outcome2 = args[0] === "accept" ? await assistant.acceptMemoryProposal(args[1] ?? "", "cli") : await assistant.dismissMemoryProposal(args[1] ?? "");
-      console.log(`
+      printSafe(`
 ${outcome2.message}
 `);
       return;
@@ -4046,12 +4158,12 @@ ${outcome2.message}
     const outcome = await assistant.consolidateMemory("cli");
     const proposals = await assistant.memoryProposals();
     if (proposals.length === 0) {
-      console.log(`
+      printSafe(`
 ${outcome.message}
 `);
       return;
     }
-    console.log(`
+    printSafe(`
 ${outcome.status === "done" ? "" : `${outcome.message}
 `}Proposed changes (nothing applied yet):
 ${proposals.map((p, i) => `  ${i + 1}. [${p.kind}]${p.touchesUserAsserted ? " (touches something you said yourself)" : ""} ${p.text ? `-> "${p.text}" ` : ""}${p.reason}`).join("\n")}
@@ -4061,17 +4173,17 @@ ${proposals.map((p, i) => `  ${i + 1}. [${p.kind}]${p.touchesUserAsserted ? " (t
   async function handleSearch(args) {
     const query = args.join(" ");
     if (!query.trim()) {
-      console.log("\nUsage: /search <query>\n");
+      printSafe("\nUsage: /search <query>\n");
       return;
     }
     const hits = await assistant.searchTranscript(query);
-    console.log(`
+    printSafe(`
 ${formatSearchResults(hits, query)}
 `);
   }
   async function handleGoals() {
     const state = await assistant.getGoalGraphState("cli");
-    console.log(`
+    printSafe(`
 ${formatGoalGraphState(state)}
 `);
   }
@@ -4079,7 +4191,7 @@ ${formatGoalGraphState(state)}
     const spendCapLine = await spendCapStatusLine();
     const spendState = await assistant.getSpendState("cli");
     const session = { inputTokens: spendState.cumulativeInputTokens, outputTokens: spendState.cumulativeOutputTokens, costUsd: spendState.cumulativeCostUsd };
-    console.log(`
+    printSafe(`
 ${formatCostSummary({ lastTurn: lastTurnUsage, session, backend: config.llmBackend, spendCapLine })}
 `);
   }
@@ -4101,7 +4213,7 @@ ${formatCostSummary({ lastTurn: lastTurnUsage, session, backend: config.llmBacke
       // that explicitly here rather than leaving it unstated (no keychain integration exists).
       { label: "provider keys stored: plaintext in config.json (no OS keychain integration)", ok: true }
     ]);
-    console.log(`
+    printSafe(`
 ${formatDoctorReport(checks)}
 `);
   }
@@ -4110,7 +4222,7 @@ ${formatDoctorReport(checks)}
     const layer = nodeToLayer(progress.currentNode);
     const label = layer ? LAYER_DISPLAY_NAME[layer] : nodeDisplayName(progress.currentNode);
     const prefix = progress.planPosition ? `[${progress.planPosition.templateName ?? "custom plan"} — step ${progress.planPosition.stepIndex}/${progress.planPosition.stepCount} (${progress.planPosition.completionPct.toFixed(0)}%)]` : `[step ${progress.stepsUsed}/${progress.maxSteps}]`;
-    const line = `${prefix}${label ? ` ${label}…` : ""}`;
+    const line = stripTerminalControls(`${prefix}${label ? ` ${label}…` : ""}`);
     process.stdout.write(`\r${line.padEnd(lastProgressLineLength)}`);
     lastProgressLineLength = line.length;
   }
@@ -4122,9 +4234,9 @@ ${formatDoctorReport(checks)}
   function writeToolStep(step) {
     clearProgress();
     if (step.deniedReason) {
-      console.log(`  ${ICONS.deniedStep} Denied: ${step.summary} — ${step.deniedReason}`);
+      console.log(stripTerminalControls(`  ${ICONS.deniedStep} Denied: ${step.summary} — ${step.deniedReason}`));
     } else {
-      console.log(`  ${toolStepIcon(step.tool)} ${step.summary}`);
+      console.log(stripTerminalControls(`  ${toolStepIcon(step.tool)} ${step.summary}`));
     }
     lastTurnToolSteps.push(step);
   }
@@ -4147,20 +4259,20 @@ ${formatDoctorReport(checks)}
   function printClarificationQuestion(question, draft, index, total) {
     const options2 = orderedAskOptions(question);
     const allowFreeText = question.allowFreeText !== false;
-    console.log("");
-    if (question.header) console.log(`[${question.header}]`);
-    if (total > 1) console.log(`Question ${index + 1} of ${total}`);
-    console.log(question.question);
+    printSafe("");
+    if (question.header) console.log(stripTerminalControls(`[${question.header}]`));
+    if (total > 1) printSafe(`Question ${index + 1} of ${total}`);
+    console.log(stripTerminalControls(question.question));
     options2.forEach((option, i) => {
       const n = i + 1;
       const picked = draft.selectedLabels.includes(option.label) ? "✓" : " ";
       const recommended = option.recommended ? " (recommended)" : "";
-      console.log(`  [${picked}] ${n}) ${option.label}${recommended}`);
-      if (option.description) console.log(`        ${option.description}`);
-      if (option.preview) console.log(`        preview: ${option.preview}`);
+      console.log(stripTerminalControls(`  [${picked}] ${n}) ${option.label}${recommended}`));
+      if (option.description) console.log(stripTerminalControls(`        ${option.description}`));
+      if (option.preview) console.log(stripTerminalControls(`        preview: ${option.preview}`));
     });
-    if (draft.editText) console.log(`  note: ${draft.editText}`);
-    if (draft.freeText) console.log(`  other: ${draft.freeText}`);
+    if (draft.editText) console.log(stripTerminalControls(`  note: ${draft.editText}`));
+    if (draft.freeText) console.log(stripTerminalControls(`  other: ${draft.freeText}`));
     const commands2 = [
       options2.length > 0 ? question.allowMultiple ? "<n>/t<n> toggle option" : "<n> select option" : void 0,
       options2.length > 0 ? "e<n> add a note to a selected option" : void 0,
@@ -4168,7 +4280,7 @@ ${formatDoctorReport(checks)}
       total > 1 ? "b back, n next" : void 0,
       "s submit"
     ].filter((c) => c !== void 0);
-    console.log(`  (${commands2.join(" | ")})`);
+    printSafe(`  (${commands2.join(" | ")})`);
   }
   async function handleClarification(result) {
     const questions = result.questions ?? [];
@@ -4176,23 +4288,23 @@ ${formatDoctorReport(checks)}
     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.`;
-      console.log(`
+      console.log(stripTerminalControls(`
 [needs clarification] ${result.reason ?? "This request needs clarification."}
-`);
+`));
       return;
     }
     if (nonInteractiveApprovalMode === "decline") {
-      console.log(`
+      printSafe(`
 [non-interactive mode: auto-declining — ASSISTANT_NON_INTERACTIVE_APPROVAL=decline]`);
-      console.log(`
-[needs clarification] ${result.reason ?? "This request needs clarification."}`);
-      for (const q2 of questions) console.log(`  - ${q2.question}`);
-      console.log("");
+      console.log(stripTerminalControls(`
+[needs clarification] ${result.reason ?? "This request needs clarification."}`));
+      for (const q2 of questions) console.log(stripTerminalControls(`  - ${q2.question}`));
+      printSafe("");
       lastTrace = void 0;
       lastNoTraceReason = "No harness trace — the last turn needed clarification and was auto-declined (non-interactive mode) before the harness resumed.";
       return;
     }
-    console.log(`
+    printSafe(`
 [needs clarification] ${questions.length} question${questions.length === 1 ? "" : "s"} to answer.`);
     const drafts = new Map(questions.map((q2) => [q2.id, emptyClarificationDraft()]));
     let index = 0;
@@ -4202,11 +4314,17 @@ ${formatDoctorReport(checks)}
       printClarificationQuestion(question, draft, index, questions.length);
       const token = (await askLine("clarify> ")).trim();
       const lower = token.toLowerCase();
+      if (inputUnavailable) {
+        printSafe("\n[no input available — leaving the clarification unanswered]\n");
+        lastTrace = void 0;
+        lastNoTraceReason = "No harness trace — the last turn needed clarification and input closed before it was answered.";
+        return;
+      }
       if (lower === "s" || lower === "submit") {
         const answers = questions.map((q2) => clarificationDraftToAnswer(q2.id, drafts.get(q2.id)));
         const missing = questions.filter((q2, i) => answers[i] === null);
         if (missing.length > 0) {
-          console.log(`
+          printSafe(`
 Still need an answer for: ${missing.map((q2) => q2.question).join("; ")}
 `);
           continue;
@@ -4225,12 +4343,12 @@ Still need an answer for: ${missing.map((q2) => q2.question).join("; ")}
       }
       if (lower === "o") {
         if (question.allowFreeText === false) {
-          console.log("\nThis question does not accept a free-text answer.\n");
+          printSafe("\nThis question does not accept a free-text answer.\n");
           continue;
         }
         const text = await askLine("Other — type your own answer: ");
         if (!text.trim()) {
-          console.log("\nEmpty answer ignored.\n");
+          printSafe("\nEmpty answer ignored.\n");
           continue;
         }
         drafts.set(question.id, { selectedLabels: [], editText: "", freeText: text.trim() });
@@ -4241,13 +4359,13 @@ Still need an answer for: ${missing.map((q2) => q2.question).join("; ")}
         const options2 = orderedAskOptions(question);
         const option = options2[Number(editMatch[1]) - 1];
         if (!option) {
-          console.log(`
+          printSafe(`
 No option ${editMatch[1]}.
 `);
           continue;
         }
         if (!draft.selectedLabels.includes(option.label)) {
-          console.log(`
+          printSafe(`
 Select option ${editMatch[1]} first, then add a note with e${editMatch[1]}.
 `);
           continue;
@@ -4261,7 +4379,7 @@ Select option ${editMatch[1]} first, then add a note with e${editMatch[1]}.
         const options2 = orderedAskOptions(question);
         const option = options2[Number(toggleMatch[1]) - 1];
         if (!option) {
-          console.log(`
+          printSafe(`
 No option ${toggleMatch[1]}.
 `);
           continue;
@@ -4278,7 +4396,7 @@ No option ${toggleMatch[1]}.
         }
         continue;
       }
-      console.log(`
+      printSafe(`
 Unrecognized input "${token}".
 `);
     }
@@ -4291,7 +4409,7 @@ Unrecognized input "${token}".
         process.stdout.write("\nAielia> ");
         streamedAnyTokens = true;
       }
-      process.stdout.write(token);
+      process.stdout.write(stripTerminalControls(token));
     }
     try {
       const result = await assistant.turn(message, {
@@ -4331,15 +4449,15 @@ Unrecognized input "${token}".
       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?";
-        console.log(`
-[needs approval — ${kindLabel}] ${result.reason}`);
+        console.log(stripTerminalControls(`
+[needs approval — ${kindLabel}] ${result.reason}`));
         let confirmed;
         if (result.pendingActionKind && rememberedActionKinds.has(result.pendingActionKind)) {
-          console.log(`["don't ask again" active this session for ${kindLabel} — auto-approved]`);
+          printSafe(`["don't ask again" active this session for ${kindLabel} — auto-approved]`);
           confirmed = true;
         } else {
           const decision = await askSelect(promptText, APPROVAL_OPTIONS);
-          confirmed = decision !== "n";
+          confirmed = decision === "y" || decision === "a";
           if (decision === "a" && result.pendingActionKind) rememberedActionKinds.add(result.pendingActionKind);
         }
         lastTrace = void 0;
@@ -4348,16 +4466,16 @@ Unrecognized input "${token}".
         return;
       }
       if (result.status === "needs_approval") {
-        console.log(`
-[needs approval — ${result.riskLevel}] ${result.reason}`);
-        console.log(`  "${message}"`);
+        console.log(stripTerminalControls(`
+[needs approval — ${result.riskLevel}] ${result.reason}`));
+        printSafe(`  "${message}"`);
         let confirmed;
         if (result.riskLevel && rememberedRiskLevels.has(result.riskLevel)) {
-          console.log(`["don't ask again" active this session for risk level ${result.riskLevel} — auto-approved]`);
+          printSafe(`["don't ask again" active this session for risk level ${result.riskLevel} — auto-approved]`);
           confirmed = true;
         } else {
           const decision = await askSelect("Proceed?", APPROVAL_OPTIONS);
-          confirmed = decision !== "n";
+          confirmed = decision === "y" || decision === "a";
           if (decision === "a" && result.riskLevel) rememberedRiskLevels.add(result.riskLevel);
         }
         if (confirmed) {
@@ -4366,7 +4484,7 @@ Unrecognized input "${token}".
           lastTrace = void 0;
           lastNoTraceReason = "No harness trace — the last turn was blocked on an approval gate and declined before the harness ran.";
           await assistant.recordDeclinedRequest("cli", message, result.reason ?? "This request needed approval.");
-          console.log("Cancelled.\n");
+          printSafe("Cancelled.\n");
         }
         return;
       }
@@ -4376,26 +4494,26 @@ Unrecognized input "${token}".
       }
       if (result.status === "needs_plan_approval") {
         if (!result.planApprovalId) {
-          console.log(`
+          printSafe(`
 [needs plan approval] ${result.reason ?? "A plan is awaiting approval, but its approval id is missing."}
 `);
           return;
         }
         const id = result.planApprovalId;
         const snapshot = result.planApproval;
-        if (result.reason) console.log(`
+        if (result.reason) printSafe(`
 ${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).";
         if (!snapshot) {
-          console.log("Decide with /plan approve or /plan decline.\n");
+          printSafe("Decide with /plan approve or /plan decline.\n");
           return;
         }
         const choice = await askSelect("Approve this plan?", PLAN_APPROVAL_OPTIONS);
         if (choice === "d") {
-          console.log("Left pending — /plan to review, /plan approve|edit|decline to decide.\n");
+          printSafe("Left pending — /plan to review, /plan approve|edit|decline to decide.\n");
           return;
         }
         pendingPlanApproval = void 0;
@@ -4418,9 +4536,9 @@ ${result.reason}`);
       if (result.status === "escalated") {
         lastTrace = void 0;
         lastNoTraceReason = `No harness trace — the last turn escalated (${result.reason}) before completing.`;
-        console.log(`
+        console.log(stripTerminalControls(`
 [escalated] ${result.reason}
-`);
+`));
         return;
       }
       if (!pendingActionId) {
@@ -4436,9 +4554,11 @@ ${result.reason}`);
       const contradictionNotice = result.contradictionNotice ? `
 
 ${result.contradictionNotice}` : "";
-      const reviewNotice = result.reviewNotice ? `
+      const reviewNotice = (result.reviewNotice ? `
+
+${result.reviewNotice}` : "") + (result.auditNotice ? `
 
-${result.reviewNotice}` : "";
+${result.auditNotice}` : "");
       lastNextSteps = result.nextSteps && result.nextSteps.length > 0 ? result.nextSteps : void 0;
       const nextStepsBlock = lastNextSteps ? `
 
@@ -4447,26 +4567,26 @@ ${formatNextSteps(lastNextSteps)}` : "";
         const pausedNoteText = result.pausedNote ? `
 
 ${result.pausedNote}` : "";
-        process.stdout.write(`${pausedNoteText}${riskSuffix}${sourcesHint}${planHint}${contradictionNotice}${reviewNotice}${nextStepsBlock}
+        process.stdout.write(stripTerminalControls(`${pausedNoteText}${riskSuffix}${sourcesHint}${planHint}${contradictionNotice}${reviewNotice}${nextStepsBlock}
 
-`);
+`));
       } else {
-        console.log(`
+        console.log(stripTerminalControls(`
 Aielia>${riskSuffix} ${result.reply}${sourcesHint}${planHint}${contradictionNotice}${reviewNotice}${nextStepsBlock}
-`);
+`));
       }
     } catch (err) {
       clearProgress();
       const { message: errorMessage, retryable } = classifyError(err, config.llmBackend);
-      console.log(`
+      console.log(stripTerminalControls(`
 [error] ${errorMessage}${retryable ? " Type the message again to retry." : ""}
-`);
+`));
     }
   }
   function askYesNo(question) {
     if (options.askYesNo) return options.askYesNo(question);
     if (nonInteractiveApprovalMode === "decline") {
-      console.log(`
+      printSafe(`
 [non-interactive mode: auto-declining — ASSISTANT_NON_INTERACTIVE_APPROVAL=decline]`);
       return Promise.resolve(false);
     }
@@ -4474,19 +4594,21 @@ Aielia>${riskSuffix} ${result.reply}${sourcesHint}${planHint}${contradictionNoti
       try {
         rl.question(question, (answer) => resolve2(answer.trim().toLowerCase().startsWith("y")));
       } catch {
-        console.log(`
+        printSafe(`
 [could not read a response — treating as declined]`);
         resolve2(false);
       }
     });
   }
+  let inputUnavailable = false;
   function askLine(question) {
     if (options.askLine) return options.askLine(question);
     return new Promise((resolve2) => {
       try {
         rl.question(question, (answer) => resolve2(answer.trim()));
       } catch {
-        console.log(`
+        inputUnavailable = true;
+        printSafe(`
 [could not read a response — treating as blank]`);
         resolve2("");
       }
@@ -4496,7 +4618,7 @@ Aielia>${riskSuffix} ${result.reply}${sourcesHint}${planHint}${contradictionNoti
     if (options.askSelect) return options.askSelect(question, selectOptions);
     const fallbackKey = selectOptions[selectOptions.length - 1].key;
     if (nonInteractiveApprovalMode === "decline") {
-      console.log(`
+      printSafe(`
 [non-interactive mode: auto-declining — ASSISTANT_NON_INTERACTIVE_APPROVAL=decline]`);
       return Promise.resolve(fallbackKey);
     }
@@ -4513,7 +4635,7 @@ ${optionLines}
           resolve2(((_a = byKey ?? byIndex) == null ? void 0 : _a.key) ?? fallbackKey);
         });
       } catch {
-        console.log(`
+        printSafe(`
 [could not read a response — treating as declined]`);
         resolve2(fallbackKey);
       }
@@ -4527,7 +4649,7 @@ ${optionLines}
   }
   async function handleConfigCommand(args) {
     if (args.length === 0) {
-      console.log(`
+      printSafe(`
 ${formatConfigListing(config, overriddenKeys)}
 `);
       return;
@@ -4536,19 +4658,19 @@ ${formatConfigListing(config, overriddenKeys)}
       const key = args[1];
       const raw = args.slice(2).join(" ");
       if (!key || !isConfigKey(key)) {
-        console.log(`
+        printSafe(`
 ✗ Unknown config key "${key ?? ""}". Known keys: ${CONFIG_KEYS.join(", ")}
 `);
         return;
       }
       if (!raw) {
-        console.log(`
+        printSafe(`
 Usage: /config set ${key} <value>
 `);
         return;
       }
       if (overriddenKeys.has(key)) {
-        console.log(`
+        printSafe(`
 ✗ "${key}" is pinned by ${ENV_VAR_FOR_CONFIG_KEY[key]} — unset that env var to change it here.
 `);
         return;
@@ -4558,7 +4680,7 @@ Usage: /config set ${key} <value>
         value = parseConfigValue(key, raw);
       } catch (err) {
         if (!(err instanceof ConfigValueParseError)) throw err;
-        console.log(`
+        printSafe(`
 ✗ ${err.message}
 `);
         return;
@@ -4568,14 +4690,14 @@ Usage: /config set ${key} <value>
         validateConfig(patch, config);
       } catch (err) {
         if (!(err instanceof ConfigValidationError)) throw err;
-        console.log(`
+        printSafe(`
 ✗ ${err.message}
 `);
         return;
       }
       await configStore.save(patch);
       await reloadAssistant();
-      console.log(`
+      printSafe(`
 ✓ ${key} updated (took effect immediately, no restart needed)
 `);
       return;
@@ -4583,8 +4705,19 @@ Usage: /config set ${key} <value>
     if (args[0] === "reset") {
       const key = args[1];
       if (key && !isConfigKey(key)) {
-        console.log(`
+        printSafe(`
 ✗ Unknown config key "${key}". Known keys: ${CONFIG_KEYS.join(", ")}
+`);
+        return;
+      }
+      const remaining = { ...await configStore.load() };
+      for (const k of key ? [key] : CONFIG_KEYS) delete remaining[k];
+      try {
+        validateConfig({}, resolveConfig(remaining, envOverrides).config);
+      } catch (err) {
+        if (!(err instanceof ConfigValidationError)) throw err;
+        printSafe(`
+✗ Not reset: ${err.message}
 `);
         return;
       }
@@ -4592,23 +4725,23 @@ Usage: /config set ${key} <value>
       const confirmed = await askYesNo(`
 Reset ${target} to default? This takes effect immediately. (y/N) `);
       if (!confirmed) {
-        console.log("\nCancelled — nothing was reset.\n");
+        printSafe("\nCancelled — nothing was reset.\n");
         return;
       }
       const clearPatch = key ? { [key]: void 0 } : Object.fromEntries(CONFIG_KEYS.map((k) => [k, void 0]));
       await configStore.save(clearPatch);
       await reloadAssistant();
-      console.log(`
+      printSafe(`
 ✓ Reset ${key ?? "all settings"} to default
 `);
       return;
     }
-    console.log("\nUsage: /config | /config set <key> <value> | /config reset [key]\n");
+    printSafe("\nUsage: /config | /config set <key> <value> | /config reset [key]\n");
   }
   async function handleLayers(args) {
     const [sub, id] = args;
     if (sub === "settings" || sub === "list") {
-      console.log(`
+      printSafe(`
 ${formatLayerListing(sanitizeLayerChoices(config.layers), layerPins, process.env)}
 `);
       return;
@@ -4616,7 +4749,7 @@ ${formatLayerListing(sanitizeLayerChoices(config.layers), layerPins, process.env
     try {
       if (sub === "on" || sub === "off") {
         if (!id) {
-          console.log(`
+          printSafe(`
 Usage: /layers ${sub} <id>
 `);
           return;
@@ -4627,19 +4760,19 @@ Usage: /layers ${sub} <id>
         const layers = id ? withLayerChoice(sanitizeLayerChoices(config.layers), id, void 0) : {};
         await configStore.save({ layers });
       } else {
-        console.log("\nUsage: /layers settings | /layers on <id> | /layers off <id> | /layers reset [id]\n");
+        printSafe("\nUsage: /layers settings | /layers on <id> | /layers off <id> | /layers reset [id]\n");
         return;
       }
     } catch (err) {
       if (!(err instanceof LayerSettingError)) throw err;
-      console.log(`
+      printSafe(`
 ✗ ${err.message}
 `);
       return;
     }
     await reloadAssistant();
     const pinned = id !== void 0 && layerPins.has(id);
-    console.log(pinned ? `
+    printSafe(pinned ? `
 ✗ Saved, but "${id}" is pinned by its AUDIT_* env flag, so the saved choice has no effect until that is unset.
 ` : `
 ✓ Layers updated (took effect immediately, no restart needed)
@@ -4647,7 +4780,7 @@ Usage: /layers ${sub} <id>
   }
   async function handleModel(args) {
     if (args.length === 0) {
-      console.log(`
+      printSafe(`
 ${config.model ?? "(using each backend's default)"}
 `);
       return;
@@ -4656,7 +4789,7 @@ ${config.model ?? "(using each backend's default)"}
   }
   async function handleProject(args) {
     if (args.length === 0) {
-      console.log(`
+      printSafe(`
 ${assistant.getActiveProject() || "(none)"}
 `);
       return;
@@ -4694,6 +4827,7 @@ ${assistant.getActiveProject() || "(none)"}
     "/checkpoint": (args) => handleCheckpoint(args)
   };
   async function dispatchOne(message) {
+    var _a, _b;
     if (quitting) return;
     if (isQuitCommand(message)) {
       quitting = true;
@@ -4701,27 +4835,29 @@ ${assistant.getActiveProject() || "(none)"}
         await assistant.endSession("cli");
       } catch {
       }
-      console.log("Exiting.");
+      printSafe("Exiting.");
       rl.close();
       return;
     }
     const pick = /^[1-3]$/.test(message) && lastNextSteps ? lastNextSteps[Number(message) - 1] : void 0;
     lastNextSteps = void 0;
     if (pick) {
-      console.log(`  → ${pick.description}`);
+      printSafe(`  → ${pick.description}`);
       message = pick.description;
     }
     const [token, ...args] = message.split(/\s+/);
-    const handler = commands[token];
+    const handler = !pick && Object.hasOwn(commands, token) ? commands[token] : void 0;
     if (handler) {
       await handler(args);
       return;
     }
     turnInProgress = true;
+    (_a = options.onTurnBusyChange) == null ? void 0 : _a.call(options, true);
     try {
       await handleTurn(message);
     } finally {
       turnInProgress = false;
+      (_b = options.onTurnBusyChange) == null ? void 0 : _b.call(options, false);
       if (isGoalGraphEnabled(config.goalGraphMode)) {
         for (const event of steeringChannel.poll()) {
           void enqueue(event.message);
@@ -4740,12 +4876,13 @@ ${assistant.getActiveProject() || "(none)"}
   }
   function isKnownCommand(message) {
     const [token] = message.split(/\s+/);
-    return token in commands || isQuitCommand(message);
+    return Object.hasOwn(commands, token) || isQuitCommand(message);
   }
   function routeMessage(message) {
     if (isGoalGraphEnabled(config.goalGraphMode) && turnInProgress && !isKnownCommand(message)) {
       steeringChannel.enqueue(message);
-      console.log("\n[queued — the current turn is still running; this will be taken into account once it finishes]\n");
+      assistant.logQueuedMessage("cli", message);
+      printSafe("\n[queued — the current turn is still running; this will be taken into account once it finishes]\n");
       return Promise.resolve();
     }
     return enqueue(message);
@@ -4783,7 +4920,19 @@ ${assistant.getActiveProject() || "(none)"}
     }
   };
 }
+class StartupError extends Error {
+}
 async function main(argv = process.argv.slice(2)) {
+  try {
+    await mainInner(argv);
+  } catch (err) {
+    if (!(err instanceof StartupError)) throw err;
+    process.stderr.write(`${err.message}
+`);
+    process.exitCode = 1;
+  }
+}
+async function mainInner(argv) {
   const parsed = parseCliArgs(argv);
   if (parsed.command === "version") {
     console.log(CLI_VERSION);
@@ -4806,8 +4955,8 @@ async function main(argv = process.argv.slice(2)) {
       if (result == null ? void 0 : result.updateAvailable) console.log(updateAvailableNotice(result.latestVersion, CLI_VERSION, isSea));
     });
   }
-  if (shouldLaunchTuiApp(config.tuiMode ?? "disabled", Boolean(process.stdout.isTTY), Boolean(process.stdin.isTTY))) {
-    const { runTuiApp } = await import("./tui-app-BLR-PRFp.js");
+  if (shouldLaunchTuiApp(config.tuiMode ?? DEFAULT_TUI_MODE, Boolean(process.stdout.isTTY), Boolean(process.stdin.isTTY))) {
+    const { runTuiApp } = await import("./tui-app-C0J6HRzv.js");
     await runTuiApp();
     return;
   }
@@ -4831,6 +4980,7 @@ export {
   PLAN_LINE_PREFIX as P,
   runCli as a,
   renderPlan as r,
+  sanitizeLabel as s,
   toLines as t
 };
-//# sourceMappingURL=bin-CjKpxDxl.js.map
+//# sourceMappingURL=bin-C_hgDdSf.js.map