ai-project-manage-cli 6.0.83 → 6.0.84

package/dist/index.js

@@ -3939,6 +3939,99 @@ async function runConnect(options) {
   });
 }
 
+// src/commands/create-pr-errors.ts
+import { ApiError as ApiError2 } from "listpage-http";
+function extractMessage(error) {
+  if (error instanceof ApiError2) {
+    return String(error.message ?? "").trim();
+  }
+  if (error instanceof Error) {
+    return error.message.trim();
+  }
+  return String(error).trim();
+}
+function extractHttpStatus(error) {
+  if (error instanceof ApiError2) {
+    return error.httpStatus;
+  }
+  return void 0;
+}
+function buildHints(message, httpStatus) {
+  const hints = [];
+  if (/未配置.*Gitee.*API Key/i.test(message)) {
+    hints.push(
+      "\u8BF7\u5728 APM Web \u2192 \u5BA2\u6237\u673A\u7BA1\u7406 \u2192 \u7F16\u8F91\u5F53\u524D\u5BA2\u6237\u673A \u2192 \u586B\u5199\u300CGitee API Key\u300D\uFF08Gitee \u79C1\u4EBA\u4EE4\u724C\uFF0C\u9700\u6709\u4ED3\u5E93 PR \u6743\u9650\uFF09"
+    );
+  } else if (/未配置.*GitHub.*API Key/i.test(message)) {
+    hints.push(
+      "\u8BF7\u5728 APM Web \u2192 \u5BA2\u6237\u673A\u7BA1\u7406 \u2192 \u7F16\u8F91\u5F53\u524D\u5BA2\u6237\u673A \u2192 \u586B\u5199\u300CGithub API Key\u300D\uFF08GitHub Personal Access Token\uFF0C\u9700\u6709 repo \u6743\u9650\uFF09"
+    );
+  } else if (httpStatus === 401 || /access token does not exist/i.test(message) || /bad credentials/i.test(message) || /Git 平台返回 401|认证失败 \(401\)/i.test(message)) {
+    hints.push(
+      "Git \u5E73\u53F0 Token \u65E0\u6548\u6216\u5DF2\u8FC7\u671F\uFF1A\u8BF7\u5728 Gitee/GitHub \u91CD\u65B0\u751F\u6210\u79C1\u4EBA\u4EE4\u724C\uFF0C\u5E76\u66F4\u65B0\u5230 APM\u300C\u5BA2\u6237\u673A\u7BA1\u7406\u300D"
+    );
+  }
+  if (/未绑定仓库|未关联仓库|选择关联仓库/i.test(message)) {
+    hints.push("\u5728 APM Web \u2192 \u5DE5\u4F5C\u76EE\u5F55 \u2192 \u4E3A\u5F53\u524D\u8DEF\u5F84\u5173\u8054\u5BF9\u5E94 Git \u4ED3\u5E93");
+  }
+  if (/路径.*不匹配|尚未登记任何工作目录/i.test(message)) {
+    hints.push(
+      "\u5728 APM Web \u2192 \u5DE5\u4F5C\u76EE\u5F55 \u2192 \u767B\u8BB0\u5F53\u524D\u9879\u76EE\u8DEF\u5F84\uFF08\u9700\u4E0E apm create-pr \u6267\u884C\u65F6\u7684 cwd \u4E00\u81F4\uFF09"
+    );
+  }
+  if (/no commits between|分支不存在|branch.*not found|找不到.*分支/i.test(
+    message
+  )) {
+    hints.push(
+      "\u7279\u6027\u5206\u652F\u53EF\u80FD\u672A\u63A8\u9001\uFF1A\u5148\u6267\u884C apm branch <sessionId> \u521B\u5EFA\u5206\u652F\u5E76 push\uFF0C\u518D\u91CD\u8BD5 create-pr"
+    );
+  }
+  if (/pull request already exists|已存在.*pull/i.test(message)) {
+    hints.push("\u8BE5\u5206\u652F\u53EF\u80FD\u5DF2\u6709\u5F00\u542F\u7684 PR\uFF0C\u8BF7\u5230 Git \u5E73\u53F0\u6216 APM \u4F1A\u8BDD\u8BE6\u60C5\u67E5\u770B");
+  }
+  if (/403|无权限|forbidden/i.test(message)) {
+    hints.push("\u786E\u8BA4 Token \u5BF9\u76EE\u6807\u4ED3\u5E93\u6709\u521B\u5EFA Pull Request \u7684\u6743\u9650");
+  }
+  if (hints.length === 0) {
+    hints.push(
+      "\u82E5\u65E0\u6CD5\u81EA\u884C\u6392\u67E5\uFF0C\u8BF7\u5728\u4F1A\u8BDD\u4E2D @\u9879\u76EE\u7ECF\u7406\uFF0C\u5E76\u63D0\u4F9B\u4E0A\u8FF0\u4F1A\u8BDD ID \u4E0E\u5DE5\u4F5C\u76EE\u5F55"
+    );
+  }
+  return hints;
+}
+function formatCreatePrErrorLines(error, context) {
+  const message = extractMessage(error);
+  const httpStatus = extractHttpStatus(error);
+  const headBranch = `feat/session-${context.sessionId}`;
+  const lines = [
+    "[apm] \u521B\u5EFA PR \u5931\u8D25",
+    "",
+    `\u4F1A\u8BDD ID: ${context.sessionId}`,
+    `\u5DE5\u4F5C\u76EE\u5F55: ${context.workdir}`,
+    `\u7279\u6027\u5206\u652F: ${headBranch}`
+  ];
+  if (context.clientMachineId) {
+    lines.push(`\u5BA2\u6237\u673A ID: ${context.clientMachineId}`);
+  }
+  lines.push("", "\u539F\u56E0:", message || "(\u672A\u77E5\u9519\u8BEF)");
+  const hints = buildHints(message, httpStatus);
+  if (hints.length > 0) {
+    lines.push("", "\u5EFA\u8BAE:");
+    hints.forEach((hint, index) => {
+      lines.push(`${index + 1}. ${hint}`);
+    });
+  }
+  if (httpStatus !== void 0) {
+    lines.push("", `HTTP \u72B6\u6001: ${httpStatus}`);
+  }
+  return lines;
+}
+function printCreatePrError(error, context) {
+  for (const line of formatCreatePrErrorLines(error, context)) {
+    console.error(line);
+  }
+}
+
 // src/commands/create-pr.ts
 async function runCreatePr(options) {
   const sessionId = options.sessionId.trim();
@@ -3954,13 +4047,22 @@ async function runCreatePr(options) {
   const cfg = await ensureLoggedConfig();
   const api = createApmApiClient(cfg);
   const workdir = resolveWorkdirPath(options.cwd ?? process.cwd());
-  const pr = await api.cli.createPullRequest({
-    sessionId,
-    workdir,
-    title,
-    content: options.content ?? ""
-  });
-  console.log(`[apm] PR \u5DF2\u5C31\u7EEA #${pr.number} (${pr.state}): ${pr.url}`);
+  try {
+    const pr = await api.cli.createPullRequest({
+      sessionId,
+      workdir,
+      title,
+      content: options.content ?? ""
+    });
+    console.log(`[apm] PR \u5DF2\u5C31\u7EEA #${pr.number} (${pr.state}): ${pr.url}`);
+  } catch (error) {
+    printCreatePrError(error, {
+      sessionId,
+      workdir,
+      clientMachineId: resolveClientMachineId(cfg)
+    });
+    process.exit(1);
+  }
 }
 
 // src/commands/deploy/deploy-execute.ts

package/package.json

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