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

package/README.md

@@ -51,39 +51,41 @@
 
 ```text
 maker_status
-maker_check_environment
 maker_exchange_pat(manual_pat)
 自动获取 TapTap token
 自动列出 app
+maker_list_apps
 用户选择 app
 maker_clone_to_current_directory
-maker_configure_remote_proxy
 maker_build_current_directory
 maker_submit_current_directory
-maker_push_current_directory
 ```
 
 说明：
 
 - Maker MCP 依赖用户本机已有 Git。工具只检测并给出安装引导，不会代替用户安装 Git。
 - 用户说“我要开发maker游戏 / 本地maker开发 / 拉取maker游戏到本地 / 把maker游戏代码拉到本地 / clone maker项目 / 下载maker游戏代码 / 初始化maker开发目录 / 配置maker本地开发 / 继续开发maker项目”时，应触发 Maker 本地开发初始化流程。
-- 如果 `maker_status` 或 `maker_check_environment` 显示 Git 缺失，必须持续提示用户自行安装 Git；在 `git --version` 可用前，不执行 clone、fetch、commit 或 push。
+- 如果 `maker_status` 显示 Git 缺失，必须持续提示用户自行安装 Git；在 `git --version` 可用前，不执行 clone、fetch、commit 或 push。
 - Maker API、git 和 TapTap token 默认走 PAT-first：如果用户还没有 PAT，引导用户打开临时 PAT 页面 `https://fuping.agnt.xd.com/pat-tokens` 新建 PAT；用户提供 PAT 后调用 `maker_exchange_pat(manual_pat)` 保存。
 - 保存 PAT 后会自动列出 app；`maker_status` 如果发现本地已有 PAT 且当前目录未绑定，也会自动列出 app，无需用户额外要求。
-- 保存 PAT 后会自动调用 `GET /api/v1/user/taptap-token` 获取并保存 TapTap MAC token；Tap OAuth 登录只作为 legacy fallback。
+- 保存 PAT 后会自动调用 `GET /api/v1/user/taptap-token` 获取并保存 TapTap MAC token。
 - `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。
+- 如果用户直接说“构建 / build / 重新构建游戏”，本地 Maker MCP 应调用 `maker_build_current_directory`。该工具会强制检查本地 Maker 项目是否有未提交改动。
+- 如果构建前发现本地有改动且尚未保存自动提交偏好，工具会停止并提示用户选择：`提交本地改动并触发构建（以后都是如此）`，或明确不提交、只构建云端已有版本。
+- 用户选择 `提交本地改动并触发构建（以后都是如此）` 后，应再次调用 `maker_build_current_directory` 并传入 `submit_local_changes_before_build=true` 和 `remember_build_submit_preference=true`；工具会完整执行 commit + push + build，并在当前项目 `.maker-mcp/config.json` 记住偏好。
+- 保存偏好后，后续用户说“构建”且本地有改动时，`maker_build_current_directory` 会默认自动提交并继续执行远端 build，不再重复询问。
+- 只有当用户明确说“不提交 / 直接构建云端版本”时，才可再次调用 `maker_build_current_directory` 并传入 `confirm_remote_build_without_submit=true`。
+- 用户说“查看结果 / 预览 / 跑一下 / 验证一下 / 看看效果”时，也按构建流程处理；如果本地有改动，先提醒用户选择是否提交，确认提交后执行 commit + push + build。
 - 构建转发会从 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`。
+- 用户未指定构建入口且本地存在 `scripts/main.lua` 时，Maker MCP 默认向远端 build 传 `scriptsPath="scripts"` 和 `entry="main.lua"`，避免第一次构建多一轮“入口配置缺失”的提示；用户显式传入口或多人入口时优先生效。
+- 远端 proxy 配置是内部能力，不单独暴露给 Agent；构建工具会在需要时直接使用远端 Maker MCP。
+- 用户说“帮我提交/提交代码”时使用 `maker_submit_current_directory`，会对当前 Maker 项目执行 commit + push + build；只有实际 push 成功后才继续远端 build。
+- “帮我提交代码到maker / taptap制造 / tap制造 / tap / push / 提交并推送”也应触发 `maker_submit_current_directory`，并在 push 成功后继续远端 build。
 - 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 百分比，最终返回会包含耗时和最近进度。
@@ -332,15 +334,15 @@ Issue #162 引入了 Maker 本地 MCP，用于后续支持 Maker 登录、项目
 
 ```text
 maker_status
-maker_check_environment
 maker_exchange_pat
 自动获取 TapTap token
 自动列出 app
+maker_list_apps
 maker_clone_to_current_directory
-maker_push_current_directory
+maker_submit_current_directory
 ```
 
-`maker_check_environment` 只做检测和引导，不安装 Git。若 Git 不可用，clone/push 会直接停止，直到用户自行安装 Git 并通过 `git --version` 验证。
+`maker_status` 会检查 Git 并输出初始化引导。若 Git 不可用，clone/push 会直接停止，直到用户自行安装 Git 并通过 `git --version` 验证。
 
 测试时引导用户访问临时 PAT 页面 `https://fuping.agnt.xd.com/pat-tokens` 新建 Maker PAT，
 再作为 `manual_pat` 传给 `maker_exchange_pat`，工具会同步获取 TapTap token。

package/dist/maker.js

@@ -25655,7 +25655,7 @@ function formatBrowserJwtGuide() {
     `1. 在 Chrome 打开 ${makerWebUrl} 并确认已登录。`,
     "2. 打开开发者工具，进入 Application -> Local storage。",
     "3. 找到 `taptap_access_token` 并拿到它的 value 给我。",
-    "拿到 value 后，MCP 会将它作为 `manual_jwt` 传给 maker_exchange_jwt。",
+    "拿到 value 后，可将它作为 legacy JWT 传给仍支持 jwt 参数的 Maker 内部流程。",
     "",
     `MCP 会把 JWT 保存到本地 ${process.env.TAPTAP_MAKER_HOME || "~/.taptap-maker"}/jwt.json。`
   ].join("\n");
@@ -25711,34 +25711,6 @@ async function exchangeTapTokenForMakerJwt(tapToken) {
   saveJwt(jwt2);
   return jwt2;
 }
-async function exchangeSavedTapAuthForMakerJwt(options) {
-  const exchangeUrl = getMakerJwtExchangeUrl();
-  const tapAuth = loadTapAuth();
-  if (exchangeUrl && tapAuth) {
-    return exchangeTapTokenForMakerJwt(tapAuth);
-  }
-  const manualJwt = getManualMakerJwt(options == null ? void 0 : options.manualJwt);
-  if (manualJwt == null ? void 0 : manualJwt.token) {
-    const saved = saveManualMakerJwt(manualJwt.token);
-    return saved;
-  }
-  const cachedJwt = loadJwt();
-  if (cachedJwt) {
-    return cachedJwt;
-  }
-  if (!exchangeUrl) {
-    throw new Error(
-      [
-        `${JWT_EXCHANGE_ENV} is not configured. Provide manual_jwt for now.`,
-        "",
-        formatBrowserJwtGuide()
-      ].join("\n")
-    );
-  }
-  throw new Error(
-    "Tap auth not found. Call maker_tap_login_start and maker_tap_login_complete first."
-  );
-}
 function requireMakerJwt(manualJwt) {
   const jwt2 = getManualMakerJwt(manualJwt) || loadJwt();
   if (!jwt2) {
@@ -25751,7 +25723,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.6" : "dev";
+var MAKER_VERSION = true ? "1.22.0-beta.8" : "dev";
 async function startTapDeviceLogin() {
   ensureMakerClientId();
   const environment = EnvConfig.environment;
@@ -25775,7 +25747,7 @@ async function completeTapDeviceLogin(options) {
   const session = (options == null ? void 0 : options.deviceCode) ? null : loadTapDeviceSession();
   const deviceCode = (options == null ? void 0 : options.deviceCode) || (session == null ? void 0 : session.device_code);
   if (!deviceCode) {
-    throw new Error("Tap device_code not found. Call maker_tap_login_start first.");
+    throw new Error("Tap device_code not found. Use maker_exchange_pat with a valid Maker PAT.");
   }
   const environment = (session == null ? void 0 : session.environment) || EnvConfig.environment;
   const intervalMs = ((session == null ? void 0 : session.interval_seconds) || 3) * 1e3;
@@ -26595,6 +26567,30 @@ async function pushMakerProject(options) {
     status: "pushed"
   };
 }
+async function readMakerProjectLocalChanges(cwd) {
+  ensureGitAvailable();
+  const requestedDir = path6.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 = path6.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 rawStatus = await readGit(["status", "--porcelain", "-z"], projectRoot);
+  const files = parseGitStatusFiles(rawStatus).filter(
+    (file2) => file2 !== ".maker-mcp" && !file2.startsWith(".maker-mcp/")
+  );
+  return {
+    hasChanges: files.length > 0,
+    projectRoot,
+    files,
+    rawStatus
+  };
+}
 function ensureTargetCanBindApp(target, appId) {
   const existingConfig = loadProjectConfig(target);
   if (!(existingConfig == null ? void 0 : existingConfig.project_id) || existingConfig.project_id === appId) {
@@ -26625,6 +26621,22 @@ function generateCommitMessage(status) {
   }
   return "chore: update maker project";
 }
+function parseGitStatusFiles(status) {
+  const entries = status.split("\0").filter(Boolean);
+  const files = [];
+  for (let index = 0; index < entries.length; index += 1) {
+    const entry = entries[index];
+    const statusCode = entry.slice(0, 2);
+    const file2 = entry.slice(3);
+    if (file2) {
+      files.push(file2);
+    }
+    if (statusCode.includes("R") || statusCode.includes("C")) {
+      index += 1;
+    }
+  }
+  return files;
+}
 async function readAheadState(cwd) {
   var _a2;
   try {
@@ -26689,9 +26701,9 @@ function nextActionForFailure(classification) {
     case "git_missing":
       return "本机未检测到可用的 Git。请用户自行安装 Git，并在 `git --version` 可用后重启 MCP 客户端再重试；安装前不要执行 clone、fetch、commit 或 push。";
     case "auth":
-      return "刷新 Maker PAT 后重试 maker_push_current_directory；如果仍失败，请确认 PAT 是否过期或缺少 Maker git 权限。";
+      return "刷新 Maker PAT 后重试 maker_submit_current_directory；如果仍失败，请确认 PAT 是否过期或缺少 Maker git 权限。";
     case "remote_transient":
-      return "远端 Maker git 服务临时不可用。不要重新提交，稍后直接重试 maker_push_current_directory。";
+      return "远端 Maker git 服务临时不可用。不要重新提交，稍后直接重试 maker_submit_current_directory。";
     case "remote_rejected":
       return "远端已有新提交。不要新建分支或要任务号，先询问用户是否 pull/rebase 当前 Maker 远端变更，再重试 push。";
     case "local":
@@ -27326,15 +27338,15 @@ function formatIdentifyHint() {
     "",
     "常见触发意图：我要开发maker游戏 / 本地maker开发 / 拉取maker游戏到本地 / 把maker游戏代码拉到本地 / 初始化maker开发目录。",
     "在 Codex/MCP 场景下，请不要运行 shell 命令 `taptap-maker init`。",
-    "初始化前必须先确认本机 Git 可用。若 `maker_status` 或 `maker_check_environment` 显示 Git 缺失，只能提示用户自行安装 Git；在 `git --version` 可用前不要执行 clone。",
-    "请按完整 MCP 工具流程初始化当前目录；当前默认使用 Maker PAT 获取 app 列表并执行 git clone/push。",
+    "初始化前必须先调用 `maker_status` 确认本机 Git 可用。若 Git 缺失，只能提示用户自行安装 Git；在 `git --version` 可用前不要执行 clone。",
+    "请按完整 MCP 工具流程初始化当前目录；当前默认使用 Maker PAT 获取 app 列表并执行 clone 和提交。",
     "",
-    "1. 调用 `maker_check_environment` 或查看 `maker_status`，确认 Git 已安装。",
+    "1. 调用 `maker_status`，确认 Git 已安装。",
     `2. 如果还没有 PAT，主动让用户打开临时 PAT 页面 ${TEMP_MAKER_PAT_TOKENS_URL} 新建 PAT，并把 PAT 发给你。`,
     "3. 调用 `maker_exchange_pat` 把 PAT 作为 `manual_pat` 保存；工具会自动获取 TapTap token 并列出可用 Maker Apps。",
     "4. 必须把 app 列表展示给用户，让用户选择。",
     "5. 用户选择后，调用 `maker_clone_to_current_directory` 把代码拉到当前对话目录。",
-    "6. 如果 PAT 获取 TapTap token 失败，再使用 `maker_tap_login_start` 和 `maker_tap_login_complete` 作为 fallback。",
+    "6. 如果 PAT 获取 TapTap token 失败，请确认 PAT 是否有效后重新调用 `maker_exchange_pat`。",
     "",
     `clone 成功后会在当前目录写入 ${getProjectMarkerDirName()}/config.json。`
   ].join("\n");
@@ -42381,54 +42393,14 @@ function isElectron() {
 }
 
 // src/maker/server/mcp.ts
-var VERSION = true ? "1.22.0-beta.6" : "dev";
-var DEFAULT_PROXY_MCP_NAME = "taptap-proxy";
+var VERSION = true ? "1.22.0-beta.8" : "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 MAKER_WEB_URL = getMakerWebUrl();
 var tools = [
-  {
-    name: "maker_tap_login_start",
-    description: "Legacy fallback: start TapTap OAuth device login for Maker. Prefer maker_exchange_pat because it can fetch and save TapTap token automatically with a Maker PAT.",
-    inputSchema: {
-      type: "object",
-      properties: {}
-    }
-  },
-  {
-    name: "maker_tap_login_complete",
-    description: "Legacy fallback: complete TapTap OAuth device login after the user says authorization is done. Saves Tap MAC auth locally for remote Maker MCP tools.",
-    inputSchema: {
-      type: "object",
-      properties: {
-        device_code: {
-          type: "string",
-          description: "Optional device_code from maker_tap_login_start. Defaults to the cached latest login session."
-        },
-        max_attempts: {
-          type: "number",
-          description: "Optional polling attempts. Defaults to 20; increase only when the user is still authorizing."
-        }
-      }
-    }
-  },
-  {
-    name: "maker_exchange_jwt",
-    description: `Prepare and save the Maker JWT used by Maker API and Git PAT operations. After Tap login is completed, ask the user to open ${MAKER_WEB_URL}, open Chrome DevTools > Application > Local storage, find \`taptap_access_token\`, give its value to the agent, and pass it as manual_jwt.`,
-    inputSchema: {
-      type: "object",
-      properties: {
-        manual_jwt: {
-          type: "string",
-          description: `Maker JWT copied from Chrome DevTools Application > Local storage key \`taptap_access_token\` on ${MAKER_WEB_URL}.`
-        }
-      }
-    }
-  },
   {
     name: "maker_exchange_pat",
-    description: `Prepare and save the Maker PAT used by Maker API app listing, Git operations, and TapTap token retrieval. Prefer this PAT-first flow over maker_exchange_jwt. If the user does not have a PAT, ask them to open the temporary PAT page ${TEMP_MAKER_PAT_TOKENS_URL}, create one, and give it to the agent. After saving PAT, this tool automatically fetches TapTap token and lists apps.`,
+    description: `Prepare and save the Maker PAT used by Maker API app listing, Git operations, and TapTap token retrieval. If the user does not have a PAT, ask them to open the temporary PAT page ${TEMP_MAKER_PAT_TOKENS_URL}, create one, and give it to the agent. After saving PAT, this tool automatically fetches TapTap token and lists apps.`,
     inputSchema: {
       type: "object",
       properties: {
@@ -42442,40 +42414,20 @@ var tools = [
   },
   {
     name: "maker_list_apps",
-    description: "List Maker apps available to the current Maker PAT. Prefer cached PAT from maker_exchange_pat or the pat argument. JWT is accepted only as a legacy fallback. Always show the list to the user and ask them to choose before cloning.",
+    description: "List Maker apps available to the current Maker PAT. Prefer cached PAT from maker_exchange_pat or the pat argument. Always show the list to the user and ask them to choose before cloning.",
     inputSchema: {
       type: "object",
       properties: {
         pat: {
           type: "string",
           description: "Optional Maker PAT override. If provided, it is saved for later Maker operations."
-        },
-        jwt: {
-          type: "string",
-          description: "Legacy Maker JWT override. Prefer PAT instead."
         }
       }
     }
   },
   {
     name: "maker_status",
-    description: `Show local Maker MCP binding status, including whether Git is available. Use this as the first step for Maker local development requests such as "我要开发maker游戏", "本地maker开发", "拉取maker游戏到本地", "把maker游戏代码拉到本地", "clone maker项目", "打开/继续开发maker项目", or "初始化maker开发目录". If Git is missing, do not call clone/push/build-side git operations; keep showing the install guidance until the user installs Git and git --version works. If PAT is missing, ask the user to open the temporary PAT page ${TEMP_MAKER_PAT_TOKENS_URL}, create a PAT, give it to the agent, then call maker_exchange_pat. If PAT exists and no project is bound, this tool automatically lists apps; ask the user to choose an app, then call maker_clone_to_current_directory.`,
-    inputSchema: {
-      type: "object",
-      properties: {}
-    }
-  },
-  {
-    name: "maker_check_environment",
-    description: "Check local Maker MCP prerequisites. This tool only detects and guides; it MUST NOT install Git or modify the user machine. If Git is missing, show the platform-specific install guidance and do not run clone, fetch, commit, or push until the user installs Git and git --version works.",
-    inputSchema: {
-      type: "object",
-      properties: {}
-    }
-  },
-  {
-    name: "maker_setup_guide",
-    description: `Show setup guidance when the current directory is not bound to a Maker project yet. Use this for user intents like "我要开发maker游戏", "本地maker开发", "拉取maker游戏到本地", "把maker游戏代码拉到本地", "clone maker游戏", "下载maker项目代码", "初始化maker项目", or "配置maker本地开发". In Codex/MCP mode, first make sure Git is installed by checking maker_status or maker_check_environment. If Git is missing, keep showing the install guidance and do not clone. If PAT is missing, ask the user to open the temporary PAT page ${TEMP_MAKER_PAT_TOKENS_URL}, create a PAT, give it to the agent, then call maker_exchange_pat; maker_exchange_pat automatically lists apps after saving PAT. If PAT already exists, maker_status automatically lists apps. Ask the user to choose an app, then maker_clone_to_current_directory. Do not ask for app_id upfront and do not run shell commands.`,
+    description: `Show local Maker MCP status, environment prerequisites, and initialization guidance. Use this as the first step for Maker local development requests such as "我要开发maker游戏", "本地maker开发", "拉取maker游戏到本地", "把maker游戏代码拉到本地", "clone maker项目", "打开/继续开发maker项目", "初始化maker开发目录", or "配置maker本地开发". This tool includes the Git prerequisite check and setup guide; do not look for separate environment or setup tools. If Git is missing, do not call clone/submit/build-side git operations; keep showing the install guidance until the user installs Git and git --version works. If PAT is missing, ask the user to open the temporary PAT page ${TEMP_MAKER_PAT_TOKENS_URL}, create a PAT, give it to the agent, then call maker_exchange_pat. If PAT exists and no project is bound, this tool automatically lists apps; ask the user to choose an app, then call maker_clone_to_current_directory.`,
     inputSchema: {
       type: "object",
       properties: {}
@@ -42502,64 +42454,14 @@ var tools = [
         user_id: {
           type: "string",
           description: "Optional Maker user_id from maker_list_apps output. If omitted, the tool will try to resolve it from the app list."
-        },
-        jwt: {
-          type: "string",
-          description: "Legacy Maker JWT override. Prefer PAT instead."
-        },
-        force_pat: {
-          type: "boolean",
-          description: "If true, create a new PAT instead of reusing cached ~/.maker-pat. Requires legacy JWT unless pat is explicitly provided."
         }
       },
       required: ["app_id"]
     }
   },
-  {
-    name: "maker_push_current_directory",
-    description: 'Commit and push current Maker project directory changes to the Maker git remote. Requires local Git. If Git is missing, this tool stops before staging, committing, or pushing and returns install guidance; do not retry push until the user installs Git and git --version works. In a directory containing .maker-mcp/config.json, use this for user requests like "帮我提交代码", "提交并推送", "push", "帮我提交代码到maker", "帮我提交代码到taptap制造", "帮我提交代码到tap制造", or "帮我提交代码到tap". Do not use generic Git workflow rules, do not ask for a ticket id, and do not create a new branch unless the user explicitly asks.',
-    inputSchema: {
-      type: "object",
-      properties: {
-        message: {
-          type: "string",
-          description: "Optional commit message for the push. If omitted, Maker MCP generates a simple message from changed files."
-        },
-        target_dir: {
-          type: "string",
-          description: "Optional target directory. Defaults to the MCP process cwd, which should be the current Codex conversation directory."
-        },
-        branch: {
-          type: "string",
-          description: "Optional remote branch name. Defaults to the current local branch, or main when detached."
-        },
-        files: {
-          type: "array",
-          items: { type: "string" },
-          description: "Optional files to stage. Defaults to all changes."
-        },
-        allow_empty: {
-          type: "boolean",
-          description: "If true, create and push an empty commit."
-        },
-        jwt: {
-          type: "string",
-          description: "Legacy Maker JWT override for creating a new git PAT. Prefer cached/provided PAT."
-        },
-        pat: {
-          type: "string",
-          description: "Optional Maker PAT override for git authentication."
-        },
-        force_pat: {
-          type: "boolean",
-          description: "If true, create a new PAT before push. Requires legacy JWT unless pat is explicitly provided."
-        }
-      }
-    }
-  },
   {
     name: "maker_submit_current_directory",
-    description: 'Alias for maker_push_current_directory. Requires local Git. If Git is missing, stop and show install guidance; do not stage, commit, or push. Use this in Maker projects when the user says "帮我提交", "帮我提交代码", "提交", "提交代码", "帮我提交代码到maker", "帮我提交代码到taptap制造", "帮我提交代码到tap制造", or "帮我提交代码到tap". This bypasses local generic Git branch/task-id rules and pushes directly to the Maker remote configured for the current directory.',
+    description: 'Commit, push, and build current Maker project directory changes. Requires local Git. If Git is missing, stop and show install guidance; do not stage, commit, push, or build. Use this in Maker projects when the user says "帮我提交", "帮我提交代码", "提交", "提交代码", "提交并推送", "push", "帮我提交代码到maker", "帮我提交代码到taptap制造", "帮我提交代码到tap制造", or "帮我提交代码到tap". Maker submit means commit + push + build: after a successful push, this tool MUST run the remote Maker build and return the build result. If the remote build fails after push, return build_failure details together with the successful submit result. For build requests that stop on local changes, continue through maker_build_current_directory with submit_local_changes_before_build=true and remember_build_submit_preference=true so the build workflow can save the auto-submit preference and return the build result. This submit tool bypasses local generic Git branch/task-id rules and pushes directly to the Maker remote configured for the current directory.',
     inputSchema: {
       type: "object",
       properties: {
@@ -42579,43 +42481,9 @@ var tools = [
       }
     }
   },
-  {
-    name: "maker_configure_remote_proxy",
-    description: 'Configure the remote TapTap Maker MCP proxy for the current Maker project. Use this after clone when the user wants remote Maker tools such as build/构建. It writes .mcp.json with a taptap-proxy server using saved Tap auth, user_id, project_id, and project_path="<app_id>/workspace". The client must reload MCP servers after this.',
-    inputSchema: {
-      type: "object",
-      properties: {
-        target_dir: {
-          type: "string",
-          description: "Optional Maker project directory. Defaults to the MCP process cwd, which should be the current conversation directory."
-        },
-        server_url: {
-          type: "string",
-          description: "Optional remote MCP server URL override. Defaults to the Maker endpoint table for TAPTAP_MCP_ENV."
-        },
-        env: {
-          type: "string",
-          enum: ["rnd", "production"],
-          description: "Remote MCP environment. Defaults to TAPTAP_MCP_ENV."
-        },
-        mcp_name: {
-          type: "string",
-          description: "MCP server name to write in .mcp.json. Defaults to taptap-proxy."
-        },
-        use_npx: {
-          type: "boolean",
-          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",
-          description: "Package used when use_npx=true. Defaults to @taptap/instant-games-open-mcp@1.22.0."
-        }
-      }
-    }
-  },
   {
     name: "maker_build_current_directory",
-    description: 'Build the current Maker game by forwarding to the remote TapTap Maker MCP build tool. MUST use this for user requests like "构建", "build", "重新构建游戏", "帮我构建maker游戏", "compile", or "run" in a Maker project. Do not write local build scripts. Uses saved Tap auth and current .maker-mcp/config.json project binding to call the remote build tool through taptap-proxy.',
+    description: 'Build the current Maker game by forwarding to the remote TapTap Maker MCP build tool. MUST use this for user requests like "构建", "build", "重新构建游戏", "帮我构建maker游戏", "compile", or "run" in a Maker project. The tool itself enforces a local-change guard before remote build: if local Maker project changes exist, it will stop unless confirm_remote_build_without_submit is true, submit_local_changes_before_build is true, or the project has saved build_local_changes_policy=auto_submit. Explain to the user that direct build only uses the Maker remote committed version and may not include local edits. The primary option should be "提交本地改动并触发构建（以后都是如此）"; if the user chooses it, call maker_build_current_directory again with submit_local_changes_before_build=true and remember_build_submit_preference=true. Maker MCP will commit + push local changes, then run remote build and return the build result. If auto_submit preference is already saved, this build tool will submit local changes automatically and then run remote build. If the user explicitly says not to submit and wants to build the remote version, call this tool with confirm_remote_build_without_submit=true. Do not write local build scripts. Uses saved Tap auth and current .maker-mcp/config.json project binding to call the remote build tool through taptap-proxy.',
     inputSchema: {
       type: "object",
       properties: {
@@ -42625,11 +42493,11 @@ var tools = [
         },
         entry: {
           type: "string",
-          description: 'Optional single-player Lua entry file relative to scriptsPath, e.g. "main.lua". Omit to let the remote build tool infer/default.'
+          description: 'Optional single-player Lua entry file relative to scriptsPath, e.g. "main.lua". If omitted and local scripts/main.lua exists with no explicit multiplayer entries, Maker MCP sends entry="main.lua" and scriptsPath="scripts" by default to avoid remote entry-missing prompts. Otherwise omit to let the remote build tool infer/default.'
         },
         scriptsPath: {
           type: "string",
-          description: 'Optional scripts directory relative to workspace. Remote build defaults to "scripts" when omitted.'
+          description: 'Optional scripts directory relative to workspace. If omitted and local scripts/main.lua exists with no explicit entry overrides, Maker MCP sends scriptsPath="scripts" by default.'
         },
         entry_client: {
           type: "string",
@@ -42655,6 +42523,18 @@ var tools = [
         timeout_ms: {
           type: "number",
           description: "Optional remote build timeout in milliseconds. Defaults to 10 minutes. If timed out, do not retry blindly; inspect remote build logs first."
+        },
+        confirm_remote_build_without_submit: {
+          type: "boolean",
+          description: "Set true only after the user explicitly confirms they do not want to submit local changes and want to build the current Maker remote committed version."
+        },
+        submit_local_changes_before_build: {
+          type: "boolean",
+          description: 'Set true only after the user explicitly chooses "提交本地改动并触发构建（以后都是如此）". Maker MCP will commit + push local changes, then run the remote build and return the build result.'
+        },
+        remember_build_submit_preference: {
+          type: "boolean",
+          description: 'Set true together with submit_local_changes_before_build when the user chooses "提交本地改动并触发构建（以后都是如此）". Saves build_local_changes_policy=auto_submit for future build requests.'
         }
       }
     }
@@ -42687,100 +42567,6 @@ async function startMakerMcpServer() {
           ]
         };
       }
-      if (name === "maker_check_environment") {
-        return {
-          content: [
-            {
-              type: "text",
-              text: formatEnvironment()
-            }
-          ]
-        };
-      }
-      if (name === "maker_tap_login_start") {
-        const session = await startTapDeviceLogin();
-        return {
-          content: [
-            {
-              type: "text",
-              text: [
-                "TapTap login started",
-                "",
-                "请让用户打开下面链接或用 TapTap App 扫码授权：",
-                session.auth_url,
-                "",
-                `- environment: ${session.environment}`,
-                `- expires_at: ${session.expires_at}`,
-                `- interval_seconds: ${session.interval_seconds}`,
-                "",
-                "授权完成后调用 maker_tap_login_complete。"
-              ].join("\n")
-            }
-          ]
-        };
-      }
-      if (name === "maker_tap_login_complete") {
-        const args = request.params.arguments || {};
-        const auth = await completeTapDeviceLogin({
-          deviceCode: args.device_code,
-          maxAttempts: args.max_attempts
-        });
-        return {
-          content: [
-            {
-              type: "text",
-              text: [
-                "✓ TapTap login completed",
-                "",
-                `- kid: ${mask2(auth.kid)}`,
-                `- token_type: ${auth.token_type}`,
-                `- mac_algorithm: ${auth.mac_algorithm}`,
-                `- saved: ${getTapAuthPath()}`,
-                "",
-                "如果还未保存 Maker PAT，下一步调用 maker_exchange_pat。"
-              ].join("\n")
-            }
-          ]
-        };
-      }
-      if (name === "maker_exchange_jwt") {
-        const args = request.params.arguments || {};
-        if (!args.manual_jwt && !loadJwt() && !getMakerJwtExchangeUrl()) {
-          return {
-            isError: true,
-            content: [
-              {
-                type: "text",
-                text: [
-                  "Maker JWT is required before listing apps or cloning projects.",
-                  "",
-                  formatBrowserJwtGuide()
-                ].join("\n")
-              }
-            ]
-          };
-        }
-        const jwt2 = await exchangeSavedTapAuthForMakerJwt({
-          manualJwt: args.manual_jwt
-        });
-        return {
-          content: [
-            {
-              type: "text",
-              text: [
-                "✓ Maker JWT ready",
-                "",
-                `- jwt: ${mask2(jwt2.token)}`,
-                `- user_id: ${jwt2.user_id || "(unknown)"}`,
-                `- implementation: ${getMakerJwtExchangeUrl() ? "remote_exchange" : "temporary_cached_or_manual_jwt"}`,
-                `- saved: ${getJwtPath()}`,
-                "",
-                "下一步调用 maker_list_apps。"
-              ].join("\n")
-            }
-          ]
-        };
-      }
       if (name === "maker_exchange_pat") {
         const args = request.params.arguments || {};
         if (!args.manual_pat) {
@@ -42835,8 +42621,7 @@ async function startMakerMcpServer() {
       if (name === "maker_list_apps") {
         const args = request.params.arguments || {};
         const projects = await listMakerProjects({
-          pat: args.pat,
-          jwt: args.jwt
+          pat: args.pat
         });
         return {
           content: [
@@ -42847,16 +42632,6 @@ async function startMakerMcpServer() {
           ]
         };
       }
-      if (name === "maker_setup_guide") {
-        return {
-          content: [
-            {
-              type: "text",
-              text: formatIdentifyHint()
-            }
-          ]
-        };
-      }
       if (name === "maker_clone_to_current_directory") {
         const args = request.params.arguments || {};
         if (!args.app_id) {
@@ -42876,8 +42651,6 @@ async function startMakerMcpServer() {
             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
           });
@@ -42905,26 +42678,21 @@ async function startMakerMcpServer() {
           ]
         };
       }
-      if (name === "maker_push_current_directory" || name === "maker_submit_current_directory") {
+      if (name === "maker_submit_current_directory") {
         const args = request.params.arguments || {};
         const targetDir = args.target_dir || process.cwd();
         const progressReporter = createToolProgressReporter(
           (_b = request.params._meta) == null ? void 0 : _b.progressToken,
           extra,
-          "Maker push"
+          "Maker submit"
         );
         let result;
         let progressSummary;
         try {
-          result = await pushMakerProject({
-            cwd: targetDir,
+          result = await pushThenBuildCurrentDirectory({
+            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();
@@ -42941,25 +42709,6 @@ async function startMakerMcpServer() {
           ]
         };
       }
-      if (name === "maker_configure_remote_proxy") {
-        const args = request.params.arguments || {};
-        const result = configureRemoteProxy({
-          targetDir: args.target_dir || process.cwd(),
-          serverUrl: args.server_url,
-          env: args.env,
-          mcpName: args.mcp_name,
-          useNpx: args.use_npx === true,
-          pkg: args.pkg
-        });
-        return {
-          content: [
-            {
-              type: "text",
-              text: formatRemoteProxyResult(result)
-            }
-          ]
-        };
-      }
       if (name === "maker_build_current_directory") {
         const args = request.params.arguments || {};
         const progressReporter = createToolProgressReporter(
@@ -42980,6 +42729,9 @@ async function startMakerMcpServer() {
             serverUrl: args.server_url,
             env: args.env,
             timeoutMs: args.timeout_ms,
+            confirmRemoteBuildWithoutSubmit: args.confirm_remote_build_without_submit,
+            submitLocalChangesBeforeBuild: args.submit_local_changes_before_build,
+            rememberBuildSubmitPreference: args.remember_build_submit_preference,
             onProgress: progressReporter.report
           });
           progressSummary = progressReporter.finish();
@@ -43035,19 +42787,21 @@ async function formatStatus() {
       ].join("\n");
     }
   }
-  const tapSession = loadTapDeviceSession();
   const git = checkGitEnvironment();
   const projectSection = identify.projectId ? [
     "当前目录已绑定 Maker 项目。",
-    "如果用户要求“帮我提交代码 / 提交并推送 / push / 帮我提交代码到maker / 帮我提交代码到taptap制造 / 帮我提交代码到tap制造 / 帮我提交代码到tap”，必须调用 maker_submit_current_directory 或 maker_push_current_directory。",
-    "不要套用本地通用 Git skill 的任务号、默认分支保护、新建分支规则；Maker push 按远端 Maker 仓库当前分支直接提交并推送。"
+    "如果用户要求“帮我提交代码 / 提交并推送 / push / 帮我提交代码到maker / 帮我提交代码到taptap制造 / 帮我提交代码到tap制造 / 帮我提交代码到tap”，必须调用 maker_submit_current_directory；提交/推送成功后工具会继续执行远端 build。",
+    "如果用户要求“构建 / build / 重新构建 / 查看结果 / 预览 / 跑一下 / 验证一下”，必须先经过 maker_build_current_directory 的本地改动强制检查；有本地改动时不要静默构建云端旧版本，应询问用户是否提交。",
+    "优先选项文案应是“提交本地改动并触发构建（以后都是如此）”；用户选择后再次调用 maker_build_current_directory，并设置 submit_local_changes_before_build=true 和 remember_build_submit_preference=true。",
+    "Maker 构建入口负责完整执行 commit + push + build；保存偏好后，后续构建遇到本地改动会自动提交并继续构建。",
+    "用户明确说不提交、直接构建云端版本时，才允许调用 maker_build_current_directory 并设置 confirm_remote_build_without_submit=true。",
+    "不要套用本地通用 Git skill 的任务号、默认分支保护、新建分支规则；Maker 提交流程按远端 Maker 仓库当前分支直接提交并推送。"
   ].join("\n") : pat ? await formatAutoProjectListFromPat() : formatIdentifyHint();
   return [
     "TapTap Maker MCP status",
     "",
     `- version: ${VERSION}`,
     `- tap_auth: ${tapAuth ? "found" : "missing"} (${getTapAuthPath()})`,
-    `- tap_login_session: ${tapSession ? "found" : "missing"} (${getTapDeviceSessionPath()})`,
     `- pat: ${pat ? "found" : "missing"} (${getPatPath()})`,
     `- project_source: ${identify.source}`,
     `- project_id: ${identify.projectId || "(none)"}`,
@@ -43069,6 +42823,19 @@ async function formatStatus() {
     projectSection
   ].filter(Boolean).join("\n");
 }
+function rememberBuildSubmitPreference(targetDir) {
+  const identify = identifyMakerProject({ cwd: targetDir });
+  if (!identify.projectRoot || !identify.projectId) {
+    throw new Error(
+      `${targetDir} is not bound to a Maker project. Cannot save build submit preference.`
+    );
+  }
+  saveProjectConfig(identify.projectRoot, {
+    ...identify.config || { project_id: identify.projectId },
+    project_id: identify.projectId,
+    build_local_changes_policy: "auto_submit"
+  });
+}
 async function formatAutoProjectListFromPat() {
   try {
     const projects = await listMakerProjects();
@@ -43086,18 +42853,6 @@ async function formatAutoProjectListFromPat() {
     ].join("\n");
   }
 }
-function formatEnvironment() {
-  const git = checkGitEnvironment();
-  return [
-    "TapTap Maker MCP environment",
-    "",
-    `- version: ${VERSION}`,
-    `- node_version: ${process.version}`,
-    formatGitEnvironmentStatus(git),
-    "",
-    git.installed ? "Git 已可用，可以继续 Maker 登录、列出 app、clone 或 push 流程。" : "Git 未可用。安装并验证 Git 前，Maker MCP 不会执行 clone、fetch、commit 或 push。"
-  ].join("\n");
-}
 function mask2(value) {
   if (value.length <= 12) {
     return "***";
@@ -43153,9 +42908,7 @@ function createRemoteProxyContext(options) {
   const projectId = (projectConfig == null ? void 0 : projectConfig.project_id) || identify.projectId;
   const tapAuth = loadTapAuth();
   if (!tapAuth) {
-    throw new Error(
-      "Tap auth not found. Run maker_tap_login_start and maker_tap_login_complete first."
-    );
+    throw new Error("Tap auth not found. Run maker_exchange_pat with a valid Maker PAT first.");
   }
   let userId = projectConfig == null ? void 0 : projectConfig.user_id;
   if (!userId) {
@@ -43208,35 +42961,6 @@ function createRemoteProxyContext(options) {
     }
   };
 }
-function configureRemoteProxy(options) {
-  const mcpName = options.mcpName || DEFAULT_PROXY_MCP_NAME;
-  const proxy = createRemoteProxyContext(options);
-  const mcpJsonPath = path9.join(proxy.projectRoot, ".mcp.json");
-  const mcpJson = readMcpJson(mcpJsonPath);
-  mcpJson.mcpServers = {
-    ...mcpJson.mcpServers || {},
-    [mcpName]: {
-      command: proxy.command,
-      args: proxy.args,
-      env: proxy.envVars
-    }
-  };
-  fs6.writeFileSync(mcpJsonPath, JSON.stringify(mcpJson, null, 2) + "\n", "utf8");
-  excludeProjectMcpJson(proxy.projectRoot);
-  return {
-    mcpJsonPath,
-    projectRoot: proxy.projectRoot,
-    mcpName,
-    serverUrl: proxy.serverUrl,
-    env: proxy.env,
-    projectId: proxy.projectId,
-    projectPath: proxy.projectPath,
-    userId: proxy.userId,
-    command: proxy.command,
-    args: proxy.args,
-    envVars: proxy.envVars
-  };
-}
 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)) : "";
@@ -43255,70 +42979,6 @@ function resolveLocalProxyBundle(options) {
   }
   throw new Error(`MCP proxy bundle not found. Checked: ${candidates.join(", ")}`);
 }
-function readMcpJson(filePath) {
-  if (!fs6.existsSync(filePath)) {
-    return {};
-  }
-  try {
-    return JSON.parse(fs6.readFileSync(filePath, "utf8"));
-  } catch (error2) {
-    throw new Error(
-      `Failed to parse existing .mcp.json: ${error2 instanceof Error ? error2.message : String(error2)}`
-    );
-  }
-}
-function excludeProjectMcpJson(projectRoot) {
-  const gitDir = path9.join(projectRoot, ".git");
-  if (!fs6.existsSync(gitDir)) {
-    return;
-  }
-  const infoDir = path9.join(gitDir, "info");
-  const excludePath = path9.join(infoDir, "exclude");
-  const entry = ".mcp.json";
-  fs6.mkdirSync(infoDir, { recursive: true });
-  const existing = fs6.existsSync(excludePath) ? fs6.readFileSync(excludePath, "utf8") : "";
-  const hasEntry = existing.split("\n").map((line) => line.trim()).includes(entry);
-  if (hasEntry) {
-    return;
-  }
-  const prefix = existing.length > 0 && !existing.endsWith("\n") ? "\n" : "";
-  fs6.appendFileSync(excludePath, `${prefix}${entry}
-`, "utf8");
-}
-function formatRemoteProxyResult(result) {
-  return [
-    "✓ Remote Maker MCP proxy configured",
-    "",
-    `- mcp_name: ${result.mcpName}`,
-    `- project_root: ${result.projectRoot}`,
-    `- mcp_json: ${result.mcpJsonPath}`,
-    `- server_url: ${result.serverUrl}`,
-    `- env: ${result.env}`,
-    `- project_id: ${result.projectId}`,
-    `- project_path: ${result.projectPath}`,
-    `- user_id: ${result.userId || "(unknown)"}`,
-    `- command: ${result.command}`,
-    `- args: ${formatProxyArgs(result.args)}`,
-    `- env: ${formatProxyEnv(result.envVars)}`,
-    "",
-    "已将 .mcp.json 写入本地 .git/info/exclude，避免误提交包含认证信息的本地 MCP 配置。",
-    "下一步：请重启当前 Claude/Codex 对话或重新加载 MCP servers，然后远端 taptap-proxy 暴露的 build/构建 tools 才会出现。"
-  ].join("\n");
-}
-function formatProxyArgs(args) {
-  return args.map((arg) => {
-    if (arg.startsWith("{") && arg.includes("mac_key")) {
-      return "<proxy_cfg_with_auth>";
-    }
-    return arg;
-  }).join(" ");
-}
-function formatProxyEnv(envVars) {
-  if (!envVars) {
-    return "(none)";
-  }
-  return Object.keys(envVars).map((key) => `${key}=<redacted>`).join(" ");
-}
 function createToolProgressReporter(progressToken, extra, operationName) {
   var _a2;
   const startedAt = Date.now();
@@ -43398,8 +43058,64 @@ function formatDuration(ms) {
   return `${minutes}m ${seconds}s`;
 }
 async function buildCurrentDirectory(options) {
+  var _a2;
+  const localChanges = await readMakerProjectLocalChanges(options.targetDir);
+  if (localChanges.hasChanges && !options.confirmRemoteBuildWithoutSubmit) {
+    const config2 = loadProjectConfig(localChanges.projectRoot);
+    let buildLocalChangesPolicy = (config2 == null ? void 0 : config2.build_local_changes_policy) === "auto_submit" ? "auto_submit" : void 0;
+    if ((config2 == null ? void 0 : config2.build_local_changes_policy) === "auto_submit" || options.submitLocalChangesBeforeBuild) {
+      (_a2 = options.onProgress) == null ? void 0 : _a2.call(options, {
+        progress: 0,
+        total: 100,
+        phase: "auto_submit",
+        message: "Auto-submitting local Maker changes before build"
+      });
+      const submitResult = await (options.submitLocalChanges || pushMakerProject)({
+        cwd: localChanges.projectRoot,
+        onProgress: options.onProgress
+      });
+      if (options.rememberBuildSubmitPreference && !submitResult.failure) {
+        rememberBuildSubmitPreference(localChanges.projectRoot);
+        buildLocalChangesPolicy = "auto_submit";
+      }
+      if (submitResult.failure || !submitResult.pushed && submitResult.status !== "clean") {
+        return {
+          mode: "submit_failed_before_build",
+          projectRoot: localChanges.projectRoot,
+          projectId: (config2 == null ? void 0 : config2.project_id) || "unknown",
+          submitResult,
+          buildLocalChangesPolicy
+        };
+      }
+      let buildResult;
+      try {
+        buildResult = await runRemoteBuildCurrentDirectory(options, localChanges.projectRoot);
+      } catch (error2) {
+        return {
+          mode: "build_failed_after_submit",
+          projectRoot: localChanges.projectRoot,
+          projectId: (config2 == null ? void 0 : config2.project_id) || "unknown",
+          submitResult,
+          buildFailure: toMakerBuildFailure(error2),
+          buildLocalChangesPolicy
+        };
+      }
+      return {
+        ...buildResult,
+        submitResult,
+        buildLocalChangesPolicy
+      };
+    }
+    throw new Error(formatLocalChangesBeforeBuildMessage(localChanges.files));
+  }
+  return runRemoteBuildCurrentDirectory(options, options.targetDir);
+}
+async function runRemoteBuildCurrentDirectory(options, targetDir) {
+  if (options.callRemoteBuild) {
+    return options.callRemoteBuild(targetDir);
+  }
   const proxy = createRemoteProxyContext({
-    targetDir: options.targetDir,
+    targetDir,
     serverUrl: options.serverUrl,
     env: options.env
   });
@@ -43443,6 +43159,7 @@ async function buildCurrentDirectory(options) {
       }
     );
     return {
+      mode: "remote_build",
       projectRoot: proxy.projectRoot,
       projectId: proxy.projectId,
       projectPath: proxy.projectPath,
@@ -43456,6 +43173,65 @@ async function buildCurrentDirectory(options) {
     await client.close();
   }
 }
+async function pushThenBuildCurrentDirectory(options) {
+  const submitResult = await (options.pushLocalChanges || pushMakerProject)({
+    cwd: options.targetDir,
+    message: options.message,
+    files: options.files,
+    onProgress: options.onProgress
+  });
+  if (!submitResult.pushed) {
+    return {
+      targetDir: options.targetDir,
+      submitResult
+    };
+  }
+  let buildResult;
+  try {
+    buildResult = await runRemoteBuildCurrentDirectory(
+      {
+        targetDir: options.targetDir,
+        callRemoteBuild: options.callRemoteBuild,
+        onProgress: options.onProgress
+      },
+      options.targetDir
+    );
+  } catch (error2) {
+    return {
+      targetDir: options.targetDir,
+      submitResult,
+      buildFailure: toMakerBuildFailure(error2)
+    };
+  }
+  return {
+    targetDir: options.targetDir,
+    submitResult,
+    buildResult
+  };
+}
+function toMakerBuildFailure(error2) {
+  return {
+    name: error2 instanceof Error ? error2.name : typeof error2,
+    message: error2 instanceof Error ? error2.message : String(error2),
+    ...error2 instanceof Error && error2.stack ? { stack: error2.stack } : {}
+  };
+}
+function formatLocalChangesBeforeBuildMessage(files) {
+  const visibleFiles = files.slice(0, 20);
+  const hiddenCount = Math.max(0, files.length - visibleFiles.length);
+  return [
+    "Current Maker project has local changes that are not submitted.",
+    "",
+    "当前有本地修改还没有提交。直接构建只会构建 Maker 云端已有版本，可能看不到这些新修改。",
+    "请先询问用户选择：",
+    "- 提交本地改动并触发构建（以后都是如此）：再次调用 maker_build_current_directory，并设置 submit_local_changes_before_build=true 和 remember_build_submit_preference=true；工具会先 commit + push，再继续执行远端 build 并返回构建结果。后续构建遇到本地改动会默认自动提交并继续构建。",
+    "- 如果用户明确说不提交、直接构建云端版本，再调用 maker_build_current_directory，并设置 confirm_remote_build_without_submit=true。",
+    "",
+    "local_changes:",
+    ...visibleFiles.map((file2) => `- ${file2}`),
+    ...hiddenCount > 0 ? [`- ... and ${hiddenCount} more`] : []
+  ].join("\n");
+}
 function createBuildArgs(projectRoot, options) {
   const buildArgs = {};
   if (options.entry) {
@@ -43464,6 +43240,10 @@ function createBuildArgs(projectRoot, options) {
   if (options.scriptsPath) {
     buildArgs.scriptsPath = options.scriptsPath;
   }
+  if (!options.entry && !options.scriptsPath && !options.entryClient && !options.entryServer && !options.multiplayer && fs6.existsSync(path9.join(projectRoot, "scripts", "main.lua"))) {
+    buildArgs.entry = "main.lua";
+    buildArgs.scriptsPath = "scripts";
+  }
   if (options.entryClient) {
     buildArgs.entry_client = options.entryClient;
   }
@@ -43507,52 +43287,151 @@ function formatRemoteToolResult(result) {
   }).join("\n");
 }
 function formatBuildResult(result, progressSummary) {
-  return [
-    "✓ Remote Maker build finished",
+  if (result.mode === "submit_failed_before_build") {
+    return [
+      result.submitResult.pushed ? "✓ Maker project submitted; remote build was not started" : result.submitResult.status === "clean" ? "Maker project has no changes to submit; remote build was not started" : "✗ Maker project submit failed; remote build was not started",
+      "",
+      `- project_root: ${result.projectRoot}`,
+      `- project_id: ${result.projectId}`,
+      "- build_local_changes_policy: auto_submit",
+      `- branch: ${result.submitResult.branch}`,
+      `- status: ${result.submitResult.status}`,
+      `- committed: ${result.submitResult.committed ? "yes" : "no"}`,
+      result.submitResult.commitHash ? `- commit_hash: ${result.submitResult.commitHash}` : "",
+      result.submitResult.message ? `- commit_message: ${result.submitResult.message}` : "",
+      result.submitResult.ahead ? `- git_state: ${result.submitResult.ahead}` : "",
+      ...formatProgressSummary(progressSummary),
+      "",
+      "note: Maker build was not started because submit did not produce a pushed state.",
+      ...result.submitResult.failure ? ["", ...formatMakerFailureLines(result.submitResult.failure)] : []
+    ].filter(Boolean).join("\n");
+  }
+  if (result.mode === "build_failed_after_submit") {
+    return [
+      "✗ Maker project submitted, but remote Maker build failed",
+      "",
+      `- project_root: ${result.projectRoot}`,
+      `- project_id: ${result.projectId}`,
+      result.buildLocalChangesPolicy ? `- build_local_changes_policy: ${result.buildLocalChangesPolicy}` : "",
+      `- branch: ${result.submitResult.branch}`,
+      `- status: ${result.submitResult.status}`,
+      `- committed: ${result.submitResult.committed ? "yes" : "no"}`,
+      result.submitResult.commitHash ? `- commit_hash: ${result.submitResult.commitHash}` : "",
+      result.submitResult.message ? `- commit_message: ${result.submitResult.message}` : "",
+      result.submitResult.ahead ? `- git_state: ${result.submitResult.ahead}` : "",
+      ...formatProgressSummary(progressSummary),
+      "",
+      ...formatMakerBuildFailureLines(result.buildFailure)
+    ].filter(Boolean).join("\n");
+  }
+  const submitLines = result.submitResult ? [
+    "submit_result:",
+    `  - branch: ${result.submitResult.branch}`,
+    `  - status: ${result.submitResult.status}`,
+    `  - committed: ${result.submitResult.committed ? "yes" : "no"}`,
+    result.submitResult.commitHash ? `  - commit_hash: ${result.submitResult.commitHash}` : "",
+    result.submitResult.message ? `  - commit_message: ${result.submitResult.message}` : "",
+    result.submitResult.ahead ? `  - git_state: ${result.submitResult.ahead}` : "",
+    ""
+  ].filter(Boolean) : [];
+  const lines = [
+    result.submitResult ? "✓ Maker project submitted, then remote Maker build finished" : "✓ Remote Maker build finished",
     "",
     `- project_root: ${result.projectRoot}`,
     `- project_id: ${result.projectId}`,
     `- project_path: ${result.projectPath}`,
     `- server_url: ${result.serverUrl}`,
-    `- env: ${result.env}`,
+    `- env: ${result.env}`
+  ];
+  if (result.buildLocalChangesPolicy) {
+    lines.push(`- build_local_changes_policy: ${result.buildLocalChangesPolicy}`);
+  }
+  lines.push(
     `- timeout_ms: ${result.timeoutMs}`,
     `- build_args: ${JSON.stringify(result.buildArgs)}`,
     ...formatProgressSummary(progressSummary),
-    "",
-    "remote_result:",
-    indent(result.resultText)
-  ].join("\n");
+    ""
+  );
+  if (submitLines.length > 0) {
+    lines.push(...submitLines);
+  }
+  lines.push("remote_result:", indent(result.resultText));
+  return lines.join("\n");
 }
 function formatPushResult(targetDir, result, progressSummary) {
+  const submitResult = result.submitResult;
   const lines = [
-    result.pushed ? "✓ Maker project pushed" : result.status === "clean" ? "Maker project has no changes to push" : "✗ Maker project push failed",
+    result.buildResult ? "✓ Maker project pushed, then remote Maker build finished" : submitResult.pushed ? "✗ Maker project pushed, but remote build result is missing" : submitResult.status === "clean" ? "Maker project has no changes to push" : "✗ Maker project push failed",
     "",
     `- target_dir: ${targetDir}`,
-    `- branch: ${result.branch}`,
-    `- status: ${result.status}`,
-    `- committed: ${result.committed ? "yes" : "no"}`,
-    result.commitHash ? `- commit_hash: ${result.commitHash}` : "",
-    result.message ? `- commit_message: ${result.message}` : "",
-    result.ahead ? `- git_state: ${result.ahead}` : "",
+    `- branch: ${submitResult.branch}`,
+    `- status: ${submitResult.status}`,
+    `- committed: ${submitResult.committed ? "yes" : "no"}`,
+    submitResult.commitHash ? `- commit_hash: ${submitResult.commitHash}` : "",
+    submitResult.message ? `- commit_message: ${submitResult.message}` : "",
+    submitResult.ahead ? `- git_state: ${submitResult.ahead}` : "",
     ...formatProgressSummary(progressSummary)
   ].filter(Boolean);
-  if (!result.failure) {
-    return lines.join("\n");
+  if (result.buildResult) {
+    return [
+      ...lines,
+      "",
+      "remote_build:",
+      indent(
+        [
+          `- project_id: ${result.buildResult.projectId}`,
+          `- project_path: ${result.buildResult.projectPath}`,
+          `- server_url: ${result.buildResult.serverUrl}`,
+          `- env: ${result.buildResult.env}`,
+          `- timeout_ms: ${result.buildResult.timeoutMs}`,
+          `- build_args: ${JSON.stringify(result.buildResult.buildArgs)}`,
+          "",
+          "remote_result:",
+          indent(result.buildResult.resultText)
+        ].join("\n")
+      )
+    ].join("\n");
   }
+  if (result.buildFailure) {
+    return [
+      ...lines,
+      "",
+      "note: Maker project was pushed successfully, but remote build failed.",
+      "",
+      ...formatMakerBuildFailureLines(result.buildFailure)
+    ].join("\n");
+  }
+  if (!submitResult.failure) {
+    return [
+      ...lines,
+      "",
+      submitResult.pushed ? "note: This is an internal contract error: pushed=true requires remote_build or build_failure." : "note: Maker build was not started because no push was performed."
+    ].join("\n");
+  }
+  return [...lines, "", ...formatMakerFailureLines(submitResult.failure)].filter(Boolean).join("\n");
+}
+function formatMakerBuildFailureLines(failure) {
+  return [
+    "build_failure:",
+    `- error_name: ${failure.name}`,
+    `- message: ${failure.message}`,
+    failure.stack ? `- stack:
+${indent(failure.stack)}` : ""
+  ].filter(Boolean);
+}
+function formatMakerFailureLines(failure) {
   return [
-    ...lines,
-    "",
     "failure:",
-    `- stage: ${result.failure.stage}`,
-    `- classification: ${result.failure.classification}`,
-    `- exit_code: ${result.failure.exitCode ?? "(none)"}`,
-    result.failure.command ? `- command: ${result.failure.command}` : "",
-    result.failure.stderr ? `- stderr:
-${indent(result.failure.stderr)}` : "",
-    result.failure.stdout ? `- stdout:
-${indent(result.failure.stdout)}` : "",
-    `- next_action: ${result.failure.nextAction}`
-  ].filter(Boolean).join("\n");
+    `- stage: ${failure.stage}`,
+    `- classification: ${failure.classification}`,
+    `- exit_code: ${failure.exitCode ?? "(none)"}`,
+    failure.command ? `- command: ${failure.command}` : "",
+    failure.stderr ? `- stderr:
+${indent(failure.stderr)}` : "",
+    failure.stdout ? `- stdout:
+${indent(failure.stdout)}` : "",
+    `- next_action: ${failure.nextAction}`
+  ].filter(Boolean);
 }
 function formatToolException(toolName, error2) {
   const message = error2 instanceof Error ? error2.message : String(error2);
@@ -43579,7 +43458,7 @@ function formatToolException(toolName, error2) {
     "debug:",
     stack ? indent(stack) : indent(message),
     "",
-    "next_action: 请把上面的完整错误反馈给开发者；如果本地已有 commit 但 push 未完成，不要重复 commit，直接重试 maker_push_current_directory。"
+    "next_action: 请把上面的完整错误反馈给开发者；如果本地已有 commit 但 push 未完成，不要重复 commit，直接重试 maker_submit_current_directory。"
   ].join("\n");
 }
 function indent(value) {

package/dist/proxy.js

@@ -29137,7 +29137,7 @@ var LogWriter = class {
 };
 
 // src/mcp-proxy/proxy.ts
-var VERSION = true ? "1.22.0-beta.6" : "dev";
+var VERSION = true ? "1.22.0-beta.8" : "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.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 多人联机集成指南
+// window.MultiplayerManager = MultiplayerManager;`}]}}};var ws;ws="1.22.0-beta.8";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.6",
+  "version": "1.22.0-beta.8",
   "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",