@seanyao/roll 2026.512.1 → 2026.512.2

package/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## Unreleased
+- **Added**: BACKLOG 支持 block / defer / unblock 状态管理 — 标记卡住的任务不再占队列
+- **Fixed**: 自动弹窗现在能识别 Ghostty 和 iTerm2，不再强制弹出 Terminal.app
+- **Fixed**: loop 检测到上一轮还在跑时自动跳过，不重复启动
+
 ## v2026.512.1
 - **Added**: `roll loop pause` / `roll loop resume` — 想自己上手时一键暂停 loop，做完再恢复
 - **Added**: `roll status` 新增所有项目的 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.1"
+VERSION="2026.512.2"
 ROLL_HOME="${ROLL_HOME:-${HOME}/.roll}"
 ROLL_CONFIG="${ROLL_HOME}/config.yaml"
 ROLL_GLOBAL="${ROLL_HOME}/conventions/global"
@@ -1994,6 +1994,13 @@ if [ -f "\$LOCK" ]; then
   fi
   rm -f "\$LOCK"
 fi
+# Guard against stale-LOCK case: if the tmux session is already alive,
+# a previous runner's LOCK was removed (e.g. parent terminal closed) but
+# the work is still in progress — don't kill it.
+if command -v tmux >/dev/null 2>&1 && tmux has-session -t "\$SESSION" 2>/dev/null; then
+  echo "[\$(date '+%Y-%m-%dT%H:%M:%S%z')] tmux session \$SESSION still active, skipping" >> "\$LOG"
+  exit 0
+fi
 echo "\$\$" > "\$LOCK"
 trap 'rm -f "\$LOCK"' EXIT
 if command -v tmux >/dev/null 2>&1; then
@@ -2004,29 +2011,29 @@ if command -v tmux >/dev/null 2>&1; then
   # tmux session so the user can watch the loop work in real time. Best-effort
   # focus retention: capture the current frontmost app and re-activate after.
   if [ ! -f "\$HOME/.shared/roll/mute" ] && [ "\$(uname)" = "Darwin" ]; then
-    case "${terminal_pref}" in
-      ghostty|Ghostty)
-        (open -na Ghostty.app --args -e tmux attach -t \$SESSION >/dev/null 2>&1) &
-        ;;
-      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) &
-        ;;
-      *)
-        command -v osascript >/dev/null 2>&1 && (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) &
-        ;;
-    esac
+    # 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
+    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
   fi
   while tmux has-session -t "\$SESSION" 2>/dev/null; do sleep 5; done
 else
@@ -2799,9 +2806,45 @@ cmd_release() {
 }
 
 # ═══════════════════════════════════════════════════════════════════════════════
-# BACKLOG — show pending tasks
+# BACKLOG — show pending tasks / manage status
 # ═══════════════════════════════════════════════════════════════════════════════
 
+# Update status of all BACKLOG rows whose ID field contains <pattern> (case-insensitive).
+# Uses Python for reliable emoji/Unicode handling.
+_backlog_set_status() {
+  local pattern="$1"
+  local new_status="$2"
+  local backlog="BACKLOG.md"
+  python3 -c "
+import sys, re
+pattern, new_status, filename = sys.argv[1], sys.argv[2], sys.argv[3]
+lines = open(filename, encoding='utf-8').readlines()
+count = 0
+out = []
+for line in lines:
+    if line.startswith('|') and line.count('|') >= 4:
+        parts = line.split('|')
+        if len(parts) >= 5:
+            id_field = re.sub(r'\[([^\]]+)\]\([^)]+\)', r'\1', parts[1]).strip()
+            if pattern.upper() in id_field.upper():
+                parts[-2] = ' ' + new_status + ' '
+                line = '|'.join(parts)
+                count += 1
+    out.append(line)
+open(filename, 'w', encoding='utf-8').writelines(out)
+print(count)
+" "$pattern" "$new_status" "$backlog"
+}
+
+_backlog_extract_id() {
+  local line="$1"
+  if echo "$line" | grep -q '\[US-'; then
+    echo "$line" | sed 's/.*\[\(US-[^]]*\)\].*/\1/'
+  else
+    echo "$line" | awk -F'|' '{print $2}' | tr -d ' '
+  fi
+}
+
 cmd_backlog() {
   local backlog="BACKLOG.md"
   if [[ ! -f "$backlog" ]]; then
@@ -2809,8 +2852,38 @@ cmd_backlog() {
     return 1
   fi
 
-  local us_items fix_items refactor_items idea_items total=0
+  local subcmd="${1:-}"
+
+  # ── Status management subcommands ─────────────────────────────────────────
+  case "$subcmd" in
+    block|defer|unblock|promote)
+      local pattern="${2:-}"
+      local reason="${3:-}"
+      if [[ -z "$pattern" ]]; then
+        err "Usage: roll backlog $subcmd <pattern> [reason]  用法: roll backlog $subcmd <匹配模式> [原因]"
+        return 1
+      fi
+      local new_status
+      case "$subcmd" in
+        block)           new_status="🔒 Blocked${reason:+ [${reason}]}" ;;
+        defer)           new_status="⏸ Deferred${reason:+ [${reason}]}" ;;
+        unblock|promote) new_status="📋 Todo" ;;
+      esac
+      local count
+      count=$(_backlog_set_status "$pattern" "$new_status")
+      if [[ "$count" -eq 0 ]]; then
+        echo "  No items matched: $pattern  未找到匹配项: $pattern"
+      else
+        echo "  Updated ${count} item(s) → ${new_status}  已更新 ${count} 条目"
+      fi
+      return
+      ;;
+  esac
+
+  # ── Display mode ──────────────────────────────────────────────────────────
+  local DIM='\033[2m'
 
+  local us_items fix_items refactor_items idea_items total=0
   us_items=$(grep -E '^\| \[US-' "$backlog" | grep -F '| 📋 Todo |' || true)
   fix_items=$(grep -E '^\| FIX-' "$backlog" | grep -F '| 📋 Todo |' || true)
   refactor_items=$(grep -E '^\| REFACTOR-' "$backlog" | grep -F '| 📋 Todo |' || true)
@@ -2827,6 +2900,20 @@ cmd_backlog() {
   [[ -z "$idea_items" ]] && idea_count=0
   total=$(( us_count + fix_count + refactor_count + idea_count ))
 
+  local blocked_items deferred_items unknown_items
+  blocked_items=$(grep -E '^\|' "$backlog" | grep '🔒 Blocked' || true)
+  deferred_items=$(grep -E '^\|' "$backlog" | grep '⏸ Deferred' || true)
+  unknown_items=$( { grep -E '^\| \[US-' "$backlog"; grep -E '^\| FIX-' "$backlog"; grep -E '^\| REFACTOR-' "$backlog"; grep -E '^\| IDEA-' "$backlog"; } \
+    | grep -v '📋 Todo\|🔨 In Progress\|✅ Done\|🔒 Blocked\|⏸ Deferred' || true)
+
+  local blocked_count deferred_count unknown_count
+  blocked_count=$(echo "$blocked_items" | grep -c . || true)
+  deferred_count=$(echo "$deferred_items" | grep -c . || true)
+  unknown_count=$(echo "$unknown_items" | grep -c . || true)
+  [[ -z "$blocked_items" ]] && blocked_count=0
+  [[ -z "$deferred_items" ]] && deferred_count=0
+  [[ -z "$unknown_items" ]] && unknown_count=0
+
   echo ""
   echo -e "  ${BOLD}Pending Backlog  待处理任务${NC}  (${total} items)"
   echo ""
@@ -2879,6 +2966,53 @@ cmd_backlog() {
     echo -e "  ${GREEN}✓ Nothing pending — backlog is clear  暂无待处理任务${NC}"
     echo ""
   fi
+
+  # ── Blocked ───────────────────────────────────────────────────────────────
+  if [[ $blocked_count -gt 0 ]]; then
+    echo -e "  ${DIM}Blocked  已阻塞  (${blocked_count})${NC}"
+    while IFS= read -r line; do
+      [[ -z "$line" ]] && continue
+      local id desc reason
+      id=$(_backlog_extract_id "$line")
+      desc=$(echo "$line" | awk -F'|' '{print $3}' | sed 's/^ *//;s/ *$//' | cut -c1-52)
+      reason=$(echo "$line" | awk -F'|' '{print $4}' | grep -oE '\[.*\]' | tr -d '[]' || true)
+      printf "    ${DIM}🔒 %-14s  %s${NC}" "$id" "$desc"
+      [[ -n "$reason" ]] && printf "${DIM}  (%s)${NC}" "$reason"
+      printf "\n"
+    done <<< "$blocked_items"
+    echo ""
+  fi
+
+  # ── Deferred ──────────────────────────────────────────────────────────────
+  if [[ $deferred_count -gt 0 ]]; then
+    echo -e "  ${DIM}Deferred  已推迟  (${deferred_count})${NC}"
+    while IFS= read -r line; do
+      [[ -z "$line" ]] && continue
+      local id desc reason
+      id=$(_backlog_extract_id "$line")
+      desc=$(echo "$line" | awk -F'|' '{print $3}' | sed 's/^ *//;s/ *$//' | cut -c1-52)
+      reason=$(echo "$line" | awk -F'|' '{print $4}' | grep -oE '\[.*\]' | tr -d '[]' || true)
+      printf "    ${DIM}⏸ %-14s  %s${NC}" "$id" "$desc"
+      [[ -n "$reason" ]] && printf "${DIM}  (%s)${NC}" "$reason"
+      printf "\n"
+    done <<< "$deferred_items"
+    echo ""
+  fi
+
+  # ── Unknown status (show for human/AI triage) ─────────────────────────────
+  if [[ $unknown_count -gt 0 ]]; then
+    echo -e "  ${YELLOW}? Unknown Status  未知状态  (${unknown_count})${NC}"
+    echo -e "  ${YELLOW}  Fix: roll backlog block/defer/unblock <pattern>  运行命令修正状态${NC}"
+    while IFS= read -r line; do
+      [[ -z "$line" ]] && continue
+      local id desc status_raw
+      id=$(_backlog_extract_id "$line")
+      desc=$(echo "$line" | awk -F'|' '{print $3}' | sed 's/^ *//;s/ *$//' | cut -c1-52)
+      status_raw=$(echo "$line" | awk -F'|' '{print $4}' | sed 's/^ *//;s/ *$//')
+      printf "    ${YELLOW}? %-14s  %s  [%s]${NC}\n" "$id" "$desc" "$status_raw"
+    done <<< "$unknown_items"
+    echo ""
+  fi
 }
 
 # ─────────────────────────────────────────────────────────────────────────────
@@ -2985,7 +3119,10 @@ usage() {
   echo "  peer                   [Peer Review] Cross-agent negotiation               跨 Agent 协商对审"
   echo "  loop <on|off|now|status|monitor|resume|reset>  [Autonomous] Manage scheduled BACKLOG executor  管理自主执行循环"
   echo "  brief                  [Digest] Show latest owner brief (regenerate if stale)  展示最新简报"
-  echo "  backlog                [View] Show all pending tasks from BACKLOG.md           显示待处理任务清单"
+  echo "  backlog                [View] Show pending tasks (Todo/Blocked/Deferred/Unknown)  显示任务清单"
+  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 "  agent [use <name>|list]   [Config] Per-project agent selection            切换项目 agent"
   echo "  release                [Publish] Sync changelog + version bump + npm publish  同步日志并发版"
   echo ""
@@ -2995,7 +3132,9 @@ usage() {
   echo "  roll init                     # New or re-merge project (run in project)   新建或重新合并（项目目录）"
   echo "  roll loop on                  # Enable autonomous loop (cron)              启用自主执行循环"
   echo "  roll brief                    # Show latest brief                          查看最新简报"
-  echo "  roll backlog                  # Show pending BACKLOG items                 查看待处理任务"
+  echo "  roll backlog                  # Show pending/blocked/deferred items        查看待处理任务"
+  echo "  roll backlog defer US-DOC '过早引入'  # Defer all US-DOC-* items          推迟一类任务"
+  echo "  roll backlog block US-HW-001 '硬件未到货'  # Block a specific item        标记阻塞"
   echo "  roll agent use kimi           # Switch this project to kimi               切换当前项目到 kimi"
 
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seanyao/roll",
-  "version": "2026.512.1",
+  "version": "2026.512.2",
   "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"