doer-agent 0.4.3 → 0.4.5

package/dist/agent-fs-rpc.js

@@ -23,7 +23,7 @@ function normalizeFsRpcPath(workspaceRoot, rawPath) {
 function parseFsRpcAction(value) {
     if (value === "list" ||
         value === "stat" ||
-        value === "fetch_file" ||
+        value === "upload_file" ||
         value === "read_text" ||
         value === "read_file" ||
         value === "write_file" ||
@@ -184,27 +184,58 @@ async function executeFsRpc(args) {
             size: archiveStat.size,
         };
     }
-    if (action === "fetch_file") {
+    if (action === "upload_file") {
         const entry = await stat(abs);
         if (!entry.isFile()) {
             throw new Error("path is not a file");
         }
         const uploadUrl = typeof args.request.uploadUrl === "string" ? args.request.uploadUrl : "";
-        const agentId = typeof args.request.agentId === "string" ? args.request.agentId : "";
-        if (!uploadUrl || !agentId) {
-            throw new Error("missing upload parameters");
+        const uploadMode = args.request.uploadMode === "multipart" ? "multipart" : "raw";
+        const uploadMethod = args.request.uploadMethod === "POST" ? "POST" : "PUT";
+        const uploadContentType = typeof args.request.uploadContentType === "string" && args.request.uploadContentType.trim()
+            ? args.request.uploadContentType.trim()
+            : inferMimeType(abs);
+        const uploadFieldName = typeof args.request.uploadFieldName === "string" && args.request.uploadFieldName.trim()
+            ? args.request.uploadFieldName.trim()
+            : "file";
+        if (!uploadUrl) {
+            throw new Error("uploadUrl is required");
         }
         const resolvedUploadUrl = new URL(uploadUrl, `${args.serverBaseUrl}/`).toString();
         const data = await readFile(abs);
         const fileName = path.basename(abs) || "file";
-        const form = new FormData();
-        form.append("file", new File([data], fileName));
-        form.append("agentId", agentId);
-        const response = await fetch(resolvedUploadUrl, {
-            method: "POST",
-            headers: { Authorization: `Bearer ${args.agentToken}` },
-            body: form,
-        });
+        const serverOrigin = new URL(args.serverBaseUrl).origin;
+        const targetOrigin = new URL(resolvedUploadUrl).origin;
+        const headers = {};
+        if (targetOrigin === serverOrigin) {
+            headers.Authorization = `Bearer ${args.agentToken}`;
+        }
+        let response;
+        if (uploadMode === "multipart") {
+            const form = new FormData();
+            const formFields = args.request.formFields && typeof args.request.formFields === "object" && !Array.isArray(args.request.formFields)
+                ? args.request.formFields
+                : {};
+            for (const [key, value] of Object.entries(formFields)) {
+                if (typeof value === "string") {
+                    form.append(key, value);
+                }
+            }
+            form.append(uploadFieldName, new File([data], fileName, { type: uploadContentType }));
+            response = await fetch(resolvedUploadUrl, {
+                method: uploadMethod,
+                headers,
+                body: form,
+            });
+        }
+        else {
+            headers["Content-Type"] = uploadContentType;
+            response = await fetch(resolvedUploadUrl, {
+                method: uploadMethod,
+                headers,
+                body: data,
+            });
+        }
         const text = await response.text();
         let upload = {};
         try {
@@ -260,11 +291,14 @@ async function executeFsRpc(args) {
             throw new Error("downloadPath is required");
         }
         const downloadUrl = new URL(downloadPath, `${args.serverBaseUrl}/`).toString();
+        const serverOrigin = new URL(args.serverBaseUrl).origin;
+        const headers = {};
+        if (new URL(downloadUrl).origin === serverOrigin) {
+            headers.Authorization = `Bearer ${args.agentToken}`;
+        }
         const response = await fetch(downloadUrl, {
             method: "GET",
-            headers: {
-                Authorization: `Bearer ${args.agentToken}`,
-            },
+            headers,
         });
         if (!response.ok) {
             const text = await response.text().catch(() => "");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doer-agent",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "Reverse-polling agent runtime for doer",
   "type": "module",
   "main": "dist/agent.js",