ai-project-manage-cli 7.1.10 → 7.1.12

package/dist/index.js

@@ -505,6 +505,10 @@ var requestConfig = {
       method: "POST",
       path: "/cli/webide/draft-pull-requests"
     }),
+    webideMergePullRequests: defineEndpoint({
+      method: "POST",
+      path: "/cli/webide/pull-requests/merge"
+    }),
     getRepositoryProjectDocumentManifest: defineEndpoint({
       method: "GET",
       path: "/cli/repository-project-documents/manifest"
@@ -648,6 +652,22 @@ async function hasUpstream(cwd) {
     return false;
   }
 }
+async function pushCurrentBranch(cwd) {
+  if (!await isGitRepo(cwd)) {
+    return false;
+  }
+  const originUrl = await tryReadGitOriginUrl(cwd);
+  if (!originUrl) {
+    console.log("[apm] \u672A\u914D\u7F6E remote.origin\uFF0C\u8DF3\u8FC7 push");
+    return false;
+  }
+  if (await hasUpstream(cwd)) {
+    await execGit(cwd, ["push"]);
+  } else {
+    await execGit(cwd, ["push", "-u", "origin", "HEAD"]);
+  }
+  return true;
+}
 var GITIGNORE_COMMIT_MESSAGE = "chore(apm): ignore .apm directory";
 async function commitAndPushGitignore(workdir) {
   if (!await isGitRepo(workdir)) {
@@ -657,17 +677,12 @@ async function commitAndPushGitignore(workdir) {
   await execGit(workdir, ["add", "--", ".gitignore"]);
   await execGit(workdir, ["commit", "-m", GITIGNORE_COMMIT_MESSAGE]);
   console.log(`[apm] \u5DF2\u63D0\u4EA4 .gitignore: ${GITIGNORE_COMMIT_MESSAGE}`);
-  const originUrl = await tryReadGitOriginUrl(workdir);
-  if (!originUrl) {
-    console.log("[apm] \u672A\u914D\u7F6E remote.origin\uFF0C\u8BF7\u7A0D\u540E\u624B\u52A8 push .gitignore");
-    return;
-  }
-  if (await hasUpstream(workdir)) {
-    await execGit(workdir, ["push"]);
+  const pushed = await pushCurrentBranch(workdir);
+  if (pushed) {
+    console.log("[apm] \u5DF2\u63A8\u9001 .gitignore");
   } else {
-    await execGit(workdir, ["push", "-u", "origin", "HEAD"]);
+    console.log("[apm] \u672A\u914D\u7F6E remote.origin\uFF0C\u8BF7\u7A0D\u540E\u624B\u52A8 push .gitignore");
   }
-  console.log("[apm] \u5DF2\u63A8\u9001 .gitignore");
 }
 
 // src/baseline-resolve.ts
@@ -6700,7 +6715,7 @@ async function syncCursorMessageLog(cfg, ctx, events) {
 function createAppendMessageCustomTools(cfg, messageId, appendContent) {
   const doAppend = appendContent ?? ((content) => appendMessageContent(cfg, messageId, content));
   return {
-    append_message: {
+    AppendMessage: {
       description: "\u5411\u5F53\u524D\u4F1A\u8BDD\u6D88\u606F\u8FFD\u52A0\u56DE\u590D\u5185\u5BB9\u3002\u53EF\u591A\u6B21\u8C03\u7528\u8865\u5145\u8FDB\u5C55\uFF1B\u88AB @ \u65F6\u6536\u5230\u540E\u5E94\u5148\u7B80\u77ED\u786E\u8BA4\u518D\u6267\u884C\u4EFB\u52A1\u3002",
       inputSchema: {
         type: "object",
@@ -6722,7 +6737,7 @@ function createAppendMessageCustomTools(cfg, messageId, appendContent) {
         }
         try {
           await doAppend(content);
-          console.log(`[apm] append_message \u5DF2\u8FFD\u52A0: messageId=${messageId}`);
+          console.log(`[apm] AppendMessage \u5DF2\u8FFD\u52A0: messageId=${messageId}`);
           return "\u5DF2\u8FFD\u52A0\u6D88\u606F\u5185\u5BB9";
         } catch (err) {
           const detail = err instanceof Error ? err.message : String(err);
@@ -6790,6 +6805,35 @@ ${payload}`;
   };
 }
 
+// src/commands/connect/webide-merge-tools.ts
+function createMergeWebIdePullRequestsTool(options) {
+  const { cfg, taskId } = options;
+  return {
+    description: "Merge all open pull requests for this WebIDE task after conflicts are resolved locally and pushed. Call once with no arguments. Do NOT call if conflicts contradict the task requirements \u2014 report the conflict and fail instead.",
+    inputSchema: {
+      type: "object",
+      properties: {
+        confirmedConflictFree: {
+          type: "boolean",
+          description: "Must be true: you have checked each repo, resolved mergeable conflicts consistently with requirements, and pushed. If conflicts contradict requirements, do not call this tool."
+        }
+      },
+      required: ["confirmedConflictFree"]
+    },
+    execute: async (args) => {
+      if (args.confirmedConflictFree !== true) {
+        throw new Error(
+          "MergeWebIdePullRequests \u8981\u6C42 confirmedConflictFree=true\u3002\u82E5\u5B58\u5728\u4E0E\u9700\u6C42\u76F8\u6096\u7684\u51B2\u7A81\uFF0C\u8BF7\u52FF\u8C03\u7528\u672C\u5DE5\u5177\uFF0C\u7528 AppendMessage \u8BF4\u660E\u5E76\u5931\u8D25\u7ED3\u675F\u3002"
+        );
+      }
+      const api = createApmApiClient(cfg);
+      console.log(`[apm] MergeWebIdePullRequests taskId=${taskId}`);
+      const result = await api.cli.webideMergePullRequests({ taskId });
+      return JSON.stringify(result, null, 2);
+    }
+  };
+}
+
 // src/commands/connect/webide-plan-tools.ts
 function asString(value) {
   return typeof value === "string" ? value.trim() : "";
@@ -6977,6 +7021,10 @@ function createCursorCustomTools(cfg, messageId, options) {
       cfg,
       taskId: options.taskId
     });
+    tools.MergeWebIdePullRequests = createMergeWebIdePullRequestsTool({
+      cfg,
+      taskId: options.taskId
+    });
   }
   return tools;
 }

package/dist/webide-message-worker.js

@@ -136,6 +136,10 @@ var requestConfig = {
       method: "POST",
       path: "/cli/webide/draft-pull-requests"
     }),
+    webideMergePullRequests: defineEndpoint({
+      method: "POST",
+      path: "/cli/webide/pull-requests/merge"
+    }),
     getRepositoryProjectDocumentManifest: defineEndpoint({
       method: "GET",
       path: "/cli/repository-project-documents/manifest"
@@ -381,6 +385,22 @@ async function hasUpstream(cwd) {
     return false;
   }
 }
+async function pushCurrentBranch(cwd) {
+  if (!await isGitRepo(cwd)) {
+    return false;
+  }
+  const originUrl = await tryReadGitOriginUrl(cwd);
+  if (!originUrl) {
+    console.log("[apm] \u672A\u914D\u7F6E remote.origin\uFF0C\u8DF3\u8FC7 push");
+    return false;
+  }
+  if (await hasUpstream(cwd)) {
+    await execGit(cwd, ["push"]);
+  } else {
+    await execGit(cwd, ["push", "-u", "origin", "HEAD"]);
+  }
+  return true;
+}
 var GITIGNORE_COMMIT_MESSAGE = "chore(apm): ignore .apm directory";
 async function commitAndPushGitignore(workdir) {
   if (!await isGitRepo(workdir)) {
@@ -390,17 +410,12 @@ async function commitAndPushGitignore(workdir) {
   await execGit(workdir, ["add", "--", ".gitignore"]);
   await execGit(workdir, ["commit", "-m", GITIGNORE_COMMIT_MESSAGE]);
   console.log(`[apm] \u5DF2\u63D0\u4EA4 .gitignore: ${GITIGNORE_COMMIT_MESSAGE}`);
-  const originUrl = await tryReadGitOriginUrl(workdir);
-  if (!originUrl) {
-    console.log("[apm] \u672A\u914D\u7F6E remote.origin\uFF0C\u8BF7\u7A0D\u540E\u624B\u52A8 push .gitignore");
-    return;
-  }
-  if (await hasUpstream(workdir)) {
-    await execGit(workdir, ["push"]);
+  const pushed = await pushCurrentBranch(workdir);
+  if (pushed) {
+    console.log("[apm] \u5DF2\u63A8\u9001 .gitignore");
   } else {
-    await execGit(workdir, ["push", "-u", "origin", "HEAD"]);
+    console.log("[apm] \u672A\u914D\u7F6E remote.origin\uFF0C\u8BF7\u7A0D\u540E\u624B\u52A8 push .gitignore");
   }
-  console.log("[apm] \u5DF2\u63A8\u9001 .gitignore");
 }
 
 // src/baseline-resolve.ts
@@ -839,6 +854,36 @@ async function commitWorkingTreeIfDirty(cwd, message) {
   console.log(`[apm] \u5DF2\u63D0\u4EA4\u5DE5\u4F5C\u533A\u53D8\u66F4: ${commitMessage}`);
   return true;
 }
+async function commitWorkspaceReposIfDirty(workdir, message) {
+  const workdirPath = resolveWorkdirPath(workdir);
+  const manifest = loadWorkspaceReposCache(workdirPath);
+  const repoRoots = resolveWorkspaceRepoAbsolutePaths(manifest);
+  let committed = 0;
+  for (const gitRoot of repoRoots) {
+    const label = formatRepoLabel(workdirPath, gitRoot);
+    const did = await commitWorkingTreeIfDirty(gitRoot, message);
+    if (did) {
+      committed += 1;
+      console.log(`[apm] WebIDE \u515C\u5E95\u63D0\u4EA4 @ ${label}`);
+    }
+  }
+  return committed;
+}
+async function pushWorkspaceRepos(workdir) {
+  const workdirPath = resolveWorkdirPath(workdir);
+  const manifest = loadWorkspaceReposCache(workdirPath);
+  const repoRoots = resolveWorkspaceRepoAbsolutePaths(manifest);
+  let pushed = 0;
+  for (const gitRoot of repoRoots) {
+    const label = formatRepoLabel(workdirPath, gitRoot);
+    const did = await pushCurrentBranch(gitRoot);
+    if (did) {
+      pushed += 1;
+      console.log(`[apm] WebIDE \u5DF2 push @ ${label}`);
+    }
+  }
+  return pushed;
+}
 function branchNameForTask(taskId) {
   const id = taskId.trim();
   if (!id) {
@@ -1420,7 +1465,7 @@ async function appendMessageContent(cfg, messageId, content) {
 function createAppendMessageCustomTools(cfg, messageId, appendContent2) {
   const doAppend = appendContent2 ?? ((content) => appendMessageContent(cfg, messageId, content));
   return {
-    append_message: {
+    AppendMessage: {
       description: "\u5411\u5F53\u524D\u4F1A\u8BDD\u6D88\u606F\u8FFD\u52A0\u56DE\u590D\u5185\u5BB9\u3002\u53EF\u591A\u6B21\u8C03\u7528\u8865\u5145\u8FDB\u5C55\uFF1B\u88AB @ \u65F6\u6536\u5230\u540E\u5E94\u5148\u7B80\u77ED\u786E\u8BA4\u518D\u6267\u884C\u4EFB\u52A1\u3002",
       inputSchema: {
         type: "object",
@@ -1442,7 +1487,7 @@ function createAppendMessageCustomTools(cfg, messageId, appendContent2) {
         }
         try {
           await doAppend(content);
-          console.log(`[apm] append_message \u5DF2\u8FFD\u52A0: messageId=${messageId}`);
+          console.log(`[apm] AppendMessage \u5DF2\u8FFD\u52A0: messageId=${messageId}`);
           return "\u5DF2\u8FFD\u52A0\u6D88\u606F\u5185\u5BB9";
         } catch (err) {
           const detail = err instanceof Error ? err.message : String(err);
@@ -1510,6 +1555,35 @@ ${payload}`;
   };
 }
 
+// src/commands/connect/webide-merge-tools.ts
+function createMergeWebIdePullRequestsTool(options) {
+  const { cfg, taskId } = options;
+  return {
+    description: "Merge all open pull requests for this WebIDE task after conflicts are resolved locally and pushed. Call once with no arguments. Do NOT call if conflicts contradict the task requirements \u2014 report the conflict and fail instead.",
+    inputSchema: {
+      type: "object",
+      properties: {
+        confirmedConflictFree: {
+          type: "boolean",
+          description: "Must be true: you have checked each repo, resolved mergeable conflicts consistently with requirements, and pushed. If conflicts contradict requirements, do not call this tool."
+        }
+      },
+      required: ["confirmedConflictFree"]
+    },
+    execute: async (args) => {
+      if (args.confirmedConflictFree !== true) {
+        throw new Error(
+          "MergeWebIdePullRequests \u8981\u6C42 confirmedConflictFree=true\u3002\u82E5\u5B58\u5728\u4E0E\u9700\u6C42\u76F8\u6096\u7684\u51B2\u7A81\uFF0C\u8BF7\u52FF\u8C03\u7528\u672C\u5DE5\u5177\uFF0C\u7528 AppendMessage \u8BF4\u660E\u5E76\u5931\u8D25\u7ED3\u675F\u3002"
+        );
+      }
+      const api = createApmApiClient(cfg);
+      console.log(`[apm] MergeWebIdePullRequests taskId=${taskId}`);
+      const result = await api.cli.webideMergePullRequests({ taskId });
+      return JSON.stringify(result, null, 2);
+    }
+  };
+}
+
 // src/commands/connect/webide-plan-tools.ts
 function asString(value) {
   return typeof value === "string" ? value.trim() : "";
@@ -1697,6 +1771,10 @@ function createCursorCustomTools(cfg, messageId, options) {
       cfg,
       taskId: options.taskId
     });
+    tools.MergeWebIdePullRequests = createMergeWebIdePullRequestsTool({
+      cfg,
+      taskId: options.taskId
+    });
   }
   return tools;
 }
@@ -2386,13 +2464,13 @@ function normalizeLocalDocumentPath(path) {
   return segments.join("/");
 }
 function readLocalManifest(apmRoot) {
-  const manifestPath2 = join6(projectDocumentsDir(apmRoot), MANIFEST_FILE);
-  if (!existsSync5(manifestPath2)) {
+  const manifestPath3 = join6(projectDocumentsDir(apmRoot), MANIFEST_FILE);
+  if (!existsSync5(manifestPath3)) {
     return null;
   }
   try {
     return JSON.parse(
-      readFileSync6(manifestPath2, "utf8")
+      readFileSync6(manifestPath3, "utf8")
     );
   } catch {
     return null;
@@ -2544,12 +2622,17 @@ function markBranchDone(sessionId, workdir) {
   lastBranchKey = sessionWorkdirKey(sessionId, workdir);
 }
 
-// src/commands/connect/webide-draft-prs.ts
-var DEVELOP_ACTIONS = /* @__PURE__ */ new Set(["start-develop", "skip-plan"]);
-function shouldEnsureWebIdeDraftPullRequests(action) {
-  return DEVELOP_ACTIONS.has(action);
-}
-async function ensureWebIdeDraftPullRequests(cfg, taskId, workdir) {
+// src/commands/connect/webide-pull-requests.ts
+var TEST_START_ACTIONS = /* @__PURE__ */ new Set([
+  "generate-cases",
+  "run-auto-test",
+  "skip-test",
+  "enter-manual-test"
+]);
+function shouldEnsureWebIdePullRequests(action) {
+  return TEST_START_ACTIONS.has(action);
+}
+async function ensureWebIdePullRequests(cfg, taskId, workdir) {
   const api = createApmApiClient(cfg);
   let repoRoots;
   try {
@@ -2557,29 +2640,27 @@ async function ensureWebIdeDraftPullRequests(cfg, taskId, workdir) {
     repoRoots = resolveWorkspaceRepoAbsolutePaths(manifest);
   } catch (err) {
     console.warn(
-      "[apm] WebIDE \u8349\u7A3F PR\uFF1A\u8BFB\u53D6\u4ED3\u5E93\u6E05\u5355\u5931\u8D25:",
+      "[apm] WebIDE PR\uFF1A\u8BFB\u53D6\u4ED3\u5E93\u6E05\u5355\u5931\u8D25:",
       err instanceof Error ? err.message : err
     );
     return;
   }
   console.log(
-    `[apm] WebIDE \u8349\u7A3F PR\uFF1A\u51C6\u5907\u4E3A ${repoRoots.length} \u4E2A\u4ED3\u5E93\u521B\u5EFA feat/task-${taskId}`
+    `[apm] WebIDE PR\uFF1A\u51C6\u5907\u4E3A ${repoRoots.length} \u4E2A\u4ED3\u5E93\u521B\u5EFA feat/task-${taskId}`
   );
   for (const gitRoot of repoRoots) {
     const label = formatRepoLabel(workdir, gitRoot);
     try {
       const originUrl = await tryReadGitOriginUrl(gitRoot);
       if (!originUrl) {
-        console.warn(
-          `[apm] WebIDE \u8349\u7A3F PR\uFF1A\u8DF3\u8FC7 ${label}\uFF08\u65E0 remote.origin.url\uFF09`
-        );
+        console.warn(`[apm] WebIDE PR\uFF1A\u8DF3\u8FC7 ${label}\uFF08\u65E0 remote.origin.url\uFF09`);
         continue;
       }
       const matched = await api.cli.matchRepository({ url: originUrl });
       const repositoryId = matched.repositoryId?.trim();
       if (!repositoryId) {
         console.warn(
-          `[apm] WebIDE \u8349\u7A3F PR\uFF1A\u8DF3\u8FC7 ${label}\uFF08\u5E73\u53F0\u672A\u767B\u8BB0\u4ED3\u5E93 ${originUrl}\uFF09`
+          `[apm] WebIDE PR\uFF1A\u8DF3\u8FC7 ${label}\uFF08\u5E73\u53F0\u672A\u767B\u8BB0\u4ED3\u5E93 ${originUrl}\uFF09`
         );
         continue;
       }
@@ -2588,18 +2669,297 @@ async function ensureWebIdeDraftPullRequests(cfg, taskId, workdir) {
         repositoryId
       });
       console.log(
-        `[apm] WebIDE \u8349\u7A3F PR\uFF1A${label} \u2192 #${pr.number} ${pr.state} ${pr.url || ""}`
+        `[apm] WebIDE PR\uFF1A${label} \u2192 #${pr.number} ${pr.state} ${pr.url || ""}`
       );
     } catch (err) {
       console.warn(
-        `[apm] WebIDE \u8349\u7A3F PR\uFF1A${label} \u5931\u8D25:`,
+        `[apm] WebIDE PR\uFF1A${label} \u5931\u8D25:`,
         err instanceof Error ? err.message : err
       );
     }
   }
 }
 
+// src/commands/connect/webide-baseline-sync.ts
+async function abortMergeOrRebase(cwd) {
+  try {
+    await execGit(cwd, ["merge", "--abort"], true);
+  } catch {
+  }
+  try {
+    await execGit(cwd, ["rebase", "--abort"], true);
+  } catch {
+  }
+}
+async function syncWebIdeBaselineOrFail(workdir) {
+  let repoRoots;
+  try {
+    const manifest = loadWorkspaceReposCache(workdir);
+    repoRoots = resolveWorkspaceRepoAbsolutePaths(manifest);
+  } catch (err) {
+    return {
+      ok: false,
+      error: `\u8BFB\u53D6\u5DE5\u4F5C\u533A\u4ED3\u5E93\u6E05\u5355\u5931\u8D25\uFF1A${err instanceof Error ? err.message : String(err)}`
+    };
+  }
+  const failures = [];
+  for (const repoRoot of repoRoots) {
+    const label = formatRepoLabel(workdir, repoRoot);
+    try {
+      const gitRoot = await resolveGitRepoRoot(repoRoot);
+      const baselineBranch = await resolveDefaultRemoteBranch(gitRoot);
+      await ensureRemoteBaselineBranch(gitRoot, baselineBranch);
+      const currentBranch = await getCurrentBranch(gitRoot);
+      console.log(
+        `[apm] webide accept sync ${label}: ${currentBranch} \u2190 origin/${baselineBranch}`
+      );
+      try {
+        await execGit(
+          gitRoot,
+          ["merge", `origin/${baselineBranch}`, "--no-edit"],
+          true
+        );
+      } catch (mergeErr) {
+        await abortMergeOrRebase(gitRoot);
+        const detail = mergeErr instanceof Error ? mergeErr.message : String(mergeErr);
+        failures.push(
+          `${label}\uFF1A\u5408\u5E76 origin/${baselineBranch} \u51B2\u7A81\uFF0C\u5DF2\u6267\u884C merge --abort \u64A4\u56DE\u672C\u6B21\u540C\u6B65\u3002${detail}`
+        );
+      }
+    } catch (err) {
+      failures.push(
+        `${label}\uFF1A${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+  }
+  if (failures.length > 0) {
+    return {
+      ok: false,
+      error: [
+        "\u62C9\u53D6\u6700\u65B0\u57FA\u7EBF\u5931\u8D25\uFF0C\u5DF2\u64A4\u56DE\u672C\u6B21\u540C\u6B65\u64CD\u4F5C\uFF0C\u8BF7\u4EBA\u5DE5\u5904\u7406\u51B2\u7A81\u540E\u91CD\u8BD5\u9A8C\u6536\u5408\u5E76\u3002",
+        ...failures.map((f) => `- ${f}`)
+      ].join("\n")
+    };
+  }
+  return { ok: true };
+}
+
+// src/version.ts
+import { readFileSync as readFileSync8 } from "fs";
+import { dirname as dirname5, join as join8 } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
+function readCliVersion() {
+  try {
+    const dir = dirname5(fileURLToPath2(import.meta.url));
+    const pkgPath = join8(dir, "..", "package.json");
+    const pkg = JSON.parse(readFileSync8(pkgPath, "utf8"));
+    return pkg.version ?? "0.0.0";
+  } catch {
+    return "0.0.0";
+  }
+}
+
+// src/commands/update-skills.ts
+import { existsSync as existsSync7, mkdirSync as mkdirSync8, statSync as statSync4 } from "fs";
+import { join as join10 } from "path";
+
+// src/skills-sync.ts
+import {
+  copyFileSync as copyFileSync2,
+  cpSync,
+  existsSync as existsSync6,
+  mkdirSync as mkdirSync7,
+  readdirSync as readdirSync4,
+  rmSync as rmSync2,
+  statSync as statSync3,
+  writeFileSync as writeFileSync9
+} from "fs";
+import { join as join9 } from "path";
+var AGENTS_TEMPLATE_PATH = join9(CLI_TEMPLATE_DIR, "AGENTS.md");
+var BASE_SKILLS_TEMPLATE_DIR = join9(CLI_TEMPLATE_DIR, "skills");
+var BASE_RULES_TEMPLATE_DIR = join9(CLI_TEMPLATE_DIR, "rules");
+function sanitizeSkillDirName(name) {
+  const trimmed = name.trim();
+  if (!trimmed) return "skill";
+  return trimmed.replace(/[/\\:*?"<>|]/g, "_");
+}
+function listBaseSkillDirNames() {
+  if (!existsSync6(BASE_SKILLS_TEMPLATE_DIR)) return [];
+  return readdirSync4(BASE_SKILLS_TEMPLATE_DIR).filter((name) => {
+    const path = join9(BASE_SKILLS_TEMPLATE_DIR, name);
+    return statSync3(path).isDirectory();
+  });
+}
+function syncAgentsGuide(apmDir) {
+  if (!existsSync6(AGENTS_TEMPLATE_PATH)) return false;
+  mkdirSync7(apmDir, { recursive: true });
+  copyFileSync2(AGENTS_TEMPLATE_PATH, join9(apmDir, "AGENTS.md"));
+  return true;
+}
+function listBaseRuleFileNames() {
+  if (!existsSync6(BASE_RULES_TEMPLATE_DIR)) return [];
+  return readdirSync4(BASE_RULES_TEMPLATE_DIR).filter((name) => {
+    const path = join9(BASE_RULES_TEMPLATE_DIR, name);
+    return statSync3(path).isFile();
+  });
+}
+function syncBaseRules(rulesDir) {
+  mkdirSync7(rulesDir, { recursive: true });
+  const names = listBaseRuleFileNames();
+  for (const name of names) {
+    const src = join9(BASE_RULES_TEMPLATE_DIR, name);
+    const dest = join9(rulesDir, name);
+    copyFileSync2(src, dest);
+  }
+  return names;
+}
+function syncBaseSkills(skillsDir) {
+  mkdirSync7(skillsDir, { recursive: true });
+  const names = listBaseSkillDirNames();
+  for (const name of names) {
+    const src = join9(BASE_SKILLS_TEMPLATE_DIR, name);
+    const dest = join9(skillsDir, name);
+    cpSync(src, dest, { recursive: true, force: true });
+  }
+  return names;
+}
+function syncSupplementarySkills(skillsDir, list) {
+  const baseNames = new Set(listBaseSkillDirNames());
+  const apiDirNames = /* @__PURE__ */ new Set();
+  const written = [];
+  const skipped = [];
+  for (const skill of list) {
+    const dirName = sanitizeSkillDirName(skill.name);
+    apiDirNames.add(dirName);
+    if (baseNames.has(dirName)) {
+      skipped.push(dirName);
+      continue;
+    }
+    const skillDir = join9(skillsDir, dirName);
+    mkdirSync7(skillDir, { recursive: true });
+    writeFileSync9(join9(skillDir, "SKILL.md"), skill.content ?? "", "utf8");
+    written.push(dirName);
+  }
+  const removed = [];
+  if (!existsSync6(skillsDir)) return { written, skipped, removed };
+  for (const entry of readdirSync4(skillsDir)) {
+    const full = join9(skillsDir, entry);
+    if (!statSync3(full).isDirectory()) continue;
+    if (baseNames.has(entry)) continue;
+    if (apiDirNames.has(entry)) continue;
+    rmSync2(full, { recursive: true, force: true });
+    removed.push(entry);
+  }
+  return { written, skipped, removed };
+}
+
+// src/commands/update-skills.ts
+async function syncWorkspaceSkills(cfg, workdir) {
+  const apmDir = workspaceApmDir(workdir);
+  const fsApmDir = toFsPath(apmDir);
+  if (!existsSync7(fsApmDir)) {
+    throw new Error("[apm] \u672A\u627E\u5230 .apm \u76EE\u5F55\uFF0C\u8BF7\u5148\u6267\u884C apm init");
+  }
+  const apmStat = statSync4(fsApmDir);
+  if (!apmStat.isDirectory()) {
+    throw new Error(`[apm] \u8DEF\u5F84\u5DF2\u5B58\u5728\u4F46\u4E0D\u662F\u76EE\u5F55: ${apmDir}`);
+  }
+  const api = createApmApiClient(cfg);
+  const { list } = await api.cli.listSkills({});
+  if (syncAgentsGuide(apmDir)) {
+    console.log("[apm] \u5DF2\u540C\u6B65 APM \u6307\u5357: .apm/AGENTS.md");
+  }
+  const rulesDir = join10(apmDir, "rules");
+  const ruleNames = syncBaseRules(rulesDir);
+  for (const name of ruleNames) {
+    console.log(`[apm] \u5DF2\u540C\u6B65\u57FA\u7840\u89C4\u5219: rules/${name}`);
+  }
+  const skillsDir = join10(apmDir, "skills");
+  mkdirSync8(toFsPath(skillsDir), { recursive: true });
+  const baseNames = syncBaseSkills(skillsDir);
+  for (const name of baseNames) {
+    console.log(`[apm] \u5DF2\u540C\u6B65\u57FA\u7840\u6280\u80FD: skills/${name}/`);
+  }
+  const { written, skipped, removed } = syncSupplementarySkills(
+    skillsDir,
+    list
+  );
+  for (const name of written) {
+    console.log(`[apm] \u5DF2\u5199\u5165\u8865\u5145\u6280\u80FD: skills/${name}/SKILL.md`);
+  }
+  for (const name of skipped) {
+    console.log(
+      `[apm] \u5DF2\u8DF3\u8FC7\u4E0E\u57FA\u7840\u6280\u80FD\u540C\u540D\u7684\u8865\u5145\u6280\u80FD: ${name}\uFF08\u4FDD\u7559\u6A21\u677F\u7248\u672C\uFF09`
+    );
+  }
+  for (const name of removed) {
+    console.log(`[apm] \u5DF2\u79FB\u9664\u5DF2\u4E0B\u7EBF\u7684\u8865\u5145\u6280\u80FD: skills/${name}/`);
+  }
+  console.log(
+    `[apm] \u540C\u6B65\u5B8C\u6210\uFF1A${ruleNames.length} \u4E2A\u57FA\u7840\u89C4\u5219\uFF0C${baseNames.length} \u4E2A\u57FA\u7840\u6280\u80FD\uFF0C${written.length} \u4E2A\u8865\u5145\u6280\u80FD`
+  );
+}
+
+// src/commands/connect/cli-version-sync.ts
+import { existsSync as existsSync8, readFileSync as readFileSync9, writeFileSync as writeFileSync10 } from "fs";
+import { join as join11 } from "path";
+var CLI_VERSION_FILE = ".cli-version.json";
+function manifestPath2(apmDir) {
+  return join11(apmDir, CLI_VERSION_FILE);
+}
+function loadManifest(apmDir) {
+  const path = toFsPath(manifestPath2(apmDir));
+  if (!existsSync8(path)) {
+    return null;
+  }
+  try {
+    const parsed = JSON.parse(
+      readFileSync9(path, "utf8")
+    );
+    if (parsed?.version === 1 && typeof parsed.cliVersion === "string" && parsed.cliVersion.trim()) {
+      return parsed;
+    }
+  } catch {
+  }
+  return null;
+}
+function saveManifest(apmDir, cliVersion) {
+  const manifest = { version: 1, cliVersion };
+  writeFileSync10(
+    toFsPath(manifestPath2(apmDir)),
+    `${JSON.stringify(manifest, null, 2)}
+`,
+    "utf8"
+  );
+}
+var syncedInSession = /* @__PURE__ */ new Map();
+function shouldSyncSkillsForCliVersion(workdir, currentVersion) {
+  const cached = syncedInSession.get(workdir);
+  if (cached === currentVersion) {
+    return false;
+  }
+  const stored = loadManifest(workspaceApmDir(workdir));
+  if (stored?.cliVersion === currentVersion) {
+    syncedInSession.set(workdir, currentVersion);
+    return false;
+  }
+  return true;
+}
+function markSkillsSyncedForCliVersion(workdir, cliVersion) {
+  saveManifest(workspaceApmDir(workdir), cliVersion);
+  syncedInSession.set(workdir, cliVersion);
+}
+
 // src/commands/connect/handle-webide-message.ts
+var WEBIDE_CODE_CHANGE_ACTIONS = /* @__PURE__ */ new Set([
+  "skip-plan",
+  "start-develop",
+  "fix-and-retest",
+  "report-defect"
+]);
+function shouldCommitAfterWebIdeMessage(action) {
+  return WEBIDE_CODE_CHANGE_ACTIONS.has(action);
+}
 async function updateStatus(cfg, messageId, status) {
   const api = createApmApiClient(cfg);
   await api.cli.webideUpdateMessageStatus({ id: messageId, status });
@@ -2627,6 +2987,15 @@ async function handleWebIdeInboundMessage(cfg, msg, signal) {
     if (!didInit) {
       assertApmGitignoredInRepo(workdir);
     }
+    const cliVersion = readCliVersion();
+    if (shouldSyncSkillsForCliVersion(workdir, cliVersion)) {
+      if (signal.aborted) throw new Error("\u4EFB\u52A1\u5DF2\u53D6\u6D88");
+      console.log(
+        `[apm] CLI \u7248\u672C ${cliVersion} \u4E0E\u5DE5\u4F5C\u533A\u8BB0\u5F55\u4E0D\u4E00\u81F4\uFF0C\u6267\u884C update-skills`
+      );
+      await syncWorkspaceSkills(cfg, workdir);
+      markSkillsSyncedForCliVersion(workdir, cliVersion);
+    }
     resolveWorkspaceRepos(workdir);
     if (shouldRunBranch(branchCacheKey, workdir)) {
       if (signal.aborted) throw new Error("\u4EFB\u52A1\u5DF2\u53D6\u6D88");
@@ -2640,9 +3009,30 @@ async function handleWebIdeInboundMessage(cfg, msg, signal) {
         `[apm] step=branch skipped taskId=${taskId} workdir=${workdir}`
       );
     }
-    if (shouldEnsureWebIdeDraftPullRequests(msg.action)) {
+    if (shouldEnsureWebIdePullRequests(msg.action)) {
       if (signal.aborted) throw new Error("\u4EFB\u52A1\u5DF2\u53D6\u6D88");
-      await ensureWebIdeDraftPullRequests(cfg, taskId, workdir);
+      const pushed = await pushWorkspaceRepos(workdir);
+      console.log(
+        `[apm] webide \u6D4B\u8BD5\u524D push action=${msg.action} repos=${pushed}`
+      );
+      if (signal.aborted) throw new Error("\u4EFB\u52A1\u5DF2\u53D6\u6D88");
+      await ensureWebIdePullRequests(cfg, taskId, workdir);
+    }
+    if (msg.action === "accept") {
+      if (signal.aborted) throw new Error("\u4EFB\u52A1\u5DF2\u53D6\u6D88");
+      const sync = await syncWebIdeBaselineOrFail(workdir);
+      if (!sync.ok) {
+        await setError(cfg, messageId, sync.error);
+        return;
+      }
+      try {
+        await pushWorkspaceRepos(workdir);
+      } catch (err) {
+        console.warn(
+          "[apm] webide accept \u540C\u6B65\u540E push \u5931\u8D25:",
+          err instanceof Error ? err.message : err
+        );
+      }
     }
     const savedAgentId = loadWebIdeAgentId(workdir, taskId);
     const logSyncRef = { current: null };
@@ -2727,6 +3117,21 @@ async function handleWebIdeInboundMessage(cfg, msg, signal) {
         );
       }
     }
+    if (shouldCommitAfterWebIdeMessage(msg.action)) {
+      if (signal.aborted) throw new Error("\u4EFB\u52A1\u5DF2\u53D6\u6D88");
+      const committed = await commitWorkspaceReposIfDirty(
+        workdir,
+        `chore(webide): sync after ${msg.action} (${taskId})`
+      );
+      console.log(
+        `[apm] webide \u515C\u5E95 commit action=${msg.action} repos=${committed}`
+      );
+      if (signal.aborted) throw new Error("\u4EFB\u52A1\u5DF2\u53D6\u6D88");
+      const pushed = await pushWorkspaceRepos(workdir);
+      console.log(
+        `[apm] webide \u81EA\u52A8 push action=${msg.action} repos=${pushed}`
+      );
+    }
     await logSyncRef.current?.markRun(outcome.runId, "finished");
     await updateStatus(cfg, messageId, "SUCCESS");
     console.log(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-project-manage-cli",
-  "version": "7.1.10",
+  "version": "7.1.12",
   "description": "命令行工具：后续用于调用平台后端 API 完成运维与自动化操作",
   "type": "module",
   "private": false,

package/template/AGENTS.md

@@ -8,8 +8,8 @@
 
 1. 读取 `.apm/sessions/<会话ID>/session.yaml`
 2. 读取 `.apm/rules/reply.md`
-3. **立即**用 `append_message` 工具回复（可先简短确认，再补充）
-4. 按需阅读 `docs/` 下的文档，有进展继续调用 `append_message`
+3. **立即**用 `AppendMessage` 工具回复（可先简短确认，再补充）
+4. 按需阅读 `docs/` 下的文档，有进展继续调用 `AppendMessage`
 
 #### 重任务（开发、写方案、评审）
 
@@ -19,7 +19,7 @@
 4. 任务有阶段性进展或者任务完成后必须回复消息（具体见规则 `reply.md`）
 5. 写工作日志（具体见规则 `write_doc.md`）
 
-**禁止**在未回复前先读完所有 docs。有进展就先调用 `append_message`。
+**禁止**在未回复前先读完所有 docs。有进展就先调用 `AppendMessage`。
 
 ### 目录指引
 
@@ -29,6 +29,9 @@
   - 规则: `.apm/rules/*`
     - reply.md：当需要回复消息时需要读取这个文档，记住回复规则
     - write_doc.md：当需要写文档时需要读取这个文档，记住写文档的规则
+    - webide_git_commit.md：WebIDE 开发/修码时读取，按规范分轮 commit，结束前 push
+    - webide_testcase.md：WebIDE 生成测试用例时读取，按规范编写并提交用例
+    - webide_merge.md：WebIDE 验收合并时读取；先解冲突再调 MergeWebIdePullRequests，需求相悖则拒绝合并
 
 - 仓库项目上下文（`.apm/project/`）:
 

package/template/rules/reply.md

@@ -7,9 +7,9 @@
 
 ## 执行回复的方法
 
-调用 `append_message` 工具，`content` 传入你要回复的消息内容。可多次调用补充进展。
+调用 `AppendMessage` 工具，`content` 传入你要回复的消息内容。可多次调用补充进展。
 
-示例: `append_message(content="收到，正在分析后端改动范围。")`
+示例: `AppendMessage(content="收到，正在分析后端改动范围。")`
 
 ## 写文档的方法
 

package/template/rules/webide_git_commit.md

@@ -0,0 +1,16 @@
+## WebIDE Git 提交规范
+
+适用场景：WebIDE 开发阶段（`skip-plan` / `start-develop`）及修码复测（`fix-and-retest`）中涉及代码改动时。
+
+### 分轮提交
+
+1. 按需求点分轮实现：每完成一个可独立验收的需求点，立即 `git add` 并 commit，不要把多轮改动攒成一次提交。
+2. commit message 用简短中文说明本轮改动（例：`feat: 实现登录表单校验`）。
+3. 多仓工作区时，只在实际改动过的仓库提交。
+
+### 结束前检查
+
+本轮全部工作结束前：
+
+1. 确认工作区干净（`git status` 无未提交变更）；若仍有残留改动，补一次 commit。
+2. 将当前分支推送到远程：已有 upstream 用 `git push`，否则 `git push -u origin HEAD`。多仓工作区时，只 push 实际有新 commit 的仓库。

package/template/rules/webide_merge.md

@@ -0,0 +1,39 @@
+## WebIDE 合并规范
+
+适用场景：WebIDE 验收通过（`accept`）后：同步最新基线 → 对照原始任务审核 → 合并本任务 PR。
+
+### 目标
+
+将本任务各仓库 `feat/task-<taskId>` 分支上的变更安全合并进基线分支（通常为 `main`）。
+
+### 步骤
+
+1. **先拉取最新基线并处理冲突，再审核，最后调用合并工具**
+
+   - 在各相关仓库拉取最新基线（`git fetch`），将基线 merge/rebase 进特性分支。
+   - 有冲突时：在本地解冲突后 commit 并 `git push`（必要时 `--force-with-lease` 仅用于已 rebase 的特性分支）。
+   - 解冲突原则：保留本任务需求与已确认计划所要求的行为；吸收基线中合理且不冲突的改动。
+   - **解冲突失败或无法安全取舍**：立即 `git merge --abort` / `git rebase --abort` 撤回本次同步，保持特性分支为同步前状态；**禁止**调用合并工具。
+
+2. **不可调和冲突 / 同步失败 → 拒绝合并**
+
+   - 若冲突双方改动在需求/业务逻辑上相悖，或本地同步已 abort：
+     - **禁止**调用 `MergeWebIdePullRequests`
+     - 用 `AppendMessage` 说明冲突文件、矛盾点、为何无法自动取舍，以及已执行的回退
+     - 以错误结束本轮（抛错或明确失败），等待人工介入（前端将展示失败信息）
+
+3. **对照原始任务审核代码**
+
+   - 在合并前快速核对：改动是否覆盖任务需求与已确认计划；是否引入明显与需求相悖的行为。
+   - 若审核不通过：同样禁止合并，AppendMessage 说明问题并以错误结束。
+
+4. **确认可安全合并后**
+   - 调用一次 `MergeWebIdePullRequests`（无参数），由平台合并本任务全部 OPEN PR
+   - 再用 `AppendMessage` 汇总合并结果（PR 编号、仓库）
+
+### 禁止
+
+- 未拉取最新基线 / 未检查冲突就直接调合并工具
+- 同步冲突未 abort 就继续合并
+- 为强行合并而删改与需求相悖的关键逻辑却不说明
+- 在仍有草稿 PR / 明显冲突未解决时假装成功

package/template/rules/webide_testcase.md

@@ -0,0 +1,47 @@
+## WebIDE 测试用例编写规范
+
+适用场景：WebIDE `generate-cases` 阶段，根据任务需求与本地代码改动生成自动化测试用例。
+
+### 产出方式
+
+1. 仅在当前工作区 cwd 内阅读/搜索代码，不要访问工作区外路径。
+2. 用中文经 `AppendMessage` 简要说明用例覆盖范围。
+3. **必须**调用 `UpsertWebIdeTestCases`，一次提交完整用例列表；工具会写入平台并进入待测阶段。
+4. 不要只在对话里列出用例而不调用工具。
+
+### 用例字段
+
+每条用例包含：
+
+| 字段          | 要求                                                             |
+| ------------- | ---------------------------------------------------------------- |
+| `name`        | 简短稳定的用例标识，可用中文或英文短句，避免空泛（如「测试 1」） |
+| `description` | 说明本用例验证什么（中文），一两句即可                           |
+| `steps`       | 有序、可执行的步骤数组；每步一句，写清操作与预期结果             |
+| `sortOrder`   | 可选，展示顺序（从 0 起）                                        |
+
+### 编写原则
+
+1. **对齐需求与改动**：覆盖本任务实现的核心路径；对照本地 diff / 关键代码，不要凭空编造未实现的功能。
+2. **主路径优先**：至少覆盖成功主流程；再按风险补边界、校验失败、权限拒绝等必要负面场景。
+3. **步骤可执行**：步骤应能被人或自动化按字面执行（打开哪页、点哪个按钮、输入什么、看到什么），禁止「验证功能正常」这类空话。
+4. **一条一焦点**：每条用例聚焦一个可验收点，不要把无关场景塞进同一步骤列表。
+5. **适量即可**：宁缺毋滥；通常数条到十余条足够，避免大量重复或琐碎用例。
+
+### 调用示例
+
+```text
+UpsertWebIdeTestCases({
+  cases: [
+    {
+      name: "登录成功进入首页",
+      description: "使用合法账号密码登录后应进入系统首页",
+      steps: [
+        "打开登录页",
+        "输入正确的用户名与密码，点击登录",
+        "应跳转到首页，并显示当前用户名"
+      ]
+    }
+  ]
+})
+```

package/template/skills/apm-dev/SKILL.md

@@ -77,4 +77,4 @@
 
 **注意：不做联调。** 前后端各自按 `API.md` 交付，接口对不上属于契约或实现问题，由 diff 评审与人工验收暴露后打回修复；禁止自行发起「联调」「接口实测」类的开放式动作。
 
-完成后用 `append_message` 回复：改动概述 + 白名单对账 + 构建结果，并 `@` 评审角色进行 diff 评审。
+完成后用 `AppendMessage` 回复：改动概述 + 白名单对账 + 构建结果，并 `@` 评审角色进行 diff 评审。

package/template/skills/apm-diff-review/SKILL.md

@@ -44,13 +44,13 @@ apm create-pr --session <会话ID> --title "<需求摘要>" --content "<计划
 
 ### 步骤 4：输出结论
 
-**通过**：用 `append_message` 回复评审结论，并 `@项目经理` 交人验收，回复中必须包含：
+**通过**：用 `AppendMessage` 回复评审结论，并 `@项目经理` 交人验收，回复中必须包含：
 
 1. 「diff 评审通过」+ 一句话改动概述；
 2. **PR 链接**（上一步 `apm create-pr` 输出；创建失败则注明原因）；
 3. 提示按 `CHECKLIST.md` 逐条验收（部署与回归验收由人工或平台完成）。
 
-**不通过**：用 `append_message` 输出问题清单（每条注明文件 + 问题 + 依据哪条计划/需求），`@` 对应工程师打回修改。**禁止自己动手改。**
+**不通过**：用 `AppendMessage` 输出问题清单（每条注明文件 + 问题 + 依据哪条计划/需求），`@` 对应工程师打回修改。**禁止自己动手改。**
 
 ---
 

package/template/skills/apm-update-plan/SKILL.md

@@ -14,7 +14,7 @@
    - 影响实现范围时 → 修订「实现步骤 / 改动文件白名单」；后端涉及接口则同步 `docs/API.md`。
 5. 重写 PLAN §1「需求理解」（融合 PM 确认口径）。
 6. **`apm sync-document`** 同步 PLAN（及 API 文档）。
-7. **`append_message`**：本端需求理解摘要 + @项目经理，请其回复「理解正确，可进入开发」。
+7. **`AppendMessage`**：本端需求理解摘要 + @项目经理，请其回复「理解正确，可进入开发」。
 8. **Read/Update** `TODO.md`：勾选相关待办。
 
 **禁止** `apm assumptions --mark-backfilled`（已废弃）。

package/template/skills/apm-write-checklist/SKILL.md

@@ -19,7 +19,7 @@
 
 逐条对照需求原文与计划：
 
-- **计划与需求矛盾、或需求关键点在计划中没有覆盖**：不要写清单，先用 `append_message` 指出问题并 `@` 对应工程师打回，等计划修订后再写。
+- **计划与需求矛盾、或需求关键点在计划中没有覆盖**：不要写清单，先用 `AppendMessage` 指出问题并 `@` 对应工程师打回，等计划修订后再写。
 - **开发门禁未通过**（`apm dev-gate` 返回 `readyForDev: false`）：**不要写清单**，先提醒 PM / 执行 `apm-update-plan`。
 - 计划覆盖完整：进入步骤 3。
 

package/template/skills/apm-write-plan/SKILL.md

@@ -18,7 +18,7 @@
 
 **Read** `.apm/sessions/<会话ID>/TASK.md`。
 
-- **不涉及本端改动**：`append_message` 回复理由后结束。
+- **不涉及本端改动**：`AppendMessage` 回复理由后结束。
 - **涉及本端改动**：进入步骤 2。
 
 ### 步骤 2：有限调研
@@ -36,7 +36,7 @@
 
 1. `apm sync-document --file FRONTEND-PLAN.md`（或 BACKEND）。
 2. **有假设且 ASSUMPTIONS 已成功 sync**：@项目经理 请其在 Web **「待您确认」** Panel 点选；说明「以上假设确认前不开始开发」。
-3. **无假设**：`append_message` 发送「本端需求理解」摘要并 @项目经理 请确认。
+3. **无假设**：`AppendMessage` 发送「本端需求理解」摘要并 @项目经理 请确认。
 
 > **禁止**在 ASSUMPTIONS sync 未成功时 @ 项目经理确认假设；PLAN 中「待确认 N 项」由服务端 sync ASSUMPTIONS 后自动更新，AI 不要手写具体数字。