ai-project-manage-cli 7.1.11 → 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
@@ -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
@@ -854,6 +869,21 @@ async function commitWorkspaceReposIfDirty(workdir, message) {
   }
   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) {
@@ -1525,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() : "";
@@ -1712,6 +1771,10 @@ function createCursorCustomTools(cfg, messageId, options) {
       cfg,
       taskId: options.taskId
     });
+    tools.MergeWebIdePullRequests = createMergeWebIdePullRequestsTool({
+      cfg,
+      taskId: options.taskId
+    });
   }
   return tools;
 }
@@ -2559,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);
+// 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 ensureWebIdeDraftPullRequests(cfg, taskId, workdir) {
+async function ensureWebIdePullRequests(cfg, taskId, workdir) {
   const api = createApmApiClient(cfg);
   let repoRoots;
   try {
@@ -2572,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;
       }
@@ -2603,17 +2669,81 @@ 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";
@@ -2824,7 +2954,8 @@ function markSkillsSyncedForCliVersion(workdir, cliVersion) {
 var WEBIDE_CODE_CHANGE_ACTIONS = /* @__PURE__ */ new Set([
   "skip-plan",
   "start-develop",
-  "fix-and-retest"
+  "fix-and-retest",
+  "report-defect"
 ]);
 function shouldCommitAfterWebIdeMessage(action) {
   return WEBIDE_CODE_CHANGE_ACTIONS.has(action);
@@ -2878,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");
+      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 ensureWebIdeDraftPullRequests(cfg, taskId, workdir);
+      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 };
@@ -2974,6 +3126,11 @@ async function handleWebIdeInboundMessage(cfg, msg, signal) {
       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");

package/package.json

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

package/template/AGENTS.md

@@ -29,8 +29,9 @@
   - 规则: `.apm/rules/*`
     - reply.md：当需要回复消息时需要读取这个文档，记住回复规则
     - write_doc.md：当需要写文档时需要读取这个文档，记住写文档的规则
-    - webide_git_commit.md：WebIDE 开发/修码时读取，按规范分轮 commit
+    - webide_git_commit.md：WebIDE 开发/修码时读取，按规范分轮 commit，结束前 push
     - webide_testcase.md：WebIDE 生成测试用例时读取，按规范编写并提交用例
+    - webide_merge.md：WebIDE 验收合并时读取；先解冲突再调 MergeWebIdePullRequests，需求相悖则拒绝合并
 
 - 仓库项目上下文（`.apm/project/`）:
 

package/template/rules/webide_git_commit.md

@@ -10,4 +10,7 @@
 
 ### 结束前检查
 
-本轮全部工作结束前，确认工作区干净（`git status` 无未提交变更）；若仍有残留改动，补一次 commit。
+本轮全部工作结束前：
+
+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 / 明显冲突未解决时假装成功