@cortexkit/pi-magic-context 0.21.7 → 0.21.8

package/dist/index.js

@@ -142834,6 +142834,49 @@ var MIGRATIONS = [
                     ON compartment_state_lease(expires_at);
             `);
     }
+  },
+  {
+    version: 20,
+    description: "Add subagent invocation token accounting",
+    up: (db) => {
+      db.exec(`
+                CREATE TABLE IF NOT EXISTS subagent_invocations (
+                    id INTEGER PRIMARY KEY AUTOINCREMENT,
+                    session_id TEXT NOT NULL,
+                    harness TEXT NOT NULL,
+                    subagent TEXT NOT NULL,
+                    task TEXT,
+                    provider_id TEXT,
+                    model_id TEXT,
+                    started_at INTEGER NOT NULL,
+                    ended_at INTEGER,
+                    status TEXT NOT NULL,
+                    input_tokens INTEGER NOT NULL DEFAULT 0,
+                    output_tokens INTEGER NOT NULL DEFAULT 0,
+                    cache_read_tokens INTEGER NOT NULL DEFAULT 0,
+                    cache_write_tokens INTEGER NOT NULL DEFAULT 0,
+                    error TEXT,
+                    parent_invocation_id INTEGER
+                );
+                CREATE INDEX IF NOT EXISTS idx_sai_session_started
+                    ON subagent_invocations(session_id, started_at DESC);
+                CREATE INDEX IF NOT EXISTS idx_sai_subagent
+                    ON subagent_invocations(subagent, started_at DESC);
+            `);
+    }
+  },
+  {
+    version: 21,
+    description: "Add session lifetime work metrics",
+    up: (db) => {
+      const cols = db.prepare("PRAGMA table_info(session_meta)").all();
+      if (!cols.some((c) => c.name === "new_work_tokens")) {
+        db.exec("ALTER TABLE session_meta ADD COLUMN new_work_tokens INTEGER NOT NULL DEFAULT 0");
+      }
+      if (!cols.some((c) => c.name === "total_input_tokens")) {
+        db.exec("ALTER TABLE session_meta ADD COLUMN total_input_tokens INTEGER NOT NULL DEFAULT 0");
+      }
+    }
   }
 ];
 function ensureMigrationsTable(db) {
@@ -143494,12 +143537,37 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       -- is a valid JSON blob written via setPendingPiCompactionMarkerState.
       -- Excluded from healNullTextColumns.
       pending_pi_compaction_marker_state TEXT,
+      new_work_tokens INTEGER NOT NULL DEFAULT 0,
+      total_input_tokens INTEGER NOT NULL DEFAULT 0,
       -- deferred_execute_state: intentionally NULLABLE without a default.
       -- Absence is SQL NULL; presence is a JSON blob written via
       -- setDeferredExecutePendingIfAbsent. Excluded from healNullTextColumns.
       deferred_execute_state TEXT
     );
 
+    CREATE TABLE IF NOT EXISTS subagent_invocations (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL,
+      harness TEXT NOT NULL,
+      subagent TEXT NOT NULL,
+      task TEXT,
+      provider_id TEXT,
+      model_id TEXT,
+      started_at INTEGER NOT NULL,
+      ended_at INTEGER,
+      status TEXT NOT NULL,
+      input_tokens INTEGER NOT NULL DEFAULT 0,
+      output_tokens INTEGER NOT NULL DEFAULT 0,
+      cache_read_tokens INTEGER NOT NULL DEFAULT 0,
+      cache_write_tokens INTEGER NOT NULL DEFAULT 0,
+      error TEXT,
+      parent_invocation_id INTEGER
+    );
+    CREATE INDEX IF NOT EXISTS idx_sai_session_started
+      ON subagent_invocations(session_id, started_at DESC);
+    CREATE INDEX IF NOT EXISTS idx_sai_subagent
+      ON subagent_invocations(subagent, started_at DESC);
+
     CREATE INDEX IF NOT EXISTS idx_tags_session_tag_number ON tags(session_id, tag_number);
     CREATE INDEX IF NOT EXISTS idx_tags_session_message_id ON tags(session_id, message_id);
     CREATE INDEX IF NOT EXISTS idx_pending_ops_session ON pending_ops(session_id);
@@ -143591,6 +143659,8 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "session_meta", "needs_emergency_recovery", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "pending_compaction_marker_state", "TEXT");
   ensureColumn(db, "session_meta", "pending_pi_compaction_marker_state", "TEXT");
+  ensureColumn(db, "session_meta", "new_work_tokens", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "total_input_tokens", "INTEGER NOT NULL DEFAULT 0");
   ensureColumn(db, "session_meta", "deferred_execute_state", "TEXT");
   ensureColumn(db, "tags", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
   ensureColumn(db, "pending_ops", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
@@ -143654,7 +143724,9 @@ function healNullIntegerColumns(db) {
     ["tool_call_tokens", 0],
     ["note_nudge_trigger_pending", 0],
     ["observed_safe_input_tokens", 0],
-    ["cache_alert_sent", 0]
+    ["cache_alert_sent", 0],
+    ["new_work_tokens", 0],
+    ["total_input_tokens", 0]
   ];
   for (const [column, fallback] of columns) {
     try {
@@ -144264,6 +144336,12 @@ function clearDeferredExecutePendingIfMatches(db, sessionId, expected) {
              WHERE session_id = ? AND deferred_execute_state = ?`).run(sessionId, expectedBlob);
   return result.changes > 0;
 }
+function setSessionWorkMetrics(db, sessionId, newWorkTokens, totalInputTokens) {
+  ensureSessionMetaRow(db, sessionId);
+  db.prepare(`UPDATE session_meta
+         SET new_work_tokens = ?, total_input_tokens = ?
+         WHERE session_id = ?`).run(Math.max(0, Math.floor(newWorkTokens)), Math.max(0, Math.floor(totalInputTokens)), sessionId);
+}
 // ../plugin/src/features/magic-context/resolve-subagent-fallback.ts
 init_logger();
 await init_read_session_db();
@@ -144579,6 +144657,19 @@ function getSourceContents(db, sessionId, tagIds) {
   }
   return sources;
 }
+// ../plugin/src/features/magic-context/storage-subagent-invocations.ts
+function clampToken(value) {
+  return Number.isFinite(value) && value > 0 ? Math.floor(value) : 0;
+}
+function recordSubagentInvocation(db, input) {
+  const result = db.prepare(`INSERT INTO subagent_invocations (
+                session_id, harness, subagent, task, provider_id, model_id,
+                started_at, ended_at, status,
+                input_tokens, output_tokens, cache_read_tokens, cache_write_tokens,
+                error, parent_invocation_id
+            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(input.sessionId, input.harness, input.subagent, input.task ?? null, input.providerId ?? null, input.modelId ?? null, input.startedAt, input.endedAt, input.status, clampToken(input.inputTokens), clampToken(input.outputTokens), clampToken(input.cacheReadTokens), clampToken(input.cacheWriteTokens), input.error ?? null, input.parentInvocationId ?? null);
+  return Number(result.lastInsertRowid);
+}
 // ../plugin/src/features/magic-context/storage-tags.ts
 var insertTagStatements = new WeakMap;
 var updateTagStatusStatements = new WeakMap;
@@ -145563,6 +145654,97 @@ import { createRequire as createRequire3 } from "node:module";
 import { dirname as dirname3, join as join9, resolve as resolvePath } from "node:path";
 import { createInterface } from "node:readline";
 import { fileURLToPath } from "node:url";
+
+// ../plugin/src/features/magic-context/subagent-token-capture.ts
+init_logger();
+function asNumber(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : 0;
+}
+function tokenObjectFromMessage(message) {
+  const info = message.info;
+  if (info && typeof info === "object") {
+    const tokens2 = info.tokens;
+    if (tokens2 && typeof tokens2 === "object")
+      return tokens2;
+  }
+  const tokens = message.tokens;
+  if (tokens && typeof tokens === "object")
+    return tokens;
+  return null;
+}
+function isAssistantMessage(message) {
+  if (!message || typeof message !== "object")
+    return false;
+  const record = message;
+  const info = record.info;
+  if (info && typeof info === "object") {
+    return info.role === "assistant";
+  }
+  return record.role === "assistant";
+}
+function modelFromMessage(message) {
+  const info = message.info;
+  const source = info && typeof info === "object" ? info : message;
+  return {
+    providerId: typeof source.providerID === "string" ? source.providerID : typeof source.providerId === "string" ? source.providerId : null,
+    modelId: typeof source.modelID === "string" ? source.modelID : typeof source.modelId === "string" ? source.modelId : null
+  };
+}
+function emptyTokenTotals() {
+  return { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 };
+}
+function sumTokensFromChildMessages(messages) {
+  const totals = emptyTokenTotals();
+  for (const message of messages) {
+    if (!isAssistantMessage(message))
+      continue;
+    const tokens = tokenObjectFromMessage(message);
+    if (!tokens)
+      continue;
+    const cache = tokens.cache && typeof tokens.cache === "object" ? tokens.cache : {};
+    totals.input += asNumber(tokens.input);
+    totals.output += asNumber(tokens.output);
+    totals.cacheRead += asNumber(cache.read ?? tokens.cacheRead ?? tokens.cache_read);
+    totals.cacheWrite += asNumber(cache.write ?? tokens.cacheWrite ?? tokens.cache_write);
+  }
+  return totals;
+}
+function findLastAssistantModel(messages) {
+  for (let index = messages.length - 1;index >= 0; index -= 1) {
+    const message = messages[index];
+    if (isAssistantMessage(message))
+      return modelFromMessage(message);
+  }
+  return { providerId: null, modelId: null };
+}
+function recordChildInvocation(input) {
+  const tokens = input.tokens ?? sumTokensFromChildMessages(input.messages ?? []);
+  const model = input.providerId !== undefined || input.modelId !== undefined ? { providerId: input.providerId ?? null, modelId: input.modelId ?? null } : findLastAssistantModel(input.messages ?? []);
+  try {
+    return recordSubagentInvocation(input.db, {
+      sessionId: input.parentSessionId,
+      harness: input.harness,
+      subagent: input.subagent,
+      task: input.task ?? null,
+      providerId: model.providerId,
+      modelId: model.modelId,
+      startedAt: input.startedAt,
+      endedAt: input.endedAt ?? Date.now(),
+      status: input.status,
+      inputTokens: tokens.input,
+      outputTokens: tokens.output,
+      cacheReadTokens: tokens.cacheRead,
+      cacheWriteTokens: tokens.cacheWrite,
+      error: input.error ? describeError(input.error).brief : null,
+      parentInvocationId: input.parentInvocationId ?? null
+    });
+  } catch (error) {
+    sessionLog(input.parentSessionId, "subagent token accounting failed:", describeError(error).brief);
+    return null;
+  }
+}
+
+// src/subagent-runner.ts
 function resolveBundledPiCli() {
   try {
     const require_ = createRequire3(import.meta.url);
@@ -145592,6 +145774,17 @@ var DREAMER_ACTION_AGENTS = new Set([
   "dreamer",
   "magic-context-dreamer"
 ]);
+function inferAccountingSubagent(agent) {
+  if (agent.includes("sidekick"))
+    return "sidekick";
+  if (agent.includes("dreamer"))
+    return "dreamer";
+  if (agent.includes("compressor"))
+    return "compressor";
+  if (agent.includes("recomp"))
+    return "recomp";
+  return "historian";
+}
 
 class PiSubagentRunner {
   harness = "pi";
@@ -145633,21 +145826,45 @@ class PiSubagentRunner {
   }
   async runOnce(options) {
     const startTime = Date.now();
+    let recordedAccounting = false;
+    const recordAccounting = (result, messages = []) => {
+      if (!options.accountingSessionId || recordedAccounting)
+        return;
+      recordedAccounting = true;
+      recordChildInvocation({
+        db: openDatabase(),
+        parentSessionId: options.accountingSessionId,
+        harness: "pi",
+        subagent: options.accountingSubagent ?? inferAccountingSubagent(options.agent),
+        task: options.accountingTask ?? null,
+        startedAt: startTime,
+        status: result.ok ? "completed" : result.reason === "abort" ? "aborted" : "failed",
+        messages,
+        providerId: typeof options.model === "string" ? options.model.split("/")[0] : null,
+        modelId: typeof options.model === "string" ? options.model.split("/").slice(1).join("/") : null,
+        error: result.ok ? null : result.error,
+        parentInvocationId: options.accountingParentInvocationId ?? null
+      });
+    };
     if (options.signal?.aborted) {
-      return {
+      const result = {
         ok: false,
         reason: "abort",
         error: "pi subagent aborted by caller",
         durationMs: Date.now() - startTime
       };
+      recordAccounting(result);
+      return result;
     }
     const args = buildArgs(options);
     return new Promise((resolve2) => {
+      let accountingMessages = [];
       let settled = false;
       const settle = (result) => {
         if (settled)
           return;
         settled = true;
+        recordAccounting(result, accountingMessages);
         resolve2(result);
       };
       const emitProgress = (event) => {
@@ -145717,6 +145934,7 @@ class PiSubagentRunner {
       let lastEventType = null;
       let lastEventTimestamp = 0;
       const accumulatedMessages = [];
+      accountingMessages = accumulatedMessages;
       rl.on("line", (line) => {
         if (line.length === 0)
           return;
@@ -146069,7 +146287,9 @@ function registerCtxAugCommand(pi, config) {
         timeoutMs: config.timeoutMs ?? 30000,
         cwd: ctx.cwd,
         signal: ctx.signal,
-        thinkingLevel: config.thinking_level
+        thinkingLevel: config.thinking_level,
+        accountingSessionId: sessionLabel,
+        accountingSubagent: "sidekick"
       });
       if (!result.ok) {
         log(`[magic-context][pi] /ctx-aug: sidekick failed (${result.reason}): ${result.error}`);
@@ -148067,6 +148287,23 @@ Return valid JSON (no markdown fencing):
 
 If no promotions are warranted, return empty arrays. Always consume reviewed candidates so they don't accumulate indefinitely.`;
   let agentSessionId = null;
+  const startedAt = Date.now();
+  let invocationRecorded = false;
+  const recordInvocation = (params) => {
+    if (!args.parentSessionId || invocationRecorded)
+      return;
+    invocationRecorded = true;
+    recordChildInvocation({
+      db: args.db,
+      parentSessionId: args.parentSessionId,
+      harness: "opencode",
+      subagent: "user_memory_review",
+      startedAt,
+      status: params.status,
+      messages: params.messages,
+      error: params.error
+    });
+  };
   const abortController = new AbortController;
   const leaseInterval = setInterval(() => {
     try {
@@ -148088,8 +148325,11 @@ If no promotions are warranted, return empty arrays. Always consume reviewed can
     });
     const created = normalizeSDKResponse(createResponse, null, { preferResponseOnMissingData: true });
     agentSessionId = typeof created?.id === "string" ? created.id : null;
-    if (!agentSessionId)
-      throw new Error("Could not create user memory review session.");
+    if (!agentSessionId) {
+      const error = new Error("Could not create user memory review session.");
+      recordInvocation({ status: "failed", error });
+      throw error;
+    }
     log(`[dreamer] user-memories: child session created ${agentSessionId}`);
     const remainingMs = Math.max(0, args.deadline - Date.now());
     await promptSyncWithModelSuggestionRetry(args.client, {
@@ -148113,6 +148353,7 @@ If no promotions are warranted, return empty arrays. Always consume reviewed can
     const messages = normalizeSDKResponse(messagesResponse, [], {
       preferResponseOnMissingData: true
     });
+    recordInvocation({ status: "completed", messages });
     const responseText = extractLatestAssistantText(messages);
     if (!responseText) {
       log("[dreamer] user-memories: no response from review agent");
@@ -148352,6 +148593,24 @@ async function runDream(args) {
       log(`[dreamer] starting task: ${taskName}`);
       const taskStartedAt = Date.now();
       let agentSessionId = null;
+      const invocationStartedAt = Date.now();
+      let invocationRecorded = false;
+      const recordInvocation = (params) => {
+        if (!parentSessionId || invocationRecorded)
+          return;
+        invocationRecorded = true;
+        recordChildInvocation({
+          db: args.db,
+          parentSessionId,
+          harness: "opencode",
+          subagent: "dreamer",
+          task: taskName,
+          startedAt: invocationStartedAt,
+          status: params.status,
+          messages: params.messages,
+          error: params.error
+        });
+      };
       const taskAbortController = new AbortController;
       const leaseRenewalInterval = setInterval(() => {
         try {
@@ -148392,7 +148651,9 @@ async function runDream(args) {
         const createdSession = normalizeSDKResponse(createResponse, null, { preferResponseOnMissingData: true });
         agentSessionId = typeof createdSession?.id === "string" ? createdSession.id : null;
         if (!agentSessionId) {
-          throw new Error("Dreamer could not create its child session.");
+          const error = new Error("Dreamer could not create its child session.");
+          recordInvocation({ status: "failed", error });
+          throw error;
         }
         log(`[dreamer] task ${taskName}: child session created ${agentSessionId}`);
         await promptSyncWithModelSuggestionRetry(args.client, {
@@ -148419,6 +148680,7 @@ async function runDream(args) {
         const messages = normalizeSDKResponse(messagesResponse, [], {
           preferResponseOnMissingData: true
         });
+        recordInvocation({ status: "completed", messages });
         const taskResult = extractLatestAssistantText(messages);
         if (!taskResult) {
           throw new Error("Dreamer returned no assistant output.");
@@ -148433,6 +148695,7 @@ async function runDream(args) {
         lastErrorSignature = null;
         consecutiveSameErrorFailures = 0;
       } catch (error) {
+        recordInvocation({ status: lostLease ? "aborted" : "failed", error });
         const durationMs = Date.now() - taskStartedAt;
         const errorDescription = describeError(error);
         logWithStackHead(`[dreamer] task ${taskName}: failed after ${(durationMs / 1000).toFixed(1)}s — ${errorDescription.brief}`, errorDescription.stackHead);
@@ -148702,6 +148965,24 @@ ${noteDescriptions}
 Only include notes whose conditions you could definitively evaluate against external signals. Skip notes where you cannot determine the status (they will be re-evaluated next run, or eventually archived as stale).`;
   const taskStartedAt = Date.now();
   let agentSessionId = null;
+  const startedAt = Date.now();
+  let invocationRecorded = false;
+  const recordInvocation = (params) => {
+    if (!args.parentSessionId || invocationRecorded)
+      return;
+    invocationRecorded = true;
+    recordChildInvocation({
+      db: args.db,
+      parentSessionId: args.parentSessionId,
+      harness: "opencode",
+      subagent: "dreamer",
+      task: "smart-notes",
+      startedAt,
+      status: params.status,
+      messages: params.messages,
+      error: params.error
+    });
+  };
   const abortController = new AbortController;
   const leaseInterval = setInterval(() => {
     try {
@@ -148725,8 +149006,11 @@ Only include notes whose conditions you could definitively evaluate against exte
     });
     const created = normalizeSDKResponse(createResponse, null, { preferResponseOnMissingData: true });
     agentSessionId = typeof created?.id === "string" ? created.id : null;
-    if (!agentSessionId)
-      throw new Error("Could not create smart note evaluation session.");
+    if (!agentSessionId) {
+      const error = new Error("Could not create smart note evaluation session.");
+      recordInvocation({ status: "failed", error });
+      throw error;
+    }
     log(`[dreamer] smart notes: child session created ${agentSessionId}`);
     const remainingMs = Math.max(0, args.deadline - Date.now());
     await promptSyncWithModelSuggestionRetry(args.client, {
@@ -148750,6 +149034,7 @@ Only include notes whose conditions you could definitively evaluate against exte
     const messages = normalizeSDKResponse(messagesResponse, [], {
       preferResponseOnMissingData: true
     });
+    recordInvocation({ status: "completed", messages });
     const output = extractLatestAssistantText(messages);
     if (!output)
       throw new Error("Smart note evaluation returned no output.");
@@ -166118,6 +166403,57 @@ function createTagger() {
   };
 }
 
+// ../plugin/src/features/magic-context/work-metrics.ts
+function asNumber2(value) {
+  return typeof value === "number" && Number.isFinite(value) ? value : 0;
+}
+function getPiUsage(entry) {
+  if (!entry || typeof entry !== "object")
+    return null;
+  const record2 = entry;
+  const message = record2.message && typeof record2.message === "object" ? record2.message : record2;
+  if (message.role !== "assistant")
+    return null;
+  if (!message.usage || typeof message.usage !== "object")
+    return null;
+  const usage = message.usage;
+  return {
+    input: asNumber2(usage.input),
+    output: asNumber2(usage.output),
+    cacheRead: asNumber2(usage.cacheRead ?? usage.cache_read),
+    cacheWrite: asNumber2(usage.cacheWrite ?? usage.cache_write)
+  };
+}
+function computePiWorkMetrics(sessionEntries) {
+  let previousPrompt = 0;
+  let phasePeak = 0;
+  let newWorkTokens = 0;
+  let totalInputTokens = 0;
+  let lastOutput = 0;
+  let sawAssistant = false;
+  for (const entry of sessionEntries) {
+    const usage = getPiUsage(entry);
+    if (!usage)
+      continue;
+    const prompt = usage.input + usage.cacheRead + usage.cacheWrite;
+    if (sawAssistant && prompt < previousPrompt) {
+      totalInputTokens += phasePeak;
+      phasePeak = prompt;
+    } else {
+      phasePeak = Math.max(phasePeak, prompt);
+    }
+    newWorkTokens += Math.max(0, prompt - previousPrompt);
+    previousPrompt = prompt;
+    lastOutput = usage.output;
+    sawAssistant = true;
+  }
+  if (sawAssistant) {
+    totalInputTokens += phasePeak;
+    newWorkTokens += lastOutput;
+  }
+  return { newWorkTokens, totalInputTokens };
+}
+
 // ../plugin/src/hooks/magic-context/apply-operations.ts
 var USER_DROP_PREVIEW_CHARS = 250;
 function buildReplacementContent(tagId, target) {
@@ -168879,12 +169215,12 @@ function createAssistantNudgeMessage(text, messages) {
 function findLatestAssistantMessage(messages) {
   for (let i = messages.length - 1;i >= 0; i--) {
     const message = messages[i];
-    if (isAssistantMessage(message))
+    if (isAssistantMessage2(message))
       return message;
   }
   return;
 }
-function isAssistantMessage(message) {
+function isAssistantMessage2(message) {
   return getRole(message) === "assistant";
 }
 function createZeroUsage() {
@@ -169495,7 +169831,9 @@ async function runCompressorPass(args) {
       fallbackModels: args.fallbackModels,
       timeoutMs: args.historianTimeoutMs ?? DEFAULT_HISTORIAN_TIMEOUT_MS,
       cwd: args.directory,
-      thinkingLevel: args.thinkingLevel
+      thinkingLevel: args.thinkingLevel,
+      accountingSessionId: args.sessionId,
+      accountingSubagent: "compressor"
     });
     if (!result.ok) {
       sessionLog(args.sessionId, `compressor: subagent failed (${result.reason}): ${result.error}`);
@@ -170239,7 +170577,9 @@ ${chunk.text}`, { stateFilePath });
         timeoutMs: historianTimeoutMs,
         cwd: directory,
         thinkingLevel,
-        onProgress: buildProgressLogger("first")
+        onProgress: buildProgressLogger("first"),
+        accountingSessionId: sessionId,
+        accountingSubagent: "historian"
       });
       let validatedPass = await validateHistorianResult(firstResult, sessionId, chunk, priorCompartments, sequenceOffset);
       let validatedDraftText = firstResult.ok ? firstResult.assistantText : null;
@@ -170255,7 +170595,9 @@ ${chunk.text}`, { stateFilePath });
           timeoutMs: historianTimeoutMs,
           cwd: directory,
           thinkingLevel,
-          onProgress: buildProgressLogger("repair")
+          onProgress: buildProgressLogger("repair"),
+          accountingSessionId: sessionId,
+          accountingSubagent: "historian"
         });
         validatedPass = await validateHistorianResult(repairResult, sessionId, chunk, priorCompartments, sequenceOffset);
         if (validatedPass.kind === "ok" && repairResult.ok) {
@@ -170281,7 +170623,9 @@ ${chunk.text}`, { stateFilePath });
             timeoutMs: historianTimeoutMs,
             cwd: directory,
             thinkingLevel,
-            onProgress: buildProgressLogger("editor")
+            onProgress: buildProgressLogger("editor"),
+            accountingSessionId: sessionId,
+            accountingSubagent: "historian_editor"
           });
           const editorPass = await validateHistorianResult(editorResult, sessionId, chunk, priorCompartments, sequenceOffset);
           if (editorPass.kind === "ok") {
@@ -172403,6 +172747,12 @@ function registerPiContextHandler(pi, options) {
       } catch (err) {
         sessionLog(sessionId, `synthetic todowrite injection failed: ${err instanceof Error ? err.message : String(err)}`);
       }
+      try {
+        const metrics = computePiWorkMetrics(outputMessages);
+        setSessionWorkMetrics(options.db, sessionId, metrics.newWorkTokens, metrics.totalInputTokens);
+      } catch (err) {
+        sessionLog(sessionId, `work-metrics update failed: ${err instanceof Error ? err.message : String(err)}`);
+      }
       logTransformTiming(sessionId, "postTransformPhase", tPostTransform);
       sessionLog(sessionId, `transform completed in ${(performance.now() - transformStartTime).toFixed(1)}ms (${outputMessages.length} messages, ${result.targetCount} targets, watermark: ${result.reasoningWatermark})`);
       clearLastTransformErrorIfSet(options.db, sessionId);
@@ -173828,6 +174178,27 @@ async function runCompressorPass2(args) {
   } = args;
   const prompt = buildCompressorPrompt(compartments, currentTokens, targetTokens, outputDepth, outputCount);
   let agentSessionId = null;
+  const startedAt = Date.now();
+  let invocationRecorded = false;
+  const recordInvocation = (params) => {
+    if (invocationRecorded)
+      return;
+    invocationRecorded = true;
+    try {
+      recordChildInvocation({
+        db: openDatabase(),
+        parentSessionId: sessionId,
+        harness: "opencode",
+        subagent: "compressor",
+        startedAt,
+        status: params.status,
+        messages: params.messages,
+        error: params.error
+      });
+    } catch (error51) {
+      sessionLog(sessionId, "subagent token accounting unavailable", getErrorMessage(error51));
+    }
+  };
   try {
     const createResponse = await client.session.create({
       body: { parentID: sessionId, title: "magic-context-compressor" },
@@ -173837,6 +174208,7 @@ async function runCompressorPass2(args) {
     agentSessionId = typeof createdSession?.id === "string" ? createdSession.id : null;
     if (!agentSessionId) {
       sessionLog(sessionId, "compressor: could not create child session");
+      recordInvocation({ status: "failed", error: "could not create child session" });
       return null;
     }
     await promptSyncWithModelSuggestionRetry(client, {
@@ -173858,6 +174230,7 @@ async function runCompressorPass2(args) {
     const messages = normalizeSDKResponse(messagesResponse, [], {
       preferResponseOnMissingData: true
     });
+    recordInvocation({ status: "completed", messages });
     const result = extractLatestAssistantText(messages);
     if (!result) {
       sessionLog(sessionId, "compressor: historian returned no output");
@@ -173878,6 +174251,7 @@ async function runCompressorPass2(args) {
     }
     return snapped.result;
   } catch (error51) {
+    recordInvocation({ status: "failed", error: error51 });
     sessionLog(sessionId, "compressor: historian call failed:", getErrorMessage(error51));
     return null;
   } finally {
@@ -173916,7 +174290,8 @@ async function runValidatedHistorianPass(args) {
       ...args,
       draftXml: firstRun.result,
       draftValidation: firstValidation,
-      draftDumpPath: firstRun.dumpPath
+      draftDumpPath: firstRun.dumpPath,
+      draftInvocationId: firstRun.invocationId ?? null
     }) : firstValidation;
     cleanupHistorianDump(args.parentSessionId, firstRun.dumpPath);
     return finalResult;
@@ -173942,7 +174317,8 @@ async function runValidatedHistorianPass(args) {
       ...args,
       draftXml: repairRun.result,
       draftValidation: repairValidation,
-      draftDumpPath: repairRun.dumpPath
+      draftDumpPath: repairRun.dumpPath,
+      draftInvocationId: repairRun.invocationId ?? null
     }) : repairValidation;
     cleanupHistorianDump(args.parentSessionId, repairRun.dumpPath);
     return finalResult;
@@ -173963,7 +174339,8 @@ async function runEditorPassOrFallback(args) {
     prompt: buildHistorianEditorPrompt(args.draftXml),
     timeoutMs: args.timeoutMs,
     dumpLabel: `${args.dumpLabelBase}-editor`,
-    agentId: HISTORIAN_EDITOR_AGENT
+    agentId: HISTORIAN_EDITOR_AGENT,
+    parentInvocationId: args.draftInvocationId ?? null
   });
   if (!editorRun.ok || !editorRun.result) {
     sessionLog(args.parentSessionId, "historian two-pass: editor call failed", {
@@ -173990,9 +174367,29 @@ async function runHistorianPrompt(args) {
     dumpLabel,
     modelOverride,
     agentId = HISTORIAN_AGENT,
-    fallbackModels
+    fallbackModels,
+    subagentKind,
+    parentInvocationId
   } = args;
   let agentSessionId = null;
+  const startedAt = Date.now();
+  let invocationRecorded = false;
+  const recordInvocation = (params) => {
+    if (invocationRecorded)
+      return null;
+    invocationRecorded = true;
+    return recordChildInvocation({
+      db: openDatabase(),
+      parentSessionId,
+      harness: "opencode",
+      subagent: agentId === HISTORIAN_EDITOR_AGENT ? "historian_editor" : subagentKind ?? "historian",
+      startedAt,
+      status: params.status,
+      messages: params.messages,
+      error: params.error,
+      parentInvocationId: agentId === HISTORIAN_EDITOR_AGENT ? parentInvocationId ?? null : null
+    });
+  };
   try {
     sessionLog(parentSessionId, `historian: creating child session (agent=${agentId}, model=${modelOverride ? `${modelOverride.providerID}/${modelOverride.modelID}` : `agent:${agentId}`})`);
     const createResponse = await client.session.create({
@@ -174005,6 +174402,10 @@ async function runHistorianPrompt(args) {
     const createdSession = normalizeSDKResponse(createResponse, null, { preferResponseOnMissingData: true });
     agentSessionId = typeof createdSession?.id === "string" ? createdSession.id : null;
     if (!agentSessionId) {
+      recordInvocation({
+        status: "failed",
+        error: "Historian could not create its child session."
+      });
       return { ok: false, error: "Historian could not create its child session." };
     }
     for (let retryIndex = 0;retryIndex <= MAX_HISTORIAN_RETRIES; retryIndex += 1) {
@@ -174043,15 +174444,21 @@ async function runHistorianPrompt(args) {
     const messages = normalizeSDKResponse(messagesResponse, [], {
       preferResponseOnMissingData: true
     });
+    const invocationId = recordInvocation({ status: "completed", messages });
     const result = extractLatestAssistantText(messages);
     if (!result) {
-      return { ok: false, error: "Historian returned no assistant output." };
+      return {
+        ok: false,
+        error: "Historian returned no assistant output.",
+        invocationId: invocationId ?? undefined
+      };
     }
     const dumpPath = dumpHistorianResponse(parentSessionId, sessionDirectory, dumpLabel ?? "historian-response", result);
-    return { ok: true, result, dumpPath };
+    return { ok: true, result, dumpPath, invocationId: invocationId ?? undefined };
   } catch (modelError) {
     const desc = describeError(modelError);
     sessionLog(parentSessionId, `historian prompt failed: ${desc.brief} promptLength=${prompt.length}${desc.stackHead ? ` stackHead="${desc.stackHead}"` : ""}`);
+    recordInvocation({ status: "failed", error: modelError });
     return {
       ok: false,
       error: `Historian failed while processing this session: ${desc.brief}`
@@ -174712,6 +175119,7 @@ Historian pass ${passCount + 1}, attempt ${passAttempt} started for messages ${c
         fallbackModelId: deps.fallbackModelId,
         fallbackModels: deps.fallbackModels,
         twoPass: deps.historianTwoPass,
+        subagentKind: "recomp",
         callbacks: {
           onRepairRetry: async (error51) => {
             await sendIgnoredMessage(client, sessionId, `## Magic Recomp
@@ -175078,6 +175486,7 @@ Historian recomp started. Rebuilding compartments and facts from raw Pi session
             timeoutMs: deps.historianTimeoutMs,
             thinkingLevel: deps.historianThinkingLevel,
             directory: ctx.cwd,
+            accountingSessionId: sessionId,
             notify: (text) => {
               sendCtxStatusMessage(pi, {
                 title: "/ctx-recomp",
@@ -175264,7 +175673,9 @@ function createPiRecompClient(args) {
       fallbackModels: args.fallbackModels,
       timeoutMs: args.timeoutMs,
       cwd: args.directory,
-      thinkingLevel: args.thinkingLevel
+      thinkingLevel: args.thinkingLevel,
+      accountingSessionId: args.accountingSessionId,
+      accountingSubagent: "recomp"
     });
     if (!result.ok) {
       throw new Error(`Pi recomp historian failed (${result.reason}): ${result.error}`);
@@ -175460,7 +175871,7 @@ function formatThresholdPercent(value) {
 // package.json
 var package_default = {
   name: "@cortexkit/pi-magic-context",
-  version: "0.21.7",
+  version: "0.21.8",
   type: "module",
   description: "Pi coding agent extension for Magic Context — cross-session memory and context management",
   main: "dist/index.js",

package/dist/subagent-entry.js

@@ -8925,6 +8925,49 @@ var MIGRATIONS = [
                     ON compartment_state_lease(expires_at);
             `);
     }
+  },
+  {
+    version: 20,
+    description: "Add subagent invocation token accounting",
+    up: (db) => {
+      db.exec(`
+                CREATE TABLE IF NOT EXISTS subagent_invocations (
+                    id INTEGER PRIMARY KEY AUTOINCREMENT,
+                    session_id TEXT NOT NULL,
+                    harness TEXT NOT NULL,
+                    subagent TEXT NOT NULL,
+                    task TEXT,
+                    provider_id TEXT,
+                    model_id TEXT,
+                    started_at INTEGER NOT NULL,
+                    ended_at INTEGER,
+                    status TEXT NOT NULL,
+                    input_tokens INTEGER NOT NULL DEFAULT 0,
+                    output_tokens INTEGER NOT NULL DEFAULT 0,
+                    cache_read_tokens INTEGER NOT NULL DEFAULT 0,
+                    cache_write_tokens INTEGER NOT NULL DEFAULT 0,
+                    error TEXT,
+                    parent_invocation_id INTEGER
+                );
+                CREATE INDEX IF NOT EXISTS idx_sai_session_started
+                    ON subagent_invocations(session_id, started_at DESC);
+                CREATE INDEX IF NOT EXISTS idx_sai_subagent
+                    ON subagent_invocations(subagent, started_at DESC);
+            `);
+    }
+  },
+  {
+    version: 21,
+    description: "Add session lifetime work metrics",
+    up: (db) => {
+      const cols = db.prepare("PRAGMA table_info(session_meta)").all();
+      if (!cols.some((c) => c.name === "new_work_tokens")) {
+        db.exec("ALTER TABLE session_meta ADD COLUMN new_work_tokens INTEGER NOT NULL DEFAULT 0");
+      }
+      if (!cols.some((c) => c.name === "total_input_tokens")) {
+        db.exec("ALTER TABLE session_meta ADD COLUMN total_input_tokens INTEGER NOT NULL DEFAULT 0");
+      }
+    }
   }
 ];
 function ensureMigrationsTable(db) {
@@ -142177,12 +142220,37 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
       -- is a valid JSON blob written via setPendingPiCompactionMarkerState.
       -- Excluded from healNullTextColumns.
       pending_pi_compaction_marker_state TEXT,
+      new_work_tokens INTEGER NOT NULL DEFAULT 0,
+      total_input_tokens INTEGER NOT NULL DEFAULT 0,
       -- deferred_execute_state: intentionally NULLABLE without a default.
       -- Absence is SQL NULL; presence is a JSON blob written via
       -- setDeferredExecutePendingIfAbsent. Excluded from healNullTextColumns.
       deferred_execute_state TEXT
     );
 
+    CREATE TABLE IF NOT EXISTS subagent_invocations (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      session_id TEXT NOT NULL,
+      harness TEXT NOT NULL,
+      subagent TEXT NOT NULL,
+      task TEXT,
+      provider_id TEXT,
+      model_id TEXT,
+      started_at INTEGER NOT NULL,
+      ended_at INTEGER,
+      status TEXT NOT NULL,
+      input_tokens INTEGER NOT NULL DEFAULT 0,
+      output_tokens INTEGER NOT NULL DEFAULT 0,
+      cache_read_tokens INTEGER NOT NULL DEFAULT 0,
+      cache_write_tokens INTEGER NOT NULL DEFAULT 0,
+      error TEXT,
+      parent_invocation_id INTEGER
+    );
+    CREATE INDEX IF NOT EXISTS idx_sai_session_started
+      ON subagent_invocations(session_id, started_at DESC);
+    CREATE INDEX IF NOT EXISTS idx_sai_subagent
+      ON subagent_invocations(subagent, started_at DESC);
+
     CREATE INDEX IF NOT EXISTS idx_tags_session_tag_number ON tags(session_id, tag_number);
     CREATE INDEX IF NOT EXISTS idx_tags_session_message_id ON tags(session_id, message_id);
     CREATE INDEX IF NOT EXISTS idx_pending_ops_session ON pending_ops(session_id);
@@ -142274,6 +142342,8 @@ CREATE INDEX IF NOT EXISTS idx_dream_queue_pending ON dream_queue(started_at, en
   ensureColumn(db, "session_meta", "needs_emergency_recovery", "INTEGER DEFAULT 0");
   ensureColumn(db, "session_meta", "pending_compaction_marker_state", "TEXT");
   ensureColumn(db, "session_meta", "pending_pi_compaction_marker_state", "TEXT");
+  ensureColumn(db, "session_meta", "new_work_tokens", "INTEGER NOT NULL DEFAULT 0");
+  ensureColumn(db, "session_meta", "total_input_tokens", "INTEGER NOT NULL DEFAULT 0");
   ensureColumn(db, "session_meta", "deferred_execute_state", "TEXT");
   ensureColumn(db, "tags", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
   ensureColumn(db, "pending_ops", "harness", "TEXT NOT NULL DEFAULT 'opencode'");
@@ -142337,7 +142407,9 @@ function healNullIntegerColumns(db) {
     ["tool_call_tokens", 0],
     ["note_nudge_trigger_pending", 0],
     ["observed_safe_input_tokens", 0],
-    ["cache_alert_sent", 0]
+    ["cache_alert_sent", 0],
+    ["new_work_tokens", 0],
+    ["total_input_tokens", 0]
   ];
   for (const [column, fallback] of columns) {
     try {
@@ -165296,6 +165368,12 @@ function clearDeferredExecutePendingIfMatches(db, sessionId, expected) {
              WHERE session_id = ? AND deferred_execute_state = ?`).run(sessionId, expectedBlob);
   return result.changes > 0;
 }
+function setSessionWorkMetrics(db, sessionId, newWorkTokens, totalInputTokens) {
+  ensureSessionMetaRow(db, sessionId);
+  db.prepare(`UPDATE session_meta
+         SET new_work_tokens = ?, total_input_tokens = ?
+         WHERE session_id = ?`).run(Math.max(0, Math.floor(newWorkTokens)), Math.max(0, Math.floor(totalInputTokens)), sessionId);
+}
 // ../plugin/src/features/magic-context/resolve-subagent-fallback.ts
 init_logger();
 await init_read_session_db();
@@ -165611,6 +165689,19 @@ function getSourceContents(db, sessionId, tagIds) {
   }
   return sources;
 }
+// ../plugin/src/features/magic-context/storage-subagent-invocations.ts
+function clampToken(value) {
+  return Number.isFinite(value) && value > 0 ? Math.floor(value) : 0;
+}
+function recordSubagentInvocation(db, input) {
+  const result = db.prepare(`INSERT INTO subagent_invocations (
+                session_id, harness, subagent, task, provider_id, model_id,
+                started_at, ended_at, status,
+                input_tokens, output_tokens, cache_read_tokens, cache_write_tokens,
+                error, parent_invocation_id
+            ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`).run(input.sessionId, input.harness, input.subagent, input.task ?? null, input.providerId ?? null, input.modelId ?? null, input.startedAt, input.endedAt, input.status, clampToken(input.inputTokens), clampToken(input.outputTokens), clampToken(input.cacheReadTokens), clampToken(input.cacheWriteTokens), input.error ?? null, input.parentInvocationId ?? null);
+  return Number(result.lastInsertRowid);
+}
 // ../plugin/src/features/magic-context/storage-tags.ts
 var insertTagStatements = new WeakMap;
 var updateTagStatusStatements = new WeakMap;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@cortexkit/pi-magic-context",
-	"version": "0.21.7",
+	"version": "0.21.8",
 	"type": "module",
 	"description": "Pi coding agent extension for Magic Context — cross-session memory and context management",
 	"main": "dist/index.js",