@annals/agent-mesh 0.18.5 → 0.19.0

package/dist/index.js

@@ -572,6 +572,7 @@ var FileUploadReceiver = class {
         });
       });
       this.peer.onDataChannel((dc) => {
+        log.debug("[WebRTC] Upload receiver: DataChannel opened");
         dc.onMessage((msg) => {
           if (typeof msg === "string") {
             try {
@@ -591,6 +592,7 @@ var FileUploadReceiver = class {
     }
     try {
       if (signal.signal_type === "offer" || signal.signal_type === "answer") {
+        log.debug(`[WebRTC] Upload receiver: setting remote ${signal.signal_type} (${signal.payload.length} chars)`);
         this.peer.setRemoteDescription(signal.payload, signal.signal_type);
         for (const c of this.pendingCandidates) {
           this.peer.addRemoteCandidate(c.candidate, c.mid);
@@ -604,7 +606,8 @@ var FileUploadReceiver = class {
           this.pendingCandidates.push({ candidate, mid });
         }
       }
-    } catch {
+    } catch (err) {
+      log.warn(`[WebRTC] Upload receiver signal error (${signal.signal_type}): ${err}`);
     }
   }
   waitForCompletion(timeoutMs = 3e4) {
@@ -1505,10 +1508,7 @@ var BridgeManager = class {
   }
   async dispatchWithLocalQueue(opts) {
     const { msg, handle, requestKey } = opts;
-    const { session_id, request_id, content, attachments, client_id, with_files, file_upload_offer } = msg;
-    if (file_upload_offer) {
-      this.registerPendingUpload(file_upload_offer, session_id, request_id);
-    }
+    const { session_id, request_id, content, attachments, client_id, with_files } = msg;
     const state = this.requestDispatches.get(requestKey);
     if (!state) return;
     try {
@@ -1830,6 +1830,11 @@ var BridgeManager = class {
     log.info(`WebRTC transfer registered: transfer=${offer.transfer_id.slice(0, 8)}... (${(zipBuffer.length / 1024).toFixed(1)} KB in memory)`);
   }
   handleRtcSignalRelay(msg) {
+    if (msg.signal_type === "prepare-upload") {
+      const offer = JSON.parse(msg.payload);
+      this.registerPendingUpload(offer, "pre-upload", "pre-upload");
+      return;
+    }
     const downloadEntry = this.pendingTransfers.get(msg.transfer_id);
     if (downloadEntry) {
       downloadEntry.targetAgentId = msg.from_agent_id;
@@ -1845,13 +1850,14 @@ var BridgeManager = class {
     }
     const uploadEntry = this.pendingUploads.get(msg.transfer_id);
     if (uploadEntry) {
+      log.debug(`[WebRTC] Routing ${msg.signal_type} signal to upload receiver: transfer=${msg.transfer_id.slice(0, 8)}...`);
       void uploadEntry.receiver.handleSignal({
         signal_type: msg.signal_type,
         payload: msg.payload
       });
       return;
     }
-    log.debug(`No pending transfer for ${msg.transfer_id.slice(0, 8)}...`);
+    log.debug(`No pending transfer for ${msg.transfer_id.slice(0, 8)}... (active=${this.pendingTransfers.size}, dormant=${this.dormantTransfers.size}, upload=${this.pendingUploads.size})`);
   }
   // ========================================================
   // Upload (Caller → Agent) WebRTC signaling
@@ -4163,8 +4169,7 @@ async function asyncChat(opts) {
     },
     body: JSON.stringify({
       message: opts.message,
-      mode: "async",
-      ...opts.fileUploadOffer ? { file_upload_offer: opts.fileUploadOffer } : {}
+      mode: "async"
     }),
     signal: opts.signal
   });
@@ -4234,8 +4239,7 @@ async function streamChat(opts) {
       "Content-Type": "application/json"
     },
     body: JSON.stringify({
-      message: opts.message,
-      ...opts.fileUploadOffer ? { file_upload_offer: opts.fileUploadOffer } : {}
+      message: opts.message
     }),
     signal: opts.signal
   });
@@ -4372,8 +4376,6 @@ function registerChatCommand(program2) {
     log.banner(`Chat with ${agentName}`);
     console.log(`${GRAY}Type your message and press Enter. /upload <path> to send a file. /quit to exit.${RESET}
 `);
-    let pendingUploadOffer;
-    let pendingUploadZipBuffer;
     const rl = createInterface4({
       input: process.stdin,
       output: process.stdout,
@@ -4410,20 +4412,33 @@ function registerChatCommand(program2) {
         }
         try {
           const prepared = prepareUploadFile(filePath);
-          pendingUploadOffer = prepared.offer;
-          pendingUploadZipBuffer = prepared.zipBuffer;
-          log.info(`File staged: ${basename2(filePath)} (${(prepared.offer.zip_size / 1024).toFixed(1)} KB). Type a message to send with the file.`);
+          const prepRes = await fetch(`${opts.baseUrl}/api/agents/${agentId}/rtc-signal`, {
+            method: "POST",
+            headers: {
+              Authorization: `Bearer ${token}`,
+              "Content-Type": "application/json"
+            },
+            body: JSON.stringify({
+              transfer_id: prepared.offer.transfer_id,
+              signal_type: "prepare-upload",
+              payload: JSON.stringify(prepared.offer)
+            })
+          });
+          if (!prepRes.ok) {
+            log.error(`Failed to signal upload: HTTP ${prepRes.status}`);
+            rl.prompt();
+            return;
+          }
+          await sleep5(500);
+          await chatWebrtcUpload(agentId, prepared.offer, prepared.zipBuffer, token, opts.baseUrl);
+          log.info(`File uploaded. Type a message to continue.`);
         } catch (err) {
-          log.error(`Failed to prepare file: ${err.message}`);
+          log.error(`Upload failed: ${err.message}`);
         }
         rl.prompt();
         return;
       }
       console.log("");
-      const uploadOffer = pendingUploadOffer;
-      const uploadZipBuffer = pendingUploadZipBuffer;
-      pendingUploadOffer = void 0;
-      pendingUploadZipBuffer = void 0;
       try {
         await streamChat({
           agentId,
@@ -4431,12 +4446,8 @@ function registerChatCommand(program2) {
           token,
           baseUrl: opts.baseUrl,
           showThinking: opts.thinking,
-          mode,
-          fileUploadOffer: uploadOffer
+          mode
         });
-        if (uploadOffer && uploadZipBuffer) {
-          await chatWebrtcUpload(agentId, uploadOffer, uploadZipBuffer, token, opts.baseUrl);
-        }
       } catch (err) {
         if (abortController.signal.aborted) return;
         log.error(err.message);
@@ -5429,6 +5440,23 @@ function prepareFileForUpload(filePath) {
     zipBuffer: Buffer.from(zipBuffer)
   };
 }
+async function sendPrepareUpload(agentId, offer, token) {
+  const res = await fetch(`${DEFAULT_BASE_URL4}/api/agents/${agentId}/rtc-signal`, {
+    method: "POST",
+    headers: {
+      Authorization: `Bearer ${token}`,
+      "Content-Type": "application/json"
+    },
+    body: JSON.stringify({
+      transfer_id: offer.transfer_id,
+      signal_type: "prepare-upload",
+      payload: JSON.stringify(offer)
+    })
+  });
+  if (!res.ok) {
+    throw new Error(`prepare-upload signal failed: HTTP ${res.status}`);
+  }
+}
 async function webrtcUpload(agentId, offer, zipBuffer, token, json) {
   if (!json) {
     log.info(`[WebRTC] Uploading file (${(offer.zip_size / 1024).toFixed(1)} KB)...`);
@@ -5523,8 +5551,7 @@ async function asyncCall(opts) {
     body: JSON.stringify({
       task_description: opts.taskDescription,
       mode: "async",
-      ...opts.withFiles ? { with_files: true } : {},
-      ...opts.uploadOffer ? { file_upload_offer: opts.uploadOffer } : {}
+      ...opts.withFiles ? { with_files: true } : {}
     }),
     signal: opts.signal
   });
@@ -5643,8 +5670,7 @@ async function streamCall(opts) {
     },
     body: JSON.stringify({
       task_description: opts.taskDescription,
-      ...opts.withFiles ? { with_files: true } : {},
-      ...opts.uploadOffer ? { file_upload_offer: opts.uploadOffer } : {}
+      ...opts.withFiles ? { with_files: true } : {}
     }),
     signal: opts.signal
   });
@@ -5827,6 +5853,11 @@ ${content}`;
       const timeoutMs = parseInt(opts.timeout || "300", 10) * 1e3;
       const abortController = new AbortController();
       const timer = setTimeout(() => abortController.abort(), timeoutMs);
+      if (uploadOffer && uploadZipBuffer) {
+        await sendPrepareUpload(id, uploadOffer, token);
+        await sleep6(500);
+        await webrtcUpload(id, uploadOffer, uploadZipBuffer, token, opts.json);
+      }
       const callOpts = {
         id,
         name,
@@ -5836,20 +5867,13 @@ ${content}`;
         json: opts.json,
         outputFile: opts.outputFile,
         signal: abortController.signal,
-        withFiles: opts.withFiles,
-        uploadOffer
+        withFiles: opts.withFiles
       };
       let result;
       if (opts.stream) {
-        if (uploadOffer && uploadZipBuffer) {
-          void webrtcUpload(id, uploadOffer, uploadZipBuffer, token, opts.json);
-        }
         result = await streamCall(callOpts);
       } else {
         result = await asyncCall(callOpts);
-        if (uploadOffer && uploadZipBuffer) {
-          await webrtcUpload(id, uploadOffer, uploadZipBuffer, token, opts.json);
-        }
       }
       clearTimeout(timer);
       if (opts.rate && result.callId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@annals/agent-mesh",
-  "version": "0.18.5",
+  "version": "0.19.0",
   "description": "CLI bridge connecting local AI agents to the Agents.Hot platform",
   "type": "module",
   "bin": {