diff --git a/skills/auto-tmux/AGENTS.md b/skills/auto-tmux/AGENTS.md index bb56077..de71cd7 100644 --- a/skills/auto-tmux/AGENTS.md +++ b/skills/auto-tmux/AGENTS.md @@ -16,6 +16,7 @@ skills/auto-tmux/ │ ├── swarm-state.sh │ ├── swarm-brief.sh │ ├── render-swarm-prompt.sh +│ ├── swarm-dispatch.sh │ ├── auto-tmux-smoke-test.sh │ ├── validate-auto-tmux.sh │ ├── README.md @@ -40,6 +41,7 @@ skills/auto-tmux/ - `scripts/swarm-state.sh` 是蜂群协作状态层,管理任务、锁、状态日志和结果报告。 - `scripts/swarm-brief.sh` 是只读交接层,汇总 doctor/topology/scan/report 形成上下文快照。 - `scripts/render-swarm-prompt.sh` 是提示词渲染层,生成 commander/worker/reviewer 协议文本。 +- `scripts/swarm-dispatch.sh` 是提示词下发层,默认写文件,显式 `--send` 后才发送到 pane。 - `scripts/validate-auto-tmux.sh` 是技能专属质量门禁,覆盖脚本、文档索引和 smoke test。 - 技能文档可以引用软链接入口;更新上游内容必须通过 `tools/external/` 下的 submodule 指针完成。 - 不在本目录直接修改 submodule 内容;如需改造,先 fork 上游并更新 submodule 来源。 @@ -49,4 +51,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/render-swarm-prompt.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/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 bdbfcc4..98893ed 100644 --- a/skills/auto-tmux/README.md +++ b/skills/auto-tmux/README.md @@ -23,6 +23,7 @@ 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/render-swarm-prompt.sh +bash -n skills/auto-tmux/scripts/swarm-dispatch.sh bash -n skills/auto-tmux/scripts/validate-auto-tmux.sh skills/auto-tmux/scripts/auto-tmux.sh help skills/auto-tmux/scripts/swarm-state.sh help diff --git a/skills/auto-tmux/SKILL.md b/skills/auto-tmux/SKILL.md index 136ad46..771157a 100644 --- a/skills/auto-tmux/SKILL.md +++ b/skills/auto-tmux/SKILL.md @@ -37,6 +37,7 @@ 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/render-swarm-prompt.sh +bash -n skills/auto-tmux/scripts/swarm-dispatch.sh bash -n skills/auto-tmux/scripts/validate-auto-tmux.sh skills/auto-tmux/scripts/auto-tmux.sh help skills/auto-tmux/scripts/swarm-state.sh help @@ -162,6 +163,7 @@ skills/auto-tmux/scripts/validate-auto-tmux.sh skills/auto-tmux/scripts/render-swarm-prompt.sh commander --session ai-hub --task "拆分并推进任务" skills/auto-tmux/scripts/render-swarm-prompt.sh worker --target :. --task "只处理指定子任务" skills/auto-tmux/scripts/render-swarm-prompt.sh reviewer --session ai-hub --task "审查 worker 产出" +skills/auto-tmux/scripts/swarm-dispatch.sh --role worker --target :. --task "只处理指定子任务" --send --dry-run ``` ## Rules & Constraints @@ -235,6 +237,7 @@ skills/auto-tmux/scripts/render-swarm-prompt.sh reviewer --session ai-hub --task - `scripts/swarm-state.sh`: 蜂群任务、锁、状态和报告脚本 - `scripts/swarm-brief.sh`: 只读生成 tmux 蜂群交接报告 - `scripts/render-swarm-prompt.sh`: commander/worker/reviewer 提示词渲染脚本 +- `scripts/swarm-dispatch.sh`: 渲染并可选下发 commander/worker/reviewer 提示词 - `scripts/auto-tmux-smoke-test.sh`: tmux 自动化脚本端到端自测 - `scripts/validate-auto-tmux.sh`: auto-tmux 专属质量门禁 - `assets/oh-my-tmux`: gpakosz/oh-my-tmux submodule 的相对软链接入口 @@ -255,6 +258,6 @@ skills/auto-tmux/scripts/render-swarm-prompt.sh reviewer --session ai-hub --task 4. ≥3 个端到端示例,含输入/步骤/验收。 5. 长文档放在 `references/` 并可导航;无文档堆砌。 6. 不确定项给出验证路径;禁止虚构 tmux 行为。 -7. `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/render-swarm-prompt.sh` 与 `bash -n skills/auto-tmux/scripts/validate-auto-tmux.sh` 通过。 +7. `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/render-swarm-prompt.sh`、`bash -n skills/auto-tmux/scripts/swarm-dispatch.sh` 与 `bash -n skills/auto-tmux/scripts/validate-auto-tmux.sh` 通过。 8. `skills/auto-tmux/scripts/auto-tmux-smoke-test.sh` 通过或在无 tmux 环境下明确跳过。 9. 运行 `skills/auto-tmux/scripts/validate-auto-tmux.sh` 和 `skills/auto-skill/scripts/validate-skill.sh skills/auto-tmux --strict` 通过。 diff --git a/skills/auto-tmux/references/automation.md b/skills/auto-tmux/references/automation.md index 968cebc..9cab3fa 100644 --- a/skills/auto-tmux/references/automation.md +++ b/skills/auto-tmux/references/automation.md @@ -27,6 +27,7 @@ | `hub` | 初始化 AI 多终端工作台 | 已存在 session 不覆盖 | | `wait` | 等待 pane 输出出现某个 pattern | 超时失败 | | `swarm-brief.sh` | 生成只读交接报告 | 不发送按键,只汇总证据 | +| `swarm-dispatch.sh` | 渲染并可选下发提示词 | 默认只写文件,发送需 `--send` | | `validate-auto-tmux.sh` | 执行技能专属质量门禁 | 覆盖脚本、文档索引、strict 和 smoke | ## 典型流程 @@ -92,6 +93,13 @@ skills/auto-tmux/scripts/validate-auto-tmux.sh skills/auto-tmux/scripts/validate-auto-tmux.sh --no-smoke ``` +渲染并预演下发 worker prompt: + +```bash +target="$(tmux list-panes -t ai-hub:worker1 -F '#S:#I.#P' | head -n 1)" +skills/auto-tmux/scripts/swarm-dispatch.sh --role worker --target "$target" --task "只运行 make test" --send --dry-run +``` + ### 3. 安全发送命令 ```bash @@ -205,6 +213,7 @@ 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/render-swarm-prompt.sh +bash -n skills/auto-tmux/scripts/swarm-dispatch.sh bash -n skills/auto-tmux/scripts/validate-auto-tmux.sh skills/auto-tmux/scripts/auto-tmux.sh help skills/auto-tmux/scripts/swarm-state.sh help diff --git a/skills/auto-tmux/references/prompt-templates.md b/skills/auto-tmux/references/prompt-templates.md index def62e5..54f153b 100644 --- a/skills/auto-tmux/references/prompt-templates.md +++ b/skills/auto-tmux/references/prompt-templates.md @@ -66,6 +66,17 @@ skills/auto-tmux/scripts/render-swarm-prompt.sh reviewer \ ## 推荐下发方式 +优先使用封装脚本渲染并预演: + +```bash +skills/auto-tmux/scripts/swarm-dispatch.sh \ + --role worker \ + --target "$target" \ + --task "运行 make test 并分析失败" \ + --send \ + --dry-run +``` + 渲染到临时文件: ```bash diff --git a/skills/auto-tmux/scripts/AGENTS.md b/skills/auto-tmux/scripts/AGENTS.md index 96b0c8f..3b7c518 100644 --- a/skills/auto-tmux/scripts/AGENTS.md +++ b/skills/auto-tmux/scripts/AGENTS.md @@ -12,6 +12,7 @@ scripts/ ├── swarm-state.sh # 蜂群状态、任务、锁和报告管理 ├── swarm-brief.sh # 只读生成蜂群交接报告 ├── render-swarm-prompt.sh # commander/worker/reviewer 提示词渲染 +├── swarm-dispatch.sh # 渲染并可选下发蜂群提示词 ├── auto-tmux-smoke-test.sh # 临时 tmux 会话端到端自测 └── validate-auto-tmux.sh # auto-tmux 专属质量门禁 ``` @@ -24,6 +25,7 @@ scripts/ - 批量救援必须通过 pattern 匹配触发,不允许无条件向所有 pane 发送输入。 - 批量广播必须要求显式 session,并支持 `--dry-run`。 - Prompt 渲染脚本只输出文本,不直接控制 tmux。 +- Prompt 下发脚本默认只写文件;真实发送必须显式 `--send`,批量使用前先 `--dry-run`。 - 交接报告脚本只读调用 doctor/topology/scan/report,不直接发送按键。 - 状态脚本只能写入显式状态目录,不保存密钥、Token、密码或私密项目内容。 - 自测脚本必须创建独立临时 tmux session,并在退出时清理。 diff --git a/skills/auto-tmux/scripts/README.md b/skills/auto-tmux/scripts/README.md index 5868f68..f71cfb9 100644 --- a/skills/auto-tmux/scripts/README.md +++ b/skills/auto-tmux/scripts/README.md @@ -8,6 +8,7 @@ - [`swarm-state.sh`](./swarm-state.sh) - 蜂群状态、任务、锁和报告管理。 - [`swarm-brief.sh`](./swarm-brief.sh) - 只读生成蜂群交接报告,汇总 doctor、topology、pane 输出和状态报告。 - [`render-swarm-prompt.sh`](./render-swarm-prompt.sh) - commander、worker、reviewer 提示词渲染。 +- [`swarm-dispatch.sh`](./swarm-dispatch.sh) - 渲染提示词并可选发送到指定 pane,默认只写文件。 - [`auto-tmux-smoke-test.sh`](./auto-tmux-smoke-test.sh) - 创建临时 tmux 会话,端到端验证脚本能力。 - [`validate-auto-tmux.sh`](./validate-auto-tmux.sh) - 汇总脚本权限、语法、help、文档索引、strict 和 smoke 门禁。 @@ -59,6 +60,9 @@ skills/auto-tmux/scripts/validate-auto-tmux.sh # 渲染 worker prompt skills/auto-tmux/scripts/render-swarm-prompt.sh worker --target "$target" --task "只运行 make test" + +# 渲染并预演下发 worker prompt +skills/auto-tmux/scripts/swarm-dispatch.sh --role worker --target "$target" --task "只运行 make test" --send --dry-run ``` ## 安全约束 diff --git a/skills/auto-tmux/scripts/auto-tmux-smoke-test.sh b/skills/auto-tmux/scripts/auto-tmux-smoke-test.sh index 950e218..a186365 100755 --- a/skills/auto-tmux/scripts/auto-tmux-smoke-test.sh +++ b/skills/auto-tmux/scripts/auto-tmux-smoke-test.sh @@ -7,15 +7,17 @@ AUTO_TMUX="$SCRIPT_DIR/auto-tmux.sh" SWARM_STATE="$SCRIPT_DIR/swarm-state.sh" RENDER_PROMPT="$SCRIPT_DIR/render-swarm-prompt.sh" SWARM_BRIEF="$SCRIPT_DIR/swarm-brief.sh" +SWARM_DISPATCH="$SCRIPT_DIR/swarm-dispatch.sh" SESSION="auto-tmux-smoke-$$" SWARM_DIR="/tmp/auto-tmux-smoke-swarm-$$" SNAPSHOT_DIR="/tmp/auto-tmux-smoke-snapshot-$$" RECORD_DIR="/tmp/auto-tmux-smoke-record-$$" BRIEF_DIR="/tmp/auto-tmux-smoke-brief-$$" +DISPATCH_PROMPT="/tmp/auto-tmux-smoke-dispatch-$$.md" cleanup() { tmux kill-session -t "$SESSION" 2>/dev/null || true - rm -rf "$SWARM_DIR" "$SNAPSHOT_DIR" "$RECORD_DIR" "$BRIEF_DIR" + rm -rf "$SWARM_DIR" "$SNAPSHOT_DIR" "$RECORD_DIR" "$BRIEF_DIR" "$DISPATCH_PROMPT" } trap cleanup EXIT @@ -28,6 +30,7 @@ bash -n "$AUTO_TMUX" bash -n "$SWARM_STATE" bash -n "$RENDER_PROMPT" bash -n "$SWARM_BRIEF" +bash -n "$SWARM_DISPATCH" "$AUTO_TMUX" hub --session "$SESSION" --workers 1 --cmd bash "$AUTO_TMUX" doctor --session "$SESSION" >/tmp/auto-tmux-smoke-doctor.txt @@ -66,7 +69,10 @@ grep -q 'FAIL' /tmp/auto-tmux-smoke-report.txt grep -q 'auto-tmux Swarm Brief' "$BRIEF_DIR/brief.md" "$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 +"$SWARM_DISPATCH" --role worker --target "$worker_target" --session "$SESSION" --swarm-dir "$SWARM_DIR" --task "smoke" --send --dry-run >/tmp/auto-tmux-smoke-dispatch-dry-run.txt grep -q 'Commander Prompt' /tmp/auto-tmux-smoke-commander-prompt.md grep -q 'Worker Prompt' /tmp/auto-tmux-smoke-worker-prompt.md +grep -q 'Worker Prompt' "$DISPATCH_PROMPT" printf 'auto-tmux smoke test ok: session=%s worker=%s\n' "$SESSION" "$worker_target" diff --git a/skills/auto-tmux/scripts/auto-tmux.sh b/skills/auto-tmux/scripts/auto-tmux.sh index 98bafe1..e6812ea 100755 --- a/skills/auto-tmux/scripts/auto-tmux.sh +++ b/skills/auto-tmux/scripts/auto-tmux.sh @@ -147,7 +147,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 render-swarm-prompt.sh auto-tmux-smoke-test.sh validate-auto-tmux.sh; do + for script in auto-tmux.sh swarm-state.sh swarm-brief.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-dispatch.sh b/skills/auto-tmux/scripts/swarm-dispatch.sh new file mode 100755 index 0000000..4fb462f --- /dev/null +++ b/skills/auto-tmux/scripts/swarm-dispatch.sh @@ -0,0 +1,89 @@ +#!/usr/bin/env bash +# Render a swarm prompt and optionally dispatch it to a tmux pane. +set -euo pipefail + +usage() { + cat <<'EOF' +swarm-dispatch: render and optionally send commander/worker/reviewer prompts + +Usage: + swarm-dispatch.sh --role ROLE --target TARGET [--session NAME] [--swarm-dir DIR] [--task TEXT] [--out FILE] [--send] [--dry-run] + +Roles: + commander + worker + reviewer + +Examples: + swarm-dispatch.sh --role worker --target ai-hub:2.1 --task "只运行 make test" --out /tmp/worker.md + swarm-dispatch.sh --role worker --target ai-hub:2.1 --task "只运行 make test" --send --dry-run + swarm-dispatch.sh --role commander --target ai-hub:1.1 --task "拆分并推进 README 重构" --send +EOF +} + +die() { + printf 'error: %s\n' "$*" >&2 + exit 1 +} + +script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +render="$script_dir/render-swarm-prompt.sh" +auto_tmux="$script_dir/auto-tmux.sh" + +role="" +target="" +session="ai-hub" +swarm_dir="${AUTO_TMUX_SWARM_DIR:-/tmp/ai_swarm}" +task="未指定;请等待 commander 分配具体任务。" +out_file="" +send="0" +dry_run="0" + +while [[ $# -gt 0 ]]; do + case "$1" in + --role) role="${2:-}"; shift 2 ;; + --target) target="${2:-}"; shift 2 ;; + --session) session="${2:-}"; shift 2 ;; + --swarm-dir) swarm_dir="${2:-}"; shift 2 ;; + --task) task="${2:-}"; shift 2 ;; + --out) out_file="${2:-}"; shift 2 ;; + --send) send="1"; shift ;; + --dry-run) dry_run="1"; shift ;; + -h|--help) usage; exit 0 ;; + *) die "unknown option: $1" ;; + esac +done + +[[ -n "$role" ]] || die "missing --role" +[[ -n "$target" ]] || die "missing --target" + +case "$role" in + commander|reviewer) ;; + worker) ;; + *) die "unknown role: $role" ;; +esac + +prompt_file="$out_file" +if [[ -z "$prompt_file" ]]; then + prompt_file="$(mktemp "/tmp/auto-tmux-${role}-prompt.XXXXXX.md")" +fi + +render_args=("$role" --session "$session" --swarm-dir "$swarm_dir" --task "$task") +if [[ "$role" == "worker" ]]; then + render_args+=(--target "$target") +fi + +"$render" "${render_args[@]}" > "$prompt_file" +printf 'prompt written: %s\n' "$prompt_file" + +if [[ "$send" != "1" ]]; then + printf 'send skipped; add --send to dispatch to %s\n' "$target" + exit 0 +fi + +send_args=(-t "$target" --text "$(cat "$prompt_file")" --enter) +if [[ "$dry_run" == "1" ]]; then + send_args+=(--dry-run) +fi + +"$auto_tmux" send "${send_args[@]}" diff --git a/skills/auto-tmux/scripts/validate-auto-tmux.sh b/skills/auto-tmux/scripts/validate-auto-tmux.sh index 013161f..77d943a 100755 --- a/skills/auto-tmux/scripts/validate-auto-tmux.sh +++ b/skills/auto-tmux/scripts/validate-auto-tmux.sh @@ -81,6 +81,7 @@ scripts=( "$script_dir/swarm-state.sh" "$script_dir/swarm-brief.sh" "$script_dir/render-swarm-prompt.sh" + "$script_dir/swarm-dispatch.sh" "$script_dir/auto-tmux-smoke-test.sh" ) @@ -93,13 +94,17 @@ run_gate "auto-tmux help" "$script_dir/auto-tmux.sh" help run_gate "swarm-state help" "$script_dir/swarm-state.sh" help run_gate "swarm-brief help" "$script_dir/swarm-brief.sh" --help run_gate "render-swarm-prompt help" "$script_dir/render-swarm-prompt.sh" --help +run_gate "swarm-dispatch help" "$script_dir/swarm-dispatch.sh" --help 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-dispatch.sh" require_contains "$skill_dir/references/index.md" "automation.md" require_contains "$skill_dir/references/README.md" "swarm-state.md" require_contains "$script_dir/README.md" "validate-auto-tmux.sh" +require_contains "$script_dir/README.md" "swarm-dispatch.sh" require_contains "$script_dir/AGENTS.md" "validate-auto-tmux.sh" +require_contains "$script_dir/AGENTS.md" "swarm-dispatch.sh" if [[ -x "$repo_root/skills/auto-skill/scripts/validate-skill.sh" ]]; then run_gate "auto-skill strict validation" "$repo_root/skills/auto-skill/scripts/validate-skill.sh" "$skill_dir" --strict