@coder/ai-sdk-agent 0.6.1 → 0.6.3

package/dist/index.js

@@ -1328,10 +1328,12 @@ var TurnTranslator = class {
   // false only for announce-style empty snapshots, whose in-flight deltas are
   // still claimable by a same-id commit.
   #emittedByMessageId = /* @__PURE__ */ new Map();
-  // Same-id revision snapshots that arrived while the NEXT step's deltas were
-  // open (latest wins). chatd sends each revision once on a healthy
-  // connection, so the suffix cannot wait for a replay — it is reconciled as
-  // soon as the next step's snapshot settles ownership of the pending deltas.
+  // Same-id revision snapshots (their full wire content) that arrived while
+  // the NEXT step's deltas were open (latest wins). chatd sends each revision
+  // once on a healthy connection, so the suffix cannot wait for a replay — it
+  // is reconciled as soon as the next step's snapshot settles ownership of
+  // the pending deltas, or flushed by finish() when the segment ends without
+  // one (see #78).
   #deferredRevisions = /* @__PURE__ */ new Map();
   #error;
   #terminalStatus;
@@ -1406,22 +1408,34 @@ var TurnTranslator = class {
    * next delta simply opens a fresh block (its pending content is tracked
    * independently of blocks).
    */
-  #reconcileRevision(out, rec, fullText, fullReasoning) {
-    const textSuffix = fullText.length > rec.text.length && fullText.startsWith(rec.text) ? fullText.slice(rec.text.length) : "";
-    const reasoningSuffix = fullReasoning.length > rec.reasoning.length && fullReasoning.startsWith(rec.reasoning) ? fullReasoning.slice(rec.reasoning.length) : "";
-    if (!textSuffix && !reasoningSuffix) return;
+  #reconcileRevision(out, rec, content) {
+    const fullText = joinContent(content, "text");
+    const fullReasoning = joinContent(content, "reasoning");
+    const textOk = fullText.length > rec.text.length && fullText.startsWith(rec.text);
+    const reasoningOk = fullReasoning.length > rec.reasoning.length && fullReasoning.startsWith(rec.reasoning);
+    if (!textOk && !reasoningOk) return;
     this.#closeText(out);
     this.#closeReasoning(out);
-    if (reasoningSuffix) {
-      this.#emitReasoningDelta(out, reasoningSuffix);
-      rec.reasoning = fullReasoning;
-      this.#closeReasoning(out);
-    }
-    if (textSuffix) {
-      this.#emitTextDelta(out, textSuffix);
-      rec.text = fullText;
-      this.#closeText(out);
+    let seenText = 0;
+    let seenReasoning = 0;
+    for (const p of content) {
+      if (p.type === "text") {
+        const end = seenText + (p.text ?? "").length;
+        const from = Math.max(seenText, rec.text.length);
+        if (textOk && end > from) this.#emitTextDelta(out, fullText.slice(from, end));
+        seenText = end;
+      } else if (p.type === "reasoning") {
+        const end = seenReasoning + (p.text ?? "").length;
+        const from = Math.max(seenReasoning, rec.reasoning.length);
+        if (reasoningOk && end > from)
+          this.#emitReasoningDelta(out, fullReasoning.slice(from, end));
+        seenReasoning = end;
+      }
     }
+    if (textOk) rec.text = fullText;
+    if (reasoningOk) rec.reasoning = fullReasoning;
+    this.#closeText(out);
+    this.#closeReasoning(out);
   }
   // --- tool helpers ---------------------------------------------------------
   #isClientTool(name) {
@@ -1504,6 +1518,7 @@ var TurnTranslator = class {
         for (const tc of ev.action_required?.tool_calls ?? []) {
           if (this.#clientToolCalls.has(tc.tool_call_id)) continue;
           if (this.#submittedToolCallIds.has(tc.tool_call_id)) continue;
+          this.#flushDeferredRevisions(out);
           this.#closeText(out);
           this.#closeReasoning(out);
           this.#clientToolCalls.add(tc.tool_call_id);
@@ -1521,6 +1536,7 @@ var TurnTranslator = class {
       case "error":
         if (ev.error) {
           this.#error = ev.error;
+          this.#flushDeferredRevisions(out);
           out.push({ type: "error", error: new CoderChatError(ev.error) });
         }
         break;
@@ -1586,9 +1602,9 @@ var TurnTranslator = class {
       const fullReasoning = joinContent(content, "reasoning");
       const known = this.#emittedByMessageId.get(message.id);
       if (known && message.id !== this.#currentAssistantId) {
-        this.#reconcileRevision(out, known, fullText, fullReasoning);
+        this.#reconcileRevision(out, known, content);
       } else if (known && this.#deltasSinceSnapshot && known.substantive) {
-        this.#deferredRevisions.set(message.id, { text: fullText, reasoning: fullReasoning });
+        this.#deferredRevisions.set(message.id, content);
       } else {
         if (this.#currentAssistantId !== void 0 && this.#currentAssistantId !== message.id && !this.#deltasSinceSnapshot) {
           this.#closeText(out);
@@ -1628,8 +1644,7 @@ var TurnTranslator = class {
         for (const [id, deferred] of this.#deferredRevisions) {
           if (id === message.id) continue;
           const deferredRec = this.#emittedByMessageId.get(id);
-          if (deferredRec)
-            this.#reconcileRevision(out, deferredRec, deferred.text, deferred.reasoning);
+          if (deferredRec) this.#reconcileRevision(out, deferredRec, deferred);
           this.#deferredRevisions.delete(id);
         }
       }
@@ -1649,8 +1664,27 @@ var TurnTranslator = class {
     }
   }
   // --- finish ---------------------------------------------------------------
+  /**
+   * Flushes revisions still deferred behind a delta-ownership race that never
+   * settled — the racing step ended terminally without committing a snapshot,
+   * so the drain in #ingestMessage never ran. chatd sent each revision once;
+   * this is the segment's last chance to emit its suffix (#78). Attribution
+   * care: the pending deltas' owner never committed, so they attribute to no
+   * one — reconciliation is against the ledger alone, and only
+   * ledger-extension suffixes may emit. Runs at finish() and, because
+   * doGenerate() throws on a streamed error part and closes the generator
+   * before finish() (issue #72), ahead of the error part in ingest().
+   */
+  #flushDeferredRevisions(out) {
+    for (const [id, deferred] of this.#deferredRevisions) {
+      const rec = this.#emittedByMessageId.get(id);
+      if (rec) this.#reconcileRevision(out, rec, deferred);
+    }
+    this.#deferredRevisions.clear();
+  }
   finish() {
     const out = [];
+    this.#flushDeferredRevisions(out);
     this.#closeText(out);
     this.#closeReasoning(out);
     let unified;