ai-project-manage-cli 3.0.2 → 3.0.4

package/dist/index.js

@@ -95,6 +95,10 @@ var requestConfig = {
       method: "GET",
       path: "/cli/requirements/pull"
     }),
+    branchBaseline: defineEndpoint({
+      method: "GET",
+      path: "/cli/requirements/branch-baseline"
+    }),
     comment: defineEndpoint({
       method: "POST",
       path: "/cli/requirements/comment"
@@ -307,6 +311,144 @@ async function runLogin(opts) {
   console.log(JSON.stringify({ userId: cfg.userId, baseUrl: cfg.baseUrl }, null, 2));
 }
 
+// src/commands/branch.ts
+import { execFile } from "child_process";
+import { resolve as resolve2 } from "path";
+import { promisify } from "util";
+var execFileAsync = promisify(execFile);
+async function fetchBaselineBranchFromApi(requirementId, cwd) {
+  const cfg = await ensureLoggedConfig();
+  const api = createApmApiClient(cfg);
+  const workdirPath = resolve2(cwd);
+  const { baselineBranch } = await api.cliRequirements.branchBaseline({
+    requirementId,
+    workdirPath
+  });
+  const name = baselineBranch.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();
+  if (!id) {
+    throw new Error("[apm] \u9700\u6C42 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"
+    );
+  }
+  return `feat/req-${id}`;
+}
+async function execGit(cwd, args, quiet) {
+  try {
+    const { stdout, stderr } = await execFileAsync("git", args, {
+      cwd,
+      encoding: "utf8",
+      maxBuffer: 10 * 1024 * 1024
+    });
+    if (!quiet && stderr.trim()) {
+      process.stderr.write(stderr);
+    }
+    return stdout;
+  } catch (err) {
+    const e = err;
+    const detail = (e.stderr ?? e.message ?? String(err)).trim();
+    throw new Error(
+      `[apm] git ${args.join(" ")} \u5931\u8D25${detail ? `: ${detail}` : ""}`
+    );
+  }
+}
+async function ensureGitRepo(cwd) {
+  await execGit(cwd, ["rev-parse", "--git-dir"], true);
+}
+async function getCurrentBranch(cwd) {
+  const name = (await execGit(cwd, ["rev-parse", "--abbrev-ref", "HEAD"], true)).trim();
+  return name;
+}
+async function isWorkingTreeDirty(cwd) {
+  const out = await execGit(cwd, ["status", "--porcelain"], true);
+  return out.trim().length > 0;
+}
+async function remoteHeadBranchExists(cwd, branch) {
+  const out = await execGit(
+    cwd,
+    ["ls-remote", "--heads", "origin", branch],
+    true
+  );
+  return out.trim().length > 0;
+}
+async function localBranchExists(cwd, branch) {
+  try {
+    await execGit(
+      cwd,
+      ["show-ref", "--verify", "--quiet", `refs/heads/${branch}`],
+      true
+    );
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function runBranch(requirementId, options = {}) {
+  const cwd = options.cwd ?? process.cwd();
+  const branch = branchNameForRequirement(requirementId);
+  const commitMessage = options.message?.trim() || `chore(apm): \u540C\u6B65\u5DE5\u4F5C\u533A (${branch})`;
+  await ensureGitRepo(cwd);
+  const current = await getCurrentBranch(cwd);
+  const dirty = await isWorkingTreeDirty(cwd);
+  if (dirty) {
+    if (current === branch) {
+      await execGit(cwd, ["add", "-A"]);
+      await execGit(cwd, ["commit", "-m", commitMessage]);
+    } else {
+      await execGit(cwd, [
+        "stash",
+        "push",
+        "-u",
+        "-m",
+        `apm: switch to ${branch}`
+      ]);
+    }
+  }
+  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}`]);
+    }
+  } 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 fetchBaselineBranchFromApi(
+          requirementId,
+          cwd
+        );
+        await execGit(cwd, ["fetch", "origin", baselineBranch]);
+        await execGit(cwd, [
+          "checkout",
+          "-b",
+          branch,
+          `origin/${baselineBranch}`
+        ]);
+      }
+    }
+    await execGit(cwd, ["push", "-u", "origin", branch]);
+  }
+  console.log(`[apm] \u5DF2\u5C31\u7EEA\u5206\u652F ${branch}`);
+  return branch;
+}
+
 // src/commands/pull.ts
 import { writeFileSync as writeFileSync3 } from "fs";
 import { join as join4 } from "path";
@@ -364,9 +506,8 @@ async function runPull(requirementId) {
     {
       id: req.id,
       status: req.status,
-      ...req.urgency != null && req.urgency !== "" ? { urgency: req.urgency } : {},
       title: req.title,
-      ...req.pauseReason != null && req.pauseReason.trim() !== "" ? { pauseReason: req.pauseReason } : {},
+      env: req.envName || "",
       tasks: tasksForStatusYaml(data.tasks ?? [])
     },
     { lineWidth: 0 }
@@ -476,6 +617,16 @@ function buildProgram() {
   program.command("pull").description("GET /api/cli/requirements/pull\uFF0C\u540C\u6B65\u6570\u636E\u5230 .apm \u76EE\u5F55").argument("<requirementId>", "\u9700\u6C42 ID").action(async (requirementId) => {
     await runPull(requirementId);
   });
+  program.command("branch").description(
+    "\u5207\u6362\u6216\u521B\u5EFA\u9700\u6C42\u5206\u652F feat/req-<ID>\uFF1A\u8FDC\u7AEF\u5B58\u5728\u5219\u62C9\u53D6\u6700\u65B0\uFF1B\u8FDC\u7AEF\u5C1A\u65E0\u8BE5\u5206\u652F\u4E14\u672C\u5730\u4E5F\u65E0\u540C\u540D\u5206\u652F\u65F6\uFF0C\u9700\u5DF2 login\uFF0C\u5E76\u7531\u5E73\u53F0\u6839\u636E\u5F53\u524D\u76EE\u5F55\u8DEF\u5F84\u89E3\u6790\u4ED3\u5E93\u57FA\u7EBF\u5206\u652F\u540E\u4ECE origin \u68C0\u51FA\u518D\u63A8\u9001\uFF1B\u6709\u672C\u5730\u672A\u63D0\u4EA4\u6539\u52A8\u65F6\u5728\u975E\u76EE\u6807\u5206\u652F\u5148 stash\uFF08\u4E0D\u81EA\u52A8\u6062\u590D\uFF09\uFF0C\u5728\u76EE\u6807\u5206\u652F\u5219\u5148 commit"
+  ).argument("<requirementId>", "\u9700\u6C42 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\uFF08\u9ED8\u8BA4\u81EA\u52A8\u751F\u6210\uFF09"
+  ).action(
+    async (requirementId, opts) => {
+      await runBranch(requirementId, { message: opts.message });
+    }
+  );
   program.command("comment").description("POST /api/cli/requirements/comment\uFF08\u6B63\u6587\u6765\u81EA\u6587\u4EF6\uFF09").argument("<requirementId>", "\u9700\u6C42 ID").requiredOption("--file <path>", "\u8BC4\u8BBA\u6B63\u6587\u6587\u4EF6\u8DEF\u5F84").option("--model <model>", "\u8BC4\u8BBA\u6A21\u578B").action(
     async (requirementId, options) => {
       await runComment(requirementId, options.file, options.model);

package/package.json

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