56 lines
4.4 KiB
Bash
Executable File
56 lines
4.4 KiB
Bash
Executable File
#!/usr/bin/env bash
|
||
# 本地 → 机器 的唯一同步入口。带"远端被人直接改过"的守卫,防止两个会话互相覆盖。
|
||
# scripts/sync.sh 推代码(harness/ agent/ export/ scripts/ bin/ registry/ config.yaml *.md),先查远端是否被动过
|
||
# scripts/sync.sh --pull 把远端的 registry/models.csv 等"在机器上生成的 registry 文件"拉回本地
|
||
# scripts/sync.sh --force 远端有未知改动也照推(会覆盖!只在你确认那些改动已经进本地时用)
|
||
# 规则(CONTRACT.md §12):只在本地改、git commit、sync;不在机器上直接改代码。远端改动会让下一次 sync 拒绝。
|
||
set -euo pipefail
|
||
HERE="$(cd "$(dirname "$0")/.." && pwd)"; cd "$HERE"
|
||
REMOTE="${BENCH_REMOTE:-ming01.wang@120.48.151.164}"
|
||
RDIR="${BENCH_REMOTE_DIR:-/mnt/data/ming01.wang/model-compile-hbdk/bench}"
|
||
STAMP=".sync/last_pushed.md5"
|
||
# 模式带单引号:本地用 eval 展开,远端在 ssh 的双引号里由远端 shell 展开——两边都不会被本地 glob 吃掉(踩过:*.md 被展开成 README.md)
|
||
# *.js 与 VERSION 是 2026-09-15 补上的:guard-core.js / guard-core.test.js / dump_tools.js / agent/VERSION
|
||
# 原来不在 TRACK 里 —— 判定核心本身游离在同步与"远端被改过"守卫之外,等于守卫有个洞。
|
||
TRACK="-name '*.py' -o -name '*.ts' -o -name '*.js' -o -name '*.mjs' -o -name '*.md' -o -name '*.yaml' -o -name '*.sh' -o -name '*.tmpl' -o -name '*.csv' -o -name VERSION -o -name bench"
|
||
PRUNE="-path ./runs -o -path ./data -o -path ./cache -o -path ./state -o -path ./datasets -o -path ./reports -o -name __pycache__ -o -path ./.sync -o -path ./.git"
|
||
FORCE=0; PULL=0
|
||
for a in "$@"; do case "$a" in --force) FORCE=1;; --pull) PULL=1;; *) echo "unknown $a"; exit 2;; esac; done
|
||
|
||
manifest_local() { eval "find . \\( $PRUNE \\) -prune -o -type f \\( $TRACK \\) -print" | sort | xargs md5sum; }
|
||
manifest_remote() { ssh -o BatchMode=yes -o ConnectTimeout=10 "$REMOTE" "cd $RDIR && find . \\( $PRUNE \\) -prune -o -type f \\( $TRACK \\) -print | sort | xargs md5sum"; }
|
||
|
||
if [ $PULL = 1 ]; then
|
||
rsync -az "$REMOTE:$RDIR/registry/models.csv" registry/models.csv
|
||
echo "pulled registry/models.csv"; exit 0
|
||
fi
|
||
|
||
mkdir -p .sync
|
||
if [ -f "$STAMP" ] && [ $FORCE = 0 ]; then
|
||
echo "检查远端是否被直接改过…"
|
||
manifest_remote > .sync/remote_now.md5
|
||
# 远端现在 vs 上次推送时:不同 = 有人在机器上直接改了(或另一个会话推过)
|
||
if ! diff -q <(sort "$STAMP") <(sort .sync/remote_now.md5) >/dev/null; then
|
||
echo "!! 远端自上次 sync 后有改动,拒绝推送。差异:"
|
||
diff <(sort "$STAMP") <(sort .sync/remote_now.md5) | grep '^[<>]' | awk '{print $1, $3}' | sort -u -k2 | head -30
|
||
echo "先把这些改动合进本地(scp 回来 / 对比),或者确认可以覆盖后 --force。"
|
||
exit 3
|
||
fi
|
||
fi
|
||
|
||
if git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
|
||
if ! git diff --quiet || ! git diff --cached --quiet || [ -n "$(git ls-files --others --exclude-standard)" ]; then
|
||
git add -A && git commit -qm "sync $(date +%F_%T) $(whoami)@$(hostname -s)" && echo "committed $(git rev-parse --short HEAD)"
|
||
fi
|
||
fi
|
||
find harness agent export scripts -name __pycache__ -type d -prune -exec rm -rf {} + 2>/dev/null || true
|
||
# 注意:rsync 多个源到一个目录会把 registry/x.yaml 摊平到 $RDIR/x.yaml(踩过),所以整目录同步 + 排除 models.csv
|
||
# 踩过两次:--delete-excluded 会把"被排除的文件"从远端删掉 → registry/models.csv 两次消失。必须用 --delete(排除项在远端受保护)。
|
||
rsync -az --delete --exclude '__pycache__' --exclude '.sync' --exclude '.git' --exclude 'registry/models.csv' --exclude 'registry/models_源清单.xlsx' \
|
||
harness agent export scripts bin registry config.yaml CONTRACT.md HANDBOOK.md CONTINUE.md REPORT-codex.md README.md requirements.txt "$REMOTE:$RDIR/" 2>&1 | tail -1
|
||
# registry/models.csv 是机器上生成的(excel_to_models),只在 --pull 方向走
|
||
# 只在代码目录里清 __pycache__:find 整棵树会扫进 runs/(JuiceFS 上 190 个 job 目录,几分钟)
|
||
ssh -o BatchMode=yes "$REMOTE" "cd $RDIR && chmod +x bin/bench scripts/*.sh agent/*.sh 2>/dev/null; find harness agent export scripts -name __pycache__ -type d -prune -exec rm -rf {} + 2>/dev/null; true"
|
||
manifest_remote > "$STAMP"
|
||
echo "synced → $REMOTE:$RDIR ($(wc -l < "$STAMP") tracked files; stamp saved)"
|