@taptap/instant-games-open-mcp 1.22.0-beta.9 → 1.23.0

package/README.md

@@ -73,7 +73,7 @@ maker_submit_current_directory
 - `maker_clone_to_current_directory` 不要求当前目录为空；clone 前会检查本地目录，忽略 `.claude`、`.mcp`、`.skill`、`.config`、`.ini` 等点开头配置项，只对普通本地文件输出提醒。clone 最终结果固定包含 `Pre-clone local directory check` 区块；已有本地文件会保留，若与 Maker 项目文件同路径冲突则失败并列出冲突文件。
 - `maker_list_apps` 会解析 Maker `/apps` 返回的创建时间、最近会话时间、游戏类型、阶段、图标、置顶/归档/删除时间等字段，并保留原始 `raw` 数据。
 - PAT 会保存到 `~/.taptap-maker/pat.json`，并兼容旧的 `~/.maker-pat`、`PAT` / `MAKER_PAT` 环境变量。
-- Maker app 必须先通过 `maker_list_apps` 展示给用户选择，再调用 clone。
+- 只有当前目录未绑定且用户要初始化或 clone 时，才通过 app 列表让用户选择并调用 clone；已绑定目录里的 app 列表只作账号项目参考，应继续当前项目，除非用户明确要求切换或重新 clone。
 - Maker 后端地址按 `TAPTAP_MCP_ENV` 从 `src/maker/config.ts` 的环境配置表读取，本地 MCP 配置只需要切 `rnd` / `production`。
 - 如果用户直接说“构建 / build / 重新构建游戏”，本地 Maker MCP 应调用 `maker_build_current_directory`。该工具会强制检查本地 Maker 项目是否有未提交改动。
 - 如果构建前发现本地有改动且尚未保存自动提交偏好，工具会停止并提示用户选择：`提交本地改动并触发构建（以后都是如此）`，或明确不提交、只构建云端已有版本。
@@ -92,16 +92,17 @@ maker_submit_current_directory
 
 ### Maker 本地 Workflow Skills（实验中）
 
-Maker 现在同时内置两个工作流 skill：
+Maker 现在同时内置三个工作流 skill：
 
 - `taptap-maker-local`：把 Maker 初始化、clone、pull、提交、推送和冲突处理交给用户本地 AI/Agent 参与判断；原有 Maker MCP tools 业务暂时保持不变。
+- `taptap-maker-dev-kit-guide`：介绍 clone 时安装到项目目录的 AI dev kit，明确 `CLAUDE.md`、`examples/`、`templates/`、`urhox-libs/` 的用途。
 - `update-taptap-mcp`：引导用户更新本地 npx 缓存里的 `@taptap/instant-games-open-mcp`，并提醒 Maker MCP 推荐安装到 user/global scope。
 
 初始化流程里，PAT 验证通过、用户选择 app 后，`maker_clone_to_current_directory` 会自动准备本地 AI dev kit。
 
 clone 工具会下载 `https://urhox-demo-platform.spark.xd.com/ai-dev-kit/pd/stable/ai-dev-kit.zip`，解压开发环境文档、引擎 API、demo 和本地 AI skills 到当前目录；会跳过 ZIP 里的顶层 `scripts` 目录并删除下载 ZIP，避免和 Maker 项目代码冲突。clone 前会先生成 `.gitignore.dev-kit-before-clone` 临时 block，clone 成功后自动合并到远端 `.gitignore`，防止这些本地开发环境文件被提交到 Maker Git。
 
-`maker_status` 会输出已随包内置的 skill 名称和文档路径：`taptap-maker-local` 与 `update-taptap-mcp`。除此之外不做编辑器安装引导。
+`maker_status` 会输出已随包内置的 skill 名称和文档路径：`taptap-maker-local`、`taptap-maker-dev-kit-guide` 与 `update-taptap-mcp`。除此之外不做编辑器安装引导。Maker 操作目标是用户当前项目目录；若 MCP 进程 cwd 是临时对话目录，Agent 应把用户当前项目目录作为 `target_dir` 传入，不让用户选择目录、不扫描其他项目。已绑定项目会检查 `CLAUDE.md`、`examples/`、`templates/`、`urhox-libs/`，缺失时自动恢复本地 AI dev kit 并刷新 `.gitignore` 管理块。
 
 Git 引导：
 
@@ -360,7 +361,7 @@ maker_submit_current_directory
 测试时引导用户访问当前环境的 PAT 页面新建 Maker PAT，
 production 使用 `https://maker.taptap.cn/pat-tokens`，RND 使用 `https://fuping.agnt.xd.com/pat-tokens`，
 再作为 `manual_pat` 传给 `maker_exchange_pat`，工具会同步获取 TapTap token。
-APP_ID 应通过 `maker_exchange_pat` 自动返回的 app 列表让用户选择，再传给 clone 工具。
+当前目录未绑定时，APP_ID 应通过 `maker_exchange_pat` 自动返回的 app 列表让用户选择，再传给 clone 工具；当前目录已绑定时不要再次引导 clone。
 
 ```bash
 npm run build

package/dist/maker.js

@@ -28302,7 +28302,8 @@ var MAKER_ENDPOINTS = {
     apiBase: "https://maker.taptap.cn/api/v1",
     patUrl: "https://maker.taptap.cn/api/v1/user/pat-tokens",
     tapTokenUrl: "https://maker.taptap.cn/api/v1/user/taptap-token",
-    gitBase: "https://maker.taptap.cn/git"
+    gitBase: "https://maker.taptap.cn/git",
+    remoteMcpServerUrl: "https://maker.taptap.cn/mcp/v1"
   },
   rnd: {
     webUrl: "https://fuping.agnt.xd.com",
@@ -28310,7 +28311,7 @@ var MAKER_ENDPOINTS = {
     patUrl: "https://fuping.agnt.xd.com/api/v1/user/pat-tokens",
     tapTokenUrl: "https://fuping.agnt.xd.com/api/v1/user/taptap-token",
     gitBase: "https://fuping.agnt.xd.com/git",
-    remoteMcpServerUrl: "http://172.25.135.95:4000"
+    remoteMcpServerUrl: "https://fuping.agnt.xd.com/mcp/v1"
   }
 };
 var MAKER_ENV_OVERRIDES = {
@@ -28709,7 +28710,24 @@ var DEFAULT_AI_DEV_KIT_URL = "https://urhox-demo-platform.spark.xd.com/ai-dev-ki
 var DEV_KIT_IGNORE_BEGIN = "# >>> TapTap Maker AI dev kit (local only) >>>";
 var DEV_KIT_IGNORE_END = "# <<< TapTap Maker AI dev kit (local only) <<<";
 var DEV_KIT_GITIGNORE_STAGING_FILE = ".gitignore.dev-kit-before-clone";
+var DEV_KIT_REQUIRED_ENTRIES = ["CLAUDE.md", "examples", "templates", "urhox-libs"];
 var SKIPPED_TOP_LEVEL_ENTRIES = /* @__PURE__ */ new Set(["scripts", ".DS_Store", "ai-dev-kit.zip"]);
+function inspectAiDevKit(targetDir) {
+  const resolvedTargetDir = path4.resolve(targetDir);
+  const presentEntries = DEV_KIT_REQUIRED_ENTRIES.filter(
+    (entry) => fs3.existsSync(path4.join(resolvedTargetDir, entry))
+  );
+  const missingEntries = DEV_KIT_REQUIRED_ENTRIES.filter(
+    (entry) => !presentEntries.includes(entry)
+  );
+  return {
+    targetDir: resolvedTargetDir,
+    requiredEntries: [...DEV_KIT_REQUIRED_ENTRIES],
+    presentEntries,
+    missingEntries,
+    ready: missingEntries.length === 0
+  };
+}
 async function installAiDevKit(options = {}) {
   const targetDir = path4.resolve(options.targetDir || ".");
   fs3.mkdirSync(targetDir, { recursive: true });
@@ -28723,7 +28741,9 @@ async function installAiDevKit(options = {}) {
       skippedEntries.push(entry.name);
       continue;
     }
-    copyEntry(path4.join(sourceDir, entry.name), path4.join(targetDir, entry.name));
+    copyEntry(path4.join(sourceDir, entry.name), path4.join(targetDir, entry.name), {
+      preserveExisting: options.preserveExisting
+    });
     installedEntries.push(entry.name);
   }
   const stagedGitignorePath = path4.join(targetDir, DEV_KIT_GITIGNORE_STAGING_FILE);
@@ -28769,7 +28789,7 @@ function finalizeStagedDevKitGitignore(targetDir) {
   fs3.rmSync(stagedGitignorePath, { force: true });
   return true;
 }
-function copyEntry(source, target) {
+function copyEntry(source, target, options = {}) {
   const stat = fs3.statSync(source);
   if (stat.isDirectory()) {
     fs3.mkdirSync(target, { recursive: true });
@@ -28777,11 +28797,14 @@ function copyEntry(source, target) {
       if (child === ".DS_Store") {
         continue;
       }
-      copyEntry(path4.join(source, child), path4.join(target, child));
+      copyEntry(path4.join(source, child), path4.join(target, child), options);
     }
     return;
   }
   if (stat.isFile()) {
+    if (options.preserveExisting && fs3.existsSync(target)) {
+      return;
+    }
     fs3.mkdirSync(path4.dirname(target), { recursive: true });
     fs3.copyFileSync(source, target);
   }
@@ -29958,11 +29981,15 @@ import fs5 from "node:fs";
 import path6 from "node:path";
 import { fileURLToPath } from "node:url";
 var MAKER_LOCAL_SKILL_NAME = "taptap-maker-local";
+var MAKER_DEV_KIT_GUIDE_SKILL_NAME = "taptap-maker-dev-kit-guide";
 var UPDATE_TAPTAP_MCP_SKILL_NAME = "update-taptap-mcp";
 var BUNDLED_SKILLS = [
   {
     name: MAKER_LOCAL_SKILL_NAME
   },
+  {
+    name: MAKER_DEV_KIT_GUIDE_SKILL_NAME
+  },
   {
     name: UPDATE_TAPTAP_MCP_SKILL_NAME
   }
@@ -30004,7 +30031,7 @@ function getBundledSkillSourceDir(skillName) {
 }
 
 // src/maker/server/mcp.ts
-var VERSION = true ? "1.22.0-beta.9" : "dev";
+var VERSION = true ? "1.23.0" : "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;
@@ -30025,7 +30052,7 @@ var tools = [
   },
   {
     name: "maker_list_apps",
-    description: "List Maker apps available to the cached or provided Maker PAT. Use this to obtain app_id values for Maker project clone.",
+    description: "List Maker apps available to the cached or provided Maker PAT. Use this for unbound Maker directory initialization or explicit app-list requests. If maker_status already reports the current directory is bound, treat this list as reference only and do not ask which app to clone unless the user explicitly wants to switch or re-clone.",
     inputSchema: {
       type: "object",
       properties: {
@@ -30038,10 +30065,15 @@ var tools = [
   },
   {
     name: "maker_status",
-    description: "Show local Maker MCP status: Git availability, PAT/TapTap token status, project binding, bundled skill document paths, validation checklist, and available apps when PAT exists.",
+    description: "Show local Maker MCP status for the user current working directory: Git availability, PAT/TapTap token status, project binding, AI dev kit status, bundled skill document paths, validation checklist, and available apps when the current directory is unbound and PAT exists. If the MCP process cwd differs from the user current working directory, pass target_dir with the user current working directory.",
     inputSchema: {
       type: "object",
-      properties: {}
+      properties: {
+        target_dir: {
+          type: "string",
+          description: "Optional user current working directory to inspect. Use when the MCP process cwd differs from the user project CWD."
+        }
+      }
     }
   },
   {
@@ -30052,11 +30084,11 @@ var tools = [
       properties: {
         app_id: {
           type: "string",
-          description: "Maker APP_ID to clone from fuping git."
+          description: "Maker APP_ID to clone from the configured Maker git service."
         },
         target_dir: {
           type: "string",
-          description: "Optional target directory. Defaults to the MCP process cwd, which should be the current Codex conversation directory."
+          description: "Optional target directory. Defaults to the MCP process cwd. Pass the user current working directory when it differs from the MCP process cwd."
         },
         pat: {
           type: "string",
@@ -30082,7 +30114,7 @@ var tools = [
         },
         target_dir: {
           type: "string",
-          description: "Optional target directory. Defaults to the MCP process cwd, which should be the current Codex conversation directory."
+          description: "Optional target directory. Defaults to the MCP process cwd. Pass the user current working directory when it differs from the MCP process cwd."
         },
         files: {
           type: "array",
@@ -30100,7 +30132,7 @@ var tools = [
       properties: {
         target_dir: {
           type: "string",
-          description: "Optional Maker project directory. Defaults to the MCP process cwd, which should be the current conversation directory."
+          description: "Optional Maker project directory. Defaults to the MCP process cwd. Pass the user current working directory when it differs from the MCP process cwd."
         },
         entry: {
           type: "string",
@@ -30169,11 +30201,14 @@ async function startMakerMcpServer() {
     const name = request.params.name;
     try {
       if (name === "maker_status") {
+        const args = request.params.arguments || {};
         return {
           content: [
             {
               type: "text",
-              text: await formatStatus()
+              text: await formatStatus({
+                targetDir: args.target_dir
+              })
             }
           ]
         };
@@ -30248,7 +30283,7 @@ async function startMakerMcpServer() {
         if (!args.app_id) {
           throw new McpError(ErrorCode.InvalidParams, "app_id is required");
         }
-        const targetDir = args.target_dir || process.cwd();
+        const targetDir = resolveMakerToolTargetDir(args.target_dir);
         const progressReporter = createToolProgressReporter(
           (_a2 = request.params._meta) == null ? void 0 : _a2.progressToken,
           extra,
@@ -30310,7 +30345,7 @@ async function startMakerMcpServer() {
       }
       if (name === "maker_submit_current_directory") {
         const args = request.params.arguments || {};
-        const targetDir = args.target_dir || process.cwd();
+        const targetDir = resolveMakerToolTargetDir(args.target_dir);
         const progressReporter = createToolProgressReporter(
           (_b = request.params._meta) == null ? void 0 : _b.progressToken,
           extra,
@@ -30350,7 +30385,7 @@ async function startMakerMcpServer() {
         let progressSummary;
         try {
           result = await buildCurrentDirectory({
-            targetDir: args.target_dir || process.cwd(),
+            targetDir: resolveMakerToolTargetDir(args.target_dir),
             entry: args.entry,
             scriptsPath: args.scriptsPath,
             entryClient: args.entry_client,
@@ -30394,9 +30429,10 @@ async function startMakerMcpServer() {
   const transport = new StdioServerTransport();
   await server.connect(transport);
 }
-async function formatStatus() {
+async function formatStatus(options = {}) {
   var _a2;
-  const identify = identifyMakerProject();
+  const targetDir = resolveMakerToolTargetDir(options.targetDir);
+  const identify = identifyMakerProject({ cwd: targetDir });
   const pat = loadPat();
   let tapAuth = loadTapAuth();
   const makerPatTokensUrl = getMakerPatTokensUrl();
@@ -30420,7 +30456,8 @@ async function formatStatus() {
   }
   const git = checkGitEnvironment();
   const projectSection = identify.projectId ? [
-    "当前目录已绑定 Maker 项目。",
+    "目标目录已绑定 Maker 项目。",
+    "请继续在当前绑定项目上执行状态、提交、构建等操作；不要再引导用户 clone，除非用户明确要求切换或重新拉取项目。",
     "本地 Maker 工作流请优先参考 taptap-maker-local skill；MCP tools 只负责保存 PAT、列 app、clone、submit 和 build 等机器动作。"
   ].join("\n") : pat ? await formatAutoProjectListFromPat() : formatIdentifyHint();
   return [
@@ -30429,6 +30466,7 @@ async function formatStatus() {
     `- version: ${VERSION}`,
     `- tap_auth: ${tapAuth ? "found" : "missing"} (${getTapAuthPath()})`,
     `- pat: ${pat ? "found" : "missing"} (${getPatPath()})`,
+    `- target_dir: ${targetDir}`,
     `- project_source: ${identify.source}`,
     `- project_id: ${identify.projectId || "(none)"}`,
     identify.configPath ? `- config: ${identify.configPath}` : "",
@@ -30442,11 +30480,54 @@ async function formatStatus() {
     "",
     tapAuthRefreshText,
     "",
-    formatMakerSkillStatus({ projectRoot: identify.projectRoot || process.cwd() }),
+    identify.projectRoot ? await formatAiDevKitStatus(identify.projectRoot) : "",
+    "",
+    formatMakerSkillStatus({ projectRoot: identify.projectRoot || targetDir }),
     "",
     projectSection
   ].filter(Boolean).join("\n");
 }
+function resolveMakerToolTargetDir(targetDir) {
+  if (targetDir) {
+    return path7.resolve(targetDir);
+  }
+  return process.cwd();
+}
+async function formatAiDevKitStatus(projectRoot) {
+  const before = inspectAiDevKit(projectRoot);
+  if (before.ready) {
+    return formatAiDevKitStatusLines("ready", before).join("\n");
+  }
+  try {
+    const installResult = await installAiDevKit({
+      targetDir: projectRoot,
+      preserveExisting: true
+    });
+    finalizeStagedDevKitGitignore(projectRoot);
+    const after = inspectAiDevKit(projectRoot);
+    return [
+      ...formatAiDevKitStatusLines("restored", after),
+      `- restored_missing_entries: ${before.missingEntries.join(", ") || "(none)"}`,
+      `- installed_entries: ${installResult.installedEntries.join(", ") || "(none)"}`
+    ].join("\n");
+  } catch (error2) {
+    return [
+      ...formatAiDevKitStatusLines("missing", before),
+      `- restore_error: ${error2 instanceof Error ? error2.message : String(error2)}`,
+      "- next_step: 请检查网络后重新调用 maker_status，或重新执行 Maker clone 初始化流程。"
+    ].join("\n");
+  }
+}
+function formatAiDevKitStatusLines(status, devKitStatus) {
+  return [
+    "AI dev kit",
+    "",
+    `- status: ${status}`,
+    `- required_entries: ${devKitStatus.requiredEntries.join(", ")}`,
+    `- present_entries: ${devKitStatus.presentEntries.join(", ") || "(none)"}`,
+    `- missing_entries: ${devKitStatus.missingEntries.join(", ") || "(none)"}`
+  ];
+}
 function rememberBuildSubmitPreference(targetDir) {
   const identify = identifyMakerProject({ cwd: targetDir });
   if (!identify.projectRoot || !identify.projectId) {
@@ -30465,7 +30546,7 @@ async function formatAutoProjectListFromPat() {
     const projects = await listMakerProjects();
     return [
       "本地已有 Maker PAT，当前目录尚未绑定 Maker 项目。",
-      "已自动列出可用 Maker Apps。选择、解释和 clone 顺序请参考 taptap-maker-local skill。",
+      "当前目录未绑定时，可从下面的 Maker Apps 中选择一个进行 clone；选择、解释和 clone 顺序请参考 taptap-maker-local skill。",
       "",
       formatProjectList(projects)
     ].join("\n");
@@ -30498,7 +30579,8 @@ function formatProjectList(projects) {
       (project, index) => `${index + 1}. ${project.id}${project.name ? `  ${project.name}` : ""}${project.user_id ? `  user_id=${project.user_id}` : ""}${project.gameType ? `  gameType=${project.gameType}` : ""}${project.stage ? `  stage=${project.stage}` : ""}${project.createdAt ? `  createdAt=${project.createdAt}` : ""}${project.lastConversationAt ? `  lastConversationAt=${project.lastConversationAt}` : ""}`
     ),
     "",
-    "请让用户选择一个 app，然后调用 maker_clone_to_current_directory。"
+    "仅当当前目录未绑定且用户要初始化或 clone 时，才让用户选择 app 并调用 maker_clone_to_current_directory。",
+    "如果当前目录已绑定 Maker 项目，这个列表仅作账号项目参考；请继续当前项目，除非用户明确要求切换或重新 clone。"
   ].join("\n");
 }
 function formatCloneWarnings(warnings) {

package/dist/proxy.js

@@ -29137,7 +29137,7 @@ var LogWriter = class {
 };
 
 // src/mcp-proxy/proxy.ts
-var VERSION = true ? "1.22.0-beta.9" : "dev";
+var VERSION = true ? "1.23.0" : "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.9";async function MRe(){return Go(Rm,"api_event_relations")}async function NRe(){return Go(Rm,"protocol_template")}async function SD(){return Go(Rm,"complete_example")}async function jRe(){return`# TapTap 多人联机集成指南
+// window.MultiplayerManager = MultiplayerManager;`}]}}};var ws;ws="1.23.0";async function MRe(){return Go(Rm,"api_event_relations")}async function NRe(){return Go(Rm,"protocol_template")}async function SD(){return Go(Rm,"complete_example")}async function jRe(){return`# TapTap 多人联机集成指南
 
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@taptap/instant-games-open-mcp",
-  "version": "1.22.0-beta.9",
+  "version": "1.23.0",
   "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",
@@ -95,6 +95,7 @@
     "dist/",
     "bin/",
     "skills/taptap-maker-local/",
+    "skills/taptap-maker-dev-kit-guide/",
     "skills/update-taptap-mcp/"
   ],
   "repository": {

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

@@ -0,0 +1,38 @@
+---
+name: taptap-maker-dev-kit-guide
+description: Explain the local TapTap Maker AI dev kit installed during Maker project clone. Use after a Maker project is cloned or bound, or when the user asks what CLAUDE.md, examples, templates, or urhox-libs are for.
+---
+
+# TapTap Maker AI Dev Kit
+
+Use this skill to orient the local AI/Agent after `maker_clone_to_current_directory` installs the
+AI dev kit into a Maker project directory.
+
+## What To Tell The Local Agent
+
+After the Maker project is cloned, point the local AI/Agent at these local resources:
+
+- `CLAUDE.md`: the main AI development guide entry. Read this first before changing Maker game code.
+- `examples/`: runnable or copyable examples for common Maker development patterns.
+- `templates/`: starter templates for creating new files or common game structures.
+- `urhox-libs/`: engine APIs, capabilities, and local reference material for Maker runtime features.
+
+Keep the explanation short. The goal is to help the local AI discover the installed development
+resources, not to duplicate their contents in chat.
+
+## Usage Guidance
+
+When a user asks to develop or modify a Maker project after clone:
+
+1. Check whether the current directory contains the dev-kit entries above.
+2. Tell the local AI/Agent that `CLAUDE.md` is the first document to read.
+3. Use `examples/` when the user asks for implementation patterns.
+4. Use `templates/` when creating new game files or scaffolding.
+5. Use `urhox-libs/` when engine API behavior or capability names are needed.
+
+If these entries are missing in a bound Maker project, call `maker_status` with the actual project
+directory as `target_dir`. The status tool will report dev-kit state and restore missing local
+dev-kit entries when possible.
+
+These files are local development aids. Do not submit them to Maker Git unless the user explicitly
+asks and understands they are local environment files.

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

@@ -43,7 +43,7 @@ Do not reimplement Maker API calls or Git authentication in shell when a Maker M
 | --------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------- |
 | initialize / configure / continue Maker local development | Follow "Initialization Workflow".                                                                                                  |
 | clone / download Maker project locally                    | Follow "Initialization Workflow"; do not ask for app_id directly.                                                                  |
-| status / is Maker ready                                   | Call `maker_status`, then explain missing prerequisites.                                                                           |
+| status / is Maker ready                                   | Call `maker_status` for the user's current project directory, then explain missing prerequisites and dev-kit status.               |
 | submit / commit / push to Maker                           | Inspect local Git state, summarize changed files, then call `maker_submit_current_directory` unless blocked.                       |
 | pull / update from remote                                 | Inspect local changes first; if dirty, explain options before pulling.                                                             |
 | conflict / merge failed                                   | Explain why the conflict happened, list conflict files, inspect conflict hunks, propose a resolution plan, and ask before editing. |
@@ -51,7 +51,7 @@ Do not reimplement Maker API calls or Git authentication in shell when a Maker M
 
 ## Project Detection
 
-A directory is a Maker project when the current directory or one of its parents contains:
+A directory is a Maker project when the user's current project directory or one of its parents contains:
 
 ```text
 .maker-mcp/config.json
@@ -62,6 +62,12 @@ When this file exists, explain that the directory is already bound to a Maker pr
 When this file is missing and the user asks to clone, initialize, or continue Maker local
 development, do not ask the user for an app_id directly. Follow the initialization workflow.
 
+The user's current project directory is the business target. Do not ask the user to choose a
+directory and do not scan unrelated Maker projects. If the MCP process cwd is a transient
+dialogue/session directory, pass the user's current project directory as `target_dir`. If the AI
+client does not expose that directory, say the current client did not provide the project directory
+instead of guessing.
+
 ## Initialization Workflow
 
 Trigger phrases include:
@@ -78,17 +84,24 @@ Trigger phrases include:
 
 Workflow:
 
-1. Call `maker_status`.
-2. If Git is missing, stop. Tell the user Git is required for clone/submit/build-side Git work.
-3. If `maker_status` lists bundled skill documents, just tell the user which skills are available.
+1. Call `maker_status`. If the MCP process cwd differs from the user's current project directory,
+   pass the user's current project directory as `target_dir`.
+2. If `maker_status` reports the current directory is already bound to a Maker project, stop the
+   initialization/clone path. Continue with the user's current intent in that bound project. Do not
+   ask which app to clone unless the user explicitly asks to switch or re-clone.
+3. If Git is missing, stop. Tell the user Git is required for clone/submit/build-side Git work.
+4. If `maker_status` lists bundled skill documents, just tell the user which skills are available.
    Do not run editor-specific CLI install commands.
-4. If PAT is missing, ask the user to open the PAT page shown by `maker_status`, create a PAT, and send it back.
-5. When the user provides PAT, call `maker_exchange_pat(manual_pat)`.
-6. Show the returned Maker app list and ask the user to choose. Do not auto-select, even if there is only one app.
-7. Run the working directory compliance check below.
-8. After the user chooses an app, call `maker_clone_to_current_directory(app_id)`. The clone
+5. If PAT is missing, ask the user to open the PAT page shown by `maker_status`, create a PAT, and send it back.
+6. When the user provides PAT, call `maker_exchange_pat(manual_pat)`.
+7. If the current directory is still unbound, show the returned Maker app list and ask the user to
+   choose. Do not auto-select, even if there is only one app.
+8. Run the working directory compliance check below.
+9. After the user chooses an app, call `maker_clone_to_current_directory(app_id)`. The clone
    tool prepares the AI dev kit automatically before project checkout.
-9. After clone succeeds, call `maker_status` again or explain that `.maker-mcp/config.json` now binds the directory to the Maker project.
+10. After clone succeeds, call `maker_status` again or explain that `.maker-mcp/config.json` now binds the directory to the Maker project.
+11. Tell the local AI/Agent to use the `taptap-maker-dev-kit-guide` skill for the installed dev-kit
+    resources, especially `CLAUDE.md`, `examples/`, `templates/`, and `urhox-libs/`.
 
 Keep the user-facing explanation short:
 
@@ -102,12 +115,24 @@ Keep the user-facing explanation short:
 `maker_clone_to_current_directory` prepares local development environment files in the current
 working directory before it checks out the Maker project.
 
+`maker_status` checks the dev-kit top-level entries for an already bound Maker project. If
+`CLAUDE.md`, `examples/`, `templates/`, or `urhox-libs/` are missing, the tool restores the dev kit
+without overwriting existing local files and refreshes the managed `.gitignore` block.
+
 The clone tool downloads and installs:
 
 ```text
 https://urhox-demo-platform.spark.xd.com/ai-dev-kit/pd/stable/ai-dev-kit.zip
 ```
 
+After clone, use the bundled `taptap-maker-dev-kit-guide` skill to explain the installed dev-kit
+resources to the local AI/Agent:
+
+- `CLAUDE.md` is the AI development guide entry.
+- `examples/` contains Maker development examples.
+- `templates/` contains reusable templates.
+- `urhox-libs/` contains engine APIs and capability references.
+
 The clone tool is responsible for deterministic file operations:
 
 - extract the ZIP into the current directory
@@ -126,7 +151,9 @@ the user wants to retry or continue without the dev kit.
 ## PAT Handling
 
 If the user pastes a token-like string while the initialization flow is waiting for PAT, call
-`maker_exchange_pat(manual_pat)` and continue to app selection. Do not just say "received".
+`maker_exchange_pat(manual_pat)` and continue only if the current directory is unbound. Do not just
+say "received". If the directory is already bound, treat the returned app list as account reference
+only and continue the user's current bound-project task.
 
 If PAT exchange fails:
 
@@ -136,8 +163,15 @@ If PAT exchange fails:
 
 ## App Selection
 
-Always display the app list from `maker_exchange_pat` or `maker_list_apps` and ask the user to
-choose by index, app id, or name.
+Use app selection only when the current directory is unbound and the user is initializing or cloning
+a Maker project, or when the user explicitly asks to switch or re-clone.
+
+If the current directory is already bound, app lists from `maker_exchange_pat`, `maker_list_apps`, or
+`maker_status` are reference only. Do not ask which app to clone. Continue operating on the current
+bound project unless the user explicitly requests a different project.
+
+When app selection is needed, display the app list and ask the user to choose by index, app id, or
+name.
 
 Do not auto-select:
 
@@ -199,8 +233,9 @@ submitted to Maker Git.
 When `maker_status` reports TapTap bundled workflow skills, show the skill names and document
 paths. Do not install or register skills automatically.
 
-`taptap-maker-local` covers Maker local workflow. `update-taptap-mcp` covers local TapTap MCP
-cache updates.
+`taptap-maker-local` covers Maker local workflow. `taptap-maker-dev-kit-guide` explains the local
+AI dev-kit resources installed during clone. `update-taptap-mcp` covers local TapTap MCP cache
+updates.
 
 Prefer user/global scope for Maker MCP installation. If a project/local config already exists,
 do not block the workflow; just explain that user/global scope is recommended to avoid config