negotium 0.21.2 → 0.22.0

package/dist/main.js

@@ -6520,7 +6520,7 @@ var exports_version = {};
 __export(exports_version, {
   NEGOTIUM_VERSION: () => NEGOTIUM_VERSION
 });
-var NEGOTIUM_VERSION = "0.21.2";
+var NEGOTIUM_VERSION = "0.22.0";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 import { spawn as spawn2 } from "child_process";
@@ -13748,8 +13748,20 @@ class InterSessionQueue {
   keysForRoom() {
     return Array.from(this.queue.keys());
   }
-  drop(topicId) {
+  drop(topicId, reason = "target session was stopped before the request ran") {
+    const bucket = this.queue.get(topicId);
     this.queue.delete(topicId);
+    if (!bucket)
+      return 0;
+    const dropped = bucket.items.slice(bucket.head);
+    for (const inject of dropped) {
+      try {
+        inject.onSettled?.({ queryId: "", kind: "error", error: reason });
+      } catch (err) {
+        logger.warn({ err, topicId, requestId: inject.requestId }, "session inject drop settlement hook failed");
+      }
+    }
+    return dropped.length;
   }
   size(topicId) {
     const bucket = this.queue.get(topicId);
@@ -15574,6 +15586,30 @@ function isQueryRecord(value) {
   const record = value;
   return record.schemaVersion === 2 && typeof record.timestamp === "string" && typeof record.session === "string" && typeof record.topicId === "string" && typeof record.agent === "string" && typeof record.model === "string" && typeof record.inputTokens === "number" && typeof record.outputTokens === "number" && typeof record.cacheCreationInputTokens === "number" && typeof record.cacheReadInputTokens === "number" && typeof record.estimatedCostUsd === "number";
 }
+function previousCumulativeCost(userId, providerSessionId) {
+  let lines;
+  try {
+    lines = readJsonlLines(queriesPath(userId));
+  } catch {
+    return 0;
+  }
+  for (let i = lines.length - 1;i >= 0; i--) {
+    let parsed;
+    try {
+      parsed = JSON.parse(lines[i]);
+    } catch {
+      continue;
+    }
+    if (parsed.providerSessionId !== providerSessionId)
+      continue;
+    if (typeof parsed.cumulativeCostUsd === "number")
+      return parsed.cumulativeCostUsd;
+    if (typeof parsed.estimatedCostUsd === "number")
+      return parsed.estimatedCostUsd;
+    return 0;
+  }
+  return 0;
+}
 function recordUsage(userId, session, usage, context) {
   const cacheReadInputTokens = usage.cacheReadInputTokens ?? 0;
   const inputTokens = context.agent === "claude" ? usage.inputTokens : Math.max(0, usage.inputTokens - cacheReadInputTokens);
@@ -15583,6 +15619,15 @@ function recordUsage(userId, session, usage, context) {
     cacheCreationInputTokens: usage.cacheCreationInputTokens ?? 0,
     cacheReadInputTokens
   };
+  let estimatedCostUsd;
+  let cumulativeCostUsd;
+  if (usage.costUsd !== undefined) {
+    const previous = context.providerSessionId ? previousCumulativeCost(userId, context.providerSessionId) : 0;
+    estimatedCostUsd = Math.max(0, usage.costUsd - previous);
+    cumulativeCostUsd = usage.costUsd;
+  } else {
+    estimatedCostUsd = estimateUsageCost(context.agent, context.model, normalized);
+  }
   const record = {
     schemaVersion: 2,
     timestamp: new Date().toISOString(),
@@ -15594,7 +15639,8 @@ function recordUsage(userId, session, usage, context) {
     ...normalized,
     ...usage.contextTokens !== undefined ? { contextTokens: usage.contextTokens } : {},
     ...usage.contextWindow !== undefined ? { contextWindow: usage.contextWindow } : {},
-    estimatedCostUsd: usage.costUsd ?? estimateUsageCost(context.agent, context.model, normalized)
+    estimatedCostUsd,
+    ...cumulativeCostUsd !== undefined ? { cumulativeCostUsd } : {}
   };
   try {
     appendJsonlEntry(queriesPath(userId), record);
@@ -23436,9 +23482,8 @@ function startAiTurn(params) {
           contextWindow: outcome.usage.contextWindow
         } : undefined, { agent: agentKind, model: resolvedModel, budgetReason: outcome.reason });
         WsHub.get().broadcastTopicNotice(topicId, "warning", "\uC608\uC0B0 \uD55C\uB3C4 \uB3C4\uB2EC");
-      } else {
-        await deliverAskError(queryId, topic.title, error);
       }
+      await deliverAskError(queryId, topic.title, error);
       await settleSubagentFailure(queryId, error);
       try {
         onSettled?.({ queryId, kind: "error", error });
@@ -23483,6 +23528,7 @@ function startAiTurn(params) {
       WsHub.get().broadcastError(topicId, queryId, error);
       WsHub.get().broadcastTopicNotice(topicId, "error", "\uC751\uB2F5 \uC2E4\uD328");
     }
+    await deliverAskError(queryId, topic.title, error);
     await settleSubagentFailure(queryId, classifyAgentError(error, agentKind));
     try {
       onSettled?.({
@@ -27512,6 +27558,9 @@ function normalizeAskTarget(target) {
     return "main";
   return target === "cron" ? "cron" : null;
 }
+function askRunsOnTargetSession(target) {
+  return target === "main";
+}
 async function createAskForkPlan(options) {
   const snapshot = structuredClone(options.entries);
   const prepareSession = options.prepareSession ?? (async () => options.synthesize(structuredClone(snapshot)));
@@ -28113,6 +28162,59 @@ ${entry.message}
     }
     return;
   }
+  const onSettled = (result) => {
+    if (result.queryId || result.kind !== "error")
+      return;
+    clearPendingAskForEntry(scope, entry, topicName, "target-unavailable-before-dispatch");
+    const message2 = `(error: ${result.error ?? "target topic became unavailable before dispatch"})`;
+    if (remoteReply) {
+      deliverPeerReply(remoteReply, targetLabel, message2, "error");
+    } else {
+      notifyAskDrop(scope, entry, targetLabel, message2);
+    }
+  };
+  const onDispatched = (queryId) => {
+    registerAskCallback2({
+      requestId,
+      contextId: entry.contextId,
+      callerTopicId,
+      ...entry.fromThreadRootId ? { callerThreadRootId: entry.fromThreadRootId } : {},
+      callerUserId: String(scope.userId),
+      targetQueryId: queryId,
+      createdAt: Date.now(),
+      ...remoteReply ? { remoteReply } : {
+        pendingAsk: {
+          userId: scope.userId,
+          from: entry.from,
+          to: topicName,
+          requestId
+        }
+      },
+      sourceLabel: targetLabel
+    });
+  };
+  if (askRunsOnTargetSession(askTarget)) {
+    triggerTopicAiTurn2(topic.id, String(scope.userId), prompt, agentOverride, {
+      origin: entry.from,
+      requestId,
+      contextId: entry.contextId,
+      depth: (entry.fromDepth ?? 0) + 1,
+      from: fromLabel,
+      injectAuthorId: "system",
+      injectSourceAdapter: "session-comm",
+      injectKind: "tell",
+      injectTellCard: {
+        fromLabel,
+        fromTopicId: entry.fromTopicId,
+        label: `Ask from ${fromLabel}`,
+        message: entry.message
+      },
+      onSettled,
+      onDispatched
+    });
+    logger.info({ topicName, from: entry.from, requestId, callerTopicId, agent: agentOverride }, "session-inbox: ask delivered to target session");
+    return;
+  }
   const forkNative = parentSessionId ? () => forkAgentSession2({
     agent: agentOverride,
     parentSessionId,
@@ -28200,36 +28302,8 @@ ${entry.message}
     forkHandle: forkPlan.forkHandle,
     prepareSession: forkPlan.prepareSession,
     cwd,
-    onSettled: (result) => {
-      if (result.queryId || result.kind !== "error")
-        return;
-      clearPendingAskForEntry(scope, entry, topicName, "target-unavailable-before-dispatch");
-      if (remoteReply) {
-        deliverPeerReply(remoteReply, targetLabel, `(error: target topic became unavailable before dispatch)`, "error");
-      } else {
-        notifyAskDrop(scope, entry, targetLabel, `(error: target topic became unavailable before dispatch)`);
-      }
-    },
-    onDispatched: (queryId) => {
-      registerAskCallback2({
-        requestId,
-        contextId: entry.contextId,
-        callerTopicId,
-        ...entry.fromThreadRootId ? { callerThreadRootId: entry.fromThreadRootId } : {},
-        callerUserId: String(scope.userId),
-        targetQueryId: queryId,
-        createdAt: Date.now(),
-        ...remoteReply ? { remoteReply } : {
-          pendingAsk: {
-            userId: scope.userId,
-            from: entry.from,
-            to: topicName,
-            requestId
-          }
-        },
-        sourceLabel: targetLabel
-      });
-    }
+    onSettled,
+    onDispatched
   });
   logger.info({ topicName, from: entry.from, requestId, callerTopicId }, "session-inbox: ask delivered");
 }
@@ -29924,6 +29998,10 @@ function callerSurface(ctx) {
 function callerSurfaceScope(ctx) {
   return getTopic(ctx.topicId)?.surfaceScope ?? null;
 }
+function isTelegramDmGeneral(ctx) {
+  const topic = getTopic(ctx.topicId);
+  return topic?.surface === "telegram" && topic.kind === "manager" && !(topic.surfaceScope ?? null);
+}
 function resolvableTopicsForCaller(ctx) {
   const surface = callerSurface(ctx);
   if (surface !== "otium") {
@@ -30004,11 +30082,15 @@ function registerNodeTools(server, ctx) {
       description: z6.string().optional().describe("Short description of the topic's purpose."),
       memory_key: z6.string().optional().describe("Wiki memory persona the room continues.")
     }, async ({ title, agent, model, effort, description, memory_key }) => {
+      if (isTelegramDmGeneral(ctx)) {
+        return errorResult("Error: topics can't be created from the Telegram DM. Topic management lives in " + "a connected forum group \u2014 ask the user to send /start to connect one, then " + "create the topic from that group's General.");
+      }
       try {
         const topic = registerTopic({
           title,
           userId: ctx.userId,
           surface: callerSurface(ctx),
+          surfaceScope: callerSurfaceScope(ctx),
           agent,
           model,
           effort,
@@ -43759,7 +43841,7 @@ function footerUsageText(state) {
   const ratio = contextUsage?.context !== undefined && contextUsage.contextWindow ? Math.round(contextUsage.context / contextUsage.contextWindow * 100) : undefined;
   const context = contextUsage?.context !== undefined && contextUsage.contextWindow ? `${contextUsage.estimated ? "~" : ""}${tokenCount(contextUsage.context)}/${tokenCount(contextUsage.contextWindow)} ${ratio}%` : "";
   const hasTopicUsage = total !== undefined && total.queries > 0;
-  const cumulative = hasTopicUsage ? `\u03A3 ${tokenCount(total.inputTokens)} in/${tokenCount(total.outputTokens)} out` : "";
+  const cumulative = hasTopicUsage ? `\u03A3 ${tokenCount(total.inputTokens)} fresh/${tokenCount(total.outputTokens)} out` : "";
   const cache = hasTopicUsage && total.cacheReadInputTokens ? `cache ${tokenCount(total.cacheReadInputTokens)}` : "";
   const cost = hasTopicUsage ? `est $${total.estimatedCostUsd.toFixed(2)}` : "";
   const variant = (values2) => {
@@ -48590,7 +48672,7 @@ function resolveTelegramTopicArg(argument, userId, surfaceScope) {
 }
 function createTelegramCommandRouter(context) {
   const { userId, reply, currentTopicId, bindMapping, loadTopic, unloadTopic, abortTurn } = context;
-  return async function handleCommand(text3, chatId, threadId, telegramUserId) {
+  return async function handleCommand(text3, chatId, threadId, telegramUserId, isPrivateDm = false) {
     const [rawCommand = ""] = text3.split(/\s+/);
     const addressedUsername = rawCommand.match(/@(\w+)$/)?.[1];
     if (addressedUsername) {
@@ -48608,6 +48690,20 @@ function createTelegramCommandRouter(context) {
     }
     const command = rawCommand.replace(/@\w+$/, "");
     const argument = extractCommandArg(text3);
+    const DM_RESTRICTED_COMMANDS = new Set([
+      "/topics",
+      "/load",
+      "/unload",
+      "/agent",
+      "/fork",
+      "/spawn",
+      "/del",
+      "/del!"
+    ]);
+    if (isPrivateDm && (DM_RESTRICTED_COMMANDS.has(command) || command === "/new" && argument)) {
+      reply(chatId, threadId, "topic management lives in a connected forum group, not this DM \u2014 " + "send /start to see how to connect one.");
+      return;
+    }
     switch (command) {
       case "/start":
         await context.sendOnboardingGuide(chatId, threadId);
@@ -48751,7 +48847,7 @@ function createTelegramCommandRouter(context) {
         return;
       }
       default:
-        reply(chatId, threadId, "commands: /new [name], /topics, /agent <claude|codex|maestro>, " + "/load <topic>, /unload, /fork [name], /spawn [name], " + "/del [name], /del! [name], /abort, /vault <list|set|del>");
+        reply(chatId, threadId, isPrivateDm ? "commands: /new, /abort, /vault <list|set|del> \u2014 topic management " + "(/topics, /load, /fork, /spawn, /del, /agent) lives in a connected " + "forum group; send /start to connect one" : "commands: /new [name], /topics, /agent <claude|codex|maestro>, " + "/load <topic>, /unload, /fork [name], /spawn [name], " + "/del [name], /del! [name], /abort, /vault <list|set|del>");
     }
   };
 }
@@ -50672,9 +50768,9 @@ Warning: enable the bot administrator permission "Manage Topics" before creating
     if (text3?.startsWith("/")) {
       const command = text3.split(/\s+/, 1)[0]?.replace(/@\w+$/, "");
       if (command === "/abort") {
-        handleCommand(text3, chatId, threadId, msg.from?.id);
+        handleCommand(text3, chatId, threadId, msg.from?.id, privateDm);
       } else {
-        mediaIntake.enqueue(chatId, threadId, () => handleCommand(text3, chatId, threadId, msg.from?.id));
+        mediaIntake.enqueue(chatId, threadId, () => handleCommand(text3, chatId, threadId, msg.from?.id, privateDm));
       }
       return;
     }
@@ -58187,4 +58283,4 @@ switch (command) {
   }
 }
 
-//# debugId=2B03CFE9288A2E3664756E2164756E21
+//# debugId=205630437F8D066064756E2164756E21