@seanyao/roll 2026.512.2 → 2026.512.6

package/CHANGELOG.md

@@ -1,6 +1,14 @@
 # Changelog
 
-## Unreleased
+## v2026.512.6
+- **Added**: peer review 现在也会自动弹出终端窗口，实时观察跨 AI 协商过程（mute 关闭同一开关）
+- **Added**: `docs/guide/en/` — loop/dream/peer 英文用户指南上线，覆盖所有子命令和使用场景
+- **Added**: `docs/guide/zh/` — loop/dream/peer 中文用户指南上线，内容与英文版语义一致
+
+## v2026.512.5
+- **Fixed**: loop 遇到 API 错误时自动重试，不再直接中断
+
+## v2026.512.3
 - **Added**: BACKLOG 支持 block / defer / unblock 状态管理 — 标记卡住的任务不再占队列
 - **Fixed**: 自动弹窗现在能识别 Ghostty 和 iTerm2，不再强制弹出 Terminal.app
 - **Fixed**: loop 检测到上一轮还在跑时自动跳过，不重复启动

package/bin/roll

@@ -4,7 +4,7 @@ set -euo pipefail
 # Roll — AI Agent Convention Manager
 # Single source of truth for how all AI coding agents behave.
 
-VERSION="2026.512.2"
+VERSION="2026.512.6"
 ROLL_HOME="${ROLL_HOME:-${HOME}/.roll}"
 ROLL_CONFIG="${ROLL_HOME}/config.yaml"
 ROLL_GLOBAL="${ROLL_HOME}/conventions/global"
@@ -1422,9 +1422,70 @@ _peer_route() {
   return 1
 }
 
+# Open a terminal window attached to the given tmux session (peer auto-attach).
+# No-ops when muted, non-macOS, or tmux unavailable. Mirrors loop popup logic.
+_peer_auto_attach() {
+  local session="$1"
+  [ "$(uname)" = "Darwin" ] || return 0
+  [ -f "$_LOOP_MUTE_FILE" ] && return 0
+  local terminal_pref
+  terminal_pref=$(_config_read_string "loop_attach_terminal" "")
+  if [[ -z "$terminal_pref" ]]; then
+    case "${TERM_PROGRAM:-}" in
+      ghostty)   terminal_pref="ghostty" ;;
+      iTerm.app) terminal_pref="iTerm2" ;;
+      *)         terminal_pref="Terminal" ;;
+    esac
+  fi
+  local launched=0
+  if [[ "$terminal_pref" = "ghostty" || "$terminal_pref" = "Ghostty" ]]; then
+    open -na Ghostty.app --args -e "tmux attach -t $session" >/dev/null 2>&1 && launched=1 || true
+  fi
+  if [[ $launched -eq 0 ]] && { [[ "$terminal_pref" = "iTerm2" || "$terminal_pref" = "iTerm" ]] || [[ -d "/Applications/iTerm.app" ]]; }; then
+    osascript \
+      -e 'tell application "System Events" to set _prev to name of first application process whose frontmost is true' \
+      -e "tell application \"iTerm2\" to create window with default profile command \"tmux attach -t $session\"" \
+      -e 'delay 0.3' -e 'try' -e 'tell application _prev to activate' -e 'end try' >/dev/null 2>&1 \
+      && launched=1 || true
+  fi
+  if [[ $launched -eq 0 ]] && [[ -d "/Applications/Ghostty.app" ]]; then
+    open -na Ghostty.app --args -e "tmux attach -t $session" >/dev/null 2>&1 && launched=1 || true
+  fi
+  if [[ $launched -eq 0 ]] && command -v osascript >/dev/null 2>&1; then
+    osascript \
+      -e 'tell application "System Events" to set _prev to name of first application process whose frontmost is true' \
+      -e "tell application \"Terminal\" to do script \"tmux attach -t $session\"" \
+      -e 'delay 0.3' -e 'try' -e 'tell application _prev to activate' -e 'end try' >/dev/null 2>&1 || true
+  fi
+}
+
+# Dispatch a peer CLI command inside an existing tmux session (window 0).
+# Writes stdout to out_file, stderr to err_file. Blocks until done or timeout.
+_peer_dispatch_in_tmux() {
+  local session="$1" cmd_str="$2" out_file="$3" err_file="$4" timeout="${5:-180}"
+  local done_file="${out_file}.done"
+  local inner
+  inner=$(mktemp /tmp/roll-peer-inner-XXXXXX.sh)
+  {
+    printf '#!/bin/bash -l\n'
+    printf 'export PATH="/opt/homebrew/bin:$PATH"\n'
+    printf '%s > %q 2> %q || true\n' "$cmd_str" "$out_file" "$err_file"
+    printf 'touch %q\n' "$done_file"
+  } > "$inner"
+  chmod +x "$inner"
+  tmux send-keys -t "${session}:0" "bash ${inner}; rm -f ${inner}" Enter
+  local elapsed=0
+  while [ ! -f "$done_file" ] && [ "$elapsed" -lt "$timeout" ]; do
+    sleep 1
+    elapsed=$((elapsed + 1))
+  done
+  rm -f "$done_file"
+}
+
 _peer_call() {
   local to="$1"
   local prompt="$2"
+  local session="${3:-}"
   local output=""
   local stderr_log
   stderr_log="${_PEER_STATE_DIR}/logs/.last_stderr.log"
@@ -1433,30 +1494,50 @@ _peer_call() {
 
   info "Peer call timeout: ${call_timeout}s  Peer 调用超时: ${call_timeout}s"
 
-  case "$to" in
-    claude)
-      output="$(claude -p --output-format text "$prompt" 2>"$stderr_log" || true)"
-      ;;
-    kimi)
-      output="$(kimi --quiet -p "$prompt" 2>"$stderr_log" || true)"
-      ;;
-    pi)
-      output="$(pi -p "$prompt" 2>"$stderr_log" || true)"
-      ;;
-    deepseek)
-      output="$(deepseek "$prompt" 2>"$stderr_log" || true)"
-      ;;
-    codex)
-      output="$(codex exec --json --output-last-message "$prompt" 2>"$stderr_log" || true)"
-      ;;
-    opencode)
-      output="$(opencode run "$prompt" 2>"$stderr_log" || true)"
-      ;;
-    *)
-      err "Unsupported peer: $to  不支持的 peer: $to"
-      return 1
-      ;;
-  esac
+  if [[ -n "$session" ]] && command -v tmux >/dev/null 2>&1 && tmux has-session -t "$session" 2>/dev/null; then
+    local out_file
+    out_file=$(mktemp)
+    local cmd_str
+    case "$to" in
+      claude)   cmd_str="claude -p --output-format text $(printf %q "$prompt")" ;;
+      kimi)     cmd_str="kimi --quiet -p $(printf %q "$prompt")" ;;
+      pi)       cmd_str="pi -p $(printf %q "$prompt")" ;;
+      deepseek) cmd_str="deepseek $(printf %q "$prompt")" ;;
+      codex)    cmd_str="codex exec --json --output-last-message $(printf %q "$prompt")" ;;
+      opencode) cmd_str="opencode run $(printf %q "$prompt")" ;;
+      *)
+        err "Unsupported peer: $to  不支持的 peer: $to"
+        return 1 ;;
+    esac
+    _peer_dispatch_in_tmux "$session" "$cmd_str" "$out_file" "$stderr_log" "$call_timeout"
+    output="$(cat "$out_file" 2>/dev/null || true)"
+    rm -f "$out_file"
+  else
+    case "$to" in
+      claude)
+        output="$(claude -p --output-format text "$prompt" 2>"$stderr_log" || true)"
+        ;;
+      kimi)
+        output="$(kimi --quiet -p "$prompt" 2>"$stderr_log" || true)"
+        ;;
+      pi)
+        output="$(pi -p "$prompt" 2>"$stderr_log" || true)"
+        ;;
+      deepseek)
+        output="$(deepseek "$prompt" 2>"$stderr_log" || true)"
+        ;;
+      codex)
+        output="$(codex exec --json --output-last-message "$prompt" 2>"$stderr_log" || true)"
+        ;;
+      opencode)
+        output="$(opencode run "$prompt" 2>"$stderr_log" || true)"
+        ;;
+      *)
+        err "Unsupported peer: $to  不支持的 peer: $to"
+        return 1
+        ;;
+    esac
+  fi
 
   printf '%s\n' "$output"
 }
@@ -1582,6 +1663,15 @@ cmd_peer() {
   local prompt
   prompt="[PEER_REVIEW round=${round} tool=${from_tool}→${to_tool}]\n\n${context}"
 
+  local peer_session=""
+  if command -v tmux >/dev/null 2>&1; then
+    peer_session="roll-peer-${from_tool}-${to_tool}"
+    if ! tmux has-session -t "$peer_session" 2>/dev/null; then
+      tmux new-session -d -s "$peer_session" -x 200 -y 50
+      _peer_auto_attach "$peer_session"
+    fi
+  fi
+
   _peer_ensure_state_dir
   local log_file
   log_file="${_PEER_STATE_DIR}/logs/$(date +%Y%m%d_%H%M%S)_${from_tool}_${to_tool}.md"
@@ -1606,7 +1696,7 @@ cmd_peer() {
 
   info "Calling $to_tool...  调用 $to_tool..."
   local response
-  response="$(_peer_call "$to_tool" "$prompt")"
+  response="$(_peer_call "$to_tool" "$prompt" "$peer_session")"
 
   local stderr_log
   stderr_log="${_PEER_STATE_DIR}/logs/.last_stderr.log"
@@ -1961,13 +2051,22 @@ _write_loop_runner_script() {
   local cmd_verbose="${cmd/claude -p/claude -p --verbose --output-format stream-json}"
   cat > "$inner_path" << INNER
 #!/bin/bash -l
+set -o pipefail
 export PATH="/opt/homebrew/bin:\$PATH"
 FMT="${fmt_script}"
-if [ -f "\$FMT" ]; then
-  ( cd "${project_path}" && ${cmd_verbose} ) | python3 "\$FMT"
-else
-  cd "${project_path}" && ${cmd_verbose}
-fi
+for _attempt in 1 2 3; do
+  if [ -f "\$FMT" ]; then
+    ( cd "${project_path}" && ${cmd_verbose} ) | python3 "\$FMT"
+  else
+    ( cd "${project_path}" && ${cmd_verbose} )
+  fi
+  _exit=\$?
+  [ "\$_exit" -eq 0 ] && break
+  if [ "\$_attempt" -lt 3 ]; then
+    echo "[loop] claude exited \$_exit (attempt \$_attempt/3) — retrying in 30s..."
+    sleep 30
+  fi
+done
 INNER
   chmod +x "$inner_path"
 
@@ -2013,21 +2112,19 @@ if command -v tmux >/dev/null 2>&1; then
   if [ ! -f "\$HOME/.shared/roll/mute" ] && [ "\$(uname)" = "Darwin" ]; then
     # Runtime terminal detection: try preferred first, fallback through installed apps.
     # open -na returns non-zero when app not found, so || chain works as fallback.
-    _PREF="${terminal_pref}"
     _launched=0
-    if [ "\$_PREF" = "ghostty" ] || [ "\$_PREF" = "Ghostty" ]; then
-      open -na Ghostty.app --args -e tmux attach -t \$SESSION >/dev/null 2>&1 && _launched=1 || true
-    fi
-    if [ "\$_launched" -eq 0 ] && { [ "\$_PREF" = "iTerm2" ] || [ "\$_PREF" = "iTerm" ] || [ -d "/Applications/iTerm.app" ]; }; then
-      osascript \\
-        -e 'tell application "System Events" to set _prev to name of first application process whose frontmost is true' \\
-        -e "tell application \"iTerm2\" to create window with default profile command \"tmux attach -t \$SESSION\"" \\
-        -e 'delay 0.3' -e 'try' -e 'tell application _prev to activate' -e 'end try' >/dev/null 2>&1 \\
-        && _launched=1 || true
-    fi
-    if [ "\$_launched" -eq 0 ] && [ -d "/Applications/Ghostty.app" ]; then
-      open -na Ghostty.app --args -e tmux attach -t \$SESSION >/dev/null 2>&1 && _launched=1 || true
-    fi
+    case "${terminal_pref}" in
+      ghostty|Ghostty)
+        open -na Ghostty.app --args -e tmux attach -t \$SESSION >/dev/null 2>&1 && _launched=1 || true
+        ;;
+      iTerm2|iTerm)
+        osascript \\
+          -e 'tell application "System Events" to set _prev to name of first application process whose frontmost is true' \\
+          -e "tell application \"iTerm2\" to create window with default profile command \"tmux attach -t \$SESSION\"" \\
+          -e 'delay 0.3' -e 'try' -e 'tell application _prev to activate' -e 'end try' >/dev/null 2>&1 \\
+          && _launched=1 || true
+        ;;
+    esac
     if [ "\$_launched" -eq 0 ] && command -v osascript >/dev/null 2>&1; then
       osascript \\
         -e 'tell application "System Events" to set _prev to name of first application process whose frontmost is true' \\
@@ -2404,6 +2501,7 @@ _loop_pause() {
     launchctl unload -w "$(_launchd_plist_path "loop" "$project_path")" 2>/dev/null || true
   else
     local slug; slug=$(_project_slug "$project_path")
+    mkdir -p "${_SHARED_ROOT}/loop"
     touch "${_SHARED_ROOT}/loop/PAUSE-${slug}"
   fi
 
@@ -2563,11 +2661,12 @@ _loop_runs() {
   fi
 
   local project_path; project_path=$(pwd -P)
+  local project_slug; project_slug=$(_project_slug "$project_path")
   local filtered
   if $all_flag; then
     filtered=$(cat "$_LOOP_RUNS")
   else
-    filtered=$(jq -c --arg p "$project_path" 'select(.project == $p)' "$_LOOP_RUNS")
+    filtered=$(jq -c --arg p "$project_slug" 'select(.project == $p)' "$_LOOP_RUNS")
   fi
 
   if [[ -z "$filtered" ]]; then
@@ -2795,6 +2894,35 @@ cmd_brief() {
   [[ -f "$latest" ]] && cat "$latest"
 }
 
+_promote_unreleased() {
+  local version="$1"
+  local changelog="$2"
+  [[ -f "$changelog" ]] || return 0
+  grep -q "^## Unreleased" "$changelog" || return 0
+  sed -i.bak "s/^## Unreleased$/## v${version}/" "$changelog" && rm "${changelog}.bak"
+}
+
+_ensure_unreleased() {
+  local changelog="$1"
+  [[ -f "$changelog" ]] || return 0
+  grep -q "^## Unreleased$" "$changelog" && return 0
+  python3 - "$changelog" <<'PYEOF'
+import sys, pathlib
+p = pathlib.Path(sys.argv[1])
+lines = p.read_text().splitlines(keepends=True)
+out = []
+inserted = False
+for line in lines:
+    out.append(line)
+    if not inserted and line.rstrip() == "# Changelog":
+        out.append("\n## Unreleased\n")
+        inserted = True
+if not inserted:
+    out.insert(0, "## Unreleased\n\n")
+p.write_text("".join(out))
+PYEOF
+}
+
 cmd_release() {
   local pkg; pkg=$(node -p "require('./package.json').name" 2>/dev/null || true)
   if [[ "$pkg" == "@seanyao/roll" ]]; then

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seanyao/roll",
-  "version": "2026.512.2",
+  "version": "2026.512.6",
   "description": "Roll — Roll out features with AI agents",
   "scripts": {
     "test": "find tests/unit tests/integration -name '*.bats' | sort | xargs ./tests/helpers/bats-core/bin/bats"

package/skills/roll-loop/SKILL.md

@@ -196,7 +196,7 @@ Optional field, only when `status == "failed"`:
 
 ```bash
 ts=$(date -u +%Y-%m-%dT%H:%M:%SZ)
-project=$(basename "$(pwd)" | sed 's/.*-//')  # or use _project_slug if available
+project=$(_project_slug "$(pwd -P)")  # must match roll loop runs filter
 # duration_sec = cycle_end_epoch - cycle_start_epoch (track at Step 1)
 # tcr_count = git log --oneline --since="<cycle_start>" | grep -c '^[a-f0-9]* tcr:'