peertable 0.8.22 → 0.8.25

package/skill/launchd/dev.kitepon.peertable-bridges.plist

@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-  <key>Label</key><string>dev.kitepon.peertable-bridges</string>
-  <key>ProgramArguments</key>
-  <array>
-    <string>/bin/bash</string>
-    <string>/Users/kite/Developer/peertable/skill/scripts/ensure-all-bridges.sh</string>
-  </array>
-  <key>EnvironmentVariables</key>
-  <dict>
-    <key>PATH</key><string>/opt/homebrew/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
-  </dict>
-  <key>RunAtLoad</key><true/>
-  <key>StartInterval</key><integer>120</integer>
-  <key>StandardOutPath</key><string>/Users/kite/Library/Logs/peertable-bridges.log</string>
-  <key>StandardErrorPath</key><string>/Users/kite/Library/Logs/peertable-bridges.log</string>
-</dict>
-</plist>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key><string>dev.kitepon.peertable-bridges</string>
+  <key>ProgramArguments</key>
+  <array>
+    <string>/bin/bash</string>
+    <string>/Users/kite/Developer/peertable/skill/scripts/ensure-all-bridges.sh</string>
+  </array>
+  <key>EnvironmentVariables</key>
+  <dict>
+    <key>PATH</key><string>/opt/homebrew/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
+  </dict>
+  <key>RunAtLoad</key><true/>
+  <key>StartInterval</key><integer>120</integer>
+  <key>StandardOutPath</key><string>/Users/kite/Library/Logs/peertable-bridges.log</string>
+  <key>StandardErrorPath</key><string>/Users/kite/Library/Logs/peertable-bridges.log</string>
+</dict>
+</plist>

package/skill/scripts/agent-pane-status.mjs

@@ -0,0 +1,6 @@
+#!/usr/bin/env node
+import { classifyPaneTail, paneStatusTail } from './seat-usage.mjs'
+
+const chunks = []
+for await (const chunk of process.stdin) chunks.push(chunk)
+process.stdout.write(`${classifyPaneTail(paneStatusTail(Buffer.concat(chunks).toString('utf8')))}\n`)

package/skill/scripts/alarm-bridge.mjs

@@ -21,6 +21,8 @@ import { join } from 'node:path'
 import { promisify } from 'node:util'
 
 import { resolvePostToken } from './seat-usage.mjs'
+import { resolveLatticeExecutable } from './seat-usage.mjs'
+import { latticeTaskAvailable } from './alarm-condition.mjs'
 import { observePidCommand } from './seat-identity.mjs'
 import { updateBridgeProgress } from './bridge-record-live.mjs'
 
@@ -53,6 +55,7 @@ if (flag === '--stop') process.exit(0)
 
 const setup = JSON.parse(readFileSync(join(team, 'setup-state.json'), 'utf8'))
 const { room, server_url: url } = setup
+const lattice = setup.lattice_cli ? resolveLatticeExecutable(setup.lattice_cli) : null
 const token = resolvePostToken(process.env)
 if (!token) { console.error('ALARM_BRIDGE_TOKEN_MISSING: 書込トークンが無い'); process.exit(1) }
 mkdirSync(alarmsDir, { recursive: true })
@@ -86,23 +89,37 @@ async function tick() {
     if (Date.now() < due) continue
     let reg
     try { reg = JSON.parse(readFileSync(file, 'utf8')) } catch { continue } // 書込途中は次周へ
-    if (typeof reg.seat !== 'string' || typeof reg.script !== 'string' || !reg.seat || !reg.script) {
-      log(`ALARM_REGISTRATION_INVALID: ${entry}（seat/script が無い）を撤去する`)
+    const typed = reg.condition?.type === 'lattice_task_ready'
+    const legacy = typeof reg.script === 'string' && reg.script.length > 0
+    if (typeof reg.seat !== 'string' || !reg.seat || (!typed && !legacy)) {
+      log(`ALARM_REGISTRATION_INVALID: ${entry}（seat/condition が無い）を撤去する`)
       try { unlinkSync(file) } catch {}
       continue
     }
     nextDue.set(file, Date.now() + Math.max(2, Number(reg.interval_s) || 10) * 1000)
     let met = false
     let firedOutput = ''
-    try {
-      const { stdout, stderr } = await run('bash', ['-c', reg.script], { timeout: 30_000, maxBuffer: 1024 * 1024 })
-      met = true
-      // 発火の証拠を残す: fail-open型の条件は「なぜ成立したか」が出力にしか現れない
-      // （実被弾 2026-08-26: statusの一過性失敗で即発火したが、何が失敗したか記録が無く未解明）
-      firedOutput = `${stdout ?? ''}${stderr ?? ''}`.trim().slice(0, 300)
-    } catch (e) {
-      // exit 非0 = 条件未成立（正常）。timeout/spawn 失敗はログへ（成立と区別し、握りつぶさない）
-      if (e.killed || e.code === 'ENOENT') log(`条件スクリプトの実行失敗（${entry}）: ${e.message}`)
+    if (typed) {
+      if (!lattice) {
+        log(`ALARM_CONDITION_EVALUATION_FAILED: ${entry} lattice_cli がsetup-stateに無い`)
+      } else {
+        try {
+          const { stdout } = await run(lattice.command, lattice.argv, { timeout: 30_000, maxBuffer: 1024 * 1024, cwd: proj })
+          const status = JSON.parse(stdout)
+          met = latticeTaskAvailable(status, reg.condition.task_id, reg.condition.plan_key ?? '')
+        } catch (e) {
+          log(`ALARM_CONDITION_EVALUATION_FAILED: ${entry} ${e.message.split('\n')[0]}`)
+        }
+      }
+    } else {
+      try {
+        const { stdout, stderr } = await run('bash', ['-c', reg.script], { timeout: 30_000, maxBuffer: 1024 * 1024 })
+        met = true
+        firedOutput = `${stdout ?? ''}${stderr ?? ''}`.trim().slice(0, 300)
+      } catch (e) {
+        // exit 非0 = 条件未成立（正常）。timeout/spawn 失敗はログへ（成立と区別し、握りつぶさない）
+        if (e.killed || e.code === 'ENOENT') log(`条件スクリプトの実行失敗（${entry}）: ${e.message}`)
+      }
     }
     if (!met) continue
     try {

package/skill/scripts/alarm-condition.mjs

@@ -0,0 +1,7 @@
+#!/usr/bin/env node
+
+export function latticeTaskAvailable(status, taskId, planKey = '') {
+  if (!status || typeof status !== 'object' || typeof taskId !== 'string' || !taskId) return false
+  const candidates = [...(status.next_ready ?? []), ...(status.active_set ?? [])]
+  return candidates.some(task => task?.task_id === taskId && (!planKey || task?.plan_key === planKey))
+}

package/skill/scripts/alarm-set.sh

@@ -1,14 +1,25 @@
 #!/bin/bash
 # 目覚まし係へ待機解放条件を登録する（席が待機に入る前に使う）。
-# usage: alarm-set.sh <project_dir> <seat> <note> <script...>
+# usage: alarm-set.sh <project_dir> <seat> <note> --lattice-task-ready <task_id> [--plan <plan_key>]
+#        alarm-set.sh <project_dir> <seat> <note> <script...>  # 外部条件の後方互換
 #   script は bash -c で実行され、exit 0 で条件成立とみなされる。
 #   **script はシングルクォートで渡すこと**。ダブルクォートだと `$()` や変数が登録側の
 #   shell で先に展開され、判定コマンドでなく展開結果が登録される（かえで実測 2026-08-22）。
 #   成立すると席へ「[待機解放条件成立] <note>」が配達され、登録は自動で消える。
 set -eu
 proj="${1:?project_dir}"; seat="${2:?seat}"; note="${3:?note}"; shift 3
-script="$*"
-[ -n "$script" ] || { echo "ALARM_SET_SCRIPT_REQUIRED: 条件スクリプトが空" >&2; exit 2; }
+condition_kind=script
+task_id=""; plan_key=""; script=""
+if [ "${1:-}" = "--lattice-task-ready" ]; then
+  condition_kind=lattice_task_ready
+  task_id="${2:-}"; shift 2
+  [ -n "$task_id" ] || { echo "ALARM_SET_TASK_REQUIRED: task_id が空" >&2; exit 2; }
+  if [ "${1:-}" = "--plan" ]; then plan_key="${2:-}"; shift 2; fi
+  [ "$#" -eq 0 ] || { echo "ALARM_SET_ARGS_INVALID: 余分な引数 $*" >&2; exit 2; }
+else
+  script="$*"
+  [ -n "$script" ] || { echo "ALARM_SET_SCRIPT_REQUIRED: 条件スクリプトが空" >&2; exit 2; }
+fi
 # 誤った project path を mkdir -p が幻のツリーとして実体化し、誰も読まない場所へ exit 0 で
 # 登録が「成功」する（実被弾 2026-08-28: worktree cwd からの相対 'poly' が poly/poly/.team/ を
 # 生み、席は登録済みと思って15時間停滞）。目覚まし係が読むのは既存卓の .team だけなので、
@@ -18,11 +29,12 @@ proj="$(cd -- "$proj" 2>/dev/null && pwd)" || { echo "ALARM_SET_PROJECT_INVALID:
 dir="$proj/.team/alarms"
 mkdir -p "$dir"
 id="$(date +%s)-$$"
-python3 - "$dir/$id.json" "$seat" "$note" "$script" <<'PY'
-import json, sys
-out, seat, note, script = sys.argv[1:5]
-with open(out, 'w') as f:
-    json.dump({'seat': seat, 'note': note, 'script': script, 'interval_s': 10,
-               'created_at': __import__('datetime').datetime.utcnow().isoformat() + 'Z'}, f, ensure_ascii=False)
-PY
+script_dir=$(cd "$(dirname "$0")" && pwd -P)
+if [ "$condition_kind" = lattice_task_ready ]; then
+  printf '%s\0%s\0%s\0%s\0%s' "$condition_kind" "$seat" "$note" "$task_id" "$plan_key" \
+    | node "$script_dir/alarm-write.mjs" "$dir/$id.json"
+else
+  printf '%s\0%s\0%s\0%s' "$condition_kind" "$seat" "$note" "$script" \
+    | node "$script_dir/alarm-write.mjs" "$dir/$id.json"
+fi
 echo "ALARM_SET_OK: ${dir}/${id}.json（seat=${seat} note=${note}）"

package/skill/scripts/alarm-write.mjs

@@ -0,0 +1,27 @@
+#!/usr/bin/env node
+// Git Bash→Windows native processのargv文字コード変換を通さず、UTF-8 stdinでalarmを保存する。
+import { writeFileSync } from 'node:fs'
+
+const out = process.argv[2]
+if (!out) throw new Error('ALARM_WRITE_PATH_REQUIRED')
+
+const chunks = []
+for await (const chunk of process.stdin) chunks.push(chunk)
+const fields = Buffer.concat(chunks).toString('utf8').split('\0')
+const kind = fields.shift()
+let payload
+if (kind === 'script' && fields.length === 3 && fields.every(value => value.length > 0)) {
+  const [seat, note, script] = fields
+  payload = { seat, note, script }
+} else if (kind === 'lattice_task_ready' && fields.length === 4
+  && fields.slice(0, 3).every(value => value.length > 0)) {
+  const [seat, note, task_id, plan_key] = fields
+  payload = { seat, note, condition: { type: 'lattice_task_ready', task_id, ...(plan_key ? { plan_key } : {}) } }
+} else {
+  throw new Error('ALARM_WRITE_PAYLOAD_INVALID')
+}
+writeFileSync(out, `${JSON.stringify({
+  ...payload,
+  interval_s: 10,
+  created_at: new Date().toISOString(),
+})}\n`, { encoding: 'utf8', mode: 0o600 })

package/skill/scripts/claude-dialog.mjs

@@ -19,5 +19,8 @@ const isMain = Boolean(process.argv[1]) && resolve(process.argv[1]) === fileURLT
 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`)
+  const action = keysForClaudeMcpPane(Buffer.concat(chunks).toString('utf8'))
+  if (process.argv.includes('--keys')) {
+    if (action) process.stdout.write(`${action.keys.join('\n')}\n`)
+  } else process.stdout.write(`${JSON.stringify(action)}\n`)
 }

package/skill/scripts/codex-dialog.mjs

@@ -10,19 +10,28 @@ 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)) {
+  const lines = text.split(/\r?\n/u).slice(-24)
+  const tail = lines.join('\n')
+  // scrollbackに残った古いdialogより、現在のbusy表示／通常composerを優先する。
+  // active dialog自身の選択肢行（`› 1.`）は通常composerとして数えない。
+  const busy = /esc to interrupt/iu.test(tail)
+  const idleComposer = lines.some(line => /^\s*›(?:\s*$|\s+(?!\d+\.))/u.test(line))
+    && lines.some(line => /gpt-[\w.-]+/iu.test(line) && line.includes('·'))
+  if (busy || idleComposer) return null
+  const dialogText = tail
+  if (dialogText.includes(MCP_ALLOW_NEEDLE) && dialogText.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)) {
+  if (dialogText.includes(COMMAND_APPROVAL_NEEDLE) && dialogText.toLowerCase().includes(COMMAND_APPROVAL_DONT_ASK)) {
     return { kind: 'command-approval', keys: ['Down', 'Enter'] }
   }
-  if (text.includes('Hooks need review')) {
+  if (dialogText.includes('Hooks need review')) {
     return { kind: 'hooks', keys: ['Down', 'Enter'] }
   }
-  if (text.includes('Update now')) {
+  if (dialogText.includes('Update now')) {
     return { kind: 'update', keys: ['Down', 'Enter'] }
   }
-  if (text.includes('Yes, continue') && text.includes('Do you trust the contents of this directory')) {
+  if (dialogText.includes('Yes, continue') && dialogText.includes('Do you trust the contents of this directory')) {
     return { kind: 'trust', keys: ['Enter'] }
   }
   return null
@@ -42,5 +51,9 @@ if (isMain) {
   if (process.argv.includes('--ready-ok')) {
     process.exit(blocksCodexReady(screen) ? 2 : 0)
   }
+  if (process.argv.includes('--keys')) {
+    if (action) process.stdout.write(`${action.keys.join('\n')}\n`)
+    process.exit(0)
+  }
   process.stdout.write(`${JSON.stringify(action)}\n`)
 }

package/skill/scripts/ensure-bridge.sh

@@ -4,6 +4,10 @@ set -euo pipefail
 
 proj="$1"; name="$2"; shift 2
 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
+scripts_dir=$(cd "$(dirname "$0")" && pwd -P)
+repo=$(cd "$scripts_dir/../.." && pwd -P)
+peertable_version=$(node -p "require(process.argv[1]).version" "$repo/package.json")
+peertable_runtime_digest=$(node "$scripts_dir/runtime-digest.mjs")
 team="$proj/.team"; record="$team/$name-bridge.json"; log="$team/$name-bridge.log"
 force=false
 if [ "${1:-}" = "--force" ]; then force=true; shift; fi
@@ -17,7 +21,16 @@ if [ $# -eq 0 ] && [ -f "$record" ]; then
   fi
 fi
 if [ -f "$record" ]; then
-  if node "$(dirname "$0")/bridge-record-live.mjs" "$record"; then exit 0; fi
+  if node "$scripts_dir/bridge-record-live.mjs" "$record"; then
+    record_version=$(node -e 'const x=require(process.argv[1]);process.stdout.write(x.peertable_version||"")' "$record")
+    record_digest=$(node -e 'const x=require(process.argv[1]);process.stdout.write(x.peertable_runtime_digest||"")' "$record")
+    if [ "$record_version" = "$peertable_version" ] && [ "$record_digest" = "$peertable_runtime_digest" ]; then exit 0; fi
+    echo "${name}-bridge: Peertable ${record_version:-unknown} → ${peertable_version} の現行runtimeへ自動更新する" >&2
+    node "$scripts_dir/$script" "$proj" --stop || {
+      echo "${name}-bridge: 旧版bridgeを停止できないため更新を中止する" >&2
+      exit 1
+    }
+  fi
   if ! "$force" && grep -q 'WRITE_DENIED' "$log" 2>/dev/null; then echo "${name}-bridge: 前回はWRITE_DENIEDで終了。--forceを指定すること" >&2; exit 1; fi
 fi
 # shellcheck disable=SC1091
@@ -49,8 +62,8 @@ if [ "$(node -p 'process.platform')" = "win32" ]; then
   # psmuxが起動する正規shellはPowerShell 7。POSIXの`env`とMSYS pathを文字列のまま
   # 渡すとnodeへ到達する前に終了するため、Windows nodeに各pathをargvとして変換させ、
   # PowerShell EncodedCommandを一箇所で組み立てる。
-  win_command=$(node "$(dirname "$0")/platform/windows/build-bridge-command.mjs" \
-    "$(dirname "$0")/$script" "$proj" "$log" "$@")
+  win_command=$(node "$scripts_dir/platform/windows/build-bridge-command.mjs" \
+    "$scripts_dir/$script" "$proj" "$log" "$@")
   tmux_at new-session -d -s "$session" "$win_command"
 else
   tmux_at new-session -d -s "$session" "env${env_prefix} node $(dirname "$0")/$script $(printf '%q ' "$proj" "$@") >> $(printf '%q' "$log") 2>&1"
@@ -60,10 +73,10 @@ for _ in $(seq 1 30); do
     # **末尾は本物の改行にする。** `"\\n"` と書くと JS がリテラルの `\`+`n` を足し、
     # record が JSON として壊れる——`--stop` も次回起動も `JSON.parse` で落ちて、
     # 「止められない・建て直せない常駐」ができる（2026-08-11 実測）。一時 file→rename で原子的に。
-    node -e 'const fs=require("fs");const p=process.argv[1],a=process.argv.slice(2);
+    node -e 'const fs=require("fs");const p=process.argv[1],version=process.argv[2],digest=process.argv[3],a=process.argv.slice(4);
       const t=`${p}.${process.pid}.tmp`;
-      fs.writeFileSync(t,JSON.stringify({...JSON.parse(fs.readFileSync(p,"utf8")),args:a})+"\n");
-      fs.renameSync(t,p)' "$record" "$@"
+      fs.writeFileSync(t,JSON.stringify({...JSON.parse(fs.readFileSync(p,"utf8")),peertable_version:version,peertable_runtime_digest:digest,args:a})+"\n");
+      fs.renameSync(t,p)' "$record" "$peertable_version" "$peertable_runtime_digest" "$@"
     exit 0
   fi
   sleep .5

package/skill/scripts/ensure-project-runtime.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+# 円卓runtimeを一回の呼出しで現行Peertable版へ収束させる正規入口。
+set -euo pipefail
+
+proj="${1:-}"
+[ -n "$proj" ] || { echo "usage: ensure-project-runtime.sh <project_dir>" >&2; exit 2; }
+scripts=$(cd "$(dirname "$0")" && pwd -P)
+
+for kind in alarm seat-status wakeup; do
+  "$scripts/ensure-bridge.sh" "$proj" "$kind"
+done
+
+echo "peertable runtime ready: alarm / seat-status / wakeup"

package/skill/scripts/grok-seat-config.mjs

@@ -0,0 +1,47 @@
+#!/usr/bin/env node
+// Peertable席のGrokをroom専用にする。GROK_HOMEだけではClaude/Cursor互換源を読むため、
+// compatを明示OFFにし、project .mcp.jsonのroom以外もnative高優先設定でdisableする。
+import { chmodSync, mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs'
+import { dirname, join, resolve } from 'node:path'
+
+const [projectArg, outputArg] = process.argv.slice(2)
+if (!projectArg || !outputArg) throw new Error('GROK_SEAT_CONFIG_ARGS_INVALID')
+const project = resolve(projectArg)
+const output = resolve(outputArg)
+const rootMcp = JSON.parse(readFileSync(join(project, '.mcp.json'), 'utf8'))
+const servers = rootMcp?.mcpServers
+if (!servers || typeof servers !== 'object' || Array.isArray(servers) || !servers.room) {
+  throw new Error('GROK_SEAT_ROOM_MCP_MISSING')
+}
+
+const disabled = Object.keys(servers).filter(name => name !== 'room').sort((a, b) => a.localeCompare(b, 'en'))
+const lines = [
+  `disabled_mcp_servers = ${JSON.stringify(disabled)}`,
+  '',
+  '[ui]',
+  'permission_mode = "always-approve"',
+  '',
+  '[compat.claude]',
+  'skills = false',
+  'rules = false',
+  'agents = false',
+  'mcps = false',
+  'hooks = false',
+  'sessions = false',
+  '',
+  '[compat.cursor]',
+  'skills = false',
+  'rules = false',
+  'agents = false',
+  'mcps = false',
+  'hooks = false',
+  'sessions = false',
+  '',
+  '[compat.codex]',
+  'sessions = false',
+]
+mkdirSync(dirname(output), { recursive: true, mode: 0o700 })
+const temp = `${output}.${process.pid}.tmp`
+writeFileSync(temp, `${lines.join('\n')}\n`, { encoding: 'utf8', mode: 0o600 })
+chmodSync(temp, 0o600)
+renameSync(temp, output)