@vincemakes/kiso-core 0.1.32 → 0.1.34

package/dist/index.d.ts

@@ -9,5 +9,4 @@ export * from "./kernel/permission.js";
 export * from "./kernel/loop.js";
 export * from "./kernel/compaction.js";
 export * from "./kernel/project.js";
-export * from "./kernel/ledger.js";
 export * from "./governance/delivery.js";

package/dist/index.js

@@ -9,5 +9,4 @@ export * from "./kernel/permission.js";
 export * from "./kernel/loop.js";
 export * from "./kernel/compaction.js";
 export * from "./kernel/project.js";
-export * from "./kernel/ledger.js";
 export * from "./governance/delivery.js";

package/dist/kernel/loop.js

@@ -374,14 +374,17 @@ export async function* loop(config) {
                         lastStop = ev.reason;
                         stopCount += 1;
                     }
-                    if (ev.type === "tool_call_end") {
-                        pending.push(ev);
+                    // R-E 0.1.43: the append precedes the launch — the call's
+                    // framework seq is assigned here; invocationSeq must never
+                    // be the adapter's stream-local hint (ADR-0002).
+                    const full = log.append(ev);
+                    if (full.type === "tool_call_end") {
+                        pending.push(full);
                         // streaming execution: the call launches immediately — the decide
                         // and the ledgered run proceed in parallel with the
                         // model stream.
-                        launch(ev);
+                        launch(full);
                     }
-                    const full = log.append(ev);
                     if (hooks.onEvent)
                         await hooks.onEvent(full, {}).catch(() => { });
                     yield full;
@@ -578,11 +581,13 @@ function terminalForStop(reason) {
     }
 }
 /** The tool_result event for a call — the shared shape (executionId rides
- *  it as the durable correlation, round 5). */
+ *  it as the durable correlation, round 5; invocationSeq = the framework
+ *  identity, R-E 0.1.43). */
 function resultEvent(call, result, executionId) {
     return {
         type: "tool_result",
         callId: call.callId,
+        invocationSeq: call.seq,
         content: result.content,
         isError: result.isError,
         // P1-9: errorKind only exists on errors (the type now enforces it;
@@ -665,6 +670,7 @@ async function decideCall(call, registry, hooks, ctx, log, resolveApproval, reso
                 type: "permission_decided",
                 decisionId: nextDecisionId(),
                 callId: call.callId,
+                invocationSeq: call.seq,
                 decision: chainVerdict.action === "allow" ? "approved" : "denied",
                 ...(chainVerdict.action === "deny" && chainVerdict.reason !== undefined
                     ? { reason: chainVerdict.reason }
@@ -733,6 +739,7 @@ async function humanPause(call, decisionId, hooks, log, resolveApproval, resolve
         type: "permission_requested",
         decisionId,
         callId: call.callId,
+        invocationSeq: call.seq,
         name: call.name,
         input: call.input ?? {},
         // W21: the ask verdict's speaker — the panel's why-asked line (a
@@ -759,6 +766,7 @@ async function humanPause(call, decisionId, hooks, log, resolveApproval, resolve
                     type: "permission_decided",
                     decisionId,
                     callId: call.callId,
+                    invocationSeq: call.seq,
                     decision: verdict ? "approved" : "denied",
                     ...(verdict ? {} : { reason: "denied by user" }),
                 });
@@ -774,6 +782,7 @@ async function humanPause(call, decisionId, hooks, log, resolveApproval, resolve
             type: "permission_decided",
             decisionId,
             callId: call.callId, // binds the decision to the invocation (B group)
+            invocationSeq: call.seq,
             decision: finalDecision.action === "allow" ? "approved" : "denied",
             ...(finalDecision.action === "deny" && finalDecision.reason !== undefined
                 ? { reason: finalDecision.reason }
@@ -806,6 +815,7 @@ async function runLedgered(call, registry, hooks, ctx, signal, push) {
         push({
             type: "tool_execution_started",
             callId: call.callId,
+            invocationSeq: call.seq,
             name: call.name,
             input: call.input, // non-null: decideCall denied a null input before this ran
         }, (id) => res(id ?? ""));
@@ -851,6 +861,7 @@ async function runLedgered(call, registry, hooks, ctx, signal, push) {
             type: "tool_execution_failed",
             executionId,
             callId: call.callId,
+            invocationSeq: call.seq,
             error: result.content,
             // P1-9: errorKind only exists on errors (the type now enforces it;
             // the runtime guard keeps a JS tool's illegal combination out of
@@ -865,6 +876,7 @@ async function runLedgered(call, registry, hooks, ctx, signal, push) {
             type: "tool_execution_succeeded",
             executionId,
             callId: call.callId,
+            invocationSeq: call.seq,
             result: { content: result.content, isError: false },
             ...(result.tags !== undefined ? { tags: result.tags } : {}),
         });

package/dist/kernel/project.js

@@ -85,6 +85,7 @@ export function projectMessages(events) {
             assistantSource = undefined;
             return;
         }
+        const callIds = blocks.filter((b) => b.type === "tool_use").map((b) => b.callId);
         const reasoning = pendingReasoning;
         pendingReasoning = null;
         out.push({
@@ -95,6 +96,15 @@ export function projectMessages(events) {
         });
         blocks = [];
         assistantSource = undefined;
+        // P1: the closed assistant's calls whose results are NOT already
+        // buffered are pending — their results land later (post-stop late
+        // results, the straddle's shape). The mid-execution inputs hold
+        // until those results flush.
+        // the guard keeps a still-pending pair holding when a call-less
+        // assistant closes mid-hold (the empty set would release the input)
+        const buffered = new Set(resultBuf.map((r) => r.callId));
+        if (callIds.length > 0)
+            pendingCalls = new Set(callIds.filter((c) => !buffered.has(c)));
     };
     // C group/round 6: vetoed/rewritten user inputs. Collect the replacement map
     // first — the FINAL replacement for each input wins (later replacements
@@ -136,7 +146,17 @@ export function projectMessages(events) {
             }
         }
     }
-    const isCovered = (seq) => summaryRanges.some((r) => seq > r.from && seq <= r.to);
+    // R-E 0.1.43 (Gap B): a model_output_abandoned marker voids the range
+    // (voidFromSeq, its seq] — the abandoned draft's events. The ranges are
+    // disjoint and in seq order; the skip below treats them exactly like the
+    // summary ranges (the marker itself renders nothing and skips itself).
+    const voidRanges = [];
+    for (const ev of events) {
+        if (ev.type === "model_output_abandoned")
+            voidRanges.push({ from: ev.voidFromSeq, to: ev.seq ?? -1 });
+    }
+    const isCovered = (seq) => summaryRanges.some((r) => seq > r.from && seq <= r.to) ||
+        voidRanges.some((r) => seq > r.from && seq <= r.to);
     // Summaries render in range order as the pass crosses their boundaries.
     let renderedSummaries = 0;
     // 0.1.26 (ADR-0024 Amd, parallel execution): the tool results of ONE turn
@@ -150,15 +170,32 @@ export function projectMessages(events) {
     let resultBuf = [];
     const callOrder = new Map();
     let callOrderNext = 0;
-    const flushResults = () => {
-        if (resultBuf.length === 0)
-            return;
-        resultBuf.sort((a, b) => (callOrder.get(a.callId) ?? 0) - (callOrder.get(b.callId) ?? 0));
-        for (const r of resultBuf)
-            out.push(r.message);
-        resultBuf = [];
-        callOrder.clear();
-        callOrderNext = 0;
+    // P1 (0.1.42): the mid-execution input deferral. A user input arriving
+    // while the last closed assistant's tool_calls are UNANSWERED (the
+    // result lands later in the log — the boundary straddle's durable
+    // shape) must never separate the call from its result: the request
+    // [assistant, user, tool] is a real provider 400. Such inputs are
+    // HELD and released right after the results flush — the mid-execution
+    // input takes effect when the turn's execution completes.
+    let pendingCalls = new Set();
+    let heldUsers = [];
+    const flushResults = (force = false) => {
+        if (resultBuf.length > 0) {
+            resultBuf.sort((a, b) => (callOrder.get(a.callId) ?? 0) - (callOrder.get(b.callId) ?? 0));
+            for (const r of resultBuf)
+                out.push(r.message);
+            resultBuf = [];
+            callOrder.clear();
+            callOrderNext = 0;
+        }
+        // The held inputs release ONLY when the pair resolved (or the
+        // projection ends — force): a still-pending pair must keep holding,
+        // or the next user_input's leading flush would dump the inputs
+        // between the call and its late result (the 400 again).
+        if (force || pendingCalls.size === 0) {
+            out.push(...heldUsers);
+            heldUsers = [];
+        }
     };
     let explicitAssistant = false;
     for (const ev of events) {
@@ -186,30 +223,41 @@ export function projectMessages(events) {
             case "user_input": {
                 // 0.1.26: the previous turn closes here — the assistant
                 // first, then its results in call order (the turn boundary).
-                flushAssistant();
-                flushResults();
                 // round 6: the final replacement renders HERE, at the input's own
                 // position — the original is skipped, the replacement event
                 // itself produces nothing (a later replacement for the same
-                // input never becomes a second message).
+                // input never becomes a second message); a null content is a
+                // true veto (nothing renders at that position).
+                flushAssistant();
+                flushResults();
+                let content = ev.content;
+                let source = ev.source;
+                let veto = false;
                 if ("seq" in ev && typeof ev.seq === "number" && replaced.has(ev.seq)) {
                     const replacement = replaced.get(ev.seq);
-                    flushAssistant();
-                    if (replacement.content !== null) {
-                        out.push({
-                            role: "user",
-                            content: replacement.content,
-                            ...(replacement.source !== undefined ? { source: replacement.source } : {}),
-                        });
+                    if (replacement.content === null) {
+                        veto = true;
+                    }
+                    else {
+                        content = replacement.content;
+                        source = replacement.source ?? ev.source;
                     }
-                    break;
                 }
-                flushAssistant();
-                out.push({
+                if (veto)
+                    break;
+                const message = {
                     role: "user",
-                    content: ev.content,
-                    ...(ev.source !== undefined ? { source: ev.source } : {}),
-                });
+                    content,
+                    ...(source !== undefined ? { source } : {}),
+                };
+                // P1: the mid-execution deferral — an input arriving while
+                // the turn's calls are unanswered is HELD and released right
+                // after the results flush (the pairing invariant: the
+                // results must follow their calls before any user message).
+                if (pendingCalls.size > 0)
+                    heldUsers.push(message);
+                else
+                    out.push(message);
                 break;
             }
             case "user_input_replaced":
@@ -253,18 +301,16 @@ export function projectMessages(events) {
             case "text_delta":
                 // 0.1.26: a text delta with BUFFERED RESULTS opens the NEXT
                 // turn's stream — the previous turn closes HERE: its
-                // assistant first (already closed at the stop, usually),
-                // then its buffered results in call order (the turn
-                // boundary; the API requires each tool_calls message to be
-                // followed by its tool messages — a real DeepSeek 400
-                // without the boundary). The guard keys on the RESULT
-                // buffer: a mid-message delta (the current turn's text, the
-                // multi-block assistant) has nothing buffered and must not
-                // flush — the empty flush would clear the source and split
-                // the message.
-                if (resultBuf.length > 0)
-                    flushAssistant();
-                flushResults();
+                // assistant (closed at the stop), then its buffered results
+                // in call order (the API requires each tool_calls message
+                // to be followed by its tool messages — a real 400 without
+                // the boundary). P1 (0.1.42): the flush keys on OPEN
+                // assistant content — an open block or text proves the
+                // model is still streaming THIS turn, and a same-turn
+                // buffered result must stay buffered (flushing it here
+                // split the turn's message — the fresh2 400).
+                if (blocks.length === 0 && text === null && resultBuf.length > 0)
+                    flushResults();
                 text = (text ?? "") + ev.text;
                 break;
             case "tool_call_start":
@@ -276,11 +322,14 @@ export function projectMessages(events) {
             case "tool_call_end":
                 // 0.1.26: a tool_call_end with BUFFERED RESULTS opens the
                 // NEXT turn's stream (the model called again) — the
-                // previous turn closes first; a same-turn call has nothing
-                // buffered.
-                if (resultBuf.length > 0)
-                    flushAssistant();
-                flushResults();
+                // previous turn's results close first; a same-turn call
+                // keeps the assistant open. P1 (0.1.42): open assistant
+                // content proves the same-turn call — the buffered results
+                // close at the stop, NEVER here (flushing a same-turn
+                // result at a later call_end split the turn's message —
+                // the fresh2 400).
+                if (blocks.length === 0 && text === null && resultBuf.length > 0)
+                    flushResults();
                 pushText();
                 callOrder.set(ev.callId, callOrderNext++);
                 blocks.push({
@@ -315,6 +364,9 @@ export function projectMessages(events) {
                 }
                 // 0.1.26: BUFFERED — the results flush in call order at the
                 // turn boundary (flushResults), not in completion order.
+                // P1: a pending call's result resolves the pair — the held
+                // mid-execution inputs release with the flush.
+                pendingCalls.delete(ev.callId);
                 resultBuf.push({ callId: ev.callId, message });
                 break;
             }
@@ -374,9 +426,11 @@ export function projectMessages(events) {
                 // the assistant message that follows carries it. 0.1.26: the
                 // assistant flush is guarded on the buffered results (a
                 // mid-turn reasoning must not split the current message).
-                if (resultBuf.length > 0)
-                    flushAssistant();
-                flushResults();
+                // P1 (0.1.42): the flush keys on OPEN assistant content —
+                // a mid-turn reasoning with a same-turn result buffered
+                // must NOT split the message (the fresh2 400 family).
+                if (blocks.length === 0 && text === null && resultBuf.length > 0)
+                    flushResults();
                 pendingReasoning = (pendingReasoning ?? "") + ev.text;
                 break;
             case "summarized":
@@ -397,9 +451,14 @@ export function projectMessages(events) {
                 break;
             case "stop":
                 // The turn boundary: the assistant closes at the provider's
-                // stop; the results are buffered and flush at the next
-                // turn's first event.
+                // stop — and the turn's BUFFERED results close WITH it (P1
+                // 0.1.42). Parallel execution lands same-turn results
+                // mid-stream; flushing them here — the true boundary —
+                // projects [assistant, results…] in reading order, and the
+                // stream-open guards below only ever flush a CLOSED turn's
+                // late (post-stop) results.
                 flushAssistant();
+                flushResults();
                 break;
             case "terminal":
             case "tool_execution_started":
@@ -410,6 +469,10 @@ export function projectMessages(events) {
             case "permission_decided":
             case "permission_expired":
             case "uncertain_pending":
+            case "model_output_abandoned":
+                // R-E 0.1.43: renders nothing — the marker is always skipped by
+                // its own range; the case documents the intent (and no flush:
+                // it must never split a message).
                 break;
             case "microcompacted":
                 // handled above (the replacement pass) — no open message.
@@ -417,7 +480,7 @@ export function projectMessages(events) {
         }
     }
     flushAssistant();
-    flushResults();
+    flushResults(true); // the log's end is the last resort: held inputs never drop
     return out;
 }
 /**

package/dist/protocol/events.d.ts

@@ -134,6 +134,7 @@ export interface ToolResultEvent {
     readonly seq: number;
     readonly type: "tool_result";
     readonly callId: string;
+    readonly invocationSeq?: number;
     /** Full content — blocks preserved losslessly (D group). */
     readonly content: string | readonly import("./messages.js").ContentBlock[];
     readonly isError: boolean;
@@ -199,6 +200,7 @@ export interface ToolExecutionStarted {
     readonly type: "tool_execution_started";
     readonly executionId: string;
     readonly callId: string;
+    readonly invocationSeq?: number;
     readonly name: string;
     readonly input: Readonly<Record<string, unknown>>;
 }
@@ -208,6 +210,7 @@ export interface ToolExecutionSucceeded {
     readonly type: "tool_execution_succeeded";
     readonly executionId: string;
     readonly callId: string;
+    readonly invocationSeq?: number;
     readonly result: {
         readonly content: string;
         readonly isError: false;
@@ -227,6 +230,7 @@ export interface ToolExecutionFailed {
     readonly type: "tool_execution_failed";
     readonly executionId: string;
     readonly callId: string;
+    readonly invocationSeq?: number;
     readonly error: string;
     readonly errorKind?: ToolErrorKind;
     readonly safeToRetry: boolean;
@@ -243,6 +247,7 @@ export interface ToolExecutionResolved {
     readonly type: "tool_execution_resolved";
     readonly executionId: string;
     readonly callId: string;
+    readonly invocationSeq?: number;
     readonly resolution: "rerun" | "abandoned";
 }
 /**
@@ -256,6 +261,7 @@ export interface PermissionRequested {
     readonly type: "permission_requested";
     readonly decisionId: string;
     readonly callId: string;
+    readonly invocationSeq?: number;
     readonly name: string;
     readonly input: Readonly<Record<string, unknown>>;
     /** W21: the first non-abstain extension's name — the panel's why-asked
@@ -269,6 +275,7 @@ export interface PermissionDecided {
     readonly decisionId: string;
     /** The invocation this decision binds to (B group). */
     readonly callId?: string;
+    readonly invocationSeq?: number;
     readonly decision: "approved" | "denied";
     readonly reason?: string;
     /** E1: the deciding extension's name — present ONLY on policy decisions;
@@ -353,6 +360,22 @@ export interface SummarizedEvent {
     /** The model's compression — replaces the covered range in the projection. */
     readonly summary: string;
 }
+/**
+ * R-E 0.1.43 / ADR-0047 (Gap B) — a model output suffix WITHOUT a committed
+ * stop was abandoned on resume. `voidFromSeq` is the last committed-boundary
+ * event's seq (stop / user_input / terminal / compaction / summarized); the
+ * voided range is (voidFromSeq, this.seq]. The projection skips the range and
+ * the marker itself renders nothing — "a model output suffix without a
+ * committed stop is an incomplete draft and must never become committed
+ * provider history." Kernel-owned: the AdapterEvent whitelist excludes it, so
+ * adapter/extension forgery is invalid_request by construction.
+ */
+export interface ModelOutputAbandoned {
+    readonly seq: number;
+    readonly type: "model_output_abandoned";
+    readonly voidFromSeq: number;
+    readonly reason: string;
+}
 /** Extended-thinking content. Providers without it emit nothing here. */
 export interface Thinking {
     readonly seq: number;
@@ -440,10 +463,17 @@ export interface TerminalEvent {
     readonly outcome: Terminal;
 }
 /**
+ * IDENTITY (the three-identity model, R-E 0.1.43 / ADR-0047): an invocation
+ * carries THREE ids — `callId` (provider correlation only, may repeat across
+ * runs), `invocationSeq` (the framework identity = the call's tool_call_end
+ * .seq; OPTIONAL — absent on old logs, present on everything written from
+ * 0.1.43), and `executionId` (a specific execution of that invocation, one
+ * per started event). Old logs keep the callId + seq-proximity fallback.
+ *
  * The union. Consume it with a `switch (event.type)`; with
  * `strictNullChecks` on, an unhandled variant is a compile error.
  */
-export type Event = AssistantStart | AssistantEnd | TextStart | TextDelta | TextEnd | ToolCallStart | ToolCallInputDelta | ToolCallEnd | ToolResultEvent | Thinking | Usage | Stop | UserInputEvent | CompactedEvent | ToolExecutionStarted | ToolExecutionSucceeded | ToolExecutionFailed | ToolExecutionResolved | PermissionRequested | PermissionDecided | PermissionExpired | UncertainPending | UserInputReplaced | MicroCompactEvent | SummarizedEvent | TerminalEvent;
+export type Event = AssistantStart | AssistantEnd | TextStart | TextDelta | TextEnd | ToolCallStart | ToolCallInputDelta | ToolCallEnd | ToolResultEvent | Thinking | Usage | Stop | UserInputEvent | CompactedEvent | ToolExecutionStarted | ToolExecutionSucceeded | ToolExecutionFailed | ToolExecutionResolved | PermissionRequested | PermissionDecided | PermissionExpired | UncertainPending | UserInputReplaced | MicroCompactEvent | SummarizedEvent | ModelOutputAbandoned | TerminalEvent;
 /**
  * Runtime type guard for the union. The store validates every JSONL record
  * with it: valid JSON that is not a kiso event is corruption, not history.

package/dist/protocol/events.js

@@ -102,6 +102,9 @@ function isErrorKind(v) {
 function isExecutionId(v) {
     return v.executionId === undefined || typeof v.executionId === "string";
 }
+/** R-E 0.1.43: the optional framework invocation identity — absent on old
+ *  logs, otherwise a non-negative safe integer (the tool_call_end.seq). */
+const isInvocationSeq = (v) => v.invocationSeq === undefined || isNonNegativeInt(v.invocationSeq);
 /** A StructuredError — the shape the `error` terminal carries. round 9: a
  *  status, when present, is a non-negative safe integer (no negatives,
  *  NaN, Infinity, or fractions). */
@@ -170,7 +173,7 @@ const EVENT_VALIDATORS = {
         isErrorKind(v) &&
         isExecutionId(v) &&
         isSource(v) &&
-        isTags(v),
+        isTags(v) && isInvocationSeq(v),
     thinking: (v) => typeof v.text === "string",
     usage: isUsage,
     stop: (v) => STOP_REASONS.has(v.reason),
@@ -186,32 +189,32 @@ const EVENT_VALIDATORS = {
     tool_execution_started: (v) => typeof v.executionId === "string" &&
         typeof v.callId === "string" &&
         typeof v.name === "string" &&
-        isPlainObject(v.input),
+        isPlainObject(v.input) && isInvocationSeq(v),
     tool_execution_succeeded: (v) => typeof v.executionId === "string" &&
         typeof v.callId === "string" &&
         isPlainObject(v.result) &&
         typeof v.result.content === "string" &&
         v.result.isError === false &&
-        isTags(v),
+        isTags(v) && isInvocationSeq(v),
     tool_execution_failed: (v) => typeof v.executionId === "string" &&
         typeof v.callId === "string" &&
         typeof v.error === "string" &&
         typeof v.safeToRetry === "boolean" &&
         isErrorKind(v) &&
-        isTags(v),
+        isTags(v) && isInvocationSeq(v),
     tool_execution_resolved: (v) => typeof v.executionId === "string" &&
         typeof v.callId === "string" &&
-        (v.resolution === "rerun" || v.resolution === "abandoned"),
+        (v.resolution === "rerun" || v.resolution === "abandoned") && isInvocationSeq(v),
     permission_requested: (v) => typeof v.decisionId === "string" &&
         typeof v.callId === "string" &&
         typeof v.name === "string" &&
         isPlainObject(v.input) &&
-        (v.speaker === undefined || typeof v.speaker === "string"),
+        (v.speaker === undefined || typeof v.speaker === "string") && isInvocationSeq(v),
     permission_decided: (v) => typeof v.decisionId === "string" &&
         (v.decision === "approved" || v.decision === "denied") &&
         (v.callId === undefined || typeof v.callId === "string") &&
         (v.reason === undefined || typeof v.reason === "string") &&
-        (v.decidedBy === undefined || typeof v.decidedBy === "string"),
+        (v.decidedBy === undefined || typeof v.decidedBy === "string") && isInvocationSeq(v),
     permission_expired: (v) => typeof v.decisionId === "string" && typeof v.reason === "string",
     uncertain_pending: (v) => typeof v.executionId === "string" && typeof v.callId === "string" && typeof v.name === "string" && typeof v.error === "string",
     microcompacted: (v) => isNonNegativeInt(v.beforeSeq),
@@ -221,6 +224,9 @@ const EVENT_VALIDATORS = {
         typeof v.summary === "string" &&
         v.summary.length > 0 &&
         v.coversToSeq < v.seq,
+    // R-E 0.1.43: the void starts at a committed boundary BEFORE the marker —
+    // a marker that voids nothing (or itself) is corruption, not history.
+    model_output_abandoned: (v) => isNonNegativeInt(v.voidFromSeq) && typeof v.reason === "string" && v.voidFromSeq < v.seq,
     user_input_replaced: (v) => isNonNegativeInt(v.replaces) && (v.content === null || isContent(v.content)) && isSource(v),
     terminal: (v) => isTerminal(v.outcome),
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vincemakes/kiso-core",
-  "version": "0.1.32",
+  "version": "0.1.34",
   "description": "kiso (foundation) core — protocol, event log, loop, hooks, modes, permissions, compaction, delivery truth. The 2,000-line kernel at the bottom of the kiso framework.",
   "type": "module",
   "license": "MIT",
@@ -33,7 +33,7 @@
     "openai"
   ],
   "devDependencies": {
-    "@vincemakes/kiso-evals": "0.1.33",
+    "@vincemakes/kiso-evals": "0.1.35",
     "@types/node": "^26.1.2",
     "typescript": "^5.7.2",
     "vitest": "^3.0.0"