negotium 0.21.2 → 0.22.0

package/dist/agent-helpers.js

@@ -5199,7 +5199,7 @@ var init_codex = __esm(async () => {
 });
 
 // ../../packages/core/src/version.ts
-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";
@@ -10999,8 +10999,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);
@@ -13940,6 +13952,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);
@@ -13949,6 +13985,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(),
@@ -13960,7 +14005,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);
@@ -20650,9 +20696,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 });
@@ -20697,6 +20742,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?.({
@@ -22793,4 +22839,4 @@ export {
   DEFAULT_SELF_CONFIG_PRODUCT
 };
 
-//# debugId=6956D5C85128E56E64756E2164756E21
+//# debugId=15A62BAA7CA7894C64756E2164756E21