ai-project-manage-cli 8.1.21 → 8.1.22

package/dist/scripts/branch_has_changes.sh

@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+# 特性分支相对基线是否有可合并改动（三方差异 base...head）。
+# 用法: branch_has_changes.sh <base-branch> <head-branch>
+# 退出码: 0 有改动；2 无改动；其它失败。
+set -euo pipefail
+
+base="${1:?用法: branch_has_changes.sh <base-branch> <head-branch>}"
+head="${2:?用法: branch_has_changes.sh <base-branch> <head-branch>}"
+
+base="${base#origin/}"
+head="${head#origin/}"
+# trim
+base="${base#"${base%%[![:space:]]*}"}"
+base="${base%"${base##*[![:space:]]}"}"
+head="${head#"${head%%[![:space:]]*}"}"
+head="${head%"${head##*[![:space:]]}"}"
+
+if [[ -z "$base" || -z "$head" ]]; then
+  exit 2
+fi
+
+git fetch origin "$base"
+
+head_ref="$head"
+set +e
+git fetch origin "$head" >/dev/null 2>&1
+git rev-parse --verify "origin/${head}" >/dev/null 2>&1
+fetch_ok=$?
+set -e
+if [[ $fetch_ok -eq 0 ]]; then
+  head_ref="origin/${head}"
+else
+  git rev-parse --verify "$head" >/dev/null
+fi
+
+base_ref="origin/${base}"
+ahead="$(git rev-list --count "${base_ref}..${head_ref}")"
+if [[ "${ahead:-0}" -le 0 ]]; then
+  exit 2
+fi
+
+set +e
+git diff --quiet "${base_ref}...${head_ref}"
+diff_status=$?
+set -e
+# diff --quiet：无差异 0，有差异 1
+if [[ $diff_status -eq 0 ]]; then
+  exit 2
+fi
+if [[ $diff_status -eq 1 ]]; then
+  exit 0
+fi
+exit "$diff_status"

package/dist/scripts/commit_if_dirty.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+# 工作区有未提交变更时 git add -A && commit；无变更则跳过。
+# 用法: commit_if_dirty.sh [commit-message]
+# 退出码: 0 已提交；2 跳过（无变更）；其它失败。
+set -euo pipefail
+
+message="${1:-}"
+
+git rev-parse --git-dir >/dev/null
+
+if [[ -z "$(git status --porcelain)" ]]; then
+  exit 2
+fi
+
+if [[ -z "$message" ]]; then
+  message="chore(apm): 同步工作区 ($(git rev-parse --abbrev-ref HEAD))"
+fi
+
+git add -A
+git commit -m "$message"
+echo "[apm] 已提交工作区变更: $message"

package/dist/scripts/ensure_baseline.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+# 拉取并确认远程存在基线分支 origin/<baseline>。
+# 用法: ensure_baseline.sh <baseline-branch>
+# 退出码: 0 成功；其它失败。
+set -euo pipefail
+
+baseline="${1:?用法: ensure_baseline.sh <baseline-branch>}"
+
+git fetch origin "$baseline"
+if git ls-remote --heads origin "$baseline" | grep -q .; then
+  exit 0
+fi
+
+echo "[apm] 远程不存在基线分支 origin/${baseline}，请确认仓库默认分支已推送到 origin" >&2
+exit 1

package/dist/scripts/ensure_feature_branch.sh

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+# 确保特性分支就绪：切到/创建 <branch>（基于 <baseline>），必要时补推远程。
+# 用法: ensure_feature_branch.sh <branch> <baseline-branch>
+# 退出码: 0 成功；其它失败。
+set -euo pipefail
+
+branch="${1:?用法: ensure_feature_branch.sh <branch> <baseline-branch>}"
+baseline="${2:?用法: ensure_feature_branch.sh <branch> <baseline-branch>}"
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+
+git rev-parse --git-dir >/dev/null
+
+current="$(git rev-parse --abbrev-ref HEAD)"
+if [[ "$current" == "$branch" ]]; then
+  echo "[apm] 已在分支 ${branch}"
+else
+  bash "$SCRIPT_DIR/ensure_baseline.sh" "$baseline"
+
+  if [[ -n "$(git status --porcelain)" ]]; then
+    git stash push -u -m "apm: switch to ${branch}"
+  fi
+
+  if git ls-remote --heads origin "$branch" | grep -q .; then
+    git fetch origin "$branch"
+    git checkout -B "$branch" "origin/${branch}"
+  elif git show-ref --verify --quiet "refs/heads/${branch}"; then
+    git checkout "$branch"
+    echo "[apm] 分支 ${branch} 已存在，跳过创建"
+  else
+    git fetch origin "$baseline"
+    set +e
+    git checkout --no-track -b "$branch" "origin/${baseline}"
+    create_status=$?
+    set -e
+    if [[ $create_status -ne 0 ]]; then
+      # 仅吞掉「并发创建导致本地已存在」
+      if git show-ref --verify --quiet "refs/heads/${branch}"; then
+        if [[ "$(git rev-parse --abbrev-ref HEAD)" != "$branch" ]]; then
+          git checkout "$branch"
+        fi
+        echo "[apm] 分支 ${branch} 已存在，跳过创建"
+      else
+        exit "$create_status"
+      fi
+    fi
+  fi
+fi
+
+# 本地已在目标分支时也要补推：上次 push 挂死/超时后常见「本地有、远端无」
+if ! git ls-remote --heads origin "$branch" | grep -q .; then
+  echo "[apm] 远程尚无 ${branch}，正在 push …"
+  bash "$SCRIPT_DIR/push_code.sh" "$branch"
+fi
+
+echo "[apm] 已就绪分支 ${branch}"

package/dist/scripts/push_code.sh

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+# 推送当前仓库到 origin，并设置 upstream。
+# 用法: push_code.sh [branch]
+#   省略 branch 时推送 HEAD（等价于 git push -u origin HEAD）。
+# 退出码: 0 已推送；2 跳过（非 git 仓 / 无 origin）；其它失败。
+set -euo pipefail
+
+branch="${1:-HEAD}"
+
+if ! git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
+  echo "[apm] 不是 git 仓库，跳过 push"
+  exit 2
+fi
+
+if ! git config --get remote.origin.url >/dev/null 2>&1; then
+  echo "[apm] 未配置 remote.origin，跳过 push"
+  exit 2
+fi
+
+# 显式 origin + -u：避免裸 git push 因 upstream 与当前分支名不一致失败
+git push -u origin "$branch"