ai-project-manage-cli 8.1.27 → 8.1.28

package/dist/index.js

@@ -1436,7 +1436,7 @@ function resolveHomeRepositoryAbsolutePaths(workdirInput, entries) {
 }
 
 // src/utils/git.ts
-import { execFile } from "child_process";
+import { execFile, spawn } from "child_process";
 import { dirname as dirname3, join as join8 } from "path";
 import { fileURLToPath as fileURLToPath3 } from "url";
 import { promisify } from "util";
@@ -1505,7 +1505,9 @@ async function execGit(cwd, args, quietOrOptions = false) {
     const e = err;
     if (e.killed || e.signal === "SIGTERM" || e.code === "ETIMEDOUT") {
       throw new Error(
-        `[apm] git ${args.join(" ")} \u8D85\u65F6\uFF08>${timeoutMs}ms\uFF09\uFF0C\u8BF7\u68C0\u67E5\u5230\u8FDC\u7A0B\u7684\u7F51\u7EDC/SSH\uFF1B\u53EF\u7A0D\u540E\u91CD\u8BD5`
+        `[apm] git ${args.join(
+          " "
+        )} \u8D85\u65F6\uFF08>${timeoutMs}ms\uFF09\uFF0C\u8BF7\u68C0\u67E5\u5230\u8FDC\u7A0B\u7684\u7F51\u7EDC/SSH\uFF1B\u53EF\u7A0D\u540E\u91CD\u8BD5`
       );
     }
     const detail = (e.stderr ?? e.message ?? String(err)).trim();
@@ -1528,33 +1530,67 @@ async function runGitScript(name, options) {
   const timeoutMs = options.timeoutMs ?? GIT_NETWORK_TIMEOUT_MS;
   const script = resolveGitScript(name);
   const args = [script, ...options.args ?? []];
-  try {
-    const { stdout, stderr } = await execFileAsync("bash", args, {
+  return new Promise((resolve5, reject) => {
+    const child = spawn("bash", args, {
       cwd: options.cwd,
       env: gitExecEnv(),
-      encoding: "utf8",
-      maxBuffer: 10 * 1024 * 1024,
-      timeout: timeoutMs,
-      killSignal: "SIGTERM"
+      stdio: ["ignore", "pipe", "pipe"]
     });
-    if (stdout.trim()) process.stdout.write(stdout);
-    if (stderr.trim()) process.stderr.write(stderr);
-    return true;
-  } catch (err) {
-    const e = err;
-    if (e.stdout?.trim()) process.stdout.write(e.stdout);
-    if (e.stderr?.trim()) process.stderr.write(e.stderr);
-    if (e.code === skipCode) {
-      return false;
-    }
-    if (e.killed || e.signal === "SIGTERM" || e.code === "ETIMEDOUT") {
-      throw new Error(
-        `[apm] ${name} \u8D85\u65F6\uFF08>${timeoutMs}ms\uFF09\uFF0C\u8BF7\u68C0\u67E5\u5230\u8FDC\u7A0B\u7684\u7F51\u7EDC/SSH\uFF1B\u53EF\u7A0D\u540E\u91CD\u8BD5`
-      );
-    }
-    const detail = (e.stderr ?? e.message ?? String(err)).trim();
-    throw new Error(`[apm] ${name} \u5931\u8D25${detail ? `: ${detail}` : ""}`);
-  }
+    let stderrBuf = "";
+    let settled = false;
+    let timedOut = false;
+    const timer = timeoutMs > 0 ? setTimeout(() => {
+      timedOut = true;
+      child.kill("SIGTERM");
+      const forceKill = setTimeout(() => {
+        child.kill("SIGKILL");
+      }, 2e3);
+      forceKill.unref();
+    }, timeoutMs) : null;
+    const finish = (fn) => {
+      if (settled) return;
+      settled = true;
+      if (timer) clearTimeout(timer);
+      fn();
+    };
+    child.stdout?.on("data", (chunk) => {
+      process.stdout.write(chunk);
+    });
+    child.stderr?.on("data", (chunk) => {
+      const text = typeof chunk === "string" ? chunk : chunk.toString("utf8");
+      stderrBuf += text;
+      process.stderr.write(chunk);
+    });
+    child.on("error", (err) => {
+      finish(() => reject(new Error(`[apm] ${name} \u542F\u52A8\u5931\u8D25: ${err.message}`)));
+    });
+    child.on("close", (code, signal) => {
+      finish(() => {
+        if (timedOut || signal === "SIGTERM" || signal === "SIGKILL") {
+          reject(
+            new Error(
+              `[apm] ${name} \u8D85\u65F6\uFF08>${timeoutMs}ms\uFF09\uFF0C\u8BF7\u770B\u4E0A\u65B9\u6700\u540E\u4E00\u6B65\u65E5\u5FD7\u5B9A\u4F4D\u5361\u70B9\uFF08\u591A\u4E3A ls-remote/fetch/push\uFF09\uFF1B\u68C0\u67E5\u5230\u8FDC\u7A0B\u7684\u7F51\u7EDC/SSH \u540E\u53EF\u7A0D\u540E\u91CD\u8BD5`
+            )
+          );
+          return;
+        }
+        if (code === skipCode) {
+          resolve5(false);
+          return;
+        }
+        if (code === 0) {
+          resolve5(true);
+          return;
+        }
+        const detail = stderrBuf.trim();
+        reject(
+          new Error(
+            `[apm] ${name} \u5931\u8D25${detail ? `: ${detail}` : code != null ? ` (exit ${code})` : ""}`
+          )
+        );
+      });
+    });
+  });
 }
 async function commitWorkingTreeIfDirty(cwd, message) {
   await ensureGitRepo(cwd);

package/dist/scripts/ensure_baseline.sh

@@ -6,8 +6,11 @@ set -euo pipefail
 
 baseline="${1:?用法: ensure_baseline.sh <baseline-branch>}"
 
+echo "[apm] ensure_baseline: fetch origin ${baseline} …"
 git fetch origin "$baseline"
+echo "[apm] ensure_baseline: ls-remote origin ${baseline} …"
 if git ls-remote --heads origin "$baseline" | grep -q .; then
+  echo "[apm] ensure_baseline: origin/${baseline} 已确认"
   exit 0
 fi
 

package/dist/scripts/ensure_feature_branch.sh

@@ -9,9 +9,12 @@ baseline="${2:?用法: ensure_feature_branch.sh <branch> <baseline-branch>}"
 SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
 
 git rev-parse --git-dir >/dev/null
+origin_url="$(git config --get remote.origin.url 2>/dev/null || true)"
+echo "[apm] ensure_feature_branch: branch=${branch} baseline=${baseline}${origin_url:+ origin=${origin_url}}"
 
 # 有未提交改动时先 stash（含 untracked），再切/建分支，避免污染目标分支工作区
 if [[ -n "$(git status --porcelain)" ]]; then
+  echo "[apm] ensure_feature_branch: stash 未提交改动 …"
   git stash push -u -m "apm: ensure ${branch}"
   echo "[apm] 已 stash 未提交改动，再确认分支 ${branch}"
 fi
@@ -20,16 +23,26 @@ current="$(git rev-parse --abbrev-ref HEAD)"
 if [[ "$current" == "$branch" ]]; then
   echo "[apm] 已在分支 ${branch}"
 else
+  echo "[apm] ensure_feature_branch: 当前 ${current} → 准备 ${branch}"
   bash "$SCRIPT_DIR/ensure_baseline.sh" "$baseline"
 
+  echo "[apm] ensure_feature_branch: ls-remote origin ${branch} …"
   if git ls-remote --heads origin "$branch" | grep -q .; then
+    echo "[apm] ensure_feature_branch: 远程已有 ${branch}，fetch + checkout …"
     git fetch origin "$branch"
     git checkout -B "$branch" "origin/${branch}"
   elif git show-ref --verify --quiet "refs/heads/${branch}"; then
+    echo "[apm] ensure_feature_branch: 本地已有 ${branch}，checkout …"
     git checkout "$branch"
     echo "[apm] 分支 ${branch} 已存在，跳过创建"
   else
+    # 先切到远程基线（便于 post-checkout 等 hook 装依赖），再基于 origin/<baseline> 建特性分支（不基于本地基线）
+    echo "[apm] ensure_feature_branch: 本地/远程均无 ${branch}，先切基线 origin/${baseline} …"
+    echo "[apm] ensure_feature_branch: fetch origin ${baseline} …"
     git fetch origin "$baseline"
+    echo "[apm] ensure_feature_branch: checkout -B ${baseline} origin/${baseline} …"
+    git checkout -B "$baseline" "origin/${baseline}"
+    echo "[apm] ensure_feature_branch: 基于 origin/${baseline} 创建 ${branch} …"
     set +e
     git checkout --no-track -b "$branch" "origin/${baseline}"
     create_status=$?
@@ -44,14 +57,19 @@ else
       else
         exit "$create_status"
       fi
+    else
+      echo "[apm] ensure_feature_branch: 已创建本地分支 ${branch}"
     fi
   fi
 fi
 
 # 本地已在目标分支时也要补推：上次 push 挂死/超时后常见「本地有、远端无」
+echo "[apm] ensure_feature_branch: 再次 ls-remote 确认远程是否已有 ${branch} …"
 if ! git ls-remote --heads origin "$branch" | grep -q .; then
   echo "[apm] 远程尚无 ${branch}，正在 push …"
   bash "$SCRIPT_DIR/push_code.sh" "$branch"
+else
+  echo "[apm] ensure_feature_branch: 远程已有 ${branch}，跳过 push"
 fi
 
 echo "[apm] 已就绪分支 ${branch}"

package/dist/scripts/push_code.sh

@@ -17,5 +17,8 @@ if ! git config --get remote.origin.url >/dev/null 2>&1; then
   exit 2
 fi
 
+origin_url="$(git config --get remote.origin.url)"
+echo "[apm] push: git push -u origin ${branch}（${origin_url}）…"
 # 显式 origin + -u：避免裸 git push 因 upstream 与当前分支名不一致失败
 git push -u origin "$branch"
+echo "[apm] push: 完成 ${branch}"

package/dist/worker-script.js

@@ -359,7 +359,7 @@ async function ensureWorkspaceApmDirForInit(cwd = resolveWorkdirPath()) {
 }
 
 // src/utils/git.ts
-import { execFile } from "child_process";
+import { execFile, spawn } from "child_process";
 import { dirname, join as join3 } from "path";
 import { fileURLToPath } from "url";
 import { promisify } from "util";
@@ -428,7 +428,9 @@ async function execGit(cwd, args, quietOrOptions = false) {
     const e = err;
     if (e.killed || e.signal === "SIGTERM" || e.code === "ETIMEDOUT") {
       throw new Error(
-        `[apm] git ${args.join(" ")} \u8D85\u65F6\uFF08>${timeoutMs}ms\uFF09\uFF0C\u8BF7\u68C0\u67E5\u5230\u8FDC\u7A0B\u7684\u7F51\u7EDC/SSH\uFF1B\u53EF\u7A0D\u540E\u91CD\u8BD5`
+        `[apm] git ${args.join(
+          " "
+        )} \u8D85\u65F6\uFF08>${timeoutMs}ms\uFF09\uFF0C\u8BF7\u68C0\u67E5\u5230\u8FDC\u7A0B\u7684\u7F51\u7EDC/SSH\uFF1B\u53EF\u7A0D\u540E\u91CD\u8BD5`
       );
     }
     const detail = (e.stderr ?? e.message ?? String(err)).trim();
@@ -458,33 +460,67 @@ async function runGitScript(name, options) {
   const timeoutMs = options.timeoutMs ?? GIT_NETWORK_TIMEOUT_MS;
   const script = resolveGitScript(name);
   const args = [script, ...options.args ?? []];
-  try {
-    const { stdout, stderr } = await execFileAsync("bash", args, {
+  return new Promise((resolve7, reject) => {
+    const child = spawn("bash", args, {
       cwd: options.cwd,
       env: gitExecEnv(),
-      encoding: "utf8",
-      maxBuffer: 10 * 1024 * 1024,
-      timeout: timeoutMs,
-      killSignal: "SIGTERM"
+      stdio: ["ignore", "pipe", "pipe"]
     });
-    if (stdout.trim()) process.stdout.write(stdout);
-    if (stderr.trim()) process.stderr.write(stderr);
-    return true;
-  } catch (err) {
-    const e = err;
-    if (e.stdout?.trim()) process.stdout.write(e.stdout);
-    if (e.stderr?.trim()) process.stderr.write(e.stderr);
-    if (e.code === skipCode) {
-      return false;
-    }
-    if (e.killed || e.signal === "SIGTERM" || e.code === "ETIMEDOUT") {
-      throw new Error(
-        `[apm] ${name} \u8D85\u65F6\uFF08>${timeoutMs}ms\uFF09\uFF0C\u8BF7\u68C0\u67E5\u5230\u8FDC\u7A0B\u7684\u7F51\u7EDC/SSH\uFF1B\u53EF\u7A0D\u540E\u91CD\u8BD5`
-      );
-    }
-    const detail = (e.stderr ?? e.message ?? String(err)).trim();
-    throw new Error(`[apm] ${name} \u5931\u8D25${detail ? `: ${detail}` : ""}`);
-  }
+    let stderrBuf = "";
+    let settled = false;
+    let timedOut = false;
+    const timer = timeoutMs > 0 ? setTimeout(() => {
+      timedOut = true;
+      child.kill("SIGTERM");
+      const forceKill = setTimeout(() => {
+        child.kill("SIGKILL");
+      }, 2e3);
+      forceKill.unref();
+    }, timeoutMs) : null;
+    const finish = (fn) => {
+      if (settled) return;
+      settled = true;
+      if (timer) clearTimeout(timer);
+      fn();
+    };
+    child.stdout?.on("data", (chunk) => {
+      process.stdout.write(chunk);
+    });
+    child.stderr?.on("data", (chunk) => {
+      const text = typeof chunk === "string" ? chunk : chunk.toString("utf8");
+      stderrBuf += text;
+      process.stderr.write(chunk);
+    });
+    child.on("error", (err) => {
+      finish(() => reject(new Error(`[apm] ${name} \u542F\u52A8\u5931\u8D25: ${err.message}`)));
+    });
+    child.on("close", (code, signal) => {
+      finish(() => {
+        if (timedOut || signal === "SIGTERM" || signal === "SIGKILL") {
+          reject(
+            new Error(
+              `[apm] ${name} \u8D85\u65F6\uFF08>${timeoutMs}ms\uFF09\uFF0C\u8BF7\u770B\u4E0A\u65B9\u6700\u540E\u4E00\u6B65\u65E5\u5FD7\u5B9A\u4F4D\u5361\u70B9\uFF08\u591A\u4E3A ls-remote/fetch/push\uFF09\uFF1B\u68C0\u67E5\u5230\u8FDC\u7A0B\u7684\u7F51\u7EDC/SSH \u540E\u53EF\u7A0D\u540E\u91CD\u8BD5`
+            )
+          );
+          return;
+        }
+        if (code === skipCode) {
+          resolve7(false);
+          return;
+        }
+        if (code === 0) {
+          resolve7(true);
+          return;
+        }
+        const detail = stderrBuf.trim();
+        reject(
+          new Error(
+            `[apm] ${name} \u5931\u8D25${detail ? `: ${detail}` : code != null ? ` (exit ${code})` : ""}`
+          )
+        );
+      });
+    });
+  });
 }
 async function branchHasChangesAgainstBase(cwd, baseBranch, headBranch) {
   return runGitScript("branch_has_changes.sh", {

package/package.json

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