@gobing-ai/ts-llm-jsonl-importer 0.4.54 → 0.4.56

package/dist/assistant-duration.d.ts

@@ -0,0 +1,41 @@
+import type { DbAdapter } from '@gobing-ai/ts-db';
+/**
+ * ETL-derived assistant-step duration (repatriated upstream from Spur task 0747 / ADR-105).
+ *
+ * Four of six sources — `claude`, `pi`, `codex`, `agy` — write no per-step
+ * `duration_ms` at all, so bottleneck ranking and per-model latency were unusable for
+ * the two busiest of them and ~73% of the measured span could not be attributed to
+ * llm/tool/idle. The transcripts carry a per-record `ts`, so the delta from the
+ * preceding record in the same session is derivable here.
+ *
+ * **It is an approximation and is labelled as one.** The delta includes queue and
+ * network time, which is arguably what "assistant step duration" should mean for
+ * bottleneck ranking, but it is not the provider's own number. `duration_source` carries
+ * that distinction to every consumer: `NULL` is provider-reported, `'derived'` is this
+ * function's work. Nothing may present the two as the same measurement.
+ */
+/** `history_message.duration_source` values. `NULL` means provider-reported. */
+export declare const DURATION_SOURCE_DERIVED = "derived";
+/**
+ * Deltas above this are session gaps, not work: the operator walked away and came back.
+ * Attributing an overnight gap to an assistant step would corrupt the very ranking this
+ * derivation exists to make usable, so those rows stay unmeasured.
+ */
+export declare const DERIVED_DURATION_CEILING_MS: number;
+/** What one derivation pass changed, and what it deliberately left alone. */
+export interface DeriveAssistantDurationsResult {
+    /** Rows that gained a derived `duration_ms` on this pass. */
+    derived: number;
+    /** Candidate rows left unmeasured because the delta exceeded the ceiling. */
+    skippedOverCeiling: number;
+}
+/**
+ * Fill `duration_ms` for assistant rows that have none, from the timestamp delta to the
+ * preceding record in the same session.
+ *
+ * Idempotent and additive: a row whose `duration_ms` is already set is never touched, so
+ * a provider measurement always wins over a derived one, and re-running after a later
+ * import only fills rows the earlier pass could not reach.
+ */
+export declare function deriveAssistantDurations(db: DbAdapter): Promise<DeriveAssistantDurationsResult>;
+//# sourceMappingURL=assistant-duration.d.ts.map

package/dist/assistant-duration.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"assistant-duration.d.ts","sourceRoot":"","sources":["../src/assistant-duration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAGlD;;;;;;;;;;;;;;GAcG;AAEH,gFAAgF;AAChF,eAAO,MAAM,uBAAuB,YAAY,CAAC;AAEjD;;;;GAIG;AACH,eAAO,MAAM,2BAA2B,QAAiB,CAAC;AAE1D,6EAA6E;AAC7E,MAAM,WAAW,8BAA8B;IAC3C,6DAA6D;IAC7D,OAAO,EAAE,MAAM,CAAC;IAChB,6EAA6E;IAC7E,kBAAkB,EAAE,MAAM,CAAC;CAC9B;AAED;;;;;;;GAOG;AACH,wBAAsB,wBAAwB,CAAC,EAAE,EAAE,SAAS,GAAG,OAAO,CAAC,8BAA8B,CAAC,CAkBrG"}

package/dist/assistant-duration.js

@@ -0,0 +1,51 @@
+import { findAssistantDurationCandidates, updateAssistantDuration } from './jsonl-importer-dao.js';
+/**
+ * ETL-derived assistant-step duration (repatriated upstream from Spur task 0747 / ADR-105).
+ *
+ * Four of six sources — `claude`, `pi`, `codex`, `agy` — write no per-step
+ * `duration_ms` at all, so bottleneck ranking and per-model latency were unusable for
+ * the two busiest of them and ~73% of the measured span could not be attributed to
+ * llm/tool/idle. The transcripts carry a per-record `ts`, so the delta from the
+ * preceding record in the same session is derivable here.
+ *
+ * **It is an approximation and is labelled as one.** The delta includes queue and
+ * network time, which is arguably what "assistant step duration" should mean for
+ * bottleneck ranking, but it is not the provider's own number. `duration_source` carries
+ * that distinction to every consumer: `NULL` is provider-reported, `'derived'` is this
+ * function's work. Nothing may present the two as the same measurement.
+ */
+/** `history_message.duration_source` values. `NULL` means provider-reported. */
+export const DURATION_SOURCE_DERIVED = 'derived';
+/**
+ * Deltas above this are session gaps, not work: the operator walked away and came back.
+ * Attributing an overnight gap to an assistant step would corrupt the very ranking this
+ * derivation exists to make usable, so those rows stay unmeasured.
+ */
+export const DERIVED_DURATION_CEILING_MS = 30 * 60 * 1000;
+/**
+ * Fill `duration_ms` for assistant rows that have none, from the timestamp delta to the
+ * preceding record in the same session.
+ *
+ * Idempotent and additive: a row whose `duration_ms` is already set is never touched, so
+ * a provider measurement always wins over a derived one, and re-running after a later
+ * import only fills rows the earlier pass could not reach.
+ */
+export async function deriveAssistantDurations(db) {
+    const rows = await findAssistantDurationCandidates(db);
+    let derived = 0;
+    let skippedOverCeiling = 0;
+    for (const row of rows) {
+        // A non-positive delta means the records share a timestamp or arrived out of
+        // order; there is no duration to claim, so leave the row unmeasured rather than
+        // invent a zero (0680 R6: absent is not zero).
+        if (row.deltaMs === null || row.deltaMs <= 0)
+            continue;
+        if (row.deltaMs > DERIVED_DURATION_CEILING_MS) {
+            skippedOverCeiling += 1;
+            continue;
+        }
+        await updateAssistantDuration(db, row.recordHash, row.deltaMs, DURATION_SOURCE_DERIVED);
+        derived += 1;
+    }
+    return { derived, skippedOverCeiling };
+}

package/dist/index.d.ts

@@ -1,11 +1,13 @@
+export { DERIVED_DURATION_CEILING_MS, type DeriveAssistantDurationsResult, DURATION_SOURCE_DERIVED, deriveAssistantDurations, } from './assistant-duration';
 export { HistoryImportError } from './errors';
 export { sha256, stableJson } from './hash';
 export { runJsonlImport } from './importer';
-export { applyHistoryImportSchema, normalizeSourceFilePaths } from './jsonl-importer-dao';
+export { applyHistoryImportSchema, normalizeSourceFilePaths, TYPED_HISTORY_TABLES } from './jsonl-importer-dao';
 export { canonicalizeSkillName, extractSkillCalls, type SkillCallIdentity, sessionIdFromSourcePath, skillCallEntry, } from './mappers';
 export { type OpenCodeImportOptions, runOpenCodeImport } from './opencode-importer';
 export { DEFAULT_REDACTION_RULES, redactRecord, redactValue } from './redaction';
-export { HISTORY_IMPORT_SCHEMA_SQL } from './schema-sql';
+export { HISTORY_IMPORT_SCHEMA_SQL, HISTORY_IMPORT_SCHEMA_VERSION } from './schema-sql';
 export { getSourceDefinition, resolveSourceDefinition, SOURCE_DEFINITIONS, VALID_TABLE_NAME, validateSourceDefinition, } from './sources';
+export { BOOKKEEPING_HISTORY_TABLES, IMPORTER_OWNED_TABLES } from './tables';
 export type { FieldTransform, ImportIssue, ImportMode, ImportOptions, ImportResult, JsonObject, LlmJsonlSource, ReconcileSummary, RedactionRule, SkillCall, SkillCallSplitRecord, SourceDefinition, SplitConfig, SplitEntry, TransformContext, } from './types';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,MAAM,sBAAsB,CAAC;AAC1F,OAAO,EACH,qBAAqB,EACrB,iBAAiB,EACjB,KAAK,iBAAiB,EACtB,uBAAuB,EACvB,cAAc,GACjB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,KAAK,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACpF,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACjF,OAAO,EAAE,yBAAyB,EAAE,MAAM,cAAc,CAAC;AACzD,OAAO,EACH,mBAAmB,EACnB,uBAAuB,EACvB,kBAAkB,EAClB,gBAAgB,EAChB,wBAAwB,GAC3B,MAAM,WAAW,CAAC;AACnB,YAAY,EACR,cAAc,EACd,WAAW,EACX,UAAU,EACV,aAAa,EACb,YAAY,EACZ,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,SAAS,EACT,oBAAoB,EACpB,gBAAgB,EAChB,WAAW,EACX,UAAU,EACV,gBAAgB,GACnB,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,2BAA2B,EAC3B,KAAK,8BAA8B,EACnC,uBAAuB,EACvB,wBAAwB,GAC3B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,wBAAwB,EAAE,wBAAwB,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAChH,OAAO,EACH,qBAAqB,EACrB,iBAAiB,EACjB,KAAK,iBAAiB,EACtB,uBAAuB,EACvB,cAAc,GACjB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,KAAK,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACpF,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACjF,OAAO,EAAE,yBAAyB,EAAE,6BAA6B,EAAE,MAAM,cAAc,CAAC;AACxF,OAAO,EACH,mBAAmB,EACnB,uBAAuB,EACvB,kBAAkB,EAClB,gBAAgB,EAChB,wBAAwB,GAC3B,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,0BAA0B,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAC7E,YAAY,EACR,cAAc,EACd,WAAW,EACX,UAAU,EACV,aAAa,EACb,YAAY,EACZ,UAAU,EACV,cAAc,EACd,gBAAgB,EAChB,aAAa,EACb,SAAS,EACT,oBAAoB,EACpB,gBAAgB,EAChB,WAAW,EACX,UAAU,EACV,gBAAgB,GACnB,MAAM,SAAS,CAAC"}

package/dist/index.js

@@ -1,9 +1,11 @@
+export { DERIVED_DURATION_CEILING_MS, DURATION_SOURCE_DERIVED, deriveAssistantDurations, } from './assistant-duration.js';
 export { HistoryImportError } from './errors.js';
 export { sha256, stableJson } from './hash.js';
 export { runJsonlImport } from './importer.js';
-export { applyHistoryImportSchema, normalizeSourceFilePaths } from './jsonl-importer-dao.js';
+export { applyHistoryImportSchema, normalizeSourceFilePaths, TYPED_HISTORY_TABLES } from './jsonl-importer-dao.js';
 export { canonicalizeSkillName, extractSkillCalls, sessionIdFromSourcePath, skillCallEntry, } from './mappers.js';
 export { runOpenCodeImport } from './opencode-importer.js';
 export { DEFAULT_REDACTION_RULES, redactRecord, redactValue } from './redaction.js';
-export { HISTORY_IMPORT_SCHEMA_SQL } from './schema-sql.js';
+export { HISTORY_IMPORT_SCHEMA_SQL, HISTORY_IMPORT_SCHEMA_VERSION } from './schema-sql.js';
 export { getSourceDefinition, resolveSourceDefinition, SOURCE_DEFINITIONS, VALID_TABLE_NAME, validateSourceDefinition, } from './sources.js';
+export { BOOKKEEPING_HISTORY_TABLES, IMPORTER_OWNED_TABLES } from './tables.js';

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

@@ -11,6 +11,12 @@ export interface SourceCheckpoint {
     readonly size: number | null;
     readonly mtimeMs: number | null;
 }
+/**
+ * Typed contract tables created and populated by the importer.
+ *
+ * Promoted to public surface per task 0749 (ADR-105).
+ */
+export declare const TYPED_HISTORY_TABLES: readonly ["history_message", "history_tool_call", "history_skill_call"];
 declare function targetTableFor(table: string): string;
 declare function timestamp(now: ImportOptions['now']): string;
 declare function ETL_TABLE_DDL(table: string): string;
@@ -51,10 +57,23 @@ declare function resetCheckpoints(db: ImportOptions['db'], source: string, files
 declare function writeCheckpoint(db: ImportOptions['db'], source: string, sourceFile: string, line: number, now: ImportOptions['now']): Promise<void>;
 declare function ledgerExists(db: ImportOptions['db'], recordHash: string): Promise<boolean>;
 /**
- * INSERT op for one accepted record row (task 0060 F9). Pure builder so the
- * per-record batch path and the single-write `insertRecord` can never drift.
- * Typed tables validate unknown keys here; the caller must have ensured the
- * target table exists (the import loop ensures accepted targets before batching).
+ * Tool identity for one `history_tool_call` row (0739).
+ *
+ * `effective` is extraction — recover the name when the agent recorded it inside a wrapper's
+ * arguments or only in the call id. `alias` is canonicalization — grouping the same logical tool
+ * across agents — and starts at identity, because the alias vocabulary is a curated decision
+ * that belongs to the consumer, not to the importer.
+ *
+ * Mirrors Spur migration 0034's backfill CASE so a row imported after the migration and a row
+ * backfilled by it resolve identically.
+ */
+export declare function resolveToolIdentity(payload: JsonObject): {
+    effective: string;
+    alias: string;
+};
+/**
+ * Build the insert op for one imported record, routing to the typed or JSON
+ * column path per target table.
  */
 export declare function recordInsertOp(targetTable: string, recordHash: string, sourceFile: string, sourceLine: number, splitIndex: number, payload: JsonObject, now: ImportOptions['now']): DbBatchOp;
 /** INSERT op for one ledger row (task 0060 F9). */
@@ -91,6 +110,19 @@ export declare function codexUsageAttributionUpdateOp(recordHash: string, tokens
  * most 200 per `IN (...)` (task 0060 F9 — replaces the per-record SELECT loop).
  */
 export declare function ledgerExistingHashes(db: ImportOptions['db'], hashes: readonly string[]): Promise<Set<string>>;
+/** Candidate assistant-message row for duration derivation. */
+export interface AssistantDurationCandidate {
+    readonly recordHash: string;
+    readonly deltaMs: number | null;
+}
+/**
+ * Fetch candidate assistant rows lacking duration_ms along with timestamp delta to preceding record.
+ */
+export declare function findAssistantDurationCandidates(db: DbAdapter): Promise<AssistantDurationCandidate[]>;
+/**
+ * Update duration_ms and duration_source for a previously unmeasured assistant row.
+ */
+export declare function updateAssistantDuration(db: DbAdapter, recordHash: string, durationMs: number, durationSource: string): Promise<void>;
 declare function insertRecord(db: ImportOptions['db'], targetTable: string, recordHash: string, sourceFile: string, sourceLine: number, splitIndex: number, payload: JsonObject, now: ImportOptions['now']): Promise<void>;
 declare function insertLedger(db: ImportOptions['db'], recordHash: string, source: string, sourceFile: string, sourceLine: number, splitIndex: number, targetTable: string, now: ImportOptions['now']): Promise<void>;
 /**

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

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

package/dist/jsonl-importer-dao.js

@@ -1,6 +1,12 @@
 import { HistoryImportError } from './errors.js';
 import { HISTORY_IMPORT_SCHEMA_SQL } from './schema-sql.js';
 import { VALID_TABLE_NAME } from './sources.js';
+/**
+ * Typed contract tables created and populated by the importer.
+ *
+ * Promoted to public surface per task 0749 (ADR-105).
+ */
+export const TYPED_HISTORY_TABLES = ['history_message', 'history_tool_call', 'history_skill_call'];
 /** Column allowlist per typed contract table; order is the INSERT column order. */
 const TYPED_TABLE_COLUMNS = {
     history_message: [
@@ -49,6 +55,8 @@ const TYPED_TABLE_COLUMNS = {
         'result_bytes',
         'error_text',
         'imported_at',
+        'effective_tool_name',
+        'tool_name_alias',
     ],
     history_skill_call: [
         'record_hash',
@@ -189,6 +197,83 @@ async function ledgerExists(db, recordHash) {
  * Typed tables validate unknown keys here; the caller must have ensured the
  * target table exists (the import loop ensures accepted targets before batching).
  */
+/** Wrapper-style `call_id` prefixes that name the tool the wrapper actually ran. */
+const CALL_ID_TOOL_PREFIXES = [
+    ['call_bash_', 'bash'],
+    ['call_read_', 'read'],
+    ['call_edit_', 'edit'],
+    ['call_write_', 'write'],
+    ['call_grep_', 'grep'],
+    ['call_find_', 'find'],
+    ['call_ls_', 'ls'],
+];
+/** Argument keys, in precedence order, that carry the tool name when `tool_name` is empty. */
+const ARGS_TOOL_NAME_KEYS = ['tool', 'tool_name', 'toolName', 'name', 'command'];
+/**
+ * Tool identity for one `history_tool_call` row (0739).
+ *
+ * `effective` is extraction — recover the name when the agent recorded it inside a wrapper's
+ * arguments or only in the call id. `alias` is canonicalization — grouping the same logical tool
+ * across agents — and starts at identity, because the alias vocabulary is a curated decision
+ * that belongs to the consumer, not to the importer.
+ *
+ * Mirrors Spur migration 0034's backfill CASE so a row imported after the migration and a row
+ * backfilled by it resolve identically.
+ */
+export function resolveToolIdentity(payload) {
+    const supplied = trimmedString(payload.effective_tool_name);
+    const effective = supplied !== undefined ? supplied : deriveEffectiveToolName(payload);
+    return { effective, alias: trimmedString(payload.tool_name_alias) ?? effective };
+}
+/** Returns the record with tool identity resolved, for insert paths that read columns off the payload. */
+function withToolIdentity(record) {
+    const { effective, alias } = resolveToolIdentity(record);
+    return { ...record, effective_tool_name: effective, tool_name_alias: alias };
+}
+function trimmedString(value) {
+    if (typeof value !== 'string')
+        return undefined;
+    const trimmed = value.trim();
+    return trimmed === '' ? undefined : trimmed;
+}
+function deriveEffectiveToolName(payload) {
+    const recorded = trimmedString(payload.tool_name);
+    if (recorded !== undefined && recorded !== 'unknown')
+        return recorded;
+    const fromArgs = toolNameFromArgs(payload.args_raw);
+    if (fromArgs !== undefined)
+        return fromArgs;
+    const callId = typeof payload.call_id === 'string' ? payload.call_id : '';
+    for (const [prefix, tool] of CALL_ID_TOOL_PREFIXES) {
+        if (callId.startsWith(prefix))
+            return tool;
+    }
+    return 'unknown';
+}
+function toolNameFromArgs(argsRaw) {
+    if (typeof argsRaw !== 'string')
+        return undefined;
+    let parsed;
+    try {
+        parsed = JSON.parse(argsRaw);
+    }
+    catch {
+        // Non-JSON arguments are the `json_valid(args_raw)` false branch in SQL: fall through.
+        return undefined;
+    }
+    if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed))
+        return undefined;
+    for (const key of ARGS_TOOL_NAME_KEYS) {
+        const candidate = trimmedString(parsed[key]);
+        if (candidate !== undefined)
+            return candidate;
+    }
+    return undefined;
+}
+/**
+ * Build the insert op for one imported record, routing to the typed or JSON
+ * column path per target table.
+ */
 export function recordInsertOp(targetTable, recordHash, sourceFile, sourceLine, splitIndex, payload, now) {
     const table = targetTableFor(targetTable);
     const typedColumns = TYPED_TABLE_COLUMNS[table];
@@ -201,11 +286,20 @@ export function recordInsertOp(targetTable, recordHash, sourceFile, sourceLine,
         }
         // record_hash and imported_at come from the function parameters, not the payload.
         const ts = timestamp(now);
+        // Tool identity is derived here rather than in each mapper: this is the single insert
+        // choke point for every typed table, so one derivation covers every source (0739 R1).
+        const toolIdentity = table === 'history_tool_call' ? resolveToolIdentity(payload) : undefined;
         const values = typedColumns.map((col) => {
             if (col === 'record_hash')
                 return recordHash;
             if (col === 'imported_at')
                 return ts;
+            if (toolIdentity !== undefined) {
+                if (col === 'effective_tool_name')
+                    return toolIdentity.effective;
+                if (col === 'tool_name_alias')
+                    return toolIdentity.alias;
+            }
             const v = payload[col];
             return v === undefined ? null : v;
         });
@@ -299,6 +393,32 @@ export async function ledgerExistingHashes(db, hashes) {
     }
     return existing;
 }
+/**
+ * Fetch candidate assistant rows lacking duration_ms along with timestamp delta to preceding record.
+ */
+export async function findAssistantDurationCandidates(db) {
+    const candidateSql = `
+        WITH ordered AS (
+            SELECT record_hash,
+                   role,
+                   duration_ms,
+                   ts,
+                   LAG(ts) OVER (PARTITION BY source, session_id ORDER BY seq) AS prev_ts
+            FROM history_message
+            WHERE ts IS NOT NULL AND ts LIKE '____-__-__T%'
+        )
+        SELECT record_hash AS recordHash,
+               CAST(ROUND((unixepoch(ts, 'subsec') - unixepoch(prev_ts, 'subsec')) * 1000) AS INTEGER) AS deltaMs
+        FROM ordered
+        WHERE role = 'assistant' AND duration_ms IS NULL AND prev_ts IS NOT NULL`;
+    return db.queryAll(candidateSql);
+}
+/**
+ * Update duration_ms and duration_source for a previously unmeasured assistant row.
+ */
+export async function updateAssistantDuration(db, recordHash, durationMs, durationSource) {
+    await db.run('UPDATE history_message SET duration_ms = ?, duration_source = ? WHERE record_hash = ? AND duration_ms IS NULL', durationMs, durationSource, recordHash);
+}
 async function insertRecord(db, targetTable, recordHash, sourceFile, sourceLine, splitIndex, payload, now) {
     const op = recordInsertOp(targetTable, recordHash, sourceFile, sourceLine, splitIndex, payload, now);
     await ensureTargetTable(db, targetTable);
@@ -522,7 +642,14 @@ export function openCodeBulkWriteOperations(entries, checkpointFiles, now) {
                 FROM input
                 WHERE true
                 ON CONFLICT(record_hash) DO NOTHING`,
-                params: chunk.flatMap((entry) => [entry.recordHash, JSON.stringify(entry.record), importedAt]),
+                // Tool identity is folded into the payload rather than the SQL: this path
+                // json_extracts every column from payload_json, so a column the record lacks
+                // arrives NULL and violates the NOT NULL constraint (0739 R1).
+                params: chunk.flatMap((entry) => [
+                    entry.recordHash,
+                    JSON.stringify(table === 'history_tool_call' ? withToolIdentity(entry.record) : entry.record),
+                    importedAt,
+                ]),
             });
         }
     }

package/dist/schema-sql.d.ts

@@ -1,3 +1,10 @@
+/**
+ * Schema version of the history import DDL.
+ *
+ * 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.4.56";
 /**
  * DDL string that creates the history import checkpoint, ledger, and typed contract tables.
  *

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;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,QA8G9B,CAAC"}
+{"version":3,"file":"schema-sql.d.ts","sourceRoot":"","sources":["../src/schema-sql.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,eAAO,MAAM,6BAA6B,WAAW,CAAC;AAEtD;;;;;GAKG;AACH,eAAO,MAAM,yBAAyB,QAqH9B,CAAC"}

package/dist/schema-sql.js

@@ -1,3 +1,10 @@
+/**
+ * Schema version of the history import DDL.
+ *
+ * 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.4.56';
 /**
  * DDL string that creates the history import checkpoint, ledger, and typed contract tables.
  *
@@ -39,6 +46,7 @@ CREATE TABLE IF NOT EXISTS history_message (
     disposition        TEXT NOT NULL,
     ts                 TEXT,
     duration_ms        INTEGER,
+    duration_source    TEXT,
     model              TEXT,
     input_tokens       INTEGER,
     output_tokens      INTEGER,
@@ -72,7 +80,13 @@ CREATE TABLE IF NOT EXISTS history_tool_call (
     duration_ms   INTEGER,
     result_bytes  INTEGER,
     error_text    TEXT,
-    imported_at   TEXT NOT NULL
+    imported_at   TEXT NOT NULL,
+    -- Tool identity (0739). Appended last so a database that gained these columns
+    -- via Spur's guarded ALTER converges on the same PRAGMA column order as a
+    -- database created fresh from this DDL. 'unknown' is the unresolved sentinel
+    -- every consumer already falls back from.
+    effective_tool_name TEXT NOT NULL DEFAULT 'unknown',
+    tool_name_alias     TEXT NOT NULL DEFAULT 'unknown'
 );
 
 CREATE INDEX IF NOT EXISTS idx_history_message_session

package/dist/tables.d.ts

@@ -0,0 +1,14 @@
+/** Bookkeeping tables owned and maintained by the importer. */
+export declare const BOOKKEEPING_HISTORY_TABLES: readonly ["history_import_checkpoint", "history_import_ledger"];
+/**
+ * Complete list of tables owned by the importer:
+ * - 3 typed contract tables (history_message, history_tool_call, history_skill_call)
+ * - 2 bookkeeping tables (history_import_checkpoint, history_import_ledger)
+ * - 10 per-source raw ETL landing tables (history_etl_<source>)
+ *
+ * Total: 15 tables.
+ * Sourced dynamically from static declarations so adding a source upstream automatically
+ * includes its landing table without downstream duplication.
+ */
+export declare const IMPORTER_OWNED_TABLES: readonly string[];
+//# sourceMappingURL=tables.d.ts.map

package/dist/tables.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tables.d.ts","sourceRoot":"","sources":["../src/tables.ts"],"names":[],"mappings":"AAGA,+DAA+D;AAC/D,eAAO,MAAM,0BAA0B,iEAAkE,CAAC;AAE1G;;;;;;;;;GASG;AACH,eAAO,MAAM,qBAAqB,EAAE,SAAS,MAAM,EAIlD,CAAC"}

package/dist/tables.js

@@ -0,0 +1,19 @@
+import { TYPED_HISTORY_TABLES } from './jsonl-importer-dao.js';
+import { SOURCE_DEFINITIONS } from './sources.js';
+/** Bookkeeping tables owned and maintained by the importer. */
+export const BOOKKEEPING_HISTORY_TABLES = ['history_import_checkpoint', 'history_import_ledger'];
+/**
+ * Complete list of tables owned by the importer:
+ * - 3 typed contract tables (history_message, history_tool_call, history_skill_call)
+ * - 2 bookkeeping tables (history_import_checkpoint, history_import_ledger)
+ * - 10 per-source raw ETL landing tables (history_etl_<source>)
+ *
+ * Total: 15 tables.
+ * Sourced dynamically from static declarations so adding a source upstream automatically
+ * includes its landing table without downstream duplication.
+ */
+export const IMPORTER_OWNED_TABLES = [
+    ...TYPED_HISTORY_TABLES,
+    ...BOOKKEEPING_HISTORY_TABLES,
+    ...Object.values(SOURCE_DEFINITIONS).map((def) => def.targetTable),
+];

package/dist/types.d.ts

@@ -149,6 +149,7 @@ export interface SkillCallSplitRecord {
     readonly completed_at?: string | null;
     readonly duration_ms?: number | null;
 }
+/** Normalized skill-call record imported into history_skill_call. */
 export interface SkillCall {
     readonly record_hash: string;
     readonly message_hash: string;

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.54",
+    "version": "0.4.56",
     "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.54",
-        "@gobing-ai/ts-runtime": "^0.4.54",
-        "@gobing-ai/ts-utils": "^0.4.54",
+        "@gobing-ai/ts-db": "^0.4.56",
+        "@gobing-ai/ts-runtime": "^0.4.56",
+        "@gobing-ai/ts-utils": "^0.4.56",
         "zod": "^4.1.0"
     },
     "devDependencies": {

package/src/assistant-duration.ts

@@ -0,0 +1,64 @@
+import type { DbAdapter } from '@gobing-ai/ts-db';
+import { findAssistantDurationCandidates, updateAssistantDuration } from './jsonl-importer-dao';
+
+/**
+ * ETL-derived assistant-step duration (repatriated upstream from Spur task 0747 / ADR-105).
+ *
+ * Four of six sources — `claude`, `pi`, `codex`, `agy` — write no per-step
+ * `duration_ms` at all, so bottleneck ranking and per-model latency were unusable for
+ * the two busiest of them and ~73% of the measured span could not be attributed to
+ * llm/tool/idle. The transcripts carry a per-record `ts`, so the delta from the
+ * preceding record in the same session is derivable here.
+ *
+ * **It is an approximation and is labelled as one.** The delta includes queue and
+ * network time, which is arguably what "assistant step duration" should mean for
+ * bottleneck ranking, but it is not the provider's own number. `duration_source` carries
+ * that distinction to every consumer: `NULL` is provider-reported, `'derived'` is this
+ * function's work. Nothing may present the two as the same measurement.
+ */
+
+/** `history_message.duration_source` values. `NULL` means provider-reported. */
+export const DURATION_SOURCE_DERIVED = 'derived';
+
+/**
+ * Deltas above this are session gaps, not work: the operator walked away and came back.
+ * Attributing an overnight gap to an assistant step would corrupt the very ranking this
+ * derivation exists to make usable, so those rows stay unmeasured.
+ */
+export const DERIVED_DURATION_CEILING_MS = 30 * 60 * 1000;
+
+/** What one derivation pass changed, and what it deliberately left alone. */
+export interface DeriveAssistantDurationsResult {
+    /** Rows that gained a derived `duration_ms` on this pass. */
+    derived: number;
+    /** Candidate rows left unmeasured because the delta exceeded the ceiling. */
+    skippedOverCeiling: number;
+}
+
+/**
+ * Fill `duration_ms` for assistant rows that have none, from the timestamp delta to the
+ * preceding record in the same session.
+ *
+ * Idempotent and additive: a row whose `duration_ms` is already set is never touched, so
+ * a provider measurement always wins over a derived one, and re-running after a later
+ * import only fills rows the earlier pass could not reach.
+ */
+export async function deriveAssistantDurations(db: DbAdapter): Promise<DeriveAssistantDurationsResult> {
+    const rows = await findAssistantDurationCandidates(db);
+
+    let derived = 0;
+    let skippedOverCeiling = 0;
+    for (const row of rows) {
+        // A non-positive delta means the records share a timestamp or arrived out of
+        // order; there is no duration to claim, so leave the row unmeasured rather than
+        // invent a zero (0680 R6: absent is not zero).
+        if (row.deltaMs === null || row.deltaMs <= 0) continue;
+        if (row.deltaMs > DERIVED_DURATION_CEILING_MS) {
+            skippedOverCeiling += 1;
+            continue;
+        }
+        await updateAssistantDuration(db, row.recordHash, row.deltaMs, DURATION_SOURCE_DERIVED);
+        derived += 1;
+    }
+    return { derived, skippedOverCeiling };
+}

package/src/index.ts

@@ -1,7 +1,13 @@
+export {
+    DERIVED_DURATION_CEILING_MS,
+    type DeriveAssistantDurationsResult,
+    DURATION_SOURCE_DERIVED,
+    deriveAssistantDurations,
+} from './assistant-duration';
 export { HistoryImportError } from './errors';
 export { sha256, stableJson } from './hash';
 export { runJsonlImport } from './importer';
-export { applyHistoryImportSchema, normalizeSourceFilePaths } from './jsonl-importer-dao';
+export { applyHistoryImportSchema, normalizeSourceFilePaths, TYPED_HISTORY_TABLES } from './jsonl-importer-dao';
 export {
     canonicalizeSkillName,
     extractSkillCalls,
@@ -11,7 +17,7 @@ export {
 } from './mappers';
 export { type OpenCodeImportOptions, runOpenCodeImport } from './opencode-importer';
 export { DEFAULT_REDACTION_RULES, redactRecord, redactValue } from './redaction';
-export { HISTORY_IMPORT_SCHEMA_SQL } from './schema-sql';
+export { HISTORY_IMPORT_SCHEMA_SQL, HISTORY_IMPORT_SCHEMA_VERSION } from './schema-sql';
 export {
     getSourceDefinition,
     resolveSourceDefinition,
@@ -19,6 +25,7 @@ export {
     VALID_TABLE_NAME,
     validateSourceDefinition,
 } from './sources';
+export { BOOKKEEPING_HISTORY_TABLES, IMPORTER_OWNED_TABLES } from './tables';
 export type {
     FieldTransform,
     ImportIssue,

package/src/jsonl-importer-dao.ts

@@ -17,6 +17,13 @@ export interface SourceCheckpoint {
     readonly mtimeMs: number | null;
 }
 
+/**
+ * Typed contract tables created and populated by the importer.
+ *
+ * Promoted to public surface per task 0749 (ADR-105).
+ */
+export const TYPED_HISTORY_TABLES = ['history_message', 'history_tool_call', 'history_skill_call'] as const;
+
 /** Column allowlist per typed contract table; order is the INSERT column order. */
 const TYPED_TABLE_COLUMNS: Readonly<Record<string, readonly string[]>> = {
     history_message: [
@@ -65,6 +72,8 @@ const TYPED_TABLE_COLUMNS: Readonly<Record<string, readonly string[]>> = {
         'result_bytes',
         'error_text',
         'imported_at',
+        'effective_tool_name',
+        'tool_name_alias',
     ],
     history_skill_call: [
         'record_hash',
@@ -245,6 +254,84 @@ async function ledgerExists(db: ImportOptions['db'], recordHash: string): Promis
  * Typed tables validate unknown keys here; the caller must have ensured the
  * target table exists (the import loop ensures accepted targets before batching).
  */
+/** Wrapper-style `call_id` prefixes that name the tool the wrapper actually ran. */
+const CALL_ID_TOOL_PREFIXES: readonly (readonly [string, string])[] = [
+    ['call_bash_', 'bash'],
+    ['call_read_', 'read'],
+    ['call_edit_', 'edit'],
+    ['call_write_', 'write'],
+    ['call_grep_', 'grep'],
+    ['call_find_', 'find'],
+    ['call_ls_', 'ls'],
+];
+
+/** Argument keys, in precedence order, that carry the tool name when `tool_name` is empty. */
+const ARGS_TOOL_NAME_KEYS = ['tool', 'tool_name', 'toolName', 'name', 'command'] as const;
+
+/**
+ * Tool identity for one `history_tool_call` row (0739).
+ *
+ * `effective` is extraction — recover the name when the agent recorded it inside a wrapper's
+ * arguments or only in the call id. `alias` is canonicalization — grouping the same logical tool
+ * across agents — and starts at identity, because the alias vocabulary is a curated decision
+ * that belongs to the consumer, not to the importer.
+ *
+ * Mirrors Spur migration 0034's backfill CASE so a row imported after the migration and a row
+ * backfilled by it resolve identically.
+ */
+export function resolveToolIdentity(payload: JsonObject): { effective: string; alias: string } {
+    const supplied = trimmedString(payload.effective_tool_name);
+    const effective = supplied !== undefined ? supplied : deriveEffectiveToolName(payload);
+    return { effective, alias: trimmedString(payload.tool_name_alias) ?? effective };
+}
+
+/** Returns the record with tool identity resolved, for insert paths that read columns off the payload. */
+function withToolIdentity(record: JsonObject): JsonObject {
+    const { effective, alias } = resolveToolIdentity(record);
+    return { ...record, effective_tool_name: effective, tool_name_alias: alias };
+}
+
+function trimmedString(value: unknown): string | undefined {
+    if (typeof value !== 'string') return undefined;
+    const trimmed = value.trim();
+    return trimmed === '' ? undefined : trimmed;
+}
+
+function deriveEffectiveToolName(payload: JsonObject): string {
+    const recorded = trimmedString(payload.tool_name);
+    if (recorded !== undefined && recorded !== 'unknown') return recorded;
+
+    const fromArgs = toolNameFromArgs(payload.args_raw);
+    if (fromArgs !== undefined) return fromArgs;
+
+    const callId = typeof payload.call_id === 'string' ? payload.call_id : '';
+    for (const [prefix, tool] of CALL_ID_TOOL_PREFIXES) {
+        if (callId.startsWith(prefix)) return tool;
+    }
+    return 'unknown';
+}
+
+function toolNameFromArgs(argsRaw: unknown): string | undefined {
+    if (typeof argsRaw !== 'string') return undefined;
+    let parsed: unknown;
+    try {
+        parsed = JSON.parse(argsRaw);
+    } catch {
+        // Non-JSON arguments are the `json_valid(args_raw)` false branch in SQL: fall through.
+        return undefined;
+    }
+    if (parsed === null || typeof parsed !== 'object' || Array.isArray(parsed)) return undefined;
+    for (const key of ARGS_TOOL_NAME_KEYS) {
+        const candidate = trimmedString((parsed as Record<string, unknown>)[key]);
+        if (candidate !== undefined) return candidate;
+    }
+    return undefined;
+}
+
+/**
+ * Build the insert op for one imported record, routing to the typed or JSON
+ * column path per target table.
+ */
 export function recordInsertOp(
     targetTable: string,
     recordHash: string,
@@ -268,9 +355,16 @@ export function recordInsertOp(
         }
         // record_hash and imported_at come from the function parameters, not the payload.
         const ts = timestamp(now);
+        // Tool identity is derived here rather than in each mapper: this is the single insert
+        // choke point for every typed table, so one derivation covers every source (0739 R1).
+        const toolIdentity = table === 'history_tool_call' ? resolveToolIdentity(payload) : undefined;
         const values = typedColumns.map((col) => {
             if (col === 'record_hash') return recordHash;
             if (col === 'imported_at') return ts;
+            if (toolIdentity !== undefined) {
+                if (col === 'effective_tool_name') return toolIdentity.effective;
+                if (col === 'tool_name_alias') return toolIdentity.alias;
+            }
             const v = payload[col];
             return v === undefined ? null : v;
         });
@@ -395,6 +489,51 @@ export async function ledgerExistingHashes(db: ImportOptions['db'], hashes: read
     return existing;
 }
 
+/** Candidate assistant-message row for duration derivation. */
+export interface AssistantDurationCandidate {
+    readonly recordHash: string;
+    readonly deltaMs: number | null;
+}
+
+/**
+ * Fetch candidate assistant rows lacking duration_ms along with timestamp delta to preceding record.
+ */
+export async function findAssistantDurationCandidates(db: DbAdapter): Promise<AssistantDurationCandidate[]> {
+    const candidateSql = `
+        WITH ordered AS (
+            SELECT record_hash,
+                   role,
+                   duration_ms,
+                   ts,
+                   LAG(ts) OVER (PARTITION BY source, session_id ORDER BY seq) AS prev_ts
+            FROM history_message
+            WHERE ts IS NOT NULL AND ts LIKE '____-__-__T%'
+        )
+        SELECT record_hash AS recordHash,
+               CAST(ROUND((unixepoch(ts, 'subsec') - unixepoch(prev_ts, 'subsec')) * 1000) AS INTEGER) AS deltaMs
+        FROM ordered
+        WHERE role = 'assistant' AND duration_ms IS NULL AND prev_ts IS NOT NULL`;
+
+    return db.queryAll<AssistantDurationCandidate>(candidateSql);
+}
+
+/**
+ * Update duration_ms and duration_source for a previously unmeasured assistant row.
+ */
+export async function updateAssistantDuration(
+    db: DbAdapter,
+    recordHash: string,
+    durationMs: number,
+    durationSource: string,
+): Promise<void> {
+    await db.run(
+        'UPDATE history_message SET duration_ms = ?, duration_source = ? WHERE record_hash = ? AND duration_ms IS NULL',
+        durationMs,
+        durationSource,
+        recordHash,
+    );
+}
+
 async function insertRecord(
     db: ImportOptions['db'],
     targetTable: string,
@@ -774,7 +913,14 @@ export function openCodeBulkWriteOperations(
                 FROM input
                 WHERE true
                 ON CONFLICT(record_hash) DO NOTHING`,
-                params: chunk.flatMap((entry) => [entry.recordHash, JSON.stringify(entry.record), importedAt]),
+                // Tool identity is folded into the payload rather than the SQL: this path
+                // json_extracts every column from payload_json, so a column the record lacks
+                // arrives NULL and violates the NOT NULL constraint (0739 R1).
+                params: chunk.flatMap((entry) => [
+                    entry.recordHash,
+                    JSON.stringify(table === 'history_tool_call' ? withToolIdentity(entry.record) : entry.record),
+                    importedAt,
+                ]),
             });
         }
     }

package/src/schema-sql.ts

@@ -1,3 +1,11 @@
+/**
+ * Schema version of the history import DDL.
+ *
+ * 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.4.56';
+
 /**
  * DDL string that creates the history import checkpoint, ledger, and typed contract tables.
  *
@@ -39,6 +47,7 @@ CREATE TABLE IF NOT EXISTS history_message (
     disposition        TEXT NOT NULL,
     ts                 TEXT,
     duration_ms        INTEGER,
+    duration_source    TEXT,
     model              TEXT,
     input_tokens       INTEGER,
     output_tokens      INTEGER,
@@ -72,7 +81,13 @@ CREATE TABLE IF NOT EXISTS history_tool_call (
     duration_ms   INTEGER,
     result_bytes  INTEGER,
     error_text    TEXT,
-    imported_at   TEXT NOT NULL
+    imported_at   TEXT NOT NULL,
+    -- Tool identity (0739). Appended last so a database that gained these columns
+    -- via Spur's guarded ALTER converges on the same PRAGMA column order as a
+    -- database created fresh from this DDL. 'unknown' is the unresolved sentinel
+    -- every consumer already falls back from.
+    effective_tool_name TEXT NOT NULL DEFAULT 'unknown',
+    tool_name_alias     TEXT NOT NULL DEFAULT 'unknown'
 );
 
 CREATE INDEX IF NOT EXISTS idx_history_message_session

package/src/tables.ts

@@ -0,0 +1,21 @@
+import { TYPED_HISTORY_TABLES } from './jsonl-importer-dao';
+import { SOURCE_DEFINITIONS } from './sources';
+
+/** Bookkeeping tables owned and maintained by the importer. */
+export const BOOKKEEPING_HISTORY_TABLES = ['history_import_checkpoint', 'history_import_ledger'] as const;
+
+/**
+ * Complete list of tables owned by the importer:
+ * - 3 typed contract tables (history_message, history_tool_call, history_skill_call)
+ * - 2 bookkeeping tables (history_import_checkpoint, history_import_ledger)
+ * - 10 per-source raw ETL landing tables (history_etl_<source>)
+ *
+ * Total: 15 tables.
+ * Sourced dynamically from static declarations so adding a source upstream automatically
+ * includes its landing table without downstream duplication.
+ */
+export const IMPORTER_OWNED_TABLES: readonly string[] = [
+    ...TYPED_HISTORY_TABLES,
+    ...BOOKKEEPING_HISTORY_TABLES,
+    ...Object.values(SOURCE_DEFINITIONS).map((def) => def.targetTable),
+];

package/src/types.ts

@@ -177,6 +177,7 @@ export interface SkillCallSplitRecord {
     readonly duration_ms?: number | null;
 }
 
+/** Normalized skill-call record imported into history_skill_call. */
 export interface SkillCall {
     readonly record_hash: string;
     readonly message_hash: string;