negotium 0.2.4 → 0.2.5

package/dist/agent-helpers.js

@@ -331,7 +331,7 @@ function resolveDefaultModel(agent, registryDefaultModel) {
 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, CONTEXTS_DIR, DM_WORKSPACE_DIR, SESSION_WORKSPACE_DIR, CLAUDE_EXECUTABLE_ENV, CLAUDE_EXECUTABLE, DEFAULT_OUTPUT_LANGUAGE = "English", BROWSER_RS_VERSION = "v0.1.16", BROWSER_RS_MIN_SECURE_VERSION = "0.1.15", BROWSER_RS_BIN, PLAYWRIGHT_MCP_BIN, TSX_BIN, TSX_LOADER, TSCONFIG_PATH, SESSION_COMM_SERVER, TASK_SERVER, BROWSER_MCP_SSE_PROXY_SERVER, CANONICAL_MCP_PROXY_SERVER, WIKI_SERVER, TOKEN_STATS_SERVER, COMPACTION_LOG_SERVER, SYSTEM_HEALTH_SERVER, AGENT_HEALTH_SERVER, BACKGROUND_BASH_SERVER, VAULT_SERVER, BG_BASH_BASE_PORT, BG_BASH_MAX_PORT, RUNTIME_MCP_SECRET, NODE_CONTROL_TOKEN, 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, 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, _envMaxTellDepth, MAX_TELL_DEPTH;
+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.16", BROWSER_RS_MIN_SECURE_VERSION = "0.1.15", BROWSER_RS_BIN, PLAYWRIGHT_MCP_BIN, TSX_BIN, TSX_LOADER, TSCONFIG_PATH, SESSION_COMM_SERVER, TASK_SERVER, BROWSER_MCP_SSE_PROXY_SERVER, CANONICAL_MCP_PROXY_SERVER, WIKI_SERVER, TOKEN_STATS_SERVER, COMPACTION_LOG_SERVER, SYSTEM_HEALTH_SERVER, AGENT_HEALTH_SERVER, BACKGROUND_BASH_SERVER, VAULT_SERVER, BG_BASH_BASE_PORT, BG_BASH_MAX_PORT, RUNTIME_MCP_SECRET, NODE_CONTROL_TOKEN, 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, 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, _envMaxTellDepth, MAX_TELL_DEPTH;
 var init_config = __esm(() => {
   init_config_helpers();
   init_logger();
@@ -348,7 +348,6 @@ var init_config = __esm(() => {
   BROWSER_PROFILES_DIR = resolve2(BROWSER_DIR, "profiles");
   BINARIES_DIR = resolve2(STATE_DIR, "binaries");
   SECRETS_DIR = resolve2(STATE_DIR, "secrets");
-  CONTEXTS_DIR = resolve2(STATE_DIR, "data", "contexts");
   DM_WORKSPACE_DIR = resolve2(STATE_DIR, "data", "dm");
   SESSION_WORKSPACE_DIR = resolve2(STATE_DIR, "data", "sessions");
   CLAUDE_EXECUTABLE_ENV = envText("NEGOTIUM_CLAUDE_EXECUTABLE");
@@ -408,7 +407,6 @@ var init_config = __esm(() => {
   mkdirSync(TOPIC_WORKSPACE_DIR, { recursive: true });
   mkdirSync(SHARED_WIKI_DIR, { recursive: true });
   mkdirSync(CRON_WORKSPACE_DIR, { recursive: true });
-  mkdirSync(CONTEXTS_DIR, { recursive: true });
   mkdirSync(DM_WORKSPACE_DIR, { recursive: true });
   mkdirSync(SESSION_WORKSPACE_DIR, { recursive: true });
   mkdirSync(BROWSER_DIR, { recursive: true });
@@ -951,6 +949,7 @@ function getManagerMcpServers(opts) {
 function getForumMcpServers(opts) {
   const {
     userId,
+    vaultUserId,
     session,
     topicId,
     subagentParentTopicId,
@@ -981,6 +980,7 @@ function getForumMcpServers(opts) {
   };
   const base = buildScope("forum", {
     userId,
+    vaultUserId,
     session,
     topicId,
     subagentParentTopicId,
@@ -1074,6 +1074,7 @@ function getMcpServersForQuery(opts) {
   }
   return getForumMcpServers({
     userId: opts.userId || "local",
+    vaultUserId: opts.vaultUserId,
     session: opts.session || "default",
     topicId: opts.topicId,
     subagentParentTopicId: opts.subagentParentTopicId,
@@ -1275,11 +1276,11 @@ var init_mcp_config = __esm(() => {
     vault: {
       ...commonRuntimeMcpPolicy("vault"),
       build(ctx) {
-        const { userId, agent } = ctx;
-        const args = [`--user-id=${userId}`];
+        const { userId, vaultUserId, agent } = ctx;
+        const args = [`--user-id=${vaultUserId ?? userId}`];
         if (agent !== "codex")
           args.push("--list-only=true");
-        return buildBuiltinMcpServer("vault", ctx, () => buildStdioMcpServer(agent, VAULT_SERVER, args));
+        return buildBuiltinMcpServer("vault", { ...ctx, userId: vaultUserId ?? userId }, () => buildStdioMcpServer(agent, VAULT_SERVER, args));
       }
     }
   };
@@ -1617,6 +1618,14 @@ function renderUserPromptBatch(prompts) {
   ].join(`
 `);
 }
+function renderUserTurnPrompt(message) {
+  const rawLabel = message.actorLabel?.trim() || message.actorUserId?.trim();
+  const label = rawLabel?.replace(/[\r\n\t]+/g, " ").replace(/\[/g, "(").replace(/\]/g, ")").replace(/\s{2,}/g, " ");
+  return label ? `[@${label}]: ${message.prompt}` : message.prompt;
+}
+function renderUserTurnBatch(messages) {
+  return renderUserPromptBatch(messages.map(renderUserTurnPrompt));
+}
 
 // ../../packages/core/src/agents/rollout/shared.ts
 import { mkdirSync as mkdirSync3 } from "fs";
@@ -2138,7 +2147,7 @@ var init_claude_registry = __esm(() => {
 });
 
 // ../../packages/core/src/version.ts
-var NEGOTIUM_VERSION = "0.2.4";
+var NEGOTIUM_VERSION = "0.2.5";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 import { spawn as spawn2 } from "child_process";
@@ -2434,6 +2443,18 @@ function patchEnvContext(envContext, cwd, currentDate, timezone) {
     }
   }
 }
+function codexRolloutPath(threadId, fallback) {
+  const threadCreatedAt = decodeUuidV7Timestamp(threadId);
+  const createdAt = threadCreatedAt === null ? fallback : new Date(threadCreatedAt);
+  const yyyy = String(createdAt.getFullYear());
+  const mm = String(createdAt.getMonth() + 1).padStart(2, "0");
+  const dd = String(createdAt.getDate()).padStart(2, "0");
+  const hh = String(createdAt.getHours()).padStart(2, "0");
+  const min = String(createdAt.getMinutes()).padStart(2, "0");
+  const ss = String(createdAt.getSeconds()).padStart(2, "0");
+  const dir = join6(codexSessionsDir(), yyyy, mm, dd);
+  return join6(dir, `rollout-${yyyy}-${mm}-${dd}T${hh}-${min}-${ss}-${threadId}.jsonl`);
+}
 function canonicalFilePath(path) {
   const absolute = resolve4(path);
   try {
@@ -2746,12 +2767,7 @@ function writeCodexRollout(opts) {
     type: "event_msg",
     payload: { type: "task_complete" }
   });
-  const yyyy = now.getUTCFullYear();
-  const mm = String(now.getUTCMonth() + 1).padStart(2, "0");
-  const dd = String(now.getUTCDate()).padStart(2, "0");
-  const tsStr = tsIso.replace(/[:.]/g, "-").slice(0, 19);
-  const dir = join6(codexSessionsDir(), String(yyyy), mm, dd);
-  const path = join6(dir, `rollout-${tsStr}-${threadId}.jsonl`);
+  const path = codexRolloutPath(threadId, now);
   if (opts.threadId) {
     sweepPriorRolloutsForThread(opts.threadId);
   }
@@ -3930,7 +3946,7 @@ async function* claudeProvider(opts) {
                   }
                 };
               }
-              const userId = opts.userId ?? "";
+              const userId = opts.vaultUserId ?? opts.userId ?? "";
               const withVault = substituteClaudeToolInput(userId, tool_name, tool_input);
               if (JSON.stringify(withVault) === JSON.stringify(tool_input)) {
                 return { continue: true };
@@ -3950,7 +3966,7 @@ async function* claudeProvider(opts) {
           hooks: [
             async (input) => {
               const { tool_response } = input;
-              const userId = opts.userId ?? "";
+              const userId = opts.vaultUserId ?? opts.userId ?? "";
               const redacted = deepMapStrings(tool_response, (value) => redactHostedSecrets(userId, value));
               if (JSON.stringify(redacted) === JSON.stringify(tool_response)) {
                 return { continue: true };
@@ -5364,6 +5380,8 @@ async function* codexProvider(opts) {
             throw err;
           if (!currentSessionId || !isMissingCodexRolloutError(err))
             throw err;
+          if (opts.userId && opts.session)
+            throw err;
           logger.warn({ staleSessionId: currentSessionId, err: errMsg(err) }, "codexProvider: stale/missing rollout, restarting fresh thread");
           thread = codex.startThread(threadOptions);
           prompt = promptForThread(opts, true);
@@ -5663,7 +5681,7 @@ function maestroProvider(opts) {
   if (opts.agent !== undefined && opts.agent !== "maestro") {
     throw new Error(`maestroProvider: unexpected agent "${opts.agent}", expected "maestro"`);
   }
-  const userId = opts.userId ?? "";
+  const userId = opts.vaultUserId ?? opts.userId ?? "";
   setMcpResolver(hostedMcpServers);
   const callerDisallowedTools = opts.disallowedTools ?? [];
   const callerToolHooks = opts.toolHooks ?? [];
@@ -5782,16 +5800,16 @@ async function resolveSessionFileMissing(agent, sessionId, cwd) {
 }
 async function maybeRebuildSession(opts) {
   if (!opts.sessionId)
-    return true;
+    return "ready";
   try {
     const missing = await resolveSessionFileMissing(opts.agent, opts.sessionId, opts.cwd);
     if (!missing)
-      return true;
+      return "ready";
     logger.info({ agent: opts.agent, sessionId: opts.sessionId, topic: opts.session }, "session file missing \u2014 rebuilding from unified log");
     const entries = readConversation(opts.userId, opts.session);
     if (entries.length === 0) {
       logger.info({ agent: opts.agent, sessionId: opts.sessionId }, "no unified log entries to rebuild \u2014 starting fresh session");
-      return false;
+      return "fresh";
     }
     const operations = getRegistryOperations(opts.agent);
     const result = operations.writeRollout({
@@ -5802,19 +5820,25 @@ async function maybeRebuildSession(opts) {
       ...opts.effort ? { effort: opts.effort } : {}
     });
     logger.info({ agent: opts.agent, sessionId: result.sessionId, rolloutPath: result.rolloutPath }, "session rebuilt from unified log");
-    return true;
+    return "ready";
   } catch (err) {
-    logger.warn({ err, agent: opts.agent, sessionId: opts.sessionId }, "session rebuild failed \u2014 starting fresh session");
-    return false;
+    logger.warn({ err, agent: opts.agent, sessionId: opts.sessionId }, "session rebuild failed \u2014 preserving resume key");
+    return "failed";
   }
 }
 async function* runAgent(opts) {
   const recording = shouldRecordTurn(opts);
   const dispatchOpts = { ...opts };
   if (hasSessionRepairContext(dispatchOpts)) {
-    const ok = await maybeRebuildSession(dispatchOpts);
-    if (!ok) {
+    const repair = await maybeRebuildSession(dispatchOpts);
+    if (repair === "fresh") {
       dispatchOpts.sessionId = undefined;
+    } else if (repair === "failed") {
+      yield {
+        type: "error",
+        content: "Provider session could not be rebuilt from conversation history; the existing session was preserved for retry."
+      };
+      return;
     }
   }
   const taskScope = resolveTaskEventScope(dispatchOpts);
@@ -11783,7 +11807,7 @@ function rowToRequest(row) {
   if (row.user_messages_json) {
     try {
       const parsed = JSON.parse(row.user_messages_json);
-      if (Array.isArray(parsed) && parsed.length > 0 && parsed.every((item) => item && typeof item === "object" && typeof item.prompt === "string" && (item.attachments === undefined || Array.isArray(item.attachments) && item.attachments?.every((attachment) => typeof attachment === "string")))) {
+      if (Array.isArray(parsed) && parsed.length > 0 && parsed.every((item) => item && typeof item === "object" && typeof item.prompt === "string" && (item.attachments === undefined || Array.isArray(item.attachments) && item.attachments?.every((attachment) => typeof attachment === "string")) && (item.actorUserId === undefined || typeof item.actorUserId === "string") && (item.actorLabel === undefined || typeof item.actorLabel === "string"))) {
         userMessages = parsed;
       }
     } catch {
@@ -11835,19 +11859,24 @@ function mergeRuntimeUserTurnRequest(input) {
   return db.transaction(() => {
     const rows = db.query("SELECT * FROM runtime_user_turn_requests WHERE topic_id = ? ORDER BY created_at ASC, rowid ASC").all(input.topicId);
     const previous = rows.map(rowToRequest);
+    const omittedRequestIds = new Set([
+      ...input.omitRequestIds ?? [],
+      ...previous.filter((request) => Boolean(request.execution?.providerSessionId)).map((request) => request.requestId)
+    ]);
+    const carried = previous.filter((request) => !omittedRequestIds.has(request.requestId));
     const alreadyIncludedRequestIds = new Set(input.alreadyIncludedRequestIds ?? []);
-    const alreadyIncludedMessages = previous.filter((request) => alreadyIncludedRequestIds.has(request.requestId)).flatMap((request) => request.userMessages);
+    const alreadyIncludedMessages = carried.filter((request) => alreadyIncludedRequestIds.has(request.requestId)).flatMap((request) => request.userMessages);
     const includedPrefixMatches = alreadyIncludedMessages.every((message, index) => {
       const candidate = input.userMessages[index];
-      return candidate?.prompt === message.prompt && JSON.stringify(candidate.attachments ?? []) === JSON.stringify(message.attachments ?? []);
+      return candidate?.prompt === message.prompt && candidate.actorUserId === message.actorUserId && candidate.actorLabel === message.actorLabel && JSON.stringify(candidate.attachments ?? []) === JSON.stringify(message.attachments ?? []);
     });
     const alreadyIncludedMessageCount = includedPrefixMatches ? alreadyIncludedMessages.length : 0;
     const userMessages = [
-      ...previous.flatMap((request) => request.userMessages),
+      ...carried.flatMap((request) => request.userMessages),
       ...input.userMessages.slice(alreadyIncludedMessageCount)
     ];
     const incomingLoggedCount = Math.min(Math.max(0, input.execution.loggedUserMessageCount ?? 0), input.userMessages.length);
-    const loggedUserMessageCount = previous.reduce((count, request) => count + loggedMessageCount(request), 0) + Math.max(0, incomingLoggedCount - alreadyIncludedMessageCount);
+    const loggedUserMessageCount = carried.reduce((count, request) => count + loggedMessageCount(request), 0) + Math.max(0, incomingLoggedCount - alreadyIncludedMessageCount);
     const execution = {
       ...input.execution,
       loggedUserMessageCount,
@@ -11859,7 +11888,7 @@ function mergeRuntimeUserTurnRequest(input) {
       ],
       conversationPrompts: userMessages.slice(loggedUserMessageCount).map((message) => message.prompt)
     };
-    const sessionBase = previous.find((request) => request.execution?.sessionIdSpecified)?.execution;
+    const sessionBase = carried.find((request) => request.execution?.sessionIdSpecified)?.execution;
     if (sessionBase?.sessionIdSpecified) {
       execution.sessionId = sessionBase.sessionId;
       execution.sessionIdSpecified = true;
@@ -11870,13 +11899,29 @@ function mergeRuntimeUserTurnRequest(input) {
          (request_id, topic_id, user_id, prompt, user_messages_json, attachments_json,
           allow_auto_continue, execution_json, topic_epoch, created_at,
           status, claimed_by, claimed_at, running_query_id)
-       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'pending', NULL, NULL, NULL)`).run(input.requestId, input.topicId, input.userId, renderUserPromptBatch(userMessages.map((message) => message.prompt)), JSON.stringify(userMessages), attachments?.length ? JSON.stringify(attachments) : null, input.allowAutoContinue ? 1 : 0, JSON.stringify(execution), input.topicEpoch, now);
+       VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'pending', NULL, NULL, NULL)`).run(input.requestId, input.topicId, input.userId, renderUserTurnBatch(userMessages), JSON.stringify(userMessages), attachments?.length ? JSON.stringify(attachments) : null, input.allowAutoContinue ? 1 : 0, JSON.stringify(execution), input.topicEpoch, now);
     return {
       requestId: input.requestId,
       supersededRequestIds: previous.map((request) => request.requestId)
     };
   }).immediate();
 }
+function markRuntimeUserTurnProviderSessionObserved(topicId, requestId, sessionId) {
+  return db.transaction(() => {
+    const row = db.query("SELECT * FROM runtime_user_turn_requests WHERE topic_id = ? AND request_id = ?").get(topicId, requestId);
+    if (!row)
+      return false;
+    const request = rowToRequest(row);
+    const execution = {
+      ...request.execution,
+      providerSessionId: sessionId
+    };
+    const result = db.query(`UPDATE runtime_user_turn_requests
+           SET execution_json = ?
+           WHERE topic_id = ? AND request_id = ?`).run(JSON.stringify(execution), topicId, requestId);
+    return result.changes === 1;
+  }).immediate();
+}
 function markRuntimeUserTurnMessagesLogged(topicId, requestId, ownerId, loggedUserMessages) {
   if (loggedUserMessages.length === 0)
     return false;
@@ -11884,7 +11929,7 @@ function markRuntimeUserTurnMessagesLogged(topicId, requestId, ownerId, loggedUs
     const requests = db.query("SELECT * FROM runtime_user_turn_requests WHERE topic_id = ? ORDER BY created_at ASC, rowid ASC").all(topicId).map(rowToRequest);
     const hasLoggedPrefix = (request2) => loggedUserMessages.length <= request2.userMessages.length && loggedUserMessages.every((message, index) => {
       const candidate = request2.userMessages[index];
-      return candidate?.prompt === message.prompt && JSON.stringify(candidate.attachments ?? []) === JSON.stringify(message.attachments ?? []);
+      return candidate?.prompt === message.prompt && candidate.actorUserId === message.actorUserId && candidate.actorLabel === message.actorLabel && JSON.stringify(candidate.attachments ?? []) === JSON.stringify(message.attachments ?? []);
     });
     const request = requests.find((candidate) => candidate.requestId === requestId && candidate.claimedBy === ownerId && hasLoggedPrefix(candidate)) ?? requests.find((candidate) => candidate.execution?.supersededRequestIds?.includes(requestId) && hasLoggedPrefix(candidate));
     if (!request)
@@ -14141,7 +14186,7 @@ function classifyAgentError(err2, agent) {
   return `${name} error: ${snippet}`;
 }
 function isSessionExpiredError(message) {
-  return message.includes(SESSION_EXPIRED_MSG) || /session was recorded with model .+ but is resuming with/i.test(message) || /session.*not found|session.*expired|unknown conversation/i.test(message);
+  return message.includes(SESSION_EXPIRED_MSG) || /session was recorded with model .+ but is resuming with/i.test(message) || /failed to resolve rollout path .+file does not exist/i.test(message) || /session.*not found|session.*expired|unknown conversation/i.test(message);
 }
 var SESSION_EXPIRED_MSG = "No conversation found with session ID";
 var init_errors = __esm(() => {
@@ -14729,6 +14774,14 @@ async function runTurnEventStream(topicId, topicTitle, queryId, events, control,
     for await (const event of events) {
       if (abortController.signal.aborted)
         break;
+      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) {
+          for (const requestId of control.durableRequestIds ?? []) {
+            markRuntimeUserTurnProviderSessionObserved(topicId, requestId, control.sessionId);
+          }
+        }
+      }
       switch (event.type) {
         case "text_delta": {
           pendingSawDelta = true;
@@ -15035,6 +15088,13 @@ async function runTurnEventStream(topicId, topicTitle, queryId, events, control,
           }
           break;
         case "session":
+          control.sessionId = event.sessionId;
+          control.providerSessionObserved = true;
+          if (control.providerTurnContentObserved) {
+            for (const requestId of control.durableRequestIds ?? []) {
+              markRuntimeUserTurnProviderSessionObserved(topicId, requestId, event.sessionId);
+            }
+          }
           if (!silent && onSessionId && getRoomQuery(topicId)?.queryId === queryId) {
             try {
               if (control.injectParams)
@@ -15109,7 +15169,9 @@ async function runTurnEventStream(topicId, topicTitle, queryId, events, control,
     if (forkHandle && outcome.kind !== "session-expired" && (!forkRequestId || !interSessionQueue.hasRequest(topicId, forkRequestId))) {
       cleanupAgentFork(forkHandle);
     }
-    if (roomId === topicId && outcome.kind !== "session-expired" && !getRoomQuery(topicId)) {
+    const queuedUserTurn = roomId === topicId ? getRuntimeUserTurnRequest(topicId) : null;
+    const hasReplacementUserTurn = queuedUserTurn !== null && queuedUserTurn.requestId !== queryId;
+    if (roomId === topicId && outcome.kind !== "session-expired" && !getRoomQuery(topicId) && !hasReplacementUserTurn) {
       const next = takeDeferredInject(topicId);
       if (next)
         redispatchInject(next);
@@ -15141,6 +15203,7 @@ var init_turn_event_stream = __esm(async () => {
     init_visuals(),
     init_api_messages(),
     init_api_topics(),
+    init_runtime_turn_requests(),
     init_token_stats()
   ]);
 });
@@ -15221,6 +15284,7 @@ __export(exports_turn_runner, {
   wasLocallyRequeuedAfterUserPreemption: () => wasLocallyRequeuedAfterUserPreemption,
   userConversationPromptsToRecord: () => userConversationPromptsToRecord,
   upsertTaskPanelMessage: () => upsertTaskPanelMessage,
+  tryReconstructTopicRollout: () => tryReconstructTopicRollout,
   triggerTopicAiTurn: () => triggerTopicAiTurn,
   topicAllowsVisualFileId: () => topicAllowsVisualFileId,
   taskPanelMessageId: () => taskPanelMessageId,
@@ -15236,9 +15300,11 @@ __export(exports_turn_runner, {
   resolveVisualMediaInput: () => resolveVisualMediaInput,
   resolveTopicTurnSession: () => resolveTopicTurnSession,
   resolveTopicTurnExecution: () => resolveTopicTurnExecution,
+  resolveSessionRetry: () => resolveSessionRetry,
   resolveModelForAgent: () => resolveModelForAgent,
   resolveInitialTurnSessionId: () => resolveInitialTurnSessionId,
   resolveCompactionExecution: () => resolveCompactionExecution,
+  renderUserTurnBatch: () => renderUserTurnBatch,
   renderUserPromptBatch: () => renderUserPromptBatch,
   renderTaskPanel: () => renderTaskPanel,
   promptWithAttachments: () => promptWithAttachments,
@@ -15393,6 +15459,7 @@ function redispatchInject(inject) {
       aiMention: topic.aiMention
     },
     userId: inject.userId,
+    vaultUserId: inject.vaultUserId,
     prompt: inject.prompt,
     allowAutoContinue: false,
     origin: inject.origin,
@@ -15518,12 +15585,10 @@ async function deliverAskError(queryId, sourceLabel, error) {
 }
 function tryReconstructTopicRollout(opts) {
   const { topicId, topicTitle, userId, agent, sessionId, cwd, model, effort } = opts;
-  if (!sessionId && !opts.allowFreshSession)
-    return null;
   try {
     const entries = readConversation(userId, topicTitle);
     if (entries.length === 0)
-      return null;
+      return { kind: "no-history" };
     const result = getRegistryOperations(agent).writeRollout({
       cwd,
       entries,
@@ -15538,15 +15603,18 @@ function tryReconstructTopicRollout(opts) {
       rolloutPath: result.rolloutPath,
       entries: entries.length
     }, sessionId ? "ai: session expired \u2014 rollout reconstructed from unified log" : "ai: provider session bridged from shared conversation log");
-    return result.sessionId;
+    return { kind: "rebuilt", sessionId: result.sessionId };
   } catch (err2) {
     logger.warn({ err: err2, topicId, agent, sessionId }, "ai: session reconstruct failed");
-    return null;
+    return { kind: "failed", error: stringifyError(err2) };
   }
 }
-function resolveSessionRetryId(opts) {
+function resolveSessionRetry(opts) {
   const reconstructed = tryReconstructTopicRollout(opts);
-  if (reconstructed)
+  if (reconstructed.kind === "rebuilt") {
+    return { kind: "retry", sessionId: reconstructed.sessionId };
+  }
+  if (reconstructed.kind === "failed")
     return reconstructed;
   if (opts.onSessionReset)
     opts.onSessionReset();
@@ -15554,7 +15622,7 @@ function resolveSessionRetryId(opts) {
     clearTopicSessionId(opts.topicId, "session-expired");
   }
   logger.info({ topicId: opts.topicId, agent: opts.agent, hadSessionId: Boolean(opts.sessionId) }, "ai: session expired \u2014 retrying with fresh session");
-  return null;
+  return { kind: "retry", sessionId: null };
 }
 function mergeSupersedingUserTurn(running, incoming) {
   const userMessages = [
@@ -15562,7 +15630,7 @@ function mergeSupersedingUserTurn(running, incoming) {
     ...incoming.userMessages ?? [legacyUserTurnEnvelope(incoming.prompt, incoming.attachments)]
   ];
   return {
-    prompt: renderUserPromptBatch(userMessages.map((message) => message.prompt)),
+    prompt: renderUserTurnBatch(userMessages),
     userMessages,
     attachments: flattenUserTurnAttachments(userMessages),
     sessionId: running.sessionId
@@ -15589,11 +15657,12 @@ function serializableUserTurnExecution(params) {
     bridgeSessionFromHistory: params.bridgeSessionFromHistory,
     peerBridge: params.peerBridge,
     from: params.from,
+    vaultUserId: params.vaultUserId,
     conversationPrompts: params._conversationPrompts ?? params._userMessages?.map((message) => message.prompt) ?? [params.prompt],
     loggedUserMessageCount: params._loggedUserMessageCount
   };
 }
-function waitToStartRemoteUserTurn(params, queryId) {
+function waitToStartRemoteUserTurn(params, queryId, options) {
   const execution = serializableUserTurnExecution(params);
   const incomingUserMessages = params._userMessages ?? [
     legacyUserTurnEnvelope(params.prompt, params.attachments)
@@ -15606,7 +15675,8 @@ function waitToStartRemoteUserTurn(params, queryId) {
     requestId: queryId,
     execution,
     topicEpoch: execution.runtimeEpoch ?? getRuntimeTopicEpoch(params.topic.id),
-    alreadyIncludedRequestIds: params._durableRequestIds
+    alreadyIncludedRequestIds: params._durableRequestIds,
+    omitRequestIds: options?.omitRequestIds
   });
   for (const supersededRequestId of merged.supersededRequestIds) {
     if (supersededRequestId !== merged.requestId) {
@@ -15657,6 +15727,7 @@ async function drainOneDurableUserTurn() {
     const queryId = startAiTurn({
       topic,
       userId: request.userId,
+      vaultUserId: execution?.vaultUserId,
       prompt: request.prompt,
       _userMessages: request.userMessages,
       _conversationPrompts: execution?.conversationPrompts ?? [request.prompt],
@@ -15727,12 +15798,13 @@ function startAiTurn(params) {
   }
   const topic = storedTopic;
   const { userId, allowAutoContinue, onDispatched } = params;
+  const vaultUserId = params.vaultUserId ?? userId;
   const origin = params.origin ?? "user";
   const conversationPrompts = params._conversationPrompts ?? [params.prompt];
   let loggedUserMessageCount = params._loggedUserMessageCount;
   let durableRequestIds = params._durableRequestIds ?? [];
   let userMessages = isUserOrigin(origin) ? params._userMessages ?? [legacyUserTurnEnvelope(params.prompt, params.attachments)] : undefined;
-  let prompt = userMessages ? renderUserPromptBatch(userMessages.map((message) => message.prompt)) : params.prompt;
+  let prompt = userMessages ? renderUserTurnBatch(userMessages) : params.prompt;
   let attachments2 = userMessages ? flattenUserTurnAttachments(userMessages) : params.attachments;
   const execution = resolveTopicTurnExecution(topic, params);
   const sessionResolution = resolveTopicTurnSession(topic, params.sessionId, {
@@ -15797,6 +15869,7 @@ function startAiTurn(params) {
       topicId,
       runtimeEpoch,
       userId,
+      vaultUserId,
       prompt,
       origin,
       sourceNode,
@@ -15881,16 +15954,22 @@ function startAiTurn(params) {
   }
   if (decision.action === "abort-replace") {
     const running = decision.running;
+    let omitRequestIds;
     if (isUserOrigin(running.origin)) {
-      const merged = mergeSupersedingUserTurn(running, { prompt, userMessages, attachments: attachments2 });
-      userMessages = merged.userMessages;
-      prompt = merged.prompt;
-      attachments2 = merged.attachments;
-      sessionId = merged.sessionId;
-      loggedUserMessageCount = running.userMessages?.length ?? 1;
-      durableRequestIds = [
-        ...new Set([...running.durableRequestIds ?? [], ...durableRequestIds])
-      ];
+      if (running.providerTurnContentObserved && running.sessionId) {
+        sessionId = running.sessionId;
+        omitRequestIds = running.durableRequestIds;
+      } else {
+        const merged = mergeSupersedingUserTurn(running, { prompt, userMessages, attachments: attachments2 });
+        userMessages = merged.userMessages;
+        prompt = merged.prompt;
+        attachments2 = merged.attachments;
+        sessionId = merged.sessionId;
+        loggedUserMessageCount = running.userMessages?.length ?? 1;
+        durableRequestIds = [
+          ...new Set([...running.durableRequestIds ?? [], ...durableRequestIds])
+        ];
+      }
     }
     if (running.injectParams) {
       const runningInject = running.injectParams;
@@ -15911,6 +15990,20 @@ function startAiTurn(params) {
     running.abortReason = "internal" /* Internal */;
     running.abortController.abort();
     logger.info({ topicId, supersededQueryId: running.queryId, supersededOrigin: running.origin }, "ai: new user message superseded running turn");
+    const queuedQueryId = waitToStartRemoteUserTurn({
+      ...params,
+      topic,
+      prompt,
+      attachments: attachments2,
+      sessionId,
+      _userMessages: userMessages,
+      _conversationPrompts: conversationPrompts,
+      _loggedUserMessageCount: loggedUserMessageCount,
+      _durableRequestIds: durableRequestIds,
+      _runtimeEpoch: runtimeEpoch
+    }, queryId, { omitRequestIds });
+    announceQueuedUserTurn({ ...params, topic }, queuedQueryId);
+    return queuedQueryId;
   }
   const abortController = new AbortController;
   const control = {
@@ -15929,6 +16022,7 @@ function startAiTurn(params) {
       topicId,
       runtimeEpoch,
       userId,
+      vaultUserId,
       prompt,
       origin,
       requestId,
@@ -16002,8 +16096,9 @@ function startAiTurn(params) {
   const resolvedEffort = execution.effort;
   const workspaceCwd = cwd ?? workspaceCwdFor(topicId);
   mkdirSync19(workspaceCwd, { recursive: true });
+  let historyBridgeError;
   if (bridgeSessionFromHistory && !sessionId) {
-    const bridgedSessionId = tryReconstructTopicRollout({
+    const bridge = tryReconstructTopicRollout({
       topicId,
       topicTitle: sessionName,
       userId,
@@ -16011,25 +16106,32 @@ function startAiTurn(params) {
       sessionId: null,
       cwd: workspaceCwd,
       model: resolvedModel,
-      ...resolvedEffort ? { effort: resolvedEffort } : {},
-      allowFreshSession: true
+      ...resolvedEffort ? { effort: resolvedEffort } : {}
     });
-    if (bridgedSessionId) {
-      sessionId = bridgedSessionId;
-      control.sessionId = bridgedSessionId;
+    if (bridge.kind === "rebuilt") {
+      sessionId = bridge.sessionId;
+      control.sessionId = bridge.sessionId;
       if (control.injectParams)
-        control.injectParams.sessionId = bridgedSessionId;
+        control.injectParams.sessionId = bridge.sessionId;
       try {
-        onSessionId?.(bridgedSessionId);
+        onSessionId?.(bridge.sessionId);
       } catch (err2) {
         logger.warn({ err: err2, topicId, queryId, agent: agentKind }, "ai: isolated session owner rejected bridged provider session id");
       }
+    } else if (bridge.kind === "failed") {
+      historyBridgeError = "Conversation history could not be encoded into a provider session; no fresh session was started.";
     }
   }
   const messageAttachmentGroups = userMessages?.map((message, index) => materializePromptAttachments(topicId, `${queryId}-${index}`, message.attachments));
   const promptAttachments = messageAttachmentGroups?.flat() ?? materializePromptAttachments(topicId, queryId, attachments2);
-  const promptWithFiles = userMessages ? renderUserPromptBatch(userMessages.map((message, index) => promptWithAttachments(message.prompt, messageAttachmentGroups?.[index] ?? []))) : promptWithAttachments(prompt, promptAttachments);
-  const renderedUserPrompts = userMessages ? userMessages.map((message, index) => promptWithAttachments(message.prompt, messageAttachmentGroups?.[index] ?? [])) : undefined;
+  const promptWithFiles = userMessages ? renderUserTurnBatch(userMessages.map((message, index) => ({
+    ...message,
+    prompt: promptWithAttachments(message.prompt, messageAttachmentGroups?.[index] ?? [])
+  }))) : promptWithAttachments(prompt, promptAttachments);
+  const renderedUserPrompts = userMessages ? userMessages.map((message, index) => renderUserTurnPrompt({
+    ...message,
+    prompt: promptWithAttachments(message.prompt, messageAttachmentGroups?.[index] ?? [])
+  })) : undefined;
   const agentPrompt = topic.aiMode === "mention" && isUserOrigin(origin) && !silent ? buildMentionOnlyChannelPrompt({
     topicId,
     userId,
@@ -16145,6 +16247,10 @@ function startAiTurn(params) {
   const turnMcpEnabled = browserProfileOwner ? enabledMcp : enabledMcp.filter((name) => name !== "playwright");
   const wantsBgBash = !isManager && enabledMcp.includes("background-bash");
   async function* runWithPlaywright() {
+    if (historyBridgeError) {
+      yield { type: "error", content: historyBridgeError };
+      return;
+    }
     if (prepareSession && !sessionId) {
       if (abortController.signal.aborted)
         return;
@@ -16217,6 +16323,7 @@ ${playwrightNote}`;
         systemPrompt: effectiveSystemPrompt,
         sessionId,
         userId,
+        vaultUserId,
         session: sessionName,
         sessionType: sessionType ?? (isManager ? "manager" : "forum"),
         abortController,
@@ -16250,11 +16357,10 @@ ${playwrightNote}`;
     WsHub.get().broadcastTyping(topicId, "ai");
     WsHub.get().broadcastAiActive(topicId, queryId);
   }
-  streamAgentEvents(topicId, topic.title, queryId, events, control, agentKind, resolvedModel, resolvedEffort, userId, !sessionRetried, onSessionId, { silent, peerBridge, sourceNode }).then(async (outcome) => {
+  streamAgentEvents(topicId, topic.title, queryId, events, control, agentKind, resolvedModel, resolvedEffort, userId, !sessionRetried, onSessionId, { silent, peerBridge, sourceNode }).then(async (streamOutcome) => {
+    let outcome = streamOutcome;
     if (outcome.kind === "session-expired") {
-      if (!silent)
-        WsHub.get().broadcastAborted(topicId, queryId, "stopped");
-      const retrySessionId = resolveSessionRetryId({
+      const retry = resolveSessionRetry({
         topicId,
         topicTitle: sessionName,
         userId,
@@ -16267,55 +16373,66 @@ ${playwrightNote}`;
         externalSessionOwner: Boolean(onSessionId),
         onSessionReset
       });
-      logger.info({
-        topicId,
-        prevQueryId: queryId,
-        agent: agentKind,
-        retrySessionId: retrySessionId ? retrySessionId.slice(0, 8) : null
-      }, "ai: retrying query after session expiry");
-      if (!retrySessionId && prepareSession && forkHandle) {
-        cleanupAgentFork(forkHandle);
-        forkHandle = undefined;
+      if (retry.kind === "failed") {
+        outcome = {
+          kind: "provider-error",
+          error: "Provider session expired and conversation history could not be rebuilt; the existing session was preserved for retry."
+        };
+      } else {
+        if (!silent)
+          WsHub.get().broadcastAborted(topicId, queryId, "stopped");
+        const retrySessionId = retry.sessionId;
+        logger.info({
+          topicId,
+          prevQueryId: queryId,
+          agent: agentKind,
+          retrySessionId: retrySessionId ? retrySessionId.slice(0, 8) : null
+        }, "ai: retrying query after session expiry");
+        if (!retrySessionId && prepareSession && forkHandle) {
+          cleanupAgentFork(forkHandle);
+          forkHandle = undefined;
+        }
+        startAiTurn({
+          topic,
+          userId,
+          vaultUserId,
+          prompt,
+          _userMessages: userMessages,
+          _conversationPrompts: conversationPrompts,
+          _loggedUserMessageCount: loggedUserMessageCount,
+          _durableRequestIds: durableRequestIds,
+          attachments: attachments2,
+          allowAutoContinue,
+          origin,
+          onDispatched,
+          requestId,
+          depth,
+          silent,
+          contextId,
+          agentOverride,
+          modelOverride,
+          effortOverride,
+          sessionId: retrySessionId,
+          sessionScope,
+          turnConcurrency,
+          forkHandle,
+          prepareSession,
+          cwd,
+          sessionName,
+          sessionType,
+          visualTools,
+          fileDeliveryTools,
+          onSessionId,
+          onSessionReset,
+          bridgeSessionFromHistory,
+          onSettled,
+          peerBridge,
+          askReplySources,
+          _runtimeEpoch: runtimeEpoch,
+          _sessionRetried: true
+        });
+        return;
       }
-      startAiTurn({
-        topic,
-        userId,
-        prompt,
-        _userMessages: userMessages,
-        _conversationPrompts: conversationPrompts,
-        _loggedUserMessageCount: loggedUserMessageCount,
-        _durableRequestIds: durableRequestIds,
-        attachments: attachments2,
-        allowAutoContinue,
-        origin,
-        onDispatched,
-        requestId,
-        depth,
-        silent,
-        contextId,
-        agentOverride,
-        modelOverride,
-        effortOverride,
-        sessionId: retrySessionId,
-        sessionScope,
-        turnConcurrency,
-        forkHandle,
-        prepareSession,
-        cwd,
-        sessionName,
-        sessionType,
-        visualTools,
-        fileDeliveryTools,
-        onSessionId,
-        onSessionReset,
-        bridgeSessionFromHistory,
-        onSettled,
-        peerBridge,
-        askReplySources,
-        _runtimeEpoch: runtimeEpoch,
-        _sessionRetried: true
-      });
-      return;
     }
     if (outcome.kind === "provider-error") {
       if (!silent) {
@@ -17416,14 +17533,11 @@ function switchApiTopicAgent(opts) {
       topicTitle: opts.topicTitle,
       from: opts.fromAgent,
       to: opts.agent
-    }, "api-topic switch: rollout encoding failed \u2014 falling back to fresh session");
-    try {
-      commitApiTopicSwitch(opts, null);
-    } catch (commitErr) {
-      logger.warn({ err: commitErr, topicId: opts.topicId, agent: opts.agent }, "api-topic switch fallback commit failed");
-      return { ok: false, error: `failed to set agent for "${opts.topicTitle}"` };
-    }
-    return { ok: true, outcome: { kind: "fresh", agent: opts.agent, reason: "bridge-failed" } };
+    }, "api-topic switch: rollout encoding failed \u2014 preserving current agent session");
+    return {
+      ok: false,
+      error: `failed to preserve conversation while switching agent for "${opts.topicTitle}"`
+    };
   }
   try {
     appendConversationEventStrict(opts.userId, opts.topicTitle, opts.agent, {
@@ -17648,7 +17762,7 @@ function createSelfConfigCore(host, productOverrides = {}) {
       return err(switched.error);
     host.runtime.configChanged(topic.id, "agent");
     ctx.onConfigChanged?.("agent");
-    const sessionNote = switched.outcome.kind === "bridged" ? ` Conversation history was bridged into a ${agent} session (${switched.outcome.bridgedSessionId}).` : switched.outcome.reason === "bridge-failed" ? " Conversation history bridge failed; the next turn starts fresh." : " No prior conversation history was found; the next turn starts fresh.";
+    const sessionNote = switched.outcome.kind === "bridged" ? ` Conversation history was bridged into a ${agent} session (${switched.outcome.bridgedSessionId}).` : " No prior conversation history was found; the next turn starts fresh.";
     return ok(`Agent for this topic set to '${agent}'. Model/effort reset to '${agent}' defaults.${sessionNote}`);
   }
   function getAgent(ctx) {
@@ -18179,4 +18293,4 @@ export {
   DEFAULT_SELF_CONFIG_PRODUCT
 };
 
-//# debugId=215B24B8D101FF5A64756E2164756E21
+//# debugId=0A6AFB912A18777064756E2164756E21