negotium 0.2.15 → 0.2.17

package/dist/mcp-factories.js

@@ -952,7 +952,7 @@ var init_claude_registry = __esm(() => {
 });
 
 // ../../packages/core/src/version.ts
-var NEGOTIUM_VERSION = "0.2.15";
+var NEGOTIUM_VERSION = "0.2.17";
 
 // ../../packages/core/src/agents/codex-native-multi-agent.ts
 import { spawn as spawn2 } from "child_process";
@@ -1292,7 +1292,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(value2) {
   return Buffer.from(JSON.stringify(value2), "utf-8").toString("base64url");
 }
@@ -1325,19 +1325,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;
@@ -2190,9 +2240,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");
@@ -2674,6 +2724,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((value2) => value2 !== undefined && (!Number.isFinite(value2) || value2 < 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)
@@ -2685,6 +2765,17 @@ function readLatestCodexContextUsage(threadId) {
     return;
   }
 }
+function readLatestCodexTokenTotals(threadId) {
+  const path = latestCodexRolloutPath(threadId);
+  if (!path)
+    return;
+  try {
+    return extractLatestCodexTokenTotals(readFileSync6(path, "utf8"));
+  } catch (error) {
+    logger.debug({ error, threadId }, "codex token totals: rollout read failed");
+    return;
+  }
+}
 function migrateCodexRolloutNativeMultiAgentMetadata(threadId) {
   const path = latestCodexRolloutPath(threadId);
   if (!path)
@@ -6013,7 +6104,7 @@ var init_browser_profiles = __esm(async () => {
 
 // ../../packages/core/src/platform/playwright/manager.ts
 import { execFileSync as execFileSync4, spawn as spawn6 } from "child_process";
-import { createHash as createHash2, randomBytes as randomBytes6, timingSafeEqual as timingSafeEqual3 } from "crypto";
+import { createHash as createHash3, randomBytes as randomBytes6, timingSafeEqual as timingSafeEqual3 } from "crypto";
 import {
   cpSync,
   existsSync as existsSync11,
@@ -6108,7 +6199,7 @@ function parseInstanceKey(instanceKey) {
   };
 }
 function portFileName(instanceKey) {
-  return createHash2("sha256").update(instanceKey).digest("hex").slice(0, 24);
+  return createHash3("sha256").update(instanceKey).digest("hex").slice(0, 24);
 }
 function writePortFile(instanceKey, port) {
   try {
@@ -8909,6 +9000,7 @@ var init_tool_format = __esm(() => {
 var exports_codex_provider = {};
 __export(exports_codex_provider, {
   toCodexMcpServers: () => toCodexMcpServers,
+  normalizeCodexTurnUsage: () => normalizeCodexTurnUsage,
   codexProvider: () => codexProvider
 });
 import { execFileSync as execFileSync6 } from "child_process";
@@ -8916,6 +9008,20 @@ import { existsSync as existsSync15, readFileSync as readFileSync14, realpathSyn
 import { homedir as homedir6 } from "os";
 import { dirname as dirname11, isAbsolute as isAbsolute3, join as join16, relative, resolve as resolve12 } 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 = (current2, previous) => current2 >= previous ? current2 - previous : current2;
+  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;
@@ -9315,6 +9421,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 = "";
@@ -9373,6 +9480,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) {
@@ -9473,10 +9581,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",
@@ -9485,6 +9594,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
                 }
@@ -9677,6 +9787,7 @@ function maestroProvider(opts) {
     ...opts,
     enableToolSearch: !opts.toolPolicy && opts.enableToolSearch !== false,
     toolResultTruncation: buildMaestroToolResultTruncation(opts),
+    ephemeralSystemPrompt: opts.ephemeralSystemPrompt,
     apiKeyOverrides: resolveMaestroApiKeyOverrides(userId),
     agent: "maestro",
     disallowedTools: buildMaestroDisallowedTools(callerDisallowedTools, opts.toolPolicy),
@@ -11839,7 +11950,7 @@ __export(exports_derive, {
   TopicForkCompactionError: () => TopicForkCompactionError,
   TopicDeriveBusyError: () => TopicDeriveBusyError
 });
-import { createHash as createHash3, randomUUID as randomUUID11 } from "crypto";
+import { createHash as createHash4, randomUUID as randomUUID11 } from "crypto";
 import { mkdirSync as mkdirSync14, rmSync as rmSync5, unlinkSync as unlinkSync13 } from "fs";
 function getTopics() {
   return listTopics().filter((topic) => !isLegacySharedGeneral(topic.id));
@@ -11905,7 +12016,7 @@ function captureForkSnapshot(sourceTopicId, userId, topicTitle) {
       maxRowid: messageRows.at(-1)?.rowid ?? 0
     },
     active: isTopicRunning(sourceTopicId),
-    canonicalDigest: createHash3("sha256").update(entries.map((entry) => JSON.stringify(entry)).join(`
+    canonicalDigest: createHash4("sha256").update(entries.map((entry) => JSON.stringify(entry)).join(`
 `)).digest("hex")
   };
 }
@@ -12398,7 +12509,7 @@ __export(exports_session_asks, {
   clearPendingAsk: () => clearPendingAsk,
   PENDING_ASK_TTL_MS: () => PENDING_ASK_TTL_MS
 });
-import { createHash as createHash4 } from "crypto";
+import { createHash as createHash5 } from "crypto";
 import {
   closeSync as closeSync3,
   mkdirSync as mkdirSync16,
@@ -12412,14 +12523,14 @@ import {
 import { dirname as dirname14, join as join25 } 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-${createHash4("sha256").update(rawUserId).digest("hex")}`;
+  const safeUserId = /^[A-Za-z0-9][A-Za-z0-9_.@-]{0,255}$/.test(rawUserId) && !rawUserId.includes("..") ? rawUserId : `sha256-${createHash5("sha256").update(rawUserId).digest("hex")}`;
   return join25(resolveStorageSessionAsksDir(), safeUserId);
 }
 function encodeAskKey(key) {
   return JSON.stringify([key.from, key.to]);
 }
 function pendingAskPath(key) {
-  const digest = createHash4("sha256").update(encodeAskKey(key)).digest("hex");
+  const digest = createHash5("sha256").update(encodeAskKey(key)).digest("hex");
   return join25(pendingAskDir(key.userId), `${ASK_FILENAME_PREFIX}${digest}.pending`);
 }
 function v2PendingAskPath(key) {
@@ -13920,7 +14031,7 @@ var init_ask_user_gates = __esm(async () => {
 });
 
 // ../../packages/core/src/agents/mcp-tools/ask-user.ts
-import { createHash as createHash5, randomUUID as randomUUID14 } from "crypto";
+import { createHash as createHash6, randomUUID as randomUUID14 } from "crypto";
 import { z as z3 } from "zod";
 function normalizeAskText(value2, maxChars) {
   if (typeof value2 !== "string")
@@ -13957,7 +14068,7 @@ function normalizeAskUserQuestionInput(input) {
   return { question, choices };
 }
 function askBodyHash(question, choices) {
-  return createHash5("sha256").update(JSON.stringify({ question, choices })).digest("hex");
+  return createHash6("sha256").update(JSON.stringify({ question, choices })).digest("hex");
 }
 function answerToolResult(answer) {
   if (!answer.userId)
@@ -14585,7 +14696,7 @@ 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 mkdirSync18 } from "fs";
 import { join as join27 } from "path";
 function emptyBucket() {
@@ -14594,12 +14705,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);
@@ -14621,16 +14733,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(value2) {
+  if (!value2 || typeof value2 !== "object")
+    return false;
+  const record = value2;
+  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);
@@ -14644,12 +14781,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;
@@ -14664,14 +14815,47 @@ 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, estimatedCostUsd: calcCost(total) };
+  return {
+    total,
+    byHour,
+    bySession,
+    currentSessions: [...currentSessions.values()].sort((a, b) => b.timestamp.localeCompare(a.timestamp)),
+    ignoredLegacyRecords,
+    estimatedCostUsd: calcCost(total)
+  };
 }
+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
@@ -14700,6 +14884,9 @@ async function runTurnEventStream(topicId, topicTitle, queryId, events, control,
   let pendingSawDelta = false;
   let accumulatedText = "";
   let pendingText = "";
+  let assistantContextTokens = 0;
+  let toolContextTokens = 0;
+  let lastContextProgressAt = 0;
   let lastVisibleMessageId = null;
   const visibleMessageIds = [];
   let lastTaskPanelText = null;
@@ -14710,6 +14897,28 @@ 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 broadcastContextProgress = (force = false) => {
+    if (silent)
+      return;
+    const now = Date.now();
+    if (!force && lastContextProgressAt > 0 && now - lastContextProgressAt < 250)
+      return;
+    lastContextProgressAt = now;
+    hub.broadcastAiStatus(topicId, {
+      kind: "context_progress",
+      queryId,
+      assistantTokens: assistantContextTokens,
+      toolTokens: toolContextTokens
+    });
+  };
   const nextSyntheticToolUseId = () => `tool-${queryId}-${++syntheticToolCounter}`;
   const bindToolUseId = (providerToolUseId, fallback) => {
     const providerId = normalizeToolUseId(providerToolUseId);
@@ -14819,6 +15028,8 @@ async function runTurnEventStream(topicId, topicTitle, queryId, events, control,
           const incoming = event.content;
           accumulatedText += incoming;
           pendingText += incoming;
+          assistantContextTokens = estimateTextTokens(accumulatedText);
+          broadcastContextProgress();
           break;
         }
         case "text":
@@ -14826,10 +15037,15 @@ async function runTurnEventStream(topicId, topicTitle, queryId, events, control,
             const incoming = event.content;
             accumulatedText += incoming;
             pendingText += incoming;
+            assistantContextTokens = estimateTextTokens(accumulatedText);
+            broadcastContextProgress();
           }
           break;
         case "tool_use":
           emitPendingAssistantMessage();
+          toolContextTokens += estimateTextTokens(`${event.name}
+${JSON.stringify(event.input ?? {})}`);
+          broadcastContextProgress(true);
           if (isVisualsShowHtmlTool(event.name)) {
             const input = event.input;
             if (typeof input.html !== "string" || input.html.trim().length === 0) {
@@ -14983,6 +15199,8 @@ async function runTurnEventStream(topicId, topicTitle, queryId, events, control,
           }
           break;
         case "tool_result":
+          toolContextTokens += estimateTextTokens(event.content);
+          broadcastContextProgress(true);
           if (isVisualToolResultHandled(event.toolUseId))
             break;
           if (!silent) {
@@ -15028,7 +15246,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,
@@ -15078,6 +15296,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;
@@ -15366,6 +15586,7 @@ __export(exports_turn_runner, {
   channelTranscriptSpeaker: () => channelTranscriptSpeaker,
   canonicalModelId: () => canonicalModelId,
   buildVideoHtml: () => buildVideoHtml,
+  buildTurnReminderQuery: () => buildTurnReminderQuery,
   buildMermaidHtml: () => buildMermaidHtml,
   buildMentionOnlyChannelPrompt: () => buildMentionOnlyChannelPrompt,
   buildImageHtml: () => buildImageHtml,
@@ -15391,6 +15612,18 @@ function withDefaultPlaywright(configuredMcp, isManager) {
   enabled.add("background-bash");
   return [...enabled];
 }
+function buildTurnReminderQuery(agent, prompt, reminders) {
+  const reminderPrompt = reminders.join(`
+
+`);
+  if (!reminderPrompt)
+    return { prompt };
+  if (agent === "maestro")
+    return { prompt, ephemeralSystemPrompt: reminderPrompt };
+  return { prompt: `${prompt}
+
+${reminderPrompt}` };
+}
 function appendSystemMessage(topicId, text2) {
   const message = {
     id: randomUUID16(),
@@ -16338,15 +16571,11 @@ function startAiTurn(params) {
     if (consumePlaywrightUnavailable(userId, topic.title)) {
       turnReminders.push("<system-reminder>Playwright browser tools are UNAVAILABLE this turn. The `mcp__playwright__*` tools have been removed from this turn's catalog because the long-lived browser MCP could not be prepared. Do not attempt to call browser tools. If browser interaction is required, ask the user to retry shortly or use a non-browser alternative.</system-reminder>");
     }
-    const effectivePrompt = turnReminders.length > 0 ? `${agentPrompt}
-
-${turnReminders.join(`
-
-`)}` : agentPrompt;
+    const reminderQuery = buildTurnReminderQuery(agentKind, agentPrompt, turnReminders);
     try {
       yield* runAgent({
         agent: agentKind,
-        prompt: effectivePrompt,
+        ...reminderQuery,
         attachments: promptAttachments,
         cwd: workspaceCwd,
         systemPrompt,
@@ -19551,7 +19780,7 @@ function createTokenStatsMcpServer(context, host = defaultTokenStatsMcpHost) {
     throw new Error("token-stats MCP requires userId");
   const server = new McpServer6({ 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",
@@ -19565,18 +19794,36 @@ function createTokenStatsMcpServer(context, host = defaultTokenStatsMcpHost) {
     to: z7.string().optional().describe("\uC885\uB8CC \uC2DC\uAC01 ISO 8601. \uC0DD\uB7B5 \uC2DC \uD604\uC7AC"),
     groupBy: z7.enum(["hour", "session"]).optional().describe("\uC9D1\uACC4 \uAE30\uC900. \uAE30\uBCF8\uAC12: hour")
   }, async ({ from, to, groupBy = "hour" }) => {
-    const { total, byHour, bySession, estimatedCostUsd } = host.getStats(context.userId, from, to);
+    const snapshot = host.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 = host.extraSummaryLines?.(context.userId) ?? [];
     if (extraSummaryLines.length > 0)
       lines.push("", ...extraSummaryLines);
@@ -19584,7 +19831,7 @@ function createTokenStatsMcpServer(context, host = defaultTokenStatsMcpHost) {
       const sorted = Object.entries(bySession).map(([name, bucket]) => ({ name, ...bucket, cost: host.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();
@@ -19696,4 +19943,4 @@ export {
   createAgentHealthMcpServer
 };
 
-//# debugId=AF3DB07211992E0064756E2164756E21
+//# debugId=AD1DC675E382EEA164756E2164756E21