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

package/dist/mappers.d.ts

@@ -2,6 +2,11 @@ import { z } from 'zod';
 import type { JsonObject, SplitEntry, TransformContext } from './types';
 /** Compute args_digest: sha256 of stable-jsonified, key-sorted, redacted args. */
 export declare function argsDigest(args: unknown): string;
+/**
+ * Return JSON-stringified raw args when the tool is a todo-writing tool for its source,
+ * otherwise undefined. Codex `arguments` arrives as a JSON string already — store as-is.
+ */
+export declare function maybeArgsRaw(source: string, toolName: string, args: unknown): string | undefined;
 /** 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. */

package/dist/mappers.d.ts.map

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

package/dist/mappers.js

@@ -89,14 +89,17 @@ function redactArgs(args) {
  *
  * Evidence: 0489 R4 confirmed omp/pi/claude; codex/grok/agy probed task 0553 R3 from real
  * session JSONL. agy has no on-disk session format (VS Code fork); gemini deferred by the
- * 2026-08-06 source-support ruling.
+ * 2026-08-06 source-support ruling. Task 0578 R3: omp `todo_write`, pi `manage_todo_list`,
+ * opencode `todowrite`/`todoread` measured live in .spur/spur.db (3,237/21, 1,043, 379/2
+ * rows with NULL args_raw).
  */
 const TODO_TOOL_ALLOWLIST = {
     claude: ['TodoWrite'],
-    pi: ['todo'],
-    omp: ['TodoWrite', 'todo'],
+    opencode: ['todowrite', 'todoread'],
     codex: ['update_plan'],
+    omp: ['TodoWrite', 'todo', 'todo_write'],
     grok: ['todo_write'],
+    pi: ['todo', 'manage_todo_list'],
     agy: [],
     gemini: [],
 };
@@ -104,7 +107,7 @@ const TODO_TOOL_ALLOWLIST = {
  * Return JSON-stringified raw args when the tool is a todo-writing tool for its source,
  * otherwise undefined. Codex `arguments` arrives as a JSON string already — store as-is.
  */
-function maybeArgsRaw(source, toolName, args) {
+export function maybeArgsRaw(source, toolName, args) {
     const allow = TODO_TOOL_ALLOWLIST[source];
     if (allow === undefined || !allow.includes(toolName))
         return undefined;
@@ -122,10 +125,10 @@ export function claudeSplit(raw) {
     const entries = [];
     const sessionId = s(raw.sessionId, raw.conversation_uuid) ?? 'unknown';
     const seq = typeof raw.seq === 'number' ? raw.seq : typeof raw.messageIndex === 'number' ? raw.messageIndex : 0;
-    const ts = s(raw.ts, raw.timestamp, raw.createdAt) ?? new Date(0).toISOString();
+    const ts = timestampOf(raw.ts, raw.timestamp, raw.createdAt);
     const role = mapRole(raw.type ?? raw.role);
     const recordType = String(raw.type ?? '');
-    const model = s(raw.model);
+    const model = s(raw.model, o(raw.message).model);
     const cwd = s(raw.cwd, raw.dir);
     // Check for system/turn-duration records
     if (raw.subtype === 'turn_duration' && typeof raw.durationMs === 'number') {
@@ -162,13 +165,13 @@ export function claudeSplit(raw) {
     }
     // Main message
     const hasUsage = typeof raw.usage === 'object' && raw.usage !== null;
-    const usage = hasUsage ? raw.usage : undefined;
-    const inputTokens = typeof raw.inputTokens === 'number' ? raw.inputTokens : undefined;
-    const outputTokens = typeof raw.outputTokens === 'number' ? raw.outputTokens : undefined;
-    const cacheRead = (usage?.cacheReadTokens ?? usage?.cache_read_tokens ?? undefined);
-    const cacheWrite = (usage?.cacheWriteTokens ?? usage?.cache_write_tokens ?? undefined);
+    const usage = (hasUsage ? raw.usage : o(raw.message).usage);
+    const inputTokens = (raw.inputTokens ?? usage?.input_tokens);
+    const outputTokens = (raw.outputTokens ?? usage?.output_tokens);
+    const cacheRead = (usage?.cacheReadTokens ?? usage?.cache_read_tokens ?? usage?.cache_read_input_tokens);
+    const cacheWrite = (usage?.cacheWriteTokens ?? usage?.cache_write_tokens ?? usage?.cache_creation_input_tokens);
     const costUsd = computeCost(inputTokens, outputTokens, model);
-    const contentBlocks = raw.content;
+    const contentBlocks = raw.content ?? o(raw.message).content;
     const contentText = extractContentText(contentBlocks);
     const messageSplitIndex = entries.length;
     entries.push({
@@ -235,10 +238,9 @@ export function piSplit(raw, context) {
     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();
+    // Prefer the ISO `timestamp`; numeric epoch values are converted (task 0580 R6), never
+    // stringified, and a missing ts persists as null rather than a 1970 sentinel (D4).
+    const ts = timestampOf(raw.timestamp, raw.createdAt, raw.ts);
     // 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' ||
@@ -363,7 +365,7 @@ export function ompSplit(raw, context) {
     const recordType = String(raw.type ?? '');
     const sessionId = sessionIdFromContext(context, raw);
     const seq = context?.sourceLine ?? (typeof raw.seq === 'number' ? raw.seq : 0);
-    const ts = s(raw.ts, raw.timestamp, raw.createdAt) ?? new Date(0).toISOString();
+    const ts = timestampOf(raw.ts, raw.timestamp, raw.createdAt);
     // Meta lifecycle/custom records — including the current `custom.*` events and non-message
     // lifecycle types — collapse to one meta row keyed by the source session, never the unique
     // event id, and never a guessed role.
@@ -517,8 +519,9 @@ export function codexSplit(raw) {
     const payload = (raw.payload ?? raw);
     const sessionId = s(raw.session_id, o(raw.session_meta).id, raw.id) ?? 'unknown';
     const seq = typeof raw.seq === 'number' ? raw.seq : 0;
-    const ts = s(raw.timestamp, raw.ts, payload.ts) ?? new Date(0).toISOString();
+    const ts = timestampOf(raw.timestamp, raw.ts, payload.ts);
     const recordType = String(raw.type ?? '');
+    const payloadType = String(payload.type ?? '');
     // Check for older short format
     if (recordType === '' && raw.id && raw.timestamp && raw.instructions) {
         return [
@@ -536,18 +539,77 @@ export function codexSplit(raw) {
             },
         ];
     }
-    const role = mapRole(recordType);
+    // Codex JSONL is a transport envelope: the top-level `type` (response_item / event_msg /
+    // turn_context / ...) is bookkeeping, never a role. Real roles live in
+    // `payload.role` for response_item message items (task 0580 D1: passing recordType to
+    // mapRole leaked 153k response_item / 91k event_msg rows into the role column).
+    let role;
+    let disposition;
+    let contentText;
+    let usage;
+    if (recordType === 'response_item') {
+        if (payloadType === 'message') {
+            role = mapRole(payload.role);
+            disposition = 'keep';
+            contentText = extractContentText(payload.content) ?? s(payload.text) ?? null;
+        }
+        else if (payloadType === 'agent_message') {
+            role = 'assistant';
+            disposition = 'keep';
+            contentText = extractContentText(payload.content) ?? s(payload.text, payload.message) ?? null;
+        }
+        else if (payloadType === 'reasoning') {
+            role = 'assistant';
+            disposition = 'keep';
+            contentText = extractContentText(payload.summary) ?? s(payload.text) ?? null;
+        }
+        else if (payloadType === 'function_call' || payloadType === 'custom_tool_call') {
+            role = 'tool';
+            disposition = 'keep';
+            contentText = null;
+        }
+        else {
+            role = 'meta';
+            disposition = 'meta';
+            contentText = s(payload.text) ?? null;
+        }
+    }
+    else if (recordType === 'user' || recordType === 'assistant') {
+        // Legacy (pre-rollout) envelope: top-level type carried the role directly.
+        role = mapRole(recordType);
+        disposition = 'keep';
+        contentText = extractContentText(payload.content) ?? s(raw.content, payload.text) ?? null;
+    }
+    else if (recordType === 'message') {
+        role = mapRole(raw.role ?? payload.role);
+        disposition = 'keep';
+        contentText = extractContentText(payload.content ?? raw.content) ?? s(payload.text, raw.text) ?? null;
+    }
+    else if (recordType === 'event_msg') {
+        role = 'meta';
+        disposition = 'meta';
+        contentText = s(payload.message, payload.text) ?? null;
+        // Per-turn usage lives on token_count transport events (task 0580 R2): real files
+        // carry `payload.info.last_token_usage`; the legacy `payload.token_count` path is kept.
+        usage = o(o(payload.info).last_token_usage);
+    }
+    else {
+        role = 'meta';
+        disposition = 'meta';
+        contentText = s(payload.text, raw.instructions) ?? null;
+    }
     const model = s(raw.model, payload.model, o(o(raw.turn_context).payload).model);
     const cwd = s(raw.cwd, raw.dir);
     const tokenCount = payload.token_count;
-    const inputTokens = (tokenCount?.input ?? tokenCount?.input_tokens ?? undefined);
-    const outputTokens = (tokenCount?.output ?? tokenCount?.output_tokens ?? undefined);
+    const usageInput = (usage?.input_tokens ?? tokenCount?.input ?? tokenCount?.input_tokens ?? undefined);
+    const usageOutput = (usage?.output_tokens ?? tokenCount?.output ?? tokenCount?.output_tokens ?? undefined);
+    const cacheRead = (usage?.cached_input_tokens ?? undefined);
     const turnCtx = raw.turn_context;
     const turnPayload = turnCtx?.payload;
     const turnInputTokens = turnPayload?.input_tokens;
     const turnOutputTokens = turnPayload?.output_tokens;
-    const finalInput = inputTokens !== undefined ? inputTokens : turnInputTokens;
-    const finalOutput = outputTokens !== undefined ? outputTokens : turnOutputTokens;
+    const finalInput = usageInput !== undefined ? usageInput : turnInputTokens;
+    const finalOutput = usageOutput !== undefined ? usageOutput : turnOutputTokens;
     const costUsd = computeCost(finalInput, finalOutput, model);
     const messageSplitIndex = entries.length;
     entries.push({
@@ -557,47 +619,56 @@ export function codexSplit(raw) {
             seq,
             role,
             record_type: recordType,
-            disposition: 'keep',
+            disposition,
             ts,
             duration_ms: undefined,
             model: model ?? null,
             input_tokens: finalInput ?? null,
             output_tokens: finalOutput ?? null,
-            cache_read_tokens: null,
+            cache_read_tokens: cacheRead ?? null,
             cache_write_tokens: null,
             cost_usd: costUsd ?? null,
-            content_text: s(payload.content, payload.text, raw.content, raw.text) ?? null,
+            content_text: contentText,
             cwd: cwd ?? null,
             provenance: 'ambient',
         },
     });
-    // Tool calls: function_call in response_item
-    const responseItems = payload.response_item
-        ? [payload.response_item]
-        : Array.isArray(payload.response_items)
-            ? payload.response_items
-            : [];
-    for (const item of responseItems) {
-        if (item.function_call) {
-            const fc = item.function_call;
-            entries.push({
-                targetTable: 'history_tool_call',
-                record: {
-                    _messageSplitIndex: messageSplitIndex,
-                    session_id: sessionId,
-                    seq,
-                    tool_name: String(fc.name ?? ''),
-                    args_digest: argsDigest(fc.arguments),
-                    args_raw: maybeArgsRaw('codex', String(fc.name ?? ''), fc.arguments),
-                    status: 'ok',
-                    started_at: undefined,
-                    completed_at: undefined,
-                    duration_ms: undefined,
-                    result_bytes: undefined,
-                    error_text: undefined,
-                },
-            });
-        }
+    // Tool calls. Live rollouts emit each call as its own response_item whose payload IS the
+    // item (`payload.type === "function_call" | "custom_tool_call"`, name/call_id/arguments or
+    // input at payload level); the legacy nested `payload.response_item[_s]` shape is kept.
+    const toolItems = [];
+    if ((recordType === 'response_item' || recordType === 'function_call' || recordType === 'custom_tool_call') &&
+        (payloadType === 'function_call' || payloadType === 'custom_tool_call')) {
+        toolItems.push(payload);
+    }
+    else if (payload.response_item) {
+        toolItems.push(payload.response_item);
+    }
+    else if (Array.isArray(payload.response_items)) {
+        toolItems.push(...payload.response_items);
+    }
+    for (const item of toolItems) {
+        const fc = item.function_call ?? item;
+        const toolName = s(fc.name) ?? '';
+        const args = fc.arguments ?? fc.input;
+        entries.push({
+            targetTable: 'history_tool_call',
+            record: {
+                _messageSplitIndex: messageSplitIndex,
+                session_id: sessionId,
+                seq,
+                tool_name: toolName,
+                call_id: s(fc.call_id),
+                args_digest: argsDigest(args),
+                args_raw: maybeArgsRaw('codex', toolName, args),
+                status: 'ok',
+                started_at: undefined,
+                completed_at: undefined,
+                duration_ms: undefined,
+                result_bytes: undefined,
+                error_text: undefined,
+            },
+        });
     }
     return entries;
 }
@@ -610,7 +681,7 @@ export function agySplit(raw) {
     const recordType = String(raw.type ?? '');
     const sessionId = s(raw.session_id, raw.conversation_id) ?? 'unknown';
     const seq = typeof raw.seq === 'number' ? raw.seq : typeof raw.step_index === 'number' ? raw.step_index : 0;
-    const ts = s(raw.created_at, raw.timestamp, raw.ts) ?? new Date(0).toISOString();
+    const ts = timestampOf(raw.created_at, raw.timestamp, raw.ts);
     let role;
     let disposition;
     let contentText = null;
@@ -723,7 +794,7 @@ export function geminiSplit(raw, context) {
     const state = o(raw.$set);
     const sessionId = sessionIdFromContext(context, raw);
     const seq = context?.sourceLine ?? 0;
-    const ts = s(raw.timestamp, raw.startTime, raw.lastUpdated, state.lastUpdated) ?? new Date(0).toISOString();
+    const ts = timestampOf(raw.timestamp, raw.startTime, raw.lastUpdated, state.lastUpdated);
     if (recordType === 'session' || recordType === 'state') {
         return [
             {
@@ -858,7 +929,12 @@ function normalizeGrokRecord(raw) {
             : undefined));
     const usage = (body.usage ?? raw.usage);
     const toolMeta = meta?.['x.ai/tool'];
-    const toolName = s(body.title, body.tool_name, body.name, toolMeta?.name, toolMeta?.label, raw.tool_name, raw.name) ?? '';
+    // The tool's real name is `_meta["x.ai/tool"].name` (or `kind`); `title` is a human label
+    // like "Read `/path`" — used only as a last resort, stripped at the first backtick so the
+    // argument payload never pollutes tool_name (task 0580 D3).
+    const titleFallback = s(body.title)?.split('`')[0]?.trim();
+    const toolName = s(toolMeta?.name, body.kind, body.tool_name, body.name, raw.tool_name, raw.name) ??
+        (titleFallback !== undefined && titleFallback.length > 0 && titleFallback.length <= 40 ? titleFallback : '');
     const toolArgs = body.rawInput ?? body.input ?? body.arguments ?? toolMeta?.input ?? raw.input ?? raw.arguments;
     const toolStatus = s(body.status, raw.outcome, raw.status) ?? 'ok';
     const durationMs = typeof body.duration_ms === 'number'
@@ -888,20 +964,7 @@ function normalizeGrokRecord(raw) {
     };
 }
 function normalizeTs(value) {
-    if (typeof value === 'number' && Number.isFinite(value)) {
-        // Grok timestamps are unix seconds (sometimes with fractional).
-        const ms = value > 1e12 ? value : value * 1000;
-        return new Date(ms).toISOString();
-    }
-    if (typeof value === 'string' && value.length > 0) {
-        const asNum = Number(value);
-        if (Number.isFinite(asNum) && /^\d+(\.\d+)?$/.test(value.trim())) {
-            const ms = asNum > 1e12 ? asNum : asNum * 1000;
-            return new Date(ms).toISOString();
-        }
-        return value;
-    }
-    return new Date(0).toISOString();
+    return timestampOf(value);
 }
 function extractGrokContent(content) {
     if (typeof content === 'string')
@@ -1265,9 +1328,31 @@ function s(...values) {
     }
     return undefined;
 }
+/**
+ * First usable timestamp: an ISO-ish string passes through, a finite number (or digit-string)
+ * is converted from epoch seconds/millis (>1e12 treated as ms). Returns undefined when nothing
+ * usable exists — mappers must persist null ts rather than a 1970 sentinel (task 0580 D4).
+ */
+function timestampOf(...values) {
+    for (const value of values) {
+        if (typeof value === 'number' && Number.isFinite(value)) {
+            const ms = value > 1e12 ? value : value * 1000;
+            return new Date(ms).toISOString();
+        }
+        if (typeof value === 'string' && value.length > 0) {
+            const asNum = Number(value);
+            if (Number.isFinite(asNum) && /^\d+(\.\d+)?$/.test(value.trim())) {
+                const ms = asNum > 1e12 ? asNum : asNum * 1000;
+                return new Date(ms).toISOString();
+            }
+            return value;
+        }
+    }
+    return undefined;
+}
 function mapRole(type) {
     const t = String(type ?? '').toLowerCase();
-    if (t === 'user' || t === 'human')
+    if (t === 'user' || t === 'human' || t === 'developer')
         return 'user';
     if (t === 'assistant' || t === 'ai' || t === 'model')
         return 'assistant';
@@ -1296,7 +1381,9 @@ function extractContentText(content) {
         if (typeof block !== 'object' || block === null)
             continue;
         const b = block;
-        if (b.type === 'text' && typeof b.text === 'string') {
+        // Claude emits {type:"text",text}; codex emits {type:"input_text"|"output_text"|
+        // "summary_text",text} — any block carrying a string `text` is text content.
+        if (typeof b.text === 'string') {
             parts.push(b.text);
         }
     }

package/dist/opencode-importer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"opencode-importer.d.ts","sourceRoot":"","sources":["../src/opencode-importer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,SAAS,EAAkB,MAAM,kBAAkB,CAAC;AACnF,OAAO,EAGH,KAAK,UAAU,EAEf,KAAK,YAAY,EACpB,MAAM,uBAAuB,CAAC;AAe/B,OAAO,KAAK,EAAe,UAAU,EAAE,YAAY,EAAgC,aAAa,EAAE,MAAM,SAAS,CAAC;AAYlH,8EAA8E;AAC9E,MAAM,WAAW,qBAAqB;IAClC,EAAE,EAAE,SAAS,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,SAAS,aAAa,EAAE,CAAC;IAC1C,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;CACpB;AAED,wFAAwF;AACxF,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,YAAY,CAAC,CAoI7F"}
+{"version":3,"file":"opencode-importer.d.ts","sourceRoot":"","sources":["../src/opencode-importer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,KAAK,SAAS,EAAkB,MAAM,kBAAkB,CAAC;AACnF,OAAO,EAGH,KAAK,UAAU,EAEf,KAAK,YAAY,EACpB,MAAM,uBAAuB,CAAC;AAgB/B,OAAO,KAAK,EAAe,UAAU,EAAE,YAAY,EAAgC,aAAa,EAAE,MAAM,SAAS,CAAC;AAYlH,8EAA8E;AAC9E,MAAM,WAAW,qBAAqB;IAClC,EAAE,EAAE,SAAS,CAAC;IACd,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,KAAK,CAAC,EAAE,YAAY,CAAC;IACrB,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,SAAS,aAAa,EAAE,CAAC;IAC1C,GAAG,CAAC,EAAE,MAAM,IAAI,CAAC;CACpB;AAED,wFAAwF;AACxF,wBAAsB,iBAAiB,CAAC,OAAO,EAAE,qBAAqB,GAAG,OAAO,CAAC,YAAY,CAAC,CAoI7F"}

package/dist/opencode-importer.js

@@ -2,6 +2,7 @@ import { createDbAdapter } from '@gobing-ai/ts-db';
 import { ambientRuntimePaths, createNodeFileSystem, joinPath, } from '@gobing-ai/ts-runtime';
 import { sha256 } from './hash.js';
 import { applyHistoryImportSchema, deleteCheckpointOperation, openCodeBulkWriteOperations, openCodeDeleteOperations, readOpenCodeExistingEntries, readOpenCodeMessages, readOpenCodeParts, } from './jsonl-importer-dao.js';
+import { maybeArgsRaw } from './mappers.js';
 import { redactRecord } from './redaction.js';
 const SOURCE = 'opencode';
 const PAGE_SIZE = 250;
@@ -202,6 +203,7 @@ function prepareEntries(row, data, parts, sourceFile, redactionRules) {
             session_id: row.session_id,
             seq: started ?? created,
             tool_name: stringValue(part.tool) ?? 'unknown',
+            args_raw: maybeArgsRaw(SOURCE, stringValue(part.tool) ?? 'unknown', state.input),
             args_digest: sha256(state.input ?? null),
             status,
             started_at: started === undefined ? null : isoTime(started),

package/dist/schema-sql.js

@@ -37,7 +37,7 @@ CREATE TABLE IF NOT EXISTS history_message (
     role               TEXT NOT NULL,
     record_type        TEXT NOT NULL,
     disposition        TEXT NOT NULL,
-    ts                 TEXT NOT NULL,
+    ts                 TEXT,
     duration_ms        INTEGER,
     model              TEXT,
     input_tokens       INTEGER,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gobing-ai/ts-llm-jsonl-importer",
-    "version": "0.4.36",
+    "version": "0.4.38",
     "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.36",
-        "@gobing-ai/ts-runtime": "^0.4.36",
-        "@gobing-ai/ts-utils": "^0.4.36",
+        "@gobing-ai/ts-db": "^0.4.38",
+        "@gobing-ai/ts-runtime": "^0.4.38",
+        "@gobing-ai/ts-utils": "^0.4.38",
         "zod": "^4.1.0"
     },
     "devDependencies": {

package/src/mappers.ts

@@ -96,14 +96,17 @@ function redactArgs(args: unknown): unknown {
  *
  * Evidence: 0489 R4 confirmed omp/pi/claude; codex/grok/agy probed task 0553 R3 from real
  * session JSONL. agy has no on-disk session format (VS Code fork); gemini deferred by the
- * 2026-08-06 source-support ruling.
+ * 2026-08-06 source-support ruling. Task 0578 R3: omp `todo_write`, pi `manage_todo_list`,
+ * opencode `todowrite`/`todoread` measured live in .spur/spur.db (3,237/21, 1,043, 379/2
+ * rows with NULL args_raw).
  */
 const TODO_TOOL_ALLOWLIST: Readonly<Record<string, readonly string[]>> = {
     claude: ['TodoWrite'],
-    pi: ['todo'],
-    omp: ['TodoWrite', 'todo'],
+    opencode: ['todowrite', 'todoread'],
     codex: ['update_plan'],
+    omp: ['TodoWrite', 'todo', 'todo_write'],
     grok: ['todo_write'],
+    pi: ['todo', 'manage_todo_list'],
     agy: [],
     gemini: [],
 };
@@ -112,7 +115,7 @@ const TODO_TOOL_ALLOWLIST: Readonly<Record<string, readonly string[]>> = {
  * Return JSON-stringified raw args when the tool is a todo-writing tool for its source,
  * otherwise undefined. Codex `arguments` arrives as a JSON string already — store as-is.
  */
-function maybeArgsRaw(source: string, toolName: string, args: unknown): string | undefined {
+export function maybeArgsRaw(source: string, toolName: string, args: unknown): string | undefined {
     const allow = TODO_TOOL_ALLOWLIST[source];
     if (allow === undefined || !allow.includes(toolName)) return undefined;
     if (typeof args === 'string') return args;
@@ -129,10 +132,10 @@ export function claudeSplit(raw: Record<string, unknown>): readonly SplitEntry[]
     const entries: SplitEntry[] = [];
     const sessionId = s(raw.sessionId, raw.conversation_uuid) ?? 'unknown';
     const seq = typeof raw.seq === 'number' ? raw.seq : typeof raw.messageIndex === 'number' ? raw.messageIndex : 0;
-    const ts = s(raw.ts, raw.timestamp, raw.createdAt) ?? new Date(0).toISOString();
+    const ts = timestampOf(raw.ts, raw.timestamp, raw.createdAt);
     const role = mapRole(raw.type ?? raw.role);
     const recordType = String(raw.type ?? '');
-    const model = s(raw.model);
+    const model = s(raw.model, o(raw.message).model);
     const cwd = s(raw.cwd, raw.dir);
 
     // Check for system/turn-duration records
@@ -171,14 +174,17 @@ export function claudeSplit(raw: Record<string, unknown>): readonly SplitEntry[]
 
     // Main message
     const hasUsage = typeof raw.usage === 'object' && raw.usage !== null;
-    const usage = hasUsage ? (raw.usage as Record<string, unknown>) : undefined;
-    const inputTokens = typeof raw.inputTokens === 'number' ? raw.inputTokens : undefined;
-    const outputTokens = typeof raw.outputTokens === 'number' ? raw.outputTokens : undefined;
-    const cacheRead = (usage?.cacheReadTokens ?? usage?.cache_read_tokens ?? undefined) as number | undefined;
-    const cacheWrite = (usage?.cacheWriteTokens ?? usage?.cache_write_tokens ?? undefined) as number | undefined;
+    const usage = (hasUsage ? raw.usage : o(raw.message).usage) as Record<string, unknown> | undefined;
+    const inputTokens = ((raw.inputTokens as number | undefined) ?? usage?.input_tokens) as number | undefined;
+    const outputTokens = ((raw.outputTokens as number | undefined) ?? usage?.output_tokens) as number | undefined;
+    const cacheRead = (usage?.cacheReadTokens ?? usage?.cache_read_tokens ?? usage?.cache_read_input_tokens) as
+        | number
+        | undefined;
+    const cacheWrite = (usage?.cacheWriteTokens ?? usage?.cache_write_tokens ?? usage?.cache_creation_input_tokens) as
+        | number
+        | undefined;
     const costUsd = computeCost(inputTokens, outputTokens, model);
-
-    const contentBlocks = raw.content;
+    const contentBlocks = raw.content ?? o(raw.message).content;
     const contentText = extractContentText(contentBlocks);
 
     const messageSplitIndex = entries.length;
@@ -250,11 +256,9 @@ export function piSplit(raw: Record<string, unknown>, context?: TransformContext
     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();
+    // Prefer the ISO `timestamp`; numeric epoch values are converted (task 0580 R6), never
+    // stringified, and a missing ts persists as null rather than a 1970 sentinel (D4).
+    const ts = timestampOf(raw.timestamp, raw.createdAt, raw.ts);
 
     // Meta lifecycle/custom records collapse to one meta row keyed by the source session,
     // never the unique event id, and never a guessed role.
@@ -387,7 +391,7 @@ export function ompSplit(raw: Record<string, unknown>, context?: TransformContex
     const recordType = String(raw.type ?? '');
     const sessionId = sessionIdFromContext(context, raw);
     const seq = context?.sourceLine ?? (typeof raw.seq === 'number' ? raw.seq : 0);
-    const ts = s(raw.ts, raw.timestamp, raw.createdAt) ?? new Date(0).toISOString();
+    const ts = timestampOf(raw.ts, raw.timestamp, raw.createdAt);
 
     // Meta lifecycle/custom records — including the current `custom.*` events and non-message
     // lifecycle types — collapse to one meta row keyed by the source session, never the unique
@@ -561,8 +565,9 @@ export function codexSplit(raw: Record<string, unknown>): readonly SplitEntry[]
     const payload = (raw.payload ?? raw) as Record<string, unknown>;
     const sessionId = s(raw.session_id, o(raw.session_meta).id, raw.id) ?? 'unknown';
     const seq = typeof raw.seq === 'number' ? raw.seq : 0;
-    const ts = s(raw.timestamp, raw.ts, payload.ts) ?? new Date(0).toISOString();
+    const ts = timestampOf(raw.timestamp, raw.ts, payload.ts);
     const recordType = String(raw.type ?? '');
+    const payloadType = String(payload.type ?? '');
 
     // Check for older short format
     if (recordType === '' && raw.id && raw.timestamp && raw.instructions) {
@@ -582,21 +587,77 @@ export function codexSplit(raw: Record<string, unknown>): readonly SplitEntry[]
         ];
     }
 
-    const role = mapRole(recordType);
+    // Codex JSONL is a transport envelope: the top-level `type` (response_item / event_msg /
+    // turn_context / ...) is bookkeeping, never a role. Real roles live in
+    // `payload.role` for response_item message items (task 0580 D1: passing recordType to
+    // mapRole leaked 153k response_item / 91k event_msg rows into the role column).
+    let role: string;
+    let disposition: string;
+    let contentText: string | null;
+    let usage: Record<string, unknown> | undefined;
+    if (recordType === 'response_item') {
+        if (payloadType === 'message') {
+            role = mapRole(payload.role);
+            disposition = 'keep';
+            contentText = extractContentText(payload.content) ?? s(payload.text) ?? null;
+        } else if (payloadType === 'agent_message') {
+            role = 'assistant';
+            disposition = 'keep';
+            contentText = extractContentText(payload.content) ?? s(payload.text, payload.message) ?? null;
+        } else if (payloadType === 'reasoning') {
+            role = 'assistant';
+            disposition = 'keep';
+            contentText = extractContentText(payload.summary) ?? s(payload.text) ?? null;
+        } else if (payloadType === 'function_call' || payloadType === 'custom_tool_call') {
+            role = 'tool';
+            disposition = 'keep';
+            contentText = null;
+        } else {
+            role = 'meta';
+            disposition = 'meta';
+            contentText = s(payload.text) ?? null;
+        }
+    } else if (recordType === 'user' || recordType === 'assistant') {
+        // Legacy (pre-rollout) envelope: top-level type carried the role directly.
+        role = mapRole(recordType);
+        disposition = 'keep';
+        contentText = extractContentText(payload.content) ?? s(raw.content, payload.text) ?? null;
+    } else if (recordType === 'message') {
+        role = mapRole(raw.role ?? payload.role);
+        disposition = 'keep';
+        contentText = extractContentText(payload.content ?? raw.content) ?? s(payload.text, raw.text) ?? null;
+    } else if (recordType === 'event_msg') {
+        role = 'meta';
+        disposition = 'meta';
+        contentText = s(payload.message, payload.text) ?? null;
+        // Per-turn usage lives on token_count transport events (task 0580 R2): real files
+        // carry `payload.info.last_token_usage`; the legacy `payload.token_count` path is kept.
+        usage = o(o(payload.info).last_token_usage);
+    } else {
+        role = 'meta';
+        disposition = 'meta';
+        contentText = s(payload.text, raw.instructions) ?? null;
+    }
+
     const model = s(raw.model, payload.model, o(o(raw.turn_context).payload).model);
     const cwd = s(raw.cwd, raw.dir);
 
     const tokenCount = payload.token_count as Record<string, unknown> | undefined;
-    const inputTokens = (tokenCount?.input ?? tokenCount?.input_tokens ?? undefined) as number | undefined;
-    const outputTokens = (tokenCount?.output ?? tokenCount?.output_tokens ?? undefined) as number | undefined;
+    const usageInput = (usage?.input_tokens ?? tokenCount?.input ?? tokenCount?.input_tokens ?? undefined) as
+        | number
+        | undefined;
+    const usageOutput = (usage?.output_tokens ?? tokenCount?.output ?? tokenCount?.output_tokens ?? undefined) as
+        | number
+        | undefined;
+    const cacheRead = (usage?.cached_input_tokens ?? undefined) as number | undefined;
 
     const turnCtx = raw.turn_context as Record<string, unknown> | undefined;
     const turnPayload = turnCtx?.payload as Record<string, unknown> | undefined;
     const turnInputTokens = turnPayload?.input_tokens as number | undefined;
     const turnOutputTokens = turnPayload?.output_tokens as number | undefined;
 
-    const finalInput = inputTokens !== undefined ? inputTokens : turnInputTokens;
-    const finalOutput = outputTokens !== undefined ? outputTokens : turnOutputTokens;
+    const finalInput = usageInput !== undefined ? usageInput : turnInputTokens;
+    const finalOutput = usageOutput !== undefined ? usageOutput : turnOutputTokens;
     const costUsd = computeCost(finalInput, finalOutput, model);
 
     const messageSplitIndex = entries.length;
@@ -608,48 +669,57 @@ export function codexSplit(raw: Record<string, unknown>): readonly SplitEntry[]
             seq,
             role,
             record_type: recordType,
-            disposition: 'keep',
+            disposition,
             ts,
             duration_ms: undefined,
             model: model ?? null,
             input_tokens: finalInput ?? null,
             output_tokens: finalOutput ?? null,
-            cache_read_tokens: null,
+            cache_read_tokens: cacheRead ?? null,
             cache_write_tokens: null,
             cost_usd: costUsd ?? null,
-            content_text: s(payload.content, payload.text, raw.content, raw.text) ?? null,
+            content_text: contentText,
             cwd: cwd ?? null,
             provenance: 'ambient',
         },
     });
 
-    // Tool calls: function_call in response_item
-    const responseItems = payload.response_item
-        ? [payload.response_item as Record<string, unknown>]
-        : Array.isArray(payload.response_items)
-          ? (payload.response_items as Record<string, unknown>[])
-          : [];
-    for (const item of responseItems) {
-        if (item.function_call) {
-            const fc = item.function_call as Record<string, unknown>;
-            entries.push({
-                targetTable: 'history_tool_call',
-                record: {
-                    _messageSplitIndex: messageSplitIndex,
-                    session_id: sessionId,
-                    seq,
-                    tool_name: String(fc.name ?? ''),
-                    args_digest: argsDigest(fc.arguments),
-                    args_raw: maybeArgsRaw('codex', String(fc.name ?? ''), fc.arguments),
-                    status: 'ok',
-                    started_at: undefined,
-                    completed_at: undefined,
-                    duration_ms: undefined,
-                    result_bytes: undefined,
-                    error_text: undefined,
-                },
-            });
-        }
+    // Tool calls. Live rollouts emit each call as its own response_item whose payload IS the
+    // item (`payload.type === "function_call" | "custom_tool_call"`, name/call_id/arguments or
+    // input at payload level); the legacy nested `payload.response_item[_s]` shape is kept.
+    const toolItems: Record<string, unknown>[] = [];
+    if (
+        (recordType === 'response_item' || recordType === 'function_call' || recordType === 'custom_tool_call') &&
+        (payloadType === 'function_call' || payloadType === 'custom_tool_call')
+    ) {
+        toolItems.push(payload);
+    } else if (payload.response_item) {
+        toolItems.push(payload.response_item as Record<string, unknown>);
+    } else if (Array.isArray(payload.response_items)) {
+        toolItems.push(...(payload.response_items as Record<string, unknown>[]));
+    }
+    for (const item of toolItems) {
+        const fc = (item.function_call as Record<string, unknown> | undefined) ?? item;
+        const toolName = s(fc.name) ?? '';
+        const args = fc.arguments ?? fc.input;
+        entries.push({
+            targetTable: 'history_tool_call',
+            record: {
+                _messageSplitIndex: messageSplitIndex,
+                session_id: sessionId,
+                seq,
+                tool_name: toolName,
+                call_id: s(fc.call_id),
+                args_digest: argsDigest(args),
+                args_raw: maybeArgsRaw('codex', toolName, args),
+                status: 'ok',
+                started_at: undefined,
+                completed_at: undefined,
+                duration_ms: undefined,
+                result_bytes: undefined,
+                error_text: undefined,
+            },
+        });
     }
 
     return entries;
@@ -665,7 +735,7 @@ export function agySplit(raw: Record<string, unknown>): readonly SplitEntry[] {
     const recordType = String(raw.type ?? '');
     const sessionId = s(raw.session_id, raw.conversation_id) ?? 'unknown';
     const seq = typeof raw.seq === 'number' ? raw.seq : typeof raw.step_index === 'number' ? raw.step_index : 0;
-    const ts = s(raw.created_at, raw.timestamp, raw.ts) ?? new Date(0).toISOString();
+    const ts = timestampOf(raw.created_at, raw.timestamp, raw.ts);
 
     let role: string;
     let disposition: string;
@@ -785,7 +855,7 @@ export function geminiSplit(raw: Record<string, unknown>, context?: TransformCon
     const state = o(raw.$set);
     const sessionId = sessionIdFromContext(context, raw);
     const seq = context?.sourceLine ?? 0;
-    const ts = s(raw.timestamp, raw.startTime, raw.lastUpdated, state.lastUpdated) ?? new Date(0).toISOString();
+    const ts = timestampOf(raw.timestamp, raw.startTime, raw.lastUpdated, state.lastUpdated);
 
     if (recordType === 'session' || recordType === 'state') {
         return [
@@ -903,7 +973,7 @@ function numberOrNull(value: unknown): number | null {
 function normalizeGrokRecord(raw: Record<string, unknown>): {
     recordType: string;
     sessionId: string;
-    ts: string;
+    ts: string | undefined;
     seq: number;
     body: Record<string, unknown>;
     model: string | undefined;
@@ -958,8 +1028,13 @@ function normalizeGrokRecord(raw: Record<string, unknown>): {
     );
     const usage = (body.usage ?? raw.usage) as Record<string, unknown> | undefined;
     const toolMeta = meta?.['x.ai/tool'] as Record<string, unknown> | undefined;
+    // The tool's real name is `_meta["x.ai/tool"].name` (or `kind`); `title` is a human label
+    // like "Read `/path`" — used only as a last resort, stripped at the first backtick so the
+    // argument payload never pollutes tool_name (task 0580 D3).
+    const titleFallback = s(body.title)?.split('`')[0]?.trim();
     const toolName =
-        s(body.title, body.tool_name, body.name, toolMeta?.name, toolMeta?.label, raw.tool_name, raw.name) ?? '';
+        s(toolMeta?.name, body.kind, body.tool_name, body.name, raw.tool_name, raw.name) ??
+        (titleFallback !== undefined && titleFallback.length > 0 && titleFallback.length <= 40 ? titleFallback : '');
     const toolArgs = body.rawInput ?? body.input ?? body.arguments ?? toolMeta?.input ?? raw.input ?? raw.arguments;
     const toolStatus = s(body.status, raw.outcome, raw.status) ?? 'ok';
     const durationMs =
@@ -992,21 +1067,8 @@ function normalizeGrokRecord(raw: Record<string, unknown>): {
     };
 }
 
-function normalizeTs(value: unknown): string {
-    if (typeof value === 'number' && Number.isFinite(value)) {
-        // Grok timestamps are unix seconds (sometimes with fractional).
-        const ms = value > 1e12 ? value : value * 1000;
-        return new Date(ms).toISOString();
-    }
-    if (typeof value === 'string' && value.length > 0) {
-        const asNum = Number(value);
-        if (Number.isFinite(asNum) && /^\d+(\.\d+)?$/.test(value.trim())) {
-            const ms = asNum > 1e12 ? asNum : asNum * 1000;
-            return new Date(ms).toISOString();
-        }
-        return value;
-    }
-    return new Date(0).toISOString();
+function normalizeTs(value: unknown): string | undefined {
+    return timestampOf(value);
 }
 
 function extractGrokContent(content: unknown): string | null {
@@ -1382,10 +1444,32 @@ function s(...values: readonly unknown[]): string | undefined {
     }
     return undefined;
 }
+/**
+ * First usable timestamp: an ISO-ish string passes through, a finite number (or digit-string)
+ * is converted from epoch seconds/millis (>1e12 treated as ms). Returns undefined when nothing
+ * usable exists — mappers must persist null ts rather than a 1970 sentinel (task 0580 D4).
+ */
+function timestampOf(...values: readonly unknown[]): string | undefined {
+    for (const value of values) {
+        if (typeof value === 'number' && Number.isFinite(value)) {
+            const ms = value > 1e12 ? value : value * 1000;
+            return new Date(ms).toISOString();
+        }
+        if (typeof value === 'string' && value.length > 0) {
+            const asNum = Number(value);
+            if (Number.isFinite(asNum) && /^\d+(\.\d+)?$/.test(value.trim())) {
+                const ms = asNum > 1e12 ? asNum : asNum * 1000;
+                return new Date(ms).toISOString();
+            }
+            return value;
+        }
+    }
+    return undefined;
+}
 
 function mapRole(type: unknown): string {
     const t = String(type ?? '').toLowerCase();
-    if (t === 'user' || t === 'human') return 'user';
+    if (t === 'user' || t === 'human' || t === 'developer') return 'user';
     if (t === 'assistant' || t === 'ai' || t === 'model') return 'assistant';
     if (t === 'system' || t === 'error') return 'system';
     return t || 'unknown';
@@ -1412,7 +1496,9 @@ function extractContentText(content: unknown): string | undefined {
     for (const block of content) {
         if (typeof block !== 'object' || block === null) continue;
         const b = block as Record<string, unknown>;
-        if (b.type === 'text' && typeof b.text === 'string') {
+        // Claude emits {type:"text",text}; codex emits {type:"input_text"|"output_text"|
+        // "summary_text",text} — any block carrying a string `text` is text content.
+        if (typeof b.text === 'string') {
             parts.push(b.text);
         }
     }

package/src/opencode-importer.ts

@@ -19,6 +19,7 @@ import {
     readOpenCodeMessages,
     readOpenCodeParts,
 } from './jsonl-importer-dao';
+import { maybeArgsRaw } from './mappers';
 import { redactRecord } from './redaction';
 import type { ImportIssue, ImportMode, ImportResult, JsonObject, ReconcileSummary, RedactionRule } from './types';
 
@@ -262,6 +263,7 @@ function prepareEntries(
                 session_id: row.session_id,
                 seq: started ?? created,
                 tool_name: stringValue(part.tool) ?? 'unknown',
+                args_raw: maybeArgsRaw(SOURCE, stringValue(part.tool) ?? 'unknown', state.input),
                 args_digest: sha256(state.input ?? null),
                 status,
                 started_at: started === undefined ? null : isoTime(started),

package/src/schema-sql.ts

@@ -37,7 +37,7 @@ CREATE TABLE IF NOT EXISTS history_message (
     role               TEXT NOT NULL,
     record_type        TEXT NOT NULL,
     disposition        TEXT NOT NULL,
-    ts                 TEXT NOT NULL,
+    ts                 TEXT,
     duration_ms        INTEGER,
     model              TEXT,
     input_tokens       INTEGER,