negotium 0.2.14 → 0.2.16

package/dist/main.js

@@ -1572,7 +1572,7 @@ var exports_version = {};
 __export(exports_version, {
   NEGOTIUM_VERSION: () => NEGOTIUM_VERSION
 });
-var NEGOTIUM_VERSION = "0.2.14";
+var NEGOTIUM_VERSION = "0.2.16";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 import { spawn } from "child_process";
@@ -1925,7 +1925,7 @@ var init_canonical_bridge_config = __esm(() => {
 });
 
 // ../../packages/core/src/mcp/runtime-spec.ts
-import { createHmac, timingSafeEqual } from "crypto";
+import { createHash as createHash2, createHmac, timingSafeEqual } from "crypto";
 function setRuntimeMcpPort(port) {
   runtimePort = port;
 }
@@ -2024,19 +2024,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 = createHash2("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", HOSTED_MCP_SURFACES, TOKEN_TTL_MS, CLAUDE_MCP_TOOL_TIMEOUT_MS = 600000, runtimePort;
@@ -3176,6 +3226,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)
@@ -3187,6 +3267,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)
@@ -5554,6 +5645,7 @@ var init_tool_format = __esm(() => {
 var exports_codex_provider = {};
 __export(exports_codex_provider, {
   toCodexMcpServers: () => toCodexMcpServers,
+  normalizeCodexTurnUsage: () => normalizeCodexTurnUsage,
   codexProvider: () => codexProvider
 });
 import { execFileSync as execFileSync5 } from "child_process";
@@ -5561,6 +5653,20 @@ import { existsSync as existsSync13, readFileSync as readFileSync11, realpathSyn
 import { homedir as homedir7 } from "os";
 import { dirname as dirname9, isAbsolute as isAbsolute2, join as join13, 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;
@@ -5960,6 +6066,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 = "";
@@ -6018,6 +6125,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) {
@@ -6118,10 +6226,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",
@@ -6130,6 +6239,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
                 }
@@ -8529,7 +8639,7 @@ var init_runtime_process_leases = __esm(async () => {
 });
 
 // ../../packages/core/src/agents/mcp-tools/ask-user.ts
-import { createHash as createHash2, randomUUID as randomUUID7 } from "crypto";
+import { createHash as createHash3, randomUUID as randomUUID7 } from "crypto";
 import { z } from "zod";
 function normalizeAskText(value, maxChars) {
   if (typeof value !== "string")
@@ -8566,7 +8676,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)
@@ -10070,7 +10180,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 existsSync15,
@@ -10165,7 +10275,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 {
@@ -14109,7 +14219,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));
@@ -14175,7 +14285,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")
   };
 }
@@ -15251,7 +15361,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,
@@ -15265,14 +15375,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) {
@@ -16880,10 +16990,11 @@ var exports_token_stats = {};
 __export(exports_token_stats, {
   tokenStatsFileId: () => tokenStatsFileId,
   recordUsage: () => recordUsage,
+  getTopicStats: () => getTopicStats,
   getStats: () => getStats,
   calcCost: () => calcCost
 });
-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 emptyBucket() {
@@ -16892,12 +17003,13 @@ function emptyBucket() {
     outputTokens: 0,
     cacheCreationInputTokens: 0,
     cacheReadInputTokens: 0,
-    queries: 0
+    queries: 0,
+    estimatedCostUsd: 0
   };
 }
 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);
@@ -16919,16 +17031,41 @@ function loadRecords(userId) {
   }
 }
 function calcCost(b) {
-  return b.inputTokens / 1e6 * 3 + b.outputTokens / 1e6 * 15 + b.cacheCreationInputTokens / 1e6 * 3.75 + b.cacheReadInputTokens / 1e6 * 0.3;
+  return b.estimatedCostUsd;
+}
+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) {
+function isQueryRecord(value) {
+  if (!value || typeof value !== "object")
+    return false;
+  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 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);
@@ -16942,12 +17079,26 @@ function getStats(userId, from, to) {
   const toTs = to ? new Date(to).getTime() : Infinity;
   if (from && Number.isNaN(fromTs) || to && Number.isNaN(toTs)) {
     logger.warn({ from, to }, "token-stats: Invalid date range, returning empty");
-    return { total: emptyBucket(), byHour: {}, bySession: {}, estimatedCostUsd: 0 };
+    return {
+      total: emptyBucket(),
+      byHour: {},
+      bySession: {},
+      currentSessions: [],
+      ignoredLegacyRecords: 0,
+      estimatedCostUsd: 0
+    };
   }
   const total = emptyBucket();
   const byHour = {};
   const bySession = {};
-  for (const r of records) {
+  const currentSessions = new Map;
+  let ignoredLegacyRecords = 0;
+  for (const raw of records) {
+    if (!isQueryRecord(raw)) {
+      ignoredLegacyRecords += 1;
+      continue;
+    }
+    const r = raw;
     const ts = new Date(r.timestamp).getTime();
     if (ts < fromTs || ts > toTs)
       continue;
@@ -16962,14 +17113,74 @@ function getStats(userId, from, to) {
       bucket.cacheCreationInputTokens += r.cacheCreationInputTokens;
       bucket.cacheReadInputTokens += r.cacheReadInputTokens;
       bucket.queries += 1;
+      bucket.estimatedCostUsd += r.estimatedCostUsd;
+    }
+    if (r.contextTokens !== undefined && r.contextWindow !== undefined && r.contextWindow > 0) {
+      currentSessions.set(r.topicId, {
+        timestamp: r.timestamp,
+        topicId: r.topicId,
+        topicTitle: r.session,
+        ...r.providerSessionId ? { providerSessionId: r.providerSessionId } : {},
+        agent: r.agent,
+        model: r.model,
+        contextTokens: r.contextTokens,
+        contextWindow: r.contextWindow
+      });
+    }
+  }
+  return {
+    total,
+    byHour,
+    bySession,
+    currentSessions: [...currentSessions.values()].sort((a, b) => b.timestamp.localeCompare(a.timestamp)),
+    ignoredLegacyRecords,
+    estimatedCostUsd: calcCost(total)
+  };
+}
+function getTopicStats(userId, topicId) {
+  const total = emptyBucket();
+  let currentSession;
+  for (const raw of loadRecords(userId)) {
+    if (!isQueryRecord(raw) || raw.topicId !== topicId)
+      continue;
+    total.inputTokens += raw.inputTokens;
+    total.outputTokens += raw.outputTokens;
+    total.cacheCreationInputTokens += raw.cacheCreationInputTokens;
+    total.cacheReadInputTokens += raw.cacheReadInputTokens;
+    total.queries += 1;
+    total.estimatedCostUsd += raw.estimatedCostUsd;
+    if (raw.contextTokens !== undefined && raw.contextWindow !== undefined && raw.contextWindow > 0 && (!currentSession || raw.timestamp > currentSession.timestamp)) {
+      currentSession = {
+        timestamp: raw.timestamp,
+        topicId: raw.topicId,
+        topicTitle: raw.session,
+        ...raw.providerSessionId ? { providerSessionId: raw.providerSessionId } : {},
+        agent: raw.agent,
+        model: raw.model,
+        contextTokens: raw.contextTokens,
+        contextWindow: raw.contextWindow
+      };
     }
   }
-  return { total, byHour, bySession, estimatedCostUsd: calcCost(total) };
+  return { topicId, ...total, ...currentSession ? { currentSession } : {} };
 }
+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
@@ -17008,6 +17219,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);
@@ -17326,7 +17545,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,
@@ -17376,6 +17595,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;
@@ -19929,7 +20150,7 @@ var init_runtime_gateway_submissions = __esm(async () => {
 });
 
 // ../../packages/core/src/application/submit-runtime-gateway-turn.ts
-import { createHash as createHash7, randomUUID as randomUUID17 } from "crypto";
+import { createHash as createHash8, randomUUID as randomUUID17 } from "crypto";
 function duplicateResult(submission, params, requestId, actorUserId, payloadHash) {
   const message = getApiMessage(submission.topicId, submission.messageId);
   if (!message)
@@ -19951,7 +20172,7 @@ function duplicateResult(submission, params, requestId, actorUserId, payloadHash
   };
 }
 function gatewayPayloadHash(params, requestId, actorUserId) {
-  return createHash7("sha256").update(JSON.stringify([
+  return createHash8("sha256").update(JSON.stringify([
     params.topic.id,
     params.userId,
     actorUserId,
@@ -21431,7 +21652,7 @@ var init_file_ops = __esm(() => {
 });
 
 // ../../packages/core/src/runtime/inbox.ts
-import { createHash as createHash8, randomUUID as randomUUID20 } from "crypto";
+import { createHash as createHash9, randomUUID as randomUUID20 } from "crypto";
 import { readdirSync as readdirSync8, statSync as statSync13, writeFileSync as writeFileSync16 } from "fs";
 import { join as join32 } from "path";
 async function createAskForkPlan(options) {
@@ -21545,7 +21766,7 @@ async function notifyAskDrop(scope, entry, targetLabel, message) {
   }
 }
 function stableLegacyRequestId(prefix, parts) {
-  const hash = createHash8("sha256").update(parts.map((part) => String(part ?? "")).join("\x00")).digest("hex").slice(0, 16);
+  const hash = createHash9("sha256").update(parts.map((part) => String(part ?? "")).join("\x00")).digest("hex").slice(0, 16);
   return `${prefix}-${hash}`;
 }
 async function flushSessionInbox() {
@@ -22553,6 +22774,7 @@ __export(exports_node_host, {
   killAllBgBash: () => killAllBgBash,
   isParticipant: () => isParticipant,
   getVisibleTopics: () => getVisibleTopics,
+  getTopicStats: () => getTopicStats,
   getTopic: () => getTopic,
   flushBashrsCompletions: () => flushBashrsCompletions,
   executeVaultCommand: () => executeVaultCommand,
@@ -22607,6 +22829,7 @@ var init_node_host = __esm(async () => {
     init_api_topics(),
     init_runtime_events(),
     init_runtime_process_leases(),
+    init_token_stats(),
     init_derive(),
     init_personal_general(),
     init_session()
@@ -23234,7 +23457,7 @@ function createTokenStatsMcpServer(context, host2 = defaultTokenStatsMcpHost) {
     throw new Error("token-stats MCP requires userId");
   const server = new McpServer2({ name: "token-stats", version: "1.0.0" });
   server.tool("get_usage_stats", [
-    "Claude \uC0AC\uC6A9\uB7C9 \uD1B5\uACC4\uB97C \uC870\uD68C\uD569\uB2C8\uB2E4. \uC644\uB8CC\uB41C \uCFFC\uB9AC\uB9C8\uB2E4 \uC138\uC158/\uC2DC\uAC04 \uC815\uBCF4\uAC00 \uAE30\uB85D\uB429\uB2C8\uB2E4. \uD604\uC7AC \uC2E4\uD589 \uC911\uC778 turn\uC740 \uC644\uB8CC \uD6C4 \uC9D1\uACC4\uB429\uB2C8\uB2E4.",
+    "Claude/Codex/Maestro \uC0AC\uC6A9\uB7C9\uACFC provider session\uC758 \uCD5C\uC2E0 context \uC810\uC720\uC728\uC744 \uC870\uD68C\uD569\uB2C8\uB2E4. \uD604\uC7AC \uC2E4\uD589 \uC911\uC778 turn\uC740 \uC644\uB8CC \uD6C4 \uC9D1\uACC4\uB429\uB2C8\uB2E4.",
     "",
     "from/to \uC0DD\uB7B5 \uC2DC \uC804\uCCB4 \uAE30\uAC04. \uC790\uC5F0\uC5B4 \uC2DC\uAC04 \uD45C\uD604\uC744 ISO \uD615\uC2DD\uC73C\uB85C \uBCC0\uD658\uD574\uC11C \uB118\uACA8\uC8FC\uC138\uC694.",
     "  \uC608: '\uC9C0\uB09C 3\uC2DC\uAC04' \u2192 from = \uD604\uC7AC -3h",
@@ -23248,18 +23471,36 @@ function createTokenStatsMcpServer(context, host2 = defaultTokenStatsMcpHost) {
     to: z8.string().optional().describe("\uC885\uB8CC \uC2DC\uAC01 ISO 8601. \uC0DD\uB7B5 \uC2DC \uD604\uC7AC"),
     groupBy: z8.enum(["hour", "session"]).optional().describe("\uC9D1\uACC4 \uAE30\uC900. \uAE30\uBCF8\uAC12: hour")
   }, async ({ from, to, groupBy = "hour" }) => {
-    const { total, byHour, bySession, estimatedCostUsd } = host2.getStats(context.userId, from, to);
+    const snapshot = host2.getStats(context.userId, from, to);
+    const {
+      total,
+      byHour,
+      bySession,
+      currentSessions = [],
+      ignoredLegacyRecords = 0,
+      estimatedCostUsd
+    } = snapshot;
     const lines = [
-      "\uD83D\uDCCA Claude \uC0AC\uC6A9\uB7C9",
+      "\uD83D\uDCCA Agent \uC0AC\uC6A9\uB7C9",
       from || to ? `\uAE30\uAC04: ${from ?? "\uC804\uCCB4"} ~ ${to ?? "\uD604\uC7AC"}` : "\uAE30\uAC04: \uC804\uCCB4",
       "",
       `\uCFFC\uB9AC \uD69F\uC218: ${total.queries.toLocaleString()}\uD68C`,
-      `\uC785\uB825 \uD1A0\uD070: ${total.inputTokens.toLocaleString()}`,
+      `\uCE90\uC2DC \uBBF8\uC801\uC911 \uC785\uB825: ${total.inputTokens.toLocaleString()}`,
       `\uCD9C\uB825 \uD1A0\uD070: ${total.outputTokens.toLocaleString()}`,
       `\uCE90\uC2DC \uC4F0\uAE30: ${total.cacheCreationInputTokens.toLocaleString()}`,
       `\uCE90\uC2DC \uC77D\uAE30: ${total.cacheReadInputTokens.toLocaleString()}`,
       `\uC608\uC0C1 \uBE44\uC6A9: $${estimatedCostUsd.toFixed(4)} USD`
     ];
+    if (ignoredLegacyRecords > 0) {
+      lines.push(`\uAD6C\uD615 \uB808\uCF54\uB4DC \uC81C\uC678: ${ignoredLegacyRecords.toLocaleString()}\uAC74`);
+    }
+    if (currentSessions.length > 0) {
+      lines.push("", `\uD83D\uDCD0 \uD604\uC7AC context (${currentSessions.length}\uAC1C provider session)`);
+      for (const current3 of currentSessions) {
+        const percent = current3.contextTokens / current3.contextWindow * 100;
+        lines.push(`  ${current3.topicTitle} \xB7 ${current3.agent}/${current3.model}  ${current3.contextTokens.toLocaleString()} / ${current3.contextWindow.toLocaleString()} (${percent.toFixed(1)}%)`);
+      }
+    }
     const extraSummaryLines = host2.extraSummaryLines?.(context.userId) ?? [];
     if (extraSummaryLines.length > 0)
       lines.push("", ...extraSummaryLines);
@@ -23267,7 +23508,7 @@ function createTokenStatsMcpServer(context, host2 = defaultTokenStatsMcpHost) {
       const sorted = Object.entries(bySession).map(([name, bucket]) => ({ name, ...bucket, cost: host2.calcCost(bucket) })).sort((left, right) => right.cost - left.cost);
       lines.push("", `\uD83D\uDDC2 \uC138\uC158\uBCC4 \uC0AC\uC6A9\uB7C9 (${sorted.length}\uAC1C)`);
       for (const session of sorted) {
-        lines.push(`  ${session.name}  \uCFFC\uB9AC ${session.queries}\uD68C  \uC785\uB825 ${session.inputTokens.toLocaleString()} / \uCD9C\uB825 ${session.outputTokens.toLocaleString()}  $${session.cost.toFixed(4)}`);
+        lines.push(`  ${session.name}  \uCFFC\uB9AC ${session.queries}\uD68C  \uCE90\uC2DC \uBBF8\uC801\uC911 \uC785\uB825 ${session.inputTokens.toLocaleString()} / \uCE90\uC2DC \uC77D\uAE30 ${session.cacheReadInputTokens.toLocaleString()} / \uCD9C\uB825 ${session.outputTokens.toLocaleString()}  $${session.cost.toFixed(4)}`);
       }
     } else {
       const hours = Object.keys(byHour).sort();
@@ -26199,6 +26440,7 @@ __export(exports_storage_public, {
   grantSubagentTellTarget: () => grantSubagentTellTarget,
   getWikiDir: () => getWikiDir,
   getUserConfig: () => getUserConfig,
+  getTopicStats: () => getTopicStats,
   getTopicSessionId: () => getTopicSessionId,
   getTopicNames: () => getTopicNames,
   getTopicMemoryOrigin: () => getTopicMemoryOrigin,
@@ -26549,7 +26791,7 @@ data: ${JSON.stringify(message)}
 var init_sse_transport = () => {};
 
 // ../../packages/mcp/src/server.ts
-import { createHash as createHash9, randomUUID as randomUUID23 } from "crypto";
+import { createHash as createHash10, randomUUID as randomUUID23 } from "crypto";
 import { realpathSync as realpathSync6, statSync as statSync17 } from "fs";
 import { basename as basename9, extname as extname3, resolve as resolve19 } from "path";
 import { McpServer as McpServer7 } from "@modelcontextprotocol/sdk/server/mcp.js";
@@ -26822,7 +27064,7 @@ async function closeNegotiumMcpSessions() {
   await Promise.all([...servers].map((server) => closeServer(server)));
 }
 function tokenFingerprint(token) {
-  return createHash9("sha256").update(token).digest("hex");
+  return createHash10("sha256").update(token).digest("hex");
 }
 async function enforceSessionBounds(reserve = 0) {
   const now = Date.now();
@@ -28273,6 +28515,14 @@ function createNodeControlHandler(options) {
         const events = listRecentRuntimeEventsForTopic(topicId).map(runtimeEvent);
         return Response.json({ ok: true, events });
       }
+      const usageMatch = path.match(/^\/topics\/([^/]+)\/usage$/);
+      if (usageMatch && req.method === "GET") {
+        const topicId = decodeURIComponent(usageMatch[1]);
+        const userId = requiredText(url.searchParams.get("user"), "user");
+        if (!topicForUser(topicId, userId))
+          return jsonError(404, "Topic not found");
+        return Response.json({ ok: true, usage: getTopicStats(userId, topicId) });
+      }
       const modelMatch = path.match(/^\/topics\/([^/]+)\/model$/);
       if (modelMatch && req.method === "POST") {
         const topicId = decodeURIComponent(modelMatch[1]);
@@ -31160,6 +31410,7 @@ function createInitialState(userId) {
     backgroundSessions: [],
     activeTopicId: null,
     messages: {},
+    topicUsage: {},
     messageHistory: {},
     activity: {},
     input: "",
@@ -31195,6 +31446,12 @@ function activeTopic(state) {
 function activeMessages(state) {
   return state.activeTopicId ? state.messages[state.activeTopicId] ?? [] : [];
 }
+function setTopicUsage(state, usage) {
+  return {
+    ...state,
+    topicUsage: { ...state.topicUsage, [usage.topicId]: usage }
+  };
+}
 function activeQuestion(state) {
   return activeMessages(state).slice().reverse().find((message) => message.kind === "ask_user_question" && message.askUserQuestion && !message.askUserQuestion.expired && !message.askUserQuestion.selectedLabel) ?? null;
 }
@@ -32565,14 +32822,28 @@ function tokenCount(value) {
   if (value >= 1e6)
     return `${(value / 1e6).toFixed(2)}M`;
   if (value >= 1000)
-    return `${(value / 1000).toFixed(value >= 1e5 ? 0 : 1)}K`;
+    return `${(value / 1000).toFixed(value >= 1e5 ? 0 : 1)}k`;
   return String(Math.round(value));
 }
+function latestActiveUsage(state) {
+  return activeMessages(state).slice().reverse().find((message) => message.authorId === "ai" && message.usage)?.usage;
+}
+function activeContextUsage(state) {
+  const usage = latestActiveUsage(state);
+  if (usage?.context !== undefined && usage.contextWindow) {
+    return { context: usage.context, contextWindow: usage.contextWindow };
+  }
+  const topic = activeTopic(state);
+  const current3 = topic ? state.topicUsage[topic.id]?.currentSession : undefined;
+  return current3 ? { context: current3.contextTokens, contextWindow: current3.contextWindow } : undefined;
+}
 function statusLines(state) {
   const topic = activeTopic(state);
-  const latest = activeMessages(state).slice().reverse().find((message) => message.authorId === "ai" && message.usage);
-  const usage = latest?.usage;
-  const ratio = usage?.context !== undefined && usage.contextWindow ? Math.round(usage.context / usage.contextWindow * 100) : undefined;
+  const usage = latestActiveUsage(state);
+  const contextUsage = activeContextUsage(state);
+  const total = topic ? state.topicUsage[topic.id] : undefined;
+  const hasTopicUsage = total !== undefined && total.queries > 0;
+  const ratio = contextUsage?.context !== undefined && contextUsage.contextWindow ? Math.round(contextUsage.context / contextUsage.contextWindow * 100) : undefined;
   return [
     line("  Status", { fg: theme.accent, bold: true }),
     line(""),
@@ -32581,7 +32852,7 @@ function statusLines(state) {
     line(`  Model       ${effectiveTopicModel(topic)}`),
     line(`  Effort      ${topic?.effectiveEffort ?? topic?.defaultEffort ?? "-"}`),
     line(""),
-    line(`  Context     ${tokenCount(usage?.context)} / ${tokenCount(usage?.contextWindow)}${ratio === undefined ? "" : ` (${ratio}%)`}`, { fg: ratio !== undefined && ratio >= 80 ? theme.amber : theme.text }),
+    line(`  Context     ${tokenCount(contextUsage?.context)} / ${tokenCount(contextUsage?.contextWindow)}${ratio === undefined ? "" : ` (${ratio}%)`}`, { fg: ratio !== undefined && ratio >= 80 ? theme.amber : theme.text }),
     line("  Measured on the latest model request", { fg: theme.muted, dim: true }),
     line(""),
     line(`  Last turn   input ${tokenCount(usage?.input)} \xB7 output ${tokenCount(usage?.output)}`),
@@ -32591,6 +32862,14 @@ function statusLines(state) {
       dim: true
     }),
     line(""),
+    line("  Topic cumulative", { fg: theme.cyan, bold: true }),
+    line(`  Queries     ${hasTopicUsage ? total.queries.toLocaleString() : "unavailable"}`),
+    line(`  Input       ${hasTopicUsage ? tokenCount(total.inputTokens) : "unavailable"} cache miss`),
+    line(`  Output      ${hasTopicUsage ? tokenCount(total.outputTokens) : "unavailable"}`),
+    line(`  Cache write ${hasTopicUsage ? tokenCount(total.cacheCreationInputTokens) : "unavailable"}`),
+    line(`  Cache read  ${hasTopicUsage ? tokenCount(total.cacheReadInputTokens) : "unavailable"}`),
+    line(`  Est. cost   ${hasTopicUsage ? `$${total.estimatedCostUsd.toFixed(4)}` : "unavailable"}`),
+    line(""),
     line("  Esc close", { fg: theme.muted })
   ];
 }
@@ -33179,6 +33458,39 @@ function footerStatusText(state) {
     title
   ];
 }
+function footerUsageText(state) {
+  const topic = activeTopic(state);
+  if (!topic)
+    return [""];
+  const contextUsage = activeContextUsage(state);
+  const total = state.topicUsage[topic.id];
+  const ratio = contextUsage?.context !== undefined && contextUsage.contextWindow ? Math.round(contextUsage.context / contextUsage.contextWindow * 100) : undefined;
+  const context = contextUsage?.context !== undefined && contextUsage.contextWindow ? `${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 cache = hasTopicUsage && total.cacheReadInputTokens ? `cache ${tokenCount(total.cacheReadInputTokens)}` : "";
+  const cost = hasTopicUsage ? `est $${total.estimatedCostUsd.toFixed(2)}` : "";
+  const parts = [context, cumulative, cache, cost].filter(Boolean);
+  return [
+    `${parts.join(" \xB7 ")}  `,
+    `${[context, cumulative, cache].filter(Boolean).join(" \xB7 ")}  `,
+    `${[context, cumulative].filter(Boolean).join(" \xB7 ")}  `,
+    context ? `${context}  ` : "",
+    ""
+  ];
+}
+function footerStatusLine(state, width) {
+  const leftCandidates = footerStatusText(state);
+  const rightCandidates = footerUsageText(state);
+  for (const right of rightCandidates) {
+    for (const left of leftCandidates) {
+      if (displayWidth(left) + (right ? 1 + displayWidth(right) : 0) <= width) {
+        return joinSides(left, right, width);
+      }
+    }
+  }
+  return joinSides(leftCandidates[leftCandidates.length - 1] ?? "", "", width);
+}
 function noticeStyle(state) {
   return NOTICE_STYLE[state.noticeLevel ?? "warn"];
 }
@@ -33228,7 +33540,7 @@ function footerLines(state, width) {
     ];
   }
   return [
-    paint(joinSides(pickFitting(footerStatusText(state), width), "", width), {
+    paint(footerStatusLine(state, width), {
       fg: theme.accent,
       bg: theme.surfaceRaised,
       bold: true
@@ -33813,6 +34125,9 @@ class EmbeddedNegotiumClient {
     const rows = getAllMessagesForTopic(topicId);
     return rows.map((row) => typeof row.id === "string" ? getApiMessage(topicId, row.id) : null).filter((message) => message !== null);
   }
+  listTopicUsage(topicId) {
+    return getTopicStats(this.#userId, topicId);
+  }
   listMessagePage(topicId, cursor, limit = MESSAGE_HISTORY_PAGE_SIZE) {
     const result = listApiMessages(topicId, { cursor, limit });
     return { messages: result.page, cursor: result.cursor, hasMore: result.hasMore };
@@ -34008,6 +34323,10 @@ class RemoteNegotiumClient {
     const result = await this.#request(`/topics/${encodeURIComponent(topicId)}/messages?user=${encodeURIComponent(this.#userId)}`);
     return result.messages ?? [];
   }
+  async listTopicUsage(topicId) {
+    const result = await this.#request(`/topics/${encodeURIComponent(topicId)}/usage?user=${encodeURIComponent(this.#userId)}`);
+    return result.usage;
+  }
   async listMessagePage(topicId, cursor, limit = MESSAGE_HISTORY_PAGE_SIZE) {
     const query2 = new URLSearchParams({ user: this.#userId, limit: String(limit) });
     if (cursor)
@@ -34261,6 +34580,7 @@ var MESSAGE_HISTORY_PAGE_SIZE = 50, INITIAL_MESSAGE_HISTORY_PAGE_COUNT = 3, INIT
 var init_client = __esm(async () => {
   await __promiseAll([
     init_src(),
+    init_storage_public(),
     init_src5(),
     init_history_store()
   ]);
@@ -35360,6 +35680,7 @@ class TerminalApp {
   #backgroundRefreshRunning = false;
   #animationFrame = animationFrameAt();
   #topicsRefreshGeneration = 0;
+  #topicUsageRefreshGeneration = new Map;
   #messageLoadGeneration = new Map;
   #messageHistory = new Map;
   #queuedRuntimeEvents = new Map;
@@ -35471,6 +35792,9 @@ class TerminalApp {
       return;
     }
     this.#applyRuntimeEvent(event);
+    if (event.type === "message" && event.payload.usage || event.type === "message-updated" && event.payload.patch?.usage) {
+      this.#refreshTopicUsage(event.topicId);
+    }
     if (event.type === "topic-created" || event.type === "topic-updated" || event.type === "topic-deleted") {
       const previous = this.#state.activeTopicId;
       const refreshSubagentGraph = this.#state.overlay === "subagents";
@@ -35578,6 +35902,20 @@ class TerminalApp {
       this.#backgroundRefreshRunning = false;
     }
   }
+  async#refreshTopicUsage(topicId) {
+    if (!this.#client.listTopicUsage)
+      return;
+    const generation = (this.#topicUsageRefreshGeneration.get(topicId) ?? 0) + 1;
+    this.#topicUsageRefreshGeneration.set(topicId, generation);
+    try {
+      const usage = await this.#client.listTopicUsage(topicId);
+      if (this.#topicUsageRefreshGeneration.get(topicId) !== generation)
+        return;
+      this.#state = setTopicUsage(this.#state, usage);
+      if (this.#state.activeTopicId === topicId)
+        this.#queueRender();
+    } catch {}
+  }
   async#loadActiveMessages() {
     const topic = activeTopic(this.#state);
     if (!topic)
@@ -35625,6 +35963,7 @@ class TerminalApp {
     this.#queuedRuntimeEvents.delete(topic.id);
     for (const event of queued)
       this.#applyRuntimeEvent(event);
+    this.#refreshTopicUsage(topic.id);
   }
   async#loadOlderMessages(topicId, targetOffset) {
     const history = this.#messageHistory.get(topicId);
@@ -39900,7 +40239,7 @@ __export(exports_join, {
   joinCredentialDigest: () => joinCredentialDigest,
   isJoinPersisted: () => isJoinPersisted
 });
-import { createHash as createHash10, randomUUID as randomUUID27 } from "crypto";
+import { createHash as createHash11, randomUUID as randomUUID27 } from "crypto";
 import {
   chmodSync as chmodSync6,
   closeSync as closeSync5,
@@ -40064,7 +40403,7 @@ function normalizedJoin(join42) {
   });
 }
 function joinCredentialDigest(join42) {
-  return createHash10("sha256").update(JSON.stringify(normalizedJoin(join42))).digest("base64url");
+  return createHash11("sha256").update(JSON.stringify(normalizedJoin(join42))).digest("base64url");
 }
 function readPersistedJoin(path = joinFilePath()) {
   if (!existsSync35(path))
@@ -40455,7 +40794,7 @@ var init_canonical_mcp_bridge = __esm(async () => {
 });
 
 // ../../adapters/otium/src/store.ts
-import { createHash as createHash11 } from "crypto";
+import { createHash as createHash12 } from "crypto";
 function isPeerDetached(hubNodeId) {
   const row = db.query("SELECT status FROM otium_peer_lifecycle WHERE hub_node_id = ?").get(hubNodeId);
   return row?.status === "detached";
@@ -40638,7 +40977,7 @@ function acknowledgePeerTerminal(hostNodeId, requestId) {
   })();
 }
 function peerInboxPayloadHash(value) {
-  return createHash11("sha256").update(JSON.stringify(value)).digest("hex");
+  return createHash12("sha256").update(JSON.stringify(value)).digest("hex");
 }
 function claimPeerInboxRequest(args) {
   const inserted = db.run(`INSERT OR IGNORE INTO otium_peer_inbox_requests
@@ -45311,4 +45650,4 @@ switch (command) {
   }
 }
 
-//# debugId=C6B36BE30E72B26A64756E2164756E21
+//# debugId=5D6FE2D4C44E041364756E2164756E21