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

package/dist/maker.js

@@ -28711,6 +28711,14 @@ var DEV_KIT_IGNORE_BEGIN = "# >>> TapTap Maker AI dev kit (local only) >>>";
 var DEV_KIT_IGNORE_END = "# <<< TapTap Maker AI dev kit (local only) <<<";
 var DEV_KIT_GITIGNORE_STAGING_FILE = ".gitignore.dev-kit-before-clone";
 var DEV_KIT_REQUIRED_ENTRIES = ["CLAUDE.md", "examples", "templates", "urhox-libs"];
+var DEV_KIT_MANAGED_ENTRY_CANDIDATES = [
+  ".emmylua",
+  "CLAUDE.md",
+  "engine-docs",
+  "examples",
+  "templates",
+  "urhox-libs"
+];
 var SKIPPED_TOP_LEVEL_ENTRIES = /* @__PURE__ */ new Set(["scripts", ".DS_Store", "ai-dev-kit.zip"]);
 function inspectAiDevKit(targetDir) {
   const resolvedTargetDir = path4.resolve(targetDir);
@@ -28728,6 +28736,12 @@ function inspectAiDevKit(targetDir) {
     ready: missingEntries.length === 0
   };
 }
+function listPresentDevKitManagedEntries(targetDir) {
+  const resolvedTargetDir = path4.resolve(targetDir);
+  return DEV_KIT_MANAGED_ENTRY_CANDIDATES.filter(
+    (entry) => fs3.existsSync(path4.join(resolvedTargetDir, entry))
+  );
+}
 async function installAiDevKit(options = {}) {
   const targetDir = path4.resolve(options.targetDir || ".");
   fs3.mkdirSync(targetDir, { recursive: true });
@@ -28824,7 +28838,7 @@ async function downloadAndExtractDevKit(url2) {
 }
 function extractZip(zipPath, targetDir) {
   if (process.platform === "win32") {
-    const result2 = spawnSync2(
+    const result = spawnSync2(
       "powershell.exe",
       [
         "-NoProfile",
@@ -28838,15 +28852,52 @@ function extractZip(zipPath, targetDir) {
       ],
       { encoding: "utf8" }
     );
-    if (result2.status !== 0) {
-      throw new Error(`Failed to extract AI dev kit zip: ${result2.stderr || result2.stdout}`);
+    if (result.status !== 0) {
+      throw new Error(`Failed to extract AI dev kit zip: ${formatSpawnFailure(result)}`);
     }
     return;
   }
-  const result = spawnSync2("unzip", ["-q", zipPath, "-d", targetDir], { encoding: "utf8" });
-  if (result.status !== 0) {
-    throw new Error(`Failed to extract AI dev kit zip: ${result.stderr || result.stdout}`);
+  const unzipResult = spawnSync2("unzip", ["-q", zipPath, "-d", targetDir], { encoding: "utf8" });
+  if (unzipResult.status === 0) {
+    return;
+  }
+  const pythonFailures = [];
+  for (const pythonCommand of ["python3", "python"]) {
+    const pythonResult = spawnSync2(
+      pythonCommand,
+      ["-c", PYTHON_ZIP_EXTRACT_SCRIPT, zipPath, targetDir],
+      { encoding: "utf8" }
+    );
+    if (pythonResult.status === 0) {
+      return;
+    }
+    pythonFailures.push(`${pythonCommand}: ${formatSpawnFailure(pythonResult)}`);
   }
+  throw new Error(
+    [
+      `Failed to extract AI dev kit zip: unzip: ${formatSpawnFailure(unzipResult)}`,
+      ...pythonFailures
+    ].join("; ")
+  );
+}
+var PYTHON_ZIP_EXTRACT_SCRIPT = String.raw`
+import os
+import sys
+import zipfile
+
+zip_path = sys.argv[1]
+target_dir = os.path.abspath(sys.argv[2])
+
+with zipfile.ZipFile(zip_path) as archive:
+    for member in archive.infolist():
+        destination = os.path.abspath(os.path.join(target_dir, member.filename))
+        if os.path.commonpath([target_dir, destination]) != target_dir:
+            raise RuntimeError("Blocked unsafe zip entry: " + member.filename)
+    archive.extractall(target_dir)
+`;
+function formatSpawnFailure(result) {
+  var _a2;
+  return ((_a2 = result.error) == null ? void 0 : _a2.message) || String(result.stderr || "").trim() || String(result.stdout || "").trim() || `exit status ${result.status ?? "unknown"}`;
 }
 function resolveDevKitRoot(sourceDir) {
   const directEntries = fs3.existsSync(sourceDir) ? fs3.readdirSync(sourceDir) : [];
@@ -29008,7 +29059,7 @@ async function cloneMakerProject(options) {
   let authUrl = makeAuthenticatedGitUrl(gitUrl, pat.token);
   let retriedWithNewPat = false;
   let transientRetries = 0;
-  if (isGitRepo(target) && hasGitHead(target)) {
+  if (isOwnGitRoot(target) && hasGitHead(target)) {
     (_d = options.onProgress) == null ? void 0 : _d.call(options, {
       progress: 10,
       total: 100,
@@ -29061,7 +29112,7 @@ async function cloneMakerProject(options) {
       warnings
     };
   }
-  if (isGitRepo(target)) {
+  if (isOwnGitRoot(target)) {
     warnings.push(
       "Target directory already contained git metadata but no checked-out commit. Maker MCP will fetch and check out the remote Maker project branch before reporting success."
     );
@@ -29107,6 +29158,7 @@ async function cloneMakerProject(options) {
   }
   try {
     ensureGitHeadCheckedOut(target);
+    ensureOwnGitRoot(target);
   } catch (error2) {
     throw withPreCloneWarnings(error2, warnings);
   }
@@ -29140,14 +29192,9 @@ async function pushMakerProject(options) {
     phase: "prepare",
     message: "Preparing Maker project push"
   });
-  const cwd = path5.resolve(options.cwd);
-  if (!isGitRepo(cwd)) {
-    throw new Error(`${cwd} is not a git repository.`);
-  }
-  const configPath = path5.join(cwd, ".maker-mcp", "config.json");
-  if (!fs4.existsSync(configPath)) {
-    throw new Error(`${cwd} is not bound to a Maker project. .maker-mcp/config.json is missing.`);
-  }
+  const requestedCwd = path5.resolve(options.cwd);
+  const workspace = resolveUsableMakerGitWorkspace(requestedCwd);
+  const cwd = workspace.projectRoot;
   const project = loadProjectConfig(cwd);
   if (!(project == null ? void 0 : project.project_id)) {
     throw new Error(`${cwd} Maker project config does not contain project_id.`);
@@ -29168,7 +29215,8 @@ async function pushMakerProject(options) {
   });
   const statusBefore = await readGit(["status", "--porcelain"], cwd);
   const branch = await currentBranch(cwd, options.branch);
-  if (!statusBefore.trim() && !options.allowEmpty) {
+  const unpushed = await readUnpushedCommitState(cwd, branch);
+  if (!statusBefore.trim() && !options.allowEmpty && !unpushed.hasUnpushedCommits) {
     (_c = options.onProgress) == null ? void 0 : _c.call(options, {
       progress: 100,
       total: 100,
@@ -29183,7 +29231,12 @@ async function pushMakerProject(options) {
       status: "clean"
     };
   }
-  if ((_d = options.files) == null ? void 0 : _d.length) {
+  let committed = false;
+  let commitHash;
+  let message;
+  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) {
     (_e = options.onProgress) == null ? void 0 : _e.call(options, {
       progress: 20,
       total: 100,
@@ -29199,33 +29252,31 @@ async function pushMakerProject(options) {
       message: "Staging all local changes"
     });
     await runGit(["add", "-A"], { cwd });
-  }
-  const staged = await readGit(["diff", "--cached", "--name-only"], cwd);
-  let committed = false;
-  let commitHash;
-  const message = options.message || generateCommitMessage(statusBefore);
-  if (staged.trim() || options.allowEmpty) {
-    (_g = options.onProgress) == null ? void 0 : _g.call(options, {
-      progress: 45,
-      total: 100,
-      phase: "commit",
-      message: "Creating local Maker project commit"
-    });
-    await runGit(
-      [
-        "-c",
-        "user.email=maker-mcp@local",
-        "-c",
-        "user.name=taptap-maker",
-        "commit",
-        ...options.allowEmpty ? ["--allow-empty"] : [],
-        "-m",
-        message
-      ],
-      { cwd }
-    );
-    committed = true;
-    commitHash = (await readGit(["rev-parse", "--short", "HEAD"], cwd)).trim();
+    const staged = await readGit(["diff", "--cached", "--name-only"], cwd);
+    message = options.message || generateCommitMessage(statusBefore);
+    if (staged.trim() || options.allowEmpty) {
+      (_g = options.onProgress) == null ? void 0 : _g.call(options, {
+        progress: 45,
+        total: 100,
+        phase: "commit",
+        message: "Creating local Maker project commit"
+      });
+      await runGit(
+        [
+          "-c",
+          "user.email=maker-mcp@local",
+          "-c",
+          "user.name=taptap-maker",
+          "commit",
+          ...options.allowEmpty ? ["--allow-empty"] : [],
+          "-m",
+          message
+        ],
+        { cwd }
+      );
+      committed = true;
+      commitHash = (await readGit(["rev-parse", "--short", "HEAD"], cwd)).trim();
+    }
   }
   try {
     (_h = options.onProgress) == null ? void 0 : _h.call(options, {
@@ -29243,7 +29294,7 @@ async function pushMakerProject(options) {
       commitHash,
       message,
       pushed: false,
-      status: committed ? "failed_after_commit" : "clean",
+      status: committed || unpushed.hasUnpushedCommits ? "failed_after_commit" : "clean",
       failure,
       ahead: await readAheadState(cwd)
     };
@@ -29265,28 +29316,23 @@ async function pushMakerProject(options) {
 }
 async function readMakerProjectLocalChanges(cwd) {
   ensureGitAvailable();
-  const requestedDir = path5.resolve(cwd);
-  if (!isGitRepo(requestedDir)) {
-    throw new Error(`${requestedDir} is not a git repository.`);
-  }
-  const projectRoot = (await readGit(["rev-parse", "--show-toplevel"], requestedDir)).trim();
-  const configPath = path5.join(projectRoot, ".maker-mcp", "config.json");
-  if (!fs4.existsSync(configPath)) {
-    throw new Error(
-      `${projectRoot} is not bound to a Maker project. .maker-mcp/config.json is missing.`
-    );
-  }
+  const { projectRoot } = resolveUsableMakerGitWorkspace(cwd);
   const rawStatus = await readGit(["status", "--porcelain", "-z"], projectRoot);
-  const files = parseGitStatusFiles(rawStatus).filter(
-    (file2) => file2 !== ".maker-mcp" && !file2.startsWith(".maker-mcp/")
-  );
+  const files = parseGitStatusFiles(rawStatus).filter((file2) => !isIgnoredBuildGuardChange(file2));
+  const branch = await currentBranch(projectRoot);
+  const unpushed = await readUnpushedCommitState(projectRoot, branch);
   return {
-    hasChanges: files.length > 0,
+    hasChanges: files.length > 0 || unpushed.hasUnpushedCommits,
     projectRoot,
     files,
-    rawStatus
+    rawStatus,
+    hasUnpushedCommits: unpushed.hasUnpushedCommits,
+    ahead: unpushed.ahead
   };
 }
+function isIgnoredBuildGuardChange(file2) {
+  return file2 === ".gitignore" || file2 === ".maker-mcp" || file2.startsWith(".maker-mcp/");
+}
 function ensureTargetCanBindApp(target, appId) {
   const existingConfig = loadProjectConfig(target);
   if (!(existingConfig == null ? void 0 : existingConfig.project_id) || existingConfig.project_id === appId) {
@@ -29342,6 +29388,28 @@ async function readAheadState(cwd) {
     return void 0;
   }
 }
+async function readUnpushedCommitState(cwd, branch) {
+  const remoteRef = `origin/${branch}`;
+  try {
+    const countText = await readGit(["rev-list", "--count", `${remoteRef}..HEAD`], cwd);
+    const count = Number.parseInt(countText.trim(), 10);
+    if (Number.isFinite(count) && count > 0) {
+      return {
+        hasUnpushedCommits: true,
+        ahead: `${remoteRef}..HEAD (${count} commit${count === 1 ? "" : "s"})`
+      };
+    }
+  } catch {
+  }
+  const status = await readAheadState(cwd);
+  if (status && /\bahead\s+\d+/i.test(status)) {
+    return {
+      hasUnpushedCommits: true,
+      ahead: status
+    };
+  }
+  return { hasUnpushedCommits: false, ahead: status };
+}
 function toMakerGitFailure(error2, stage) {
   if (error2 instanceof MakerGitError) {
     return error2.failure;
@@ -29399,13 +29467,13 @@ function nextActionForFailure(classification) {
     case "auth":
       return "刷新 Maker PAT 后重试 maker_submit_current_directory；如果仍失败，请确认 PAT 是否过期或缺少 Maker git 权限。";
     case "remote_transient":
-      return "远端 Maker git 服务临时不可用。不要重新提交，稍后直接重试 maker_submit_current_directory。";
+      return "远端 Maker git 服务临时不可用。本地 commit 会保留；不要手动执行通用 git push，稍后直接重试 maker_submit_current_directory，或在构建重试时调用 maker_build_current_directory 并设置 submit_local_changes_before_build=true。";
     case "remote_rejected":
-      return "远端已有新提交。不要新建分支或要任务号，先询问用户是否 pull/rebase 当前 Maker 远端变更，再重试 push。";
+      return "远端已有新提交。不要新建分支、不要要任务号、不要手动执行通用 git push；先询问用户是否 pull/rebase 当前 Maker 远端变更，再重试 maker_submit_current_directory。";
     case "local":
       return "本地目录或权限异常。检查当前目录是否是 Maker git repo，以及 Codex 是否有目录写权限。";
     default:
-      return "保留本地提交，不要重复提交；把错误详情反馈给用户，并在确认后重试 push。";
+      return "保留本地提交，不要重复提交；把错误详情反馈给用户，并在确认后重试 maker_submit_current_directory。";
   }
 }
 function pushGit(args, cwd, onProgress) {
@@ -29667,12 +29735,139 @@ async function assertNoCheckoutFileConflicts(cwd, branch) {
 async function setOrigin(cwd, authUrl) {
   await runGit(["remote", "get-url", "origin"], { cwd, quiet: true }).then(() => runGit(["remote", "set-url", "origin", authUrl], { cwd, quiet: true })).catch(() => runGit(["remote", "add", "origin", authUrl], { cwd, quiet: true }));
 }
-function isGitRepo(repoDir) {
+function isOwnGitRoot(repoDir) {
+  const status = inspectMakerDirectoryGitStatus(repoDir);
+  return status.isOwnGitRoot;
+}
+function ensureOwnGitRoot(repoDir) {
+  const status = inspectMakerDirectoryGitStatus(repoDir);
+  if (status.isOwnGitRoot) {
+    return;
+  }
+  throw new Error(
+    [
+      "Maker project checkout did not create an independent Git repository.",
+      `target_dir: ${status.targetDir}`,
+      status.gitRoot ? `detected_git_root: ${status.gitRoot}` : "",
+      "A Maker project directory must have its own .git directory. Parent Git repositories must not be reused."
+    ].filter(Boolean).join("\n")
+  );
+}
+function inspectMakerDirectoryGitStatus(cwd) {
+  const targetDir = path5.resolve(cwd);
+  const gitRoot = resolveGitRoot(targetDir);
+  const gitDir = resolveGitDir(targetDir);
+  const makerBinding = findMakerProjectBinding(targetDir);
+  const isGitWorkTree = Boolean(gitRoot);
+  const isOwnGitRoot2 = Boolean(gitRoot && samePath(gitRoot, targetDir));
+  const isUsableMakerGitRepo = Boolean(
+    (makerBinding == null ? void 0 : makerBinding.projectRoot) && gitRoot && samePath(makerBinding.projectRoot, gitRoot)
+  );
+  let issue2;
+  let message;
+  if (makerBinding && gitRoot && !samePath(makerBinding.projectRoot, gitRoot)) {
+    issue2 = "inside_parent_git_repo";
+    message = [
+      `${makerBinding.projectRoot} contains Maker binding config, but Git root is ${gitRoot}.`,
+      "The Maker directory must be an independent Git repository before build or submit."
+    ].join(" ");
+  } else if (makerBinding && !gitRoot) {
+    issue2 = "missing_git_repo";
+    message = `${makerBinding.projectRoot} is bound to Maker but is not a Git repository.`;
+  } else if (!makerBinding) {
+    issue2 = "missing_maker_config";
+    message = `${targetDir} is not bound to a Maker project. .maker-mcp/config.json is missing.`;
+  }
+  return {
+    targetDir,
+    gitRoot,
+    gitDir,
+    makerProjectRoot: makerBinding == null ? void 0 : makerBinding.projectRoot,
+    configPath: makerBinding == null ? void 0 : makerBinding.configPath,
+    isGitWorkTree,
+    isOwnGitRoot: isOwnGitRoot2,
+    isUsableMakerGitRepo,
+    issue: issue2,
+    message
+  };
+}
+function resolveUsableMakerGitWorkspace(cwd) {
+  const status = inspectMakerDirectoryGitStatus(cwd);
+  if (!status.makerProjectRoot || !status.configPath) {
+    throw new Error(status.message || `${status.targetDir} is not bound to a Maker project.`);
+  }
+  if (!status.gitRoot) {
+    throw new Error(
+      [
+        `${status.makerProjectRoot} is bound to a Maker project but is not a Git repository.`,
+        "The Maker project directory must be an independent Git repository before build or submit."
+      ].join("\n")
+    );
+  }
+  if (!samePath(status.makerProjectRoot, status.gitRoot)) {
+    throw new Error(formatMakerGitRootMismatch(status));
+  }
+  return {
+    projectRoot: status.makerProjectRoot,
+    configPath: status.configPath,
+    gitRoot: status.gitRoot
+  };
+}
+function formatMakerGitRootMismatch(status) {
+  return [
+    `${status.makerProjectRoot} must be an independent Git repository before build or submit.`,
+    "",
+    `maker_project_root: ${status.makerProjectRoot}`,
+    `git_root: ${status.gitRoot || "(none)"}`,
+    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."
+  ].filter(Boolean).join("\n");
+}
+function findMakerProjectBinding(startDir) {
+  var _a2;
+  let current = path5.resolve(startDir);
+  while (current.length > 0) {
+    const configPath = getProjectConfigPath(current);
+    if (fs4.existsSync(configPath) && ((_a2 = loadProjectConfig(current)) == null ? void 0 : _a2.project_id)) {
+      return {
+        projectRoot: current,
+        configPath
+      };
+    }
+    const parent = path5.dirname(current);
+    if (parent === current) {
+      return null;
+    }
+    current = parent;
+  }
+  return null;
+}
+function resolveGitRoot(cwd) {
   try {
-    const gitDir = readGitSync(["-C", repoDir, "rev-parse", "--git-dir"]);
-    return gitDir.trim().length > 0;
+    return path5.resolve(readGitSync(["-C", cwd, "rev-parse", "--show-toplevel"]).trim());
   } catch {
-    return false;
+    return void 0;
+  }
+}
+function resolveGitDir(cwd) {
+  try {
+    const gitDir = readGitSync(["-C", cwd, "rev-parse", "--git-dir"]).trim();
+    return path5.isAbsolute(gitDir) ? path5.resolve(gitDir) : path5.resolve(cwd, gitDir);
+  } catch {
+    return void 0;
+  }
+}
+function samePath(left, right) {
+  return normalizePathForCompare(left) === normalizePathForCompare(right);
+}
+function normalizePathForCompare(value) {
+  const resolved = path5.resolve(value);
+  try {
+    return fs4.realpathSync.native(resolved);
+  } catch {
+    return resolved;
   }
 }
 function hasGitHead(repoDir) {
@@ -30031,14 +30226,23 @@ function getBundledSkillSourceDir(skillName) {
 }
 
 // src/maker/server/mcp.ts
-var VERSION = true ? "1.23.0" : "dev";
+var VERSION = true ? "1.23.2" : "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;
+var MakerCloneFailedError = class extends Error {
+  constructor(targetDir, originalError) {
+    const message = originalError instanceof Error ? originalError.message : String(originalError);
+    super(message);
+    this.name = "MakerCloneFailedError";
+    this.targetDir = targetDir;
+    this.originalError = originalError;
+  }
+};
 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 lists available Maker apps.",
+    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: {
@@ -30052,7 +30256,7 @@ var tools = [
   },
   {
     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 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.",
+    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: {
@@ -30065,7 +30269,7 @@ var tools = [
   },
   {
     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 MCP process cwd differs from the user current working directory, pass target_dir with the user current working directory.",
+    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.",
     inputSchema: {
       type: "object",
       properties: {
@@ -30238,7 +30442,12 @@ async function startMakerMcpServer() {
         let nextText;
         try {
           const projects = await listMakerProjects({ pat: args.manual_pat });
-          nextText = ["已自动列出可用 Maker Apps：", "", formatProjectList(projects)].join("\n");
+          nextText = [
+            "已自动列出可用 Maker Apps。",
+            "当前目录未绑定时，请逐项展示下面完整列表，不要只总结数量；然后让用户选择编号或 app_id。",
+            "",
+            formatProjectList(projects)
+          ].join("\n");
         } catch (error2) {
           nextText = [
             "自动列出 Maker Apps 失败。",
@@ -30284,13 +30493,23 @@ async function startMakerMcpServer() {
           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;
+        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({
@@ -30299,14 +30518,45 @@ async function startMakerMcpServer() {
             phase: "dev_kit",
             message: "Preparing local AI dev kit before Maker clone"
           });
-          devKitResult = await installAiDevKit({
-            targetDir
-          });
+          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: "Local AI dev kit prepared"
+            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,
@@ -30319,7 +30569,7 @@ async function startMakerMcpServer() {
           progressSummary = progressReporter.finish();
         } catch (error2) {
           progressReporter.finish();
-          throw error2;
+          throw new MakerCloneFailedError(targetDir, error2);
         }
         return {
           content: [
@@ -30333,7 +30583,11 @@ async function startMakerMcpServer() {
                 `- target_dir: ${result.targetDir}`,
                 `- status: ${result.status}`,
                 `- retried_with_new_pat: ${result.retriedWithNewPat ? "yes" : "no"}`,
-                "- ai_dev_kit: prepared",
+                `- 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),
@@ -30433,6 +30687,7 @@ async function formatStatus(options = {}) {
   var _a2;
   const targetDir = resolveMakerToolTargetDir(options.targetDir);
   const identify = identifyMakerProject({ cwd: targetDir });
+  const gitDirectoryStatus = inspectMakerDirectoryGitStatus(targetDir);
   const pat = loadPat();
   let tapAuth = loadTapAuth();
   const makerPatTokensUrl = getMakerPatTokensUrl();
@@ -30459,7 +30714,7 @@ async function formatStatus(options = {}) {
     "目标目录已绑定 Maker 项目。",
     "请继续在当前绑定项目上执行状态、提交、构建等操作；不要再引导用户 clone，除非用户明确要求切换或重新拉取项目。",
     "本地 Maker 工作流请优先参考 taptap-maker-local skill；MCP tools 只负责保存 PAT、列 app、clone、submit 和 build 等机器动作。"
-  ].join("\n") : pat ? await formatAutoProjectListFromPat() : formatIdentifyHint();
+  ].join("\n") : isLikelyAiDialogueDirectory(targetDir) ? formatAiDialogueDirectoryHint(targetDir) : pat ? await formatAutoProjectListFromPat() : formatIdentifyHint();
   return [
     "TapTap Maker MCP status",
     "",
@@ -30476,6 +30731,8 @@ async function formatStatus(options = {}) {
     "",
     formatGitEnvironmentStatus(git),
     "",
+    formatMakerGitDirectoryStatus(gitDirectoryStatus),
+    "",
     pat ? "" : ["Auth next step", "", `Maker PAT 缺失。PAT 页面：${makerPatTokensUrl}`].join("\n"),
     "",
     tapAuthRefreshText,
@@ -30487,6 +30744,41 @@ async function formatStatus(options = {}) {
     projectSection
   ].filter(Boolean).join("\n");
 }
+function formatMakerGitDirectoryStatus(status) {
+  return [
+    "Maker Git directory",
+    "",
+    `- status: ${status.isUsableMakerGitRepo ? "ready" : status.issue || "unbound"}`,
+    `- target_dir: ${status.targetDir}`,
+    status.makerProjectRoot ? `- maker_project_root: ${status.makerProjectRoot}` : "",
+    status.gitRoot ? `- git_root: ${status.gitRoot}` : "- git_root: (none)",
+    status.gitDir ? `- git_dir: ${status.gitDir}` : "",
+    `- target_is_git_root: ${status.isOwnGitRoot ? "yes" : "no"}`,
+    `- usable_for_build_submit: ${status.isUsableMakerGitRepo ? "yes" : "no"}`,
+    status.message ? `- warning: ${status.message}` : "",
+    status.issue === "inside_parent_git_repo" ? "- recommendation: 当前目录位于外层 Git 仓库下，但不是独立 Maker Git 仓库；建议新开独立目录重新 clone，或重新执行 clone 让当前目录创建自己的 .git。" : ""
+  ].filter(Boolean).join("\n");
+}
+function isLikelyAiDialogueDirectory(targetDir) {
+  const normalized = targetDir.replace(/\\/g, "/").toLowerCase();
+  if (normalized.includes("/xdt-maker/dialogues/")) {
+    return true;
+  }
+  return /(^|\/)dialogues\/\d{4}-\d{2}-\d{2}\/[0-9a-f]{8}-[0-9a-f-]{13,}$/i.test(normalized);
+}
+function formatAiDialogueDirectoryHint(targetDir) {
+  return [
+    "AI client workspace selection",
+    "",
+    `- current_target_dir: ${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_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");
+}
 function resolveMakerToolTargetDir(targetDir) {
   if (targetDir) {
     return path7.resolve(targetDir);
@@ -30546,7 +30838,7 @@ async function formatAutoProjectListFromPat() {
     const projects = await listMakerProjects();
     return [
       "本地已有 Maker PAT，当前目录尚未绑定 Maker 项目。",
-      "当前目录未绑定时，可从下面的 Maker Apps 中选择一个进行 clone；选择、解释和 clone 顺序请参考 taptap-maker-local skill。",
+      "当前目录未绑定时，必须逐项展示下面完整 Maker Apps 列表，不要只总结数量；选择、解释和 clone 顺序请参考 taptap-maker-local skill。",
       "",
       formatProjectList(projects)
     ].join("\n");
@@ -30575,6 +30867,8 @@ function formatProjectList(projects) {
   return [
     "Maker apps",
     "",
+    "请把下面每一个 app 条目展示给用户，不要只说共有多少个。",
+    "",
     ...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.createdAt ? `  createdAt=${project.createdAt}` : ""}${project.lastConversationAt ? `  lastConversationAt=${project.lastConversationAt}` : ""}`
     ),
@@ -30603,6 +30897,33 @@ function formatCloneWarnings(warnings) {
     ""
   ];
 }
+function formatClonePartialStateLines(targetDir) {
+  const resolvedTargetDir = path7.resolve(targetDir);
+  const identify = identifyMakerProject({ cwd: resolvedTargetDir });
+  const gitStatus = inspectMakerDirectoryGitStatus(resolvedTargetDir);
+  const devKitStatus = inspectAiDevKit(resolvedTargetDir);
+  const stagedDevKitGitignorePath = path7.join(resolvedTargetDir, DEV_KIT_GITIGNORE_STAGING_FILE);
+  const projectBound = Boolean(identify.projectId);
+  const gitInitialized = Boolean(
+    gitStatus.isOwnGitRoot || fs6.existsSync(path7.join(resolvedTargetDir, ".git"))
+  );
+  const safeToRetry = !projectBound;
+  return [
+    "partial_state:",
+    `- target_dir: ${resolvedTargetDir}`,
+    `- git_initialized: ${gitInitialized ? "yes" : "no"}`,
+    gitStatus.gitRoot ? `- git_root: ${gitStatus.gitRoot}` : "- git_root: (none)",
+    `- target_is_git_root: ${gitStatus.isOwnGitRoot ? "yes" : "no"}`,
+    `- project_bound: ${projectBound ? "yes" : "no"}`,
+    identify.projectId ? `- project_id: ${identify.projectId}` : "",
+    identify.configPath ? `- config: ${identify.configPath}` : "",
+    `- ai_dev_kit_present: ${devKitStatus.ready ? "yes" : "no"}`,
+    `- 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。"
+  ].filter(Boolean);
+}
 function createRemoteProxyContext(options) {
   const identify = identifyMakerProject({ cwd: options.targetDir });
   if (!identify.projectRoot || !identify.projectId) {
@@ -30812,7 +31133,12 @@ async function buildCurrentDirectory(options) {
         buildLocalChangesPolicy
       };
     }
-    throw new Error(formatLocalChangesBeforeBuildMessage(localChanges.files));
+    throw new Error(
+      formatLocalChangesBeforeBuildMessage(localChanges.files, {
+        ahead: localChanges.ahead,
+        hasUnpushedCommits: localChanges.hasUnpushedCommits
+      })
+    );
   }
   return runRemoteBuildCurrentDirectory(options, options.targetDir);
 }
@@ -30922,7 +31248,7 @@ function toMakerBuildFailure(error2) {
     ...error2 instanceof Error && error2.stack ? { stack: error2.stack } : {}
   };
 }
-function formatLocalChangesBeforeBuildMessage(files) {
+function formatLocalChangesBeforeBuildMessage(files, options = {}) {
   const visibleFiles = files.slice(0, 20);
   const hiddenCount = Math.max(0, files.length - visibleFiles.length);
   return [
@@ -30933,10 +31259,14 @@ function formatLocalChangesBeforeBuildMessage(files) {
     "- 提交本地改动并触发构建（以后都是如此）：再次调用 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`] : []
-  ].join("\n");
+  ].filter((line) => line !== "").join("\n");
 }
 function createBuildArgs(projectRoot, options) {
   const buildArgs = {};
@@ -31009,7 +31339,12 @@ function formatBuildResult(result, progressSummary) {
       ...formatProgressSummary(progressSummary),
       "",
       "note: Maker build was not started because submit did not produce a pushed state.",
-      ...result.submitResult.failure ? ["", ...formatMakerFailureLines(result.submitResult.failure)] : []
+      ...result.submitResult.failure ? [
+        "",
+        ...formatPushRecoveryLines(result.submitResult),
+        "",
+        ...formatMakerFailureLines(result.submitResult.failure)
+      ] : []
     ].filter(Boolean).join("\n");
   }
   if (result.mode === "build_failed_after_submit") {
@@ -31114,7 +31449,29 @@ function formatPushResult(targetDir, result, progressSummary) {
       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, "", ...formatMakerFailureLines(submitResult.failure)].filter(Boolean).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 [];
+  }
+  return [
+    "push_recovery:",
+    "- 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",
+    "- do_not_use_generic_git_push: yes",
+    "- user_message: 本地提交已经保留，但还没推送到 Maker 远端；直接重试 Maker 提交/构建工具即可。"
+  ].filter(Boolean);
 }
 function formatMakerBuildFailureLines(failure) {
   return [
@@ -31154,6 +31511,24 @@ function formatToolException(toolName, error2) {
       "next_action: 请只引导用户安装 Git；在 `git --version` 可用之前，不要继续调用 clone、fetch、commit 或 push。"
     ].join("\n");
   }
+  if (error2 instanceof MakerCloneFailedError) {
+    const original = error2.originalError;
+    const originalStack = original instanceof Error ? original.stack : void 0;
+    return [
+      "✗ Maker MCP tool failed",
+      "",
+      `- tool: ${toolName}`,
+      `- error_name: ${original instanceof Error ? original.name : typeof original}`,
+      `- message: ${message}`,
+      "",
+      ...formatClonePartialStateLines(error2.targetDir),
+      "",
+      "debug:",
+      originalStack ? indent(originalStack) : indent(message),
+      "",
+      "next_action: 请根据 partial_state 判断是否直接重试；不要删除用户文件。若用户不懂目录状态，优先建议新建独立目录重新 clone。"
+    ].join("\n");
+  }
   return [
     "✗ Maker MCP tool failed",
     "",

package/dist/proxy.js

@@ -29137,7 +29137,7 @@ var LogWriter = class {
 };
 
 // src/mcp-proxy/proxy.ts
-var VERSION = true ? "1.23.0" : "dev";
+var VERSION = true ? "1.23.2" : "dev";
 var TapTapMCPProxy = class {
   constructor(config2) {
     this.connected = false;

package/dist/server.js

@@ -6078,7 +6078,7 @@ class MultiplayerManager {
 // 导出
 // export default MultiplayerManager;
 // module.exports = MultiplayerManager;
-// window.MultiplayerManager = MultiplayerManager;`}]}}};var ws;ws="1.23.0";async function MRe(){return Go(Rm,"api_event_relations")}async function NRe(){return Go(Rm,"protocol_template")}async function SD(){return Go(Rm,"complete_example")}async function jRe(){return`# TapTap 多人联机集成指南
+// window.MultiplayerManager = MultiplayerManager;`}]}}};var ws;ws="1.23.2";async function MRe(){return Go(Rm,"api_event_relations")}async function NRe(){return Go(Rm,"protocol_template")}async function SD(){return Go(Rm,"complete_example")}async function jRe(){return`# TapTap 多人联机集成指南
 
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taptap/instant-games-open-mcp",
-  "version": "1.23.0",
+  "version": "1.23.2",
   "type": "module",
   "description": "TapTap Open API MCP Server - Documentation and Management APIs for TapTap Minigame and H5 Games (Leaderboard, and more features coming)",
   "main": "dist/server.js",

package/skills/taptap-maker-dev-kit-guide/SKILL.md

@@ -36,3 +36,16 @@ dev-kit entries when possible.
 
 These files are local development aids. Do not submit them to Maker Git unless the user explicitly
 asks and understands they are local environment files.
+
+## Testing And Result Check
+
+Keep validation simple for Maker users. 用户可以直接说“提交”或“构建”:
+
+- If the user says “提交”, use the Maker submit flow so local changes are committed, pushed, and
+  built by the Maker MCP tools.
+- If the user says “构建”, use the Maker build flow. If the tool reports local changes, follow the
+  options returned by the tool instead of inventing a separate build script.
+- After submit or build finishes, tell the user to open the TapMaker 网页端查看结果.
+
+Do not create local-only test scripts just to verify Maker changes. The expected validation path is
+chat request -> Maker MCP submit/build tool -> TapMaker web result check.

package/skills/taptap-maker-local/SKILL.md

@@ -68,6 +68,22 @@ dialogue/session directory, pass the user's current project directory as `target
 client does not expose that directory, say the current client did not provide the project directory
 instead of guessing.
 
+### Attached Workspace Selection
+
+Some AI clients start MCP from a dialogue/session directory and expose the real project as an
+attached workspace. For Maker status, clone, submit, and build, compare:
+
+- the AI dialogue current directory, often containing `dialogues`
+- the attached workspace directories shown by the client
+
+If there is a single attached workspace, use that single attached workspace as `target_dir` when
+calling Maker tools. If there are multiple attached workspaces, show the paths and ask the user
+which one is the Maker project directory. Do not treat the dialogue/session directory as the Maker
+project directory, and do not ask the user to clone an app into that directory.
+
+If `maker_status` returns `AI client workspace selection`, follow that hint: choose an attached
+workspace first, then call `maker_status(target_dir="<attached project directory>")`.
+
 ## Initialization Workflow
 
 Trigger phrases include:
@@ -94,9 +110,10 @@ Workflow:
    Do not run editor-specific CLI install commands.
 5. If PAT is missing, ask the user to open the PAT page shown by `maker_status`, create a PAT, and send it back.
 6. When the user provides PAT, call `maker_exchange_pat(manual_pat)`.
-7. If the current directory is still unbound, show the returned Maker app list and ask the user to
-   choose. Do not auto-select, even if there is only one app.
-8. Run the working directory compliance check below.
+7. If the current directory is still unbound, show every returned Maker app entry to the user and
+   ask the user to choose. Do not summarize the list as only a count, category, or stage. Do not
+   auto-select, even if there is only one app.
+8. Run the working directory compliance check below, including the parent Git repository warning.
 9. After the user chooses an app, call `maker_clone_to_current_directory(app_id)`. The clone
    tool prepares the AI dev kit automatically before project checkout.
 10. After clone succeeds, call `maker_status` again or explain that `.maker-mcp/config.json` now binds the directory to the Maker project.
@@ -170,8 +187,9 @@ If the current directory is already bound, app lists from `maker_exchange_pat`,
 `maker_status` are reference only. Do not ask which app to clone. Continue operating on the current
 bound project unless the user explicitly requests a different project.
 
-When app selection is needed, display the app list and ask the user to choose by index, app id, or
-name.
+When app selection is needed, display every app entry from the tool result and ask the user to
+choose by index, app id, or name. Do not replace the list with a summary such as "10 apps are
+available".
 
 Do not auto-select:
 
@@ -183,6 +201,25 @@ After the user chooses, pass the concrete `app_id` to `maker_clone_to_current_di
 
 ## Working Directory Compliance Check
 
+Before every clone attempt, call `maker_status(target_dir)` for the user's intended Maker
+development directory. Use that result as the source of truth for Git availability, existing Maker
+binding, outer Git repository detection, and AI dev-kit status.
+
+### Directory Suitability Decision
+
+After `maker_status(target_dir)`, decide whether the directory is suitable for clone:
+
+- If the directory is already bound to a Maker project, do not clone again unless the user
+  explicitly asks to switch or re-clone.
+- If Git is missing, stop and tell the user to install Git first.
+- If `Maker Git directory` reports `inside_parent_git_repo` or `target_is_git_root: no` with an
+  outer `git_root`, explain that the directory is under another Git repository. Recommend a
+  completely independent directory, such as `~/MakerProjects/<game-name>`.
+- If the directory is unbound and only contains ignored local config folders, continue after the
+  user chooses an app.
+- If the directory contains ordinary user files or folders, explain that Maker clone keeps local
+  files but may stop on path conflicts. Ask whether to continue here or switch to a clean directory.
+
 Before clone, inspect only the current directory top level.
 The goal is to avoid surprising overwrites, not to deeply audit game code.
 
@@ -200,6 +237,17 @@ If the directory contains ordinary user files or folders, explain that Maker ini
 keep local files, but clone can fail if a local path conflicts with the Maker project. Ask whether
 to continue in this directory or switch to a clean directory.
 
+If the current directory is inside a larger Git repository but is not itself a Git root, warn the
+user before clone:
+
+- The outer repository may be an existing user project.
+- A Maker project can live under that directory only if the Maker directory gets its own `.git`.
+- Recommend a completely independent directory, such as `~/MakerProjects/<game-name>`, for safer
+  local development.
+- If the user explicitly continues, call `maker_clone_to_current_directory`; the MCP clone tool
+  must initialize an independent Maker Git repository in the target directory and must not modify
+  the outer repository remote.
+
 Do not delete, move, or overwrite user files during this check.
 
 ## Clone Directory Safety
@@ -214,6 +262,20 @@ may create local-only files before clone, so explain this in non-technical terms
 
 Do not delete or overwrite user files to make clone work unless the user explicitly asks.
 
+If `maker_clone_to_current_directory` fails and the tool returns `partial_state`, explain the
+state in plain language:
+
+- `project_bound: no` usually means clone did not finish; retrying clone is allowed.
+- `git_initialized: yes` with `project_bound: no` means the directory may contain a partial local
+  Git setup; retry once, and if it fails again recommend a fresh independent directory.
+- `ai_dev_kit_present: yes` means local AI docs/examples may already be present even though Maker
+  project checkout failed.
+- `project_bound: yes` means the directory already has Maker binding; run `maker_status` before
+  attempting anything else.
+
+Do not delete partial files automatically. For novice users, prefer recommending a new independent
+directory over manual cleanup.
+
 ### `.gitignore` Merge During Clone
 
 The Maker clone tool stages the dev-kit managed ignore block in
@@ -276,6 +338,21 @@ If `maker_submit_current_directory` returns a build failure after a successful p
 - submit/push succeeded
 - build failed, with the concrete build error
 
+If submit created a local commit but push failed because the Maker remote was temporarily
+unavailable, do not run a manual generic `git push`. Tell the user to retry
+`maker_submit_current_directory`, or use `maker_build_current_directory` with
+`submit_local_changes_before_build=true` when the user is retrying build. Maker MCP will detect
+committed-but-unpushed local commits and push them before build.
+
+When a Maker tool output contains `push_recovery`, follow it exactly:
+
+- Tell the user the local commit is preserved but not yet on Maker remote.
+- Do not ask for permission to run a generic `git push`.
+- Retry with `maker_submit_current_directory` for submit requests.
+- Retry with `maker_build_current_directory(submit_local_changes_before_build=true)` for build
+  requests.
+- If the failure is `remote_rejected`, ask before pull/rebase; do not create a new branch or PR.
+
 ## Pull And Conflict Handling
 
 Before pulling:

package/skills/update-taptap-mcp/SKILL.md

@@ -104,7 +104,7 @@ Get-ChildItem $NpxDir -Directory -ErrorAction SilentlyContinue | ForEach-Object
 $env:TAPTAP_MCP_ENV = 'rnd'
 $log = Join-Path $env:TEMP 'taptap-mcp-warmup.log'
 $proc = Start-Process -FilePath npx `
-  -ArgumentList '-y','--prefer-online','-p','@taptap/instant-games-open-mcp@beta','taptap-maker' `
+  -ArgumentList '-y','-p','@taptap/instant-games-open-mcp@beta','taptap-maker' `
   -RedirectStandardOutput $log -RedirectStandardError "$log.err" `
   -WindowStyle Hidden -PassThru
 Start-Sleep -Seconds 25
@@ -189,7 +189,7 @@ done
 根据用户 MCP 配置选默认 bin 或指定 bin（`taptap-maker`）。下例以 `taptap-maker` 为例，默认 bin 去掉 `-p ... taptap-maker`，直接写 `@taptap/instant-games-open-mcp@beta`。
 
 ```bash
-TAPTAP_MCP_ENV=rnd npx -y --prefer-online -p @taptap/instant-games-open-mcp@beta taptap-maker \
+TAPTAP_MCP_ENV=rnd npx -y -p @taptap/instant-games-open-mcp@beta taptap-maker \
   < /dev/null > /tmp/taptap-mcp-warmup.log 2>&1 &
 PID=$!; sleep 25; kill $PID 2>/dev/null; wait 2>/dev/null
 ```