@gobing-ai/ts-llm-jsonl-importer 0.4.19 → 0.4.21

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,gGAAgG;AAChG,eAAO,MAAM,yBAAyB,QAiF9B,CAAC"}
+{"version":3,"file":"schema-sql.d.ts","sourceRoot":"","sources":["../src/schema-sql.ts"],"names":[],"mappings":"AAAA,gGAAgG;AAChG,eAAO,MAAM,yBAAyB,QA0I9B,CAAC"}

package/dist/schema-sql.js

@@ -80,4 +80,61 @@ CREATE TABLE IF NOT EXISTS history_etl_openclaw (
     payload_json TEXT NOT NULL,
     imported_at TEXT NOT NULL
 );
+
+CREATE TABLE IF NOT EXISTS history_message (
+    record_hash        TEXT PRIMARY KEY,
+    source             TEXT NOT NULL,
+    source_file        TEXT NOT NULL,
+    source_line        INTEGER NOT NULL,
+    session_id         TEXT NOT NULL,
+    seq                INTEGER NOT NULL,
+    turn_index         INTEGER,
+    role               TEXT NOT NULL,
+    record_type        TEXT NOT NULL,
+    disposition        TEXT NOT NULL,
+    ts                 TEXT NOT NULL,
+    duration_ms        INTEGER,
+    model              TEXT,
+    input_tokens       INTEGER,
+    output_tokens      INTEGER,
+    cache_read_tokens  INTEGER,
+    cache_write_tokens INTEGER,
+    cost_usd           REAL,
+    content_text       TEXT,
+    cwd                TEXT,
+    provenance         TEXT NOT NULL,
+    run_id             TEXT,
+    task_wbs           TEXT,
+    imported_at        TEXT NOT NULL
+);
+
+CREATE TABLE IF NOT EXISTS history_tool_call (
+    record_hash   TEXT PRIMARY KEY,
+    message_hash  TEXT NOT NULL,
+    source        TEXT NOT NULL,
+    source_file   TEXT NOT NULL,
+    source_line   INTEGER NOT NULL,
+    session_id    TEXT NOT NULL,
+    seq           INTEGER NOT NULL,
+    tool_name     TEXT NOT NULL,
+    args_digest   TEXT,
+    status        TEXT NOT NULL,
+    started_at    TEXT,
+    completed_at  TEXT,
+    duration_ms   INTEGER,
+    result_bytes  INTEGER,
+    error_text    TEXT,
+    imported_at   TEXT NOT NULL
+);
+
+CREATE INDEX IF NOT EXISTS idx_history_message_session
+    ON history_message(source, session_id, seq);
+CREATE INDEX IF NOT EXISTS idx_history_message_ts
+    ON history_message(ts);
+CREATE INDEX IF NOT EXISTS idx_history_tool_call_session
+    ON history_tool_call(source, session_id, seq);
+CREATE INDEX IF NOT EXISTS idx_history_tool_call_tool_name
+    ON history_tool_call(tool_name);
+CREATE INDEX IF NOT EXISTS idx_history_tool_call_message_hash
+    ON history_tool_call(message_hash);
 `.trim();

package/dist/sources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sources.d.ts","sourceRoot":"","sources":["../src/sources.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAA8B,cAAc,EAAE,gBAAgB,EAAoB,MAAM,SAAS,CAAC;AA8F9G;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,QAA0B,CAAC;AAExD,8DAA8D;AAC9D,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAQjF,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,cAAc,GAAG,gBAAgB,CAM5E;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,gBAAgB,GAAG,gBAAgB,CA+BvF;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,GAAG,gBAAgB,CAK1F"}
+{"version":3,"file":"sources.d.ts","sourceRoot":"","sources":["../src/sources.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAA8B,cAAc,EAAE,gBAAgB,EAAoB,MAAM,SAAS,CAAC;AAsH9G;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,QAAsB,CAAC;AAEpD,8DAA8D;AAC9D,eAAO,MAAM,kBAAkB,EAAE,QAAQ,CAAC,MAAM,CAAC,cAAc,EAAE,gBAAgB,CAAC,CAmDjF,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,cAAc,GAAG,gBAAgB,CAM5E;AAED;;;;;;;;GAQG;AACH,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,gBAAgB,GAAG,gBAAgB,CA+BvF;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,GAAG,gBAAgB,CAK1F"}

package/dist/sources.js

@@ -1,5 +1,6 @@
 import { z } from 'zod';
 import { HistoryImportError } from './errors.js';
+import { AGY_FIELD_MAP, AGY_SCHEMA, agySplit, CLAUDE_FIELD_MAP, CLAUDE_SCHEMA, CODEX_FIELD_MAP, CODEX_SCHEMA, claudeSplit, codexSplit, GROK_FIELD_MAP, GROK_SCHEMA, grokSplit, OMP_FIELD_MAP, OMP_SCHEMA, ompSplit, PI_FIELD_MAP, PI_SCHEMA, piSplit, } from './mappers.js';
 const sourceRecordSchema = z
     .object({
     source_record_id: z.string().min(1),
@@ -72,6 +73,20 @@ function sourceDefinition(source, displayName, defaultRoots, filePatterns) {
         schema: sourceRecordSchema,
     };
 }
+/** Build a source definition with a typed custom split for the forensic contract tables. */
+function customSourceDefinition(source, displayName, defaultRoots, filePatterns, split, fieldMap, schema) {
+    return {
+        source,
+        displayName,
+        defaultRoots,
+        filePatterns,
+        targetTable: `history_etl_${source}`,
+        splitConfig: { mode: 'custom', split },
+        fieldMap,
+        fieldTransforms: {},
+        schema,
+    };
+}
 /**
  * Pattern every importer-owned table must match.
  *
@@ -80,12 +95,15 @@ function sourceDefinition(source, displayName, defaultRoots, filePatterns) {
  * namespaces importer tables away from consumer schemas. Both built-in and
  * custom source definitions are held to this rule.
  */
-export const VALID_TABLE_NAME = /^history_etl_[a-z_]+$/;
+export const VALID_TABLE_NAME = /^history_[a-z_]+$/;
 /** Built-in source definitions keyed by source identifier. */
 export const SOURCE_DEFINITIONS = {
-    pi: sourceDefinition('pi', 'Pi', ['.pi/history', '.pi'], ['*.jsonl', '*.json']),
-    claude: sourceDefinition('claude', 'Claude Code', ['.claude/projects', '.claude'], ['*.jsonl']),
-    codex: sourceDefinition('codex', 'Codex', ['.codex/sessions', '.codex'], ['*.jsonl']),
+    pi: customSourceDefinition('pi', 'Pi', ['.pi/agent/sessions'], ['*.jsonl'], piSplit, PI_FIELD_MAP, PI_SCHEMA),
+    claude: customSourceDefinition('claude', 'Claude Code', ['.claude/projects'], ['*.jsonl'], claudeSplit, CLAUDE_FIELD_MAP, CLAUDE_SCHEMA),
+    codex: customSourceDefinition('codex', 'Codex', ['.codex/sessions'], ['*.jsonl'], codexSplit, CODEX_FIELD_MAP, CODEX_SCHEMA),
+    omp: customSourceDefinition('omp', 'OMP', ['.omp/agent/sessions'], ['*.jsonl'], ompSplit, OMP_FIELD_MAP, OMP_SCHEMA),
+    grok: customSourceDefinition('grok', 'Grok', ['.grok/sessions'], ['*.jsonl'], grokSplit, GROK_FIELD_MAP, GROK_SCHEMA),
+    agy: customSourceDefinition('agy', 'Antigravity CLI', ['.gemini/antigravity-cli/brain'], ['*.jsonl'], agySplit, AGY_FIELD_MAP, AGY_SCHEMA),
     gemini: sourceDefinition('gemini', 'Gemini CLI', ['.gemini', '.config/gemini'], ['*.jsonl']),
     opencode: sourceDefinition('opencode', 'OpenCode', ['.opencode', '.local/share/opencode'], ['*.jsonl']),
     antigravity: sourceDefinition('antigravity', 'Antigravity', ['.antigravity'], ['*.jsonl']),
@@ -158,6 +176,6 @@ export function resolveSourceDefinition(input) {
 }
 function assertValidTable(table, source) {
     if (!VALID_TABLE_NAME.test(table)) {
-        throw new HistoryImportError(`Invalid history ETL target table for source "${source}": ${table}. Must match ${VALID_TABLE_NAME.source}.`, { source, table });
+        throw new HistoryImportError(`Invalid history target table for source "${source}": ${table}. Must match ${VALID_TABLE_NAME.source}.`, { source, table });
     }
 }

package/dist/types.d.ts

@@ -2,9 +2,14 @@ import type { DbAdapter } from '@gobing-ai/ts-db';
 import type { FileSystem, RuntimePaths } from '@gobing-ai/ts-runtime';
 import type { z } from 'zod';
 /** Built-in source identifiers supported by the importer. */
-export type LlmJsonlSource = 'pi' | 'claude' | 'codex' | 'gemini' | 'opencode' | 'antigravity' | 'openclaw';
+export type LlmJsonlSource = 'pi' | 'claude' | 'codex' | 'gemini' | 'opencode' | 'antigravity' | 'openclaw' | 'omp' | 'grok' | 'agy';
 /** Import mode controlling checkpoint behavior. */
 export type ImportMode = 'full' | 'incremental' | 'force-file';
+/** One record emitted by a custom split, optionally routed to its own table. */
+export interface SplitEntry {
+    readonly targetTable?: string;
+    readonly record: JsonObject;
+}
 /** Split strategy for turning a raw JSONL object into one or more ETL records. */
 export type SplitConfig = {
     readonly mode: 'one-to-one';
@@ -14,7 +19,7 @@ export type SplitConfig = {
     readonly targetTable?: string;
 } | {
     readonly mode: 'custom';
-    readonly split: (raw: JsonObject) => readonly JsonObject[];
+    readonly split: (raw: JsonObject) => readonly (JsonObject | SplitEntry)[];
     readonly targetTable?: string;
 };
 /** JSON-compatible record used at the importer boundary. */
@@ -80,6 +85,7 @@ export interface ImportResult {
     readonly processedLines: number;
     readonly importedRecords: number;
     readonly skippedDuplicates: number;
+    readonly unknownRecords: number;
     readonly parseErrors: readonly ImportIssue[];
     readonly validationErrors: readonly ImportIssue[];
     readonly checkpointUpdates: number;

package/dist/types.d.ts.map

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

package/package.json

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

package/src/importer.ts

@@ -53,6 +53,7 @@ export async function runJsonlImport(source: string | SourceDefinition, options:
     let processedLines = 0;
     let importedRecords = 0;
     let skippedDuplicates = 0;
+    let unknownRecords = 0;
     let checkpointUpdates = 0;
 
     for (const file of files) {
@@ -70,6 +71,14 @@ export async function runJsonlImport(source: string | SourceDefinition, options:
             const splitRecords = splitRawRecord(definition, raw);
             let lineSucceeded = false;
 
+            // First pass: normalize, validate, redact, compute recordHash for every entry.
+            interface PreparedEntry {
+                readonly split: SplitRecord;
+                readonly splitIndex: number;
+                readonly normalized: JsonObject;
+                readonly recordHash: string;
+            }
+            const prepared: PreparedEntry[] = [];
             for (let splitIndex = 0; splitIndex < splitRecords.length; splitIndex += 1) {
                 const split = splitRecords[splitIndex];
                 if (split === undefined) continue;
@@ -102,6 +111,25 @@ export async function runJsonlImport(source: string | SourceDefinition, options:
                     skippedDuplicates += 1;
                     continue;
                 }
+                prepared.push({ split, splitIndex, normalized: redacted, recordHash });
+            }
+
+            // Second pass: resolve _messageSplitIndex → message_hash, then insert.
+            const recordHashBySplitIndex = new Map(prepared.map((e) => [e.splitIndex, e.recordHash] as const));
+            for (const entry of prepared) {
+                const { split, splitIndex, normalized, recordHash } = entry;
+                if (normalized.disposition === 'unknown') {
+                    unknownRecords += 1;
+                }
+                // Resolve _messageSplitIndex if present (tool call → parent message linkage).
+                const msgSplitIdx = normalized._messageSplitIndex as number | undefined;
+                delete normalized._messageSplitIndex;
+                if (msgSplitIdx !== undefined && typeof msgSplitIdx === 'number') {
+                    const msgHash = recordHashBySplitIndex.get(msgSplitIdx);
+                    if (msgHash !== undefined) {
+                        normalized.message_hash = msgHash;
+                    }
+                }
                 if (!options.dryRun) {
                     await insertRecord(
                         options.db,
@@ -110,7 +138,7 @@ export async function runJsonlImport(source: string | SourceDefinition, options:
                         file,
                         lineNumber,
                         splitIndex,
-                        redacted,
+                        normalized,
                         options.now,
                     );
                     await insertLedger(
@@ -141,6 +169,7 @@ export async function runJsonlImport(source: string | SourceDefinition, options:
         processedLines,
         importedRecords,
         skippedDuplicates,
+        unknownRecords,
         parseErrors,
         validationErrors,
         checkpointUpdates,
@@ -173,10 +202,17 @@ function splitRawRecord(definition: SourceDefinition, raw: JsonObject): readonly
     }
     if (definition.splitConfig.mode === 'custom') {
         const config = definition.splitConfig;
-        return config.split(raw).map((entry) => ({
-            targetTable: targetTableFor(config.targetTable ?? definition.targetTable),
-            raw: entry,
-        }));
+        const configTable = config.targetTable !== undefined ? targetTableFor(config.targetTable) : undefined;
+        return config.split(raw).map((entry) => {
+            // Normalize: SplitEntry has a `record` property, bare object is the record itself.
+            const hasTargetTable =
+                'targetTable' in entry && typeof (entry as { targetTable: unknown }).targetTable === 'string';
+            const record = hasTargetTable ? (entry as { record: JsonObject }).record : (entry as JsonObject);
+            const entryTable = hasTargetTable ? (entry as { targetTable?: string }).targetTable : undefined;
+            // Resolution order: entry → splitConfig → definition
+            const table = entryTable ?? configTable ?? targetTable;
+            return { targetTable: targetTableFor(table), raw: record };
+        });
     }
 
     const config = definition.splitConfig;

package/src/index.ts

@@ -22,5 +22,6 @@ export type {
     RedactionRule,
     SourceDefinition,
     SplitConfig,
+    SplitEntry,
     TransformContext,
 } from './types';

package/src/jsonl-importer-dao.ts

@@ -7,6 +7,57 @@ interface CheckpointRow {
     readonly last_imported_line: number;
 }
 
+/** Column allowlist per typed contract table; order is the INSERT column order. */
+const TYPED_TABLE_COLUMNS: Readonly<Record<string, readonly string[]>> = {
+    history_message: [
+        'record_hash',
+        'source',
+        'source_file',
+        'source_line',
+        'session_id',
+        'seq',
+        'turn_index',
+        'role',
+        'record_type',
+        'disposition',
+        'ts',
+        'duration_ms',
+        'model',
+        'input_tokens',
+        'output_tokens',
+        'cache_read_tokens',
+        'cache_write_tokens',
+        'cost_usd',
+        'content_text',
+        'cwd',
+        'provenance',
+        'run_id',
+        'task_wbs',
+        'imported_at',
+    ],
+    history_tool_call: [
+        'record_hash',
+        'message_hash',
+        'source',
+        'source_file',
+        'source_line',
+        'session_id',
+        'seq',
+        'tool_name',
+        'args_digest',
+        'status',
+        'started_at',
+        'completed_at',
+        'duration_ms',
+        'result_bytes',
+        'error_text',
+        'imported_at',
+    ],
+};
+
+/** Keys that a typed table mapper may produce that are not columns. */
+const TYPED_IGNORED_KEYS = new Set<string>(['_meta', 'split_index']);
+
 function targetTableFor(table: string): string {
     if (!VALID_TABLE_NAME.test(table)) {
         throw new HistoryImportError(`Invalid history ETL target table: ${table}`, { table });
@@ -43,12 +94,12 @@ export async function applyHistoryImportSchema(db: ImportOptions['db']): Promise
  * Ensure the ETL table(s) for a source definition exist.
  *
  * WHY: the static {@link HISTORY_IMPORT_SCHEMA_SQL} only creates the built-in
- * `history_etl_*` tables. Custom source definitions (and built-in definitions
- * with a `splitConfig.targetTable` override) need their target table(s) created
- * on demand. The table name is already gated by {@link VALID_TABLE_NAME} in
- * {@link validateSourceDefinition} / {@link targetTableFor}, so it is safe to
- * interpolate into DDL. `CREATE TABLE IF NOT EXISTS` makes this idempotent for
- * built-in tables that the static schema already created.
+ * `history_etl_*` tables and the typed contract tables. Custom source definitions
+ * (and built-in definitions with a `splitConfig.targetTable` override) need their
+ * target table(s) created on demand. The table name is already gated by
+ * {@link VALID_TABLE_NAME} in {@link validateSourceDefinition} / {@link targetTableFor},
+ * so it is safe to interpolate into DDL. `CREATE TABLE IF NOT EXISTS` makes this
+ * idempotent for built-in tables that the static schema already created.
  */
 async function ensureTargetTables(db: ImportOptions['db'], definition: SourceDefinition): Promise<void> {
     const tables = new Set<string>([targetTableFor(definition.targetTable)]);
@@ -56,6 +107,8 @@ async function ensureTargetTables(db: ImportOptions['db'], definition: SourceDef
         tables.add(targetTableFor(definition.splitConfig.targetTable));
     }
     for (const table of tables) {
+        // Typed tables are created by the static schema; use ETL DDL for custom tables.
+        if (TYPED_TABLE_COLUMNS[table] !== undefined) continue;
         await db.exec(ETL_TABLE_DDL(table));
     }
 }
@@ -103,6 +156,8 @@ async function ledgerExists(db: ImportOptions['db'], recordHash: string): Promis
     return row !== undefined && row !== null;
 }
 
+const _ensuredTables = new Set<string>();
+
 async function insertRecord(
     db: ImportOptions['db'],
     targetTable: string,
@@ -114,17 +169,53 @@ async function insertRecord(
     now: ImportOptions['now'],
 ): Promise<void> {
     const table = targetTableFor(targetTable);
-    await db.run(
-        `INSERT INTO ${table} (record_hash, source_file, source_line, split_index, payload_json, imported_at)
-         VALUES (?, ?, ?, ?, ?, ?)
-         ON CONFLICT(record_hash) DO NOTHING`,
-        recordHash,
-        sourceFile,
-        sourceLine,
-        splitIndex,
-        JSON.stringify(payload),
-        timestamp(now),
-    );
+    const typedColumns = TYPED_TABLE_COLUMNS[table];
+    if (typedColumns !== undefined) {
+        // Typed insert path: map each column from the payload, assert no unknown keys.
+        const unknownKeys = Object.keys(payload).filter((k) => !typedColumns.includes(k) && !TYPED_IGNORED_KEYS.has(k));
+        if (unknownKeys.length > 0) {
+            throw new HistoryImportError(
+                `Typed table "${table}" has unknown columns: ${unknownKeys.join(', ')}. ` +
+                    `Expected one of: ${typedColumns.join(', ')}.`,
+                { table, unknownKeys, knownColumns: typedColumns },
+            );
+        }
+        // record_hash and imported_at come from the function parameters, not the payload.
+        const ts = timestamp(now);
+        const values = typedColumns.map((col) => {
+            if (col === 'record_hash') return recordHash;
+            if (col === 'imported_at') return ts;
+            const v = payload[col];
+            return v === undefined ? null : v;
+        });
+        if (!_ensuredTables.has(table)) {
+            // Typed tables are created by the static schema in applyHistoryImportSchema.
+            _ensuredTables.add(table);
+        }
+        await db.run(
+            `INSERT INTO ${table} (${typedColumns.join(', ')})
+             VALUES (${typedColumns.map(() => '?').join(', ')})
+             ON CONFLICT(record_hash) DO NOTHING`,
+            ...values,
+        );
+    } else {
+        // Generic ETL insert path: store as payload_json blob.
+        if (!_ensuredTables.has(table)) {
+            await db.exec(ETL_TABLE_DDL(table));
+            _ensuredTables.add(table);
+        }
+        await db.run(
+            `INSERT INTO ${table} (record_hash, source_file, source_line, split_index, payload_json, imported_at)
+             VALUES (?, ?, ?, ?, ?, ?)
+             ON CONFLICT(record_hash) DO NOTHING`,
+            recordHash,
+            sourceFile,
+            sourceLine,
+            splitIndex,
+            JSON.stringify(payload),
+            timestamp(now),
+        );
+    }
 }
 
 async function insertLedger(