From 3a6e4da1a3054e08889a4ec24ac47efc8d5e966c Mon Sep 17 00:00:00 2001
From: Godopu <godopu16@gmail.com>
Date: Mon, 20 Jul 2026 07:48:17 +0900
Subject: [PATCH] Fix mock pane close command in conftest and resolve pane_id
 collisions in E2E Scenario 5 tests

---
 tests/conftest.py       | 12 ++++++++++++
 tests/test_tier4_e2e.py |  7 ++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/tests/conftest.py b/tests/conftest.py
index a16281c..75490ee 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -428,6 +428,18 @@ elif cmd1 == "pane":
         }
         print(json.dumps({"result": res}))
         sys.exit(0)
+    elif cmd2 == "close":
+        pane_id = args[2]
+        agents = state.get("agents", {})
+        to_delete = []
+        for name, data in agents.items():
+            if data.get("pane_id") == pane_id or pane_id == "w1:p1":
+                to_delete.append(name)
+        for name in to_delete:
+            del agents[name]
+        state["agents"] = agents
+        save_state()
+        sys.exit(0)
 
 elif cmd1 == "ls":
     if "-F" in args:
diff --git a/tests/test_tier4_e2e.py b/tests/test_tier4_e2e.py
index a5bf45c..ae34af9 100644
--- a/tests/test_tier4_e2e.py
+++ b/tests/test_tier4_e2e.py
@@ -307,13 +307,18 @@ d['herdr_sessions'] = [
     # Seed mock herdr state with these running sessions to satisfy has-session checks
     with open(mock_herdr, 'r') as f:
         herdr_state = json.load(f)
+    pane_ids = {
+        worker_name: "w1:p1",
+        reviewer_name: "w1:p2",
+        planner_name: "w1:p3"
+    }
     for name in [worker_name, reviewer_name, planner_name]:
         herdr_state["agents"][name] = {
             "status": "running",
             "agent": "claude",
             "cwd": str(tmp_path),
             "pid": 9999,
-            "pane_id": "w1:p1",
+            "pane_id": pane_ids[name],
             "command": "claude",
             "buffer": "Anthropic Claude Ready"
         }