npm - @taptap/instant-games-open-mcp - Versions diffs - 1.23.2 → 1.23.3 - Mend

@taptap/instant-games-open-mcp 1.23.2 → 1.23.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/README.md +64 -56
package/dist/maker.js +1498 -1089
package/dist/proxy.js +1 -1
package/dist/server.js +1 -1
package/package.json +1 -1
package/skills/taptap-maker-dev-kit-guide/SKILL.md +10 -9
package/skills/taptap-maker-local/SKILL.md +88 -74
package/skills/update-taptap-mcp/SKILL.md +9 -16

package/dist/maker.js CHANGED Viewed

@@ -3116,27 +3116,27 @@ var require_utils = __commonJS({
     "use strict";
     var isUUID = RegExp.prototype.test.bind(/^[\da-f]{8}-[\da-f]{4}-[\da-f]{4}-[\da-f]{4}-[\da-f]{12}$/iu);
     var isIPv4 = RegExp.prototype.test.bind(/^(?:(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)\.){3}(?:25[0-5]|2[0-4]\d|1\d{2}|[1-9]\d|\d)$/u);
-    function stringArrayToHexStripped(input) {
+    function stringArrayToHexStripped(input2) {
       let acc = "";
       let code = 0;
       let i = 0;
-      for (i = 0; i < input.length; i++) {
-        code = input[i].charCodeAt(0);
+      for (i = 0; i < input2.length; i++) {
+        code = input2[i].charCodeAt(0);
         if (code === 48) {
           continue;
         }
         if (!(code >= 48 && code <= 57 || code >= 65 && code <= 70 || code >= 97 && code <= 102)) {
           return "";
         }
-        acc += input[i];
+        acc += input2[i];
         break;
       }
-      for (i += 1; i < input.length; i++) {
-        code = input[i].charCodeAt(0);
+      for (i += 1; i < input2.length; i++) {
+        code = input2[i].charCodeAt(0);
         if (!(code >= 48 && code <= 57 || code >= 65 && code <= 70 || code >= 97 && code <= 102)) {
           return "";
         }
-        acc += input[i];
+        acc += input2[i];
       }
       return acc;
     }
@@ -3145,29 +3145,29 @@ var require_utils = __commonJS({
       buffer.length = 0;
       return true;
     }
-    function consumeHextets(buffer, address, output) {
+    function consumeHextets(buffer, address, output2) {
       if (buffer.length) {
         const hex3 = stringArrayToHexStripped(buffer);
         if (hex3 !== "") {
           address.push(hex3);
         } else {
-          output.error = true;
+          output2.error = true;
           return false;
         }
         buffer.length = 0;
       }
       return true;
     }
-    function getIPV6(input) {
+    function getIPV6(input2) {
       let tokenCount = 0;
-      const output = { error: false, address: "", zone: "" };
+      const output2 = { error: false, address: "", zone: "" };
       const address = [];
       const buffer = [];
       let endipv6Encountered = false;
       let endIpv6 = false;
       let consume = consumeHextets;
-      for (let i = 0; i < input.length; i++) {
-        const cursor = input[i];
+      for (let i = 0; i < input2.length; i++) {
+        const cursor = input2[i];
         if (cursor === "[" || cursor === "]") {
           continue;
         }
@@ -3175,20 +3175,20 @@ var require_utils = __commonJS({
           if (endipv6Encountered === true) {
             endIpv6 = true;
           }
-          if (!consume(buffer, address, output)) {
+          if (!consume(buffer, address, output2)) {
             break;
           }
           if (++tokenCount > 7) {
-            output.error = true;
+            output2.error = true;
             break;
           }
-          if (i > 0 && input[i - 1] === ":") {
+          if (i > 0 && input2[i - 1] === ":") {
             endipv6Encountered = true;
           }
           address.push(":");
           continue;
         } else if (cursor === "%") {
-          if (!consume(buffer, address, output)) {
+          if (!consume(buffer, address, output2)) {
             break;
           }
           consume = consumeIsZone;
@@ -3199,15 +3199,15 @@ var require_utils = __commonJS({
       }
       if (buffer.length) {
         if (consume === consumeIsZone) {
-          output.zone = buffer.join("");
+          output2.zone = buffer.join("");
         } else if (endIpv6) {
           address.push(buffer.join(""));
         } else {
           address.push(stringArrayToHexStripped(buffer));
         }
       }
-      output.address = address.join("");
-      return output;
+      output2.address = address.join("");
+      return output2;
     }
     function normalizeIPv6(host) {
       if (findToken(host, ":") < 2) {
@@ -3233,80 +3233,80 @@ var require_utils = __commonJS({
       }
       return ind;
     }
-    function removeDotSegments(path9) {
-      let input = path9;
-      const output = [];
+    function removeDotSegments(path10) {
+      let input2 = path10;
+      const output2 = [];
       let nextSlash = -1;
       let len = 0;
-      while (len = input.length) {
+      while (len = input2.length) {
         if (len === 1) {
-          if (input === ".") {
+          if (input2 === ".") {
             break;
-          } else if (input === "/") {
-            output.push("/");
+          } else if (input2 === "/") {
+            output2.push("/");
             break;
           } else {
-            output.push(input);
+            output2.push(input2);
             break;
           }
         } else if (len === 2) {
-          if (input[0] === ".") {
-            if (input[1] === ".") {
+          if (input2[0] === ".") {
+            if (input2[1] === ".") {
               break;
-            } else if (input[1] === "/") {
-              input = input.slice(2);
+            } else if (input2[1] === "/") {
+              input2 = input2.slice(2);
               continue;
             }
-          } else if (input[0] === "/") {
-            if (input[1] === "." || input[1] === "/") {
-              output.push("/");
+          } else if (input2[0] === "/") {
+            if (input2[1] === "." || input2[1] === "/") {
+              output2.push("/");
               break;
             }
           }
         } else if (len === 3) {
-          if (input === "/..") {
-            if (output.length !== 0) {
-              output.pop();
+          if (input2 === "/..") {
+            if (output2.length !== 0) {
+              output2.pop();
             }
-            output.push("/");
+            output2.push("/");
             break;
           }
         }
-        if (input[0] === ".") {
-          if (input[1] === ".") {
-            if (input[2] === "/") {
-              input = input.slice(3);
+        if (input2[0] === ".") {
+          if (input2[1] === ".") {
+            if (input2[2] === "/") {
+              input2 = input2.slice(3);
               continue;
             }
-          } else if (input[1] === "/") {
-            input = input.slice(2);
+          } else if (input2[1] === "/") {
+            input2 = input2.slice(2);
             continue;
           }
-        } else if (input[0] === "/") {
-          if (input[1] === ".") {
-            if (input[2] === "/") {
-              input = input.slice(2);
+        } else if (input2[0] === "/") {
+          if (input2[1] === ".") {
+            if (input2[2] === "/") {
+              input2 = input2.slice(2);
               continue;
-            } else if (input[2] === ".") {
-              if (input[3] === "/") {
-                input = input.slice(3);
-                if (output.length !== 0) {
-                  output.pop();
+            } else if (input2[2] === ".") {
+              if (input2[3] === "/") {
+                input2 = input2.slice(3);
+                if (output2.length !== 0) {
+                  output2.pop();
                 }
                 continue;
               }
             }
           }
         }
-        if ((nextSlash = input.indexOf("/", 1)) === -1) {
-          output.push(input);
+        if ((nextSlash = input2.indexOf("/", 1)) === -1) {
+          output2.push(input2);
           break;
         } else {
-          output.push(input.slice(0, nextSlash));
-          input = input.slice(nextSlash);
+          output2.push(input2.slice(0, nextSlash));
+          input2 = input2.slice(nextSlash);
         }
       }
-      return output.join("");
+      return output2.join("");
     }
     function normalizeComponentEncoding(component, esc2) {
       const func = esc2 !== true ? escape : unescape;
@@ -3433,8 +3433,8 @@ var require_schemes = __commonJS({
         wsComponent.secure = void 0;
       }
       if (wsComponent.resourceName) {
-        const [path9, query] = wsComponent.resourceName.split("?");
-        wsComponent.path = path9 && path9 !== "/" ? path9 : void 0;
+        const [path10, query] = wsComponent.resourceName.split("?");
+        wsComponent.path = path10 && path10 !== "/" ? path10 : void 0;
         wsComponent.query = query;
         wsComponent.resourceName = void 0;
       }
@@ -12491,12 +12491,12 @@ var require_dist = __commonJS({
         throw new Error(`Unknown format "${name}"`);
       return f;
     };
-    function addFormats(ajv, list, fs8, exportName) {
+    function addFormats(ajv, list, fs9, exportName) {
       var _a2;
       var _b;
       (_a2 = (_b = ajv.opts.code).formats) !== null && _a2 !== void 0 ? _a2 : _b.formats = (0, codegen_1._)`require("ajv-formats/dist/formats").${exportName}`;
       for (const f of list)
-        ajv.addFormat(f, fs8[f]);
+        ajv.addFormat(f, fs9[f]);
     }
     module.exports = exports = formatsPlugin;
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -12509,8 +12509,8 @@ var require_windows = __commonJS({
   "node_modules/isexe/windows.js"(exports, module) {
     module.exports = isexe;
     isexe.sync = sync;
-    var fs8 = __require("fs");
-    function checkPathExt(path9, options) {
+    var fs9 = __require("fs");
+    function checkPathExt(path10, options) {
       var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
       if (!pathext) {
         return true;
@@ -12521,25 +12521,25 @@ var require_windows = __commonJS({
       }
       for (var i = 0; i < pathext.length; i++) {
         var p = pathext[i].toLowerCase();
-        if (p && path9.substr(-p.length).toLowerCase() === p) {
+        if (p && path10.substr(-p.length).toLowerCase() === p) {
           return true;
         }
       }
       return false;
     }
-    function checkStat(stat, path9, options) {
+    function checkStat(stat, path10, options) {
       if (!stat.isSymbolicLink() && !stat.isFile()) {
         return false;
       }
-      return checkPathExt(path9, options);
+      return checkPathExt(path10, options);
     }
-    function isexe(path9, options, cb) {
-      fs8.stat(path9, function(er, stat) {
-        cb(er, er ? false : checkStat(stat, path9, options));
+    function isexe(path10, options, cb) {
+      fs9.stat(path10, function(er, stat) {
+        cb(er, er ? false : checkStat(stat, path10, options));
       });
     }
-    function sync(path9, options) {
-      return checkStat(fs8.statSync(path9), path9, options);
+    function sync(path10, options) {
+      return checkStat(fs9.statSync(path10), path10, options);
     }
   }
 });
@@ -12549,14 +12549,14 @@ var require_mode = __commonJS({
   "node_modules/isexe/mode.js"(exports, module) {
     module.exports = isexe;
     isexe.sync = sync;
-    var fs8 = __require("fs");
-    function isexe(path9, options, cb) {
-      fs8.stat(path9, function(er, stat) {
+    var fs9 = __require("fs");
+    function isexe(path10, options, cb) {
+      fs9.stat(path10, function(er, stat) {
         cb(er, er ? false : checkStat(stat, options));
       });
     }
-    function sync(path9, options) {
-      return checkStat(fs8.statSync(path9), options);
+    function sync(path10, options) {
+      return checkStat(fs9.statSync(path10), options);
     }
     function checkStat(stat, options) {
       return stat.isFile() && checkMode(stat, options);
@@ -12580,7 +12580,7 @@ var require_mode = __commonJS({
 // node_modules/isexe/index.js
 var require_isexe = __commonJS({
   "node_modules/isexe/index.js"(exports, module) {
-    var fs8 = __require("fs");
+    var fs9 = __require("fs");
     var core;
     if (process.platform === "win32" || global.TESTING_WINDOWS) {
       core = require_windows();
@@ -12589,7 +12589,7 @@ var require_isexe = __commonJS({
     }
     module.exports = isexe;
     isexe.sync = sync;
-    function isexe(path9, options, cb) {
+    function isexe(path10, options, cb) {
       if (typeof options === "function") {
         cb = options;
         options = {};
@@ -12599,7 +12599,7 @@ var require_isexe = __commonJS({
           throw new TypeError("callback not provided");
         }
         return new Promise(function(resolve, reject) {
-          isexe(path9, options || {}, function(er, is) {
+          isexe(path10, options || {}, function(er, is) {
             if (er) {
               reject(er);
             } else {
@@ -12608,7 +12608,7 @@ var require_isexe = __commonJS({
           });
         });
       }
-      core(path9, options || {}, function(er, is) {
+      core(path10, options || {}, function(er, is) {
         if (er) {
           if (er.code === "EACCES" || options && options.ignoreErrors) {
             er = null;
@@ -12618,9 +12618,9 @@ var require_isexe = __commonJS({
         cb(er, is);
       });
     }
-    function sync(path9, options) {
+    function sync(path10, options) {
       try {
-        return core.sync(path9, options || {});
+        return core.sync(path10, options || {});
       } catch (er) {
         if (options && options.ignoreErrors || er.code === "EACCES") {
           return false;
@@ -12636,7 +12636,7 @@ var require_isexe = __commonJS({
 var require_which = __commonJS({
   "node_modules/which/which.js"(exports, module) {
     var isWindows = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
-    var path9 = __require("path");
+    var path10 = __require("path");
     var COLON = isWindows ? ";" : ":";
     var isexe = require_isexe();
     var getNotFoundError = (cmd) => Object.assign(new Error(`not found: ${cmd}`), { code: "ENOENT" });
@@ -12674,7 +12674,7 @@ var require_which = __commonJS({
           return opt.all && found.length ? resolve(found) : reject(getNotFoundError(cmd));
         const ppRaw = pathEnv[i];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-        const pCmd = path9.join(pathPart, cmd);
+        const pCmd = path10.join(pathPart, cmd);
         const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
         resolve(subStep(p, i, 0));
       });
@@ -12701,7 +12701,7 @@ var require_which = __commonJS({
       for (let i = 0; i < pathEnv.length; i++) {
         const ppRaw = pathEnv[i];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-        const pCmd = path9.join(pathPart, cmd);
+        const pCmd = path10.join(pathPart, cmd);
         const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
         for (let j = 0; j < pathExt.length; j++) {
           const cur = p + pathExt[j];
@@ -12749,7 +12749,7 @@ var require_path_key = __commonJS({
 var require_resolveCommand = __commonJS({
   "node_modules/cross-spawn/lib/util/resolveCommand.js"(exports, module) {
     "use strict";
-    var path9 = __require("path");
+    var path10 = __require("path");
     var which = require_which();
     var getPathKey = require_path_key();
     function resolveCommandAttempt(parsed, withoutPathExt) {
@@ -12767,7 +12767,7 @@ var require_resolveCommand = __commonJS({
       try {
         resolved = which.sync(parsed.command, {
           path: env[getPathKey({ env })],
-          pathExt: withoutPathExt ? path9.delimiter : void 0
+          pathExt: withoutPathExt ? path10.delimiter : void 0
         });
       } catch (e) {
       } finally {
@@ -12776,7 +12776,7 @@ var require_resolveCommand = __commonJS({
         }
       }
       if (resolved) {
-        resolved = path9.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
+        resolved = path10.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
       }
       return resolved;
     }
@@ -12830,8 +12830,8 @@ var require_shebang_command = __commonJS({
       if (!match) {
         return null;
       }
-      const [path9, argument] = match[0].replace(/#! ?/, "").split(" ");
-      const binary = path9.split("/").pop();
+      const [path10, argument] = match[0].replace(/#! ?/, "").split(" ");
+      const binary = path10.split("/").pop();
       if (binary === "env") {
         return argument;
       }
@@ -12844,16 +12844,16 @@ var require_shebang_command = __commonJS({
 var require_readShebang = __commonJS({
   "node_modules/cross-spawn/lib/util/readShebang.js"(exports, module) {
     "use strict";
-    var fs8 = __require("fs");
+    var fs9 = __require("fs");
     var shebangCommand = require_shebang_command();
     function readShebang(command) {
       const size = 150;
       const buffer = Buffer.alloc(size);
       let fd;
       try {
-        fd = fs8.openSync(command, "r");
-        fs8.readSync(fd, buffer, 0, size, 0);
-        fs8.closeSync(fd);
+        fd = fs9.openSync(command, "r");
+        fs9.readSync(fd, buffer, 0, size, 0);
+        fs9.closeSync(fd);
       } catch (e) {
       }
       return shebangCommand(buffer.toString());
@@ -12866,7 +12866,7 @@ var require_readShebang = __commonJS({
 var require_parse = __commonJS({
   "node_modules/cross-spawn/lib/parse.js"(exports, module) {
     "use strict";
-    var path9 = __require("path");
+    var path10 = __require("path");
     var resolveCommand = require_resolveCommand();
     var escape2 = require_escape();
     var readShebang = require_readShebang();
@@ -12891,7 +12891,7 @@ var require_parse = __commonJS({
       const needsShell = !isExecutableRegExp.test(commandFile);
       if (parsed.options.forceShell || needsShell) {
         const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
-        parsed.command = path9.normalize(parsed.command);
+        parsed.command = path10.normalize(parsed.command);
         parsed.command = escape2.command(parsed.command);
         parsed.args = parsed.args.map((arg) => escape2.argument(arg, needsDoubleEscapeMetaChars));
         const shellCommand = [parsed.command].concat(parsed.args).join(" ");
@@ -12987,7 +12987,7 @@ var require_cross_spawn = __commonJS({
       enoent.hookChildProcess(spawned, parsed);
       return spawned;
     }
-    function spawnSync4(command, args, options) {
+    function spawnSync5(command, args, options) {
       const parsed = parse3(command, args, options);
       const result = cp.spawnSync(parsed.command, parsed.args, parsed.options);
       result.error = result.error || enoent.verifyENOENTSync(result.status, parsed);
@@ -12995,16 +12995,12 @@ var require_cross_spawn = __commonJS({
     }
     module.exports = spawn3;
     module.exports.spawn = spawn3;
-    module.exports.sync = spawnSync4;
+    module.exports.sync = spawnSync5;
     module.exports._parse = parse3;
     module.exports._enoent = enoent;
   }
 });
-// src/maker/index.ts
-import fs7 from "node:fs";
-import path8 from "node:path";
 // src/maker/server/mcp.ts
 import fs6 from "node:fs";
 import path7 from "node:path";
@@ -13369,8 +13365,8 @@ function getErrorMap() {
 // node_modules/zod/v3/helpers/parseUtil.js
 var makeIssue = (params) => {
-  const { data, path: path9, errorMaps, issueData } = params;
-  const fullPath = [...path9, ...issueData.path || []];
+  const { data, path: path10, errorMaps, issueData } = params;
+  const fullPath = [...path10, ...issueData.path || []];
   const fullIssue = {
     ...issueData,
     path: fullPath
@@ -13485,11 +13481,11 @@ var errorUtil;
 // node_modules/zod/v3/types.js
 var ParseInputLazyPath = class {
-  constructor(parent, value, path9, key) {
+  constructor(parent, value, path10, key) {
     this._cachedPath = [];
     this.parent = parent;
     this.data = value;
-    this._path = path9;
+    this._path = path10;
     this._key = key;
   }
   get path() {
@@ -13549,41 +13545,41 @@ var ZodType = class {
   get description() {
     return this._def.description;
   }
-  _getType(input) {
-    return getParsedType(input.data);
+  _getType(input2) {
+    return getParsedType(input2.data);
   }
-  _getOrReturnCtx(input, ctx) {
+  _getOrReturnCtx(input2, ctx) {
     return ctx || {
-      common: input.parent.common,
-      data: input.data,
-      parsedType: getParsedType(input.data),
+      common: input2.parent.common,
+      data: input2.data,
+      parsedType: getParsedType(input2.data),
       schemaErrorMap: this._def.errorMap,
-      path: input.path,
-      parent: input.parent
+      path: input2.path,
+      parent: input2.parent
     };
   }
-  _processInputParams(input) {
+  _processInputParams(input2) {
     return {
       status: new ParseStatus(),
       ctx: {
-        common: input.parent.common,
-        data: input.data,
-        parsedType: getParsedType(input.data),
+        common: input2.parent.common,
+        data: input2.data,
+        parsedType: getParsedType(input2.data),
         schemaErrorMap: this._def.errorMap,
-        path: input.path,
-        parent: input.parent
+        path: input2.path,
+        parent: input2.parent
       }
     };
   }
-  _parseSync(input) {
-    const result = this._parse(input);
+  _parseSync(input2) {
+    const result = this._parse(input2);
     if (isAsync(result)) {
       throw new Error("Synchronous parse encountered promise.");
     }
     return result;
   }
-  _parseAsync(input) {
-    const result = this._parse(input);
+  _parseAsync(input2) {
+    const result = this._parse(input2);
     return Promise.resolve(result);
   }
   parse(data, params) {
@@ -13910,13 +13906,13 @@ function isValidCidr(ip, version2) {
   return false;
 }
 var ZodString = class _ZodString2 extends ZodType {
-  _parse(input) {
+  _parse(input2) {
     if (this._def.coerce) {
-      input.data = String(input.data);
+      input2.data = String(input2.data);
     }
-    const parsedType2 = this._getType(input);
+    const parsedType2 = this._getType(input2);
     if (parsedType2 !== ZodParsedType.string) {
-      const ctx2 = this._getOrReturnCtx(input);
+      const ctx2 = this._getOrReturnCtx(input2);
       addIssueToContext(ctx2, {
         code: ZodIssueCode.invalid_type,
         expected: ZodParsedType.string,
@@ -13928,8 +13924,8 @@ var ZodString = class _ZodString2 extends ZodType {
     let ctx = void 0;
     for (const check2 of this._def.checks) {
       if (check2.kind === "min") {
-        if (input.data.length < check2.value) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (input2.data.length < check2.value) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.too_small,
             minimum: check2.value,
@@ -13941,8 +13937,8 @@ var ZodString = class _ZodString2 extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "max") {
-        if (input.data.length > check2.value) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (input2.data.length > check2.value) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.too_big,
             maximum: check2.value,
@@ -13954,10 +13950,10 @@ var ZodString = class _ZodString2 extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "length") {
-        const tooBig = input.data.length > check2.value;
-        const tooSmall = input.data.length < check2.value;
+        const tooBig = input2.data.length > check2.value;
+        const tooSmall = input2.data.length < check2.value;
         if (tooBig || tooSmall) {
-          ctx = this._getOrReturnCtx(input, ctx);
+          ctx = this._getOrReturnCtx(input2, ctx);
           if (tooBig) {
             addIssueToContext(ctx, {
               code: ZodIssueCode.too_big,
@@ -13980,8 +13976,8 @@ var ZodString = class _ZodString2 extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "email") {
-        if (!emailRegex.test(input.data)) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (!emailRegex.test(input2.data)) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             validation: "email",
             code: ZodIssueCode.invalid_string,
@@ -13993,8 +13989,8 @@ var ZodString = class _ZodString2 extends ZodType {
         if (!emojiRegex) {
           emojiRegex = new RegExp(_emojiRegex, "u");
         }
-        if (!emojiRegex.test(input.data)) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (!emojiRegex.test(input2.data)) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             validation: "emoji",
             code: ZodIssueCode.invalid_string,
@@ -14003,8 +13999,8 @@ var ZodString = class _ZodString2 extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "uuid") {
-        if (!uuidRegex.test(input.data)) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (!uuidRegex.test(input2.data)) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             validation: "uuid",
             code: ZodIssueCode.invalid_string,
@@ -14013,8 +14009,8 @@ var ZodString = class _ZodString2 extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "nanoid") {
-        if (!nanoidRegex.test(input.data)) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (!nanoidRegex.test(input2.data)) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             validation: "nanoid",
             code: ZodIssueCode.invalid_string,
@@ -14023,8 +14019,8 @@ var ZodString = class _ZodString2 extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "cuid") {
-        if (!cuidRegex.test(input.data)) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (!cuidRegex.test(input2.data)) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             validation: "cuid",
             code: ZodIssueCode.invalid_string,
@@ -14033,8 +14029,8 @@ var ZodString = class _ZodString2 extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "cuid2") {
-        if (!cuid2Regex.test(input.data)) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (!cuid2Regex.test(input2.data)) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             validation: "cuid2",
             code: ZodIssueCode.invalid_string,
@@ -14043,8 +14039,8 @@ var ZodString = class _ZodString2 extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "ulid") {
-        if (!ulidRegex.test(input.data)) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (!ulidRegex.test(input2.data)) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             validation: "ulid",
             code: ZodIssueCode.invalid_string,
@@ -14054,9 +14050,9 @@ var ZodString = class _ZodString2 extends ZodType {
         }
       } else if (check2.kind === "url") {
         try {
-          new URL(input.data);
+          new URL(input2.data);
         } catch {
-          ctx = this._getOrReturnCtx(input, ctx);
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             validation: "url",
             code: ZodIssueCode.invalid_string,
@@ -14066,9 +14062,9 @@ var ZodString = class _ZodString2 extends ZodType {
         }
       } else if (check2.kind === "regex") {
         check2.regex.lastIndex = 0;
-        const testResult = check2.regex.test(input.data);
+        const testResult = check2.regex.test(input2.data);
         if (!testResult) {
-          ctx = this._getOrReturnCtx(input, ctx);
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             validation: "regex",
             code: ZodIssueCode.invalid_string,
@@ -14077,10 +14073,10 @@ var ZodString = class _ZodString2 extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "trim") {
-        input.data = input.data.trim();
+        input2.data = input2.data.trim();
       } else if (check2.kind === "includes") {
-        if (!input.data.includes(check2.value, check2.position)) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (!input2.data.includes(check2.value, check2.position)) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.invalid_string,
             validation: { includes: check2.value, position: check2.position },
@@ -14089,12 +14085,12 @@ var ZodString = class _ZodString2 extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "toLowerCase") {
-        input.data = input.data.toLowerCase();
+        input2.data = input2.data.toLowerCase();
       } else if (check2.kind === "toUpperCase") {
-        input.data = input.data.toUpperCase();
+        input2.data = input2.data.toUpperCase();
       } else if (check2.kind === "startsWith") {
-        if (!input.data.startsWith(check2.value)) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (!input2.data.startsWith(check2.value)) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.invalid_string,
             validation: { startsWith: check2.value },
@@ -14103,8 +14099,8 @@ var ZodString = class _ZodString2 extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "endsWith") {
-        if (!input.data.endsWith(check2.value)) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (!input2.data.endsWith(check2.value)) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.invalid_string,
             validation: { endsWith: check2.value },
@@ -14114,8 +14110,8 @@ var ZodString = class _ZodString2 extends ZodType {
         }
       } else if (check2.kind === "datetime") {
         const regex = datetimeRegex(check2);
-        if (!regex.test(input.data)) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (!regex.test(input2.data)) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.invalid_string,
             validation: "datetime",
@@ -14125,8 +14121,8 @@ var ZodString = class _ZodString2 extends ZodType {
         }
       } else if (check2.kind === "date") {
         const regex = dateRegex;
-        if (!regex.test(input.data)) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (!regex.test(input2.data)) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.invalid_string,
             validation: "date",
@@ -14136,8 +14132,8 @@ var ZodString = class _ZodString2 extends ZodType {
         }
       } else if (check2.kind === "time") {
         const regex = timeRegex(check2);
-        if (!regex.test(input.data)) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (!regex.test(input2.data)) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.invalid_string,
             validation: "time",
@@ -14146,8 +14142,8 @@ var ZodString = class _ZodString2 extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "duration") {
-        if (!durationRegex.test(input.data)) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (!durationRegex.test(input2.data)) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             validation: "duration",
             code: ZodIssueCode.invalid_string,
@@ -14156,8 +14152,8 @@ var ZodString = class _ZodString2 extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "ip") {
-        if (!isValidIP(input.data, check2.version)) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (!isValidIP(input2.data, check2.version)) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             validation: "ip",
             code: ZodIssueCode.invalid_string,
@@ -14166,8 +14162,8 @@ var ZodString = class _ZodString2 extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "jwt") {
-        if (!isValidJWT(input.data, check2.alg)) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (!isValidJWT(input2.data, check2.alg)) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             validation: "jwt",
             code: ZodIssueCode.invalid_string,
@@ -14176,8 +14172,8 @@ var ZodString = class _ZodString2 extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "cidr") {
-        if (!isValidCidr(input.data, check2.version)) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (!isValidCidr(input2.data, check2.version)) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             validation: "cidr",
             code: ZodIssueCode.invalid_string,
@@ -14186,8 +14182,8 @@ var ZodString = class _ZodString2 extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "base64") {
-        if (!base64Regex.test(input.data)) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (!base64Regex.test(input2.data)) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             validation: "base64",
             code: ZodIssueCode.invalid_string,
@@ -14196,8 +14192,8 @@ var ZodString = class _ZodString2 extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "base64url") {
-        if (!base64urlRegex.test(input.data)) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (!base64urlRegex.test(input2.data)) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             validation: "base64url",
             code: ZodIssueCode.invalid_string,
@@ -14209,7 +14205,7 @@ var ZodString = class _ZodString2 extends ZodType {
         util.assertNever(check2);
       }
     }
-    return { status: status.value, value: input.data };
+    return { status: status.value, value: input2.data };
   }
   _regex(regex, validation, message) {
     return this.refinement((data) => regex.test(data), {
@@ -14470,13 +14466,13 @@ var ZodNumber = class _ZodNumber extends ZodType {
     this.max = this.lte;
     this.step = this.multipleOf;
   }
-  _parse(input) {
+  _parse(input2) {
     if (this._def.coerce) {
-      input.data = Number(input.data);
+      input2.data = Number(input2.data);
     }
-    const parsedType2 = this._getType(input);
+    const parsedType2 = this._getType(input2);
     if (parsedType2 !== ZodParsedType.number) {
-      const ctx2 = this._getOrReturnCtx(input);
+      const ctx2 = this._getOrReturnCtx(input2);
       addIssueToContext(ctx2, {
         code: ZodIssueCode.invalid_type,
         expected: ZodParsedType.number,
@@ -14488,8 +14484,8 @@ var ZodNumber = class _ZodNumber extends ZodType {
     const status = new ParseStatus();
     for (const check2 of this._def.checks) {
       if (check2.kind === "int") {
-        if (!util.isInteger(input.data)) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (!util.isInteger(input2.data)) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.invalid_type,
             expected: "integer",
@@ -14499,9 +14495,9 @@ var ZodNumber = class _ZodNumber extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "min") {
-        const tooSmall = check2.inclusive ? input.data < check2.value : input.data <= check2.value;
+        const tooSmall = check2.inclusive ? input2.data < check2.value : input2.data <= check2.value;
         if (tooSmall) {
-          ctx = this._getOrReturnCtx(input, ctx);
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.too_small,
             minimum: check2.value,
@@ -14513,9 +14509,9 @@ var ZodNumber = class _ZodNumber extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "max") {
-        const tooBig = check2.inclusive ? input.data > check2.value : input.data >= check2.value;
+        const tooBig = check2.inclusive ? input2.data > check2.value : input2.data >= check2.value;
         if (tooBig) {
-          ctx = this._getOrReturnCtx(input, ctx);
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.too_big,
             maximum: check2.value,
@@ -14527,8 +14523,8 @@ var ZodNumber = class _ZodNumber extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "multipleOf") {
-        if (floatSafeRemainder(input.data, check2.value) !== 0) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (floatSafeRemainder(input2.data, check2.value) !== 0) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.not_multiple_of,
             multipleOf: check2.value,
@@ -14537,8 +14533,8 @@ var ZodNumber = class _ZodNumber extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "finite") {
-        if (!Number.isFinite(input.data)) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (!Number.isFinite(input2.data)) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.not_finite,
             message: check2.message
@@ -14549,7 +14545,7 @@ var ZodNumber = class _ZodNumber extends ZodType {
         util.assertNever(check2);
       }
     }
-    return { status: status.value, value: input.data };
+    return { status: status.value, value: input2.data };
   }
   gte(value, message) {
     return this.setLimit("min", value, true, errorUtil.toString(message));
@@ -14701,25 +14697,25 @@ var ZodBigInt = class _ZodBigInt extends ZodType {
     this.min = this.gte;
     this.max = this.lte;
   }
-  _parse(input) {
+  _parse(input2) {
     if (this._def.coerce) {
       try {
-        input.data = BigInt(input.data);
+        input2.data = BigInt(input2.data);
       } catch {
-        return this._getInvalidInput(input);
+        return this._getInvalidInput(input2);
       }
     }
-    const parsedType2 = this._getType(input);
+    const parsedType2 = this._getType(input2);
     if (parsedType2 !== ZodParsedType.bigint) {
-      return this._getInvalidInput(input);
+      return this._getInvalidInput(input2);
     }
     let ctx = void 0;
     const status = new ParseStatus();
     for (const check2 of this._def.checks) {
       if (check2.kind === "min") {
-        const tooSmall = check2.inclusive ? input.data < check2.value : input.data <= check2.value;
+        const tooSmall = check2.inclusive ? input2.data < check2.value : input2.data <= check2.value;
         if (tooSmall) {
-          ctx = this._getOrReturnCtx(input, ctx);
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.too_small,
             type: "bigint",
@@ -14730,9 +14726,9 @@ var ZodBigInt = class _ZodBigInt extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "max") {
-        const tooBig = check2.inclusive ? input.data > check2.value : input.data >= check2.value;
+        const tooBig = check2.inclusive ? input2.data > check2.value : input2.data >= check2.value;
         if (tooBig) {
-          ctx = this._getOrReturnCtx(input, ctx);
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.too_big,
             type: "bigint",
@@ -14743,8 +14739,8 @@ var ZodBigInt = class _ZodBigInt extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "multipleOf") {
-        if (input.data % check2.value !== BigInt(0)) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (input2.data % check2.value !== BigInt(0)) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.not_multiple_of,
             multipleOf: check2.value,
@@ -14756,10 +14752,10 @@ var ZodBigInt = class _ZodBigInt extends ZodType {
         util.assertNever(check2);
       }
     }
-    return { status: status.value, value: input.data };
+    return { status: status.value, value: input2.data };
   }
-  _getInvalidInput(input) {
-    const ctx = this._getOrReturnCtx(input);
+  _getInvalidInput(input2) {
+    const ctx = this._getOrReturnCtx(input2);
     addIssueToContext(ctx, {
       code: ZodIssueCode.invalid_type,
       expected: ZodParsedType.bigint,
@@ -14868,13 +14864,13 @@ ZodBigInt.create = (params) => {
   });
 };
 var ZodBoolean = class extends ZodType {
-  _parse(input) {
+  _parse(input2) {
     if (this._def.coerce) {
-      input.data = Boolean(input.data);
+      input2.data = Boolean(input2.data);
     }
-    const parsedType2 = this._getType(input);
+    const parsedType2 = this._getType(input2);
     if (parsedType2 !== ZodParsedType.boolean) {
-      const ctx = this._getOrReturnCtx(input);
+      const ctx = this._getOrReturnCtx(input2);
       addIssueToContext(ctx, {
         code: ZodIssueCode.invalid_type,
         expected: ZodParsedType.boolean,
@@ -14882,7 +14878,7 @@ var ZodBoolean = class extends ZodType {
       });
       return INVALID;
     }
-    return OK(input.data);
+    return OK(input2.data);
   }
 };
 ZodBoolean.create = (params) => {
@@ -14893,13 +14889,13 @@ ZodBoolean.create = (params) => {
   });
 };
 var ZodDate = class _ZodDate extends ZodType {
-  _parse(input) {
+  _parse(input2) {
     if (this._def.coerce) {
-      input.data = new Date(input.data);
+      input2.data = new Date(input2.data);
     }
-    const parsedType2 = this._getType(input);
+    const parsedType2 = this._getType(input2);
     if (parsedType2 !== ZodParsedType.date) {
-      const ctx2 = this._getOrReturnCtx(input);
+      const ctx2 = this._getOrReturnCtx(input2);
       addIssueToContext(ctx2, {
         code: ZodIssueCode.invalid_type,
         expected: ZodParsedType.date,
@@ -14907,8 +14903,8 @@ var ZodDate = class _ZodDate extends ZodType {
       });
       return INVALID;
     }
-    if (Number.isNaN(input.data.getTime())) {
-      const ctx2 = this._getOrReturnCtx(input);
+    if (Number.isNaN(input2.data.getTime())) {
+      const ctx2 = this._getOrReturnCtx(input2);
       addIssueToContext(ctx2, {
         code: ZodIssueCode.invalid_date
       });
@@ -14918,8 +14914,8 @@ var ZodDate = class _ZodDate extends ZodType {
     let ctx = void 0;
     for (const check2 of this._def.checks) {
       if (check2.kind === "min") {
-        if (input.data.getTime() < check2.value) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (input2.data.getTime() < check2.value) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.too_small,
             message: check2.message,
@@ -14931,8 +14927,8 @@ var ZodDate = class _ZodDate extends ZodType {
           status.dirty();
         }
       } else if (check2.kind === "max") {
-        if (input.data.getTime() > check2.value) {
-          ctx = this._getOrReturnCtx(input, ctx);
+        if (input2.data.getTime() > check2.value) {
+          ctx = this._getOrReturnCtx(input2, ctx);
           addIssueToContext(ctx, {
             code: ZodIssueCode.too_big,
             message: check2.message,
@@ -14949,7 +14945,7 @@ var ZodDate = class _ZodDate extends ZodType {
     }
     return {
       status: status.value,
-      value: new Date(input.data.getTime())
+      value: new Date(input2.data.getTime())
     };
   }
   _addCheck(check2) {
@@ -15002,10 +14998,10 @@ ZodDate.create = (params) => {
   });
 };
 var ZodSymbol = class extends ZodType {
-  _parse(input) {
-    const parsedType2 = this._getType(input);
+  _parse(input2) {
+    const parsedType2 = this._getType(input2);
     if (parsedType2 !== ZodParsedType.symbol) {
-      const ctx = this._getOrReturnCtx(input);
+      const ctx = this._getOrReturnCtx(input2);
       addIssueToContext(ctx, {
         code: ZodIssueCode.invalid_type,
         expected: ZodParsedType.symbol,
@@ -15013,7 +15009,7 @@ var ZodSymbol = class extends ZodType {
       });
       return INVALID;
     }
-    return OK(input.data);
+    return OK(input2.data);
   }
 };
 ZodSymbol.create = (params) => {
@@ -15023,10 +15019,10 @@ ZodSymbol.create = (params) => {
   });
 };
 var ZodUndefined = class extends ZodType {
-  _parse(input) {
-    const parsedType2 = this._getType(input);
+  _parse(input2) {
+    const parsedType2 = this._getType(input2);
     if (parsedType2 !== ZodParsedType.undefined) {
-      const ctx = this._getOrReturnCtx(input);
+      const ctx = this._getOrReturnCtx(input2);
       addIssueToContext(ctx, {
         code: ZodIssueCode.invalid_type,
         expected: ZodParsedType.undefined,
@@ -15034,7 +15030,7 @@ var ZodUndefined = class extends ZodType {
       });
       return INVALID;
     }
-    return OK(input.data);
+    return OK(input2.data);
   }
 };
 ZodUndefined.create = (params) => {
@@ -15044,10 +15040,10 @@ ZodUndefined.create = (params) => {
   });
 };
 var ZodNull = class extends ZodType {
-  _parse(input) {
-    const parsedType2 = this._getType(input);
+  _parse(input2) {
+    const parsedType2 = this._getType(input2);
     if (parsedType2 !== ZodParsedType.null) {
-      const ctx = this._getOrReturnCtx(input);
+      const ctx = this._getOrReturnCtx(input2);
       addIssueToContext(ctx, {
         code: ZodIssueCode.invalid_type,
         expected: ZodParsedType.null,
@@ -15055,7 +15051,7 @@ var ZodNull = class extends ZodType {
       });
       return INVALID;
     }
-    return OK(input.data);
+    return OK(input2.data);
   }
 };
 ZodNull.create = (params) => {
@@ -15069,8 +15065,8 @@ var ZodAny = class extends ZodType {
     super(...arguments);
     this._any = true;
   }
-  _parse(input) {
-    return OK(input.data);
+  _parse(input2) {
+    return OK(input2.data);
   }
 };
 ZodAny.create = (params) => {
@@ -15084,8 +15080,8 @@ var ZodUnknown = class extends ZodType {
     super(...arguments);
     this._unknown = true;
   }
-  _parse(input) {
-    return OK(input.data);
+  _parse(input2) {
+    return OK(input2.data);
   }
 };
 ZodUnknown.create = (params) => {
@@ -15095,8 +15091,8 @@ ZodUnknown.create = (params) => {
   });
 };
 var ZodNever = class extends ZodType {
-  _parse(input) {
-    const ctx = this._getOrReturnCtx(input);
+  _parse(input2) {
+    const ctx = this._getOrReturnCtx(input2);
     addIssueToContext(ctx, {
       code: ZodIssueCode.invalid_type,
       expected: ZodParsedType.never,
@@ -15112,10 +15108,10 @@ ZodNever.create = (params) => {
   });
 };
 var ZodVoid = class extends ZodType {
-  _parse(input) {
-    const parsedType2 = this._getType(input);
+  _parse(input2) {
+    const parsedType2 = this._getType(input2);
     if (parsedType2 !== ZodParsedType.undefined) {
-      const ctx = this._getOrReturnCtx(input);
+      const ctx = this._getOrReturnCtx(input2);
       addIssueToContext(ctx, {
         code: ZodIssueCode.invalid_type,
         expected: ZodParsedType.void,
@@ -15123,7 +15119,7 @@ var ZodVoid = class extends ZodType {
       });
       return INVALID;
     }
-    return OK(input.data);
+    return OK(input2.data);
   }
 };
 ZodVoid.create = (params) => {
@@ -15133,8 +15129,8 @@ ZodVoid.create = (params) => {
   });
 };
 var ZodArray = class _ZodArray extends ZodType {
-  _parse(input) {
-    const { ctx, status } = this._processInputParams(input);
+  _parse(input2) {
+    const { ctx, status } = this._processInputParams(input2);
     const def = this._def;
     if (ctx.parsedType !== ZodParsedType.array) {
       addIssueToContext(ctx, {
@@ -15274,10 +15270,10 @@ var ZodObject = class _ZodObject extends ZodType {
     this._cached = { shape, keys };
     return this._cached;
   }
-  _parse(input) {
-    const parsedType2 = this._getType(input);
+  _parse(input2) {
+    const parsedType2 = this._getType(input2);
     if (parsedType2 !== ZodParsedType.object) {
-      const ctx2 = this._getOrReturnCtx(input);
+      const ctx2 = this._getOrReturnCtx(input2);
       addIssueToContext(ctx2, {
         code: ZodIssueCode.invalid_type,
         expected: ZodParsedType.object,
@@ -15285,7 +15281,7 @@ var ZodObject = class _ZodObject extends ZodType {
       });
       return INVALID;
     }
-    const { status, ctx } = this._processInputParams(input);
+    const { status, ctx } = this._processInputParams(input2);
     const { shape, keys: shapeKeys } = this._getCached();
     const extraKeys = [];
     if (!(this._def.catchall instanceof ZodNever && this._def.unknownKeys === "strip")) {
@@ -15599,8 +15595,8 @@ ZodObject.lazycreate = (shape, params) => {
   });
 };
 var ZodUnion = class extends ZodType {
-  _parse(input) {
-    const { ctx } = this._processInputParams(input);
+  _parse(input2) {
+    const { ctx } = this._processInputParams(input2);
     const options = this._def.options;
     function handleResults(results) {
       for (const result of results) {
@@ -15721,8 +15717,8 @@ var getDiscriminator = (type) => {
   }
 };
 var ZodDiscriminatedUnion = class _ZodDiscriminatedUnion extends ZodType {
-  _parse(input) {
-    const { ctx } = this._processInputParams(input);
+  _parse(input2) {
+    const { ctx } = this._processInputParams(input2);
     if (ctx.parsedType !== ZodParsedType.object) {
       addIssueToContext(ctx, {
         code: ZodIssueCode.invalid_type,
@@ -15835,8 +15831,8 @@ function mergeValues(a, b) {
   }
 }
 var ZodIntersection = class extends ZodType {
-  _parse(input) {
-    const { status, ctx } = this._processInputParams(input);
+  _parse(input2) {
+    const { status, ctx } = this._processInputParams(input2);
     const handleParsed = (parsedLeft, parsedRight) => {
       if (isAborted(parsedLeft) || isAborted(parsedRight)) {
         return INVALID;
@@ -15888,8 +15884,8 @@ ZodIntersection.create = (left, right, params) => {
   });
 };
 var ZodTuple = class _ZodTuple extends ZodType {
-  _parse(input) {
-    const { status, ctx } = this._processInputParams(input);
+  _parse(input2) {
+    const { status, ctx } = this._processInputParams(input2);
     if (ctx.parsedType !== ZodParsedType.array) {
       addIssueToContext(ctx, {
         code: ZodIssueCode.invalid_type,
@@ -15961,8 +15957,8 @@ var ZodRecord = class _ZodRecord extends ZodType {
   get valueSchema() {
     return this._def.valueType;
   }
-  _parse(input) {
-    const { status, ctx } = this._processInputParams(input);
+  _parse(input2) {
+    const { status, ctx } = this._processInputParams(input2);
     if (ctx.parsedType !== ZodParsedType.object) {
       addIssueToContext(ctx, {
         code: ZodIssueCode.invalid_type,
@@ -16014,8 +16010,8 @@ var ZodMap = class extends ZodType {
   get valueSchema() {
     return this._def.valueType;
   }
-  _parse(input) {
-    const { status, ctx } = this._processInputParams(input);
+  _parse(input2) {
+    const { status, ctx } = this._processInputParams(input2);
     if (ctx.parsedType !== ZodParsedType.map) {
       addIssueToContext(ctx, {
         code: ZodIssueCode.invalid_type,
@@ -16074,8 +16070,8 @@ ZodMap.create = (keyType, valueType, params) => {
   });
 };
 var ZodSet = class _ZodSet extends ZodType {
-  _parse(input) {
-    const { status, ctx } = this._processInputParams(input);
+  _parse(input2) {
+    const { status, ctx } = this._processInputParams(input2);
     if (ctx.parsedType !== ZodParsedType.set) {
       addIssueToContext(ctx, {
         code: ZodIssueCode.invalid_type,
@@ -16163,8 +16159,8 @@ var ZodFunction = class _ZodFunction extends ZodType {
     super(...arguments);
     this.validate = this.implement;
   }
-  _parse(input) {
-    const { ctx } = this._processInputParams(input);
+  _parse(input2) {
+    const { ctx } = this._processInputParams(input2);
     if (ctx.parsedType !== ZodParsedType.function) {
       addIssueToContext(ctx, {
         code: ZodIssueCode.invalid_type,
@@ -16267,8 +16263,8 @@ var ZodLazy = class extends ZodType {
   get schema() {
     return this._def.getter();
   }
-  _parse(input) {
-    const { ctx } = this._processInputParams(input);
+  _parse(input2) {
+    const { ctx } = this._processInputParams(input2);
     const lazySchema = this._def.getter();
     return lazySchema._parse({ data: ctx.data, path: ctx.path, parent: ctx });
   }
@@ -16281,9 +16277,9 @@ ZodLazy.create = (getter, params) => {
   });
 };
 var ZodLiteral = class extends ZodType {
-  _parse(input) {
-    if (input.data !== this._def.value) {
-      const ctx = this._getOrReturnCtx(input);
+  _parse(input2) {
+    if (input2.data !== this._def.value) {
+      const ctx = this._getOrReturnCtx(input2);
       addIssueToContext(ctx, {
         received: ctx.data,
         code: ZodIssueCode.invalid_literal,
@@ -16291,7 +16287,7 @@ var ZodLiteral = class extends ZodType {
       });
       return INVALID;
     }
-    return { status: "valid", value: input.data };
+    return { status: "valid", value: input2.data };
   }
   get value() {
     return this._def.value;
@@ -16312,9 +16308,9 @@ function createZodEnum(values, params) {
   });
 }
 var ZodEnum = class _ZodEnum extends ZodType {
-  _parse(input) {
-    if (typeof input.data !== "string") {
-      const ctx = this._getOrReturnCtx(input);
+  _parse(input2) {
+    if (typeof input2.data !== "string") {
+      const ctx = this._getOrReturnCtx(input2);
       const expectedValues = this._def.values;
       addIssueToContext(ctx, {
         expected: util.joinValues(expectedValues),
@@ -16326,8 +16322,8 @@ var ZodEnum = class _ZodEnum extends ZodType {
     if (!this._cache) {
       this._cache = new Set(this._def.values);
     }
-    if (!this._cache.has(input.data)) {
-      const ctx = this._getOrReturnCtx(input);
+    if (!this._cache.has(input2.data)) {
+      const ctx = this._getOrReturnCtx(input2);
       const expectedValues = this._def.values;
       addIssueToContext(ctx, {
         received: ctx.data,
@@ -16336,7 +16332,7 @@ var ZodEnum = class _ZodEnum extends ZodType {
       });
       return INVALID;
     }
-    return OK(input.data);
+    return OK(input2.data);
   }
   get options() {
     return this._def.values;
@@ -16377,9 +16373,9 @@ var ZodEnum = class _ZodEnum extends ZodType {
 };
 ZodEnum.create = createZodEnum;
 var ZodNativeEnum = class extends ZodType {
-  _parse(input) {
+  _parse(input2) {
     const nativeEnumValues = util.getValidEnumValues(this._def.values);
-    const ctx = this._getOrReturnCtx(input);
+    const ctx = this._getOrReturnCtx(input2);
     if (ctx.parsedType !== ZodParsedType.string && ctx.parsedType !== ZodParsedType.number) {
       const expectedValues = util.objectValues(nativeEnumValues);
       addIssueToContext(ctx, {
@@ -16392,7 +16388,7 @@ var ZodNativeEnum = class extends ZodType {
     if (!this._cache) {
       this._cache = new Set(util.getValidEnumValues(this._def.values));
     }
-    if (!this._cache.has(input.data)) {
+    if (!this._cache.has(input2.data)) {
       const expectedValues = util.objectValues(nativeEnumValues);
       addIssueToContext(ctx, {
         received: ctx.data,
@@ -16401,7 +16397,7 @@ var ZodNativeEnum = class extends ZodType {
       });
       return INVALID;
     }
-    return OK(input.data);
+    return OK(input2.data);
   }
   get enum() {
     return this._def.values;
@@ -16418,8 +16414,8 @@ var ZodPromise = class extends ZodType {
   unwrap() {
     return this._def.type;
   }
-  _parse(input) {
-    const { ctx } = this._processInputParams(input);
+  _parse(input2) {
+    const { ctx } = this._processInputParams(input2);
     if (ctx.parsedType !== ZodParsedType.promise && ctx.common.async === false) {
       addIssueToContext(ctx, {
         code: ZodIssueCode.invalid_type,
@@ -16451,8 +16447,8 @@ var ZodEffects = class extends ZodType {
   sourceType() {
     return this._def.schema._def.typeName === ZodFirstPartyTypeKind.ZodEffects ? this._def.schema.sourceType() : this._def.schema;
   }
-  _parse(input) {
-    const { status, ctx } = this._processInputParams(input);
+  _parse(input2) {
+    const { status, ctx } = this._processInputParams(input2);
     const effect = this._def.effect || null;
     const checkCtx = {
       addIssue: (arg) => {
@@ -16584,12 +16580,12 @@ ZodEffects.createWithPreprocess = (preprocess2, schema, params) => {
   });
 };
 var ZodOptional = class extends ZodType {
-  _parse(input) {
-    const parsedType2 = this._getType(input);
+  _parse(input2) {
+    const parsedType2 = this._getType(input2);
     if (parsedType2 === ZodParsedType.undefined) {
       return OK(void 0);
     }
-    return this._def.innerType._parse(input);
+    return this._def.innerType._parse(input2);
   }
   unwrap() {
     return this._def.innerType;
@@ -16603,12 +16599,12 @@ ZodOptional.create = (type, params) => {
   });
 };
 var ZodNullable = class extends ZodType {
-  _parse(input) {
-    const parsedType2 = this._getType(input);
+  _parse(input2) {
+    const parsedType2 = this._getType(input2);
     if (parsedType2 === ZodParsedType.null) {
       return OK(null);
     }
-    return this._def.innerType._parse(input);
+    return this._def.innerType._parse(input2);
   }
   unwrap() {
     return this._def.innerType;
@@ -16622,8 +16618,8 @@ ZodNullable.create = (type, params) => {
   });
 };
 var ZodDefault = class extends ZodType {
-  _parse(input) {
-    const { ctx } = this._processInputParams(input);
+  _parse(input2) {
+    const { ctx } = this._processInputParams(input2);
     let data = ctx.data;
     if (ctx.parsedType === ZodParsedType.undefined) {
       data = this._def.defaultValue();
@@ -16647,8 +16643,8 @@ ZodDefault.create = (type, params) => {
   });
 };
 var ZodCatch = class extends ZodType {
-  _parse(input) {
-    const { ctx } = this._processInputParams(input);
+  _parse(input2) {
+    const { ctx } = this._processInputParams(input2);
     const newCtx = {
       ...ctx,
       common: {
@@ -16700,10 +16696,10 @@ ZodCatch.create = (type, params) => {
   });
 };
 var ZodNaN = class extends ZodType {
-  _parse(input) {
-    const parsedType2 = this._getType(input);
+  _parse(input2) {
+    const parsedType2 = this._getType(input2);
     if (parsedType2 !== ZodParsedType.nan) {
-      const ctx = this._getOrReturnCtx(input);
+      const ctx = this._getOrReturnCtx(input2);
       addIssueToContext(ctx, {
         code: ZodIssueCode.invalid_type,
         expected: ZodParsedType.nan,
@@ -16711,7 +16707,7 @@ var ZodNaN = class extends ZodType {
       });
       return INVALID;
     }
-    return { status: "valid", value: input.data };
+    return { status: "valid", value: input2.data };
   }
 };
 ZodNaN.create = (params) => {
@@ -16722,8 +16718,8 @@ ZodNaN.create = (params) => {
 };
 var BRAND = Symbol("zod_brand");
 var ZodBranded = class extends ZodType {
-  _parse(input) {
-    const { ctx } = this._processInputParams(input);
+  _parse(input2) {
+    const { ctx } = this._processInputParams(input2);
     const data = ctx.data;
     return this._def.type._parse({
       data,
@@ -16736,8 +16732,8 @@ var ZodBranded = class extends ZodType {
   }
 };
 var ZodPipeline = class _ZodPipeline extends ZodType {
-  _parse(input) {
-    const { status, ctx } = this._processInputParams(input);
+  _parse(input2) {
+    const { status, ctx } = this._processInputParams(input2);
     if (ctx.common.async) {
       const handleAsync = async () => {
         const inResult = await this._def.in._parseAsync({
@@ -16791,8 +16787,8 @@ var ZodPipeline = class _ZodPipeline extends ZodType {
   }
 };
 var ZodReadonly = class extends ZodType {
-  _parse(input) {
-    const result = this._def.innerType._parse(input);
+  _parse(input2) {
+    const result = this._def.innerType._parse(input2);
     const freeze = (data) => {
       if (isValid(data)) {
         data.value = Object.freeze(data.value);
@@ -17070,8 +17066,8 @@ function cached(getter) {
     }
   };
 }
-function nullish(input) {
-  return input === null || input === void 0;
+function nullish(input2) {
+  return input2 === null || input2 === void 0;
 }
 function cleanRegex(source) {
   const start = source.startsWith("^") ? 1 : 0;
@@ -17138,10 +17134,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path9) {
-  if (!path9)
+function getElementAtPath(obj, path10) {
+  if (!path10)
     return obj;
-  return path9.reduce((acc, key) => acc == null ? void 0 : acc[key], obj);
+  return path10.reduce((acc, key) => acc == null ? void 0 : acc[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -17165,8 +17161,8 @@ function randomString(length = 10) {
 function esc(str) {
   return JSON.stringify(str);
 }
-function slugify(input) {
-  return input.toLowerCase().trim().replace(/[^\w\s-]/g, "").replace(/[\s_-]+/g, "-").replace(/^-+|-+$/g, "");
+function slugify(input2) {
+  return input2.toLowerCase().trim().replace(/[^\w\s-]/g, "").replace(/[\s_-]+/g, "-").replace(/^-+|-+$/g, "");
 }
 var captureStackTrace = "captureStackTrace" in Error ? Error.captureStackTrace : (..._args) => {
 };
@@ -17526,11 +17522,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path9, issues) {
+function prefixIssues(path10, issues) {
   return issues.map((iss) => {
     var _a2;
     (_a2 = iss).path ?? (_a2.path = []);
-    iss.path.unshift(path9);
+    iss.path.unshift(path10);
     return iss;
   });
 }
@@ -17551,19 +17547,19 @@ function finalizeIssue(iss, ctx, config2) {
   }
   return full;
 }
-function getSizableOrigin(input) {
-  if (input instanceof Set)
+function getSizableOrigin(input2) {
+  if (input2 instanceof Set)
     return "set";
-  if (input instanceof Map)
+  if (input2 instanceof Map)
     return "map";
-  if (input instanceof File)
+  if (input2 instanceof File)
     return "file";
   return "unknown";
 }
-function getLengthableOrigin(input) {
-  if (Array.isArray(input))
+function getLengthableOrigin(input2) {
+  if (Array.isArray(input2))
     return "array";
-  if (typeof input === "string")
+  if (typeof input2 === "string")
     return "string";
   return "unknown";
 }
@@ -17589,12 +17585,12 @@ function parsedType(data) {
   return t;
 }
 function issue(...args) {
-  const [iss, input, inst] = args;
+  const [iss, input2, inst] = args;
   if (typeof iss === "string") {
     return {
       message: iss,
       code: "custom",
-      input,
+      input: input2,
       inst
     };
   }
@@ -18056,23 +18052,23 @@ var $ZodCheckNumberFormat = /* @__PURE__ */ $constructor("$ZodCheckNumberFormat"
       bag.pattern = integer;
   });
   inst._zod.check = (payload) => {
-    const input = payload.value;
+    const input2 = payload.value;
     if (isInt) {
-      if (!Number.isInteger(input)) {
+      if (!Number.isInteger(input2)) {
         payload.issues.push({
           expected: origin,
           format: def.format,
           code: "invalid_type",
           continue: false,
-          input,
+          input: input2,
           inst
         });
         return;
       }
-      if (!Number.isSafeInteger(input)) {
-        if (input > 0) {
+      if (!Number.isSafeInteger(input2)) {
+        if (input2 > 0) {
           payload.issues.push({
-            input,
+            input: input2,
             code: "too_big",
             maximum: Number.MAX_SAFE_INTEGER,
             note: "Integers must be within the safe integer range.",
@@ -18083,7 +18079,7 @@ var $ZodCheckNumberFormat = /* @__PURE__ */ $constructor("$ZodCheckNumberFormat"
           });
         } else {
           payload.issues.push({
-            input,
+            input: input2,
             code: "too_small",
             minimum: Number.MIN_SAFE_INTEGER,
             note: "Integers must be within the safe integer range.",
@@ -18096,10 +18092,10 @@ var $ZodCheckNumberFormat = /* @__PURE__ */ $constructor("$ZodCheckNumberFormat"
         return;
       }
     }
-    if (input < minimum) {
+    if (input2 < minimum) {
       payload.issues.push({
         origin: "number",
-        input,
+        input: input2,
         code: "too_small",
         minimum,
         inclusive: true,
@@ -18107,10 +18103,10 @@ var $ZodCheckNumberFormat = /* @__PURE__ */ $constructor("$ZodCheckNumberFormat"
         continue: !def.abort
       });
     }
-    if (input > maximum) {
+    if (input2 > maximum) {
       payload.issues.push({
         origin: "number",
-        input,
+        input: input2,
         code: "too_big",
         maximum,
         inclusive: true,
@@ -18130,11 +18126,11 @@ var $ZodCheckBigIntFormat = /* @__PURE__ */ $constructor("$ZodCheckBigIntFormat"
     bag.maximum = maximum;
   });
   inst._zod.check = (payload) => {
-    const input = payload.value;
-    if (input < minimum) {
+    const input2 = payload.value;
+    if (input2 < minimum) {
       payload.issues.push({
         origin: "bigint",
-        input,
+        input: input2,
         code: "too_small",
         minimum,
         inclusive: true,
@@ -18142,10 +18138,10 @@ var $ZodCheckBigIntFormat = /* @__PURE__ */ $constructor("$ZodCheckBigIntFormat"
         continue: !def.abort
       });
     }
-    if (input > maximum) {
+    if (input2 > maximum) {
       payload.issues.push({
         origin: "bigint",
-        input,
+        input: input2,
         code: "too_big",
         maximum,
         inclusive: true,
@@ -18168,16 +18164,16 @@ var $ZodCheckMaxSize = /* @__PURE__ */ $constructor("$ZodCheckMaxSize", (inst, d
       inst2._zod.bag.maximum = def.maximum;
   });
   inst._zod.check = (payload) => {
-    const input = payload.value;
-    const size = input.size;
+    const input2 = payload.value;
+    const size = input2.size;
     if (size <= def.maximum)
       return;
     payload.issues.push({
-      origin: getSizableOrigin(input),
+      origin: getSizableOrigin(input2),
       code: "too_big",
       maximum: def.maximum,
       inclusive: true,
-      input,
+      input: input2,
       inst,
       continue: !def.abort
     });
@@ -18196,16 +18192,16 @@ var $ZodCheckMinSize = /* @__PURE__ */ $constructor("$ZodCheckMinSize", (inst, d
       inst2._zod.bag.minimum = def.minimum;
   });
   inst._zod.check = (payload) => {
-    const input = payload.value;
-    const size = input.size;
+    const input2 = payload.value;
+    const size = input2.size;
     if (size >= def.minimum)
       return;
     payload.issues.push({
-      origin: getSizableOrigin(input),
+      origin: getSizableOrigin(input2),
       code: "too_small",
       minimum: def.minimum,
       inclusive: true,
-      input,
+      input: input2,
       inst,
       continue: !def.abort
     });
@@ -18225,13 +18221,13 @@ var $ZodCheckSizeEquals = /* @__PURE__ */ $constructor("$ZodCheckSizeEquals", (i
     bag.size = def.size;
   });
   inst._zod.check = (payload) => {
-    const input = payload.value;
-    const size = input.size;
+    const input2 = payload.value;
+    const size = input2.size;
     if (size === def.size)
       return;
     const tooBig = size > def.size;
     payload.issues.push({
-      origin: getSizableOrigin(input),
+      origin: getSizableOrigin(input2),
       ...tooBig ? { code: "too_big", maximum: def.size } : { code: "too_small", minimum: def.size },
       inclusive: true,
       exact: true,
@@ -18254,17 +18250,17 @@ var $ZodCheckMaxLength = /* @__PURE__ */ $constructor("$ZodCheckMaxLength", (ins
       inst2._zod.bag.maximum = def.maximum;
   });
   inst._zod.check = (payload) => {
-    const input = payload.value;
-    const length = input.length;
+    const input2 = payload.value;
+    const length = input2.length;
     if (length <= def.maximum)
       return;
-    const origin = getLengthableOrigin(input);
+    const origin = getLengthableOrigin(input2);
     payload.issues.push({
       origin,
       code: "too_big",
       maximum: def.maximum,
       inclusive: true,
-      input,
+      input: input2,
       inst,
       continue: !def.abort
     });
@@ -18283,17 +18279,17 @@ var $ZodCheckMinLength = /* @__PURE__ */ $constructor("$ZodCheckMinLength", (ins
       inst2._zod.bag.minimum = def.minimum;
   });
   inst._zod.check = (payload) => {
-    const input = payload.value;
-    const length = input.length;
+    const input2 = payload.value;
+    const length = input2.length;
     if (length >= def.minimum)
       return;
-    const origin = getLengthableOrigin(input);
+    const origin = getLengthableOrigin(input2);
     payload.issues.push({
       origin,
       code: "too_small",
       minimum: def.minimum,
       inclusive: true,
-      input,
+      input: input2,
       inst,
       continue: !def.abort
     });
@@ -18313,11 +18309,11 @@ var $ZodCheckLengthEquals = /* @__PURE__ */ $constructor("$ZodCheckLengthEquals"
     bag.length = def.length;
   });
   inst._zod.check = (payload) => {
-    const input = payload.value;
-    const length = input.length;
+    const input2 = payload.value;
+    const length = input2.length;
     if (length === def.length)
       return;
-    const origin = getLengthableOrigin(input);
+    const origin = getLengthableOrigin(input2);
     const tooBig = length > def.length;
     payload.issues.push({
       origin,
@@ -18977,15 +18973,15 @@ var $ZodNumber = /* @__PURE__ */ $constructor("$ZodNumber", (inst, def) => {
         payload.value = Number(payload.value);
       } catch (_) {
       }
-    const input = payload.value;
-    if (typeof input === "number" && !Number.isNaN(input) && Number.isFinite(input)) {
+    const input2 = payload.value;
+    if (typeof input2 === "number" && !Number.isNaN(input2) && Number.isFinite(input2)) {
       return payload;
     }
-    const received = typeof input === "number" ? Number.isNaN(input) ? "NaN" : !Number.isFinite(input) ? "Infinity" : void 0 : void 0;
+    const received = typeof input2 === "number" ? Number.isNaN(input2) ? "NaN" : !Number.isFinite(input2) ? "Infinity" : void 0 : void 0;
     payload.issues.push({
       expected: "number",
       code: "invalid_type",
-      input,
+      input: input2,
       inst,
       ...received ? { received } : {}
     });
@@ -19005,13 +19001,13 @@ var $ZodBoolean = /* @__PURE__ */ $constructor("$ZodBoolean", (inst, def) => {
         payload.value = Boolean(payload.value);
       } catch (_) {
       }
-    const input = payload.value;
-    if (typeof input === "boolean")
+    const input2 = payload.value;
+    if (typeof input2 === "boolean")
       return payload;
     payload.issues.push({
       expected: "boolean",
       code: "invalid_type",
-      input,
+      input: input2,
       inst
     });
     return payload;
@@ -19044,13 +19040,13 @@ var $ZodBigIntFormat = /* @__PURE__ */ $constructor("$ZodBigIntFormat", (inst, d
 var $ZodSymbol = /* @__PURE__ */ $constructor("$ZodSymbol", (inst, def) => {
   $ZodType.init(inst, def);
   inst._zod.parse = (payload, _ctx) => {
-    const input = payload.value;
-    if (typeof input === "symbol")
+    const input2 = payload.value;
+    if (typeof input2 === "symbol")
       return payload;
     payload.issues.push({
       expected: "symbol",
       code: "invalid_type",
-      input,
+      input: input2,
       inst
     });
     return payload;
@@ -19063,13 +19059,13 @@ var $ZodUndefined = /* @__PURE__ */ $constructor("$ZodUndefined", (inst, def) =>
   inst._zod.optin = "optional";
   inst._zod.optout = "optional";
   inst._zod.parse = (payload, _ctx) => {
-    const input = payload.value;
-    if (typeof input === "undefined")
+    const input2 = payload.value;
+    if (typeof input2 === "undefined")
       return payload;
     payload.issues.push({
       expected: "undefined",
       code: "invalid_type",
-      input,
+      input: input2,
       inst
     });
     return payload;
@@ -19080,13 +19076,13 @@ var $ZodNull = /* @__PURE__ */ $constructor("$ZodNull", (inst, def) => {
   inst._zod.pattern = _null;
   inst._zod.values = /* @__PURE__ */ new Set([null]);
   inst._zod.parse = (payload, _ctx) => {
-    const input = payload.value;
-    if (input === null)
+    const input2 = payload.value;
+    if (input2 === null)
       return payload;
     payload.issues.push({
       expected: "null",
       code: "invalid_type",
-      input,
+      input: input2,
       inst
     });
     return payload;
@@ -19115,13 +19111,13 @@ var $ZodNever = /* @__PURE__ */ $constructor("$ZodNever", (inst, def) => {
 var $ZodVoid = /* @__PURE__ */ $constructor("$ZodVoid", (inst, def) => {
   $ZodType.init(inst, def);
   inst._zod.parse = (payload, _ctx) => {
-    const input = payload.value;
-    if (typeof input === "undefined")
+    const input2 = payload.value;
+    if (typeof input2 === "undefined")
       return payload;
     payload.issues.push({
       expected: "void",
       code: "invalid_type",
-      input,
+      input: input2,
       inst
     });
     return payload;
@@ -19136,15 +19132,15 @@ var $ZodDate = /* @__PURE__ */ $constructor("$ZodDate", (inst, def) => {
       } catch (_err) {
       }
     }
-    const input = payload.value;
-    const isDate = input instanceof Date;
-    const isValidDate = isDate && !Number.isNaN(input.getTime());
+    const input2 = payload.value;
+    const isDate = input2 instanceof Date;
+    const isValidDate = isDate && !Number.isNaN(input2.getTime());
     if (isValidDate)
       return payload;
     payload.issues.push({
       expected: "date",
       code: "invalid_type",
-      input,
+      input: input2,
       ...isDate ? { received: "Invalid Date" } : {},
       inst
     });
@@ -19160,20 +19156,20 @@ function handleArrayResult(result, final, index) {
 var $ZodArray = /* @__PURE__ */ $constructor("$ZodArray", (inst, def) => {
   $ZodType.init(inst, def);
   inst._zod.parse = (payload, ctx) => {
-    const input = payload.value;
-    if (!Array.isArray(input)) {
+    const input2 = payload.value;
+    if (!Array.isArray(input2)) {
       payload.issues.push({
         expected: "array",
         code: "invalid_type",
-        input,
+        input: input2,
         inst
       });
       return payload;
     }
-    payload.value = Array(input.length);
+    payload.value = Array(input2.length);
     const proms = [];
-    for (let i = 0; i < input.length; i++) {
-      const item = input[i];
+    for (let i = 0; i < input2.length; i++) {
+      const item = input2[i];
       const result = def.element._zod.run({
         value: item,
         issues: []
@@ -19190,15 +19186,15 @@ var $ZodArray = /* @__PURE__ */ $constructor("$ZodArray", (inst, def) => {
     return payload;
   };
 });
-function handlePropertyResult(result, final, key, input, isOptionalOut) {
+function handlePropertyResult(result, final, key, input2, isOptionalOut) {
   if (result.issues.length) {
-    if (isOptionalOut && !(key in input)) {
+    if (isOptionalOut && !(key in input2)) {
       return;
     }
     final.issues.push(...prefixIssues(key, result.issues));
   }
   if (result.value === void 0) {
-    if (key in input) {
+    if (key in input2) {
       final.value[key] = void 0;
     }
   } else {
@@ -19222,31 +19218,31 @@ function normalizeDef(def) {
     optionalKeys: new Set(okeys)
   };
 }
-function handleCatchall(proms, input, payload, ctx, def, inst) {
+function handleCatchall(proms, input2, payload, ctx, def, inst) {
   const unrecognized = [];
   const keySet = def.keySet;
   const _catchall = def.catchall._zod;
   const t = _catchall.def.type;
   const isOptionalOut = _catchall.optout === "optional";
-  for (const key in input) {
+  for (const key in input2) {
     if (keySet.has(key))
       continue;
     if (t === "never") {
       unrecognized.push(key);
       continue;
     }
-    const r = _catchall.run({ value: input[key], issues: [] }, ctx);
+    const r = _catchall.run({ value: input2[key], issues: [] }, ctx);
     if (r instanceof Promise) {
-      proms.push(r.then((r2) => handlePropertyResult(r2, payload, key, input, isOptionalOut)));
+      proms.push(r.then((r2) => handlePropertyResult(r2, payload, key, input2, isOptionalOut)));
     } else {
-      handlePropertyResult(r, payload, key, input, isOptionalOut);
+      handlePropertyResult(r, payload, key, input2, isOptionalOut);
     }
   }
   if (unrecognized.length) {
     payload.issues.push({
       code: "unrecognized_keys",
       keys: unrecognized,
-      input,
+      input: input2,
       inst
     });
   }
@@ -19290,12 +19286,12 @@ var $ZodObject = /* @__PURE__ */ $constructor("$ZodObject", (inst, def) => {
   let value;
   inst._zod.parse = (payload, ctx) => {
     value ?? (value = _normalized.value);
-    const input = payload.value;
-    if (!isObject2(input)) {
+    const input2 = payload.value;
+    if (!isObject2(input2)) {
       payload.issues.push({
         expected: "object",
         code: "invalid_type",
-        input,
+        input: input2,
         inst
       });
       return payload;
@@ -19306,17 +19302,17 @@ var $ZodObject = /* @__PURE__ */ $constructor("$ZodObject", (inst, def) => {
     for (const key of value.keys) {
       const el = shape[key];
       const isOptionalOut = el._zod.optout === "optional";
-      const r = el._zod.run({ value: input[key], issues: [] }, ctx);
+      const r = el._zod.run({ value: input2[key], issues: [] }, ctx);
       if (r instanceof Promise) {
-        proms.push(r.then((r2) => handlePropertyResult(r2, payload, key, input, isOptionalOut)));
+        proms.push(r.then((r2) => handlePropertyResult(r2, payload, key, input2, isOptionalOut)));
       } else {
-        handlePropertyResult(r, payload, key, input, isOptionalOut);
+        handlePropertyResult(r, payload, key, input2, isOptionalOut);
       }
     }
     if (!catchall) {
       return proms.length ? Promise.all(proms).then(() => payload) : payload;
     }
-    return handleCatchall(proms, input, payload, ctx, _normalized.value, inst);
+    return handleCatchall(proms, input2, payload, ctx, _normalized.value, inst);
   };
 });
 var $ZodObjectJIT = /* @__PURE__ */ $constructor("$ZodObjectJIT", (inst, def) => {
@@ -19398,12 +19394,12 @@ var $ZodObjectJIT = /* @__PURE__ */ $constructor("$ZodObjectJIT", (inst, def) =>
   let value;
   inst._zod.parse = (payload, ctx) => {
     value ?? (value = _normalized.value);
-    const input = payload.value;
-    if (!isObject2(input)) {
+    const input2 = payload.value;
+    if (!isObject2(input2)) {
       payload.issues.push({
         expected: "object",
         code: "invalid_type",
-        input,
+        input: input2,
         inst
       });
       return payload;
@@ -19414,7 +19410,7 @@ var $ZodObjectJIT = /* @__PURE__ */ $constructor("$ZodObjectJIT", (inst, def) =>
       payload = fastpass(payload, ctx);
       if (!catchall)
         return payload;
-      return handleCatchall([], input, payload, ctx, value, inst);
+      return handleCatchall([], input2, payload, ctx, value, inst);
     }
     return superParse(payload, ctx);
   };
@@ -19577,17 +19573,17 @@ var $ZodDiscriminatedUnion = /* @__PURE__ */ $constructor("$ZodDiscriminatedUnio
     return map2;
   });
   inst._zod.parse = (payload, ctx) => {
-    const input = payload.value;
-    if (!isObject(input)) {
+    const input2 = payload.value;
+    if (!isObject(input2)) {
       payload.issues.push({
         code: "invalid_type",
         expected: "object",
-        input,
+        input: input2,
         inst
       });
       return payload;
     }
-    const opt = disc.value.get(input == null ? void 0 : input[def.discriminator]);
+    const opt = disc.value.get(input2 == null ? void 0 : input2[def.discriminator]);
     if (opt) {
       return opt._zod.run(payload, ctx);
     }
@@ -19599,7 +19595,7 @@ var $ZodDiscriminatedUnion = /* @__PURE__ */ $constructor("$ZodDiscriminatedUnio
       errors: [],
       note: "No matching discriminator",
       discriminator: def.discriminator,
-      input,
+      input: input2,
       path: [def.discriminator],
       inst
     });
@@ -19609,9 +19605,9 @@ var $ZodDiscriminatedUnion = /* @__PURE__ */ $constructor("$ZodDiscriminatedUnio
 var $ZodIntersection = /* @__PURE__ */ $constructor("$ZodIntersection", (inst, def) => {
   $ZodType.init(inst, def);
   inst._zod.parse = (payload, ctx) => {
-    const input = payload.value;
-    const left = def.left._zod.run({ value: input, issues: [] }, ctx);
-    const right = def.right._zod.run({ value: input, issues: [] }, ctx);
+    const input2 = payload.value;
+    const left = def.left._zod.run({ value: input2, issues: [] }, ctx);
+    const right = def.right._zod.run({ value: input2, issues: [] }, ctx);
     const async = left instanceof Promise || right instanceof Promise;
     if (async) {
       return Promise.all([left, right]).then(([left2, right2]) => {
@@ -19708,10 +19704,10 @@ var $ZodTuple = /* @__PURE__ */ $constructor("$ZodTuple", (inst, def) => {
   $ZodType.init(inst, def);
   const items = def.items;
   inst._zod.parse = (payload, ctx) => {
-    const input = payload.value;
-    if (!Array.isArray(input)) {
+    const input2 = payload.value;
+    if (!Array.isArray(input2)) {
       payload.issues.push({
-        input,
+        input: input2,
         inst,
         expected: "tuple",
         code: "invalid_type"
@@ -19723,12 +19719,12 @@ var $ZodTuple = /* @__PURE__ */ $constructor("$ZodTuple", (inst, def) => {
     const reversedIndex = [...items].reverse().findIndex((item) => item._zod.optin !== "optional");
     const optStart = reversedIndex === -1 ? 0 : items.length - reversedIndex;
     if (!def.rest) {
-      const tooBig = input.length > items.length;
-      const tooSmall = input.length < optStart - 1;
+      const tooBig = input2.length > items.length;
+      const tooSmall = input2.length < optStart - 1;
       if (tooBig || tooSmall) {
         payload.issues.push({
           ...tooBig ? { code: "too_big", maximum: items.length, inclusive: true } : { code: "too_small", minimum: items.length },
-          input,
+          input: input2,
           inst,
           origin: "array"
         });
@@ -19738,12 +19734,12 @@ var $ZodTuple = /* @__PURE__ */ $constructor("$ZodTuple", (inst, def) => {
     let i = -1;
     for (const item of items) {
       i++;
-      if (i >= input.length) {
+      if (i >= input2.length) {
         if (i >= optStart)
           continue;
       }
       const result = item._zod.run({
-        value: input[i],
+        value: input2[i],
         issues: []
       }, ctx);
       if (result instanceof Promise) {
@@ -19753,7 +19749,7 @@ var $ZodTuple = /* @__PURE__ */ $constructor("$ZodTuple", (inst, def) => {
       }
     }
     if (def.rest) {
-      const rest = input.slice(items.length);
+      const rest = input2.slice(items.length);
       for (const el of rest) {
         i++;
         const result = def.rest._zod.run({
@@ -19781,12 +19777,12 @@ function handleTupleResult(result, final, index) {
 var $ZodRecord = /* @__PURE__ */ $constructor("$ZodRecord", (inst, def) => {
   $ZodType.init(inst, def);
   inst._zod.parse = (payload, ctx) => {
-    const input = payload.value;
-    if (!isPlainObject(input)) {
+    const input2 = payload.value;
+    if (!isPlainObject(input2)) {
       payload.issues.push({
         expected: "record",
         code: "invalid_type",
-        input,
+        input: input2,
         inst
       });
       return payload;
@@ -19799,7 +19795,7 @@ var $ZodRecord = /* @__PURE__ */ $constructor("$ZodRecord", (inst, def) => {
       for (const key of values) {
         if (typeof key === "string" || typeof key === "number" || typeof key === "symbol") {
           recordKeys.add(typeof key === "number" ? key.toString() : key);
-          const result = def.valueType._zod.run({ value: input[key], issues: [] }, ctx);
+          const result = def.valueType._zod.run({ value: input2[key], issues: [] }, ctx);
           if (result instanceof Promise) {
             proms.push(result.then((result2) => {
               if (result2.issues.length) {
@@ -19816,7 +19812,7 @@ var $ZodRecord = /* @__PURE__ */ $constructor("$ZodRecord", (inst, def) => {
         }
       }
       let unrecognized;
-      for (const key in input) {
+      for (const key in input2) {
         if (!recordKeys.has(key)) {
           unrecognized = unrecognized ?? [];
           unrecognized.push(key);
@@ -19825,14 +19821,14 @@ var $ZodRecord = /* @__PURE__ */ $constructor("$ZodRecord", (inst, def) => {
       if (unrecognized && unrecognized.length > 0) {
         payload.issues.push({
           code: "unrecognized_keys",
-          input,
+          input: input2,
           inst,
           keys: unrecognized
         });
       }
     } else {
       payload.value = {};
-      for (const key of Reflect.ownKeys(input)) {
+      for (const key of Reflect.ownKeys(input2)) {
         if (key === "__proto__")
           continue;
         let keyResult = def.keyType._zod.run({ value: key, issues: [] }, ctx);
@@ -19851,7 +19847,7 @@ var $ZodRecord = /* @__PURE__ */ $constructor("$ZodRecord", (inst, def) => {
         }
         if (keyResult.issues.length) {
           if (def.mode === "loose") {
-            payload.value[key] = input[key];
+            payload.value[key] = input2[key];
           } else {
             payload.issues.push({
               code: "invalid_key",
@@ -19864,7 +19860,7 @@ var $ZodRecord = /* @__PURE__ */ $constructor("$ZodRecord", (inst, def) => {
           }
           continue;
         }
-        const result = def.valueType._zod.run({ value: input[key], issues: [] }, ctx);
+        const result = def.valueType._zod.run({ value: input2[key], issues: [] }, ctx);
         if (result instanceof Promise) {
           proms.push(result.then((result2) => {
             if (result2.issues.length) {
@@ -19889,27 +19885,27 @@ var $ZodRecord = /* @__PURE__ */ $constructor("$ZodRecord", (inst, def) => {
 var $ZodMap = /* @__PURE__ */ $constructor("$ZodMap", (inst, def) => {
   $ZodType.init(inst, def);
   inst._zod.parse = (payload, ctx) => {
-    const input = payload.value;
-    if (!(input instanceof Map)) {
+    const input2 = payload.value;
+    if (!(input2 instanceof Map)) {
       payload.issues.push({
         expected: "map",
         code: "invalid_type",
-        input,
+        input: input2,
         inst
       });
       return payload;
     }
     const proms = [];
     payload.value = /* @__PURE__ */ new Map();
-    for (const [key, value] of input) {
+    for (const [key, value] of input2) {
       const keyResult = def.keyType._zod.run({ value: key, issues: [] }, ctx);
       const valueResult = def.valueType._zod.run({ value, issues: [] }, ctx);
       if (keyResult instanceof Promise || valueResult instanceof Promise) {
         proms.push(Promise.all([keyResult, valueResult]).then(([keyResult2, valueResult2]) => {
-          handleMapResult(keyResult2, valueResult2, payload, key, input, inst, ctx);
+          handleMapResult(keyResult2, valueResult2, payload, key, input2, inst, ctx);
         }));
       } else {
-        handleMapResult(keyResult, valueResult, payload, key, input, inst, ctx);
+        handleMapResult(keyResult, valueResult, payload, key, input2, inst, ctx);
       }
     }
     if (proms.length)
@@ -19917,7 +19913,7 @@ var $ZodMap = /* @__PURE__ */ $constructor("$ZodMap", (inst, def) => {
     return payload;
   };
 });
-function handleMapResult(keyResult, valueResult, final, key, input, inst, ctx) {
+function handleMapResult(keyResult, valueResult, final, key, input2, inst, ctx) {
   if (keyResult.issues.length) {
     if (propertyKeyTypes.has(typeof key)) {
       final.issues.push(...prefixIssues(key, keyResult.issues));
@@ -19925,7 +19921,7 @@ function handleMapResult(keyResult, valueResult, final, key, input, inst, ctx) {
       final.issues.push({
         code: "invalid_key",
         origin: "map",
-        input,
+        input: input2,
         inst,
         issues: keyResult.issues.map((iss) => finalizeIssue(iss, ctx, config()))
       });
@@ -19938,7 +19934,7 @@ function handleMapResult(keyResult, valueResult, final, key, input, inst, ctx) {
       final.issues.push({
         origin: "map",
         code: "invalid_element",
-        input,
+        input: input2,
         inst,
         key,
         issues: valueResult.issues.map((iss) => finalizeIssue(iss, ctx, config()))
@@ -19950,10 +19946,10 @@ function handleMapResult(keyResult, valueResult, final, key, input, inst, ctx) {
 var $ZodSet = /* @__PURE__ */ $constructor("$ZodSet", (inst, def) => {
   $ZodType.init(inst, def);
   inst._zod.parse = (payload, ctx) => {
-    const input = payload.value;
-    if (!(input instanceof Set)) {
+    const input2 = payload.value;
+    if (!(input2 instanceof Set)) {
       payload.issues.push({
-        input,
+        input: input2,
         inst,
         expected: "set",
         code: "invalid_type"
@@ -19962,7 +19958,7 @@ var $ZodSet = /* @__PURE__ */ $constructor("$ZodSet", (inst, def) => {
     }
     const proms = [];
     payload.value = /* @__PURE__ */ new Set();
-    for (const item of input) {
+    for (const item of input2) {
       const result = def.valueType._zod.run({ value: item, issues: [] }, ctx);
       if (result instanceof Promise) {
         proms.push(result.then((result2) => handleSetResult(result2, payload)));
@@ -19987,14 +19983,14 @@ var $ZodEnum = /* @__PURE__ */ $constructor("$ZodEnum", (inst, def) => {
   inst._zod.values = valuesSet;
   inst._zod.pattern = new RegExp(`^(${values.filter((k) => propertyKeyTypes.has(typeof k)).map((o) => typeof o === "string" ? escapeRegex(o) : o.toString()).join("|")})$`);
   inst._zod.parse = (payload, _ctx) => {
-    const input = payload.value;
-    if (valuesSet.has(input)) {
+    const input2 = payload.value;
+    if (valuesSet.has(input2)) {
       return payload;
     }
     payload.issues.push({
       code: "invalid_value",
       values,
-      input,
+      input: input2,
       inst
     });
     return payload;
@@ -20009,14 +20005,14 @@ var $ZodLiteral = /* @__PURE__ */ $constructor("$ZodLiteral", (inst, def) => {
   inst._zod.values = values;
   inst._zod.pattern = new RegExp(`^(${def.values.map((o) => typeof o === "string" ? escapeRegex(o) : o ? escapeRegex(o.toString()) : String(o)).join("|")})$`);
   inst._zod.parse = (payload, _ctx) => {
-    const input = payload.value;
-    if (values.has(input)) {
+    const input2 = payload.value;
+    if (values.has(input2)) {
       return payload;
     }
     payload.issues.push({
       code: "invalid_value",
       values: def.values,
-      input,
+      input: input2,
       inst
     });
     return payload;
@@ -20025,13 +20021,13 @@ var $ZodLiteral = /* @__PURE__ */ $constructor("$ZodLiteral", (inst, def) => {
 var $ZodFile = /* @__PURE__ */ $constructor("$ZodFile", (inst, def) => {
   $ZodType.init(inst, def);
   inst._zod.parse = (payload, _ctx) => {
-    const input = payload.value;
-    if (input instanceof File)
+    const input2 = payload.value;
+    if (input2 instanceof File)
       return payload;
     payload.issues.push({
       expected: "file",
       code: "invalid_type",
-      input,
+      input: input2,
       inst
     });
     return payload;
@@ -20045,9 +20041,9 @@ var $ZodTransform = /* @__PURE__ */ $constructor("$ZodTransform", (inst, def) =>
     }
     const _out = def.transform(payload.value, payload);
     if (ctx.async) {
-      const output = _out instanceof Promise ? _out : Promise.resolve(_out);
-      return output.then((output2) => {
-        payload.value = output2;
+      const output2 = _out instanceof Promise ? _out : Promise.resolve(_out);
+      return output2.then((output3) => {
+        payload.value = output3;
         return payload;
       });
     }
@@ -20058,8 +20054,8 @@ var $ZodTransform = /* @__PURE__ */ $constructor("$ZodTransform", (inst, def) =>
     return payload;
   };
 });
-function handleOptionalResult(result, input) {
-  if (result.issues.length && input === void 0) {
+function handleOptionalResult(result, input2) {
+  if (result.issues.length && input2 === void 0) {
     return { issues: [], value: void 0 };
   }
   return result;
@@ -20466,12 +20462,12 @@ var $ZodFunction = /* @__PURE__ */ $constructor("$ZodFunction", (inst, def) => {
       output: inst._def.output
     });
   };
-  inst.output = (output) => {
+  inst.output = (output2) => {
     const F = inst.constructor;
     return new F({
       type: "function",
       input: inst._def.input,
-      output
+      output: output2
     });
   };
   return inst;
@@ -20513,20 +20509,20 @@ var $ZodCustom = /* @__PURE__ */ $constructor("$ZodCustom", (inst, def) => {
     return payload;
   };
   inst._zod.check = (payload) => {
-    const input = payload.value;
-    const r = def.fn(input);
+    const input2 = payload.value;
+    const r = def.fn(input2);
     if (r instanceof Promise) {
-      return r.then((r2) => handleRefineResult(r2, payload, input, inst));
+      return r.then((r2) => handleRefineResult(r2, payload, input2, inst));
     }
-    handleRefineResult(r, payload, input, inst);
+    handleRefineResult(r, payload, input2, inst);
     return;
   };
 });
-function handleRefineResult(result, payload, input, inst) {
+function handleRefineResult(result, payload, input2, inst) {
   if (!result) {
     const _iss = {
       code: "custom",
-      input,
+      input: input2,
       inst,
       // incorporates params.error into issue reporting
       path: [...inst._zod.def.path ?? []],
@@ -21320,23 +21316,23 @@ function _overwrite(tx) {
 }
 // @__NO_SIDE_EFFECTS__
 function _normalize(form) {
-  return /* @__PURE__ */ _overwrite((input) => input.normalize(form));
+  return /* @__PURE__ */ _overwrite((input2) => input2.normalize(form));
 }
 // @__NO_SIDE_EFFECTS__
 function _trim() {
-  return /* @__PURE__ */ _overwrite((input) => input.trim());
+  return /* @__PURE__ */ _overwrite((input2) => input2.trim());
 }
 // @__NO_SIDE_EFFECTS__
 function _toLowerCase() {
-  return /* @__PURE__ */ _overwrite((input) => input.toLowerCase());
+  return /* @__PURE__ */ _overwrite((input2) => input2.toLowerCase());
 }
 // @__NO_SIDE_EFFECTS__
 function _toUpperCase() {
-  return /* @__PURE__ */ _overwrite((input) => input.toUpperCase());
+  return /* @__PURE__ */ _overwrite((input2) => input2.toUpperCase());
 }
 // @__NO_SIDE_EFFECTS__
 function _slugify() {
-  return /* @__PURE__ */ _overwrite((input) => slugify(input));
+  return /* @__PURE__ */ _overwrite((input2) => slugify(input2));
 }
 // @__NO_SIDE_EFFECTS__
 function _array(Class2, element, params) {
@@ -21454,8 +21450,8 @@ function _stringbool(Classes, _params) {
     type: "pipe",
     in: stringSchema,
     out: booleanSchema,
-    transform: ((input, payload) => {
-      let data = input;
+    transform: ((input2, payload) => {
+      let data = input2;
       if (params.case !== "sensitive")
         data = data.toLowerCase();
       if (truthySet.has(data)) {
@@ -21474,8 +21470,8 @@ function _stringbool(Classes, _params) {
         return {};
       }
     }),
-    reverseTransform: ((input, _payload) => {
-      if (input === true) {
+    reverseTransform: ((input2, _payload) => {
+      if (input2 === true) {
         return truthyArray[0] || "true";
       } else {
         return falsyArray[0] || "false";
@@ -23496,14 +23492,14 @@ var ZodTransform = /* @__PURE__ */ $constructor("ZodTransform", (inst, def) => {
         payload.issues.push(util_exports.issue(_issue));
       }
     };
-    const output = def.transform(payload.value, payload);
-    if (output instanceof Promise) {
-      return output.then((output2) => {
-        payload.value = output2;
+    const output2 = def.transform(payload.value, payload);
+    if (output2 instanceof Promise) {
+      return output2.then((output3) => {
+        payload.value = output3;
         return payload;
       });
     }
-    payload.value = output;
+    payload.value = output2;
     return payload;
   };
 });
@@ -26347,12 +26343,12 @@ var AjvJsonSchemaValidator = class {
    */
   getValidator(schema) {
     const ajvValidator = "$id" in schema && typeof schema.$id === "string" ? this._ajv.getSchema(schema.$id) ?? this._ajv.compile(schema) : this._ajv.compile(schema);
-    return (input) => {
-      const valid = ajvValidator(input);
+    return (input2) => {
+      const valid = ajvValidator(input2);
       if (valid) {
         return {
           valid: true,
-          data: input,
+          data: input2,
           errorMessage: void 0
         };
       } else {
@@ -28584,7 +28580,7 @@ async function requestMakerPat(options) {
       [
         "Maker PAT not found.",
         "Provide a PAT through the pat argument, MAKER_PAT/PAT environment variable,",
-        "or save it with maker_exchange_pat.",
+        "or save it interactively with `taptap-maker pat set`.",
         "Creating a new PAT still requires a legacy Maker JWT."
       ].join(" ")
     );
@@ -28933,6 +28929,7 @@ var MakerGitError = class extends Error {
     this.failure = failure;
   }
 };
+var MAKER_FIRST_CLONE_WAIT_MESSAGE = "First Maker clone/fetch can take 20+ seconds while the server prepares the repository. Please keep this running; transient 503/5xx errors are retried automatically.";
 function getConfiguredMakerApiBase() {
   return getMakerEndpoints().apiBase;
 }
@@ -29234,6 +29231,7 @@ async function pushMakerProject(options) {
   let committed = false;
   let commitHash;
   let message;
+  let transientRetries = 0;
   if (!statusBefore.trim() && !options.allowEmpty && unpushed.hasUnpushedCommits) {
     commitHash = (await readGit(["rev-parse", "--short", "HEAD"], cwd)).trim();
   } else if ((_d = options.files) == null ? void 0 : _d.length) {
@@ -29285,7 +29283,11 @@ async function pushMakerProject(options) {
       phase: "push",
       message: `Pushing Maker project to ${branch}`
     });
-    await pushGit(["push", "origin", `HEAD:${branch}`], cwd, options.onProgress);
+    transientRetries += await pushGitWithTransientRetry(
+      ["push", "origin", `HEAD:${branch}`],
+      cwd,
+      options.onProgress
+    );
   } catch (error2) {
     const failure = toMakerGitFailure(error2, "push");
     return {
@@ -29296,7 +29298,8 @@ async function pushMakerProject(options) {
       pushed: false,
       status: committed || unpushed.hasUnpushedCommits ? "failed_after_commit" : "clean",
       failure,
-      ahead: await readAheadState(cwd)
+      ahead: await readAheadState(cwd),
+      transientRetries
     };
   }
   (_i = options.onProgress) == null ? void 0 : _i.call(options, {
@@ -29311,7 +29314,8 @@ async function pushMakerProject(options) {
     commitHash,
     message,
     pushed: true,
-    status: "pushed"
+    status: "pushed",
+    transientRetries
   };
 }
 async function readMakerProjectLocalChanges(cwd) {
@@ -29420,36 +29424,42 @@ function toMakerGitFailure(error2, stage) {
     stderr: message
   });
 }
-function createGitFailure(input) {
+function createGitFailure(input2) {
   var _a2, _b;
-  const stderr = ((_a2 = input.stderr) == null ? void 0 : _a2.trim()) || "";
-  const stdout = ((_b = input.stdout) == null ? void 0 : _b.trim()) || "";
+  const stderr = redactGitSecrets(((_a2 = input2.stderr) == null ? void 0 : _a2.trim()) || "");
+  const stdout = redactGitSecrets(((_b = input2.stdout) == null ? void 0 : _b.trim()) || "");
   const text = `${stdout}
 ${stderr}`.trim();
   const classification = classifyGitFailure(text);
+  const retryDecision = getMakerGitRetryDecision(text);
   return {
-    stage: input.stage,
-    command: input.command,
-    exitCode: input.exitCode,
+    stage: input2.stage,
+    command: input2.command ? redactGitSecrets(input2.command) : void 0,
+    exitCode: input2.exitCode,
     stdout,
     stderr,
-    message: text || `${input.stage} failed`,
+    message: text || `${input2.stage} failed`,
     classification,
+    retryable: retryDecision.retry,
+    retryReason: retryDecision.reason,
     nextAction: nextActionForFailure(classification)
   };
 }
+function redactGitSecrets(value) {
+  return value.replace(/(https?:\/\/[^:\s/@]+:)[^@\s]+@/g, "$1***@");
+}
 function classifyGitFailure(message) {
-  if (/ENOENT|not found|cannot find|spawn git/i.test(message)) {
+  if (/ENOENT|cannot find|spawn git|git: command not found|not recognized as an internal or external command/i.test(
+    message
+  )) {
     return "git_missing";
   }
-  if (/authentication|authorization|401|403|forbidden|unauthorized|could not read username/i.test(
+  if (/authentication|authorization|401|403|forbidden|unauthorized|could not read username|repository not found/i.test(
     message
   )) {
     return "auth";
   }
-  if (/502|503|504|Bad Gateway|Service Unavailable|Gateway Timeout|connection reset|remote end hung up/i.test(
-    message
-  )) {
+  if (getMakerGitRetryDecision(message).retry) {
     return "remote_transient";
   }
   if (/non-fast-forward|fetch first|rejected|failed to push some refs/i.test(message)) {
@@ -29460,20 +29470,50 @@ function classifyGitFailure(message) {
   }
   return "unknown";
 }
+function getMakerGitRetryDecision(message) {
+  const text = message.trim();
+  if (!text) {
+    return { retry: false };
+  }
+  if (isNonRetryableGitFailure(text)) {
+    return { retry: false };
+  }
+  if (/(?:HTTP|error|status|code|response|returned)\D*(?:500|502|503|504)\b|Bad Gateway|Service Unavailable|Gateway Timeout|Internal Server Error/i.test(
+    text
+  )) {
+    return { retry: true, reason: "remote_http_5xx" };
+  }
+  if (/timed?\s*out|timeout|TLS handshake timeout|Failed to connect|Could not resolve host|Network is unreachable|No route to host/i.test(
+    text
+  )) {
+    return { retry: true, reason: "network_or_timeout" };
+  }
+  if (/connection reset|connection refused|connection closed|remote end hung up|unexpected disconnect|early EOF|RPC failed|index-pack failed|HTTP\/2 stream.*not closed cleanly|SSL_ERROR_SYSCALL|curl\s+(?:18|28|35|52|55|56|92)/i.test(
+    text
+  )) {
+    return { retry: true, reason: "connection_interrupted" };
+  }
+  return { retry: false };
+}
+function isNonRetryableGitFailure(message) {
+  return /authentication|authorization|401|403|forbidden|unauthorized|could not read username|repository not found|not a git repository|not empty|already exists and is not an empty directory|permission denied|Operation not permitted|non-fast-forward|fetch first|rejected|failed to push some refs|would be overwritten|conflicting local files/i.test(
+    message
+  );
+}
 function nextActionForFailure(classification) {
   switch (classification) {
     case "git_missing":
       return "本机未检测到可用的 Git。请用户自行安装 Git，并在 `git --version` 可用后重启 MCP 客户端再重试；安装前不要执行 clone、fetch、commit 或 push。";
     case "auth":
-      return "刷新 Maker PAT 后重试 maker_submit_current_directory；如果仍失败，请确认 PAT 是否过期或缺少 Maker git 权限。";
+      return "运行 `taptap-maker pat set` 并粘贴新的 Maker PAT 后，再重试 maker_build_current_directory；如果仍失败，请确认 PAT 是否过期或缺少 Maker git 权限。";
     case "remote_transient":
-      return "远端 Maker git 服务临时不可用。本地 commit 会保留；不要手动执行通用 git push，稍后直接重试 maker_submit_current_directory，或在构建重试时调用 maker_build_current_directory 并设置 submit_local_changes_before_build=true。";
+      return "远端 Maker git 服务临时不可用。本地 commit 会保留；不要手动执行通用 git push，稍后直接重试 maker_build_current_directory。";
     case "remote_rejected":
-      return "远端已有新提交。不要新建分支、不要要任务号、不要手动执行通用 git push；先询问用户是否 pull/rebase 当前 Maker 远端变更，再重试 maker_submit_current_directory。";
+      return "远端已有新提交。不要新建分支、不要要任务号、不要手动执行通用 git push；先询问用户是否 pull/rebase 当前 Maker 远端变更，再重试 maker_build_current_directory。";
     case "local":
       return "本地目录或权限异常。检查当前目录是否是 Maker git repo，以及 Codex 是否有目录写权限。";
     default:
-      return "保留本地提交，不要重复提交；把错误详情反馈给用户，并在确认后重试 maker_submit_current_directory。";
+      return "保留本地提交，不要重复提交；把错误详情反馈给用户，并在确认后重试 maker_build_current_directory。";
   }
 }
 function pushGit(args, cwd, onProgress) {
@@ -29524,6 +29564,12 @@ function pushGit(args, cwd, onProgress) {
     });
   });
 }
+function pushGitWithTransientRetry(args, cwd, onProgress) {
+  return runWithTransientRetry(() => pushGit(args, cwd, onProgress), {
+    stage: "push",
+    onProgress
+  });
+}
 async function resolveMakerProjectUserId(options) {
   var _a2;
   try {
@@ -29567,6 +29613,7 @@ async function cloneOrInitializeTarget(target, authUrl, pat, onProgress) {
       message: "Target directory is not empty; initializing git repository in place and keeping existing untracked files unless they conflict with Maker project files."
     });
     let transientRetries = 0;
+    emitFirstCloneWaitNotice(onProgress, "fetch");
     transientRetries += await runGitCaptureWithTransientRetry(["init", target], {
       sanitize: pat,
       onProgress
@@ -29592,11 +29639,20 @@ async function cloneOrInitializeTarget(target, authUrl, pat, onProgress) {
     }
     return transientRetries;
   }
+  emitFirstCloneWaitNotice(onProgress, "clone");
   return runGitCaptureWithTransientRetry(["clone", authUrl, target], {
     sanitize: pat,
     onProgress
   });
 }
+function emitFirstCloneWaitNotice(onProgress, phase) {
+  onProgress == null ? void 0 : onProgress({
+    progress: 10,
+    total: 100,
+    phase,
+    message: MAKER_FIRST_CLONE_WAIT_MESSAGE
+  });
+}
 function hasDirectoryEntries(target) {
   if (!fs4.existsSync(target)) {
     return false;
@@ -29728,7 +29784,7 @@ async function assertNoCheckoutFileConflicts(cwd, branch) {
       "Conflicting local files:",
       ...conflicts.map((file2) => `- ${file2}`),
       "",
-      "Please move, rename, or delete these local files, then retry maker_clone_to_current_directory."
+      "Please move, rename, or delete these local files, then retry taptap-maker init."
     ].join("\n")
   );
 }
@@ -29822,7 +29878,7 @@ function formatMakerGitRootMismatch(status) {
     status.configPath ? `config: ${status.configPath}` : "",
     "",
     "The current Maker directory is inside another Git repository, but it does not have its own .git directory.",
-    "Re-run maker_clone_to_current_directory after this fix, or use a fresh independent Maker directory."
+    "Re-run taptap-maker init after this fix, or use a fresh independent Maker directory."
   ].filter(Boolean).join("\n");
 }
 function findMakerProjectBinding(startDir) {
@@ -29886,7 +29942,7 @@ function ensureGitHeadCheckedOut(repoDir) {
     [
       "Maker clone did not complete checkout: local git repository has no HEAD commit.",
       `target_dir: ${repoDir}`,
-      "The remote fetch may have succeeded, but project files were not checked out. Please inspect git status and retry maker_clone_to_current_directory."
+      "The remote fetch may have succeeded, but project files were not checked out. Please inspect git status and retry taptap-maker init."
     ].join("\n")
   );
 }
@@ -29899,7 +29955,7 @@ function enhanceCheckoutConflictError(error2, target) {
     [
       "Maker clone could not check out project files because existing local files would be overwritten.",
       `target_dir: ${target}`,
-      "Please move, rename, or delete the conflicting local files, then retry maker_clone_to_current_directory.",
+      "Please move, rename, or delete the conflicting local files, then retry taptap-maker init.",
       "",
       message
     ].join("\n")
@@ -29964,12 +30020,19 @@ function readGit(args, cwd) {
   });
 }
 async function runGitWithTransientRetry(args, options) {
-  return runWithTransientRetry(() => runGit(args, options));
+  return runWithTransientRetry(() => runGit(args, options), {
+    stage: args[0] || "git",
+    onProgress: options.onProgress
+  });
 }
 async function runGitCaptureWithTransientRetry(args, options = {}) {
-  return runWithTransientRetry(() => runGitCapture(args, options));
+  return runWithTransientRetry(() => runGitCapture(args, options), {
+    stage: args[0] || "git",
+    onProgress: options.onProgress
+  });
 }
-async function runWithTransientRetry(operation) {
+async function runWithTransientRetry(operation, options) {
+  var _a2;
   let retries = 0;
   const maxRetries = 2;
   for (; ; ) {
@@ -29977,20 +30040,65 @@ async function runWithTransientRetry(operation) {
       await operation();
       return retries;
     } catch (error2) {
-      if (retries >= maxRetries || !isTransientGitRemoteError(error2)) {
+      const decision = getMakerGitRetryDecisionFromError(error2);
+      if (!decision.retry) {
         throw error2;
       }
+      if (retries >= maxRetries) {
+        throw appendRetryExhausted(error2, retries, decision);
+      }
       retries += 1;
-      await sleep(1500 * retries);
+      (_a2 = options.onProgress) == null ? void 0 : _a2.call(options, {
+        phase: options.stage,
+        message: formatGitRetryProgressMessage(options.stage, decision, retries, maxRetries)
+      });
+      await sleep(getGitRetryDelayMs() * retries);
     }
   }
 }
-function isTransientGitRemoteError(error2) {
+function formatGitRetryProgressMessage(stage, decision, retries, maxRetries) {
+  const reason = decision.reason || "temporary_remote_failure";
+  const prefix = (stage === "clone" || stage === "fetch") && reason === "remote_http_5xx" ? "Maker server may still be preparing the repository" : "Maker git remote is temporarily unavailable";
+  return `${prefix} (${reason}); retrying ${retries}/${maxRetries}. Please keep this running.`;
+}
+function getMakerGitRetryDecisionFromError(error2) {
+  if (error2 instanceof MakerGitError) {
+    return getMakerGitRetryDecision(
+      [error2.failure.stdout, error2.failure.stderr, error2.failure.message].filter(Boolean).join("\n")
+    );
+  }
   const message = error2 instanceof Error ? error2.message : String(error2);
-  return /502|503|504|Bad Gateway|Service Unavailable|Gateway Timeout|The requested URL returned error: 5\d\d/i.test(
-    message
+  return getMakerGitRetryDecision(message);
+}
+function appendRetryExhausted(error2, retryAttempts, decision) {
+  if (error2 instanceof MakerGitError) {
+    return new MakerGitError({
+      ...error2.failure,
+      retryable: decision.retry,
+      retryReason: decision.reason,
+      retryAttempts,
+      message: [
+        error2.failure.message,
+        "",
+        `Maker git transient retry exhausted after ${retryAttempts} retry attempts.`,
+        decision.reason ? `retry_reason: ${decision.reason}` : ""
+      ].filter(Boolean).join("\n")
+    });
+  }
+  const message = error2 instanceof Error ? error2.message : String(error2);
+  return new Error(
+    [
+      message,
+      "",
+      `Maker git transient retry exhausted after ${retryAttempts} retry attempts.`,
+      decision.reason ? `retry_reason: ${decision.reason}` : ""
+    ].filter(Boolean).join("\n")
   );
 }
+function getGitRetryDelayMs() {
+  const value = Number.parseInt(process.env.TAPTAP_MAKER_GIT_RETRY_DELAY_MS || "", 10);
+  return Number.isFinite(value) && value >= 0 ? value : 1500;
+}
 function sleep(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -30226,7 +30334,7 @@ function getBundledSkillSourceDir(skillName) {
 }
 // src/maker/server/mcp.ts
-var VERSION = true ? "1.23.2" : "dev";
+var VERSION = true ? "1.23.3" : "dev";
 var DEFAULT_PROXY_PACKAGE = "@taptap/instant-games-open-mcp@1.22.0";
 var DEFAULT_BUILD_TIMEOUT_MS = 10 * 60 * 1e3;
 var LONG_OPERATION_HEARTBEAT_MS = 3 * 60 * 1e3;
@@ -30241,35 +30349,8 @@ var MakerCloneFailedError = class extends Error {
 };
 var tools = [
   {
-    name: "maker_exchange_pat",
-    description: "Save a Maker PAT for local Maker API, Git, and TapTap token operations. After saving PAT, this tool fetches TapTap token and returns a user-facing Maker app list. If the current directory is unbound, show every returned app entry to the user and ask them to choose; do not summarize the list as a count only.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        manual_pat: {
-          type: "string",
-          description: "Maker PAT provided by the user. It will be saved for later Maker API and git operations."
-        }
-      },
-      required: ["manual_pat"]
-    }
-  },
-  {
-    name: "maker_list_apps",
-    description: "List Maker apps available to the cached or provided Maker PAT. Use this for unbound Maker directory initialization or explicit app-list requests. If the current directory is unbound, show every returned app entry to the user and ask them to choose; do not summarize the list as a count only. If maker_status already reports the current directory is bound, treat this list as reference only and do not ask which app to clone unless the user explicitly wants to switch or re-clone.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        pat: {
-          type: "string",
-          description: "Optional Maker PAT override. If provided, it is saved for later Maker operations."
-        }
-      }
-    }
-  },
-  {
-    name: "maker_status",
-    description: "Show local Maker MCP status for the user current working directory: Git availability, PAT/TapTap token status, project binding, AI dev kit status, bundled skill document paths, validation checklist, and available apps when the current directory is unbound and PAT exists. If the current directory is unbound and apps are returned, show every app entry to the user; do not summarize the list as a count only. If the MCP process cwd differs from the user current working directory, pass target_dir with the user current working directory.",
+    name: "maker_status_lite",
+    description: "Compatibility fallback for clients that cannot read the maker://status resource. Prefer reading maker://status when resources are available. Shows local Maker status for the user current working directory, including Git, PAT/TapTap auth, project binding, AI dev kit status, and bundled workflow skill document paths.",
     inputSchema: {
       type: "object",
       properties: {
@@ -30280,57 +30361,9 @@ var tools = [
       }
     }
   },
-  {
-    name: "maker_clone_to_current_directory",
-    description: "Clone a selected Maker app repository into the current agent working directory and write .maker-mcp/config.json. Requires Git and a concrete app_id. Before clone, the tool prepares the local AI dev kit automatically, skips dev-kit scripts, deletes the downloaded zip, and stages dev-kit ignore rules for merge after checkout. The tool checks local file conflicts before checkout and keeps non-conflicting local files.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        app_id: {
-          type: "string",
-          description: "Maker APP_ID to clone from the configured Maker git service."
-        },
-        target_dir: {
-          type: "string",
-          description: "Optional target directory. Defaults to the MCP process cwd. Pass the user current working directory when it differs from the MCP process cwd."
-        },
-        pat: {
-          type: "string",
-          description: "Optional Maker PAT override. If provided, it is saved and used for git authentication."
-        },
-        user_id: {
-          type: "string",
-          description: "Optional Maker user_id from maker_list_apps output. If omitted, the tool will try to resolve it from the app list."
-        }
-      },
-      required: ["app_id"]
-    }
-  },
-  {
-    name: "maker_submit_current_directory",
-    description: 'Commit, push, and build current Maker project directory changes. Requires local Git. If Git is missing, stop and show install guidance; do not stage, commit, push, or build. Use this in Maker projects when the user says "帮我提交", "帮我提交代码", "提交", "提交代码", "提交并推送", "push", "帮我提交代码到maker", "帮我提交代码到taptap制造", "帮我提交代码到tap制造", or "帮我提交代码到tap". Maker submit means commit + push + build: after a successful push, this tool MUST run the remote Maker build and return the build result. If the remote build fails after push, return build_failure details together with the successful submit result. For build requests that stop on local changes, continue through maker_build_current_directory with submit_local_changes_before_build=true and remember_build_submit_preference=true so the build workflow can save the auto-submit preference and return the build result. This submit tool bypasses local generic Git branch/task-id rules and pushes directly to the Maker remote configured for the current directory.',
-    inputSchema: {
-      type: "object",
-      properties: {
-        message: {
-          type: "string",
-          description: "Optional commit message. If omitted, Maker MCP generates a simple message from changed files."
-        },
-        target_dir: {
-          type: "string",
-          description: "Optional target directory. Defaults to the MCP process cwd. Pass the user current working directory when it differs from the MCP process cwd."
-        },
-        files: {
-          type: "array",
-          items: { type: "string" },
-          description: "Optional files to stage. Defaults to all changes."
-        }
-      }
-    }
-  },
   {
     name: "maker_build_current_directory",
-    description: 'Build the current Maker game by forwarding to the remote TapTap Maker MCP build tool. MUST use this for user requests like "构建", "build", "重新构建游戏", "帮我构建maker游戏", "compile", or "run" in a Maker project. The tool itself enforces a local-change guard before remote build: if local Maker project changes exist, it will stop unless confirm_remote_build_without_submit is true, submit_local_changes_before_build is true, or the project has saved build_local_changes_policy=auto_submit. Explain to the user that direct build only uses the Maker remote committed version and may not include local edits. The primary option should be "提交本地改动并触发构建（以后都是如此）"; if the user chooses it, call maker_build_current_directory again with submit_local_changes_before_build=true and remember_build_submit_preference=true. Maker MCP will commit + push local changes, then run remote build and return the build result. If auto_submit preference is already saved, this build tool will submit local changes automatically and then run remote build. If the user explicitly says not to submit and wants to build the remote version, call this tool with confirm_remote_build_without_submit=true. Do not write local build scripts. Uses saved Tap auth and current .maker-mcp/config.json project binding to call the remote build tool through taptap-proxy.',
+    description: 'Sync and build the current Maker game. Use this single tool for user requests like "构建", "build", "跑一下", "预览", "验证一下", "提交", "提交代码", "推送", or "push" in a Maker project. If local changes or committed-but-unpushed commits exist, the tool commits when needed, pushes to Maker remote, then triggers remote Maker build. If push fails, build is not started and the result includes recovery details for the local Agent to handle merge/conflict resolution. If push succeeds but remote build fails, report that code is already on Maker remote and include build failure details. Only set confirm_remote_build_without_submit=true when the user explicitly says they do not want to submit local changes and wants to build the current remote version.',
     inputSchema: {
       type: "object",
       properties: {
@@ -30371,22 +30404,31 @@ var tools = [
           type: "number",
           description: "Optional remote build timeout in milliseconds. Defaults to 10 minutes. If timed out, do not retry blindly; inspect remote build logs first."
         },
-        confirm_remote_build_without_submit: {
-          type: "boolean",
-          description: "Set true only after the user explicitly confirms they do not want to submit local changes and want to build the current Maker remote committed version."
+        message: {
+          type: "string",
+          description: "Optional commit message used when local file changes need to be committed before build."
         },
-        submit_local_changes_before_build: {
-          type: "boolean",
-          description: 'Set true only after the user explicitly chooses "提交本地改动并触发构建（以后都是如此）". Maker MCP will commit + push local changes, then run the remote build and return the build result.'
+        files: {
+          type: "array",
+          items: { type: "string" },
+          description: "Optional files to stage before build. Defaults to all local changes."
         },
-        remember_build_submit_preference: {
+        confirm_remote_build_without_submit: {
           type: "boolean",
-          description: 'Set true together with submit_local_changes_before_build when the user chooses "提交本地改动并触发构建（以后都是如此）". Saves build_local_changes_policy=auto_submit for future build requests.'
+          description: "Set true only after the user explicitly confirms they do not want to submit local changes and want to build the current Maker remote committed version."
         }
       }
     }
   }
 ];
+var resources = [
+  {
+    uri: "maker://status",
+    name: "Maker status",
+    description: "Local TapTap Maker project status, including Git, PAT/TapTap auth, project binding, AI dev kit status, and bundled workflow skill document paths.",
+    mimeType: "text/plain"
+  }
+];
 async function startMakerMcpServer() {
   const server = new Server(
     {
@@ -30395,16 +30437,33 @@ async function startMakerMcpServer() {
     },
     {
       capabilities: {
-        tools: {}
+        tools: {},
+        resources: {}
       }
     }
   );
   server.setRequestHandler(ListToolsRequestSchema, async () => ({ tools }));
+  server.setRequestHandler(ListResourcesRequestSchema, async () => ({ resources }));
+  server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
+    const uri = request.params.uri;
+    if (uri !== "maker://status") {
+      throw new McpError(ErrorCode.InvalidParams, `Unknown Maker resource: ${uri}`);
+    }
+    return {
+      contents: [
+        {
+          uri,
+          mimeType: "text/plain",
+          text: await formatStatus()
+        }
+      ]
+    };
+  });
   server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
-    var _a2, _b, _c;
+    var _a2;
     const name = request.params.name;
     try {
-      if (name === "maker_status") {
+      if (name === "maker_status_lite") {
         const args = request.params.arguments || {};
         return {
           content: [
@@ -30417,221 +30476,10 @@ async function startMakerMcpServer() {
           ]
         };
       }
-      if (name === "maker_exchange_pat") {
-        const args = request.params.arguments || {};
-        if (!args.manual_pat) {
-          throw new McpError(ErrorCode.InvalidParams, "manual_pat is required");
-        }
-        const pat = saveManualMakerPat(args.manual_pat);
-        let tapAuthText;
-        try {
-          const tapAuth = await requestTapAuthWithPat(args.manual_pat);
-          tapAuthText = [
-            "TapTap token 已通过 PAT 获取并保存。",
-            `- kid: ${mask(tapAuth.kid)}`,
-            `- token_type: ${tapAuth.token_type}`,
-            `- saved: ${getTapAuthPath()}`
-          ].join("\n");
-        } catch (error2) {
-          tapAuthText = [
-            "TapTap token 自动获取失败。",
-            `原因：${error2 instanceof Error ? error2.message : String(error2)}`,
-            "远端 Maker MCP tools 需要 TapTap token；请确认 PAT 是否有效后重新调用 maker_exchange_pat。"
-          ].join("\n");
-        }
-        let nextText;
-        try {
-          const projects = await listMakerProjects({ pat: args.manual_pat });
-          nextText = [
-            "已自动列出可用 Maker Apps。",
-            "当前目录未绑定时，请逐项展示下面完整列表，不要只总结数量；然后让用户选择编号或 app_id。",
-            "",
-            formatProjectList(projects)
-          ].join("\n");
-        } catch (error2) {
-          nextText = [
-            "自动列出 Maker Apps 失败。",
-            `原因：${error2 instanceof Error ? error2.message : String(error2)}`,
-            "请确认 PAT 是否有效，然后重新调用 maker_list_apps。"
-          ].join("\n");
-        }
-        return {
-          content: [
-            {
-              type: "text",
-              text: [
-                "✓ Maker PAT ready",
-                "",
-                `- pat: ${mask(pat.token)}`,
-                `- saved: ${getPatPath()}`,
-                "",
-                tapAuthText,
-                "",
-                nextText
-              ].join("\n")
-            }
-          ]
-        };
-      }
-      if (name === "maker_list_apps") {
-        const args = request.params.arguments || {};
-        const projects = await listMakerProjects({
-          pat: args.pat
-        });
-        return {
-          content: [
-            {
-              type: "text",
-              text: formatProjectList(projects)
-            }
-          ]
-        };
-      }
-      if (name === "maker_clone_to_current_directory") {
-        const args = request.params.arguments || {};
-        if (!args.app_id) {
-          throw new McpError(ErrorCode.InvalidParams, "app_id is required");
-        }
-        const targetDir = resolveMakerToolTargetDir(args.target_dir);
-        ensureGitAvailable();
-        const progressReporter = createToolProgressReporter(
-          (_a2 = request.params._meta) == null ? void 0 : _a2.progressToken,
-          extra,
-          "Maker clone"
-        );
-        let result;
-        let devKitResult = {
-          targetDir,
-          sourceDir: targetDir,
-          installedEntries: [],
-          skippedEntries: [],
-          gitignorePath: path7.join(targetDir, ".gitignore"),
-          stagedGitignorePath: path7.join(targetDir, DEV_KIT_GITIGNORE_STAGING_FILE)
-        };
-        let devKitState = "prepared";
-        let devKitError = "";
-        let progressSummary;
-        try {
-          progressReporter.report({
-            progress: 1,
-            total: 100,
-            phase: "dev_kit",
-            message: "Preparing local AI dev kit before Maker clone"
-          });
-          const devKitStatus = inspectAiDevKit(targetDir);
-          if (devKitStatus.ready) {
-            const presentManagedEntries = listPresentDevKitManagedEntries(targetDir);
-            writeDevKitStagedGitignore(
-              path7.join(targetDir, DEV_KIT_GITIGNORE_STAGING_FILE),
-              presentManagedEntries
-            );
-            devKitState = "already_ready";
-            devKitResult = {
-              targetDir,
-              sourceDir: targetDir,
-              installedEntries: presentManagedEntries,
-              skippedEntries: [],
-              gitignorePath: path7.join(targetDir, ".gitignore"),
-              stagedGitignorePath: path7.join(targetDir, DEV_KIT_GITIGNORE_STAGING_FILE)
-            };
-          } else {
-            try {
-              devKitResult = await installAiDevKit({
-                targetDir
-              });
-            } catch (error2) {
-              const presentManagedEntries = listPresentDevKitManagedEntries(targetDir);
-              if (presentManagedEntries.length > 0) {
-                writeDevKitStagedGitignore(
-                  path7.join(targetDir, DEV_KIT_GITIGNORE_STAGING_FILE),
-                  presentManagedEntries
-                );
-              }
-              devKitState = "failed_non_blocking";
-              devKitError = error2 instanceof Error ? error2.message : String(error2);
-              devKitResult.installedEntries = presentManagedEntries;
-            }
-          }
-          progressReporter.report({
-            progress: 5,
-            total: 100,
-            phase: "dev_kit",
-            message: devKitState === "failed_non_blocking" ? "Local AI dev kit preparation failed; continuing Maker clone" : "Local AI dev kit prepared"
-          });
-          result = await cloneMakerProject({
-            appId: args.app_id,
-            targetDir,
-            pat: args.pat,
-            userId: args.user_id,
-            sceEndpoint: process.env.SCE_MCP_URL,
-            onProgress: progressReporter.report
-          });
-          progressSummary = progressReporter.finish();
-        } catch (error2) {
-          progressReporter.finish();
-          throw new MakerCloneFailedError(targetDir, error2);
-        }
-        return {
-          content: [
-            {
-              type: "text",
-              text: [
-                "✓ Maker project cloned",
-                "",
-                ...formatCloneWarnings(result.warnings),
-                `- app_id: ${args.app_id}`,
-                `- target_dir: ${result.targetDir}`,
-                `- status: ${result.status}`,
-                `- retried_with_new_pat: ${result.retriedWithNewPat ? "yes" : "no"}`,
-                `- ai_dev_kit: ${devKitState}`,
-                ...devKitError ? [
-                  `- ai_dev_kit_error: ${devKitError}`,
-                  "- ai_dev_kit_next_step: run maker_status after clone to retry dev kit restoration"
-                ] : [],
-                `- ai_dev_kit_installed_entries: ${devKitResult.installedEntries.join(", ") || "(none)"}`,
-                `- ai_dev_kit_skipped_entries: ${devKitResult.skippedEntries.join(", ") || "(none)"}`,
-                ...formatProgressSummary(progressSummary),
-                "- project config: .maker-mcp/config.json"
-              ].join("\n")
-            }
-          ]
-        };
-      }
-      if (name === "maker_submit_current_directory") {
-        const args = request.params.arguments || {};
-        const targetDir = resolveMakerToolTargetDir(args.target_dir);
-        const progressReporter = createToolProgressReporter(
-          (_b = request.params._meta) == null ? void 0 : _b.progressToken,
-          extra,
-          "Maker submit"
-        );
-        let result;
-        let progressSummary;
-        try {
-          result = await pushThenBuildCurrentDirectory({
-            targetDir,
-            message: args.message,
-            files: args.files,
-            onProgress: progressReporter.report
-          });
-          progressSummary = progressReporter.finish();
-        } catch (error2) {
-          progressReporter.finish();
-          throw error2;
-        }
-        return {
-          content: [
-            {
-              type: "text",
-              text: formatPushResult(targetDir, result, progressSummary)
-            }
-          ]
-        };
-      }
       if (name === "maker_build_current_directory") {
         const args = request.params.arguments || {};
         const progressReporter = createToolProgressReporter(
-          (_c = request.params._meta) == null ? void 0 : _c.progressToken,
+          (_a2 = request.params._meta) == null ? void 0 : _a2.progressToken,
           extra,
           "Maker build"
         );
@@ -30648,9 +30496,9 @@ async function startMakerMcpServer() {
             serverUrl: args.server_url,
             env: args.env,
             timeoutMs: args.timeout_ms,
+            message: args.message,
+            files: args.files,
             confirmRemoteBuildWithoutSubmit: args.confirm_remote_build_without_submit,
-            submitLocalChangesBeforeBuild: args.submit_local_changes_before_build,
-            rememberBuildSubmitPreference: args.remember_build_submit_preference,
             onProgress: progressReporter.report
           });
           progressSummary = progressReporter.finish();
@@ -30713,7 +30561,7 @@ async function formatStatus(options = {}) {
   const projectSection = identify.projectId ? [
     "目标目录已绑定 Maker 项目。",
     "请继续在当前绑定项目上执行状态、提交、构建等操作；不要再引导用户 clone，除非用户明确要求切换或重新拉取项目。",
-    "本地 Maker 工作流请优先参考 taptap-maker-local skill；MCP tools 只负责保存 PAT、列 app、clone、submit 和 build 等机器动作。"
+    "本地 Maker 工作流请优先参考 taptap-maker-local skill；CLI 负责初始化/PAT/app/clone，MCP 只保留状态和同步构建。"
   ].join("\n") : isLikelyAiDialogueDirectory(targetDir) ? formatAiDialogueDirectoryHint(targetDir) : pat ? await formatAutoProjectListFromPat() : formatIdentifyHint();
   return [
     "TapTap Maker MCP status",
@@ -30774,7 +30622,7 @@ function formatAiDialogueDirectoryHint(targetDir) {
     "- detected_issue: current directory looks like an AI dialogue/session directory, not a Maker project directory.",
     "- do_not_clone_here: yes",
     "- next_step: inspect the AI client attached/extra workspace directories and choose the Maker project directory.",
-    '- if_single_attached_workspace: call maker_status(target_dir="<attached project directory>") directly.',
+    "- if_single_attached_workspace: read maker://status or call maker_status_lite with the attached project directory.",
     "- if_multiple_attached_workspaces: show the directories to the user and ask which one is the Maker project.",
     "- do_not_show_app_selection_here: yes"
   ].join("\n");
@@ -30786,29 +30634,14 @@ function resolveMakerToolTargetDir(targetDir) {
   return process.cwd();
 }
 async function formatAiDevKitStatus(projectRoot) {
-  const before = inspectAiDevKit(projectRoot);
-  if (before.ready) {
-    return formatAiDevKitStatusLines("ready", before).join("\n");
-  }
-  try {
-    const installResult = await installAiDevKit({
-      targetDir: projectRoot,
-      preserveExisting: true
-    });
-    finalizeStagedDevKitGitignore(projectRoot);
-    const after = inspectAiDevKit(projectRoot);
-    return [
-      ...formatAiDevKitStatusLines("restored", after),
-      `- restored_missing_entries: ${before.missingEntries.join(", ") || "(none)"}`,
-      `- installed_entries: ${installResult.installedEntries.join(", ") || "(none)"}`
-    ].join("\n");
-  } catch (error2) {
-    return [
-      ...formatAiDevKitStatusLines("missing", before),
-      `- restore_error: ${error2 instanceof Error ? error2.message : String(error2)}`,
-      "- next_step: 请检查网络后重新调用 maker_status，或重新执行 Maker clone 初始化流程。"
-    ].join("\n");
+  const devKitStatus = inspectAiDevKit(projectRoot);
+  if (devKitStatus.ready) {
+    return formatAiDevKitStatusLines("ready", devKitStatus).join("\n");
   }
+  return [
+    ...formatAiDevKitStatusLines("missing", devKitStatus),
+    "- next_step: 请运行 taptap-maker dev-kit update，或重新执行 taptap-maker init。"
+  ].join("\n");
 }
 function formatAiDevKitStatusLines(status, devKitStatus) {
   return [
@@ -30820,19 +30653,6 @@ function formatAiDevKitStatusLines(status, devKitStatus) {
     `- missing_entries: ${devKitStatus.missingEntries.join(", ") || "(none)"}`
   ];
 }
-function rememberBuildSubmitPreference(targetDir) {
-  const identify = identifyMakerProject({ cwd: targetDir });
-  if (!identify.projectRoot || !identify.projectId) {
-    throw new Error(
-      `${targetDir} is not bound to a Maker project. Cannot save build submit preference.`
-    );
-  }
-  saveProjectConfig(identify.projectRoot, {
-    ...identify.config || { project_id: identify.projectId },
-    project_id: identify.projectId,
-    build_local_changes_policy: "auto_submit"
-  });
-}
 async function formatAutoProjectListFromPat() {
   try {
     const projects = await listMakerProjects();
@@ -30846,16 +30666,10 @@ async function formatAutoProjectListFromPat() {
     return [
       "本地已有 Maker PAT，但自动列出 Maker Apps 失败。",
       `原因：${error2 instanceof Error ? error2.message : String(error2)}`,
-      `如果 PAT 已失效，请使用新的 Maker PAT 重新调用 maker_exchange_pat。PAT 页面：${getMakerPatTokensUrl()}`
+      `如果 PAT 已失效，请运行 taptap-maker pat set 并粘贴新的 Maker PAT。PAT 页面：${getMakerPatTokensUrl()}`
     ].join("\n");
   }
 }
-function mask(value) {
-  if (value.length <= 12) {
-    return "***";
-  }
-  return `${value.slice(0, 6)}...${value.slice(-4)}`;
-}
 function formatProjectList(projects) {
   if (projects.length === 0) {
     return [
@@ -30873,30 +30687,10 @@ function formatProjectList(projects) {
       (project, index) => `${index + 1}. ${project.id}${project.name ? `  ${project.name}` : ""}${project.user_id ? `  user_id=${project.user_id}` : ""}${project.gameType ? `  gameType=${project.gameType}` : ""}${project.stage ? `  stage=${project.stage}` : ""}${project.createdAt ? `  createdAt=${project.createdAt}` : ""}${project.lastConversationAt ? `  lastConversationAt=${project.lastConversationAt}` : ""}`
     ),
     "",
-    "仅当当前目录未绑定且用户要初始化或 clone 时，才让用户选择 app 并调用 maker_clone_to_current_directory。",
+    "仅当当前目录未绑定且用户要初始化或 clone 时，才让用户选择 app 并继续 taptap-maker init。",
     "如果当前目录已绑定 Maker 项目，这个列表仅作账号项目参考；请继续当前项目，除非用户明确要求切换或重新 clone。"
   ].join("\n");
 }
-function formatCloneWarnings(warnings) {
-  if (warnings.length === 0) {
-    return [
-      "Pre-clone local directory check",
-      "",
-      "- result: checked",
-      "- local_files: none found before clone, ignoring dot-prefixed local config entries",
-      ""
-    ];
-  }
-  return [
-    "Pre-clone local directory check",
-    "",
-    "- result: found local files before clone",
-    "- action: kept local files and continued unless they conflicted with Maker project files",
-    "",
-    ...warnings.map((warning) => `- ${warning}`),
-    ""
-  ];
-}
 function formatClonePartialStateLines(targetDir) {
   const resolvedTargetDir = path7.resolve(targetDir);
   const identify = identifyMakerProject({ cwd: resolvedTargetDir });
@@ -30921,21 +30715,21 @@ function formatClonePartialStateLines(targetDir) {
     `- ai_dev_kit_missing_entries: ${devKitStatus.missingEntries.join(", ") || "(none)"}`,
     `- staged_dev_kit_gitignore: ${fs6.existsSync(stagedDevKitGitignorePath) ? "yes" : "no"}`,
     `- safe_to_retry: ${safeToRetry ? "yes" : "no"}`,
-    safeToRetry ? "- next_step: 可以直接重试 maker_clone_to_current_directory；如果连续失败，建议换一个全新的独立目录重新 clone。" : "- next_step: 当前目录已经有 Maker 绑定信息；先运行 maker_status 确认状态，不要重复 clone。"
+    safeToRetry ? "- next_step: 可以直接重试 taptap-maker init；如果连续失败，建议换一个全新的独立目录重新 clone。" : "- next_step: 当前目录已经有 Maker 绑定信息；先运行 taptap-maker doctor 或读取 maker://status 确认状态，不要重复 clone。"
   ].filter(Boolean);
 }
 function createRemoteProxyContext(options) {
   const identify = identifyMakerProject({ cwd: options.targetDir });
   if (!identify.projectRoot || !identify.projectId) {
     throw new Error(
-      `${options.targetDir} is not bound to a Maker project. Run maker_clone_to_current_directory first.`
+      `${options.targetDir} is not bound to a Maker project. Run taptap-maker init first.`
     );
   }
   const projectConfig = loadProjectConfig(identify.projectRoot);
   const projectId = (projectConfig == null ? void 0 : projectConfig.project_id) || identify.projectId;
   const tapAuth = loadTapAuth();
   if (!tapAuth) {
-    throw new Error("Tap auth not found. Run maker_exchange_pat with a valid Maker PAT first.");
+    throw new Error("Tap auth not found. Run taptap-maker pat set and paste a Maker PAT first.");
   }
   let userId = projectConfig == null ? void 0 : projectConfig.user_id;
   if (!userId) {
@@ -30944,7 +30738,7 @@ function createRemoteProxyContext(options) {
   }
   if (!userId) {
     throw new Error(
-      "Cannot resolve user_id. Re-run maker_list_apps and maker_clone_to_current_directory with PAT so the project config can cache user_id."
+      "Cannot resolve user_id. Re-run taptap-maker init with PAT so the project config can cache user_id."
     );
   }
   const env = getMakerEnvironment(options.env);
@@ -31089,56 +30883,42 @@ async function buildCurrentDirectory(options) {
   const localChanges = await readMakerProjectLocalChanges(options.targetDir);
   if (localChanges.hasChanges && !options.confirmRemoteBuildWithoutSubmit) {
     const config2 = loadProjectConfig(localChanges.projectRoot);
-    let buildLocalChangesPolicy = (config2 == null ? void 0 : config2.build_local_changes_policy) === "auto_submit" ? "auto_submit" : void 0;
-    if ((config2 == null ? void 0 : config2.build_local_changes_policy) === "auto_submit" || options.submitLocalChangesBeforeBuild) {
-      (_a2 = options.onProgress) == null ? void 0 : _a2.call(options, {
-        progress: 0,
-        total: 100,
-        phase: "auto_submit",
-        message: "Auto-submitting local Maker changes before build"
-      });
-      const submitResult = await (options.submitLocalChanges || pushMakerProject)({
-        cwd: localChanges.projectRoot,
-        onProgress: options.onProgress
-      });
-      if (options.rememberBuildSubmitPreference && !submitResult.failure) {
-        rememberBuildSubmitPreference(localChanges.projectRoot);
-        buildLocalChangesPolicy = "auto_submit";
-      }
-      if (submitResult.failure || !submitResult.pushed && submitResult.status !== "clean") {
-        return {
-          mode: "submit_failed_before_build",
-          projectRoot: localChanges.projectRoot,
-          projectId: (config2 == null ? void 0 : config2.project_id) || "unknown",
-          submitResult,
-          buildLocalChangesPolicy
-        };
-      }
-      let buildResult;
-      try {
-        buildResult = await runRemoteBuildCurrentDirectory(options, localChanges.projectRoot);
-      } catch (error2) {
-        return {
-          mode: "build_failed_after_submit",
-          projectRoot: localChanges.projectRoot,
-          projectId: (config2 == null ? void 0 : config2.project_id) || "unknown",
-          submitResult,
-          buildFailure: toMakerBuildFailure(error2),
-          buildLocalChangesPolicy
-        };
-      }
+    (_a2 = options.onProgress) == null ? void 0 : _a2.call(options, {
+      progress: 0,
+      total: 100,
+      phase: "sync",
+      message: "Syncing local Maker changes before remote build"
+    });
+    const submitResult = await (options.submitLocalChanges || pushMakerProject)({
+      cwd: localChanges.projectRoot,
+      message: options.message,
+      files: options.files,
+      onProgress: options.onProgress
+    });
+    if (submitResult.failure || !submitResult.pushed && submitResult.status !== "clean") {
+      return {
+        mode: "submit_failed_before_build",
+        projectRoot: localChanges.projectRoot,
+        projectId: (config2 == null ? void 0 : config2.project_id) || "unknown",
+        submitResult
+      };
+    }
+    let buildResult;
+    try {
+      buildResult = await runRemoteBuildCurrentDirectory(options, localChanges.projectRoot);
+    } catch (error2) {
       return {
-        ...buildResult,
+        mode: "build_failed_after_submit",
+        projectRoot: localChanges.projectRoot,
+        projectId: (config2 == null ? void 0 : config2.project_id) || "unknown",
         submitResult,
-        buildLocalChangesPolicy
+        buildFailure: toMakerBuildFailure(error2)
       };
     }
-    throw new Error(
-      formatLocalChangesBeforeBuildMessage(localChanges.files, {
-        ahead: localChanges.ahead,
-        hasUnpushedCommits: localChanges.hasUnpushedCommits
-      })
-    );
+    return {
+      ...buildResult,
+      submitResult
+    };
   }
   return runRemoteBuildCurrentDirectory(options, options.targetDir);
 }
@@ -31205,42 +30985,6 @@ async function runRemoteBuildCurrentDirectory(options, targetDir) {
     await client.close();
   }
 }
-async function pushThenBuildCurrentDirectory(options) {
-  const submitResult = await (options.pushLocalChanges || pushMakerProject)({
-    cwd: options.targetDir,
-    message: options.message,
-    files: options.files,
-    onProgress: options.onProgress
-  });
-  if (!submitResult.pushed) {
-    return {
-      targetDir: options.targetDir,
-      submitResult
-    };
-  }
-  let buildResult;
-  try {
-    buildResult = await runRemoteBuildCurrentDirectory(
-      {
-        targetDir: options.targetDir,
-        callRemoteBuild: options.callRemoteBuild,
-        onProgress: options.onProgress
-      },
-      options.targetDir
-    );
-  } catch (error2) {
-    return {
-      targetDir: options.targetDir,
-      submitResult,
-      buildFailure: toMakerBuildFailure(error2)
-    };
-  }
-  return {
-    targetDir: options.targetDir,
-    submitResult,
-    buildResult
-  };
-}
 function toMakerBuildFailure(error2) {
   return {
     name: error2 instanceof Error ? error2.name : typeof error2,
@@ -31248,26 +30992,6 @@ function toMakerBuildFailure(error2) {
     ...error2 instanceof Error && error2.stack ? { stack: error2.stack } : {}
   };
 }
-function formatLocalChangesBeforeBuildMessage(files, options = {}) {
-  const visibleFiles = files.slice(0, 20);
-  const hiddenCount = Math.max(0, files.length - visibleFiles.length);
-  return [
-    "Current Maker project has local changes that are not submitted.",
-    "",
-    "当前有本地修改还没有提交。直接构建只会构建 Maker 云端已有版本，可能看不到这些新修改。",
-    "请先询问用户选择：",
-    "- 提交本地改动并触发构建（以后都是如此）：再次调用 maker_build_current_directory，并设置 submit_local_changes_before_build=true 和 remember_build_submit_preference=true；工具会先 commit + push，再继续执行远端 build 并返回构建结果。后续构建遇到本地改动会默认自动提交并继续构建。",
-    "- 如果用户明确说不提交、直接构建云端版本，再调用 maker_build_current_directory，并设置 confirm_remote_build_without_submit=true。",
-    "",
-    options.hasUnpushedCommits ? `unpushed_commits: ${options.ahead || "yes"}` : "",
-    options.hasUnpushedCommits ? "note: 本地已有 commit 还没有推送到 Maker 远端；需要先 push，远端构建才会包含这些改动。" : "",
-    options.hasUnpushedCommits ? "" : "",
-    "local_changes:",
-    ...visibleFiles.map((file2) => `- ${file2}`),
-    visibleFiles.length === 0 ? "- (none)" : "",
-    ...hiddenCount > 0 ? [`- ... and ${hiddenCount} more`] : []
-  ].filter((line) => line !== "").join("\n");
-}
 function createBuildArgs(projectRoot, options) {
   const buildArgs = {};
   if (options.entry) {
@@ -31329,13 +31053,13 @@ function formatBuildResult(result, progressSummary) {
       "",
       `- project_root: ${result.projectRoot}`,
       `- project_id: ${result.projectId}`,
-      "- build_local_changes_policy: auto_submit",
       `- branch: ${result.submitResult.branch}`,
       `- status: ${result.submitResult.status}`,
       `- committed: ${result.submitResult.committed ? "yes" : "no"}`,
       result.submitResult.commitHash ? `- commit_hash: ${result.submitResult.commitHash}` : "",
       result.submitResult.message ? `- commit_message: ${result.submitResult.message}` : "",
       result.submitResult.ahead ? `- git_state: ${result.submitResult.ahead}` : "",
+      result.submitResult.transientRetries ? `- transient_git_retries: ${result.submitResult.transientRetries}` : "",
       ...formatProgressSummary(progressSummary),
       "",
       "note: Maker build was not started because submit did not produce a pushed state.",
@@ -31353,13 +31077,13 @@ function formatBuildResult(result, progressSummary) {
       "",
       `- project_root: ${result.projectRoot}`,
       `- project_id: ${result.projectId}`,
-      result.buildLocalChangesPolicy ? `- build_local_changes_policy: ${result.buildLocalChangesPolicy}` : "",
       `- branch: ${result.submitResult.branch}`,
       `- status: ${result.submitResult.status}`,
       `- committed: ${result.submitResult.committed ? "yes" : "no"}`,
       result.submitResult.commitHash ? `- commit_hash: ${result.submitResult.commitHash}` : "",
       result.submitResult.message ? `- commit_message: ${result.submitResult.message}` : "",
       result.submitResult.ahead ? `- git_state: ${result.submitResult.ahead}` : "",
+      result.submitResult.transientRetries ? `- transient_git_retries: ${result.submitResult.transientRetries}` : "",
       ...formatProgressSummary(progressSummary),
       "",
       ...formatMakerBuildFailureLines(result.buildFailure)
@@ -31373,6 +31097,7 @@ function formatBuildResult(result, progressSummary) {
     result.submitResult.commitHash ? `  - commit_hash: ${result.submitResult.commitHash}` : "",
     result.submitResult.message ? `  - commit_message: ${result.submitResult.message}` : "",
     result.submitResult.ahead ? `  - git_state: ${result.submitResult.ahead}` : "",
+    result.submitResult.transientRetries ? `  - transient_git_retries: ${result.submitResult.transientRetries}` : "",
     ""
   ].filter(Boolean) : [];
   const lines = [
@@ -31384,9 +31109,6 @@ function formatBuildResult(result, progressSummary) {
     `- server_url: ${result.serverUrl}`,
     `- env: ${result.env}`
   ];
-  if (result.buildLocalChangesPolicy) {
-    lines.push(`- build_local_changes_policy: ${result.buildLocalChangesPolicy}`);
-  }
   lines.push(
     `- timeout_ms: ${result.timeoutMs}`,
     `- build_args: ${JSON.stringify(result.buildArgs)}`,
@@ -31399,64 +31121,6 @@ function formatBuildResult(result, progressSummary) {
   lines.push("remote_result:", indent(result.resultText));
   return lines.join("\n");
 }
-function formatPushResult(targetDir, result, progressSummary) {
-  const submitResult = result.submitResult;
-  const lines = [
-    result.buildResult ? "✓ Maker project pushed, then remote Maker build finished" : submitResult.pushed ? "✗ Maker project pushed, but remote build result is missing" : submitResult.status === "clean" ? "Maker project has no changes to push" : "✗ Maker project push failed",
-    "",
-    `- target_dir: ${targetDir}`,
-    `- branch: ${submitResult.branch}`,
-    `- status: ${submitResult.status}`,
-    `- committed: ${submitResult.committed ? "yes" : "no"}`,
-    submitResult.commitHash ? `- commit_hash: ${submitResult.commitHash}` : "",
-    submitResult.message ? `- commit_message: ${submitResult.message}` : "",
-    submitResult.ahead ? `- git_state: ${submitResult.ahead}` : "",
-    ...formatProgressSummary(progressSummary)
-  ].filter(Boolean);
-  if (result.buildResult) {
-    return [
-      ...lines,
-      "",
-      "remote_build:",
-      indent(
-        [
-          `- project_id: ${result.buildResult.projectId}`,
-          `- project_path: ${result.buildResult.projectPath}`,
-          `- server_url: ${result.buildResult.serverUrl}`,
-          `- env: ${result.buildResult.env}`,
-          `- timeout_ms: ${result.buildResult.timeoutMs}`,
-          `- build_args: ${JSON.stringify(result.buildResult.buildArgs)}`,
-          "",
-          "remote_result:",
-          indent(result.buildResult.resultText)
-        ].join("\n")
-      )
-    ].join("\n");
-  }
-  if (result.buildFailure) {
-    return [
-      ...lines,
-      "",
-      "note: Maker project was pushed successfully, but remote build failed.",
-      "",
-      ...formatMakerBuildFailureLines(result.buildFailure)
-    ].join("\n");
-  }
-  if (!submitResult.failure) {
-    return [
-      ...lines,
-      "",
-      submitResult.pushed ? "note: This is an internal contract error: pushed=true requires remote_build or build_failure." : "note: Maker build was not started because no push was performed."
-    ].join("\n");
-  }
-  return [
-    ...lines,
-    "",
-    ...formatPushRecoveryLines(submitResult),
-    "",
-    ...formatMakerFailureLines(submitResult.failure)
-  ].filter(Boolean).join("\n");
-}
 function formatPushRecoveryLines(submitResult) {
   if (submitResult.pushed || submitResult.status !== "failed_after_commit") {
     return [];
@@ -31466,9 +31130,7 @@ function formatPushRecoveryLines(submitResult) {
     "- committed_but_unpushed: yes",
     submitResult.commitHash ? `- local_commit: ${submitResult.commitHash}` : "",
     submitResult.ahead ? `- git_state: ${submitResult.ahead}` : "",
-    "- retry_tool: maker_submit_current_directory",
-    "- retry_build_tool: maker_build_current_directory",
-    "- retry_build_args: submit_local_changes_before_build=true",
+    "- retry_tool: maker_build_current_directory",
     "- do_not_use_generic_git_push: yes",
     "- user_message: 本地提交已经保留，但还没推送到 Maker 远端；直接重试 Maker 提交/构建工具即可。"
   ].filter(Boolean);
@@ -31487,6 +31149,9 @@ function formatMakerFailureLines(failure) {
     "failure:",
     `- stage: ${failure.stage}`,
     `- classification: ${failure.classification}`,
+    `- retryable: ${failure.retryable ? "yes" : "no"}`,
+    failure.retryReason ? `- retry_reason: ${failure.retryReason}` : "",
+    failure.retryAttempts ? `- retry_attempts: ${failure.retryAttempts}` : "",
     `- exit_code: ${failure.exitCode ?? "(none)"}`,
     failure.command ? `- command: ${failure.command}` : "",
     failure.stderr ? `- stderr:
@@ -31539,13 +31204,758 @@ function formatToolException(toolName, error2) {
     "debug:",
     stack ? indent(stack) : indent(message),
     "",
-    "next_action: 请把上面的完整错误反馈给开发者；如果本地已有 commit 但 push 未完成，不要重复 commit，直接重试 maker_submit_current_directory。"
+    "next_action: 请把上面的完整错误反馈给开发者；如果本地已有 commit 但 push 未完成，不要重复 commit，直接重试 maker_build_current_directory。"
   ].join("\n");
 }
 function indent(value) {
   return value.split("\n").map((line) => `  ${line}`).join("\n");
 }
+// src/maker/cli/commands.ts
+import { spawnSync as spawnSync4 } from "node:child_process";
+import crypto from "node:crypto";
+import fs7 from "node:fs";
+import os4 from "node:os";
+import path8 from "node:path";
+import readline from "node:readline/promises";
+import { stdin as input, stdout as output } from "node:process";
+var DEFAULT_MCP_NAME = "taptap-maker";
+var DEFAULT_PACKAGE = "@taptap/instant-games-open-mcp";
+var TWO_PART_COMMANDS = /* @__PURE__ */ new Set(["pat", "mcp", "dev-kit"]);
+var BOOLEAN_OPTIONS = /* @__PURE__ */ new Set([
+  "json",
+  "skip_confirm",
+  "skip_mcp_install",
+  "pat_stdin",
+  "pat_from_stdin",
+  "h",
+  "help"
+]);
+var PAT_ARG_WARNING = "Warning: passing Maker PAT via command-line arguments exposes it via ps/shell history; prefer the interactive prompt or --pat-stdin.\n";
+async function runMakerCli(argv) {
+  const parsed = parseArgs(argv);
+  const ctx = { json: Boolean(parsed.options.json) };
+  const [command, subcommand] = parsed.command;
+  if (!command || command === "help" || command === "--help" || command === "-h") {
+    printHelp();
+    return;
+  }
+  if (command === "init") {
+    await runInit(parsed, ctx);
+    return;
+  }
+  if (command === "doctor") {
+    await runDoctor(parsed, ctx);
+    return;
+  }
+  if (command === "apps") {
+    await runApps(parsed, ctx);
+    return;
+  }
+  if (command === "pat" && subcommand === "set") {
+    await runPatSet(parsed, ctx);
+    return;
+  }
+  if (command === "mcp" && subcommand === "install") {
+    await runMcpInstall(parsed, ctx);
+    return;
+  }
+  if (command === "mcp" && subcommand === "verify") {
+    await runMcpVerify(parsed, ctx);
+    return;
+  }
+  if (command === "dev-kit" && subcommand === "update") {
+    await runDevKitUpdate(parsed, ctx);
+    return;
+  }
+  throw new Error(`Unknown taptap-maker command: ${formatUnknownCommand(parsed.command)}`);
+}
+function parseArgs(argv) {
+  const command = [];
+  const positionals = [];
+  const options = {};
+  for (let index = 0; index < argv.length; index += 1) {
+    const arg = argv[index];
+    if (arg.startsWith("--")) {
+      const equalIndex = arg.indexOf("=");
+      if (equalIndex > 0) {
+        options[toOptionKey(arg.slice(2, equalIndex))] = arg.slice(equalIndex + 1);
+        continue;
+      }
+      const key = toOptionKey(arg.slice(2));
+      if (BOOLEAN_OPTIONS.has(key)) {
+        options[key] = true;
+        continue;
+      }
+      const next = argv[index + 1];
+      if (next && !next.startsWith("-")) {
+        options[key] = next;
+        index += 1;
+      } else {
+        options[key] = true;
+      }
+      continue;
+    }
+    if (arg.startsWith("-") && arg.length > 1) {
+      options[arg.slice(1)] = true;
+      continue;
+    }
+    if (command.length === 0) {
+      command.push(arg);
+      continue;
+    }
+    if (command.length === 1 && TWO_PART_COMMANDS.has(command[0])) {
+      command.push(arg);
+    } else {
+      positionals.push(arg);
+    }
+  }
+  return { command, options, positionals };
+}
+function toOptionKey(value) {
+  return value.replace(/-/g, "_");
+}
+async function runInit(parsed, ctx) {
+  const targetDir = path8.resolve(stringOption(parsed, "target_dir") || process.cwd());
+  const env = makerEnvOption(parsed);
+  const skipConfirm = booleanOption(parsed, "skip_confirm");
+  const skipMcpInstall = booleanOption(parsed, "skip_mcp_install");
+  const pkg = stringOption(parsed, "package") || DEFAULT_PACKAGE;
+  emit(ctx, "init_start", "TapTap Maker local initialization started", {
+    target_dir: targetDir,
+    env
+  });
+  saveInitState(targetDir, {
+    status: "started",
+    target_dir: targetDir,
+    env
+  });
+  const git = ensureGitAvailable();
+  emit(ctx, "doctor", "Git is available", { version: git.version });
+  const pat = await resolvePat(parsed, ctx);
+  emit(ctx, "pat", "Maker PAT ready", { saved: getPatPath() });
+  const tapAuth = await requestTapAuthWithPat(pat);
+  emit(ctx, "tap_auth", "TapTap token exchanged and saved", {
+    kid: mask(tapAuth.kid),
+    saved: getTapAuthPath()
+  });
+  const projects = await listMakerProjects({ pat });
+  const selected = await resolveProjectSelection(parsed, projects, {
+    skipConfirm
+  });
+  emit(ctx, "app", "Maker app selected", {
+    app_id: selected.id,
+    name: selected.name,
+    user_id: selected.user_id
+  });
+  saveInitState(targetDir, {
+    status: "app_selected",
+    target_dir: targetDir,
+    env,
+    selected_app_id: selected.id
+  });
+  await prepareDevKit(targetDir, ctx);
+  const cloneResult = await cloneMakerProject({
+    appId: selected.id,
+    targetDir,
+    pat,
+    userId: selected.user_id,
+    sceEndpoint: selected.sce_endpoint || process.env.SCE_MCP_URL,
+    onProgress: (progress) => emitProgress(ctx, "clone", progress)
+  });
+  emit(ctx, "clone", "Maker project cloned or fetched", cloneResult);
+  if (!skipMcpInstall) {
+    const ides = parseIdeList(stringOption(parsed, "register_mcp") || "codex,cursor,claude");
+    const installResults = installMcpConfigs({
+      ides,
+      env,
+      pkg,
+      mcpName: DEFAULT_MCP_NAME
+    });
+    for (const result of installResults) {
+      emit(ctx, "mcp_install", result.message, result);
+    }
+  }
+  saveInitState(targetDir, {
+    status: "completed",
+    target_dir: targetDir,
+    env,
+    selected_app_id: selected.id
+  });
+  emit(ctx, "done", "TapTap Maker initialization completed", {
+    target_dir: targetDir,
+    app_id: selected.id,
+    next_step: "Restart or reload the AI client MCP session when you want MCP tools/resources to appear."
+  });
+}
+async function runDoctor(parsed, ctx) {
+  const targetDir = path8.resolve(stringOption(parsed, "target_dir") || process.cwd());
+  const git = checkGitEnvironment();
+  const pat = loadPat();
+  const tapAuth = loadTapAuth();
+  const identify = identifyMakerProject({ cwd: targetDir });
+  const devKit = inspectAiDevKit(identify.projectRoot || targetDir);
+  if (ctx.json) {
+    writeJson({
+      git,
+      auth: {
+        pat: Boolean(pat),
+        tap_auth: Boolean(tapAuth)
+      },
+      project: identify,
+      dev_kit: devKit
+    });
+    return;
+  }
+  process.stdout.write(
+    [
+      "TapTap Maker doctor",
+      "",
+      "Git",
+      formatGitEnvironmentStatus(git),
+      "",
+      "Auth",
+      `- pat: ${pat ? "found" : "missing"} (${getPatPath()})`,
+      `- tap_auth: ${tapAuth ? "found" : "missing"} (${getTapAuthPath()})`,
+      pat ? "" : `- pat_page: ${getMakerPatTokensUrl(makerEnvOption(parsed))}`,
+      "",
+      "Project",
+      `- target_dir: ${targetDir}`,
+      `- project_id: ${identify.projectId || "(none)"}`,
+      identify.configPath ? `- config: ${identify.configPath}` : "",
+      "",
+      "AI dev kit",
+      `- ready: ${devKit.ready ? "yes" : "no"}`,
+      `- missing_entries: ${devKit.missingEntries.join(", ") || "(none)"}`,
+      "",
+      formatMakerSkillStatus({ projectRoot: identify.projectRoot || targetDir }),
+      ""
+    ].filter(Boolean).join("\n")
+  );
+}
+async function runApps(parsed, ctx) {
+  const pat = stringOption(parsed, "pat");
+  if (pat) {
+    warnPatArgExposure();
+  }
+  const projects = await listMakerProjects({ pat });
+  if (ctx.json) {
+    writeJson(projects);
+    return;
+  }
+  process.stdout.write(`${formatProjectList2(projects)}
+`);
+}
+async function runPatSet(parsed, ctx) {
+  const pat = await resolvePatSet(parsed);
+  saveManualMakerPat(pat);
+  const tapAuth = await requestTapAuthWithPat(pat);
+  emit(ctx, "pat", "Maker PAT and TapTap token saved", {
+    pat_path: getPatPath(),
+    tap_auth_path: getTapAuthPath(),
+    kid: mask(tapAuth.kid)
+  });
+}
+async function resolvePatSet(parsed) {
+  if (booleanOption(parsed, "pat_stdin") || booleanOption(parsed, "pat_from_stdin")) {
+    const pat = fs7.readFileSync(0, "utf8").trim();
+    if (!pat) {
+      throw new Error("No PAT found on stdin.");
+    }
+    return pat;
+  }
+  const fromPositional = parsed.positionals[0];
+  const fromOption = stringOption(parsed, "pat");
+  if (fromPositional || fromOption) {
+    warnPatArgExposure();
+    return fromPositional || fromOption;
+  }
+  return promptRequired("PAT");
+}
+async function runMcpInstall(parsed, ctx) {
+  const ides = parseIdeList(stringOption(parsed, "ide") || stringOption(parsed, "ides") || "");
+  const results = installMcpConfigs({
+    ides: ides.length > 0 ? ides : ["codex", "cursor", "claude"],
+    env: makerEnvOption(parsed),
+    pkg: stringOption(parsed, "package") || DEFAULT_PACKAGE,
+    mcpName: stringOption(parsed, "name") || DEFAULT_MCP_NAME
+  });
+  if (ctx.json) {
+    writeJson(results);
+    return;
+  }
+  process.stdout.write(`${results.map((result) => result.message).join("\n")}
+`);
+}
+async function runMcpVerify(parsed, ctx) {
+  var _a2;
+  const mode = mcpVerifyModeOption(parsed);
+  const pkg = stringOption(parsed, "package") || DEFAULT_PACKAGE;
+  const command = mode === "npx" ? getNpxCliCommand(pkg) : getCurrentCliCommand();
+  const result = spawnSync4(command.command, [...command.args, "help"], {
+    encoding: "utf8"
+  });
+  const payload = {
+    mode,
+    package: mode === "npx" ? pkg : void 0,
+    command: formatShellCommand([command.command, ...command.args, "help"]),
+    status: result.status,
+    ok: result.status === 0,
+    stdout: result.stdout,
+    stderr: result.stderr,
+    error: (_a2 = result.error) == null ? void 0 : _a2.message
+  };
+  if (ctx.json) {
+    writeJson(payload);
+    return;
+  }
+  process.stdout.write(
+    [
+      payload.ok ? "✓ MCP config command can spawn taptap-maker" : "✗ MCP config command spawn failed",
+      `- mode: ${payload.mode}`,
+      `- command: ${payload.command}`,
+      mode === "npx" ? "- scope: verifies the npx command written by taptap-maker mcp install" : "- scope: verifies only the currently running CLI binary",
+      `- status: ${payload.status}`,
+      payload.error ? `- error: ${payload.error}` : "",
+      payload.stderr ? `- stderr:
+${indent2(payload.stderr)}` : "",
+      ""
+    ].filter(Boolean).join("\n")
+  );
+}
+async function runDevKitUpdate(parsed, ctx) {
+  const targetDir = path8.resolve(stringOption(parsed, "target_dir") || process.cwd());
+  const result = await installAiDevKit({
+    targetDir,
+    preserveExisting: true
+  });
+  finalizeStagedDevKitGitignore(targetDir);
+  emit(ctx, "dev_kit", "AI dev kit updated", result);
+}
+async function resolvePat(parsed, ctx) {
+  const fromArgs = stringOption(parsed, "pat");
+  if (fromArgs) {
+    warnPatArgExposure();
+    saveManualMakerPat(fromArgs);
+    return fromArgs;
+  }
+  const cached2 = loadPat();
+  if (cached2 == null ? void 0 : cached2.token) {
+    return cached2.token;
+  }
+  if (booleanOption(parsed, "skip_confirm")) {
+    throw new Error(
+      `Maker PAT missing. Create one at ${getMakerPatTokensUrl(makerEnvOption(parsed))}`
+    );
+  }
+  emit(ctx, "pat_required", "Maker PAT is required", {
+    pat_page: getMakerPatTokensUrl(makerEnvOption(parsed))
+  });
+  const pat = await promptRequired("Paste Maker PAT");
+  saveManualMakerPat(pat);
+  return pat;
+}
+async function resolveProjectSelection(parsed, projects, options) {
+  const appId = stringOption(parsed, "app_id") || parsed.positionals[0];
+  if (appId) {
+    return projects.find((project) => project.id === appId) || { id: appId };
+  }
+  if (projects.length === 0) {
+    throw new Error("No Maker apps found for this PAT.");
+  }
+  if (options.skipConfirm) {
+    throw new Error("Missing --app-id in non-interactive init mode.");
+  }
+  process.stdout.write(`${formatProjectList2(projects)}
+`);
+  const answer = await promptRequired("Choose app by index or app_id");
+  const byIndex = Number(answer);
+  if (Number.isInteger(byIndex) && byIndex >= 1 && byIndex <= projects.length) {
+    return projects[byIndex - 1];
+  }
+  const selected = projects.find((project) => project.id === answer.trim());
+  if (!selected) {
+    throw new Error(`Unknown Maker app selection: ${answer}`);
+  }
+  return selected;
+}
+async function prepareDevKit(targetDir, ctx) {
+  const before = inspectAiDevKit(targetDir);
+  if (before.ready) {
+    writeDevKitStagedGitignore(
+      path8.join(targetDir, DEV_KIT_GITIGNORE_STAGING_FILE),
+      listPresentDevKitManagedEntries(targetDir)
+    );
+    emit(ctx, "dev_kit", "AI dev kit already present", before);
+    return;
+  }
+  try {
+    const result = await installAiDevKit({ targetDir });
+    emit(ctx, "dev_kit", "AI dev kit prepared", result);
+  } catch (error2) {
+    emit(ctx, "dev_kit_warning", "AI dev kit preparation failed; clone will continue", {
+      error: error2 instanceof Error ? error2.message : String(error2)
+    });
+  }
+}
+function installMcpConfigs(options) {
+  return options.ides.map((ide) => installMcpConfig(ide, options));
+}
+function installMcpConfig(ide, options) {
+  try {
+    return installMcpConfigUnsafe(ide, options);
+  } catch (error2) {
+    return {
+      ide,
+      ok: false,
+      message: `✗ ${ide} MCP config update failed: ${error2 instanceof Error ? error2.message : String(error2)}`
+    };
+  }
+}
+function installMcpConfigUnsafe(ide, options) {
+  if (ide === "codex") {
+    const configPath = path8.join(os4.homedir(), ".codex", "config.toml");
+    mergeCodexMcpConfig(configPath, options);
+    return {
+      ide,
+      ok: true,
+      path: configPath,
+      message: `✓ Codex MCP config updated: ${configPath}`
+    };
+  }
+  if (ide === "cursor") {
+    const configPath = path8.join(os4.homedir(), ".cursor", "mcp.json");
+    mergeJsonMcpConfig(configPath, options);
+    return {
+      ide,
+      ok: true,
+      path: configPath,
+      message: `✓ Cursor MCP config updated: ${configPath}`
+    };
+  }
+  if (ide === "claude") {
+    const claudeResult = tryClaudeMcpAdd(options);
+    if (claudeResult.ok) {
+      return { ide, ok: true, message: "✓ Claude Code MCP config updated with claude mcp add" };
+    }
+    const configPath = path8.join(os4.homedir(), ".claude.json");
+    mergeJsonMcpConfig(configPath, options);
+    return {
+      ide,
+      ok: true,
+      path: configPath,
+      message: `✓ Claude fallback MCP config updated: ${configPath}`
+    };
+  }
+  return { ide, ok: false, message: `Skipped unknown IDE: ${ide}` };
+}
+function mergeJsonMcpConfig(configPath, options) {
+  backupIfExists(configPath);
+  const existing = readJsonObject(configPath);
+  const mcpServers = asObject(existing.mcpServers);
+  mcpServers[options.mcpName] = createJsonMcpServerConfig(options);
+  existing.mcpServers = mcpServers;
+  fs7.mkdirSync(path8.dirname(configPath), { recursive: true });
+  fs7.writeFileSync(configPath, `${JSON.stringify(existing, null, 2)}
+`, "utf8");
+}
+function mergeCodexMcpConfig(configPath, options) {
+  backupIfExists(configPath);
+  const existing = fs7.existsSync(configPath) ? fs7.readFileSync(configPath, "utf8") : "";
+  const sectionPattern = new RegExp(
+    `\\n?\\[mcp_servers\\."${escapeRegExp2(options.mcpName)}"(?:\\.[^\\]]+)?\\][\\s\\S]*?(?=\\n\\[(?!mcp_servers\\."${escapeRegExp2(options.mcpName)}"(?:\\.|\\]))|$)`,
+    "g"
+  );
+  const withoutOld = existing.replace(sectionPattern, "").trimEnd();
+  const command = getNpxCommand();
+  const section = [
+    `[mcp_servers."${options.mcpName}"]`,
+    `command = "${escapeToml(command)}"`,
+    `args = ["-y", "-p", "${escapeToml(options.pkg)}", "taptap-maker"]`,
+    "",
+    `[mcp_servers."${options.mcpName}".env]`,
+    `TAPTAP_MCP_ENV = "${options.env}"`,
+    ""
+  ].join("\n");
+  fs7.mkdirSync(path8.dirname(configPath), { recursive: true });
+  fs7.writeFileSync(configPath, [withoutOld, section].filter(Boolean).join("\n\n"), "utf8");
+}
+function tryClaudeMcpAdd(options) {
+  const command = process.platform === "win32" ? "claude.cmd" : "claude";
+  const result = spawnSync4(
+    command,
+    [
+      "mcp",
+      "add",
+      "--scope",
+      "user",
+      "--transport",
+      "stdio",
+      "--env",
+      `TAPTAP_MCP_ENV=${options.env}`,
+      options.mcpName,
+      "--",
+      getNpxCommand(),
+      "-y",
+      "-p",
+      options.pkg,
+      "taptap-maker"
+    ],
+    { encoding: "utf8" }
+  );
+  return { ok: result.status === 0 };
+}
+function createJsonMcpServerConfig(options) {
+  return {
+    command: getNpxCommand(),
+    args: ["-y", "-p", options.pkg, "taptap-maker"],
+    env: {
+      TAPTAP_MCP_ENV: options.env
+    }
+  };
+}
+function getCurrentCliCommand() {
+  if (process.argv[1]) {
+    return { command: process.execPath, args: [process.argv[1]] };
+  }
+  return { command: process.platform === "win32" ? "taptap-maker.cmd" : "taptap-maker", args: [] };
+}
+function getNpxCliCommand(pkg) {
+  return { command: getNpxCommand(), args: ["-y", "-p", pkg, "taptap-maker"] };
+}
+function getNpxCommand() {
+  return process.platform === "win32" ? "npx.cmd" : "npx";
+}
+function readJsonObject(filePath) {
+  if (!fs7.existsSync(filePath)) {
+    return {};
+  }
+  return JSON.parse(fs7.readFileSync(filePath, "utf8"));
+}
+function asObject(value) {
+  if (value && typeof value === "object" && !Array.isArray(value)) {
+    return value;
+  }
+  return {};
+}
+function backupIfExists(filePath) {
+  if (!fs7.existsSync(filePath)) {
+    return;
+  }
+  const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[-:]/g, "").replace(/\..+$/, "");
+  fs7.copyFileSync(filePath, `${filePath}.bak.${stamp}`);
+}
+function saveInitState(targetDir, state) {
+  fs7.mkdirSync(getMakerHome(), { recursive: true });
+  const key = crypto.createHash("sha256").update(path8.resolve(targetDir)).digest("hex").slice(0, 16);
+  fs7.writeFileSync(
+    path8.join(getMakerHome(), `init-state-${key}.json`),
+    `${JSON.stringify({ ...state, updated_at: (/* @__PURE__ */ new Date()).toISOString() }, null, 2)}
+`,
+    "utf8"
+  );
+}
+function formatProjectList2(projects) {
+  if (projects.length === 0) {
+    return "No Maker apps found.";
+  }
+  return [
+    `Maker apps (${projects.length})`,
+    "",
+    ...projects.map(
+      (project, index) => `${index + 1}. ${project.id}${project.name ? `  ${project.name}` : ""}${project.user_id ? `  user_id=${project.user_id}` : ""}${project.gameType ? `  gameType=${project.gameType}` : ""}${project.stage ? `  stage=${project.stage}` : ""}${project.lastConversationAt ? `  lastConversationAt=${project.lastConversationAt}` : ""}`
+    )
+  ].join("\n");
+}
+function emit(ctx, step, message, data) {
+  if (ctx.json) {
+    writeJson({ step, status: "ok", message, data });
+    return;
+  }
+  process.stdout.write(`${message}
+`);
+}
+function emitProgress(ctx, step, progress) {
+  if (ctx.json) {
+    writeJson({ step, status: "progress", progress });
+    return;
+  }
+  process.stdout.write(`- ${progress.phase || step}: ${progress.message}
+`);
+}
+function writeJson(value) {
+  process.stdout.write(`${JSON.stringify(value)}
+`);
+}
+async function promptRequired(label) {
+  if (!process.stdin.isTTY) {
+    throw new Error(`${label} is required in non-interactive mode.`);
+  }
+  const rl = readline.createInterface({ input, output });
+  try {
+    const answer = await rl.question(`${label}: `);
+    if (!answer.trim()) {
+      throw new Error(`${label} cannot be empty.`);
+    }
+    return answer.trim();
+  } finally {
+    rl.close();
+  }
+}
+function warnPatArgExposure() {
+  process.stderr.write(PAT_ARG_WARNING);
+}
+function formatUnknownCommand(command) {
+  if (command.length === 0) {
+    return "(empty)";
+  }
+  const [primary, secondary] = command;
+  if (!secondary) {
+    return primary;
+  }
+  return `${primary} ${isKnownSubcommand(primary, secondary) ? secondary : "<redacted>"}`;
+}
+function isKnownSubcommand(command, subcommand) {
+  return command === "pat" && subcommand === "set" || command === "mcp" && (subcommand === "install" || subcommand === "verify") || command === "dev-kit" && subcommand === "update";
+}
+function stringOption(parsed, key) {
+  const value = parsed.options[key];
+  return typeof value === "string" ? value : void 0;
+}
+function booleanOption(parsed, key) {
+  return parsed.options[key] === true || parsed.options[key] === "true";
+}
+function makerEnvOption(parsed) {
+  const env = stringOption(parsed, "env");
+  if (env === "rnd" || env === "production") {
+    return env;
+  }
+  return getMakerEnvironment();
+}
+function mcpVerifyModeOption(parsed) {
+  const mode = stringOption(parsed, "mode") || "npx";
+  if (mode === "npx" || mode === "self") {
+    return mode;
+  }
+  throw new Error("Invalid mcp verify --mode. Use npx or self.");
+}
+function parseIdeList(value) {
+  return value.split(",").map((item) => item.trim().toLowerCase()).filter(Boolean);
+}
+function mask(value) {
+  if (value.length <= 12) {
+    return "***";
+  }
+  return `${value.slice(0, 6)}...${value.slice(-4)}`;
+}
+function escapeRegExp2(value) {
+  return value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+}
+function escapeToml(value) {
+  return value.replace(/\\/g, "\\\\").replace(/"/g, '\\"');
+}
+function indent2(value) {
+  return value.split("\n").map((line) => `  ${line}`).join("\n");
+}
+function formatShellCommand(parts) {
+  return parts.map((part) => /\s/.test(part) ? `"${part.replace(/(["\\$`])/g, "\\$1")}"` : part).join(" ");
+}
+function printHelp() {
+  process.stdout.write(
+    [
+      "Usage:",
+      "  taptap-maker                         Start MCP server mode",
+      "  taptap-maker init [--env rnd|production] [--app-id ID] [--target-dir DIR] [--pat PAT]",
+      "                     [--skip-confirm] [--skip-mcp-install] [--register-mcp codex,cursor,claude]",
+      "                     [--package @taptap/instant-games-open-mcp] [--json]",
+      "  taptap-maker doctor [--target-dir DIR] [--env rnd|production] [--json]",
+      "  taptap-maker apps [--pat PAT] [--json]  # warns: PAT appears in ps/history",
+      "  taptap-maker pat set [--pat-stdin] [--json]",
+      "  taptap-maker pat set [PAT|--pat PAT] [--json]  # warns: PAT appears in ps/history",
+      "  taptap-maker mcp install [--ide codex,cursor,claude] [--env rnd|production]",
+      "                             [--package @taptap/instant-games-open-mcp] [--json]",
+      "  taptap-maker mcp verify [--package @taptap/instant-games-open-mcp]",
+      "                           [--mode npx|self] [--json]",
+      "  taptap-maker dev-kit update [--target-dir DIR] [--json]",
+      "",
+      "MCP verify defaults to the npx command written into AI client config.",
+      "",
+      "Windows note:",
+      "  Generated MCP configs use npx.cmd automatically on Windows.",
+      ""
+    ].join("\n")
+  );
+}
+function formatCliError(error2) {
+  if (error2 instanceof MakerGitNotFoundError) {
+    return error2.message;
+  }
+  return error2 instanceof Error ? error2.message : String(error2);
+}
+// src/maker/crashLog.ts
+import fs8 from "node:fs";
+import path9 from "node:path";
+var DEFAULT_MAX_BYTES = 1024 * 1024;
+var DEFAULT_MAX_ENTRY_BYTES = 16 * 1024;
+function appendMakerCrashLog(source, error2, options = {}) {
+  const makerHome = getMakerHome();
+  fs8.mkdirSync(makerHome, { recursive: true });
+  const logPath = path9.join(makerHome, "mcp-crash.log");
+  const maxBytes = positiveInteger(options.maxBytes) || resolveEnvBytes("TAPTAP_MAKER_CRASH_LOG_MAX_BYTES", DEFAULT_MAX_BYTES);
+  const maxEntryBytes = positiveInteger(options.maxEntryBytes) || resolveEnvBytes("TAPTAP_MAKER_CRASH_LOG_MAX_ENTRY_BYTES", DEFAULT_MAX_ENTRY_BYTES);
+  const message = error2 instanceof Error ? error2.stack || error2.message : String(error2);
+  const entry = truncateUtf8(
+    [`[${(/* @__PURE__ */ new Date()).toISOString()}] ${source}`, message, ""].join("\n"),
+    Math.min(maxEntryBytes, maxBytes)
+  );
+  const entryBytes = Buffer.byteLength(entry, "utf8");
+  rotateIfNeeded(logPath, maxBytes, entryBytes);
+  fs8.appendFileSync(logPath, entry, "utf8");
+}
+function rotateIfNeeded(logPath, maxBytes, incomingBytes) {
+  if (!fs8.existsSync(logPath)) {
+    return;
+  }
+  const currentBytes = fs8.statSync(logPath).size;
+  if (currentBytes + incomingBytes <= maxBytes) {
+    return;
+  }
+  const rotatedPath = `${logPath}.1`;
+  writeFileTail(logPath, rotatedPath, maxBytes);
+  fs8.writeFileSync(logPath, "", "utf8");
+}
+function writeFileTail(sourcePath, targetPath, maxBytes) {
+  const size = fs8.statSync(sourcePath).size;
+  const bytesToRead = Math.min(size, maxBytes);
+  const start = Math.max(0, size - bytesToRead);
+  const fd = fs8.openSync(sourcePath, "r");
+  try {
+    const buffer = Buffer.alloc(bytesToRead);
+    fs8.readSync(fd, buffer, 0, bytesToRead, start);
+    fs8.writeFileSync(targetPath, buffer);
+  } finally {
+    fs8.closeSync(fd);
+  }
+}
+function truncateUtf8(value, maxBytes) {
+  if (Buffer.byteLength(value, "utf8") <= maxBytes) {
+    return value;
+  }
+  const suffix = `
+[truncated to ${maxBytes} bytes]
+`;
+  const suffixBytes = Buffer.byteLength(suffix, "utf8");
+  const prefixBytes = Math.max(0, maxBytes - suffixBytes);
+  return `${Buffer.from(value, "utf8").subarray(0, prefixBytes).toString("utf8")}${suffix}`;
+}
+function resolveEnvBytes(key, fallback) {
+  return positiveInteger(Number(process.env[key])) || fallback;
+}
+function positiveInteger(value) {
+  return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.floor(value) : void 0;
+}
 // src/maker/index.ts
 installCrashLogging();
 async function main() {
@@ -31555,33 +31965,40 @@ async function main() {
     return;
   }
   if (command === "help" || command === "--help" || command === "-h") {
-    printHelp();
+    printHelp2();
     return;
   }
-  throw new Error(
-    `taptap-maker does not expose user CLI subcommands. Start it without arguments as an MCP server.`
-  );
+  await runMakerCli(process.argv.slice(2));
 }
-function printHelp() {
+function printHelp2() {
   process.stdout.write(
     [
       "Usage:",
       "  taptap-maker                         Start MCP server mode",
+      "  taptap-maker init [--env rnd|production] [--app-id ID] [--target-dir DIR] [--pat PAT]",
+      "                     [--skip-confirm] [--skip-mcp-install] [--register-mcp codex,cursor,claude]",
+      "                     [--package @taptap/instant-games-open-mcp] [--json]",
+      "  taptap-maker doctor [--target-dir DIR] [--env rnd|production] [--json]",
+      "  taptap-maker apps [--pat PAT] [--json]",
+      "  taptap-maker pat set [--pat-stdin] [--json]",
+      "  taptap-maker pat set [PAT|--pat PAT] [--json]  # warns: PAT appears in ps/history",
+      "  taptap-maker mcp install [--ide codex,cursor,claude] [--env rnd|production]",
+      "                             [--package @taptap/instant-games-open-mcp] [--json]",
+      "  taptap-maker mcp verify              Verify CLI spawn path",
+      "  taptap-maker dev-kit update [--target-dir DIR] [--json]",
       "  taptap-maker help                    Show this help",
       "",
-      "Normal Maker local development should use MCP tools:",
-      "  maker_exchange_pat, maker_list_apps, maker_clone_to_current_directory,",
-      "  maker_submit_current_directory, maker_build_current_directory.",
+      "Windows note:",
+      "  Generated MCP configs use npx.cmd automatically on Windows.",
       "",
-      "Advanced CLI subcommands still exist for maintainers and diagnostics,",
-      "but are not the default user onboarding path.",
+      "MCP server mode is still used by AI clients after configuration reload.",
       ""
     ].join("\n")
   );
 }
 main().catch((error2) => {
   logCrash("main.catch", error2);
-  process.stderr.write(`❌ ${error2 instanceof Error ? error2.message : String(error2)}
+  process.stderr.write(`❌ ${formatCliError(error2)}
 `);
   process.exit(1);
 });
@@ -31601,15 +32018,7 @@ function installCrashLogging() {
 }
 function logCrash(source, error2) {
   try {
-    const makerHome = getMakerHome();
-    fs7.mkdirSync(makerHome, { recursive: true });
-    const logPath = path8.join(makerHome, "mcp-crash.log");
-    const message = error2 instanceof Error ? error2.stack || error2.message : String(error2);
-    fs7.appendFileSync(
-      logPath,
-      [`[${(/* @__PURE__ */ new Date()).toISOString()}] ${source}`, message, ""].join("\n"),
-      "utf8"
-    );
+    appendMakerCrashLog(source, error2);
   } catch {
   }
 }