@seanyao/roll 2026.523.2 → 2026.524.1

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.523.2"
+VERSION="2026.524.1"
 ROLL_HOME="${ROLL_HOME:-${HOME}/.roll}"
 ROLL_CONFIG="${ROLL_HOME}/config.yaml"
 ROLL_GLOBAL="${ROLL_HOME}/conventions/global"
@@ -920,14 +920,14 @@ _doctor_launchd_stale_section() {
     [[ -d "$wd" ]] && continue
     if [[ "$found" -eq 0 ]]; then
       echo ""
-      echo "Stale launchd plists  无效的 launchd 服务"
+      echo "$(msg doctor.stale_plists)"
       echo ""
       found=1
     fi
     label=$(basename "$plist" .plist)
     echo "  ⚠ ${label}"
     echo "    WorkingDirectory missing: ${wd}"
-    echo "    路径已失效，可清理: launchctl bootout gui/$(id -u)/${label}; rm '${plist}'"
+    echo "    $(msg doctor.stale_plists_cleanup): launchctl bootout gui/$(id -u)/${label}; rm '${plist}'"
   done
   return 0
 }
@@ -936,7 +936,8 @@ _doctor_pr_section() {
   git rev-parse --is-inside-work-tree >/dev/null 2>&1 || return 0
 
   echo ""
-  echo "PR review extras  PR 评审两档开关"
+  echo "$(ROLL_LANG_RESOLVED=en msg doctor.pr_review_extras)"
+  echo "$(ROLL_LANG_RESOLVED=zh msg doctor.pr_review_extras)"
   echo ""
 
   local protection_state event_state
@@ -945,24 +946,24 @@ _doctor_pr_section() {
 
   case "$protection_state" in
     enabled)
-      echo "  ✅ AI review double gate enabled  AI 评审双门已启用"
+      echo "  $(msg doctor.pr_double_gate_enabled)"
       ;;
     disabled)
-      echo "  ⚪ AI review double gate not enabled  双门未启用"
+      echo "  $(msg doctor.pr_double_gate_disabled)"
       _print_pr_pipeline_hint
       ;;
     *)
-      echo "  ⚪ AI review double gate state unknown — requires gh auth  状态未知（需要 gh auth）"
+      echo "  $(msg doctor.pr_double_gate_unknown)"
       _print_pr_pipeline_hint
       ;;
   esac
 
   case "$event_state" in
     present)
-      echo "  ✅ Event-driven PR review installed  事件驱动 PR 评审已安装"
+      echo "  $(msg doctor.pr_event_enabled)"
       ;;
     *)
-      echo "  ⚪ Event-driven PR review not installed  事件驱动 PR 评审未安装"
+      echo "  $(msg doctor.pr_event_disabled)"
       _print_pr_event_hint
       ;;
   esac
@@ -1000,21 +1001,18 @@ _doctor_event_workflow_state() {
 }
 
 _print_pr_event_hint() {
-  cat <<'HINT'
-
-  Optional — enable event-driven PR review (seconds-fast, GitHub only).
-  可选 —— 启用事件驱动 PR 评审（秒级响应，仅限 GitHub）。
-
-  Without this, Roll reviews PRs each loop cycle (~1h). With it,
-  contributors get AI feedback on PR open/update immediately.
-  不安装也行 — loop 每轮会兜底评审。安装后 PR 一开即触发 AI 评审。
-
-      cp templates/workflows/pr-review-event.yml .github/workflows/
-
-  Then set the API key secret for your configured agent in GitHub repo settings.
-  然后在 GitHub 仓库设置中添加你配置的 agent 对应的 API key secret。
-
-HINT
+  echo ""
+  echo "  $(msg doctor.pr_event_optional)"
+  echo "  $(msg doctor.pr_event_optional_zh)"
+  echo ""
+  echo "  $(msg doctor.pr_event_without)"
+  echo "  $(msg doctor.pr_event_without_zh)"
+  echo ""
+  echo "      cp templates/workflows/pr-review-event.yml .github/workflows/"
+  echo ""
+  echo "  $(msg doctor.pr_event_secret)"
+  echo "  $(msg doctor.pr_event_secret_zh)"
+  echo ""
 }
 
 # ═══════════════════════════════════════════════════════════════════════════════
@@ -1031,19 +1029,19 @@ _check_installed_version_or_retry() {
   [[ -z "$expected" || -z "$installed" ]] && return 0
 
   if [[ "$installed" != "$expected" ]]; then
-    warn "Version mismatch: installed ${installed}, expected ${expected} — CDN propagation lag, clearing cache and retrying...  版本不一致（已安装 ${installed}，期望 ${expected}），疑似 CDN 未同步，清理缓存后重试..."
+    warn "$(msg update.version_mismatch "$installed" "$expected")"
     npm cache clean --force &>/dev/null || true
     npm install -g @seanyao/roll@latest &>/dev/null || true
     local after
     after="$(grep "^VERSION=" "${pkg_dir}/@seanyao/roll/bin/roll" 2>/dev/null | sed 's/VERSION="\([^"]*\)"/\1/' || true)"
     if [[ -n "$after" && "$after" != "$expected" ]]; then
-      warn "Still on ${after} after retry — registry may not have propagated yet, try again in a minute.  重试后仍为 ${after}，注册表可能尚未同步，请稍后再试。"
+      warn "$(msg update.still_mismatch "$after")"
     fi
   fi
 }
 
 cmd_update() {
-  info "Current version: roll v${VERSION}  当前版本: roll v${VERSION}"
+  info "$(msg update.current_version "$VERSION")"
   info "Upgrading via npm...  正在通过 npm 升级..."
   echo ""
 
@@ -1520,16 +1518,16 @@ _onboard_failure_hint() {
   local agent="$1" code="$2"
   echo "" >&2
   if [[ "$code" == "130" ]]; then
-    err "Onboard cancelled (Ctrl-C).  Onboard 已取消（Ctrl-C）。" >&2
+    err "$(msg init.onboard_cancelled)" >&2
   else
-    err "Agent '${agent}' exited with code ${code}.  agent '${agent}' 异常退出 (code ${code})。" >&2
+    err "$(msg init.onboard_agent_exited "$agent" "$code")" >&2
   fi
   echo "" >&2
-  echo "  下一步  Next step:" >&2
-  echo "    - 再试一次同一个 agent:  roll init" >&2
-  echo "    - retry the same agent:   roll init" >&2
-  echo "    - 换一个 agent:           ROLL_ONBOARD_AGENT=<name> roll init" >&2
-  echo "    - switch to another:      ROLL_ONBOARD_AGENT=<name> roll init" >&2
+  echo "  $(msg init.onboard_next_step)" >&2
+  echo "    - $(msg init.onboard_retry)" >&2
+  echo "    - $(msg init.onboard_retry_en)" >&2
+  echo "    - $(msg init.onboard_switch)" >&2
+  echo "    - $(msg init.onboard_switch_en)" >&2
   echo "" >&2
 }
 
@@ -1821,13 +1819,13 @@ cmd_offboard() {
   local changeset; changeset=$(_onboard_changeset_path "$project_dir")
 
   if [[ ! -f "$changeset" ]]; then
-    err "No onboard changeset found at .roll/onboard-changeset.yaml"
-    err "未找到 onboard 变更清单 .roll/onboard-changeset.yaml"
+    err "$(msg offboard.no_changeset_en)"
+    err "$(msg offboard.no_changeset_zh)"
     echo "" >&2
-    echo "  Manual offboard — remove these by hand if they came from Roll:" >&2
-    echo "    rm -rf .roll/                  # all process artefacts" >&2
-    echo "    rm -f AGENTS.md CLAUDE.md      # only if they were generated by roll init" >&2
-    echo "    Edit .gitignore to remove any '.roll/' entry" >&2
+    echo "  $(msg offboard.manual_offboard)" >&2
+    echo "    $(msg offboard.manual_rm_roll)" >&2
+    echo "    $(msg offboard.manual_rm_agents)" >&2
+    echo "    $(msg offboard.manual_edit_gitignore)" >&2
     return 1
   fi
 
@@ -3086,6 +3084,18 @@ _project_agent() {
   fi
 }
 
+_fallback_agent() {
+  local pref new_pref
+  new_pref=$(_project_agent_pref_file)
+  if [[ -f "$new_pref" ]] && grep -q "^fallback_agent:" "$new_pref" 2>/dev/null; then
+    grep "^fallback_agent:" "$new_pref" | awk '{print $2}' | tr -d '"' | head -1
+  elif [[ -f ".roll.yaml" ]] && grep -q "^fallback_agent:" .roll.yaml 2>/dev/null; then
+    grep "^fallback_agent:" .roll.yaml | awk '{print $2}' | tr -d '"' | head -1
+  elif [[ -f "$ROLL_CONFIG" ]] && grep -q "fallback_agent:" "$ROLL_CONFIG" 2>/dev/null; then
+    grep "fallback_agent:" "$ROLL_CONFIG" | awk '{print $2}' | tr -d '"' | head -1
+  fi
+}
+
 _skill_content() {
   # Strip YAML frontmatter (---...---) — it's roll-internal metadata, not agent instructions
   awk 'NR==1 && /^---$/{skip=1;next} skip && /^---$/{skip=0;next} !skip{print}' "$1"
@@ -3211,6 +3221,115 @@ _agent_run_skill() {
 # `list` / `preview` (DECK-005). The AI authoring step happens in `new`;
 # everything else is pure bash.
 # ═══════════════════════════════════════════════════════════════════════════════
+# ─── Progress helpers (US-DECK-010) ──────────────────────────────────────────
+# Shared state for slides progress reporting.
+
+_SLIDES_PROGRESS_PHASES=()
+_SLIDES_PROGRESS_START_TIME=0
+_SLIDES_PROGRESS_CURRENT=""
+_SLIDES_PROGRESS_PHASE_START_TIME=0
+_SLIDES_PROGRESS_SPINNER_PID=""
+_SLIDES_PROGRESS_QUIET=0
+
+_slides_progress_init() {
+  _SLIDES_PROGRESS_PHASES=("$@")
+  _SLIDES_PROGRESS_START_TIME=$(date +%s)
+  _SLIDES_PROGRESS_CURRENT=""
+  _SLIDES_PROGRESS_PHASE_START_TIME=0
+  _SLIDES_PROGRESS_SPINNER_PID=""
+  _SLIDES_PROGRESS_QUIET=0
+}
+
+_slides_progress_quiet() {
+  _SLIDES_PROGRESS_QUIET=1
+}
+
+_slides_progress_elapsed_str() {
+  local elapsed="${1:-0}"
+  local min=$(( elapsed / 60 ))
+  local sec=$(( elapsed % 60 ))
+  if [[ $min -gt 0 ]]; then
+    printf '%dm %ds' "$min" "$sec"
+  else
+    printf '%ds' "$sec"
+  fi
+}
+
+_slides_progress_detect_tty() {
+  if [[ ! -t 1 ]]; then
+    _slides_progress_quiet
+  fi
+}
+
+_slides_progress_phase_enter() {
+  local phase="$1"
+  local now
+  now=$(date +%s)
+
+  # Stop any running spinner
+  if [[ -n "${_SLIDES_PROGRESS_SPINNER_PID:-}" ]]; then
+    kill "${_SLIDES_PROGRESS_SPINNER_PID}" 2>/dev/null || true
+    wait "${_SLIDES_PROGRESS_SPINNER_PID}" 2>/dev/null || true
+    _SLIDES_PROGRESS_SPINNER_PID=""
+    if [[ $_SLIDES_PROGRESS_QUIET -eq 0 ]]; then
+      printf '\r\033[K' >&2
+    fi
+  fi
+
+  # Print previous phase completion
+  if [[ -n "$_SLIDES_PROGRESS_CURRENT" && $_SLIDES_PROGRESS_PHASE_START_TIME -gt 0 ]]; then
+    local prev_elapsed=$(( now - _SLIDES_PROGRESS_PHASE_START_TIME ))
+    local elapsed_str
+    elapsed_str=$(_slides_progress_elapsed_str "$prev_elapsed")
+    if [[ $_SLIDES_PROGRESS_QUIET -eq 0 ]]; then
+      printf '  ✅ %s (%s)\n' "$_SLIDES_PROGRESS_CURRENT" "$elapsed_str" >&2
+    fi
+  fi
+
+  _SLIDES_PROGRESS_CURRENT="$phase"
+  _SLIDES_PROGRESS_PHASE_START_TIME="$now"
+
+  if [[ $_SLIDES_PROGRESS_QUIET -eq 0 ]]; then
+    printf '→ %s ...\n' "$phase" >&2
+  fi
+  return 0
+}
+
+_slides_progress_spinner_start() {
+  [[ $_SLIDES_PROGRESS_QUIET -eq 1 ]] && return 0
+
+  local chars='⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏'
+  local delay=0.1
+  local label_file="${TEST_TMP:-/tmp}/roll-slides-spinner-label-$$"
+  printf '%s' "$_SLIDES_PROGRESS_CURRENT" > "$label_file"
+  (
+    local i=0
+    while true; do
+      local label
+      label=$(cat "$label_file" 2>/dev/null || echo "$_SLIDES_PROGRESS_CURRENT")
+      printf '\r\033[K%s %s' "${chars:$i:1}" "$label" >&2
+      i=$(( (i+1) % ${#chars} ))
+      sleep "$delay"
+    done
+  ) &
+  _SLIDES_PROGRESS_SPINNER_PID=$!
+}
+
+_slides_progress_spinner_label() {
+  local label="$1"
+  local label_file="${TEST_TMP:-/tmp}/roll-slides-spinner-label-$$"
+  printf '%s' "$label" > "$label_file"
+}
+
+_slides_progress_ok() {
+  local phase="$1"
+  local elapsed="${2:-0}"
+  local elapsed_str
+  elapsed_str=$(_slides_progress_elapsed_str "$elapsed")
+  [[ $_SLIDES_PROGRESS_QUIET -eq 0 ]] && printf '  ✅ %s (%s)\n' "$phase" "$elapsed_str" >&2
+}
+
+# ─── slides help ─────────────────────────────────────────────────────────────
 _slides_help() {
   cat <<'EOF'
 roll slides — deck.md → HTML rendering
@@ -3220,9 +3339,9 @@ USAGE  用法
   roll slides build <slug> [--no-open]
                           Render .roll/slides/<slug>/deck.md → .roll/slides/<slug>.html
                           渲染 deck.md 为 HTML 并自动打开浏览器
-  roll slides new "<topic>" [--template <name>]
-                          Generate a new deck.md from a topic via the selected AI agent
-                          通过所选 AI agent 根据主题生成新的 deck.md
+  roll slides new "<topic>" [--template <name>] [--no-build]
+                          Generate deck.md via AI, then auto-build + open HTML
+                          通过 AI 生成 deck.md，自动渲染并打开 HTML
   roll slides list        List all decks under .roll/slides/ as a table
                           列出 .roll/slides/ 下所有幻灯片
   roll slides preview <slug> [--no-open]
@@ -3232,6 +3351,8 @@ USAGE  用法
 OPTIONS  选项
   --no-open               Skip auto-opening the rendered HTML in a browser
                           渲染后不自动打开浏览器
+  --no-build              Skip auto-build after agent completes (deck.md only)
+                          仅生成 deck.md，不自动渲染
   --help, -h              Show this help
                           显示本帮助
 EOF
@@ -3546,13 +3667,15 @@ _slides_topic_slug() {
 # `.roll/slides/<slug>/deck.md` (and nothing else). After the agent exits,
 # we print a bilingual hint pointing at `roll slides build <slug>`.
 cmd_slides_new() {
-  local topic="" template="introduction-v3"
+  local topic="" template="introduction-v3" quiet=0 no_build=0
   while [[ $# -gt 0 ]]; do
     case "$1" in
       --template)
         [[ -n "${2:-}" ]] || { err "--template requires a value  --template 需要一个值"; return 1; }
         template="$2"; shift 2 ;;
       --template=*) template="${1#--template=}"; shift ;;
+      --quiet) quiet=1; shift ;;
+      --no-build) no_build=1; shift ;;
       --help|-h) _slides_help; return 0 ;;
       --*) err "Unknown option: $1  未知选项: $1"; return 1 ;;
       *)
@@ -3566,8 +3689,8 @@ cmd_slides_new() {
   done
 
   if [[ -z "$topic" ]]; then
-    err "Usage: roll slides new \"<topic>\" [--template <name>]"
-    echo "  用法：roll slides new \"<主题>\" [--template <模板名>]" >&2
+    err "Usage: roll slides new \"<topic>\" [--template <name>] [--quiet] [--no-build]"
+    echo "  用法：roll slides new \"<主题>\" [--template <模板名>] [--quiet] [--no-build]" >&2
     return 1
   fi
 
@@ -3578,14 +3701,26 @@ cmd_slides_new() {
     return 1
   fi
 
+  # Progress: init with 5 phases, detect quiet mode
+  _slides_progress_init launching generating validating rendering opening
+  _slides_progress_detect_tty
+  if [[ "$quiet" -eq 1 ]]; then
+    _slides_progress_quiet
+  fi
+
+  # Ctrl-C trap: stop spinner and clean cursor
+  trap '_slides_progress_phase_enter "cancelled" 2>/dev/null; exit 130' INT TERM
+
+  # Phase: launching
+  _slides_progress_phase_enter "launching"
+
   local skill_file="${ROLL_PKG_DIR}/skills/roll-deck/SKILL.md"
   [[ -f "$skill_file" ]] || { err "Skill not found: ${skill_file}"; return 1; }
   local skill_body; skill_body=$(_skill_content "$skill_file")
 
   local agent; agent=$(_project_agent)
 
-  # Compose the full prompt: skill body + concrete task context. The agent
-  # reads the skill, then sees the topic / slug / template it must use.
+  # Compose the full prompt
   local prompt
   prompt="$(cat <<EOF
 ${skill_body}
@@ -3607,16 +3742,81 @@ EOF
 
   _agent_argv "$agent" text "$prompt" || {
     err "Unknown agent '${agent}'. Run: roll agent use <claude|kimi|deepseek|pi|codex|opencode>"
+    trap - INT TERM
     return 1
   }
 
-  info "Launching ${agent} with roll-deck skill for topic: ${topic}"
-  info "启动 ${agent} 处理主题：${topic}"
-  "${_AGENT_ARGV[@]}"
+  # Phase: generating — launch agent in background + spinner + file-watch
+  _slides_progress_phase_enter "generating"
+
+  local deck_file=".roll/slides/${slug}/deck.md"
+  local deck_dir; deck_dir="$(dirname "$deck_file")"
+  mkdir -p "$deck_dir"
+
+  # Start spinner
+  _slides_progress_spinner_start
+
+  # Launch agent in background
+  "${_AGENT_ARGV[@]}" &
+  local agent_pid=$!
+
+  # File-watch: poll deck.md for ## Slide N count and update spinner label
+  local slide_count=0 last_slide_count=-1
+  while kill -0 "$agent_pid" 2>/dev/null; do
+    if [[ -f "$deck_file" ]]; then
+      slide_count=$(grep -c '^## Slide ' "$deck_file" 2>/dev/null || echo 0)
+      if [[ "$slide_count" != "$last_slide_count" ]]; then
+        last_slide_count="$slide_count"
+        if [[ "$slide_count" -gt 0 ]]; then
+          _slides_progress_spinner_label "generating slide ${slide_count}/18"
+        fi
+      fi
+    fi
+    sleep 1
+  done
+
+  # Agent finished — stop spinner
+  if [[ -n "${_SLIDES_PROGRESS_SPINNER_PID:-}" ]]; then
+    kill "${_SLIDES_PROGRESS_SPINNER_PID}" 2>/dev/null || true
+    wait "${_SLIDES_PROGRESS_SPINNER_PID}" 2>/dev/null || true
+    _SLIDES_PROGRESS_SPINNER_PID=""
+    [[ $_SLIDES_PROGRESS_QUIET -eq 0 ]] && printf '\r\033[K' >&2
+  fi
+
+  wait "$agent_pid"
   local rc=$?
 
-  # Whether the agent succeeded or not, point the user at the next bash step.
-  # (Build will surface its own validation errors if deck.md is malformed.)
+  # Phase: validating
+  _slides_progress_phase_enter "validating"
+
+  # If deck.md exists, validate it
+  if [[ -f "$deck_file" ]]; then
+    local lib_dir; lib_dir=$(_slides_lib)
+    if python3 "${lib_dir}/slides-validate.py" "$deck_file" >/dev/null 2>&1; then
+      : # validation passed
+    else
+      [[ $_SLIDES_PROGRESS_QUIET -eq 0 ]] && printf '  ⚠️ validation warnings (build may surface details)\n' >&2
+    fi
+  fi
+
+  # Phase: rendering + opening (unless --no-build)
+  if [[ "$no_build" -eq 0 ]] && [[ -f "$deck_file" ]]; then
+    _slides_progress_phase_enter "rendering"
+    cmd_slides_build "$slug" --no-open
+    local build_rc=$?
+
+    if [[ $build_rc -eq 0 ]]; then
+      _slides_progress_phase_enter "opening"
+      local opener
+      if opener=$(_slides_open_cmd); then
+        "$opener" ".roll/slides/${slug}.html" >/dev/null 2>&1 || true
+      fi
+    fi
+  fi
+
+  trap - INT TERM
+
+  # Print Next hint (unless --quiet flag was explicitly passed)
   echo
   echo "Next:  roll slides build ${slug}"
   echo "下一步：roll slides build ${slug}"
@@ -3624,14 +3824,15 @@ EOF
   return "$rc"
 }
 
-# ─── cmd_prices (US-VIEW-013) ─────────────────────────────────────────────────
+# ─── cmd_prices (US-VIEW-013 / FIX-116) ───────────────────────────────────────
 # `roll prices show`     — print the current price snapshot table.
 # `roll prices refresh`  — fetch live pricing docs, diff vs latest snapshot,
 #                          write a new snapshot when rates have changed.
+# FIX-116: --vendor flag for multi-vendor support.
 _prices_help() {
   cat <<'EOF'
-Usage: roll prices <subcommand> [--url URL]
-      roll prices <子命令> [--url 网址]
+Usage: roll prices <subcommand> [--url URL] [--vendor VENDOR]
+      roll prices <子命令> [--url 网址] [--vendor 厂商]
 
 Subcommands:
   show     Print the current price snapshot table.
@@ -3639,6 +3840,10 @@ Subcommands:
   refresh  Fetch the official pricing docs, diff against the latest snapshot,
            and write a new snapshot only when rates have changed.
            拉取官方价格文档与最新快照对比，有变化才落新快照。
+
+Options:
+  --vendor anthropic|deepseek|kimi  Target vendor for refresh (default: anthropic).
+                                    指定拉取价格的厂商（默认：anthropic）。
 EOF
 }
 
@@ -3654,36 +3859,60 @@ version, effective_at, source_url = mp.snapshot_meta()
 print(f"price snapshot  价格快照")
 print(f"  version        {version}")
 print(f"  effective_at   {effective_at}")
-print(f"  source         {source_url}")
-print(f"  default_model  {mp.DEFAULT}")
+print(f"  snapshots      {len(mp._SNAPSHOTS)} loaded  已加载")
+for snap in mp._SNAPSHOTS:
+    v = snap.get("vendor", "—")
+    c = snap.get("currency", "—")
+    print(f"    {v:<12} {c:>4}  {snap['source_url']}")
 print()
-print(f"  {'model':<22}{'in':>8}{'out':>8}{'cw':>8}{'cr':>8}")
+print(f"  {'model':<24}{'cur':>4}{'in':>10}{'out':>10}{'cw':>10}{'cr':>10}")
 for model in sorted(mp.PRICES):
     p = mp.PRICES[model]
-    print(f"  {model:<22}{p['in']:>8.2f}{p['out']:>8.2f}{p['cache_create']:>8.2f}{p['cache_read']:>8.2f}")
+    cur = mp.currency_for(model)
+    print(f"  {model:<24}{cur:>4}{p['in']:>10.4f}{p['out']:>10.4f}{p['cache_create']:>10.4f}{p['cache_read']:>10.4f}")
 print()
-print("rates per million tokens, USD  单位为每百万 token 美元")
+print("rates per million tokens  每百万 token 单价")
 PY
 }
 
 cmd_prices_refresh() {
   local url=""
+  local vendor=""
   while (( $# > 0 )); do
     case "$1" in
       --url) url="$2"; shift 2 ;;
+      --vendor) vendor="$2"; shift 2 ;;
       *)     err "Unknown flag: $1  未知参数: $1"; return 1 ;;
     esac
   done
   local lib_dir="${ROLL_PKG_DIR}/lib"
-  python3 - "$lib_dir" "$url" <<'PY'
+  python3 - "$lib_dir" "$url" "$vendor" <<'PY'
 import os, sys
 lib_dir = sys.argv[1]
 override_url = sys.argv[2] if len(sys.argv) > 2 else ""
+vendor = sys.argv[3] if len(sys.argv) > 3 else ""
 sys.path.insert(0, lib_dir)
 import prices_fetcher as pf
 
 snapshot_dir = os.path.join(lib_dir, "prices")
-url = override_url or pf.DEFAULT_SOURCE_URL
+
+# FIX-116: vendor-specific default URLs.
+VENDOR_URLS = {
+    "anthropic": "https://platform.claude.com/docs/en/about-claude/pricing",
+    "deepseek":  "https://api-docs.deepseek.com/quick_start/pricing",
+    "kimi":      "https://platform.kimi.com/docs/pricing/chat",
+}
+
+if vendor:
+    default_url = VENDOR_URLS.get(vendor)
+    if not default_url:
+        print(f"[roll] unknown vendor: {vendor}  未知厂商", file=sys.stderr)
+        print(f"[roll] known vendors: {', '.join(sorted(VENDOR_URLS))}  已知厂商", file=sys.stderr)
+        sys.exit(1)
+    url = override_url or default_url
+    pf.DEFAULT_SOURCE_URL = url
+else:
+    url = override_url or pf.DEFAULT_SOURCE_URL
 
 try:
     action, changes = pf.refresh(snapshot_dir=snapshot_dir, url=url)
@@ -3725,6 +3954,37 @@ cmd_prices() {
   esac
 }
 
+# FIX-113: changelog audit — list PRs merged to main since latest release
+# tag that don't appear in CHANGELOG.md's ## Unreleased section.
+cmd_changelog() {
+  local subcmd="${1:-audit}"
+  shift || true
+  case "$subcmd" in
+    audit)
+      python3 "${ROLL_PKG_DIR}/lib/changelog_audit.py" "$@"
+      ;;
+    --help|-h|help)
+      cat <<EOF
+Usage: roll changelog audit [--since <tag>] [--json]
+                                                                  发版前体检
+Scan PRs merged to main since latest v* tag; flag ones that look user-visible
+(carry US-/FIX-/REFACTOR- id) but are missing from CHANGELOG.md '## Unreleased'.
+
+Read-only — never edits CHANGELOG. Use to catch drift before release.
+
+  roll changelog audit                # check against latest v* tag
+  roll changelog audit --since v2026.520.1
+  roll changelog audit --json         # machine-readable
+EOF
+      ;;
+    *)
+      err "Unknown subcommand: ${subcmd}  未知子命令：${subcmd}"
+      err "Try: roll changelog audit"
+      return 1
+      ;;
+  esac
+}
+
 cmd_slides() {
   local subcmd="${1:-}"
   shift || true
@@ -4428,6 +4688,21 @@ _write_loop_runner_script() {
     claude_cmd="${claude_cmd/--output-format stream-json/--output-format stream-json --add-dir \"\$WT\"}"
   fi
   local slug; slug=$(_project_slug "$project_path")
+  # FIX-115: build fallback agent command. When primary agent fails all 3
+  # attempts, the inner runner switches to this command for 3 more attempts.
+  local fallback_agent; fallback_agent=$(_fallback_agent)
+  local fallback_cmd=""
+  if [[ -n "$fallback_agent" ]]; then
+    local fallback_skill_file="${ROLL_HOME}/skills/roll-loop/SKILL.md"
+    if [[ -f "$fallback_skill_file" ]]; then
+      local fallback_prompt; fallback_prompt=$(_skill_content "$fallback_skill_file")
+      if _agent_argv "$fallback_agent" plain "$fallback_prompt" 2>/dev/null; then
+        _AGENT_ARGV[0]=$(command -v "${_AGENT_ARGV[0]}" 2>/dev/null || echo "${_AGENT_ARGV[0]}")
+        printf -v fallback_cmd '%q ' "${_AGENT_ARGV[@]}"
+        fallback_cmd="${fallback_cmd% }"
+      fi
+    fi
+  fi
   cat > "$inner_path" << INNER
 #!/bin/bash -l
 set -o pipefail
@@ -4755,6 +5030,18 @@ for _orphan_wt in "\${_SHARED_ROOT}/worktrees/${slug}-cycle-"*; do
   [ -d "\${_orphan_wt}/.git" ] || [ -f "\${_orphan_wt}/.git" ] || continue
   _orphan_branch=\$(cd "\$_orphan_wt" && git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "")
   [ -z "\$_orphan_branch" ] && continue
+  # FIX-114: PR for this branch may already be squash-merged externally. In
+  # that case origin/main..HEAD still shows commits (squash created new SHA)
+  # so the old "needs republish" path tries to recreate the PR and fails.
+  # Ask gh first; if MERGED → drop the worktree clean.
+  if command -v gh >/dev/null 2>&1; then
+    _orphan_pr_state=\$(gh pr view "\$_orphan_branch" --json state -q .state 2>/dev/null || echo "")
+    if [ "\$_orphan_pr_state" = "MERGED" ]; then
+      echo "[loop] FIX-114: orphan worktree \$_orphan_wt branch \$_orphan_branch already merged remotely; cleaning up"
+      _worktree_cleanup "\$_orphan_wt" "\$_orphan_branch"
+      continue
+    fi
+  fi
   _orphan_commits=\$(cd "\$_orphan_wt" && git rev-list --count origin/main..HEAD 2>/dev/null || echo 0)
   if [ "\$_orphan_commits" -gt 0 ]; then
     echo "[loop] FIX-040: recovering orphan worktree \$_orphan_wt (branch \$_orphan_branch, \${_orphan_commits} commits)"
@@ -4821,6 +5108,10 @@ export LOOP_PROJECT_SLUG="${slug}"
 export LOOP_CYCLE_ID="\${CYCLE_ID}"
 export LOOP_SHARED_ROOT="\${_SHARED_ROOT:-\$HOME/.shared/roll}"
 _phase_begin claude_invoke
+# FIX-115: fallback agent support — when primary fails 3 attempts, try fallback 3 more
+FALLBACK_AGENT_NAME="${fallback_agent}"
+FALLBACK_CMD="${fallback_cmd}"
+_USE_FALLBACK=0
 for _attempt in 1 2 3; do
   # FIX-068: defensive reset before each attempt — _CYCLE_TIMED_OUT carries
   # the SIGTERM result of the previous attempt and would otherwise force an
@@ -4858,6 +5149,36 @@ for _attempt in 1 2 3; do
   fi
 done
 
+# FIX-115: fallback agent retry — when primary fails all 3 attempts and a
+# fallback_agent is configured, try the fallback for 3 more attempts.
+if [ "\$_CYCLE_TIMED_OUT" -eq 0 ] && [ "\$_exit" -ne 0 ] && [ -n "\$FALLBACK_AGENT_NAME" ] && [ -n "\$FALLBACK_CMD" ]; then
+  _loop_event agent_switch "\$FALLBACK_AGENT_NAME" "" "primary failed after 3 attempts" || true
+  echo "[loop] primary agent failed after 3 attempts — switching to fallback: \$FALLBACK_AGENT_NAME"
+  _USE_FALLBACK=1
+  for _attempt in 1 2 3; do
+    _CYCLE_TIMED_OUT=0
+    ( sleep "\$LOOP_CYCLE_TIMEOUT_SEC" && {
+        kill -TERM \$\$ 2>/dev/null
+        pkill -TERM -P \$\$ 2>/dev/null
+        pkill -TERM -f "\$WT" 2>/dev/null
+        sleep 5
+        pkill -KILL -P \$\$ 2>/dev/null
+        pkill -KILL -f "\$WT" 2>/dev/null
+      } ) &
+    _WATCHDOG_PID=\$!
+    ( cd "\$WT" && \$FALLBACK_CMD )
+    _exit=\$?
+    kill "\$_WATCHDOG_PID" 2>/dev/null
+    wait "\$_WATCHDOG_PID" 2>/dev/null
+    [ "\$_CYCLE_TIMED_OUT" -eq 1 ] && break
+    [ "\$_exit" -eq 0 ] && break
+    if [ "\$_attempt" -lt 3 ]; then
+      echo "[loop] \$FALLBACK_AGENT_NAME exited \$_exit (attempt \$_attempt/3) — retrying in 30s..."
+      sleep 30
+    fi
+  done
+fi
+
 if [ "\$_CYCLE_TIMED_OUT" -eq 1 ] || [ "\$_exit" -ne 0 ]; then
   _phase_end claude_invoke fail
 else
@@ -6296,8 +6617,13 @@ _loop_check_depends_on() {
 }
 
 # _loop_is_manual_only <story-id> [backlog-path]
-#   Exit 0: story's own row carries `manual-only:true`.
+#   Exit 0: story's own row carries any manual-only:<value> tag.
 #   Exit 1: tag absent, story-id not found, or backlog missing.
+#
+# FIX-109: loop used to accept only the literal `manual-only:true` value;
+# anything else (e.g. `manual-only:roll-meta`, `manual-only:sean-yao`) was
+# ignored and the story got picked. Now any non-empty `manual-only:<value>`
+# qualifies — lets users tag rows reserved for a specific human or scope.
 _loop_is_manual_only() {
   local id="$1"
   local backlog="${2:-.roll/backlog.md}"
@@ -6308,7 +6634,7 @@ _loop_is_manual_only() {
   row=$(grep -E "^\| \[?${id}[]| ]" "$backlog" | head -1)
   [ -n "$row" ] || return 1
 
-  echo "$row" | grep -qE 'manual-only:true'
+  echo "$row" | grep -qE 'manual-only:[A-Za-z0-9_.-]+'
 }
 
 # US-AUTO-034: PR-first inbox — loop processes open PRs before scanning BACKLOG.
@@ -7865,6 +8191,14 @@ cmd_backlog() {
       _backlog_lint "$@" "$backlog"
       return
       ;;
+    unstick)
+      # FIX-112: revert 🔨 In Progress stories whose latest cycle ended
+      # failed / aborted / blocked > N hours ago (default 4). Conservative
+      # gate so it never undoes legitimately-in-progress work.
+      shift
+      python3 "${ROLL_PKG_DIR}/lib/loop_unstick.py" "$@"
+      return
+      ;;
     block|defer|unblock|promote)
       local pattern="${2:-}"
       local reason="${3:-}"
@@ -8401,6 +8735,7 @@ _legacy_help() {
   echo "  backlog block <pat> [reason]  Mark matching items as 🔒 Blocked  标记为已阻塞"
   echo "  backlog defer <pat> [reason]  Mark matching items as ⏸ Deferred  标记为已推迟"
   echo "  backlog unblock <pat>         Restore matching items to 📋 Todo   恢复为待处理"
+  echo "  backlog unstick [--dry-run]   Revert In Progress whose cycle failed >4h ago  自愈卡住的进行中任务"
   echo "  backlog lint                  Check descriptions for path/function/filename violations  检查描述合规"
   echo "  agent [use <name>|list]   [Config] Per-project agent selection            切换项目 agent"
   echo "  ci [--wait]            [CI] Show or wait for current commit's CI status       查看/等待 CI 状态"
@@ -8481,17 +8816,17 @@ _check_structure() {
   fi
 
   if [[ "$_has_old_path" == "true" ]] && _has_roll_signature "$root"; then
-    err "Legacy structure detected at: $root  发现老结构目录"
+    err "$(msg check_structure.detected "$root")"
     echo "" >&2
-    echo "  This project uses the pre-2.0 layout (BACKLOG.md / docs/*). Roll 2.0 requires" >&2
-    echo "  process artifacts to live in .roll/. Run the migration to upgrade:" >&2
+    echo "  $(msg check_structure.pre_2_0_layout)" >&2
+    echo "  $(msg check_structure.run_migration)" >&2
     echo "" >&2
-    echo "    roll migrate --dry-run       # Preview changes" >&2
-    echo "    roll migrate                 # Execute (single atomic commit)" >&2
+    echo "    roll migrate --dry-run       $(msg check_structure.preview_changes)" >&2
+    echo "    roll migrate                 $(msg check_structure.execute)" >&2
     echo "" >&2
-    echo "  Migration guide: ${ROLL_PKG_DIR}/guide/en/migration-2.0.md" >&2
+    echo "  $(msg check_structure.migration_guide): ${ROLL_PKG_DIR}/guide/en/migration-2.0.md" >&2
     echo "" >&2
-    echo "  To roll back to Roll 1.x temporarily:" >&2
+    echo "  $(msg check_structure.roll_back):" >&2
     echo "    npm install -g @seanyao/roll@1" >&2
     exit 1
   fi
@@ -8526,11 +8861,12 @@ main() {
     review-pr)     cmd_review_pr "$@" ;;
     slides)        cmd_slides "$@" ;;
     prices)        cmd_prices "$@" ;;
+    changelog)     cmd_changelog "$@" ;;
     version|--version|-v) echo "roll v${VERSION}" ;;
     help|--help|-h) _help "$@" ;;
     "") [[ -f ".roll/backlog.md" ]] && _home || { _help; _show_changelog; } ;;
     *)
-      err "Unknown command: $cmd  未知命令: $cmd"
+      err "$(msg main.unknown_command "$cmd")"
       echo ""
       usage
       exit 1
@@ -8543,7 +8879,7 @@ _show_changelog() {
   local changelog="${ROLL_PKG_DIR}/CHANGELOG.md"
   [[ -f "$changelog" ]] || return 0
 
-  echo -e "${BOLD}Recent Changes  最近更新:${NC}"
+  echo -e "${BOLD}$(msg changelog.heading):${NC}"
 
   local count=0 in_section=false
   while IFS= read -r line; do
@@ -8589,7 +8925,7 @@ _notify_update() {
     return
   fi
   echo ""
-  warn "v${latest} available — run 'roll update' to upgrade  有新版本 v${latest} — 运行 'roll update' 升级"
+  warn "$(msg update.available "$latest")"
 }
 
 if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then