negotium 0.2.31 → 0.2.32

package/dist/main.js

@@ -1868,7 +1868,7 @@ var exports_version = {};
 __export(exports_version, {
   NEGOTIUM_VERSION: () => NEGOTIUM_VERSION
 });
-var NEGOTIUM_VERSION = "0.2.31";
+var NEGOTIUM_VERSION = "0.2.32";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 import { spawn } from "child_process";
@@ -17473,7 +17473,6 @@ async function runTurnEventStream(topicId, topicTitle, queryId, events, control,
   const emitPendingAssistantMessage = (usage) => {
     const text2 = pendingText.trimEnd();
     pendingText = "";
-    pendingSawDelta = false;
     if (silent || !text2.trim())
       return null;
     const message = {
@@ -17546,7 +17545,11 @@ async function runTurnEventStream(topicId, topicTitle, queryId, events, control,
           break;
         }
         case "text":
-          if (!pendingSawDelta) {
+          if (pendingSawDelta) {
+            pendingSawDelta = false;
+            break;
+          }
+          {
             const incoming = event.content;
             accumulatedText += incoming;
             pendingText += incoming;
@@ -21904,6 +21907,18 @@ function clearPendingAskForEntry(scope, entry, topicName, reason) {
 function entryFromLabel(entry) {
   return entry.fromTitle?.trim() || entry.from;
 }
+function callerScope(entry, getTopic2) {
+  const fromTopicId = "fromTopicId" in entry ? entry.fromTopicId : undefined;
+  if (!fromTopicId)
+    return { kind: "unscoped" };
+  const surface = getTopic2(fromTopicId)?.surface;
+  return surface ? { kind: "surface", on: surface } : { kind: "deny" };
+}
+function scopeToLookupOpts(scope) {
+  if (scope.kind === "deny")
+    return null;
+  return scope.kind === "surface" ? { surface: scope.on } : {};
+}
 async function resolveEntryCallerTopic(scope, entry) {
   const { getTopic: getTopic2, getTopicByNameForUser: getTopicByNameForUser2 } = await init_api_topics().then(() => exports_api_topics);
   if (entry.fromTopicId) {
@@ -21911,7 +21926,10 @@ async function resolveEntryCallerTopic(scope, entry) {
     if (byId?.participants.some((p) => p.userId === scope.userId))
       return byId;
   }
-  return getTopicByNameForUser2(entry.from, String(scope.userId));
+  const opts = scopeToLookupOpts(callerScope(entry, getTopic2));
+  if (!opts)
+    return null;
+  return getTopicByNameForUser2(entry.from, String(scope.userId), opts);
 }
 function notifyCallerTopic(callerTopicId, targetLabel, message) {
   const msg = {
@@ -22197,7 +22215,8 @@ async function processTopicInbox(args) {
         seenRequestIds.add(entry.requestId);
       }
       const byId = topicId ? getTopic2(topicId) : null;
-      const topic = topicId ? byId?.participants.some((participant) => participant.userId === userId) ? byId : null : getTopicByNameForUser2(topicName, userId);
+      const nameLookupOpts = scopeToLookupOpts(callerScope(entry, getTopic2));
+      const topic = topicId ? byId?.participants.some((participant) => participant.userId === userId) ? byId : null : nameLookupOpts && getTopicByNameForUser2(topicName, userId, nameLookupOpts);
       if (!topic) {
         logger.warn({ topicName, from: entry.from }, "session-inbox: topic not found, dropping");
         if (entry.type === "ask") {
@@ -23369,13 +23388,14 @@ function resolveTopicForUser(ctx, ref) {
   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);
   const byId = getTopic(trimmed);
   if (byId) {
-    if (!isParticipant(byId, ctx.userId))
+    if (!isParticipant(byId, ctx.userId) || byId.surface !== surface)
       return { error: notFound };
     return { topic: byId };
   }
-  const byTitle = getTopicByNameForUser(trimmed, ctx.userId, { surface: callerSurface(ctx) });
+  const byTitle = getTopicByNameForUser(trimmed, ctx.userId, { surface });
   if (byTitle)
     return { topic: byTitle };
   return { error: notFound };
@@ -39448,6 +39468,13 @@ var init_telegram_api = __esm(() => {
 });
 
 // ../../adapters/telegram/src/commands.ts
+function resolveTelegramTopicArg(argument, userId) {
+  const byName = getTopicByNameForUser(argument, userId, { surface: "telegram" });
+  if (byName)
+    return byName;
+  const byId = getTopic(argument);
+  return byId?.surface === "telegram" ? byId : null;
+}
 function createTelegramCommandRouter(context) {
   const { userId, reply, currentTopicId, bindMapping, loadTopic, unloadTopic, abortTurn } = context;
   return async function handleCommand(text2, chatId, threadId, telegramUserId) {
@@ -39544,7 +39571,7 @@ function createTelegramCommandRouter(context) {
           reply(chatId, threadId, "usage: /load <topic>");
           return;
         }
-        const candidate = getTopicByNameForUser(argument, userId) ?? getTopic(argument);
+        const candidate = resolveTelegramTopicArg(argument, userId);
         const topic = candidate && isTopicVisible(candidate) ? candidate : null;
         if (!topic || !loadTopic(chatId, topic.id, threadId)) {
           reply(chatId, threadId, `no visible topic matching "${argument}"`);
@@ -39589,7 +39616,7 @@ function createTelegramCommandRouter(context) {
       case "/del!": {
         const force = command === "/del!";
         const topicId = currentTopicId(chatId, threadId);
-        const topic = argument ? getTopicByNameForUser(argument, userId) : topicId ? getTopic(topicId) : null;
+        const topic = argument ? resolveTelegramTopicArg(argument, userId) : topicId ? getTopic(topicId) : null;
         if (!topic) {
           reply(chatId, threadId, argument ? `no topic named "${argument}"` : "this chat has no topic \u2014 usage: /del [name]");
           return;
@@ -42957,11 +42984,11 @@ async function peerSupportsRemoteAsk(node) {
   }
 }
 async function findNode(nodeName, fromTopicId) {
-  const callerScope = fromTopicId ? getTopic(fromTopicId)?.surfaceScope ?? null : null;
+  const callerScope2 = fromTopicId ? getTopic(fromTopicId)?.surfaceScope ?? null : null;
   const select = (nodes) => {
     let candidates = nodes.filter((node) => node.nodeName === nodeName);
-    if (callerScope) {
-      candidates = candidates.filter((node) => surfaceScopeForCell(node.viaCellId) === callerScope);
+    if (callerScope2) {
+      candidates = candidates.filter((node) => surfaceScopeForCell(node.viaCellId) === callerScope2);
     }
     if (candidates.length === 0)
       return null;
@@ -43074,12 +43101,12 @@ async function sessions(userId, sourceQueryId, fromTopicId) {
   const selves = new Map(nodes.filter((node) => node.self).map((node) => [node.viaCellId, node]));
   if (selves.size === 0)
     return { ok: false, nodes: [] };
-  const callerScope = fromTopicId ? getTopic(fromTopicId)?.surfaceScope ?? null : null;
+  const callerScope2 = fromTopicId ? getTopic(fromTopicId)?.surfaceScope ?? null : null;
   return {
     ok: true,
     nodes: await Promise.all(nodes.filter((node) => {
       const self = selves.get(node.viaCellId);
-      if (callerScope && surfaceScopeForCell(node.viaCellId) !== callerScope)
+      if (callerScope2 && surfaceScopeForCell(node.viaCellId) !== callerScope2)
         return false;
       return !node.self && node.nodeName && self && (self.isPrimary || node.isPrimary);
     }).map(async (node) => {
@@ -46036,4 +46063,4 @@ switch (command) {
   }
 }
 
-//# debugId=295C7100524DA6AC64756E2164756E21
+//# debugId=B3AFD0752FA1AFAA64756E2164756E21