negotium 0.19.0 → 0.19.2

package/dist/mcp-factories.js

@@ -439,7 +439,7 @@ function resolveWhisperBackend() {
 function codexAuthFilePath() {
   return process.env.NEGOTIUM_CODEX_AUTH_FILE || join(process.env.CODEX_HOME || join(homedir(), ".codex"), "auth.json");
 }
-var HOME, PROJECT_ROOT, STATE_DIR, WORKSPACE_DIR, TOPIC_WORKSPACE_DIR, SHARED_WIKI_DIR, CRON_WORKSPACE_DIR, BROWSER_DIR, BROWSER_PROFILES_DIR, BINARIES_DIR, SECRETS_DIR, DM_WORKSPACE_DIR, SESSION_WORKSPACE_DIR, CLAUDE_EXECUTABLE_ENV, CLAUDE_EXECUTABLE, DEFAULT_OUTPUT_LANGUAGE = "English", BINARY_EXTENSION, BROWSER_RS_VERSION = "v0.6.0", BROWSER_RS_MIN_SECURE_VERSION = "0.2.1", BROWSER_RS_VERSION_PROBE_TIMEOUT_MS = 15000, SNIPPETS_API_URL, BROWSER_RS_BIN, BASH_RS_VERSION = "v0.1.10", BASH_RS_BIN, PLAYWRIGHT_MCP_BIN, TSX_BIN, TSX_LOADER_PATH, TSX_LOADER, TSCONFIG_PATH, SESSION_COMM_SERVER, TASK_SERVER, DECISION_SERVER, CANONICAL_MCP_PROXY_SERVER, WIKI_SERVER, TOKEN_STATS_SERVER, COMPACTION_LOG_SERVER, SYSTEM_HEALTH_SERVER, AGENT_HEALTH_SERVER, VAULT_SERVER, BG_BASH_BASE_PORT, BG_BASH_MAX_PORT, RUNTIME_MCP_SECRET, NODE_CONTROL_TOKEN, NODE_ID, VAULT_MASTER_KEY, NEGOTIUM_PORT, hostname, DATA_DIR, LOG_DIR, UPLOADS_DIR, VAULT_DIR, SESSIONS_DB, DEBUG_FILE, USERS_LOG_DIR, RUN_DIR, RUNTIME_DIR, PROGRESS_DIR, DM_CMD_DIR, DM_RESP_DIR, SESSION_INBOX_DIR, SESSION_ASKS_DIR, BASHRS_SPILL_ROOT, PLAYWRIGHT_BASE_PORT, PLAYWRIGHT_MAX_PORT, PLAYWRIGHT_PORTS_DIR, ACTIVE_QUERY_STALE_MS, AGENTS_PROMPTS_DIR, RESOURCES_DIR, ABSOLUTE_PATH_PREFIX, FILE_EXTENSIONS_REGEX, FILE_TAG_REGEX, MODEL_SONNET = "claude-sonnet-5", MODEL_OPUS = "claude-opus-5", MODEL_HAIKU = "claude-haiku-4-5-20251001", MODEL_FABLE = "claude-fable-5-1", MODEL_DEEPSEEK_V4_PRO = "deepseek-v4-pro", MODEL_DEEPSEEK_V4_FLASH = "deepseek-v4-flash", FALLBACK_AGENT, FALLBACK_MODEL, DEFAULT_TOPIC_EFFORT, FFMPEG_BIN, FFPROBE_BIN, PYTHON_BIN, FASTER_WHISPER_WRAPPER, WHISPER_MODEL, TESSERACT_BIN, PDFTOTEXT_BIN, WHISPER_BACKEND, MLX_WHISPER_BIN, WHISPER_MODEL_MLX, _envMaxTellDepth, MAX_TELL_DEPTH;
+var HOME, PROJECT_ROOT, STATE_DIR, WORKSPACE_DIR, TOPIC_WORKSPACE_DIR, SHARED_WIKI_DIR, CRON_WORKSPACE_DIR, BROWSER_DIR, BROWSER_PROFILES_DIR, BINARIES_DIR, SECRETS_DIR, DM_WORKSPACE_DIR, SESSION_WORKSPACE_DIR, CLAUDE_EXECUTABLE_ENV, CLAUDE_EXECUTABLE, DEFAULT_OUTPUT_LANGUAGE = "English", BINARY_EXTENSION, BROWSER_RS_VERSION = "v0.6.0", BROWSER_RS_MIN_SECURE_VERSION = "0.2.1", BROWSER_RS_VERSION_PROBE_TIMEOUT_MS = 15000, SNIPPETS_API_URL, BROWSER_RS_BIN, BASH_RS_VERSION = "v0.1.10", BASH_RS_BIN, PLAYWRIGHT_MCP_BIN, TSX_BIN, TSX_LOADER_PATH, TSX_LOADER, TSCONFIG_PATH, SESSION_COMM_SERVER, TASK_SERVER, DECISION_SERVER, CANONICAL_MCP_PROXY_SERVER, WIKI_SERVER, TOKEN_STATS_SERVER, COMPACTION_LOG_SERVER, SYSTEM_HEALTH_SERVER, AGENT_HEALTH_SERVER, VAULT_SERVER, BG_BASH_BASE_PORT, BG_BASH_MAX_PORT, RUNTIME_MCP_SECRET, NODE_CONTROL_TOKEN, NODE_ID, VAULT_MASTER_KEY, NEGOTIUM_PORT, hostname, DATA_DIR, LOG_DIR, UPLOADS_DIR, VAULT_DIR, SESSIONS_DB, DEBUG_FILE, USERS_LOG_DIR, RUN_DIR, RUNTIME_DIR, PROGRESS_DIR, DM_CMD_DIR, DM_RESP_DIR, SESSION_INBOX_DIR, SESSION_ASKS_DIR, BASHRS_SPILL_ROOT, PLAYWRIGHT_BASE_PORT, PLAYWRIGHT_MAX_PORT, PLAYWRIGHT_PORTS_DIR, ACTIVE_QUERY_STALE_MS, AGENTS_PROMPTS_DIR, RESOURCES_DIR, ABSOLUTE_PATH_PREFIX, FILE_EXTENSIONS_REGEX, FILE_TAG_REGEX, MODEL_SONNET = "claude-sonnet-5", MODEL_OPUS = "claude-opus-5-5", MODEL_HAIKU = "claude-haiku-4-5-20251001", MODEL_FABLE = "claude-fable-5-1", MODEL_DEEPSEEK_V4_PRO = "deepseek-v4-pro", MODEL_DEEPSEEK_V4_FLASH = "deepseek-v4-flash", FALLBACK_AGENT, FALLBACK_MODEL, DEFAULT_TOPIC_EFFORT, FFMPEG_BIN, FFPROBE_BIN, PYTHON_BIN, FASTER_WHISPER_WRAPPER, WHISPER_MODEL, TESSERACT_BIN, PDFTOTEXT_BIN, WHISPER_BACKEND, MLX_WHISPER_BIN, WHISPER_MODEL_MLX, _envMaxTellDepth, MAX_TELL_DEPTH;
 var init_config = __esm(() => {
   init_config_helpers();
   init_logger();
@@ -4005,7 +4005,7 @@ var init_codex = __esm(async () => {
 });
 
 // ../../packages/core/src/version.ts
-var NEGOTIUM_VERSION = "0.19.0";
+var NEGOTIUM_VERSION = "0.19.2";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 import { spawn as spawn2 } from "child_process";
@@ -4698,6 +4698,8 @@ var init_model_catalog = __esm(() => {
     haiku: "claude",
     fable: "claude",
     "gpt-6-astra": "codex",
+    "gpt-6-sol": "codex",
+    "gpt-6-luna": "codex",
     "gpt-5.6-luna": "codex",
     "gpt-5.6-terra": "codex",
     "gpt-5.6-sol": "codex",
@@ -4727,6 +4729,26 @@ var init_model_catalog = __esm(() => {
       marginalTokenCost: "Codex credits (OpenAI API rate): $10/M uncached input, $1/M cached input, $12.50/M cache write, $50/M output",
       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-5.6-sol given the higher per-token cost. ${CODEX_COMMUNITY_WEEKLY}`
     },
+    {
+      model: "gpt-6-sol",
+      agent: "codex",
+      description: "GPT-6 generation Sol route (2026-09-22) for demanding coding and agentic work.",
+      intelligenceTier: "opus",
+      routingSummary: "demanding coding work; about half as many mistakes as gpt-5.6-sol at half the price",
+      accessCost: CODEX_PRO_20X_COST,
+      marginalTokenCost: "Codex credits (OpenAI API rate): $2/M uncached input, $0.20/M cached input (assumed), $10/M output",
+      estimatedUsage: `Released 2026-09-22; local message-count/quota-weight ranges not yet published. ${CODEX_COMMUNITY_WEEKLY}`
+    },
+    {
+      model: "gpt-6-luna",
+      agent: "codex",
+      description: "GPT-6 generation Luna route (2026-09-22): fast, high-volume, lowest cost.",
+      intelligenceTier: "sonnet",
+      routingSummary: "fast high-volume work; cheapest Codex route",
+      accessCost: CODEX_PRO_20X_COST,
+      marginalTokenCost: "Codex credits (OpenAI API rate): $0.10/M uncached input, $0.01/M cached input (assumed), $0.50/M output",
+      estimatedUsage: `Released 2026-09-22; local message-count/quota-weight ranges not yet published. ${CODEX_COMMUNITY_WEEKLY}`
+    },
     {
       model: "gpt-5.6-sol",
       agent: "codex",
@@ -4772,9 +4794,9 @@ var init_model_catalog = __esm(() => {
       agent: "claude",
       description: "High-capability Claude route for complex reasoning and tool-heavy work.",
       intelligenceTier: "opus",
-      routingSummary: "complex reasoning and tool-heavy work; about 2.5x Sonnet marginal cost",
+      routingSummary: "complex reasoning and tool-heavy work; about 2x Sonnet marginal cost",
       accessCost: CLAUDE_MAX_20X_COST,
-      marginalTokenCost: "Claude API/extra usage: $5/M input, $6.25/M cache write, $0.50/M cache read, $25/M output",
+      marginalTokenCost: "Claude API/extra usage (Opus 5.5, 2026-09-22): $4/M input, $5/M cache write (assumed), $0.40/M cache read (assumed), $20/M output",
       estimatedUsage: `${CLAUDE_COMMUNITY_SESSION}; Opus uses the shared all-model weekly pool more quickly than Sonnet. No stable per-model token cap is published.`
     },
     {
@@ -5184,6 +5206,75 @@ var init_bus = __esm(async () => {
   };
 });
 
+// ../../packages/core/src/query/state.ts
+import { mkdirSync as mkdirSync10, renameSync as renameSync6, unlinkSync as unlinkSync9, writeFileSync as writeFileSync8 } from "fs";
+import { basename as basename3, join as join13 } from "path";
+function createQueryStateStore(options) {
+  const sanitize = options.sanitizeTopicId ?? sanitizeId;
+  const queryStateDirPath = (userId) => join13(options.usersLogDir, String(userId), "active-queries");
+  const queryStateFile = (userId, topicId) => join13(queryStateDirPath(userId), `${sanitize(topicId)}.json`);
+  const legacyQueryStateFile = (userId, topicName) => {
+    if (!topicName || topicName === "." || topicName === ".." || basename3(topicName) !== topicName) {
+      return null;
+    }
+    return join13(queryStateDirPath(userId), `${topicName}.json`);
+  };
+  return {
+    write(userId, topicId, topicName, task) {
+      const dir = queryStateDirPath(userId);
+      mkdirSync10(dir, { recursive: true });
+      const state = { topicId, topicName, since: new Date().toISOString() };
+      if (task)
+        state.task = [...task.replace(/\n+/g, " ").trim()].slice(0, 100).join("");
+      const target = queryStateFile(userId, topicId);
+      const tmp = `${target}.${process.pid}.${Date.now()}.tmp`;
+      writeFileSync8(tmp, JSON.stringify(state));
+      renameSync6(tmp, target);
+    },
+    clear(userId, topicId, legacyTopicName) {
+      const paths = [
+        queryStateFile(userId, topicId),
+        legacyQueryStateFile(userId, legacyTopicName)
+      ].filter((path) => Boolean(path));
+      for (const path of new Set(paths)) {
+        try {
+          unlinkSync9(path);
+        } catch (error) {
+          if (error?.code !== "ENOENT") {
+            options.logger?.warn({ err: error, userId, topicId, path }, "Failed to clear query state file");
+          }
+        }
+      }
+    },
+    hasActive(userId, topicId) {
+      const state = readJsonFile(queryStateFile(userId, topicId));
+      if (!state)
+        return false;
+      const sinceMs = new Date(state.since).getTime();
+      return Date.now() - sinceMs <= ACTIVE_QUERY_STALE_MS;
+    }
+  };
+}
+function writeQueryState(userId, topicId, topicName, task) {
+  defaultQueryStateStore.write(userId, topicId, topicName, task);
+}
+function clearQueryState(userId, topicId, legacyTopicName) {
+  defaultQueryStateStore.clear(userId, topicId, legacyTopicName);
+}
+function hasActiveQuery(userId, topicId) {
+  return defaultQueryStateStore.hasActive(userId, topicId);
+}
+var defaultQueryStateStore;
+var init_state = __esm(() => {
+  init_config();
+  init_jsonl();
+  init_logger();
+  defaultQueryStateStore = createQueryStateStore({
+    usersLogDir: USERS_LOG_DIR,
+    logger
+  });
+});
+
 // ../../packages/core/src/storage/api-messages.ts
 function initializeApiMessagesSchema() {
   db.exec(`
@@ -5965,7 +6056,7 @@ var init_registry = __esm(async () => {
 });
 
 // ../../packages/core/src/agents/fork.ts
-import { existsSync as existsSync13, unlinkSync as unlinkSync9 } from "fs";
+import { existsSync as existsSync13, unlinkSync as unlinkSync10 } from "fs";
 function createAgentForkHelpers(host) {
   return {
     async forkAgentSession(options) {
@@ -6003,7 +6094,7 @@ var init_fork = __esm(async () => {
   defaultForkHelpers = createAgentForkHelpers({
     forkSession: (agent, options) => getRegistryOperations(agent).forkSession(options),
     exists: existsSync13,
-    unlink: unlinkSync9,
+    unlink: unlinkSync10,
     warn: (details, message) => logger.warn(details, message)
   });
 });
@@ -6207,7 +6298,7 @@ var init_runtime_process_leases = __esm(async () => {
 
 // ../../packages/core/src/platform/playwright/browser-processes.ts
 import { execFileSync as execFileSync3 } from "child_process";
-import { readdirSync as readdirSync4, unlinkSync as unlinkSync10 } from "fs";
+import { readdirSync as readdirSync4, unlinkSync as unlinkSync11 } from "fs";
 import { createServer } from "net";
 import { resolve as resolve9, sep as sep2 } from "path";
 function isPortInUse(port) {
@@ -6336,7 +6427,7 @@ function cleanSingletonFiles(userDataDir) {
     for (const f of files) {
       if (f.startsWith("Singleton")) {
         try {
-          unlinkSync10(resolve9(userDataDir, f));
+          unlinkSync11(resolve9(userDataDir, f));
           logger.info({ file: f, userDataDir }, "Removed stale Singleton file");
         } catch (e) {
           logger.warn({ err: e, file: f }, "Failed to remove stale Chrome Singleton file");
@@ -6472,11 +6563,11 @@ var init_transport_probe = __esm(() => {
 // ../../packages/core/src/platform/ipc.ts
 import { createHash as createHash3 } from "crypto";
 import { chmodSync as chmodSync5 } from "fs";
-import { basename as basename3 } from "path";
+import { basename as basename4 } from "path";
 function ipcEndpoint(posixSocketPath) {
   if (!IS_WINDOWS)
     return posixSocketPath;
-  const label = basename3(posixSocketPath).replace(/\.sock$/, "").replace(/[^A-Za-z0-9._-]/g, "-").slice(0, 48) || "endpoint";
+  const label = basename4(posixSocketPath).replace(/\.sock$/, "").replace(/[^A-Za-z0-9._-]/g, "-").slice(0, 48) || "endpoint";
   const digest = createHash3("sha256").update(posixSocketPath).digest("hex").slice(0, 16);
   return `\\\\.\\pipe\\negotium-${label}-${digest}`;
 }
@@ -6500,7 +6591,7 @@ var init_vault_public = __esm(async () => {
 import { randomBytes as randomBytes5, timingSafeEqual as timingSafeEqual2 } from "crypto";
 import { createServer as createServer2 } from "net";
 import { tmpdir as tmpdir2 } from "os";
-import { join as join13 } from "path";
+import { join as join14 } from "path";
 function deepMapStrings(value2, transform) {
   if (typeof value2 === "string")
     return transform(value2);
@@ -6587,7 +6678,7 @@ function authorized(actual, expected) {
 }
 async function createBrowserVaultBroker(userId) {
   const token = randomBytes5(32).toString("hex");
-  const socketPath = ipcEndpoint(join13(process.platform === "win32" ? tmpdir2() : "/tmp", `negotium-browser-vault-${process.pid}-${randomBytes5(8).toString("hex")}.sock`));
+  const socketPath = ipcEndpoint(join14(process.platform === "win32" ? tmpdir2() : "/tmp", `negotium-browser-vault-${process.pid}-${randomBytes5(8).toString("hex")}.sock`));
   const retainedForms = new Map;
   const leases = new Map;
   const sockets = new Set;
@@ -6793,13 +6884,13 @@ import { createHash as createHash4, randomBytes as randomBytes6, timingSafeEqual
 import {
   cpSync,
   existsSync as existsSync14,
-  mkdirSync as mkdirSync10,
+  mkdirSync as mkdirSync11,
   readFileSync as readFileSync11,
   rmSync as rmSync2,
-  unlinkSync as unlinkSync11,
-  writeFileSync as writeFileSync8
+  unlinkSync as unlinkSync12,
+  writeFileSync as writeFileSync9
 } from "fs";
-import { dirname as dirname10, join as join14, resolve as resolve11 } from "path";
+import { dirname as dirname10, join as join15, resolve as resolve11 } from "path";
 function removeDefaultProfileDataDir(userDataDir) {
   const root = resolve11(BROWSER_PROFILES_DIR);
   const target = resolve11(userDataDir);
@@ -6868,15 +6959,15 @@ function portFileName(instanceKey) {
 }
 function writePortFile(instanceKey, port) {
   try {
-    mkdirSync10(managerHost.portsDir, { recursive: true });
-    writeFileSync8(join14(managerHost.portsDir, portFileName(instanceKey)), String(port));
+    mkdirSync11(managerHost.portsDir, { recursive: true });
+    writeFileSync9(join15(managerHost.portsDir, portFileName(instanceKey)), String(port));
   } catch (e) {
     logger.warn({ err: e, instanceKey, port }, "Failed to save playwright port file");
   }
 }
 function deletePortFile(instanceKey) {
   try {
-    unlinkSync11(join14(managerHost.portsDir, portFileName(instanceKey)));
+    unlinkSync12(join15(managerHost.portsDir, portFileName(instanceKey)));
   } catch (e) {
     if (e.code === "ENOENT")
       return;
@@ -7077,7 +7168,7 @@ async function spawnPlaywright(instanceKey, ownerId, reservedPort, browserBin =
   }
   const userDataDir = resolveUserDataDir(instanceKey);
   const port = reservedPort ?? await allocatePort();
-  mkdirSync10(userDataDir, { recursive: true });
+  mkdirSync11(userDataDir, { recursive: true });
   const mcpArgs = [
     "--port",
     String(port),
@@ -7383,7 +7474,7 @@ async function cloneProfileForChild(opts) {
       if (existsSync14(dstDir)) {
         rmSync2(dstDir, { recursive: true, force: true });
       }
-      mkdirSync10(dirname10(dstDir), { recursive: true });
+      mkdirSync11(dirname10(dstDir), { recursive: true });
       if (process.platform === "darwin") {
         try {
           execFileSync4("cp", ["-cR", srcDir, dstDir], { stdio: "pipe" });
@@ -7401,7 +7492,7 @@ async function cloneProfileForChild(opts) {
     cleanSingletonFiles(dstDir);
     for (const f of ["DevToolsActivePort", "LOCK"]) {
       try {
-        unlinkSync11(resolve11(dstDir, f));
+        unlinkSync12(resolve11(dstDir, f));
       } catch {}
     }
     logger.info({ srcKey, dstKey, srcDir, dstDir }, "Cloned Playwright profile for child topic");
@@ -7999,15 +8090,15 @@ var init_api_topic_config = __esm(async () => {
 // ../../packages/core/src/storage/conversations.ts
 import {
   existsSync as existsSync15,
-  mkdirSync as mkdirSync11,
+  mkdirSync as mkdirSync12,
   readFileSync as readFileSync12,
-  renameSync as renameSync6,
-  unlinkSync as unlinkSync12,
-  writeFileSync as writeFileSync9
+  renameSync as renameSync7,
+  unlinkSync as unlinkSync13,
+  writeFileSync as writeFileSync10
 } from "fs";
-import { dirname as dirname11, join as join15 } from "path";
+import { dirname as dirname11, join as join16 } from "path";
 function conversationDir(_userId) {
-  return join15(resolveStorageDataDir(), "conversations");
+  return join16(resolveStorageDataDir(), "conversations");
 }
 function topicFilename(userId, topicName) {
   const t = sanitizeTopicName(topicName, true);
@@ -8017,7 +8108,7 @@ function topicFilename(userId, topicName) {
   return `${t}.${sanitizeId(owner)}.jsonl`;
 }
 function getConversationPath(userId, topicName) {
-  return join15(conversationDir(userId), topicFilename(userId, topicName));
+  return join16(conversationDir(userId), topicFilename(userId, topicName));
 }
 function getActiveConversationPath(userId, topicName) {
   const rawPath = getConversationPath(userId, topicName);
@@ -8043,7 +8134,7 @@ function appendConversationEventStrict(userId, topicName, agent, event) {
     event
   };
   const line = JSON.stringify(entry);
-  mkdirSync11(dirname11(path), { recursive: true });
+  mkdirSync12(dirname11(path), { recursive: true });
   appendJsonlLine(path, line);
   const activePath = getActiveConversationPath(userId, topicName);
   if (existsSync15(activePath)) {
@@ -8061,7 +8152,7 @@ function appendRawConversationEventStrict(userId, topicName, agent, event) {
     agent,
     event
   };
-  mkdirSync11(dirname11(path), { recursive: true });
+  mkdirSync12(dirname11(path), { recursive: true });
   appendJsonlLine(path, JSON.stringify(entry));
 }
 function readConversationPath(path) {
@@ -8102,15 +8193,15 @@ function replaceRawConversationStrict(userId, topicName, entries) {
 }
 function replaceConversationPathStrict(path, entries) {
   const tempPath = `${path}.${process.pid}.${Date.now()}.tmp`;
-  mkdirSync11(dirname11(path), { recursive: true });
+  mkdirSync12(dirname11(path), { recursive: true });
   try {
-    writeFileSync9(tempPath, entries.length > 0 ? `${entries.map((entry) => JSON.stringify(entry)).join(`
+    writeFileSync10(tempPath, entries.length > 0 ? `${entries.map((entry) => JSON.stringify(entry)).join(`
 `)}
 ` : "", { flag: "wx" });
-    renameSync6(tempPath, path);
+    renameSync7(tempPath, path);
   } catch (error) {
     try {
-      unlinkSync12(tempPath);
+      unlinkSync13(tempPath);
     } catch {}
     throw error;
   }
@@ -8362,8 +8453,8 @@ var init_compaction_tool_projection = __esm(() => {
 });
 
 // ../../packages/core/src/storage/tasks.ts
-import { existsSync as existsSync16, mkdirSync as mkdirSync12, readFileSync as readFileSync13, renameSync as renameSync7, statSync as statSync4, writeFileSync as writeFileSync10 } from "fs";
-import { dirname as dirname12, join as join16 } from "path";
+import { existsSync as existsSync16, mkdirSync as mkdirSync13, readFileSync as readFileSync13, renameSync as renameSync8, statSync as statSync4, writeFileSync as writeFileSync11 } from "fs";
+import { dirname as dirname12, join as join17 } from "path";
 function safeTaskScopeKey(scopeKey) {
   const safe = sanitizeFileName(scopeKey);
   if (!safe || safe === "." || safe === "..") {
@@ -8375,7 +8466,7 @@ function taskScopeKey(opts) {
   return opts.topicId?.trim() || opts.session || "default";
 }
 function getTaskFilePath(userId, scopeKey) {
-  return join16(resolveStorageDataDir(), "tasks", `${safeTaskScopeKey(scopeKey)}.json`);
+  return join17(resolveStorageDataDir(), "tasks", `${safeTaskScopeKey(scopeKey)}.json`);
 }
 function readTasks(userId, scopeKey) {
   const path = getTaskFilePath(userId, scopeKey);
@@ -8391,11 +8482,11 @@ function readTasks(userId, scopeKey) {
 }
 function writeTasks(userId, scopeKey, tasks) {
   const path = getTaskFilePath(userId, scopeKey);
-  mkdirSync12(dirname12(path), { recursive: true });
+  mkdirSync13(dirname12(path), { recursive: true });
   const payload = { version: 1, tasks };
   const tmp = `${path}.${process.pid}.tmp`;
-  writeFileSync10(tmp, JSON.stringify(payload, null, 2), "utf-8");
-  renameSync7(tmp, path);
+  writeFileSync11(tmp, JSON.stringify(payload, null, 2), "utf-8");
+  renameSync8(tmp, path);
 }
 function taskFileMtimeNs(userId, scopeKey) {
   try {
@@ -9429,12 +9520,12 @@ import { execFile } from "child_process";
 import { createHash as createHash6, randomUUID as randomUUID9 } from "crypto";
 import { existsSync as existsSync18 } from "fs";
 import { mkdir, rename, rm, writeFile } from "fs/promises";
-import { join as join17 } from "path";
+import { join as join18 } from "path";
 import { promisify } from "util";
 function cscPath() {
   const windir = process.env.WINDIR ?? process.env.SystemRoot ?? "C:\\Windows";
   for (const framework of ["Framework64", "Framework"]) {
-    const candidate = join17(windir, "Microsoft.NET", framework, "v4.0.30319", "csc.exe");
+    const candidate = join18(windir, "Microsoft.NET", framework, "v4.0.30319", "csc.exe");
     if (existsSync18(candidate))
       return candidate;
   }
@@ -9442,13 +9533,13 @@ function cscPath() {
 }
 async function ensureCodexWindowsWrapperExe(cacheDir) {
   const digest2 = createHash6("sha256").update(CODEX_WINDOWS_WRAPPER_SOURCE).digest("hex").slice(0, 12);
-  const exePath = join17(cacheDir, `codex-hook-wrapper-${digest2}.exe`);
+  const exePath = join18(cacheDir, `codex-hook-wrapper-${digest2}.exe`);
   if (existsSync18(exePath))
     return exePath;
   await mkdir(cacheDir, { recursive: true });
   const stamp = randomUUID9();
-  const sourcePath = join17(cacheDir, `wrapper-${stamp}.cs`);
-  const tempExe = join17(cacheDir, `wrapper-${stamp}.exe`);
+  const sourcePath = join18(cacheDir, `wrapper-${stamp}.cs`);
+  const tempExe = join18(cacheDir, `wrapper-${stamp}.exe`);
   try {
     await writeFile(sourcePath, CODEX_WINDOWS_WRAPPER_SOURCE, "utf8");
     await execFileAsync(cscPath(), ["/nologo", "/target:exe", "/optimize+", `/out:${tempExe}`, sourcePath], { windowsHide: true, timeout: 60000 });
@@ -9565,7 +9656,7 @@ import { existsSync as existsSync19 } from "fs";
 import { chmod, copyFile, mkdtemp, rm as rm2, writeFile as writeFile2 } from "fs/promises";
 import { createServer as createServer3 } from "net";
 import { tmpdir as tmpdir3 } from "os";
-import { dirname as dirname13, join as join18, resolve as resolve12 } from "path";
+import { dirname as dirname13, join as join19, resolve as resolve12 } from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 function evaluateCodexVaultPreToolUse(input, userId, operations) {
   if (operations.referencesSensitiveStorage(input.tool_input)) {
@@ -9621,10 +9712,10 @@ function windowsQuote(value2) {
   return `"${value2.replaceAll('"', "\\\"")}"`;
 }
 async function createCodexVaultHookBridge(userId) {
-  const root = await mkdtemp(join18(tmpdir3(), "negotium-codex-vault-"));
+  const root = await mkdtemp(join19(tmpdir3(), "negotium-codex-vault-"));
   await chmod(root, 448);
-  const socketPath = ipcEndpoint(join18(root, "hook.sock"));
-  const wrapperPath = join18(root, IS_WINDOWS2 ? "codex-with-hooks.exe" : "codex-with-hooks");
+  const socketPath = ipcEndpoint(join19(root, "hook.sock"));
+  const wrapperPath = join19(root, IS_WINDOWS2 ? "codex-with-hooks.exe" : "codex-with-hooks");
   const token = randomBytes7(32).toString("hex");
   const connections = new Set;
   const server = createServer3((socket) => {
@@ -9675,9 +9766,9 @@ async function createCodexVaultHookBridge(userId) {
     restrictIpcEndpoint(socketPath);
     if (IS_WINDOWS2) {
       const { BINARIES_DIR: BINARIES_DIR2 } = await Promise.resolve().then(() => (init_config(), exports_config));
-      const cached = await ensureCodexWindowsWrapperExe(join18(BINARIES_DIR2, "codex-hook-wrapper"));
+      const cached = await ensureCodexWindowsWrapperExe(join19(BINARIES_DIR2, "codex-hook-wrapper"));
       await copyFile(cached, wrapperPath);
-      await writeFile2(join18(root, "codex-with-hooks.cfg"), [process.execPath, codexCliScriptPath(), socketPath, token].join(`
+      await writeFile2(join19(root, "codex-with-hooks.cfg"), [process.execPath, codexCliScriptPath(), socketPath, token].join(`
 `), { encoding: "utf8", mode: 384 });
     } else {
       await writeFile2(wrapperPath, privateCodexWrapper(codexCliScriptPath(), socketPath, token), {
@@ -10254,7 +10345,7 @@ __export(exports_codex_provider, {
 import { execFileSync as execFileSync6 } from "child_process";
 import { existsSync as existsSync20, readFileSync as readFileSync16, realpathSync as realpathSync5, statSync as statSync6 } from "fs";
 import { homedir as homedir6 } from "os";
-import { dirname as dirname14, isAbsolute as isAbsolute4, join as join19, relative as relative3, resolve as resolve14 } from "path";
+import { dirname as dirname14, isAbsolute as isAbsolute4, join as join20, relative as relative3, resolve as resolve14 } from "path";
 import { Codex } from "@openai/codex-sdk";
 function sameCodexUsage(usage, total) {
   return usage.input_tokens === total.inputTokens && usage.output_tokens === total.outputTokens && (usage.cached_input_tokens ?? 0) === total.cachedInputTokens && (usage.cache_write_input_tokens ?? 0) === total.cacheWriteInputTokens;
@@ -10282,7 +10373,7 @@ function codexMcpServerName(name) {
   return CODEX_MCP_SERVER_NAME_OVERRIDES[name] ?? name;
 }
 function globalCodexMcpServerNames(authFilePath) {
-  const configPath = join19(dirname14(authFilePath), "config.toml");
+  const configPath = join20(dirname14(authFilePath), "config.toml");
   if (!existsSync20(configPath))
     return [];
   try {
@@ -10645,7 +10736,7 @@ async function* codexProvider(opts) {
     mcpServerCount: Object.keys(codexMcpServers).length
   }, "codexProvider: starting turn");
   const hostedCodexHome = hostedCodexHomePath();
-  const inheritedCodexHome = process.env.CODEX_HOME || join19(homedir6(), ".codex");
+  const inheritedCodexHome = process.env.CODEX_HOME || join20(homedir6(), ".codex");
   const codexEnvironment = scopedBrowserCapability || resolve14(hostedCodexHome) !== resolve14(inheritedCodexHome) ? {
     ...Object.fromEntries(Object.entries(process.env).filter((entry) => typeof entry[1] === "string")),
     CODEX_HOME: hostedCodexHome,
@@ -11097,7 +11188,7 @@ var init_maestro_provider = __esm(async () => {
 // ../../packages/core/src/agents/index.ts
 import { existsSync as existsSync21 } from "fs";
 import { homedir as homedir7 } from "os";
-import { join as join20 } from "path";
+import { join as join21 } from "path";
 async function* dispatchAgent(opts) {
   switch (opts.agent) {
     case "claude": {
@@ -11131,11 +11222,11 @@ async function resolveSessionFileMissing(agent, sessionId, cwd) {
   switch (agent) {
     case "claude": {
       const encodedCwd = encodeClaudeCwd(cwd);
-      const path = join20(homedir7(), ".claude", "projects", encodedCwd, `${sessionId}.jsonl`);
+      const path = join21(homedir7(), ".claude", "projects", encodedCwd, `${sessionId}.jsonl`);
       return !existsSync21(path);
     }
     case "codex": {
-      const sessionsDir = join20(hostedCodexHomePath(), "sessions");
+      const sessionsDir = join21(hostedCodexHomePath(), "sessions");
       const glob = new Bun.Glob(`**/rollout-*-${sessionId}.jsonl`);
       for await (const _rel of glob.scan({ cwd: sessionsDir, onlyFiles: true })) {
         return false;
@@ -11705,9 +11796,9 @@ var init_api_topic_brief = __esm(async () => {
 });
 
 // ../../packages/core/src/storage/wiki.ts
-import { basename as basename4, dirname as dirname15, join as join21 } from "path";
+import { basename as basename5, dirname as dirname15, join as join22 } from "path";
 function getSharedWikiDir(workspaceDir = resolveStorageWorkspaceDir()) {
-  return workspaceDir === resolveStorageWorkspaceDir() ? resolveStorageSharedWikiDir() : join21(workspaceDir, "wiki");
+  return workspaceDir === resolveStorageWorkspaceDir() ? resolveStorageSharedWikiDir() : join22(workspaceDir, "wiki");
 }
 var init_wiki = __esm(async () => {
   await init_storage_host();
@@ -11716,7 +11807,7 @@ var init_wiki = __esm(async () => {
 // ../../packages/core/src/agents/archiver.ts
 import { randomUUID as randomUUID10 } from "crypto";
 import { existsSync as existsSync22, readdirSync as readdirSync5, readFileSync as readFileSync18, statSync as statSync7 } from "fs";
-import { join as join22 } from "path";
+import { join as join23 } from "path";
 function resolveMemoryLanguage() {
   const override = process.env.NEGOTIUM_MEMORY_LANG?.trim();
   return override && override.length > 0 ? override : resolveOutputLanguage();
@@ -11970,10 +12061,10 @@ function distillOneLine(summaryMd) {
   return "";
 }
 function findSummaryFile(storage, topicTitle, date, sinceMs, topicId) {
-  const dir = join22(storage.getWikiDir(), "summaries");
+  const dir = join23(storage.getWikiDir(), "summaries");
   if (!storage.fileExists(dir))
     return null;
-  const predicted = join22(dir, wikiSummaryFilename(date, topicTitle, topicId));
+  const predicted = join23(dir, wikiSummaryFilename(date, topicTitle, topicId));
   if (storage.fileExists(predicted) && storage.fileModifiedAt(predicted) >= sinceMs)
     return predicted;
   let best = null;
@@ -11981,7 +12072,7 @@ function findSummaryFile(storage, topicTitle, date, sinceMs, topicId) {
     if (!f.startsWith(`${date}-`) || !isTopicSummaryFile(f, topicId ?? "", topicTitle)) {
       continue;
     }
-    const p = join22(dir, f);
+    const p = join23(dir, f);
     try {
       const m = storage.fileModifiedAt(p);
       if (m >= sinceMs && (!best || m > best.mtime))
@@ -12194,15 +12285,15 @@ function formatTopicArchiveTranscriptRecord(row, topicTitle, index) {
 }
 
 // ../../packages/core/src/storage/topic-archive.ts
-import { mkdirSync as mkdirSync13, writeFileSync as writeFileSync11 } from "fs";
-import { join as join23 } from "path";
+import { mkdirSync as mkdirSync14, writeFileSync as writeFileSync12 } from "fs";
+import { join as join24 } from "path";
 function archiveTopicMessages(topicId, topicTitle, options = {}) {
   const rows = options.afterRowid !== undefined ? getMessagesForTopicAfterRowid(topicId, options.afterRowid) : getAllMessagesForTopic(topicId);
   if (rows.length === 0)
     return null;
   const safeTopic = sanitizeTopicName(topicTitle, true);
-  const archiveDir = join23(getSharedWikiDir(), "archive");
-  mkdirSync13(archiveDir, { recursive: true });
+  const archiveDir = join24(getSharedWikiDir(), "archive");
+  mkdirSync14(archiveDir, { recursive: true });
   const date = new Date().toISOString().slice(0, 10);
   const reasonSuffix = options.reason && options.reason !== "delete" ? `_${options.reason}` : "";
   let filename;
@@ -12214,9 +12305,9 @@ function archiveTopicMessages(topicId, topicTitle, options = {}) {
   let path;
   while (true) {
     filename = `${safeTopic}_${date}${reasonSuffix}${counter === 1 ? "" : `_${counter}`}.jsonl`;
-    path = join23(archiveDir, filename);
+    path = join24(archiveDir, filename);
     try {
-      writeFileSync11(path, body, { flag: "wx" });
+      writeFileSync12(path, body, { flag: "wx" });
       break;
     } catch (err) {
       if (err.code !== "EEXIST")
@@ -12259,8 +12350,8 @@ function archiveConversationEvents(topicId, topicTitle, userId, options = {}) {
   const entries = readRawConversation(userId, topicTitle);
   if (entries.length === 0)
     return null;
-  const archiveDir = join23(getSharedWikiDir(), "archive");
-  mkdirSync13(archiveDir, { recursive: true });
+  const archiveDir = join24(getSharedWikiDir(), "archive");
+  mkdirSync14(archiveDir, { recursive: true });
   const safeTopic = sanitizeTopicName(topicTitle, true);
   const date = new Date().toISOString().slice(0, 10);
   const reasonSuffix = options.reason && options.reason !== "delete" ? `_${options.reason}` : "";
@@ -12287,9 +12378,9 @@ function archiveConversationEvents(topicId, topicTitle, userId, options = {}) {
   let counter = 1;
   while (true) {
     const suffix = counter === 1 ? "" : `_${counter}`;
-    const path = join23(archiveDir, `${safeTopic}_${date}${reasonSuffix}_events${suffix}.jsonl`);
+    const path = join24(archiveDir, `${safeTopic}_${date}${reasonSuffix}_events${suffix}.jsonl`);
     try {
-      writeFileSync11(path, body, { flag: "wx" });
+      writeFileSync12(path, body, { flag: "wx" });
       logger.info({ topicId, topicTitle, archive: path, eventCount: entries.length }, "archiveConversationEvents: archived raw conversation events");
       return { path, eventCount: entries.length };
     } catch (error) {
@@ -12613,8 +12704,8 @@ var init_idle_archiver = __esm(async () => {
 
 // ../../packages/core/src/storage/token-stats.ts
 import { createHash as createHash7 } from "crypto";
-import { mkdirSync as mkdirSync14, writeFileSync as writeFileSync12 } from "fs";
-import { join as join24 } from "path";
+import { mkdirSync as mkdirSync15, writeFileSync as writeFileSync13 } from "fs";
+import { join as join25 } from "path";
 function emptyBucket() {
   return {
     inputTokens: 0,
@@ -12632,8 +12723,8 @@ function tokenStatsFileId(userId) {
 function queriesPath(userId) {
   const fileId = tokenStatsFileId(userId);
   const logDir = resolveStorageLogDir();
-  mkdirSync14(logDir, { recursive: true });
-  return join24(logDir, `token-queries-${fileId}.jsonl`);
+  mkdirSync15(logDir, { recursive: true });
+  return join25(logDir, `token-queries-${fileId}.jsonl`);
 }
 function loadRecords(userId) {
   try {
@@ -12702,7 +12793,7 @@ function deleteTopicStats(userId, topicId) {
         return true;
       }
     });
-    writeFileSync12(path, kept.length > 0 ? `${kept.join(`
+    writeFileSync13(path, kept.length > 0 ? `${kept.join(`
 `)}
 ` : "", "utf-8");
   } catch (e) {
@@ -12812,11 +12903,14 @@ var init_token_stats = __esm(async () => {
   ]);
   TOKEN_PRICES = {
     "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-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 },
     "claude:fable": { input: 10, cacheWrite: 12.5, cacheRead: 0.25, output: 50 },
-    "claude:opus": { input: 5, cacheWrite: 6.25, cacheRead: 0.5, output: 25 },
+    "claude:opus": { input: 4, cacheWrite: 5, cacheRead: 0.4, output: 20 },
+    "claude:claude-opus-5-5": { input: 4, cacheWrite: 5, cacheRead: 0.4, output: 20 },
     "claude:sonnet": { input: 2, cacheWrite: 2.5, cacheRead: 0.2, output: 10 },
     "maestro:kimi-k3": { input: 3, cacheRead: 0.3, output: 15 },
     "maestro:kimi-k2.7-code": { input: 0.95, cacheRead: 0.19, output: 4 },
@@ -12985,7 +13079,7 @@ var init_idle_compact = __esm(async () => {
 });
 
 // ../../packages/core/src/agents/topic-cleanup.ts
-import { mkdirSync as mkdirSync15, renameSync as renameSync8, unlinkSync as unlinkSync13, writeFileSync as writeFileSync13 } from "fs";
+import { mkdirSync as mkdirSync16, renameSync as renameSync9, unlinkSync as unlinkSync14, writeFileSync as writeFileSync14 } from "fs";
 import { dirname as dirname16 } from "path";
 function collectSessionIdsByAgent(entries, extraSessions = []) {
   const out = new Map;
@@ -13052,14 +13146,14 @@ function createTopicLogMaintenance(host) {
       const path = runtimeHost.activeConversationPath(opts.userId, opts.topicName);
       const tempPath = `${path}.${process.pid}.${Date.now()}.tmp`;
       try {
-        mkdirSync15(dirname16(path), { recursive: true });
-        writeFileSync13(tempPath, retained.length > 0 ? `${retained.map((entry) => JSON.stringify(entry)).join(`
+        mkdirSync16(dirname16(path), { recursive: true });
+        writeFileSync14(tempPath, retained.length > 0 ? `${retained.map((entry) => JSON.stringify(entry)).join(`
 `)}
 ` : "", { flag: "wx" });
-        renameSync8(tempPath, path);
+        renameSync9(tempPath, path);
       } catch (e) {
         try {
-          unlinkSync13(tempPath);
+          unlinkSync14(tempPath);
         } catch {}
         runtimeHost.warn({ err: e, path }, "rotateTopicLogs: conversation replacement failed");
         return {
@@ -13089,7 +13183,7 @@ function createTopicLogMaintenance(host) {
         runtimeHost.rawConversationPath(userId, topicName)
       ]) {
         try {
-          unlinkSync13(path);
+          unlinkSync14(path);
         } catch (e) {
           if (e?.code !== "ENOENT") {
             runtimeHost.warn({ err: e, path }, "purgeTopicLogs: conversation log unlink failed");
@@ -13229,9 +13323,9 @@ __export(exports_session, {
   AUTO_FORK_COMPACTION_TOKENS: () => AUTO_FORK_COMPACTION_TOKENS
 });
 import { randomUUID as randomUUID11 } from "crypto";
-import { mkdtempSync as mkdtempSync2, rmSync as rmSync4, writeFileSync as writeFileSync14 } from "fs";
+import { mkdtempSync as mkdtempSync2, rmSync as rmSync4, writeFileSync as writeFileSync15 } from "fs";
 import { tmpdir as tmpdir4 } from "os";
-import { join as join25 } from "path";
+import { join as join26 } from "path";
 async function waitForMemoryArchive(settled, timeoutMs) {
   let timer;
   try {
@@ -13546,7 +13640,7 @@ function formatCompactElapsed(startedAt) {
 async function summarizeTopicContext(request) {
   const startedAt = Date.now();
   const sessionIds = [];
-  const compactCwd = mkdtempSync2(join25(tmpdir4(), "negotium-compact-"));
+  const compactCwd = mkdtempSync2(join26(tmpdir4(), "negotium-compact-"));
   const abortController = new AbortController;
   const relayAbort = () => abortController.abort(request.signal?.reason);
   if (request.signal?.aborted)
@@ -13573,7 +13667,7 @@ async function summarizeTopicContext(request) {
   let error = "";
   let toolViolation = false;
   let compactionLogCalls = 0;
-  const compactionLogPath = join25(compactCwd, "conversation.log");
+  const compactionLogPath = join26(compactCwd, "conversation.log");
   try {
     const compactionMcp = useCompactionLog ? {
       compact_log: {
@@ -13587,7 +13681,7 @@ async function summarizeTopicContext(request) {
       }
     } : undefined;
     if (useCompactionLog)
-      writeFileSync14(compactionLogPath, request.source, { mode: 384 });
+      writeFileSync15(compactionLogPath, request.source, { mode: 384 });
     for await (const event of runAgent({
       agent: request.agent,
       prompt: useCompactionLog ? [
@@ -14001,7 +14095,7 @@ __export(exports_derive, {
   TopicDeriveBusyError: () => TopicDeriveBusyError
 });
 import { createHash as createHash8, randomUUID as randomUUID12 } from "crypto";
-import { mkdirSync as mkdirSync16, rmSync as rmSync5, unlinkSync as unlinkSync14 } from "fs";
+import { mkdirSync as mkdirSync17, rmSync as rmSync5, unlinkSync as unlinkSync15 } from "fs";
 function getTopics(opts = {}) {
   return listTopics(opts).filter((topic) => !isLegacySharedGeneral(topic.id));
 }
@@ -14131,7 +14225,7 @@ async function createDerivedTopicImpl(topic, sourceTopicId, userId, copyHistory,
   try {
     if (agent) {
       const cwd = derivedWorkspace;
-      mkdirSync16(cwd, { recursive: true });
+      mkdirSync17(cwd, { recursive: true });
       const registry = getRegistry(agent);
       const requestedRolloutModel = subagentModel ?? (subagent?.agent ? undefined : sourceConfig?.model) ?? derived.defaultModel;
       const rolloutModel = resolveModelForAgent(agent, requestedRolloutModel, registry);
@@ -14299,7 +14393,7 @@ async function createDerivedTopicImpl(topic, sourceTopicId, userId, copyHistory,
         getConversationPath(userId, derived.title)
       ]) {
         try {
-          unlinkSync14(path);
+          unlinkSync15(path);
         } catch {}
       }
     }
@@ -14356,14 +14450,14 @@ var init_derive = __esm(async () => {
 });
 
 // ../../packages/core/src/query/session-inbox-path.ts
-import { join as join26 } from "path";
+import { join as join27 } from "path";
 function sessionInboxPath(userId, topicId) {
   const key = Buffer.from(topicId, "utf8").toString("base64url");
-  return join26(SESSION_INBOX_DIR, userId, `${TOPIC_ID_FILE_PREFIX}${key}${JSONL_SUFFIX}`);
+  return join27(SESSION_INBOX_DIR, userId, `${TOPIC_ID_FILE_PREFIX}${key}${JSONL_SUFFIX}`);
 }
 function scheduledSessionInboxPath(userId, topicId) {
   const key = Buffer.from(topicId, "utf8").toString("base64url");
-  return join26(SESSION_INBOX_DIR, userId, `${TOPIC_ID_FILE_PREFIX}${key}${SCHEDULE_SUFFIX}`);
+  return join27(SESSION_INBOX_DIR, userId, `${TOPIC_ID_FILE_PREFIX}${key}${SCHEDULE_SUFFIX}`);
 }
 var TOPIC_ID_FILE_PREFIX = "topic-id-", JSONL_SUFFIX = ".jsonl", SCHEDULE_SUFFIX = ".schedule";
 var init_session_inbox_path = __esm(() => {
@@ -14371,12 +14465,12 @@ var init_session_inbox_path = __esm(() => {
 });
 
 // ../../packages/core/src/storage/session-inbox-signal.ts
-import { join as join27 } from "path";
+import { join as join28 } from "path";
 var SESSION_INBOX_WAKE_FILE, listeners;
 var init_session_inbox_signal = __esm(() => {
   init_config();
   init_logger();
-  SESSION_INBOX_WAKE_FILE = join27(SESSION_INBOX_DIR, ".wake");
+  SESSION_INBOX_WAKE_FILE = join28(SESSION_INBOX_DIR, ".wake");
   listeners = new Set;
 });
 
@@ -14413,14 +14507,14 @@ var init_session_inbox = __esm(async () => {
 });
 
 // ../../packages/core/src/query/session-inbox-cleanup.ts
-import { unlinkSync as unlinkSync15 } from "fs";
-import { basename as basename5, join as join28 } from "path";
+import { unlinkSync as unlinkSync16 } from "fs";
+import { basename as basename6, join as join29 } from "path";
 function cleanupSessionInboxFiles(userId, topicId, legacyTopicTitle) {
   const live = sessionInboxPath(userId, topicId);
   const scheduled = scheduledSessionInboxPath(userId, topicId);
   const candidates = new Set([live, `${live}.processing`, scheduled, `${scheduled}.processing`]);
-  if (legacyTopicTitle && legacyTopicTitle !== "." && legacyTopicTitle !== ".." && basename5(legacyTopicTitle) === legacyTopicTitle) {
-    const legacyBase = join28(SESSION_INBOX_DIR, userId, legacyTopicTitle);
+  if (legacyTopicTitle && legacyTopicTitle !== "." && legacyTopicTitle !== ".." && basename6(legacyTopicTitle) === legacyTopicTitle) {
+    const legacyBase = join29(SESSION_INBOX_DIR, userId, legacyTopicTitle);
     for (const suffix of [".jsonl", ".jsonl.processing", ".schedule", ".schedule.processing"]) {
       candidates.add(`${legacyBase}${suffix}`);
     }
@@ -14428,7 +14522,7 @@ function cleanupSessionInboxFiles(userId, topicId, legacyTopicTitle) {
   let deleted = deleteSessionInboxForTopic(topicId);
   for (const path of candidates) {
     try {
-      unlinkSync15(path);
+      unlinkSync16(path);
       deleted++;
     } catch (err) {
       if (err?.code !== "ENOENT") {
@@ -14445,64 +14539,6 @@ var init_session_inbox_cleanup = __esm(async () => {
   await init_session_inbox();
 });
 
-// ../../packages/core/src/query/state.ts
-import { mkdirSync as mkdirSync17, renameSync as renameSync9, unlinkSync as unlinkSync16, writeFileSync as writeFileSync15 } from "fs";
-import { basename as basename6, join as join29 } from "path";
-function createQueryStateStore(options) {
-  const sanitize = options.sanitizeTopicId ?? sanitizeId;
-  const queryStateDirPath = (userId) => join29(options.usersLogDir, String(userId), "active-queries");
-  const queryStateFile = (userId, topicId) => join29(queryStateDirPath(userId), `${sanitize(topicId)}.json`);
-  const legacyQueryStateFile = (userId, topicName) => {
-    if (!topicName || topicName === "." || topicName === ".." || basename6(topicName) !== topicName) {
-      return null;
-    }
-    return join29(queryStateDirPath(userId), `${topicName}.json`);
-  };
-  return {
-    write(userId, topicId, topicName, task) {
-      const dir = queryStateDirPath(userId);
-      mkdirSync17(dir, { recursive: true });
-      const state = { topicId, topicName, since: new Date().toISOString() };
-      if (task)
-        state.task = [...task.replace(/\n+/g, " ").trim()].slice(0, 100).join("");
-      const target = queryStateFile(userId, topicId);
-      const tmp = `${target}.${process.pid}.${Date.now()}.tmp`;
-      writeFileSync15(tmp, JSON.stringify(state));
-      renameSync9(tmp, target);
-    },
-    clear(userId, topicId, legacyTopicName) {
-      const paths = [
-        queryStateFile(userId, topicId),
-        legacyQueryStateFile(userId, legacyTopicName)
-      ].filter((path) => Boolean(path));
-      for (const path of new Set(paths)) {
-        try {
-          unlinkSync16(path);
-        } catch (error) {
-          if (error?.code !== "ENOENT") {
-            options.logger?.warn({ err: error, userId, topicId, path }, "Failed to clear query state file");
-          }
-        }
-      }
-    }
-  };
-}
-function writeQueryState(userId, topicId, topicName, task) {
-  defaultQueryStateStore.write(userId, topicId, topicName, task);
-}
-function clearQueryState(userId, topicId, legacyTopicName) {
-  defaultQueryStateStore.clear(userId, topicId, legacyTopicName);
-}
-var defaultQueryStateStore;
-var init_state = __esm(() => {
-  init_config();
-  init_logger();
-  defaultQueryStateStore = createQueryStateStore({
-    usersLogDir: USERS_LOG_DIR,
-    logger
-  });
-});
-
 // ../../packages/core/src/mcp/session-comm/peer-forward.ts
 var exports_peer_forward = {};
 __export(exports_peer_forward, {
@@ -19298,6 +19334,12 @@ var init_auth_check = __esm(async () => {
 
 // ../../packages/core/src/agents/mcp-tools/spawn-subagent.ts
 import { z as z5 } from "zod";
+function activeQueryUserId(topic) {
+  return topic?.participants.find((participant) => hasActiveQuery(participant.userId, topic.id))?.userId;
+}
+function persistedWatchUserId(topic) {
+  return activeQueryUserId(topic) ?? topic?.participants.find((participant) => participant.role === "owner")?.userId ?? topic?.participants[0]?.userId;
+}
 function createSubagentLifecycle(host) {
   const runtimeOwnerId = host.runtime.ownerId;
   const limits = Object.freeze({
@@ -19412,7 +19454,7 @@ function createSubagentLifecycle(host) {
   }
   function watchFromPersistedCard(message, card, queryId) {
     const child = host.storage.getTopic(card.subagentTopicId);
-    const userId = child?.participants.find((participant) => participant.role === "owner")?.userId ?? child?.participants[0]?.userId;
+    const userId = persistedWatchUserId(child);
     if (!userId)
       return null;
     return {
@@ -19771,6 +19813,10 @@ ${card.task}${reportInstruction}`;
     if (watch?.running)
       return "running";
     const card = host.storage.listSubagentMessages().filter((message) => message.topicId === parentTopicId && message.subagentCard?.subagentTopicId === childTopicId).at(-1)?.subagentCard;
+    if (!card || card.status === "failed") {
+      if (activeQueryUserId(host.storage.getTopic(childTopicId)))
+        return "running";
+    }
     return card?.status ?? "unknown";
   }
   function listMemoryTopicNames(ctx) {
@@ -19994,6 +20040,7 @@ var MAX_TASK_CHARS = 8000, MAX_NAME_CHARS = 80, MAX_LIVE_CHILDREN_PER_PARENT = 5
 var init_spawn_subagent = __esm(async () => {
   init_common();
   init_logger();
+  init_state();
   init_wiki_summary_names();
   init_types();
   await __promiseAll([
@@ -20090,7 +20137,9 @@ var init_spawn_subagent = __esm(async () => {
         if (getRuntimeUserTurnRequest(childTopicId))
           return true;
         const lease = getRuntimeTurnLease(childTopicId);
-        return Boolean(lease && processOwnerIsAlive(lease.ownerId));
+        if (lease && processOwnerIsAlive(lease.ownerId))
+          return true;
+        return Boolean(activeQueryUserId(getTopic(childTopicId)));
       }
     },
     config: {
@@ -23383,4 +23432,4 @@ export {
   createAgentHealthMcpServer
 };
 
-//# debugId=380404FE3C39663964756E2164756E21
+//# debugId=8058FA42EBEC001764756E2164756E21