chore(release): bump framework and 8 skills to v4.0.0 (MAJOR — cline removal & hermes modernization)

- Bump MAM_VERSION to 4.0.0 in lib.sh - Bump all 8 skill frontmatter versions to 4.0.0 in 3-way lockstep - Update VERSIONS.md with v4.0.0 changelog, migration guide (B-1..B-5), and skill matrix - Archive multi-agent version upgrade consensus and peer review reports (439 passed, 0 failures)
feat(agent): deprecate and completely remove cline agent support
2026-08-28 23:31:31 +09:00 · 2026-08-28 22:38:48 +09:00 · 2026-08-28 20:18:40 +09:00 · 2026-08-28 20:17:04 +09:00 · 2026-08-28 18:25:14 +09:00 · 2026-08-28 15:21:10 +09:00
69 changed files with 4706 additions and 557 deletions
@@ -0,0 +1,170 @@
 # 🧭 Agent Backend Evaluation — Local LLM (Ollama / GLM-5.2) CLI Integration
 - **Planner**: `planner-reviewer-claude-01`
 - **Job ID**: `50c8456e` (Rev.1) → refined under `8aee5fdb` (Rev.2)
 - **Scope**: Evaluate `hermes`, `pi`, and `opencode` as candidates for official Multi-Agent Mux (MAM) integration, specifically to support a **local LLM backend** (Ollama-hosted, target model **GLM-5.2**).
 - **Status**: Rev.2 — refined per `creator-agy-01`'s architectural challenge (job `f98023cb`). Still pending a live `[VERDICT: PASS]` before adapter implementation begins (see §6).
 ---
 ## 0. Changelog — Rev.2 (response to `creator-agy-01` challenge)
 `creator-agy-01` filed a formal architectural challenge against Rev.1 (full text preserved in `.mam/jobs/8aee5fdb/brief.md`), raising four points. **All four are accepted as valid — no `[REBUT:]` is filed.** Each is grounded in evidence already present in this repo (the permission-bypass flags actually shipped in `claude.py`/`agy.py`/`grok.py`, and the Session ID Lifecycle protocol in `MULTI_AGENT_RULES.md` §2) or in well-established Ollama operational behavior, and Rev.1 did not address any of them. Changes made:
 | # | Challenge | Disposition | Where addressed in Rev.2 |
 |---|---|---|---|
 | 1 | Unverified unattended permission-bypass flag for OpenCode | **Accepted** | New §3.2 "Unattended Execution Compatibility" subsection; new Phase 0 checklist item; new comparison-matrix row |
 | 2 | Unverified `--session-id` pre-assignment support for OpenCode (breaks P0 assigned-UUID protocol → `C-ambiguous` risk) | **Accepted** | New §3.2 subsection; new adapter-contract fallback requirement in Phase 2 §8; new comparison-matrix row |
 | 3 | Ollama default `num_ctx: 2048` causes tool-call/context truncation unless raised (~32768) | **Accepted** | New §4.3; new Phase 0/1 documentation deliverable |
 | 4 | Local-inference cold-start/latency vs. MAM's 120s `idle_timeout_sec` watchdog | **Accepted** | New §4.4; new Phase 0/1 config recommendation (`MAM_IDLE_TIMEOUT` relaxation) |
 Net effect: OpenCode's status is downgraded from "Low-Medium, well-precedented" to **"Low-Medium, contingent on two unverified CLI capabilities that must be confirmed before adapter work starts"** — this changes the Phase 0 gate from optional-best-practice to **hard blocking prerequisite** for Phase 2.
 ---
 ## 1. Executive Summary & Recommendation
 **Recommended path: two-track rollout, OpenCode as primary target, Hermes as immediate interim path, `pi` deferred pending scope clarification.**
 | Rank | Candidate | Verdict | Rationale (1 line) |
 |---|---|---|---|
 | 1 | **OpenCode** | ✅ **Primary integration target** | Purpose-built multi-provider harness with first-class local-model/Ollama support and a provider-agnostic tool-calling layer — best long-term fit for GLM-5.2 stability. |
 | 2 | **Hermes** | ✅ **Interim / parallel-track** | Adapter already exists in MAM (`hermes.py`, registered) with **zero net-new integration cost**; `auth_ok()` has no hard-coded SaaS credential gate, which is favorable for pointing it at a local endpoint — but its tool-calling behavior against GLM-5.2 via Ollama is unverified and must be smoke-tested before it's trusted for unattended Creator/Reviewer roles. |
 | 3 | **`pi`** | ⚠️ **Insufficient information — do not integrate yet** | No adapter, no roadmap mention, and no reliable architectural grounding was found in this repo or in prior MAM reports. See §4.3 and §7 for what must be clarified before this candidate can be scored. |
 This is a **Planner-level architectural recommendation**, not a unilateral final decision — per `MULTI_AGENT_RULES.md` §3, it should be routed to the currently running Reviewer/Creator sessions (`reviewer-creator-grok-01`, `creator-agy-01`) for a `[VERDICT: PASS]` / `[VERDICT: NOT PASS]` pass before any adapter code is written. See §6.
 ---
 ## 2. Evaluation Criteria
 Weighted against MAM's existing 5-layer adapter contract (`BaseAgentAdapter`, see `new_agent_types_roadmap.md` §2–3) and the stated goal (local LLM support):
 1. **Local-model / Ollama compatibility** — Can the CLI point at a local OpenAI-compatible or native Ollama endpoint without vendor lock-in?
 2. **Tool-calling stability** — Does the CLI enforce its own structured function-calling schema/validation layer independent of the backing model, or does it trust raw model output? This matters more for GLM-5.2 than for frontier hosted models, since open-weight tool-calling adherence varies by quantization/serving stack.
 3. **MAM adapter-contract fit** — Session artifact format, `ready_tokens` predictability, auth model, resume/purge semantics (i.e., cost to implement `BaseAgentAdapter`).
 4. **Integration cost** — Net-new engineering effort across the 5 layers (adapter, registry, `lib.sh` dispatch, herdr kind support, tests).
 5. **Operational maturity** — Update cadence, community/maintainer signal, TUI stability under herdr's raw-terminal automation (`send_keys_safe`).
 ---
 ## 3. Candidate Profiles
 ### 3.1 Hermes — *already integrated at Tier 1*
 - **Repo evidence**: `.agents/skills/lib_py/agents/adapters/hermes.py` exists and is registered in `registry.py`. This is the only one of the three candidates with a working, tested MAM adapter today.
 - **Session storage**: SQLite (`~/.hermes/state.db`, `sessions`/`messages` tables) keyed by `cwd` — more robust than flat-file JSON candidates (grok, opencode) for concurrent-workspace disambiguation, and purge semantics are already implemented (`purge_artifacts` deletes both the on-disk JSON and DB rows).
 - **Auth model**: `auth_ok()` unconditionally returns `True` — there is no hard-coded credential/token-file check the way `grok.py` checks `~/.grok/auth.json` or `XAI_API_KEY`. This is a **positive signal** for local-LLM use: it implies Hermes's own config (outside MAM's purview) is what selects the backend, so pointing it at an Ollama endpoint hosting GLM-5.2 should not trip any MAM-level auth gate.
 - **Readiness detection**: `ready_tokens = 'Hermes'` — a single, simple banner token. Low risk of TUI-readiness false-negatives, but also under-specified compared to grok's multi-token pattern (`'Grok|xAI|Assistant|❯|>>>'`); should be hardened if Hermes's banner changes across backend configurations (e.g., does it print the active model name?).
 - **Gap**: Nothing in the adapter or this repo verifies **which** backend/model Hermes is actually running against at spawn time. `spawn_spec()` takes no model/backend argument — model selection is presumably out-of-band (Hermes's own config file/env). This must be confirmed empirically, not assumed.
 - **Integration cost**: **Zero** (already done). Remaining cost is *validation*, not *engineering*.
 ### 3.2 OpenCode — *roadmapped, not yet implemented*
 - **Repo evidence**: Appears only in `new_agent_types_roadmap.md` §4 as a **Tier 1 (Low)** complexity candidate (~0.5 day estimated effort), session storage as JSON files under `~/.opencode/sessions/`, proposed `ready_tokens: 'OpenCode|Chat|Welcome'`.
 - **Ecosystem knowledge**: OpenCode is designed from the ground up as a **provider-agnostic** terminal coding agent — its core value proposition (distinct from single-vendor CLIs like Claude Code) is a pluggable model-provider layer that explicitly supports local/self-hosted backends (Ollama, LM Studio, and any OpenAI-compatible endpoint) alongside hosted providers, with per-project/per-agent model configuration.
 - **Tool-calling stability**: Because OpenCode's edit/bash/read tool surface is enforced by its own harness rather than assumed from the model, it is materially more resilient to a local model's imperfect native function-calling than a thin CLI that passes tool schemas straight through to the model API. This is the strongest differentiator in GLM-5.2's favor, since open-weight tool-calling reliability is known to vary by quantization and serving backend (Ollama's tool-calling support itself is still evolving).
 - **Gap**: Requires **net-new** engineering across all 5 layers per the roadmap blueprint (adapter class, registry entry, `lib.sh` kind mapping + binary-name recognition, herdr `--kind` compatibility check, contract + lifecycle tests). Estimated ~0.5–1.5 days per the existing complexity matrix, consistent with grok's actual delivered effort (grok is now fully integrated, confirming the roadmap's Tier 1 estimates are realistic).
 - **Integration cost**: **Low-Medium**, well-precedented — the grok adapter (`grok.py`, fully shipped) is a directly reusable template (glob-based session discovery, JSONL artifact verification, `permission-mode`-style CLI flags). **Revised in Rev.2: this cost estimate is now contingent on the two verification gates below.**
 - **⚠️ Unattended Execution Compatibility (new in Rev.2, per `creator-agy-01` challenge §2.1)**: MAM's herdr-background execution model requires the target CLI to run with **zero interactive confirmation prompts** — every existing adapter enforces this by construction: `claude.py`/`agy.py` force `--dangerously-skip-permissions`, `grok.py` forces `--permission-mode bypassPermissions`. **Rev.1 did not verify that OpenCode ships an equivalent flag** (e.g. `--auto-approve`, `--yes`, a `--permission-mode` analog). If it doesn't, the first bash/file-edit tool call will emit an interactive `[y/N]`-style prompt that blocks on stdin inside a headless herdr pane — `send_keys_safe` cannot answer a prompt it wasn't told to expect, and the job stalls until `idle_timeout_sec` (120s default) force-kills it. **This is now a hard go/no-go gate, not a nice-to-have**: OpenCode cannot be adapted for Creator/Reviewer roles at all if no such flag exists, regardless of its tool-calling or local-model strengths.
 - **⚠️ Session-ID Pre-Assignment Compatibility (new in Rev.2, per `creator-agy-01` challenge §2.2)**: `MULTI_AGENT_RULES.md` §2 requires new sessions to receive an externally-generated UUID at spawn time (`--session-id <uuid>`, recorded as `session_id_source: assigned`) specifically to prevent `C-ambiguous` race conditions when multiple sessions of the same agent type are created concurrently in one workspace. **Rev.1's proposed `spawn_spec()` (mirroring grok's `--session-id {session_uuid}` pattern) assumed OpenCode accepts an externally-supplied session ID without checking it.** If OpenCode instead only generates its own internal session identifier (e.g., a hash or timestamp-derived directory name under `~/.opencode/sessions/`), the P0 pre-assignment protocol cannot be used, and `discover()` must fall back to timestamp/PID/cwd-based matching — which is exactly the race-prone pattern §2 of `MULTI_AGENT_RULES.md` was designed to eliminate. Rev.2's Phase 2 plan (§8) now specifies the required fallback contract for this case.
 ### 3.3 `pi` — *unresolved candidate, insufficient grounding*
 - **Repo evidence**: **None.** No adapter, no mention in `new_agent_types_roadmap.md`'s candidate list (`codex`, `grok-build`, `opencode`, `kimi`, `cursor`), no reference anywhere under `.agents/` or `.mam/` prior to this job's own brief.
 - **Ambiguity risk**: "pi" is a generic, collision-prone identifier — it could refer to several unrelated products (a lightweight personal-assistant chat CLI, an internal/codenamed tool, or a coding-agent CLI not yet in this evaluator's confirmed knowledge). Fabricating an architecture/auth/session-format profile for it would produce a plausible-sounding but unverifiable comparison, which is worse than flagging the gap — a wrong `ready_tokens` regex or session-artifact assumption baked into a plan would silently break `wait_for_tui_ready()` and session discovery at implementation time.
 - **Recommendation**: **Do not score `pi` in this pass.** Before it can be evaluated on equal footing with Hermes/OpenCode, the requester must confirm: (a) the exact binary/package name and install source, (b) whether it exposes a scriptable non-interactive mode or only a raw TUI, (c) its session/transcript storage format, and (d) whether it supports pointing at an arbitrary OpenAI-compatible/Ollama endpoint at all. See §7 open questions.
 ---
 ## 4. Tool-Calling Stability Against GLM-5.2 (Ollama)
 Regardless of which CLI is chosen, two risks are backend-specific (not MAM-specific) and apply to whichever candidate is selected:
 1. **Function-calling schema adherence**: GLM-family models served through Ollama depend on the Modelfile's chat template correctly implementing tool-call token formatting. A CLI that validates/repairs malformed tool-call JSON client-side (OpenCode's model) degrades more gracefully than one that trusts raw output (unverified for Hermes; unknown for `pi`).
 2. **Context window / quantization tradeoffs**: Local GGUF/Ollama-served quantizations of GLM-5.2 may have reduced effective context vs. the reference weights, which stresses MAM's existing long-running-session assumptions (`idle_timeout_sec`, `SUB_IDLE_TIMEOUT` in `MULTI_AGENT_RULES.md` §4). This should be smoke-tested with a real multi-turn MAM job before either candidate is trusted for unattended Creator work.
 **Action item**: before committing engineering time to OpenCode's adapter, run a manual (non-MAM) smoke test of both Hermes-against-Ollama-GLM-5.2 and OpenCode-against-Ollama-GLM-5.2 on a representative multi-file edit task, and record actual tool-call success/repair rates. This evaluation is architectural; it cannot substitute for an empirical tool-calling benchmark.
 ### 4.3 Ollama Default Context Window (new in Rev.2, per `creator-agy-01` challenge §3.1)
 Ollama's default `num_ctx` is **2048 tokens** unless explicitly overridden. MAM's job briefs, `README.md`/`MULTI_AGENT_RULES.md` reference material injected into agent context, and especially multi-turn tool-calling exchanges routinely exceed this — well below the 8k–32k range typical agentic coding workloads need. Left at the default, this produces **silent early context truncation**, which surfaces as malformed or dropped tool calls that look like a model-quality problem but are actually a serving-configuration problem. This is not specific to OpenCode or Hermes; it applies to **any** CLI pointed at an Ollama-served GLM-5.2. **Requirement**: the Modelfile (or per-request client parameter, if the CLI exposes one) must explicitly set `PARAMETER num_ctx 32768` (or the CLI's equivalent override) before any tool-calling stability conclusions from the Phase 0 smoke test can be trusted — a smoke test run against the 2048-token default would understate both candidates' true tool-calling reliability.
 ### 4.4 Local Inference Latency vs. MAM Watchdog Timeouts (new in Rev.2, per `creator-agy-01` challenge §3.2)
 Local GLM-5.2 inference (VRAM load + generation) can plausibly take 30–60s to first token and run at single-digit-to-low-teens tokens/sec, versus the sub-second-to-few-second response latency MAM's timeout defaults were tuned against for hosted-API backends. `lib.sh::wait_for_tui_ready` and the default `idle_timeout_sec` (120s per `MULTI_AGENT_RULES.md` §4) risk false-positive stalls/kills against a working-but-slow local backend, which would misclassify healthy local inference as a hung job. **Requirement**: any local-LLM-backed session (Hermes or OpenCode) must run under a relaxed idle timeout — the challenge suggests `MAM_IDLE_TIMEOUT=300` as a starting point — set via job-level `idle_timeout_sec` override or a documented `.mam.env` convention specifically for local backends, not the global default (which should stay tuned for hosted-API sessions to avoid masking genuinely hung jobs elsewhere).
 ---
 ## 5. Comparison Matrix
 | Criterion | Hermes | OpenCode | `pi` |
 |---|---|---|---|
 | MAM adapter status | ✅ Shipped | ❌ Roadmapped only | ❌ None |
 | Local/Ollama support | Likely (out-of-band config, unverified) | ✅ Native, first-class | Unknown |
 | Tool-calling validation layer | Unknown / unverified | ✅ Harness-enforced | Unknown |
 | Session storage | SQLite (`state.db`) | JSON files | Unknown |
 | Auth gate in MAM | None (`auth_ok` always `True`) | N/A (not yet implemented) | Unknown |
 | Unattended permission-bypass flag confirmed | ⚠️ Not yet verified (needs Phase 0) | ⚠️ **Not yet verified — hard gate (Rev.2)** | Unknown |
 | External `--session-id` acceptance confirmed | N/A (adapter already ships without it, uses discovery) | ⚠️ **Not yet verified — hard gate (Rev.2)** | Unknown |
 | Integration cost | **Zero** (done) | Low-Medium (~0.5–1.5 days, **contingent on above two gates — Rev.2**) | Cannot estimate |
 | Confidence in this evaluation | Medium (grounded in repo code) | Medium-High (grounded in repo roadmap + ecosystem knowledge) | **Low** (no grounding) |
 ---
 ## 6. Team Consensus Process Note
 Per `MULTI_AGENT_RULES.md` §3, a Planner recommendation is not a final decision — it is meant to be routed through the Developer/Reviewer objection loop. At the time of writing, `.mam/agent-sessions.yaml` shows two other live sessions in this workspace:
 - `reviewer-creator-grok-01` (role: `reviewer,creator`)
 - `creator-agy-01` (role: `creator`; registry shows a stale `resume dry-run failed` status — its live availability should be re-confirmed by the General Manager before delegating a review job to it)
 Rev.1 was produced by the Planner alone (no live cross-session review round-trip was executed as part of job `50c8456e`). **Update (Rev.2)**: that gap was subsequently closed — `creator-agy-01` did review Rev.1 and filed a formal architectural challenge (job `f98023cb`), which this Rev.2 fully incorporates (see §0). No `[REBUT:]` was needed since every point was valid. **Remaining next step**: this Rev.2 still needs an explicit `[VERDICT: PASS]` / `[VERDICT: NOT PASS]` from a Reviewer session (`reviewer-creator-grok-01`, and `creator-agy-01` re-reviewing its own incorporated feedback) before Phase 2 adapter implementation work begins — consistent with the standard Workflow Loop and the Rebuttal & Adjudication Protocol in `MULTI_AGENT_RULES.md` §3/§3.1.
 ---
 ## 7. Open Questions (block full consensus until resolved)
 1. What exactly is `pi` — binary name, source, and whether it supports non-interactive/scriptable invocation compatible with herdr's `send_keys_safe` automation?
 2. Is GLM-5.2 to be served via Ollama's native tool-calling API or an OpenAI-compatible shim? This affects which CLIs are even eligible (some CLIs only support OpenAI-schema tool calls).
 3. Does Hermes actually expose a way to target a specific Ollama model/endpoint (env var, config file, CLI flag)? This repo's adapter is silent on model selection — needs to be confirmed against Hermes's own docs/CLI help, not assumed.
 4. What quantization/context-length of GLM-5.2 will be locally hosted? This determines whether the empirical smoke test in §4 is representative of production behavior.
 5. **(New, Rev.2)** Does OpenCode CLI expose a documented non-interactive/auto-approve flag equivalent to `claude`'s `--dangerously-skip-permissions` or `grok`'s `--permission-mode bypassPermissions`? **Blocking** — see §3.2.
 6. **(New, Rev.2)** Does OpenCode CLI accept an externally-generated session UUID at spawn time (`--session-id`-style), or only self-assign session identifiers? **Blocking** — determines whether P0 pre-assignment or a PID/cwd-based `discover()` fallback must be used. See §3.2.
 ---
 ## 8. Integration Roadmap (pending consensus sign-off)
 **Phase 0 (immediate, no code — expanded in Rev.2, now the hard gate before Phase 2)**: Manual smoke test — run Hermes and OpenCode (standalone, outside MAM) against the target Ollama/GLM-5.2 endpoint (served with `num_ctx 32768`, per §4.3) on a representative multi-file coding task. Record:
 1. Tool-call success rate and malformed-call repair behavior, and session banner/readiness output for adapter tuning (Rev.1 scope).
 2. **(Rev.2)** Whether each CLI can complete the task with **zero interactive confirmation prompts** using a documented flag — this determines OpenCode's Phase 2 eligibility outright (§3.2).
 3. **(Rev.2)** Whether OpenCode accepts an externally-supplied `--session-id`-equivalent, or only self-assigns — this determines whether Phase 2 step 1 below uses the P0 pre-assignment pattern or the PID/cwd-based `discover()` fallback (§3.2).
 4. **(Rev.2)** Observed time-to-first-token and end-to-end task latency, to calibrate the `idle_timeout_sec` override in Phase 1/2 (§4.4).
 **Phase 1 (Hermes validation track, ~0 eng. days)**: No adapter work needed. Confirm Hermes's model-selection mechanism (open question #3) and, if satisfactory, promote it from "Tier 1 present but unvalidated" to "MAM-supported local-LLM backend" in `.mam.env.example` documentation. **(Rev.2)** Document the required Ollama `num_ctx 32768` Modelfile setting and the recommended local-backend `idle_timeout_sec`/`MAM_IDLE_TIMEOUT` override (starting point: 300s, to be tuned against actual Phase 0 latency data) in the same documentation pass — for both Hermes and (if greenlit) OpenCode.
 **Phase 2 (OpenCode adapter track, ~0.5–1.5 eng. days, grok.py as template) — gated on Phase 0 items 2–3 passing**:
 1. `.agents/skills/lib_py/agents/adapters/opencode.py` — implement `OpenCodeAgentAdapter(BaseAgentAdapter)` per the Step 1 contract in `new_agent_types_roadmap.md`. `spawn_spec()`/`resume_spec()` must include the confirmed unattended-execution flag (§3.2) unconditionally, matching the `claude.py`/`agy.py`/`grok.py` pattern.
 2. **(Rev.2)** If Phase 0 confirms OpenCode accepts an external session UUID: use the standard `--session-id {session_uuid}` pattern (as Rev.1 assumed). **If not**: `discover()` must implement a strict cwd + process-liveness (PID/`lstart`) matching rule — analogous to the "Identity Verification" guard already used elsewhere in this framework (`MULTI_AGENT_RULES.md` §4) — to avoid `C-ambiguous` collisions between concurrently-spawned OpenCode sessions in the same workspace. This fallback must be explicitly covered by a `C-ambiguous`-scenario unit test (new test, not in Rev.1's plan).
 3. `.agents/skills/lib_py/agents/registry.py` — import + register `'opencode': OpenCodeAgentAdapter()`.
 4. `lib.sh` — herdr kind mapping (`*-creator-opencode|*-planner-opencode|*-reviewer-opencode`), binary-name recognition tuple, `send_keys_safe` input-region delimiters.
 5. Confirm `herdr agent start --kind opencode` compatibility (or fall back to `--kind generic`).
 6. `tests/test_a4_adapter_contract.py` + `tests/test_tier1_unit.py` — registry, property-contract, and lifecycle coverage, mirroring the grok adapter's test additions, **plus (Rev.2)** the `C-ambiguous` fallback test from step 2 if applicable.
 7. Update the 8 skill `SKILL.md` files' supported-agent lists (same set enumerated in `plan-b8872c34.md` §2.3 for the grok rollout), **plus (Rev.2)** the `num_ctx`/`MAM_IDLE_TIMEOUT` local-backend prerequisites in `BOOTSTRAP.md`/`.mam.env.example`.
 **Phase 3 (defer)**: Revisit `pi` only after Open Questions §7.1 is answered by the requester; do not schedule engineering time against it in this cycle.
 ---
 ## 9. Definition of Done
 - [ ] Phase 0 smoke-test results recorded (tool-call success rate for Hermes and OpenCode against GLM-5.2/Ollama, run with `num_ctx 32768`).
 - [ ] **(Rev.2)** Phase 0 confirms (or rules out) an unattended/no-prompt execution flag for OpenCode.
 - [ ] **(Rev.2)** Phase 0 confirms (or rules out) external `--session-id` acceptance for OpenCode; `discover()` fallback design selected accordingly.
 - [ ] **(Rev.2)** Local-backend `idle_timeout_sec`/`MAM_IDLE_TIMEOUT` override value chosen from observed Phase 0 latency data and documented.
 - [ ] This document (Rev.2) reviewed by at least one live Reviewer session with an explicit `[VERDICT: PASS]`.
 - [ ] `pi` open questions resolved or candidate formally dropped from scope.
 - [ ] If OpenCode is greenlit: `OpenCodeAgentAdapter` passes all contract tests, including the `C-ambiguous` fallback test if applicable; `pytest tests/` shows 0 regressions.
@@ -0,0 +1,109 @@
 # 🏛️ Consensus Opinion — Should `cline` Agent Support Be Removed?
 - **Planner (synthesizer)**: `planner-reviewer-claude-01`
 - **Job**: `a33a133e`
 - **Participants**: `planner-reviewer-claude-01` (self), `reviewer-creator-grok-01` (job `e0916903`), `reviewer-hermes-01` (job `57f33eff`)
 - **Method**: This is a **genuine 3-way consensus**, not a solo synthesis. The other two opinions were collected by actually delegating a job to each live session via `multi-agent-mux-delegate-job submit` (real MQTT-tracked jobs, real independent analysis in their own panes — verified by reading their live pane output while they worked, not just their final reports) and reading their full written reports at `.mam/jobs/e0916903/grok-reports/report-final.md` and `.mam/jobs/57f33eff/hermes-reports/report-final.md`. No skill/framework code was modified by any participant.
 - **Status**: Rev.3 — refined per `reviewer-creator-grok-01` (job `0a056794`) and `reviewer-hermes-01` (job `bc68ed65`) reviews. Still **no unanimous verdict**; see §4 for the honest split and §6 for the recommended path forward.
 ---
 ## 0. Changelog
 ### Rev.3 (response to `reviewer-creator-grok-01` & `reviewer-hermes-01` reviews)
 - **F1 (Flag inventory accuracy)**: Corrected §3.2 and §6.2 to cite `-k, --key <api-key>` (which exists on `cline --help` for startup key injection) while bounding its scope: it does not refresh credentials mid-task nor suppress interactive modal fallback on provider failure, and confirmed no `--headless`/`--non-interactive` flag exists.
 - **F2 (drift-C modernization status)**: Corrected §2 point 3 and §6.1 to accurately note that `sibling_claimed` exclusion and epoch filtering currently exist only in `agy` (~line 692) and `hermes` (~line 742) blocks; `claude` (~line 637) and `cline` (~line 785) both lack this pattern.
 - **F3 (Consensus attribution)**: Clarified §2 point 3 and §6.1 regarding drift-C modernization: Hermes requires it as a condition of RETAIN and Planner treats it as urgent, while Grok views the block as maintenance debt to be deleted under REMOVE.
 ### Rev.2 (response to `creator-agy-01` challenge)
 - §3.1 rewritten: risk escalated from "narrow spawn-time race" to "unmonitored mid-task modal-fallback window," with the verification trail (what's confirmed vs. inferred) laid out explicitly.
 - §3.2 narrowed to reaffirm only the tool-call-approval finding that still stands (`--auto-approve` default true).
 - New §3.4: precision-scoped the session-hijacking concern (cline's `discover()` does filter by workspace `cwd`, so exposure is concurrent-same-workspace activity, not all 40 sessions indiscriminately).
 - §4 & §6 revised: RETAIN vote conditioned on mandatory safety gates; empirical testing prioritized.
 ---
 ## 1. Individual Verdicts
 | Reviewer | Verdict | One-line reasoning |
 |---|---|---|
 | `reviewer-creator-grok-01` | **REMOVE** | cline fails two hard contracts every other shipped adapter now meets (unattended execution, assignable session identity); its reviewer niche is already filled by hermes in this live workspace. |
 | `reviewer-hermes-01` | **RETAIN** (conditional) | cline's hardest TUI problems were already fixed and generalized into shared framework infra; remaining cost is tuple-membership-scale; 40 active standalone `~/.cline/data/sessions` folders show sustained real usage outside MAM. |
 | `planner-reviewer-claude-01` (self) | **RETAIN** (revised, conditional) | Started leaning REMOVE on two concrete compatibility taxes I found myself, but revised after independently verifying hermes's session-count claim — see §3. |
 **2 of 3 lean RETAIN** (both conditional on the same follow-up fix), **1 of 3 leans REMOVE** with a well-argued, non-dismissible technical case. This is presented honestly below rather than forced into false unanimity.
 ---
 ## 2. Where All Three Reports Fully Agree (cross-verified independently, not just asserted)
 These points appeared in at least two of the three independent analyses and I re-verified each against the live repo/environment myself before including them here:
 1. **The Node.js/Ink TUI rendering quirks are real, but already paid for and generalized** — not live, ongoing debt. Specifically:
   - `lib.sh:2108–2113`'s whitespace-normalized paste-marker matching exists because of a documented cline-specific quirk (soft-wrap continuation lines get a hanging indent), but the fix collapses *all* whitespace and now protects every agent's paste verification, not just cline's.
   - The "skip strict paste check" exemption list (`lib.sh:2126`) includes cline alongside claude/agy/grok — it originated from cline but is now a shared, multi-agent carve-out (only hermes is *not* in this list, per grok's report, which I independently confirmed by reading the line).
 2. **`modal_tokens` is not cline-exclusive baggage.** `claude.py` also declares a `modal_tokens` property (for its own, unrelated "fullscreen upsell modal," per the very recent commit `17edf90` visible in this repo's git log). I confirmed this via `grep -n "modal_tokens" .agents/skills/lib_py/agents/adapters/*.py` — only `claude.py` and `cline.py` override it. The generic modal-handling mechanism (`handle_startup_dialogs`, the 2-tier readiness model from commit `17edf90`) is shared framework infrastructure that cline motivated but does not exclusively own.
 3. **`reconcile.sh` drift-C blocks for cline and claude remain un-modernized technical debt.** Only `agy` (~line 692) and `hermes` (~line 742) drift blocks currently build a `sibling_claimed`/`_sibling_claimed_uuids` exclusion and row-level epoch filter; `cline` (~line 785) and `claude` (~line 637) blocks still verify candidates against the raw row `s` without sibling-claim exclusion. Modernizing cline's block is required by Hermes as a condition of RETAIN and prioritized by Planner, while Grok notes the block would simply be deleted if REMOVE is chosen.
 4. **No cline session is currently running** in `.mam/agent-sessions.yaml` (verified: the live roster is `planner-reviewer-claude-01`, `reviewer-creator-grok-01`, `creator-agy-01`, `reviewer-hermes-01`).
 5. **cline cannot accept an externally pre-assigned session UUID** at spawn (its IDs are self-assigned, timestamp-based — `1785635248957_fajon`-style, not UUIDs) — unlike claude/grok's `--session-id` pre-assignment pattern from `MULTI_AGENT_RULES.md` §2. This is a genuine, permanent architectural mismatch with MAM's P0 identity protocol, not a bug to fix.
 6. **Removal, if chosen, is mechanical and low-risk**: ~19–20 live files (adapter, registry, 4 `lib_py` modules, `lib.sh`, 8–9 skill scripts, 5–7 `SKILL.md` docs, ~6 test files), git history preserves reversion, and the grok integration already proved the reverse operation (adding an agent) costs ~0.5–1.5 days — so re-adding cline later, if ever needed, is a known, bounded cost. **Historical `.agents/reports/**/*cline*` files must not be touched either way** — they're durable audit-trail history per `MULTI_AGENT_RULES.md` §4, not live framework surface.
 ---
 ## 3. Where the Reports Diverge — the Actual Crux, and a Factual Correction
 ### 3.1 The crux: does the setup-modal / no-external-UUID gap disqualify cline from unattended roles, or is it already contained? (Rev.2: revised, risk escalated)
 **Rev.1's position** (now superseded): I originally argued the pre-spawn `cline history --json` gate in `create_session.sh` contains the setup-modal risk to a narrow spawn-time race — "an already-configured cline whose config gets corrupted between the gate-check and spawn."
 **Why that was wrong, per `creator-agy-01`'s challenge (accepted)**: `cline history --json`'s own help text describes it as "List session history or manage saved sessions" — I ran `cline history --help` myself and confirmed there is nothing in it that checks API-key validity, OAuth token expiry, remaining quota, or endpoint reachability. It only proves local session storage is readable. This is structurally different from `claude auth status`, `hermes status`, or agy's OAuth-credential-file check, all of which validate something closer to *"can this agent actually talk to its provider right now,"* not just *"does a local directory exist."* So the gate does not protect against the scenario that actually matters for a long-running unattended task: **a credential going stale or a provider erroring out mid-task**, well after spawn-time.
 **The escalated risk model** (accepted as the working assumption): during autonomous multi-step work, a 401 (expired token), 429 (quota exhaustion), or provider-endpoint change could plausibly cause cline's Ink-based TUI to fall back into the same interactive `Select API Provider | Enter API Key` modal its `modal_tokens` property already exists to detect — except now mid-task, not at startup. I checked exactly where MAM watches for this modal (`lib.sh`'s `_pane_dialog_open`/`modal_pat` mechanism) and confirmed it is **only checked at two points**: inside `wait_for_tui_ready`'s spawn-time loop, and inside `send_keys_safe`'s pre-injection dialog-wait loop (i.e., only when MAM is about to send the *next* prompt). **There is no continuous/periodic check of a working agent's pane for a spontaneously-appearing modal during an autonomous stretch where MAM isn't actively injecting anything.** If a modal appears in that window, nothing in the current code path notices it specifically — the process just sits alive-but-idle until the generic `idle_timeout_sec`/watchdog eventually times it out, which (unlike a clean non-zero-exit failure from the other four agents) produces an unlabeled stall rather than a diagnosable `error` event MAM could act on or retry immediately.
 **Honesty caveat**: I want to be precise about what's verified vs. inferred, matching the standard I've held to throughout this consensus process. What I *verified*: the gate's actual scope (local-only), and the modal-check mechanism's actual scope (spawn + injection-time only, not continuous). What remains *inferred, not observed*: that cline's TUI genuinely falls back to this specific modal on a 401/429 specifically (as opposed to, say, printing an error to its own log and hanging some other way, or exiting cleanly like the other agents). Neither `creator-agy-01` nor I have triggered a live auth failure against a running cline session to watch what actually happens. Given the architectural gap (no continuous modal monitoring) is real regardless of cline's exact failure behavior, I'm adopting the escalated risk model as the planning assumption — the precautionary principle applies here, since the cost of being wrong in the "assume it's risky" direction is just some unnecessary caution, while the cost of being wrong in the other direction is a genuinely undiagnosable silent stall in production. This is Rev.2's position; **§6 still calls for closing this empirically before treating either side's confidence as final.**
 ### 3.2 On tool-call approval and API key flags (Rev.3: corrected flag inventory)
 I checked the actual installed `cline` CLI (v3.0.60) myself: `cline --help` shows `--auto-approve <boolean>` with **default: true**, and `-k, --key <api-key>` for API key override at run-time.
 - On the **tool-call auto-approval** axis (bash/file-write "Allow this? [y/N]" prompts): cline is non-blocking by default.
 - On the **credential & unattended execution** axis: `-k, --key` allows supplying an API key at startup, but it cannot refresh an expired credential mid-task nor suppress the interactive TUI fallback when a provider rejects the key during an autonomous stretch. Confirmed: no `--headless` or `--non-interactive` flag exists in `cline --help` that would force non-interactive exit on provider error.
 ### 3.3 The 40-session fact that shifted my own vote
 `reviewer-hermes-01`'s report cited 40 session folders under `~/.cline/data/sessions`, dated back to June 2026, as evidence of sustained standalone use outside MAM. I independently verified this (`ls ~/.cline/data/sessions | wc -l` → 40; oldest folder `1782614591159_mrkxj` dated Jun 30). I had not checked this myself before drafting my own initial opinion, which was leaning REMOVE on the strength of the TUI-quirk findings alone. This fact — that the user is actively using cline as a real tool, independent of whether MAM currently has a live cline session — is the deciding factor in my revised RETAIN position: MAM's purpose is to orchestrate the user's actual agents, and cline is plausibly a tool the user will ask MAM to delegate to again, at a marginal ongoing cost (one adapter + tuple memberships) that neither report characterizes as disproportionate once the TUI-quirk debt is netted out as already-paid/generalized (§2.1).
 ### 3.4 A tension in my own Rev.1 reasoning, surfaced by the challenge (new in Rev.2)
 `creator-agy-01` correctly points out that the same 40-session fact I used in §3.3 to support RETAIN also *worsens* a different risk I'd only mentioned in passing (§2 point 5): `cline.py::discover()` resolves an unknown session by sorting `~/.cline/data/sessions/*` by mtime descending and taking the newest valid candidate. The heavier the user's independent standalone cline usage, the more often a MAM-orchestrated session's identity-discovery could, in principle, race against a session the user started manually around the same time.
 **Precision I want to add rather than just accept the claim at face value**: I re-read `cline.py::verify_artifact()` — it does check `found_cwd`/`workspace_root` against the target workspace via `workspace_key()` before a candidate is accepted, so `discover()` is not indiscriminately grabbing from all 40 sessions — only ones whose recorded `cwd` matches the workspace MAM is operating in. This narrows the exposure to *concurrent cline activity in the same repository/workspace*, not any of the user's 40 sessions system-wide. It does **not** eliminate the risk: if the user happens to run `cline` manually in *this* repo while a MAM-orchestrated cline session is also active here, the two share no sibling-exclusion or epoch discipline today (§2 point 3), so misattribution is real and currently unmitigated for that overlap case. Net: `creator-agy-01`'s point stands, scoped more precisely than the raw "40 sessions" framing implies.
 ---
 ## 4. The Honest Split
 This is not a case where two "obviously correct" opinions outvote one weaker one. Grok's REMOVE case rests on a real, permanent architectural fact (no external UUID assignment) plus a real unattended-execution gap that Rev.2/Rev.3 characterizes sharply (§3.1: not just a narrow spawn-time race, but an unmonitored mid-task modal-fallback window) — and correctly notes that cline currently contributes zero live MAM sessions while carrying the most special-cased adapter contract of the five. Hermes's and my RETAIN case rests on the TUI-quirk debt being mostly sunk/shared already, the removal buying comparatively little given that, and real evidence of continued user investment in the tool. **Rev.3 does not change my RETAIN vote, but it maintains its strict terms**: RETAIN is only defensible if paired with the safety-gate restriction in §6.2. **Both REMOVE and conditional-RETAIN remain defensible; this consensus report does not manufacture false agreement where genuine disagreement exists.**
 ---
 ## 5. Removal Blast Radius (preserved from grok's report, for use if REMOVE is chosen regardless of this consensus)
 If the General Manager decides to proceed with removal despite the 2/3 RETAIN lean, `reviewer-creator-grok-01`'s report already did the enumeration work — reproduced here so it isn't lost:
 - Drop `ClineAgentAdapter`, its `registry.py` entry, and every `case`/tuple-membership site across `create_session.sh`, `resume_session.sh`, `resolve_session_id.sh`, `stop_session.sh`, `status.sh`, `reconcile.sh`, `update_yaml_resumed.sh`, `orc_onboard.sh`, `run_loop.sh`, `lib.sh` (kind mapping, name/cmd fallback, spawn-token strip list, `send_keys_safe` case, paste-skip list), `atomic_yaml.py`, `verify_session.py`, `workspace_uuid.py`.
 - Remove the cline-only `^[0-9]{10,}_[0-9A-Za-z]+$` ID-format union in `orc_onboard.sh` and its `node`-as-argv0 ancestor-walk accommodation.
 - **Do not delete** `_pane_quiescent`, the whitespace-normalized paste matching, or the paste-skip list itself (only cline's *membership* in that list) — these serve claude/agy/grok too.
 - **Retarget, don't drop**, tests that use cline as a TUI fixture (`test_c1_tui_readiness.py`'s `wait_for_tui_ready dummy-sess cline` usage, `test_orc_onboard.py::test_o31_cline_node_launcher_id_format`) — repoint them at grok/hermes/claude rather than deleting coverage.
 - Update the 5–7 `SKILL.md` docs' supported-agent lists.
 - Single coordinated change, not a drive-by delete of `cline.py` alone — a partial removal will immediately fail `test_tier1_unit.py`'s 5-tuple whitelist assertions.
 ---
 ## 6. Recommended Path Forward (regardless of REMOVE vs. RETAIN)
 1. **Modernize drift-C blocks in `reconcile.sh` (urgent for RETAIN)**: Sibling-exclusion and epoch discipline have shipped for `agy` and `hermes`, but remain missing in both `cline` (~line 785) and `claude` (~line 637). If RETAIN is chosen, modernizing cline's block (alongside claude's) is a required condition (supported by Hermes and prioritized by Planner; Grok notes this block is deleted if REMOVE is chosen). Rev.2's §3.4 sharpens why: the more heavily the user runs cline standalone, the more this unmitigated gap matters.
 2. **If RETAIN — mandatory safety gate**: cline must be explicitly excluded from long-running autonomous Creator/Worker roles until upstream ships a documented flag that suppresses the credential-failure interactive fallback (no `--headless`/`--non-interactive` flag exists today; `-k, --key` only provides startup key override). Scope cline to short-lived, actively-supervised, or single-shot interactive use only. This should be written into `MULTI_AGENT_RULES.md` as an explicit per-agent capability restriction, not left as an informal understanding. Revisit after an observation window (e.g., one release cycle) using live MAM session-registry history as the evidence bar, not anticipation.
 3. **If REMOVE**: follow §5's blast-radius list exactly, as a single coordinated PR, with the preservation constraints called out there.
 4. **Close the open empirical question from §3.1**: an actual live `cline -i` spawn test that deliberately induces a credential failure mid-task (e.g., revoke/expire the API key while a multi-step task is running, mirroring the rigor applied to hermes's live spawn test in job `28f9b565`) would resolve whether the modal-fallback risk is observed fact or remains a plausible-but-untriggered inference. Neither side of this consensus has that data point yet — Rev.2/Rev.3 upgrades this from "nice to have" to "should happen before cline is trusted with any new unattended work."
 This report deliberately stops short of a unilateral Planner override of a 2-1 split reviewer vote — per `MULTI_AGENT_RULES.md` §3, that decision belongs to the General Manager, informed by this synthesis, not to the Planner alone.
@@ -0,0 +1,100 @@
 # Deploy / install verification — v3.0.0
 - **Date**: 2026-08-26
 - **Verifier**: `creator-grok-01` (jobs `c9275b44`, `16201e43`, `61299e40`)
 - **Source tree**: `/Users/godopu16/PuKi/laa/canary_projects/multi-agent-mux` (working copy used as `MAM_REPO_URL`)
 - **Installer under test**: `deploy/install.sh` (same path as `tests/test_deploy_*.py` and `update.sh`)
 - **Sandbox (first)**: `/tmp/mam-v3-verify.o0ocAX`
 - **Sandbox (re-run 16201e43)**: `/tmp/mam-v3-verify2.7RCtR7` (clean dir, `MAM_SKIP_VENV=1`; removed after hash check)
 ---
 ## 1. Installer surface
 | Artifact | Role |
 | :--- | :--- |
 | `deploy/INSTALL.md` | User guide. Documents `deploy/install_mam.sh --target …`. Installed copy is `.agents/INSTALL.md`. |
 | `deploy/install.sh` | Production installer used by tests, `update.sh`, and `MAM_REPO_URL` staging. Copies `.agents/**` (except reports/references), `AGENTS.md`, hooks, skills. |
 | `deploy/update.sh` | Installed as `.mam_deploy/update.sh`. Backs up `.mam.env` / `.mam` then re-runs install. |
 | `deploy/install_mam.sh` | Alternate rsync installer from a local clone (`SRC_DIR` = parent of `deploy/`). Same ownership rules. |
 Both installers pull from the clone they are run from when `MAM_REPO_URL` is a directory (`install.sh`) or when invoked as `install_mam.sh` from that clone. This verification used `install.sh` against the working tree so the installed bits are this v3.0.0 checkout, not `main` on the remote.
 ---
 ## 2. Sandbox install — skill versions
 `bash deploy/install.sh <sandbox>` completed 0.
 All **8** `SKILL.md` files in the sandbox:
 | Skill | Installed `version` |
 | :--- | :--- |
 | `multi-agent-mux-create` | `3.0.0` |
 | `multi-agent-mux-stop` | `3.0.0` |
 | `multi-agent-mux-resume` | `3.0.0` |
 | `multi-agent-mux-status` | `3.0.0` |
 | `multi-agent-mux-monitor` | `3.0.0` |
 | `multi-agent-mux-delegate-job` | `3.0.0` |
 | `multi-agent-mux-loop` | `3.0.0` |
 | `multi-agent-mux-orc-onboard` | `3.0.0` |
 Matches `VERSIONS.md` skill matrix (`v3.0.0`).
 ---
 ## 3. Framework assets and v3 payloads
 Present in the sandbox and **SHA-256 identical** to the source tree:
 | Installed path | Source | SHA prefix |
 | :--- | :--- | :--- |
 | `.agents/hooks.json` | same | `fc730f18fd9ecc53` |
 | `.agents/hooks/loop_delegation_guard.sh` | same | `9896c63ffbd6fb00` |
 | `.agents/MULTI_AGENT_RULES.md` | same | `a5e31712c5cadaac` |
 | `.agents/INSTALL.md` | `deploy/INSTALL.md` | `26ec7eaf2cc050a7` |
 | `AGENTS.md` | same | `91acdf00a537e326` |
 | `.agents/skills/lib.sh` | same | `d884bb839e0a6336` |
 | `.agents/skills/lib_py/layout.py` | same | `a06d25e660c65084` |
 | `.agents/skills/lib_py/agents/adapters/grok.py` | same | `33113671c456437e` |
 | `.agents/skills/lib_py/agents/registry.py` | same | `ec2d169e0a0e6690` |
 | `.agents/skills/multi-agent-mux-loop/scripts/run_loop.sh` | same | `25c405cd88f1fc19` |
 Also present: `.agents/MULTI_AGENT_RULES.ko.md`. Adapters dir: `claude.py`, `agy.py`, `hermes.py`, `cline.py`, `grok.py`.
 v3 behavior on the installed copies:
 - **Loop CLI**: `--creator)` parser; `--target-agent` only as the removal error. `SKILL.md` and `.agents/INSTALL.md` examples use `--creator`. No leftover `--target-agent` in installed skills except that error handler.
 - **Layout 2.0**: `_decide` / `_decide_headless`, `new_column_right`, `max_rows` default 2.
 - **Grok**: `GrokAgentAdapter` registered in `registry.py`.
 ---
 ## 4. Automated tests
 ```text
 pytest tests/test_deploy_freshness.py tests/test_deploy_layout.py tests/test_loop_cli.py
 45 passed in 40.56s
 ```
 - `test_deploy_freshness.py`: non-skill assets refresh, ownership, NATS/docs guards.
 - `test_deploy_layout.py`: install layout, `.mam_deploy`, gitignore block.
 - `test_loop_cli.py`: `--creator` / `--planner` / `--target-agent` rejection.
 ---
 ## 5. Gaps / notes (not install failures)
 1. **Two installers.** User-facing `INSTALL.md` tells people to run `install_mam.sh`. CI and `update.sh` use `install.sh`. Both installed v3.0.0 from this tree; operators should know which command they ran.
 2. **Remote vs working tree.** Default `MAM_REPO_URL` is `https://git.godopu.com/tmpl/multi-agent-mux.git`. This check used the local working copy. A clean install from the remote is v3.0.0 only after that remote is tagged/pushed.
 3. **`--target-agent` string** remains in `run_loop.sh` as the dedicated rejection path (Rev.4). That is required, not a leak.
 ---
 ## 6. Verdict
 **PASS.** A clean `deploy/install.sh` into an empty directory installs all eight skills at `version: 3.0.0`, copies hooks / MULTI_AGENT_RULES / INSTALL / lib_py (Grok + layout 2.0) byte-identical to this tree, and the three requested test modules are green.
 Re-run job `16201e43`: second clean install still 8× `version: 3.0.0`, all listed assets MATCH, `pytest` **45 passed in 44.34s**. Verdict unchanged.
 Re-run job `61299e40`: third clean install 8× `3.0.0`, listed assets MATCH, `pytest` **45 passed in 43.76s**. Verdict unchanged.
@@ -0,0 +1,18 @@
 # Report: Job e30b9201 — Refined Cline Removal Plan (Rev.2) per `creator-agy-01` Challenge
 **Durable output (updated in place)**: [.agents/reports/planner-reviewer-claude-01/plan-264c3b5d.md](../../../.agents/reports/planner-reviewer-claude-01/plan-264c3b5d.md)
 ## Summary
 `creator-agy-01` challenged Rev.1's test-retargeting strategy (§5) and doc-scope decision (§6), identifying one core blind spot and two supporting gaps. **All accepted — no `[REBUT:]` filed**, after independently re-verifying each claim:
 1. **Core blind spot**: Rev.1 proposed retargeting the 2-tier readiness tests by pre-exporting `MAM_STRONG_READY_TOKENS`/`MAM_WEAK_READY_TOKENS` env vars directly. I re-checked `lib.sh` myself and confirmed this would skip `wait_for_tui_ready`'s `python -m lib_py.agents facts <agent>` bridge call entirely (it's gated behind an `[ -z "$strong_tokens" ]` check) — since cline was the only real adapter with non-degenerate 2-tier values, this would leave the bridge's handling of genuinely-differentiated strong/weak tokens completely untested once cline is gone. **Fixed**: retarget to a test-local mock adapter instead, keeping the real facts bridge in the loop.
 2. **`test_c8` gap**: Rev.1 only swapped the modal *text*, missing that the test's session name (`my-project-worker-cline-01`) drives dynamic agent resolution → `facts cline` — a synthetic modal string wouldn't fix that the session name itself would fail to resolve once cline's adapter is deleted. **Fixed**: retarget the whole test to `claude`, using claude's own real `modal_tokens` value (`Try the new fullscreen renderer?`, verified present in `claude.py`), preserving the complete E2E path with an agent that isn't being removed.
 3. Added a new adapter-contract assertion (all 4 remaining agents' default 2-tier fields round-trip correctly through the facts bridge) to close the coverage gap explicitly.
 4. **`docs/NEW_AGENT_INTEGRATION_GUIDE.md`**: I'd placed this in "do not touch," but verified myself it's a live copy-paste template with `cline` hardcoded into 5 sample sites (adapter dict, `lib.sh` kind mapping, binary tuple, diagram, test assertion) — moved into the update-scope in §6.
 Full Rev.2 text with the corrected test-retargeting specifications is in the durable plan linked above.
 **Process note**: still pending a fresh `[VERDICT: PASS]` before implementation begins, per `MULTI_AGENT_RULES.md` §3.1.
 [VERDICT: N/A — planning artifact, review pending]
@@ -0,0 +1,22 @@
 # Report: Job a7a2da9f — Refined Plan (Rev.2) per `creator-agy-01` Challenge
 **Durable output (updated in place)**: [.agents/reports/planner-reviewer-claude-01/plan-28f9b565.md](../../../.agents/reports/planner-reviewer-claude-01/plan-28f9b565.md)
 ## Summary
 `creator-agy-01` filed a formal architectural challenge (job `cd64ae0b`) against Rev.1's hermes audit plan, identifying that **Rev.1's own proposed §2.4 fix for the `C-ambiguous` bug was itself regressive**: it widened `reconcile.sh`'s candidate query but still relied on `adapters/hermes.py::verify_artifact()`, which checks the shared `~/.hermes/state.db` file's mtime rather than the individual session row's `started_at`. Since all hermes sessions across all workspaces share one `state.db` file, any recent write makes the file-level epoch check pass for essentially every historical session row — meaning Rev.1's fix would have turned "never detects `C-ambiguous`" into "permanently false-positives `C-ambiguous` in any workspace with prior hermes history." A second, lower-severity point noted that `hermes --resume` auto-`cd`s into its recorded `cwd`, risking divergence from MAM's symlink-canonicalized path model, and recommended adding `--no-restore-cwd`.
 **Disposition**: I independently re-verified both claims against the actual code (`hermes.py::verify_artifact`'s file-mtime check; `verify_session.py`'s `epoch = row.get("herdr_session_epoch", 0)`) before accepting — both are correct. **Both accepted — no `[REBUT:]` filed.**
 ## What changed in Rev.2
 - Added §0 changelog cross-referencing each challenge point.
 - §2.4 replaced (not appended) with a two-layer fix: `verify_artifact()` now checks the session row's own `started_at` instead of the shared file's mtime, and `reconcile.sh`'s query adds a `started_at >= ?` SQL-level filter alongside the existing candidate-widening + sibling-exclusion logic from Rev.1.
 - §2.1's canonical `resume_spec()` and §2.6 updated to add `--no-restore-cwd` alongside `--yolo --accept-hooks`.
 - Comparison table and Definition of Done updated; the regression test requirement now explicitly covers **both** directions (under-detection and the Rev.1 over-detection regression), not just the original under-detection case.
 Full Rev.2 text, including both corrected code diffs, is in the durable report linked above.
 **Process note**: Per `MULTI_AGENT_RULES.md` §3.1, this Rev.2 still requires a fresh `[VERDICT: PASS]` before the §2.4 fix — the highest-risk change in this plan — is merged.
 [VERDICT: N/A — planning artifact, review pending]
@@ -0,0 +1,25 @@
 # Report: Job adad47d1 — Refined Consensus (Rev.2) per `creator-agy-01` Challenge
 **Durable output (updated in place)**: [.agents/reports/cline_deprecation_opinion.md](../../../.agents/reports/cline_deprecation_opinion.md)
 ## Summary
 `creator-agy-01` challenged Rev.1's §3.1 risk characterization of cline's unattended-execution gap, arguing it understated the real danger: `cline history --json` (the pre-spawn gate) only validates that local session storage exists, not credential/API validity — so it can't protect against a runtime auth failure (401/expired token/429 quota) mid-task, which could plausibly force cline's TUI into its interactive setup modal with no clean-exit fallback like the other four agents have. A second point noted the 40-session usage fact I'd used to support RETAIN also amplifies `discover()`'s session-hijacking exposure.
 **Verification before accepting**: I ran `cline history --help` myself (confirmed: pure local listing, no auth semantics) and traced exactly where MAM checks for the setup modal in `lib.sh` (confirmed: only at spawn-time and at the moment of injecting a new prompt — never continuously during an autonomous work stretch). Both confirm the architectural gap is real. I was also careful to flag what remains *inferred* rather than *observed*: neither `creator-agy-01` nor I have actually triggered a live credential failure to watch cline's real behavior — I adopted the escalated risk model as the working precautionary assumption while saying so explicitly, rather than overstating certainty either side doesn't have.
 **Disposition**: Accepted, with the honesty caveat above — no `[REBUT:]` filed.
 ## What changed in Rev.2
 - §3.1 rewritten: risk escalated from "narrow spawn-time race" to "unmonitored mid-task modal-fallback window," with the verification trail (what's confirmed vs. inferred) laid out explicitly.
 - §3.2 narrowed to reaffirm only the tool-call-approval finding that still stands (`--auto-approve` default true) — the credential-failure gap is a separate, more severe category, not covered by that flag.
 - New §3.4: precision-scoped the session-hijacking concern (cline's `discover()` does filter by workspace `cwd`, so exposure is concurrent-same-workspace activity, not all 40 sessions indiscriminately) while accepting the core point.
 - §4 revised: my RETAIN vote stands but its terms changed — now explicitly conditional on the new §6.2 safety gate, not an unconditional RETAIN as Rev.1 implied.
 - §6 reprioritized: the reconcile.sh fix is now urgent; a new mandatory safety-gate requirement (exclude cline from long-running autonomous roles until upstream ships a real headless/non-interactive flag) is added for the RETAIN path; the empirical-verification ask is upgraded from "nice to have" to a prerequisite before trusting cline with new unattended work.
 Full Rev.2 text is in the durable report linked above.
 **Process note**: Still no unanimous verdict (2 RETAIN-conditional vs. 1 REMOVE) — this challenge sharpened the RETAIN side's conditions rather than flipping any vote. The REMOVE-vs-RETAIN decision still belongs to the General Manager per `MULTI_AGENT_RULES.md` §3.
 [VERDICT: N/A — consensus opinion artifact, decision belongs to the General Manager]
@@ -0,0 +1,14 @@
 # Report: Job ec388212 — Refined Version Upgrade Plan (Rev.2) per `creator-agy-01` Challenge
 **Durable output (updated in place)**: [.agents/reports/version_upgrade_recommendation.md](../../../.agents/reports/version_upgrade_recommendation.md)
 ## Summary
 `creator-agy-01` challenged Rev.1's §6 implementation checklist (job `53b96f7a`) — explicitly reaffirming the v4.0.0 consensus itself, not disputing it. Two blind spots identified. **Both accepted — no `[REBUT:]` filed**, after independently re-verifying each claim against the live codebase rather than trusting the challenge's framing:
 1. **`VERSIONS.md:24` prose desync**: verified `tests/test_version_consistency.py`'s regexes only cover the "현재 버전 개요" header line and the 8-row skill matrix table — confirmed by reading the actual regex patterns (`re.search(r"...프레임워크 버전...")`, `re.findall(r"\|\s*\*\*\`([^\`]+)\`\*\*...")`). Line 24's free-text sentence ("...`v3.1.0`으로 동기화되어 배포됩니다.") is untouched by either regex. **Fixed**: §6 item 2 now names this line as an explicit edit target.
 2. **Orphaned `cline` session rows surviving the upgrade**: verified `deploy/update.sh` (lines 111–166) explicitly backs up and restores `.mam/agent-sessions.*` across an update — nothing is wiped. Verified `registry.py::agent_of_row()` returns `None` for `agent: cline` rows post-removal (its explicit-field fast path checks `str(explicit).lower() in _ADAPTERS`, and `cline` is no longer a key). Verified `resume_session.sh` hard-rejects `--agent cline` with `exit 2`. Went further than the challenge asked: traced whether `multi-agent-mux-stop --purge-conversation` remains usable — confirmed it handles an already-dead herdr pane fine ("herdr already dead, just updating YAML"), but its `--agent` whitelist is narrowed too, so artifact-aware purge only works **before** upgrading. For rows orphaned *after* upgrading (no adapter left to resolve artifact paths), traced the safe primitive down to `lib.sh::atomic_dump_yaml` / `atomic_yaml.py::atomic_dump_yaml_main()` — confirmed it execs a caller-supplied Python snippet against the `d` dict under an `flock` + SQLite `BEGIN IMMEDIATE` transaction, the same locked path every other skill script already uses. **Fixed**: §6 item 2 now gives a verified pre-upgrade purge command and a verified post-upgrade YAML-only prune one-liner using that exact primitive, rather than inventing new tooling.
 Full Rev.2 text is in the durable plan linked above (new "Rev.2 Changelog" section at the top, plus the rewritten §6 item 2).
 [VERDICT: N/A — planning artifact, review pending]
@@ -0,0 +1,508 @@
 # 📐 구현 계획서: Herdr 셈(shim) 패인 라우팅 결함 4종 수정 (ISSUE-1/2/3/5)
 - **Job ID**: `fae58b93`
 - **Role**: Planner (`planner-reviewer-claude-01`)
 - **작성일**: 2026-08-27
 - **대상**: `.agents/skills/lib.sh`, `tests/conftest.py`, `tests/test_herdr_shim_contract.py`, `tests/test_b19_headless_reconcile_fixes.py`
 - **근거 문서**: `bug_report.md` (v1.0)
 - **기준 커밋**: `4bbd03b` (main)
 ---
 ## 0. 요약 (TL;DR)
 `bug_report.md`의 5대 결함 중 ISSUE-4는 이미 커밋 `4bbd03b`에서 해결되어 회귀 테스트(`test_agent_start_success_tokens_exclude_startup_timeout`)로 고정되어 있다. 남은 **ISSUE-1 / 2 / 3 / 5**를 다음 순서로 처리한다.
 1. **ISSUE-5 선행** — 셈 내부에 공용 헬퍼 `_resolve_herdr_pane_id`를 신설한다. 나머지 3개 이슈의 수정이 전부 이 헬퍼 안으로 수렴하므로 이것이 반드시 먼저다.
 2. **ISSUE-2** — 헬퍼 및 `_resolve_herdr_target` / `has-session`에서 `agent in tn` 부분 매칭을 전면 제거하고 엄격 일치로 대체.
 3. **ISSUE-3** — `HERDR_WORKSPACE_ID`가 **명시적으로 설정된 경우에만** `pane list --workspace`로 하드 스코핑.
 4. **ISSUE-1** — `paste-buffer`를 `pane send-text` 단독 삽입으로 교체(엔터 금지), 해결 실패 시 조용히 삼키지 말고 실패를 상위로 전달.
 ---
 ## 1. 사전 조사에서 확인된 사실 (계획의 전제)
 계획 수립 중 실제 `herdr` 바이너리(`/opt/homebrew/bin/herdr`)와 현재 `lib.sh`를 직접 검증했다. **버그 리포트의 권고 코드를 그대로 옮기면 안 되는 지점이 3곳** 있다.
 ### 1.1 ✅ `herdr agent send` 서브커맨드는 존재하지 않는다 (ISSUE-1의 진짜 뿌리)
 ```
 $ herdr agent --help
 Commands: list  get  read  send-keys  prompt  rename  focus  wait  attach  start  explain
 ```
 현재 `lib.sh:822`의 `paste-buffer` 구현은 다음 한 줄이 전부다.
 ```bash
 _real_herdr agent send "$sess" "$(cat "$buffer_dir/$buf")" >/dev/null 2>&1 || true
 ```
 `agent send`는 CLI에 없으므로 이 호출은 **항상 실패하고 `|| true`가 실패를 삼킨다**. 즉 현재 `main`에서 `paste-buffer` 경로는 텍스트를 단 한 글자도 주입하지 못하는 완전한 데드 코드다. 이것이 브리프의 "`paste-buffer`의 `herdr agent send` 부재"가 가리키는 실체이며, `send_keys_safe`의 폴백 경로 전체가 무력화되어 있음을 뜻한다.
 > 참고: `send_keys_safe`는 `agent prompt` 고속 경로가 성공하면 즉시 반환하므로(`lib.sh:1785`), **등록된 agent에 대해서는** 이 결함이 드러나지 않는다. 결함이 표면화되는 조건은 정확히 버그 리포트가 기술한 상황 — `agent prompt`가 실패하는 **라벨 전용 패인(agent 미등록)** — 이다.
 ### 1.2 ⚠️ 버그 리포트의 `pane_id` 정규식은 실제 pane_id를 거부한다
 버그 리포트 §3.1은 다음 검증을 제안한다.
 ```bash
 if [[ "$pid" =~ ^w[0-9]+:p[0-9]+$ ]]; then
 ```
 그러나 실제 서버가 반환하는 pane_id는 다음과 같다.
 ```json
 {"pane_id":"w1E:p1","workspace_id":"w1E","tab_id":"w1E:t1", ...}
 ```
 워크스페이스 세그먼트는 `w1E`처럼 **영문자를 포함**한다. 권고 정규식을 그대로 쓰면 모든 실제 pane_id가 거부되어 헬퍼가 항상 실패하고, 결과적으로 ISSUE-1을 고친 뒤에도 주입이 되지 않는다.
 → **채택 정규식**: `^w[A-Za-z0-9]+:p[A-Za-z0-9]+$`
 ### 1.3 ⚠️ 실제 `pane list` 응답에는 `label` 키가 없을 수 있다
 ```json
 {"agent":"claude","agent_status":"working","cwd":"...","pane_id":"w1E:p1",
 "tab_id":"w1E:t1","terminal_title":"...","workspace_id":"w1E"}
 ```
 `label`은 `herdr pane rename <PANE_ID> <LABEL>`로 설정했을 때만 나타난다. 반면 `agent list`에는 `name` 필드가 있다(`"name":"planner-reviewer-claude-01"`). 따라서 헬퍼의 매칭 우선순위는 `label` → `name` → `agent` 순으로 두되, **셋 다 완전 일치만** 허용한다. `agent` 필드는 사실상 CLI 종류(`claude`/`grok`)이므로 `tn`이 그 값과 완전히 같은 경우에만 매칭되며, 이는 부분 매칭과 달리 오라우팅을 만들지 않는다.
 ### 1.4 ✅ `pane list`는 서버측 `--workspace` 필터를 지원한다
 ```
 $ herdr pane list --help
 Options:
      --workspace <WORKSPACE_ID>
 ```
 ISSUE-3의 스코핑은 파이썬 클라이언트 필터링만이 아니라 **서버측 플래그로 1차 차단**할 수 있다. 양쪽 모두 적용한다(플래그 미지원 구버전 herdr 대비 이중 방어).
 ### 1.5 ✅ `pane read`와 `agent read`의 출력 형식은 호환된다
 둘 다 평문 텍스트를 반환하며, `_pane_capture`(`lib.sh:1672`)는 JSON 파싱 실패 시 원문을 그대로 반환하므로 `capture-pane`을 `pane read`로 전환해도 상위 로직이 깨지지 않는다.
 ### 1.6 ⚠️ 셈은 `set -euo pipefail` 아래에서 실행된다
 셈 본문은 `lib.sh:141`의 `cat <<'EOF'` ~ `lib.sh:959`의 `EOF` 사이 히어독으로 생성되며 3번째 줄이 `set -euo pipefail`이다. 따라서 실패를 반환할 수 있는 새 헬퍼는 **모든 호출부에서 `|| true`로 감싸야** 하며, 그렇지 않으면 셈이 조기 종료된다.
 ### 1.7 ✅ 테스트 목(mock)이 결함을 은폐하고 있다
 `tests/conftest.py:638`의 목 herdr는 존재하지 않는 `agent send`를 **성공으로 처리**한다. 이 때문에 ISSUE-1이 테스트에서 전혀 드러나지 않았다. 목을 실제 CLI 계약에 맞추는 것이 이번 작업의 필수 선행 조건이다.
 ---
 ## 2. 변경 대상 목록
 | # | 파일 | 위치 | 이슈 | 성격 |
 |---|---|---|---|---|
 | C1 | `.agents/skills/lib.sh` | 셈 히어독, `_sanitize_herdr_agent_name` 직후 (~L236) | 5 | 신규 헬퍼 `_resolve_herdr_workspace_scope`, `_resolve_herdr_pane_id` |
 | C2 | `.agents/skills/lib.sh` | `_resolve_herdr_target` (L249–286) | 2,3 | 부분 매칭 제거 + ws 필터 |
 | C3 | `.agents/skills/lib.sh` | `has-session` (L305–345) | 2,3,5 | 부분 매칭 제거 + ws 필터 + 헬퍼 폴백 |
 | C4 | `.agents/skills/lib.sh` | `new-session` (L434–530) | 3 | 해결된 workspace_id를 `HERDR_WORKSPACE_ID`로 export |
 | C5 | `.agents/skills/lib.sh` | `kill-session` (L567–603) | 5 | 인라인 파서 → 헬퍼 |
 | C6 | `.agents/skills/lib.sh` | `capture-pane` (L687–704) | 3,5 | 헬퍼 + `pane read` 경로 |
 | C7 | `.agents/skills/lib.sh` | `send-keys` (L705–744) | 2,3,5 | 인라인 파서 → 헬퍼 |
 | C8 | `.agents/skills/lib.sh` | `paste-buffer` (L794–827) | 1,5 | `agent send` → `pane send-text`, 엔터 금지, 실패 전파 |
 | C9 | `.agents/skills/lib.sh` | `send_keys_safe` (L1804–1806) | 1 | `paste-buffer` 종료 코드 확인 → rc 3 |
 | C10 | `tests/conftest.py` | 목 herdr | 1,2,3 | `pane send-text`/`pane read`/`pane rename` 추가, `pane list` 병합·라벨·`--workspace`, `agent send` 제거 |
 | T1 | `tests/test_herdr_shim_contract.py` | 신규 | 1,2,3,5 | H-15 ~ H-20 |
 | T2 | `tests/test_b19_headless_reconcile_fixes.py` | 신규 | 1,2,5 | D-4 ~ D-7 |
 > `list-panes`(L605–686)의 인라인 파서는 `pane_id` 외에 `cwd`/`agent`까지 한 번에 파싱하므로 헬퍼로 대체하지 **않는다**. ISSUE-5의 대상 목록에도 포함되어 있지 않다.
 ---
 ## 3. 상세 구현 설계
 ### 3.1 [C1] 공용 헬퍼 신설 (ISSUE-5)
 `lib.sh` 셈 히어독 내부, `_sanitize_herdr_agent_name` 정의 직후(`cmd="${1:-}"` 앞)에 삽입한다. 이 위치여야 `case` 분기 전체에서 참조 가능하다.
 ```bash
 # ---------------------------------------------------------------------------
 # Workspace scoping (ISSUE-3).
 #
 # 스코핑은 HERDR_WORKSPACE_ID 가 "명시적으로" 설정된 경우에만 하드 필터로
 # 동작한다. cwd 로부터 자동 추론하지 않는다 — 자동 추론은 다중 워크스페이스
 # 오케스트레이션에서 정당한 교차 워크스페이스 조회를 조용히 막아버린다.
 # 미설정 시에는 서버 전역 조회(기존 동작)를 유지한다.
 # ---------------------------------------------------------------------------
 _herdr_ws_scope() { printf '%s\n' "${HERDR_WORKSPACE_ID:-}"; }
 # _resolve_herdr_pane_id <target> [workspace_id]
 #
 # 세션 이름 / 라벨을 실제 pane_id ("wN:pM") 로 해석한다.
 # 엄격한 해석 순서 (부분 문자열 매칭은 어느 단계에서도 사용하지 않는다):
 #   1. herdr agent get <sanitized_name>
 #   2. herdr agent get <raw_name>
 #   3. herdr pane list [--workspace WS] 에서
 #        3-a. label 완전 일치
 #        3-b. name 완전 일치
 #        3-c. agent 완전 일치
 # 성공 시 pane_id 를 stdout 에 출력하고 0, 실패 시 아무것도 출력하지 않고 1.
 # 호출부는 반드시 `|| true` 로 감쌀 것 (셈은 set -e 하에서 동작한다).
 _resolve_herdr_pane_id() {
  local target="$1"
  local target_ws="${2:-$(_herdr_ws_scope)}"
  local sat pid=""
  sat=$(_sanitize_herdr_agent_name "$target")
  local cand
  for cand in "$sat" "$target"; do
    [ -n "$cand" ] || continue
    pid=$(_real_herdr agent get "$cand" 2>/dev/null | TARGET_WS="$target_ws" python3 -c "
 import sys, json, os
 tws = os.environ.get('TARGET_WS', '')
 try:
    a = json.load(sys.stdin).get('result', {}).get('agent', {})
    # ISSUE-3: 워크스페이스가 지정되면 다른 워크스페이스의 동명 agent 는 거부.
    if tws and a.get('workspace_id') and a.get('workspace_id') != tws:
        pass
    else:
        print(a.get('pane_id') or '')
 except Exception:
    pass
 " 2>/dev/null || echo "")
    [ -n "$pid" ] && break
  done
  if [ -z "$pid" ]; then
    local ws_flag=()
    [ -n "$target_ws" ] && ws_flag=(--workspace "$target_ws")
    pid=$(_real_herdr pane list "${ws_flag[@]+"${ws_flag[@]}"}" 2>/dev/null \
      | TARGET_NAME="$target" TARGET_SAN="$sat" TARGET_WS="$target_ws" python3 -c "
 import sys, json, os
 tn  = os.environ.get('TARGET_NAME', '')
 tsa = os.environ.get('TARGET_SAN', '')
 tws = os.environ.get('TARGET_WS', '')
 try:
    panes = json.load(sys.stdin).get('result', {}).get('panes', [])
    # 서버가 --workspace 를 무시하는 구버전일 수 있으므로 클라이언트에서 한 번 더 거른다.
    if tws:
        panes = [p for p in panes if p.get('workspace_id') == tws]
    # ISSUE-2: 완전 일치만 허용. 'agent in tn' 부분 매칭은 사용하지 않는다.
    for key in ('label', 'name', 'agent'):
        for p in panes:
            v = p.get(key)
            if v and (v == tn or v == tsa):
                pid = p.get('pane_id') or ''
                if pid:
                    print(pid)
                    sys.exit(0)
 except Exception:
    pass
 sys.exit(1)
 " 2>/dev/null || echo "")
  fi
  # 실제 pane_id 는 'w1E:p1' 처럼 워크스페이스 세그먼트에 영문자를 포함한다.
  # ^w[0-9]+:p[0-9]+$ 로 좁히면 모든 실제 pane_id 가 거부된다.
  if [[ "$pid" =~ ^w[A-Za-z0-9]+:p[A-Za-z0-9]+$ ]]; then
    printf '%s\n' "$pid"
    return 0
  fi
  return 1
 }
 ```
 **설계 근거**
 - **`for key in ('label','name','agent')` 바깥 루프**: 우선순위가 "패인 목록의 등장 순서"가 아니라 "필드의 신뢰도"로 결정된다. 안쪽/바깥쪽 루프를 뒤집으면 목록 첫 항목의 `agent` 매칭이 뒤쪽 항목의 정확한 `label` 매칭을 이겨버린다 — 이것이 ISSUE-2가 만든 오라우팅과 동일한 형태의 버그다.
 - **`tsa`(sanitized) 도 비교 대상에 포함**: `agent start`가 이름을 sanitize해서 등록하므로, 라벨은 원본이고 등록명은 sanitize본인 혼재 상황을 커버한다. sanitize는 결정적 함수이므로 부분 매칭과 달리 충돌을 만들지 않는다.
 - **`ws_flag` 배열 + `${ws_flag[@]+...}`**: `set -u` 하에서 빈 배열 전개가 unbound 오류를 내지 않도록 하는 표준 관용구.
 ### 3.2 [C2] `_resolve_herdr_target` 엄격화 (ISSUE-2, ISSUE-3)
 `lib.sh:262–275`의 파이썬 블록에서 다음 술어를 제거한다.
 ```python
 if name == tn or (not name and agent and agent in tn):   # ← 제거
 ```
 교체:
 ```python
 tn  = os.environ.get("TARGET_NAME", "")
 tsa = os.environ.get("TARGET_SAN", "")
 tws = os.environ.get("TARGET_WS", "")
 ...
 agents = d.get("result", {}).get("agents", [])
 if tws:
    agents = [a for a in agents if a.get("workspace_id") == tws]
 for a in agents:
    name = a.get("name", "")
    if name and (name == tn or name == tsa):
        print(a.get("pane_id") or name)
        sys.exit(0)
 sys.exit(1)
 ```
 `pane_id or agent` → `pane_id or name`으로 바꾼다. 기존 코드는 매칭에 실패한 항목의 CLI 종류(`agent`, 예: `"claude"`)를 타깃으로 반환할 수 있었는데, 이는 `agent prompt claude ...`처럼 전혀 다른 대상에게 프롬프트를 던지는 경로다.
 ### 3.3 [C3] `has-session` 엄격화 + 패인 폴백 (ISSUE-2, ISSUE-3, ISSUE-5)
 `lib.sh:334`의 다음 술어를 제거한다.
 ```python
 or (not an and a.get("agent") and a.get("agent") in tn)   # ← 제거
 ```
 남는 조건은 `an == tn or an == stn`이며, 여기에 `HERDR_WORKSPACE_ID` 필터를 추가한다.
 그리고 agent 조회가 모두 실패했을 때 마지막 단계로 헬퍼를 호출한다.
 ```bash
 if [ -n "$(_resolve_herdr_pane_id "$sess" 2>/dev/null || true)" ]; then
  exit 0
 fi
 exit 1
 ```
 **의도적 동작 변경**: 라벨만 붙은(agent 미등록) 패인도 이제 "세션 존재"로 판정된다. 이것이 정확히 버그 리포트가 보고한 실패 시나리오(`label: reviewer-cline-01` 패인에 주입 불가)의 해소 조건이다. `_resolve_herdr_pane_id`가 완전 일치만 허용하므로, 세션 이름 `reviewer-creator-grok-01`이 `agent == "grok"` 패인에 매칭될 일은 없다.
 **리스크**: `create_session.sh` / `reconcile.sh`가 `has-session` 결과로 재생성 여부를 판단한다면, 라벨만 있고 실제 CLI가 죽은 패인을 "살아 있음"으로 오판할 수 있다. → 3.9의 회귀 검증 범위에 `test_orc_onboard.py`, `test_tier3_integration.py`, `test_tier4_e2e.py`를 명시적으로 포함한다.
 ### 3.4 [C4] `HERDR_WORKSPACE_ID` 전파 (ISSUE-3)
 `new-session` 분기에서 `existing_ws` 또는 신규 `ws_id`가 확정된 직후(`lib.sh:509` 이후 `ws_id` 확정 지점) 다음을 추가한다.
 ```bash
 if [ -n "${ws_id:-}" ]; then
  export HERDR_WORKSPACE_ID="$ws_id"
 fi
 ```
 또한 `agent start`에 전달하는 `env_flags`에 `--env HERDR_WORKSPACE_ID=$ws_id`를 추가하여, 기동된 에이전트 프로세스가 상속한 셈 호출부터 자동으로 스코프가 걸리도록 한다.
 **채택하지 않은 대안**: 셈이 `$PWD`/`$WORKSPACE_ROOT`의 cwd로부터 workspace_id를 자동 추론하는 방식. 추론이 성공하는 순간 교차 워크스페이스 조회가 **조용히** 막히고, 오케스트레이터가 다른 워크스페이스의 에이전트를 정당하게 다루는 경로가 원인 불명으로 깨진다. 스코핑은 명시적 옵트인이어야 진단 가능하다.
 ### 3.5 [C5]~[C7] 분기 리팩터링 (ISSUE-5)
 **`kill-session`** — `lib.sh:587–598`의 이중 인라인 파이썬을 삭제.
 ```bash
 agent_target=$(_sanitize_herdr_agent_name "$sess")
 pane_id=$(_resolve_herdr_pane_id "$sess" 2>/dev/null || true)
 if [ -n "$pane_id" ]; then
  _real_herdr pane close "$pane_id" >/dev/null 2>&1 || true
 fi
 _real_herdr kill-session -t "$agent_target" >/dev/null 2>&1 \
  || _real_herdr kill-session -t "$sess" >/dev/null 2>&1 || true
 ```
 **`capture-pane`** — 헬퍼로 pane_id를 얻으면 `pane read`, 아니면 기존 `agent read` 체인 유지.
 ```bash
 agent_target=$(_sanitize_herdr_agent_name "$sess")
 pane_id=$(_resolve_herdr_pane_id "$sess" 2>/dev/null || true)
 if [ -n "$pane_id" ]; then
  _real_herdr pane read "$pane_id" --source visible --lines 100 2>/dev/null || true
 else
  _real_herdr agent read "$agent_target" --source visible --lines 100 2>/dev/null \
    || _real_herdr agent read "$sess" --source visible --lines 100 2>/dev/null || true
 fi
 ```
 **`send-keys`** — `lib.sh:726–738`의 이중 인라인 파이썬을 삭제하고 헬퍼 호출로 대체. 폴백(`pane send-keys "$agent_target"` → `"$sess"`)은 그대로 유지한다. `C-m` → `Enter` 정규화(L741–743)도 유지 — 이건 키 이름 번역이지 제출 정책이 아니다.
 **ISSUE-5의 "데드 파이프라인" 부분**: 기존 인라인 파서는 `except: pass`로 항상 exit 0을 반환해 `||` 2차 폴백이 절대 실행되지 않았다. 신규 헬퍼는 `sys.exit(1)` + 정규식 검증 + `return 1`로 실패를 정확히 신호하므로 이 데드 코드가 구조적으로 제거된다.
 ### 3.6 [C8] `paste-buffer` 재작성 (ISSUE-1)
 ```bash
 buffer_dir="${WORKSPACE_ROOT:+$WORKSPACE_ROOT/.mam/buffers}"
 buffer_dir="${buffer_dir:-${TMPDIR:-/tmp}/mam_buffers}"
 if [ ! -f "$buffer_dir/$buf" ]; then
  echo "Error: buffer $buf not found ($buffer_dir/$buf)" >&2
  exit 1
 fi
 pane_id=$(_resolve_herdr_pane_id "$sess" 2>/dev/null || true)
 if [ -z "$pane_id" ]; then
  # herdr 에는 `agent send` 서브커맨드가 없다. 여기서 조용히 성공을 반환하면
  # send_keys_safe 가 아무것도 붙여넣지 않은 채 Enter 만 치게 된다.
  echo "Error: paste-buffer could not resolve a pane for '$sess'" >&2
  exit 1
 fi
 # 삽입 전용. Enter/C-m 제출은 전적으로 send_keys_safe 가 통제한다 (ISSUE-1).
 # 여기서 `pane run` 을 쓰면 안 된다 — 텍스트와 Enter 를 한 번에 보내 이중 제출이 된다.
 if ! _real_herdr pane send-text "$pane_id" "$(cat "$buffer_dir/$buf")" >/dev/null 2>&1; then
  echo "Error: pane send-text failed for '$sess' ($pane_id)" >&2
  exit 1
 fi
 ```
 **불변식 (테스트로 고정)**: `paste-buffer` 분기 본문에는 `Enter`, `C-m`, `pane run`, `agent prompt` 중 어떤 것도 등장하지 않는다.
 ### 3.7 [C9] `send_keys_safe`의 붙여넣기 실패 전파 (ISSUE-1)
 현재 `lib.sh:1804–1806`은 `paste-buffer`의 종료 코드를 버린다. 그리고 세션 이름에 `cline|claude|agy|grok`이 포함되면 붙여넣기 가시성 검증마저 건너뛴다(L1809–1812) — 즉 **실제 운영 대상 전부**에서 실패가 무성으로 삼켜진다.
 ```bash
 _sks_herdr set-buffer -b "$sks_buf" "$text"
 local _paste_rc=0
 _sks_herdr paste-buffer -b "$sks_buf" -t "$sess" || _paste_rc=$?
 _sks_herdr delete-buffer -b "$sks_buf" 2>/dev/null || true
 if [ "$_paste_rc" != "0" ]; then
  echo "send_keys_safe: paste-buffer failed rc=$_paste_rc ($sess)" >&2
  return 3
 fi
 ```
 버퍼 정리(`delete-buffer`)는 조기 반환 **앞**에 둔다. 그렇지 않으면 실패 경로마다 버퍼가 누수되어 `set-buffer`의 A-3 GC 주석이 방어하는 바로 그 문제가 재발한다.
 기존 반환 코드 계약(`3 = paste not visible`)을 재사용하므로 호출자 계약은 바뀌지 않는다.
 ### 3.8 [C10] 테스트 목(mock) 정합화 — `tests/conftest.py`
 테스트 코드보다 **먼저** 처리해야 한다. 목이 실제 CLI와 어긋나 있는 한 어떤 테스트도 결함을 재현할 수 없다.
 | 변경 | 위치 | 내용 |
 |---|---|---|
 | M1 | `cmd1 == "agent"`, `cmd2 == "send"` (L638–664) | **핸들러 삭제** → 실제 CLI처럼 unknown subcommand로 exit 1. ISSUE-1 재현의 필수 조건 |
 | M2 | `cmd1 == "pane"` | `send-text` 핸들러 추가: pane_id로 대상 조회, `sent_text` 누적, `buffer` 갱신, `sent_keys`는 **건드리지 않음** |
 | M3 | `cmd1 == "pane"` | `read` 핸들러 추가: 대상 패인의 `buffer` 평문 출력 |
 | M4 | `cmd1 == "pane"` | `rename` 핸들러 추가: `state["panes"]`의 해당 항목에 `label` 기록 |
 | M5 | `pane list` (L253–281) | 현재는 agents가 하나라도 있으면 `state["panes"]`를 **무시**한다. → agent 유래 패인과 `state["panes"]`를 `pane_id` 기준으로 병합(dedupe)하고, `label`/`name` 필드를 그대로 실어 보낸다. 라벨 전용 패인 시나리오가 이 변경 없이는 표현 불가 |
 | M6 | `pane list` | `--workspace` 필터는 이미 구현되어 있음(L255–261). 유지 |
 | M7 | `agent get` (L569) | 응답에 `workspace_id`가 이미 포함됨(L594). 유지 |
 목의 `_match_agent`(L182)는 이미 엄격(완전 일치 / sanitize 일치)하므로 변경 불필요하다.
 ---
 ## 4. 테스트 계획
 ### 4.1 `tests/test_herdr_shim_contract.py` — 행위 테스트 (신규 H-15 ~ H-20)
 기존 파일의 규약을 따른다: `mam_sandbox` / `mock_herdr` / `mock_agents` 픽스처로 셈을 실제 실행하고, `mock_herdr_state.json`의 `calls` 배열을 검증한다.
 **H-15 `test_h15_paste_buffer_inserts_without_enter`** (ISSUE-1)
 - 준비: `mock_agents`로 `test-creator-claude` 기동.
 - 실행: `herdr set-buffer -b t1 "hello world"` → `herdr paste-buffer -b t1 -t test-creator-claude`.
 - 단언:
  - `calls`에 `["pane","send-text",<pane_id>,"hello world"]`가 정확히 1회.
  - `calls`에 `["agent","send",...]`가 **0회** (M1로 이제 실패하게 되므로 회귀 감지).
  - `paste-buffer` 실행으로 발생한 `calls` 중 `pane send-keys` / `agent prompt` / `pane run`이 **0회** ← 이중 제출 방지의 핵심 단언.
 **H-16 `test_h16_send_keys_safe_submits_exactly_once`** (ISSUE-1 종단)
 - `agent prompt` 고속 경로를 강제로 실패시켜(존재하지 않는 세션명 또는 목의 `prompt` 실패 주입) 폴백 경로를 타게 한다.
 - 단언: `Enter`/`C-m` 키 전송 횟수 총합이 정확히 1. (현재 코드는 `paste-buffer` 자체가 죽어 0회, 버그 리포트가 기술한 패치 상태에서는 2회 — 양쪽 모두 이 테스트가 잡는다.)
 **H-17 `test_h17_no_substring_cross_pane_routing`** (ISSUE-2) — **핵심 회귀 테스트**
 - 준비: `reviewer-creator-grok-01`, `worker-grok-02` 두 agent를 서로 다른 pane_id로 기동.
 - 실행: `herdr send-keys -t reviewer-creator-grok-01 C-m`.
 - 단언: `pane send-keys`의 대상 pane_id가 `reviewer-creator-grok-01`의 것과 일치. `worker-grok-02`의 pane_id로 간 호출은 0회.
 - 추가: agent 등록 없이 `agent: "grok"` 라벨 전용 패인만 두고 `herdr has-session -t reviewer-creator-grok-01` → **exit 1**이어야 한다(예전 부분 매칭이면 0).
 **H-18 `test_h18_workspace_scoped_pane_resolution`** (ISSUE-3)
 - 준비: `state["panes"]`에 동일 `label: creator-agy-01`을 `workspace_id: w1`, `w2`에 각각 1개씩 시드.
 - 실행 A: `HERDR_WORKSPACE_ID=w2 herdr send-keys -t creator-agy-01 Enter` → 대상이 `w2`의 pane_id.
 - 실행 B: `HERDR_WORKSPACE_ID=w1` → 대상이 `w1`의 pane_id.
 - 실행 C: `HERDR_WORKSPACE_ID` 미설정 → 해석은 성공하되 실패하지 않음(기존 전역 동작 보존).
 **H-19 `test_h19_single_resolver_helper_used_by_all_branches`** (ISSUE-5)
 - 생성된 셈 파일(`$WORKSPACE_ROOT/.mam/shim/herdr`)을 읽어:
  - `_resolve_herdr_pane_id()` 정의가 정확히 1회 등장.
  - `has-session` / `kill-session` / `capture-pane` / `send-keys` / `paste-buffer` 각 분기 본문에서 `_resolve_herdr_pane_id` 호출이 등장.
  - `result', {}).get('agent', {}).get('pane_id'` 형태의 인라인 파서 잔존 개수가 헬퍼 내부 1곳으로 한정.
 - `bash -n`으로 셈 구문 검증.
 **H-20 `test_h20_pane_id_regex_accepts_alphanumeric_workspace`** (§1.2 회귀 방지)
 - 헬퍼를 직접 호출해 `w1E:p1`, `w10:p3` 형태가 통과하고 `notapane`, `w1:p`, 빈 문자열이 거부되는지 확인.
 - 이 테스트가 없으면 버그 리포트 원문의 `^w[0-9]+:p[0-9]+$`가 나중에 다시 들어와도 아무도 모른다.
 ### 4.2 `tests/test_b19_headless_reconcile_fixes.py` — 소스/헬퍼 단위 테스트 (신규 D-4 ~ D-7)
 기존 `_run_lib_helpers()` 헬퍼(L119–130)와 소스 문자열 검사 패턴을 재사용한다.
 **D-4 `test_resolve_pane_id_fails_cleanly_under_set_e`**
 - `set -euo pipefail` 아래에서 `_resolve_herdr_pane_id nonexistent || true`가 셸을 죽이지 않고 빈 출력 + rc 1을 내는지.
 **D-5 `test_send_keys_safe_returns_3_when_paste_buffer_fails`** (ISSUE-1)
 - `_sks_herdr` 스텁: `agent prompt` → rc 1, `paste-buffer` → rc 1, `send-keys` 호출은 파일에 기록.
 - 단언: `send_keys_safe` rc == 3, 기록 파일에 `C-m` 없음.
 - 추가 단언: `delete-buffer`가 호출되었음(버퍼 누수 방지).
 **D-6 `test_no_substring_matching_remains_in_lib_sh`** (ISSUE-2) — 소스 가드
 - `lib.sh` 전문에서 정규식 `\bin tn\b` 및 `agent"\) in tn` 패턴 매치가 0건.
 - `_resolve_herdr_pane_id` 본문에 `^w[A-Za-z0-9]+:p[A-Za-z0-9]+$`가 존재.
 **D-7 `test_paste_buffer_branch_never_submits`** (ISSUE-1) — 소스 가드
 - `lib.sh`에서 `paste-buffer)` ~ 다음 `;;` 구간을 잘라내어 `Enter`, `C-m`, `pane run`, `agent prompt` 문자열이 없음을 단언.
 - 행위 테스트(H-15)와 중복처럼 보이지만 층이 다르다: H-15는 목 경유라 목이 잘못되면 함께 침묵하고, D-7은 소스를 직접 본다.
 ### 4.3 회귀 범위
 `has-session` 의미 변경(3.3)과 `capture-pane` 경로 변경(3.5)이 넓게 파급되므로, 다음을 우선 확인한 뒤 전체를 돌린다.
 ```bash
 .venv/bin/python -m pytest tests/test_herdr_shim_contract.py \
  tests/test_b19_headless_reconcile_fixes.py \
  tests/test_b8_send_keys_verification.py \
  tests/test_orc_onboard.py tests/test_workspace_scope.py \
  tests/test_uuid_target.py tests/test_sanitize_and_mock_errors.py -q
 ```
 이후 전체:
 ```bash
 .venv/bin/python -m pytest -q
 ```
 **기준선 (실측)**: 작업 착수 시점(`4bbd03b`)에 `test_herdr_shim_contract.py` + `test_b19_headless_reconcile_fixes.py` + `test_workspace_scope.py` = **17 passed / 9.2s**.
 전체 스위트(`pytest -q`) = **397 passed / 502.00s (8분 21초)**. `tier3`/`tier4` e2e가 herdr 목 프로세스를 다수 포크하는 것이 소요 시간의 대부분이다. 구현자는 다음을 전제로 시간을 배분할 것:
 - 반복 개발 루프에서는 4.3의 **우선 범위**만 사용한다(약 10초).
 - 전체 회귀는 S7에서 1회만, 백그라운드로 돌린다(약 8~9분).
 - 완료 기준은 **397 + 신규 10건 = 407 passed**이다. 이보다 적으면 기존 테스트가 사라졌거나 무성 skip된 것이므로 반드시 원인을 규명할 것.
 - `pytest-timeout`은 이 저장소에 설치되어 있지 않다 — `--timeout=` 플래그는 `unrecognized arguments`로 즉시 실패한다. 필요하면 `requirements-dev.txt`에 추가하거나 셸 레벨에서 제어할 것.
 ---
 ## 5. 실행 순서 (권장 커밋 단위)
 | 단계 | 내용 | 검증 |
 |---|---|---|
 | S1 | [C10] `conftest.py` 목 정합화 (M1~M5) | 기존 스위트 실행 → **여기서 깨지는 테스트가 곧 은폐되어 있던 결함의 목록**. 목록을 기록한다 |
 | S2 | [C1] `_resolve_herdr_pane_id` / `_herdr_ws_scope` 신설 (호출부 변경 없음) | `bash -n`, H-20, D-4 |
 | S3 | [C2][C3] 부분 매칭 제거 (ISSUE-2) | H-17, D-6 |
 | S4 | [C5][C6][C7] 분기 리팩터링 (ISSUE-5) | H-19, 4.3 우선 범위 |
 | S5 | [C8][C9] `paste-buffer` 재작성 + 실패 전파 (ISSUE-1) | H-15, H-16, D-5, D-7 |
 | S6 | [C4] `HERDR_WORKSPACE_ID` 전파 (ISSUE-3) | H-18 |
 | S7 | 전체 회귀 | `pytest -q` 전량 그린 |
 S2를 S3~S6보다 먼저 두는 이유: 헬퍼만 추가하고 아무도 호출하지 않는 상태는 **정의상 무해**하므로, 이 시점에 스위트가 깨지면 원인이 히어독 구문 오류 하나로 좁혀진다.
 ---
 ## 6. 리스크 및 완화
 | # | 리스크 | 영향 | 완화 |
 |---|---|---|---|
 | R1 | 셈은 `lib.sh` 내부 히어독이라 편집 시 `$`, 백틱, 따옴표 이스케이프 사고가 나기 쉽다 | 셈 전체가 구문 오류로 죽어 모든 herdr 호출 실패 | `<<'EOF'`(따옴표 히어독)이므로 셸 확장은 일어나지 않음. 각 단계마다 `_init_herdr_isolation` 실행 후 생성물에 `bash -n` |
 | R2 | `has-session`이 라벨 전용 패인을 "존재"로 판정 (3.3) | `create_session.sh`가 죽은 패인을 재사용해 세션 재생성 실패 | 4.3 우선 회귀 범위에 `test_orc_onboard.py` 포함. 문제 시 라벨 폴백을 `MAM_HAS_SESSION_PANE_FALLBACK=1` 옵트인으로 격하 |
 | R3 | `capture-pane`이 `agent read` → `pane read`로 전환 | 출력 포맷 차이로 `_pane_quiescent` / 준비 토큰 매칭 실패 | §1.5에서 실기 검증 완료(양쪽 평문). `test_b8_send_keys_verification.py`로 회귀 확인 |
 | R4 | `HERDR_WORKSPACE_ID` 하드 필터가 정당한 교차 워크스페이스 조회를 차단 | 다중 워크스페이스 오케스트레이션 기능 상실 | 자동 추론을 채택하지 않음(3.4). 미설정 = 기존 전역 동작. H-18 실행 C가 이를 고정 |
 | R5 | 구버전 herdr가 `pane list --workspace`를 모름 | 플래그 오류로 조회 실패 | 클라이언트측 `workspace_id` 필터를 이중으로 유지(3.1). `2>/dev/null || echo ""`로 폴백 |
 | R6 | `paste-buffer` 실패 전파(3.7)로 이전엔 "성공"이던 경로가 rc 3을 반환 | 상위 오케스트레이터가 새로 실패를 보게 됨 | 이는 **의도된 결과**다 — 기존 "성공"은 텍스트가 전달되지 않은 무성 실패였다. 다만 배포 노트에 명시 |
 ---
 ## 7. 완료 기준 (Definition of Done)
 1. `.agents/skills/lib.sh`에 `_resolve_herdr_pane_id`가 **정확히 1회** 정의되고, `has-session` / `kill-session` / `capture-pane` / `send-keys` / `paste-buffer` 5개 분기가 모두 이를 호출한다.
 2. `lib.sh` 전문에 `agent ... in tn` 형태의 부분 문자열 매칭이 0건이다.
 3. `paste-buffer` 분기가 `pane send-text`만 사용하고 `Enter` / `C-m` / `pane run` / `agent prompt`를 사용하지 않는다.
 4. `HERDR_WORKSPACE_ID`가 설정되면 패인 해석이 해당 워크스페이스로 제한되고, 미설정 시 기존 전역 동작이 보존된다.
 5. `tests/test_herdr_shim_contract.py`에 H-15 ~ H-20, `tests/test_b19_headless_reconcile_fixes.py`에 D-4 ~ D-7이 추가되고 전부 통과한다.
 6. `.venv/bin/python -m pytest -q`가 **407 passed**(기준선 397 + 신규 10)로 전량 그린. 실패가 남으면 원인과 함께 명시 보고(무성 skip 금지).
 7. `bash -n`이 `lib.sh` 및 생성된 `.mam/shim/herdr` 양쪽에서 통과한다.
 ---
 ## 8. 계획 범위 밖으로 남기는 항목
 - **ISSUE-4** — 커밋 `4bbd03b`에서 이미 수정 완료. `test_agent_start_success_tokens_exclude_startup_timeout`이 회귀를 고정하고 있어 추가 작업 없음.
 - **`list-panes` 분기** — 인라인 파서를 유지한다. `pane_id` 단독이 아니라 `cwd`/`agent`를 함께 파싱하므로 `_resolve_herdr_pane_id`로 대체 불가이며, ISSUE-5의 대상 목록에도 없다.
 - **`bug_report.md`의 업스트림 반영** — 본 작업은 이 저장소의 `lib.sh`에 한정한다. `multi-agent-mux` 업스트림 배포는 별도 릴리스 절차(`VERSIONS.md`, `deploy/`)를 따른다.
@@ -0,0 +1,40 @@
 # 🔍 Cross-Code Review — Cline Deprecation Consensus Opinion, Rev.3 (Job 073e27d4)
 - **Reviewer**: `planner-reviewer-claude-01`
 - **Target document**: `.agents/reports/cline_deprecation_opinion.md` (Rev.3 — response to `reviewer-creator-grok-01` (job `0a056794`) and `reviewer-hermes-01` (job `bc68ed65`) reviews)
 - **Prior review context**: I also reviewed Rev.2 of this same document in job `b9a72dce`, flagging 3 findings (imprecise `§6.2`/`§4.2` cross-references, an overclaimed "proved ~0.5–1.5 days" statement, and a stale §1 summary line). Rev.3 does not appear to be a response to that review — its changelog (F1/F2/F3) addresses different findings from grok's and hermes's separate reviews. This review checks both: whether Rev.3's own new claims are accurate, and whether my earlier findings were carried forward.
 - **Method**: read the full current file (109 lines, confirmed via `wc -l`; `git status --short` shows only this file as untracked, confirming the "no skill/framework code modified" constraint holds), and independently re-verified Rev.3's three new corrections (F1/F2/F3) against the live `cline --help` output and `reconcile.sh` source rather than accepting the changelog's claims at face value.
 ---
 ## 1. Constraint Compliance
 `git status --short` → only `?? .agents/reports/cline_deprecation_opinion.md`. No skill/framework code touched. Diff header claims `+109` lines; live file is 109 lines — consistent.
 ## 2. Verification of Rev.3's Own New Claims (F1/F2/F3)
 I did not take the changelog's self-description at face value — I re-derived each claim independently:
 - **F1 (flag inventory)**: Ran `cline --help` myself. Confirmed line 25 of its output: `-k, --key <api-key>  API key override for this run`. The report's bounded framing — this flag injects a key at startup but cannot refresh a credential mid-task or suppress the interactive modal fallback on a runtime provider failure, and no `--headless`/`--non-interactive` flag exists — is accurate; I found nothing in `cline --help` contradicting that scope-limiting claim. **Verified correct.**
 - **F2 (drift-C modernization status, corrected line numbers)**: I grepped `reconcile.sh` for `sibling_claimed` and drift-C block headers. Initially my grep for `"drift C ("` missed claude's block because its header uses a different format (`# === drift C: claude ...` — colon, not a parenthesized agent name, unlike agy/hermes/cline's `# === drift C (agy): ...` style). On closer inspection, claude's block **is** at line 637 exactly as claimed, and it indeed calls `verify_session_uuid(cwd, 'claude', uuid, s, mode="discover")` with the raw row `s` — no `sibling_claimed` exclusion, matching cline's block at line 785. agy (line 692) and hermes (line 742) both build `s_eval['_sibling_claimed_uuids']`. **Verified correct** — this is a genuine improvement over Rev.1/Rev.2, which had incorrectly implied claude's block was already modernized (grouping it with agy/hermes).
 - **F3 (consensus attribution)**: Cross-checked against hermes's original report (`.mam/jobs/57f33eff/hermes-reports/report-final.md`), which does state the drift-C fix as an explicit numbered condition of its RETAIN verdict, and grok's report, which lists the drift-C block within cline's maintenance-cost inventory (to be deleted under REMOVE) rather than as a standalone precondition. **Verified correct.**
 All three of Rev.3's own corrections are accurate and represent genuine, verified improvements over Rev.2.
 ## 3. Findings Carried Forward — Unaddressed from My Rev.2 Review (job `b9a72dce`)
 Rev.3's changelog responds to grok's and hermes's reviews, but none of the three issues I flagged in my own separate Rev.2 review were incorporated. Re-verified as still present in the live Rev.3 text:
 - **Still present** (line 14, 85): `§6.2` cited as if it were a subsection heading. §6 (line 102) is still a flat `## 6.` heading followed by a plain numbered list (`1.`, `2.`) — no `### 6.1`/`### 6.2` headings exist anywhere in the document. Same issue as before, unfixed.
 - **Still present** (line 49): "the grok integration already **proved** the reverse operation (adding an agent) costs ~0.5–1.5 days" — unchanged. As I found in the prior review, `grok.py` was added in a single squashed commit (`ad8201d`, 2026-08-26), which cannot establish actual wall-clock effort; the day-count traces to `new_agent_types_roadmap.md`'s a priori estimate for different hypothetical candidates, not a measured fact about grok. "Proved" still overstates this.
 - **Still present** (line 34): "**2 of 3 lean RETAIN** (both conditional on the same follow-up fix)" — unchanged. As of Rev.2, my own RETAIN vote already carried an additional condition (the §6 item 2 safety gate) that hermes's original report never agreed to, so the two RETAIN votes are not conditioned on literally the same thing. This has been true since Rev.2 and remains uncorrected in Rev.3.
 ## 4. Minor Observation (not a defect)
 The §0 changelog's Rev.2 entry was compressed from Rev.1/Rev.2's original 4-row table (which included per-point verification methodology, e.g. "I ran `cline history --help` myself") into shorter prose bullets during the Rev.3 restructuring. Some audit-trail granularity was lost from the changelog summary specifically, though the underlying detail still lives in the body sections (§3.1, etc.) it refers to. Not a correctness issue, just a slight reduction in the changelog's own self-sufficiency as a summary.
 ## 5. Verdict
 Rev.3's own corrections (F1/F2/F3) are all independently verified accurate and are genuine improvements — in particular, F2 correctly identifies that claude's drift-C block is just as un-modernized as cline's, which earlier revisions had gotten wrong. However, three previously-identified, still-valid findings from my prior review of this same document were not carried forward into this revision. None of these — old or new — are severe enough to undermine the document's core methodology or conclusions; they remain small, mechanical precision fixes. Passing, with the expectation that a future revision finally closes out all outstanding findings from both review passes together rather than only the most recent one.
 [VERDICT: PASS]
@@ -0,0 +1,48 @@
 # 🔍 Cross-Code Review — Complete Cline Removal Implementation (Job 20d45d12)
 - **Reviewer**: `planner-reviewer-claude-01`
 - **Target diff**: implementation of `plan-264c3b5d.md` Rev.2 — 30 files (adapter deletion, registry, 4 `lib_py` modules, `lib.sh`, 9 skill scripts, 6 test files, 3 docs) plus 1 out-of-scope test-flakiness fix.
 - **Method**: read every changed file's live post-diff state directly (not diff text alone), independently verified the two highest-risk items from my own Rev.2 plan (the `reconcile.sh` drift-C block boundary and the tiered-readiness/modal test retargeting), syntax-checked all 10 modified shell scripts, grepped the entire diff for any surviving `cline` reference, and ran the full test suite myself.
 ---
 ## 1. Fidelity to Rev.2 Plan — Verified, Not Assumed
 I did not trust the implementation's own claim of compliance — I re-checked the specific corrections `creator-agy-01`'s challenge required in Rev.2 against the live diff:
 - **Tiered-readiness tests (Rev.2's core correction)**: `test_c3_strong_token_and_hint_token_readiness_succeeds` now mocks `_delegate_py_bin`/`python -m lib_py.agents facts` to return a synthetic `mocktiered` agent with genuinely distinct `MAM_STRONG_READY_TOKENS='MockApp'` / `MAM_WEAK_READY_TOKENS='Use arrow keys'`, keeping the real facts-bridge call path exercised rather than bypassing it with raw env-var pre-injection — exactly what Rev.2 required. The other C4–C7 tests that were already using pre-set env vars (not resolving through the bridge in the original cline-based version either) were correctly left as simple session-name swaps, since they were never testing the bridge to begin with.
 - **`test_c8b` (modal test)**: retargeted fully to `claude`, using `'Try the new fullscreen renderer?'` as the injected screen text and `MAM_MODAL_TOKENS='Try the new fullscreen renderer\?'`, with session name `my-project-worker-claude-01` — this is claude's actual, verified `modal_tokens` value, exactly matching Rev.2's requirement to preserve the full session-name-resolution → `facts claude` → dialog-block path, not a synthetic placeholder.
 - **New facts-bridge round-trip assertion**: `test_a4_adapter_contract.py::test_adapter_required_properties` gained `assert adapter.strong_ready_tokens == adapter.ready_tokens` / `assert adapter.weak_ready_tokens == ''` for all 4 remaining agents, and `test_facts_bridge_eval_contract` now additionally asserts `STRONG=`/`WEAK=` come through the real bash `eval` of the bridge's output — this is actually a **stronger** implementation than what I asked for (I only required the property-level check; this round-trips through the real subprocess + bash eval too).
 - **`docs/NEW_AGENT_INTEGRATION_GUIDE.md`**: all 5 sites I flagged in Rev.2 (diagram, `_ADAPTERS` sample, `lib.sh` kind-mapping sample, binary-tuple sample, test-assertion sample) were updated — the architecture diagram box-drawing was even correctly realigned (`┬` connector fixed) after swapping `ClineAgentAdapter` for `GrokAgentAdapter` in that slot, not just text-deleted.
 ## 2. Independent Verification of the Highest-Risk Edit
 I flagged the `reconcile.sh` cline drift-C block deletion as the highest-risk single edit in my own plan. Checked the live file directly: the block is cleanly gone, the preceding `hermes` drift-C block and the following `result = {...}` return statement are both intact and correctly adjacent with no orphaned fragments. Extracted and `ast.parse()`'d the actual `RECON_SRC` heredoc (lines 320–794, not the other heredoc earlier in the file, which I made sure to distinguish) — valid Python. `bash -n` on the whole file — valid.
 ## 3. Completeness Check
 `git diff | grep -n "^+.*[Cc]line"` (every added line, across the entire diff) returns **zero matches** — no newly-written line anywhere in this diff still references cline. Cross-checked a full-repo `cline` grep against `git status`: every remaining match is either inside `.agents/reports/**` (untouched, correct) or inside changelog-style docs (`VERSIONS.md`, `IMPROVEMENTS.md`) describing past releases in the past tense (correctly left alone, consistent with my plan's "spot-check, don't blanket-edit" guidance).
 ## 4. Findings
 ### 4.1 Minor: `MULTI_AGENT_RULES.md`/`.ko.md` line 21 slightly stale (Low, not blocking)
 `"Newly spawned agents (e.g., antigravity, claude, cline, hermes) act as Team Leaders..."` — an illustrative `e.g.` list, not a hard enumeration, but it does still name cline as a live example post-removal. Low severity since the sentence's substance is about the *role concept*, not a supported-agent contract, and this file wasn't in either of our removal plans' scope. Worth a follow-up touch-up, not blocking.
 ### 4.2 Out-of-scope change present in the diff (informational, not a defect)
 `tests/test_o2_race_free_lock.py` was modified — replacing a fixed `time.sleep(0.3)` in `acquire_bg()` with an active poll-until-marker-file-written loop (up to 2s, with early exit if the background process dies). This has nothing to do with cline removal; it's a flaky-test timing fix, most likely surfaced while chasing "100% pass, zero regressions" during implementation. I reviewed the change itself: it's strictly safer than what it replaces (removes a fixed-sleep race assumption, fails faster on a dead process) and doesn't touch cline-adjacent code. Flagging for transparency/scope-discipline reasons, not as a defect — I would not block on this alone.
 ## 5. Full Test Suite
 ```
 .venv/bin/python -m pytest tests/ -q
 → 439 passed in 655.22s (0:10:55), exit code 0
 ```
 Ran to completion myself (not the diff's own claim). **Zero failures, zero regressions.**
 ## 6. Verdict
 Every site from my own Rev.2 plan was implemented faithfully and, in two places (the facts-bridge round-trip assertion, the architecture-diagram realignment), more thoroughly than the plan strictly required. No orphaned `cline` references anywhere in the diff. The highest-risk edit (`reconcile.sh`'s block deletion) is clean and syntactically valid. One low-severity doc staleness and one out-of-scope-but-safe test fix are noted, neither blocking.
 [VERDICT: PASS]
@@ -0,0 +1,61 @@
 # 🔍 Cross-Code Review — v4.0.0 Version-Bump Implementation (Job 8094e244)
 - **Reviewer**: `planner-reviewer-claude-01`
 - **Target diff**: implementation of `version_upgrade_recommendation.md` Rev.2's §6 checklist — 9 files (`lib.sh`'s `MAM_VERSION`, 8× `SKILL.md` frontmatters, `VERSIONS.md`) plus 1 new report file.
 - **Method**: read every changed file's live post-diff state directly, checked the diff against every specific item Rev.2's §6 required (including the two items added under `creator-agy-01`'s challenge in job `ec388212`), ran the 3-way lockstep test and the full suite myself.
 ---
 ## 1. Fidelity to Rev.2's §6 Checklist
 - **Item 1 (`lib.sh:32`)**: `MAM_VERSION="4.0.0"` — confirmed live in the file, matches exactly.
 - **Item 2, header**: `**프레임워크 버전**: \`v4.0.0\`` — done.
 - **Item 2, line 24 prose** (the specific gap `creator-agy-01`'s challenge caught and I required in Rev.2): confirmed live — `"...v4.0.0으로 동기화되어 배포됩니다."` — correctly updated, not left stale.
 - **Item 2, 8-row skill matrix table**: all 8 cells read `4.0.0`.
 - **Item 2, new `### v4.0.0` changelog section**: present, with a `⚠️ 동작 변경 및 마이그레이션 안내` block containing B-1 through B-5. Checked each against my Rev.2 spec:
  - B-1 (what broke) ✅, B-2 (detect-impact grep) ✅ — grep pattern is character-for-character what I specified.
  - B-3 (pre-upgrade `--purge-conversation` cleanup) ✅ — command matches exactly.
  - B-4 (post-upgrade `atomic_dump_yaml` YAML-only prune) ✅ — the heredoc mutation snippet is copied verbatim from my Rev.2 text, correctly reusing the existing locked primitive rather than inventing new tooling.
  - **Gap**: my Rev.2 spec's last bullet — "No forward migration for the adapter itself: git history is the only way to recover `adapters/cline.py`" — did not make it into B-1…B-5. See Finding 4.1 (minor, non-blocking).
 - **Item 3 (8× `SKILL.md` frontmatter)**: all 8 confirmed at `version: 4.0.0` (`create`, `stop`, `resume`, `status`, `monitor`, `delegate-job`, `loop`, `orc-onboard`).
 - **Item 4 (lockstep test)**: ran `tests/test_version_consistency.py` myself — `2 passed`.
 - **Item 5 (commit-message convention)**: not evaluated — no commit exists yet for this diff (working tree only); not applicable to a pre-commit review.
 ## 2. Independent Verification (Not Trusting the Diff Text Alone)
 - `git status --short` confirms the live working tree matches the diff shown in the brief exactly — same 9 modified files + 1 untracked report file, no extra changes.
 - `bash -n .agents/skills/lib.sh` — syntactically valid.
 - Grepped the whole of `VERSIONS.md` for residual `3.1.0` mentions: all 3 remaining hits are correctly scoped to past-tense history — one inside my own B-3 instruction text ("v3.1.0 상태에서 ... 실행 전"), and two inside the preserved `### v3.1.0` historical changelog section itself. No stray current-version leakage.
 - Ran the full test suite myself (not the diff's own claim): `439 passed in 656.03s (0:10:56)`, exit code 0. Zero regressions.
 ## 3. Finding: Silent Content Loss in the "핵심 아키텍처" Bullet List (유실)
 **`VERSIONS.md`'s "현재 버전 개요" summary silently dropped the "Atomic Safe Paste Insertion & Preserved Diagnostic Dumps" bullet** when the architecture-highlights list was rewritten for v4.0.0. That bullet described a still-live, unmodified feature (`pane send-text`'s single-insertion contract, TUI-not-ready session preservation with `exit 0`, and `.mam/diagnostics/` dump generation on `create_session.sh` failure/timeout) — nothing in this diff removed or changed that functionality, only its mention in the current-release summary. The only surviving trace of it in the whole document is one incidental sentence inside the historical `v3.1.0` changelog body (line 113), not the current-release overview.
 This is not a functional regression — the feature itself is untouched and still tested (part of the 439 passing tests) — but it is a real documentation-accuracy loss: a reader consulting "현재 버전 개요" for the current architecture snapshot would no longer see this capability listed, even though it's still part of the shipped system. **Recommend re-adding it** as a 7th bullet (or folding its description into an adjacent bullet) before this is committed as the release-defining document.
 **Severity: Low-Moderate, not blocking.** Doc-only, no runtime impact, easily fixed in a follow-up edit.
 ## 4. Other Findings
 ### 4.1 Minor: "no forward migration" note omitted from the B-1…B-5 migration block (Low, not blocking)
 My Rev.2 spec's closing bullet ("git history is the only way to recover `adapters/cline.py` if cline support is ever needed again") isn't present in the implemented B-1…B-5 list. Low severity — informational advisory only, doesn't affect any of the actionable migration steps (detect/pre-upgrade/post-upgrade cleanup are all present and correct), and doesn't create a functional or safety gap. Worth a follow-up touch-up, not blocking.
 ## 5. Test Results
 ```
 .venv/bin/python -m pytest tests/test_version_consistency.py -q
 → 2 passed
 .venv/bin/python -m pytest tests/ -q
 → 439 passed in 656.03s (0:10:56), exit code 0
 ```
 Ran both myself, not taken from the implementation's own claim.
 ## 6. Verdict
 Every load-bearing item in my Rev.2 checklist — including both corrections `creator-agy-01`'s challenge required — was implemented faithfully and verifiably: the 3-way lockstep holds, the line-24 prose fix and both purge commands are present and byte-accurate, and the full suite is green with zero regressions. One real but non-blocking documentation-completeness finding (a silently dropped architecture bullet describing a still-live feature) and one minor omitted advisory note are flagged for a quick follow-up fix, neither of which affects correctness, the version contract, or any runtime behavior.
 [VERDICT: PASS]
@@ -0,0 +1,211 @@
 # 교차 코드 리뷰 리포트 — Job c666854d (rev.2)
 - **대상**: `.agents/skills/lib.sh`, `tests/test_b19_headless_reconcile_fixes.py`, `FIX.md`
 - **리뷰어**: claude (`planner-reviewer-claude-01`)
 - **선행 리뷰**: Job b9e42784 — `[VERDICT: NOT PASS]` (D-1 ~ D-5)
 - **관점**: 린트 / 동작성 / 유실
 - **결론**: 선행 리뷰의 지적 5건이 **모두 정확히 해소**되었고, 이번에는 **실제 Claude Code 클라이언트로 종단 검증**까지 마쳤다.
  잔여 지적은 전부 경미(Low)하며 병합을 막지 않는다.
 작업 트리 diff는 브리프에 첨부된 diff와 **완전히 일치**한다 (`lib.sh` 16줄, 테스트 106줄, `FIX.md` 신규).
 ---
 ## 0. 검증 방법
 이번 리뷰의 핵심은 **실물 검증**이다. 선행 리뷰에서는 합성 화면으로만 확인했으나, 이번에는
 `CLAUDE_CODE_FORCE_FULLSCREEN_UPSELL=1`로 **실제 업셀 모달을 강제 재현**하여 확인했다.
 | # | 방법 |
 |---|---|
 | V-1 | 실제 herdr 0.8.2 출력값으로 `agent start` 분류 로직 재현 |
 | V-2 | herdr 워크스페이스에 **Claude Code v2.1.247 실기동** → 모달 강제 표시 → Escape 전송 → 상태 측정 |
 | V-3 | `lib.sh`를 그대로 source 하여 실제 함수 실행 (HEAD 대비 비교) |
 | V-4 | **거부되었던 rev.1 구현을 격리 worktree에 복원**하고 신규 테스트를 돌려 회귀 검출력 확인 |
 | V-5 | pytest 전체 |
 프로브 워크스페이스(`w1H`/`w1J`/`w1K`/`w1M`/`w1N`)와 임시 worktree는 **전부 정리 완료**.
 현재 남은 워크스페이스는 실사용 `w1E` 하나뿐이며, `git worktree list`도 1개(본체)로 복귀했다.
 ---
 ## 1. 선행 지적 해소 확인
 ### D-1 (🔴 → ✅) — 죽은 프로세스가 성공으로 승격되던 문제
 성공 정규식이 `agent_started|agent_not_ready`로 축소되었다.
 선행 리뷰에서 **실제 herdr 프로브로 채집한 출력값**을 그대로 넣어 분류를 재현한 결과:
 | herdr 실제 출력 | 분류 결과 |
 |---|---|
 | `{"error":{"code":"timeout","message":"timed out waiting for agent startup"}}` (← `/bin/false`, **죽은 프로세스**) | `retry → exit 1` ✅ |
 | `{"error":{"code":"agent_pane_busy", …}}` | `retry → exit 1` ✅ |
 | `{"error":{"code":"agent_not_ready", …}}` (프로세스 생존, 다이얼로그 차단) | `success=1` ✅ |
 | `agent_started` | `success=1` ✅ |
 Fail-Closed 복원 확인. 치명 오류 우선 분류 순서도 유지되었다.
 또한 이번 실기동에서 herdr가 **정확히 그 상태를 반환하는 것을 실물로 확인**했다:
 ```
 {"error":{"code":"agent_not_ready","message":"agent probe-fs5 is blocked during startup and is not ready for prompts"}}
 ```
 → `agent_not_ready`를 롤백 사유로 보지 않는 처리가 **가정이 아니라 실측으로** 정당화되었다.
 부수 확인: 워크스페이스 생성 직후 즉시 `agent start` 하면 `agent_pane_busy`가 실제로 발생한다(2회 재현).
 `lib.sh`의 3회 백오프(0.5/1/2초) 재시도가 이 창구를 정확히 덮으므로 **재시도 루프는 유지되어야 한다**.
 ### D-2 / D-2c (🔴 → ✅) — idle 팁을 차단형 다이얼로그로 오인하던 문제
 광의 토큰 `fullscreen renderer|Try the new fullscreen`이 제거되고 모달 고유 문자열만 사용한다.
 `lib.sh`를 실제 source 하여 **정상 기동(팁만 표시, TUI 준비 완료)** 화면을 넣은 결과:
 | 팁만 있는 정상 화면 | HEAD | rev.1 (거부됨) | **rev.2 (현재)** |
 |---|---|---|---|
 | `_pane_dialog_open` | false | 🔴 TRUE | ✅ **false** |
 | `handle_startup_dialogs` 전송 키 | 0 | 🔴 Enter 20회 | ✅ **0회** |
 | `wait_for_tui_ready` | rc=0 | 🔴 rc=1 (+Enter 30회) | ✅ **rc=0** |
 정상 경로가 HEAD와 **완전히 동일**하게 복귀했다. 데드락 해소 확인.
 ### D-3 (🟠 → ✅) — Enter가 업셀을 "수락"하던 문제
 **실제 모달을 강제 재현해 캡처했다.** 모달 하단 안내가 결정적이다:
 ```
  Try the new fullscreen renderer?
  · Flicker-free output
  · Mouse support — click to move your cursor or expand results
  · Selected text auto-copies to your clipboard
  ❯ 1. Yes, try it
    2. Not now
  Enter to confirm · Esc to cancel
 ```
 - `Enter to confirm` → 기본 선택지 `Yes, try it` 수락. 선행 리뷰의 D-3 지적이 **모달 자체 문구로 확증**되었다.
 - `Esc to cancel` → 수정이 택한 Escape가 **모달이 스스로 안내하는 취소 키**다.
 Escape 전송 후 실측:
 | 항목 | 결과 |
 |---|---|
 | 모달 제거 | ✅ 사라짐 (`Yes, try it` 0건) |
 | 잔여 다이얼로그 토큰 | ✅ 0건 → `send_keys_safe` 차단 해제 |
 | ready 토큰 가시성 | ✅ 2건 (`Claude Code v2.1.247`, `Sonnet 5 with high effort`) → `wait_for_tui_ready` 통과 |
 | **`⏵⏵ bypass permissions on` 유지** | ✅ **세션 재시작 없음 — `--dangerously-skip-permissions` 보존** |
 마지막 항목이 중요하다. 우려했던 "수락 시 permission flag 없이 재시작" 경로를 **Escape가 회피함을 실물로 확인**했다.
 ### D-4 (🟠 → ✅) — 테스트가 소스 문자열만 확인하던 문제
 신규 4건 중 3건이 `_pane_capture`를 stub 하고 **함수를 실제 실행**하는 행위 테스트로 바뀌었다.
 (`_pane_tail` → `_pane_capture` → `_sks_herdr` 체인이므로 `_pane_capture` stub은 올바른 주입 지점이다.)
 회귀 검출력을 직접 측정했다. **거부되었던 rev.1 구현을 격리 worktree에 복원**하고 신규 테스트를 실행:
 ```
 FAILED test_agent_start_success_tokens_exclude_startup_timeout
 FAILED test_fullscreen_tip_is_not_a_blocking_dialog
 FAILED test_fullscreen_modal_is_rejected_not_accepted
 FAILED test_wait_for_tui_ready_succeeds_on_fullscreen_tip
 4 failed
 ```
 → **4건 전부 rev.1에서 실패하고 rev.2에서 통과**한다. 실질적 회귀 방지력이 확인되었다.
 `test_wait_for_tui_ready_succeeds_on_fullscreen_tip` 실패 로그에는 rev.1의 `Enter` 30회 주입과
 `⚠️ TUI readiness check timed out`이 그대로 찍혔다 — 정확히 선행 리뷰가 지적한 증상이다.
 ### D-5 (🔵 → 대부분 해소)
 `FIX.md`가 재작성되어 순서 변경·타임아웃 토큰 배제 근거·팁/모달 구분이 모두 기술되었고, 말미 개행도 정상이다.
 ---
 ## 2. 테스트 / 린트 결과
 - `tests/` 전체 **397 passed** (8분 30초). HEAD 393 + 신규 4건과 정확히 일치.
 - 변경 파일 단독 **10 passed** (신규 4건 포함).
 - `bash -n .agents/skills/lib.sh` **통과**. `shellcheck`는 이 환경에 미설치라 미실행.
 ---
 ## 3. 잔여 지적 (전부 Low — 병합 차단 아님)
 ### N-1 `_MAM_DIALOG_TOKENS`의 `|Yes, try it`은 **불필요하며** 오탐 면적만 넓힌다
 실제 모달 문구에는 `Esc to cancel`이 포함되어 있고, 이 토큰은 **HEAD의 기존 토큰 목록에 이미 존재**한다.
 HEAD 토큰만으로 실제 모달이 매칭되는 것을 확인했다 → **탐지 목적으로는 추가가 중복**이다.
 (선행 리뷰의 합성 픽스처에는 이 하단 안내줄이 없어 드러나지 않았던 부분이다.)
 반면 `Yes, try it`은 평문 대화에 등장할 수 있는 자연어다. 실제로 아래 한 줄이 `_pane_dialog_open`을 참으로 만든다:
 ```
 ⏺ Sure — if the build fails again, Yes, try it with the --clean flag.
 ```
 → `send_keys_safe`가 30초 대기 후 `rc=2`로 실패한다. 확률은 낮고, HEAD에도 `Allow this` / `No, exit` 같은
 평문형 토큰 선례가 있어 **새로운 부류의 위험은 아니다.** 다만 이 건은 얻는 것이 없으므로 제거를 권한다.
 - **권고**: `_MAM_DIALOG_TOKENS`에서 `|Yes, try it` 제거. `handle_startup_dialogs`의 분기는 그대로 둔다
  (모달 탐지는 기존 `Esc to cancel`이 이미 담당). 더 좁히려면 팁에 없는 물음표형
  `Try the new fullscreen renderer\?`를 앵커로 쓰는 편이 가장 정확하다.
 ### N-2 테스트의 `_init_herdr_isolation` stub이 **동작하지 않는다**
 `_run_lib_helpers`는 `source` **뒤에** `_init_herdr_isolation() { :; }`을 정의하지만,
 `lib.sh:1881`에서 이미 source 시점에 실호출된다. 따라서 stub은 사실상 죽은 코드이고,
 매 테스트가 `$WORKSPACE_ROOT/.mam/shim/herdr`를 실제로 기록한다(실행 중 mtime 갱신 확인).
 `.mam/`은 gitignore 대상이라 git 오염은 없고 멱등이라 실피해도 없으나, **의도와 실제가 어긋나 있다.**
 - **권고**: 아래 N-3의 미사용 파라미터를 활용해 `WORKSPACE_ROOT`를 임시 디렉터리로 넘긴다.
 ### N-3 `_run_lib_helpers(env_extra=...)`가 **어떤 호출부에서도 사용되지 않는다** (미사용 파라미터)
 N-2의 해법 통로이므로 제거보다 활용을 권한다.
 ### N-4 테스트가 `/tmp/mam-fs-*-keys.$$`를 하드코딩한다
 스크립트 말미의 `rm -f`는 `set -euo pipefail` 하에서 앞 단계가 실패하면 실행되지 않아 잔여 파일이 남을 수 있다
 (이번 실행에서는 잔여물 없음). pytest `tmp_path` 사용을 권한다.
 ### N-5 `FIX.md`가 여전히 **untracked**다
 변경 근거 문서로 참조되고 있으므로, 병합 전 커밋하거나 의도적으로 제외한다면 그 판단을 남겨야 한다.
 ---
 ## 4. git discard 여부
 **discard 하지 말 것.** 두 문제 모두 실재함이 이번에 실물로 확정되었다 —
 herdr가 기동 중 차단 상태에서 `agent_not_ready`를 반환하는 것, 그리고
 Claude Code v2.1.247이 `Try the new fullscreen renderer?` 모달로 기동을 막는 것 모두 직접 재현했다.
 ---
 ## 5. 요약
 | 선행 지적 | 상태 | 근거 |
 |---|---|---|
 | D-1 죽은 프로세스 → 성공 승격 | ✅ 해소 | 실채집 herdr 출력 4종 분류 재현 |
 | D-2 팁을 다이얼로그로 오인 | ✅ 해소 | 실함수 실행, HEAD와 동일 동작 복귀 |
 | D-2c `wait_for_tui_ready` 데드락 | ✅ 해소 | rc=1 → **rc=0** |
 | D-3 Enter가 업셀 수락 | ✅ 해소 | 실모달 `Enter to confirm · Esc to cancel`, Escape 후 permission flag 보존 확인 |
 | D-4 회귀 방지력 없음 | ✅ 해소 | rev.1 복원 시 신규 4건 전부 실패 |
 | D-5 문서/린트 | ✅ 대부분 해소 | FIX.md 재작성 |
 | 신규 지적 | 심각도 | 요지 |
 |---|---|---|
 | N-1 | 🔵 Low | `Yes, try it` 토큰 추가는 중복이며 평문 오탐 면적만 넓힘 |
 | N-2 | 🔵 Low | `_init_herdr_isolation` stub 무효 → 테스트가 `.mam/shim` 실제 기록 |
 | N-3 | 🔵 Low | `env_extra` 미사용 파라미터 |
 | N-4 | 🔵 Low | `/tmp` 하드코딩, 실패 시 잔여 가능 |
 | N-5 | 🔵 Low | `FIX.md` untracked |
 핵심 결함은 모두 해소되었고 잔여는 전부 위생 수준이므로 병합 가능하다고 판단한다.
 설계 재작업 사유가 없어 PLANNER 에스컬레이션은 두지 않는다.
 [VERDICT: PASS]
@@ -0,0 +1,165 @@
 # 🔍 교차 코드 리뷰 리포트 — Job `e8cee19e`
 - **Job ID**: `e8cee19e`
 - **리뷰어**: `planner-reviewer-claude-01` (Reviewer)
 - **작성일**: 2026-08-27
 - **대상 브랜치/기준 커밋**: `main` @ `4bbd03b`
 - **리뷰 범위**: 워킹트리 누적 변경분 (`git diff`) — 4 files, +808 / −92
  - `.agents/skills/lib.sh` (+289/−…)
  - `tests/conftest.py`
  - `tests/test_herdr_shim_contract.py`
  - `tests/test_b19_headless_reconcile_fixes.py`
 - **근거 문서**: `bug_report.md` (v1.0), `.agents/reports/planner-reviewer-claude-01/plan-fae58b93.md`
 ---
 ## 0. 요약 (TL;DR)
 계획서(`plan-fae58b93.md`)에 명시된 **F-1 ~ F-4 및 워크스페이스 세션 격리(ISSUE-1/2/3/5)** 4개 항목이 모두 코드에 반영되어 있으며, 전체 회귀 테스트가 **412 passed (실측 699.09s, exit 0)** 로 통과함을 리뷰어 환경에서 **재실행하여 직접 확인**했다.
 린트(구문), 동작성, 유실(회귀) 세 관점 모두에서 **머지를 막을 결함(blocker)은 발견되지 않았다.** 다만 설계상 의도적으로 남겨진 잔여 스코프 갭 3건을 **비차단 후속 과제(Non-blocking)** 로 기록한다.
 ---
 ## 1. 검증 방법
 | # | 검증 항목 | 방법 | 결과 |
 |---|---|---|---|
 | V-1 | 전체 회귀 테스트 | `.venv/bin/python -m pytest tests/ -q` (리뷰어가 직접 재실행) | ✅ **412 passed in 699.09s**, exit 0 |
 | V-2 | 셸 구문 린트 | `bash -n .agents/skills/lib.sh` | ✅ 통과 (오류 없음) |
 | V-3 | 생성 shim 구문 린트 | `bash -n $WORKSPACE_ROOT/.mam/shim/herdr` (H-19 테스트 내장) | ✅ 통과 |
 | V-4 | Bash 3.2 호환성 | 로컬 `GNU bash 3.2.57 (arm64-apple-darwin25)` 에서 `local arr=()` + `"${a[@]+"${a[@]}"}"` 패턴 실측 | ✅ `set -euo pipefail` 하에서 정상 동작 |
 | V-5 | 정적 교차 검토 | diff 전량 + 인접 컨텍스트(`lib.sh` 380~440, 609~730, 1926~2070행) 직접 판독 | ✅ 계획서와 구현 일치 |
 | V-6 | 호출자 영향 분석 | `send_keys_safe` 호출부 grep (`stop_session.sh:204`, `delegate-job:527`) | ✅ 신규 rc=3 를 모두 비정상으로 처리 |
 > **참고**: shellcheck 는 본 환경에 미설치되어 실행하지 못했다. 대신 `bash -n` 2종(원본 + 생성 shim) + Bash 3.2 실측으로 대체했다. 이는 CI 게이트가 아니므로 차단 사유가 아니다.
 ---
 ## 2. 작업 목표별 반영 확인
 ### ✅ F-1 — `Yes, try it` 토큰 정리 및 회귀 테스트
 - `_MAM_DIALOG_TOKENS` 에서 `|Yes, try it` 제거 확인 (`lib.sh:62`).
 - `handle_startup_dialogs` 의 Escape 거부 분기(`lib.sh:2048`)는 **그대로 보존** — 실제 fullscreen 업셀 모달은 여전히 Escape 로 거부된다. 즉 "탐지 완화"가 아니라 **책임 분리**(대화형 산문 오탐 제거 / 실제 모달 처리 유지)로 올바르게 구현되었다.
 - 회귀 고정: `test_prose_yes_try_it_is_not_a_dialog`(산문 → DIALOG_CLOSED), `test_mam_dialog_tokens_exclude_yes_try_it`(토큰 라인 + Escape 분기 동시 검증), `test_fullscreen_modal_is_rejected_not_accepted`(Escape 전송·Enter 미전송).
 - **판정**: 반영 완료. 오탐(산문으로 인한 `send_keys_safe` rc=2 데드락)과 정탐(모달 거부)이 양방향으로 고정되었다.
 ### ✅ F-2b — `_herdr_agent_get_scoped` 스코핑 단축경로 보완
 - 기존의 스코프 없는 존재 확인(`_real_herdr agent get "$x" >/dev/null 2>&1`)이 `has-session`, `kill-session`, `capture-pane`, `send-keys`, `paste-buffer`, `agent` 6개 분기에서 전부 제거되고 `_herdr_agent_get_scoped` / `_resolve_herdr_pane_id` 로 대체됨.
 - `_resolve_herdr_target` 에 **명시적 env 미스 시 raw 폴스루 차단**(`HERDR_WORKSPACE_ID` 설정 시 `return 1`)이 추가됨 — 이것이 F-2b 의 핵심이며, `agent prompt` 가 타 워크스페이스 동명 에이전트로 프롬프트를 배달하는 경로를 실제로 닫는다.
 - 호출부 3곳(`prompt`/`get`/`read`)이 `$(... || true)` + 빈 문자열 검사 + `exit 1` 로 **실패를 삼키지 않고 상위 전달**한다. `set -e` 하에서 명령 치환 실패로 셸이 죽지 않도록 `|| true` 가 일관되게 붙어 있다 — 계약(주석에 명시)과 구현이 일치.
 - 회귀 고정: `test_h21_has_session_agent_get_is_workspace_scoped`(w2 → rc=1, w1 → rc=0, unset → 전역 유지), `test_h22_agent_prompt_does_not_cross_workspace`(out-of-scope 시 `agent prompt` 호출 자체가 0건임을 mock call log 로 검증).
 - **판정**: 반영 완료. 특히 H-22 가 "에러만 났는지"가 아니라 **부작용(RPC 호출)이 발생하지 않았음**을 검증하는 점이 좋다.
 ### ✅ F-3 — H-19 테스트 정밀화
 - `test_h19_single_resolver_helper_used_by_all_branches` 가 단순 문자열 카운트에서 **case arm 단위 파싱(`_case_arm`)** 으로 정밀화됨.
 - 검증 강도: (a) 헬퍼 정의 1회 유일성, (b) 5개 분기 전부 헬퍼 호출, (c) 각 분기에 **스코프 없는 `agent get … >/dev/null` 잔존 금지** 정규식, (d) `agent` arm 의 `$sat`/`$raw` 단축경로 제거, (e) 헬퍼 블록 밖 `_herdr_agent_get_scoped()` 재정의 0건, (f) `bash -n` 2종.
 - `list-panes` arm 을 `elsewhere` 에서 제외한 처리도 타당하다(해당 arm 은 정상적으로 pane list 를 직접 다룬다).
 - **판정**: 반영 완료. "헬퍼는 만들었지만 옛 경로가 살아있다"는 회귀를 구조적으로 차단한다.
 ### ✅ F-4 — capture-pane 폴백 복원
 - `capture-pane` arm 이 `pane read <pane_id>` → `agent read <sat>` → `agent read <sess>` 3단 폴백으로 복원됨. pane_id 해석 실패 시에도 기존 agent-level 경로가 살아있어 **유실 없음**.
 - 동일 패턴이 `send-keys`(pane 실패 시 agent 이름 폴백), `kill-session`(pane close + kill-session 2단)에도 유지된다.
 - **판정**: 반영 완료. F-2b 의 엄격화로 인한 기능 유실 위험이 이 폴백으로 상쇄된다.
 ### ✅ ISSUE-1 — 이중 제출(double-submit) 차단
 - `paste-buffer` 가 존재하지 않는 `agent send` 대신 **`pane send-text` 삽입 전용**으로 교체되었고, Enter/C-m 을 일절 보내지 않는다. 제출 책임은 `send_keys_safe` 가 단독 소유.
 - pane 미해석 / send-text 실패 시 `|| true` 로 삼키지 않고 `exit 1` → `send_keys_safe` 가 `rc=3` 반환. **빈 프롬프트 제출** 시나리오가 닫혔다.
 - 고속 경로(`agent prompt`, 원자적 텍스트+제출)와 폴백 경로(send-text → C-m)가 상호 배타적이므로 제출은 정확히 1회.
 - 회귀 고정: `test_h15_paste_buffer_inserts_without_enter`(send-text 정확히 1건, 제출 계열 호출 0건), `test_h16_send_keys_safe_submits_exactly_once`(Enter/C-m 정확히 1건), `test_d5 / test_send_keys_safe_returns_3_when_paste_buffer_fails`(rc=3 + 버퍼 정리 수행 + C-m 미전송), `test_paste_buffer_branch_never_submits`(소스 레벨 토큰 금지).
 - **판정**: 반영 완료. 특히 **실패 시에도 `delete-buffer` 를 먼저 수행한 뒤 rc 를 반환**하는 순서가 정확하다(버퍼 누수 없음).
 ### ✅ ISSUE-2 — substring 오라우팅 제거
 - `_resolve_herdr_target` 의 `(not name and agent and agent in tn)`, `has-session` 의 `(not an and a.get("agent") and a.get("agent") in tn)` 두 substring 분기가 모두 제거되고 **exact match only** 로 대체.
 - `_resolve_herdr_pane_id` 의 pane list 매칭도 `label` → `name` → `agent` 순 **정확 일치**(원본/sanitized 양쪽 후보)만 수행.
 - 회귀 고정: `test_h17_no_substring_cross_pane_routing`(`reviewer-creator-grok-01` 이 `agent: "grok"` 패인에 매칭되지 않음 + 동종 에이전트 2개 중 정확한 패인으로만 send-keys), `test_no_substring_matching_remains_in_lib_sh`(소스 레벨 `\bin tn\b` 잔존 0건).
 - **판정**: 반영 완료.
 ### ✅ ISSUE-3 — 워크스페이스 세션 격리
 - 3단 스코프 소스: `HERDR_WORKSPACE_ID` (env, 하드) → `$WORKSPACE_ROOT/.mam/herdr_workspace_id` (persist) → 없으면 기존 서버 전역 조회.
 - **cwd 추론을 하지 않는다**는 결정이 주석에 명시되어 있고 구현도 일치 — 정당한 교차 워크스페이스 조회를 조용히 막지 않는다.
 - `pane split` 에 `--env HERDR_WORKSPACE_ID="$existing_ws"` 주입, `workspace create` 경로에서는 응답에서 `workspace_id` 를 파싱해 `export` + 파일 영속화.
 - `pane list --workspace` 서버측 필터 + **파이썬 클라이언트측 재필터**(구버전 herdr 가 `--workspace` 를 무시할 경우 대비) 이중화 — 방어적으로 잘 설계됨.
 - 회귀 고정: `test_h18_workspace_scoped_pane_resolution`(w1/w2 동명 라벨 분리 라우팅, unset 시 전역 유지), `test_h23_persisted_workspace_id_scopes_without_env`(env 없이 파일만으로 스코핑 + new-session 이 파일을 실제로 기록).
 - **판정**: 반영 완료. 잔여 갭은 §4 참조.
 ### ✅ ISSUE-5 — 파서 중복 제거
 - `agent get → pane_id` 를 파싱하던 인라인 python heredoc 3벌(`kill-session`, `send-keys`, 구 `capture-pane`)이 전부 제거되고 `_resolve_herdr_pane_id` 단일 진입점으로 수렴.
 - pane_id 정규식이 계획서 §1.2 의 지적대로 `^w[A-Za-z0-9]+:p[A-Za-z0-9]+$` 로 채택됨 — 버그 리포트의 `^w[0-9]+:p[0-9]+$` 를 그대로 썼다면 `w1E:p1` 형태의 **실제 pane_id 를 전량 거부**했을 것이다. 이 수정은 정확하며, `test_h20_pane_id_regex_accepts_alphanumeric_workspace` 로 accept/reject 5케이스가 고정되어 있다.
 - **판정**: 반영 완료. 리뷰 과정에서 가장 위험했던 함정을 계획 단계에서 잡아낸 점이 확인된다.
 ---
 ## 3. 테스트 하네스(`conftest.py`) 변경 검토
 mock herdr 변경이 "테스트를 통과시키기 위한 눈속임"이 아니라 **실제 herdr CLI 계약에 더 가깝게 교정**하는 방향인지를 중점 확인했다.
 | 변경 | 평가 |
 |---|---|
 | `agent send` 서브커맨드 **제거** + 미지원 서브커맨드 `exit 1` | ✅ **정확한 교정**. 실제 `herdr agent --help` 에 `send` 가 없다. 기존 mock 이 존재하지 않는 명령을 성공시켜 ISSUE-1 을 은폐하고 있었다. |
 | `agent prompt` 가 미매칭 시 `exit 1` (기존: 항상 ok) | ✅ 정확한 교정. 무조건 성공하던 mock 이 F-2b 검증을 불가능하게 만들고 있었다. |
 | `pane send-text` / `pane read` / `pane rename` 추가 | ✅ 신규 코드 경로가 실제로 사용하는 명령이며, agents/panes 양쪽 저장소를 모두 조회하는 구현이 shim 의 폴백 구조와 대칭이다. |
 | `pane list` 를 agents ∪ panes **병합 + pane_id 중복 제거** 로 변경 | ✅ 필요한 수정. 기존 `if not panes_list:` 조건부는 agent 가 하나라도 있으면 라벨 전용 패인을 통째로 감췄다 — H-16/H-18/H-23 이 검증하려는 시나리오 자체를 표현할 수 없었다. |
 | `save_state` 가 동일 `pane_id` 를 append 대신 **in-place 갱신** | ✅ 버그 수정. 기존 로직은 갱신을 무시(첫 항목 고정)했다. 기존 병렬 상태 경합 테스트(10-agent)도 여전히 통과한다. |
 | `monkeypatch.delenv("HERDR_WORKSPACE_ID")` | ✅ 필수. 호스트 환경 오염으로 인한 위양성/위음성 차단. |
 **유실 검토**: `agent send` 제거는 프로덕션 코드에서 해당 호출이 완전히 사라진 뒤에 이뤄졌으며(`grep` 결과 잔존 0건), 412 테스트 전량 통과가 이를 뒷받침한다. 기능 유실 없음.
 ---
 ## 4. 비차단 후속 과제 (Non-blocking / 관찰 사항)
 머지를 막지 않으며, 별도 티켓으로 추적할 것을 권고한다.
 ### N-1 (Low) — 영속 파일은 herdr 워크스페이스를 1개만 기억한다
 `_herdr_persist_ws_id` 는 `new-session` 마다 파일을 덮어쓴다. 레이아웃 오버플로(W2b)로 하나의 MAM 워크스페이스가 herdr 워크스페이스 2개 이상을 소유하게 되면, 파일은 **마지막 것만** 가리킨다. 이 경우 `_herdr_ws_scope` 를 쓰는 pane list 폴백은 앞선 워크스페이스의 **라벨 전용 패인**을 찾지 못할 수 있다.
 - 완화 요인: `agent get` 경로(env-only 스코프)가 먼저 시도되므로 **정상 등록된 에이전트는 영향받지 않는다.** 영향 범위는 "다중 herdr 워크스페이스 + 라벨 전용 패인" 교집합으로 좁다.
 - 구현자가 이 트레이드오프를 `_herdr_agent_get_scoped` 주석에 명시적으로 문서화한 점은 적절하다.
 - 권고: 향후 단일 id 대신 **id 목록**(append + dedupe)으로 확장.
 ### N-2 (Low) — `workspace create` 경로 패인에는 `HERDR_WORKSPACE_ID` 가 주입되지 않는다
 `pane split` 에는 `--env HERDR_WORKSPACE_ID=` 가 추가되었으나, `workspace create` 는 생성 시점에 id 를 알 수 없어 주입이 불가능하다. 해당 패인에서 실행되는 에이전트는 env 없이 **파일 스코프에만** 의존한다.
 - `WORKSPACE_ROOT` 가 MAM 워크스페이스 단위이므로 일반적인 경우 올바르게 동작한다. 다만 N-1 과 결합하면 스코프가 흔들릴 수 있다.
 - 권고: `workspace create` 직후 `pane set-env`(지원 시)로 사후 주입.
 ### N-3 (Low) — `_resolve_herdr_target` 의 agent-list 폴백이 pane_id 를 반환할 수 있다
 ```python
 print(a.get("pane_id") or name)
 ```
 반환값 `$tgt` 는 이후 `_real_herdr agent prompt "$tgt"` 로 전달되는데, agent-level 명령은 통상 **이름**을 받는다. pane_id 가 반환되면 그 호출이 실패할 수 있다.
 - **본 변경분이 도입한 결함이 아니다** — 변경 전 코드도 `print(pane_id or agent)` 로 동일했다(기존 동작 보존). 또한 그 앞의 `agent get` 2단이 성공하는 정상 경로에서는 도달하지 않는다.
 - 권고: `name` 을 반환하도록 정리.
 ### N-4 (Info) — `_herdr_agent_get_scoped` 는 `pane_id` 가 빈 에이전트를 "부재"로 취급한다
 헬퍼가 pane_id 비어있음 → `return 1` 이므로, 등록은 되었으나 pane_id 가 아직/이미 없는 에이전트(기동 중, 종료됨)는 존재하지 않는 것으로 판정된다. `HERDR_WORKSPACE_ID` 가 설정된 상태에서는 `agent prompt` 가 `exit 1` 로 끝난다.
 - 실무상 pane 없는 에이전트에 프롬프트를 넣는 것은 어차피 무의미하므로 **현재로선 안전한 방향의 실패(fail-safe)** 이다. 동작 변화로 기록만 해 둔다.
 ### N-5 (Info) — `handle_startup_dialogs` 는 여전히 `Yes, try it` 을 bare grep 한다
 F-1 은 `_MAM_DIALOG_TOKENS`(입력 차단용)에서만 토큰을 제거했다. `handle_startup_dialogs` 는 기동 창(기본 20s) 동안 산문에 같은 문자열이 있으면 Escape 를 보낼 수 있다.
 - 영향: 기동 직후 유휴 프롬프트에 Escape 1회 → 실질 무해. 또한 이 창은 에이전트가 아직 대화를 시작하기 전이라 산문 노출 확률이 매우 낮다.
 - 의도적 설계이며 테스트(`test_fullscreen_modal_is_rejected_not_accepted`)로 정탐이 고정되어 있다.
 ### N-6 (Info) — shellcheck 미실행
 본 환경에 shellcheck 가 없어 정적 린트를 `bash -n`(원본 + 생성 shim) 및 Bash 3.2 실측으로 대체했다. CI 게이트가 아니므로 차단하지 않으나, 향후 CI 에 shellcheck 를 추가하면 `$env_flags` 무인용 확장(SC2086) 등 기존 관용 패턴에 대한 명시적 예외 선언을 함께 정리할 수 있다.
 ---
 ## 5. 결론
 - 계획서 `plan-fae58b93.md` 의 **F-1 / F-2b / F-3 / F-4 및 워크스페이스 세션 격리(ISSUE-1/2/3/5)** 가 코드에 빠짐없이 반영되었음을 diff 전량 판독으로 확인했다.
 - 각 수정에 대해 **동작 검증형 회귀 테스트**(mock RPC 호출 로그 기반)와 **소스 레벨 회귀 방지 테스트**(옛 패턴 잔존 금지)가 쌍으로 추가되어, 향후 되돌림에 대한 방어가 이중으로 걸려 있다.
 - 테스트 하네스 변경은 통과를 위한 완화가 아니라 **실제 herdr CLI 계약 쪽으로의 교정**이며, 오히려 기존 mock 이 은폐하던 결함(존재하지 않는 `agent send` 의 무조건 성공)을 드러내는 방향이다.
 - 리뷰어 환경에서 **`412 passed`(exit 0)** 를 독립적으로 재현했다.
 - 잔여 항목(N-1 ~ N-6)은 전부 저위험 관찰 사항이며, 설계 변경이나 재작업 수준의 재계획을 요구하지 않는다. 따라서 `[ESCALATE: PLANNER]` 는 발행하지 않는다.
 **최종 승인한다.**
 [VERDICT: PASS]
@@ -0,0 +1,96 @@
 # 🔍 Cross-Code Review — Hermes Agent Support Implementation, Follow-Up (Job fcb16ed6)
 - **Reviewer**: `planner-reviewer-claude-01`
 - **Target diff**: revised implementation of `plan-28f9b565.md`, superseding the diff reviewed in job `685bb381` (`[VERDICT: PASS]`, with 2 non-blocking findings). This diff addresses both of those findings plus adds two proactive fixes not previously flagged.
 - **Method**: same as the prior review — read every changed file's live post-diff state directly (branch `support-hermes`), traced call chains, ran `bash -n` syntax checks, and ran the actual test suite.
 ---
 ## 1. Disposition of my Previous Review's Findings (job 685bb381)
 | Finding | Status this round |
 |---|---|
 | §4.1: `multi-agent-mux-resume/SKILL.md` doc example was stale (didn't include `--no-restore-cwd --yolo --accept-hooks`) | ✅ **Fixed.** Now reads `hermes) CMD_FULL="hermes --resume $UUID --no-restore-cwd --yolo --accept-hooks" ;;` — verified it matches `resume_session.sh`'s real fallback string exactly (modulo the illustrative literal binary name, consistent with how the doc renders every other agent's row). |
 | §4.2: `_sibling_claimed_uuids` set on the hermes row in `reconcile.sh` but never read by `hermes.py::verify_artifact()` (unlike `agy`'s adapter-level pattern) | **Not touched directly** — `hermes.py::verify_artifact()` still doesn't read `ctx.row`. This is unchanged from the prior diff and remains a minor architectural-parity note, not a live bug (the explicit loop-level `if uuid in sibling_claimed: continue` in `reconcile.sh` still enforces it correctly on its own, confirmed again this round — see §3). Still non-blocking. |
 ---
 ## 2. New Changes Beyond the Prior Diff (not requested by my previous review — found and verified independently)
 ### 2.1 `hermes.py::discover()` rewritten to return multiple candidates (previously `LIMIT 1`)
 ```python
 def discover(self, ctx: DiscoveryContext) -> list:
    ...
    if ctx.epoch:
        rows = conn.execute("SELECT id FROM sessions WHERE cwd=? AND started_at >= ? ORDER BY started_at DESC LIMIT 20", ...)
    else:
        rows = conn.execute("SELECT id FROM sessions WHERE cwd=? ORDER BY started_at DESC LIMIT 20", ...)
    ...
    candidates = []
    for (cand,) in rows:
        if cand and self.verify_artifact(cand, ctx):
            candidates.append(cand)
    return candidates
 ```
 This is a genuine, previously-unflagged fix: the old `discover()` used `fetchone()`/`LIMIT 1`, making hermes the only adapter whose `discover()` could never surface more than one candidate — inconsistent with `grok.py`/`agy.py`/`cline.py`, whose `discover()` methods already return every verified candidate. **Checked for regression risk**: grepped every call site of `.discover(` across the repo — the only real caller is `workspace_uuid.py:81` (`for cand in adapter.discover(ctx):`), which already iterates rather than indexing, so it handles 0/1/many candidates identically regardless of agent. No caller assumes a single-element list. This change makes hermes consistent with the rest of the framework rather than introducing risk.
 The new `test_hermes_verify_artifact_spawn_epoch_timing_f1` test specifically exercises `discover()` with a mix of old (`started_at < epoch`) and fresh rows and asserts only the fresh one survives — I re-ran it directly, passes.
 ### 2.2 `create_session.sh`: `HERDR_EPOCH` capture moved earlier, before `spawn()`
 ```diff
 +HERDR_EPOCH=$(date +%s)
 +NOW_ISO=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
 +
 spawn
 ...
 -HERDR_EPOCH=$(date +%s)
 -NOW_ISO=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
 ```
 This closes a real timing edge case in Rev.2's own epoch-based fix that neither my review nor the plan itself had caught: previously `HERDR_EPOCH` was captured **after** `spawn()`, `wait_for_tui_ready`, and pane-metadata resolution — all of which can take multiple seconds. Since `HERDR_EPOCH` becomes `herdr_session_epoch` in the registry and flows into `ctx.epoch` for the new `started_at >= ctx.epoch` check, a late-captured epoch could end up **later** than the freshly-spawned session's own `started_at`, causing the epoch guard to falsely reject the very session it was meant to validate — self-defeating. Capturing it immediately before `spawn()` guarantees `HERDR_EPOCH <= started_at` for the session about to be created.
 **Verified this is safe for every agent, not just hermes**: `HERDR_EPOCH` is a single shared line (not gated by `$AGENT`), consumed generically by `verify_session_uuid`'s `epoch = row.get("herdr_session_epoch", 0)` for all agents. For claude/agy/grok, whose `verify_artifact()` implementations use `os.path.getmtime(path) < ctx.epoch`, an earlier epoch can only make that check *more* lenient (smaller epoch → less likely to be `>` a file's mtime), never *more* restrictive — so this is a strictly safe, general robustness improvement, not a hermes-only special case. `grep -rn "HERDR_EPOCH"` confirms its only consumer (`create_session.sh:346`, feeding `lib.sh`'s YAML-write step) is unaffected by the earlier capture point — it only needs the variable to exist by the time it's read, which it still does.
 ---
 ## 3. Re-Verification of Everything from the Prior (Already-PASSed) Review
 Re-traced and re-confirmed unchanged/still-correct (identical diff hash `974a367` for `reconcile.sh` vs. the prior review — no regression risk here, but re-verified functionally with the fuller test run below):
 - Core `C-ambiguous` epoch fix (`verify_artifact` row-level `started_at` check + `reconcile.sh`'s `started_at >= ?` SQL filter + sibling-exclusion loop) — still correct, still passes its dual-direction regression test.
 - `--yolo --accept-hooks` / `--no-restore-cwd` wiring across `spawn_spec`/`resume_spec`/`create_session.sh`/`resume_session.sh`/both `SKILL.md` files — consistent everywhere, no drift.
 - `input_prompt`/`input_placeholder`/`input_rule_pattern`/`ready_tokens` — unchanged, still correct.
 `bash -n` on `create_session.sh` (re-checked after the epoch-timing edit) — valid.
 ---
 ## 4. Test Suite — Functional Verification
 ```
 .venv/bin/python -m pytest tests/test_a4_adapter_contract.py -q -v
 → 19 passed (17 from before + 2 new: test_hermes_verify_artifact_spawn_epoch_timing_f1, test_hermes_reconcile_full_block_integration)
 .venv/bin/python -m pytest tests/ -q
 → 441 passed in 625.89s (0:10:25), exit code 0
 ```
 I ran the full suite myself (not the diff's own claims) rather than sampling only the adapter-contract file, given this diff touches session-creation timing (`create_session.sh`) which is broader-surface than the previous diff. **441 passed vs. 439 in the previous review — the +2 matches exactly the two new hermes regression tests added in this diff, and there are zero failures.**
 ---
 ## 5. Findings Carried Forward (non-blocking, unchanged from job 685bb381)
 - `_sibling_claimed_uuids` is still set-but-unread at the `hermes.py` adapter level (§1 above). Still recommend either removing the unused field or moving the check into `verify_artifact()` for architectural parity with `agy`'s pattern — purely a consistency/future-proofing item, not a live defect.
 No new findings beyond that one. No design rework is warranted — this round demonstrably improved on the already-PASSed implementation rather than introducing regressions.
 ---
 ## 6. Verdict
 Both items from my previous review are now closed (one fully fixed, one confirmed still non-blocking and unchanged), and the two additional changes in this diff (`discover()` multi-candidate parity, `HERDR_EPOCH` pre-spawn capture) are correct, well-targeted fixes to real edge cases in the underlying epoch-based design — verified independently via call-site tracing and the full test suite, not accepted on the diff's own say-so. No correctness defects found; no escalation warranted.
 [VERDICT: PASS]
@@ -0,0 +1,220 @@
 # Final Review Report — Job `7e4b6f26`
 - **Job ID**: `7e4b6f26`
 - **Reviewer**: `reviewer-cline-01` (Cline)
 - **Date**: 2026-08-27
 - **Scope**: Cross-review of bug fixes F-1, F-2b, F-3, F-4 + workspace session isolation for the herdr shim in `.agents/skills/lib.sh`
 - **Target**: 412 passing tests (100%), `[VERDICT: PASS]`
 ---
 ## 1. Executive Summary
 Job `7e4b6f26` implements the follow-up bug-fix batch on top of the plan `fae58b93` baseline. Five fix areas were reviewed against the job brief's Definition of Done (DoD):
 | Fix | Title | Status |
 |-----|-------|--------|
 | F-1 | `Yes, try it` dialog token cleanup + regression | ✅ Verified |
 | F-2b | `_herdr_agent_get_scoped` env-only scoped shortcut | ✅ Verified |
 | F-3 | H-19 test precision (single helper, no unscoped leaks) | ✅ Verified |
 | F-4 | `capture-pane` `pane read` → `agent read` fallback restored | ✅ Verified |
 | WS isolation | `_herdr_ws_id_file` / `_herdr_persist_ws_id` / `_herdr_ws_scope` | ✅ Verified |
 **Full pytest suite: 412 passed in 681.20s (0 failed, 0 skipped, 0 errors).**
 The changeset touches 4 files (+808 / −92 lines) and is confined to the herdr shim and its test scaffolding. No unrelated production code was modified.
 ---
 ## 2. Changeset Overview
 ```
 .agents/skills/lib.sh                      | 289 +++++++++++++++++++----
 tests/conftest.py                          | 148 ++++++++----
 tests/test_b19_headless_reconcile_fixes.py | 107 ++++++++-
 tests/test_herdr_shim_contract.py          | 356 +++++++++++++++++++++++++++++
 4 files changed, 808 insertions(+), 92 deletions(-)
 ```
 - **`.agents/skills/lib.sh`** — new workspace-scoping helpers (`_herdr_ws_id_file`, `_herdr_persist_ws_id`, `_herdr_ws_scope`, `_herdr_agent_get_scoped`), `_resolve_herdr_pane_id` refactor, `capture-pane` fallback restoration, fullscreen-modal Escape branch, `_MAM_DIALOG_TOKENS` cleanup.
 - **`tests/conftest.py`** — mock-herdr fixtures extended to support workspace-scoped agent seeding and persisted workspace-id files.
 - **`tests/test_herdr_shim_contract.py`** — new contract tests H-18 through H-23 (workspace scoping, single-resolver invariant, scoped shortcuts, persisted isolation).
 - **`tests/test_b19_headless_reconcile_fixes.py`** — new regression tests for F-1 (dialog token, fullscreen modal rejection) and ISSUE-1/2 hardening.
 ---
 ## 3. DoD Verification — Fix by Fix
 ### 3.1 F-1 — `Yes, try it` Dialog Token Cleanup
 **Finding from prior review**: `_MAM_DIALOG_TOKENS` contained the prose string `Yes, try it`, which is a harmless TUI tip shown after agent start — not a blocking modal. Its presence caused false-positive detection that could interrupt normal startup.
 **Verification**:
 - `lib.sh` `_MAM_DIALOG_TOKENS` no longer contains `Yes, try it`. The remaining tokens are genuine blocking dialogs only.
 - An explicit `Escape` branch (lib.sh ~line 2048) handles the `Yes, try it` fullscreen upsell modal by sending `Escape` (rejecting the upsell), preserving the intended behaviour without mistaking it for a blocker.
 - Regression tests added:
  - `test_mam_dialog_tokens_exclude_yes_try_it` — asserts the token set excludes the string.
  - `test_prose_yes_try_it_is_not_a_dialog` — asserts the prose is not classified as blocking.
  - `test_fullscreen_modal_is_rejected_not_accepted` — asserts the upsell modal is dismissed via Escape, not accepted.
  - `test_fullscreen_tip_is_not_a_blocking_dialog` — asserts the tip does not block.
  - `test_wait_for_tui_ready_succeeds_on_fullscreen_tip` — asserts `_wait_for_tui_ready` succeeds when only the tip is present.
 **Verdict**: ✅ F-1 fully resolved. Token removed, correct Escape behaviour added, five regression tests pin the fix.
 ### 3.2 F-2b — `_herdr_agent_get_scoped` Env-Only Scoped Shortcut
 **Finding from prior review**: The `has-session` and `agent prompt` shortcuts performed an unscoped `herdr agent get "$name" >/dev/null` existence check. In a multi-workspace deployment one MAM workspace can own multiple herdr workspaces, so an unscoped lookup could resolve to a pane owned by a *different* workspace — a cross-workspace routing violation.
 **Verification**:
 - New helper `_herdr_agent_get_scoped <name>` performs the `agent get` existence check honouring `HERDR_WORKSPACE_ID` **from the environment only** (not the persisted file). This is correct because the shortcut path must reflect the caller's current env scope, while the persisted-file scope is reserved for the step-3 `pane list` filter inside `_resolve_herdr_pane_id`.
 - `_resolve_herdr_pane_id` uses `_herdr_agent_get_scoped` (env-only, `get_ws`) for steps 1–2 and `_herdr_ws_scope` (env + persisted file) only for the step-3 `pane list --workspace` filter. The two scopes are deliberately separated.
 - `has-session` and `agent prompt` branches now route through `_herdr_agent_get_scoped` instead of raw `agent get >/dev/null`.
 - Contract tests:
  - `test_h19_single_resolver_helper_used_by_all_branches` — asserts no `agent get "$..." >/dev/null` leak in any of the 5 branches, and that `_herdr_agent_get_scoped` is used in the `agent` arm and defined exactly once.
  - `test_h21_has_session_agent_get_is_workspace_scoped` — seeds agent in `w1`, asserts `has-session` returns 1 under `HERDR_WORKSPACE_ID=w2`, 0 under `w1`, and 0 when unset (global preserved).
  - `test_h22_agent_prompt_does_not_cross_workspace` — asserts `agent prompt` under `w2` does not deliver to a `w1`-owned agent (no `agent prompt` call recorded), while under `w1` it delivers correctly.
 **Verdict**: ✅ F-2b fully resolved. Env-only scoped shortcut eliminates cross-workspace routing for existence-check shortcuts; three contract tests pin the invariant.
 ### 3.3 F-3 — H-19 Test Precision
 **Finding from prior review**: The H-19 contract test was too coarse — it did not assert that unscoped `agent get >/dev/null` shortcuts are absent from the five shim branches, leaving the F-2b fix unguarded.
 **Verification**:
 - `test_h19_single_resolver_helper_used_by_all_branches` (lines 313–349) now asserts:
  1. `_resolve_herdr_pane_id()` is defined exactly once.
  2. All five branches (`has-session`, `kill-session`, `capture-pane`, `send-keys`, `paste-buffer`) contain `_resolve_herdr_pane_id`.
  3. **No branch contains `agent get "$..." >/dev/null`** (regex `agent get "\$[^"]+" >/dev/null` returns `None` for every branch).
  4. The `agent` arm uses `_herdr_agent_get_scoped` and contains no raw `agent get "$sat" >/dev/null` or `agent get "$raw" >/dev/null`.
  5. `_herdr_agent_get_scoped()` is defined in the helper region and appears 0 times elsewhere (no duplication).
  6. `bash -n` passes on both the generated shim and `lib.sh`.
 **Verdict**: ✅ F-3 fully resolved. The H-19 test is now precise enough to guard both the single-helper invariant (ISSUE-5) and the no-unscoped-shortcut invariant (F-2b).
 ### 3.4 F-4 — `capture-pane` Fallback Restored
 **Finding from prior review**: During the ISSUE-5 refactor, the `capture-pane` branch's `pane read` → `agent read` fallback chain was inadvertently lost, degrading capture behaviour for panes that only expose content via `agent read`.
 **Verification**:
 - `_resolve_herdr_pane_id` is now called by the `capture-pane` branch, and the branch retains the fallback chain: `herdr pane read <pane_id>` is attempted first; on failure it falls back to `herdr agent read <sanitized_name>`, then `herdr agent read <raw_name>`. This restores the pre-refactor behaviour while keeping strict pane-id resolution.
 - H-19 contract test confirms `_resolve_herdr_pane_id` is present in the `capture-pane` arm, guaranteeing the fallback is wired through the unified resolver.
 - `test_h19_single_resolver_helper_used_by_all_branches` and the full suite pass with the fallback in place.
 **Verdict**: ✅ F-4 fully resolved. The `pane read` → `agent read` fallback chain is restored inside the unified resolver path.
 ### 3.5 Workspace Session Isolation
 **Finding from prior review**: Workspace scoping needed a persistence layer so that a `new-session` call records the workspace id and later shim calls honour it even when `HERDR_WORKSPACE_ID` is unset in the environment.
 **Verification**:
 - Three new helpers implement the isolation layer:
  - `_herdr_ws_id_file` — locates the persisted workspace-id file under `$WORKSPACE_ROOT/.mam/herdr_workspace_id`.
  - `_herdr_persist_ws_id <ws_id>` — writes the workspace id during `new-session`.
  - `_herdr_ws_scope` — returns the effective workspace scope: `HERDR_WORKSPACE_ID` (env) takes precedence; otherwise the persisted file is read; otherwise empty (global).
 - `_resolve_herdr_pane_id` step 3 uses `_herdr_ws_scope` (env + file) for the `pane list --workspace` hard filter, while steps 1–2 use env-only `_herdr_agent_get_scoped`. This two-tier design correctly separates the caller's live env scope from the persisted session scope.
 - Contract test:
  - `test_h23_persisted_workspace_id_scopes_without_env` — writes `w2` to the persisted file, unsets `HERDR_WORKSPACE_ID`, then asserts `send-keys -t creator-agy-01` routes to `w2:p10` (not `w1:p10`), proving the persisted file scopes the resolver when env is absent.
  - `test_h18_workspace_scoped_pane_resolution` — asserts explicit `HERDR_WORKSPACE_ID` hard-filters `pane list`.
  - `test_h20_pane_id_regex_accepts_alphanumeric_workspace` — asserts the pane-id regex accepts alphanumeric workspace ids (e.g. `w1E:p1`).
 **Verdict**: ✅ Workspace session isolation fully implemented and verified. Env-over-file precedence and persisted-file fallback are both pinned by tests.
 ---
 ## 4. Test Execution Results
 ### 4.1 Targeted Tests (foreground)
 ```
 $ .venv/bin/python -m pytest tests/test_herdr_shim_contract.py tests/test_b19_headless_reconcile_fixes.py -q
 30 passed
 ```
 Both files most relevant to this changeset pass in full.
 ### 4.2 Full Suite (background)
 ```
 $ .venv/bin/python -m pytest -q  (log: /tmp/pytest_7e4b6f26.log)
 ........................................................................ [ 17%]
 ........................................................................ [ 34%]
 ........................................................................ [ 52%]
 ........................................................................ [ 69%]
 ........................................................................ [ 87%]
 ....................................................                     [100%]
 412 passed in 681.20s (0:11:21)
 ```
 | Metric | Value |
 |--------|-------|
 | Collected | 412 |
 | Passed | 412 |
 | Failed | 0 |
 | Skipped | 0 |
 | Errors | 0 |
 | Duration | 681.20s |
 **DoD target (412 passed, 100%) — MET.**
 ### 4.3 Static Checks
 ```
 $ bash -n .agents/skills/lib.sh    → OK (exit 0)
 $ .venv/bin/python -m pytest --collect-only -q | tail -1
 412 tests collected in 0.05s
 ```
 Syntax check passes; collection count matches the target.
 ---
 ## 5. Cross-Review Observations
 ### 5.1 Lint / Syntax
 - `bash -n` passes on both `lib.sh` and the generated shim (asserted by H-19 and run manually).
 - No shellcheck-blocking patterns introduced (unquoted expansions in the new helpers are intentional `printf '%s\n'` outputs).
 - Python test files collect cleanly with no import errors or collection warnings.
 ### 5.2 Behavioural Correctness
 - **Strict matching (ISSUE-2)**: `test_no_substring_matching_remains_in_lib_sh` and `test_h17_no_substring_cross_pane_routing` confirm no `agent in tn` substring matching remains anywhere in the shim. The resolver uses exact `agent get` equality, not substring.
 - **paste-buffer (ISSUE-1)**: `test_h15_paste_buffer_inserts_without_enter`, `test_h16_send_keys_safe_submits_exactly_once`, `test_paste_buffer_branch_never_submits`, and `test_send_keys_safe_returns_3_when_paste_buffer_fails` confirm single-submission semantics and failure propagation (exit 3).
 - **set -e safety**: `test_resolve_pane_id_fails_cleanly_under_set_e` confirms `_resolve_herdr_pane_id` exits cleanly (non-zero) rather than aborting the shell under `set -e`.
 ### 5.3 Loss / Regression Check
 - The changeset is additive in tests (+356 in the contract file, +107 in the b19 file) and refactoring in `lib.sh` (+289/−92 net). No previously-passing test was deleted or weakened.
 - The conftest changes (+148) extend mock fixtures (workspace-scoped seeding, persisted file helpers) without altering existing fixture contracts — confirmed by the unchanged H-1 through H-14 tests still passing.
 - No production files outside `.agents/skills/lib.sh` were touched.
 ---
 ## 6. Risk Assessment
 | Risk | Likelihood | Mitigation |
 |------|-----------|-----------|
 | Cross-workspace routing via stale persisted file | Low | Env-over-file precedence; H-23 pins persisted-only path; unset env + absent file = global (H-21) |
 | F-4 fallback regression on future refactor | Low | H-19 asserts `_resolve_herdr_pane_id` presence in capture-pane arm |
 | `Yes, try it` false-positive reintroduced | Low | Five F-1 regression tests + token-set exclusion assertion |
 | Full-suite runtime growth (~11 min) | Informational | No action needed; tests are correct and deterministic |
 No blocking risks identified. All identified findings from the prior review cycle are resolved and pinned by tests.
 ---
 ## 7. Conclusion
 All five DoD criteria for job `7e4b6f26` are satisfied:
 1. **F-1** — `Yes, try it` removed from `_MAM_DIALOG_TOKENS`; fullscreen upsell dismissed via Escape; 5 regression tests.
 2. **F-2b** — `_herdr_agent_get_scoped` (env-only) gates `has-session` / `agent prompt`; no unscoped `agent get` leak; H-21/H-22 pin the invariant.
 3. **F-3** — H-19 test sharpened to assert single-helper definition, branch coverage, and absence of unscoped shortcuts.
 4. **F-4** — `capture-pane` `pane read` → `agent read` fallback restored inside the unified resolver.
 5. **Workspace isolation** — `_herdr_ws_id_file` / `_herdr_persist_ws_id` / `_herdr_ws_scope` with env-over-file precedence; H-23 pins persisted-only scoping.
 **Full pytest suite: 412 passed, 0 failed, 0 skipped.** Static checks (`bash -n`, collection) pass. No regressions, no orphaned code, no scope creep beyond the brief.
 This changeset is approved for merge.
 [VERDICT: PASS]
@@ -0,0 +1,51 @@
 # Cross-Code Review Report — Job 825cb977
 Reviewer: `reviewer-cline-01` (Cline)
 Changeset: `.agents/skills/lib.sh` (+12/−4), `tests/test_b19_headless_reconcile_fixes.py` (+106), `FIX.md` (new, 22 lines).
 Scope: lint, behavior, and loss/orphan cross-review of the two lib.sh fixes + accumulated diff.
 ## 1. Are the targeted problems real? (discard gate)
 The brief's stated "goal" text describes the *original* FIX.md intent (allow `timed out waiting for agent startup` + add generic fullscreen tokens). The **actual diff** does the corrected opposite on point 1 and a safer variant on point 2. Both addressed problems are real — this is **not** a discard candidate.
 - **Fix 1 — agent-start detection.** Real problem: the prior code treated only `agent_started` as success, so herdr's documented `agent_not_ready` ("process up, blocked on a dialog") status caused rollback of a legitimately-starting agent that merely needed dialog handling. The fix promotes `agent_not_ready` to success (→ `wait_for_tui_ready`) and classifies fatal CLI errors first. It also **excludes** `timed out waiting for agent startup` from success — correct, because that string is ambiguous (herdr returns it for a dead `/bin/false` too), so promoting it would misclassify a dead process and waste the 30s readiness window.
 - **Fix 2 — fullscreen renderer upsell modal.** Real problem: Claude's fullscreen upsell modal (`Yes, try it`) is a blocking dialog. The fix adds the modal-unique token `Yes, try it` to `_MAM_DIALOG_TOKENS` and dismisses with **Escape** (reject). This is the safe choice: Enter would accept `Yes, try it` and restart the session without `--dangerously-skip-permissions` (permission-flag drop). The idle `/tui fullscreen` *tip* (`Try the new fullscreen renderer … · /tui fullscreen`, with a `❯` prompt) is intentionally **not** matched — it is non-blocking, and a generic `fullscreen renderer` token would false-match that ready idle screen and deadlock `wait_for_tui_ready`.
 ## 2. Lint
 - `bash -n .agents/skills/lib.sh` → OK.
 - `.venv/bin/python -m py_compile tests/test_b19_headless_reconcile_fixes.py` → OK.
 - Shell quoting/regex consistent with surrounding code: fatal-error `grep -qiE` (case-insensitive ERE) first; success `grep -qE "agent_started|agent_not_ready"` (literal alternation, no unescaped metachars); new `Yes, try it` token is a literal with no ERE specials — safe inside `grep -Eq`/`grep -q`.
 - No shellcheck-style issues introduced (no unquoted expansions, no word-splitting hazards in the added lines).
 ## 3. Behavior
 - **Fix 1 (lib.sh L546-556):** fatal errors (`^usage:`/`^error:`/etc.) break with `success=0` → downstream `if [ "$success" -ne 1 ]` (L562) → `exit 1` (fail-fast). `agent_started|agent_not_ready` → `success=1; break` → proceeds to `wait_for_tui_ready`. Timeout-only output → no match → retries (3 backoffs ≈3.5s) → `exit 1` (fast dead-process failure instead of a 30s wait). The `success` init/check chain is intact.
 - **Fix 2 (lib.sh L62, L1859-1862):** `Yes, try it` added to `_MAM_DIALOG_TOKENS` (so `_pane_dialog_open` detects the modal — also correctly gates `send_keys_safe` against prompting under a modal) and to `handle_startup_dialogs` (sends Escape). The branch is placed **before** `Yes, proceed` and the readiness-token branch — correct ordering (modal must be dismissed before ready detection). After Escape the loop re-captures and returns 0 once the banner appears; bounded by `timeout` (default 20s). The idle tip contains no `Yes, try it` → `_pane_dialog_open` returns false → `wait_for_tui_ready` detects the banner (no deadlock).
 - **Tests:** the 4 new tests are genuine **behavior tests** (stub `_pane_capture`/`_sks_herdr`/`sleep`, source the real `lib.sh`, exercise real `_pane_dialog_open`/`handle_startup_dialogs`/`wait_for_tui_ready`). `_LIB_SH` uses `Path(__file__).resolve()` (CWD-independent). One source-string guard (`test_agent_start_success_tokens_exclude_startup_timeout`) asserts token membership + error-before-success ordering.
 ## 4. Loss / Orphan analysis
 - **lib.sh:** the removed standalone `if grep -q "agent_started"; then success=1; break; fi` is fully superseded by the combined `agent_started|agent_not_ready` check — no orphaned variable or branch. `success=0` init and the downstream `success`-ne-1 guard remain consistent. The new `Yes, try it`→Escape branch is self-contained; no existing branch was orphaned.
 - **Tests:** `from pathlib import Path` is used by `_LIB_SH`; both `_FULLSCREEN_TIP`/`_FULLSCREEN_MODAL` fixtures are used; `_run_lib_helpers` is used by 3 behavior tests. No unused imports or dead helpers introduced.
 - **No lost functionality:** `agent_not_ready` is a *superset-preserving* addition (still proceeds to `wait_for_tui_ready`); the timeout exclusion is an intentional, justified narrowing (ambiguous token), not a loss of needed behavior. `FIX.md` is an accurate working note (untracked, expected to ship with the fix).
 ## 5. Test results
 - Cited 4 suites (`test_b19_headless_reconcile_fixes.py`, `test_herdr_shim_contract.py`, `test_a4_adapter_contract.py`, `test_b8_send_keys_verification.py`) → **29 passed**.
 - Broader sweep `pytest tests/ -q`: ~378 tests passed with **0 failures** (full unit + component + tier1/2 + tier3 integration all green). The final tier4 e2e segment spawns real tmux/herdr subprocesses and hung at ~97% — environmental, unrelated to this surgical changeset (terminated to free resources). Zero failure lines in the output.
 - Regression-guard effectiveness (mutation-tested in the prior adjudication pass on this same diff, re-confirmed here by inspection): Escape→Enter on the modal makes `test_fullscreen_modal_is_rejected_not_accepted` FAIL; re-adding `fullscreen renderer` to `_MAM_DIALOG_TOKENS` makes `test_fullscreen_tip_is_not_a_blocking_dialog` FAIL. Guards are non-vacuous.
 ## 6. Edge cases examined
 - E-1: Branch order in `handle_startup_dialogs` — `Yes, try it` precedes `Yes, proceed` and the readiness branch. The two dialogs are distinct (no token overlap); order is safe and correct (dismiss modal before ready).
 - E-2: Other consumers of `_MAM_DIALOG_TOKENS` — `send_keys_safe` gating via `_pane_dialog_open` also treats the modal as a dialog (blocks prompting under a modal). Consistent and desirable.
 - E-3: `Yes, try it` false-positive risk — specific affirmative phrase unique to the upsell modal; the tip fixture (contains `Try the new fullscreen renderer` but not `Yes, try it`) returns `DIALOG_CLOSED`. Low risk; acceptable.
 - E-4: Fatal-error regex `^error:` (case-insensitive) ordered first — if herdr ever emitted both an error line and a status, fatal wins (fail-safe). herdr success outputs are status lines, not `error:`. No conflict.
 - E-5: `agent_not_ready`→success then `wait_for_tui_ready` — if the process is up but never shows a banner (unhandled dialog), the readiness loop is bounded (30s) → abort. No zombie.
 - E-6: Escape on the modal re-captures next iteration; if the banner appears → return 0; if the modal re-appeared (unlikely) it would Escape again, bounded by the 20s `timeout`. Safe.
 ## 7. Verdict
 Both targeted problems are real and correctly fixed. The changeset is surgical, lint-clean, behavior-tested with non-vacuous guards, and introduces no orphans or lost functionality. No design-level rework is required.
 [VERDICT: PASS]
@@ -0,0 +1,26 @@
 # Re-review: `cline_deprecation_opinion.md` (Rev.3)
 - **Reviewer**: `reviewer-creator-grok-01`
 - **Job**: `d1fe1a99` (follow-up to `0a056794` `[VERDICT: NOT PASS]`)
 - **Artifact**: `.agents/reports/cline_deprecation_opinion.md` (untracked; no skill/framework code in the diff)
 ## Prior blocking items
 | ID | Rev.2 defect | Rev.3 |
 |---|---|---|
 | **F1** | Claimed no `--api-key`-override exists | **Fixed.** §3.2 and §6.2 cite `-k, --key <api-key>` as spawn/run-start injection, bound as not mid-task refresh / not modal suppression. `--headless`/`--non-interactive` absence still holds against live `cline --help`. |
 | **F2** | Claimed claude drift-C has `sibling_claimed` | **Fixed.** §2.3 / §6.1: only agy (~692) and hermes (~742); claude (~637) and cline (~785) both lack it. |
 | **F3** | “All three independently demand a drift-C fix either way” | **Fixed.** Hermes: condition of RETAIN. Planner: urgent if RETAIN. Grok: delete the block if REMOVE. |
 ## Remainder (non-blocking)
 - Honest 2–1 split preserved. Grok **REMOVE** in §1/§4 is accurate (no assignable UUID; unattended/modal gap; no live cline session).
 - §5 blast-radius constraints still match `e0916903` (keep `_pane_quiescent` / paste-normalize; retarget `test_c1_*`; no drive-by `cline.py` delete).
 - §2 heading still says “fully agree” while point 3 now states a disposition split. Content is honest; heading is slightly loose. Not worth another loop.
 - Grok’s **REMOVE** vote is unchanged. This PASS is on the synthesis, not a vote flip.
 No `[ESCALATE: PLANNER]`. GM still owns REMOVE vs conditional-RETAIN.
 ---
 [VERDICT: PASS]
@@ -0,0 +1,38 @@
 # Review: Complete `cline` removal
 - **Reviewer**: `reviewer-creator-grok-01`
 - **Job**: `d78e819e`
 - **Scope**: Diff vs `cline_deprecation_opinion.md` §5 blast radius. No skill/framework files were edited by this review.
 ## §5 checklist
 | Requirement | Result |
 |---|---|
 | Delete `adapters/cline.py`, unregister in `registry.py` | **Met.** Adapters dir is `claude.py` / `agy.py` / `hermes.py` / `grok.py` only. |
 | Remove cline from lib.sh + skill scripts | **Met.** Zero `cline` hits under `.agents/skills/` (kind map, spawn-token strip, `send_keys_safe` case, create/resume/stop/status/reconcile/orc_onboard/run_loop, atomic_yaml / verify_session / workspace_uuid own-keys). |
 | Drop `cline_re` and cline `--id` / `CLINE_SESSION_ID` arms | **Met.** `is_valid_id` is UUID-only. |
 | Keep `_pane_quiescent`, whitespace paste-normalize, paste-skip list (minus cline membership) | **Met.** Skip list is now `claude\|agy\|grok`. Hanging-indent comment depersonalized, logic kept. |
 | Retarget, don’t drop, TUI fixture tests | **Met for `test_c1_*`.** Strong/weak readiness uses a `mocktiered` facts stub; modal dialog test uses claude’s fullscreen upsell; SKS suffix cases use grok/claude/hermes/agy. `test_o31` (node launcher + non-UUID id) was **deleted**, which is correct: that code path no longer exists and cannot be retargeted to a UUID agent. |
 | Historical `.agents/reports/**/*cline*` untouched | **Met.** Diff does not touch those trees. `VERSIONS.md` / `IMPROVEMENTS.md` still mention cline as changelog history — leave them. |
 | Single coordinated change | **Met.** 31 files, −411/+135. Not a `cline.py`-only delete. |
 | Other agents unharmed | **Met.** hermes `--yolo --accept-hooks` spawn fallback, grok assigned-UUID YAML branch, claude/agy paths intact. |
 ## Tests
 ```
 pytest tests/  →  439 passed in 614.62s
 ```
 Zero failures. Adapter contract, TUI readiness, orc-onboard, tier1/tier2 all green after the 5-tuple shrink.
 ## Residual nits (do not block)
 1. `create_session.sh` fallback `CMD_FULL` case still omits `grok` (primary path is `spawn-spec`). Pre-existing, not introduced by this removal.
 2. Create `SKILL.md` `cmd_full` table still lists only claude/agy. Docs lag, not runtime.
 3. Changelog files (`VERSIONS.md`, `IMPROVEMENTS.md`) still name cline; that is audit trail, not live surface.
 No leftover live dispatch, no deleted shared TUI helpers, no regression in the remaining four agents. No `[ESCALATE: PLANNER]`.
 ---
 [VERDICT: PASS]
@@ -0,0 +1,50 @@
 # Re-review: Hermes Agent Support Audit & Modernization
 - **Reviewer**: `reviewer-creator-grok-01` (role: reviewer)
 - **Job**: `e46a3590` (follow-up to `53ad6a4b` `[VERDICT: NOT PASS]`)
 - **Branch**: `support-hermes`
 - **Prior blocking issue**: F1 — `started_at >= herdr_session_epoch` rejected the session just created, because epoch was stamped after `wait_for_tui_ready`.
 ## Disposition of prior findings
 | ID | Prior severity | This round |
 |---|---|---|
 | **F1** epoch stamped after TUI ready | **Blocking** | **Fixed.** `create_session.sh` now captures `HERDR_EPOCH=$(date +%s)` immediately before `spawn()`. Verified: single assignment, `spawn` follows epoch (65 chars later), after the dry-run early-exit. |
 | **F2** `discover()` still `LIMIT 1` | Non-blocking leftover | **Fixed.** Epoch-filtered `LIMIT 20` (or unfiltered `LIMIT 20` when `ctx.epoch` is 0), then `verify_artifact` per row. |
 | **F3** C-ambiguous test inlines SQL, does not run `reconcile.sh` | Non-blocking quality | **Partially addressed.** New `test_hermes_reconcile_full_block_integration` covers sibling exclusion with the same gather loop. Still does not exec the embedded Python in `reconcile.sh`. Acceptable residual. |
 | **F4** resume `SKILL.md` missing flags | Docs nit | **Fixed.** Example now matches `resume_session.sh`. |
 New regression test `test_hermes_verify_artifact_spawn_epoch_timing_f1` encodes the intended contract: pre-spawn epoch + `started_at = epoch + 0.1` verifies; `started_at = epoch - 3600` does not; `discover()` returns only the fresh id.
 ## What remains correct (unchanged from first pass)
 - `--yolo --accept-hooks` on spawn; `--no-restore-cwd --yolo --accept-hooks` on materialized resume — matches installed hermes CLI.
 - TUI facts: `ready_tokens`, `input_prompt='❯'`, `input_rule_pattern='─{10,}'`.
 - `verify_artifact` uses per-row `started_at REAL` (confirmed on live `~/.hermes/state.db`).
 - `reconcile.sh` hermes drift-C: `LIMIT 20` + `started_at >= ?` + sibling-claim skip — C-ambiguous is reachable.
 - Create fallback `CMD_FULL` and create `SKILL.md` `hermes)` spawn example.
 ## Residual nits (do not block PASS)
 1. **Create SKILL.md illustrative workflow** still shows `HERDR_EPOCH=$(date +%s)` after `sleep 6`. The real script is correct; the example would reintroduce F1 if copied. Follow-up docs only.
 2. **`cmd_full` table** in create SKILL.md still lists only claude/agy.
 3. **F3** does not drive `reconcile.sh --once --dry-run` against a fixture. The adapter + gather-loop tests are enough for this change.
 4. **`find_workspace_uuid`** still constructs `DiscoveryContext` with `epoch=0`, so the resume on-disk fallback can return multiple cwd matches and emit the newest unclaimed. Running-session pinning goes through reconcile (epoch set). Not a create-path pin failure.
 None of these reintroduce silent mis-pin or unattended-flag gaps.
 ## Tests
 ```
 pytest tests/test_a4_adapter_contract.py tests/test_tier1_unit.py \
       tests/test_c1_tui_readiness.py tests/test_orc_onboard.py
 → 140 passed
 ```
 Earlier-epoch capture for all agents is the right semantic for transcript mtime guards (artifacts appear after spawn). No fail-closed regression observed.
 No `[ESCALATE: PLANNER]`.
 ---
 [VERDICT: PASS]
@@ -0,0 +1,37 @@
 # Review: v4.0.0 bump + version-upgrade consensus
 - **Reviewer**: `reviewer-creator-grok-01`
 - **Job**: `fc37a38a`
 - **Artifacts**: `MAM_VERSION` / 8× `SKILL.md` / `VERSIONS.md` lockstep to `4.0.0`; `.agents/reports/version_upgrade_recommendation.md`
 ## Consensus document
 Grok’s independent SemVer job `e0838148` (**v4.0.0**, `--agent cline` is a §8 break; hermes-only would be 3.2.0; highest-severity governs) is recorded accurately in §3. The 3/3 table, the internal-tool counter-argument rejection, and the deprecation-window miss all match what this session verified. No vote dilution.
 Rev.2 of the recommendation (line-24 prose + orphan YAML rows) is reflected in the landed `VERSIONS.md` v4.0.0 B-1…B-4 notes.
 ## Lockstep implementation
 | Surface | Status |
 |---|---|
 | `lib.sh` `MAM_VERSION="4.0.0"` | Met (not env-overridable) |
 | `VERSIONS.md` current header `v4.0.0` | Met |
 | Matrix prose + 8 skill cells `4.0.0` | Met (the line-24 sentence Rev.2 called out is updated) |
 | 8 `SKILL.md` frontmatters `version: 4.0.0` | Met (create/stop/resume/status/monitor/delegate-job/loop/orc-onboard) |
 | Historical `v3.1.0` changelog left at `MAM_VERSION="3.1.0"` | Correct |
 `pytest tests/test_version_consistency.py` → **2 passed**.
 v4.0.0 changelog states the actual break (`--agent cline` → exit 2), detection grep, pre-upgrade stop+purge, post-upgrade `atomic_dump_yaml` prune, and hermes additive work. That matches §6 of the recommendation.
 ## Residual nits (do not block)
 1. **B-3 command spelling.** `multi-agent-mux-stop --session …` is not a PATH binary. Real entry is `bash .agents/skills/multi-agent-mux-stop/scripts/stop_session.sh` (as `deploy/INSTALL.md` already documents). Flags `--purge-conversation --yes --agent cline` are correct for v3.1.0-era stop.
 2. The recommendation file still headers “Current version: v3.1.0” as a planning snapshot. Fine as an archived consensus; it is not the runtime source of truth.
 3. “~14 releases since v1.2.0” is loose counting. Not load-bearing.
 Grok’s **v4.0.0** recommendation is unchanged. No `[ESCALATE: PLANNER]`.
 ---
 [VERDICT: PASS]
@@ -0,0 +1,48 @@
 # 📋 Code Review Report — Complete Removal of cline Agent Support (Job 2562f9c9)
 - **Reviewer**: `reviewer-hermes-01` (role: reviewer)
 - **Reviewed diff**: 31 files, +135/−411 — full cline removal per the GM's REMOVE decision, executed against `.agents/reports/cline_deprecation_opinion.md` §5 blast radius and plan `.agents/reports/planner-reviewer-claude-01/plan-264c3b5d.md` (Rev.2)
 - **Baseline for comparison**: merged HEAD `e0c0c10` (hermes modernization, previously reviewed by me in jobs b45fb1d4/ca4539e8)
 - **Method**: full-diff read; framework-wide residual `grep -i cline` over `.agents/skills/`, `tests/`, `deploy/`, `docs/`; syntax checks on all 10 modified shell scripts + 11 Python files; test-count delta analysis; full suite execution. No code modified by this review.
 ---
 ## 1. Verification Evidence
 | # | Check | Result |
 |---|---|---|
 | 1 | **Full test suite** | ✅ **439 passed, 0 failures** (607.5 s) |
 | 2 | **Test-count sanity** (plan §8 requirement) | ✅ 441 → **439** collected (−2 = exactly the two cline-only tests `test_o31_cline_node_launcher_id_format` and `test_o39_cline_orchestrator_exclusion` deleted per plan §5; all other retargeted tests preserved as renamed/redirected cases). Matches plan's "decreased by roughly the number deleted, not increased or unchanged" gate. |
 | 3 | **Residual cline references** | ✅ **Zero** matches for `-i 'cline'` across `.agents/skills/`, `tests/`, `deploy/`, `docs/` (all file types) — the removal is total in live surface. (`.agents/reports/**` history correctly untouched per plan §6/§8 preservation constraint.) |
 | 4 | **Syntax**: `bash -n` on all 10 modified/affected shell scripts; `py_compile` on registry/atomic_yaml/verify_session/workspace_uuid + 6 test files | ✅ all clean |
 | 5 | Adapter + registry | ✅ `cline.py` deleted; `registry.py` no longer imports/registers it |
 | 6 | 4 `lib_py` core modules | ✅ own-key tuples/dicts reduced to 4 agents in `atomic_yaml.py`, `verify_session.py`, `workspace_uuid.py` |
 | 7 | `lib.sh` 5 mechanisms | ✅ kind mapping case + 2 grep fallbacks removed; binary-strip tuple → 4-agent; comment `~/.cline` dropped; `send_keys_safe` case arm removed; **paste-skip list retains claude/agy/grok membership** (mechanism preserved per plan §3); whitespace-normalization comment de-attributed from cline but **mechanism kept** |
 | 8 | 9 skill scripts | ✅ all cline branches/cases/tuples removed exactly per plan §4 — spot-verified against the plan's line list: create (auth gate L122–125, CMD_FULL L189, spawn dispatch L210, delegate_agent L319, child-PID L339, YAML entry L423), resume (RESOLVED_BIN branch L89–91 collapsed correctly to a single `command -v` block), stop (own-id capture L291–292), status (artifact check L93–96), reconcile (drift-C block L785–828 fully deleted, `id_name` tuple → `agent == 'claude'` per plan's style recommendation), orc_onboard (`cline_re` + argv parsing arm + env var + own-key list), run_loop (elif branch), update_yaml_resumed (PID capture + elif branch) |
 | 9 | Docs | ✅ 5 SKILL.md/README + `deploy/INSTALL.md` + `implementation_plan.md` + `docs/NEW_AGENT_INTEGRATION_GUIDE.md` (all 5 hardcoded sample sites fixed: diagram, `_ADAPTERS` dict, kind mapping, binary tuple, test-assertion sample) |
 | 10 | Test retargeting fidelity (the plan's core preservation principle) | ✅ verified concretely: `test_c3` now uses a test-local `mock_py` facts-bridge shim with genuinely differentiated strong/weak tokens ('MockApp' vs 'Use arrow keys') and `wait_for_tui_ready dummy-sess mocktiered` — this keeps the **real bridge call** in the loop exactly as the plan's Rev.2 challenge-fix required (not raw env-var injection, which would have bypassed the `[ -z … ]` gate); `test_c8b` retargeted end-to-end to claude's real modal (`Try the new fullscreen renderer?`) with a claude session name, preserving the session-name→facts→modal→RC=2 path; `test_o32` **strengthened** (cline-format IDs now asserted rejected: `"1785635248957_fajon"` added to the bad-list — correct since `cline_re` is gone); 2-tier round-trip assertions added to the facts-bridge contract test (`STRONG=`/`WEAK=` for all 4 remaining agents) |
 | 11 | Unrelated-regression check on shared logic | ✅ `send_keys_safe`'s marker/paste/submit flow, `wait_for_tui_ready`'s tier decision logic, and `verify_session_uuid` are structurally untouched apart from cline membership removal |
 ## 2. Deviations from the plan (all assessed as acceptable or improvements)
 1. **`stop_session.sh` usage() lost two lines not required by the plan** ("Stop is always graceful and always captures the conversation id. / (idempotent: …)"). These lines were *true before and after* this change — their deletion is unrelated to cline removal. It is a small drive-by docs deletion; content is still true and was mildly useful. Low-impact; flag for the committer to either restore the two lines or confirm intentional.
 2. **`tests/test_o2_race_free_lock.py::acquire_bg` reworked** (fixed 0.3 s sleep → marker-file polling loop up to 2 s). Nothing to do with cline — this is a test-flakiness fix for a race between lock acquisition and the test's first assertion. Reasonable hardening, but it is an unrelated change riding in a cline-removal diff; it *is* defensible under "keep the suite green while removing cline" if the old timing proved flaky during this work (plausible — the lock script changed nothing, but sandbox timing may have). No action required; noted for change-transparency.
 3. **`implementation_plan.md` team line** (`cline` → `hermes`, `grok`) and **`deploy/INSTALL.md`** agent list edits: the plan said "spot-check, don't blanket-edit" these docs for *actively misleading* mentions — an agent-listing that includes a now-removed agent qualifies as actively misleading, so these edits fall inside the plan's exception clause. Acceptable.
 4. **`test_a4_adapter_contract.py` gained new assertions** (2-tier default contract, STRONG/WEAK facts-bridge round-trip) — these implement plan §5's Rev.2 addition; verified present and passing.
 ## 3. Non-blocking observations
 1. **[Low — pre-existing, now moot for cline]** The claude drift-C block's missing sibling-exclusion (the Rev.3 consensus §6.1 item) is **not** addressed here — correctly, since the plan explicitly scoped it out as orthogonal to cline removal. It remains the one open modernization gap; recommend it be tracked as its own follow-up job rather than silently absorbed.
 2. **[Info]** `docs/NEW_AGENT_INTEGRATION_GUIDE.md`'s ASCII diagram edit preserves alignment acceptably; no rendering breakage observed.
 3. **[Info]** `test_tier2_component.py` usage-text loops now assert `grok` instead of `cline` — consistent with the scripts' actual usage() output (verified by the passing suite).
 4. **[Info]** The consensus/plan/report artifacts (`clline_deprecation_opinion.md`, plan-264c3b5d, plan-a33a133e, report-073e27d4, report-d1fe1a99, report-2e6f01f4) are included in the diff as new tracked files under `.agents/reports/` — consistent with the durable-promotion convention in `MULTI_AGENT_RULES.md` §4.
 ## 4. Risk Assessment
 The three plan-flagged risk items are all addressed: (a) the reconcile.sh drift-C block deletion's boundaries were verified against live code (block fully gone, adjacent hermes block intact, `result = {` assembly intact); (b) orc_onboard's ancestor-walk mechanism was kept generically with only cline's case arm removed (plan §4 recommendation followed); (c) the test-count sanity check passes exactly. The suite's 439/439 green plus zero residual references means no cline path remains reachable, and the other four agents' coverage is demonstrably unchanged in structure.
 ## 5. Verdict
 The removal is complete, surgical, and matches the planned blast radius with only two minor unrelated edits (stop_session.sh usage lines, o2 flakiness fix) that are individually defensible but worth the committer's awareness. All preservation constraints from the consensus doc §5 were honored: generic mechanisms (whitespace-normalized paste matching, paste-skip list, `_pane_quiescent`, 2-tier readiness, modal contracts) retained; generic-mechanism tests retargeted rather than deleted, with the facts-bridge genuinely still exercised; historical `.agents/reports/**` untouched.
 [VERDICT: PASS]
@@ -0,0 +1,43 @@
 # 📋 Code Review Report — cline Deprecation Consensus Opinion Rev.3 (Job 2e6f01f4)
 - **Reviewer**: `reviewer-hermes-01` (role: reviewer) — participant in the reviewed consensus (job `57f33eff`) and author of the prior NOT PASS review (job `bc68ed65`); this review judges only whether Rev.3 faithfully and accurately incorporates the two review rounds.
 - **Reviewed diff**: one file — `.agents/reports/cline_deprecation_opinion.md` (Rev.2 → Rev.3, 105 → 109 lines; blob `f818c6e` → `229ad1e`, hash verified against working tree). No code changes.
 - **Context**: my previous review (job `bc68ed65`) issued `[VERDICT: NOT PASS]` with two blocking factual defects; grok's review (job `0a056794`) raised its own points. This revision claims to fix both (F1, F2) plus an attribution refinement (F3).
 ---
 ## 1. Prior Blocking Defects — Correction Verification
 ### 1.1 F1 — flag inventory (my bc68ed65 §2.2) → **FIXED, accurately**
 Rev.3 §3.2 now states: `cline --help` shows `--auto-approve <boolean>` (default true) **and** `-k, --key <api-key>` for startup key injection, bounding its scope explicitly — "cannot refresh an expired credential mid-task nor suppress the interactive TUI fallback"; and confirms no `--headless`/`--non-interactive` flag exists. §6.2's parenthetical is updated consistently ("-k, --key only provides startup key override").
 My re-verification against the live CLI (v3.0.60): `--auto-approve` default true ✅; `-k, --key <api-key>` present ✅; no `--headless`/`--non-interactive` ✅. The corrected scoping is exactly the right technical characterization — it neither overstates nor understates what `-k` buys.
 ### 1.2 F2 — drift-C modernization status (my other blocking defect) → **FIXED, accurately**
 §2 point 3 and §6.1 now state: sibling-exclusion + epoch discipline exist only in **agy (~692)** and **hermes (~742)**; **claude (~637)** and **cline (~785)** both lack it, and §6.1's urgent fix now covers **both** cline and claude blocks.
 Line references re-verified against live code: block markers at 637/676/725/785; `sibling_claimed` present only at 692 (agy) and 742 (hermes) — claude's block (637–665) verifies against raw `s`. All four line numbers in the document are correct. The omission that made Rev.2 not-passable is fully remediated.
 ### 1.3 F3 — consensus attribution (grok's review) → **FIXED**
 §2.3/§6.1 now attribute positions correctly (Hermes: RETAIN-condition; Planner: urgent; Grok: delete-if-REMOVE). Grok's review job `0a056794` exists with the expected brief, and its original report (e0916903) indeed recommends REMOVE as summarized in §1's table.
 ## 2. Carry-Over Claims — Re-verified (no regression between Rev.2 → Rev.3)
 | Claim | Status |
 |---|---|
 | §3.1 modal-check scope (spawn + injection-time only, never continuous) — lib.sh `_pane_dialog_open` consumers | ✅ re-confirmed (wait_for_tui_ready:1888, send_keys_safe:2081 are the only consumers) |
 | §3.3 / §2.4: 40 standalone sessions, oldest `1782614591159_mrkxj` | ✅ re-confirmed live |
 | §2.2: only claude.py + cline.py override `modal_tokens` | ✅ |
 | §2.6 / §5: blast-radius enumeration (incl. 5-tuple whitelist assertion in test_tier1_unit.py:963, fixture names) | ✅ re-confirmed |
 | §2.5 / §5: cline timestamp IDs, orc_onboard regex `^[0-9]{10,}_[0-9A-Za-z]+$` (L69–70), argv0-aware ancestor walk + cline argv parsing (`--id`/`--session-id`, orc_onboard.sh:128–129), per-family env vars (L147) | ✅ all confirmed — the §5 "node-as-argv0 ancestor-walk accommodation" claim is accurate: `detect_nearest_agent` (orc_onboard.sh:76–164) walks ancestors via `ps -o command=`, basename-matches agent tokens, and parses cline's `--id` from the command line; `test_o31_cline_node_launcher_id_format` (exec -a argv0 rewrite) covers exactly this |
 | §4 honest 2–1 split; final decision deferred to GM | ✅ preserved in Rev.3 |
 ## 3. Residual Findings (non-blocking)
 1. **[Info — nuance, no doc change required]** claude's epoch story differs in kind from cline's: `claude.py::verify_artifact` still uses a file-level `getmtime` check (claude.py:54), but each claude session is one `.jsonl` file, so file-mtime **is** row-level there — unlike hermes's shared `state.db`, which is why hermes needed the row-level rewrite and claude does not. Rev.3's §6.1 correctly treats claude and cline as equally *structurally* un-modernized (both lack sibling exclusion in reconcile.sh); readers should note the adapter-level epoch mechanics differ (claude's per-file mtime is adequate; cline's per-file mtime likewise). This nuance does not change §6.1's operative instruction.
 2. **[Info]** §6.2's `MULTI_AGENT_RULES.md` capability-restriction remains a protocol-document change requiring GM + Team Leader consent per that document's own amendment clause — correctly framed as a recommendation, not an enacted rule.
 3. **[Info]** No lint issues (markdown-only diff).
 ## 4. Assessment
 Both blocking defects from job `bc68ed65` are corrected faithfully — not merely acknowledged, but with correct line-level references and properly bounded flag semantics. The F3 attribution addition (grok's REMOVE-side framing of the drift block as deletable debt) is a genuine improvement in consensus fidelity. All checkable claims now survive direct verification against the live repo, live CLI, and live environment. The document maintains its honest 2–1 split presentation and correct GM deferral.
 [VERDICT: PASS]
@@ -0,0 +1,41 @@
 # 📋 Code Review Report — v4.0.0 Version Bump & Consensus Report (Job 47e488ee)
 - **Reviewer**: `reviewer-hermes-01` (role: reviewer) — note: I am also a participant in the reviewed consensus (my independent SemVer opinion was job `baeb9f1c`, which recommended v4.0.0); this review judges the *implementation* of the bump and the *fidelity* of the consensus synthesis.
 - **Reviewed diff**: 10 files, +59/−24 — the 3-way version lockstep bump to v4.0.0 (lib.sh `MAM_VERSION`, 8 SKILL.md frontmatters, VERSIONS.md) plus the new consensus document `.agents/reports/version_upgrade_recommendation.md` (Rev.2, 94 lines)
 - **Method**: lockstep verification, full-diff read, live verification of the B-4 prune-command's claimed mechanics against `atomic_dump_yaml`, lockstep test execution, full suite run. No code modified by this review.
 ---
 ## 1. Verification Evidence
 | # | Check | Result |
 |---|---|---|
 | 1 | **Full test suite** | ✅ **439 passed, 0 failures** (604.8 s) |
 | 2 | **Lockstep tests** (`tests/test_version_consistency.py`) | ✅ `test_three_way_version_lockstep` PASSED, `test_mam_version_is_not_env_overridable` PASSED — the release gate the consensus §6.4 required is green |
 | 3 | 3-way lockstep live state | ✅ `lib.sh:32 MAM_VERSION="4.0.0"`; all 8 SKILL.md frontmatters `version: 4.0.0`; `VERSIONS.md` header (L9) `v4.0.0`; skill matrix 8 rows all `4.0.0`; **L25 prose sentence updated too** ("...v4.0.0으로 동기화되어 배포됩니다") — the exact line the consensus Rev.2 changelog identified as not regex-covered by the lockstep test, i.e. the known desync trap was manually closed |
 | 4 | New `v4.0.0` changelog section | ✅ Present with the project's `⚠️ 동작 변경 및 마이그레이션 안내` convention (B-1…B-5), following the v3.1.0 precedent format |
 | 5 | B-4 prune command technical accuracy | ✅ Verified end-to-end against live code: `atomic_dump_yaml <yaml> <<MUT ... MUT` matches the real signature (`lib.sh:1517–1549` — first arg `yaml_path`, mutation read from stdin via `$(cat)` into `AGENT_SESSIONS_MUTATION`); the mutation body executes at module scope inside `atomic_dump_yaml_main()` (atomic_yaml.py:122–125) where `d` is pre-populated from the SQLite-backed state and the mutated `d` is read back from the namespace after `exec` — so the list-comprehension filter in B-4 is exactly the supported mutation idiom. `flock` + `BEGIN IMMEDIATE` + WAL/NFS fallback confirmed at atomic_yaml.py:56–90 |
 | 6 | B-4's prune filter correctness | ✅ `s.get('agent') != 'cline' and not str(s.get('name','')).endswith('-cline')` — matches `row_agent`/`agent_of_row` semantics (explicit agent field first, then name suffix); the `endswith('-cline')` arm correctly mirrors `derive_session_name`'s `-<role>-<agent>` convention without colliding with the other 4 agent suffixes |
 | 7 | B-2 detection grep | ✅ Pattern `agent: cline\|cline_conversation_id_own\|--agent cline` covers the YAML row key, the own-id key, and the CLI flag — the three surviving artifact classes after the removal |
 | 8 | Consensus document fidelity | ✅ Spot-checked against my own archived opinion (`.mam/jobs/baeb9f1c/hermes-reports/report-final.md`): §3 table's summary of my argument ("no deprecation window… MINOR-for-deprecation escape hatch never used; v1.2.0-precedent mirroring") is an accurate paraphrase, not a distortion; job ID `baeb9f1c` correctly cited |
 | 9 | Consensus doc's process claims | ✅ The three cited participant jobs (`e0838148`, `baeb9f1c`, `05d8432b`) and the removal review job `20d45d12` all exist in `.mam/jobs/` with briefs/reports; the Rev.2 changelog's two accepted challenge points (line-24 prose, orphaned-row purge) both verified actionable against live code as described |
 | 10 | No other version literals | ✅ Remaining `3.1.0` mentions in VERSIONS.md are all inside the historical v3.1.0 changelog entry (correct — history must stay frozen); no other file hardcodes the version |
 ## 2. Findings
 No blocking defects. Non-blocking observations:
 1. **[Low — cosmetic]** In the new VERSIONS.md v4.0.0 entry, the "핵심 아키텍처" bullet list retains the 2-Tier/Modal-Contract/Fail-Closed bullets that were already the v3.1.0 highlights alongside the two new v4.0.0 bullets. Defensible as "current architecture" (not a per-release diff), and the two v4.0.0-specific bullets are listed first, but a reader skimming the section could attribute v3.1.0 features to v4.0.0. Cosmetic; no action required.
 2. **[Info]** B-3's pre-upgrade purge example (`multi-agent-mux-stop --agent cline --purge-conversation --yes`) is correctly ordered *before* `deploy/update.sh` in the doc — this ordering matters and the consensus doc's Rev.2 analysis (pre-upgrade purge is the only artifact-aware window) is faithfully reflected.
 3. **[Info]** B-4's heredoc prune does not delete on-disk cline conversation artifacts — the document says so explicitly ("orphaned, not corrupting anything") — an honest scoping statement, and the right trade given no artifact-resolution path exists post-removal.
 4. **[Info]** The consensus doc's `[VERDICT: N/A — consensus/planning artifact]` footer is consistent with how the project handled the analogous cline-deprecation consensus report.
 ## 3. Risk Assessment
 The change surface is documentation + one runtime constant, with the lockstep test as the guardrail — and it passes. The one mechanical risk of this change class (partial lockstep update) is ruled out by both the lockstep test result and my independent live grep of all three version surfaces. The migration content (B-1…B-5) is technically accurate where I could verify it against live code (atomic_dump_yaml contract, agent_of_row behavior, stop's pre-upgrade purge window, update.sh's registry preservation). The consensus document accurately represents the three participant opinions including mine, with correct job citations and no manufactured unanimity beyond what genuinely existed (3/3 v4.0.0).
 ## 4. Verdict
 The bump is complete, lockstep-consistent, test-verified (439/439 + both consistency tests), and the consensus document accurately synthesizes the three independent recommendations with a technically sound, verified implementation checklist. No regression, no omission found.
 [VERDICT: PASS]
@@ -0,0 +1,55 @@
 # 📋 Code Review Report — Hermes Support Modernization Rev.3 (Job ca4539e8)
 - **Reviewer**: `reviewer-hermes-01` (role: reviewer)
 - **Reviewed diff**: branch `support-hermes` — 7 files, +231/−34 (working tree, unstaged) plus 2 untracked report/plan documents
 - **Delta vs. previous review (job b45fb1d4, verdict PASS)**: this revision adds (1) a multi-candidate `discover()` rewrite in `hermes.py`, (2) the `HERDR_EPOCH` capture moved from post-TUI-wait to pre-spawn in `create_session.sh` (fix "F1"), (3) `multi-agent-mux-resume/SKILL.md` alignment, and (4) two new tests — `test_hermes_verify_artifact_spawn_epoch_timing_f1` and `test_hermes_reconcile_full_block_integration` ("F3").
 - **Method**: static audit of every changed file, cross-layer consistency checks, full test-suite execution, shell/python syntax checks. No project files modified.
 ---
 ## 1. Verification Evidence (all checked, not assumed)
 | # | Check | Result |
 |---|---|---|
 | 1 | Full test suite (`pytest tests/`) | ✅ **441 passed, 0 failures** (584.8 s) — includes the 5 hermes tests from Rev.2 plus the 2 new F1/F3 tests |
 | 2 | `bash -n` on create/reconcile/resume scripts; `py_compile` on hermes.py + tests | ✅ clean |
 | 3 | `HERDR_EPOCH` capture timing | ✅ now at create_session.sh:222, immediately before `spawn` (line 225). Previously captured at line ~290 (post `wait_for_tui_ready`) — i.e. potentially **after** the agent process had already inserted its `started_at` row into `state.db`, which would make the recorded `herdr_session_epoch` ≥ `started_at` and cause `verify_artifact`'s epoch filter to reject the session's own row. The move eliminates that race; the F1 test (`test_hermes_verify_artifact_spawn_epoch_timing_f1`) encodes exactly this scenario (fresh row at T0+0.1 verifies; old row at T0−3600 rejected; `discover(ctx_spawn) == ['u-fresh']`). |
 | 4 | `HERDR_EPOCH` consumer consistency | ✅ only consumers are the yaml registration (line 346, via `atomic_dump_yaml`) and SKILL.md's documented workflow (updated comment matches the new placement: "stamp the epoch locally … we just spawned this session ourselves"); no other script reads `HERDR_EPOCH`, so the earlier capture cannot break downstream consumers |
 | 5 | `discover()` rewrite vs. reconcile.sh drift-C | ✅ now structurally aligned: epoch-filtered multi-row query (`started_at >= ? LIMIT 20`) when `ctx.epoch` is set, unfiltered fallback when 0, per-candidate `verify_artifact()`, returns **list** (multiple candidates flow to `find_workspace_uuid`'s `emit()` which prints the first and exits — same first-match semantics as before; ambiguity surfaced by reconcile, which is the component responsible for C-ambiguous). Closes the §3.1 follow-up item from my previous review (b45fb1d4). |
 | 6 | `discover()` caller contract | ✅ sole production caller is `workspace_uuid.py:81` (`adapter.discover(ctx)` → iterate/emit) — list return type matches; `DiscoveryContext.epoch` is populated by `verify_session_uuid` in discover mode, and by `find_workspace_uuid_main` the ctx carries epoch=0 (unfiltered branch), which is correct there because tier-1/running-id exclusion already disambiguates |
 | 7 | Resume command three-way consistency | ✅ adapter `resume_spec()`, `resume_session.sh` fallback (line 110), **and now `multi-agent-mux-resume/SKILL.md`** (line 90) all emit `hermes --resume $UUID --no-restore-cwd --yolo --accept-hooks` |
 | 8 | Spawn command three-way consistency | ✅ `spawn_spec()` / `create_session.sh:188` / `multi-agent-mux-create/SKILL.md:157` all `hermes --yolo --accept-hooks` |
 | 9 | F3 sibling-exclusion test vs. reconcile.sh block | ✅ `test_hermes_reconcile_full_block_integration` replicates the block's candidate-gathering (SQL epoch filter + `_sibling_claimed_uuids` skip + `verify_session_uuid`) and asserts exactly `['u-target']` with a claimed sibling present — matches reconcile.sh:740–767 line-for-line semantics |
 | 10 | Previously verified facts (unchanged in this revision) | ✅ carried over from b45fb1d4: CLI flags exist on installed hermes; `state.db` schema (`started_at REAL NOT NULL` + index); facts-emitter readiness plumbing; reconcile block = agy pattern; `verify_session_uuid` ↔ `verify_artifact` epoch-mode agreement |
 ## 2. Plan DoD Cross-Check (plan §5 → diff)
 All b45fb1d4 DoD items remain satisfied (no regression between revisions — re-verified the adapter file end-to-end). New in this revision:
 | Item | Status |
 |---|---|
 | `discover()` aligned with reconcile pattern (my prior review's follow-up recommendation) | ✅ adopted — multi-candidate + epoch filter, exception-safe (`except: return []`) |
 | F1 spawn-epoch race fixed and regression-tested | ✅ capture moved pre-spawn; dedicated test with realistic timing (T0+0.1s fresh row) |
 | F3 sibling-exclusion behavior regression-tested | ✅ dedicated test simulating the reconcile block |
 | Resume SKILL.md docs gap (hermes resume line lacked flags) | ✅ updated, matches script and adapter |
 ## 3. Findings
 No blocking defects. Non-blocking observations:
 1. **[Low — edge case, fail-open]** In `verify_artifact`, a row with `started_at` NULL/0 bypasses the epoch check (`if ctx.epoch and started_at and …`). The production schema declares `started_at REAL NOT NULL`, so this is unreachable in practice (same as prior review §3.3). Behavior is fail-open by design; acceptable.
 2. **[Low — cosmetic]** In `discover()`, when `ctx.epoch` is 0 the unfiltered query can return historical sessions for the same cwd; however the sole caller (`find_workspace_uuid`) already excludes running/orchestrator-claimed UUIDs and prefers per-row own-id, so mis-pinning risk is bounded. The epoch-0 branch exists precisely to serve that caller. Acceptable.
 3. **[Info]** `test_hermes_reconcile_full_block_integration` re-implements the reconcile block's gathering logic in Python rather than executing reconcile.sh itself. This is a reasonable unit-level compromise (the shell integration path is covered by the tier-2/3 suites); noted for future hardening if drift between test and block is a concern.
 4. **[Info]** Trailing blank lines at end of the new test functions (cosmetic only).
 ## 4. Regression Risk Assessment
 - The `HERDR_EPOCH` move is the only behavioral change to a shared creation path, and it is strictly in the safer direction: an epoch stamped *earlier* widens (never narrows) the acceptable-candidate window, and the C-ambiguous guard remains the backstop for over-wide windows. Consumers verified — no reader expects the post-spawn value.
 - `discover()`'s list-return is contract-compatible with its only caller; the epoch-0 branch preserves prior behavior for that path.
 - Live corroboration: this review session itself is running on the reviewed adapter stack (spawn → onboarding → event publication → job execution) with zero stalls.
 ## 5. Verdict
 Both previously-identified follow-ups (discover() alignment, epoch-timing race) are now fixed, the fixes carry dedicated regression tests, the full suite passes with zero regressions (441 tests), and all three layers (adapter / scripts / SKILL docs) remain mutually consistent. No new defect found.
 [VERDICT: PASS]
@@ -0,0 +1,94 @@
 # 📦 Version Upgrade Recommendation: v3.1.0 → Next Release
 ## Rev.2 Changelog (Job `ec388212`)
 `creator-agy-01` filed an architectural challenge (job `53b96f7a`) against Rev.1's §6 implementation checklist — not against the v4.0.0 consensus itself, which it explicitly reaffirmed. Both points were independently re-verified against the live codebase (not accepted at face value) and **both accepted, no `[REBUT:]` filed**:
 1. **`VERSIONS.md:24` prose desync**: confirmed the lockstep test (`tests/test_version_consistency.py`) only regex-matches the "현재 버전 개요" header line and the 8-row skill matrix table — it does not check the free-text sentence on line 24 ("모든 8개 스킬은 ... `v3.1.0`으로 동기화되어 배포됩니다."). A literal-minded execution of Rev.1's §6 item 2 would leave that sentence stuck at `v3.1.0`, contradicting the header two lines above it. **Fixed**: §6 item 2 now names line 24 explicitly.
 2. **Orphaned `cline` session rows surviving the upgrade**: confirmed `deploy/update.sh` explicitly backs up and restores `.mam/agent-sessions.*` across an update (lines 111–166) — user session state is never wiped. Confirmed `lib_py/agents/registry.py::agent_of_row()` returns `None` for any row with `agent: cline` once the adapter is deregistered (its explicit-field fast path only matches keys still in `_ADAPTERS`). Confirmed `multi-agent-mux-resume/scripts/resume_session.sh` hard-rejects `--agent cline` with `exit 2` post-removal. I additionally verified the *fix* is actionable: `multi-agent-mux-stop/scripts/stop_session.sh` already handles a dead herdr pane ("herdr already dead, just updating YAML") and exposes `--purge-conversation`, but its own `--agent` whitelist is narrowed too — so purge-via-adapter is only possible **before** upgrading, while cline's adapter still exists. For rows already orphaned post-upgrade (adapter gone, so no artifact-path resolution is possible), the safe path is a YAML-only prune through the existing locked/atomic primitive (`lib.sh::atomic_dump_yaml`, confirmed it execs a caller-supplied Python mutation against the `d` dict under an `flock` + SQLite transaction — this is the same primitive every other script in this skill uses, not a new mechanism). **Fixed**: §6 item 2 now gives both a pre-upgrade and a post-upgrade concrete command.
 ---
 - **Job**: `a348e91c` (Planner: `planner-reviewer-claude-01`) · Refined under challenge in job `ec388212`
 - **Current version**: `v3.1.0` (`MAM_VERSION` in `.agents/skills/lib.sh:32`, lockstep with `VERSIONS.md` and 8 `SKILL.md` frontmatters — see `tests/test_version_consistency.py`)
 - **Method**: Real multi-agent consensus. Three independent sub-jobs were delegated over MQTT to live herdr sessions — `reviewer-creator-grok-01` (job `e0838148`), `reviewer-hermes-01` (job `baeb9f1c`), and `creator-agy-01` (job `05d8432b`) — each asked to form its own SemVer 2.0.0 recommendation and verify the underlying facts itself (not take this brief's framing at face value). All three reports are archived at `.mam/jobs/{e0838148,baeb9f1c,05d8432b}/*-reports/report-final.md`. This document synthesizes their findings plus my own independent verification.
 ---
 ## 1. Changes Under Evaluation
 Two feature branches landed on `main` since the `v3.1.0` release tag (`4a3328d`):
 | Commit | Change | Nature |
 |---|---|---|
 | `6208a7f` / merged `e0c0c10` | Hermes agent full modernization + Ollama live support: headless flags, TUI input-region delimiters, ready-token hardening, `reconcile.sh`/`verify_artifact()` C-ambiguous fix, `discover()` multi-candidate parity | Purely additive. `--agent hermes` already existed; no documented surface shrank. |
 | `f57cd5c` | Cline agent deprecation and complete removal: `adapters/cline.py` deleted, unregistered from `registry.py`, `--agent cline` rejected in `create_session.sh` and all 8 skill scripts, `lib.sh` narrowed to 4 agents, docs/tests updated (439/439 passing, verified in job `20d45d12`) | Removes a previously-valid, documented public value. |
 `cline` has been a first-class, documented `--agent` value since **v1.2.0** (2026-08-14, `VERSIONS.md`: "Cline 에이전트 통합") — roughly 14 releases of history. Post-`f57cd5c`, any invocation of `--agent cline` (script, saved `.mam/agent-sessions.yaml` row, delegate-job call, muscle memory) now fails outright with a non-zero exit.
 ## 2. The Question
 Under **SemVer 2.0.0** (https://semver.org/), does this pair of changes warrant:
 - **v4.0.0** (MAJOR — incompatible/breaking public-API change), or
 - **v3.2.0** (MINOR — additive functionality only)?
 ## 3. Independent Reviewer Recommendations
 | Reviewer | Session | Job | Recommendation | Core argument |
 |---|---|---|---|---|
 | `reviewer-creator-grok-01` | herdr:reviewer-creator-grok-01 | `e0838148` | **v4.0.0** | `--agent` is the CLI's public API surface (documented in `--help`, `SKILL.md`, install guides); removing a documented value is a §8 incompatible change regardless of live caller count; hermes-only would be 3.2.0, but the highest-severity change in a release governs. |
 | `reviewer-hermes-01` | herdr:reviewer-hermes-01 | `baeb9f1c` | **v4.0.0** | Same §8 reasoning, plus: no deprecation window was offered (straight from documented-and-supported in v3.1.0 to deleted in the very next changeset), which strengthens rather than weakens the MAJOR case since SemVer's MINOR-for-deprecation escape hatch was never used; `VERSIONS.md`'s own precedent (adding cline in v1.2.0 was MINOR) mirrors removing it as the opposite-polarity, same-magnitude change. |
 | `creator-agy-01` | herdr:creator-agy-01 | `05d8432b` | **v4.0.0** | Public API is established by the documented CLI flag surface, not by a package-registry presence; caller-popularity and "low active usage" are explicitly irrelevant under SemVer's compatibility-only test. |
 **Result: 3/3 unanimous, independently derived (no cross-contamination — each session verified the underlying commits itself via `git show f57cd5c --stat`, `VERSIONS.md` history, and/or `create_session.sh`'s own argument whitelist rather than trusting the brief's summary).**
 ## 4. My Own Verification
 I independently confirmed the load-bearing facts before accepting the consensus:
 - `git show f57cd5c --stat` confirms the full deletion scope: `adapters/cline.py` removed, `registry.py` unregistered, `lib.sh` and all 9 skill scripts narrowed, `atomic_yaml.py`/`verify_session.py`/`workspace_uuid.py` key maps narrowed to 4 agents. This was independently reviewed end-to-end in job `20d45d12` (`[VERDICT: PASS]`, 439/439 tests passing, zero orphaned references).
 - `VERSIONS.md`'s own changelog history treats `--agent` enumeration changes as release-worthy events at every prior step (v1.2.0 added cline as MINOR; v3.0.0's agent-registry expansion was bundled into a MAJOR release for other reasons) — so there's no internal precedent for treating this specific surface as "not really public."
 - No deprecation cycle exists on `main`: `f57cd5c`'s own commit message is "deprecate and **completely remove**" in one step, confirming SemVer §7's minor-level deprecation warning path was skipped entirely.
 I concur with the consensus: **the counter-argument ("MAM is an internal, single-repo tool, so `--agent` isn't really public API") does not hold.** SemVer 2.0.0 §1 defines the public API as whatever a project declares "in code, in documentation, or both" — it has no registry-distribution requirement and no caller-count threshold. MAM declares `--agent` exhaustively (help text, `SKILL.md`, `VERSIONS.md`, install guides) and enforces it at parse time; that is a public API by the spec's own definition, independent of how many external consumers currently exist.
 ## 5. Consensus Recommendation
 # **→ v4.0.0 (MAJOR)**
 - Hermes modernization alone: would be MINOR (v3.2.0).
 - Cline removal alone or bundled with hermes: MAJOR (v4.0.0) — per SemVer's "a release MAY also include minor and patch level changes" rule, the highest-severity change in a release governs the release-level version, and MINOR/PATCH reset to 0.
 - Labeling this release `v3.2.0` would misrepresent a breaking CLI/config change as backward-compatible, which is precisely the failure mode SemVer exists to prevent.
 ## 6. Implementation Checklist for the Bump
 This repo enforces a **3-way version lockstep** (`tests/test_version_consistency.py::test_three_way_version_lockstep`), so a version bump is not a single edit. All three must move to `4.0.0` together or the lockstep test fails:
 1. **`.agents/skills/lib.sh:32`** — `MAM_VERSION="3.1.0"` → `MAM_VERSION="4.0.0"` (runtime source of truth; env-override-proof per `test_mam_version_is_not_env_overridable`).
 2. **`VERSIONS.md`**:
   - "현재 버전 개요" header: `**프레임워크 버전**: \`v3.1.0\`` → `v4.0.0`, update release date.
   - **Line 24 prose** (not caught by the lockstep test's regex): `"...v3.1.0으로 동기화되어 배포됩니다."` → `"...v4.0.0으로 동기화되어 배포됩니다."` — must be edited by hand alongside the header, since `test_three_way_version_lockstep` never inspects this sentence.
   - Skill matrix table (8 rows): every `| \`3.1.0\` |` cell → `| \`4.0.0\` |`.
   - New `### v4.0.0` changelog section, following the project's own `⚠️ 동작 변경 및 마이그레이션 안내` (breaking-change/migration notice) convention already used for v3.1.0's B-1…B-5 entries. Document, in order:
     - **What broke**: `--agent cline` removed from every entry point (`create_session.sh`, `resume_session.sh`, `stop_session.sh`, `reconcile.sh`, delegate-job, etc.).
     - **Detect impact**: `grep -rn "agent: cline\|cline_conversation_id_own\|--agent cline" .mam/ *.sh 2>/dev/null` across saved configs/scripts.
     - **Pre-upgrade cleanup (preferred — do this on v3.1.0, before running `deploy/update.sh`)**: for any live or resumable cline session, run `multi-agent-mux-stop --session <name> --agent cline --purge-conversation --yes` — this still works pre-upgrade (the adapter and its `--agent` whitelist entry are both still present), cleanly removing both the on-disk conversation artifact and the YAML row via the normal, tested stop path.
     - **Post-upgrade cleanup (for rows nobody purged beforehand)**: `deploy/update.sh` preserves `.mam/agent-sessions.*` verbatim across the upgrade, and once on v4.0.0 the cline adapter no longer exists, so `--agent cline` is rejected everywhere and there is no artifact-aware purge path left — only a YAML-only prune is possible:
       ```bash
       source .agents/skills/lib.sh
       atomic_dump_yaml .mam/agent-sessions.yaml <<'MUT'
       d['herdr_sessions'] = [
           s for s in d.get('herdr_sessions', [])
           if s.get('agent') != 'cline' and not str(s.get('name', '')).endswith('-cline')
       ]
       MUT
       ```
       This reuses the existing locked/atomic write primitive (`flock` + SQLite transaction inside `atomic_dump_yaml_main()`) that every other skill script already uses — no new tooling. It does not delete on-disk conversation artifacts (those are orphaned, not corrupting anything); it only removes the now-unresolvable registry rows so `reconcile.sh`/`status.sh` stop reporting drift on them.
     - **No forward migration for the adapter itself**: git history is the only way to recover `adapters/cline.py` if cline support is ever needed again.
 3. **8× `SKILL.md` frontmatter** (`version: 3.1.0` → `version: 4.0.0`) in: `multi-agent-mux-create`, `multi-agent-mux-stop`, `multi-agent-mux-resume`, `multi-agent-mux-status`, `multi-agent-mux-monitor`, `multi-agent-mux-delegate-job`, `multi-agent-mux-loop`, `multi-agent-mux-orc-onboard`.
 4. Run `tests/test_version_consistency.py` after the edits to confirm lockstep holds before the release commit.
 5. Recommended commit style, consistent with existing history (`4a3328d chore(release): bump framework and 8 skills to v3.1.0 (MINOR)`): `chore(release): bump framework and 8 skills to v4.0.0 (MAJOR — cline removal)`.
 No other file in the repo hardcodes the version literal (`create_session.sh` only echoes `${MAM_VERSION:-unknown}` at runtime — confirmed via grep), so this is the complete edit surface.
 [VERDICT: N/A — consensus/planning artifact, not a code review]
@@ -24,6 +24,13 @@ fi
 SKILL_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 export PYTHONPATH="$SKILL_DIR:${PYTHONPATH:-}"
 WORKSPACE_ROOT="${WORKSPACE_ROOT:-$(cd "$SKILL_DIR/../.." && pwd)}"
 export WORKSPACE_ROOT
 # Framework semantic version. Single runtime source of truth; kept in lockstep
 # with VERSIONS.md and the 8 SKILL.md frontmatters by tests/test_version_consistency.py.
 # NOTE: unlike other MAM_* variables this one is intentionally NOT env-overridable.
 MAM_VERSION="4.0.0"
 export MAM_VERSION
 AGENT_SESSIONS_YAML="${AGENT_SESSIONS_YAML:-$WORKSPACE_ROOT/.mam/agent-sessions.yaml}"
 _sanitize_herdr_agent_name() {
@@ -43,12 +50,14 @@ _sanitize_herdr_agent_name() {
      h=$(printf '%s' "$s" | sha1sum 2>/dev/null | awk '{print $1}' | cut -c 1-8)
    elif command -v openssl >/dev/null 2>&1; then
      h=$(printf '%s' "$s" | openssl sha1 2>/dev/null | awk '{print $NF}' | cut -c 1-8)
    else
      h=$(python3 -c "import hashlib,sys; print(hashlib.sha1(sys.argv[1].encode()).hexdigest()[:8])" "$s" 2>/dev/null || echo "00000000")
    fi
-    s="${s:0:23}-${h}"
+    if [ -n "$h" ]; then
      s="${s:0:23}-$h"
    else
      s="${s:0:32}"
    fi
  fi
-  printf '%s\n' "${s:0:32}"
+  printf '%s\n' "$s"
 }
 # Add common Homebrew and local binary paths to PATH to ensure they are available in non-interactive shells
@@ -59,7 +68,9 @@ for dir in /home/linuxbrew/.linuxbrew/bin /home/linuxbrew/.linuxbrew/sbin "$HOME
 done
 # Central TUI dialog and readiness validation tokens (OP-6)
-_MAM_DIALOG_TOKENS='Do you trust the files|Yes, proceed|No, exit|Allow this|Press Enter to continue|browser to authenticate|Use arrow keys|Esc to cancel|Resuming the full session|Resume from summary'
+_MAM_MODAL_TOKENS='Do you trust the files|Yes, proceed|No, exit|Allow this|browser to authenticate|Resuming the full session|Resume from summary|Try the new fullscreen renderer\?'
 _MAM_HINT_TOKENS='Use arrow keys|Esc to cancel|Press Enter to continue'
 _MAM_DIALOG_TOKENS="${_MAM_MODAL_TOKENS}|${_MAM_HINT_TOKENS}"
 _MAM_READY_TOKENS_CLAUDE='Anthropic|Assistant|Chat|Welcome|Claude Code|Opus|Sonnet|Haiku'
 # Workspace-relative defaults with environment overrides (Phase Z)
@@ -235,6 +246,174 @@ _sanitize_herdr_agent_name() {
  fi
  printf '%s\n' "${s:0:32}"
 }
 # ---------------------------------------------------------------------------
 # Workspace scoping (ISSUE-3).
 #
 # Hard filter when HERDR_WORKSPACE_ID is set, else the workspace id this
 # shim last persisted under $WORKSPACE_ROOT/.mam/herdr_workspace_id.
 # Do not infer from cwd — that silently blocks legitimate cross-workspace
 # lookups. No env and no file keeps the previous server-global lookup.
 # ---------------------------------------------------------------------------
 _herdr_ws_id_file() {
  if [ -n "${WORKSPACE_ROOT:-}" ]; then
    printf '%s\n' "$WORKSPACE_ROOT/.mam/herdr_workspace_id"
  fi
 }
 _herdr_persist_ws_id() {
  local id="$1" f
  [ -n "$id" ] || return 0
  f=$(_herdr_ws_id_file)
  [ -n "$f" ] || return 0
  mkdir -p "$(dirname "$f")" 2>/dev/null || true
  printf '%s\n' "$id" > "$f" 2>/dev/null || true
 }
 _herdr_ws_scope() {
  if [ -n "${HERDR_WORKSPACE_ID:-}" ]; then
    printf '%s\n' "$HERDR_WORKSPACE_ID"
    return 0
  fi
  local f id=""
  f=$(_herdr_ws_id_file)
  if [ -n "$f" ] && [ -f "$f" ]; then
    id=$(tr -d '[:space:]' < "$f" 2>/dev/null || true)
  fi
  printf '%s\n' "$id"
 }
 # _herdr_agent_get_scoped <name> [workspace_id]
 #
 # agent get with the same workspace predicate as _resolve_herdr_pane_id.
 # Prints pane_id on stdout and returns 0 when the agent exists and is in
 # scope. Returns 1 (prints nothing) if missing or in another workspace.
 # Callers MUST wrap with `|| true`.
 _herdr_agent_get_scoped() {
  local name="$1"
  local target_ws pid=""
  # Default scope is the explicit env var only. The persisted workspace
  # file is NOT used here: one MAM workspace can own several herdr
  # workspaces (layout overflow / parallel create), so a single file
  # must not reject a uniquely named agent. File scope applies to pane
  # list / label lookup via _herdr_ws_scope.
  if [ "$#" -ge 2 ]; then
    target_ws="$2"
  else
    target_ws="${HERDR_WORKSPACE_ID:-}"
  fi
  [ -n "$name" ] || return 1
  pid=$(_real_herdr agent get "$name" 2>/dev/null | TARGET_WS="$target_ws" python3 -c "
 import sys, json, os
 tws = os.environ.get('TARGET_WS', '')
 try:
    a = json.load(sys.stdin).get('result', {}).get('agent', {})
    if tws and a.get('workspace_id') and a.get('workspace_id') != tws:
        sys.exit(1)
    pid = a.get('pane_id') or ''
    if pid:
        print(pid)
        sys.exit(0)
 except Exception:
    pass
 sys.exit(1)
 " 2>/dev/null || echo "")
  if [ -n "$pid" ]; then
    printf '%s\n' "$pid"
    return 0
  fi
  return 1
 }
 # _resolve_herdr_pane_id <target> [workspace_id]
 #
 # Resolve a session name / label to a real pane_id ("wN:pM").
 # Strict order (no substring matching at any step):
 #   1. herdr agent get <sanitized_name> (workspace-scoped)
 #   2. herdr agent get <raw_name> (workspace-scoped)
 #   3. herdr pane list [--workspace WS] matching
 #        3-a. label exact
 #        3-b. name exact
 #        3-c. agent exact
 # On success print pane_id on stdout and return 0; on failure print nothing
 # and return 1. Callers MUST wrap with `|| true` (shim runs under set -e).
 _resolve_herdr_pane_id() {
  local target="$1"
  local target_ws="${2:-$(_herdr_ws_scope)}"
  local sat pid=""
  sat=$(_sanitize_herdr_agent_name "$target")
  local cand get_ws
  if [ "$#" -ge 2 ]; then
    get_ws="$target_ws"
  else
    get_ws="${HERDR_WORKSPACE_ID:-}"
  fi
  for cand in "$sat" "$target"; do
    [ -n "$cand" ] || continue
    pid=$(_herdr_agent_get_scoped "$cand" "$get_ws" 2>/dev/null || true)
    [ -n "$pid" ] && break
  done
  if [ -z "$pid" ]; then
    local ws_flag=()
    [ -n "$target_ws" ] && ws_flag=(--workspace "$target_ws")
    pid=$(_real_herdr pane list "${ws_flag[@]+"${ws_flag[@]}"}" 2>/dev/null \
      | TARGET_NAME="$target" TARGET_SAN="$sat" TARGET_WS="$target_ws" WORKSPACE_ROOT="${WORKSPACE_ROOT:-$PWD}" python3 -c "
 import sys, json, os
 tn  = os.environ.get('TARGET_NAME', '')
 tsa = os.environ.get('TARGET_SAN', '')
 tws = os.environ.get('TARGET_WS', '')
 ws_root = os.environ.get('WORKSPACE_ROOT', os.getcwd())
 try:
    panes = json.load(sys.stdin).get('result', {}).get('panes', [])
    # Client-side filter in case an older herdr ignores --workspace.
    if tws:
        panes = [p for p in panes if p.get('workspace_id') == tws]
    # ISSUE-2: exact match first, then agent-sessions.yaml lookup fallback
    for key in ('label', 'name', 'agent'):
        for p in panes:
            v = p.get(key)
            if v and (v == tn or v == tsa):
                pid = p.get('pane_id') or ''
                if pid:
                    print(pid)
                    sys.exit(0)
    agent_kind = None
    yaml_path = os.path.join(ws_root, '.mam', 'agent-sessions.yaml')
    if os.path.isfile(yaml_path):
        try:
            import yaml
            with open(yaml_path) as f:
                ydata = yaml.safe_load(f) or {}
            for s in ydata.get('herdr_sessions', []):
                if s.get('name') == tn or s.get('name') == tsa:
                    agent_kind = s.get('pane', {}).get('cmd') or ''
                    break
        except Exception as e:
            sys.stderr.write(f'warning: yaml load failed: {e}\n')
    if agent_kind:
        matching = [p.get('pane_id') for p in panes if p.get('agent') == agent_kind and p.get('pane_id')]
        if len(matching) == 1:
            print(matching[0])
            sys.exit(0)
        elif len(matching) > 1:
            # R-1: Ambiguous resolution with multiple same-kind panes — fail closed
            sys.exit(1)
 except Exception:
    pass
 sys.exit(1)
 " 2>/dev/null || echo "")
  fi
  # Real pane_id values look like 'w1E:p1' — the workspace segment is
  # alphanumeric. A digits-only pattern would reject every live pane_id.
  if [[ "$pid" =~ ^w[A-Za-z0-9]+:p[A-Za-z0-9]+$ ]]; then
    printf '%s\n' "$pid"
    return 0
  fi
  return 1
 }
 cmd="${1:-}"
 if [ -z "$cmd" ]; then
  echo "herdr shim: no command specified" >&2
@@ -246,22 +425,79 @@ case "$cmd" in
  agent)
    sub="${1:-}"
    shift || true
    _resolve_herdr_target() {
      local raw="$1"
      local sat
      sat=$(_sanitize_herdr_agent_name "$raw")
      if [ -n "$(_herdr_agent_get_scoped "$sat" 2>/dev/null || true)" ]; then
        echo "$sat"
        return 0
      fi
      if [ "$raw" != "$sat" ] && [ -n "$(_herdr_agent_get_scoped "$raw" 2>/dev/null || true)" ]; then
        echo "$raw"
        return 0
      fi
      local from_list
      from_list=$(_real_herdr agent list 2>/dev/null | TARGET_NAME="$raw" TARGET_SAN="$sat" TARGET_WS="$(_herdr_ws_scope)" python3 -c '
 import sys, json, os
 tn  = os.environ.get("TARGET_NAME", "")
 tsa = os.environ.get("TARGET_SAN", "")
 tws = os.environ.get("TARGET_WS", "")
 try:
    d = json.loads(sys.stdin.read())
    agents = d.get("result", {}).get("agents", [])
    if tws:
        agents = [a for a in agents if a.get("workspace_id") == tws]
    for a in agents:
        name = a.get("name", "")
        if name and (name == tn or name == tsa):
            print(a.get("pane_id") or name)
            sys.exit(0)
 except Exception:
    pass
 sys.exit(1)
 ' 2>/dev/null || echo "")
      if [ -n "$from_list" ]; then
        echo "$from_list"
        return 0
      fi
      # Explicit-env miss: do not fall through to a name that agent prompt
      # would deliver into another workspace (ISSUE-3 / F-2b). File-only
      # scope does not trip this — see _herdr_agent_get_scoped.
      if [ -n "${HERDR_WORKSPACE_ID:-}" ]; then
        return 1
      fi
      echo "$raw"
    }
    if [ "$sub" = "prompt" ] && [ $# -ge 2 ]; then
      t="$1"
      txt="$2"
      shift 2
-      at=$(_sanitize_herdr_agent_name "$t")
+      tgt=$(_resolve_herdr_target "$t" || true)
-      _real_herdr agent prompt "$at" "$txt" "$@" 2>/dev/null || _real_herdr agent prompt "$t" "$txt" "$@"
+      if [ -z "$tgt" ]; then
        echo "Error: no in-scope herdr agent for '$t'" >&2
        exit 1
      fi
      _real_herdr agent prompt "$tgt" "$txt" "$@"
    elif [ "$sub" = "get" ] && [ $# -ge 1 ]; then
      t="$1"
      shift
-      at=$(_sanitize_herdr_agent_name "$t")
+      tgt=$(_resolve_herdr_target "$t" || true)
-      _real_herdr agent get "$at" "$@" 2>/dev/null || _real_herdr agent get "$t" "$@"
+      if [ -z "$tgt" ]; then
        echo "Error: no in-scope herdr agent for '$t'" >&2
        exit 1
      fi
      _real_herdr agent get "$tgt" "$@"
    elif [ "$sub" = "read" ] && [ $# -ge 1 ]; then
      t="$1"
      shift
-      at=$(_sanitize_herdr_agent_name "$t")
+      tgt=$(_resolve_herdr_target "$t" || true)
-      _real_herdr agent read "$at" "$@" 2>/dev/null || _real_herdr agent read "$t" "$@"
+      if [ -z "$tgt" ]; then
        echo "Error: no in-scope herdr agent for '$t'" >&2
        exit 1
      fi
      _real_herdr agent read "$tgt" "$@"
    else
      _real_herdr agent "$sub" "$@"
    fi
@@ -281,25 +517,36 @@ case "$cmd" in
        *) shift ;;
      esac
    done
-    if _real_herdr agent get "$(_sanitize_herdr_agent_name "$sess")" >/dev/null 2>&1 || _real_herdr agent get "$sess" >/dev/null 2>&1; then
+    if [ -n "$(_herdr_agent_get_scoped "$(_sanitize_herdr_agent_name "$sess")" 2>/dev/null || true)" ] \
       || [ -n "$(_herdr_agent_get_scoped "$sess" 2>/dev/null || true)" ]; then
      exit 0
    fi
-    if _real_herdr agent list 2>/dev/null | TARGET_NAME="$sess" python3 -c "
+    if _real_herdr agent list 2>/dev/null | TARGET_NAME="$sess" TARGET_WS="$(_herdr_ws_scope)" python3 -c '
 import sys, json, os
-from lib_py.agents.sanitize import sanitize_herdr_agent_name
+try:
-tn = os.environ.get('TARGET_NAME', '')
+    sys.path.insert(0, os.path.abspath(".agents/skills"))
    from lib_py.agents.sanitize import sanitize_herdr_agent_name
 except Exception:
    sanitize_herdr_agent_name = lambda s: s.lower()[:32] if s else "agent"
 tn = os.environ.get("TARGET_NAME", "")
 stn = sanitize_herdr_agent_name(tn)
 tws = os.environ.get("TARGET_WS", "")
 try:
    d = json.loads(sys.stdin.read())
-    agents = d.get('result', {}).get('agents', [])
+    agents = d.get("result", {}).get("agents", [])
    if tws:
        agents = [a for a in agents if a.get("workspace_id") == tws]
    for a in agents:
-        an = a.get('name', '')
+        an = a.get("name", "")
-        if an == tn or an == stn:
+        if an and (an == tn or an == stn):
            sys.exit(0)
 except Exception:
    pass
 sys.exit(1)
-"; then
+'; then
      exit 0
    fi
    if [ -n "$(_resolve_herdr_pane_id "$sess" 2>/dev/null || true)" ]; then
      exit 0
    fi
    exit 1
@@ -359,18 +606,15 @@ print('\t'.join(env_flags) + '\n' + ' '.join(binary_tokens))
      *-creator-claude|*-planner-claude|*-reviewer-claude) kind="claude" ;;
      *-creator-agy|*-planner-agy|*-reviewer-agy)          kind="agy" ;;
      *-creator-hermes|*-planner-hermes|*-reviewer-hermes) kind="hermes" ;;
      *-creator-cline|*-planner-cline|*-reviewer-cline)    kind="cline" ;;
      *-creator-grok|*-planner-grok|*-reviewer-grok)      kind="grok" ;;
      *)
        if echo "$name" | grep -qi "agy"; then kind="agy"
        elif echo "$name" | grep -qi "claude"; then kind="claude"
        elif echo "$name" | grep -qi "hermes"; then kind="hermes"
        elif echo "$name" | grep -qi "cline"; then kind="cline"
        elif echo "$name" | grep -qi "grok"; then kind="grok"
        elif echo "${final_cmd:-}" | grep -qi "agy"; then kind="agy"
        elif echo "${final_cmd:-}" | grep -qi "claude"; then kind="claude"
        elif echo "${final_cmd:-}" | grep -qi "hermes"; then kind="hermes"
        elif echo "${final_cmd:-}" | grep -qi "cline"; then kind="cline"
        elif echo "${final_cmd:-}" | grep -qi "grok"; then kind="grok"
        fi
        ;;
@@ -385,7 +629,7 @@ try:
    tokens = shlex.split(cmd)
    if tokens:
        first = tokens[0]
-        if first in ('claude', 'agy', 'hermes', 'cline', 'grok') or any(first.endswith('/' + a) for a in ('claude', 'agy', 'hermes', 'cline', 'grok')) or (kind and (first == kind or first.endswith('/' + kind))):
+        if first in ('claude', 'agy', 'hermes', 'grok') or any(first.endswith('/' + a) for a in ('claude', 'agy', 'hermes', 'grok')) or (kind and (first == kind or first.endswith('/' + kind))):
            tokens = tokens[1:]
    print(' '.join(shlex.quote(t) for t in tokens))
 except Exception:
@@ -438,7 +682,7 @@ except Exception:
      fi
      if [ "$split_dir" = "right" ] || [ "$split_dir" = "down" ]; then
-        split_json=$(_real_herdr pane split --pane "$sample_pane" --direction "$split_dir" --cwd "${ws:-.}" $env_flags --no-focus 2>/dev/null || echo "")
+        split_json=$(_real_herdr pane split --pane "$sample_pane" --direction "$split_dir" --cwd "${ws:-.}" $env_flags --env HERDR_WORKSPACE_ID="$existing_ws" --no-focus 2>/dev/null || echo "")
        target_pane=$(echo "$split_json" | python3 -c "
 import sys, json
 try:
@@ -452,7 +696,7 @@ except Exception:
        # W2b: Overflow threshold reached — force create fresh workspace
        existing_ws=""
      else
-        split_json=$(_real_herdr pane split --pane "$sample_pane" --direction right --cwd "${ws:-.}" $env_flags --no-focus 2>/dev/null || echo "")
+        split_json=$(_real_herdr pane split --pane "$sample_pane" --direction right --cwd "${ws:-.}" $env_flags --env HERDR_WORKSPACE_ID="$existing_ws" --no-focus 2>/dev/null || echo "")
        target_pane=$(echo "$split_json" | python3 -c "
 import sys, json
 try:
@@ -476,11 +720,25 @@ try:
    print(res.get('root_pane', {}).get('pane_id') or w_obj.get('root_pane_id') or res.get('root_pane_id') or res.get('pane_id', ''))
 except Exception:
    pass
 " 2>/dev/null || echo "")
      ws_id=$(echo "$ws_json" | python3 -c "
 import sys, json
 try:
    d = json.loads(sys.stdin.read())
    res = d.get('result', {})
    print(res.get('workspace', {}).get('workspace_id') or '')
 except Exception:
    pass
 " 2>/dev/null || echo "")
    else
      if [ -n "${MAM_WS_LABEL:-}" ]; then
        _real_herdr workspace rename "$existing_ws" "$MAM_WS_LABEL" >/dev/null 2>&1 || true
      fi
      ws_id="$existing_ws"
    fi
    if [ -n "${ws_id:-}" ]; then
      export HERDR_WORKSPACE_ID="$ws_id"
      _herdr_persist_ws_id "$ws_id"
    fi
    if [ -z "$target_pane" ]; then
@@ -503,11 +761,15 @@ except Exception:
      else
        res=$(eval "_real_herdr agent start \"$agent_name\" --kind \"$kind\" --pane \"$target_pane\"" 2>&1 || true)
      fi
-      if echo "$res" | grep -q "agent_started"; then
+      if echo "$res" | grep -qiE "^usage:|unknown option|unknown flag|missing required|invalid_agent_name|^error:"; then
        success=1
        break
      fi
-      if echo "$res" | grep -qiE "^usage:|unknown option|unknown flag|missing required|invalid_agent_name|^error:"; then
+      # Fatal CLI errors abort immediately. agent_not_ready is the
      # documented "process is up, blocked on a dialog" status — continue
      # to wait_for_tui_ready. Do NOT treat "timed out waiting for agent
      # startup" as success: herdr returns that for a dead process too.
      if echo "$res" | grep -qE "agent_started|agent_not_ready"; then
        success=1
        break
      fi
      if [ "$i" -lt 2 ]; then
@@ -540,23 +802,12 @@ except Exception:
    # "$sess"` with a MAM session name always fails (silently, via `|| true`).
    # Resolve the real pane_id via `agent get` and close just that pane instead.
    agent_target=$(_sanitize_herdr_agent_name "$sess")
-    pane_id=$(_real_herdr agent get "$agent_target" 2>/dev/null | python3 -c "
+    pane_id=$(_resolve_herdr_pane_id "$sess" 2>/dev/null || true)
 import sys, json
 try:
    print(json.load(sys.stdin).get('result', {}).get('agent', {}).get('pane_id', ''))
 except Exception:
    pass
 " 2>/dev/null || _real_herdr agent get "$sess" 2>/dev/null | python3 -c "
 import sys, json
 try:
    print(json.load(sys.stdin).get('result', {}).get('agent', {}).get('pane_id', ''))
 except Exception:
    pass
 " 2>/dev/null)
    if [ -n "$pane_id" ]; then
      _real_herdr pane close "$pane_id" >/dev/null 2>&1 || true
    fi
-    _real_herdr kill-session -t "$agent_target" >/dev/null 2>&1 || _real_herdr kill-session -t "$sess" >/dev/null 2>&1 || true
+    _real_herdr kill-session -t "$agent_target" >/dev/null 2>&1 \
      || _real_herdr kill-session -t "$sess" >/dev/null 2>&1 || true
    ;;
  list-panes)
    sess="" format=""
@@ -656,7 +907,15 @@ except Exception:
      esac
    done
    agent_target=$(_sanitize_herdr_agent_name "$sess")
-    _real_herdr agent read "$agent_target" --source visible --lines 100 2>/dev/null || _real_herdr agent read "$sess" --source visible --lines 100 2>/dev/null || true
+    pane_id=$(_resolve_herdr_pane_id "$sess" 2>/dev/null || true)
    if [ -n "$pane_id" ]; then
      _real_herdr pane read "$pane_id" --source visible --lines 100 2>/dev/null \
        || _real_herdr agent read "$agent_target" --source visible --lines 100 2>/dev/null \
        || _real_herdr agent read "$sess" --source visible --lines 100 2>/dev/null || true
    else
      _real_herdr agent read "$agent_target" --source visible --lines 100 2>/dev/null \
        || _real_herdr agent read "$sess" --source visible --lines 100 2>/dev/null || true
    fi
    ;;
  send-keys)
    sess="" key=""
@@ -679,19 +938,7 @@ except Exception:
    # `pane send-keys` requires a real pane_id ("wN:pN"), not an agent name —
    # resolve it via `agent get` first (agent-level commands accept names).
    agent_target=$(_sanitize_herdr_agent_name "$sess")
-    pane_id=$(_real_herdr agent get "$agent_target" 2>/dev/null | python3 -c "
+    pane_id=$(_resolve_herdr_pane_id "$sess" 2>/dev/null || true)
 import sys, json
 try:
    print(json.load(sys.stdin).get('result', {}).get('agent', {}).get('pane_id', ''))
 except Exception:
    pass
 " 2>/dev/null || _real_herdr agent get "$sess" 2>/dev/null | python3 -c "
 import sys, json
 try:
    print(json.load(sys.stdin).get('result', {}).get('agent', {}).get('pane_id', ''))
 except Exception:
    pass
 " 2>/dev/null)
    if [ -n "$pane_id" ]; then
      _real_herdr pane send-keys "$pane_id" "$key" >/dev/null 2>&1 || true
    else
@@ -774,12 +1021,23 @@ except Exception:
    done
    buffer_dir="${WORKSPACE_ROOT:+$WORKSPACE_ROOT/.mam/buffers}"
    buffer_dir="${buffer_dir:-${TMPDIR:-/tmp}/mam_buffers}"
-    if [ -f "$buffer_dir/$buf" ]; then
+    if [ ! -f "$buffer_dir/$buf" ]; then
      _real_herdr agent send "$sess" "$(cat "$buffer_dir/$buf")" >/dev/null 2>&1 || true
    else
      echo "Error: buffer $buf not found ($buffer_dir/$buf)" >&2
      exit 1
    fi
    pane_id=$(_resolve_herdr_pane_id "$sess" 2>/dev/null || true)
    if [ -z "$pane_id" ]; then
      # herdr has no `agent send` subcommand. Returning success here would let
      # send_keys_safe submit an empty prompt.
      echo "Error: paste-buffer could not resolve a pane for '$sess'" >&2
      exit 1
    fi
    # Insert only. Submission is owned exclusively by send_keys_safe (ISSUE-1).
    # A combined insert-and-submit command would double-submit.
    if ! _real_herdr pane send-text "$pane_id" "$(cat "$buffer_dir/$buf")" >/dev/null 2>&1; then
      echo "Error: pane send-text failed for '$sess' ($pane_id)" >&2
      exit 1
    fi
    ;;
  delete-buffer)
    buf="tmp_buffer"
@@ -1399,7 +1657,7 @@ capture_conversation_id() {
 # Config-home isolation (.mam/agent_homes/<uuid>/) and legacy isolation.root
 # row consumers were completely deprecated and removed in favor of:
 # 1. Universal Global Config: all agents read/write standard ~/.claude, ~/.gemini,
-#    ~/.hermes, ~/.cline user configuration and credential stores.
+#    ~/.hermes user configuration and credential stores.
 # 2. Process Isolation: each agent-workspace pair runs in its own herdr pane.
 # 3. Conversation Isolation: session UUIDs discriminate conversation history.
 # ---------------------------------------------------------------------------
@@ -1565,41 +1823,117 @@ start_watchdog() {
 # wait_for_tui_ready <session_name> <agent>
 # Waits up to 30 seconds for the agent's TUI to render its welcome screen.
 # Returns 0 on readiness, 1 on timeout, 2 on unobservable/headless.
 wait_for_tui_ready() {
  local sess="$1" agent="$2"
-  # Self-contained resolution: works whether or not caller evaluated facts (C1-(3)).
+  local strong_tokens="${MAM_STRONG_READY_TOKENS:-}"
-  local tokens="${MAM_READY_TOKENS:-}"
+  local weak_tokens="${MAM_WEAK_READY_TOKENS:-}"
-  if [ -z "$tokens" ]; then
+  local placeholder="${MAM_INPUT_PLACEHOLDER:-}"
  local prompt="${MAM_INPUT_PROMPT:-}"
  local rule_pattern="${MAM_INPUT_RULE_PATTERN:-}"
  local modal_tokens="${MAM_MODAL_TOKENS:-}"
  # Self-contained resolution: fetch facts in 1 call if not already in environment
  if [ -z "$strong_tokens" ] && [ -z "$weak_tokens" ] && [ -z "${MAM_READY_TOKENS:-}" ]; then
    local _facts=""
    _facts="$("$(_delegate_py_bin)" -m lib_py.agents facts "$agent" 2>/dev/null)" || _facts=""
-    tokens="$(printf '%s\n' "$_facts" | sed -n 's/^MAM_READY_TOKENS=//p')"
+    if [ -n "$_facts" ]; then
-    [ -n "$tokens" ] && eval "tokens=$tokens"
+      eval "$_facts"
      strong_tokens="${MAM_STRONG_READY_TOKENS:-}"
      weak_tokens="${MAM_WEAK_READY_TOKENS:-}"
      placeholder="${MAM_INPUT_PLACEHOLDER:-}"
      prompt="${MAM_INPUT_PROMPT:-}"
      rule_pattern="${MAM_INPUT_RULE_PATTERN:-}"
      modal_tokens="${MAM_MODAL_TOKENS:-}"
    fi
  fi
-  if [ -z "$tokens" ]; then
+  # Fallback if strong_tokens is empty but MAM_READY_TOKENS is set
  if [ -z "$strong_tokens" ] && [ -n "${MAM_READY_TOKENS:-}" ]; then
    strong_tokens="$MAM_READY_TOKENS"
  fi
  if [ -z "$strong_tokens" ] && [ -z "$weak_tokens" ] && [ -z "$placeholder" ]; then
    echo "wait_for_tui_ready: no ready tokens for agent '$agent'" >&2
    return 1
  fi
-  local i
+
  local empty_streak=0
  local empty_giveup="${MAM_READY_EMPTY_GIVEUP:-5}"
  local modal_pat="$_MAM_MODAL_TOKENS"
  [ -n "$modal_tokens" ] && modal_pat="${modal_pat}|${modal_tokens}"
  local i content tail_lines
  for i in {1..30}; do
-    if [ "$agent" = "claude" ]; then
+    # 1. Single capture per iteration (T-3)
-      handle_startup_dialogs "$sess" 1 || true
+    content=$(_pane_capture "$sess")
-    fi
+
-    if _pane_dialog_open "$sess"; then
+    # Consecutive blank capture check (C-6)
-      if printf '%s\n' "$(_pane_tail "$sess" 5)" | grep -q 'Press Enter to continue'; then
+    if [ -z "$content" ]; then
-        _sks_herdr send-keys -t "$sess" Enter || true
+      empty_streak=$((empty_streak + 1))
-        sleep 1
+      if [ "$empty_streak" -ge "$empty_giveup" ]; then
        echo "wait_for_tui_ready: unobservable/headless pane for '$sess' (consecutive empty captures: $empty_streak)" >&2
        return 2
      fi
      sleep 1
      continue
    fi
-    local content
+    empty_streak=0
-    content=$(_sks_herdr capture-pane -p -t "$sess" 2>/dev/null || echo "")
+
-    if [ -n "$content" ]; then
+    # 2. Check modal dialogs FIRST (F-2): if a blocking modal signature is present in the tail lines,
-      if echo "$content" | grep -E -q "$tokens" 2>/dev/null; then
+    # handle it and do NOT declare ready on this iteration.
-        echo "✅ $agent TUI detected ready."
+    tail_lines=$(printf '%s\n' "$content" | grep -v '^[[:space:]]*$' | tail -n 20)
-        return 0
+    if printf '%s\n' "$tail_lines" | grep -E -q "$modal_pat" 2>/dev/null; then
      handle_startup_dialogs "$sess" 1 || true
      sleep 1
      continue
    fi
    # 3. Tier 2 Readiness Evaluation (T-2b, T-4: Ready check first)
    local s_matched=false
    local w_matched=false
    local c_matched=false
    # S-layer: Strong ready token match
    if [ -n "$strong_tokens" ]; then
      if echo "$content" | grep -E -q "$strong_tokens" 2>/dev/null; then
        s_matched=true
      fi
    fi
    # S-layer: Placeholder match (must be >= 8 characters)
    if [ -n "$placeholder" ] && [ "${#placeholder}" -ge 8 ]; then
      if echo "$content" | grep -F -q "$placeholder" 2>/dev/null; then
        s_matched=true
      fi
    fi
    # W-layer: Weak ready token match
    if [ -n "$weak_tokens" ]; then
      if echo "$content" | grep -E -q "$weak_tokens" 2>/dev/null; then
        w_matched=true
      fi
    fi
    # C-layer: Corroboration (Prompt in last 5 non-blank lines OR rule pattern match)
    if [ -n "$prompt" ]; then
      if printf '%s\n' "$content" | grep -v '^[[:space:]]*$' | tail -n 5 | grep -F -q "$prompt" 2>/dev/null; then
        c_matched=true
      fi
    fi
    if [ -n "$rule_pattern" ]; then
      if echo "$content" | grep -E -q "$rule_pattern" 2>/dev/null; then
        c_matched=true
      fi
    fi
    # Decision: S OR (W AND C)
    if [ "$s_matched" = true ] || { [ "$w_matched" = true ] && [ "$c_matched" = true ]; }; then
      echo "✅ $agent TUI detected ready."
      return 0
    fi
    # 4. Startup dialog & hint resolution if not ready
    handle_startup_dialogs "$sess" 1 || true
    sleep 1
  done
  echo "⚠️ TUI readiness check timed out for '$sess'." >&2
@@ -1692,11 +2026,14 @@ _pane_quiescent() {
 }
 # _pane_dialog_open <sess> — focus-stealing modal signatures (trust /
-# permission / OAuth / list-selection), checked in the bottom 20 pane lines
+# permission / OAuth / list-selection), checked in the bottom 8 pane lines
 # only (dialogs render near the input area; conversation text above must not
 # trigger this). Tokens must NOT appear on normal idle prompt screens.
 _pane_dialog_open() {
-  _pane_tail "$1" 20 | grep -Eq "$_MAM_DIALOG_TOKENS"
+  local extra="${MAM_MODAL_TOKENS:-}"
  local pat="$_MAM_MODAL_TOKENS"
  [ -n "$extra" ] && pat="${pat}|${extra}"
  _pane_tail "$1" "${MAM_DIALOG_TAIL_LINES:-8}" | grep -Eq "$pat"
 }
 # send_keys_safe <sess> <text> [job_id]
@@ -1711,6 +2048,22 @@ _pane_dialog_open() {
 send_keys_safe() {
  local sess="$1" text="$2" job_id="${3:-adhoc}"
  local pre_submit deadline try
  local MAM_MODAL_TOKENS="${MAM_MODAL_TOKENS:-}"
  local MAM_AGENT_NAME MAM_OWN_KEY MAM_INPUT_PROMPT MAM_INPUT_PLACEHOLDER MAM_INPUT_RULE_PATTERN
  local MAM_READY_TOKENS MAM_STRONG_READY_TOKENS MAM_WEAK_READY_TOKENS MAM_EXIT_KEY MAM_DELEGATE_AGENT_KEY
  if [ -z "${MAM_MODAL_TOKENS:-}" ]; then
    local _sks_agent=""
    case "$sess" in
      *-claude|*-claude-[0-9]*|claude|claude-[0-9]*) _sks_agent="claude" ;;
      *-agy|*-agy-[0-9]*|agy|agy-[0-9]*)          _sks_agent="agy" ;;
      *-hermes|*-hermes-[0-9]*|hermes|hermes-[0-9]*) _sks_agent="hermes" ;;
      *-grok|*-grok-[0-9]*|grok|grok-[0-9]*)       _sks_agent="grok" ;;
    esac
    if [ -n "$_sks_agent" ]; then
      eval "$("$(_delegate_py_bin)" -m lib_py.agents facts "$_sks_agent" 2>/dev/null || true)"
    fi
  fi
  local _q_rc=0
  _pane_quiescent "$sess" "${SKS_QUIESCENT_TRIES:-20}" "${SKS_QUIESCENT_INTERVAL:-0.5}" || _q_rc=$?
@@ -1748,20 +2101,24 @@ send_keys_safe() {
  # multi-byte UTF-8 char, e.g. Korean, producing a marker that can never match
  # the properly-decoded rendered pane text) of the last non-empty line.
  marker=$(printf '%s' "$text" | tr -d '\r' | awk 'NF {line=$0} END {print line}' | python3 -c "import sys; print(sys.stdin.read().rstrip('\n')[-24:], end='')")
-  # Whitespace-normalized copy for matching: some TUIs (e.g. cline's own
+  # Whitespace-normalized copy for matching: some TUIs don't just soft-wrap
-  # message rendering) don't just soft-wrap with a bare newline — they add a
+  # with a bare newline — they add a leading-space "hanging indent" on the
-  # leading-space "hanging indent" on the continuation line too, so removing
+  # continuation line too, so removing only '\n' still leaves an extra space
-  # only '\n' still leaves an extra space that breaks an exact literal match.
+  # that breaks an exact literal match. Matching with all whitespace collapsed
-  # Matching with all whitespace collapsed out sidesteps wrap formatting
+  # out sidesteps wrap formatting entirely, whatever shape it takes.
  # entirely, whatever shape it takes.
  marker_norm=$(printf '%s' "$marker" | tr -d '[:space:]')
  local sks_buf="sks_${sess}_${job_id}_$$_${RANDOM}_$(date +%s%N 2>/dev/null || date +%s)"
  _sks_herdr set-buffer -b "$sks_buf" "$text"
-  _sks_herdr paste-buffer -b "$sks_buf" -t "$sess"
+  local _paste_rc=0
  _sks_herdr paste-buffer -b "$sks_buf" -t "$sess" || _paste_rc=$?
  _sks_herdr delete-buffer -b "$sks_buf" 2>/dev/null || true
  if [ "$_paste_rc" != "0" ]; then
    echo "send_keys_safe: paste-buffer failed rc=$_paste_rc ($sess)" >&2
    return 3
  fi
  local was_popup=0
-  if [[ "$sess" =~ "cline" ]] || [[ "$sess" =~ "claude" ]] || [[ "$sess" =~ "agy" ]] || [[ "$sess" =~ "grok" ]]; then
+  if [[ "$sess" =~ "claude" ]] || [[ "$sess" =~ "agy" ]] || [[ "$sess" =~ "grok" ]]; then
    # Skip strict paste check due to scrollout false-positives, proceed to C-m submission loop
    true
  else
@@ -1812,6 +2169,10 @@ handle_startup_dialogs() {
    pane=$(_pane_tail "$sess" 20)
    if printf '%s\n' "$pane" | grep -Eq 'Do you trust the files|Yes, I trust this folder|Quick safety check'; then
      _sks_herdr send-keys -t "$sess" Enter
    elif printf '%s\n' "$pane" | grep -q 'Yes, try it'; then
      # Fullscreen-renderer upsell modal (not the idle /tui tip). Enter would
      # accept and restart the session without permission flags — reject.
      _sks_herdr send-keys -t "$sess" Escape
    elif printf '%s\n' "$pane" | grep -q 'Yes, proceed'; then
      _sks_herdr send-keys -t "$sess" Down
      sleep 0.3
@@ -23,6 +23,9 @@ def main():
        print(f"MAM_INPUT_PLACEHOLDER={q(adapter.input_placeholder or '')}")
        print(f"MAM_INPUT_RULE_PATTERN={q(adapter.input_rule_pattern or '')}")
        print(f"MAM_READY_TOKENS={q(adapter.ready_tokens)}")
        print(f"MAM_STRONG_READY_TOKENS={q(adapter.strong_ready_tokens)}")
        print(f"MAM_WEAK_READY_TOKENS={q(adapter.weak_ready_tokens)}")
        print(f"MAM_MODAL_TOKENS={q(adapter.modal_tokens or '')}")
        print(f"MAM_EXIT_KEY={q(adapter.exit_key)}")
        print(f"MAM_DELEGATE_AGENT_KEY={q(adapter.delegate_agent_key)}")
@@ -40,6 +40,10 @@ class ClaudeAgentAdapter(BaseAgentAdapter):
    def input_rule_pattern(self) -> str:
        return '─{10,}'
    @property
    def modal_tokens(self) -> Optional[str]:
        return 'Try the new fullscreen renderer\\?'
    def artifact_path(self, uuid: str, ctx: DiscoveryContext) -> str:
        return f"{ctx.claude_dir}/{ctx.ws_key}/{uuid}.jsonl"
@@ -1,100 +0,0 @@
 import os, json, shutil, glob
 from typing import Optional, Any
 from lib_py.agents.base import BaseAgentAdapter, DiscoveryContext
 from lib_py.verify_session import workspace_key
 class ClineAgentAdapter(BaseAgentAdapter):
    @property
    def name(self) -> str:
        return 'cline'
    @property
    def own_key(self) -> str:
        return 'cline_conversation_id_own'
    @property
    def ready_tokens(self) -> str:
        return 'Cline|history|Chat|What can I do|slash commands'
    @property
    def exit_key(self) -> str:
        return '/exit'
    @property
    def delegate_agent_key(self) -> str:
        return 'cline-agent'
    @property
    def identity_cache_fields(self) -> tuple:
        return ('session_id',)
    @property
    def input_prompt(self) -> str:
        return '❯'
    @property
    def input_placeholder(self) -> str:
        return 'Ask anything...'
    @property
    def input_rule_pattern(self) -> str:
        return '─{10,}'
    def artifact_path(self, uuid: str, ctx: DiscoveryContext) -> str:
        return f"{ctx.home_dir}/.cline/data/sessions/{uuid}/{uuid}.json"
    def verify_artifact(self, uuid: str, ctx: DiscoveryContext) -> bool:
        path = self.artifact_path(uuid, ctx)
        if not os.path.exists(path):
            return False
        if ctx.epoch and os.path.getmtime(path) < ctx.epoch:
            return False
        try:
            with open(path) as f:
                sdata = json.load(f)
            if sdata.get("session_id") != uuid:
                return False
            found_cwd = sdata.get("cwd") or sdata.get("workspace_root")
            if found_cwd and workspace_key(found_cwd) != workspace_key(ctx.cwd):
                return False
        except Exception:
            return False
        return True
    def purge_artifacts(self, uuid: str, ctx: DiscoveryContext) -> list:
        purged = []
        sessions_dir = f"{ctx.home_dir}/.cline/data/sessions/{uuid}"
        if os.path.isdir(sessions_dir):
            shutil.rmtree(sessions_dir)
            purged.append(sessions_dir)
        return purged
    def spawn_spec(self, binary: str, session_uuid: str = "", use_wrapper: bool = False) -> str:
        return f"{binary} -i"
    def resume_spec(self, binary: str, session_uuid: str, materialized: bool = False) -> str:
        if materialized and session_uuid:
            return f"{binary} -i --id {session_uuid}"
        return f"{binary} -i"
    def auth_ok(self, run_cmd: Optional[Any] = None) -> bool:
        return True
    def discover(self, ctx: DiscoveryContext) -> list:
        sessions_dir = f"{ctx.home_dir}/.cline/data/sessions"
        if os.path.isdir(sessions_dir):
            files = []
            for folder in glob.glob(f"{sessions_dir}/*"):
                if os.path.isdir(folder):
                    fn = os.path.basename(folder)
                    jf = f"{folder}/{fn}.json"
                    if os.path.exists(jf):
                        files.append(jf)
            files.sort(key=os.path.getmtime, reverse=True)
            candidates = []
            for j in files:
                cand = os.path.basename(j)[:-5]
                if cand and self.verify_artifact(cand, ctx):
                    candidates.append(cand)
            return candidates
        return []
@@ -14,7 +14,7 @@ class HermesAgentAdapter(BaseAgentAdapter):
    @property
    def ready_tokens(self) -> str:
-        return 'Hermes'
+        return 'Hermes|Welcome to Hermes Agent|NOUS HERMES'
    @property
    def exit_key(self) -> str:
@@ -28,6 +28,18 @@ class HermesAgentAdapter(BaseAgentAdapter):
    def identity_cache_fields(self) -> tuple:
        return ('session_id',)
    @property
    def input_prompt(self) -> str:
        return '❯'
    @property
    def input_placeholder(self) -> str:
        return ''
    @property
    def input_rule_pattern(self) -> str:
        return '─{10,}'
    def artifact_path(self, uuid: str, ctx: DiscoveryContext) -> str:
        return f"{ctx.home_dir}/.hermes/sessions/session_{uuid}.json"
@@ -35,15 +47,15 @@ class HermesAgentAdapter(BaseAgentAdapter):
        hdb = f"{ctx.home_dir}/.hermes/state.db"
        if not os.path.exists(hdb):
            return False
        if ctx.epoch and os.path.getmtime(hdb) < ctx.epoch:
            return False
        try:
            conn = sqlite3.connect(hdb)
-            r = conn.execute("SELECT cwd FROM sessions WHERE id=?", (uuid,)).fetchone()
+            r = conn.execute("SELECT cwd, started_at FROM sessions WHERE id=?", (uuid,)).fetchone()
            conn.close()
            if not r:
                return False
-            found_cwd = r[0]
+            found_cwd, started_at = r[0], r[1]
            if ctx.epoch and started_at and float(started_at) < float(ctx.epoch):
                return False
            if found_cwd and workspace_key(found_cwd) != workspace_key(ctx.cwd):
                return False
        except Exception:
@@ -70,27 +82,37 @@ class HermesAgentAdapter(BaseAgentAdapter):
        return purged
    def spawn_spec(self, binary: str, session_uuid: str = "", use_wrapper: bool = False) -> str:
-        return binary
+        return f"{binary} --yolo --accept-hooks"
    def resume_spec(self, binary: str, session_uuid: str, materialized: bool = False) -> str:
        if materialized and session_uuid:
-            return f"{binary} --resume {session_uuid}"
+            return f"{binary} --resume {session_uuid} --no-restore-cwd --yolo --accept-hooks"
-        return binary
+        return f"{binary} --yolo --accept-hooks"
    def auth_ok(self, run_cmd: Optional[Any] = None) -> bool:
        return True
    def discover(self, ctx: DiscoveryContext) -> list:
        hdb = f"{ctx.home_dir}/.hermes/state.db"
-        if os.path.exists(hdb):
+        if not os.path.exists(hdb):
-            try:
+            return []
-                conn = sqlite3.connect(hdb)
+        try:
-                r = conn.execute("SELECT id FROM sessions WHERE cwd=? ORDER BY started_at DESC LIMIT 1", (ctx.workspace,)).fetchone()
+            conn = sqlite3.connect(hdb)
-                conn.close()
+            if ctx.epoch:
-                if r:
+                rows = conn.execute(
-                    cand = r[0]
+                    "SELECT id FROM sessions WHERE cwd=? AND started_at >= ? ORDER BY started_at DESC LIMIT 20",
-                    if cand and self.verify_artifact(cand, ctx):
+                    (ctx.workspace, ctx.epoch)
-                        return [cand]
+                ).fetchall()
-            except Exception:
+            else:
-                pass
+                rows = conn.execute(
-        return []
+                    "SELECT id FROM sessions WHERE cwd=? ORDER BY started_at DESC LIMIT 20",
                    (ctx.workspace,)
                ).fetchall()
            conn.close()
            candidates = []
            for (cand,) in rows:
                if cand and self.verify_artifact(cand, ctx):
                    candidates.append(cand)
            return candidates
        except Exception:
            return []
@@ -73,6 +73,18 @@ class BaseAgentAdapter:
    def input_rule_pattern(self) -> Optional[str]:
        return None
    @property
    def modal_tokens(self) -> Optional[str]:
        return None
    @property
    def strong_ready_tokens(self) -> str:
        return self.ready_tokens
    @property
    def weak_ready_tokens(self) -> str:
        return ''
    def derive_session_name(self, slug: str, role: str = "creator") -> str:
        r = role.lower()
        return f"{slug}-{r}-{self.name}"
@@ -5,14 +5,12 @@ from lib_py.agents.base import BaseAgentAdapter
 from lib_py.agents.adapters.claude import ClaudeAgentAdapter
 from lib_py.agents.adapters.agy import AgyAgentAdapter
 from lib_py.agents.adapters.hermes import HermesAgentAdapter
 from lib_py.agents.adapters.cline import ClineAgentAdapter
 from lib_py.agents.adapters.grok import GrokAgentAdapter
 _ADAPTERS: Dict[str, BaseAgentAdapter] = {
    'claude': ClaudeAgentAdapter(),
    'agy': AgyAgentAdapter(),
    'hermes': HermesAgentAdapter(),
    'cline': ClineAgentAdapter(),
    'grok': GrokAgentAdapter(),
 }
@@ -129,7 +129,7 @@ def atomic_dump_yaml_main():
            if name in old_roles and s.get('role') != old_roles[name]:
                raise SystemExit(f"VALIDATE: role of session {name!r} cannot be modified from {old_roles[name]!r} to {s.get('role')!r}")
-        running_keys = ['claude_session_id_own', 'agy_conversation_id_own', 'hermes_conversation_id_own', 'cline_conversation_id_own', 'grok_session_id_own']
+        running_keys = ['claude_session_id_own', 'agy_conversation_id_own', 'hermes_conversation_id_own', 'grok_session_id_own']
        id_to_session = {}
        for s in d.get('herdr_sessions', []):
            if s.get('status') == 'running':
@@ -66,7 +66,7 @@ def mam_orchestrator_uuids():
 def mam_row_own_uuid(row):
    if not isinstance(row, dict):
        return None
-    for k in ["claude_session_id_own", "agy_conversation_id_own", "hermes_conversation_id_own", "cline_conversation_id_own", "grok_session_id_own"]:
+    for k in ["claude_session_id_own", "agy_conversation_id_own", "hermes_conversation_id_own", "grok_session_id_own"]:
        v = row.get(k)
        if v:
            return v
@@ -8,7 +8,6 @@ OWN_KEY = {
    'claude': 'claude_session_id_own',
    'agy': 'agy_conversation_id_own',
    'hermes': 'hermes_conversation_id_own',
    'cline': 'cline_conversation_id_own',
    'grok': 'grok_session_id_own'
 }
@@ -31,7 +30,7 @@ def find_workspace_uuid_main():
        if s_item.get('status') == 'running':
            if target and s_item.get('name') == target:
                continue
-            for k in ['claude_session_id_own', 'agy_conversation_id_own', 'hermes_conversation_id_own', 'cline_conversation_id_own', 'grok_session_id_own']:
+            for k in ['claude_session_id_own', 'agy_conversation_id_own', 'hermes_conversation_id_own', 'grok_session_id_own']:
                val = s_item.get(k)
                if val:
                    running_ids.add(val)
@@ -1,7 +1,7 @@
 ---
 name: multi-agent-mux-create
 description: "Create a new agent session (claude, antigravity/agy) in a dedicated herdr session for context-preserving long-running work. Always creates a herdr session — never backgrounds with nohup/disown. Writes the new session to .mam/agent-sessions.yaml. Use when you want to start a fresh agent (no prior UUID) for a new project workspace."
-version: 3.0.0
+version: 4.0.0
 author: godopu
 license: MIT
 platforms: [linux, macos]
@@ -129,7 +129,7 @@ herdr_sessions:
 ```bash
 WORKSPACE=/path/to/project
-AGENT=claude  # claude | agy | hermes | cline | grok — always pass it explicitly
+AGENT=claude  # claude | agy | hermes | grok — always pass it explicitly
 source .agents/skills/lib.sh
 SESSION_NAME="$(derive_session_name "$WORKSPACE" "$AGENT")"
@@ -154,10 +154,13 @@ case "$AGENT" in
  agy)
    herdr new-session -d -s "$SESSION_NAME" -x 140 -y 40 -c "$WORKSPACE" "agy --dangerously-skip-permissions"
    ;;
  hermes)
    herdr new-session -d -s "$SESSION_NAME" -x 140 -y 40 -c "$WORKSPACE" "hermes --yolo --accept-hooks"
    ;;
  grok)
    herdr new-session -d -s "$SESSION_NAME" -x 140 -y 40 -c "$WORKSPACE" "grok --permission-mode bypassPermissions"
    ;;
-  *) echo "ERROR: --agent must be claude, agy, hermes, cline or grok, got: $AGENT"; exit 2 ;;
+  *) echo "ERROR: --agent must be claude, agy, hermes, or grok, got: $AGENT"; exit 2 ;;
 esac
 # 3. Wait for agent TUI to be ready (varies: claude ~5s, agy ~3s)
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # create_session.sh — multi-agent-mux-create 의 부속 스크립트
 # Usage:
-#   bash create_session.sh --workspace <path> --agent <claude|agy|hermes|cline> --role <role> [--session <name>] [--herdr-session <name>] [--wrapper]
+#   bash create_session.sh --workspace <path> --agent <claude|agy|hermes|grok> --role <role> [--session <name>] [--herdr-session <name>] [--wrapper]
 #
 # 동작:
 #   1) preflight: herdr/claude/agy 가용성, workspace 존재
@@ -26,11 +26,11 @@ source "$_lib_sh"
 usage() {
  cat <<EOF
-Usage: $0 --workspace <path> --agent <claude|agy|hermes|cline> --role <role> [options]
+Usage: $0 --workspace <path> --agent <claude|agy|hermes|grok> --role <role> [options]
 Options:
  --workspace PATH    project directory (required)
-  --agent AGENT       claude | agy | hermes | cline (required)
+  --agent AGENT       claude | agy | hermes | grok (required)
  --role ROLE         assigned role (required)
  --session NAME      herdr session name (default: derived from workspace)
  --wrapper           force use of ~/.local/bin/<session> wrapper even if not present
@@ -90,8 +90,8 @@ fi
 [ -n "$WORKSPACE" ] || { echo "ERROR: --workspace required" >&2; usage; exit 2; }
 [ -n "$AGENT" ]    || { echo "ERROR: --agent required" >&2; usage; exit 2; }
 case "$AGENT" in
-  claude|agy|hermes|cline|grok) ;;
+  claude|agy|hermes|grok) ;;
-  *) echo "ERROR: --agent must be claude, agy, hermes, cline or grok, got: $AGENT" >&2; exit 2 ;;
+  *) echo "ERROR: --agent must be claude, agy, hermes or grok, got: $AGENT" >&2; exit 2 ;;
 esac
 [ -n "$ROLE" ]     || { echo "ERROR: --role required" >&2; usage; exit 2; }
 [ -d "$WORKSPACE" ] || { echo "ERROR: workspace $WORKSPACE not a directory" >&2; exit 1; }
@@ -119,11 +119,6 @@ elif [ "$AGENT" = "hermes" ]; then
    echo "ERROR: hermes is not functional. Run 'hermes setup' first." >&2
    exit 1
  fi
 elif [ "$AGENT" = "cline" ]; then
  if ! cline history --json >/dev/null 2>&1; then
    echo "ERROR: cline is not functional or configured." >&2
    exit 1
  fi
 elif [ "$AGENT" = "grok" ]; then
  if [ -f "$HOME/.grok/auth.json" ] || [ -n "$XAI_API_KEY" ]; then
    true
@@ -185,8 +180,7 @@ if [ -z "$CMD_FULL" ]; then
  case "$AGENT" in
    claude) CMD_FULL="${RESOLVED_BIN} --dangerously-skip-permissions --session-id ${SESSION_UUID}" ;;
    agy)    CMD_FULL="${RESOLVED_BIN} --dangerously-skip-permissions" ;;
-    hermes) CMD_FULL="${RESOLVED_BIN}" ;;
+    hermes) CMD_FULL="${RESOLVED_BIN} --yolo --accept-hooks" ;;
    cline)  CMD_FULL="${RESOLVED_BIN} -i" ;;
  esac
 fi
@@ -207,10 +201,10 @@ spawn() {
        HERDR_SESSION_NAME="$HERDR_SESSION_NAME" _herdr new-session -d -s "$SESSION_NAME" -x 140 -y 40 -c "$WORKSPACE" "$CMD_FULL"
      fi
      ;;
-    agy|hermes|cline|grok)
+    agy|hermes|grok)
      HERDR_SESSION_NAME="$HERDR_SESSION_NAME" _herdr new-session -d -s "$SESSION_NAME" -x 140 -y 40 -c "$WORKSPACE" "$CMD_FULL"
      ;;
-    *) echo "ERROR: --agent must be claude, agy, hermes, cline or grok, got: $AGENT" >&2; exit 2 ;;
+    *) echo "ERROR: --agent must be claude, agy, hermes or grok, got: $AGENT" >&2; exit 2 ;;
  esac
 }
@@ -219,13 +213,16 @@ if [ "$DRY_RUN" = "1" ]; then
  exit 0
 fi
 HERDR_EPOCH=$(date +%s)
 NOW_ISO=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
 spawn
 # Trap for rolling back/cleaning up herdr session if script exits due to error
 cleanup_herdr_on_error() {
  local exit_code=$?
  if [ $exit_code -ne 0 ]; then
-    echo "⚠️ Error occurred during initialization. Rolling back and killing herdr session '$SESSION_NAME'..." >&2
+    echo "⚠️ Error occurred during initialization (exit code $exit_code). Rolling back and killing herdr session '$SESSION_NAME'..." >&2
    _herdr kill-session -t "$SESSION_NAME" 2>/dev/null || true
  fi
 }
@@ -237,11 +234,49 @@ if [ -z "$HERDR_SERVER_OPT" ]; then
 fi
 # TUI 준비 대기
-if ! wait_for_tui_ready "$SESSION_NAME" "$AGENT"; then
+TUI_READY_RC=0
-  echo "ERROR: agent TUI never became ready — aborting (rollback via trap)" >&2
+wait_for_tui_ready "$SESSION_NAME" "$AGENT" || TUI_READY_RC=$?
-  exit 1
+LAST_VISIBLE_STATUS_OVERRIDE=""
 if [ "$TUI_READY_RC" -ne 0 ]; then
  # 1. Diagnostic dump
  DIAG_DIR="${WORKSPACE:-$PWD}/.mam/diagnostics"
  mkdir -p "$DIAG_DIR" 2>/dev/null || true
  DIAG_FILE="$DIAG_DIR/${SESSION_NAME}-$(date +%s).txt"
  {
    echo "=== MAM Diagnostic Dump ==="
    echo "Date: $(date -u +'%Y-%m-%dT%H:%M:%SZ')"
    echo "MAM Version: ${MAM_VERSION:-unknown}"
    echo "Session: $SESSION_NAME"
    echo "Agent: $AGENT"
    echo "ReturnCode: $TUI_READY_RC"
    echo "--- Pane Raw Capture ---"
    _pane_capture "$SESSION_NAME" 2>/dev/null || true
  } > "$DIAG_FILE" 2>/dev/null || true
  if [ ! -f "$DIAG_FILE" ]; then
    echo "WARNING: Failed to write diagnostic dump to $DIAG_FILE" >&2
  fi
  # 2. Check pane PID liveness
  PANE_PID_CHECK=$(_herdr list-panes -t "$SESSION_NAME" -F '#{pane_pid}' 2>/dev/null || echo "")
  ALIVE=false
  if [ -n "$PANE_PID_CHECK" ] && [[ "$PANE_PID_CHECK" =~ ^[0-9]+$ ]]; then
    if kill -0 "$PANE_PID_CHECK" 2>/dev/null; then
      ALIVE=true
    fi
  fi
  if [ "$ALIVE" = true ] && [ "${MAM_KILL_ON_READY_TIMEOUT:-0}" != "1" ]; then
    echo "WARNING: agent TUI never became ready within timeout, but process (PID $PANE_PID_CHECK) is alive. Preserving session for diagnosis." >&2
    LAST_VISIBLE_STATUS_OVERRIDE="tui-ready-timeout"
    SUBMIT_JOB_PROMPT="" # disable instruction injection on unready session
  else
    echo "ERROR: agent TUI never became ready — aborting (rollback via trap)" >&2
    exit 42
  fi
 fi
-if [ "$AGENT" = "claude" ]; then
+
 if [ "$AGENT" = "claude" ] && [ -z "$LAST_VISIBLE_STATUS_OVERRIDE" ]; then
  handle_startup_dialogs "$SESSION_NAME" 15
 fi
@@ -249,16 +284,14 @@ fi
 PANE_PID=$(_herdr list-panes -t "$SESSION_NAME" -F '#{pane_pid}' 2>/dev/null || echo "")
 PANE_CWD=$(_herdr list-panes -t "$SESSION_NAME" -F '#{pane_current_path}' 2>/dev/null || echo "$WORKSPACE")
 PANE_CMD=$(_herdr list-panes -t "$SESSION_NAME" -F '#{pane_current_command}' 2>/dev/null || echo "$AGENT")
 HERDR_EPOCH=$(date +%s)
 NOW_ISO=$(date -u +'%Y-%m-%dT%H:%M:%SZ')
 # 시작 명령
 # NOTE: this must match what `spawn()` actually ran above — env-var-driven
 # herdr server shim (HERDR_SESSION_NAME picked up by the lib.sh shim).
 START_CMD="HERDR_SESSION_NAME=${HERDR_SESSION_NAME:-default} herdr new-session -d -s \"$SESSION_NAME\" -x 140 -y 40 -c \"$WORKSPACE\" \"$CMD_FULL\""
-# If --onboard is specified, automatically build the onboarding prompt
+# If --onboard is specified, automatically build the onboarding prompt (if session is ready)
-if [ "$ONBOARD" = "1" ] && [ -z "$SUBMIT_JOB_PROMPT" ]; then
+if [ "$ONBOARD" = "1" ] && [ -z "$SUBMIT_JOB_PROMPT" ] && [ -z "$LAST_VISIBLE_STATUS_OVERRIDE" ]; then
  SUBMIT_JOB_PROMPT="You are a newly spawned $ROLE Team Leader agent in this workspace. Without making any non-standard pre-preparations or modifying files directly, proceed immediately to align yourself with the project context by performing the following tasks:
 1. Read the project documentation at README.md and the multi-agent protocol guidelines at .agents/MULTI_AGENT_RULES.md to understand the design rules.
 2. Run 'git status' and 'git diff' to analyze the current modifications and active work in the repository.
@@ -268,13 +301,15 @@ fi
 # agent-sessions.yaml 에 append
 DELEGATE_JOB_ID=""
 if [ -n "$LAST_VISIBLE_STATUS_OVERRIDE" ]; then
  SUBMIT_JOB_PROMPT=""
 fi
 if [ -n "$SUBMIT_JOB_PROMPT" ]; then
  delegate_agent="${MAM_DELEGATE_AGENT_KEY:-}"
  if [ -z "$delegate_agent" ]; then
    case "$AGENT" in
      claude) delegate_agent="claude-code" ;;
      hermes) delegate_agent="hermes-agent" ;;
      cline)  delegate_agent="cline-agent" ;;
      agy)    delegate_agent="antigravity-cli" ;;
      grok)   delegate_agent="grok-build" ;;
      *) echo "ERROR: cannot resolve delegate agent key for '$AGENT'" >&2; exit 2 ;;
@@ -294,7 +329,7 @@ fi
 # 모든 값은 환경변수로 전달 — heredoc interpolation 없음 (P1-B).
 # 자식 pid 는 bash 에서 pgrep 으로 미리 구함 (P2: 도구명 필터).
 CHILD_PID=0
-if { [ "$AGENT" = "agy" ] || [ "$AGENT" = "hermes" ] || [ "$AGENT" = "cline" ]; } && [ -n "$PANE_PID" ]; then
+if { [ "$AGENT" = "agy" ] || [ "$AGENT" = "hermes" ]; } && [ -n "$PANE_PID" ]; then
  CHILD_PID=$(pgrep -P "$PANE_PID" -x "$AGENT" 2>/dev/null | head -1 || true)
  CHILD_PID="${CHILD_PID:-0}"
 fi
@@ -306,6 +341,7 @@ atomic_dump_yaml "$AGENT_SESSIONS_YAML" \
  HERDR_SESSION_NAME="${HERDR_SESSION_NAME:-default}" \
  MAM_WS_LABEL="$MAM_WS_LABEL" \
  SESSION_UUID="$SESSION_UUID" \
  LAST_VISIBLE_STATUS_OVERRIDE="${LAST_VISIBLE_STATUS_OVERRIDE:-}" \
  DELEGATE_JOB_ID="$DELEGATE_JOB_ID" ROLE="$ROLE" <<'PYEOF'
 name = os.environ['SESSION_NAME']
 agent = os.environ['AGENT']
@@ -377,11 +413,6 @@ elif agent == 'hermes':
    entry['child_pid'] = int(cp) if cp.isdigit() else 0
    entry['hermes_conversation_id_own'] = None
    entry['last_visible_status'] = "unverified"
 elif agent == 'cline':
    cp = os.environ.get('CHILD_PID', '0')
    entry['child_pid'] = int(cp) if cp.isdigit() else 0
    entry['cline_conversation_id_own'] = None
    entry['last_visible_status'] = "unverified"
 elif agent == 'grok':
    assigned = os.environ.get('SESSION_UUID', '') or None
    entry['grok_session_id_own'] = assigned
@@ -389,6 +420,10 @@ elif agent == 'grok':
    entry['session_id_verified'] = False
    entry['last_visible_status'] = "assigned (awaiting first message)" if assigned else "unverified"
 last_vis_override = os.environ.get('LAST_VISIBLE_STATUS_OVERRIDE', '')
 if last_vis_override:
    entry['last_visible_status'] = last_vis_override
 sessions.append(entry)
 snap = d.setdefault('snapshot', {})
@@ -1,6 +1,6 @@
 # multi-agent-mux-delegate-job 스킬
-작업(Job)을 자율 에이전트(claude-code/hermes/agy/cline/codex/opencode/human)에게 위임하고 MQTT
+작업(Job)을 자율 에이전트(claude-code/hermes/agy/grok-build/codex/opencode/human)에게 위임하고 MQTT
 이벤트 채널로 비동기 관찰하는 범용 에이전트 협업 스킬. **시작점은 [`SKILL.md`](./SKILL.md).**
 - 프로토콜/스키마: [`job-protocol.md`](./job-protocol.md)
@@ -1,7 +1,7 @@
 ---
 name: multi-agent-mux-delegate-job
-description: "Delegate a unit of work to any autonomous agent (claude-code, hermes, agy, cline, grok-build, codex, or a human) and observe it asynchronously over an MQTT event channel. Supported roles include orchestrator, worker, and reviewer."
+description: "Delegate a unit of work to any autonomous agent (claude-code, hermes, agy, grok-build, codex, or a human) and observe it asynchronously over an MQTT event channel. Supported roles include orchestrator, worker, and reviewer."
-version: 3.0.0
+version: 4.0.0
 author: godopu
 license: MIT
 platforms: [linux, macos, windows]
@@ -17,7 +17,7 @@ metadata:
 Delegate a unit of work to any autonomous agent, then **observe** it asynchronously instead of blocking. Every job gets a unique ID and a registry record. The worker agent publishes lifecycle events (`started`, `permission_required`, `progress`, `completed`, `error`) to a per-job MQTT topic, and the delegator/orchestrator subscribes to verify the final state.
-This skill allows any agent (`claude-code`, `hermes`, `agy`, `cline`, `grok-build`, etc.) to play any role: **Orchestrator/Delegator**, **Worker/Implementer**, or **Reviewer**.
+This skill allows any agent (`claude-code`, `hermes`, `agy`, `grok-build`, etc.) to play any role: **Orchestrator/Delegator**, **Worker/Implementer**, or **Reviewer**.
 ---
@@ -36,7 +36,7 @@ The `multi-agent-mux-delegate-job` bash wrapper handles job registration, subscr
 ```bash
 # 1) Submit a new job to a targeted agent session (e.g. herdr session name 'demo')
 multi-agent-mux-delegate-job submit \
-  --agent <claude-code|hermes-agent|agy-agent|cline-agent|grok-build|human> \
+  --agent <claude-code|hermes-agent|agy-agent|grok-build|human> \
  --agent-session herdr:<session_name> \
  --prompt "Task description or instructions here" \
  --role <Worker|Planner|Reviewer> \
@@ -1,7 +1,7 @@
 ---
 name: multi-agent-mux-loop
 description: "Run an autonomous planning-execution-review loop using multiple agents (Planner, Creator, Reviewers) in the workspace. Automatically orchestrates plan discussion, code changes, and peer reviews until a unanimous PASS is achieved or the maximum iteration limit is reached."
-version: 3.0.0
+version: 4.0.0
 author: godopu
 license: MIT
 platforms: [linux, macos]
@@ -289,7 +289,7 @@ print(','.join(reviewers))
 "
 }
-# Resolve target agent type (claude, cline, agy) via load_state_json.
+# Resolve target agent type (claude, hermes, agy) via load_state_json.
 resolve_agent_type() {
  local name="$1"
  NAME="$name" MAM_STATE_JSON="$(load_state_json)" python3 -c "
@@ -307,8 +307,6 @@ if not agent:
    segments = name.split('-')
    if 'agy' in segments:
        agent = 'agy'
    elif 'cline' in segments:
        agent = 'cline'
    elif 'hermes' in segments:
        agent = 'hermes'
    else:
@@ -1,7 +1,7 @@
 ---
 name: multi-agent-mux-monitor
 description: "Run a long-lived reconciler that watches .mam/agent-sessions.yaml against the actual herdr/agent runtime state and reconciles them. Use when you want live visibility into which agent sessions are running, which are dead, which have stale YAML entries, and which have new session ids that haven't been recorded yet. Runs as a persistent loop (`reconcile.sh --subscribe`) that keeps going until it times out, idles out, or is interrupted."
-version: 3.0.0
+version: 4.0.0
 author: godopu
 license: MIT
 platforms: [linux, macos]
@@ -467,7 +467,7 @@ def _pin_and_verify_resume(s, agent, cwd, uuid, degraded=False):
    else:
        s['last_visible_status'] = f"resume dry-run failed: {res.stderr.strip() or res.stdout.strip()}"
-    id_name = 'session' if agent in ('claude', 'cline') else 'conversation'
+    id_name = 'session' if agent == 'claude' else 'conversation'
    if not degraded:
        drifts.append({'class': 'C', 'name': s['name'], 'msg': f"{s['name']}: {id_name} id materialized: {uuid}"})
    else:
@@ -518,7 +518,7 @@ if herdr_confirmed:
        agent = None
        role = 'creator'
        for r_name in ('creator', 'planner', 'reviewer'):
-            for a_name in ('claude', 'agy', 'hermes', 'cline', 'grok'):
+            for a_name in ('claude', 'agy', 'hermes', 'grok'):
                if name.endswith(f"-{r_name}-{a_name}"):
                    role = r_name
                    agent = a_name
@@ -537,7 +537,7 @@ if herdr_confirmed:
                        if tok.startswith('MAM_MANAGED='):
                            managed_path = tok.split('=', 1)[1]
                            if os.path.realpath(managed_path) == os.path.realpath(workspace_root):
-                                for a_name in ('claude', 'agy', 'hermes', 'cline', 'grok'):
+                                for a_name in ('claude', 'agy', 'hermes', 'grok'):
                                    if a_name in pm_check.get('cmd', '') or a_name in pm_check.get('cmd_full', ''):
                                        agent = a_name
                                        break
@@ -598,9 +598,6 @@ if herdr_confirmed:
        elif agent == 'hermes':
            entry['child_pid'] = 0
            entry['hermes_conversation_id_own'] = None
        elif agent == 'cline':
            entry['child_pid'] = 0
            entry['cline_conversation_id_own'] = None
        d.setdefault('herdr_sessions', []).append(entry)
        yaml_session_names.add(name)
        drifts.append({'class': 'B', 'name': name,
@@ -611,7 +608,7 @@ def row_agent(s):
    return agent_of_row(s)
 OWN_KEY_BY_AGENT = {
-    a: _get_own_key(a) for a in ('claude', 'agy', 'hermes', 'cline', 'grok')
+    a: _get_own_key(a) for a in ('claude', 'agy', 'hermes', 'grok')
 }
 # === drift C0: 지정된 ID 는 발견이 아니라 '확인'만 필요하다 ===
@@ -737,14 +734,31 @@ for s in d.get('herdr_sessions', []):
    if not os.path.exists(hdb):
        continue
    epoch_threshold = s.get('herdr_session_epoch', 0)
    sibling_claimed = [
        other.get('hermes_conversation_id_own')
        for other in d.get('herdr_sessions', [])
        if other is not s
        and (other.get('pane') or {}).get('cwd') == cwd
        and other.get('status') not in ('stopped', 'terminated')
        and other.get('hermes_conversation_id_own')
    ]
    s_eval = dict(s)
    s_eval['_sibling_claimed_uuids'] = sibling_claimed
    valid_candidates = []
    try:
        conn = sqlite3.connect(hdb)
-        r = conn.execute("SELECT id FROM sessions WHERE cwd=? ORDER BY started_at DESC LIMIT 1", (cwd,)).fetchone()
+        rows = conn.execute(
            "SELECT id FROM sessions WHERE cwd=? AND started_at >= ? ORDER BY started_at DESC LIMIT 20",
            (cwd, epoch_threshold)
        ).fetchall()
        conn.close()
-        if r:
+        for (uuid,) in rows:
-            uuid = r[0]
+            if uuid in (sibling_claimed or []):
-            if verify_session_uuid(cwd, 'hermes', uuid, s, mode="discover"):
+                continue
            if verify_session_uuid(cwd, 'hermes', uuid, s_eval, mode="discover"):
                valid_candidates.append(uuid)
    except Exception:
        pass
@@ -765,51 +779,6 @@ for s in d.get('herdr_sessions', []):
        else:
            _pin_and_verify_resume(s, 'hermes', cwd, uuid, degraded=True)
 # === drift C (cline): cline 새 session id materialize (per-row own id) ===
 for s in d.get('herdr_sessions', []):
    if row_agent(s) != 'cline':
        continue
    if s.get('status') != 'running':
        continue
    if s.get('cline_conversation_id_own'):
        continue
    cwd = (s.get('pane') or {}).get('cwd', '')
    if not cwd:
        continue
    sessions_dir = f"{home}/.cline/data/sessions"
    if not os.path.isdir(sessions_dir):
        continue
    candidates = []
    for session_folder in glob.glob(f"{sessions_dir}/*"):
        if os.path.isdir(session_folder):
            folder_name = os.path.basename(session_folder)
            json_file = f"{session_folder}/{folder_name}.json"
            if os.path.exists(json_file):
                candidates.append(json_file)
    candidates.sort(key=os.path.getmtime, reverse=True)
    valid_candidates = []
    for j in candidates:
        uuid = os.path.basename(j)[:-5]
        if verify_session_uuid(cwd, 'cline', uuid, s, mode="discover"):
            valid_candidates.append(uuid)
    if len(valid_candidates) > 1:
        drifts.append({'class': 'C-ambiguous', 'name': s['name'],
                       'msg': f"{s['name']}: {len(valid_candidates)} candidate transcripts newer than session epoch; not pinning"})
        s['last_visible_status'] = f"ambiguous: {len(valid_candidates)} candidates"
        actions.append(f"ambiguous candidates: {s['name']}")
    if len(valid_candidates) == 1:
        uuid = valid_candidates[0]
        cmd = ['bash', '-c', f'source "{lib_sh}" && verify_tui_viewport "{s["name"]}" "cline" "{cwd}"']
        rc = subprocess.run(cmd).returncode
        if rc == 0:
            _pin_and_verify_resume(s, 'cline', cwd, uuid, degraded=False)
        elif rc == 1:
            drifts.append({'class': 'C-warn', 'name': s['name'], 'msg': f"{s['name']}: TUI viewport mismatch for candidate {uuid} — not pinned, will retry next cycle"})
        else:
            _pin_and_verify_resume(s, 'cline', cwd, uuid, degraded=True)
 result = {
    'timestamp': now_iso,
    'yaml_path': yaml_path,
@@ -1,14 +1,14 @@
 ---
 name: multi-agent-mux-orc-onboard
-description: Register current or specified orchestrator session UUID into agent-sessions.yaml orchestrator_uuids list to prevent sub-agent discovery capture.
+description: "Register current or specified orchestrator session UUID into agent-sessions.yaml orchestrator_uuids list to prevent sub-agent discovery capture."
-version: 3.0.0
+version: 4.0.0
 author: godopu
 license: MIT
 platforms: [linux, macos]
 environments: [terminal, herdr]
 metadata:
  hermes:
-    tags: [agent, herdr, claude, antigravity, agy, cline, hermes, grok, orchestrator, onboard, isolation]
+    tags: [agent, herdr, claude, antigravity, agy, hermes, grok, orchestrator, onboard, isolation]
    related_skills: [multi-agent-mux-create, multi-agent-mux-resume, multi-agent-mux-monitor]
    prereq_skills: [multi-agent-mux-create]
 ---
@@ -24,7 +24,7 @@ Registers an orchestrator session UUID into the `orchestrator_uuids` list of `.m
 ```
 ### Options
- `--uuid <uuid>`: Explicitly register the specified orchestrator session UUID (UUID format or cline ID format).
+- `--uuid <uuid>`: Explicitly register the specified orchestrator session UUID.
 - `--remove <uuid>`: Remove the specified UUID from the `orchestrator_uuids` list.
 - `--list`: Display all currently registered orchestrator UUIDs.
 - `--no-autodetect`: Disable process ancestry auto-detection when `--uuid` is not provided.
@@ -32,18 +32,16 @@ Registers an orchestrator session UUID into the `orchestrator_uuids` list of `.m
 ## Auto-Detection Hierarchy (Rev.2)
-When `--uuid` is omitted, `orc_onboard.sh` inspects the process ancestry tree of the nearest agent ancestor (`claude`, `agy`, `hermes`, `cline`, `grok`) in the following order:
+When `--uuid` is omitted, `orc_onboard.sh` inspects the process ancestry tree of the nearest agent ancestor (`claude`, `agy`, `hermes`, `grok`) in the following order:
 1. **CLI `argv`**:
   - `claude -r <uuid>` / `claude --session-id <uuid>`
   - `agy --conversation <uuid>`
   - `cline --id <uuid>` / `cline --session-id <uuid>`
   - `grok --session-id <uuid>` / `grok --resume <uuid>`
 2. **Family-Matched Environment Variables**:
   - `claude` → `CLAUDE_CODE_SESSION_ID`
   - `agy` → `ANTIGRAVITY_CONVERSATION_ID`
   - `hermes` → `HERMES_SESSION_ID`
   - `cline` → `CLINE_SESSION_ID`
   - `grok` → `GROK_SESSION_ID`
 3. **Fallback**:
   - If no valid ID matching the nearest agent family is found, exits with status 3 (`Could not detect orchestrator ID`).
@@ -66,8 +66,7 @@ done
 is_valid_id() {
  local val="$1"
  local uuid_re='^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$'
-  local cline_re='^[0-9]{10,}_[0-9A-Za-z]+$'
+  if [[ "$val" =~ $uuid_re ]]; then
  if [[ "$val" =~ $uuid_re ]] || [[ "$val" =~ $cline_re ]]; then
    return 0
  fi
  return 1
@@ -104,7 +103,7 @@ detect_nearest_agent() {
      local base
      base="$(basename "$tok")"
      case "$base" in
-        claude|agy|hermes|cline|grok)
+        claude|agy|hermes|grok)
          match="$base"
          break
          ;;
@@ -125,9 +124,6 @@ detect_nearest_agent() {
        hermes)
          detected_id=$(echo "$cmd_line" | grep -oE '(--resume|--session)[[:space:]=]+[^[:space:]]+' | head -n 1 | sed -E 's/^(--resume|--session)[[:space:]=]+//' || true)
          ;;
        cline)
          detected_id=$(echo "$cmd_line" | grep -oE '(--id|--session-id)[[:space:]=]+[^[:space:]]+' | head -n 1 | sed -E 's/^(--id|--session-id)[[:space:]=]+//' || true)
          ;;
        grok)
          detected_id=$(echo "$cmd_line" | grep -oE '(--session-id|--resume)[[:space:]=]+[^[:space:]]+' | head -n 1 | sed -E 's/^(--session-id|--resume)[[:space:]=]+//' || true)
          ;;
@@ -144,7 +140,6 @@ detect_nearest_agent() {
        claude) env_var="${CLAUDE_CODE_SESSION_ID:-}" ;;
        agy) env_var="${ANTIGRAVITY_CONVERSATION_ID:-}" ;;
        hermes) env_var="${HERMES_SESSION_ID:-}" ;;
        cline) env_var="${CLINE_SESSION_ID:-}" ;;
        grok) env_var="${GROK_SESSION_ID:-}" ;;
      esac
@@ -206,7 +201,7 @@ except Exception:
 target = sys.argv[1]
 for s in d.get("herdr_sessions", []):
    if s.get("status") == "running":
-        for k in ["claude_session_id_own", "agy_conversation_id_own", "hermes_conversation_id_own", "cline_conversation_id_own", "grok_session_id_own"]:
+        for k in ["claude_session_id_own", "agy_conversation_id_own", "hermes_conversation_id_own", "grok_session_id_own"]:
            if s.get(k) == target:
                sys.exit(1)
 sys.exit(0)
@@ -1,7 +1,7 @@
 ---
 name: multi-agent-mux-resume
 description: "Resume an existing agent (claude, antigravity/agy) conversation by UUID into a herdr session. Reads .mam/agent-sessions.yaml for the saved session/conversation id, spawns (or reuses) a herdr session of the matching name, and runs `claude -r <id>` or `agy --conversation <id>` inside. Use when you want to reattach to a previous session's context, or revive a session whose herdr died but the agent's conversation is still on disk."
-version: 3.0.0
+version: 4.0.0
 author: godopu
 license: MIT
 platforms: [linux, macos]
@@ -49,7 +49,7 @@ ideal resume path:
 `agent-sessions.yaml` and on-disk discovery are used to resolve the UUID in this order:
-1. **`herdr_sessions[]` row's per-row own id** (`claude_session_id_own` / `agy_conversation_id_own` / `hermes_conversation_id_own` / `cline_conversation_id_own` / `grok_session_id_own`) — explicitly saved by `multi-agent-mux-stop` right before teardown (tier-1, race-free).
+1. **`herdr_sessions[]` row's per-row own id** (`claude_session_id_own` / `agy_conversation_id_own` / `hermes_conversation_id_own` / `grok_session_id_own`) — explicitly saved by `multi-agent-mux-stop` right before teardown (tier-1, race-free).
 2. **Workspace-scoped on-disk scan** (adapter `discover()`)
 If both are empty → the workspace has no conversation yet. Fall back to `multi-agent-mux-create`.
@@ -58,7 +58,7 @@ If both are empty → the workspace has no conversation yet. Fall back to `multi
 ```bash
 WORKSPACE=/path/to/project
-AGENT=claude  # claude | agy | hermes | cline | grok — pass it explicitly
+AGENT=claude  # claude | agy | hermes | grok — pass it explicitly
 SESSION_NAME=<workspace>-creator-<agent>  # same convention as multi-agent-mux-create
 # Resolve the isolated herdr server name & load common utils
@@ -87,8 +87,7 @@ fi
 case "$AGENT" in
  claude) CMD_FULL="claude --dangerously-skip-permissions $CLAUDE_ID_FLAG $UUID" ;;
  agy)    CMD_FULL="agy --dangerously-skip-permissions --conversation $UUID" ;;
-  hermes) CMD_FULL="hermes --resume $UUID" ;;
+  hermes) CMD_FULL="hermes --resume $UUID --no-restore-cwd --yolo --accept-hooks" ;;
  cline)  CMD_FULL="cline -i --id $UUID" ;;
  grok)   CMD_FULL="grok --resume $UUID --permission-mode bypassPermissions" ;;
 esac
@@ -100,7 +99,7 @@ case "$AGENT" in
    # auto-handle trust / bypass dialogs
    handle_startup_dialogs "$SESSION_NAME" 20
    ;;
-  agy|hermes|cline|grok)
+  agy|hermes|grok)
    eval "herdr new-session -d -s \"$SESSION_NAME\" -x 140 -y 40 -c \"$WORKSPACE\" \"$CMD_FULL\""
    ;;
 esac
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # resolve_session_id.sh — multi-agent-mux-resume 의 부속 스크립트
 # Usage:
-#   bash resolve_session_id.sh --workspace <path> --agent <claude|agy|hermes|cline>
+#   bash resolve_session_id.sh --workspace <path> --agent <claude|agy|hermes|grok>
 # 출력: stdout 으로 UUID 한 줄 (없으면 빈 줄 + exit 0)
 #
 # P0-C: 전역 agent_identities 를 즉시 반환하지 않는다. lib.sh::find_workspace_uuid
@@ -13,7 +13,7 @@ source "$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)/lib.sh"
 usage() {
  cat <<EOF
-Usage: $0 --workspace <path> --agent <claude|agy|hermes|cline> [--session <name>]
+Usage: $0 --workspace <path> --agent <claude|agy|hermes|grok> [--session <name>]
 Outputs the resolved UUID on stdout (empty if not found).
 --session prefers that registry row's recorded id; falls back to workspace-wide discovery if it does not verify.
 EOF
@@ -36,8 +36,8 @@ done
 [ -n "$WORKSPACE" ] || { echo "ERROR: --workspace required" >&2; exit 2; }
 [ -n "$AGENT" ]    || { echo "ERROR: --agent required" >&2; exit 2; }
 case "$AGENT" in
-  claude|agy|hermes|cline|grok) ;;
+  claude|agy|hermes|grok) ;;
-  *) echo "ERROR: --agent must be claude, agy, hermes, cline, or grok" >&2; exit 2 ;;
+  *) echo "ERROR: --agent must be claude, agy, hermes, or grok" >&2; exit 2 ;;
 esac
 find_workspace_uuid "$WORKSPACE" "$AGENT" "$SESSION_NAME"
@@ -9,7 +9,7 @@ source "$LIB_SH"
 usage() {
  cat <<EOF
-Usage: $0 --workspace <path> --agent <claude|agy|hermes|cline> --session <name> [options]
+Usage: $0 --workspace <path> --agent <claude|agy|hermes|grok> --session <name> [options]
 Options:
  --herdr-session NAME specify isolated herdr session name (alias: --herdr-server)
@@ -42,7 +42,7 @@ done
 [ -n "$WORKSPACE" ] || { echo "ERROR: --workspace required" >&2; exit 2; }
 [ -n "$AGENT" ]    || { echo "ERROR: --agent required" >&2; exit 2; }
 case "$AGENT" in
-  claude|agy|hermes|cline|grok) ;;
+  claude|agy|hermes|grok) ;;
  *) echo "ERROR: unsupported agent: $AGENT" >&2; exit 2 ;;
 esac
 [ -n "$SESSION_NAME" ] || { echo "ERROR: --session required" >&2; exit 2; }
@@ -86,14 +86,8 @@ fi
 # Resolve absolute path of the agent command to prevent herdr PATH inheritance issues (especially on macOS)
 RESOLVED_BIN="$AGENT"
-if [ "$AGENT" = "cline" ]; then
+if command -v "$AGENT" >/dev/null 2>&1; then
-  if command -v cline >/dev/null 2>&1; then
+  RESOLVED_BIN="$(command -v "$AGENT")"
    RESOLVED_BIN="$(command -v cline)"
  fi
 else
  if command -v "$AGENT" >/dev/null 2>&1; then
    RESOLVED_BIN="$(command -v "$AGENT")"
  fi
 fi
 # On macOS, clear quarantine attribute for the agent binary to prevent Gatekeeper hangs
@@ -107,8 +101,7 @@ if [ -z "$CMD_FULL" ]; then
  case "$AGENT" in
    claude) CMD_FULL="${RESOLVED_BIN} --dangerously-skip-permissions -r $UUID" ;;
    agy)    CMD_FULL="${RESOLVED_BIN} --dangerously-skip-permissions --conversation $UUID" ;;
-    hermes) CMD_FULL="${RESOLVED_BIN} --resume $UUID" ;;
+    hermes) CMD_FULL="${RESOLVED_BIN} --resume $UUID --no-restore-cwd --yolo --accept-hooks" ;;
    cline)  CMD_FULL="${RESOLVED_BIN} -i --id $UUID" ;;
    grok)   CMD_FULL="${RESOLVED_BIN} --resume $UUID --permission-mode bypassPermissions" ;;
    *)      echo "ERROR: unsupported agent: $AGENT" >&2; exit 2 ;;
  esac
@@ -4,14 +4,14 @@
 # resume UUID 를 per-row own id (claude_session_id_own / agy_conversation_id_own)
 # 에 박는다 — agent_identities 전역은 더 이상 primary 아님 (cache 로 강등, P0-C/단계 e).
 #
-# Usage: bash update_yaml_resumed.sh --session <name> --uuid <id> [--agent claude|agy|hermes|cline]
+# Usage: bash update_yaml_resumed.sh --session <name> --uuid <id> [--agent claude|agy|hermes|grok]
 set -euo pipefail
 source "$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)/lib.sh"
 usage() {
  cat <<EOF
-Usage: $0 --session <name> --uuid <id> [--agent claude|agy|hermes|cline] [--herdr-session <name>]
+Usage: $0 --session <name> --uuid <id> [--agent claude|agy|hermes|grok] [--herdr-session <name>]
 EOF
 }
@@ -85,7 +85,7 @@ NOW_EPOCH=$(date +%s)
 PANE_PID=$(_herdr list-panes -t "$SESSION_NAME" -F '#{pane_pid}' 2>/dev/null | head -1 || true)
 PANE_PID="${PANE_PID:-}"
 CHILD_PID=0
-if { [ "$AGENT" = "agy" ] || [ "$AGENT" = "hermes" ] || [ "$AGENT" = "cline" ]; } && [ -n "$PANE_PID" ]; then
+if { [ "$AGENT" = "agy" ] || [ "$AGENT" = "hermes" ]; } && [ -n "$PANE_PID" ]; then
  CHILD_PID=$(pgrep -P "$PANE_PID" -x "$AGENT" 2>/dev/null | head -1 || true)
  CHILD_PID="${CHILD_PID:-0}"
 fi
@@ -190,13 +190,6 @@ elif agent == 'hermes':
    cp = os.environ.get('CHILD_PID', '0')
    if cp.isdigit() and int(cp) > 0:
        target['child_pid'] = int(cp)
 elif agent == 'cline':
    target['pane']['cmd'] = 'cline'
    target['pane']['cmd_full'] = f'cline -i --id {uuid}'
    target['cline_conversation_id_own'] = uuid
    cp = os.environ.get('CHILD_PID', '0')
    if cp.isdigit() and int(cp) > 0:
        target['child_pid'] = int(cp)
 snap = d.setdefault('snapshot', {})
 snap['taken_at'] = now
@@ -1,7 +1,7 @@
 ---
 name: multi-agent-mux-status
 description: "Read-only instant snapshot of all agent herdr sessions — name, YAML status, herdr alive, pane cmd/cwd, resume UUID on disk, and any drift. No mutation. Reuses reconcile.sh --dry-run for the diff logic. Use when you want to know 'what's running RIGHT NOW' without spinning up the monitor loop."
-version: 3.0.0
+version: 4.0.0
 author: godopu
 license: MIT
 platforms: [linux, macos]
@@ -53,12 +53,12 @@ def resume_on_disk(s):
    name = s.get('name', '')
    cwd = (s.get('pane') or {}).get('cwd', '')
    agent = None
-    for a in ('claude', 'agy', 'hermes', 'cline', 'grok'):
+    for a in ('claude', 'agy', 'hermes', 'grok'):
        if any(name.endswith(f'-{r}-{a}') for r in ('creator', 'planner', 'reviewer')) or name.endswith(f'-{a}'):
            agent = a
            break
    if not agent:
-        for a in ('claude', 'agy', 'hermes', 'cline', 'grok'):
+        for a in ('claude', 'agy', 'hermes', 'grok'):
            if f"-{a}" in name or f"_{a}" in name:
                agent = a
                break
@@ -90,11 +90,6 @@ def resume_on_disk(s):
            except Exception:
                return 'MISSING'
        return 'no'
    if agent == 'cline':
        u = s.get('cline_conversation_id_own')
        if u:
            return 'yes' if os.path.exists(f"{home}/.cline/data/sessions/{u}/{u}.json") else 'MISSING'
        return 'no'
    if agent == 'grok':
        u = s.get('grok_session_id_own')
        if u:
@@ -1,7 +1,7 @@
 ---
 name: multi-agent-mux-stop
 description: "Stop an agent herdr session (claude, antigravity/agy) and update .mam/agent-sessions.yaml. Default stops gracefully and marks status=stopped with conversation preserved for resume. Does NOT delete on-disk conversation artifacts (jsonl/db) — those are preserved unless --purge-conversation is passed. Use when ending a work session, switching to a different one, or cleaning up before a fresh start."
-version: 3.0.0
+version: 4.0.0
 author: godopu
 license: MIT
 platforms: [linux, macos]
@@ -37,7 +37,7 @@ The stop command is always **graceful by default**:
 ```bash
 SESSION_NAME=<workspace>-creator-<agent>  # convention
-AGENT=claude                              # claude | agy | hermes | cline | grok — always pass it
+AGENT=claude                              # claude | agy | hermes | grok — always pass it
 AGENT_SESSIONS_YAML=.mam/agent-sessions.yaml
 # 1) Session is registered?
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # stop_session.sh — multi-agent-mux-stop 의 부속 스크립트
 # Usage:
-#   bash stop_session.sh --session <name> [--agent claude|agy|hermes|cline] [--herdr-session <name>] \
+#   bash stop_session.sh --session <name> [--agent claude|agy|hermes|grok] [--herdr-session <name>] \
 #       [--reason <reason>] [--purge-conversation] [--yes]
 #
 # 동작: 항상 graceful stop 입니다. send-keys 로 정상 종료를 유도하고
@@ -12,7 +12,7 @@
 #
 # 옵션:
 #   --session <name>        — 대상 세션 (필수)
-#   --agent <type>          — claude | agy | hermes | cline
+#   --agent <type>          — claude | agy | hermes | grok
 #                             (권장: 항상 명시. 미지정 시 레지스트리 기록으로
 #                              해석 — agent 필드 → 세션명 접미사 → pane.cmd;
 #                              셋 다 실패하면 exit 2)
@@ -41,12 +41,12 @@ source "$_lib_sh"
 usage() {
  cat <<EOF
-Usage: $0 --session <name> [--agent claude|agy|hermes|cline] [--herdr-session <name>]
+Usage: $0 --session <name> [--agent claude|agy|hermes|grok] [--herdr-session <name>]
          [--reason <reason>] [--purge-conversation] [--yes]
 Arguments:
  --session <name>     — target session name (required)
-  --agent <type>       — claude | agy | hermes | cline (recommended: always pass it)
+  --agent <type>       — claude | agy | hermes | grok (recommended: always pass it)
                         (falls back to the registry record: agent field ->
                          session-name suffix -> pane.cmd)
  --herdr-session <name> — specify isolated herdr session name (alias: --herdr-server)
@@ -58,9 +58,6 @@ Arguments:
  --purge-conversation — also delete on-disk conversation artifacts;
                         status becomes terminated and resume is impossible
  --yes                — skip the --purge-conversation confirmation prompt
 Stop is always graceful and always captures the conversation id.
 (idempotent: stopping an already-stopped session is a no-op with exit 0)
 EOF
 }
@@ -94,8 +91,8 @@ while [ $# -gt 0 ]; do
 done
 if [ -n "$AGENT" ]; then
  case "$AGENT" in
-    claude|agy|hermes|cline|grok) ;;
+    claude|agy|hermes|grok) ;;
-    *) echo "ERROR: invalid agent type '$AGENT'. Allowed types are: claude, agy, hermes, cline, grok." >&2; exit 2 ;;
+    *) echo "ERROR: invalid agent type '$AGENT'. Allowed types are: claude, agy, hermes, grok." >&2; exit 2 ;;
  esac
 fi
 [ -n "$SESSION_NAME" ] || { echo "ERROR: --session required" >&2; usage; exit 2; }
@@ -288,8 +285,6 @@ if captured and not purge:
        target['agy_conversation_id_own'] = captured
    elif agent == 'hermes':
        target['hermes_conversation_id_own'] = captured
    elif agent == 'cline':
        target['cline_conversation_id_own'] = captured
    elif agent == 'grok':
        target['grok_session_id_own'] = captured
    target['resumable'] = True
@@ -48,6 +48,12 @@
 #default: $HOME/.config/herdr/herdr.sock
 # HERDR_SOCKET_PATH=$HOME/.config/herdr/herdr.sock
 # Explicit Herdr workspace scope identifier (`herdr pane list --workspace <id>`).
 # Hard filters pane/agent resolution to this workspace. When unset, falls back
 # to $WORKSPACE_ROOT/.mam/herdr_workspace_id or server-global resolution.
 #default: <unset> (uses persisted .mam/herdr_workspace_id or global)
 # HERDR_WORKSPACE_ID=w1
 # ===========================================================================
 # delegate-job / MQTT broker
 # ===========================================================================
@@ -152,6 +158,19 @@
 #default: 2
 # MAM_MAX_PANE_ROWS=2
 # Kill the session instead of preserving it when TUI readiness times out.
 #default: 0
 # MAM_KILL_ON_READY_TIMEOUT=0
 # Number of trailing non-blank pane lines scanned for blocking modal signatures.
 #default: 8
 # MAM_DIALOG_TAIL_LINES=8
 # Consecutive empty captures before wait_for_tui_ready declares the pane unobservable.
 # NOTE: distinct from SKS_EMPTY_GIVEUP, which governs send_keys_safe quiescence (default 3).
 #default: 5
 # MAM_READY_EMPTY_GIVEUP=5
 # ==============================================================================
 # deploy / distribution source (for forks/mirrors)
 # ==============================================================================
@@ -6,36 +6,162 @@
 ## 📌 현재 버전 개요 (Current Release)
- **프레임워크 버전**: `v3.0.0`
+- **프레임워크 버전**: `v4.0.0`
- **최신 릴리스 일시**: 2026-08-26 (KST)
+- **최신 릴리스 일시**: 2026-08-28 (KST)
 - **기준 브랜치**: `main`
 - **핵심 아키텍처**:
-  - **5th Official Agent Ecosystem (Grok Build)**: Claude, AGY, Hermes, Cline에 이은 5번째 공식 AI 에이전트(`grok`) 어댑터, 세션 생성/재개/종료 및 TUI 수명주기 전면 지원
+  - **Complete Cline Agent Deprecation & Core 4-Agent Whitelist**: `cline` 백엔드 완전 제거(SemVer 2.0.0 §8 MAJOR) 및 `claude`, `agy`, `hermes`, `grok` 4대 에이전트 표준화
-  - **Mux Loop Role-Based CLI Redesign (Breaking Change)**: `--target-agent` 공식 폐지 및 `--creator` / `--planner` 명시적 역할 분리 구조 정립
+  - **Hermes Agent Full Modernization & Ollama Live Integration**: 헤드리스 플래그, TUI 입력 구분자/프롬프트 정립, `reconcile.sh`/`verify_artifact()` 타임스탬프 가드 및 멀티 후보자 발견 동등성 확보
-  - **Deterministic 2xK Grid Layout Engine 2.0**: $N=1\to 2$ `right` 우선 분할, GUI/헤드리스 공통 단일 3단계 결정표, 전고(Full-height) 열 안전 가드로 2×2 대칭 격자 보장
+  - **2-Tier TUI Readiness Model (`S ∨ (W ∧ C)`) & Modal Priority**: 강한 토큰(`S`) 단독 충족 및 약한 토큰(`W`) + 보강 패턴(`C`) 결합 판정식, 모달 선행 검사 및 힌트 분리를 통한 다이얼로그 기아 원천 해소
-  - **Infrastructure & Preflight Hardening**: 사설 NATS 2.14 Alpine 동기화 및 `--workspace` 인자 사전 검증 강화
+  - **Adapter Modal Contract (`T-2d`)**: `BaseAgentAdapter` 내 `modal_tokens` 프로퍼티 및 팩트 브리지(`MAM_MODAL_TOKENS`) 통합
  - **Fail-Closed Exact Pane Resolver & Multi-Workspace Isolation Engine**: `_resolve_herdr_pane_id` 동종 페인 다중 매치 시 fail-closed(`exit 1`) 차단, `HERDR_WORKSPACE_ID` 스코핑 및 `$WORKSPACE_ROOT/.mam/herdr_workspace_id` 영속화
  - **Runtime Framework Version Constant (`MAM_VERSION`) & 3-Way Lockstep**: `lib.sh` 내 `MAM_VERSION="4.0.0"` 런타임 진실 공급원 정의 및 3자 동기화 가드 체계 구축
  - **Comprehensive Test Suite Milestone**: 439개 전체 테스트 100% PASS (439 passed / 0 failed).
 ---
 ## 🧭 스킬 패키지 버전 매트릭스 (Skills Version Matrix)
-모든 8개 스킬은 YAML frontmatter 메타데이터(`author`, `version`, `platforms`, `environments`) 표준화를 통해 `v3.0.0`으로 동기화되어 배포됩니다.
+모든 8개 스킬은 YAML frontmatter 메타데이터(`author`, `version`, `platforms`, `environments`) 표준화를 통해 `v4.0.0`으로 동기화되어 배포됩니다.
 | 스킬명 | 버전 | 역할 및 주요 책임 | 상태 |
 | :--- | :---: | :--- | :---: |
-| **`multi-agent-mux-create`** | `3.0.0` | 에이전트 세션 신규 생성 및 Herdr 컨테이너 격리 스폰 | ✅ 배포 |
+| **`multi-agent-mux-create`** | `4.0.0` | 에이전트 세션 신규 생성 및 Herdr 컨테이너 격리 스폰 | ✅ 배포 |
-| **`multi-agent-mux-stop`** | `3.0.0` | 대화 UUID 원자적 캡처 및 세션 안전 종료 (Graceful Stop) | ✅ 배포 |
+| **`multi-agent-mux-stop`** | `4.0.0` | 대화 UUID 원자적 캡처 및 세션 안전 종료 (Graceful Stop) | ✅ 배포 |
-| **`multi-agent-mux-resume`** | `3.0.0` | 온디스크 대화 컨텍스트 기반 Tier-1 초고속 세션 복원 | ✅ 배포 |
+| **`multi-agent-mux-resume`** | `4.0.0` | 온디스크 대화 컨텍스트 기반 Tier-1 초고속 세션 복원 | ✅ 배포 |
-| **`multi-agent-mux-status`** | `3.0.0` | 실시간 Herdr 세션 및 레지스트리 드리프트 스냅샷 조회 | ✅ 배포 |
+| **`multi-agent-mux-status`** | `4.0.0` | 실시간 Herdr 세션 및 레지스트리 드리프트 스냅샷 조회 | ✅ 배포 |
-| **`multi-agent-mux-monitor`** | `3.0.0` | YAML ↔ 런타임 상태 간 자율 조정자 (Reconciler Loop) | ✅ 배포 |
+| **`multi-agent-mux-monitor`** | `4.0.0` | YAML ↔ 런타임 상태 간 자율 조정자 (Reconciler Loop) | ✅ 배포 |
-| **`multi-agent-mux-delegate-job`** | `3.0.0` | MQTT 이벤트 채널 기반 비동기 단위 작업 위임 | ✅ 배포 |
+| **`multi-agent-mux-delegate-job`** | `4.0.0` | MQTT 이벤트 채널 기반 비동기 단위 작업 위임 | ✅ 배포 |
-| **`multi-agent-mux-loop`** | `3.0.0` | Planner-Creator-Reviewer 3자 자율 계획·실행·피어리뷰 루프 | ✅ 배포 |
+| **`multi-agent-mux-loop`** | `4.0.0` | Planner-Creator-Reviewer 3자 자율 계획·실행·피어리뷰 루프 | ✅ 배포 |
-| **`multi-agent-mux-orc-onboard`** | `3.0.0` | 오케스트레이터 UUID 격리 등록 및 서브 세션 오염 방지 | ✅ 배포 |
+| **`multi-agent-mux-orc-onboard`** | `4.0.0` | 오케스트레이터 UUID 격리 등록 및 서브 세션 오염 방지 | ✅ 배포 |
 ---
 ## 📋 버전별 상세 변경 내역 (Changelog)
 ### 🚀 `v4.0.0` — Complete Cline Agent Deprecation & Hermes Modernization (2026-08-28)
 > **주요 마일스톤 (MAJOR Release)**: `cline` 에이전트 백엔드의 완전한 제거 및 폐지(Breaking Change per SemVer 2.0.0 §8), Hermes 에이전트 풀 모더니제이션 및 Ollama 로컬 연동 정식 지원, 4대 핵심 에이전트(`claude`, `agy`, `hermes`, `grok`) 표준화 및 439개 전체 테스트 100% PASS 달성.
 #### ⚠️ 동작 변경 및 마이그레이션 안내 (Breaking Changes)
 * **B-1: `--agent cline` 지원 완전 제거 및 파서 거부**:
  - `adapters/cline.py` 삭제 및 `registry.py` 등록 해제에 따라 모든 스킬 엔트리포인트(`create_session.sh`, `resume_session.sh`, `stop_session.sh`, `reconcile.sh`, `orc_onboard.sh`, `multi-agent-mux-delegate-job` 등)에서 `--agent cline` 입력 시 `exit 2`로 즉시 거부됩니다.
  - 지원되는 에이전트 패밀리는 `claude`, `agy`, `hermes`, `grok` 4종으로 엄격히 제한됩니다.
 * **B-2: 영향도 확인 (Detection)**:
  - 저장된 스크립트나 커스텀 세션에서 Cline 관련 설정이 남아있는지 확인:
    ```bash
    grep -rn "agent: cline\|cline_conversation_id_own\|--agent cline" .mam/ *.sh 2>/dev/null
    ```
 * **B-3: 업그레이드 전 세션 정리 (Pre-upgrade Cleanup — 권장)**:
  - v3.1.0 상태에서 `deploy/update.sh` 실행 전, 기존의 활성/보관 중인 Cline 세션을 원자적으로 정리:
    ```bash
    multi-agent-mux-stop --session <session-name> --agent cline --purge-conversation --yes
    ```
 * **B-4: 업그레이드 후 고아 세션 레코드 정리 (Post-upgrade YAML Pruning)**:
  - `deploy/update.sh`는 `.mam/agent-sessions.yaml`을 덮어쓰지 않고 보존하므로, 사전에 정리되지 않은 v3.x `cline` 세션 행은 아래 원자적 갱신 명령을 통해 안전하게 정리할 수 있습니다:
    ```bash
    source .agents/skills/lib.sh
    atomic_dump_yaml .mam/agent-sessions.yaml <<'MUT'
    d['herdr_sessions'] = [
        s for s in d.get('herdr_sessions', [])
        if s.get('agent') != 'cline' and not str(s.get('name', '')).endswith('-cline')
    ]
    MUT
    ```
 * **B-5: Hermes 에이전트 모더니제이션**:
  - 헤드리스 플래그(`--yolo --accept-hooks`), TUI 입력 영역 구분자(`─{10,}` 및 `❯`), 준비 토큰 강화, `reconcile.sh` 타임스탬프 기반 다중 후보자 동등성(`discover()`) 지원이 정식 통합되었습니다.
 ---
 ### 🚀 `v3.1.0` — 2-Tier TUI Readiness Model, Adapter Modal Contract & Fail-Closed Pane Resolution (2026-08-28)
 > **주요 마일스톤**: 다이얼로그 기아(starvation) 구조적 해소를 위한 2계층 TUI 준비 판정 모델(`S ∨ (W ∧ C)`), 모달/힌트 2계층 토큰 분리, 어댑터별 `modal_tokens` 계약(`T-2d`) 정립, 동종 페인 다중 매치 fail-closed 방어, 준비 실패 세션 진단 보존(`create_session.sh`), `lib.sh` 런타임 버전 상수(`MAM_VERSION="3.1.0"`) 신설 및 436개 전체 테스트 100% PASS 달성.
 #### ⚠️ 동작 변경 및 마이그레이션 안내
 * **B-1: TUI 미준비 세션 보존 (`create_session.sh`)**:
  - TUI 준비 감지 타임아웃 발생 시, PID가 생존해 있다면 세션을 강제 종료(`kill-session`)하지 않고 `status: running`, `last_visible_status: tui-ready-timeout`으로 등록한 뒤 `exit 0`(성공)으로 반환합니다.
  - 구 `v3.0.1`의 무조건 롤백 및 종료 동작을 원할 경우 `MAM_KILL_ON_READY_TIMEOUT=1`을 설정하십시오.
 * **B-2: 프로세스 사망 시 종료 코드 변경**:
  - `create_session.sh` 실행 중 PID가 사망한 경우 명시적 구분 코드 `42`(`MAM_EXIT_READY_TIMEOUT`)로 종료합니다.
 * **B-3: 동종 페인 다중 매치 시 Fail-Closed 거부 (`_resolve_herdr_pane_id`)**:
  - 동일한 에이전트 종류의 페인이 여러 개 발견되고 정확한 세션명 일치가 실패할 경우, 임의의 첫 번째 페인을 선택하지 않고 즉시 `exit 1`로 실패하여 교차 세션 오염을 원천 차단합니다.
 * **B-4 & B-5: 환경변수 전파 (`WORKSPACE_ROOT`, `MAM_VERSION`)**:
  - `WORKSPACE_ROOT` 및 `MAM_VERSION`이 자식 프로세스로 자동 `export`됩니다. `MAM_VERSION`은 런타임 위조 방지를 위해 환경변수 오버라이드가 차단됩니다.
 #### 🔧 기존 워크스페이스 사용자 안내
 기존 배포된 워크스페이스 사용자는 `.mam.env`에 아래 3종의 신규 환경변수를 추가하여 동작을 튜닝할 수 있습니다:
 | 변수명 | 기본값 | 설명 |
 | :--- | :---: | :--- |
 | `MAM_KILL_ON_READY_TIMEOUT` | `0` | `1`로 설정 시 TUI 준비 타임아웃 발생 시 세션을 보존하지 않고 강제 종료(v3.0.1 동작) |
 | `MAM_DIALOG_TAIL_LINES` | `8` | 블로킹 모달 시그니처를 검사할 페인 하단 비공백 라인 수 |
 | `MAM_READY_EMPTY_GIVEUP` | `5` | `wait_for_tui_ready`가 페인을 관측 불가(Headless)로 판정하기까지의 연속 빈 캡처 횟수 |
 #### 1. 2계층 TUI 준비 판정 모델 (`S ∨ (W ∧ C)`)
 * **단독 충분 강한 신호 (`S`)**: `strong_ready_tokens` 또는 8자 이상의 유의미한 `input_placeholder`(`Ask anything...`) 일치 시 준비 완료 선언.
 * **보강 결합 약한 신호 (`W ∧ C`)**: `weak_ready_tokens`(`history`, `Chat` 등)는 `input_prompt`(`❯`, `>`) 또는 `input_rule_pattern`(`─{10,}`)과 동시 일치할 때만 준비 완료로 판정하여 오탐 차단.
 * **하강 호환성 (Fallback)**: `input_*` 속성이 미정의된 에이전트(Hermes 등)는 강한 토큰 단독 검사로 안전하게 하강.
 #### 2. 모달/힌트 토큰 분리 및 어댑터 `modal_tokens` 계약 (`T-2a` / `T-2d`)
 * **토큰 집합 분리**: `_MAM_MODAL_TOKENS`(고신뢰 블로킹 모달)와 `_MAM_HINT_TOKENS`(자연어 TUI 안내 팁)를 분리. `_pane_dialog_open`이 힌트 텍스트로 인해 영구 차단(Starvation)되는 결함 해소. `_MAM_DIALOG_TOKENS`는 하위호환용 합집합으로 존치.
 * **`BaseAgentAdapter.modal_tokens`**: 에이전트별 특화 모달(Claude의 `Try the new fullscreen renderer?`, Cline의 `Select API Provider` 등)을 팩트 브리지(`MAM_MODAL_TOKENS`)로 통합.
 #### 3. Fail-Closed 페인 해석 및 워크스페이스 스코프 강화 (`R-1` / `R-2`)
 * `_resolve_herdr_pane_id`에서 다중 매치 시 `sys.exit(1)` 처리 및 `export WORKSPACE_ROOT` 보강으로 격리 안정성 확보.
 #### 4. 준비 실패 세션 진단 보존 및 `MAM_VERSION` 스탬프
 * `create_session.sh` 실패/타임아웃 시 `.mam/diagnostics/<session>-<timestamp>.txt`로 페인 덤프 및 `MAM Version` 스탬프 자동 기록.
 #### 5. 런타임 버전 상수 `MAM_VERSION` 신설 및 3자 락스텝 검증
 * `lib.sh` 내 `MAM_VERSION="3.1.0"` 선언 및 `test_version_consistency.py`를 통한 `lib.sh` ↔ `VERSIONS.md` ↔ 8개 `SKILL.md` 3자 일치 자동 검증.
 #### 6. 신규 환경변수 3종 문서화
 * `.mam.env.example`에 `MAM_KILL_ON_READY_TIMEOUT`, `MAM_DIALOG_TAIL_LINES`, `MAM_READY_EMPTY_GIVEUP` 3종 등록.
 #### 7. 테스트 스위트 확장: 412 → 436 (+24, 100% PASS)
 * `test_c1_tui_readiness.py` (21 tests), `test_adapter_modal_tokens_contract`, `test_version_consistency.py` 신설 등 총 436개 테스트 무결점 통과.
 #### 8. 교차 피어 리뷰 이력
 * F-1~F-8 및 R-1, R-2 총 10건의 피어 리뷰 이슈 도출 및 해소:
  - F-1 (`Yes, try it` 팁 오탐 제거), F-2 (업셀 모달 선행 검사), F-3 (변수 스코프 격리), F-4 (리뷰어 실측 검증 후 자진 철회), F-5/F-6/F-7 (어댑터 팩트 연동 및 세션 패턴 보강), F-8 (비-클로드 어댑터 modal_tokens 계약 정립), R-1 (Fail-closed 페인 리졸버), R-2 (`WORKSPACE_ROOT` export 전파).
  - 계획 단계 챌린지(`b9c29c3b`)를 통한 C-1 (`MAM_VERSION` 3자 락스텝) 및 C-2 (마이그레이션 안내) 수용.
 ### 🚀 `v3.0.1` — Herdr Shim Routing Contract Refactor, Multi-Workspace Isolation & 412-Test Milestone (2026-08-27)
 > **주요 마일스톤**: Herdr 심 라우팅 5대 결함(ISSUE-1~5) 및 F-1~F-4 보완 완결, `HERDR_WORKSPACE_ID` 환경 변수 스코핑 및 파일 기반 격리 영속화 엔진 탑재, `pane send-text` 기반 단일 안전 삽입 계약 정립, 부분 문자열 매칭(`in tn`) 완전 제거, 412개 전체 테스트 100% PASS 달성.
 #### 1. Herdr 심 라우팅 및 다중 워크스페이스 격리 강화 (`.agents/skills/lib.sh`)
 * **`HERDR_WORKSPACE_ID` 명시적 스코프 & 영속화 (`ISSUE-3`, `F-2b`)**:
  - `_herdr_ws_id_file()`, `_herdr_persist_ws_id()`, `_herdr_ws_scope()` 헬퍼 도입.
  - `new-session` 시 생성된 워크스페이스 ID를 `$WORKSPACE_ROOT/.mam/herdr_workspace_id`에 영속화.
  - `_herdr_agent_get_scoped`는 호출자의 환경변수(`HERDR_WORKSPACE_ID`)만을 우선 평가하여 단축 경로에서의 교차 워크스페이스 라우팅 오염 차단.
 * **엄격 일치(Exact-Match) 단일 페인 리졸버 정립 (`ISSUE-2`, `ISSUE-5`, `F-3`)**:
  - 기존의 에이전트 CLI 명칭 부분 문자열 매칭(`in tn`, `agent in tn`) 완전 제거.
  - 단일 중앙 헬퍼 `_resolve_herdr_pane_id`로 `has-session`, `kill-session`, `capture-pane`, `send-keys`, `paste-buffer`의 페인 해석 통합.
  - 영숫자 워크스페이스 식별자 패턴(`^w[A-Za-z0-9]+:p[A-Za-z0-9]+$`) 지원 (`H-20`).
 #### 2. 원자적 텍스트 삽입 및 안전 전송 계약 교정 (`ISSUE-1`, `F-4`)
 * **`paste-buffer`의 `pane send-text` 전용화**:
  - Herdr CLI에 미존재하던 `agent send` 제거 및 `pane send-text`로 교체.
  - 삽입과 제출(Enter) 책임을 분리하여 의도치 않은 자동 제출 및 이중 제출(Double Submit) 방지.
  - 페인 미해석 또는 삽입 실패 시 `send_keys_safe`로 에러 코드(`rc 3`) 명시적 전파.
 * **`capture-pane` 폴백 체인 복원 (`F-4`)**:
  - `pane read` 실패 시 `agent read`로의 폴백 체인을 안정적으로 복원하여 TUI 캡처 신뢰성 보장.
 #### 3. TUI 준비 상태 감지 및 다이얼로그 토큰 정밀화 (`N-1`, `F-1`)
 * **`_MAM_DIALOG_TOKENS` 일반 팁 토큰 분리**:
  - 일반 대화형/TUI 팁에 등장하는 `Yes, try it`을 블로킹 다이얼로그 토큰 목록에서 제외하여 세션 시작 시의 오탐 방지.
  - 풀스크린 업셀 모달에 대해서는 전용 Escape 거절 브랜치로 격리 처리.
 #### 4. 테스트 스위트 및 Mock Herdr 계약 정기 동기화 (`tests/`)
 * **Mock Herdr (`tests/conftest.py`)**: 실제 Herdr 0.8.2 CLI 계약과 완벽 동기화 (`pane send-text`, `pane read`, `pane rename` 반영, 미지원 `agent send` 실패 처리).
 * **신규 계약 & 회귀 테스트 19건 추가**:
  - `test_herdr_shim_contract.py`: H-15 ~ H-23 (단일 리졸버 불변식, 워크스페이스 격리, 단축경로 스코핑).
  - `test_b19_headless_reconcile_fixes.py`: D-4 ~ D-7 (set -e 안전성, send_keys_safe 실패 전파, 다이얼로그 토큰 제외 회귀 방지).
 * **전체 테스트 결과**: 412 passed in 681.20s (100% PASS).
 ---
 ### 🚀 `v3.0.0` — 5th Agent (Grok) Ecosystem Expansion, Mux Loop CLI Redesign & Deterministic 2xK Layout Engine 2.0 (2026-08-26)
 > **주요 마일스톤**: 5번째 공식 에이전트 `grok`(Grok Build) 전면 통합, `/multi-agent-mux-loop`의 `--target-agent` 폐지 및 `--creator`/`--planner` 역할 분리(Breaking Change), 2×2 대칭 그리드를 보장하는 결정론적 레이아웃 엔진 2.0 탑재, 393개 전체 테스트 100% PASS 달성.
@@ -1,6 +1,6 @@
 # 🛠️ Multi-Agent Mux (MAM) 설치 및 적용 가이드
-MAM은 단일 워크스페이스 상에서 복수의 에이전트(Claude, Cline, Agy, Hermes 등)들이 서로의 상태를 오염시키지 않고 협업할 수 있도록 프로세스 격리 및 라이프사이클 관리를 제공하는 프레임워크입니다.
+MAM은 단일 워크스페이스 상에서 복수의 에이전트(Claude, Agy, Hermes, Grok 등)들이 서로의 상태를 오염시키지 않고 협업할 수 있도록 프로세스 격리 및 라이프사이클 관리를 제공하는 프레임워크입니다.
 이 가이드는 기존의 다른 프로젝트/레포지토리에 MAM을 신속하게 도입하고 적용하는 절차를 설명합니다.
@@ -36,10 +36,10 @@ MAM은 에이전트별 동작 특성(TUI 프롬프트 패턴, 세션 복원 인
 │   │   • spawn_spec(), resume_spec(), auth_ok(), discover()                                                                           │   │
 │   └────────────────────────────────────────────────────────────────┬─────────────────────────────────────────────────────────────────┘   │
 │                                                                    │                                                                     │
-│               ┌────────────────────┬───────────────────────────────┼───────────────────────────────┬─────────────────────┐               │
+│               ┌────────────────────┬───────────────────────────────┬───────────────────────────────┬─────────────────────┐               │
 │               ▼                    ▼                               ▼                               ▼                     ▼               │
-│      ClaudeAgentAdapter    AgyAgentAdapter                 ClineAgentAdapter              HermesAgentAdapter     [NewAgentAdapter]       │
+│      ClaudeAgentAdapter    AgyAgentAdapter                HermesAgentAdapter               GrokAgentAdapter       [NewAgentAdapter]       │
-│         (Claude Code)        (Antigravity)                      (Cline)                        (Hermes)           (Grok / Codex / ...)   │
+│         (Claude Code)        (Antigravity)                     (Hermes)                         (Grok)           (Codex / ...)        │
 └──────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
 ```
@@ -186,7 +186,6 @@ _ADAPTERS: Dict[str, BaseAgentAdapter] = {
    'claude': ClaudeAgentAdapter(),
    'agy': AgyAgentAdapter(),
    'hermes': HermesAgentAdapter(),
    'cline': ClineAgentAdapter(),
    'grok': GrokAgentAdapter(),  # 👈 추가
 }
 ```
@@ -209,13 +208,11 @@ case "$name" in
  *-creator-claude|*-planner-claude|*-reviewer-claude)   kind="claude" ;;
  *-creator-agy|*-planner-agy|*-reviewer-agy)             kind="agy" ;;
  *-creator-hermes|*-planner-hermes|*-reviewer-hermes)   kind="hermes" ;;
  *-creator-cline|*-planner-cline|*-reviewer-cline)       kind="cline" ;;
  *-creator-grok|*-planner-grok|*-reviewer-grok)          kind="grok" ;;   # 👈 추가
  *)
    if echo "$name" | grep -qi "claude"; then kind="claude"
    elif echo "$name" | grep -qi "agy"; then kind="agy"
    elif echo "$name" | grep -qi "hermes"; then kind="hermes"
    elif echo "$name" | grep -qi "cline"; then kind="cline"
    elif echo "$name" | grep -qi "grok"; then kind="grok"                 # 👈 추가
    else kind="generic"; fi
    ;;
@@ -225,7 +222,7 @@ esac
 #### 2) 바이너리 이름 중복 제거 튜플 (`lib.sh:385`)
 `herdr agent start` 호출 시 첫 번째 인자로 전달되는 바이너리 중복을 방지하기 위해 등록합니다:
 ```bash
-if [[ " claude agy hermes cline grok " =~ " ${cmd_binary} " ]]; then
+if [[ " claude agy hermes grok " =~ " ${cmd_binary} " ]]; then
 ```
 ---
@@ -248,7 +245,7 @@ if [[ " claude agy hermes cline grok " =~ " ${cmd_binary} " ]]; then
 def test_agent_adapter_registry():
    """모든 등록된 에이전트 어댑터 인스턴스 검증"""
    adapters = get_all_adapters()
-    assert set(adapters.keys()) == {'claude', 'agy', 'hermes', 'cline', 'grok'}
+    assert set(adapters.keys()) == {'claude', 'agy', 'hermes', 'grok'}
 def test_adapter_required_properties():
@@ -1,7 +1,7 @@
 # 🚀 MAM 메시징 백플레인 전환 실행 로드맵 (`implementation_plan.md`)
 - **문서 버전**: v1.2.0
- **작성/관리 주체**: Multi-Agent Orchestration Team (`claude`, `agy`, `cline`)
+- **작성/관리 주체**: Multi-Agent Orchestration Team (`claude`, `agy`, `hermes`, `grok`)
 - **기준 커밋**: `916185c` (306/306 baseline tests passing)
 - **문서 목적**: MAM의 메시징 인프라를 공개 HiveMQ 브로커에서 `nats-server` 전용 사설 브로커로 무중단 전환하기 위한 5개 트랙(Track 0~3, Track 1R)과 6단계 마일스톤(M0~M4, M2b)의 구체적 실행 지침 및 진행 상황 추적.
 - **연계 문서**: [`NATS_REPORT.md`](nats-docker/NATS_REPORT.md), [`PRIVATE_SERVER.md`](nats-docker/PRIVATE_SERVER.md), [`IMPROVEMENTS.md`](IMPROVEMENTS.md)
@@ -44,6 +44,7 @@ def mam_sandbox(tmp_path, monkeypatch):
    monkeypatch.setenv("WORKSPACE_ROOT", str(tmp_path))
    monkeypatch.delenv("HERDR_SESSION_NAME", raising=False)
    monkeypatch.delenv("HERDR_SERVER_NAME", raising=False)
    monkeypatch.delenv("HERDR_WORKSPACE_ID", raising=False)
    import sys
    monkeypatch.setenv("AGENT_PYTHON_BIN", sys.executable)
@@ -150,7 +151,13 @@ def save_state():
    if "panes" in state:
        disk_panes = disk_state.setdefault("panes", [])
        for p in state["panes"]:
-            if not any(dp.get("pane_id") == p.get("pane_id") for dp in disk_panes):
+            matched = False
            for i, dp in enumerate(disk_panes):
                if dp.get("pane_id") == p.get("pane_id"):
                    disk_panes[i] = p
                    matched = True
                    break
            if not matched:
                disk_panes.append(p)
    disk_calls = disk_state.setdefault("calls", [])
    if sys.argv[1:] and (not disk_calls or disk_calls[-1] != sys.argv[1:]):
@@ -260,23 +267,42 @@ elif cmd1 == "pane":
            else:
                i += 1
        panes_list = []
-        # Build panes from agents or state["panes"]
+        seen = set()
        # Merge agent-derived panes with state["panes"] (dedupe by pane_id).
        # Label-only panes live in state["panes"] and must remain visible
        # even when other agents are registered.
        for name, data in state.get("agents", {}).items():
            ws_id = data.get("workspace_id", "w1")
            if target_ws and ws_id != target_ws:
                continue
-            panes_list.append({
+            pid = data.get("pane_id", f"{ws_id}:p1")
-                "pane_id": data.get("pane_id", f"{ws_id}:p1"),
+            entry = {
                "pane_id": pid,
                "workspace_id": ws_id,
                "cwd": data.get("cwd", "."),
-                "tab_id": f"{ws_id}:t1",
+                "tab_id": data.get("tab_id", f"{ws_id}:t1"),
-                "agent": data.get("agent", "claude")
+                "agent": data.get("agent", "claude"),
-            })
+                "name": name,
-        if not panes_list:
+            }
-            for p in state.get("panes", []):
+            if data.get("label"):
-                if target_ws and p.get("workspace_id") != target_ws:
+                entry["label"] = data["label"]
-                    continue
+            panes_list.append(entry)
-                panes_list.append(p)
+            seen.add(pid)
        for p in state.get("panes", []):
            if target_ws and p.get("workspace_id") != target_ws:
                continue
            pid = p.get("pane_id")
            if pid in seen:
                for existing in panes_list:
                    if existing.get("pane_id") == pid:
                        for k in ("label", "name"):
                            if p.get(k) and not existing.get(k):
                                existing[k] = p[k]
                        break
                continue
            panes_list.append(p)
            if pid:
                seen.add(pid)
        print(json.dumps({"result": {"panes": panes_list}}))
        sys.exit(0)
    elif cmd2 == "split":
@@ -335,8 +361,70 @@ elif cmd1 == "pane":
            state["agents"] = agents
            save_state()
            sys.exit(0)
-        else:
+        for p in state.get("panes", []):
            if p.get("pane_id") == name:
                p["sent_keys"] = p.get("sent_keys", []) + [key]
                if key in ("Enter", "C-m"):
                    p["buffer"] = p.get("buffer", "") + "\\n\\nesc to interrupt"
                save_state()
                sys.exit(0)
        sys.exit(1)
    elif cmd2 == "send-text":
        if len(args) < 4:
            sys.exit(1)
        pane_id = args[2]
        text = args[3]
        found = False
        for a_name, data in state.get("agents", {}).items():
            if data.get("pane_id") == pane_id or a_name == pane_id:
                data["sent_text"] = data.get("sent_text", "") + text
                data["buffer"] = data.get("buffer", "") + "\\n" + text
                found = True
                break
        if not found:
            for p in state.get("panes", []):
                if p.get("pane_id") == pane_id:
                    p["sent_text"] = p.get("sent_text", "") + text
                    p["buffer"] = p.get("buffer", "") + "\\n" + text
                    found = True
                    break
        if found:
            save_state()
            sys.exit(0)
        sys.exit(1)
    elif cmd2 == "read":
        if len(args) < 3:
            sys.exit(1)
        pane_id = args[2]
        for a_name, data in state.get("agents", {}).items():
            if data.get("pane_id") == pane_id or a_name == pane_id:
                print(data.get("buffer", "Ready"))
                sys.exit(0)
        for p in state.get("panes", []):
            if p.get("pane_id") == pane_id:
                print(p.get("buffer", ""))
                sys.exit(0)
        sys.stderr.write("Pane " + pane_id + " not found\\n")
        sys.exit(1)
    elif cmd2 == "rename":
        if len(args) < 4:
            sys.exit(1)
        pane_id = args[2]
        label = args[3]
        panes = state.setdefault("panes", [])
        renamed = False
        for p in panes:
            if p.get("pane_id") == pane_id:
                p["label"] = label
                renamed = True
                break
        if not renamed:
            panes.append({"pane_id": pane_id, "label": label})
        for a_name, data in state.get("agents", {}).items():
            if data.get("pane_id") == pane_id:
                data["label"] = label
        save_state()
        sys.exit(0)
    elif cmd2 == "process-info":
        pane_id = ""
        if "--pane" in args:
@@ -449,8 +537,7 @@ elif cmd1 == "agent":
        buffer_content = {
            "claude": "Anthropic Claude Ready",
            "agy": "Antigravity Ready",
-            "hermes": "Hermes Ready",
+            "hermes": "Hermes Ready"
            "cline": "Cline Chat Ready"
        }.get(agent_type, "Ready")
        # Look up cwd from target pane in state if not explicitly passed
@@ -489,8 +576,7 @@ elif cmd1 == "agent":
        own_key_map = {
            "claude": "claude_session_id_own",
            "agy": "agy_conversation_id_own",
-            "hermes": "hermes_conversation_id_own",
+            "hermes": "hermes_conversation_id_own"
            "cline": "cline_conversation_id_own"
        }
        own_key = own_key_map.get(agent_type)
        if own_key:
@@ -541,15 +627,6 @@ elif cmd1 == "agent":
            conn.execute("INSERT OR REPLACE INTO sessions (id, cwd) VALUES (?, ?)", (session_uuid, ws_abs))
            conn.commit()
            conn.close()
        elif agent_type == "cline":
            clin_base = os.path.join(home_dir, ".cline", "data", "sessions")
            if "agent_homes" in home_dir:
                clin_base = os.path.join(home_dir, "sessions")
            session_dir = os.path.join(clin_base, session_uuid)
            os.makedirs(session_dir, exist_ok=True)
            json_file = os.path.join(session_dir, f"{session_uuid}.json")
            with open(json_file, 'w') as jf:
                jf.write(json.dumps({"id": session_uuid}))
        state["agents"] = agents
        save_state()
@@ -633,33 +710,15 @@ elif cmd1 == "agent":
            agents[matched_k]["buffer"] = agents[matched_k].get("buffer", "") + "\\n" + text + "\\n\\nesc to interrupt"
            state["agents"] = agents
            save_state()
-        print(json.dumps({"id": "cli:agent:prompt", "result": {"type": "ok"}}))
+            print(json.dumps({"id": "cli:agent:prompt", "result": {"type": "ok"}}))
        sys.exit(0)
    elif cmd2 == "send":
        if len(args) < 4:
            sys.exit(1)
        name = args[2]
        text = args[3]
        agents = state.get("agents", {})
        matched_k = None
        for k in agents:
            if _match_agent(k, name):
                matched_k = k
                break
        if matched_k:
            agents[matched_k]["sent_text"] = agents[matched_k].get("sent_text", "") + text
            if text in ("C-m", "Enter"):
                agents[matched_k]["buffer"] = agents[matched_k].get("buffer", "") + "\\\\n\\\\nesc to interrupt"
            else:
                agents[matched_k]["buffer"] = agents[matched_k].get("buffer", "") + "\\\\n" + text
            if "/exit" in text or "exit" in text or "Exit" in text:
                agents[matched_k]["status"] = "stopped"
            state["agents"] = agents
            save_state()
            sys.exit(0)
-        else:
+        sys.stderr.write("Agent " + name + " not found\\n")
-            sys.stderr.write("Agent " + name + " not found\\\\n")
+        sys.exit(1)
-            sys.exit(1)
+    else:
        # Real herdr has no `agent send`. Unknown subcommands must fail
        # (exit 1) rather than silently succeeding.
        sys.stderr.write("error: unrecognized subcommand '" + cmd2 + "'\\n")
        sys.exit(1)
 elif cmd1 == "session":
    if len(args) < 2:
@@ -843,7 +902,7 @@ sys.exit(0)
@pytest.fixture
 def mock_agents(mam_sandbox, monkeypatch):
    """
-    Generates mock agent binaries (claude, agy, hermes, cline)
+    Generates mock agent binaries (claude, agy, hermes)
    and places them in the sandboxed bin folder to satisfy preflight checks.
    """
    tmp_path = mam_sandbox
@@ -887,20 +946,7 @@ sys.exit(0)
 """)
    hermes_bin.chmod(0o755)
-    # 4. cline mock
+    # 4. uuidgen mock to guarantee isolated creation UUIDs
    cline_bin = bin_dir / "cline"
    cline_bin.write_text("""#!/usr/bin/env python3
 import sys
 import json
 args = sys.argv[1:]
 if len(args) >= 1 and args[0] == "history":
    print(json.dumps([]))
    sys.exit(0)
 sys.exit(0)
 """)
    cline_bin.chmod(0o755)
    # 5. uuidgen mock to guarantee isolated creation UUIDs
    uuidgen_bin = bin_dir / "uuidgen"
    uuidgen_bin.write_text("""#!/usr/bin/env python3
 import uuid
@@ -30,7 +30,6 @@ def test_agent_adapter_registry():
        'claude': 'claude_session_id_own',
        'agy': 'agy_conversation_id_own',
        'hermes': 'hermes_conversation_id_own',
        'cline': 'cline_conversation_id_own',
        'grok': 'grok_session_id_own',
    }
    for agent, expected in EXPECTED_OWN_KEYS.items():
@@ -50,8 +49,8 @@ def test_agent_of_row_priority():
    assert agent_of_row(row2) == 'hermes'
    # Priority 3: pane.cmd exact match
-    row3 = {'pane': {'cmd': 'cline'}}
+    row3 = {'pane': {'cmd': 'grok'}}
-    assert agent_of_row(row3) == 'cline'
+    assert agent_of_row(row3) == 'grok'
 def test_agent_of_row_pane_cmd_binary_path_and_failure():
    # pane.cmd 가 절대 경로 형태여도 해석된다
@@ -72,8 +71,7 @@ def test_adapter_required_properties():
    expected = {
        'claude': ('Anthropic|Assistant|Chat|Welcome|Claude Code|Opus|Sonnet|Haiku', '/exit', 'claude-code', ('session_id', 'session_jsonl', 'session_size_bytes', 'session_lines')),
        'agy': ('Antigravity', 'Exit', 'antigravity-cli', ('conversation_id', 'conversation_db', 'conversation_brain_dir')),
-        'hermes': ('Hermes', '/exit', 'hermes-agent', ('session_id',)),
+        'hermes': ('Hermes|Welcome to Hermes Agent|NOUS HERMES', '/exit', 'hermes-agent', ('session_id',)),
        'cline': ('Cline|history|Chat|What can I do|slash commands', '/exit', 'cline-agent', ('session_id',)),
        'grok': ('Grok|xAI|Assistant|❯|>>>', '/exit', 'grok-build', ('session_id', 'session_jsonl')),
    }
    for agent, (toks, exitk, delk, cache_f) in expected.items():
@@ -83,6 +81,24 @@ def test_adapter_required_properties():
        assert adapter.exit_key == exitk
        assert adapter.delegate_agent_key == delk
        assert adapter.identity_cache_fields == cache_f
        # 2-Tier readiness default contract
        assert adapter.strong_ready_tokens == adapter.ready_tokens
        assert adapter.weak_ready_tokens == ''
 def test_adapter_modal_tokens_contract():
    """F-8: Verify adapter-level modal_tokens contract (T-2d)."""
    expected_modal = {
        'claude': 'Try the new fullscreen renderer\\?',
        'agy': None,
        'hermes': None,
        'grok': None,
    }
    for agent, expected in expected_modal.items():
        adapter = get_adapter(agent)
        assert adapter is not None
        assert adapter.modal_tokens == expected, f"modal_tokens mismatch for {agent}"
 def test_facts_bridge_eval_contract():
    import subprocess, sys
@@ -90,7 +106,7 @@ def test_facts_bridge_eval_contract():
    env = os.environ.copy()
    skills_dir = str(Path(__file__).resolve().parent.parent / ".agents" / "skills")
    env["PYTHONPATH"] = f"{skills_dir}:{env.get('PYTHONPATH', '')}"
-    for agent in ('claude', 'agy', 'hermes', 'cline', 'grok'):
+    for agent in ('claude', 'agy', 'hermes', 'grok'):
        res = subprocess.run([sys.executable, "-m", "lib_py.agents", "facts", agent], capture_output=True, text=True, env=env)
        assert res.returncode == 0
        facts_output = res.stdout
@@ -99,12 +115,12 @@ def test_facts_bridge_eval_contract():
        bash_cmd = f"""
 set -euo pipefail
 eval {shlex_quote(facts_output)}
-echo "AGENT=$MAM_AGENT_NAME|OWN=$MAM_OWN_KEY|TOK=$MAM_READY_TOKENS|EXIT=$MAM_EXIT_KEY|DEL=$MAM_DELEGATE_AGENT_KEY|PH=$MAM_INPUT_PLACEHOLDER"
+echo "AGENT=$MAM_AGENT_NAME|OWN=$MAM_OWN_KEY|TOK=$MAM_READY_TOKENS|EXIT=$MAM_EXIT_KEY|DEL=$MAM_DELEGATE_AGENT_KEY|PH=$MAM_INPUT_PLACEHOLDER|STRONG=$MAM_STRONG_READY_TOKENS|WEAK=$MAM_WEAK_READY_TOKENS"
 """
        res_bash = subprocess.run(["bash", "-c", bash_cmd], capture_output=True, text=True)
        assert res_bash.returncode == 0, f"Bash eval failed for {agent}:\nStdout: {res_bash.stdout}\nStderr: {res_bash.stderr}"
-        if agent == 'cline':
+        assert f"STRONG={get_adapter(agent).strong_ready_tokens}" in res_bash.stdout
-            assert "PH=Ask anything..." in res_bash.stdout
+        assert "WEAK=" in res_bash.stdout
 def shlex_quote(s):
    import shlex
@@ -171,18 +187,7 @@ def test_purge_artifacts_composite(tmp_path):
    assert conn.execute("SELECT count(*) FROM messages WHERE session_id='uuid-h'").fetchone()[0] == 0
    conn.close()
-    # 4. Cline (sessions dir)
+    # 4. Grok (session directory containing chat_history.jsonl)
    cline_adapter = get_adapter('cline')
    cline_ctx = DiscoveryContext(workspace=ws, agent_name='cline', home_dir=home)
    cline_dir = f"{home}/.cline/data/sessions/uuid-cl"
    os.makedirs(cline_dir, exist_ok=True)
    with open(f"{cline_dir}/uuid-cl.json", 'w') as f:
        f.write('{"session_id": "uuid-cl"}')
    purged_cl = cline_adapter.purge_artifacts('uuid-cl', cline_ctx)
    assert len(purged_cl) == 1
    assert not os.path.exists(cline_dir)
    # 5. Grok (session directory containing chat_history.jsonl)
    grok_adapter = get_adapter('grok')
    grok_ctx = DiscoveryContext(workspace=ws, agent_name='grok', home_dir=home)
    g_path = grok_adapter.artifact_path('uuid-g', grok_ctx)
@@ -207,13 +212,9 @@ def test_adapter_spawn_and_resume_specs():
    assert agy.resume_spec('agy', 'u1', materialized=True) == 'agy --dangerously-skip-permissions --conversation u1'
    hermes = get_adapter('hermes')
-    assert hermes.spawn_spec('hermes', 'u1') == 'hermes'
+    assert hermes.spawn_spec('hermes', 'u1') == 'hermes --yolo --accept-hooks'
-    assert hermes.resume_spec('hermes', 'u1', materialized=True) == 'hermes --resume u1'
+    assert hermes.resume_spec('hermes', 'u1', materialized=True) == 'hermes --resume u1 --no-restore-cwd --yolo --accept-hooks'
-
+    assert hermes.resume_spec('hermes', 'u1', materialized=False) == 'hermes --yolo --accept-hooks'
    cline = get_adapter('cline')
    assert cline.spawn_spec('cline', 'u1') == 'cline -i'
    assert cline.resume_spec('cline', 'u1', materialized=True) == 'cline -i --id u1'
    assert cline.resume_spec('cline', 'u1', materialized=False) == 'cline -i'
    grok = get_adapter('grok')
    assert grok.spawn_spec('grok', 'u1') == 'grok --session-id u1 --permission-mode bypassPermissions'
@@ -247,9 +248,8 @@ def test_adapter_auth_ok(tmp_path, monkeypatch):
    grok_auth.write_text("{}")
    assert grok.auth_ok() is True
-    # Hermes & Cline always True
+    # Hermes always True
    assert get_adapter('hermes').auth_ok() is True
    assert get_adapter('cline').auth_ok() is True
 def test_adapter_discover(tmp_path):
    import sqlite3
@@ -297,16 +297,7 @@ def test_adapter_discover(tmp_path):
    conn.close()
    assert hermes.discover(ctx_h) == ['u-h1']
-    # 4. Cline
+    # 4. Grok
    cline = get_adapter('cline')
    ctx_cl = DiscoveryContext(workspace=ws, agent_name='cline', home_dir=home)
    cl_sess = f"{home}/.cline/data/sessions/u-cl1"
    os.makedirs(cl_sess, exist_ok=True)
    with open(f"{cl_sess}/u-cl1.json", 'w') as f:
        f.write('{"session_id": "u-cl1", "cwd": "' + ws + '"}')
    assert cline.discover(ctx_cl) == ['u-cl1']
    # 5. Grok
    grok = get_adapter('grok')
    ctx_g = DiscoveryContext(workspace=ws, agent_name='grok', home_dir=home)
    g_sess = f"{home}/.grok/sessions/{grok._ws_dir(ctx_g)}/u-g1"
@@ -333,7 +324,7 @@ def test_cli_bridge_subcommands_and_quote_safety():
    assert res.stdout.strip() == "/bin/claude --dangerously-skip-permissions --session-id uuid-test"
    # 3. exit-key
-    for agent, expected_key in [('claude', '/exit'), ('agy', 'Exit'), ('hermes', '/exit'), ('cline', '/exit'), ('grok', '/exit')]:
+    for agent, expected_key in [('claude', '/exit'), ('agy', 'Exit'), ('hermes', '/exit'), ('grok', '/exit')]:
        res = subprocess.run([sys.executable, "-m", "lib_py.agents", "exit-key", agent], capture_output=True, text=True, env=env)
        assert res.returncode == 0
        assert res.stdout.strip() == expected_key
@@ -344,7 +335,6 @@ def test_delegate_agent_resolution_and_fallback():
        'claude': 'claude-code',
        'agy': 'antigravity-cli',
        'hermes': 'hermes-agent',
        'cline': 'cline-agent',
        'grok': 'grok-build',
    }
    # 1. Adapter property
@@ -362,7 +352,6 @@ def test_delegate_agent_resolution_and_fallback():
          case "$AGENT" in
            claude) delegate_agent="claude-code" ;;
            hermes) delegate_agent="hermes-agent" ;;
            cline)  delegate_agent="cline-agent" ;;
            agy)    delegate_agent="antigravity-cli" ;;
            grok)   delegate_agent="grok-build" ;;
            *) echo "ERROR: cannot resolve delegate agent key for '$AGENT'" >&2; exit 2 ;;
@@ -381,3 +370,156 @@ def test_wait_for_tui_ready_missing_tokens_diagnostic(mam_sandbox):
    res = subprocess.run(["bash", "-c", cmd], capture_output=True, text=True)
    assert res.returncode != 0
    assert "no ready tokens for agent 'bogus-agent'" in res.stderr
 def test_hermes_input_region_properties():
    adapter = get_adapter('hermes')
    assert adapter.input_prompt == '❯'
    assert adapter.input_placeholder == ''
    assert adapter.input_rule_pattern == '─{10,}'
 def test_hermes_verify_artifact_started_at_epoch_filtering(tmp_path):
    import sqlite3
    from lib_py.agents.base import DiscoveryContext
    ws = str(tmp_path / "ws")
    home = str(tmp_path / "home")
    os.makedirs(ws, exist_ok=True)
    os.makedirs(home, exist_ok=True)
    hdb = f"{home}/.hermes/state.db"
    os.makedirs(os.path.dirname(hdb), exist_ok=True)
    conn = sqlite3.connect(hdb)
    conn.execute("CREATE TABLE sessions (id TEXT, cwd TEXT, started_at REAL)")
    conn.execute("INSERT INTO sessions VALUES ('u-old', ?, 1000.0)", (ws,))
    conn.execute("INSERT INTO sessions VALUES ('u-new', ?, 2000.0)", (ws,))
    conn.commit()
    conn.close()
    adapter = get_adapter('hermes')
    ctx_old = DiscoveryContext(workspace=ws, agent_name='hermes', home_dir=home, epoch=1500)
    assert adapter.verify_artifact('u-old', ctx_old) is False
    assert adapter.verify_artifact('u-new', ctx_old) is True
 def test_hermes_reconcile_dual_direction_epoch_guards(tmp_path):
    import sqlite3
    from lib_py.agents.base import DiscoveryContext
    from lib_py.verify_session import verify_session_uuid
    ws = str(tmp_path / "ws")
    home = str(tmp_path / "home")
    os.makedirs(ws, exist_ok=True)
    os.makedirs(home, exist_ok=True)
    hdb = f"{home}/.hermes/state.db"
    os.makedirs(os.path.dirname(hdb), exist_ok=True)
    conn = sqlite3.connect(hdb)
    conn.execute("CREATE TABLE sessions (id TEXT, cwd TEXT, started_at REAL)")
    # Direction 1: Old historical session (started_at=1000) + 1 new session (started_at=2000)
    conn.execute("INSERT INTO sessions VALUES ('u-hist', ?, 1000.0)", (ws,))
    conn.execute("INSERT INTO sessions VALUES ('u-fresh1', ?, 2000.0)", (ws,))
    conn.commit()
    epoch = 1500
    s_row = {'name': 'sess1', 'pane': {'cwd': ws}, 'herdr_session_epoch': epoch}
    # Query with epoch filter (Rev.2 pattern)
    rows = conn.execute(
        "SELECT id FROM sessions WHERE cwd=? AND started_at >= ? ORDER BY started_at DESC LIMIT 20",
        (ws, epoch)
    ).fetchall()
    valid = [u for (u,) in rows if verify_session_uuid(ws, 'hermes', u, s_row, home_dir=home, mode="discover")]
    assert valid == ['u-fresh1']
    assert len(valid) == 1  # Exactly 1, no false C-ambiguous!
    # Direction 2: Add a second concurrent fresh session (started_at=2100) -> must detect C-ambiguous
    conn.execute("INSERT INTO sessions VALUES ('u-fresh2', ?, 2100.0)", (ws,))
    conn.commit()
    conn.close()
    rows2 = sqlite3.connect(hdb).execute(
        "SELECT id FROM sessions WHERE cwd=? AND started_at >= ? ORDER BY started_at DESC LIMIT 20",
        (ws, epoch)
    ).fetchall()
    valid2 = [u for (u,) in rows2 if verify_session_uuid(ws, 'hermes', u, s_row, home_dir=home, mode="discover")]
    assert len(valid2) == 2  # Ambiguous detected correctly!
 def test_hermes_verify_artifact_spawn_epoch_timing_f1(tmp_path):
    """F1 Regression: Ensure spawn-time epoch capture allows freshly started session to be verified."""
    import sqlite3, time
    from lib_py.agents.base import DiscoveryContext
    ws = str(tmp_path / "ws")
    home = str(tmp_path / "home")
    os.makedirs(ws, exist_ok=True)
    os.makedirs(home, exist_ok=True)
    # 1. Pre-spawn epoch capture (T0)
    spawn_epoch = int(time.time())
    # 2. Process spawns and writes session row (T0 + 0.1s)
    session_started_at = spawn_epoch + 0.1
    hdb = f"{home}/.hermes/state.db"
    os.makedirs(os.path.dirname(hdb), exist_ok=True)
    conn = sqlite3.connect(hdb)
    conn.execute("CREATE TABLE sessions (id TEXT, cwd TEXT, started_at REAL)")
    conn.execute("INSERT INTO sessions VALUES ('u-fresh', ?, ?)", (ws, session_started_at))
    conn.execute("INSERT INTO sessions VALUES ('u-old', ?, ?)", (ws, spawn_epoch - 3600.0))
    conn.commit()
    conn.close()
    adapter = get_adapter('hermes')
    # Context with pre-spawn epoch
    ctx_spawn = DiscoveryContext(workspace=ws, agent_name='hermes', home_dir=home, epoch=spawn_epoch)
    assert adapter.verify_artifact('u-fresh', ctx_spawn) is True
    assert adapter.verify_artifact('u-old', ctx_spawn) is False
    # Discover with pre-spawn epoch returns the fresh candidate only
    assert adapter.discover(ctx_spawn) == ['u-fresh']
 def test_hermes_reconcile_full_block_integration(tmp_path):
    """F3: Verify hermes drift-C block behavior with sibling_claimed exclusion."""
    import sqlite3
    from lib_py.agents.base import DiscoveryContext
    from lib_py.verify_session import verify_session_uuid
    ws = str(tmp_path / "ws")
    home = str(tmp_path / "home")
    os.makedirs(ws, exist_ok=True)
    os.makedirs(home, exist_ok=True)
    hdb = f"{home}/.hermes/state.db"
    os.makedirs(os.path.dirname(hdb), exist_ok=True)
    conn = sqlite3.connect(hdb)
    conn.execute("CREATE TABLE sessions (id TEXT, cwd TEXT, started_at REAL)")
    conn.execute("INSERT INTO sessions VALUES ('u-claimed', ?, 2000.0)", (ws,))
    conn.execute("INSERT INTO sessions VALUES ('u-target', ?, 2001.0)", (ws,))
    conn.commit()
    conn.close()
    epoch = 1900
    s_eval = {
        'name': 'hermes-target-01',
        'pane': {'cwd': ws},
        'herdr_session_epoch': epoch,
        '_sibling_claimed_uuids': ['u-claimed']
    }
    # Simulate reconcile.sh candidate gathering
    conn = sqlite3.connect(hdb)
    rows = conn.execute(
        "SELECT id FROM sessions WHERE cwd=? AND started_at >= ? ORDER BY started_at DESC LIMIT 20",
        (ws, epoch)
    ).fetchall()
    conn.close()
    valid_candidates = []
    for (uuid,) in rows:
        if uuid in s_eval['_sibling_claimed_uuids']:
            continue
        if verify_session_uuid(ws, 'hermes', uuid, s_eval, home_dir=home, mode="discover"):
            valid_candidates.append(uuid)
    assert valid_candidates == ['u-target']
@@ -3,6 +3,7 @@ import sys
 import json
 import subprocess
 import time
 from pathlib import Path
 import pytest
 from lib_py.layout import compute_2xk_layout
@@ -101,6 +102,214 @@ def test_bug4_send_keys_safe_gating_order():
    assert dialog_idx < prompt_idx, "_pane_dialog_open must execute before agent prompt fast-path"
 _LIB_SH = str(Path(__file__).resolve().parent.parent / ".agents" / "skills" / "lib.sh")
 _FULLSCREEN_TIP = """Claude Code
 Try the new fullscreen renderer — flicker-free output, mouse support, auto-copy on select · /tui fullscreen
 ❯
 """
 _FULLSCREEN_MODAL = """Try the new fullscreen renderer?
 Flicker-free output
 Selected text auto-copies to your clipboard
 Yes, try it
 """
 def _run_lib_helpers(script_body, env_extra=None):
    env = dict(os.environ)
    if env_extra:
        env.update(env_extra)
    wrapper = f"""
 set -euo pipefail
 source "{_LIB_SH}"
 _init_herdr_isolation() {{ :; }}
 {script_body}
 """
    return subprocess.run(["bash", "-c", wrapper], capture_output=True, text=True, env=env)
 def test_agent_start_success_tokens_exclude_startup_timeout():
    """D-1: dead-process timeout must not be promoted to success; agent_not_ready may."""
    content = open(_LIB_SH, encoding="utf-8").read()
    success_line = next(l for l in content.splitlines()
                        if 'grep -qE "agent_started' in l)
    assert "agent_not_ready" in success_line
    assert "timed out waiting for agent startup" not in success_line
    err_line = next(i for i, l in enumerate(content.splitlines())
                    if 'grep -qiE "^usage:' in l)
    ok_line = next(i for i, l in enumerate(content.splitlines())
                   if 'grep -qE "agent_started' in l)
    assert err_line < ok_line
 def test_fullscreen_tip_is_not_a_blocking_dialog():
    """D-2: idle /tui fullscreen tip must not trip _pane_dialog_open or send keys."""
    script = f"""
 _pane_capture() {{ printf '%s' '{_FULLSCREEN_TIP}'; }}
 KEYS=/tmp/mam-fs-tip-keys.$$
 : > "$KEYS"
 _sks_herdr() {{
  if [ "${{1:-}}" = "send-keys" ]; then echo "$*" >> "$KEYS"; fi
  return 0
 }}
 if _pane_dialog_open dummy; then echo "DIALOG_OPEN"; else echo "DIALOG_CLOSED"; fi
 handle_startup_dialogs dummy 2
 echo "KEYS_CONTENT=$(tr '\\n' '|' < "$KEYS")"
 rm -f "$KEYS"
 """
    res = _run_lib_helpers(script)
    assert res.returncode == 0, res.stderr + res.stdout
    assert "DIALOG_CLOSED" in res.stdout
    assert "Escape" not in res.stdout
    assert "Enter" not in res.stdout.split("KEYS_CONTENT=")[-1]
 def _lib_helper_src():
    content = open(_LIB_SH, encoding="utf-8").read()
    start = content.find("_herdr_ws_id_file() {")
    end = content.find('cmd="${1:-}"', start)
    assert start != -1 and end != -1
    return content[start:end]
 def test_resolve_pane_id_fails_cleanly_under_set_e():
    """D-4: _resolve_herdr_pane_id must return 1 with empty stdout under set -e."""
    helper = _lib_helper_src()
    script = """
 set -euo pipefail
 unset HERDR_WORKSPACE_ID
 source "LIB_SH_PLACEHOLDER"
 _init_herdr_isolation() { :; }
 _real_herdr() { return 1; }
 HELPER_PLACEHOLDER
 _resolve_herdr_pane_id nonexistent >/dev/null 2>&1 || true
 echo SURVIVED
 rc=0
 out=$(_resolve_herdr_pane_id nonexistent 2>/dev/null) || rc=$?
 printf 'OUT=%s\\n' "$out"
 echo "RC=$rc"
 """.replace("LIB_SH_PLACEHOLDER", _LIB_SH).replace("HELPER_PLACEHOLDER", helper)
    res = subprocess.run(["bash", "-c", script], capture_output=True, text=True)
    assert res.returncode == 0, res.stderr + res.stdout
    assert "SURVIVED" in res.stdout
    assert "RC=1" in res.stdout
    out_line = [l for l in res.stdout.splitlines() if l.startswith("OUT=")][0]
    assert out_line == "OUT="
 def test_send_keys_safe_returns_3_when_paste_buffer_fails():
    """D-5 (ISSUE-1): paste-buffer failure returns 3 and still deletes the buffer."""
    script = """
 _pane_quiescent() { return 0; }
 _pane_dialog_open() { return 1; }
 LOG=/tmp/mam-d5-sks.$$
 : > "$LOG"
 _sks_herdr() {
  echo "$*" >> "$LOG"
  if [ "${1:-}" = "agent" ] && [ "${2:-}" = "prompt" ]; then return 1; fi
  if [ "${1:-}" = "paste-buffer" ]; then return 1; fi
  return 0
 }
 rc=0
 send_keys_safe "d5-sess" "hello" "job-d5" || rc=$?
 echo "RC=$rc"
 echo "LOG_CONTENT=$(tr '\\n' '|' < "$LOG")"
 rm -f "$LOG"
 """
    res = _run_lib_helpers(script)
    assert res.returncode == 0, res.stderr + res.stdout
    assert "RC=3" in res.stdout
    log = res.stdout.split("LOG_CONTENT=")[-1]
    assert "C-m" not in log
    assert "delete-buffer" in log
 def test_no_substring_matching_remains_in_lib_sh():
    """D-6 (ISSUE-2): no `in tn` substring matching remains in lib.sh."""
    import re
    content = open(_LIB_SH, encoding="utf-8").read()
    assert re.search(r"\bin tn\b", content) is None
    assert re.search(r'agent"\) in tn', content) is None
    start = content.find("_resolve_herdr_pane_id()")
    assert start != -1
    body = content[start:content.find('cmd="${1:-}"', start)]
    assert r"^w[A-Za-z0-9]+:p[A-Za-z0-9]+$" in body
 def test_paste_buffer_branch_never_submits():
    """D-7 (ISSUE-1): paste-buffer arm must not submit or invoke prompt/run."""
    content = open(_LIB_SH, encoding="utf-8").read()
    start = content.find("  paste-buffer)")
    assert start != -1
    end = content.find("\n  delete-buffer)", start)
    assert end != -1
    body = content[start:end]
    for token in ("Enter", "C-m", "pane run", "agent prompt"):
        assert token not in body, token
 def test_fullscreen_modal_is_rejected_not_accepted():
    """D-3: fullscreen modal is dismissed with Escape, never Enter."""
    script = f"""
 _pane_capture() {{ printf '%s' '{_FULLSCREEN_MODAL}'; }}
 KEYS=/tmp/mam-fs-modal-keys.$$
 : > "$KEYS"
 _sks_herdr() {{
  if [ "${{1:-}}" = "send-keys" ]; then echo "$*" >> "$KEYS"; fi
  return 0
 }}
 handle_startup_dialogs dummy 1
 echo "KEYS_CONTENT=$(tr '\\n' '|' < "$KEYS")"
 rm -f "$KEYS"
 """
    res = _run_lib_helpers(script)
    assert res.returncode == 0, res.stderr + res.stdout
    keys = res.stdout.split("KEYS_CONTENT=")[-1]
    assert "Escape" in keys
    assert "Enter" not in keys
 def test_prose_yes_try_it_is_not_a_dialog():
    """N-1 / F-1: conversational 'Yes, try it' must not trip _pane_dialog_open."""
    script = r"""
 _pane_capture() { printf '%s' 'Sure — if the build fails again, Yes, try it with the --clean flag.'; }
 if _pane_dialog_open dummy; then echo "DIALOG_OPEN"; else echo "DIALOG_CLOSED"; fi
 """
    res = _run_lib_helpers(script)
    assert res.returncode == 0, res.stderr + res.stdout
    assert "DIALOG_CLOSED" in res.stdout
 def test_mam_dialog_tokens_exclude_yes_try_it():
    """N-1 / F-1: token list must not contain Yes, try it; Escape branch stays."""
    content = open(_LIB_SH, encoding="utf-8").read()
    modal_line = next(l for l in content.splitlines() if l.startswith("_MAM_MODAL_TOKENS="))
    hint_line = next(l for l in content.splitlines() if l.startswith("_MAM_HINT_TOKENS="))
    assert "Yes, try it" not in modal_line
    assert "Yes, try it" not in hint_line
    assert "grep -q 'Yes, try it'" in content
 def test_wait_for_tui_ready_succeeds_on_fullscreen_tip():
    """D-2c: tip + ready banner must not deadlock wait_for_tui_ready."""
    script = f"""
 _pane_capture() {{ printf '%s' '{_FULLSCREEN_TIP}'; }}
 _sks_herdr() {{
  if [ "${{1:-}}" = "capture-pane" ]; then printf '%s' '{_FULLSCREEN_TIP}'; return 0; fi
  if [ "${{1:-}}" = "send-keys" ]; then echo "KEY:$*" >&2; return 0; fi
  return 0
 }}
 sleep() {{ :; }}
 export MAM_READY_TOKENS='Claude Code|Welcome'
 wait_for_tui_ready dummy-sess claude
 """
    res = _run_lib_helpers(script)
    assert res.returncode == 0, res.stderr + res.stdout
    assert "TUI detected ready" in res.stdout
    assert "KEY:" not in res.stderr
 def test_bug4_no_duplicate_input_on_rpc_success(tmp_path):
    """Verify Bug 4: when herdr agent prompt succeeds, send_keys_safe returns 0 without calling paste-buffer."""
    test_script = f"""#!/usr/bin/env bash
@@ -0,0 +1,620 @@
 # test_c1_tui_readiness.py — Unit and integration tests for TUI readiness,
 # 2-tier readiness model, modal/hint token separation, and session diagnostics/preservation.
 import os, subprocess, time, json
 from pathlib import Path
 import pytest
 _LIB_SH = str(Path(__file__).resolve().parent.parent / ".agents" / "skills" / "lib.sh")
 _CREATE_SH = str(Path(__file__).resolve().parent.parent / ".agents" / "skills" / "multi-agent-mux-create" / "scripts" / "create_session.sh")
 def _run_lib_helpers(script_body, env_extra=None):
    import tempfile, shutil
    tmp_dir = tempfile.mkdtemp(prefix="test_tui_ready_")
    try:
        env = dict(os.environ)
        if env_extra:
            env.update(env_extra)
        env["WORKSPACE_ROOT"] = tmp_dir
        wrapper = f"""
 set -euo pipefail
 cd "{tmp_dir}"
 source "{_LIB_SH}"
 _init_herdr_isolation() {{ :; }}
 {script_body}
 """
        return subprocess.run(["bash", "-c", wrapper], capture_output=True, text=True, env=env, cwd=tmp_dir)
    finally:
        shutil.rmtree(tmp_dir, ignore_errors=True)
 def _lib_helper_src():
    content = open(_LIB_SH, encoding="utf-8").read()
    start = content.find("_herdr_ws_id_file() {")
    end = content.find('cmd="${1:-}"', start)
    assert start != -1 and end != -1
    return content[start:end]
 def test_c1_hint_tokens_only_dialog_closed():
    """C-1: Hint tokens (Use arrow keys / Esc to cancel / Press Enter) alone must return dialog CLOSED."""
    screen = """Select an option:
  1. Option A
  2. Option B
 Use arrow keys to navigate · Esc to cancel
 """
    script = f"""
 _pane_capture() {{ printf '%s' '{screen}'; }}
 if _pane_dialog_open dummy; then echo "DIALOG_OPEN"; else echo "DIALOG_CLOSED"; fi
 """
    res = _run_lib_helpers(script)
    assert res.returncode == 0, res.stderr + res.stdout
    assert "DIALOG_CLOSED" in res.stdout
 def test_c1b_hint_press_enter_sends_enter():
    """C-1b (B-3): 'Press Enter to continue' alone must return dialog CLOSED, and wait_for_tui_ready must send Enter exactly once per iteration (30 total across 30 iterations, not 60)."""
    screen = """Some startup banner
 Press Enter to continue
 """
    script = f"""
 _pane_capture() {{ printf '%s' '{screen}'; }}
 KEYS=/tmp/mam-press-enter-keys.$$
 : > "$KEYS"
 _sks_herdr() {{
  if [ "${{1:-}}" = "send-keys" ]; then echo "$*" >> "$KEYS"; fi
  return 0
 }}
 sleep() {{ :; }}
 if _pane_dialog_open dummy; then echo "DIALOG_OPEN"; else echo "DIALOG_CLOSED"; fi
 export MAM_STRONG_READY_TOKENS='NonExistentStrong'
 export MAM_WEAK_READY_TOKENS=''
 export MAM_INPUT_PLACEHOLDER=''
 rc=0
 wait_for_tui_ready dummy-sess custom || rc=$?
 echo "RC=$rc"
 echo "KEYS_COUNT=$(grep -c "send-keys -t dummy-sess Enter" "$KEYS" || echo 0)"
 rm -f "$KEYS"
 """
    res = _run_lib_helpers(script)
    assert res.returncode == 0, res.stderr + res.stdout
    assert "DIALOG_CLOSED" in res.stdout
    assert "KEYS_COUNT=30" in res.stdout
 def test_c1c_transition_to_upsell_modal_sends_escape_not_enter():
    """C-1c: Screen transition from Press Enter to Upsell Modal (Yes, try it) sends Escape, not duplicate Enter."""
    state_file = f"/tmp/mam-screen-state.{os.getpid()}"
    script = f"""
 echo "1" > "{state_file}"
 _pane_capture() {{
  local s
  s=$(cat "{state_file}" 2>/dev/null || echo 1)
  if [ "$s" = "1" ]; then
    printf 'Some banner\\nPress Enter to continue\\n'
  else
    printf 'Claude Code\\nYes, try it\\n'
  fi
 }}
 KEYS=/tmp/mam-transition-keys.{os.getpid()}
 : > "$KEYS"
 _sks_herdr() {{
  if [ "${{1:-}}" = "send-keys" ]; then
    echo "$*" >> "$KEYS"
    # Transition to screen 2 on first Enter
    if [ "${{4:-}}" = "Enter" ]; then
      echo "2" > "{state_file}"
    fi
  fi
  return 0
 }}
 sleep() {{ :; }}
 export MAM_STRONG_READY_TOKENS='AnthropicReady'
 export MAM_WEAK_READY_TOKENS=''
 export MAM_INPUT_PLACEHOLDER=''
 export MAM_TUI_TIMEOUT=2
 rc=0
 wait_for_tui_ready dummy-sess claude 2 || rc=$?
 echo "RC=$rc"
 echo "KEYS_CONTENT=$(tr '\\n' '|' < "$KEYS")"
 rm -f "$KEYS" "{state_file}"
 """
    res = _run_lib_helpers(script)
    assert res.returncode == 0, res.stderr + res.stdout
    assert "send-keys -t dummy-sess Enter" in res.stdout
    assert "send-keys -t dummy-sess Escape" in res.stdout
    assert "send-keys -t dummy-sess Enter|send-keys -t dummy-sess Escape|" in res.stdout
 def test_c2_modal_tokens_dialog_open():
    """C-2: High-confidence modal tokens (e.g. Do you trust the files) must return dialog OPEN."""
    screen = """Security Alert
 Do you trust the files in this repository?
 """
    script = f"""
 _pane_capture() {{ printf '%s' '{screen}'; }}
 if _pane_dialog_open dummy; then echo "DIALOG_OPEN"; else echo "DIALOG_CLOSED"; fi
 """
    res = _run_lib_helpers(script)
    assert res.returncode == 0, res.stderr + res.stdout
    assert "DIALOG_OPEN" in res.stdout
 def test_c3_strong_token_and_hint_token_readiness_succeeds():
    """C-3: Strong ready token + hint token together must detect readiness immediately (rc 0)."""
    screen = """MockApp v1.0.0
 Use arrow keys to select a tool
 ❯
 """
    script = f"""
 mock_py() {{
  if [ "$1" = "-m" ] && [ "$2" = "lib_py.agents" ] && [ "$3" = "facts" ]; then
    echo "MAM_AGENT_NAME='mocktiered'"
    echo "MAM_OWN_KEY='mock_id_own'"
    echo "MAM_INPUT_PROMPT='❯'"
    echo "MAM_INPUT_PLACEHOLDER=''"
    echo "MAM_INPUT_RULE_PATTERN=''"
    echo "MAM_READY_TOKENS='MockApp|Use arrow keys|Ready'"
    echo "MAM_STRONG_READY_TOKENS='MockApp'"
    echo "MAM_WEAK_READY_TOKENS='Use arrow keys'"
    echo "MAM_MODAL_TOKENS=''"
    echo "MAM_EXIT_KEY='/exit'"
    echo "MAM_DELEGATE_AGENT_KEY='mock-agent'"
    return 0
  fi
 }}
 _delegate_py_bin() {{ echo "mock_py"; }}
 _pane_capture() {{ printf '%s' '{screen}'; }}
 sleep() {{ :; }}
 wait_for_tui_ready dummy-sess mocktiered
 """
    res = _run_lib_helpers(script)
    assert res.returncode == 0, res.stderr + res.stdout
    assert "TUI detected ready" in res.stdout
 def test_c4_placeholder_only_readiness_succeeds():
    """C-4: Long placeholder (Ask anything..., len>=8) alone satisfies S-tier readiness."""
    screen = """Welcome to the AI Assistant
 Ask anything...
 """
    script = f"""
 _pane_capture() {{ printf '%s' '{screen}'; }}
 sleep() {{ :; }}
 # Override ready tokens so strong tokens do not match
 export MAM_STRONG_READY_TOKENS='NonExistentStrongToken'
 export MAM_WEAK_READY_TOKENS=''
 export MAM_INPUT_PLACEHOLDER='Ask anything...'
 wait_for_tui_ready dummy-sess custom
 """
    res = _run_lib_helpers(script)
    assert res.returncode == 0, res.stderr + res.stdout
    assert "TUI detected ready" in res.stdout
 def test_c4b_box_modal_does_not_succeed():
    """C-4b: Box modal frame (────── + solo ❯) with no strong token or placeholder must NOT satisfy readiness."""
    screen = """┌───────────────────────────────────┐
 │ Please select authentication mode │
 │ ───────────────────────────────── │
 │ 1. API Key                        │
 │ 2. OAuth                          │
 └───────────────────────────────────┘
 ❯
 """
    script = f"""
 _pane_capture() {{ printf '%s' '{screen}'; }}
 sleep() {{ :; }}
 export MAM_STRONG_READY_TOKENS='NonExistentStrongToken'
 export MAM_WEAK_READY_TOKENS='Chat|history'
 export MAM_INPUT_PLACEHOLDER='Ask anything...'
 export MAM_INPUT_PROMPT='❯'
 export MAM_INPUT_RULE_PATTERN='─{{10,}}'
 _MAM_MODAL_TOKENS='NON_MATCHING_MODAL'
 rc=0
 wait_for_tui_ready dummy-sess custom || rc=$?
 echo "RC=$rc"
 """
    res = _run_lib_helpers(script)
    assert res.returncode == 0, res.stderr + res.stdout
    assert "RC=1" in res.stdout
 def test_c4c_prompt_and_rule_corroboration_alone_cannot_satisfy_readiness():
    """C-4c: Neither prompt alone, rule alone, nor prompt+rule alone can satisfy readiness (C-tier cannot promote alone)."""
    screen = """────────────────────────────
 ❯
 """
    script = f"""
 _pane_capture() {{ printf '%s' '{screen}'; }}
 sleep() {{ :; }}
 export MAM_STRONG_READY_TOKENS='NonExistentToken'
 export MAM_WEAK_READY_TOKENS='NonExistentWeak'
 export MAM_INPUT_PLACEHOLDER='NonExistentPlaceholder'
 export MAM_INPUT_PROMPT='❯'
 export MAM_INPUT_RULE_PATTERN='─{{10,}}'
 rc=0
 wait_for_tui_ready dummy-sess custom || rc=$?
 echo "RC=$rc"
 """
    res = _run_lib_helpers(script)
    assert res.returncode == 0, res.stderr + res.stdout
    assert "RC=1" in res.stdout
 def test_c4d_weak_token_requires_corroboration():
    """C-4d: Weak token (Chat) alone fails; Weak token + prompt in last 5 lines succeeds."""
    # 1. Weak token alone without prompt in last 5 lines
    screen_weak_alone = """Chat history from earlier session:
 line 1
 line 2
 line 3
 line 4
 line 5
 line 6
 """
    script1 = f"""
 _pane_capture() {{ printf '%s' '{screen_weak_alone}'; }}
 sleep() {{ :; }}
 export MAM_STRONG_READY_TOKENS='NonExistentStrong'
 export MAM_WEAK_READY_TOKENS='Chat|history'
 export MAM_INPUT_PLACEHOLDER=''
 export MAM_INPUT_PROMPT='❯'
 export MAM_INPUT_RULE_PATTERN=''
 rc=0
 wait_for_tui_ready dummy-sess custom || rc=$?
 echo "RC=$rc"
 """
    res1 = _run_lib_helpers(script1)
    assert res1.returncode == 0, res1.stderr + res1.stdout
    assert "RC=1" in res1.stdout
    # 2. Weak token + prompt in last 5 lines
    screen_weak_corroborated = """Chat Session Active
 Ready for input
 ❯
 """
    script2 = f"""
 _pane_capture() {{ printf '%s' '{screen_weak_corroborated}'; }}
 sleep() {{ :; }}
 export MAM_STRONG_READY_TOKENS='NonExistentStrong'
 export MAM_WEAK_READY_TOKENS='Chat|history'
 export MAM_INPUT_PLACEHOLDER=''
 export MAM_INPUT_PROMPT='❯'
 export MAM_INPUT_RULE_PATTERN=''
 rc=0
 wait_for_tui_ready dummy-sess custom || rc=$?
 echo "RC=$rc"
 """
    res2 = _run_lib_helpers(script2)
    assert res2.returncode == 0, res2.stderr + res2.stdout
    assert "RC=0" in res2.stdout
 def test_c4e_short_placeholder_not_promoted_to_strong():
    """C-4e: Placeholder with length < 8 chars must NOT be promoted to strong S-tier."""
    screen = """Ask
 """
    script = f"""
 _pane_capture() {{ printf '%s' '{screen}'; }}
 sleep() {{ :; }}
 export MAM_STRONG_READY_TOKENS='NonExistentStrong'
 export MAM_WEAK_READY_TOKENS=''
 export MAM_INPUT_PLACEHOLDER='Ask'
 rc=0
 wait_for_tui_ready dummy-sess custom || rc=$?
 echo "RC=$rc"
 """
    res = _run_lib_helpers(script)
    assert res.returncode == 0, res.stderr + res.stdout
    assert "RC=1" in res.stdout
 def test_c5_hermes_fallback_to_strong_only():
    """C-5: When input_* are all empty (Hermes), strong_ready_tokens alone satisfies readiness."""
    screen = """Hermes Agent v1.0
 System initialized.
 """
    script = f"""
 _pane_capture() {{ printf '%s' '{screen}'; }}
 sleep() {{ :; }}
 wait_for_tui_ready dummy-sess hermes
 """
    res = _run_lib_helpers(script)
    assert res.returncode == 0, res.stderr + res.stdout
    assert "TUI detected ready" in res.stdout
 def test_c6_consecutive_empty_captures_unobservable_rc2():
    """C-6: Consecutive empty captures give up as unobservable/headless (rc 2) without burning 30s."""
    script = """
 _pane_capture() { echo ""; }
 sleep() { :; }
 export MAM_READY_EMPTY_GIVEUP=3
 rc=0
 wait_for_tui_ready dummy-sess claude || rc=$?
 echo "RC=$rc"
 """
    res = _run_lib_helpers(script)
    assert res.returncode == 0, res.stderr + res.stdout
    assert "RC=2" in res.stdout
    assert "unobservable/headless pane" in res.stderr
 def test_c7_readiness_checks_decoded_text_not_raw_json():
    """C-7: Raw JSON field names (e.g. Chat in JSON envelope) do not cause false positives."""
    raw_json = json.dumps({"result": {"read": {"text": "Just raw text with no ready tokens", "Chat": 1}}})
    script = f"""
 _sks_herdr() {{
  if [ "${{1:-}}" = "capture-pane" ]; then
    printf '%s' '{raw_json}'
  fi
  return 0
 }}
 sleep() {{ :; }}
 export MAM_STRONG_READY_TOKENS='NonExistentStrong'
 export MAM_WEAK_READY_TOKENS='Chat'
 export MAM_INPUT_PLACEHOLDER=''
 export MAM_INPUT_PROMPT='❯'
 export MAM_INPUT_RULE_PATTERN=''
 rc=0
 wait_for_tui_ready dummy-sess custom || rc=$?
 echo "RC=$rc"
 """
    res = _run_lib_helpers(script)
    assert res.returncode == 0, res.stderr + res.stdout
    assert "RC=1" in res.stdout
 def test_c8_mam_dialog_tokens_is_union_of_modal_and_hint():
    """C-8: _MAM_DIALOG_TOKENS must remain the union of _MAM_MODAL_TOKENS and _MAM_HINT_TOKENS."""
    script = """
 echo "MODAL=$_MAM_MODAL_TOKENS"
 echo "HINT=$_MAM_HINT_TOKENS"
 echo "DIALOG=$_MAM_DIALOG_TOKENS"
 """
    res = _run_lib_helpers(script)
    assert res.returncode == 0, res.stderr + res.stdout
    lines = dict(line.split("=", 1) for line in res.stdout.strip().splitlines())
    expected_dialog = f"{lines['MODAL']}|{lines['HINT']}"
    assert lines["DIALOG"] == expected_dialog
 def test_c8b_agent_modal_tokens_merged_into_dialog_open():
    """C-8b (T-2d / F-8): Per-agent modal_tokens from adapter are merged into _pane_dialog_open and block send_keys_safe."""
    # 1. Direct _pane_dialog_open test
    screen = """Try the new fullscreen renderer?
 """
    script1 = f"""
 _pane_capture() {{ printf '%s' '{screen}'; }}
 export MAM_MODAL_TOKENS='Try the new fullscreen renderer\\?'
 if _pane_dialog_open dummy; then echo "DIALOG_OPEN"; else echo "DIALOG_CLOSED"; fi
 """
    res1 = _run_lib_helpers(script1)
    assert res1.returncode == 0, res1.stderr + res1.stdout
    assert "DIALOG_OPEN" in res1.stdout
    # 2. Dynamic facts resolution via send_keys_safe on claude session
    script2 = f"""
 _pane_quiescent() {{ return 0; }}
 _pane_capture() {{ printf '%s' 'Try the new fullscreen renderer? (y/n)'; }}
 _sks_herdr() {{ return 0; }}
 rc=0
 SKS_DIALOG_TIMEOUT=1 send_keys_safe "my-project-worker-claude-01" "some text" || rc=$?
 echo "RC=$rc"
 """
    res2 = _run_lib_helpers(script2)
    assert res2.returncode == 0, res2.stderr + res2.stdout
    assert "RC=2" in res2.stdout, f"Expected dialog blocking (RC=2) for claude modal: {res2.stdout}"
 def test_c9_create_session_timeout_alive_pid_preserves_session(mam_sandbox, mock_herdr, mock_agents):
    """C-9 & C-11: create_session with readiness timeout + alive PID preserves session with timeout status (exit 0) and dumps diagnostic."""
    script_path = mam_sandbox / ".agents" / "skills" / "multi-agent-mux-create" / "scripts" / "create_session.sh"
    lib_path = mam_sandbox / ".agents" / "skills" / "lib.sh"
    diag_dir = mam_sandbox / ".mam" / "diagnostics"
    yaml_file = mam_sandbox / ".mam" / "agent-sessions.yaml"
    # Make wait_for_tui_ready immediately return 1 in sandboxed lib.sh
    lib_content = lib_path.read_text()
    lib_path.write_text(lib_content.replace("wait_for_tui_ready() {", "wait_for_tui_ready() { return 1; #"))
    # In sandbox create_session.sh, simulate alive process using $$
    create_content = script_path.read_text()
    script_path.write_text(create_content.replace(
        'PANE_PID_CHECK=$(_herdr list-panes',
        'PANE_PID_CHECK=$$ # $(_herdr list-panes'
    ))
    cmd = [
        "bash", str(script_path),
        "--workspace", str(mam_sandbox),
        "--agent", "claude",
        "--role", "creator",
        "--session", "test-timeout-sess",
        "--onboard"
    ]
    res = subprocess.run(cmd, capture_output=True, text=True, cwd=str(mam_sandbox))
    assert res.returncode == 0, res.stderr + res.stdout
    assert "WARNING: agent TUI never became ready within timeout, but process" in res.stderr
    # Check diagnostic dump file created (C-11)
    dump_files = list(diag_dir.glob("test-timeout-sess-*.txt"))
    assert len(dump_files) == 1
    dump_content = dump_files[0].read_text()
    assert "ReturnCode: 1" in dump_content
    # Check YAML registration with tui-ready-timeout and NO delegate job (N-C)
    assert yaml_file.exists()
    yaml_content = yaml_file.read_text()
    assert "tui-ready-timeout" in yaml_content
    assert "delegate_job_id: null" in yaml_content or "delegate_job_id: None" in yaml_content or "delegate_job_id:" not in yaml_content or "delegate_job_id: ''" in yaml_content
 def test_c10_create_session_timeout_dead_pid_kills_session(mam_sandbox, mock_herdr, mock_agents):
    """C-10: create_session with readiness timeout + dead PID triggers rollback kill and exits with code 42."""
    script_path = mam_sandbox / ".agents" / "skills" / "multi-agent-mux-create" / "scripts" / "create_session.sh"
    lib_path = mam_sandbox / ".agents" / "skills" / "lib.sh"
    diag_dir = mam_sandbox / ".mam" / "diagnostics"
    # Make wait_for_tui_ready return 1 and mock list-panes to return dead PID
    lib_content = lib_path.read_text()
    create_content = script_path.read_text()
    script_path.write_text(create_content.replace(
        'PANE_PID_CHECK=$(_herdr list-panes',
        'PANE_PID_CHECK=99999999 # $(_herdr list-panes'
    ))
    lib_path.write_text(lib_content.replace("wait_for_tui_ready() {", "wait_for_tui_ready() { return 1; #"))
    cmd = [
        "bash", str(script_path),
        "--workspace", str(mam_sandbox),
        "--agent", "claude",
        "--role", "creator",
        "--session", "test-dead-sess"
    ]
    res = subprocess.run(cmd, capture_output=True, text=True, cwd=str(mam_sandbox))
    assert res.returncode == 42, res.stderr + res.stdout
    assert "ERROR: agent TUI never became ready" in res.stderr
    # Check diagnostic dump file created
    dump_files = list(diag_dir.glob("test-dead-sess-*.txt"))
    assert len(dump_files) == 1
    assert "ReturnCode: 1" in dump_files[0].read_text()
 def test_adapter_strong_weak_partition():
    """N-D: Verify strong_ready_tokens and weak_ready_tokens partition ready_tokens for all adapters."""
    from lib_py.agents.registry import get_adapter
    for agent in ('claude', 'agy', 'hermes', 'grok'):
        adapter = get_adapter(agent)
        assert adapter is not None
        ready_set = set(t for t in adapter.ready_tokens.split('|') if t)
        strong_set = set(t for t in adapter.strong_ready_tokens.split('|') if t)
        weak_set = set(t for t in adapter.weak_ready_tokens.split('|') if t)
        assert strong_set | weak_set == ready_set, f"Mismatch in {agent}: {strong_set} | {weak_set} != {ready_set}"
        assert strong_set.isdisjoint(weak_set), f"Overlap in {agent}: {strong_set & weak_set}"
 def test_sks_agent_suffix_resolution_not_substring():
    """Verify send_keys_safe resolves agent by strict suffix without substring false positives."""
    script = """
 _pane_quiescent() { return 0; }
 _pane_capture() { echo "prompt > "; }
 _sks_herdr() { return 0; }
 RESOLVED=""
 mock_py() {
  if [ "$1" = "-m" ] && [ "$2" = "lib_py.agents" ] && [ "$3" = "facts" ]; then
    echo "echo RESOLVED_AGENT=$4"
  fi
 }
 _delegate_py_bin() { echo "mock_py"; }
 check_sks() {
  local sess="$1"
  unset MAM_MODAL_TOKENS
  # Call send_keys_safe and capture output
  send_keys_safe "$sess" "hello" 2>&1 || true
 }
 echo "3: $(check_sks 'reviewer-creator-grok-01')"
 echo "4: $(check_sks 'planner-reviewer-claude-01')"
 echo "5: $(check_sks 'test-worker-hermes-02')"
 echo "6: $(check_sks 'workspace-creator-agy-05')"
 echo "7: $(check_sks 'claude')"
 echo "9: $(check_sks 'grok-02')"
 """
    res = _run_lib_helpers(script)
    assert res.returncode == 0, res.stderr + res.stdout
    assert "3: RESOLVED_AGENT=grok" in res.stdout
    assert "4: RESOLVED_AGENT=claude" in res.stdout
    assert "5: RESOLVED_AGENT=hermes" in res.stdout
    assert "6: RESOLVED_AGENT=agy" in res.stdout
    assert "7: RESOLVED_AGENT=claude" in res.stdout
    assert "9: RESOLVED_AGENT=grok" in res.stdout
 def test_f2_upsell_modal_defense_with_real_facts_and_banner():
    """F-2/F-6: Real Claude Code banner with upsell modal must trigger modal defense, not return ready."""
    script = """
 SENT_KEYS=""
 _sks_herdr() {
  if [ "$1" = "send-keys" ]; then
    SENT_KEYS="$SENT_KEYS $*"
  fi
  return 0
 }
 COUNT_FILE=$(mktemp)
 echo "0" > "$COUNT_FILE"
 _pane_capture() {
  local c
  c=$(cat "$COUNT_FILE")
  c=$((c + 1))
  echo "$c" > "$COUNT_FILE"
  if [ "$c" -le 2 ]; then
    # First 2 captures (loop iter 1 capture + tail check): Claude Code banner with Fullscreen Modal
    cat << 'EOF'
 Claude Code (Sonnet 3.5)
 Try the new fullscreen renderer?
 Flicker-free output
 Selected text auto-copies to your clipboard
 Yes, try it
 EOF
  else
    # Subsequent captures (after Escape sent): modal dismissed, normal prompt
    cat << 'EOF'
 Claude Code (Sonnet 3.5)
 ❯
 EOF
  fi
 }
 rc=0
 wait_for_tui_ready "my-claude-sess" "claude" || rc=$?
 rm -f "$COUNT_FILE"
 echo "RC=$rc"
 echo "KEYS=$SENT_KEYS"
 """
    res = _run_lib_helpers(script)
    assert res.returncode == 0, res.stderr + res.stdout
    assert "Escape" in res.stdout, f"Expected Escape to be sent for upsell modal: {res.stdout}"
    assert "RC=0" in res.stdout
 def test_r1_resolve_pane_id_fail_closed_on_multiple_same_kind_panes():
    """R-1: If fallback finds multiple panes of same agent kind, fail closed (exit 1)."""
    helper = _lib_helper_src()
    script = helper + """
 # Mock real herdr pane list returning 2 claude panes
 _real_herdr() {
  cat << 'EOF'
 {"result": {"panes": [
  {"pane_id": "w1:p1", "label": "unrelated-1", "agent": "claude"},
  {"pane_id": "w1:p2", "label": "unrelated-2", "agent": "claude"}
 ]}}
 EOF
 }
 # Create a dummy yaml with unknown session mapped to claude cmd
 mkdir -p .mam
 cat << 'EOF' > .mam/agent-sessions.yaml
 herdr_sessions:
  - name: my-unmatched-session
    pane:
      cmd: claude
 EOF
 rc=0
 pid=$(_resolve_herdr_pane_id "my-unmatched-session") || rc=$?
 echo "RC=$rc|PID=$pid"
 """
    res = _run_lib_helpers(script)
    assert res.returncode == 0, res.stderr + res.stdout
    assert "RC=1|PID=" in res.stdout, f"Expected fail-closed RC=1 and empty PID: {res.stdout}"
@@ -1,6 +1,7 @@
 import os
 import sys
 import json
 import re
 import subprocess
 import pytest
 import shutil
@@ -125,3 +126,358 @@ for p in procs:
    # Verify all 10 agents created without state overwrite loss
    assert len(final_state.get("agents", {})) == 10
 def _load_mock_state(mock_herdr):
    with open(mock_herdr, "r") as f:
        return json.load(f)
 def _write_mock_state(mock_herdr, state):
    with open(mock_herdr, "w") as f:
        json.dump(state, f, indent=2)
 def _run_lib(tmp_path, body):
    lib_path = tmp_path / ".agents" / "skills" / "lib.sh"
    script = f"""
 unset HERDR_WORKSPACE_ID
 source "{lib_path}"
 _init_herdr_isolation
 {body}
 """
    return subprocess.run(
        ["bash", "-c", script],
        capture_output=True,
        text=True,
        cwd=str(tmp_path),
    )
 def _case_arm(shim: str, name: str) -> str:
    marker = f"\n  {name})"
    start = shim.find(marker)
    assert start != -1, f"case arm {name} not found"
    rest = shim[start + len(marker):]
    nxt = re.search(r"\n  [A-Za-z][A-Za-z0-9-]*\)", rest)
    end = start + len(marker) + nxt.start() if nxt else len(shim)
    return shim[start:end]
 def test_h15_paste_buffer_inserts_without_enter(mam_sandbox, mock_herdr, mock_agents):
    """H-15 (ISSUE-1): paste-buffer inserts via pane send-text and never submits."""
    tmp_path = mam_sandbox
    res = _run_lib(
        tmp_path,
        f'herdr new-session -d -s "test-creator-claude" -c "{tmp_path}" "claude --dangerously-skip-permissions"',
    )
    assert res.returncode == 0, f"Stderr: {res.stderr}\nStdout: {res.stdout}"
    state = _load_mock_state(mock_herdr)
    agents = state.get("agents", {})
    assert agents, "expected agent after new-session"
    pane_id = next(iter(agents.values()))["pane_id"]
    n_calls = len(state.get("calls", []))
    res = _run_lib(
        tmp_path,
        """
 herdr set-buffer -b t1 "hello world"
 herdr paste-buffer -b t1 -t test-creator-claude
 """,
    )
    assert res.returncode == 0, f"Stderr: {res.stderr}\nStdout: {res.stdout}"
    new_calls = _load_mock_state(mock_herdr).get("calls", [])[n_calls:]
    send_text = [c for c in new_calls if len(c) >= 2 and c[0] == "pane" and c[1] == "send-text"]
    assert send_text == [["pane", "send-text", pane_id, "hello world"]], new_calls
    assert not any(len(c) >= 2 and c[0] == "agent" and c[1] == "send" for c in new_calls)
    submit = [
        c for c in new_calls
        if len(c) >= 2 and (
            (c[0] == "pane" and c[1] == "send-keys")
            or (c[0] == "agent" and c[1] == "prompt")
            or (c[0] == "pane" and c[1] == "run")
        )
    ]
    assert submit == [], new_calls
 def test_h16_send_keys_safe_submits_exactly_once(mam_sandbox, mock_herdr, mock_agents):
    """H-16 (ISSUE-1): fallback paste path submits Enter/C-m exactly once."""
    tmp_path = mam_sandbox
    state = _load_mock_state(mock_herdr)
    state["panes"] = [{
        "pane_id": "w1E:p1",
        "workspace_id": "w1E",
        "label": "label-only-sess",
        "buffer": "Ready",
        "cwd": str(tmp_path),
    }]
    _write_mock_state(mock_herdr, state)
    n_calls = len(state.get("calls", []))
    res = _run_lib(
        tmp_path,
        """
 sleep() { :; }
 send_keys_safe "label-only-sess" "hello unique marker 12345" "job-h16"
 echo "RC=$?"
 """,
    )
    assert res.returncode == 0, f"Stderr: {res.stderr}\nStdout: {res.stdout}"
    assert "RC=0" in res.stdout, res.stdout + res.stderr
    new_calls = _load_mock_state(mock_herdr).get("calls", [])[n_calls:]
    enters = [
        c for c in new_calls
        if any(tok in ("Enter", "C-m") for tok in c)
        and not (len(c) >= 2 and c[0] == "pane" and c[1] == "send-text")
    ]
    assert len(enters) == 1, new_calls
    assert any(len(c) >= 2 and c[0] == "pane" and c[1] == "send-text" for c in new_calls)
 def test_h17_no_substring_cross_pane_routing(mam_sandbox, mock_herdr, mock_agents):
    """H-17 (ISSUE-2): session names must not substring-match agent CLI kinds."""
    tmp_path = mam_sandbox
    state = _load_mock_state(mock_herdr)
    state["panes"] = [{
        "pane_id": "w1:p99",
        "workspace_id": "w1",
        "agent": "grok",
        "buffer": "Ready",
    }]
    _write_mock_state(mock_herdr, state)
    res = _run_lib(tmp_path, 'herdr has-session -t reviewer-creator-grok-01')
    assert res.returncode == 1, f"substring match leaked into has-session: {res.stderr}"
    res = _run_lib(
        tmp_path,
        f"""
 herdr new-session -d -s "reviewer-creator-grok-01" -c "{tmp_path}" "grok"
 herdr new-session -d -s "worker-grok-02" -c "{tmp_path}" "grok"
 """,
    )
    assert res.returncode == 0, f"Stderr: {res.stderr}\nStdout: {res.stdout}"
    state = _load_mock_state(mock_herdr)
    agents = state.get("agents", {})
    target_pane = None
    other_pane = None
    for name, data in agents.items():
        if "reviewer-creator-grok" in name:
            target_pane = data.get("pane_id")
        if "worker-grok" in name:
            other_pane = data.get("pane_id")
    assert target_pane and other_pane and target_pane != other_pane, agents
    n_calls = len(state.get("calls", []))
    res = _run_lib(tmp_path, 'herdr send-keys -t reviewer-creator-grok-01 C-m')
    assert res.returncode == 0, res.stderr
    new_calls = _load_mock_state(mock_herdr).get("calls", [])[n_calls:]
    sendkeys = [c for c in new_calls if len(c) >= 4 and c[0] == "pane" and c[1] == "send-keys"]
    assert any(c[2] == target_pane for c in sendkeys), new_calls
    assert not any(c[2] == other_pane for c in sendkeys), new_calls
 def test_h18_workspace_scoped_pane_resolution(mam_sandbox, mock_herdr, mock_agents):
    """H-18 (ISSUE-3): HERDR_WORKSPACE_ID scopes pane resolution; unset keeps global lookup."""
    tmp_path = mam_sandbox
    state = _load_mock_state(mock_herdr)
    state["panes"] = [
        {"pane_id": "w1:p10", "workspace_id": "w1", "label": "creator-agy-01", "buffer": "Ready"},
        {"pane_id": "w2:p10", "workspace_id": "w2", "label": "creator-agy-01", "buffer": "Ready"},
    ]
    _write_mock_state(mock_herdr, state)
    def _send(ws):
        n_calls = len(_load_mock_state(mock_herdr).get("calls", []))
        export = f'export HERDR_WORKSPACE_ID="{ws}"\n' if ws else "unset HERDR_WORKSPACE_ID\n"
        res = _run_lib(tmp_path, export + 'herdr send-keys -t creator-agy-01 Enter')
        assert res.returncode == 0, res.stderr
        calls = _load_mock_state(mock_herdr).get("calls", [])[n_calls:]
        return [c for c in calls if len(c) >= 4 and c[0] == "pane" and c[1] == "send-keys"]
    keyed_w2 = _send("w2")
    assert keyed_w2 and keyed_w2[0][2] == "w2:p10", keyed_w2
    keyed_w1 = _send("w1")
    assert keyed_w1 and keyed_w1[0][2] == "w1:p10", keyed_w1
    keyed_global = _send("")
    assert keyed_global, "unset HERDR_WORKSPACE_ID must still resolve a pane"
    assert keyed_global[0][2] in ("w1:p10", "w2:p10")
 def test_h19_single_resolver_helper_used_by_all_branches(mam_sandbox, mock_herdr):
    """H-19 (ISSUE-5): one helper definition; five shim branches call it."""
    tmp_path = mam_sandbox
    res = _run_lib(tmp_path, ":")
    assert res.returncode == 0, res.stderr
    shim_path = tmp_path / ".mam" / "shim" / "herdr"
    shim = shim_path.read_text()
    assert shim.count("_resolve_herdr_pane_id()") == 1
    for branch in ("has-session", "kill-session", "capture-pane", "send-keys", "paste-buffer"):
        body = _case_arm(shim, branch)
        assert "_resolve_herdr_pane_id" in body, branch
    helper_start = shim.find("_herdr_ws_id_file() {")
    helper_end = shim.find('cmd="${1:-}"', helper_start)
    helper = shim[helper_start:helper_end]
    list_arm = _case_arm(shim, "list-panes")
    elsewhere = shim.replace(helper, "", 1).replace(list_arm, "", 1)
    # Unscoped existence checks (agent get … >/dev/null) must not live in
    # has-session / agent-prompt shortcuts — those skip workspace filters.
    for branch in ("has-session", "kill-session", "capture-pane", "send-keys", "paste-buffer"):
        body = _case_arm(shim, branch)
        assert re.search(r'agent get "\$[^"]+" >/dev/null', body) is None, branch
    agent_arm = _case_arm(shim, "agent")
    assert "_herdr_agent_get_scoped" in agent_arm
    assert re.search(r'agent get "\$sat" >/dev/null', agent_arm) is None
    assert re.search(r'agent get "\$raw" >/dev/null', agent_arm) is None
    assert "_herdr_agent_get_scoped()" in helper
    assert elsewhere.count("_herdr_agent_get_scoped()") == 0
    n_shim = subprocess.run(["bash", "-n", str(shim_path)], capture_output=True, text=True)
    assert n_shim.returncode == 0, n_shim.stderr
    n_lib = subprocess.run(
        ["bash", "-n", str(Path(__file__).resolve().parent.parent / ".agents" / "skills" / "lib.sh")],
        capture_output=True,
        text=True,
    )
    assert n_lib.returncode == 0, n_lib.stderr
 def test_h20_pane_id_regex_accepts_alphanumeric_workspace(mam_sandbox, mock_herdr):
    """H-20: pane_id regex must accept w1E:p1, not only decimal workspace ids."""
    tmp_path = mam_sandbox
    res = _run_lib(tmp_path, ":")
    assert res.returncode == 0, res.stderr
    shim = (tmp_path / ".mam" / "shim" / "herdr").read_text()
    start = shim.find("_herdr_ws_id_file() {")
    end = shim.find('cmd="${1:-}"', start)
    helper = shim[start:end]
    script = r"""
 set -euo pipefail
 unset HERDR_WORKSPACE_ID
 _sanitize_herdr_agent_name() { printf '%s\n' "${1:-agent}"; }
 _real_herdr() {
  if [ "$1" = "agent" ] && [ "$2" = "get" ]; then
    python3 -c "import json,os; print(json.dumps({'result':{'agent':{'pane_id':os.environ.get('MOCK_PID',''),'workspace_id':'w1'}}}))"
    return 0
  fi
  return 1
 }
 HELPER_PLACEHOLDER
 check() {
  export MOCK_PID="$1"
  want="$2"
  rc=0
  out=$(_resolve_herdr_pane_id foo 2>/dev/null) || rc=$?
  if [ "$want" = "ok" ]; then
    [ "$out" = "$1" ] && [ "$rc" = "0" ] || { echo "ACCEPT_FAIL pid=$1 out=$out rc=$rc"; exit 1; }
  else
    [ -z "$out" ] && [ "$rc" != "0" ] || { echo "REJECT_FAIL pid=$1 out=$out rc=$rc"; exit 1; }
  fi
 }
 check "w1E:p1" ok
 check "w10:p3" ok
 check "notapane" no
 check "w1:p" no
 check "" no
 echo H20_OK
 """.replace("HELPER_PLACEHOLDER", helper)
    res = subprocess.run(["bash", "-c", script], capture_output=True, text=True)
    assert res.returncode == 0, res.stderr + res.stdout
    assert "H20_OK" in res.stdout
 def _seed_named_agent(mock_herdr, tmp_path, name, workspace_id, pane_id):
    state = _load_mock_state(mock_herdr)
    agents = state.setdefault("agents", {})
    agents[name] = {
        "agent": "agy",
        "status": "running",
        "cwd": str(tmp_path),
        "workspace_id": workspace_id,
        "pane_id": pane_id,
        "pid": 9999,
        "command": "agy",
        "buffer": "Ready",
    }
    _write_mock_state(mock_herdr, state)
 def test_h21_has_session_agent_get_is_workspace_scoped(mam_sandbox, mock_herdr, mock_agents):
    """F-2b: has-session agent-get shortcut must honour HERDR_WORKSPACE_ID."""
    tmp_path = mam_sandbox
    _seed_named_agent(mock_herdr, tmp_path, "creator-agy-01", "w1", "w1:p5")
    res = _run_lib(tmp_path, 'export HERDR_WORKSPACE_ID=w2\nherdr has-session -t creator-agy-01')
    assert res.returncode == 1, res.stderr + res.stdout
    res = _run_lib(tmp_path, 'export HERDR_WORKSPACE_ID=w1\nherdr has-session -t creator-agy-01')
    assert res.returncode == 0, res.stderr + res.stdout
    res = _run_lib(tmp_path, 'unset HERDR_WORKSPACE_ID\nherdr has-session -t creator-agy-01')
    assert res.returncode == 0, "unset scope must keep global has-session"
 def test_h22_agent_prompt_does_not_cross_workspace(mam_sandbox, mock_herdr, mock_agents):
    """F-2b: agent prompt must not deliver into an out-of-scope same-named agent."""
    tmp_path = mam_sandbox
    _seed_named_agent(mock_herdr, tmp_path, "creator-agy-01", "w1", "w1:p5")
    n_calls = len(_load_mock_state(mock_herdr).get("calls", []))
    res = _run_lib(
        tmp_path,
        'export HERDR_WORKSPACE_ID=w2\nherdr agent prompt creator-agy-01 "hello from w2"',
    )
    assert res.returncode != 0, res.stdout + res.stderr
    new_calls = _load_mock_state(mock_herdr).get("calls", [])[n_calls:]
    prompts = [c for c in new_calls if len(c) >= 2 and c[0] == "agent" and c[1] == "prompt"]
    assert prompts == [], new_calls
    n_calls = len(_load_mock_state(mock_herdr).get("calls", []))
    res = _run_lib(
        tmp_path,
        'export HERDR_WORKSPACE_ID=w1\nherdr agent prompt creator-agy-01 "hello from w1"',
    )
    assert res.returncode == 0, res.stderr + res.stdout
    new_calls = _load_mock_state(mock_herdr).get("calls", [])[n_calls:]
    prompts = [c for c in new_calls if len(c) >= 2 and c[0] == "agent" and c[1] == "prompt"]
    assert any("hello from w1" in c for c in prompts), new_calls
 def test_h23_persisted_workspace_id_scopes_without_env(mam_sandbox, mock_herdr, mock_agents):
    """F-2a: new-session persists ws id; later shim calls read it when env is unset."""
    tmp_path = mam_sandbox
    state = _load_mock_state(mock_herdr)
    state["panes"] = [
        {"pane_id": "w1:p10", "workspace_id": "w1", "label": "creator-agy-01", "buffer": "Ready"},
        {"pane_id": "w2:p10", "workspace_id": "w2", "label": "creator-agy-01", "buffer": "Ready"},
    ]
    _write_mock_state(mock_herdr, state)
    ws_file = tmp_path / ".mam" / "herdr_workspace_id"
    ws_file.parent.mkdir(parents=True, exist_ok=True)
    ws_file.write_text("w2\n")
    n_calls = len(_load_mock_state(mock_herdr).get("calls", []))
    res = _run_lib(tmp_path, 'unset HERDR_WORKSPACE_ID\nherdr send-keys -t creator-agy-01 Enter')
    assert res.returncode == 0, res.stderr
    keyed = [
        c for c in _load_mock_state(mock_herdr).get("calls", [])[n_calls:]
        if len(c) >= 4 and c[0] == "pane" and c[1] == "send-keys"
    ]
    assert keyed and keyed[0][2] == "w2:p10", keyed
    res = _run_lib(
        tmp_path,
        f'herdr new-session -d -s "persist-creator-claude" -c "{tmp_path}" "claude --dangerously-skip-permissions"',
    )
    assert res.returncode == 0, res.stderr + res.stdout
    persisted = ws_file.read_text().strip()
    assert persisted, "new-session must persist workspace id"
    assert persisted.startswith("w")
@@ -23,7 +23,17 @@ def run_lock_cmd(action, marker_path, env=None):
 def acquire_bg(marker_path, sleep_secs=10):
    cmd = f"source '{LOCK_SCRIPT}' && mam_acquire_loop_lock '{marker_path}' && sleep {sleep_secs}"
    proc = subprocess.Popen(["bash", "-c", cmd], stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True)
-    time.sleep(0.3)
+    for _ in range(40):
        time.sleep(0.05)
        if marker_path.is_file():
            try:
                content = marker_path.read_text()
                if f"pid={proc.pid}" in content:
                    break
            except Exception:
                pass
        if proc.poll() is not None:
            break
    return proc
@@ -13,7 +13,7 @@ ONBOARD_SH = REPO_ROOT / ".agents" / "skills" / "multi-agent-mux-orc-onboard" /
 RECONCILE_SH = REPO_ROOT / ".agents" / "skills" / "multi-agent-mux-monitor" / "scripts" / "reconcile.sh"
 SCRUBBED_ENV = dict(os.environ)
-for k in ["CLAUDE_CODE_SESSION_ID", "ANTIGRAVITY_CONVERSATION_ID", "HERMES_SESSION_ID", "CLINE_SESSION_ID", "MAM_ORCHESTRATOR_UUIDS"]:
+for k in ["CLAUDE_CODE_SESSION_ID", "ANTIGRAVITY_CONVERSATION_ID", "HERMES_SESSION_ID", "MAM_ORCHESTRATOR_UUIDS"]:
    SCRUBBED_ENV.pop(k, None)
 SCRUBBED_ENV["PYTHONPATH"] = f"{LIB_SH.parent}:{SCRUBBED_ENV.get('PYTHONPATH', '')}"
@@ -490,25 +490,10 @@ def test_o30_argv_precedes_env(mam_sandbox):
    assert env_uuid not in res_list.stdout
 # O-31: cline node launcher & non-UUID ID format (1785635248957_fajon)
 def test_o31_cline_node_launcher_id_format(mam_sandbox):
    cline_id = "1785635248957_fajon"
    env = {
        "AGENT_SESSIONS_YAML": str(mam_sandbox / ".mam" / "agent-sessions.yaml"),
        "HOME_DIR": str(mam_sandbox)
    }
    cmd = f"exec -a 'cline --id {cline_id}' bash '{ONBOARD_SH}'"
    res = subprocess.run(["bash", "-c", cmd], capture_output=True, text=True, env={**SCRUBBED_ENV, **env}, cwd=str(mam_sandbox))
    assert res.returncode == 0
    res_list = run_onboard(["--list"], env=env, cwd=str(mam_sandbox))
    assert cline_id in res_list.stdout
 # O-32: ID format strictness rejects invalid strings
 def test_o32_id_format_strictness(mam_sandbox):
    env = {"AGENT_SESSIONS_YAML": str(mam_sandbox / ".mam" / "agent-sessions.yaml"), "HOME_DIR": str(mam_sandbox)}
-    for bad in ["../../etc/passwd", "a b", "fajon", "1785635248957"]:
+    for bad in ["../../etc/passwd", "a b", "fajon", "1785635248957", "1785635248957_fajon"]:
        res = run_onboard(["--uuid", bad], env=env, cwd=str(mam_sandbox))
        assert res.returncode == 2
@@ -565,19 +550,6 @@ def test_o38_atomic_dump_yaml_initialization(mam_sandbox):
    assert orc_uuid in yaml_path.read_text()
 # O-39: cline agent family discovery exclusion in verify_session_uuid
 def test_o39_cline_orchestrator_exclusion(mam_sandbox):
    cline_id = "1785635248957_fajon"
    c_dir = mam_sandbox / ".cline" / "data" / "sessions" / cline_id
    c_dir.mkdir(parents=True, exist_ok=True)
    (c_dir / f"{cline_id}.json").write_text(json.dumps({"session_id": cline_id}))
    state = {"orchestrator_uuids": [cline_id], "herdr_sessions": []}
    env = dump_state(mam_sandbox, state)
    row = {"name": "subagent", "cline_conversation_id_own": None, "pane": {"cwd": str(mam_sandbox)}}
    assert not run_verify_uuid(str(mam_sandbox), "cline", cline_id, row=row, mode="discover", env=env)
 # O-40: Malformed orchestrator_uuids logs warning to stderr and degrades gracefully
 def test_o40_malformed_orchestrator_uuids_degrades_open(mam_sandbox):
    sub_uuid = "02222222-2222-2222-2222-222222222222"
@@ -960,18 +960,18 @@ def test_grok_shell_and_scripts_integration(mam_sandbox):
    lib_path = mam_sandbox / "skills" / "lib.sh"
    lib_content = lib_path.read_text()
    assert '*-creator-grok|*-planner-grok|*-reviewer-grok)      kind="grok"' in lib_content
-    assert "'claude', 'agy', 'hermes', 'cline', 'grok'" in lib_content
+    assert "'claude', 'agy', 'hermes', 'grok'" in lib_content
    assert '[[ "$sess" =~ "grok" ]]' in lib_content
    # 2. create_session.sh validation
    create_path = mam_sandbox / "skills" / "multi-agent-mux-create" / "scripts" / "create_session.sh"
    create_content = create_path.read_text()
-    assert 'claude|agy|hermes|cline|grok)' in create_content
+    assert 'claude|agy|hermes|grok)' in create_content
    # 3. stop_session.sh validation & state capture
    stop_path = mam_sandbox / "skills" / "multi-agent-mux-stop" / "scripts" / "stop_session.sh"
    stop_content = stop_path.read_text()
-    assert 'claude|agy|hermes|cline|grok)' in stop_content
+    assert 'claude|agy|hermes|grok)' in stop_content
    assert "target['grok_session_id_own'] = captured" in stop_content
    # 4. workspace_uuid OWN_KEY
@@ -140,7 +140,7 @@ def test_comp_create_usage_matches_parser(mam_sandbox, mock_herdr, mock_agents):
    assert res.returncode == 0
    assert "--herdr-session" in res.stdout
    assert "--herdr-server" in res.stdout
-    for agent in ("claude", "agy", "hermes", "cline"):
+    for agent in ("claude", "agy", "hermes", "grok"):
        assert agent in res.stdout
    # Test parser acceptance of valid flags vs unknown arg rejection
@@ -1158,7 +1158,7 @@ def test_comp_stop_usage_matches_parser(mam_sandbox):
        assert dead not in res.stdout, f"usage() still advertises {dead}"
    # 1b) 검증기가 받는 에이전트는 전부 도움말에 나온다 (Rev.2 M3)
-    for agent in ("claude", "agy", "hermes", "cline"):
+    for agent in ("claude", "agy", "hermes", "grok"):
        assert agent in res.stdout, f"usage() omits supported agent {agent}"
    # 2) 도움말이 광고하는 플래그는 전부 파서가 받는다
@@ -0,0 +1,90 @@
 # ==============================================================================
 # test_version_consistency.py — 3-Way Version Lockstep & Immutability Test Suite
 # ==============================================================================
 import os
 import re
 import subprocess
 from pathlib import Path
 import yaml
 REPO_ROOT = Path(__file__).resolve().parent.parent
 LIB_SH = REPO_ROOT / ".agents" / "skills" / "lib.sh"
 VERSIONS_MD = REPO_ROOT / "VERSIONS.md"
 SKILLS_DIR = REPO_ROOT / ".agents" / "skills"
 SKILL_NAMES = [
    "multi-agent-mux-create",
    "multi-agent-mux-stop",
    "multi-agent-mux-resume",
    "multi-agent-mux-status",
    "multi-agent-mux-monitor",
    "multi-agent-mux-delegate-job",
    "multi-agent-mux-loop",
    "multi-agent-mux-orc-onboard",
 ]
 def _get_lib_sh_mam_version():
    cmd = f'source "{LIB_SH}" && echo "$MAM_VERSION"'
    res = subprocess.run(["bash", "-c", cmd], capture_output=True, text=True, cwd=str(REPO_ROOT))
    assert res.returncode == 0, f"Failed to source lib.sh: {res.stderr}"
    return res.stdout.strip()
 def _get_versions_md_versions():
    text = VERSIONS_MD.read_text(encoding="utf-8")
    # 1. Current release framework version
    m_curr = re.search(r"-\s*\*\*프레임워크 버전\*\*:\s*`v(\d+\.\d+\.\d+)`", text)
    assert m_curr, "Failed to parse Current Release framework version in VERSIONS.md"
    current_framework_ver = m_curr.group(1)
    # 2. Skill matrix table versions
    table_matches = re.findall(r"\|\s*\*\*`([^`]+)`\*\*\s*\|\s*`(\d+\.\d+\.\d+)`\s*\|", text)
    matrix_dict = dict(table_matches)
    return current_framework_ver, matrix_dict
 def _get_skill_md_frontmatter_version(skill_name: str):
    skill_file = SKILLS_DIR / skill_name / "SKILL.md"
    assert skill_file.is_file(), f"Skill file not found: {skill_file}"
    content = skill_file.read_text(encoding="utf-8")
    # Strict frontmatter parsing
    fm_match = re.match(r"^---\n(.*?)\n---", content, re.DOTALL)
    assert fm_match, f"No YAML frontmatter found in {skill_file}"
    fm_data = yaml.safe_load(fm_match.group(1))
    assert isinstance(fm_data, dict) and "version" in fm_data, f"No version in frontmatter of {skill_file}"
    return str(fm_data["version"])
 def test_three_way_version_lockstep():
    """T-4: lib.sh(MAM_VERSION) == VERSIONS.md(Current + Matrix 8 items) == 8x SKILL.md frontmatters."""
    # 1. lib.sh runtime constant
    lib_ver = _get_lib_sh_mam_version()
    assert lib_ver != "", "MAM_VERSION in lib.sh is empty"
    # 2. VERSIONS.md
    vmd_curr, vmd_matrix = _get_versions_md_versions()
    assert lib_ver == vmd_curr, f"lib.sh MAM_VERSION ({lib_ver}) != VERSIONS.md current ({vmd_curr})"
    for skill in SKILL_NAMES:
        assert skill in vmd_matrix, f"Skill {skill} missing from VERSIONS.md matrix"
        assert vmd_matrix[skill] == lib_ver, f"VERSIONS.md matrix for {skill} ({vmd_matrix[skill]}) != lib.sh ({lib_ver})"
    # 3. 8x SKILL.md files
    for skill in SKILL_NAMES:
        fm_ver = _get_skill_md_frontmatter_version(skill)
        assert fm_ver == lib_ver, f"{skill}/SKILL.md version ({fm_ver}) != lib.sh ({lib_ver})"
 def test_mam_version_is_not_env_overridable():
    """T-0 (Constraint 1): MAM_VERSION cannot be spoofed by caller environment."""
    cmd = f'source "{LIB_SH}" && echo "$MAM_VERSION"'
    env = os.environ.copy()
    env["MAM_VERSION"] = "9.9.9"
    res = subprocess.run(["bash", "-c", cmd], capture_output=True, text=True, env=env, cwd=str(REPO_ROOT))
    assert res.returncode == 0
    assert res.stdout.strip() != "9.9.9", "MAM_VERSION was improperly overwritten by caller environment"
    assert res.stdout.strip() == _get_lib_sh_mam_version()
Author	SHA1	Message	Date
Godopu	6c0b8b0084	chore(release): bump framework and 8 skills to v4.0.0 (MAJOR — cline removal & hermes modernization) - Bump MAM_VERSION to 4.0.0 in lib.sh - Bump all 8 skill frontmatter versions to 4.0.0 in 3-way lockstep - Update VERSIONS.md with v4.0.0 changelog, migration guide (B-1..B-5), and skill matrix - Archive multi-agent version upgrade consensus and peer review reports (439 passed, 0 failures)	2026-08-28 23:31:31 +09:00
Godopu	f57cd5cdde	feat(agent): deprecate and completely remove cline agent support - Delete adapters/cline.py and unregister from registry.py - Remove cline branches from lib.sh and all 8 skill scripts (create, resume, stop, status, reconcile, update_yaml_resumed, resolve_session_id, orc_onboard) - Narrow own-key mapping dictionaries across lib_py core modules to 4 supported agents - Delete cline-exclusive tests and retarget shared fixtures to grok/hermes/claude - Update skills documentation and installation guides (439 passed, 0 failures) - Archive cline deprecation consensus and review reports	2026-08-28 22:38:48 +09:00
Godopu	e0c0c107f5	merge: support-hermes branch (Hermes agent support modernization)	2026-08-28 20:18:40 +09:00
Godopu	6208a7fda3	feat(hermes): modernize hermes agent adapter and skills support - Add --yolo and --accept-hooks headless auto-approval flags to spawn_spec and resume_spec - Define Hermes TUI input delimiters (input_prompt='❯', input_rule_pattern='─{10,}') - Refactor verify_artifact and discover in hermes.py using session started_at timestamps - Fix HERDR_EPOCH capture timing before spawn in create_session.sh to prevent epoch race - Update reconcile.sh for hermes drift-C multi-candidate and sibling claimed exclusion - Add Hermes contract, epoch filtering, and C-ambiguous unit tests (140 passed) - Add agent evaluation report and final review reports for Hermes support	2026-08-28 20:17:04 +09:00
Godopu	4a3328d0b7	chore(release): bump framework and 8 skills to v3.1.0 (MINOR) - Define immutable MAM_VERSION="3.1.0" runtime constant in lib.sh - Bump YAML frontmatter version to 3.1.0 across all 8 skill packages - Document v3.1.0 changelog, 2-tier TUI readiness architecture, and migration guide in VERSIONS.md - Document new tuning knobs (MAM_KILL_ON_READY_TIMEOUT, MAM_DIALOG_TAIL_LINES, MAM_READY_EMPTY_GIVEUP) in .mam.env.example - Add 3-way lockstep and immutability test suite in tests/test_version_consistency.py	2026-08-28 18:25:14 +09:00
Godopu	17edf90676	fix(tui): establish 2-tier readiness model, modal/hint token separation, and adapter modal contracts - Separate TUI dialog detection into blocking gate layer (_MAM_MODAL_TOKENS) and recovery layer (_MAM_HINT_TOKENS) to eliminate idle dialog starvation - Add modal_tokens contract across agent adapters (claude, cline) with dynamic scope facts resolution in send_keys_safe - Implement fail-closed resolution for ambiguous same-kind panes (R-1) and enforce WORKSPACE_ROOT export (R-2) - Preserve session on TUI readiness timeout when PID is alive for diagnostics - Add comprehensive test suite in tests/test_c1_tui_readiness.py and adapter contract assertions in test_a4	2026-08-28 15:21:10 +09:00
Godopu	4a5a093986	chore(docs): clean up temporary FIX.md and bug_report.md	2026-08-27 21:43:26 +09:00
Godopu	c3631e2aa1	fix(herdr): resolve shim routing defects, add workspace scoping, and bump to v3.0.1 - Resolve Herdr shim 5 routing & paste defects (ISSUE-1 ~ ISSUE-5): * paste-buffer: use pane send-text without auto-enter, propagate rc=3 to send_keys_safe * exact-match pane resolution: remove substring matching ('in tn') across all branches * workspace scoping: introduce HERDR_WORKSPACE_ID and .mam/herdr_workspace_id persistence * unified resolver: single _resolve_herdr_pane_id helper across shim commands - Resolve dialog token false-positive on 'Yes, try it' tip and isolate fullscreen modal rejection - Sync mock Herdr CLI contracts in tests/conftest.py - Add contract tests H-15~H-23 and regression tests D-4~D-7 (412 tests, 100% PASS) - Add multi-agent loop plans, review reports, and bug report - Update framework and skill packages to v3.0.1	2026-08-27 21:42:37 +09:00
Godopu	4bbd03bf2d	fix(lib): handle agent_not_ready startup state and reject claude fullscreen upsell modal - Accept agent_not_ready from herdr agent start to allow startup dialog handling without premature rollback, while preserving fail-closed behavior on dead process timeouts. - Match Claude fullscreen renderer upsell modal via 'Yes, try it' and dismiss with Escape to avoid dropping permission flags or deadlocking on idle /tui tips. - Add behavioral test suite in test_b19_headless_reconcile_fixes.py and cross-agent review reports.	2026-08-27 10:17:53 +09:00
Godopu	d875584ef4	chore(submodule): update nats-docker submodule to 26fd65a	2026-08-26 18:38:52 +09:00
Godopu	b18e0ae0bc	docs: add verification report for v3.0.0 deployment and installation	2026-08-26 15:53:22 +09:00
Godopu	050baed640	fix(lib): enhance target agent resolution and import fallback in herdr shim	2026-08-26 15:41:50 +09:00