negotium 0.2.14 → 0.2.16

package/dist/hosted-agent.js

@@ -531,7 +531,7 @@ var referencesRuntimeSecretStorage = defaultVaultToolPolicy.referencesRuntimeSec
 var shouldRedirectVaultTool = defaultVaultToolPolicy.shouldRedirectVaultTool;
 
 // ../../packages/core/src/mcp/runtime-spec.ts
-import { createHmac, timingSafeEqual } from "crypto";
+import { createHash, createHmac, timingSafeEqual } from "crypto";
 var RUNTIME_MCP_KEY = "runtime";
 var RUNTIME_MCP_BASE_PATH = "/mcp/runtime";
 var TOKEN_TTL_MS = 4 * 60 * 60 * 1000;
@@ -569,19 +569,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)
+    } : {}
   };
 }
 
@@ -1398,12 +1448,12 @@ if (isBun) {
 }
 
 // ../../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";
 var ENVELOPE_PREFIX = "otium-vault:v1:";
 var IV_BYTES = 12;
 var KEY_BYTES = 32;
 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");
@@ -2185,7 +2235,7 @@ import { tmpdir } from "os";
 import { dirname as dirname4, join as join3 } from "path";
 
 // ../../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
 var moduleRequire = createRequire2(import.meta.url);
@@ -2769,6 +2819,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)
@@ -2780,6 +2860,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)
@@ -2949,6 +3040,20 @@ function buildNumberedDiffSummary(before, after, startLine = 1) {
 }
 
 // ../../packages/core/src/agents/codex-provider.ts
+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;
@@ -3355,6 +3460,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 = "";
@@ -3413,6 +3519,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) {
@@ -3513,10 +3620,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",
@@ -3525,6 +3633,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
                 }
@@ -3816,4 +3925,4 @@ export {
   buildClaudeDisallowedTools
 };
 
-//# debugId=61393A8287FDB3CB64756E2164756E21
+//# debugId=76B59F2AB62704F364756E2164756E21