peertable 0.8.18 → 0.8.20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "peertable",
-  "version": "0.8.18",
+  "version": "0.8.20",
   "description": "A round table of peer agents. No orchestrator at the head. Turn Claude Code, Codex, and Grok sessions into a team of equal, long-lived peers.",
   "type": "module",
   "license": "MIT",

package/room/client.mjs

@@ -13,7 +13,7 @@ import { findModelsDoc, resolveSeatIdentity } from '../skill/scripts/resolve-sea
 
 // client.mjs 側のハードコード版数。package.json の version と一致していることを
 // diagnostics の version_consistency が見る（2 つの版数源の drift 検出。決定45）
-const MCP_VERSION = '0.8.18'
+const MCP_VERSION = '0.8.20'
 const PKG_ROOT = join(dirname(fileURLToPath(import.meta.url)), '..')
 
 const USAGE = `usage:

package/skill/scripts/alarm-bridge.mjs

@@ -22,6 +22,7 @@ import { promisify } from 'node:util'
 
 import { resolvePostToken } from './seat-usage.mjs'
 import { observePidCommand } from './seat-identity.mjs'
+import { updateBridgeProgress } from './bridge-record-live.mjs'
 
 const run = promisify(execFile)
 const [proj, flag] = process.argv.slice(2)
@@ -57,9 +58,10 @@ if (!token) { console.error('ALARM_BRIDGE_TOKEN_MISSING: 書込トークンが
 mkdirSync(alarmsDir, { recursive: true })
 
 const self = observePidCommand(process.pid)
+const startedAt = new Date().toISOString()
 writeFileSync(record, JSON.stringify({
   pid: process.pid, start_identity: self.started_identity, room, server_url: url,
-  started_at: new Date().toISOString(), ready_at: new Date().toISOString(),
+  started_at: startedAt, ready_at: startedAt, last_progress_at: startedAt,
 }) + '\n')
 const cleanup = () => { try { unlinkSync(record) } catch {} process.exit(0) }
 process.on('SIGTERM', cleanup)
@@ -117,5 +119,6 @@ async function tick() {
 log(`alarm-bridge start: room=${room} project=${proj} pid=${process.pid}`)
 for (;;) {
   try { await tick() } catch (e) { log(`tick 失敗（続行）: ${e.message}`) }
+  updateBridgeProgress(record)
   await sleep(2000)
 }

package/skill/scripts/bridge-record-live.mjs

@@ -3,7 +3,7 @@
 // Windows は pid を再利用する。alive な pid だけでは本人ではない
 // （2026-08-21 実測: wakeup-bridge.json の pid が oracle-mcp に再利用され、
 // 本物の配達は死んだまま ensure-bridge が起動済みと誤認した）。
-import { readFileSync } from 'node:fs'
+import { readFileSync, renameSync, writeFileSync } from 'node:fs'
 import { resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
@@ -21,6 +21,13 @@ export function bridgeRecordLive(record, now = Date.now()) {
   return (now - at) <= STALE_MS
 }
 
+export function updateBridgeProgress(path, now = new Date()) {
+  const record = JSON.parse(readFileSync(path, 'utf8'))
+  const temporary = `${path}.${process.pid}.tmp`
+  writeFileSync(temporary, JSON.stringify({ ...record, last_progress_at: now.toISOString() }) + '\n')
+  renameSync(temporary, path)
+}
+
 const invokedDirectly = Boolean(process.argv[1])
   && resolve(fileURLToPath(import.meta.url)).toLowerCase() === resolve(process.argv[1]).toLowerCase()
 if (invokedDirectly) {

package/skill/scripts/claude-dialog.mjs

@@ -0,0 +1,23 @@
+#!/usr/bin/env node
+import { resolve } from 'node:path'
+import { fileURLToPath } from 'node:url'
+
+export function keysForClaudeMcpPane(screen) {
+  const text = String(screen ?? '')
+  if (text.includes('New MCP server found in this project: room')) {
+    return { kind: 'single-mcp-consent', keys: ['Down', 'Enter'] }
+  }
+  if (/new MCP servers found in this project/iu.test(text) && text.includes('Enable selected')) {
+    const selected = text.split(/\r?\n/u).filter(line => /\[✔\]/u.test(line))
+    if (!selected.some(line => /\broom\b/u.test(line))) return null
+    return { kind: 'multi-mcp-consent', keys: [...selected.map(() => 'Down'), 'Enter'] }
+  }
+  return null
+}
+
+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)
+  process.stdout.write(`${JSON.stringify(keysForClaudeMcpPane(Buffer.concat(chunks).toString('utf8')))}\n`)
+}

package/skill/scripts/ensure-bridge.sh

@@ -25,6 +25,10 @@ fi
 sock=$(node "$(dirname "$0")/tmux-socket.mjs")
 room=$(node -e 'process.stdout.write(require(process.argv[1]).room)' "$team/setup-state.json")
 session="peertable-${name}-${room}"
+# **session が在るだけでは常駐が生きている証拠にならない**（中の node だけ死んで殻が残る）。
+# pid/進捗の生存確認を通れずここへ来たsessionは、Windowsでlogを開いたままの可能性がある。
+# log切詰めより先に畳み、EBUSYを発生させない。
+tmux_at kill-session -t "$session" 2>/dev/null || true
 # **死んだ記録をここで消す。** 残すと下の loop が前回の `ready_at` を読んで、
 # 新しい bridge が1バイトも動いていない段階で success を返す——「起動していないのに
 # 起動したと言う」＝この supervisor が塞ぐはずの穴そのものになる。
@@ -41,9 +45,6 @@ for v in PEERTABLE_TMUX_SOCKET PEERTABLE_POST_TOKEN PEERTABLE_CREDENTIAL_FILE PE
   eval "val=\${$v:-}"
   [ -n "$val" ] && env_prefix="$env_prefix $v=$(printf '%q' "$val")"
 done
-# **session が在るだけでは常駐が生きている証拠にならない**（中の node だけ死んで殻が残る）。
-# 上で pid 生存を確かめて here まで来た＝生きていないので、殻は畳んでから立て直す。
-tmux_at kill-session -t "$session" 2>/dev/null || true
 if [ "$(node -p 'process.platform')" = "win32" ]; then
   # psmuxが起動する正規shellはPowerShell 7。POSIXの`env`とMSYS pathを文字列のまま
   # 渡すとnodeへ到達する前に終了するため、Windows nodeに各pathをargvとして変換させ、

package/skill/scripts/launch-seat.sh

@@ -474,6 +474,7 @@ codex_update_accepted=false
 codex_trust_accepted=false
 claude_trust_accepted=false
 codex_dialog_helper="$peertable_script_dir/codex-dialog.mjs"
+claude_dialog_helper="$peertable_script_dir/claude-dialog.mjs"
 pass_codex_pane() {
   local json key
   json=$(printf '%s' "$1" | node "$codex_dialog_helper" || true)
@@ -489,6 +490,18 @@ print("\n".join(a.get("keys") or []) if isinstance(a, dict) else "")' <<<"$json"
 codex_pane_blocks_ready() {
   printf '%s' "$1" | node "$codex_dialog_helper" --ready-ok
 }
+pass_claude_mcp_pane() {
+  local json key
+  json=$(printf '%s' "$1" | node "$claude_dialog_helper" || true)
+  [ -n "$json" ] && [ "$json" != "null" ] || return 1
+  while IFS= read -r key; do
+    [ -n "$key" ] || continue
+    tmux_at send-keys -t "$sess" "$key" || return 1
+  done < <(python3 -c 'import json,sys
+a=json.loads(sys.stdin.read() or "null")
+print("\n".join(a.get("keys") or []) if isinstance(a, dict) else "")' <<<"$json")
+  return 0
+}
 while [ $SECONDS -lt "$room_ready_deadline" ]; do
   # Grok Build は初めて開く作業treeで、room MCPを初期化する前にworkspace trustを尋ねる。
   # Peertableが正式に着席させるtreeなので、この既知文言だけを一度通す。未知の確認画面を
@@ -551,17 +564,11 @@ while [ $SECONDS -lt "$room_ready_deadline" ]; do
   # 同意が member 登録より前に出る。選択肢2（this and all future）だけを通す。
   if [ "$harness" = claude ] && [ "$mcp_consent_accepted" != true ]; then
     claude_screen=$(tmux_at capture-pane -t "$sess" -p 2>/dev/null || true)
-    case "$claude_screen" in
-      *"New MCP server found in this project: room"*)
-        if ! tmux_at send-keys -t "$sess" Down || ! tmux_at send-keys -t "$sess" Enter; then
-          echo "SEAT_CLAUDE_MCP_CONSENT_FAILED: room MCP 同意へ応答できない" >&2
-          exit 1
-        fi
-        mcp_consent_accepted=true
-        room_ready_deadline=$((SECONDS + 90))
-        echo "claude room MCP consent: accepted"
-        ;;
-    esac
+    if pass_claude_mcp_pane "$claude_screen"; then
+      mcp_consent_accepted=true
+      room_ready_deadline=$((SECONDS + 90))
+      echo "claude room MCP consent: accepted"
+    fi
   fi
   room_members=$(curl -sf "$url/api/$room/members" 2>/dev/null || true)
   if printf '%s' "$room_members" | python3 -c 'import json,sys; name=sys.argv[1]; members=json.load(sys.stdin).get("members",[]); raise SystemExit(0 if any(m.get("name") == name for m in members) else 1)' "$name"; then

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

@@ -28,6 +28,7 @@ import { existsSync, readFileSync, renameSync, writeFileSync, unlinkSync } from
 import { join } from 'node:path'
 
 import { STOP_DECLARATION, attributeJobSession, combineSeatLamp, isPaneHarnessMissing, hasActiveDescendant, subtreeCpuSeconds, patrolTargets, classifyPaneTail, decideBridgeContinuation, deriveMissingSession, isPaneProcessStopped, parsePaneTokenHint, resolveLatticeExecutable, resolvePostToken, resolveSeatObservation, resolveTmuxSocket, supportsMemberObservation, tmuxArgv, tmuxPanePid } from './seat-usage.mjs'
+import { updateBridgeProgress } from './bridge-record-live.mjs'
 
 const args = process.argv.slice(2)
 const proj = args[0]
@@ -381,7 +382,8 @@ function recordReady() {
   readyRecorded = true
   const record = JSON.parse(readFileSync(pidPath, 'utf8'))
   const temporary = `${pidPath}.${process.pid}.tmp`
-  writeFileSync(temporary, JSON.stringify({ ...record, ready_at: new Date().toISOString() }) + '\n')
+  const readyAt = new Date().toISOString()
+  writeFileSync(temporary, JSON.stringify({ ...record, ready_at: readyAt, last_progress_at: readyAt }) + '\n')
   renameSync(temporary, pidPath)
 }
 
@@ -484,6 +486,7 @@ let provenWritable = false
 async function guardedTick() {
   await beatBridge()
   const { attempted, failed } = await tick() ?? NOTHING_ATTEMPTED
+  updateBridgeProgress(pidPath)
   const decided = decideBridgeContinuation({ attempted, failed, provenWritable, failedTicks, limit: FAILED_TICK_LIMIT })
   provenWritable = decided.provenWritable
   failedTicks = decided.failedTicks