@agent-finops/core 0.5.8 → 0.6.0

package/dist/toolInvocations.js

@@ -36,10 +36,12 @@ export function parseClaudeCodeInvocations(content, sinceMs) {
         if (timestamp && (!lastActivityAt || timestamp > lastActivityAt)) {
             lastActivityAt = timestamp;
         }
-        // sinceIso filter: skip lines older than the cutoff when a timestamp exists.
+        // A selected window requires dated evidence. Undated lines cannot prove an
+        // invocation occurred inside that window and must not create removal-safe
+        // coverage by accident.
         if (typeof sinceMs === "number") {
             const ts = Date.parse(stringOf(entry.timestamp) ?? "");
-            if (Number.isFinite(ts) && ts < sinceMs)
+            if (!Number.isFinite(ts) || ts < sinceMs)
                 continue;
         }
         if (isClaudeCompactionEntry(entry))
@@ -114,6 +116,27 @@ export function parseClaudeCodeInvocations(content, sinceMs) {
 }
 /** Parse ONE Codex rollout's tool/skill/subagent invocations. */
 export function parseCodexInvocations(content, sinceMs) {
+    const collector = createCodexInvocationCollector(sinceMs);
+    for (const line of content.split("\n")) {
+        if (!line.trim())
+            continue;
+        let entry;
+        try {
+            entry = JSON.parse(line);
+        }
+        catch {
+            continue;
+        }
+        if (isRecord(entry))
+            collector.consume(entry);
+    }
+    return collector.finish();
+}
+/**
+ * Stateful Codex invocation parser used to share localAgentLogs' JSONL pass.
+ * One collector is created per rollout file and discarded after `finish()`.
+ */
+export function createCodexInvocationCollector(sinceMs) {
     const counts = new Map();
     const mcpTools = new Set();
     const skills = new Set();
@@ -122,35 +145,70 @@ export function parseCodexInvocations(content, sinceMs) {
     const fileReads = new Map();
     let assistantTurns = 0;
     let sessionId;
+    let rootSessionMetaSeen = false;
+    let rootStartedAtMs;
+    let rootTaskStarted = false;
     let lastActivityAt;
     let compactionEvents = 0;
-    for (const line of content.split("\n")) {
-        if (!line.trim())
-            continue;
-        let entry;
-        try {
-            entry = JSON.parse(line);
+    let isSubagent = false;
+    let parentSessionId;
+    const nestedSessions = new Map();
+    const resetObservedEvidence = () => {
+        counts.clear();
+        mcpTools.clear();
+        skills.clear();
+        subagents.clear();
+        commands.clear();
+        fileReads.clear();
+        assistantTurns = 0;
+        compactionEvents = 0;
+    };
+    const consume = (entry) => {
+        const payload = isRecord(entry.payload) ? entry.payload : undefined;
+        if (entry.type === "session_meta" && payload) {
+            const metadata = codexSessionMetadata(payload);
+            if (!rootSessionMetaSeen) {
+                // Forked rollouts can contain a complete parent history after the
+                // first line. Bind this file to its first/root metadata exactly once.
+                rootSessionMetaSeen = true;
+                sessionId = metadata.sessionId;
+                isSubagent = metadata.isSubagent;
+                parentSessionId = metadata.parentSessionId;
+                rootStartedAtMs = timestampMilliseconds(payload.timestamp ?? entry.timestamp);
+            }
+            else if (metadata.sessionId !== sessionId ||
+                metadata.parentSessionId !== parentSessionId ||
+                metadata.isSubagent !== isSubagent) {
+                const key = [
+                    metadata.sessionId ?? "",
+                    metadata.parentSessionId ?? "",
+                    metadata.isSubagent ? "subagent" : "session"
+                ].join("\u0000");
+                nestedSessions.set(key, metadata);
+            }
         }
-        catch {
-            continue;
+        if (isSubagent &&
+            !rootTaskStarted &&
+            payload?.type === "task_started" &&
+            isRootSpecificTaskStart(payload.started_at, rootStartedAtMs)) {
+            // Everything before this boundary is inherited parent history copied
+            // into the fork. It is useful nested provenance, but it is not evidence
+            // that the child invoked those tools or incurred those compactions.
+            rootTaskStarted = true;
+            resetObservedEvidence();
+            lastActivityAt = stringOf(entry.timestamp) ?? lastActivityAt;
         }
-        if (!isRecord(entry))
-            continue;
         const timestampValue = stringOf(entry.timestamp);
         if (timestampValue && (!lastActivityAt || timestampValue > lastActivityAt)) {
             lastActivityAt = timestampValue;
         }
         if (typeof sinceMs === "number") {
             const timestamp = Date.parse(stringOf(entry.timestamp) ?? "");
-            if (Number.isFinite(timestamp) && timestamp < sinceMs)
-                continue;
+            if (!Number.isFinite(timestamp) || timestamp < sinceMs)
+                return;
         }
-        const payload = isRecord(entry.payload) ? entry.payload : undefined;
         if (!payload)
-            continue;
-        if (entry.type === "session_meta") {
-            sessionId = stringOf(payload.id) ?? sessionId;
-        }
+            return;
         // Codex writes both a top-level `compacted` entry and a separate
         // `context_compacted` event for one compaction. Count only the former.
         if (entry.type === "compacted")
@@ -158,7 +216,7 @@ export function parseCodexInvocations(content, sinceMs) {
         // Codex emits one turn_context per model turn.
         if (entry.type === "turn_context") {
             assistantTurns += 1;
-            continue;
+            return;
         }
         if (payload.type === "message" && payload.role === "user") {
             for (const text of codexTextValues(payload.content)) {
@@ -166,14 +224,14 @@ export function parseCodexInvocations(content, sinceMs) {
                 if (command)
                     commands.add(command);
             }
-            continue;
+            return;
         }
         if (payload.type !== "function_call" && payload.type !== "custom_tool_call") {
-            continue;
+            return;
         }
         const name = stringOf(payload.name);
         if (!name)
-            continue;
+            return;
         counts.set(name, (counts.get(name) ?? 0) + 1);
         const input = codexToolInput(payload);
         if (name.startsWith("mcp__")) {
@@ -194,25 +252,35 @@ export function parseCodexInvocations(content, sinceMs) {
         const file = input && explicitReadFile(name, input);
         if (file)
             fileReads.set(file, (fileReads.get(file) ?? 0) + 1);
-    }
-    return {
-        invocations: [...counts.entries()]
-            .map(([name, count]) => ({ name, count }))
-            .sort((left, right) => right.count - left.count || left.name.localeCompare(right.name)),
-        invokedMcpTools: [...mcpTools].sort(),
-        invokedSkills: [...skills].sort(),
-        invokedSubagents: [...subagents].sort(),
-        invokedCommands: [...commands].sort(),
-        assistantTurns,
-        contextSignal: buildSessionContextSignal({
-            agent: "codex",
-            sessionId,
-            lastActivityAt,
-            compactionEvents,
-            fileReads,
-            isSubagent: false
-        })
     };
+    const finish = () => {
+        // Without a recognized root task boundary, an older-format child file is
+        // indistinguishable from copied parent history. Preserve nested metadata,
+        // but do not manufacture child invocation/turn coverage from it.
+        if (isSubagent && !rootTaskStarted)
+            resetObservedEvidence();
+        return {
+            invocations: [...counts.entries()]
+                .map(([name, count]) => ({ name, count }))
+                .sort((left, right) => right.count - left.count || left.name.localeCompare(right.name)),
+            invokedMcpTools: [...mcpTools].sort(),
+            invokedSkills: [...skills].sort(),
+            invokedSubagents: [...subagents].sort(),
+            invokedCommands: [...commands].sort(),
+            assistantTurns,
+            contextSignal: buildSessionContextSignal({
+                agent: "codex",
+                sessionId,
+                lastActivityAt,
+                compactionEvents,
+                fileReads,
+                isSubagent,
+                parentSessionId,
+                nestedSessions: [...nestedSessions.values()]
+            })
+        };
+    };
+    return { consume, finish };
 }
 /** Scan this machine's Claude Code + Codex transcripts and aggregate invocations. */
 export async function loadToolInvocations(options = {}) {
@@ -227,6 +295,10 @@ export async function loadToolInvocations(options = {}) {
     const commands = new Set();
     const sessionTurnCounts = [];
     const sessionSignals = [];
+    const hostEvidence = {
+        "claude-code": createHostInvocationAccumulator(),
+        codex: createHostInvocationAccumulator()
+    };
     let sessions = 0;
     let claudeCodeSessions = 0;
     let codexSessions = 0;
@@ -234,11 +306,18 @@ export async function loadToolInvocations(options = {}) {
         const content = await readFile(file, "utf8").catch(() => "");
         if (!content)
             continue;
+        const parsed = parseClaudeCodeInvocations(content, sinceMs);
+        // A transcript file is not coverage for the selected window merely
+        // because it exists on disk. Without an in-window assistant turn there
+        // was no opportunity to observe an invocation, so counting the file would
+        // manufacture configured-without-invocation findings from stale history.
+        if (parsed.assistantTurns === 0)
+            continue;
         sessions += 1;
         claudeCodeSessions += 1;
-        const parsed = parseClaudeCodeInvocations(content, sinceMs);
         sessionTurnCounts.push(parsed.assistantTurns);
         sessionSignals.push(parsed.contextSignal);
+        addHostInvocationEvidence(hostEvidence["claude-code"], parsed);
         for (const { name, count } of parsed.invocations) {
             counts.set(name, (counts.get(name) ?? 0) + count);
         }
@@ -251,17 +330,26 @@ export async function loadToolInvocations(options = {}) {
         for (const c of parsed.invokedCommands)
             commands.add(c);
     }
-    for (const file of await listJsonlFiles(codexDir)) {
-        if (!file.split(/[\\/]/).pop()?.startsWith("rollout-"))
-            continue;
-        const content = await readFile(file, "utf8").catch(() => "");
-        if (!content)
+    const codexInvocationFiles = options.codexInvocationFiles ?? await (async () => {
+        const parsedFiles = [];
+        for (const file of await listJsonlFiles(codexDir)) {
+            if (!file.split(/[\\/]/).pop()?.startsWith("rollout-"))
+                continue;
+            const content = await readFile(file, "utf8").catch(() => "");
+            if (!content)
+                continue;
+            parsedFiles.push(parseCodexInvocations(content, sinceMs));
+        }
+        return parsedFiles;
+    })();
+    for (const parsed of codexInvocationFiles) {
+        if (parsed.assistantTurns === 0)
             continue;
         sessions += 1;
         codexSessions += 1;
-        const parsed = parseCodexInvocations(content, sinceMs);
         sessionTurnCounts.push(parsed.assistantTurns);
         sessionSignals.push(parsed.contextSignal);
+        addHostInvocationEvidence(hostEvidence.codex, parsed);
         for (const { name, count } of parsed.invocations) {
             counts.set(name, (counts.get(name) ?? 0) + count);
         }
@@ -290,9 +378,40 @@ export async function loadToolInvocations(options = {}) {
             claudeCode: claudeCodeSessions,
             codex: codexSessions
         },
+        byHost: {
+            "claude-code": finishHostInvocationEvidence(hostEvidence["claude-code"]),
+            codex: finishHostInvocationEvidence(hostEvidence.codex)
+        },
         sessionSignals
     };
 }
+function createHostInvocationAccumulator() {
+    return {
+        sessionTurnCounts: [],
+        mcpTools: new Set(),
+        skills: new Set(),
+        subagents: new Set(),
+        commands: new Set()
+    };
+}
+function addHostInvocationEvidence(accumulator, parsed) {
+    accumulator.sessionTurnCounts.push(parsed.assistantTurns);
+    parsed.invokedMcpTools.forEach((value) => accumulator.mcpTools.add(value));
+    parsed.invokedSkills.forEach((value) => accumulator.skills.add(value));
+    parsed.invokedSubagents.forEach((value) => accumulator.subagents.add(value));
+    parsed.invokedCommands.forEach((value) => accumulator.commands.add(value));
+}
+function finishHostInvocationEvidence(accumulator) {
+    return {
+        sessions: accumulator.sessionTurnCounts.length,
+        totalAssistantTurns: accumulator.sessionTurnCounts.reduce((sum, count) => sum + count, 0),
+        sessionTurnCounts: accumulator.sessionTurnCounts,
+        invokedMcpTools: [...accumulator.mcpTools].sort(),
+        invokedSkills: [...accumulator.skills].sort(),
+        invokedSubagents: [...accumulator.subagents].sort(),
+        invokedCommands: [...accumulator.commands].sort()
+    };
+}
 /** Extract "/foo" slash-command names from a user entry's content. */
 function slashCommandsFrom(entry) {
     const message = isRecord(entry.message) ? entry.message : undefined;
@@ -417,9 +536,42 @@ function buildSessionContextSignal(input) {
         repeatedFileReads: fileReads.filter((file) => file.count > 1),
         isSubagent: input.isSubagent,
         ...(input.parentSessionId ? { parentSessionId: input.parentSessionId } : {}),
+        ...(input.nestedSessions && input.nestedSessions.length > 0
+            ? { nestedSessions: input.nestedSessions }
+            : {}),
         readCoverage: "explicit_read_tools_only"
     };
 }
+function codexSessionMetadata(payload) {
+    return {
+        ...(stringOf(payload.id) ? { sessionId: stringOf(payload.id) } : {}),
+        isSubagent: stringOf(payload.thread_source) === "subagent" ||
+            isRecord(payload.source) && "subagent" in payload.source,
+        ...(stringOf(payload.parent_thread_id)
+            ? { parentSessionId: stringOf(payload.parent_thread_id) }
+            : {})
+    };
+}
+const ROOT_TASK_CLOCK_TOLERANCE_MS = 5_000;
+function isRootSpecificTaskStart(value, rootStartedAtMs) {
+    const taskStartedAtMs = timestampMilliseconds(value);
+    return typeof rootStartedAtMs === "number" &&
+        typeof taskStartedAtMs === "number" &&
+        taskStartedAtMs >= rootStartedAtMs - ROOT_TASK_CLOCK_TOLERANCE_MS;
+}
+function timestampMilliseconds(value) {
+    if (typeof value === "number" && Number.isFinite(value)) {
+        return value < 1_000_000_000_000 ? value * 1_000 : value;
+    }
+    if (typeof value !== "string" || value.length === 0)
+        return undefined;
+    const numeric = Number(value);
+    if (Number.isFinite(numeric)) {
+        return numeric < 1_000_000_000_000 ? numeric * 1_000 : numeric;
+    }
+    const parsed = Date.parse(value);
+    return Number.isFinite(parsed) ? parsed : undefined;
+}
 function isRecord(value) {
     return typeof value === "object" && value !== null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agent-finops/core",
-  "version": "0.5.8",
+  "version": "0.6.0",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",

package/samples/anthropic-usage.csv

@@ -1,4 +1,4 @@
-id,timestamp,source_id,source_name,provider,source_confidence,observed_from,model,input_tokens,output_tokens,amount_usd,cost_confidence,client_id,project_id,agent_id,user_id,workspace_id,api_key_id,operation
-ant-001,2026-05-17T16:00:00.000Z,anthropic-sample,Anthropic sample export,anthropic,detected_unverified,sample_csv,claude-fable-5,90000,9000,8.00,detected_unverified,client-acme,project-support,agent-drafter,user-ops-lead,workspace-acme,anthropic-key-support,reply_draft
-ant-002,2026-05-18T12:20:00.000Z,anthropic-sample,Anthropic sample export,anthropic,detected_unverified,sample_csv,claude-haiku-4-5,42000,5000,5.50,detected_unverified,client-acme,project-support,agent-drafter,user-support-rep,workspace-acme,anthropic-key-support,reply_draft
-ant-003,2026-05-19T17:05:00.000Z,anthropic-sample,Anthropic sample export,anthropic,detected_unverified,sample_csv,claude-fable-5,140000,16000,16.90,detected_unverified,client-beta,project-research,agent-analyst,user-research-lead,workspace-beta,anthropic-key-research,research_summary
+id,timestamp,source_id,source_name,provider,source_confidence,observed_from,model,input_tokens,output_tokens,amount_usd,cost_confidence,client_id,project_id,agent_id,user_id,workspace_id,api_key_id,provider_cost_type,operation,usage_granularity,stable_input_fingerprint,batch_eligible,downgrade_safe
+ant-001,2026-05-17T16:00:00.000Z,anthropic-sample,Anthropic sample export,anthropic,detected_unverified,sample_csv,claude-fable-5,90000,9000,8.00,detected_unverified,client-acme,project-support,agent-drafter,user-ops-lead,workspace-acme,anthropic-key-support,sample_call,reply_draft,call,,false,true
+ant-002,2026-05-18T12:20:00.000Z,anthropic-sample,Anthropic sample export,anthropic,detected_unverified,sample_csv,claude-haiku-4-5,42000,5000,5.50,detected_unverified,client-acme,project-support,agent-drafter,user-support-rep,workspace-acme,anthropic-key-support,sample_call,reply_draft,call,,false,true
+ant-003,2026-05-19T17:05:00.000Z,anthropic-sample,Anthropic sample export,anthropic,detected_unverified,sample_csv,claude-fable-5,140000,16000,16.90,detected_unverified,client-beta,project-research,agent-analyst,user-research-lead,workspace-beta,anthropic-key-research,sample_call,research_summary,call,research-summary-anthropic-v1,true,true

package/samples/openai-usage.csv

@@ -1,7 +1,7 @@
-id,timestamp,source_id,source_name,provider,source_confidence,observed_from,model,input_tokens,output_tokens,amount_usd,cost_confidence,client_id,project_id,agent_id,user_id,workspace_id,api_key_id,operation
-oai-001,2026-05-17T10:00:00.000Z,openai-sample,OpenAI sample export,openai,estimated,sample_csv,gpt-5.5,60000,7000,4.80,estimated,client-acme,project-support,agent-triage,user-ops-lead,workspace-acme,key-support,ticket_triage
-oai-002,2026-05-17T13:30:00.000Z,openai-sample,OpenAI sample export,openai,estimated,sample_csv,gpt-5.5-mini,32000,5000,2.70,estimated,client-acme,project-support,agent-triage,user-support-rep,workspace-acme,key-support,ticket_triage
-oai-003,2026-05-18T09:10:00.000Z,openai-sample,OpenAI sample export,openai,verified,sample_csv,gpt-5.5,70000,8500,6.10,verified,client-beta,project-research,agent-analyst,user-research-lead,workspace-beta,key-research,research_summary
-oai-004,2026-05-18T15:45:00.000Z,openai-sample,OpenAI sample export,openai,verified,sample_csv,gpt-5.5-mini,24000,4200,2.00,verified,client-acme,project-support,agent-triage,user-support-rep,workspace-acme,key-support,ticket_triage
-oai-005,2026-05-19T11:15:00.000Z,openai-sample,OpenAI sample export,openai,estimated,sample_csv,gpt-5.5,180000,14000,22.40,estimated,client-beta,project-research,agent-analyst,user-research-lead,workspace-beta,key-research,research_summary
-oai-006,2026-05-19T14:40:00.000Z,openai-sample,OpenAI sample export,openai,estimated,sample_csv,gpt-5.5,160000,12000,18.60,estimated,client-beta,project-research,agent-analyst,user-research-lead,workspace-beta,key-research,research_summary
+id,timestamp,source_id,source_name,provider,source_confidence,observed_from,model,input_tokens,output_tokens,amount_usd,cost_confidence,client_id,project_id,agent_id,user_id,workspace_id,api_key_id,provider_cost_type,operation,usage_granularity,stable_input_fingerprint,batch_eligible,downgrade_safe
+oai-001,2026-05-17T10:00:00.000Z,openai-sample,OpenAI sample export,openai,estimated,sample_csv,gpt-5.5,60000,7000,4.80,estimated,client-acme,project-support,agent-triage,user-ops-lead,workspace-acme,key-support,sample_call,ticket_triage,call,,false,true
+oai-002,2026-05-17T13:30:00.000Z,openai-sample,OpenAI sample export,openai,estimated,sample_csv,gpt-5.5-mini,32000,5000,2.70,estimated,client-acme,project-support,agent-triage,user-support-rep,workspace-acme,key-support,sample_call,ticket_triage,call,,false,true
+oai-003,2026-05-18T09:10:00.000Z,openai-sample,OpenAI sample export,openai,estimated,sample_csv,gpt-5.5,70000,8500,6.10,estimated,client-beta,project-research,agent-analyst,user-research-lead,workspace-beta,key-research,sample_call,research_summary,call,research-summary-v1,true,true
+oai-004,2026-05-18T15:45:00.000Z,openai-sample,OpenAI sample export,openai,estimated,sample_csv,gpt-5.5-mini,24000,4200,2.00,estimated,client-acme,project-support,agent-triage,user-support-rep,workspace-acme,key-support,sample_call,ticket_triage,call,,false,true
+oai-005,2026-05-19T11:15:00.000Z,openai-sample,OpenAI sample export,openai,estimated,sample_csv,gpt-5.5,180000,14000,22.40,estimated,client-beta,project-research,agent-analyst,user-research-lead,workspace-beta,key-research,sample_call,research_summary,call,research-summary-v1,true,true
+oai-006,2026-05-19T14:40:00.000Z,openai-sample,OpenAI sample export,openai,estimated,sample_csv,gpt-5.5,160000,12000,18.60,estimated,client-beta,project-research,agent-analyst,user-research-lead,workspace-beta,key-research,sample_call,research_summary,call,research-summary-v1,true,true