peertable 0.4.1 → 0.4.3

package/skill/scripts/aiterm-configure.mjs

@@ -16,7 +16,7 @@ if (!session_id || (!model && !reasoning_effort)) {
 // Aiterm のmanaged session metadataは実行時state root（macOSではTMPDIR）にある。
 // stdio transportの既定環境は親のTMPDIRを落とすため、同じ公開serverへ明示継承する。
 const transport = new StdioClientTransport({ command: 'aiterm-mcp', env: process.env })
-const client = new Client({ name: 'peertable-seat-configure', version: '0.4.1' })
+const client = new Client({ name: 'peertable-seat-configure', version: '0.4.3' })
 await client.connect(transport)
 const result = await client.callTool({
   name: 'agent_configure',

package/skill/scripts/aiterm-launch.mjs

@@ -8,7 +8,7 @@ if (!session_name || !['claude', 'codex', 'grok'].includes(vendor) || !model ||
   throw new Error('SEAT_AITERM_LAUNCH_ARGS_INVALID')
 }
 
-const client = new Client({ name: 'peertable-seat-launch', version: '0.4.1' })
+const client = new Client({ name: 'peertable-seat-launch', version: '0.4.3' })
 await client.connect(new StdioClientTransport({ command: 'aiterm-mcp', env: process.env }))
 const env_vars = [
   'PEERTABLE_URL', 'PEERTABLE_ROOM', 'PEERTABLE_MEMBER', 'PEERTABLE_CREDENTIAL_FILE',

package/skill/scripts/change-seat.sh

@@ -16,6 +16,8 @@ set -eu
 # token値はこの制御processや再起動する席へ継承しない。launch後のroom記録も席別file経由で行う。
 unset PEERTABLE_POST_TOKEN
 script_dir=$(cd "$(dirname "$0")" && pwd -P)
+# shellcheck disable=SC1091
+. "$script_dir/tmux-at.bash"
 credential_helper="${PEERTABLE_CREDENTIAL_HELPER:-$script_dir/seat-credential.mjs}"
 
 proj="${1:-}"; name="${2:-}"
@@ -87,10 +89,10 @@ fi
 
 sock="${PEERTABLE_TMUX_SOCKET:-${TMPDIR:-/tmp/}claude-tmux-sockets/claude.sock}"
 sess="peer-$name"
-tmux -S "$sock" has-session -t "$sess" 2>/dev/null || {
+tmux_at has-session -t "$sess" 2>/dev/null || {
   echo "SEAT_CHANGE_SEAT_MISSING: ${sess}" >&2; exit 1;
 }
-screen=$(tmux -S "$sock" capture-pane -t "$sess" -p -S -25 2>/dev/null) || {
+screen=$(tmux_at capture-pane -t "$sess" -p -S -25 2>/dev/null) || {
   echo "SEAT_CHANGE_SEAT_UNREADABLE: $sess" >&2; exit 1;
 }
 # busy の判定文字列は seat-status-bridge と同じ（Claude のステータス行にも Codex の `Working (…)` にも出る）

package/skill/scripts/ensure-bridge.sh

@@ -21,6 +21,8 @@ if [ -f "$record" ]; then
   if [ -n "$pid" ] && kill -0 "$pid" 2>/dev/null; then exit 0; 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
+. "$(dirname "$0")/tmux-at.bash"
 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}"
@@ -39,8 +41,8 @@ for v in PEERTABLE_TMUX_SOCKET PEERTABLE_POST_TOKEN PEERTABLE_CREDENTIAL_FILE PE
 done
 # **session が在るだけでは常駐が生きている証拠にならない**（中の node だけ死んで殻が残る）。
 # 上で pid 生存を確かめて here まで来た＝生きていないので、殻は畳んでから立て直す。
-tmux -S "$sock" kill-session -t "$session" 2>/dev/null || true
-tmux -S "$sock" new-session -d -s "$session" "env${env_prefix} node $(dirname "$0")/$script $(printf '%q ' "$proj" "$@") >> $(printf '%q' "$log") 2>&1"
+tmux_at kill-session -t "$session" 2>/dev/null || true
+tmux_at new-session -d -s "$session" "env${env_prefix} node $(dirname "$0")/$script $(printf '%q ' "$proj" "$@") >> $(printf '%q' "$log") 2>&1"
 for _ in $(seq 1 30); do
   if [ -f "$record" ] && node -e 'process.exit(require(process.argv[1]).ready_at?0:1)' "$record"; then
     # **末尾は本物の改行にする。** `"\\n"` と書くと JS がリテラルの `\`+`n` を足し、

package/skill/scripts/launch-seat.sh

@@ -33,6 +33,8 @@ credential_helper="${PEERTABLE_CREDENTIAL_HELPER:-$(dirname "$0")/seat-credentia
 room_mcp_helper="${PEERTABLE_ROOM_MCP_HELPER:-$(dirname "$0")/ensure-room-mcp.mjs}"
 codex_room_mcp_helper="${PEERTABLE_CODEX_ROOM_MCP_HELPER:-$(dirname "$0")/ensure-codex-room-mcp.mjs}"
 aiterm_launch_helper="${PEERTABLE_AITERM_LAUNCH_HELPER:-$(dirname "$0")/aiterm-launch.mjs}"
+# shellcheck disable=SC1091
+. "$(dirname "$0")/tmux-at.bash"
 peertable_repo=$(cd "$(dirname "$0")/../.." && pwd -P)
 peertable_client="$peertable_repo/room/client.mjs"
 credential_file=""
@@ -68,16 +70,16 @@ rollback_brief() {
   local rollback_failed=0
   local encoded_name member_code listing
 
-  if [ -n "$sock" ] && [ -n "$sess" ] && [ "$seat_created" = true ]; then
-    if tmux -S "$sock" has-session -t "$sess" 2>/dev/null; then
-      if ! tmux -S "$sock" kill-session -t "$sess" 2>/dev/null; then
+  if [ -n "$sess" ] && [ "$seat_created" = true ]; then
+    if tmux_at has-session -t "$sess" 2>/dev/null; then
+      if ! tmux_at kill-session -t "$sess" 2>/dev/null; then
         rollback_failed=1
         echo "LAUNCH_BRIEF_ROLLBACK_FAILED: tmux session を停止できない: ${sess}" >&2
-      elif tmux -S "$sock" has-session -t "$sess" 2>/dev/null; then
+      elif tmux_at has-session -t "$sess" 2>/dev/null; then
         rollback_failed=1
         echo "LAUNCH_BRIEF_ROLLBACK_FAILED: tmux session が停止後も残っている: ${sess}" >&2
       fi
-    elif tmux -S "$sock" list-sessions >/dev/null 2>&1; then
+    elif tmux_at list-sessions >/dev/null 2>&1; then
       : # serverへ到達でき、対象sessionが無い
     else
       rollback_failed=1
@@ -263,7 +265,7 @@ esac
 # 前の卓の残骸を回収してから、Aiterm の公開 agent launcher を唯一の席起動経路として呼ぶ。
 # direct CLI launch へ戻るfallbackは置かない。Aiterm が作る同名PTYと launch receipt が、
 # 以後の `pty_read` / `agent_configure` / room metadata を同じsessionへ束縛する。
-tmux -S "$sock" kill-session -t "$sess" 2>/dev/null || true
+tmux_at kill-session -t "$sess" 2>/dev/null || true
 rm -f "$proj/.team/seats/$name.json"
 
 launch_env=(
@@ -312,7 +314,7 @@ then
 fi
 aiterm_session_id="$sess"
 brief_dispatched=true
-seat_tmux=$(tmux -S "$sock" display-message -p -t "$sess" '#{socket_path}')
+seat_tmux=$(tmux_at display-message -p -t "$sess" '#{socket_path}')
 
 # Aiterm管理席の process 起動は公開launch receiptで確定している。旧direct CLI launch向けの
 # ヘッダ/trust dialog待機をここへ重ねると、brief turnでヘッダが画面外へ流れた正常席をrollbackする。
@@ -325,15 +327,16 @@ echo "launched: ${sess}（${vendor} / ${model}${effort:+ / $effort} / room=${roo
 room_ready_deadline=$((SECONDS + 30))
 room_ready=false
 grok_trust_accepted=false
+mcp_consent_accepted=false
 while [ $SECONDS -lt "$room_ready_deadline" ]; do
   # Grok Build は初めて開く作業treeで、room MCPを初期化する前にworkspace trustを尋ねる。
   # Peertableが正式に着席させるtreeなので、この既知文言だけを一度通す。未知の確認画面を
   # 汎用的に承認するfallbackにはしない。承認後のMCP初期化時間は改めて30秒確保する。
   if [ "$vendor" = grok ] && [ "$grok_trust_accepted" != true ]; then
-    grok_screen=$(tmux -S "$sock" capture-pane -t "$sess" -p 2>/dev/null || true)
+    grok_screen=$(tmux_at capture-pane -t "$sess" -p 2>/dev/null || true)
     case "$grok_screen" in
       *"Do you trust the contents of this directory?"*)
-        if ! tmux -S "$sock" send-keys -t "$sess" y; then
+        if ! tmux_at send-keys -t "$sess" y; then
           echo "SEAT_GROK_TRUST_FAILED: workspace trustへ応答できない" >&2
           exit 1
         fi
@@ -343,6 +346,22 @@ while [ $SECONDS -lt "$room_ready_deadline" ]; do
         ;;
     esac
   fi
+  # aiterm claude_agent は --dangerously-skip-permissions を付けない。project の room MCP
+  # 同意が member 登録より前に出る。選択肢2（this and all future）だけを通す。
+  if [ "$vendor" = 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 + 30))
+        echo "claude room MCP consent: accepted"
+        ;;
+    esac
+  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
     room_ready=true
@@ -368,7 +387,7 @@ if [ -n "$brief" ] && [ "$brief_dispatched" != true ]; then
   brief_ready_streak=0
   brief_ready=false
   while [ $SECONDS -lt "$brief_ready_deadline" ]; do
-    brief_ready_screen=$(tmux -S "$sock" capture-pane -t "$sess" -p 2>/dev/null || true)
+    brief_ready_screen=$(tmux_at capture-pane -t "$sess" -p 2>/dev/null || true)
     if [ "$vendor" != codex ] || printf '%s\n' "$brief_ready_screen" | python3 -c 'import sys; lines=sys.stdin.read().splitlines()[-24:]; has_prompt=any(line.strip() == "›" or line.lstrip().startswith("› ") for line in lines); has_footer=any("gpt-" in line and "·" in line for line in lines); raise SystemExit(0 if has_prompt and has_footer else 1)'; then
       brief_ready_streak=$((brief_ready_streak + 1))
       if [ "$brief_ready_streak" -ge 3 ]; then
@@ -388,19 +407,19 @@ if [ -n "$brief" ] && [ "$brief_dispatched" != true ]; then
     # mountした直後に paste と Enter を同一tickで受けると、Enterだけ落ちる。
     sleep 1
 
-  brief_before=$(tmux -S "$sock" capture-pane -S -1000 -t "$sess" -p 2>/dev/null || true)
+  brief_before=$(tmux_at capture-pane -S -1000 -t "$sess" -p 2>/dev/null || true)
   brief_buffer="peertable-brief-${name}-$$"
-  if ! tmux -S "$sock" load-buffer -b "$brief_buffer" "$brief_file"; then
+  if ! tmux_at load-buffer -b "$brief_buffer" "$brief_file"; then
     echo "LAUNCH_BRIEF_SEND_FAILED: brief の tmux buffer 読み込みに失敗（席は着席済み）" >&2
     exit 1
   fi
-  if ! tmux -S "$sock" paste-buffer -b "$brief_buffer" -d -t "$sess"; then
-    tmux -S "$sock" delete-buffer -b "$brief_buffer" 2>/dev/null || true
+  if ! tmux_at paste-buffer -b "$brief_buffer" -d -t "$sess"; then
+    tmux_at delete-buffer -b "$brief_buffer" 2>/dev/null || true
     echo "LAUNCH_BRIEF_SEND_FAILED: brief の tmux paste に失敗（席は着席済み）" >&2
     exit 1
   fi
   sleep 1
-  if ! tmux -S "$sock" send-keys -t "$sess" Enter; then
+  if ! tmux_at send-keys -t "$sess" Enter; then
     echo "LAUNCH_BRIEF_SEND_FAILED: brief の submit に失敗（席は着席済み）" >&2
     exit 1
   fi
@@ -411,7 +430,7 @@ if [ -n "$brief" ] && [ "$brief_dispatched" != true ]; then
   brief_deadline=$((SECONDS + 30))
   brief_turn_started=false
   while [ $SECONDS -lt "$brief_deadline" ]; do
-    brief_screen=$(tmux -S "$sock" capture-pane -S -1000 -t "$sess" -p 2>/dev/null || true)
+    brief_screen=$(tmux_at capture-pane -S -1000 -t "$sess" -p 2>/dev/null || true)
     case "$brief_screen" in
       *"esc to interrupt"*)
         if [ "$brief_screen" != "$brief_before" ]; then brief_turn_started=true; break; fi
@@ -438,13 +457,13 @@ fi
 # この file が主張するのは「この pid はこの席だった」という**識別**であって、生死ではない。
 # 生きているかは attach する側（Lattice）が lstart+argv の再観測で確かめる。
 seat_pid=""
-pane_pid=$(tmux -S "$sock" list-panes -t "$sess" -F '#{pane_pid}' 2>/dev/null | head -1 || true)
+pane_pid=$(tmux_at list-panes -t "$sess" -F '#{pane_pid}' 2>/dev/null | head -1 || true)
+seat_ident=""
 if [ -n "$pane_pid" ]; then
-  # pane の子で pid===pgid のものが席本体。pane_pid（shell）を渡すと Lattice の直接 OS 観測が
-  # 「worker process group を無関係 process と共有している」で正しく落ちる。
-  # **1件でなければ推測で選ばない**（run-bridge.mjs の seatWorkerPid と同じ規律）。
-  leaders=$(ps -Ao pid=,ppid=,pgid= | awk -v p="$pane_pid" '$2==p && $1==$3 {print $1}')
-  if [ "$(printf '%s\n' "$leaders" | grep -c .)" = "1" ]; then seat_pid=$(printf '%s' "$leaders" | tr -d ' \n'); fi
+  seat_ident=$(node "$(dirname "$0")/seat-identity.mjs" "$pane_pid" 2>/dev/null || true)
+fi
+if [ -n "$seat_ident" ]; then
+  seat_pid=$(python3 -c "import json,sys;print(json.load(sys.stdin)['pid'])" <<<"$seat_ident")
 fi
 if [ -z "$seat_pid" ]; then
   # 記録が無ければ席は attach できず、装置の介入は協調 hold のままになる。**黙らない。**
@@ -455,14 +474,13 @@ else
   # `input.session === actor.session` を要求し（`runtime-pull-intake.mjs:674`）、actor session は
   # 上の env_line が入れる `LATTICE_TODO_ACTOR_SESSION=$name` である。tmux 識別子を混ぜると
   # attach が必ず `WORKER_ACTOR_MISMATCH` で拒否される（mio の監査で発覚・room [937]）。
-  if ! python3 - "$proj/.team/seats/$name.json" "$name" "$name" "$seat_pid" <<'PY'
+  if ! python3 - "$proj/.team/seats/$name.json" "$name" "$name" "$seat_ident" <<'PY'
 import hashlib, json, os, subprocess, sys, tempfile
-out, name, session, pid = sys.argv[1:5]
-pid = int(pid)
-started = subprocess.run(['/bin/ps', '-o', 'lstart=', '-p', str(pid)],
-                         capture_output=True, text=True, check=True).stdout.strip()
-argv = subprocess.run(['/bin/ps', '-o', 'args=', '-p', str(pid)],
-                      capture_output=True, text=True, check=True).stdout.strip()
+out, name, session, ident_raw = sys.argv[1:5]
+ident = json.loads(ident_raw)
+pid = int(ident['pid'])
+started = ident['started_identity']
+argv = ident['argv']
 if not started or not argv:
     sys.exit('pid の lstart/args を観測できない')
 record = {
@@ -499,11 +517,15 @@ fi
 # **欄が無い登録で既存の素性を消さない**（upsert）ことが前提である。
 # effort は渡された時だけ入れる——欄が無い＝「不明」ではなく「CLI 既定で走っている」。
 # ここが失敗しても席は着席済みなので落とさない。ただし黙っては飲まない。
-meta=$(python3 - "$name" "$vendor" "$model" "$effort" "$sock" "$sess" "$role" "$aiterm_session_id" <<'PY'
+tmux_ns=$(node "$(dirname "$0")/tmux-socket.mjs" --namespace)
+meta=$(python3 - "$name" "$vendor" "$model" "$effort" "$sock" "$sess" "$role" "$aiterm_session_id" "$tmux_ns" <<'PY'
 import json, sys
-name, vendor, model, effort, sock, sess, role, aiterm_session_id = sys.argv[1:9]
+name, vendor, model, effort, sock, sess, role, aiterm_session_id, tmux_ns = sys.argv[1:10]
+observe = {'tmux_socket': sock, 'tmux_target': sess}
+if tmux_ns:
+    observe['tmux_namespace'] = tmux_ns
 body = {'name': name, 'vendor': vendor, 'model': model, 'role': role, 'aiterm_session_id': aiterm_session_id,
-        'observe': {'tmux_socket': sock, 'tmux_target': sess}}
+        'observe': observe}
 if effort:
     body['effort'] = effort
 print(json.dumps(body))

package/skill/scripts/leave-seat.sh

@@ -15,6 +15,8 @@ case "$name" in
 esac
 
 script_dir=$(cd "$(dirname "$0")" && pwd -P)
+# shellcheck disable=SC1091
+. "$script_dir/tmux-at.bash"
 credential_helper="${PEERTABLE_CREDENTIAL_HELPER:-$script_dir/seat-credential.mjs}"
 state="$proj/.team/setup-state.json"
 [ -f "$state" ] || { echo "SEAT_LEAVE_STATE_MISSING: $state" >&2; exit 1; }
@@ -48,21 +50,18 @@ PY
 EOF
 
 failed=0
-if [ -z "$member_socket" ]; then
-  echo "SEAT_LEAVE_SESSION_UNREADABLE: tmux socketを解決できない" >&2
-  failed=1
-elif tmux -S "$member_socket" has-session -t "$target" 2>/dev/null; then
-  if ! tmux -S "$member_socket" kill-session -t "$target"; then
+if tmux_at has-session -t "$target" 2>/dev/null; then
+  if ! tmux_at kill-session -t "$target"; then
     echo "SEAT_LEAVE_SESSION_FAILED: $target" >&2
     failed=1
-  elif tmux -S "$member_socket" has-session -t "$target" 2>/dev/null; then
+  elif tmux_at has-session -t "$target" 2>/dev/null; then
     echo "SEAT_LEAVE_SESSION_FAILED: $target が撤去後も残っている" >&2
     failed=1
   fi
-elif tmux -S "$member_socket" list-sessions >/dev/null 2>&1; then
+elif tmux_at list-sessions >/dev/null 2>&1; then
   : # serverへ到達でき、対象sessionが無い
 else
-  echo "SEAT_LEAVE_SESSION_UNREADABLE: $member_socket" >&2
+  echo "SEAT_LEAVE_SESSION_UNREADABLE: ${member_socket:-tmux}" >&2
   failed=1
 fi
 

package/skill/scripts/parent-watch.mjs

@@ -10,6 +10,7 @@
 import { execFileSync } from 'node:child_process'
 import { existsSync, readFileSync, renameSync, statSync, unlinkSync, writeFileSync } from 'node:fs'
 import { join } from 'node:path'
+import { resolveLatticeExecutable } from './seat-usage.mjs'
 
 const args = process.argv.slice(2)
 const project = args.shift()
@@ -43,7 +44,8 @@ function readLatticeState(previous = null) {
   const source = `${info.mtimeMs}:${info.size}`
   if (previous?.source === source && previous.error === undefined) return previous
   try {
-    const status = JSON.parse(execFileSync(latticeCli, ['todo', 'status', '--json'], {
+    const lattice = resolveLatticeExecutable(latticeCli)
+    const status = JSON.parse(execFileSync(lattice.command, lattice.argv, {
       cwd: project,
       encoding: 'utf8',
       stdio: ['ignore', 'pipe', 'pipe'],

package/skill/scripts/seat-identity.mjs

@@ -0,0 +1,58 @@
+#!/usr/bin/env node
+// pane_pid から Lattice attach 用の pid / lstart / argv を1件に決める。
+// POSIX は ps。Windows は Win32_Process（ps -Ao は Git Bash で unknown option -- A）。
+import { execFileSync } from 'node:child_process'
+
+const panePid = process.argv[2]
+if (!/^\d+$/.test(panePid || '')) {
+  console.error('usage: seat-identity.mjs <pane_pid>')
+  process.exit(2)
+}
+
+const AGENT = /(?:claude|codex|grok|composer)(?:\.cmd|\.exe)?(?:\s|$)/iu
+
+function posixIdentity(pid) {
+  const table = execFileSync('ps', ['-Ao', 'pid=,ppid=,pgid='], { encoding: 'utf8' })
+  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' }).trim()
+  const argv = execFileSync('/bin/ps', ['-o', 'args=', '-p', chosen], { encoding: 'utf8' }).trim()
+  if (!started || !argv) throw new Error('pid の lstart/args を観測できない')
+  return { pid: Number(chosen), started_identity: started, 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('powershell.exe', ['-NoProfile', '-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 ? new Date(chosen.CreationDate).toISOString() : ''
+  const argv = String(chosen.CommandLine || '').trim()
+  if (!started || !argv) throw new Error('pid の CreationDate/CommandLine を観測できない')
+  return { pid: Number(chosen.ProcessId), started_identity: started, argv }
+}
+
+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-status-bridge.mjs

@@ -26,7 +26,7 @@ import { execFileSync } from 'node:child_process'
 import { existsSync, readFileSync, renameSync, writeFileSync, unlinkSync } from 'node:fs'
 import { join } from 'node:path'
 
-import { classifyPaneTail, decideBridgeContinuation, deriveMissingSession, isPaneProcessStopped, parsePaneTokenHint, resolvePostToken, resolveSeatObservation, resolveTmuxSocket, supportsMemberObservation, tmuxPanePid } from './seat-usage.mjs'
+import { classifyPaneTail, decideBridgeContinuation, deriveMissingSession, isPaneProcessStopped, parsePaneTokenHint, resolvePostToken, resolveSeatObservation, resolveTmuxSocket, supportsMemberObservation, tmuxArgv, tmuxPanePid } from './seat-usage.mjs'
 
 const args = process.argv.slice(2)
 const proj = args[0]
@@ -87,7 +87,7 @@ const defaultSocket = () => {
   if (defaultSocketResolution === null) defaultSocketResolution = resolveTmuxSocket(process.env)
   return defaultSocketResolution.socket
 }
-const tmux = (socket, ...a) => { try { return execFileSync('tmux', ['-S', socket, ...a], { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }) } catch { return null } }
+const tmux = (socket, ...a) => { try { return execFileSync('tmux', tmuxArgv(a, { socket }), { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }) } catch { return null } }
 
 // 監視するのは room の members に居る席だけ。tmux の `peer-*` を全部拾うと、同じマシンで走る別の卓を晒す
 async function seats() {

package/skill/scripts/seat-usage.mjs

@@ -1,7 +1,8 @@
-import { readFileSync, readdirSync } from 'node:fs'
+import { createHash } from 'node:crypto'
+import { existsSync, readFileSync, readdirSync } from 'node:fs'
 import { execFileSync } from 'node:child_process'
-import { homedir } from 'node:os'
-import { join } from 'node:path'
+import { homedir, tmpdir } from 'node:os'
+import path, { join } from 'node:path'
 
 const TOKEN_HINT = /[↓↑]\s*([0-9]+(?:\.[0-9]+)?)\s*([kKmM]?)\s*tokens\b/gu
 
@@ -17,9 +18,9 @@ export function supportsMemberObservation(payload) {
   return payload?.capabilities?.member_observation_v1 === true
 }
 
-/** aiterm-mcp の POSIX 既定ソケット規則。 */
+/** aiterm-mcp の POSIX 既定ソケット規則。Windows の path.join で `/tmp` を壊さない。 */
 export function defaultTmuxSocket(env) {
-  return join(env.TMPDIR || '/tmp', 'claude-tmux-sockets', 'claude.sock')
+  return path.posix.join(env.TMPDIR || '/tmp', 'claude-tmux-sockets', 'claude.sock')
 }
 
 const defaultTmuxProbe = {
@@ -69,6 +70,50 @@ export function resolveTmuxSocket(env, probe = defaultTmuxProbe) {
   return { socket: fallback, source: 'default', candidates: [], error: null }
 }
 
+/**
+ * Windows の psmux は -S を黙って既定 namespace へ落とす（aiterm 実測 2026-08-16）。
+ * aiterm と同じ -L namespace を使う。名前の式は aiterm-mcp core.js の WIN_NS と一致させる。
+ */
+export function usesPsmuxNamespace(env = process.env, platform = process.platform) {
+  if (env.PEERTABLE_FORCE_POSIX_TMUX === '1') return false
+  if (env.PEERTABLE_TMUX_L || env.AITERM_PSMUX_NS) return true
+  return platform === 'win32'
+}
+
+export function aitermPsmuxNamespace(env = process.env, platform = process.platform) {
+  if (env.PEERTABLE_TMUX_L) return env.PEERTABLE_TMUX_L
+  if (env.AITERM_PSMUX_NS) return env.AITERM_PSMUX_NS
+  const isWin = platform === 'win32'
+  const root = env.TMPDIR ?? (isWin ? env.TEMP ?? tmpdir() : '/tmp')
+  const joinPath = isWin ? path.win32.join : path.posix.join
+  const sockdir = joinPath(root, 'claude-tmux-sockets')
+  return `aiterm-${createHash('sha1').update(sockdir).digest('hex').slice(0, 12)}`
+}
+
+/** tmux/psmux へ渡す接続引数。POSIX は -S socket、Windows は -L namespace。 */
+export function tmuxArgv(extraArgs = [], { socket, env = process.env, platform = process.platform } = {}) {
+  if (usesPsmuxNamespace(env, platform)) {
+    return ['-L', aitermPsmuxNamespace(env, platform), ...extraArgs]
+  }
+  return ['-S', socket, ...extraArgs]
+}
+
+/**
+ * npm の extensionless shim は Windows の execFile で ENOENT。
+ * 隣の .cmd を cmd.exe /c で起動する（shell:true は DEP0190 かつ引数連結）。
+ */
+export function resolveLatticeExecutable(cli, { platform = process.platform, exists = existsSync } = {}) {
+  if (typeof cli !== 'string' || !cli) return { command: cli, argv: ['todo', 'status', '--json'] }
+  if (platform !== 'win32') return { command: cli, argv: ['todo', 'status', '--json'] }
+  const lower = cli.toLowerCase()
+  const cmd = lower.endsWith('.cmd') || lower.endsWith('.bat') || lower.endsWith('.exe')
+    ? cli
+    : exists(`${cli}.cmd`)
+      ? `${cli}.cmd`
+      : cli
+  return { command: process.env.ComSpec || 'cmd.exe', argv: ['/d', '/c', cmd, 'todo', 'status', '--json'] }
+}
+
 /** member の自己申告を優先し、無い既存 member だけ旧 session 名へ互換フォールバックする。 */
 export function resolveSeatObservation(member, defaultSocket) {
   const observe = member?.observe
@@ -164,7 +209,7 @@ export function classifyPaneTail(tail) {
  */
 export function tmuxPanePid(socket, target, exec = execFileSync) {
   try {
-    const out = exec('tmux', ['-S', socket, 'list-panes', '-t', target, '-F', '#{pane_pid}'], { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] })
+    const out = exec('tmux', tmuxArgv(['list-panes', '-t', target, '-F', '#{pane_pid}'], { socket }), { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] })
     const pid = out.trim().split('\n')[0]
     return pid && /^[0-9]+$/.test(pid) ? pid : null
   } catch {

package/skill/scripts/teardown.sh

@@ -14,6 +14,8 @@
 set -e
 proj="$1"
 script_dir=$(cd "$(dirname "$0")" && pwd -P)
+# shellcheck disable=SC1091
+. "$script_dir/tmux-at.bash"
 peertable_repo=$(cd "$script_dir/../.." && pwd -P)
 mode=archive
 for arg in "${@:2}"; do
@@ -75,12 +77,12 @@ else
     name=$(python3 -c 'import json,sys; print(json.loads(sys.argv[1])["name"])' "$member")
     target=$(python3 -c 'import json,sys; x=json.loads(sys.argv[1]); print((x.get("observe") or {}).get("tmux_target") or "peer-" + x["name"])' "$member")
     member_sock=$(python3 -c 'import json,sys; x=json.loads(sys.argv[1]); print((x.get("observe") or {}).get("tmux_socket") or sys.argv[2])' "$member" "$sock")
-    if tmux -S "$member_sock" has-session -t "$target" 2>/dev/null; then
-      tmux -S "$member_sock" kill-session -t "$target" && closed=$((closed + 1))
+    if tmux_at has-session -t "$target" 2>/dev/null; then
+      tmux_at kill-session -t "$target" && closed=$((closed + 1))
     fi
   done <<<"$member_lines"
   if [ "$closed" -gt 0 ]; then did "席の終了（${closed}席）"; else skip "席の終了（生きている席なし）"; fi
-  left=$(tmux -S "$sock" list-sessions 2>/dev/null | grep -c '^peer-' || true)
+  left=$(tmux_at list-sessions 2>/dev/null | grep -c '^peer-' || true)
   [ "${left:-0}" -eq 0 ] || echo "teardown: [注記] 他の卓の peer-* が ${left}件 残っている（この卓のものではないので畳まない）"
 fi
 

package/skill/scripts/tmux-at.bash

@@ -0,0 +1,10 @@
+# sourced by launch-seat / leave-seat / teardown / ensure-bridge / change-seat
+# POSIX は tmux -S <sock>。Windows psmux は -L <aiterm-ns>（-S は既定 namespace へ落ちる）。
+_peertable_tmux_scripts=$(CDPATH= cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)
+tmux_at() {
+  local prefix
+  prefix=$(node "$_peertable_tmux_scripts/tmux-socket.mjs" --prefix) || return 1
+  # shellcheck disable=SC2206
+  local -a conn=($prefix)
+  command tmux "${conn[@]}" "$@"
+}

package/skill/scripts/tmux-socket.mjs

@@ -1,10 +1,19 @@
 #!/usr/bin/env node
-import { resolveTmuxSocket } from './seat-usage.mjs'
+import { aitermPsmuxNamespace, resolveTmuxSocket, tmuxArgv, usesPsmuxNamespace } from './seat-usage.mjs'
 
 const result = resolveTmuxSocket(process.env)
-if (result.error?.code === 'PEERTABLE_TMUX_SOCKET_AMBIGUOUS') {
+if (result.error?.code === 'PEERTABLE_TMUX_SOCKET_AMBIGUOUS' && !usesPsmuxNamespace(process.env)) {
   console.error(`${result.error.code}: ${result.candidates.join(', ')}`)
   process.exit(1)
 }
-if (process.argv.includes('--source')) console.log(result.source)
-else console.log(result.socket)
+if (process.argv.includes('--prefix')) {
+  console.log(tmuxArgv([], { socket: result.socket }).join(' '))
+} else if (process.argv.includes('--namespace')) {
+  console.log(usesPsmuxNamespace(process.env) ? aitermPsmuxNamespace(process.env) : '')
+} else if (process.argv.includes('--source')) {
+  console.log(usesPsmuxNamespace(process.env) ? 'psmux-namespace' : result.source)
+} else if (usesPsmuxNamespace(process.env)) {
+  console.log(aitermPsmuxNamespace(process.env))
+} else {
+  console.log(result.socket)
+}

package/skill/scripts/wakeup-bridge.mjs

@@ -16,7 +16,7 @@ import { execFile } from 'node:child_process'
 import { existsSync, readFileSync, renameSync, unlinkSync, writeFileSync } from 'node:fs'
 import { join } from 'node:path'
 import { promisify } from 'node:util'
-import { resolveSeatObservation } from './seat-usage.mjs'
+import { resolveSeatObservation, tmuxArgv } from './seat-usage.mjs'
 import { BROADCAST_RECIPIENT, formatWakeNotice, isWakeupBridgeTarget, shouldDeferGrokWake } from './wakeup-delivery.mjs'
 
 const run = promisify(execFile)
@@ -236,7 +236,7 @@ async function wake(seat, msgs) {
     throw error
   }
   if (member.vendor === 'grok') {
-    const pane = await run('tmux', ['-S', observation.socket, 'capture-pane', '-t', observation.target, '-p'])
+    const pane = await run('tmux', tmuxArgv(['capture-pane', '-t', observation.target, '-p'], { socket: observation.socket }))
     const tail = String(pane.stdout).split('\n').slice(-14).join('\n')
     if (shouldDeferGrokWake(member.vendor, tail)) {
       if (!deferredBusy.has(seat)) {
@@ -250,11 +250,11 @@ async function wake(seat, msgs) {
   // Codexの入力欄は本文とEnterを同じtmux commandで送ると、初回turn完了後に
   // 本文が入力欄へ残ることがある。再試行時の半入力も含め、正規のsubmitを分離する。
   // 最後のEnterまで成功しない限りwakeは成功扱いにせず、flushSeatのreceiptも確定しない。
-  await run('tmux', ['-S', observation.socket, 'send-keys', '-t', observation.target, 'C-u'])
+  await run('tmux', tmuxArgv(['send-keys', '-t', observation.target, 'C-u'], { socket: observation.socket }))
   await sleep(100)
-  await run('tmux', ['-S', observation.socket, 'send-keys', '-l', '-t', observation.target, text])
+  await run('tmux', tmuxArgv(['send-keys', '-l', '-t', observation.target, text], { socket: observation.socket }))
   await sleep(750)
-  await run('tmux', ['-S', observation.socket, 'send-keys', '-t', observation.target, 'Enter'])
+  await run('tmux', tmuxArgv(['send-keys', '-t', observation.target, 'Enter'], { socket: observation.socket }))
   log(`起こした: ${seat} ← ${msgs.length} 件（最新 seq ${last.seq}）`)
 }