dooers-agents-client 0.9.0 → 0.9.2

package/dist/main.cjs

@@ -246,6 +246,8 @@ function toWireContentPart(p) {
         ref_id: p.refId
       };
       if (p.duration != null) w.duration = p.duration;
+      if (p.filename?.trim()) w.filename = p.filename.trim();
+      if (p.mimeType?.trim()) w.mime_type = p.mimeType.trim();
       if (p.url) w.url = p.url;
       return w;
     }
@@ -254,6 +256,8 @@ function toWireContentPart(p) {
         type: "image",
         ref_id: p.refId
       };
+      if (p.filename?.trim()) w.filename = p.filename.trim();
+      if (p.mimeType?.trim()) w.mime_type = p.mimeType.trim();
       if (p.url) w.url = p.url;
       return w;
     }
@@ -262,6 +266,8 @@ function toWireContentPart(p) {
         type: "document",
         ref_id: p.refId
       };
+      if (p.filename?.trim()) w.filename = p.filename.trim();
+      if (p.mimeType?.trim()) w.mime_type = p.mimeType.trim();
       if (p.url) w.url = p.url;
       return w;
     }
@@ -272,6 +278,35 @@ function toWireContentPart(p) {
 var MAX_RECONNECT_ATTEMPTS = 5;
 var RECONNECT_DELAYS = [1e3, 2e3, 4e3, 8e3, 16e3];
 var SEND_MESSAGE_TIMEOUT = 3e4;
+function blobPartFilename(blob, override) {
+  const o = (override ?? "").trim();
+  if (o) return o;
+  const t = (blob.type || "").toLowerCase();
+  if (t.includes("webm")) return "recording.webm";
+  if (t.includes("ogg")) return "recording.ogg";
+  if (t.includes("mpeg") || t.includes("mp3")) return "recording.mp3";
+  if (t.includes("mp4") || t.includes("m4a") || t.includes("aac")) return "recording.m4a";
+  if (t.startsWith("audio/")) return `recording.${t.split("/")[1]?.split("+")[0] || "bin"}`;
+  return "recording.bin";
+}
+async function readHttpErrorMessage(response) {
+  const raw = await response.text().catch(() => "") || "";
+  const trimmed = raw.trim();
+  if (!trimmed) {
+    return `Upload failed: ${response.status} ${response.statusText}`.trim();
+  }
+  try {
+    const j = JSON.parse(trimmed);
+    const d = j.detail;
+    if (typeof d === "string") return d;
+    if (Array.isArray(d) && d.length > 0) {
+      const first = d[0];
+      if (first && typeof first.msg === "string") return first.msg;
+    }
+  } catch {
+  }
+  return trimmed.length > 300 ? `${trimmed.slice(0, 300)}\u2026` : trimmed;
+}
 var AgentServerClient = class {
   wsUrl;
   constructor(apiMessagesUrl) {
@@ -365,6 +400,12 @@ var AgentClient = class {
   url = "";
   httpBaseUrl = "";
   agentId = "";
+  /** Mirrors ``AgentProvider`` ``agentId`` so HTTP uploads work before WS ``connect`` completes. */
+  uploadAgentId = "";
+  /** Current chat thread id for ``POST /uploads`` (aligns GCS path with ``hydrate_thread_events``). */
+  uploadThreadId = "";
+  /** Optional run id for ``POST /uploads`` (metadata only). */
+  uploadRunId = "";
   uploadUrl;
   config = {
     organizationId: "",
@@ -379,7 +420,7 @@ var AgentClient = class {
   subscriptionRefs = /* @__PURE__ */ new Map();
   // Track optimistic events for reconciliation
   pendingOptimistic = /* @__PURE__ */ new Map();
-  // Pending message promises — resolved when event.append arrives with matching clientEventId
+  // Pending message promises — keyed by outbound frame id (same as client_event_id for sends).
   pendingMessages = /* @__PURE__ */ new Map();
   // Track last event ID per thread for gap recovery on reconnect
   lastEventIds = /* @__PURE__ */ new Map();
@@ -397,14 +438,40 @@ var AgentClient = class {
   setUploadUrl(url) {
     this.uploadUrl = url;
   }
-  async upload(file) {
+  /** Sync from ``AgentProvider`` ``agentId``; used for ``POST /uploads`` ``agent_id`` (non-WS). */
+  setUploadAgentId(agentId) {
+    this.uploadAgentId = (agentId ?? "").trim();
+  }
+  /** Sync active thread id for chat uploads (must match persisted thread for signed URL keys). */
+  setUploadThreadId(threadId) {
+    this.uploadThreadId = (threadId ?? "").trim();
+  }
+  setUploadRunId(runId) {
+    this.uploadRunId = (runId ?? "").trim();
+  }
+  async upload(file, options) {
     if (!this.uploadUrl) {
       throw new Error("uploadUrl not configured");
     }
+    const aid = (this.uploadAgentId || this.agentId || "").trim();
+    if (!aid) {
+      throw new Error("agentId is required for upload (set AgentProvider agentId)");
+    }
     const formData = new FormData();
-    formData.append("file", file);
-    if (this.agentId) {
-      formData.append("agent_id", this.agentId);
+    if (file instanceof File) {
+      const partName = options?.filename?.trim() || file.name.trim() || "upload";
+      formData.append("file", file, partName);
+    } else {
+      formData.append("file", file, blobPartFilename(file, options?.filename));
+    }
+    formData.append("agent_id", aid);
+    const tid = this.uploadThreadId.trim();
+    if (tid) {
+      formData.append("thread_id", tid);
+    }
+    const rid = this.uploadRunId.trim();
+    if (rid) {
+      formData.append("run_id", rid);
     }
     const headers = {};
     if (this.config.authToken) {
@@ -416,7 +483,8 @@ var AgentClient = class {
       headers
     });
     if (!response.ok) {
-      throw new Error(`Upload failed: ${response.status} ${response.statusText}`);
+      const detail = await readHttpErrorMessage(response);
+      throw new Error(detail);
     }
     const result = await response.json();
     return {
@@ -430,6 +498,7 @@ var AgentClient = class {
   connect(url, agentId, config) {
     this.url = apiMessagesUrlToWebSocketUrl(url);
     this.agentId = agentId;
+    this.uploadAgentId = agentId.trim();
     this.config = config ?? { organizationId: "", workspaceId: "", userId: "" };
     this.isIntentionallyClosed = false;
     try {
@@ -445,16 +514,29 @@ var AgentClient = class {
     this.callbacks.setConnectionStatus("connecting");
     this.createConnection();
   }
+  /** Clear the last in-chat send error banner (see ``connection.sendError``). */
+  clearSendError() {
+    this.callbacks.setSendError(null);
+  }
+  abortPendingMessages(reason) {
+    for (const [clientEventId, pending] of this.pendingMessages) {
+      clearTimeout(pending.timer);
+      const opt = this.pendingOptimistic.get(clientEventId);
+      if (opt?.threadId) {
+        this.callbacks.removeOptimistic(opt.threadId, clientEventId);
+      }
+      this.pendingOptimistic.delete(clientEventId);
+      pending.reject(new Error(reason));
+    }
+    this.pendingMessages.clear();
+  }
   disconnect() {
     this.isIntentionallyClosed = true;
     if (this.reconnectTimer) {
       clearTimeout(this.reconnectTimer);
       this.reconnectTimer = null;
     }
-    for (const [, pending] of this.pendingMessages) {
-      clearTimeout(pending.timer);
-    }
-    this.pendingMessages.clear();
+    this.abortPendingMessages("Disconnected");
     if (this.ws) {
       this.ws.onopen = null;
       this.ws.onmessage = null;
@@ -546,6 +628,7 @@ var AgentClient = class {
   }
   // --- Messaging ---
   sendMessage(params) {
+    this.callbacks.setSendError(null);
     const clientEventId = crypto.randomUUID();
     const content = params.content ? params.content.map(toWireContentPart) : [{ type: "text", text: params.text ?? "" }];
     const displayContent = params.content ? params.content.map((p) => {
@@ -553,11 +636,27 @@ var AgentClient = class {
         case "text":
           return { type: "text", text: p.text };
         case "audio":
-          return { type: "audio", duration: p.duration };
+          return {
+            type: "audio",
+            duration: p.duration,
+            ...p.url ? { url: p.url } : {},
+            ...p.mimeType ? { mimeType: p.mimeType } : {},
+            ...p.filename ? { filename: p.filename } : {}
+          };
         case "image":
-          return { type: "image" };
+          return {
+            type: "image",
+            ...p.url ? { url: p.url } : {},
+            ...p.mimeType ? { mimeType: p.mimeType } : {},
+            ...p.filename ? { filename: p.filename } : {}
+          };
         case "document":
-          return { type: "document" };
+          return {
+            type: "document",
+            ...p.url ? { url: p.url } : {},
+            ...p.mimeType ? { mimeType: p.mimeType } : {},
+            ...p.filename ? { filename: p.filename } : {}
+          };
         default:
           return { type: "text", text: "" };
       }
@@ -601,23 +700,32 @@ var AgentClient = class {
     if (params.metadata) {
       payload.metadata = params.metadata;
     }
-    this.send("event.create", payload);
+    this.sendRaw({
+      id: clientEventId,
+      type: "event.create",
+      payload
+    });
     return promise;
   }
   sendFormResponse(params) {
+    this.callbacks.setSendError(null);
     const clientEventId = crypto.randomUUID();
     const promise = this.createPendingPromise(clientEventId);
-    this.send("event.create", {
-      thread_id: params.threadId,
-      client_event_id: clientEventId,
-      event: {
-        type: "form.response",
-        actor: "user",
-        content: [],
-        data: {
-          form_event_id: params.formEventId,
-          cancelled: params.cancelled,
-          values: params.values
+    this.sendRaw({
+      id: clientEventId,
+      type: "event.create",
+      payload: {
+        thread_id: params.threadId,
+        client_event_id: clientEventId,
+        event: {
+          type: "form.response",
+          actor: "user",
+          content: [],
+          data: {
+            form_event_id: params.formEventId,
+            cancelled: params.cancelled,
+            values: params.values
+          }
         }
       }
     });
@@ -627,14 +735,20 @@ var AgentClient = class {
   createPendingPromise(clientEventId) {
     return new Promise((resolve, reject) => {
       const timer = setTimeout(() => {
+        const opt = this.pendingOptimistic.get(clientEventId);
+        if (opt?.threadId) {
+          this.callbacks.removeOptimistic(opt.threadId, clientEventId);
+        }
+        this.pendingOptimistic.delete(clientEventId);
         this.pendingMessages.delete(clientEventId);
         reject(new Error("Request timed out waiting for server response"));
       }, SEND_MESSAGE_TIMEOUT);
-      this.pendingMessages.set(clientEventId, { resolve, timer });
+      this.pendingMessages.set(clientEventId, { resolve, reject, timer });
     });
   }
   createConnection() {
     if (this.ws) {
+      this.abortPendingMessages("Connection lost; reconnecting");
       this.ws.onopen = null;
       this.ws.onmessage = null;
       this.ws.onclose = null;
@@ -702,9 +816,26 @@ var AgentClient = class {
             this.callbacks.setConnectionStatus("error", frame.payload.error?.message);
           }
         } else if (!frame.payload.ok && frame.payload.error) {
+          const ackId = frame.payload.ack_id;
+          const err = frame.payload.error;
+          if (ackId) {
+            const pending = this.pendingMessages.get(ackId);
+            if (pending) {
+              clearTimeout(pending.timer);
+              this.pendingMessages.delete(ackId);
+              const msg = err.message || "Request rejected";
+              const opt = this.pendingOptimistic.get(ackId);
+              if (opt?.threadId) {
+                this.callbacks.removeOptimistic(opt.threadId, ackId);
+              }
+              this.pendingOptimistic.delete(ackId);
+              pending.reject(new Error(msg));
+              this.callbacks.setSendError(msg);
+            }
+          }
           this.onError?.({
-            code: frame.payload.error.code,
-            message: frame.payload.error.message,
+            code: err.code,
+            message: err.message,
             frameType: "ack"
           });
         }
@@ -741,6 +872,7 @@ var AgentClient = class {
       case "event.append": {
         const events = this.resolveEventUrls(frame.payload.events.map(toThreadEvent));
         const resolvedClientEventIds = [];
+        const pendingIdsToResolve = [];
         for (const event of events) {
           if (event.clientEventId && this.pendingOptimistic.has(event.clientEventId)) {
             resolvedClientEventIds.push(event.clientEventId);
@@ -750,8 +882,7 @@ var AgentClient = class {
             const pendingMessage = this.pendingMessages.get(event.clientEventId);
             if (pendingMessage) {
               clearTimeout(pendingMessage.timer);
-              pendingMessage.resolve({ threadId: frame.payload.thread_id });
-              this.pendingMessages.delete(event.clientEventId);
+              pendingIdsToResolve.push(event.clientEventId);
             }
           }
         }
@@ -764,6 +895,14 @@ var AgentClient = class {
         } else {
           this.callbacks.onEventAppend(frame.payload.thread_id, events);
         }
+        const tid = frame.payload.thread_id;
+        for (const id of pendingIdsToResolve) {
+          const pending = this.pendingMessages.get(id);
+          if (pending) {
+            pending.resolve({ threadId: tid });
+            this.pendingMessages.delete(id);
+          }
+        }
         break;
       }
       case "event.list.result": {
@@ -816,6 +955,7 @@ var AgentClient = class {
   }
   scheduleReconnect() {
     if (this.reconnectAttempts >= MAX_RECONNECT_ATTEMPTS) {
+      this.abortPendingMessages("Connection lost after maximum retries");
       this.callbacks.setReconnectFailed();
       this.callbacks.setConnectionStatus("error", "Connection lost after maximum retries");
       return;
@@ -850,6 +990,43 @@ var AgentClient = class {
     });
   }
 };
+function mergeDisplayContentParts(prev, next) {
+  if (!next?.length) return prev;
+  if (!prev?.length) return next;
+  const out = [];
+  const len = Math.max(prev.length, next.length);
+  for (let i = 0; i < len; i++) {
+    const p = prev[i];
+    const n = next[i];
+    if (!n) {
+      if (p) out.push(p);
+      continue;
+    }
+    if (!p) {
+      out.push(n);
+      continue;
+    }
+    if (p.type !== n.type) {
+      out.push(n);
+      continue;
+    }
+    if (n.type === "image" || n.type === "audio" || n.type === "document") {
+      const url = n.url ?? ("url" in p ? p.url : void 0);
+      out.push({ ...p, ...n, ...url ? { url } : {} });
+      continue;
+    }
+    out.push(n);
+  }
+  return out;
+}
+function mergeThreadEventById(prev, next) {
+  const content = mergeDisplayContentParts(prev.content, next.content);
+  return {
+    ...prev,
+    ...next,
+    ...content !== void 0 ? { content } : {}
+  };
+}
 function extractFormStates(events, existing) {
   let result = existing;
   for (const e of events) {
@@ -872,6 +1049,7 @@ function createAgentStore() {
     connection: {
       status: "idle",
       error: null,
+      sendError: null,
       reconnectAttempts: 0,
       reconnectFailed: false
     },
@@ -900,7 +1078,15 @@ function createAgentStore() {
     loadingThreads: /* @__PURE__ */ new Set(),
     actions: {
       setConnectionStatus: (status, error) => set((s) => ({
-        connection: { ...s.connection, status, error: error ?? null }
+        connection: {
+          ...s.connection,
+          status,
+          error: error ?? null,
+          ...status === "connected" ? { sendError: null } : {}
+        }
+      })),
+      setSendError: (message) => set((s) => ({
+        connection: { ...s.connection, sendError: message }
       })),
       setReconnectFailed: () => set((s) => ({
         connection: { ...s.connection, reconnectFailed: true }
@@ -988,8 +1174,13 @@ function createAgentStore() {
           mergedEvents = snapshotEvents;
         } else {
           const existingIds = new Set(existing.map((e) => e.id));
+          const snapById = new Map(snapshotEvents.map((e) => [e.id, e]));
+          const mergedExisting = existing.map((e) => {
+            const snap = snapById.get(e.id);
+            return snap ? mergeThreadEventById(e, snap) : e;
+          });
           const newFromSnapshot = snapshotEvents.filter((e) => !existingIds.has(e.id));
-          mergedEvents = newFromSnapshot.length > 0 ? [...existing, ...newFromSnapshot] : existing;
+          mergedEvents = newFromSnapshot.length > 0 ? [...mergedExisting, ...newFromSnapshot] : mergedExisting;
         }
         const optimistic = { ...s.optimistic };
         const optimisticKeys = { ...s.optimisticKeys };
@@ -1013,7 +1204,8 @@ function createAgentStore() {
         const appends = [];
         for (const e of newEvents) {
           if (existingIds.has(e.id)) {
-            updates.set(e.id, e);
+            const prev = existing.find((x) => x.id === e.id);
+            updates.set(e.id, mergeThreadEventById(prev, e));
           } else {
             appends.push(e);
           }
@@ -1027,6 +1219,10 @@ function createAgentStore() {
       reconcileEvents: (threadId, newEvents, resolvedClientEventIds) => set((s) => {
         const existing = s.events[threadId] ?? [];
         const existingIds = new Set(existing.map((e) => e.id));
+        const mergedExisting = newEvents.length > 0 ? existing.map((e) => {
+          const up = newEvents.find((n) => n.id === e.id);
+          return up ? mergeThreadEventById(e, up) : e;
+        }) : existing;
         const unique = newEvents.filter((e) => !existingIds.has(e.id));
         let optEvents = s.optimistic[threadId] ?? [];
         let optKeys = s.optimisticKeys[threadId] ?? [];
@@ -1040,7 +1236,7 @@ function createAgentStore() {
           }
         }
         return {
-          events: { ...s.events, [threadId]: [...existing, ...unique] },
+          events: { ...s.events, [threadId]: [...mergedExisting, ...unique] },
           optimistic: { ...s.optimistic, [threadId]: optEvents },
           optimisticKeys: { ...s.optimisticKeys, [threadId]: optKeys }
         };
@@ -1090,7 +1286,10 @@ function createAgentStore() {
         const subscriptions = new Set(s.subscriptions);
         subscriptions.add(threadId);
         const loadingThreads = new Set(s.loadingThreads);
-        loadingThreads.add(threadId);
+        const alreadyHadEvents = (s.events[threadId]?.length ?? 0) > 0;
+        if (!alreadyHadEvents) {
+          loadingThreads.add(threadId);
+        }
         return { subscriptions, loadingThreads };
       }),
       removeSubscription: (threadId) => set((s) => {
@@ -1234,6 +1433,9 @@ function AgentProvider({
   react.useEffect(() => {
     clientRef.current?.setUploadUrl(uploadUrl);
   }, [uploadUrl]);
+  react.useEffect(() => {
+    clientRef.current?.setUploadAgentId(agentId);
+  }, [agentId]);
   const identityIdsKey = identityIds?.join(",") ?? "";
   react.useEffect(() => {
     if (!url || !agentId) return;
@@ -1403,9 +1605,13 @@ function useConnection() {
   const { client } = useAgentContext();
   const status = useStore((s) => s.connection.status);
   const error = useStore((s) => s.connection.error);
+  const sendError = useStore((s) => s.connection.sendError);
   const reconnectFailed = useStore((s) => s.connection.reconnectFailed);
   const reconnect = react.useCallback(() => client.retry(), [client]);
-  return { status, error, reconnectFailed, reconnect };
+  const dismissSendError = react.useCallback(() => {
+    client.clearSendError();
+  }, [client]);
+  return { status, error, sendError, dismissSendError, reconnectFailed, reconnect };
 }
 function useFeedback(targetId, targetType = "event") {
   const { client } = useAgentContext();
@@ -1534,11 +1740,15 @@ function useFormFileUpload() {
       setIsUploading(true);
       setError(null);
       try {
+        const aid = (params.agentId || "").trim();
+        if (!aid) {
+          throw new Error("agentId is required for upload");
+        }
         const formData = new FormData();
         formData.append("file", params.file);
         formData.append("field_id", params.fieldId);
         formData.append("source", "chat");
-        formData.append("agent_id", params.agentId);
+        formData.append("agent_id", aid);
         formData.append("run_id", params.runId);
         formData.append("thread_id", params.threadId);
         const response = await fetch(params.uploadUrl, {
@@ -1690,11 +1900,11 @@ function useUpload() {
   const [isUploading, setIsUploading] = react.useState(false);
   const activeCountRef = react.useRef(0);
   const upload = react.useCallback(
-    async (file) => {
+    async (file, options) => {
       activeCountRef.current++;
       setIsUploading(true);
       try {
-        return await client.upload(file);
+        return await client.upload(file, options);
       } finally {
         activeCountRef.current--;
         if (activeCountRef.current === 0) {
@@ -1714,6 +1924,7 @@ exports.isSettingsFieldGroup = isSettingsFieldGroup;
 exports.toFormElement = toFormElement;
 exports.toFormEventData = toFormEventData;
 exports.toFormResponseEventData = toFormResponseEventData;
+exports.useAgentContext = useAgentContext;
 exports.useAnalytics = useAnalytics;
 exports.useAudioRecorder = useAudioRecorder;
 exports.useConnection = useConnection;