Merge origin/main into feature/rdm-increment-settings-duties

scripts/svc.sh

@@ -1435,8 +1435,9 @@ svc_launch_serve() {
 }
 
 # svc_lifecycle_child ACTION [extra args...]：用清空的环境拉起本脚本的
-# __lifecycle。白名单：PATH/HOME/USER/LOGNAME/LANG/LC_*/TZ/TMPDIR、代理、SVC_*。
-# 从不传入 AGENT_SYSTEM_*。
+# __lifecycle。白名单：PATH/HOME/USER/LOGNAME/LANG/LC_*/TZ/TMPDIR、代理、SVC_*、
+# GIT_CONFIG_*（运行器把 SSH pin 改写成受信 HTTPS，token 只在环境里）。
+# 从不传入 AGENT_SYSTEM_*。serve 仍是 env -i，不继承这些变量。
 svc_lifecycle_child() {
   local -a args=(env -i "PATH=${PATH:-/usr/bin:/bin}" "HOME=${HOME:-/tmp}"
     "USER=${USER:-}" "LOGNAME=${LOGNAME:-${USER:-}}" "LANG=${LANG:-C.UTF-8}"
@@ -1450,7 +1451,7 @@ svc_lifecycle_child() {
   while IFS= read -r k; do
     [ -n "$k" ] || continue
     args+=("$k=${!k}")
-  done < <(compgen -e | grep -E '^(SVC_|LC_)' || true)
+  done < <(compgen -e | grep -E '^(SVC_|LC_|GIT_CONFIG_)' || true)
   if [ -n "${RDM_DISABLE_EXEC_TOOLS:-}" ]; then
     args+=("RDM_DISABLE_EXEC_TOOLS=$RDM_DISABLE_EXEC_TOOLS")
   fi
@@ -3364,7 +3365,6 @@ static_do_deploy() {
       wt="$(materialize_dev_commit "$SRC_FULL" "$SRC_SHA" frontend)" \
         || { hist_event deploy fail "$(read_pid)" "物化/构建失败（$SRC_LABEL）"; return 1; }
       src_dist="$wt/modules/frontend/dist"
-      recycle_worktree "$SRC_SHA"
       ;;
     release)
       c_err "[$ENV_NAME] release 制品内嵌前端（无独立 dist）；static 请用 --from dev|local 或 --dir"
@@ -3378,10 +3378,20 @@ static_do_deploy() {
       return 1
       ;;
   esac
-  [ -d "$src_dist" ] || { c_err "[$ENV_NAME] 前端产物缺失：$src_dist"; hist_event deploy fail "$(read_pid)" "dist 缺失"; return 1; }
+  if [ ! -d "$src_dist" ]; then
+    [ "$SRC_KINDSRC" = dev ] && recycle_worktree "$SRC_SHA"
+    c_err "[$ENV_NAME] 前端产物缺失：$src_dist"
+    hist_event deploy fail "$(read_pid)" "dist 缺失"
+    return 1
+  fi
   mkdir -p "$ENV_DIR"
   rm -rf "${ENV_DIR:?}/htdocs"
-  cp -r "$src_dist" "$ENV_DIR/htdocs" || { hist_event deploy fail "$(read_pid)" "dist 复制失败"; return 1; }
+  cp -r "$src_dist" "$ENV_DIR/htdocs" || {
+    [ "$SRC_KINDSRC" = dev ] && recycle_worktree "$SRC_SHA"
+    hist_event deploy fail "$(read_pid)" "dist 复制失败"
+    return 1
+  }
+  [ "$SRC_KINDSRC" = dev ] && recycle_worktree "$SRC_SHA"
   write_static_reg "$ENV_DIR/htdocs"
   c_ok "[$ENV_NAME] 前端产物就位：$ENV_DIR/htdocs（源 $SRC_LABEL）"
   hist_event deploy ok "$(read_pid)" "from=$SRC_LABEL"