negotium 0.2.16 → 0.2.18

package/dist/agent-helpers.js

@@ -1310,6 +1310,8 @@ var init_mcp_config = __esm(() => {
           return env ? buildStdioMcpServer(agent, CANONICAL_MCP_PROXY_SERVER, ["--surface=wiki"], env) : null;
         }
         const args = [`--user-id=${userId}`];
+        if (topicId)
+          args.push(`--current-topic-id=${topicId}`);
         const resolvedWikiTopicId = wikiTopicId ?? topicId ?? (session !== "dm" ? session : undefined);
         if (resolvedWikiTopicId)
           args.push(`--topic-id=${resolvedWikiTopicId}`);
@@ -2223,7 +2225,7 @@ var init_claude_registry = __esm(() => {
 });
 
 // ../../packages/core/src/version.ts
-var NEGOTIUM_VERSION = "0.2.16";
+var NEGOTIUM_VERSION = "0.2.18";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 import { spawn as spawn2 } from "child_process";
@@ -5834,6 +5836,7 @@ function maestroProvider(opts) {
     ...opts,
     enableToolSearch: !opts.toolPolicy && opts.enableToolSearch !== false,
     toolResultTruncation: buildMaestroToolResultTruncation(opts),
+    ephemeralSystemPrompt: opts.ephemeralSystemPrompt,
     apiKeyOverrides: resolveMaestroApiKeyOverrides(userId),
     agent: "maestro",
     disallowedTools: buildMaestroDisallowedTools(callerDisallowedTools, opts.toolPolicy),
@@ -6777,14 +6780,14 @@ function buildMemoryPromptSection(opts) {
   const parts = [`
 
 ## Memory`];
-  parts.push(`Memory directory: ${opts.wikiDir}/topic`);
-  parts.push(`Files: ${opts.hasFiles ? opts.briefFile : "(none)"}`);
-  if (opts.latestSummaryFile) {
-    parts.push(`Latest summary: ${opts.latestSummaryFile}`);
-  }
-  parts.push("", opts.isManager ? opts.hasFiles ? "Above is this workspace's memory-hub brief (accumulated across all archived topics). For past context or other topics, consult it first, then use the `wiki_query` MCP tool for deeper recall." : "If you need past context while handling delegated work, use the `wiki_query` MCP tool." : opts.hasFiles ? "The file above is this topic's wiki brief. Read it first for past context; use the `wiki_query` MCP tool for deeper recall." : opts.latestSummaryFile ? "There is no wiki brief file yet. For past context, read the Latest summary first; use the `wiki_query` MCP tool for deeper recall." : "There is no wiki brief file yet. Use the `wiki_query` MCP tool for past context.");
-  parts.push("", opts.isManager ? "When answering about past workspace decisions or other topics, weave in memory naturally, but confirm with `wiki_query` when unsure." : opts.hasFiles || opts.latestSummaryFile ? "On your first reply in the topic, read the wiki brief" + (opts.latestSummaryFile ? " and Latest summary" : "") + " and mention a one-line context recap so the user can quickly confirm it is on track." : "On your first reply in the topic, check prior conversation context if needed and mention it in one natural line.");
-  parts.push("", opts.hasFiles ? "If the user says your memory is wrong, find the file in the Memory directory with Read and fix it directly with Edit." : "If the user says your memory is wrong, check the relevant wiki brief and fix it directly when possible, or use `wiki_query` to find the entry and reconcile.");
+  if (opts.isManager) {
+    parts.push("Use `wiki_query` for past workspace decisions or cross-topic context, then `wiki_read` only for the relevant result.");
+  } else if (opts.memoryKey) {
+    parts.push(`This topic uses the canonical memory key \`${opts.memoryKey}\`. At the start of a new session, read it with \`wiki_read(kind: "topic", key: "${opts.memoryKey}")\`.`);
+  } else {
+    parts.push(`At the start of a new session, search topic memories with \`wiki_query(question: "${opts.topicTitle}", kind: "topic", limit: 5)\` and read the most relevant candidate with \`wiki_read\`.`, "If a candidate is clearly the same continuing topic/persona, read it with `adopt: true`; otherwise keep this topic's own name as its memory key. Do not merge weak or ambiguous matches.");
+  }
+  parts.push("Keep the lookup quiet. Mention prior context naturally in one short line only when it helps the user.", 'Use `wiki_query(kind: "article")` for reusable knowledge and `wiki_query(kind: "summary")` for historical session details.');
   if (opts.hasArchive) {
     parts.push("", "If you need the actual conversation from an earlier session, use the `wiki_last_conversation` MCP tool.");
   }
@@ -7438,6 +7441,7 @@ function initializeApiTopicsSchema() {
       last_message_at TEXT,
       parent_topic_id TEXT,
       memory_topic_id TEXT,
+      memory_key TEXT,
       is_fork INTEGER NOT NULL DEFAULT 0 CHECK (is_fork IN (0,1)),
       is_subagent INTEGER NOT NULL DEFAULT 0 CHECK (is_subagent IN (0,1)),
       visibility TEXT NOT NULL DEFAULT 'visible' CHECK (visibility IN ('visible','hidden')),
@@ -7487,8 +7491,8 @@ function initializeApiTopicsSchema() {
           const legacyBaseEffort = row.base_effort ?? row.default_effort;
           db.query(`INSERT INTO api_topics_next
              (id,title,kind,description,agent,base_model,base_effort,response_policy,
-              created_at,last_message_at,parent_topic_id,memory_topic_id,is_fork,is_subagent,visibility,access_mode,session_id)
-           VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`).run(String(row.id), String(row.title), normalized.kind, typeof row.description === "string" ? row.description : null, normalized.agent ?? null, typeof legacyBaseModel === "string" ? legacyBaseModel : null, typeof legacyBaseEffort === "string" ? legacyBaseEffort : null, normalized.aiMode, String(row.created_at), typeof row.last_message_at === "string" ? row.last_message_at : null, typeof row.parent_topic_id === "string" ? row.parent_topic_id : null, typeof row.memory_topic_id === "string" ? row.memory_topic_id : null, Number(row.is_fork ?? 0) !== 0 ? 1 : 0, Number(row.is_subagent ?? 0) !== 0 ? 1 : 0, row.visibility === "hidden" ? "hidden" : "visible", row.access_mode === "shared" ? "shared" : "private", typeof row.session_id === "string" ? row.session_id : null);
+              created_at,last_message_at,parent_topic_id,memory_topic_id,memory_key,is_fork,is_subagent,visibility,access_mode,session_id)
+           VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)`).run(String(row.id), String(row.title), normalized.kind, typeof row.description === "string" ? row.description : null, normalized.agent ?? null, typeof legacyBaseModel === "string" ? legacyBaseModel : null, typeof legacyBaseEffort === "string" ? legacyBaseEffort : null, normalized.aiMode, String(row.created_at), typeof row.last_message_at === "string" ? row.last_message_at : null, typeof row.parent_topic_id === "string" ? row.parent_topic_id : null, typeof row.memory_topic_id === "string" ? row.memory_topic_id : null, typeof row.memory_key === "string" ? row.memory_key : null, Number(row.is_fork ?? 0) !== 0 ? 1 : 0, Number(row.is_subagent ?? 0) !== 0 ? 1 : 0, row.visibility === "hidden" ? "hidden" : "visible", row.access_mode === "shared" ? "shared" : "private", typeof row.session_id === "string" ? row.session_id : null);
         }
         db.exec("DROP TABLE IF EXISTS topic_members");
         db.exec("DROP TABLE api_topics");
@@ -7557,6 +7561,9 @@ function initializeApiTopicsSchema() {
   if (!tableColumns2("api_topics").has("memory_topic_id")) {
     db.exec("ALTER TABLE api_topics ADD COLUMN memory_topic_id TEXT");
   }
+  if (!tableColumns2("api_topics").has("memory_key")) {
+    db.exec("ALTER TABLE api_topics ADD COLUMN memory_key TEXT");
+  }
   db.exec(`
   UPDATE api_topics
   SET browser_profile_owner = (
@@ -7617,6 +7624,7 @@ function rowToDto2(r, participants = getTopicParticipants(r.id), tellTargets) {
     lastMessageAt: r.last_message_at ?? new Date().toISOString(),
     parentTopicId: r.parent_topic_id ?? undefined,
     memoryTopicId: r.memory_topic_id ?? undefined,
+    memoryKey: r.memory_key ?? undefined,
     isFork: r.is_fork !== 0,
     ...r.is_subagent !== 0 ? { isSubagent: true } : {},
     ...r.is_subagent !== 0 ? {
@@ -7688,9 +7696,9 @@ function upsertTopic(t) {
   db.transaction(() => {
     db.query(`INSERT INTO api_topics
        (id,title,kind,description,agent,base_model,base_effort,response_policy,
-        created_at,last_message_at,parent_topic_id,memory_topic_id,is_fork,is_subagent,visibility,access_mode,
+        created_at,last_message_at,parent_topic_id,memory_topic_id,memory_key,is_fork,is_subagent,visibility,access_mode,
         subagent_report_mode)
-     VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+     VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
      ON CONFLICT(id) DO UPDATE SET
        title = excluded.title,
        kind = excluded.kind,
@@ -7703,11 +7711,12 @@ function upsertTopic(t) {
        last_message_at = excluded.last_message_at,
        parent_topic_id = excluded.parent_topic_id,
        memory_topic_id = excluded.memory_topic_id,
+       memory_key = excluded.memory_key,
        is_fork = excluded.is_fork,
        is_subagent = excluded.is_subagent,
        visibility = excluded.visibility,
        access_mode = excluded.access_mode,
-       subagent_report_mode = excluded.subagent_report_mode`).run(t.id, t.title, normalized.kind, t.description ?? null, normalized.agent ?? null, t.defaultModel ?? null, t.defaultEffort ?? null, normalized.aiMode, t.createdAt, t.lastMessageAt ?? null, t.parentTopicId ?? null, t.memoryTopicId ?? null, t.isFork ? 1 : 0, t.isSubagent ? 1 : 0, normalizeTopicVisibility(t.visibility), normalizeTopicAccessMode(t.accessMode), t.subagentReportMode ?? "auto");
+       subagent_report_mode = excluded.subagent_report_mode`).run(t.id, t.title, normalized.kind, t.description ?? null, normalized.agent ?? null, t.defaultModel ?? null, t.defaultEffort ?? null, normalized.aiMode, t.createdAt, t.lastMessageAt ?? null, t.parentTopicId ?? null, t.memoryTopicId ?? null, t.memoryKey ?? null, t.isFork ? 1 : 0, t.isSubagent ? 1 : 0, normalizeTopicVisibility(t.visibility), normalizeTopicAccessMode(t.accessMode), t.subagentReportMode ?? "auto");
     db.query("DELETE FROM topic_members WHERE topic_id = ?").run(t.id);
     for (const participant of t.participants) {
       db.query("INSERT INTO topic_members (topic_id,user_id,role) VALUES (?,?,?)").run(t.id, participant.userId, participant.role);
@@ -9459,11 +9468,12 @@ function archiveActiveTopicForMemory(topicId, userId, options) {
     }, "topic-memory-archiver: raw snapshot preserved below exchange threshold");
     return "below-threshold";
   }
-  const memoryTopic = getTopicMemoryOrigin(topicId) ?? topic;
+  const memoryTopic = topic.memoryKey ? topic : getTopicMemoryOrigin(topicId) ?? topic;
+  const memoryTitle = memoryTopic.memoryKey?.trim() || memoryTopic.title;
   const launched = (options.launchArchiver ?? runArchiverTurn)({
     userId,
     topicId: memoryTopic.id,
-    topicTitle: memoryTopic.title,
+    topicTitle: memoryTitle,
     archivePath: job.archivePath,
     ...options.rawArchivePaths ? { rawArchivePaths: options.rawArchivePaths } : {},
     messageCount: job.messageCount,
@@ -13975,11 +13985,12 @@ async function deleteTopicCascadeImpl(topic, userId, options, deletingAncestorId
     }
     if (archived && meetsMemoryArchiveExchangeThreshold(archived.exchangeCount, MIN_MEMORY_ARCHIVE_EXCHANGES, topic)) {
       try {
-        const memoryTopic = getTopicMemoryOrigin(topicId) ?? topic;
+        const memoryTopic = topic.memoryKey ? topic : getTopicMemoryOrigin(topicId) ?? topic;
+        const memoryTitle = memoryTopic.memoryKey?.trim() || memoryTopic.title;
         runArchiverTurn({
           userId,
           ...memoryTopic.id !== topicId && !deletingTopicIds.has(memoryTopic.id) ? { topicId: memoryTopic.id } : {},
-          topicTitle: memoryTopic.title,
+          topicTitle: memoryTitle,
           archivePath: archived.path,
           ...rawArchives.length > 0 ? { rawArchivePaths: rawArchives } : {},
           messageCount: archived.messageCount
@@ -14856,6 +14867,9 @@ async function runTurnEventStream(topicId, topicTitle, queryId, events, control,
   let pendingSawDelta = false;
   let accumulatedText = "";
   let pendingText = "";
+  let assistantContextTokens = 0;
+  let toolContextTokens = 0;
+  let lastContextProgressAt = 0;
   let lastVisibleMessageId = null;
   const visibleMessageIds = [];
   let lastTaskPanelText = null;
@@ -14874,6 +14888,20 @@ async function runTurnEventStream(topicId, topicTitle, queryId, events, control,
       model
     });
   };
+  const broadcastContextProgress = (force = false) => {
+    if (silent)
+      return;
+    const now = Date.now();
+    if (!force && lastContextProgressAt > 0 && now - lastContextProgressAt < 250)
+      return;
+    lastContextProgressAt = now;
+    hub.broadcastAiStatus(topicId, {
+      kind: "context_progress",
+      queryId,
+      assistantTokens: assistantContextTokens,
+      toolTokens: toolContextTokens
+    });
+  };
   const nextSyntheticToolUseId = () => `tool-${queryId}-${++syntheticToolCounter}`;
   const bindToolUseId = (providerToolUseId, fallback) => {
     const providerId = normalizeToolUseId(providerToolUseId);
@@ -14983,6 +15011,8 @@ async function runTurnEventStream(topicId, topicTitle, queryId, events, control,
           const incoming = event.content;
           accumulatedText += incoming;
           pendingText += incoming;
+          assistantContextTokens = estimateTextTokens(accumulatedText);
+          broadcastContextProgress();
           break;
         }
         case "text":
@@ -14990,10 +15020,15 @@ async function runTurnEventStream(topicId, topicTitle, queryId, events, control,
             const incoming = event.content;
             accumulatedText += incoming;
             pendingText += incoming;
+            assistantContextTokens = estimateTextTokens(accumulatedText);
+            broadcastContextProgress();
           }
           break;
         case "tool_use":
           emitPendingAssistantMessage();
+          toolContextTokens += estimateTextTokens(`${event.name}
+${JSON.stringify(event.input ?? {})}`);
+          broadcastContextProgress(true);
           if (isVisualsShowHtmlTool(event.name)) {
             const input = event.input;
             if (typeof input.html !== "string" || input.html.trim().length === 0) {
@@ -15147,6 +15182,8 @@ async function runTurnEventStream(topicId, topicTitle, queryId, events, control,
           }
           break;
         case "tool_result":
+          toolContextTokens += estimateTextTokens(event.content);
+          broadcastContextProgress(true);
           if (isVisualToolResultHandled(event.toolUseId))
             break;
           if (!silent) {
@@ -15532,6 +15569,7 @@ __export(exports_turn_runner, {
   channelTranscriptSpeaker: () => channelTranscriptSpeaker,
   canonicalModelId: () => canonicalModelId,
   buildVideoHtml: () => buildVideoHtml,
+  buildTurnReminderQuery: () => buildTurnReminderQuery,
   buildMermaidHtml: () => buildMermaidHtml,
   buildMentionOnlyChannelPrompt: () => buildMentionOnlyChannelPrompt,
   buildImageHtml: () => buildImageHtml,
@@ -15557,6 +15595,18 @@ function withDefaultPlaywright(configuredMcp, isManager) {
   enabled.add("background-bash");
   return [...enabled];
 }
+function buildTurnReminderQuery(agent, prompt, reminders) {
+  const reminderPrompt = reminders.join(`
+
+`);
+  if (!reminderPrompt)
+    return { prompt };
+  if (agent === "maestro")
+    return { prompt, ephemeralSystemPrompt: reminderPrompt };
+  return { prompt: `${prompt}
+
+${reminderPrompt}` };
+}
 function appendSystemMessage(topicId, text2) {
   const message = {
     id: randomUUID16(),
@@ -16372,25 +16422,24 @@ function startAiTurn(params) {
   const isManager = topicRecord?.kind === "manager";
   const isMentionOnlyChannel = topic.aiMode === "mention" && !isManager;
   let systemPrompt = isManager ? buildManagerSystemPrompt(systemPromptOpts) : isMentionOnlyChannel ? buildChannelSystemPrompt(systemPromptOpts) : buildTopicSystemPrompt(systemPromptOpts);
-  const memoryTopic = isMentionOnlyChannel || isManager ? topic : getTopicMemoryOrigin(topicId) ?? topic;
+  const memoryTopic = isMentionOnlyChannel || isManager || topic.memoryKey ? topic : getTopicMemoryOrigin(topicId) ?? topic;
+  const memoryTitle = memoryTopic.memoryKey?.trim() || memoryTopic.title;
   if (!isMentionOnlyChannel) {
+    let hasMemoryArchive = false;
     try {
-      const resolvedBrief = resolveTopicBrief(memoryTopic.id, memoryTopic.title);
+      const resolvedBrief = resolveTopicBrief(memoryTopic.id, memoryTitle);
       const wikiDir = getSharedWikiDir();
-      const { briefFile, hasBriefFile, latestSummaryFile } = resolveWikiMemoryMirror(wikiDir, memoryTopic.id, memoryTopic.title);
-      if (resolvedBrief || hasBriefFile || latestSummaryFile) {
-        systemPrompt += buildMemoryPromptSection({
-          briefFile,
-          wikiDir,
-          hasFiles: hasBriefFile,
-          latestSummaryFile,
-          hasArchive: Boolean(resolvedBrief?.brief.latestSummaryMd || latestSummaryFile),
-          isManager
-        });
-      }
+      const { latestSummaryFile } = resolveWikiMemoryMirror(wikiDir, memoryTopic.id, memoryTitle);
+      hasMemoryArchive = Boolean(resolvedBrief?.brief.latestSummaryMd || latestSummaryFile);
     } catch (err2) {
       logger.warn({ topicId, err: err2 }, "ai: failed to inject topic brief");
     }
+    systemPrompt += buildMemoryPromptSection({
+      topicTitle: topic.title,
+      ...memoryTopic.memoryKey ? { memoryKey: memoryTopic.memoryKey } : {},
+      hasArchive: hasMemoryArchive,
+      isManager
+    });
   }
   const activeVisual = visualTools ? getActiveVisualForPrompt(topicId, userId) : null;
   if (activeVisual) {
@@ -16504,15 +16553,11 @@ function startAiTurn(params) {
     if (consumePlaywrightUnavailable(userId, topic.title)) {
       turnReminders.push("<system-reminder>Playwright browser tools are UNAVAILABLE this turn. The `mcp__playwright__*` tools have been removed from this turn's catalog because the long-lived browser MCP could not be prepared. Do not attempt to call browser tools. If browser interaction is required, ask the user to retry shortly or use a non-browser alternative.</system-reminder>");
     }
-    const effectivePrompt = turnReminders.length > 0 ? `${agentPrompt}
-
-${turnReminders.join(`
-
-`)}` : agentPrompt;
+    const reminderQuery = buildTurnReminderQuery(agentKind, agentPrompt, turnReminders);
     try {
       yield* runAgent({
         agent: agentKind,
-        prompt: effectivePrompt,
+        ...reminderQuery,
         attachments: promptAttachments,
         cwd: workspaceCwd,
         systemPrompt,
@@ -18731,4 +18776,4 @@ export {
   DEFAULT_SELF_CONFIG_PRODUCT
 };
 
-//# debugId=969112A1E458C75264756E2164756E21
+//# debugId=407E1CBFBD75364B64756E2164756E21