ai-project-manage-cli 5.0.2 → 5.0.4

package/dist/index.js

@@ -283,37 +283,17 @@ import { execFile } from "child_process";
 import { resolve as resolve2 } from "path";
 import { promisify } from "util";
 var execFileAsync = promisify(execFile);
-async function fetchBaselineBranchFromApi(sessionId, cwd) {
-  const cfg = await ensureLoggedConfig();
-  const api = createApmApiClient(cfg);
-  const workdirPath = resolve2(cwd);
-  const res = await api.cli.branchBaseline({
-    sessionId,
-    workdirPath
-  });
-  if (!res.repositoryId) {
-    throw new Error(
-      `[apm] \u672A\u5728\u5E73\u53F0\u627E\u5230\u4E0E\u5F53\u524D\u76EE\u5F55\u5339\u914D\u7684\u5DE5\u4F5C\u76EE\u5F55\u767B\u8BB0\uFF1A${workdirPath}
-\u8BF7\u5148\u5728\u5E73\u53F0\u767B\u8BB0\u8BE5\u8DEF\u5F84\u5BF9\u5E94\u7684\u5DE5\u4F5C\u76EE\u5F55\u4E0E\u4ED3\u5E93\u3002`
-    );
-  }
-  const name = (res.defaultBranch ?? "").trim();
-  if (!name) {
-    throw new Error("[apm] \u5E73\u53F0\u8FD4\u56DE\u7684\u57FA\u7EBF\u5206\u652F\u540D\u4E3A\u7A7A");
-  }
-  return name;
-}
-function branchNameForRequirement(requirementId) {
-  const id = requirementId.trim();
+function branchNameForSession(sessionId) {
+  const id = sessionId.trim();
   if (!id) {
-    throw new Error("[apm] \u9700\u6C42 ID \u4E0D\u80FD\u4E3A\u7A7A");
+    throw new Error("[apm] \u4F1A\u8BDD ID \u4E0D\u80FD\u4E3A\u7A7A");
   }
   if (/[\s/\\]/.test(id)) {
     throw new Error(
-      "[apm] \u9700\u6C42 ID \u4E0D\u80FD\u5305\u542B\u7A7A\u767D\u6216\u8DEF\u5F84\u5206\u9694\u7B26\uFF0C\u8BF7\u4F7F\u7528\u5B57\u6BCD\u3001\u6570\u5B57\u3001._- \u7B49"
+      "[apm] \u4F1A\u8BDD ID \u4E0D\u80FD\u5305\u542B\u7A7A\u767D\u6216\u8DEF\u5F84\u5206\u9694\u7B26\uFF0C\u8BF7\u4F7F\u7528\u5B57\u6BCD\u3001\u6570\u5B57\u3001._- \u7B49"
     );
   }
-  return `feat/req-${id}`;
+  return `feat/session-${id}`;
 }
 async function execGit(cwd, args, quiet) {
   try {
@@ -376,10 +356,15 @@ async function commitWorkingTreeIfDirty(cwd, message) {
   console.log(`[apm] \u5DF2\u63D0\u4EA4\u5DE5\u4F5C\u533A\u53D8\u66F4: ${commitMessage}`);
   return true;
 }
-async function ensureFeatureBranch(branch, options, fetchBaseline) {
+async function ensureFeatureBranch(branch, baselineBranch, options) {
   const cwd = options.cwd ?? process.cwd();
   const commitMessage = options.message?.trim() || `chore(apm): \u540C\u6B65\u5DE5\u4F5C\u533A (${branch})`;
   await ensureGitRepo(cwd);
+  if (!await remoteHeadBranchExists(cwd, baselineBranch)) {
+    throw new Error(
+      `[apm] \u8FDC\u7A0B\u4E0D\u5B58\u5728\u57FA\u7EBF\u5206\u652F ${baselineBranch}\uFF0C\u8BF7\u786E\u8BA4\u4ED3\u5E93\u9ED8\u8BA4\u5206\u652F\u5DF2\u63A8\u9001\u5230 origin`
+    );
+  }
   const current = await getCurrentBranch(cwd);
   const dirty = await isWorkingTreeDirty(cwd);
   if (dirty) {
@@ -395,34 +380,29 @@ async function ensureFeatureBranch(branch, options, fetchBaseline) {
       ]);
     }
   }
-  const remoteExists = await remoteHeadBranchExists(cwd, branch);
-  if (remoteExists) {
-    await execGit(cwd, ["fetch", "origin", branch]);
-    const hasLocal = await localBranchExists(cwd, branch);
-    if (hasLocal) {
-      await execGit(cwd, ["checkout", branch]);
-      await execGit(cwd, ["pull", "--no-edit"]);
-    } else {
-      await execGit(cwd, ["checkout", "-b", branch, `origin/${branch}`]);
-    }
+  const onTargetBranch = await getCurrentBranch(cwd) === branch;
+  if (onTargetBranch) {
+    await execGit(cwd, ["fetch", "origin", baselineBranch]);
+    await execGit(cwd, ["merge", `origin/${baselineBranch}`, "--no-edit"]);
   } else {
-    const onBranch = await getCurrentBranch(cwd) === branch;
-    if (!onBranch) {
-      const hasLocal = await localBranchExists(cwd, branch);
-      if (hasLocal) {
-        await execGit(cwd, ["checkout", branch]);
-      } else {
-        const baselineBranch = await fetchBaseline();
-        await execGit(cwd, ["fetch", "origin", baselineBranch]);
-        await execGit(cwd, [
-          "checkout",
-          "-b",
-          branch,
-          `origin/${baselineBranch}`
-        ]);
-      }
+    const remoteExists = await remoteHeadBranchExists(cwd, branch);
+    if (remoteExists) {
+      await execGit(cwd, ["fetch", "origin", branch]);
+      await execGit(cwd, ["checkout", "-B", branch, `origin/${branch}`]);
+    } else if (await localBranchExists(cwd, branch)) {
+      throw new Error(
+        `[apm] \u8FDC\u7A0B\u4E0D\u5B58\u5728\u5206\u652F ${branch}\uFF0C\u4F46\u672C\u5730\u5DF2\u5B58\u5728\u8BE5\u5206\u652F\uFF0C\u8BF7\u5148\u63A8\u9001\u6216\u5220\u9664\u672C\u5730\u5206\u652F`
+      );
+    } else {
+      await execGit(cwd, ["fetch", "origin", baselineBranch]);
+      await execGit(cwd, [
+        "checkout",
+        "-b",
+        branch,
+        `origin/${baselineBranch}`
+      ]);
+      await execGit(cwd, ["push", "-u", "origin", branch]);
     }
-    await execGit(cwd, ["push", "-u", "origin", branch]);
   }
   console.log(`[apm] \u5DF2\u5C31\u7EEA\u5206\u652F ${branch}`);
   return branch;
@@ -436,16 +416,23 @@ async function runBranch(sessionId, options = {}) {
   const cfg = await ensureLoggedConfig();
   const api = createApmApiClient(cfg);
   const cwd = options.cwd ?? process.cwd();
+  const workdirPath = resolve2(cwd);
   const baseline = await api.cli.branchBaseline({
     sessionId: trimmedSessionId,
-    workdirPath: resolve2(cwd)
+    workdirPath
   });
-  const branch = branchNameForRequirement(baseline.requirementId);
-  return ensureFeatureBranch(
-    branch,
-    options,
-    () => fetchBaselineBranchFromApi(trimmedSessionId, cwd)
-  );
+  if (!baseline.repositoryId) {
+    throw new Error(
+      `[apm] \u672A\u5728\u5E73\u53F0\u627E\u5230\u4E0E\u5F53\u524D\u76EE\u5F55\u5339\u914D\u7684\u5DE5\u4F5C\u76EE\u5F55\u767B\u8BB0\uFF1A${workdirPath}
+\u8BF7\u5148\u5728\u5E73\u53F0\u767B\u8BB0\u8BE5\u8DEF\u5F84\u5BF9\u5E94\u7684\u5DE5\u4F5C\u76EE\u5F55\u4E0E\u4ED3\u5E93\u3002`
+    );
+  }
+  const baselineBranch = (baseline.defaultBranch ?? "").trim();
+  if (!baselineBranch) {
+    throw new Error("[apm] \u5E73\u53F0\u8FD4\u56DE\u7684\u57FA\u7EBF\u5206\u652F\u540D\u4E3A\u7A7A");
+  }
+  const branch = branchNameForSession(trimmedSessionId);
+  return ensureFeatureBranch(branch, baselineBranch, options);
 }
 
 // src/commands/pull.ts
@@ -1795,9 +1782,7 @@ function buildProgram() {
   program.command("update-message-status").description("\u66F4\u65B0\u5E73\u53F0\u4F1A\u8BDD\u6D88\u606F\u72B6\u6001").requiredOption("--id <messageId>", "\u6D88\u606F ID").requiredOption("--status <status>", "CREATED | TYPING | SUCCESS | FAILED").action(async (opts) => {
     await runUpdateMessageStatus(opts);
   });
-  program.command("branch").description(
-    "\u5207\u6362\u6216\u521B\u5EFA\u9700\u6C42\u5206\u652F feat/req-<requirementId>\uFF08\u7531 sessionId \u89E3\u6790\u9700\u6C42\uFF09"
-  ).argument("<sessionId>", "\u6C9F\u901A\u7FA4 ID").option(
+  program.command("branch").description("\u5207\u6362\u6216\u521B\u5EFA\u4F1A\u8BDD\u5206\u652F feat/session-<sessionId>").argument("<sessionId>", "\u6C9F\u901A\u7FA4 ID").option(
     "-m, --message <text>",
     "\u5DF2\u5728\u76EE\u6807\u5206\u652F\u4E14\u9700\u63D0\u4EA4\u672C\u5730\u6539\u52A8\u65F6\u4F7F\u7528\u7684\u63D0\u4EA4\u8BF4\u660E"
   ).action(async (sessionId, opts) => {

package/package.json

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