dsh-offhours 0.1.3 → 0.2.0

package/README.md

@@ -26,9 +26,12 @@ npx dsh-offhours init --repo . --name myapp
 # 2) 体检（依赖、路径、worker 权限）
 npx dsh-offhours doctor
 
-# 3) 建一张卡（自动盖当前会话；没有 session 的卡跑批不会捡）
+# 3) 建一张卡（必须在 dsh 会话里，或显式传当前会话 id）
+#    最省事：在 dsh 里对 agent 说「用 offhours 技能建一张卡：给登录页补错误提示」。
+#    终端命令需要带 --session；没有 sourceSessionId 的卡跑批永远不会捡。
 npx dsh-offhours card add "给登录页补错误提示" \
-  --summary "目标：登录失败有提示。判据：npm test 通过。不做什么：不改后端。"
+  --summary "目标：登录失败有提示。判据：npm test 通过。不做什么：不改后端。" \
+  --session <当前 dsh 会话 id>
 ```
 
 之后低谷时段自动跑；也可以用面板「立即跑」或 `npx dsh-offhours run --once`。
@@ -37,6 +40,42 @@ npx dsh-offhours card add "给登录页补错误提示" \
 
 装完/升级插件后记得重启一次 `dsh web`，面板才会加载新代码。
 
+## 可选：把卡交给 dsh-superagent 执行（Issue 桥接）
+
+默认 `executor=local`：夜间跑批自己起 headless worker。  
+也可以让指定的看板走 **superagent 执行器**：夜间跑批只在低谷把 `todo(auto)` 卡变成 Gitea issue，superagent 的 Source → Eval → Ticket → Executor 负责独立 worktree、PR、评审和 attention；夜间跑批只回写卡状态。
+
+```json
+{
+  "executor": "superagent",
+  "superagent": {
+    "cli": "/path/to/gh-gitea",
+    "tokenFile": "~/.config/dsh-superagent/gitea-operator-token",
+    "repo": "<owner>/<repo>",
+    "baseUrl": "https://gitea.example.com",
+    "mention": "@dsh-agent"
+  },
+  "boards": [
+    { "id": "myapp", "file": "~/code/myapp/KANBAN.json", "executor": "superagent" }
+  ]
+}
+```
+
+- `tokenFile` 必须是**有权创建 issue 的操作者** token（不是 agent 自己的 token）；agent token 创建的 issue 会被 superagent Source 当作自己的消息过滤掉。
+- 只有 `todo` + `auto` + 非 `hold` 的卡会被派发；卡片状态会写 `superagentIssue` / `superagentPr` / `superagentState`。
+- `stallMinutes`（默认 30）：ticket 长时间 `working` 但无 report/attention 时，卡自动转 `review`（防 worker 等后台 gate 静默卡死）；issue 正文也会要求“前台等命令、必须 report”。
+- `dispatch` 只在低谷执行；峰段由 superagent 的 peak-pause 再兜底。
+- **不自动合并代码 PR**：PR 打开 → 卡 `review`；PR 合并 → 卡 `done`；issue 被关但未合并 → 卡 `review`。
+- superagent 与夜间跑批共用同一个仓库，superagent 的 `maxWorkers` 建议保持 1，避免同仓库并发写。
+
+手动命令：
+
+```bash
+npx dsh-offhours superagent status  --board myapp
+npx dsh-offhours superagent dispatch --board myapp --dry-run
+npx dsh-offhours superagent sync     --board myapp
+```
+
 ## 配置
 
 `~/.dsh/offhours/config.json`（`npx dsh-offhours init` 生成）：
@@ -70,7 +109,7 @@ npx dsh-offhours card add "给登录页补错误提示" \
 |---|---|
 | `npx dsh-offhours init --repo .` | 初始化配置/看板/特性 |
 | `npx dsh-offhours doctor` | 依赖与权限体检（失败退出非 0） |
-| `npx dsh-offhours card add "<标题>" --summary "<目标/判据/边界>"` | 建卡并盖章当前会话 |
+| `npx dsh-offhours card add "<标题>" --summary "<目标/判据/边界>" [--session <id>]` | 建卡并盖章会话（无 session 不会跑） |
 | `npx dsh-offhours card list` | 列卡 |
 | `npx dsh-offhours run --once` / `--dry-run` | 手动跑一轮 / 只看会挑哪张 |
 | `npx dsh-offhours status` | 看板计数、心跳、最近状态（JSON） |
@@ -108,3 +147,20 @@ npm pack
 ```
 
 MIT License。
+
+## 自动采集数据（dsh-rsi）
+
+RSI 自动采集的资产/经验**不放在 main**：完整历史（211 个提交、9990 个文件）在分支 **`data/dsh-rsi`**，
+该子树已被 `.gitignore` 挡住，不会随日常提交回到主干。要用它：
+
+```bash
+git fetch gitea data/dsh-rsi && git worktree add /tmp/rsi gitea/data/dsh-rsi
+```
+
+要把它变成**独立仓库**（推荐，需一次人工登录态）：
+
+```bash
+glops token --create --name glops      # 生成并保存令牌（仅一次）
+glops create dsh-rsi-data --desc "dsh-rsi 采集数据"
+git -C <你的 dsh-nightshift 检出> push "$(glops url <owner>/dsh-rsi-data | awk '/SSH/{print $NF}')" data/dsh-rsi:main
+```

package/bin/offhours.mjs

@@ -28,6 +28,7 @@ const HELP = `dsh-offhours —— 夜间/低谷自动跑批（配一个 git 仓
   npx dsh-offhours run [--once] [--dry-run] [--force] [--board id]
   npx dsh-offhours status [--board id]
   npx dsh-offhours boards
+  npx dsh-offhours superagent dispatch|sync|status [--board id] [--dry-run] [--force]
 
 如果你已经全局安装了本包，也可以把 npx dsh-offhours 换成 offhours。
 全局：--config <path>（默认 ~/.dsh/offhours/config.json）
@@ -163,6 +164,12 @@ function cmdDoctor(flags) {
     hard(`仓库 ${b.repos[0] || '?'}`, !!cfg.repos[b.repos[0]] && existsSync(cfg.repos[b.repos[0]].path),
       (cfg.repos[b.repos[0]] || {}).path || '(未登记)')
   }
+  if (cfg.boards.some((b) => b.executor === 'superagent')) {
+    const sa = cfg.superagent || {}
+    hard('superagent cli', !!sa.cli && existsSync(sa.cli), sa.cli || '未配置')
+    hard('superagent token', !!sa.tokenFile && existsSync(sa.tokenFile), sa.tokenFile || '未配置')
+    hard('superagent repo', !!sa.repo, sa.repo || '未配置')
+  }
   for (const [name, bin] of [['python3', 'python3'], ['bash', 'bash'], ['git', 'git'], ['jq', 'jq'], ['flock', 'flock'], ['dsh', cfg.dshBin]]) {
     const p = which(bin)
     hard(name, !!p, p || '未找到')
@@ -198,14 +205,17 @@ function cmdCard(args, flags) {
   if (sub !== 'add') die('用法：offhours card add "<标题>" --summary "..."')
   const title = args.slice(1).join(' ').trim()
   if (!title) die('card add 需要一个标题')
-  const pyArgs = [nsPy(cfg), 'card-add', board.file, title,
-    '--session', String(flags.session || process.env.DSH_SESSION_ID || ''),
-  ]
+  const sessionId = String(flags.session || process.env.DSH_SESSION_ID || '')
+  if (!sessionId && !flags['allow-no-session']) {
+    die('缺少会话 id：在 dsh 会话里运行，或显式加 --session <sessionId>。\n' +
+      '没有 sourceSessionId 的卡不会被跑批捡起；确需建无主卡（只人工看）时加 --allow-no-session。')
+  }
+  const pyArgs = [nsPy(cfg), 'card-add', board.file, title, '--session', sessionId]
   for (const k of ['summary', 'description', 'rationale', 'rejected', 'tags', 'status', 'run-timeout']) {
     if (flags[k] !== undefined) pyArgs.push(`--${k}`, String(flags[k]))
   }
   if (flags['no-explain']) pyArgs.push('--no-explain')
-  const env = { ...process.env, DSH_SESSION_ID: String(flags.session || process.env.DSH_SESSION_ID || '') }
+  const env = { ...process.env, DSH_SESSION_ID: sessionId }
   const r = spawnSync('python3', pyArgs, { env, encoding: 'utf8' })
   process.stdout.write(r.stdout || '')
   process.stderr.write(r.stderr || '')
@@ -264,6 +274,21 @@ function main() {
     for (const b of cfg.boards) console.log(`${b.id}\t${b.file}`)
     return
   }
+  if (cmd === 'superagent') {
+    const { cfg, path } = loadOrDie(flags)
+    const board = boardOf(cfg, flags)
+    const sub = _[1] || 'status'
+    if (!['dispatch', 'sync', 'status'].includes(sub)) die('用法：superagent dispatch|sync|status')
+    const py = join(packageRoot(), 'mechanism', 'superagent_bridge.py')
+    const args = [py, sub, board.file, '--config', path]
+    if (flags.limit) args.push('--limit', String(flags.limit))
+    if (flags['dry-run']) args.push('--dry-run')
+    if (flags.force) args.push('--force')
+    const r = spawnSync('python3', args, { encoding: 'utf8', env: process.env })
+    process.stdout.write(r.stdout || '')
+    process.stderr.write(r.stderr || '')
+    process.exit(r.status || 0)
+  }
   die(`未知命令：${cmd}\n\n${HELP}`)
 }
 

package/feature-worktrees/feature-lib.sh

@@ -72,13 +72,31 @@ feature_is_recycled() { [ "$(feature_status "$1")" = "recycled" ]; }
 # 「在用」特性（不含已回收）：**所有「哪里能干活/该去哪里干活」的判断都必须用它**。
 # 已回收的 worktree 已经拆掉，原地只剩一个指向主检出的路标（符号链接）——
 # 它是给旧会话的引用兜底的只读入口，不再是 worktree（见 feature_retired_path）。
+# 性能（2026-11-10）：SessionStart 每次启动都要扫全部特性；原来每个 slug 起一次 jq，
+# 208 个特性时钩子要 8s。改成「一次 jq 读全部 feature.json」，把启动成本压到亚秒级。
+_feature_files() {
+  local f
+  for f in "$FEATURES_ROOT"/*/feature.json; do
+    [ -f "$f" ] && printf '%s\n' "$f"
+  done
+}
+_feature_slug_of_file() { basename "$(dirname "$1")"; }
+
 feature_slugs_active() {
-  local s
-  for s in $(feature_slugs); do feature_is_recycled "$s" || printf '%s\n' "$s"; done
+  local f
+  local -a files=()
+  while IFS= read -r f; do files+=("$f"); done < <(_feature_files)
+  [ "${#files[@]}" -gt 0 ] || return 0
+  jq -r 'select((.status // "active") != "recycled") | input_filename' "${files[@]}" 2>/dev/null \
+    | while IFS= read -r f; do _feature_slug_of_file "$f"; done
 }
 feature_slugs_recycled() {
-  local s
-  for s in $(feature_slugs); do feature_is_recycled "$s" && printf '%s\n' "$s"; done
+  local f
+  local -a files=()
+  while IFS= read -r f; do files+=("$f"); done < <(_feature_files)
+  [ "${#files[@]}" -gt 0 ] || return 0
+  jq -r 'select((.status // "active") == "recycled") | input_filename' "${files[@]}" 2>/dev/null \
+    | while IFS= read -r f; do _feature_slug_of_file "$f"; done
 }
 
 feature_projects() { feature_json "$1" | jq -r '.repos | keys[]' 2>/dev/null; }
@@ -165,14 +183,16 @@ retired_target() { # <slug> <proj> → 路标指向（readlink 优先，其次
 }
 
 retired_of_path() { # <path> → 每行 "<slug>\t<路标路径>\t<指向>"（命中已回收特性的路标）
-  local p=$1 slug proj wt
-  for slug in $(feature_slugs_recycled); do
-    while IFS=$'\t' read -r proj wt; do
-      [ -n "$wt" ] || continue
-      [ -L "$wt" ] || continue
-      case "$p" in "$wt"|"$wt"/*) printf '%s\t%s\t%s\n' "$slug" "$wt" "$(retired_target "$slug" "$proj")"; return 0 ;; esac
-    done < <(feature_json "$slug" | jq -r '.repos | to_entries[] | "\(.key)\t\(.value.path)"' 2>/dev/null)
-  done
+  local p=$1 slug proj wt f
+  local -a files=()
+  while IFS= read -r f; do files+=("$f"); done < <(_feature_files)
+  [ "${#files[@]}" -gt 0 ] || return 1
+  while IFS=$'\t' read -r f proj wt; do
+    [ -n "$wt" ] || continue
+    [ -L "$wt" ] || continue
+    slug=$(_feature_slug_of_file "$f")
+    case "$p" in "$wt"|"$wt"/*) printf '%s\t%s\t%s\n' "$slug" "$wt" "$(retired_target "$slug" "$proj")"; return 0 ;; esac
+  done < <(jq -r 'select((.status // "active") == "recycled") | .repos | to_entries[] | [input_filename, .key, .value.path] | @tsv' "${files[@]}" 2>/dev/null)
   return 1
 }
 retired_feature_of_path() { retired_of_path "$1" 2>/dev/null | head -1 | cut -f1; }
@@ -180,13 +200,15 @@ retired_feature_of_path() { retired_of_path "$1" 2>/dev/null | head -1 | cut -f1
 # 路径落在哪个**在用**特性的 worktree 内 → 输出 slug（未命中返回 1）
 # 已回收特性刻意不参与：它们的路径只是路标，谁都不能在那儿干活。
 feature_of_path() {
-  local p=$1 slug wt
-  for slug in $(feature_slugs_active); do
-    while IFS= read -r wt; do
-      [ -n "$wt" ] || continue
-      case "$p" in "$wt"|"$wt"/*) printf '%s\n' "$slug"; return 0 ;; esac
-    done < <(feature_json "$slug" | jq -r '.repos[].path' 2>/dev/null)
-  done
+  local p=$1 slug wt f
+  local -a files=()
+  while IFS= read -r f; do files+=("$f"); done < <(_feature_files)
+  [ "${#files[@]}" -gt 0 ] || return 1
+  while IFS=$'\t' read -r f wt; do
+    [ -n "$wt" ] || continue
+    slug=$(_feature_slug_of_file "$f")
+    case "$p" in "$wt"|"$wt"/*) printf '%s\n' "$slug"; return 0 ;; esac
+  done < <(jq -r 'select((.status // "active") != "recycled") | .repos[]?.path as $p | [input_filename, $p] | @tsv' "${files[@]}" 2>/dev/null)
   return 1
 }
 

package/lib/client.js

@@ -837,6 +837,13 @@ window.__ModuleLoader__.load({
                       (c.sourceSessionId ? `\n\n【来源会话】${c.sourceSessionId}` : ''))),
                 h('div', { style: { display: 'flex', gap: 6, flexWrap: 'wrap' } },
                   h(Button, { onClick: () => store.act('scan-this', { cardId: c.id }) }, t('runThisNow')),
+                  (c.superagentPr && c.superagentPr.url) || (c.superagentIssue && c.superagentIssue.url)
+                    ? h('a', {
+                        href: (c.superagentPr && c.superagentPr.url) || (c.superagentIssue && c.superagentIssue.url),
+                        target: '_blank', rel: 'noreferrer',
+                        style: { fontSize: 12, color: T.brand, alignSelf: 'center' },
+                      }, t('superagentLink'))
+                    : null,
                   c.workerSessionId
                     ? h(Button, { onClick: () => openWorkerSession(c.workerSessionId) }, t('openWorkerSession'))
                     : null,
@@ -1181,6 +1188,9 @@ window.__ModuleLoader__.load({
             { k: 'review', label: t('review'), n: reviews.length, tone: reviews.length ? T.warn : T.textSub },
             { k: 'live', label: t('running'), n: running.length, tone: running.length ? '#1a8f5a' : T.textSub },
             { k: 'doc', label: '手册', n: 0, tone: T.textSub },
+            // 工程资源入口：iframe 指向自动生成的手册站（与「手册」并列，不抢它的位置）。
+            // 用 location.hostname 而不是写死 IP：远程访问时也能指到同一台机器的 :8087。
+            { k: 'entries', label: '入口', n: 0, tone: T.textSub },
             { k: 'timers', label: '定时', n: (data.cron || []).length + 2, tone: T.textSub },
           ].map((x) => h('button', {
             key: x.k, role: 'tab', 'aria-selected': tab === x.k, onClick: () => goTab(x.k),
@@ -1244,6 +1254,13 @@ window.__ModuleLoader__.load({
               h('iframe', { src: '/nightshift/api/doc-page', title: '使用手册', style: { width: '100%', height: '100%', border: 0, display: 'block', background: '#fff' } }))
           : null,
 
+        tab === 'entries'
+          ? h('div', { style: { height: narrow ? '68vh' : '72vh', borderRadius: 12, overflow: 'hidden', border: `1px solid ${T.borderStrong}`, marginTop: 8 } },
+              // 指向 :8087 工作台：菜单/手册/出处全部由 catalog.tsv 自动生成（15 分钟同步）。
+              // 这里只负责显示，不复制任何条目——复制就一定会漂移。
+              h('iframe', { src: `http://${location.hostname}:8087/`, title: '工程资源入口', style: { width: '100%', height: '100%', border: 0, display: 'block', background: '#fff' } }))
+          : null,
+
         tab === 'live'
           ? h(Section, { title: t('running'), count: running.length },
               running.length === 0

package/lib/config.js

@@ -85,6 +85,16 @@ export function defaultConfig() {
     dshBin: process.env.DSH_BIN || 'dsh',
     dshProfile: 'headless',
     scheduler: 'plugin',
+    executor: 'local',
+    superagent: {
+      cli: '',
+      tokenFile: '',
+      repo: '',
+      baseUrl: '',
+      mention: '@dsh-agent',
+      issueLabel: 'agent:ready',
+      pollSeconds: 30,
+    },
     daemonUnit: '',
     repos: {},
     boards: [],
@@ -120,6 +130,7 @@ function normalizeBoard(raw, base, cfg) {
     timer: String(raw.unit || raw.timer || ''),
     envFile: String(raw.envFile || ''),
     requireAuto: asBool(raw.requireAuto, false),
+    executor: String(raw.executor || cfg.executor || 'local') === 'superagent' ? 'superagent' : 'local',
     enabled: raw.enabled === undefined ? true : asBool(raw.enabled, true),
   }
 }
@@ -168,6 +179,17 @@ export function normalizeConfig(raw, { path = '' } = {}) {
     dshBin: String(worker.dshBin || cfg.dshBin),
     dshProfile: String(worker.dshProfile || cfg.dshProfile),
   }
+  cfg.executor = String(cfg.executor || 'local') === 'superagent' ? 'superagent' : 'local'
+  const sa = cfg.superagent && typeof cfg.superagent === 'object' ? cfg.superagent : {}
+  cfg.superagent = {
+    cli: String(sa.cli || ''),
+    tokenFile: absPath(String(sa.tokenFile || ''), base),
+    repo: String(sa.repo || ''),
+    baseUrl: String(sa.baseUrl || ''),
+    mention: String(sa.mention || '@dsh-agent'),
+    issueLabel: String(sa.issueLabel || 'agent:ready'),
+    pollSeconds: asInt(sa.pollSeconds, 30, 10, 3600),
+  }
 
   const repos = cfg.repos && typeof cfg.repos === 'object' ? cfg.repos : {}
   cfg.repos = {}
@@ -197,13 +219,14 @@ export function normalizeConfig(raw, { path = '' } = {}) {
 export function loadConfig(configFile) {
   const path = absPath(configFile || defaultConfigPath(), process.cwd())
   if (!existsSync(path)) {
-    const cfg = normalizeConfig({}, { path })
+    const cfg = normalizeConfig({}, { path }); cfg._path = path
     cfg.problems.unshift(`配置文件不存在：${path}（先运行 offhours init 或安装时生成）`)
     return { config: cfg, path, exists: false }
   }
   try {
     const raw = JSON.parse(readFileSync(path, 'utf8'))
-    return { config: normalizeConfig(raw, { path }), path, exists: true }
+    const config = normalizeConfig(raw, { path }); config._path = path
+    return { config, path, exists: true }
   } catch (e) {
     const cfg = normalizeConfig({}, { path })
     cfg.problems.unshift(`配置不是合法 JSON：${path}（${(e && e.message) || e}）`)
@@ -221,9 +244,11 @@ export function saveConfig(path, cfg) {
     dshProfile: cfg.dshProfile,
     scheduler: cfg.scheduler,
     daemonUnit: cfg.daemonUnit || '',
+    executor: cfg.executor || 'local',
+    superagent: cfg.superagent || {},
     repos: cfg.repos,
-    boards: cfg.boards.map(({ id, label, file, workdir, repos, unit, envFile, requireAuto, enabled }) => ({
-      id, label, file, workdir, repos, unit, envFile, requireAuto, enabled,
+    boards: cfg.boards.map(({ id, label, file, workdir, repos, unit, envFile, requireAuto, executor, enabled }) => ({
+      id, label, file, workdir, repos, unit, envFile, requireAuto, executor, enabled,
     })),
     gates: cfg.gates,
     schedule: cfg.schedule,
@@ -255,6 +280,9 @@ export function scanEnv(cfg, board, extra = {}) {
     NIGHTSHIFT_BOARDS: cfg.boards.map((b) => b.file).join(' '),
     NIGHTSHIFT_WORKER_PERMISSION_MODE: cfg.worker.permissionMode,
     NIGHTSHIFT_SANDBOX: 'auto',
+    NIGHTSHIFT_EXECUTOR: board.executor || cfg.executor || 'local',
+    NIGHTSHIFT_SUPERAGENT_CONFIG: cfg._path || '',
+    OFFHOURS_CONFIG: cfg._path || '',
     MAX_CARDS_PER_RUN: String(cfg.gates.maxCardsPerRun),
     MAX_CARDS_PER_DAY: String(cfg.gates.maxCardsPerDay),
     MAX_CNY_PER_DAY: String(cfg.gates.maxCnyPerDay),

package/mechanism/ns.py

@@ -385,7 +385,9 @@ def eligible(card):
     # HOLD_IN_TEXT（2026-11-01）：标题或描述里写明 HOLD 的卡（外部依赖未就绪，如"需 key+设备"）
     # 以前只写在标题里、没有 hold 标签 ⇒ 会被反复挑中然后必然失败。
     _t = (card.get("title") or "") + "\n" + (card.get("description") or "")[:2000]
-    if "HOLD" in _t.upper() and "解除" not in _t:
+    # 2026-11-04：不再用"解除"二字做豁免（说明文字里的"解除 hold"会把阻塞卡误放行）。
+    # 放行必须显式加结构化标签 released（或去掉标题里的 HOLD）。
+    if "HOLD" in _t.upper() and "released" not in tags:
         return False
     if REQUIRE_AUTO and "auto" not in tags:
         return False
@@ -440,8 +442,17 @@ def cmd_pick(argv):
 
     cand = [c for c in todos if eligible(c)]
     decisions = [c for c in cand if is_decision(c)]
-    runnable = sorted([c for c in cand if not is_decision(c)],
-                      key=lambda c: 0 if "auto" in _tags(c) else 1)     # auto 优先
+    runnable_all = sorted([c for c in cand if not is_decision(c)],
+                          key=lambda c: 0 if "auto" in _tags(c) else 1)     # auto 优先
+    # 同源会话串行保护：同一次扫描里，同一个 sourceSessionId 只允许一个 worker。
+    # 原因（2026-11-10 实测）：同一会话派生的多张卡虽然各有 worker worktree，但 merge-back
+    # 都回到同一个源 worktree；并行合并会撞 .devloop/posture / worker-progress，并让 worker
+    # 看到别人的现场，最终出现「结果行无法解析/串味」。宁可串行，不要串味。
+    active_sessions = {x for x in os.environ.get("NIGHTSHIFT_ACTIVE_SESSIONS", "").split() if x}
+    blocked = [c for c in runnable_all
+               if (c.get("sourceSessionId") or "").strip() in active_sessions]
+    runnable = [c for c in runnable_all
+                if (c.get("sourceSessionId") or "").strip() not in active_sessions]
     missing_session = [c for c in todos if not (c.get("sourceSessionId") or "").strip()]
     picked = runnable[0] if runnable else None
     reason = None
@@ -453,6 +464,9 @@ def cmd_pick(argv):
                       "或在 dsh 会话里给它补 --session）" % len(missing_session))
         elif not cand:
             reason = "所有 todo 都标了 hold（禁跑）"
+        elif blocked:
+            reason = ("同源会话已有 worker 在跑（%d 张同会话卡暂时串行），等这一波结束再跑"
+                      % len(blocked))
         else:
             reason = "只剩需你拍板的卡（%d 张），无人值守不碰" % len(decisions)
     print(json.dumps({
@@ -463,6 +477,7 @@ def cmd_pick(argv):
             "sourceSessionId": picked.get("sourceSessionId") or ""},
         "reason": reason,
         "todoCount": len(todos), "runnableCount": len(runnable),
+        "blockedSessionCount": len(blocked),
         "decisionCards": [{"id": c["id"], "title": c["title"][:60]} for c in decisions],
         "heldCount": len(todos) - len(cand),
         "missingSessionCount": len(missing_session),
@@ -1245,13 +1260,22 @@ def cmd_confirm_recommended(argv):
     done = skipped = 0
     for c in [x for x in board.get("cards", []) if x.get("status") == "review"]:
         desc = c.get("description") or ""
-        if "【审批单 · explain-plain】" not in desc:
-            skipped += 1
-            continue
         opts = [l.strip() for l in desc.splitlines() if l.strip().startswith("- O")]
         rec = [l for l in opts if "推荐" in l] or opts[:1]
-        if not rec:
-            skipped += 1
+        # 2026-11-10：审批窗口对「没有审批单」的 review 卡也显示「全部按推荐批准」。
+        # 以前这里静默跳过 ⇒ 按钮看起来无效。没有审批单时退化为单卡一键放行
+        # （与卡上「审核通过（回待办）」完全同一结论；hold 仍保留，除非显式 --unhold）。
+        if "【审批单 · explain-plain】" not in desc or not rec:
+            decision = "审核通过（按卡内推荐执行）"
+            detail = "人审通过 ⇒ 回到待办，由后续轮次按卡内推荐执行"
+            if dry:
+                print("DRY  %-20s ← %s" % (c["id"][:20], decision))
+                continue
+            rc = cmd_confirm([board_path, c["id"], decision, detail, "--by", by])
+            if rc == 0:
+                done += 1
+            else:
+                skipped += 1
             continue
         text = rec[0]
         m = re.match(r"-\s*(O\d+)[：:]\s*(.*)$", text)
@@ -1566,6 +1590,25 @@ def _source_worktree(card, allow_create=False):
             return None, "E_ASSOC_INCOMPLETE 源会话关联文件缺 feature/project：%s" % assoc_path
         ok, why = _feature_counts_as_usable(feature, project)
         if not ok:
+            # P2-ASSOC-HOLD（2026-11-04）：源特性缺失 ⇒ 这张卡每次被领都会失败。
+            # 在这里就把 hold 打上并写清原因，停止空转；人修好关联后去掉 hold 即可。
+            try:
+                def _fix(bd):
+                    cc = _find(bd, card["id"])
+                    if cc is None:
+                        return False
+                    tags = list(cc.get("tags") or [])
+                    if "hold" not in [t.lower() for t in tags]:
+                        tags.append("hold")
+                        cc["tags"] = tags
+                        cc["description"] = (cc.get("description") or "").rstrip() + (
+                            "\n【自动止血 %s】源特性缺失（%s）⇒ 已加 hold 停止空转；请 feature attach 后去掉 hold。\n"
+                            % (time.strftime("%Y-%m-%d %H:%M"), (why or "")[:80]))
+                        cc["updatedAt"] = int(time.time() * 1000)
+                    return True
+                mutate_board(board_path or KANBAN_DEFAULT, _fix)
+            except Exception:
+                pass
             return None, "E_ASSOC_STALE %s；请重新 feature attach <特性名>（或删掉该关联后重跑）" % why
         wt = _feature_worktree(feature, project)
         return {"session": sid, "feature": feature, "project": project, "worktree": wt}, ""
@@ -2221,6 +2264,14 @@ def cmd_invariants(argv):
             if heal:
                 _sh.rmtree(sp, ignore_errors=True); healed.append("释放僵尸槽 %s" % d)
             continue
+        # SLOT-BOARD-SCOPE：只处置"属于本看板"的槽位，避免跨板误伤（2026-11-04 故障注入发现）
+        try:
+            _owner = open(_os.path.join(sp, "board")).read().strip()
+        except Exception:
+            _owner = ""
+        _mykey = _os.path.basename(_os.path.dirname(_os.path.abspath(path))) or ""
+        if _owner and _mykey and _owner != _mykey:
+            continue
         try:
             card = open(_os.path.join(sp, "card")).read().strip()
         except Exception:
@@ -2228,12 +2279,60 @@ def cmd_invariants(argv):
         if card:
             if card in seen:
                 violations.append({"inv": "I4", "slot": d, "why": "卡 %s 同占 %s/%s" % (card[:16], seen[card], d)})
+                if heal:
+                    # 保留先出现的那个槽，释放重复槽（避免同卡被两个 worker 抢着写）
+                    import shutil as _sh2
+                    _sh2.rmtree(sp, ignore_errors=True)
+                    healed.append("释放重复槽 %s（卡 %s 已由槽 %s 占用）" % (d, card[:16], seen[card]))
+                    continue
             seen[card] = d
             if card not in ip:
                 violations.append({"inv": "I1", "slot": d, "card": card[:16], "why": "槽位占着非 in_progress 卡"})
                 if heal:
                     _sh.rmtree(sp, ignore_errors=True); healed.append("释放槽 %s" % d)
     return_viol = list(violations)
+    # I5（2026-11-04）：已有人工【确认】且确认时间晚于最后一次【送审】的 review 卡，
+    # 说明"批准→回待办"这一步没落地（面板/confirm-all 路径都可能漏）⇒ 自愈推回 todo。
+    import re as _re
+    _review = [c for c in b.get("cards", []) if c.get("status") == "review"]
+    _advanced = []
+    for c in _review:
+        desc = c.get("description") or ""
+        confs = _re.findall(r"【确认 (\d{4}-\d{2}-\d{2} \d{2}:\d{2})", desc)
+        subms = _re.findall(r"【夜间跑批送审 (\d{4}-\d{2}-\d{2} \d{2}:\d{2})", desc)
+        if not confs:
+            continue
+        if subms and confs[-1] < subms[-1]:
+            continue                      # 批准后又被重新送审 ⇒ 需要人再看，不动
+        # P1（2026-11-04）：收窄三处误判 ——
+        # ① 正在被 worker 跑（槽位里有它）⇒ 不动；② 有活槽位（一轮在跑）⇒ 不动；
+        # ③ 最后一次送审在 30 分钟内 ⇒ 视为"刚送审，可能还在流转"，不动。
+        if c["id"] in seen:
+            continue
+        if len(seen) > 0:
+            continue
+        try:
+            import time as _t
+            if subms:
+                _last = _t.mktime(_t.strptime(subms[-1], "%Y-%m-%d %H:%M"))
+                if _t.time() - _last < 1800:
+                    continue
+        except Exception:
+            pass
+        if heal:
+            def _mut(bd, _cid=c["id"], _conf=confs[-1]):
+                cc = _find(bd, _cid)
+                if cc is None or cc.get("status") != "review":
+                    return False
+                cc["status"] = "todo"
+                cc["description"] = (cc.get("description") or "").rstrip() + (
+                    "\n【推进自愈 %s】有效确认(%s)但状态仍 review ⇒ 回 todo。\n" % (time.strftime("%Y-%m-%d %H:%M"), _conf))
+                cc["updatedAt"] = int(time.time() * 1000)
+                return True
+            if mutate_board(path, _mut) == "ok":
+                _advanced.append(c["id"][:16]); healed.append("批准未推进 ⇒ 回 todo %s" % c["id"][:16])
+        else:
+            return_viol.append({"inv": "I5", "card": c["id"][:16], "why": "已有效确认但仍是 review（批准→待办未落地）"})
     for cid in list(ip):
         if cid in seen:
             continue