@xrkseek/harness-cli 0.0.6 → 0.0.8

package/node_modules/@xrkseek/core-agent-loop/dist/settle-batch.d.ts

@@ -1,14 +1,22 @@
 /**
- * Step-local tool settlement: serial or parallel.
+ * Step-local tool settlement: serial, or concurrency-aware parallel.
+ *
+ * When `mode` is `parallel` (default):
+ *   - only tools whose `isConcurrencySafe(args) === true` may overlap
+ *   - exclusive calls are barriers (drain pool, run alone)
+ *   - later calls are reclassified before start (registry hot-reload safe)
  *
  * Innovation vs OpenCode FiberSet (completion-order publish):
- *   1) append every tool/call (barrier)
- *   2) settle bodies concurrently (optional)
- *   3) append tool/result in **call order**
+ *   1) append every tool/call (barrier — caller)
+ *   2) settle bodies with exclusive barriers + bounded parallel pools
+ *   3) append tool/result in **call order** (caller)
  * so the durable log stays reconstructible and order-stable.
+ *
+ * Cancel (DSH): already-started calls finish or `ABORTED`; never-started calls
+ * receive synthetic `ABORTED_BEFORE_DISPATCH` outcomes — no throw mid-batch.
  */
+import { type ToolCall } from "@xrkseek/protocol";
 import { type RunToolOutcome, type ToolMaterialization, type ToolPipeline, type ToolRegistry } from "@xrkseek/core-tools";
-import type { ToolCall } from "@xrkseek/protocol";
 export type ToolSettleMode = "serial" | "parallel";
 export interface SettleToolBatchInput {
     readonly calls: readonly ToolCall[];
@@ -16,17 +24,19 @@ export interface SettleToolBatchInput {
     readonly materialization: ToolMaterialization;
     readonly pipeline?: ToolPipeline;
     readonly signal?: AbortSignal;
-    /** Default `parallel`. */
+    /** Default `parallel` (concurrency-classified). Use `serial` to force exclusive. */
     readonly mode?: ToolSettleMode;
     /**
-     * Cap concurrent settles when `mode` is `parallel`.
-     * Omit / ≤0 → unbounded (Promise.all). Face `agent-loop.maxParallelToolCalls`.
+     * Cap concurrent settles within a parallel group.
+     * Omit / ≤0 → unbounded within the group. Face `agent-loop.maxParallelToolCalls`.
      */
     readonly maxParallel?: number;
 }
 export interface SettleToolBatchResult {
     readonly outcomes: readonly RunToolOutcome[];
     readonly mode: ToolSettleMode;
+    /** True when cancel filled remaining slots with ABORTED_BEFORE_DISPATCH. */
+    readonly aborted: boolean;
 }
 /**
  * Run settles for already-recorded calls. Does **not** touch the session log —

package/node_modules/@xrkseek/core-agent-loop/dist/settle-batch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settle-batch.d.ts","sourceRoot":"","sources":["../src/settle-batch.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,mBAAmB,EACxB,KAAK,YAAY,EACjB,KAAK,YAAY,EAClB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAElD,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,UAAU,CAAC;AAEnD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,KAAK,EAAE,SAAS,QAAQ,EAAE,CAAC;IACpC,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC;IAChC,QAAQ,CAAC,eAAe,EAAE,mBAAmB,CAAC;IAC9C,QAAQ,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC;IACjC,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAC9B,0BAA0B;IAC1B,QAAQ,CAAC,IAAI,CAAC,EAAE,cAAc,CAAC;IAC/B;;;OAGG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,QAAQ,EAAE,SAAS,cAAc,EAAE,CAAC;IAC7C,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;CAC/B;AAkBD;;;GAGG;AACH,wBAAsB,eAAe,CACnC,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,qBAAqB,CAAC,CAyChC"}
+{"version":3,"file":"settle-batch.d.ts","sourceRoot":"","sources":["../src/settle-batch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAIL,KAAK,QAAQ,EACd,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAKL,KAAK,cAAc,EACnB,KAAK,mBAAmB,EACxB,KAAK,YAAY,EACjB,KAAK,YAAY,EAClB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,MAAM,cAAc,GAAG,QAAQ,GAAG,UAAU,CAAC;AAEnD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,KAAK,EAAE,SAAS,QAAQ,EAAE,CAAC;IACpC,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC;IAChC,QAAQ,CAAC,eAAe,EAAE,mBAAmB,CAAC;IAC9C,QAAQ,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC;IACjC,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC;IAC9B,oFAAoF;IACpF,QAAQ,CAAC,IAAI,CAAC,EAAE,cAAc,CAAC;IAC/B;;;OAGG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,QAAQ,EAAE,SAAS,cAAc,EAAE,CAAC;IAC7C,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,4EAA4E;IAC5E,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;CAC3B;AAoLD;;;GAGG;AACH,wBAAsB,eAAe,CACnC,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,qBAAqB,CAAC,CA0DhC"}

package/node_modules/@xrkseek/core-agent-loop/dist/settle-batch.js

@@ -1,16 +1,65 @@
 /**
- * Step-local tool settlement: serial or parallel.
+ * Step-local tool settlement: serial, or concurrency-aware parallel.
+ *
+ * When `mode` is `parallel` (default):
+ *   - only tools whose `isConcurrencySafe(args) === true` may overlap
+ *   - exclusive calls are barriers (drain pool, run alone)
+ *   - later calls are reclassified before start (registry hot-reload safe)
  *
  * Innovation vs OpenCode FiberSet (completion-order publish):
- *   1) append every tool/call (barrier)
- *   2) settle bodies concurrently (optional)
- *   3) append tool/result in **call order**
+ *   1) append every tool/call (barrier — caller)
+ *   2) settle bodies with exclusive barriers + bounded parallel pools
+ *   3) append tool/result in **call order** (caller)
  * so the durable log stays reconstructible and order-stable.
+ *
+ * Cancel (DSH): already-started calls finish or `ABORTED`; never-started calls
+ * receive synthetic `ABORTED_BEFORE_DISPATCH` outcomes — no throw mid-batch.
  */
-import { runToolDetailed, } from "@xrkseek/core-tools";
+import { TOOL_ABORTED, TOOL_ABORTED_BEFORE_DISPATCH, TOOL_ABORTED_BEFORE_DISPATCH_MESSAGE, } from "@xrkseek/protocol";
+import { abortedToolContent, classifyToolExecutionMode, isAbortError, runToolDetailed, } from "@xrkseek/core-tools";
+const EMPTY_SIDE = {
+    additionalContexts: [],
+    safetyNotices: [],
+    toolEvents: [],
+    stages: [],
+};
+function abortedBeforeDispatchOutcome(call) {
+    return {
+        result: {
+            toolCallId: call.id,
+            name: call.name,
+            content: TOOL_ABORTED_BEFORE_DISPATCH_MESSAGE,
+            isError: true,
+            error: {
+                name: "AbortError",
+                code: TOOL_ABORTED_BEFORE_DISPATCH,
+            },
+        },
+        ...EMPTY_SIDE,
+        skippedBody: true,
+    };
+}
+/** Fallback when AbortError escapes runTool (pipeline normally absorbs it). */
+function abortedAfterStartOutcome(call) {
+    const body = abortedToolContent();
+    return {
+        result: {
+            toolCallId: call.id,
+            name: call.name,
+            content: body.content,
+            isError: true,
+            ...(body.error !== undefined ? { error: body.error } : {}),
+        },
+        ...EMPTY_SIDE,
+        skippedBody: false,
+    };
+}
+function isAbortSettlementCode(code) {
+    return code === TOOL_ABORTED || code === TOOL_ABORTED_BEFORE_DISPATCH;
+}
 async function settleOne(input, call) {
     if (input.signal?.aborted) {
-        throw new DOMException("aborted", "AbortError");
+        return abortedBeforeDispatchOutcome(call);
     }
     return runToolDetailed({
         registry: input.registry,
@@ -20,6 +69,98 @@ async function settleOne(input, call) {
         ...(input.pipeline ? { pipeline: input.pipeline } : {}),
     });
 }
+function parallelCap(input) {
+    if (typeof input.maxParallel === "number" &&
+        Number.isFinite(input.maxParallel) &&
+        input.maxParallel > 0) {
+        return Math.floor(input.maxParallel);
+    }
+    return Number.POSITIVE_INFINITY;
+}
+/**
+ * Run a consecutive parallel-classified group with a rolling pool.
+ * Stops filling when a later call reclassifies as exclusive (left for next group).
+ */
+async function settleParallelGroup(input, group) {
+    const cap = parallelCap(input);
+    const outcomes = group.map(() => undefined);
+    const inFlight = new Map();
+    let nextToStart = 0;
+    let started = 0;
+    let failure;
+    let aborted = false;
+    const start = (index) => {
+        const call = group[index];
+        started += 1;
+        const promise = settleOne(input, call).then((outcome) => {
+            outcomes[index] = outcome;
+            if (isAbortSettlementCode(outcome.result.error?.code)) {
+                aborted = true;
+            }
+            return index;
+        }, (err) => {
+            if (isAbortError(err)) {
+                aborted = true;
+                outcomes[index] = abortedAfterStartOutcome(call);
+                return index;
+            }
+            failure ??= err;
+            return index;
+        });
+        inFlight.set(index, promise);
+    };
+    const fill = () => {
+        while (nextToStart < group.length &&
+            inFlight.size < cap &&
+            !input.signal?.aborted &&
+            !aborted) {
+            const call = group[nextToStart];
+            if (nextToStart > 0 &&
+                classifyToolExecutionMode(input.registry, call).kind !== "parallel") {
+                break;
+            }
+            start(nextToStart);
+            nextToStart += 1;
+        }
+    };
+    fill();
+    while (inFlight.size > 0) {
+        const settledIndex = await Promise.race(inFlight.values());
+        inFlight.delete(settledIndex);
+        if (failure !== undefined) {
+            await Promise.allSettled([...inFlight.values()]);
+            throw failure instanceof Error ? failure : new Error(String(failure));
+        }
+        if (input.signal?.aborted) {
+            aborted = true;
+            await Promise.allSettled([...inFlight.values()]);
+            break;
+        }
+        fill();
+    }
+    if (aborted || input.signal?.aborted) {
+        aborted = true;
+        for (let i = 0; i < group.length; i++) {
+            if (outcomes[i] === undefined) {
+                outcomes[i] = abortedBeforeDispatchOutcome(group[i]);
+            }
+        }
+        return {
+            outcomes: outcomes,
+            consumed: group.length,
+            aborted: true,
+        };
+    }
+    const settled = [];
+    for (let i = 0; i < started; i++) {
+        const o = outcomes[i];
+        if (o === undefined) {
+            throw new Error(`settleToolBatch: missing outcome at ${i}`);
+        }
+        settled.push(o);
+    }
+    return { outcomes: settled, consumed: started, aborted: false };
+}
 /**
  * Run settles for already-recorded calls. Does **not** touch the session log —
  * caller owns call/result append barriers.
@@ -27,37 +168,54 @@ async function settleOne(input, call) {
 export async function settleToolBatch(input) {
     const mode = input.mode ?? "parallel";
     if (input.calls.length === 0) {
-        return { outcomes: [], mode };
+        return { outcomes: [], mode, aborted: false };
     }
     if (mode === "serial") {
         const outcomes = [];
+        let aborted = false;
         for (const call of input.calls) {
-            outcomes.push(await settleOne(input, call));
+            if (aborted || input.signal?.aborted) {
+                aborted = true;
+                outcomes.push(abortedBeforeDispatchOutcome(call));
+                continue;
+            }
+            const outcome = await settleOne(input, call);
+            if (isAbortSettlementCode(outcome.result.error?.code)) {
+                aborted = true;
+            }
+            outcomes.push(outcome);
         }
-        return { outcomes, mode };
+        return { outcomes, mode, aborted };
     }
-    const cap = typeof input.maxParallel === "number" &&
-        Number.isFinite(input.maxParallel) &&
-        input.maxParallel > 0
-        ? Math.floor(input.maxParallel)
-        : undefined;
-    if (cap === undefined || cap >= input.calls.length) {
-        const outcomes = await Promise.all(input.calls.map((call) => settleOne(input, call)));
-        return { outcomes, mode };
-    }
-    // Bounded parallel: worker pool; results kept in call order.
-    const outcomes = new Array(input.calls.length);
+    const outcomes = [];
     let next = 0;
-    async function worker() {
-        for (;;) {
-            const i = next++;
-            if (i >= input.calls.length)
-                return;
-            outcomes[i] = await settleOne(input, input.calls[i]);
+    let aborted = false;
+    while (next < input.calls.length) {
+        if (aborted || input.signal?.aborted) {
+            aborted = true;
+            for (let i = next; i < input.calls.length; i++) {
+                outcomes.push(abortedBeforeDispatchOutcome(input.calls[i]));
+            }
+            break;
+        }
+        const first = input.calls[next];
+        const kind = classifyToolExecutionMode(input.registry, first).kind;
+        if (kind === "exclusive") {
+            const outcome = await settleOne(input, first);
+            if (isAbortSettlementCode(outcome.result.error?.code)) {
+                aborted = true;
+            }
+            outcomes.push(outcome);
+            next += 1;
+            continue;
         }
+        const group = input.calls.slice(next);
+        const { outcomes: groupOut, consumed, aborted: groupAborted, } = await settleParallelGroup(input, group);
+        outcomes.push(...groupOut);
+        next += consumed;
+        if (groupAborted)
+            aborted = true;
     }
-    const workers = Array.from({ length: cap }, () => worker());
-    await Promise.all(workers);
-    return { outcomes, mode };
+    return { outcomes, mode, aborted };
 }
 //# sourceMappingURL=settle-batch.js.map

package/node_modules/@xrkseek/core-agent-loop/dist/settle-batch.js.map

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

package/node_modules/@xrkseek/core-session/README.md

@@ -27,4 +27,4 @@ See [docs/session-compaction.md](../../../docs/session-compaction.md).
 ## Store
 
 `createMemorySessionStore` — `append` runs `assertSessionEvent` then deep-freeze. `has(id)` 不抛。  
-`createPersistentSessionStore(dir)` — 工作区 `{dir}/sessions.db`（WAL · **schema v3** · `node:sqlite` · FTS5 trigram · lazy load · chunk 写批并物理 `text-chunks` · `flush()` · open-turn 崩溃修复）；Host 经 `XRK_SESSIONS_DIR` 默认选用；drain idle / `stop` 时 flush/close。ZIP 导出 `toPackedJSONL` + `.jsonl.zst` sidecar；`fromPackedJSONL` 可导入；`searchSessionIds` 供 Face `session.search`。
+`createPersistentSessionStore(dir)` — 工作区 `{dir}/sessions.db`（WAL · **schema v3** · `node:sqlite` · FTS5 trigram · lazy load · chunk 写批并物理 `text-chunks` / `tool-call-chunks` · `flush()` · open-turn 崩溃修复）；Host 经 `XRK_SESSIONS_DIR` 默认选用；drain idle / `stop` 时 flush/close。ZIP 导出 `toPackedJSONL` + `.jsonl.zst` sidecar；`fromPackedJSONL` 可导入；`searchSessionIds` 供 Face `session.search`。

package/node_modules/@xrkseek/core-session/dist/chunk-pack.d.ts

@@ -10,22 +10,36 @@ export interface TextChunkRow {
     readonly dts: readonly number[];
     readonly texts: readonly string[];
 }
-export type PackedStorageRecord = SessionEvent | TextChunkRow;
+/** Packed tool-call argument deltas (DSH `tool-call-chunks`). */
+export interface ToolCallChunkRow {
+    readonly type: "tool-call-chunks";
+    readonly turnId: string;
+    readonly stepId: string;
+    readonly index: number;
+    readonly toolCallId: string;
+    readonly toolName?: string;
+    readonly ts0: number;
+    readonly dts: readonly number[];
+    readonly args: readonly string[];
+}
+export type PackedStorageRecord = SessionEvent | TextChunkRow | ToolCallChunkRow;
 /**
- * Collapse runs of consecutive same-block `assistant/chunk` deltas for export.
- * Live session log stays one event per row; this is ZIP/JSONL artifact encoding only.
+ * Collapse runs of consecutive same-block `assistant/chunk` deltas for export /
+ * SQLite flush. Live session log stays one event per row.
  */
 export declare function packChunkRunsForExport(events: readonly SessionEvent[]): readonly PackedStorageRecord[];
 /** Expand packed export rows back to flat session events (import / round-trip). */
 export declare function expandPackedStorageRecords(records: readonly PackedStorageRecord[]): SessionEvent[];
 export declare function toPackedJSONL(events: readonly SessionEvent[]): string;
 export declare function isTextChunkRow(value: unknown): value is TextChunkRow;
+export declare function isToolCallChunkRow(value: unknown): value is ToolCallChunkRow;
+export declare function isPackedChunkRow(value: unknown): value is TextChunkRow | ToolCallChunkRow;
 export interface ParsePackedJSONLResult {
     readonly records: PackedStorageRecord[];
     /** Last non-empty line was not valid JSON or storage record. */
     readonly droppedTrailingIncomplete: boolean;
 }
-/** Parse export JSONL that may contain `text-chunks` storage rows. */
+/** Parse export JSONL that may contain packed chunk storage rows. */
 export declare function parsePackedJSONL(text: string): ParsePackedJSONLResult;
 /** Expand packed export JSONL to flat session events. */
 export declare function fromPackedJSONL(text: string): SessionEvent[];

package/node_modules/@xrkseek/core-session/dist/chunk-pack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"chunk-pack.d.ts","sourceRoot":"","sources":["../src/chunk-pack.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGtD,+EAA+E;AAC/E,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,GAAG,EAAE,SAAS,MAAM,EAAE,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;CACnC;AAED,MAAM,MAAM,mBAAmB,GAAG,YAAY,GAAG,YAAY,CAAC;AAoC9D;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,SAAS,YAAY,EAAE,GAC9B,SAAS,mBAAmB,EAAE,CAkChC;AAED,mFAAmF;AACnF,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,SAAS,mBAAmB,EAAE,GACtC,YAAY,EAAE,CAsBhB;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,MAAM,CAGrE;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,YAAY,CAapE;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,OAAO,EAAE,mBAAmB,EAAE,CAAC;IACxC,gEAAgE;IAChE,QAAQ,CAAC,yBAAyB,EAAE,OAAO,CAAC;CAC7C;AAED,sEAAsE;AACtE,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,sBAAsB,CAwCrE;AAED,yDAAyD;AACzD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,EAAE,CAE5D;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,sEAAsE;AACtE,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,EAAE,CAE/D"}
+{"version":3,"file":"chunk-pack.d.ts","sourceRoot":"","sources":["../src/chunk-pack.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGtD,+EAA+E;AAC/E,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,IAAI,EAAE,aAAa,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;IACpC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,GAAG,EAAE,SAAS,MAAM,EAAE,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;CACnC;AAED,iEAAiE;AACjE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,IAAI,EAAE,kBAAkB,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,GAAG,EAAE,SAAS,MAAM,EAAE,CAAC;IAChC,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;CAClC;AAED,MAAM,MAAM,mBAAmB,GAC3B,YAAY,GACZ,YAAY,GACZ,gBAAgB,CAAC;AA8ErB;;;GAGG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,SAAS,YAAY,EAAE,GAC9B,SAAS,mBAAmB,EAAE,CAoDhC;AAED,mFAAmF;AACnF,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,SAAS,mBAAmB,EAAE,GACtC,YAAY,EAAE,CA0ChB;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,MAAM,CAGrE;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,YAAY,CAapE;AAED,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,gBAAgB,CAa5E;AAED,wBAAgB,gBAAgB,CAC9B,KAAK,EAAE,OAAO,GACb,KAAK,IAAI,YAAY,GAAG,gBAAgB,CAE1C;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,OAAO,EAAE,mBAAmB,EAAE,CAAC;IACxC,gEAAgE;IAChE,QAAQ,CAAC,yBAAyB,EAAE,OAAO,CAAC;CAC7C;AAED,qEAAqE;AACrE,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,sBAAsB,CAwCrE;AAED,yDAAyD;AACzD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,YAAY,EAAE,CAE5D;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAErD;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,sEAAsE;AACtE,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,EAAE,CAE/D"}

package/node_modules/@xrkseek/core-session/dist/chunk-pack.js

@@ -2,45 +2,78 @@ import { zstdCompressSync, zstdDecompressSync } from "node:zlib";
 import { assertSessionEvent } from "@xrkseek/protocol";
 const MIN_RUN = 3;
 function isTextDelta(ev) {
-    return ev.kind !== "usage";
+    return ev.kind !== "usage" && ev.kind !== "tool-call";
 }
-function chunkKey(ev) {
+function isToolCallDelta(ev) {
+    return ev.kind === "tool-call" && typeof ev.toolCallId === "string";
+}
+function textKey(ev) {
     const kind = ev.kind ?? "text";
     const index = ev.index ?? 0;
     return `${ev.turnId}\0${ev.stepId}\0${kind}\0${index}`;
 }
-function continues(prev, next) {
-    return chunkKey(prev) === chunkKey(next);
+function toolKey(ev) {
+    const index = ev.index ?? 0;
+    const name = ev.toolName ?? "";
+    return `${ev.turnId}\0${ev.stepId}\0${index}\0${ev.toolCallId}\0${name}`;
+}
+function continuesText(prev, next) {
+    return textKey(prev) === textKey(next);
+}
+function continuesTool(prev, next) {
+    return toolKey(prev) === toolKey(next);
 }
-function buildRow(run) {
+function buildTextRow(run) {
     const first = run[0];
     const kind = first.kind ?? "text";
     return {
         type: "text-chunks",
         turnId: first.turnId,
         stepId: first.stepId,
-        kind,
+        kind: kind === "reasoning" ? "reasoning" : "text",
         index: first.index ?? 0,
         ts0: first.ts,
         dts: run.slice(1).map((ev, i) => ev.ts - run[i].ts),
         texts: run.map((ev) => ev.text),
     };
 }
+function buildToolRow(run) {
+    const first = run[0];
+    return {
+        type: "tool-call-chunks",
+        turnId: first.turnId,
+        stepId: first.stepId,
+        index: first.index ?? 0,
+        toolCallId: first.toolCallId,
+        ...(first.toolName ? { toolName: first.toolName } : {}),
+        ts0: first.ts,
+        dts: run.slice(1).map((ev, i) => ev.ts - run[i].ts),
+        args: run.map((ev) => ev.argumentsDelta ?? ev.text),
+    };
+}
 /**
- * Collapse runs of consecutive same-block `assistant/chunk` deltas for export.
- * Live session log stays one event per row; this is ZIP/JSONL artifact encoding only.
+ * Collapse runs of consecutive same-block `assistant/chunk` deltas for export /
+ * SQLite flush. Live session log stays one event per row.
  */
 export function packChunkRunsForExport(events) {
     const out = [];
-    let run = [];
+    let run;
     const flush = () => {
-        if (run.length >= MIN_RUN) {
-            out.push(buildRow(run));
+        if (!run)
+            return;
+        if (run.kind === "text") {
+            if (run.events.length >= MIN_RUN)
+                out.push(buildTextRow(run.events));
+            else
+                out.push(...run.events);
+        }
+        else if (run.events.length >= MIN_RUN) {
+            out.push(buildToolRow(run.events));
         }
         else {
-            out.push(...run);
+            out.push(...run.events);
         }
-        run = [];
+        run = undefined;
     };
     for (const event of events) {
         if (event.type !== "assistant/chunk") {
@@ -48,18 +81,28 @@ export function packChunkRunsForExport(events) {
             out.push(event);
             continue;
         }
+        if (isToolCallDelta(event)) {
+            if (run?.kind === "tool" &&
+                continuesTool(run.events[run.events.length - 1], event)) {
+                run.events.push(event);
+                continue;
+            }
+            flush();
+            run = { kind: "tool", events: [event] };
+            continue;
+        }
         if (!isTextDelta(event)) {
             flush();
             out.push(event);
             continue;
         }
-        const last = run[run.length - 1];
-        if (last !== undefined && continues(last, event)) {
-            run.push(event);
+        if (run?.kind === "text" &&
+            continuesText(run.events[run.events.length - 1], event)) {
+            run.events.push(event);
             continue;
         }
         flush();
-        run = [event];
+        run = { kind: "text", events: [event] };
     }
     flush();
     return out;
@@ -68,24 +111,45 @@ export function packChunkRunsForExport(events) {
 export function expandPackedStorageRecords(records) {
     const out = [];
     for (const record of records) {
-        if (record.type !== "text-chunks") {
-            out.push(record);
+        if (record.type === "text-chunks") {
+            let ts = record.ts0;
+            for (let i = 0; i < record.texts.length; i++) {
+                if (i > 0)
+                    ts += record.dts[i - 1];
+                out.push({
+                    type: "assistant/chunk",
+                    ts,
+                    turnId: record.turnId,
+                    stepId: record.stepId,
+                    text: record.texts[i],
+                    kind: record.kind,
+                    index: record.index,
+                });
+            }
             continue;
         }
-        let ts = record.ts0;
-        for (let i = 0; i < record.texts.length; i++) {
-            if (i > 0)
-                ts += record.dts[i - 1];
-            out.push({
-                type: "assistant/chunk",
-                ts,
-                turnId: record.turnId,
-                stepId: record.stepId,
-                text: record.texts[i],
-                kind: record.kind,
-                index: record.index,
-            });
+        if (record.type === "tool-call-chunks") {
+            let ts = record.ts0;
+            for (let i = 0; i < record.args.length; i++) {
+                if (i > 0)
+                    ts += record.dts[i - 1];
+                const delta = record.args[i];
+                out.push({
+                    type: "assistant/chunk",
+                    ts,
+                    turnId: record.turnId,
+                    stepId: record.stepId,
+                    text: delta,
+                    kind: "tool-call",
+                    index: record.index,
+                    toolCallId: record.toolCallId,
+                    ...(record.toolName ? { toolName: record.toolName } : {}),
+                    argumentsDelta: delta,
+                });
+            }
+            continue;
         }
+        out.push(record);
     }
     return out;
 }
@@ -106,7 +170,23 @@ export function isTextChunkRow(value) {
         Array.isArray(v.dts) &&
         Array.isArray(v.texts));
 }
-/** Parse export JSONL that may contain `text-chunks` storage rows. */
+export function isToolCallChunkRow(value) {
+    if (!value || typeof value !== "object")
+        return false;
+    const v = value;
+    return (v.type === "tool-call-chunks" &&
+        typeof v.turnId === "string" &&
+        typeof v.stepId === "string" &&
+        typeof v.index === "number" &&
+        typeof v.toolCallId === "string" &&
+        typeof v.ts0 === "number" &&
+        Array.isArray(v.dts) &&
+        Array.isArray(v.args));
+}
+export function isPackedChunkRow(value) {
+    return isTextChunkRow(value) || isToolCallChunkRow(value);
+}
+/** Parse export JSONL that may contain packed chunk storage rows. */
 export function parsePackedJSONL(text) {
     const rawLines = text.split(/\r?\n/);
     const nonempty = [];
@@ -133,7 +213,7 @@ export function parsePackedJSONL(text) {
                 cause: err,
             });
         }
-        if (isTextChunkRow(raw)) {
+        if (isPackedChunkRow(raw)) {
             records.push(raw);
             continue;
         }

package/node_modules/@xrkseek/core-session/dist/chunk-pack.js.map

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