@swmansion/argent 0.31.2-next.1 → 0.31.2-next.3

package/dist/cli-cmds.mjs

@@ -10310,6 +10310,36 @@ var TOOL_ID_ALIASES = Object.freeze({
 function canonicalToolId(id) {
   return Object.hasOwn(TOOL_ID_ALIASES, id) ? TOOL_ID_ALIASES[id] : id;
 }
+var TOOL_PARAM_ALIASES = Object.freeze({
+  "e2e-execute": Object.freeze({ flow_path: "e2e_test_path", flow_file: "e2e_test_file" }),
+  "e2e-read-prerequisite": Object.freeze({
+    flow_path: "e2e_test_path",
+    flow_file: "e2e_test_file"
+  })
+});
+var ToolParamAliasError = class extends Error {
+  constructor(former, current) {
+    super(`Pass ${current} or its former name ${former}, not both.`);
+    this.name = "ToolParamAliasError";
+  }
+};
+function toolParamAliases(tool) {
+  const id = canonicalToolId(tool);
+  return Object.hasOwn(TOOL_PARAM_ALIASES, id) ? TOOL_PARAM_ALIASES[id] : {};
+}
+function canonicalToolArgs(tool, args) {
+  if (typeof args !== "object" || args === null || Array.isArray(args)) return args;
+  const record2 = args;
+  let out;
+  for (const [former, current] of Object.entries(toolParamAliases(tool))) {
+    if (record2[former] === void 0) continue;
+    if (record2[current] !== void 0) throw new ToolParamAliasError(former, current);
+    out ??= { ...record2 };
+    out[current] = out[former];
+    delete out[former];
+  }
+  return out ?? args;
+}
 
 // ../registry/src/flow-file-refs.ts
 async function canonicalFlowPath(p) {
@@ -10379,7 +10409,13 @@ async function classifyOnDiskSpelling(dir, base, addressable = FLOW_FILE_NAME_PA
 }
 function nestedFlowTarget(args) {
   if (typeof args !== "object" || args === null || Array.isArray(args)) return void 0;
-  const { name, project_root: projectRoot, flow_path: flowPath } = args;
+  let canonical;
+  try {
+    canonical = canonicalToolArgs("e2e-execute", args);
+  } catch {
+    return void 0;
+  }
+  const { name, project_root: projectRoot, e2e_test_path: flowPath } = canonical;
   if (flowPath === void 0) {
     if (typeof name !== "string" || !FLOW_NAME_PATTERN.test(name)) return void 0;
     if (!isResolvedAbsolute(projectRoot)) return void 0;
@@ -10388,7 +10424,7 @@ function nestedFlowTarget(args) {
   }
   if (name !== void 0 || !isResolvedAbsolute(flowPath)) return void 0;
   if (!FLOW_FILE_NAME_PATTERN.test(path8.basename(flowPath))) return void 0;
-  return { kind: "flow_path", path: flowPath };
+  return { kind: "e2e_test_path", path: flowPath };
 }
 function isResolvedAbsolute(value) {
   return typeof value === "string" && path8.isAbsolute(value) && !value.split(/[\\/]+/).includes("..");
@@ -31111,12 +31147,18 @@ function isResolvedAbsolute2(value) {
   return typeof value === "string" && path11.isAbsolute(value) && !value.split(/[\\/]+/).includes("..");
 }
 function namesValidFlow(args) {
-  const { project_root, flow_path, name } = args;
+  let canonical;
+  try {
+    canonical = canonicalToolArgs("e2e-execute", args);
+  } catch {
+    return false;
+  }
+  const { project_root, e2e_test_path: testPath, name } = canonical;
   if (!isResolvedAbsolute2(project_root)) return false;
   if (name === void 0) {
-    return isResolvedAbsolute2(flow_path) && FLOW_FILE_NAME_PATTERN.test(path11.basename(flow_path));
+    return isResolvedAbsolute2(testPath) && FLOW_FILE_NAME_PATTERN.test(path11.basename(testPath));
   }
-  return flow_path === void 0 && typeof name === "string" && FLOW_NAME_PATTERN.test(name);
+  return testPath === void 0 && typeof name === "string" && FLOW_NAME_PATTERN.test(name);
 }
 function savedFlowProject(file2) {
   if (!path11.isAbsolute(file2)) return null;
@@ -31290,8 +31332,8 @@ function memberCollector(roots, opts) {
 `));
   const emit = (member, sent) => {
     members2.push(member);
-    const subject = member.role === "flow" ? member.canonical : member.key;
-    if (logging) log2(printable(`[flow-files] ${member.role} ${subject}: ${sent}`));
+    const [label, subject] = member.role === "flow" ? ["e2e test", member.canonical] : [member.role, member.key];
+    if (logging) log2(printable(`[e2e-files] ${label} ${subject}: ${sent}`));
   };
   async function flow(anchorDir, target, onlyPresent) {
     const key = flowMemberKey(anchorDir, target);
@@ -31457,7 +31499,7 @@ function recordedStep(args) {
   if (typeof text2 !== "string") return void 0;
   let parsed;
   try {
-    parsed = JSON.parse(text2);
+    parsed = canonicalToolArgs(command, JSON.parse(text2));
   } catch {
     return void 0;
   }
@@ -31480,7 +31522,7 @@ async function collectStepMembers(args, opts, recordingDirFor = e2eDirFor) {
     const self2 = await collector.flow(path11.dirname(recording), path11.basename(recording));
     let runArgs = step.args;
     const named = nestedFlowTarget(runArgs);
-    if (named?.kind === "flow_path") {
+    if (named?.kind === "e2e_test_path") {
       const stem = path11.basename(named.path, ".yaml");
       const base = path11.basename(named.path);
       const dir = path11.resolve(path11.dirname(named.path));
@@ -31489,7 +31531,7 @@ async function collectStepMembers(args, opts, recordingDirFor = e2eDirFor) {
       if (dirs.some((d) => path11.resolve(d) === dir)) {
         await collector.flow(path11.dirname(named.path), base);
         runArgs = { ...runArgs, name: stem };
-        delete runArgs.flow_path;
+        delete runArgs.e2e_test_path;
       }
     }
     const target = nestedFlowTarget(runArgs);
@@ -31517,7 +31559,21 @@ async function nameToE2ePathForOlderServer(tool, fileInputs, args) {
   const picked = await pickE2eFile(target.paths);
   if (!picked.exists || picked.legacy) return args;
   const { name: _name, ...rest } = args;
-  return { ...rest, flow_path: picked.path };
+  return { ...rest, e2e_test_path: picked.path };
+}
+function formerParamsForOlderServer(meta3, args) {
+  const listed = meta3.inputSchema.properties;
+  if (typeof args !== "object" || args === null || Array.isArray(args)) return args;
+  if (typeof listed !== "object" || listed === null) return args;
+  const record2 = args;
+  let out;
+  for (const [former, current] of Object.entries(toolParamAliases(meta3.name))) {
+    if (record2[current] === void 0 || current in listed || !(former in listed)) continue;
+    out ??= { ...record2 };
+    out[former] = out[current];
+    delete out[current];
+  }
+  return out ?? args;
 }
 async function stepForOlderServer(args, listedId) {
   if (typeof args !== "object" || args === null || Array.isArray(args)) return args;
@@ -31775,12 +31831,13 @@ function createToolsClient(options = {}) {
   async function callTool(name, args, opts) {
     opts?.signal?.throwIfAborted();
     const { url: url2, token, remote } = await route();
-    let finalArgs = args;
+    let finalArgs = canonicalToolArgs(name, args);
     const tools2 = await fetchTools({ signal: opts?.signal });
     const meta3 = findTool(tools2, name);
     const olderServer = meta3 !== null && !tools2.some((t2) => t2.name === canonicalToolId(meta3.name));
     if (meta3) {
-      finalArgs = await nameToE2ePathForOlderServer(meta3.name, meta3.fileInputs, args);
+      finalArgs = await nameToE2ePathForOlderServer(meta3.name, meta3.fileInputs, finalArgs);
+      finalArgs = formerParamsForOlderServer(meta3, finalArgs);
     }
     if (olderServer && canonicalToolId(meta3.name) === "e2e-add-step") {
       finalArgs = await stepForOlderServer(finalArgs, (tool) => findTool(tools2, tool)?.name);
@@ -31808,7 +31865,7 @@ function createToolsClient(options = {}) {
       if (filesLogEnabled()) {
         for (const file2 of applied.written) {
           if (baselineDirs.includes(path12.dirname(file2))) {
-            diagnose(`[flow-files] baseline ${file2}: written`);
+            diagnose(`[e2e-files] baseline ${file2}: written`);
           }
         }
       }
@@ -35740,7 +35797,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID2 = randomUUID5();
 function readCliVersion() {
   if (true) {
-    return "0.31.2-next.0";
+    return "0.31.2-next.3";
   }
   return "0.0.0";
 }
@@ -37203,8 +37260,12 @@ function renderEchoLine(s) {
   }
   return `  ${indent}\u203A ${s.message}`;
 }
+function e2eTestOf(r2) {
+  return r2.e2eTest ?? r2.flow;
+}
 function stepLabel(s, topFlow) {
-  const where = s.flow && s.flow !== topFlow ? ` [${s.flow}]` : "";
+  const owner = e2eTestOf(s);
+  const where = owner && owner !== topFlow ? ` [${owner}]` : "";
   const what = s.tool ?? s.target;
   return `${what ? `${s.kind} ${what}` : s.kind}${where}`;
 }
@@ -37261,7 +37322,7 @@ function renderFailedSteps(report) {
     if (s.status !== "fail" && s.status !== "error" && !s.warning && !scriptNote && scriptLog.length === 0) {
       continue;
     }
-    lines.push(renderStepLine(s, n3, report.flow));
+    lines.push(renderStepLine(s, n3, e2eTestOf(report)));
     if (s.warning) lines.push(renderUnderStepLine(s, n3, `\u26A0 ${s.warning}`));
     lines.push(...scriptLog);
     if (s.artifacts && typeof s.artifacts === "object") {
@@ -37282,7 +37343,7 @@ function summarizeFailure(report) {
     n3++;
     if (s.status === "fail" || s.status === "error") {
       const detail = s.reason ? String(s.reason) : void 0;
-      return { headline: `step ${n3} ${stepLabel(s, report.flow)}`, detail };
+      return { headline: `step ${n3} ${stepLabel(s, e2eTestOf(report))}`, detail };
     }
   }
   return { headline: "failed with no failing step" };
@@ -37322,11 +37383,15 @@ function rerunCommand(flowPath, rel, projectRoot, args) {
   if (args.output) parts.push("--output", pathArg(path18.join(args.output, path18.dirname(rel))));
   return parts.join(" ");
 }
-var EXPORT_SOURCE_MARKER = ".argent-flow-source";
+var EXPORT_SOURCE_MARKER = ".argent-e2e-source";
+var LEGACY_EXPORT_SOURCE_MARKER = ".argent-flow-source";
 var MARKER_READ_RETRIES = 4;
 var MARKER_READ_DELAY_MS = 5;
 async function readExportMarker(dir) {
-  const marker = path18.join(dir, EXPORT_SOURCE_MARKER);
+  const owner = await readMarkerFile(path18.join(dir, EXPORT_SOURCE_MARKER));
+  return owner !== void 0 ? owner : await readMarkerFile(path18.join(dir, LEGACY_EXPORT_SOURCE_MARKER));
+}
+async function readMarkerFile(marker) {
   for (let attempt = 0; ; attempt++) {
     let owner;
     try {
@@ -37469,7 +37534,7 @@ function exitAfterFlush(code, streams = [process.stdout, process.stderr]) {
 }
 function renderReport(report) {
   const lines = [];
-  lines.push(`E2E test "${report.flow}"${report.device ? ` on ${report.device}` : ""}`);
+  lines.push(`E2E test "${e2eTestOf(report)}"${report.device ? ` on ${report.device}` : ""}`);
   if (report.executionPrerequisite) {
     lines.push(`  assumes: ${report.executionPrerequisite}`);
   }
@@ -37481,7 +37546,7 @@ function renderReport(report) {
       continue;
     }
     n3++;
-    lines.push(renderStepLine(s, n3, report.flow));
+    lines.push(renderStepLine(s, n3, e2eTestOf(report)));
     if (s.warning) lines.push(renderUnderStepLine(s, n3, `\u26A0 ${s.warning}`));
     lines.push(...renderScriptLogLines(s, n3));
     if (s.artifacts && typeof s.artifacts === "object") {
@@ -37575,7 +37640,7 @@ async function collectFlowFiles(dir, recursive2) {
 var RUN_TOOL_ID = "e2e-execute";
 function buildRunPayload(flowPath, projectRoot, args) {
   const payload = {
-    flow_path: flowPath,
+    e2e_test_path: flowPath,
     project_root: projectRoot,
     // Headless runs never block on the LLM prerequisite handshake.
     prerequisiteAcknowledged: true
@@ -37785,7 +37850,12 @@ async function runFlowDirectory(dir, args, projectRoot, options) {
   const durationMs = Date.now() - batchStartedAt;
   if (args.json) {
     console.log(
-      JSON.stringify({ ok: counts.failed === 0, ...counts, durationMs, flows: results }, null, 2)
+      JSON.stringify(
+        // `flows` is the deprecated spelling of `e2eTests`.
+        { ok: counts.failed === 0, ...counts, durationMs, e2eTests: results, flows: results },
+        null,
+        2
+      )
     );
   } else {
     for (const line of renderFailedFlows(failures)) console.log(line);

package/dist/client.js

@@ -8883,6 +8883,36 @@ var TOOL_ID_ALIASES = Object.freeze({
 function canonicalToolId(id) {
   return Object.hasOwn(TOOL_ID_ALIASES, id) ? TOOL_ID_ALIASES[id] : id;
 }
+var TOOL_PARAM_ALIASES = Object.freeze({
+  "e2e-execute": Object.freeze({ flow_path: "e2e_test_path", flow_file: "e2e_test_file" }),
+  "e2e-read-prerequisite": Object.freeze({
+    flow_path: "e2e_test_path",
+    flow_file: "e2e_test_file"
+  })
+});
+var ToolParamAliasError = class extends Error {
+  constructor(former, current) {
+    super(`Pass ${current} or its former name ${former}, not both.`);
+    this.name = "ToolParamAliasError";
+  }
+};
+function toolParamAliases(tool) {
+  const id = canonicalToolId(tool);
+  return Object.hasOwn(TOOL_PARAM_ALIASES, id) ? TOOL_PARAM_ALIASES[id] : {};
+}
+function canonicalToolArgs(tool, args) {
+  if (typeof args !== "object" || args === null || Array.isArray(args)) return args;
+  const record = args;
+  let out;
+  for (const [former, current] of Object.entries(toolParamAliases(tool))) {
+    if (record[former] === void 0) continue;
+    if (record[current] !== void 0) throw new ToolParamAliasError(former, current);
+    out ??= { ...record };
+    out[current] = out[former];
+    delete out[former];
+  }
+  return out ?? args;
+}
 
 // ../registry/src/flow-file-refs.ts
 async function canonicalFlowPath(p) {
@@ -8952,7 +8982,13 @@ async function classifyOnDiskSpelling(dir, base, addressable = FLOW_FILE_NAME_PA
 }
 function nestedFlowTarget(args) {
   if (typeof args !== "object" || args === null || Array.isArray(args)) return void 0;
-  const { name, project_root: projectRoot, flow_path: flowPath } = args;
+  let canonical;
+  try {
+    canonical = canonicalToolArgs("e2e-execute", args);
+  } catch {
+    return void 0;
+  }
+  const { name, project_root: projectRoot, e2e_test_path: flowPath } = canonical;
   if (flowPath === void 0) {
     if (typeof name !== "string" || !FLOW_NAME_PATTERN.test(name)) return void 0;
     if (!isResolvedAbsolute(projectRoot)) return void 0;
@@ -8961,7 +8997,7 @@ function nestedFlowTarget(args) {
   }
   if (name !== void 0 || !isResolvedAbsolute(flowPath)) return void 0;
   if (!FLOW_FILE_NAME_PATTERN.test(path8.basename(flowPath))) return void 0;
-  return { kind: "flow_path", path: flowPath };
+  return { kind: "e2e_test_path", path: flowPath };
 }
 function isResolvedAbsolute(value) {
   return typeof value === "string" && path8.isAbsolute(value) && !value.split(/[\\/]+/).includes("..");
@@ -9857,12 +9893,18 @@ function isResolvedAbsolute2(value) {
   return typeof value === "string" && path11.isAbsolute(value) && !value.split(/[\\/]+/).includes("..");
 }
 function namesValidFlow(args) {
-  const { project_root, flow_path, name } = args;
+  let canonical;
+  try {
+    canonical = canonicalToolArgs("e2e-execute", args);
+  } catch {
+    return false;
+  }
+  const { project_root, e2e_test_path: testPath, name } = canonical;
   if (!isResolvedAbsolute2(project_root)) return false;
   if (name === void 0) {
-    return isResolvedAbsolute2(flow_path) && FLOW_FILE_NAME_PATTERN.test(path11.basename(flow_path));
+    return isResolvedAbsolute2(testPath) && FLOW_FILE_NAME_PATTERN.test(path11.basename(testPath));
   }
-  return flow_path === void 0 && typeof name === "string" && FLOW_NAME_PATTERN.test(name);
+  return testPath === void 0 && typeof name === "string" && FLOW_NAME_PATTERN.test(name);
 }
 function savedFlowProject(file) {
   if (!path11.isAbsolute(file)) return null;
@@ -10036,8 +10078,8 @@ function memberCollector(roots, opts) {
 `));
   const emit = (member, sent) => {
     members.push(member);
-    const subject = member.role === "flow" ? member.canonical : member.key;
-    if (logging) log(printable(`[flow-files] ${member.role} ${subject}: ${sent}`));
+    const [label, subject] = member.role === "flow" ? ["e2e test", member.canonical] : [member.role, member.key];
+    if (logging) log(printable(`[e2e-files] ${label} ${subject}: ${sent}`));
   };
   async function flow(anchorDir, target, onlyPresent) {
     const key = flowMemberKey(anchorDir, target);
@@ -10203,7 +10245,7 @@ function recordedStep(args) {
   if (typeof text !== "string") return void 0;
   let parsed;
   try {
-    parsed = JSON.parse(text);
+    parsed = canonicalToolArgs(command, JSON.parse(text));
   } catch {
     return void 0;
   }
@@ -10226,7 +10268,7 @@ async function collectStepMembers(args, opts, recordingDirFor = e2eDirFor) {
     const self = await collector.flow(path11.dirname(recording), path11.basename(recording));
     let runArgs = step.args;
     const named = nestedFlowTarget(runArgs);
-    if (named?.kind === "flow_path") {
+    if (named?.kind === "e2e_test_path") {
       const stem = path11.basename(named.path, ".yaml");
       const base = path11.basename(named.path);
       const dir = path11.resolve(path11.dirname(named.path));
@@ -10235,7 +10277,7 @@ async function collectStepMembers(args, opts, recordingDirFor = e2eDirFor) {
       if (dirs.some((d) => path11.resolve(d) === dir)) {
         await collector.flow(path11.dirname(named.path), base);
         runArgs = { ...runArgs, name: stem };
-        delete runArgs.flow_path;
+        delete runArgs.e2e_test_path;
       }
     }
     const target = nestedFlowTarget(runArgs);
@@ -10263,7 +10305,21 @@ async function nameToE2ePathForOlderServer(tool, fileInputs, args) {
   const picked = await pickE2eFile(target.paths);
   if (!picked.exists || picked.legacy) return args;
   const { name: _name, ...rest } = args;
-  return { ...rest, flow_path: picked.path };
+  return { ...rest, e2e_test_path: picked.path };
+}
+function formerParamsForOlderServer(meta, args) {
+  const listed = meta.inputSchema.properties;
+  if (typeof args !== "object" || args === null || Array.isArray(args)) return args;
+  if (typeof listed !== "object" || listed === null) return args;
+  const record = args;
+  let out;
+  for (const [former, current] of Object.entries(toolParamAliases(meta.name))) {
+    if (record[current] === void 0 || current in listed || !(former in listed)) continue;
+    out ??= { ...record };
+    out[former] = out[current];
+    delete out[current];
+  }
+  return out ?? args;
 }
 async function stepForOlderServer(args, listedId) {
   if (typeof args !== "object" || args === null || Array.isArray(args)) return args;
@@ -10521,12 +10577,13 @@ function createToolsClient(options = {}) {
   async function callTool(name, args, opts) {
     opts?.signal?.throwIfAborted();
     const { url, token, remote } = await route();
-    let finalArgs = args;
+    let finalArgs = canonicalToolArgs(name, args);
     const tools = await fetchTools({ signal: opts?.signal });
     const meta = findTool(tools, name);
     const olderServer = meta !== null && !tools.some((t) => t.name === canonicalToolId(meta.name));
     if (meta) {
-      finalArgs = await nameToE2ePathForOlderServer(meta.name, meta.fileInputs, args);
+      finalArgs = await nameToE2ePathForOlderServer(meta.name, meta.fileInputs, finalArgs);
+      finalArgs = formerParamsForOlderServer(meta, finalArgs);
     }
     if (olderServer && canonicalToolId(meta.name) === "e2e-add-step") {
       finalArgs = await stepForOlderServer(finalArgs, (tool) => findTool(tools, tool)?.name);
@@ -10554,7 +10611,7 @@ function createToolsClient(options = {}) {
       if (filesLogEnabled()) {
         for (const file of applied.written) {
           if (baselineDirs.includes(path12.dirname(file))) {
-            diagnose(`[flow-files] baseline ${file}: written`);
+            diagnose(`[e2e-files] baseline ${file}: written`);
           }
         }
       }

package/dist/installer.mjs

@@ -15759,6 +15759,13 @@ var TOOL_ID_ALIASES = Object.freeze({
   "flow-read-prerequisite": "e2e-read-prerequisite",
   "flow-execute": "e2e-execute"
 });
+var TOOL_PARAM_ALIASES = Object.freeze({
+  "e2e-execute": Object.freeze({ flow_path: "e2e_test_path", flow_file: "e2e_test_file" }),
+  "e2e-read-prerequisite": Object.freeze({
+    flow_path: "e2e_test_path",
+    flow_file: "e2e_test_file"
+  })
+});
 
 // ../registry/src/failure-codes.ts
 var FAILURE_CODES = {
@@ -16915,7 +16922,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = randomUUID4();
 function readCliVersion() {
   if (true) {
-    return "0.31.2-next.0";
+    return "0.31.2-next.3";
   }
   return "0.0.0";
 }
@@ -22711,6 +22718,11 @@ async function runGlobal(opts) {
     try {
       await runShellCommand(cmd);
       spinner3.stop(import_picocolors4.default.green("Installed globally."));
+      if (!isGloballyInstalled()) {
+        log.warn(
+          `${import_picocolors4.default.cyan("argent")} is not on PATH, so editors can't start it. Add your package manager's global bin directory to PATH.`
+        );
+      }
       version = getGloballyInstalledVersion() ?? getInstalledVersion() ?? version;
       await tel.trackPackageAction("fresh_install", packageActionStartedAt2, true);
     } catch (err) {