peertable 0.4.37 → 0.5.1

package/skill/scripts/change-seat.sh

@@ -59,7 +59,8 @@ name=sys.argv[1]
 member=next((m for m in json.load(sys.stdin).get("members",[]) if m.get("name")==name),None)
 if not member or member.get("vendor") not in ("claude","codex","grok") or not member.get("model"):
     raise SystemExit(1)
-print("\t".join((member["vendor"],member["model"],member.get("effort") or "",member.get("aiterm_session_id") or "",member.get("role") or "")))
+roles=member.get("roles") or []
+print("\t".join((member["vendor"],member["model"],member.get("effort") or "",member.get("aiterm_session_id") or "",",".join(roles))))
 ' "$name") || { echo "SEAT_CHANGE_MEMBER_METADATA_MISSING: ${name} のvendor/modelが要る" >&2; exit 1; }
 IFS=$'\t' read -r old_vendor old_model old_effort aiterm_session_id old_role <<EOF
 $meta

package/skill/scripts/codex-dialog.mjs

@@ -0,0 +1,46 @@
+#!/usr/bin/env node
+// Codex TUI の既知ダイアログ → 送るキー。画面文言だけで判定する。未知の確認は通さない。
+import { fileURLToPath } from 'node:url'
+import { resolve } from 'node:path'
+
+export const MCP_ALLOW_NEEDLE = 'Allow the room MCP server to run tool'
+export const MCP_ALWAYS_ALLOW = 'Always allow'
+export const COMMAND_APPROVAL_NEEDLE = 'Would you like to run the following command?'
+export const COMMAND_APPROVAL_DONT_ASK = "don't ask again"
+
+export function keysForCodexPane(screen) {
+  const text = String(screen ?? '')
+  if (text.includes(MCP_ALLOW_NEEDLE) && text.includes(MCP_ALWAYS_ALLOW)) {
+    return { kind: 'mcp-allow', keys: ['Down', 'Down', 'Enter'] }
+  }
+  if (text.includes(COMMAND_APPROVAL_NEEDLE) && text.toLowerCase().includes(COMMAND_APPROVAL_DONT_ASK)) {
+    return { kind: 'command-approval', keys: ['Down', 'Enter'] }
+  }
+  if (text.includes('Hooks need review')) {
+    return { kind: 'hooks', keys: ['Down', 'Enter'] }
+  }
+  if (text.includes('Update now')) {
+    return { kind: 'update', keys: ['Down', 'Enter'] }
+  }
+  if (text.includes('Yes, continue') && text.includes('Do you trust the contents of this directory')) {
+    return { kind: 'trust', keys: ['Enter'] }
+  }
+  return null
+}
+
+export function blocksCodexReady(screen) {
+  const kind = keysForCodexPane(screen)?.kind
+  return kind === 'mcp-allow' || kind === 'command-approval'
+}
+
+const isMain = Boolean(process.argv[1]) && resolve(process.argv[1]) === fileURLToPath(import.meta.url)
+if (isMain) {
+  const chunks = []
+  for await (const chunk of process.stdin) chunks.push(chunk)
+  const screen = Buffer.concat(chunks).toString('utf8')
+  const action = keysForCodexPane(screen)
+  if (process.argv.includes('--ready-ok')) {
+    process.exit(blocksCodexReady(screen) ? 2 : 0)
+  }
+  process.stdout.write(`${JSON.stringify(action)}\n`)
+}

package/skill/scripts/codex-seat-toml.mjs

@@ -0,0 +1,6 @@
+export function repairSplicedBegin(text) {
+  return String(text ?? '').replace(
+    /^# BEGIN PEERTABLE ROOM MCP\napproval_policy = "never"\nsandbox_mode = "danger-full-access" added_newline=([01])\n/mu,
+    '# BEGIN PEERTABLE ROOM MCP added_newline=$1\napproval_policy = "never"\nsandbox_mode = "danger-full-access"\n',
+  )
+}

package/skill/scripts/doctor.sh

@@ -0,0 +1,185 @@
+#!/bin/bash
+# 卓の健全性を機械判定して表示し、--repair 指定時だけ死んでいるブリッジを立て直す。
+# usage: doctor.sh <project_dir> [--repair]
+#
+# 判定するのは5点だけ:
+#   1. room サーバー到達性（GET /api/<room>/summary）
+#   2. 台帳（room member 行）の素性・本人性の完全性
+#   3. 各席の tmux セッション（peer-<name>）の存在と、席file の pid+lstart による本人性
+#   4. 2ブリッジ（wakeup / seat-status）の record 生存と、record にある識別情報だけで
+#      判定できる範囲の本人性・鮮度（判定できないものは「判定不能」と正直に出す。偽の生存判定を作らない）
+#   5. Lattice 併用モード（mode=lattice）なら `lattice status --json` の state / active_runs
+#
+# 各行は OK / NG / REPAIRED / 判定不能 のいずれかで始まる。--repair は NG のブリッジだけ
+# ensure-bridge.sh で立て直す。**席の再起動はしない**——席は人の判断が要るので、NG 表示に
+# launch-seat.sh を促す一言を添えるだけに留める。
+#
+# 終了コード: 全 OK（判定不能を含む）= 0、NG が1件でもあれば 1（--repair で全部直れば 0）。
+set -euo pipefail
+
+proj="${1:-}"
+repair=false
+if [ "${2:-}" = "--repair" ]; then repair=true; fi
+if [ -z "$proj" ]; then
+  echo "usage: doctor.sh <project_dir> [--repair]" >&2
+  exit 1
+fi
+proj=$(cd "$proj" && pwd)
+script_dir=$(cd "$(dirname "$0")" && pwd)
+setup="$proj/.team/setup-state.json"
+if [ ! -f "$setup" ]; then
+  echo "NG .team/setup-state.json が無い（${proj} は peertable setup 済みか確認せよ）" >&2
+  exit 1
+fi
+
+DOCTOR_PROJ="$proj" DOCTOR_SCRIPT_DIR="$script_dir" DOCTOR_REPAIR="$repair" \
+  node --input-type=module <<'NODE'
+import { existsSync, readFileSync, readdirSync } from 'node:fs'
+import { execFileSync, spawnSync } from 'node:child_process'
+import { join } from 'node:path'
+import { pathToFileURL } from 'node:url'
+
+const proj = process.env.DOCTOR_PROJ
+const scriptDir = process.env.DOCTOR_SCRIPT_DIR
+const repair = process.env.DOCTOR_REPAIR === 'true'
+const team = join(proj, '.team')
+
+const { bridgeRecordLive } = await import(pathToFileURL(join(scriptDir, 'bridge-record-live.mjs')))
+const { observePidCommand } = await import(pathToFileURL(join(scriptDir, 'refresh-seat-identity.mjs')))
+const { resolveTmuxSocket, tmuxArgv } = await import(pathToFileURL(join(scriptDir, 'seat-usage.mjs')))
+
+let ng = 0
+function line(level, text) {
+  console.log(`${level} ${text}`)
+  if (level === 'NG') ng = 1
+}
+
+const setup = JSON.parse(readFileSync(join(team, 'setup-state.json'), 'utf8'))
+const { room, server_url: url, mode } = setup
+
+// 1. room サーバー到達性
+let summary = null
+try {
+  const res = await fetch(`${url}/api/${encodeURIComponent(room)}/summary`)
+  if (!res.ok) throw new Error(`HTTP ${res.status}`)
+  summary = await res.json()
+  line('OK', `room 到達: ${url} room=${room} seq=${summary.seq} member_count=${summary.member_count}`)
+} catch (error) {
+  line('NG', `room 到達不可: ${url} room=${room}（${error.message}）`)
+}
+
+// members は以降の突合・席チェックにも使う
+let members = []
+let membersOk = false
+try {
+  const res = await fetch(`${url}/api/${encodeURIComponent(room)}/members`)
+  if (!res.ok) throw new Error(`HTTP ${res.status}`)
+  const body = await res.json()
+  members = Array.isArray(body.members) ? body.members : []
+  membersOk = true
+} catch (error) {
+  line('NG', `room members を取得できない（${error.message}）`)
+}
+
+// 2. 台帳の完全性。tmux 席を持つ member（親以外）は本人性欄（pid 等）も台帳に載っている
+// はず（席file は 2026-08-22 廃止・正本は member 行だけ）
+function hasDescriptor(member) {
+  return Boolean(member?.observe && typeof member.observe === 'object'
+    && typeof member.observe.tmux_target === 'string' && member.observe.tmux_target.length > 0)
+}
+const seatRows = new Map()
+if (membersOk) {
+  const seated = members.filter(hasDescriptor)
+  const missingIdentity = seated.filter(m => !Number.isSafeInteger(m.pid) || !m.started_identity || !m.argv_digest)
+  for (const m of seated) seatRows.set(m.name, m)
+  if (missingIdentity.length === 0) {
+    line('OK', `台帳の member 行に素性・本人性が揃っている（${seated.length} 席）`)
+  } else {
+    line('NG', `台帳の本人性欄が欠けている member: ${missingIdentity.map(m => m.name).join(',')}`)
+  }
+}
+
+// 3. 各席の tmux セッション（peer-<name>）の存在と、台帳の pid+lstart による本人性
+for (const [name, seat] of seatRows) {
+  const member = seat
+  const socket = member?.observe?.tmux_socket || resolveTmuxSocket(process.env).socket
+  const target = member?.observe?.tmux_target || `peer-${name}`
+  let sessionExists = false
+  try {
+    execFileSync('tmux', tmuxArgv(['has-session', '-t', target], { socket }), { stdio: 'ignore' })
+    sessionExists = true
+  } catch { /* has-session は非ゼロ終了で無しを表す */ }
+  if (!sessionExists) {
+    line('NG', `席 ${name}: tmux セッション ${target} が無い（launch-seat.sh で立て直す）`)
+    continue
+  }
+  let identity = null
+  let identityError = null
+  try { identity = observePidCommand(seat.pid) } catch (error) { identityError = error }
+  if (identityError) {
+    line('NG', `席 ${name}: pid ${seat.pid} を観測できない（${identityError.message}）（launch-seat.sh で立て直す）`)
+    continue
+  }
+  if (identity.started_identity !== seat.started_identity) {
+    line('NG', `席 ${name}: pid ${seat.pid} は再利用されている（lstart不一致・本人ではない）（launch-seat.sh で立て直す）`)
+    continue
+  }
+  line('OK', `席 ${name}: tmux ${target} 生存・pid ${seat.pid} 本人性確認`)
+}
+
+// 4. 2ブリッジ（run-bridge は 2026-08-22 退役）。record の形式が違うので判定できる範囲だけ判定する
+function judgeWakeup() {
+  const path = join(team, 'wakeup-bridge.json')
+  if (!existsSync(path)) return { level: 'NG', text: 'wakeup-bridge: record が無い（起動していない）' }
+  const record = JSON.parse(readFileSync(path, 'utf8'))
+  if (bridgeRecordLive(record)) {
+    const age = Math.round((Date.now() - Date.parse(record.last_progress_at)) / 1000)
+    return { level: 'OK', text: `wakeup-bridge: 生存 pid=${record.pid} last_progress ${age}秒前` }
+  }
+  return { level: 'NG', text: `wakeup-bridge: pid=${record.pid} が死んでいるか last_progress_at が古い` }
+}
+
+function judgeSeatStatusBridge() {
+  const path = join(team, 'seat-status-bridge.json')
+  if (!existsSync(path)) return { level: 'NG', text: 'seat-status-bridge: record が無い（起動していない）' }
+  const record = JSON.parse(readFileSync(path, 'utf8'))
+  let alive = false
+  try { process.kill(record.pid, 0); alive = true } catch { /* 死んでいる */ }
+  if (!alive) return { level: 'NG', text: `seat-status-bridge: pid=${record.pid} が死んでいる` }
+  return { level: '判定不能', text: `seat-status-bridge: pid=${record.pid} は生存しているが record に lstart が無く本人性を確認できない` }
+}
+
+for (const [name, judge] of [['wakeup', judgeWakeup], ['seat-status', judgeSeatStatusBridge]]) {
+  let result = judge()
+  if (result.level === 'NG' && repair) {
+    const res = spawnSync(join(scriptDir, 'ensure-bridge.sh'), [proj, name], { encoding: 'utf8' })
+    if (res.status === 0) {
+      const after = judge()
+      if (after.level !== 'NG') { line('REPAIRED', `${name}-bridge: 立て直した（${after.text}）`); continue }
+      line('NG', `${name}-bridge: 立て直したが依然として不健全（${after.text}）`)
+      continue
+    }
+    const detail = (res.stderr || res.stdout || '').trim().split('\n').slice(-3).join(' / ')
+    line('NG', `${name}-bridge: 立て直しに失敗（${detail || `exit ${res.status}`}）`)
+    continue
+  }
+  line(result.level, result.text)
+}
+
+// 5. Lattice 併用モードの工程正本
+if (mode === 'lattice') {
+  const latticeCli = process.env.LATTICE_CLI || (typeof setup.lattice_cli === 'string' && setup.lattice_cli) || 'lattice'
+  try {
+    const command = process.platform === 'win32' && !/\.(cmd|bat|exe)$/i.test(latticeCli) && existsSync(`${latticeCli}.cmd`)
+      ? `${latticeCli}.cmd`
+      : latticeCli
+    const out = execFileSync(command, ['status', '--json'], { cwd: proj, encoding: 'utf8', maxBuffer: 8 * 1024 * 1024 })
+    const status = JSON.parse(out)
+    line('OK', `Lattice: state=${status.state} active_runs=${(status.active_runs ?? []).length}`)
+  } catch (error) {
+    line('NG', `Lattice status を取得できない（${String(error.message ?? error).split('\n')[0]}）`)
+  }
+}
+
+process.exit(ng)
+NODE

package/skill/scripts/ensure-bridge.sh

@@ -3,7 +3,7 @@
 set -euo pipefail
 
 proj="$1"; name="$2"; shift 2
-case "$name" in seat-status) script="seat-status-bridge.mjs" ;; wakeup) script="wakeup-bridge.mjs" ;; run) script="run-bridge.mjs" ;; *) echo "usage: ensure-bridge.sh <project> <seat-status|wakeup|run> [args...]" >&2; exit 1 ;; esac
+case "$name" in seat-status) script="seat-status-bridge.mjs" ;; wakeup) script="wakeup-bridge.mjs" ;; alarm) script="alarm-bridge.mjs" ;; run) echo "ENSURE_BRIDGE_RETIRED: run-bridge は退役した（2026-08-22）。介入は席が自分の Lattice コマンド応答で受け取る" >&2; exit 1 ;; *) echo "usage: ensure-bridge.sh <project> <seat-status|wakeup|alarm> [args...]" >&2; exit 1 ;; esac
 team="$proj/.team"; record="$team/$name-bridge.json"; log="$team/$name-bridge.log"
 force=false
 if [ "${1:-}" = "--force" ]; then force=true; shift; fi

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

@@ -6,6 +6,7 @@ import {
 } from 'node:fs'
 import { dirname, join, resolve } from 'node:path'
 import { execFileSync } from 'node:child_process'
+import { repairSplicedBegin } from './codex-seat-toml.mjs'
 
 const fail = (code, message) => {
   process.stderr.write(`${code}: ${message}\n`)
@@ -71,6 +72,8 @@ function expectedBlock(addedNewline) {
   if (process.env.PATH) explicitEnv.unshift(`PATH = ${JSON.stringify(process.env.PATH)}`)
   return [
     `# BEGIN PEERTABLE ROOM MCP added_newline=${addedNewline ? '1' : '0'}`,
+    'approval_policy = "never"',
+    'sandbox_mode = "danger-full-access"',
     '[mcp_servers.room]',
     'command = "node"',
     `args = [${JSON.stringify(client)}]`,
@@ -120,7 +123,7 @@ try {
     const missing = requiredSeatEnv.filter((name) => !process.env[name])
     if (missing.length > 0)
       fail('SEAT_CODEX_ROOM_MCP_ENV_MISSING', `seat環境が無い: ${missing.join(',')}`)
-    const current = existsSync(configFile) ? readFileSync(configFile, 'utf8') : ''
+    const current = repairSplicedBegin(existsSync(configFile) ? readFileSync(configFile, 'utf8') : '')
     const range = markerRange(current)
     let next
     if (range) {