diff --git a/skills/auto-tmux/AGENTS.md b/skills/auto-tmux/AGENTS.md index 9302d27..1096946 100644 --- a/skills/auto-tmux/AGENTS.md +++ b/skills/auto-tmux/AGENTS.md @@ -18,6 +18,7 @@ skills/auto-tmux/ │ ├── swarm-watch.sh │ ├── swarm-archive.sh │ ├── swarm-board.sh +│ ├── swarm-assign.sh │ ├── safety-check.sh │ ├── render-swarm-prompt.sh │ ├── swarm-dispatch.sh @@ -47,6 +48,7 @@ skills/auto-tmux/ - `scripts/swarm-watch.sh` 是有限轮次巡检层,按间隔采集 pane 输出与 swarm report。 - `scripts/swarm-archive.sh` 是归档层,打包 brief、snapshot 和 swarm state 供复盘交接。 - `scripts/swarm-board.sh` 是看板层,将任务、依赖、锁和状态日志渲染为 Markdown。 +- `scripts/swarm-assign.sh` 是分配建议层,将 ready task 轮询映射到 worker pane。 - `scripts/safety-check.sh` 是安全预检层,检查待发送 payload 的危险命令、敏感信息和大小。 - `scripts/render-swarm-prompt.sh` 是提示词渲染层,生成 commander/worker/reviewer 协议文本。 - `scripts/swarm-dispatch.sh` 是提示词下发层,默认写文件,显式 `--send` 后才发送到 pane。 @@ -59,4 +61,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/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`。 +- 脚本验证:`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/swarm-assign.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 90093cb..af9dcc6 100644 --- a/skills/auto-tmux/README.md +++ b/skills/auto-tmux/README.md @@ -25,6 +25,7 @@ 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/swarm-assign.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 db8007a..c49eba0 100644 --- a/skills/auto-tmux/SKILL.md +++ b/skills/auto-tmux/SKILL.md @@ -39,6 +39,7 @@ 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/swarm-assign.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 @@ -119,6 +120,7 @@ skills/auto-tmux/scripts/swarm-brief.sh --session ai-hub --swarm-dir /tmp/ai_swa 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 +skills/auto-tmux/scripts/swarm-assign.sh --swarm-dir /tmp/ai_swarm --session ai-hub --out /tmp/ai-swarm-assign.md ``` **远程救援:发现等待输入即发送 y** @@ -262,6 +264,7 @@ skills/auto-tmux/scripts/swarm-dispatch.sh --role worker --target ::/dev/null || true - rm -rf "$SWARM_DIR" "$DEP_SWARM_DIR" "$SNAPSHOT_DIR" "$RECORD_DIR" "$BRIEF_DIR" "$WATCH_DIR" "$ARCHIVE_FILE" "$BOARD_FILE" "$DISPATCH_PROMPT" "$TASK_IMPORT_FILE" "$PASTE_FILE" + rm -rf "$SWARM_DIR" "$DEP_SWARM_DIR" "$SNAPSHOT_DIR" "$RECORD_DIR" "$BRIEF_DIR" "$WATCH_DIR" "$ARCHIVE_FILE" "$BOARD_FILE" "$ASSIGN_FILE" "$DISPATCH_PROMPT" "$TASK_IMPORT_FILE" "$PASTE_FILE" } trap cleanup EXIT @@ -43,6 +45,7 @@ bash -n "$SWARM_BRIEF" bash -n "$SWARM_WATCH" bash -n "$SWARM_ARCHIVE" bash -n "$SWARM_BOARD" +bash -n "$SWARM_ASSIGN" bash -n "$SAFETY_CHECK" bash -n "$SWARM_DISPATCH" @@ -132,6 +135,9 @@ test -s "$ARCHIVE_FILE" grep -q 'auto-tmux Swarm Board' "$BOARD_FILE" grep -q '## Ready TODO' "$BOARD_FILE" grep -q 'smoke-fail' "$BOARD_FILE" +"$SWARM_ASSIGN" --swarm-dir "$SWARM_DIR" --session "$SESSION" --out "$ASSIGN_FILE" --limit 20 >/tmp/auto-tmux-smoke-assign.txt +grep -q 'auto-tmux Swarm Assignment Suggestions' "$ASSIGN_FILE" +grep -q 'swarm-dispatch.sh' "$ASSIGN_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 77fb21b..3636c69 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 swarm-board.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 swarm-assign.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-assign.sh b/skills/auto-tmux/scripts/swarm-assign.sh new file mode 100755 index 0000000..fa57b01 --- /dev/null +++ b/skills/auto-tmux/scripts/swarm-assign.sh @@ -0,0 +1,158 @@ +#!/usr/bin/env bash +# swarm-assign: generate read-only task-to-pane dispatch suggestions. +set -euo pipefail + +usage() { + cat <<'EOF' +swarm-assign: suggest ready task assignments for auto-tmux workers + +Usage: + swarm-assign.sh [--swarm-dir DIR] [--session NAME] [--out FILE] [--limit N] + +Defaults: + --swarm-dir AUTO_TMUX_SWARM_DIR or /tmp/ai_swarm + --session omitted; use placeholder targets + --out stdout + --limit 20 suggestions + +This script is read-only. It does not claim tasks and does not send prompts. +EOF +} + +die() { + printf 'error: %s\n' "$*" >&2 + exit 1 +} + +swarm_dir="${AUTO_TMUX_SWARM_DIR:-/tmp/ai_swarm}" +session="" +out_file="" +limit=20 + +while [[ $# -gt 0 ]]; do + case "$1" in + --swarm-dir|--dir) + swarm_dir="${2:-}" + shift 2 + ;; + --session) + session="${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" +[[ -f "$tasks_tsv" ]] || die "tasks file not found: $tasks_tsv" +[[ -f "$deps_tsv" ]] || die "deps file not found: $deps_tsv" + +tmp_dir="$(mktemp -d)" +cleanup() { + rm -rf "$tmp_dir" +} +trap cleanup EXIT + +ready_tsv="$tmp_dir/ready.tsv" +panes_tsv="$tmp_dir/panes.tsv" + +awk -F '\t' -v limit="$limit" ' + FILENAME == ARGV[1] { + if (FNR == 1) next + status[$1] = $2 + owner[$1] = $3 + text[$1] = $4 + order[++n] = $1 + next + } + FILENAME == ARGV[2] { + if (FNR == 1) next + if (status[$2] != "DONE") blocked[$1] = 1 + next + } + END { + shown = 0 + for (i = 1; i <= n; i++) { + id = order[i] + if (status[id] == "TODO" && blocked[id] != 1) { + print id "\t" owner[id] "\t" text[id] + shown++ + if (shown >= limit) break + } + } + } +' "$tasks_tsv" "$deps_tsv" > "$ready_tsv" + +if [[ -n "$session" ]]; then + command -v tmux >/dev/null 2>&1 || die "tmux is required when --session is used" + tmux has-session -t "$session" 2>/dev/null || die "session not found: $session" + tmux list-panes -t "$session" -F '#S:#{window_index}.#{pane_index}\t#{window_name}\t#{pane_current_command}' | + awk -F '\t' 'tolower($2) ~ /worker/ {print; next} {other[++n] = $0} END {for (i = 1; i <= n; i++) print other[i]}' > "$panes_tsv" +else + printf '\tworker\tunknown\n' > "$panes_tsv" +fi + +render_assignments() { + printf '# auto-tmux Swarm Assignment Suggestions\n\n' + printf -- '- swarm_dir: `%s`\n' "$swarm_dir" + printf -- '- session: `%s`\n' "${session:-}" + printf -- '- created_at: `%s`\n\n' "$(date -Is)" + printf 'This is a read-only planning report. It does not claim tasks and does not send prompts.\n\n' + + printf '## Suggestions\n\n' + printf '| task | current owner | target | command |\n' + printf '|:---|:---|:---|:---|\n' + + if [[ ! -s "$ready_tsv" ]]; then + printf '| - | - | - | no ready TODO task |\n' + return 0 + fi + + awk -F '\t' -v swarm_dir="$swarm_dir" ' + FILENAME == ARGV[1] { + pane[++pane_count] = $1 + next + } + FILENAME == ARGV[2] { + task_count++ + idx = ((task_count - 1) % pane_count) + 1 + target = pane[idx] + task_text = $3 + gsub(/"/, "\\\"", task_text) + cmd = "skills/auto-tmux/scripts/swarm-dispatch.sh --role worker --target " target " --swarm-dir " swarm_dir " --task \"" $1 ": " task_text "\" --send --dry-run" + gsub(/\|/, "\\|", $3) + gsub(/\|/, "\\|", cmd) + print "| `" $1 "` | `" $2 "` | `" target "` | `" cmd "` |" + } + ' "$panes_tsv" "$ready_tsv" + + printf '\n## Ready Tasks\n\n' + printf '| id | owner | text |\n' + printf '|:---|:---|:---|\n' + awk -F '\t' '{gsub(/\|/, "\\|", $3); print "| `" $1 "` | `" $2 "` | " $3 " |"}' "$ready_tsv" +} + +if [[ -n "$out_file" ]]; then + mkdir -p "$(dirname "$out_file")" + render_assignments > "$out_file" + printf 'swarm assignments written: %s\n' "$out_file" +else + render_assignments +fi diff --git a/skills/auto-tmux/scripts/validate-auto-tmux.sh b/skills/auto-tmux/scripts/validate-auto-tmux.sh index 9cdc0de..8679fb7 100755 --- a/skills/auto-tmux/scripts/validate-auto-tmux.sh +++ b/skills/auto-tmux/scripts/validate-auto-tmux.sh @@ -83,6 +83,7 @@ scripts=( "$script_dir/swarm-watch.sh" "$script_dir/swarm-archive.sh" "$script_dir/swarm-board.sh" + "$script_dir/swarm-assign.sh" "$script_dir/safety-check.sh" "$script_dir/render-swarm-prompt.sh" "$script_dir/swarm-dispatch.sh" @@ -100,6 +101,7 @@ 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 "swarm-assign help" "$script_dir/swarm-assign.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 @@ -115,6 +117,7 @@ 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/swarm-assign.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" @@ -126,12 +129,14 @@ 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" "swarm-assign.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" "swarm-assign.sh" require_contains "$script_dir/AGENTS.md" "safety-check.sh" if [[ -x "$repo_root/skills/auto-skill/scripts/validate-skill.sh" ]]; then