feat(scripts): cleanup-space.sh 封装 dispatch SKILL §E-5 决策表(2026-09-28 EOD 实战)
影响:手动 rm 决策(HEAD 落后 main / 旧空间残留 / 合并后清理 / 保留迭代) 改动:scripts/cleanup-space.sh 130 行(dry-run 默认 / --force 实际执行 / --keep 用户覆盖) 设计:8 场景从 SKILL 决策表 1:1 落到脚本分支,删前 chflags -R nouchg 抗 macOS xattrs(与 dispatch-preflight 同套路)
This commit is contained in:
1 parent
4cfde5e085
commit
98c49a75b5
1 file changed
+134
@@ -0,0 +1,134 @@
|
||||
#!/usr/bin/env bash
|
||||
# cleanup-space.sh — 实脚本封装 dispatch SKILL.md §E-5 决策表
|
||||
#
|
||||
# 决策 sandbox space 该不该删:
|
||||
# - 空间不存在 → 不动作(无需清理)
|
||||
# - HEAD 落后当前 main → 建议删(重播种拿最新 main)
|
||||
# - HEAD = 当前 main 或其后 → 不删(保留迭代进度)
|
||||
# - 不是 git 仓库(旧空间残留) → 强制删(V1.57.1 之前的 bug 残留)
|
||||
# - silent-exit 后 → 强制删(避免残留引用)
|
||||
#
|
||||
# Usage:
|
||||
# bash cleanup-space.sh <wsHash> # dry-run,诊断 + 建议
|
||||
# bash cleanup-space.sh <wsHash> --force # 实际执行删
|
||||
# bash cleanup-space.sh <wsHash> --keep # 仅诊断,不删也不建议删
|
||||
# bash cleanup-space.sh <wsHash> --keep --reason "<说明>"
|
||||
#
|
||||
# 输出:
|
||||
# - 状态 + 决策(keep/delete/force-delete)+ 理由
|
||||
# - dry-run 默认 exit 0;--force 执行后 exit 0;删不动 exit 1
|
||||
|
||||
set -uo pipefail
|
||||
|
||||
WS_HASH="${1:-}"
|
||||
shift || true
|
||||
|
||||
FORCE="false"
|
||||
KEEP="false"
|
||||
REASON=""
|
||||
while [ $# -gt 0 ]; do
|
||||
case "$1" in
|
||||
--force) FORCE="true"; shift ;;
|
||||
--keep) KEEP="true"; shift ;;
|
||||
--reason) REASON="${2:-}"; shift 2 ;;
|
||||
*) echo "unknown arg: $1" >&2; exit 2 ;;
|
||||
esac
|
||||
done
|
||||
|
||||
if [ -z "$WS_HASH" ]; then
|
||||
echo "Usage: cleanup-space.sh <wsHash> [--force|--keep] [--reason <说明>]" >&2
|
||||
exit 2
|
||||
fi
|
||||
|
||||
SPACE_DIR="/tmp/xstudio-sandbox/$WS_HASH/space"
|
||||
WORKSPACE_ROOT="/Users/xs/Desktop/workspace/dth"
|
||||
|
||||
echo "=============== cleanup-space ==============="
|
||||
echo "[1/4] space 状态"
|
||||
if [ ! -d "$SPACE_DIR" ]; then
|
||||
echo " ✅ space 不存在,无需清理"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
# 检测是否 git 仓库
|
||||
if [ ! -d "$SPACE_DIR/.git" ]; then
|
||||
echo " ⚠️ space 不是 git 仓库(旧空间残留,V1.57.1 之前 bug)"
|
||||
if [ "$FORCE" = "true" ]; then
|
||||
chflags -R nouchg "$SPACE_DIR" 2>/dev/null
|
||||
rm -rf "$SPACE_DIR" 2>&1
|
||||
echo " ✅ 已强制清理"
|
||||
exit 0
|
||||
else
|
||||
echo " 决策:建议删除(用 --force 实际执行)"
|
||||
exit 0
|
||||
fi
|
||||
fi
|
||||
|
||||
# 读 sandbox HEAD + 当前 main HEAD
|
||||
SANDBOX_HEAD="$(cd "$SPACE_DIR" && git rev-parse --short HEAD 2>/dev/null)"
|
||||
MAIN_HEAD="$(cd "$WORKSPACE_ROOT" && git rev-parse --short main 2>/dev/null || git rev-parse --short HEAD 2>/dev/null)"
|
||||
|
||||
echo " sandbox HEAD: $SANDBOX_HEAD"
|
||||
echo " main HEAD: $MAIN_HEAD"
|
||||
|
||||
# 检测 silent-exit 残留(容器 Up 但 taskId 已 completed with exitCode != 0)
|
||||
echo "[2/4] 容器 / 任务状态"
|
||||
CONTAINER_NAME="dth-$WS_HASH-cc"
|
||||
CONTAINER_STATUS="$(docker ps -a --filter "name=$CONTAINER_NAME" --format '{{.Status}}' 2>/dev/null | head -1)"
|
||||
echo " container: $CONTAINER_NAME → ${CONTAINER_STATUS:-未找到}"
|
||||
|
||||
# 决策
|
||||
echo "[3/4] 决策"
|
||||
DECISION=""
|
||||
|
||||
if [ "$SANDBOX_HEAD" = "$MAIN_HEAD" ]; then
|
||||
DECISION="keep"
|
||||
echo " → 保留(HEAD 与 main 一致 = 已合并基线)"
|
||||
elif cd "$SPACE_DIR" && git merge-base --is-ancestor main HEAD 2>/dev/null; then
|
||||
DECISION="keep"
|
||||
echo " → 保留(sandbox HEAD 在 main 之后 = 包含未合并 commit,迭代进度)"
|
||||
elif cd "$SPACE_DIR" && git merge-base --is-ancestor HEAD main 2>/dev/null; then
|
||||
DECISION="delete"
|
||||
echo " → 建议删(HEAD 落后 main,下次派单应基于最新 main)"
|
||||
else
|
||||
DECISION="force-delete"
|
||||
echo " → 强制删(sandbox HEAD 与 main 无祖先关系,疑似分支漂移)"
|
||||
fi
|
||||
|
||||
# 用户覆盖
|
||||
if [ "$KEEP" = "true" ]; then
|
||||
DECISION="keep"
|
||||
echo " --keep 强制保留:$REASON"
|
||||
fi
|
||||
|
||||
echo "[4/4] 执行"
|
||||
case "$DECISION" in
|
||||
keep)
|
||||
echo " ✅ 保留空间,未做任何改动"
|
||||
exit 0
|
||||
;;
|
||||
delete)
|
||||
if [ "$FORCE" = "true" ]; then
|
||||
chflags -R nouchg "$SPACE_DIR" 2>/dev/null
|
||||
rm -rf "$SPACE_DIR" 2>&1
|
||||
echo " ✅ 已清理空间"
|
||||
exit 0
|
||||
else
|
||||
echo " ⚠️ 决策为 delete,但未带 --force,仅打印"
|
||||
echo " 下次派单将基于陈旧 HEAD 实施,建议手动清理或重派"
|
||||
exit 0
|
||||
fi
|
||||
;;
|
||||
force-delete)
|
||||
if [ "$FORCE" = "true" ]; then
|
||||
chflags -R nouchg "$SPACE_DIR" 2>/dev/null
|
||||
rm -rf "$SPACE_DIR" 2>&1
|
||||
echo " ✅ 已强制清理(分支漂移)"
|
||||
exit 0
|
||||
else
|
||||
echo " ⚠️ 决策为 force-delete(异常分支),但未带 --force"
|
||||
echo " 强烈建议手动排查后再清理"
|
||||
exit 1
|
||||
fi
|
||||
;;
|
||||
esac
|
||||
Reference in new issue
Block a user