peertable 0.8.55 → 0.8.57

package/skill/scripts/room-public-session.test.mjs

@@ -0,0 +1,73 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+import { spawn, execFileSync } from 'node:child_process'
+import { createServer } from 'node:net'
+import { once } from 'node:events'
+import { mkdtempSync, writeFileSync, rmSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { fileURLToPath } from 'node:url'
+import { Client } from '@modelcontextprotocol/sdk/client/index.js'
+import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js'
+
+test('実room clientが公開session IDと席資格で参加・投稿し、serverが公開観測先への配達経路を認識する', { timeout: 20_000 }, async t => {
+  const root = fileURLToPath(new URL('../../', import.meta.url))
+  const dir = mkdtempSync(join(tmpdir(), 'peertable-room-public-'))
+  const socket = createServer()
+  socket.listen(0, '127.0.0.1')
+  await once(socket, 'listening')
+  const port = socket.address().port
+  await new Promise(resolve => socket.close(resolve))
+  const credential = join(dir, 'fixture.token')
+  writeFileSync(credential, 'fixture-token\n', { mode: 0o600 })
+  const server = spawn(process.execPath, [join(root, 'room/server.mjs')], {
+    env: { ...process.env, PEERTABLE_PORT: String(port), PEERTABLE_DATA: dir, PEERTABLE_POST_TOKEN: 'fixture-token' },
+    stdio: ['ignore', 'ignore', 'pipe'],
+  })
+  const mcp = new Client({ name: 'peertable-public-session-test', version: '1' })
+  t.after(async () => {
+    await mcp.close()
+    if (server.exitCode === null) { server.kill(); await once(server, 'exit') }
+    rmSync(dir, { recursive: true, force: true })
+  })
+  await new Promise((resolve, reject) => {
+    let output = ''
+    server.stderr.on('data', chunk => {
+      output += chunk
+      if (output.includes(`server on :${port}`)) resolve()
+    })
+    server.once('error', reject)
+    server.once('exit', code => reject(new Error(`room起動失敗: ${code}: ${output}`)))
+  })
+  const placement = JSON.parse(execFileSync(process.execPath, [join(root, 'skill/scripts/resolve-seat-placement.mjs'), '--roles', '実装'], { encoding: 'utf8' }))
+  const { harness, model, effort } = placement.settings
+  const env = { ...process.env, PEERTABLE_URL: `http://127.0.0.1:${port}`, PEERTABLE_ROOM: 'fixture',
+    PEERTABLE_MEMBER: 'alice', PEERTABLE_HARNESS: harness, PEERTABLE_VENDOR: harness, PEERTABLE_MODEL: model,
+    PEERTABLE_EFFORT: effort, PEERTABLE_ROLE: '実装', PEERTABLE_ROLES: '実装', PEERTABLE_CREDENTIAL_FILE: credential,
+    AITERM_SESSION_ID: '公開-session-日本語',
+  }
+  delete env.PEERTABLE_POST_TOKEN
+  await mcp.connect(new StdioClientTransport({ command: process.execPath, args: [join(root, 'room/client.mjs')], env, stderr: 'pipe' }))
+  const api = async (path, options = {}) => {
+    const response = await fetch(`${env.PEERTABLE_URL}/api/fixture/${path}`, {
+      ...options, headers: { 'content-type': 'application/json', 'X-Peertable-Token': 'fixture-token' },
+    })
+    assert.equal(response.ok, true, `${path}: ${response.status}`)
+    return response.json()
+  }
+  const alice = (await api('members')).members.find(member => member.name === 'alice')
+  assert.equal(alice.aiterm_session_id, env.AITERM_SESSION_ID)
+  assert.deepEqual(alice.observe, { aiterm_session_id: env.AITERM_SESSION_ID })
+  assert.deepEqual(alice.roles, ['実装'])
+  await api('members', { method: 'POST', body: JSON.stringify({ name: 'beta', observe: { aiterm_session_id: 'beta-public-session' } }) })
+  const posted = await mcp.callTool({ name: 'post', arguments: { to: 'beta', message: '公開APIとroomの境界確認' } })
+  assert.equal(posted.isError, undefined)
+  assert.match(posted.content[0].text, /room_saved/)
+  const { messages } = await api('messages')
+  const message = messages.find(item => item.body === '公開APIとroomの境界確認')
+  assert.ok(message)
+  const { delivery } = await api(`deliveries?seq=${message.seq}`)
+  assert.equal(delivery.beta.state, 'bridge_unavailable')
+  assert.notEqual(delivery.beta.reason, 'no_delivery_route')
+  assert.doesNotMatch(JSON.stringify({ alice, posted, message }), /fixture-token/)
+})

package/skill/scripts/runtime-contract.test.mjs

@@ -7,116 +7,22 @@ import { spawnSync } from 'node:child_process'
 import { fileURLToPath } from 'node:url'
 import test from 'node:test'
 
-import { keysForCodexPane } from './codex-dialog.mjs'
-import { buildWindowsBridgeLaunch } from './platform/windows/build-bridge-command.mjs'
-import { paneStatusTail } from './seat-usage.mjs'
-import { classifyGrokPaneTail } from './vendors/grok/pane-status.mjs'
 import { latticeTaskAvailable } from './alarm-condition.mjs'
 import { boundedRecent, boundedUnread } from '../../room/message-bounds.mjs'
 
-test('Grokの通信失敗はWaiting表示が残ってもbusyにしない', () => {
-  const tail = [
-    'Connection failed — reqwest error stream: error sending request.',
-    'Check your network and try again.',
-    'Waiting for response… 29s [stop]',
-  ].join('\n')
-  assert.equal(classifyGrokPaneTail(tail), 'blocked')
-})
-
-test('通信失敗の無いGrok応答待ちはbusy', () => {
-  assert.equal(classifyGrokPaneTail('Waiting for response… 12s [stop]'), 'busy')
-})
-
-test('状態判定窓は折返しで14行より上へ出た通信失敗を含む', () => {
-  const pane = ['Connection failed — reqwest error stream', ...Array(20).fill('wrapped line'), 'Waiting for response…'].join('\n')
-  assert.ok(paneStatusTail(pane).includes('Connection failed'))
-})
-
-test('Codexのroom許可とcommand許可は固定選択肢だけを通す', () => {
-  assert.deepEqual(keysForCodexPane([
-    'Allow the room MCP server to run tool "members"?',
-    '3. Always allow',
-  ].join('\n')), { kind: 'mcp-allow', keys: ['Down', 'Down', 'Enter'] })
-  assert.deepEqual(keysForCodexPane([
-    'Would you like to run the following command?',
-    "2. Yes, and don't ask again for commands that start with Get-Content",
-  ].join('\n')), { kind: 'command-approval', keys: ['Down', 'Enter'] })
-})
-
-test('Codexの現在busy／idle composerはscrollbackの古い許可文より優先する', () => {
-  const stale = [
-    'Would you like to run the following command?',
-    "2. Yes, and don't ask again for commands that start with rg",
-  ]
-  assert.equal(keysForCodexPane([...stale, '• Working (8s • esc to interrupt)', '› Ask Codex to do anything', 'gpt-5.6-terra high · ~/work'].join('\n')), null)
-  assert.equal(keysForCodexPane([...stale, '› Ask Codex to do anything', 'gpt-5.6-terra high · ~/work'].join('\n')), null)
-})
-
-test('Codexの長い承認文は現在footerがあれば24行を越えても検出する', () => {
-  const screen = [
-    'Would you like to run the following command?',
-    "2. Yes, and don't ask again for commands that start with Get-Process",
-    ...Array(28).fill('wrapped command line'),
-    'Press enter to confirm or esc to cancel',
-  ].join('\n')
-  assert.deepEqual(keysForCodexPane(screen), { kind: 'command-approval', keys: ['Down', 'Enter'] })
-})
-
-test('着座はAiterm dispatch前に独自prompt連続判定を重ねない', () => {
-  const source = readFileSync(new URL('./launch-seat.sh', import.meta.url), 'utf8')
-  const activeBranch = source.slice(
-    source.indexOf('if [ "$brief_in_composer" != true ]; then'),
-    source.indexOf('  else\n  # Codex はヘッダを描いた後も MCP 初期化を続ける。'),
-  )
-  assert.ok(activeBranch.includes('aiterm-send.mjs'))
-  assert.ok(!activeBranch.includes('brief_ready_streak'))
-  assert.ok(source.includes('brief_turn_observed'))
-  assert.ok(source.includes('agent-pane-status.mjs'))
-  assert.ok(source.includes('aiterm-wait --session'))
-})
-
-test('wakeup bridgeはpending DMが無くてもCodex既知dialogを巡回する', () => {
-  const source = readFileSync(new URL('./wakeup-bridge.mjs', import.meta.url), 'utf8')
-  assert.ok(source.includes('dialogSweepRunning'))
-  assert.ok(source.includes('await passKnownCodexDialog(member)'))
-})
-
-test('円卓runtimeは3bridgeを固定順で一括収束する', () => {
-  const source = readFileSync(new URL('./ensure-project-runtime.sh', import.meta.url), 'utf8')
-  assert.ok(source.includes('for kind in alarm seat-status wakeup'))
-})
-
-test('bridge更新は版数だけでなくruntime source digestへ束縛する', () => {
-  const digest = spawnSync(process.execPath, [fileURLToPath(new URL('./runtime-digest.mjs', import.meta.url))], { encoding: 'utf8' })
-  assert.equal(digest.status, 0, digest.stderr)
-  assert.match(digest.stdout, /^[0-9a-f]{64}$/u)
-  const source = readFileSync(new URL('./ensure-bridge.sh', import.meta.url), 'utf8')
-  assert.ok(source.includes('peertable_runtime_digest'))
-})
-
-test('bridge起動は書込トークンをコマンドラインへ載せない', () => {
-  const ensure = readFileSync(new URL('./ensure-bridge.sh', import.meta.url), 'utf8')
-  // env_prefix の転送対象に生トークンを含めない（tmux session コマンドと ps に平文で残る・2026-08-30 実測）
-  assert.ok(!ensure.includes('PEERTABLE_TMUX_SOCKET PEERTABLE_POST_TOKEN'))
-  assert.ok(ensure.includes('bridge.token'))
-  const launch = buildWindowsBridgeLaunch({
-    script: 'bridge.mjs', project: 'C:\\work', log: 'C:\\work\\bridge.log',
-    env: { PEERTABLE_POST_TOKEN: 'secret-raw-token', PEERTABLE_CREDENTIAL_FILE: 'C:\\work\\.team\\credentials\\bridge.token' },
-  })
-  const encodedAt = launch.argv.indexOf('-EncodedCommand')
-  const decoded = Buffer.from(launch.argv[encodedAt + 1], 'base64').toString('utf16le')
-  assert.ok(!decoded.includes('secret-raw-token'))
-  assert.ok(decoded.includes('bridge.token'))
-})
-
-test('Windows bridgeはUTF-8を明示してログへ書く', () => {
-  const launch = buildWindowsBridgeLaunch({ script: 'bridge.mjs', project: 'C:\\work', log: 'C:\\work\\bridge.log' })
-  const encodedAt = launch.argv.indexOf('-EncodedCommand')
-  const decoded = Buffer.from(launch.argv[encodedAt + 1], 'base64').toString('utf16le')
-  assert.ok(decoded.includes('[Console]::OutputEncoding = $utf8'))
-  assert.ok(decoded.includes('Out-File'))
-  assert.ok(decoded.includes('-Encoding utf8'))
-})
+// TUI判定の試験は所有者Aitermへ移し、ここでは公開契約とPeertableの操作結果を検証する。
+import './install-skill.test.mjs'
+import './project-scaffold.test.mjs'
+import './project-runtime.test.mjs'
+import './leave-seat.test.mjs'
+import './launch-seat.test.mjs'
+import './change-seat.test.mjs'
+import './room-public-session.test.mjs'
+import './seat-observer.test.mjs'
+import './seat-approval.test.mjs'
+import './runtime-launch-command.test.mjs'
+import './ensure-project-runtime.test.mjs'
+import './teardown.test.mjs'
 
 test('alarm writerは日本語noteをUTF-8 stdinから保存する', () => {
   const dir = mkdtempSync(join(tmpdir(), 'peertable-alarm-'))
@@ -187,42 +93,3 @@ test('親post入口は明示envだけでなく共通token解決を使う', () =>
   assert.ok(source.includes("import { resolvePostToken } from './seat-usage.mjs'"))
   assert.ok(source.includes('resolvePostToken(process.env)'))
 })
-
-test('teardownはalarm-bridgeを停止してから.teamを削除する', () => {
-  const source = readFileSync(new URL('./teardown.sh', import.meta.url), 'utf8')
-  const stop = source.indexOf('alarm-bridge.mjs" "$proj" --stop')
-  const remove = source.indexOf('rm -rf "$proj/.team"')
-  assert.ok(stop >= 0)
-  assert.ok(remove >= 0 && stop < remove)
-  assert.ok(source.includes('did "alarm-bridge 停止"'))
-  assert.ok(source.includes('miss "alarm-bridge 停止に失敗'))
-  assert.ok(source.includes('-X DELETE "$url/api/$room/bridges"'))
-})
-
-test('archive room logは解散区切り前の控えであり原本をroomに残すと明記する', () => {
-  const dir = mkdtempSync(join(tmpdir(), 'peertable-archive-room-log-'))
-  const out = join(dir, 'room-log.md')
-  const script = fileURLToPath(new URL('./archive-room-log.py', import.meta.url))
-  const fixture = JSON.stringify({
-    messages: [{ seq: 1, from: 'bell', to_names: ['all'], ts: '2026-08-30T00:00:00Z', body: '完了' }],
-  })
-  const python = [
-    'import importlib.util, json, sys',
-    'spec = importlib.util.spec_from_file_location("archive_room_log", sys.argv[1])',
-    'module = importlib.util.module_from_spec(spec)',
-    'spec.loader.exec_module(module)',
-    'fixture = json.loads(sys.argv[3])',
-    'module.fetch = lambda _url, _path: fixture',
-    'raise SystemExit(module.main(["https://room.example", "factory", sys.argv[2]]))',
-  ].join('; ')
-  try {
-    const result = spawnSync('python3', ['-c', python, script, out, fixture], { encoding: 'utf8' })
-    assert.equal(result.status, 0, result.stderr)
-    const log = readFileSync(out, 'utf8')
-    assert.match(log, /解散の区切りを投稿する前までの room ログを書き出した控え/u)
-    assert.match(log, /room と過去ログの原本はサーバー側に残り、次の卓も同じ room で続く/u)
-    assert.doesNotMatch(log, /削除済み|唯一の記録/u)
-  } finally {
-    rmSync(dir, { recursive: true, force: true })
-  }
-})

package/skill/scripts/runtime-launch-command.mjs

@@ -0,0 +1,19 @@
+// Peertableの常駐コマンドだけをOS標準shellの構文へ変換する。
+// 永続PTYの作成・送信・終了・backend選択はAiterm公開APIが担当する。
+export function runtimeLaunchCommand({ executable, script, project, args = [], log, env = {}, platform = process.platform }) {
+  const names = ['PEERTABLE_CREDENTIAL_FILE', 'PEERTABLE_URL', 'PEERTABLE_PARENT_NAME']
+  if (platform === 'win32') {
+    const quote = value => `'${String(value).replaceAll("'", "''")}'`
+    return [
+      '$utf8 = [System.Text.UTF8Encoding]::new($false)',
+      '[Console]::OutputEncoding = $utf8', '$OutputEncoding = $utf8',
+      'Remove-Item Env:PEERTABLE_POST_TOKEN -ErrorAction SilentlyContinue',
+      ...names.filter(name => env[name]).map(name => `$env:${name} = ${quote(env[name])}`),
+      `Set-Location -LiteralPath ${quote(project)}`,
+      `& ${[executable, script, project, ...args].map(quote).join(' ')} 2>&1 | Out-File -FilePath ${quote(log)} -Encoding utf8 -Append`,
+    ].join('; ')
+  }
+  if (!['darwin', 'linux'].includes(platform)) throw Object.assign(new Error(`未対応OS: ${platform}`), { code: 'PEERTABLE_PLATFORM_UNSUPPORTED' })
+  const quote = value => `'${String(value).replaceAll("'", "'\\''")}'`
+  return `cd ${quote(project)} && exec env -u PEERTABLE_POST_TOKEN ${names.filter(name => env[name]).map(name => `${name}=${quote(env[name])}`).join(' ')} ${[executable, script, project, ...args].map(quote).join(' ')} >> ${quote(log)} 2>&1`
+}

package/skill/scripts/runtime-launch-command.test.mjs

@@ -0,0 +1,32 @@
+import assert from 'node:assert/strict'
+import { execFileSync } from 'node:child_process'
+import { mkdirSync, mkdtempSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import test from 'node:test'
+import { runtimeLaunchCommand } from './runtime-launch-command.mjs'
+
+test('runtimeのshell輸送はcredential pathだけを渡し秘密値を載せない', () => {
+  for (const platform of ['darwin', 'linux', 'win32']) {
+    const command = runtimeLaunchCommand({
+      executable: 'node', script: '/a b/bridge.mjs', project: "/project's dir", log: '/log.txt', platform,
+      env: { PEERTABLE_POST_TOKEN: 'secret-value', PEERTABLE_CREDENTIAL_FILE: '/credential path' },
+    })
+    assert.ok(!command.includes('secret-value'))
+    assert.ok(command.includes('/credential path'))
+    assert.ok(!command.includes('tmux') && !command.includes('psmux'))
+  }
+})
+
+test('実OSのshellで日本語・引用符・置換構文を文字列として渡す', t => {
+  const dir = mkdtempSync(join(tmpdir(), 'peertable-runtime-quote-'))
+  t.after(() => rmSync(dir, { recursive: true, force: true }))
+  const project = join(dir, "日本語 owner's project")
+  mkdirSync(project)
+  const script = join(dir, 'bridge.mjs'), log = join(dir, 'log.txt')
+  writeFileSync(script, 'console.log(JSON.stringify({args:process.argv.slice(2),credential:process.env.PEERTABLE_CREDENTIAL_FILE,token:process.env.PEERTABLE_POST_TOKEN??null}))')
+  const arg = "引用 ' $(echo unexpected) `echo unexpected`"
+  const command = runtimeLaunchCommand({ executable: process.execPath, script, project, log, args: [arg], env: { PEERTABLE_CREDENTIAL_FILE: arg } })
+  execFileSync(process.platform === 'win32' ? 'pwsh' : 'bash', process.platform === 'win32' ? ['-NoProfile', '-Command', command] : ['-c', command], { env: { ...process.env, PEERTABLE_POST_TOKEN: 'not-forwarded' } })
+  assert.deepEqual(JSON.parse(readFileSync(log, 'utf8').replace(/^\uFEFF/u, '').trim()), { args: [project, arg], credential: arg, token: null })
+})

package/skill/scripts/seat-approval.mjs

@@ -0,0 +1,24 @@
+// 席に許可した作業の既知承認だけを、Aitermが示した現在の確認へ単発で返す。
+export async function passSeatApproval(aiterm, sessionId, harness, observation) {
+  if (!['codex', 'claude'].includes(harness)) return false
+  if (harness === 'claude') {
+    const current = observation ?? await aiterm.observe(sessionId)
+    if (current.state !== 'blocked' || current.reason !== 'tool_approval') return false
+  }
+  const tool = harness === 'claude' ? 'claude_approval' : 'agent_approval'
+  const schema = harness === 'claude' ? 'aiterm.claude-approval-result.v1' : 'aiterm.agent-approval-result.v1'
+  const inspection = await aiterm.structured(tool, {
+    action: 'inspect', session_id: sessionId,
+  }, schema)
+  if (inspection.status === 'none') return false
+  if (inspection.status !== 'approval_required' || !inspection.choices.some(choice => choice.decision === 'approve_once')) {
+    throw Object.assign(new Error(`席 ${sessionId} の承認を解決できません: ${inspection.reason}`), { code: 'PEERTABLE_SEAT_APPROVAL_BLOCKED' })
+  }
+  const response = await aiterm.structured(tool, {
+    action: 'respond', session_id: sessionId, observed_prompt_digest: inspection.prompt_digest, approval_choice: 'approve_once',
+  }, schema)
+  if (response.status !== 'submitted') {
+    throw Object.assign(new Error(`席 ${sessionId} の承認応答が成立していません`), { code: 'PEERTABLE_SEAT_APPROVAL_BLOCKED' })
+  }
+  return true
+}

package/skill/scripts/seat-approval.test.mjs

@@ -0,0 +1,43 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+import { passSeatApproval } from './seat-approval.mjs'
+
+test('公開APIのdigestと単発許可だけを返す', async () => {
+  const calls = []
+  const aiterm = { structured: async (tool, args) => {
+    calls.push({ tool, args })
+    return args.action === 'inspect'
+      ? { status: 'approval_required', prompt_digest: 'current-digest', choices: [{ decision: 'approve_once', label: '今回だけ許可' }] }
+      : { status: 'submitted' }
+  } }
+  assert.equal(await passSeatApproval(aiterm, 'seat', 'codex'), true)
+  assert.deepEqual(calls[1], { tool: 'agent_approval', args: { action: 'respond', session_id: 'seat', observed_prompt_digest: 'current-digest', approval_choice: 'approve_once' } })
+})
+
+test('未知の確認・digest不一致を握りつぶさず、再送しない', async () => {
+  let count = 0
+  const aiterm = { structured: async () => { count++; throw new Error('dialog_changed') } }
+  await assert.rejects(passSeatApproval(aiterm, 'seat', 'codex'), /dialog_changed/)
+  assert.equal(count, 1)
+})
+
+test('承認が無ければ何も送らない', async () => {
+  let count = 0
+  assert.equal(await passSeatApproval({ structured: async () => { count++; return { status: 'none' } } }, 'seat', 'codex'), false)
+  assert.equal(count, 1)
+})
+test('Claudeのtool承認だけを既存の相関付き公開APIへ渡す', async () => {
+  const calls = []
+  const aiterm = { structured: async (tool, args, schema) => {
+    calls.push({ tool, args, schema })
+    return args.action === 'inspect' ? { status: 'approval_required', prompt_digest: 'claude-digest', choices: [{ decision: 'approve_once' }] } : { status: 'submitted' }
+  } }
+  for (const observation of [{ state: 'idle' }, { state: 'blocked', reason: 'project_mcp_consent' }]) {
+    assert.equal(await passSeatApproval(aiterm, 'seat', 'claude', observation), false)
+  }
+  assert.equal(calls.length, 0)
+  assert.equal(await passSeatApproval(aiterm, 'seat', 'claude', { state: 'blocked', reason: 'tool_approval' }), true)
+  assert.equal(calls[1].tool, 'claude_approval')
+  assert.equal(calls[1].schema, 'aiterm.claude-approval-result.v1')
+  assert.equal(calls[1].args.observed_prompt_digest, 'claude-digest')
+})

package/skill/scripts/seat-identity.mjs

@@ -1,14 +1,6 @@
-#!/usr/bin/env node
-// Peertable スクリプト群の OS プロセス観測ライブラリ（唯一の所有者）。
-// pane_pid から Lattice attach 用の pid / lstart / argv を1件に決める CLI を兼ねる。
-// POSIX は ps。Windows は Win32_Process（ps -Ao は Git Bash で unknown option -- A）。
-// ps の観測規約（LC_ALL=C・/bin/ps 絶対パス・trim）と argv digest の計算はこのファイルだけが持つ。
-// 他スクリプトはここから import し、ps を手書きしない（locale 罠の再発防止。caveat:
-// ps-locale-lstart-lc-time-ascii-argv-lc-ctype-digest）。
+// Peertable自身のbridge processを照合するためのOS観測。席のPTYはAitermが観測する。
 import { createHash } from 'node:crypto'
 import { execFileSync } from 'node:child_process'
-import { resolve } from 'node:path'
-import { fileURLToPath } from 'node:url'
 import { observeWindowsPidCommand, parseWindowsCreationDate } from './platform/windows/observe-pid-command.mjs'
 
 export function hashArgv(argv) {
@@ -16,7 +8,7 @@ export function hashArgv(argv) {
 }
 
 // 記録済み pid そのものの lstart / argv を観測する（pane からの席特定はしない）。
-// refresh-seat-identity・doctor が使う。
+// 自製bridgeの停止前照合に使う。
 export function observePidCommand(pid) {
   if (!Number.isSafeInteger(pid) || pid < 1) {
     const error = new Error('pid が正整数でない')
@@ -34,66 +26,5 @@ export function observePidCommand(pid) {
   return { pid, started_identity: started, argv, argv_digest: hashArgv(argv) }
 }
 
-const AGENT = /(?:claude|codex|grok|composer)(?:\.cmd|\.exe)?(?:\s|$)/iu
-
 export const parseWinCreationDate = parseWindowsCreationDate
-
-// ps の lstart 書式（LC_TIME）と非ASCII argv のエスケープ（LC_CTYPE）は locale で変わり、
-// 観測者ごとに digest が割れる（2026-08-22 実測）。Lattice 側の観測も LC_ALL=C に固定している。
 const psEnv = () => ({ ...process.env, LC_ALL: 'C' })
-
-function posixIdentity(pid) {
-  const table = execFileSync('/bin/ps', ['-Ao', 'pid=,ppid=,pgid='], { encoding: 'utf8', env: psEnv() })
-  const leaders = table.split('\n').flatMap((line) => {
-    const match = /^\s*(\d+)\s+(\d+)\s+(\d+)\s*$/u.exec(line)
-    if (!match) return []
-    const [, child, ppid, pgid] = match
-    return ppid === String(pid) && child === pgid ? [child] : []
-  })
-  const chosen = leaders.length === 1 ? leaders[0] : String(pid)
-  const started = execFileSync('/bin/ps', ['-o', 'lstart=', '-p', chosen], { encoding: 'utf8', env: psEnv() }).trim()
-  const argv = execFileSync('/bin/ps', ['-o', 'command=', '-p', chosen], { encoding: 'utf8', env: psEnv() }).trim()
-  if (!started || !argv) throw new Error('pid の lstart/args を観測できない')
-  return { pid: Number(chosen), started_identity: started, argv, argv_digest: hashArgv(argv) }
-}
-
-function winQuery(filter) {
-  const script = `Get-CimInstance Win32_Process -Filter ${JSON.stringify(filter)} | Select-Object ProcessId,ParentProcessId,CreationDate,CommandLine | ConvertTo-Json -Compress`
-  const out = execFileSync('pwsh.exe', ['-NoLogo', '-NoProfile', '-NonInteractive', '-Command', script], {
-    encoding: 'utf8',
-  }).trim()
-  if (!out) return []
-  const parsed = JSON.parse(out)
-  return Array.isArray(parsed) ? parsed : [parsed]
-}
-
-function winIdentity(pid) {
-  const self = winQuery(`ProcessId=${pid}`)[0]
-  if (!self) throw new Error('Win32_Process を観測できない')
-  const children = winQuery(`ParentProcessId=${pid}`)
-  const agentKids = children.filter((row) => AGENT.test(String(row.CommandLine || '')))
-  let chosen = self
-  if (AGENT.test(String(self.CommandLine || ''))) chosen = self
-  else if (agentKids.length === 1) chosen = agentKids[0]
-  else if (children.length === 1) chosen = children[0]
-  const started = chosen.CreationDate ? parseWinCreationDate(chosen.CreationDate) : ''
-  const argv = String(chosen.CommandLine || '').trim()
-  if (!started || !argv) throw new Error('pid の CreationDate/CommandLine を観測できない')
-  return { pid: Number(chosen.ProcessId), started_identity: started, argv, argv_digest: hashArgv(argv) }
-}
-
-const isCli = process.argv[1] && fileURLToPath(import.meta.url) === resolve(process.argv[1])
-if (isCli) {
-  const panePid = process.argv[2]
-  if (!/^\d+$/.test(panePid || '')) {
-    console.error('usage: seat-identity.mjs <pane_pid>')
-    process.exit(2)
-  }
-  try {
-    const ident = process.platform === 'win32' ? winIdentity(panePid) : posixIdentity(panePid)
-    process.stdout.write(`${JSON.stringify(ident)}\n`)
-  } catch (error) {
-    console.error(error.message || error)
-    process.exit(1)
-  }
-}

package/skill/scripts/seat-launch-phase.mjs

@@ -0,0 +1,11 @@
+// 着任指示を渡すまで、その席へのroom配達を保留する。状態はPeertableが所有する。
+import { existsSync, mkdirSync, rmSync, writeFileSync } from 'node:fs'
+import { join } from 'node:path'
+
+const phasePath = (project, name) => join(project, '.team', 'seats', `${name}.launching`)
+export const isSeatLaunching = (project, name) => existsSync(phasePath(project, name))
+export function beginSeatLaunch(project, name) {
+  mkdirSync(join(project, '.team', 'seats'), { recursive: true })
+  writeFileSync(phasePath(project, name), `${process.pid}\n`, { flag: 'wx' })
+}
+export function endSeatLaunch(project, name) { rmSync(phasePath(project, name), { force: true }) }

package/skill/scripts/seat-observer.mjs

@@ -0,0 +1,54 @@
+// 状態と活動の観測はAitermが所有し、Peertableはroom表示へ対応づける。
+import { seatSessionId, findSeatSession } from './seat-session.mjs'
+import { combineSeatLamp } from './seat-usage.mjs'
+
+export class SeatObserver {
+  constructor(aiterm, room) {
+    this.aiterm = aiterm
+    this.room = room
+    this.cursors = new Map()
+  }
+  async read(sessionId) {
+    const result = await this.aiterm.observe(sessionId, this.cursors.get(sessionId))
+    if (result.activity.cursor) this.cursors.set(sessionId, result.activity.cursor)
+    else this.cursors.delete(sessionId)
+    return result
+  }
+  async cycle(members, previous, observedAt) {
+    const sessions = await this.aiterm.sessions(['PEERTABLE_MEMBER', 'PEERTABLE_ROOM'])
+    const live = new Set(sessions.map(item => item.session_id))
+    for (const id of this.cursors.keys()) if (!live.has(id)) this.cursors.delete(id)
+    const result = new Map()
+    const mainIds = new Set(members.map(seatSessionId).filter(Boolean))
+    for (const member of members) {
+      if (member.delivery?.kind === 'parent_watch') continue
+      const id = seatSessionId(member)
+      if (!id) continue
+      try { findSeatSession(member, sessions, this.room) }
+      catch (error) {
+        if (error.code !== 'PEERTABLE_SEAT_SESSION_IDENTITY_CONFLICT') throw error
+        result.set(member.name, { error })
+        continue
+      }
+      const raw = await this.read(id)
+      const paneStatus = raw.state === 'missing' ? 'dead' : raw.state
+      const prev = previous.get(member.name)
+      const busySince = ['busy', 'blocked'].includes(paneStatus)
+        ? (prev?.busySince ?? observedAt) : null
+      const job = { alive: false, active: (raw.activity.background_cpu_delta_seconds ?? 0) > 0 }
+      const jobs = sessions.filter(item => !mainIds.has(item.session_id)
+        && item.environment?.PEERTABLE_MEMBER === member.name && item.environment?.PEERTABLE_ROOM === this.room)
+      for (const session of jobs) {
+        const work = await this.read(session.session_id)
+        if (!work.exists || work.pane_alive === false) continue
+        job.alive = true
+        if (work.activity.output_changed === true || (work.activity.cpu_delta_seconds ?? 0) > 0) job.active = true
+      }
+      result.set(member.name, {
+        status: combineSeatLamp(paneStatus, job), paneStatus, busySince,
+        paneTokenHint: raw.token_hint, identity: raw.process_identity,
+      })
+    }
+    return result
+  }
+}

package/skill/scripts/seat-observer.test.mjs

@@ -0,0 +1,58 @@
+import test from 'node:test'
+import assert from 'node:assert/strict'
+import { SeatObserver } from './seat-observer.mjs'
+
+const result = (state, activity = {}) => ({ state, exists: state !== 'missing', pane_alive: true, token_hint: 1200,
+  process_identity: { pid: 42 }, activity: { cursor: 'opaque', output_changed: null, cpu_delta_seconds: null, background_cpu_delta_seconds: null, ...activity } })
+function fixture(extra = [], observations = {}) {
+  const member = { name: 'alice', aiterm_session_id: 'seat' }
+  const calls = []
+  const aiterm = {
+    sessions: async () => [{ session_id: 'seat', environment: { PEERTABLE_MEMBER: 'alice', PEERTABLE_ROOM: 'r' } }, ...extra],
+    observe: async (id, cursor) => { calls.push({ id, cursor }); return observations[id] ?? result('idle') },
+  }
+  return { observer: new SeatObserver(aiterm, 'r'), member, calls }
+}
+test('Aitermの状態とtokenを渡し、opaque cursorを再観測へ返す', async () => {
+  const f = fixture([], { seat: result('blocked') })
+  const first = await f.observer.cycle([f.member], new Map(), 'time')
+  assert.equal(first.get('alice').status, 'blocked')
+  assert.equal(first.get('alice').paneTokenHint, 1200)
+  await f.observer.cycle([f.member], first, 'later')
+  assert.equal(f.calls[1].cursor, 'opaque')
+})
+test('roomが一致する預け仕事だけを合成し、番犬用の席状態を保つ', async () => {
+  const f = fixture([
+    { session_id: 'job', environment: { PEERTABLE_MEMBER: 'alice', PEERTABLE_ROOM: 'r' } },
+    { session_id: 'elsewhere', environment: { PEERTABLE_MEMBER: 'alice', PEERTABLE_ROOM: 'other' } },
+  ], { job: result('unknown', { output_changed: true }) })
+  const row = (await f.observer.cycle([f.member], new Map(), 'time')).get('alice')
+  assert.equal(row.status, 'busy')
+  assert.equal(row.paneStatus, 'idle')
+  assert.deepEqual(f.calls.map(x => x.id), ['seat', 'job'])
+})
+test('足場CPUを稼働に数えず、席内background CPUを稼働へ合成する', async () => {
+  for (const [background, expected] of [[null, 'idle'], [0.01, 'busy']]) {
+    const f = fixture([], { seat: result('idle', { cpu_delta_seconds: 0.3, background_cpu_delta_seconds: background }) })
+    assert.equal((await f.observer.cycle([f.member], new Map(), 'time')).get('alice').status, expected)
+  }
+})
+test('消失はdead、観測失敗は例外になりidleへ丸めない', async () => {
+  const f = fixture([], { seat: result('missing') })
+  assert.equal((await f.observer.cycle([f.member], new Map(), 'time')).get('alice').status, 'dead')
+  f.observer.aiterm.observe = async () => { throw new Error('API failure') }
+  await assert.rejects(f.observer.cycle([f.member], new Map(), 'time'), /API failure/)
+})
+test('他roomの身元不一致を明示し、同じ観測回の正常席を残す', async () => {
+  const f = fixture([{ session_id: 'wrong', environment: { PEERTABLE_MEMBER: 'bob', PEERTABLE_ROOM: 'other' } }])
+  const rows = await f.observer.cycle([f.member, { name: 'bob', aiterm_session_id: 'wrong' }], new Map(), 'time')
+  assert.equal(rows.get('alice').status, 'idle')
+  assert.equal(rows.get('bob').error.code, 'PEERTABLE_SEAT_SESSION_IDENTITY_CONFLICT')
+  assert.deepEqual(f.calls.map(call => call.id), ['seat'])
+})
+test('harnessのnative停止はblockedとして保持する', async () => {
+  const f = fixture([], { seat: { ...result('blocked'), reason: 'harness_stopped', pane_alive: true, harness_alive: true } })
+  const row = (await f.observer.cycle([f.member], new Map(), 'time')).get('alice')
+  assert.equal(row.status, 'blocked')
+  assert.equal(row.paneStatus, 'blocked')
+})

package/skill/scripts/seat-session.mjs

@@ -0,0 +1,17 @@
+// 既存台帳のtargetは移行時の識別子として読むだけで、backendへ渡さない。
+export function seatSessionId(member) {
+  return member.aiterm_session_id || member.observe?.aiterm_session_id || member.observe?.tmux_target || null
+}
+
+export function findSeatSession(member, sessions, room) {
+  const id = seatSessionId(member)
+  const session = id ? sessions.find(item => item.session_id === id) : null
+  if (!session) return null
+  const env = session.environment ?? {}
+  if ((env.PEERTABLE_MEMBER && env.PEERTABLE_MEMBER !== member.name) || (env.PEERTABLE_ROOM && env.PEERTABLE_ROOM !== room)) {
+    throw Object.assign(new Error(`席 ${member.name} のAitermセッションが対象roomの本人だと確認できません`), {
+      code: 'PEERTABLE_SEAT_SESSION_IDENTITY_CONFLICT',
+    })
+  }
+  return session
+}