indusagi-coding-agent 0.2.12 → 0.2.14

package/dist/entry.js

@@ -2,7 +2,7 @@
 
 // src/entry.ts
 import { argv as processArgv, env as processEnv } from "node:process";
-import { realpathSync as realpathSync3 } from "node:fs";
+import { realpathSync as realpathSync4 } from "node:fs";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // src/workspace/brand.ts
@@ -18,7 +18,7 @@ var BRAND = Object.freeze({
   envShareViewer: "INDUSAGI_SHARE_VIEWER_URL",
   shareViewerUrl: "https://buildwithindusagi.ai/session/"
 });
-var VERSION = "0.2.12";
+var VERSION = "0.2.14";
 
 // src/launch/credentials.ts
 import { createInterface as createInterface2 } from "node:readline/promises";
@@ -31,7 +31,8 @@ var THINKING_EFFORTS = [
   "low",
   "medium",
   "high",
-  "xhigh"
+  "xhigh",
+  "max"
 ];
 function isThinkingEffort(value) {
   return THINKING_EFFORTS.includes(value);
@@ -76,26 +77,153 @@ import {
 
 // src/launch/login.ts
 import { createInterface } from "node:readline/promises";
+import { setTimeout as delay } from "node:timers/promises";
 import chalk from "chalk";
 
 // src/boot/server-token.ts
-import { mkdir, readFile, unlink, writeFile } from "node:fs/promises";
+import { unlink } from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
+
+// src/security/private-state.ts
+import {
+  chmodSync,
+  closeSync,
+  constants,
+  fchmodSync,
+  fstatSync,
+  lstatSync,
+  mkdirSync,
+  openSync,
+  readFileSync,
+  renameSync,
+  rmSync,
+  writeFileSync
+} from "node:fs";
+import { randomUUID } from "node:crypto";
+import { dirname } from "node:path";
+var PRIVATE_DIRECTORY_MODE = 448;
+var PRIVATE_FILE_MODE = 384;
+var NO_FOLLOW = constants.O_NOFOLLOW ?? 0;
+function isPosix() {
+  return process.platform !== "win32";
+}
+function assertOwned(uid, path5) {
+  if (!isPosix() || process.getuid === void 0) return;
+  if (uid !== process.getuid()) {
+    throw new Error(`Refusing sensitive path not owned by the current user: ${path5}`);
+  }
+}
+function ensurePrivateDirectorySync(path5) {
+  try {
+    const current = lstatSync(path5);
+    if (current.isSymbolicLink() || !current.isDirectory()) {
+      throw new Error(`Refusing non-directory sensitive state path: ${path5}`);
+    }
+    assertOwned(current.uid, path5);
+  } catch (error) {
+    if (error.code !== "ENOENT") throw error;
+    mkdirSync(path5, { recursive: true, mode: PRIVATE_DIRECTORY_MODE });
+  }
+  if (isPosix()) chmodSync(path5, PRIVATE_DIRECTORY_MODE);
+}
+function validateExistingFile(path5) {
+  try {
+    const current = lstatSync(path5);
+    if (current.isSymbolicLink() || !current.isFile()) {
+      throw new Error(`Refusing non-regular sensitive file: ${path5}`);
+    }
+    assertOwned(current.uid, path5);
+  } catch (error) {
+    if (error.code === "ENOENT") return;
+    throw error;
+  }
+}
+function readPrivateFileSync(path5) {
+  ensurePrivateDirectorySync(dirname(path5));
+  try {
+    validateExistingFile(path5);
+    const fd = openSync(path5, constants.O_RDONLY | NO_FOLLOW);
+    try {
+      const current = fstatSync(fd);
+      if (!current.isFile()) throw new Error(`Refusing non-regular sensitive file: ${path5}`);
+      assertOwned(current.uid, path5);
+      if (isPosix()) fchmodSync(fd, PRIVATE_FILE_MODE);
+      return readFileSync(fd, "utf8");
+    } finally {
+      closeSync(fd);
+    }
+  } catch (error) {
+    if (error.code === "ENOENT") return null;
+    throw error;
+  }
+}
+function atomicWritePrivateFileSync(path5, content) {
+  const parent = dirname(path5);
+  ensurePrivateDirectorySync(parent);
+  validateExistingFile(path5);
+  const temporary = `${path5}.tmp-${process.pid}-${randomUUID()}`;
+  let fd;
+  try {
+    fd = openSync(
+      temporary,
+      constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | NO_FOLLOW,
+      PRIVATE_FILE_MODE
+    );
+    writeFileSync(fd, content, "utf8");
+    if (isPosix()) fchmodSync(fd, PRIVATE_FILE_MODE);
+    closeSync(fd);
+    fd = void 0;
+    renameSync(temporary, path5);
+    if (isPosix()) chmodSync(path5, PRIVATE_FILE_MODE);
+  } catch (error) {
+    if (fd !== void 0) closeSync(fd);
+    try {
+      rmSync(temporary, { force: true });
+    } catch {
+    }
+    throw error;
+  }
+}
+function appendPrivateFileSync(path5, content) {
+  ensurePrivateDirectorySync(dirname(path5));
+  validateExistingFile(path5);
+  const fd = openSync(
+    path5,
+    constants.O_WRONLY | constants.O_APPEND | constants.O_CREAT | NO_FOLLOW,
+    PRIVATE_FILE_MODE
+  );
+  try {
+    const current = fstatSync(fd);
+    if (!current.isFile()) throw new Error(`Refusing non-regular sensitive file: ${path5}`);
+    assertOwned(current.uid, path5);
+    if (isPosix()) fchmodSync(fd, PRIVATE_FILE_MODE);
+    writeFileSync(fd, content, "utf8");
+  } finally {
+    closeSync(fd);
+  }
+}
+
+// src/boot/server-token.ts
 var INDUS_SERVER_URL = process.env.INDUS_SERVER_URL?.replace(/\/+$/, "") ?? "https://indus-server.vercel.app";
 var CONFIG_DIR = path.join(os.homedir(), ".indusagi", "agent");
 var TOKEN_FILE = path.join(CONFIG_DIR, "server-token.json");
-async function getServerToken() {
+function resolveTokenPaths(paths = {}) {
+  const configDir = paths.configDir ?? CONFIG_DIR;
+  return { configDir, tokenFile: paths.tokenFile ?? path.join(configDir, "server-token.json") };
+}
+async function getServerToken(paths = {}) {
   try {
-    const data = await readFile(TOKEN_FILE, "utf8");
+    const data = readPrivateFileSync(resolveTokenPaths(paths).tokenFile);
+    if (data === null) return null;
     return JSON.parse(data);
   } catch {
     return null;
   }
 }
-async function storeServerToken(token) {
+async function storeServerToken(token, paths = {}) {
   try {
-    await mkdir(CONFIG_DIR, { recursive: true });
+    const { tokenFile } = resolveTokenPaths(paths);
     const tokenData = {
       access_token: token.access_token,
       refresh_token: token.refresh_token,
@@ -104,20 +232,17 @@ async function storeServerToken(token) {
       expires_at: token.expires_in !== void 0 ? new Date(Date.now() + token.expires_in * 1e3).toISOString() : null,
       created_at: (/* @__PURE__ */ new Date()).toISOString()
     };
-    await writeFile(TOKEN_FILE, `${JSON.stringify(tokenData, null, 2)}
-`, {
-      encoding: "utf8",
-      mode: 384
-    });
+    atomicWritePrivateFileSync(tokenFile, `${JSON.stringify(tokenData, null, 2)}
+`);
     return true;
   } catch (error) {
     console.error("Failed to store server token:", error.message);
     return false;
   }
 }
-async function clearServerToken() {
+async function clearServerToken(paths = {}) {
   try {
-    await unlink(TOKEN_FILE);
+    await unlink(resolveTokenPaths(paths).tokenFile);
     return true;
   } catch {
     return false;
@@ -154,10 +279,10 @@ function err(line) {
   process.stderr.write(`${line}
 `);
 }
-function sleep(ms) {
-  return new Promise((resolve9) => setTimeout(resolve9, ms));
+function sleep(ms, signal) {
+  return delay(ms, void 0, { signal });
 }
-async function postJson(url, body) {
+async function postJson(url, body, signal) {
   const res = await fetch(url, {
     method: "POST",
     headers: {
@@ -165,7 +290,8 @@ async function postJson(url, body) {
       accept: "application/json",
       "user-agent": USER_AGENT
     },
-    body: JSON.stringify(body)
+    body: JSON.stringify(body),
+    signal: signal ? AbortSignal.any([signal, AbortSignal.timeout(3e4)]) : AbortSignal.timeout(3e4)
   });
   const data = await res.json().catch(() => ({}));
   return { status: res.status, data };
@@ -201,11 +327,11 @@ async function confirm(prompt, defaultValue) {
     rl.close();
   }
 }
-async function requestDeviceCode(serverUrl, clientId) {
+async function requestDeviceCode(serverUrl, clientId, signal) {
   const { status, data } = await postJson(`${serverUrl}/api/auth/device/code`, {
     client_id: clientId,
     scope: DEVICE_SCOPE
-  });
+  }, signal);
   if (status >= 400 || typeof data.device_code !== "string") {
     throw new LoginError(
       `Authorization request failed: ${data.error_description ?? data.error ?? data.message ?? `HTTP ${status}`}`
@@ -213,18 +339,18 @@ async function requestDeviceCode(serverUrl, clientId) {
   }
   return data;
 }
-async function pollForToken(serverUrl, clientId, device) {
+async function pollForToken(serverUrl, clientId, device, signal) {
   let intervalMs = Math.max(1, device.interval ?? 5) * 1e3;
   const deadline = Date.now() + (device.expires_in ?? 0) * 1e3;
   while (Date.now() < deadline) {
-    await sleep(intervalMs);
+    await sleep(intervalMs, signal);
     const { data } = await postJson(`${serverUrl}/api/auth/device/token`, {
       grant_type: DEVICE_GRANT_TYPE,
       device_code: device.device_code,
       client_id: clientId
-    });
+    }, signal);
     if (typeof data.access_token === "string") {
-      return data;
+      return { ...data, access_token: data.access_token };
     }
     const code = data.error;
     switch (code) {
@@ -247,14 +373,17 @@ async function pollForToken(serverUrl, clientId, device) {
   throw new LoginError("Timed out waiting for authorization. Run `indus login` again.");
 }
 async function runServerTierLogin(callbacks, serverUrl = INDUS_SERVER_URL, clientId = INDUS_CLIENT_ID) {
-  const device = await requestDeviceCode(serverUrl, clientId);
+  callbacks.signal?.throwIfAborted();
+  const device = await requestDeviceCode(serverUrl, clientId, callbacks.signal);
+  callbacks.signal?.throwIfAborted();
   callbacks.onAuth({
     url: device.verification_uri_complete ?? device.verification_uri ?? "",
     instructions: `Enter code ${device.user_code} to authorize this device.`
   });
   callbacks.onProgress?.("Waiting for authorization...");
-  const token = await pollForToken(serverUrl, clientId, device);
-  await storeServerToken(token);
+  const token = await pollForToken(serverUrl, clientId, device, callbacks.signal);
+  callbacks.signal?.throwIfAborted();
+  if (!await storeServerToken(token)) throw new LoginError("Could not save the server token.");
   callbacks.onProgress?.("Server sign-in complete.");
 }
 async function doLogin(args) {
@@ -465,12 +594,12 @@ function openLoginUrl(url) {
   const tryAt = (index) => {
     if (index >= attempts.length) return Promise.resolve(false);
     const { command, args } = attempts[index];
-    return new Promise((resolve9) => {
+    return new Promise((resolve11) => {
       let settled = false;
       const finish = (ok) => {
         if (settled) return;
         settled = true;
-        resolve9(ok);
+        resolve11(ok);
       };
       try {
         const child = spawn(command, [...args], {
@@ -503,8 +632,11 @@ async function startOAuthLogin(providerId, callbacks, vault, account = "default"
     const hint = envVar !== void 0 ? `set ${envVar} and restart` : "configure its OAuth client id";
     throw new Error(`Browser sign-in for "${providerId}" is not configured: ${hint}.`);
   }
+  callbacks.signal?.throwIfAborted();
   const credentials = await provider.login(callbacks);
+  callbacks.signal?.throwIfAborted();
   const existing = await vault.listAccounts(providerId);
+  callbacks.signal?.throwIfAborted();
   const madeDefault = existing.length === 0;
   await vault.putOAuth(providerId, account, credentials, madeDefault);
   return { provider: providerId, account, madeDefault };
@@ -1157,7 +1289,7 @@ var FLAG_GROUPS = [
   { id: "tools", title: "Tools" },
   { id: "meta", title: "Meta" }
 ];
-var THINKING_CHOICES = ["off", "minimal", "low", "medium", "high", "xhigh"];
+var THINKING_CHOICES = ["off", "minimal", "low", "medium", "high", "xhigh", "max"];
 var FLAG_SPECS = [
   /* ---- Output ---------------------------------------------------------- */
   {
@@ -1246,6 +1378,18 @@ var FLAG_SPECS = [
     group: "context",
     describe: "Continue the most recent session in this directory."
   },
+  {
+    name: "--trust-project-addons",
+    kind: "boolean",
+    group: "context",
+    describe: "Trust executable project addons for the canonical workspace and their current content digest."
+  },
+  {
+    name: "--allow-context-import",
+    kind: "list",
+    group: "context",
+    describe: "Explicitly approve an exact external context file (comma-separated or repeated). Secret-like files remain blocked."
+  },
   /* ---- Tools ----------------------------------------------------------- */
   {
     name: "--tools",
@@ -1330,6 +1474,150 @@ var FLAG_SPECS = [
   }
 ];
 
+// src/models.ts
+import { ModelRegistry } from "indusagi/ai";
+var GPT_6_ASTRA_BASE = {
+  id: "gpt-6-astra",
+  name: "GPT-6 Astra",
+  api: "openai-responses",
+  reasoning: true,
+  reasoningEfforts: ["low", "medium", "high", "xhigh", "max"],
+  input: ["text", "image"],
+  cost: {
+    input: 10,
+    cacheRead: 1,
+    cacheWrite: 12.5,
+    output: 50
+  },
+  contextWindow: 105e4,
+  maxTokens: 128e3,
+  longContextPricing: {
+    threshold: 272e3,
+    multipliers: {
+      input: 2,
+      cacheRead: 2,
+      cacheWrite: 2,
+      output: 1.5
+    }
+  }
+};
+var GPT_6_SOL_BASE = {
+  id: "gpt-6-sol",
+  name: "GPT-6 Sol",
+  api: "openai-responses",
+  reasoning: true,
+  reasoningEfforts: ["high"],
+  input: ["text", "image"],
+  cost: {
+    input: 10,
+    cacheRead: 1,
+    cacheWrite: 12.5,
+    output: 50
+  },
+  contextWindow: 105e4,
+  maxTokens: 128e3,
+  longContextPricing: {
+    threshold: 272e3,
+    multipliers: {
+      input: 2,
+      cacheRead: 2,
+      cacheWrite: 2,
+      output: 1.5
+    }
+  }
+};
+var GPT_6_LUNA_BASE = {
+  id: "gpt-6-luna",
+  name: "GPT-6 Luna",
+  api: "openai-responses",
+  reasoning: true,
+  reasoningEfforts: ["low", "medium", "high", "xhigh", "max"],
+  input: ["text", "image"],
+  cost: {
+    input: 0.1,
+    cacheRead: 0.01,
+    cacheWrite: 0.125,
+    output: 0.5
+  },
+  contextWindow: 105e4,
+  maxTokens: 128e3,
+  longContextPricing: {
+    threshold: 272e3,
+    multipliers: { input: 2, cacheRead: 2, cacheWrite: 2, output: 1.5 }
+  }
+};
+var CODING_AGENT_MODELS = [
+  {
+    ...GPT_6_SOL_BASE,
+    provider: "openai",
+    baseUrl: "https://api.openai.com/v1"
+  },
+  {
+    ...GPT_6_SOL_BASE,
+    api: "openai-codex-responses",
+    provider: "openai-codex",
+    baseUrl: "https://chatgpt.com/backend-api"
+  },
+  {
+    ...GPT_6_LUNA_BASE,
+    provider: "openai",
+    baseUrl: "https://api.openai.com/v1"
+  },
+  {
+    ...GPT_6_LUNA_BASE,
+    api: "openai-codex-responses",
+    provider: "openai-codex",
+    baseUrl: "https://chatgpt.com/backend-api"
+  },
+  {
+    ...GPT_6_ASTRA_BASE,
+    provider: "openai",
+    baseUrl: "https://api.openai.com/v1"
+  },
+  {
+    ...GPT_6_ASTRA_BASE,
+    api: "openai-codex-responses",
+    provider: "openai-codex",
+    baseUrl: "https://chatgpt.com/backend-api"
+  },
+  {
+    ...GPT_6_ASTRA_BASE,
+    provider: "codex-cli",
+    baseUrl: "bridge:codex-cli"
+  },
+  {
+    ...GPT_6_ASTRA_BASE,
+    id: "openai/gpt-6-astra",
+    provider: "indusagi-cli",
+    baseUrl: "bridge:indusagi-cli"
+  },
+  {
+    ...GPT_6_ASTRA_BASE,
+    id: "openai-codex/gpt-6-astra",
+    api: "openai-codex-responses",
+    provider: "indusagi-cli",
+    baseUrl: "bridge:indusagi-cli"
+  }
+];
+function applyCodingAgentModelOverlay(registry) {
+  for (const model of CODING_AGENT_MODELS) registry.registerCustomModel(model);
+  return registry;
+}
+function createCodingAgentModelRegistry() {
+  return applyCodingAgentModelOverlay(new ModelRegistry());
+}
+function isReasoningEffortSupported(modelId, effort) {
+  const id = modelId?.split("/").at(-1);
+  if (id === "gpt-6-astra") {
+    return GPT_6_ASTRA_BASE.reasoningEfforts.includes(effort);
+  }
+  if (id === "gpt-6-sol") return effort === "high";
+  if (id === "gpt-6-luna") {
+    return GPT_6_LUNA_BASE.reasoningEfforts.includes(effort);
+  }
+  return true;
+}
+
 // src/launch/invocation/read.ts
 function isFlagToken(token) {
   return token.length > 1 && token.startsWith("-");
@@ -1445,9 +1733,9 @@ function deriveMode(flags) {
   if (readBool(flags, "json")) return "rpc";
   return "text";
 }
-function resolveThinking(flags) {
+function resolveThinking(flags, modelId) {
   const raw = readString(flags, "thinking");
-  return raw !== void 0 && isThinkingEffort(raw) ? raw : void 0;
+  return raw !== void 0 && isThinkingEffort(raw) && isReasoningEffortSupported(modelId, raw) ? raw : void 0;
 }
 function resolveTools(flags) {
   const raw = readList(flags, "tools");
@@ -1496,7 +1784,7 @@ function readInvocation(argv2) {
   const cwd = readString(flags, "cwd");
   const system = readString(flags, "system");
   const appendSystem = readString(flags, "append-system");
-  const thinking = resolveThinking(flags);
+  const thinking = resolveThinking(flags, model);
   const tools = resolveTools(flags);
   return {
     mode,
@@ -1580,7 +1868,7 @@ var MAX_TEXT_BYTES = 10 * 1024 * 1024;
 var MAX_IMAGE_BYTES = 20 * 1024 * 1024;
 
 // src/launch/catalog.ts
-import { ModelRegistry } from "indusagi/ai";
+import { ModelRegistry as ModelRegistry2 } from "indusagi/ai";
 function defaultCatalogIo() {
   return {
     print(line) {
@@ -1589,10 +1877,11 @@ function defaultCatalogIo() {
     }
   };
 }
-function registrySource(registry = new ModelRegistry()) {
+function registrySource(registry = new ModelRegistry2()) {
+  const overlaid = applyCodingAgentModelOverlay(registry);
   return {
-    providers: () => registry.getProviders(),
-    models: (provider) => registry.getModels(provider)
+    providers: () => overlaid.getProviders(),
+    models: (provider) => overlaid.getModels(provider)
   };
 }
 var HEADERS = [
@@ -1699,13 +1988,13 @@ function defaultResumeDeps() {
     },
     mountPicker(sessions, totalCount) {
       const byPath = new Map(sessions.map((s) => [s.path, s]));
-      return new Promise((resolve9, reject) => {
+      return new Promise((resolve11, reject) => {
         let settled = false;
         const settle = (value) => {
           if (settled) return;
           settled = true;
           instance.unmount();
-          resolve9(value);
+          resolve11(value);
         };
         let instance;
         try {
@@ -1724,7 +2013,7 @@ function defaultResumeDeps() {
         void instance.waitUntilExit().then(() => {
           if (!settled) {
             settled = true;
-            resolve9(null);
+            resolve11(null);
           }
         });
       });
@@ -1829,7 +2118,7 @@ import { join as join2 } from "node:path";
 
 // src/boot/upgrade/upgrades.ts
 import { promises as fs, constants as fsConstants } from "node:fs";
-import { join, dirname, basename } from "node:path";
+import { join, dirname as dirname2, basename } from "node:path";
 var SECURE_FILE_MODE = 384;
 var RETIRED_SUFFIX = ".retired";
 async function pathExists(target) {
@@ -1862,7 +2151,7 @@ async function readJsonOrUndefined(target) {
   }
 }
 async function writeJsonWithMode(target, value, mode) {
-  await fs.mkdir(dirname(target), { recursive: true });
+  await fs.mkdir(dirname2(target), { recursive: true });
   await fs.writeFile(target, `${JSON.stringify(value, null, 2)}
 `, { mode });
   await fs.chmod(target, mode);
@@ -1870,7 +2159,7 @@ async function writeJsonWithMode(target, value, mode) {
 async function relocateWithoutClobber(from, into) {
   if (!await pathExists(from)) return false;
   if (await pathExists(into)) return false;
-  await fs.mkdir(dirname(into), { recursive: true });
+  await fs.mkdir(dirname2(into), { recursive: true });
   await fs.rename(from, into);
   return true;
 }
@@ -2027,7 +2316,6 @@ async function applyUpgrades(ws) {
 }
 
 // src/workspace/locator.ts
-import { mkdirSync } from "node:fs";
 import { homedir } from "node:os";
 import { isAbsolute, join as join3, resolve } from "node:path";
 var LAYOUT = {
@@ -2091,7 +2379,7 @@ function createWorkspace(overrides = {}) {
 }
 function ensureDirs(workspace) {
   for (const key of DIRECTORY_KEYS) {
-    mkdirSync(workspace[key], { recursive: true });
+    ensurePrivateDirectorySync(workspace[key]);
   }
   return workspace;
 }
@@ -2139,11 +2427,7 @@ async function loadDefaultSettings() {
   }
 }
 async function loadModelRegistry() {
-  const mod = await import("indusagi/ai");
-  if (typeof mod.ModelRegistry === "function") {
-    return new mod.ModelRegistry();
-  }
-  return mod.modelRegistry;
+  return createCodingAgentModelRegistry();
 }
 var selectRunnerStage = {
   name: "select-runner",
@@ -2192,6 +2476,30 @@ var EMPTY_CONSOLE_STATE = {
   tick: 0
 };
 
+// src/console/input/graphemes.ts
+var segmenter = new Intl.Segmenter(void 0, { granularity: "grapheme" });
+function previousGrapheme(text, at) {
+  let previous = 0;
+  for (const part of segmenter.segment(text)) {
+    if (part.index >= at) break;
+    previous = part.index;
+  }
+  return previous;
+}
+function nextGrapheme(text, at) {
+  for (const part of segmenter.segment(text)) if (part.index > at) return part.index;
+  return text.length;
+}
+function moveGrapheme(text, at, delta) {
+  let next = Math.max(0, Math.min(at, text.length));
+  for (let i = 0; i < Math.abs(delta); i++) next = delta < 0 ? previousGrapheme(text, next) : nextGrapheme(text, next);
+  return next;
+}
+function snapGrapheme(text, at) {
+  const clamped = Math.max(0, Math.min(at, text.length));
+  return clamped === text.length ? clamped : previousGrapheme(text, clamped + 1);
+}
+
 // src/console/reducer.ts
 function clamp(offset, max) {
   if (offset < 0) return 0;
@@ -2215,13 +2523,14 @@ function insertBuffer(state, text) {
 function erasePrev(state) {
   const at = clamp(state.caret, state.buffer.length);
   if (at === 0) return state;
-  const next = state.buffer.slice(0, at - 1) + state.buffer.slice(at);
-  return withBuffer(state, next, at - 1);
+  const previous = previousGrapheme(state.buffer, at);
+  const next = state.buffer.slice(0, previous) + state.buffer.slice(at);
+  return withBuffer(state, next, previous);
 }
 function eraseNext(state) {
   const at = clamp(state.caret, state.buffer.length);
   if (at >= state.buffer.length) return state;
-  const next = state.buffer.slice(0, at) + state.buffer.slice(at + 1);
+  const next = state.buffer.slice(0, at) + state.buffer.slice(nextGrapheme(state.buffer, at));
   return withBuffer(state, next, at);
 }
 function pushHistory(state, text) {
@@ -2264,6 +2573,10 @@ function patchRow(state, id, text) {
 }
 function consoleReducer(state, event) {
   switch (event.type) {
+    case "view:reset":
+      return { ...state, rows: [], blocks: [], buffer: "", caret: 0, historyAt: null, stash: "", modal: NO_MODAL, busy: false };
+    case "display:set":
+      return { ...state, [event.key]: event.value };
     // Composer buffer & caret
     case "buffer:set":
       return setBuffer(state, event.text);
@@ -2282,9 +2595,9 @@ function consoleReducer(state, event) {
     case "buffer:eraseNext":
       return eraseNext(state);
     case "caret:move":
-      return { ...state, caret: clamp(state.caret + event.delta, state.buffer.length) };
+      return { ...state, caret: moveGrapheme(state.buffer, state.caret, event.delta) };
     case "caret:jump":
-      return { ...state, caret: clamp(event.offset, state.buffer.length) };
+      return { ...state, caret: snapGrapheme(state.buffer, event.offset) };
     // History ring
     case "history:push":
       return pushHistory(state, event.text);
@@ -2514,7 +2827,7 @@ function resolveTheme(scheme) {
 var THEME_SCHEMES = Object.keys(THEMES);
 
 // src/console/slash/builtins.ts
-import { homedir as homedir3 } from "node:os";
+import { homedir as homedir2 } from "node:os";
 import { join as join12 } from "node:path";
 
 // src/briefing/contract.ts
@@ -2699,7 +3012,7 @@ function composeBriefing(input) {
 }
 
 // src/briefing/macros.ts
-import { readFileSync, readdirSync, statSync } from "node:fs";
+import { readFileSync as readFileSync2, readdirSync, statSync } from "node:fs";
 import { basename as basename2, join as join4 } from "node:path";
 var decimal = (ch) => ch.charCodeAt(0) >= 48 && ch.charCodeAt(0) <= 57;
 var bareword = (ch) => {
@@ -2911,13 +3224,13 @@ function loadMacros(dir, opts = {}) {
   const macros = [];
   for (const entry of entries.sort()) {
     if (entry.startsWith(".") || !entry.toLowerCase().endsWith(".md")) continue;
-    const path4 = join4(dir, entry);
+    const path5 = join4(dir, entry);
     try {
-      if (!statSync(path4).isFile()) continue;
+      if (!statSync(path5).isFile()) continue;
     } catch {
       continue;
     }
-    const macro = readMacroFile(path4, origin, label);
+    const macro = readMacroFile(path5, origin, label);
     if (!seen.has(macro.name)) {
       seen.add(macro.name);
       macros.push(macro);
@@ -2925,17 +3238,17 @@ function loadMacros(dir, opts = {}) {
   }
   return macros;
 }
-function readMacroFile(path4, origin, label) {
+function readMacroFile(path5, origin, label) {
   let text;
   try {
-    text = readFileSync(path4, "utf8");
+    text = readFileSync2(path5, "utf8");
   } catch (cause) {
-    throw briefingFault("macro_invalid", `could not read macro file at ${path4}`, cause);
+    throw briefingFault("macro_invalid", `could not read macro file at ${path5}`, cause);
   }
   const { frontmatter, body } = splitFrontmatter(text);
-  const name = basename2(path4).replace(/\.md$/i, "");
+  const name = basename2(path5).replace(/\.md$/i, "");
   const declared = typeof frontmatter.description === "string" ? frontmatter.description.trim() : "";
-  return { name, description: declared ? `${declared} (${label})` : deriveDescription(body, label), body, origin, source: path4 };
+  return { name, description: declared ? `${declared} (${label})` : deriveDescription(body, label), body, origin, source: path5 };
 }
 function deriveDescription(body, label) {
   const first = body.split("\n").find((line) => line.trim())?.trim() ?? "";
@@ -2961,8 +3274,8 @@ function unquoteScalar(value) {
 }
 
 // src/briefing/skills.ts
-import { readFileSync as readFileSync2, readdirSync as readdirSync2, realpathSync, statSync as statSync2 } from "node:fs";
-import { basename as basename3, dirname as dirname2, join as join5 } from "node:path";
+import { readFileSync as readFileSync3, readdirSync as readdirSync2, realpathSync, statSync as statSync2 } from "node:fs";
+import { basename as basename3, dirname as dirname3, join as join5 } from "node:path";
 var SKILL_MANIFEST = "SKILL.md";
 var PRUNED_DIRS = /* @__PURE__ */ new Set(["node_modules", ".git"]);
 var KNOWN_FRONTMATTER_KEYS = /* @__PURE__ */ new Set(["name", "description", "license", "compatibility", "metadata", "allowed-tools", "disable-model-invocation"]);
@@ -2997,7 +3310,7 @@ function* walkLevel(dir, atRoot, seen) {
         seen.add(real);
         yield* walkLevel(full, false, seen);
       }
-    } else if (stats.isFile() && (atRoot && entry.toLowerCase().endsWith(".md") || !atRoot && entry === SKILL_MANIFEST)) yield { path: full, dirName: basename3(dirname2(full)) };
+    } else if (stats.isFile() && (atRoot && entry.toLowerCase().endsWith(".md") || !atRoot && entry === SKILL_MANIFEST)) yield { path: full, dirName: basename3(dirname3(full)) };
   }
 }
 function checkName(name, dirName, fromDir) {
@@ -3036,7 +3349,7 @@ function describeCause(cause) {
 function parseCandidate(candidate, origin) {
   let text;
   try {
-    text = readFileSync2(candidate.path, "utf8");
+    text = readFileSync3(candidate.path, "utf8");
   } catch (cause) {
     return { card: null, diagnostic: diag("invalid", candidate.path, `could not read the skill file (${describeCause(cause)})`) };
   }
@@ -3087,49 +3400,52 @@ function modelInvocableCards(cards) {
 }
 
 // src/briefing/context-docs.ts
-import { existsSync, readFileSync as readFileSync3, realpathSync as realpathSync2 } from "node:fs";
-import { dirname as dirname3, extname, isAbsolute as isAbsolute2, join as join6, parse, resolve as resolve2 } from "node:path";
+import { closeSync as closeSync2, constants as constants2, fstatSync as fstatSync2, lstatSync as lstatSync2, openSync as openSync2, readFileSync as readFileSync4, realpathSync as realpathSync2 } from "node:fs";
+import { basename as basename4, dirname as dirname4, extname, isAbsolute as isAbsolute2, join as join6, parse, resolve as resolve2, sep } from "node:path";
 var DEFAULT_MAX_IMPORT_DEPTH = 5;
 var DEFAULT_MAX_BYTES_PER_DOC = 4e4;
 var CANDIDATE_FILES = ["AGENTS.md", "CLAUDE.md", "INDUSAGI.md", "CLAUDE.local.md", "AGENTS.local.md", join6(".indusagi", "CLAUDE.md"), join6(".claude", "CLAUDE.md")];
-var TEXT_FILE_EXTENSIONS = /* @__PURE__ */ new Set([".md", ".markdown", ".txt", ".text", ".json", ".jsonc", ".yaml", ".yml", ".toml", ".xml", ".csv", ".html", ".htm", ".css", ".js", ".ts", ".tsx", ".jsx", ".mjs", ".cjs", ".mts", ".cts", ".py", ".rb", ".go", ".rs", ".sh", ".env"]);
+var TEXT_FILE_EXTENSIONS = /* @__PURE__ */ new Set([".md", ".markdown", ".txt", ".text", ".json", ".jsonc", ".yaml", ".yml", ".toml", ".xml", ".csv", ".html", ".htm", ".css", ".js", ".ts", ".tsx", ".jsx", ".mjs", ".cjs", ".mts", ".cts", ".py", ".rb", ".go", ".rs", ".sh"]);
 var IMPORT_REGEX = /(?:^|\s)@((?:[^\s\\]|\\ )+)/g;
-function shortenPath(path4, cwd, home) {
-  if (cwd && path4.startsWith(cwd)) {
-    const rest = path4.slice(cwd.length).replace(/^[/\\]+/, "");
+var NO_FOLLOW2 = constants2.O_NOFOLLOW ?? 0;
+var SECRET_BASENAMES = /* @__PURE__ */ new Set([
+  ".env",
+  "credentials",
+  "credentials.json",
+  "id_rsa",
+  "id_dsa",
+  "id_ecdsa",
+  "id_ed25519"
+]);
+var SECRET_EXTENSIONS = /* @__PURE__ */ new Set([".key", ".pem", ".p12", ".pfx"]);
+function shortenPath(path5, cwd, home) {
+  if (cwd && (path5 === cwd || path5.startsWith(`${cwd}${sep}`))) {
+    const rest = path5.slice(cwd.length).replace(/^[/\\]+/, "");
     return rest ? `./${rest}` : ".";
   }
-  return home && path4.startsWith(home) ? `~${path4.slice(home.length)}` : path4;
-}
-function dirChain(cwd) {
-  const chain = [];
-  let current = cwd;
-  for (let i = 0; i < 256; i++) {
-    chain.push(current);
-    const parent = dirname3(current);
-    if (parent === current || current === parse(current).root) break;
-    current = parent;
-  }
-  return chain.reverse();
-}
-function safeRealpath(path4) {
-  try {
-    return realpathSync2(path4);
-  } catch {
-    return path4;
-  }
+  return home && (path5 === home || path5.startsWith(`${home}${sep}`)) ? `~${path5.slice(home.length)}` : path5;
 }
-function isTextFile(path4) {
-  const extension = extname(path4).toLowerCase();
+function isTextFile(path5) {
+  const extension = extname(path5).toLowerCase();
   return !extension || TEXT_FILE_EXTENSIONS.has(extension);
 }
-function readFileBody(path4) {
-  if (!existsSync(path4)) return null;
+function isLikelySecretFile(path5) {
+  const name = basename4(path5).toLowerCase();
+  return SECRET_BASENAMES.has(name) || name.startsWith(".env.") || SECRET_EXTENSIONS.has(extname(name));
+}
+function readFileBody(path5) {
+  let fd;
   try {
-    const body = readFileSync3(path4, "utf8").trim();
+    const before = lstatSync2(path5);
+    if (before.isSymbolicLink() || !before.isFile()) return null;
+    fd = openSync2(path5, constants2.O_RDONLY | NO_FOLLOW2);
+    if (!fstatSync2(fd).isFile()) return null;
+    const body = readFileSync4(fd, "utf8").trim();
     return body || null;
   } catch {
     return null;
+  } finally {
+    if (fd !== void 0) closeSync2(fd);
   }
 }
 function extractImports(body, baseDir, home) {
@@ -3148,23 +3464,46 @@ function extractImports(body, baseDir, home) {
   }
   return out2;
 }
-function loadDocTree(path4, cwd, home, seen, depth, maxDepth, maxBytes, out2) {
-  const real = safeRealpath(path4);
-  if (seen.has(real)) return;
+function canonicalExistingFile(path5) {
+  try {
+    const before = lstatSync2(path5);
+    if (before.isSymbolicLink() || !before.isFile()) return null;
+    return realpathSync2(path5);
+  } catch {
+    return null;
+  }
+}
+function isWithin(root, candidate) {
+  return candidate === root || candidate.startsWith(`${root}${sep}`);
+}
+function loadTrustedDocTree(path5, cwd, home, seen, depth, maxDepth, maxBytes, out2, policy) {
+  if (isLikelySecretFile(path5)) return;
+  const real = canonicalExistingFile(path5);
+  if (real === null || seen.has(real) || isLikelySecretFile(real)) return;
+  if (!isWithin(policy.root, real) && !policy.approvedExternal.has(real)) return;
   seen.add(real);
-  const body = readFileBody(path4);
+  const body = readFileBody(real);
   if (body === null) return;
-  out2.push({ path: shortenPath(path4, cwd, home), body: body.length > maxBytes ? body.slice(0, maxBytes) : body });
+  out2.push({ path: shortenPath(real, cwd, home), body: body.length > maxBytes ? body.slice(0, maxBytes) : body });
   if (depth >= maxDepth) return;
-  for (const child of extractImports(body, dirname3(path4), home)) loadDocTree(child, cwd, home, seen, depth + 1, maxDepth, maxBytes, out2);
+  for (const child of extractImports(body, dirname4(real), home)) {
+    loadTrustedDocTree(child, cwd, home, seen, depth + 1, maxDepth, maxBytes, out2, policy);
+  }
 }
-function gatherContextDocs(cwd, home, opts) {
+function gatherContextDocs(cwd, home, opts = {}) {
   const out2 = [];
   try {
+    const root = realpathSync2(cwd);
+    const approvedExternal = /* @__PURE__ */ new Set();
+    for (const path5 of opts.approvedExternalPaths ?? []) {
+      const real = canonicalExistingFile(path5);
+      if (real !== null && !isLikelySecretFile(real)) approvedExternal.add(real);
+    }
+    const policy = { root, approvedExternal };
     const seen = /* @__PURE__ */ new Set();
-    const roots = dirChain(cwd);
-    if (home) roots.push(home);
-    for (const dir of roots) for (const name of CANDIDATE_FILES) loadDocTree(join6(dir, name), cwd, home, seen, 0, opts?.maxImportDepth ?? DEFAULT_MAX_IMPORT_DEPTH, opts?.maxBytesPerDoc ?? DEFAULT_MAX_BYTES_PER_DOC, out2);
+    for (const name of CANDIDATE_FILES) {
+      loadTrustedDocTree(join6(root, name), root, home, seen, 0, opts.maxImportDepth ?? DEFAULT_MAX_IMPORT_DEPTH, opts.maxBytesPerDoc ?? DEFAULT_MAX_BYTES_PER_DOC, out2, policy);
+    }
   } catch {
     return out2;
   }
@@ -3277,9 +3616,9 @@ function buildDynamicCommands(sources = {}) {
 
 // src/console/slash/commands/integrations.ts
 import { spawnSync as spawnSync3 } from "node:child_process";
-import { readFileSync as readFileSync6, writeFileSync as writeFileSync3 } from "node:fs";
-import { homedir as homedir2 } from "node:os";
-import { join as join10, resolve as resolve5 } from "node:path";
+import { getEnvApiKey as getEnvApiKey2 } from "indusagi/ai";
+import { writeFileSync as writeFileSync4 } from "node:fs";
+import { resolve as resolve5 } from "node:path";
 import { createMCPAgentToolFactory, loadMCPConfig, MCPClientPool } from "indusagi/mcp";
 import { createComposioGateway } from "indusagi/connectors-saas";
 
@@ -4399,14 +4738,14 @@ var DaemonTable = class {
     if (handle.state !== "running") return;
     const child = handle.child;
     child.kill("SIGTERM");
-    await new Promise((resolve9) => {
+    await new Promise((resolve11) => {
       const timer = setTimeout(() => {
         if (handle.state === "running") child.kill("SIGKILL");
-        resolve9();
+        resolve11();
       }, graceMs);
       child.once("exit", () => {
         clearTimeout(timer);
-        resolve9();
+        resolve11();
       });
     });
   }
@@ -5150,7 +5489,7 @@ function createLimiter(limit) {
     queue.shift()?.();
   };
   return async (fn) => {
-    if (active >= limit) await new Promise((resolve9) => queue.push(resolve9));
+    if (active >= limit) await new Promise((resolve11) => queue.push(resolve11));
     active++;
     try {
       return await fn();
@@ -5216,9 +5555,59 @@ import { Agent } from "indusagi/agent";
 import { createZeroUsage as createZeroUsage2 } from "indusagi/ai";
 import * as path3 from "node:path";
 
+// src/kit/run-shell.ts
+import { spawn as spawn3 } from "node:child_process";
+function runShell(command, cwd, signal) {
+  if (signal?.aborted) return Promise.resolve({ output: "Command cancelled.", exitCode: 130 });
+  return new Promise((resolve11) => {
+    let output = "", truncated = false, settled = false;
+    let forceKill;
+    const child = spawn3(command, { cwd, shell: true, detached: process.platform !== "win32" });
+    const capture = (chunk) => {
+      output += String(chunk);
+      if (output.length > 1024 * 1024) {
+        output = output.slice(-1024 * 1024);
+        truncated = true;
+      }
+    };
+    const kill = (signalName) => {
+      try {
+        if (process.platform !== "win32" && child.pid) process.kill(-child.pid, signalName);
+        else child.kill(signalName);
+      } catch {
+        try {
+          child.kill(signalName);
+        } catch {
+        }
+      }
+    };
+    const abort = () => {
+      kill("SIGTERM");
+      forceKill = setTimeout(() => kill("SIGKILL"), 1e3);
+      forceKill.unref();
+    };
+    const finish = (exitCode) => {
+      if (settled) return;
+      settled = true;
+      signal?.removeEventListener("abort", abort);
+      if (forceKill) clearTimeout(forceKill);
+      resolve11({ output: (truncated ? "[older output truncated]\n" : "") + output, exitCode: signal?.aborted ? 130 : exitCode });
+    };
+    child.stdout?.on("data", capture);
+    child.stderr?.on("data", capture);
+    child.once("error", (error) => {
+      capture(error.message);
+      finish(1);
+    });
+    child.once("close", (code) => finish(code ?? 1));
+    signal?.addEventListener("abort", abort, { once: true });
+    if (signal?.aborted) abort();
+  });
+}
+
 // src/conductor/catalog/catalog.ts
 import { z } from "zod";
-import { getModels, getProviders } from "indusagi/ai";
+import { getModels, getProviders, modelRegistry } from "indusagi/ai";
 var rawModelGate = z.object({
   id: z.string().min(1),
   name: z.string().min(1),
@@ -5228,6 +5617,7 @@ var rawModelGate = z.object({
   contextWindow: z.number().optional()
 });
 var EXCLUDED_PROVIDERS = /* @__PURE__ */ new Set(["mock"]);
+applyCodingAgentModelOverlay(modelRegistry);
 var frameworkSource = {
   providers: () => getProviders().filter((provider) => !EXCLUDED_PROVIDERS.has(String(provider))),
   models: (provider) => getModels(provider)
@@ -5642,30 +6032,21 @@ function memoryBackend() {
 }
 function fsBackend(dir) {
   const fileOf = async (sessionId) => {
-    const path4 = await import("node:path");
-    return path4.join(dir, `${sessionId}.ndjson`);
+    const path5 = await import("node:path");
+    return path5.join(dir, `${sessionId}.ndjson`);
   };
   return {
     locate: (sessionId) => `${dir}/${sessionId}.ndjson`,
     read: async (sessionId) => {
-      const fs3 = await import("node:fs/promises");
-      try {
-        return await fs3.readFile(await fileOf(sessionId), "utf8");
-      } catch {
-        return null;
-      }
+      return readPrivateFileSync(await fileOf(sessionId));
     },
     append: async (sessionId, line) => {
-      const fs3 = await import("node:fs/promises");
-      await fs3.mkdir(dir, { recursive: true });
-      await fs3.appendFile(await fileOf(sessionId), `${line}
-`, "utf8");
+      appendPrivateFileSync(await fileOf(sessionId), `${line}
+`);
     },
     rewrite: async (sessionId, text) => {
-      const fs3 = await import("node:fs/promises");
-      await fs3.mkdir(dir, { recursive: true });
-      await fs3.writeFile(await fileOf(sessionId), text.length === 0 ? "" : `${text}
-`, "utf8");
+      atomicWritePrivateFileSync(await fileOf(sessionId), text.length === 0 ? "" : `${text}
+`);
     }
   };
 }
@@ -6303,7 +6684,10 @@ async function summarize(messages, deps = {}) {
     const digest2 = localFallbackDigest(messages, deps.priorDigest);
     return { message: toSummaryMessage(digest2, scope), coveredCount };
   }
-  const prompt = buildSummaryPrompt(messages, scope, deps.priorDigest);
+  const prompt = buildSummaryPrompt(messages, scope, deps.priorDigest) + (deps.instructions ? `
+
+User compaction guidance:
+${deps.instructions}` : "");
   const context = {
     systemPrompt: CONDENSER_BRIEF,
     messages: [{ role: "user", content: prompt, timestamp: Date.now() }]
@@ -6427,8 +6811,8 @@ function collectVisibleReadPaths(kept, readToolName) {
       if (!isRecord4(block2) || block2.type !== "toolCall") continue;
       if (block2.name !== readToolName) continue;
       const args = isRecord4(block2.arguments) ? block2.arguments : void 0;
-      const path4 = args && typeof args.path === "string" ? args.path : "";
-      if (path4.length > 0) paths.add(path4);
+      const path5 = args && typeof args.path === "string" ? args.path : "";
+      if (path5.length > 0) paths.add(path5);
     }
   }
   return paths;
@@ -6444,8 +6828,8 @@ function collectDroppedReads(dropped, readToolName) {
       if (block2.name !== readToolName) continue;
       const id = typeof block2.id === "string" ? block2.id : "";
       const args = isRecord4(block2.arguments) ? block2.arguments : void 0;
-      const path4 = args && typeof args.path === "string" ? args.path : "";
-      if (id.length > 0 && path4.length > 0) calls.set(id, { path: path4, order: i });
+      const path5 = args && typeof args.path === "string" ? args.path : "";
+      if (id.length > 0 && path5.length > 0) calls.set(id, { path: path5, order: i });
     }
   }
   if (calls.size === 0) return [];
@@ -6496,7 +6880,7 @@ ${read.body}`,
 
 // src/conductor/diagnostics.ts
 import * as path2 from "node:path";
-import { existsSync as existsSync2 } from "node:fs";
+import { existsSync } from "node:fs";
 var MAX_PER_FILE = 10;
 var MAX_TOTAL = 30;
 var DELIVERED_KEYS_CAP = 500;
@@ -6553,18 +6937,18 @@ async function loadSpawn() {
     return void 0;
   }
 }
-function captureOutput(spawn3, bin, args, cwd, signal) {
-  return new Promise((resolve9) => {
+function captureOutput(spawn4, bin, args, cwd, signal) {
+  return new Promise((resolve11) => {
     let settled = false;
     const finish = (value) => {
       if (!settled) {
         settled = true;
-        resolve9(value);
+        resolve11(value);
       }
     };
     let child;
     try {
-      child = spawn3(bin, args, { cwd, shell: false });
+      child = spawn4(bin, args, { cwd, shell: false });
     } catch {
       finish();
       return;
@@ -6593,9 +6977,9 @@ function captureOutput(spawn3, bin, args, cwd, signal) {
   });
 }
 async function runTscDiagnostics(cwd, signal) {
-  const spawn3 = await loadSpawn();
-  if (!spawn3 || signal?.aborted) return [];
-  const output = await captureOutput(spawn3, path2.join(cwd, "node_modules", ".bin", "tsc"), ["--noEmit", "--pretty", "false"], cwd, signal);
+  const spawn4 = await loadSpawn();
+  if (!spawn4 || signal?.aborted) return [];
+  const output = await captureOutput(spawn4, path2.join(cwd, "node_modules", ".bin", "tsc"), ["--noEmit", "--pretty", "false"], cwd, signal);
   return output === void 0 ? [] : parseTscOutput(output, cwd);
 }
 function parseTscOutput(output, cwd) {
@@ -6615,9 +6999,9 @@ function parseTscOutput(output, cwd) {
 }
 async function runEslintDiagnostics(files, cwd, signal) {
   if (files.length === 0) return [];
-  const spawn3 = await loadSpawn();
-  if (!spawn3 || signal?.aborted) return [];
-  const output = await captureOutput(spawn3, path2.join(cwd, "node_modules", ".bin", "eslint"), ["--format", "json", ...files], cwd, signal);
+  const spawn4 = await loadSpawn();
+  if (!spawn4 || signal?.aborted) return [];
+  const output = await captureOutput(spawn4, path2.join(cwd, "node_modules", ".bin", "eslint"), ["--format", "json", ...files], cwd, signal);
   return output === void 0 ? [] : parseEslintOutput(output, cwd);
 }
 function parseEslintOutput(output, cwd) {
@@ -6724,14 +7108,14 @@ function isTypeScriptOrJs(filePath) {
 }
 function hasTsConfig(cwd) {
   try {
-    return existsSync2(path2.join(cwd, "tsconfig.json"));
+    return existsSync(path2.join(cwd, "tsconfig.json"));
   } catch {
     return false;
   }
 }
 function hasEslintConfig(cwd) {
   try {
-    return ["eslint.config.js", "eslint.config.mjs", "eslint.config.cjs", ".eslintrc", ".eslintrc.js", ".eslintrc.cjs", ".eslintrc.json", ".eslintrc.yml", ".eslintrc.yaml"].some((name) => existsSync2(path2.join(cwd, name)));
+    return ["eslint.config.js", "eslint.config.mjs", "eslint.config.cjs", ".eslintrc", ".eslintrc.js", ".eslintrc.cjs", ".eslintrc.json", ".eslintrc.yml", ".eslintrc.yaml"].some((name) => existsSync(path2.join(cwd, name)));
   } catch {
     return false;
   }
@@ -6758,7 +7142,7 @@ function reduceState(prev, action) {
   }
 }
 var DEFAULT_RETRY = { maxAttempts: 2, baseDelayMs: 250 };
-var THINKING_LADDER = ["off", "low", "medium", "high"];
+var DEFAULT_THINKING_LADDER = ["off", "low", "medium", "high"];
 var PERMISSION_CYCLE = ["default", "acceptEdits", "plan", "bypass"];
 function newSessionId() {
   return `s_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 10)}`;
@@ -6780,6 +7164,10 @@ function isOverloadFault(error) {
   const text = errorText(error).toLowerCase();
   return text.includes("529") || text.includes("overload");
 }
+function thinkingLadderForModel(model) {
+  const efforts = model?.reasoningEfforts;
+  return efforts?.length ? efforts : DEFAULT_THINKING_LADDER;
+}
 function withGatewayBaseUrl(model, gatewayBaseUrls) {
   const url = gatewayBaseUrls?.[model.provider];
   return url ? { ...model, baseUrl: url } : model;
@@ -6878,6 +7266,8 @@ var SessionConductorImpl = class {
   #matcher;
   #state;
   #busy = false;
+  #activeWork;
+  #shellAbort;
   #draining = false;
   #queue = [];
   #boundModel;
@@ -6937,6 +7327,7 @@ var SessionConductorImpl = class {
   abort() {
     this.clearQueue();
     this.#condenseAbort?.abort();
+    this.#shellAbort?.abort();
     this.agent.abort();
     const fault = conductorFault("aborted", "turn aborted by caller");
     this.#dispatch({ type: "fault", fault });
@@ -6949,13 +7340,22 @@ var SessionConductorImpl = class {
       return this.#state;
     }
     this.#busy = true;
-    try {
-      await this.#runTurn(input);
-      await this.#drainQueue();
-      return this.#state;
-    } finally {
-      this.#busy = false;
-    }
+    const work = (async () => {
+      try {
+        await this.#runTurn(input);
+        await this.#drainQueue();
+        return this.#state;
+      } finally {
+        this.#busy = false;
+      }
+    })();
+    this.#activeWork = work;
+    return work;
+  }
+  async #stopWork() {
+    if (!this.#busy) return;
+    this.abort();
+    await this.#activeWork;
   }
   async #drainQueue() {
     if (this.#draining) return;
@@ -6993,7 +7393,7 @@ var SessionConductorImpl = class {
         }
         if (attempt < (this.deps.retry ?? DEFAULT_RETRY).maxAttempts && isTransient(error)) {
           this.#hub.emit({ kind: "fault", fault: conductorFault("model", `transient model fault; retry ${attempt + 1}`, error), transient: true });
-          await (this.deps.sleep ?? ((ms) => new Promise((resolve9) => setTimeout(resolve9, ms))))((this.deps.retry ?? DEFAULT_RETRY).baseDelayMs * 2 ** attempt);
+          await (this.deps.sleep ?? ((ms) => new Promise((resolve11) => setTimeout(resolve11, ms))))((this.deps.retry ?? DEFAULT_RETRY).baseDelayMs * 2 ** attempt);
           continue;
         }
         if (isOverloadFault(error) && this.options.fallbackModelId) this.selectModel(this.options.fallbackModelId);
@@ -7044,8 +7444,16 @@ var SessionConductorImpl = class {
     }
     this.#applyModel(card);
   }
-  cycleModel(id) {
-    this.selectModel(id);
+  cycleModel(id, direction = 1) {
+    if (id.trim()) {
+      this.selectModel(id);
+      return;
+    }
+    const cards = this.availableModels();
+    if (!cards.length) return;
+    const at = cards.findIndex((card) => card.id === this.#state.modelId);
+    const index = at < 0 ? 0 : (at + direction + cards.length) % cards.length;
+    this.selectModel(cards[index].id);
   }
   #applyModel(card) {
     const model = withGatewayBaseUrl(card.model, this.#gatewayBaseUrls);
@@ -7060,28 +7468,36 @@ var SessionConductorImpl = class {
   registerTools(tools) {
     this.agent.setTools([...this.#deckTools, ...tools]);
   }
-  async condense() {
+  async condense(instructions) {
     if (this.#busy) return "busy";
     this.#busy = true;
     this.#condenseAbort = new AbortController();
-    try {
-      const result = await this.#runCondense(true, this.#condenseAbort.signal);
-      await this.#drainQueue();
-      return result;
-    } finally {
-      this.#busy = false;
-      this.#condenseAbort = void 0;
-    }
+    const work = (async () => {
+      try {
+        const result = await this.#runCondense(true, this.#condenseAbort.signal, instructions);
+        await this.#drainQueue();
+        return result;
+      } finally {
+        this.#busy = false;
+        this.#condenseAbort = void 0;
+      }
+    })();
+    this.#activeWork = work;
+    return work;
   }
   cancelCondense() {
     this.#condenseAbort?.abort();
   }
-  async #runCondense(force, signal) {
+  async #runCondense(force, signal, instructions) {
     const before = [...this.agent.state.messages];
     this.#dispatch({ type: "phase", phase: "condensing" });
     try {
-      const after = await (this.deps.condense ?? noopCondense)(before, { force, model: this.#boundModel, contextTokens: this.#state.contextTokens, signal });
-      if (signal?.aborted) return "cancelled";
+      const after = await (this.deps.condense ?? noopCondense)(before, { force, model: this.#boundModel, contextTokens: this.#state.contextTokens, signal, instructions });
+      if (signal?.aborted) {
+        this.#dispatch({ type: "settled" });
+        this.#hub.emit({ kind: "idle" });
+        return "cancelled";
+      }
       if (after.length >= before.length) {
         this.#dispatch({ type: "settled" });
         return "nothing";
@@ -7108,10 +7524,12 @@ var SessionConductorImpl = class {
   }
   async #move(id, message) {
     try {
+      await this.#stopWork();
       await this.store.branchAt(id);
       this.agent.replaceMessages(this.store.messages());
       this.#dispatch({ type: "head", head: this.store.head });
       this.#dispatch({ type: "settled" });
+      this.#hub.emit({ kind: "reset" });
       this.#hub.emit({ kind: "idle" });
     } catch (error) {
       const fault = conductorFault("persistence", message, error);
@@ -7126,18 +7544,33 @@ var SessionConductorImpl = class {
     return { canRestore: this.options.checkpoint?.hasSnapshot(id) ?? false };
   }
   async executeBash(command, opts = {}) {
-    const { spawn: spawn3 } = await import("node:child_process");
-    const outcome = await new Promise((resolve9) => {
-      const child = spawn3(command, { cwd: this.#workspace, shell: true });
-      let output = "";
-      child.stdout?.on("data", (chunk) => output += String(chunk));
-      child.stderr?.on("data", (chunk) => output += String(chunk));
-      child.on("error", (error) => resolve9({ output: output + errorText(error), exitCode: 1 }));
-      child.on("close", (code) => resolve9({ output, exitCode: code ?? 1 }));
-    });
-    if (!opts.excludeFromContext) await this.store.append({ role: "user", content: `$ ${command}
-${outcome.output}`.trimEnd(), timestamp: Date.now() }, "note");
-    return outcome;
+    if (this.#busy) throw new Error("A turn is running \u2014 stop it before running a shell command.");
+    this.#busy = true;
+    this.#shellAbort = new AbortController();
+    const signal = opts.signal ? AbortSignal.any([opts.signal, this.#shellAbort.signal]) : this.#shellAbort.signal;
+    const work = (async () => {
+      try {
+        this.#dispatch({ type: "phase", phase: "tooling" });
+        const outcome = await runShell(command, this.#workspace, signal);
+        if (!opts.excludeFromContext) {
+          const message = { role: "user", content: `$ ${command}
+${outcome.output}`.trimEnd(), timestamp: Date.now() };
+          const entry = await this.store.append(message, "note");
+          this.agent.replaceMessages([...this.agent.state.messages, message]);
+          this.#dispatch({ type: "head", head: this.store.head });
+          this.#hub.emit({ kind: "persisted", entryId: entry.id });
+        }
+        this.#dispatch({ type: "settled" });
+        this.#hub.emit({ kind: "idle" });
+        await this.#drainQueue();
+        return outcome;
+      } finally {
+        this.#busy = false;
+        this.#shellAbort = void 0;
+      }
+    })();
+    this.#activeWork = work;
+    return work;
   }
   stats() {
     const messages = this.agent.state.messages;
@@ -7160,11 +7593,13 @@ ${outcome.output}`.trimEnd(), timestamp: Date.now() }, "note");
     return this.#thinking;
   }
   setThinkingLevel(level) {
+    if (!isReasoningEffortSupported(this.#boundModel?.id, level)) return;
     this.#thinking = level;
     this.agent.setThinkingLevel?.(level);
   }
   cycleThinkingLevel() {
-    const next = THINKING_LADDER[(THINKING_LADDER.indexOf(this.#thinking) + 1) % THINKING_LADDER.length];
+    const ladder = thinkingLadderForModel(this.#boundModel);
+    const next = ladder[(ladder.indexOf(this.#thinking) + 1) % ladder.length];
     this.setThinkingLevel(next);
     return next;
   }
@@ -7205,6 +7640,7 @@ ${outcome.output}`.trimEnd(), timestamp: Date.now() }, "note");
     this.#sessionName = name;
   }
   async resume(id) {
+    await this.#stopWork();
     if (!await this.store.load(id)) {
       const fault = conductorFault("persistence", `no session "${id}" to resume`);
       this.#dispatch({ type: "fault", fault });
@@ -7213,19 +7649,23 @@ ${outcome.output}`.trimEnd(), timestamp: Date.now() }, "note");
     }
     this.agent.replaceMessages(this.store.messages());
     this.#state = { ...this.#state, head: this.store.head, usage: this.store.usage ?? createZeroUsage2(), phase: "idle" };
+    this.#hub.emit({ kind: "reset" });
     this.#hub.emit({ kind: "idle" });
   }
   async newSession() {
-    this.agent.abort();
+    await this.#stopWork();
     this.agent.replaceMessages([]);
     this.store.startNewSession(newSessionId());
     this.#queue.length = 0;
     this.#sessionName = void 0;
     this.#state = { phase: "idle", head: this.store.head, usage: createZeroUsage2(), contextTokens: 0, modelId: this.#state.modelId };
+    this.#hub.emit({ kind: "reset" });
     this.#hub.emit({ kind: "idle" });
   }
   #dispatch(action) {
+    const phase = this.#state.phase;
     this.#state = reduceState(this.#state, action);
+    if (phase !== this.#state.phase) this.#hub.emit({ kind: "phase", phase: this.#state.phase });
   }
 };
 
@@ -7993,7 +8433,7 @@ var SETTING_KEYS = Object.freeze(
 
 // src/kit/clipboard-image.ts
 import { spawnSync } from "node:child_process";
-import { readFileSync as readFileSync4, writeFileSync } from "node:fs";
+import { readFileSync as readFileSync5, writeFileSync as writeFileSync2 } from "node:fs";
 import { tmpdir } from "node:os";
 import { join as join8 } from "node:path";
 var READ_TIMEOUT_MS = 3e3;
@@ -8038,10 +8478,10 @@ function captureViaOsascript() {
     { timeout: READ_TIMEOUT_MS, encoding: "utf8" }
   );
   if (result.error || result.status !== 0) return null;
-  const path4 = String(result.stdout ?? "").trim();
-  if (path4.length === 0) return null;
+  const path5 = String(result.stdout ?? "").trim();
+  if (path5.length === 0) return null;
   try {
-    const bytes = readFileSync4(path4);
+    const bytes = readFileSync5(path5);
     return bytes.length > 0 ? bytes : null;
   } catch {
     return null;
@@ -8072,10 +8512,10 @@ function readClipboardImage(options = {}) {
   if (bytes === null) return null;
   const dir = options.dir ?? tmpdir();
   const name = `indus-clipboard-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}.png`;
-  const path4 = join8(dir, name);
+  const path5 = join8(dir, name);
   try {
-    writeFileSync(path4, bytes);
-    return path4;
+    writeFileSync2(path5, bytes);
+    return path5;
   } catch {
     return null;
   }
@@ -8083,7 +8523,7 @@ function readClipboardImage(options = {}) {
 
 // src/kit/external-editor.ts
 import { spawnSync as spawnSync2 } from "node:child_process";
-import { readFileSync as readFileSync5, unlinkSync, writeFileSync as writeFileSync2 } from "node:fs";
+import { readFileSync as readFileSync6, unlinkSync, writeFileSync as writeFileSync3 } from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
 import { join as join9 } from "node:path";
 var FALLBACK_EDITOR = "vi";
@@ -8096,18 +8536,28 @@ function openInExternalEditor(buffer, options = {}) {
   const env2 = options.env ?? process.env;
   const dir = options.dir ?? tmpdir2();
   const name = `indus-editor-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}.md`;
-  const path4 = join9(dir, name);
+  const path5 = join9(dir, name);
   const [editor, ...editorArgs] = resolveEditor(env2);
   try {
-    writeFileSync2(path4, buffer, "utf8");
-    const result = spawnSync2(editor, [...editorArgs, path4], { stdio: "inherit" });
+    writeFileSync3(path5, buffer, "utf8");
+    const terminal = options.terminal ?? { stdin: process.stdin, stdout: process.stdout };
+    const wasRaw = terminal.stdin.isRaw === true;
+    let result;
+    try {
+      terminal.stdin.setRawMode?.(false);
+      if (terminal.stdout.isTTY) terminal.stdout.write("\x1B[?1049h\x1B[?25h");
+      result = spawnSync2(editor, [...editorArgs, path5], { stdio: "inherit" });
+    } finally {
+      if (terminal.stdout.isTTY) terminal.stdout.write("\x1B[?1049l\x1B[?25l");
+      terminal.stdin.setRawMode?.(wasRaw);
+    }
     if (result.error || result.status !== 0) return null;
-    return readFileSync5(path4, "utf8").replace(/\n$/, "");
+    return readFileSync6(path5, "utf8").replace(/\n$/, "");
   } catch {
     return null;
   } finally {
     try {
-      unlinkSync(path4);
+      unlinkSync(path5);
     } catch {
     }
   }
@@ -8757,6 +9207,7 @@ function lastAssistantText(messages) {
   return "";
 }
 function toPublishRole(role) {
+  if (role === "toolResult") return "tool";
   return PUBLISH_ROLES.has(role) ? role : "note";
 }
 function toPublishEntries(messages) {
@@ -8787,7 +9238,7 @@ function exportTranscriptHtml(ctx, target) {
     const html = publishTranscript(toPublishEntries(messages), {
       title: "Session Transcript"
     });
-    writeFileSync3(outPath, html, "utf-8");
+    writeFileSync4(outPath, html, "utf-8");
     return { ok: true, path: outPath };
   } catch (cause) {
     const message = cause instanceof Error ? cause.message : String(cause);
@@ -9178,13 +9629,11 @@ function runLogin2(ctx) {
   }
   return HANDLED;
 }
-function hasLocalProviderKey(provider) {
-  if (provider.length === 0) return false;
+async function hasLocalProviderKey(provider, ctx) {
+  if (!provider) return false;
   try {
-    const file = join10(homedir2(), ".indusagi", "agent", "auth.json");
-    const vault = JSON.parse(readFileSync6(file, "utf8"));
-    const entry = vault[provider];
-    return entry !== null && typeof entry === "object" && Object.keys(entry).length > 0;
+    if (getEnvApiKey2(provider)) return true;
+    return (await ctx.services?.vault.listAccounts(provider) ?? []).length > 0;
   } catch {
     return false;
   }
@@ -9200,7 +9649,7 @@ function runStatus(ctx) {
       signedIn = false;
     }
     const eligible = isGatewayEligibleProvider(provider);
-    const localKey = hasLocalProviderKey(provider);
+    const localKey = await hasLocalProviderKey(provider, ctx);
     const viaServer = signedIn && eligible && !localKey;
     if (viaServer) {
       ctx.setStatus(info(`\u25CF server tier \u2014 ${modelId} routing via ${INDUS_SERVER_URL} (signed in)`));
@@ -9381,12 +9830,7 @@ var compactCommand = {
     ctx.setStatus({ kind: "busy", text: busyText });
     void (async () => {
       try {
-        if (instructions.length > 0) {
-          await ctx.conductor.executeBash(
-            `printf '%s' ${JSON.stringify(`Compaction guidance: ${instructions}`)}`
-          );
-        }
-        switch (await ctx.conductor.condense()) {
+        switch (await ctx.conductor.condense(instructions || void 0)) {
           case "condensed":
             ctx.setStatus(
               info(
@@ -9561,7 +10005,7 @@ var transcriptCommands = [
 ];
 
 // src/console/slash/commands/workbench.ts
-import { mkdtempSync, readFileSync as readFileSync7, writeFileSync as writeFileSync4 } from "node:fs";
+import { mkdtempSync, readFileSync as readFileSync8, writeFileSync as writeFileSync5 } from "node:fs";
 import { tmpdir as tmpdir3 } from "node:os";
 import { join as join11 } from "node:path";
 function block(slug, title, markdown) {
@@ -9597,7 +10041,7 @@ function hotkeysBlock() {
 function readChangelog(cwd) {
   for (const name of CHANGELOG_NAMES) {
     try {
-      const text = readFileSync7(join11(cwd, name), "utf8");
+      const text = readFileSync8(join11(cwd, name), "utf8");
       if (text.trim().length > 0) return text;
     } catch {
     }
@@ -9635,9 +10079,9 @@ function runDebug(ctx) {
   const jsonl = records.map((r) => JSON.stringify(r)).join("\n") + "\n";
   try {
     const dir = mkdtempSync(join11(tmpdir3(), "indus-debug-"));
-    const path4 = join11(dir, `session-${stats.sessionId || "unknown"}.jsonl`);
-    writeFileSync4(path4, jsonl, "utf8");
-    ctx.setStatus(info(`Diagnostics written to ${path4}`));
+    const path5 = join11(dir, `session-${stats.sessionId || "unknown"}.jsonl`);
+    writeFileSync5(path5, jsonl, "utf8");
+    ctx.setStatus(info(`Diagnostics written to ${path5}`));
   } catch (cause) {
     const detail = cause instanceof Error ? cause.message : String(cause);
     ctx.setStatus(warn(`Could not write the diagnostics log (${detail}).`));
@@ -9689,7 +10133,7 @@ var HOTKEYS = [
   ["Tab", "Accept the highlighted completion"],
   ["Ctrl+C", "Interrupt the running turn"],
   ["Ctrl+T", "Toggle reasoning / thinking rows"],
-  ["/thinking", "Cycle thinking effort level (off \u2192 low \u2192 medium)"],
+  ["/thinking", "Cycle the selected model's supported reasoning efforts"],
   ["Ctrl+V", "Attach an image from the clipboard"],
   ["Ctrl+G", "Edit the composer in your external editor"],
   ["Ctrl+O", "Expand or collapse full tool output"],
@@ -9761,7 +10205,7 @@ var workbenchCommands = [
   {
     name: "whats-new",
     summary: "Show what changed in this build",
-    aliases: ["changelog"],
+    aliases: ["changelog", "release-notes"],
     run: runChangelog
   },
   {
@@ -9771,7 +10215,7 @@ var workbenchCommands = [
   },
   {
     name: "thinking",
-    summary: "Cycle thinking effort level (off \u2192 low \u2192 medium \u2192 off)",
+    summary: "Cycle reasoning effort using the selected model's supported levels",
     run: (ctx) => {
       ctx.conductor.cycleThinkingLevel();
       return HANDLED;
@@ -9787,7 +10231,7 @@ var workbenchCommands = [
 // src/console/slash/builtins.ts
 var PROJECT_DIR = ".indusagi";
 function dynamicRoots() {
-  const home = homedir3();
+  const home = homedir2();
   const cwd = process.cwd();
   return {
     skills: [
@@ -9925,7 +10369,7 @@ function readKey(input, key) {
       case "n":
         return { verb: "flow:cycleModel" };
       case "p":
-        return { verb: "flow:cycleModel" };
+        return { verb: "flow:cycleModel", direction: -1 };
       case "t":
         return { verb: "view:toggleReasoning" };
       case "v":
@@ -9950,15 +10394,15 @@ function readKey(input, key) {
   }
   if (key.escape) return { verb: "flow:dismiss" };
   if (key.tab) return key.shift ? { verb: "mode:cyclePermission" } : { verb: "flow:accept" };
-  if (key.backspace || key.delete || input === "\x7F" || input === "\b") {
+  if (key.delete) return { verb: "edit:eraseNext" };
+  if (key.backspace || input === "\x7F" || input === "\b") {
     return { verb: "edit:erasePrev" };
   }
   if (key.leftArrow) return { verb: "nav:left" };
   if (key.rightArrow) return { verb: "nav:right" };
   if (key.upArrow) return { verb: "nav:up" };
   if (key.downArrow) return { verb: "nav:down" };
-  if (key.pageUp) return { verb: "nav:home" };
-  if (key.pageDown) return { verb: "nav:end" };
+  if (key.pageUp || key.pageDown) return NO_INTENT;
   return isPrintable(input) ? typed(input) : NO_INTENT;
 }
 var NO_CHORD = { armed: null };
@@ -10078,12 +10522,12 @@ function splitPathStem(stem) {
   const body = stem.slice(sigil.length);
   const slash = body.lastIndexOf("/");
   if (slash < 0) return { dir: ".", leaf: body, sigil };
-  return { dir: body.slice(0, slash) || ".", leaf: body.slice(slash + 1), sigil };
+  return { dir: body.slice(0, slash) || "/", leaf: body.slice(slash + 1), sigil };
 }
 function completePath(stem, readDir) {
   const { dir, leaf, sigil } = splitPathStem(stem);
   const lowerLeaf = leaf.toLowerCase();
-  const prefix = dir === "." ? "" : `${dir}/`;
+  const prefix = dir === "." ? "" : dir === "/" ? "/" : `${dir}/`;
   const matches = readDir(dir).filter((e) => e.name.toLowerCase().startsWith(lowerLeaf)).sort((a, b) => {
     if (a.isDir !== b.isDir) return a.isDir ? -1 : 1;
     return a.name < b.name ? -1 : a.name > b.name ? 1 : 0;
@@ -10119,6 +10563,7 @@ function applySuggestion(buffer, span, suggestion) {
 // src/console/input/dir-reader.ts
 import { readdirSync as readdirSync3, statSync as statSync3 } from "node:fs";
 import { resolve as resolve6 } from "node:path";
+import { homedir as homedir3 } from "node:os";
 function entryIsDir(base, name, isDirent, isSymlink) {
   if (isDirent) return true;
   if (!isSymlink) return false;
@@ -10130,7 +10575,8 @@ function entryIsDir(base, name, isDirent, isSymlink) {
 }
 function createDirReader(cwd = process.cwd()) {
   return (dirPath) => {
-    const target = resolve6(cwd, dirPath);
+    const expanded = dirPath === "~" ? homedir3() : dirPath.startsWith("~/") ? resolve6(homedir3(), dirPath.slice(2)) : dirPath;
+    const target = resolve6(cwd, expanded);
     try {
       const dirents = readdirSync3(target, { withFileTypes: true });
       return dirents.map((d) => ({
@@ -10145,11 +10591,12 @@ function createDirReader(cwd = process.cwd()) {
 
 // src/console/components/TerminalConsole.ts
 import { execFileSync } from "node:child_process";
-import { homedir as homedir7 } from "node:os";
-import React3, { useEffect as useEffect7, useMemo as useMemo2, useState as useState8 } from "indusagi/react-host";
-import { Box as Box10, Text as Text10, useInput as useInput4 } from "indusagi/react-host/ink";
+import { homedir as homedir6 } from "node:os";
+import React4, { useEffect as useEffect9, useMemo as useMemo2, useState as useState10 } from "indusagi/react-host";
+import { Box as Box12, Text as Text11, useInput as useInput6 } from "indusagi/react-host/ink";
+import { useStdin, useStdout as useStdout2 } from "ink";
 import { MessageList, StreamingMarkdown, TaskPanel } from "indusagi/react-ink";
-import { Fragment as Fragment4, jsx as jsx13, jsxs as jsxs10 } from "indusagi/react-host/jsx-runtime";
+import { Fragment as Fragment4, jsx as jsx14, jsxs as jsxs10 } from "indusagi/react-host/jsx-runtime";
 
 // src/workspace/runtime-detect.ts
 var BUN_VIRTUAL_FS_MARKERS = ["$bunfs", "~BUN", "%7EBUN"];
@@ -10164,13 +10611,13 @@ function isPackagedBinary() {
 }
 
 // src/settings/manager.ts
-import { existsSync as existsSync3, mkdirSync as mkdirSync2, readFileSync as readFileSync8, writeFileSync as writeFileSync5 } from "node:fs";
-import { dirname as dirname4, join as join13 } from "node:path";
+import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync9, writeFileSync as writeFileSync6 } from "node:fs";
+import { dirname as dirname5, join as join13 } from "node:path";
 function loadTier(filePath) {
-  if (!existsSync3(filePath)) return {};
+  if (!existsSync2(filePath)) return {};
   let raw;
   try {
-    raw = readFileSync8(filePath, "utf-8");
+    raw = readFileSync9(filePath, "utf-8");
   } catch {
     return {};
   }
@@ -10186,9 +10633,9 @@ function loadTier(filePath) {
   return { ...parsed };
 }
 function writeTier(filePath, tier) {
-  const dir = dirname4(filePath);
-  if (!existsSync3(dir)) mkdirSync2(dir, { recursive: true });
-  writeFileSync5(filePath, `${JSON.stringify(tier, null, 2)}
+  const dir = dirname5(filePath);
+  if (!existsSync2(dir)) mkdirSync2(dir, { recursive: true });
+  writeFileSync6(filePath, `${JSON.stringify(tier, null, 2)}
 `, "utf-8");
 }
 var PreferenceStore = class _PreferenceStore {
@@ -10261,14 +10708,14 @@ var IMAGE_SNIFF_BYTES = PNG_SIGNATURE.length;
 
 // src/sessions/library.ts
 import {
-  mkdir as mkdir2,
-  readFile as readFile2,
+  mkdir,
+  readFile,
   readdir,
   rename,
   rm,
   stat
 } from "node:fs/promises";
-import { basename as basename4, join as join14 } from "node:path";
+import { basename as basename5, join as join14 } from "node:path";
 var SESSION_FILE_EXT = ".ndjson";
 var PREVIEW_LIMIT = 72;
 var SessionLibrary = class {
@@ -10300,14 +10747,14 @@ var SessionLibrary = class {
     if (!await this.#missing(toPath)) {
       throw new Error(`SessionLibrary.rename: session "${toId}" already exists`);
     }
-    await mkdir2(this.#dir, { recursive: true });
+    await mkdir(this.#dir, { recursive: true });
     await rename(fromPath, toPath);
     return toPath;
   }
   async remove(id) {
-    const path4 = this.pathOf(id);
-    if (await this.#missing(path4)) return false;
-    await rm(path4, { force: true });
+    const path5 = this.pathOf(id);
+    if (await this.#missing(path5)) return false;
+    await rm(path5, { force: true });
     return true;
   }
   pathOf(id) {
@@ -10362,41 +10809,41 @@ var SessionLibrary = class {
     } catch {
       return [];
     }
-    return names.filter((name) => name.endsWith(SESSION_FILE_EXT)).map((name) => basename4(name, SESSION_FILE_EXT));
+    return names.filter((name) => name.endsWith(SESSION_FILE_EXT)).map((name) => basename5(name, SESSION_FILE_EXT));
   }
   async #shallowRow(id) {
-    const path4 = this.pathOf(id);
-    const meta = await this.#fileMeta(path4);
-    return { id, path: path4, ...meta };
+    const path5 = this.pathOf(id);
+    const meta = await this.#fileMeta(path5);
+    return { id, path: path5, ...meta };
   }
   async #deepRow(id) {
-    const path4 = this.pathOf(id);
-    const meta = await this.#fileMeta(path4);
+    const path5 = this.pathOf(id);
+    const meta = await this.#fileMeta(path5);
     const store = await this.open(id);
-    if (store === null) return { id, path: path4, ...meta };
+    if (store === null) return { id, path: path5, ...meta };
     const branch = store.pathTo();
     const conversational = branch.filter(isConversational);
     const opener = conversational.find((entry) => entry.role === "user");
     const preview2 = opener ? previewOf(messageText(opener.content)) : void 0;
     return {
       id,
-      path: path4,
+      path: path5,
       ...meta,
       messageCount: conversational.length,
       ...preview2 ? { preview: preview2, name: preview2 } : {}
     };
   }
-  async #fileMeta(path4) {
+  async #fileMeta(path5) {
     try {
-      const info2 = await stat(path4);
+      const info2 = await stat(path5);
       return { size: info2.size, lastModified: info2.mtimeMs };
     } catch {
       return {};
     }
   }
-  async #missing(path4) {
+  async #missing(path5) {
     try {
-      await readFile2(path4);
+      await readFile(path5);
       return false;
     } catch {
       return true;
@@ -10555,9 +11002,9 @@ function resolveSpecifierPath(specifier) {
 function buildAliasMap() {
   const map = {};
   for (const specifier of BUNDLED_NAMESPACES) {
-    const path4 = resolveSpecifierPath(specifier);
-    if (path4 !== void 0) {
-      map[specifier] = path4;
+    const path5 = resolveSpecifierPath(specifier);
+    if (path5 !== void 0) {
+      map[specifier] = path5;
     }
   }
   return map;
@@ -10605,8 +11052,8 @@ function createJitiLoader(options = {}) {
   const base = options.base ?? process.cwd();
   const home = options.home ?? homedir4();
   return {
-    async load(path4) {
-      const absolute = resolvePath(path4, base, home);
+    async load(path5) {
+      const absolute = resolvePath(path5, base, home);
       const specifier = pathToFileURL(absolute).href;
       const imported = await jiti.import(specifier);
       const manifest = toManifest(imported);
@@ -10621,8 +11068,8 @@ function createJitiLoader(options = {}) {
 }
 
 // src/addons/manifest.ts
-import { readFileSync as readFileSync9, readdirSync as readdirSync4, statSync as statSync4 } from "node:fs";
-import { basename as basename5, extname as extname3, isAbsolute as isAbsolute5, join as join15, resolve as resolve8 } from "node:path";
+import { readFileSync as readFileSync10, readdirSync as readdirSync4, statSync as statSync4 } from "node:fs";
+import { basename as basename6, extname as extname3, isAbsolute as isAbsolute5, join as join15, resolve as resolve8 } from "node:path";
 var ENTRY_EXTENSIONS = [
   ".ts",
   ".tsx",
@@ -10639,9 +11086,9 @@ function isHidden(name) {
 function hasEntryExtension(name) {
   return ENTRY_EXTENSIONS.includes(extname3(name).toLowerCase());
 }
-function entryKind(path4) {
+function entryKind(path5) {
   try {
-    const stat2 = statSync4(path4);
+    const stat2 = statSync4(path5);
     if (stat2.isDirectory()) return "directory";
     if (stat2.isFile()) return "file";
     return void 0;
@@ -10662,7 +11109,7 @@ function readManifestEntry(packageDir) {
     return void 0;
   }
   try {
-    const parsed = JSON.parse(readFileSync9(manifestPath, "utf8"));
+    const parsed = JSON.parse(readFileSync10(manifestPath, "utf8"));
     if (typeof parsed !== "object" || parsed === null) {
       return void 0;
     }
@@ -10694,13 +11141,13 @@ function resolveTopLevelEntry(dir, name) {
   if (isHidden(name)) {
     return void 0;
   }
-  const path4 = join15(dir, name);
-  const kind = entryKind(path4);
+  const path5 = join15(dir, name);
+  const kind = entryKind(path5);
   if (kind === "file") {
-    return hasEntryExtension(name) ? path4 : void 0;
+    return hasEntryExtension(name) ? path5 : void 0;
   }
   if (kind === "directory") {
-    return resolvePackageEntry(path4);
+    return resolvePackageEntry(path5);
   }
   return void 0;
 }
@@ -10715,9 +11162,9 @@ function discoverAddons(dir) {
   return entries.sort();
 }
 function deriveAddonId(entryPath) {
-  const file = basename5(entryPath);
+  const file = basename6(entryPath);
   const stem = file.slice(0, file.length - extname3(file).length);
-  const label = INDEX_BASENAMES.includes(stem) ? basename5(join15(entryPath, "..")) : stem;
+  const label = INDEX_BASENAMES.includes(stem) ? basename6(join15(entryPath, "..")) : stem;
   return addonId(label.length > 0 ? label : entryPath);
 }
 function addonsDirFor(workspace, dir = ADDONS_DIR) {
@@ -10734,12 +11181,12 @@ function discoverSources(discovery) {
   }
   const seen = /* @__PURE__ */ new Set();
   const sources = [];
-  for (const path4 of paths) {
-    if (seen.has(path4)) {
+  for (const path5 of paths) {
+    if (seen.has(path5)) {
       continue;
     }
-    seen.add(path4);
-    sources.push({ id: deriveAddonId(path4), path: path4 });
+    seen.add(path5);
+    sources.push({ id: deriveAddonId(path5), path: path5 });
   }
   return sources;
 }
@@ -11308,6 +11755,7 @@ function ndjsonStrategy() {
     },
     onSignal(signal, ctx) {
       const s = signal;
+      if (s.kind === "tool_update") return;
       ctx.out.write(ctx.framer.encodeLine({ type: "signal", name: s.kind, body: s }));
     },
     finish(state, ctx) {
@@ -11414,16 +11862,16 @@ function createDialogBridge(deps) {
     ask(kind, payload, fallback) {
       const id = nextAskId(seq);
       const frame = { type: "ask", id, kind, payload };
-      return new Promise((resolve9) => {
+      return new Promise((resolve11) => {
         const timer = setTimeout(() => {
           pending.delete(id);
-          resolve9(fallback);
+          resolve11(fallback);
         }, deps.timings.dialogMs);
         if (typeof timer.unref === "function") {
           timer.unref();
         }
         pending.set(id, {
-          settle: (value) => resolve9(value),
+          settle: (value) => resolve11(value),
           timer
         });
         emit(frame);
@@ -12016,6 +12464,9 @@ var DEFAULT_REDACTOR = createRedactor();
 // src/insight/replay.ts
 var TEXT_DECODER3 = new TextDecoder();
 
+// src/review-agent/reviewer.ts
+import { Type as Type8 } from "@sinclair/typebox";
+
 // src/console/overlays/approval-queue.ts
 var EMPTY_APPROVAL_QUEUE = { entries: [] };
 function approvalQueueReducer(state, event) {
@@ -12049,6 +12500,7 @@ import { jsx as jsx2 } from "indusagi/react-host/jsx-runtime";
 
 // src/console/auth-status.ts
 import { useEffect, useState } from "indusagi/react-host";
+import { getEnvApiKey as getEnvApiKey3 } from "indusagi/ai";
 function useAuthenticatedProviders(services, refreshKey) {
   const [authed, setAuthed] = useState(null);
   useEffect(() => {
@@ -12057,10 +12509,14 @@ function useAuthenticatedProviders(services, refreshKey) {
     void (async () => {
       const found = /* @__PURE__ */ new Set();
       try {
-        for (const provider of services.listLoginProviders()) {
+        const providers = /* @__PURE__ */ new Set([
+          ...services.listLoginProviders().map((provider) => provider.id),
+          ...services.conductor.availableModels().map((model) => model.provider)
+        ]);
+        for (const provider of providers) {
           try {
-            if ((await services.vault.listAccounts(provider.id)).length > 0) {
-              found.add(provider.id);
+            if (getEnvApiKey3(provider) || (await services.vault.listAccounts(provider)).length > 0) {
+              found.add(provider);
             }
           } catch {
           }
@@ -12078,15 +12534,12 @@ function useAuthenticatedProviders(services, refreshKey) {
     return () => {
       live3 = false;
     };
-  }, [refreshKey]);
+  }, [services, refreshKey]);
   return authed;
 }
 
 // src/console/overlays/boards.ts
 import chalk2 from "chalk";
-import { readFileSync as readFileSync10 } from "node:fs";
-import { homedir as homedir5 } from "node:os";
-import { join as join16 } from "node:path";
 import { useEffect as useEffect2, useMemo, useState as useState2 } from "indusagi/react-host";
 import { Box, Text, useInput } from "indusagi/react-host/ink";
 import {
@@ -12094,28 +12547,6 @@ import {
   wrapSelectionIndex
 } from "indusagi/react-ink";
 import { Fragment, jsx, jsxs } from "indusagi/react-host/jsx-runtime";
-function readServerTierInfo() {
-  let signedIn = false;
-  try {
-    const file = join16(homedir5(), ".indusagi", "agent", "server-token.json");
-    const token = JSON.parse(readFileSync10(file, "utf8"));
-    signedIn = typeof token.expires_at === "string" && new Date(token.expires_at).getTime() - Date.now() > 5 * 60 * 1e3;
-  } catch {
-    signedIn = false;
-  }
-  const localKeys = /* @__PURE__ */ new Set();
-  try {
-    const file = join16(homedir5(), ".indusagi", "agent", "auth.json");
-    const vault = JSON.parse(readFileSync10(file, "utf8"));
-    for (const [provider, entry] of Object.entries(vault)) {
-      if (entry !== null && typeof entry === "object" && Object.keys(entry).length > 0) {
-        localKeys.add(provider);
-      }
-    }
-  } catch {
-  }
-  return { signedIn, localKeys };
-}
 function truncate(text, width) {
   if (text.length <= width) return text;
   if (width <= 1) return text.slice(0, width);
@@ -12212,6 +12643,7 @@ function nextValue(values, current, direction) {
   return values[(at + direction + values.length) % values.length];
 }
 function SettingsBoard({ theme, items, onClose }) {
+  const [error, setError] = useState2();
   const [query, setQuery] = useState2("");
   const [selectedIndex, setSelectedIndex] = useState2(0);
   const filtered = useMemo(
@@ -12228,7 +12660,15 @@ function SettingsBoard({ theme, items, onClose }) {
     const item = filtered[selectedIndex];
     if (!item) return;
     const value = nextValue(item.values, item.value, direction);
-    if (value && value !== item.value) void item.onChange(value);
+    if (value && value !== item.value) {
+      setError(void 0);
+      const failed = (error2) => setError(error2 instanceof Error ? error2.message : String(error2));
+      try {
+        void Promise.resolve(item.onChange(value)).catch(failed);
+      } catch (error2) {
+        failed(error2);
+      }
+    }
   };
   useInput((input, key) => {
     if (key.escape) return onClose();
@@ -12243,7 +12683,7 @@ function SettingsBoard({ theme, items, onClose }) {
   const { start, budget, below } = windowAround(filtered.length, selectedIndex);
   const visible = filtered.slice(start, start + budget);
   const selected = filtered[selectedIndex];
-  const detail = selected ? `${selected.description}  \xB7  ${selected.values.join(" / ")}` : void 0;
+  const detail = error ?? (selected ? `${selected.description}  \xB7  ${selected.values.join(" / ")}` : void 0);
   const list = items.length === 0 ? jsx(Text, { children: theme.muted("No settings are available.") }) : filtered.length === 0 ? jsx(Text, { children: theme.muted("No settings matched the search.") }) : jsx(Box, {
     flexDirection: "column",
     children: visible.map((item, index) => {
@@ -12283,12 +12723,7 @@ function ModelBoard({ theme, models, onClose, onSelect, search }) {
   const [query, setQuery] = useState2(search ?? "");
   const [selectedIndex, setSelectedIndex] = useState2(0);
   useEffect2(() => setQuery(search ?? ""), [search]);
-  const serverTier = useMemo(readServerTierInfo, []);
-  const isServerTier = (provider) => serverTier.signedIn && isGatewayEligibleProvider(provider) && !serverTier.localKeys.has(provider);
-  const available = useMemo(
-    () => models.filter((model) => serverTier.localKeys.has(model.provider) || isServerTier(model.provider)),
-    [models, serverTier]
-  );
+  const available = models;
   const filtered = useMemo(() => available.filter((model) => modelMatches(model, query)), [available, query]);
   useEffect2(() => setSelectedIndex(0), [query]);
   useEffect2(() => {
@@ -12324,10 +12759,10 @@ function ModelBoard({ theme, models, onClose, onSelect, search }) {
             jsx(Box, { width: 2, children: jsx(Text, { children: isSelected ? theme.color("accent", "\u203A") : " " }) }),
             jsx(Text, { bold: isSelected, children: theme.color("text", model.id) }),
             model.name ? jsx(Text, { children: theme.dim(`  ${model.name}`) }) : null,
-            isServerTier(model.provider) ? jsx(Text, { children: theme.color("accent", "  \u2AE1 server") }) : null
+            jsx(Text, { children: theme.dim(`  ${model.provider}`) })
           ]
         },
-        model.id
+        `${model.provider}/${model.id}`
       );
     })
   });
@@ -12344,6 +12779,19 @@ function ModelBoard({ theme, models, onClose, onSelect, search }) {
 
 // src/console/overlays/pickers.ts
 var TOGGLE_VALUES = ["on", "off"];
+function saveSetting(settings, key, value) {
+  const previous = settings.get(key);
+  try {
+    settings.set(key, value);
+    settings.save();
+  } catch (error) {
+    settings.set(key, previous);
+    throw error;
+  }
+}
+function reportError(dispatch2, error) {
+  dispatch2({ type: "status:set", status: { kind: "error", text: error instanceof Error ? error.message : String(error) } });
+}
 function refToModel(ref) {
   return {
     id: ref.id,
@@ -12366,7 +12814,7 @@ function listModels(services) {
   }
 }
 function ModelPicker(props) {
-  const { services, theme, closeModal } = props;
+  const { services, theme, closeModal, dispatch: dispatch2 } = props;
   const authed = useAuthenticatedProviders(services);
   if (!services) return null;
   const all = listModels(services);
@@ -12377,7 +12825,8 @@ function ModelPicker(props) {
     onSelect: (model) => {
       try {
         services.conductor.selectModel(model.id);
-      } catch {
+      } catch (error) {
+        reportError(dispatch2, error);
       }
       closeModal();
     },
@@ -12398,8 +12847,7 @@ function ScopedModelPicker(props) {
   useEffect3(() => {
     if (!services || payload.intent !== "reset") return;
     try {
-      services.settings.set("enabledModels", []);
-      services.settings.save();
+      saveSetting(services.settings, "enabledModels", []);
       dispatch2({
         type: "status:set",
         status: { kind: "info", text: "Per-scope model overrides cleared." }
@@ -12429,9 +12877,9 @@ function ScopedModelPicker(props) {
       try {
         const all = models.map((model) => model.id);
         const next = ids.length === all.length ? [] : ids;
-        services.settings.set("enabledModels", next);
-        services.settings.save();
-      } catch {
+        saveSetting(services.settings, "enabledModels", next);
+      } catch (error) {
+        reportError(dispatch2, error);
       }
       closeModal();
     },
@@ -12458,11 +12906,11 @@ function ThemePicker(props) {
     themes: [...THEME_SCHEMES],
     onSelect: (name) => {
       if (isThemeScheme(name)) {
-        dispatch2({ type: "scheme:set", scheme: name });
         try {
-          services.settings.set("colourScheme", name);
-          services.settings.save();
-        } catch {
+          saveSetting(services.settings, "colourScheme", name);
+          dispatch2({ type: "scheme:set", scheme: name });
+        } catch (error) {
+          reportError(dispatch2, error);
         }
       }
       closeModal();
@@ -12484,9 +12932,8 @@ function SettingsPicker(props) {
     value: onOff(settings.get(key)),
     values: [...TOGGLE_VALUES],
     onChange: (value) => {
-      settings.set(key, value === "on");
-      settings.save();
-      live3?.();
+      saveSetting(settings, key, value === "on");
+      live3?.(value === "on");
       bump();
     }
   });
@@ -12498,8 +12945,7 @@ function SettingsPicker(props) {
     values: [...DELIVERY_MODES],
     onChange: (value) => {
       if (isDeliveryMode(value)) {
-        settings.set(key, value);
-        settings.save();
+        saveSetting(settings, key, value);
       }
       bump();
     }
@@ -12513,16 +12959,15 @@ function SettingsPicker(props) {
       value: settings.get("colourScheme"),
       values: [...THEME_SCHEMES],
       onChange: (value) => {
-        settings.set("colourScheme", value);
-        settings.save();
+        saveSetting(settings, "colourScheme", value);
         if (isThemeScheme(value)) dispatch2({ type: "scheme:set", scheme: value });
         bump();
       }
     });
-    items.push(toggleRow("show-images", "showImages", "Show images", "Render inline image content in the transcript.", () => dispatch2({ type: "toggle:images" })));
+    items.push(toggleRow("show-images", "showImages", "Show images", "Render inline image content in the transcript.", (value) => dispatch2({ type: "display:set", key: "showImages", value })));
     items.push(toggleRow("image-auto-resize", "imageAutoResize", "Auto-resize images", "Shrink oversized images to fit before handing them to a provider."));
     items.push(toggleRow("block-images", "blockImages", "Block images", "Withhold image content from providers entirely."));
-    items.push(toggleRow("show-reasoning", "showReasoning", "Show reasoning", "Stream the model's reasoning / thinking text as it arrives.", () => dispatch2({ type: "toggle:reasoning" })));
+    items.push(toggleRow("show-reasoning", "showReasoning", "Show reasoning", "Stream the model's reasoning / thinking text as it arrives.", (value) => dispatch2({ type: "display:set", key: "showReasoning", value })));
     items.push(toggleRow("skill-commands", "enableSkillCommands", "Skill commands", "Surface discovered skills as their own slash commands."));
     items.push(deliveryRow("steering-mode", "steeringMode", "Steering mode", "Whether queued steering corrections release one at a time or all at once."));
     items.push(deliveryRow("follow-up-mode", "followUpMode", "Follow-up mode", "Whether queued follow-up prompts release one at a time or all at once."));
@@ -12531,7 +12976,6 @@ function SettingsPicker(props) {
     items.push(toggleRow("quiet-startup", "quietStartup", "Quiet startup", "Suppress the banner and tips shown on a normal interactive launch."));
     items.push(toggleRow("logo-sweep", "logoSweep", "Logo sweep", "Tint the startup wordmark and emblem along a static colour gradient."));
     items.push(toggleRow("reduced-motion", "reducedMotion", "Reduced motion", "Suppress motion-flavoured flourishes such as the logo colour sweep."));
-    items.push(toggleRow("hardware-cursor", "showHardwareCursor", "Hardware cursor", "Reveal the terminal's own cursor instead of the software-drawn caret."));
     items.push({
       id: "editor-padding",
       label: "Editor padding",
@@ -12541,8 +12985,7 @@ function SettingsPicker(props) {
       onChange: (value) => {
         const parsed = Number.parseInt(value, 10);
         if (Number.isFinite(parsed)) {
-          settings.set("editorPaddingX", parsed);
-          settings.save();
+          saveSetting(settings, "editorPaddingX", parsed);
         }
         bump();
       }
@@ -12796,7 +13239,7 @@ function SignInDialog(props) {
 var SERVER_TIER_ACCOUNT_ID = "server-session";
 var SERVER_TIER_PROVIDER_ID2 = "indus-server";
 function SignOutDialog(props) {
-  const { services, closeModal } = props;
+  const { services, closeModal, dispatch: dispatch2 } = props;
   const [accounts, setAccounts] = useState5([]);
   useEffect5(() => {
     let live3 = true;
@@ -12848,7 +13291,10 @@ function SignOutDialog(props) {
         } else {
           await services.vault.remove(account.provider, account.accountId);
         }
-      } catch {
+        await services.refreshGatewayRouting();
+        dispatch2({ type: "status:set", status: { kind: "info", text: "Signed out. Model routing refreshed." } });
+      } catch (error) {
+        dispatch2({ type: "status:set", status: { kind: "error", text: error instanceof Error ? error.message : "Sign-out failed." } });
       }
       closeModal();
     }
@@ -12886,15 +13332,24 @@ function OAuthFlowDialog(props) {
   })();
   const [state, setState] = useState5(() => seedOAuthState(providerId, providerName, mode));
   const pending = useRef(null);
+  const cancelPrompt = useRef(null);
+  const mounted = useRef(true);
+  const saving = useRef(false);
+  useEffect5(() => () => {
+    mounted.current = false;
+  }, []);
   const merge = (next) => setState((prev) => ({ ...prev, ...next }));
   useEffect5(() => {
     if (mode !== "oauth") return;
     let live3 = true;
+    const controller = new AbortController();
     const safeMerge = (next) => {
       if (live3) merge(next);
     };
     const callbacks = {
+      signal: controller.signal,
       onAuth: (info2) => {
+        if (!live3) return;
         safeMerge({ authInfo: info2, progress: "Opening your browser to sign in\u2026" });
         void services.openLoginUrl(info2.url).then((opened) => {
           safeMerge({
@@ -12902,12 +13357,28 @@ function OAuthFlowDialog(props) {
           });
         });
       },
-      onPrompt: (prompt) => new Promise((resolve9) => {
-        pending.current = resolve9;
+      onPrompt: (prompt) => new Promise((resolve11, reject) => {
+        if (!live3) {
+          reject(new DOMException("Sign-in cancelled", "AbortError"));
+          return;
+        }
+        cancelPrompt.current = () => reject(new DOMException("Sign-in cancelled", "AbortError"));
+        pending.current = (value) => {
+          cancelPrompt.current = null;
+          resolve11(value);
+        };
         safeMerge({ prompt, inputLabel: prompt.message, inputValue: "" });
       }),
-      onManualCodeInput: () => new Promise((resolve9) => {
-        pending.current = resolve9;
+      onManualCodeInput: () => new Promise((resolve11, reject) => {
+        if (!live3) {
+          reject(new DOMException("Sign-in cancelled", "AbortError"));
+          return;
+        }
+        cancelPrompt.current = () => reject(new DOMException("Sign-in cancelled", "AbortError"));
+        pending.current = (value) => {
+          cancelPrompt.current = null;
+          resolve11(value);
+        };
         safeMerge({
           prompt: { message: "Paste the authorization code or complete redirect URL:" },
           inputLabel: "Authorization code or redirect URL",
@@ -12921,7 +13392,9 @@ function OAuthFlowDialog(props) {
     void (async () => {
       try {
         await services.startOAuthLogin(providerId, callbacks, services.vault);
+        if (!live3) return;
         await services.refreshGatewayRouting();
+        if (!live3) return;
         selectProviderModel(services, providerId);
         if (live3) {
           dispatch2({
@@ -12936,15 +13409,23 @@ function OAuthFlowDialog(props) {
     })();
     return () => {
       live3 = false;
+      controller.abort();
+      cancelPrompt.current?.();
+      cancelPrompt.current = null;
+      pending.current = null;
     };
   }, []);
   const saveApiKey = () => {
     const key = state.inputValue.trim();
-    if (key.length === 0) return;
+    if (key.length === 0 || saving.current) return;
+    saving.current = true;
     const account = state.accountId ?? "default";
     void (async () => {
       try {
         await services.vault.putApiKey(providerId, account, key, true);
+        if (!mounted.current) return;
+        await services.refreshGatewayRouting();
+        if (!mounted.current) return;
         selectProviderModel(services, providerId);
         dispatch2({
           type: "status:set",
@@ -12967,12 +13448,12 @@ function OAuthFlowDialog(props) {
         saveApiKey();
         return;
       }
-      const resolve9 = pending.current;
-      if (resolve9 === null) return;
+      const resolve11 = pending.current;
+      if (resolve11 === null) return;
       pending.current = null;
       const value = state.inputValue;
       merge({ inputValue: "", prompt: void 0 });
-      resolve9(value);
+      resolve11(value);
     },
     onClose: closeModal
   });
@@ -13127,12 +13608,12 @@ function summarizeInput(input) {
 }
 function ApprovalDialog(props) {
   const { payload, closeModal } = props;
-  const { request, resolve: resolve9 } = payload;
+  const { request, resolve: resolve11 } = payload;
   let settled = false;
   const settle = (choice) => {
     if (settled) return;
     settled = true;
-    resolve9(choice);
+    resolve11(choice);
     closeModal();
   };
   const args = summarizeInput(request.input);
@@ -13169,8 +13650,18 @@ function ApprovalOverlays(props) {
 }
 
 // src/console/overlays/host.ts
+import { Box as Box4, Text as Text4, useInput as useInput3 } from "indusagi/react-host/ink";
+function UnavailableOverlay({ closeModal }) {
+  useInput3((_input, key) => {
+    if (key.escape || key.return) closeModal();
+  });
+  return jsx6(Box4, { children: jsx6(Text4, { children: "This dialog is unavailable in this host. Esc / Enter to return." }) });
+}
 function OverlayHost(props) {
   if (props.modal.kind === "none") return null;
+  if (!props.services && props.modal.kind !== "approval" && props.modal.kind !== "plugin") {
+    return jsx6(UnavailableOverlay, { closeModal: props.closeModal });
+  }
   const forwarded = {
     modal: props.modal,
     services: props.services,
@@ -13189,31 +13680,31 @@ function OverlayHost(props) {
 }
 
 // src/console/startup.ts
-import { existsSync as existsSync4, readFileSync as readFileSync11 } from "node:fs";
-import { join as join17 } from "node:path";
+import { existsSync as existsSync3, readFileSync as readFileSync11 } from "node:fs";
+import { join as join16 } from "node:path";
 var PROFILE_DIR = ".indusagi";
 var CONTEXT_FILES = ["AGENTS.md", "CLAUDE.md"];
 function skillRoots(cwd, home) {
   return [
-    { dir: join17(cwd, PROFILE_DIR, "skills"), origin: "project" },
-    { dir: join17(home, PROFILE_DIR, "skills"), origin: "user" }
+    { dir: join16(cwd, PROFILE_DIR, "skills"), origin: "project" },
+    { dir: join16(home, PROFILE_DIR, "skills"), origin: "user" }
   ];
 }
 function macroRoots(cwd, home) {
   return [
-    { dir: join17(cwd, PROFILE_DIR, "commands"), origin: "project", label: "project" },
-    { dir: join17(home, PROFILE_DIR, "commands"), origin: "user", label: "user" }
+    { dir: join16(cwd, PROFILE_DIR, "commands"), origin: "project", label: "project" },
+    { dir: join16(home, PROFILE_DIR, "commands"), origin: "user", label: "user" }
   ];
 }
-function shortenPath2(path4, cwd, home) {
-  if (cwd.length > 0 && path4.startsWith(cwd)) {
-    const rest = path4.slice(cwd.length).replace(/^[/\\]+/, "");
+function shortenPath2(path5, cwd, home) {
+  if (cwd.length > 0 && path5.startsWith(cwd)) {
+    const rest = path5.slice(cwd.length).replace(/^[/\\]+/, "");
     return rest.length > 0 ? `./${rest}` : ".";
   }
-  if (home.length > 0 && path4.startsWith(home)) {
-    return `~${path4.slice(home.length)}`;
+  if (home.length > 0 && path5.startsWith(home)) {
+    return `~${path5.slice(home.length)}`;
   }
-  return path4;
+  return path5;
 }
 var MAX_SECTION_LINES = 6;
 function capLines(lines) {
@@ -13232,10 +13723,10 @@ function gatherContext(cwd, home) {
   for (const root of [cwd, home]) {
     if (root.length === 0) continue;
     for (const name of CONTEXT_FILES) {
-      const path4 = join17(root, name);
-      if (seen.has(path4)) continue;
-      seen.add(path4);
-      if (existsSync4(path4)) out2.push(shortenPath2(path4, cwd, home));
+      const path5 = join16(root, name);
+      if (seen.has(path5)) continue;
+      seen.add(path5);
+      if (existsSync3(path5)) out2.push(shortenPath2(path5, cwd, home));
     }
   }
   return out2;
@@ -13299,12 +13790,12 @@ function mascotRows(face) {
   ];
 }
 var TIPS = [
-  "Run /init to create a CLAUDE.md file with instructions for IndusCode",
+  "Run /help to explore commands and configured skill helpers",
   'Ask in plain English \u2014 try "fix the failing tests" or "explain src/agent.ts"',
-  "Shift+Tab cycles permission modes: auto \u2192 plan \u2192 accept-edits",
+  "Shift+Tab cycles: default \u2192 accept-edits \u2192 plan \u2192 bypass",
   "Type @ to attach a file, or paste an image straight into the prompt",
   "Run /status to check your model, account, and connectivity",
-  "Use /skills to discover specialized helpers for the task at hand"
+  "Use /help to discover specialized commands for the task at hand"
 ];
 var WHATS_NEW = [
   "Ctrl+X runs your newest queued message NOW \u2014 the current run stops cleanly",
@@ -13324,148 +13815,21 @@ function pickWelcomeVariant(seed) {
 var PINNED_WELCOME_SEED = 12;
 
 // src/console/components/AgentsView.ts
-import { useState as useState6 } from "indusagi/react-host";
-import { Box as Box4, Text as Text4, useInput as useInput3 } from "indusagi/react-host/ink";
+import { useState as useState7 } from "indusagi/react-host";
+import { Box as Box6, Text as Text6, useInput as useInput4 } from "indusagi/react-host/ink";
 import { wrapSelectionIndex as wrapSelectionIndex2 } from "indusagi/react-ink";
+import { jsx as jsx8, jsxs as jsxs5 } from "indusagi/react-host/jsx-runtime";
+
+// src/console/components/BackgroundAgents.ts
+import { Box as Box5, Text as Text5 } from "indusagi/react-host/ink";
+import { useEffect as useEffect6, useState as useState6 } from "indusagi/react-host";
+import { splitAssistantMessage } from "indusagi/react-ink";
 import { jsx as jsx7, jsxs as jsxs4 } from "indusagi/react-host/jsx-runtime";
-function formatTokens2(tokens) {
-  return tokens >= 1e3 ? `${(tokens / 1e3).toFixed(1)}k` : String(tokens);
-}
-function clampLine(text, width) {
-  const flat = text.replace(/\s+/g, " ").trim();
-  if (flat.length <= width) return flat;
-  if (width <= 1) return flat.slice(0, width);
-  return `${flat.slice(0, width - 1)}\u2026`;
-}
-function runStatusLine(run, now, tokens) {
-  let head;
-  if (run.status === "error") head = "failed";
-  else if (run.status === "done") head = "done";
-  else if (run.startedAt > 0 && now >= run.startedAt) {
-    head = `${Math.max(0, Math.round((now - run.startedAt) / 1e3))}s`;
-  } else head = "working";
-  const tok = tokens !== void 0 && tokens > 0 ? `  \xB7  \u2193 ${formatTokens2(tokens)} tokens` : "";
-  return `${head}${tok}`;
-}
-var NAME_WIDTH = 12;
-function ActivityRow({ theme, line }) {
-  if (line.tone === "tool") {
-    return jsxs4(Box4, {
-      children: [
-        jsx7(Text4, { children: theme.color("success", "\u25CF ") }),
-        jsx7(Text4, { children: theme.color("text", clampLine(line.text, 96)) })
-      ]
-    });
-  }
-  if (line.tone === "result") {
-    return jsx7(Box4, { marginLeft: 2, children: jsx7(Text4, { children: theme.dim(`\u2514 ${clampLine(line.text, 92)}`) }) });
-  }
-  return jsxs4(Box4, {
-    children: [
-      jsx7(Text4, { children: theme.color("accent", "\u25CF ") }),
-      jsx7(Text4, { children: theme.color("text", clampLine(line.text, 96)) })
-    ]
-  });
-}
-function AgentsView({ theme, runs, activity, tokens, now, onExit }) {
-  const clock = now ?? Date.now();
-  const [selectedIndex, setSelectedIndex] = useState6(runs.length > 0 ? 1 : 0);
-  const rowCount = runs.length + 1;
-  const index = Math.min(selectedIndex, rowCount - 1);
-  const viewed = index > 0 ? runs[index - 1] : void 0;
-  useInput3((input, key) => {
-    if (key.escape || input === "x") return onExit();
-    if (key.upArrow) return setSelectedIndex((i) => wrapSelectionIndex2(Math.min(i, rowCount - 1), -1, rowCount));
-    if (key.downArrow) return setSelectedIndex((i) => wrapSelectionIndex2(Math.min(i, rowCount - 1), 1, rowCount));
-    if (key.return && index === 0) onExit();
-  });
-  const lines = viewed ? activity[viewed.id] ?? [] : [];
-  return jsxs4(Box4, {
-    flexDirection: "column",
-    marginTop: 1,
-    children: [
-      viewed ? jsxs4(Box4, {
-        flexDirection: "column",
-        children: [
-          jsxs4(Box4, {
-            marginBottom: 1,
-            children: [
-              jsx7(Text4, { children: theme.color("accent", "\u2736 ") }),
-              jsx7(Text4, { bold: true, children: theme.color("accent", viewed.name) }),
-              jsx7(Text4, { children: theme.dim(`  ${runStatusLine(viewed, clock, tokens[viewed.id])}`) })
-            ]
-          }),
-          lines.length === 0 ? jsx7(Text4, { children: theme.muted("  Waiting for the first step\u2026") }) : lines.map((line, i) => jsx7(ActivityRow, { theme, line }, i)),
-          jsx7(Box4, {
-            marginTop: 1,
-            children: jsx7(Text4, { wrap: "truncate", children: theme.muted(`\u2514 ${clampLine(viewed.objective, 100)}`) })
-          })
-        ]
-      }) : jsxs4(Box4, {
-        children: [
-          jsx7(Text4, { children: theme.muted("Select a sub-agent to view its live activity, or press Enter on ") }),
-          jsx7(Text4, { bold: true, children: theme.color("text", "main") }),
-          jsx7(Text4, { children: theme.muted(" to return.") })
-        ]
-      }),
-      jsxs4(Box4, {
-        flexDirection: "column",
-        marginTop: 1,
-        borderStyle: "single",
-        borderColor: theme.colors["borderMuted"],
-        borderBottom: false,
-        borderLeft: false,
-        borderRight: false,
-        paddingTop: 0,
-        children: [
-          jsxs4(Box4, {
-            children: [
-              jsx7(Text4, { children: index === 0 ? theme.color("accent", "\u203A ") : "  " }),
-              jsx7(Text4, { children: index === 0 ? theme.color("text", "\u25CF ") : theme.dim("\u25CB ") }),
-              jsx7(Text4, { bold: index === 0, children: theme.color("text", "main") })
-            ]
-          }),
-          runs.map((run, i) => {
-            const selected = index === i + 1;
-            const dot = run.status === "running" ? theme.color("accent", "\u25D0") : run.status === "error" ? theme.color("error", "\u25CF") : theme.color("success", "\u25CF");
-            return jsxs4(
-              Box4,
-              {
-                children: [
-                  jsx7(Text4, { children: selected ? theme.color("accent", "\u203A ") : "  " }),
-                  jsx7(Box4, { width: 2, flexShrink: 0, children: jsx7(Text4, { children: dot }) }),
-                  jsx7(Box4, {
-                    width: NAME_WIDTH,
-                    flexShrink: 0,
-                    children: jsx7(Text4, { bold: selected, children: theme.color("accent", clampLine(run.name, NAME_WIDTH - 1)) })
-                  }),
-                  jsx7(Box4, {
-                    flexGrow: 1,
-                    flexShrink: 1,
-                    children: jsx7(Text4, { wrap: "truncate", children: theme.muted(clampLine(run.objective, 56)) })
-                  }),
-                  jsx7(Text4, { children: theme.dim(`  ${runStatusLine(run, clock, tokens[run.id])}`) })
-                ]
-              },
-              run.id
-            );
-          })
-        ]
-      }),
-      jsx7(Box4, { marginTop: 1, children: jsx7(Text4, { children: theme.dim("\u2191/\u2193 select  \xB7  Enter to view  \xB7  Enter on main / Esc to return") }) })
-    ]
-  });
-}
-
-// src/console/components/BackgroundAgents.ts
-import { Box as Box5, Text as Text5 } from "indusagi/react-host/ink";
-import { splitAssistantMessage } from "indusagi/react-ink";
-import { jsx as jsx8, jsxs as jsxs5 } from "indusagi/react-host/jsx-runtime";
-function readString2(args, key) {
-  const value = args[key];
-  if (typeof value !== "string") return void 0;
-  const trimmed = value.trim();
-  return trimmed.length > 0 ? trimmed : void 0;
+function readString2(args, key) {
+  const value = args[key];
+  if (typeof value !== "string") return void 0;
+  const trimmed = value.trim();
+  return trimmed.length > 0 ? trimmed : void 0;
 }
 function deriveAgentRuns(messages) {
   const runs = [];
@@ -13496,7 +13860,7 @@ function deriveAgentRuns(messages) {
   return runs.map((run) => ({ ...run, status: status.get(run.id) ?? run.status }));
 }
 var MAX_VISIBLE_RUNS = 8;
-var NAME_WIDTH2 = 12;
+var NAME_WIDTH = 12;
 function clamp2(text, width) {
   if (text.length <= width) return text;
   if (width <= 1) return text.slice(0, width);
@@ -13506,7 +13870,7 @@ var OBJECTIVE_WIDTH = 64;
 function oneLine(text) {
   return text.replace(/\s+/g, " ").trim();
 }
-function formatTokens3(tokens) {
+function formatTokens2(tokens) {
   if (tokens >= 1e3) return `${(tokens / 1e3).toFixed(1)}k`;
   return String(tokens);
 }
@@ -13518,65 +13882,206 @@ function statusText(run, now, tokens) {
     head = `${Math.max(0, Math.round((now - run.startedAt) / 1e3))}s`;
   } else head = "running";
   if (tokens !== void 0 && tokens > 0) {
-    return `${head}  \xB7  \u2193 ${formatTokens3(tokens)} tokens`;
+    return `${head}  \xB7  \u2193 ${formatTokens2(tokens)} tokens`;
   }
   return head;
 }
+function useAgentClock(active, supplied) {
+  const [now, setNow] = useState6(Date.now);
+  useEffect6(() => {
+    if (!active || supplied !== void 0) return;
+    const timer = setInterval(() => setNow(Date.now()), 1e3);
+    return () => clearInterval(timer);
+  }, [active, supplied]);
+  return supplied ?? now;
+}
 function BackgroundAgents({ theme, runs, tokens, now }) {
-  const clock = now ?? Date.now();
+  const clock = useAgentClock(runs.some((run) => run.status === "running"), now);
   const runningCount = runs.reduce((n, run) => run.status === "running" ? n + 1 : n, 0);
   if (runningCount === 0) return null;
-  const visible = runs.slice(-MAX_VISIBLE_RUNS);
-  return jsxs5(Box5, {
+  const running = runs.filter((run) => run.status === "running");
+  const recentDone = runs.filter((run) => run.status !== "running").slice(-Math.max(0, MAX_VISIBLE_RUNS - running.length));
+  const visible = [...running, ...recentDone].slice(0, MAX_VISIBLE_RUNS);
+  return jsxs4(Box5, {
     flexDirection: "column",
     marginTop: 1,
     children: [
-      jsxs5(Box5, {
+      jsxs4(Box5, {
         children: [
-          jsx8(Text5, { children: theme.color("text", "\u25CF ") }),
-          jsx8(Text5, { bold: true, children: theme.color("text", "main") })
+          jsx7(Text5, { children: theme.color("text", "\u25CF ") }),
+          jsx7(Text5, { bold: true, children: theme.color("text", "main") })
         ]
       }),
       visible.map((run) => {
         const dot = run.status === "running" ? theme.color("accent", "\u25D0") : run.status === "error" ? theme.color("error", "\u25CF") : theme.color("success", "\u25CF");
-        return jsxs5(
+        return jsxs4(
           Box5,
           {
             children: [
-              jsx8(Box5, { width: 2, flexShrink: 0, children: jsx8(Text5, { children: dot }) }),
-              jsx8(Box5, {
-                width: NAME_WIDTH2,
+              jsx7(Box5, { width: 2, flexShrink: 0, children: jsx7(Text5, { children: dot }) }),
+              jsx7(Box5, {
+                width: NAME_WIDTH,
                 flexShrink: 0,
-                children: jsx8(Text5, { bold: true, children: theme.color("accent", clamp2(run.name, NAME_WIDTH2 - 1)) })
+                children: jsx7(Text5, { bold: true, children: theme.color("accent", clamp2(run.name, NAME_WIDTH - 1)) })
               }),
-              jsx8(Box5, {
+              jsx7(Box5, {
                 flexGrow: 1,
                 flexShrink: 1,
-                children: jsx8(Text5, { wrap: "truncate", children: theme.muted(clamp2(oneLine(run.objective), OBJECTIVE_WIDTH)) })
+                children: jsx7(Text5, { wrap: "truncate", children: theme.muted(clamp2(oneLine(run.objective), OBJECTIVE_WIDTH)) })
               }),
-              jsx8(Text5, { children: theme.dim(`  ${statusText(run, clock, tokens?.[run.id])}`) })
+              jsx7(Text5, { children: theme.dim(`  ${statusText(run, clock, tokens?.[run.id])}`) })
             ]
           },
           run.id
         );
       }),
-      jsxs5(Box5, {
+      jsxs4(Box5, {
         marginTop: 1,
         children: [
-          jsx8(Text5, { children: theme.color("accent", "\u2736 ") }),
-          jsx8(Text5, { children: theme.muted(`Waiting for ${runningCount} background agent${runningCount === 1 ? "" : "s"} to finish`) })
+          jsx7(Text5, { children: theme.color("accent", "\u2736 ") }),
+          jsx7(Text5, { children: theme.muted(`Waiting for ${runningCount} background agent${runningCount === 1 ? "" : "s"} to finish`) })
         ]
       })
     ]
   });
 }
 
+// src/console/components/AgentsView.ts
+function formatTokens3(tokens) {
+  return tokens >= 1e3 ? `${(tokens / 1e3).toFixed(1)}k` : String(tokens);
+}
+function clampLine(text, width) {
+  const flat = text.replace(/\s+/g, " ").trim();
+  if (flat.length <= width) return flat;
+  if (width <= 1) return flat.slice(0, width);
+  return `${flat.slice(0, width - 1)}\u2026`;
+}
+function runStatusLine(run, now, tokens) {
+  let head;
+  if (run.status === "error") head = "failed";
+  else if (run.status === "done") head = "done";
+  else if (run.startedAt > 0 && now >= run.startedAt) {
+    head = `${Math.max(0, Math.round((now - run.startedAt) / 1e3))}s`;
+  } else head = "working";
+  const tok = tokens !== void 0 && tokens > 0 ? `  \xB7  \u2193 ${formatTokens3(tokens)} tokens` : "";
+  return `${head}${tok}`;
+}
+var NAME_WIDTH2 = 12;
+function ActivityRow({ theme, line }) {
+  if (line.tone === "tool") {
+    return jsxs5(Box6, {
+      children: [
+        jsx8(Text6, { children: theme.color("success", "\u25CF ") }),
+        jsx8(Text6, { children: theme.color("text", clampLine(line.text, 96)) })
+      ]
+    });
+  }
+  if (line.tone === "result") {
+    return jsx8(Box6, { marginLeft: 2, children: jsx8(Text6, { children: theme.dim(`\u2514 ${clampLine(line.text, 92)}`) }) });
+  }
+  return jsxs5(Box6, {
+    children: [
+      jsx8(Text6, { children: theme.color("accent", "\u25CF ") }),
+      jsx8(Text6, { children: theme.color("text", clampLine(line.text, 96)) })
+    ]
+  });
+}
+function AgentsView({ theme, runs, activity, tokens, now, onExit }) {
+  const clock = useAgentClock(runs.some((run) => run.status === "running"), now);
+  const [selectedIndex, setSelectedIndex] = useState7(runs.length > 0 ? 1 : 0);
+  const rowCount = runs.length + 1;
+  const index = Math.min(selectedIndex, rowCount - 1);
+  const viewed = index > 0 ? runs[index - 1] : void 0;
+  useInput4((input, key) => {
+    if (key.escape || input === "x") return onExit();
+    if (key.upArrow) return setSelectedIndex((i) => wrapSelectionIndex2(Math.min(i, rowCount - 1), -1, rowCount));
+    if (key.downArrow) return setSelectedIndex((i) => wrapSelectionIndex2(Math.min(i, rowCount - 1), 1, rowCount));
+    if (key.return && index === 0) onExit();
+  });
+  const lines = viewed ? activity[viewed.id] ?? [] : [];
+  return jsxs5(Box6, {
+    flexDirection: "column",
+    marginTop: 1,
+    children: [
+      viewed ? jsxs5(Box6, {
+        flexDirection: "column",
+        children: [
+          jsxs5(Box6, {
+            marginBottom: 1,
+            children: [
+              jsx8(Text6, { children: theme.color("accent", "\u2736 ") }),
+              jsx8(Text6, { bold: true, children: theme.color("accent", viewed.name) }),
+              jsx8(Text6, { children: theme.dim(`  ${runStatusLine(viewed, clock, tokens[viewed.id])}`) })
+            ]
+          }),
+          lines.length === 0 ? jsx8(Text6, { children: theme.muted("  Waiting for the first step\u2026") }) : lines.map((line, i) => jsx8(ActivityRow, { theme, line }, i)),
+          jsx8(Box6, {
+            marginTop: 1,
+            children: jsx8(Text6, { wrap: "truncate", children: theme.muted(`\u2514 ${clampLine(viewed.objective, 100)}`) })
+          })
+        ]
+      }) : jsxs5(Box6, {
+        children: [
+          jsx8(Text6, { children: theme.muted("Select a sub-agent to view its live activity, or press Enter on ") }),
+          jsx8(Text6, { bold: true, children: theme.color("text", "main") }),
+          jsx8(Text6, { children: theme.muted(" to return.") })
+        ]
+      }),
+      jsxs5(Box6, {
+        flexDirection: "column",
+        marginTop: 1,
+        borderStyle: "single",
+        borderColor: theme.colors["borderMuted"],
+        borderBottom: false,
+        borderLeft: false,
+        borderRight: false,
+        paddingTop: 0,
+        children: [
+          jsxs5(Box6, {
+            children: [
+              jsx8(Text6, { children: index === 0 ? theme.color("accent", "\u203A ") : "  " }),
+              jsx8(Text6, { children: index === 0 ? theme.color("text", "\u25CF ") : theme.dim("\u25CB ") }),
+              jsx8(Text6, { bold: index === 0, children: theme.color("text", "main") })
+            ]
+          }),
+          runs.map((run, i) => {
+            const selected = index === i + 1;
+            const dot = run.status === "running" ? theme.color("accent", "\u25D0") : run.status === "error" ? theme.color("error", "\u25CF") : theme.color("success", "\u25CF");
+            return jsxs5(
+              Box6,
+              {
+                children: [
+                  jsx8(Text6, { children: selected ? theme.color("accent", "\u203A ") : "  " }),
+                  jsx8(Box6, { width: 2, flexShrink: 0, children: jsx8(Text6, { children: dot }) }),
+                  jsx8(Box6, {
+                    width: NAME_WIDTH2,
+                    flexShrink: 0,
+                    children: jsx8(Text6, { bold: selected, children: theme.color("accent", clampLine(run.name, NAME_WIDTH2 - 1)) })
+                  }),
+                  jsx8(Box6, {
+                    flexGrow: 1,
+                    flexShrink: 1,
+                    children: jsx8(Text6, { wrap: "truncate", children: theme.muted(clampLine(run.objective, 56)) })
+                  }),
+                  jsx8(Text6, { children: theme.dim(`  ${runStatusLine(run, clock, tokens[run.id])}`) })
+                ]
+              },
+              run.id
+            );
+          })
+        ]
+      }),
+      jsx8(Box6, { marginTop: 1, children: jsx8(Text6, { children: theme.dim("\u2191/\u2193 select  \xB7  Enter to view  \xB7  Enter on main / Esc to return") }) })
+    ]
+  });
+}
+
 // src/console/components/Banner.ts
-import { Fragment as Fragment3, jsx as jsx9, jsxs as jsxs6 } from "indusagi/react-host/jsx-runtime";
-import { Box as Box6, Text as Text6 } from "indusagi/react-host/ink";
+import { Fragment as Fragment3, jsx as jsx10, jsxs as jsxs6 } from "indusagi/react-host/jsx-runtime";
+import { Box as Box8, Text as Text7 } from "indusagi/react-host/ink";
 import { ChangelogBlock } from "indusagi/react-ink";
-import { homedir as homedir6 } from "node:os";
-import { basename as basename6 } from "node:path";
+import { homedir as homedir5 } from "node:os";
+import { basename as basename7 } from "node:path";
 
 // src/console/components/banner-sweep.ts
 var WELCOME_FALLBACK = "Welcome back!";
@@ -13587,6 +14092,70 @@ function welcomeLine(name) {
   if (trimmed.length === 0 || trimmed.length > MAX_NAME) return WELCOME_FALLBACK;
   return `Welcome back, ${trimmed}!`;
 }
+function rowGradient(rowIndex, rowCount, primaryHex, secondaryHex) {
+  if (rowCount <= 1) return primaryHex;
+  const t = Math.max(0, Math.min(1, rowIndex / (rowCount - 1)));
+  const a = Number.parseInt(primaryHex.replace("#", ""), 16);
+  const b = Number.parseInt(secondaryHex.replace("#", ""), 16);
+  const channel = (shift) => Math.round((a >> shift & 255) * (1 - t) + (b >> shift & 255) * t).toString(16).padStart(2, "0");
+  return `#${channel(16)}${channel(8)}${channel(0)}`;
+}
+
+// src/console/components/Banner.ts
+import chalk3 from "chalk";
+
+// src/console/components/ScrollViewport.ts
+import React2, { useEffect as useEffect7, useState as useState8 } from "indusagi/react-host";
+import { Box as Box7, useInput as useInput5 } from "indusagi/react-host/ink";
+import { measureElement, useStdout } from "ink";
+import { jsx as jsx9 } from "indusagi/react-host/jsx-runtime";
+function useTerminalSize() {
+  const { stdout } = useStdout();
+  const read = () => ({ columns: Math.max(1, stdout.columns || 80), rows: Math.max(1, stdout.rows || 24) });
+  const [size, setSize] = useState8(read);
+  useEffect7(() => {
+    const resize = () => setSize(read());
+    stdout.on("resize", resize);
+    return () => {
+      stdout.off("resize", resize);
+    };
+  }, [stdout]);
+  return size;
+}
+function ScrollViewport({ children, active = true, follow = true }) {
+  const outer = React2.useRef(null);
+  const inner = React2.useRef(null);
+  const [metrics, setMetrics] = useState8({ height: 1, content: 1 });
+  const [offset, setOffset] = useState8(0);
+  useEffect7(() => {
+    if (!outer.current || !inner.current) return;
+    const height = measureElement(outer.current).height;
+    const content = measureElement(inner.current).height;
+    if (metrics.height !== height || metrics.content !== content) {
+      const oldMax = Math.max(0, metrics.content - metrics.height);
+      const newMax = Math.max(0, content - height);
+      if (follow) setOffset((n) => n === 0 ? 0 : Math.max(0, Math.min(newMax, n + newMax - oldMax)));
+      setMetrics({ height, content });
+    }
+  });
+  const max = Math.max(0, metrics.content - metrics.height);
+  const scroll = Math.min(max, offset);
+  useInput5((_input, key) => {
+    const step = Math.max(1, metrics.height - 2);
+    if (key.pageUp) setOffset((n) => Math.min(max, n + (follow ? step : -step)));
+    if (key.pageDown) setOffset((n) => Math.max(0, Math.min(max, n + (follow ? -step : step))));
+  }, { isActive: active });
+  const top = follow ? Math.max(0, max - scroll) : Math.max(0, scroll);
+  return jsx9(Box7, {
+    ref: outer,
+    flexDirection: "column",
+    flexGrow: 1,
+    flexBasis: 0,
+    minHeight: 1,
+    overflow: "hidden",
+    children: jsx9(Box7, { ref: inner, flexDirection: "column", flexShrink: 0, marginTop: -top, children })
+  });
+}
 
 // src/console/components/Banner.ts
 var BRAND2 = "IndusCode";
@@ -13599,12 +14168,16 @@ var WORDMARK_ROWS = [
   "\u2588\u2588\u2551\u2588\u2588\u2551 \u255A\u2588\u2588\u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551    \u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2551",
   "\u255A\u2550\u255D\u255A\u2550\u255D  \u255A\u2550\u2550\u2550\u255D\u255A\u2550\u2550\u2550\u2550\u2550\u255D  \u255A\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D     \u255A\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D"
 ];
+function StartupSummary({ theme, startup }) {
+  if (!startup?.sections.length) return null;
+  return jsx10(Text7, { wrap: "truncate-end", children: theme.muted(startup.sections.map((section2) => `${section2.title}: ${section2.count}`).join(" \xB7 ")) });
+}
 function StartupNotices({ theme, notices }) {
   if (notices.length === 0) return null;
-  return jsx9(Box6, {
+  return jsx10(Box8, {
     flexDirection: "column",
     marginBottom: 1,
-    children: notices.map((notice, index) => jsx9(Text6, { children: paintNotice(theme, notice) }, index))
+    children: notices.map((notice, index) => jsx10(Text7, { children: paintNotice(theme, notice) }, index))
   });
 }
 function paintNotice(theme, notice) {
@@ -13620,15 +14193,15 @@ function paintNotice(theme, notice) {
 }
 function StartupChangelogBlock({ theme, changelog }) {
   if (changelog.mode === "full" && changelog.markdown !== void 0) {
-    return jsx9(ChangelogBlock, { markdown: changelog.markdown, theme, title: "What is new" });
+    return jsx10(ChangelogBlock, { markdown: changelog.markdown, theme, title: "What is new" });
   }
   if (changelog.mode === "condensed") {
-    return jsxs6(Box6, {
+    return jsxs6(Box8, {
       marginTop: 1,
       children: [
-        jsx9(Text6, { children: theme.muted(`Updated to v${changelog.version}. Use `) }),
-        jsx9(Text6, { children: theme.color("accent", "/changelog") }),
-        jsx9(Text6, { children: theme.muted(" to view the full changelog.") })
+        jsx10(Text7, { children: theme.muted(`Updated to v${changelog.version}. Use `) }),
+        jsx10(Text7, { children: theme.color("accent", "/changelog") }),
+        jsx10(Text7, { children: theme.muted(" to view the full changelog.") })
       ]
     });
   }
@@ -13638,46 +14211,46 @@ function WelcomeLine({ theme, name, tone = "accent" }) {
   const paint = (text) => tone === "muted" ? theme.muted(text) : theme.color("accent", text);
   const line = welcomeLine(name);
   if (name !== void 0 && line !== "Welcome back!") {
-    return jsxs6(Box6, {
+    return jsxs6(Box8, {
       children: [
-        jsx9(Text6, { children: paint("Welcome back, ") }),
-        jsx9(Text6, { bold: true, children: name.trim() }),
-        jsx9(Text6, { children: paint("!") })
+        jsx10(Text7, { children: paint("Welcome back, ") }),
+        jsx10(Text7, { bold: true, children: name.trim() }),
+        jsx10(Text7, { children: paint("!") })
       ]
     });
   }
-  return jsx9(Box6, { children: jsx9(Text6, { children: paint(line) }) });
+  return jsx10(Box8, { children: jsx10(Text7, { children: paint(line) }) });
 }
 function ShellLine({ theme, workspace, branch }) {
-  const dir = basename6(workspace);
-  return jsxs6(Box6, {
+  const dir = basename7(workspace);
+  return jsxs6(Box8, {
     children: [
-      jsx9(Text6, { children: theme.color("customMessage", "\u279C") }),
-      jsx9(Text6, { children: "  " }),
-      jsx9(Text6, { bold: true, children: theme.color("text", dir) }),
+      jsx10(Text7, { children: theme.color("customMessage", "\u279C") }),
+      jsx10(Text7, { children: "  " }),
+      jsx10(Text7, { bold: true, children: theme.color("text", dir) }),
       branch !== void 0 && branch !== null && branch.length > 0 ? jsxs6(Fragment3, {
         children: [
-          jsx9(Text6, { children: " " }),
-          jsx9(Text6, { children: theme.color("accent", "git:(") }),
-          jsx9(Text6, { children: theme.color("customMessage", branch) }),
-          jsx9(Text6, { children: theme.color("accent", ")") })
+          jsx10(Text7, { children: " " }),
+          jsx10(Text7, { children: theme.color("accent", "git:(") }),
+          jsx10(Text7, { children: theme.color("customMessage", branch) }),
+          jsx10(Text7, { children: theme.color("accent", ")") })
         ]
       }) : null,
-      jsx9(Text6, { children: theme.dim("  indus") })
+      jsx10(Text7, { children: theme.dim("  indus") })
     ]
   });
 }
-function Wordmark({ theme }) {
-  return jsx9(Box6, {
+function Wordmark({ theme, sweep }) {
+  return jsx10(Box8, {
     flexDirection: "column",
-    children: WORDMARK_ROWS.map((line, index) => jsx9(Text6, { children: theme.color("accent", line) }, index))
+    children: WORDMARK_ROWS.map((line, index) => jsx10(Text7, { children: sweep ? chalk3.hex(rowGradient(index, WORDMARK_ROWS.length, theme.colors.accent, theme.colors.customMessage))(line) : theme.color("accent", line) }, index))
   });
 }
 function SessionFact({ theme, label, value }) {
-  return jsxs6(Box6, {
+  return jsxs6(Box8, {
     children: [
-      jsx9(Text6, { children: theme.dim(`${label.padEnd(7)} `) }),
-      jsx9(Text6, { children: theme.muted(value) })
+      jsx10(Text7, { children: theme.dim(`${label.padEnd(7)} `) }),
+      jsx10(Text7, { children: theme.muted(value) })
     ]
   });
 }
@@ -13693,17 +14266,17 @@ function paintMascot(theme, tone, text) {
       return theme.dim(text);
   }
 }
-function Mascot({ theme, face }) {
-  return jsx9(Box6, {
+function Mascot({ theme, face, sweep }) {
+  return jsx10(Box8, {
     flexDirection: "column",
     alignItems: "center",
     marginY: 1,
     children: mascotRows(face).map(
-      (row, rowIndex) => jsx9(
-        Box6,
+      (row, rowIndex) => jsx10(
+        Box8,
         {
           children: row.map(
-            (seg, segIndex) => jsx9(Text6, { children: paintMascot(theme, seg.tone, seg.text) }, segIndex)
+            (seg, segIndex) => jsx10(Text7, { children: sweep && seg.tone === "head" ? chalk3.hex(rowGradient(rowIndex, 5, theme.colors.accent, theme.colors.customMessage))(seg.text) : paintMascot(theme, seg.tone, seg.text) }, segIndex)
           )
         },
         rowIndex
@@ -13712,13 +14285,14 @@ function Mascot({ theme, face }) {
   });
 }
 function shortenWorkspace(workspace) {
-  const home = homedir6();
+  const home = homedir5();
   if (home.length > 0 && workspace.startsWith(home)) {
     return `~${workspace.slice(home.length)}`;
   }
   return workspace;
 }
 function Banner(props) {
+  const { columns } = useTerminalSize();
   const {
     theme,
     modelId,
@@ -13732,71 +14306,75 @@ function Banner(props) {
     variantSeed,
     whatsNew,
     notices,
-    changelog
+    changelog,
+    sweep,
+    startup
   } = props;
   const noticeList = notices ?? [];
-  if (quiet || compact) {
-    return jsxs6(Box6, {
+  if (quiet || compact || columns < 76) {
+    return jsxs6(Box8, {
       flexDirection: "column",
       marginBottom: 1,
       children: [
-        jsx9(StartupNotices, { theme, notices: noticeList }),
-        jsxs6(Box6, {
+        jsx10(StartupNotices, { theme, notices: noticeList }),
+        jsx10(StartupSummary, { theme, startup }),
+        jsxs6(Box8, {
           children: [
             compact ? jsxs6(Fragment3, {
               children: [
-                jsx9(Text6, { children: theme.color("accent", COMPACT_EMBLEM.slice(0, 2)) }),
-                jsx9(Text6, { children: theme.color("customMessage", COMPACT_EMBLEM.slice(2)) }),
-                jsx9(Text6, { children: "  " })
+                jsx10(Text7, { children: theme.color("accent", COMPACT_EMBLEM.slice(0, 2)) }),
+                jsx10(Text7, { children: theme.color("customMessage", COMPACT_EMBLEM.slice(2)) }),
+                jsx10(Text7, { children: "  " })
               ]
             }) : null,
-            jsx9(Text6, { bold: true, children: theme.color("accent", BRAND2) }),
-            jsx9(Text6, { children: "  " }),
-            jsx9(Text6, { children: theme.muted(`v${version}`) }),
-            jsx9(Text6, { children: "  " }),
-            jsx9(Text6, { children: theme.dim(modelId) })
+            jsx10(Text7, { bold: true, children: theme.color("accent", BRAND2) }),
+            jsx10(Text7, { children: "  " }),
+            jsx10(Text7, { children: theme.muted(`v${version}`) }),
+            jsx10(Text7, { children: "  " }),
+            jsx10(Text7, { children: theme.dim(modelId) })
           ]
         }),
-        jsx9(WelcomeLine, { theme, name, tone: "muted" }),
-        changelog ? jsx9(StartupChangelogBlock, { theme, changelog }) : null
+        jsx10(WelcomeLine, { theme, name, tone: "muted" }),
+        changelog ? jsx10(StartupChangelogBlock, { theme, changelog }) : null
       ]
     });
   }
   if (started) {
-    return jsxs6(Box6, {
+    return jsxs6(Box8, {
       flexDirection: "column",
       marginBottom: 1,
       children: [
-        jsx9(StartupNotices, { theme, notices: noticeList }),
-        jsx9(ShellLine, { theme, workspace, branch }),
-        jsx9(Box6, { marginTop: 1, children: jsx9(Wordmark, { theme }) }),
-        jsxs6(Box6, {
+        jsx10(StartupNotices, { theme, notices: noticeList }),
+        jsx10(StartupSummary, { theme, startup }),
+        jsx10(ShellLine, { theme, workspace, branch }),
+        jsx10(Box8, { marginTop: 1, children: jsx10(Wordmark, { theme, sweep }) }),
+        jsxs6(Box8, {
           marginTop: 1,
           flexDirection: "column",
           children: [
-            jsxs6(Box6, {
+            jsxs6(Box8, {
               children: [
-                jsx9(Text6, { bold: true, children: theme.color("accent", "indus console") }),
-                jsx9(Text6, { children: "  " }),
-                jsx9(Text6, { children: theme.dim(`v${version}`) })
+                jsx10(Text7, { bold: true, children: theme.color("accent", "indus console") }),
+                jsx10(Text7, { children: "  " }),
+                jsx10(Text7, { children: theme.dim(`v${version}`) })
               ]
             }),
-            jsx9(WelcomeLine, { theme, name, tone: "accent" })
+            jsx10(WelcomeLine, { theme, name, tone: "accent" })
           ]
         }),
-        jsxs6(Box6, {
+        jsxs6(Box8, {
           flexDirection: "column",
           borderStyle: "round",
           borderColor: theme.colors["accent"],
           paddingX: 1,
           marginTop: 1,
           children: [
-            jsx9(Text6, { bold: true, children: theme.color("accent", "Session") }),
-            jsx9(SessionFact, { theme, label: "model", value: modelId }),
-            jsx9(SessionFact, { theme, label: "cwd", value: shortenWorkspace(workspace) })
+            jsx10(Text7, { bold: true, children: theme.color("accent", "Session") }),
+            jsx10(SessionFact, { theme, label: "model", value: modelId }),
+            jsx10(SessionFact, { theme, label: "cwd", value: shortenWorkspace(workspace) })
           ]
         }),
-        changelog ? jsx9(StartupChangelogBlock, { theme, changelog }) : null
+        changelog ? jsx10(StartupChangelogBlock, { theme, changelog }) : null
       ]
     });
   }
@@ -13804,43 +14382,44 @@ function Banner(props) {
   const greeting = welcomeLine(name);
   const news = whatsNew && whatsNew.length > 0 ? whatsNew : WHATS_NEW;
   const metaLine = modelId;
-  return jsxs6(Box6, {
+  return jsxs6(Box8, {
     flexDirection: "column",
     marginBottom: 1,
     children: [
-      jsx9(StartupNotices, { theme, notices: noticeList }),
-      jsxs6(Box6, {
+      jsx10(StartupNotices, { theme, notices: noticeList }),
+      jsx10(StartupSummary, { theme, startup }),
+      jsxs6(Box8, {
         flexDirection: "column",
         borderStyle: "round",
         borderColor: theme.colors["accent"],
         paddingX: 2,
         paddingY: 1,
         children: [
-          jsxs6(Box6, {
+          jsxs6(Box8, {
             children: [
-              jsx9(Text6, { children: theme.color("customMessage", "\u25CF ") }),
-              jsx9(Text6, { bold: true, children: theme.color("accent", `${BRAND2} `) }),
-              jsx9(Text6, { children: theme.dim(`v${version}`) })
+              jsx10(Text7, { children: theme.color("customMessage", "\u25CF ") }),
+              jsx10(Text7, { bold: true, children: theme.color("accent", `${BRAND2} `) }),
+              jsx10(Text7, { children: theme.dim(`v${version}`) })
             ]
           }),
-          jsxs6(Box6, {
+          jsxs6(Box8, {
             marginTop: 1,
             flexDirection: "row",
             children: [
-              jsxs6(Box6, {
+              jsxs6(Box8, {
                 flexDirection: "column",
                 alignItems: "center",
                 width: 32,
                 flexShrink: 0,
                 marginRight: 2,
                 children: [
-                  jsx9(Text6, { bold: true, children: theme.color("text", greeting) }),
-                  jsx9(Mascot, { theme, face: variant.mascot }),
-                  jsx9(Text6, { children: theme.dim(metaLine) }),
-                  jsx9(Text6, { children: theme.dim(shortenWorkspace(workspace)) })
+                  jsx10(Text7, { bold: true, children: theme.color("text", greeting) }),
+                  jsx10(Mascot, { theme, face: variant.mascot, sweep }),
+                  jsx10(Text7, { children: theme.dim(metaLine) }),
+                  jsx10(Text7, { children: theme.dim(shortenWorkspace(workspace)) })
                 ]
               }),
-              jsxs6(Box6, {
+              jsxs6(Box8, {
                 flexDirection: "column",
                 flexGrow: 1,
                 borderStyle: "single",
@@ -13850,108 +14429,96 @@ function Banner(props) {
                 borderBottom: false,
                 paddingLeft: 2,
                 children: [
-                  jsx9(Text6, { bold: true, children: theme.color("accent", "Tips for getting started") }),
-                  jsx9(Text6, { children: theme.color("text", variant.tip) }),
-                  jsx9(Box6, { marginTop: 1, children: jsx9(Text6, { bold: true, children: theme.color("accent", "What's new") }) }),
+                  jsx10(Text7, { bold: true, children: theme.color("accent", "Tips for getting started") }),
+                  jsx10(Text7, { children: theme.color("text", variant.tip) }),
+                  jsx10(Box8, { marginTop: 1, children: jsx10(Text7, { bold: true, children: theme.color("accent", "What's new") }) }),
                   news.map(
-                    (line, index) => jsxs6(Box6, {
+                    (line, index) => jsxs6(Box8, {
                       flexDirection: "row",
                       children: [
-                        jsx9(Box6, { width: 2, flexShrink: 0, children: jsx9(Text6, { children: theme.color("customMessage", "\u25B8") }) }),
-                        jsx9(Box6, { flexGrow: 1, children: jsx9(Text6, { children: theme.color("text", line) }) })
+                        jsx10(Box8, { width: 2, flexShrink: 0, children: jsx10(Text7, { children: theme.color("customMessage", "\u25B8") }) }),
+                        jsx10(Box8, { flexGrow: 1, children: jsx10(Text7, { children: theme.color("text", line) }) })
                       ]
                     }, index)
                   ),
-                  jsx9(Box6, { marginTop: 1, children: jsx9(Text6, { italic: true, children: theme.muted("/release-notes for more") }) })
+                  jsx10(Box8, { marginTop: 1, children: jsx10(Text7, { italic: true, children: theme.muted("/release-notes for more") }) })
                 ]
               })
             ]
           })
         ]
       }),
-      changelog ? jsx9(StartupChangelogBlock, { theme, changelog }) : null
+      changelog ? jsx10(StartupChangelogBlock, { theme, changelog }) : null
     ]
   });
 }
 
 // src/console/components/Composer.ts
-import { Box as Box7, Text as Text7 } from "indusagi/react-host/ink";
-import { jsx as jsx10, jsxs as jsxs7 } from "indusagi/react-host/jsx-runtime";
-var PROMPT_GLYPH = "\u203A ";
-var SUGGESTION_WINDOW = 8;
-var NAME_COLUMN_CAP = 24;
-var NAME_COLUMN_FLOOR = 8;
-function clampName(label, width) {
-  if (label.length <= width) return label;
-  if (width <= 1) return label.slice(0, width);
-  return `${label.slice(0, width - 1)}\u2026`;
-}
-function bufferWithCaret(buffer, caret) {
-  const before = buffer.slice(0, caret);
-  const under = caret < buffer.length ? buffer[caret] : " ";
-  const after = caret < buffer.length ? buffer.slice(caret + 1) : "";
-  return jsxs7(Text7, {
-    children: [before, jsx10(Text7, { inverse: true, children: under }), after]
-  });
+import { Box as Box9, Text as Text8 } from "indusagi/react-host/ink";
+import { jsx as jsx11, jsxs as jsxs7 } from "indusagi/react-host/jsx-runtime";
+import stringWidth from "string-width";
+var segmenter2 = new Intl.Segmenter(void 0, { granularity: "grapheme" });
+function editorLines(buffer, caret, width) {
+  const lines = [[]];
+  let column = 0;
+  caret = snapGrapheme(buffer, caret);
+  for (const { segment, index } of segmenter2.segment(buffer + " ")) {
+    const cursor = index === caret;
+    if (segment === "\n") {
+      if (cursor) lines.at(-1).push({ text: " ", caret: true });
+      lines.push([]);
+      column = 0;
+      continue;
+    }
+    const text = segment === "	" ? "  " : segment.replace(/[\x00-\x1f\x7f]/g, "");
+    const cells2 = stringWidth(text);
+    if (column + cells2 > width && column > 0) {
+      lines.push([]);
+      column = 0;
+    }
+    lines.at(-1).push({ text: cells2 > width ? "?" : text, caret: cursor });
+    column += Math.min(width, cells2);
+  }
+  return lines;
 }
-function Composer({ theme, buffer, caret, busy, suggestions, highlight }) {
-  const shown = suggestions.slice(0, SUGGESTION_WINDOW);
-  const borderColor = theme.colors.borderMuted ?? theme.colors.accent ?? "gray";
-  const nameWidth = shown.length > 0 ? Math.max(NAME_COLUMN_FLOOR, Math.min(NAME_COLUMN_CAP, Math.max(...shown.map((s) => s.label.length)))) : 0;
-  return jsxs7(Box7, {
-    flexDirection: "column",
-    children: [
-      jsxs7(Box7, {
-        borderStyle: "round",
-        borderColor,
-        paddingX: 1,
-        children: [
-          jsxs7(Box7, {
-            flexGrow: 1,
-            children: [
-              jsx10(Text7, { children: theme.color("customMessage", PROMPT_GLYPH) }),
-              bufferWithCaret(buffer, caret)
-            ]
-          }),
-          jsx10(Text7, { children: theme.dim("\u21B5 send") })
-        ]
-      }),
-      shown.length > 0 ? jsx10(Box7, {
-        flexDirection: "column",
-        marginTop: 1,
-        children: shown.map((suggestion, index) => {
-          const active = index === highlight;
-          const name = clampName(suggestion.label, nameWidth);
-          return jsxs7(
-            Box7,
-            {
-              children: [
-                jsx10(Box7, {
-                  width: 2,
-                  flexShrink: 0,
-                  children: jsx10(Text7, { children: active ? theme.color("accent", "\u25B8") : " " })
-                }),
-                jsx10(Box7, {
-                  width: nameWidth,
-                  flexShrink: 0,
-                  children: jsx10(Text7, { bold: active, children: theme.color("customMessage", name) })
-                }),
-                jsx10(Text7, { children: "  " }),
-                jsx10(Text7, { children: theme.muted(suggestion.detail) })
-              ]
-            },
-            suggestion.value
-          );
-        })
-      }) : null
-    ]
-  });
+function Composer({ theme, buffer, caret, suggestions, highlight, paddingX = 1 }) {
+  const { columns, rows } = useTerminalSize();
+  const padding = Math.max(0, Math.min(3, Math.floor(paddingX), Math.floor((columns - 8) / 2)));
+  const sendWidth = columns >= 32 ? 7 : 0;
+  const width = Math.max(1, columns - 2 - padding * 2 - 2 - sendWidth);
+  const allLines = editorLines(buffer, caret, width);
+  const caretRow = Math.max(0, allLines.findIndex((line) => line.some((cell) => cell.caret)));
+  const editorBudget = Math.max(1, Math.min(6, Math.floor(rows / 4)));
+  const top = Math.max(0, Math.min(caretRow - editorBudget + 1, allLines.length - editorBudget));
+  const lines = allLines.slice(top, top + editorBudget);
+  const budget = Math.max(1, Math.min(8, rows - lines.length - 12));
+  const start = Math.max(0, Math.min(highlight - budget + 1, suggestions.length - budget));
+  const shown = suggestions.slice(start, start + budget);
+  const nameWidth = Math.max(1, Math.min(24, Math.floor(columns / 3)));
+  return jsxs7(Box9, { flexDirection: "column", flexShrink: 0, children: [
+    jsx11(Box9, {
+      borderStyle: "round",
+      borderColor: theme.colors.borderMuted ?? "gray",
+      paddingX: padding,
+      flexDirection: "column",
+      children: lines.map((line, index) => jsxs7(Box9, { height: 1, flexShrink: 0, children: [
+        jsx11(Box9, { width: 2, flexShrink: 0, children: jsx11(Text8, { children: theme.color("customMessage", index + top === 0 ? "\u203A " : "\xB7 ") }) }),
+        jsx11(Box9, { width, flexShrink: 0, children: jsx11(Text8, { wrap: "truncate-end", children: line.map((cell, i) => jsx11(Text8, { inverse: cell.caret, children: cell.text }, i)) }) }),
+        sendWidth ? jsx11(Box9, { width: sendWidth, flexShrink: 0, children: jsx11(Text8, { children: index === 0 ? theme.dim(" \u21B5 send") : "" }) }) : null
+      ] }, index))
+    }),
+    shown.length ? jsx11(Box9, { flexDirection: "column", marginTop: 1, children: shown.map((suggestion, index) => jsxs7(Box9, { height: 1, children: [
+      jsx11(Box9, { width: 2, flexShrink: 0, children: jsx11(Text8, { children: start + index === highlight ? theme.color("accent", "\u25B8") : " " }) }),
+      jsx11(Box9, { width: nameWidth, flexShrink: 0, children: jsx11(Text8, { wrap: "truncate-end", bold: start + index === highlight, children: theme.color("customMessage", suggestion.label) }) }),
+      jsx11(Box9, { width: Math.max(1, columns - nameWidth - 2), children: jsx11(Text8, { wrap: "truncate-end", children: theme.muted("  " + suggestion.detail) }) })
+    ] }, suggestion.value)) }) : null
+  ] });
 }
 
 // src/console/components/StatusBar.ts
-import { Box as Box8, Text as Text8 } from "indusagi/react-host/ink";
+import { Box as Box10, Text as Text9 } from "indusagi/react-host/ink";
 import { Footer, StatusLine } from "indusagi/react-ink";
-import { jsx as jsx11, jsxs as jsxs8 } from "indusagi/react-host/jsx-runtime";
+import { jsx as jsx12, jsxs as jsxs8 } from "indusagi/react-host/jsx-runtime";
 function permissionBadge(mode) {
   switch (mode) {
     case "acceptEdits":
@@ -13968,26 +14535,26 @@ function permissionBadge(mode) {
 }
 function StatusBar({ theme, snapshot, branch, providerCount, status, permissionMode }) {
   const badge = permissionMode !== void 0 ? permissionBadge(permissionMode) : null;
-  return jsxs8(Box8, {
+  return jsxs8(Box10, {
     flexDirection: "column",
     children: [
-      jsx11(StatusLine, { theme, snapshot, status, showBusyText: false }),
-      badge !== null ? jsx11(Box8, {
-        children: jsxs8(Text8, {
+      jsx12(StatusLine, { theme, snapshot, status, showBusyText: false }),
+      badge !== null ? jsx12(Box10, {
+        children: jsxs8(Text9, {
           color: badge.color,
           children: ["\u25CF permission: ", badge.label]
         })
       }) : null,
-      jsx11(Footer, { theme, branch, snapshot, availableProviderCount: providerCount })
+      jsx12(Footer, { theme, branch, snapshot, availableProviderCount: providerCount })
     ]
   });
 }
 
 // src/console/components/WorkingIndicator.ts
-import React2, { useEffect as useEffect6, useState as useState7 } from "indusagi/react-host";
-import { Box as Box9, Text as Text9 } from "indusagi/react-host/ink";
-import { jsx as jsx12, jsxs as jsxs9 } from "indusagi/react-host/jsx-runtime";
-var { useRef: useRef2 } = React2;
+import React3, { useEffect as useEffect8, useState as useState9 } from "indusagi/react-host";
+import { Box as Box11, Text as Text10 } from "indusagi/react-host/ink";
+import { jsx as jsx13, jsxs as jsxs9 } from "indusagi/react-host/jsx-runtime";
+var { useRef: useRef2 } = React3;
 var SPINNER_FRAMES = ["\u280B", "\u2819", "\u2839", "\u2838", "\u283C", "\u2834", "\u2826", "\u2827", "\u2807", "\u280F"];
 var FRAME_MS = 120;
 var WORD_MS = 4e3;
@@ -14037,11 +14604,11 @@ function phaseLabel(phase) {
       return null;
   }
 }
-function WorkingIndicator({ theme, busy, phase }) {
-  const [frame, setFrame] = useState7(0);
+function WorkingIndicator({ theme, busy, phase, reducedMotion = false }) {
+  const [frame, setFrame] = useState9(0);
   const startRef = useRef2(null);
   const wordOffsetRef = useRef2(0);
-  useEffect6(() => {
+  useEffect8(() => {
     if (!busy) {
       startRef.current = null;
       return;
@@ -14050,28 +14617,27 @@ function WorkingIndicator({ theme, busy, phase }) {
       startRef.current = Date.now();
       wordOffsetRef.current = Math.floor(Math.random() * WORKING_WORDS.length);
     }
-    const id = setInterval(() => setFrame((f) => (f + 1) % SPINNER_FRAMES.length), FRAME_MS);
+    const id = setInterval(() => setFrame((f) => (f + 1) % SPINNER_FRAMES.length), reducedMotion ? 1e3 : FRAME_MS);
     return () => clearInterval(id);
-  }, [busy]);
+  }, [busy, reducedMotion]);
   if (!busy) return null;
   const elapsedMs = startRef.current !== null ? Date.now() - startRef.current : 0;
   const elapsedSec = Math.floor(elapsedMs / 1e3);
-  const spinner = SPINNER_FRAMES[frame % SPINNER_FRAMES.length];
-  const label = phaseLabel(phase) ?? pickWord(wordOffsetRef.current + Math.floor(elapsedMs / WORD_MS));
-  return jsxs9(Box9, {
+  const spinner = reducedMotion ? "\u2022" : SPINNER_FRAMES[frame % SPINNER_FRAMES.length];
+  const label = phaseLabel(phase) ?? (reducedMotion ? "Working" : pickWord(wordOffsetRef.current + Math.floor(elapsedMs / WORD_MS)));
+  return jsxs9(Box11, {
     marginTop: 1,
     children: [
-      jsx12(Text9, { children: theme.color("accent", `${spinner} ${label}\u2026 `) }),
-      jsx12(Text9, { children: theme.muted(`(${elapsedSec}s \xB7 esc to interrupt)`) })
+      jsx13(Text10, { children: theme.color("accent", `${spinner} ${label}\u2026 `) }),
+      jsx13(Text10, { children: theme.muted(`(${elapsedSec}s \xB7 esc to interrupt)`) })
     ]
   });
 }
 
 // src/console/components/TerminalConsole.ts
-var { useReducer, useRef: useRef3, useCallback } = React3;
+var { useReducer, useRef: useRef3, useCallback } = React4;
 var CHORD_WINDOW_MS = 600;
 var CTRL_C_EXIT_WINDOW_MS = 500;
-var FALLBACK_TERMINAL_ROWS = 40;
 var CHROME_ROWS = 14;
 var MODAL_CHROME_ROWS = 24;
 var MIN_VISIBLE_ROWS = 8;
@@ -14212,8 +14778,39 @@ function permissionModeStatusText(mode) {
 }
 function TerminalConsole(props) {
   const { conductor, theme, slash, verbose, onExit, initialInput, services } = props;
-  const adapter = theme.adapter;
-  const [state, dispatch2] = useReducer(consoleReducer, initConsoleState({ scheme: theme.scheme }));
+  const { stdin, internal_eventEmitter } = useStdin();
+  const { stdout } = useStdout2();
+  const rawKey = useRef3("");
+  useEffect9(() => {
+    const capture = (data) => {
+      rawKey.current = String(data);
+    };
+    internal_eventEmitter.prependListener("input", capture);
+    return () => {
+      internal_eventEmitter.removeListener("input", capture);
+    };
+  }, [internal_eventEmitter]);
+  const [state, dispatch2] = useReducer(consoleReducer, theme.scheme, (scheme) => {
+    let stored;
+    try {
+      stored = services?.settings.get("colourScheme");
+    } catch {
+    }
+    const flag = (key, fallback) => {
+      try {
+        const value = services?.settings.get(key);
+        return typeof value === "boolean" ? value : fallback;
+      } catch {
+        return fallback;
+      }
+    };
+    return initConsoleState({
+      scheme: typeof stored === "string" && isThemeScheme(stored) ? stored : scheme,
+      showReasoning: flag("showReasoning", false),
+      showImages: flag("showImages", true)
+    });
+  });
+  const adapter = resolveTheme(state.scheme).adapter;
   const chord = useRef3(NO_CHORD);
   const chordTimer = useRef3(null);
   const paste = useRef3(EMPTY_PASTE_VAULT);
@@ -14224,34 +14821,39 @@ function TerminalConsole(props) {
   const liveReason = useRef3(null);
   const rowSeed = useRef3(0);
   const ctrlCAt = useRef3(0);
-  const [highlight, setHighlight] = useState8(0);
-  const [toolExecutions, setToolExecutions] = useState8({});
-  const [taskTokens, setTaskTokens] = useState8({});
-  const [subagentActivity, setSubagentActivity] = useState8({});
-  const [expandTools, setExpandTools] = useState8(false);
-  const [agentsOpen, setAgentsOpen] = useState8(false);
-  const [terminalRows, setTerminalRows] = useState8(() => process.stdout.rows ?? FALLBACK_TERMINAL_ROWS);
-  const [, forceTick] = useState8(0);
+  const resumeHandler = useRef3(null);
+  useEffect9(() => () => {
+    if (resumeHandler.current) process.off("SIGCONT", resumeHandler.current);
+  }, []);
+  const [highlight, setHighlight] = useState10(0);
+  const [toolExecutions, setToolExecutions] = useState10({});
+  const [taskTokens, setTaskTokens] = useState10({});
+  const [subagentActivity, setSubagentActivity] = useState10({});
+  const [expandTools, setExpandTools] = useState10(false);
+  const [agentsOpen, setAgentsOpen] = useState10(false);
+  const { rows: terminalRows, columns: terminalColumns } = useTerminalSize();
+  const renderRows = Math.max(1, terminalRows - 1);
+  const [, forceTick] = useState10(0);
   const pulse = useCallback(() => forceTick((n) => n + 1), []);
   const dirReader = useMemo2(() => createDirReader(process.cwd()), []);
   const [approvalQueue, dispatchApproval] = useReducer(approvalQueueReducer, EMPTY_APPROVAL_QUEUE);
   const approvalSeed = useRef3(0);
   const approvalResolvers = useRef3(/* @__PURE__ */ new Map());
   const settleApproval = useCallback((id, choice) => {
-    const resolve9 = approvalResolvers.current.get(id);
-    if (resolve9 === void 0) return;
+    const resolve11 = approvalResolvers.current.get(id);
+    if (resolve11 === void 0) return;
     approvalResolvers.current.delete(id);
     dispatchApproval({ type: "settle", id });
-    resolve9(choice);
+    resolve11(choice);
   }, []);
   const denyAllApprovals = useCallback(() => {
     const pending = [...approvalResolvers.current.entries()];
     approvalResolvers.current.clear();
     dispatchApproval({ type: "clear" });
-    for (const [, resolve9] of pending) resolve9("deny");
+    for (const [, resolve11] of pending) resolve11("deny");
   }, []);
   const requestApproval = useCallback(
-    (toolName, input, opts) => new Promise((resolve9) => {
+    (toolName, input, opts) => new Promise((resolve11) => {
       approvalSeed.current += 1;
       const id = `ap_${approvalSeed.current}`;
       const request = {
@@ -14259,21 +14861,26 @@ function TerminalConsole(props) {
         input,
         suggestions: allowAlwaysRuleStrings(toolName, input)
       };
-      approvalResolvers.current.set(id, resolve9);
       const signal = opts.signal;
+      const onAbort = () => settleApproval(id, "deny");
+      const finish = (choice) => {
+        signal?.removeEventListener("abort", onAbort);
+        resolve11(choice);
+      };
+      approvalResolvers.current.set(id, finish);
       if (signal !== void 0) {
         if (signal.aborted) {
           approvalResolvers.current.delete(id);
-          resolve9("deny");
+          resolve11("deny");
           return;
         }
-        signal.addEventListener("abort", () => settleApproval(id, "deny"), { once: true });
+        signal.addEventListener("abort", onAbort, { once: true });
       }
-      dispatchApproval({ type: "enqueue", entry: { id, request, resolve: resolve9 } });
+      dispatchApproval({ type: "enqueue", entry: { id, request, resolve: finish } });
     }),
     [settleApproval]
   );
-  useEffect7(() => {
+  useEffect9(() => {
     conductor.setApprovalResolver(requestApproval);
     return () => {
       conductor.setApprovalResolver(void 0);
@@ -14283,7 +14890,7 @@ function TerminalConsole(props) {
   const head = activeApproval(approvalQueue);
   const headId = head?.id;
   const approvalModalOpen = useRef3(false);
-  useEffect7(() => {
+  useEffect9(() => {
     if (head === void 0) {
       if (approvalModalOpen.current) {
         approvalModalOpen.current = false;
@@ -14314,11 +14921,53 @@ function TerminalConsole(props) {
   const answerText = useRef3("");
   const reasonText = useRef3("");
   const visibleFrom = useRef3(0);
-  const [compactNote, setCompactNote] = useState8(null);
-  useEffect7(() => {
+  const [compactNote, setCompactNote] = useState10(null);
+  const sessionId = conductor.snapshot().head.sessionId;
+  const priorSession = useRef3(sessionId);
+  const resetView = useCallback(() => {
+    liveAnswer.current = null;
+    liveReason.current = null;
+    answerText.current = "";
+    reasonText.current = "";
+    visibleFrom.current = 0;
+    activePaste.current = null;
+    paste.current = EMPTY_PASTE_VAULT;
+    burst.current = "";
+    if (burstTimer.current !== null) {
+      clearTimeout(burstTimer.current);
+      burstTimer.current = null;
+    }
+    setToolExecutions({});
+    setTaskTokens({});
+    setSubagentActivity({});
+    setCompactNote(null);
+    setAgentsOpen(false);
+    denyAllApprovals();
+    dispatch2({ type: "view:reset" });
+  }, [denyAllApprovals]);
+  useEffect9(() => {
+    if (priorSession.current !== sessionId) {
+      priorSession.current = sessionId;
+      resetView();
+    }
+  }, [sessionId, resetView]);
+  useEffect9(() => {
     const off = conductor.subscribe((signal) => {
       switch (signal.kind) {
+        case "reset": {
+          resetView();
+          break;
+        }
+        case "phase": {
+          dispatch2({ type: "busy:set", busy: signal.phase === "streaming" || signal.phase === "tooling" || signal.phase === "condensing" });
+          break;
+        }
         case "prompt": {
+          liveAnswer.current = null;
+          liveReason.current = null;
+          answerText.current = "";
+          reasonText.current = "";
+          dispatch2({ type: "busy:set", busy: true });
           break;
         }
         case "text": {
@@ -14326,10 +14975,8 @@ function TerminalConsole(props) {
             const id = freshRowId(rowSeed.current++);
             liveAnswer.current = id;
             answerText.current = signal.delta;
-            dispatch2({ type: "rows:append", row: { id, kind: "answer", text: answerText.current } });
           } else {
             answerText.current += signal.delta;
-            dispatch2({ type: "rows:patch", id: liveAnswer.current, text: answerText.current });
           }
           break;
         }
@@ -14338,19 +14985,14 @@ function TerminalConsole(props) {
             const id = freshRowId(rowSeed.current++);
             liveReason.current = id;
             reasonText.current = signal.delta;
-            dispatch2({ type: "rows:append", row: { id, kind: "reason", text: reasonText.current } });
           } else {
             reasonText.current += signal.delta;
-            dispatch2({ type: "rows:patch", id: liveReason.current, text: reasonText.current });
           }
           break;
         }
         case "tool_start": {
           liveAnswer.current = null;
           liveReason.current = null;
-          const id = `tool-${signal.id}`;
-          const row = { id, kind: "toolRun", text: signal.name, runId: signal.id };
-          dispatch2({ type: "rows:append", row });
           setToolExecutions((current) => ({
             ...current,
             [signal.id]: {
@@ -14395,11 +15037,6 @@ function TerminalConsole(props) {
           break;
         }
         case "tool_end": {
-          dispatch2({
-            type: "rows:patch",
-            id: `tool-${signal.id}`,
-            text: signal.ok ? "done" : "failed"
-          });
           setToolExecutions((current) => {
             const prior = current[signal.id];
             if (prior === void 0) return current;
@@ -14424,7 +15061,7 @@ function TerminalConsole(props) {
           if (signal.manual) {
             const carried = [];
             for (const message of conductor.messages()) {
-              const content = message.content;
+              const content = "content" in message ? message.content : void 0;
               if (typeof content === "string" && content.startsWith(RESTORED_FILE_PREFIX)) {
                 const firstLine = content.slice(RESTORED_FILE_PREFIX.length).split("\n", 1)[0];
                 if (firstLine) carried.push(firstLine.trim());
@@ -14436,7 +15073,7 @@ function TerminalConsole(props) {
             liveReason.current = null;
             answerText.current = "";
             reasonText.current = "";
-            dispatch2({ type: "rows:set", rows: [] });
+            dispatch2({ type: "blocks:clear" });
           }
           dispatch2({
             type: "status:set",
@@ -14463,6 +15100,8 @@ function TerminalConsole(props) {
           break;
         }
         case "idle": {
+          liveAnswer.current = null;
+          liveReason.current = null;
           dispatch2({ type: "busy:set", busy: false });
           break;
         }
@@ -14472,19 +15111,17 @@ function TerminalConsole(props) {
       pulse();
     });
     return off;
-  }, [conductor, pulse]);
+  }, [conductor, pulse, resetView]);
   const completion = useMemo2(
     () => completeAt(state.buffer, state.caret, slash, dirReader),
     [state.buffer, state.caret, slash, dirReader]
   );
   const suggestions = completion.suggestions;
-  useEffect7(() => {
+  useEffect9(() => {
     if (highlight >= suggestions.length) setHighlight(0);
   }, [suggestions.length, highlight]);
   const runTurn = useCallback(
     async (text) => {
-      const id = freshRowId(rowSeed.current++);
-      dispatch2({ type: "rows:append", row: { id, kind: "prompt", text } });
       dispatch2({ type: "busy:set", busy: true });
       if (conductor.snapshot().phase === "condensing") {
         dispatch2({
@@ -14494,8 +15131,6 @@ function TerminalConsole(props) {
       }
       setCompactNote(null);
       activePaste.current = null;
-      answerText.current = "";
-      reasonText.current = "";
       try {
         await conductor.submit(text);
       } catch (err2) {
@@ -14514,15 +15149,29 @@ function TerminalConsole(props) {
       const text = hasMarkers(raw, paste.current) ? expandMarkers(raw, paste.current) : raw;
       const trimmed = text.trim();
       dispatch2({ type: "buffer:set", text: "" });
-      paste.current = EMPTY_PASTE_VAULT;
+      paste.current = { bodies: /* @__PURE__ */ new Map(), minted: paste.current.minted };
+      activePaste.current = null;
       if (trimmed.length === 0) return;
-      dispatch2({ type: "history:push", text: raw });
+      dispatch2({ type: "history:push", text });
       if (trimmed.startsWith("!")) {
         const excludeFromContext = trimmed.startsWith("!!");
         const command = trimmed.slice(excludeFromContext ? 2 : 1).trim();
         if (command.length === 0) return;
         dispatch2({ type: "status:set", status: { kind: "busy", text: `Running: ${command}` } });
         void conductor.executeBash(command, { excludeFromContext }).then((outcome) => {
+          const output = String(outcome.output ?? "");
+          const fence = "`".repeat(Math.max(3, ...Array.from(output.matchAll(/`+/g), (m) => m[0].length + 1)));
+          const recorded = conductor.messages().some((message) => message.role === "user" && message.content === `$ ${command}
+${output}`.trimEnd());
+          if (!recorded || excludeFromContext) dispatch2({ type: "block:append", block: {
+            id: freshRowId(rowSeed.current++),
+            kind: "changelog",
+            title: `$ ${command}`,
+            markdown: `${fence}text
+${output || "(no output)"}
+${fence}`,
+            timestamp: Date.now()
+          } });
           dispatch2({
             type: "status:set",
             status: {
@@ -14540,9 +15189,10 @@ function TerminalConsole(props) {
       }
       const resolution = resolveSlash(trimmed, slash);
       if (resolution.kind === "match") {
-        const outcome = resolution.command.run({
+        void Promise.resolve().then(() => resolution.command.run({
           args: resolution.args,
           conductor,
+          services,
           dispatch: dispatch2,
           openModal: (kind, payload) => dispatch2({ type: "modal:open", kind, payload }),
           closeModal: () => dispatch2({ type: "modal:close" }),
@@ -14550,10 +15200,9 @@ function TerminalConsole(props) {
           setStatus: (status) => dispatch2({ type: "status:set", status }),
           setBuffer: (value) => dispatch2({ type: "buffer:set", text: value }),
           appendBlock: (block2) => dispatch2({ type: "block:append", block: block2 })
-        });
-        void Promise.resolve(outcome).then((settled) => {
+        })).then((settled) => {
           if (settled.kind === "prompt") void runTurn(settled.text);
-        });
+        }).catch((error) => dispatch2({ type: "status:set", status: { kind: "error", text: error instanceof Error ? error.message : String(error) } }));
         return;
       }
       if (resolution.kind === "miss") {
@@ -14565,7 +15214,7 @@ function TerminalConsole(props) {
       }
       void runTurn(text);
     },
-    [slash, conductor, onExit, runTurn]
+    [slash, conductor, onExit, runTurn, services]
   );
   const flushBurst = useCallback(() => {
     if (burstTimer.current !== null) {
@@ -14613,22 +15262,15 @@ function TerminalConsole(props) {
       chordTimer.current = null;
     }
   }, []);
-  useEffect7(
+  useEffect9(
     () => () => {
       if (chordTimer.current !== null) clearTimeout(chordTimer.current);
       if (burstTimer.current !== null) clearTimeout(burstTimer.current);
     },
     []
   );
-  useEffect7(() => {
-    const onResize = () => setTerminalRows(process.stdout.rows ?? FALLBACK_TERMINAL_ROWS);
-    process.stdout.on("resize", onResize);
-    return () => {
-      process.stdout.off("resize", onResize);
-    };
-  }, []);
   const titleName = conductor.sessionName();
-  useEffect7(() => {
+  useEffect9(() => {
     writeTerminalTitle(titleName && titleName.length > 0 ? titleName : "indus console");
   }, [titleName]);
   const requestExit = useCallback(() => {
@@ -14643,11 +15285,12 @@ function TerminalConsole(props) {
     setHighlight(0);
     return true;
   }, [suggestions, highlight, state.buffer, completion.span]);
-  useInput4(
+  useInput6(
     (rawInput, key) => {
       const input = rawInput.replace(BRACKETED_PASTE, "");
       if (input.length === 0 && input !== rawInput) return;
-      const intent = readKey(input, key);
+      const isBackspaceByte = rawKey.current === "\x7F" || rawKey.current === "\b";
+      const intent = readKey(input, { ...key, backspace: key.backspace || isBackspaceByte, delete: key.delete && !isBackspaceByte });
       if (intent.verb === "text:type") {
         burst.current += intent.text ?? "";
         armChord(NO_CHORD);
@@ -14784,7 +15427,8 @@ function TerminalConsole(props) {
           return;
         }
         case "flow:cycleModel":
-          conductor.cycleModel?.("");
+          conductor.cycleModel?.("", intent.direction ?? 1);
+          pulse();
           return;
         case "model:cycleThinking": {
           const level = conductor.cycleThinkingLevel();
@@ -14827,10 +15471,10 @@ function TerminalConsole(props) {
           return;
         }
         case "input:pasteImage": {
-          const path4 = readClipboardImage();
-          if (path4 !== null) {
-            const sep = state.buffer.length > 0 && !/\s$/.test(state.buffer) ? " " : "";
-            dispatch2({ type: "buffer:insert", text: `${sep}${path4}` });
+          const path5 = readClipboardImage();
+          if (path5 !== null) {
+            const sep2 = state.buffer.length > 0 && !/\s$/.test(state.buffer) ? " " : "";
+            dispatch2({ type: "buffer:insert", text: `${sep2}${path5}` });
           } else {
             dispatch2({
               type: "status:set",
@@ -14840,7 +15484,7 @@ function TerminalConsole(props) {
           return;
         }
         case "input:externalEditor": {
-          const edited = openInExternalEditor(state.buffer);
+          const edited = openInExternalEditor(expandMarkers(state.buffer, paste.current), { terminal: { stdin, stdout } });
           if (edited !== null) {
             dispatch2({ type: "buffer:set", text: edited });
           }
@@ -14854,9 +15498,30 @@ function TerminalConsole(props) {
         case "view:expandTools":
           setExpandTools((current) => !current);
           return;
-        case "flow:suspend":
-          process.kill(process.pid, "SIGTSTP");
+        case "flow:suspend": {
+          if (process.platform === "win32") {
+            dispatch2({ type: "status:set", status: { kind: "warning", text: "Process suspension is not supported on Windows." } });
+            return;
+          }
+          const wasRaw = stdin.isRaw === true;
+          const resume = () => {
+            process.off("SIGCONT", resume);
+            resumeHandler.current = null;
+            stdin.setRawMode?.(wasRaw);
+            if (stdout.isTTY) stdout.write("\x1B[?25l");
+            dispatch2({ type: "status:set", status: { kind: "info", text: "Resumed console." } });
+          };
+          resumeHandler.current = resume;
+          process.once("SIGCONT", resume);
+          stdin.setRawMode?.(false);
+          if (stdout.isTTY) stdout.write("\x1B[?25h");
+          try {
+            process.kill(process.pid, "SIGTSTP");
+          } catch {
+            resume();
+          }
           return;
+        }
         case "none":
         default:
           return;
@@ -14864,14 +15529,23 @@ function TerminalConsole(props) {
     },
     { isActive: state.modal.kind === "none" && !agentsOpen }
   );
-  useInput4(
+  useInput6((input, key) => {
+    if (!key.ctrl || input !== "c") return;
+    if (state.busy || conductor.isBusy?.() || conductor.snapshot().phase === "condensing") {
+      denyAllApprovals();
+      conductor.abort();
+    }
+    dispatch2({ type: "modal:close" });
+    setAgentsOpen(false);
+  }, { isActive: state.modal.kind !== "none" || agentsOpen });
+  useInput6(
     (_rawInput, key) => {
       if (key.tab && key.shift) cyclePermission();
     },
     { isActive: state.modal.kind === "approval" }
   );
   const seeded = useRef3(false);
-  useEffect7(() => {
+  useEffect9(() => {
     if (seeded.current) return;
     seeded.current = true;
     const opening = conductor.permissionMode();
@@ -14905,7 +15579,7 @@ function TerminalConsole(props) {
   const taskPanelRows = showTaskPanel ? 2 + Math.min(pendingMessages.length, 8) : 0;
   const workingIndicatorRows = state.busy ? 2 : 0;
   const maxItems = transcriptHeight(
-    terminalRows,
+    renderRows,
     modalOpen,
     agentPanelRows(agentRuns) + streamingAnswerRows + taskPanelRows + workingIndicatorRows
   );
@@ -14914,7 +15588,7 @@ function TerminalConsole(props) {
   const startupMap = useMemo2(
     () => gatherStartup({
       cwd: process.cwd(),
-      home: homedir7(),
+      home: homedir6(),
       version: VERSION,
       lastSeenVersion
     }),
@@ -14923,8 +15597,8 @@ function TerminalConsole(props) {
   const quietStartup = (services?.settings.get("quietStartup") ?? false) && !verbose;
   const sweep = (services?.settings.get("logoSweep") ?? false) && !(services?.settings.get("reducedMotion") ?? false) && Boolean(process.stdout.isTTY);
   const welcomeSeed = PINNED_WELCOME_SEED;
-  const [welcomeName, setWelcomeName] = useState8(void 0);
-  useEffect7(() => {
+  const [welcomeName, setWelcomeName] = useState10(void 0);
+  useEffect9(() => {
     if (!services) return;
     let live3 = true;
     const provider = services.settings.get("defaultProvider");
@@ -14936,119 +15610,127 @@ function TerminalConsole(props) {
       live3 = false;
     };
   }, [services]);
-  const authedProviders = useAuthenticatedProviders(services, state.status);
+  const authRefreshKey = useMemo2(() => ({ status: state.status, modal: state.modal.kind }), [state.status, state.modal.kind]);
+  const authedProviders = useAuthenticatedProviders(services, authRefreshKey);
   const boundModelId = conductor.snapshot().modelId;
   const boundProvider = boundModelId.includes("/") ? boundModelId.split("/")[0] : boundModelId;
   const modelAuthed = authedProviders === null || authedProviders.has(boundProvider);
   const bannerModelId = modelAuthed ? boundModelId : "no authenticated model \u2014 run /login";
   const statusBarSnapshot = modelAuthed || !snapshot.model ? snapshot : { ...snapshot, model: { ...snapshot.model, provider: "no model", id: "run /login" } };
-  return jsxs10(Box10, {
+  return jsx14(Box12, {
     flexDirection: "column",
-    children: [
-      agentsOpen ? jsx13(AgentsView, {
-        theme: adapter,
-        runs: agentRuns,
-        activity: subagentActivity,
-        tokens: taskTokens,
-        onExit: () => setAgentsOpen(false)
-      }) : jsxs10(Fragment4, {
-        children: [
-          jsx13(Banner, {
-            theme: adapter,
-            modelId: bannerModelId,
-            workspace: process.cwd(),
-            version: VERSION,
-            verbose,
-            quiet: quietStartup,
-            compact: false,
-            started: liveMessages.length > 0,
-            branch,
-            name: welcomeName,
-            sweep,
-            startup: startupMap,
-            variantSeed: welcomeSeed
-          }),
-          compactNote !== null ? jsxs10(Box10, {
-            flexDirection: "column",
-            borderStyle: "round",
-            borderColor: adapter.colors["borderMuted"],
-            paddingX: 1,
-            marginBottom: 1,
-            children: [
-              jsx13(Text10, {
-                children: adapter.color("accent", "\u25C6 Context condensed \u2014 fresh session, history summarized")
-              }),
-              compactNote.length > 0 ? jsxs10(Fragment4, {
-                children: [
-                  jsx13(Text10, { children: adapter.muted("Files carried into the new context:") }),
-                  compactNote.map(
-                    (file, index) => jsx13(Text10, { children: adapter.muted(`  \xB7 ${file}`) }, index)
-                  )
-                ]
-              }) : jsx13(Text10, {
-                children: adapter.muted("No files re-attached; the summary digest carries the history.")
-              })
-            ]
-          }) : null,
-          jsx13(MessageList, {
-            messages: liveMessages,
-            theme: adapter,
-            showThinking: state.showReasoning,
-            showImages: state.showImages,
-            expandToolOutputs: expandTools,
-            maxItems,
-            displayBlocks: [...state.blocks]
-          }),
-          liveAnswer.current !== null && answerText.current ? jsx13(Box10, {
-            flexDirection: "column",
-            marginBottom: 1,
-            children: jsx13(StreamingMarkdown, { theme: adapter, children: answerText.current })
-          }) : null,
-          showTaskPanel ? jsx13(TaskPanel, {
-            theme: adapter,
-            snapshot,
-            toolExecutions: SHOW_TOOL_ACTIVITY ? toolExecutions : {},
-            expandToolOutputs: expandTools,
-            pendingMessages
-          }) : null,
-          jsx13(WorkingIndicator, {
-            theme: adapter,
-            busy: state.busy || conductor.snapshot().phase === "condensing",
-            phase: conductor.snapshot().phase
-          }),
-          jsx13(Composer, {
-            theme: adapter,
-            buffer: state.buffer,
-            caret: state.caret,
-            busy: state.busy,
-            suggestions,
-            highlight
-          }),
-          jsx13(StatusBar, {
-            theme: adapter,
-            snapshot: statusBarSnapshot,
-            branch,
-            providerCount,
-            status: state.status,
-            permissionMode: conductor.permissionMode()
-          }),
-          jsx13(BackgroundAgents, { theme: adapter, runs: agentRuns, tokens: taskTokens })
-        ]
-      }),
-      jsx13(OverlayHost, {
-        modal: state.modal,
-        services,
+    width: terminalColumns,
+    height: renderRows,
+    overflow: "hidden",
+    children: modalOpen ? jsx14(ScrollViewport, { follow: false, children: jsx14(OverlayHost, {
+      modal: state.modal,
+      services,
+      theme: adapter,
+      dispatch: dispatch2,
+      closeModal: () => dispatch2({ type: "modal:close" })
+    }) }, state.modal.kind) : agentsOpen ? jsx14(ScrollViewport, { follow: false, children: jsx14(AgentsView, {
+      theme: adapter,
+      runs: agentRuns,
+      activity: subagentActivity,
+      tokens: taskTokens,
+      onExit: () => setAgentsOpen(false)
+    }) }, "agents") : jsxs10(Fragment4, { children: [
+      terminalRows >= 18 ? jsx14(Box12, { flexShrink: 0, flexDirection: "column", children: jsx14(Banner, {
         theme: adapter,
-        dispatch: dispatch2,
-        closeModal: () => dispatch2({ type: "modal:close" })
-      })
-    ]
+        modelId: bannerModelId,
+        workspace: process.cwd(),
+        version: VERSION,
+        verbose,
+        quiet: quietStartup,
+        compact: liveMessages.length > 0 || terminalRows < 32,
+        started: liveMessages.length > 0,
+        branch,
+        name: welcomeName,
+        sweep,
+        startup: startupMap,
+        variantSeed: welcomeSeed
+      }) }) : null,
+      jsx14(ScrollViewport, { children: jsxs10(Fragment4, { children: [
+        compactNote !== null ? jsx14(Text11, { children: adapter.muted(
+          `Context condensed.${compactNote.length ? " Files carried: " + compactNote.join(", ") : ""}`
+        ) }) : null,
+        jsx14(MessageList, {
+          messages: liveMessages,
+          theme: adapter,
+          showThinking: state.showReasoning,
+          showImages: state.showImages,
+          expandToolOutputs: expandTools,
+          maxItems: liveMessages.length + state.blocks.length,
+          displayBlocks: [...state.blocks]
+        }),
+        state.showReasoning && liveReason.current !== null && reasonText.current ? jsx14(Box12, {
+          flexDirection: "column",
+          marginBottom: 1,
+          children: jsx14(StreamingMarkdown, { theme: adapter, dim: true, children: reasonText.current })
+        }) : null,
+        liveAnswer.current !== null && answerText.current ? jsx14(Box12, {
+          flexDirection: "column",
+          marginBottom: 1,
+          children: jsx14(StreamingMarkdown, { theme: adapter, children: answerText.current })
+        }) : null,
+        showTaskPanel ? jsx14(TaskPanel, {
+          theme: adapter,
+          snapshot,
+          toolExecutions: SHOW_TOOL_ACTIVITY ? toolExecutions : {},
+          expandToolOutputs: expandTools,
+          pendingMessages
+        }) : null,
+        jsx14(BackgroundAgents, { theme: adapter, runs: agentRuns, tokens: taskTokens })
+      ] }) }, snapshot.sessionId),
+      jsx14(Box12, { flexDirection: "column", flexShrink: 0, children: jsxs10(Fragment4, { children: [
+        jsx14(WorkingIndicator, { theme: adapter, busy: state.busy || conductor.snapshot().phase === "condensing", phase: conductor.snapshot().phase, reducedMotion: services?.settings.get("reducedMotion") ?? false }),
+        jsx14(Composer, {
+          theme: adapter,
+          buffer: state.buffer,
+          caret: state.caret,
+          busy: state.busy,
+          suggestions,
+          highlight,
+          paddingX: services?.settings.get("editorPaddingX") ?? 1
+        }),
+        terminalRows >= 12 ? jsx14(StatusBar, {
+          theme: adapter,
+          snapshot: statusBarSnapshot,
+          branch,
+          providerCount,
+          status: state.status,
+          permissionMode: conductor.permissionMode()
+        }) : null
+      ] }) })
+    ] })
   });
 }
 
 // src/console/mount.ts
 import { createElement as createElement2 } from "indusagi/react-host";
 import { render as render2 } from "indusagi/react-host/ink";
+var SYNC_OUTPUT_BEGIN = "\x1B[?2026h";
+var SYNC_OUTPUT_END = "\x1B[?2026l";
+function supportsSynchronizedOutput(stream) {
+  if (!stream.isTTY || process.env["INDUS_TUI_SYNC_OUTPUT"] === "0") return false;
+  const term = process.env["TERM"] ?? "";
+  return process.env["TMUX"] === void 0 && process.env["STY"] === void 0 && !term.startsWith("screen") && !term.startsWith("tmux");
+}
+function synchronizedOutputStream(stream, enabled = supportsSynchronizedOutput(stream)) {
+  if (!enabled) return stream;
+  const write = (chunk, encodingOrCallback, callback) => {
+    const framed = typeof chunk === "string" ? `${SYNC_OUTPUT_BEGIN}${chunk}${SYNC_OUTPUT_END}` : Buffer.concat([Buffer.from(SYNC_OUTPUT_BEGIN), Buffer.from(chunk), Buffer.from(SYNC_OUTPUT_END)]);
+    if (typeof encodingOrCallback === "function") return stream.write(framed, encodingOrCallback);
+    return stream.write(framed, encodingOrCallback, callback);
+  };
+  return new Proxy(stream, {
+    get(target, property) {
+      if (property === "write") return write;
+      const value = Reflect.get(target, property, target);
+      return typeof value === "function" ? value.bind(target) : value;
+    }
+  });
+}
 async function mountConsole(conductor, opts = {}) {
   const theme = resolveTheme(opts.scheme ?? null);
   const slash = opts.slash ?? DEFAULT_SLASH_REGISTRY;
@@ -15066,15 +15748,23 @@ async function mountConsole(conductor, opts = {}) {
       instance.unmount();
     }
   };
-  const instance = render2(createElement2(TerminalConsole, props));
-  await instance.waitUntilExit();
-  return { clean: exited };
+  const wasRaw = process.stdin.isRaw === true;
+  const stdout = synchronizedOutputStream(process.stdout);
+  const instance = render2(createElement2(TerminalConsole, props), { exitOnCtrlC: false, stdout });
+  try {
+    await instance.waitUntilExit();
+    return { clean: exited };
+  } finally {
+    instance.unmount();
+    if (process.stdin.isTTY) process.stdin.setRawMode(wasRaw);
+    if (process.stdout.isTTY) process.stdout.write("\x1B[?25h");
+  }
 }
 
 // src/boot/runners/session.ts
-import { existsSync as existsSync9, readFileSync as readFileSync17 } from "node:fs";
-import { join as join22 } from "node:path";
-import { homedir as homedir11 } from "node:os";
+import { existsSync as existsSync8, readFileSync as readFileSync17 } from "node:fs";
+import { isAbsolute as isAbsolute6, join as join22, resolve as resolve10 } from "node:path";
+import { homedir as homedir10 } from "node:os";
 import { createMCPAgentToolFactory as createMCPAgentToolFactory4, loadMCPConfig as loadMCPConfig2, MCPClientPool as MCPClientPool2 } from "indusagi/mcp";
 
 // src/boot/runners/delegate-runner.ts
@@ -15131,7 +15821,7 @@ async function acquireTaskSlot() {
   if (activeTasks < MAX_PARALLEL_TASKS) {
     activeTasks++;
   } else {
-    await new Promise((resolve9) => taskQueue.push(resolve9));
+    await new Promise((resolve11) => taskQueue.push(resolve11));
   }
   let released = false;
   return () => {
@@ -15236,7 +15926,7 @@ ${request.context}` : request.objective;
 }
 
 // src/boot/runners/checkpoint.ts
-import { mkdirSync as mkdirSync3, rmSync, writeFileSync as writeFileSync6 } from "node:fs";
+import { mkdirSync as mkdirSync3, rmSync as rmSync2, writeFileSync as writeFileSync7 } from "node:fs";
 import { dirname as dirname22, normalize as normalize2 } from "node:path";
 var CHECKPOINT_HANDLE_KEY = "checkpoint";
 var ROOT_NODE_ID = "__root__";
@@ -15304,7 +15994,7 @@ var CheckpointStore = class {
   snapshotFor(nodeId) {
     const paths = this.byNode.get(nodeId);
     if (paths === void 0) return [];
-    return [...paths].map(([path4, previous]) => ({ path: path4, previous }));
+    return [...paths].map(([path5, previous]) => ({ path: path5, previous }));
   }
   /** Whether a node has ANY recorded file snapshot (the picker's restore gate). */
   hasSnapshot(nodeId) {
@@ -15330,15 +16020,15 @@ var CheckpointStore = class {
   restore(nodeId) {
     const snapshots = this.snapshotFor(nodeId);
     const restored = [];
-    for (const { path: path4, previous } of snapshots) {
+    for (const { path: path5, previous } of snapshots) {
       try {
         if (previous === null) {
-          rmSync(path4, { force: true });
+          rmSync2(path5, { force: true });
         } else {
-          mkdirSync3(dirname22(path4), { recursive: true });
-          writeFileSync6(path4, previous, "utf8");
+          mkdirSync3(dirname22(path5), { recursive: true });
+          writeFileSync7(path5, previous, "utf8");
         }
-        restored.push(path4);
+        restored.push(path5);
       } catch {
       }
     }
@@ -15385,15 +16075,15 @@ function createReadStateStore() {
 }
 
 // src/integrations/zoho/config.ts
-import { existsSync as existsSync5, readFileSync as readFileSync12, writeFileSync as writeFileSync7, mkdirSync as mkdirSync4 } from "node:fs";
-import { homedir as homedir8 } from "node:os";
-import { dirname as dirname5, join as join18 } from "node:path";
+import { existsSync as existsSync4, readFileSync as readFileSync12, writeFileSync as writeFileSync8, mkdirSync as mkdirSync4 } from "node:fs";
+import { homedir as homedir7 } from "node:os";
+import { dirname as dirname6, join as join17 } from "node:path";
 var ENV_URL = "ZOHO_MCP_URL";
 var ENV_DISABLE = "ZOHO_DISABLED";
-function readJsonFile(path4) {
+function readJsonFile(path5) {
   try {
-    if (!existsSync5(path4)) return void 0;
-    const raw = readFileSync12(path4, "utf8");
+    if (!existsSync4(path5)) return void 0;
+    const raw = readFileSync12(path5, "utf8");
     const parsed = JSON.parse(raw);
     if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
       return void 0;
@@ -15412,11 +16102,11 @@ function configFromRecord(rec) {
   const auth = rec.auth === "none" || rec.auth === "oauth" || rec.auth === "auto" ? rec.auth : "auto";
   return { url, id, enabled, auth };
 }
-function profileZohoPath(home = homedir8()) {
-  return join18(home, ".indusagi", "agent", "zoho.json");
+function profileZohoPath(home = homedir7()) {
+  return join17(home, ".indusagi", "agent", "zoho.json");
 }
 function projectZohoPath(cwd) {
-  return join18(cwd, ".indusagi", "zoho.json");
+  return join17(cwd, ".indusagi", "zoho.json");
 }
 function resolveZohoConfig(opts = {}) {
   const env2 = opts.env ?? process.env;
@@ -15428,7 +16118,7 @@ function resolveZohoConfig(opts = {}) {
   const fromEnv = env2[ENV_URL]?.trim();
   const fromProject = configFromRecord(readJsonFile(projectZohoPath(cwd)));
   const fromProfile = configFromRecord(
-    readJsonFile(profileZohoPath(opts.home ?? homedir8()))
+    readJsonFile(profileZohoPath(opts.home ?? homedir7()))
   );
   const base = (fromArg ? { url: fromArg, id: "zoho", enabled: true, auth: "auto" } : void 0) ?? (fromEnv ? { url: fromEnv, id: "zoho", enabled: true, auth: "auto" } : void 0) ?? fromProject ?? fromProfile;
   if (!base) return void 0;
@@ -15440,9 +16130,9 @@ function resolveZohoConfig(opts = {}) {
 }
 
 // src/integrations/zoho/attach.ts
-import { existsSync as existsSync6, readFileSync as readFileSync13 } from "node:fs";
-import { homedir as homedir9 } from "node:os";
-import { join as join19 } from "node:path";
+import { existsSync as existsSync5, readFileSync as readFileSync13 } from "node:fs";
+import { homedir as homedir8 } from "node:os";
+import { join as join18 } from "node:path";
 import { connectZohoMcp } from "indusagi/zoho";
 import { createMCPAgentToolFactory as createMCPAgentToolFactory2 } from "indusagi/mcp";
 var live = null;
@@ -15451,15 +16141,15 @@ var cancelConnect = false;
 var lastAuthUrl;
 function zohoTokenPath(id = "zoho") {
   const xdg = process.env.XDG_CONFIG_HOME;
-  const home = process.env.HOME ?? process.env.USERPROFILE ?? homedir9();
-  const dir = xdg && xdg.length > 0 ? join19(xdg, "indusagi", "credentials", "mcp") : join19(home, ".config", "indusagi", "credentials", "mcp");
-  return join19(dir, `${id.replace(/[^a-zA-Z0-9._-]/g, "-")}.json`);
+  const home = process.env.HOME ?? process.env.USERPROFILE ?? homedir8();
+  const dir = xdg && xdg.length > 0 ? join18(xdg, "indusagi", "credentials", "mcp") : join18(home, ".config", "indusagi", "credentials", "mcp");
+  return join18(dir, `${id.replace(/[^a-zA-Z0-9._-]/g, "-")}.json`);
 }
 function hasUsableZohoTokens(id = "zoho") {
-  const path4 = zohoTokenPath(id);
+  const path5 = zohoTokenPath(id);
   try {
-    if (!existsSync6(path4)) return false;
-    const raw = readFileSync13(path4, "utf8");
+    if (!existsSync5(path5)) return false;
+    const raw = readFileSync13(path5, "utf8");
     const parsed = JSON.parse(raw);
     return typeof parsed?.tokens?.access_token === "string" && parsed.tokens.access_token.length > 0;
   } catch {
@@ -15598,17 +16288,18 @@ async function loadZohoAgentTools(opts) {
 }
 
 // src/integrations/sarvam/config.ts
-import { existsSync as existsSync7, readFileSync as readFileSync14, writeFileSync as writeFileSync8, mkdirSync as mkdirSync5 } from "node:fs";
-import { homedir as homedir10 } from "node:os";
-import { dirname as dirname6, join as join20 } from "node:path";
+import { existsSync as existsSync6, readFileSync as readFileSync14 } from "node:fs";
+import { homedir as homedir9 } from "node:os";
+import { join as join19 } from "node:path";
 var ENV_KEY = "SARVAM_API_KEY";
 var ENV_DISABLE2 = "SARVAM_DISABLED";
 var ENV_BASE_URL = "SARVAM_API_BASE_URL";
 var ENV_BASE_PATH = "SARVAM_MCP_BASE_PATH";
-function readJsonFile2(path4) {
+function readJsonFile2(path5, sensitive = false) {
   try {
-    if (!existsSync7(path4)) return void 0;
-    const raw = readFileSync14(path4, "utf8");
+    if (!sensitive && !existsSync6(path5)) return void 0;
+    const raw = sensitive ? readPrivateFileSync(path5) : readFileSync14(path5, "utf8");
+    if (raw === null) return void 0;
     const parsed = JSON.parse(raw);
     if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) {
       return void 0;
@@ -15618,11 +16309,11 @@ function readJsonFile2(path4) {
     return void 0;
   }
 }
-function configFromRecord2(rec) {
+function configFromRecord2(rec, includeApiKey = true) {
   if (!rec) return void 0;
   const enabled = rec.enabled === false ? false : true;
   const id = typeof rec.id === "string" && rec.id.trim() ? rec.id.trim() : "sarvam";
-  const apiKey = typeof rec.apiKey === "string" ? rec.apiKey.trim() : void 0;
+  const apiKey = includeApiKey && typeof rec.apiKey === "string" ? rec.apiKey.trim() : void 0;
   const baseUrl = typeof rec.baseUrl === "string" ? rec.baseUrl.trim() : void 0;
   const basePath = typeof rec.basePath === "string" ? rec.basePath.trim() : void 0;
   const command = typeof rec.command === "string" ? rec.command.trim() : void 0;
@@ -15635,11 +16326,11 @@ function configFromRecord2(rec) {
     ...command ? { command } : {}
   };
 }
-function profileSarvamPath(home = homedir10()) {
-  return join20(home, ".indusagi", "agent", "sarvam.json");
+function profileSarvamPath(home = homedir9()) {
+  return join19(home, ".indusagi", "agent", "sarvam.json");
 }
 function projectSarvamPath(cwd) {
-  return join20(cwd, ".indusagi", "sarvam.json");
+  return join19(cwd, ".indusagi", "sarvam.json");
 }
 function resolveSarvamConfig(opts = {}) {
   const env2 = opts.env ?? process.env;
@@ -15649,9 +16340,9 @@ function resolveSarvamConfig(opts = {}) {
   }
   const fromArgKey = opts.apiKey?.trim();
   const fromEnvKey = env2[ENV_KEY]?.trim();
-  const fromProject = configFromRecord2(readJsonFile2(projectSarvamPath(cwd)));
+  const fromProject = configFromRecord2(readJsonFile2(projectSarvamPath(cwd)), false);
   const fromProfile = configFromRecord2(
-    readJsonFile2(profileSarvamPath(opts.home ?? homedir10()))
+    readJsonFile2(profileSarvamPath(opts.home ?? homedir9()), true)
   );
   const fileBase = fromProject ?? fromProfile;
   const apiKey = fromArgKey || fromEnvKey || fileBase?.apiKey;
@@ -15776,8 +16467,6 @@ async function loadSarvamAgentTools(opts) {
 }
 
 // src/boot/auth-vault.ts
-import { mkdirSync as mkdirSync6, readFileSync as readFileSync15, writeFileSync as writeFileSync9 } from "node:fs";
-import { dirname as dirname7 } from "node:path";
 import {
   ensureFreshOAuthCredentials,
   getOAuthProvider as getOAuthProvider3
@@ -15801,8 +16490,9 @@ function normaliseRecord(value) {
   return void 0;
 }
 function readAuthFile(filePath) {
+  const text = readPrivateFileSync(filePath);
+  if (text === null) return {};
   try {
-    const text = readFileSync15(filePath, "utf8");
     const parsed = JSON.parse(text);
     if (parsed === null || typeof parsed !== "object") return {};
     const file = {};
@@ -15821,9 +16511,8 @@ function readAuthFile(filePath) {
   }
 }
 function writeAuthFile(filePath, data) {
-  mkdirSync6(dirname7(filePath), { recursive: true });
-  writeFileSync9(filePath, `${JSON.stringify(data, null, 2)}
-`, { mode: 384 });
+  atomicWritePrivateFileSync(filePath, `${JSON.stringify(data, null, 2)}
+`);
 }
 function toCredentials(record) {
   const { kind: _kind, isDefault: _isDefault, ...credentials } = record;
@@ -15917,8 +16606,8 @@ function createAuthVault(authPath) {
 }
 
 // src/boot/runners/memdir.ts
-import { existsSync as existsSync8, mkdirSync as mkdirSync7, readFileSync as readFileSync16, writeFileSync as writeFileSync10 } from "node:fs";
-import { join as join21 } from "node:path";
+import { existsSync as existsSync7, mkdirSync as mkdirSync5, readFileSync as readFileSync15, writeFileSync as writeFileSync9 } from "node:fs";
+import { join as join20 } from "node:path";
 var MEMORY_ENTRYPOINT = "MEMORY.md";
 var MAX_ENTRYPOINT_LINES = 200;
 var MAX_ENTRYPOINT_BYTES = 25e3;
@@ -15944,27 +16633,27 @@ function truncateEntrypointContent(raw) {
 }
 function memoryDirFor(workspace, cwd) {
   const slug = cwd.replace(/[^a-zA-Z0-9]+/g, "-").replace(/^-+|-+$/g, "");
-  return join21(workspace.profileDir, "memory", `--${slug}--`);
+  return join20(workspace.profileDir, "memory", `--${slug}--`);
 }
 var DiskMemoryStore = class {
   memDir;
   file;
   constructor(memDir) {
     this.memDir = memDir;
-    this.file = join21(memDir, MEMORY_ENTRYPOINT);
+    this.file = join20(memDir, MEMORY_ENTRYPOINT);
   }
   /** The current note, or `""` when no file has been written yet. */
   read() {
     try {
-      return existsSync8(this.file) ? readFileSync16(this.file, "utf8") : "";
+      return existsSync7(this.file) ? readFileSync15(this.file, "utf8") : "";
     } catch {
       return "";
     }
   }
   /** Overwrite the note, creating the memory directory as needed (mode 0o600). */
   replace(content) {
-    mkdirSync7(this.memDir, { recursive: true });
-    writeFileSync10(this.file, content, { mode: 384 });
+    mkdirSync5(this.memDir, { recursive: true });
+    writeFileSync9(this.file, content, { mode: 384 });
   }
   /** Add a single line to the end of the note (composed of read + replace). */
   append(line) {
@@ -15977,9 +16666,9 @@ ${line}`;
 function loadMemoryDoc(memDir) {
   let raw;
   try {
-    const file = join21(memDir, MEMORY_ENTRYPOINT);
-    if (!existsSync8(file)) return void 0;
-    raw = readFileSync16(file, "utf8");
+    const file = join20(memDir, MEMORY_ENTRYPOINT);
+    if (!existsSync7(file)) return void 0;
+    raw = readFileSync15(file, "utf8");
   } catch {
     return void 0;
   }
@@ -15990,11 +16679,104 @@ function loadMemoryDoc(memDir) {
 }
 
 // src/boot/runners/addon-wiring.ts
+import { createHash } from "node:crypto";
+import { lstatSync as lstatSync3, readFileSync as readFileSync16, readdirSync as readdirSync5, realpathSync as realpathSync3 } from "node:fs";
+import { join as join21, relative, resolve as resolve9 } from "node:path";
+var TRUST_FILE = "addon-trust.json";
+function hashAddonTree(addonsDir) {
+  let root;
+  try {
+    const rootStat = lstatSync3(addonsDir);
+    if (rootStat.isSymbolicLink() || !rootStat.isDirectory()) return null;
+    root = realpathSync3(addonsDir);
+  } catch (error) {
+    if (error.code === "ENOENT") return null;
+    throw error;
+  }
+  const files = [];
+  const visit = (dir) => {
+    for (const entry of readdirSync5(dir, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name))) {
+      const path5 = join21(dir, entry.name);
+      const info2 = lstatSync3(path5);
+      if (info2.isSymbolicLink()) throw new Error(`Refusing symlink in project addon tree: ${path5}`);
+      if (info2.isDirectory()) visit(path5);
+      else if (info2.isFile()) files.push(path5);
+      else throw new Error(`Refusing special file in project addon tree: ${path5}`);
+    }
+  };
+  visit(root);
+  const hash = createHash("sha256");
+  for (const file of files) {
+    hash.update(relative(root, file));
+    hash.update("\0");
+    hash.update(readFileSync16(file));
+    hash.update("\0");
+  }
+  return hash.digest("hex");
+}
+function readTrustStore(path5) {
+  const raw = readPrivateFileSync(path5);
+  if (raw === null) return { version: 1, projects: [] };
+  try {
+    const parsed = JSON.parse(raw);
+    if (parsed.version !== 1 || !Array.isArray(parsed.projects)) return { version: 1, projects: [] };
+    return {
+      version: 1,
+      projects: parsed.projects.filter((record) => typeof record?.root === "string" && typeof record?.digest === "string" && typeof record?.approvedAt === "string")
+    };
+  } catch {
+    return { version: 1, projects: [] };
+  }
+}
+function persistTrust(path5, root, digest) {
+  const store = readTrustStore(path5);
+  const projects = store.projects.filter((record) => record.root !== root);
+  projects.push({ root, digest, approvedAt: (/* @__PURE__ */ new Date()).toISOString() });
+  atomicWritePrivateFileSync(path5, `${JSON.stringify({ version: 1, projects }, null, 2)}
+`);
+}
 async function buildAddonHost(ctx) {
   const host = createAddonHost({ handles: {} });
-  host.onFault(() => {
+  host.onFault((fault) => {
+    process.stderr.write(`Addon ${fault.kind} fault: ${fault.message}
+`);
   });
-  return host.loadAll({ workspace: ctx.invocation.cwd ?? process.cwd() });
+  const workspace = resolve9(ctx.invocation.cwd ?? process.cwd());
+  const addonsDir = join21(workspace, ".indus", "addons");
+  let canonicalRoot;
+  let digest;
+  try {
+    canonicalRoot = realpathSync3(workspace);
+    digest = hashAddonTree(addonsDir);
+  } catch (error) {
+    process.stderr.write(`Project addons blocked: ${error instanceof Error ? error.message : String(error)}
+`);
+    return host.loadAll({ explicitPaths: [] });
+  }
+  if (digest === null) return host.loadAll({ explicitPaths: [] });
+  const trustPath = join21(ctx.workspace.profileDir, TRUST_FILE);
+  const approvedNow = ctx.invocation.flags["trust-project-addons"] === true;
+  let trusted = false;
+  try {
+    const store = readTrustStore(trustPath);
+    trusted = store.projects.some((record) => record.root === canonicalRoot && record.digest === digest);
+    if (!trusted && approvedNow) {
+      persistTrust(trustPath, canonicalRoot, digest);
+      trusted = true;
+    }
+  } catch (error) {
+    process.stderr.write(`Project addons blocked: ${error instanceof Error ? error.message : String(error)}
+`);
+    return host.loadAll({ explicitPaths: [] });
+  }
+  if (!trusted) {
+    process.stderr.write(
+      `Project addons are disabled until explicitly trusted for this exact content. Re-run with --trust-project-addons to approve ${canonicalRoot}.
+`
+    );
+    return host.loadAll({ explicitPaths: [] });
+  }
+  return host.loadAll({ workspace: canonicalRoot });
 }
 function wrapToolsWithAddons(tools, bundle) {
   const chain = bundle.interceptors;
@@ -16035,12 +16817,107 @@ function concatAddonTools(deck, bundle) {
   return fresh.length === 0 ? deck : [...deck, ...fresh];
 }
 
+// src/boot/runners/benchmark-integrity.ts
+import { appendFileSync } from "node:fs";
+import path4 from "node:path";
+var GUARDED_TOOLS = /* @__PURE__ */ new Set(["read", "write", "edit", "grep", "find", "ls", "bash"]);
+var PATH_KEYS = /* @__PURE__ */ new Set(["path", "file", "file_path", "directory", "dir", "cwd", "search_path"]);
+var FORBIDDEN_ABSOLUTE = [
+  "/tests",
+  "/solution",
+  "/solutions",
+  "/reference",
+  "/reference_solution",
+  "/reference-solutions",
+  "/reward.txt",
+  "/rewards",
+  "/grader",
+  "/verifier"
+];
+var FORBIDDEN_BASENAMES = /* @__PURE__ */ new Set([
+  "solution.sh",
+  "solve.sh",
+  "reward.txt",
+  "expected_answer.txt",
+  "expected_output.txt"
+]);
+function normalizeCandidate(value, cwd) {
+  return path4.resolve(cwd, value);
+}
+function forbiddenPath(value, cwd) {
+  const resolved = normalizeCandidate(value, cwd);
+  const base = path4.basename(resolved).toLowerCase();
+  if (FORBIDDEN_BASENAMES.has(base)) return true;
+  return FORBIDDEN_ABSOLUTE.some((prefix) => resolved === prefix || resolved.startsWith(`${prefix}/`));
+}
+function pathValues(args) {
+  if (args === null || typeof args !== "object" || Array.isArray(args)) return [];
+  const values = [];
+  for (const [key, value] of Object.entries(args)) {
+    if (PATH_KEYS.has(key) && typeof value === "string") values.push(value);
+  }
+  return values;
+}
+function forbiddenShell(command, cwd) {
+  const lower = command.toLowerCase();
+  if ([...FORBIDDEN_BASENAMES].some((name) => lower.includes(name))) return true;
+  if (FORBIDDEN_ABSOLUTE.some((prefix) => new RegExp(`(^|[\\s'"=])${prefix.replaceAll("/", "\\/")}(?:[/\\s'";|&]|$)`, "i").test(command))) return true;
+  if (/(^|[\s'"=])\.\.\/(?:tests|solutions?|reference(?:[-_]solutions?)?|grader|verifier)(?:[/\s'";|&]|$)/i.test(command)) return true;
+  if (/\b(?:find|ls|grep|rg)\s+(?:-[^\s]+\s+)*\/(?:\s|$)/i.test(command)) return true;
+  const retrievesOnline = /\b(?:curl|wget|git\s+clone|gh\s+repo\s+clone)\b/i.test(command);
+  const benchmarkMaterial = /terminal[-_ ]bench|reference[-_ ]solution|solution\.sh|solve\.sh|benchmark[-_ ]solution/i.test(command);
+  if (retrievesOnline && benchmarkMaterial) return true;
+  return false;
+}
+function denialReason(tool, args, cwd) {
+  if (tool === "bash") {
+    const command = typeof args?.command === "string" ? args.command : "";
+    if (forbiddenShell(command, cwd)) return "Terminal-Bench integrity guard blocked benchmark-owned or solution material.";
+    return void 0;
+  }
+  if (pathValues(args).some((candidate) => forbiddenPath(candidate, cwd))) {
+    return "Terminal-Bench integrity guard blocked benchmark-owned or solution material.";
+  }
+  return void 0;
+}
+function recordDenial(tool, callId, reason, env2) {
+  const auditPath = env2.INDUSAGI_BENCHMARK_AUDIT_LOG ?? "/logs/agent/integrity-denials.jsonl";
+  try {
+    appendFileSync(auditPath, `${JSON.stringify({ type: "integrity_denial", tool, call_id: callId, reason })}
+`, { encoding: "utf8" });
+  } catch {
+  }
+}
+function wrapOne2(tool, cwd, env2) {
+  const execute = tool.execute.bind(tool);
+  return {
+    ...tool,
+    async execute(callId, args, signal, onUpdate) {
+      const reason = denialReason(tool.name, args, cwd);
+      if (reason !== void 0) {
+        recordDenial(tool.name, callId, reason, env2);
+        return {
+          content: [{ type: "text", text: reason }],
+          details: void 0,
+          isError: true
+        };
+      }
+      return execute(callId, args, signal, onUpdate);
+    }
+  };
+}
+function wrapToolsForTerminalBench(tools, cwd, env2 = process.env) {
+  if (env2.INDUSAGI_BENCHMARK_PROFILE !== "terminal-bench") return tools;
+  return tools.map((tool) => GUARDED_TOOLS.has(tool.name) ? wrapOne2(tool, cwd, env2) : tool);
+}
+
 // src/boot/runners/session.ts
 function authenticatedProviders(ctx) {
   try {
-    const path4 = ctx.workspace.authPath;
-    if (!existsSync9(path4)) return [];
-    const data = JSON.parse(readFileSync17(path4, "utf8"));
+    const path5 = ctx.workspace.authPath;
+    const raw = readPrivateFileSync(path5);
+    if (raw === null) return [];
+    const data = JSON.parse(raw);
     return Object.keys(data).filter((id) => {
       const accounts = data[id];
       return id.length > 0 && accounts !== null && typeof accounts === "object" && Object.keys(accounts).length > 0;
@@ -16118,9 +16995,9 @@ var PROVIDER_ENV = {
 };
 function primeProviderEnv(ctx) {
   try {
-    const path4 = ctx.workspace.authPath;
-    if (!existsSync9(path4)) return;
-    const data = JSON.parse(readFileSync17(path4, "utf8"));
+    const path5 = ctx.workspace.authPath;
+    if (!existsSync8(path5)) return;
+    const data = JSON.parse(readFileSync17(path5, "utf8"));
     for (const [provider, accounts] of Object.entries(data)) {
       if (provider.startsWith("_") || accounts === null || typeof accounts !== "object") continue;
       const envVar = PROVIDER_ENV[provider];
@@ -16158,13 +17035,13 @@ function buildKeyResolver(ctx, vault, requestedAccount) {
     }
   };
 }
-var THINKING_LEVELS = /* @__PURE__ */ new Set(["off", "minimal", "low", "medium", "high", "xhigh"]);
-function resolveThinkingLevel(raw) {
-  return raw !== void 0 && THINKING_LEVELS.has(raw) ? raw : void 0;
+var THINKING_LEVELS = /* @__PURE__ */ new Set(["off", "minimal", "low", "medium", "high", "xhigh", "max"]);
+function resolveThinkingLevel(raw, modelId) {
+  return raw !== void 0 && THINKING_LEVELS.has(raw) && isReasoningEffortSupported(modelId, raw) ? raw : void 0;
 }
 function resolveText(value) {
   try {
-    if (existsSync9(value)) return readFileSync17(value, "utf8");
+    if (existsSync8(value)) return readFileSync17(value, "utf8");
   } catch {
   }
   return value;
@@ -16173,7 +17050,7 @@ var PROFILE_DIR2 = ".indusagi";
 function skillRoots2(cwd) {
   return [
     { dir: join22(cwd, PROFILE_DIR2, "skills"), origin: "project" },
-    { dir: join22(homedir11(), PROFILE_DIR2, "skills"), origin: "user" }
+    { dir: join22(homedir10(), PROFILE_DIR2, "skills"), origin: "user" }
   ];
 }
 function gatherModelSkills(cwd) {
@@ -16204,8 +17081,9 @@ function selectTools(cwd, inv, runner, memoryStore, checkpoint, workflowRunner)
   return visible.filter((tool) => allow.has(canon2(tool.name)));
 }
 function composeSystem(tools, inv, cwd, skills = [], memoryDoc) {
+  const approvedExternalPaths = Array.isArray(inv.flags["allow-context-import"]) ? inv.flags["allow-context-import"].filter((path5) => typeof path5 === "string").map((path5) => isAbsolute6(path5) ? path5 : resolve10(cwd, path5)) : [];
   const contextDocs = [
-    ...gatherContextDocs(cwd, homedir11()),
+    ...gatherContextDocs(cwd, homedir10(), { approvedExternalPaths }),
     ...memoryDoc ? [memoryDoc] : []
   ];
   let base = inv.system !== void 0 ? resolveText(inv.system) : composeBriefing({ tools, contextDocs, skills });
@@ -16297,9 +17175,9 @@ async function loadMcpTools(inv, cwd) {
   console.error = () => {
   };
   try {
-    for (const path4 of paths) {
+    for (const path5 of paths) {
       try {
-        const servers = loadMCPConfig2(path4);
+        const servers = loadMCPConfig2(path5);
         if (servers.length === 0) continue;
         const pool = new MCPClientPool2({ servers });
         await pool.connectAll();
@@ -16331,7 +17209,8 @@ var condenseTranscript = async (messages, opts) => {
   const deps = model ? {
     model,
     ...opts?.apiKey !== void 0 ? { apiKey: opts.apiKey } : {},
-    ...opts?.signal !== void 0 ? { signal: opts.signal } : {}
+    ...opts?.signal !== void 0 ? { signal: opts.signal } : {},
+    ...opts?.instructions !== void 0 ? { instructions: opts.instructions } : {}
   } : {};
   const cleared = clearStaleToolResults(messages);
   if (opts?.force) {
@@ -16371,7 +17250,7 @@ function resolveDefaultMode(store) {
     const mode = tier.permissions?.defaultMode;
     if (mode !== void 0 && isPermissionMode(mode)) return mode;
   }
-  return "default";
+  return "acceptEdits";
 }
 function readOnlyNamesFromDeck(tools) {
   const names = /* @__PURE__ */ new Set();
@@ -16458,10 +17337,13 @@ async function buildSessionConductor(ctx) {
       basePath: typeof inv.sarvamBasePath === "string" ? inv.sarvamBasePath : typeof inv.flags?.["sarvam-base-path"] === "string" ? inv.flags["sarvam-base-path"] : void 0
     })
   ];
-  const tools = wrapToolsWithAddons(concatAddonTools(deck, addons), addons);
+  const tools = wrapToolsForTerminalBench(
+    wrapToolsWithAddons(concatAddonTools(deck, addons), addons),
+    cwd
+  );
   const skills = gatherModelSkills(cwd);
   const system = composeSystem(tools, inv, cwd, skills, memoryDoc);
-  const thinking = resolveThinkingLevel(inv.thinking);
+  const thinking = resolveThinkingLevel(inv.thinking, modelId);
   const fallbackModelId = inv.fallbackModelId;
   const planReachable = inv.mode === "repl";
   const canUseTool = buildPermissionGate(permissionRules, permissionMode, tools, planReachable);
@@ -16807,7 +17689,7 @@ function isProgramEntry() {
   const entryArg = processArgv[1];
   if (!entryArg) return false;
   try {
-    return realpathSync3(fileURLToPath2(import.meta.url)) === realpathSync3(entryArg);
+    return realpathSync4(fileURLToPath2(import.meta.url)) === realpathSync4(entryArg);
   } catch {
     return false;
   }