@syntrologie/adapt-chatbot 2.8.0-canary.294 → 2.8.0-canary.296

package/dist/AdaptiveChatBar.js

@@ -1,8 +1,8 @@
 import {
   AdaptiveChatBar
 } from "./chunk-SCVTTLFJ.js";
-import "./chunk-IGRIDG7O.js";
-import "./chunk-NLQR3MGO.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-IGRIDG7O.js";
-import "./chunk-NLQR3MGO.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-FLSMUFFX.js";
-import "./chunk-NLQR3MGO.js";
+} from "./chunk-ES5JYJA7.js";
+import "./chunk-ZZUKH2D6.js";
 import "./chunk-VLJ3WOEX.js";
 import "./chunk-UVKRO5ER.js";
 export {

package/dist/{chunk-FLSMUFFX.js → chunk-ES5JYJA7.js}

@@ -7324,6 +7324,7 @@ var AgUiTransport = class {
     this._handlers = /* @__PURE__ */ new Set();
     this._pendingResume = false;
     this._currentAssistantMessageId = null;
+    this._toolCallMessageIds = /* @__PURE__ */ new Map();
     this._url = options.url;
     this._headers = options.headers ?? {};
     this._threadId = options.threadId;
@@ -7331,6 +7332,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;
@@ -7362,6 +7364,8 @@ var AgUiTransport = class {
     this._agent = null;
     this._connected = false;
     this._pendingResume = false;
+    this._currentAssistantMessageId = null;
+    this._toolCallMessageIds.clear();
   }
   send(action) {
     if (!this._agent) return;
@@ -7391,7 +7395,9 @@ var AgUiTransport = class {
   // ---------------------------------------------------------------------------
   _sendUserMessage(text) {
     const agent = this._agent;
-    const pendingInterrupts = agent.pendingInterrupts ?? [];
+    const pendingInterrupts = (agent.pendingInterrupts ?? []).map((i) => i).filter(
+      (i) => typeof i?.id === "string" && i.id.length > 0
+    );
     const cancelResume = pendingInterrupts.length > 0 ? pendingInterrupts.map((i) => {
       const toolCallId = i.toolCallId ?? i.tool_call_id;
       if (toolCallId) {
@@ -7461,22 +7467,80 @@ 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;
       const status = typeof e.status === "number" ? e.status : typeof e.statusCode === "number" ? e.statusCode : typeof e.response?.status === "number" ? e.response.status : null;
       const rawBody = e.body ?? e.response?.body ?? null;
       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) => {
@@ -7506,6 +7570,7 @@ var AgUiTransport = class {
       onToolCallStartEvent: (params) => {
         const { event } = params;
         const messageId = event.parentMessageId ?? this._currentAssistantMessageId ?? event.toolCallId;
+        this._toolCallMessageIds.set(event.toolCallId, messageId);
         this._emit({
           type: "tool-call",
           messageId,
@@ -7528,8 +7593,10 @@ var AgUiTransport = class {
       },
       onToolCallEndEvent: (params) => {
         const { event, toolCallName, toolCallArgs } = params;
+        const startMessageId = this._toolCallMessageIds.get(event.toolCallId);
+        this._toolCallMessageIds.delete(event.toolCallId);
         if (this._clientTools.has(toolCallName)) {
-          const messageId = this._currentAssistantMessageId ?? event.toolCallId;
+          const messageId = startMessageId ?? this._currentAssistantMessageId ?? event.toolCallId;
           this._emit({
             type: "tool-call",
             messageId,
@@ -7599,6 +7666,7 @@ var AgUiTransport = class {
   // Private — emit to subscribers
   // ---------------------------------------------------------------------------
   _emit(event) {
+    if (!this._connected) return;
     for (const handler of this._handlers) {
       handler(event);
     }
@@ -8684,4 +8752,4 @@ fast-json-patch/module/duplex.mjs:
    * MIT license
    *)
 */
-//# sourceMappingURL=chunk-FLSMUFFX.js.map
+//# sourceMappingURL=chunk-ES5JYJA7.js.map