negotium 0.6.5 → 0.6.7

package/dist/agent-helpers.js

@@ -2980,7 +2980,7 @@ var init_codex = __esm(async () => {
 });
 
 // ../../packages/core/src/version.ts
-var NEGOTIUM_VERSION = "0.6.5";
+var NEGOTIUM_VERSION = "0.6.7";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 import { spawn as spawn2 } from "child_process";
@@ -3670,6 +3670,16 @@ var init_task_events = __esm(async () => {
   defaultTaskEventHost = { readTasks, taskFileMtimeNs, taskScopeKey };
 });
 
+// ../../packages/core/src/platform/constants.ts
+var FROM_AUTO_CONTINUE = "auto-continue", FROM_SELF_SCHEDULE = "self-schedule", RESERVED_TOPIC_NAMES, GENERAL_TOPIC_ID = "general", MANAGER_TOPIC_LOG_NAME = "general", NODE_LOCAL_USER_ID = "local";
+var init_constants = __esm(() => {
+  RESERVED_TOPIC_NAMES = new Set([
+    FROM_AUTO_CONTINUE,
+    FROM_SELF_SCHEDULE,
+    "general"
+  ]);
+});
+
 // ../../packages/core/src/storage/conversations.ts
 import {
   existsSync as existsSync9,
@@ -3683,12 +3693,15 @@ import { dirname as dirname8, join as join11 } from "path";
 function conversationDir(_userId) {
   return join11(resolveStorageDataDir(), "conversations");
 }
-function topicFilename(topicName) {
+function topicFilename(userId, topicName) {
   const t = sanitizeTopicName(topicName, true);
-  return `${t}.jsonl`;
+  const owner = String(userId);
+  if (t !== MANAGER_TOPIC_LOG_NAME || owner === NODE_LOCAL_USER_ID)
+    return `${t}.jsonl`;
+  return `${t}.${sanitizeId(owner)}.jsonl`;
 }
 function getConversationPath(userId, topicName) {
-  return join11(conversationDir(userId), topicFilename(topicName));
+  return join11(conversationDir(userId), topicFilename(userId, topicName));
 }
 function getActiveConversationPath(userId, topicName) {
   const rawPath = getConversationPath(userId, topicName);
@@ -3789,6 +3802,7 @@ function findLastSessionIdForAgent(entries, agent) {
 }
 var ConversationLogDivergedError;
 var init_conversations = __esm(async () => {
+  init_constants();
   init_jsonl();
   init_logger();
   await init_storage_host();
@@ -7449,142 +7463,6 @@ var init_api_topic_brief = __esm(async () => {
   }, 30);
 });
 
-// ../../packages/core/src/storage/wiki.ts
-import { basename as basename2, dirname as dirname11, join as join15 } from "path";
-function getSharedWikiDir(workspaceDir = resolveStorageWorkspaceDir()) {
-  return workspaceDir === resolveStorageWorkspaceDir() ? resolveStorageSharedWikiDir() : join15(workspaceDir, "wiki");
-}
-var init_wiki = __esm(async () => {
-  await init_storage_host();
-});
-
-// ../../packages/core/src/platform/constants.ts
-var FROM_AUTO_CONTINUE = "auto-continue", FROM_SELF_SCHEDULE = "self-schedule", RESERVED_TOPIC_NAMES, GENERAL_TOPIC_ID = "general";
-var init_constants = __esm(() => {
-  RESERVED_TOPIC_NAMES = new Set([
-    FROM_AUTO_CONTINUE,
-    FROM_SELF_SCHEDULE,
-    "general"
-  ]);
-});
-
-// ../../packages/core/src/storage/api-topic-config.ts
-function tableColumns(table) {
-  const rows = db.query(`PRAGMA table_info(${table})`).all();
-  return new Set(rows.map((row) => row.name));
-}
-function createCanonicalConfigTable(name = "api_topic_config") {
-  db.exec(`
-    CREATE TABLE IF NOT EXISTS ${name} (
-      topic_id TEXT PRIMARY KEY REFERENCES api_topics(id) ON DELETE CASCADE,
-      model TEXT,
-      effort TEXT CHECK (effort IS NULL OR effort IN ('low','medium','high','xhigh','max')),
-      mcp TEXT,
-      agent_locked INTEGER NOT NULL DEFAULT 0 CHECK (agent_locked IN (0,1)),
-      model_locked INTEGER NOT NULL DEFAULT 0 CHECK (model_locked IN (0,1)),
-      effort_locked INTEGER NOT NULL DEFAULT 0 CHECK (effort_locked IN (0,1))
-    )
-  `);
-}
-function initializeApiTopicConfigSchema() {
-  const existingConfigColumns = tableColumns("api_topic_config");
-  if (existingConfigColumns.size === 0) {
-    createCanonicalConfigTable();
-  } else if (existingConfigColumns.has("agent") || existingConfigColumns.has("agent_pinned") || existingConfigColumns.has("runtime_locked") || existingConfigColumns.has("model_pinned") || existingConfigColumns.has("effort_pinned") || existingConfigColumns.has("last_shown_agent")) {
-    const topicColumns = tableColumns("api_topics");
-    const agentColumn = topicColumns.has("agent") ? "agent" : topicColumns.has("runtime_agent") ? "runtime_agent" : null;
-    if (agentColumn && existingConfigColumns.has("agent")) {
-      db.exec(`UPDATE api_topics
-       SET ${agentColumn} = (
-         SELECT c.agent FROM api_topic_config c WHERE c.topic_id = api_topics.id
-       )
-       WHERE ${agentColumn} IS NULL
-         AND EXISTS (
-           SELECT 1 FROM api_topic_config c
-           WHERE c.topic_id = api_topics.id AND c.agent IS NOT NULL
-         )`);
-    }
-    const previousForeignKeys = db.query("PRAGMA foreign_keys").get()?.foreign_keys;
-    db.exec("PRAGMA foreign_keys = OFF");
-    try {
-      const agentLockSource = existingConfigColumns.has("runtime_locked") ? "runtime_locked" : existingConfigColumns.has("agent_pinned") ? "agent_pinned" : "0";
-      const modelLockSource = existingConfigColumns.has("model_locked") ? "model_locked" : existingConfigColumns.has("model_pinned") ? "model_pinned" : "0";
-      const effortLockSource = existingConfigColumns.has("effort_locked") ? "effort_locked" : existingConfigColumns.has("effort_pinned") ? "effort_pinned" : "0";
-      db.transaction(() => {
-        createCanonicalConfigTable("api_topic_config_next");
-        db.exec(`
-        INSERT INTO api_topic_config_next
-          (topic_id, model, effort, mcp, agent_locked, model_locked, effort_locked)
-        SELECT
-          topic_id,
-          model,
-          effort,
-          mcp,
-          COALESCE(${agentLockSource}, 0),
-          COALESCE(${modelLockSource}, 0),
-          COALESCE(${effortLockSource}, 0)
-        FROM api_topic_config
-        WHERE EXISTS (SELECT 1 FROM api_topics t WHERE t.id = api_topic_config.topic_id)
-      `);
-        db.exec("DROP TABLE api_topic_config");
-        db.exec("ALTER TABLE api_topic_config_next RENAME TO api_topic_config");
-      })();
-    } finally {
-      db.exec(`PRAGMA foreign_keys = ${previousForeignKeys ? "ON" : "OFF"}`);
-    }
-  } else {
-    createCanonicalConfigTable();
-  }
-}
-function rowToConfig(r) {
-  const cfg = {};
-  if (r.model)
-    cfg.model = r.model;
-  if (r.effort)
-    cfg.effort = r.effort;
-  if (r.mcp) {
-    try {
-      const parsed = JSON.parse(r.mcp);
-      if (Array.isArray(parsed))
-        cfg.mcp = parsed;
-    } catch {}
-  }
-  if (r.agent_locked)
-    cfg.agentLocked = true;
-  if (r.model_locked)
-    cfg.modelLocked = true;
-  if (r.effort_locked)
-    cfg.effortLocked = true;
-  return cfg;
-}
-function getApiTopicConfig(topicId) {
-  const row = db.query("SELECT topic_id, model, effort, mcp, agent_locked, model_locked, effort_locked FROM api_topic_config WHERE topic_id = ?").get(topicId);
-  if (!row)
-    return;
-  const config = rowToConfig(row);
-  return Object.keys(config).length > 0 ? config : undefined;
-}
-function setApiTopicConfig(topicId, config) {
-  db.query(`INSERT INTO api_topic_config
-       (topic_id, model, effort, mcp, agent_locked, model_locked, effort_locked)
-       VALUES (?, ?, ?, ?, ?, ?, ?)
-     ON CONFLICT(topic_id) DO UPDATE SET
-       model = excluded.model,
-       effort = excluded.effort,
-       mcp = excluded.mcp,
-       agent_locked = excluded.agent_locked,
-       model_locked = excluded.model_locked,
-       effort_locked = excluded.effort_locked`).run(topicId, config.model ?? null, config.effort ?? null, config.mcp ? JSON.stringify(config.mcp) : null, config.agentLocked ? 1 : 0, config.modelLocked ? 1 : 0, config.effortLocked ? 1 : 0);
-}
-function deleteApiTopicConfig(topicId) {
-  db.query("DELETE FROM api_topic_config WHERE topic_id = ?").run(topicId);
-}
-var init_api_topic_config = __esm(async () => {
-  await init_forum_db();
-  await init_storage_host();
-  registerStorageSchemaInitializer(initializeApiTopicConfigSchema, 40);
-});
-
 // ../../packages/core/src/storage/api-topics.ts
 function defaultTopicSurface() {
   return normalizeTopicSurface(process.env.NEGOTIUM_DEFAULT_SURFACE);
@@ -7601,7 +7479,7 @@ function normalizeSurfaceScope(value) {
 function defaultSurfaceScope() {
   return activeSurfaceScope ?? normalizeSurfaceScope(process.env.NEGOTIUM_SURFACE_SCOPE);
 }
-function tableColumns2(table) {
+function tableColumns(table) {
   const rows = db.query(`PRAGMA table_info(${table})`).all();
   return new Set(rows.map((row) => row.name));
 }
@@ -7630,7 +7508,7 @@ function initializeApiTopicsSchema() {
     ai_mode TEXT
   )
 `);
-  const initialTopicColumns = tableColumns2("api_topics");
+  const initialTopicColumns = tableColumns("api_topics");
   const legacyTopicSchema = !initialTopicColumns.has("response_policy");
   const needsCanonicalTopicRebuild = legacyTopicSchema || !initialTopicColumns.has("agent");
   if (legacyTopicSchema) {
@@ -7757,8 +7635,8 @@ function initializeApiTopicsSchema() {
   }
   if (needsCanonicalTopicRebuild) {
     const legacyRows = db.query("SELECT * FROM api_topics").all();
-    const existingMemberRows = tableColumns2("topic_members").has("topic_id") ? db.query("SELECT topic_id, user_id, role FROM topic_members").all() : [];
-    const configColumns = tableColumns2("api_topic_config");
+    const existingMemberRows = tableColumns("topic_members").has("topic_id") ? db.query("SELECT topic_id, user_id, role FROM topic_members").all() : [];
+    const configColumns = tableColumns("api_topic_config");
     const legacyAgentOverrides = configColumns.has("agent") ? new Map(db.query("SELECT topic_id, agent FROM api_topic_config WHERE agent IS NOT NULL").all().map((row) => [row.topic_id, row.agent])) : new Map;
     const previousForeignKeys = db.query("PRAGMA foreign_keys").get()?.foreign_keys;
     db.exec("PRAGMA foreign_keys = OFF");
@@ -7830,35 +7708,35 @@ function initializeApiTopicsSchema() {
        OR granted_by_topic_id NOT IN (SELECT id FROM api_topics)
   `);
   db.exec("DELETE FROM topic_members WHERE topic_id NOT IN (SELECT id FROM api_topics)");
-  if (!tableColumns2("api_topics").has("visibility")) {
+  if (!tableColumns("api_topics").has("visibility")) {
     db.exec("ALTER TABLE api_topics ADD COLUMN visibility TEXT NOT NULL DEFAULT 'visible'");
   }
-  if (!tableColumns2("api_topics").has("surface")) {
+  if (!tableColumns("api_topics").has("surface")) {
     db.exec("ALTER TABLE api_topics ADD COLUMN surface TEXT NOT NULL DEFAULT 'terminal'");
   }
-  if (!tableColumns2("api_topics").has("surface_scope")) {
+  if (!tableColumns("api_topics").has("surface_scope")) {
     db.exec("ALTER TABLE api_topics ADD COLUMN surface_scope TEXT");
   }
-  if (tableColumns2("api_topics").has("access_mode")) {
+  if (tableColumns("api_topics").has("access_mode")) {
     try {
       db.exec("ALTER TABLE api_topics DROP COLUMN access_mode");
     } catch (err) {
       logger.warn({ err }, "api_topics: could not drop the retired access_mode column");
     }
   }
-  if (!tableColumns2("api_topics").has("browser_profile")) {
+  if (!tableColumns("api_topics").has("browser_profile")) {
     db.exec("ALTER TABLE api_topics ADD COLUMN browser_profile TEXT NOT NULL DEFAULT 'default'");
   }
-  if (!tableColumns2("api_topics").has("browser_profile_owner")) {
+  if (!tableColumns("api_topics").has("browser_profile_owner")) {
     db.exec("ALTER TABLE api_topics ADD COLUMN browser_profile_owner TEXT");
   }
-  if (!tableColumns2("api_topics").has("subagent_report_mode")) {
+  if (!tableColumns("api_topics").has("subagent_report_mode")) {
     db.exec("ALTER TABLE api_topics ADD COLUMN subagent_report_mode TEXT NOT NULL DEFAULT 'auto'");
   }
-  if (!tableColumns2("api_topics").has("memory_topic_id")) {
+  if (!tableColumns("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")) {
+  if (!tableColumns("api_topics").has("memory_key")) {
     db.exec("ALTER TABLE api_topics ADD COLUMN memory_key TEXT");
   }
   db.exec(`
@@ -8234,6 +8112,132 @@ var init_api_topics = __esm(async () => {
   registerStorageSchemaInitializer(initializeApiTopicsSchema, 20);
 });
 
+// ../../packages/core/src/storage/wiki.ts
+import { basename as basename2, dirname as dirname11, join as join15 } from "path";
+function getSharedWikiDir(workspaceDir = resolveStorageWorkspaceDir()) {
+  return workspaceDir === resolveStorageWorkspaceDir() ? resolveStorageSharedWikiDir() : join15(workspaceDir, "wiki");
+}
+var init_wiki = __esm(async () => {
+  await init_storage_host();
+});
+
+// ../../packages/core/src/storage/api-topic-config.ts
+function tableColumns2(table) {
+  const rows = db.query(`PRAGMA table_info(${table})`).all();
+  return new Set(rows.map((row) => row.name));
+}
+function createCanonicalConfigTable(name = "api_topic_config") {
+  db.exec(`
+    CREATE TABLE IF NOT EXISTS ${name} (
+      topic_id TEXT PRIMARY KEY REFERENCES api_topics(id) ON DELETE CASCADE,
+      model TEXT,
+      effort TEXT CHECK (effort IS NULL OR effort IN ('low','medium','high','xhigh','max')),
+      mcp TEXT,
+      agent_locked INTEGER NOT NULL DEFAULT 0 CHECK (agent_locked IN (0,1)),
+      model_locked INTEGER NOT NULL DEFAULT 0 CHECK (model_locked IN (0,1)),
+      effort_locked INTEGER NOT NULL DEFAULT 0 CHECK (effort_locked IN (0,1))
+    )
+  `);
+}
+function initializeApiTopicConfigSchema() {
+  const existingConfigColumns = tableColumns2("api_topic_config");
+  if (existingConfigColumns.size === 0) {
+    createCanonicalConfigTable();
+  } else if (existingConfigColumns.has("agent") || existingConfigColumns.has("agent_pinned") || existingConfigColumns.has("runtime_locked") || existingConfigColumns.has("model_pinned") || existingConfigColumns.has("effort_pinned") || existingConfigColumns.has("last_shown_agent")) {
+    const topicColumns = tableColumns2("api_topics");
+    const agentColumn = topicColumns.has("agent") ? "agent" : topicColumns.has("runtime_agent") ? "runtime_agent" : null;
+    if (agentColumn && existingConfigColumns.has("agent")) {
+      db.exec(`UPDATE api_topics
+       SET ${agentColumn} = (
+         SELECT c.agent FROM api_topic_config c WHERE c.topic_id = api_topics.id
+       )
+       WHERE ${agentColumn} IS NULL
+         AND EXISTS (
+           SELECT 1 FROM api_topic_config c
+           WHERE c.topic_id = api_topics.id AND c.agent IS NOT NULL
+         )`);
+    }
+    const previousForeignKeys = db.query("PRAGMA foreign_keys").get()?.foreign_keys;
+    db.exec("PRAGMA foreign_keys = OFF");
+    try {
+      const agentLockSource = existingConfigColumns.has("runtime_locked") ? "runtime_locked" : existingConfigColumns.has("agent_pinned") ? "agent_pinned" : "0";
+      const modelLockSource = existingConfigColumns.has("model_locked") ? "model_locked" : existingConfigColumns.has("model_pinned") ? "model_pinned" : "0";
+      const effortLockSource = existingConfigColumns.has("effort_locked") ? "effort_locked" : existingConfigColumns.has("effort_pinned") ? "effort_pinned" : "0";
+      db.transaction(() => {
+        createCanonicalConfigTable("api_topic_config_next");
+        db.exec(`
+        INSERT INTO api_topic_config_next
+          (topic_id, model, effort, mcp, agent_locked, model_locked, effort_locked)
+        SELECT
+          topic_id,
+          model,
+          effort,
+          mcp,
+          COALESCE(${agentLockSource}, 0),
+          COALESCE(${modelLockSource}, 0),
+          COALESCE(${effortLockSource}, 0)
+        FROM api_topic_config
+        WHERE EXISTS (SELECT 1 FROM api_topics t WHERE t.id = api_topic_config.topic_id)
+      `);
+        db.exec("DROP TABLE api_topic_config");
+        db.exec("ALTER TABLE api_topic_config_next RENAME TO api_topic_config");
+      })();
+    } finally {
+      db.exec(`PRAGMA foreign_keys = ${previousForeignKeys ? "ON" : "OFF"}`);
+    }
+  } else {
+    createCanonicalConfigTable();
+  }
+}
+function rowToConfig(r) {
+  const cfg = {};
+  if (r.model)
+    cfg.model = r.model;
+  if (r.effort)
+    cfg.effort = r.effort;
+  if (r.mcp) {
+    try {
+      const parsed = JSON.parse(r.mcp);
+      if (Array.isArray(parsed))
+        cfg.mcp = parsed;
+    } catch {}
+  }
+  if (r.agent_locked)
+    cfg.agentLocked = true;
+  if (r.model_locked)
+    cfg.modelLocked = true;
+  if (r.effort_locked)
+    cfg.effortLocked = true;
+  return cfg;
+}
+function getApiTopicConfig(topicId) {
+  const row = db.query("SELECT topic_id, model, effort, mcp, agent_locked, model_locked, effort_locked FROM api_topic_config WHERE topic_id = ?").get(topicId);
+  if (!row)
+    return;
+  const config = rowToConfig(row);
+  return Object.keys(config).length > 0 ? config : undefined;
+}
+function setApiTopicConfig(topicId, config) {
+  db.query(`INSERT INTO api_topic_config
+       (topic_id, model, effort, mcp, agent_locked, model_locked, effort_locked)
+       VALUES (?, ?, ?, ?, ?, ?, ?)
+     ON CONFLICT(topic_id) DO UPDATE SET
+       model = excluded.model,
+       effort = excluded.effort,
+       mcp = excluded.mcp,
+       agent_locked = excluded.agent_locked,
+       model_locked = excluded.model_locked,
+       effort_locked = excluded.effort_locked`).run(topicId, config.model ?? null, config.effort ?? null, config.mcp ? JSON.stringify(config.mcp) : null, config.agentLocked ? 1 : 0, config.modelLocked ? 1 : 0, config.effortLocked ? 1 : 0);
+}
+function deleteApiTopicConfig(topicId) {
+  db.query("DELETE FROM api_topic_config WHERE topic_id = ?").run(topicId);
+}
+var init_api_topic_config = __esm(async () => {
+  await init_forum_db();
+  await init_storage_host();
+  registerStorageSchemaInitializer(initializeApiTopicConfigSchema, 40);
+});
+
 // ../../packages/core/src/topics/personal-general.ts
 import { randomUUID as randomUUID5 } from "crypto";
 function ensurePersonalGeneral(userId, surface, opts = {}) {
@@ -8348,6 +8352,7 @@ function createArchiverRuntime(host) {
   const runTurn = (params) => {
     const {
       userId,
+      sourceTopicId,
       topicId,
       topicTitle,
       archivePath,
@@ -8355,6 +8360,7 @@ function createArchiverRuntime(host) {
       messageCount,
       mode = "deleted-topic"
     } = params;
+    const generalTopicId = host.storage.getGeneralTopicId(userId, sourceTopicId);
     let definition;
     try {
       definition = getAgentDefinition();
@@ -8367,12 +8373,15 @@ function createArchiverRuntime(host) {
     const agent = params.agent ?? "claude";
     const model = params.model;
     const outputLanguage = resolveMemoryLanguage();
+    const generalReplyInstruction = `Reply with a short completion message in ${outputLanguage} for display in #General. ` + "Do not include tool-call logs or raw transcripts \u2014 just briefly name the summary / brief / articles you saved.";
     const prompt = mode === "active-topic" ? [
       `Recent idle conversation snapshot of session "${topicTitle}". Extract durable memory from the archive below and save it into this topic's wiki.`,
       `archive_path: ${archivePath}`,
       ...rawArchivePaths.map((path) => `raw_archive_path: ${path}`),
       `wiki_dir: ${wikiDir}`,
-      `output_language: ${outputLanguage}`
+      `output_language: ${outputLanguage}`,
+      "",
+      generalReplyInstruction
     ].join(`
 `) : [
       `Session "${topicTitle}" was deleted. Extract durable memory from the archive below and save it into the wiki.`,
@@ -8381,7 +8390,7 @@ function createArchiverRuntime(host) {
       `wiki_dir: ${wikiDir}`,
       `output_language: ${outputLanguage}`,
       "",
-      `Reply with a short completion message in ${outputLanguage} for display in #General. ` + "Do not include tool-call logs or raw transcripts \u2014 just briefly name the summary / brief / articles you saved."
+      generalReplyInstruction
     ].join(`
 `);
     const activeSessionId = `memory:${host.config.createId()}`;
@@ -8509,10 +8518,8 @@ function createArchiverRuntime(host) {
           host.config.warn({ err, userId, topicTitle }, "archiver: settlement callback failed");
         }
       }
-      if (mode === "deleted-topic") {
-        const text = finalText.trimEnd();
-        finalizeGeneralMemory(host, userId, topicTitle, messageCount, startMs, ok, topicId, ok && text ? { text, agent, model, usage } : undefined);
-      }
+      const text = finalText.trimEnd();
+      finalizeGeneralMemory(host, userId, topicTitle, messageCount, startMs, ok, mode, topicId, generalTopicId, ok && text ? { text, agent, model, usage } : undefined);
     });
     topicQueues.set(safeTopic, work);
     work.finally(() => {
@@ -8558,14 +8565,14 @@ function findSummaryFile(storage, topicTitle, date, sinceMs, topicId) {
   }
   return best?.path ?? null;
 }
-function finalizeGeneralMemory(host, userId, topicTitle, messageCount, startMs, ok, topicId, generalReply) {
-  const generalTopicId = host.storage.getGeneralTopicId(userId);
+function finalizeGeneralMemory(host, userId, topicTitle, messageCount, startMs, ok, mode, topicId, generalTopicId, generalReply) {
+  const resolvedGeneralTopicId = generalTopicId ?? host.storage.getGeneralTopicId(userId, topicId);
   const date = host.config.now().toISOString().slice(0, 10);
   try {
     const summaryPath = ok ? findSummaryFile(host.storage, topicTitle, date, startMs, topicId) : null;
     const summaryMd = summaryPath ? host.storage.readTextFile(summaryPath) : "";
     const oneLine = summaryMd && distillOneLine(summaryMd) || `Archived ${messageCount} messages`;
-    const prev = host.storage.getTopicBrief(generalTopicId);
+    const prev = host.storage.getTopicBrief(resolvedGeneralTopicId);
     const prevEntries = (prev?.briefMd ?? "").split(`
 `).map((l) => l.trim()).filter((l) => l.startsWith("- "));
     const newEntry = `- **${topicTitle}** (${date}): ${oneLine}`;
@@ -8575,12 +8582,12 @@ function finalizeGeneralMemory(host, userId, topicTitle, messageCount, startMs,
     ].slice(0, MAX_BRIEF_ENTRIES);
     const briefMd = `# Workspace Memory Hub
 
-Recent memory digest distilled from deleted topics. Use \`wiki_query\` for details.
+Recent memory digest distilled from archived topics (deletions and idle/session-reset snapshots). Use \`wiki_query\` for details.
 
 ## Recent Archives
 ${rolled.join(`
 `)}`;
-    host.storage.setTopicBrief(generalTopicId, {
+    host.storage.setTopicBrief(resolvedGeneralTopicId, {
       briefMd,
       ...summaryMd ? { latestSummaryMd: summaryMd, summaryDate: date } : {}
     });
@@ -8590,7 +8597,7 @@ ${rolled.join(`
   }
   try {
     const replyText = generalReply?.text.trim();
-    const text = replyText || (ok ? `\uD83D\uDDC2 Topic "${topicTitle}" was deleted and archived into #General memory.` : `\uD83D\uDDC2 Archived topic "${topicTitle}" (summary extraction failed \u2014 raw log preserved in wiki/archive).`);
+    const text = replyText || (mode === "deleted-topic" ? ok ? `\uD83D\uDDC2 Topic "${topicTitle}" was deleted and archived into #General memory.` : `\uD83D\uDDC2 Archived topic "${topicTitle}" (summary extraction failed \u2014 raw log preserved in wiki/archive).` : ok ? `\uD83D\uDDC2 Session "${topicTitle}" was snapshotted and archived into #General memory.` : `\uD83D\uDDC2 Archived a snapshot of "${topicTitle}" (summary extraction failed \u2014 raw log preserved in wiki/archive).`);
     const replyMeta = generalReply && replyText ? {
       authorId: "ai",
       agentType: generalReply.agent,
@@ -8599,13 +8606,13 @@ ${rolled.join(`
     } : { authorId: "system" };
     const msg = {
       id: host.config.createId(),
-      topicId: generalTopicId,
+      topicId: resolvedGeneralTopicId,
       text,
       ...replyMeta,
       createdAt: host.config.now().toISOString()
     };
     host.messaging.appendMessage(msg);
-    host.messaging.broadcastMessage(generalTopicId, msg);
+    host.messaging.broadcastMessage(resolvedGeneralTopicId, msg);
   } catch (err) {
     host.config.warn({ err, topicTitle }, "archiver: failed to post #General notification");
   }
@@ -8624,6 +8631,7 @@ var init_archiver = __esm(async () => {
   init_background_session_policy();
   await init_api_messages();
   await init_api_topic_brief();
+  await init_api_topics();
   await init_wiki();
   init_wiki_summary_names();
   await init_personal_general();
@@ -8635,7 +8643,12 @@ var init_archiver = __esm(async () => {
       readTextFile: (path) => readFileSync13(path, "utf-8"),
       fileSize: (path) => statSync6(path).size,
       fileModifiedAt: (path) => statSync6(path).mtimeMs,
-      getGeneralTopicId: (userId) => ensurePersonalGeneral(userId).id,
+      getGeneralTopicId: (userId, sourceTopicId) => {
+        const source = sourceTopicId ? getTopic(sourceTopicId) : null;
+        return source ? ensurePersonalGeneral(userId, source.surface, {
+          surfaceScope: source.surfaceScope ?? null
+        }).id : ensurePersonalGeneral(userId).id;
+      },
       getTopicBrief,
       setTopicBrief: (topicId, fields) => {
         setTopicBrief(topicId, fields);
@@ -9823,6 +9836,7 @@ function archiveActiveTopicForMemory(topicId, userId, options) {
   const memoryTitle = memoryTopic.memoryKey?.trim() || memoryTopic.title;
   const launched = (options.launchArchiver ?? runArchiverTurn)({
     userId,
+    sourceTopicId: topic.id,
     topicId: memoryTopic.id,
     topicTitle: memoryTitle,
     archivePath: job.archivePath,
@@ -14497,7 +14511,8 @@ async function deleteTopicCascadeImpl(topic, userId, options, deletingAncestorId
         const memoryTopic = topic.memoryKey ? topic : getTopicMemoryOrigin(topicId) ?? topic;
         const memoryTitle = memoryTopic.memoryKey?.trim() || memoryTopic.title;
         runArchiverTurn({
-          userId,
+          userId: options.memoryUserId ?? userId,
+          sourceTopicId: topicId,
           ...memoryTopic.id !== topicId && !deletingTopicIds.has(memoryTopic.id) ? { topicId: memoryTopic.id } : {},
           topicTitle: memoryTitle,
           archivePath: archived.path,
@@ -15751,7 +15766,7 @@ ${JSON.stringify(event.input ?? {})}`);
             }
           }
           if (!silent) {
-            scheduleIdleArchiveForTopic(topicId, userId);
+            scheduleIdleArchiveForTopic(topicId, execution?.actorUserId ?? userId);
             hub.broadcastDone(topicId, queryId, event.usage ? {
               input: event.usage.inputTokens,
               output: event.usage.outputTokens,
@@ -17122,7 +17137,13 @@ function startAiTurn(params) {
     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, ...threadRootId ? { threadRootId } : {} }).then(async (streamOutcome) => {
+  streamAgentEvents(topicId, topic.title, queryId, events, control, agentKind, resolvedModel, resolvedEffort, userId, !sessionRetried, onSessionId, {
+    silent,
+    actorUserId: params.actorUserId,
+    peerBridge,
+    sourceNode,
+    ...threadRootId ? { threadRootId } : {}
+  }).then(async (streamOutcome) => {
     let outcome = streamOutcome;
     if (outcome.kind === "session-expired") {
       const retry = resolveSessionRetry({
@@ -19294,4 +19315,4 @@ export {
   DEFAULT_SELF_CONFIG_PRODUCT
 };
 
-//# debugId=E4CEF015C435076364756E2164756E21
+//# debugId=E2BEA0E09AFF549864756E2164756E21