diff --git a/skills/auto-tmux/AGENTS.md b/skills/auto-tmux/AGENTS.md index a1d4aba..9302d27 100644 --- a/skills/auto-tmux/AGENTS.md +++ b/skills/auto-tmux/AGENTS.md @@ -17,6 +17,7 @@ skills/auto-tmux/ │ ├── swarm-brief.sh │ ├── swarm-watch.sh │ ├── swarm-archive.sh +│ ├── swarm-board.sh │ ├── safety-check.sh │ ├── render-swarm-prompt.sh │ ├── swarm-dispatch.sh @@ -45,6 +46,7 @@ skills/auto-tmux/ - `scripts/swarm-brief.sh` 是只读交接层，汇总 doctor/topology/scan/report 形成上下文快照。 - `scripts/swarm-watch.sh` 是有限轮次巡检层，按间隔采集 pane 输出与 swarm report。 - `scripts/swarm-archive.sh` 是归档层，打包 brief、snapshot 和 swarm state 供复盘交接。 +- `scripts/swarm-board.sh` 是看板层，将任务、依赖、锁和状态日志渲染为 Markdown。 - `scripts/safety-check.sh` 是安全预检层，检查待发送 payload 的危险命令、敏感信息和大小。 - `scripts/render-swarm-prompt.sh` 是提示词渲染层，生成 commander/worker/reviewer 协议文本。 - `scripts/swarm-dispatch.sh` 是提示词下发层，默认写文件，显式 `--send` 后才发送到 pane。 @@ -57,4 +59,4 @@ skills/auto-tmux/ - 上游来源：`tools/external/.tmux` 与 `tools/external/tmux`。 - 下游使用：`SKILL.md` 和 `references/` 中的命令示例。 - 验证入口：`skills/auto-skill/scripts/validate-skill.sh skills/auto-tmux --strict`。 -- 脚本验证：`skills/auto-tmux/scripts/validate-auto-tmux.sh`、`bash -n skills/auto-tmux/scripts/auto-tmux.sh`、`bash -n skills/auto-tmux/scripts/swarm-state.sh`、`bash -n skills/auto-tmux/scripts/swarm-brief.sh`、`bash -n skills/auto-tmux/scripts/swarm-watch.sh`、`bash -n skills/auto-tmux/scripts/swarm-archive.sh`、`bash -n skills/auto-tmux/scripts/safety-check.sh`、`bash -n skills/auto-tmux/scripts/render-swarm-prompt.sh`、`bash -n skills/auto-tmux/scripts/swarm-dispatch.sh`、`skills/auto-tmux/scripts/auto-tmux-smoke-test.sh`。 +- 脚本验证：`skills/auto-tmux/scripts/validate-auto-tmux.sh`、`bash -n skills/auto-tmux/scripts/auto-tmux.sh`、`bash -n skills/auto-tmux/scripts/swarm-state.sh`、`bash -n skills/auto-tmux/scripts/swarm-brief.sh`、`bash -n skills/auto-tmux/scripts/swarm-watch.sh`、`bash -n skills/auto-tmux/scripts/swarm-archive.sh`、`bash -n skills/auto-tmux/scripts/swarm-board.sh`、`bash -n skills/auto-tmux/scripts/safety-check.sh`、`bash -n skills/auto-tmux/scripts/render-swarm-prompt.sh`、`bash -n skills/auto-tmux/scripts/swarm-dispatch.sh`、`skills/auto-tmux/scripts/auto-tmux-smoke-test.sh`。 diff --git a/skills/auto-tmux/README.md b/skills/auto-tmux/README.md index 4fb5079..90093cb 100644 --- a/skills/auto-tmux/README.md +++ b/skills/auto-tmux/README.md @@ -24,6 +24,7 @@ bash -n skills/auto-tmux/scripts/swarm-state.sh bash -n skills/auto-tmux/scripts/swarm-brief.sh bash -n skills/auto-tmux/scripts/swarm-watch.sh bash -n skills/auto-tmux/scripts/swarm-archive.sh +bash -n skills/auto-tmux/scripts/swarm-board.sh bash -n skills/auto-tmux/scripts/safety-check.sh bash -n skills/auto-tmux/scripts/render-swarm-prompt.sh bash -n skills/auto-tmux/scripts/swarm-dispatch.sh diff --git a/skills/auto-tmux/SKILL.md b/skills/auto-tmux/SKILL.md index 60b1116..db8007a 100644 --- a/skills/auto-tmux/SKILL.md +++ b/skills/auto-tmux/SKILL.md @@ -38,6 +38,7 @@ bash -n skills/auto-tmux/scripts/swarm-state.sh bash -n skills/auto-tmux/scripts/swarm-brief.sh bash -n skills/auto-tmux/scripts/swarm-watch.sh bash -n skills/auto-tmux/scripts/swarm-archive.sh +bash -n skills/auto-tmux/scripts/swarm-board.sh bash -n skills/auto-tmux/scripts/safety-check.sh bash -n skills/auto-tmux/scripts/render-swarm-prompt.sh bash -n skills/auto-tmux/scripts/swarm-dispatch.sh @@ -117,6 +118,7 @@ skills/auto-tmux/scripts/auto-tmux.sh snapshot --session ai-hub --dir /tmp/auto- skills/auto-tmux/scripts/swarm-brief.sh --session ai-hub --swarm-dir /tmp/ai_swarm --out /tmp/auto-tmux-brief skills/auto-tmux/scripts/swarm-watch.sh --session ai-hub --swarm-dir /tmp/ai_swarm --iterations 3 --interval 10 skills/auto-tmux/scripts/swarm-archive.sh --session ai-hub --swarm-dir /tmp/ai_swarm --out /tmp/ai-hub-handoff.tar.gz +skills/auto-tmux/scripts/swarm-board.sh --dir /tmp/ai_swarm --out /tmp/ai-swarm-board.md ``` **远程救援：发现等待输入即发送 y** @@ -259,6 +261,7 @@ skills/auto-tmux/scripts/swarm-dispatch.sh --role worker --target ::/dev/null || true - rm -rf "$SWARM_DIR" "$SNAPSHOT_DIR" "$RECORD_DIR" "$BRIEF_DIR" "$WATCH_DIR" "$ARCHIVE_FILE" "$DISPATCH_PROMPT" "$TASK_IMPORT_FILE" "$PASTE_FILE" + rm -rf "$SWARM_DIR" "$SNAPSHOT_DIR" "$RECORD_DIR" "$BRIEF_DIR" "$WATCH_DIR" "$ARCHIVE_FILE" "$BOARD_FILE" "$DISPATCH_PROMPT" "$TASK_IMPORT_FILE" "$PASTE_FILE" } trap cleanup EXIT @@ -39,6 +41,7 @@ bash -n "$RENDER_PROMPT" bash -n "$SWARM_BRIEF" bash -n "$SWARM_WATCH" bash -n "$SWARM_ARCHIVE" +bash -n "$SWARM_BOARD" bash -n "$SAFETY_CHECK" bash -n "$SWARM_DISPATCH" @@ -114,6 +117,10 @@ grep -q 'auto-tmux Swarm Brief' "$BRIEF_DIR/brief.md" grep -q 'auto-tmux Swarm Watch' "$WATCH_DIR/index.md" "$SWARM_ARCHIVE" --session "$SESSION" --swarm-dir "$SWARM_DIR" --out "$ARCHIVE_FILE" -n 10 >/tmp/auto-tmux-smoke-archive.txt test -s "$ARCHIVE_FILE" +"$SWARM_BOARD" --dir "$SWARM_DIR" --out "$BOARD_FILE" --limit 20 >/tmp/auto-tmux-smoke-board.txt +grep -q 'auto-tmux Swarm Board' "$BOARD_FILE" +grep -q '## Ready TODO' "$BOARD_FILE" +grep -q 'smoke-fail' "$BOARD_FILE" "$RENDER_PROMPT" commander --session "$SESSION" --swarm-dir "$SWARM_DIR" --task "smoke" >/tmp/auto-tmux-smoke-commander-prompt.md "$RENDER_PROMPT" worker --session "$SESSION" --target "$worker_target" --swarm-dir "$SWARM_DIR" --task "smoke" >/tmp/auto-tmux-smoke-worker-prompt.md "$SWARM_DISPATCH" --role worker --target "$worker_target" --session "$SESSION" --swarm-dir "$SWARM_DIR" --task "smoke" --out "$DISPATCH_PROMPT" >/tmp/auto-tmux-smoke-dispatch-render.txt diff --git a/skills/auto-tmux/scripts/auto-tmux.sh b/skills/auto-tmux/scripts/auto-tmux.sh index 8fcf680..77fb21b 100755 --- a/skills/auto-tmux/scripts/auto-tmux.sh +++ b/skills/auto-tmux/scripts/auto-tmux.sh @@ -153,7 +153,7 @@ cmd_doctor() { status_line "WARN" "tmux server has no reachable session yet" fi - for script in auto-tmux.sh swarm-state.sh swarm-brief.sh swarm-watch.sh swarm-archive.sh safety-check.sh render-swarm-prompt.sh swarm-dispatch.sh auto-tmux-smoke-test.sh validate-auto-tmux.sh; do + for script in auto-tmux.sh swarm-state.sh swarm-brief.sh swarm-watch.sh swarm-archive.sh swarm-board.sh safety-check.sh render-swarm-prompt.sh swarm-dispatch.sh auto-tmux-smoke-test.sh validate-auto-tmux.sh; do if [[ -x "$script_dir/$script" ]]; then status_line "OK" "script executable: $script" else diff --git a/skills/auto-tmux/scripts/swarm-board.sh b/skills/auto-tmux/scripts/swarm-board.sh new file mode 100755 index 0000000..3805e2b --- /dev/null +++ b/skills/auto-tmux/scripts/swarm-board.sh @@ -0,0 +1,189 @@ +#!/usr/bin/env bash +# swarm-board: render swarm tasks, dependencies and locks as a Markdown board. +set -euo pipefail + +usage() { + cat <<'EOF' +swarm-board: render an auto-tmux swarm state directory as Markdown + +Usage: + swarm-board.sh [--dir DIR] [--out FILE] [--limit N] + +Defaults: + --dir AUTO_TMUX_SWARM_DIR or /tmp/ai_swarm + --out stdout + --limit 50 rows per section +EOF +} + +die() { + printf 'error: %s\n' "$*" >&2 + exit 1 +} + +swarm_dir="${AUTO_TMUX_SWARM_DIR:-/tmp/ai_swarm}" +out_file="" +limit=50 + +while [[ $# -gt 0 ]]; do + case "$1" in + --dir) + swarm_dir="${2:-}" + shift 2 + ;; + --out) + out_file="${2:-}" + shift 2 + ;; + --limit) + limit="${2:-}" + shift 2 + ;; + -h|--help) + usage + exit 0 + ;; + *) + die "unknown option: $1" + ;; + esac +done + +[[ "$limit" =~ ^[0-9]+$ ]] || die "--limit must be a number" + +tasks_tsv="$swarm_dir/tasks.tsv" +deps_tsv="$swarm_dir/deps.tsv" +locks_dir="$swarm_dir/locks" +status_log="$swarm_dir/status.log" + +[[ -f "$tasks_tsv" ]] || die "tasks file not found: $tasks_tsv" +[[ -f "$deps_tsv" ]] || die "deps file not found: $deps_tsv" + +render_summary() { + awk -F '\t' ' + NR > 1 {count[$2]++} + END { + print "| status | count |" + print "|:---|---:|" + n = split("TODO DOING DONE BLOCKED FAIL", order, " ") + for (i = 1; i <= n; i++) { + status = order[i] + print "| `" status "` | " (count[status] + 0) " |" + } + } + ' "$tasks_tsv" +} + +render_ready() { + awk -F '\t' -v limit="$limit" ' + function esc(value) { + gsub(/\|/, "\\|", value) + return value + } + FILENAME == ARGV[1] { + if (FNR == 1) next + status[$1] = $2 + owner[$1] = $3 + text[$1] = $4 + result[$1] = $5 + order[++n] = $1 + next + } + FILENAME == ARGV[2] { + if (FNR == 1) next + if (status[$2] != "DONE") { + blocked[$1] = blocked[$1] ? blocked[$1] ", " $2 : $2 + } + next + } + END { + print "| id | owner | text |" + print "|:---|:---|:---|" + shown = 0 + for (i = 1; i <= n; i++) { + id = order[i] + if (status[id] == "TODO" && blocked[id] == "") { + print "| `" esc(id) "` | `" esc(owner[id]) "` | " esc(text[id]) " |" + shown++ + if (shown >= limit) break + } + } + if (shown == 0) print "| - | - | - |" + } + ' "$tasks_tsv" "$deps_tsv" +} + +render_status_section() { + local status="$1" + awk -F '\t' -v wanted="$status" -v limit="$limit" ' + function esc(value) { + gsub(/\|/, "\\|", value) + return value + } + BEGIN { + print "| id | owner | text | result |" + print "|:---|:---|:---|:---|" + } + NR > 1 && $2 == wanted { + print "| `" esc($1) "` | `" esc($3) "` | " esc($4) " | " esc($5) " |" + shown++ + if (shown >= limit) exit + } + END { + if (shown == 0) print "| - | - | - | - |" + } + ' "$tasks_tsv" +} + +render_locks() { + printf '| lock | owner | created_at |\n' + printf '|:---|:---|:---|\n' + if [[ ! -d "$locks_dir" ]] || ! find "$locks_dir" -mindepth 1 -maxdepth 1 -type d -name '*.lock.d' -print -quit | grep -q .; then + printf '| - | - | - |\n' + return 0 + fi + find "$locks_dir" -mindepth 1 -maxdepth 1 -type d -name '*.lock.d' -print | sort | while read -r path; do + printf '| `%s` | `%s` | %s |\n' \ + "$(basename "$path" .lock.d)" \ + "$(cat "$path/owner" 2>/dev/null || printf unknown)" \ + "$(cat "$path/created_at" 2>/dev/null || printf unknown)" + done +} + +render_recent_status() { + if [[ -s "$status_log" ]]; then + tail -n 20 "$status_log" | sed 's/^/- /' + else + printf -- '- no status log\n' + fi +} + +render_board() { + printf '# auto-tmux Swarm Board\n\n' + printf -- '- dir: `%s`\n' "$swarm_dir" + printf -- '- created_at: `%s`\n\n' "$(date -Is)" + + printf '## Summary\n\n' + render_summary + printf '\n## Ready TODO\n\n' + render_ready + + local status + for status in TODO DOING BLOCKED FAIL DONE; do + printf '\n## %s\n\n' "$status" + render_status_section "$status" + done + + printf '\n## Locks\n\n' + render_locks + printf '\n## Recent Status\n\n' + render_recent_status +} + +if [[ -n "$out_file" ]]; then + mkdir -p "$(dirname "$out_file")" + render_board > "$out_file" + printf 'swarm board written: %s\n' "$out_file" +else + render_board +fi diff --git a/skills/auto-tmux/scripts/validate-auto-tmux.sh b/skills/auto-tmux/scripts/validate-auto-tmux.sh index c4e5772..9cdc0de 100755 --- a/skills/auto-tmux/scripts/validate-auto-tmux.sh +++ b/skills/auto-tmux/scripts/validate-auto-tmux.sh @@ -82,6 +82,7 @@ scripts=( "$script_dir/swarm-brief.sh" "$script_dir/swarm-watch.sh" "$script_dir/swarm-archive.sh" + "$script_dir/swarm-board.sh" "$script_dir/safety-check.sh" "$script_dir/render-swarm-prompt.sh" "$script_dir/swarm-dispatch.sh" @@ -98,6 +99,7 @@ run_gate "swarm-state help" "$script_dir/swarm-state.sh" help run_gate "swarm-brief help" "$script_dir/swarm-brief.sh" --help run_gate "swarm-watch help" "$script_dir/swarm-watch.sh" --help run_gate "swarm-archive help" "$script_dir/swarm-archive.sh" --help +run_gate "swarm-board help" "$script_dir/swarm-board.sh" --help run_gate "safety-check help" "$script_dir/safety-check.sh" --help run_gate "safety-check clean text" "$script_dir/safety-check.sh" --text "make test" if "$script_dir/safety-check.sh" --text "rm -rf /tmp/example" >/tmp/auto-tmux-validate-gate.log 2>&1; then @@ -112,6 +114,7 @@ require_contains "$skill_dir/SKILL.md" "scripts/validate-auto-tmux.sh" require_contains "$skill_dir/SKILL.md" "scripts/swarm-brief.sh" require_contains "$skill_dir/SKILL.md" "scripts/swarm-watch.sh" require_contains "$skill_dir/SKILL.md" "scripts/swarm-archive.sh" +require_contains "$skill_dir/SKILL.md" "scripts/swarm-board.sh" require_contains "$skill_dir/SKILL.md" "scripts/safety-check.sh" require_contains "$skill_dir/SKILL.md" "scripts/swarm-dispatch.sh" require_contains "$skill_dir/references/index.md" "automation.md" @@ -122,11 +125,13 @@ require_contains "$script_dir/README.md" "validate-auto-tmux.sh" require_contains "$script_dir/README.md" "swarm-dispatch.sh" require_contains "$script_dir/README.md" "swarm-watch.sh" require_contains "$script_dir/README.md" "swarm-archive.sh" +require_contains "$script_dir/README.md" "swarm-board.sh" require_contains "$script_dir/README.md" "safety-check.sh" require_contains "$script_dir/AGENTS.md" "validate-auto-tmux.sh" require_contains "$script_dir/AGENTS.md" "swarm-dispatch.sh" require_contains "$script_dir/AGENTS.md" "swarm-watch.sh" require_contains "$script_dir/AGENTS.md" "swarm-archive.sh" +require_contains "$script_dir/AGENTS.md" "swarm-board.sh" require_contains "$script_dir/AGENTS.md" "safety-check.sh" if [[ -x "$repo_root/skills/auto-skill/scripts/validate-skill.sh" ]]; then