@taptap/instant-games-open-mcp 1.23.6 → 1.23.7-beta.2

package/dist/maker.js

@@ -3233,8 +3233,8 @@ var require_utils = __commonJS({
       }
       return ind;
     }
-    function removeDotSegments(path10) {
-      let input2 = path10;
+    function removeDotSegments(path11) {
+      let input2 = path11;
       const output2 = [];
       let nextSlash = -1;
       let len = 0;
@@ -3433,8 +3433,8 @@ var require_schemes = __commonJS({
         wsComponent.secure = void 0;
       }
       if (wsComponent.resourceName) {
-        const [path10, query] = wsComponent.resourceName.split("?");
-        wsComponent.path = path10 && path10 !== "/" ? path10 : void 0;
+        const [path11, query] = wsComponent.resourceName.split("?");
+        wsComponent.path = path11 && path11 !== "/" ? path11 : void 0;
         wsComponent.query = query;
         wsComponent.resourceName = void 0;
       }
@@ -12491,12 +12491,12 @@ var require_dist = __commonJS({
         throw new Error(`Unknown format "${name}"`);
       return f;
     };
-    function addFormats(ajv, list, fs9, exportName) {
+    function addFormats(ajv, list, fs10, exportName) {
       var _a2;
       var _b;
       (_a2 = (_b = ajv.opts.code).formats) !== null && _a2 !== void 0 ? _a2 : _b.formats = (0, codegen_1._)`require("ajv-formats/dist/formats").${exportName}`;
       for (const f of list)
-        ajv.addFormat(f, fs9[f]);
+        ajv.addFormat(f, fs10[f]);
     }
     module.exports = exports = formatsPlugin;
     Object.defineProperty(exports, "__esModule", { value: true });
@@ -12509,8 +12509,8 @@ var require_windows = __commonJS({
   "node_modules/isexe/windows.js"(exports, module) {
     module.exports = isexe;
     isexe.sync = sync;
-    var fs9 = __require("fs");
-    function checkPathExt(path10, options) {
+    var fs10 = __require("fs");
+    function checkPathExt(path11, options) {
       var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
       if (!pathext) {
         return true;
@@ -12521,25 +12521,25 @@ var require_windows = __commonJS({
       }
       for (var i = 0; i < pathext.length; i++) {
         var p = pathext[i].toLowerCase();
-        if (p && path10.substr(-p.length).toLowerCase() === p) {
+        if (p && path11.substr(-p.length).toLowerCase() === p) {
           return true;
         }
       }
       return false;
     }
-    function checkStat(stat, path10, options) {
+    function checkStat(stat, path11, options) {
       if (!stat.isSymbolicLink() && !stat.isFile()) {
         return false;
       }
-      return checkPathExt(path10, options);
+      return checkPathExt(path11, options);
     }
-    function isexe(path10, options, cb) {
-      fs9.stat(path10, function(er, stat) {
-        cb(er, er ? false : checkStat(stat, path10, options));
+    function isexe(path11, options, cb) {
+      fs10.stat(path11, function(er, stat) {
+        cb(er, er ? false : checkStat(stat, path11, options));
       });
     }
-    function sync(path10, options) {
-      return checkStat(fs9.statSync(path10), path10, options);
+    function sync(path11, options) {
+      return checkStat(fs10.statSync(path11), path11, options);
     }
   }
 });
@@ -12549,14 +12549,14 @@ var require_mode = __commonJS({
   "node_modules/isexe/mode.js"(exports, module) {
     module.exports = isexe;
     isexe.sync = sync;
-    var fs9 = __require("fs");
-    function isexe(path10, options, cb) {
-      fs9.stat(path10, function(er, stat) {
+    var fs10 = __require("fs");
+    function isexe(path11, options, cb) {
+      fs10.stat(path11, function(er, stat) {
         cb(er, er ? false : checkStat(stat, options));
       });
     }
-    function sync(path10, options) {
-      return checkStat(fs9.statSync(path10), options);
+    function sync(path11, options) {
+      return checkStat(fs10.statSync(path11), options);
     }
     function checkStat(stat, options) {
       return stat.isFile() && checkMode(stat, options);
@@ -12580,7 +12580,7 @@ var require_mode = __commonJS({
 // node_modules/isexe/index.js
 var require_isexe = __commonJS({
   "node_modules/isexe/index.js"(exports, module) {
-    var fs9 = __require("fs");
+    var fs10 = __require("fs");
     var core;
     if (process.platform === "win32" || global.TESTING_WINDOWS) {
       core = require_windows();
@@ -12589,7 +12589,7 @@ var require_isexe = __commonJS({
     }
     module.exports = isexe;
     isexe.sync = sync;
-    function isexe(path10, options, cb) {
+    function isexe(path11, options, cb) {
       if (typeof options === "function") {
         cb = options;
         options = {};
@@ -12599,7 +12599,7 @@ var require_isexe = __commonJS({
           throw new TypeError("callback not provided");
         }
         return new Promise(function(resolve, reject) {
-          isexe(path10, options || {}, function(er, is) {
+          isexe(path11, options || {}, function(er, is) {
             if (er) {
               reject(er);
             } else {
@@ -12608,7 +12608,7 @@ var require_isexe = __commonJS({
           });
         });
       }
-      core(path10, options || {}, function(er, is) {
+      core(path11, options || {}, function(er, is) {
         if (er) {
           if (er.code === "EACCES" || options && options.ignoreErrors) {
             er = null;
@@ -12618,9 +12618,9 @@ var require_isexe = __commonJS({
         cb(er, is);
       });
     }
-    function sync(path10, options) {
+    function sync(path11, options) {
       try {
-        return core.sync(path10, options || {});
+        return core.sync(path11, options || {});
       } catch (er) {
         if (options && options.ignoreErrors || er.code === "EACCES") {
           return false;
@@ -12636,7 +12636,7 @@ var require_isexe = __commonJS({
 var require_which = __commonJS({
   "node_modules/which/which.js"(exports, module) {
     var isWindows = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
-    var path10 = __require("path");
+    var path11 = __require("path");
     var COLON = isWindows ? ";" : ":";
     var isexe = require_isexe();
     var getNotFoundError = (cmd) => Object.assign(new Error(`not found: ${cmd}`), { code: "ENOENT" });
@@ -12674,7 +12674,7 @@ var require_which = __commonJS({
           return opt.all && found.length ? resolve(found) : reject(getNotFoundError(cmd));
         const ppRaw = pathEnv[i];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-        const pCmd = path10.join(pathPart, cmd);
+        const pCmd = path11.join(pathPart, cmd);
         const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
         resolve(subStep(p, i, 0));
       });
@@ -12701,7 +12701,7 @@ var require_which = __commonJS({
       for (let i = 0; i < pathEnv.length; i++) {
         const ppRaw = pathEnv[i];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-        const pCmd = path10.join(pathPart, cmd);
+        const pCmd = path11.join(pathPart, cmd);
         const p = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
         for (let j = 0; j < pathExt.length; j++) {
           const cur = p + pathExt[j];
@@ -12749,7 +12749,7 @@ var require_path_key = __commonJS({
 var require_resolveCommand = __commonJS({
   "node_modules/cross-spawn/lib/util/resolveCommand.js"(exports, module) {
     "use strict";
-    var path10 = __require("path");
+    var path11 = __require("path");
     var which = require_which();
     var getPathKey = require_path_key();
     function resolveCommandAttempt(parsed, withoutPathExt) {
@@ -12767,7 +12767,7 @@ var require_resolveCommand = __commonJS({
       try {
         resolved = which.sync(parsed.command, {
           path: env[getPathKey({ env })],
-          pathExt: withoutPathExt ? path10.delimiter : void 0
+          pathExt: withoutPathExt ? path11.delimiter : void 0
         });
       } catch (e) {
       } finally {
@@ -12776,7 +12776,7 @@ var require_resolveCommand = __commonJS({
         }
       }
       if (resolved) {
-        resolved = path10.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
+        resolved = path11.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
       }
       return resolved;
     }
@@ -12830,8 +12830,8 @@ var require_shebang_command = __commonJS({
       if (!match) {
         return null;
       }
-      const [path10, argument] = match[0].replace(/#! ?/, "").split(" ");
-      const binary = path10.split("/").pop();
+      const [path11, argument] = match[0].replace(/#! ?/, "").split(" ");
+      const binary = path11.split("/").pop();
       if (binary === "env") {
         return argument;
       }
@@ -12844,16 +12844,16 @@ var require_shebang_command = __commonJS({
 var require_readShebang = __commonJS({
   "node_modules/cross-spawn/lib/util/readShebang.js"(exports, module) {
     "use strict";
-    var fs9 = __require("fs");
+    var fs10 = __require("fs");
     var shebangCommand = require_shebang_command();
     function readShebang(command) {
       const size = 150;
       const buffer = Buffer.alloc(size);
       let fd;
       try {
-        fd = fs9.openSync(command, "r");
-        fs9.readSync(fd, buffer, 0, size, 0);
-        fs9.closeSync(fd);
+        fd = fs10.openSync(command, "r");
+        fs10.readSync(fd, buffer, 0, size, 0);
+        fs10.closeSync(fd);
       } catch (e) {
       }
       return shebangCommand(buffer.toString());
@@ -12866,7 +12866,7 @@ var require_readShebang = __commonJS({
 var require_parse = __commonJS({
   "node_modules/cross-spawn/lib/parse.js"(exports, module) {
     "use strict";
-    var path10 = __require("path");
+    var path11 = __require("path");
     var resolveCommand = require_resolveCommand();
     var escape2 = require_escape();
     var readShebang = require_readShebang();
@@ -12891,7 +12891,7 @@ var require_parse = __commonJS({
       const needsShell = !isExecutableRegExp.test(commandFile);
       if (parsed.options.forceShell || needsShell) {
         const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
-        parsed.command = path10.normalize(parsed.command);
+        parsed.command = path11.normalize(parsed.command);
         parsed.command = escape2.command(parsed.command);
         parsed.args = parsed.args.map((arg) => escape2.argument(arg, needsDoubleEscapeMetaChars));
         const shellCommand = [parsed.command].concat(parsed.args).join(" ");
@@ -12981,7 +12981,7 @@ var require_cross_spawn = __commonJS({
     var cp = __require("child_process");
     var parse3 = require_parse();
     var enoent = require_enoent();
-    function spawn3(command, args, options) {
+    function spawn5(command, args, options) {
       const parsed = parse3(command, args, options);
       const spawned = cp.spawn(parsed.command, parsed.args, parsed.options);
       enoent.hookChildProcess(spawned, parsed);
@@ -12993,8 +12993,8 @@ var require_cross_spawn = __commonJS({
       result.error = result.error || enoent.verifyENOENTSync(result.status, parsed);
       return result;
     }
-    module.exports = spawn3;
-    module.exports.spawn = spawn3;
+    module.exports = spawn5;
+    module.exports.spawn = spawn5;
     module.exports.sync = spawnSync5;
     module.exports._parse = parse3;
     module.exports._enoent = enoent;
@@ -13002,8 +13002,9 @@ var require_cross_spawn = __commonJS({
 });
 
 // src/maker/server/mcp.ts
-import fs6 from "node:fs";
-import path7 from "node:path";
+import { execFileSync, spawn as spawn4 } from "node:child_process";
+import fs7 from "node:fs";
+import path8 from "node:path";
 import { fileURLToPath as fileURLToPath2 } from "node:url";
 
 // node_modules/zod/v3/helpers/util.js
@@ -13365,8 +13366,8 @@ function getErrorMap() {
 
 // node_modules/zod/v3/helpers/parseUtil.js
 var makeIssue = (params) => {
-  const { data, path: path10, errorMaps, issueData } = params;
-  const fullPath = [...path10, ...issueData.path || []];
+  const { data, path: path11, errorMaps, issueData } = params;
+  const fullPath = [...path11, ...issueData.path || []];
   const fullIssue = {
     ...issueData,
     path: fullPath
@@ -13481,11 +13482,11 @@ var errorUtil;
 
 // node_modules/zod/v3/types.js
 var ParseInputLazyPath = class {
-  constructor(parent, value, path10, key) {
+  constructor(parent, value, path11, key) {
     this._cachedPath = [];
     this.parent = parent;
     this.data = value;
-    this._path = path10;
+    this._path = path11;
     this._key = key;
   }
   get path() {
@@ -17134,10 +17135,10 @@ function mergeDefs(...defs) {
 function cloneDef(schema) {
   return mergeDefs(schema._zod.def);
 }
-function getElementAtPath(obj, path10) {
-  if (!path10)
+function getElementAtPath(obj, path11) {
+  if (!path11)
     return obj;
-  return path10.reduce((acc, key) => acc == null ? void 0 : acc[key], obj);
+  return path11.reduce((acc, key) => acc == null ? void 0 : acc[key], obj);
 }
 function promiseAllObject(promisesObj) {
   const keys = Object.keys(promisesObj);
@@ -17522,11 +17523,11 @@ function aborted(x, startIndex = 0) {
   }
   return false;
 }
-function prefixIssues(path10, issues) {
+function prefixIssues(path11, issues) {
   return issues.map((iss) => {
     var _a2;
     (_a2 = iss).path ?? (_a2.path = []);
-    iss.path.unshift(path10);
+    iss.path.unshift(path11);
     return iss;
   });
 }
@@ -28436,8 +28437,105 @@ function formatIdentifyHint() {
   ].join("\n");
 }
 
+// src/maker/server/hiddenStdioTransport.ts
+import { spawn as spawn2 } from "node:child_process";
+import { PassThrough as PassThrough2 } from "node:stream";
+var HiddenStdioClientTransport = class {
+  constructor(serverParams) {
+    this.serverParams = serverParams;
+    this.abortController = new AbortController();
+    this.readBuffer = new ReadBuffer();
+    this.stderrStream = serverParams.stderr === "pipe" || serverParams.stderr === "overlapped" ? new PassThrough2() : null;
+  }
+  async start() {
+    if (this.process) {
+      throw new Error("HiddenStdioClientTransport already started.");
+    }
+    await new Promise((resolve, reject) => {
+      var _a2, _b, _c;
+      this.process = spawn2(this.serverParams.command, this.serverParams.args ?? [], {
+        env: this.serverParams.env,
+        stdio: ["pipe", "pipe", this.serverParams.stderr ?? "inherit"],
+        shell: false,
+        signal: this.abortController.signal,
+        windowsHide: true,
+        cwd: this.serverParams.cwd
+      });
+      this.process.on("error", (error2) => {
+        var _a3, _b2;
+        if (error2.name === "AbortError") {
+          (_a3 = this.onclose) == null ? void 0 : _a3.call(this);
+          return;
+        }
+        reject(error2);
+        (_b2 = this.onerror) == null ? void 0 : _b2.call(this, error2);
+      });
+      this.process.on("spawn", () => resolve());
+      this.process.on("close", () => {
+        var _a3;
+        this.process = void 0;
+        (_a3 = this.onclose) == null ? void 0 : _a3.call(this);
+      });
+      (_a2 = this.process.stdin) == null ? void 0 : _a2.on("error", (error2) => {
+        var _a3;
+        return (_a3 = this.onerror) == null ? void 0 : _a3.call(this, error2);
+      });
+      (_b = this.process.stdout) == null ? void 0 : _b.on("data", (chunk) => {
+        this.readBuffer.append(chunk);
+        this.processReadBuffer();
+      });
+      (_c = this.process.stdout) == null ? void 0 : _c.on("error", (error2) => {
+        var _a3;
+        return (_a3 = this.onerror) == null ? void 0 : _a3.call(this, error2);
+      });
+      if (this.stderrStream && this.process.stderr) {
+        this.process.stderr.pipe(this.stderrStream);
+      }
+    });
+  }
+  get stderr() {
+    var _a2;
+    return this.stderrStream || ((_a2 = this.process) == null ? void 0 : _a2.stderr) || null;
+  }
+  get pid() {
+    var _a2;
+    return ((_a2 = this.process) == null ? void 0 : _a2.pid) ?? null;
+  }
+  async close() {
+    this.abortController.abort();
+    this.process = void 0;
+    this.readBuffer.clear();
+  }
+  async send(message) {
+    var _a2;
+    const stdin = (_a2 = this.process) == null ? void 0 : _a2.stdin;
+    if (!stdin) {
+      throw new Error("Not connected");
+    }
+    const json2 = serializeMessage(message);
+    if (stdin.write(json2)) {
+      return;
+    }
+    await new Promise((resolve) => stdin.once("drain", resolve));
+  }
+  processReadBuffer() {
+    var _a2, _b;
+    for (; ; ) {
+      try {
+        const message = this.readBuffer.readMessage();
+        if (message === null) {
+          break;
+        }
+        (_a2 = this.onmessage) == null ? void 0 : _a2.call(this, message);
+      } catch (error2) {
+        (_b = this.onerror) == null ? void 0 : _b.call(this, error2 instanceof Error ? error2 : new Error(String(error2)));
+      }
+    }
+  }
+};
+
 // src/maker/cli/projects.ts
-import { spawn as spawn2, spawnSync as spawnSync3 } from "node:child_process";
+import { spawn as spawn3, spawnSync as spawnSync3 } from "node:child_process";
 import fs4 from "node:fs";
 import path5 from "node:path";
 
@@ -28702,20 +28800,38 @@ import { spawnSync as spawnSync2 } from "node:child_process";
 import fs3 from "node:fs";
 import os3 from "node:os";
 import path4 from "node:path";
-var DEFAULT_AI_DEV_KIT_URL = "https://urhox-demo-platform.spark.xd.com/ai-dev-kit/pd/stable/ai-dev-kit.zip";
+var AI_DEV_KIT_URLS = {
+  production: "https://urhox-demo-platform.spark.xd.com/ai-dev-kit/pd/stable/ai-dev-kit.zip",
+  rnd: "https://urhox-demo-platform.spark.xd.com/ai-dev-kit/rnd/latest/ai-dev-kit.zip"
+};
+var DEFAULT_AI_DEV_KIT_URL = AI_DEV_KIT_URLS.production;
+function resolveDefaultAiDevKitUrl(environment = EnvConfig.environment) {
+  return AI_DEV_KIT_URLS[environment] || AI_DEV_KIT_URLS.production;
+}
 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 ALWAYS_IGNORED_LOCAL_ENTRIES = [".DS_Store", ".maker"];
 var DEV_KIT_MANAGED_ENTRY_CANDIDATES = [
+  ".claude",
+  ".cli",
+  ".codex",
+  ".cursor",
   ".emmylua",
+  ".gemini",
+  "AGENTS.md",
   "CLAUDE.md",
   "engine-docs",
   "examples",
+  "schemas",
+  "skills",
   "templates",
+  "tools",
   "urhox-libs"
 ];
 var SKIPPED_TOP_LEVEL_ENTRIES = /* @__PURE__ */ new Set(["scripts", ".DS_Store", "ai-dev-kit.zip"]);
+var SKILL_INSTALLER_OUTPUT_ENTRIES = [".claude", ".codex", ".cursor", ".gemini"];
 function inspectAiDevKit(targetDir) {
   const resolvedTargetDir = path4.resolve(targetDir);
   const presentEntries = DEV_KIT_REQUIRED_ENTRIES.filter(
@@ -28741,7 +28857,7 @@ function listPresentDevKitManagedEntries(targetDir) {
 async function installAiDevKit(options = {}) {
   const targetDir = path4.resolve(options.targetDir || ".");
   fs3.mkdirSync(targetDir, { recursive: true });
-  const preparedSource = options.sourceDir ? path4.resolve(options.sourceDir) : await downloadAndExtractDevKit(options.url || DEFAULT_AI_DEV_KIT_URL);
+  const preparedSource = options.sourceDir ? path4.resolve(options.sourceDir) : await downloadAndExtractDevKit(options.url || resolveDefaultAiDevKitUrl());
   const sourceDir = resolveDevKitRoot(preparedSource);
   const entries = fs3.readdirSync(sourceDir, { withFileTypes: true });
   const installedEntries = [];
@@ -28756,19 +28872,49 @@ async function installAiDevKit(options = {}) {
     });
     installedEntries.push(entry.name);
   }
+  const skillInstaller = runDevKitSkillInstallerForInstall(targetDir, {
+    onStart: options.onSkillInstallerStart
+  });
   const stagedGitignorePath = path4.join(targetDir, DEV_KIT_GITIGNORE_STAGING_FILE);
-  writeDevKitStagedGitignore(stagedGitignorePath, installedEntries);
+  writeDevKitStagedGitignore(stagedGitignorePath, [
+    ...installedEntries,
+    ...listPresentSkillInstallerOutputEntries(targetDir)
+  ]);
   return {
     targetDir,
     sourceDir,
     installedEntries: installedEntries.sort(),
     skippedEntries: skippedEntries.sort(),
     gitignorePath: path4.join(targetDir, ".gitignore"),
-    stagedGitignorePath
+    stagedGitignorePath,
+    skillInstaller
+  };
+}
+function inspectAiDevKitSkillInstallStatus(targetDir) {
+  const resolvedTargetDir = path4.resolve(targetDir);
+  const targets = SKILL_INSTALLER_OUTPUT_ENTRIES.map((entry) => {
+    const skillsDir = path4.join(resolvedTargetDir, entry, "skills");
+    const present = fs3.existsSync(skillsDir) && fs3.statSync(skillsDir).isDirectory();
+    const skillCount = present ? fs3.readdirSync(skillsDir, { withFileTypes: true }).filter((item) => item.isDirectory() || item.isSymbolicLink()).length : 0;
+    return {
+      name: entry.replace(/^\./, ""),
+      path: skillsDir,
+      present,
+      skillCount
+    };
+  });
+  const installedCount = targets.filter((target) => target.present && target.skillCount > 0).length;
+  const status = installedCount === targets.length ? "installed" : installedCount > 0 ? "partial" : "missing";
+  return {
+    status,
+    summary: targets.map((target) => `${target.name}=${target.skillCount}`).join(", "),
+    targets
   };
 }
 function createDevKitGitignoreBlock(entries) {
-  const ignoreEntries = Array.from(/* @__PURE__ */ new Set([".DS_Store", ...entries.map(formatIgnoreEntry)])).filter(Boolean).sort();
+  const ignoreEntries = Array.from(
+    new Set([...ALWAYS_IGNORED_LOCAL_ENTRIES, ...entries].map(formatIgnoreEntry))
+  ).filter(Boolean).sort();
   return [DEV_KIT_IGNORE_BEGIN, ...ignoreEntries, DEV_KIT_IGNORE_END].join("\n");
 }
 function writeDevKitStagedGitignore(stagedGitignorePath, entries) {
@@ -28819,6 +28965,87 @@ function copyEntry(source, target, options = {}) {
     fs3.copyFileSync(source, target);
   }
 }
+function installAiDevKitSkills(targetDir, options = {}) {
+  var _a2;
+  const toolsDir = path4.join(targetDir, "tools");
+  if (!fs3.existsSync(toolsDir) || !fs3.statSync(toolsDir).isDirectory()) {
+    return {
+      ok: false,
+      status: "skipped",
+      stdout: "",
+      stderr: "",
+      summary: "skipped: tools directory not found",
+      reason: "tools_not_found"
+    };
+  }
+  const isWindows = process.platform === "win32";
+  const scriptName = isWindows ? "install-skills.ps1" : "install-skills.sh";
+  const scriptPath = path4.join(toolsDir, scriptName);
+  if (!fs3.existsSync(scriptPath)) {
+    return {
+      ok: false,
+      status: "skipped",
+      script: scriptPath,
+      stdout: "",
+      stderr: "",
+      summary: `skipped: ${scriptName} not found`,
+      reason: "script_not_found"
+    };
+  }
+  const command = isWindows ? ["powershell.exe", "-NoProfile", "-ExecutionPolicy", "Bypass", "-File", scriptPath, "all"] : ["bash", scriptPath, "all"];
+  (_a2 = options.onStart) == null ? void 0 : _a2.call(options, {
+    platform: process.platform,
+    script: scriptPath,
+    cwd: toolsDir,
+    command
+  });
+  const result = spawnSync2(command[0], command.slice(1), { cwd: toolsDir, encoding: "utf8" });
+  if (result.status !== 0) {
+    throw new AiDevKitSkillInstallerError(
+      formatFailedSkillInstallerResult({
+        platform: process.platform,
+        scriptPath,
+        toolsDir,
+        command,
+        result
+      })
+    );
+  }
+  const stdout = String(result.stdout || "");
+  const stderr = String(result.stderr || "");
+  return {
+    ok: true,
+    status: "installed",
+    script: scriptPath,
+    stdout,
+    stderr,
+    summary: summarizeSkillInstallerOutput(stdout)
+  };
+}
+function runDevKitSkillInstallerForInstall(targetDir, options = {}) {
+  try {
+    return installAiDevKitSkills(targetDir, options);
+  } catch (error2) {
+    if (error2 instanceof AiDevKitSkillInstallerError) {
+      return error2.result;
+    }
+    const message = error2 instanceof Error ? error2.message : String(error2);
+    return {
+      ok: false,
+      status: "failed",
+      stdout: "",
+      stderr: "",
+      summary: "failed",
+      reason: "installer_failed",
+      error: message
+    };
+  }
+}
+function listPresentSkillInstallerOutputEntries(targetDir) {
+  return SKILL_INSTALLER_OUTPUT_ENTRIES.filter(
+    (entry) => fs3.existsSync(path4.join(targetDir, entry))
+  );
+}
 async function downloadAndExtractDevKit(url2) {
   const tempDir = fs3.mkdtempSync(path4.join(os3.tmpdir(), "taptap-maker-ai-dev-kit-"));
   const zipPath = path4.join(tempDir, "ai-dev-kit.zip");
@@ -28895,6 +29122,67 @@ function formatSpawnFailure(result) {
   var _a2;
   return ((_a2 = result.error) == null ? void 0 : _a2.message) || String(result.stderr || "").trim() || String(result.stdout || "").trim() || `exit status ${result.status ?? "unknown"}`;
 }
+function formatDevKitSkillInstallerFailure(options) {
+  return [
+    "Failed to install AI dev kit skills",
+    `platform: ${options.platform}`,
+    `script: ${options.scriptPath}`,
+    `cwd: ${options.toolsDir}`,
+    `command: ${options.command.map(shellQuote).join(" ")}`,
+    `exit_status: ${options.result.status ?? "unknown"}`,
+    options.result.signal ? `signal: ${options.result.signal}` : "",
+    options.result.error ? `spawn_error: ${options.result.error.message}` : "",
+    "stdout:",
+    formatSpawnOutput(options.result.stdout),
+    "stderr:",
+    formatSpawnOutput(options.result.stderr)
+  ].filter((line) => line.length > 0).join("\n");
+}
+function formatFailedSkillInstallerResult(options) {
+  return {
+    ok: false,
+    status: "failed",
+    script: options.scriptPath,
+    stdout: String(options.result.stdout || ""),
+    stderr: String(options.result.stderr || ""),
+    summary: summarizeSkillInstallerFailure(options.result),
+    reason: "installer_failed",
+    error: formatDevKitSkillInstallerFailure(options)
+  };
+}
+function summarizeSkillInstallerFailure(result) {
+  if (typeof result.status === "number") {
+    return `failed: exit_status=${result.status}`;
+  }
+  if (result.signal) {
+    return `failed: signal=${result.signal}`;
+  }
+  if (result.error) {
+    return `failed: ${result.error.message}`;
+  }
+  return "failed";
+}
+var AiDevKitSkillInstallerError = class extends Error {
+  constructor(result) {
+    super(result.error || result.summary);
+    this.result = result;
+    this.name = "AiDevKitSkillInstallerError";
+  }
+};
+function formatSpawnOutput(value) {
+  const text = String(value || "").trim();
+  return text.length > 0 ? text : "(empty)";
+}
+function summarizeSkillInstallerOutput(stdout) {
+  const entries = stdout.split(/\r?\n/).map((line) => line.match(/\[install-skills\]\s+([^:]+):\s+installed=(\d+)/)).filter((match) => Boolean(match)).map((match) => `${match[1]}=${match[2]}`);
+  return entries.length > 0 ? entries.join(", ") : "completed";
+}
+function shellQuote(value) {
+  if (/^[A-Za-z0-9_./:=@-]+$/.test(value)) {
+    return value;
+  }
+  return `'${value.replace(/'/g, "'\\''")}'`;
+}
 function resolveDevKitRoot(sourceDir) {
   const directEntries = fs3.existsSync(sourceDir) ? fs3.readdirSync(sourceDir) : [];
   if (looksLikeDevKitRoot(sourceDir)) {
@@ -28912,6 +29200,9 @@ function looksLikeDevKitRoot(dir) {
   return fs3.existsSync(path4.join(dir, "engine-docs")) || fs3.existsSync(path4.join(dir, ".emmylua")) || fs3.existsSync(path4.join(dir, "urhox-libs"));
 }
 function formatIgnoreEntry(entry) {
+  if (entry === ".DS_Store") {
+    return entry;
+  }
   return entry.endsWith("/") ? entry : fsSafeDirectoryPattern(entry);
 }
 function fsSafeDirectoryPattern(entry) {
@@ -29413,7 +29704,7 @@ async function inspectMakerRemoteSyncStatus(cwd) {
 }
 function getMakerRemoteSyncFailureNextAction(failure) {
   if (failure.classification === "auth") {
-    return "暂时无法检查 Maker 远端是否有新提交：Git 鉴权失败。请先运行 `taptap-maker pat set` 并粘贴新的 Maker PAT 后，再重新读取 maker://status。";
+    return `暂时无法检查 Maker 远端是否有新提交：Git 鉴权失败。PAT 页面：${getMakerPatTokensUrl()}。请在该页面创建新的 Maker PAT，然后运行 \`taptap-maker pat set\` 并粘贴 PAT 后，再重新读取 maker://status。`;
   }
   return "暂时无法检查 Maker 远端是否有新提交。请把 failure 信息反馈给用户；如果只是 503、5xx、超时或网络中断，可稍后重新读取 maker://status。";
 }
@@ -29634,7 +29925,7 @@ function nextActionForFailure(classification) {
     case "git_missing":
       return "本机未检测到可用的 Git。请用户自行安装 Git，并在 `git --version` 可用后重启 MCP 客户端再重试；安装前不要执行 clone、fetch、commit 或 push。";
     case "auth":
-      return "运行 `taptap-maker pat set` 并粘贴新的 Maker PAT 后，再重试 maker_build_current_directory；如果仍失败，请确认 PAT 是否过期或缺少 Maker git 权限。";
+      return `Maker Git 鉴权失败。PAT 页面：${getMakerPatTokensUrl()}。请在该页面创建新的 Maker PAT，然后运行 \`taptap-maker pat set\` 并粘贴 PAT 后重试。`;
     case "remote_transient":
       return "远端 Maker git 服务临时不可用。本地 commit 会保留；不要手动执行通用 git push，稍后直接重试 maker_build_current_directory。";
     case "branch_not_allowed":
@@ -29652,7 +29943,7 @@ function nextActionForFailure(classification) {
 function pushGit(args, cwd, onProgress) {
   return new Promise((resolve, reject) => {
     const gitCommand = getGitCommand();
-    const child = spawn2(gitCommand, args, {
+    const child = spawn3(gitCommand, args, {
       cwd,
       stdio: ["ignore", "pipe", "pipe"]
     });
@@ -30128,7 +30419,7 @@ function readGitSync(args) {
 function readGit(args, cwd) {
   return new Promise((resolve, reject) => {
     const gitCommand = getGitCommand();
-    const child = spawn2(gitCommand, args, {
+    const child = spawn3(gitCommand, args, {
       cwd,
       stdio: ["ignore", "pipe", "pipe"]
     });
@@ -30238,7 +30529,7 @@ function sleep(ms) {
 function runGitCapture(args, options = {}) {
   return new Promise((resolve, reject) => {
     const gitCommand = getGitCommand();
-    const child = spawn2(gitCommand, args, {
+    const child = spawn3(gitCommand, args, {
       cwd: options.cwd,
       stdio: ["ignore", "pipe", "pipe"]
     });
@@ -30271,7 +30562,7 @@ function runGitCapture(args, options = {}) {
 function runGit(args, options) {
   return new Promise((resolve, reject) => {
     const gitCommand = getGitCommand();
-    const child = spawn2(gitCommand, args, {
+    const child = spawn3(gitCommand, args, {
       cwd: options.cwd,
       stdio: ["ignore", "pipe", "pipe"]
     });
@@ -30436,11 +30727,13 @@ function formatMakerSkillStatus(_options = {}) {
     path: path6.join(resolveMakerSkillSourceDir(skill.name), "SKILL.md")
   }));
   return [
-    "TapTap bundled workflow skills",
+    "TapTap Maker workflow guide documents",
     "",
     ...skillDocuments.map((skill) => `- ${skill.name}: ${skill.path}`),
     "",
-    "These skill documents are bundled in the package. Let the current AI client decide whether and how to load them."
+    "Use these documents as reading references for Maker local workflows.",
+    "Maker initialization next_step: execute `taptap-maker init`.",
+    "Load these documents when the current AI client supports reading local guide files."
   ].join("\n");
 }
 function resolveMakerSkillSourceDir(skillName = MAKER_LOCAL_SKILL_NAME) {
@@ -30466,10 +30759,386 @@ function getBundledSkillSourceDir(skillName) {
   return path6.join(packageRoot, "skills", skillName);
 }
 
+// src/maker/server/runtimeLogs.ts
+import fs6 from "node:fs";
+import path7 from "node:path";
+var DEFAULT_RUNTIME_LOG_SINCE_SECONDS = 600;
+var MAX_RUNTIME_LOG_WINDOW_SECONDS = 3600;
+var DEFAULT_RUNTIME_LOG_TOPICS = ["user_script", "server_user_script"];
+var MERGED_RUNTIME_LOG_FILE = "runtime.log";
+var RUNTIME_LOG_FILES_TO_RESET = [
+  MERGED_RUNTIME_LOG_FILE,
+  "state.json",
+  "last-query-runtime-logs-result.json",
+  "runtime.raw.log",
+  "engine.log",
+  "user_script.log",
+  "server_user_script.log"
+];
+async function watchRuntimeLogs(options) {
+  var _a2, _b;
+  if (options.reset) {
+    resetRuntimeLogs(options.projectRoot);
+  }
+  const intervalMs = options.intervalMs ?? 5e3;
+  const maxConsecutiveFailures = options.maxConsecutiveFailures;
+  const sleep2 = options.sleep || defaultSleep;
+  const nowMs = options.nowMs || Date.now;
+  let polls = 0;
+  let writtenLogs = 0;
+  let lastResult;
+  let consecutiveFailures = 0;
+  for (; ; ) {
+    try {
+      const previousCursor = lastResult == null ? void 0 : lastResult.nextStartTime;
+      const result = await pullRuntimeLogs({
+        projectRoot: options.projectRoot,
+        projectId: options.projectId,
+        sinceSeconds: options.sinceSeconds,
+        limit: options.limit,
+        nowMs: options.nowMs,
+        callRemoteRuntimeLogs: options.callRemoteRuntimeLogs
+      });
+      polls += 1;
+      writtenLogs += result.writtenLogs;
+      lastResult = result;
+      consecutiveFailures = 0;
+      await ((_a2 = options.onPoll) == null ? void 0 : _a2.call(options, result));
+      if (options.maxPolls !== void 0 && polls >= options.maxPolls) {
+        return { projectRoot: options.projectRoot, polls, writtenLogs, lastResult };
+      }
+      const cursorProgressed = previousCursor === void 0 ? result.writtenLogs > 0 : result.nextStartTime !== previousCursor;
+      if (!result.hasMore || !cursorProgressed) {
+        await sleep2(intervalMs);
+      }
+    } catch (error2) {
+      consecutiveFailures += 1;
+      writeRuntimeLogFailureState(options.projectRoot, {
+        nowMs,
+        consecutiveFailures,
+        error: error2
+      });
+      await ((_b = options.onError) == null ? void 0 : _b.call(options, error2, consecutiveFailures));
+      if (isNonRetryableRuntimeLogError(error2)) {
+        throw new Error(
+          `runtime log watch stopped after non-retryable failure: ${error2 instanceof Error ? error2.message : String(error2)}`
+        );
+      }
+      if (maxConsecutiveFailures !== void 0 && consecutiveFailures >= maxConsecutiveFailures) {
+        throw new Error(
+          `runtime log watch stopped after ${consecutiveFailures} consecutive failures: ${error2 instanceof Error ? error2.message : String(error2)}`
+        );
+      }
+      await sleep2(intervalMs);
+    }
+  }
+}
+async function pullRuntimeLogs(options) {
+  const nowMs = options.nowMs || Date.now;
+  const state = readRuntimeLogState(options.projectRoot);
+  const nowSeconds = nowMs() / 1e3;
+  const stateFresh = (state == null ? void 0 : state.nextStartTime) !== void 0 && isFreshRuntimeLogCursor(state.nextStartTime, nowSeconds);
+  const queryArgs = {};
+  let cursorExpired = false;
+  if (options.startTime !== void 0) {
+    queryArgs.startTime = options.startTime;
+  } else if (stateFresh && state) {
+    queryArgs.startTime = state.nextStartTime;
+  } else {
+    cursorExpired = Boolean(state == null ? void 0 : state.nextStartTime);
+    queryArgs.sinceSeconds = options.sinceSeconds ?? DEFAULT_RUNTIME_LOG_SINCE_SECONDS;
+  }
+  queryArgs.topics = options.topics && options.topics.length > 0 ? options.topics : DEFAULT_RUNTIME_LOG_TOPICS;
+  if (options.limit !== void 0) {
+    queryArgs.limit = options.limit;
+  }
+  const result = await options.callRemoteRuntimeLogs(queryArgs);
+  const appendResult = appendRuntimeLogs(options.projectRoot, result.logs);
+  const nextStartTime = resolveNextRuntimeLogCursor(result);
+  const nowIso = new Date(nowMs()).toISOString();
+  const nextState = {
+    ...state || {},
+    ...options.projectId ? { appId: options.projectId, projectId: options.projectId } : {},
+    nextStartTime,
+    updatedAt: nowIso,
+    lastPollAt: nowIso,
+    lastSuccessAt: nowIso,
+    lastWrittenLogs: appendResult.written,
+    consecutiveFailures: 0,
+    lastError: null
+  };
+  writeRuntimeLogState(options.projectRoot, nextState);
+  return {
+    projectRoot: options.projectRoot,
+    queryArgs,
+    writtenLogs: appendResult.written,
+    files: appendResult.files,
+    statePath: getRuntimeLogStatePath(options.projectRoot),
+    nextStartTime,
+    serverTime: result.serverTime,
+    hasMore: result.hasMore,
+    cursorExpired
+  };
+}
+function resetRuntimeLogs(projectRoot) {
+  const runtimeDir = getRuntimeLogDir(projectRoot);
+  fs6.mkdirSync(runtimeDir, { recursive: true });
+  for (const file2 of RUNTIME_LOG_FILES_TO_RESET) {
+    fs6.rmSync(path7.join(runtimeDir, file2), { force: true });
+  }
+  return runtimeDir;
+}
+function readRuntimeLogState(projectRoot) {
+  const statePath = getRuntimeLogStatePath(projectRoot);
+  if (!fs6.existsSync(statePath)) {
+    return null;
+  }
+  try {
+    const state = JSON.parse(fs6.readFileSync(statePath, "utf8"));
+    return isRuntimeLogState(state) ? state : null;
+  } catch {
+    return null;
+  }
+}
+function formatRuntimeLogPullResult(result) {
+  return [
+    "✓ Maker runtime logs pulled once",
+    "",
+    `- project_root: ${result.projectRoot}`,
+    `- query_args: ${JSON.stringify(result.queryArgs)}`,
+    `- written_logs: ${result.writtenLogs}`,
+    `- files: ${result.files.length > 0 ? result.files.join(", ") : "(none)"}`,
+    `- state: ${result.statePath}`,
+    `- next_start_time: ${result.nextStartTime}`,
+    `- server_time: ${result.serverTime}`,
+    `- has_more: ${result.hasMore ? "yes" : "no"}`,
+    result.cursorExpired ? "- cursor_expired: yes; old cursor exceeded 1 hour, used default since window" : "- cursor_expired: no",
+    "",
+    result.hasMore ? "next_action: 还有更多远端日志；可以再次调用 maker_pull_runtime_logs 继续拉取。" : "next_action: 日志已写入 .maker/logs/runtime/runtime.log，AI/skill 可直接读取这一份合并日志。"
+  ].join("\n");
+}
+function normalizeRuntimeLogQueryResult(result) {
+  const payload = findRuntimeLogPayload(extractRemoteToolPayload(result));
+  if (!payload) {
+    throw new Error("query_runtime_logs result does not contain logs array.");
+  }
+  const nextStartTime = payload.nextStartTime ?? payload.next_start_time;
+  const serverTime = payload.serverTime ?? payload.server_time ?? nextStartTime;
+  const hasMore = payload.hasMore ?? payload.has_more ?? false;
+  if (typeof nextStartTime !== "number") {
+    throw new Error("query_runtime_logs result does not contain nextStartTime.");
+  }
+  if (typeof serverTime !== "number") {
+    throw new Error("query_runtime_logs result does not contain serverTime.");
+  }
+  return {
+    logs: payload.logs.map(normalizeRuntimeLogEntry),
+    nextStartTime,
+    serverTime,
+    hasMore: Boolean(hasMore)
+  };
+}
+function writeRuntimeLogRawResponse(projectRoot, raw) {
+  const rawPath = path7.join(getRuntimeLogDir(projectRoot), "last-query-runtime-logs-result.json");
+  fs6.mkdirSync(path7.dirname(rawPath), { recursive: true });
+  fs6.writeFileSync(
+    rawPath,
+    `${JSON.stringify({ capturedAt: (/* @__PURE__ */ new Date()).toISOString(), raw }, null, 2)}
+`,
+    "utf8"
+  );
+  return rawPath;
+}
+function appendRuntimeLogs(projectRoot, logs) {
+  fs6.mkdirSync(getRuntimeLogDir(projectRoot), { recursive: true });
+  if (logs.length === 0) {
+    return { files: [], written: 0 };
+  }
+  const filePath = getRuntimeLogPath(projectRoot);
+  let written = 0;
+  for (const log of logs) {
+    const line = JSON.stringify(compactRuntimeLogEntry(log));
+    fs6.appendFileSync(filePath, `${line}
+`, "utf8");
+    written += 1;
+  }
+  return { files: written > 0 ? [filePath] : [], written };
+}
+function writeRuntimeLogState(projectRoot, state) {
+  const statePath = getRuntimeLogStatePath(projectRoot);
+  fs6.mkdirSync(path7.dirname(statePath), { recursive: true });
+  const tempPath = `${statePath}.${process.pid}.${Date.now()}.tmp`;
+  fs6.writeFileSync(tempPath, `${JSON.stringify(state, null, 2)}
+`, "utf8");
+  fs6.renameSync(tempPath, statePath);
+}
+function writeRuntimeLogFailureState(projectRoot, options) {
+  const nowIso = new Date(options.nowMs()).toISOString();
+  writeRuntimeLogState(projectRoot, {
+    ...readRuntimeLogState(projectRoot) || {},
+    updatedAt: nowIso,
+    lastPollAt: nowIso,
+    consecutiveFailures: options.consecutiveFailures,
+    lastError: options.error instanceof Error ? options.error.message : String(options.error)
+  });
+}
+function isRuntimeLogState(state) {
+  return typeof state.nextStartTime === "number" || typeof state.updatedAt === "string" || typeof state.lastPollAt === "string" || typeof state.lastSuccessAt === "string";
+}
+function isFreshRuntimeLogCursor(nextStartTime, nowSeconds) {
+  if (!Number.isFinite(nextStartTime) || nextStartTime <= 0) {
+    return false;
+  }
+  if (nextStartTime > 1e10) {
+    return false;
+  }
+  const ageSeconds = nowSeconds - nextStartTime;
+  return ageSeconds >= -300 && ageSeconds <= MAX_RUNTIME_LOG_WINDOW_SECONDS;
+}
+function isNonRetryableRuntimeLogError(error2) {
+  const message = error2 instanceof Error ? error2.message : String(error2);
+  return /\b(?:401|403|unauthori[sz]ed|forbidden|pat expired|auth(?:entication|orization)?)\b/i.test(
+    message
+  );
+}
+function getRuntimeLogDir(projectRoot) {
+  return path7.join(projectRoot, ".maker", "logs", "runtime");
+}
+function getRuntimeLogStatePath(projectRoot) {
+  return path7.join(getRuntimeLogDir(projectRoot), "state.json");
+}
+function getRuntimeLogPath(projectRoot) {
+  return path7.join(getRuntimeLogDir(projectRoot), MERGED_RUNTIME_LOG_FILE);
+}
+function resolveNextRuntimeLogCursor(result) {
+  const maxLogTime = result.logs.reduce((max, log) => {
+    const value = typeof log.t === "number" ? log.t : typeof log.time === "number" ? log.time : max;
+    return Math.max(max, value);
+  }, Number.NEGATIVE_INFINITY);
+  if (maxLogTime === Number.NEGATIVE_INFINITY) {
+    return result.nextStartTime;
+  }
+  return Math.max(result.nextStartTime, maxLogTime + 1);
+}
+function defaultSleep(ms) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
+}
+function extractRemoteToolPayload(result) {
+  if (!result || typeof result !== "object") {
+    return result;
+  }
+  const structuredContent = result.structuredContent;
+  if (structuredContent) {
+    return structuredContent;
+  }
+  const textItems = extractRemoteToolTextItems(result);
+  if (textItems.length === 0) {
+    return result;
+  }
+  for (const textItem of textItems) {
+    const payload = parseRuntimeLogTextPayload(textItem);
+    if (payload) {
+      return payload;
+    }
+  }
+  const text = textItems.join("\n");
+  return parseRuntimeLogTextPayload(text) || text;
+}
+function parseRuntimeLogTextPayload(text) {
+  try {
+    return JSON.parse(text);
+  } catch {
+    return parseRuntimeLogNdjson(text);
+  }
+}
+function extractRemoteToolTextItems(result) {
+  if (!result || typeof result !== "object") {
+    return [];
+  }
+  const content = result.content;
+  return (content == null ? void 0 : content.filter((item) => item.type === "text" && typeof item.text === "string").map((item) => item.text)) || [];
+}
+function parseRuntimeLogNdjson(text) {
+  const rows = text.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
+  if (rows.length === 0) {
+    return null;
+  }
+  const parsedRows = [];
+  for (const row of rows) {
+    try {
+      parsedRows.push(JSON.parse(row));
+    } catch {
+      return null;
+    }
+  }
+  const meta3 = parsedRows.find(isRuntimeLogMeta);
+  const logs = parsedRows.filter((row) => !isRuntimeLogMeta(row));
+  if (!meta3 && logs.length === 0) {
+    return null;
+  }
+  return {
+    logs,
+    nextStartTime: meta3 == null ? void 0 : meta3.nextStartTime,
+    next_start_time: meta3 == null ? void 0 : meta3.next_start_time,
+    serverTime: meta3 == null ? void 0 : meta3.serverTime,
+    server_time: meta3 == null ? void 0 : meta3.server_time,
+    hasMore: (meta3 == null ? void 0 : meta3.hasMore) ?? (meta3 == null ? void 0 : meta3.has_more) ?? (meta3 == null ? void 0 : meta3.truncated)
+  };
+}
+function findRuntimeLogPayload(value, depth = 0) {
+  if (!value || typeof value !== "object" || depth > 4) {
+    return null;
+  }
+  const candidate = value;
+  if (Array.isArray(candidate.logs)) {
+    return candidate;
+  }
+  if (candidate.type === "meta" && candidate.success === true && typeof candidate.nextStartTime === "number") {
+    return {
+      logs: [],
+      nextStartTime: candidate.nextStartTime,
+      serverTime: candidate.serverTime ?? candidate.nextStartTime,
+      hasMore: Boolean(candidate.truncated)
+    };
+  }
+  const wrappers = value;
+  for (const key of ["data", "result", "payload", "runtimeLogs", "runtime_logs"]) {
+    const nested = findRuntimeLogPayload(wrappers[key], depth + 1);
+    if (nested) {
+      return nested;
+    }
+  }
+  return null;
+}
+function isRuntimeLogMeta(value) {
+  return Boolean(value) && typeof value === "object" && value.type === "meta" && value.success === true && (typeof value.nextStartTime === "number" || typeof value.next_start_time === "number");
+}
+function normalizeRuntimeLogEntry(entry) {
+  return compactRuntimeLogEntry(entry);
+}
+function compactRuntimeLogEntry(entry) {
+  const { id: _id, time: time3, message, ...rest } = entry;
+  const compact = {
+    ...rest
+  };
+  if (compact.t === void 0 && time3 !== void 0) {
+    compact.t = time3;
+  }
+  if (compact.msg === void 0 && message !== void 0) {
+    compact.msg = message;
+  }
+  return compact;
+}
+
 // src/maker/server/mcp.ts
-var VERSION = true ? "1.23.6" : "dev";
+var VERSION = true ? "1.23.7-beta.2" : "dev";
 var DEFAULT_PROXY_PACKAGE = "@taptap/instant-games-open-mcp@1.22.0";
 var DEFAULT_BUILD_TIMEOUT_MS = 10 * 60 * 1e3;
+var PREVIEW_REFRESH_TIMEOUT_MS = 15 * 1e3;
+var WATCHER_STOP_TIMEOUT_MS = 1500;
+var WATCHER_PROCESS_PATTERN = /(?:\btaptap-maker\b|\bmaker\.js\b).*\blogs\b.*\bwatch\b/;
 var LONG_OPERATION_HEARTBEAT_MS = 3 * 60 * 1e3;
 var MakerCloneFailedError = class extends Error {
   constructor(targetDir, originalError) {
@@ -30483,7 +31152,7 @@ var MakerCloneFailedError = class extends Error {
 var tools = [
   {
     name: "maker_status_lite",
-    description: "Compatibility fallback for clients that cannot read the maker://status resource. Prefer reading maker://status when resources are available. Shows local Maker status for the user current working directory, including Git, PAT/TapTap auth, project binding, AI dev kit status, and bundled workflow skill document paths.",
+    description: "Compatibility status surface for clients using tool output instead of the maker://status resource. Prefer reading maker://status when resources are available. Shows local Maker status for the user current working directory, including Git, PAT/TapTap auth, project binding, AI dev kit status, and bundled workflow guide document paths. Maker initialization next_step: taptap-maker init.",
     inputSchema: {
       type: "object",
       properties: {
@@ -30500,7 +31169,7 @@ var tools = [
   },
   {
     name: "maker_build_current_directory",
-    description: 'Sync and build the current Maker game. Use this single tool for user requests like "构建", "build", "跑一下", "预览", "验证一下", "提交", "提交代码", "推送", or "push" in a Maker project. If local changes or committed-but-unpushed commits exist, the tool commits when needed, pushes to Maker remote, then triggers remote Maker build. If push fails, build is not started and the result includes recovery details for the local Agent to handle merge/conflict resolution. If push succeeds but remote build fails, report that code is already on Maker remote and include build failure details. Only set confirm_remote_build_without_submit=true when the user explicitly says they do not want to submit local changes and wants to build the current remote version.',
+    description: 'Sync and build the current Maker game. Use this single tool for user requests like "构建", "build", "跑一下", "预览", "验证一下", "提交", "提交代码", "推送", or "push" in a Maker project. If local changes or committed-but-unpushed commits exist, the tool commits when needed, pushes to Maker remote, then triggers remote Maker build. If push fails, build is not started and the result includes recovery details for the local Agent to handle merge/conflict resolution. If push succeeds but remote build fails, report that code is already on Maker remote and include build failure details. After a successful build, a local runtime log watcher is started; for gameplay/runtime diagnostics, read runtime_logs.local_file, and for watcher health read runtime_logs.state_file. Only set confirm_remote_build_without_submit=true when the user explicitly says they do not want to submit local changes and wants to build the current remote version.',
     inputSchema: {
       type: "object",
       properties: {
@@ -30556,31 +31225,69 @@ var tools = [
         }
       }
     }
-  }
-];
-var resources = [
+  },
   {
-    uri: "maker://status",
-    name: "Maker status",
-    description: "Local TapTap Maker project status, including Git, PAT/TapTap auth, project binding, AI dev kit status, and bundled workflow skill document paths.",
-    mimeType: "text/plain"
-  }
-];
-async function startMakerMcpServer() {
-  const server = new Server(
-    {
-      name: "taptap-maker",
-      version: VERSION
-    },
-    {
-      capabilities: {
-        tools: {},
-        resources: {}
-      }
-    }
-  );
-  server.setRequestHandler(ListToolsRequestSchema, async () => ({ tools }));
-  server.setRequestHandler(ListResourcesRequestSchema, async () => ({ resources }));
+    name: "maker_pull_runtime_logs",
+    description: "Pull Maker Lua runtime logs once from the remote Maker MCP query_runtime_logs tool and write user_script/server_user_script logs to .maker/logs/runtime/runtime.log. This is a one-shot fixed business flow for AI diagnostics; it does not start a watcher, does not keep a long-running MCP call open, and does not clear local logs.",
+    inputSchema: {
+      type: "object",
+      properties: {
+        target_dir: {
+          type: "string",
+          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."
+        },
+        start_time: {
+          type: "number",
+          description: "Optional Unix seconds cursor. If omitted, the tool uses a fresh local state cursor, otherwise defaults to since_seconds."
+        },
+        since_seconds: {
+          type: "number",
+          description: "Optional fallback lookback window in seconds when no fresh cursor exists. Defaults to 600 seconds and is capped by the remote server."
+        },
+        limit: {
+          type: "number",
+          description: "Optional maximum log entries returned by the remote query."
+        },
+        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."
+        },
+        timeout_ms: {
+          type: "number",
+          description: "Optional remote log query timeout in milliseconds. Defaults to 60 seconds."
+        }
+      }
+    }
+  }
+];
+var resources = [
+  {
+    uri: "maker://status",
+    name: "Maker status",
+    description: "Local TapTap Maker project status, including Git, PAT/TapTap auth, project binding, AI dev kit status, and bundled workflow guide document paths. Maker initialization next_step: taptap-maker init.",
+    mimeType: "text/plain"
+  }
+];
+async function startMakerMcpServer() {
+  const server = new Server(
+    {
+      name: "taptap-maker",
+      version: VERSION
+    },
+    {
+      capabilities: {
+        tools: {},
+        resources: {}
+      }
+    }
+  );
+  server.setRequestHandler(ListToolsRequestSchema, async () => ({ tools }));
+  server.setRequestHandler(ListResourcesRequestSchema, async () => ({ resources }));
   server.setRequestHandler(ReadResourceRequestSchema, async (request) => {
     const uri = request.params.uri;
     if (uri !== "maker://status") {
@@ -30653,6 +31360,30 @@ async function startMakerMcpServer() {
           ]
         };
       }
+      if (name === "maker_pull_runtime_logs") {
+        const args = request.params.arguments || {};
+        const proxy = createRemoteProxyContext({
+          targetDir: resolveMakerToolTargetDir(args.target_dir),
+          serverUrl: args.server_url,
+          env: args.env
+        });
+        const result = await pullRuntimeLogs({
+          projectRoot: proxy.projectRoot,
+          projectId: proxy.projectId,
+          startTime: args.start_time,
+          sinceSeconds: args.since_seconds,
+          limit: args.limit,
+          callRemoteRuntimeLogs: (queryArgs) => callRemoteRuntimeLogs(proxy, queryArgs, args.timeout_ms)
+        });
+        return {
+          content: [
+            {
+              type: "text",
+              text: formatRuntimeLogPullResult(result)
+            }
+          ]
+        };
+      }
       throw new McpError(ErrorCode.MethodNotFound, `Unknown Maker tool: ${name}`);
     } catch (error2) {
       return {
@@ -30699,8 +31430,8 @@ async function formatStatus(options = {}) {
   const git = checkGitEnvironment();
   const projectSection = identify.projectId ? [
     "目标目录已绑定 Maker 项目。",
-    "请继续在当前绑定项目上执行状态、提交、构建等操作；不要再引导用户 clone，除非用户明确要求切换或重新拉取项目。",
-    "本地 Maker 工作流请优先参考 taptap-maker-local skill；CLI 负责初始化/PAT/app/clone，MCP 只保留状态和同步构建。"
+    "请继续在当前绑定项目上执行状态、提交、构建等操作；用户明确要求切换或重新拉取项目时，再进入项目选择流程。",
+    "本地 Maker 工作流请参考 taptap-maker-local workflow guide document；CLI 负责初始化/PAT/app/clone，MCP 只保留状态和同步构建。"
   ].join("\n") : isLikelyAiDialogueDirectory(targetDir) ? formatAiDialogueDirectoryHint(targetDir) : pat ? await formatAutoProjectListFromPat() : formatIdentifyHint();
   return [
     "TapTap Maker MCP status",
@@ -30738,7 +31469,7 @@ function formatMakerRemoteSyncSkipped() {
     "Maker remote sync",
     "",
     "- status: skipped",
-    "- next_action: 已跳过远端同步检查；如需确认是否需要 pull，请重新读取 maker_status_lite 且不要设置 skip_remote_sync。"
+    "- next_action: 已跳过远端同步检查；如需确认是否需要 pull，请重新读取 maker_status_lite 并启用远端同步检查。"
   ].join("\n");
 }
 async function formatMakerRemoteSyncStatus(projectRoot) {
@@ -30823,7 +31554,7 @@ function formatAiDialogueDirectoryHint(targetDir) {
 }
 function resolveMakerToolTargetDir(targetDir) {
   if (targetDir) {
-    return path7.resolve(targetDir);
+    return path8.resolve(targetDir);
   }
   return process.cwd();
 }
@@ -30838,13 +31569,16 @@ async function formatAiDevKitStatus(projectRoot) {
   ].join("\n");
 }
 function formatAiDevKitStatusLines(status, devKitStatus) {
+  const skillStatus = inspectAiDevKitSkillInstallStatus(devKitStatus.targetDir);
   return [
     "AI dev kit",
     "",
     `- status: ${status}`,
     `- required_entries: ${devKitStatus.requiredEntries.join(", ")}`,
     `- present_entries: ${devKitStatus.presentEntries.join(", ") || "(none)"}`,
-    `- missing_entries: ${devKitStatus.missingEntries.join(", ") || "(none)"}`
+    `- missing_entries: ${devKitStatus.missingEntries.join(", ") || "(none)"}`,
+    `- skill_install_status: ${skillStatus.status}`,
+    `- skill_install_summary: ${skillStatus.summary}`
   ];
 }
 async function formatAutoProjectListFromPat() {
@@ -30852,7 +31586,8 @@ async function formatAutoProjectListFromPat() {
     const projects = await listMakerProjects();
     return [
       "本地已有 Maker PAT，当前目录尚未绑定 Maker 项目。",
-      "当前目录未绑定时，先展示下面的 Maker Apps 预览和总数，避免长列表刷屏；选择、解释和 clone 顺序请参考 taptap-maker-local skill。",
+      "当前目录未绑定时，先展示下面的 Maker Apps 预览和总数；选择、解释和 clone 顺序请参考 taptap-maker-local workflow guide document。",
+      "用户选择 app 后，next_step: 执行 `taptap-maker init`。",
       "",
       formatStatusProjectList(projects)
     ].join("\n");
@@ -30897,25 +31632,26 @@ function formatStatusProjectList(projects) {
     "",
     hiddenCount > 0 ? `为了保持友好的可读性，默认最多展示 ${visibleProjects.length} 个 app；如需完整列表，可以选择显示全部。` : "已显示全部 app；请询问用户选择。",
     hiddenCount > 0 ? "如需完整列表，请运行 taptap-maker apps --json 查看全部 app。" : void 0,
-    "AI 展示建议：如果聊天或客户端宽度足够，可把 app 预览整理成两列紧凑布局；每个 app 保留序号、app_id、名称，以及可用的最近活跃时间或 user_id。窄屏保持单列。不要省略 app_id，也不要在用户确认前自动选择 app。",
+    "AI 展示建议：如果聊天或客户端宽度足够，可把 app 预览整理成两列紧凑布局；每个 app 保留序号、app_id、名称，以及可用的最近活跃时间或 user_id。窄屏保持单列。选择 app 前先获取用户确认。",
     "",
     ...visibleProjects.map(
       (project, index) => `${index + 1}. ${project.id}${project.name ? `  ${project.name}` : ""}${project.user_id ? `  user_id=${project.user_id}` : ""}${project.gameType ? `  gameType=${project.gameType}` : ""}${project.stage ? `  stage=${project.stage}` : ""}${project.createdAt ? `  createdAt=${project.createdAt}` : ""}${project.lastConversationAt ? `  lastConversationAt=${project.lastConversationAt}` : ""}`
     ),
     "",
-    "仅当当前目录未绑定且用户要初始化或 clone 时，才让用户选择 app 并继续 taptap-maker init。",
-    "如果当前目录已绑定 Maker 项目，这个列表仅作账号项目参考；请继续当前项目，除非用户明确要求切换或重新 clone。"
+    "当前目录未绑定且用户要初始化或 clone 时，让用户选择 app 并继续 taptap-maker init。",
+    "用户回复序号或 app_id 后，next_step: 执行 `taptap-maker init`，或让已经启动的 `taptap-maker init` 交互继续读取该选择。",
+    "如果当前目录已绑定 Maker 项目，这个列表仅作账号项目参考；请继续当前项目。用户明确要求切换或重新 clone 时，再进入项目选择流程。"
   ].filter((line) => line !== void 0).join("\n");
 }
 function formatClonePartialStateLines(targetDir) {
-  const resolvedTargetDir = path7.resolve(targetDir);
+  const resolvedTargetDir = path8.resolve(targetDir);
   const identify = identifyMakerProject({ cwd: resolvedTargetDir });
   const gitStatus = inspectMakerDirectoryGitStatus(resolvedTargetDir);
   const devKitStatus = inspectAiDevKit(resolvedTargetDir);
-  const stagedDevKitGitignorePath = path7.join(resolvedTargetDir, DEV_KIT_GITIGNORE_STAGING_FILE);
+  const stagedDevKitGitignorePath = path8.join(resolvedTargetDir, DEV_KIT_GITIGNORE_STAGING_FILE);
   const projectBound = Boolean(identify.projectId);
   const gitInitialized = Boolean(
-    gitStatus.isOwnGitRoot || fs6.existsSync(path7.join(resolvedTargetDir, ".git"))
+    gitStatus.isOwnGitRoot || fs7.existsSync(path8.join(resolvedTargetDir, ".git"))
   );
   const safeToRetry = !projectBound;
   return [
@@ -30929,9 +31665,9 @@ function formatClonePartialStateLines(targetDir) {
     identify.configPath ? `- config: ${identify.configPath}` : "",
     `- ai_dev_kit_present: ${devKitStatus.ready ? "yes" : "no"}`,
     `- ai_dev_kit_missing_entries: ${devKitStatus.missingEntries.join(", ") || "(none)"}`,
-    `- staged_dev_kit_gitignore: ${fs6.existsSync(stagedDevKitGitignorePath) ? "yes" : "no"}`,
+    `- staged_dev_kit_gitignore: ${fs7.existsSync(stagedDevKitGitignorePath) ? "yes" : "no"}`,
     `- safe_to_retry: ${safeToRetry ? "yes" : "no"}`,
-    safeToRetry ? "- next_step: 可以直接重试 taptap-maker init；如果连续失败，建议换一个全新的独立目录重新 clone。" : "- next_step: 当前目录已经有 Maker 绑定信息；先运行 taptap-maker doctor 或读取 maker://status 确认状态，不要重复 clone。"
+    safeToRetry ? "- next_step: 可以直接重试 taptap-maker init；如果连续失败，建议换一个全新的独立目录重新 clone。" : "- next_step: 当前目录已经有 Maker 绑定信息；先运行 taptap-maker doctor 或读取 maker://status 确认状态。"
   ].filter(Boolean);
 }
 function createRemoteProxyContext(options) {
@@ -31000,17 +31736,17 @@ function createRemoteProxyContext(options) {
 }
 function resolveLocalProxyBundle(options) {
   const currentModuleUrl = (options == null ? void 0 : options.currentModuleUrl) || (typeof __MAKER_BUNDLE_URL__ !== "undefined" ? __MAKER_BUNDLE_URL__ : void 0);
-  const currentModuleDir = currentModuleUrl ? path7.dirname(fileURLToPath2(currentModuleUrl)) : "";
+  const currentModuleDir = currentModuleUrl ? path8.dirname(fileURLToPath2(currentModuleUrl)) : "";
   const makerEntry = (options == null ? void 0 : options.makerEntry) ?? process.argv[1];
-  const makerEntryDir = makerEntry ? path7.dirname(path7.resolve(makerEntry)) : "";
+  const makerEntryDir = makerEntry ? path8.dirname(path8.resolve(makerEntry)) : "";
   const cwd = (options == null ? void 0 : options.cwd) ?? process.cwd();
   const candidates = [
-    currentModuleDir ? path7.join(currentModuleDir, "proxy.js") : "",
-    makerEntryDir ? path7.join(makerEntryDir, "..", "dist", "proxy.js") : "",
-    path7.resolve(cwd, "dist", "proxy.js")
+    currentModuleDir ? path8.join(currentModuleDir, "proxy.js") : "",
+    makerEntryDir ? path8.join(makerEntryDir, "..", "dist", "proxy.js") : "",
+    path8.resolve(cwd, "dist", "proxy.js")
   ].filter(Boolean);
   for (const candidate of candidates) {
-    if (fs6.existsSync(candidate)) {
+    if (fs7.existsSync(candidate)) {
       return candidate;
     }
   }
@@ -31098,6 +31834,13 @@ function formatMakerAppWebUrl(projectId, env) {
   const makerEnv = env === "rnd" || env === "production" ? env : void 0;
   return `${getMakerWebUrl(makerEnv)}/app/${encodeURIComponent(projectId)}`;
 }
+var RemoteBuildFailedError = class extends Error {
+  constructor(buildResult) {
+    super(buildResult.resultText);
+    this.name = "RemoteBuildFailedError";
+    this.buildResult = buildResult;
+  }
+};
 async function buildCurrentDirectory(options) {
   var _a2;
   const localChanges = await readMakerProjectLocalChanges(options.targetDir);
@@ -31140,11 +31883,27 @@ async function buildCurrentDirectory(options) {
       submitResult
     };
   }
-  return runRemoteBuildCurrentDirectory(options, options.targetDir);
+  try {
+    return await runRemoteBuildCurrentDirectory(options, options.targetDir);
+  } catch (error2) {
+    if (error2 instanceof RemoteBuildFailedError) {
+      return {
+        mode: "remote_build_failed",
+        projectRoot: error2.buildResult.projectRoot,
+        projectId: error2.buildResult.projectId,
+        buildResult: error2.buildResult,
+        buildFailure: toMakerBuildFailure(error2)
+      };
+    }
+    throw error2;
+  }
 }
 async function runRemoteBuildCurrentDirectory(options, targetDir) {
   if (options.callRemoteBuild) {
-    return options.callRemoteBuild(targetDir);
+    return attachBuildSuccessSideEffects(await options.callRemoteBuild(targetDir), {
+      refreshPreview: options.refreshPreview || skipPreviewRefresh,
+      startRuntimeLogWatch: options.startRuntimeLogWatch
+    });
   }
   const proxy = createRemoteProxyContext({
     targetDir,
@@ -31190,22 +31949,446 @@ async function runRemoteBuildCurrentDirectory(options, targetDir) {
         }
       }
     );
+    if (isRemoteToolError(result)) {
+      throw new Error(formatRemoteToolResult(result));
+    }
+    return attachBuildSuccessSideEffects(
+      {
+        mode: "remote_build",
+        projectRoot: proxy.projectRoot,
+        projectId: proxy.projectId,
+        projectPath: proxy.projectPath,
+        serverUrl: proxy.serverUrl,
+        env: proxy.env,
+        makerUrl: formatMakerAppWebUrl(proxy.projectId, proxy.env),
+        timeoutMs,
+        buildArgs,
+        resultText: formatRemoteToolResult(result)
+      },
+      {
+        refreshPreview: options.refreshPreview,
+        startRuntimeLogWatch: options.startRuntimeLogWatch || startRuntimeLogWatch
+      }
+    );
+  } finally {
+    await client.close();
+  }
+}
+async function attachBuildSuccessSideEffects(buildResult, options) {
+  if (isRemoteBuildFailureResult(buildResult)) {
+    throw new RemoteBuildFailedError(buildResult);
+  }
+  const withPreview = await attachPreviewRefresh(buildResult, options.refreshPreview);
+  if (!options.startRuntimeLogWatch) {
+    return withPreview;
+  }
+  return attachRuntimeLogWatch(withPreview, options.startRuntimeLogWatch);
+}
+function isRemoteToolError(result) {
+  return Boolean(result && typeof result === "object" && result.isError);
+}
+function isRemoteBuildFailureResult(buildResult) {
+  return /\bBUILD FAILED\b/i.test(buildResult.resultText);
+}
+async function attachPreviewRefresh(buildResult, refreshPreview = refreshMakerPreview) {
+  try {
     return {
-      mode: "remote_build",
-      projectRoot: proxy.projectRoot,
-      projectId: proxy.projectId,
-      projectPath: proxy.projectPath,
-      serverUrl: proxy.serverUrl,
-      env: proxy.env,
-      makerUrl: formatMakerAppWebUrl(proxy.projectId, proxy.env),
-      timeoutMs,
-      buildArgs,
-      resultText: formatRemoteToolResult(result)
+      ...buildResult,
+      previewRefresh: await refreshPreview(buildResult)
+    };
+  } catch (error2) {
+    return {
+      ...buildResult,
+      previewRefresh: {
+        ok: false,
+        status: 0,
+        url: "",
+        error: error2 instanceof Error ? error2.message : String(error2)
+      }
+    };
+  }
+}
+async function skipPreviewRefresh(buildResult) {
+  return {
+    ok: false,
+    status: 0,
+    url: "",
+    error: `preview refresh skipped for injected remote build: ${buildResult.projectId}`
+  };
+}
+async function attachRuntimeLogWatch(buildResult, startWatch) {
+  try {
+    return {
+      ...buildResult,
+      runtimeLogWatch: await startWatch(buildResult)
+    };
+  } catch (error2) {
+    return {
+      ...buildResult,
+      runtimeLogWatch: {
+        started: false,
+        command: formatRuntimeLogWatchCommand(buildResult).text,
+        runtimeLog: getRuntimeLogFilePath(buildResult.projectRoot),
+        error: error2 instanceof Error ? error2.message : String(error2)
+      }
+    };
+  }
+}
+async function startRuntimeLogWatch(buildResult) {
+  const runtimeDir = path8.join(buildResult.projectRoot, ".maker", "logs", "runtime");
+  fs7.mkdirSync(runtimeDir, { recursive: true });
+  const stdoutLog = path8.join(runtimeDir, "watcher.out.log");
+  const stderrLog = path8.join(runtimeDir, "watcher.err.log");
+  const pidFile = path8.join(runtimeDir, "watcher.pid");
+  const previous = stopExistingRuntimeLogWatcher(pidFile);
+  const outFd = fs7.openSync(stdoutLog, "a");
+  const errFd = fs7.openSync(stderrLog, "a");
+  const command = formatRuntimeLogWatchCommand(buildResult);
+  if (previous.previousStopError) {
+    fs7.closeSync(outFd);
+    fs7.closeSync(errFd);
+    return {
+      started: false,
+      command: command.text,
+      runtimeLog: getRuntimeLogFilePath(buildResult.projectRoot),
+      stdoutLog,
+      stderrLog,
+      pidFile,
+      ...previous,
+      error: previous.previousStopError
+    };
+  }
+  try {
+    const child = spawn4(command.command, command.args, {
+      cwd: buildResult.projectRoot,
+      detached: true,
+      env: mergeStringEnv(process.env, { TAPTAP_MCP_ENV: buildResult.env }),
+      stdio: ["ignore", outFd, errFd],
+      windowsHide: true
+    });
+    const spawnError = await waitForSpawnError(child);
+    if (spawnError) {
+      return {
+        started: false,
+        command: command.text,
+        runtimeLog: getRuntimeLogFilePath(buildResult.projectRoot),
+        stdoutLog,
+        stderrLog,
+        pidFile,
+        ...previous,
+        error: spawnError.message
+      };
+    }
+    if (!child.pid) {
+      return {
+        started: false,
+        command: command.text,
+        runtimeLog: getRuntimeLogFilePath(buildResult.projectRoot),
+        stdoutLog,
+        stderrLog,
+        pidFile,
+        ...previous,
+        error: "runtime log watcher process did not report a pid"
+      };
+    }
+    child.once("error", () => void 0);
+    child.unref();
+    writeRuntimeLogWatcherPidFile(pidFile, {
+      pid: child.pid,
+      command: command.text,
+      startedAt: (/* @__PURE__ */ new Date()).toISOString()
+    });
+    return {
+      started: true,
+      command: command.text,
+      runtimeLog: getRuntimeLogFilePath(buildResult.projectRoot),
+      stdoutLog,
+      stderrLog,
+      pidFile,
+      pid: child.pid,
+      ...previous
     };
   } finally {
-    await client.close();
+    fs7.closeSync(outFd);
+    fs7.closeSync(errFd);
+  }
+}
+function stopExistingRuntimeLogWatcher(pidFile, options = {}) {
+  if (!fs7.existsSync(pidFile)) {
+    return {};
+  }
+  const pidState = readRuntimeLogWatcherPidState(pidFile);
+  const pid = pidState == null ? void 0 : pidState.pid;
+  if (!Number.isInteger(pid) || pid <= 0) {
+    fs7.rmSync(pidFile, { force: true });
+    return {};
+  }
+  try {
+    process.kill(pid, 0);
+    const processCommand = (options.getProcessCommand || getProcessCommand)(pid);
+    const verifiedCommand = getVerifiedRuntimeLogWatcherCommand(processCommand, pidState);
+    if (!verifiedCommand) {
+      fs7.rmSync(pidFile, { force: true });
+      return {
+        previousPid: pid,
+        previousStopped: false,
+        previousStopError: processCommand ? `process ${pid} does not look like a Maker log watcher: ${processCommand}` : `process ${pid} could not be verified as a Maker log watcher`
+      };
+    }
+    process.kill(pid, "SIGTERM");
+    const stopped = (options.waitForExit || waitForProcessExit)(pid, WATCHER_STOP_TIMEOUT_MS);
+    if (stopped) {
+      fs7.rmSync(pidFile, { force: true });
+      return { previousPid: pid, previousStopped: true };
+    }
+    return {
+      previousPid: pid,
+      previousStopped: false,
+      previousStopError: `process ${pid} did not exit after SIGTERM within ${WATCHER_STOP_TIMEOUT_MS}ms`
+    };
+  } catch (error2) {
+    fs7.rmSync(pidFile, { force: true });
+    const code = error2 && typeof error2 === "object" && "code" in error2 ? String(error2.code) : "";
+    if (code === "ESRCH") {
+      return { previousPid: pid, previousStopped: false };
+    }
+    return {
+      previousPid: pid,
+      previousStopped: false,
+      previousStopError: error2 instanceof Error ? error2.message : String(error2)
+    };
+  }
+}
+function readRuntimeLogWatcherPidState(pidFile) {
+  const raw = fs7.readFileSync(pidFile, "utf8").trim();
+  if (!raw) {
+    return null;
+  }
+  try {
+    const parsed = JSON.parse(raw);
+    if (typeof parsed === "number") {
+      return Number.isInteger(parsed) && parsed > 0 ? { pid: parsed, legacy: true } : null;
+    }
+    return typeof parsed.pid === "number" ? parsed : null;
+  } catch {
+    const pid = Number(raw);
+    return Number.isInteger(pid) && pid > 0 ? { pid, legacy: true } : null;
+  }
+}
+function writeRuntimeLogWatcherPidFile(pidFile, state) {
+  fs7.writeFileSync(pidFile, `${JSON.stringify(state, null, 2)}
+`, "utf8");
+}
+function getProcessCommand(pid) {
+  if (process.platform === "win32") {
+    return void 0;
+  }
+  try {
+    return execFileSync("ps", ["-p", String(pid), "-o", "command="], {
+      encoding: "utf8",
+      stdio: ["ignore", "pipe", "ignore"]
+    }).trim();
+  } catch {
+    return void 0;
+  }
+}
+function isRuntimeLogWatcherProcess(command) {
+  return Boolean(command && WATCHER_PROCESS_PATTERN.test(command));
+}
+function getVerifiedRuntimeLogWatcherCommand(processCommand, pidState) {
+  if (isRuntimeLogWatcherProcess(processCommand)) {
+    return processCommand;
+  }
+  if (!processCommand && !pidState.legacy && isRuntimeLogWatcherProcess(pidState.command)) {
+    return pidState.command;
+  }
+  return void 0;
+}
+function waitForProcessExit(pid, timeoutMs) {
+  const deadline = Date.now() + timeoutMs;
+  while (Date.now() < deadline) {
+    try {
+      process.kill(pid, 0);
+    } catch {
+      return true;
+    }
+    sleepSync(50);
+  }
+  try {
+    process.kill(pid, 0);
+    return false;
+  } catch {
+    return true;
   }
 }
+function sleepSync(ms) {
+  const buffer = new SharedArrayBuffer(4);
+  Atomics.wait(new Int32Array(buffer), 0, 0, ms);
+}
+function waitForSpawnError(child) {
+  return new Promise((resolve) => {
+    let done = false;
+    const finish = (error2) => {
+      if (done) {
+        return;
+      }
+      done = true;
+      child.off("error", finish);
+      resolve(error2);
+    };
+    child.once("error", finish);
+    setTimeout(() => finish(), 50);
+  });
+}
+function formatRuntimeLogWatchCommand(buildResult) {
+  const args = [
+    resolveMakerCliEntry(),
+    "logs",
+    "watch",
+    "--target-dir",
+    buildResult.projectRoot,
+    "--reset",
+    "--interval",
+    "5s",
+    "--env",
+    buildResult.env,
+    "--server-url",
+    buildResult.serverUrl
+  ];
+  return {
+    command: process.execPath,
+    args,
+    text: formatLocalShellCommand([process.execPath, ...args])
+  };
+}
+function resolveMakerCliEntry() {
+  return process.argv[1] || path8.resolve(process.cwd(), "dist", "maker.js");
+}
+function getRuntimeLogFilePath(projectRoot) {
+  return path8.join(projectRoot, ".maker", "logs", "runtime", "runtime.log");
+}
+async function refreshMakerPreview(buildResult) {
+  const makerEnv = buildResult.env === "rnd" || buildResult.env === "production" ? buildResult.env : void 0;
+  const apiBase = requireMakerEndpoint("apiBase", getMakerEndpoints(makerEnv).apiBase, makerEnv);
+  const url2 = `${apiBase.replace(/\/$/, "")}/apps/${encodeURIComponent(
+    buildResult.projectId
+  )}/preview-refresh`;
+  const pat = loadPat();
+  if (!(pat == null ? void 0 : pat.token)) {
+    return {
+      ok: false,
+      status: 0,
+      url: url2,
+      error: "Maker PAT not found. Run taptap-maker pat set and paste a Maker PAT first."
+    };
+  }
+  const controller = new AbortController();
+  const timeout = setTimeout(() => {
+    controller.abort();
+  }, PREVIEW_REFRESH_TIMEOUT_MS);
+  try {
+    const response = await fetch(url2, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${pat.token}`,
+        "Content-Type": "application/json"
+      },
+      body: "{}",
+      signal: controller.signal
+    });
+    const responseText = await response.text();
+    return {
+      ok: response.ok,
+      status: response.status,
+      url: url2,
+      ...responseText ? { responseText: responseText.slice(0, 2e3) } : {}
+    };
+  } catch (error2) {
+    return {
+      ok: false,
+      status: 0,
+      url: url2,
+      error: error2 instanceof Error && error2.name === "AbortError" ? `preview refresh timed out after ${PREVIEW_REFRESH_TIMEOUT_MS}ms` : error2 instanceof Error ? error2.message : String(error2)
+    };
+  } finally {
+    clearTimeout(timeout);
+  }
+}
+async function callRemoteRuntimeLogs(proxy, args, timeoutMs = 60 * 1e3) {
+  const runtimeLogClient = createRemoteRuntimeLogClient(proxy, timeoutMs);
+  try {
+    return await runtimeLogClient.call(args);
+  } finally {
+    await runtimeLogClient.close();
+  }
+}
+function createRemoteRuntimeLogClient(proxy, timeoutMs = 60 * 1e3, options = {}) {
+  let client;
+  const createTransport = options.createTransport || (() => new HiddenStdioClientTransport({
+    command: proxy.command,
+    args: proxy.args,
+    env: mergeStringEnv(process.env, proxy.envVars),
+    stderr: "pipe"
+  }));
+  const createClient = options.createClient || (() => new Client(
+    {
+      name: "taptap-maker-runtime-log-forwarder",
+      version: VERSION
+    },
+    {
+      capabilities: {}
+    }
+  ));
+  const ensureClient = async () => {
+    if (client) {
+      return client;
+    }
+    const nextClient = createClient();
+    await nextClient.connect(createTransport());
+    client = nextClient;
+    return nextClient;
+  };
+  const close = async () => {
+    const activeClient = client;
+    client = void 0;
+    if (activeClient) {
+      await activeClient.close();
+    }
+  };
+  return {
+    call: async (args) => {
+      const activeClient = await ensureClient();
+      let result;
+      try {
+        result = await activeClient.callTool(
+          {
+            name: "query_runtime_logs",
+            arguments: { ...args }
+          },
+          void 0,
+          {
+            timeout: timeoutMs
+          }
+        );
+      } catch (error2) {
+        await close();
+        throw error2;
+      }
+      try {
+        return normalizeRuntimeLogQueryResult(result);
+      } catch (error2) {
+        const rawPath = writeRuntimeLogRawResponse(proxy.projectRoot, result);
+        throw new Error(
+          [
+            error2 instanceof Error ? error2.message : String(error2),
+            `Raw query_runtime_logs response saved to ${rawPath}`
+          ].join(" ")
+        );
+      }
+    },
+    close
+  };
+}
 function toMakerBuildFailure(error2) {
   return {
     name: error2 instanceof Error ? error2.name : typeof error2,
@@ -31221,7 +32404,7 @@ function createBuildArgs(projectRoot, options) {
   if (options.scriptsPath) {
     buildArgs.scriptsPath = options.scriptsPath;
   }
-  if (!options.entry && !options.scriptsPath && !options.entryClient && !options.entryServer && !options.multiplayer && fs6.existsSync(path7.join(projectRoot, "scripts", "main.lua"))) {
+  if (!options.entry && !options.scriptsPath && !options.entryClient && !options.entryServer && !options.multiplayer && fs7.existsSync(path8.join(projectRoot, "scripts", "main.lua"))) {
     buildArgs.entry = "main.lua";
     buildArgs.scriptsPath = "scripts";
   }
@@ -31233,7 +32416,7 @@ function createBuildArgs(projectRoot, options) {
   }
   if (options.multiplayer) {
     buildArgs.multiplayer = options.multiplayer;
-  } else if (!fs6.existsSync(path7.join(projectRoot, ".project", "settings.json"))) {
+  } else if (!fs7.existsSync(path8.join(projectRoot, ".project", "settings.json"))) {
     buildArgs.multiplayer = { enabled: false };
   }
   return buildArgs;
@@ -31268,6 +32451,26 @@ function formatRemoteToolResult(result) {
   }).join("\n");
 }
 function formatBuildResult(result, progressSummary) {
+  if (result.mode === "remote_build_failed") {
+    return [
+      "✗ Remote Maker build failed",
+      "",
+      `- project_root: ${result.projectRoot}`,
+      `- project_id: ${result.projectId}`,
+      `- maker_url: ${result.buildResult.makerUrl || formatMakerAppWebUrl(result.buildResult.projectId, result.buildResult.env)}`,
+      `- 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)}`,
+      ...formatProgressSummary(progressSummary),
+      "",
+      ...formatMakerBuildFailureLines(result.buildFailure),
+      "",
+      "remote_result:",
+      indent(result.buildResult.resultText)
+    ].filter(Boolean).join("\n");
+  }
   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",
@@ -31334,7 +32537,10 @@ function formatBuildResult(result, progressSummary) {
   lines.push(
     `- timeout_ms: ${result.timeoutMs}`,
     `- build_args: ${JSON.stringify(result.buildArgs)}`,
+    ...formatPreviewRefreshLines(result.previewRefresh),
     ...formatProgressSummary(progressSummary),
+    "",
+    ...formatRuntimeLogWatchNextActionLines(result),
     ""
   );
   if (submitLines.length > 0) {
@@ -31343,6 +32549,51 @@ function formatBuildResult(result, progressSummary) {
   lines.push("remote_result:", indent(result.resultText));
   return lines.join("\n");
 }
+function formatPreviewRefreshLines(result) {
+  if (!result) {
+    return ["- preview_refresh: (not attempted)"];
+  }
+  return [
+    `- preview_refresh: ${result.ok ? "ok" : "failed"}`,
+    `- preview_refresh_status: ${result.status}`,
+    result.url ? `- preview_refresh_url: ${result.url}` : "",
+    result.error ? `- preview_refresh_error: ${result.error}` : ""
+  ].filter(Boolean);
+}
+function formatRuntimeLogWatchNextActionLines(result) {
+  var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  const command = formatLocalShellCommand([
+    "taptap-maker",
+    "logs",
+    "watch",
+    "--target-dir",
+    result.projectRoot,
+    "--reset",
+    "--interval",
+    "5s"
+  ]);
+  return [
+    "runtime_logs:",
+    result.runtimeLogWatch ? `- watch_started: ${result.runtimeLogWatch.started ? "yes" : "no"}` : "- watch_started: (not attempted)",
+    ((_a2 = result.runtimeLogWatch) == null ? void 0 : _a2.pid) ? `- watch_pid: ${result.runtimeLogWatch.pid}` : "",
+    `- watch_command: ${command}`,
+    ((_b = result.runtimeLogWatch) == null ? void 0 : _b.command) ? `- actual_watch_command: ${result.runtimeLogWatch.command}` : "",
+    `- local_file: ${path8.join(result.projectRoot, ".maker", "logs", "runtime", "runtime.log")}`,
+    ((_c = result.runtimeLogWatch) == null ? void 0 : _c.stdoutLog) ? `- watcher_stdout: ${result.runtimeLogWatch.stdoutLog}` : "",
+    ((_d = result.runtimeLogWatch) == null ? void 0 : _d.stderrLog) ? `- watcher_stderr: ${result.runtimeLogWatch.stderrLog}` : "",
+    ((_e = result.runtimeLogWatch) == null ? void 0 : _e.pidFile) ? `- watcher_pid_file: ${result.runtimeLogWatch.pidFile}` : "",
+    `- state_file: ${path8.join(result.projectRoot, ".maker", "logs", "runtime", "state.json")}`,
+    ((_f = result.runtimeLogWatch) == null ? void 0 : _f.previousPid) ? `- previous_watch_pid: ${result.runtimeLogWatch.previousPid}` : "",
+    ((_g = result.runtimeLogWatch) == null ? void 0 : _g.previousStopped) !== void 0 ? `- previous_watch_stopped: ${result.runtimeLogWatch.previousStopped ? "yes" : "no"}` : "",
+    ((_h = result.runtimeLogWatch) == null ? void 0 : _h.previousStopError) ? `- previous_watch_stop_error: ${result.runtimeLogWatch.previousStopError}` : "",
+    ((_i = result.runtimeLogWatch) == null ? void 0 : _i.error) ? `- watch_error: ${result.runtimeLogWatch.error}` : "",
+    ((_j = result.runtimeLogWatch) == null ? void 0 : _j.started) ? "- note: 构建成功后已启动本地 CLI watcher，正在清理历史日志并每 5 秒持续追加 Lua 运行日志。" : "- note: 构建成功后应由本地 CLI watcher 清理历史日志，并每 5 秒持续追加 Lua 运行日志。",
+    "- next_action: 如需分析游戏运行结果或报错，请读取 runtime_logs.local_file；如需判断 watcher 是否正常，请读取 runtime_logs.state_file。"
+  ].filter(Boolean);
+}
+function formatLocalShellCommand(parts) {
+  return parts.map((part) => /\s/.test(part) ? `"${part.replace(/(["\\$`])/g, "\\$1")}"` : part).join(" ");
+}
 function formatPushRecoveryLines(submitResult) {
   if (submitResult.pushed || submitResult.status !== "failed_after_commit") {
     return [];
@@ -31448,20 +32699,21 @@ function indent(value) {
 // src/maker/cli/commands.ts
 import { spawnSync as spawnSync4 } from "node:child_process";
 import crypto from "node:crypto";
-import fs7 from "node:fs";
+import fs8 from "node:fs";
 import os4 from "node:os";
-import path8 from "node:path";
+import path9 from "node:path";
 import readline from "node:readline/promises";
 import { stdin as input, stdout as output } from "node:process";
 var DEFAULT_MCP_NAME = "taptap-maker";
 var DEFAULT_PACKAGE = "@taptap/instant-games-open-mcp";
-var TWO_PART_COMMANDS = /* @__PURE__ */ new Set(["pat", "mcp", "dev-kit"]);
+var TWO_PART_COMMANDS = /* @__PURE__ */ new Set(["pat", "mcp", "dev-kit", "logs"]);
 var BOOLEAN_OPTIONS = /* @__PURE__ */ new Set([
   "json",
   "skip_confirm",
   "skip_mcp_install",
   "pat_stdin",
   "pat_from_stdin",
+  "reset",
   "all",
   "h",
   "help"
@@ -31503,6 +32755,10 @@ async function runMakerCli(argv) {
     await runDevKitUpdate(parsed, ctx);
     return;
   }
+  if (command === "logs" && subcommand === "watch") {
+    await runLogsWatch(parsed, ctx);
+    return;
+  }
   throw new Error(`Unknown taptap-maker command: ${formatUnknownCommand(parsed.command)}`);
 }
 function parseArgs(argv) {
@@ -31551,7 +32807,7 @@ function toOptionKey(value) {
   return value.replace(/-/g, "_");
 }
 async function runInit(parsed, ctx) {
-  const targetDir = path8.resolve(stringOption(parsed, "target_dir") || process.cwd());
+  const targetDir = path9.resolve(stringOption(parsed, "target_dir") || process.cwd());
   const env = makerEnvOption(parsed);
   const skipConfirm = booleanOption(parsed, "skip_confirm");
   const skipMcpInstall = booleanOption(parsed, "skip_mcp_install");
@@ -31569,12 +32825,16 @@ async function runInit(parsed, ctx) {
   emit(ctx, "doctor", "Git is available", { version: git.version });
   const pat = await resolvePat(parsed, ctx);
   emit(ctx, "pat", "Maker PAT ready", { saved: getPatPath() });
-  const tapAuth = await requestTapAuthWithPat(pat);
+  const tapAuth = await requestTapAuthWithPat(pat).catch((error2) => {
+    throw appendPatRecoveryUrl(error2, parsed);
+  });
   emit(ctx, "tap_auth", "TapTap token exchanged and saved", {
     kid: mask(tapAuth.kid),
     saved: getTapAuthPath()
   });
-  const projects = await listMakerProjects({ pat });
+  const projects = await listMakerProjects({ pat }).catch((error2) => {
+    throw appendPatRecoveryUrl(error2, parsed);
+  });
   const selected = await resolveProjectSelection(parsed, projects, {
     skipConfirm
   });
@@ -31597,6 +32857,8 @@ async function runInit(parsed, ctx) {
     userId: selected.user_id,
     sceEndpoint: selected.sce_endpoint || process.env.SCE_MCP_URL,
     onProgress: (progress) => emitProgress(ctx, "clone", progress)
+  }).catch((error2) => {
+    throw appendPatRecoveryUrl(error2, parsed);
   });
   emit(ctx, "clone", "Maker project cloned or fetched", cloneResult);
   if (!skipMcpInstall) {
@@ -31624,7 +32886,7 @@ async function runInit(parsed, ctx) {
   });
 }
 async function runDoctor(parsed, ctx) {
-  const targetDir = path8.resolve(stringOption(parsed, "target_dir") || process.cwd());
+  const targetDir = path9.resolve(stringOption(parsed, "target_dir") || process.cwd());
   const git = checkGitEnvironment();
   const pat = loadPat();
   const tapAuth = loadTapAuth();
@@ -31675,7 +32937,9 @@ async function runApps(parsed, ctx) {
     warnPatArgExposure();
   }
   const showAll = booleanOption(parsed, "all");
-  const projects = await listMakerProjects({ pat });
+  const projects = await listMakerProjects({ pat }).catch((error2) => {
+    throw appendPatRecoveryUrl(error2, parsed);
+  });
   if (ctx.json) {
     writeJson(projects);
     return;
@@ -31686,7 +32950,9 @@ async function runApps(parsed, ctx) {
 async function runPatSet(parsed, ctx) {
   const pat = await resolvePatSet(parsed, ctx);
   saveManualMakerPat(pat);
-  const tapAuth = await requestTapAuthWithPat(pat);
+  const tapAuth = await requestTapAuthWithPat(pat).catch((error2) => {
+    throw appendPatRecoveryUrl(error2, parsed);
+  });
   emit(ctx, "pat", "Maker PAT and TapTap token saved", {
     pat_path: getPatPath(),
     tap_auth_path: getTapAuthPath(),
@@ -31695,7 +32961,7 @@ async function runPatSet(parsed, ctx) {
 }
 async function resolvePatSet(parsed, ctx) {
   if (booleanOption(parsed, "pat_stdin") || booleanOption(parsed, "pat_from_stdin")) {
-    const pat = fs7.readFileSync(0, "utf8").trim();
+    const pat = fs8.readFileSync(0, "utf8").trim();
     if (!pat) {
       throw new Error("No PAT found on stdin.");
     }
@@ -31822,13 +33088,127 @@ function getMcpVerifyNextSteps(mode, commandText) {
   ];
 }
 async function runDevKitUpdate(parsed, ctx) {
-  const targetDir = path8.resolve(stringOption(parsed, "target_dir") || process.cwd());
+  const targetDir = path9.resolve(stringOption(parsed, "target_dir") || process.cwd());
   const result = await installAiDevKit({
     targetDir,
     preserveExisting: true
   });
   finalizeStagedDevKitGitignore(targetDir);
-  emit(ctx, "dev_kit", "AI dev kit updated", result);
+  emit(ctx, "dev_kit", formatDevKitInstallMessage("AI dev kit updated", result), result);
+  emitDevKitSkillInstallerFailure(ctx, result.skillInstaller, "AI skills install failed");
+}
+async function runLogsWatch(parsed, ctx) {
+  const targetDir = path9.resolve(stringOption(parsed, "target_dir") || process.cwd());
+  const intervalMs = parseDurationMs(stringOption(parsed, "interval") || "5s");
+  const timeoutMs = numberOption(parsed, "timeout_ms") ?? 60 * 1e3;
+  const maxPolls = numberOption(parsed, "max_polls");
+  const maxConsecutiveFailures = numberOption(parsed, "max_consecutive_failures");
+  const proxy = createRemoteProxyContext({
+    targetDir,
+    serverUrl: stringOption(parsed, "server_url"),
+    env: makerEnvOption(parsed)
+  });
+  const runtimeDir = path9.join(proxy.projectRoot, ".maker", "logs", "runtime");
+  const runtimeLog = path9.join(runtimeDir, "runtime.log");
+  const pidFile = path9.join(runtimeDir, "watcher.pid");
+  const replacedWatcher = registerRuntimeLogWatcherProcess(pidFile);
+  const runtimeLogClient = createRemoteRuntimeLogClient(proxy, timeoutMs);
+  emit(ctx, "logs_watch_start", "Maker runtime log watcher started", {
+    project_root: proxy.projectRoot,
+    project_id: proxy.projectId,
+    runtime_log: runtimeLog,
+    pid_file: pidFile,
+    pid: process.pid,
+    ...replacedWatcher,
+    reset: booleanOption(parsed, "reset"),
+    interval_ms: intervalMs,
+    topics: ["user_script", "server_user_script"]
+  });
+  try {
+    const result = await watchRuntimeLogs({
+      projectRoot: proxy.projectRoot,
+      projectId: proxy.projectId,
+      reset: booleanOption(parsed, "reset"),
+      intervalMs,
+      limit: numberOption(parsed, "limit"),
+      maxPolls,
+      maxConsecutiveFailures,
+      callRemoteRuntimeLogs: (args) => runtimeLogClient.call(args),
+      onPoll: (pullResult) => {
+        emit(ctx, "logs_poll", `Maker runtime logs pulled: ${pullResult.writtenLogs}`, {
+          written_logs: pullResult.writtenLogs,
+          has_more: pullResult.hasMore,
+          next_start_time: pullResult.nextStartTime,
+          files: pullResult.files
+        });
+      },
+      onError: (error2, consecutiveFailures) => {
+        emit(ctx, "logs_poll_error", "Maker runtime log poll failed; watcher will retry", {
+          consecutive_failures: consecutiveFailures,
+          error: error2 instanceof Error ? error2.message : String(error2)
+        });
+      }
+    });
+    emit(ctx, "logs_watch_stop", "Maker runtime log watcher stopped", result);
+  } finally {
+    await runtimeLogClient.close();
+  }
+}
+function registerRuntimeLogWatcherProcess(pidFile) {
+  fs8.mkdirSync(path9.dirname(pidFile), { recursive: true });
+  const existingPid = readPidFile(pidFile);
+  const previous = existingPid && existingPid !== process.pid ? stopExistingRuntimeLogWatcher(pidFile) : {};
+  fs8.writeFileSync(
+    pidFile,
+    `${JSON.stringify(
+      {
+        pid: process.pid,
+        command: formatShellCommand([process.execPath, ...process.argv.slice(1)]),
+        startedAt: (/* @__PURE__ */ new Date()).toISOString()
+      },
+      null,
+      2
+    )}
+`,
+    "utf8"
+  );
+  installRuntimeLogWatcherPidCleanup(pidFile);
+  return previous;
+}
+function readPidFile(pidFile) {
+  if (!fs8.existsSync(pidFile)) {
+    return void 0;
+  }
+  const raw = fs8.readFileSync(pidFile, "utf8").trim();
+  let pid = Number(raw);
+  if (!Number.isInteger(pid) || pid <= 0) {
+    try {
+      const parsed = JSON.parse(raw);
+      pid = typeof parsed.pid === "number" ? parsed.pid : Number.NaN;
+    } catch {
+      pid = Number.NaN;
+    }
+  }
+  return Number.isInteger(pid) && pid > 0 ? pid : void 0;
+}
+function installRuntimeLogWatcherPidCleanup(pidFile) {
+  let cleaned = false;
+  const cleanup = () => {
+    if (cleaned) {
+      return;
+    }
+    cleaned = true;
+    if (readPidFile(pidFile) === process.pid) {
+      fs8.rmSync(pidFile, { force: true });
+    }
+  };
+  process.once("exit", cleanup);
+  for (const signal of ["SIGINT", "SIGTERM"]) {
+    process.once(signal, () => {
+      cleanup();
+      process.exit(0);
+    });
+  }
 }
 async function resolvePat(parsed, ctx) {
   const fromArgs = stringOption(parsed, "pat");
@@ -31900,21 +33280,90 @@ async function prepareDevKit(targetDir, ctx) {
   const before = inspectAiDevKit(targetDir);
   if (before.ready) {
     writeDevKitStagedGitignore(
-      path8.join(targetDir, DEV_KIT_GITIGNORE_STAGING_FILE),
+      path9.join(targetDir, DEV_KIT_GITIGNORE_STAGING_FILE),
       listPresentDevKitManagedEntries(targetDir)
     );
-    emit(ctx, "dev_kit", "AI dev kit already present", before);
+    try {
+      const skillInstaller = installAiDevKitSkills(targetDir, {
+        onStart: (event) => emitSkillInstallerStart(ctx, event)
+      });
+      emit(
+        ctx,
+        "dev_kit",
+        formatDevKitInstallMessage("AI dev kit already present", { skillInstaller }),
+        {
+          ...before,
+          skillInstaller
+        }
+      );
+    } catch (error2) {
+      const detail = error2 instanceof Error ? error2.message : String(error2);
+      emit(ctx, "dev_kit_warning", `AI skills install failed; clone will continue
+${detail}`, {
+        error: detail
+      });
+    }
     return;
   }
   try {
-    const result = await installAiDevKit({ targetDir });
-    emit(ctx, "dev_kit", "AI dev kit prepared", result);
+    const result = await installAiDevKit({
+      targetDir,
+      onSkillInstallerStart: (event) => emitSkillInstallerStart(ctx, event)
+    });
+    emit(ctx, "dev_kit", formatDevKitInstallMessage("AI dev kit prepared", result), result);
+    emitDevKitSkillInstallerFailure(
+      ctx,
+      result.skillInstaller,
+      "AI skills install failed; clone will continue"
+    );
   } catch (error2) {
-    emit(ctx, "dev_kit_warning", "AI dev kit preparation failed; clone will continue", {
-      error: error2 instanceof Error ? error2.message : String(error2)
+    const detail = error2 instanceof Error ? error2.message : String(error2);
+    emit(ctx, "dev_kit_warning", `AI dev kit preparation failed; clone will continue
+${detail}`, {
+      error: detail
     });
   }
 }
+function formatDevKitInstallMessage(message, result) {
+  if (!result.skillInstaller) {
+    return message;
+  }
+  return `${message}
+AI skills install result: ${result.skillInstaller.summary}`;
+}
+function emitSkillInstallerStart(ctx, event) {
+  emit(ctx, "dev_kit_skill_install_start", `AI skills install started: ${event.script}`, event);
+}
+function emitDevKitSkillInstallerFailure(ctx, result, message) {
+  if (!result || result.ok || result.status !== "failed") {
+    return;
+  }
+  const detail = result.error || "unknown installer failure";
+  emit(ctx, "dev_kit_warning", `${message}
+${detail}`, {
+    error: detail
+  });
+}
+function appendPatRecoveryUrl(error2, parsed) {
+  const message = error2 instanceof Error ? error2.message : String(error2);
+  if (!isPatValidationFailure(message) || message.includes("/pat-tokens")) {
+    return error2 instanceof Error ? error2 : new Error(message);
+  }
+  const patPage = getMakerPatTokensUrl(makerEnvOption(parsed));
+  return new Error(
+    [
+      message,
+      "",
+      `PAT 页面：${patPage}`,
+      "请在该页面创建新的 Maker PAT，然后运行 `taptap-maker pat set` 并粘贴 PAT。"
+    ].join("\n")
+  );
+}
+function isPatValidationFailure(message) {
+  return /\b(?:PAT_INVALID|HTTP\s*40[13]|40[13]|unauthori[sz]ed|invalid\s+PAT|PAT\s+invalid|expired)\b/i.test(
+    message
+  ) || /(?:过期|失效)/.test(message);
+}
 function installMcpConfigs(options) {
   return options.ides.map((ide) => installMcpConfig(ide, options));
 }
@@ -31931,7 +33380,7 @@ function installMcpConfig(ide, options) {
 }
 function installMcpConfigUnsafe(ide, options) {
   if (ide === "codex") {
-    const configPath = path8.join(os4.homedir(), ".codex", "config.toml");
+    const configPath = path9.join(os4.homedir(), ".codex", "config.toml");
     mergeCodexMcpConfig(configPath, options);
     return {
       ide,
@@ -31941,7 +33390,7 @@ function installMcpConfigUnsafe(ide, options) {
     };
   }
   if (ide === "cursor") {
-    const configPath = path8.join(os4.homedir(), ".cursor", "mcp.json");
+    const configPath = path9.join(os4.homedir(), ".cursor", "mcp.json");
     mergeJsonMcpConfig(configPath, options);
     return {
       ide,
@@ -31955,7 +33404,7 @@ function installMcpConfigUnsafe(ide, options) {
     if (claudeResult.ok) {
       return { ide, ok: true, message: "✓ Claude Code MCP config updated with claude mcp add" };
     }
-    const configPath = path8.join(os4.homedir(), ".claude.json");
+    const configPath = path9.join(os4.homedir(), ".claude.json");
     mergeJsonMcpConfig(configPath, options);
     return {
       ide,
@@ -31972,13 +33421,13 @@ function mergeJsonMcpConfig(configPath, options) {
   const mcpServers = asObject(existing.mcpServers);
   mcpServers[options.mcpName] = createJsonMcpServerConfig(options);
   existing.mcpServers = mcpServers;
-  fs7.mkdirSync(path8.dirname(configPath), { recursive: true });
-  fs7.writeFileSync(configPath, `${JSON.stringify(existing, null, 2)}
+  fs8.mkdirSync(path9.dirname(configPath), { recursive: true });
+  fs8.writeFileSync(configPath, `${JSON.stringify(existing, null, 2)}
 `, "utf8");
 }
 function mergeCodexMcpConfig(configPath, options) {
   const backupPath = backupIfExists(configPath);
-  const existing = fs7.existsSync(configPath) ? fs7.readFileSync(configPath, "utf8") : "";
+  const existing = fs8.existsSync(configPath) ? fs8.readFileSync(configPath, "utf8") : "";
   const sectionPattern = createCodexMcpSectionPattern(options.mcpName);
   const withoutOld = existing.replace(sectionPattern, "").trimEnd();
   const command = getNpxCommand();
@@ -31991,9 +33440,9 @@ function mergeCodexMcpConfig(configPath, options) {
     `TAPTAP_MCP_ENV = "${options.env}"`,
     ""
   ].join("\n");
-  fs7.mkdirSync(path8.dirname(configPath), { recursive: true });
-  fs7.writeFileSync(configPath, [withoutOld, section].filter(Boolean).join("\n\n"), "utf8");
-  const updated = fs7.readFileSync(configPath, "utf8");
+  fs8.mkdirSync(path9.dirname(configPath), { recursive: true });
+  fs8.writeFileSync(configPath, [withoutOld, section].filter(Boolean).join("\n\n"), "utf8");
+  const updated = fs8.readFileSync(configPath, "utf8");
   const duplicates = findCodexMcpTableDuplicates(updated, options.mcpName);
   if (duplicates.length > 0) {
     restoreBackup(configPath, backupPath);
@@ -32091,10 +33540,10 @@ function getNpxCommand() {
   return process.platform === "win32" ? "npx.cmd" : "npx";
 }
 function readJsonObject(filePath) {
-  if (!fs7.existsSync(filePath)) {
+  if (!fs8.existsSync(filePath)) {
     return {};
   }
-  return JSON.parse(fs7.readFileSync(filePath, "utf8"));
+  return JSON.parse(fs8.readFileSync(filePath, "utf8"));
 }
 function asObject(value) {
   if (value && typeof value === "object" && !Array.isArray(value)) {
@@ -32103,26 +33552,26 @@ function asObject(value) {
   return {};
 }
 function backupIfExists(filePath) {
-  if (!fs7.existsSync(filePath)) {
+  if (!fs8.existsSync(filePath)) {
     return void 0;
   }
   const stamp = (/* @__PURE__ */ new Date()).toISOString().replace(/[-:]/g, "").replace(/\..+$/, "");
   const backupPath = `${filePath}.bak.${stamp}`;
-  fs7.copyFileSync(filePath, backupPath);
+  fs8.copyFileSync(filePath, backupPath);
   return backupPath;
 }
 function restoreBackup(filePath, backupPath) {
   if (backupPath) {
-    fs7.copyFileSync(backupPath, filePath);
+    fs8.copyFileSync(backupPath, filePath);
     return;
   }
-  fs7.rmSync(filePath, { force: true });
+  fs8.rmSync(filePath, { force: true });
 }
 function saveInitState(targetDir, state) {
-  fs7.mkdirSync(getMakerHome(), { recursive: true });
-  const key = crypto.createHash("sha256").update(path8.resolve(targetDir)).digest("hex").slice(0, 16);
-  fs7.writeFileSync(
-    path8.join(getMakerHome(), `init-state-${key}.json`),
+  fs8.mkdirSync(getMakerHome(), { recursive: true });
+  const key = crypto.createHash("sha256").update(path9.resolve(targetDir)).digest("hex").slice(0, 16);
+  fs8.writeFileSync(
+    path9.join(getMakerHome(), `init-state-${key}.json`),
     `${JSON.stringify({ ...state, updated_at: (/* @__PURE__ */ new Date()).toISOString() }, null, 2)}
 `,
     "utf8"
@@ -32223,7 +33672,7 @@ function formatUnknownCommand(command) {
   return `${primary} ${isKnownSubcommand(primary, secondary) ? secondary : "<redacted>"}`;
 }
 function isKnownSubcommand(command, subcommand) {
-  return command === "pat" && subcommand === "set" || command === "mcp" && (subcommand === "install" || subcommand === "verify") || command === "dev-kit" && subcommand === "update";
+  return command === "pat" && subcommand === "set" || command === "mcp" && (subcommand === "install" || subcommand === "verify") || command === "dev-kit" && subcommand === "update" || command === "logs" && subcommand === "watch";
 }
 function stringOption(parsed, key) {
   const value = parsed.options[key];
@@ -32232,6 +33681,26 @@ function stringOption(parsed, key) {
 function booleanOption(parsed, key) {
   return parsed.options[key] === true || parsed.options[key] === "true";
 }
+function numberOption(parsed, key) {
+  const value = parsed.options[key];
+  if (value === void 0 || value === true || value === false) {
+    return void 0;
+  }
+  const number3 = Number(value);
+  if (!Number.isFinite(number3)) {
+    throw new Error(`Invalid --${key.replace(/_/g, "-")} value: ${value}`);
+  }
+  return number3;
+}
+function parseDurationMs(value) {
+  const match = /^(\d+(?:\.\d+)?)(ms|s)?$/.exec(value.trim());
+  if (!match) {
+    throw new Error("Invalid --interval value. Use seconds, or suffix with s/ms.");
+  }
+  const amount = Number(match[1]);
+  const unit = match[2] || "s";
+  return unit === "s" ? amount * 1e3 : amount;
+}
 function makerEnvOption(parsed) {
   const env = stringOption(parsed, "env");
   if (env === "rnd" || env === "production") {
@@ -32288,6 +33757,7 @@ function printHelp() {
       "  taptap-maker mcp verify [--package @taptap/instant-games-open-mcp]",
       "                           [--mode npx|self] [--json]",
       "  taptap-maker dev-kit update [--target-dir DIR] [--json]",
+      "  taptap-maker logs watch [--target-dir DIR] [--interval 5s] [--reset] [--json]",
       "",
       "MCP verify defaults to the npx command written into AI client config.",
       "Advanced: init and mcp install accept --package only when testing a different npm package.",
@@ -32306,14 +33776,14 @@ function formatCliError(error2) {
 }
 
 // src/maker/crashLog.ts
-import fs8 from "node:fs";
-import path9 from "node:path";
+import fs9 from "node:fs";
+import path10 from "node:path";
 var DEFAULT_MAX_BYTES = 1024 * 1024;
 var DEFAULT_MAX_ENTRY_BYTES = 16 * 1024;
 function appendMakerCrashLog(source, error2, options = {}) {
   const makerHome = getMakerHome();
-  fs8.mkdirSync(makerHome, { recursive: true });
-  const logPath = path9.join(makerHome, "mcp-crash.log");
+  fs9.mkdirSync(makerHome, { recursive: true });
+  const logPath = path10.join(makerHome, "mcp-crash.log");
   const maxBytes = positiveInteger(options.maxBytes) || resolveEnvBytes("TAPTAP_MAKER_CRASH_LOG_MAX_BYTES", DEFAULT_MAX_BYTES);
   const maxEntryBytes = positiveInteger(options.maxEntryBytes) || resolveEnvBytes("TAPTAP_MAKER_CRASH_LOG_MAX_ENTRY_BYTES", DEFAULT_MAX_ENTRY_BYTES);
   const message = error2 instanceof Error ? error2.stack || error2.message : String(error2);
@@ -32323,31 +33793,31 @@ function appendMakerCrashLog(source, error2, options = {}) {
   );
   const entryBytes = Buffer.byteLength(entry, "utf8");
   rotateIfNeeded(logPath, maxBytes, entryBytes);
-  fs8.appendFileSync(logPath, entry, "utf8");
+  fs9.appendFileSync(logPath, entry, "utf8");
 }
 function rotateIfNeeded(logPath, maxBytes, incomingBytes) {
-  if (!fs8.existsSync(logPath)) {
+  if (!fs9.existsSync(logPath)) {
     return;
   }
-  const currentBytes = fs8.statSync(logPath).size;
+  const currentBytes = fs9.statSync(logPath).size;
   if (currentBytes + incomingBytes <= maxBytes) {
     return;
   }
   const rotatedPath = `${logPath}.1`;
   writeFileTail(logPath, rotatedPath, maxBytes);
-  fs8.writeFileSync(logPath, "", "utf8");
+  fs9.writeFileSync(logPath, "", "utf8");
 }
 function writeFileTail(sourcePath, targetPath, maxBytes) {
-  const size = fs8.statSync(sourcePath).size;
+  const size = fs9.statSync(sourcePath).size;
   const bytesToRead = Math.min(size, maxBytes);
   const start = Math.max(0, size - bytesToRead);
-  const fd = fs8.openSync(sourcePath, "r");
+  const fd = fs9.openSync(sourcePath, "r");
   try {
     const buffer = Buffer.alloc(bytesToRead);
-    fs8.readSync(fd, buffer, 0, bytesToRead, start);
-    fs8.writeFileSync(targetPath, buffer);
+    fs9.readSync(fd, buffer, 0, bytesToRead, start);
+    fs9.writeFileSync(targetPath, buffer);
   } finally {
-    fs8.closeSync(fd);
+    fs9.closeSync(fd);
   }
 }
 function truncateUtf8(value, maxBytes) {
@@ -32400,6 +33870,7 @@ function printHelp2() {
       "  taptap-maker mcp verify [--package @taptap/instant-games-open-mcp]",
       "                           [--mode npx|self] [--json]",
       "  taptap-maker dev-kit update [--target-dir DIR] [--json]",
+      "  taptap-maker logs watch [--target-dir DIR] [--interval 5s] [--reset] [--json]",
       "",
       "MCP verify defaults to the npx command written into AI client config.",
       "Advanced: init and mcp install accept --package only when testing a different npm package.",