Add task-card autoclose wiring: close subcommand, post-merge hook, gate reports
Why: 11 merged branches had left their task cards open (bookkeeping debt found on 2026-09-30); closure was manual and never triggered, so card status rotted after each merge. Evidence: dogfood run of `task.sh close --fold` closed and archived the 11 cards (previous commit); temp-repo matrix 33/33 PASS covering detection, pending-branch idempotence, dirty/no-fold refusals, post-merge auto-close on merge-type pulls, worktree guard, and the full lifecycle (closure PR merge archives cards on main). Impact: scripts/task.sh (+close, precheck [cards] report, finish-tail trigger), scripts/hooks/post-merge (new), Makefile (+task-close target, setup chmod), AGENTS.md rule; archive fixes correct PR links missed by the first dogfood run; no module or gitlink change. Refs: task card feature/card-autoclose-r1
This commit is contained in:
@@ -0,0 +1,15 @@
|
||||
#!/usr/bin/env bash
|
||||
# 本地钩子（post-merge）：merge 型 pull/merge 落地后自动闭合已合入任务卡（ff-only 不触发
|
||||
# 本钩子——由 task-finish 收尾与 precheck [cards] 报告兜底）。
|
||||
# 触发条件收紧到"主检出 + 集成分支 main"——任务 worktree 里 task-sync 的 merge 不触发，
|
||||
# 防止把卡片闭合混进任务分支现场。失败只警告，绝不阻断 pull。
|
||||
# 注意：task.sh close 在主检出会另建 feature/card-close-* 分支提交（集成分支不直推），
|
||||
# 结束后切回 main；PR 由所有者合入。
|
||||
common=$(git rev-parse --git-common-dir) && common=$(cd "$common" 2>/dev/null && pwd) || exit 0
|
||||
mainrepo=$(dirname "$common")
|
||||
[ "$mainrepo" = "$PWD" ] || exit 0
|
||||
[ "$(git rev-parse --abbrev-ref HEAD)" = "main" ] || exit 0
|
||||
[ -f "$mainrepo/scripts/task.sh" ] || exit 0
|
||||
bash "$mainrepo/scripts/task.sh" close \
|
||||
|| echo "[warn] post-merge 卡片自动闭合失败——在主检出手动运行 make task-close" >&2
|
||||
exit 0
|
||||
+138
-2
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env bash
|
||||
# 任务启动门禁：precheck / start / sync / finish（配套 Makefile 同名目标）。
|
||||
# 任务启动门禁：precheck / start / sync / close / finish（配套 Makefile 同名目标）。
|
||||
# 规范依据：collaboration.md 共同基线与同步节点、治理清理；delivery.md §1/§5。
|
||||
set -euo pipefail
|
||||
|
||||
@@ -31,6 +31,17 @@ cmd_precheck() {
|
||||
[ "${sub_uninit:-0}" -gt 0 ] && echo "[warn] ${sub_uninit} 个子模块未初始化——构建/测试前需物化（不阻断写入）"
|
||||
echo "[worktrees] linked=${wt}"
|
||||
[ -n "$merged" ] && echo "[recycle] merged un-recycled branches: $(echo $merged)"
|
||||
local open_cards="" pc pb pst
|
||||
for pc in .task/*.md; do
|
||||
[ -f "$pc" ] || continue
|
||||
pb=$(card_of_branch "$pc"); [ -n "$pb" ] || continue
|
||||
pst=$(card_status "$pc"); case "$pst" in 已完成*) continue ;; esac
|
||||
card_pending "${pc##*/}" && continue
|
||||
if git log --merges --format='%s' "origin/${TARGET_BRANCH}" 2>/dev/null | grep -qF " from $pb into ${TARGET_BRANCH}"; then
|
||||
open_cards="${open_cards} ${pc##*/}"
|
||||
fi
|
||||
done
|
||||
[ -n "$open_cards" ] && echo "[cards] 已合入未闭合任务卡:$(echo $open_cards)——make task-close 回填归档（主检出运行）"
|
||||
echo "[required-reading] core/baseline.md, workflows/delivery.md §1$([ "$dirty" -gt 0 ] && echo ", standards/collaboration.md（树脏=他人或未收尾现场，不得写入）")"
|
||||
echo "[R0] $(echo "$rmain" | cut -c1-10)（完整：$rmain）"
|
||||
if [ "$dirty" -gt 0 ] || [ "${sub_drift:-0}" -gt 0 ]; then
|
||||
@@ -110,6 +121,127 @@ cmd_sync() {
|
||||
echo "[next] 跑正式验收（make test 等），证据写入任务卡"
|
||||
}
|
||||
|
||||
# ---- 卡片闭合（防欠账）----
|
||||
# 依据：delivery.md §5 治理清理；机制化 2026-09-30 治理缺口（11 张已合入卡片未闭合）。
|
||||
# 检测 .task/*.md 中"分支已合入 origin/<target> 但状态非已完成"的卡片：回填状态、主记录
|
||||
# （PR 链接+合并 SHA）与闭合记录，并 git mv 到 .task/archive/。变更落点：主检出运行→
|
||||
# 新建 feature/card-close-* 分支推送（集成分支受保护，不直推）；任务分支内运行须 --fold
|
||||
# （随当前任务 PR 合入）。合并判定用合并提交主题（分支删除后仍可追溯），不依赖分支存活。
|
||||
|
||||
card_of_branch() { sed -n 's/^- 工作区：.*分支：\([A-Za-z0-9._/-]\+\).*/\1/p' "$1" | head -1; }
|
||||
card_status() { sed -n 's/^.*；状态：\([^；]*\).*/\1/p' "$1" | head -1; }
|
||||
card_merge() { # $1=branch → "sha|subject"（该分支合入 origin/<target> 的合并提交）
|
||||
git log --merges --format='%H|%s' "origin/${TARGET_BRANCH}" 2>/dev/null \
|
||||
| grep -F " from $1 into ${TARGET_BRANCH}" | head -1
|
||||
}
|
||||
card_pending() { # $1=卡片文件名——闭合是否已在某 origin/feature/card-close-* 分支待合入
|
||||
local cb
|
||||
for cb in $(git for-each-ref --format='%(refname:short)' "refs/remotes/origin/feature/card-close-*"); do
|
||||
git cat-file -e "${cb}:.task/archive/$1" 2>/dev/null && return 0
|
||||
done
|
||||
return 1
|
||||
}
|
||||
card_backfill() { # $1=card $2=pr_num $3=merge_sha $4=merge_subject $5=web_base（原地改写）
|
||||
python3 - "$1" "$2" "$3" "$4" "$5" <<'PY'
|
||||
import re, sys
|
||||
path, pr, sha, subject, base = sys.argv[1:6]
|
||||
s = open(path, encoding='utf-8').read()
|
||||
s = re.sub(r'状态：[^；\n]*', '状态：已完成（回填）', s, count=1)
|
||||
m = re.search(r'任务主记录：([^；\n]*)', s)
|
||||
if m and 'pulls/' not in m.group(1):
|
||||
s = s.replace(m.group(1), f'PR #{pr} {base}/pulls/{pr}（merge {sha[:10]}）', 1)
|
||||
s = s.replace('## 结果与验证（完成后填写）', '## 结果与验证', 1)
|
||||
s = s.rstrip('\n') + f'''
|
||||
|
||||
## 闭合记录（card-autoclose 回填）
|
||||
|
||||
- 依据：merge {sha}（PR #{pr}）已包含于 origin/main，分支成果已落盘；本段为合入后回填。
|
||||
- 合并主题：{subject}
|
||||
- 归档：随闭合移入 .task/archive/；任务执行期的过程证据见原任务记录与 PR。
|
||||
'''
|
||||
open(path, 'w', encoding='utf-8').write(s)
|
||||
PY
|
||||
}
|
||||
|
||||
cmd_close() {
|
||||
need_repo
|
||||
local fold=0
|
||||
[ "${1:-}" = "--fold" ] && fold=1
|
||||
git fetch -q origin "${TARGET_BRANCH}" 2>/dev/null || true
|
||||
# 默认值取远端通告的 Web 面（git push 输出的 PR 建议链接）；可用 TASK_CARD_WEB_BASE 覆盖
|
||||
local web_base="${TASK_CARD_WEB_BASE:-https://git-panel.u1680832.nyat.app:30319}"
|
||||
local url owner repo
|
||||
url=$(git remote get-url origin); url="${url%.git}"
|
||||
repo=$(basename "$url"); owner=$(basename "$(dirname "$url")")
|
||||
local branch c b st m cards=""
|
||||
branch=$(git rev-parse --abbrev-ref HEAD)
|
||||
for c in .task/*.md; do
|
||||
[ -f "$c" ] || continue
|
||||
b=$(card_of_branch "$c"); [ -n "$b" ] || continue
|
||||
st=$(card_status "$c"); case "$st" in 已完成*) continue ;; esac
|
||||
if card_pending "${c##*/}"; then
|
||||
echo "[close] ${c##*/} 已有待合入的闭合分支，跳过（等其 PR 合入）"
|
||||
continue
|
||||
fi
|
||||
m=$(card_merge "$b") || m=""
|
||||
[ -n "$m" ] || continue
|
||||
cards="$cards
|
||||
$c|$b|$m"
|
||||
done
|
||||
[ -n "$cards" ] || { echo "[close] 无已合入未闭合的任务卡"; exit 0; }
|
||||
# 落点：主检出→feature/card-close-* 分支（提交过 pre-commit 分支闸）；任务分支须显式 --fold
|
||||
local newbranch=""
|
||||
if [ "$branch" = "${TARGET_BRANCH}" ]; then
|
||||
[ -z "$(git status --porcelain | grep -v '^.. \.zcode/' || true)" ] || die "主检出树脏——先收尾再 close（防混入未提交现场）"
|
||||
newbranch="feature/card-close-$(date -u +%Y%m%d-%H%M%SZ)"
|
||||
git rev-parse --verify -q "refs/heads/${newbranch}" >/dev/null && die "分支已存在：${newbranch}"
|
||||
git checkout -q -b "$newbranch" "origin/${TARGET_BRANCH}"
|
||||
elif [ "$fold" != "1" ]; then
|
||||
die "close 在任务分支内须加 --fold（并入当前任务 PR）；或到主检出运行（将建 feature/card-close-* 分支+PR）"
|
||||
fi
|
||||
local n=0 sha subject pr closed_list=""
|
||||
while IFS='|' read -r c b m; do
|
||||
[ -n "$c" ] || continue
|
||||
sha="${m%%|*}"; subject="${m#*|}"
|
||||
pr=$(printf '%s' "$subject" | sed -n 's/.*(#\([0-9]\+\)) from.*/\1/p')
|
||||
[ -n "$pr" ] || pr=unknown
|
||||
card_backfill "$c" "$pr" "$sha" "$subject" "${web_base}/${owner}/${repo}"
|
||||
mkdir -p .task/archive
|
||||
git mv "$c" ".task/archive/${c##*/}"
|
||||
closed_list="$closed_list ${c##*/}(PR#${pr})"
|
||||
n=$((n+1))
|
||||
done <<EOF
|
||||
$cards
|
||||
EOF
|
||||
local msg; msg=$(mktemp)
|
||||
{ echo "Close ${n} merged task card(s) and archive them"
|
||||
echo
|
||||
echo "Why: branches merged into ${TARGET_BRANCH} had left their task cards open; backfill status and archive to prevent bookkeeping debt."
|
||||
echo "Evidence: $(echo $closed_list) — merges verified via git log --merges against origin/${TARGET_BRANCH}."
|
||||
echo "Impact: .task/*.md moved to .task/archive/ with status backfilled; no code or submodule change."
|
||||
echo "Refs: task.sh close (card-autoclose-r1)"
|
||||
} > "$msg"
|
||||
git add .task
|
||||
git commit -q -F "$msg"; rm -f "$msg"
|
||||
git push -q -u origin HEAD
|
||||
local headbr pr_url=""
|
||||
headbr=$(git rev-parse --abbrev-ref HEAD)
|
||||
if [ -n "${GITEA_TOKEN:-}" ]; then
|
||||
local resp
|
||||
resp=$(curl -sS -X POST -H "Authorization: token ${GITEA_TOKEN}" -H 'Content-Type: application/json' \
|
||||
"${web_base}/api/v1/repos/${owner}/${repo}/pulls" \
|
||||
-d "{\"head\":\"${headbr}\",\"base\":\"${TARGET_BRANCH}\",\"title\":\"Close merged task cards (${headbr})\",\"body\":\"Auto-generated by task.sh close; see commit message for evidence.\"}" 2>/dev/null || true)
|
||||
pr_url=$(printf '%s' "$resp" | python3 -c 'import json,sys; print(json.load(sys.stdin).get("html_url",""))' 2>/dev/null || true)
|
||||
fi
|
||||
if [ -n "$newbranch" ]; then git checkout -q "${TARGET_BRANCH}"; fi
|
||||
if [ -n "$pr_url" ]; then
|
||||
echo "[pr] ${pr_url}（合入权在所有者）"
|
||||
else
|
||||
echo "[next] 建 PR：${web_base}/${owner}/${repo}/pulls/new?head=${headbr}（合入权在所有者）"
|
||||
fi
|
||||
echo "[closed] ${n} 张已合入卡片已回填归档，提交于 ${headbr} 并推送"
|
||||
}
|
||||
|
||||
cmd_finish() {
|
||||
need_repo
|
||||
local abandon="${1:-}"
|
||||
@@ -140,12 +272,16 @@ cmd_finish() {
|
||||
git -C "$mainrepo" worktree prune
|
||||
git push -q --delete origin "$branch" 2>/dev/null || true
|
||||
echo "[recycled] worktree 与分支 ${branch} 已回收（本地+远端，$(date -u +%FT%TZ)）"
|
||||
# 合入成功→自动闭合任务卡（含本任务卡；经 feature/card-close-* 分支+PR，合入权在所有者）
|
||||
( cd "$mainrepo" && bash scripts/task.sh close ) \
|
||||
|| echo "[next] 卡片自动闭合未完成——在主检出运行 make task-close"
|
||||
}
|
||||
|
||||
case "${1:-}" in
|
||||
precheck) shift; cmd_precheck "$@" ;;
|
||||
start) shift; cmd_start "$@" ;;
|
||||
sync) shift; cmd_sync "$@" ;;
|
||||
close) shift; cmd_close "$@" ;;
|
||||
finish) shift; cmd_finish "$@" ;;
|
||||
*) echo "usage: task.sh <precheck|start|sync|finish> [args]"; exit 2 ;;
|
||||
*) echo "usage: task.sh <precheck|start|sync|close|finish> [args]"; exit 2 ;;
|
||||
esac
|
||||
|
||||
Reference in New Issue
Block a user