@swmansion/argent 0.26.1-next.12 → 0.26.1-next.14

package/dist/cli-cmds.mjs

@@ -1675,7 +1675,9 @@ function spawnToolsServer(paths, port, options = {}) {
     } catch {
       logFd = fs.openSync("/dev/null", "w");
     }
-    const child = spawn("node", [paths.bundlePath, "start"], {
+    const { bun, deno, electron } = process.versions;
+    const nodeBin = !(bun || deno || electron) && fs.existsSync(process.execPath) ? process.execPath : "node";
+    const child = spawn(nodeBin, [paths.bundlePath, "start"], {
       detached: true,
       stdio: ["ignore", "pipe", logFd],
       env: buildToolsServerEnv(paths, port, process.env, options)
@@ -1683,7 +1685,14 @@ function spawnToolsServer(paths, port, options = {}) {
     child.unref();
     const pid = child.pid;
     if (!pid) {
-      reject(new Error("Failed to get PID of spawned tools server"));
+      child.once(
+        "error",
+        (err) => reject(
+          new Error(
+            err.code === "ENOENT" && nodeBin === "node" ? "Could not start the argent tool-server: `node` was not found on PATH. Install Node.js 20+ or add it to PATH." : `Could not start the argent tool-server: ${err.message}`
+          )
+        )
+      );
       return;
     }
     let settled = false;
@@ -17134,7 +17143,7 @@ function sha256File(filePath) {
     createReadStream(filePath).on("data", (chunk) => hash2.update(chunk)).on("end", () => resolve11(hash2.digest("hex"))).on("error", reject);
   });
 }
-async function uploadTar(tarPath, endpoint) {
+async function uploadTar(tarPath, endpoint, signal) {
   const init2 = {
     method: "POST",
     headers: {
@@ -17142,7 +17151,8 @@ async function uploadTar(tarPath, endpoint) {
       ...endpoint.token ? { Authorization: `Bearer ${endpoint.token}` } : {}
     },
     body: createReadStream(tarPath),
-    duplex: "half"
+    duplex: "half",
+    signal
   };
   const res = await fetch(`${endpoint.url}/upload`, init2);
   if (!res.ok) {
@@ -17194,7 +17204,7 @@ async function prepareFileInputs(specs, args, opts) {
           );
           tarPath = await tarball(filePath);
           wire.contentHash = await sha256File(tarPath);
-          wire.uploadId = await uploadTar(tarPath, opts.uploadEndpoint);
+          wire.uploadId = await uploadTar(tarPath, opts.uploadEndpoint, opts.signal);
         } finally {
           if (tarPath) await rm2(tarPath, { force: true }).catch(() => {
           });
@@ -17263,7 +17273,7 @@ var ToolInvocationError = class extends Error {
 function authHeaders2(token) {
   return token ? { Authorization: `Bearer ${token}` } : {};
 }
-async function consumeToolStream(body, onProgress) {
+async function consumeToolStream(body, onProgress, signal) {
   let final;
   const handleLine = (line) => {
     if (!line.trim()) return;
@@ -17287,6 +17297,7 @@ async function consumeToolStream(body, onProgress) {
       buffered += decoder.decode(value, { stream: true });
       let newline;
       while ((newline = buffered.indexOf("\n")) !== -1) {
+        signal?.throwIfAborted();
         const line = buffered.slice(0, newline);
         buffered = buffered.slice(newline + 1);
         handleLine(line);
@@ -17299,6 +17310,7 @@ async function consumeToolStream(body, onProgress) {
     });
     throw err;
   }
+  signal?.throwIfAborted();
   if (!final) {
     throw new Error("tool stream ended without a result \u2014 connection lost mid-run?");
   }
@@ -17325,27 +17337,33 @@ function createToolsClient(options = {}) {
     cached3 = await ensureToolsServer(options.paths);
     return cached3;
   }
-  async function fetchTools() {
+  async function fetchTools(opts) {
+    opts?.signal?.throwIfAborted();
     const { url: url2, token } = await baseUrl();
-    const res = await fetch(`${url2}/tools`, { headers: authHeaders2(token) });
+    const res = await fetch(`${url2}/tools`, {
+      headers: authHeaders2(token),
+      signal: opts?.signal
+    });
     if (!res.ok) throw new Error(`GET /tools failed: ${res.status} ${res.statusText}`);
     const json2 = await res.json();
     return json2.tools;
   }
-  async function fetchTool(name) {
-    const tools2 = await fetchTools();
+  async function fetchTool(name, opts) {
+    const tools2 = await fetchTools(opts);
     return tools2.find((t2) => t2.name === name) ?? null;
   }
   async function callTool(name, args, opts) {
+    opts?.signal?.throwIfAborted();
     const { url: url2, token } = await baseUrl();
     let finalArgs = args;
-    const meta3 = await fetchTool(name);
+    const meta3 = await fetchTool(name, { signal: opts?.signal });
     if (meta3?.fileInputs?.length) {
       const { url: routedUrl } = await getResolvedToolsUrl();
       const isRemote = routedUrl !== null;
       finalArgs = await prepareFileInputs(meta3.fileInputs, args ?? {}, {
         includeContent: isRemote,
-        uploadEndpoint: isRemote ? { url: url2, token } : void 0
+        uploadEndpoint: isRemote ? { url: url2, token } : void 0,
+        signal: opts?.signal
       });
     }
     const res = await fetch(`${url2}/tools/${encodeURIComponent(name)}`, {
@@ -17355,13 +17373,17 @@ function createToolsClient(options = {}) {
         ...opts?.onProgress ? { Accept: "application/x-ndjson" } : {},
         ...authHeaders2(token)
       },
-      body: JSON.stringify(finalArgs ?? {})
+      body: JSON.stringify(finalArgs ?? {}),
+      signal: opts?.signal
     });
     const contentType = res.headers.get("content-type") ?? "";
     if (opts?.onProgress && res.ok && res.body && contentType.includes("application/x-ndjson")) {
-      return consumeToolStream(res.body, opts.onProgress);
+      return consumeToolStream(res.body, opts.onProgress, opts.signal);
     }
-    const json2 = await res.json().catch(() => ({}));
+    const json2 = await res.json().catch(() => {
+      opts?.signal?.throwIfAborted();
+      return {};
+    });
     if (!res.ok) {
       throw new ToolInvocationError(errorBodyMessage(json2) ?? `${res.status} ${res.statusText}`, {
         errorCode: json2.error_code,
@@ -17369,6 +17391,7 @@ function createToolsClient(options = {}) {
         issues: Array.isArray(json2.issues) ? json2.issues : void 0
       });
     }
+    opts?.signal?.throwIfAborted();
     const { result: data } = await applyClientFileDirectives(json2.data);
     return { data, note: json2.note };
   }
@@ -18279,7 +18302,8 @@ async function materializeArtifacts(result, ctx) {
             return null;
           }
           const res = await fetchFn(`${ctx.toolsUrl}/artifacts/${value.id}`, {
-            headers: authHeaders3
+            headers: authHeaders3,
+            signal: ctx.signal
           });
           if (!res.ok) return null;
           const data = await readCapped(res, value.size);
@@ -18306,7 +18330,8 @@ async function materializeArtifacts(result, ctx) {
       }
       try {
         const res = await fetchFn(`${ctx.toolsUrl}/artifacts/${value.id}`, {
-          headers: authHeaders3
+          headers: authHeaders3,
+          signal: ctx.signal
         });
         if (!res.ok) return null;
         const data = Buffer.from(await res.arrayBuffer());
@@ -21881,7 +21906,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID2 = randomUUID5();
 function readCliVersion() {
   if (true) {
-    return "0.26.1-next.12";
+    return "0.26.1-next.14";
   }
   return "0.0.0";
 }

package/dist/client.d.ts

@@ -13,6 +13,8 @@ export interface ArgentToolResult<T = unknown> {
 export interface CallToolOptions {
     /** Receive progress events while a long-running tool works. */
     onProgress?: (event: unknown) => void;
+    /** Stop waiting for the call. It rejects with the signal's reason, not ArgentToolError. */
+    signal?: AbortSignal;
 }
 /** The tool-server rejected or failed a call. */
 export declare class ArgentToolError extends Error {
@@ -37,7 +39,9 @@ export interface ArgentFlag {
 /** Feature flags and their effective state: project overrides global, then the default. */
 export declare function listFlags(): ArgentFlag[];
 export interface ArgentClient {
-    listTools(): Promise<ArgentTool[]>;
+    listTools(options?: {
+        signal?: AbortSignal;
+    }): Promise<ArgentTool[]>;
     callTool<T = unknown>(name: string, args?: Record<string, unknown>, options?: CallToolOptions): Promise<ArgentToolResult<T>>;
     /**
      * Stop this install's local tool-server, like `argent server stop`. The next

package/dist/client.js

@@ -887,7 +887,9 @@ function spawnToolsServer(paths, port, options = {}) {
     } catch {
       logFd = fs4.openSync("/dev/null", "w");
     }
-    const child = spawn("node", [paths.bundlePath, "start"], {
+    const { bun, deno, electron } = process.versions;
+    const nodeBin = !(bun || deno || electron) && fs4.existsSync(process.execPath) ? process.execPath : "node";
+    const child = spawn(nodeBin, [paths.bundlePath, "start"], {
       detached: true,
       stdio: ["ignore", "pipe", logFd],
       env: buildToolsServerEnv(paths, port, process.env, options)
@@ -895,7 +897,14 @@ function spawnToolsServer(paths, port, options = {}) {
     child.unref();
     const pid = child.pid;
     if (!pid) {
-      reject(new Error("Failed to get PID of spawned tools server"));
+      child.once(
+        "error",
+        (err) => reject(
+          new Error(
+            err.code === "ENOENT" && nodeBin === "node" ? "Could not start the argent tool-server: `node` was not found on PATH. Install Node.js 20+ or add it to PATH." : `Could not start the argent tool-server: ${err.message}`
+          )
+        )
+      );
       return;
     }
     let settled = false;
@@ -1718,7 +1727,7 @@ function sha256File(filePath) {
     createReadStream(filePath).on("data", (chunk) => hash.update(chunk)).on("end", () => resolve7(hash.digest("hex"))).on("error", reject);
   });
 }
-async function uploadTar(tarPath, endpoint) {
+async function uploadTar(tarPath, endpoint, signal) {
   const init = {
     method: "POST",
     headers: {
@@ -1726,7 +1735,8 @@ async function uploadTar(tarPath, endpoint) {
       ...endpoint.token ? { Authorization: `Bearer ${endpoint.token}` } : {}
     },
     body: createReadStream(tarPath),
-    duplex: "half"
+    duplex: "half",
+    signal
   };
   const res = await fetch(`${endpoint.url}/upload`, init);
   if (!res.ok) {
@@ -1778,7 +1788,7 @@ async function prepareFileInputs(specs, args, opts) {
           );
           tarPath = await tarball(filePath);
           wire.contentHash = await sha256File(tarPath);
-          wire.uploadId = await uploadTar(tarPath, opts.uploadEndpoint);
+          wire.uploadId = await uploadTar(tarPath, opts.uploadEndpoint, opts.signal);
         } finally {
           if (tarPath) await rm2(tarPath, { force: true }).catch(() => {
           });
@@ -1847,7 +1857,7 @@ var ToolInvocationError = class extends Error {
 function authHeaders2(token) {
   return token ? { Authorization: `Bearer ${token}` } : {};
 }
-async function consumeToolStream(body, onProgress) {
+async function consumeToolStream(body, onProgress, signal) {
   let final;
   const handleLine = (line) => {
     if (!line.trim()) return;
@@ -1871,6 +1881,7 @@ async function consumeToolStream(body, onProgress) {
       buffered += decoder.decode(value, { stream: true });
       let newline;
       while ((newline = buffered.indexOf("\n")) !== -1) {
+        signal?.throwIfAborted();
         const line = buffered.slice(0, newline);
         buffered = buffered.slice(newline + 1);
         handleLine(line);
@@ -1883,6 +1894,7 @@ async function consumeToolStream(body, onProgress) {
     });
     throw err;
   }
+  signal?.throwIfAborted();
   if (!final) {
     throw new Error("tool stream ended without a result \u2014 connection lost mid-run?");
   }
@@ -1909,27 +1921,33 @@ function createToolsClient(options = {}) {
     cached = await ensureToolsServer(options.paths);
     return cached;
   }
-  async function fetchTools() {
+  async function fetchTools(opts) {
+    opts?.signal?.throwIfAborted();
     const { url, token } = await baseUrl();
-    const res = await fetch(`${url}/tools`, { headers: authHeaders2(token) });
+    const res = await fetch(`${url}/tools`, {
+      headers: authHeaders2(token),
+      signal: opts?.signal
+    });
     if (!res.ok) throw new Error(`GET /tools failed: ${res.status} ${res.statusText}`);
     const json = await res.json();
     return json.tools;
   }
-  async function fetchTool(name) {
-    const tools = await fetchTools();
+  async function fetchTool(name, opts) {
+    const tools = await fetchTools(opts);
     return tools.find((t) => t.name === name) ?? null;
   }
   async function callTool(name, args, opts) {
+    opts?.signal?.throwIfAborted();
     const { url, token } = await baseUrl();
     let finalArgs = args;
-    const meta = await fetchTool(name);
+    const meta = await fetchTool(name, { signal: opts?.signal });
     if (meta?.fileInputs?.length) {
       const { url: routedUrl } = await getResolvedToolsUrl();
       const isRemote = routedUrl !== null;
       finalArgs = await prepareFileInputs(meta.fileInputs, args ?? {}, {
         includeContent: isRemote,
-        uploadEndpoint: isRemote ? { url, token } : void 0
+        uploadEndpoint: isRemote ? { url, token } : void 0,
+        signal: opts?.signal
       });
     }
     const res = await fetch(`${url}/tools/${encodeURIComponent(name)}`, {
@@ -1939,13 +1957,17 @@ function createToolsClient(options = {}) {
         ...opts?.onProgress ? { Accept: "application/x-ndjson" } : {},
         ...authHeaders2(token)
       },
-      body: JSON.stringify(finalArgs ?? {})
+      body: JSON.stringify(finalArgs ?? {}),
+      signal: opts?.signal
     });
     const contentType = res.headers.get("content-type") ?? "";
     if (opts?.onProgress && res.ok && res.body && contentType.includes("application/x-ndjson")) {
-      return consumeToolStream(res.body, opts.onProgress);
+      return consumeToolStream(res.body, opts.onProgress, opts.signal);
     }
-    const json = await res.json().catch(() => ({}));
+    const json = await res.json().catch(() => {
+      opts?.signal?.throwIfAborted();
+      return {};
+    });
     if (!res.ok) {
       throw new ToolInvocationError(errorBodyMessage(json) ?? `${res.status} ${res.statusText}`, {
         errorCode: json.error_code,
@@ -1953,6 +1975,7 @@ function createToolsClient(options = {}) {
         issues: Array.isArray(json.issues) ? json.issues : void 0
       });
     }
+    opts?.signal?.throwIfAborted();
     const { result: data } = await applyClientFileDirectives(json.data);
     return { data, note: json.note };
   }
@@ -2159,7 +2182,8 @@ async function materializeArtifacts(result, ctx) {
             return null;
           }
           const res = await fetchFn(`${ctx.toolsUrl}/artifacts/${value.id}`, {
-            headers: authHeaders3
+            headers: authHeaders3,
+            signal: ctx.signal
           });
           if (!res.ok) return null;
           const data = await readCapped(res, value.size);
@@ -2186,7 +2210,8 @@ async function materializeArtifacts(result, ctx) {
       }
       try {
         const res = await fetchFn(`${ctx.toolsUrl}/artifacts/${value.id}`, {
-          headers: authHeaders3
+          headers: authHeaders3,
+          signal: ctx.signal
         });
         if (!res.ok) return null;
         const data = Buffer.from(await res.arrayBuffer());
@@ -2345,19 +2370,22 @@ function createArgentClient() {
     client = createToolsClient({ paths: BUNDLED_RUNTIME_PATHS });
     return stopped;
   }
-  async function listTools() {
-    const tools = await client.fetchTools();
+  async function listTools(options) {
+    const tools = await client.fetchTools({ signal: options?.signal });
     return tools.map(({ name, description, inputSchema }) => ({ name, description, inputSchema }));
   }
   async function callTool(name, args = {}, options) {
     try {
       const response = await client.callTool(name, args, options);
       const { url, token } = await client.baseUrl();
+      options?.signal?.throwIfAborted();
       const { result } = await materializeArtifacts(response.data, {
         toolsUrl: url,
         authToken: token,
-        deviceId: getDeviceIdFromArgs(args)
+        deviceId: getDeviceIdFromArgs(args),
+        signal: options?.signal
       });
+      options?.signal?.throwIfAborted();
       return { data: result, note: response.note };
     } catch (err) {
       if (err instanceof ToolInvocationError) {

package/dist/installer.mjs

@@ -16730,7 +16730,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = randomUUID4();
 function readCliVersion() {
   if (true) {
-    return "0.26.1-next.12";
+    return "0.26.1-next.14";
   }
   return "0.0.0";
 }

package/dist/mcp-server.mjs

@@ -15932,7 +15932,9 @@ function spawnToolsServer(paths, port, options = {}) {
     } catch {
       logFd = fs.openSync("/dev/null", "w");
     }
-    const child = spawn("node", [paths.bundlePath, "start"], {
+    const { bun, deno, electron } = process.versions;
+    const nodeBin = !(bun || deno || electron) && fs.existsSync(process.execPath) ? process.execPath : "node";
+    const child = spawn(nodeBin, [paths.bundlePath, "start"], {
       detached: true,
       stdio: ["ignore", "pipe", logFd],
       env: buildToolsServerEnv(paths, port, process.env, options)
@@ -15940,7 +15942,14 @@ function spawnToolsServer(paths, port, options = {}) {
     child.unref();
     const pid = child.pid;
     if (!pid) {
-      reject(new Error("Failed to get PID of spawned tools server"));
+      child.once(
+        "error",
+        (err) => reject(
+          new Error(
+            err.code === "ENOENT" && nodeBin === "node" ? "Could not start the argent tool-server: `node` was not found on PATH. Install Node.js 20+ or add it to PATH." : `Could not start the argent tool-server: ${err.message}`
+          )
+        )
+      );
       return;
     }
     let settled = false;
@@ -16796,7 +16805,7 @@ function sha256File(filePath) {
     createReadStream(filePath).on("data", (chunk) => hash.update(chunk)).on("end", () => resolve8(hash.digest("hex"))).on("error", reject);
   });
 }
-async function uploadTar(tarPath, endpoint) {
+async function uploadTar(tarPath, endpoint, signal) {
   const init = {
     method: "POST",
     headers: {
@@ -16804,7 +16813,8 @@ async function uploadTar(tarPath, endpoint) {
       ...endpoint.token ? { Authorization: `Bearer ${endpoint.token}` } : {}
     },
     body: createReadStream(tarPath),
-    duplex: "half"
+    duplex: "half",
+    signal
   };
   const res = await fetch(`${endpoint.url}/upload`, init);
   if (!res.ok) {
@@ -16856,7 +16866,7 @@ async function prepareFileInputs(specs, args, opts) {
           );
           tarPath = await tarball(filePath);
           wire.contentHash = await sha256File(tarPath);
-          wire.uploadId = await uploadTar(tarPath, opts.uploadEndpoint);
+          wire.uploadId = await uploadTar(tarPath, opts.uploadEndpoint, opts.signal);
         } finally {
           if (tarPath) await rm2(tarPath, { force: true }).catch(() => {
           });
@@ -17524,7 +17534,8 @@ async function materializeArtifacts(result, ctx) {
             return null;
           }
           const res = await fetchFn(`${ctx.toolsUrl}/artifacts/${value.id}`, {
-            headers: authHeaders2
+            headers: authHeaders2,
+            signal: ctx.signal
           });
           if (!res.ok) return null;
           const data = await readCapped(res, value.size);
@@ -17551,7 +17562,8 @@ async function materializeArtifacts(result, ctx) {
       }
       try {
         const res = await fetchFn(`${ctx.toolsUrl}/artifacts/${value.id}`, {
-          headers: authHeaders2
+          headers: authHeaders2,
+          signal: ctx.signal
         });
         if (!res.ok) return null;
         const data = Buffer.from(await res.arrayBuffer());

package/dist/tool-server.cjs

@@ -94814,7 +94814,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = (0, import_node_crypto3.randomUUID)();
 function readCliVersion() {
   if (true) {
-    return "0.26.1-next.12";
+    return "0.26.1-next.14";
   }
   return "0.0.0";
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@swmansion/argent",
-  "version": "0.26.1-next.12",
+  "version": "0.26.1-next.14",
   "mcpName": "io.github.software-mansion/argent",
   "description": "MCP server for iOS Simulator and Android Emulator control",
   "license": "Apache-2.0",