negotium 0.6.4 → 0.6.6

package/dist/main.js

@@ -3674,7 +3674,7 @@ var exports_version = {};
 __export(exports_version, {
   NEGOTIUM_VERSION: () => NEGOTIUM_VERSION
 });
-var NEGOTIUM_VERSION = "0.6.4";
+var NEGOTIUM_VERSION = "0.6.6";
 
 // ../../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, {
@@ -12494,12 +12498,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 +12515,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 +12643,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, ok && text ? { text, agent, model, usage } : undefined);
     });
     topicQueues.set(safeTopic, work);
     work.finally(() => {
@@ -12685,7 +12690,7 @@ function findSummaryFile(storage, topicTitle, date, sinceMs, topicId) {
   }
   return best?.path ?? null;
 }
-function finalizeGeneralMemory(host, userId, topicTitle, messageCount, startMs, ok, topicId, generalReply) {
+function finalizeGeneralMemory(host, userId, topicTitle, messageCount, startMs, ok, mode, topicId, generalReply) {
   const generalTopicId = host.storage.getGeneralTopicId(userId);
   const date = host.config.now().toISOString().slice(0, 10);
   try {
@@ -12702,7 +12707,7 @@ 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(`
@@ -12717,7 +12722,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,
@@ -23679,6 +23684,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,
@@ -24094,6 +24100,7 @@ __export(exports_node_host, {
   startBashrsCompletionsWorker: () => startBashrsCompletionsWorker,
   startAskUserQuestionGateOwner: () => startAskUserQuestionGateOwner,
   startAiTurn: () => startAiTurn,
+  softDeleteApiMessage: () => softDeleteApiMessage,
   setRuntimeMcpPort: () => setRuntimeMcpPort,
   setNodeMcpServers: () => setNodeMcpServers,
   setGlobalAiName: () => setGlobalAiName,
@@ -24508,6 +24515,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
@@ -24548,12 +24556,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)
@@ -24565,6 +24592,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";
@@ -24603,8 +24636,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.");
     }
@@ -24649,7 +24682,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.", {
@@ -24666,12 +24699,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([
@@ -32528,6 +32562,7 @@ function createNodeControlHandler(options) {
               "turn-events-sse-resume",
               "canonical-topic-read",
               "canonical-message-read",
+              "canonical-message-delete",
               "canonical-topic-usage",
               "canonical-file-read",
               "canonical-visual-read",
@@ -32812,6 +32847,36 @@ function createNodeControlHandler(options) {
           });
           return Response.json({ ok: true, v: NODE_RUNTIME_CONTRACT_VERSION, ...result });
         }
+        const runtimeMessageMatch = runtimePath.match(/^\/topics\/([^/]+)\/messages\/([^/]+)$/);
+        if (runtimeMessageMatch && req.method === "DELETE") {
+          const body = await bodyRecord(req);
+          if (body.v !== NODE_RUNTIME_CONTRACT_VERSION)
+            return jsonError(400, "Unsupported v");
+          const topicId = decodeURIComponent(runtimeMessageMatch[1]);
+          const messageId = decodeURIComponent(runtimeMessageMatch[2]);
+          const topic = getTopic(topicId);
+          if (!topic || !topicInRequestScope(req, topic))
+            return jsonError(404, "Topic not found");
+          const actorUserId = requiredText(body.actorUserId, "actorUserId");
+          if (body.allowAdmin !== undefined && typeof body.allowAdmin !== "boolean") {
+            return jsonError(400, "allowAdmin must be boolean");
+          }
+          const existing = getApiMessage(topicId, messageId);
+          if (!existing || existing.deleted)
+            return jsonError(404, "Message not found");
+          if (existing.authorId !== actorUserId && body.allowAdmin !== true) {
+            return jsonError(403, "Not allowed");
+          }
+          const message = softDeleteApiMessage(topicId, messageId);
+          if (!message)
+            return jsonError(404, "Message not found");
+          WsHub.get().broadcastMessageUpdated(topicId, messageId, { deleted: true, text: "" });
+          return Response.json({
+            ok: true,
+            v: NODE_RUNTIME_CONTRACT_VERSION,
+            message
+          });
+        }
         if (req.method === "GET" && runtimePath === "/topics") {
           const topics = gatewayVisibleTopics(req);
           const previews = getLastMessagePreviews(topics.map((topic) => topic.id));
@@ -32845,6 +32910,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);
@@ -46582,6 +46675,8 @@ function allowedRuntimePath(path, method) {
     return /^\/topics\/[^/]+\/(abort|session\/(reset|compact))$/.test(path);
   }
   if (method === "DELETE" || method === "PATCH") {
+    if (method === "DELETE" && /^\/topics\/[^/]+\/messages\/[^/]+$/.test(path))
+      return true;
     return /^\/topics\/[^/]+$/.test(path) || /^\/cron\/jobs\/[^/]+$/.test(path);
   }
   return false;
@@ -48632,4 +48727,4 @@ switch (command) {
   }
 }
 
-//# debugId=FFCB7D41CEEC0A6064756E2164756E21
+//# debugId=679BF40C457A90DE64756E2164756E21