negotium 0.6.5 → 0.6.7

package/dist/main.js

@@ -3674,7 +3674,7 @@ var exports_version = {};
 __export(exports_version, {
   NEGOTIUM_VERSION: () => NEGOTIUM_VERSION
 });
-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";
@@ -4519,6 +4519,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
 var exports_conversations = {};
 __export(exports_conversations, {
@@ -4548,12 +4558,15 @@ import { dirname as dirname8, join as join13 } from "path";
 function conversationDir(_userId) {
   return join13(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 join13(conversationDir(userId), topicFilename(topicName));
+  return join13(conversationDir(userId), topicFilename(userId, topicName));
 }
 function getActiveConversationPath(userId, topicName) {
   const rawPath = getConversationPath(userId, topicName);
@@ -4687,6 +4700,7 @@ function findLastSessionIdForAgent(entries, agent) {
 }
 var ConversationLogDivergedError;
 var init_conversations = __esm(async () => {
+  init_constants();
   init_jsonl();
   init_logger();
   await init_storage_host();
@@ -7769,16 +7783,6 @@ var init_api_topic_config = __esm(async () => {
   registerStorageSchemaInitializer(initializeApiTopicConfigSchema, 40);
 });
 
-// ../../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-topics.ts
 var exports_api_topics = {};
 __export(exports_api_topics, {
@@ -12475,6 +12479,7 @@ function createArchiverRuntime(host) {
   const runTurn = (params) => {
     const {
       userId,
+      sourceTopicId,
       topicId,
       topicTitle,
       archivePath,
@@ -12482,6 +12487,7 @@ function createArchiverRuntime(host) {
       messageCount,
       mode = "deleted-topic"
     } = params;
+    const generalTopicId = host.storage.getGeneralTopicId(userId, sourceTopicId);
     let definition;
     try {
       definition = getAgentDefinition();
@@ -12494,12 +12500,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.`,
@@ -12508,7 +12517,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()}`;
@@ -12636,10 +12645,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(() => {
@@ -12685,14 +12692,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}`;
@@ -12702,12 +12709,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 } : {}
     });
@@ -12717,7 +12724,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,
@@ -12726,13 +12733,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");
   }
@@ -12754,6 +12761,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();
@@ -12765,7 +12773,12 @@ var init_archiver = __esm(async () => {
       readTextFile: (path) => readFileSync14(path, "utf-8"),
       fileSize: (path) => statSync7(path).size,
       fileModifiedAt: (path) => statSync7(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);
@@ -13265,6 +13278,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,
@@ -14069,7 +14083,7 @@ async function restartTopicSession(topicId, userId, reason = "topic-session-rest
     const memoryArchiveSettled = new Promise((resolve15) => {
       settleMemoryArchive = resolve15;
     });
-    const archiveStatus = (options.archiveMemory ?? archiveActiveTopicForMemory)(topicId, userId, {
+    const archiveStatus = (options.archiveMemory ?? archiveActiveTopicForMemory)(topicId, options.memoryUserId ?? userId, {
       reason: "reset",
       minMessages: 1,
       minExchanges: MIN_MEMORY_ARCHIVE_EXCHANGES,
@@ -17060,7 +17074,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,
@@ -18330,7 +18345,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,
@@ -19716,7 +19731,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({
@@ -21401,6 +21422,7 @@ var init_topic_service = __esm(async () => {
       }
       await deleteTopicCascade(topic, params.userId, {
         ...params.force !== undefined ? { force: params.force } : {},
+        ...params.memoryUserId !== undefined ? { memoryUserId: params.memoryUserId } : {},
         ...params.allowManager !== undefined ? { allowManager: params.allowManager } : {},
         ...params.skipArchive !== undefined ? { skipArchive: params.skipArchive } : {},
         ...params.purgeLogs !== undefined ? { purgeLogs: params.purgeLogs } : {}
@@ -21408,7 +21430,9 @@ var init_topic_service = __esm(async () => {
     },
     async reset(params) {
       ownerTopic(params.topicId, params.userId);
-      return restartTopicSession(params.topicId, params.userId, params.reason);
+      return restartTopicSession(params.topicId, params.userId, params.reason, {
+        memoryUserId: params.actorUserId
+      });
     },
     async compact(params) {
       ownerTopic(params.topicId, params.userId);
@@ -23679,6 +23703,7 @@ __export(exports_src, {
   PROCESS_LEASE_STALE_MS: () => PROCESS_LEASE_STALE_MS,
   PROCESS_LEASE_HEARTBEAT_MS: () => PROCESS_LEASE_HEARTBEAT_MS,
   OPTIONAL_FORUM_MCP_SERVERS: () => OPTIONAL_FORUM_MCP_SERVERS,
+  NODE_LOCAL_USER_ID: () => NODE_LOCAL_USER_ID,
   NODE_CONTROL_TOKEN: () => NODE_CONTROL_TOKEN,
   NEGOTIUM_VERSION: () => NEGOTIUM_VERSION,
   NEGOTIUM_PORT: () => NEGOTIUM_PORT,
@@ -24509,6 +24534,7 @@ __export(exports_mcp_runtime_host, {
   RUNTIME_MCP_BASE_PATH: () => RUNTIME_MCP_BASE_PATH,
   REQUIRED_FORUM_MCP_SERVERS: () => REQUIRED_FORUM_MCP_SERVERS,
   OPTIONAL_FORUM_MCP_SERVERS: () => OPTIONAL_FORUM_MCP_SERVERS,
+  NODE_LOCAL_USER_ID: () => NODE_LOCAL_USER_ID,
   HOSTED_MCP_SURFACES: () => HOSTED_MCP_SURFACES,
   FROM_AUTO_CONTINUE: () => FROM_AUTO_CONTINUE,
   EFFORT_VALUES: () => EFFORT_VALUES
@@ -24549,12 +24575,31 @@ import { z as z6 } from "zod";
 function callerSurface(ctx) {
   return getTopic(ctx.topicId)?.surface ?? defaultTopicSurface();
 }
+function callerSurfaceScope(ctx) {
+  return getTopic(ctx.topicId)?.surfaceScope ?? null;
+}
+function topicsForCaller(ctx) {
+  const surface = callerSurface(ctx);
+  if (surface !== "otium") {
+    return getTopics({ surface }).filter((topic) => isParticipant(topic, ctx.userId));
+  }
+  return getTopics({ surface, surfaceScope: callerSurfaceScope(ctx) }).filter((topic) => topic.kind !== "manager" || topic.id === ctx.topicId || isParticipant(topic, ctx.userId));
+}
 function resolveTopicForUser(ctx, ref) {
   const trimmed = ref.trim();
   if (!trimmed)
     return { error: "Error: topic is required." };
   const notFound = `Error: topic '${trimmed}' not found (or not uniquely named). Use list_topics to see available topics.`;
   const surface = callerSurface(ctx);
+  if (surface === "otium") {
+    const visible = topicsForCaller(ctx);
+    const byId2 = visible.find((topic) => topic.id === trimmed);
+    if (byId2)
+      return { topic: byId2 };
+    const wanted = trimmed.toLowerCase();
+    const byTitle2 = visible.filter((topic) => topic.title.toLowerCase() === wanted);
+    return byTitle2.length === 1 ? { topic: byTitle2[0] } : { error: notFound };
+  }
   const byId = getTopic(trimmed);
   if (byId) {
     if (!isParticipant(byId, ctx.userId) || byId.surface !== surface)
@@ -24566,6 +24611,12 @@ function resolveTopicForUser(ctx, ref) {
     return { topic: byTitle };
   return { error: notFound };
 }
+function actingUserFor(ctx, target) {
+  const owner = target.participants.find((p) => p.role === "owner")?.userId;
+  if (callerSurface(ctx) !== "otium" || owner !== NODE_LOCAL_USER_ID)
+    return ctx.userId;
+  return owner;
+}
 function describeTopic(topic) {
   const running = getRoomQuery(topic.id) ? "turn running" : "idle";
   const agent = topic.agent ? `agent: ${topic.agent}` : "no agent";
@@ -24604,8 +24655,8 @@ function registerNodeTools(server, ctx) {
       return errorResult(`Error: failed to register topic: ${errMsg(err2)}`);
     }
   });
-  server.tool("list_topics", "List the calling user's topics on this negotium node: title, id, kind, agent, and whether a turn is currently running.", {}, async () => {
-    const topics = getTopics({ surface: callerSurface(ctx) }).filter((topic) => isParticipant(topic, ctx.userId));
+  server.tool("list_topics", "List the topics this turn can reach on this negotium node: title, id, kind, agent, and whether a turn is currently running.", {}, async () => {
+    const topics = topicsForCaller(ctx);
     if (topics.length === 0) {
       return textResult("No topics found. Use register_topic to create one.");
     }
@@ -24650,7 +24701,7 @@ function registerNodeTools(server, ctx) {
     if (target.kind === "manager") {
       return errorResult("Error: manager rooms are system-managed and cannot be restarted.");
     }
-    const result = await restartTopicSession(target.id, ctx.userId, "runtime-mcp-session-reset");
+    const result = await restartTopicSession(target.id, actingUserFor(ctx, target), "runtime-mcp-session-reset");
     return result.isError ? errorResult(`Error: ${result.text}`) : textResult(result.text);
   });
   server.tool("delete_topic", "Delete a topic owned by the calling user after archiving its conversation history. Deletion is blocked " + "when the archive cannot be written; pass force: true only as an explicit escape hatch that accepts losing history.", {
@@ -24667,12 +24718,13 @@ function registerNodeTools(server, ctx) {
     if (target.kind === "manager") {
       return errorResult("Error: manager rooms are system-managed and cannot be deleted.");
     }
-    const isOwner = target.participants.some((participant) => participant.userId === ctx.userId && participant.role === "owner");
+    const actingUser = actingUserFor(ctx, target);
+    const isOwner = target.participants.some((participant) => participant.userId === actingUser && participant.role === "owner");
     if (!isOwner) {
       return errorResult("Error: only the topic owner can delete it.");
     }
     try {
-      await deleteTopicCascade(target, ctx.userId, { force: force === true });
+      await deleteTopicCascade(target, actingUser, { force: force === true });
     } catch (err2) {
       if (err2 instanceof TopicArchiveRequiredError) {
         return errorResult([
@@ -32877,6 +32929,34 @@ function createNodeControlHandler(options) {
           });
           return Response.json({ ok: true, v: NODE_RUNTIME_CONTRACT_VERSION, topic }, { status: 201 });
         }
+        const runtimeDeriveMatch = runtimePath.match(/^\/topics\/([^/]+)\/derive$/);
+        if (runtimeDeriveMatch && req.method === "POST") {
+          const body = await bodyRecord(req);
+          if (body.v !== NODE_RUNTIME_CONTRACT_VERSION)
+            return jsonError(400, "Unsupported v");
+          const topicId = decodeURIComponent(runtimeDeriveMatch[1]);
+          const userId = requiredText(body.userId, "userId");
+          if (typeof body.copyHistory !== "boolean") {
+            return jsonError(400, "copyHistory must be a boolean");
+          }
+          if (body.name !== undefined && typeof body.name !== "string") {
+            return jsonError(400, "name must be a string");
+          }
+          const source = topicForUser(topicId, userId);
+          if (!source || source.kind === "manager" || !topicInRequestScope(req, source)) {
+            return jsonError(404, "Topic not found");
+          }
+          const name = typeof body.name === "string" && body.name.trim() ? body.name.trim() : "";
+          const derived = await topicService.derive({
+            sourceTopicId: topicId,
+            userId,
+            copyHistory: body.copyHistory,
+            ...name ? { name } : {}
+          });
+          if (!derived)
+            return jsonError(500, "Failed to derive topic");
+          return Response.json({ ok: true, v: NODE_RUNTIME_CONTRACT_VERSION, topic: derived }, { status: 201 });
+        }
         const importMatch = runtimePath.match(/^\/topics\/([^/]+)\/import$/);
         if (importMatch && req.method === "POST") {
           const body = await bodyRecord(req);
@@ -32952,10 +33032,12 @@ function createNodeControlHandler(options) {
           if (!topic || !topicInRequestScope(req, topic))
             return jsonError(404, "Topic not found");
           const userId = requiredText(body.userId, "userId");
+          const actorUserId = body.actorUserId === undefined ? undefined : requiredText(body.actorUserId, "actorUserId");
           const reason = body.reason === undefined ? undefined : requiredText(body.reason, "reason");
           const result = await topicService.reset({
             topicId,
             userId,
+            actorUserId,
             reason: reason ?? "runtime-contract-session-reset"
           });
           if (result.isError)
@@ -32976,10 +33058,12 @@ function createNodeControlHandler(options) {
           if (!topic || !topicInRequestScope(req, topic))
             return jsonError(404, "Topic not found");
           const userId = requiredText(body.userId, "userId");
+          const actorUserId = body.actorUserId === undefined ? undefined : requiredText(body.actorUserId, "actorUserId");
           const reason = body.reason === undefined ? undefined : requiredText(body.reason, "reason");
           const result = await topicService.compact({
             topicId,
             userId,
+            actorUserId,
             reason: reason ?? "runtime-contract-session-compact",
             compactSession: options.compactSession
           });
@@ -33067,8 +33151,9 @@ function createNodeControlHandler(options) {
           if (!topic || !topicInRequestScope(req, topic))
             return jsonError(404, "Topic not found");
           const userId = requiredText(url.searchParams.get("user"), "user");
+          const actorUserId = url.searchParams.get("actor")?.trim() || undefined;
           try {
-            await topicService.delete({ topicId, userId });
+            await topicService.delete({ topicId, userId, memoryUserId: actorUserId });
           } catch (err2) {
             if (err2 instanceof TopicServiceError) {
               const status = err2.code === "TOPIC_NOT_FOUND" ? 404 : err2.code === "TOPIC_FORBIDDEN" ? 403 : 400;
@@ -48666,4 +48751,4 @@ switch (command) {
   }
 }
 
-//# debugId=0FC049F7BD1544D864756E2164756E21
+//# debugId=E5965A3EFE680BBE64756E2164756E21