@gobing-ai/ts-llm-jsonl-importer 0.4.33 → 0.4.36

package/dist/importer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"importer.d.ts","sourceRoot":"","sources":["../src/importer.ts"],"names":[],"mappings":"AAwBA,OAAO,KAAK,EAER,aAAa,EACb,YAAY,EAGZ,gBAAgB,EAEnB,MAAM,SAAS,CAAC;AAOjB;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,CAgMrH"}
+{"version":3,"file":"importer.d.ts","sourceRoot":"","sources":["../src/importer.ts"],"names":[],"mappings":"AA0BA,OAAO,KAAK,EAER,aAAa,EACb,YAAY,EAGZ,gBAAgB,EAEnB,MAAM,SAAS,CAAC;AAoFjB;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,CAkRrH"}

package/dist/importer.js

@@ -1,8 +1,44 @@
 import { ambientRuntimePaths, createNodeFileSystem, resolvePath, walkDir, } from '@gobing-ai/ts-runtime';
 import { sha256 } from './hash.js';
-import { applyHistoryImportSchema, checkpointUpsertOp, ensureTargetTables, ledgerExistingHashes, ledgerInsertOp, readCheckpoint, reconcileFullImport, recordInsertOp, resetCheckpoints, targetTableFor, } from './jsonl-importer-dao.js';
+import { applyHistoryImportSchema, checkpointUpsertOp, ensureTargetTables, ledgerExistingHashes, ledgerInsertOp, readCheckpoint, reconcileFullImport, recordInsertOp, resetCheckpoints, targetTableFor, toolCallDurationUpdateOp, } from './jsonl-importer-dao.js';
+import { ompToolResultTiming, timestampToEpochMs } from './mappers.js';
 import { redactRecord } from './redaction.js';
 import { resolveSourceDefinition } from './sources.js';
+const TOOL_CALL_KEY_SEP = '\u0000';
+function toolCallKey(source, sessionId, callId) {
+    return `${source}${TOOL_CALL_KEY_SEP}${sessionId}${TOOL_CALL_KEY_SEP}${callId}`;
+}
+/** Resolve a tool-call row this run did not see (its line is behind the checkpoint). */
+async function resolveToolCallRow(db, source, sessionId, callId) {
+    const row = await db.queryFirst(`SELECT tc.record_hash AS recordHash, m.ts AS messageTs
+         FROM history_tool_call tc
+         LEFT JOIN history_message m ON m.record_hash = tc.message_hash
+         WHERE tc.source = ? AND tc.session_id = ? AND tc.call_id = ?`, source, sessionId, callId);
+    if (row === undefined || row === null)
+        return undefined;
+    return { recordHash: row.recordHash, messageTsMs: timestampToEpochMs(row.messageTs) };
+}
+/**
+ * Compute the attachable duration for a toolResult, or null when nothing should
+ * be written (implausible fallback delta → row stays NULL → counts unmeasured).
+ */
+function attachableDuration(timing, messageTsMs) {
+    if (timing.wallTimeMs !== undefined) {
+        // The tool's own measurement — no clamping, no sanity check.
+        return { startedAt: null, completedAt: null, durationMs: Math.round(timing.wallTimeMs) };
+    }
+    if (timing.timestampMs === undefined || messageTsMs === undefined)
+        return null;
+    const delta = timing.timestampMs - messageTsMs;
+    // Guard rails apply to the fallback ONLY: negative or > 1h is implausible.
+    if (!Number.isFinite(delta) || delta < 0 || delta > 3_600_000)
+        return null;
+    return {
+        startedAt: new Date(messageTsMs).toISOString(),
+        completedAt: new Date(timing.timestampMs).toISOString(),
+        durationMs: Math.round(delta),
+    };
+}
 /** Run the JSONL import pipeline for one source.
  *
  * @param source - Either a built-in source identifier resolved from the
@@ -32,6 +68,9 @@ export async function runJsonlImport(source, options) {
     // Full-mode desired set (R1, task 0504): every record hash the current source produces.
     // ReconcileFullImport diffs this against the persisted ledger to retire stale rows.
     const desiredHashes = new Set();
+    // Task 0564 R1: tool-call rows emitted by earlier assistant lines, keyed by
+    // (source, session_id, call_id) so a later toolResult line can attach its duration.
+    const toolCallRows = new Map();
     for (const file of files) {
         const checkpoint = mode === 'incremental' ? await readCheckpoint(options.db, resolvedSource, file) : 0;
         let lineNumber = 0;
@@ -92,6 +131,33 @@ export async function runJsonlImport(source, options) {
             // second pass, no checkpoint advance, no partial rows from this record.
             if (lineRejected)
                 continue;
+            // Task 0564 R1 (omp): register this line's tool-call rows for later duration
+            // attach. Runs over ALL prepared entries — including duplicates — because a
+            // re-imported line's row already exists and its duration UPDATE still targets
+            // the same deterministic record_hash. The assistant message timestamp is the
+            // fallback's start bound; every call in one message shares it.
+            if (definition.source === 'omp') {
+                const assistantTs = new Map();
+                for (const entry of prepared) {
+                    if (entry.split.targetTable === 'history_message' &&
+                        entry.normalized.role === 'assistant' &&
+                        typeof entry.normalized.session_id === 'string') {
+                        assistantTs.set(`${entry.normalized.session_id}${TOOL_CALL_KEY_SEP}${entry.normalized.seq}`, timestampToEpochMs(entry.normalized.ts));
+                    }
+                }
+                for (const entry of prepared) {
+                    const callId = entry.normalized.call_id;
+                    if (entry.split.targetTable === 'history_tool_call' &&
+                        typeof callId === 'string' &&
+                        callId.length > 0 &&
+                        typeof entry.normalized.session_id === 'string') {
+                        toolCallRows.set(toolCallKey(resolvedSource, entry.normalized.session_id, callId), {
+                            recordHash: entry.recordHash,
+                            messageTsMs: assistantTs.get(`${entry.normalized.session_id}${TOOL_CALL_KEY_SEP}${entry.normalized.seq}`),
+                        });
+                    }
+                }
+            }
             // Chunked ledger lookup (task 0060 F9): one `IN (...)` query per ≤200 hashes
             // instead of a SELECT per record; duplicates are dropped before the write pass.
             const existing = await ledgerExistingHashes(options.db, prepared.map((e) => e.recordHash));
@@ -128,6 +194,32 @@ export async function runJsonlImport(source, options) {
                 importedRecords += 1;
             }
             if (!options.dryRun && lineSucceeded) {
+                // Task 0564 R1 (omp): attach tool durations from this line's toolResult
+                // message. Unmatched toolCallIds attach nothing and never fail the import;
+                // an implausible fallback delta stays NULL (unmeasured). The UPDATEs ride
+                // this line's batch — idempotent, so re-imports and post-resume tail
+                // reprocessing write the same values.
+                if (definition.source === 'omp') {
+                    const timing = ompToolResultTiming(raw);
+                    if (timing !== null) {
+                        const resultEntry = prepared.find((entry) => entry.split.targetTable === 'history_message' && entry.normalized.role === 'toolresult');
+                        const sessionId = resultEntry?.normalized.session_id;
+                        if (typeof sessionId === 'string') {
+                            let pending = toolCallRows.get(toolCallKey(resolvedSource, sessionId, timing.toolCallId));
+                            if (pending === undefined) {
+                                // The tool-call line sits behind this run's checkpoint — the
+                                // row exists from an earlier import; resolve it from the DB.
+                                pending = await resolveToolCallRow(options.db, resolvedSource, sessionId, timing.toolCallId);
+                            }
+                            if (pending !== undefined) {
+                                const duration = attachableDuration(timing, pending.messageTsMs);
+                                if (duration !== null) {
+                                    ops.push(toolCallDurationUpdateOp(pending.recordHash, duration.startedAt, duration.completedAt, duration.durationMs));
+                                }
+                            }
+                        }
+                    }
+                }
                 // Checkpoint upsert joins the same batch so an accepted line can never be
                 // re-imported after a mid-batch crash.
                 ops.push(checkpointUpsertOp(resolvedSource, file, lineNumber, options.now));

package/dist/jsonl-importer-dao.d.ts

@@ -44,6 +44,16 @@ export declare function recordInsertOp(targetTable: string, recordHash: string,
 export declare function ledgerInsertOp(recordHash: string, source: string, sourceFile: string, sourceLine: number, splitIndex: number, targetTable: string, now: ImportOptions['now']): DbBatchOp;
 /** UPSERT op for one checkpoint row (task 0060 F9: checkpoint joins the record batch). */
 export declare function checkpointUpsertOp(source: string, sourceFile: string, line: number, now: ImportOptions['now']): DbBatchOp;
+/**
+ * Targeted UPDATE op attaching a tool duration to a previously-inserted
+ * `history_tool_call` row (task 0564 R1). Keyed by `record_hash` (PK), never an
+ * unindexed predicate. Idempotent: re-imports write the same values.
+ *
+ * Bounds are written alongside a FALLBACK duration so the figure is auditable;
+ * a wallTimeMs-derived duration keeps `started_at`/`completed_at` NULL so the
+ * two measurement paths stay distinguishable.
+ */
+declare function toolCallDurationUpdateOp(recordHash: string, startedAt: string | null, completedAt: string | null, durationMs: number | null): DbBatchOp;
 /**
  * Query which of the given hashes already exist in the ledger, in chunks of at
  * most 200 per `IN (...)` (task 0060 F9 — replaces the per-record SELECT loop).
@@ -126,5 +136,5 @@ export declare function deleteCheckpointOperation(source: string, sourceFile: st
 /** Build batched history, ledger, and checkpoint writes for OpenCode entries. */
 export declare function openCodeBulkWriteOperations(entries: readonly OpenCodeQueuedEntry[], checkpointFiles: readonly string[], now: ImportOptions['now']): DbBatchOp[];
 export type { CheckpointRow };
-export { ETL_TABLE_DDL, ensureTargetTables, insertLedger, insertRecord, ledgerExists, readCheckpoint, reconcileFullImport, resetCheckpoints, targetTableFor, timestamp, writeCheckpoint, };
+export { ETL_TABLE_DDL, ensureTargetTables, insertLedger, insertRecord, ledgerExists, readCheckpoint, reconcileFullImport, resetCheckpoints, targetTableFor, timestamp, toolCallDurationUpdateOp, writeCheckpoint, };
 //# sourceMappingURL=jsonl-importer-dao.d.ts.map

package/dist/jsonl-importer-dao.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jsonl-importer-dao.d.ts","sourceRoot":"","sources":["../src/jsonl-importer-dao.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"jsonl-importer-dao.d.ts","sourceRoot":"","sources":["../src/jsonl-importer-dao.ts"],"names":[],"mappings":"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"}

package/dist/jsonl-importer-dao.js

@@ -38,6 +38,7 @@ const TYPED_TABLE_COLUMNS = {
         'session_id',
         'seq',
         'tool_name',
+        'call_id',
         'args_digest',
         'args_raw',
         'status',
@@ -194,6 +195,23 @@ export function checkpointUpsertOp(source, sourceFile, line, now) {
         params: [source, sourceFile, line, timestamp(now)],
     };
 }
+/**
+ * Targeted UPDATE op attaching a tool duration to a previously-inserted
+ * `history_tool_call` row (task 0564 R1). Keyed by `record_hash` (PK), never an
+ * unindexed predicate. Idempotent: re-imports write the same values.
+ *
+ * Bounds are written alongside a FALLBACK duration so the figure is auditable;
+ * a wallTimeMs-derived duration keeps `started_at`/`completed_at` NULL so the
+ * two measurement paths stay distinguishable.
+ */
+function toolCallDurationUpdateOp(recordHash, startedAt, completedAt, durationMs) {
+    return {
+        sql: `UPDATE history_tool_call
+              SET started_at = ?, completed_at = ?, duration_ms = ?
+              WHERE record_hash = ?`,
+        params: [startedAt, completedAt, durationMs, recordHash],
+    };
+}
 /**
  * Query which of the given hashes already exist in the ledger, in chunks of at
  * most 200 per `IN (...)` (task 0060 F9 — replaces the per-record SELECT loop).
@@ -468,4 +486,4 @@ export function openCodeBulkWriteOperations(entries, checkpointFiles, now) {
     }
     return operations;
 }
-export { ETL_TABLE_DDL, ensureTargetTables, insertLedger, insertRecord, ledgerExists, readCheckpoint, reconcileFullImport, resetCheckpoints, targetTableFor, timestamp, writeCheckpoint, };
+export { ETL_TABLE_DDL, ensureTargetTables, insertLedger, insertRecord, ledgerExists, readCheckpoint, reconcileFullImport, resetCheckpoints, targetTableFor, timestamp, toolCallDurationUpdateOp, writeCheckpoint, };

package/dist/mappers.d.ts

@@ -5,9 +5,29 @@ export declare function argsDigest(args: unknown): string;
 /** Map a Claude Code JSONL record into one or more ETL split entries. */
 export declare function claudeSplit(raw: Record<string, unknown>): readonly SplitEntry[];
 /** Map a Pi JSONL record into one or more ETL split entries. */
-export declare function piSplit(raw: unknown): readonly SplitEntry[];
+export declare function piSplit(raw: Record<string, unknown>, context?: TransformContext): readonly SplitEntry[];
 /** Map an OMP JSONL record into one or more ETL split entries. */
 export declare function ompSplit(raw: Record<string, unknown>, context?: TransformContext): readonly SplitEntry[];
+/** Timing signals carried by an OMP toolResult message envelope (task 0564 R1). */
+export interface OmpToolResultTiming {
+    /** The toolCall id this result answers — joins `toolCall.id` exactly. */
+    toolCallId: string;
+    /** The tool's own measured wall time in ms, when present and finite. */
+    wallTimeMs: number | undefined;
+    /** Message timestamp as epoch millis, when parseable. */
+    timestampMs: number | undefined;
+}
+/** Parse a message timestamp (epoch-millis number, numeric string, or ISO) to epoch millis. */
+export declare function timestampToEpochMs(value: unknown): number | undefined;
+/**
+ * Extract toolResult timing signals from a raw OMP record (task 0564 R1), or null
+ * when the record is not a toolResult message or carries no toolCallId. Live OMP
+ * emits `role: "toolResult"` message envelopes with `{toolCallId, toolName,
+ * content, details, isError, timestamp}`; `details.wallTimeMs` is the tool's own
+ * measured wall time (48% of results in the sampled session) and `toolCallId`
+ * joins the originating `toolCall.id` exactly.
+ */
+export declare function ompToolResultTiming(raw: Record<string, unknown>): OmpToolResultTiming | null;
 /** Map a Codex JSONL record into one or more ETL split entries. */
 export declare function codexSplit(raw: Record<string, unknown>): readonly SplitEntry[];
 /** Map an Antigravity (AGY) JSONL record into one or more ETL split entries. */

package/dist/mappers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mappers.d.ts","sourceRoot":"","sources":["../src/mappers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAkExE,kFAAkF;AAClF,wBAAgB,UAAU,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAGhD;AAqDD,yEAAyE;AACzE,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,UAAU,EAAE,CA6G/E;AAMD,gEAAgE;AAChE,wBAAgB,OAAO,CAAC,GAAG,EAAE,OAAO,GAAG,SAAS,UAAU,EAAE,CAuE3D;AAMD,kEAAkE;AAClE,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,SAAS,UAAU,EAAE,CA2GxG;AAoBD,mEAAmE;AACnE,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,UAAU,EAAE,CAkG9E;AAMD,gFAAgF;AAChF,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,UAAU,EAAE,CAiH5E;AAMD,gGAAgG;AAChG,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,SAAS,UAAU,EAAE,CAiF3G;AAyMD,kEAAkE;AAClE,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,UAAU,EAAE,CA4S7E;AAwDD,wGAAwG;AACxG,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,CAKxD;AAMD,gDAAgD;AAChD,eAAO,MAAM,gBAAgB,wBAAsE,CAAC;AACpG,4CAA4C;AAC5C,eAAO,MAAM,YAAY,wBAAsE,CAAC;AAChG,6CAA6C;AAC7C,eAAO,MAAM,aAAa,wBAAsE,CAAC;AACjG,+CAA+C;AAC/C,eAAO,MAAM,eAAe,wBAAsE,CAAC;AACnG,6CAA6C;AAC7C,eAAO,MAAM,aAAa,wBAAsE,CAAC;AACjG,8CAA8C;AAC9C,eAAO,MAAM,cAAc,wBAAsE,CAAC;AAClG,gDAAgD;AAChD,eAAO,MAAM,gBAAgB,wBAAsE,CAAC;AAQpG,oDAAoD;AACpD,eAAO,MAAM,aAAa,gCAAoB,CAAC;AAC/C,gDAAgD;AAChD,eAAO,MAAM,SAAS,gCAAoB,CAAC;AAC3C,iDAAiD;AACjD,eAAO,MAAM,UAAU,gCAAoB,CAAC;AAC5C,mDAAmD;AACnD,eAAO,MAAM,YAAY,gCAAoB,CAAC;AAC9C,iDAAiD;AACjD,eAAO,MAAM,UAAU,gCAAoB,CAAC;AAC5C,kDAAkD;AAClD,eAAO,MAAM,WAAW,gCAAoB,CAAC;AAC7C,oDAAoD;AACpD,eAAO,MAAM,aAAa,gCAAoB,CAAC"}
+{"version":3,"file":"mappers.d.ts","sourceRoot":"","sources":["../src/mappers.ts"],"names":[],"mappings":"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"}

package/dist/mappers.js

@@ -31,6 +31,7 @@ const TOOL_CALL_MAPPER_KEYS = [
     'session_id',
     'seq',
     'tool_name',
+    'call_id',
     'args_digest',
     'args_raw',
     'status',
@@ -225,24 +226,62 @@ export function claudeSplit(raw) {
 // Pi mapper
 // ---------------------------------------------------------------------------
 /** Map a Pi JSONL record into one or more ETL split entries. */
-export function piSplit(raw) {
+export function piSplit(raw, context) {
+    // Pi session files are top-level event envelopes: `{type, id, parentId, timestamp,
+    // message: {role, content, model, usage, provider, ...}}`. Newer records carry `recordType`
+    // instead of `type` with `role`/`text` at the top level. The top-level `id` is an event id,
+    // never a session id; the session key and sequence come from the source file (context).
+    const msg = raw.message;
+    const recordType = String(raw.type ?? raw.recordType ?? '');
+    const sessionId = sessionIdFromContext(context, raw);
+    const seq = context?.sourceLine ?? (typeof raw.seq === 'number' ? raw.seq : 0);
+    // Prefer the ISO `timestamp`; a numeric epoch-ms `ts` is converted, never stringified.
+    const ts = s(raw.timestamp, raw.createdAt) ??
+        (typeof raw.ts === 'number' && Number.isFinite(raw.ts) ? new Date(raw.ts).toISOString() : s(raw.ts)) ??
+        new Date(0).toISOString();
+    // Meta lifecycle/custom records collapse to one meta row keyed by the source session,
+    // never the unique event id, and never a guessed role.
+    if (recordType === 'title' ||
+        recordType === 'title_change' ||
+        recordType === 'service_tier_change' ||
+        recordType === 'session_info' ||
+        recordType === 'ttsr_injection' ||
+        recordType === 'session_init' ||
+        recordType === 'session' ||
+        recordType === 'model_change' ||
+        recordType === 'thinking_level_change' ||
+        recordType === 'compaction' ||
+        recordType === 'custom' ||
+        recordType === 'custom_message' ||
+        recordType.startsWith('custom.')) {
+        return [
+            {
+                targetTable: 'history_message',
+                record: {
+                    session_id: sessionId,
+                    seq,
+                    role: 'meta',
+                    record_type: recordType,
+                    disposition: 'meta',
+                    ts,
+                    provenance: 'ambient',
+                },
+            },
+        ];
+    }
     const entries = [];
-    const r = raw;
-    const sessionId = s(r.id, o(r.session).id) ?? 'unknown';
-    const seq = typeof r.seq === 'number' ? r.seq : 0;
-    const ts = s(r.ts, r.timestamp, r.createdAt) ?? new Date(0).toISOString();
-    const role = mapRole(r.type ?? r.role);
-    const recordType = String(r.type ?? '');
-    const model = s(r.model, o(r.message).model);
-    const cwd = s(r.cwd, r.dir);
-    const msg = r.message;
-    const usage = msg?.usage;
+    const role = piRole(msg?.role ?? raw.role ?? recordType);
+    const model = s(raw.model, o(msg).model);
+    const cwd = s(raw.cwd, raw.dir);
+    const usage = (msg?.usage ?? raw.usage);
     const inputTokens = (usage?.input ?? usage?.input_tokens ?? undefined);
     const outputTokens = (usage?.output ?? usage?.output_tokens ?? undefined);
     const cacheRead = (usage?.cacheRead ?? usage?.cache_read_tokens ?? undefined);
     const cacheWrite = (usage?.cacheWrite ?? usage?.cache_write_tokens ?? undefined);
-    const costObj = (msg?.cost ?? r.cost);
+    const costObj = (msg?.cost ?? raw.cost);
     const costUsd = typeof costObj?.total === 'number' ? costObj.total : computeCost(inputTokens, outputTokens, model);
+    const contentBlocks = msg?.content ?? raw.content;
+    const durationMs = typeof msg?.duration === 'number' && Number.isFinite(msg.duration) ? msg.duration : undefined;
     const messageSplitIndex = entries.length;
     entries.push({
         targetTable: 'history_message',
@@ -253,45 +292,64 @@ export function piSplit(raw) {
             record_type: recordType,
             disposition: 'keep',
             ts,
-            duration_ms: undefined,
+            duration_ms: durationMs,
             model: model ?? null,
             input_tokens: inputTokens ?? null,
             output_tokens: outputTokens ?? null,
             cache_read_tokens: cacheRead ?? null,
             cache_write_tokens: cacheWrite ?? null,
             cost_usd: costUsd ?? null,
-            content_text: s(r.content, r.text, msg?.content) ?? null,
+            content_text: extractContentText(contentBlocks) ?? s(raw.content, raw.text, msg?.content) ?? null,
             cwd: cwd ?? null,
             provenance: 'ambient',
         },
     });
-    // Tool calls from toolCall blocks in assistant content
-    if (Array.isArray(r.content) && role === 'assistant') {
-        for (const block of r.content) {
-            if (block?.toolCall) {
-                const tc = block.toolCall;
-                entries.push({
-                    targetTable: 'history_tool_call',
-                    record: {
-                        _messageSplitIndex: messageSplitIndex,
-                        session_id: sessionId,
-                        seq,
-                        tool_name: String(tc.name ?? ''),
-                        args_digest: argsDigest(tc.input ?? tc.arguments),
-                        args_raw: maybeArgsRaw('pi', String(tc.name ?? ''), tc.input ?? tc.arguments),
-                        status: 'ok',
-                        started_at: undefined,
-                        completed_at: undefined,
-                        duration_ms: undefined,
-                        result_bytes: undefined,
-                        error_text: undefined,
-                    },
-                });
-            }
+    // Tool calls from content blocks in assistant messages. normalizeOmpToolCall handles both
+    // the legacy nested `{toolCall: {...}}` block and pi's flat `{type: "toolCall", id, name,
+    // arguments}` block.
+    if (Array.isArray(contentBlocks) && role === 'assistant') {
+        for (const block of contentBlocks) {
+            const call = normalizeOmpToolCall(block);
+            if (call === null)
+                continue;
+            entries.push({
+                targetTable: 'history_tool_call',
+                record: {
+                    _messageSplitIndex: messageSplitIndex,
+                    session_id: sessionId,
+                    seq,
+                    tool_name: String(call.name ?? ''),
+                    // The tool's own call id is the exact join key a toolResult's `toolCallId`
+                    // matches (see ompSplit / task 0564 R1).
+                    call_id: s(call.id),
+                    args_digest: argsDigest(call.input ?? call.arguments),
+                    args_raw: maybeArgsRaw('pi', String(call.name ?? ''), call.input ?? call.arguments),
+                    status: 'ok',
+                    started_at: undefined,
+                    completed_at: undefined,
+                    duration_ms: undefined,
+                    result_bytes: undefined,
+                    error_text: undefined,
+                },
+            });
         }
     }
     return entries;
 }
+/**
+ * Canonicalize a pi message role. pi tool results and bash executions ride user turns (Claude
+ * protocol shape); everything unrecognized clamps to `unknown` so pi record types never leak
+ * into the role column (task 0577 AC2).
+ */
+function piRole(type) {
+    const t = String(type ?? '').toLowerCase();
+    if (t === 'toolresult' || t === 'tool_result' || t === 'bashexecution' || t === 'tool')
+        return 'user';
+    const mapped = mapRole(t);
+    if (mapped === 'user' || mapped === 'assistant' || mapped === 'system')
+        return mapped;
+    return 'unknown';
+}
 // ---------------------------------------------------------------------------
 // OMP mapper (near-identical to pi)
 // ---------------------------------------------------------------------------
@@ -383,6 +441,10 @@ export function ompSplit(raw, context) {
                     session_id: sessionId,
                     seq,
                     tool_name: String(call.name ?? ''),
+                    // Task 0564 R1: the tool's own call id is the exact join key a
+                    // toolResult's `toolCallId` matches — it lets the streaming loop
+                    // attach the tool's measured duration to the right row.
+                    call_id: s(call.id),
                     args_digest: argsDigest(call.input ?? call.arguments),
                     args_raw: maybeArgsRaw('omp', String(call.name ?? ''), call.input ?? call.arguments),
                     status: 'ok',
@@ -413,6 +475,39 @@ function normalizeOmpToolCall(block) {
         return block;
     return null;
 }
+/** Parse a message timestamp (epoch-millis number, numeric string, or ISO) to epoch millis. */
+export function timestampToEpochMs(value) {
+    if (typeof value === 'number' && Number.isFinite(value))
+        return value;
+    if (typeof value === 'string' && value.length > 0) {
+        const numeric = Number(value);
+        if (Number.isFinite(numeric))
+            return numeric;
+        const parsed = Date.parse(value);
+        if (!Number.isNaN(parsed))
+            return parsed;
+    }
+    return undefined;
+}
+/**
+ * Extract toolResult timing signals from a raw OMP record (task 0564 R1), or null
+ * when the record is not a toolResult message or carries no toolCallId. Live OMP
+ * emits `role: "toolResult"` message envelopes with `{toolCallId, toolName,
+ * content, details, isError, timestamp}`; `details.wallTimeMs` is the tool's own
+ * measured wall time (48% of results in the sampled session) and `toolCallId`
+ * joins the originating `toolCall.id` exactly.
+ */
+export function ompToolResultTiming(raw) {
+    const msg = o(raw.message);
+    if (String(msg.role ?? '').toLowerCase() !== 'toolresult')
+        return null;
+    const toolCallId = s(msg.toolCallId);
+    if (toolCallId === undefined)
+        return null;
+    const details = o(msg.details);
+    const wallTimeMs = typeof details.wallTimeMs === 'number' && Number.isFinite(details.wallTimeMs) ? details.wallTimeMs : undefined;
+    return { toolCallId, wallTimeMs, timestampMs: timestampToEpochMs(raw.timestamp ?? msg.timestamp) };
+}
 // ---------------------------------------------------------------------------
 // Codex mapper
 // ---------------------------------------------------------------------------

package/dist/schema-sql.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema-sql.d.ts","sourceRoot":"","sources":["../src/schema-sql.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,eAAO,MAAM,yBAAyB,QA4E9B,CAAC"}
+{"version":3,"file":"schema-sql.d.ts","sourceRoot":"","sources":["../src/schema-sql.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,eAAO,MAAM,yBAAyB,QA6E9B,CAAC"}

package/dist/schema-sql.js

@@ -62,6 +62,7 @@ CREATE TABLE IF NOT EXISTS history_tool_call (
     session_id    TEXT NOT NULL,
     seq           INTEGER NOT NULL,
     tool_name     TEXT NOT NULL,
+    call_id       TEXT,
     args_digest   TEXT,
     args_raw      TEXT,
     status        TEXT NOT NULL,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gobing-ai/ts-llm-jsonl-importer",
-    "version": "0.4.33",
+    "version": "0.4.36",
     "description": "@gobing-ai/ts-llm-jsonl-importer — Generic JSONL importer for LLM agent history files.",
     "keywords": [
         "typescript",
@@ -47,9 +47,9 @@
         "release": "echo 'Manual publish is disabled. Releases go through GitHub Actions via Trusted Publishing — push a tag: git tag @gobing-ai/ts-llm-jsonl-importer-v<version> && git push --tags' && exit 1"
     },
     "dependencies": {
-        "@gobing-ai/ts-db": "^0.4.33",
-        "@gobing-ai/ts-runtime": "^0.4.33",
-        "@gobing-ai/ts-utils": "^0.4.33",
+        "@gobing-ai/ts-db": "^0.4.36",
+        "@gobing-ai/ts-runtime": "^0.4.36",
+        "@gobing-ai/ts-utils": "^0.4.36",
         "zod": "^4.1.0"
     },
     "devDependencies": {

package/src/importer.ts

@@ -19,7 +19,9 @@ import {
     recordInsertOp,
     resetCheckpoints,
     targetTableFor,
+    toolCallDurationUpdateOp,
 } from './jsonl-importer-dao';
+import { type OmpToolResultTiming, ompToolResultTiming, timestampToEpochMs } from './mappers';
 import { redactRecord } from './redaction';
 import { resolveSourceDefinition } from './sources';
 import type {
@@ -37,6 +39,83 @@ interface SplitRecord {
     readonly raw: JsonObject;
 }
 
+// ---------------------------------------------------------------------------
+// Task 0564 R1 — tool-call duration attach (omp)
+//
+// A toolCall row is emitted while handling its assistant message (SplitEntry is
+// insert-only, so the duration cannot ride the mapper's split path); the
+// duration arrives on a LATER toolResult line. The attach therefore lives in the
+// streaming loop, keyed on (source, session_id, call_id) per the frozen contract:
+//   - `details.wallTimeMs` is the tool's own measured wall time — used as-is,
+//     rounded, NEVER clamped or second-guessed (guards are fallback-only);
+//   - otherwise the fallback `toolResult.timestamp − toolCall message timestamp`
+//     when both are parseable AND the delta is in [0, 3_600_000]; an implausible
+//     delta stays NULL so the unmeasured count stays honest;
+//   - started_at / completed_at are written alongside a FALLBACK figure so it is
+//     auditable (wallTimeMs rows keep both NULL — the two stay distinguishable);
+//   - an unmatched toolCallId attaches nothing and never fails the import.
+//
+// The in-memory map covers the common (fresh-import) case without extra queries;
+// a toolResult whose tool-call line was imported by an earlier checkpointed run
+// (resume) resolves through a DB lookup instead, so a mid-file checkpoint loses
+// no earlier duration.
+// ---------------------------------------------------------------------------
+
+interface PendingToolCall {
+    readonly recordHash: string;
+    /** Assistant-message timestamp (epoch ms) — the fallback's start bound. */
+    readonly messageTsMs: number | undefined;
+}
+
+const TOOL_CALL_KEY_SEP = '\u0000';
+
+function toolCallKey(source: string, sessionId: string, callId: string): string {
+    return `${source}${TOOL_CALL_KEY_SEP}${sessionId}${TOOL_CALL_KEY_SEP}${callId}`;
+}
+
+/** Resolve a tool-call row this run did not see (its line is behind the checkpoint). */
+async function resolveToolCallRow(
+    db: ImportOptions['db'],
+    source: string,
+    sessionId: string,
+    callId: string,
+): Promise<PendingToolCall | undefined> {
+    const row = await db.queryFirst<{ recordHash: string; messageTs: string | null }>(
+        `SELECT tc.record_hash AS recordHash, m.ts AS messageTs
+         FROM history_tool_call tc
+         LEFT JOIN history_message m ON m.record_hash = tc.message_hash
+         WHERE tc.source = ? AND tc.session_id = ? AND tc.call_id = ?`,
+        source,
+        sessionId,
+        callId,
+    );
+    if (row === undefined || row === null) return undefined;
+    return { recordHash: row.recordHash, messageTsMs: timestampToEpochMs(row.messageTs) };
+}
+
+/**
+ * Compute the attachable duration for a toolResult, or null when nothing should
+ * be written (implausible fallback delta → row stays NULL → counts unmeasured).
+ */
+function attachableDuration(
+    timing: OmpToolResultTiming,
+    messageTsMs: number | undefined,
+): { startedAt: string | null; completedAt: string | null; durationMs: number } | null {
+    if (timing.wallTimeMs !== undefined) {
+        // The tool's own measurement — no clamping, no sanity check.
+        return { startedAt: null, completedAt: null, durationMs: Math.round(timing.wallTimeMs) };
+    }
+    if (timing.timestampMs === undefined || messageTsMs === undefined) return null;
+    const delta = timing.timestampMs - messageTsMs;
+    // Guard rails apply to the fallback ONLY: negative or > 1h is implausible.
+    if (!Number.isFinite(delta) || delta < 0 || delta > 3_600_000) return null;
+    return {
+        startedAt: new Date(messageTsMs).toISOString(),
+        completedAt: new Date(timing.timestampMs).toISOString(),
+        durationMs: Math.round(delta),
+    };
+}
+
 /** Run the JSONL import pipeline for one source.
  *
  * @param source - Either a built-in source identifier resolved from the
@@ -69,6 +148,10 @@ export async function runJsonlImport(source: string | SourceDefinition, options:
     // ReconcileFullImport diffs this against the persisted ledger to retire stale rows.
     const desiredHashes = new Set<string>();
 
+    // Task 0564 R1: tool-call rows emitted by earlier assistant lines, keyed by
+    // (source, session_id, call_id) so a later toolResult line can attach its duration.
+    const toolCallRows = new Map<string, PendingToolCall>();
+
     for (const file of files) {
         const checkpoint = mode === 'incremental' ? await readCheckpoint(options.db, resolvedSource, file) : 0;
         let lineNumber = 0;
@@ -138,6 +221,43 @@ export async function runJsonlImport(source: string | SourceDefinition, options:
             // second pass, no checkpoint advance, no partial rows from this record.
             if (lineRejected) continue;
 
+            // Task 0564 R1 (omp): register this line's tool-call rows for later duration
+            // attach. Runs over ALL prepared entries — including duplicates — because a
+            // re-imported line's row already exists and its duration UPDATE still targets
+            // the same deterministic record_hash. The assistant message timestamp is the
+            // fallback's start bound; every call in one message shares it.
+            if (definition.source === 'omp') {
+                const assistantTs = new Map<string, number | undefined>();
+                for (const entry of prepared) {
+                    if (
+                        entry.split.targetTable === 'history_message' &&
+                        entry.normalized.role === 'assistant' &&
+                        typeof entry.normalized.session_id === 'string'
+                    ) {
+                        assistantTs.set(
+                            `${entry.normalized.session_id}${TOOL_CALL_KEY_SEP}${entry.normalized.seq}`,
+                            timestampToEpochMs(entry.normalized.ts),
+                        );
+                    }
+                }
+                for (const entry of prepared) {
+                    const callId = entry.normalized.call_id;
+                    if (
+                        entry.split.targetTable === 'history_tool_call' &&
+                        typeof callId === 'string' &&
+                        callId.length > 0 &&
+                        typeof entry.normalized.session_id === 'string'
+                    ) {
+                        toolCallRows.set(toolCallKey(resolvedSource, entry.normalized.session_id, callId), {
+                            recordHash: entry.recordHash,
+                            messageTsMs: assistantTs.get(
+                                `${entry.normalized.session_id}${TOOL_CALL_KEY_SEP}${entry.normalized.seq}`,
+                            ),
+                        });
+                    }
+                }
+            }
+
             // Chunked ledger lookup (task 0060 F9): one `IN (...)` query per ≤200 hashes
             // instead of a SELECT per record; duplicates are dropped before the write pass.
             const existing = await ledgerExistingHashes(
@@ -199,6 +319,47 @@ export async function runJsonlImport(source: string | SourceDefinition, options:
             }
 
             if (!options.dryRun && lineSucceeded) {
+                // Task 0564 R1 (omp): attach tool durations from this line's toolResult
+                // message. Unmatched toolCallIds attach nothing and never fail the import;
+                // an implausible fallback delta stays NULL (unmeasured). The UPDATEs ride
+                // this line's batch — idempotent, so re-imports and post-resume tail
+                // reprocessing write the same values.
+                if (definition.source === 'omp') {
+                    const timing = ompToolResultTiming(raw);
+                    if (timing !== null) {
+                        const resultEntry = prepared.find(
+                            (entry) =>
+                                entry.split.targetTable === 'history_message' && entry.normalized.role === 'toolresult',
+                        );
+                        const sessionId = resultEntry?.normalized.session_id;
+                        if (typeof sessionId === 'string') {
+                            let pending = toolCallRows.get(toolCallKey(resolvedSource, sessionId, timing.toolCallId));
+                            if (pending === undefined) {
+                                // The tool-call line sits behind this run's checkpoint — the
+                                // row exists from an earlier import; resolve it from the DB.
+                                pending = await resolveToolCallRow(
+                                    options.db,
+                                    resolvedSource,
+                                    sessionId,
+                                    timing.toolCallId,
+                                );
+                            }
+                            if (pending !== undefined) {
+                                const duration = attachableDuration(timing, pending.messageTsMs);
+                                if (duration !== null) {
+                                    ops.push(
+                                        toolCallDurationUpdateOp(
+                                            pending.recordHash,
+                                            duration.startedAt,
+                                            duration.completedAt,
+                                            duration.durationMs,
+                                        ),
+                                    );
+                                }
+                            }
+                        }
+                    }
+                }
                 // Checkpoint upsert joins the same batch so an accepted line can never be
                 // re-imported after a mid-batch crash.
                 ops.push(checkpointUpsertOp(resolvedSource, file, lineNumber, options.now));

package/src/jsonl-importer-dao.ts

@@ -45,6 +45,7 @@ const TYPED_TABLE_COLUMNS: Readonly<Record<string, readonly string[]>> = {
         'session_id',
         'seq',
         'tool_name',
+        'call_id',
         'args_digest',
         'args_raw',
         'status',
@@ -255,6 +256,29 @@ export function checkpointUpsertOp(
     };
 }
 
+/**
+ * Targeted UPDATE op attaching a tool duration to a previously-inserted
+ * `history_tool_call` row (task 0564 R1). Keyed by `record_hash` (PK), never an
+ * unindexed predicate. Idempotent: re-imports write the same values.
+ *
+ * Bounds are written alongside a FALLBACK duration so the figure is auditable;
+ * a wallTimeMs-derived duration keeps `started_at`/`completed_at` NULL so the
+ * two measurement paths stay distinguishable.
+ */
+function toolCallDurationUpdateOp(
+    recordHash: string,
+    startedAt: string | null,
+    completedAt: string | null,
+    durationMs: number | null,
+): DbBatchOp {
+    return {
+        sql: `UPDATE history_tool_call
+              SET started_at = ?, completed_at = ?, duration_ms = ?
+              WHERE record_hash = ?`,
+        params: [startedAt, completedAt, durationMs, recordHash],
+    };
+}
+
 /**
  * Query which of the given hashes already exist in the ledger, in chunks of at
  * most 200 per `IN (...)` (task 0060 F9 — replaces the per-record SELECT loop).
@@ -688,5 +712,6 @@ export {
     resetCheckpoints,
     targetTableFor,
     timestamp,
+    toolCallDurationUpdateOp,
     writeCheckpoint,
 };

package/src/mappers.ts

@@ -35,6 +35,7 @@ const TOOL_CALL_MAPPER_KEYS: readonly string[] = [
     'session_id',
     'seq',
     'tool_name',
+    'call_id',
     'args_digest',
     'args_raw',
     'status',
@@ -240,25 +241,67 @@ export function claudeSplit(raw: Record<string, unknown>): readonly SplitEntry[]
 // ---------------------------------------------------------------------------
 
 /** Map a Pi JSONL record into one or more ETL split entries. */
-export function piSplit(raw: unknown): readonly SplitEntry[] {
+export function piSplit(raw: Record<string, unknown>, context?: TransformContext): readonly SplitEntry[] {
+    // Pi session files are top-level event envelopes: `{type, id, parentId, timestamp,
+    // message: {role, content, model, usage, provider, ...}}`. Newer records carry `recordType`
+    // instead of `type` with `role`/`text` at the top level. The top-level `id` is an event id,
+    // never a session id; the session key and sequence come from the source file (context).
+    const msg = raw.message as Record<string, unknown> | undefined;
+    const recordType = String(raw.type ?? raw.recordType ?? '');
+    const sessionId = sessionIdFromContext(context, raw);
+    const seq = context?.sourceLine ?? (typeof raw.seq === 'number' ? raw.seq : 0);
+    // Prefer the ISO `timestamp`; a numeric epoch-ms `ts` is converted, never stringified.
+    const ts =
+        s(raw.timestamp, raw.createdAt) ??
+        (typeof raw.ts === 'number' && Number.isFinite(raw.ts) ? new Date(raw.ts).toISOString() : s(raw.ts)) ??
+        new Date(0).toISOString();
+
+    // Meta lifecycle/custom records collapse to one meta row keyed by the source session,
+    // never the unique event id, and never a guessed role.
+    if (
+        recordType === 'title' ||
+        recordType === 'title_change' ||
+        recordType === 'service_tier_change' ||
+        recordType === 'session_info' ||
+        recordType === 'ttsr_injection' ||
+        recordType === 'session_init' ||
+        recordType === 'session' ||
+        recordType === 'model_change' ||
+        recordType === 'thinking_level_change' ||
+        recordType === 'compaction' ||
+        recordType === 'custom' ||
+        recordType === 'custom_message' ||
+        recordType.startsWith('custom.')
+    ) {
+        return [
+            {
+                targetTable: 'history_message',
+                record: {
+                    session_id: sessionId,
+                    seq,
+                    role: 'meta',
+                    record_type: recordType,
+                    disposition: 'meta',
+                    ts,
+                    provenance: 'ambient',
+                },
+            },
+        ];
+    }
+
     const entries: SplitEntry[] = [];
-    const r = raw as Record<string, unknown>;
-    const sessionId = s(r.id, o(r.session).id) ?? 'unknown';
-    const seq = typeof r.seq === 'number' ? r.seq : 0;
-    const ts = s(r.ts, r.timestamp, r.createdAt) ?? new Date(0).toISOString();
-    const role = mapRole(r.type ?? r.role);
-    const recordType = String(r.type ?? '');
-    const model = s(r.model, o(r.message).model);
-    const cwd = s(r.cwd, r.dir);
-
-    const msg = r.message as Record<string, unknown> | undefined;
-    const usage = msg?.usage as Record<string, unknown> | undefined;
+    const role = piRole(msg?.role ?? raw.role ?? recordType);
+    const model = s(raw.model, o(msg).model);
+    const cwd = s(raw.cwd, raw.dir);
+    const usage = (msg?.usage ?? raw.usage) as Record<string, unknown> | undefined;
     const inputTokens = (usage?.input ?? usage?.input_tokens ?? undefined) as number | undefined;
     const outputTokens = (usage?.output ?? usage?.output_tokens ?? undefined) as number | undefined;
     const cacheRead = (usage?.cacheRead ?? usage?.cache_read_tokens ?? undefined) as number | undefined;
     const cacheWrite = (usage?.cacheWrite ?? usage?.cache_write_tokens ?? undefined) as number | undefined;
-    const costObj = (msg?.cost ?? r.cost) as Record<string, unknown> | undefined;
+    const costObj = (msg?.cost ?? raw.cost) as Record<string, unknown> | undefined;
     const costUsd = typeof costObj?.total === 'number' ? costObj.total : computeCost(inputTokens, outputTokens, model);
+    const contentBlocks = msg?.content ?? raw.content;
+    const durationMs = typeof msg?.duration === 'number' && Number.isFinite(msg.duration) ? msg.duration : undefined;
 
     const messageSplitIndex = entries.length;
 
@@ -271,48 +314,65 @@ export function piSplit(raw: unknown): readonly SplitEntry[] {
             record_type: recordType,
             disposition: 'keep',
             ts,
-            duration_ms: undefined,
+            duration_ms: durationMs,
             model: model ?? null,
             input_tokens: inputTokens ?? null,
             output_tokens: outputTokens ?? null,
             cache_read_tokens: cacheRead ?? null,
             cache_write_tokens: cacheWrite ?? null,
             cost_usd: costUsd ?? null,
-            content_text: s(r.content, r.text, msg?.content) ?? null,
+            content_text: extractContentText(contentBlocks) ?? s(raw.content, raw.text, msg?.content) ?? null,
             cwd: cwd ?? null,
             provenance: 'ambient',
         },
     });
 
-    // Tool calls from toolCall blocks in assistant content
-    if (Array.isArray(r.content) && role === 'assistant') {
-        for (const block of r.content as Record<string, unknown>[]) {
-            if (block?.toolCall) {
-                const tc = block.toolCall as Record<string, unknown>;
-                entries.push({
-                    targetTable: 'history_tool_call',
-                    record: {
-                        _messageSplitIndex: messageSplitIndex,
-                        session_id: sessionId,
-                        seq,
-                        tool_name: String(tc.name ?? ''),
-                        args_digest: argsDigest(tc.input ?? tc.arguments),
-                        args_raw: maybeArgsRaw('pi', String(tc.name ?? ''), tc.input ?? tc.arguments),
-                        status: 'ok',
-                        started_at: undefined,
-                        completed_at: undefined,
-                        duration_ms: undefined,
-                        result_bytes: undefined,
-                        error_text: undefined,
-                    },
-                });
-            }
+    // Tool calls from content blocks in assistant messages. normalizeOmpToolCall handles both
+    // the legacy nested `{toolCall: {...}}` block and pi's flat `{type: "toolCall", id, name,
+    // arguments}` block.
+    if (Array.isArray(contentBlocks) && role === 'assistant') {
+        for (const block of contentBlocks as Record<string, unknown>[]) {
+            const call = normalizeOmpToolCall(block);
+            if (call === null) continue;
+            entries.push({
+                targetTable: 'history_tool_call',
+                record: {
+                    _messageSplitIndex: messageSplitIndex,
+                    session_id: sessionId,
+                    seq,
+                    tool_name: String(call.name ?? ''),
+                    // The tool's own call id is the exact join key a toolResult's `toolCallId`
+                    // matches (see ompSplit / task 0564 R1).
+                    call_id: s(call.id),
+                    args_digest: argsDigest(call.input ?? call.arguments),
+                    args_raw: maybeArgsRaw('pi', String(call.name ?? ''), call.input ?? call.arguments),
+                    status: 'ok',
+                    started_at: undefined,
+                    completed_at: undefined,
+                    duration_ms: undefined,
+                    result_bytes: undefined,
+                    error_text: undefined,
+                },
+            });
         }
     }
 
     return entries;
 }
 
+/**
+ * Canonicalize a pi message role. pi tool results and bash executions ride user turns (Claude
+ * protocol shape); everything unrecognized clamps to `unknown` so pi record types never leak
+ * into the role column (task 0577 AC2).
+ */
+function piRole(type: unknown): string {
+    const t = String(type ?? '').toLowerCase();
+    if (t === 'toolresult' || t === 'tool_result' || t === 'bashexecution' || t === 'tool') return 'user';
+    const mapped = mapRole(t);
+    if (mapped === 'user' || mapped === 'assistant' || mapped === 'system') return mapped;
+    return 'unknown';
+}
+
 // ---------------------------------------------------------------------------
 // OMP mapper (near-identical to pi)
 // ---------------------------------------------------------------------------
@@ -411,6 +471,10 @@ export function ompSplit(raw: Record<string, unknown>, context?: TransformContex
                     session_id: sessionId,
                     seq,
                     tool_name: String(call.name ?? ''),
+                    // Task 0564 R1: the tool's own call id is the exact join key a
+                    // toolResult's `toolCallId` matches — it lets the streaming loop
+                    // attach the tool's measured duration to the right row.
+                    call_id: s(call.id),
                     args_digest: argsDigest(call.input ?? call.arguments),
                     args_raw: maybeArgsRaw('omp', String(call.name ?? ''), call.input ?? call.arguments),
                     status: 'ok',
@@ -441,6 +505,51 @@ function normalizeOmpToolCall(block: Record<string, unknown>): Record<string, un
     return null;
 }
 
+// ---------------------------------------------------------------------------
+// OMP toolResult timing signals (task 0564 R1)
+// ---------------------------------------------------------------------------
+
+/** Timing signals carried by an OMP toolResult message envelope (task 0564 R1). */
+export interface OmpToolResultTiming {
+    /** The toolCall id this result answers — joins `toolCall.id` exactly. */
+    toolCallId: string;
+    /** The tool's own measured wall time in ms, when present and finite. */
+    wallTimeMs: number | undefined;
+    /** Message timestamp as epoch millis, when parseable. */
+    timestampMs: number | undefined;
+}
+
+/** Parse a message timestamp (epoch-millis number, numeric string, or ISO) to epoch millis. */
+export function timestampToEpochMs(value: unknown): number | undefined {
+    if (typeof value === 'number' && Number.isFinite(value)) return value;
+    if (typeof value === 'string' && value.length > 0) {
+        const numeric = Number(value);
+        if (Number.isFinite(numeric)) return numeric;
+        const parsed = Date.parse(value);
+        if (!Number.isNaN(parsed)) return parsed;
+    }
+    return undefined;
+}
+
+/**
+ * Extract toolResult timing signals from a raw OMP record (task 0564 R1), or null
+ * when the record is not a toolResult message or carries no toolCallId. Live OMP
+ * emits `role: "toolResult"` message envelopes with `{toolCallId, toolName,
+ * content, details, isError, timestamp}`; `details.wallTimeMs` is the tool's own
+ * measured wall time (48% of results in the sampled session) and `toolCallId`
+ * joins the originating `toolCall.id` exactly.
+ */
+export function ompToolResultTiming(raw: Record<string, unknown>): OmpToolResultTiming | null {
+    const msg = o(raw.message);
+    if (String(msg.role ?? '').toLowerCase() !== 'toolresult') return null;
+    const toolCallId = s(msg.toolCallId);
+    if (toolCallId === undefined) return null;
+    const details = o(msg.details);
+    const wallTimeMs =
+        typeof details.wallTimeMs === 'number' && Number.isFinite(details.wallTimeMs) ? details.wallTimeMs : undefined;
+    return { toolCallId, wallTimeMs, timestampMs: timestampToEpochMs(raw.timestamp ?? msg.timestamp) };
+}
+
 // ---------------------------------------------------------------------------
 // Codex mapper
 // ---------------------------------------------------------------------------

package/src/schema-sql.ts

@@ -62,6 +62,7 @@ CREATE TABLE IF NOT EXISTS history_tool_call (
     session_id    TEXT NOT NULL,
     seq           INTEGER NOT NULL,
     tool_name     TEXT NOT NULL,
+    call_id       TEXT,
     args_digest   TEXT,
     args_raw      TEXT,
     status        TEXT NOT NULL,