@syntrologie/adapt-chatbot 2.8.0-canary.295 → 2.8.0-canary.297

package/dist/AdaptiveChatBar.js

@@ -1,8 +1,8 @@
 import {
   AdaptiveChatBar
 } from "./chunk-SCVTTLFJ.js";
-import "./chunk-3HYMFSO4.js";
-import "./chunk-A4X7HEVE.js";
+import "./chunk-TIHH27JQ.js";
+import "./chunk-ZZUKH2D6.js";
 import "./chunk-UVKRO5ER.js";
 export {
   AdaptiveChatBar

package/dist/AdaptiveChatTrail.js

@@ -1,7 +1,7 @@
 import {
   AdaptiveChatTrail
-} from "./chunk-3HYMFSO4.js";
-import "./chunk-A4X7HEVE.js";
+} from "./chunk-TIHH27JQ.js";
+import "./chunk-ZZUKH2D6.js";
 import "./chunk-UVKRO5ER.js";
 export {
   AdaptiveChatTrail

package/dist/ChatAssistantLit.js

@@ -1,8 +1,8 @@
 import {
   ChatAssistantLitMountable,
   renderFallbackHtml
-} from "./chunk-F2INJT5F.js";
-import "./chunk-A4X7HEVE.js";
+} from "./chunk-E2H6T7XI.js";
+import "./chunk-ZZUKH2D6.js";
 import "./chunk-VLJ3WOEX.js";
 import "./chunk-UVKRO5ER.js";
 export {

package/dist/{chunk-F2INJT5F.js → chunk-E2H6T7XI.js}

@@ -7325,6 +7325,7 @@ var AgUiTransport = class {
     this._pendingResume = false;
     this._currentAssistantMessageId = null;
     this._toolCallMessageIds = /* @__PURE__ */ new Map();
+    this._localPendingInterrupts = /* @__PURE__ */ new Map();
     this._url = options.url;
     this._headers = options.headers ?? {};
     this._threadId = options.threadId;
@@ -7332,6 +7333,7 @@ var AgUiTransport = class {
     this._credentials = options.credentials;
     this._onA2UIEvent = options.onA2UIEvent;
     this._forwardedProps = options.forwardedProps;
+    this._serverOwnedHistory = options.serverOwnedHistory ?? false;
   }
   get connected() {
     return this._connected;
@@ -7365,6 +7367,7 @@ var AgUiTransport = class {
     this._pendingResume = false;
     this._currentAssistantMessageId = null;
     this._toolCallMessageIds.clear();
+    this._localPendingInterrupts.clear();
   }
   send(action) {
     if (!this._agent) return;
@@ -7394,9 +7397,13 @@ var AgUiTransport = class {
   // ---------------------------------------------------------------------------
   _sendUserMessage(text) {
     const agent = this._agent;
-    const pendingInterrupts = (agent.pendingInterrupts ?? []).map((i) => i).filter(
+    const upstream = (agent.pendingInterrupts ?? []).map((i) => i).filter(
       (i) => typeof i?.id === "string" && i.id.length > 0
     );
+    const byId = /* @__PURE__ */ new Map();
+    for (const i of this._localPendingInterrupts.values()) byId.set(i.id, i);
+    for (const i of upstream) byId.set(i.id, i);
+    const pendingInterrupts = [...byId.values()];
     const cancelResume = pendingInterrupts.length > 0 ? pendingInterrupts.map((i) => {
       const toolCallId = i.toolCallId ?? i.tool_call_id;
       if (toolCallId) {
@@ -7407,6 +7414,7 @@ var AgUiTransport = class {
         status: "cancelled"
       };
     }) : void 0;
+    if (cancelResume) this._localPendingInterrupts.clear();
     agent.addMessage({
       id: generateId(),
       role: "user",
@@ -7440,6 +7448,7 @@ var AgUiTransport = class {
   // ---------------------------------------------------------------------------
   _sendDeferredToolResume(action) {
     let entry;
+    this._localPendingInterrupts.delete(action.interruptId);
     if (action.decision === "cancel") {
       entry = { interruptId: action.interruptId, status: "cancelled" };
     } else if (action.decision === "approve") {
@@ -7466,12 +7475,18 @@ var AgUiTransport = class {
     if (typeof this._headers === "function") {
       agent.headers = this._headers();
     }
+    const sentMessageIds = new Set((agent.messages ?? []).map((m) => m.id));
     const fwd = typeof this._forwardedProps === "function" ? this._forwardedProps() : this._forwardedProps;
     const runParams = {
       ...fwd ? { forwardedProps: fwd } : {},
       ...resume && resume.length > 0 ? { resume: [...resume] } : {}
     };
-    agent.runAgent(runParams, this._buildSubscriber()).catch((err) => {
+    const runPromise = agent.runAgent(runParams, this._buildSubscriber());
+    runPromise.then(() => {
+      this._resetAgentMessages(agent, sentMessageIds);
+    }).catch(() => {
+    });
+    runPromise.catch((err) => {
       const message = err instanceof Error ? err.message : "Agent run failed";
       const errorName = err instanceof Error ? err.name : null;
       const e = err;
@@ -7480,10 +7495,60 @@ var AgUiTransport = class {
       const body = typeof rawBody === "string" ? rawBody.slice(0, 500) : rawBody != null ? JSON.stringify(rawBody).slice(0, 500) : null;
       this._pendingResume = false;
       this._currentAssistantMessageId = null;
+      this._resetAgentMessages(agent, sentMessageIds);
       this._emit({ type: "error", message, status, body, errorName });
       this._emit({ type: "typing", isTyping: false });
     });
   }
+  /**
+   * Reset `agent.messages` after a settled run (server-owned history).
+   *
+   * The backend owns conversation state (`chat_threads.native_messages`);
+   * the agent object is only a request builder, so anything that already
+   * shipped in a run is dropped. The ONLY retention is undelivered
+   * client-tool state: an assistant message carrying `toolCalls` for a
+   * tool in `clientTools` whose result either doesn't exist yet (the UI
+   * is still computing/asking) or was queued mid-run and never shipped
+   * (`_sendToolResult` while `isRunning`). The retained pair makes the
+   * next run's wire self-consistent — a `role: "tool"` message without
+   * its matching call in the SAME client list is dropped by the backend
+   * filter and the result would be lost.
+   *
+   * No-op unless `serverOwnedHistory` is set: the adaptive runtime and
+   * editor chat backends still build the model conversation from the
+   * client's `messages` array.
+   */
+  _resetAgentMessages(agent, sentMessageIds) {
+    if (!this._serverOwnedHistory) return;
+    if (agent !== this._agent) return;
+    const messages = agent.messages ?? [];
+    const resultsByCallId = /* @__PURE__ */ new Map();
+    for (const msg of messages) {
+      if (msg.role === "tool" && typeof msg.toolCallId === "string") {
+        resultsByCallId.set(msg.toolCallId, msg);
+      }
+    }
+    const retained = [];
+    for (const msg of messages) {
+      if (msg.role !== "assistant" || !Array.isArray(msg.toolCalls)) continue;
+      const pendingCalls = msg.toolCalls.filter((tc) => {
+        if (!this._clientTools.has(tc.function?.name)) return false;
+        const result = resultsByCallId.get(tc.id);
+        return result === void 0 || !sentMessageIds.has(result.id);
+      });
+      if (pendingCalls.length === 0) continue;
+      retained.push({ ...msg, toolCalls: pendingCalls });
+      for (const tc of pendingCalls) {
+        const result = resultsByCallId.get(tc.id);
+        if (result !== void 0) retained.push(result);
+      }
+    }
+    if (typeof agent.setMessages === "function") {
+      agent.setMessages(retained);
+    } else {
+      agent.messages = retained;
+    }
+  }
   _buildSubscriber() {
     return {
       onTextMessageStartEvent: (params) => {
@@ -7578,6 +7643,12 @@ var AgUiTransport = class {
         if (outcome?.type === "interrupt" && Array.isArray(outcome.interrupts)) {
           for (const interrupt of outcome.interrupts) {
             const toolCallId = interrupt.toolCallId ?? interrupt.tool_call_id;
+            if (typeof interrupt.id === "string" && interrupt.id) {
+              this._localPendingInterrupts.set(interrupt.id, {
+                id: interrupt.id,
+                toolCallId: typeof toolCallId === "string" ? toolCallId : void 0
+              });
+            }
             if (typeof toolCallId === "string" && typeof interrupt.id === "string") {
               this._emit({
                 type: "tool-call-deferred",
@@ -8695,4 +8766,4 @@ fast-json-patch/module/duplex.mjs:
    * MIT license
    *)
 */
-//# sourceMappingURL=chunk-F2INJT5F.js.map
+//# sourceMappingURL=chunk-E2H6T7XI.js.map