negotium 0.23.1 → 0.23.3

package/dist/main.js

@@ -1503,9 +1503,14 @@ function agentAliases(agent) {
       return [
         "codex",
         "\uCF54\uB371\uC2A4",
+        "astra",
+        "sol",
+        "luna",
+        "terra",
         "gpt-6-luna",
         "gpt-6-sol",
         "gpt-5.6-luna",
+        "gpt-6.1-terra",
         "gpt-5.6-terra",
         "gpt-5.6-sol",
         "gpt-6-astra"
@@ -1533,7 +1538,7 @@ function hasExplicitAgentSwitchRequest(prompt, agent) {
   if (!prompt?.trim())
     return false;
   const text = prompt.toLowerCase().replace(/\s+/g, " ").trim();
-  const target = `(?:${agentAliases(agent).map(escapeRegExp).join("|")})`;
+  const target = `(?<![A-Za-z0-9_-])(?:${agentAliases(agent).map(escapeRegExp).join("|")})(?![A-Za-z0-9_-])`;
   const switchVerb = "(?:\uBC14\uAFD4|\uBC14\uAFD4\uC918|\uBCC0\uACBD|\uBCC0\uACBD\uD574|\uC804\uD658|\uC804\uD658\uD574|\uC124\uC815|\uC124\uC815\uD574|\uC368\uC918|\uC0AC\uC6A9|\uAC00|switch|change|set|use)";
   const switchSubject = "(?:agent|runtime|model|\uC5D0\uC774\uC804\uD2B8|\uB7F0\uD0C0\uC784|\uBAA8\uB378)";
   return [
@@ -6559,7 +6564,7 @@ var exports_version = {};
 __export(exports_version, {
   NEGOTIUM_VERSION: () => NEGOTIUM_VERSION
 });
-var NEGOTIUM_VERSION = "0.23.1";
+var NEGOTIUM_VERSION = "0.23.3";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 import { spawn as spawn2 } from "child_process";
@@ -6575,9 +6580,22 @@ import {
   unlinkSync as unlinkSync5,
   writeFileSync as writeFileSync4
 } from "fs";
-import { createRequire as createRequire2 } from "module";
 import { tmpdir } from "os";
 import { dirname as dirname7, join as join9 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
+function findPackageJson(specifier, searchFromDir) {
+  let dir = searchFromDir;
+  for (;; ) {
+    const candidate = join9(dir, "node_modules", specifier, "package.json");
+    if (existsSync7(candidate))
+      return candidate;
+    const parent = dirname7(dir);
+    if (parent === dir) {
+      throw new Error(`Could not locate node_modules/${specifier} starting from ${searchFromDir}`);
+    }
+    dir = parent;
+  }
+}
 function readPackageVersion(packageJsonPath) {
   const parsed = JSON.parse(readFileSync5(packageJsonPath, "utf8"));
   if (typeof parsed.version !== "string" || !parsed.version.trim()) {
@@ -6802,12 +6820,11 @@ function writeCodexCatalogWithNativeMultiAgentDisabled(authFilePath, sourcePath)
   writePrivateFileAtomic(outputPath, contents);
   return outputPath;
 }
-var moduleRequire, codexSdkPackagePath, codexSdkRequire, bundledCodexPackagePath, BUNDLED_CODEX_VERSION, SAFE_BUNDLED_CODEX_VERSION, NEGOTIUM_MODEL_CACHE, NEGOTIUM_MODEL_CATALOG, CODEX_BOOTSTRAP_EXIT_WAIT_MS = 3000;
+var thisModuleDir, codexSdkPackagePath, bundledCodexPackagePath, BUNDLED_CODEX_VERSION, SAFE_BUNDLED_CODEX_VERSION, NEGOTIUM_MODEL_CACHE, NEGOTIUM_MODEL_CATALOG, CODEX_BOOTSTRAP_EXIT_WAIT_MS = 3000;
 var init_codex_native_multi_agent = __esm(() => {
-  moduleRequire = createRequire2(import.meta.url);
-  codexSdkPackagePath = moduleRequire.resolve("@openai/codex-sdk/package.json");
-  codexSdkRequire = createRequire2(codexSdkPackagePath);
-  bundledCodexPackagePath = codexSdkRequire.resolve("@openai/codex/package.json");
+  thisModuleDir = dirname7(fileURLToPath2(import.meta.url));
+  codexSdkPackagePath = findPackageJson("@openai/codex-sdk", thisModuleDir);
+  bundledCodexPackagePath = findPackageJson("@openai/codex", dirname7(codexSdkPackagePath));
   BUNDLED_CODEX_VERSION = readPackageVersion(bundledCodexPackagePath);
   SAFE_BUNDLED_CODEX_VERSION = BUNDLED_CODEX_VERSION.replace(/[^a-zA-Z0-9._-]/g, "_");
   NEGOTIUM_MODEL_CACHE = `negotium-models-cache-${SAFE_BUNDLED_CODEX_VERSION}.json`;
@@ -6951,7 +6968,7 @@ var init_codex_registry = __esm(async () => {
   VALID_EFFORTS2 = new Set(CODEX_EFFORT_VALUES);
   codexRegistry = {
     kind: "codex",
-    defaultModel: "gpt-6-luna",
+    defaultModel: "luna",
     expandModelAlias(s) {
       return s;
     },
@@ -8308,6 +8325,76 @@ var init_claude_provider = __esm(async () => {
   claudeProcessExitListeners = new WeakMap;
 });
 
+// ../../packages/core/src/agents/codex-tier-resolver.ts
+function codexTiersFromCache(cache) {
+  const result = {};
+  const priorities = {};
+  if (!cache || typeof cache !== "object" || !("models" in cache))
+    return result;
+  const models = cache.models;
+  if (!Array.isArray(models))
+    return result;
+  for (const model of models) {
+    if (!model || typeof model !== "object")
+      continue;
+    const { slug, visibility, priority } = model;
+    if (typeof slug !== "string" || visibility !== "list")
+      continue;
+    if (typeof priority !== "number" || !Number.isFinite(priority))
+      continue;
+    const suffix = slug.slice(slug.lastIndexOf("-") + 1);
+    if (!Object.hasOwn(CODEX_TIER_FALLBACKS, suffix))
+      continue;
+    const tier = suffix;
+    if (priorities[tier] === undefined || priority < priorities[tier]) {
+      priorities[tier] = priority;
+      result[tier] = slug;
+    }
+  }
+  return result;
+}
+function resolveCodexTierModel(tier, cachePath = process.env.NEGOTIUM_CODEX_MODELS_CACHE_FILE ?? bundledCodexModelCachePath(hostedCodexAuthFilePath())) {
+  try {
+    const selected = codexTiersFromCache(readCompatibleCodexModelCache(cachePath).parsed)[tier];
+    if (selected) {
+      if (!pricedSlugs.has(selected) && !warnedUnpricedSlugs.has(selected)) {
+        warnedUnpricedSlugs.add(selected);
+        logger.warn({ tier, model: selected }, "Codex tier model has no token-stats price");
+      }
+      return selected;
+    }
+  } catch (error) {
+    if (!warnedCachePaths.has(cachePath)) {
+      warnedCachePaths.add(cachePath);
+      logger.warn({ err: error, cachePath }, "Codex tier cache unavailable; using fallback ids");
+    }
+  }
+  return CODEX_TIER_FALLBACKS[tier];
+}
+var CODEX_TIER_FALLBACKS, warnedCachePaths, warnedUnpricedSlugs, pricedSlugs;
+var init_codex_tier_resolver = __esm(async () => {
+  init_codex_native_multi_agent();
+  init_logger();
+  await init_execution_host();
+  CODEX_TIER_FALLBACKS = {
+    astra: "gpt-6-astra",
+    sol: "gpt-6-sol",
+    luna: "gpt-6-luna",
+    terra: "gpt-6.1-terra"
+  };
+  warnedCachePaths = new Set;
+  warnedUnpricedSlugs = new Set;
+  pricedSlugs = new Set([
+    "gpt-6-astra",
+    "gpt-6-sol",
+    "gpt-6-luna",
+    "gpt-6.1-terra",
+    "gpt-5.6-sol",
+    "gpt-5.6-luna",
+    "gpt-5.6-terra"
+  ]);
+});
+
 // ../../packages/core/src/agents/codex-windows-wrapper.ts
 import { execFile } from "child_process";
 import { createHash as createHash4, randomUUID as randomUUID5 } from "crypto";
@@ -8471,7 +8558,7 @@ import { chmod, copyFile, mkdtemp, rm as rm2, writeFile as writeFile2 } from "fs
 import { createServer } from "net";
 import { tmpdir as tmpdir2 } from "os";
 import { dirname as dirname10, join as join15, resolve as resolve8 } from "path";
-import { fileURLToPath as fileURLToPath2 } from "url";
+import { fileURLToPath as fileURLToPath3 } from "url";
 function evaluateCodexVaultPreToolUse(input, userId, operations) {
   if (operations.referencesSensitiveStorage(input.tool_input)) {
     return {
@@ -8499,7 +8586,7 @@ function shellQuote(value) {
   return `'${value.replaceAll("'", `'"'"'`)}'`;
 }
 function hookClientPath() {
-  const moduleDir = dirname10(fileURLToPath2(import.meta.url));
+  const moduleDir = dirname10(fileURLToPath3(import.meta.url));
   const adjacent = resolve8(moduleDir, "codex-vault-hook.mjs");
   if (existsSync15(adjacent))
     return adjacent;
@@ -9568,6 +9655,7 @@ async function* codexProvider(opts) {
     ...codexEnvironment ? { env: codexEnvironment } : {},
     config: {
       agents: { enabled: false },
+      tools: { update_plan: { enabled: false } },
       features: {
         hooks: true,
         goals: false,
@@ -9591,7 +9679,9 @@ async function* codexProvider(opts) {
       webSearchMode: "disabled",
       webSearchEnabled: false
     } : {},
-    ...opts.model ? { model: opts.model } : {},
+    ...opts.model ? {
+      model: Object.hasOwn(CODEX_TIER_FALLBACKS, opts.model) ? resolveCodexTierModel(opts.model) : opts.model
+    } : {},
     ...opts.effort ? { modelReasoningEffort: mapEffort(opts.effort) } : {}
   };
   let currentSessionId = opts.sessionId;
@@ -9853,6 +9943,7 @@ var init_codex_provider = __esm(async () => {
   init_file_events();
   init_logger();
   await __promiseAll([
+    init_codex_tier_resolver(),
     init_codex_vault_hook_bridge(),
     init_execution_host(),
     init_codex(),
@@ -12025,10 +12116,13 @@ __export(exports_model_catalog, {
   FALLBACK_ORDER: () => FALLBACK_ORDER,
   AGENT_DISPLAY_NAME: () => AGENT_DISPLAY_NAME
 });
+function canonicalModelCasing() {
+  return Object.fromEntries(SELECTABLE_MODELS.map((candidate) => [candidate.model.toLowerCase(), candidate.model]));
+}
 function canonicalModelId(value) {
   const trimmed = value.trim();
   const lower = trimmed.toLowerCase();
-  return SELECTABLE_MODEL_ALIASES[lower] ?? CANONICAL_MODEL_CASING[lower] ?? trimmed;
+  return SELECTABLE_MODEL_ALIASES[lower] ?? canonicalModelCasing()[lower] ?? trimmed;
 }
 function formatSelectableModel(candidate) {
   const tier = `${candidate.intelligenceTier[0].toUpperCase()}${candidate.intelligenceTier.slice(1)}`;
@@ -12073,7 +12167,7 @@ function resolveModelForAgent(agent, requested, registry) {
   return registry.validateModel(candidate) ? candidate : defaultModel;
 }
 function resolveWorkerDefaultModel(agent, registry) {
-  return agent === "codex" ? "gpt-5.6-terra" : registry.defaultModel;
+  return agent === "codex" ? "terra" : registry.defaultModel;
 }
 function resolveWorkerModel(agent, requested, registry) {
   const workerDefault = resolveWorkerDefaultModel(agent, registry);
@@ -12090,7 +12184,7 @@ function resolveCompactionExecution(agent, registry) {
   const effort = registry.validateEffort("medium") ? "medium" : registry.defaultEffort;
   return { model, ...effort ? { effort } : {} };
 }
-var MODEL_OWNER, MODEL_COST_RESEARCHED_AT = "2026-09-05", MODEL_COST_ROUTING_SUMMARY = "Cost basis (2026-09-05): Codex Pro 20x and Claude Max 20x are each $200/month; Maestro models are pay-per-token. DeepSeek Flash is cheapest. gpt-6-astra and Claude Fable 5.1 are the newest flagships, both priced at $10/M input / $50/M output.", CODEX_PRO_20X_COST = "ChatGPT Pro 20x subscription: $200/month", CODEX_COMMUNITY_WEEKLY = "Community plan-level observation: roughly 2\u20134B raw/cached tokens per week; fresh-input equivalent is much lower and unstable (low confidence)", CLAUDE_MAX_20X_COST = "Claude Max 20x subscription: $200/month", CLAUDE_COMMUNITY_SESSION = "Community observations vary from roughly 220\u2013250K locally displayed tokens per 5-hour session to billions of cache-heavy raw tokens per week; calibrated reports value a full weekly allowance around $680\u2013$1,900 at API rates. Recent heavy-model reports reach the weekly cap after about 4\u20135 full sessions (low confidence; not a token cap)", SELECTABLE_MODELS, SELECTABLE_MODEL_ALIASES, CANONICAL_MODEL_CASING, FALLBACK_ORDER, AGENT_DISPLAY_NAME;
+var MODEL_OWNER, MODEL_COST_RESEARCHED_AT = "2026-09-05", MODEL_COST_ROUTING_SUMMARY = "Cost basis (2026-09-05): Codex Pro 20x and Claude Max 20x are each $200/month; Maestro models are pay-per-token. DeepSeek Flash is cheapest. gpt-6-astra and Claude Fable 5.1 are the newest flagships, both priced at $10/M input / $50/M output.", CODEX_PRO_20X_COST = "ChatGPT Pro 20x subscription: $200/month", CODEX_COMMUNITY_WEEKLY = "Community plan-level observation: roughly 2\u20134B raw/cached tokens per week; fresh-input equivalent is much lower and unstable (low confidence)", CLAUDE_MAX_20X_COST = "Claude Max 20x subscription: $200/month", CLAUDE_COMMUNITY_SESSION = "Community observations vary from roughly 220\u2013250K locally displayed tokens per 5-hour session to billions of cache-heavy raw tokens per week; calibrated reports value a full weekly allowance around $680\u2013$1,900 at API rates. Recent heavy-model reports reach the weekly cap after about 4\u20135 full sessions (low confidence; not a token cap)", SELECTABLE_MODELS, SELECTABLE_MODEL_ALIASES, FALLBACK_ORDER, AGENT_DISPLAY_NAME;
 var init_model_catalog = __esm(() => {
   init_config();
   MODEL_OWNER = {
@@ -12098,9 +12192,14 @@ var init_model_catalog = __esm(() => {
     opus: "claude",
     haiku: "claude",
     fable: "claude",
+    astra: "codex",
+    sol: "codex",
+    luna: "codex",
+    terra: "codex",
     "gpt-6-astra": "codex",
     "gpt-6-sol": "codex",
     "gpt-6-luna": "codex",
+    "gpt-6.1-terra": "codex",
     "gpt-5.6-luna": "codex",
     "gpt-5.6-terra": "codex",
     "gpt-5.6-sol": "codex",
@@ -12121,7 +12220,7 @@ var init_model_catalog = __esm(() => {
   };
   SELECTABLE_MODELS = [
     {
-      model: "gpt-6-astra",
+      model: "astra",
       agent: "codex",
       description: "Newest OpenAI flagship; Codex's highest-capability route.",
       intelligenceTier: "fable",
@@ -12131,7 +12230,7 @@ var init_model_catalog = __esm(() => {
       estimatedUsage: `Released 2026-09-03; became Codex CLI's bundled default in v0.153.4 (2026-09-05). Local message-count/quota-weight ranges not yet published as of the last catalog check \u2014 expect a quota weight above gpt-6-sol given the higher per-token cost. ${CODEX_COMMUNITY_WEEKLY}`
     },
     {
-      model: "gpt-6-sol",
+      model: "sol",
       agent: "codex",
       description: "GPT-6 generation Sol route (2026-09-22) for demanding coding and agentic work.",
       intelligenceTier: "opus",
@@ -12141,7 +12240,7 @@ var init_model_catalog = __esm(() => {
       estimatedUsage: `Released 2026-09-22; local message-count/quota-weight ranges not yet published. ${CODEX_COMMUNITY_WEEKLY}`
     },
     {
-      model: "gpt-6-luna",
+      model: "luna",
       agent: "codex",
       description: "Default Codex route (GPT-6 Luna, 2026-09-22): fast, high-volume, lowest cost.",
       intelligenceTier: "sonnet",
@@ -12151,14 +12250,14 @@ var init_model_catalog = __esm(() => {
       estimatedUsage: `Released 2026-09-22; local message-count/quota-weight ranges not yet published. ${CODEX_COMMUNITY_WEEKLY}`
     },
     {
-      model: "gpt-5.6-terra",
+      model: "terra",
       agent: "codex",
-      description: "High-capability Codex route for complex coding and reasoning.",
+      description: "GPT-6.1 Terra route (2026-10-26) for complex coding, visual reasoning, and computer use.",
       intelligenceTier: "opus",
-      routingSummary: "complex coding and reasoning; 2.5x Codex quota cost",
+      routingSummary: "capable coding and computer use at a lower cost than GPT-5.6 Terra",
       accessCost: CODEX_PRO_20X_COST,
-      marginalTokenCost: "Codex credits: $2.50/M uncached input, $0.25/M cached input, $15/M output",
-      estimatedUsage: `Official Pro 20x range: 400\u20132,200 local messages per 5 hours; quota weight 2.5x the retired GPT-5.6 Luna. ${CODEX_COMMUNITY_WEEKLY}`
+      marginalTokenCost: "Codex credits (OpenAI API rate): $1/M uncached input, $0.05/M cached input, $5/M output",
+      estimatedUsage: `Released 2026-10-26; local message-count/quota-weight ranges not yet published. ${CODEX_COMMUNITY_WEEKLY}`
     },
     {
       model: "fable",
@@ -12252,8 +12351,13 @@ var init_model_catalog = __esm(() => {
     }
   ];
   SELECTABLE_MODEL_ALIASES = {
-    "gpt-5.6-sol": "gpt-6-sol",
-    "gpt-5.6-luna": "gpt-6-luna",
+    "gpt-6-astra": "astra",
+    "gpt-5.6-sol": "sol",
+    "gpt-6-sol": "sol",
+    "gpt-5.6-luna": "luna",
+    "gpt-6-luna": "luna",
+    "gpt-5.6-terra": "terra",
+    "gpt-6.1-terra": "terra",
     kimi: "kimi-k3",
     "kimi-pro": "kimi-k3",
     "kimi-code": "kimi-k2.7-code",
@@ -12261,18 +12365,17 @@ var init_model_catalog = __esm(() => {
     "glm-pro": "glm-5.3",
     "glm-flash": "glm-5.3-flash"
   };
-  CANONICAL_MODEL_CASING = Object.fromEntries(SELECTABLE_MODELS.map((candidate) => [candidate.model.toLowerCase(), candidate.model]));
   FALLBACK_ORDER = {
     claude: [
       { agent: "maestro", model: "deepseek-pro" },
-      { agent: "codex", model: "gpt-6-luna" }
+      { agent: "codex", model: "luna" }
     ],
     codex: [
       { agent: "maestro", model: "deepseek-pro" },
       { agent: "claude", model: "sonnet" }
     ],
     maestro: [
-      { agent: "codex", model: "gpt-6-luna" },
+      { agent: "codex", model: "luna" },
       { agent: "claude", model: "sonnet" }
     ]
   };
@@ -16400,6 +16503,7 @@ var init_token_stats = __esm(async () => {
     "codex:gpt-6-astra": { input: 10, cacheWrite: 12.5, cacheRead: 1, output: 50 },
     "codex:gpt-6-sol": { input: 2, cacheRead: 0.2, output: 10 },
     "codex:gpt-6-luna": { input: 0.1, cacheRead: 0.01, output: 0.5 },
+    "codex:gpt-6.1-terra": { input: 1, cacheRead: 0.05, output: 5 },
     "codex:gpt-5.6-sol": { input: 5, cacheRead: 0.5, output: 30 },
     "codex:gpt-5.6-terra": { input: 2.5, cacheRead: 0.25, output: 15 },
     "codex:gpt-5.6-luna": { input: 1, cacheRead: 0.1, output: 6 },
@@ -21603,12 +21707,13 @@ async function runTurnEventStream(topicId, topicTitle, queryId, events, control,
   const toolSummaryOptions = {
     cwd: control.injectParams?.cwd ?? workspaceCwdFor(topicId)
   };
+  const pricedModel = agentType === "codex" && Object.hasOwn(CODEX_TIER_FALLBACKS, model) ? resolveCodexTierModel(model) : model;
   const recordEventUsage = (usage) => {
     recordUsage(userId, topicTitle, usage, {
       topicId,
       ...control.sessionId ? { providerSessionId: control.sessionId } : {},
       agent: agentType,
-      model
+      model: pricedModel
     });
   };
   const broadcastContextProgress = (force = false) => {
@@ -22190,6 +22295,7 @@ var init_turn_event_stream = __esm(async () => {
   init_usage_alert();
   init_sensitive_path();
   await __promiseAll([
+    init_codex_tier_resolver(),
     init_fork(),
     init_idle_archiver(),
     init_idle_compact(),
@@ -38114,7 +38220,7 @@ var init_scheduler = __esm(async () => {
 
 // ../../packages/module-cron/src/module.ts
 import { existsSync as existsSync36 } from "fs";
-import { fileURLToPath as fileURLToPath3 } from "url";
+import { fileURLToPath as fileURLToPath4 } from "url";
 function envMs(name, fallback) {
   const parsed = Number.parseInt(process.env[name] ?? "", 10);
   return Number.isFinite(parsed) && parsed > 0 ? parsed : fallback;
@@ -38243,8 +38349,8 @@ var init_module = __esm(async () => {
     init_scripts(),
     init_store()
   ]);
-  SOURCE_MCP_SERVER_FILE = fileURLToPath3(new URL("./mcp-server.ts", import.meta.url));
-  PACKAGED_MCP_SERVER_FILE = fileURLToPath3(new URL("./runtime/cron/mcp-server.ts", import.meta.url));
+  SOURCE_MCP_SERVER_FILE = fileURLToPath4(new URL("./mcp-server.ts", import.meta.url));
+  PACKAGED_MCP_SERVER_FILE = fileURLToPath4(new URL("./runtime/cron/mcp-server.ts", import.meta.url));
 });
 
 // ../../packages/module-cron/src/summarize.ts
@@ -41921,6 +42027,7 @@ function createInitialState(userId) {
     topicUsage: {},
     messageHistory: {},
     activity: {},
+    unread: {},
     input: "",
     inputCursor: { row: 0, col: 0 },
     suggestionIndex: 0,
@@ -42157,11 +42264,12 @@ function sortedTopicEntries(state, entries) {
 function topicPickerItems(state) {
   const visible = visibleTopicPickerIds(state);
   const indexedTopics = state.topics.map((topic, index) => ({ topic, index })).filter(({ topic }) => visible.has(topic.id));
-  const managerEntries = sortedTopicEntries(state, indexedTopics.filter(({ topic }) => topic.kind === "manager"));
-  const regularEntries = sortedTopicEntries(state, indexedTopics.filter(({ topic }) => topic.kind !== "manager"));
   return [
-    ...managerEntries.map(({ topic, index }) => ({ kind: "topic", id: topic.id, index })),
-    ...regularEntries.map(({ topic, index }) => ({ kind: "topic", id: topic.id, index })),
+    ...managerFirstTopicEntries(state, indexedTopics).map(({ topic, index }) => ({
+      kind: "topic",
+      id: topic.id,
+      index
+    })),
     ...visibleBackgroundSessions(state).map((session) => ({
       kind: "background",
       id: session.id
@@ -42237,6 +42345,7 @@ function setTopics(state, topics, preferredTitle) {
     ...state,
     topics: orderedTopics,
     activity,
+    unread: withoutUnread(state.unread, nextActive),
     activeTopicId: nextActive,
     scrollOffset: nextActive === state.activeTopicId ? state.scrollOffset : 0,
     askChoiceIndex: nextActive === state.activeTopicId ? state.askChoiceIndex : 0,
@@ -42244,11 +42353,32 @@ function setTopics(state, topics, preferredTitle) {
     topicPickerBackgroundId: state.topicPickerBackgroundId
   });
 }
+function withoutUnread(unread, topicId) {
+  if (topicId === null || !unread[topicId])
+    return unread;
+  const next = { ...unread };
+  delete next[topicId];
+  return next;
+}
+function managerFirstTopicEntries(state, entries) {
+  return [
+    ...sortedTopicEntries(state, entries.filter(({ topic }) => topic.kind === "manager")),
+    ...sortedTopicEntries(state, entries.filter(({ topic }) => topic.kind !== "manager"))
+  ];
+}
+function adjacentTopicId(state, delta) {
+  const order = managerFirstTopicEntries(state, state.topics.map((topic) => ({ topic }))).map(({ topic }) => topic.id);
+  const current3 = order.indexOf(state.activeTopicId ?? "");
+  if (current3 < 0 || order.length < 2)
+    return null;
+  return order[(current3 + delta + order.length) % order.length] ?? null;
+}
 function selectTopic(state, topicId) {
   if (!state.topics.some((topic) => topic.id === topicId))
     return state;
   return {
     ...state,
+    unread: withoutUnread(state.unread, topicId),
     activeTopicId: topicId,
     scrollOffset: 0,
     askChoiceIndex: 0,
@@ -42336,6 +42466,11 @@ function removeMessage(state, topicId, messageId) {
     return state;
   return { ...state, messages: { ...state.messages, [topicId]: next } };
 }
+function flagUnreadReply(state, topicId, wasRunning) {
+  if (!wasRunning || topicId === state.activeTopicId)
+    return state;
+  return { ...state, unread: { ...state.unread, [topicId]: true } };
+}
 function activityFor(state, topicId) {
   return state.activity[topicId] ?? { running: false, tools: [] };
 }
@@ -42504,11 +42639,11 @@ function applyAiStatus(state, topicId, raw, createdAt) {
   if (kind === "ai_done") {
     if (isStaleTerminalStatus(current3, status))
       return state;
-    return setActivity(state, topicId, {
+    return flagUnreadReply(setActivity(state, topicId, {
       ...liveCurrent,
       running: false,
       status: "Done"
-    });
+    }), topicId, current3.running);
   }
   if (kind === "ai_aborted") {
     if (isStaleTerminalStatus(current3, status))
@@ -42522,12 +42657,12 @@ function applyAiStatus(state, topicId, raw, createdAt) {
   if (kind === "ai_error") {
     if (isStaleTerminalStatus(current3, status))
       return state;
-    return setActivity(state, topicId, {
+    return flagUnreadReply(setActivity(state, topicId, {
       ...liveCurrent,
       running: false,
       status: "Error",
       error: String(status.error ?? "Unknown error")
-    });
+    }), topicId, current3.running);
   }
   if (kind === "tool_call") {
     if (isStaleTerminalStatus(current3, status))
@@ -43895,6 +44030,8 @@ function topicStatusIndicator(state, topic, animationFrame) {
   if (state.activity[topic.id]?.running) {
     return { icon: workingFrame(animationFrame), fg: theme.green };
   }
+  if (state.unread[topic.id])
+    return { icon: "\u25CF", fg: theme.blue };
   return { icon: "\u25CB", fg: theme.muted };
 }
 function topicPanelRowLines(state, topic, topicIndex, animationFrame) {
@@ -44097,7 +44234,7 @@ function renderSideColumn(state, layout, bodyHeight, animationFrame) {
 function maxTopicsPanelScrollOffset(state, columns, rows) {
   const width = Math.max(1, columns);
   const height = Math.max(14, rows);
-  if (state.overlay)
+  if (state.overlay && state.overlay !== "background-session")
     return 0;
   const layout = terminalBodyLayout(state, width);
   if (!layout.showTopicsPanel)
@@ -44110,7 +44247,7 @@ function maxTopicsPanelScrollOffset(state, columns, rows) {
 function maxTaskPanelScrollOffset(state, columns, rows) {
   const width = Math.max(1, columns);
   const height = Math.max(14, rows);
-  if (state.overlay)
+  if (state.overlay && state.overlay !== "background-session")
     return 0;
   const layout = terminalBodyLayout(state, width);
   if (!layout.showTaskPanel)
@@ -44133,6 +44270,7 @@ function helpLines() {
     line("  Ctrl-R sort topics panel (activity / name) \xB7 drag a \u2502 divider to resize"),
     line("  Ctrl-T open/close a shell on the right (closing ends it) \xB7 click it to type"),
     line("  Ctrl-O topics \xB7 Ctrl-G subagents \xB7 Ctrl-D decisions \xB7 Ctrl-X abort"),
+    line("  Ctrl/Alt-\u2191 \u2193 step through topics \xB7 a blue \u25CF marks an unread reply"),
     line("  In topics: type to filter \xB7 Ctrl-N new \xB7 Ctrl-D delete"),
     line("  Esc/Ctrl-C stop active turn \xB7 Ctrl-C twice when idle to quit"),
     line(""),
@@ -45343,6 +45481,7 @@ var init_render = __esm(async () => {
     cyan: [87, 205, 220],
     tool: [196, 181, 253],
     green: [94, 211, 142],
+    blue: [96, 165, 250],
     diffAddBg: [18, 43, 32],
     amber: [241, 190, 91],
     red: [245, 116, 128],
@@ -48405,10 +48544,10 @@ class TerminalApp {
         this.#handleGraphMouse(event);
         continue;
       }
-      if (this.#handleSidePanelResizeDrag(event))
+      if (this.#handleSidePanelScrollbarDrag(event))
         continue;
       this.#focusPaneUnderPress(event);
-      if (this.#handleSidePanelScrollbarDrag(event))
+      if (this.#handleSidePanelResizeDrag(event))
         continue;
       if (this.#handlePickableRowMouse(event))
         continue;
@@ -48422,7 +48561,7 @@ class TerminalApp {
       this.#toggleTerminalPane();
       return;
     }
-    if (this.#state.terminalPaneFocused && this.#shell) {
+    if (this.#state.terminalPaneFocused && this.#shell && this.#terminalPane) {
       this.#shell.write(chunk);
       return;
     }
@@ -48459,6 +48598,29 @@ class TerminalApp {
       this.#toggleDecisionGraph();
       return;
     }
+    if (chunk === NEW_TOPIC_KEY && this.#sideColumnBounds !== null && !this.#state.creatingTopic) {
+      if (editingVaultSecret)
+        return;
+      if (composerHoldsSecret(this.#state) || activeQuestion(this.#state))
+        return;
+      if (this.#input.text) {
+        this.#state = {
+          ...this.#state,
+          notice: "Clear the message box first, then Ctrl-N to start a new topic",
+          noticeLevel: "warn"
+        };
+        this.#queueRender();
+        return;
+      }
+      this.#openNewTopicComposer();
+      return;
+    }
+    if (this.#state.overlay === null && (PREVIOUS_TOPIC_KEYS.has(chunk) || NEXT_TOPIC_KEYS.has(chunk))) {
+      const topicId = adjacentTopicId(this.#state, PREVIOUS_TOPIC_KEYS.has(chunk) ? -1 : 1);
+      if (topicId !== null)
+        this.#activateTopic(topicId);
+      return;
+    }
     if (chunk === "\x10") {
       if (editingVaultSecret)
         return;
@@ -48891,7 +49053,7 @@ class TerminalApp {
       notice: undefined,
       noticeLevel: undefined
     };
-    if (isKnownTerminalCommand(text3)) {
+    if (isKnownTerminalCommand(text3) || isVaultCommandLine(text3)) {
       await this.#runCommand(text3);
       return;
     }
@@ -50167,7 +50329,7 @@ class TerminalApp {
       await this.#client.stop();
   }
 }
-var KITTY_KEYBOARD_PUSH = "\x1B[>1u", KITTY_KEYBOARD_POP = "\x1B[<u", CANVAS_RGB, ENTER_ALT_SCREEN, EXIT_ALT_SCREEN, ABORT_ENTER_ALT_SCREEN, NEW_TOPIC_KEY = "\x0E", DELETE_TOPIC_KEY = "\x04", TERMINAL_PANE_KEY = "\x14", FILTER_BACKSPACE_KEYS, CONFIRM_KEYS, CANCEL_KEYS, INPUT_CARRY_FLUSH_MS = 15;
+var KITTY_KEYBOARD_PUSH = "\x1B[>1u", KITTY_KEYBOARD_POP = "\x1B[<u", CANVAS_RGB, ENTER_ALT_SCREEN, EXIT_ALT_SCREEN, ABORT_ENTER_ALT_SCREEN, NEW_TOPIC_KEY = "\x0E", DELETE_TOPIC_KEY = "\x04", TERMINAL_PANE_KEY = "\x14", PREVIOUS_TOPIC_KEYS, NEXT_TOPIC_KEYS, FILTER_BACKSPACE_KEYS, CONFIRM_KEYS, CANCEL_KEYS, INPUT_CARRY_FLUSH_MS = 15;
 var init_app = __esm(async () => {
   init_color_depth();
   init_commands();
@@ -50191,6 +50353,8 @@ var init_app = __esm(async () => {
   ENTER_ALT_SCREEN = altScreenSequences().enter;
   EXIT_ALT_SCREEN = altScreenSequences().exit;
   ABORT_ENTER_ALT_SCREEN = altScreenSequences().abortEnter;
+  PREVIOUS_TOPIC_KEYS = new Set(["\x1B[1;5A", "\x1B[1;3A", "\x1B\x1B[A"]);
+  NEXT_TOPIC_KEYS = new Set(["\x1B[1;5B", "\x1B[1;3B", "\x1B\x1B[B"]);
   FILTER_BACKSPACE_KEYS = new Set(["\x7F", "\b"]);
   CONFIRM_KEYS = new Set(["y", "\u315B"]);
   CANCEL_KEYS = new Set(["n", "\u315C"]);
@@ -60232,4 +60396,4 @@ switch (command) {
   }
 }
 
-//# debugId=3A2E1C01E70CD8A864756E2164756E21
+//# debugId=202F5FA265766A0464756E2164756E21