negotium 0.2.14 → 0.2.16

package/dist/agent-helpers.js

@@ -474,7 +474,7 @@ var init_canonical_bridge_config = __esm(() => {
 });
 
 // ../../packages/core/src/mcp/runtime-spec.ts
-import { createHmac, timingSafeEqual } from "crypto";
+import { createHash, createHmac, timingSafeEqual } from "crypto";
 function encodeTokenPart(value) {
   return Buffer.from(JSON.stringify(value), "utf-8").toString("base64url");
 }
@@ -507,19 +507,69 @@ function buildRuntimeMcpSpec(agent, ctx) {
   return {
     type: "sse",
     url: `${base}/sse?${query}`,
-    timeout: CLAUDE_MCP_TOOL_TIMEOUT_MS
+    timeout: CLAUDE_MCP_TOOL_TIMEOUT_MS,
+    ...agent === "maestro" ? { lifecycle: "turn" } : {}
   };
 }
+function hostedMcpCacheIdentity(surface, ctx) {
+  let semanticContext;
+  switch (surface) {
+    case "system-health":
+      semanticContext = {};
+      break;
+    case "token-stats":
+    case "agent-health":
+      semanticContext = { userId: ctx.userId };
+      break;
+    case "task":
+      semanticContext = {
+        userId: ctx.userId,
+        topicTitle: ctx.topicTitle,
+        topicId: ctx.topicId ?? null
+      };
+      break;
+    case "wiki":
+    case "skills":
+      semanticContext = {
+        userId: ctx.userId,
+        topicId: ctx.wikiTopicId ?? ctx.topicId ?? null
+      };
+      break;
+    case "vault":
+      semanticContext = { userId: ctx.userId, cwd: ctx.cwd, agent: ctx.agent };
+      break;
+    case "session-comm":
+      semanticContext = {
+        userId: ctx.userId,
+        topicTitle: ctx.topicTitle,
+        topicId: ctx.topicId ?? null,
+        subagentParentTopicId: ctx.subagentParentTopicId ?? null,
+        depth: ctx.depth ?? 0,
+        silent: ctx.silent ?? false,
+        agent: ctx.agent,
+        peerBridge: ctx.peerBridge ?? null
+      };
+      break;
+  }
+  const digest = createHash("sha256").update(JSON.stringify([surface, semanticContext])).digest("hex").slice(0, 24);
+  return `hosted:${surface}:${digest}`;
+}
 function buildHostedMcpSpec(agent, surface, ctx) {
   const token = issueHostedMcpToken(surface, ctx);
   const base = `http://127.0.0.1:${runtimePort}${RUNTIME_MCP_BASE_PATH}/${surface}`;
   const query = `token=${encodeURIComponent(token)}`;
   if (agent === "codex")
     return { url: `${base}/mcp?${query}` };
+  const queryBound = surface === "session-comm" && (ctx.silent === true || ctx.peerBridge !== undefined);
+  const lifecycle = queryBound ? "turn" : surface === "session-comm" ? "session" : "process";
   return {
     type: "sse",
     url: `${base}/sse?${query}`,
-    timeout: CLAUDE_MCP_TOOL_TIMEOUT_MS
+    timeout: CLAUDE_MCP_TOOL_TIMEOUT_MS,
+    ...agent === "maestro" ? {
+      lifecycle,
+      cacheKey: hostedMcpCacheIdentity(surface, ctx)
+    } : {}
   };
 }
 var RUNTIME_MCP_KEY = "runtime", RUNTIME_MCP_BASE_PATH = "/mcp/runtime", TOKEN_TTL_MS, CLAUDE_MCP_TOOL_TIMEOUT_MS = 600000, runtimePort;
@@ -1372,9 +1422,9 @@ var init_sqlite = __esm(async () => {
 });
 
 // ../../packages/core/src/storage/vault-crypto-core.ts
-import { createCipheriv, createDecipheriv, createHash, randomBytes as randomBytes3 } from "crypto";
+import { createCipheriv, createDecipheriv, createHash as createHash2, randomBytes as randomBytes3 } from "crypto";
 function encryptionKey(masterKey) {
-  return createHash("sha256").update("otium-vault-value-v1\x00", "utf8").update(masterKey, "utf8").digest().subarray(0, KEY_BYTES);
+  return createHash2("sha256").update("otium-vault-value-v1\x00", "utf8").update(masterKey, "utf8").digest().subarray(0, KEY_BYTES);
 }
 function aad(userId, key) {
   return Buffer.from(`${userId}\x00${key.toUpperCase()}`, "utf8");
@@ -2173,7 +2223,7 @@ var init_claude_registry = __esm(() => {
 });
 
 // ../../packages/core/src/version.ts
-var NEGOTIUM_VERSION = "0.2.14";
+var NEGOTIUM_VERSION = "0.2.16";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 import { spawn as spawn2 } from "child_process";
@@ -2631,6 +2681,36 @@ function extractLatestCodexContextUsage(jsonl) {
   }
   return;
 }
+function extractLatestCodexTokenTotals(jsonl) {
+  const lines = jsonl.trimEnd().split(`
+`);
+  for (let index = lines.length - 1;index >= 0; index -= 1) {
+    try {
+      const entry = JSON.parse(lines[index] ?? "");
+      if (entry.type !== "event_msg" || entry.payload?.type !== "token_count")
+        continue;
+      const usage = entry.payload.info?.total_token_usage;
+      if (!usage)
+        continue;
+      const values = [
+        usage.input_tokens,
+        usage.output_tokens,
+        usage.cached_input_tokens,
+        usage.cache_write_input_tokens
+      ];
+      if (values.some((value) => value !== undefined && (!Number.isFinite(value) || value < 0))) {
+        continue;
+      }
+      return {
+        inputTokens: usage.input_tokens ?? 0,
+        outputTokens: usage.output_tokens ?? 0,
+        cachedInputTokens: usage.cached_input_tokens ?? 0,
+        cacheWriteInputTokens: usage.cache_write_input_tokens ?? 0
+      };
+    } catch {}
+  }
+  return;
+}
 function readLatestCodexContextUsage(threadId) {
   const path = latestCodexRolloutPath(threadId);
   if (!path)
@@ -2642,6 +2722,17 @@ function readLatestCodexContextUsage(threadId) {
     return;
   }
 }
+function readLatestCodexTokenTotals(threadId) {
+  const path = latestCodexRolloutPath(threadId);
+  if (!path)
+    return;
+  try {
+    return extractLatestCodexTokenTotals(readFileSync5(path, "utf8"));
+  } catch (error) {
+    logger.debug({ error, threadId }, "codex token totals: rollout read failed");
+    return;
+  }
+}
 function migrateCodexRolloutNativeMultiAgentMetadata(threadId) {
   const path = latestCodexRolloutPath(threadId);
   if (!path)
@@ -4956,6 +5047,7 @@ var init_tool_format = __esm(() => {
 var exports_codex_provider = {};
 __export(exports_codex_provider, {
   toCodexMcpServers: () => toCodexMcpServers,
+  normalizeCodexTurnUsage: () => normalizeCodexTurnUsage,
   codexProvider: () => codexProvider
 });
 import { execFileSync as execFileSync4 } from "child_process";
@@ -4963,6 +5055,20 @@ import { existsSync as existsSync11, readFileSync as readFileSync11, realpathSyn
 import { homedir as homedir6 } from "os";
 import { dirname as dirname9, isAbsolute as isAbsolute2, join as join12, relative, resolve as resolve8 } from "path";
 import { Codex } from "@openai/codex-sdk";
+function sameCodexUsage(usage, total) {
+  return usage.input_tokens === total.inputTokens && usage.output_tokens === total.outputTokens && (usage.cached_input_tokens ?? 0) === total.cachedInputTokens && (usage.cache_write_input_tokens ?? 0) === total.cacheWriteInputTokens;
+}
+function normalizeCodexTurnUsage(usage, baseline, rolloutTotal) {
+  if (!baseline || !rolloutTotal || !sameCodexUsage(usage, rolloutTotal))
+    return usage;
+  const delta = (current, previous) => current >= previous ? current - previous : current;
+  return {
+    input_tokens: delta(rolloutTotal.inputTokens, baseline.inputTokens),
+    output_tokens: delta(rolloutTotal.outputTokens, baseline.outputTokens),
+    cached_input_tokens: delta(rolloutTotal.cachedInputTokens, baseline.cachedInputTokens),
+    cache_write_input_tokens: delta(rolloutTotal.cacheWriteInputTokens, baseline.cacheWriteInputTokens)
+  };
+}
 function mapEffort(effort) {
   if (!effort)
     return;
@@ -5362,6 +5468,7 @@ async function* codexProvider(opts) {
     ...opts.effort ? { modelReasoningEffort: mapEffort(opts.effort) } : {}
   };
   let currentSessionId = opts.sessionId;
+  let usageBaseline = currentSessionId ? readLatestCodexTokenTotals(currentSessionId) : undefined;
   let thread = currentSessionId ? codex.resumeThread(currentSessionId, threadOptions) : codex.startThread(threadOptions);
   let prompt = promptForThread(opts, true);
   let agentTextSoFar = "";
@@ -5420,6 +5527,7 @@ async function* codexProvider(opts) {
           thread = codex.startThread(threadOptions);
           prompt = promptForThread(opts, true);
           currentSessionId = undefined;
+          usageBaseline = undefined;
           startResult = await startStreamedWithTracking(thread, prompt, attemptAbort.signal, trackedPids);
         }
         if (attemptAbort.signal.aborted) {
@@ -5520,10 +5628,11 @@ async function* codexProvider(opts) {
               break;
             }
             case "turn.completed": {
-              const usage = event.usage;
-              if (!usage)
+              const rawUsage = event.usage;
+              if (!rawUsage)
                 break;
               attemptCompleted = true;
+              const usage = normalizeCodexTurnUsage(rawUsage, usageBaseline, currentSessionId ? readLatestCodexTokenTotals(currentSessionId) : undefined);
               const contextUsage = currentSessionId ? readLatestCodexContextUsage(currentSessionId) : undefined;
               yield {
                 type: "result",
@@ -5532,6 +5641,7 @@ async function* codexProvider(opts) {
                 usage: {
                   inputTokens: usage.input_tokens,
                   outputTokens: usage.output_tokens,
+                  cacheCreationInputTokens: usage.cache_write_input_tokens,
                   cacheReadInputTokens: usage.cached_input_tokens,
                   ...contextUsage
                 }
@@ -9750,7 +9860,7 @@ var init_runtime_process_leases = __esm(async () => {
 });
 
 // ../../packages/core/src/agents/mcp-tools/ask-user.ts
-import { createHash as createHash2, randomUUID as randomUUID9 } from "crypto";
+import { createHash as createHash3, randomUUID as randomUUID9 } from "crypto";
 import { z } from "zod";
 function normalizeAskText(value, maxChars) {
   if (typeof value !== "string")
@@ -9787,7 +9897,7 @@ function normalizeAskUserQuestionInput(input) {
   return { question, choices };
 }
 function askBodyHash(question, choices) {
-  return createHash2("sha256").update(JSON.stringify({ question, choices })).digest("hex");
+  return createHash3("sha256").update(JSON.stringify({ question, choices })).digest("hex");
 }
 function answerToolResult(answer) {
   if (!answer.userId)
@@ -10807,7 +10917,7 @@ var init_browser_profiles = __esm(async () => {
 
 // ../../packages/core/src/platform/playwright/manager.ts
 import { execFileSync as execFileSync7, spawn as spawn5 } from "child_process";
-import { createHash as createHash3, randomBytes as randomBytes6, timingSafeEqual as timingSafeEqual3 } from "crypto";
+import { createHash as createHash4, randomBytes as randomBytes6, timingSafeEqual as timingSafeEqual3 } from "crypto";
 import {
   cpSync,
   existsSync as existsSync17,
@@ -10902,7 +11012,7 @@ function parseInstanceKey(instanceKey) {
   };
 }
 function portFileName(instanceKey) {
-  return createHash3("sha256").update(instanceKey).digest("hex").slice(0, 24);
+  return createHash4("sha256").update(instanceKey).digest("hex").slice(0, 24);
 }
 function writePortFile(instanceKey, port) {
   try {
@@ -12495,7 +12605,7 @@ __export(exports_derive, {
   TopicForkCompactionError: () => TopicForkCompactionError,
   TopicDeriveBusyError: () => TopicDeriveBusyError
 });
-import { createHash as createHash4, randomUUID as randomUUID12 } from "crypto";
+import { createHash as createHash5, randomUUID as randomUUID12 } from "crypto";
 import { mkdirSync as mkdirSync13, rmSync as rmSync5, unlinkSync as unlinkSync13 } from "fs";
 function getTopics() {
   return listTopics().filter((topic) => !isLegacySharedGeneral(topic.id));
@@ -12561,7 +12671,7 @@ function captureForkSnapshot(sourceTopicId, userId, topicTitle) {
       maxRowid: messageRows.at(-1)?.rowid ?? 0
     },
     active: isTopicRunning(sourceTopicId),
-    canonicalDigest: createHash4("sha256").update(entries.map((entry) => JSON.stringify(entry)).join(`
+    canonicalDigest: createHash5("sha256").update(entries.map((entry) => JSON.stringify(entry)).join(`
 `)).digest("hex")
   };
 }
@@ -13054,7 +13164,7 @@ __export(exports_session_asks, {
   clearPendingAsk: () => clearPendingAsk,
   PENDING_ASK_TTL_MS: () => PENDING_ASK_TTL_MS
 });
-import { createHash as createHash5 } from "crypto";
+import { createHash as createHash6 } from "crypto";
 import {
   closeSync as closeSync2,
   mkdirSync as mkdirSync15,
@@ -13068,14 +13178,14 @@ import {
 import { dirname as dirname13, join as join24 } from "path";
 function pendingAskDir(userId) {
   const rawUserId = String(userId);
-  const safeUserId = /^[A-Za-z0-9][A-Za-z0-9_.@-]{0,255}$/.test(rawUserId) && !rawUserId.includes("..") ? rawUserId : `sha256-${createHash5("sha256").update(rawUserId).digest("hex")}`;
+  const safeUserId = /^[A-Za-z0-9][A-Za-z0-9_.@-]{0,255}$/.test(rawUserId) && !rawUserId.includes("..") ? rawUserId : `sha256-${createHash6("sha256").update(rawUserId).digest("hex")}`;
   return join24(resolveStorageSessionAsksDir(), safeUserId);
 }
 function encodeAskKey(key) {
   return JSON.stringify([key.from, key.to]);
 }
 function pendingAskPath(key) {
-  const digest = createHash5("sha256").update(encodeAskKey(key)).digest("hex");
+  const digest = createHash6("sha256").update(encodeAskKey(key)).digest("hex");
   return join24(pendingAskDir(key.userId), `${ASK_FILENAME_PREFIX}${digest}.pending`);
 }
 function v2PendingAskPath(key) {
@@ -14654,12 +14764,12 @@ var init_visuals = __esm(async () => {
 });
 
 // ../../packages/core/src/storage/token-stats.ts
-import { createHash as createHash6 } from "crypto";
+import { createHash as createHash7 } from "crypto";
 import { mkdirSync as mkdirSync17 } from "fs";
 import { join as join26 } from "path";
 function tokenStatsFileId(userId) {
   const rawUserId = String(userId);
-  return /^[A-Za-z0-9][A-Za-z0-9_.@-]{0,255}$/.test(rawUserId) && !rawUserId.includes("..") ? rawUserId : `sha256-${createHash6("sha256").update(rawUserId).digest("hex")}`;
+  return /^[A-Za-z0-9][A-Za-z0-9_.@-]{0,255}$/.test(rawUserId) && !rawUserId.includes("..") ? rawUserId : `sha256-${createHash7("sha256").update(rawUserId).digest("hex")}`;
 }
 function queriesPath(userId) {
   const fileId = tokenStatsFileId(userId);
@@ -14667,14 +14777,33 @@ function queriesPath(userId) {
   mkdirSync17(logDir, { recursive: true });
   return join26(logDir, `token-queries-${fileId}.jsonl`);
 }
-function recordUsage(userId, session, usage) {
+function estimateUsageCost(agent, model, usage) {
+  const prices = TOKEN_PRICES[`${agent}:${model}`];
+  if (!prices)
+    return 0;
+  return (usage.inputTokens * prices.input + usage.outputTokens * prices.output + (agent === "claude" ? usage.cacheCreationInputTokens * (prices.cacheWrite ?? prices.input) : 0) + usage.cacheReadInputTokens * prices.cacheRead) / 1e6;
+}
+function recordUsage(userId, session, usage, context) {
+  const cacheReadInputTokens = usage.cacheReadInputTokens ?? 0;
+  const inputTokens = context.agent === "claude" ? usage.inputTokens : Math.max(0, usage.inputTokens - cacheReadInputTokens);
+  const normalized = {
+    inputTokens,
+    outputTokens: usage.outputTokens,
+    cacheCreationInputTokens: usage.cacheCreationInputTokens ?? 0,
+    cacheReadInputTokens
+  };
   const record = {
+    schemaVersion: 2,
     timestamp: new Date().toISOString(),
     session,
-    inputTokens: usage.inputTokens,
-    outputTokens: usage.outputTokens,
-    cacheCreationInputTokens: usage.cacheCreationInputTokens ?? 0,
-    cacheReadInputTokens: usage.cacheReadInputTokens ?? 0
+    topicId: context.topicId,
+    ...context.providerSessionId ? { providerSessionId: context.providerSessionId } : {},
+    agent: context.agent,
+    model: context.model,
+    ...normalized,
+    ...usage.contextTokens !== undefined ? { contextTokens: usage.contextTokens } : {},
+    ...usage.contextWindow !== undefined ? { contextWindow: usage.contextWindow } : {},
+    estimatedCostUsd: usage.costUsd ?? estimateUsageCost(context.agent, context.model, normalized)
   };
   try {
     appendJsonlEntry(queriesPath(userId), record);
@@ -14682,10 +14811,23 @@ function recordUsage(userId, session, usage) {
     logger.warn({ err: e, userId }, "token-stats: Failed to record");
   }
 }
+var TOKEN_PRICES;
 var init_token_stats = __esm(async () => {
   init_jsonl();
   init_logger();
   await init_storage_host();
+  TOKEN_PRICES = {
+    "codex:gpt-5.6-sol": { input: 5, cacheRead: 0.5, output: 30 },
+    "codex:gpt-5.6-terra": { input: 2.5, cacheRead: 0.25, output: 15 },
+    "codex:gpt-5.6-luna": { input: 1, cacheRead: 0.1, output: 6 },
+    "claude:fable": { input: 10, cacheWrite: 12.5, cacheRead: 1, output: 50 },
+    "claude:opus": { input: 5, cacheWrite: 6.25, cacheRead: 0.5, output: 25 },
+    "claude:sonnet": { input: 2, cacheWrite: 2.5, cacheRead: 0.2, output: 10 },
+    "maestro:kimi-k3": { input: 3, cacheRead: 0.3, output: 15 },
+    "maestro:kimi-k2.7-code": { input: 0.95, cacheRead: 0.19, output: 4 },
+    "maestro:deepseek-pro": { input: 0.435, cacheRead: 0.003625, output: 0.87 },
+    "maestro:deepseek-flash": { input: 0.14, cacheRead: 0.0028, output: 0.28 }
+  };
 });
 
 // ../../packages/core/src/runtime/turn-event-stream.ts
@@ -14724,6 +14866,14 @@ async function runTurnEventStream(topicId, topicTitle, queryId, events, control,
   const toolSummaryOptions = {
     cwd: control.injectParams?.cwd ?? workspaceCwdFor(topicId)
   };
+  const recordEventUsage = (usage) => {
+    recordUsage(userId, topicTitle, usage, {
+      topicId,
+      ...control.sessionId ? { providerSessionId: control.sessionId } : {},
+      agent: agentType,
+      model
+    });
+  };
   const nextSyntheticToolUseId = () => `tool-${queryId}-${++syntheticToolCounter}`;
   const bindToolUseId = (providerToolUseId, fallback) => {
     const providerId = normalizeToolUseId(providerToolUseId);
@@ -15042,7 +15192,7 @@ async function runTurnEventStream(topicId, topicTitle, queryId, events, control,
           break;
         case "result":
           if (event.usage)
-            recordUsage(userId, topicTitle, event.usage);
+            recordEventUsage(event.usage);
           {
             const usage = event.usage ? {
               input: event.usage.inputTokens,
@@ -15092,6 +15242,8 @@ async function runTurnEventStream(topicId, topicTitle, queryId, events, control,
           }
           break;
         case "error":
+          if (event.usage)
+            recordEventUsage(event.usage);
           logger.warn({ topicId, queryId, agentType, model, silent, error: event.content }, "ai: provider returned error");
           terminalEmitted = true;
           errorOccurred = true;
@@ -18579,4 +18731,4 @@ export {
   DEFAULT_SELF_CONFIG_PRODUCT
 };
 
-//# debugId=1F2C27A2871EECB564756E2164756E21
+//# debugId=969112A1E458C75264756E2164756E21