@fungi.computer/graft 0.1.4 → 0.1.6

package/dist/adapter.js

@@ -33,14 +33,7 @@ function notify(client, sessionId, update) {
         update,
     });
 }
-/**
- * Return the part of `next` that extends what was sent. ACP chunks cannot be
- * retracted, so a revision that does not extend the sent text sends nothing.
- */
-function unsent(sent, next) {
-    return next.startsWith(sent) ? next.slice(sent.length) : "";
-}
-async function projectMessage(client, sessionId, message, streamed = { text: "", thinking: "" }) {
+async function projectMessage(client, sessionId, message, streamed = { text: 0, thinking: 0 }) {
     const value = message.value;
     if (value.role === "system")
         return;
@@ -53,13 +46,13 @@ async function projectMessage(client, sessionId, message, streamed = { text: "",
         return;
     }
     if (value.role === "assistant") {
-        const thinking = unsent(streamed.thinking, thinkingFromAssistant(value.content));
+        const thinking = thinkingFromAssistant(value.content).slice(streamed.thinking);
         if (thinking)
             await notify(client, sessionId, {
                 sessionUpdate: "agent_thought_chunk",
                 content: acpText(thinking),
             });
-        const text = unsent(streamed.text, textFromAssistant(value.content));
+        const text = textFromAssistant(value.content).slice(streamed.text);
         if (text)
             await notify(client, sessionId, {
                 sessionUpdate: "agent_message_chunk",
@@ -95,14 +88,20 @@ async function projectProgress(client, sessionId, progress, turn) {
     if (turn.projected.has(progress.messageId))
         return;
     const sent = turn.streamed.get(progress.messageId) ?? {
-        text: "",
-        thinking: "",
+        text: 0,
+        thinking: 0,
     };
-    const thinking = unsent(sent.thinking, progress.thinking);
-    const text = unsent(sent.text, progress.text);
+    // ACP cannot retract text or represent a missing prefix. If a reset starts
+    // beyond what it has seen, leave that channel to exact durable completion.
+    const thinking = progress.thinking.offset > sent.thinking
+        ? ""
+        : progress.thinking.append.slice(Math.max(0, sent.thinking - progress.thinking.offset));
+    const text = progress.text.offset > sent.text
+        ? ""
+        : progress.text.append.slice(Math.max(0, sent.text - progress.text.offset));
     turn.streamed.set(progress.messageId, {
-        text: sent.text + text,
-        thinking: sent.thinking + thinking,
+        text: sent.text + text.length,
+        thinking: sent.thinking + thinking.length,
     });
     if (thinking)
         await notify(client, sessionId, {
@@ -140,10 +139,20 @@ async function projectFrame(client, sessionId, frame, turn) {
         return [];
     }
     if (frame.kind === "reset") {
-        // A reset replaces the baseline mid-turn. Project this turn's messages
-        // that were not already sent; everything else is history. Later progress
-        // frames carry cumulative text, so live progress resumes from its delta.
+        // A reset replaces the baseline mid-turn. Completed messages fill any
+        // missing prefix; a non-truncated tail may resume the live appends too.
         await projectTurnMessages(client, sessionId, frame.baseline.messages, turn);
+        const progress = frame.baseline.progress;
+        if (progress !== null)
+            await projectProgress(client, sessionId, {
+                messageId: progress.messageId,
+                revision: progress.revision,
+                text: { offset: progress.textOffset, append: progress.text },
+                thinking: {
+                    offset: progress.thinkingOffset,
+                    append: progress.thinking,
+                },
+            }, turn);
         return frame.baseline.terminals;
     }
     await projectTurnMessages(client, sessionId, frame.messages, turn);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fungi.computer/graft",
-  "version": "0.1.4",
+  "version": "0.1.6",
   "description": "ACP v1 projection for an authorized Shiitake Session",
   "type": "module",
   "main": "./dist/index.js",
@@ -25,7 +25,7 @@
     "@agentclientprotocol/sdk": "1.7.0",
     "@fungi.computer/cairn": "0.1.0",
     "@fungi.computer/mule": "0.2.1",
-    "@fungi.computer/shiitake": "0.6.0"
+    "@fungi.computer/shiitake": "0.8.0"
   },
   "devDependencies": {
     "@types/node": "24.13.3",