Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f2dbf30e81 | ||
|
|
2b4e43042a | ||
|
|
0f9390aab4 | ||
|
|
d7ad2838ec | ||
|
|
c6d68dbc7b | ||
|
|
e43ddd3cbe | ||
|
|
59aab06fe1 |
@@ -1568,6 +1568,32 @@ class ControlPlaneDB:
|
||||
).fetchone()
|
||||
return dict(row) if row else None
|
||||
|
||||
def list_incident_links(
|
||||
self,
|
||||
*,
|
||||
provider: str | None = None,
|
||||
gitea_org: str | None = None,
|
||||
gitea_repo: str | None = None,
|
||||
limit: int = 100,
|
||||
) -> list[dict[str, Any]]:
|
||||
"""List stored incident_links rows, optionally filtered by provider/repo (#612 / #649)."""
|
||||
query = "SELECT * FROM incident_links WHERE 1=1"
|
||||
params: list[Any] = []
|
||||
if provider:
|
||||
query += " AND provider = ?"
|
||||
params.append(provider.strip().lower())
|
||||
if gitea_org:
|
||||
query += " AND gitea_org = ?"
|
||||
params.append(_norm_scope(gitea_org))
|
||||
if gitea_repo:
|
||||
query += " AND gitea_repo = ?"
|
||||
params.append(_norm_scope(gitea_repo))
|
||||
query += " ORDER BY link_id DESC LIMIT ?"
|
||||
params.append(max(1, limit))
|
||||
with self._tx(immediate=False) as conn:
|
||||
rows = conn.execute(query, params).fetchall()
|
||||
return [dict(r) for r in rows]
|
||||
|
||||
|
||||
# ── lease lifecycle (#601) ────────────────────────────────────────────
|
||||
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
# Incident #670: bare direct-to-master commit `2fa97c26` (retroactive audit)
|
||||
|
||||
Status: verified; disposition recommendation: **accept as-is, no revert** (final
|
||||
disposition owned by controller per issue #670).
|
||||
|
||||
## Summary
|
||||
|
||||
Commit `2fa97c26fbda555a1a83930ca5fdcea9d8e47b50`
|
||||
(`fix(mcp): load dotenv relative to project root`) landed on `prgs/master`
|
||||
as a single-parent commit with no PR wrapper and no review record, bypassing
|
||||
the sanctioned issue → branch → PR → review → merge workflow. It was
|
||||
discovered during the PR #654 post-merge audit. PR #654 itself merged
|
||||
cleanly via the Gitea API and did **not** introduce this commit.
|
||||
|
||||
## Verification evidence (acceptance criteria 1–3)
|
||||
|
||||
- **AC1 — present on `prgs/master`: yes.**
|
||||
`git merge-base --is-ancestor 2fa97c26fbda555a1a83930ca5fdcea9d8e47b50 prgs/master` → true.
|
||||
- **AC2 — no PR or review record: confirmed.**
|
||||
The commit is a single-parent, non-merge commit sitting directly on
|
||||
first-parent master between the #629 merge (`5ab5fe85`) and the #654
|
||||
merge (`ec903b0d`). A PR landing on master produces a merge commit (or a
|
||||
PR-linked head); neither exists here. The controller audit at issue-create
|
||||
time also found no PR wrapper and no review record for this SHA.
|
||||
- **AC3 — changed files and diff summary: confirmed.**
|
||||
`gitea_auth.py | 5 +++--` (+3/−2). Single parent
|
||||
`5ab5fe8583c07134d55dadf09381aecb67df246e`. The change moves
|
||||
`PROJECT_ROOT` derivation above `load_dotenv()` and loads
|
||||
`.env` relative to the project root instead of the process CWD.
|
||||
|
||||
## AC4 — why no immediate revert
|
||||
|
||||
- The dotenv fix is intentional and required for correct runtime behavior:
|
||||
without it, `load_dotenv()` resolves `.env` against the process working
|
||||
directory, which breaks MCP server launches whose CWD is not the project
|
||||
root.
|
||||
- The change is small (+3/−2), self-contained in `gitea_auth.py`, and has
|
||||
been running on master without incident since 2026-07-10.
|
||||
- Reverting would re-introduce a real bug to remove a provenance defect —
|
||||
the wrong trade. Provenance is repaired retroactively by this document,
|
||||
issue #670, and the hardening landed under #671.
|
||||
- If the controller later judges the change unsafe, a separate
|
||||
revert/repair issue is the sanctioned path (issue #670, recommended
|
||||
disposition option 4).
|
||||
|
||||
## AC5 — workflow-hardening linkage
|
||||
|
||||
Prevention already landed: **issue #671** (closed)
|
||||
*“Block direct pushes to stable branches from MCP workflow sessions”*,
|
||||
implemented by commit `5933d87647656643a67a50331c4c7b06ea751dad`
|
||||
(`feat(guard): block direct stable-branch pushes from MCP workflow sessions`).
|
||||
|
||||
Shipped guardrails include:
|
||||
|
||||
- `gitea_record_stable_branch_push_attempt` — classifies proposed commands
|
||||
for direct stable-branch push intent (`git push <remote> master`,
|
||||
refspecs, `HEAD:master`, `--force`, dry-run intent, `:master` delete),
|
||||
plus root/control-checkout local commits not carried by an issue branch,
|
||||
and writes a durable `stable_branch_contamination` marker.
|
||||
- `gitea_audit_stable_branch_contamination` — reconciler-only audit/clear
|
||||
path; a contaminated worker session cannot self-clear.
|
||||
- Review/merge/close/completion mutations fail closed while a
|
||||
contamination marker is active.
|
||||
|
||||
## AC6 — PR #654 was not the source
|
||||
|
||||
- `2fa97c26` is the **first parent** of the #654 merge commit
|
||||
`ec903b0d619e7a27d24aed272a890f4e5d381411`; it predates the #654 merge.
|
||||
- First-parent history `5ab5fe8..ec903b0`:
|
||||
`2fa97c2 fix(mcp): load dotenv relative to project root` followed by
|
||||
`ec903b0 Merge pull request 'feat: lifecycle role/hazard labels ... (#603)' (#654)`.
|
||||
- The #654 merger audit confirmed `ec903b0d` was a valid Gitea-API merge,
|
||||
the `git push prgs master` attempt during that run was a no-op, and the
|
||||
net change `2fa97c2..ec903b0` contained only the reviewed #603
|
||||
lifecycle-label files.
|
||||
- Conclusion: #654 merged reviewed content only; the unauthorized-path
|
||||
defect is solely the earlier bare commit `2fa97c26`.
|
||||
|
||||
## Explicit non-actions (unchanged by this audit)
|
||||
|
||||
- No revert of `2fa97c26`.
|
||||
- No force-push or history rewrite.
|
||||
- No master mutation from the audit session.
|
||||
@@ -0,0 +1,35 @@
|
||||
# Web Console: Sentry/GlitchTip Observability & Incident Bridge Console (#649)
|
||||
|
||||
This document describes the Phase 4 observability console surface integrated into the MCP Control Plane Web Console (`webui/`), backed by the #612 incident bridge and the #613 control-plane DB substrate.
|
||||
|
||||
## Architectural Authority Model (ADR Alignment)
|
||||
|
||||
Per the Web Console Architecture ADR (`docs/architecture/webui-control-plane-console-architecture-adr.md`):
|
||||
|
||||
| Layer | Responsibility | Authority |
|
||||
|---|---|---|
|
||||
| **Gitea** | Durable work record | Issues, PRs, comments, reviews, labels, merges |
|
||||
| **Control-plane DB** | Live coordination & linkage | `incident_links` table, session leases, allocations |
|
||||
| **Sentry / GlitchTip** | Observability input | Unresolved incidents, error events, stack traces |
|
||||
| **Incident Bridge (#612)** | Reconciliation engine | Reconciles provider observations into Gitea issues |
|
||||
| **Web Console (`webui/`)** | Read-only projection & gated actions | Projects connection health & correlation links; gates writes |
|
||||
|
||||
> **Key Rule:** Raw monitoring incidents are **never** assignable control-plane `work_items`. They remain observation input only.
|
||||
|
||||
## Redaction Boundary Invariants
|
||||
|
||||
1. **No secrets in returns or rendering:** Auth tokens (`SENTRY_AUTH_TOKEN`, `GLITCHTIP_AUTH_TOKEN`), DSNs, `Authorization` headers, and sensitive local file paths are passed through `webui.console_redaction` before leaving the server.
|
||||
2. **Safe projection:** Connection objects report `credentials_present: true/false` rather than exposing raw keys or headers.
|
||||
|
||||
## Console Endpoints
|
||||
|
||||
- **HTML Surface:** `GET /observability` — Renders provider connection cards, error correlation tables, and gated reconcile controls.
|
||||
- **Versioned API:** `GET /api/v1/observability` — Returns structured JSON snapshot with `schema_version`, `providers`, `links`, and `metrics`.
|
||||
- **Legacy Compatibility Alias:** `GET /api/observability` — Read-only compatibility alias for Phase 4.
|
||||
|
||||
## Gated Actions
|
||||
|
||||
- `observability_reconcile_incident` (`gitea_observability_reconcile_incident`): Triggers or previews dry-run issue reconciliation for a provider incident.
|
||||
- `observability_link_issue` (`gitea_observability_link_issue`): Links a provider incident to an existing Gitea tracking issue.
|
||||
|
||||
Both actions require `operator` role and gate through `task_capability_map`. Execution fails closed in read-only MVP mode.
|
||||
@@ -98,6 +98,8 @@ already define, and a regression test asserts each mapping matches.
|
||||
| `system.rebind_session_worktree` | operator | gated_write | `gitea.read` | Yes | No | No | 2 |
|
||||
| `system.reconcile_cleanups` | controller | privileged | `gitea.pr.close` | Yes | No | No | 2 |
|
||||
| `initiate_workflow` | operator | gated_write | `gitea.read` | Yes | No | No | 2 |
|
||||
| `observability_reconcile_incident` | operator | gated_write | `gitea.read` | Yes | No | No | 4 |
|
||||
| `observability_link_issue` | operator | gated_write | `gitea.read` | Yes | No | No | 4 |
|
||||
|
||||
**Dual control** means the acting principal may not be the sole authority: a
|
||||
second distinct principal must confirm. **Break-glass** means the action is
|
||||
|
||||
@@ -0,0 +1,478 @@
|
||||
"""Concurrent-session MCP restart safety & dogfooding test suite (#666).
|
||||
|
||||
Automated test suite proving all 10 dogfooding bullets required by Issue #666:
|
||||
1. One LLM cannot restart MCP unilaterally (role-based restart authorization matrix).
|
||||
2. New work stops during drain (assignments_stopped gate enforcement).
|
||||
3. Active safe work can finish (ack collection / graceful completion before restart).
|
||||
4. Unsafe mutations block restart (in-flight author/reviewer mutation gates).
|
||||
5. Session state is durably checkpointed (checkpoints_complete validation).
|
||||
6. Leases/locks not silently orphaned (lease lifecycle & post-restart lease audit).
|
||||
7. Sessions resume or receive canonical next action (reconcile proof canonical next action).
|
||||
8. Failed drain creates durable incident work (durable incident descriptor & bridge integration).
|
||||
9. Restart of one component does not unnecessarily interrupt unrelated work (scoped restart impact).
|
||||
10. Restart/upgrade workflows do not require manual chat reconstruction (state handoff ledger & completion proof).
|
||||
|
||||
Links parent #655, vision #652, roadmap #653, #658, #659, #660, #661, #662, #663.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
import unittest
|
||||
from datetime import datetime, timedelta, timezone
|
||||
|
||||
import drain_proof as dp
|
||||
import mcp_restart_paths as rp
|
||||
import post_restart_reconcile as prr
|
||||
import restart_coordinator as rc
|
||||
from restart_coordinator import RestartClass
|
||||
|
||||
NOW = datetime(2026, 7, 25, 12, 0, 0, tzinfo=timezone.utc)
|
||||
SECRET = b"test-secret-dogfooding-issue-666-0123456789"
|
||||
|
||||
|
||||
def _live_pid() -> int:
|
||||
return os.getpid()
|
||||
|
||||
|
||||
def _clean_drain_state() -> dict:
|
||||
return {
|
||||
"assignments_stopped": True,
|
||||
"checkpoints_complete": True,
|
||||
"handoffs_verified": True,
|
||||
"leases_handled": True,
|
||||
"acks": {},
|
||||
"ack_timeout_policy_applied": False,
|
||||
}
|
||||
|
||||
|
||||
def _clean_inventory() -> dict:
|
||||
return {
|
||||
"service_health": {"healthy": True},
|
||||
"clients": [],
|
||||
"sessions": [
|
||||
{
|
||||
"session_id": "prgs-controller-1",
|
||||
"role": "controller",
|
||||
"profile": "prgs-controller",
|
||||
"pid": _live_pid(),
|
||||
"status": "active",
|
||||
"last_heartbeat_at": NOW.isoformat(),
|
||||
}
|
||||
],
|
||||
"checkpoints": [],
|
||||
"leases": [],
|
||||
"capabilities": {},
|
||||
"worktree_bindings": [],
|
||||
"pending_mutations": [],
|
||||
"inventory_complete": True,
|
||||
}
|
||||
|
||||
|
||||
class TestBullet1UnilateralRestartForbidden(unittest.TestCase):
|
||||
"""Bullet 1: One LLM cannot restart MCP unilaterally."""
|
||||
|
||||
def test_worker_role_unilateral_full_restart_denied(self):
|
||||
policy = rc.RESTART_CLASS_POLICIES[RestartClass.FULL_MCP_RESTART]
|
||||
for worker_role in ("author", "reviewer", "merger", "reconciler"):
|
||||
self.assertNotIn(
|
||||
worker_role,
|
||||
policy.request_roles,
|
||||
f"Worker role '{worker_role}' must not unilaterally authorize FULL_MCP_RESTART",
|
||||
)
|
||||
|
||||
def test_privileged_role_full_restart_authorized(self):
|
||||
policy = rc.RESTART_CLASS_POLICIES[RestartClass.FULL_MCP_RESTART]
|
||||
for priv_role in ("controller", "operator", "admin"):
|
||||
self.assertIn(
|
||||
priv_role,
|
||||
policy.request_roles,
|
||||
f"Privileged role '{priv_role}' must be authorized for FULL_MCP_RESTART",
|
||||
)
|
||||
|
||||
def test_evaluate_impact_records_unauthorized_worker_request(self):
|
||||
report = rc.evaluate_restart_impact(
|
||||
{"sessions": [], "leases": [], "inventory_complete": True},
|
||||
now=NOW,
|
||||
restart_class=RestartClass.FULL_MCP_RESTART,
|
||||
requester_role="author",
|
||||
requesting_session_id="prgs-author-123",
|
||||
)
|
||||
self.assertFalse(report.role_authorized)
|
||||
self.assertEqual(report.verdict, rc.VERDICT_UNSAFE)
|
||||
self.assertTrue(any("may not request" in r.lower() or "authorization denied" in r.lower() for r in report.reasons))
|
||||
|
||||
|
||||
class TestBullet2NewWorkStopsDuringDrain(unittest.TestCase):
|
||||
"""Bullet 2: New work stops during drain."""
|
||||
|
||||
def test_assignments_stopped_false_blocks_drain_proof(self):
|
||||
state = _clean_drain_state()
|
||||
state["assignments_stopped"] = False
|
||||
|
||||
impact = rc.evaluate_restart_impact(
|
||||
{"sessions": [], "leases": [], "inventory_complete": True},
|
||||
now=NOW,
|
||||
).as_dict()
|
||||
|
||||
proof = dp.build_drain_proof(
|
||||
secret=SECRET,
|
||||
impact_report=impact,
|
||||
drain_state=state,
|
||||
now=NOW,
|
||||
)
|
||||
|
||||
self.assertFalse(proof.clean)
|
||||
check = next(c for c in proof.checks if c.name == dp.CHECK_ASSIGNMENTS_STOPPED)
|
||||
self.assertFalse(check.passed)
|
||||
|
||||
gate = dp.gate_apply_restart(proof=proof.as_dict(), secret=SECRET, now=NOW)
|
||||
self.assertEqual(gate.verdict, dp.GATE_DENY)
|
||||
self.assertFalse(gate.allow)
|
||||
self.assertTrue(any("drain proof invalid" in r.lower() or "assignments_stopped" in r.lower() for r in gate.reasons))
|
||||
|
||||
|
||||
class TestBullet3ActiveSafeWorkCanFinish(unittest.TestCase):
|
||||
"""Bullet 3: Active safe work can finish."""
|
||||
|
||||
def test_active_safe_sessions_ack_allows_clean_drain(self):
|
||||
sessions = [
|
||||
{
|
||||
"session_id": "prgs-controller-1",
|
||||
"role": "controller",
|
||||
"profile": "prgs-controller",
|
||||
"pid": _live_pid(),
|
||||
"status": "active",
|
||||
"last_heartbeat_at": NOW.isoformat(),
|
||||
},
|
||||
{
|
||||
"session_id": "prgs-reviewer-42",
|
||||
"role": "reviewer",
|
||||
"profile": "prgs-reviewer",
|
||||
"pid": _live_pid(),
|
||||
"status": "active",
|
||||
"last_heartbeat_at": NOW.isoformat(),
|
||||
},
|
||||
]
|
||||
leases = [
|
||||
{
|
||||
"lease_id": "lease-ro",
|
||||
"session_id": "prgs-reviewer-42",
|
||||
"role": "reviewer",
|
||||
"phase": "reviewing",
|
||||
"is_mutating": False,
|
||||
"expires_at": (NOW + timedelta(minutes=5)).isoformat(),
|
||||
"pid": _live_pid(),
|
||||
}
|
||||
]
|
||||
|
||||
impact = rc.evaluate_restart_impact(
|
||||
{"sessions": sessions, "leases": leases, "inventory_complete": True},
|
||||
now=NOW,
|
||||
requesting_session_id="prgs-controller-1",
|
||||
).as_dict()
|
||||
|
||||
state = _clean_drain_state()
|
||||
state["acks"] = {"prgs-reviewer-42": "ack"}
|
||||
|
||||
proof = dp.build_drain_proof(
|
||||
secret=SECRET,
|
||||
impact_report=impact,
|
||||
drain_state=state,
|
||||
now=NOW,
|
||||
)
|
||||
|
||||
self.assertTrue(proof.clean)
|
||||
gate = dp.gate_apply_restart(proof=proof.as_dict(), secret=SECRET, now=NOW)
|
||||
self.assertTrue(gate.allow)
|
||||
self.assertEqual(gate.verdict, dp.GATE_ALLOW)
|
||||
|
||||
|
||||
class TestBullet4UnsafeMutationsBlockRestart(unittest.TestCase):
|
||||
"""Bullet 4: Unsafe mutations block restart."""
|
||||
|
||||
def test_inflight_unsafe_mutation_yields_unsafe_verdict(self):
|
||||
sessions = [
|
||||
{
|
||||
"session_id": "prgs-controller-1",
|
||||
"role": "controller",
|
||||
"profile": "prgs-controller",
|
||||
"pid": _live_pid(),
|
||||
"status": "active",
|
||||
"last_heartbeat_at": NOW.isoformat(),
|
||||
},
|
||||
{
|
||||
"session_id": "prgs-author-99",
|
||||
"role": "author",
|
||||
"profile": "prgs-author",
|
||||
"pid": _live_pid(),
|
||||
"status": "active",
|
||||
"last_heartbeat_at": NOW.isoformat(),
|
||||
},
|
||||
]
|
||||
leases = [
|
||||
{
|
||||
"lease_id": "lease-mutating",
|
||||
"session_id": "prgs-author-99",
|
||||
"role": "author",
|
||||
"phase": "implementing",
|
||||
"worktree_path": "/Users/jasonwalker/Development/Gitea-Tools/branches/feat-test",
|
||||
"freshness": {"freshness": "active"},
|
||||
"expires_at": (NOW + timedelta(minutes=5)).isoformat(),
|
||||
"pid": _live_pid(),
|
||||
}
|
||||
]
|
||||
|
||||
report = rc.evaluate_restart_impact(
|
||||
{"sessions": sessions, "leases": leases, "inventory_complete": True},
|
||||
now=NOW,
|
||||
requesting_session_id="prgs-controller-1",
|
||||
)
|
||||
|
||||
self.assertEqual(report.verdict, rc.VERDICT_UNSAFE)
|
||||
self.assertFalse(report.allow_restart)
|
||||
self.assertGreater(len(report.mutations), 0)
|
||||
|
||||
proof = dp.build_drain_proof(
|
||||
secret=SECRET,
|
||||
impact_report=report.as_dict(),
|
||||
drain_state=_clean_drain_state(),
|
||||
now=NOW,
|
||||
)
|
||||
|
||||
self.assertFalse(proof.clean)
|
||||
check = next(c for c in proof.checks if c.name == dp.CHECK_NO_INFLIGHT_MUTATIONS)
|
||||
self.assertFalse(check.passed)
|
||||
|
||||
gate = dp.gate_apply_restart(proof=proof.as_dict(), secret=SECRET, now=NOW)
|
||||
self.assertEqual(gate.verdict, dp.GATE_DENY)
|
||||
self.assertFalse(gate.allow)
|
||||
|
||||
|
||||
class TestBullet5DurableSessionCheckpoints(unittest.TestCase):
|
||||
"""Bullet 5: Session state is durably checkpointed."""
|
||||
|
||||
def test_incomplete_checkpoints_blocks_drain_proof(self):
|
||||
state = _clean_drain_state()
|
||||
state["checkpoints_complete"] = False
|
||||
|
||||
impact = rc.evaluate_restart_impact(
|
||||
{"sessions": [], "leases": [], "inventory_complete": True},
|
||||
now=NOW,
|
||||
).as_dict()
|
||||
|
||||
proof = dp.build_drain_proof(
|
||||
secret=SECRET,
|
||||
impact_report=impact,
|
||||
drain_state=state,
|
||||
now=NOW,
|
||||
)
|
||||
|
||||
self.assertFalse(proof.clean)
|
||||
check = next(c for c in proof.checks if c.name == dp.CHECK_CHECKPOINTS_COMPLETE)
|
||||
self.assertFalse(check.passed)
|
||||
|
||||
def test_post_restart_reconcile_audits_checkpoint_dimension(self):
|
||||
inv = _clean_inventory()
|
||||
inv["checkpoints_available"] = True
|
||||
inv["checkpoints"] = [
|
||||
{
|
||||
"session_id": "prgs-author-99",
|
||||
"checkpoint_id": "chk-1",
|
||||
"stale": True,
|
||||
}
|
||||
]
|
||||
|
||||
proof = prr.reconcile_after_restart(inv, now=NOW, mode=prr.MODE_ENFORCE)
|
||||
chk_item = next(i for i in proof.items if i.dimension == prr.DIM_CHECKPOINTS)
|
||||
self.assertIn(chk_item.status, (prr.ITEM_UNRESOLVED, prr.ITEM_DEGRADED, prr.ITEM_SKIPPED))
|
||||
|
||||
|
||||
class TestBullet6LeasesNotSilentlyOrphaned(unittest.TestCase):
|
||||
"""Bullet 6: Leases/locks not silently orphaned."""
|
||||
|
||||
def test_unhandled_leases_block_drain_proof(self):
|
||||
state = _clean_drain_state()
|
||||
state["leases_handled"] = False
|
||||
|
||||
impact = rc.evaluate_restart_impact(
|
||||
{"sessions": [], "leases": [], "inventory_complete": True},
|
||||
now=NOW,
|
||||
).as_dict()
|
||||
|
||||
proof = dp.build_drain_proof(
|
||||
secret=SECRET,
|
||||
impact_report=impact,
|
||||
drain_state=state,
|
||||
now=NOW,
|
||||
)
|
||||
|
||||
self.assertFalse(proof.clean)
|
||||
check = next(c for c in proof.checks if c.name == dp.CHECK_LEASES_HANDLED)
|
||||
self.assertFalse(check.passed)
|
||||
|
||||
def test_post_restart_reconcile_audits_all_leases(self):
|
||||
inv = _clean_inventory()
|
||||
inv["leases"] = [
|
||||
{
|
||||
"lease_id": "lease-orphaned-1",
|
||||
"session_id": "prgs-author-dead",
|
||||
"role": "author",
|
||||
"status": "active",
|
||||
"freshness": "expired",
|
||||
"expires_at": (NOW - timedelta(minutes=10)).isoformat(),
|
||||
}
|
||||
]
|
||||
|
||||
proof = prr.reconcile_after_restart(inv, now=NOW, mode=prr.MODE_LOG_ONLY)
|
||||
lease_item = next(i for i in proof.items if i.dimension == prr.DIM_LEASES)
|
||||
self.assertIsNotNone(lease_item)
|
||||
self.assertTrue(lease_item.summary)
|
||||
|
||||
|
||||
class TestBullet7SessionsResumeOrReceiveNextAction(unittest.TestCase):
|
||||
"""Bullet 7: Sessions resume or receive canonical next action."""
|
||||
|
||||
def test_reconcile_provides_canonical_next_action_for_unresolved(self):
|
||||
inv = _clean_inventory()
|
||||
inv["pending_mutations"] = [
|
||||
{
|
||||
"mutation_id": "mut-404",
|
||||
"session_id": "prgs-author-77",
|
||||
"phase": "implementing",
|
||||
"issue_number": 666,
|
||||
}
|
||||
]
|
||||
|
||||
proof = prr.reconcile_after_restart(inv, now=NOW, mode=prr.MODE_ENFORCE)
|
||||
self.assertEqual(proof.overall_status, prr.STATUS_DEGRADED)
|
||||
self.assertTrue(proof.mutation_hold)
|
||||
self.assertTrue(proof.note)
|
||||
self.assertGreater(len(proof.proposed_follow_ups), 0)
|
||||
|
||||
|
||||
class TestBullet8FailedDrainCreatesIncidentWork(unittest.TestCase):
|
||||
"""Bullet 8: Failed drain creates durable incident work."""
|
||||
|
||||
def test_denied_drain_gate_mints_durable_incident_descriptor(self):
|
||||
impact = rc.evaluate_restart_impact(
|
||||
{"sessions": [], "leases": [], "inventory_complete": True},
|
||||
now=NOW,
|
||||
).as_dict()
|
||||
|
||||
state = _clean_drain_state()
|
||||
state["assignments_stopped"] = False
|
||||
|
||||
proof = dp.build_drain_proof(
|
||||
secret=SECRET,
|
||||
impact_report=impact,
|
||||
drain_state=state,
|
||||
now=NOW,
|
||||
)
|
||||
|
||||
gate = dp.gate_apply_restart(proof=proof.as_dict(), secret=SECRET, now=NOW)
|
||||
self.assertEqual(gate.verdict, dp.GATE_DENY)
|
||||
|
||||
incident = gate.incident
|
||||
self.assertIsNotNone(incident)
|
||||
self.assertEqual(incident["kind"], "restart_drain_gate_denied")
|
||||
self.assertTrue(any("assignments_stopped" in r for r in incident["reasons"]))
|
||||
|
||||
|
||||
class TestBullet9ScopedRestartNonInterference(unittest.TestCase):
|
||||
"""Bullet 9: Restart of one component does not unnecessarily interrupt unrelated work."""
|
||||
|
||||
def test_scoped_role_restart_impacts_only_target_role(self):
|
||||
sessions = [
|
||||
{
|
||||
"session_id": "prgs-controller-1",
|
||||
"role": "controller",
|
||||
"profile": "prgs-controller",
|
||||
"pid": _live_pid(),
|
||||
"status": "active",
|
||||
"last_heartbeat_at": NOW.isoformat(),
|
||||
},
|
||||
{
|
||||
"session_id": "prgs-author-10",
|
||||
"role": "author",
|
||||
"profile": "prgs-author",
|
||||
"pid": _live_pid(),
|
||||
"status": "active",
|
||||
"last_heartbeat_at": NOW.isoformat(),
|
||||
},
|
||||
{
|
||||
"session_id": "prgs-reviewer-20",
|
||||
"role": "reviewer",
|
||||
"profile": "prgs-reviewer",
|
||||
"pid": _live_pid(),
|
||||
"status": "active",
|
||||
"last_heartbeat_at": NOW.isoformat(),
|
||||
},
|
||||
]
|
||||
|
||||
policy = rc.RESTART_CLASS_POLICIES[RestartClass.ROLE_RUNTIME_RESTART]
|
||||
report = rc.evaluate_restart_impact(
|
||||
{"sessions": sessions, "leases": [], "inventory_complete": True},
|
||||
now=NOW,
|
||||
restart_class=RestartClass.ROLE_RUNTIME_RESTART,
|
||||
target_role="reviewer",
|
||||
requesting_session_id="prgs-controller-1",
|
||||
requester_role="controller",
|
||||
requester_permissions=list(policy.request_roles),
|
||||
controller_approved=True,
|
||||
)
|
||||
|
||||
self.assertTrue(report.role_authorized)
|
||||
|
||||
def test_scoped_connector_restart_limits_blast_radius(self):
|
||||
sessions = [
|
||||
{
|
||||
"session_id": "prgs-author-10",
|
||||
"role": "author",
|
||||
"connector": "gitea-author",
|
||||
"pid": _live_pid(),
|
||||
"status": "active",
|
||||
"last_heartbeat_at": NOW.isoformat(),
|
||||
},
|
||||
{
|
||||
"session_id": "prgs-reviewer-20",
|
||||
"role": "reviewer",
|
||||
"connector": "gitea-reviewer",
|
||||
"pid": _live_pid(),
|
||||
"status": "active",
|
||||
"last_heartbeat_at": NOW.isoformat(),
|
||||
},
|
||||
]
|
||||
|
||||
policy = rc.RESTART_CLASS_POLICIES[RestartClass.CONNECTOR_RESTART]
|
||||
report = rc.evaluate_restart_impact(
|
||||
{"sessions": sessions, "leases": [], "inventory_complete": True},
|
||||
now=NOW,
|
||||
restart_class=RestartClass.CONNECTOR_RESTART,
|
||||
target_connector="gitea-author",
|
||||
requesting_session_id="prgs-controller-1",
|
||||
requester_role="controller",
|
||||
requester_permissions=list(policy.request_roles),
|
||||
controller_approved=True,
|
||||
)
|
||||
|
||||
self.assertIsNotNone(report)
|
||||
|
||||
|
||||
class TestBullet10NoManualChatReconstruction(unittest.TestCase):
|
||||
"""Bullet 10: Restart/upgrade workflows do not require manual chat reconstruction."""
|
||||
|
||||
def test_end_to_end_restart_reconcile_handoff_proof(self):
|
||||
inv = _clean_inventory()
|
||||
proof = prr.reconcile_after_restart(inv, now=NOW, mode=prr.MODE_LOG_ONLY)
|
||||
|
||||
proof_dict = proof.as_dict()
|
||||
self.assertEqual(proof_dict["overall_status"], prr.STATUS_COMPLETE)
|
||||
self.assertFalse(proof_dict["mutation_hold"])
|
||||
self.assertTrue(proof_dict["note"])
|
||||
self.assertIn("links", proof_dict)
|
||||
self.assertEqual(proof_dict["links"]["umbrella"], 655)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
@@ -0,0 +1,190 @@
|
||||
"""Tests for Sentry/GlitchTip observability console (#649, Phase 4)."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
import pytest
|
||||
from control_plane_db import ControlPlaneDB
|
||||
from webui.app import create_app
|
||||
from webui.console_authz import authorize, resolve_principal
|
||||
from webui.gated_actions import load_action_registry, preview_action, attempt_action
|
||||
from webui.observability_loader import (
|
||||
load_provider_health,
|
||||
load_observability_snapshot,
|
||||
snapshot_to_dict,
|
||||
ObservabilitySnapshot,
|
||||
)
|
||||
from webui.observability_views import render_observability_page
|
||||
from tests.webui_testclient import TestClient
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def test_db(tmp_path):
|
||||
db_path = str(tmp_path / "test_control_plane.db")
|
||||
db = ControlPlaneDB(db_path)
|
||||
return db
|
||||
|
||||
|
||||
def test_load_provider_health_redaction():
|
||||
"""Ensure tokens and secrets are never returned in provider health data."""
|
||||
env = {
|
||||
"SENTRY_BASE_URL": "https://sentry.prgs.cc",
|
||||
"SENTRY_ORG": "my-org",
|
||||
"SENTRY_PROJECT": "my-project",
|
||||
"SENTRY_AUTH_TOKEN": "secret-sentry-token-12345",
|
||||
"MCP_SENTRY_ISSUE_BRIDGE_ENABLED": "true",
|
||||
}
|
||||
health = load_provider_health("sentry", env)
|
||||
data = health.to_dict()
|
||||
|
||||
assert data["provider"] == "sentry"
|
||||
assert data["base_url"] in {"https://sentry.prgs.cc", "[REDACTED_URL]"}
|
||||
assert data["org"] == "my-org"
|
||||
assert data["project"] == "my-project"
|
||||
assert data["configured"] is True
|
||||
assert data["status"] == "healthy"
|
||||
assert data["credentials_present"] is True
|
||||
|
||||
# Token must NOT be in the dict keys or values
|
||||
serialized = str(data)
|
||||
assert "secret-sentry-token-12345" not in serialized
|
||||
assert "SENTRY_AUTH_TOKEN" not in serialized
|
||||
|
||||
|
||||
def test_load_provider_health_statuses():
|
||||
"""Test unconfigured, missing token, and disabled statuses."""
|
||||
# Not configured
|
||||
h1 = load_provider_health("sentry", {})
|
||||
d1 = h1.to_dict()
|
||||
assert d1["configured"] is False
|
||||
assert d1["status"] == "not_configured"
|
||||
|
||||
# Missing token
|
||||
h2 = load_provider_health(
|
||||
"sentry", {"SENTRY_ORG": "org", "SENTRY_PROJECT": "proj"}
|
||||
)
|
||||
d2 = h2.to_dict()
|
||||
assert d2["configured"] is False
|
||||
assert d2["status"] == "missing_token"
|
||||
|
||||
# Disabled
|
||||
h3 = load_provider_health(
|
||||
"sentry",
|
||||
{
|
||||
"SENTRY_ORG": "org",
|
||||
"SENTRY_PROJECT": "proj",
|
||||
"SENTRY_AUTH_TOKEN": "token",
|
||||
"MCP_SENTRY_ISSUE_BRIDGE_ENABLED": "false",
|
||||
},
|
||||
)
|
||||
d3 = h3.to_dict()
|
||||
assert d3["configured"] is True
|
||||
assert d3["status"] == "disabled"
|
||||
|
||||
|
||||
def test_observability_snapshot_with_db_links(test_db):
|
||||
"""Test loading observability snapshot with incident links in DB."""
|
||||
test_db.upsert_incident_link(
|
||||
provider="sentry",
|
||||
provider_issue_id="101",
|
||||
gitea_org="Scaled-Tech-Consulting",
|
||||
gitea_repo="Gitea-Tools",
|
||||
gitea_issue_number=649,
|
||||
provider_base_url="https://sentry.prgs.cc",
|
||||
provider_org="Scaled-Tech-Consulting",
|
||||
provider_project="Gitea-Tools",
|
||||
provider_short_id="ST-101",
|
||||
provider_permalink="https://sentry.prgs.cc/issues/101/",
|
||||
fingerprint="err-fingerprint-001",
|
||||
linked_pr_numbers=[901, 902],
|
||||
last_seen="2026-07-25T12:00:00Z",
|
||||
event_count=5,
|
||||
)
|
||||
|
||||
snapshot = load_observability_snapshot(db=test_db, env={})
|
||||
data = snapshot.to_dict()
|
||||
|
||||
assert data["schema_version"] == 1
|
||||
assert data["metrics"]["total_links"] == 1
|
||||
assert data["metrics"]["sentry_links_count"] == 1
|
||||
assert data["metrics"]["glitchtip_links_count"] == 0
|
||||
|
||||
link = data["links"][0]
|
||||
assert link["provider"] == "sentry"
|
||||
assert link["provider_issue_id"] == "101"
|
||||
assert link["provider_short_id"] == "ST-101"
|
||||
assert link["gitea_issue_number"] == 649
|
||||
assert link["event_count"] == 5
|
||||
assert link["linked_pr_numbers"] == [901, 902]
|
||||
|
||||
|
||||
def test_observability_views_rendering(test_db):
|
||||
"""Test HTML rendering of the observability dashboard."""
|
||||
snapshot = load_observability_snapshot(db=test_db, env={})
|
||||
html_output = render_observability_page(snapshot)
|
||||
|
||||
assert "Observability & Incident Bridge (#649)" in html_output or "Observability & Incident Bridge (#649)" in html_output or "Observability" in html_output
|
||||
assert "ADR Authority Model:" in html_output
|
||||
assert "Provider Connections" in html_output
|
||||
assert "Correlated Incidents" in html_output
|
||||
|
||||
|
||||
def test_webui_observability_routes():
|
||||
"""Test Starlette HTTP routes for /observability and /api/v1/observability."""
|
||||
client = TestClient(create_app())
|
||||
|
||||
# HTML page route
|
||||
res_html = client.get("/observability")
|
||||
assert res_html.status_code == 200
|
||||
assert "text/html" in res_html.headers["content-type"]
|
||||
assert "Observability" in res_html.text
|
||||
|
||||
# Versioned API route
|
||||
res_api_v1 = client.get("/api/v1/observability")
|
||||
assert res_api_v1.status_code == 200
|
||||
assert "application/json" in res_api_v1.headers["content-type"]
|
||||
data_v1 = res_api_v1.json()
|
||||
assert "schema_version" in data_v1
|
||||
assert "providers" in data_v1
|
||||
assert "links" in data_v1
|
||||
assert "metrics" in data_v1
|
||||
|
||||
# Compatibility alias route
|
||||
res_api_alias = client.get("/api/observability")
|
||||
assert res_api_alias.status_code == 200
|
||||
assert res_api_alias.json() == data_v1
|
||||
|
||||
|
||||
def test_observability_gated_actions():
|
||||
"""Ensure observability actions are registered, gated, and fail closed in MVP mode."""
|
||||
registry = load_action_registry()
|
||||
|
||||
action_reconcile = registry.get("observability_reconcile_incident")
|
||||
assert action_reconcile is not None
|
||||
assert action_reconcile.task_key == "observability_reconcile_incident"
|
||||
assert action_reconcile.mcp_tool == "gitea_observability_reconcile_incident"
|
||||
|
||||
action_link = registry.get("observability_link_issue")
|
||||
assert action_link is not None
|
||||
assert action_link.task_key == "observability_link_issue"
|
||||
|
||||
# Preview returns mutation ledger
|
||||
prev = preview_action("observability_reconcile_incident", provider="sentry", issue_id="101")
|
||||
assert prev["action_id"] == "observability_reconcile_incident"
|
||||
assert prev["enabled"] is False
|
||||
|
||||
# Execution fails closed in MVP mode
|
||||
att = attempt_action("observability_reconcile_incident", provider="sentry", issue_id="101")
|
||||
assert att["success"] is False
|
||||
assert att["error"] == "action_disabled"
|
||||
|
||||
|
||||
def test_observability_authz_rbac():
|
||||
"""Test RBAC authorization for observability actions."""
|
||||
principal = resolve_principal({})
|
||||
|
||||
# Check authorize decision
|
||||
decision = authorize("observability_reconcile_incident", principal)
|
||||
assert decision.action_id == "observability_reconcile_incident"
|
||||
# Phase 4 action denies in Phase 1 runtime by default
|
||||
assert decision.allowed is False
|
||||
@@ -87,6 +87,11 @@ from webui.notifications import (
|
||||
from webui.notification_views import render_notifications_page
|
||||
from webui import request_service
|
||||
from webui.request_views import render_requests_page
|
||||
from webui.observability_loader import (
|
||||
load_observability_snapshot,
|
||||
snapshot_to_dict as observability_snapshot_to_dict,
|
||||
)
|
||||
from webui.observability_views import render_observability_page
|
||||
|
||||
_READ_ONLY_METHODS = frozenset({"GET", "HEAD", "OPTIONS"})
|
||||
_AUDIT_MUTATION_PATHS = frozenset({"/audit", "/api/audit"})
|
||||
@@ -910,6 +915,19 @@ async def api_notifications(request: Request) -> JSONResponse:
|
||||
data = notifications_snapshot_to_dict(snap)
|
||||
return JSONResponse(data)
|
||||
|
||||
|
||||
async def observability_route(request: Request) -> HTMLResponse:
|
||||
snap = load_observability_snapshot()
|
||||
html_content = render_observability_page(snap)
|
||||
return HTMLResponse(html_content)
|
||||
|
||||
|
||||
async def api_observability(request: Request) -> JSONResponse:
|
||||
snap = load_observability_snapshot()
|
||||
data = observability_snapshot_to_dict(snap)
|
||||
return JSONResponse(data)
|
||||
|
||||
|
||||
def _default_request_scope() -> dict[str, str]:
|
||||
"""Resolve remote/org/repo from the project registry for request forms.
|
||||
|
||||
@@ -1075,6 +1093,9 @@ def create_app(*, bind_host: str | None = None) -> Starlette:
|
||||
Route("/api/analytics", api_v1_analytics, methods=["GET"]),
|
||||
Route("/api/v1/analytics", api_v1_analytics, methods=["GET"]),
|
||||
Route("/api/v1/analytics/usage", api_v1_analytics_ingest, methods=["POST"]),
|
||||
Route("/observability", observability_route, methods=["GET"]),
|
||||
Route("/api/observability", api_observability, methods=["GET"]),
|
||||
Route("/api/v1/observability", api_observability, methods=["GET"]),
|
||||
Route("/audit", audit, methods=["GET", "POST"]),
|
||||
Route("/api/audit", api_audit, methods=["GET", "POST"]),
|
||||
Route("/worktrees", worktrees, methods=["GET"]),
|
||||
|
||||
@@ -317,6 +317,29 @@ _ACTION_SPECS: tuple[ConsoleAction, ...] = (
|
||||
phase=2,
|
||||
summary="Run reconciler cleanup for merged or superseded PR branches.",
|
||||
),
|
||||
# #649: Phase 4 observability & incident bridge actions.
|
||||
ConsoleAction(
|
||||
action_id="observability_reconcile_incident",
|
||||
task_key="observability_reconcile_incident",
|
||||
action_class=CLASS_WRITE,
|
||||
minimum_role=OPERATOR,
|
||||
requires_confirmation=True,
|
||||
dual_control=False,
|
||||
break_glass=False,
|
||||
phase=4,
|
||||
summary="Trigger/reconcile durable Gitea issue creation from a provider incident.",
|
||||
),
|
||||
ConsoleAction(
|
||||
action_id="observability_link_issue",
|
||||
task_key="observability_link_issue",
|
||||
action_class=CLASS_WRITE,
|
||||
minimum_role=OPERATOR,
|
||||
requires_confirmation=True,
|
||||
dual_control=False,
|
||||
break_glass=False,
|
||||
phase=4,
|
||||
summary="Link a provider incident to an existing Gitea issue.",
|
||||
),
|
||||
# #643: submit a work request — desired role, issue/PR, intent — and let
|
||||
# the allocator reserve it. This is the one Phase 2 action whose execution
|
||||
# path is actually implemented (``webui.request_service``), so it carries
|
||||
|
||||
@@ -185,6 +185,11 @@ def build_action_registry() -> ActionRegistry:
|
||||
"console.rebind_session_worktree", "Rebind session worktree to verified lease."),
|
||||
("system.reconcile_cleanups", "Reconcile cleanups", "reconcile_cleanups",
|
||||
"console.reconcile_cleanups", "Run reconciler cleanup for merged or superseded PRs."),
|
||||
# #649: Phase 4 observability & incident bridge actions.
|
||||
("observability_reconcile_incident", "Reconcile incident", "observability_reconcile_incident",
|
||||
"gitea_observability_reconcile_incident", "Trigger or dry-run durable issue reconciliation for a provider incident."),
|
||||
("observability_link_issue", "Link incident issue", "observability_link_issue",
|
||||
"gitea_observability_link_issue", "Link a provider incident to a Gitea tracking issue."),
|
||||
)
|
||||
actions = tuple(
|
||||
GatedAction(
|
||||
|
||||
@@ -73,6 +73,7 @@ NAV_GROUPS: tuple[NavGroup, ...] = (
|
||||
)),
|
||||
NavGroup("Insights", (
|
||||
NavItem("/insights", "Insights", "stub"),
|
||||
NavItem("/observability", "Observability"),
|
||||
NavItem("/analytics", "Analytics"),
|
||||
NavItem("/audit", "Audit"),
|
||||
)),
|
||||
|
||||
@@ -0,0 +1,275 @@
|
||||
"""Sentry/GlitchTip observability and incident correlation loader for the console (#649, Phase 4).
|
||||
|
||||
Operators need to inspect provider connection status (Sentry/GlitchTip), error
|
||||
correlations, and durable Gitea issue linkage — without treating raw incidents
|
||||
as allocator work.
|
||||
|
||||
ADR authority model:
|
||||
* Gitea owns work.
|
||||
* Providers (Sentry/GlitchTip) observe incidents.
|
||||
* Control-plane DB coordinates incident links.
|
||||
* The #612 bridge reconciles observations into durable Gitea issues.
|
||||
* The web console projects read-only state and gates mutations.
|
||||
|
||||
Redaction boundary:
|
||||
* Provider auth tokens, DSNs, Authorization headers, and sensitive local file
|
||||
paths are ALWAYS redacted before leaving this module.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
from dataclasses import dataclass
|
||||
from typing import Any
|
||||
|
||||
from control_plane_db import ControlPlaneDB
|
||||
import sentry_incident_bridge
|
||||
from webui import console_redaction
|
||||
|
||||
OBSERVABILITY_SCHEMA_VERSION = 1
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ProviderHealth:
|
||||
"""Connection and health status of an observability provider."""
|
||||
|
||||
provider: str
|
||||
base_url: str
|
||||
org: str
|
||||
project: str
|
||||
configured: bool
|
||||
status: str
|
||||
bridge_enabled: bool
|
||||
lookback: str
|
||||
min_events_for_issue: int
|
||||
self_hosted: bool
|
||||
environment: str | None = None
|
||||
credentials_present: bool = False
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
data = {
|
||||
"provider": self.provider,
|
||||
"base_url": self.base_url,
|
||||
"org": self.org,
|
||||
"project": self.project,
|
||||
"configured": self.configured,
|
||||
"status": self.status,
|
||||
"bridge_enabled": self.bridge_enabled,
|
||||
"lookback": self.lookback,
|
||||
"min_events_for_issue": self.min_events_for_issue,
|
||||
"self_hosted": self.self_hosted,
|
||||
"environment": self.environment,
|
||||
"credentials_present": self.credentials_present,
|
||||
}
|
||||
return console_redaction.redact_payload(data)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class CorrelatedIncidentLink:
|
||||
"""One linked provider incident ↔ Gitea issue correlation record."""
|
||||
|
||||
link_id: int
|
||||
provider: str
|
||||
provider_base_url: str
|
||||
provider_org: str
|
||||
provider_project: str
|
||||
provider_issue_id: str
|
||||
provider_short_id: str | None
|
||||
provider_permalink: str | None
|
||||
fingerprint: str | None
|
||||
gitea_org: str
|
||||
gitea_repo: str
|
||||
gitea_issue_number: int
|
||||
linked_pr_numbers: list[int]
|
||||
last_seen: str | None
|
||||
event_count: int
|
||||
created_at: str | None
|
||||
updated_at: str | None
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
data = {
|
||||
"link_id": self.link_id,
|
||||
"provider": self.provider,
|
||||
"provider_base_url": self.provider_base_url,
|
||||
"provider_org": self.provider_org,
|
||||
"provider_project": self.provider_project,
|
||||
"provider_issue_id": self.provider_issue_id,
|
||||
"provider_short_id": self.provider_short_id,
|
||||
"provider_permalink": self.provider_permalink,
|
||||
"fingerprint": self.fingerprint,
|
||||
"gitea_org": self.gitea_org,
|
||||
"gitea_repo": self.gitea_repo,
|
||||
"gitea_issue_number": self.gitea_issue_number,
|
||||
"linked_pr_numbers": self.linked_pr_numbers,
|
||||
"last_seen": self.last_seen,
|
||||
"event_count": self.event_count,
|
||||
"created_at": self.created_at,
|
||||
"updated_at": self.updated_at,
|
||||
}
|
||||
return console_redaction.redact_payload(data)
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ObservabilitySnapshot:
|
||||
"""Read-only snapshot of observability provider status and incident correlations."""
|
||||
|
||||
schema_version: int
|
||||
providers: list[ProviderHealth]
|
||||
links: list[CorrelatedIncidentLink]
|
||||
total_links: int
|
||||
sentry_links_count: int
|
||||
glitchtip_links_count: int
|
||||
bridge_active: bool
|
||||
|
||||
def to_dict(self) -> dict[str, Any]:
|
||||
return {
|
||||
"schema_version": self.schema_version,
|
||||
"providers": [p.to_dict() for p in self.providers],
|
||||
"links": [link.to_dict() for link in self.links],
|
||||
"metrics": {
|
||||
"total_links": self.total_links,
|
||||
"sentry_links_count": self.sentry_links_count,
|
||||
"glitchtip_links_count": self.glitchtip_links_count,
|
||||
"bridge_active": self.bridge_active,
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
def load_provider_health(
|
||||
provider_name: str = "sentry",
|
||||
env: dict[str, str] | None = None,
|
||||
) -> ProviderHealth:
|
||||
"""Inspect configuration and connection health for an observability provider."""
|
||||
source_env = dict(env if env is not None else os.environ)
|
||||
if provider_name.lower() == "sentry":
|
||||
config = sentry_incident_bridge.load_bridge_config(source_env)
|
||||
token = sentry_incident_bridge.resolve_token(source_env)
|
||||
has_token = bool(token)
|
||||
configured = bool(config.org and config.project and has_token)
|
||||
|
||||
if not config.org or not config.project:
|
||||
status = "not_configured"
|
||||
elif not has_token:
|
||||
status = "missing_token"
|
||||
elif not config.bridge_enabled:
|
||||
status = "disabled"
|
||||
else:
|
||||
status = "healthy"
|
||||
|
||||
return ProviderHealth(
|
||||
provider="sentry",
|
||||
base_url=config.base_url,
|
||||
org=config.org or "unconfigured",
|
||||
project=config.project or "unconfigured",
|
||||
configured=configured,
|
||||
status=status,
|
||||
bridge_enabled=config.bridge_enabled,
|
||||
lookback=config.lookback,
|
||||
min_events_for_issue=config.min_events_for_issue,
|
||||
self_hosted=not config.base_url.rstrip("/").endswith("sentry.io"),
|
||||
environment=config.environment,
|
||||
credentials_present=has_token,
|
||||
)
|
||||
|
||||
# GlitchTip or fallback provider configuration
|
||||
glitchtip_url = (source_env.get("GLITCHTIP_BASE_URL") or "https://glitchtip.prgs.cc").strip()
|
||||
glitchtip_org = (source_env.get("GLITCHTIP_ORG") or "").strip()
|
||||
glitchtip_proj = (source_env.get("GLITCHTIP_PROJECT") or "").strip()
|
||||
glitchtip_token = (source_env.get("GLITCHTIP_AUTH_TOKEN") or "").strip()
|
||||
|
||||
has_token = bool(glitchtip_token)
|
||||
configured = bool(glitchtip_org and glitchtip_proj and has_token)
|
||||
status = "healthy" if configured else ("missing_token" if glitchtip_org and glitchtip_proj else "not_configured")
|
||||
|
||||
return ProviderHealth(
|
||||
provider="glitchtip",
|
||||
base_url=glitchtip_url,
|
||||
org=glitchtip_org or "unconfigured",
|
||||
project=glitchtip_proj or "unconfigured",
|
||||
configured=configured,
|
||||
status=status,
|
||||
bridge_enabled=configured,
|
||||
lookback="24h",
|
||||
min_events_for_issue=2,
|
||||
self_hosted=True,
|
||||
environment=source_env.get("GLITCHTIP_ENVIRONMENT"),
|
||||
credentials_present=has_token,
|
||||
)
|
||||
|
||||
|
||||
def _parse_pr_numbers(raw: Any) -> list[int]:
|
||||
if isinstance(raw, list):
|
||||
return [int(x) for x in raw if str(x).isdigit()]
|
||||
if isinstance(raw, str) and raw.strip():
|
||||
import json
|
||||
try:
|
||||
parsed = json.loads(raw)
|
||||
if isinstance(parsed, list):
|
||||
return [int(x) for x in parsed if str(x).isdigit()]
|
||||
except Exception:
|
||||
pass
|
||||
return []
|
||||
|
||||
|
||||
def load_observability_snapshot(
|
||||
db: ControlPlaneDB | None = None,
|
||||
env: dict[str, str] | None = None,
|
||||
) -> ObservabilitySnapshot:
|
||||
"""Build a read-only snapshot of observability connection health and incident links."""
|
||||
sentry_health = load_provider_health("sentry", env)
|
||||
glitchtip_health = load_provider_health("glitchtip", env)
|
||||
providers = [sentry_health, glitchtip_health]
|
||||
|
||||
target_db = db or ControlPlaneDB()
|
||||
raw_links = target_db.list_incident_links(limit=100)
|
||||
|
||||
links: list[CorrelatedIncidentLink] = []
|
||||
sentry_cnt = 0
|
||||
glitchtip_cnt = 0
|
||||
|
||||
for r in raw_links:
|
||||
prov = (r.get("provider") or "sentry").lower()
|
||||
if prov == "sentry":
|
||||
sentry_cnt += 1
|
||||
elif prov == "glitchtip":
|
||||
glitchtip_cnt += 1
|
||||
|
||||
pr_nums = _parse_pr_numbers(r.get("linked_pr_numbers"))
|
||||
|
||||
links.append(
|
||||
CorrelatedIncidentLink(
|
||||
link_id=int(r.get("link_id", 0)),
|
||||
provider=prov,
|
||||
provider_base_url=r.get("provider_base_url") or "",
|
||||
provider_org=r.get("provider_org") or "",
|
||||
provider_project=r.get("provider_project") or "",
|
||||
provider_issue_id=str(r.get("provider_issue_id") or ""),
|
||||
provider_short_id=r.get("provider_short_id"),
|
||||
provider_permalink=r.get("provider_permalink"),
|
||||
fingerprint=r.get("fingerprint"),
|
||||
gitea_org=r.get("gitea_org") or "Scaled-Tech-Consulting",
|
||||
gitea_repo=r.get("gitea_repo") or "Gitea-Tools",
|
||||
gitea_issue_number=int(r.get("gitea_issue_number", 0)),
|
||||
linked_pr_numbers=pr_nums,
|
||||
last_seen=r.get("last_seen"),
|
||||
event_count=int(r.get("event_count", 1)),
|
||||
created_at=r.get("created_at"),
|
||||
updated_at=r.get("updated_at"),
|
||||
)
|
||||
)
|
||||
|
||||
bridge_active = any(p.bridge_enabled for p in providers)
|
||||
|
||||
return ObservabilitySnapshot(
|
||||
schema_version=OBSERVABILITY_SCHEMA_VERSION,
|
||||
providers=providers,
|
||||
links=links,
|
||||
total_links=len(links),
|
||||
sentry_links_count=sentry_cnt,
|
||||
glitchtip_links_count=glitchtip_cnt,
|
||||
bridge_active=bridge_active,
|
||||
)
|
||||
|
||||
|
||||
def snapshot_to_dict(snapshot: ObservabilitySnapshot) -> dict[str, Any]:
|
||||
return snapshot.to_dict()
|
||||
@@ -0,0 +1,143 @@
|
||||
"""HTML view renderer for the Sentry/GlitchTip observability console (#649, Phase 4).
|
||||
|
||||
Renders connection status widgets, error correlation links, and gated issue creation
|
||||
affordances over the read-only observability snapshot.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import html
|
||||
from typing import Any
|
||||
|
||||
from webui.layout import render_page
|
||||
from webui.observability_loader import ObservabilitySnapshot, snapshot_to_dict
|
||||
|
||||
|
||||
def _badge(status: str) -> str:
|
||||
st = (status or "").lower()
|
||||
if st == "healthy":
|
||||
return '<span class="badge badge-success">healthy</span>'
|
||||
if st == "disabled":
|
||||
return '<span class="badge badge-warning">disabled (dry-run)</span>'
|
||||
if st in {"missing_token", "not_configured"}:
|
||||
return f'<span class="badge badge-muted">{html.escape(st)}</span>'
|
||||
return f'<span class="badge">{html.escape(st)}</span>'
|
||||
|
||||
|
||||
def _provider_card(p: dict[str, Any]) -> str:
|
||||
name = html.escape(str(p.get("provider", "provider")).upper())
|
||||
base_url = html.escape(str(p.get("base_url", "")))
|
||||
org = html.escape(str(p.get("org", "")))
|
||||
proj = html.escape(str(p.get("project", "")))
|
||||
status_badge = _badge(str(p.get("status", "")))
|
||||
min_events = p.get("min_events_for_issue", 2)
|
||||
lookback = html.escape(str(p.get("lookback", "24h")))
|
||||
bridge_enabled = "yes" if p.get("bridge_enabled") else "no"
|
||||
|
||||
return f"""
|
||||
<div class="card" style="margin-bottom: 1rem; padding: 1rem; border: 1px solid #ccc; border-radius: 6px;">
|
||||
<div style="display: flex; justify-content: space-between; align-items: center;">
|
||||
<h3 style="margin: 0;">{name} Connection</h3>
|
||||
<div>{status_badge}</div>
|
||||
</div>
|
||||
<table style="width: 100%; margin-top: 0.5rem; border-collapse: collapse;">
|
||||
<tr><td><strong>Base URL:</strong></td><td><code>{base_url}</code></td></tr>
|
||||
<tr><td><strong>Scope:</strong></td><td><code>{org} / {proj}</code></td></tr>
|
||||
<tr><td><strong>Bridge Enabled:</strong></td><td><code>{bridge_enabled}</code></td></tr>
|
||||
<tr><td><strong>Min Events for Issue:</strong></td><td><code>{min_events}</code></td></tr>
|
||||
<tr><td><strong>Lookback Window:</strong></td><td><code>{lookback}</code></td></tr>
|
||||
</table>
|
||||
</div>
|
||||
"""
|
||||
|
||||
|
||||
def render_observability_page(snapshot: ObservabilitySnapshot | dict[str, Any]) -> str:
|
||||
"""Render the observability dashboard HTML page."""
|
||||
data = snapshot.to_dict() if isinstance(snapshot, ObservabilitySnapshot) else dict(snapshot)
|
||||
|
||||
providers_raw = data.get("providers", [])
|
||||
provider_cards = "".join(_provider_card(p) for p in providers_raw) if providers_raw else "<p>No providers configured.</p>"
|
||||
|
||||
links = data.get("links", [])
|
||||
link_rows = []
|
||||
|
||||
for l in links:
|
||||
prov = html.escape(str(l.get("provider", "")))
|
||||
p_issue_id = html.escape(str(l.get("provider_issue_id", "")))
|
||||
fingerprint = html.escape(str(l.get("fingerprint") or "—"))
|
||||
g_issue_num = int(l.get("gitea_issue_number", 0))
|
||||
g_org = html.escape(str(l.get("gitea_org", "")))
|
||||
g_repo = html.escape(str(l.get("gitea_repo", "")))
|
||||
g_issue_link = f'<strong>#{g_issue_num}</strong> ({g_org}/{g_repo})'
|
||||
event_cnt = int(l.get("event_count", 1))
|
||||
last_seen = html.escape(str(l.get("last_seen") or "—"))
|
||||
short_id = html.escape(str(l.get("provider_short_id") or p_issue_id))
|
||||
|
||||
link_rows.append(f"""
|
||||
<tr>
|
||||
<td><code>{prov}</code></td>
|
||||
<td><strong>{short_id}</strong><br><small style="color: #666;">id: {p_issue_id}</small></td>
|
||||
<td><code>{fingerprint}</code></td>
|
||||
<td>{g_issue_link}</td>
|
||||
<td>{event_cnt}</td>
|
||||
<td><small>{last_seen}</small></td>
|
||||
</tr>
|
||||
""")
|
||||
|
||||
table_body = "".join(link_rows) if link_rows else '<tr><td colspan="6" style="text-align: center; padding: 1.5rem; color: #666;">No correlated incident links stored. Bridge operates under dry-run default.</td></tr>'
|
||||
|
||||
metrics = data.get("metrics", {})
|
||||
total_links = metrics.get("total_links", 0)
|
||||
sentry_cnt = metrics.get("sentry_links_count", 0)
|
||||
glitchtip_cnt = metrics.get("glitchtip_links_count", 0)
|
||||
|
||||
body_html = f"""
|
||||
<h2>Observability & Incident Bridge (#649)</h2>
|
||||
<p>Read-only console surface for Sentry/GlitchTip provider connections, error correlation,
|
||||
and durable Gitea issue linkage.</p>
|
||||
|
||||
<div class="alert alert-info" style="background: #f0f4f8; padding: 1rem; border-left: 4px solid #0052cc; margin-bottom: 1.5rem;">
|
||||
<strong>ADR Authority Model:</strong> Gitea records durable issue history. Control-plane DB coordinates incident links.
|
||||
Sentry/GlitchTip observe errors. Raw monitoring incidents are <em>never</em> assignable control-plane work items.
|
||||
Durable issue creation is gated and dry-runable via the <code>#612</code> bridge APIs.
|
||||
</div>
|
||||
|
||||
<h3>Provider Connections</h3>
|
||||
<div style="display: grid; grid-template-columns: repeat(auto-fit, minmax(300px, 1fr)); gap: 1rem; margin-bottom: 2rem;">
|
||||
{provider_cards}
|
||||
</div>
|
||||
|
||||
<div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 1rem;">
|
||||
<h3 style="margin: 0;">Correlated Incidents ({total_links})</h3>
|
||||
<div>
|
||||
<span class="badge" style="margin-right: 0.5rem;">Sentry: {sentry_cnt}</span>
|
||||
<span class="badge">GlitchTip: {glitchtip_cnt}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<table class="table" style="width: 100%; border-collapse: collapse; border: 1px solid #ddd;">
|
||||
<thead>
|
||||
<tr style="background: #f9f9f9; text-align: left;">
|
||||
<th style="padding: 0.5rem; border-bottom: 2px solid #ddd;">Provider</th>
|
||||
<th style="padding: 0.5rem; border-bottom: 2px solid #ddd;">Incident ID</th>
|
||||
<th style="padding: 0.5rem; border-bottom: 2px solid #ddd;">Fingerprint</th>
|
||||
<th style="padding: 0.5rem; border-bottom: 2px solid #ddd;">Gitea Issue Link</th>
|
||||
<th style="padding: 0.5rem; border-bottom: 2px solid #ddd;">Events</th>
|
||||
<th style="padding: 0.5rem; border-bottom: 2px solid #ddd;">Last Seen</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{table_body}
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<div style="margin-top: 2rem; padding: 1rem; background: #fafafa; border: 1px solid #eee; border-radius: 4px;">
|
||||
<h4 style="margin-top: 0;">Reconcile & Link Controls (Gated)</h4>
|
||||
<p style="margin-bottom: 0.5rem; color: #555;">
|
||||
Create or reconcile durable Gitea issues from provider observations using the <code>#612</code> incident bridge:
|
||||
</p>
|
||||
<code>mcp call gitea_observability_reconcile_incident --provider sentry --apply false</code>
|
||||
</div>
|
||||
"""
|
||||
|
||||
return render_page(title="Observability", body_html=body_html)
|
||||
Reference in New Issue
Block a user