peertable 0.6.1 → 0.7.1

package/skill/scripts/ensure-room-mcp.mjs

@@ -4,6 +4,7 @@ import {
   closeSync, fsyncSync, openSync, readFileSync, renameSync, statSync, unlinkSync, writeFileSync,
 } from 'node:fs'
 import { join, resolve } from 'node:path'
+import { expectedRoomMcp, isExpectedRoomMcp } from './room-mcp-config.mjs'
 
 const fail = (code, message) => {
   process.stderr.write(`${code}: ${message}\n`)
@@ -21,14 +22,9 @@ try { config = JSON.parse(readFileSync(file, 'utf8')) } catch {
 }
 if (!config || typeof config !== 'object' || Array.isArray(config))
   fail('SEAT_ROOM_MCP_INVALID', `${file} のrootがobjectでない`)
-const expected = { command: 'node', args: [resolve(peertableRepo, 'room', 'client.mjs')] }
+const expected = expectedRoomMcp(peertableRepo)
 const current = config?.mcpServers?.room
-if (current && typeof current === 'object' && !Array.isArray(current)
-    && Object.keys(current).sort().join(',') === 'args,command'
-    && current.command === expected.command
-    && Array.isArray(current.args)
-    && current.args.length === 1
-    && current.args[0] === expected.args[0]) process.exit(0)
+if (isExpectedRoomMcp(current, expected)) process.exit(0)
 
 if (ownership !== 'managed')
   fail('SEAT_ROOM_MCP_STALE', '既存.mcp.jsonのroom serverをcurrent-tree clientへmergeする必要がある')

package/skill/scripts/kickoff-gate.mjs

@@ -0,0 +1,82 @@
+#!/usr/bin/env node
+// 円卓開始ゲート（決定104）。kickoff を「依頼済み」と扱ってよいかを機械判定する。
+// 3条件（①対象席の実効稼働状態が fresh ②kickoff message の delivered receipt ③対象席の引受発言）が
+// 全席で成立するまで pending。親の推測・経過時間・room 保存成功による稼働判定を置き換える。
+//
+// usage: kickoff-gate.mjs <project_dir> --seq <kickoff_seq> --seats <a,b,c> [--ack-regex <re>] [--json]
+// 終了コード: 0 = active / 3 = pending / 1 = 判定不能（room へ到達できない等）
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+
+const args = process.argv.slice(2)
+const proj = args[0]
+const opt = (name) => {
+  const i = args.indexOf(name)
+  return i >= 0 ? args[i + 1] : undefined
+}
+const seq = Number(opt('--seq'))
+const seats = (opt('--seats') ?? '').split(',').map(s => s.trim()).filter(Boolean)
+const ackRe = new RegExp(opt('--ack-regex') ?? '引受|着手|claim', 'iu')
+const asJson = args.includes('--json')
+if (!proj || !Number.isSafeInteger(seq) || seq <= 0 || seats.length === 0) {
+  console.error('usage: kickoff-gate.mjs <project_dir> --seq <kickoff_seq> --seats <a,b,c> [--ack-regex <re>] [--json]')
+  process.exit(1)
+}
+
+const { room, server_url: url } = JSON.parse(readFileSync(join(proj, '.team', 'setup-state.json'), 'utf8'))
+const api = p => `${url}/api/${encodeURIComponent(room)}/${p}`
+const get = async (p) => {
+  const res = await fetch(api(p))
+  if (!res.ok) throw new Error(`GET ${p} -> HTTP ${res.status}`)
+  return res.json()
+}
+
+let membersBody, deliveryBody, messagesBody
+try {
+  ;[membersBody, deliveryBody, messagesBody] = await Promise.all([
+    get('members'), get(`deliveries?seq=${seq}`), get(`messages?since=${seq}`),
+  ])
+} catch (error) {
+  console.error(`KICKOFF_GATE_UNREACHABLE: ${error.message}`)
+  process.exit(1)
+}
+const members = new Map(membersBody.members.map(m => [m.name, m]))
+if (membersBody.members.length && membersBody.members[0].status_effective === undefined) {
+  console.error('KICKOFF_GATE_SERVER_TOO_OLD: server が実効稼働状態を返さない版。判定できない')
+  process.exit(1)
+}
+
+const report = {}
+let allPass = true
+for (const seat of seats) {
+  const member = members.get(seat)
+  const fresh = member?.status_reason === 'fresh' && member.status_effective !== 'dead'
+  const delivery = deliveryBody.delivery?.[seat]
+  const delivered = delivery?.state === 'delivered'
+  const ack = messagesBody.messages.find(m => m.from === seat && m.seq > seq && ackRe.test(m.body ?? ''))
+  const pass = fresh && delivered && Boolean(ack)
+  allPass = allPass && pass
+  report[seat] = {
+    pass,
+    status: member ? { effective: member.status_effective, reason: member.status_reason } : { effective: null, reason: 'member_not_found' },
+    delivery: delivery ?? { state: 'unknown' },
+    ack: ack ? { seq: ack.seq, body: String(ack.body).slice(0, 80) } : null,
+  }
+}
+
+const state = allPass ? 'active' : 'pending'
+if (asJson) {
+  console.log(JSON.stringify({ schema: 'peertable.kickoff_gate.v1', room, kickoff_seq: seq, state, seats: report }))
+} else {
+  console.log(`kickoff-gate: ${state}（room=${room} kickoff seq=${seq}）`)
+  for (const [seat, r] of Object.entries(report)) {
+    const parts = [
+      `状態=${r.status.effective ?? '不在'}(${r.status.reason})`,
+      `配達=${r.delivery.state}${r.delivery.reason ? `(${r.delivery.reason})` : ''}`,
+      `引受=${r.ack ? `seq ${r.ack.seq}` : 'なし'}`,
+    ]
+    console.log(`  ${r.pass ? 'OK' : 'NG'} ${seat}: ${parts.join(' / ')}`)
+  }
+  if (state === 'pending') console.log('  3条件が揃うまで円卓taskは依頼済みと扱わないこと（決定104）')
+}
+process.exit(state === 'active' ? 0 : 3)

package/skill/scripts/remove-managed-room-mcp.mjs

@@ -0,0 +1,70 @@
+#!/usr/bin/env node
+import {
+  closeSync, fsyncSync, lstatSync, openSync, readFileSync, renameSync, unlinkSync, writeFileSync,
+} from 'node:fs'
+import { basename, dirname, join, resolve } from 'node:path'
+import { randomBytes } from 'node:crypto'
+import { isPeertableRoomMcp } from './room-mcp-config.mjs'
+
+const fail = (code, detail) => {
+  process.stderr.write(`${JSON.stringify({ schema: 'peertable.managed_room_mcp_remove_result.v1',
+    result: 'rejected', code, detail })}\n`)
+  process.exit(1)
+}
+
+const [project] = process.argv.slice(2)
+if (!project) fail('PEERTABLE_MANAGED_MCP_REMOVE_ARGS_INVALID', '<project>')
+const file = resolve(project, '.mcp.json')
+let stat
+try { stat = lstatSync(file) } catch (error) {
+  if (error?.code === 'ENOENT') {
+    process.stdout.write(`${JSON.stringify({ schema: 'peertable.managed_room_mcp_remove_result.v1',
+      result: 'ok', action: 'already-absent' })}\n`)
+    process.exit(0)
+  }
+  fail('PEERTABLE_MANAGED_MCP_REMOVE_UNREADABLE', error.message)
+}
+if (stat.isSymbolicLink() || !stat.isFile())
+  fail('PEERTABLE_MANAGED_MCP_REMOVE_UNSAFE', `${file} がsymlinkまたはregular fileでない`)
+
+let config
+try { config = JSON.parse(readFileSync(file, 'utf8')) } catch (error) {
+  fail('PEERTABLE_MANAGED_MCP_REMOVE_INVALID', `${file}: JSONを読めない: ${error.message}`)
+}
+if (!config || typeof config !== 'object' || Array.isArray(config)
+  || !config.mcpServers || typeof config.mcpServers !== 'object' || Array.isArray(config.mcpServers)) {
+  fail('PEERTABLE_MANAGED_MCP_REMOVE_INVALID', `${file}: root/mcpServersがobjectでない`)
+}
+if (config.mcpServers.room === undefined) {
+  process.stdout.write(`${JSON.stringify({ schema: 'peertable.managed_room_mcp_remove_result.v1',
+    result: 'ok', action: 'room-already-absent' })}\n`)
+  process.exit(0)
+}
+if (!isPeertableRoomMcp(config.mcpServers.room))
+  fail('PEERTABLE_MANAGED_MCP_REMOVE_CONFLICT', `${file}: room blockがPeertable所有形でない`)
+
+delete config.mcpServers.room
+if (Object.keys(config.mcpServers).length === 0) delete config.mcpServers
+if (Object.keys(config).length === 0) {
+  unlinkSync(file)
+  process.stdout.write(`${JSON.stringify({ schema: 'peertable.managed_room_mcp_remove_result.v1',
+    result: 'ok', action: 'file-deleted' })}\n`)
+  process.exit(0)
+}
+
+const temporary = join(dirname(file), `.${basename(file)}.teardown-${process.pid}-${randomBytes(6).toString('hex')}.tmp`)
+let fd
+try {
+  fd = openSync(temporary, 'wx', stat.mode & 0o777)
+  writeFileSync(fd, `${JSON.stringify(config, null, 2)}\n`, 'utf8')
+  fsyncSync(fd)
+  closeSync(fd)
+  fd = undefined
+  renameSync(temporary, file)
+} catch (error) {
+  if (fd !== undefined) closeSync(fd)
+  try { unlinkSync(temporary) } catch {}
+  fail('PEERTABLE_MANAGED_MCP_REMOVE_FAILED', error.message)
+}
+process.stdout.write(`${JSON.stringify({ schema: 'peertable.managed_room_mcp_remove_result.v1',
+  result: 'ok', action: 'room-removed-file-preserved' })}\n`)

package/skill/scripts/resume.sh

@@ -0,0 +1,234 @@
+#!/bin/bash
+# 既存 room の正規 resume（決定105）。過去ログを残した同じ room を、現行工程へ接続し直して再稼働させる。
+# usage: resume.sh <project_dir> [--plan <plan_key>] [--phase <id>]... [--no-probe]
+#
+# 一回で行うこと:
+#   1. 既存 .team/ と room の確認（無ければ setup.sh を案内して止まる）
+#   2. --plan 指定時、setup-state.json / roles/member.md / 外部ペインを現行 plan へ再束縛
+#   3. 死んだ bridge 記録（pid 不一致・停止）の除去
+#   4. 台帳（room member 行）から現行メンバー構成を読み、席が死んでいるものだけ launch-seat.sh で再起動
+#      （credential の再生成・本人性の再記録は launch-seat.sh が持つ）
+#   5. alarm / seat-status / wakeup bridge の再起動（ensure-bridge.sh）
+#   6. fresh heartbeat の読み戻し（server 実効状態が fresh になるまで待つ）
+#   7. テスト DM の配送 receipt 確認（delivered になるまで待つ。--no-probe で省略）
+#
+# 手書きのメンバー一覧・個別再起動 script には依存しない。親の再着卓（parent-join / 番犬）は別手順
+#（SKILL.md「親の再着卓」）——resume は席と bridge の面だけを持つ。
+set -euo pipefail
+
+proj="${1:-}"
+[ -n "$proj" ] || { echo "usage: resume.sh <project_dir> [--plan <plan_key>] [--phase <id>]... [--no-probe]" >&2; exit 1; }
+shift
+plan=""
+phases=()
+probe=true
+while [ $# -gt 0 ]; do
+  case "$1" in
+    --plan) plan="${2:-}"; shift 2 ;;
+    --phase) [ -n "${2:-}" ] || { echo "ERROR: --phase には phase id が要る" >&2; exit 1; }; phases+=("$2"); shift 2 ;;
+    --no-probe) probe=false; shift ;;
+    *) echo "ERROR: 未知の引数: $1" >&2; exit 1 ;;
+  esac
+done
+proj=$(cd "$proj" && pwd)
+script_dir=$(cd "$(dirname "$0")" && pwd -P)
+repo="${PEERTABLE_REPO:-$(cd "$script_dir/../.." && pwd -P)}"
+[ -f "$repo/room/client.mjs" ] || { echo "RESUME_PEERTABLE_TREE_UNRESOLVED: $repo が peertable tree でない" >&2; exit 1; }
+setup="$proj/.team/setup-state.json"
+if [ ! -f "$setup" ]; then
+  echo "RESUME_NOT_SET_UP: $setup が無い。新規の卓は setup.sh で立てること" >&2
+  exit 1
+fi
+
+# resumeは同じroomを現行Peertable treeへ再接続する入口である。席が全て生存していて再起動0件でも、
+# Peertable所有のgenerated assetとroot room MCPを先に現行版へ更新する。
+"$script_dir/upgrade-team-assets.sh" "$proj"
+
+seats_file="$proj/.team/resume-seats.json"
+
+# Phase A: 到達確認・plan 再束縛・死記録掃除・再起動対象の抽出（node が JSON を書き出す）
+RESUME_PROJ="$proj" RESUME_REPO="$repo" RESUME_PLAN="$plan" RESUME_PHASES="${phases[*]:-}" \
+RESUME_SEATS_FILE="$seats_file" node --input-type=module <<'NODE'
+import { existsSync, readFileSync, unlinkSync, writeFileSync } from 'node:fs'
+import { execFileSync } from 'node:child_process'
+import { join } from 'node:path'
+import { pathToFileURL } from 'node:url'
+
+const proj = process.env.RESUME_PROJ
+const repo = process.env.RESUME_REPO
+const team = join(proj, '.team')
+const scriptDir = join(repo, 'skill', 'scripts')
+const { bridgeRecordLive } = await import(pathToFileURL(join(scriptDir, 'bridge-record-live.mjs')))
+const { resolveSeatObservation, tmuxArgv } = await import(pathToFileURL(join(scriptDir, 'seat-usage.mjs')))
+
+const setupPath = join(team, 'setup-state.json')
+const state = JSON.parse(readFileSync(setupPath, 'utf8'))
+const { room, server_url: url } = state
+
+// 1. room の存在確認（読み取りは room を作らないので、summary が member 0・seq 0 でも部屋の有無は API 一覧で見る）
+const roomsRes = await fetch(`${url}/api/rooms`).catch((e) => { throw new Error(`RESUME_ROOM_UNREACHABLE: ${url} へ到達できない: ${e.message}`) })
+if (!roomsRes.ok) throw new Error(`RESUME_ROOM_UNREACHABLE: GET /api/rooms -> HTTP ${roomsRes.status}`)
+const { rooms } = await roomsRes.json()
+if (!rooms.includes(room)) throw new Error(`RESUME_ROOM_MISSING: room「${room}」が server に無い。新規は setup.sh で立てること`)
+console.log(`[実施] room 確認: ${room} @ ${url}`)
+
+// 2. plan 再束縛（--plan 指定時だけ）
+const plan = process.env.RESUME_PLAN
+const phases = (process.env.RESUME_PHASES ?? '').split(' ').filter(Boolean)
+if (plan) {
+  state.mode = 'lattice'
+  state.plan_key = plan
+  state.phases = phases
+  writeFileSync(setupPath, JSON.stringify(state) + '\n')
+  const scope = phases.length === 0
+    ? 'この卓の claim 範囲は plan 全体（phase 指定なしで立っている）。'
+    : `**この卓の claim 範囲は phase ${phases.join(' ')} の task だけ**。範囲外の phase の task は、ready に見えていても取らない。範囲外に手を入れる必要が出たら room へ出して裁定を仰ぐ。`
+  const template = readFileSync(join(repo, 'skill', 'templates', 'member.md'), 'utf8')
+  writeFileSync(join(team, 'roles', 'member.md'), template.replaceAll('{{PLAN_KEY}}', plan).replaceAll('{{CLAIM_SCOPE}}', scope))
+  const publicUrl = process.env.PEERTABLE_PUBLIC_URL ?? state.public_url ?? url
+  execFileSync('node', [join(scriptDir, 'external-pane.mjs'), proj, room, publicUrl], { stdio: ['ignore', 'ignore', 'inherit'] })
+  console.log(`[実施] plan 再束縛: ${plan}${phases.length ? `（phase ${phases.join(',')}）` : ''}`)
+} else {
+  console.log(`[スキップ] plan 再束縛（--plan 未指定。現行 ${state.plan_key || state.mode} のまま）`)
+}
+
+// 3. 死んだ bridge 記録の除去（生きている記録は触らない。parent-watch.json は cursor 正本なので消さない）
+for (const name of ['wakeup-bridge.json', 'seat-status-bridge.json', 'alarm-bridge.json']) {
+  const path = join(team, name)
+  if (!existsSync(path)) continue
+  let record = null
+  try { record = JSON.parse(readFileSync(path, 'utf8')) } catch {}
+  if (bridgeRecordLive(record)) { console.log(`[スキップ] ${name}: 生存中（pid ${record.pid}）`); continue }
+  unlinkSync(path)
+  console.log(`[実施] ${name}: 死んだ記録を除去（pid ${record?.pid ?? '不明'}）`)
+}
+
+// 4. 台帳から再起動対象を抽出。席の生死は tmux session の実在で判定する
+const { members } = await (await fetch(`${url}/api/${encodeURIComponent(room)}/members`)).json()
+const relaunch = []
+const missingRoles = []
+for (const member of members) {
+  if (member.delivery?.kind === 'parent_watch') continue
+  const harness = member.harness ?? member.vendor
+  if (!harness) continue // 素性の無い行（親の手動登録等）は席ではない
+  const observation = resolveSeatObservation(member, null)
+  let aliveSeat = false
+  if (observation) {
+    try {
+      execFileSync('tmux', tmuxArgv(['has-session', '-t', observation.target], { socket: observation.socket }), { stdio: 'ignore' })
+      aliveSeat = true
+    } catch {}
+  }
+  if (aliveSeat) { console.log(`[スキップ] 席 ${member.name}: tmux session 生存中`); continue }
+  if (!Array.isArray(member.roles) || member.roles.length === 0) { missingRoles.push(member.name); continue }
+  relaunch.push({
+    name: member.name, roles: member.roles.join(','), harness,
+    model: member.model ?? null, effort: member.effort ?? null, mission: member.mission ?? null,
+  })
+}
+if (missingRoles.length) {
+  throw new Error(`RESUME_MEMBER_ROLES_MISSING: 役割の無い member は再起動できない: ${missingRoles.join(', ')}。`
+    + 'launch-seat.sh --roles で個別に立て直すか、member 行を整備すること')
+}
+writeFileSync(process.env.RESUME_SEATS_FILE, JSON.stringify(relaunch) + '\n')
+console.log(`[実施] 再起動対象の抽出: ${relaunch.length} 席（${relaunch.map(s => s.name).join(', ') || 'なし'}）`)
+NODE
+
+# Phase B: 席の再起動（credential 再生成・本人性再記録は launch-seat.sh が持つ）。
+# 受け渡しは TSV（mission に tab を含む member は台帳整備の対象であり、ここでは想定しない）
+while IFS=$'\t' read -r name roles harness model effort mission; do
+  [ -n "$name" ] || continue
+  argv=("$proj" "$name" --roles "$roles" --harness "$harness")
+  [ -n "$model" ] && argv+=(--model "$model")
+  [ -n "$effort" ] && argv+=(--effort "$effort")
+  [ -n "$mission" ] && argv+=(--mission "$mission")
+  echo "[実施] 席の再起動: $name（roles=$roles harness=$harness${model:+ model=$model}${effort:+ effort=$effort}）"
+  env -u PEERTABLE_POST_TOKEN "$script_dir/launch-seat.sh" "${argv[@]}"
+done < <(node -e '
+  const seats = JSON.parse(require("node:fs").readFileSync(process.argv[1], "utf8"))
+  for (const s of seats) console.log([s.name, s.roles, s.harness, s.model ?? "", s.effort ?? "", s.mission ?? ""].join("\t"))
+' "$seats_file")
+rm -f "$seats_file"
+
+# Phase C: bridge の再起動
+for kind in alarm seat-status wakeup; do
+  if "$script_dir/ensure-bridge.sh" "$proj" "$kind"; then
+    echo "[実施] ${kind}-bridge: ready"
+  else
+    echo "[未実施] ${kind}-bridge: 起動を確認できなかった（ログ $proj/.team/${kind}-bridge.log）" >&2
+    exit 1
+  fi
+done
+
+# Phase D: fresh heartbeat の読み戻しと probe DM の配送 receipt 確認
+RESUME_PROJ="$proj" RESUME_PROBE="$probe" RESUME_SCRIPT_DIR="$script_dir" node --input-type=module <<'NODE'
+import { readFileSync } from 'node:fs'
+import { join } from 'node:path'
+import { pathToFileURL } from 'node:url'
+
+const proj = process.env.RESUME_PROJ
+const { room, server_url: url } = JSON.parse(readFileSync(join(proj, '.team', 'setup-state.json'), 'utf8'))
+const api = p => `${url}/api/${encodeURIComponent(room)}/${p}`
+const sleep = ms => new Promise(r => setTimeout(r, ms))
+
+// launch-seat.sh 直後の席（tmux session が居る非親 member）が対象
+const { resolvePostToken } = await import(pathToFileURL(join(process.env.RESUME_SCRIPT_DIR, 'seat-usage.mjs')))
+
+// 6. fresh heartbeat の読み戻し（seat-status bridge 心拍 30 秒 + 判定余裕）
+const deadline = Date.now() + 90_000
+let pendingSeats = []
+for (;;) {
+  const { members, bridges } = await (await fetch(api('members'))).json()
+  const seats = members.filter(m => m.delivery?.kind !== 'parent_watch' && (m.harness ?? m.vendor) && m.observe?.tmux_target)
+  if (seats.length === 0) {
+    console.log('[スキップ] fresh heartbeat 読み戻し（観測対象の席なし）')
+    break
+  }
+  pendingSeats = seats.filter(m => m.status_reason !== 'fresh')
+  if (pendingSeats.length === 0) {
+    console.log(`[実施] fresh heartbeat 読み戻し: ${seats.length} 席すべて fresh`)
+    break
+  }
+  if (Date.now() > deadline) {
+    console.error(`RESUME_HEARTBEAT_STALE: fresh にならない席: ${pendingSeats.map(m => `${m.name}(${m.status_reason})`).join(', ') || '（席なし）'}`
+      + `（bridges: seat_status=${bridges?.seat_status?.state} wakeup=${bridges?.wakeup?.state}）`)
+    process.exit(1)
+  }
+  await sleep(3000)
+}
+
+// 7. probe DM の配送 receipt 確認
+if (process.env.RESUME_PROBE !== 'true') {
+  console.log('[スキップ] probe DM（--no-probe 指定）')
+  process.exit(0)
+}
+const token = resolvePostToken(process.env)
+const headers = { 'Content-Type': 'application/json', ...(token ? { 'X-Peertable-Token': token } : {}) }
+const { members } = await (await fetch(api('members'))).json()
+const targets = members.filter(m => m.delivery?.kind !== 'parent_watch' && (m.harness ?? m.vendor) && m.observe?.tmux_target).map(m => m.name)
+if (!targets.length) { console.log('[スキップ] probe DM（配達対象の席なし）'); process.exit(0) }
+const res = await fetch(api('messages'), {
+  method: 'POST', headers,
+  body: JSON.stringify({ from: 'resume', to: targets.length === 1 ? targets[0] : targets,
+    body: '[resume-probe] 配達経路の確認。応答不要・読み流してよい。' }),
+})
+const saved = await res.json()
+if (!res.ok) { console.error(`RESUME_PROBE_POST_FAILED: ${JSON.stringify(saved)}`); process.exit(1) }
+console.log(`[実施] probe DM 投稿: seq ${saved.seq} → ${targets.join(', ')}`)
+const probeDeadline = Date.now() + 120_000
+for (;;) {
+  const { delivery } = await (await fetch(api(`deliveries?seq=${saved.seq}`))).json()
+  const undelivered = targets.filter(t => delivery?.[t]?.state !== 'delivered')
+  if (undelivered.length === 0) {
+    console.log('[実施] probe DM の配送 receipt: 全席 delivered')
+    break
+  }
+  if (Date.now() > probeDeadline) {
+    console.error(`RESUME_PROBE_UNDELIVERED: delivered にならない席: ${undelivered.map(t => `${t}=${delivery?.[t]?.state ?? 'unknown'}${delivery?.[t]?.reason ? `(${delivery[t].reason})` : ''}`).join(', ')}`
+      + '（Grok 席は idle 待ちで遅れることがある。.team/wakeup-bridge.log を確認すること）')
+    process.exit(1)
+  }
+  await sleep(3000)
+}
+console.log('resume 完了。親の再着卓（parent-join / 番犬）は SKILL.md「親の再着卓」の手順で別途行うこと')
+NODE

package/skill/scripts/room-mcp-config.mjs

@@ -0,0 +1,24 @@
+import { resolve } from 'node:path'
+
+export function expectedRoomMcp(peertableRepo) {
+  return { command: 'node', args: [resolve(peertableRepo, 'room', 'client.mjs')] }
+}
+
+export function isExpectedRoomMcp(current, expected) {
+  return Boolean(current && typeof current === 'object' && !Array.isArray(current)
+    && Object.keys(current).sort().join(',') === 'args,command'
+    && current.command === expected.command
+    && Array.isArray(current.args)
+    && current.args.length === 1
+    && current.args[0] === expected.args[0])
+}
+
+export function isPeertableRoomMcp(current) {
+  return Boolean(current && typeof current === 'object' && !Array.isArray(current)
+    && Object.keys(current).sort().join(',') === 'args,command'
+    && current.command === 'node'
+    && Array.isArray(current.args)
+    && current.args.length === 1
+    && typeof current.args[0] === 'string'
+    && /(?:^|[\\/])room[\\/]client\.mjs$/u.test(current.args[0]))
+}

package/skill/scripts/seat-status-bridge.mjs

@@ -179,6 +179,32 @@ async function nudgeIfDropped(name, busySince) {
   }
 }
 
+// bridge 心拍（決定103）。server の bridge 台帳へ 30 秒ごとに送る。途絶＝status_bridge_down、
+// 403＝server 側が bridge_auth_failed として観測する。旧 server（404）へは送り続けない
+let lastBridgeBeatAt = 0
+let bridgeBeatSupported = null
+async function beatBridge() {
+  const now = Date.now()
+  if (bridgeBeatSupported === false || now - lastBridgeBeatAt < HEARTBEAT_MS) return
+  try {
+    const res = await fetch(`${url}/api/${encodeURIComponent(room)}/bridges`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json', ...(token ? { 'X-Peertable-Token': token } : {}) },
+      body: JSON.stringify({ kind: 'seat_status', pid: process.pid, state: 'running' }),
+    })
+    if (res.status === 404) {
+      bridgeBeatSupported = false
+      console.error('seat-status-bridge: server が bridge 台帳を持たない版（404）。心拍送信を止める')
+      return
+    }
+    if (!res.ok) throw new Error(`HTTP ${res.status}`)
+    bridgeBeatSupported = true
+    lastBridgeBeatAt = now
+  } catch (e) {
+    console.error(`seat-status-bridge: bridge心拍の送信に失敗: ${e.message}`)
+  }
+}
+
 const last = new Map()   // name -> { status, at }
 let supported = null     // server が status を保持する版か（未判定は null）
 const tokenBucket = value => value === null ? null : Math.floor(value / 1_000)
@@ -282,6 +308,7 @@ let failedTicks = 0
 let provenWritable = false
 
 async function guardedTick() {
+  await beatBridge()
   const { attempted, failed } = await tick() ?? NOTHING_ATTEMPTED
   const decided = decideBridgeContinuation({ attempted, failed, provenWritable, failedTicks, limit: FAILED_TICK_LIMIT })
   provenWritable = decided.provenWritable

package/skill/scripts/teardown.sh

@@ -44,6 +44,12 @@ skip() { echo "teardown: [スキップ] $*"; }
 miss() { echo "teardown: [未実施] $*" >&2; fail=1; }
 yes_() { [ "$1" = "True" ] || [ "$1" = "true" ]; }
 
+mcp_remove_action=not-managed
+if yes_ "$added_mcp"; then
+  mcp_remove_result=$(node "$script_dir/remove-managed-room-mcp.mjs" "$proj") || exit "$?"
+  mcp_remove_action=$(python3 -c 'import json,sys; print(json.loads(sys.argv[1])["action"])' "$mcp_remove_result")
+fi
+
 echo "teardown: mode=${mode}（archive=ログとstoreを残す／purge=痕跡ゼロ）"
 
 # ---- ログの控え（archive だけ）。room 自体は残るので、これは repo 側の写し ----
@@ -316,8 +322,7 @@ rm -rf "$proj/.team"
 did ".team/ 削除"
 
 if yes_ "$added_mcp"; then
-  rm -f "$proj/.mcp.json"
-  did ".mcp.json 削除"
+  did ".mcp.json のPeertable room MCP撤去（${mcp_remove_action}）"
 else
   skip ".mcp.json（setup が作っていない）"
 fi

package/skill/scripts/tmux-at.bash

@@ -1,10 +1,10 @@
-# sourced by launch-seat / leave-seat / teardown / ensure-bridge / change-seat
-# POSIX は tmux -S <sock>。Windows psmux は -L <aiterm-ns>（-S は既定 namespace へ落ちる）。
-_peertable_tmux_scripts=$(CDPATH= cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)
-tmux_at() {
-  local prefix
-  prefix=$(node "$_peertable_tmux_scripts/tmux-socket.mjs" --prefix) || return 1
-  # shellcheck disable=SC2206
-  local -a conn=($prefix)
-  command tmux "${conn[@]}" "$@"
-}
+# sourced by launch-seat / leave-seat / teardown / ensure-bridge / change-seat
+# POSIX は tmux -S <sock>。Windows psmux は -L <aiterm-ns>（-S は既定 namespace へ落ちる）。
+_peertable_tmux_scripts=$(CDPATH= cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)
+tmux_at() {
+  local prefix
+  prefix=$(node "$_peertable_tmux_scripts/tmux-socket.mjs" --prefix) || return 1
+  # shellcheck disable=SC2206
+  local -a conn=($prefix)
+  command tmux "${conn[@]}" "$@"
+}