@taptap/instant-games-open-mcp 1.22.0-beta.5 → 1.22.0-beta.6

package/README.md

@@ -72,17 +72,21 @@ maker_push_current_directory
 - 保存 PAT 后会自动列出 app；`maker_status` 如果发现本地已有 PAT 且当前目录未绑定，也会自动列出 app，无需用户额外要求。
 - 保存 PAT 后会自动调用 `GET /api/v1/user/taptap-token` 获取并保存 TapTap MAC token；Tap OAuth 登录只作为 legacy fallback。
 - `maker_list_apps` 和 `maker_clone_to_current_directory` 不再要求先完成 Tap 登录。
+- `maker_clone_to_current_directory` 不要求当前目录为空；clone 前会检查本地目录，忽略 `.claude`、`.mcp`、`.skill`、`.config`、`.ini` 等点开头配置项，只对普通本地文件输出提醒。clone 最终结果固定包含 `Pre-clone local directory check` 区块；已有本地文件会保留，若与 Maker 项目文件同路径冲突则失败并列出冲突文件。
+- `maker_list_apps` 会解析 Maker `/apps` 返回的创建时间、最近会话时间、游戏类型、阶段、图标、置顶/归档/删除时间等字段，并保留原始 `raw` 数据。
 - Maker Tap 登录只需要 client id；`rnd` 环境或 npm `@beta` 包会使用内置 Maker client id 兜底，不要求产品配置 `TAPTAP_MCP_CLIENT_SECRET`。
 - PAT 会保存到 `~/.taptap-maker/pat.json`，并兼容旧的 `~/.maker-pat`、`PAT` / `MAKER_PAT` 环境变量。
 - JWT 仅作为 legacy fallback 保留：`maker_exchange_jwt(manual_jwt)`、`JWT` / `MAKER_JWT` 仍可用于旧后端或创建新 PAT。
 - Maker app 必须先通过 `maker_list_apps` 展示给用户选择，再调用 clone。
 - Maker 后端地址按 `TAPTAP_MCP_ENV` 从 `src/maker/config.ts` 的环境配置表读取，本地 MCP 配置只需要切 `rnd` / `production`。
 - 如果用户直接说“构建 / build / 重新构建游戏”，本地 Maker MCP 应调用 `maker_build_current_directory` 转发到远端 `build` tool。
+- 构建转发会从 MCP 包自身定位 `dist/proxy.js`；`cwd` / `target_dir` 只用于识别 Maker 游戏项目，不要求游戏目录存在 MCP 的 `dist/proxy.js`。
 - 如需在当前游戏项目里直接暴露远端全量 `taptap-proxy` tools，再使用 `maker_configure_remote_proxy` 写入 `.mcp.json` 并重启 MCP 会话。
 - 用户说“帮我提交/提交代码”时使用 `maker_submit_current_directory`，会对当前 Maker 项目执行 commit + push。
 - “帮我提交代码到maker / taptap制造 / tap制造 / tap”也应触发 `maker_submit_current_directory`。
 - Maker 项目提交不走通用 Git skill 的任务号、新分支规则；冲突时先和用户确认 pull/rebase 流程。
 - 如果 commit 已完成但 push 失败，Maker MCP 会返回 commit hash、ahead 状态、exit code、stderr/stdout 和下一步建议，便于开发期排查。
+- clone/fetch、push 和远端 build 属于慢操作；工具会尽量发送 MCP progress notification，Git 阶段会解析 stderr 百分比，最终返回会包含耗时和最近进度。
 
 Git 引导：
 

package/dist/maker.js

@@ -2,6 +2,7 @@
 // TapTap Maker MCP - Standalone Bundle
 import { createRequire } from 'node:module';
 const require = createRequire(import.meta.url);
+const __MAKER_BUNDLE_URL__ = import.meta.url;
 
 var __create = Object.create;
 var __defProp = Object.defineProperty;
@@ -25750,7 +25751,7 @@ function requireMakerJwt(manualJwt) {
 var BUILT_IN_MAKER_CLIENT_ID = "m2dnabebip3fpardnm";
 var MAKER_CLIENT_ID_ENV = "TAPTAP_MAKER_CLIENT_ID";
 var TAPTAP_CLIENT_ID_ENV = "TAPTAP_MCP_CLIENT_ID";
-var MAKER_VERSION = true ? "1.22.0-beta.5" : "dev";
+var MAKER_VERSION = true ? "1.22.0-beta.6" : "dev";
 async function startTapDeviceLogin() {
   ensureMakerClientId();
   const environment = EnvConfig.environment;
@@ -26158,17 +26159,59 @@ function getMakerApiBase() {
 function getMakerGitBase() {
   return requireMakerEndpoint("gitBase", getConfiguredMakerGitBase()).replace(/\/$/, "");
 }
+function stringField(item, ...keys) {
+  for (const key of keys) {
+    const value = item[key];
+    if (typeof value === "string") {
+      return value;
+    }
+  }
+  return void 0;
+}
+function nullableStringField(item, ...keys) {
+  for (const key of keys) {
+    const value = item[key];
+    if (typeof value === "string" || value === null) {
+      return value;
+    }
+  }
+  return void 0;
+}
+function numberField(item, ...keys) {
+  for (const key of keys) {
+    const value = item[key];
+    if (typeof value === "number") {
+      return value;
+    }
+  }
+  return void 0;
+}
 function normalizeProjectsResponse(data) {
   const body = data;
   const list = Array.isArray(data) ? data : Array.isArray(body.data) ? body.data : Array.isArray(body.apps) ? body.apps : Array.isArray(body.projects) ? body.projects : [];
-  return list.map((item) => item).map((item) => ({
-    id: String(item.id || item.app_id || item.project_id || ""),
-    name: typeof item.name === "string" ? item.name : typeof item.title === "string" ? item.title : void 0,
-    user_id: typeof item.user_id === "string" ? item.user_id : typeof item.userId === "string" ? item.userId : void 0,
-    sce_endpoint: typeof item.sce_endpoint === "string" ? item.sce_endpoint : typeof item.sce_mcp_url === "string" ? item.sce_mcp_url : void 0,
-    git_url: typeof item.git_url === "string" ? item.git_url : void 0,
-    raw: item
-  })).filter((project) => project.id.length > 0);
+  return list.map((item) => item).map((item) => {
+    const userId = stringField(item, "userId", "user_id");
+    return {
+      id: String(item.id || item.app_id || item.project_id || ""),
+      name: stringField(item, "name", "title"),
+      userId,
+      user_id: userId,
+      createdAt: stringField(item, "createdAt", "created_at"),
+      archivedAt: nullableStringField(item, "archivedAt", "archived_at"),
+      deletedAt: nullableStringField(item, "deletedAt", "deleted_at"),
+      gameType: stringField(item, "gameType", "game_type"),
+      icon: numberField(item, "icon"),
+      iconColor: numberField(item, "iconColor", "icon_color"),
+      lastAccessedAt: nullableStringField(item, "lastAccessedAt", "last_accessed_at"),
+      lastConversationAt: stringField(item, "lastConversationAt", "last_conversation_at"),
+      metadata: item.metadata,
+      pinnedAt: nullableStringField(item, "pinnedAt", "pinned_at"),
+      stage: stringField(item, "stage"),
+      sce_endpoint: stringField(item, "sce_endpoint", "sce_mcp_url"),
+      git_url: stringField(item, "git_url"),
+      raw: item
+    };
+  }).filter((project) => project.id.length > 0);
 }
 async function runProjects(args, flags) {
   const subcommand = args[0] || "list";
@@ -26265,41 +26308,70 @@ async function pushProject(flags) {
 `);
 }
 async function cloneMakerProject(options) {
-  ensureGitAvailable();
+  var _a2, _b, _c, _d, _e, _f, _g, _h;
   const target = path6.resolve(options.targetDir);
   ensureTargetCanBindApp(target, options.appId);
+  const warnings = createPreCloneWarnings(target);
+  (_a2 = options.onProgress) == null ? void 0 : _a2.call(options, {
+    progress: 0,
+    total: 100,
+    phase: "pre_clone_check",
+    message: formatPreCloneProgressMessage(options.appId, warnings)
+  });
+  ensureGitAvailable();
+  (_b = options.onProgress) == null ? void 0 : _b.call(options, {
+    progress: 1,
+    total: 100,
+    phase: "prepare",
+    message: `Preparing Maker project ${options.appId}`
+  });
   let pat = await requestMakerPat({
     jwt: options.jwt,
     pat: options.pat,
     name: options.patName || "first-pat",
     force: options.forcePat
   });
+  (_c = options.onProgress) == null ? void 0 : _c.call(options, {
+    progress: 5,
+    total: 100,
+    phase: "auth",
+    message: "Maker PAT ready for git authentication"
+  });
   const gitBase = getMakerGitBase();
   const gitUrl = `${gitBase}/${options.appId}.git`;
   let authUrl = makeAuthenticatedGitUrl(gitUrl, pat.token);
   let retriedWithNewPat = false;
   let transientRetries = 0;
-  if (isGitRepo(target)) {
+  if (isGitRepo(target) && hasGitHead(target)) {
+    (_d = options.onProgress) == null ? void 0 : _d.call(options, {
+      progress: 10,
+      total: 100,
+      phase: "fetch",
+      message: "Existing git repository found; fetching origin"
+    });
     await setOrigin(target, authUrl);
     try {
       transientRetries += await runGitWithTransientRetry(["fetch", "origin"], {
-        cwd: target
+        cwd: target,
+        onProgress: options.onProgress
       });
     } catch (error2) {
-      if (options.forcePat) {
-        throw error2;
+      if (options.forcePat || !isAuthGitError(error2)) {
+        throw withPreCloneWarnings(error2, warnings);
       }
-      pat = await requestMakerPat({
+      pat = await refreshPatAfterAuthFailure(error2, {
         jwt: options.jwt,
         pat: options.pat,
-        name: options.patName || "first-pat",
-        force: true
+        name: options.patName || "first-pat"
       });
       authUrl = makeAuthenticatedGitUrl(gitUrl, pat.token);
       retriedWithNewPat = true;
       await setOrigin(target, authUrl);
       transientRetries += await runGitWithTransientRetry(["fetch", "origin"], {
-        cwd: target
+        cwd: target,
+        onProgress: options.onProgress
+      }).catch((retryError) => {
+        throw withPreCloneWarnings(retryError, warnings);
       });
     }
     saveProjectConfig(target, {
@@ -26307,59 +26379,99 @@ async function cloneMakerProject(options) {
       user_id: options.userId || await resolveMakerProjectUserId(options),
       sce_endpoint: options.sceEndpoint
     });
+    (_e = options.onProgress) == null ? void 0 : _e.call(options, {
+      progress: 100,
+      total: 100,
+      phase: "done",
+      message: "Maker project fetch completed"
+    });
     return {
       appId: options.appId,
       targetDir: target,
       status: "fetched",
       retriedWithNewPat,
-      transientRetries
+      transientRetries,
+      warnings
     };
   }
-  if (fs4.existsSync(target) && hasNonIgnorableFiles(target)) {
-    throw new Error(
-      [
-        `${target} is not empty and is not a git repository.`,
-        "Maker clone can be run multiple times after the directory is a git repo, but the first clone requires an empty target directory.",
-        "Please open an empty directory, or remove the unrelated files before cloning."
-      ].join("\n")
+  if (isGitRepo(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."
     );
   }
   try {
-    transientRetries += await runGitCaptureWithTransientRetry(["clone", authUrl, target], {
-      sanitize: pat.token
+    (_f = options.onProgress) == null ? void 0 : _f.call(options, {
+      progress: 10,
+      total: 100,
+      phase: "clone",
+      message: `Cloning Maker project ${options.appId}`
     });
+    transientRetries += await cloneOrInitializeTarget(
+      target,
+      authUrl,
+      pat.token,
+      options.onProgress
+    );
   } catch (error2) {
-    if (options.forcePat) {
-      throw error2;
+    if (options.forcePat || !isAuthGitError(error2)) {
+      throw withPreCloneWarnings(error2, warnings);
     }
-    pat = await requestMakerPat({
+    pat = await refreshPatAfterAuthFailure(error2, {
       jwt: options.jwt,
       pat: options.pat,
-      name: options.patName || "first-pat",
-      force: true
+      name: options.patName || "first-pat"
     });
     authUrl = makeAuthenticatedGitUrl(gitUrl, pat.token);
     retriedWithNewPat = true;
-    transientRetries += await runGitCaptureWithTransientRetry(["clone", authUrl, target], {
-      sanitize: pat.token
+    (_g = options.onProgress) == null ? void 0 : _g.call(options, {
+      progress: 10,
+      total: 100,
+      phase: "clone",
+      message: `Retrying clone for Maker project ${options.appId} with refreshed PAT`
     });
+    transientRetries += await cloneOrInitializeTarget(
+      target,
+      authUrl,
+      pat.token,
+      options.onProgress
+    ).catch((retryError) => {
+      throw withPreCloneWarnings(retryError, warnings);
+    });
+  }
+  try {
+    ensureGitHeadCheckedOut(target);
+  } catch (error2) {
+    throw withPreCloneWarnings(error2, warnings);
   }
   saveProjectConfig(target, {
     project_id: options.appId,
     user_id: options.userId || await resolveMakerProjectUserId(options),
     sce_endpoint: options.sceEndpoint
   });
+  (_h = options.onProgress) == null ? void 0 : _h.call(options, {
+    progress: 100,
+    total: 100,
+    phase: "done",
+    message: "Maker project clone completed"
+  });
   return {
     appId: options.appId,
     targetDir: target,
     status: "cloned",
     retriedWithNewPat,
-    transientRetries
+    transientRetries,
+    warnings
   };
 }
 async function pushMakerProject(options) {
-  var _a2;
+  var _a2, _b, _c, _d, _e, _f, _g, _h, _i;
   ensureGitAvailable();
+  (_a2 = options.onProgress) == null ? void 0 : _a2.call(options, {
+    progress: 0,
+    total: 100,
+    phase: "prepare",
+    message: "Preparing Maker project push"
+  });
   const cwd = path6.resolve(options.cwd);
   if (!isGitRepo(cwd)) {
     throw new Error(`${cwd} is not a git repository.`);
@@ -26377,11 +26489,24 @@ async function pushMakerProject(options) {
     appId: project.project_id,
     jwt: options.jwt,
     pat: options.pat,
-    forcePat: options.forcePat
+    forcePat: options.forcePat,
+    onProgress: options.onProgress
+  });
+  (_b = options.onProgress) == null ? void 0 : _b.call(options, {
+    progress: 10,
+    total: 100,
+    phase: "auth",
+    message: "Authenticated Maker git origin ready"
   });
   const statusBefore = await readGit(["status", "--porcelain"], cwd);
   const branch = await currentBranch(cwd, options.branch);
   if (!statusBefore.trim() && !options.allowEmpty) {
+    (_c = options.onProgress) == null ? void 0 : _c.call(options, {
+      progress: 100,
+      total: 100,
+      phase: "done",
+      message: "Maker project has no local changes to push"
+    });
     return {
       branch,
       committed: false,
@@ -26390,9 +26515,21 @@ async function pushMakerProject(options) {
       status: "clean"
     };
   }
-  if ((_a2 = options.files) == null ? void 0 : _a2.length) {
+  if ((_d = options.files) == null ? void 0 : _d.length) {
+    (_e = options.onProgress) == null ? void 0 : _e.call(options, {
+      progress: 20,
+      total: 100,
+      phase: "stage",
+      message: "Staging selected files"
+    });
     await runGit(["add", ...options.files], { cwd });
   } else {
+    (_f = options.onProgress) == null ? void 0 : _f.call(options, {
+      progress: 20,
+      total: 100,
+      phase: "stage",
+      message: "Staging all local changes"
+    });
     await runGit(["add", "-A"], { cwd });
   }
   const staged = await readGit(["diff", "--cached", "--name-only"], cwd);
@@ -26400,6 +26537,12 @@ async function pushMakerProject(options) {
   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",
@@ -26417,7 +26560,13 @@ async function pushMakerProject(options) {
     commitHash = (await readGit(["rev-parse", "--short", "HEAD"], cwd)).trim();
   }
   try {
-    await pushGit(["push", "origin", `HEAD:${branch}`], cwd);
+    (_h = options.onProgress) == null ? void 0 : _h.call(options, {
+      progress: 65,
+      total: 100,
+      phase: "push",
+      message: `Pushing Maker project to ${branch}`
+    });
+    await pushGit(["push", "origin", `HEAD:${branch}`], cwd, options.onProgress);
   } catch (error2) {
     const failure = toMakerGitFailure(error2, "push");
     return {
@@ -26431,6 +26580,12 @@ async function pushMakerProject(options) {
       ahead: await readAheadState(cwd)
     };
   }
+  (_i = options.onProgress) == null ? void 0 : _i.call(options, {
+    progress: 100,
+    total: 100,
+    phase: "done",
+    message: "Maker project push completed"
+  });
   return {
     branch,
     committed,
@@ -26545,7 +26700,7 @@ function nextActionForFailure(classification) {
       return "保留本地提交，不要重复提交；把错误详情反馈给用户，并在确认后重试 push。";
   }
 }
-function pushGit(args, cwd) {
+function pushGit(args, cwd, onProgress) {
   return new Promise((resolve2, reject) => {
     const gitCommand = getGitCommand();
     const child = spawn(gitCommand, args, {
@@ -26556,6 +26711,7 @@ function pushGit(args, cwd) {
     let stderr = "";
     child.stderr.on("data", (chunk) => {
       stderr += String(chunk);
+      emitGitProgress(chunk, onProgress);
     });
     child.stdout.on("data", (chunk) => {
       stdout += String(chunk);
@@ -26605,6 +26761,7 @@ async function resolveMakerProjectUserId(options) {
   }
 }
 async function ensureAuthenticatedOrigin(options) {
+  var _a2;
   const pat = await requestMakerPat({
     jwt: options.jwt,
     pat: options.pat,
@@ -26615,15 +26772,189 @@ async function ensureAuthenticatedOrigin(options) {
   const gitUrl = `${gitBase}/${options.appId}.git`;
   const authUrl = makeAuthenticatedGitUrl(gitUrl, pat.token);
   await setOrigin(options.cwd, authUrl);
+  (_a2 = options.onProgress) == null ? void 0 : _a2.call(options, {
+    progress: 8,
+    total: 100,
+    phase: "auth",
+    message: "Maker git origin updated with PAT authentication"
+  });
 }
 function makeAuthenticatedGitUrl(gitUrl, pat) {
   return gitUrl.replace(/^https:\/\//, `https://git:${encodeURIComponent(pat)}@`);
 }
-function hasNonIgnorableFiles(target) {
+async function cloneOrInitializeTarget(target, authUrl, pat, onProgress) {
+  if (fs4.existsSync(target) && hasDirectoryEntries(target)) {
+    onProgress == null ? void 0 : onProgress({
+      progress: 10,
+      total: 100,
+      phase: "clone",
+      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;
+    transientRetries += await runGitCaptureWithTransientRetry(["init", target], {
+      sanitize: pat,
+      onProgress
+    });
+    await setOrigin(target, authUrl);
+    transientRetries += await runGitWithTransientRetry(["fetch", "origin"], {
+      cwd: target,
+      onProgress
+    });
+    const branch = await resolveRemoteDefaultBranch(target);
+    await assertNoCheckoutFileConflicts(target, branch);
+    try {
+      transientRetries += await runGitCaptureWithTransientRetry(
+        ["checkout", "-B", branch, `origin/${branch}`],
+        {
+          cwd: target,
+          sanitize: pat,
+          onProgress
+        }
+      );
+    } catch (error2) {
+      throw enhanceCheckoutConflictError(error2, target);
+    }
+    return transientRetries;
+  }
+  return runGitCaptureWithTransientRetry(["clone", authUrl, target], {
+    sanitize: pat,
+    onProgress
+  });
+}
+function hasDirectoryEntries(target) {
   if (!fs4.existsSync(target)) {
     return false;
   }
-  return fs4.readdirSync(target).some((entry) => entry !== ".maker-mcp" && entry !== ".DS_Store");
+  return fs4.readdirSync(target).length > 0;
+}
+function listLocalFiles(root) {
+  if (!fs4.existsSync(root)) {
+    return [];
+  }
+  const files = [];
+  const visit = (dir, relativeDir) => {
+    for (const entry of fs4.readdirSync(dir, { withFileTypes: true })) {
+      const relativePath = relativeDir ? `${relativeDir}/${entry.name}` : entry.name;
+      if (entry.name === ".git" || relativePath === ".maker-mcp" || relativePath.startsWith(".maker-mcp/") || entry.name === ".DS_Store") {
+        continue;
+      }
+      const fullPath = path6.join(dir, entry.name);
+      if (entry.isDirectory()) {
+        visit(fullPath, relativePath);
+        continue;
+      }
+      if (entry.isFile()) {
+        files.push(relativePath);
+      }
+    }
+  };
+  visit(root, "");
+  return files;
+}
+function listPreCloneNoticeFiles(root) {
+  if (!fs4.existsSync(root)) {
+    return [];
+  }
+  return fs4.readdirSync(root, { withFileTypes: true }).filter((entry) => !isIgnorablePreCloneEntry(entry.name)).map((entry) => entry.name).sort();
+}
+function createPreCloneWarnings(target) {
+  const preCloneLocalFiles = listPreCloneNoticeFiles(target);
+  if (preCloneLocalFiles.length === 0) {
+    return [];
+  }
+  const preview = preCloneLocalFiles.slice(0, 10);
+  return [
+    [
+      "Pre-clone notice: target directory already contains local files. Maker MCP will keep them and continue unless they conflict with Maker project files.",
+      `local_file_count: ${preCloneLocalFiles.length}`,
+      "local_files:",
+      ...preview.map((file2) => `  - ${file2}`),
+      preCloneLocalFiles.length > preview.length ? `  - ... ${preCloneLocalFiles.length - preview.length} more` : ""
+    ].filter(Boolean).join("\n")
+  ];
+}
+function formatPreCloneProgressMessage(appId, warnings) {
+  if (warnings.length === 0) {
+    return `Pre-clone local directory check passed for Maker project ${appId}`;
+  }
+  return [
+    `Pre-clone local directory check found existing local files for Maker project ${appId}.`,
+    ...warnings
+  ].join("\n");
+}
+function isIgnorablePreCloneEntry(entryName) {
+  return entryName === ".DS_Store" || entryName.startsWith(".");
+}
+function isAuthGitError(error2) {
+  return toMakerGitFailure(error2, "clone").classification === "auth";
+}
+async function refreshPatAfterAuthFailure(originalError, options) {
+  try {
+    return await requestMakerPat({
+      jwt: options.jwt,
+      pat: options.pat,
+      name: options.name || "first-pat",
+      force: true
+    });
+  } catch (refreshError) {
+    const originalMessage = originalError instanceof Error ? originalError.message : String(originalError);
+    const refreshMessage = refreshError instanceof Error ? refreshError.message : String(refreshError);
+    throw new Error(
+      [
+        "Maker git authentication failed and PAT refresh also failed.",
+        "",
+        "original_git_error:",
+        originalMessage,
+        "",
+        "pat_refresh_error:",
+        refreshMessage
+      ].join("\n")
+    );
+  }
+}
+function withPreCloneWarnings(error2, warnings) {
+  const original = error2 instanceof Error ? error2 : new Error(String(error2));
+  if (warnings.length === 0) {
+    return original;
+  }
+  return new Error(
+    [
+      "Maker clone failed after pre-clone local directory check.",
+      "",
+      "Pre-clone notices:",
+      ...warnings.map((warning) => indentText(warning)),
+      "",
+      "original_error:",
+      original.message
+    ].join("\n")
+  );
+}
+function indentText(text) {
+  return text.split("\n").map((line) => `  ${line}`).join("\n");
+}
+async function assertNoCheckoutFileConflicts(cwd, branch) {
+  const remoteTree = await readGit(["ls-tree", "-r", "--name-only", `origin/${branch}`], cwd);
+  const remoteFiles = new Set(
+    remoteTree.split(/\r?\n/).map((line) => line.trim()).filter(Boolean)
+  );
+  if (remoteFiles.size === 0) {
+    return;
+  }
+  const conflicts = listLocalFiles(cwd).filter((file2) => remoteFiles.has(file2)).sort();
+  if (conflicts.length === 0) {
+    return;
+  }
+  throw new Error(
+    [
+      "Maker clone cannot continue because existing local files have the same paths as files in the remote Maker project.",
+      `target_dir: ${cwd}`,
+      "",
+      "Conflicting local files:",
+      ...conflicts.map((file2) => `- ${file2}`),
+      "",
+      "Please move, rename, or delete these local files, then retry maker_clone_to_current_directory."
+    ].join("\n")
+  );
 }
 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 }));
@@ -26636,6 +26967,41 @@ function isGitRepo(repoDir) {
     return false;
   }
 }
+function hasGitHead(repoDir) {
+  try {
+    const head = readGitSync(["-C", repoDir, "rev-parse", "--verify", "HEAD"]);
+    return head.trim().length > 0;
+  } catch {
+    return false;
+  }
+}
+function ensureGitHeadCheckedOut(repoDir) {
+  if (hasGitHead(repoDir)) {
+    return;
+  }
+  throw new Error(
+    [
+      "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."
+    ].join("\n")
+  );
+}
+function enhanceCheckoutConflictError(error2, target) {
+  const message = error2 instanceof Error ? error2.message : String(error2);
+  if (!/untracked working tree files would be overwritten by checkout/i.test(message)) {
+    return error2 instanceof Error ? error2 : new Error(message);
+  }
+  return new Error(
+    [
+      "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.",
+      "",
+      message
+    ].join("\n")
+  );
+}
 async function currentBranch(cwd, explicitBranch) {
   if (explicitBranch) {
     return explicitBranch;
@@ -26643,6 +27009,20 @@ async function currentBranch(cwd, explicitBranch) {
   const branch = await readGit(["branch", "--show-current"], cwd);
   return branch.trim() || "main";
 }
+async function resolveRemoteDefaultBranch(cwd) {
+  try {
+    const branch = await readGit(["symbolic-ref", "--short", "refs/remotes/origin/HEAD"], cwd);
+    return branch.trim().replace(/^origin\//, "") || "main";
+  } catch {
+  }
+  try {
+    const remoteHead = await readGit(["ls-remote", "--symref", "origin", "HEAD"], cwd);
+    const match = remoteHead.match(/^ref:\s+refs\/heads\/([^\s]+)\s+HEAD/m);
+    return (match == null ? void 0 : match[1]) || "main";
+  } catch {
+    return "main";
+  }
+}
 function readGitSync(args) {
   const gitCommand = getGitCommand();
   const result = spawnSync3(gitCommand, args, {
@@ -26725,6 +27105,7 @@ function runGitCapture(args, options = {}) {
     });
     child.stderr.on("data", (chunk) => {
       stderr += String(chunk);
+      emitGitProgress(chunk, options.onProgress, options.sanitize);
     });
     child.on("exit", (code) => {
       if (code === 0) {
@@ -26757,6 +27138,7 @@ function runGit(args, options) {
     });
     child.stderr.on("data", (chunk) => {
       stderr += String(chunk);
+      emitGitProgress(chunk, options.onProgress);
     });
     child.on("exit", (code) => {
       if (code === 0) {
@@ -26796,6 +27178,42 @@ function sanitize(value, secret) {
   }
   return value.split(secret).join("***");
 }
+function emitGitProgress(chunk, onProgress, secret) {
+  if (!onProgress) {
+    return;
+  }
+  for (const rawLine of String(chunk).split(/\r\n|\n|\r/)) {
+    const line = sanitize(rawLine.trim(), secret);
+    const progress = parseGitProgressLine(line);
+    if (progress) {
+      onProgress(progress);
+    }
+  }
+}
+function parseGitProgressLine(line) {
+  const message = line.trim();
+  if (!message) {
+    return void 0;
+  }
+  const percentMatch = message.match(
+    /(?:remote:\s*)?(Counting objects|Compressing objects|Receiving objects|Resolving deltas|Writing objects):\s+(\d+)%/i
+  );
+  if (percentMatch) {
+    return {
+      progress: Math.max(0, Math.min(100, Number(percentMatch[2]))),
+      total: 100,
+      phase: "git",
+      message
+    };
+  }
+  if (/^(remote:\s*)?(Cloning into|Enumerating objects|Total )/i.test(message)) {
+    return {
+      phase: "git",
+      message
+    };
+  }
+  return void 0;
+}
 
 // src/maker/cli/init.ts
 async function runInit(flags) {
@@ -27000,6 +27418,7 @@ async function runStatus(flags) {
 // src/maker/server/mcp.ts
 import fs6 from "node:fs";
 import path9 from "node:path";
+import { fileURLToPath } from "node:url";
 
 // node_modules/zod/v3/helpers/util.js
 var util;
@@ -41962,10 +42381,11 @@ function isElectron() {
 }
 
 // src/maker/server/mcp.ts
-var VERSION = true ? "1.22.0-beta.5" : "dev";
+var VERSION = true ? "1.22.0-beta.6" : "dev";
 var DEFAULT_PROXY_MCP_NAME = "taptap-proxy";
 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 MAKER_WEB_URL = getMakerWebUrl();
 var tools = [
   {
@@ -42063,7 +42483,7 @@ var tools = [
   },
   {
     name: "maker_clone_to_current_directory",
-    description: 'Clone a Maker app repository into the current Codex/agent working directory. Use after the user chooses an app from the Maker app list for requests like "拉取maker游戏到本地", "把这个maker app拉下来", "clone maker项目", or "下载maker游戏代码". Call this only after maker_list_apps has listed apps and the user has chosen one. Requires local Git. If Git is missing, this tool stops before changing files and returns install guidance; do not retry clone until the user installs Git and git --version works. Requires the selected app_id; uses cached Maker PAT by default.',
+    description: 'Clone a Maker app repository into the current Codex/agent working directory. Use after the user chooses an app from the Maker app list for requests like "拉取maker游戏到本地", "把这个maker app拉下来", "clone maker项目", or "下载maker游戏代码". Call this only after maker_list_apps has listed apps and the user has chosen one. Requires local Git. If Git is missing, this tool stops before changing files and returns install guidance; do not retry clone until the user installs Git and git --version works. The target directory does not have to be empty; before clone, the tool checks local entries and warns about non-config local files while ignoring dot-prefixed config entries such as .claude, .mcp, .skill, .config, and .ini. Existing local files are kept unless they conflict with Maker project files; conflicts fail with a file list. Requires the selected app_id; uses cached Maker PAT by default.',
     inputSchema: {
       type: "object",
       properties: {
@@ -42184,7 +42604,7 @@ var tools = [
         },
         use_npx: {
           type: "boolean",
-          description: "If true, write the script-style npx package command. Defaults to false for local development and uses local dist/proxy.js."
+          description: "If true, write the script-style npx package command. Defaults to false and uses the proxy.js bundled with the Maker MCP package when available."
         },
         pkg: {
           type: "string",
@@ -42253,7 +42673,8 @@ async function startMakerMcpServer() {
     }
   );
   server.setRequestHandler(ListToolsRequestSchema, async () => ({ tools }));
-  server.setRequestHandler(CallToolRequestSchema, async (request) => {
+  server.setRequestHandler(CallToolRequestSchema, async (request, extra) => {
+    var _a2, _b, _c;
     const name = request.params.name;
     try {
       if (name === "maker_status") {
@@ -42442,15 +42863,29 @@ async function startMakerMcpServer() {
           throw new McpError(ErrorCode.InvalidParams, "app_id is required");
         }
         const targetDir = args.target_dir || process.cwd();
-        const result = await cloneMakerProject({
-          appId: args.app_id,
-          targetDir,
-          pat: args.pat,
-          userId: args.user_id,
-          jwt: args.jwt,
-          forcePat: args.force_pat === true,
-          sceEndpoint: process.env.SCE_MCP_URL
-        });
+        const progressReporter = createToolProgressReporter(
+          (_a2 = request.params._meta) == null ? void 0 : _a2.progressToken,
+          extra,
+          "Maker clone"
+        );
+        let result;
+        let progressSummary;
+        try {
+          result = await cloneMakerProject({
+            appId: args.app_id,
+            targetDir,
+            pat: args.pat,
+            userId: args.user_id,
+            jwt: args.jwt,
+            forcePat: args.force_pat === true,
+            sceEndpoint: process.env.SCE_MCP_URL,
+            onProgress: progressReporter.report
+          });
+          progressSummary = progressReporter.finish();
+        } catch (error2) {
+          progressReporter.finish();
+          throw error2;
+        }
         return {
           content: [
             {
@@ -42458,10 +42893,12 @@ async function startMakerMcpServer() {
               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"}`,
+                ...formatProgressSummary(progressSummary),
                 "- project config: .maker-mcp/config.json"
               ].join("\n")
             }
@@ -42471,21 +42908,35 @@ async function startMakerMcpServer() {
       if (name === "maker_push_current_directory" || name === "maker_submit_current_directory") {
         const args = request.params.arguments || {};
         const targetDir = args.target_dir || process.cwd();
-        const result = await pushMakerProject({
-          cwd: targetDir,
-          message: args.message,
-          branch: args.branch,
-          files: args.files,
-          allowEmpty: args.allow_empty === true,
-          pat: args.pat,
-          jwt: args.jwt,
-          forcePat: args.force_pat === true
-        });
+        const progressReporter = createToolProgressReporter(
+          (_b = request.params._meta) == null ? void 0 : _b.progressToken,
+          extra,
+          "Maker push"
+        );
+        let result;
+        let progressSummary;
+        try {
+          result = await pushMakerProject({
+            cwd: targetDir,
+            message: args.message,
+            branch: args.branch,
+            files: args.files,
+            allowEmpty: args.allow_empty === true,
+            pat: args.pat,
+            jwt: args.jwt,
+            forcePat: args.force_pat === true,
+            onProgress: progressReporter.report
+          });
+          progressSummary = progressReporter.finish();
+        } catch (error2) {
+          progressReporter.finish();
+          throw error2;
+        }
         return {
           content: [
             {
               type: "text",
-              text: formatPushResult(targetDir, result)
+              text: formatPushResult(targetDir, result, progressSummary)
             }
           ]
         };
@@ -42511,22 +42962,36 @@ async function startMakerMcpServer() {
       }
       if (name === "maker_build_current_directory") {
         const args = request.params.arguments || {};
-        const result = await buildCurrentDirectory({
-          targetDir: args.target_dir || process.cwd(),
-          entry: args.entry,
-          scriptsPath: args.scriptsPath,
-          entryClient: args.entry_client,
-          entryServer: args.entry_server,
-          multiplayer: args.multiplayer,
-          serverUrl: args.server_url,
-          env: args.env,
-          timeoutMs: args.timeout_ms
-        });
+        const progressReporter = createToolProgressReporter(
+          (_c = request.params._meta) == null ? void 0 : _c.progressToken,
+          extra,
+          "Maker build"
+        );
+        let result;
+        let progressSummary;
+        try {
+          result = await buildCurrentDirectory({
+            targetDir: args.target_dir || process.cwd(),
+            entry: args.entry,
+            scriptsPath: args.scriptsPath,
+            entryClient: args.entry_client,
+            entryServer: args.entry_server,
+            multiplayer: args.multiplayer,
+            serverUrl: args.server_url,
+            env: args.env,
+            timeoutMs: args.timeout_ms,
+            onProgress: progressReporter.report
+          });
+          progressSummary = progressReporter.finish();
+        } catch (error2) {
+          progressReporter.finish();
+          throw error2;
+        }
         return {
           content: [
             {
               type: "text",
-              text: formatBuildResult(result)
+              text: formatBuildResult(result, progressSummary)
             }
           ]
         };
@@ -42651,12 +43116,32 @@ function formatProjectList(projects) {
     "Maker apps",
     "",
     ...projects.map(
-      (project, index) => `${index + 1}. ${project.id}${project.name ? `  ${project.name}` : ""}${project.user_id ? `  user_id=${project.user_id}` : ""}`
+      (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}` : ""}`
     ),
     "",
     "请让用户选择一个 app，然后调用 maker_clone_to_current_directory。"
   ].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 createRemoteProxyContext(options) {
   const identify = identifyMakerProject({ cwd: options.targetDir });
   if (!identify.projectRoot || !identify.projectId) {
@@ -42752,19 +43237,23 @@ function configureRemoteProxy(options) {
     envVars: proxy.envVars
   };
 }
-function resolveLocalProxyBundle() {
-  const makerEntry = process.argv[1] ? path9.resolve(process.argv[1]) : "";
-  const alongsideMaker = makerEntry ? path9.join(path9.dirname(makerEntry), "proxy.js") : "";
-  if (alongsideMaker && fs6.existsSync(alongsideMaker)) {
-    return alongsideMaker;
-  }
-  const cwdBundle = path9.resolve(process.cwd(), "dist", "proxy.js");
-  if (fs6.existsSync(cwdBundle)) {
-    return cwdBundle;
+function resolveLocalProxyBundle(options) {
+  const currentModuleUrl = (options == null ? void 0 : options.currentModuleUrl) || (typeof __MAKER_BUNDLE_URL__ !== "undefined" ? __MAKER_BUNDLE_URL__ : void 0);
+  const currentModuleDir = currentModuleUrl ? path9.dirname(fileURLToPath(currentModuleUrl)) : "";
+  const makerEntry = (options == null ? void 0 : options.makerEntry) ?? process.argv[1];
+  const makerEntryDir = makerEntry ? path9.dirname(path9.resolve(makerEntry)) : "";
+  const cwd = (options == null ? void 0 : options.cwd) ?? process.cwd();
+  const candidates = [
+    currentModuleDir ? path9.join(currentModuleDir, "proxy.js") : "",
+    makerEntryDir ? path9.join(makerEntryDir, "..", "dist", "proxy.js") : "",
+    path9.resolve(cwd, "dist", "proxy.js")
+  ].filter(Boolean);
+  for (const candidate of candidates) {
+    if (fs6.existsSync(candidate)) {
+      return candidate;
+    }
   }
-  throw new Error(
-    "Local dist/proxy.js not found. Run npm run build before configuring remote proxy."
-  );
+  throw new Error(`MCP proxy bundle not found. Checked: ${candidates.join(", ")}`);
 }
 function readMcpJson(filePath) {
   if (!fs6.existsSync(filePath)) {
@@ -42830,6 +43319,84 @@ function formatProxyEnv(envVars) {
   }
   return Object.keys(envVars).map((key) => `${key}=<redacted>`).join(" ");
 }
+function createToolProgressReporter(progressToken, extra, operationName) {
+  var _a2;
+  const startedAt = Date.now();
+  let events = 0;
+  let lastProgress;
+  let lastSentProgress = 0;
+  let finished = false;
+  const sendProgress = (progress) => {
+    if (finished || progressToken === void 0) {
+      return;
+    }
+    const elapsed = formatDuration(Date.now() - startedAt);
+    const numericProgress = progress.progress !== void 0 ? Math.max(lastSentProgress, progress.progress) : Math.max(lastSentProgress, Math.floor((Date.now() - startedAt) / 1e3));
+    lastSentProgress = numericProgress;
+    const message = `${operationName}: ${progress.message} (elapsed ${elapsed})`;
+    void extra.sendNotification({
+      method: "notifications/progress",
+      params: {
+        progressToken,
+        progress: numericProgress,
+        ...progress.total !== void 0 ? { total: progress.total } : {},
+        message
+      }
+    }).catch(() => {
+    });
+  };
+  const heartbeat = setInterval(() => {
+    const elapsed = formatDuration(Date.now() - startedAt);
+    sendProgress({
+      progress: lastProgress == null ? void 0 : lastProgress.progress,
+      total: lastProgress == null ? void 0 : lastProgress.total,
+      phase: lastProgress == null ? void 0 : lastProgress.phase,
+      message: `still running; elapsed ${elapsed}; last status: ${(lastProgress == null ? void 0 : lastProgress.message) || "waiting for progress"}`
+    });
+  }, LONG_OPERATION_HEARTBEAT_MS);
+  (_a2 = heartbeat.unref) == null ? void 0 : _a2.call(heartbeat);
+  return {
+    report(progress) {
+      events += 1;
+      lastProgress = progress;
+      sendProgress(progress);
+    },
+    finish() {
+      if (!finished) {
+        finished = true;
+        clearInterval(heartbeat);
+      }
+      const elapsedMs = Date.now() - startedAt;
+      return {
+        elapsedMs,
+        elapsed: formatDuration(elapsedMs),
+        progressEvents: events,
+        lastProgress
+      };
+    }
+  };
+}
+function formatProgressSummary(summary) {
+  return [
+    `- elapsed_ms: ${summary.elapsedMs}`,
+    `- elapsed: ${summary.elapsed}`,
+    `- progress_events: ${summary.progressEvents}`,
+    summary.lastProgress ? `- last_progress: ${formatProgressMessage(summary.lastProgress)}` : "- last_progress: (none)"
+  ];
+}
+function formatProgressMessage(progress) {
+  const percent = progress.progress !== void 0 ? `${progress.progress}${progress.total === 100 ? "%" : ""}` : void 0;
+  return [progress.phase ? `[${progress.phase}]` : "", percent, progress.message].filter(Boolean).join(" ");
+}
+function formatDuration(ms) {
+  const totalSeconds = Math.max(0, Math.round(ms / 1e3));
+  const minutes = Math.floor(totalSeconds / 60);
+  const seconds = totalSeconds % 60;
+  if (minutes === 0) {
+    return `${seconds}s`;
+  }
+  return `${minutes}m ${seconds}s`;
+}
 async function buildCurrentDirectory(options) {
   const proxy = createRemoteProxyContext({
     targetDir: options.targetDir,
@@ -42841,10 +43408,7 @@ async function buildCurrentDirectory(options) {
   const transport = new StdioClientTransport({
     command: proxy.command,
     args: proxy.args,
-    env: {
-      ...process.env,
-      ...proxy.envVars
-    },
+    env: mergeStringEnv(process.env, proxy.envVars),
     stderr: "pipe"
   });
   const client = new Client(
@@ -42866,7 +43430,16 @@ async function buildCurrentDirectory(options) {
       void 0,
       {
         timeout: timeoutMs,
-        resetTimeoutOnProgress: true
+        resetTimeoutOnProgress: true,
+        onprogress: (progress) => {
+          var _a2;
+          (_a2 = options.onProgress) == null ? void 0 : _a2.call(options, {
+            progress: progress.progress,
+            total: progress.total,
+            phase: "remote_build",
+            message: progress.message || "Remote Maker build progress"
+          });
+        }
       }
     );
     return {
@@ -42904,6 +43477,20 @@ function createBuildArgs(projectRoot, options) {
   }
   return buildArgs;
 }
+function mergeStringEnv(...sources) {
+  const result = {};
+  for (const source of sources) {
+    if (!source) {
+      continue;
+    }
+    for (const [key, value] of Object.entries(source)) {
+      if (typeof value === "string") {
+        result[key] = value;
+      }
+    }
+  }
+  return result;
+}
 function formatRemoteToolResult(result) {
   if (!result || typeof result !== "object") {
     return String(result);
@@ -42919,7 +43506,7 @@ function formatRemoteToolResult(result) {
     return JSON.stringify(item);
   }).join("\n");
 }
-function formatBuildResult(result) {
+function formatBuildResult(result, progressSummary) {
   return [
     "✓ Remote Maker build finished",
     "",
@@ -42930,12 +43517,13 @@ function formatBuildResult(result) {
     `- env: ${result.env}`,
     `- timeout_ms: ${result.timeoutMs}`,
     `- build_args: ${JSON.stringify(result.buildArgs)}`,
+    ...formatProgressSummary(progressSummary),
     "",
     "remote_result:",
     indent(result.resultText)
   ].join("\n");
 }
-function formatPushResult(targetDir, result) {
+function formatPushResult(targetDir, result, progressSummary) {
   const lines = [
     result.pushed ? "✓ Maker project pushed" : result.status === "clean" ? "Maker project has no changes to push" : "✗ Maker project push failed",
     "",
@@ -42945,7 +43533,8 @@ function formatPushResult(targetDir, result) {
     `- committed: ${result.committed ? "yes" : "no"}`,
     result.commitHash ? `- commit_hash: ${result.commitHash}` : "",
     result.message ? `- commit_message: ${result.message}` : "",
-    result.ahead ? `- git_state: ${result.ahead}` : ""
+    result.ahead ? `- git_state: ${result.ahead}` : "",
+    ...formatProgressSummary(progressSummary)
   ].filter(Boolean);
   if (!result.failure) {
     return lines.join("\n");

package/dist/proxy.js

@@ -29137,7 +29137,7 @@ var LogWriter = class {
 };
 
 // src/mcp-proxy/proxy.ts
-var VERSION = true ? "1.22.0-beta.5" : "dev";
+var VERSION = true ? "1.22.0-beta.6" : "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.22.0-beta.5";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.22.0-beta.6";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.22.0-beta.5",
+  "version": "1.22.0-beta.6",
   "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",