negotium 0.5.9 → 0.5.12

package/dist/agent-helpers.js

@@ -175,6 +175,11 @@ function resolveAgentEnv(envKey, fallback, legacyEnvKey) {
   const value = envText(envKey) ?? (legacyEnvKey ? envText(legacyEnvKey) : undefined);
   return isAgentKind(value) ? value : fallback;
 }
+function resolveStateDir() {
+  const configured = envText("NEGOTIUM_STATE_DIR");
+  if (false) {}
+  return configured ? resolve2(configured) : resolve2(HOME, ".negotium");
+}
 function resolveProjectRoot() {
   const moduleDir = dirname(fileURLToPath(import.meta.url));
   const packagedRuntime = resolve2(moduleDir, "runtime");
@@ -338,15 +343,14 @@ 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_ENV, 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", BROWSER_RS_VERSION = "v0.1.23", BROWSER_RS_MIN_SECURE_VERSION = "0.1.15", BROWSER_RS_VERSION_PROBE_TIMEOUT_MS = 15000, SNIPPETS_API_URL, BROWSER_RS_BIN, BASH_RS_VERSION = "v0.1.7", BASH_RS_BIN, PLAYWRIGHT_MCP_BIN, TSX_BIN, 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, 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, FILE_TAG_REGEX, MODEL_SONNET = "claude-sonnet-5", MODEL_OPUS = "claude-opus-5", MODEL_FABLE = "claude-fable-5", FALLBACK_AGENT, SESSION_AGENT, GATEWAY_AGENT, FALLBACK_MODEL, SESSION_MODEL, GATEWAY_MODEL, 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", BROWSER_RS_VERSION = "v0.1.23", BROWSER_RS_MIN_SECURE_VERSION = "0.1.15", BROWSER_RS_VERSION_PROBE_TIMEOUT_MS = 15000, SNIPPETS_API_URL, BROWSER_RS_BIN, BASH_RS_VERSION = "v0.1.7", BASH_RS_BIN, PLAYWRIGHT_MCP_BIN, TSX_BIN, 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, 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, FILE_TAG_REGEX, MODEL_SONNET = "claude-sonnet-5", MODEL_OPUS = "claude-opus-5", MODEL_FABLE = "claude-fable-5", FALLBACK_AGENT, SESSION_AGENT, GATEWAY_AGENT, FALLBACK_MODEL, SESSION_MODEL, GATEWAY_MODEL, 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();
   init_types();
   HOME = homedir();
   PROJECT_ROOT = resolveProjectRoot();
-  STATE_DIR_ENV = envText("NEGOTIUM_STATE_DIR");
-  STATE_DIR = STATE_DIR_ENV ? resolve2(STATE_DIR_ENV) : resolve2(HOME, ".negotium");
+  STATE_DIR = resolveStateDir();
   WORKSPACE_DIR = resolveLocalStateDir("NEGOTIUM_WORKSPACE_DIR", "workspace");
   TOPIC_WORKSPACE_DIR = resolve2(WORKSPACE_DIR, "topics");
   SHARED_WIKI_DIR = resolve2(WORKSPACE_DIR, "wiki");
@@ -2439,7 +2443,7 @@ var init_claude_registry = __esm(() => {
 });
 
 // ../../packages/core/src/version.ts
-var NEGOTIUM_VERSION = "0.5.9";
+var NEGOTIUM_VERSION = "0.5.12";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 import { spawn as spawn2 } from "child_process";
@@ -6023,14 +6027,8 @@ function buildVaultHook(userId) {
 function buildMaestroToolHooks(userId) {
   return [buildVaultHook(userId), buildProviderOwnedToolBlockHook()];
 }
-function providerOwnedToolRedirect(toolName) {
-  if (toolName === PROVIDER_ASK_USER_TOOL) {
-    return "Use the runtime ask_user_question MCP tool instead.";
-  }
-  if (toolName === PROVIDER_SUBAGENT_TOOL) {
-    return "Use the runtime spawn_subagent MCP tool instead.";
-  }
-  return "Use the shared task MCP tools instead " + "(mcp__task__task_create / task_update / task_list / task_get / task_delete).";
+function providerOwnedToolRedirect() {
+  return "Use the runtime ask_user_question MCP tool instead.";
 }
 function resolveMaestroApiKeyOverrides(userId) {
   if (!userId)
@@ -6052,7 +6050,7 @@ function buildProviderOwnedToolBlockHook() {
         return { decision: "allow" };
       return {
         decision: "block",
-        error: `${toolName} is disabled in this environment. ${providerOwnedToolRedirect(toolName)}`
+        error: `${toolName} is disabled in this environment. ${providerOwnedToolRedirect()}`
       };
     }
   };
@@ -6088,31 +6086,15 @@ function maestroProvider(opts) {
   };
   return sdkMaestroProvider(sdkOpts);
 }
-var MAESTRO_DEFAULT_MAX_TOKENS = 32768, PROVIDER_ASK_USER_TOOL = "AskUserQuestion", PROVIDER_SUBAGENT_TOOL = "Agent", MAESTRO_NATIVE_TASK_TOOLS, MAESTRO_PROVIDER_OWNED_TOOL_SET, DEFAULT_MAESTRO_DISALLOWED_TOOLS, MAESTRO_ALL_BUILTIN_TOOLS, MAESTRO_TOOL_OUTPUT_DIR;
+var MAESTRO_DEFAULT_MAX_TOKENS = 32768, PROVIDER_ASK_USER_TOOL = "AskUserQuestion", MAESTRO_PROVIDER_OWNED_TOOL_SET, DEFAULT_MAESTRO_DISALLOWED_TOOLS, MAESTRO_ALL_BUILTIN_TOOLS, MAESTRO_TOOL_OUTPUT_DIR;
 var init_maestro_provider = __esm(async () => {
   init_maestro_bootstrap_env();
   await init_execution_host();
   init_vault_tool_policy();
   init_config();
   await init_vault();
-  MAESTRO_NATIVE_TASK_TOOLS = [
-    "TaskCreate",
-    "TaskUpdate",
-    "TaskList",
-    "TaskGet",
-    "TaskOutput",
-    "TaskStop"
-  ];
-  MAESTRO_PROVIDER_OWNED_TOOL_SET = new Set([
-    PROVIDER_ASK_USER_TOOL,
-    PROVIDER_SUBAGENT_TOOL,
-    ...MAESTRO_NATIVE_TASK_TOOLS
-  ]);
-  DEFAULT_MAESTRO_DISALLOWED_TOOLS = [
-    PROVIDER_ASK_USER_TOOL,
-    PROVIDER_SUBAGENT_TOOL,
-    ...MAESTRO_NATIVE_TASK_TOOLS
-  ];
+  MAESTRO_PROVIDER_OWNED_TOOL_SET = new Set([PROVIDER_ASK_USER_TOOL]);
+  DEFAULT_MAESTRO_DISALLOWED_TOOLS = [PROVIDER_ASK_USER_TOOL];
   MAESTRO_ALL_BUILTIN_TOOLS = [
     "Bash",
     "Read",
@@ -13326,6 +13308,35 @@ var init_session_inbox_path = __esm(() => {
   init_config();
 });
 
+// ../../packages/core/src/storage/session-inbox.ts
+function deleteSessionInboxForTopic(topicId) {
+  return Number(db.run("DELETE FROM session_inbox WHERE topic_id = ?", [topicId]).changes ?? 0);
+}
+var init_session_inbox = __esm(async () => {
+  await init_forum_db();
+  await init_storage_host();
+  registerStorageSchemaInitializer((database) => {
+    database.exec(`
+    CREATE TABLE IF NOT EXISTS session_inbox (
+      sequence    INTEGER PRIMARY KEY AUTOINCREMENT,
+      id          TEXT NOT NULL UNIQUE,
+      user_id     TEXT NOT NULL,
+      topic_id    TEXT NOT NULL,
+      payload     TEXT NOT NULL,
+      status      TEXT NOT NULL DEFAULT 'pending'
+                  CHECK (status IN ('pending', 'processing')),
+      claimed_by  TEXT,
+      claimed_at  INTEGER,
+      created_at  INTEGER NOT NULL
+    );
+    CREATE INDEX IF NOT EXISTS idx_session_inbox_ready
+      ON session_inbox(status, user_id, topic_id, sequence);
+    CREATE INDEX IF NOT EXISTS idx_session_inbox_topic
+      ON session_inbox(topic_id);
+  `);
+  }, 35);
+});
+
 // ../../packages/core/src/query/session-inbox-cleanup.ts
 import { unlinkSync as unlinkSync14 } from "fs";
 import { basename as basename3, join as join23 } from "path";
@@ -13339,7 +13350,7 @@ function cleanupSessionInboxFiles(userId, topicId, legacyTopicTitle) {
       candidates.add(`${legacyBase}${suffix}`);
     }
   }
-  let deleted = 0;
+  let deleted = deleteSessionInboxForTopic(topicId);
   for (const path of candidates) {
     try {
       unlinkSync14(path);
@@ -13352,10 +13363,11 @@ function cleanupSessionInboxFiles(userId, topicId, legacyTopicTitle) {
   }
   return deleted;
 }
-var init_session_inbox_cleanup = __esm(() => {
+var init_session_inbox_cleanup = __esm(async () => {
   init_config();
   init_logger();
   init_session_inbox_path();
+  await init_session_inbox();
 });
 
 // ../../packages/core/src/query/state.ts
@@ -14535,7 +14547,7 @@ var init_lifecycle = __esm(async () => {
   init_logger();
   await init_manager2();
   await init_active_rooms();
-  init_session_inbox_cleanup();
+  await init_session_inbox_cleanup();
   init_state();
   await init_ask_callbacks();
   init_file_hooks();
@@ -15321,6 +15333,7 @@ async function runTurnEventStream(topicId, topicTitle, queryId, events, control,
   const peerBridge = execution?.peerBridge ?? control.injectParams?.peerBridge;
   let errorOccurred = false;
   let terminalEmitted = false;
+  let lastEventType = null;
   let pendingSawDelta = false;
   let accumulatedText = "";
   let pendingText = "";
@@ -15454,6 +15467,7 @@ async function runTurnEventStream(topicId, topicTitle, queryId, events, control,
     for await (const event of events) {
       if (abortController.signal.aborted)
         break;
+      lastEventType = event.type;
       if (!control.providerTurnContentObserved && (event.type === "text_delta" || event.type === "text" || event.type === "reasoning" || event.type === "tool_use" || event.type === "tool_result" || event.type === "file" || event.type === "result")) {
         control.providerTurnContentObserved = true;
         if (control.sessionId) {
@@ -15842,12 +15856,23 @@ ${JSON.stringify(event.input ?? {})}`);
         deliverAskError(queryId, topicTitle, msg);
     }
   } finally {
+    if (!terminalEmitted && !abortController.signal.aborted) {
+      const error = "Provider stream ended without a terminal event";
+      outcome = { kind: "provider-error", error };
+      logger.warn({
+        topicId,
+        queryId,
+        agentType,
+        model,
+        silent,
+        lastEventType,
+        hadAssistantOutput: visibleMessageIds.length > 0 || pendingText.length > 0,
+        hadToolActivity: syntheticToolCounter > 0 || providerToolIds.size > 0
+      }, "ai: provider stream ended without result, error, or abort");
+    }
     const discardIncompleteSegments = outcome.kind === "session-expired" || outcome.kind === "provider-error" || !terminalEmitted && !abortController.signal.aborted;
     if (discardIncompleteSegments)
       discardVisibleAssistantMessages();
-    if (!terminalEmitted && !silent) {
-      hub.broadcastDone(topicId, queryId, undefined, { agent: agentType, model });
-    }
     const stillCurrent = getRoomQuery(roomId)?.queryId === queryId;
     clearRoomQuery(roomId, queryId);
     cancelPendingAskUserQuestions(topicId, queryId);
@@ -17203,7 +17228,7 @@ function triggerTopicAiTurn(topicId, userId, prompt, agentType, opts) {
   if (!opts?.silent && !opts?.hideInjectMessage) {
     const now = new Date().toISOString();
     const injectMsg = {
-      id: `tell-${randomUUID16()}`,
+      id: opts?.requestId ? `tell-${opts.requestId}` : `tell-${randomUUID16()}`,
       topicId,
       authorId: opts?.injectAuthorId ?? userId,
       sourceAdapter: opts?.injectSourceAdapter,
@@ -17215,8 +17240,13 @@ function triggerTopicAiTurn(topicId, userId, prompt, agentType, opts) {
       model: execution.model,
       createdAt: now
     };
-    appendApiMessage(injectMsg);
-    WsHub.get().broadcastMessage(topicId, injectMsg);
+    try {
+      appendApiMessage(injectMsg);
+      WsHub.get().broadcastMessage(topicId, injectMsg);
+    } catch (error) {
+      if (!opts?.requestId || !getApiMessage(topicId, injectMsg.id))
+        throw error;
+    }
   }
   return startAiTurn({
     topic: topicCfg,
@@ -19189,4 +19219,4 @@ export {
   DEFAULT_SELF_CONFIG_PRODUCT
 };
 
-//# debugId=5C27F540959207AC64756E2164756E21
+//# debugId=751F37A04AE5257A64756E2164756E21