@swmansion/argent 0.29.1-next.21 → 0.29.1-next.22

package/dist/cli-cmds.mjs

@@ -124,17 +124,17 @@ var require_visit = __commonJS({
     visit2.BREAK = BREAK;
     visit2.SKIP = SKIP;
     visit2.REMOVE = REMOVE;
-    function visit_(key, node2, visitor, path24) {
-      const ctrl = callVisitor(key, node2, visitor, path24);
+    function visit_(key, node2, visitor, path25) {
+      const ctrl = callVisitor(key, node2, visitor, path25);
       if (identity2.isNode(ctrl) || identity2.isPair(ctrl)) {
-        replaceNode(key, path24, ctrl);
-        return visit_(key, ctrl, visitor, path24);
+        replaceNode(key, path25, ctrl);
+        return visit_(key, ctrl, visitor, path25);
       }
       if (typeof ctrl !== "symbol") {
         if (identity2.isCollection(node2)) {
-          path24 = Object.freeze(path24.concat(node2));
+          path25 = Object.freeze(path25.concat(node2));
           for (let i2 = 0; i2 < node2.items.length; ++i2) {
-            const ci = visit_(i2, node2.items[i2], visitor, path24);
+            const ci = visit_(i2, node2.items[i2], visitor, path25);
             if (typeof ci === "number")
               i2 = ci - 1;
             else if (ci === BREAK)
@@ -145,13 +145,13 @@ var require_visit = __commonJS({
             }
           }
         } else if (identity2.isPair(node2)) {
-          path24 = Object.freeze(path24.concat(node2));
-          const ck = visit_("key", node2.key, visitor, path24);
+          path25 = Object.freeze(path25.concat(node2));
+          const ck = visit_("key", node2.key, visitor, path25);
           if (ck === BREAK)
             return BREAK;
           else if (ck === REMOVE)
             node2.key = null;
-          const cv = visit_("value", node2.value, visitor, path24);
+          const cv = visit_("value", node2.value, visitor, path25);
           if (cv === BREAK)
             return BREAK;
           else if (cv === REMOVE)
@@ -172,17 +172,17 @@ var require_visit = __commonJS({
     visitAsync.BREAK = BREAK;
     visitAsync.SKIP = SKIP;
     visitAsync.REMOVE = REMOVE;
-    async function visitAsync_(key, node2, visitor, path24) {
-      const ctrl = await callVisitor(key, node2, visitor, path24);
+    async function visitAsync_(key, node2, visitor, path25) {
+      const ctrl = await callVisitor(key, node2, visitor, path25);
       if (identity2.isNode(ctrl) || identity2.isPair(ctrl)) {
-        replaceNode(key, path24, ctrl);
-        return visitAsync_(key, ctrl, visitor, path24);
+        replaceNode(key, path25, ctrl);
+        return visitAsync_(key, ctrl, visitor, path25);
       }
       if (typeof ctrl !== "symbol") {
         if (identity2.isCollection(node2)) {
-          path24 = Object.freeze(path24.concat(node2));
+          path25 = Object.freeze(path25.concat(node2));
           for (let i2 = 0; i2 < node2.items.length; ++i2) {
-            const ci = await visitAsync_(i2, node2.items[i2], visitor, path24);
+            const ci = await visitAsync_(i2, node2.items[i2], visitor, path25);
             if (typeof ci === "number")
               i2 = ci - 1;
             else if (ci === BREAK)
@@ -193,13 +193,13 @@ var require_visit = __commonJS({
             }
           }
         } else if (identity2.isPair(node2)) {
-          path24 = Object.freeze(path24.concat(node2));
-          const ck = await visitAsync_("key", node2.key, visitor, path24);
+          path25 = Object.freeze(path25.concat(node2));
+          const ck = await visitAsync_("key", node2.key, visitor, path25);
           if (ck === BREAK)
             return BREAK;
           else if (ck === REMOVE)
             node2.key = null;
-          const cv = await visitAsync_("value", node2.value, visitor, path24);
+          const cv = await visitAsync_("value", node2.value, visitor, path25);
           if (cv === BREAK)
             return BREAK;
           else if (cv === REMOVE)
@@ -226,23 +226,23 @@ var require_visit = __commonJS({
       }
       return visitor;
     }
-    function callVisitor(key, node2, visitor, path24) {
+    function callVisitor(key, node2, visitor, path25) {
       if (typeof visitor === "function")
-        return visitor(key, node2, path24);
+        return visitor(key, node2, path25);
       if (identity2.isMap(node2))
-        return visitor.Map?.(key, node2, path24);
+        return visitor.Map?.(key, node2, path25);
       if (identity2.isSeq(node2))
-        return visitor.Seq?.(key, node2, path24);
+        return visitor.Seq?.(key, node2, path25);
       if (identity2.isPair(node2))
-        return visitor.Pair?.(key, node2, path24);
+        return visitor.Pair?.(key, node2, path25);
       if (identity2.isScalar(node2))
-        return visitor.Scalar?.(key, node2, path24);
+        return visitor.Scalar?.(key, node2, path25);
       if (identity2.isAlias(node2))
-        return visitor.Alias?.(key, node2, path24);
+        return visitor.Alias?.(key, node2, path25);
       return void 0;
     }
-    function replaceNode(key, path24, node2) {
-      const parent = path24[path24.length - 1];
+    function replaceNode(key, path25, node2) {
+      const parent = path25[path25.length - 1];
       if (identity2.isCollection(parent)) {
         parent.items[key] = node2;
       } else if (identity2.isPair(parent)) {
@@ -854,10 +854,10 @@ var require_Collection = __commonJS({
     var createNode = require_createNode();
     var identity2 = require_identity();
     var Node = require_Node();
-    function collectionFromPath(schema, path24, value) {
+    function collectionFromPath(schema, path25, value) {
       let v = value;
-      for (let i2 = path24.length - 1; i2 >= 0; --i2) {
-        const k = path24[i2];
+      for (let i2 = path25.length - 1; i2 >= 0; --i2) {
+        const k = path25[i2];
         if (typeof k === "number" && Number.isInteger(k) && k >= 0) {
           const a2 = [];
           a2[k] = v;
@@ -876,7 +876,7 @@ var require_Collection = __commonJS({
         sourceObjects: /* @__PURE__ */ new Map()
       });
     }
-    var isEmptyPath = (path24) => path24 == null || typeof path24 === "object" && !!path24[Symbol.iterator]().next().done;
+    var isEmptyPath = (path25) => path25 == null || typeof path25 === "object" && !!path25[Symbol.iterator]().next().done;
     var Collection = class extends Node.NodeBase {
       constructor(type, schema) {
         super(type);
@@ -906,11 +906,11 @@ var require_Collection = __commonJS({
        * be a Pair instance or a `{ key, value }` object, which may not have a key
        * that already exists in the map.
        */
-      addIn(path24, value) {
-        if (isEmptyPath(path24))
+      addIn(path25, value) {
+        if (isEmptyPath(path25))
           this.add(value);
         else {
-          const [key, ...rest] = path24;
+          const [key, ...rest] = path25;
           const node2 = this.get(key, true);
           if (identity2.isCollection(node2))
             node2.addIn(rest, value);
@@ -924,8 +924,8 @@ var require_Collection = __commonJS({
        * Removes a value from the collection.
        * @returns `true` if the item was found and removed.
        */
-      deleteIn(path24) {
-        const [key, ...rest] = path24;
+      deleteIn(path25) {
+        const [key, ...rest] = path25;
         if (rest.length === 0)
           return this.delete(key);
         const node2 = this.get(key, true);
@@ -939,8 +939,8 @@ var require_Collection = __commonJS({
        * scalar values from their surrounding node; to disable set `keepScalar` to
        * `true` (collections are always returned intact).
        */
-      getIn(path24, keepScalar) {
-        const [key, ...rest] = path24;
+      getIn(path25, keepScalar) {
+        const [key, ...rest] = path25;
         const node2 = this.get(key, true);
         if (rest.length === 0)
           return !keepScalar && identity2.isScalar(node2) ? node2.value : node2;
@@ -958,8 +958,8 @@ var require_Collection = __commonJS({
       /**
        * Checks if the collection includes a value with the key `key`.
        */
-      hasIn(path24) {
-        const [key, ...rest] = path24;
+      hasIn(path25) {
+        const [key, ...rest] = path25;
         if (rest.length === 0)
           return this.has(key);
         const node2 = this.get(key, true);
@@ -969,8 +969,8 @@ var require_Collection = __commonJS({
        * Sets a value in this collection. For `!!set`, `value` needs to be a
        * boolean to add/remove the item from the set.
        */
-      setIn(path24, value) {
-        const [key, ...rest] = path24;
+      setIn(path25, value) {
+        const [key, ...rest] = path25;
         if (rest.length === 0) {
           this.set(key, value);
         } else {
@@ -1650,8 +1650,8 @@ ${ctx.indent}`;
         const vs0 = valueStr[0];
         const nl0 = valueStr.indexOf("\n");
         const hasNewline = nl0 !== -1;
-        const flow2 = ctx.inFlow ?? value.flow ?? value.items.length === 0;
-        if (hasNewline || !flow2) {
+        const flow = ctx.inFlow ?? value.flow ?? value.items.length === 0;
+        if (hasNewline || !flow) {
           let hasPropsLine = false;
           if (hasNewline && (vs0 === "&" || vs0 === "!")) {
             let sp0 = valueStr.indexOf(" ");
@@ -1877,8 +1877,8 @@ var require_stringifyCollection = __commonJS({
     var stringify = require_stringify();
     var stringifyComment = require_stringifyComment();
     function stringifyCollection(collection, ctx, options) {
-      const flow2 = ctx.inFlow ?? collection.flow;
-      const stringify2 = flow2 ? stringifyFlowCollection : stringifyBlockCollection;
+      const flow = ctx.inFlow ?? collection.flow;
+      const stringify2 = flow ? stringifyFlowCollection : stringifyBlockCollection;
       return stringify2(collection, ctx, options);
     }
     function stringifyBlockCollection({ comment, items }, ctx, { blockItemPrefix, flowChars, itemIndent, onChompKeep, onComment }) {
@@ -3485,9 +3485,9 @@ var require_Document = __commonJS({
           this.contents.add(value);
       }
       /** Adds a value to the document. */
-      addIn(path24, value) {
+      addIn(path25, value) {
         if (assertCollection(this.contents))
-          this.contents.addIn(path24, value);
+          this.contents.addIn(path25, value);
       }
       /**
        * Create a new `Alias` node, ensuring that the target `node` has the required anchor.
@@ -3521,7 +3521,7 @@ var require_Document = __commonJS({
           options = replacer;
           replacer = void 0;
         }
-        const { aliasDuplicateObjects, anchorPrefix, flow: flow2, keepUndefined, onTagObj, tag } = options ?? {};
+        const { aliasDuplicateObjects, anchorPrefix, flow, keepUndefined, onTagObj, tag } = options ?? {};
         const { onAnchor, setAnchors, sourceObjects } = anchors.createNodeAnchors(
           this,
           // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
@@ -3537,7 +3537,7 @@ var require_Document = __commonJS({
           sourceObjects
         };
         const node2 = createNode.createNode(value, tag, ctx);
-        if (flow2 && identity2.isCollection(node2))
+        if (flow && identity2.isCollection(node2))
           node2.flow = true;
         setAnchors();
         return node2;
@@ -3562,14 +3562,14 @@ var require_Document = __commonJS({
        * Removes a value from the document.
        * @returns `true` if the item was found and removed.
        */
-      deleteIn(path24) {
-        if (Collection.isEmptyPath(path24)) {
+      deleteIn(path25) {
+        if (Collection.isEmptyPath(path25)) {
           if (this.contents == null)
             return false;
           this.contents = null;
           return true;
         }
-        return assertCollection(this.contents) ? this.contents.deleteIn(path24) : false;
+        return assertCollection(this.contents) ? this.contents.deleteIn(path25) : false;
       }
       /**
        * Returns item at `key`, or `undefined` if not found. By default unwraps
@@ -3584,10 +3584,10 @@ var require_Document = __commonJS({
        * scalar values from their surrounding node; to disable set `keepScalar` to
        * `true` (collections are always returned intact).
        */
-      getIn(path24, keepScalar) {
-        if (Collection.isEmptyPath(path24))
+      getIn(path25, keepScalar) {
+        if (Collection.isEmptyPath(path25))
           return !keepScalar && identity2.isScalar(this.contents) ? this.contents.value : this.contents;
-        return identity2.isCollection(this.contents) ? this.contents.getIn(path24, keepScalar) : void 0;
+        return identity2.isCollection(this.contents) ? this.contents.getIn(path25, keepScalar) : void 0;
       }
       /**
        * Checks if the document includes a value with the key `key`.
@@ -3598,10 +3598,10 @@ var require_Document = __commonJS({
       /**
        * Checks if the document includes a value at `path`.
        */
-      hasIn(path24) {
-        if (Collection.isEmptyPath(path24))
+      hasIn(path25) {
+        if (Collection.isEmptyPath(path25))
           return this.contents !== void 0;
-        return identity2.isCollection(this.contents) ? this.contents.hasIn(path24) : false;
+        return identity2.isCollection(this.contents) ? this.contents.hasIn(path25) : false;
       }
       /**
        * Sets a value in this document. For `!!set`, `value` needs to be a
@@ -3618,13 +3618,13 @@ var require_Document = __commonJS({
        * Sets a value in this document. For `!!set`, `value` needs to be a
        * boolean to add/remove the item from the set.
        */
-      setIn(path24, value) {
-        if (Collection.isEmptyPath(path24)) {
+      setIn(path25, value) {
+        if (Collection.isEmptyPath(path25)) {
           this.contents = value;
         } else if (this.contents == null) {
-          this.contents = Collection.collectionFromPath(this.schema, Array.from(path24), value);
+          this.contents = Collection.collectionFromPath(this.schema, Array.from(path25), value);
         } else if (assertCollection(this.contents)) {
-          this.contents.setIn(path24, value);
+          this.contents.setIn(path25, value);
         }
       }
       /**
@@ -3785,7 +3785,7 @@ ${pointer}
 var require_resolve_props = __commonJS({
   "../../node_modules/yaml/dist/compose/resolve-props.js"(exports) {
     "use strict";
-    function resolveProps(tokens, { flow: flow2, indicator, next, offset, onError, parentIndent, startOnNewline }) {
+    function resolveProps(tokens, { flow, indicator, next, offset, onError, parentIndent, startOnNewline }) {
       let spaceBefore = false;
       let atNewline = startOnNewline;
       let hasSpace = startOnNewline;
@@ -3814,7 +3814,7 @@ var require_resolve_props = __commonJS({
         }
         switch (token.type) {
           case "space":
-            if (!flow2 && (indicator !== "doc-start" || next?.type !== "flow-collection") && token.source.includes("	")) {
+            if (!flow && (indicator !== "doc-start" || next?.type !== "flow-collection") && token.source.includes("	")) {
               tab = token;
             }
             hasSpace = true;
@@ -3870,15 +3870,15 @@ var require_resolve_props = __commonJS({
             if (anchor2 || tag)
               onError(token, "BAD_PROP_ORDER", `Anchors and tags must be after the ${token.source} indicator`);
             if (found)
-              onError(token, "UNEXPECTED_TOKEN", `Unexpected ${token.source} in ${flow2 ?? "collection"}`);
+              onError(token, "UNEXPECTED_TOKEN", `Unexpected ${token.source} in ${flow ?? "collection"}`);
             found = token;
             atNewline = indicator === "seq-item-ind" || indicator === "explicit-key-ind";
             hasSpace = false;
             break;
           case "comma":
-            if (flow2) {
+            if (flow) {
               if (comma)
-                onError(token, "UNEXPECTED_TOKEN", `Unexpected , in ${flow2}`);
+                onError(token, "UNEXPECTED_TOKEN", `Unexpected , in ${flow}`);
               comma = token;
               atNewline = false;
               hasSpace = false;
@@ -5585,9 +5585,9 @@ var require_cst_visit = __commonJS({
     visit2.BREAK = BREAK;
     visit2.SKIP = SKIP;
     visit2.REMOVE = REMOVE;
-    visit2.itemAtPath = (cst, path24) => {
+    visit2.itemAtPath = (cst, path25) => {
       let item = cst;
-      for (const [field, index] of path24) {
+      for (const [field, index] of path25) {
         const tok = item?.[field];
         if (tok && "items" in tok) {
           item = tok.items[index];
@@ -5596,23 +5596,23 @@ var require_cst_visit = __commonJS({
       }
       return item;
     };
-    visit2.parentCollection = (cst, path24) => {
-      const parent = visit2.itemAtPath(cst, path24.slice(0, -1));
-      const field = path24[path24.length - 1][0];
+    visit2.parentCollection = (cst, path25) => {
+      const parent = visit2.itemAtPath(cst, path25.slice(0, -1));
+      const field = path25[path25.length - 1][0];
       const coll = parent?.[field];
       if (coll && "items" in coll)
         return coll;
       throw new Error("Parent collection not found");
     };
-    function _visit(path24, item, visitor) {
-      let ctrl = visitor(item, path24);
+    function _visit(path25, item, visitor) {
+      let ctrl = visitor(item, path25);
       if (typeof ctrl === "symbol")
         return ctrl;
       for (const field of ["key", "value"]) {
         const token = item[field];
         if (token && "items" in token) {
           for (let i2 = 0; i2 < token.items.length; ++i2) {
-            const ci = _visit(Object.freeze(path24.concat([[field, i2]])), token.items[i2], visitor);
+            const ci = _visit(Object.freeze(path25.concat([[field, i2]])), token.items[i2], visitor);
             if (typeof ci === "number")
               i2 = ci - 1;
             else if (ci === BREAK)
@@ -5623,10 +5623,10 @@ var require_cst_visit = __commonJS({
             }
           }
           if (typeof ctrl === "function" && field === "key")
-            ctrl = ctrl(item, path24);
+            ctrl = ctrl(item, path25);
         }
       }
-      return typeof ctrl === "function" ? ctrl(item, path24) : ctrl;
+      return typeof ctrl === "function" ? ctrl(item, path25) : ctrl;
     }
     exports.visit = visit2;
   }
@@ -6928,14 +6928,14 @@ var require_parser = __commonJS({
             case "scalar":
             case "single-quoted-scalar":
             case "double-quoted-scalar": {
-              const fs18 = this.flowScalar(this.type);
+              const fs19 = this.flowScalar(this.type);
               if (atNextItem || it.value) {
-                map2.items.push({ start, key: fs18, sep: [] });
+                map2.items.push({ start, key: fs19, sep: [] });
                 this.onKeyLine = true;
               } else if (it.sep) {
-                this.stack.push(fs18);
+                this.stack.push(fs19);
               } else {
-                Object.assign(it, { key: fs18, sep: [] });
+                Object.assign(it, { key: fs19, sep: [] });
                 this.onKeyLine = true;
               }
               return;
@@ -7063,13 +7063,13 @@ var require_parser = __commonJS({
             case "scalar":
             case "single-quoted-scalar":
             case "double-quoted-scalar": {
-              const fs18 = this.flowScalar(this.type);
+              const fs19 = this.flowScalar(this.type);
               if (!it || it.value)
-                fc.items.push({ start: [], key: fs18, sep: [] });
+                fc.items.push({ start: [], key: fs19, sep: [] });
               else if (it.sep)
-                this.stack.push(fs18);
+                this.stack.push(fs19);
               else
-                Object.assign(it, { key: fs18, sep: [] });
+                Object.assign(it, { key: fs19, sep: [] });
               return;
             }
             case "flow-map-end":
@@ -8916,8 +8916,8 @@ var require_src = __commonJS({
 });
 
 // ../argent-cli/src/run.ts
-import * as fs11 from "node:fs";
-import * as path16 from "node:path";
+import * as fs12 from "node:fs";
+import * as path17 from "node:path";
 
 // ../argent-tools-client/src/launcher.ts
 import * as net from "node:net";
@@ -8958,7 +8958,7 @@ function generateAuthToken() {
   return generateToken();
 }
 function findFreePort() {
-  return new Promise((resolve12, reject) => {
+  return new Promise((resolve13, reject) => {
     const srv = net.createServer();
     srv.listen(0, "127.0.0.1", () => {
       const addr = srv.address();
@@ -8969,7 +8969,7 @@ function findFreePort() {
       const port = addr.port;
       srv.close((err) => {
         if (err) reject(err);
-        else resolve12(port);
+        else resolve13(port);
       });
     });
     srv.on("error", reject);
@@ -9070,7 +9070,7 @@ function killSpawnedChild(child, pid) {
   }
 }
 function spawnToolsServer(paths, port, options = {}) {
-  return new Promise((resolve12, reject) => {
+  return new Promise((resolve13, reject) => {
     let logFd;
     try {
       fs.mkdirSync(STATE_DIR, { recursive: true });
@@ -9116,7 +9116,7 @@ function spawnToolsServer(paths, port, options = {}) {
         rl.close();
         child.stdout?.resume();
         child.stdout?.unref?.();
-        settle2(() => resolve12({ port: actualPort, pid }));
+        settle2(() => resolve13({ port: actualPort, pid }));
       }
     });
     child.on("error", (err) => {
@@ -9430,10 +9430,11 @@ async function ensureToolsServer(paths) {
 }
 
 // ../argent-tools-client/src/tools-client.ts
-import * as path6 from "node:path";
+import * as path7 from "node:path";
 
 // ../registry/src/types.ts
 var LINKED_CALL_HEADER = "x-argent-linked";
+var E2E_DIR_CLIENT_HEADER = "x-argent-e2e-dir";
 
 // ../registry/src/artifacts.ts
 import { stat } from "node:fs/promises";
@@ -9471,19 +9472,98 @@ function toolStepFiles(specs, args) {
   }
   return files;
 }
-function isClientFileArgument({ spec, path: path24 }) {
-  return spec.kind === "file" && spec.path === `\${${spec.target}}` && path24.startsWith("/") && hasToolFileExtension(path24);
+function isClientFileArgument({ spec, path: path25 }) {
+  return spec.kind === "file" && spec.path === `\${${spec.target}}` && path25.startsWith("/") && hasToolFileExtension(path25);
 }
 
 // ../registry/src/flow-file-refs.ts
+import * as fs3 from "node:fs/promises";
+import * as path3 from "node:path";
+
+// ../registry/src/e2e-dirs.ts
 import * as fs2 from "node:fs/promises";
 import * as path2 from "node:path";
+var E2E_DIR = path2.join(".argent", "e2e");
+var LEGACY_E2E_DIRS = Object.freeze([path2.join(".argent", "flows")]);
+var E2E_DIRS = Object.freeze([E2E_DIR, ...LEGACY_E2E_DIRS]);
+function e2eDirFor(projectRoot) {
+  return path2.join(projectRoot, E2E_DIR);
+}
+function e2eDirsFor(projectRoot) {
+  return E2E_DIRS.map((dir) => path2.join(projectRoot, dir));
+}
+function e2eFileCandidates(projectRoot, name) {
+  return e2eDirsFor(projectRoot).map((dir) => path2.join(dir, `${name}.yaml`));
+}
+async function exists(file2) {
+  return fs2.stat(file2).then(
+    () => true,
+    () => false
+  );
+}
+async function pickE2eFile(candidates) {
+  for (let i2 = 0; i2 < candidates.length; i2++) {
+    if (!await exists(candidates[i2])) continue;
+    let shadowed;
+    for (const later of candidates.slice(i2 + 1)) {
+      if (await exists(later)) {
+        shadowed = later;
+        break;
+      }
+    }
+    return {
+      path: candidates[i2],
+      exists: true,
+      legacy: i2 > 0,
+      ...shadowed === void 0 ? {} : { shadowed }
+    };
+  }
+  return { path: candidates[0], exists: false, legacy: false };
+}
+function resolveE2eFile(projectRoot, name) {
+  return pickE2eFile(e2eFileCandidates(projectRoot, name));
+}
+function e2eShadowWarning(used, shadowed) {
+  return `${shadowed} is not used: ${used} has the same name and is read first.`;
+}
+var E2E_DIR_NAMES = E2E_DIRS.map((dir) => path2.basename(dir));
+function e2eDirProject(dir) {
+  const trimmed = dir.length > 1 ? dir.replace(/[\\/]+$/, "") : dir;
+  const argent = path2.dirname(trimmed);
+  if (!E2E_DIR_NAMES.includes(path2.basename(trimmed)) || path2.basename(argent) !== ".argent") {
+    return null;
+  }
+  return path2.dirname(argent);
+}
+function e2eRunFallbackDirs(anchorDir, target) {
+  if (target.includes("/") || target.includes("\\")) return [];
+  const project = e2eDirProject(anchorDir);
+  if (project === null) return [];
+  const anchor2 = path2.resolve(anchorDir);
+  return e2eDirsFor(project).filter((dir) => path2.resolve(dir) !== anchor2);
+}
+
+// ../registry/src/tool-ids.ts
+var TOOL_ID_ALIASES = Object.freeze({
+  "flow-start-recording": "e2e-start-recording",
+  "flow-add-step": "e2e-add-step",
+  "flow-add-echo": "e2e-add-echo",
+  "flow-add-script": "e2e-add-script",
+  "flow-finish-recording": "e2e-finish-recording",
+  "flow-read-prerequisite": "e2e-read-prerequisite",
+  "flow-execute": "e2e-execute"
+});
+function canonicalToolId(id) {
+  return Object.hasOwn(TOOL_ID_ALIASES, id) ? TOOL_ID_ALIASES[id] : id;
+}
+
+// ../registry/src/flow-file-refs.ts
 async function canonicalFlowPath(p) {
   try {
-    return await fs2.realpath(p);
+    return await fs3.realpath(p);
   } catch {
     try {
-      return path2.join(await fs2.realpath(path2.dirname(p)), path2.basename(p));
+      return path3.join(await fs3.realpath(path3.dirname(p)), path3.basename(p));
     } catch {
       return p;
     }
@@ -9492,7 +9572,7 @@ async function canonicalFlowPath(p) {
 function completeRunExtension(value) {
   if (value.endsWith(".yaml")) return value;
   const candidate = `${value}.yaml`;
-  return FLOW_FILE_NAME_PATTERN.test(path2.posix.basename(candidate)) ? candidate : value;
+  return FLOW_FILE_NAME_PATTERN.test(path3.posix.basename(candidate)) ? candidate : value;
 }
 var MAX_RUN_DEPTH = 20;
 var MAX_BLOCK_NESTING = 64;
@@ -9511,16 +9591,16 @@ function collectFlowRequests(doc) {
     for (const step of steps) {
       if (!isRecord(step)) continue;
       const run2 = step.run;
-      if (typeof run2 === "string" && !run2.includes("\\") && !path2.posix.isAbsolute(run2) && !/^[A-Za-z]:/.test(run2)) {
+      if (typeof run2 === "string" && !run2.includes("\\") && !path3.posix.isAbsolute(run2) && !/^[A-Za-z]:/.test(run2)) {
         const target = completeRunExtension(run2);
-        if (FLOW_FILE_NAME_PATTERN.test(path2.posix.basename(target))) runTargets.add(target);
+        if (FLOW_FILE_NAME_PATTERN.test(path3.posix.basename(target))) runTargets.add(target);
       }
       const snapshot = isRecord(step.snapshot) ? step.snapshot.name : step.snapshot;
       if (typeof snapshot === "string" && FLOW_NAME_PATTERN.test(snapshot)) snapshots.add(snapshot);
       if (typeof step.tool === "string") {
         const args = isRecord(step.args) ? step.args : {};
         toolSteps.push({ tool: step.tool, args });
-        const target = step.tool === "flow-execute" ? nestedFlowTarget(args) : void 0;
+        const target = canonicalToolId(step.tool) === "e2e-execute" ? nestedFlowTarget(args) : void 0;
         if (target !== void 0) nested.push({ target, args });
       }
       visit2(step.steps, depth + 1);
@@ -9530,14 +9610,14 @@ function collectFlowRequests(doc) {
   return { runTargets: [...runTargets], snapshots: [...snapshots], toolSteps, nested };
 }
 function baselineKeyFor(canonicalPath, flowName) {
-  const stem = path2.basename(canonicalPath, ".yaml");
+  const stem = path3.basename(canonicalPath, ".yaml");
   return FLOW_NAME_PATTERN.test(stem) ? stem : flowName;
 }
 function flowMemberKey(anchorDir, target) {
   return `${anchorDir}\0${target}`;
 }
 async function classifyOnDiskSpelling(dir, base, addressable = FLOW_FILE_NAME_PATTERN) {
-  const entries = await fs2.readdir(dir).catch(() => null);
+  const entries = await fs3.readdir(dir).catch(() => null);
   if (entries === null || entries.includes(base)) return { state: "listed" };
   const actual = entries.find((entry) => entry.toLowerCase() === base.toLowerCase());
   if (actual === void 0) return { state: "absent" };
@@ -9549,19 +9629,15 @@ function nestedFlowTarget(args) {
   if (flowPath === void 0) {
     if (typeof name !== "string" || !FLOW_NAME_PATTERN.test(name)) return void 0;
     if (!isResolvedAbsolute(projectRoot)) return void 0;
-    return {
-      kind: "name",
-      projectRoot,
-      name,
-      path: path2.join(projectRoot, ".argent", "flows", `${name}.yaml`)
-    };
+    const paths = e2eFileCandidates(projectRoot, name);
+    return { kind: "name", projectRoot, name, path: paths[0], paths };
   }
   if (name !== void 0 || !isResolvedAbsolute(flowPath)) return void 0;
-  if (!FLOW_FILE_NAME_PATTERN.test(path2.basename(flowPath))) return void 0;
+  if (!FLOW_FILE_NAME_PATTERN.test(path3.basename(flowPath))) return void 0;
   return { kind: "flow_path", path: flowPath };
 }
 function isResolvedAbsolute(value) {
-  return typeof value === "string" && path2.isAbsolute(value) && !value.split(/[\\/]+/).includes("..");
+  return typeof value === "string" && path3.isAbsolute(value) && !value.split(/[\\/]+/).includes("..");
 }
 
 // ../registry/src/failure-codes.ts
@@ -10743,10 +10819,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path24) {
-  if (!path24)
+function getElementAtPath(obj, path25) {
+  if (!path25)
     return obj;
-  return path24.reduce((acc, key) => acc?.[key], obj);
+  return path25.reduce((acc, key) => acc?.[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -11086,11 +11162,11 @@ function explicitlyAborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path24, issues) {
+function prefixIssues(path25, issues) {
   return issues.map((iss) => {
     var _a3;
     (_a3 = iss).path ?? (_a3.path = []);
-    iss.path.unshift(path24);
+    iss.path.unshift(path25);
     return iss;
   });
 }
@@ -11552,16 +11628,16 @@ function flattenError(error63, mapper = (issue2) => issue2.message) {
 }
 function formatError(error63, mapper = (issue2) => issue2.message) {
   const fieldErrors = { _errors: [] };
-  const processError = (error64, path24 = []) => {
+  const processError = (error64, path25 = []) => {
     for (const issue2 of error64.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path24, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path25, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path24, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path25, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path24, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path25, ...issue2.path]);
       } else {
-        const fullpath = [...path24, ...issue2.path];
+        const fullpath = [...path25, ...issue2.path];
         if (fullpath.length === 0) {
           fieldErrors._errors.push(mapper(issue2));
         } else {
@@ -11600,17 +11676,17 @@ function formatError(error63, mapper = (issue2) => issue2.message) {
 }
 function treeifyError(error63, mapper = (issue2) => issue2.message) {
   const result = { errors: [] };
-  const processError = (error64, path24 = []) => {
+  const processError = (error64, path25 = []) => {
     var _a3;
     for (const issue2 of error64.issues) {
       if (issue2.code === "invalid_union" && issue2.errors.length) {
-        issue2.errors.map((issues) => processError({ issues }, [...path24, ...issue2.path]));
+        issue2.errors.map((issues) => processError({ issues }, [...path25, ...issue2.path]));
       } else if (issue2.code === "invalid_key") {
-        processError({ issues: issue2.issues }, [...path24, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path25, ...issue2.path]);
       } else if (issue2.code === "invalid_element") {
-        processError({ issues: issue2.issues }, [...path24, ...issue2.path]);
+        processError({ issues: issue2.issues }, [...path25, ...issue2.path]);
       } else {
-        const fullpath = [...path24, ...issue2.path];
+        const fullpath = [...path25, ...issue2.path];
         if (fullpath.length === 0) {
           result.errors.push(mapper(issue2));
           continue;
@@ -11649,8 +11725,8 @@ function treeifyError(error63, mapper = (issue2) => issue2.message) {
 }
 function toDotPath(_path) {
   const segs = [];
-  const path24 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
-  for (const seg of path24) {
+  const path25 = _path.map((seg) => typeof seg === "object" ? seg.key : seg);
+  for (const seg of path25) {
     if (typeof seg === "number")
       segs.push(`[${seg}]`);
     else if (typeof seg === "symbol")
@@ -14993,7 +15069,7 @@ var recursive = /* @__PURE__ */ new WeakMap();
 var NONE = 0;
 var ASSUMED = 1;
 var PROVEN = 2;
-function isRecursive(inst, stack, resolve12) {
+function isRecursive(inst, stack, resolve13) {
   const cached3 = recursive.get(inst);
   if (cached3 !== void 0)
     return cached3 ? PROVEN : NONE;
@@ -15003,7 +15079,7 @@ function isRecursive(inst, stack, resolve12) {
   let result = NONE;
   const check2 = (child) => {
     if (result !== PROVEN && child?._zod) {
-      const answer = isRecursive(child, stack, resolve12);
+      const answer = isRecursive(child, stack, resolve13);
       if (answer > result)
         result = answer;
     }
@@ -15014,7 +15090,7 @@ function isRecursive(inst, stack, resolve12) {
       const desc = Object.getOwnPropertyDescriptor(sh, key);
       if (spread && !desc.enumerable)
         continue;
-      const child = desc.get ? ASSUMED : desc.value?._zod ? isRecursive(desc.value, stack, resolve12) : NONE;
+      const child = desc.get ? ASSUMED : desc.value?._zod ? isRecursive(desc.value, stack, resolve13) : NONE;
       if (child > answer)
         answer = child;
     }
@@ -15078,7 +15154,7 @@ function isRecursive(inst, stack, resolve12) {
       break;
     // `$ZodLazy` caches its inner on the def, so a resolved edge is followed exactly
     case "lazy": {
-      const inner = def._cachedInner ?? (resolve12 ? inst._zod.innerType : void 0);
+      const inner = def._cachedInner ?? (resolve13 ? inst._zod.innerType : void 0);
       merge2(inner ? isRecursive(inner, stack, false) : ASSUMED);
       break;
     }
@@ -28788,13 +28864,13 @@ function resolveRef(ref, ctx) {
   if (!ref.startsWith("#")) {
     throw new Error("External $ref is not supported, only local refs (#/...) are allowed");
   }
-  const path24 = ref.slice(1).split("/").filter(Boolean);
-  if (path24.length === 0) {
+  const path25 = ref.slice(1).split("/").filter(Boolean);
+  if (path25.length === 0) {
     return ctx.rootSchema;
   }
   const defsKey = ctx.version === "draft-2020-12" ? "$defs" : "definitions";
-  if (path24[0] === defsKey) {
-    const key = path24[1] === void 0 ? void 0 : decodeJSONPointerSegment(path24[1]);
+  if (path25[0] === defsKey) {
+    const key = path25[1] === void 0 ? void 0 : decodeJSONPointerSegment(path25[1]);
     if (!key || !ctx.defs[key]) {
       throw new Error(`Reference not found: ${ref}`);
     }
@@ -29647,9 +29723,9 @@ function date4(params) {
 import { randomUUID as randomUUID2 } from "node:crypto";
 import { AsyncLocalStorage } from "node:async_hooks";
 var resolvedDuringInvocation = new AsyncLocalStorage();
-function valueAtPath(root, path24) {
+function valueAtPath(root, path25) {
   let current = root;
-  for (const key of path24) {
+  for (const key of path25) {
     if (current === null || typeof current !== "object") return void 0;
     if (!Object.hasOwn(current, key)) return void 0;
     current = current[key];
@@ -29707,11 +29783,11 @@ function describeParamIssues(error63, params) {
 }
 
 // ../argent-tools-client/src/link-config.ts
-import * as path3 from "node:path";
+import * as path4 from "node:path";
 import { homedir as homedir2 } from "node:os";
 import { mkdir as mkdir2, writeFile as writeFile2, readFile as readFile2, unlink as unlink2, chmod as chmod2 } from "node:fs/promises";
-var LINK_DIR = path3.join(homedir2(), ".argent");
-var LINK_FILE = path3.join(LINK_DIR, "link.json");
+var LINK_DIR = path4.join(homedir2(), ".argent");
+var LINK_FILE = path4.join(LINK_DIR, "link.json");
 async function readLinkConfig() {
   try {
     const raw = await readFile2(LINK_FILE, "utf8");
@@ -29809,8 +29885,8 @@ function parseLinkTarget(input2) {
   const host = u3.hostname.startsWith("[") ? u3.hostname.slice(1, -1) : u3.hostname;
   if (!host) throw new Error(`URL "${input2}" is missing a host.`);
   const port = u3.port ? Number(u3.port) : u3.protocol === "https:" ? 443 : 80;
-  const path24 = u3.pathname === "/" ? "" : u3.pathname.replace(/\/+$/, "");
-  const url2 = `${u3.protocol}//${u3.host}${path24}`;
+  const path25 = u3.pathname === "/" ? "" : u3.pathname.replace(/\/+$/, "");
+  const url2 = `${u3.protocol}//${u3.host}${path25}`;
   const token = u3.username ? decodeURIComponent(u3.username) : void 0;
   return { url: url2, host, port, ...token ? { token } : {} };
 }
@@ -29826,22 +29902,22 @@ import {
   realpath as realpath2,
   rename as rename2,
   rm as rm2,
-  stat as stat2,
+  stat as stat3,
   writeFile as writeFile3
 } from "node:fs/promises";
 import { constants, tmpdir } from "node:os";
-import * as path4 from "node:path";
+import * as path5 from "node:path";
 
 // ../archive/src/index.ts
 import { execFile } from "node:child_process";
 import { rm, readdir as readdir3 } from "node:fs/promises";
-import { basename as basename3, dirname as dirname3, join as join4, posix as posix2, resolve as resolve2, sep as sep2 } from "node:path";
+import { basename as basename4, dirname as dirname4, join as join5, posix as posix2, resolve as resolve3, sep as sep2 } from "node:path";
 import { promisify } from "node:util";
 var execFileAsync = promisify(execFile);
 var ArchiveError = class extends Error {
 };
 function createTarGzArgs(sourcePath, target) {
-  return ["-czf", target, "-C", dirname3(sourcePath), basename3(sourcePath)];
+  return ["-czf", target, "-C", dirname4(sourcePath), basename4(sourcePath)];
 }
 async function createTarGzFile(sourcePath, tarPath) {
   try {
@@ -29863,8 +29939,8 @@ function isSafeTarMember(memberPath, destDir) {
   if (relative3 === ".." || relative3.startsWith("../") || relative3.split("/").includes("..")) {
     return false;
   }
-  const root = resolve2(destDir);
-  const resolved = resolve2(destDir, relative3);
+  const root = resolve3(destDir);
+  const resolved = resolve3(destDir, relative3);
   return resolved === root || resolved.startsWith(root + sep2);
 }
 async function listTarMembers(tarPath) {
@@ -29918,7 +29994,7 @@ async function assertSafeArchive(tarPath, destDir) {
 async function resolveMember(destDir, expectedName) {
   const entries = await readdir3(destDir);
   if (entries.includes(expectedName)) {
-    return join4(destDir, expectedName);
+    return join5(destDir, expectedName);
   }
   const real = entries.filter((e) => !e.startsWith("._"));
   if (real.length !== 1) {
@@ -29926,7 +30002,7 @@ async function resolveMember(destDir, expectedName) {
       `Could not identify the extracted member (expected "${expectedName}", found ${real.length} entries).`
     );
   }
-  return join4(destDir, real[0]);
+  return join5(destDir, real[0]);
 }
 async function safeExtractTarGz(tarPath, destDir, expectedName) {
   await assertSafeArchive(tarPath, destDir);
@@ -29964,6 +30040,16 @@ function interpolatePath(template, args) {
   });
   return missing ? null : out;
 }
+async function specPath(spec, args) {
+  if (spec.kind !== "file" || !spec.paths?.length) return interpolatePath(spec.path, args);
+  const candidates = [];
+  for (const template of spec.paths) {
+    const filled = interpolatePath(template, args);
+    if (filled === null) return null;
+    candidates.push(filled);
+  }
+  return (await pickE2eFile(candidates)).path;
+}
 var pendingArchives = /* @__PURE__ */ new Set();
 var ARCHIVE_SIGNALS = ["SIGINT", "SIGTERM", "SIGHUP"];
 function removePendingArchives() {
@@ -29999,9 +30085,9 @@ function untrackArchive(archive) {
   process.removeListener("exit", removePendingArchives);
 }
 function sha256File(filePath) {
-  return new Promise((resolve12, reject) => {
+  return new Promise((resolve13, reject) => {
     const hash2 = createHash2("sha256");
-    createReadStream(filePath).on("data", (chunk) => hash2.update(chunk)).on("end", () => resolve12(hash2.digest("hex"))).on("error", reject);
+    createReadStream(filePath).on("data", (chunk) => hash2.update(chunk)).on("end", () => resolve13(hash2.digest("hex"))).on("error", reject);
   });
 }
 function toolServerError(text2) {
@@ -30028,7 +30114,7 @@ function uploadFailure(url2, res, text2, bytes) {
   });
 }
 async function uploadTar(tarPath, endpoint, signal) {
-  const { size } = await stat2(tarPath);
+  const { size } = await stat3(tarPath);
   const init2 = {
     method: "POST",
     headers: {
@@ -30052,7 +30138,7 @@ async function uploadTar(tarPath, endpoint, signal) {
   return json2.uploadId;
 }
 async function uploadFile(sourcePath, endpoint, signal) {
-  const tarPath = path4.join(tmpdir(), `argent-upload-${randomUUID3()}.tar.gz`);
+  const tarPath = path5.join(tmpdir(), `argent-upload-${randomUUID3()}.tar.gz`);
   trackArchive(tarPath);
   try {
     await createTarGzFile(await realpath2(sourcePath), tarPath);
@@ -30067,7 +30153,7 @@ async function uploadFile(sourcePath, endpoint, signal) {
 async function readFileInputWire(filePath, opts) {
   let st;
   try {
-    st = await stat2(filePath);
+    st = await stat3(filePath);
   } catch {
     return null;
   }
@@ -30095,7 +30181,7 @@ async function prepareFileInputs(specs, args, opts) {
   for (const spec of specs) {
     if (spec.skipWhenSet && record2[spec.skipWhenSet] !== void 0) continue;
     if (spec.target in record2 && typeof record2[spec.target] !== "string") continue;
-    const filePath = interpolatePath(spec.path, record2);
+    const filePath = await specPath(spec, record2);
     if (filePath === null) continue;
     if (spec.target in record2 && record2[spec.target] !== filePath) continue;
     const wire = { [FILE_INPUT_MARKER2]: true, path: filePath };
@@ -30113,13 +30199,13 @@ async function prepareFileInputs(specs, args, opts) {
       wire.members = await opts.collectStepMembers(record2, opts);
     }
     if (spec.kind === "tar-upload") {
-      const st = await stat2(filePath).catch(() => null);
+      const st = await stat3(filePath).catch(() => null);
       if (st) {
         wire.size = st.size;
         wire.mtimeMs = st.mtimeMs;
       }
       if (opts.uploadEndpoint && st) {
-        process.stderr.write(`Uploading ${path4.basename(filePath)} to the remote tool-server...
+        process.stderr.write(`Uploading ${path5.basename(filePath)} to the remote tool-server...
 `);
         Object.assign(wire, await uploadFile(filePath, opts.uploadEndpoint, opts.signal));
       }
@@ -30130,18 +30216,18 @@ async function prepareFileInputs(specs, args, opts) {
   return out ?? args;
 }
 function isAllowedClientFilePath(p) {
-  if (!path4.isAbsolute(p)) return false;
+  if (!path5.isAbsolute(p)) return false;
   const segments = p.split(/[\\/]+/);
   if (segments.includes("..")) return false;
   const file2 = segments[segments.length - 1] ?? "";
   if (!FLOW_FILE_NAME_PATTERN.test(file2)) return false;
-  return segments[segments.length - 3] === ".argent" && segments[segments.length - 2] === "flows";
+  return e2eDirProject(segments.slice(0, -1).join("/")) !== null;
 }
 function isClientFileDirective2(value) {
   return !!value && typeof value === "object" && value[CLIENT_FILE_MARKER2] === true && typeof value.path === "string" && typeof value.content === "string";
 }
 async function replaceFile(target, bytes, mode) {
-  const temp = path4.join(path4.dirname(target), `.baseline-${randomUUID3()}.tmp`);
+  const temp = path5.join(path5.dirname(target), `.baseline-${randomUUID3()}.tmp`);
   try {
     await writeFile3(temp, bytes, { flag: "wx" });
     if (mode !== void 0) await chmod3(temp, mode & 511);
@@ -30152,27 +30238,27 @@ async function replaceFile(target, bytes, mode) {
   }
 }
 async function writeBaselineFile(file2, bytes, allowedDirs) {
-  if (!path4.isAbsolute(file2) || path4.normalize(file2) !== file2 || file2.split(/[\\/]/).includes("..") || !file2.endsWith(".png") || !allowedDirs.includes(path4.dirname(file2))) {
+  if (!path5.isAbsolute(file2) || path5.normalize(file2) !== file2 || file2.split(/[\\/]/).includes("..") || !file2.endsWith(".png") || !allowedDirs.includes(path5.dirname(file2))) {
     return allowedDirs.length === 0 ? "this call writes no baselines" : `${file2} is not a baseline of this call (${allowedDirs.map((d) => `${d}/<name>.png`).join(", ")})`;
   }
   if (bytes.length > MAX_CONTENT_BYTES) {
     return `${file2}: the baseline is larger than the 32 MiB cap on a file this client writes`;
   }
-  const dir = path4.dirname(file2);
+  const dir = path5.dirname(file2);
   await mkdir3(dir, { recursive: true });
   const link2 = await lstat(file2).catch(() => null);
   const real = link2 === null ? null : await realpath2(file2).catch(() => null);
   if (link2 !== null && real === null) return `${file2} is a symbolic link to a missing file`;
   if (real !== null) {
     if (!real.endsWith(".png")) return `${file2} links to a file that is not a PNG file`;
-    if (path4.dirname(real) !== await realpath2(dir)) {
+    if (path5.dirname(real) !== await realpath2(dir)) {
       return `${file2} links outside its baseline directory`;
     }
   }
-  const existing = real === null ? null : await stat2(real);
+  const existing = real === null ? null : await stat3(real);
   if (existing !== null && !existing.isFile()) return `${file2} is not a regular file`;
   await replaceFile(
-    real ?? path4.join(await realpath2(dir), path4.basename(file2)),
+    real ?? path5.join(await realpath2(dir), path5.basename(file2)),
     bytes,
     existing?.mode
   );
@@ -30198,7 +30284,7 @@ async function applyClientFileDirectives(result, opts = {}) {
     if (isClientFileDirective2(value)) {
       if (!isAllowedClientFilePath(value.path)) return null;
       try {
-        await mkdir3(path4.dirname(value.path), { recursive: true });
+        await mkdir3(path5.dirname(value.path), { recursive: true });
         await writeFile3(value.path, value.content, "utf8");
         written.push(value.path);
         return value.path;
@@ -30226,12 +30312,14 @@ async function applyClientFileDirectives(result, opts = {}) {
 
 // ../argent-tools-client/src/flow-files.ts
 var import_yaml = __toESM(require_dist(), 1);
-import { readdir as readdir4, readFile as readFile4, realpath as realpath3, stat as stat3 } from "node:fs/promises";
-import * as path5 from "node:path";
+import { readdir as readdir4, readFile as readFile4, realpath as realpath3, stat as stat4 } from "node:fs/promises";
+import * as path6 from "node:path";
 var INLINE_MEMBERS_BYTES = 256 * 1024;
-var FLOW_FILES_LOG_ENV = "ARGENT_FLOW_FILES_LOG";
+function filesLogEnabled() {
+  return (process.env.ARGENT_E2E_FILES_LOG ?? process.env.ARGENT_FLOW_FILES_LOG) === "1";
+}
 function isWithin(inner, outer) {
-  return inner === outer || inner.startsWith(outer.endsWith(path5.sep) ? outer : outer + path5.sep);
+  return inner === outer || inner.startsWith(outer.endsWith(path6.sep) ? outer : outer + path6.sep);
 }
 function printable(text2) {
   return [...text2].map(
@@ -30239,23 +30327,21 @@ function printable(text2) {
   ).join("");
 }
 function isResolvedAbsolute2(value) {
-  return typeof value === "string" && path5.isAbsolute(value) && !value.split(/[\\/]+/).includes("..");
+  return typeof value === "string" && path6.isAbsolute(value) && !value.split(/[\\/]+/).includes("..");
 }
 function namesValidFlow(args) {
   const { project_root, flow_path, name } = args;
   if (!isResolvedAbsolute2(project_root)) return false;
   if (name === void 0) {
-    return isResolvedAbsolute2(flow_path) && FLOW_FILE_NAME_PATTERN.test(path5.basename(flow_path));
+    return isResolvedAbsolute2(flow_path) && FLOW_FILE_NAME_PATTERN.test(path6.basename(flow_path));
   }
   return flow_path === void 0 && typeof name === "string" && FLOW_NAME_PATTERN.test(name);
 }
 function savedFlowProject(file2) {
-  if (!path5.isAbsolute(file2)) return null;
-  const parts = file2.split(path5.sep);
-  for (let i2 = parts.length - 3; i2 >= 0; i2--) {
-    if (parts[i2] === ".argent" && parts[i2 + 1] === "flows") {
-      return parts.slice(0, i2).join(path5.sep) || path5.sep;
-    }
+  if (!path6.isAbsolute(file2)) return null;
+  for (let dir = path6.dirname(file2); dir !== path6.dirname(dir); dir = path6.dirname(dir)) {
+    const project = e2eDirProject(dir);
+    if (project !== null) return project;
   }
   return null;
 }
@@ -30268,11 +30354,11 @@ async function landing(spelled) {
     const canonical = await canonicalFlowPath(spelled);
     let at = spelled;
     for (; ; ) {
-      const parent = path5.dirname(at);
+      const parent = path6.dirname(at);
       if (parent === at) return { canonical, fence: spelled, ...failure2 };
       const real = await realpath3(parent).catch(() => null);
       if (real !== null) {
-        return { canonical, fence: path5.join(real, path5.basename(at)), ...failure2 };
+        return { canonical, fence: path6.join(real, path6.basename(at)), ...failure2 };
       }
       at = parent;
     }
@@ -30280,10 +30366,10 @@ async function landing(spelled) {
 }
 async function closureRoots(rootPath, rootCanonical, projectRoot) {
   const candidates = [];
-  if (typeof projectRoot === "string" && path5.isAbsolute(projectRoot)) {
-    candidates.push(projectRoot, path5.join(projectRoot, ".argent", "flows"));
+  if (typeof projectRoot === "string" && path6.isAbsolute(projectRoot)) {
+    candidates.push(projectRoot, ...e2eDirsFor(projectRoot));
   }
-  candidates.push(path5.dirname(rootPath), path5.dirname(rootCanonical));
+  candidates.push(path6.dirname(rootPath), path6.dirname(rootCanonical));
   for (const file2 of [rootPath, rootCanonical]) {
     const project = savedFlowProject(file2);
     if (project !== null) candidates.push(project);
@@ -30296,11 +30382,11 @@ async function closureRoots(rootPath, rootCanonical, projectRoot) {
   return real.filter((root) => !real.some((other) => other !== root && isWithin(root, other)));
 }
 async function readFlowMember(anchorDir, target, roots, budget, opts) {
-  const spelled = anchorDir + path5.sep + target;
+  const spelled = anchorDir + path6.sep + target;
   const { canonical, fence, missing, error: error63 } = await landing(spelled);
   const spelling = await classifyOnDiskSpelling(
-    path5.dirname(spelled),
-    path5.posix.basename(target),
+    path6.dirname(spelled),
+    path6.posix.basename(target),
     FLOW_FILE_NAME_PATTERN
   );
   const member = {
@@ -30319,13 +30405,13 @@ async function readFlowMember(anchorDir, target, roots, budget, opts) {
   }
   if (error63 !== void 0) return refuse(error63);
   if (missing) return { member: { ...member, state: "missing" }, sent: "missing" };
-  const st = await stat3(canonical).catch((err) => err);
+  const st = await stat4(canonical).catch((err) => err);
   if (st instanceof Error) {
     if (st.code !== "ENOENT") return refuse(st.message);
     return { member: { ...member, state: "missing" }, sent: "missing" };
   }
   if (st.isDirectory()) return refuse("EISDIR: illegal operation on a directory, read");
-  if (!/\.ya?ml$/i.test(path5.basename(canonical))) {
+  if (!/\.ya?ml$/i.test(path6.basename(canonical))) {
     return refuse(`${target} links to a file that is not a YAML file`);
   }
   const sent = await sendBytes(member, canonical, budget, opts);
@@ -30344,7 +30430,7 @@ async function readToolMember(file2, roots, budget, opts) {
   if (!hasToolFileExtension(canonical)) {
     return refuse(`${file2} links to a file that is not one of ${TOOL_FILE_EXTENSIONS.join(", ")}`);
   }
-  const st = await stat3(canonical).catch((err) => err);
+  const st = await stat4(canonical).catch((err) => err);
   if (st instanceof Error) {
     if (st.code === "ENOENT" || st.code === "ENOTDIR") {
       return { member: { ...member, state: "missing" }, sent: "missing" };
@@ -30368,7 +30454,7 @@ async function baselineEntry(file2, roots, forWrite) {
     };
   }
   if (error63 !== void 0) return { state: "refused", error: error63 };
-  const st = await stat3(canonical).catch((err) => err);
+  const st = await stat4(canonical).catch((err) => err);
   if (st instanceof Error) {
     if (st.code !== "ENOENT") return { state: "refused", error: st.message };
     return forWrite ? { state: "refused", error: `${file2} is a symbolic link to a missing file` } : { state: "missing" };
@@ -30418,7 +30504,7 @@ function memberCollector(roots, opts) {
   const runs = /* @__PURE__ */ new Set();
   const baselineDirs = /* @__PURE__ */ new Map();
   const budget = { inline: 0 };
-  const logging = process.env[FLOW_FILES_LOG_ENV] === "1";
+  const logging = filesLogEnabled();
   const log2 = opts.log ?? ((line) => void process.stderr.write(`${line}
 `));
   const emit = (member, sent) => {
@@ -30426,18 +30512,19 @@ function memberCollector(roots, opts) {
     const subject = member.role === "flow" ? member.canonical : member.key;
     if (logging) log2(printable(`[flow-files] ${member.role} ${subject}: ${sent}`));
   };
-  async function flow2(anchorDir, target) {
+  async function flow(anchorDir, target, onlyPresent) {
     const key = flowMemberKey(anchorDir, target);
     const known = flows.get(key);
-    if (known !== void 0) return known;
+    if (known !== void 0) return onlyPresent && known.text === void 0 ? void 0 : known;
     const { member, text: text2, sent } = await readFlowMember(anchorDir, target, roots, budget, opts);
+    if (onlyPresent && text2 === void 0) return void 0;
     const entry = { member, ...text2 === void 0 ? {} : { text: text2 } };
     flows.set(key, entry);
     emit(member, sent);
     return entry;
   }
   async function toolFiles(step) {
-    if (step.tool === "flow-execute") return;
+    if (canonicalToolId(step.tool) === "e2e-execute") return;
     for (const file2 of toolStepFiles(opts.toolFileInputs?.(step.tool), step.args)) {
       const { unwrapWhenSet } = file2.spec;
       if (unwrapWhenSet !== void 0 && step.args[unwrapWhenSet] !== void 0) continue;
@@ -30447,11 +30534,31 @@ function memberCollector(roots, opts) {
       emit(read.member, read.sent);
     }
   }
+  async function savedTest(target) {
+    for (const candidate of target.paths) {
+      const found = await flow(path6.dirname(candidate), path6.basename(candidate), true);
+      if (found !== void 0) return found;
+    }
+    let first;
+    for (const candidate of target.paths) {
+      first ??= await flow(path6.dirname(candidate), path6.basename(candidate));
+    }
+    return first;
+  }
   async function nestedRun(target, hop, updates, platform) {
-    const { member, text: text2 } = await flow2(path5.dirname(target.path), `${target.name}.yaml`);
+    const { member, text: text2 } = await savedTest(target);
     if (text2 === void 0 || hop >= MAX_RUN_DEPTH) return void 0;
     return { canonical: member.canonical, text: text2, flowName: target.name, hop, updates, platform };
   }
+  async function runTarget(anchorDir, target) {
+    const found = await flow(anchorDir, target);
+    if (found.member.spelling?.state !== "absent") return found;
+    for (const dir of e2eRunFallbackDirs(anchorDir, target)) {
+      const other = await flow(dir, target, true);
+      if (other !== void 0) return other;
+    }
+    return found;
+  }
   async function walk(start) {
     const queue = [...start];
     for (let run2 = queue.shift(); run2 !== void 0; run2 = queue.shift()) {
@@ -30471,12 +30578,12 @@ function memberCollector(roots, opts) {
         const requests = collectFlowRequests(doc);
         for (const name of requests.snapshots) snapshots.add(name);
         for (const step of requests.toolSteps) await toolFiles(step);
-        const anchorDir = path5.dirname(file2.canonical);
+        const anchorDir = path6.dirname(file2.canonical);
         for (const target of requests.runTargets) {
           const key = flowMemberKey(anchorDir, target);
           if (visited.has(key)) continue;
           visited.add(key);
-          const { member, text: text2 } = await flow2(anchorDir, target);
+          const { member, text: text2 } = await runTarget(anchorDir, target);
           if (text2 !== void 0 && file2.hop + 1 < MAX_RUN_DEPTH) {
             files.push({ canonical: member.canonical, text: text2, hop: file2.hop + 1 });
           }
@@ -30493,8 +30600,8 @@ function memberCollector(roots, opts) {
         }
       }
       if (snapshots.size === 0) continue;
-      const dir = path5.join(
-        path5.dirname(run2.canonical),
+      const dir = path6.join(
+        path6.dirname(run2.canonical),
         "__baselines__",
         baselineKeyFor(run2.canonical, run2.flowName)
       );
@@ -30518,7 +30625,7 @@ function memberCollector(roots, opts) {
         if (!name.endsWith(".png")) continue;
         const compared = [...prefixes].some((prefix) => name.startsWith(prefix));
         if (!updates && !compared) continue;
-        const file2 = path5.join(dir, name);
+        const file2 = path6.join(dir, name);
         if (tools2.has(file2)) continue;
         const member = { role: "baseline", key: file2, path: file2 };
         const entry = await baselineEntry(file2, roots, updates && !compared);
@@ -30535,14 +30642,14 @@ function memberCollector(roots, opts) {
       }
     }
   }
-  return { members: members2, flow: flow2, toolFiles, nestedRun, walk, sendBaselines };
+  return { members: members2, flow, toolFiles, nestedRun, walk, sendBaselines };
 }
 async function collectFlowMembers(rootPath, rootBytes, args, opts) {
   if (!namesValidFlow(args)) return {};
   const canonical = await canonicalFlowPath(rootPath);
   const spelling = await classifyOnDiskSpelling(
-    path5.dirname(rootPath),
-    path5.basename(rootPath),
+    path6.dirname(rootPath),
+    path6.basename(rootPath),
     FLOW_FILE_NAME_PATTERN
   );
   const collector = memberCollector(
@@ -30553,7 +30660,7 @@ async function collectFlowMembers(rootPath, rootBytes, args, opts) {
     {
       canonical,
       text: rootBytes.toString("utf8"),
-      flowName: path5.basename(rootPath, ".yaml"),
+      flowName: path6.basename(rootPath, ".yaml"),
       hop: 0,
       updates: args.updateBaselines === true,
       platform: callPlatform(args)
@@ -30576,33 +30683,37 @@ function recordedStep(args) {
   if (typeof parsed !== "object" || parsed === null || Array.isArray(parsed)) return void 0;
   return { tool: command, args: parsed };
 }
-async function collectStepMembers(args, opts) {
+async function collectStepMembers(args, opts, recordingDirFor = e2eDirFor) {
   const { name, project_root: projectRoot } = args;
   const step = recordedStep(args);
-  if (typeof name !== "string" || !FLOW_NAME_PATTERN.test(name) || typeof projectRoot !== "string" || !path5.isAbsolute(projectRoot) || step === void 0) {
+  if (typeof name !== "string" || !FLOW_NAME_PATTERN.test(name) || typeof projectRoot !== "string" || !path6.isAbsolute(projectRoot) || step === void 0) {
     return [];
   }
-  const recording = path5.join(projectRoot, ".argent", "flows", `${name}.yaml`);
+  const recording = path6.join(recordingDirFor(projectRoot), `${name}.yaml`);
   const collector = memberCollector(
     await closureRoots(recording, (await landing(recording)).canonical, projectRoot),
     opts
   );
   await collector.toolFiles(step);
-  if (step.tool === "flow-execute") {
-    const self2 = await collector.flow(path5.dirname(recording), path5.basename(recording));
+  if (canonicalToolId(step.tool) === "e2e-execute") {
+    const self2 = await collector.flow(path6.dirname(recording), path6.basename(recording));
     let runArgs = step.args;
     const named = nestedFlowTarget(runArgs);
     if (named?.kind === "flow_path") {
-      const stem = path5.basename(named.path, ".yaml");
-      if (path5.resolve(path5.dirname(named.path)) === path5.resolve(path5.dirname(recording))) {
-        await collector.flow(path5.dirname(recording), path5.basename(named.path));
+      const stem = path6.basename(named.path, ".yaml");
+      const base = path6.basename(named.path);
+      const dir = path6.resolve(path6.dirname(named.path));
+      const recordingDir = path6.dirname(recording);
+      const dirs = [recordingDir, ...e2eRunFallbackDirs(recordingDir, base)];
+      if (dirs.some((d) => path6.resolve(d) === dir)) {
+        await collector.flow(path6.dirname(named.path), base);
         runArgs = { ...runArgs, name: stem };
         delete runArgs.flow_path;
       }
     }
     const target = nestedFlowTarget(runArgs);
     if (target?.kind === "name") {
-      await collector.flow(path5.dirname(self2.member.canonical), `${target.name}.yaml`);
+      await collector.flow(path6.dirname(self2.member.canonical), `${target.name}.yaml`);
       const run2 = await collector.nestedRun(
         target,
         0,
@@ -30615,6 +30726,43 @@ async function collectStepMembers(args, opts) {
   await collector.sendBaselines();
   return collector.members;
 }
+async function nameToE2ePathForOlderServer(tool, fileInputs, args) {
+  const id = canonicalToolId(tool);
+  if (id !== "e2e-execute" && id !== "e2e-read-prerequisite") return args;
+  const spec = fileInputs?.find((s) => s.target === "flow_file");
+  if (spec === void 0 || spec.kind !== "file" || spec.paths?.length) return args;
+  const target = nestedFlowTarget(args);
+  if (target?.kind !== "name") return 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 };
+}
+async function stepForOlderServer(args, listedId) {
+  if (typeof args !== "object" || args === null || Array.isArray(args)) return args;
+  const record2 = args;
+  if (typeof record2.command !== "string") return args;
+  const command = listedId(record2.command) ?? record2.command;
+  const step = recordedStep({ ...record2, command });
+  const target = step && canonicalToolId(step.tool) === "e2e-execute" && nestedFlowTarget(step.args);
+  if (target && target.kind === "name") {
+    const picked = await pickE2eFile(target.paths);
+    if (picked.exists && !picked.legacy) {
+      throw new Error(
+        `Cannot record a nested ${record2.command} of "${target.name}": the tool-server runs an older argent that records and runs nested e2e tests only from .argent/flows/, and "${target.name}" is ${picked.path}. Upgrade the tool-server to record it, or run it with e2e-execute outside the recording.`
+      );
+    }
+  }
+  return command === record2.command ? args : { ...record2, command };
+}
+async function e2eShadowWarningFor(tool, args) {
+  const id = canonicalToolId(tool);
+  if (id !== "e2e-execute" && id !== "e2e-read-prerequisite") return void 0;
+  const target = nestedFlowTarget(args);
+  if (target?.kind !== "name") return void 0;
+  const picked = await pickE2eFile(target.paths);
+  return picked.shadowed === void 0 ? void 0 : e2eShadowWarning(picked.path, picked.shadowed);
+}
 
 // ../argent-tools-client/src/tools-client.ts
 function authHeaders2(token) {
@@ -30692,6 +30840,10 @@ function errorBodyMessage(body) {
   if (Array.isArray(body.issues) && typeof body.message === "string") return body.message;
   return body.error ?? body.message;
 }
+function findTool(tools2, name) {
+  const id = canonicalToolId(name);
+  return tools2.find((t2) => t2.name === name) ?? tools2.find((t2) => canonicalToolId(t2.name) === id) ?? null;
+}
 function assertRequiredPresent(meta3, args) {
   const record2 = typeof args === "object" && args !== null ? args : {};
   const schema = meta3.inputSchema;
@@ -30767,26 +30919,33 @@ function createToolsClient(options = {}) {
     return json2.tools;
   }
   async function fetchTool(name, opts) {
-    const tools2 = await fetchTools(opts);
-    return tools2.find((t2) => t2.name === name) ?? null;
+    return findTool(await fetchTools(opts), name);
   }
   async function callTool(name, args, opts) {
     opts?.signal?.throwIfAborted();
     const { url: url2, token, remote } = await route();
     let finalArgs = args;
     const tools2 = await fetchTools({ signal: opts?.signal });
-    const meta3 = tools2.find((t2) => t2.name === name) ?? null;
+    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);
+    }
+    if (olderServer && canonicalToolId(meta3.name) === "e2e-add-step") {
+      finalArgs = await stepForOlderServer(finalArgs, (tool) => findTool(tools2, tool)?.name);
+    }
+    const shadowWarning = await e2eShadowWarningFor(name, args);
     const baselineDirs = [];
     if (meta3?.fileInputs?.length) {
-      if (remote) assertRequiredPresent(meta3, args);
-      finalArgs = await prepareFileInputs(meta3.fileInputs, args ?? {}, {
+      if (remote) assertRequiredPresent(meta3, finalArgs);
+      finalArgs = await prepareFileInputs(meta3.fileInputs, finalArgs ?? {}, {
         includeContent: remote,
         uploadEndpoint: remote ? { url: url2, token } : void 0,
         log: diagnose,
         baselineDirs,
         collectMembers: collectFlowMembers,
-        collectStepMembers,
-        toolFileInputs: (tool) => tools2.find((t2) => t2.name === tool)?.fileInputs,
+        collectStepMembers: olderServer ? (record2, o) => collectStepMembers(record2, o, (root) => path7.join(root, LEGACY_E2E_DIRS[0])) : collectStepMembers,
+        toolFileInputs: (tool) => findTool(tools2, tool)?.fileInputs,
         signal: opts?.signal
       });
     }
@@ -30795,19 +30954,23 @@ function createToolsClient(options = {}) {
       for (const { path: file2, error: error63 } of applied.failed) {
         diagnose(`The baseline ${file2} was not written on this client: ${error63}`);
       }
-      if (process.env.ARGENT_FLOW_FILES_LOG === "1") {
+      if (filesLogEnabled()) {
         for (const file2 of applied.written) {
-          if (baselineDirs.includes(path6.dirname(file2))) {
+          if (baselineDirs.includes(path7.dirname(file2))) {
             diagnose(`[flow-files] baseline ${file2}: written`);
           }
         }
       }
-      return applied.result;
+      const result = applied.result;
+      if (shadowWarning === void 0 || typeof result !== "object" || result === null || Array.isArray(result) || typeof result.warning === "string") {
+        return result;
+      }
+      return { ...result, warning: shadowWarning };
     };
     const stream = opts?.onProgress !== void 0 || carriesMembers(finalArgs);
     const sentOnce = carriesUpload(finalArgs);
     const res = await doFetch(
-      `${url2}/tools/${encodeURIComponent(name)}`,
+      `${url2}/tools/${encodeURIComponent(meta3?.name ?? name)}`,
       {
         method: "POST",
         headers: {
@@ -30815,6 +30978,9 @@ function createToolsClient(options = {}) {
           // Tells the tool-server the call came over a link, a link to
           // 127.0.0.1 included, which nothing else in the request shows.
           ...remote ? { [LINKED_CALL_HEADER]: "1" } : {},
+          // Tells the tool-server this client writes recordings under
+          // `.argent/e2e/`; an older client writes only `.argent/flows/`.
+          [E2E_DIR_CLIENT_HEADER]: "1",
           // A proxy that compresses the stream holds each line until its buffer
           // fills. `identity` keeps the stream uncompressed end to end.
           ...stream ? { "Accept": "application/x-ndjson", "Accept-Encoding": "identity" } : {},
@@ -30872,15 +31038,15 @@ function createToolsClient(options = {}) {
 }
 
 // ../argent-tools-client/src/artifacts.ts
-import { copyFile, mkdir as mkdir4, readFile as readFile5, realpath as realpath4, rm as rm3, stat as stat4, writeFile as writeFile4 } from "node:fs/promises";
+import { copyFile, mkdir as mkdir4, readFile as readFile5, realpath as realpath4, rm as rm3, stat as stat5, writeFile as writeFile4 } from "node:fs/promises";
 import { constants as fsConstants } from "node:fs";
 import { tmpdir as tmpdir2 } from "node:os";
-import { basename as basename6, dirname as dirname8, extname as extname2, isAbsolute as isAbsolute6, join as join11, normalize as normalize2, resolve as resolve7, sep as sep4 } from "node:path";
+import { basename as basename7, dirname as dirname9, extname as extname2, isAbsolute as isAbsolute6, join as join13, normalize as normalize2, resolve as resolve8, sep as sep4 } from "node:path";
 import { createHash as createHash3 } from "node:crypto";
 
 // ../configuration-core/src/flags.ts
-import * as fs3 from "node:fs";
-import * as path7 from "node:path";
+import * as fs4 from "node:fs";
+import * as path8 from "node:path";
 import { homedir as homedir3 } from "node:os";
 var FLAG_REGISTRY = [
   {
@@ -30922,31 +31088,31 @@ function getFlagDefinition(name, registry2 = FLAG_REGISTRY) {
 }
 var PROJECT_MARKERS = [".argent", ".git", "package.json"];
 function findProjectRoot(startDir) {
-  let current = path7.resolve(startDir);
+  let current = path8.resolve(startDir);
   while (true) {
     for (const marker of PROJECT_MARKERS) {
-      if (fs3.existsSync(path7.join(current, marker))) return current;
+      if (fs4.existsSync(path8.join(current, marker))) return current;
     }
-    const parent = path7.dirname(current);
+    const parent = path8.dirname(current);
     if (parent === current) return null;
     current = parent;
   }
 }
 function resolveProjectRoot(startDir) {
-  return findProjectRoot(startDir) ?? path7.resolve(startDir);
+  return findProjectRoot(startDir) ?? path8.resolve(startDir);
 }
 function getFlagsPath(scope, options = {}) {
   const home = options.homeDir ?? homedir3();
   if (scope === "global") {
-    return path7.join(home, ".argent", "flags.json");
+    return path8.join(home, ".argent", "flags.json");
   }
   const cwd = options.cwd ?? process.cwd();
-  return path7.join(resolveProjectRoot(cwd), ".argent", "flags.json");
+  return path8.join(resolveProjectRoot(cwd), ".argent", "flags.json");
 }
 function readFlagsFile(filePath) {
   let raw;
   try {
-    raw = fs3.readFileSync(filePath, "utf8");
+    raw = fs4.readFileSync(filePath, "utf8");
   } catch {
     return {};
   }
@@ -30967,20 +31133,20 @@ function readFlagsFile(filePath) {
 }
 function writeFlagsFile(filePath, flags2) {
   if (Object.keys(flags2).length === 0) {
-    if (fs3.existsSync(filePath)) fs3.rmSync(filePath, { force: true });
-    const parent = path7.dirname(filePath);
+    if (fs4.existsSync(filePath)) fs4.rmSync(filePath, { force: true });
+    const parent = path8.dirname(filePath);
     try {
-      if (fs3.existsSync(parent) && fs3.readdirSync(parent).length === 0) {
-        fs3.rmdirSync(parent);
+      if (fs4.existsSync(parent) && fs4.readdirSync(parent).length === 0) {
+        fs4.rmdirSync(parent);
       }
     } catch {
     }
     return;
   }
-  fs3.mkdirSync(path7.dirname(filePath), { recursive: true });
+  fs4.mkdirSync(path8.dirname(filePath), { recursive: true });
   const tmp = `${filePath}.${process.pid}.tmp`;
-  fs3.writeFileSync(tmp, JSON.stringify({ flags: flags2 }, null, 2) + "\n");
-  fs3.renameSync(tmp, filePath);
+  fs4.writeFileSync(tmp, JSON.stringify({ flags: flags2 }, null, 2) + "\n");
+  fs4.renameSync(tmp, filePath);
 }
 function readFlags(scope, options = {}) {
   return readFlagsFile(getFlagsPath(scope, options));
@@ -31009,7 +31175,7 @@ function isFlagEnabled(name, options = {}) {
 
 // ../configuration-core/src/paths.ts
 import * as os from "node:os";
-import * as path8 from "node:path";
+import * as path9 from "node:path";
 function nonEmpty(value) {
   if (value == void 0) return null;
   const trimmed = value.trim();
@@ -31020,26 +31186,26 @@ function resolveHomeDir(options = {}) {
   return process.platform === "win32" ? nonEmpty(process.env.USERPROFILE) ?? os.homedir() : nonEmpty(process.env.HOME) ?? os.homedir();
 }
 function argentHomeDir() {
-  return path8.join(resolveHomeDir(), ".argent");
+  return path9.join(resolveHomeDir(), ".argent");
 }
 function configDir(scope = "global", options = {}) {
   if (scope === "global") {
-    return path8.join(resolveHomeDir(options), ".argent");
+    return path9.join(resolveHomeDir(options), ".argent");
   }
   const cwd = options.cwd ?? process.cwd();
-  return path8.join(resolveProjectRoot(cwd), ".argent");
+  return path9.join(resolveProjectRoot(cwd), ".argent");
 }
 function configFilePath(scope = "global", options = {}) {
-  return path8.join(configDir(scope, options), "config.json");
+  return path9.join(configDir(scope, options), "config.json");
 }
 
 // ../configuration-core/src/config.ts
 import * as crypto from "node:crypto";
-import * as fs4 from "node:fs";
-import * as path9 from "node:path";
+import * as fs5 from "node:fs";
+import * as path10 from "node:path";
 function readConfigObject(scope = "global", options = {}) {
   try {
-    const raw = fs4.readFileSync(configFilePath(scope, options), "utf8");
+    const raw = fs5.readFileSync(configFilePath(scope, options), "utf8");
     const json2 = JSON.parse(raw);
     if (json2 && typeof json2 === "object" && !Array.isArray(json2)) {
       return json2;
@@ -31115,9 +31281,9 @@ function acquireConfigLock(finalPath) {
   const deadline = Date.now() + LOCK_MAX_WAIT_MS;
   for (; ; ) {
     try {
-      const fd = fs4.openSync(lockPath, "wx", 384);
+      const fd = fs5.openSync(lockPath, "wx", 384);
       try {
-        fs4.writeSync(fd, `${process.pid}
+        fs5.writeSync(fd, `${process.pid}
 `);
       } catch {
       }
@@ -31125,8 +31291,8 @@ function acquireConfigLock(finalPath) {
     } catch (err) {
       if (err.code !== "EEXIST") return null;
       try {
-        if (Date.now() - fs4.statSync(lockPath).mtimeMs > LOCK_STALE_MS2) {
-          fs4.unlinkSync(lockPath);
+        if (Date.now() - fs5.statSync(lockPath).mtimeMs > LOCK_STALE_MS2) {
+          fs5.unlinkSync(lockPath);
           continue;
         }
       } catch {
@@ -31138,35 +31304,35 @@ function acquireConfigLock(finalPath) {
 }
 function releaseConfigLock(lock) {
   try {
-    fs4.closeSync(lock.fd);
+    fs5.closeSync(lock.fd);
   } catch {
   }
   try {
-    fs4.unlinkSync(lock.lockPath);
+    fs5.unlinkSync(lock.lockPath);
   } catch {
   }
 }
 function updateConfig(mutate, scope = "global", options = {}) {
   const dir = configDir(scope, options);
-  fs4.mkdirSync(dir, { recursive: true });
+  fs5.mkdirSync(dir, { recursive: true });
   const finalPath = configFilePath(scope, options);
   const lock = acquireConfigLock(finalPath);
   try {
     const next = readConfigObject(scope, options);
     mutate(next);
-    const tmpPath = path9.join(dir, `.config.tmp.${process.pid}.${crypto.randomUUID()}`);
-    const fd = fs4.openSync(tmpPath, "wx", 384);
+    const tmpPath = path10.join(dir, `.config.tmp.${process.pid}.${crypto.randomUUID()}`);
+    const fd = fs5.openSync(tmpPath, "wx", 384);
     try {
-      fs4.writeSync(fd, JSON.stringify(next, null, 2) + "\n");
-      fs4.fsyncSync(fd);
+      fs5.writeSync(fd, JSON.stringify(next, null, 2) + "\n");
+      fs5.fsyncSync(fd);
     } finally {
-      fs4.closeSync(fd);
+      fs5.closeSync(fd);
     }
     try {
-      fs4.renameSync(tmpPath, finalPath);
+      fs5.renameSync(tmpPath, finalPath);
     } catch (err) {
       try {
-        fs4.unlinkSync(tmpPath);
+        fs5.unlinkSync(tmpPath);
       } catch {
       }
       throw err;
@@ -31178,8 +31344,8 @@ function updateConfig(mutate, scope = "global", options = {}) {
 
 // ../configuration-core/src/secrets.ts
 var import_dotenv = __toESM(require_dist2(), 1);
-import * as fs5 from "node:fs";
-import * as path10 from "node:path";
+import * as fs6 from "node:fs";
+import * as path11 from "node:path";
 var SECRET_ENV_PREFIX = "ARGENT_SECRET_";
 var SECRETS_FILE_NAME = "secrets.env";
 var SHARED_ENV_FILES = [".env.local", ".env"];
@@ -31208,10 +31374,10 @@ function fileSource(filePath, exposure) {
     names: [],
     values: /* @__PURE__ */ new Map()
   };
-  if (!fs5.statSync(filePath, { throwIfNoEntry: false })) return absent;
+  if (!fs6.statSync(filePath, { throwIfNoEntry: false })) return absent;
   let content;
   try {
-    content = fs5.readFileSync(filePath, "utf8");
+    content = fs6.readFileSync(filePath, "utf8");
   } catch {
     return absent;
   }
@@ -31241,20 +31407,20 @@ function secretSources(options = {}) {
   const filePaths = [];
   if (projectRoot) {
     filePaths.push({
-      path: path10.join(projectRoot, ".argent", SECRETS_FILE_NAME),
+      path: path11.join(projectRoot, ".argent", SECRETS_FILE_NAME),
       exposure: "dedicated"
     });
     for (const name of SHARED_ENV_FILES) {
-      filePaths.push({ path: path10.join(projectRoot, name), exposure: "shared" });
+      filePaths.push({ path: path11.join(projectRoot, name), exposure: "shared" });
     }
   }
   filePaths.push({
-    path: path10.join(resolveHomeDir(options), ".argent", SECRETS_FILE_NAME),
+    path: path11.join(resolveHomeDir(options), ".argent", SECRETS_FILE_NAME),
     exposure: "dedicated"
   });
   const seen = /* @__PURE__ */ new Set();
   for (const entry of filePaths) {
-    const resolved = path10.resolve(entry.path);
+    const resolved = path11.resolve(entry.path);
     if (seen.has(resolved)) continue;
     seen.add(resolved);
     sources.push(fileSource(resolved, entry.exposure));
@@ -31422,7 +31588,7 @@ var CONFIG_SCHEMA = [
   // nominal here — the project scope of a global-only key is never read.
   {
     key: "scripts.maxTimeoutMs",
-    description: `Upper bound, in milliseconds, on the time limit a flow \`script\` step may ask for (default 300000 \u2014 five minutes). Bounds how long one script can occupy the host. Values below ${MIN_SCRIPT_TIMEOUT_MS} ms are refused: the step starts a Node process before the script runs, so a smaller ceiling ends a script that did nothing wrong.`,
+    description: `Upper bound, in milliseconds, on the time limit an e2e test \`script\` step may ask for (default 300000 \u2014 five minutes). Bounds how long one script can occupy the host. Values below ${MIN_SCRIPT_TIMEOUT_MS} ms are refused: the step starts a Node process before the script runs, so a smaller ceiling ends a script that did nothing wrong.`,
     scopes: ["global"],
     parse: (raw) => {
       const value = asPositiveInteger(raw);
@@ -31435,7 +31601,7 @@ var CONFIG_SCHEMA = [
   },
   {
     key: "scripts.heapLimitMb",
-    description: `Old-space heap limit, in MiB, given to each flow \`script\` process (default 512). Values below ${MIN_SCRIPT_HEAP_LIMIT_MB} MiB are refused: that is already below what importing a real npm dependency needs, and under about 5 MiB the process dies inside V8's own startup before any script runs.`,
+    description: `Old-space heap limit, in MiB, given to each e2e test \`script\` process (default 512). Values below ${MIN_SCRIPT_HEAP_LIMIT_MB} MiB are refused: that is already below what importing a real npm dependency needs, and under about 5 MiB the process dies inside V8's own startup before any script runs.`,
     scopes: ["global"],
     parse: (raw) => {
       const value = asPositiveInteger(raw);
@@ -31452,7 +31618,7 @@ function getConfigDefinition(key, registry2 = CONFIG_SCHEMA) {
 }
 
 // ../configuration-core/src/config-access.ts
-import * as path11 from "node:path";
+import * as path12 from "node:path";
 function readScopeValue(def, scope, options) {
   if (!def.scopes.includes(scope)) return void 0;
   const raw = getAtPath(readConfigObject(scope, options), def.key);
@@ -31599,20 +31765,20 @@ function sanitizeSegment(segment) {
 function projectSlug() {
   const cwd = process.cwd();
   const hash2 = createHash3("sha1").update(cwd).digest("hex").slice(0, 6);
-  const name = sanitizeSegment(basename6(cwd)) || "root";
+  const name = sanitizeSegment(basename7(cwd)) || "root";
   return `${name}-${hash2}`;
 }
 function artifactsRoot() {
-  return process.env.ARGENT_ARTIFACTS_DIR ?? join11(tmpdir2(), "argent-artifacts");
+  return process.env.ARGENT_ARTIFACTS_DIR ?? join13(tmpdir2(), "argent-artifacts");
 }
 function artifactDir(deviceId) {
   const parts = [artifactsRoot(), projectSlug(), sessionId()];
   if (deviceId) parts.push(sanitizeSegment(deviceId));
-  return join11(...parts);
+  return join13(...parts);
 }
 function durableBaseDir() {
   const projectRoot = findProjectRoot(process.cwd());
-  return projectRoot ?? dirname8(argentHomeDir());
+  return projectRoot ?? dirname9(argentHomeDir());
 }
 var ALLOWED_SAVE_DIRS = /* @__PURE__ */ new Set([normalize2(".argent/recordings")]);
 var RECORDINGS_SAVE_DIR = normalize2(".argent/recordings");
@@ -31626,9 +31792,9 @@ function configuredRecordingsDir() {
   if (typeof value !== "string") return null;
   const trimmed = value.trim();
   if (trimmed === "") return null;
-  const home = dirname8(argentHomeDir());
-  const expanded = trimmed === "~" ? home : trimmed.startsWith("~/") || trimmed.startsWith(`~${sep4}`) ? join11(home, trimmed.slice(2)) : trimmed;
-  return resolve7(durableBaseDir(), expanded);
+  const home = dirname9(argentHomeDir());
+  const expanded = trimmed === "~" ? home : trimmed.startsWith("~/") || trimmed.startsWith(`~${sep4}`) ? join13(home, trimmed.slice(2)) : trimmed;
+  return resolve8(durableBaseDir(), expanded);
 }
 var MAX_DURABLE_BYTES = 2 * 1024 * 1024 * 1024;
 async function readCapped(res, cap) {
@@ -31661,10 +31827,10 @@ async function writeDurableUnique(dir, filename, write) {
   const stem = filename.slice(0, filename.length - ext.length);
   for (let i2 = 1; i2 <= 1e3; i2++) {
     const candidate = i2 === 1 ? filename : `${stem} (${i2})${ext}`;
-    const path24 = join11(dir, candidate);
+    const path25 = join13(dir, candidate);
     try {
-      await write(path24);
-      return path24;
+      await write(path25);
+      return path25;
     } catch (err) {
       if (err?.code === "EEXIST") continue;
       throw err;
@@ -31684,21 +31850,21 @@ function durableSaveTarget(handle) {
     if (configured) {
       return {
         dir: configured,
-        path: join11(configured, sanitizeSegment(handle.filename)),
+        path: join13(configured, sanitizeSegment(handle.filename)),
         base: configured,
         rel: ""
       };
     }
   }
   const base = durableBaseDir();
-  const dir = join11(base, rel);
-  return { dir, path: join11(dir, sanitizeSegment(handle.filename)), base, rel };
+  const dir = join13(base, rel);
+  return { dir, path: join13(dir, sanitizeSegment(handle.filename)), base, rel };
 }
 async function confineToRealBase(dir, base, rel) {
   try {
     const realDir = await realpath4(dir);
     const realBase = await realpath4(base);
-    return realDir === join11(realBase, rel);
+    return realDir === join13(realBase, rel);
   } catch {
     return false;
   }
@@ -31706,7 +31872,7 @@ async function confineToRealBase(dir, base, rel) {
 async function resolveLocalFile(handle) {
   if (!handle.hostPath) return null;
   try {
-    const st = await stat4(handle.hostPath);
+    const st = await stat5(handle.hostPath);
     if (handle.archive) {
       return st.isDirectory() ? handle.hostPath : null;
     }
@@ -31721,7 +31887,7 @@ async function resolveLocalFile(handle) {
   }
 }
 async function downloadAndExtractArchive(handle, data, dir) {
-  const tarball = join11(dir, `${sanitizeSegment(handle.filename)}.tar.gz`);
+  const tarball = join13(dir, `${sanitizeSegment(handle.filename)}.tar.gz`);
   try {
     await writeFile4(tarball, data);
     return await safeExtractTarGz(tarball, dir, handle.filename);
@@ -31749,7 +31915,7 @@ async function materializeArtifacts(result, ctx) {
       const localPath = await resolveLocalFile(value);
       const saveTarget = durableSaveTarget(value);
       if (saveTarget) {
-        const filename = basename6(saveTarget.path);
+        const filename = basename7(saveTarget.path);
         try {
           await mkdir4(saveTarget.dir, { recursive: true });
           if (!await confineToRealBase(saveTarget.dir, saveTarget.base, saveTarget.rel)) {
@@ -31813,7 +31979,7 @@ async function materializeArtifacts(result, ctx) {
           return await downloadAndExtractArchive(value, data, dir);
         }
         if (value.size > 0 && data.length !== value.size) return null;
-        const downloadedPath = join11(dir, sanitizeSegment(value.filename));
+        const downloadedPath = join13(dir, sanitizeSegment(value.filename));
         await writeFile4(downloadedPath, data);
         if (value.mimeType.startsWith("image/")) {
           images.push({ localPath: downloadedPath, data, mimeType: value.mimeType });
@@ -32270,8 +32436,8 @@ var Deferred = class {
   _resolve;
   _reject;
   constructor() {
-    this._promise = new Promise((resolve12, reject) => {
-      this._resolve = resolve12;
+    this._promise = new Promise((resolve13, reject) => {
+      this._resolve = resolve13;
       this._reject = reject;
     });
   }
@@ -33164,8 +33330,8 @@ var ExportOperation = class {
   _metrics;
   _exportScheduledResolve;
   constructor(exporter, logRecords, exportTimeoutMillis, metrics) {
-    this._exportScheduledPromise = new Promise((resolve12) => {
-      this._exportScheduledResolve = resolve12;
+    this._exportScheduledPromise = new Promise((resolve13) => {
+      this._exportScheduledResolve = resolve13;
     });
     this._exportCompleted = this._executeExport(exporter, logRecords, exportTimeoutMillis);
     this._metrics = metrics;
@@ -33190,7 +33356,7 @@ var ExportOperation = class {
     }
   }
   async _exportWithTimeout(exporter, logRecords, exportTimeoutMillis) {
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve13, reject) => {
       const timer = setTimeout(() => {
         reject(new Error("Timeout"));
       }, exportTimeoutMillis);
@@ -33198,7 +33364,7 @@ var ExportOperation = class {
         this._metrics.finishLogs(logRecords.length, result.error);
         clearTimeout(timer);
         if (result.code === ExportResultCode.SUCCESS) {
-          resolve12();
+          resolve13();
         } else {
           reject(result.error ?? new Error("BatchLogRecordProcessor: log record export failed"));
         }
@@ -33979,7 +34145,7 @@ function parseRetryAfterToMills(retryAfter) {
 var DEFAULT_USER_AGENT = `OTel-OTLP-Exporter-JavaScript/${VERSION4}`;
 var MAX_RESPONSE_BODY_SIZE = 4 * 1024 * 1024;
 function sendWithHttp(request, url2, headers, compression, userAgent, agent, data, timeoutMillis) {
-  return new Promise((resolve12) => {
+  return new Promise((resolve13) => {
     const parsedUrl = new URL(url2);
     if (userAgent) {
       headers["User-Agent"] = `${userAgent} ${DEFAULT_USER_AGENT}`;
@@ -33998,7 +34164,7 @@ function sendWithHttp(request, url2, headers, compression, userAgent, agent, dat
         responseSize += chunk.length;
         if (responseSize > MAX_RESPONSE_BODY_SIZE) {
           const sizeError = new Error(`OTLP export response body exceeded size limit of ${MAX_RESPONSE_BODY_SIZE} bytes`);
-          resolve12({ status: "failure", error: sizeError });
+          resolve13({ status: "failure", error: sizeError });
           res.destroy();
           return;
         }
@@ -34006,18 +34172,18 @@ function sendWithHttp(request, url2, headers, compression, userAgent, agent, dat
       });
       res.on("end", () => {
         if (res.statusCode && res.statusCode <= 299) {
-          resolve12({
+          resolve13({
             status: "success",
             data: Buffer.concat(responseData)
           });
         } else if (res.statusCode && isExportHTTPErrorRetryable(res.statusCode)) {
-          resolve12({
+          resolve13({
             status: "retryable",
             retryInMillis: parseRetryAfterToMills(res.headers["retry-after"])
           });
         } else {
           const error63 = new OTLPExporterError(res.statusMessage, res.statusCode, Buffer.concat(responseData).toString());
-          resolve12({
+          resolve13({
             status: "failure",
             error: error63
           });
@@ -34025,17 +34191,17 @@ function sendWithHttp(request, url2, headers, compression, userAgent, agent, dat
       });
       res.on("error", (error63) => {
         if (res.statusCode && res.statusCode <= 299) {
-          resolve12({
+          resolve13({
             status: "success"
           });
         } else if (res.statusCode && isExportHTTPErrorRetryable(res.statusCode)) {
-          resolve12({
+          resolve13({
             status: "retryable",
             error: error63,
             retryInMillis: parseRetryAfterToMills(res.headers["retry-after"])
           });
         } else {
-          resolve12({
+          resolve13({
             status: "failure",
             error: error63
           });
@@ -34044,26 +34210,26 @@ function sendWithHttp(request, url2, headers, compression, userAgent, agent, dat
     });
     req.setTimeout(timeoutMillis, () => {
       req.destroy();
-      resolve12({
+      resolve13({
         status: "retryable",
         error: new Error("Request timed out")
       });
     });
     req.on("error", (error63) => {
       if (isHttpTransportNetworkErrorRetryable(error63)) {
-        resolve12({
+        resolve13({
           status: "retryable",
           error: error63
         });
       } else {
-        resolve12({
+        resolve13({
           status: "failure",
           error: error63
         });
       }
     });
     compressAndSend(req, compression, data, (error63) => {
-      resolve12({
+      resolve13({
         status: "failure",
         error: error63
       });
@@ -34153,9 +34319,9 @@ var RetryingTransport = class {
     this._transport = transport;
   }
   retry(data, timeoutMillis, inMillis) {
-    return new Promise((resolve12, reject) => {
+    return new Promise((resolve13, reject) => {
       setTimeout(() => {
-        this._transport.send(data, timeoutMillis).then(resolve12, reject);
+        this._transport.send(data, timeoutMillis).then(resolve13, reject);
       }, inMillis);
     });
   }
@@ -34268,8 +34434,8 @@ function getSharedConfigurationFromEnvironment(signalIdentifier) {
 init_esm();
 
 // ../../node_modules/@opentelemetry/otlp-exporter-base/build/esm/configuration/otlp-node-http-env-configuration.js
-import * as fs6 from "fs";
-import * as path12 from "path";
+import * as fs7 from "fs";
+import * as path13 from "path";
 init_esm();
 function getStaticHeadersFromEnv(signalIdentifier) {
   const signalSpecificRawHeaders = getStringFromEnv(`OTEL_EXPORTER_OTLP_${signalIdentifier}_HEADERS`);
@@ -34290,7 +34456,7 @@ function appendRootPathToUrlIfNeeded(url2) {
     return void 0;
   }
 }
-function appendResourcePathToUrl(url2, path24) {
+function appendResourcePathToUrl(url2, path25) {
   try {
     new URL(url2);
   } catch {
@@ -34300,11 +34466,11 @@ function appendResourcePathToUrl(url2, path24) {
   if (!url2.endsWith("/")) {
     url2 = url2 + "/";
   }
-  url2 += path24;
+  url2 += path25;
   try {
     new URL(url2);
   } catch {
-    diag2.warn(`Configuration: Provided URL appended with '${path24}' is not a valid URL, using 'undefined' instead of '${url2}'`);
+    diag2.warn(`Configuration: Provided URL appended with '${path25}' is not a valid URL, using 'undefined' instead of '${url2}'`);
     return void 0;
   }
   return url2;
@@ -34329,7 +34495,7 @@ function readFileFromEnv(signalSpecificEnvVar, nonSignalSpecificEnvVar, warningM
   const filePath = signalSpecificPath ?? nonSignalSpecificPath;
   if (filePath != null) {
     try {
-      return fs6.readFileSync(path12.resolve(process.cwd(), filePath));
+      return fs7.readFileSync(path13.resolve(process.cwd(), filePath));
     } catch {
       diag2.warn(warningMessage);
       return void 0;
@@ -34415,15 +34581,15 @@ var OTLPLogExporter = class extends OTLPExporterBase {
 init_esm();
 
 // ../telemetry/src/debug.ts
-import * as fs7 from "node:fs";
+import * as fs8 from "node:fs";
 
 // ../telemetry/src/paths.ts
-import * as path13 from "node:path";
+import * as path14 from "node:path";
 function identityFilePath() {
-  return path13.join(argentHomeDir(), "telemetry-id");
+  return path14.join(argentHomeDir(), "telemetry-id");
 }
 function debugLogPath() {
-  return path13.join(argentHomeDir(), "telemetry-debug.log");
+  return path14.join(argentHomeDir(), "telemetry-debug.log");
 }
 
 // ../telemetry/src/debug.ts
@@ -34453,8 +34619,8 @@ function emitDebugPayload(payload) {
   } catch {
   }
   try {
-    fs7.mkdirSync(argentHomeDir(), { recursive: true });
-    fs7.appendFileSync(debugLogPath(), line + "\n");
+    fs8.mkdirSync(argentHomeDir(), { recursive: true });
+    fs8.appendFileSync(debugLogPath(), line + "\n");
   } catch {
   }
 }
@@ -34825,6 +34991,7 @@ var ALLOWED = {
   "tool:invoke": {
     device_provider: DEVICE_PROVIDER,
     tool: TOOL_NAME,
+    alias_used: bool,
     tool_invocation_id: UUID,
     platform: PLATFORM,
     device_kind: DEVICE_KIND,
@@ -34833,6 +35000,7 @@ var ALLOWED = {
   "tool:complete": {
     device_provider: DEVICE_PROVIDER,
     tool: TOOL_NAME,
+    alias_used: bool,
     tool_invocation_id: UUID,
     platform: PLATFORM,
     device_kind: DEVICE_KIND,
@@ -34842,6 +35010,7 @@ var ALLOWED = {
   "tool:fail": {
     device_provider: DEVICE_PROVIDER,
     tool: TOOL_NAME,
+    alias_used: bool,
     tool_invocation_id: UUID,
     platform: PLATFORM,
     device_kind: DEVICE_KIND,
@@ -34860,6 +35029,7 @@ var ALLOWED = {
   },
   "cli:run_fail": {
     tool: TOOL_NAME,
+    alias_used: bool,
     duration_ms: DURATION_MS,
     ...FAILURE_SIGNAL
   },
@@ -34956,9 +35126,9 @@ function isReplitAgent(env) {
 }
 var DEVIN_MARKER_PATH = "/opt/.devin";
 var JULES_MARKER_PATH = "/opt/environment_summary.sh";
-function safeExists(fileExists, path24) {
+function safeExists(fileExists, path25) {
   try {
-    return fileExists(path24);
+    return fileExists(path25);
   } catch {
     return false;
   }
@@ -35379,7 +35549,7 @@ var _CI_VENDOR_COUNT_FOR_TEST = vendors_default.length;
 var SESSION_ID2 = randomUUID5();
 function readCliVersion() {
   if (true) {
-    return "0.29.1-next.21";
+    return "0.29.1-next.22";
   }
   return "0.0.0";
 }
@@ -35412,8 +35582,8 @@ function getBaseProps(runtime) {
 
 // ../telemetry/src/identity.ts
 import * as crypto2 from "node:crypto";
-import * as fs8 from "node:fs";
-import * as path14 from "node:path";
+import * as fs9 from "node:fs";
+import * as path15 from "node:path";
 var FINGERPRINT_PATTERN = /^[0-9a-f]{64}$/;
 var cached2 = null;
 var fingerprintResolved = null;
@@ -35509,66 +35679,66 @@ function resolveFingerprintOnce(resolveFingerprint) {
 function isCorruptIdFile(filePath) {
   let isRegularFile;
   try {
-    isRegularFile = fs8.lstatSync(filePath).isFile();
+    isRegularFile = fs9.lstatSync(filePath).isFile();
   } catch {
     return false;
   }
   return isRegularFile && tryReadId(filePath) === null;
 }
 function writeIdFileAtomic(finalPath, id) {
-  fs8.mkdirSync(argentHomeDir(), { recursive: true });
+  fs9.mkdirSync(argentHomeDir(), { recursive: true });
   let occupant;
   try {
-    occupant = fs8.lstatSync(finalPath);
+    occupant = fs9.lstatSync(finalPath);
   } catch (err) {
     if (err.code !== "ENOENT") throw err;
   }
   if (occupant && !occupant.isFile()) {
     throw new Error("telemetry: refusing to replace a non-regular file at the identity path");
   }
-  const tmpPath = path14.join(
+  const tmpPath = path15.join(
     argentHomeDir(),
     `.telemetry-id.tmp.${process.pid}.${crypto2.randomUUID()}`
   );
-  const fd = fs8.openSync(tmpPath, "wx", 384);
+  const fd = fs9.openSync(tmpPath, "wx", 384);
   try {
     try {
-      fs8.writeSync(fd, id);
-      fs8.fsyncSync(fd);
+      fs9.writeSync(fd, id);
+      fs9.fsyncSync(fd);
     } finally {
-      fs8.closeSync(fd);
+      fs9.closeSync(fd);
     }
-    fs8.renameSync(tmpPath, finalPath);
+    fs9.renameSync(tmpPath, finalPath);
   } finally {
     try {
-      fs8.unlinkSync(tmpPath);
+      fs9.unlinkSync(tmpPath);
     } catch {
     }
   }
 }
 function mintRandomId(finalPath) {
-  fs8.mkdirSync(argentHomeDir(), { recursive: true });
+  fs9.mkdirSync(argentHomeDir(), { recursive: true });
   let value = crypto2.randomUUID();
   for (let attempt = 0; attempt < 3; attempt++) {
-    const tmpPath = path14.join(
+    const tmpPath = path15.join(
       argentHomeDir(),
       `.telemetry-id.tmp.${process.pid}.${crypto2.randomUUID()}`
     );
     let fd;
     try {
-      fd = fs8.openSync(tmpPath, "wx", 384);
+      fd = fs9.openSync(tmpPath, "wx", 384);
     } catch (err) {
       if (err.code === "EEXIST") continue;
       throw err;
     }
     try {
       try {
-        fs8.writeSync(fd, value);
-        fs8.fsyncSync(fd);
+        fs9.writeSync(fd, value);
+        fs9.fsyncSync(fd);
       } finally {
-        fs8.closeSync(fd);
+        fs9.closeSync(fd);
       }
-      fs8.linkSync(tmpPath, finalPath);
+      fs9.linkSync(tmpPath, finalPath);
       cached2 = { path: finalPath, id: value };
       return value;
     } catch (err) {
@@ -35587,7 +35757,7 @@ function mintRandomId(finalPath) {
       throw err;
     } finally {
       try {
-        fs8.unlinkSync(tmpPath);
+        fs9.unlinkSync(tmpPath);
       } catch {
       }
     }
@@ -35595,12 +35765,12 @@ function mintRandomId(finalPath) {
   throw new Error("telemetry: failed to create identity after retries");
 }
 function claimCorruptOccupant(finalPath) {
-  const claimed = path14.join(
+  const claimed = path15.join(
     argentHomeDir(),
     `.telemetry-id.corrupt.${process.pid}.${crypto2.randomUUID()}`
   );
   try {
-    fs8.renameSync(finalPath, claimed);
+    fs9.renameSync(finalPath, claimed);
   } catch {
     return null;
   }
@@ -35609,7 +35779,7 @@ function claimCorruptOccupant(finalPath) {
     grabbed = tryReadId(claimed);
   } finally {
     try {
-      fs8.unlinkSync(claimed);
+      fs9.unlinkSync(claimed);
     } catch {
     }
   }
@@ -35621,9 +35791,9 @@ function peekAnonId() {
 function tryReadId(filePath) {
   let raw;
   try {
-    const stats = fs8.lstatSync(filePath);
+    const stats = fs9.lstatSync(filePath);
     if (!stats.isFile()) return null;
-    raw = fs8.readFileSync(filePath, "utf8");
+    raw = fs9.readFileSync(filePath, "utf8");
   } catch (err) {
     if (err.code === "ENOENT") return null;
     return null;
@@ -35637,12 +35807,12 @@ function tryReadId(filePath) {
 import { execFileSync as execFileSync2, spawn as spawn2 } from "node:child_process";
 
 // ../native-devtools-ios/src/index.ts
-import * as path15 from "node:path";
-import * as fs9 from "node:fs";
-var DYLIB_DIR = process.env.ARGENT_NATIVE_DEVTOOLS_DIR ?? path15.join(__dirname, "..", "dylibs");
-var BIN_DIR = process.env.ARGENT_SIMULATOR_SERVER_DIR ?? path15.join(__dirname, "..", "bin");
-var DYLIB_TCP_DIR = process.env.ARGENT_NATIVE_DEVTOOLS_TCP_DIR ?? path15.join(DYLIB_DIR, "tcp");
-var DYLIB_TVOS_DIR = path15.join(DYLIB_DIR, "tvos");
+import * as path16 from "node:path";
+import * as fs10 from "node:fs";
+var DYLIB_DIR = process.env.ARGENT_NATIVE_DEVTOOLS_DIR ?? path16.join(__dirname, "..", "dylibs");
+var BIN_DIR = process.env.ARGENT_SIMULATOR_SERVER_DIR ?? path16.join(__dirname, "..", "bin");
+var DYLIB_TCP_DIR = process.env.ARGENT_NATIVE_DEVTOOLS_TCP_DIR ?? path16.join(DYLIB_DIR, "tcp");
+var DYLIB_TVOS_DIR = path16.join(DYLIB_DIR, "tvos");
 function hostPlatformKey() {
   if (process.platform === "linux" && process.arch === "arm64") {
     return "linux-arm64";
@@ -35653,14 +35823,14 @@ function simulatorServerBinaryName() {
   return process.platform === "win32" ? "simulator-server.exe" : "simulator-server";
 }
 function platformBinDir() {
-  return path15.join(BIN_DIR, hostPlatformKey());
+  return path16.join(BIN_DIR, hostPlatformKey());
 }
 function simulatorServerBinaryPath() {
   const binaryName = simulatorServerBinaryName();
-  const p = path15.join(platformBinDir(), binaryName);
-  if (!fs9.existsSync(p)) {
-    const flat = path15.join(BIN_DIR, binaryName);
-    const migrationHint = fs9.existsSync(flat) ? ` Found a binary at the old flat path ${flat}; move it to ${p} or update ARGENT_SIMULATOR_SERVER_DIR to point at the parent of the platform subdirectory.` : "";
+  const p = path16.join(platformBinDir(), binaryName);
+  if (!fs10.existsSync(p)) {
+    const flat = path16.join(BIN_DIR, binaryName);
+    const migrationHint = fs10.existsSync(flat) ? ` Found a binary at the old flat path ${flat}; move it to ${p} or update ARGENT_SIMULATOR_SERVER_DIR to point at the parent of the platform subdirectory.` : "";
     throw new Error(
       `simulator-server binary not found for platform "${hostPlatformKey()}" at ${p}. Supported hosts today: darwin, linux (x86_64 and arm64), win32.${migrationHint}`
     );
@@ -35689,12 +35859,12 @@ function resolveHostFingerprint() {
   }
 }
 function resolveHostFingerprintAsync() {
-  return new Promise((resolve12) => {
+  return new Promise((resolve13) => {
     let binary;
     try {
       binary = simulatorServerBinaryPath();
     } catch {
-      resolve12(null);
+      resolve13(null);
       return;
     }
     let settled = false;
@@ -35707,7 +35877,7 @@ function resolveHostFingerprintAsync() {
         child?.kill("SIGKILL");
       } catch {
       }
-      resolve12(value);
+      resolve13(value);
     };
     const watchdog = setTimeout(() => finish(null), FINGERPRINT_TIMEOUT_MS);
     watchdog.unref?.();
@@ -35740,14 +35910,14 @@ function resolveHostFingerprintAsync() {
 }
 
 // ../telemetry/src/consent.ts
-import * as fs10 from "node:fs";
+import * as fs11 from "node:fs";
 var cache = /* @__PURE__ */ new Map();
 var sessionOverride = null;
 function readConfigOverrideAt(filePath) {
   const miss = { mtimeMs: null, fingerprint: null, enabledOverride: null };
   let stats;
   try {
-    stats = fs10.lstatSync(filePath);
+    stats = fs11.lstatSync(filePath);
   } catch {
     cache.set(filePath, miss);
     return null;
@@ -35764,7 +35934,7 @@ function readConfigOverrideAt(filePath) {
   }
   let parsedEnabled = null;
   try {
-    const raw = fs10.readFileSync(filePath, "utf8");
+    const raw = fs11.readFileSync(filePath, "utf8");
     const json2 = JSON.parse(raw);
     if (json2 && typeof json2 === "object") {
       const t2 = json2.telemetry;
@@ -35921,7 +36091,7 @@ var DRAIN_GRACE_MS = 250;
 async function raceDrain(client2, timeoutMs) {
   await Promise.race([
     client2.shutdown(timeoutMs),
-    new Promise((resolve12) => setTimeout(resolve12, timeoutMs + DRAIN_GRACE_MS).unref())
+    new Promise((resolve13) => setTimeout(resolve13, timeoutMs + DRAIN_GRACE_MS).unref())
   ]);
 }
 async function shutdown(timeoutMs = SHORT_FLUSH_TIMEOUT_MS) {
@@ -36345,13 +36515,13 @@ function splitOptions(argv) {
   return { json: json2, outPath, argvForFlags: rest };
 }
 async function readStdin() {
-  return new Promise((resolve12, reject) => {
+  return new Promise((resolve13, reject) => {
     let data = "";
     process.stdin.setEncoding("utf8");
     process.stdin.on("data", (chunk) => {
       data += chunk;
     });
-    process.stdin.on("end", () => resolve12(data));
+    process.stdin.on("end", () => resolve13(data));
     process.stdin.on("error", reject);
   });
 }
@@ -36383,8 +36553,8 @@ async function fetchImageToFile(result, outPath) {
   const res = await fetch(url2);
   if (!res.ok) throw new Error(`Failed to download image: ${res.status} ${res.statusText}`);
   const buf = Buffer.from(await res.arrayBuffer());
-  fs11.mkdirSync(path16.dirname(path16.resolve(outPath)), { recursive: true });
-  fs11.writeFileSync(outPath, buf);
+  fs12.mkdirSync(path17.dirname(path17.resolve(outPath)), { recursive: true });
+  fs12.writeFileSync(outPath, buf);
 }
 function renderResult(result, outputHint, images, json2) {
   if (json2) return JSON.stringify(result, null, 2);
@@ -36402,8 +36572,10 @@ function safeToolName(toolName) {
   return toolName && SAFE_TOOL_RE.test(toolName) ? toolName : "unknown";
 }
 async function trackRunFailure(toolName, startedAt, signal) {
+  const tool = toolName ? canonicalToolId(toolName) : toolName;
   track("cli:run_fail", {
-    tool: safeToolName(toolName),
+    tool: safeToolName(tool),
+    ...tool !== toolName ? { alias_used: true } : {},
     duration_ms: performance.now() - startedAt,
     ...signal
   });
@@ -36578,8 +36750,8 @@ Examples:
   if (outPath && meta3.outputHint === "image") {
     try {
       if (images.length > 0) {
-        fs11.mkdirSync(path16.dirname(path16.resolve(outPath)), { recursive: true });
-        fs11.writeFileSync(outPath, images[0].data);
+        fs12.mkdirSync(path17.dirname(path17.resolve(outPath)), { recursive: true });
+        fs12.writeFileSync(outPath, images[0].data);
       } else if (result && typeof result === "object") {
         await fetchImageToFile(result, outPath);
       }
@@ -36601,11 +36773,11 @@ Examples:
   }
 }
 
-// ../argent-cli/src/flow.ts
+// ../argent-cli/src/e2e.ts
 import * as fsp from "node:fs/promises";
 import { constants as fsConstants2 } from "node:fs";
 import { createHash as createHash5 } from "node:crypto";
-import * as path17 from "node:path";
+import * as path18 from "node:path";
 
 // ../argent-cli/src/command-args.ts
 var UsageError = class extends Error {
@@ -36677,7 +36849,7 @@ function parseCommandArgs(argv, specs) {
   return { positionals, options };
 }
 
-// ../argent-cli/src/flow.ts
+// ../argent-cli/src/e2e.ts
 var STATUS_GLYPH = {
   pass: "\u2713",
   fail: "\u2717",
@@ -36698,93 +36870,96 @@ function durationSuffix(ms) {
 }
 function printHelp(toStderr = false) {
   const print = toStderr ? console.error : console.log;
-  print(`Usage: argent flow <subcommand> [options]
+  print(`Usage: argent e2e <subcommand> [options]
 
-Run a YAML flow without an LLM in the loop. \`run\` takes any of these forms:
+Run a YAML e2e test without an LLM in the loop. \`run\` takes any of these forms:
 
-  a name   A flow saved under .argent/flows \u2014 "checkout" runs
-           .argent/flows/checkout.yaml, resolved from the current directory
+  a name   An e2e test saved under .argent/e2e or .argent/flows, resolved
+           from the current directory. "checkout" runs
+           .argent/e2e/checkout.yaml, or .argent/flows/checkout.yaml when only
+           that one exists
   a path   Any .yaml file on the local filesystem, resolved from the current
            directory. It must not contain ".." segments (pass the resolved
-           path instead); a path is what reaches flows kept elsewhere, and
-           what \`argent flow list\` prints for nested ones
-  a dir    Every flow in that directory, run sequentially
+           path instead); a path is what reaches e2e tests kept elsewhere, and
+           what \`argent e2e list\` prints for nested ones
+  a dir    Every e2e test in that directory, run sequentially
 
 For a name and for a file path alike, the
 filename (minus .yaml) names the run's report and artifacts, so it must
 contain only letters, numbers, "_", or "-" \u2014 the same charset a name must
-match. A flow is e2e when its first non-\`echo\`/\`script\` step is \`launch\`.
-Other flows are fragments and use the device's current state. Exception: a fragment whose first step \`run:\`s a chromium e2e
-flow boots that flow's app before step 1 \u2014 when that launch is unambiguously
+match. A test is standalone when its first non-\`echo\`/\`script\` step is \`launch\`.
+Other tests are fragments and use the device's current state. Exception: a fragment whose first step \`run:\`s a chromium standalone
+test boots that test's app before step 1 \u2014 when that launch is unambiguously
 chromium (a lone \`{ chromium: ... }\` target, or --platform chromium); a
 multi-platform launch auto-detects a device instead. Pass --device to attach to
 a running instance.
 
 A directory run prints only the steps that need attention (each failure, each
-warning, and each script step's output), then its outcome. After the last flow
-it lists every failed flow with its reason and a command that re-runs that flow
-alone, then a final flow summary; --recursive walks subdirectories too
-(dot-directories and node_modules are skipped). A flow that fails its steps
+warning, and each script step's output), then its outcome. After the last test
+it lists every failed test with its reason and a command that re-runs that test
+alone, then a final summary; --recursive walks subdirectories too
+(dot-directories and node_modules are skipped). A test that fails its steps
 keeps the batch running, as does one the server rejects up front \u2014 an invalid
 file, or a device it cannot resolve. A transport failure, a rejection the server
 does not mark as validation, or a reply that is not a report stops the batch and
-counts the remaining flows skipped.
+counts the remaining tests skipped.
 
 The CLI sends a run to its tool-server: the local one that starts
 automatically, or the one that \`argent link\` or ARGENT_TOOLS_URL names. Over
 a link, the CLI uploads these files and writes the new baselines that the run
 returns:
-  - the flow file and the run: fragments that it reaches
-  - each flow that a tool: flow-execute step names with name (a nested flow)
+  - the e2e test file and the run: fragments that it reaches
+  - each e2e test that a tool: e2e-execute step names with name (a nested test)
   - the snapshot baselines of each run
   - each .png or .yaml file that a tool: step takes as a file argument by an
     absolute path
-The tool-server rejects the flow before the first step when the flow, a
-fragment or a nested flow has one of these steps:
+The tool-server rejects the test before the first step when the test, a
+fragment or a nested test has one of these steps:
   - a script: step
-  - a tool: flow-execute step that does not name its flow with name and an
+  - a tool: e2e-execute step that does not name its test with name and an
     absolute project_root that has no .. segment
-  - a tool: step that records a flow
+  - a tool: step that records an e2e test
   - a tool: step that takes a directory, an app or an output directory
   - a tool: step whose tool builds a file path from several arguments
   - a tool: step that names a relative path or a file other than .png or .yaml
 Without a link, all step kinds run.
 
 Subcommands:
-  run <flow|flow.yaml|dir>   Run a saved flow by name, a YAML file by path, or
-                             every flow in a directory, and report pass/fail
+  run <test|test.yaml|dir>   Run a saved e2e test by name, a YAML file by path,
+                             or every test in a directory, and report pass/fail
                              (exit reflects result)
-  list                       List runnable YAML paths in .argent/flows
+  list                       List runnable YAML paths in .argent/e2e and
+                             .argent/flows (legacy); notes go to stderr
 
 Options (run):
   --device <id>          Device id to run against (auto-detected when omitted)
   --platform <p>         ios | android | chromium | vega | ios-remote \u2014 narrow
                          auto-detection (ios never picks a remote simulator)
   --update-baselines     Write/refresh screenshot baselines instead of diffing,
-                         also those of flows that tool: flow-execute steps run,
+                         also those of tests that tool: e2e-execute steps run,
                          unless such a step sets updateBaselines
   --output <dir>         Also write failed snapshot images (baseline/current/diff)
                          and failed-step screenshots (step-<n>-screen.png)
-                         under <dir>/<flow>/ \u2014 a stable path for CI artifact
-                         upload; a directory run keys nested flows as
-                         <dir>/<subdir>/<flow>/. A different flow file with the
-                         same filename sharing <dir> exports to <flow>-<pathhash>/
-                         instead (with a warning), so no flow's evidence is
+                         under <dir>/<test>/ \u2014 a stable path for CI artifact
+                         upload; a directory run keys nested tests as
+                         <dir>/<subdir>/<test>/. A different test file with the
+                         same filename sharing <dir> exports to <test>-<pathhash>/
+                         instead (with a warning), so no test's evidence is
                          overwritten
-  -r, --recursive        With a directory path, also run flows in subdirectories
-  --json                 Print the flow's JSON report, or a directory run's JSON
+  -r, --recursive        With a directory path, also run tests in subdirectories
+  --json                 Print the test's JSON report, or a directory run's JSON
                          aggregate
   --json-stream          Print each step and the final report as NDJSON (single
-                         flow only, never with --json)
+                         test only, never with --json)
   --help, -h             Show this help
-  --                     End of options \u2014 only needed for a flow whose name
-                         starts with "-" (\`argent flow run -- -nightly\`)
+  --                     End of options \u2014 only needed for a test whose name
+                         starts with "-" (\`argent e2e run -- -nightly\`)
 
 Examples:
-  argent flow run checkout --platform ios
-  argent flow run .argent/flows/checkout.yaml --output flow-artifacts --json
-  argent flow run ~/shared-flows/checkout.yaml --device <UDID> --update-baselines
-  argent flow run .argent/flows --recursive
+  argent e2e run checkout --platform ios
+  argent e2e run .argent/e2e/checkout.yaml --output e2e-artifacts --json
+  argent e2e run ~/shared-e2e/checkout.yaml --device <UDID> --update-baselines
+  argent e2e run .argent/e2e --recursive
 `);
 }
 var RUN_OPTIONS = {
@@ -36807,7 +36982,7 @@ function parseRunArgs(argv) {
   const { positionals, options } = parsed;
   if (positionals.length > 1) {
     throw new FlagParseException(
-      `unexpected argument ${JSON.stringify(positionals[1])}; flow run accepts one flow name, YAML file path, or directory path`
+      `unexpected argument ${JSON.stringify(positionals[1])}; e2e run accepts one e2e test name, YAML file path, or directory path`
     );
   }
   const out = {
@@ -36907,7 +37082,7 @@ function renderFailedSteps(report) {
   return lines;
 }
 function renderBatchSummary(counts, durationMs) {
-  return `${counts.failed === 0 ? "PASS" : "FAIL"} \u2014 ${counts.total} flow${counts.total === 1 ? "" : "s"}: ${counts.passed} passed, ${counts.failed} failed, ${counts.skipped} skipped${durationSuffix(durationMs)}`;
+  return `${counts.failed === 0 ? "PASS" : "FAIL"} \u2014 ${counts.total} e2e test${counts.total === 1 ? "" : "s"}: ${counts.passed} passed, ${counts.failed} failed, ${counts.skipped} skipped${durationSuffix(durationMs)}`;
 }
 function summarizeFailure(report) {
   let n3 = 0;
@@ -36934,34 +37109,33 @@ function renderFailedFlows(failed) {
   if (failed.length === 0) return [];
   return [
     "",
-    `Failed flows (${failed.length})`,
+    `Failed e2e tests (${failed.length})`,
     ...failed.flatMap((f) => ["", ...renderFailedFlow(f)])
   ];
 }
 var SAFE_ARTIFACT_NAME = FLOW_NAME_PATTERN;
 var SAFE_FLOW_NAME = FLOW_NAME_PATTERN;
-var FLOWS_DIR = path17.join(".argent", "flows");
 var SHELL_SAFE_ARG = /^(?!=)[A-Za-z0-9_@%+=:,./-]+$/;
 function shellQuoteArg(arg) {
   if (SHELL_SAFE_ARG.test(arg)) return arg;
   return `'${arg.replaceAll("'", "'\\''")}'`;
 }
 function rerunCommand(flowPath, rel, projectRoot, args) {
-  const pathArg = (p) => shellQuoteArg(p.startsWith("-") ? `.${path17.sep}${p}` : p);
-  const fromCwd = path17.relative(projectRoot, flowPath);
-  const shown = path17.isAbsolute(fromCwd) || fromCwd.split(/[\\/]+/).includes("..") ? flowPath : fromCwd;
-  const parts = ["argent flow run", pathArg(shown)];
+  const pathArg = (p) => shellQuoteArg(p.startsWith("-") ? `.${path18.sep}${p}` : p);
+  const fromCwd = path18.relative(projectRoot, flowPath);
+  const shown = path18.isAbsolute(fromCwd) || fromCwd.split(/[\\/]+/).includes("..") ? flowPath : fromCwd;
+  const parts = ["argent e2e run", pathArg(shown)];
   if (args.device) parts.push("--device", shellQuoteArg(args.device));
   if (args.platform) parts.push("--platform", shellQuoteArg(args.platform));
   if (args.updateBaselines) parts.push("--update-baselines");
-  if (args.output) parts.push("--output", pathArg(path17.join(args.output, path17.dirname(rel))));
+  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 MARKER_READ_RETRIES = 4;
 var MARKER_READ_DELAY_MS = 5;
 async function readExportMarker(dir) {
-  const marker = path17.join(dir, EXPORT_SOURCE_MARKER);
+  const marker = path18.join(dir, EXPORT_SOURCE_MARKER);
   for (let attempt = 0; ; attempt++) {
     let owner;
     try {
@@ -36971,7 +37145,7 @@ async function readExportMarker(dir) {
     }
     if (owner) return owner;
     if (attempt === MARKER_READ_RETRIES) return null;
-    await new Promise((resolve12) => setTimeout(resolve12, MARKER_READ_DELAY_MS));
+    await new Promise((resolve13) => setTimeout(resolve13, MARKER_READ_DELAY_MS));
   }
 }
 async function classifyExportDir(dir, flowPath) {
@@ -36996,7 +37170,7 @@ function occupiedBy(owner) {
 async function takeExportDir(dir, flowPath) {
   try {
     await fsp.mkdir(dir, { recursive: true });
-    await fsp.writeFile(path17.join(dir, EXPORT_SOURCE_MARKER), `${flowPath}
+    await fsp.writeFile(path18.join(dir, EXPORT_SOURCE_MARKER), `${flowPath}
 `, { flag: "wx" });
     return null;
   } catch (err) {
@@ -37015,7 +37189,7 @@ async function claimExportDirName(outputDir, flowPath, stem) {
   }
   const avoided = [];
   for (const name of candidates) {
-    const dir = path17.join(outputDir, name);
+    const dir = path18.join(outputDir, name);
     const claim2 = await classifyExportDir(dir, flowPath);
     const reason = claim2.state === "foreign" ? occupiedBy(claim2.owner) : await takeExportDir(dir, flowPath);
     if (reason !== null) {
@@ -37024,7 +37198,7 @@ async function claimExportDirName(outputDir, flowPath, stem) {
     }
     for (const entry of avoided) {
       console.error(
-        `warning: ${entry.dir} ${entry.reason}; writing this flow's artifacts to ${dir} so neither set is overwritten`
+        `warning: ${entry.dir} ${entry.reason}; writing this e2e test's artifacts to ${dir} so neither set is overwritten`
       );
     }
     return name;
@@ -37035,10 +37209,10 @@ async function claimExportDirName(outputDir, flowPath, stem) {
   return null;
 }
 async function exportFailureArtifacts(report, outputDir, flowPath, ctx) {
-  const stem = path17.basename(flowPath, ".yaml");
+  const stem = path18.basename(flowPath, ".yaml");
   if (!SAFE_ARTIFACT_NAME.test(stem)) {
     console.error(
-      `warning: skipping artifact export for unsafe flow filename ${JSON.stringify(stem)}`
+      `warning: skipping artifact export for unsafe e2e test filename ${JSON.stringify(stem)}`
     );
     return;
   }
@@ -37068,11 +37242,11 @@ async function exportFailureArtifacts(report, outputDir, flowPath, ctx) {
       if (dir === null) {
         const dirName = await claimExportDirName(outputDir, flowPath, stem);
         if (dirName === null) return;
-        dir = path17.join(outputDir, dirName);
+        dir = path18.join(outputDir, dirName);
       }
-      const dest = path17.join(dir, fileName(role));
-      const rel = path17.relative(outputDir, dest);
-      if (rel.startsWith("..") || path17.isAbsolute(rel)) continue;
+      const dest = path18.join(dir, fileName(role));
+      const rel = path18.relative(outputDir, dest);
+      if (rel.startsWith("..") || path18.isAbsolute(rel)) continue;
       try {
         await fsp.copyFile(value, dest);
         s.artifacts[role] = dest;
@@ -37087,7 +37261,7 @@ async function exportFailureArtifacts(report, outputDir, flowPath, ctx) {
 function keyFromBaselinePath(artifacts) {
   const baseline = artifacts.baseline;
   if (typeof baseline !== "string") return null;
-  return path17.basename(baseline).replace(/\.png$/, "");
+  return path18.basename(baseline).replace(/\.png$/, "");
 }
 function resolveArtifactDisplayPaths(report) {
   for (const s of report.steps) {
@@ -37099,12 +37273,12 @@ function resolveArtifactDisplayPaths(report) {
 }
 function exitAfterFlush(code, streams = [process.stdout, process.stderr]) {
   return Promise.all(
-    streams.map((s) => new Promise((resolve12) => s.write("", () => resolve12())))
+    streams.map((s) => new Promise((resolve13) => s.write("", () => resolve13())))
   ).then(() => process.exit(code));
 }
 function renderReport(report) {
   const lines = [];
-  lines.push(`Flow "${report.flow}"${report.device ? ` on ${report.device}` : ""}`);
+  lines.push(`E2E test "${report.flow}"${report.device ? ` on ${report.device}` : ""}`);
   if (report.executionPrerequisite) {
     lines.push(`  assumes: ${report.executionPrerequisite}`);
   }
@@ -37132,8 +37306,8 @@ ${renderSummary(report)}`);
 }
 async function isRunnableFlowFile(filePath) {
   try {
-    const stat6 = await fsp.stat(filePath);
-    if (!stat6.isFile()) return false;
+    const stat7 = await fsp.stat(filePath);
+    if (!stat7.isFile()) return false;
     await fsp.access(filePath, fsConstants2.R_OK);
     return true;
   } catch {
@@ -37144,59 +37318,70 @@ async function collectRunnableFlowPaths(dir, relDir = "") {
   const found = [];
   const entries = await fsp.readdir(dir, { withFileTypes: true });
   for (const entry of entries) {
-    const rel = relDir ? path17.join(relDir, entry.name) : entry.name;
+    const rel = relDir ? path18.join(relDir, entry.name) : entry.name;
     if (entry.isDirectory()) {
       if (entry.name === "__baselines__") continue;
       found.push(
-        ...await collectRunnableFlowPaths(path17.join(dir, entry.name), rel).catch(() => [])
+        ...await collectRunnableFlowPaths(path18.join(dir, entry.name), rel).catch(() => [])
       );
       continue;
     }
     if (!entry.name.endsWith(".yaml")) continue;
-    if (!SAFE_FLOW_NAME.test(path17.basename(entry.name, ".yaml"))) continue;
-    if (await isRunnableFlowFile(path17.join(dir, entry.name))) found.push(rel);
+    if (!SAFE_FLOW_NAME.test(path18.basename(entry.name, ".yaml"))) continue;
+    if (await isRunnableFlowFile(path18.join(dir, entry.name))) found.push(rel);
   }
   return found;
 }
-function resolveFlowRef(ref) {
+async function resolveFlowRef(ref, projectRoot) {
   if (!SAFE_FLOW_NAME.test(ref)) return { suppliedPath: ref, fromName: false };
-  return { suppliedPath: path17.join(FLOWS_DIR, `${ref}.yaml`), fromName: true };
+  const picked = await resolveE2eFile(projectRoot, ref);
+  return {
+    suppliedPath: path18.relative(projectRoot, picked.path),
+    fromName: true,
+    ...picked.shadowed === void 0 ? {} : { shadowed: path18.relative(projectRoot, picked.shadowed) }
+  };
 }
 async function savedFlowHint(projectRoot, missingPath) {
-  const dir = path17.resolve(projectRoot, FLOWS_DIR);
-  const within = path17.relative(dir, missingPath);
-  if (!within.startsWith("..") && !path17.isAbsolute(within)) return "";
-  const wanted = `${path17.basename(missingPath, ".yaml")}.yaml`;
-  const entries = await fsp.readdir(dir).catch(() => null);
-  if (entries === null) return "";
-  const actual = entries.includes(wanted) ? wanted : entries.find((name2) => name2.toLowerCase() === wanted.toLowerCase());
-  if (actual === void 0) return "";
-  const name = path17.basename(actual, ".yaml");
-  if (!SAFE_FLOW_NAME.test(name)) return "";
-  if (!await isRunnableFlowFile(path17.join(dir, actual))) return "";
-  return `
-A flow named "${name}" is saved under ${FLOWS_DIR} \u2014 did you mean: argent flow run ${name}`;
+  const dirs = E2E_DIRS.map((rel) => ({ rel, abs: path18.resolve(projectRoot, rel) }));
+  for (const { abs } of dirs) {
+    const within = path18.relative(abs, missingPath);
+    if (!within.startsWith("..") && !path18.isAbsolute(within)) return "";
+  }
+  const wanted = `${path18.basename(missingPath, ".yaml")}.yaml`;
+  for (const { rel, abs } of dirs) {
+    const entries = await fsp.readdir(abs).catch(() => null);
+    if (entries === null) continue;
+    const actual = entries.includes(wanted) ? wanted : entries.find((name2) => name2.toLowerCase() === wanted.toLowerCase());
+    if (actual === void 0) continue;
+    const name = path18.basename(actual, ".yaml");
+    if (!SAFE_FLOW_NAME.test(name)) return "";
+    if (!await isRunnableFlowFile(path18.join(abs, actual))) return "";
+    return `
+An e2e test named "${name}" is saved under ${rel} \u2014 did you mean: argent e2e run ${name}`;
+  }
+  return "";
 }
 async function collectFlowFiles(dir, recursive2) {
   const found = [];
   const walk = async (current, rel) => {
     for (const entry of await fsp.readdir(current, { withFileTypes: true })) {
-      const entryRel = rel ? path17.join(rel, entry.name) : entry.name;
+      const entryRel = rel ? path18.join(rel, entry.name) : entry.name;
       if (entry.isDirectory()) {
         if (recursive2 && !entry.name.startsWith(".") && entry.name !== "node_modules") {
-          await walk(path17.join(current, entry.name), entryRel).catch(() => {
+          await walk(path18.join(current, entry.name), entryRel).catch(() => {
           });
         }
         continue;
       }
       if (!entry.name.endsWith(".yaml")) continue;
-      if (!SAFE_FLOW_NAME.test(path17.basename(entry.name, ".yaml"))) continue;
-      if (await isRunnableFlowFile(path17.join(current, entry.name))) found.push(entryRel);
+      if (!SAFE_FLOW_NAME.test(path18.basename(entry.name, ".yaml"))) continue;
+      if (await isRunnableFlowFile(path18.join(current, entry.name))) found.push(entryRel);
     }
   };
   await walk(dir, "");
   return found.sort();
 }
+var RUN_TOOL_ID = "e2e-execute";
 function buildRunPayload(flowPath, projectRoot, args) {
   const payload = {
     flow_path: flowPath,
@@ -37278,7 +37463,7 @@ function rejectionVerdict(code) {
     case FAILURE_CODES.FLOW_FILE_INVALID:
     case FAILURE_CODES.FLOW_ENTRY_UNRECOGNIZED:
     case FAILURE_CODES.FLOW_E2E_HAS_PREREQUISITE:
-      return "not run (invalid flow)";
+      return "not run (invalid e2e test)";
     case FAILURE_CODES.FLOW_DEVICE_RESOLUTION:
       return "not run (no device resolved)";
     case FAILURE_CODES.FILE_INPUT_UPLOAD_FAILED:
@@ -37287,6 +37472,20 @@ function rejectionVerdict(code) {
       return "not run (rejected)";
   }
 }
+function nestedStepWarnings(steps, into = /* @__PURE__ */ new Set()) {
+  for (const s of steps) {
+    if (!s || typeof s.result !== "object" || s.result === null) continue;
+    const { warning, steps: inner } = s.result;
+    if (typeof warning === "string" && warning !== s.warning) into.add(warning);
+    if (Array.isArray(inner)) nestedStepWarnings(inner, into);
+  }
+  return [...into];
+}
+function printWarnings(warnings, json2) {
+  for (const warning of warnings) {
+    console.error(json2 ? JSON.stringify({ event: "warning", warning }) : `warning: ${warning}`);
+  }
+}
 function isFlowReport(data) {
   const steps = data?.steps;
   return Array.isArray(steps) && steps.every((step) => !!step && typeof step === "object");
@@ -37311,15 +37510,15 @@ async function runFlowDirectory(dir, args, projectRoot, options) {
   try {
     flows = await collectFlowFiles(dir, args.recursive);
   } catch {
-    return reject(`Could not read flow directory: ${dir}`);
+    return reject(`Could not read e2e test directory: ${dir}`);
   }
   if (flows.length === 0) {
     return reject(
-      `No flows found in ${dir}` + (args.recursive ? "" : "\nPass -r/--recursive to include subdirectories.")
+      `No e2e tests found in ${dir}` + (args.recursive ? "" : "\nPass -r/--recursive to include subdirectories.")
     );
   }
   const { callTool, baseUrl } = runToolsClient(args, options);
-  const outputBase = args.output ? path17.resolve(args.output) : void 0;
+  const outputBase = args.output ? path18.resolve(args.output) : void 0;
   const results = [];
   const failures = [];
   const batchStartedAt = Date.now();
@@ -37332,11 +37531,11 @@ async function runFlowDirectory(dir, args, projectRoot, options) {
       if (!args.json) console.log(`  ${STATUS_GLYPH.skip} not run (batch stopped)`);
       continue;
     }
-    const flowPath = path17.join(dir, rel);
+    const flowPath = path18.join(dir, rel);
     const rerun = rerunCommand(flowPath, rel, projectRoot, args);
     let report;
     try {
-      const resp = await callTool("flow-execute", buildRunPayload(flowPath, projectRoot, args));
+      const resp = await callTool(RUN_TOOL_ID, buildRunPayload(flowPath, projectRoot, args));
       if (isFlowReport(resp.data)) report = resp.data;
     } catch (thrown) {
       const unreachableErr = await toolServerUnreachable(thrown);
@@ -37363,9 +37562,10 @@ async function runFlowDirectory(dir, args, projectRoot, options) {
       stopped = true;
       continue;
     }
+    printWarnings(nestedStepWarnings(report.steps), args.json);
     await exportAndResolveArtifacts(
       report,
-      outputBase ? path17.join(outputBase, path17.dirname(rel)) : void 0,
+      outputBase ? path18.join(outputBase, path18.dirname(rel)) : void 0,
       flowPath,
       baseUrl
     );
@@ -37403,25 +37603,54 @@ ${renderBatchSummary(counts, durationMs)}`);
   }
   return exitAfterFlush(unreachable ? 2 : counts.failed === 0 ? 0 : 1);
 }
-async function flow(argv, options) {
+async function e2e(argv, options) {
   const [sub, ...rest] = argv;
   if (!sub || sub === "--help" || sub === "-h") {
     printHelp();
     return;
   }
   if (sub === "list") {
-    const dir = path17.join(process.cwd(), FLOWS_DIR);
-    try {
-      const paths = (await collectRunnableFlowPaths(dir)).sort().map((rel) => path17.join(FLOWS_DIR, rel));
-      if (paths.length === 0) console.log("No flows found in .argent/flows");
-      else console.log(paths.join("\n"));
-    } catch {
-      console.log("No .argent/flows directory in the current working directory.");
+    const lines = [];
+    const notes = [];
+    let legacyCount = 0;
+    const byName = /* @__PURE__ */ new Map();
+    let anyDir = false;
+    for (const dir of E2E_DIRS) {
+      let rels;
+      try {
+        rels = (await collectRunnableFlowPaths(path18.join(process.cwd(), dir))).sort();
+      } catch {
+        continue;
+      }
+      anyDir = true;
+      for (const rel of rels) {
+        const shown = path18.join(dir, rel);
+        const name = path18.dirname(rel) === "." ? path18.basename(rel, ".yaml") : void 0;
+        const usedByName = name === void 0 ? void 0 : byName.get(name);
+        if (name !== void 0 && usedByName === void 0) byName.set(name, shown);
+        lines.push(shown);
+        if (dir === E2E_DIR) continue;
+        legacyCount++;
+        if (usedByName)
+          notes.push(`warning: ${shown} is shadowed by ${usedByName} when run by name`);
+      }
+    }
+    if (legacyCount > 0) {
+      notes.push(
+        `note: ${legacyCount} test${legacyCount === 1 ? "" : "s"} listed from .argent/flows (legacy); move ${legacyCount === 1 ? "it" : "them"} to .argent/e2e`
+      );
+    }
+    if (!anyDir) {
+      console.log(`No ${E2E_DIRS.join(" or ")} directory in the current working directory.`);
+    } else if (lines.length === 0) console.log(`No e2e tests found in ${E2E_DIRS.join(" or ")}`);
+    else {
+      console.log(lines.join("\n"));
+      for (const note of notes) console.error(note);
     }
     return;
   }
   if (sub !== "run") {
-    console.error(`Unknown flow subcommand "${sub}". Run \`argent flow --help\`.`);
+    console.error(`Unknown e2e subcommand "${sub}". Run \`argent e2e --help\`.`);
     return exitAfterFlush(2);
   }
   const flagGiven = (flag) => rest.some((tok) => tok === flag || tok.startsWith(`${flag}=`));
@@ -37452,7 +37681,7 @@ async function flow(argv, options) {
     throw err;
   }
   if (!args.flowRef) {
-    const message = "argent flow run <flow|flow.yaml|dir> requires a flow name, a YAML file path, or a directory path.";
+    const message = "argent e2e run <test|test.yaml|dir> requires an e2e test name, a YAML file path, or a directory path.";
     return usageError(message, message);
   }
   const fail = (message, code, err = message) => {
@@ -37461,109 +37690,112 @@ async function flow(argv, options) {
     return exitAfterFlush(code);
   };
   const projectRoot = process.cwd();
-  const { suppliedPath, fromName } = resolveFlowRef(args.flowRef);
+  const { suppliedPath, fromName, shadowed } = await resolveFlowRef(args.flowRef, projectRoot);
+  if (shadowed !== void 0) {
+    printWarnings([e2eShadowWarning(suppliedPath, shadowed)], args.json);
+  }
   if (suppliedPath.split(/[\\/]+/).includes("..")) {
-    let recovery = "Pass the fully resolved path to the flow's YAML.";
-    const suppliedBase2 = path17.basename(suppliedPath);
+    let recovery = "Pass the fully resolved path to the e2e test's YAML.";
+    const suppliedBase2 = path18.basename(suppliedPath);
     if (suppliedBase2 !== ".." && suppliedBase2 !== ".") {
       try {
-        const resolved = path17.join(await fsp.realpath(path17.dirname(suppliedPath)), suppliedBase2);
+        const resolved = path18.join(await fsp.realpath(path18.dirname(suppliedPath)), suppliedBase2);
         await fsp.stat(resolved);
-        recovery = `Did you mean: argent flow run ${shellQuoteArg(resolved)}`;
+        recovery = `Did you mean: argent e2e run ${shellQuoteArg(resolved)}`;
       } catch {
       }
     }
     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}
+      `E2E test 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,
       2
     );
   }
-  const resolvedPath = path17.resolve(projectRoot, suppliedPath);
+  const resolvedPath = path18.resolve(projectRoot, suppliedPath);
   let isDirectory = false;
   try {
     isDirectory = (await fsp.stat(resolvedPath)).isDirectory();
   } catch {
     if (args.recursive && !fromName) {
-      return fail(`Flow directory not found: ${resolvedPath}`, 2);
+      return fail(`E2E test 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 fail("--json-stream supports a single e2e test; directory runs are not supported.", 2);
     }
     return runFlowDirectory(resolvedPath, args, projectRoot, options);
   }
   if (args.recursive) {
     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}`,
+      fromName ? `e2e run --recursive requires a directory path; "${args.flowRef}" is a saved test's name, which always addresses the single file ${suppliedPath}.` : `e2e run --recursive requires a directory path: ${suppliedPath}`,
       2
     );
   }
   const separatorTrimmedPath = suppliedPath.replace(/[\\/]+$/, "");
   if (separatorTrimmedPath !== suppliedPath && separatorTrimmedPath !== "") {
-    const hint = SAFE_FLOW_NAME.test(separatorTrimmedPath) ? `.${path17.sep}${separatorTrimmedPath}` : separatorTrimmedPath;
+    const hint = SAFE_FLOW_NAME.test(separatorTrimmedPath) ? `.${path18.sep}${separatorTrimmedPath}` : separatorTrimmedPath;
     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)}`,
+      `E2E test 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 e2e run ${shellQuoteArg(hint)}`,
       2
     );
   }
-  if (path17.extname(suppliedPath) !== ".yaml") {
-    const looksLikeName = !suppliedPath.includes("/") && !suppliedPath.includes("\\") && path17.extname(suppliedPath) === "";
-    if (path17.basename(suppliedPath).toLowerCase() === ".yaml") {
+  if (path18.extname(suppliedPath) !== ".yaml") {
+    const looksLikeName = !suppliedPath.includes("/") && !suppliedPath.includes("\\") && path18.extname(suppliedPath) === "";
+    if (path18.basename(suppliedPath).toLowerCase() === ".yaml") {
       return fail(
-        `Flow filename must have a non-empty name containing only letters, numbers, "_", or "-": ${suppliedPath}`,
+        `E2E test filename must have a non-empty name containing only letters, numbers, "_", or "-": ${suppliedPath}`,
         2
       );
     }
     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.`,
+        `E2E test name must contain only letters, numbers, "_", or "-": ${suppliedPath}
+Names run \`${E2E_DIRS.map((dir) => `${dir}/<name>.yaml`).join("` or `")}\`; pass a path ending in .yaml to run an e2e test file kept elsewhere.`,
         2
       );
     }
-    if (path17.extname(suppliedPath).toLowerCase() === ".yaml") {
+    if (path18.extname(suppliedPath).toLowerCase() === ".yaml") {
       return fail(
-        `Flow extension must be lowercase .yaml, not ${path17.extname(suppliedPath)}: ${suppliedPath}`,
+        `E2E test extension must be lowercase .yaml, not ${path18.extname(suppliedPath)}: ${suppliedPath}`,
         2
       );
     }
-    return fail(`Flow path must end in .yaml: ${suppliedPath}`, 2);
+    return fail(`E2E test path must end in .yaml: ${suppliedPath}`, 2);
   }
-  const flowName = path17.basename(suppliedPath, ".yaml");
+  const flowName = path18.basename(suppliedPath, ".yaml");
   if (!SAFE_FLOW_NAME.test(flowName)) {
     return fail(
-      `Flow filename must have a non-empty name containing only letters, numbers, "_", or "-": ${suppliedPath}`,
+      `E2E test filename must have a non-empty name containing only letters, numbers, "_", or "-": ${suppliedPath}`,
       2
     );
   }
   const flowPath = resolvedPath;
   try {
-    const stat6 = await fsp.stat(flowPath);
-    if (!stat6.isFile()) {
-      return fail(`Flow path is not a file: ${flowPath}`, 2);
+    const stat7 = await fsp.stat(flowPath);
+    if (!stat7.isFile()) {
+      return fail(`E2E test path is not a file: ${flowPath}`, 2);
     }
     await fsp.access(flowPath, fsConstants2.R_OK);
   } catch (err) {
     const code = err.code;
-    const detail = code === "ENOENT" ? "Flow file not found" : "Could not read flow file";
+    const detail = code === "ENOENT" ? "E2E test file not found" : "Could not read e2e test file";
     let recovery = "";
     if (code === "ENOENT") {
       recovery = fromName ? `
-No flow named "${args.flowRef}" is saved there \u2014 run \`argent flow list\` to see the saved flows.` : await savedFlowHint(projectRoot, flowPath);
+No e2e test named "${args.flowRef}" is saved in ${E2E_DIRS.join(" or ")} \u2014 run \`argent e2e list\` to see the saved tests.` : await savedFlowHint(projectRoot, flowPath);
     }
     return fail(`${detail}: ${flowPath}${recovery}`, 2);
   }
-  const suppliedBase = path17.basename(flowPath);
-  const siblings = await fsp.readdir(path17.dirname(flowPath)).catch(() => null);
+  const suppliedBase = path18.basename(flowPath);
+  const siblings = await fsp.readdir(path18.dirname(flowPath)).catch(() => null);
   if (siblings !== null && !siblings.includes(suppliedBase)) {
     const actual = siblings.find((name) => name.toLowerCase() === suppliedBase.toLowerCase());
-    const actualRunnable = actual !== void 0 && path17.extname(actual) === ".yaml" && SAFE_FLOW_NAME.test(path17.basename(actual, ".yaml"));
-    const recovery = actualRunnable ? fromName ? `Did you mean: argent flow run ${path17.basename(actual, ".yaml")}` : `Did you mean: argent flow run ${shellQuoteArg(path17.join(path17.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.";
+    const actualRunnable = actual !== void 0 && path18.extname(actual) === ".yaml" && SAFE_FLOW_NAME.test(path18.basename(actual, ".yaml"));
+    const recovery = actualRunnable ? fromName ? `Did you mean: argent e2e run ${path18.basename(actual, ".yaml")}` : `Did you mean: argent e2e run ${shellQuoteArg(path18.join(path18.dirname(suppliedPath), actual))}` : actual !== void 0 ? `Rename ${actual} to ${suppliedBase} to run it \u2014 e2e test files must be lowercase .yaml.` : "Pass the e2e test file's name exactly as it appears on disk.";
     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}
+      `E2E test 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 test name (which keys the report, __baselines__/, and --output) would be one no file carries: ${suppliedPath}
 ${recovery}`,
       2
     );
@@ -37578,7 +37810,7 @@ ${recovery}`,
       writeJsonStreamRecord({ event: "progress", data: s });
       return;
     }
-    if (liveSteps === 0) console.log(`Flow "${flowName}"`);
+    if (liveSteps === 0) console.log(`E2E test "${flowName}"`);
     liveSteps++;
     if (s.kind === "echo") {
       const line = renderEchoLine(s);
@@ -37593,7 +37825,7 @@ ${recovery}`,
   let report;
   try {
     const resp = await callTool(
-      "flow-execute",
+      RUN_TOOL_ID,
       payload,
       args.json ? void 0 : { onProgress: onStepReport }
     );
@@ -37601,7 +37833,7 @@ ${recovery}`,
   } catch (err) {
     const unreachableErr = await toolServerUnreachable(err);
     if (!args.json && !args.jsonStream) {
-      if (liveSteps === 0) console.log(`Flow "${flowName}"`);
+      if (liveSteps === 0) console.log(`E2E test "${flowName}"`);
       console.log(
         `  ${STATUS_GLYPH.error} ` + (unreachableErr ? UNREACHABLE_VERDICT : err instanceof ToolInvocationError && err.errorKind === "validation" ? rejectionVerdict(err.errorCode) : "did not finish (run error)")
       );
@@ -37611,15 +37843,16 @@ ${recovery}`,
   }
   if (!isFlowReport(report)) {
     if (!args.json && !args.jsonStream) {
-      if (liveSteps === 0) console.log(`Flow "${flowName}"`);
+      if (liveSteps === 0) console.log(`E2E test "${flowName}"`);
       console.log(`  ${STATUS_GLYPH.error} did not finish (no run report)`);
     }
     return fail(`"${flowName}" did not produce a run report.`, 2);
   }
+  printWarnings(nestedStepWarnings(report.steps), args.json);
   try {
     await exportAndResolveArtifacts(
       report,
-      args.output ? path17.resolve(args.output) : void 0,
+      args.output ? path18.resolve(args.output) : void 0,
       flowPath,
       baseUrl
     );
@@ -37658,7 +37891,7 @@ function summarize(description, max = 80) {
 async function tools(argv, options) {
   const { fetchTool, fetchTools } = createToolsClient({ paths: options.paths });
   async function listTools(json3) {
-    const list = await fetchTools();
+    const list = (await fetchTools()).filter((tool) => tool.aliasOf === void 0);
     if (json3) {
       console.log(JSON.stringify(list, null, 2));
       return;
@@ -37733,12 +37966,12 @@ Listing tools contacts the argent tool-server, starting one if none is running.
 }
 
 // ../argent-cli/src/server.ts
-import * as fs12 from "node:fs";
-import * as path18 from "node:path";
+import * as fs13 from "node:fs";
+import * as path19 from "node:path";
 import { homedir as homedir5, networkInterfaces } from "node:os";
 import { spawn as spawn3 } from "node:child_process";
-var STATE_DIR2 = path18.join(homedir5(), ".argent");
-var LOG_FILE2 = path18.join(STATE_DIR2, "tool-server.log");
+var STATE_DIR2 = path19.join(homedir5(), ".argent");
+var LOG_FILE2 = path19.join(STATE_DIR2, "tool-server.log");
 async function describeForeignServers(ownBundlePath) {
   const others = (await readAllToolsServerStates()).filter(
     ({ state: state2 }) => state2.bundlePath !== ownBundlePath && isToolsServerProcessAlive(state2.pid)
@@ -37802,12 +38035,12 @@ Stop one with: kill <pid>`);
   }
 }
 function logsCmd(follow) {
-  if (!fs12.existsSync(LOG_FILE2)) {
+  if (!fs13.existsSync(LOG_FILE2)) {
     console.log(`No log file at ${LOG_FILE2}`);
     return;
   }
   if (!follow) {
-    process.stdout.write(fs12.readFileSync(LOG_FILE2, "utf8"));
+    process.stdout.write(fs13.readFileSync(LOG_FILE2, "utf8"));
     return;
   }
   const child = spawn3("tail", ["-f", LOG_FILE2], { stdio: "inherit" });
@@ -38131,9 +38364,9 @@ async function server(argv, options) {
 }
 
 // ../argent-cli/src/lens.ts
-import * as fs13 from "node:fs";
+import * as fs14 from "node:fs";
 import * as os2 from "node:os";
-import * as path19 from "node:path";
+import * as path20 from "node:path";
 
 // ../argent-cli/src/lens-terminal.ts
 import { execFileSync as execFileSync3 } from "node:child_process";
@@ -38351,15 +38584,15 @@ function isSessionAlive(session) {
 // ../argent-cli/src/lens-pty.ts
 import { chmodSync as chmodSync2, readdirSync as readdirSync2 } from "node:fs";
 import { createRequire } from "node:module";
-import { dirname as dirname11, join as join17 } from "node:path";
+import { dirname as dirname12, join as join19 } from "node:path";
 var nodeRequire = createRequire(import.meta.url);
 function ensureSpawnHelperExecutable(req = nodeRequire) {
   if (process.platform !== "darwin") return;
   try {
-    const prebuilds = join17(dirname11(req.resolve("node-pty/package.json")), "prebuilds");
+    const prebuilds = join19(dirname12(req.resolve("node-pty/package.json")), "prebuilds");
     for (const entry of readdirSync2(prebuilds)) {
       try {
-        chmodSync2(join17(prebuilds, entry, "spawn-helper"), 493);
+        chmodSync2(join19(prebuilds, entry, "spawn-helper"), 493);
       } catch {
       }
     }
@@ -38391,7 +38624,7 @@ function ptyInjectBeats(text2) {
   ];
 }
 function sleep(ms) {
-  return new Promise((resolve12) => setTimeout(resolve12, ms));
+  return new Promise((resolve13) => setTimeout(resolve13, ms));
 }
 var DEFAULT_COLS = 80;
 var DEFAULT_ROWS = 24;
@@ -38612,7 +38845,7 @@ var SPAWN_GRACE_MS = 8e3;
 var DEATH_CONFIRMATIONS = 3;
 var SSE_RECONNECT_MS = 1e3;
 function sleep2(ms) {
-  return new Promise((resolve12) => setTimeout(resolve12, ms));
+  return new Promise((resolve13) => setTimeout(resolve13, ms));
 }
 var TRUST_PROMPT_RE = /trust this folder|do you trust|yes,? i trust|trust the files in this/i;
 async function dismissTrustPrompt(session) {
@@ -38884,12 +39117,12 @@ async function lens(argv, options) {
     await endSession(baseUrl);
     process.exit(1);
   }
-  const seedFile = path19.join(os2.tmpdir(), `argent-lens-seed-${process.pid}-${Date.now()}.txt`);
-  fs13.writeFileSync(seedFile, buildSeedPrompt(), "utf8");
+  const seedFile = path20.join(os2.tmpdir(), `argent-lens-seed-${process.pid}-${Date.now()}.txt`);
+  fs14.writeFileSync(seedFile, buildSeedPrompt(), "utf8");
   const launchCmd = agent.launch(shellQuote(process.cwd()), shellQuote(seedFile));
   const removeSeedFile = () => {
     try {
-      fs13.rmSync(seedFile, { force: true });
+      fs14.rmSync(seedFile, { force: true });
     } catch {
     }
   };
@@ -39248,7 +39481,7 @@ Options:
 
 // ../argent-cli/src/config.ts
 var import_picocolors2 = __toESM(require_picocolors(), 1);
-import * as path20 from "node:path";
+import * as path21 from "node:path";
 function config2(argv) {
   if (argv.length === 0 || argv[0] === "--help" || argv[0] === "-h") {
     printUsage();
@@ -39419,16 +39652,16 @@ function wantsHelp(argv) {
 }
 function scopeLabel(scope) {
   if (scope === "global") return "global";
-  return `project: ${path20.dirname(configDir("project"))}`;
+  return `project: ${path21.dirname(configDir("project"))}`;
 }
 function degenerateProjectScopeWarning(scope) {
   if (scope !== "project") return null;
   const projDir = configDir("project");
-  if (path20.resolve(projDir) === path20.resolve(configDir("global"))) {
-    return `WARNING: no project found between ${process.cwd()} and your home directory \u2014 "project" scope resolved to the home directory, so this writes the GLOBAL config file (${path20.join(projDir, "config.json")}).`;
+  if (path21.resolve(projDir) === path21.resolve(configDir("global"))) {
+    return `WARNING: no project found between ${process.cwd()} and your home directory \u2014 "project" scope resolved to the home directory, so this writes the GLOBAL config file (${path21.join(projDir, "config.json")}).`;
   }
   if (findProjectRoot(process.cwd()) === null) {
-    return `WARNING: no project markers (.argent, .git, package.json) found above ${process.cwd()} \u2014 treating it as the project root and creating ${path20.join(projDir, "config.json")}.`;
+    return `WARNING: no project markers (.argent, .git, package.json) found above ${process.cwd()} \u2014 treating it as the project root and creating ${path21.join(projDir, "config.json")}.`;
   }
   return null;
 }
@@ -40345,7 +40578,7 @@ import { styleText as styleText2, stripVTControlCharacters } from "node:util";
 import process$1 from "node:process";
 var import_sisteransi2 = __toESM(require_src(), 1);
 import { existsSync as existsSync7, lstatSync as lstatSync3, readdirSync as readdirSync3 } from "node:fs";
-import { dirname as dirname13, join as join20 } from "node:path";
+import { dirname as dirname14, join as join22 } from "node:path";
 function isUnicodeSupported() {
   if (process$1.platform !== "win32") {
     return process$1.env.TERM !== "linux";
@@ -41347,8 +41580,8 @@ async function cmdDisable(scope) {
 
 // ../argent-cli/src/providers.ts
 var import_picocolors7 = __toESM(require_picocolors(), 1);
-import * as fs17 from "node:fs";
-import * as path23 from "node:path";
+import * as fs18 from "node:fs";
+import * as path24 from "node:path";
 
 // ../device-providers/src/contract.ts
 var PROVIDER_SCHEMA_VERSION = 1;
@@ -41493,9 +41726,9 @@ var providerEnvelopeSchema = providerRecordSchema.extend({
 });
 
 // ../device-providers/src/read.ts
-import * as fs14 from "node:fs";
+import * as fs15 from "node:fs";
 import * as os3 from "node:os";
-import * as path21 from "node:path";
+import * as path22 from "node:path";
 var DISABLE_ENV = "ARGENT_DISABLE_DEVICE_PROVIDERS";
 var OVERRIDE_ENV = "ARGENT_DEVICE_PROVIDERS";
 function resolveHomeDir2() {
@@ -41504,7 +41737,7 @@ function resolveHomeDir2() {
   return trimmed ? raw : os3.homedir();
 }
 function providersDirectory() {
-  return path21.join(resolveHomeDir2(), ".argent", "providers");
+  return path22.join(resolveHomeDir2(), ".argent", "providers");
 }
 function discoveryDisabled() {
   const raw = process.env[DISABLE_ENV];
@@ -41520,7 +41753,7 @@ function warnOnce(key, message) {
 function readProviderFile(file2) {
   let raw;
   try {
-    raw = fs14.readFileSync(file2, "utf8");
+    raw = fs15.readFileSync(file2, "utf8");
   } catch {
     return void 0;
   }
@@ -41570,15 +41803,15 @@ function discoverProviders() {
 function descriptorFiles() {
   const directory = providersDirectory();
   try {
-    return fs14.readdirSync(directory).filter((name) => name.endsWith(".json")).sort().map((name) => path21.join(directory, name));
+    return fs15.readdirSync(directory).filter((name) => name.endsWith(".json")).sort().map((name) => path22.join(directory, name));
   } catch {
     return [];
   }
 }
 
 // ../device-providers/src/write.ts
-import * as fs15 from "node:fs";
-import * as path22 from "node:path";
+import * as fs16 from "node:fs";
+import * as path23 from "node:path";
 var ProviderValidationError = class extends Error {
   /** One line per problem, `path: message`, in the order zod reported them. */
   issues;
@@ -41630,20 +41863,20 @@ function publishProvider(record2, options = {}) {
     );
   }
   const directory = providersDirectory();
-  const file2 = path22.join(directory, `${validated.id}.json`);
+  const file2 = path23.join(directory, `${validated.id}.json`);
   const body = JSON.stringify(canonicalize(candidate), null, 2) + "\n";
   try {
-    if (fs15.readFileSync(file2, "utf8") === body) return { changed: false, path: file2 };
+    if (fs16.readFileSync(file2, "utf8") === body) return { changed: false, path: file2 };
   } catch {
   }
-  fs15.mkdirSync(directory, { recursive: true });
+  fs16.mkdirSync(directory, { recursive: true });
   const temporary = `${file2}.${process.pid}.tmp`;
   try {
-    fs15.writeFileSync(temporary, body);
-    fs15.renameSync(temporary, file2);
+    fs16.writeFileSync(temporary, body);
+    fs16.renameSync(temporary, file2);
   } catch (error63) {
     try {
-      fs15.rmSync(temporary, { force: true });
+      fs16.rmSync(temporary, { force: true });
     } catch {
     }
     throw error63;
@@ -41654,9 +41887,9 @@ function withdrawProvider(id) {
   if (!PROVIDER_ID_SHAPE.test(id)) {
     throw new Error(`'${id}' is not a valid provider id (${String(PROVIDER_ID_SHAPE)}).`);
   }
-  const file2 = path22.join(providersDirectory(), `${id}.json`);
+  const file2 = path23.join(providersDirectory(), `${id}.json`);
   try {
-    fs15.unlinkSync(file2);
+    fs16.unlinkSync(file2);
     return true;
   } catch (e) {
     if (e.code === "ENOENT") return false;
@@ -41686,7 +41919,7 @@ function pruneOrphanedProviders(options = {}) {
       continue;
     }
     try {
-      fs15.unlinkSync(file2);
+      fs16.unlinkSync(file2);
       removed.push(entry);
     } catch {
     }
@@ -41696,7 +41929,7 @@ function pruneOrphanedProviders(options = {}) {
 
 // ../argent-cli/src/providers-check.ts
 var import_picocolors6 = __toESM(require_picocolors(), 1);
-import * as fs16 from "node:fs";
+import * as fs17 from "node:fs";
 var KNOWN_CAPABILITIES = new Set(EXTERNAL_CAPABILITIES);
 var PROBE_TIMEOUT_MS = 5e3;
 function error62(message) {
@@ -41762,7 +41995,7 @@ async function checkDevices(devices, findings) {
         );
       } else {
         try {
-          fs16.accessSync(device.deviceSet, fs16.constants.R_OK);
+          fs17.accessSync(device.deviceSet, fs17.constants.R_OK);
         } catch {
           findings.push(
             error62(`${label}: deviceSet '${device.deviceSet}' is not readable by this user`)
@@ -41819,7 +42052,7 @@ async function checkDevices(devices, findings) {
         );
       } else {
         try {
-          fs16.accessSync(device.nativeDevtools.socketPath, fs16.constants.R_OK | fs16.constants.W_OK);
+          fs17.accessSync(device.nativeDevtools.socketPath, fs17.constants.R_OK | fs17.constants.W_OK);
         } catch {
           findings.push(
             error62(
@@ -41890,7 +42123,7 @@ async function checkDescriptorFile(file2, expectedVersion) {
   const report = { deviceCount: 0, findings, source: file2 };
   let raw;
   try {
-    raw = fs16.readFileSync(file2, "utf8");
+    raw = fs17.readFileSync(file2, "utf8");
   } catch (e) {
     findings.push(error62(`unreadable: ${e instanceof Error ? e.message : String(e)}`));
     return report;
@@ -42026,7 +42259,7 @@ async function readDocument(args) {
   }
   if (args.file) {
     try {
-      return { raw: fs17.readFileSync(args.file, "utf8"), source: args.file };
+      return { raw: fs18.readFileSync(args.file, "utf8"), source: args.file };
     } catch (e) {
       throw new UsageError2(
         `cannot read ${args.file}: ${e instanceof Error ? e.message : String(e)}`
@@ -42159,7 +42392,7 @@ function runWithdraw(args) {
     throw new UsageError2(`'${id}' is not a valid provider id (${String(PROVIDER_ID_SHAPE)})`);
   }
   const removed = withdrawProvider(id);
-  const file2 = path23.join(providersDirectory(), `${id}.json`);
+  const file2 = path24.join(providersDirectory(), `${id}.json`);
   if (args.json) {
     console.log(JSON.stringify({ ok: true, path: file2, removed }, null, 2));
     return;
@@ -42367,9 +42600,10 @@ export {
   FLAG_REGISTRY,
   config2 as config,
   disable,
+  e2e,
   enable,
   flags,
-  flow,
+  e2e as flow,
   getFlagDefinition,
   isFlagEnabled,
   lens,