negotium 0.22.4 → 0.22.6

package/dist/hosted-agent.js

@@ -1,51 +1,48 @@
 // @bun
 import {
-  canonicalMcpBridgeEnv,
-  revokeCanonicalMcpBridgeTurn
-} from "./chunk-f7p0h1gs.js";
-import {
-  AGENT_HEALTH_SERVER,
-  BASHRS_SPILL_ROOT,
-  BASH_RS_BIN,
-  BASH_RS_VERSION,
-  BG_BASH_BASE_PORT,
-  BG_BASH_MAX_PORT,
-  CANONICAL_MCP_PROXY_SERVER,
-  CLAUDE_EFFORT_VALUES,
-  CLAUDE_EXECUTABLE,
-  DECISION_SERVER,
-  DM_WORKSPACE_DIR,
-  FALLBACK_AGENT,
-  FILE_TAG_REGEX,
-  MODEL_FABLE,
-  MODEL_OPUS,
-  MODEL_SONNET,
-  NEGOTIUM_PORT,
-  PROJECT_ROOT,
-  RUNTIME_MCP_SECRET,
-  RUN_DIR,
-  SESSION_COMM_SERVER,
-  SESSION_WORKSPACE_DIR,
   SUPPORTED_AGENTS,
-  SYSTEM_HEALTH_SERVER,
-  TASK_SERVER,
-  TOKEN_STATS_SERVER,
-  TOPIC_WORKSPACE_DIR,
-  TSCONFIG_PATH,
-  TSX_LOADER,
-  VAULT_MASTER_KEY,
-  VAULT_SERVER,
-  WIKI_SERVER,
-  WORKSPACE_DIR,
-  codexAuthFilePath,
-  envText,
-  logger,
+  CLAUDE_EFFORT_VALUES,
   resolveFallbackAgent,
-  resolveTopicWorkspaceDir
-} from "./chunk-9zn0bkc9.js";
+  logger,
+  envText2,
+  PROJECT_ROOT2,
+  WORKSPACE_DIR2,
+  TOPIC_WORKSPACE_DIR2,
+  DM_WORKSPACE_DIR2,
+  SESSION_WORKSPACE_DIR2,
+  CLAUDE_EXECUTABLE2,
+  BASH_RS_VERSION2,
+  BASH_RS_BIN2,
+  TSX_LOADER2,
+  TSCONFIG_PATH2,
+  SESSION_COMM_SERVER2,
+  TASK_SERVER2,
+  DECISION_SERVER2,
+  CANONICAL_MCP_PROXY_SERVER2,
+  WIKI_SERVER2,
+  TOKEN_STATS_SERVER2,
+  SYSTEM_HEALTH_SERVER2,
+  AGENT_HEALTH_SERVER2,
+  VAULT_SERVER2,
+  BG_BASH_BASE_PORT2,
+  BG_BASH_MAX_PORT2,
+  resolveTopicWorkspaceDir2,
+  RUNTIME_MCP_SECRET2,
+  VAULT_MASTER_KEY2,
+  NEGOTIUM_PORT2,
+  RUN_DIR2,
+  BASHRS_SPILL_ROOT2,
+  FILE_TAG_REGEX2,
+  MODEL_SONNET2,
+  MODEL_OPUS2,
+  MODEL_FABLE2,
+  FALLBACK_AGENT2,
+  codexAuthFilePath2
+} from "./chunk-1mba9m1j.js";
 import {
-  __require
-} from "./chunk-2mx7fq49.js";
+  canonicalMcpBridgeEnv2,
+  revokeCanonicalMcpBridgeTurn2
+} from "./chunk-ww8a4ej4.js";
 
 // ../../packages/core/src/agents/claude-provider.ts
 import { spawn as spawn2 } from "child_process";
@@ -63,12 +60,12 @@ function toDisplayPath(filePath) {
 
 // ../../packages/core/src/agents/rollout/shared.ts
 var trustedWorkspaceRoots = [
-  WORKSPACE_DIR,
-  DM_WORKSPACE_DIR,
-  SESSION_WORKSPACE_DIR,
-  TOPIC_WORKSPACE_DIR
+  WORKSPACE_DIR2,
+  DM_WORKSPACE_DIR2,
+  SESSION_WORKSPACE_DIR2,
+  TOPIC_WORKSPACE_DIR2
 ].map((root) => resolve2(root));
-var FIXTURES_DIR = resolve2(PROJECT_ROOT, "src", "agents", "fixtures");
+var FIXTURES_DIR = resolve2(PROJECT_ROOT2, "src", "agents", "fixtures");
 
 // ../../packages/core/src/platform/jsonl.ts
 import {
@@ -154,9 +151,9 @@ function fsyncDirectoryBestEffort(dir) {
 
 // ../../packages/core/src/agents/claude-registry.ts
 var ALIAS_MAP = {
-  sonnet: MODEL_SONNET,
-  opus: MODEL_OPUS,
-  fable: MODEL_FABLE
+  sonnet: MODEL_SONNET2,
+  opus: MODEL_OPUS2,
+  fable: MODEL_FABLE2
 };
 var VALID_ALIASES = new Set(Object.keys(ALIAS_MAP));
 var VALID_EFFORTS = new Set(CLAUDE_EFFORT_VALUES);
@@ -523,12 +520,12 @@ class McpUrlBudgetExceededError extends Error {
     this.name = "McpUrlBudgetExceededError";
   }
 }
-var runtimePort = NEGOTIUM_PORT;
+var runtimePort = NEGOTIUM_PORT2;
 function encodeTokenPart(value) {
   return Buffer.from(JSON.stringify(value), "utf-8").toString("base64url");
 }
 function signTokenPayload(payloadPart) {
-  return createHmac("sha256", RUNTIME_MCP_SECRET).update(payloadPart).digest("base64url");
+  return createHmac("sha256", RUNTIME_MCP_SECRET2).update(payloadPart).digest("base64url");
 }
 function issueRuntimeMcpToken(ctx) {
   const payloadPart = encodeTokenPart({
@@ -680,9 +677,9 @@ function createBackgroundBashManager(options = {}) {
   const knownContexts = new Map;
   const runtimeCapability = options.capability ?? randomBytes(32).toString("hex");
   const runtimeServerId = options.serverId ?? randomBytes(16).toString("hex");
-  const bashRsBin = options.bashRsBin ?? BASH_RS_BIN;
-  const basePort = options.basePort ?? BG_BASH_BASE_PORT;
-  const maxPort = options.maxPort ?? BG_BASH_MAX_PORT;
+  const bashRsBin = options.bashRsBin ?? BASH_RS_BIN2;
+  const basePort = options.basePort ?? BG_BASH_BASE_PORT2;
+  const maxPort = options.maxPort ?? BG_BASH_MAX_PORT2;
   const fetchImpl = options.fetch ?? globalThis.fetch;
   const now = options.now ?? Date.now;
   const wait = options.delay ?? delay;
@@ -739,7 +736,7 @@ function createBackgroundBashManager(options = {}) {
   }
   async function spawnServer(key, reservedPort, excludedPorts = new Set) {
     if (!bashRsBin) {
-      throw new Error(`background-bash requires the bash-rs ${BASH_RS_VERSION} binary; run install-bash-rs.mjs (or set NEGOTIUM_BASH_RS_BIN)`);
+      throw new Error(`background-bash requires the bash-rs ${BASH_RS_VERSION2} binary; run install-bash-rs.mjs (or set NEGOTIUM_BASH_RS_BIN)`);
     }
     const port = reservedPort ?? await allocatePort(excludedPorts);
     const process2 = spawnImpl(bashRsBin, [String(port)], {
@@ -752,7 +749,7 @@ function createBackgroundBashManager(options = {}) {
         NEGOTIUM_BG_BASH_SERVER_ID: runtimeServerId,
         BASHRS_HTTP_CAPABILITY: runtimeCapability,
         BASHRS_INSTANCE_ID: runtimeServerId,
-        BASHRS_SPILL_ROOT
+        BASHRS_SPILL_ROOT: BASHRS_SPILL_ROOT2
       }
     });
     process2.once("error", (error) => {
@@ -839,12 +836,12 @@ function createBackgroundBashManager(options = {}) {
     usedPorts.clear();
     knownContexts.clear();
     const deadline = now() + 3000;
-    await Promise.all(entries.map((instance) => new Promise((resolve4) => {
+    await Promise.all(entries.map((instance) => new Promise((resolve) => {
       if (instance.process.exitCode !== null || instance.process.killed)
-        return resolve4();
-      instance.process.once("exit", resolve4);
-      instance.process.once("error", resolve4);
-      const timer = setTimeout(resolve4, Math.max(0, deadline - now()));
+        return resolve();
+      instance.process.once("exit", resolve);
+      instance.process.once("error", resolve);
+      const timer = setTimeout(resolve, Math.max(0, deadline - now()));
       timer.unref?.();
     })));
   }
@@ -1276,7 +1273,7 @@ var SCHEMA_TRIGGERS = {
 };
 var OTIUM_TOPIC_SCOPE_IMMUTABLE_ERROR = "otium_topic_scope_immutable";
 function topicLinkSchemaIsCurrent(database, nodeId) {
-  const objects = new Map(database.query("SELECT name, sql FROM sqlite_master WHERE type IN ('table','index','trigger')").all().map((row2) => [row2.name, row2.sql ?? ""]));
+  const objects = new Map(database.query("SELECT name, sql FROM sqlite_master WHERE type IN ('table','index','trigger')").all().map((row) => [row.name, row.sql ?? ""]));
   for (const name of [...SCHEMA_TABLES, ...SCHEMA_INDEXES, ...SCHEMA_INDEXES_TOMBSTONES]) {
     if (!objects.has(name))
       return false;
@@ -1293,7 +1290,7 @@ function topicLinkSchemaIsCurrent(database, nodeId) {
       return false;
   }
   const identity = database.query("SELECT node_id, epoch_id FROM api_node_identity WHERE singleton = 1").all();
-  if (identity.some((row2) => row2.epoch_id === null))
+  if (identity.some((row) => row.epoch_id === null))
     return false;
   if (nodeId && identity[0]?.node_id !== nodeId)
     return false;
@@ -2112,8 +2109,8 @@ function buildStdioMcpServer(agent, serverFile, serverArgs, env) {
   if (agent === "codex") {
     return {
       command: "node",
-      args: ["--import", TSX_LOADER, serverFile, ...serverArgs],
-      env: { TSX_TSCONFIG_PATH: TSCONFIG_PATH, ...env }
+      args: ["--import", TSX_LOADER2, serverFile, ...serverArgs],
+      env: { TSX_TSCONFIG_PATH: TSCONFIG_PATH2, ...env }
     };
   }
   return {
@@ -2123,12 +2120,12 @@ function buildStdioMcpServer(agent, serverFile, serverArgs, env) {
   };
 }
 function useHostedBuiltinMcp() {
-  return envText("NEGOTIUM_BUILTIN_MCP_TRANSPORT") !== "stdio";
+  return envText2("NEGOTIUM_BUILTIN_MCP_TRANSPORT") !== "stdio";
 }
 function buildBuiltinMcpServer(surface, ctx, stdio) {
   if (!useHostedBuiltinMcp())
     return stdio();
-  const agent = ctx.agent ?? FALLBACK_AGENT;
+  const agent = ctx.agent ?? FALLBACK_AGENT2;
   return buildHostedMcpSpec(agent, surface, {
     userId: ctx.userId,
     ...ctx.actorUserId ? { actorUserId: ctx.actorUserId } : {},
@@ -2140,7 +2137,7 @@ function buildBuiltinMcpServer(surface, ctx, stdio) {
     ...ctx.wikiTopicId ? { wikiTopicId: ctx.wikiTopicId } : {},
     ...ctx.subagentParentTopicId ? { subagentParentTopicId: ctx.subagentParentTopicId } : {},
     ...ctx.threadRootId ? { threadRootId: ctx.threadRootId } : {},
-    cwd: ctx.cwd ?? (ctx.topicId ? resolveTopicWorkspaceDir(ctx.topicId) : process.cwd()),
+    cwd: ctx.cwd ?? (ctx.topicId ? resolveTopicWorkspaceDir2(ctx.topicId) : process.cwd()),
     agent,
     ...ctx.model ? { model: ctx.model } : {},
     ...ctx.depth !== undefined ? { depth: ctx.depth } : {},
@@ -2253,7 +2250,7 @@ var MCP_CATALOG = {
         topicId,
         topicTitle: session,
         queryId,
-        cwd: cwd ?? resolveTopicWorkspaceDir(topicId),
+        cwd: cwd ?? resolveTopicWorkspaceDir2(topicId),
         agent,
         model,
         ...switchTargets.length ? { explicitAgentSwitchTargets: switchTargets } : {},
@@ -2268,7 +2265,7 @@ var MCP_CATALOG = {
   "token-stats": {
     ...commonRuntimeMcpPolicy("token-stats"),
     build(ctx) {
-      return buildBuiltinMcpServer("token-stats", ctx, () => buildStdioMcpServer(ctx.agent, TOKEN_STATS_SERVER, [`--user-id=${ctx.userId}`]));
+      return buildBuiltinMcpServer("token-stats", ctx, () => buildStdioMcpServer(ctx.agent, TOKEN_STATS_SERVER2, [`--user-id=${ctx.userId}`]));
     }
   },
   task: {
@@ -2278,19 +2275,19 @@ var MCP_CATALOG = {
       if (peerBridge) {
         if (!topicId || !queryId)
           return null;
-        const env = canonicalMcpBridgeEnv({
+        const env = canonicalMcpBridgeEnv2({
           surface: "task",
           userId,
           topicId,
           queryId,
           peerBridge
         });
-        return env ? buildStdioMcpServer(agent, CANONICAL_MCP_PROXY_SERVER, ["--surface=task"], env) : null;
+        return env ? buildStdioMcpServer(agent, CANONICAL_MCP_PROXY_SERVER2, ["--surface=task"], env) : null;
       }
       const args = [`--user-id=${userId}`, `--topic=${session}`];
       if (topicId)
         args.push(`--topic-id=${topicId}`);
-      return buildBuiltinMcpServer("task", ctx, () => buildStdioMcpServer(agent, TASK_SERVER, args));
+      return buildBuiltinMcpServer("task", ctx, () => buildStdioMcpServer(agent, TASK_SERVER2, args));
     }
   },
   decision: {
@@ -2300,25 +2297,25 @@ var MCP_CATALOG = {
       if (peerBridge) {
         if (!topicId || !queryId)
           return null;
-        const env = canonicalMcpBridgeEnv({
+        const env = canonicalMcpBridgeEnv2({
           surface: "decision",
           userId,
           topicId,
           queryId,
           peerBridge
         });
-        return env ? buildStdioMcpServer(agent, CANONICAL_MCP_PROXY_SERVER, ["--surface=decision"], env) : null;
+        return env ? buildStdioMcpServer(agent, CANONICAL_MCP_PROXY_SERVER2, ["--surface=decision"], env) : null;
       }
       const args = [
         `--user-id=${userId}`,
         `--topic=${session}`,
-        `--agent=${agent ?? FALLBACK_AGENT}`
+        `--agent=${agent ?? FALLBACK_AGENT2}`
       ];
       if (topicId)
         args.push(`--topic-id=${topicId}`);
       if (model)
         args.push(`--model=${model}`);
-      return buildBuiltinMcpServer("decision", ctx, () => buildStdioMcpServer(agent, DECISION_SERVER, args));
+      return buildBuiltinMcpServer("decision", ctx, () => buildStdioMcpServer(agent, DECISION_SERVER2, args));
     }
   },
   "session-comm": {
@@ -2338,7 +2335,7 @@ var MCP_CATALOG = {
         threadRootId,
         peerBridge
       } = ctx;
-      const effectiveAgent = agent ?? FALLBACK_AGENT;
+      const effectiveAgent = agent ?? FALLBACK_AGENT2;
       const cronSessionId = topicId ? getRegisteredCronSession(topicId, effectiveAgent)?.sessionId : undefined;
       const args = [
         `--user-id=${userId}`,
@@ -2358,7 +2355,7 @@ var MCP_CATALOG = {
         ...threadRootId ? [`--thread-root-id=${threadRootId}`] : [],
         ...peerBridge ? [`--peer-host-query-id=${peerBridge.hostQueryId}`] : []
       ];
-      return buildBuiltinMcpServer("session-comm", ctx, () => buildStdioMcpServer(effectiveAgent, SESSION_COMM_SERVER, args, peerBridge ? peerSessionBridgeIpcEnv() : undefined));
+      return buildBuiltinMcpServer("session-comm", ctx, () => buildStdioMcpServer(effectiveAgent, SESSION_COMM_SERVER2, args, peerBridge ? peerSessionBridgeIpcEnv() : undefined));
     }
   },
   wiki: {
@@ -2368,14 +2365,14 @@ var MCP_CATALOG = {
       if (peerBridge) {
         if (!topicId || !queryId)
           return null;
-        const env = canonicalMcpBridgeEnv({
+        const env = canonicalMcpBridgeEnv2({
           surface: "wiki",
           userId,
           topicId,
           queryId,
           peerBridge
         });
-        return env ? buildStdioMcpServer(agent, CANONICAL_MCP_PROXY_SERVER, ["--surface=wiki"], env) : null;
+        return env ? buildStdioMcpServer(agent, CANONICAL_MCP_PROXY_SERVER2, ["--surface=wiki"], env) : null;
       }
       const args = [`--user-id=${userId}`];
       if (topicId)
@@ -2384,7 +2381,7 @@ var MCP_CATALOG = {
       if (resolvedWikiTopicId)
         args.push(`--topic-id=${resolvedWikiTopicId}`);
       args.push("--surface=wiki");
-      return buildBuiltinMcpServer("wiki", { ...ctx, wikiTopicId: resolvedWikiTopicId }, () => buildStdioMcpServer(agent, WIKI_SERVER, args));
+      return buildBuiltinMcpServer("wiki", { ...ctx, wikiTopicId: resolvedWikiTopicId }, () => buildStdioMcpServer(agent, WIKI_SERVER2, args));
     }
   },
   skills: {
@@ -2394,13 +2391,13 @@ var MCP_CATALOG = {
       const args = [`--user-id=${userId}`, "--surface=skills"];
       if (topicId)
         args.push(`--topic-id=${topicId}`);
-      return buildBuiltinMcpServer("skills", ctx, () => buildStdioMcpServer(agent, WIKI_SERVER, args));
+      return buildBuiltinMcpServer("skills", ctx, () => buildStdioMcpServer(agent, WIKI_SERVER2, args));
     }
   },
   "system-health": {
     ...commonRuntimeMcpPolicy("system-health"),
     build(ctx) {
-      return buildBuiltinMcpServer("system-health", ctx, () => buildStdioMcpServer(ctx.agent, SYSTEM_HEALTH_SERVER, []));
+      return buildBuiltinMcpServer("system-health", ctx, () => buildStdioMcpServer(ctx.agent, SYSTEM_HEALTH_SERVER2, []));
     }
   },
   "background-bash": {
@@ -2416,7 +2413,7 @@ var MCP_CATALOG = {
     build(ctx) {
       const { userId, agent } = ctx;
       const args = [`--user-id=${userId}`];
-      return buildBuiltinMcpServer("agent-health", ctx, () => buildStdioMcpServer(agent, AGENT_HEALTH_SERVER, args));
+      return buildBuiltinMcpServer("agent-health", ctx, () => buildStdioMcpServer(agent, AGENT_HEALTH_SERVER2, args));
     }
   },
   vault: {
@@ -2426,7 +2423,7 @@ var MCP_CATALOG = {
       const args = [`--user-id=${vaultUserId ?? userId}`];
       if (agent !== "codex")
         args.push("--list-only=true");
-      return buildBuiltinMcpServer("vault", { ...ctx, userId: vaultUserId ?? userId }, () => buildStdioMcpServer(agent, VAULT_SERVER, args));
+      return buildBuiltinMcpServer("vault", { ...ctx, userId: vaultUserId ?? userId }, () => buildStdioMcpServer(agent, VAULT_SERVER2, args));
     }
   },
   "cua-rs": {
@@ -2455,6 +2452,12 @@ refreshForumCatalogViews();
 function isReservedRuntimeMcpServerName(name) {
   return Object.hasOwn(MCP_CATALOG, name) || nodeMcpEntries.some((entry) => entry.key === name);
 }
+var MANAGER_ONLY_HOST_MCP_NAMES = new Set(["topic-admin"]);
+function withoutManagerOnlyHostMcpServers(hostMcpServers) {
+  if (!hostMcpServers)
+    return;
+  return Object.fromEntries(Object.entries(hostMcpServers).filter(([name]) => !MANAGER_ONLY_HOST_MCP_NAMES.has(name)));
+}
 function mergeHostMcpServers(base, hostMcpServers) {
   if (!hostMcpServers)
     return base;
@@ -2682,7 +2685,7 @@ function getMcpServersForQuery(opts) {
       fileDeliveryTools: opts.fileDeliveryTools
     }), opts.hostMcpServers), opts.topicId);
   }
-  return hideProviderIntrospectionForOtium(getForumMcpServers({
+  return hideProviderIntrospectionForOtium(mergeHostMcpServers(getForumMcpServers({
     userId: opts.userId || "local",
     actorUserId: opts.actorUserId,
     actorTopicScope: opts.actorTopicScope,
@@ -2709,7 +2712,7 @@ function getMcpServersForQuery(opts) {
     extra: opts.mcpExtra,
     silent: opts.silent,
     peerBridge: opts.peerBridge
-  }), opts.topicId);
+  }), withoutManagerOnlyHostMcpServers(opts.hostMcpServers)), opts.topicId);
 }
 function hideProviderIntrospectionForOtium(servers, topicId) {
   if (!topicId || getTopic(topicId)?.surface !== "otium")
@@ -2769,16 +2772,16 @@ function decryptVaultValueWithKey(userId, key, storedValue, masterKey) {
 }
 
 // ../../packages/core/src/storage/vault-crypto.ts
-function encryptVaultValue(userId, key, value, masterKey = VAULT_MASTER_KEY) {
+function encryptVaultValue(userId, key, value, masterKey = VAULT_MASTER_KEY2) {
   return encryptVaultValueWithKey(userId, key, value, masterKey);
 }
-function decryptVaultValue(userId, key, storedValue, masterKey = VAULT_MASTER_KEY) {
+function decryptVaultValue(userId, key, storedValue, masterKey = VAULT_MASTER_KEY2) {
   return decryptVaultValueWithKey(userId, key, storedValue, masterKey);
 }
 
 // ../../packages/core/src/storage/vault.ts
 var vaultDb;
-var vaultMasterKey = VAULT_MASTER_KEY;
+var vaultMasterKey = VAULT_MASTER_KEY2;
 function initializeVaultDatabase(database) {
   database.exec("PRAGMA journal_mode = WAL");
   database.exec("PRAGMA busy_timeout = 5000");
@@ -2918,8 +2921,8 @@ var defaultHost = {
   redactVaultSecrets,
   substituteVaultSecrets: (userId, value) => vaultSubstituteDetailed(userId, value).text,
   referencesRuntimeSecretStorage,
-  claudeCodeExecutablePath: () => CLAUDE_EXECUTABLE,
-  codexAuthFilePath
+  claudeCodeExecutablePath: () => CLAUDE_EXECUTABLE2,
+  codexAuthFilePath: codexAuthFilePath2
 };
 var hostRegistrations = [];
 var scopedHost = new AsyncLocalStorage;
@@ -2984,7 +2987,7 @@ function hostedCodexHomePath() {
 
 // ../../packages/core/src/media/file-events.ts
 function* extractFileEvents(text, source) {
-  const tagRegex = new RegExp(FILE_TAG_REGEX.source, "gi");
+  const tagRegex = new RegExp(FILE_TAG_REGEX2.source, "gi");
   let match = tagRegex.exec(text);
   while (match !== null) {
     yield { type: "file", path: match[1], source, origin: "tag" };
@@ -3126,8 +3129,8 @@ var CLAUDE_ABORT_SIGKILL_DELAY_MS = 2500;
 var claudeProcessExitListeners = new WeakMap;
 function watchClaudeProcessExit(signal) {
   let listener;
-  const exited = new Promise((resolve5) => {
-    listener = resolve5;
+  const exited = new Promise((resolve) => {
+    listener = resolve;
     const listeners = claudeProcessExitListeners.get(signal) ?? new Set;
     listeners.add(listener);
     claudeProcessExitListeners.set(signal, listeners);
@@ -3584,7 +3587,7 @@ import { tmpdir } from "os";
 import { dirname as dirname5, join as join3 } from "path";
 
 // ../../packages/core/src/version.ts
-var NEGOTIUM_VERSION = "0.22.4";
+var NEGOTIUM_VERSION = "0.22.6";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 var moduleRequire = createRequire(import.meta.url);
@@ -3652,7 +3655,7 @@ async function bootstrapCodexModelCache(codexHome, cachePath) {
     stdio: ["pipe", "pipe", "pipe"],
     windowsHide: true
   });
-  const refreshed = new Promise((resolve5, reject) => {
+  const refreshed = new Promise((resolve, reject) => {
     let settled = false;
     let stdoutBuffer = "";
     let stderr = "";
@@ -3671,7 +3674,7 @@ async function bootstrapCodexModelCache(codexHome, cachePath) {
       else if (!existsSync2(cachePath))
         reject(new Error("Codex did not create its model cache"));
       else
-        resolve5();
+        resolve();
     };
     const send = (message) => {
       child.stdin.write(`${JSON.stringify(message)}
@@ -3738,12 +3741,12 @@ var CODEX_BOOTSTRAP_EXIT_WAIT_MS = 3000;
 function waitForChildExit(child, timeoutMs) {
   if (child.exitCode !== null || child.signalCode !== null)
     return Promise.resolve();
-  return new Promise((resolve5) => {
-    const timer = setTimeout(resolve5, timeoutMs);
+  return new Promise((resolve) => {
+    const timer = setTimeout(resolve, timeoutMs);
     timer.unref?.();
     child.once("exit", () => {
       clearTimeout(timer);
-      resolve5();
+      resolve();
     });
   });
 }
@@ -3877,12 +3880,12 @@ function createCodexTreeManager(host, options = {}) {
     const previous = spawnChain;
     let release;
     let released = false;
-    spawnChain = new Promise((resolve5) => {
+    spawnChain = new Promise((resolve) => {
       release = () => {
         if (released)
           return;
         released = true;
-        resolve5();
+        resolve();
       };
     });
     await previous;
@@ -3989,7 +3992,7 @@ function createCodexTreeManager(host, options = {}) {
       return;
     const deadline = Date.now() + Math.max(0, graceMs);
     while (Date.now() < deadline && hasSurvivors(plan.targets)) {
-      await new Promise((resolve5) => setTimeout(resolve5, Math.min(100, Math.max(1, deadline - Date.now()))));
+      await new Promise((resolve) => setTimeout(resolve, Math.min(100, Math.max(1, deadline - Date.now()))));
     }
     killStragglers(plan);
   }
@@ -4313,7 +4316,7 @@ async function createCodexVaultHookBridge(userId) {
     });
     restrictIpcEndpoint(socketPath);
     if (IS_WINDOWS2) {
-      const { BINARIES_DIR } = await import("./chunk-q5djsg78.js");
+      const { BINARIES_DIR } = await import("./chunk-bnyvxss3.js");
       const cached = await ensureCodexWindowsWrapperExe(join5(BINARIES_DIR, "codex-hook-wrapper"));
       await copyFile(cached, wrapperPath);
       await writeFile2(join5(root, "codex-with-hooks.cfg"), [process.execPath, codexCliScriptPath(), socketPath, token].join(`
@@ -5052,9 +5055,9 @@ async function startStreamedWithTracking(thread, prompt, abortSignal, trackedPid
       nextP.catch(() => {});
       first = await Promise.race([nextP, startupTimeout]);
     } catch (err) {
-      const novel2 = findNewCodexChildren(baseline);
-      if (novel2.length > 0) {
-        killCodexTrees(novel2);
+      const novel = findNewCodexChildren(baseline);
+      if (novel.length > 0) {
+        killCodexTrees(novel);
       }
       await closeIterator(iter);
       throw err;
@@ -5526,7 +5529,7 @@ function buildProviderOwnedToolBlockHook() {
     }
   };
 }
-var MAESTRO_TOOL_OUTPUT_DIR = resolve8(RUN_DIR, "maestro-tool-outputs");
+var MAESTRO_TOOL_OUTPUT_DIR = resolve8(RUN_DIR2, "maestro-tool-outputs");
 function buildMaestroToolResultTruncation(opts) {
   if (opts.toolResultTruncation)
     return opts.toolResultTruncation;
@@ -5620,7 +5623,7 @@ async function* runHostedAgent(input, host) {
     }
   } finally {
     if (opts.userId && opts.topicId && opts.queryId && opts.peerBridge) {
-      revokeCanonicalMcpBridgeTurn({
+      revokeCanonicalMcpBridgeTurn2({
         userId: opts.userId,
         topicId: opts.topicId,
         queryId: opts.queryId,
@@ -5630,17 +5633,17 @@ async function* runHostedAgent(input, host) {
   }
 }
 export {
-  toCodexMcpServers,
-  spawnClaudeCodeProcessWithTreeKill,
-  runHostedAgent,
-  maestroProvider,
-  inspectBundledClaudeRuntime,
-  configureAgentExecutionHost,
-  codexProvider,
-  claudeProvider,
-  buildMaestroToolHooks,
+  buildClaudeDisallowedTools,
   buildMaestroDisallowedTools,
-  buildClaudeDisallowedTools
+  buildMaestroToolHooks,
+  claudeProvider,
+  codexProvider,
+  configureAgentExecutionHost,
+  inspectBundledClaudeRuntime,
+  maestroProvider,
+  runHostedAgent,
+  spawnClaudeCodeProcessWithTreeKill,
+  toCodexMcpServers
 };
 
-//# debugId=052575FE43ABD9DA64756E2164756E21
+//# debugId=BB59DA8C13CF133464756E2164756E21