agent-control-plane 0.1.13 → 0.1.16

package/tools/dashboard/dashboard_snapshot.py

@@ -143,6 +143,15 @@ def file_mtime_iso(path: Path) -> str:
     return datetime.fromtimestamp(path.stat().st_mtime, tz=timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
 
 
+def read_json_file(path: Path) -> dict[str, Any]:
+    if not path.is_file():
+        return {}
+    try:
+        return json.loads(path.read_text(encoding="utf-8", errors="replace"))
+    except Exception:
+        return {}
+
+
 def read_tail_text(path: Path, max_bytes: int = 65536) -> str:
     if not path.is_file():
         return ""
@@ -191,6 +200,11 @@ GITHUB_RATE_LIMIT_PATTERNS = [
     ),
 ]
 
+WORKER_PREFLIGHT_NETWORK_BLOCKED_PATTERN = re.compile(
+    r"Blocked on external network access.*?What I ran:\s*-\s*`(?P<command>[^`]+)`.*?Exact failure:\s*`(?P<failure>[^`]+)`",
+    re.IGNORECASE | re.DOTALL,
+)
+
 
 def summarize_whitespace(text: str) -> str:
     return re.sub(r"\s+", " ", text).strip()
@@ -233,6 +247,52 @@ def extract_github_rate_limit_alert(run_dir: Path, run: dict[str, Any]) -> dict[
     return None
 
 
+def extract_worker_preflight_network_blocked_alert(run_dir: Path, run: dict[str, Any]) -> dict[str, Any] | None:
+    candidate_files = [
+        run_dir / "issue-comment.md",
+        run_dir / "pr-comment.md",
+    ]
+    for path in candidate_files:
+        text = read_tail_text(path)
+        if not text:
+            continue
+        match = WORKER_PREFLIGHT_NETWORK_BLOCKED_PATTERN.search(text)
+        if not match:
+            continue
+        command = summarize_whitespace(match.group("command"))
+        failure = summarize_whitespace(match.group("failure"))
+        message = f"Worker preflight `{command or 'unknown command'}` failed before implementation."
+        if failure:
+            message = f"{message} {failure}"
+        message = f"{message} Verify from the host if the same command succeeds; worker and host environment can diverge."
+        return {
+            "id": f"worker-preflight-network-blocked:{run.get('session', '')}:{command}:{failure}",
+            "kind": "worker-preflight-network-blocked",
+            "severity": "warn",
+            "title": "Worker preflight blocked by network",
+            "message": message,
+            "session": run.get("session", ""),
+            "task_kind": run.get("task_kind", ""),
+            "task_id": run.get("task_id", ""),
+            "reset_at": "",
+            "updated_at": run.get("updated_at", "") or file_mtime_iso(path),
+            "source_file": str(path),
+        }
+    return None
+
+
+def extract_run_alerts(run_dir: Path, run: dict[str, Any]) -> list[dict[str, Any]]:
+    alerts: list[dict[str, Any]] = []
+    for extractor in (
+        extract_github_rate_limit_alert,
+        extract_worker_preflight_network_blocked_alert,
+    ):
+        alert = extractor(run_dir, run)
+        if alert:
+            alerts.append(alert)
+    return alerts
+
+
 def collect_runs(runs_root: Path) -> list[dict[str, Any]]:
     if not runs_root.is_dir():
         return []
@@ -287,12 +347,68 @@ def collect_runs(runs_root: Path) -> list[dict[str, Any]]:
             "provider_pool_name": run_env.get("ACTIVE_PROVIDER_POOL_NAME", ""),
             "run_dir": str(run_dir),
         }
-        alert = extract_github_rate_limit_alert(run_dir, item)
-        item["alerts"] = [alert] if alert else []
+        item["alerts"] = extract_run_alerts(run_dir, item)
         runs.append(item)
     return runs
 
 
+def collect_recent_history(history_root: Path, limit: int = 8) -> list[dict[str, Any]]:
+    if not history_root.is_dir():
+        return []
+
+    items: list[dict[str, Any]] = []
+    seen_sessions: set[str] = set()
+    for run_dir in sorted(
+        [entry for entry in history_root.iterdir() if entry.is_dir()],
+        key=lambda item: item.stat().st_mtime,
+        reverse=True,
+    ):
+        run_env = read_env_file(run_dir / "run.env")
+        runner_env = read_env_file(run_dir / "runner.env")
+        result_env = read_env_file(run_dir / "result.env")
+        session = run_env.get("SESSION", "")
+        if not session:
+            name = run_dir.name
+            parts = name.split("-")
+            session = "-".join(parts[:-2]) if len(parts) > 2 else name
+        if session in seen_sessions:
+            continue
+        lifecycle_status = (runner_env.get("RUNNER_STATE", "") or "").strip().upper()
+        if lifecycle_status == "SUCCEEDED":
+            lifecycle_status = "SUCCEEDED"
+        elif lifecycle_status == "FAILED":
+            lifecycle_status = "FAILED"
+        elif lifecycle_status:
+            lifecycle_status = lifecycle_status.upper()
+        else:
+            lifecycle_status = "UNKNOWN"
+        outcome = result_env.get("OUTCOME", "")
+        failure_reason = runner_env.get("LAST_FAILURE_REASON", "")
+        result_kind, result_label = classify_run_result(lifecycle_status, outcome, failure_reason)
+        item = {
+            "session": session,
+            "task_kind": run_env.get("TASK_KIND", ""),
+            "task_id": run_env.get("TASK_ID", ""),
+            "status": lifecycle_status,
+            "lifecycle_status": lifecycle_status,
+            "updated_at": result_env.get("UPDATED_AT", "") or runner_env.get("UPDATED_AT", "") or file_mtime_iso(run_dir),
+            "coding_worker": run_env.get("CODING_WORKER", ""),
+            "failure_reason": failure_reason,
+            "outcome": outcome,
+            "action": result_env.get("ACTION", ""),
+            "result_kind": result_kind,
+            "result_label": result_label,
+            "run_dir": str(run_dir),
+            "archived": True,
+        }
+        item["alerts"] = extract_run_alerts(run_dir, item)
+        items.append(item)
+        seen_sessions.add(session)
+        if len(items) >= limit:
+            break
+    return items
+
+
 def controller_is_stale(env: dict[str, str], controller_path: Path) -> bool:
     """A controller is stale if it claims to be running but its PID is dead or its
     UPDATED_AT file mtime is older than 10 minutes."""
@@ -408,6 +524,94 @@ def collect_provider_cooldowns(state_root: Path) -> list[dict[str, Any]]:
     return items
 
 
+def collect_codex_rotation(profile: dict[str, str]) -> dict[str, Any]:
+    coding_worker = profile.get("EFFECTIVE_CODING_WORKER", "")
+    if coding_worker != "codex":
+        return {}
+
+    cache_root = Path(os.environ.get("XDG_CACHE_HOME", str(Path.home() / ".cache"))) / "codex-quota-manager"
+    state_file = cache_root / "rotation-state.json"
+    switch_file = cache_root / "last-switch.env"
+    state_json = read_json_file(state_file)
+    state_accounts = state_json.get("accounts", {}) if isinstance(state_json, dict) else {}
+    now_epoch = int(datetime.now(timezone.utc).timestamp())
+
+    active_label = ""
+    candidate_labels: list[str] = []
+    list_json: dict[str, Any] = {}
+    quota_bin_override = os.environ.get("CODEX_QUOTA_BIN", "").strip()
+    quota_bin = Path(quota_bin_override) if quota_bin_override else TOOLS_BIN_DIR / "codex-quota"
+    if quota_bin.is_file():
+        try:
+            raw = subprocess.check_output(
+                [str(quota_bin), "codex", "list", "--json"],
+                cwd=str(ROOT_DIR),
+                env=os.environ.copy(),
+                text=True,
+                stderr=subprocess.DEVNULL,
+                timeout=20,
+            )
+            list_json = json.loads(raw)
+        except Exception:
+            list_json = {}
+
+    if isinstance(list_json, dict):
+        active_info = list_json.get("activeInfo", {}) or {}
+        active_label = str(active_info.get("trackedLabel") or active_info.get("activeLabel") or "")
+        seen: set[str] = set()
+        for account in list_json.get("accounts", []) or []:
+            label = str(account.get("label") or "").strip()
+            if not label or label == active_label or label in seen:
+                continue
+            candidate_labels.append(label)
+            seen.add(label)
+
+    next_retry_label = ""
+    next_retry_epoch = 0
+    for label in candidate_labels:
+        entry = state_accounts.get(label, {}) if isinstance(state_accounts, dict) else {}
+        retry_epoch = safe_int(str(entry.get("next_retry_at", "")))
+        removed = bool(entry.get("removed", False))
+        if removed or not retry_epoch or retry_epoch <= now_epoch:
+            continue
+        if next_retry_epoch == 0 or retry_epoch < next_retry_epoch:
+            next_retry_epoch = retry_epoch
+            next_retry_label = label
+
+    ready_candidates = []
+    for label in candidate_labels:
+        entry = state_accounts.get(label, {}) if isinstance(state_accounts, dict) else {}
+        retry_epoch = safe_int(str(entry.get("next_retry_at", ""))) or 0
+        removed = bool(entry.get("removed", False))
+        if not removed and retry_epoch <= now_epoch:
+            ready_candidates.append(label)
+
+    last_switch = read_env_file(switch_file)
+    switch_decision = "unknown"
+    if ready_candidates:
+        switch_decision = "ready-candidate"
+    elif next_retry_label:
+        switch_decision = "deferred"
+    elif last_switch.get("LAST_SWITCH_LABEL"):
+        switch_decision = "switched"
+    elif candidate_labels:
+        switch_decision = "failed"
+
+    return {
+        "active_label": active_label,
+        "candidate_labels": candidate_labels,
+        "ready_candidates": ready_candidates,
+        "next_retry_label": next_retry_label,
+        "next_retry_epoch": next_retry_epoch,
+        "next_retry_at": datetime.fromtimestamp(next_retry_epoch, tz=timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ") if next_retry_epoch else "",
+        "switch_decision": switch_decision,
+        "last_switch_label": last_switch.get("LAST_SWITCH_LABEL", ""),
+        "last_switch_reason": last_switch.get("LAST_SWITCH_REASON", ""),
+        "last_switch_epoch": safe_int(last_switch.get("LAST_SWITCH_EPOCH")),
+        "state_file": str(state_file),
+    }
+
+
 def collect_scheduled_issues(state_root: Path) -> list[dict[str, Any]]:
     scheduled_root = state_root / "scheduled-issues"
     if not scheduled_root.is_dir():
@@ -455,6 +659,43 @@ def collect_issue_retries(state_root: Path) -> list[dict[str, Any]]:
     return items
 
 
+def collect_pr_retries(state_root: Path) -> list[dict[str, Any]]:
+    retries_root = state_root / "retries" / "prs"
+    if not retries_root.is_dir():
+        return []
+
+    now_epoch = int(datetime.now(timezone.utc).timestamp())
+    items: list[dict[str, Any]] = []
+    for path in sorted(retries_root.glob("*.env"), key=lambda item: item.stat().st_mtime, reverse=True):
+        env = read_env_file(path)
+        next_attempt_epoch = safe_int(env.get("NEXT_ATTEMPT_EPOCH"))
+        items.append(
+            {
+                "pr_number": path.stem,
+                "attempts": safe_int(env.get("ATTEMPTS")) or 0,
+                "next_attempt_epoch": next_attempt_epoch,
+                "next_attempt_at": env.get("NEXT_ATTEMPT_AT", ""),
+                "last_reason": env.get("LAST_REASON", ""),
+                "updated_at": env.get("UPDATED_AT", "") or file_mtime_iso(path),
+                "ready": not bool(next_attempt_epoch and next_attempt_epoch > now_epoch),
+                "state_file": str(path),
+            }
+        )
+    return items
+
+
+def resolve_history_root(render_env: dict[str, str], yaml_env: dict[str, str], runs_root: Path) -> Path:
+    configured = (
+        render_env.get("EFFECTIVE_HISTORY_ROOT", "").strip()
+        or yaml_env.get("runtime.history_root", "").strip()
+    )
+    if configured and configured != ".":
+        return Path(configured)
+    if runs_root.name == "runs":
+        return runs_root.parent / "history"
+    return Path(".")
+
+
 def collect_issue_queue(state_root: Path) -> dict[str, list[dict[str, Any]]]:
     queue_root = state_root / "resident-workers" / "issue-queue"
     pending_root = queue_root / "pending"
@@ -491,14 +732,18 @@ def build_profile_snapshot(profile_id: str, registry_root: Path) -> dict[str, An
 
     runs_root = Path(render_env.get("EFFECTIVE_RUNS_ROOT", ""))
     state_root = Path(render_env.get("EFFECTIVE_STATE_ROOT", ""))
+    history_root = resolve_history_root(render_env, yaml_env, runs_root)
     runs = collect_runs(runs_root)
+    recent_history = collect_recent_history(history_root)
     controllers = collect_resident_controllers(state_root)
     resident_workers = collect_resident_workers(state_root)
     cooldowns = collect_provider_cooldowns(state_root)
     scheduled = collect_scheduled_issues(state_root)
     retries = collect_issue_retries(state_root)
+    pr_retries = collect_pr_retries(state_root)
     queue = collect_issue_queue(state_root)
-    alerts = [alert for run in runs for alert in run.get("alerts", [])]
+    alerts = [alert for run in (runs + recent_history) for alert in run.get("alerts", [])]
+    codex_rotation = collect_codex_rotation(render_env)
 
     return {
         "id": profile_id,
@@ -506,6 +751,7 @@ def build_profile_snapshot(profile_id: str, registry_root: Path) -> dict[str, An
         "repo_root": render_env.get("EFFECTIVE_REPO_ROOT", ""),
         "runs_root": str(runs_root),
         "state_root": str(state_root),
+        "history_root": str(history_root),
         "issue_prefix": yaml_env.get("session_naming.issue_prefix", ""),
         "pr_prefix": yaml_env.get("session_naming.pr_prefix", ""),
         "coding_worker": render_env.get("EFFECTIVE_CODING_WORKER", ""),
@@ -520,6 +766,7 @@ def build_profile_snapshot(profile_id: str, registry_root: Path) -> dict[str, An
             "last_reason": render_env.get("EFFECTIVE_PROVIDER_POOL_LAST_REASON", ""),
             "pools_exhausted": render_env.get("EFFECTIVE_PROVIDER_POOLS_EXHAUSTED", ""),
         },
+        "codex_rotation": codex_rotation,
         "counts": {
             "active_runs": len(runs),
             "running_runs": sum(1 for item in runs if item["status"] == "RUNNING"),
@@ -531,6 +778,7 @@ def build_profile_snapshot(profile_id: str, registry_root: Path) -> dict[str, An
             "completed_runs": sum(
                 1 for item in runs if item["status"] == "SUCCEEDED" and item["result_kind"] not in {"implemented", "reported", "blocked"}
             ),
+            "recent_history_runs": len(recent_history),
             "resident_controllers": len(controllers),
             "live_resident_controllers": sum(1 for item in controllers if item["state"] != "stopped" and item["controller_live"]),
             "stale_resident_controllers": sum(1 for item in controllers if item.get("controller_stale", False)),
@@ -543,12 +791,14 @@ def build_profile_snapshot(profile_id: str, registry_root: Path) -> dict[str, An
             "alerts": len(alerts),
         },
         "runs": runs,
+        "recent_history": recent_history,
         "alerts": alerts,
         "resident_controllers": controllers,
         "resident_workers": resident_workers,
         "provider_cooldowns": cooldowns,
         "scheduled_issues": scheduled,
         "issue_retries": retries,
+        "pr_retries": pr_retries,
         "issue_queue": queue,
     }
 

package/tools/dashboard/index.html

@@ -3,6 +3,7 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="color-scheme" content="light dark" />
     <title>ACP Worker Dashboard</title>
     <link rel="stylesheet" href="./styles.css" />
   </head>
@@ -20,7 +21,10 @@
           </p>
         </div>
         <div class="hero-actions">
-          <button id="refresh-button" type="button">Refresh now</button>
+          <div class="hero-controls">
+            <button id="theme-toggle" type="button" aria-label="Toggle dark mode">Dark mode</button>
+            <button id="refresh-button" type="button">Refresh now</button>
+          </div>
           <div class="meta">
             <div>Auto refresh: <strong>5s</strong></div>
             <div id="generated-at">Loading snapshot...</div>

package/tools/dashboard/styles.css

@@ -12,6 +12,56 @@
   --danger: #b42318;
   --danger-soft: #fdd8d2;
   --shadow: 0 18px 50px rgba(25, 33, 38, 0.08);
+  --button-bg: var(--ink);
+  --button-ink: #ffffff;
+  --button-hover: #0f1720;
+  --hero-bg: rgba(255, 253, 247, 0.92);
+  --profile-bg: rgba(255, 253, 247, 0.94);
+  --body-gradient-top: rgba(15, 118, 110, 0.08);
+  --body-gradient-bottom: #faf7ef;
+  --theme-toggle-bg: var(--panel);
+  --theme-toggle-ink: var(--ink);
+  --theme-toggle-line: var(--line);
+  --theme-toggle-hover: var(--panel-strong);
+  --reported-soft: #dbeafe;
+  --reported-ink: #1d4ed8;
+  --implemented-soft: #dcfce7;
+  --implemented-ink: #166534;
+  --blocked-soft: #fef3c7;
+  --blocked-ink: #92400e;
+}
+
+:root[data-theme="dark"] {
+  --bg: #0d1418;
+  --panel: #142026;
+  --panel-strong: #1a2a31;
+  --ink: #ebf1f3;
+  --muted: #9ab0bb;
+  --line: #2a3c44;
+  --accent: #5ad4c7;
+  --accent-soft: #183d3a;
+  --warn: #f4c35f;
+  --warn-soft: #4d3a12;
+  --danger: #ff8a80;
+  --danger-soft: #4a2220;
+  --shadow: 0 24px 60px rgba(0, 0, 0, 0.32);
+  --button-bg: #ebf1f3;
+  --button-ink: #0d1418;
+  --button-hover: #d7e2e6;
+  --hero-bg: rgba(20, 32, 38, 0.92);
+  --profile-bg: rgba(20, 32, 38, 0.94);
+  --body-gradient-top: rgba(90, 212, 199, 0.12);
+  --body-gradient-bottom: #10181d;
+  --theme-toggle-bg: #1d2d35;
+  --theme-toggle-ink: #ebf1f3;
+  --theme-toggle-line: #35505b;
+  --theme-toggle-hover: #23363f;
+  --reported-soft: #1b3552;
+  --reported-ink: #9fc8ff;
+  --implemented-soft: #173a2b;
+  --implemented-ink: #85ddb1;
+  --blocked-soft: #4a3711;
+  --blocked-ink: #f4c35f;
 }
 
 * {
@@ -22,8 +72,8 @@ body {
   margin: 0;
   font-family: "Iowan Old Style", "Palatino Linotype", "Book Antiqua", serif;
   background:
-    radial-gradient(circle at top right, rgba(15, 118, 110, 0.08), transparent 34%),
-    linear-gradient(180deg, #faf7ef 0%, var(--bg) 100%);
+    radial-gradient(circle at top right, var(--body-gradient-top), transparent 34%),
+    linear-gradient(180deg, var(--body-gradient-bottom) 0%, var(--bg) 100%);
   color: var(--ink);
 }
 
@@ -41,7 +91,7 @@ body {
   padding: 24px;
   border: 1px solid var(--line);
   border-radius: 28px;
-  background: rgba(255, 253, 247, 0.92);
+  background: var(--hero-bg);
   box-shadow: var(--shadow);
 }
 
@@ -75,19 +125,42 @@ body {
   align-items: flex-end;
 }
 
+.hero-controls {
+  display: flex;
+  gap: 10px;
+  align-items: center;
+  flex-wrap: wrap;
+  justify-content: flex-end;
+}
+
 button {
   appearance: none;
   border: 0;
   border-radius: 999px;
   padding: 12px 18px;
   font: inherit;
-  background: var(--ink);
-  color: white;
+  background: var(--button-bg);
+  color: var(--button-ink);
   cursor: pointer;
+  transition: background 140ms ease, color 140ms ease, border-color 140ms ease, transform 140ms ease;
 }
 
 button:hover {
-  background: #0f1720;
+  background: var(--button-hover);
+}
+
+button:active {
+  transform: translateY(1px);
+}
+
+#theme-toggle {
+  background: var(--theme-toggle-bg);
+  color: var(--theme-toggle-ink);
+  border: 1px solid var(--theme-toggle-line);
+}
+
+#theme-toggle:hover {
+  background: var(--theme-toggle-hover);
 }
 
 .meta {
@@ -135,7 +208,7 @@ button:hover {
   padding: 22px;
   border-radius: 28px;
   border: 1px solid var(--line);
-  background: rgba(255, 253, 247, 0.94);
+  background: var(--profile-bg);
   box-shadow: var(--shadow);
 }
 
@@ -183,12 +256,12 @@ button:hover {
 
 .badge.good {
   background: var(--accent-soft);
-  color: #0d5a54;
+  color: var(--accent);
 }
 
 .badge.warn {
   background: var(--warn-soft);
-  color: #855500;
+  color: var(--warn);
 }
 
 .badge.danger {
@@ -243,8 +316,8 @@ button:hover {
 }
 
 .alert-card.warn {
-  border-color: #e7c76d;
-  background: #fff6dd;
+  border-color: color-mix(in srgb, var(--warn) 45%, var(--line));
+  background: color-mix(in srgb, var(--warn-soft) 82%, var(--panel) 18%);
 }
 
 .alert-card h4 {
@@ -323,7 +396,7 @@ th {
 .status-pill.launching,
 .status-pill.reconciling {
   background: var(--accent-soft);
-  color: #0d5a54;
+  color: var(--accent);
 }
 
 .status-pill.waiting-provider,
@@ -332,7 +405,7 @@ th {
 .status-pill.idle,
 .status-pill.sleeping {
   background: var(--warn-soft);
-  color: #855500;
+  color: var(--warn);
 }
 
 .status-pill.FAILED,
@@ -343,19 +416,19 @@ th {
 }
 
 .status-pill.implemented {
-  background: #dcfce7;
-  color: #166534;
+  background: var(--implemented-soft);
+  color: var(--implemented-ink);
 }
 
 .status-pill.reported,
 .status-pill.completed {
-  background: #dbeafe;
-  color: #1d4ed8;
+  background: var(--reported-soft);
+  color: var(--reported-ink);
 }
 
 .status-pill.blocked {
-  background: #fef3c7;
-  color: #92400e;
+  background: var(--blocked-soft);
+  color: var(--blocked-ink);
 }
 
 .status-pill.failed,
@@ -366,7 +439,7 @@ th {
 
 .status-pill.running {
   background: var(--accent-soft);
-  color: #0d5a54;
+  color: var(--accent);
 }
 
 .empty-state {
@@ -387,6 +460,10 @@ th {
     text-align: left;
   }
 
+  .hero-controls {
+    justify-content: flex-start;
+  }
+
   .panel.half,
   .panel.third {
     grid-column: span 12;

package/tools/templates/pr-fix-template.md

@@ -3,11 +3,11 @@ You are the PR repair worker for `{REPO_SLUG}`.
 Before making any change:
 
 1. Read `{REPO_ROOT}/AGENTS.md`.
-2. Read `{REPO_ROOT}/openspec/AGENT_RULES.md`.
-3. Read `{REPO_ROOT}/openspec/AGENTS.md`.
-4. Read `{REPO_ROOT}/openspec/project.md`.
-5. Read `{REPO_ROOT}/openspec/CONVENTIONS.md`.
-6. Read `{REPO_ROOT}/docs/TESTING_AND_SEED_POLICY.md`.
+2. If present, read `{REPO_ROOT}/openspec/AGENT_RULES.md`.
+3. If present, read `{REPO_ROOT}/openspec/AGENTS.md`.
+4. If present, read `{REPO_ROOT}/openspec/project.md`.
+5. If present, read `{REPO_ROOT}/openspec/CONVENTIONS.md`.
+6. If present, read `{REPO_ROOT}/docs/TESTING_AND_SEED_POLICY.md`.
 7. Stay on this PR branch worktree. Do not push or mutate GitHub from inside the worker.
 
 PR metadata:
@@ -58,7 +58,7 @@ PR body:
 Required flow:
 
 1. Inspect the current diff and the failing/pending CI signals first:
-   - `openspec list`
+   - `openspec list` if the repo uses OpenSpec
    - `git diff --stat origin/main...HEAD`
    - `git status --short`
    - if `Merge state` is not `CLEAN` or `Mergeable` is `FALSE`, treat branch drift/conflicts as the concrete blocker first

package/tools/templates/pr-merge-repair-template.md

@@ -3,11 +3,11 @@ You are the PR merge-repair worker for `{REPO_SLUG}`.
 Before making any change:
 
 1. Read `{REPO_ROOT}/AGENTS.md`.
-2. Read `{REPO_ROOT}/openspec/AGENT_RULES.md`.
-3. Read `{REPO_ROOT}/openspec/AGENTS.md`.
-4. Read `{REPO_ROOT}/openspec/project.md`.
-5. Read `{REPO_ROOT}/openspec/CONVENTIONS.md`.
-6. Read `{REPO_ROOT}/docs/TESTING_AND_SEED_POLICY.md`.
+2. If present, read `{REPO_ROOT}/openspec/AGENT_RULES.md`.
+3. If present, read `{REPO_ROOT}/openspec/AGENTS.md`.
+4. If present, read `{REPO_ROOT}/openspec/project.md`.
+5. If present, read `{REPO_ROOT}/openspec/CONVENTIONS.md`.
+6. If present, read `{REPO_ROOT}/docs/TESTING_AND_SEED_POLICY.md`.
 7. Stay on this PR branch worktree. Do not push or mutate GitHub from inside the worker.
 
 PR metadata:
@@ -53,7 +53,7 @@ Required flow:
    - do not run `git fetch`, `git pull`, `git merge`, `git rebase`, `git commit`, `git push`, or any command that writes Git metadata
    - do not abort or restart the prepared merge state
 3. Inspect only the concrete branch-repair state you were given:
-   - `openspec list`
+   - `openspec list` if the repo uses OpenSpec
    - `git status --short`
    - `git diff --check`
    - `git diff --name-only --diff-filter=U`

package/tools/vendor/codex-quota-manager/scripts/auto-switch.sh

@@ -410,12 +410,6 @@ for label in "${CANDIDATE_LABELS[@]}"; do
     continue
   fi
 
-  retry_at="$(state_next_retry_at "$label")"
-  if [[ "$retry_at" =~ ^[0-9]+$ ]] && (( retry_at > now_epoch )); then
-    note_candidate_retry "$label" "$retry_at"
-    continue
-  fi
-
   quota_output="$(load_account_quota_json "$label" 2>&1 || true)"
   if ! jq -e 'type == "array" and length > 0' >/dev/null 2>&1 <<<"$quota_output"; then
     if is_auth_401_output "$quota_output"; then
@@ -436,6 +430,14 @@ for label in "${CANDIDATE_LABELS[@]}"; do
     continue
   fi
 
+  retry_at="$(state_next_retry_at "$label")"
+  if [[ "$retry_at" =~ ^[0-9]+$ ]] && (( retry_at > now_epoch )) && account_is_eligible "$label" "$quota_output"; then
+    state_mark_ready "$label" "quota-revalidated" "$now_epoch"
+  elif [[ "$retry_at" =~ ^[0-9]+$ ]] && (( retry_at > now_epoch )); then
+    note_candidate_retry "$label" "$retry_at"
+    continue
+  fi
+
   if ! account_is_eligible "$label" "$quota_output"; then
     retry_at="$(account_retry_epoch "$label" "$quota_output")"
     if [[ "$retry_at" =~ ^[0-9]+$ ]] && (( retry_at > now_epoch )); then

package/tools/bin/render-dashboard-snapshot.py

@@ -1,16 +0,0 @@
-#!/usr/bin/env python3
-from __future__ import annotations
-
-import pathlib
-import sys
-
-
-ROOT = pathlib.Path(__file__).resolve().parents[1] / "dashboard"
-if str(ROOT) not in sys.path:
-    sys.path.insert(0, str(ROOT))
-
-from dashboard_snapshot import main
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())