ai-project-manage-cli 7.1.20 → 7.1.23

package/dist/webide-message-worker.js

@@ -452,6 +452,116 @@ async function ensureRemoteBaselineBranch(cwd, baselineBranch) {
     `[apm] \u8FDC\u7A0B\u4E0D\u5B58\u5728\u57FA\u7EBF\u5206\u652F origin/${baselineBranch}\uFF0C\u8BF7\u786E\u8BA4\u4ED3\u5E93\u9ED8\u8BA4\u5206\u652F\u5DF2\u63A8\u9001\u5230 origin`
   );
 }
+async function branchHasChangesAgainstBase(cwd, baseBranch, headBranch) {
+  const base = baseBranch.trim().replace(/^origin\//, "");
+  const head = headBranch.trim().replace(/^origin\//, "");
+  if (!base || !head) return false;
+  await execGit(cwd, ["fetch", "origin", base], true);
+  let headRef = head;
+  try {
+    await execGit(cwd, ["fetch", "origin", head], true);
+    await execGit(cwd, ["rev-parse", "--verify", `origin/${head}`], true);
+    headRef = `origin/${head}`;
+  } catch {
+    await execGit(cwd, ["rev-parse", "--verify", head], true);
+  }
+  const baseRef = `origin/${base}`;
+  const ahead = (await execGit(cwd, ["rev-list", "--count", `${baseRef}..${headRef}`], true)).trim();
+  if ((Number.parseInt(ahead, 10) || 0) <= 0) {
+    return false;
+  }
+  try {
+    await execGit(cwd, ["diff", "--quiet", `${baseRef}...${headRef}`], true);
+    return false;
+  } catch {
+    return true;
+  }
+}
+var FEATURE_BRANCH_RE = /^feat\/(task|session)-.+/;
+function isFeatureBranchName(branch) {
+  return FEATURE_BRANCH_RE.test(branch.trim().replace(/^origin\//, ""));
+}
+async function resolveFeatureBranchBaseFromGit(cwd, headBranch) {
+  const head = headBranch.trim().replace(/^origin\//, "");
+  if (!head) {
+    throw new Error("[apm] head \u5206\u652F\u540D\u4E3A\u7A7A\uFF0C\u65E0\u6CD5\u63A8\u65AD\u57FA\u7EBF");
+  }
+  try {
+    const reflog = await execGit(
+      cwd,
+      ["reflog", "show", "--date=iso", head],
+      true
+    );
+    for (const line of reflog.split("\n")) {
+      const created = line.match(
+        /Created from (?:refs\/remotes\/origin\/|origin\/)?(\S+)/i
+      );
+      if (created?.[1]) {
+        const name = created[1].replace(/^origin\//, "");
+        if (name && name !== head && !isFeatureBranchName(name)) {
+          return name;
+        }
+      }
+      const moving = line.match(
+        /checkout: moving from (\S+) to (?:origin\/)?\S+/i
+      );
+      if (moving?.[1]) {
+        const from = moving[1].replace(/^origin\//, "");
+        if (from && from !== head && !isFeatureBranchName(from)) {
+          return from;
+        }
+      }
+    }
+  } catch {
+  }
+  await execGit(cwd, ["fetch", "origin", "--prune"], true);
+  let headRef = head;
+  try {
+    await execGit(cwd, ["rev-parse", "--verify", `origin/${head}`], true);
+    headRef = `origin/${head}`;
+  } catch {
+    await execGit(cwd, ["rev-parse", "--verify", head], true);
+  }
+  const refsOut = await execGit(
+    cwd,
+    ["for-each-ref", "--format=%(refname:short)", "refs/remotes/origin/"],
+    true
+  );
+  let best = null;
+  for (const ref of refsOut.split("\n").map((s) => s.trim()).filter(Boolean)) {
+    const name = ref.replace(/^origin\//, "");
+    if (!name || name === "HEAD" || name === head || isFeatureBranchName(name)) {
+      continue;
+    }
+    try {
+      await execGit(
+        cwd,
+        ["merge-base", "--is-ancestor", `origin/${name}`, headRef],
+        true
+      );
+      const ahead = Number.parseInt(
+        (await execGit(
+          cwd,
+          ["rev-list", "--count", `origin/${name}..${headRef}`],
+          true
+        )).trim(),
+        10
+      );
+      if (!Number.isFinite(ahead) || ahead < 0) continue;
+      if (!best || ahead < best.ahead) {
+        best = { name, ahead };
+      }
+    } catch {
+      continue;
+    }
+  }
+  if (best) {
+    return best.name;
+  }
+  throw new Error(
+    `[apm] \u65E0\u6CD5\u63A8\u65AD ${head} \u57FA\u4E8E\u54EA\u6761\u5206\u652F\u521B\u5EFA\uFF0C\u8BF7\u786E\u8BA4\u672C\u5730 reflog \u6216 origin \u8FDC\u7A0B\u5206\u652F`
+  );
+}
 async function hasUpstream(cwd) {
   try {
     await execGit(cwd, ["rev-parse", "--abbrev-ref", "@{upstream}"], true);
@@ -3108,60 +3218,198 @@ function shouldEnsureWebIdePullRequests(action) {
 function shouldEnsureWebIdePullRequestsAfterAgent(action) {
   return POST_AGENT_PR_ACTIONS.has(action);
 }
+function formatWebIdePullRequestSummary(result) {
+  const lines = [];
+  lines.push("## PR \u521B\u5EFA\u7ED3\u679C");
+  lines.push(
+    `\u5408\u8BA1\uFF1A\u6210\u529F ${result.ensured} \u6761\uFF0C\u65E0\u53D8\u66F4\u8DF3\u8FC7 ${result.skippedNoChanges} \u6761\uFF0C\u5176\u4ED6\u8DF3\u8FC7 ${result.skipped} \u6761\uFF0C\u5931\u8D25 ${result.failed} \u6761\u3002`
+  );
+  if (result.items.length === 0) {
+    lines.push("\u672A\u5904\u7406\u4EFB\u4F55\u4ED3\u5E93\u3002");
+    return lines.join("\n");
+  }
+  lines.push("");
+  for (const item of result.items) {
+    if (item.outcome === "created") {
+      const num = item.number != null && item.number > 0 ? `#${item.number}` : "\uFF08\u65E0\u7F16\u53F7\uFF09";
+      const branch = item.headBranch && item.baseBranch ? `${item.headBranch} \u2192 ${item.baseBranch}` : item.baseBranch ? `\u76EE\u6807\u5206\u652F ${item.baseBranch}` : "";
+      const state = item.state ? `\u72B6\u6001 ${item.state}` : "";
+      const url = item.url?.trim() ? item.url.trim() : "";
+      lines.push(
+        `- **${item.label}**\uFF1A\u5DF2\u521B\u5EFA ${num}${branch ? `\uFF0C${branch}` : ""}${state ? `\uFF0C${state}` : ""}${url ? `\uFF0C${url}` : ""}`
+      );
+      continue;
+    }
+    if (item.outcome === "skipped_no_changes") {
+      lines.push(
+        `- **${item.label}**\uFF1A\u76F8\u5BF9\u57FA\u7EBF ${item.baseBranch || "\uFF08\u672A\u77E5\uFF09"} \u65E0\u4EE3\u7801\u53D8\u66F4\uFF0C\u672A\u521B\u5EFA PR`
+      );
+      continue;
+    }
+    if (item.outcome === "skipped") {
+      lines.push(`- **${item.label}**\uFF1A\u5DF2\u8DF3\u8FC7 \u2014 ${item.detail}`);
+      continue;
+    }
+    lines.push(`- **${item.label}**\uFF1A\u521B\u5EFA\u5931\u8D25 \u2014 ${item.detail}`);
+  }
+  return lines.join("\n");
+}
 async function ensureWebIdePullRequests(cfg, taskId, workdir) {
   const api = createApmApiClient(cfg);
+  const empty = () => ({
+    ensured: 0,
+    skipped: 0,
+    skippedNoChanges: 0,
+    failed: 0,
+    items: [],
+    tips: []
+  });
   let repoRoots;
   try {
     const manifest = loadWorkspaceReposCache(workdir);
     repoRoots = resolveWorkspaceRepoAbsolutePaths(manifest);
   } catch (err) {
-    console.warn(
-      "[apm] WebIDE PR\uFF1A\u8BFB\u53D6\u4ED3\u5E93\u6E05\u5355\u5931\u8D25:",
-      err instanceof Error ? err.message : err
-    );
-    return { ensured: 0, skipped: 0, failed: 1 };
+    const tip = `\u8BFB\u53D6\u4ED3\u5E93\u6E05\u5355\u5931\u8D25: ${err instanceof Error ? err.message : err}`;
+    console.warn(`[apm] WebIDE PR\uFF1A${tip}`);
+    return {
+      ...empty(),
+      failed: 1,
+      tips: [tip],
+      items: [
+        {
+          label: "\u5DE5\u4F5C\u533A",
+          outcome: "failed",
+          detail: tip
+        }
+      ]
+    };
   }
+  const expectedHead = `feat/task-${taskId}`;
   console.log(
-    `[apm] WebIDE PR\uFF1A\u51C6\u5907\u4E3A ${repoRoots.length} \u4E2A\u4ED3\u5E93\u521B\u5EFA feat/task-${taskId}`
+    `[apm] WebIDE PR\uFF1A\u51C6\u5907\u68C0\u67E5 ${repoRoots.length} \u4E2A\u4ED3\u5E93\uFF08\u671F\u671B\u7279\u6027\u5206\u652F ${expectedHead}\uFF09`
   );
   let ensured = 0;
   let skipped = 0;
+  let skippedNoChanges = 0;
   let failed = 0;
+  const tips = [];
+  const items = [];
   for (const gitRoot of repoRoots) {
     const label = formatRepoLabel(workdir, gitRoot);
     try {
+      const current = await getCurrentBranch(gitRoot);
+      if (!isFeatureBranchName(current)) {
+        const tip = `${label}\uFF1A\u5F53\u524D\u5206\u652F ${current} \u4E0D\u662F feat/task-* / feat/session-*\uFF0C\u4E0D\u7B26\u5408\u521B\u5EFA PR \u6761\u4EF6`;
+        console.warn(`[apm] WebIDE PR\uFF1A${tip}`);
+        tips.push(tip);
+        skipped += 1;
+        items.push({
+          label,
+          outcome: "skipped",
+          headBranch: current,
+          detail: tip
+        });
+        continue;
+      }
+      if (current !== expectedHead) {
+        const tip = `${label}\uFF1A\u5F53\u524D\u4E3A ${current}\uFF0C\u671F\u671B ${expectedHead}\uFF0C\u5DF2\u8DF3\u8FC7`;
+        console.warn(`[apm] WebIDE PR\uFF1A${tip}`);
+        tips.push(tip);
+        skipped += 1;
+        items.push({
+          label,
+          outcome: "skipped",
+          headBranch: current,
+          detail: tip
+        });
+        continue;
+      }
+      const headBranch = current;
       const originUrl = await tryReadGitOriginUrl(gitRoot);
       if (!originUrl) {
-        console.warn(`[apm] WebIDE PR\uFF1A\u8DF3\u8FC7 ${label}\uFF08\u65E0 remote.origin.url\uFF09`);
+        const tip = `${label}\uFF1A\u65E0 remote.origin.url`;
+        console.warn(`[apm] WebIDE PR\uFF1A\u8DF3\u8FC7 ${tip}`);
+        tips.push(tip);
         skipped += 1;
+        items.push({
+          label,
+          outcome: "skipped",
+          headBranch,
+          detail: tip
+        });
         continue;
       }
       const matched = await api.cli.matchRepository({ url: originUrl });
       const repositoryId = matched.repositoryId?.trim();
       if (!repositoryId) {
-        console.warn(
-          `[apm] WebIDE PR\uFF1A\u8DF3\u8FC7 ${label}\uFF08\u5E73\u53F0\u672A\u767B\u8BB0\u4ED3\u5E93 ${originUrl}\uFF09`
-        );
+        const tip = `${label}\uFF1A\u5E73\u53F0\u672A\u767B\u8BB0\u4ED3\u5E93 ${originUrl}`;
+        console.warn(`[apm] WebIDE PR\uFF1A\u8DF3\u8FC7 ${tip}`);
+        tips.push(tip);
         skipped += 1;
+        items.push({
+          label,
+          outcome: "skipped",
+          headBranch,
+          detail: tip
+        });
+        continue;
+      }
+      const baseBranch = await resolveFeatureBranchBaseFromGit(
+        gitRoot,
+        headBranch
+      );
+      const hasChanges = await branchHasChangesAgainstBase(
+        gitRoot,
+        baseBranch,
+        headBranch
+      );
+      if (!hasChanges) {
+        const tip = `${label}\uFF1A\u76F8\u5BF9\u57FA\u7EBF ${baseBranch} \u65E0\u4EE3\u7801\u53D8\u66F4\uFF0C\u65E0\u9700\u521B\u5EFA PR`;
+        console.log(`[apm] WebIDE PR\uFF1A${tip}`);
+        tips.push(tip);
+        skippedNoChanges += 1;
+        items.push({
+          label,
+          outcome: "skipped_no_changes",
+          headBranch,
+          baseBranch,
+          detail: tip
+        });
         continue;
       }
       const pr = await api.cli.createWebIdeDraftPullRequest({
         taskId,
-        repositoryId
+        repositoryId,
+        headBranch,
+        baseBranch
       });
       ensured += 1;
+      items.push({
+        label,
+        outcome: "created",
+        headBranch,
+        baseBranch,
+        number: pr.number,
+        state: pr.state,
+        url: pr.url,
+        detail: `\u5DF2\u521B\u5EFA #${pr.number} ${headBranch} \u2192 ${baseBranch}`
+      });
       console.log(
-        `[apm] WebIDE PR\uFF1A${label} \u2192 #${pr.number} ${pr.state} ${pr.url || ""}`
+        `[apm] WebIDE PR\uFF1A${label} \u2192 #${pr.number} ${pr.state} ${headBranch} \u2192 ${baseBranch} ${pr.url || ""}`
       );
     } catch (err) {
       failed += 1;
-      console.warn(
-        `[apm] WebIDE PR\uFF1A${label} \u5931\u8D25:`,
-        err instanceof Error ? err.message : err
-      );
+      const tip = `${label}\uFF1A${err instanceof Error ? err.message : err}`;
+      console.warn(`[apm] WebIDE PR\uFF1A\u5931\u8D25 ${tip}`);
+      tips.push(tip);
+      items.push({
+        label,
+        outcome: "failed",
+        detail: tip
+      });
     }
   }
-  return { ensured, skipped, failed };
+  return { ensured, skipped, skippedNoChanges, failed, items, tips };
 }
 
 // src/version.ts
@@ -3687,9 +3935,38 @@ async function handleWebIdeInboundMessage(cfg, msg, signal, options) {
         );
       }
       const prResult = await ensureWebIdePullRequests(cfg, taskId, workdir);
+      if (prResult.tips.length > 0) {
+        for (const tip of prResult.tips) {
+          console.log(`[apm] webide create-pr \u63D0\u793A: ${tip}`);
+        }
+      }
+      try {
+        await appendContent(
+          cfg,
+          messageId,
+          formatWebIdePullRequestSummary(prResult)
+        );
+      } catch (appendErr) {
+        console.warn(
+          "[apm] webide create-pr \u8FFD\u52A0 PR \u7ED3\u679C\u5931\u8D25:",
+          appendErr instanceof Error ? appendErr.message : appendErr
+        );
+      }
       if (prResult.ensured === 0) {
-        const detail = prResult.failed > 0 ? `\u521B\u5EFA PR \u5931\u8D25\uFF08${prResult.failed} \u4E2A\u4ED3\u5E93\u51FA\u9519\uFF09` : "\u672A\u80FD\u521B\u5EFA PR\uFF1A\u672A\u5339\u914D\u5230\u53EF\u767B\u8BB0\u7684\u4ED3\u5E93\uFF0C\u8BF7\u68C0\u67E5\u5DE5\u4F5C\u533A git remote \u4E0E\u5E73\u53F0\u4ED3\u5E93\u767B\u8BB0";
-        throw new Error(detail);
+        if (prResult.failed > 0) {
+          throw new Error(
+            `\u521B\u5EFA PR \u5931\u8D25\uFF08${prResult.failed} \u4E2A\u4ED3\u5E93\u51FA\u9519\uFF09${prResult.tips[0] ? `\uFF1A${prResult.tips[0]}` : ""}`
+          );
+        }
+        if (prResult.skippedNoChanges > 0 && prResult.skipped === 0) {
+          console.log(
+            "[apm] webide create-pr\uFF1A\u5404\u4ED3\u5E93\u76F8\u5BF9\u63A8\u65AD\u57FA\u7EBF\u5747\u65E0\u53D8\u66F4\uFF0C\u8DF3\u8FC7\u521B\u5EFA PR"
+          );
+        } else {
+          throw new Error(
+            prResult.tips[0] || "\u672A\u80FD\u521B\u5EFA PR\uFF1A\u8BF7\u786E\u8BA4\u5404\u4ED3\u5F53\u524D\u4F4D\u4E8E feat/task-* \u5206\u652F\uFF0C\u4E14 remote \u5DF2\u5728\u5E73\u53F0\u767B\u8BB0"
+          );
+        }
       }
     }
     if (projectId) {

package/package.json

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