peertable 0.5.0 → 0.6.0

package/skill/scripts/launch-seat.sh

@@ -1,25 +1,25 @@
 #!/bin/bash
 # 席を1つ立てる（tmux 作成 → env 注入 → エージェント起動 → 既知ダイアログ通過 → 着席確認）。
-# usage: launch-seat.sh <project_dir> <name> --roles <role>[,<role>...] [--mission <text>] [--model <slug>] [--effort <effort>] [--vendor <vendor>] [brief]
+# usage: launch-seat.sh <project_dir> <name> --roles <role>[,<role>...] [--mission <text>] [--model <slug>] [--effort <effort>] [--harness <harness>] [brief]
 #   --roles: 必須。02_models の公式役割。位置引数に公式役割を置いてもよい
 #   --model: 任意。省略時は先頭役割の着席可能な1位。指定時は表外でも通す
 #   brief: 着席が成立したら送る着任指示（省略時は送らない）
 set -e
 usage() {
-  echo "usage: launch-seat.sh <project_dir> <name> --roles <role>[,<role>...] [--mission <text>] [--model <slug>] [--effort <effort>] [--vendor <vendor>] [brief]" >&2
+  echo "usage: launch-seat.sh <project_dir> <name> --roles <role>[,<role>...] [--mission <text>] [--model <slug>] [--effort <effort>] [--harness <harness>] [brief]" >&2
 }
 proj="$1"; name="$2"
 [ -n "$proj" ] && [ -n "$name" ] || { usage; exit 1; }
 shift 2
 brief=""
 roles=""; mission=""
-opt_model=""; opt_vendor=""; opt_effort=""
+opt_model=""; opt_harness=""; opt_effort=""
 while [ $# -gt 0 ]; do
   case "$1" in
     --roles) roles="${2:-}"; shift 2 ;;
     --mission) mission="${2:-}"; shift 2 ;;
     --model) opt_model="${2:-}"; shift 2 ;;
-    --vendor) opt_vendor="${2:-}"; shift 2 ;;
+    --harness|--vendor) opt_harness="${2:-}"; shift 2 ;;  # --vendor は旧名互換
     --effort) opt_effort="${2:-}"; shift 2 ;;
     --*) echo "SEAT_LAUNCH_ARGS_INVALID: 不明な引数 $1" >&2; usage; exit 1 ;;
     *)
@@ -65,26 +65,26 @@ aiterm_session_id=""
 placement_argv=(--roles "$roles")
 [ -n "$opt_model" ] && placement_argv+=(--model "$opt_model")
 [ -n "$opt_effort" ] && placement_argv+=(--effort "$opt_effort")
-[ -n "$opt_vendor" ] && placement_argv+=(--vendor "$opt_vendor")
+[ -n "$opt_harness" ] && placement_argv+=(--harness "$opt_harness")
 placement=$(node "$placement_helper" "${placement_argv[@]}") || exit "$?"
-IFS=$'\t' read -r model vendor effort role <<EOF
+IFS=$'\t' read -r model harness effort role <<EOF
 $(python3 -c 'import json,sys
 p=json.load(sys.stdin)
 s=p.get("settings") or {}
 roles=",".join(p.get("roles") or [])
-print("\t".join((s.get("model") or "", s.get("vendor") or "", s.get("effort") or "", roles)))' <<<"$placement")
+print("\t".join((s.get("model") or "", s.get("harness") or "", s.get("effort") or "", roles)))' <<<"$placement")
 EOF
-echo "SEAT_PLACEMENT: ${role} → ${vendor} / ${model}${effort:+ / $effort}"
+echo "SEAT_PLACEMENT: ${role} → ${harness} / ${model}${effort:+ / $effort}"
 python3 -c 'import json,sys
 p=json.load(sys.stdin)
 for item in p.get("dropped") or []:
     print("SEAT_PLACEMENT_DROPPED: rank %s %s %s" % (item.get("rank"), item.get("reason"), item.get("cell") or ""), file=sys.stderr)
 ' <<<"$placement" || true
-case "$vendor" in
+case "$harness" in
   claude|codex|grok) ;;
-  *) echo "SEAT_LAUNCH_VENDOR_UNSUPPORTED: vendor=${vendor}" >&2; exit 1 ;;
+  *) echo "SEAT_LAUNCH_HARNESS_UNSUPPORTED: harness=${harness}" >&2; exit 1 ;;
 esac
-if [ "$vendor" = "claude" ] && [ -n "$effort" ]; then
+if [ "$harness" = "claude" ] && [ -n "$effort" ]; then
   case "$effort" in
     low|medium|high|xhigh|max) ;;
     *) echo "unknown effort: ${effort}（claude は low|medium|high|xhigh|max）" >&2; exit 1 ;;
@@ -221,7 +221,7 @@ fi
 # 席を畳む前に測るのが要点である——ここで落ちれば、動いている席を殺さずに済む。
 export PATH="${HOME}/.grok/bin:${PATH}"
 preflight_dir="${TMPDIR:-/tmp}"
-case "$vendor" in
+case "$harness" in
   claude) preflight_cmd=(claude --model "$model" -p "ping") ;;
   codex)  preflight_cmd=(codex exec --model "$model" --skip-git-repo-check "ping") ;;
   grok)
@@ -245,7 +245,7 @@ case "$vendor" in
     echo "grok preflight: GROK_HOME=${grok_home} ${grok_bin} --model ${model} --reasoning-effort ${effort} -p ping"
     preflight_cmd=(env GROK_HOME="$grok_home" "$grok_bin" --model "$model" --reasoning-effort "$effort" -p "ping")
     ;;
-  *) echo "unknown vendor: ${vendor}（claude / codex / grok）" >&2; exit 1 ;;
+  *) echo "unknown harness: ${harness}（claude / codex / grok）" >&2; exit 1 ;;
 esac
 preflight_log=$(mktemp "${TMPDIR:-/tmp}/peertable-preflight.XXXXXX")
 ( cd "$preflight_dir" && "${preflight_cmd[@]}" >"$preflight_log" 2>&1 </dev/null ) &
@@ -264,14 +264,14 @@ while [ $SECONDS -lt $preflight_deadline ]; do
 done
 if [ -z "$preflight_rc" ]; then
   kill "$preflight_pid" 2>/dev/null || true
-  echo "model preflight が 120 秒で返らない: ${vendor} / ${model}（席は立てない）" >&2
+  echo "model preflight が 120 秒で返らない: ${harness} / ${model}（席は立てない）" >&2
   echo "preflight log: ${preflight_log}" >&2
   cat "$preflight_log" >&2 || true
   [ -n "${grok_home:-}" ] && rm -rf "$grok_home"
   exit 1
 fi
 if [ "$preflight_rc" != 0 ]; then
-  echo "model が live で使えない: ${vendor} / ${model}（preflight rc=${preflight_rc}・席は立てない）" >&2
+  echo "model が live で使えない: ${harness} / ${model}（preflight rc=${preflight_rc}・席は立てない）" >&2
   cat "$preflight_log" >&2 || true
   rm -f "$preflight_log"
   [ -n "${grok_home:-}" ] && rm -rf "$grok_home"
@@ -338,7 +338,7 @@ fi
 
 # leave-seat が席専用 GROK_HOME を消す。同名再着席では preflight 後に空になるので、
 # live 起動の直前に auth と ui だけを書き直す（user booth MCP は載せない）。
-if [ "$vendor" = grok ]; then
+if [ "$harness" = grok ]; then
   mkdir -p "$grok_home"
   if [ ! -f "${HOME}/.grok/auth.json" ]; then
     echo "SEAT_GROK_AUTH_MISSING: ${HOME}/.grok/auth.json が無い（席は立てない）" >&2
@@ -359,7 +359,8 @@ launch_env=(
   "PEERTABLE_ROOM=$room"
   "PEERTABLE_MEMBER=$name"
   "PEERTABLE_CREDENTIAL_FILE=$credential_file"
-  "PEERTABLE_VENDOR=$vendor"
+  "PEERTABLE_HARNESS=$harness"
+  "PEERTABLE_VENDOR=$harness"  # 旧版 room client 互換
   "PEERTABLE_MODEL=$model"
   "PEERTABLE_EFFORT=$effort"
   "PEERTABLE_ROLE=$role"
@@ -376,13 +377,13 @@ if [ "$mode" = "lattice" ]; then
   )
   [ -n "$lattice_cli" ] && launch_env+=("LATTICE_CLI=$lattice_cli")
 fi
-if [ "$vendor" = grok ]; then
+if [ "$harness" = grok ]; then
   # 実測 2026-08-21: auth の coding_data_retention_opt_out だけでは
   # `Help improve Grok [Opt out] [Opt in]` バナーが残る。席が死んだように見える。
   launch_env+=("GROK_HOME=$grok_home")
   launch_env+=("GROK_PRIVACY_NOTICE_ROLLOUT=0")
 fi
-if [ "$vendor" = codex ]; then
+if [ "$harness" = codex ]; then
   codex_home="${proj}/.team/seats/${name}.codex"
   mkdir -p "$codex_home"
   if [ -f "${HOME}/.codex/auth.json" ]; then
@@ -391,7 +392,7 @@ if [ "$vendor" = codex ]; then
   fi
   launch_env+=("CODEX_HOME=$codex_home")
 fi
-if [ "$vendor" = codex ] \
+if [ "$harness" = codex ] \
   && ! env -u PEERTABLE_POST_TOKEN "${launch_env[@]}" node "$codex_room_mcp_helper" ensure "$proj" "$peertable_repo"; then
   echo "SEAT_CODEX_ROOM_MCP_INVALID: Codexのproject設定へseat固有room clientを装備できない（席は立てない）" >&2
   exit 1
@@ -399,7 +400,7 @@ fi
 # Aiterm launcherはsession作成後にtyped failureを返すことがある。ここから先は同名memberが
 # 無いことを確認済みなので、launch試行が作ったtmux/memberをon_exitの対象として先に所有する。
 seat_created=true
-launch_receipt=$(env -u PEERTABLE_POST_TOKEN "${launch_env[@]}" node "$aiterm_launch_helper" "$sess" "$vendor" "$model" "$effort" "$proj" "$brief") || {
+launch_receipt=$(env -u PEERTABLE_POST_TOKEN "${launch_env[@]}" node "$aiterm_launch_helper" "$sess" "$harness" "$model" "$effort" "$proj" "$brief") || {
   echo "SEAT_AITERM_LAUNCH_FAILED: ${name} をAiterm公開launcherで起動できない（direct CLI fallbackなし）" >&2
   exit 1
 }
@@ -449,7 +450,7 @@ seat_tmux=$(tmux_at display-message -p -t "$sess" '#{socket_path}')
 # Aiterm管理席の process 起動は公開launch receiptで確定している。旧direct CLI launch向けの
 # ヘッダ/trust dialog待機をここへ重ねると、brief turnでヘッダが画面外へ流れた正常席をrollbackする。
 # 必須room MCPの成立は、次の member登録readbackだけで判定する。
-echo "launched: ${sess}（${vendor} / ${model}${effort:+ / $effort} / room=${room} / mode=${mode}）"
+echo "launched: ${sess}（${harness} / ${model}${effort:+ / $effort} / room=${room} / mode=${mode}）"
 
 # CodexのヘッダはCLIが起動した証拠であって、必須room MCPが初期化された証拠ではない。
 # 無関係MCPのwarningが画面へ出ても、room clientがmember登録まで到達した席だけを着席として扱う。
@@ -484,7 +485,7 @@ while [ $SECONDS -lt "$room_ready_deadline" ]; do
   # Grok Build は初めて開く作業treeで、room MCPを初期化する前にworkspace trustを尋ねる。
   # Peertableが正式に着席させるtreeなので、この既知文言だけを一度通す。未知の確認画面を
   # 汎用的に承認するfallbackにはしない。承認後のMCP初期化時間は改めて30秒確保する。
-  if [ "$vendor" = codex ]; then
+  if [ "$harness" = codex ]; then
     codex_screen=$(tmux_at capture-pane -t "$sess" -p 2>/dev/null || true)
     if pass_codex_pane "$codex_screen"; then
       room_ready_deadline=$((SECONDS + 90))
@@ -508,7 +509,7 @@ while [ $SECONDS -lt "$room_ready_deadline" ]; do
       esac
     fi
   fi
-  if [ "$vendor" = grok ] && [ "$grok_trust_accepted" != true ]; then
+  if [ "$harness" = grok ] && [ "$grok_trust_accepted" != true ]; then
     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?"*)
@@ -524,7 +525,7 @@ while [ $SECONDS -lt "$room_ready_deadline" ]; do
   fi
   # 未信頼ディレクトリでは room MCP 同意より前に workspace trust が出る。既定選択肢
   # （1. Yes, I trust this folder）を Enter で通す。この既知文言だけを一度通す。
-  if [ "$vendor" = claude ] && [ "$claude_trust_accepted" != true ]; then
+  if [ "$harness" = claude ] && [ "$claude_trust_accepted" != true ]; then
     claude_trust_screen=$(tmux_at capture-pane -t "$sess" -p 2>/dev/null || true)
     case "$claude_trust_screen" in
       *"Is this a project you created or one you trust"*|*"trust this folder"*)
@@ -540,7 +541,7 @@ while [ $SECONDS -lt "$room_ready_deadline" ]; do
   fi
   # aiterm claude_agent は --dangerously-skip-permissions を付けない。project の room MCP
   # 同意が member 登録より前に出る。選択肢2（this and all future）だけを通す。
-  if [ "$vendor" = claude ] && [ "$mcp_consent_accepted" != true ]; then
+  if [ "$harness" = claude ] && [ "$mcp_consent_accepted" != true ]; then
     claude_screen=$(tmux_at capture-pane -t "$sess" -p 2>/dev/null || true)
     case "$claude_screen" in
       *"New MCP server found in this project: room"*)
@@ -556,7 +557,7 @@ while [ $SECONDS -lt "$room_ready_deadline" ]; do
   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
-    if [ "$vendor" = codex ]; then
+    if [ "$harness" = codex ]; then
       codex_screen=$(tmux_at capture-pane -t "$sess" -p 2>/dev/null || true)
       if ! codex_pane_blocks_ready "$codex_screen"; then
         sleep 1
@@ -575,7 +576,7 @@ if [ "$room_ready" != true ]; then
   exit 1
 fi
 echo "room ready: ${room}/${name}"
-if [ "$vendor" = codex ]; then
+if [ "$harness" = codex ]; then
   # member 登録後の最初の tool 呼び出しで MCP Allow が出る。出ている間だけ通し、沈黙5秒で抜ける。
   codex_post_ready_deadline=$((SECONDS + 90))
   codex_post_ready_idle=0
@@ -607,7 +608,7 @@ if [ -n "$brief" ] && [ "$brief_dispatched" != true ]; then
   brief_ready=false
   while [ $SECONDS -lt "$brief_ready_deadline" ]; do
     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
+    if [ "$harness" != 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
         brief_ready=true
@@ -691,9 +692,11 @@ if [ -z "$seat_pid" ]; then
   # 記録が無ければ席は attach できず、装置の介入は協調 hold のままになる。**黙らない。**
   echo "seat identity を記録できなかった: ${sess} の process group leader を1つに確定できない（席は着席済み）" >&2
 else
-  ident_body=$(python3 - "$name" "$seat_ident" <<'PY'
+  # aiterm_session_id の書き手はランチャー（launch receipt の所有者）。席の client は
+  # Codex closed-mode env で AITERM_SESSION_ID を受け取れないため、ここで台帳へ載せる。
+  ident_body=$(python3 - "$name" "$seat_ident" "$aiterm_session_id" <<'PY'
 import json, subprocess, sys
-name, ident_raw = sys.argv[1:3]
+name, ident_raw, aiterm_session = sys.argv[1:4]
 ident = json.loads(ident_raw)
 if not ident.get('started_identity') or not ident.get('argv') or not ident.get('argv_digest'):
     sys.exit('pid の lstart/args を観測できない')
@@ -702,6 +705,7 @@ print(json.dumps({
     'pid': int(ident['pid']),
     'started_identity': ident['started_identity'],
     'argv_digest': ident['argv_digest'],
+    'aiterm_session_id': aiterm_session,
     'identity_recorded_at': subprocess.run(['date', '-u', '+%Y-%m-%dT%H:%M:%S.000Z'],
                                            capture_output=True, text=True, check=True).stdout.strip(),
 }, ensure_ascii=False))
@@ -713,7 +717,7 @@ PY
   fi
 fi
 
-# 素性（vendor/model/roles/mission/observe/aiterm ID）の書き手は**席の room client だけ**。
+# 素性（harness/model/roles/mission/observe/aiterm ID）の書き手は**席の room client だけ**。
 # ランチャーはここで台帳を読み返し、実際に載ったかを確認するだけにする（重複書込の禁止）。
 member_row=$(curl -sf "$url/api/$room/members/$(python3 -c 'import sys,urllib.parse;print(urllib.parse.quote(sys.argv[1],safe=""))' "$name")" || true)
 stored=$(python3 - "$member_row" <<'PY'
@@ -727,11 +731,12 @@ print('yes' if m.get('model') and m.get('roles') and m.get('aiterm_session_id')
 PY
 )
 if [ "$stored" = yes ]; then
-  echo "台帳確認: ${vendor} / ${model}${effort:+ / $effort}${role:+ / $role}（素性・本人性とも登録済み）"
+  echo "台帳確認: ${harness} / ${model}${effort:+ / $effort}${role:+ / $role}（素性・本人性とも登録済み）"
 else
   echo "SEAT_LEDGER_INCOMPLETE: 台帳の member 行に素性または本人性が欠けている（席は着席済み。doctor で確認）" >&2
 fi
 
+PEERTABLE_CREDENTIAL_FILE="$credential_file" "$(dirname "$0")/ensure-bridge.sh" "$proj" alarm   || echo "alarm-bridge の起動確認に失敗した（席は着席済み）" >&2
 if PEERTABLE_CREDENTIAL_FILE="$credential_file" "$(dirname "$0")/ensure-bridge.sh" "$proj" seat-status; then
   echo "seat-status-bridge: 起動確認済み"
 else
@@ -740,7 +745,7 @@ fi
 
 # Claude 席の新着は room client の notifications/claude/channel。TUI 配達は channels を持たない
 # Codex / Grok 席だけ。Claude に立てると channel と二重配達になる。
-if [ "$vendor" = codex ] || [ "$vendor" = grok ]; then
+if [ "$harness" = codex ] || [ "$harness" = grok ]; then
   if PEERTABLE_CREDENTIAL_FILE="$credential_file" "$(dirname "$0")/ensure-bridge.sh" "$proj" wakeup; then
     echo "wakeup-bridge: TUI配達 起動確認済み"
   else

package/skill/scripts/parent-join.sh

@@ -1,15 +1,15 @@
 #!/bin/bash
 # 親（ベル等）が room へ着卓する。
-# usage: parent-join.sh <project_dir> [name] [model] [effort] [vendor]
+# usage: parent-join.sh <project_dir> [name] [model] [effort] [harness]
 #   name 既定は bell。broadcast廃止に伴いkickoff投稿は行わない。
-#   model / effort / vendor は任意。親はオーナーの対話セッション（決定40）なので、席と違って
+#   model / effort / harness は任意。親はオーナーの対話セッション（決定40）なので、席と違って
 #   起動時に確定した値を script が知らない——**渡された時だけ**参加者一覧の素性として登録する。
 #   渡さなければ欄ごと出ない（「不明」ではなく「素性を名乗っていない」）。
-#   vendor は claude（既定）、codex、または grok。model だけ渡して vendor を渡さない場合は
+#   harness は claude（既定）、codex、または grok。model だけ渡して harness を渡さない場合は
 #   claude とみなす（後方互換）。
 # 親は MCP を後付けできないので room へは HTTP API 直で入る（決定40 の operating notes）。
 set -e
-proj="$1"; name="${2:-bell}"; model="$3"; effort="$4"; vendor="$5"
+proj="$1"; name="${2:-bell}"; model="$3"; effort="$4"; harness="$5"
 mission=""
 if [ "${6:-}" = "--mission" ]; then mission="${7:-}"; fi
 state="$proj/.team/setup-state.json"
@@ -23,21 +23,22 @@ fi
 
 # 親はAiterm席ではない。Claude/Codex/Grokとも、親自身が所有するparent-watchを配送先にする。
 # tmux observeやCodex thread IDを登録すると、通常席bridge／外部resumeへ誤配送される。
-parent_vendor="$vendor"
-if [ -z "$parent_vendor" ] && [ -n "$model" ]; then
+parent_harness="$harness"
+if [ -z "$parent_harness" ] && [ -n "$model" ]; then
   case "$model" in
-    gpt-*|o[0-9]*) parent_vendor=codex ;;
-    grok*) parent_vendor=grok ;;
-    claude*|opus*|sonnet*|haiku*|fable*) parent_vendor=claude ;;
+    gpt-*|o[0-9]*) parent_harness=codex ;;
+    grok*) parent_harness=grok ;;
+    claude*|opus*|sonnet*|haiku*|fable*) parent_harness=claude ;;
   esac
 fi
-member=$(python3 - "$name" "$model" "$effort" "$parent_vendor" "$mission" <<'PY'
+member=$(python3 - "$name" "$model" "$effort" "$parent_harness" "$mission" <<'PY'
 import json, sys
-name, model, effort, vendor, mission = sys.argv[1:6]
+name, model, effort, harness, mission = sys.argv[1:6]
 # 台帳には canonical 欄だけを登録する（settings / role 単数の重複欄は 2026-08-22 廃止）
 body = {'name': name, 'roles': ['統括']}
-if vendor:
-    body['vendor'] = vendor
+if harness:
+    body['harness'] = harness
+    body['vendor'] = harness  # 旧版 room server 互換
 if model:
     body['model'] = model
 if effort:
@@ -45,7 +46,7 @@ if effort:
 if mission:
     body['mission'] = mission
 body['observe'] = None
-body['delivery'] = {'kind': 'parent_watch', 'host': vendor or ''}
+body['delivery'] = {'kind': 'parent_watch', 'host': harness or ''}
 print(json.dumps(body, ensure_ascii=False))
 PY
 )
@@ -75,11 +76,11 @@ echo "親の権限境界: 各ToDoのクローズは監査担当が行い、親
 
 # parent-watchが初回headを固定する。以後のDMはwatcher不在時間を含め
 # 永続cursorからcatch-upされる。host内のbackground task自体は親セッションだけが所有できる。
-if PEERTABLE_PARENT_HOST="$parent_vendor" node "$here/parent-watch.mjs" "$proj" "$name" --prime; then
-  echo "parent-watch cursor ready: ${name}（host=${parent_vendor}）"
-  if [ "$parent_vendor" = "codex" ]; then
+if PEERTABLE_PARENT_HOST="$parent_harness" node "$here/parent-watch.mjs" "$proj" "$name" --prime; then
+  echo "parent-watch cursor ready: ${name}（host=${parent_harness}）"
+  if [ "$parent_harness" = "codex" ]; then
     echo "PARENT_WATCH_START_REQUIRED: Codex親のbackground taskで1秒ごとに ${here}/codex-parent-watch.sh ${proj} ${name} を都度実行し、空でないstdoutだけを親turnへnotifyすること。background taskはloopを続けるが、Node processや端末sessionは常駐させない"
-  elif [ "$parent_vendor" = "grok" ]; then
+  elif [ "$parent_harness" = "grok" ]; then
     echo "PARENT_WATCH_START_REQUIRED: Grok Monitor（persistent）で ${here}/parent-watch.mjs ${proj} ${name} --follow を1回だけ起動し、通知後も同じMonitorで待機を続けること。通常席用wakeup-bridgeに親を載せない"
   else
     echo "PARENT_WATCH_START_REQUIRED: Claude Monitor（persistent）で ${here}/parent-watch.mjs ${proj} ${name} --follow を1回だけ起動し、通知後も同じMonitorで待機を続けること"

package/skill/scripts/resolve-seat-placement.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-// 02_models.md の役割→1位〜3位から、着席可能な vendor / model / effort を解決する。
+// 02_models.md の役割→1位〜3位から、着席可能な harness / model / effort を解決する。
 // 具体モデル名はここに持たない。台帳と順位表をその場で読む。
 import { existsSync, readFileSync } from 'node:fs'
 import { dirname, join, resolve } from 'node:path'
@@ -7,7 +7,7 @@ import { fileURLToPath } from 'node:url'
 
 const here = dirname(fileURLToPath(import.meta.url))
 const EFFORT = /×\s*(none|low|medium|high|xhigh|max|ultra)/iu
-const vendorOf = (modelName) => {
+const harnessOf = (modelName) => {
   const name = String(modelName).trim()
   if (/^claude\b/iu.test(name)) return 'claude'
   if (/^gpt\b|^gpt-/iu.test(name)) return 'codex'
@@ -62,9 +62,9 @@ export function parseLedger(markdown) {
   return rows.flatMap((row) => {
     const name = row['モデル']
     const slug = slugOf(row['slug'] ?? '')
-    const vendor = vendorOf(name)
-    if (!name || !slug || !vendor) return []
-    return [{ name, slug, vendor }]
+    const harness = harnessOf(name)
+    if (!name || !slug || !harness) return []
+    return [{ name, slug, harness }]
   })
 }
 
@@ -103,7 +103,7 @@ export function listOfficialRoles(markdown) {
     .filter(Boolean)
 }
 
-export function vendorFromSlug(slug) {
+export function harnessFromSlug(slug) {
   const text = String(slug ?? '').trim().toLowerCase()
   if (!text) return null
   if (/^(gpt-|gpt\b|o[0-9])/u.test(text)) return 'codex'
@@ -125,8 +125,8 @@ const parseRoleList = (roles) => {
   return list
 }
 
-export function resolveSeatPlacement(role, markdown, { source = '', vendor = '' } = {}) {
-  const wantVendor = String(vendor ?? '').trim()
+export function resolveSeatPlacement(role, markdown, { source = '', harness = '' } = {}) {
+  const wantHarness = String(harness ?? '').trim()
   const wanted = String(role ?? '').trim()
   if (!wanted) {
     return { error: 'SEAT_ROLE_REQUIRED', message: 'role が空（02_models の役割名が要る）' }
@@ -151,12 +151,12 @@ export function resolveSeatPlacement(role, markdown, { source = '', vendor = ''
       dropped.push({ rank, reason: 'not-in-ledger', cell: parsed.cell })
       continue
     }
-    if (wantVendor && hit.vendor !== wantVendor) {
-      dropped.push({ rank, reason: `vendor-mismatch(want ${wantVendor})`, cell: parsed.cell })
+    if (wantHarness && hit.harness !== wantHarness) {
+      dropped.push({ rank, reason: `harness-mismatch(want ${wantHarness})`, cell: parsed.cell })
       continue
     }
     if (hit.slug === 'haiku') {
-      return { role: wanted, rank, vendor: hit.vendor, model: hit.slug, effort: '', source, dropped }
+      return { role: wanted, rank, harness: hit.harness, model: hit.slug, effort: '', source, dropped }
     }
     if (!parsed.effort) {
       dropped.push({ rank, reason: 'effort-missing', cell: parsed.cell })
@@ -165,7 +165,7 @@ export function resolveSeatPlacement(role, markdown, { source = '', vendor = ''
     return {
       role: wanted,
       rank,
-      vendor: hit.vendor,
+      harness: hit.harness,
       model: hit.slug,
       effort: parsed.effort,
       source,
@@ -174,13 +174,13 @@ export function resolveSeatPlacement(role, markdown, { source = '', vendor = ''
   }
   return {
     error: 'SEAT_PLACEMENT_UNRESOLVABLE',
-    message: `${wanted}${wantVendor ? `（vendor=${wantVendor}）` : ''} を着席可能な vendor/model/effort へ解決できない`,
+    message: `${wanted}${wantHarness ? `（harness=${wantHarness}）` : ''} を着席可能な harness/model/effort へ解決できない`,
     dropped,
   }
 }
 
 export function resolveSeatIdentity({
-  roles, model, effort, vendor, markdown, source = '', allowParentRole = false,
+  roles, model, effort, harness, markdown, source = '', allowParentRole = false,
 } = {}) {
   const roleList = parseRoleList(roles)
   if (roleList.length === 0) {
@@ -204,7 +204,7 @@ export function resolveSeatIdentity({
     return {
       roles: roleList,
       settings: {
-        vendor: String(vendor ?? '').trim(),
+        harness: String(harness ?? '').trim(),
         model: '',
         effort: String(effort ?? '').trim(),
       },
@@ -214,29 +214,29 @@ export function resolveSeatIdentity({
 
   const requestedModel = String(model ?? '').trim()
   const requestedEffort = String(effort ?? '').trim()
-  const requestedVendor = String(vendor ?? '').trim()
+  const requestedHarness = String(harness ?? '').trim()
   if (requestedModel) {
-    const resolvedVendor = requestedVendor || vendorFromSlug(requestedModel)
-      || parseLedger(markdown).find((row) => row.slug === requestedModel)?.vendor
-    if (!resolvedVendor) {
+    const resolvedHarness = requestedHarness || harnessFromSlug(requestedModel)
+      || parseLedger(markdown).find((row) => row.slug === requestedModel)?.harness
+    if (!resolvedHarness) {
       return {
-        error: 'SEAT_VENDOR_UNRESOLVED',
-        message: `model=${requestedModel} の vendor を推定できない（--vendor が要る）`,
+        error: 'SEAT_HARNESS_UNRESOLVED',
+        message: `model=${requestedModel} の harness を推定できない（--harness が要る）`,
       }
     }
     return {
       roles: roleList,
-      settings: { vendor: resolvedVendor, model: requestedModel, effort: requestedEffort },
+      settings: { harness: resolvedHarness, model: requestedModel, effort: requestedEffort },
       source,
     }
   }
 
-  const first = resolveSeatPlacement(roleList[0], markdown, { source, vendor: requestedVendor })
+  const first = resolveSeatPlacement(roleList[0], markdown, { source, harness: requestedHarness })
   if (first.error) return first
   return {
     roles: roleList,
     settings: {
-      vendor: first.vendor,
+      harness: first.harness,
       model: first.model,
       effort: requestedEffort || first.effort || '',
     },
@@ -251,14 +251,15 @@ if (isMain) {
   let roles = ''
   let model = ''
   let effort = ''
-  let vendor = ''
+  let harness = ''
   const positional = []
   for (let i = 0; i < args.length; i += 1) {
     const arg = args[i]
     if (arg === '--roles') { roles = args[++i] ?? ''; continue }
     if (arg === '--model') { model = args[++i] ?? ''; continue }
     if (arg === '--effort') { effort = args[++i] ?? ''; continue }
-    if (arg === '--vendor') { vendor = args[++i] ?? ''; continue }
+    // --vendor は旧名の互換 alias
+    if (arg === '--harness' || arg === '--vendor') { harness = args[++i] ?? ''; continue }
     positional.push(arg)
   }
   if (!roles) roles = positional[0] ?? ''
@@ -270,7 +271,7 @@ if (isMain) {
     fail('SEAT_MODELS_DOC_MISSING', `02_models.md が無い: ${doc}`)
   }
   const result = resolveSeatIdentity({
-    roles, model, effort, vendor, markdown: readFileSync(doc, 'utf8'), source: doc,
+    roles, model, effort, harness, markdown: readFileSync(doc, 'utf8'), source: doc,
   })
   if (result.error) fail(result.error, result.message)
   process.stdout.write(`${JSON.stringify(result)}\n`)

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

@@ -146,6 +146,39 @@ async function serverKeepsStatus() {
   return supportsMemberObservation(await res.json())
 }
 
+// ---- 継続番犬（2026-08-22 オーナー設計）----
+// 「AI は ToDo が終わっていなくてもターンを終えてしまう」への機械保証。busy が一定時間
+// 続いた席が停止宣言（[待機]/[監査提出]等）なしに idle 化したら、継続指示を配達する。
+// 自己DM（席の自己規律）は保険として残るが、継続の保証はこの番犬が持つ。
+// busy 2分未満は情報読取だけの正当な無宣言ターンがあるため起こさない（誤爆の代償は
+// 待機宣言1ターンで、宣言後の episode は declared 判定で再起こしされない）。
+const STOP_DECLARATION = /\[待機\]|\[監査提出\]|待機します|散会/u
+const NUDGE_MIN_BUSY_MS = 120_000
+const nudgedEpisodes = new Map() // name -> busySince（同一エピソード1回だけ）
+async function nudgeIfDropped(name, busySince) {
+  if (!busySince || nudgedEpisodes.get(name) === busySince) return
+  if (Date.now() - Date.parse(busySince) < NUDGE_MIN_BUSY_MS) return
+  nudgedEpisodes.set(name, busySince)
+  let messages
+  try {
+    messages = (await (await fetch(`${url}/api/${encodeURIComponent(room)}/messages`)).json()).messages ?? []
+  } catch { return }
+  const since = Date.parse(busySince)
+  if (messages.some(m => m.from === name && Date.parse(m.ts) >= since && STOP_DECLARATION.test(m.body ?? ''))) return
+  try {
+    const res = await fetch(`${url}/api/${encodeURIComponent(room)}/messages`, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json', ...(token ? { 'X-Peertable-Token': token } : {}) },
+      body: JSON.stringify({ from: 'alarm', to: name,
+        body: '[継続] 停止宣言なしにターンが終了した。未完の作業があれば続行すること。手番が無いなら規約どおり [待機] を宣言してから沈黙すること。' }),
+    })
+    if (!res.ok) throw new Error(`HTTP ${res.status}`)
+    console.error(`seat-status-bridge: 継続番犬が ${name} を起こした（停止宣言なしの busy→idle）`)
+  } catch (e) {
+    console.error(`seat-status-bridge: 継続番犬の起こしに失敗: ${e.message}`)
+  }
+}
+
 const last = new Map()   // name -> { status, at }
 let supported = null     // server が status を保持する版か（未判定は null）
 const tokenBucket = value => value === null ? null : Math.floor(value / 1_000)
@@ -221,6 +254,7 @@ async function tick() {
       await send(name, observation, observedAt)
       last.set(name, { ...observation, at: now })
       sent++
+      if (prev?.status === 'busy' && observation.status === 'idle') await nudgeIfDropped(name, prev.busySince)
       if (changed) console.error(`seat-status-bridge: ${name} → ${observation.status}${prev ? `（${prev.status} から）` : ''}`)
     } catch (e) {
       failed++

package/skill/scripts/seat-usage.mjs

@@ -268,7 +268,7 @@ export function isPaneProcessStopped(panePid, exec = execFileSync) {
 
 /**
  * paneのstatus行が公開しているtoken値だけを読む。
- * vendor固有のログや課金単価は推測せず、表示が無い席はnullのままにする。
+ * harness固有のログや課金単価は推測せず、表示が無い席はnullのままにする。
  */
 export function parsePaneTokenHint(pane) {
   if (typeof pane !== 'string') return null

package/skill/scripts/setup.sh

@@ -119,6 +119,10 @@ else
   cp "$tpl/done.sh" "$tdir/scripts/done.sh" && chmod +x "$tdir/scripts/done.sh"
   cp "$tpl/independence-refresh.sh" "$tdir/scripts/independence-refresh.sh" && chmod +x "$tdir/scripts/independence-refresh.sh"
 fi
+# 目覚まし係の登録口は全モード共通で配る（member.md の待機作法が参照する）
+cp "$repo/skill/scripts/alarm-set.sh" "$tdir/scripts/alarm-set.sh" && chmod +x "$tdir/scripts/alarm-set.sh"
+# member.md が attach 手順で参照する。配り漏れると席が attach できず停止する（実被弾 2026-08-22）
+cp "$repo/skill/scripts/pull-attach-input.mjs" "$tdir/scripts/pull-attach-input.mjs" && chmod +x "$tdir/scripts/pull-attach-input.mjs"
 # room MCP 定義は project root の .mcp.json が正（channels は --mcp-config を解決しない。決定44）
 added_root_mcp=false
 if [ -f "$proj/.mcp.json" ]; then
@@ -197,6 +201,7 @@ printf '{"room":"%s","server_url":"%s","public_url":"%s","mode":"%s","plan_key":
 # 4時間 HTTP 403 を撃ち続け、参加者一覧には点が1つも出なかった＝起こしていないのと見分けがつかない）。
 # AI は使わず席へも1バイト送らないので卓の作業を邪魔しない。**書けない時は常駐せずに死ぬ**ので、
 # ここで壊れた常駐が黙って残ることは無い。setup-state.json を読むので、必ずその後で起こす。
+"$repo/skill/scripts/ensure-bridge.sh" "$proj" alarm || echo "alarm-bridge の起動確認に失敗した（席は使える・目覚まし係だけ後で ensure-bridge.sh で立てる）" >&2
 if "$repo/skill/scripts/ensure-bridge.sh" "$proj" seat-status; then
   echo "seat-status-bridge: ready_at を確認した（ログ $tdir/seat-status-bridge.log・停止は teardown が行う）"
 else