@bivy/bivy 0.10.1-staging.280 → 0.10.1-staging.282

package/bin/codex-app-server-shim.mjs

@@ -178,6 +178,11 @@ function handleCompletedItem(params) {
         agentMessageItems.add(itemId);
         bivy({ type: "message.delta", text: String(item.text) });
       }
+      // An agentMessage is a real prose item, not merely another token in one
+      // turn-wide answer. Tell the protocol host it ended so commentary and tool
+      // activity render in source order (message → tools → message → tools)
+      // instead of one concatenated bubble followed by a single tool block.
+      bivy({ type: "message.boundary", itemId });
       return;
     case "plan":
       if (!reasoningItems.has(itemId) && item.text) emitReasoning(itemId, item.text);

package/dist/runtime/protocol.js

@@ -168,6 +168,11 @@ class ProtocolSession {
     resumeRef;
     started = false;
     assistantText = "";
+    /** A protocol agent can produce several discrete assistant messages in one
+     * turn (Codex commentary items are the common case). After a
+     * `message.boundary`, separate the next item's text in the cumulative stream
+     * instead of welding `"first." + "Second"` into `"first.Second"`. */
+    assistantItemBoundary = false;
     reasoningText = "";
     stderrOutput = "";
     lastUsage;
@@ -512,6 +517,16 @@ class ProtocolSession {
             if (this.streaming) {
                 if (!this.assistantText)
                     this.emit({ type: "message_start", message: { role: "assistant", content: "" } });
+                if (this.assistantItemBoundary && this.assistantText) {
+                    // If a tool already flushed the preceding item, advance the persisted
+                    // prefix over this display-only separator too; the next turnContent
+                    // block should contain `Second message`, not `\n\nSecond message`.
+                    const wasFullyFlushed = this.turnTextFlushed === this.assistantText;
+                    this.assistantText += "\n\n";
+                    if (wasFullyFlushed)
+                        this.turnTextFlushed = this.assistantText;
+                }
+                this.assistantItemBoundary = false;
                 this.assistantText += text;
                 this.emit({ type: "message_update", message: { role: "assistant", content: this.assistantText } });
                 return;
@@ -525,6 +540,26 @@ class ProtocolSession {
             this.foldLateAssistantDelta(text);
             return;
         }
+        if (type === "message.boundary") {
+            // Codex emits multiple agentMessage items during one turn: commentary,
+            // then tools, then more commentary. Seal the prose item now so the client
+            // can place the next tool card AFTER it. Waiting for session.done flattens
+            // every item into one growing bubble and leaves all tools in a block below.
+            // Keep assistantText cumulative: SessionStore uses the committed prefix to
+            // derive each new run, and session.done still persists the complete turn.
+            if (this.streaming && this.assistantText) {
+                // Keep the boundary durable too. The marker is display-only, but it lets
+                // renderHistory split adjacent prose items after reload even when no tool
+                // happened between them.
+                this.flushPendingTurnText();
+                if (this.turnContent[this.turnContent.length - 1]?.type !== "bivy_message_boundary") {
+                    this.turnContent.push({ type: "bivy_message_boundary" });
+                }
+                this.emit({ type: "message_boundary", message: { role: "assistant", content: this.assistantText } });
+                this.assistantItemBoundary = true;
+            }
+            return;
+        }
         if (type === "message.reasoning" || type === "reasoning.delta") {
             // Reasoning/thinking stream → the same intermediate thinking block the
             // daemon renders for Pi/Claude (display-only, kept out of the transcript).
@@ -574,6 +609,7 @@ class ProtocolSession {
             this.emit({ type: "message_end", message });
             this.streaming = false;
             this.assistantText = "";
+            this.assistantItemBoundary = false;
             this.reasoningText = "";
             this.turnContent = [];
             this.turnTextFlushed = "";
@@ -787,6 +823,7 @@ class ProtocolSession {
         this.messages.push({ role: "user", content: prompt, timestamp: Date.now() });
         this.streaming = true;
         this.assistantText = "";
+        this.assistantItemBoundary = false;
         this.reasoningText = "";
         this.stderrOutput = "";
         this.turnContent = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bivy/bivy",
-  "version": "0.10.1-staging.280",
+  "version": "0.10.1-staging.282",
   "type": "module",
   "license": "AGPL-3.0-only",
   "description": "Run coding agents on machines you own. Open-source, self-hostable agent workspace.",