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

package/dist/tool-server.cjs

@@ -482,11 +482,14 @@ var init_artifacts = __esm({
 function isFileInputWire(value) {
   return !!value && typeof value === "object" && value[FILE_INPUT_MARKER] === true && typeof value.path === "string";
 }
-var FILE_INPUT_MARKER, CLIENT_FILE_MARKER;
+var FILE_INPUT_MARKER, FLOW_NAME_CHARSET, FLOW_NAME_PATTERN, FLOW_FILE_NAME_PATTERN, CLIENT_FILE_MARKER;
 var init_file_inputs = __esm({
   "../registry/src/file-inputs.ts"() {
     "use strict";
     FILE_INPUT_MARKER = "__argentFileInput";
+    FLOW_NAME_CHARSET = "[A-Za-z0-9_-]+";
+    FLOW_NAME_PATTERN = new RegExp(`^${FLOW_NAME_CHARSET}$`);
+    FLOW_FILE_NAME_PATTERN = new RegExp(`^${FLOW_NAME_CHARSET}\\.yaml$`);
     CLIENT_FILE_MARKER = "__argentClientFile";
   }
 });
@@ -21741,10 +21744,10 @@ var require_raw_body = __commonJS({
       if (done) {
         return readStream(stream, encoding, length, limit, wrap(done));
       }
-      return new Promise(function executor(resolve9, reject) {
+      return new Promise(function executor(resolve10, reject) {
         readStream(stream, encoding, length, limit, function onRead(err, buf) {
           if (err) return reject(err);
-          resolve9(buf);
+          resolve10(buf);
         });
       });
     }
@@ -31573,7 +31576,7 @@ var require_mime_types = __commonJS({
   "../../node_modules/type-is/node_modules/mime-types/index.js"(exports2) {
     "use strict";
     var db = require_mime_db();
-    var extname4 = require("path").extname;
+    var extname6 = require("path").extname;
     var mimeScore = require_mimeScore();
     var EXTRACT_TYPE_REGEXP = /^\s*([^;\s]*)(?:;|\s|$)/;
     var TEXT_TYPE_REGEXP = /^text\//i;
@@ -31629,7 +31632,7 @@ var require_mime_types = __commonJS({
       if (!path40 || typeof path40 !== "string") {
         return false;
       }
-      var extension3 = extname4("x." + path40).toLowerCase().slice(1);
+      var extension3 = extname6("x." + path40).toLowerCase().slice(1);
       if (!extension3) {
         return false;
       }
@@ -35256,15 +35259,15 @@ var require_view = __commonJS({
     var path40 = require("node:path");
     var fs55 = require("node:fs");
     var dirname14 = path40.dirname;
-    var basename10 = path40.basename;
-    var extname4 = path40.extname;
+    var basename12 = path40.basename;
+    var extname6 = path40.extname;
     var join47 = path40.join;
-    var resolve9 = path40.resolve;
+    var resolve10 = path40.resolve;
     module2.exports = View;
     function View(name, options) {
       var opts = options || {};
       this.defaultEngine = opts.defaultEngine;
-      this.ext = extname4(name);
+      this.ext = extname6(name);
       this.name = name;
       this.root = opts.root;
       if (!this.ext && !this.defaultEngine) {
@@ -35293,9 +35296,9 @@ var require_view = __commonJS({
       debug('lookup "%s"', name);
       for (var i = 0; i < roots.length && !path41; i++) {
         var root2 = roots[i];
-        var loc = resolve9(root2, name);
+        var loc = resolve10(root2, name);
         var dir = dirname14(loc);
-        var file2 = basename10(loc);
+        var file2 = basename12(loc);
         path41 = this.resolve(dir, file2);
       }
       return path41;
@@ -35318,14 +35321,14 @@ var require_view = __commonJS({
       });
       sync = false;
     };
-    View.prototype.resolve = function resolve10(dir, file2) {
+    View.prototype.resolve = function resolve11(dir, file2) {
       var ext = this.ext;
       var path41 = join47(dir, file2);
       var stat4 = tryStat(path41);
       if (stat4 && stat4.isFile()) {
         return path41;
       }
-      path41 = join47(dir, basename10(file2, ext), "index" + ext);
+      path41 = join47(dir, basename12(file2, ext), "index" + ext);
       stat4 = tryStat(path41);
       if (stat4 && stat4.isFile()) {
         return path41;
@@ -44892,7 +44895,7 @@ var require_mime_types2 = __commonJS({
   "../../node_modules/express/node_modules/mime-types/index.js"(exports2) {
     "use strict";
     var db = require_mime_db2();
-    var extname4 = require("path").extname;
+    var extname6 = require("path").extname;
     var mimeScore = require_mimeScore2();
     var EXTRACT_TYPE_REGEXP = /^\s*([^;\s]*)(?:;|\s|$)/;
     var TEXT_TYPE_REGEXP = /^text\//i;
@@ -44948,7 +44951,7 @@ var require_mime_types2 = __commonJS({
       if (!path40 || typeof path40 !== "string") {
         return false;
       }
-      var extension3 = extname4("x." + path40).toLowerCase().slice(1);
+      var extension3 = extname6("x." + path40).toLowerCase().slice(1);
       if (!extension3) {
         return false;
       }
@@ -47082,7 +47085,7 @@ var require_application = __commonJS({
     var compileETag = require_utils3().compileETag;
     var compileQueryParser = require_utils3().compileQueryParser;
     var compileTrust = require_utils3().compileTrust;
-    var resolve9 = require("node:path").resolve;
+    var resolve10 = require("node:path").resolve;
     var once = require_once();
     var Router2 = require_router();
     var slice = Array.prototype.slice;
@@ -47136,7 +47139,7 @@ var require_application = __commonJS({
       this.mountpath = "/";
       this.locals.settings = this.settings;
       this.set("view", View);
-      this.set("views", resolve9("views"));
+      this.set("views", resolve10("views"));
       this.set("jsonp callback name", "callback");
       if (env === "production") {
         this.enable("view cache");
@@ -57248,7 +57251,7 @@ var require_mime_types3 = __commonJS({
   "../../node_modules/accepts/node_modules/mime-types/index.js"(exports2) {
     "use strict";
     var db = require_mime_db3();
-    var extname4 = require("path").extname;
+    var extname6 = require("path").extname;
     var mimeScore = require_mimeScore3();
     var EXTRACT_TYPE_REGEXP = /^\s*([^;\s]*)(?:;|\s|$)/;
     var TEXT_TYPE_REGEXP = /^text\//i;
@@ -57304,7 +57307,7 @@ var require_mime_types3 = __commonJS({
       if (!path40 || typeof path40 !== "string") {
         return false;
       }
-      var extension3 = extname4("x." + path40).toLowerCase().slice(1);
+      var extension3 = extname6("x." + path40).toLowerCase().slice(1);
       if (!extension3) {
         return false;
       }
@@ -57770,9 +57773,9 @@ var require_content_disposition = __commonJS({
       if (typeof fallback === "string" && NON_LATIN1_REGEXP.test(fallback)) {
         throw new TypeError("fallback must be ISO-8859-1 string");
       }
-      var name = basename10(filename);
+      var name = basename12(filename);
       var isQuotedString = TEXT_REGEXP.test(name);
-      var fallbackName = typeof fallback !== "string" ? fallback && getlatin1(name) : basename10(fallback);
+      var fallbackName = typeof fallback !== "string" ? fallback && getlatin1(name) : basename12(fallback);
       var hasFallback = typeof fallbackName === "string" && fallbackName !== name;
       if (hasFallback || !isQuotedString || hasHexEscape(name)) {
         params["filename*"] = name;
@@ -57892,7 +57895,7 @@ var require_content_disposition = __commonJS({
       this.type = type;
       this.parameters = parameters;
     }
-    function basename10(path40) {
+    function basename12(path40) {
       const normalized = path40.replaceAll("\\", "/");
       let end = normalized.length;
       while (end > 0 && normalized[end - 1] === "/") {
@@ -67528,7 +67531,7 @@ var require_mime_types4 = __commonJS({
   "../../node_modules/send/node_modules/mime-types/index.js"(exports2) {
     "use strict";
     var db = require_mime_db4();
-    var extname4 = require("path").extname;
+    var extname6 = require("path").extname;
     var mimeScore = require_mimeScore4();
     var EXTRACT_TYPE_REGEXP = /^\s*([^;\s]*)(?:;|\s|$)/;
     var TEXT_TYPE_REGEXP = /^text\//i;
@@ -67584,7 +67587,7 @@ var require_mime_types4 = __commonJS({
       if (!path40 || typeof path40 !== "string") {
         return false;
       }
-      var extension3 = extname4("x." + path40).toLowerCase().slice(1);
+      var extension3 = extname6("x." + path40).toLowerCase().slice(1);
       if (!extension3) {
         return false;
       }
@@ -67648,11 +67651,11 @@ var require_send = __commonJS({
     var statuses = require_statuses();
     var Stream2 = require("stream");
     var util = require("util");
-    var extname4 = path40.extname;
+    var extname6 = path40.extname;
     var join47 = path40.join;
     var normalize = path40.normalize;
-    var resolve9 = path40.resolve;
-    var sep6 = path40.sep;
+    var resolve10 = path40.resolve;
+    var sep7 = path40.sep;
     var BYTES_RANGE_REGEXP = /^ *bytes=/;
     var MAX_MAXAGE = 60 * 60 * 24 * 365 * 1e3;
     var UP_PATH_REGEXP = /(?:^|[\\/])\.\.(?:[\\/]|$)/;
@@ -67680,7 +67683,7 @@ var require_send = __commonJS({
       this._maxage = opts.maxAge || opts.maxage;
       this._maxage = typeof this._maxage === "string" ? ms(this._maxage) : Number(this._maxage);
       this._maxage = !isNaN(this._maxage) ? Math.min(Math.max(0, this._maxage), MAX_MAXAGE) : 0;
-      this._root = opts.root ? resolve9(opts.root) : null;
+      this._root = opts.root ? resolve10(opts.root) : null;
     }
     util.inherits(SendStream, Stream2);
     SendStream.prototype.error = function error52(status, err) {
@@ -67813,14 +67816,14 @@ var require_send = __commonJS({
       var parts;
       if (root2 !== null) {
         if (path41) {
-          path41 = normalize("." + sep6 + path41);
+          path41 = normalize("." + sep7 + path41);
         }
         if (UP_PATH_REGEXP.test(path41)) {
           debug('malicious path "%s"', path41);
           this.error(403);
           return res;
         }
-        parts = path41.split(sep6);
+        parts = path41.split(sep7);
         path41 = normalize(join47(root2, path41));
       } else {
         if (UP_PATH_REGEXP.test(path41)) {
@@ -67828,8 +67831,8 @@ var require_send = __commonJS({
           this.error(403);
           return res;
         }
-        parts = normalize(path41).split(sep6);
-        path41 = resolve9(path41);
+        parts = normalize(path41).split(sep7);
+        path41 = resolve10(path41);
       }
       if (containsDotFile(parts)) {
         debug('%s dotfile "%s"', this._dotfiles, path41);
@@ -67922,8 +67925,8 @@ var require_send = __commonJS({
       var self2 = this;
       debug('stat "%s"', path41);
       fs55.stat(path41, function onstat(err, stat4) {
-        var pathEndsWithSep = path41[path41.length - 1] === sep6;
-        if (err && err.code === "ENOENT" && !extname4(path41) && !pathEndsWithSep) {
+        var pathEndsWithSep = path41[path41.length - 1] === sep7;
+        if (err && err.code === "ENOENT" && !extname6(path41) && !pathEndsWithSep) {
           return next(err);
         }
         if (err) return self2.onStatError(err);
@@ -67986,7 +67989,7 @@ var require_send = __commonJS({
     SendStream.prototype.type = function type(path41) {
       var res = this.res;
       if (res.getHeader("Content-Type")) return;
-      var ext = extname4(path41);
+      var ext = extname6(path41);
       var type2 = mime.contentType(ext) || "application/octet-stream";
       debug("content-type %s", type2);
       res.setHeader("Content-Type", type2);
@@ -68206,8 +68209,8 @@ var require_response = __commonJS({
     var setCharset = require_utils3().setCharset;
     var cookie = require_cookie();
     var send = require_send();
-    var extname4 = path40.extname;
-    var resolve9 = path40.resolve;
+    var extname6 = path40.extname;
+    var resolve10 = path40.resolve;
     var vary = require_vary();
     var { Buffer: Buffer2 } = require("node:buffer");
     var res = Object.create(http5.ServerResponse.prototype);
@@ -68413,7 +68416,7 @@ var require_response = __commonJS({
       }
       opts = Object.create(opts);
       opts.headers = headers;
-      var fullPath = !opts.root ? resolve9(path41) : path41;
+      var fullPath = !opts.root ? resolve10(path41) : path41;
       return this.sendFile(fullPath, opts, done);
     };
     res.contentType = res.type = function contentType(type) {
@@ -68444,7 +68447,7 @@ var require_response = __commonJS({
     };
     res.attachment = function attachment(filename) {
       if (filename) {
-        this.type(extname4(filename));
+        this.type(extname6(filename));
       }
       this.set("Content-Disposition", contentDisposition(filename));
       return this;
@@ -68662,7 +68665,7 @@ var require_serve_static = __commonJS({
     var encodeUrl = require_encodeurl();
     var escapeHtml = require_escape_html();
     var parseUrl = require_parseurl();
-    var resolve9 = require("path").resolve;
+    var resolve10 = require("path").resolve;
     var send = require_send();
     var url2 = require("url");
     module2.exports = serveStatic;
@@ -68681,7 +68684,7 @@ var require_serve_static = __commonJS({
         throw new TypeError("option setHeaders must be function");
       }
       opts.maxage = opts.maxage || opts.maxAge || 0;
-      opts.root = resolve9(root2);
+      opts.root = resolve10(root2);
       var onDirectory = redirect ? createRedirectDirectoryListener() : createNotFoundDirectoryListener();
       return function serveStatic2(req, res, next) {
         if (req.method !== "GET" && req.method !== "HEAD") {
@@ -71033,13 +71036,13 @@ var require_min_release_age = __commonJS({
       return Number.isFinite(days) && days > 0 ? days * config_parse_1.DAY_MS : 0;
     }
     function probe3(p) {
-      return new Promise((resolve9) => {
+      return new Promise((resolve10) => {
         (0, node_child_process_1.exec)(p.command, { timeout: PROBE_TIMEOUT_MS, windowsHide: true }, (err, stdout) => {
           if (err) {
-            resolve9(0);
+            resolve10(0);
             return;
           }
-          resolve9(p.parse(stdout));
+          resolve10(p.parse(stdout));
         });
       });
     }
@@ -71072,12 +71075,12 @@ var require_registry = __commonJS({
     var node_https_1 = __importDefault(require("node:https"));
     var REQUEST_TIMEOUT_MS = 1e4;
     function fetchRegistryInfo2(url2) {
-      return new Promise((resolve9) => {
+      return new Promise((resolve10) => {
         let resolved = false;
         const safeResolve = (value) => {
           if (!resolved) {
             resolved = true;
-            resolve9(value);
+            resolve10(value);
           }
         };
         const req = node_https_1.default.get(url2, { timeout: REQUEST_TIMEOUT_MS }, (res) => {
@@ -72706,7 +72709,7 @@ var require_aspromise = __commonJS({
       var params = new Array(arguments.length - 1), offset = 0, index = 2, pending = true;
       while (index < arguments.length)
         params[offset++] = arguments[index++];
-      return new Promise(function executor(resolve9, reject) {
+      return new Promise(function executor(resolve10, reject) {
         params[offset] = function callback(err) {
           if (pending) {
             pending = false;
@@ -72716,7 +72719,7 @@ var require_aspromise = __commonJS({
               var params2 = new Array(arguments.length - 1), offset2 = 0;
               while (offset2 < params2.length)
                 params2[offset2++] = arguments[offset2];
-              resolve9.apply(null, params2);
+              resolve10.apply(null, params2);
             }
           }
         };
@@ -75213,13 +75216,13 @@ var require_path = __commonJS({
   "../../node_modules/@protobufjs/path/index.js"(exports2) {
     "use strict";
     var path40 = exports2;
-    var isAbsolute6 = (
+    var isAbsolute7 = (
       /**
        * Tests if the specified path is absolute.
        * @param {string} path Path to test
        * @returns {boolean} `true` if path is absolute
        */
-      path40.isAbsolute = function isAbsolute7(path41) {
+      path40.isAbsolute = function isAbsolute8(path41) {
         return /^(?:\/|\w+:)/.test(path41);
       }
     );
@@ -75231,7 +75234,7 @@ var require_path = __commonJS({
        */
       path40.normalize = function normalize2(path41) {
         path41 = path41.replace(/\\/g, "/").replace(/\/{2,}/g, "/");
-        var parts = path41.split("/"), absolute = isAbsolute6(path41), prefix = "";
+        var parts = path41.split("/"), absolute = isAbsolute7(path41), prefix = "";
         if (absolute)
           prefix = parts.shift() + "/";
         for (var i = 0; i < parts.length; ) {
@@ -75250,10 +75253,10 @@ var require_path = __commonJS({
         return prefix + parts.join("/");
       }
     );
-    path40.resolve = function resolve9(originPath, includePath, alreadyNormalized) {
+    path40.resolve = function resolve10(originPath, includePath, alreadyNormalized) {
       if (!alreadyNormalized)
         includePath = normalize(includePath);
-      if (isAbsolute6(includePath))
+      if (isAbsolute7(includePath))
         return includePath;
       if (!alreadyNormalized)
         originPath = normalize(originPath);
@@ -75607,7 +75610,7 @@ var require_mapfield = __commonJS({
         keepComments ? this.comment : void 0
       ]);
     };
-    MapField.prototype.resolve = function resolve9() {
+    MapField.prototype.resolve = function resolve10() {
       if (this.resolved)
         return this;
       if (types.mapKey[this.keyType] === void 0)
@@ -75684,7 +75687,7 @@ var require_method = __commonJS({
         this.parsedOptions
       ]);
     };
-    Method.prototype.resolve = function resolve9() {
+    Method.prototype.resolve = function resolve10() {
       if (this.resolved)
         return this;
       this.resolvedRequestType = this.parent.lookupType(this.requestType);
@@ -77297,7 +77300,7 @@ var require_field = __commonJS({
         keepComments ? this.comment : void 0
       ]);
     };
-    Field.prototype.resolve = function resolve9() {
+    Field.prototype.resolve = function resolve10() {
       if (this.resolved)
         return this;
       if ((this.typeDefault = types.defaults[this.type]) === void 0) {
@@ -77570,7 +77573,7 @@ var require_object = __commonJS({
       this.parent = null;
       this.resolved = false;
     };
-    ReflectionObject.prototype.resolve = function resolve9() {
+    ReflectionObject.prototype.resolve = function resolve10() {
       if (this.resolved)
         return this;
       if (this.root instanceof Root)
@@ -84726,7 +84729,7 @@ var require_minimatch = __commonJS({
 var require_path_is_absolute = __commonJS({
   "../../node_modules/path-is-absolute/index.js"(exports2, module2) {
     "use strict";
-    function posix3(path40) {
+    function posix5(path40) {
       return path40.charAt(0) === "/";
     }
     function win32(path40) {
@@ -84736,8 +84739,8 @@ var require_path_is_absolute = __commonJS({
       var isUnc = Boolean(device && device.charAt(1) !== ":");
       return Boolean(result[2] || isUnc);
     }
-    module2.exports = process.platform === "win32" ? win32 : posix3;
-    module2.exports.posix = posix3;
+    module2.exports = process.platform === "win32" ? win32 : posix5;
+    module2.exports.posix = posix5;
     module2.exports.win32 = win32;
   }
 });
@@ -84759,7 +84762,7 @@ var require_common3 = __commonJS({
     }
     var path40 = require("path");
     var minimatch = require_minimatch();
-    var isAbsolute6 = require_path_is_absolute();
+    var isAbsolute7 = require_path_is_absolute();
     var Minimatch = minimatch.Minimatch;
     function alphasorti(a, b) {
       return a.toLowerCase().localeCompare(b.toLowerCase());
@@ -84902,7 +84905,7 @@ var require_common3 = __commonJS({
       var abs = f;
       if (f.charAt(0) === "/") {
         abs = path40.join(self2.root, f);
-      } else if (isAbsolute6(f) || f === "") {
+      } else if (isAbsolute7(f) || f === "") {
         abs = f;
       } else if (self2.changedCwd) {
         abs = path40.resolve(self2.cwd, f);
@@ -84940,7 +84943,7 @@ var require_sync = __commonJS({
     var util = require("util");
     var path40 = require("path");
     var assert2 = require("assert");
-    var isAbsolute6 = require_path_is_absolute();
+    var isAbsolute7 = require_path_is_absolute();
     var common = require_common3();
     var alphasort = common.alphasort;
     var alphasorti = common.alphasorti;
@@ -85014,8 +85017,8 @@ var require_sync = __commonJS({
       var read;
       if (prefix === null)
         read = ".";
-      else if (isAbsolute6(prefix) || isAbsolute6(pattern.join("/"))) {
-        if (!prefix || !isAbsolute6(prefix))
+      else if (isAbsolute7(prefix) || isAbsolute7(pattern.join("/"))) {
+        if (!prefix || !isAbsolute7(prefix))
           prefix = "/" + prefix;
         read = prefix;
       } else
@@ -85200,7 +85203,7 @@ var require_sync = __commonJS({
         this.matches[index] = /* @__PURE__ */ Object.create(null);
       if (!exists2)
         return;
-      if (prefix && isAbsolute6(prefix) && !this.nomount) {
+      if (prefix && isAbsolute7(prefix) && !this.nomount) {
         var trail = /[\/\\]$/.test(prefix);
         if (prefix.charAt(0) === "/") {
           prefix = path40.join(this.root, prefix);
@@ -85320,7 +85323,7 @@ var require_glob = __commonJS({
     var EE = require("events").EventEmitter;
     var path40 = require("path");
     var assert2 = require("assert");
-    var isAbsolute6 = require_path_is_absolute();
+    var isAbsolute7 = require_path_is_absolute();
     var globSync = require_sync();
     var common = require_common3();
     var alphasort = common.alphasort;
@@ -85534,8 +85537,8 @@ var require_glob = __commonJS({
       var read;
       if (prefix === null)
         read = ".";
-      else if (isAbsolute6(prefix) || isAbsolute6(pattern.join("/"))) {
-        if (!prefix || !isAbsolute6(prefix))
+      else if (isAbsolute7(prefix) || isAbsolute7(pattern.join("/"))) {
+        if (!prefix || !isAbsolute7(prefix))
           prefix = "/" + prefix;
         read = prefix;
       } else
@@ -85767,7 +85770,7 @@ var require_glob = __commonJS({
         this.matches[index] = /* @__PURE__ */ Object.create(null);
       if (!exists2)
         return cb();
-      if (prefix && isAbsolute6(prefix) && !this.nomount) {
+      if (prefix && isAbsolute7(prefix) && !this.nomount) {
         var trail = /[\/\\]$/.test(prefix);
         if (prefix.charAt(0) === "/") {
           prefix = path40.join(this.root, prefix);
@@ -87604,7 +87607,7 @@ var require_util2 = __commonJS({
         }
         path40 = url2.path;
       }
-      var isAbsolute6 = exports2.isAbsolute(path40);
+      var isAbsolute7 = exports2.isAbsolute(path40);
       var parts = [];
       var start2 = 0;
       var i = 0;
@@ -87639,7 +87642,7 @@ var require_util2 = __commonJS({
       }
       path40 = parts.join("/");
       if (path40 === "") {
-        path40 = isAbsolute6 ? "/" : ".";
+        path40 = isAbsolute7 ? "/" : ".";
       }
       if (url2) {
         url2.path = path40;
@@ -95379,10 +95382,10 @@ var require_resolve_block_map = __commonJS({
       let offset = bm.offset;
       let commentEnd = null;
       for (const collItem of bm.items) {
-        const { start: start2, key, sep: sep6, value } = collItem;
+        const { start: start2, key, sep: sep7, value } = collItem;
         const keyProps = resolveProps.resolveProps(start2, {
           indicator: "explicit-key-ind",
-          next: key ?? sep6?.[0],
+          next: key ?? sep7?.[0],
           offset,
           onError,
           parentIndent: bm.indent,
@@ -95396,7 +95399,7 @@ var require_resolve_block_map = __commonJS({
             else if ("indent" in key && key.indent !== bm.indent)
               onError(offset, "BAD_INDENT", startColMsg);
           }
-          if (!keyProps.anchor && !keyProps.tag && !sep6) {
+          if (!keyProps.anchor && !keyProps.tag && !sep7) {
             commentEnd = keyProps.end;
             if (keyProps.comment) {
               if (map2.comment)
@@ -95420,7 +95423,7 @@ var require_resolve_block_map = __commonJS({
         ctx.atKey = false;
         if (utilMapIncludes.mapIncludes(ctx, map2.items, keyNode))
           onError(keyStart, "DUPLICATE_KEY", "Map keys must be unique");
-        const valueProps = resolveProps.resolveProps(sep6 ?? [], {
+        const valueProps = resolveProps.resolveProps(sep7 ?? [], {
           indicator: "map-value-ind",
           next: value,
           offset: keyNode.range[2],
@@ -95436,7 +95439,7 @@ var require_resolve_block_map = __commonJS({
             if (ctx.options.strict && keyProps.start < valueProps.found.offset - 1024)
               onError(keyNode.range, "KEY_OVER_1024_CHARS", "The : indicator must be at most 1024 chars after the start of an implicit block mapping key");
           }
-          const valueNode = value ? composeNode(ctx, value, valueProps, onError) : composeEmptyNode(ctx, offset, sep6, null, valueProps, onError);
+          const valueNode = value ? composeNode(ctx, value, valueProps, onError) : composeEmptyNode(ctx, offset, sep7, null, valueProps, onError);
           if (ctx.schema.compat)
             utilFlowIndentCheck.flowIndentCheck(bm.indent, value, onError);
           offset = valueNode.range[2];
@@ -95527,7 +95530,7 @@ var require_resolve_end = __commonJS({
       let comment = "";
       if (end) {
         let hasSpace = false;
-        let sep6 = "";
+        let sep7 = "";
         for (const token of end) {
           const { source, type } = token;
           switch (type) {
@@ -95541,13 +95544,13 @@ var require_resolve_end = __commonJS({
               if (!comment)
                 comment = cb;
               else
-                comment += sep6 + cb;
-              sep6 = "";
+                comment += sep7 + cb;
+              sep7 = "";
               break;
             }
             case "newline":
               if (comment)
-                sep6 += source;
+                sep7 += source;
               hasSpace = true;
               break;
             default:
@@ -95590,18 +95593,18 @@ var require_resolve_flow_collection = __commonJS({
       let offset = fc.offset + fc.start.source.length;
       for (let i = 0; i < fc.items.length; ++i) {
         const collItem = fc.items[i];
-        const { start: start2, key, sep: sep6, value } = collItem;
+        const { start: start2, key, sep: sep7, value } = collItem;
         const props = resolveProps.resolveProps(start2, {
           flow: fcName,
           indicator: "explicit-key-ind",
-          next: key ?? sep6?.[0],
+          next: key ?? sep7?.[0],
           offset,
           onError,
           parentIndent: fc.indent,
           startOnNewline: false
         });
         if (!props.found) {
-          if (!props.anchor && !props.tag && !sep6 && !value) {
+          if (!props.anchor && !props.tag && !sep7 && !value) {
             if (i === 0 && props.comma)
               onError(props.comma, "UNEXPECTED_TOKEN", `Unexpected , in ${fcName}`);
             else if (i < fc.items.length - 1)
@@ -95655,8 +95658,8 @@ var require_resolve_flow_collection = __commonJS({
             }
           }
         }
-        if (!isMap && !sep6 && !props.found) {
-          const valueNode = value ? composeNode(ctx, value, props, onError) : composeEmptyNode(ctx, props.end, sep6, null, props, onError);
+        if (!isMap && !sep7 && !props.found) {
+          const valueNode = value ? composeNode(ctx, value, props, onError) : composeEmptyNode(ctx, props.end, sep7, null, props, onError);
           coll.items.push(valueNode);
           offset = valueNode.range[2];
           if (isBlock(value))
@@ -95668,7 +95671,7 @@ var require_resolve_flow_collection = __commonJS({
           if (isBlock(key))
             onError(keyNode.range, "BLOCK_IN_FLOW", blockMsg);
           ctx.atKey = false;
-          const valueProps = resolveProps.resolveProps(sep6 ?? [], {
+          const valueProps = resolveProps.resolveProps(sep7 ?? [], {
             flow: fcName,
             indicator: "map-value-ind",
             next: value,
@@ -95679,8 +95682,8 @@ var require_resolve_flow_collection = __commonJS({
           });
           if (valueProps.found) {
             if (!isMap && !props.found && ctx.options.strict) {
-              if (sep6)
-                for (const st of sep6) {
+              if (sep7)
+                for (const st of sep7) {
                   if (st === valueProps.found)
                     break;
                   if (st.type === "newline") {
@@ -95697,7 +95700,7 @@ var require_resolve_flow_collection = __commonJS({
             else
               onError(valueProps.start, "MISSING_CHAR", `Missing , or : between ${fcName} items`);
           }
-          const valueNode = value ? composeNode(ctx, value, valueProps, onError) : valueProps.found ? composeEmptyNode(ctx, valueProps.end, sep6, null, valueProps, onError) : null;
+          const valueNode = value ? composeNode(ctx, value, valueProps, onError) : valueProps.found ? composeEmptyNode(ctx, valueProps.end, sep7, null, valueProps, onError) : null;
           if (valueNode) {
             if (isBlock(value))
               onError(valueNode.range, "BLOCK_IN_FLOW", blockMsg);
@@ -95877,7 +95880,7 @@ var require_resolve_block_scalar = __commonJS({
           chompStart = i + 1;
       }
       let value = "";
-      let sep6 = "";
+      let sep7 = "";
       let prevMoreIndented = false;
       for (let i = 0; i < contentStart; ++i)
         value += lines[i][0].slice(trimIndent) + "\n";
@@ -95894,24 +95897,24 @@ var require_resolve_block_scalar = __commonJS({
           indent = "";
         }
         if (type === Scalar.Scalar.BLOCK_LITERAL) {
-          value += sep6 + indent.slice(trimIndent) + content;
-          sep6 = "\n";
+          value += sep7 + indent.slice(trimIndent) + content;
+          sep7 = "\n";
         } else if (indent.length > trimIndent || content[0] === "	") {
-          if (sep6 === " ")
-            sep6 = "\n";
-          else if (!prevMoreIndented && sep6 === "\n")
-            sep6 = "\n\n";
-          value += sep6 + indent.slice(trimIndent) + content;
-          sep6 = "\n";
+          if (sep7 === " ")
+            sep7 = "\n";
+          else if (!prevMoreIndented && sep7 === "\n")
+            sep7 = "\n\n";
+          value += sep7 + indent.slice(trimIndent) + content;
+          sep7 = "\n";
           prevMoreIndented = true;
         } else if (content === "") {
-          if (sep6 === "\n")
+          if (sep7 === "\n")
             value += "\n";
           else
-            sep6 = "\n";
+            sep7 = "\n";
         } else {
-          value += sep6 + content;
-          sep6 = " ";
+          value += sep7 + content;
+          sep7 = " ";
           prevMoreIndented = false;
         }
       }
@@ -96093,25 +96096,25 @@ var require_resolve_flow_scalar = __commonJS({
       if (!match)
         return source;
       let res = match[1];
-      let sep6 = " ";
+      let sep7 = " ";
       let pos = first.lastIndex;
       line.lastIndex = pos;
       while (match = line.exec(source)) {
         if (match[1] === "") {
-          if (sep6 === "\n")
-            res += sep6;
+          if (sep7 === "\n")
+            res += sep7;
           else
-            sep6 = "\n";
+            sep7 = "\n";
         } else {
-          res += sep6 + match[1];
-          sep6 = " ";
+          res += sep7 + match[1];
+          sep7 = " ";
         }
         pos = line.lastIndex;
       }
       const last = /[ \t]*(.*)/sy;
       last.lastIndex = pos;
       match = last.exec(source);
-      return res + sep6 + (match?.[1] ?? "");
+      return res + sep7 + (match?.[1] ?? "");
     }
     function doubleQuotedValue(source, onError) {
       let res = "";
@@ -96921,14 +96924,14 @@ var require_cst_stringify = __commonJS({
         }
       }
     }
-    function stringifyItem({ start: start2, key, sep: sep6, value }) {
+    function stringifyItem({ start: start2, key, sep: sep7, value }) {
       let res = "";
       for (const st of start2)
         res += st.source;
       if (key)
         res += stringifyToken(key);
-      if (sep6)
-        for (const st of sep6)
+      if (sep7)
+        for (const st of sep7)
           res += st.source;
       if (value)
         res += stringifyToken(value);
@@ -98095,18 +98098,18 @@ var require_parser2 = __commonJS({
         if (this.type === "map-value-ind") {
           const prev = getPrevProps(this.peek(2));
           const start2 = getFirstKeyStartProps(prev);
-          let sep6;
+          let sep7;
           if (scalar.end) {
-            sep6 = scalar.end;
-            sep6.push(this.sourceToken);
+            sep7 = scalar.end;
+            sep7.push(this.sourceToken);
             delete scalar.end;
           } else
-            sep6 = [this.sourceToken];
+            sep7 = [this.sourceToken];
           const map2 = {
             type: "block-map",
             offset: scalar.offset,
             indent: scalar.indent,
-            items: [{ start: start2, key: scalar, sep: sep6 }]
+            items: [{ start: start2, key: scalar, sep: sep7 }]
           };
           this.onKeyLine = true;
           this.stack[this.stack.length - 1] = map2;
@@ -98259,15 +98262,15 @@ var require_parser2 = __commonJS({
                 } else if (isFlowToken(it.key) && !includesToken(it.sep, "newline")) {
                   const start3 = getFirstKeyStartProps(it.start);
                   const key = it.key;
-                  const sep6 = it.sep;
-                  sep6.push(this.sourceToken);
+                  const sep7 = it.sep;
+                  sep7.push(this.sourceToken);
                   delete it.key;
                   delete it.sep;
                   this.stack.push({
                     type: "block-map",
                     offset: this.offset,
                     indent: this.indent,
-                    items: [{ start: start3, key, sep: sep6 }]
+                    items: [{ start: start3, key, sep: sep7 }]
                   });
                 } else if (start2.length > 0) {
                   it.sep = it.sep.concat(start2, this.sourceToken);
@@ -98461,13 +98464,13 @@ var require_parser2 = __commonJS({
             const prev = getPrevProps(parent);
             const start2 = getFirstKeyStartProps(prev);
             fixFlowSeqItems(fc);
-            const sep6 = fc.end.splice(1, fc.end.length);
-            sep6.push(this.sourceToken);
+            const sep7 = fc.end.splice(1, fc.end.length);
+            sep7.push(this.sourceToken);
             const map2 = {
               type: "block-map",
               offset: fc.offset,
               indent: fc.indent,
-              items: [{ start: start2, key: fc, sep: sep6 }]
+              items: [{ start: start2, key: fc, sep: sep7 }]
             };
             this.onKeyLine = true;
             this.stack[this.stack.length - 1] = map2;
@@ -101730,14 +101733,14 @@ async function addSourceContext(frames) {
   return frames;
 }
 function getContextLinesFromFile(path40, ranges, output) {
-  return new Promise((resolve9) => {
+  return new Promise((resolve10) => {
     const stream = (0, import_node_fs.createReadStream)(path40);
     const lineReaded = (0, import_node_readline.createInterface)({
       input: stream
     });
     function destroyStreamAndResolve() {
       stream.destroy();
-      resolve9();
+      resolve10();
     }
     let lineNumber = 0;
     let currentRangeIndex = 0;
@@ -103034,9 +103037,9 @@ var PostHogBackendClient = class extends PostHogCoreStateless {
     if (!waitUntil) return;
     if (this.disabled || this.optedOut) return;
     if (!this._waitUntilCycle) {
-      let resolve9;
+      let resolve10;
       const promise2 = new Promise((r) => {
-        resolve9 = r;
+        resolve10 = r;
       });
       try {
         waitUntil(promise2);
@@ -103044,7 +103047,7 @@ var PostHogBackendClient = class extends PostHogCoreStateless {
         return;
       }
       this._waitUntilCycle = {
-        resolve: resolve9,
+        resolve: resolve10,
         startedAt: Date.now(),
         timer: void 0
       };
@@ -103068,12 +103071,12 @@ var PostHogBackendClient = class extends PostHogCoreStateless {
     return cycle?.resolve;
   }
   async resolveWaitUntilFlush() {
-    const resolve9 = this._consumeWaitUntilCycle();
+    const resolve10 = this._consumeWaitUntilCycle();
     try {
       await super.flush();
     } catch {
     } finally {
-      resolve9?.();
+      resolve10?.();
     }
   }
   getPersistedProperty(key) {
@@ -103194,15 +103197,15 @@ var PostHogBackendClient = class extends PostHogCoreStateless {
   async waitForLocalEvaluationReady(timeoutMs = THIRTY_SECONDS) {
     if (this.isLocalEvaluationReady()) return true;
     if (void 0 === this.featureFlagsPoller) return false;
-    return new Promise((resolve9) => {
+    return new Promise((resolve10) => {
       const timeout = setTimeout(() => {
         cleanup();
-        resolve9(false);
+        resolve10(false);
       }, timeoutMs);
       const cleanup = this._events.on("localEvaluationFlagsLoaded", (count2) => {
         clearTimeout(timeout);
         cleanup();
-        resolve9(count2 > 0);
+        resolve10(count2 > 0);
       });
     });
   }
@@ -103657,14 +103660,14 @@ var PostHogBackendClient = class extends PostHogCoreStateless {
     this.context?.enter(data, options);
   }
   async _shutdown(shutdownTimeoutMs) {
-    const resolve9 = this._consumeWaitUntilCycle();
+    const resolve10 = this._consumeWaitUntilCycle();
     await this.featureFlagsPoller?.stopPoller(shutdownTimeoutMs);
     this.errorTracking.shutdown();
     try {
       return await super._shutdown(shutdownTimeoutMs);
     } finally {
       this.distinctIdHasSentFlagCalls = {};
-      resolve9?.();
+      resolve10?.();
     }
   }
   async _requestRemoteConfigPayload(flagKey) {
@@ -105202,12 +105205,12 @@ function resolveHostFingerprint() {
   }
 }
 function resolveHostFingerprintAsync() {
-  return new Promise((resolve9) => {
+  return new Promise((resolve10) => {
     let binary;
     try {
       binary = simulatorServerBinaryPath();
     } catch {
-      resolve9(null);
+      resolve10(null);
       return;
     }
     let settled = false;
@@ -105220,7 +105223,7 @@ function resolveHostFingerprintAsync() {
         child?.kill("SIGKILL");
       } catch {
       }
-      resolve9(value);
+      resolve10(value);
     };
     const watchdog = setTimeout(() => finish(null), FINGERPRINT_TIMEOUT_MS);
     watchdog.unref?.();
@@ -105604,7 +105607,7 @@ async function shutdown(timeoutMs = SHORT_FLUSH_TIMEOUT_MS) {
   try {
     await Promise.race([
       client2.shutdown(timeoutMs),
-      new Promise((resolve9) => setTimeout(resolve9, timeoutMs + 250).unref())
+      new Promise((resolve10) => setTimeout(resolve10, timeoutMs + 250).unref())
     ]);
   } catch (err) {
     emitDebugError("shutdown failed", err);
@@ -105897,7 +105900,7 @@ async function runVega(args, options = {}) {
   const vegaPath = await resolveVegaOrThrow();
   const timeoutMs = options.timeoutMs ?? 6e4;
   const maxOutputBytes = options.maxOutputBytes ?? VEGA_MAX_OUTPUT_BYTES;
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     let child;
     try {
       child = (0, import_node_child_process4.spawn)(vegaPath, args, {
@@ -105987,7 +105990,7 @@ async function runVega(args, options = {}) {
     });
     const finish = (code, signal) => {
       if (code === 0) {
-        settle(() => resolve9({ stdout, stderr }));
+        settle(() => resolve10({ stdout, stderr }));
       } else {
         settle(
           () => reject(
@@ -106936,7 +106939,7 @@ function getSocketPath(udid) {
   return `/tmp/ax-${udid.slice(0, 8)}.sock`;
 }
 function startListener(endpoint, onConnection) {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     if (endpoint.transport === "unix") {
       try {
         fs12.unlinkSync(endpoint.socketPath);
@@ -106956,7 +106959,7 @@ function startListener(endpoint, onConnection) {
         }
         endpoint.port = addr.port;
       }
-      resolve9(server);
+      resolve10(server);
     };
     if (endpoint.transport === "tcp") {
       server.listen(endpoint.port ?? 0, "127.0.0.1", onListening);
@@ -106966,13 +106969,13 @@ function startListener(endpoint, onConnection) {
   });
 }
 function waitForDaemonConnection(server, proc, timeoutMs) {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     let settled = false;
     const onConnection = (socket) => {
       if (settled) return;
       settled = true;
       cleanup();
-      resolve9(socket);
+      resolve10(socket);
     };
     const onExit = (code) => {
       if (settled) return;
@@ -107186,7 +107189,7 @@ var axServiceBlueprint = {
       throw err;
     }
     function query(command, timeoutMs = 5e3) {
-      return new Promise((resolve9, reject) => {
+      return new Promise((resolve10, reject) => {
         if (!daemonSocket || daemonSocket.destroyed) {
           reject(
             new FailureError("ax-service not connected", {
@@ -107212,7 +107215,7 @@ var axServiceBlueprint = {
             );
           }
         }, timeoutMs);
-        pendingRpc.set(id, { resolve: resolve9, reject, timer });
+        pendingRpc.set(id, { resolve: resolve10, reject, timer });
         daemonSocket.write(JSON.stringify({ id, command }) + "\n");
       });
     }
@@ -107481,8 +107484,8 @@ var Signal = class _Signal {
   }
   /** Resolves with the next value, once the signal changes. */
   next() {
-    return new Promise((resolve9) => {
-      this.changed(resolve9);
+    return new Promise((resolve10) => {
+      this.changed(resolve10);
     });
   }
   /** Calls `fn` with the current value now, and again every time it changes. */
@@ -107494,9 +107497,9 @@ var Signal = class _Signal {
   /** Resolves with the next value from whichever of the given signals changes first. */
   static async race(...sigs) {
     const dispose = [];
-    const result = await new Promise((resolve9) => {
+    const result = await new Promise((resolve10) => {
       for (const sig of sigs) {
-        dispose.push(sig.changed(resolve9));
+        dispose.push(sig.changed(resolve10));
       }
     });
     for (const fn of dispose)
@@ -107559,12 +107562,12 @@ ${debugInfo}`);
     if (this.#async.length > 0) {
       try {
         let warn;
-        const timeout = new Promise((resolve9) => {
+        const timeout = new Promise((resolve10) => {
           warn = setTimeout(() => {
             if (DEV) {
               console.warn("spawn is still running after 5s; continuing anyway", this.#stack);
             }
-            resolve9();
+            resolve10();
           }, 5e3);
         });
         await Promise.race([Promise.all(this.#async), timeout]);
@@ -107867,11 +107870,11 @@ var Announced = class {
   closed;
   constructor(prefix = empty()) {
     this.prefix = prefix;
-    this.closed = new Promise((resolve9) => {
+    this.closed = new Promise((resolve10) => {
       const dispose = this.state.closed.subscribe((closed) => {
         if (!closed)
           return;
-        resolve9(closed instanceof Error ? closed : void 0);
+        resolve10(closed instanceof Error ? closed : void 0);
         dispose();
       });
     });
@@ -107937,11 +107940,11 @@ var Group = class {
   closed;
   constructor(sequence) {
     this.sequence = sequence;
-    this.closed = new Promise((resolve9) => {
+    this.closed = new Promise((resolve10) => {
       const dispose = this.#state.closed.subscribe((closed) => {
         if (!closed)
           return;
-        resolve9(closed instanceof Error ? closed : void 0);
+        resolve10(closed instanceof Error ? closed : void 0);
         dispose();
       });
     });
@@ -108069,11 +108072,11 @@ var Track = class {
   closed;
   constructor(name) {
     this.name = name;
-    this.closed = new Promise((resolve9) => {
+    this.closed = new Promise((resolve10) => {
       const dispose = this.state.closed.subscribe((closed) => {
         if (!closed)
           return;
-        resolve9(closed instanceof Error ? closed : void 0);
+        resolve10(closed instanceof Error ? closed : void 0);
         dispose();
       });
     });
@@ -108276,11 +108279,11 @@ var Broadcast = class {
   /** Resolves with the abort error (or undefined) once closed. */
   closed;
   constructor() {
-    this.closed = new Promise((resolve9) => {
+    this.closed = new Promise((resolve10) => {
       const dispose = this.state.closed.subscribe((closed) => {
         if (!closed)
           return;
-        resolve9(closed instanceof Error ? closed : void 0);
+        resolve10(closed instanceof Error ? closed : void 0);
         dispose();
       });
     });
@@ -108346,11 +108349,11 @@ var E_ALREADY_LOCKED = new Error("mutex already locked");
 var E_CANCELED = new Error("request for lock canceled");
 var __awaiter$2 = function(thisArg, _arguments, P, generator) {
   function adopt(value) {
-    return value instanceof P ? value : new P(function(resolve9) {
-      resolve9(value);
+    return value instanceof P ? value : new P(function(resolve10) {
+      resolve10(value);
     });
   }
-  return new (P || (P = Promise))(function(resolve9, reject) {
+  return new (P || (P = Promise))(function(resolve10, reject) {
     function fulfilled(value) {
       try {
         step(generator.next(value));
@@ -108366,7 +108369,7 @@ var __awaiter$2 = function(thisArg, _arguments, P, generator) {
       }
     }
     function step(result) {
-      result.done ? resolve9(result.value) : adopt(result.value).then(fulfilled, rejected);
+      result.done ? resolve10(result.value) : adopt(result.value).then(fulfilled, rejected);
     }
     step((generator = generator.apply(thisArg, _arguments || [])).next());
   });
@@ -108381,8 +108384,8 @@ var Semaphore = class {
   acquire(weight = 1, priority = 0) {
     if (weight <= 0)
       throw new Error(`invalid weight ${weight}: must be positive`);
-    return new Promise((resolve9, reject) => {
-      const task = { resolve: resolve9, reject, weight, priority };
+    return new Promise((resolve10, reject) => {
+      const task = { resolve: resolve10, reject, weight, priority };
       const i = findIndexFromEnd(this._queue, (other) => priority <= other.priority);
       if (i === -1 && weight <= this._value) {
         this._dispatchItem(task);
@@ -108407,10 +108410,10 @@ var Semaphore = class {
     if (this._couldLockImmediately(weight, priority)) {
       return Promise.resolve();
     } else {
-      return new Promise((resolve9) => {
+      return new Promise((resolve10) => {
         if (!this._weightedWaiters[weight - 1])
           this._weightedWaiters[weight - 1] = [];
-        insertSorted(this._weightedWaiters[weight - 1], { resolve: resolve9, priority });
+        insertSorted(this._weightedWaiters[weight - 1], { resolve: resolve10, priority });
       });
     }
   }
@@ -108493,11 +108496,11 @@ function findIndexFromEnd(a, predicate) {
 }
 var __awaiter$1 = function(thisArg, _arguments, P, generator) {
   function adopt(value) {
-    return value instanceof P ? value : new P(function(resolve9) {
-      resolve9(value);
+    return value instanceof P ? value : new P(function(resolve10) {
+      resolve10(value);
     });
   }
-  return new (P || (P = Promise))(function(resolve9, reject) {
+  return new (P || (P = Promise))(function(resolve10, reject) {
     function fulfilled(value) {
       try {
         step(generator.next(value));
@@ -108513,7 +108516,7 @@ var __awaiter$1 = function(thisArg, _arguments, P, generator) {
       }
     }
     function step(result) {
-      result.done ? resolve9(result.value) : adopt(result.value).then(fulfilled, rejected);
+      result.done ? resolve10(result.value) : adopt(result.value).then(fulfilled, rejected);
     }
     step((generator = generator.apply(thisArg, _arguments || [])).next());
   });
@@ -108632,8 +108635,8 @@ var ControlStreamAdapter = class {
     const queued = this.#incomingQueue.shift();
     if (queued)
       return queued;
-    return new Promise((resolve9) => {
-      this.#incomingWaiters.push(resolve9);
+    return new Promise((resolve10) => {
+      this.#incomingWaiters.push(resolve10);
     });
   }
   /**
@@ -108704,8 +108707,8 @@ var ControlStreamAdapter = class {
         this.#requestId += 2n;
         return id;
       }
-      await new Promise((resolve9) => {
-        this.#maxRequestIdResolves.push(resolve9);
+      await new Promise((resolve10) => {
+        this.#maxRequestIdResolves.push(resolve10);
       });
     }
   }
@@ -108750,8 +108753,8 @@ var ControlStreamAdapter = class {
             break;
           case Route.MaxRequestId:
             this.#maxRequestId = requestId;
-            for (const resolve9 of this.#maxRequestIdResolves)
-              resolve9();
+            for (const resolve10 of this.#maxRequestIdResolves)
+              resolve10();
             this.#maxRequestIdResolves = [];
             break;
         }
@@ -109109,8 +109112,8 @@ var ControlStreamAdapter = class {
     this.#namespaces.clear();
     this.#namespacesByRequestId.clear();
     this.#subscribeNamespaces.clear();
-    for (const resolve9 of this.#maxRequestIdResolves)
-      resolve9();
+    for (const resolve10 of this.#maxRequestIdResolves)
+      resolve10();
     this.#maxRequestIdResolves = [];
   }
 };
@@ -111528,8 +111531,8 @@ var Publisher2 = class {
     }
     for (; ; ) {
       let dispose;
-      const changed = new Promise((resolve9) => {
-        dispose = this.#broadcasts.changed(resolve9);
+      const changed = new Promise((resolve10) => {
+        dispose = this.#broadcasts.changed(resolve10);
       });
       const broadcasts2 = await Promise.race([changed, stream.reader.closed]);
       dispose();
@@ -111675,7 +111678,7 @@ var Publisher2 = class {
     let lastSentTime;
     try {
       for (; ; ) {
-        const timeout = new Promise((resolve9) => setTimeout(() => resolve9("timeout"), PROBE_INTERVAL));
+        const timeout = new Promise((resolve10) => setTimeout(() => resolve10("timeout"), PROBE_INTERVAL));
         const result = await Promise.race([timeout, stream.reader.closed]);
         if (result !== "timeout")
           break;
@@ -112177,19 +112180,19 @@ var Connection2 = class {
   }
   async #runSendBandwidth(bandwidth) {
     const quic = this.#quic;
-    return new Promise((resolve9) => {
+    return new Promise((resolve10) => {
       const id = setInterval(async () => {
         try {
           const stats = await quic.getStats();
           bandwidth.set(stats.estimatedSendRate ?? void 0);
         } catch {
           clearInterval(id);
-          resolve9();
+          resolve10();
         }
       }, SEND_BW_POLL_INTERVAL);
       void this.closed.then(() => {
         clearInterval(id);
-        resolve9();
+        resolve10();
       });
     });
   }
@@ -112376,8 +112379,8 @@ var Credit = class {
       const claimed = this.tryClaim(limit);
       if (claimed > 0n)
         return claimed;
-      await new Promise((resolve9, reject) => {
-        this.#waiters.push({ resolve: resolve9, reject });
+      await new Promise((resolve10, reject) => {
+        this.#waiters.push({ resolve: resolve10, reject });
       });
     }
   }
@@ -112442,8 +112445,8 @@ var Credit = class {
   #wake() {
     const waiters = this.#waiters;
     this.#waiters = [];
-    for (const { resolve: resolve9 } of waiters)
-      resolve9();
+    for (const { resolve: resolve10 } of waiters)
+      resolve10();
   }
 };
 
@@ -113492,7 +113495,7 @@ var Session = class _Session {
   }
   async #sendFrame(frame) {
     while (this.#ws.bufferedAmount > 64 * 1024) {
-      await new Promise((resolve9) => setTimeout(resolve9, 10));
+      await new Promise((resolve10) => setTimeout(resolve10, 10));
     }
     const chunk = encode7(frame, this.#version);
     this.#ws.send(chunk);
@@ -113908,7 +113911,7 @@ async function connectWebTransport(url2, cancel, options) {
   return quic;
 }
 async function connectWebSocket(url2, delay2, cancel) {
-  const timer = new Promise((resolve9) => setTimeout(resolve9, delay2));
+  const timer = new Promise((resolve10) => setTimeout(resolve10, delay2));
   const active = await Promise.race([cancel, timer.then(() => true)]);
   if (!active)
     return void 0;
@@ -113960,8 +113963,8 @@ var Reload = class {
     this.webtransport = props?.webtransport;
     this.websocket = props?.websocket;
     this.#delay = this.delay.initial;
-    this.closed = new Promise((resolve9, reject) => {
-      this.#closedResolve = resolve9;
+    this.closed = new Promise((resolve10, reject) => {
+      this.#closedResolve = resolve10;
       this.#closedReject = reject;
     });
     this.signals.run(this.#connect.bind(this));
@@ -114336,28 +114339,28 @@ init_src();
 var sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 var DEFAULT_INTER_STEP_DELAY_MS = 100;
 function sleepOrAbort(ms, signal) {
-  return new Promise((resolve9) => {
-    if (signal?.aborted) return resolve9(false);
+  return new Promise((resolve10) => {
+    if (signal?.aborted) return resolve10(false);
     const onAbort = () => {
       clearTimeout(timer);
-      resolve9(false);
+      resolve10(false);
     };
     const timer = setTimeout(() => {
       signal?.removeEventListener("abort", onAbort);
-      resolve9(true);
+      resolve10(true);
     }, ms);
     signal?.addEventListener("abort", onAbort, { once: true });
   });
 }
 function settleWithin(p, ms, signal) {
-  return new Promise((resolve9) => {
+  return new Promise((resolve10) => {
     let done = false;
     const teardown = [];
     const finish = (r) => {
       if (done) return;
       done = true;
       for (const fn of teardown) fn();
-      resolve9(r);
+      resolve10(r);
     };
     p.then(
       (value) => finish({ type: "value", value }),
@@ -114650,7 +114653,7 @@ async function spawnSimulatorServerProcess(udid, subcommand) {
   }
   const deviceSet = subcommand === "ios" ? await deviceSetForUdid(udid) : null;
   const { BINARY_PATH, BINARY_DIR } = getPaths();
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     const args = [subcommand, "--id", udid];
     if (deviceSet) args.push("--device-set", deviceSet);
     const proc = (0, import_node_child_process10.spawn)(BINARY_PATH, args, {
@@ -114674,7 +114677,7 @@ async function spawnSimulatorServerProcess(udid, subcommand) {
     };
     const resolveWhenReady = () => {
       if (apiUrl == null) return;
-      settle(() => resolve9({ proc, apiUrl, streamUrl }));
+      settle(() => resolve10({ proc, apiUrl, streamUrl }));
     };
     rl.on("line", (rawLine) => {
       const line = rawLine.trim();
@@ -114976,7 +114979,7 @@ var CDPClient = class {
     this.sendOrigin = options?.sendOrigin !== false;
   }
   connect() {
-    return new Promise((resolve9, reject) => {
+    return new Promise((resolve10, reject) => {
       let headers;
       if (this.sendOrigin) {
         const { protocol, host } = new URL(this.wsUrl);
@@ -114988,7 +114991,7 @@ var CDPClient = class {
       const onOpen = () => {
         cleanup();
         this.events.emit("connected");
-        resolve9();
+        resolve10();
       };
       const onError = (err) => {
         cleanup();
@@ -115021,10 +115024,10 @@ var CDPClient = class {
     if (!this.ws) return;
     const ws = this.ws;
     this.ws = null;
-    return new Promise((resolve9) => {
-      ws.once("close", () => resolve9());
+    return new Promise((resolve10) => {
+      ws.once("close", () => resolve10());
       ws.close();
-      setTimeout(resolve9, 1e3);
+      setTimeout(resolve10, 1e3);
     });
   }
   /**
@@ -115059,7 +115062,7 @@ var CDPClient = class {
     return this.ws?.readyState === wrapper_default.OPEN;
   }
   send(method, params, timeout = DEFAULT_TIMEOUT_MS2) {
-    return new Promise((resolve9, reject) => {
+    return new Promise((resolve10, reject) => {
       if (!this.ws || this.ws.readyState !== wrapper_default.OPEN) {
         return reject(new Error("CDP not connected"));
       }
@@ -115071,7 +115074,7 @@ var CDPClient = class {
       this.pending.set(id, {
         resolve: (result) => {
           this.trackDomain(method);
-          resolve9(result);
+          resolve10(result);
         },
         reject,
         timer
@@ -115122,7 +115125,7 @@ var CDPClient = class {
         )
       );
     }
-    return new Promise((resolve9, reject) => {
+    return new Promise((resolve10, reject) => {
       const timer = setTimeout(() => {
         this.pendingBindings.delete(id);
         reject(
@@ -115134,7 +115137,7 @@ var CDPClient = class {
           })
         );
       }, timeout);
-      this.pendingBindings.set(id, { resolve: resolve9, reject, timer });
+      this.pendingBindings.set(id, { resolve: resolve10, reject, timer });
       this.evaluate(expression, { timeout, returnByValue: false, awaitPromise: false }).catch(
         (err) => {
           this.pendingBindings.delete(id);
@@ -116558,11 +116561,11 @@ function parseVegaDeviceList(stdout) {
   const devices = [];
   for (const raw of stdout.split("\n")) {
     const line = raw.trim();
-    const sep6 = line.indexOf(" : ");
-    if (sep6 < 0) continue;
-    const type = line.slice(0, sep6).trim();
+    const sep7 = line.indexOf(" : ");
+    if (sep7 < 0) continue;
+    const type = line.slice(0, sep7).trim();
     if (!/^[A-Za-z]+$/.test(type)) continue;
-    const rhs = line.slice(sep6 + 3).trim();
+    const rhs = line.slice(sep7 + 3).trim();
     const parts = rhs.split(/\s+-\s+/);
     const serial = parts[parts.length - 1]?.trim();
     if (!serial) continue;
@@ -116733,13 +116736,13 @@ async function withDeadline(p, fallback, label) {
   try {
     return await Promise.race([
       p,
-      new Promise((resolve9) => {
+      new Promise((resolve10) => {
         timer = setTimeout(() => {
           process.stderr.write(
             `[list-devices] ${label} discovery exceeded ${BRANCH_DEADLINE_MS}ms; returning partial results (a wedged device or its CLI is unresponsive)
 `
           );
-          resolve9(fallback);
+          resolve10(fallback);
         }, BRANCH_DEADLINE_MS);
       })
     ]);
@@ -117267,7 +117270,7 @@ var VariantProposalStore = class {
         message: "No variants have been proposed yet. Call propose_variant first, then await_user_selection."
       });
     }
-    return new Promise((resolve9, reject) => {
+    return new Promise((resolve10, reject) => {
       let done = false;
       const finish = (fn) => {
         if (done) return;
@@ -117282,7 +117285,7 @@ var VariantProposalStore = class {
       const waiter = {
         round: this.round,
         settled: false,
-        settle: (outcome) => finish(() => resolve9(outcome))
+        settle: (outcome) => finish(() => resolve10(outcome))
       };
       const onAbort = () => {
         waiter.settled = true;
@@ -117295,7 +117298,7 @@ var VariantProposalStore = class {
       const timer = setTimeout(() => {
         waiter.settled = true;
         finish(
-          () => resolve9({
+          () => resolve10({
             status: "pending",
             round: waiter.round,
             message: "User has not completed their selection yet. The proposals are still live in the preview window \u2014 call await_user_selection again to keep waiting (this is expected; it is not an error).",
@@ -117378,11 +117381,11 @@ function getNativeDevtoolsSocketPath(udid) {
   return `/tmp/argent-nd-${udid.slice(0, 8)}.sock`;
 }
 function bindNativeDevtoolsUnixSocket(server, socketPath) {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     let retried = false;
     const onListening = () => {
       server.off("error", onError);
-      resolve9();
+      resolve10();
     };
     const onError = (err) => {
       if ((err.code === "EADDRINUSE" || err.code === "EEXIST") && !retried) {
@@ -117506,8 +117509,8 @@ var nativeDevtoolsBlueprint = {
         );
       }
       const id = nextRpcId++;
-      return new Promise((resolve9, reject) => {
-        pendingRpc.set(id, { resolve: resolve9, reject });
+      return new Promise((resolve10, reject) => {
+        pendingRpc.set(id, { resolve: resolve10, reject });
         conn.socket.write(
           JSON.stringify({
             type: "ViewInspector",
@@ -117608,7 +117611,7 @@ var nativeDevtoolsBlueprint = {
       });
     });
     if (endpoint.transport === "tcp") {
-      await new Promise((resolve9, reject) => {
+      await new Promise((resolve10, reject) => {
         server.once("error", reject);
         server.listen(endpoint.port ?? 0, "127.0.0.1", () => {
           server.off("error", reject);
@@ -117619,7 +117622,7 @@ var nativeDevtoolsBlueprint = {
             return;
           }
           endpoint.port = addr.port;
-          resolve9();
+          resolve10();
         });
       });
       await host.startProxy(udid, endpoint.port);
@@ -118892,7 +118895,7 @@ init_src();
 var DEFAULT_RPC_TIMEOUT_MS = 5e3;
 var LONG_RPC_TIMEOUT_MS = 15e3;
 function connectAndroidDevtoolsClient(localPort, onTerminated) {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     const socket = net3.createConnection({ host: "127.0.0.1", port: localPort });
     socket.setNoDelay(true);
     const pending = /* @__PURE__ */ new Map();
@@ -118951,7 +118954,7 @@ function connectAndroidDevtoolsClient(localPort, onTerminated) {
         }
       });
       rl.on("close", () => cleanup());
-      resolve9({
+      resolve10({
         request(method, params = {}) {
           const send = () => {
             if (closed) {
@@ -119052,7 +119055,7 @@ async function spawnHelper(serial) {
     ["-s", serial, "shell", "am", "instrument", "-w", manifest.instrumentationRunner],
     { stdio: ["ignore", "pipe", "pipe"] }
   );
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     let devicePort = null;
     let localPort = null;
     let settled = false;
@@ -119085,7 +119088,7 @@ async function spawnHelper(serial) {
           });
         }
         localPort = parseInt(lpMatch[1], 10);
-        settle(() => resolve9({ proc, devicePort, localPort }));
+        settle(() => resolve10({ proc, devicePort, localPort }));
       } catch (err) {
         settle(
           () => reject(err instanceof Error ? err : new Error(String(err))),
@@ -119939,32 +119942,28 @@ var MAX_UPLOAD_BYTES = 32 * 1024 * 1024;
 var FileInputError = class extends Error {
 };
 async function probeHostPath(wire, kind) {
+  const miss = { present: false, statVerified: false };
   try {
     const st = await (0, import_promises8.stat)(wire.path);
-    if (kind === "directory") return st.isDirectory();
-    if (kind === "probe") return true;
-    if (kind === "tar-upload") {
-      if (st.isDirectory()) {
-        if (wire.mtimeMs != null && Math.round(st.mtimeMs) !== Math.round(wire.mtimeMs)) {
-          return false;
-        }
-        return true;
-      }
-      if (!st.isFile()) return false;
-      if (wire.size != null && st.size !== wire.size) return false;
+    if (kind === "directory") return { present: st.isDirectory(), statVerified: false };
+    if (kind === "probe") return { present: true, statVerified: false };
+    if (kind === "tar-upload" && st.isDirectory()) {
       if (wire.mtimeMs != null && Math.round(st.mtimeMs) !== Math.round(wire.mtimeMs)) {
-        return false;
+        return miss;
       }
-      return true;
+      return { present: true, statVerified: false };
     }
-    if (!st.isFile()) return false;
-    if (wire.size != null && st.size !== wire.size) return false;
-    if (wire.mtimeMs != null && Math.round(st.mtimeMs) !== Math.round(wire.mtimeMs)) return false;
-    return true;
+    if (!st.isFile()) return miss;
+    if (wire.size != null && st.size !== wire.size) return miss;
+    if (wire.mtimeMs != null && Math.round(st.mtimeMs) !== Math.round(wire.mtimeMs)) return miss;
+    return { present: true, statVerified: wire.size != null && wire.mtimeMs != null };
   } catch {
-    return false;
+    return miss;
   }
 }
+function isParamSet(value) {
+  return value !== void 0;
+}
 function formatBytes(bytes) {
   if (bytes == null) return "unknown size";
   return (0, import_bytes.default)(bytes, { decimalPlaces: 1, unitSeparator: " " }) ?? `${bytes} B`;
@@ -120025,10 +120024,12 @@ async function extractTarUpload(wire, uploadId, meta3, tempDirs, lookupUpload) {
   }
 }
 async function resolveOne(spec, wire, tempDirs, lookupUpload) {
+  const probe3 = await probeHostPath(wire, spec.kind);
   const meta3 = {
     clientPath: wire.path,
-    presentOnHost: await probeHostPath(wire, spec.kind),
-    viaUpload: false
+    presentOnHost: probe3.present,
+    viaUpload: false,
+    ...probe3.statVerified ? { statVerified: true } : {}
   };
   if (spec.kind === "probe") {
     return { value: wire.path, meta: meta3 };
@@ -120084,6 +120085,14 @@ async function resolveFileInputs(def, body, lookupUpload) {
     for (const spec of specs) {
       const value = args[spec.target];
       if (!isFileInputWire(value)) continue;
+      if (spec.unwrapWhenSet !== void 0 && isParamSet(args[spec.unwrapWhenSet])) {
+        args[spec.target] = value.path;
+        continue;
+      }
+      if (spec.skipWhenSet !== void 0 && isParamSet(args[spec.skipWhenSet])) {
+        delete args[spec.target];
+        continue;
+      }
       const { value: path40, meta: meta3 } = await resolveOne(spec, value, tempDirs, lookupUpload);
       args[spec.target] = path40;
       resolved = { ...resolved ?? {}, [spec.target]: meta3 };
@@ -120344,6 +120353,10 @@ function isToolExposed(def) {
 function findDependencyMissing(err) {
   return findErrorInCauseChain(err, DependencyMissingError);
 }
+function errorSignalFields(err) {
+  const signal = getFailureSignal(err);
+  return signal ? { error_code: signal.error_code, error_kind: signal.error_kind } : {};
+}
 function streamErrorMessage(err) {
   if (err instanceof ToolNotFoundError) return err.message;
   const depErr = findDependencyMissing(err);
@@ -120821,27 +120834,27 @@ function createHttpApp(registry2, options) {
         }
       } catch (err) {
         if (wantsStream) {
-          writeLine({ event: "error", error: streamErrorMessage(err) });
+          writeLine({ event: "error", error: streamErrorMessage(err), ...errorSignalFields(err) });
           res.end();
           return;
         }
         if (err instanceof ToolNotFoundError) {
-          res.status(404).json({ error: err.message });
+          res.status(404).json({ error: err.message, ...errorSignalFields(err) });
           return;
         }
         const depErr = findDependencyMissing(err);
         if (depErr) {
-          res.status(424).json({ error: depErr.message, missing: depErr.missing });
+          res.status(424).json({ error: depErr.message, missing: depErr.missing, ...errorSignalFields(err) });
           return;
         }
         const unsupportedErr = findErrorInCauseChain(err, UnsupportedOperationError);
         if (unsupportedErr) {
-          res.status(400).json({ error: unsupportedErr.message });
+          res.status(400).json({ error: unsupportedErr.message, ...errorSignalFields(err) });
           return;
         }
         const invalidInputErr = findErrorInCauseChain(err, InvalidToolInputError);
         if (invalidInputErr) {
-          res.status(400).json({ error: invalidInputErr.message });
+          res.status(400).json({ error: invalidInputErr.message, ...errorSignalFields(err) });
           return;
         }
         const notImplementedErr = findErrorInCauseChain(err, NotImplementedOnPlatformError);
@@ -120850,11 +120863,12 @@ function createHttpApp(registry2, options) {
             error: notImplementedErr.message,
             toolId: notImplementedErr.toolId,
             platform: notImplementedErr.platform,
-            hint: notImplementedErr.hint
+            hint: notImplementedErr.hint,
+            ...errorSignalFields(err)
           });
           return;
         }
-        res.status(500).json({ error: formatErrorForAgent(err) });
+        res.status(500).json({ error: formatErrorForAgent(err), ...errorSignalFields(err) });
       } finally {
         if (keepAlive) clearInterval(keepAlive);
         releaseInvocationMeta?.();
@@ -120951,13 +120965,13 @@ function createToolServerEventLog({
     dispose: () => {
       if (disposePromise) return disposePromise;
       disposed = true;
-      disposePromise = new Promise((resolve9, reject) => {
+      disposePromise = new Promise((resolve10, reject) => {
         if (streamError) {
           reject(streamError);
           return;
         }
         if (fileStream.closed || fileStream.destroyed) {
-          resolve9();
+          resolve10();
           return;
         }
         fileStream.once("error", (error52) => {
@@ -120967,7 +120981,7 @@ function createToolServerEventLog({
             })
           );
         });
-        fileStream.end(resolve9);
+        fileStream.end(resolve10);
       });
       return disposePromise;
     }
@@ -121426,7 +121440,7 @@ function formatConsoleArgs(params) {
   }).join(" ");
 }
 function createConsoleLogServer(consoleEvents, logWriter) {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     const server = http.createServer();
     const wss = new import_websocket_server.default({ server });
     wss.on("connection", (ws) => {
@@ -121448,7 +121462,7 @@ function createConsoleLogServer(consoleEvents, logWriter) {
         return;
       }
       const url2 = `ws://127.0.0.1:${addr.port}`;
-      resolve9({
+      resolve10({
         url: url2,
         close: () => new Promise((res) => {
           wss.clients.forEach((c) => c.close());
@@ -121589,7 +121603,7 @@ function hidSocketPath(udid) {
   return `/tmp/argent-tv-hid-${udid.slice(0, 8)}.sock`;
 }
 function sendLine(socketPath, line, timeoutMs = 1e4) {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     const socket = net4.createConnection(socketPath);
     const chunks = [];
     let settled = false;
@@ -121605,7 +121619,7 @@ function sendLine(socketPath, line, timeoutMs = 1e4) {
       clearTimeout(timer);
       socket.destroy();
       if (err) reject(err);
-      else resolve9(value ?? "");
+      else resolve10(value ?? "");
     };
     socket.on("connect", () => socket.write(line.endsWith("\n") ? line : line + "\n"));
     socket.on("data", (d) => chunks.push(d));
@@ -121676,13 +121690,13 @@ async function waitForSocket(socketPath, proc, timeoutMs) {
         throw new Error(`tv daemon exited with code ${exited} before its socket was ready`);
       }
       if (fs21.existsSync(socketPath)) {
-        const ok = await new Promise((resolve9) => {
+        const ok = await new Promise((resolve10) => {
           const s = net4.createConnection(socketPath);
           s.on("connect", () => {
             s.destroy();
-            resolve9(true);
+            resolve10(true);
           });
-          s.on("error", () => resolve9(false));
+          s.on("error", () => resolve10(false));
         });
         if (ok) return;
       }
@@ -123074,7 +123088,7 @@ function formatConsoleArgs2(params) {
   }).join(" ");
 }
 function createConsoleLogServer2(consoleEvents, logWriter) {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     const server = http2.createServer();
     const wss = new import_websocket_server.default({ server });
     wss.on("connection", (ws) => {
@@ -123103,7 +123117,7 @@ function createConsoleLogServer2(consoleEvents, logWriter) {
         return;
       }
       const url2 = `ws://127.0.0.1:${addr.port}`;
-      resolve9({
+      resolve10({
         url: url2,
         close: () => new Promise((res) => {
           wss.clients.forEach((c) => c.close());
@@ -124377,7 +124391,7 @@ function electronGuiChildEnv(overrides = {}) {
 // ../tool-server/src/tools/devices/boot-electron.ts
 var DEFAULT_READY_TIMEOUT_MS = 3e4;
 async function pickFreePort() {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     const srv = net5.createServer();
     srv.unref();
     srv.on("error", reject);
@@ -124385,7 +124399,7 @@ async function pickFreePort() {
       const addr = srv.address();
       if (addr && typeof addr === "object") {
         const { port } = addr;
-        srv.close(() => resolve9(port));
+        srv.close(() => resolve10(port));
       } else {
         srv.close(() => reject(new Error("Could not allocate a free TCP port")));
       }
@@ -129003,7 +129017,7 @@ async function fetchVegaPageSource(timeoutMs = 15e3) {
   }
 }
 function postJson(host, port, path40, body, timeoutMs) {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     const req = (0, import_node_http.request)(
       {
         host,
@@ -129026,7 +129040,7 @@ function postJson(host, port, path40, body, timeoutMs) {
             reject(new Error(`toolkit HTTP ${status}: ${data.slice(0, 200)}`));
             return;
           }
-          resolve9(data);
+          resolve10(data);
         });
       }
     );
@@ -132350,21 +132364,21 @@ var Matcher = class {
    * @returns {string}
    */
   toString(separator, includeNamespace = true) {
-    const sep6 = separator || this.separator;
-    const isDefault = sep6 === this.separator && includeNamespace === true;
+    const sep7 = separator || this.separator;
+    const isDefault = sep7 === this.separator && includeNamespace === true;
     if (isDefault) {
       if (this._pathStringCache !== null) {
         return this._pathStringCache;
       }
       const result = this.path.map(
         (n) => n.namespace ? `${n.namespace}:${n.tag}` : n.tag
-      ).join(sep6);
+      ).join(sep7);
       this._pathStringCache = result;
       return result;
     }
     return this.path.map(
       (n) => includeNamespace && n.namespace ? `${n.namespace}:${n.tag}` : n.tag
-    ).join(sep6);
+    ).join(sep7);
   }
   /**
    * Get path as array of tag names.
@@ -135068,7 +135082,7 @@ Use when you want to apply code changes or reset JS state. Returns { reloaded, p
   async execute(services, _params) {
     const api = services.debugger;
     const port = api.port;
-    const disableLogBox = () => new Promise((resolve9) => setTimeout(resolve9, 2e3)).then(
+    const disableLogBox = () => new Promise((resolve10) => setTimeout(resolve10, 2e3)).then(
       () => api.cdp.evaluate(DISABLE_LOGBOX_SCRIPT).catch(() => {
       })
     );
@@ -139731,11 +139745,11 @@ function buildHotspots(nodes, samples, timeDeltas, topN2, reactOnly) {
 function renderMarkdownTable(entries) {
   if (entries.length === 0) return "_No hotspots found._";
   const header = "| Function | Location | Self (ms) | Total (ms) | Self % |";
-  const sep6 = "|---|---|---|---|---|";
+  const sep7 = "|---|---|---|---|---|";
   const rows = entries.map(
     (e) => `| \`${e.function}\` | ${e.url || "\u2014"} | ${e.self_ms} | ${e.total_ms} | ${e.self_pct} |`
   );
-  return [header, sep6, ...rows].join("\n");
+  return [header, sep7, ...rows].join("\n");
 }
 var reactProfilerCpuSummaryTool = {
   id: "react-profiler-cpu-summary",
@@ -139843,11 +139857,11 @@ function renderMarkdownTable2(entries) {
   if (entries.length === 0)
     return "_No render data found. Ensure React DevTools global hook is present._";
   const header = "| Component | Renders | Total (ms) | Self Base (ms) |";
-  const sep6 = "|---|---|---|---|";
+  const sep7 = "|---|---|---|---|";
   const rows = entries.map(
     (e) => `| \`${e.component}\` | ${e.renderCount} | ${e.totalActualDuration_ms.toFixed(2)} | ${e.selfBaseDuration_ms.toFixed(2)} |`
   );
-  return [header, sep6, ...rows].join("\n");
+  return [header, sep7, ...rows].join("\n");
 }
 var zodSchema46 = external_exports.object({
   port: external_exports.coerce.number().default(8081).describe("Metro server port"),
@@ -140120,14 +140134,14 @@ function waitForChildExit(child, ms) {
   if (child.exitCode !== null || child.signalCode !== null) {
     return Promise.resolve(true);
   }
-  return new Promise((resolve9) => {
+  return new Promise((resolve10) => {
     const onExit = () => {
       clearTimeout(timer);
-      resolve9(true);
+      resolve10(true);
     };
     const timer = setTimeout(() => {
       child.removeListener("exit", onExit);
-      resolve9(false);
+      resolve10(false);
     }, ms);
     child.once("exit", onExit);
   });
@@ -140341,7 +140355,7 @@ function listenForDarwinNotification(name) {
 // ../tool-server/src/utils/ios-profiler/startup.ts
 init_src();
 function waitForXctraceReady(child, { notify, timeoutMs }) {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     let settled = false;
     let stderrBuffer = "";
     const settle = (run2) => {
@@ -140354,7 +140368,7 @@ function waitForXctraceReady(child, { notify, timeoutMs }) {
     child.stdout?.on("data", (data) => {
       const text = data.toString();
       if (text.includes("Ctrl-C to stop") || text.includes("Starting recording")) {
-        settle(() => resolve9({ stderrBuffer }));
+        settle(() => resolve10({ stderrBuffer }));
       }
     });
     child.stderr?.on("data", (data) => {
@@ -140417,7 +140431,7 @@ function waitForXctraceReady(child, { notify, timeoutMs }) {
       });
     }, timeoutMs);
     if (notify) {
-      notify.fired.then(() => settle(() => resolve9({ stderrBuffer }))).catch(() => {
+      notify.fired.then(() => settle(() => resolve10({ stderrBuffer }))).catch(() => {
       });
     }
   });
@@ -142650,7 +142664,7 @@ async function startPerfetto(opts) {
   child.stderr.on("data", (chunk) => {
     stderr += chunk.toString("utf8");
   });
-  const pid = await new Promise((resolve9, reject) => {
+  const pid = await new Promise((resolve10, reject) => {
     let settled = false;
     const timer = setTimeout(() => {
       fail(
@@ -142680,7 +142694,7 @@ async function startPerfetto(opts) {
       if (settled) return;
       settled = true;
       clearTimeout(timer);
-      resolve9(value);
+      resolve10(value);
     }
     child.on(
       "error",
@@ -144071,7 +144085,7 @@ function streamFailure(message, stage, kind = "network", cause) {
   );
 }
 function openMjpegStream(url2, connectTimeoutMs = 1e4) {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     let settled = false;
     const request3 = import_http.default.get(url2, (res) => {
       request3.setTimeout(0);
@@ -144139,7 +144153,7 @@ function openMjpegStream(url2, connectTimeoutMs = 1e4) {
       res.on("error", fail);
       res.on("aborted", () => fail(new Error("frame stream aborted")));
       settled = true;
-      resolve9({
+      resolve10({
         get latest() {
           return state3.latest;
         },
@@ -144692,7 +144706,7 @@ async function startCaptureLocked(api, params) {
   };
 }
 function waitForEncoderReady(child, stderrRef) {
-  return new Promise((resolve9, reject) => {
+  return new Promise((resolve10, reject) => {
     let settled = false;
     const finish = (err) => {
       if (settled) return;
@@ -144701,7 +144715,7 @@ function waitForEncoderReady(child, stderrRef) {
       child.removeListener("exit", onExit);
       child.removeListener("error", onError);
       if (err) reject(err);
-      else resolve9();
+      else resolve10();
     };
     const onExit = (code, signal) => {
       finish(
@@ -145063,7 +145077,7 @@ function renderTopFunctions(index, topN2, startMs, endMs) {
   const hotspots = queryCpuWindow(index, windowStart, windowEnd, topN2);
   if (hotspots.length === 0) return "_No CPU hotspots found in the specified range._";
   const header = "| Function | Self (ms) | Total (ms) | Location |";
-  const sep6 = "|---|---|---|---|";
+  const sep7 = "|---|---|---|---|";
   const rows = hotspots.map((hs) => {
     const loc = hs.url ? `${shortenUrl(hs.url)}${hs.lineNumber != null ? `:${hs.lineNumber}` : ""}` : "\u2014";
     return `| \`${hs.name}\` | ${hs.selfMs} | ${hs.totalMs} | ${loc} |`;
@@ -145074,7 +145088,7 @@ function renderTopFunctions(index, topN2, startMs, endMs) {
   return `## CPU Hotspots
 
 ${rangeNote}${header}
-${sep6}
+${sep7}
 ${rows.join("\n")}`;
 }
 function renderCallTree(index, functionName, topN2, includeCallers) {
@@ -147087,10 +147101,12 @@ function requireActiveProjectRoot() {
   }
   return activeProjectRoot;
 }
+function flowsDirFor(root2) {
+  return path31.join(root2, FLOWS_DIR_NAME);
+}
 function getFlowsDir() {
-  return path31.join(requireActiveProjectRoot(), FLOWS_DIR_NAME);
+  return flowsDirFor(requireActiveProjectRoot());
 }
-var FLOW_NAME_PATTERN = /^[A-Za-z0-9_-]+$/;
 function assertSafeFlowName(name) {
   if (!FLOW_NAME_PATTERN.test(name)) {
     throw new FailureError(
@@ -147118,6 +147134,13 @@ function getFlowPath(name) {
   }
   return filePath;
 }
+async function classifyOnDiskSpelling(dir, base) {
+  const entries = await fs43.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" };
+  return { state: "case_folded", actual, addressable: FLOW_FILE_NAME_PATTERN.test(actual) };
+}
 function startRecordingSession(name, session) {
   activeFlowName = name;
   recordingSession = session;
@@ -147432,6 +147455,7 @@ function toYamlStep(step) {
     }
   }
 }
+var MAX_ENTRY_RENDER_CHARS = 200;
 function badEntry(raw, detail) {
   let rendered;
   try {
@@ -147439,6 +147463,10 @@ function badEntry(raw, detail) {
   } catch {
     rendered = "[cyclic entry]";
   }
+  if (rendered.length > MAX_ENTRY_RENDER_CHARS) {
+    const elided = rendered.length - MAX_ENTRY_RENDER_CHARS;
+    rendered = `${rendered.slice(0, MAX_ENTRY_RENDER_CHARS)}\u2026(+${elided} chars)`;
+  }
   throw new FailureError(`Unrecognized flow entry (${detail}): ${rendered}`, {
     error_code: FAILURE_CODES.FLOW_ENTRY_UNRECOGNIZED,
     failure_stage: "flow_file_parse_step",
@@ -147968,6 +147996,42 @@ function parseWhenStep(raw, depth) {
   });
   return { kind: "when", condition, steps };
 }
+function runTargetName(target) {
+  return path31.posix.basename(target, ".yaml");
+}
+function parseRunTarget(raw, value) {
+  if (typeof value !== "string") {
+    badEntry(
+      raw,
+      value === null || value === void 0 ? "`run` has no target \u2014 give it a YAML path relative to this flow's file, e.g. `run: fragments/login.yaml`" : "a `run` target must be a YAML path string relative to this flow's file, e.g. `run: fragments/login.yaml`"
+    );
+  }
+  if (value.includes("\\")) {
+    badEntry(raw, "a `run` path uses forward slashes, e.g. `run: fragments/login.yaml`");
+  }
+  if (path31.posix.isAbsolute(value) || /^[A-Za-z]:/.test(value)) {
+    badEntry(raw, "a `run` path must be relative to the flow file that references it");
+  }
+  const target = completeRunExtension(value);
+  if (!target.endsWith(".yaml")) {
+    if (target.toLowerCase().endsWith(".yaml")) {
+      badEntry(raw, "a `run` path must use the lowercase .yaml extension");
+    }
+    badEntry(raw, "a `run` path must end in .yaml, or name a sibling flow (`run: login`)");
+  }
+  if (!FLOW_FILE_NAME_PATTERN.test(path31.posix.basename(target))) {
+    badEntry(
+      raw,
+      `a \`run\` target's filename must match ${FLOW_FILE_NAME_PATTERN} \u2014 letters, digits, underscore, hyphen before the .yaml`
+    );
+  }
+  return target;
+}
+function completeRunExtension(value) {
+  if (value.endsWith(".yaml")) return value;
+  const candidate = `${value}.yaml`;
+  return FLOW_FILE_NAME_PATTERN.test(path31.posix.basename(candidate)) ? candidate : value;
+}
 function fromYamlStep(raw, whenDepth = 0) {
   const entry = raw;
   if ("optional" in raw) {
@@ -148000,7 +148064,7 @@ function fromYamlStep(raw, whenDepth = 0) {
   }
   if ("echo" in raw) return { kind: "echo", message: String(raw.echo) };
   if ("launch" in raw) return { kind: "launch", app: parseLaunch(raw.launch) };
-  if ("run" in raw) return { kind: "run", flow: String(raw.run) };
+  if ("run" in raw) return { kind: "run", flow: parseRunTarget(raw, raw.run) };
   if ("when" in raw) return parseWhenStep(entry, whenDepth);
   if ("tap" in raw) return parseTap(raw.tap, raw);
   if ("long-press" in raw) {
@@ -148139,7 +148203,21 @@ function parseFlow(content) {
   if (trimmed.length === 0) {
     return { executionPrerequisite: "", steps: [] };
   }
-  const parsed = (0, import_yaml.parse)(trimmed);
+  let parsed;
+  try {
+    parsed = (0, import_yaml.parse)(trimmed);
+  } catch (err) {
+    throw new FailureError(
+      `Invalid flow file: ${err instanceof Error ? err.message : String(err)}`,
+      {
+        error_code: FAILURE_CODES.FLOW_FILE_INVALID,
+        failure_stage: "flow_file_parse",
+        failure_area: "tool_server",
+        error_kind: "validation"
+      },
+      err instanceof Error ? { cause: err } : void 0
+    );
+  }
   if (typeof parsed !== "object" || parsed === null || !("steps" in parsed) || !Array.isArray(parsed.steps)) {
     throw new FailureError("Invalid flow file: expected an object with a steps array", {
       error_code: FAILURE_CODES.FLOW_FILE_INVALID,
@@ -148280,6 +148358,7 @@ to remove or reorder steps.`,
 init_zod();
 var fs45 = __toESM(require("node:fs/promises"));
 var path32 = __toESM(require("node:path"));
+init_src();
 
 // ../tool-server/src/tools/flows/flow-device.ts
 init_src();
@@ -148862,9 +148941,66 @@ async function captureTapSelector(registry2, udid, point) {
   }
 }
 var RUN_TARGET_COMMAND = "flow-execute";
+async function rewriteSiblingFlowPath(session, args) {
+  const flowPath = args.flow_path;
+  if (typeof flowPath !== "string" || args.name !== void 0) return;
+  const invalid = (detail) => new FailureError(
+    `Cannot record a flow-execute of flow_path "${flowPath}": ${detail}. flow_path carries no file-input resolution through flow-add-step's opaque args \u2014 pass name + project_root for a flow saved beside the recording, or add a \`run: <relative path>.yaml\` step to the flow YAML by hand for a cross-directory target.`,
+    {
+      error_code: FAILURE_CODES.FLOW_FILE_INVALID,
+      failure_stage: "flow_add_step_flow_path",
+      failure_area: "tool_server",
+      error_kind: "validation"
+    }
+  );
+  if (!session || session.persist !== "host") {
+    throw invalid(
+      "the recording is not persisted on this host, so its siblings cannot be resolved here"
+    );
+  }
+  if (flowPath.split(/[\\/]+/).includes("..")) {
+    throw invalid(
+      'flow paths must not contain ".." segments \u2014 sibling identity is decided lexically from this path, and a symlinked directory component would make the rewrite run a different file than the path opens'
+    );
+  }
+  const ext = path32.extname(flowPath);
+  const bareExtension = path32.basename(flowPath).toLowerCase() === ".yaml";
+  if (!bareExtension && ext !== ".yaml") {
+    throw invalid(
+      ext.toLowerCase() === ".yaml" ? `flow files must use the lowercase .yaml extension, not "${ext}"` : "flow files must use the .yaml extension"
+    );
+  }
+  const flowsDir = path32.dirname(session.filePath);
+  if (path32.resolve(path32.dirname(flowPath)) !== path32.resolve(flowsDir)) {
+    throw invalid(
+      `it is not in the recording's flow directory ("${flowsDir}"), and a raw tool: step has no boundary to resolve a path through at replay`
+    );
+  }
+  const stem = bareExtension ? "" : path32.basename(flowPath, ".yaml");
+  assertSafeFlowName(stem);
+  const projectRoot = args.project_root;
+  if (typeof projectRoot !== "string" || !path32.isAbsolute(projectRoot)) {
+    throw invalid(
+      `project_root must be an absolute path (got ${typeof projectRoot === "string" ? `"${projectRoot}"` : "none"}) \u2014 a relative root would be resolved against the tool server's cwd, not the calling agent's`
+    );
+  }
+  if (path32.resolve(flowsDirFor(projectRoot), `${stem}.yaml`) !== path32.resolve(flowPath)) {
+    throw invalid(`project_root "${projectRoot}" does not resolve "${stem}" to it`);
+  }
+  const suppliedBase = path32.basename(flowPath);
+  const spelling = await classifyOnDiskSpelling(flowsDir, suppliedBase);
+  if (spelling.state !== "listed") {
+    const recovery = spelling.state === "absent" ? `pass the basename exactly as it appears on disk` : spelling.addressable ? `pass flow_path with the on-disk basename "${spelling.actual}"` : `rename "${spelling.actual}" to "${suppliedBase}" to record it \u2014 flow files must be lowercase .yaml`;
+    throw invalid(
+      `the file must be named as it appears on disk \u2014 no directory entry is named "${suppliedBase}"` + (spelling.state === "case_folded" ? ` (this filesystem matched it case-insensitively to "${spelling.actual}")` : "") + `, so the recorded run: step would name a flow no case-sensitive checkout can find \u2014 ` + recovery
+    );
+  }
+  delete args.flow_path;
+  args.name = stem;
+}
 async function captureRunTarget(session, args) {
-  const name = args.name;
-  if (typeof name !== "string") {
+  const name = typeof args.name === "string" ? args.name : void 0;
+  if (name === void 0) {
     return { warning: "flow-execute call had no flow name; kept the raw step" };
   }
   if (!session || session.persist !== "host") {
@@ -148874,9 +149010,40 @@ async function captureRunTarget(session, args) {
   }
   try {
     assertSafeFlowName(name);
-    const fragPath = path32.join(path32.dirname(session.filePath), `${name}.yaml`);
+    const realFlowPath = await fs45.realpath(session.filePath);
+    const flowsDir = path32.dirname(realFlowPath);
+    const fragPath = path32.join(flowsDir, `${name}.yaml`);
+    const projectRoot = args.project_root;
+    if (typeof projectRoot !== "string" || !path32.isAbsolute(projectRoot)) {
+      return {
+        warning: `kept the raw flow-execute step \u2014 project_root must be an absolute path (got ${typeof projectRoot === "string" ? `"${projectRoot}"` : "none"}) to confirm "${name}" names the recording's own sibling`
+      };
+    }
+    const spelling = await classifyOnDiskSpelling(flowsDir, `${name}.yaml`);
+    if (spelling.state === "case_folded") {
+      const recovery = spelling.addressable ? `re-run it as name "${path32.basename(spelling.actual, ".yaml")}" to record it` : `rename "${spelling.actual}" to "${name}.yaml" to record it \u2014 flow files must be lowercase .yaml`;
+      return {
+        warning: `kept the raw flow-execute step \u2014 no sibling is named "${name}.yaml" (this filesystem matched it case-insensitively to "${spelling.actual}"), so a run: ${name} step would name a flow no case-sensitive checkout can find \u2014 ${recovery}`
+      };
+    }
     parseFlow(await fs45.readFile(fragPath, "utf8"));
-    return { flow: name };
+    let executedPath;
+    try {
+      executedPath = await fs45.realpath(path32.join(flowsDirFor(projectRoot), `${name}.yaml`));
+    } catch {
+      executedPath = void 0;
+    }
+    if (executedPath === void 0) {
+      return {
+        warning: `kept the raw flow-execute step \u2014 could not verify which file the live flow-execute ran ("${name}" has no canonical file in project_root's flows dir to compare the sibling against)`
+      };
+    }
+    if (executedPath !== await fs45.realpath(fragPath)) {
+      return {
+        warning: `kept the raw flow-execute step \u2014 project_root "${projectRoot}" resolves "${name}" to "${executedPath}", not the recording's sibling "${fragPath}", so "${name}.yaml" beside the recording's real file is not the file the live flow-execute ran and a run: ${name} step would replay a different flow than the one that just ran`
+      };
+    }
+    return { flow: `${name}.yaml` };
   } catch (err) {
     return {
       warning: `could not resolve "${name}" as a sibling fragment (${err instanceof Error ? err.message : String(err)}); kept the raw flow-execute step`
@@ -148898,6 +149065,8 @@ If a step was recorded by mistake, edit the .yaml file directly to remove it.`,
     async execute(_services, params, ctx) {
       const flowName = getActiveFlow();
       const args = params.args ? JSON.parse(params.args) : {};
+      const session = getRecordingSession();
+      if (params.command === RUN_TARGET_COMMAND) await rewriteSiblingFlowPath(session, args);
       const isTap = params.command === "gesture-tap" && params.delayMs === void 0 && typeof args.udid === "string" && typeof args.x === "number" && typeof args.y === "number";
       let captured;
       if (isTap) {
@@ -148907,7 +149076,6 @@ If a step was recorded by mistake, edit the .yaml file directly to remove it.`,
         });
       }
       const toolResult = await invokeSubTool(registry2, ctx, params.command, args);
-      const session = getRecordingSession();
       const runTarget = params.command === RUN_TARGET_COMMAND && params.delayMs === void 0 ? await captureRunTarget(session, args) : void 0;
       const strippedArgs = stripDeviceKeys(args);
       const isLaunch = params.command === "restart-app" && params.delayMs === void 0 && typeof strippedArgs.bundleId === "string" && Object.keys(strippedArgs).length === 1;
@@ -151974,13 +152142,18 @@ async function restoreStatusBar(device) {
 
 // ../tool-server/src/tools/flows/flow-run.ts
 var zodSchema64 = external_exports.object({
-  name: external_exports.string().describe('Name of the flow to run (e.g. "settings-explore")'),
+  name: external_exports.string().optional().describe(
+    'Name of a saved flow to run from `.argent/flows` (e.g. "settings-explore"). Omit when flow_path is set.'
+  ),
   project_root: external_exports.string().describe(
-    "Absolute path to the project root directory that contains `.argent/flows/<name>.yaml`."
+    "Absolute path to the calling agent's project root \u2014 the cwd it is working in. With name, the saved flow is read from `.argent/flows/<name>.yaml` under this root; with flow_path, the flow, its run: siblings, and baselines all resolve beside the YAML instead, so pass the agent's cwd."
   ),
   flow_file: external_exports.string().optional().describe(
     "Path to the flow .yaml as readable by the tool-server. Internal \u2014 the argent client derives it from project_root and name automatically; leave unset."
   ),
+  flow_path: external_exports.string().optional().describe(
+    "Absolute path to a co-located flow .yaml on the client and tool server's shared filesystem. This must be supplied through the file-input boundary. For remote execution, pass name + project_root instead."
+  ),
   device: external_exports.string().optional().describe(
     "Device id to run against (iOS UDID, Android/Vega serial, Chromium id). Auto-detected when omitted."
   ),
@@ -151991,9 +152164,37 @@ var zodSchema64 = external_exports.object({
   prerequisiteAcknowledged: external_exports.boolean().optional().describe(
     "Set to true to confirm the execution prerequisite has been met. Required (LLM path) when a fragment defines an executionPrerequisite."
   )
-});
+}).superRefine((params, ctx) => {
+  if (params.name === void 0 === (params.flow_path === void 0)) {
+    ctx.addIssue({
+      code: external_exports.ZodIssueCode.custom,
+      message: "Pass exactly one flow source: name or flow_path.",
+      path: ["flow_path"]
+    });
+  }
+});
+var inputSchema2 = {
+  ...zodObjectToJsonSchema(zodSchema64),
+  // Zod's JSON Schema conversion cannot represent superRefine. `oneOf` makes
+  // the same exactly-one source rule visible to MCP and HTTP clients: neither
+  // branch matches when both fields are absent, and both branches match (which
+  // is invalid for oneOf) when both fields are present.
+  oneOf: [{ required: ["name"] }, { required: ["flow_path"] }]
+};
 var fileInputs3 = [
-  { target: "flow_file", path: "${project_root}/.argent/flows/${name}.yaml", kind: "file" }
+  {
+    target: "flow_path",
+    path: "${flow_path}",
+    kind: "file",
+    optional: true,
+    unwrapWhenSet: "name"
+  },
+  {
+    target: "flow_file",
+    path: "${project_root}/.argent/flows/${name}.yaml",
+    kind: "file",
+    skipWhenSet: "flow_path"
+  }
 ];
 var MAX_RUN_DEPTH = 20;
 var POST_LAUNCH_SETTLE_MS = 1500;
@@ -152114,15 +152315,51 @@ function deviceEnv(state3) {
   }
   return { ...state3, device: state3.device };
 }
+function displayFlowName(params) {
+  const stem = params.flow_path === void 0 ? void 0 : path35.basename(params.flow_path, ".yaml");
+  return params.name || stem || params.flow_path || "(unspecified)";
+}
+function* walkSteps(steps) {
+  for (const step of steps) {
+    yield step;
+    if (step.kind === "when") yield* walkSteps(step.steps);
+  }
+}
+function assertUploadSelfContained(flow) {
+  for (const step of walkSteps(flow.steps)) {
+    if (step.kind === "run") {
+      throw new FailureError(
+        `This flow uses run: composition ("run: ${step.flow}"), which requires a co-located client and tool server \u2014 an uploaded flow's referenced files are not available on this host.`,
+        {
+          error_code: FAILURE_CODES.FLOW_FILE_INVALID,
+          failure_stage: "flow_upload_run_composition",
+          failure_area: "tool_server",
+          error_kind: "validation"
+        }
+      );
+    }
+    if (step.kind === "snapshot") {
+      throw new FailureError(
+        `This flow uses a snapshot step ("snapshot: ${step.name}"), whose baselines live beside the flow's file \u2014 an uploaded flow materializes to a fresh temp directory each call, so a plain snapshot can never find a baseline and updateBaselines (--update-baselines) writes PNGs no later run can read. Use name + project_root with a co-located client and tool server for snapshot flows.`,
+        {
+          error_code: FAILURE_CODES.FLOW_FILE_INVALID,
+          failure_stage: "flow_upload_snapshot_baseline",
+          failure_area: "tool_server",
+          error_kind: "validation"
+        }
+      );
+    }
+  }
+}
 function createRunFlowTool(registry2) {
   return {
     id: "flow-execute",
     interaction: {
-      startedMsg: ({ params }) => `Running flow ${params.name}`,
-      completedMsg: ({ params }) => `Ran flow ${params.name}`,
-      failedMsg: ({ params, failureSignal: failureSignal2 }) => `Failed to run flow ${params.name}: ${failureSignal2.error_code}`
+      startedMsg: ({ params }) => `Running flow ${displayFlowName(params)}`,
+      completedMsg: ({ params }) => `Ran flow ${displayFlowName(params)}`,
+      failedMsg: ({ params, failureSignal: failureSignal2 }) => `Failed to run flow ${displayFlowName(params)}: ${failureSignal2.error_code}`
     },
-    description: `Run a saved flow from the .argent/flows/ directory.
+    description: `Run a saved flow from the .argent/flows/ directory, or an explicit boundary-managed flow_path.
 Steps run in order: \`launch\` starts an app from scratch (terminate + relaunch) and waits until it is
 ready; \`tool\` calls dispatch through the registry; \`tap\`/\`long-press\`/\`type\` resolve a selector to an
 element and act on it (\`tap: { on, times: 2 }\` double-taps; \`long-press: { on, duration }\` presses and
@@ -152140,7 +152377,9 @@ when \`on\` is omitted; distinct from the \`rotate\` tool, which changes device
 for a UI condition; \`wait\` pauses for a fixed number of milliseconds; \`assert\` checks one now; \`snapshot\`
 diffs a screenshot \u2014 or, with \`cropOn: <selector>\`, one element's cropped region \u2014 against a stored
 baseline (a missing baseline fails the step \u2014 set updateBaselines to adopt the current screen; a
-cropped element whose size drifted fails on dimensions); \`echo\` annotates; \`run\` executes a referenced fragment inline.
+cropped element whose size drifted fails on dimensions); \`echo\` annotates; \`run\` executes another flow
+inline \u2014 a YAML path resolved against the directory of the flow file that references it (co-located
+runs only).
 A \`when:\` block (condition + \`steps:\`, no else) runs its steps only if the condition holds \u2014
 checked once with the short assert grace \u2014 for one-sided divergences like interstitials and coach
 marks; a skipped block reports distinctly and failures inside an entered block are real failures.
@@ -152156,21 +152395,28 @@ If a fragment has an execution prerequisite and prerequisiteAcknowledged is not
 returns a notice with the prerequisite instead of running.`,
     longRunning: true,
     zodSchema: zodSchema64,
+    inputSchema: inputSchema2,
     fileInputs: fileInputs3,
     services: () => ({}),
     async execute(_services, params, ctx) {
       const signal = ctx?.signal;
-      const filePath = resolveFlowFilePath(params, ctx?.fileInputs?.flow_file);
-      const flowsDir = path35.dirname(filePath);
-      const flow = parseFlow(await fs49.readFile(filePath, "utf8"));
+      const { filePath, flowName, viaUpload } = await resolveFlowSource(
+        params,
+        ctx?.fileInputs?.flow_file,
+        ctx?.fileInputs?.flow_path
+      );
+      const canonicalPath = await canonicalFlowPath(filePath);
+      const flowsDir = path35.dirname(canonicalPath);
+      const flow = parseFlow(await fs49.readFile(canonicalPath, "utf8"));
+      if (viaUpload) assertUploadSelfContained(flow);
       if (flow.executionPrerequisite && !params.prerequisiteAcknowledged) {
         return {
-          flow: params.name,
+          flow: flowName,
           notice: "This flow has an execution prerequisite that must be fulfilled before it can run. Verify the prerequisite is met and call flow-execute again with prerequisiteAcknowledged set to true.",
           executionPrerequisite: flow.executionPrerequisite
         };
       }
-      const resolved = await resolveRunDevice(registry2, ctx, flow, params, flowsDir);
+      const resolved = await resolveRunDevice(registry2, ctx, flow, params, flowsDir, viaUpload);
       const device = resolved.device;
       const statusBarPinned = device !== null && await pinStatusBar(device);
       if (device?.platform === "chromium") await frontChromiumPage(registry2, device);
@@ -152180,7 +152426,7 @@ returns a notice with the prerequisite instead of running.`,
         device,
         signal,
         flowsDir,
-        topFlowName: params.name,
+        baselineKey: baselineKeyFor(canonicalPath, flowName),
         updateBaselines: Boolean(params.updateBaselines),
         reports: [],
         stopped: false,
@@ -152192,8 +152438,7 @@ returns a notice with the prerequisite instead of running.`,
       let aborted2;
       try {
         await execSteps(state3, flow.steps, {
-          flow: params.name,
-          runStack: [params.name],
+          runStack: [{ canonical: canonicalPath, display: flowName }],
           depth: 0
         });
       } finally {
@@ -152202,7 +152447,7 @@ returns a notice with the prerequisite instead of running.`,
         if (resolved.booted) await teardownBootedChromium(registry2, resolved.booted);
       }
       return summarize(
-        params.name,
+        flowName,
         device?.id ?? "",
         flow.executionPrerequisite,
         state3.reports,
@@ -152211,11 +152456,11 @@ returns a notice with the prerequisite instead of running.`,
     }
   };
 }
-async function resolveRunDevice(registry2, ctx, flow, params, flowDir) {
+async function resolveRunDevice(registry2, ctx, flow, params, flowDir, viaUpload) {
   if (!params.device) {
     const spec = chromiumBootSpec(flow, params.platform);
     if (spec) {
-      const booted = await bootChromiumForFlow(spec, flowDir);
+      const booted = await bootChromiumForFlow(spec, flowDir, viaUpload);
       return { device: resolveDevice(booted.deviceId), booted };
     }
     if (!flowRequiresDevice(registry2, flow.steps)) {
@@ -152243,7 +152488,18 @@ function launchTargetPlatform(launch, platform) {
   }
   return null;
 }
-async function bootChromiumForFlow(spec, flowDir) {
+async function bootChromiumForFlow(spec, flowDir, viaUpload) {
+  if (viaUpload && !path35.isAbsolute(spec.path)) {
+    throw new FailureError(
+      `A relative chromium app path ("${spec.path}") resolves against the flow file's directory, which requires a co-located client and tool server \u2014 an uploaded flow has no real flow directory on this host. Use an absolute tool-server path instead.`,
+      {
+        error_code: FAILURE_CODES.FLOW_FILE_INVALID,
+        failure_stage: "flow_upload_chromium_app_path",
+        failure_area: "tool_server",
+        error_kind: "validation"
+      }
+    );
+  }
   const appPath = path35.isAbsolute(spec.path) ? spec.path : path35.resolve(flowDir, spec.path);
   const res = await bootElectronApp({ appPath, extraArgs: spec.args });
   return { deviceId: res.id, port: res.port, pid: res.pid };
@@ -152348,10 +152604,27 @@ function stepTarget(step) {
     }
     case "snapshot":
       return step.cropOn ? `"${step.name}" cropOn ${selectorLabel2(step.cropOn)}` : `"${step.name}"`;
+    case "run":
+      return step.flow;
     default:
       return void 0;
   }
 }
+function scopeFlow(scope) {
+  return scope.runStack[scope.runStack.length - 1].display;
+}
+function runDisplayName(target, scope) {
+  const stem = runTargetName(target);
+  if (stem !== scope.runStack[0].display) return stem;
+  const spelled = target.slice(0, -".yaml".length);
+  return spelled === stem ? `./${stem}` : spelled;
+}
+function stepFlow(step, scope) {
+  return step.kind === "run" ? runDisplayName(step.flow, scope) : scopeFlow(scope);
+}
+function scopeFlowDir(scope) {
+  return path35.dirname(scope.runStack[scope.runStack.length - 1].canonical);
+}
 function childScope(scope, overrides = {}) {
   return { ...scope, ...overrides, depth: scope.depth + 1 };
 }
@@ -152366,7 +152639,7 @@ async function execSteps(state3, steps, scope) {
         index,
         kind: step.kind,
         status: "skip",
-        flow: scope.flow,
+        flow: stepFlow(step, scope),
         target: stepTarget(step),
         ...depthOf(scope),
         // Carry the echo's message so a skipped narration renders as a skip
@@ -152382,7 +152655,7 @@ async function execSteps(state3, steps, scope) {
         index,
         kind: step.kind,
         status: "error",
-        flow: scope.flow,
+        flow: scopeFlow(scope),
         target: stepTarget(step),
         ...depthOf(scope),
         reason: `step needs a device but the flow was resolved as device-free \u2014 pass an explicit device`
@@ -152397,7 +152670,7 @@ async function execSteps(state3, steps, scope) {
         kind: step.kind,
         status: "skip",
         reason: "run aborted",
-        flow: scope.flow,
+        flow: stepFlow(step, scope),
         target: stepTarget(step),
         ...depthOf(scope),
         ...step.kind === "echo" ? { message: step.message } : {}
@@ -152431,10 +152704,7 @@ function reportBlockSkipped(state3, steps, scope, reason) {
       kind: step.kind,
       status: "skip",
       reason,
-      // A `run:` line is attributed to the fragment it names, matching the
-      // executed marker in execRunStep; everything else belongs to the
-      // enclosing flow.
-      flow: step.kind === "run" ? step.flow : scope.flow,
+      flow: stepFlow(step, scope),
       target: stepTarget(step),
       ...depthOf(scope),
       ...step.kind === "echo" ? { message: step.message } : {}
@@ -152446,7 +152716,13 @@ async function execWhenStep(state3, step, scope) {
   const index = state3.reports.length;
   const label = describeWhenCondition(step.condition);
   const target = stepTarget(step);
-  const marker = { index, kind: "when", flow: scope.flow, target, ...depthOf(scope) };
+  const marker = {
+    index,
+    kind: "when",
+    flow: scopeFlow(scope),
+    target,
+    ...depthOf(scope)
+  };
   const inner = childScope(scope);
   let met;
   if (step.condition.kind === "platform") {
@@ -152485,46 +152761,82 @@ async function execWhenStep(state3, step, scope) {
   pushReport(state3, { ...marker, status: "pass", reason: `condition met (${label})` });
   await execSteps(state3, step.steps, inner);
 }
+async function canonicalFlowPath(p) {
+  try {
+    return await fs49.realpath(p);
+  } catch {
+    try {
+      return path35.join(await fs49.realpath(path35.dirname(p)), path35.basename(p));
+    } catch {
+      return p;
+    }
+  }
+}
+function baselineKeyFor(canonicalPath, flowName) {
+  const stem = path35.basename(canonicalPath, ".yaml");
+  return FLOW_NAME_PATTERN.test(stem) ? stem : flowName;
+}
 async function execRunStep(state3, step, scope) {
   const index = state3.reports.length;
   const target = step.flow;
+  const display = runDisplayName(target, scope);
   const fail = (reason) => {
     pushReport(state3, {
       index,
       kind: "run",
       status: "error",
-      flow: target,
+      flow: display,
+      target,
       reason,
       ...depthOf(scope)
     });
     state3.stopped = true;
   };
-  if (scope.runStack.includes(target)) {
-    return fail(`cyclic flow reference: ${[...scope.runStack, target].join(" \u2192 ")}`);
+  const canonical = await canonicalFlowPath(scopeFlowDir(scope) + path35.sep + target);
+  if (scope.runStack.some((entry) => entry.canonical === canonical)) {
+    return fail(
+      `cyclic flow reference: ${[...scope.runStack.map((entry) => entry.display), display].join(" \u2192 ")}`
+    );
   }
   if (scope.runStack.length >= MAX_RUN_DEPTH) {
     return fail("max run depth exceeded");
   }
+  const suppliedBase = path35.posix.basename(target);
+  const spelling = await classifyOnDiskSpelling(
+    path35.dirname(scopeFlowDir(scope) + path35.sep + target),
+    suppliedBase
+  );
+  if (spelling.state === "case_folded") {
+    const recovery = spelling.addressable ? `reference it as "${target.slice(0, target.length - suppliedBase.length)}${spelling.actual}"` : `rename "${spelling.actual}" to "${suppliedBase}" to compose it \u2014 flow files must be lowercase .yaml`;
+    return fail(
+      `mis-cased fragment reference "${target}": no directory entry is named "${suppliedBase}" (this filesystem matched it case-insensitively to "${spelling.actual}"), so the fragment name keying its step reports is one nothing on disk carries and a case-sensitive checkout could not find the file at all \u2014 ${recovery}`
+    );
+  }
   let fragment;
   try {
-    assertSafeFlowName(target);
-    const fragPath = path35.join(state3.flowsDir, `${target}.yaml`);
-    fragment = parseFlow(await fs49.readFile(fragPath, "utf8"));
+    fragment = parseFlow(await fs49.readFile(canonical, "utf8"));
   } catch (err) {
     return fail(`could not load fragment "${target}": ${errMsg2(err)}`);
   }
-  pushReport(state3, { index, kind: "run", status: "pass", flow: target, ...depthOf(scope) });
+  pushReport(state3, {
+    index,
+    kind: "run",
+    status: "pass",
+    flow: display,
+    target,
+    ...depthOf(scope)
+  });
   await execSteps(
     state3,
     fragment.steps,
-    childScope(scope, { flow: target, runStack: [...scope.runStack, target] })
+    childScope(scope, { runStack: [...scope.runStack, { canonical, display }] })
   );
 }
 async function execLeafStep(state3, step, index, scope) {
   const base = {
     index,
     kind: step.kind,
-    flow: scope.flow,
+    flow: scopeFlow(scope),
     target: stepTarget(step),
     ...depthOf(scope)
   };
@@ -152563,7 +152875,7 @@ async function execLeafStep(state3, step, index, scope) {
       try {
         const r = await runSnapshot(deviceEnv(state3), {
           flowsDir: state3.flowsDir,
-          flowName: state3.topFlowName,
+          flowName: state3.baselineKey,
           name: step.name,
           maxMismatch: step.maxMismatch ?? DEFAULT_MAX_MISMATCH,
           updateBaselines: state3.updateBaselines,
@@ -152621,13 +152933,98 @@ async function execLeafStep(state3, step, index, scope) {
 function errMsg2(err) {
   return err instanceof Error ? err.message : String(err);
 }
-function resolveFlowFilePath(params, fileInput) {
-  assertSafeFlowName(params.name);
+async function resolveFlowSource(params, fileInput, flowPathInput) {
+  if (params.name === void 0 === (params.flow_path === void 0)) {
+    throw new FailureError("Pass exactly one flow source: name or flow_path.", {
+      error_code: FAILURE_CODES.FLOW_FILE_INVALID,
+      failure_stage: "flow_source",
+      failure_area: "tool_server",
+      error_kind: "validation"
+    });
+  }
   setActiveProjectRoot(params.project_root);
-  const expected = getFlowPath(params.name);
-  if (!params.flow_file) return expected;
-  if (fileInput?.viaUpload) return params.flow_file;
-  if (!path35.isAbsolute(params.flow_file) || params.flow_file.split(/[\\/]+/).includes("..") || path35.resolve(params.flow_file) !== path35.resolve(expected)) {
+  if (params.flow_path !== void 0) {
+    if (flowPathInput?.viaUpload) {
+      throw new FailureError(
+        `Invalid flow_path "${flowPathInput.clientPath}": explicit flow paths require a co-located client and tool server with a shared filesystem, and this one arrived as an upload \u2014 sibling run: files, baselines, and baseline write-back all resolve beside the copy this server materialized, alone in a temp directory. Pass name + project_root to run a self-contained flow from a remote client; name uploads the same way, so a flow with run: or snapshot: steps needs the client and tool server on one filesystem.`,
+        {
+          error_code: FAILURE_CODES.FLOW_FILE_INVALID,
+          failure_stage: "flow_path_shared_filesystem",
+          failure_area: "tool_server",
+          error_kind: "validation"
+        }
+      );
+    }
+    const isVerifiedHostPath = flowPathInput?.presentOnHost === true && flowPathInput.statVerified === true && path35.resolve(params.flow_path) === path35.resolve(flowPathInput.clientPath);
+    if (!isVerifiedHostPath) {
+      throw new FailureError(
+        `Invalid flow_path "${params.flow_path}": explicit flow paths must be supplied through the flow_path file-input boundary. Pass the client-local path and let the argent client resolve it.`,
+        {
+          error_code: FAILURE_CODES.FLOW_FILE_INVALID,
+          failure_stage: "flow_path_boundary",
+          failure_area: "tool_server",
+          error_kind: "validation"
+        }
+      );
+    }
+    if (!path35.isAbsolute(params.flow_path)) {
+      throw new FailureError(
+        `Invalid flow_path "${params.flow_path}": flow paths must be absolute \u2014 a relative path is resolved against the tool server's working directory, not the caller's. Pass the absolute path to the flow's YAML.`,
+        {
+          error_code: FAILURE_CODES.FLOW_FILE_INVALID,
+          failure_stage: "flow_path_absolute",
+          failure_area: "tool_server",
+          error_kind: "validation"
+        }
+      );
+    }
+    if (params.flow_path.split(/[\\/]+/).includes("..")) {
+      throw new FailureError(
+        `Invalid flow_path "${params.flow_path}": flow paths must not contain ".." segments \u2014 a ".." after a symlinked directory can name a different file than the spelling suggests, and the argent client always sends fully resolved paths. Pass the fully resolved absolute path to the flow's YAML.`,
+        {
+          error_code: FAILURE_CODES.FLOW_FILE_INVALID,
+          failure_stage: "flow_path_dotdot",
+          failure_area: "tool_server",
+          error_kind: "validation"
+        }
+      );
+    }
+    const clientPath = flowPathInput.clientPath;
+    const clientExt = path35.extname(clientPath);
+    const bareExtension = path35.basename(clientPath).toLowerCase() === ".yaml";
+    if (!bareExtension && clientExt !== ".yaml") {
+      const detail = clientExt.toLowerCase() === ".yaml" ? `flow files must use the lowercase .yaml extension, not "${clientExt}".` : `flow files must use the .yaml extension.`;
+      throw new FailureError(`Invalid flow_path "${clientPath}": ${detail}`, {
+        error_code: FAILURE_CODES.FLOW_FILE_INVALID,
+        failure_stage: "flow_path_extension",
+        failure_area: "tool_server",
+        error_kind: "validation"
+      });
+    }
+    const flowName2 = bareExtension ? "" : path35.basename(clientPath, ".yaml");
+    assertSafeFlowName(flowName2);
+    const suppliedBase = path35.basename(clientPath);
+    const spelling2 = await classifyOnDiskSpelling(path35.dirname(params.flow_path), suppliedBase);
+    if (spelling2.state !== "listed") {
+      const recovery = spelling2.state === "absent" ? `Pass the basename exactly as it appears on disk.` : spelling2.addressable ? `Pass flow_path with the on-disk basename "${spelling2.actual}".` : `Rename "${spelling2.actual}" to "${suppliedBase}" to run it \u2014 flow files must be lowercase .yaml.`;
+      throw new FailureError(
+        `Invalid flow_path "${clientPath}": the file must be named as it appears on disk \u2014 this filesystem matched "${suppliedBase}" case-insensitively` + (spelling2.state === "case_folded" ? ` to "${spelling2.actual}"` : "") + `, so the flow name (which keys the report and __baselines__/) would be one no directory entry carries. ${recovery}`,
+        {
+          error_code: FAILURE_CODES.FLOW_FILE_INVALID,
+          failure_stage: "flow_path_casing",
+          failure_area: "tool_server",
+          error_kind: "validation"
+        }
+      );
+    }
+    return { filePath: params.flow_path, flowName: flowName2, viaUpload: false };
+  }
+  const flowName = params.name;
+  assertSafeFlowName(flowName);
+  const expected = getFlowPath(flowName);
+  if (params.flow_file && fileInput?.viaUpload)
+    return { filePath: params.flow_file, flowName, viaUpload: true };
+  if (params.flow_file && (!path35.isAbsolute(params.flow_file) || params.flow_file.split(/[\\/]+/).includes("..") || path35.resolve(params.flow_file) !== path35.resolve(expected))) {
     throw new FailureError(
       `Invalid flow_file "${params.flow_file}": it must resolve to the flow's path under the project root ("${expected}"). flow_file is internal \u2014 leave it unset and pass project_root + name.`,
       {
@@ -152638,23 +153035,70 @@ function resolveFlowFilePath(params, fileInput) {
       }
     );
   }
-  return params.flow_file;
+  const spelling = await classifyOnDiskSpelling(path35.dirname(expected), `${flowName}.yaml`);
+  if (spelling.state === "case_folded") {
+    const recovery = spelling.addressable ? `Pass name "${path35.basename(spelling.actual, ".yaml")}".` : `Rename "${spelling.actual}" to "${flowName}.yaml" to run it \u2014 flow files must be lowercase .yaml.`;
+    throw new FailureError(
+      `Invalid flow name "${flowName}": no saved flow is named "${flowName}.yaml" \u2014 this filesystem matched it case-insensitively to "${spelling.actual}", so the flow name (which keys the report and __baselines__/) would be one no directory entry carries. ` + recovery,
+      {
+        error_code: FAILURE_CODES.FLOW_NAME_INVALID,
+        failure_stage: "flow_name_casing",
+        failure_area: "tool_server",
+        error_kind: "validation"
+      }
+    );
+  }
+  return { filePath: params.flow_file || expected, flowName, viaUpload: false };
 }
 
 // ../tool-server/src/tools/flows/flow-read-prerequisite.ts
 init_zod();
 var fs50 = __toESM(require("node:fs/promises"));
+init_src();
 var zodSchema65 = external_exports.object({
-  name: external_exports.string().describe('Name of the flow to inspect (e.g. "settings-explore")'),
+  name: external_exports.string().optional().describe(
+    'Name of a saved flow to inspect from `.argent/flows` (e.g. "settings-explore"). Omit when flow_path is set.'
+  ),
   project_root: external_exports.string().describe(
-    "Absolute path to the project root directory that contains `.argent/flows/<name>.yaml`."
+    "Absolute path to the calling agent's project root \u2014 the cwd it is working in. With name, the saved flow is read from `.argent/flows/<name>.yaml` under this root; with flow_path, the prerequisite is read from that YAML instead, so pass the agent's cwd."
   ),
   flow_file: external_exports.string().optional().describe(
     "Path to the flow .yaml as readable by the tool-server. Internal \u2014 the argent client derives it from project_root and name automatically; leave unset."
+  ),
+  flow_path: external_exports.string().optional().describe(
+    "Absolute path to a co-located flow .yaml on the client and tool server's shared filesystem. This must be supplied through the file-input boundary. Pass the same flow source here as to flow-execute, so the prerequisite you read belongs to the flow that will run; for remote reads, pass name + project_root instead."
   )
-});
+}).superRefine((params, ctx) => {
+  if (params.name === void 0 === (params.flow_path === void 0)) {
+    ctx.addIssue({
+      code: external_exports.ZodIssueCode.custom,
+      message: "Pass exactly one flow source: name or flow_path.",
+      path: ["flow_path"]
+    });
+  }
+});
+var inputSchema3 = {
+  ...zodObjectToJsonSchema(zodSchema65),
+  // Zod's JSON Schema conversion cannot represent superRefine. `oneOf` makes
+  // the same exactly-one source rule visible to MCP and HTTP clients — the
+  // identical addition flow-execute makes, so the pre-flight read advertises
+  // the same contract as the run it precedes.
+  oneOf: [{ required: ["name"] }, { required: ["flow_path"] }]
+};
 var fileInputs4 = [
-  { target: "flow_file", path: "${project_root}/.argent/flows/${name}.yaml", kind: "file" }
+  {
+    target: "flow_path",
+    path: "${flow_path}",
+    kind: "file",
+    optional: true,
+    unwrapWhenSet: "name"
+  },
+  {
+    target: "flow_file",
+    path: "${project_root}/.argent/flows/${name}.yaml",
+    kind: "file",
+    skipWhenSet: "flow_path"
+  }
 ];
 var flowReadPrerequisiteTool = {
   id: "flow-read-prerequisite",
@@ -152663,19 +153107,25 @@ var flowReadPrerequisiteTool = {
     completedMsg: () => "Read flow prerequisite",
     failedMsg: ({ failureSignal: failureSignal2 }) => `Failed to read flow prerequisite: ${failureSignal2.error_code}`
   },
-  description: `Read the execution prerequisite of a saved flow without running it.
+  description: `Read the execution prerequisite of a flow without running it \u2014 a saved flow from the .argent/flows/ directory, or an explicit boundary-managed flow_path.
 Returns the prerequisite description so you can verify the required state is met before calling flow-execute.
-Use when you need to check what app/simulator state is required before executing a flow.
-Fails if the flow file does not exist in the .argent/flows/ directory.`,
+Use when you need to check what app/simulator state is required before executing a flow; pass the same flow
+source (name or flow_path) you will pass to flow-execute, so the prerequisite you read is the contract of
+the flow that will actually run.
+Fails if the flow file does not exist.`,
   zodSchema: zodSchema65,
+  inputSchema: inputSchema3,
   fileInputs: fileInputs4,
   services: () => ({}),
   async execute(_services, params, ctx) {
-    const filePath = resolveFlowFilePath(params, ctx?.fileInputs?.flow_file);
-    const fileContent = await fs50.readFile(filePath, "utf8");
-    const flow = parseFlow(fileContent);
+    const { filePath, flowName } = await resolveFlowSource(
+      params,
+      ctx?.fileInputs?.flow_file,
+      ctx?.fileInputs?.flow_path
+    );
+    const flow = parseFlow(await fs50.readFile(filePath, "utf8"));
     return {
-      flow: params.name,
+      flow: flowName,
       executionPrerequisite: flow.executionPrerequisite
     };
   }
@@ -152730,15 +153180,15 @@ async function listDir(path40) {
 }
 var COMMAND_TIMEOUT_MS = 3e3;
 function runVersionCommand(cmd, args, cwd) {
-  return new Promise((resolve9) => {
+  return new Promise((resolve10) => {
     const child = (0, import_node_child_process28.execFile)(cmd, args, { cwd, timeout: COMMAND_TIMEOUT_MS }, (err, stdout) => {
       if (err) {
-        resolve9(null);
+        resolve10(null);
         return;
       }
-      resolve9(stdout.trim().replace(/^v/, ""));
+      resolve10(stdout.trim().replace(/^v/, ""));
     });
-    child.on("error", () => resolve9(null));
+    child.on("error", () => resolve10(null));
   });
 }
 var METRO_PORT_PATTERNS = [/server\s*:\s*\{[^}]*?port\s*:\s*(\d+)/s, /port\s*:\s*(\d+)/];
@@ -153439,7 +153889,7 @@ function findElementMatch(tree, match) {
   return { frame: candidates[0].frame, exact: candidates[0].exact };
 }
 function delay(ms) {
-  return new Promise((resolve9) => setTimeout(resolve9, ms));
+  return new Promise((resolve10) => setTimeout(resolve10, ms));
 }
 var CAPTURE_ATTEMPTS = 8;
 var CAPTURE_RETRY_MS = 300;
@@ -154052,19 +154502,19 @@ function createRegistry() {
 // ../tool-server/src/utils/probe-argent-tool-server.ts
 var http4 = __toESM(require("node:http"));
 function probeArgentToolServer(host, port, timeoutMs = 500) {
-  return new Promise((resolve9) => {
+  return new Promise((resolve10) => {
     const req = http4.request(
       { host, port, path: "/tools", method: "GET", timeout: timeoutMs },
       (res) => {
         const isArgentPeer = res.statusCode === 200 || res.statusCode === 401;
         res.resume();
-        resolve9(isArgentPeer);
+        resolve10(isArgentPeer);
       }
     );
-    req.on("error", () => resolve9(false));
+    req.on("error", () => resolve10(false));
     req.on("timeout", () => {
       req.destroy();
-      resolve9(false);
+      resolve10(false);
     });
     req.end();
   });
@@ -154508,7 +154958,7 @@ function start() {
     }
     if (server) {
       const forceExit = setTimeout(() => process.exit(finalExitCode), PROCESS_TIMEOUT_MS);
-      await new Promise((resolve9) => server.close(() => resolve9()));
+      await new Promise((resolve10) => server.close(() => resolve10()));
       clearTimeout(forceExit);
     }
     variantProposalStore.events.off("awaitParked", onAwaitParked);