@deksden-com/dd-flow-cli 0.9.0-beta.1 → 0.9.0-beta.100

package/dist/services/usage.js

@@ -3,6 +3,9 @@ import fs from "node:fs";
 import { parseJsonObject } from "../shared/json.js";
 import { resolveProjectRoot } from "../storage/paths.js";
 import { registerProject, requireProjectByRoot } from "./projects.js";
+import { publicSessionIdentity } from "./session-identity.js";
+import { runObservations } from "./run-observations.js";
+import { ToolObservations, codexToolObservation } from "../harness-runtime/lib/tool-observations.mjs";
 export function ingestZcodeUsage(context, input) {
     return ingestHarnessUsage(context, input, { harness: "zcode-acp", label: "ZCode", idPrefix: "ZUSG", sourceKind: "zcode_session_usage_v1" });
 }
@@ -18,6 +21,14 @@ export function ingestOpenCodeUsage(context, input) {
 export function ingestAgyUsage(context, input) {
     return ingestHarnessUsage(context, input, { harness: "antigravity-cli", label: "Antigravity", idPrefix: "AUSG", sourceKind: "antigravity_cli_session_usage_v1" });
 }
+/** Droid counters must describe one physical Session; inclusive roots double-count children. */
+export function ingestDroidUsage(context, input) {
+    const payload = parseJsonObject(input.stdin || "{}", "Droid usage snapshot");
+    if (payload.usage_scope !== "physical_session" || !["complete", "partial"].includes(String(payload.completeness))) {
+        throw new Error("Droid usage requires physical_session scope and complete or partial completeness");
+    }
+    return ingestHarnessUsage(context, input, { harness: "droid-cli", label: "Droid", idPrefix: "DUSG", sourceKind: "droid_session_usage_v1" });
+}
 function ingestHarnessUsage(context, input, harness) {
     const payload = parseJsonObject(input.stdin || "{}", `${harness.label} usage snapshot`);
     const usage = object(payload.usage);
@@ -55,11 +66,11 @@ function ingestHarnessUsage(context, input, harness) {
         values.input, values.cacheRead, values.cacheWrite, values.output, values.reasoning, values.requests, values.errors,
         values.toolCalls, values.toolFailures, values.toolByName ? JSON.stringify(values.toolByName) : null, harness.sourceKind,
         stringValue(payload.usage_scope) ?? "physical_session", stringValue(payload.completeness) ?? "complete", context.now()]);
-    return { ok: true, observed: inserted.changes === 1, duplicate: inserted.changes === 0, snapshot_id: id, provider_session_id: providerSessionId, harness: harness.harness };
+    return { ok: true, observed: inserted.changes === 1, duplicate: inserted.changes === 0, snapshot_id: id, session: publicSessionIdentity({ harness: harness.harness, provider_session_id: providerSessionId, session_id: providerSessionId }) };
 }
 export function checkpointSessionUsage(context, session, input) {
     const observedAt = context.now();
-    const result = readCodexTranscript(session.transcript_path, session.session_id);
+    const result = readCodexTranscript(session.transcript_path, nativeSessionId(session));
     const source = sourceFacts(session.transcript_path);
     const snapshot = {
         id: `USG-${crypto.randomUUID()}`,
@@ -114,7 +125,7 @@ export function checkpointSessionUsage(context, session, input) {
     return snapshotForOutput(snapshot);
 }
 export function checkpointRunUsage(context, input) {
-    const sessions = context.db.all(`SELECT session_id, project_id, run_id, transcript_path, parent_session_id, role, aspect_id, plan_item_id, session_kind
+    const sessions = context.db.all(`SELECT session_id, project_id, run_id, transcript_path, provider_session_id, parent_session_id, role, aspect_id, plan_item_id, session_kind
      FROM sessions WHERE project_id = ? AND run_id = ?`, [input.projectId, input.runId]);
     return sessions.map((session) => checkpointSessionUsage(context, session, input));
 }
@@ -136,7 +147,7 @@ export function recalculateRunUsage(context, input) {
     // after `work finish` but before the agent's actual terminal event.
     const accountingAt = observedAt;
     const links = context.db.all(`SELECT ws.id, ws.work_id, ws.session_id, ws.created_at, ws.completed_at,
-            w.project_id, s.harness, s.transcript_path, s.parent_session_id, s.agent_id, s.provider_session_id
+            w.project_id, s.harness, s.transcript_path, s.parent_session_id, s.provider_parent_session_id, s.agent_id, s.provider_session_id
        FROM work_sessions ws
        JOIN works w ON w.work_id = ws.work_id
        LEFT JOIN sessions s ON s.project_id = w.project_id AND s.session_id = ws.session_id
@@ -154,32 +165,38 @@ export function recalculateRunUsage(context, input) {
     const settledSessions = settledRunSessions(context, links, observedAt);
     const unsettledSessions = [...new Set(links.map((link) => link.session_id))].filter((sessionId) => !settledSessions.some((session) => session.session_id === sessionId));
     const usageFinal = final && unsettledSessions.length === 0;
-    context.db.exec("BEGIN IMMEDIATE");
-    try {
-        context.db.run("DELETE FROM usage WHERE project_id = ? AND run_id = ?", [input.projectId, input.runId]);
-        for (const row of rows) {
-            context.db.run(`INSERT INTO usage (id, project_id, run_id, session_id, checkpoint, stage, stage_attempt, observed_at, total_tokens, input_tokens, cached_input_tokens, cache_read_input_tokens, cache_write_input_tokens, uncached_input_tokens, output_tokens, reasoning_output_tokens, source_kind, source_locator, source_sha256, source_size_bytes, source_mtime_ms, token_event_at, turn_id, turn_attribution, parser_version, extraction_status, diagnostic_code, created_at)
+    const persistRunProjection = !input.sessionId && !input.stage;
+    if (persistRunProjection) {
+        context.db.exec("SAVEPOINT run_usage");
+        try {
+            context.db.run("DELETE FROM usage WHERE project_id = ? AND run_id = ?", [input.projectId, input.runId]);
+            for (const row of rows) {
+                context.db.run(`INSERT INTO usage (id, project_id, run_id, session_id, checkpoint, stage, stage_attempt, observed_at, total_tokens, input_tokens, cached_input_tokens, cache_read_input_tokens, cache_write_input_tokens, uncached_input_tokens, output_tokens, reasoning_output_tokens, source_kind, source_locator, source_sha256, source_size_bytes, source_mtime_ms, token_event_at, turn_id, turn_attribution, parser_version, extraction_status, diagnostic_code, created_at)
          VALUES (?, ?, ?, ?, ?, ?, NULL, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, NULL, NULL, 'windowed_work_session', 1, ?, ?, ?)`, [
-                `USG-${crypto.randomUUID()}`, input.projectId, input.runId, row.session_id, usageFinal ? "final" : "provisional", input.stage?.name ?? null, row.observed_at,
-                row.tokens?.total_tokens ?? null, row.tokens?.input_tokens ?? null, row.tokens?.cache_read_input_tokens ?? null,
-                row.tokens?.cache_read_input_tokens ?? null, row.tokens?.cache_write_input_tokens ?? null, row.tokens?.uncached_input_tokens ?? null,
-                row.tokens?.output_tokens ?? null, row.tokens?.reasoning_output_tokens ?? null, row.source_kind, row.source.locator, row.source.sha256, row.source.size, row.source.mtime,
-                row.status, row.diagnostic, observedAt
-            ]);
-        }
-        for (const session of settledSessions) {
-            context.db.run(`UPDATE sessions
+                    `USG-${crypto.randomUUID()}`, input.projectId, input.runId, row.session_id, usageFinal ? "final" : "provisional", input.stage?.name ?? null, row.observed_at,
+                    row.tokens?.total_tokens ?? null, row.tokens?.input_tokens ?? null, row.tokens?.cache_read_input_tokens ?? null,
+                    row.tokens?.cache_read_input_tokens ?? null, row.tokens?.cache_write_input_tokens ?? null, row.tokens?.uncached_input_tokens ?? null,
+                    row.tokens?.output_tokens ?? null, row.tokens?.reasoning_output_tokens ?? null, row.source_kind, row.source.locator, row.source.sha256, row.source.size, row.source.mtime,
+                    row.status, row.diagnostic, observedAt
+                ]);
+            }
+            for (const session of settledSessions) {
+                context.db.run(`UPDATE sessions
             SET status = 'stopped', stop_reason = 'provider_turn_complete', updated_at = ?, stopped_at = ?
           WHERE project_id = ? AND run_id = ? AND session_id = ?
             AND status = 'idle'
             AND NOT EXISTS (SELECT 1 FROM work_sessions WHERE session_id = ? AND status = 'running')`, [observedAt, session.completed_at, input.projectId, input.runId, session.session_id, session.session_id]);
+            }
+            context.db.exec("RELEASE run_usage");
+        }
+        catch (error) {
+            context.db.exec("ROLLBACK TO run_usage");
+            context.db.exec("RELEASE run_usage");
+            throw error;
         }
-        context.db.exec("COMMIT");
-    }
-    catch (error) {
-        context.db.exec("ROLLBACK");
-        throw error;
     }
+    const observations = persistRunProjection ? runObservations(context, input.projectId, input.runId) : null;
+    const legacyTools = toolCallsForLinks(context, links, accountingAt);
     return {
         ok: true,
         schema_id: "dd-flow/run-usage@2",
@@ -187,16 +204,29 @@ export function recalculateRunUsage(context, input) {
         status: usageFinal ? "final" : "provisional",
         scope: input.stage ? { kind: "stage", stage: input.stage.name, started_at: input.stage.startedAt, completed_at: input.stage.completedAt } : { kind: "run" },
         observed_at: observedAt,
+        persisted: persistRunProjection,
         totals: outputUsageTotals(totals),
-        sessions: rows,
+        sessions: publicUsageRows(context, input.projectId, rows),
         session_reconciliation: {
-            stopped: settledSessions.map((session) => session.session_id),
-            unsettled: unsettledSessions
+            stopped: publicSessionIdentities(context, input.projectId, settledSessions.map((session) => session.session_id)),
+            unsettled: publicSessionIdentities(context, input.projectId, unsettledSessions)
         },
-        tool_calls: toolCallsForLinks(context, links, accountingAt),
+        tool_calls: observations?.tools.observed_sessions ? observations.tools : legacyTools,
+        ...(observations ? { observations, legacy_tool_calls: legacyTools } : {}),
         coverage: rows.reduce((coverage, row) => ({ ...coverage, [row.status]: (coverage[row.status] ?? 0) + 1 }), {})
     };
 }
+function publicUsageRows(context, projectId, rows) {
+    const identityFor = (storageId) => {
+        const row = context.db.get("SELECT harness, provider_session_id FROM sessions WHERE project_id = ? AND session_id = ?", [projectId, storageId]);
+        return row ? publicSessionIdentity({ harness: row.harness, provider_session_id: row.provider_session_id, session_id: storageId }) : null;
+    };
+    return rows.map(({ session_id, provider_session_id: _providerSessionId, parent_session_id, ...row }) => ({
+        ...row,
+        session: identityFor(session_id),
+        ...(parent_session_id ? { parent_session: identityFor(parent_session_id) } : {})
+    }));
+}
 function overlapsStage(link, stage, observedAt) {
     const linkStart = Date.parse(link.created_at);
     const linkEnd = Date.parse(link.completed_at ?? observedAt);
@@ -212,8 +242,20 @@ function clipToStage(link, stage, observedAt) {
     const completedAt = Date.parse(naturalEnd) > Date.parse(stageEnd) ? stageEnd : naturalEnd;
     return { ...link, created_at: startedAt, completed_at: completedAt };
 }
+function nativeSessionId(session) {
+    return session.provider_session_id ?? session.session_id;
+}
+function publicSessionIdentities(context, projectId, storageIds) {
+    if (storageIds.length === 0)
+        return [];
+    const marks = storageIds.map(() => "?").join(", ");
+    const rows = context.db.all(`SELECT session_id, harness, provider_session_id FROM sessions WHERE project_id = ? AND session_id IN (${marks})`, [projectId, ...storageIds]);
+    const byStorage = new Map(rows.map((row) => [row.session_id, publicSessionIdentity(row)]));
+    return storageIds.flatMap((id) => byStorage.get(id) ?? []);
+}
 function toolCallsForLinks(context, links, observedAt) {
     const result = { status: "unavailable", total: 0, failures: 0, by_tool: {}, observed_sessions: 0, unavailable_sessions: [] };
+    let incomplete = false;
     const sessions = new Map();
     for (const link of links)
         sessions.set(link.session_id, [...(sessions.get(link.session_id) ?? []), link]);
@@ -221,23 +263,25 @@ function toolCallsForLinks(context, links, observedAt) {
         const first = windows[0];
         const parsed = isExternalHarness(first.harness)
             ? readHarnessToolCallsWindow(context, first.harness, first.project_id, first.provider_session_id, windows.map((item) => item.created_at).sort()[0], windows.map((item) => item.completed_at ?? observedAt).sort().at(-1), observedAt)
-            : readToolCallsForWindows(first.transcript_path, sessionId, windows, observedAt);
+            : readToolCallsForWindows(first.transcript_path, nativeSessionId(first), windows, observedAt);
         if (!parsed) {
             result.unavailable_sessions.push(sessionId);
             continue;
         }
+        if ("completeness" in parsed && parsed.completeness !== "complete")
+            incomplete = true;
         result.observed_sessions += 1;
         result.total += parsed.total;
         result.failures += parsed.failures;
         for (const [name, count] of Object.entries(parsed.by_tool))
             result.by_tool[name] = (result.by_tool[name] ?? 0) + count;
     }
-    result.status = result.observed_sessions === 0 ? "unavailable" : result.unavailable_sessions.length ? "partial" : "measured";
+    result.status = result.observed_sessions === 0 ? "unavailable" : result.unavailable_sessions.length || incomplete ? "partial" : "measured";
     return result;
 }
-function isExternalHarness(harness) { return harness === "zcode-acp" || harness === "grok-acp" || harness === "opencode-server" || harness === "antigravity-cli"; }
+function isExternalHarness(harness) { return harness === "droid-cli" || harness === "zcode-acp" || harness === "grok-acp" || harness === "opencode-server" || harness === "antigravity-cli"; }
 function harnessSourceKind(harness) {
-    return harness === "grok-acp" ? "grok_session_usage_v1" : harness === "zcode-acp" ? "zcode_session_usage_v1" : harness === "antigravity-cli" ? "antigravity_cli_session_usage_v1" : "opencode_session_usage_v1";
+    return harness === "droid-cli" ? "droid_session_usage_v1" : harness === "grok-acp" ? "grok_session_usage_v1" : harness === "zcode-acp" ? "zcode_session_usage_v1" : harness === "antigravity-cli" ? "antigravity_cli_session_usage_v1" : "opencode_session_usage_v1";
 }
 function readHarnessToolCallsWindow(context, harness, projectId, providerSessionId, startedAt, endedAt, observedAt) {
     if (!providerSessionId)
@@ -275,9 +319,7 @@ function readToolCallsForWindows(transcriptPath, expectedSessionId, windows, obs
         return null;
     try {
         let sessionId;
-        let total = 0;
-        let failures = 0;
-        const byTool = {};
+        const tools = new ToolObservations();
         for (const line of fs.readFileSync(transcriptPath, "utf8").split(/\r?\n/)) {
             if (!line.trim())
                 continue;
@@ -286,6 +328,7 @@ function readToolCallsForWindows(transcriptPath, expectedSessionId, windows, obs
                 event = JSON.parse(line);
             }
             catch {
+                tools.gaps.add("journal_invalid_record");
                 continue;
             }
             const payload = object(event.payload);
@@ -294,20 +337,13 @@ function readToolCallsForWindows(transcriptPath, expectedSessionId, windows, obs
             if (event.type !== "response_item" || !payload)
                 continue;
             const eventAt = stringValue(event.timestamp);
-            if (eventAt && !windows.some((window) => eventInsideWindow(eventAt, window, observedAt)))
+            if (eventAt && windows.length && !windows.some((window) => eventInsideWindow(eventAt, window, observedAt)))
                 continue;
-            const type = stringValue(payload.type);
-            if (type === "function_call" || type === "custom_tool_call") {
-                const name = stringValue(payload.name) ?? "unknown";
-                byTool[name] = (byTool[name] ?? 0) + 1;
-                total += 1;
-            }
-            if ((type === "function_call_output" || type === "custom_tool_call_output") && outputIndicatesFailure(payload))
-                failures += 1;
+            tools.add(codexToolObservation(event, expectedSessionId));
         }
         if (sessionId && sessionId !== expectedSessionId)
             return null;
-        return { total, failures, by_tool: Object.fromEntries(Object.entries(byTool).sort(([left], [right]) => left.localeCompare(right))) };
+        return tools.summary();
     }
     catch {
         return null;
@@ -319,37 +355,6 @@ function eventInsideWindow(eventAt, window, observedAt) {
     const end = Date.parse(window.completed_at ?? observedAt);
     return Number.isFinite(at) && (!Number.isFinite(start) || at >= start) && (!Number.isFinite(end) || at <= end);
 }
-function outputIndicatesFailure(payload) {
-    if (payload.error === true || typeof payload.error === "string")
-        return true;
-    return containsFailure(payload.output);
-}
-function containsFailure(value) {
-    if (Array.isArray(value))
-        return value.some(containsFailure);
-    if (typeof value === "string") {
-        if (/(?:^|\n)exit=(?:[1-9]\d*)\b|Process exited with code [1-9]\d*/.test(value))
-            return true;
-        const trimmed = value.trim();
-        if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
-            try {
-                return containsFailure(JSON.parse(trimmed));
-            }
-            catch {
-                return false;
-            }
-        }
-        return false;
-    }
-    const item = object(value);
-    if (!item)
-        return false;
-    if (item.ok === false || item.is_error === true || item.isError === true || item.error === true || typeof item.error === "string")
-        return true;
-    if (typeof item.exit_code === "number" && item.exit_code !== 0)
-        return true;
-    return Object.values(item).some(containsFailure);
-}
 /** RUN accounting belongs to the physical provider Session, not to every Work link. */
 function usageRowsForPhysicalSessions(context, links, observedAt, stage) {
     const sessions = new Map();
@@ -357,15 +362,15 @@ function usageRowsForPhysicalSessions(context, links, observedAt, stage) {
         sessions.set(link.session_id, [...(sessions.get(link.session_id) ?? []), link]);
     const physicalSessions = [...sessions.values()].filter((sessionLinks) => {
         const link = sessionLinks[0];
-        if (!link.parent_session_id)
+        if (!link.provider_parent_session_id)
             return true;
-        const parent = links.find((candidate) => candidate.session_id === link.parent_session_id);
+        const parent = links.find((candidate) => candidate.session_id === link.provider_parent_session_id);
         return !parent || !hasInclusiveUsageSnapshot(context, parent.project_id, parent.harness, parent.provider_session_id, observedAt);
     });
     return physicalSessions.map((sessionLinks) => {
         const link = sessionLinks[0];
         const startedAt = stage?.startedAt ?? sessionLinks.map((item) => item.created_at).sort()[0];
-        const completedTurn = stage ? null : completedProviderTurn(link.transcript_path, link.session_id);
+        const completedTurn = stage ? null : completedProviderTurn(link.transcript_path, nativeSessionId(link));
         const naturalEnd = isExternalHarness(link.harness)
             ? observedAt
             : completedTurn?.completed_at ?? sessionLinks.map((item) => item.completed_at ?? observedAt).sort().at(-1);
@@ -373,7 +378,7 @@ function usageRowsForPhysicalSessions(context, links, observedAt, stage) {
         const harnessUsage = isExternalHarness(link.harness)
             ? readHarnessUsageWindow(context, link.harness, link.project_id, link.provider_session_id, startedAt, endedAt, observedAt)
             : null;
-        const parsed = harnessUsage ?? readCodexTranscriptWindow(link.transcript_path, link.session_id, startedAt, endedAt);
+        const parsed = harnessUsage ?? readCodexTranscriptWindow(link.transcript_path, nativeSessionId(link), startedAt, endedAt);
         return {
             work_session_id: link.id,
             work_id: link.work_id,
@@ -398,7 +403,7 @@ function hasInclusiveUsageSnapshot(context, projectId, harness, providerSessionI
 function readHarnessUsageWindow(context, harness, projectId, providerSessionId, startedAt, endedAt, observedAt) {
     if (!providerSessionId)
         return { status: "not_observable", diagnostic: "provider_session_id_missing" };
-    const snapshots = context.db.all(`SELECT observed_at, total_tokens, input_tokens, cache_read_input_tokens, cache_write_input_tokens, output_tokens, reasoning_output_tokens
+    const snapshots = context.db.all(`SELECT completeness, observed_at, total_tokens, input_tokens, cache_read_input_tokens, cache_write_input_tokens, output_tokens, reasoning_output_tokens
        FROM harness_usage_snapshots
       WHERE project_id = ? AND harness = ? AND provider_session_id = ? AND observed_at <= ?
       ORDER BY observed_at, id`, [projectId, harness, providerSessionId, observedAt]);
@@ -407,6 +412,8 @@ function readHarnessUsageWindow(context, harness, projectId, providerSessionId,
     const before = snapshots.filter((snapshot) => Date.parse(snapshot.observed_at) <= Date.parse(startedAt)).at(-1);
     if (!last || !before || last === before)
         return { status: "not_yet_emitted", diagnostic: `${harness}_usage_window_incomplete` };
+    if (harness === "droid-cli" && (last.completeness !== "complete" || before.completeness !== "complete"))
+        return { status: "not_observable", diagnostic: "droid-cli_usage_window_partial" };
     const delta = (value, baseline) => value === null || baseline === null ? null : Math.max(0, value - baseline);
     const input = delta(last.input_tokens, before.input_tokens);
     const cacheRead = delta(last.cache_read_input_tokens, before.cache_read_input_tokens);
@@ -437,15 +444,16 @@ function settledRunSessions(context, links, observedAt) {
             return [];
         const link = sessionLinks[0];
         const sessionStartedAt = sessionLinks.map((item) => item.created_at).sort()[0];
+        const workCompletedAt = sessionLinks.map((item) => item.completed_at).sort().at(-1);
         if (isExternalHarness(link.harness) && link.provider_session_id) {
             const snapshot = context.db.get(`SELECT observed_at FROM harness_usage_snapshots
           WHERE project_id = ? AND harness = ? AND provider_session_id = ?
             AND completeness = 'complete' AND observed_at >= ? AND observed_at <= ?
-          ORDER BY observed_at DESC, id DESC LIMIT 1`, [link.project_id, link.harness, link.provider_session_id, sessionStartedAt, observedAt]);
+          ORDER BY observed_at DESC, id DESC LIMIT 1`, [link.project_id, link.harness, link.provider_session_id, workCompletedAt, observedAt]);
             return snapshot ? [{ session_id: sessionId, completed_at: snapshot.observed_at }] : [];
         }
-        const completed = completedProviderTurn(sessionLinks[0].transcript_path, sessionId);
-        if (!completed || Date.parse(completed.completed_at) < Date.parse(sessionStartedAt))
+        const completed = completedProviderTurn(sessionLinks[0].transcript_path, nativeSessionId(sessionLinks[0]));
+        if (!completed || Date.parse(completed.completed_at) < Date.parse(workCompletedAt) || Date.parse(completed.completed_at) < Date.parse(sessionStartedAt))
             return [];
         return [{ session_id: sessionId, completed_at: completed.completed_at }];
     });
@@ -484,10 +492,10 @@ function completedProviderTurn(transcriptPath, expectedSessionId) {
     }
 }
 function usageReport(context, input, refresh) {
-    const sessions = context.db.all(`SELECT DISTINCT session_id, project_id, ? AS run_id, transcript_path, parent_session_id, role, aspect_id, plan_item_id, session_kind
+    const sessions = context.db.all(`SELECT DISTINCT session_id, project_id, ? AS run_id, transcript_path, harness, provider_session_id, parent_session_id, role, aspect_id, plan_item_id, session_kind
      FROM sessions WHERE project_id = ? AND run_id = ?
      UNION
-     SELECT DISTINCT f.session_id, f.project_id, ? AS run_id, f.transcript_path, f.parent_session_id, f.role, f.aspect_id, f.plan_item_id, f.session_kind
+     SELECT DISTINCT f.session_id, f.project_id, ? AS run_id, f.transcript_path, f.harness, f.provider_session_id, f.parent_session_id, f.role, f.aspect_id, f.plan_item_id, f.session_kind
      FROM flow_session_segments s JOIN sessions f ON f.project_id = s.project_id AND f.session_id = s.session_id
      WHERE s.project_id = ? AND s.run_id = ?`, [input.runId, input.projectId, input.runId, input.runId, input.projectId, input.runId]);
     const selectedSessions = input.sessionId ? sessions.filter((session) => session.session_id === input.sessionId) : sessions;
@@ -500,13 +508,15 @@ function usageReport(context, input, refresh) {
      LEFT JOIN sessions f ON f.project_id = s.project_id AND f.session_id = s.session_id
      WHERE s.project_id = ? AND s.run_id = ? ORDER BY s.session_id, s.observed_at, s.id`, [input.projectId, input.runId]);
     const selectedRows = input.sessionId ? rows.filter((row) => row.session_id === input.sessionId) : rows;
-    const deltas = usageDeltas(selectedRows);
+    const publicSessions = new Map(sessions.map((session) => [session.session_id, publicSessionIdentity({ harness: session.harness ?? "codex-desktop", provider_session_id: session.provider_session_id ?? null, session_id: session.session_id })]));
+    const rawDeltas = usageDeltas(selectedRows);
+    const deltas = rawDeltas.map(({ session_id, ...delta }) => ({ ...delta, session: publicSessions.get(session_id) ?? null }));
     const segments = context.db.all(`SELECT id, session_id, run_id, protocol_id, started_at, ended_at, cwd, tool_name
      FROM flow_session_segments WHERE project_id = ? AND run_id = ? ORDER BY started_at, id`, [input.projectId, input.runId]);
     const supported = new Set(["session", "role", "aspect", "plan-item", "stage", "protocol"]);
     const groupBy = supported.has(input.groupBy) ? input.groupBy : "session";
     const groups = new Map();
-    for (const delta of deltas) {
+    for (const delta of rawDeltas) {
         const key = groupKey(delta, groupBy);
         const group = groups.get(key) ?? { tokens: emptyUsage(), snapshots: 0, statuses: {}, transition_buckets: 0 };
         group.snapshots += 1;
@@ -523,7 +533,9 @@ function usageReport(context, input, refresh) {
         run_id: input.runId,
         source: { kind: "codex_transcript_v1", parser_version: 1, refreshed_sessions: refreshed.length, checkpoint_source: refresh ? "refreshed" : "stored" },
         sessions: selectedSessions.map((session) => ({
-            session_id: session.session_id, parent_session_id: session.parent_session_id ?? null, role: session.role ?? null,
+            session: publicSessionIdentity({ harness: session.harness ?? "codex-desktop", provider_session_id: session.provider_session_id ?? null, session_id: session.session_id }),
+            ...(session.parent_session_id ? { parent_session: publicSessions.get(session.parent_session_id) ?? null } : {}),
+            role: session.role ?? null,
             aspect_id: session.aspect_id ?? null, plan_item_id: session.plan_item_id ?? null, session_kind: session.session_kind ?? null
         })),
         groups: [...groups.entries()].map(([key, group]) => ({ key, ...group, tokens: outputUsageTotals(group.tokens) })),
@@ -531,7 +543,7 @@ function usageReport(context, input, refresh) {
         tool_calls: toolCallsForSessions(sessions),
         segments: segments.map((segment) => ({
             segment_id: segment.id,
-            session_id: segment.session_id,
+            session: publicSessions.get(segment.session_id) ?? null,
             run_id: segment.run_id,
             protocol_id: segment.protocol_id,
             started_at: segment.started_at,
@@ -543,67 +555,31 @@ function usageReport(context, input, refresh) {
 }
 function toolCallsForSessions(sessions) {
     const result = { status: "unavailable", total: 0, failures: 0, by_tool: {}, observed_sessions: 0, unavailable_sessions: [] };
+    let incomplete = false;
     for (const session of sessions) {
-        const parsed = readToolCalls(session.transcript_path, session.session_id);
+        const parsed = readToolCalls(session.transcript_path, nativeSessionId(session));
         if (!parsed) {
             result.unavailable_sessions.push(session.session_id);
             continue;
         }
+        if (parsed.completeness !== "complete")
+            incomplete = true;
         result.observed_sessions += 1;
         result.total += parsed.total;
         result.failures += parsed.failures;
         for (const [name, count] of Object.entries(parsed.by_tool))
             result.by_tool[name] = (result.by_tool[name] ?? 0) + count;
     }
-    result.status = result.observed_sessions === 0 ? "unavailable" : result.unavailable_sessions.length === 0 ? "measured" : "partial";
+    result.status = result.observed_sessions === 0 ? "unavailable" : result.unavailable_sessions.length || incomplete ? "partial" : "measured";
     return result;
 }
 function readToolCalls(transcriptPath, expectedSessionId) {
-    if (!transcriptPath || !fs.existsSync(transcriptPath))
-        return null;
-    try {
-        let sessionId;
-        const byTool = {};
-        let total = 0;
-        let failures = 0;
-        for (const line of fs.readFileSync(transcriptPath, "utf8").split(/\r?\n/)) {
-            if (!line.trim())
-                continue;
-            let event;
-            try {
-                event = JSON.parse(line);
-            }
-            catch {
-                continue;
-            }
-            const payload = object(event.payload);
-            if (!payload)
-                continue;
-            if (event.type === "session_meta")
-                sessionId = stringValue(payload.id) ?? sessionId;
-            if (event.type !== "response_item")
-                continue;
-            const type = stringValue(payload.type);
-            if (type === "function_call" || type === "custom_tool_call") {
-                const name = stringValue(payload.name) ?? "unknown";
-                byTool[name] = (byTool[name] ?? 0) + 1;
-                total += 1;
-            }
-            if ((type === "function_call_output" || type === "custom_tool_call_output") && outputIndicatesFailure(payload))
-                failures += 1;
-        }
-        if (sessionId && sessionId !== expectedSessionId)
-            return null;
-        return { total, failures, by_tool: Object.fromEntries(Object.entries(byTool).sort(([left], [right]) => left.localeCompare(right))) };
-    }
-    catch {
-        return null;
-    }
+    return readToolCallsForWindows(transcriptPath, expectedSessionId, [], new Date().toISOString());
 }
 function segmentUsage(context, session, segment) {
     if (!session)
         return { status: "unavailable", diagnostic: "session_record_missing" };
-    const result = readCodexTranscriptWindow(session.transcript_path, session.session_id, segment.started_at, segment.ended_at ?? context.now());
+    const result = readCodexTranscriptWindow(session.transcript_path, nativeSessionId(session), segment.started_at, segment.ended_at ?? context.now());
     return result.counter ? { status: result.status, tokens: result.counter.usage, token_event_at: result.counter.token_event_at } : { status: result.status, diagnostic: result.diagnostic ?? null };
 }
 function readCodexTranscript(transcriptPath, expectedSessionId) {