@vincemakes/kiso-core 0.1.32 → 0.1.33

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
@@ -150,15 +160,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 +213,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 +291,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 +312,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 +354,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 +416,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 +441,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":
@@ -417,7 +466,7 @@ export function projectMessages(events) {
         }
     }
     flushAssistant();
-    flushResults();
+    flushResults(true); // the log's end is the last resort: held inputs never drop
     return out;
 }
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vincemakes/kiso-core",
-  "version": "0.1.32",
+  "version": "0.1.33",
   "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",