peertable 0.8.54 → 0.8.56

package/skill/scripts/project-scaffold.mjs

@@ -0,0 +1,179 @@
+// 明示されたprojectだけに、Peertableの生成物と所有記録を置く。
+import { existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, rmSync, writeFileSync } from 'node:fs'
+import { execFileSync } from 'node:child_process'
+import { basename, dirname, join, resolve } from 'node:path'
+import { packageRoot } from './install-skill.mjs'
+import { expectedRoomMcp, isExpectedRoomMcp } from './room-mcp-config.mjs'
+import { resolveLatticeInvocation } from './seat-usage.mjs'
+
+export const fail = (code, message) => { throw Object.assign(new Error(`${code}: ${message}`), { code }) }
+export const readJson = path => JSON.parse(readFileSync(path, 'utf8'))
+export const writeJson = (path, value) => writeFileSync(path, `${JSON.stringify(value, null, 2)}\n`)
+
+export function projectPath(input) {
+  if (!input) fail('PEERTABLE_PROJECT_REQUIRED', '対象projectのパスを指定してください')
+  const path = realpathSync(input)
+  if (!lstatSync(path).isDirectory()) fail('PEERTABLE_PROJECT_INVALID', path)
+  return path
+}
+
+export function readSetup(project) {
+  const file = join(project, '.team', 'setup-state.json')
+  if (!existsSync(file)) fail('RESUME_NOT_SET_UP', `${project}は未setupです`)
+  const state = readJson(file)
+  if (!state || !['standalone', 'lattice'].includes(state.mode) || !state.room || !state.server_url)
+    fail('PEERTABLE_SETUP_STATE_INVALID', file)
+  return state
+}
+
+export function runScript(script, args = [], { root = packageRoot, env = process.env, cwd } = {}) {
+  return execFileSync(process.execPath, [join(root, 'skill', 'scripts', script), ...args], {
+    encoding: 'utf8', cwd, env, stdio: ['ignore', 'pipe', 'pipe'],
+  }).trim()
+}
+
+function excludePath(project) {
+  try {
+    return execFileSync('git', ['-C', project, 'rev-parse', '--path-format=absolute', '--git-path', 'info/exclude'], {
+      encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'],
+    }).trim()
+  } catch (error) {
+    if (error.code === 'ENOENT') throw error
+    return null // git管理外のprojectも単独モードで使える。
+  }
+}
+
+export function addExclude(project, rule) {
+  const path = excludePath(project)
+  if (!path) return false
+  const body = existsSync(path) ? readFileSync(path, 'utf8') : ''
+  if (body.split(/\r?\n/u).includes(rule)) return false
+  mkdirSync(dirname(path), { recursive: true })
+  writeFileSync(path, `${body}${body && !body.endsWith('\n') ? '\n' : ''}${rule}\n`)
+  return true
+}
+
+export function removeExclude(project, rule) {
+  const path = excludePath(project)
+  if (!path || !existsSync(path)) return
+  const body = readFileSync(path, 'utf8')
+  writeFileSync(path, body.split('\n').filter(line => line.replace(/\r$/u, '') !== rule).join('\n'))
+}
+
+export function ensureProjectRoomMcp(project, state, { root = packageRoot } = {}) {
+  const file = join(project, '.mcp.json')
+  if (existsSync(file) && lstatSync(file).isSymbolicLink()) fail('PEERTABLE_MCP_CONFLICT', '.mcp.jsonはsymlinkです')
+  const mcp = existsSync(file) ? readJson(file) : {}
+  if (!mcp || typeof mcp !== 'object' || Array.isArray(mcp)
+    || (mcp.mcpServers !== undefined && (!mcp.mcpServers || typeof mcp.mcpServers !== 'object' || Array.isArray(mcp.mcpServers))))
+    fail('PEERTABLE_MCP_CONFLICT', '.mcp.jsonの形式が不正です')
+  const expected = expectedRoomMcp(root)
+  if (mcp.mcpServers?.room !== undefined) {
+    if (!isExpectedRoomMcp(mcp.mcpServers.room, expected)) fail('PEERTABLE_MCP_CONFLICT', '既存のroom MCP定義が異なります')
+    return
+  }
+  if (!(state.room_mcp_managed ?? state.added_root_mcp)) fail('PEERTABLE_MCP_CONFLICT', '利用者が管理するroom MCP定義がありません')
+  mcp.mcpServers ??= {}
+  mcp.mcpServers.room = expected
+  // 所有記録の保存後にだけ置換する。書込み失敗で利用者の設定を切り詰めない。
+  const temporary = `${file}.peertable-${process.pid}.tmp`
+  try {
+    writeFileSync(temporary, `${JSON.stringify(mcp, null, 2)}\n`, { mode: existsSync(file) ? lstatSync(file).mode & 0o777 : 0o600 })
+    renameSync(temporary, file)
+  } finally { rmSync(temporary, { force: true }) }
+}
+
+export function scaffoldProject(options, { root = packageRoot } = {}) {
+  const project = projectPath(options.project)
+  const team = join(project, '.team')
+  try {
+    const info = lstatSync(team)
+    if (info.isSymbolicLink() || !info.isDirectory()) fail('PEERTABLE_SETUP_TEAM_CONFLICT', '.teamは通常ディレクトリではありません')
+  } catch (error) { if (error.code !== 'ENOENT') throw error }
+  if (existsSync(join(team, 'setup-state.json'))) {
+    const state = readSetup(project)
+    if ((options.room && options.room !== state.room)
+      || (options.url && options.url.replace(/\/+$/u, '') !== state.server_url.replace(/\/+$/u, '')))
+      fail('PEERTABLE_SETUP_TARGET_CONFLICT', '既存projectのroomまたはserverと指定が違います')
+    ensureProjectRoomMcp(project, state, { root })
+    return { project, state, action: 'resume' }
+  }
+  if (existsSync(team) && (!lstatSync(team).isDirectory() || lstatSync(team).isSymbolicLink() || readdirSync(team).length))
+    fail('PEERTABLE_SETUP_TEAM_CONFLICT', '.teamに既存資産があります')
+  if (excludePath(project)) {
+    const tracked = execFileSync('git', ['-C', project, 'ls-files', '--cached', '--', '.team'], { encoding: 'utf8' })
+    if (tracked.trim()) fail('PEERTABLE_SETUP_TEAM_CONFLICT', '.teamにgit追跡済みの資産があります')
+  }
+  const room = options.room || basename(project)
+  if (!/^[A-Za-z0-9._-]+$/u.test(room)) fail('PEERTABLE_ROOM_INVALID', room)
+  const url = (options.url || '').replace(/\/+$/u, '')
+  let parsedUrl
+  try { parsedUrl = new URL(url) } catch { fail('PEERTABLE_SERVER_REQUIRED', '--urlにroom server URLを指定してください') }
+  if (!['http:', 'https:'].includes(parsedUrl.protocol) || parsedUrl.username || parsedUrl.password)
+    fail('PEERTABLE_SERVER_INVALID', 'HTTP/HTTPSのroom serverを指定してください')
+  const mode = options.plan && options.plan !== '-' ? 'lattice' : 'standalone'
+  const phases = options.phases ?? []
+  if (phases.some(phase => !/^[A-Za-z0-9._-]+$/u.test(phase)) || (mode === 'standalone' && phases.length))
+    fail('PEERTABLE_PHASE_INVALID', 'phaseはLatticeモードの有効なIDだけを指定できます')
+  let tasks
+  if (mode === 'standalone') {
+    if (!options.tasks) fail('PEERTABLE_TASKS_REQUIRED', '単独モードには--tasksで議題ファイルを指定してください')
+    tasks = readFileSync(resolve(options.tasks), 'utf8')
+    if (!tasks.trim()) fail('PEERTABLE_TASKS_REQUIRED', '議題ファイルが空です')
+  }
+  if (mode === 'lattice') {
+    const gitRoot = execFileSync('git', ['-C', project, 'rev-parse', '--show-toplevel'], { encoding: 'utf8' }).trim()
+    if (realpathSync(gitRoot) !== project) fail('PEERTABLE_PROJECT_INVALID', 'Latticeモードはgit rootを指定してください')
+    const invocation = resolveLatticeInvocation(options.latticeCli || process.env.LATTICE_CLI || 'lattice', ['--version'])
+    execFileSync(invocation.command, invocation.argv, { cwd: project, encoding: 'utf8', timeout: 15_000 })
+  }
+  const mcpPath = join(project, '.mcp.json')
+  try { if (lstatSync(mcpPath).isSymbolicLink()) fail('PEERTABLE_MCP_CONFLICT', '.mcp.jsonはsymlinkです') }
+  catch (error) { if (error.code !== 'ENOENT') throw error }
+  const preexisting = existsSync(mcpPath)
+  if (preexisting && (!lstatSync(mcpPath).isFile() || lstatSync(mcpPath).isSymbolicLink()))
+    fail('PEERTABLE_MCP_CONFLICT', '.mcp.jsonは通常ファイルである必要があります')
+  const mcp = preexisting ? readJson(mcpPath) : {}
+  if (!mcp || typeof mcp !== 'object' || Array.isArray(mcp)
+    || (mcp.mcpServers !== undefined && (!mcp.mcpServers || typeof mcp.mcpServers !== 'object' || Array.isArray(mcp.mcpServers))))
+    fail('PEERTABLE_MCP_CONFLICT', '.mcp.jsonの形式が不正です')
+  const roomPreexisting = mcp.mcpServers?.room !== undefined
+  if (roomPreexisting && !isExpectedRoomMcp(mcp.mcpServers.room, expectedRoomMcp(root)))
+    fail('PEERTABLE_MCP_CONFLICT', '既存のroom MCP定義が異なります')
+
+  const state = {
+    room, server_url: url, public_url: options.publicUrl || url, mode,
+    plan_key: mode === 'lattice' ? options.plan : '', phases,
+    lattice_cli: options.latticeCli || process.env.LATTICE_CLI || '',
+    lattice_preexisting: existsSync(join(project, '.lattice')),
+    runtime_preexisting: existsSync(join(project, '.lattice', 'runtime')),
+    added_exclude: false, added_mcp_exclude: false, added_runtime_exclude: false,
+    added_root_mcp: !preexisting, room_mcp_managed: !roomPreexisting,
+    external_pane: false, project_json_preexisting: false,
+    work_order_adapter: false, work_order_spool_ref: '',
+  }
+  try {
+    mkdirSync(join(team, 'roles'), { recursive: true })
+    mkdirSync(join(team, 'scripts'), { recursive: true })
+    if (!roomPreexisting && preexisting) writeFileSync(join(team, 'root-mcp.original.json'), readFileSync(mcpPath))
+    if (mode === 'standalone') writeFileSync(join(team, 'tasks.md'), readFileSync(join(root, 'skill', 'templates', 'tasks.md'), 'utf8') + tasks)
+    writeJson(join(team, 'setup-state.json'), state)
+  } catch (error) {
+    // この時点では既存設定へ未着手。今回作った足場だけを戻して再実行可能にする。
+    try { rmSync(team, { recursive: true, force: true }) }
+    catch (cleanup) { throw new AggregateError([error, cleanup], 'setup記録の保存と足場の撤去が失敗しました') }
+    throw error
+  }
+  ensureProjectRoomMcp(project, state, { root })
+  state.added_exclude = addExclude(project, '.team/')
+  if (!preexisting) state.added_mcp_exclude = addExclude(project, '/.mcp.json')
+  if (mode === 'lattice') state.added_runtime_exclude = addExclude(project, '/.lattice/runtime/')
+  writeJson(join(team, 'setup-state.json'), state)
+  runScript('upgrade-team-assets.mjs', [project], { root })
+  if (mode === 'lattice') {
+    state.project_json_preexisting = runScript('external-pane.mjs', [project, room, state.public_url], { root }) === 'true'
+    state.external_pane = true
+    writeJson(join(team, 'setup-state.json'), state)
+  }
+  return { project, state, action: 'created' }
+}

package/skill/scripts/project-scaffold.test.mjs

@@ -0,0 +1,129 @@
+import assert from 'node:assert/strict'
+import { execFileSync } from 'node:child_process'
+import { existsSync, mkdirSync, mkdtempSync, readFileSync, rmSync, symlinkSync, writeFileSync } from 'node:fs'
+import fs from 'node:fs'
+import { syncBuiltinESMExports } from 'node:module'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import test from 'node:test'
+import { scaffoldProject, runScript } from './project-scaffold.mjs'
+
+function fixture(t) {
+  const dir = mkdtempSync(join(tmpdir(), 'peertable-project-'))
+  t.after(() => rmSync(dir, { recursive: true, force: true }))
+  const project = join(dir, 'project with spaces')
+  mkdirSync(project)
+  execFileSync('git', ['init', '--quiet', project])
+  const tasks = join(dir, 'tasks.md')
+  writeFileSync(tasks, '- smoke: 導入の確認\n')
+  return { dir, project, tasks, room: 'install-smoke', url: 'http://127.0.0.1:18860' }
+}
+
+test('scaffoldは対象projectに生成し既存MCP設定と他projectを保持する', t => {
+  const options = fixture(t)
+  const mcp = { custom: true, mcpServers: { existing: { command: 'keep', args: ['a'] } } }
+  writeFileSync(join(options.project, '.mcp.json'), JSON.stringify(mcp))
+  mkdirSync(join(options.dir, 'other'))
+  writeFileSync(join(options.dir, 'other', 'setting'), '保持')
+  const result = scaffoldProject(options)
+  assert.equal(result.action, 'created')
+  assert.equal(result.state.mode, 'standalone')
+  assert.equal(result.state.added_root_mcp, false)
+  assert.equal(result.state.room_mcp_managed, true)
+  const after = JSON.parse(readFileSync(join(options.project, '.mcp.json'), 'utf8'))
+  assert.deepEqual(after.mcpServers.existing, mcp.mcpServers.existing)
+  assert.equal(after.custom, true)
+  assert.equal(after.mcpServers.room.command, 'node')
+  assert.equal(readFileSync(join(options.dir, 'other', 'setting'), 'utf8'), '保持')
+  assert.ok(existsSync(join(options.project, '.team', 'roles', 'member.md')))
+})
+
+test('setup再実行は既存roomと議題を保持してresumeを選ぶ', t => {
+  const options = fixture(t)
+  scaffoldProject(options)
+  const path = join(options.project, '.team', 'tasks.md')
+  const tasksBefore = readFileSync(path, 'utf8')
+  writeFileSync(options.tasks, '新しい議題')
+  const result = scaffoldProject({ project: options.project, tasks: options.tasks })
+  assert.equal(result.action, 'resume')
+  assert.equal(result.state.room, options.room)
+  assert.equal(readFileSync(path, 'utf8'), tasksBefore)
+  assert.throws(() => scaffoldProject({ project: options.project, room: 'different' }), { code: 'PEERTABLE_SETUP_TARGET_CONFLICT' })
+  assert.throws(() => scaffoldProject({ project: options.project, url: 'http://elsewhere' }), { code: 'PEERTABLE_SETUP_TARGET_CONFLICT' })
+})
+
+test('既存team・room設定の衝突は書込み前に拒否する', t => {
+  const options = fixture(t)
+  writeFileSync(join(options.project, '.mcp.json'), '{"mcpServers":{"room":{"command":"user-owned"}}}')
+  assert.throws(() => scaffoldProject(options), { code: 'PEERTABLE_MCP_CONFLICT' })
+  assert.equal(existsSync(join(options.project, '.team')), false)
+  rmSync(join(options.project, '.mcp.json'))
+  mkdirSync(join(options.project, '.team'))
+  writeFileSync(join(options.project, '.team', 'owned'), '独自資産')
+  assert.throws(() => scaffoldProject(options), { code: 'PEERTABLE_SETUP_TEAM_CONFLICT' })
+  assert.equal(readFileSync(join(options.project, '.team', 'owned'), 'utf8'), '独自資産')
+})
+
+test('team symlinkへ既存状態をたどらず、別projectへ書かない', t => {
+  const options = fixture(t)
+  const target = join(options.dir, 'outside')
+  mkdirSync(target)
+  writeFileSync(join(target, 'setup-state.json'), '{"mode":"standalone","room":"outside","server_url":"http://localhost"}')
+  symlinkSync(target, join(options.project, '.team'), process.platform === 'win32' ? 'junction' : 'dir')
+  assert.throws(() => scaffoldProject(options), { code: 'PEERTABLE_SETUP_TEAM_CONFLICT' })
+})
+
+test('単独modeの議題と明示projectを要求する', t => {
+  const options = fixture(t)
+  assert.throws(() => scaffoldProject({}), { code: 'PEERTABLE_PROJECT_REQUIRED' })
+  assert.throws(() => scaffoldProject({ ...options, tasks: undefined }), { code: 'PEERTABLE_TASKS_REQUIRED' })
+  assert.equal(existsSync(join(options.project, '.team')), false)
+})
+test('room block撤去は元の書式を戻し、運用中の他設定変更は保持する', t => {
+  for (const original of ['{ "mcpServers": {} }', '{"custom":true,"mcpServers":{"existing":{"command":"keep"}}}']) {
+    for (const changed of [false, true]) {
+      const options = fixture(t)
+      const file = join(options.project, '.mcp.json')
+      writeFileSync(file, original)
+      scaffoldProject(options)
+      if (changed) {
+        const current = JSON.parse(readFileSync(file, 'utf8'))
+        current.added_by_user = '運用中の変更'
+        writeFileSync(file, JSON.stringify(current))
+      }
+      runScript('remove-managed-room-mcp.mjs', [options.project])
+      const actual = readFileSync(file, 'utf8')
+      if (!changed) assert.equal(actual, original)
+      else {
+        assert.equal(JSON.parse(actual).added_by_user, '運用中の変更')
+        assert.equal(JSON.parse(actual).mcpServers?.room, undefined)
+      }
+    }
+  }
+})
+test('所有記録とMCP設定の書込み失敗から既存設定を保って再開する', t => {
+  for (const point of ['setup-state.json', '.mcp.json.peertable-']) {
+    const options = fixture(t)
+    const file = join(options.project, '.mcp.json')
+    const original = '{ "mcpServers": {} }\n'
+    writeFileSync(file, original)
+    const write = fs.writeFileSync
+    try {
+      fs.writeFileSync = (path, ...args) => {
+        if (String(path).includes(point)) throw Object.assign(new Error('注入した書込み失敗'), { code: 'ENOSPC' })
+        return write(path, ...args)
+      }
+      syncBuiltinESMExports()
+      assert.throws(() => scaffoldProject(options), { code: 'ENOSPC' })
+    } finally {
+      fs.writeFileSync = write
+      syncBuiltinESMExports()
+    }
+    assert.equal(readFileSync(file, 'utf8'), original)
+    const resumed = scaffoldProject(options)
+    assert.equal(resumed.action, point === 'setup-state.json' ? 'created' : 'resume')
+    assert.ok(JSON.parse(readFileSync(file, 'utf8')).mcpServers.room)
+    runScript('remove-managed-room-mcp.mjs', [options.project])
+    assert.equal(readFileSync(file, 'utf8'), original)
+  }
+})

package/skill/scripts/refresh-seat-identity.mjs

@@ -1,15 +1,14 @@
 #!/usr/bin/env node
-// 台帳（room member 行）の argv_digest を、Lattice attach と同じ /bin/ps -o command= 観測へ揃える。
+// 台帳のargv_digestを、Aitermの公開プロセス観測へ揃える。
 // pid / lstart が台帳と違うときは書き換えず終わる（pid 推定も再利用も禁止）。
-import { execFileSync, execFile } from 'node:child_process'
+import { execFile } from 'node:child_process'
 import { readFileSync } from 'node:fs'
 import { dirname, join, resolve } from 'node:path'
 import { fileURLToPath } from 'node:url'
 import { promisify } from 'node:util'
 
-// ps 観測と digest 計算は seat-identity.mjs（OS観測ライブラリ）が唯一の所有者。再実装しない。
-export { hashArgv, observePidCommand } from './seat-identity.mjs'
-import { observePidCommand } from './seat-identity.mjs'
+import { AitermClient } from './aiterm-client.mjs'
+import { seatSessionId } from './seat-session.mjs'
 
 export function refreshSeatRecord(raw, observed, recordedAt) {
   if (!Number.isSafeInteger(raw?.pid) || raw.pid < 1) {
@@ -37,7 +36,7 @@ export function refreshSeatRecord(raw, observed, recordedAt) {
 }
 
 function utcRecordedAt() {
-  return execFileSync('date', ['-u', '+%Y-%m-%dT%H:%M:%S.000Z'], { encoding: 'utf8' }).trim()
+  return new Date().toISOString()
 }
 
 const isCli = process.argv[1] && fileURLToPath(import.meta.url) === resolve(process.argv[1])
@@ -62,12 +61,16 @@ if (isCli) {
   }
   const raw = (await memberResponse.json()).member
   let observed
+  const aiterm = new AitermClient()
   try {
-    observed = observePidCommand(raw.pid)
+    const id = seatSessionId(raw)
+    if (!id) throw new Error('Aitermのsession_idが台帳にありません')
+    observed = (await aiterm.observe(id)).process_identity
+    if (!observed) throw new Error('Aitermでプロセス本人性を確認できません')
   } catch (error) {
     process.stderr.write(`${error.code || 'SEAT_IDENTITY_UNOBSERVABLE'}: ${error.message}\n`)
     process.exit(2)
-  }
+  } finally { await aiterm.close() }
   let next
   try {
     next = refreshSeatRecord(raw, observed, utcRecordedAt())

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

@@ -1,9 +1,10 @@
 #!/usr/bin/env node
 import {
-  closeSync, fsyncSync, lstatSync, openSync, readFileSync, renameSync, unlinkSync, writeFileSync,
+  closeSync, existsSync, fsyncSync, lstatSync, openSync, readFileSync, renameSync, unlinkSync, writeFileSync,
 } from 'node:fs'
 import { basename, dirname, join, resolve } from 'node:path'
 import { randomBytes } from 'node:crypto'
+import { isDeepStrictEqual } from 'node:util'
 import { isPeertableRoomMcp } from './room-mcp-config.mjs'
 
 const fail = (code, detail) => {
@@ -43,9 +44,13 @@ if (config.mcpServers.room === undefined) {
 if (!isPeertableRoomMcp(config.mcpServers.room))
   fail('PEERTABLE_MANAGED_MCP_REMOVE_CONFLICT', `${file}: room blockがPeertable所有形でない`)
 
+const backup = join(resolve(project), '.team', 'root-mcp.original.json')
+const originalText = existsSync(backup) ? readFileSync(backup, 'utf8') : null
+const original = originalText === null ? null : JSON.parse(originalText)
 delete config.mcpServers.room
-if (Object.keys(config.mcpServers).length === 0) delete config.mcpServers
-if (Object.keys(config).length === 0) {
+if (Object.keys(config.mcpServers).length === 0 && !Object.hasOwn(original ?? {}, 'mcpServers')) delete config.mcpServers
+const restored = originalText !== null && isDeepStrictEqual(config, original)
+if (!restored && 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`)
@@ -56,7 +61,7 @@ const temporary = join(dirname(file), `.${basename(file)}.teardown-${process.pid
 let fd
 try {
   fd = openSync(temporary, 'wx', stat.mode & 0o777)
-  writeFileSync(fd, `${JSON.stringify(config, null, 2)}\n`, 'utf8')
+  writeFileSync(fd, restored ? originalText : `${JSON.stringify(config, null, 2)}\n`, 'utf8')
   fsyncSync(fd)
   closeSync(fd)
   fd = undefined

package/skill/scripts/resume.sh

@@ -1,227 +1,4 @@
 #!/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: runtime を一回の入口で現行版へ収束
-"$script_dir/ensure-project-runtime.sh" "$proj"
-
-# 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
+exec node "$(dirname "$0")/legacy-entry.mjs" resume "$@"

package/skill/scripts/room-api.mjs

@@ -0,0 +1,28 @@
+// roomのHTTP境界。失敗応答を空の台帳として扱わない。
+import { readFileSync } from 'node:fs'
+
+export class RoomApi {
+  constructor(state, { credential, fetchImpl = fetch } = {}) {
+    this.base = `${state.server_url.replace(/\/$/, '')}/api/${encodeURIComponent(state.room)}`
+    this.credential = credential
+    this.fetch = fetchImpl
+  }
+  async request(path, { method = 'GET', body } = {}) {
+    const headers = { 'Content-Type': 'application/json' }
+    if (method !== 'GET' && this.credential) {
+      headers['X-Peertable-Token'] = readFileSync(this.credential, 'utf8').trim()
+    }
+    let response
+    try {
+      response = await this.fetch(path ? `${this.base}/${path}` : this.base, {
+        method, headers, ...(body === undefined ? {} : { body: JSON.stringify(body) }),
+        signal: AbortSignal.timeout(15_000),
+      })
+    } catch (error) {
+      throw Object.assign(new Error(`roomへ到達できません: ${error.message}`), { code: 'PEERTABLE_ROOM_UNREACHABLE' })
+    }
+    if (!response.ok) throw Object.assign(new Error(`${method} ${path}: HTTP ${response.status}`), { code: 'PEERTABLE_ROOM_REQUEST_FAILED' })
+    return response.json()
+  }
+  async members() { return (await this.request('members')).members }
+}