ai-project-manage-cli 5.0.9 → 5.0.11

package/dist/index.js

@@ -410,18 +410,30 @@ async function ensureFeatureBranch(branch, baselineBranch, options) {
       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`
-      );
+      if (await getCurrentBranch(cwd) !== branch) {
+        await execGit(cwd, ["checkout", branch]);
+      }
+      console.log(`[apm] \u5206\u652F ${branch} \u5DF2\u5B58\u5728\uFF0C\u8DF3\u8FC7\u521B\u5EFA`);
     } else {
       await execGit(cwd, ["fetch", "origin", baselineBranch]);
-      await execGit(cwd, [
-        "checkout",
-        "-b",
-        branch,
-        `origin/${baselineBranch}`
-      ]);
-      await execGit(cwd, ["push", "-u", "origin", branch]);
+      try {
+        await execGit(cwd, [
+          "checkout",
+          "-b",
+          branch,
+          `origin/${baselineBranch}`
+        ]);
+        await execGit(cwd, ["push", "-u", "origin", branch]);
+      } catch (err) {
+        if (await localBranchExists(cwd, branch)) {
+          if (await getCurrentBranch(cwd) !== branch) {
+            await execGit(cwd, ["checkout", branch]);
+          }
+          console.log(`[apm] \u5206\u652F ${branch} \u5DF2\u5B58\u5728\uFF0C\u8DF3\u8FC7\u521B\u5EFA`);
+        } else {
+          throw err;
+        }
+      }
     }
   }
   console.log(`[apm] \u5DF2\u5C31\u7EEA\u5206\u652F ${branch}`);
@@ -1041,7 +1053,7 @@ async function handleInboundMessage(cfg, raw) {
   const messageId = msg.messageId;
   try {
     await runBranch(msg.sessionId, { cwd: msg.workdir });
-    await runPull(msg.sessionId, msg.workdir);
+    await runPull(msg.sessionId, workspaceApmDir(msg.workdir));
     await updateMessageStatus(cfg, messageId, "TYPING");
     await runCursorAgent(cfg, {
       messageId: msg.messageId,

package/package.json

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