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

package/dist/mappers.d.ts

@@ -5,7 +5,7 @@ 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). */

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

@@ -226,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',
@@ -254,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)
 // ---------------------------------------------------------------------------

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gobing-ai/ts-llm-jsonl-importer",
-    "version": "0.4.35",
+    "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.35",
-        "@gobing-ai/ts-runtime": "^0.4.35",
-        "@gobing-ai/ts-utils": "^0.4.35",
+        "@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/mappers.ts

@@ -241,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;
 
@@ -272,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)
 // ---------------------------------------------------------------------------