@gobing-ai/ts-llm-jsonl-importer 0.5.18 → 0.5.20

package/dist/importer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"importer.d.ts","sourceRoot":"","sources":["../src/importer.ts"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAER,aAAa,EACb,YAAY,EAGZ,gBAAgB,EAEnB,MAAM,SAAS,CAAC;AA4JjB;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,CAoerH"}
+{"version":3,"file":"importer.d.ts","sourceRoot":"","sources":["../src/importer.ts"],"names":[],"mappings":"AAiCA,OAAO,KAAK,EAER,aAAa,EACb,YAAY,EAGZ,gBAAgB,EAEnB,MAAM,SAAS,CAAC;AAkKjB;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,gBAAgB,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,YAAY,CAAC,CAwerH"}

package/dist/importer.js

@@ -95,8 +95,14 @@ async function resolveToolCallRow(db, source, sessionId, callId) {
  */
 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) };
+        // The tool's own measurement — no clamping, no sanity check. pi carries
+        // native bounds in details.toolMetadata (task 1131 R2); persist them when
+        // present so native and fallback durations stay distinguishable.
+        return {
+            startedAt: timing.startedAtMs !== undefined ? new Date(timing.startedAtMs).toISOString() : null,
+            completedAt: timing.completedAtMs !== undefined ? new Date(timing.completedAtMs).toISOString() : null,
+            durationMs: Math.round(timing.wallTimeMs),
+        };
     }
     if (timing.timestampMs === undefined || messageTsMs === undefined)
         return null;
@@ -382,10 +388,14 @@ export async function runJsonlImport(source, options) {
                 // 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') {
+                if (definition.source === 'omp' || definition.source === 'pi') {
                     const timing = ompToolResultTiming(raw);
                     if (timing !== null) {
-                        const resultEntry = prepared.find((entry) => entry.split.targetTable === 'history_message' && entry.normalized.role === 'toolresult');
+                        // pi normalizes toolResult envelopes to role `user` (piRole), so the
+                        // role match must accept both shapes (task 1131 R2).
+                        const resultEntry = prepared.find((entry) => entry.split.targetTable === 'history_message' &&
+                            (entry.normalized.role === 'toolresult' ||
+                                (definition.source === 'pi' && entry.normalized.role === 'user')));
                         const sessionId = resultEntry?.normalized.session_id;
                         if (typeof sessionId === 'string') {
                             let pending = toolCallRows.get(toolCallKey(resolvedSource, sessionId, timing.toolCallId));

package/dist/mappers.d.ts

@@ -54,16 +54,22 @@ export interface OmpToolResultTiming {
     wallTimeMs: number | undefined;
     /** Message timestamp as epoch millis, when parseable. */
     timestampMs: number | undefined;
+    /** Native start bound from pi `details.toolMetadata.startedAt` (task 1131 R2). */
+    startedAtMs: number | undefined;
+    /** Native completion bound from pi `details.toolMetadata.completedAt` (task 1131 R2). */
+    completedAtMs: 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.
+ * Extract toolResult timing signals from a raw OMP or pi record (task 0564 R1,
+ * generalized for pi in task 1131 R2), or null when the record is not a
+ * toolResult message or carries no toolCallId. Both sources emit
+ * `role: "toolResult"` message envelopes with `{toolCallId, toolName, content,
+ * details, isError, timestamp}`; the tool's own wall time resolves from
+ * `details.wallTimeMs`, falling back to pi's `message.durationMs` and
+ * `details.toolMetadata.durationMs`, and `toolCallId` joins the originating
+ * `toolCall.id` exactly.
  */
 export declare function ompToolResultTiming(raw: Record<string, unknown>): OmpToolResultTiming | null;
 /** Signals carried by a Claude tool_result user line (task 0624 R2). */

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;AASxB,OAAO,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AA0F9F;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CASzD;AAED,4FAA4F;AAC5F,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,4FAA4F;IAC5F,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;CACtC;AAED;;;;;;;;;GASG;AACH,wBAAgB,iBAAiB,CAC7B,GAAG,EAAE,UAAU,EACf,OAAO,EAAE,gBAAgB,GAAG,SAAS,EACrC,QAAQ,EAAE,iBAAiB,GAC5B,SAAS,oBAAoB,EAAE,CAmBjC;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,oBAAoB,GAAG,UAAU,CAIvE;AAy2BD,kFAAkF;AAClF,wBAAgB,UAAU,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAGhD;AAwHD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAwBjG;AAMD,yEAAyE;AACzE,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,SAAS,UAAU,EAAE,CAuH3G;AAMD,gEAAgE;AAChE,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,SAAS,UAAU,EAAE,CAwHvG;AAmBD,kEAAkE;AAClE,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,SAAS,UAAU,EAAE,CAoHxG;AAoBD,mFAAmF;AACnF,MAAM,WAAW,mBAAmB;IAChC,yEAAyE;IACzE,UAAU,EAAE,MAAM,CAAC;IACnB,8EAA8E;IAC9E,OAAO,EAAE,OAAO,CAAC;IACjB,wEAAwE;IACxE,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,yDAAyD;IACzD,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACnC;AAED,+FAA+F;AAC/F,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CASrE;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,mBAAmB,GAAG,IAAI,CAc5F;AAMD,wEAAwE;AACxE,MAAM,WAAW,sBAAsB;IACnC,uFAAuF;IACvF,UAAU,EAAE,MAAM,CAAC;IACnB,iFAAiF;IACjF,OAAO,EAAE,OAAO,CAAC;IACjB,yDAAyD;IACzD,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,wDAAwD;IACxD,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAC/B,2DAA2D;IAC3D,WAAW,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;;GAQG;AACH,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,sBAAsB,GAAG,IAAI,CA+BlG;AAMD,mEAAmE;AACnE,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,SAAS,UAAU,EAAE,CAiM1G;AAMD,gFAAgF;AAChF,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,SAAS,UAAU,EAAE,CAwIxG;AAMD,gGAAgG;AAChG,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,SAAS,UAAU,EAAE,CAuF3G;AAMD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,SAAS,UAAU,EAAE,CAgExG;AAQD;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAoB9F;AAiMD,kEAAkE;AAClE,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,EAAE,gBAAgB,GAAG,SAAS,UAAU,EAAE,CAkTzG;AAgFD,wGAAwG;AACxG,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,UAAU,GAAG,MAAM,CAKxD;AAMD,gDAAgD;AAChD,eAAO,MAAM,gBAAgB,wBAE5B,CAAC;AACF,4CAA4C;AAC5C,eAAO,MAAM,YAAY,wBAA8F,CAAC;AACxH,6CAA6C;AAC7C,eAAO,MAAM,aAAa,wBAEzB,CAAC;AACF,+CAA+C;AAC/C,eAAO,MAAM,eAAe,wBAE3B,CAAC;AACF,6CAA6C;AAC7C,eAAO,MAAM,aAAa,wBAEzB,CAAC;AACF,8CAA8C;AAC9C,eAAO,MAAM,cAAc,wBAE1B,CAAC;AACF,gDAAgD;AAChD,eAAO,MAAM,gBAAgB,wBAE5B,CAAC;AACF,6FAA6F;AAC7F,eAAO,MAAM,aAAa,wBAAqE,CAAC;AAQhG,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;AAC/C,0DAA0D;AAC1D,eAAO,MAAM,UAAU,gCAAoB,CAAC"}
+{"version":3,"file":"mappers.d.ts","sourceRoot":"","sources":["../src/mappers.ts"],"names":[],"mappings":"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"}

package/dist/mappers.js

@@ -1,6 +1,7 @@
 import { z } from 'zod';
 import { capabilityInvocationId, extractNestedExecCommandLiterals, matchCapabilityOrigin, parseLiteralReadTargets, } from './capability.js';
 import { sha256, sha256Text } from './hash.js';
+import { applyRules } from './redaction.js';
 // ---------------------------------------------------------------------------
 // Helper: identity field map for typed columns
 // ---------------------------------------------------------------------------
@@ -940,14 +941,15 @@ export function argsDigest(args) {
     const redacted = redactArgs(args);
     return sha256(redacted);
 }
-/** Redact tool arguments for digest: replace string values > 80 chars or containing secrets. */
+/**
+ * Redact tool arguments for digest: every string leaf gets the same secret
+ * replacement the persistence layer applies (task 1131 R1) — no length-based
+ * collapse, so two distinct long commands keep distinct digests and a token the
+ * shape rules catch never leaks into the digest input.
+ */
 function redactArgs(args) {
     if (typeof args === 'string') {
-        if (args.length > 80)
-            return '[REDACTED:long]';
-        if (/[A-Za-z0-9+/]{40,}=*|[A-Za-z0-9_-]{20,}/.test(args))
-            return '[REDACTED:secret]';
-        return args;
+        return applyRules(args);
     }
     if (Array.isArray(args))
         return args.map(redactArgs);
@@ -1469,12 +1471,14 @@ export function timestampToEpochMs(value) {
     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.
+ * Extract toolResult timing signals from a raw OMP or pi record (task 0564 R1,
+ * generalized for pi in task 1131 R2), or null when the record is not a
+ * toolResult message or carries no toolCallId. Both sources emit
+ * `role: "toolResult"` message envelopes with `{toolCallId, toolName, content,
+ * details, isError, timestamp}`; the tool's own wall time resolves from
+ * `details.wallTimeMs`, falling back to pi's `message.durationMs` and
+ * `details.toolMetadata.durationMs`, and `toolCallId` joins the originating
+ * `toolCall.id` exactly.
  */
 export function ompToolResultTiming(raw) {
     const msg = o(raw.message);
@@ -1484,12 +1488,15 @@ export function ompToolResultTiming(raw) {
     if (toolCallId === undefined)
         return null;
     const details = o(msg.details);
-    const wallTimeMs = typeof details.wallTimeMs === 'number' && Number.isFinite(details.wallTimeMs) ? details.wallTimeMs : undefined;
+    const toolMetadata = o(details.toolMetadata);
+    const finite = (value) => typeof value === 'number' && Number.isFinite(value) ? value : undefined;
     return {
         toolCallId,
         isError: msg.isError === true,
-        wallTimeMs,
+        wallTimeMs: finite(details.wallTimeMs) ?? finite(msg.durationMs) ?? finite(toolMetadata.durationMs),
         timestampMs: timestampToEpochMs(raw.timestamp ?? msg.timestamp),
+        startedAtMs: timestampToEpochMs(toolMetadata.startedAt),
+        completedAtMs: timestampToEpochMs(toolMetadata.completedAt),
     };
 }
 /**

package/dist/redaction.d.ts

@@ -1,6 +1,8 @@
 import type { JsonObject, RedactionRule } from './types';
 /** Default redaction rules for common token, key, and email shapes in agent logs. */
 export declare const DEFAULT_REDACTION_RULES: readonly RedactionRule[];
+/** Apply the rules' substring replacement to a single string leaf. */
+export declare function applyRules(value: string, rules?: readonly RedactionRule[]): string;
 /** Redact supported scalar and composite JSON values recursively. */
 export declare function redactValue(value: unknown, rules?: readonly RedactionRule[]): unknown;
 /** Redact a normalized ETL record before hashing or writing it to the database. */

package/dist/redaction.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"redaction.d.ts","sourceRoot":"","sources":["../src/redaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAEzD,qFAAqF;AACrF,eAAO,MAAM,uBAAuB,EAAE,SAAS,aAAa,EAwC3D,CAAC;AAUF,qEAAqE;AACrE,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,GAAE,SAAS,aAAa,EAA4B,GAAG,OAAO,CAgB9G;AAED,mFAAmF;AACnF,wBAAgB,YAAY,CAAC,OAAO,SAAS,UAAU,EACnD,MAAM,EAAE,OAAO,EACf,KAAK,GAAE,SAAS,aAAa,EAA4B,GAC1D,OAAO,CAET"}
+{"version":3,"file":"redaction.d.ts","sourceRoot":"","sources":["../src/redaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAEzD,qFAAqF;AACrF,eAAO,MAAM,uBAAuB,EAAE,SAAS,aAAa,EAwC3D,CAAC;AAUF,sEAAsE;AACtE,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,GAAE,SAAS,aAAa,EAA4B,GAAG,MAAM,CAE3G;AAED,qEAAqE;AACrE,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,GAAE,SAAS,aAAa,EAA4B,GAAG,OAAO,CAgB9G;AAED,mFAAmF;AACnF,wBAAgB,YAAY,CAAC,OAAO,SAAS,UAAU,EACnD,MAAM,EAAE,OAAO,EACf,KAAK,GAAE,SAAS,aAAa,EAA4B,GAC1D,OAAO,CAET"}

package/dist/redaction.js

@@ -45,10 +45,14 @@ export const DEFAULT_REDACTION_RULES = [
  * NOT redacted — those appear in LLM usage records.
  */
 const SECRET_KEY = /^(?:api[_-]?key|apikey|api[_-]?secret|token|access[_-]?token|refresh[_-]?token|auth[_-]?token|secret|secret[_-]?key|client[_-]?secret|private[_-]?key|session[_-]?token|password|passwd|authorization)$/i;
+/** Apply the rules' substring replacement to a single string leaf. */
+export function applyRules(value, rules = DEFAULT_REDACTION_RULES) {
+    return rules.reduce((current, rule) => current.replace(rule.pattern, rule.replacement), value);
+}
 /** Redact supported scalar and composite JSON values recursively. */
 export function redactValue(value, rules = DEFAULT_REDACTION_RULES) {
     if (typeof value === 'string') {
-        return rules.reduce((current, rule) => current.replace(rule.pattern, rule.replacement), value);
+        return applyRules(value, rules);
     }
     if (Array.isArray(value)) {
         return value.map((entry) => redactValue(entry, rules));

package/dist/schema-sql.d.ts

@@ -4,7 +4,7 @@
  * Guaranteed to match the package version; a bump-or-fail test enforces that
  * any modification to HISTORY_IMPORT_SCHEMA_SQL must be accompanied by a version bump.
  */
-export declare const HISTORY_IMPORT_SCHEMA_VERSION = "0.5.18";
+export declare const HISTORY_IMPORT_SCHEMA_VERSION = "0.5.20";
 /**
  * DDL string that creates the history import checkpoint, ledger, and typed contract tables.
  *

package/dist/schema-sql.js

@@ -4,7 +4,7 @@
  * Guaranteed to match the package version; a bump-or-fail test enforces that
  * any modification to HISTORY_IMPORT_SCHEMA_SQL must be accompanied by a version bump.
  */
-export const HISTORY_IMPORT_SCHEMA_VERSION = '0.5.18';
+export const HISTORY_IMPORT_SCHEMA_VERSION = '0.5.20';
 /**
  * DDL string that creates the history import checkpoint, ledger, and typed contract tables.
  *

package/package.json

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

package/src/importer.ts

@@ -181,8 +181,14 @@ function attachableDuration(
     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) };
+        // The tool's own measurement — no clamping, no sanity check. pi carries
+        // native bounds in details.toolMetadata (task 1131 R2); persist them when
+        // present so native and fallback durations stay distinguishable.
+        return {
+            startedAt: timing.startedAtMs !== undefined ? new Date(timing.startedAtMs).toISOString() : null,
+            completedAt: timing.completedAtMs !== undefined ? new Date(timing.completedAtMs).toISOString() : null,
+            durationMs: Math.round(timing.wallTimeMs),
+        };
     }
     if (timing.timestampMs === undefined || messageTsMs === undefined) return null;
     const delta = timing.timestampMs - messageTsMs;
@@ -526,12 +532,16 @@ export async function runJsonlImport(source: string | SourceDefinition, options:
                 // 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') {
+                if (definition.source === 'omp' || definition.source === 'pi') {
                     const timing = ompToolResultTiming(raw);
                     if (timing !== null) {
+                        // pi normalizes toolResult envelopes to role `user` (piRole), so the
+                        // role match must accept both shapes (task 1131 R2).
                         const resultEntry = prepared.find(
                             (entry) =>
-                                entry.split.targetTable === 'history_message' && entry.normalized.role === 'toolresult',
+                                entry.split.targetTable === 'history_message' &&
+                                (entry.normalized.role === 'toolresult' ||
+                                    (definition.source === 'pi' && entry.normalized.role === 'user')),
                         );
                         const sessionId = resultEntry?.normalized.session_id;
                         if (typeof sessionId === 'string') {

package/src/mappers.ts

@@ -7,6 +7,7 @@ import {
     parseLiteralReadTargets,
 } from './capability';
 import { sha256, sha256Text } from './hash';
+import { applyRules } from './redaction';
 import type { JsonObject, SkillCallSplitRecord, SplitEntry, TransformContext } from './types';
 
 // ---------------------------------------------------------------------------
@@ -1047,12 +1048,15 @@ export function argsDigest(args: unknown): string {
 /** Redacted tool args: JSON shape preserved, string leaves possibly elided. */
 type RedactedValue = string | number | boolean | null | RedactedValue[] | { [key: string]: RedactedValue };
 
-/** Redact tool arguments for digest: replace string values > 80 chars or containing secrets. */
+/**
+ * Redact tool arguments for digest: every string leaf gets the same secret
+ * replacement the persistence layer applies (task 1131 R1) — no length-based
+ * collapse, so two distinct long commands keep distinct digests and a token the
+ * shape rules catch never leaks into the digest input.
+ */
 function redactArgs(args: unknown): RedactedValue {
     if (typeof args === 'string') {
-        if (args.length > 80) return '[REDACTED:long]';
-        if (/[A-Za-z0-9+/]{40,}=*|[A-Za-z0-9_-]{20,}/.test(args)) return '[REDACTED:secret]';
-        return args;
+        return applyRules(args);
     }
     if (Array.isArray(args)) return args.map(redactArgs);
     if (args !== null && typeof args === 'object') {
@@ -1610,6 +1614,10 @@ export interface OmpToolResultTiming {
     wallTimeMs: number | undefined;
     /** Message timestamp as epoch millis, when parseable. */
     timestampMs: number | undefined;
+    /** Native start bound from pi `details.toolMetadata.startedAt` (task 1131 R2). */
+    startedAtMs: number | undefined;
+    /** Native completion bound from pi `details.toolMetadata.completedAt` (task 1131 R2). */
+    completedAtMs: number | undefined;
 }
 
 /** Parse a message timestamp (epoch-millis number, numeric string, or ISO) to epoch millis. */
@@ -1625,12 +1633,14 @@ export 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.
+ * Extract toolResult timing signals from a raw OMP or pi record (task 0564 R1,
+ * generalized for pi in task 1131 R2), or null when the record is not a
+ * toolResult message or carries no toolCallId. Both sources emit
+ * `role: "toolResult"` message envelopes with `{toolCallId, toolName, content,
+ * details, isError, timestamp}`; the tool's own wall time resolves from
+ * `details.wallTimeMs`, falling back to pi's `message.durationMs` and
+ * `details.toolMetadata.durationMs`, and `toolCallId` joins the originating
+ * `toolCall.id` exactly.
  */
 export function ompToolResultTiming(raw: Record<string, unknown>): OmpToolResultTiming | null {
     const msg = o(raw.message);
@@ -1638,13 +1648,16 @@ export function ompToolResultTiming(raw: Record<string, unknown>): OmpToolResult
     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;
+    const toolMetadata = o(details.toolMetadata);
+    const finite = (value: unknown): number | undefined =>
+        typeof value === 'number' && Number.isFinite(value) ? value : undefined;
     return {
         toolCallId,
         isError: msg.isError === true,
-        wallTimeMs,
+        wallTimeMs: finite(details.wallTimeMs) ?? finite(msg.durationMs) ?? finite(toolMetadata.durationMs),
         timestampMs: timestampToEpochMs(raw.timestamp ?? msg.timestamp),
+        startedAtMs: timestampToEpochMs(toolMetadata.startedAt),
+        completedAtMs: timestampToEpochMs(toolMetadata.completedAt),
     };
 }
 

package/src/redaction.ts

@@ -51,10 +51,15 @@ export const DEFAULT_REDACTION_RULES: readonly RedactionRule[] = [
 const SECRET_KEY =
     /^(?:api[_-]?key|apikey|api[_-]?secret|token|access[_-]?token|refresh[_-]?token|auth[_-]?token|secret|secret[_-]?key|client[_-]?secret|private[_-]?key|session[_-]?token|password|passwd|authorization)$/i;
 
+/** Apply the rules' substring replacement to a single string leaf. */
+export function applyRules(value: string, rules: readonly RedactionRule[] = DEFAULT_REDACTION_RULES): string {
+    return rules.reduce((current, rule) => current.replace(rule.pattern, rule.replacement), value);
+}
+
 /** Redact supported scalar and composite JSON values recursively. */
 export function redactValue(value: unknown, rules: readonly RedactionRule[] = DEFAULT_REDACTION_RULES): unknown {
     if (typeof value === 'string') {
-        return rules.reduce((current, rule) => current.replace(rule.pattern, rule.replacement), value);
+        return applyRules(value, rules);
     }
     if (Array.isArray(value)) {
         return value.map((entry) => redactValue(entry, rules));

package/src/schema-sql.ts

@@ -4,7 +4,7 @@
  * Guaranteed to match the package version; a bump-or-fail test enforces that
  * any modification to HISTORY_IMPORT_SCHEMA_SQL must be accompanied by a version bump.
  */
-export const HISTORY_IMPORT_SCHEMA_VERSION = '0.5.18';
+export const HISTORY_IMPORT_SCHEMA_VERSION = '0.5.20';
 
 /**
  * DDL string that creates the history import checkpoint, ledger, and typed contract tables.