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

package/dist/tool-server.cjs

@@ -1323,7 +1323,31 @@ var init_e2e_dirs = __esm({
 function canonicalToolId(id) {
   return Object.hasOwn(TOOL_ID_ALIASES, id) ? TOOL_ID_ALIASES[id] : id;
 }
-var TOOL_ID_ALIASES;
+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;
+}
+function withFormerParamSpecs(tool, specs) {
+  const former = Object.entries(toolParamAliases(tool));
+  const copies = specs.flatMap(
+    (spec) => spec.path === `\${${spec.target}}` ? former.filter(([, current]) => current === spec.target).map(([name]) => ({ ...spec, target: name, path: `\${${name}}` })) : []
+  );
+  return copies.length > 0 ? [...specs, ...copies] : specs;
+}
+var TOOL_ID_ALIASES, TOOL_PARAM_ALIASES, ToolParamAliasError;
 var init_tool_ids = __esm({
   "../registry/src/tool-ids.ts"() {
     "use strict";
@@ -1336,6 +1360,19 @@ var init_tool_ids = __esm({
       "flow-read-prerequisite": "e2e-read-prerequisite",
       "flow-execute": "e2e-execute"
     });
+    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"
+      })
+    });
+    ToolParamAliasError = class extends Error {
+      constructor(former, current) {
+        super(`Pass ${current} or its former name ${former}, not both.`);
+        this.name = "ToolParamAliasError";
+      }
+    };
   }
 });
 
@@ -1382,7 +1419,13 @@ async function resolveFlowRelativeFile(anchorDir, target, addressable) {
 }
 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;
@@ -1391,7 +1434,7 @@ function nestedFlowTarget(args) {
   }
   if (name !== void 0 || !isResolvedAbsolute(flowPath)) return void 0;
   if (!FLOW_FILE_NAME_PATTERN.test(path6.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" && path6.isAbsolute(value) && !value.split(/[\\/]+/).includes("..");
@@ -22444,6 +22487,7 @@ var init_registry = __esm({
     init_artifacts();
     init_errors();
     init_failure_codes();
+    init_tool_ids();
     init_urn();
     init_zod_to_json_schema();
     import_node_crypto2 = require("node:crypto");
@@ -22524,6 +22568,18 @@ var init_registry = __esm({
         );
         this.events.emit("toolInvoked", toolId, toolInvocationId, startedMsg, calledAs);
         try {
+          try {
+            params = canonicalToolArgs(toolId, params);
+          } catch (err) {
+            if (!(err instanceof ToolParamAliasError)) throw err;
+            throw new FailureError(`Invalid params for tool "${toolId}": ${err.message}`, {
+              error_code: FAILURE_CODES.TOOL_INPUT_INVALID,
+              failure_stage: "tool_params_parse",
+              failure_area: "registry",
+              error_kind: "validation"
+            });
+          }
+          effectiveParams = params;
           if (definition.zodSchema) {
             const parsed = definition.zodSchema.safeParse(params ?? {});
             if (!parsed.success) {
@@ -101024,7 +101080,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID = (0, import_node_crypto3.randomUUID)();
 function readCliVersion() {
   if (true) {
-    return "0.31.2-next.2";
+    return "0.31.2-next.3";
   }
   return "0.0.0";
 }
@@ -131011,7 +131067,9 @@ function createHttpApp(registry2, options) {
         )
       };
       if (def.outputHint) entry.outputHint = renderFlagGated(def.outputHint, isFlagEnabled);
-      if (def.fileInputs && def.fileInputs.length > 0) entry.fileInputs = def.fileInputs;
+      if (def.fileInputs && def.fileInputs.length > 0) {
+        entry.fileInputs = withFormerParamSpecs(def.id, def.fileInputs);
+      }
       if (def.alwaysLoad) entry.alwaysLoad = true;
       if (def.searchHint) entry.searchHint = renderFlagGated(def.searchHint, isFlagEnabled);
       if (def.longRunning) entry.longRunning = true;
@@ -131087,11 +131145,29 @@ function createHttpApp(registry2, options) {
           return;
         }
       }
+      let body;
+      try {
+        body = canonicalToolArgs(def.id, req.body);
+      } catch (err) {
+        if (!(err instanceof ToolParamAliasError)) throw err;
+        emitHttpFailure(
+          {
+            error_code: FAILURE_CODES.HTTP_ZOD_VALIDATION_FAILED,
+            failure_stage: "http_param_alias",
+            failure_area: "http",
+            error_kind: "validation"
+          },
+          req.body
+        );
+        const issues = [{ code: "custom", path: [], message: err.message }];
+        res.status(400).json({ error: JSON.stringify(issues), message: err.message, issues });
+        return;
+      }
       let bodyArgs;
       let resolvedFileInputs;
       let derivedTargets;
       try {
-        const resolved = await resolveFileInputs(def, req.body, (id) => {
+        const resolved = await resolveFileInputs(def, body, (id) => {
           const entry = uploads.get(id);
           if (entry) uploads.delete(id);
           return entry;
@@ -168118,7 +168194,13 @@ function fromYamlStep(raw, blockDepth = 0) {
   if ("script" in raw) return parseScriptStep(raw, raw.script);
   if ("tool" in raw) {
     const r = raw;
-    const step = { kind: "tool", name: r.tool, args: r.args ?? {} };
+    let args = r.args ?? {};
+    try {
+      args = canonicalToolArgs(r.tool, args);
+    } catch (err) {
+      badEntry(raw, err instanceof Error ? err.message : String(err));
+    }
+    const step = { kind: "tool", name: r.tool, args };
     if (r.delayMs !== void 0) step.delayMs = r.delayMs;
     return step;
   }
@@ -168470,7 +168552,7 @@ var flowStartRecordingTool = {
   },
   description: `Start recording a new e2e test, resetting .argent/e2e/<name>.yaml to an empty e2e test and replacing any existing one.
 Use when you want to capture a reusable sequence of device interactions for later replay.
-Returns { message, flowFile, savedTo } and optionally { restarted, discardedSteps } if a live recording of the same e2e test was discarded.
+Returns { message, e2eTestFile, savedTo } and optionally { restarted, discardedSteps } if a live recording of the same e2e test was discarded.
 Without a link, it creates that file and fails if the .argent/e2e/ directory cannot be created or the file cannot be written. Over a link (argent link or ARGENT_TOOLS_URL, also to 127.0.0.1), your client writes the file, and \`savedTo\` is its path on your computer, or null when that write failed.
 
 Several e2e tests can be recorded at once, each keyed by the \`name\` + \`project_root\`
@@ -168541,12 +168623,14 @@ reports for those steps.`,
         message: `Restarted recording "${params.name}" \u2014 ${lost} was discarded and ` + reset,
         restarted: true,
         ...discardedSteps === void 0 ? {} : { discardedSteps },
+        e2eTestFile: flowFile,
         flowFile,
         savedTo
       };
     }
     return {
       message: `Started recording "${params.name}" e2e test`,
+      e2eTestFile: flowFile,
       flowFile,
       savedTo
     };
@@ -169698,7 +169782,7 @@ async function runDirective(env, step) {
     return {
       ok: false,
       indeterminate: true,
-      reason: `\`await: { idle }\` cannot run on ${env.device.platform}: flows have no UI-tree source on this platform, so screen stillness can never be judged. Replace this step with an explicit \`wait:\`.`
+      reason: `\`await: { idle }\` cannot run on ${env.device.platform}: e2e tests have no UI-tree source on this platform, so screen stillness can never be judged. Replace this step with an explicit \`wait:\`.`
     };
   }
   switch (step.kind) {
@@ -170647,7 +170731,7 @@ var UPLOAD_STAGE_BY_KIND = {
 };
 function nestedFlowRef(args) {
   if (typeof args.name === "string") return ` (name: ${args.name})`;
-  if (typeof args.flow_path === "string") return ` (flow_path: ${args.flow_path})`;
+  if (typeof args.e2e_test_path === "string") return ` (e2e_test_path: ${args.e2e_test_path})`;
   return "";
 }
 function toolStepFilePaths(registry2, tool, args) {
@@ -170760,9 +170844,9 @@ async function prepareNestedFlow(registry2, project, toolId, args) {
   };
   const resolved = await resolveFileInputs(
     { fileInputs: registry2.getTool(toolId)?.fileInputs },
-    { ...args, flow_file: wire }
+    { ...args, e2e_test_file: wire }
   );
-  const input2 = resolved.fileInputs?.flow_file;
+  const input2 = resolved.fileInputs?.e2e_test_file;
   if (input2) {
     input2.canonical = hop.canonical;
     input2.spelling = hop.spelling;
@@ -170797,7 +170881,8 @@ function count(value) {
   return typeof value === "number" ? value : 0;
 }
 function flowExecuteOutcome(result) {
-  const flow = typeof result.flow === "string" ? result.flow : "the composed e2e test";
+  const name = result.e2eTest ?? result.flow;
+  const flow = typeof name === "string" ? name : "the composed e2e test";
   if (!("steps" in result) && typeof result.notice === "string") {
     const prerequisite = typeof result.executionPrerequisite === "string" && result.executionPrerequisite ? `: ${result.executionPrerequisite}` : "";
     return {
@@ -171350,7 +171435,7 @@ var DIRECTIVE_COMMAND_HINTS = {
   run: {
     tool: "e2e-execute",
     rewritten: true,
-    rewriteCondition: "when the target resolves as a sibling e2e test in this recording's folder, on the computer that has the project; a `name` that does not is kept as a raw `tool: e2e-execute` step, and a `flow_path` that is not a sibling is refused outright and records nothing"
+    rewriteCondition: "when the target resolves as a sibling e2e test in this recording's folder, on the computer that has the project; a `name` that does not is kept as a raw `tool: e2e-execute` step, and an `e2e_test_path` that is not a sibling is refused outright and records nothing"
   },
   type: { tool: "keyboard", rewritten: false },
   await: { tool: AWAIT_UI_ELEMENT_TOOL_ID, rewritten: false },
@@ -171399,10 +171484,10 @@ function directiveCommandHint(command) {
 }
 var RUN_TARGET_COMMAND = "e2e-execute";
 async function rewriteSiblingFlowPath(session, args, project, linked) {
-  const flowPath = args.flow_path;
+  const flowPath = args.e2e_test_path;
   if (typeof flowPath !== "string" || args.name !== void 0) return;
   const invalid = (detail) => new FailureError(
-    `Cannot record an e2e-execute of flow_path "${flowPath}": ${detail}. flow_path carries no file-input resolution through e2e-add-step's opaque args \u2014 pass name + project_root for an e2e test saved beside the recording, or add a \`run: <relative path>.yaml\` step to the e2e test YAML by hand for a cross-directory target.`,
+    `Cannot record an e2e-execute of e2e_test_path "${flowPath}": ${detail}. e2e_test_path carries no file-input resolution through e2e-add-step's opaque args \u2014 pass name + project_root for an e2e test saved beside the recording, or add a \`run: <relative path>.yaml\` step to the e2e test YAML by hand for a cross-directory target.`,
     {
       error_code: FAILURE_CODES.FLOW_FILE_INVALID,
       failure_stage: "flow_add_step_flow_path",
@@ -171446,7 +171531,7 @@ async function rewriteSiblingFlowPath(session, args, project, linked) {
   const suppliedBase = path45.basename(flowPath);
   if (linked && project.mode === "host") {
     throw new FailureError(
-      `Cannot record an e2e-execute of flow_path "${flowPath}": the argent client sent no files with this call, so the recorder cannot check that the file is a sibling of the recording. Update the argent CLI or MCP adapter on the client.`,
+      `Cannot record an e2e-execute of e2e_test_path "${flowPath}": the argent client sent no files with this call, so the recorder cannot check that the file is a sibling of the recording. Update the argent CLI or MCP adapter on the client.`,
       {
         error_code: FAILURE_CODES.FLOW_FILE_INVALID,
         failure_stage: "flow_add_step_flow_path",
@@ -171461,11 +171546,11 @@ async function rewriteSiblingFlowPath(session, args, project, linked) {
   } catch (err) {
     if (path45.resolve(flowDir) === path45.resolve(flowsDir)) throw err;
     throw invalid(
-      `over a link, this argent client sends a flow_path only for an e2e test beside the recording; update the argent CLI or MCP adapter on the client (${err instanceof Error ? err.message : String(err)})`
+      `over a link, this argent client sends an e2e_test_path only for an e2e test beside the recording; update the argent CLI or MCP adapter on the client (${err instanceof Error ? err.message : String(err)})`
     );
   }
   if (spelling.state !== "listed") {
-    const recovery = spelling.state === "absent" ? `pass the basename exactly as it appears on disk` : spelling.addressable ? `pass flow_path with the on-disk basename "${spelling.actual}"` : `rename "${spelling.actual}" to "${suppliedBase}" to record it \u2014 e2e test files must be lowercase .yaml`;
+    const recovery = spelling.state === "absent" ? `pass the basename exactly as it appears on disk` : spelling.addressable ? `pass e2e_test_path with the on-disk basename "${spelling.actual}"` : `rename "${spelling.actual}" to "${suppliedBase}" to record it \u2014 e2e test files must be lowercase .yaml`;
     throw invalid(
       `the file must be named as it appears on disk \u2014 no directory entry is named "${suppliedBase}"` + (spelling.state === "case_folded" ? ` (this filesystem matched it case-insensitively to "${spelling.actual}")` : "") + `, so the recorded run: step would name an e2e test no case-sensitive checkout can find \u2014 ` + recovery
     );
@@ -171476,7 +171561,7 @@ async function rewriteSiblingFlowPath(session, args, project, linked) {
       throw invalid(`project_root "${projectRoot}" resolves "${stem}" to "${picked.path}" instead`);
     }
   }
-  delete args.flow_path;
+  delete args.e2e_test_path;
   args.name = stem;
 }
 async function captureRunTarget(session, args, project) {
@@ -171538,7 +171623,7 @@ async function captureRunTarget(session, args, project) {
 function replayRefusal(issue2, args) {
   let hint;
   if (issue2.kind === "nested") {
-    hint = nestedFlowTarget(args)?.kind === "name" ? " Over a link, a nested e2e-execute runs only when the argent client sends the e2e test it names with the call. Update the argent CLI or MCP adapter on the client." : " Over a link, a nested e2e-execute runs only when it names its e2e test with a test name in name, has an absolute project_root with no .. segment, and has no flow_path.";
+    hint = nestedFlowTarget(args)?.kind === "name" ? " Over a link, a nested e2e-execute runs only when the argent client sends the e2e test it names with the call. Update the argent CLI or MCP adapter on the client." : " Over a link, a nested e2e-execute runs only when it names its e2e test with a test name in name, has an absolute project_root with no .. segment, and has no e2e_test_path.";
   } else if (issue2.fixes.length === 0) {
     hint = " A replay without a link runs this step. To keep it, add it to the YAML by hand after e2e-finish-recording.";
   } else {
@@ -171598,6 +171683,10 @@ Returns { message, stepCount, recorded, savedTo }; \`recorded\`, not the status,
         throw err;
       }
       const authoredArgs = { ...args };
+      try {
+        args = canonicalToolArgs(command, args);
+      } catch {
+      }
       const linked = isLinkedRecorderCall(session, ctx);
       const stepFiles = ctx?.fileInputs?.project_root?.members;
       const project = stepFiles ? new ClientProjectAccess(stepFiles) : new HostProjectAccess();
@@ -173303,7 +173392,7 @@ var flowFinishRecordingTool = {
     completedMsg: ({ params }) => `Saved recorded e2e test ${params.name}`,
     failedMsg: ({ params, failureSignal: failureSignal2 }) => `Failed to finish recording of e2e test ${params.name}: ${failureSignal2.error_code}`
   },
-  description: `Finish recording the e2e test named by \`name\` + \`project_root\`, leaving recordings under any other key untouched. Returns { message, path, executionPrerequisite, steps, summary, flowFile, savedTo } - a summary of all recorded steps plus the final YAML. Use when you have added all desired steps and want to finalize the e2e test file. Fails if that e2e test has no recording in progress.
+  description: `Finish recording the e2e test named by \`name\` + \`project_root\`, leaving recordings under any other key untouched. Returns { message, path, executionPrerequisite, steps, summary, e2eTestFile, savedTo } - a summary of all recorded steps plus the final YAML. Use when you have added all desired steps and want to finalize the e2e test file. Fails if that e2e test has no recording in progress.
 A warning e2e-add-step raised on a recorded \`await-ui-element\` is repeated in \`summary\` as a \`warning:\` line of its own, right below the step it judges, and \`message\` counts them by kind. A warning is repeated only while the step it judges is still identifiable by its number: hand-editing the .yaml during the recording moves the steps, so those warnings are DROPPED rather than pinned on whichever step inherited the number, and \`message\` says how many were dropped. A step that carries a cross-tree warning was re-probed against the runner's tree: read it before converting that wait to \`await:\`/\`assert:\`, which is what the verdict is about and what this moment is for. A step that recorded a wait which did not pass was never probed at all, and its own warning names the CAUSE, because only one of them judges the condition: an unmet wait was read and found false, and it stops the run at replay; a wait whose tree source could not be read, or one that was cancelled, observed nothing and leaves the condition UNKNOWN rather than known-bad. Read those before replaying.
 You can still edit the .yaml file directly afterwards to remove or reorder steps.`,
   zodSchema: zodSchema70,
@@ -173341,6 +173430,7 @@ You can still edit the .yaml file directly afterwards to remove or reorder steps
       executionPrerequisite: flow.executionPrerequisite,
       steps: flow.steps.length,
       summary,
+      e2eTestFile: flowFile,
       flowFile,
       savedTo
     };
@@ -175786,15 +175876,15 @@ async function restoreStatusBar(device) {
 // ../tool-server/src/tools/flows/flow-run.ts
 var zodSchema71 = external_exports.object({
   name: external_exports.string().optional().describe(
-    'Name of a saved e2e test to run from `.argent/e2e`, or `.argent/flows` when it is not there (e.g. "settings-explore"). Omit when flow_path is set.'
+    'Name of a saved e2e test to run from `.argent/e2e`, or `.argent/flows` when it is not there (e.g. "settings-explore"). Omit when e2e_test_path is set.'
   ),
   project_root: external_exports.string().describe(
-    "Absolute path to the calling agent's project root: the cwd it is working in. With name, the saved e2e test is read from `.argent/e2e/<name>.yaml`, else `.argent/flows/<name>.yaml`, under this root; with flow_path, the e2e test, its run: siblings, its script: paths and baselines all resolve beside the YAML instead, so pass the agent's cwd. A script still RUNS in this root whichever source was used."
+    "Absolute path to the calling agent's project root: the cwd it is working in. With name, the saved e2e test is read from `.argent/e2e/<name>.yaml`, else `.argent/flows/<name>.yaml`, under this root; with e2e_test_path, the e2e test, its run: siblings, its script: paths and baselines all resolve beside the YAML instead, so pass the agent's cwd. A script still RUNS in this root whichever source was used."
   ),
-  flow_file: external_exports.string().optional().describe(
+  e2e_test_file: external_exports.string().optional().describe(
     "Path to the e2e test .yaml as readable by the tool-server. Internal: the argent client derives it from project_root and name automatically; leave unset."
   ),
-  flow_path: external_exports.string().optional().describe(
+  e2e_test_path: external_exports.string().optional().describe(
     "Omit when name is set. Absolute path to an e2e test .yaml on the client. Over a link (argent link or ARGENT_TOOLS_URL), the argent client uploads the file, its run: fragments and the snapshot baselines of each run, and the tool-server runs those copies. Keep run: fragments under project_root or beside the e2e test file. With updateBaselines, the client writes the new baselines when the run ends. The client also uploads each absolute .png or .yaml path that a tool: step takes as a file argument, when the file is under project_root or beside the e2e test file. A tool: e2e-execute step that names an e2e test with name and an absolute project_root without a .. segment runs: the client also uploads that e2e test and its own files. Over a link, the uploaded e2e tests must not have: script: steps; tool: steps that run an e2e test another way or record an e2e test; tool: steps that take a directory, an app or an output directory; tool: steps whose tool builds a file path from several arguments; tool: steps that name a relative path or a file other than .png or .yaml. Without a link, the tool-server reads the files in place and all step kinds run."
   ),
   device: external_exports.string().optional().describe(
@@ -175810,32 +175900,32 @@ var zodSchema71 = external_exports.object({
     "Set to true to confirm the execution prerequisite has been met. Required (LLM path) when a fragment defines an executionPrerequisite."
   )
 }).superRefine((params, ctx) => {
-  if (params.name === void 0 === (params.flow_path === void 0)) {
+  if (params.name === void 0 === (params.e2e_test_path === void 0)) {
     ctx.addIssue({
       code: external_exports.ZodIssueCode.custom,
-      message: params.name !== void 0 ? "Pass exactly one e2e test source: name or flow_path." : "Pass exactly one e2e test source: name or flow_path. e2e-execute needs the e2e test's name in `name` \u2014 it resolves <project_root>/.argent/e2e/<name>.yaml, else .argent/flows/<name>.yaml.",
-      // The ROOT, not `flow_path`: the rule spans both source fields, and a
-      // path would prefix the message with "`flow_path`:".
+      message: params.name !== void 0 ? "Pass exactly one e2e test source: name or e2e_test_path." : "Pass exactly one e2e test source: name or e2e_test_path. e2e-execute needs the e2e test's name in `name` \u2014 it resolves <project_root>/.argent/e2e/<name>.yaml, else .argent/flows/<name>.yaml.",
+      // The ROOT, not `e2e_test_path`: the rule spans both source fields, and a
+      // path would prefix the message with "`e2e_test_path`:".
       path: []
     });
   }
 });
 var fileInputs4 = [
   {
-    target: "flow_path",
-    path: "${flow_path}",
+    target: "e2e_test_path",
+    path: "${e2e_test_path}",
     kind: "file",
     optional: true,
     unwrapWhenSet: "name",
     collect: "flow"
   },
   {
-    target: "flow_file",
+    target: "e2e_test_file",
     // A client that predates `paths` reads the legacy dir only.
     path: "${project_root}/.argent/flows/${name}.yaml",
     paths: E2E_FILE_TEMPLATES,
     kind: "file",
-    skipWhenSet: "flow_path",
+    skipWhenSet: "e2e_test_path",
     collect: "flow"
   }
 ];
@@ -176126,8 +176216,8 @@ function deviceEnv(state3) {
   return { ...state3, device: state3.device };
 }
 function displayFlowName(params) {
-  const stem = params.flow_path === void 0 ? void 0 : path50.basename(params.flow_path, ".yaml");
-  return params.name || stem || params.flow_path || "(unspecified)";
+  const stem = params.e2e_test_path === void 0 ? void 0 : path50.basename(params.e2e_test_path, ".yaml");
+  return params.name || stem || params.e2e_test_path || "(unspecified)";
 }
 function* walkSteps(steps, within = "") {
   for (const [i, step] of steps.entries()) {
@@ -176273,7 +176363,9 @@ function assertUploadSelfContained(registry2, flow, closure, origin = {
   throw new FailureError(
     `${origin.subject} is not self-contained, and ${origin.arrival}. The steps below read or write project files, which stay on the client:
 ` + offending.map((o) => `  - ${o.line}`).join("\n") + `
-Run the e2e test on the computer that runs the tool-server, with no link and no ARGENT_TOOLS_URL, so that the tool-server reads the files in place.${uploadUpdateHint(servable)}${toolFilePathHints(toolFileFixes)}`,
+Run the e2e test on the computer that runs the tool-server, with no link and no ARGENT_TOOLS_URL, so that the tool-server reads the files in place.${uploadUpdateHint(servable)}` + // An older client lists e2e_test_path from this schema but collects the
+    // files only for flow_path.
+    (servable.length > 0 ? " A client older than the e2e_test_path param sends those files for a test passed as flow_path." : "") + toolFilePathHints(toolFileFixes),
     {
       error_code: FAILURE_CODES.FLOW_FILE_INVALID,
       failure_stage: UPLOAD_STAGE_BY_KIND[offending[0].kind],
@@ -176294,7 +176386,7 @@ function createRunFlowTool(registry2) {
     description: `Run a saved YAML e2e test end to end. Use when
 asked to replay a recorded path, re-run a QA regression, or check that a known journey still passes; for a
 one-off interaction use the gesture tools instead, and to author an e2e test use e2e-start-recording. Pass
-exactly one e2e test source: name (under project_root) or flow_path.
+exactly one e2e test source: name (under project_root) or e2e_test_path.
 Returns a per-step report: the first failure stops the run and the rest report as skipped.`,
     longRunning: true,
     zodSchema: zodSchema71,
@@ -176305,11 +176397,11 @@ Returns a per-step report: the first failure stops the run and the rest report a
       const signal = ctx?.signal;
       const { filePath, flowName, viaUpload, shadowed } = await resolveFlowSource(
         params,
-        ctx?.fileInputs?.flow_file,
-        ctx?.fileInputs?.flow_path
+        ctx?.fileInputs?.e2e_test_file,
+        ctx?.fileInputs?.e2e_test_path
       );
       const warning = shadowed ? { warning: e2eShadowWarning(filePath, shadowed) } : {};
-      const rootInput = viaUpload ? ctx?.fileInputs?.flow_path ?? ctx?.fileInputs?.flow_file : void 0;
+      const rootInput = viaUpload ? ctx?.fileInputs?.e2e_test_path ?? ctx?.fileInputs?.e2e_test_file : void 0;
       const clientProject = rootInput?.members ? new ClientProjectAccess(rootInput.members) : void 0;
       const project = clientProject ?? new HostProjectAccess();
       const canonicalPath = await canonicalFlowPath(filePath);
@@ -176369,6 +176461,7 @@ Returns a per-step report: the first failure stops the run and the rest report a
       }
       if (flow.executionPrerequisite && !params.prerequisiteAcknowledged) {
         return {
+          e2eTest: flowName,
           flow: flowName,
           notice: "This e2e test has an execution prerequisite that must be fulfilled before it can run. Verify the prerequisite is met and call e2e-execute again with prerequisiteAcknowledged set to true.",
           executionPrerequisite: flow.executionPrerequisite,
@@ -176622,6 +176715,7 @@ function summarize(flowName, deviceId, executionPrerequisite, steps, aborted2, t
     else errored++;
   }
   return {
+    e2eTest: flowName,
     flow: flowName,
     device: deviceId,
     executionPrerequisite,
@@ -176640,6 +176734,7 @@ function summarize(flowName, deviceId, executionPrerequisite, steps, aborted2, t
   };
 }
 function pushReport(state3, report) {
+  if (report.e2eTest !== void 0) report.flow = report.e2eTest;
   state3.reports.push(report);
   state3.onStepReport?.(report);
 }
@@ -176676,7 +176771,7 @@ async function execSteps(state3, steps, scope) {
         index,
         kind: step.kind,
         status: "skip",
-        flow: stepFlow(step, scope),
+        e2eTest: stepFlow(step, scope),
         target: stepTarget(step),
         ...depthOf(scope),
         ...stopReason ? { reason: stopReason } : {},
@@ -176694,7 +176789,7 @@ async function execSteps(state3, steps, scope) {
         index,
         kind: step.kind,
         status: "error",
-        flow: scopeFlow(scope),
+        e2eTest: scopeFlow(scope),
         target: stepTarget(step),
         ...depthOf(scope),
         reason: `step needs a device but the e2e test was resolved as device-free \u2014 pass an explicit device`
@@ -176710,7 +176805,7 @@ async function execSteps(state3, steps, scope) {
         kind: step.kind,
         status: "skip",
         reason: "run aborted",
-        flow: stepFlow(step, scope),
+        e2eTest: stepFlow(step, scope),
         target: stepTarget(step),
         ...depthOf(scope),
         ...step.kind === "echo" ? { message: step.message } : {}
@@ -176762,7 +176857,7 @@ function reportBlockSkipped(state3, steps, scope, reason2) {
       kind: step.kind,
       status: "skip",
       reason: reason2,
-      flow: stepFlow(step, scope),
+      e2eTest: stepFlow(step, scope),
       target: stepTarget(step),
       ...depthOf(scope),
       ...step.kind === "echo" ? { message: step.message } : {}
@@ -176788,7 +176883,7 @@ async function execWhenStep(state3, step, scope) {
   const marker = {
     index,
     kind: "when",
-    flow: scopeFlow(scope),
+    e2eTest: scopeFlow(scope),
     target,
     ...depthOf(scope)
   };
@@ -176848,7 +176943,7 @@ async function execRunStep(state3, step, scope) {
       index,
       kind: "run",
       status: "error",
-      flow: display,
+      e2eTest: display,
       target,
       reason: reason2,
       ...depthOf(scope),
@@ -176896,7 +176991,7 @@ async function execRunStep(state3, step, scope) {
     index,
     kind: "run",
     status: "pass",
-    flow: display,
+    e2eTest: display,
     target,
     ...depthOf(scope),
     durationMs: Date.now() - startedAt
@@ -176950,7 +177045,7 @@ async function execLeafStep(state3, step, index, scope) {
   const base = {
     index,
     kind: step.kind,
-    flow: scopeFlow(scope),
+    e2eTest: scopeFlow(scope),
     target: stepTarget(step),
     ...depthOf(scope)
   };
@@ -177158,7 +177253,7 @@ function errMsg4(err) {
   return err instanceof Error ? err.message : String(err);
 }
 function assertFlowPathShape(flowPath) {
-  const windows = windowsPathRefusal("flow_path", flowPath);
+  const windows = windowsPathRefusal("e2e_test_path", flowPath);
   if (windows) {
     throw new FailureError(windows, {
       error_code: FAILURE_CODES.FLOW_FILE_INVALID,
@@ -177169,7 +177264,7 @@ function assertFlowPathShape(flowPath) {
   }
   if (!path50.isAbsolute(flowPath)) {
     throw new FailureError(
-      `Invalid flow_path "${flowPath}": e2e test paths must be absolute \u2014 a relative path is resolved against the tool server's working directory, not the caller's. Pass the absolute path to the e2e test's YAML.`,
+      `Invalid e2e_test_path "${flowPath}": e2e test paths must be absolute \u2014 a relative path is resolved against the tool server's working directory, not the caller's. Pass the absolute path to the e2e test's YAML.`,
       {
         error_code: FAILURE_CODES.FLOW_FILE_INVALID,
         failure_stage: "flow_path_absolute",
@@ -177180,7 +177275,7 @@ function assertFlowPathShape(flowPath) {
   }
   if (flowPath.split(/[\\/]+/).includes("..")) {
     throw new FailureError(
-      `Invalid flow_path "${flowPath}": e2e test paths must not contain ".." segments \u2014 a ".." after a symlinked directory can name a different file than the spelling suggests, and the argent client always sends fully resolved paths. Pass the fully resolved absolute path to the e2e test's YAML.`,
+      `Invalid e2e_test_path "${flowPath}": e2e test paths must not contain ".." segments \u2014 a ".." after a symlinked directory can name a different file than the spelling suggests, and the argent client always sends fully resolved paths. Pass the fully resolved absolute path to the e2e test's YAML.`,
       {
         error_code: FAILURE_CODES.FLOW_FILE_INVALID,
         failure_stage: "flow_path_dotdot",
@@ -177195,7 +177290,7 @@ function flowNameOf(clientPath) {
   const bareExtension = path50.basename(clientPath).toLowerCase() === ".yaml";
   if (!bareExtension && clientExt !== ".yaml") {
     const detail = clientExt.toLowerCase() === ".yaml" ? `e2e test files must use the lowercase .yaml extension, not "${clientExt}".` : `e2e test files must use the .yaml extension.`;
-    throw new FailureError(`Invalid flow_path "${clientPath}": ${detail}`, {
+    throw new FailureError(`Invalid e2e_test_path "${clientPath}": ${detail}`, {
       error_code: FAILURE_CODES.FLOW_FILE_INVALID,
       failure_stage: "flow_path_extension",
       failure_area: "tool_server",
@@ -177208,9 +177303,9 @@ function flowNameOf(clientPath) {
 }
 function flowPathCasingError(clientPath, spelling) {
   const suppliedBase = path50.basename(clientPath);
-  const recovery = spelling.state === "absent" ? `Pass the basename exactly as it appears on disk.` : spelling.addressable ? `Pass flow_path with the on-disk basename "${spelling.actual}".` : `Rename "${spelling.actual}" to "${suppliedBase}" to run it \u2014 e2e test files must be lowercase .yaml.`;
+  const recovery = spelling.state === "absent" ? `Pass the basename exactly as it appears on disk.` : spelling.addressable ? `Pass e2e_test_path with the on-disk basename "${spelling.actual}".` : `Rename "${spelling.actual}" to "${suppliedBase}" to run it \u2014 e2e test files must be lowercase .yaml.`;
   return new FailureError(
-    `Invalid flow_path "${clientPath}": the file must be named as it appears on disk \u2014 this filesystem matched "${suppliedBase}" case-insensitively` + (spelling.state === "case_folded" ? ` to "${spelling.actual}"` : "") + `, so the e2e test name (which keys the report and __baselines__/) would be one no directory entry carries. ${recovery}`,
+    `Invalid e2e_test_path "${clientPath}": the file must be named as it appears on disk \u2014 this filesystem matched "${suppliedBase}" case-insensitively` + (spelling.state === "case_folded" ? ` to "${spelling.actual}"` : "") + `, so the e2e test name (which keys the report and __baselines__/) would be one no directory entry carries. ${recovery}`,
     {
       error_code: FAILURE_CODES.FLOW_FILE_INVALID,
       failure_stage: "flow_path_casing",
@@ -177220,8 +177315,8 @@ function flowPathCasingError(clientPath, spelling) {
   );
 }
 async function resolveFlowSource(params, fileInput, flowPathInput) {
-  if (params.name === void 0 === (params.flow_path === void 0)) {
-    throw new FailureError("Pass exactly one e2e test source: name or flow_path.", {
+  if (params.name === void 0 === (params.e2e_test_path === void 0)) {
+    throw new FailureError("Pass exactly one e2e test source: name or e2e_test_path.", {
       error_code: FAILURE_CODES.FLOW_FILE_INVALID,
       failure_stage: "flow_source",
       failure_area: "tool_server",
@@ -177229,16 +177324,16 @@ async function resolveFlowSource(params, fileInput, flowPathInput) {
     });
   }
   assertValidProjectRoot(params.project_root);
-  if (params.flow_path !== void 0) {
+  if (params.e2e_test_path !== void 0) {
     if (flowPathInput?.viaUpload) {
       const clientPath2 = flowPathInput.clientPath;
       assertFlowPathShape(clientPath2);
-      return { filePath: params.flow_path, flowName: flowNameOf(clientPath2), viaUpload: true };
+      return { filePath: params.e2e_test_path, flowName: flowNameOf(clientPath2), viaUpload: true };
     }
-    const isVerifiedHostPath = flowPathInput?.presentOnHost === true && flowPathInput.statVerified === true && path50.resolve(params.flow_path) === path50.resolve(flowPathInput.clientPath);
+    const isVerifiedHostPath = flowPathInput?.presentOnHost === true && flowPathInput.statVerified === true && path50.resolve(params.e2e_test_path) === path50.resolve(flowPathInput.clientPath);
     if (!isVerifiedHostPath) {
       throw new FailureError(
-        `Invalid flow_path "${params.flow_path}": explicit e2e test paths must be supplied through the flow_path file-input boundary. Pass the client-local path and let the argent client resolve it.`,
+        `Invalid e2e_test_path "${params.e2e_test_path}": explicit e2e test paths must be supplied through the e2e_test_path file-input boundary. Pass the client-local path and let the argent client resolve it.`,
         {
           error_code: FAILURE_CODES.FLOW_FILE_INVALID,
           failure_stage: "flow_path_boundary",
@@ -177247,24 +177342,26 @@ async function resolveFlowSource(params, fileInput, flowPathInput) {
         }
       );
     }
-    assertFlowPathShape(params.flow_path);
+    assertFlowPathShape(params.e2e_test_path);
     const clientPath = flowPathInput.clientPath;
     const flowName2 = flowNameOf(clientPath);
     const spelling = await classifyOnDiskSpelling(
-      path50.dirname(params.flow_path),
+      path50.dirname(params.e2e_test_path),
       path50.basename(clientPath)
     );
     if (spelling.state !== "listed") throw flowPathCasingError(clientPath, spelling);
-    return { filePath: params.flow_path, flowName: flowName2, viaUpload: false };
+    return { filePath: params.e2e_test_path, flowName: flowName2, viaUpload: false };
   }
   const flowName = params.name;
   assertSafeFlowName(flowName);
   const candidates = e2eFileCandidates(params.project_root, flowName);
-  if (params.flow_file && fileInput?.viaUpload)
-    return { filePath: params.flow_file, flowName, viaUpload: true };
-  if (params.flow_file && (!path50.isAbsolute(params.flow_file) || params.flow_file.split(/[\\/]+/).includes("..") || !candidates.some((candidate) => path50.resolve(candidate) === path50.resolve(params.flow_file)))) {
+  if (params.e2e_test_file && fileInput?.viaUpload)
+    return { filePath: params.e2e_test_file, flowName, viaUpload: true };
+  if (params.e2e_test_file && (!path50.isAbsolute(params.e2e_test_file) || params.e2e_test_file.split(/[\\/]+/).includes("..") || !candidates.some(
+    (candidate) => path50.resolve(candidate) === path50.resolve(params.e2e_test_file)
+  ))) {
     throw new FailureError(
-      `Invalid flow_file "${params.flow_file}": it must resolve to the e2e test's path under the project root ("${candidates.join('" or "')}"). flow_file is internal \u2014 leave it unset and pass project_root + name.`,
+      `Invalid e2e_test_file "${params.e2e_test_file}": it must resolve to the e2e test's path under the project root ("${candidates.join('" or "')}"). e2e_test_file is internal \u2014 leave it unset and pass project_root + name.`,
       {
         error_code: FAILURE_CODES.FLOW_FILE_INVALID,
         failure_stage: "flow_file_containment",
@@ -177274,8 +177371,8 @@ async function resolveFlowSource(params, fileInput, flowPathInput) {
     );
   }
   const picked = await pickE2eFile(candidates);
-  const filePath = params.flow_file || picked.path;
-  const spellingDirs = params.flow_file || picked.exists ? [path50.dirname(filePath)] : candidates.map((candidate) => path50.dirname(candidate));
+  const filePath = params.e2e_test_file || picked.path;
+  const spellingDirs = params.e2e_test_file || picked.exists ? [path50.dirname(filePath)] : candidates.map((candidate) => path50.dirname(candidate));
   for (const dir of spellingDirs) {
     const spelling = await classifyOnDiskSpelling(dir, `${flowName}.yaml`);
     if (spelling.state === "case_folded") throw flowNameCasingError(flowName, spelling);
@@ -177290,22 +177387,22 @@ var fs66 = __toESM(require("node:fs/promises"));
 init_src2();
 var zodSchema72 = external_exports.object({
   name: external_exports.string().optional().describe(
-    'Name of a saved e2e test to inspect from `.argent/e2e`, or `.argent/flows` when it is not there (e.g. "settings-explore"). Omit when flow_path is set.'
+    'Name of a saved e2e test to inspect from `.argent/e2e`, or `.argent/flows` when it is not there (e.g. "settings-explore"). Omit when e2e_test_path is set.'
   ),
   project_root: external_exports.string().describe(
-    "Absolute path to the calling agent's project root: the cwd it is working in. With name, the saved e2e test is read from `.argent/e2e/<name>.yaml`, else `.argent/flows/<name>.yaml`, under this root; with flow_path, the prerequisite is read from that YAML instead, so pass the agent's cwd."
+    "Absolute path to the calling agent's project root: the cwd it is working in. With name, the saved e2e test is read from `.argent/e2e/<name>.yaml`, else `.argent/flows/<name>.yaml`, under this root; with e2e_test_path, the prerequisite is read from that YAML instead, so pass the agent's cwd."
   ),
-  flow_file: external_exports.string().optional().describe(
+  e2e_test_file: external_exports.string().optional().describe(
     "Path to the e2e test .yaml as readable by the tool-server. Internal: the argent client derives it from project_root and name automatically; leave unset."
   ),
-  flow_path: external_exports.string().optional().describe(
+  e2e_test_path: external_exports.string().optional().describe(
     "Omit when name is set. Absolute path to an e2e test .yaml on the client. Over a link (argent link or ARGENT_TOOLS_URL), the argent client uploads the file and the tool-server reads the uploaded copy; without a link, the tool-server reads the file in place. Pass the path through the argent client; a raw path that the file-input boundary did not verify is rejected. Pass the same e2e test source here as to e2e-execute, so the prerequisite you read belongs to the e2e test that will run."
   )
 }).superRefine((params, ctx) => {
-  if (params.name === void 0 === (params.flow_path === void 0)) {
+  if (params.name === void 0 === (params.e2e_test_path === void 0)) {
     ctx.addIssue({
       code: external_exports.ZodIssueCode.custom,
-      message: params.name !== void 0 ? "Pass exactly one e2e test source: name or flow_path." : "Pass exactly one e2e test source: name or flow_path. e2e-read-prerequisite needs the e2e test's name in `name` \u2014 it resolves <project_root>/.argent/e2e/<name>.yaml, else .argent/flows/<name>.yaml.",
+      message: params.name !== void 0 ? "Pass exactly one e2e test source: name or e2e_test_path." : "Pass exactly one e2e test source: name or e2e_test_path. e2e-read-prerequisite needs the e2e test's name in `name` \u2014 it resolves <project_root>/.argent/e2e/<name>.yaml, else .argent/flows/<name>.yaml.",
       // The ROOT, matching flow-execute: the rule spans both source fields,
       // so it must not be anchored on one of them.
       path: []
@@ -177314,18 +177411,18 @@ var zodSchema72 = external_exports.object({
 });
 var fileInputs5 = [
   {
-    target: "flow_path",
-    path: "${flow_path}",
+    target: "e2e_test_path",
+    path: "${e2e_test_path}",
     kind: "file",
     optional: true,
     unwrapWhenSet: "name"
   },
   {
-    target: "flow_file",
+    target: "e2e_test_file",
     path: "${project_root}/.argent/flows/${name}.yaml",
     paths: E2E_FILE_TEMPLATES,
     kind: "file",
-    skipWhenSet: "flow_path"
+    skipWhenSet: "e2e_test_path"
   }
 ];
 var flowReadPrerequisiteTool = {
@@ -177336,8 +177433,8 @@ var flowReadPrerequisiteTool = {
     completedMsg: () => "Read e2e test prerequisite",
     failedMsg: ({ failureSignal: failureSignal2 }) => `Failed to read e2e test prerequisite: ${failureSignal2.error_code}`
   },
-  description: `Read the execution prerequisite of an e2e test without running it: a saved e2e test from the .argent/e2e/ directory (or the older .argent/flows/), or an explicit boundary-managed flow_path.
-Returns { flow, executionPrerequisite, warning? }: the logical name, plus the precondition its author recorded
+  description: `Read the execution prerequisite of an e2e test without running it: a saved e2e test from the .argent/e2e/ directory (or the older .argent/flows/), or an explicit boundary-managed e2e_test_path.
+Returns { e2eTest, executionPrerequisite, warning? }: the logical name, plus the precondition its author recorded
 verbatim. Empty when none was declared, which is always so for a self-contained scenario: one opening
 on a launch may declare no prerequisite, because it builds its own start state.
 Use when deciding whether the device already sits where a fragment expects it (correct app foregrounded,
@@ -177345,7 +177442,7 @@ correct account, correct screen) before committing to a run, or when relaying th
 Touches no device: nothing is launched, tapped, dispatched or torn down, and no simulator or emulator
 needs booting, so calling this costs nothing but a file read.
 Fails if the e2e test file does not exist.
-Address the e2e test exactly as you will address it in e2e-execute: name or flow_path, one and only one; supplying both or neither is rejected. The name goes in \`name\`, which resolves <project_root>/.argent/e2e/<name>.yaml, else .argent/flows/<name>.yaml.`,
+Address the e2e test exactly as you will address it in e2e-execute: name or e2e_test_path, one and only one; supplying both or neither is rejected. The name goes in \`name\`, which resolves <project_root>/.argent/e2e/<name>.yaml, else .argent/flows/<name>.yaml.`,
   readOnly: true,
   zodSchema: zodSchema72,
   fileInputs: fileInputs5,
@@ -177353,11 +177450,12 @@ Address the e2e test exactly as you will address it in e2e-execute: name or flow
   async execute(_services, params, ctx) {
     const { filePath, flowName, shadowed } = await resolveFlowSource(
       params,
-      ctx?.fileInputs?.flow_file,
-      ctx?.fileInputs?.flow_path
+      ctx?.fileInputs?.e2e_test_file,
+      ctx?.fileInputs?.e2e_test_path
     );
     const flow = parseFlow(await fs66.readFile(filePath, "utf8"));
     return {
+      e2eTest: flowName,
       flow: flowName,
       executionPrerequisite: flow.executionPrerequisite,
       ...shadowed ? { warning: e2eShadowWarning(filePath, shadowed) } : {}