@swmansion/argent 0.21.1-next.12 → 0.21.1-next.13

package/dist/cli-cmds.mjs

@@ -7214,7 +7214,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID2 = randomUUID5();
 function readCliVersion() {
   if (true) {
-    return "0.21.1-next.12";
+    return "0.21.1-next.13";
   }
   return "0.0.0";
 }
@@ -8400,8 +8400,9 @@ function stepIndent(depth) {
   if (typeof depth !== "number" || !Number.isInteger(depth) || depth <= 0) return "";
   return "  ".repeat(Math.min(depth, MAX_RENDER_DEPTH));
 }
-function printHelp() {
-  console.log(`Usage: argent flow <subcommand> [options]
+function printHelp(toStderr = false) {
+  const print = toStderr ? console.error : console.log;
+  print(`Usage: argent flow <subcommand> [options]
 
 Run a YAML flow without an LLM in the loop. \`run\` takes any of these forms:
 
@@ -8451,6 +8452,7 @@ Options (run):
                          overwritten
   -r, --recursive        With a directory path, also run flows in subdirectories
   --json                 Print the raw JSON report
+  --json-stream          Print progress and the final report as NDJSON (single flow only)
   --help, -h             Show this help
   --                     End of options \u2014 only needed for a flow whose name
                          starts with "-" (\`argent flow run -- -nightly\`)
@@ -8466,7 +8468,8 @@ function parseRunArgs(argv) {
   const out = {
     updateBaselines: false,
     recursive: false,
-    json: false
+    json: false,
+    jsonStream: false
   };
   const takePositional = (tok) => {
     if (out.flowRef !== void 0) {
@@ -8516,6 +8519,9 @@ function parseRunArgs(argv) {
     } else if (flag === "--json") {
       noValue("--json");
       out.json = true;
+    } else if (flag === "--json-stream") {
+      noValue("--json-stream");
+      out.jsonStream = true;
     } else if (flag === "--recursive" || flag === "-r") {
       noValue("--recursive");
       out.recursive = true;
@@ -8524,6 +8530,9 @@ function parseRunArgs(argv) {
     else if (flag === "--output") out.output = takeValue("--output");
     else throw new FlagParseException(`unknown flag ${tok}`);
   }
+  if (out.json && out.jsonStream) {
+    throw new FlagParseException("--json and --json-stream cannot be combined");
+  }
   return out;
 }
 function renderEchoLine(s) {
@@ -8822,13 +8831,10 @@ async function collectFlowFiles(dir, recursive) {
 }
 async function requireLocalToolServer() {
   const routing = await getResolvedToolsUrl();
-  if (routing.source === "none") return true;
+  if (routing.source === "none") return void 0;
   const recovery = routing.source === "env" ? routing.shadowedLink ? `Unset ARGENT_TOOLS_URL and run \`argent unlink\`, then try again \u2014 a link to ${routing.shadowedLink.url} is also configured and takes over once the env var is unset.` : "Unset ARGENT_TOOLS_URL and try again." : "Run `argent unlink` and try again.";
-  console.error(
-    `argent flow run requires the auto-started local tool server; ${routing.source} routing is configured.
-${recovery}`
-  );
-  return false;
+  return `argent flow run requires the auto-started local tool server; ${routing.source} routing is configured.
+${recovery}`;
 }
 function buildRunPayload(flowPath, projectRoot, args) {
   const payload = {
@@ -8842,6 +8848,18 @@ function buildRunPayload(flowPath, projectRoot, args) {
   if (args.updateBaselines) payload.updateBaselines = true;
   return payload;
 }
+function writeJsonStreamRecord(record) {
+  console.log(JSON.stringify(record));
+}
+function writeJsonStreamError(err) {
+  const message = err instanceof Error ? err.message : String(err);
+  writeJsonStreamRecord({
+    event: "error",
+    error: message,
+    ...err instanceof ToolInvocationError && err.errorCode ? { error_code: err.errorCode } : {},
+    ...err instanceof ToolInvocationError && err.errorKind ? { error_kind: err.errorKind } : {}
+  });
+}
 async function exportAndResolveArtifacts(report, outputDir, flowPath, baseUrl) {
   if (outputDir) {
     const { url, token } = await baseUrl();
@@ -8862,7 +8880,11 @@ async function runFlowDirectory(dir, args, projectRoot, options) {
     if (!args.recursive) console.error("Pass -r/--recursive to include subdirectories.");
     return exitAfterFlush(2);
   }
-  if (!await requireLocalToolServer()) return exitAfterFlush(2);
+  const refusal = await requireLocalToolServer();
+  if (refusal) {
+    console.error(refusal);
+    return exitAfterFlush(2);
+  }
   const { callTool, baseUrl } = createToolsClient({ paths: options.paths });
   const outputBase = args.output ? path14.resolve(args.output) : void 0;
   const results = [];
@@ -8944,27 +8966,36 @@ async function flow(argv, options) {
     console.error(`Unknown flow subcommand "${sub}". Run \`argent flow --help\`.`);
     return exitAfterFlush(2);
   }
+  const jsonStream = rest.some(
+    (tok) => tok === "--json-stream" || tok.startsWith("--json-stream=")
+  );
   if (rest.includes("--help") || rest.includes("-h")) {
-    printHelp();
+    printHelp(jsonStream);
     return;
   }
+  const fail = (message, code, err = message) => {
+    if (jsonStream) writeJsonStreamError(err);
+    console.error(message);
+    return exitAfterFlush(code);
+  };
   let args;
   try {
     args = parseRunArgs(rest);
   } catch (err) {
     if (err instanceof FlagParseException) {
+      if (jsonStream) writeJsonStreamError(err);
       console.error(`Error: ${err.message}
 `);
-      printHelp();
+      printHelp(jsonStream);
       return exitAfterFlush(2);
     }
     throw err;
   }
   if (!args.flowRef) {
-    console.error(
-      "argent flow run <flow|flow.yaml|dir> requires a flow name, a YAML file path, or a directory path."
-    );
-    printHelp();
+    const message = "argent flow run <flow|flow.yaml|dir> requires a flow name, a YAML file path, or a directory path.";
+    if (jsonStream) writeJsonStreamError(message);
+    console.error(message);
+    printHelp(jsonStream);
     return exitAfterFlush(2);
   }
   const projectRoot = process.cwd();
@@ -8980,11 +9011,11 @@ async function flow(argv, options) {
       } catch {
       }
     }
-    console.error(
+    return fail(
       `Flow path must not contain ".." segments \u2014 they are collapsed without following symlinks, so the path can name a different file than the one your shell opens: ${suppliedPath}
-` + recovery
+` + recovery,
+      2
     );
-    return exitAfterFlush(2);
   }
   const resolvedPath = path14.resolve(projectRoot, suppliedPath);
   let isDirectory = false;
@@ -8992,61 +9023,65 @@ async function flow(argv, options) {
     isDirectory = (await fsp.stat(resolvedPath)).isDirectory();
   } catch {
     if (args.recursive && !fromName) {
-      console.error(`Flow directory not found: ${resolvedPath}`);
-      return exitAfterFlush(2);
+      return fail(`Flow directory not found: ${resolvedPath}`, 2);
     }
   }
   if (isDirectory) {
+    if (args.jsonStream) {
+      return fail("--json-stream supports a single flow; directory runs are not supported.", 2);
+    }
     return runFlowDirectory(resolvedPath, args, projectRoot, options);
   }
   if (args.recursive) {
-    console.error(
-      fromName ? `flow run --recursive requires a directory path; "${args.flowRef}" is a saved-flow name, which always addresses the single file ${suppliedPath}.` : `flow run --recursive requires a directory path: ${suppliedPath}`
+    return fail(
+      fromName ? `flow run --recursive requires a directory path; "${args.flowRef}" is a saved-flow name, which always addresses the single file ${suppliedPath}.` : `flow run --recursive requires a directory path: ${suppliedPath}`,
+      2
     );
-    return exitAfterFlush(2);
   }
   const separatorTrimmedPath = suppliedPath.replace(/[\\/]+$/, "");
   if (separatorTrimmedPath !== suppliedPath && separatorTrimmedPath !== "") {
     const hint = SAFE_FLOW_NAME.test(separatorTrimmedPath) ? `.${path14.sep}${separatorTrimmedPath}` : separatorTrimmedPath;
-    console.error(
+    return fail(
       `Flow path must not end in a path separator \u2014 the separator claims a directory, which the kernel would refuse to open as a file, so the CLI would run a file this string does not name: ${suppliedPath}
-Did you mean: argent flow run ${shellQuoteArg(hint)}`
+Did you mean: argent flow run ${shellQuoteArg(hint)}`,
+      2
     );
-    return exitAfterFlush(2);
   }
   if (path14.extname(suppliedPath) !== ".yaml") {
     const looksLikeName = !suppliedPath.includes("/") && !suppliedPath.includes("\\") && path14.extname(suppliedPath) === "";
     if (path14.basename(suppliedPath).toLowerCase() === ".yaml") {
-      console.error(
-        `Flow filename must have a non-empty name containing only letters, numbers, "_", or "-": ${suppliedPath}`
+      return fail(
+        `Flow filename must have a non-empty name containing only letters, numbers, "_", or "-": ${suppliedPath}`,
+        2
       );
-    } else if (looksLikeName) {
-      console.error(
+    }
+    if (looksLikeName) {
+      return fail(
         `Flow name must contain only letters, numbers, "_", or "-": ${suppliedPath}
-Names run \`${FLOWS_DIR}/<name>.yaml\`; pass a path ending in .yaml to run a flow file kept elsewhere.`
+Names run \`${FLOWS_DIR}/<name>.yaml\`; pass a path ending in .yaml to run a flow file kept elsewhere.`,
+        2
       );
-    } else if (path14.extname(suppliedPath).toLowerCase() === ".yaml") {
-      console.error(
-        `Flow extension must be lowercase .yaml, not ${path14.extname(suppliedPath)}: ${suppliedPath}`
+    }
+    if (path14.extname(suppliedPath).toLowerCase() === ".yaml") {
+      return fail(
+        `Flow extension must be lowercase .yaml, not ${path14.extname(suppliedPath)}: ${suppliedPath}`,
+        2
       );
-    } else {
-      console.error(`Flow path must end in .yaml: ${suppliedPath}`);
     }
-    return exitAfterFlush(2);
+    return fail(`Flow path must end in .yaml: ${suppliedPath}`, 2);
   }
   const flowName = path14.basename(suppliedPath, ".yaml");
   if (!SAFE_FLOW_NAME.test(flowName)) {
-    console.error(
-      `Flow filename must have a non-empty name containing only letters, numbers, "_", or "-": ${suppliedPath}`
+    return fail(
+      `Flow filename must have a non-empty name containing only letters, numbers, "_", or "-": ${suppliedPath}`,
+      2
     );
-    return exitAfterFlush(2);
   }
   const flowPath = resolvedPath;
   try {
     const stat5 = await fsp.stat(flowPath);
     if (!stat5.isFile()) {
-      console.error(`Flow path is not a file: ${flowPath}`);
-      return exitAfterFlush(2);
+      return fail(`Flow path is not a file: ${flowPath}`, 2);
     }
     await fsp.access(flowPath, fsConstants2.R_OK);
   } catch (err) {
@@ -9057,8 +9092,7 @@ Names run \`${FLOWS_DIR}/<name>.yaml\`; pass a path ending in .yaml to run a flo
       recovery = fromName ? `
 No flow named "${args.flowRef}" is saved there \u2014 run \`argent flow list\` to see the saved flows.` : await savedFlowHint(projectRoot, flowPath);
     }
-    console.error(`${detail}: ${flowPath}${recovery}`);
-    return exitAfterFlush(2);
+    return fail(`${detail}: ${flowPath}${recovery}`, 2);
   }
   const suppliedBase = path14.basename(flowPath);
   const siblings = await fsp.readdir(path14.dirname(flowPath)).catch(() => null);
@@ -9066,19 +9100,24 @@ No flow named "${args.flowRef}" is saved there \u2014 run \`argent flow list\` t
     const actual = siblings.find((name) => name.toLowerCase() === suppliedBase.toLowerCase());
     const actualRunnable = actual !== void 0 && path14.extname(actual) === ".yaml" && SAFE_FLOW_NAME.test(path14.basename(actual, ".yaml"));
     const recovery = actualRunnable ? fromName ? `Did you mean: argent flow run ${path14.basename(actual, ".yaml")}` : `Did you mean: argent flow run ${shellQuoteArg(path14.join(path14.dirname(suppliedPath), actual))}` : actual !== void 0 ? `Rename ${actual} to ${suppliedBase} to run it \u2014 flow files must be lowercase .yaml.` : "Pass the flow file's name exactly as it appears on disk.";
-    console.error(
+    return fail(
       `Flow path must name the file as it appears on disk \u2014 this filesystem matched ${JSON.stringify(suppliedBase)} case-insensitively${actual !== void 0 ? ` to ${JSON.stringify(actual)}` : ""}, so the flow name (which keys the report, __baselines__/, and --output) would be one no file carries: ${suppliedPath}
-${recovery}`
+${recovery}`,
+      2
     );
-    return exitAfterFlush(2);
   }
-  if (!await requireLocalToolServer()) return exitAfterFlush(2);
+  const refusal = await requireLocalToolServer();
+  if (refusal) return fail(refusal, 2);
   const { callTool, baseUrl } = createToolsClient({ paths: options.paths });
   const payload = buildRunPayload(flowPath, projectRoot, args);
   let liveSteps = 0;
   let liveIndex = 0;
   const onStepReport = (event) => {
     const s = event;
+    if (args.jsonStream) {
+      writeJsonStreamRecord({ event: "progress", data: s });
+      return;
+    }
     if (liveSteps === 0) console.log(`Flow "${flowName}"`);
     liveSteps++;
     if (s.kind === "echo") {
@@ -9099,20 +9138,25 @@ ${recovery}`
     );
     report = resp.data;
   } catch (err) {
-    console.error(err instanceof Error ? err.message : String(err));
-    return exitAfterFlush(1);
+    return fail(err instanceof Error ? err.message : String(err), 1, err);
   }
-  if (!report || !("steps" in report)) {
-    console.error(`"${flowName}" did not produce a run report.`);
-    return exitAfterFlush(2);
+  if (!report || typeof report !== "object" || !("steps" in report)) {
+    return fail(`"${flowName}" did not produce a run report.`, 2);
   }
-  await exportAndResolveArtifacts(
-    report,
-    args.output ? path14.resolve(args.output) : void 0,
-    flowPath,
-    baseUrl
-  );
-  if (args.json) {
+  try {
+    await exportAndResolveArtifacts(
+      report,
+      args.output ? path14.resolve(args.output) : void 0,
+      flowPath,
+      baseUrl
+    );
+  } catch (err) {
+    if (!args.jsonStream) throw err;
+    return fail(err instanceof Error ? err.message : String(err), 2, err);
+  }
+  if (args.jsonStream) {
+    writeJsonStreamRecord({ event: "result", data: report });
+  } else if (args.json) {
     console.log(JSON.stringify(report, null, 2));
   } else if (liveSteps > 0) {
     if (report.executionPrerequisite) console.log(`  assumes: ${report.executionPrerequisite}`);

package/dist/installer.mjs

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

package/dist/tool-server.cjs

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

package/package.json

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