Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7f97de1ed6 |
@@ -0,0 +1,198 @@
|
|||||||
|
"""Early duplicate-work detection for author work-issue flows (#400)."""
|
||||||
|
|
||||||
|
from __future__ import annotations
|
||||||
|
|
||||||
|
import re
|
||||||
|
from typing import Any
|
||||||
|
|
||||||
|
from issue_claim_heartbeat import (
|
||||||
|
_linked_open_pr,
|
||||||
|
_matching_branch_names,
|
||||||
|
classify_issue_claim,
|
||||||
|
)
|
||||||
|
|
||||||
|
STAGES = (
|
||||||
|
"claim",
|
||||||
|
"lock",
|
||||||
|
"worktree",
|
||||||
|
"edit",
|
||||||
|
"commit",
|
||||||
|
"push",
|
||||||
|
"create_pr",
|
||||||
|
)
|
||||||
|
|
||||||
|
ELIGIBILITY_OPEN_PR_EXISTS = "OPEN_PR_EXISTS"
|
||||||
|
ELIGIBILITY_DUPLICATE_BRANCH_EXISTS = "DUPLICATE_BRANCH_EXISTS"
|
||||||
|
ELIGIBILITY_ACTIVE_CLAIM = "ACTIVE_CLAIM_BY_OTHER"
|
||||||
|
ELIGIBILITY_CLEAR = "CLEAR"
|
||||||
|
|
||||||
|
|
||||||
|
def assess_author_duplicate_work(
|
||||||
|
issue_number: int,
|
||||||
|
*,
|
||||||
|
stage: str,
|
||||||
|
open_prs: list[dict] | None = None,
|
||||||
|
branch_names: list[str] | None = None,
|
||||||
|
claim_entry: dict | None = None,
|
||||||
|
matching_branches: list[str] | None = None,
|
||||||
|
allow_stale_takeover: bool = False,
|
||||||
|
) -> dict[str, Any]:
|
||||||
|
"""Fail closed when duplicate work is detected before author mutations (#400)."""
|
||||||
|
stage_norm = (stage or "").strip().lower()
|
||||||
|
if stage_norm not in STAGES:
|
||||||
|
return {
|
||||||
|
"allowed": False,
|
||||||
|
"block": True,
|
||||||
|
"eligibility_class": "INVALID_STAGE",
|
||||||
|
"stage": stage_norm or None,
|
||||||
|
"reasons": [f"unknown duplicate-work stage {stage!r}"],
|
||||||
|
"safe_next_action": f"use one of: {', '.join(STAGES)}",
|
||||||
|
}
|
||||||
|
|
||||||
|
prs = list(open_prs or [])
|
||||||
|
linked_pr = _linked_open_pr(int(issue_number), prs)
|
||||||
|
branches = list(
|
||||||
|
matching_branches
|
||||||
|
if matching_branches is not None
|
||||||
|
else _matching_branch_names(int(issue_number), list(branch_names or []))
|
||||||
|
)
|
||||||
|
|
||||||
|
reasons: list[str] = []
|
||||||
|
eligibility = ELIGIBILITY_CLEAR
|
||||||
|
|
||||||
|
if linked_pr:
|
||||||
|
eligibility = ELIGIBILITY_OPEN_PR_EXISTS
|
||||||
|
reasons.append(
|
||||||
|
f"open PR #{linked_pr.get('number')} already covers issue "
|
||||||
|
f"#{issue_number}"
|
||||||
|
)
|
||||||
|
|
||||||
|
if branches and stage_norm in {"claim", "lock", "worktree", "edit"}:
|
||||||
|
if eligibility == ELIGIBILITY_CLEAR:
|
||||||
|
eligibility = ELIGIBILITY_DUPLICATE_BRANCH_EXISTS
|
||||||
|
reasons.append(
|
||||||
|
f"remote branch(es) already exist for issue #{issue_number}: "
|
||||||
|
f"{', '.join(branches)}"
|
||||||
|
)
|
||||||
|
|
||||||
|
entry = claim_entry or {}
|
||||||
|
claim_status = (entry.get("status") or "").strip()
|
||||||
|
if claim_status in {"active", "awaiting_review"} and stage_norm == "claim":
|
||||||
|
if entry.get("reclaimable") and allow_stale_takeover:
|
||||||
|
pass
|
||||||
|
elif claim_status == "active" and not entry.get("reclaimable"):
|
||||||
|
if eligibility == ELIGIBILITY_CLEAR:
|
||||||
|
eligibility = ELIGIBILITY_ACTIVE_CLAIM
|
||||||
|
reasons.append(
|
||||||
|
f"issue #{issue_number} has active claim "
|
||||||
|
f"(status={claim_status})"
|
||||||
|
)
|
||||||
|
elif claim_status == "awaiting_review" and stage_norm == "claim":
|
||||||
|
if not linked_pr:
|
||||||
|
reasons.append(
|
||||||
|
f"issue #{issue_number} is awaiting_review but no linked open PR "
|
||||||
|
"was supplied for duplicate-work proof"
|
||||||
|
)
|
||||||
|
|
||||||
|
allowed = not reasons
|
||||||
|
outcome = "duplicate_work_prevented" if not allowed else "clear"
|
||||||
|
if stage_norm == "create_pr" and not allowed:
|
||||||
|
outcome = "duplicate_pr_prevented"
|
||||||
|
elif stage_norm in {"commit", "push"} and not allowed:
|
||||||
|
outcome = "duplicate_push_prevented" if stage_norm == "push" else "duplicate_commit_prevented"
|
||||||
|
|
||||||
|
return {
|
||||||
|
"allowed": allowed,
|
||||||
|
"block": not allowed,
|
||||||
|
"eligibility_class": eligibility if not allowed else ELIGIBILITY_CLEAR,
|
||||||
|
"stage": stage_norm,
|
||||||
|
"linked_open_pr": linked_pr.get("number") if linked_pr else None,
|
||||||
|
"matching_branches": branches,
|
||||||
|
"claim_status": claim_status or None,
|
||||||
|
"outcome": outcome,
|
||||||
|
"reasons": reasons,
|
||||||
|
"safe_next_action": (
|
||||||
|
"stop without edits/commit/push/PR; produce reconciliation handoff "
|
||||||
|
"preserving local work only"
|
||||||
|
if not allowed
|
||||||
|
else "proceed"
|
||||||
|
),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def build_claim_entry_from_classification(classification: dict) -> dict:
|
||||||
|
"""Map ``classify_issue_claim`` output to gate claim metadata."""
|
||||||
|
return {
|
||||||
|
"status": classification.get("status"),
|
||||||
|
"reclaimable": classification.get("reclaimable"),
|
||||||
|
"linked_open_pr": classification.get("linked_open_pr"),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
_DUPLICATE_OUTCOME_RE = re.compile(
|
||||||
|
r"(duplicate\s+(?:pr|branch|commit|push)\s+prevented|"
|
||||||
|
r"duplicate\s+work\s+not\s+prevented|reconciliation\s+handoff)",
|
||||||
|
re.IGNORECASE,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def assess_work_issue_duplicate_prevention_report(report_text: str) -> dict:
|
||||||
|
"""#400: work-issue reports must state duplicate-work prevention outcome."""
|
||||||
|
text = report_text or ""
|
||||||
|
if "duplicate work" not in text.lower() and "duplicate pr" not in text.lower():
|
||||||
|
return {
|
||||||
|
"proven": True,
|
||||||
|
"block": False,
|
||||||
|
"reasons": [],
|
||||||
|
"safe_next_action": "proceed",
|
||||||
|
}
|
||||||
|
if _DUPLICATE_OUTCOME_RE.search(text):
|
||||||
|
return {
|
||||||
|
"proven": True,
|
||||||
|
"block": False,
|
||||||
|
"reasons": [],
|
||||||
|
"safe_next_action": "proceed",
|
||||||
|
}
|
||||||
|
return {
|
||||||
|
"proven": False,
|
||||||
|
"block": True,
|
||||||
|
"reasons": [
|
||||||
|
"duplicate-work discussion must name a prevention outcome "
|
||||||
|
"(duplicate PR/branch/commit/push prevented, or duplicate work "
|
||||||
|
"not prevented, or reconciliation handoff)"
|
||||||
|
],
|
||||||
|
"safe_next_action": "state exact duplicate-work prevention class in final report",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def classify_and_assess(
|
||||||
|
issue: dict,
|
||||||
|
*,
|
||||||
|
stage: str,
|
||||||
|
comments: list[dict] | None = None,
|
||||||
|
open_prs: list[dict] | None = None,
|
||||||
|
branch_names: list[str] | None = None,
|
||||||
|
allow_stale_takeover: bool = False,
|
||||||
|
) -> dict[str, Any]:
|
||||||
|
"""Combine claim classification with duplicate-work gate assessment."""
|
||||||
|
issue_number = int(issue.get("number") or 0)
|
||||||
|
claim = classify_issue_claim(
|
||||||
|
issue=issue,
|
||||||
|
comments=comments or [],
|
||||||
|
open_prs=open_prs or [],
|
||||||
|
branch_names=branch_names or [],
|
||||||
|
)
|
||||||
|
assessment = assess_author_duplicate_work(
|
||||||
|
issue_number,
|
||||||
|
stage=stage,
|
||||||
|
open_prs=open_prs,
|
||||||
|
branch_names=branch_names,
|
||||||
|
claim_entry=build_claim_entry_from_classification(claim),
|
||||||
|
matching_branches=claim.get("matching_branches"),
|
||||||
|
allow_stale_takeover=allow_stale_takeover,
|
||||||
|
)
|
||||||
|
return {
|
||||||
|
"issue_number": issue_number,
|
||||||
|
"claim": claim,
|
||||||
|
"duplicate_work": assessment,
|
||||||
|
}
|
||||||
@@ -281,21 +281,6 @@ same-issue/same-operation lease blocks duplicate work. An expired lease still
|
|||||||
blocks takeover until a recovery review records why the prior work is abandoned,
|
blocks takeover until a recovery review records why the prior work is abandoned,
|
||||||
completed, or unsafe to continue.
|
completed, or unsafe to continue.
|
||||||
|
|
||||||
**Issue-lock recovery (#447):** Do not manually seed, restore, or delete
|
|
||||||
`/tmp/gitea_issue_lock.json` as a normal recovery path. That file is global
|
|
||||||
shared state and manual writes can clobber another session's live lease. Use
|
|
||||||
`sanctioned recovery` instead:
|
|
||||||
|
|
||||||
1. `gitea_lock_issue` on a clean `branches/` worktree (normal path).
|
|
||||||
2. Own-branch adoption via #442 when the issue's exact branch is already pushed.
|
|
||||||
3. Operator override only when explicitly authorized — record
|
|
||||||
`External-state mutations` and `operator override proof` in the final report.
|
|
||||||
|
|
||||||
`gitea_create_pr` rejects lock files that lack sanctioned `lock_provenance`
|
|
||||||
metadata. Final-report validation blocks handoffs that hide lock read/write/delete
|
|
||||||
under `External-state mutations: none` or mix author PR creation with reviewer
|
|
||||||
approval in one run. See also #438 (global lock redesign).
|
|
||||||
|
|
||||||
Remote branches matching the issue number are also treated as active work unless
|
Remote branches matching the issue number are also treated as active work unless
|
||||||
the recovery review proves the branch is abandoned or superseded. Never delete
|
the recovery review proves the branch is abandoned or superseded. Never delete
|
||||||
or clean up a branch when it has an active lease, dirty worktree, open PR, or is
|
or clean up a branch when it has an active lease, dirty worktree, open PR, or is
|
||||||
|
|||||||
@@ -1,89 +0,0 @@
|
|||||||
# Internal web UI — local development (#426)
|
|
||||||
|
|
||||||
Read-only MVP skeleton for the MCP Control Plane operator console. Gitea,
|
|
||||||
MCP capability gates, and `skills/llm-project-workflow/` remain the source of
|
|
||||||
truth; this UI only provides route stubs and layout.
|
|
||||||
|
|
||||||
## Prerequisites
|
|
||||||
|
|
||||||
- Python 3.11+ with project dependencies installed (`pip install -r requirements.txt`)
|
|
||||||
- No secrets in repo, config, or client bundle
|
|
||||||
|
|
||||||
## Start the server
|
|
||||||
|
|
||||||
From the repository root (or an issue worktree):
|
|
||||||
|
|
||||||
```bash
|
|
||||||
./scripts/run-webui
|
|
||||||
```
|
|
||||||
|
|
||||||
Or directly:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
python3 -m webui
|
|
||||||
```
|
|
||||||
|
|
||||||
Optional environment variables:
|
|
||||||
|
|
||||||
| Variable | Default | Purpose |
|
|
||||||
|----------|---------|---------|
|
|
||||||
| `WEBUI_HOST` | `127.0.0.1` | Bind address (keep local for MVP) |
|
|
||||||
| `WEBUI_PORT` | `8765` | Listen port |
|
|
||||||
|
|
||||||
## Routes (MVP)
|
|
||||||
|
|
||||||
| Path | Description |
|
|
||||||
|------|-------------|
|
|
||||||
| `/` | Home / operator overview |
|
|
||||||
| `/health` | JSON liveness (`status`, `service`, `mode`, `timestamp`) |
|
|
||||||
| `/queue` | Live PR and issue queue dashboard (#429) |
|
|
||||||
| `/api/queue` | JSON queue export with pagination metadata |
|
|
||||||
| `/projects` | Project registry list (#427) |
|
|
||||||
| `/projects/{id}` | Project detail + onboarding checklist |
|
|
||||||
| `/api/projects` | JSON registry export |
|
|
||||||
| `/prompts` | Prompt library with per-prompt copy buttons (#428) |
|
|
||||||
| `/api/prompts` | JSON prompt export with workflow hashes |
|
|
||||||
| `/runtime` | Stub — MCP runtime health (#430) |
|
|
||||||
| `/audit` | Stub — report audit paste (#431) |
|
|
||||||
| `/worktrees` | Stub — hygiene dashboard (#432) |
|
|
||||||
| `/leases` | Stub — lease visibility (#433) |
|
|
||||||
|
|
||||||
All routes are GET-only. POST/PUT/PATCH/DELETE return `405` with
|
|
||||||
`read-only-mvp`.
|
|
||||||
|
|
||||||
## Project registry (#427)
|
|
||||||
|
|
||||||
Versioned registry file: `webui/data/projects.registry.json` (schema version `1`).
|
|
||||||
|
|
||||||
Override path with `WEBUI_PROJECT_REGISTRY` when operators keep a machine-local
|
|
||||||
copy outside git. The registry stores repo identity, remotes, profile names,
|
|
||||||
workflow/schema path references, and onboarding checklist steps — never tokens
|
|
||||||
or credentials.
|
|
||||||
|
|
||||||
Seed entry: **Gitea-Tools** on `https://gitea.prgs.cc` with `prgs-author`,
|
|
||||||
`prgs-reviewer`, and `prgs-reconciler` profiles.
|
|
||||||
|
|
||||||
## Prompt library (#428)
|
|
||||||
|
|
||||||
Prompts are generated at load time from canonical workflow files under
|
|
||||||
`skills/llm-project-workflow/workflows/`. SHA-256 hashes are computed from
|
|
||||||
`WEBUI_REPO_ROOT` (defaults to the repository root). Prompt bodies are short
|
|
||||||
copy/paste starters; canonical workflow files remain the only full policy
|
|
||||||
source.
|
|
||||||
|
|
||||||
## Live queue dashboard (#429)
|
|
||||||
|
|
||||||
`/queue` loads open PRs and issues for the default registry project (seed:
|
|
||||||
**Gitea-Tools** on `https://gitea.prgs.cc`) using existing `gitea_auth` read
|
|
||||||
credentials. The UI surfaces pagination proof (returned count, pages fetched,
|
|
||||||
`has_more`, `inventory_complete`) and classification badges (`claimed`,
|
|
||||||
`blocked`, `in-review`, `duplicate`) when evidence exists.
|
|
||||||
|
|
||||||
If credentials are missing or the fetch fails, the page shows an explicit error
|
|
||||||
instead of an empty queue (fail closed).
|
|
||||||
|
|
||||||
## Tests
|
|
||||||
|
|
||||||
```bash
|
|
||||||
pytest tests/test_webui_skeleton.py tests/test_webui_project_registry.py tests/test_webui_prompt_library.py tests/test_webui_queue_dashboard.py -q
|
|
||||||
```
|
|
||||||
@@ -11,7 +11,6 @@ import inspect
|
|||||||
import re
|
import re
|
||||||
from typing import Any, Callable
|
from typing import Any, Callable
|
||||||
|
|
||||||
import issue_lock_provenance
|
|
||||||
from review_proofs import (
|
from review_proofs import (
|
||||||
HANDOFF_HEADING,
|
HANDOFF_HEADING,
|
||||||
assess_controller_handoff,
|
assess_controller_handoff,
|
||||||
@@ -871,54 +870,6 @@ def _rule_reviewer_mutation_ledger(
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
def _rule_shared_issue_lock_external_state(report_text: str) -> list[dict[str, str]]:
|
|
||||||
result = issue_lock_provenance.assess_issue_lock_external_state_report(report_text)
|
|
||||||
if result.get("proven"):
|
|
||||||
return []
|
|
||||||
return _findings_from_reasons(
|
|
||||||
"shared.issue_lock_external_state",
|
|
||||||
result.get("reasons") or [],
|
|
||||||
field="External-state mutations",
|
|
||||||
severity="block",
|
|
||||||
safe_next_action=(
|
|
||||||
"disclose gitea_issue_lock.json read/write/delete under "
|
|
||||||
"External-state mutations; never claim none after lock seeding"
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def _rule_shared_manual_lock_pr_override(report_text: str) -> list[dict[str, str]]:
|
|
||||||
result = issue_lock_provenance.assess_manual_lock_pr_without_override(report_text)
|
|
||||||
if result.get("proven"):
|
|
||||||
return []
|
|
||||||
return _findings_from_reasons(
|
|
||||||
"shared.manual_lock_pr_override",
|
|
||||||
result.get("reasons") or [],
|
|
||||||
field="External-state mutations",
|
|
||||||
severity="block",
|
|
||||||
safe_next_action=(
|
|
||||||
"use gitea_lock_issue or #442 adoption instead of manual lock seeding; "
|
|
||||||
"if operator override was authorized, cite override proof"
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def _rule_shared_author_reviewer_same_run(report_text: str) -> list[dict[str, str]]:
|
|
||||||
result = issue_lock_provenance.assess_author_reviewer_same_run_report(report_text)
|
|
||||||
if result.get("proven"):
|
|
||||||
return []
|
|
||||||
return _findings_from_reasons(
|
|
||||||
"shared.author_reviewer_same_run",
|
|
||||||
result.get("reasons") or [],
|
|
||||||
field="Review mutations",
|
|
||||||
severity="block",
|
|
||||||
safe_next_action=(
|
|
||||||
"split author PR creation and reviewer approval across separate "
|
|
||||||
"sessions and handoffs"
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def _rule_reviewer_review_mutation(
|
def _rule_reviewer_review_mutation(
|
||||||
report_text: str,
|
report_text: str,
|
||||||
*,
|
*,
|
||||||
@@ -938,17 +889,10 @@ def _rule_reviewer_review_mutation(
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
_SHARED_ISSUE_LOCK_RULES = (
|
|
||||||
_rule_shared_issue_lock_external_state,
|
|
||||||
_rule_shared_manual_lock_pr_override,
|
|
||||||
_rule_shared_author_reviewer_same_run,
|
|
||||||
)
|
|
||||||
|
|
||||||
_RULES_BY_TASK: dict[str, list[Callable[..., list[dict[str, str]]]]] = {
|
_RULES_BY_TASK: dict[str, list[Callable[..., list[dict[str, str]]]]] = {
|
||||||
"review_pr": [
|
"review_pr": [
|
||||||
_rule_shared_controller_handoff,
|
_rule_shared_controller_handoff,
|
||||||
_rule_shared_email_disclosure,
|
_rule_shared_email_disclosure,
|
||||||
*_SHARED_ISSUE_LOCK_RULES,
|
|
||||||
_rule_reviewer_legacy_workspace_mutations,
|
_rule_reviewer_legacy_workspace_mutations,
|
||||||
_rule_reviewer_vague_mutations_none,
|
_rule_reviewer_vague_mutations_none,
|
||||||
_rule_reviewer_mutation_categories,
|
_rule_reviewer_mutation_categories,
|
||||||
@@ -969,7 +913,6 @@ _RULES_BY_TASK: dict[str, list[Callable[..., list[dict[str, str]]]]] = {
|
|||||||
"reconcile_already_landed": [
|
"reconcile_already_landed": [
|
||||||
_rule_reconcile_controller_handoff,
|
_rule_reconcile_controller_handoff,
|
||||||
_rule_shared_email_disclosure,
|
_rule_shared_email_disclosure,
|
||||||
*_SHARED_ISSUE_LOCK_RULES,
|
|
||||||
_rule_reconcile_stale_author_fields,
|
_rule_reconcile_stale_author_fields,
|
||||||
_rule_reconcile_eligible_reviewed,
|
_rule_reconcile_eligible_reviewed,
|
||||||
_rule_reconcile_linked_issue_live,
|
_rule_reconcile_linked_issue_live,
|
||||||
@@ -981,30 +924,25 @@ _RULES_BY_TASK: dict[str, list[Callable[..., list[dict[str, str]]]]] = {
|
|||||||
"author_issue": [
|
"author_issue": [
|
||||||
_rule_shared_controller_handoff,
|
_rule_shared_controller_handoff,
|
||||||
_rule_shared_email_disclosure,
|
_rule_shared_email_disclosure,
|
||||||
*_SHARED_ISSUE_LOCK_RULES,
|
|
||||||
_rule_reviewer_vague_mutations_none,
|
_rule_reviewer_vague_mutations_none,
|
||||||
],
|
],
|
||||||
"work_issue": [
|
"work_issue": [
|
||||||
_rule_shared_controller_handoff,
|
_rule_shared_controller_handoff,
|
||||||
_rule_shared_email_disclosure,
|
_rule_shared_email_disclosure,
|
||||||
*_SHARED_ISSUE_LOCK_RULES,
|
|
||||||
_rule_reviewer_vague_mutations_none,
|
_rule_reviewer_vague_mutations_none,
|
||||||
],
|
],
|
||||||
"issue_filing": [
|
"issue_filing": [
|
||||||
_rule_shared_controller_handoff,
|
_rule_shared_controller_handoff,
|
||||||
_rule_shared_email_disclosure,
|
_rule_shared_email_disclosure,
|
||||||
*_SHARED_ISSUE_LOCK_RULES,
|
|
||||||
],
|
],
|
||||||
"inventory": [
|
"inventory": [
|
||||||
_rule_shared_controller_handoff,
|
_rule_shared_controller_handoff,
|
||||||
_rule_shared_email_disclosure,
|
_rule_shared_email_disclosure,
|
||||||
*_SHARED_ISSUE_LOCK_RULES,
|
|
||||||
_rule_reconcile_pagination_proof,
|
_rule_reconcile_pagination_proof,
|
||||||
],
|
],
|
||||||
"issue_selection": [
|
"issue_selection": [
|
||||||
_rule_shared_controller_handoff,
|
_rule_shared_controller_handoff,
|
||||||
_rule_shared_email_disclosure,
|
_rule_shared_email_disclosure,
|
||||||
*_SHARED_ISSUE_LOCK_RULES,
|
|
||||||
],
|
],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+157
-295
@@ -440,48 +440,10 @@ def verify_preflight_purity(remote: str | None = None, worktree_path: str | None
|
|||||||
"Pre-flight order violation: Task capability (gitea_resolve_task_capability) has not been resolved (fail closed)"
|
"Pre-flight order violation: Task capability (gitea_resolve_task_capability) has not been resolved (fail closed)"
|
||||||
)
|
)
|
||||||
|
|
||||||
workspace = author_mutation_worktree.resolve_mutation_workspace(
|
if worktree_path:
|
||||||
worktree_path,
|
dirty_files = sorted(_parse_porcelain_entries(_get_workspace_porcelain(worktree_path)))
|
||||||
PROJECT_ROOT,
|
|
||||||
active_worktree_env=os.environ.get(ACTIVE_WORKTREE_ENV),
|
|
||||||
author_worktree_env=os.environ.get(AUTHOR_WORKTREE_ENV),
|
|
||||||
)
|
|
||||||
real_workspace = os.path.realpath(workspace)
|
|
||||||
real_root = os.path.realpath(PROJECT_ROOT)
|
|
||||||
|
|
||||||
if real_workspace != real_root:
|
|
||||||
if not _preflight_in_test_mode():
|
|
||||||
if not os.path.exists(real_workspace):
|
|
||||||
raise RuntimeError(
|
|
||||||
f"Branches-only mutation guard (#274): worktree path '{workspace}' does not exist (fail closed)"
|
|
||||||
)
|
|
||||||
if not os.path.isdir(real_workspace):
|
|
||||||
raise RuntimeError(
|
|
||||||
f"Branches-only mutation guard (#274): worktree path '{workspace}' is not a directory (fail closed)"
|
|
||||||
)
|
|
||||||
try:
|
|
||||||
res = subprocess.run(
|
|
||||||
["git", "-C", real_workspace, "rev-parse", "--git-common-dir"],
|
|
||||||
capture_output=True,
|
|
||||||
text=True,
|
|
||||||
check=True,
|
|
||||||
)
|
|
||||||
common_dir = os.path.realpath(res.stdout.strip())
|
|
||||||
expected_dir = os.path.realpath(os.path.join(real_root, ".git"))
|
|
||||||
if common_dir != expected_dir:
|
|
||||||
raise RuntimeError(
|
|
||||||
f"Branches-only mutation guard (#274): worktree '{workspace}' does not belong to the target repository '{PROJECT_ROOT}' (fail closed)"
|
|
||||||
)
|
|
||||||
except Exception as e:
|
|
||||||
if isinstance(e, RuntimeError):
|
|
||||||
raise e
|
|
||||||
raise RuntimeError(
|
|
||||||
f"Branches-only mutation guard (#274): worktree '{workspace}' is not a valid git repository (fail closed)"
|
|
||||||
)
|
|
||||||
|
|
||||||
dirty_files = sorted(_parse_porcelain_entries(_get_workspace_porcelain(workspace)))
|
|
||||||
if dirty_files:
|
if dirty_files:
|
||||||
details = _preflight_workspace_details(workspace, dirty_files)
|
details = _preflight_workspace_details(worktree_path, dirty_files)
|
||||||
raise RuntimeError(
|
raise RuntimeError(
|
||||||
"Pre-flight order violation: Active task workspace has tracked "
|
"Pre-flight order violation: Active task workspace has tracked "
|
||||||
"file edits before mutation (fail closed). "
|
"file edits before mutation (fail closed). "
|
||||||
@@ -538,12 +500,10 @@ import task_capability_map # noqa: E402
|
|||||||
import review_proofs # noqa: E402
|
import review_proofs # noqa: E402
|
||||||
import agent_temp_artifacts
|
import agent_temp_artifacts
|
||||||
import issue_lock_worktree # noqa: E402
|
import issue_lock_worktree # noqa: E402
|
||||||
import issue_lock_provenance # noqa: E402
|
|
||||||
import already_landed_reconcile # noqa: E402
|
import already_landed_reconcile # noqa: E402
|
||||||
import author_mutation_worktree # noqa: E402
|
import author_mutation_worktree # noqa: E402
|
||||||
import issue_claim_heartbeat # noqa: E402
|
import issue_claim_heartbeat # noqa: E402
|
||||||
import issue_work_duplicate_gate # noqa: E402
|
import author_duplicate_work_gate # noqa: E402
|
||||||
import issue_lock_adoption # noqa: E402
|
|
||||||
import merged_cleanup_reconcile # noqa: E402
|
import merged_cleanup_reconcile # noqa: E402
|
||||||
import reconciler_profile # noqa: E402
|
import reconciler_profile # noqa: E402
|
||||||
import reconciliation_workflow # noqa: E402
|
import reconciliation_workflow # noqa: E402
|
||||||
@@ -588,7 +548,7 @@ def _load_existing_issue_lock() -> dict | None:
|
|||||||
if not os.path.exists(ISSUE_LOCK_FILE):
|
if not os.path.exists(ISSUE_LOCK_FILE):
|
||||||
return None
|
return None
|
||||||
try:
|
try:
|
||||||
with open(ISSUE_LOCK_FILE, "r", encoding="utf-8") as f:
|
with open(ISSUE_LOCK_FILE, encoding="utf-8") as f:
|
||||||
data = json.load(f)
|
data = json.load(f)
|
||||||
return data if isinstance(data, dict) else None
|
return data if isinstance(data, dict) else None
|
||||||
except Exception:
|
except Exception:
|
||||||
@@ -682,132 +642,6 @@ def _branch_entry_name(branch: dict | str) -> str:
|
|||||||
return str(branch.get("name") or branch.get("ref") or "")
|
return str(branch.get("name") or branch.get("ref") or "")
|
||||||
|
|
||||||
|
|
||||||
def _live_fetch_issue_duplicate_context(
|
|
||||||
h: str,
|
|
||||||
o: str,
|
|
||||||
r: str,
|
|
||||||
auth: str,
|
|
||||||
issue_number: int,
|
|
||||||
) -> tuple[list[dict], list[str], dict]:
|
|
||||||
"""Live open PRs, remote branch names, and claim state for one issue."""
|
|
||||||
base = repo_api_url(h, o, r)
|
|
||||||
open_prs = api_get_all(f"{base}/pulls?state=open", auth)
|
|
||||||
branches = api_get_all(f"{base}/branches", auth)
|
|
||||||
branch_names = [_branch_entry_name(b) for b in branches]
|
|
||||||
issue = api_request("GET", f"{base}/issues/{issue_number}", auth) or {}
|
|
||||||
comments = api_request(
|
|
||||||
"GET", f"{base}/issues/{issue_number}/comments", auth
|
|
||||||
) or []
|
|
||||||
claim_entry = issue_claim_heartbeat.classify_issue_claim(
|
|
||||||
issue=issue,
|
|
||||||
comments=comments,
|
|
||||||
open_prs=open_prs,
|
|
||||||
branch_names=branch_names,
|
|
||||||
)
|
|
||||||
return open_prs, branch_names, claim_entry
|
|
||||||
|
|
||||||
|
|
||||||
# Injectable duplicate-work context fetcher (#400). Production uses the live
|
|
||||||
# Gitea API path above; unit tests patch this symbol instead of hitting the
|
|
||||||
# network.
|
|
||||||
issue_duplicate_context_fetcher = _live_fetch_issue_duplicate_context
|
|
||||||
|
|
||||||
|
|
||||||
def _collect_issue_duplicate_context(
|
|
||||||
h: str,
|
|
||||||
o: str,
|
|
||||||
r: str,
|
|
||||||
auth: str,
|
|
||||||
issue_number: int,
|
|
||||||
) -> tuple[list[dict], list[str], dict]:
|
|
||||||
return issue_duplicate_context_fetcher(h, o, r, auth, issue_number)
|
|
||||||
|
|
||||||
|
|
||||||
def _assess_issue_duplicate_gate(
|
|
||||||
issue_number: int,
|
|
||||||
*,
|
|
||||||
h: str,
|
|
||||||
o: str,
|
|
||||||
r: str,
|
|
||||||
auth: str,
|
|
||||||
locked_branch: str | None = None,
|
|
||||||
phase: str,
|
|
||||||
) -> dict:
|
|
||||||
open_prs, branch_names, claim_entry = _collect_issue_duplicate_context(
|
|
||||||
h, o, r, auth, issue_number
|
|
||||||
)
|
|
||||||
return issue_work_duplicate_gate.assess_work_issue_duplicate_gate(
|
|
||||||
issue_number,
|
|
||||||
open_prs=open_prs,
|
|
||||||
branch_names=branch_names,
|
|
||||||
claim_entry=claim_entry,
|
|
||||||
locked_branch=locked_branch,
|
|
||||||
phase=phase,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def _duplicate_gate_block_response(gate: dict, **extra) -> dict:
|
|
||||||
out = {
|
|
||||||
"success": False,
|
|
||||||
"performed": False,
|
|
||||||
"reasons": list(gate.get("reasons") or []),
|
|
||||||
"duplicate_gate": gate,
|
|
||||||
"safe_next_action": gate.get("safe_next_action"),
|
|
||||||
}
|
|
||||||
out.update(extra)
|
|
||||||
return out
|
|
||||||
|
|
||||||
|
|
||||||
def _enforce_locked_issue_duplicate_recheck(
|
|
||||||
remote: str,
|
|
||||||
phase: str,
|
|
||||||
*,
|
|
||||||
host: str | None = None,
|
|
||||||
org: str | None = None,
|
|
||||||
repo: str | None = None,
|
|
||||||
) -> dict | None:
|
|
||||||
"""Re-check duplicate-work gates for the locked issue (#400)."""
|
|
||||||
lock_data = _load_existing_issue_lock()
|
|
||||||
if not lock_data:
|
|
||||||
return None
|
|
||||||
issue_number = int(lock_data.get("issue_number") or 0)
|
|
||||||
locked_branch = lock_data.get("branch_name")
|
|
||||||
if not issue_number:
|
|
||||||
return None
|
|
||||||
h, o, r = _resolve(
|
|
||||||
remote or lock_data.get("remote") or "dadeschools",
|
|
||||||
host or lock_data.get("host"),
|
|
||||||
org or lock_data.get("org"),
|
|
||||||
repo or lock_data.get("repo"),
|
|
||||||
)
|
|
||||||
auth = _auth(h)
|
|
||||||
gate = _assess_issue_duplicate_gate(
|
|
||||||
issue_number,
|
|
||||||
h=h,
|
|
||||||
o=o,
|
|
||||||
r=r,
|
|
||||||
auth=auth,
|
|
||||||
locked_branch=locked_branch,
|
|
||||||
phase=phase,
|
|
||||||
)
|
|
||||||
if gate.get("block"):
|
|
||||||
return gate
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def _branch_entry_commit_sha(branch: dict | str) -> str | None:
|
|
||||||
"""Best-effort head SHA for a Gitea branch entry (None when absent)."""
|
|
||||||
if not isinstance(branch, dict):
|
|
||||||
return None
|
|
||||||
commit = branch.get("commit")
|
|
||||||
if isinstance(commit, dict):
|
|
||||||
sha = commit.get("id") or commit.get("sha")
|
|
||||||
if sha:
|
|
||||||
return str(sha)
|
|
||||||
sha = branch.get("commit_sha")
|
|
||||||
return str(sha) if sha else None
|
|
||||||
|
|
||||||
|
|
||||||
def _reveal_endpoints() -> bool:
|
def _reveal_endpoints() -> bool:
|
||||||
"""Admin/debug opt-in (#120): include endpoint URLs and token source
|
"""Admin/debug opt-in (#120): include endpoint URLs and token source
|
||||||
names in tool output. Off by default so normal LLM-facing responses
|
names in tool output. Off by default so normal LLM-facing responses
|
||||||
@@ -1139,7 +973,6 @@ def gitea_create_issue(
|
|||||||
repo: str | None = None,
|
repo: str | None = None,
|
||||||
allow_duplicate_override: bool = False,
|
allow_duplicate_override: bool = False,
|
||||||
split_from_issue: int | None = None,
|
split_from_issue: int | None = None,
|
||||||
worktree_path: str | None = None,
|
|
||||||
) -> dict:
|
) -> dict:
|
||||||
"""Create a new issue on a Gitea repository.
|
"""Create a new issue on a Gitea repository.
|
||||||
|
|
||||||
@@ -1152,7 +985,6 @@ def gitea_create_issue(
|
|||||||
repo: Override the repository name.
|
repo: Override the repository name.
|
||||||
allow_duplicate_override: Operator-approved split after duplicate found.
|
allow_duplicate_override: Operator-approved split after duplicate found.
|
||||||
split_from_issue: Existing duplicate issue number when overriding.
|
split_from_issue: Existing duplicate issue number when overriding.
|
||||||
worktree_path: Optional path to verify branches-only guard.
|
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
dict with 'number' of the created issue ('url' only with the reveal opt-in).
|
dict with 'number' of the created issue ('url' only with the reveal opt-in).
|
||||||
@@ -1179,7 +1011,7 @@ def gitea_create_issue(
|
|||||||
)
|
)
|
||||||
if blocked:
|
if blocked:
|
||||||
return blocked
|
return blocked
|
||||||
verify_preflight_purity(remote, worktree_path=worktree_path)
|
verify_preflight_purity(remote)
|
||||||
base = repo_api_url(h, o, r)
|
base = repo_api_url(h, o, r)
|
||||||
open_issues = api_get_all(f"{base}/issues?state=open&type=issues", auth)
|
open_issues = api_get_all(f"{base}/issues?state=open&type=issues", auth)
|
||||||
closed_issues = api_get_all(
|
closed_issues = api_get_all(
|
||||||
@@ -1218,6 +1050,76 @@ def gitea_create_issue(
|
|||||||
return _with_optional_url({"number": data["number"]}, data.get("html_url"))
|
return _with_optional_url({"number": data["number"]}, data.get("html_url"))
|
||||||
|
|
||||||
|
|
||||||
|
def _list_repo_branch_names(h: str, o: str, r: str, auth: str, *, limit: int = 200) -> list[str]:
|
||||||
|
branches = api_get_all(f"{repo_api_url(h, o, r)}/branches", auth, limit=limit)
|
||||||
|
return [_branch_entry_name(branch) for branch in branches]
|
||||||
|
|
||||||
|
|
||||||
|
def _gather_author_duplicate_work_context(
|
||||||
|
issue_number: int,
|
||||||
|
*,
|
||||||
|
h: str,
|
||||||
|
o: str,
|
||||||
|
r: str,
|
||||||
|
auth: str,
|
||||||
|
exclude_branch_name: str | None = None,
|
||||||
|
) -> dict:
|
||||||
|
base = repo_api_url(h, o, r)
|
||||||
|
issue = api_request("GET", f"{base}/issues/{issue_number}", auth)
|
||||||
|
comments = api_request("GET", f"{base}/issues/{issue_number}/comments", auth) or []
|
||||||
|
open_prs = api_get_all(f"{base}/pulls?state=open", auth)
|
||||||
|
branch_names = _list_repo_branch_names(h, o, r, auth)
|
||||||
|
if exclude_branch_name:
|
||||||
|
branch_names = [
|
||||||
|
name for name in branch_names
|
||||||
|
if name != exclude_branch_name
|
||||||
|
]
|
||||||
|
return {
|
||||||
|
"issue": issue,
|
||||||
|
"comments": comments,
|
||||||
|
"open_prs": open_prs,
|
||||||
|
"branch_names": branch_names,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def _enforce_author_duplicate_work_gate(
|
||||||
|
issue_number: int,
|
||||||
|
stage: str,
|
||||||
|
*,
|
||||||
|
h: str,
|
||||||
|
o: str,
|
||||||
|
r: str,
|
||||||
|
auth: str,
|
||||||
|
allow_stale_takeover: bool = False,
|
||||||
|
exclude_branch_name: str | None = None,
|
||||||
|
) -> dict:
|
||||||
|
"""Fail closed when duplicate work is detected (#400)."""
|
||||||
|
ctx = _gather_author_duplicate_work_context(
|
||||||
|
issue_number,
|
||||||
|
h=h,
|
||||||
|
o=o,
|
||||||
|
r=r,
|
||||||
|
auth=auth,
|
||||||
|
exclude_branch_name=exclude_branch_name,
|
||||||
|
)
|
||||||
|
result = author_duplicate_work_gate.classify_and_assess(
|
||||||
|
ctx["issue"],
|
||||||
|
stage=stage,
|
||||||
|
comments=ctx["comments"],
|
||||||
|
open_prs=ctx["open_prs"],
|
||||||
|
branch_names=ctx["branch_names"],
|
||||||
|
allow_stale_takeover=allow_stale_takeover,
|
||||||
|
)
|
||||||
|
assessment = result.get("duplicate_work") or {}
|
||||||
|
if assessment.get("block"):
|
||||||
|
reasons = "; ".join(assessment.get("reasons") or ["duplicate work detected"])
|
||||||
|
raise RuntimeError(
|
||||||
|
f"Author duplicate-work gate (#400) blocked at stage '{stage}': "
|
||||||
|
f"{reasons} (fail closed)"
|
||||||
|
)
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
@mcp.tool()
|
@mcp.tool()
|
||||||
def gitea_lock_issue(
|
def gitea_lock_issue(
|
||||||
issue_number: int,
|
issue_number: int,
|
||||||
@@ -1282,42 +1184,14 @@ def gitea_lock_issue(
|
|||||||
|
|
||||||
h, o, r = _resolve(remote, host, org, repo)
|
h, o, r = _resolve(remote, host, org, repo)
|
||||||
auth = _auth(h)
|
auth = _auth(h)
|
||||||
duplicate_gate = _assess_issue_duplicate_gate(
|
_enforce_author_duplicate_work_gate(
|
||||||
issue_number,
|
issue_number,
|
||||||
|
"lock",
|
||||||
h=h,
|
h=h,
|
||||||
o=o,
|
o=o,
|
||||||
r=r,
|
r=r,
|
||||||
auth=auth,
|
auth=auth,
|
||||||
locked_branch=branch_name,
|
exclude_branch_name=branch_name,
|
||||||
phase=issue_work_duplicate_gate.PHASE_LOCK,
|
|
||||||
)
|
|
||||||
if duplicate_gate.get("block"):
|
|
||||||
raise ValueError("; ".join(duplicate_gate.get("reasons") or [
|
|
||||||
f"duplicate work gate blocked issue #{issue_number} (fail closed)"
|
|
||||||
]))
|
|
||||||
|
|
||||||
branch_url = f"{repo_api_url(h, o, r)}/branches"
|
|
||||||
try:
|
|
||||||
branches = api_get_all(branch_url, auth)
|
|
||||||
except Exception as e:
|
|
||||||
raise RuntimeError(f"Could not list branches to verify issue lock: {e}")
|
|
||||||
existing_branch_entries = [
|
|
||||||
{
|
|
||||||
"name": _branch_entry_name(branch),
|
|
||||||
"commit_sha": _branch_entry_commit_sha(branch),
|
|
||||||
}
|
|
||||||
for branch in branches
|
|
||||||
]
|
|
||||||
adoption = issue_lock_adoption.assess_own_branch_adoption(
|
|
||||||
issue_number=issue_number,
|
|
||||||
requested_branch=branch_name,
|
|
||||||
existing_branches=existing_branch_entries,
|
|
||||||
)
|
|
||||||
if adoption["block"]:
|
|
||||||
competing = ", ".join(adoption["competing_branches"])
|
|
||||||
raise ValueError(
|
|
||||||
f"Issue #{issue_number} already has matching branch '{competing}' "
|
|
||||||
"that is not the requested branch (fail closed)"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
work_lease = _build_author_issue_work_lease(
|
work_lease = _build_author_issue_work_lease(
|
||||||
@@ -1334,10 +1208,6 @@ def gitea_lock_issue(
|
|||||||
"repo": r,
|
"repo": r,
|
||||||
"worktree_path": resolved_worktree,
|
"worktree_path": resolved_worktree,
|
||||||
"work_lease": work_lease,
|
"work_lease": work_lease,
|
||||||
"lock_provenance": issue_lock_provenance.build_sanctioned_lock_provenance(
|
|
||||||
tool="gitea_lock_issue",
|
|
||||||
claimant=work_lease.get("claimant"),
|
|
||||||
),
|
|
||||||
}
|
}
|
||||||
|
|
||||||
try:
|
try:
|
||||||
@@ -1360,21 +1230,6 @@ def gitea_lock_issue(
|
|||||||
"worktree_path": resolved_worktree,
|
"worktree_path": resolved_worktree,
|
||||||
"work_lease": work_lease,
|
"work_lease": work_lease,
|
||||||
}
|
}
|
||||||
if adoption["adopt"]:
|
|
||||||
# #442: recovery lock over the issue's own already-pushed branch.
|
|
||||||
result["adoption"] = issue_lock_adoption.build_adoption_proof(
|
|
||||||
issue_number=issue_number,
|
|
||||||
branch_name=branch_name,
|
|
||||||
assessment=adoption,
|
|
||||||
open_pr_checked=True,
|
|
||||||
competing_lock_checked=True,
|
|
||||||
lock_file_path=ISSUE_LOCK_FILE,
|
|
||||||
lock_file_status="written",
|
|
||||||
)
|
|
||||||
result["message"] = (
|
|
||||||
f"Adopted existing branch '{branch_name}' and locked issue "
|
|
||||||
f"#{issue_number} for recovery (fail-closed check complete)."
|
|
||||||
)
|
|
||||||
if agent_artifacts:
|
if agent_artifacts:
|
||||||
result["warnings"] = [
|
result["warnings"] = [
|
||||||
"Agent temp artifacts at repo root (delete before implementation): "
|
"Agent temp artifacts at repo root (delete before implementation): "
|
||||||
@@ -1383,39 +1238,6 @@ def gitea_lock_issue(
|
|||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
||||||
@mcp.tool()
|
|
||||||
def gitea_assess_work_issue_duplicate(
|
|
||||||
issue_number: int,
|
|
||||||
branch_name: str | None = None,
|
|
||||||
phase: str = issue_work_duplicate_gate.PHASE_LOCK,
|
|
||||||
remote: str = "dadeschools",
|
|
||||||
host: str | None = None,
|
|
||||||
org: str | None = None,
|
|
||||||
repo: str | None = None,
|
|
||||||
) -> dict:
|
|
||||||
"""Read-only duplicate-work gate for author sessions before mutations (#400)."""
|
|
||||||
read_block = _profile_operation_gate("gitea.read")
|
|
||||||
if read_block:
|
|
||||||
return {
|
|
||||||
"success": False,
|
|
||||||
"performed": False,
|
|
||||||
"reasons": read_block,
|
|
||||||
"permission_report": _permission_block_report("gitea.read"),
|
|
||||||
}
|
|
||||||
h, o, r = _resolve(remote, host, org, repo)
|
|
||||||
auth = _auth(h)
|
|
||||||
gate = _assess_issue_duplicate_gate(
|
|
||||||
issue_number,
|
|
||||||
h=h,
|
|
||||||
o=o,
|
|
||||||
r=r,
|
|
||||||
auth=auth,
|
|
||||||
locked_branch=branch_name,
|
|
||||||
phase=phase,
|
|
||||||
)
|
|
||||||
return {"success": not gate.get("block"), **gate}
|
|
||||||
|
|
||||||
|
|
||||||
@mcp.tool()
|
@mcp.tool()
|
||||||
def gitea_create_pr(
|
def gitea_create_pr(
|
||||||
title: str,
|
title: str,
|
||||||
@@ -1476,14 +1298,6 @@ def gitea_create_pr(
|
|||||||
except Exception as e:
|
except Exception as e:
|
||||||
raise RuntimeError(f"Could not read issue lock file: {e} (fail closed)")
|
raise RuntimeError(f"Could not read issue lock file: {e} (fail closed)")
|
||||||
|
|
||||||
lock_provenance_check = issue_lock_provenance.assess_lock_file_for_create_pr(
|
|
||||||
lock_data
|
|
||||||
)
|
|
||||||
if lock_provenance_check["block"]:
|
|
||||||
raise RuntimeError(
|
|
||||||
issue_lock_provenance.format_lock_provenance_error(lock_provenance_check)
|
|
||||||
)
|
|
||||||
|
|
||||||
locked_issue = lock_data.get("issue_number")
|
locked_issue = lock_data.get("issue_number")
|
||||||
locked_branch = lock_data.get("branch_name")
|
locked_branch = lock_data.get("branch_name")
|
||||||
locked_worktree = lock_data.get("worktree_path")
|
locked_worktree = lock_data.get("worktree_path")
|
||||||
@@ -1499,6 +1313,17 @@ def gitea_create_pr(
|
|||||||
f"PR head branch '{head}' does not match locked branch '{locked_branch}' (fail closed)"
|
f"PR head branch '{head}' does not match locked branch '{locked_branch}' (fail closed)"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
auth = _auth(h)
|
||||||
|
_enforce_author_duplicate_work_gate(
|
||||||
|
int(locked_issue),
|
||||||
|
"create_pr",
|
||||||
|
h=h,
|
||||||
|
o=o,
|
||||||
|
r=r,
|
||||||
|
auth=auth,
|
||||||
|
exclude_branch_name=locked_branch,
|
||||||
|
)
|
||||||
|
|
||||||
# Check for forbidden terms anywhere in title/body
|
# Check for forbidden terms anywhere in title/body
|
||||||
forbidden_terms = ["equivalent", "related", "same as"]
|
forbidden_terms = ["equivalent", "related", "same as"]
|
||||||
text_to_check = f"{title} {body}".lower()
|
text_to_check = f"{title} {body}".lower()
|
||||||
@@ -1515,22 +1340,6 @@ def gitea_create_pr(
|
|||||||
f"PR title or body must contain 'Closes #{locked_issue}' or 'Fixes #{locked_issue}' exactly to ensure durable tracking (fail closed)"
|
f"PR title or body must contain 'Closes #{locked_issue}' or 'Fixes #{locked_issue}' exactly to ensure durable tracking (fail closed)"
|
||||||
)
|
)
|
||||||
|
|
||||||
duplicate_block = _enforce_locked_issue_duplicate_recheck(
|
|
||||||
remote,
|
|
||||||
issue_work_duplicate_gate.PHASE_CREATE_PR,
|
|
||||||
host=host,
|
|
||||||
org=org,
|
|
||||||
repo=repo,
|
|
||||||
)
|
|
||||||
if duplicate_block:
|
|
||||||
return _duplicate_gate_block_response(
|
|
||||||
duplicate_block,
|
|
||||||
number=None,
|
|
||||||
issue_number=locked_issue,
|
|
||||||
branch_name=locked_branch,
|
|
||||||
)
|
|
||||||
|
|
||||||
auth = _auth(h)
|
|
||||||
url = f"{repo_api_url(h, o, r)}/pulls"
|
url = f"{repo_api_url(h, o, r)}/pulls"
|
||||||
payload = {"title": title, "body": body, "head": head, "base": base}
|
payload = {"title": title, "body": body, "head": head, "base": base}
|
||||||
meta = {"title": title, "head": head, "base": base}
|
meta = {"title": title, "head": head, "base": base}
|
||||||
@@ -3134,20 +2943,6 @@ def gitea_commit_files(
|
|||||||
if blocked:
|
if blocked:
|
||||||
return blocked
|
return blocked
|
||||||
|
|
||||||
duplicate_block = _enforce_locked_issue_duplicate_recheck(
|
|
||||||
remote,
|
|
||||||
issue_work_duplicate_gate.PHASE_COMMIT,
|
|
||||||
host=host,
|
|
||||||
org=org,
|
|
||||||
repo=repo,
|
|
||||||
)
|
|
||||||
if duplicate_block:
|
|
||||||
return _duplicate_gate_block_response(
|
|
||||||
duplicate_block,
|
|
||||||
commit="",
|
|
||||||
branch="",
|
|
||||||
)
|
|
||||||
|
|
||||||
verify_preflight_purity(remote)
|
verify_preflight_purity(remote)
|
||||||
processed_files, source_proofs = _prepare_commit_payload_files(files)
|
processed_files, source_proofs = _prepare_commit_payload_files(files)
|
||||||
|
|
||||||
@@ -6258,6 +6053,14 @@ def gitea_mark_issue(
|
|||||||
)
|
)
|
||||||
|
|
||||||
if action == "start":
|
if action == "start":
|
||||||
|
_enforce_author_duplicate_work_gate(
|
||||||
|
issue_number,
|
||||||
|
"claim",
|
||||||
|
h=h,
|
||||||
|
o=o,
|
||||||
|
r=r,
|
||||||
|
auth=auth,
|
||||||
|
)
|
||||||
with _audited("label_issue", host=h, remote=remote, org=o, repo=r,
|
with _audited("label_issue", host=h, remote=remote, org=o, repo=r,
|
||||||
issue_number=issue_number,
|
issue_number=issue_number,
|
||||||
request_metadata={"op": "add", "label": "status:in-progress"}):
|
request_metadata={"op": "add", "label": "status:in-progress"}):
|
||||||
@@ -6339,6 +6142,65 @@ def gitea_post_heartbeat(
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@mcp.tool()
|
||||||
|
def gitea_assess_author_duplicate_work(
|
||||||
|
issue_number: int,
|
||||||
|
stage: str,
|
||||||
|
remote: str = "dadeschools",
|
||||||
|
host: str | None = None,
|
||||||
|
org: str | None = None,
|
||||||
|
repo: str | None = None,
|
||||||
|
allow_stale_takeover: bool = False,
|
||||||
|
exclude_branch_name: str | None = None,
|
||||||
|
) -> dict:
|
||||||
|
"""Read-only: assess duplicate-work risk before author mutations (#400).
|
||||||
|
|
||||||
|
Call at claim, lock, worktree, edit, commit, push, and create_pr stages.
|
||||||
|
"""
|
||||||
|
read_block = _profile_operation_gate("gitea.read")
|
||||||
|
if read_block:
|
||||||
|
return {
|
||||||
|
"success": False,
|
||||||
|
"reasons": read_block,
|
||||||
|
"permission_report": _permission_block_report("gitea.read"),
|
||||||
|
}
|
||||||
|
h, o, r = _resolve(remote, host, org, repo)
|
||||||
|
auth = _auth(h)
|
||||||
|
ctx = _gather_author_duplicate_work_context(
|
||||||
|
issue_number,
|
||||||
|
h=h,
|
||||||
|
o=o,
|
||||||
|
r=r,
|
||||||
|
auth=auth,
|
||||||
|
exclude_branch_name=exclude_branch_name,
|
||||||
|
)
|
||||||
|
result = author_duplicate_work_gate.classify_and_assess(
|
||||||
|
ctx["issue"],
|
||||||
|
stage=stage,
|
||||||
|
comments=ctx["comments"],
|
||||||
|
open_prs=ctx["open_prs"],
|
||||||
|
branch_names=ctx["branch_names"],
|
||||||
|
allow_stale_takeover=allow_stale_takeover,
|
||||||
|
)
|
||||||
|
assessment = result.get("duplicate_work") or {}
|
||||||
|
return {
|
||||||
|
"success": True,
|
||||||
|
"performed": False,
|
||||||
|
"issue_number": issue_number,
|
||||||
|
"stage": stage,
|
||||||
|
"allowed": assessment.get("allowed"),
|
||||||
|
"block": assessment.get("block"),
|
||||||
|
"eligibility_class": assessment.get("eligibility_class"),
|
||||||
|
"outcome": assessment.get("outcome"),
|
||||||
|
"linked_open_pr": assessment.get("linked_open_pr"),
|
||||||
|
"matching_branches": assessment.get("matching_branches"),
|
||||||
|
"claim_status": assessment.get("claim_status"),
|
||||||
|
"reasons": assessment.get("reasons"),
|
||||||
|
"safe_next_action": assessment.get("safe_next_action"),
|
||||||
|
"claim": result.get("claim"),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@mcp.tool()
|
@mcp.tool()
|
||||||
def gitea_reconcile_issue_claims(
|
def gitea_reconcile_issue_claims(
|
||||||
state: str = "open",
|
state: str = "open",
|
||||||
|
|||||||
@@ -1,142 +0,0 @@
|
|||||||
"""Own-branch lock adoption / recovery for ``gitea_lock_issue`` (#442).
|
|
||||||
|
|
||||||
When an issue's own already-pushed branch exists, lock reacquisition must be
|
|
||||||
allowed (adoption) instead of being treated as #400 duplicate competing work.
|
|
||||||
This module isolates the pure decision so it can be unit-tested apart from the
|
|
||||||
MCP server's live Gitea calls.
|
|
||||||
|
|
||||||
Adoption is granted only for the issue's *exact* requested branch. Any other
|
|
||||||
branch that merely contains the same ``issue-<n>`` marker is competing work and
|
|
||||||
stays fail-closed. Open-PR, competing-live-lock, capability, and worktree
|
|
||||||
safety checks are enforced by the caller before this decision is consulted;
|
|
||||||
this module additionally records whether they passed for proof purposes.
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
ADOPT = "adopt_existing_branch"
|
|
||||||
BLOCK_COMPETING = "block_competing_branch"
|
|
||||||
NO_MATCH = "no_matching_branch"
|
|
||||||
|
|
||||||
|
|
||||||
def _branch_name(entry) -> str:
|
|
||||||
if isinstance(entry, dict):
|
|
||||||
return str(entry.get("name") or "")
|
|
||||||
return str(entry or "")
|
|
||||||
|
|
||||||
|
|
||||||
def _branch_sha(entry) -> str | None:
|
|
||||||
if isinstance(entry, dict):
|
|
||||||
sha = entry.get("commit_sha")
|
|
||||||
if sha:
|
|
||||||
return str(sha)
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def assess_own_branch_adoption(
|
|
||||||
*,
|
|
||||||
issue_number: int,
|
|
||||||
requested_branch: str,
|
|
||||||
existing_branches,
|
|
||||||
) -> dict:
|
|
||||||
"""Decide whether an existing matching branch is adoptable.
|
|
||||||
|
|
||||||
Args:
|
|
||||||
issue_number: The tracking issue number being locked.
|
|
||||||
requested_branch: The exact branch the caller wants to lock.
|
|
||||||
existing_branches: Iterable of remote branch entries — either names or
|
|
||||||
dicts with ``name`` and optional ``commit_sha``.
|
|
||||||
|
|
||||||
Returns:
|
|
||||||
dict with:
|
|
||||||
* ``outcome`` — one of ADOPT / BLOCK_COMPETING / NO_MATCH
|
|
||||||
* ``adopt`` (bool), ``block`` (bool)
|
|
||||||
* ``reason`` (str)
|
|
||||||
* ``matched_branch`` (str | None), ``matched_head_sha`` (str | None)
|
|
||||||
* ``competing_branches`` (list[str])
|
|
||||||
|
|
||||||
ADOPT: the issue's exact branch exists and no other same-issue branch does.
|
|
||||||
BLOCK_COMPETING: at least one same-issue branch is not the requested branch.
|
|
||||||
NO_MATCH: no branch carries the issue marker — normal lock path applies.
|
|
||||||
"""
|
|
||||||
marker = f"issue-{issue_number}"
|
|
||||||
requested = (requested_branch or "").strip()
|
|
||||||
|
|
||||||
matches: list[tuple[str, str | None]] = []
|
|
||||||
for entry in existing_branches or []:
|
|
||||||
name = _branch_name(entry).strip()
|
|
||||||
if marker in name:
|
|
||||||
matches.append((name, _branch_sha(entry)))
|
|
||||||
|
|
||||||
competing = sorted({name for name, _ in matches if name != requested})
|
|
||||||
exact = [(name, sha) for name, sha in matches if name == requested]
|
|
||||||
|
|
||||||
# Fail closed whenever any non-requested same-issue branch exists, even if
|
|
||||||
# the requested branch is also present: ownership is then ambiguous.
|
|
||||||
if competing:
|
|
||||||
return {
|
|
||||||
"outcome": BLOCK_COMPETING,
|
|
||||||
"adopt": False,
|
|
||||||
"block": True,
|
|
||||||
"reason": (
|
|
||||||
f"issue #{issue_number} already has matching branch(es) "
|
|
||||||
f"{competing} that are not the requested branch "
|
|
||||||
f"'{requested}' (fail closed)"
|
|
||||||
),
|
|
||||||
"matched_branch": None,
|
|
||||||
"matched_head_sha": None,
|
|
||||||
"competing_branches": competing,
|
|
||||||
}
|
|
||||||
|
|
||||||
if exact:
|
|
||||||
name, sha = exact[0]
|
|
||||||
return {
|
|
||||||
"outcome": ADOPT,
|
|
||||||
"adopt": True,
|
|
||||||
"block": False,
|
|
||||||
"reason": (
|
|
||||||
f"existing branch '{name}' is the exact requested branch for "
|
|
||||||
f"issue #{issue_number}; adopting it for lock recovery"
|
|
||||||
),
|
|
||||||
"matched_branch": name,
|
|
||||||
"matched_head_sha": sha,
|
|
||||||
"competing_branches": [],
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
"outcome": NO_MATCH,
|
|
||||||
"adopt": False,
|
|
||||||
"block": False,
|
|
||||||
"reason": f"no existing branch matches issue #{issue_number}",
|
|
||||||
"matched_branch": None,
|
|
||||||
"matched_head_sha": None,
|
|
||||||
"competing_branches": [],
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def build_adoption_proof(
|
|
||||||
*,
|
|
||||||
issue_number: int,
|
|
||||||
branch_name: str,
|
|
||||||
assessment: dict,
|
|
||||||
open_pr_checked: bool,
|
|
||||||
competing_lock_checked: bool,
|
|
||||||
lock_file_path: str,
|
|
||||||
lock_file_status: str,
|
|
||||||
) -> dict:
|
|
||||||
"""Assemble the proof block returned by ``gitea_lock_issue`` on adoption.
|
|
||||||
|
|
||||||
Requirement #4: adoption results must carry issue number, branch name,
|
|
||||||
branch head commit, adoption reason, no-existing-PR proof, no-competing-
|
|
||||||
live-lock proof, and lock file path/status.
|
|
||||||
"""
|
|
||||||
return {
|
|
||||||
"issue_number": issue_number,
|
|
||||||
"branch_name": branch_name,
|
|
||||||
"branch_head_commit": assessment.get("matched_head_sha"),
|
|
||||||
"adoption_reason": assessment.get("reason"),
|
|
||||||
"no_existing_pr_proof": bool(open_pr_checked),
|
|
||||||
"no_competing_live_lock_proof": bool(competing_lock_checked),
|
|
||||||
"lock_file_path": lock_file_path,
|
|
||||||
"lock_file_status": lock_file_status,
|
|
||||||
}
|
|
||||||
@@ -1,269 +0,0 @@
|
|||||||
"""Issue-lock provenance and external-state disclosure (#447).
|
|
||||||
|
|
||||||
Sanctioned locks are written only by ``gitea_lock_issue`` (or adoption recovery
|
|
||||||
#442). Manual seeding of ``/tmp/gitea_issue_lock.json`` is unsafe and must be
|
|
||||||
blocked at PR creation unless explicit operator override proof is recorded.
|
|
||||||
"""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import os
|
|
||||||
import re
|
|
||||||
from datetime import datetime, timezone
|
|
||||||
|
|
||||||
ISSUE_LOCK_FILE = os.environ.get("GITEA_ISSUE_LOCK_FILE", "/tmp/gitea_issue_lock.json")
|
|
||||||
|
|
||||||
SOURCE_LOCK_ISSUE = "gitea_lock_issue"
|
|
||||||
SOURCE_LOCK_ADOPTION = "gitea_lock_issue_adoption"
|
|
||||||
SOURCE_OPERATOR_OVERRIDE = "operator_override"
|
|
||||||
|
|
||||||
SANCTIONED_LOCK_SOURCES = frozenset({
|
|
||||||
SOURCE_LOCK_ISSUE,
|
|
||||||
SOURCE_LOCK_ADOPTION,
|
|
||||||
SOURCE_OPERATOR_OVERRIDE,
|
|
||||||
})
|
|
||||||
|
|
||||||
_OPERATOR_OVERRIDE_ENV = "GITEA_ISSUE_LOCK_OPERATOR_OVERRIDE"
|
|
||||||
|
|
||||||
_ISSUE_LOCK_PATH_RE = re.compile(
|
|
||||||
r"(?:/tmp/)?gitea_issue_lock\.json",
|
|
||||||
re.IGNORECASE,
|
|
||||||
)
|
|
||||||
_LOCK_SEED_RE = re.compile(
|
|
||||||
r"(?:seed(?:ed|ing)?|restor(?:e|ed|ing)|wrote|written|write|programmatically|"
|
|
||||||
r"hand[- ]forg|manual(?:ly)?).{0,80}gitea_issue_lock",
|
|
||||||
re.IGNORECASE | re.DOTALL,
|
|
||||||
)
|
|
||||||
_LOCK_REMOVE_RE = re.compile(
|
|
||||||
r"(?:\brm\b|remove|deleted?|unlink).{0,80}gitea_issue_lock",
|
|
||||||
re.IGNORECASE | re.DOTALL,
|
|
||||||
)
|
|
||||||
_LOCK_READ_RE = re.compile(
|
|
||||||
r"(?:read|loaded?|parsed?).{0,80}gitea_issue_lock",
|
|
||||||
re.IGNORECASE | re.DOTALL,
|
|
||||||
)
|
|
||||||
_EXTERNAL_NONE_RE = re.compile(
|
|
||||||
r"external[- ]state mutations\s*:\s*none\b",
|
|
||||||
re.IGNORECASE,
|
|
||||||
)
|
|
||||||
_EXTERNAL_FIELD_RE = re.compile(
|
|
||||||
r"external[- ]state mutations\s*:\s*(.+)$",
|
|
||||||
re.IGNORECASE | re.MULTILINE,
|
|
||||||
)
|
|
||||||
_CLEANUP_ONLY_RE = re.compile(
|
|
||||||
r"cleanup mutations\s*:\s*(?:none|lock removed|removed issue lock)",
|
|
||||||
re.IGNORECASE,
|
|
||||||
)
|
|
||||||
_PR_CREATED_RE = re.compile(
|
|
||||||
r"(?:\bgitea_create_pr\b|PR\s*#\s*\d+\s+created|created\s+PR\s*#|opened\s+PR\s*#|"
|
|
||||||
r"PR\s+creation\s+(?:succeeded|complete))",
|
|
||||||
re.IGNORECASE,
|
|
||||||
)
|
|
||||||
_REVIEW_APPROVE_RE = re.compile(
|
|
||||||
r"(?:submitted\s+(?:['\"]approve['\"]|approve\s+review)|"
|
|
||||||
r"review decision\s*:\s*approve|approved\s+PR\s*#|gitea_review_pr.*approve)",
|
|
||||||
re.IGNORECASE,
|
|
||||||
)
|
|
||||||
_OVERRIDE_PROOF_RE = re.compile(
|
|
||||||
r"operator[- ]override\s+proof\s*:\s*(.+)$",
|
|
||||||
re.IGNORECASE | re.MULTILINE,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def _utc_now_iso() -> str:
|
|
||||||
return datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ")
|
|
||||||
|
|
||||||
|
|
||||||
def build_sanctioned_lock_provenance(
|
|
||||||
*,
|
|
||||||
tool: str,
|
|
||||||
source: str = SOURCE_LOCK_ISSUE,
|
|
||||||
claimant: dict | None = None,
|
|
||||||
adoption: dict | None = None,
|
|
||||||
) -> dict:
|
|
||||||
"""Return provenance metadata stored with a sanctioned lock write."""
|
|
||||||
entry = {
|
|
||||||
"source": source,
|
|
||||||
"written_at": _utc_now_iso(),
|
|
||||||
"written_by_tool": tool,
|
|
||||||
"lock_file_path": ISSUE_LOCK_FILE,
|
|
||||||
}
|
|
||||||
if claimant:
|
|
||||||
entry["claimant"] = claimant
|
|
||||||
if adoption:
|
|
||||||
entry["adoption"] = adoption
|
|
||||||
return entry
|
|
||||||
|
|
||||||
|
|
||||||
def operator_override_requested() -> bool:
|
|
||||||
return os.environ.get(_OPERATOR_OVERRIDE_ENV, "").strip().lower() in {
|
|
||||||
"1",
|
|
||||||
"true",
|
|
||||||
"yes",
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def build_operator_override_provenance(*, reason: str, claimant: dict | None = None) -> dict:
|
|
||||||
text = (reason or "").strip()
|
|
||||||
if not text:
|
|
||||||
raise ValueError(
|
|
||||||
"operator override requires a non-empty override reason (fail closed)"
|
|
||||||
)
|
|
||||||
entry = build_sanctioned_lock_provenance(
|
|
||||||
tool="operator_override",
|
|
||||||
source=SOURCE_OPERATOR_OVERRIDE,
|
|
||||||
claimant=claimant,
|
|
||||||
)
|
|
||||||
entry["override_reason"] = text
|
|
||||||
return entry
|
|
||||||
|
|
||||||
|
|
||||||
def assess_lock_file_for_create_pr(lock_data: dict | None) -> dict:
|
|
||||||
"""Fail closed when lock file lacks sanctioned provenance (#447)."""
|
|
||||||
data = lock_data if isinstance(lock_data, dict) else {}
|
|
||||||
reasons: list[str] = []
|
|
||||||
provenance = data.get("lock_provenance")
|
|
||||||
if not isinstance(provenance, dict):
|
|
||||||
reasons.append(
|
|
||||||
"issue lock file lacks sanctioned lock_provenance; manual seeding is "
|
|
||||||
"not a normal recovery path — call gitea_lock_issue or use #442 adoption"
|
|
||||||
)
|
|
||||||
return _provenance_result(False, reasons, provenance)
|
|
||||||
|
|
||||||
source = str(provenance.get("source") or "").strip()
|
|
||||||
if source not in SANCTIONED_LOCK_SOURCES:
|
|
||||||
reasons.append(
|
|
||||||
f"issue lock provenance source '{source or '(missing)'}' is not sanctioned"
|
|
||||||
)
|
|
||||||
|
|
||||||
if source == SOURCE_OPERATOR_OVERRIDE and not str(
|
|
||||||
provenance.get("override_reason") or ""
|
|
||||||
).strip():
|
|
||||||
reasons.append(
|
|
||||||
"operator_override lock provenance requires override_reason proof"
|
|
||||||
)
|
|
||||||
|
|
||||||
if not data.get("work_lease"):
|
|
||||||
reasons.append("issue lock file missing work_lease metadata")
|
|
||||||
|
|
||||||
if not str(provenance.get("written_by_tool") or "").strip():
|
|
||||||
reasons.append("issue lock provenance missing written_by_tool")
|
|
||||||
|
|
||||||
proven = not reasons
|
|
||||||
return _provenance_result(proven, reasons, provenance)
|
|
||||||
|
|
||||||
|
|
||||||
def _provenance_result(proven: bool, reasons: list[str], provenance: dict | None) -> dict:
|
|
||||||
return {
|
|
||||||
"proven": proven,
|
|
||||||
"block": not proven,
|
|
||||||
"reasons": reasons,
|
|
||||||
"lock_provenance": provenance,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def format_lock_provenance_error(assessment: dict) -> str:
|
|
||||||
reasons = "; ".join(assessment.get("reasons") or ["unknown lock provenance violation"])
|
|
||||||
return f"Issue lock provenance guard (#447): {reasons} (fail closed)"
|
|
||||||
|
|
||||||
|
|
||||||
def _lock_activity_detected(text: str) -> dict[str, bool]:
|
|
||||||
body = text or ""
|
|
||||||
return {
|
|
||||||
"seed_or_restore": bool(_LOCK_SEED_RE.search(body)),
|
|
||||||
"remove": bool(_LOCK_REMOVE_RE.search(body)),
|
|
||||||
"read": bool(_LOCK_READ_RE.search(body)),
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def _external_state_discloses_lock(text: str) -> bool:
|
|
||||||
match = _EXTERNAL_FIELD_RE.search(text or "")
|
|
||||||
if not match:
|
|
||||||
return False
|
|
||||||
value = (match.group(1) or "").strip().lower()
|
|
||||||
if value in {"", "none", "n/a"}:
|
|
||||||
return False
|
|
||||||
return "lock" in value or "gitea_issue_lock" in value or "issue-lock" in value
|
|
||||||
|
|
||||||
|
|
||||||
def assess_issue_lock_external_state_report(report_text: str) -> dict:
|
|
||||||
"""Require explicit external-state disclosure for issue-lock mutations (#447)."""
|
|
||||||
text = report_text or ""
|
|
||||||
activity = _lock_activity_detected(text)
|
|
||||||
if not any(activity.values()):
|
|
||||||
return {"proven": True, "block": False, "reasons": [], "activity": activity}
|
|
||||||
|
|
||||||
reasons: list[str] = []
|
|
||||||
disclosed = _external_state_discloses_lock(text)
|
|
||||||
|
|
||||||
if activity["seed_or_restore"] and _EXTERNAL_NONE_RE.search(text):
|
|
||||||
reasons.append(
|
|
||||||
"report mentions seeding/restoring gitea_issue_lock.json but claims "
|
|
||||||
"External-state mutations: none"
|
|
||||||
)
|
|
||||||
elif activity["seed_or_restore"] and not disclosed:
|
|
||||||
reasons.append(
|
|
||||||
"report mentions issue-lock file activity but External-state mutations "
|
|
||||||
"does not disclose read/write of gitea_issue_lock.json"
|
|
||||||
)
|
|
||||||
|
|
||||||
if activity["remove"]:
|
|
||||||
if _EXTERNAL_NONE_RE.search(text):
|
|
||||||
reasons.append(
|
|
||||||
"report mentions removing gitea_issue_lock.json but claims "
|
|
||||||
"External-state mutations: none"
|
|
||||||
)
|
|
||||||
elif not disclosed and _CLEANUP_ONLY_RE.search(text):
|
|
||||||
reasons.append(
|
|
||||||
"report removes issue lock but classifies it as cleanup only; "
|
|
||||||
"record under External-state mutations"
|
|
||||||
)
|
|
||||||
elif not disclosed:
|
|
||||||
reasons.append(
|
|
||||||
"report mentions deleting issue lock without External-state "
|
|
||||||
"mutation disclosure"
|
|
||||||
)
|
|
||||||
|
|
||||||
proven = not reasons
|
|
||||||
return {
|
|
||||||
"proven": proven,
|
|
||||||
"block": not proven,
|
|
||||||
"reasons": reasons,
|
|
||||||
"activity": activity,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def assess_manual_lock_pr_without_override(report_text: str) -> dict:
|
|
||||||
"""Block reports that created a PR via manual lock seed without override proof."""
|
|
||||||
text = report_text or ""
|
|
||||||
seeded = bool(_LOCK_SEED_RE.search(text))
|
|
||||||
created = bool(_PR_CREATED_RE.search(text))
|
|
||||||
if not (seeded and created):
|
|
||||||
return {"proven": True, "block": False, "reasons": []}
|
|
||||||
|
|
||||||
if _OVERRIDE_PROOF_RE.search(text):
|
|
||||||
return {"proven": True, "block": False, "reasons": []}
|
|
||||||
|
|
||||||
return {
|
|
||||||
"proven": False,
|
|
||||||
"block": True,
|
|
||||||
"reasons": [
|
|
||||||
"report created/opened a PR after manual issue-lock seeding without "
|
|
||||||
"operator override proof"
|
|
||||||
],
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def assess_author_reviewer_same_run_report(report_text: str) -> dict:
|
|
||||||
"""Reviewer handoff must not create and approve the same PR in one run (#447)."""
|
|
||||||
text = report_text or ""
|
|
||||||
if not (_PR_CREATED_RE.search(text) and _REVIEW_APPROVE_RE.search(text)):
|
|
||||||
return {"proven": True, "block": False, "reasons": []}
|
|
||||||
return {
|
|
||||||
"proven": False,
|
|
||||||
"block": True,
|
|
||||||
"reasons": [
|
|
||||||
"report mixes author-side PR creation and reviewer approval in one "
|
|
||||||
"final handoff; split author and reviewer sessions"
|
|
||||||
],
|
|
||||||
}
|
|
||||||
@@ -1,180 +0,0 @@
|
|||||||
"""Early duplicate-work detection for author work-issue sessions (#400)."""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from typing import Any
|
|
||||||
|
|
||||||
import issue_claim_heartbeat as claim_hb
|
|
||||||
|
|
||||||
PHASE_LOCK = "lock_issue"
|
|
||||||
PHASE_COMMIT = "commit"
|
|
||||||
PHASE_PUSH = "push"
|
|
||||||
PHASE_CREATE_PR = "create_pr"
|
|
||||||
|
|
||||||
OUTCOME_DUPLICATE_PR_PREVENTED = "duplicate_pr_prevented"
|
|
||||||
OUTCOME_DUPLICATE_BRANCH_PREVENTED = "duplicate_branch_prevented"
|
|
||||||
OUTCOME_DUPLICATE_COMMIT_PREVENTED = "duplicate_commit_prevented"
|
|
||||||
OUTCOME_DUPLICATE_WORK_NOT_PREVENTED = "duplicate_work_not_prevented"
|
|
||||||
|
|
||||||
_ACTIVE_CLAIM_STATUSES = frozenset({"active", "awaiting_review"})
|
|
||||||
|
|
||||||
|
|
||||||
def _issue_pattern(issue_number: int) -> str:
|
|
||||||
return f"issue-{int(issue_number)}"
|
|
||||||
|
|
||||||
|
|
||||||
def _linked_open_pr(issue_number: int, open_prs: list[dict]) -> dict | None:
|
|
||||||
return claim_hb._linked_open_pr(issue_number, open_prs)
|
|
||||||
|
|
||||||
|
|
||||||
def _matching_branches(
|
|
||||||
issue_number: int,
|
|
||||||
branch_names: list[str],
|
|
||||||
*,
|
|
||||||
locked_branch: str | None = None,
|
|
||||||
) -> list[str]:
|
|
||||||
pattern = _issue_pattern(issue_number)
|
|
||||||
matches = [
|
|
||||||
name for name in (branch_names or [])
|
|
||||||
if pattern in (name or "").lower()
|
|
||||||
]
|
|
||||||
if locked_branch:
|
|
||||||
locked = locked_branch.strip()
|
|
||||||
matches = [name for name in matches if name != locked]
|
|
||||||
return matches
|
|
||||||
|
|
||||||
|
|
||||||
def assess_work_issue_duplicate_gate(
|
|
||||||
issue_number: int,
|
|
||||||
*,
|
|
||||||
open_prs: list[dict] | None = None,
|
|
||||||
branch_names: list[str] | None = None,
|
|
||||||
claim_entry: dict | None = None,
|
|
||||||
locked_branch: str | None = None,
|
|
||||||
phase: str = PHASE_LOCK,
|
|
||||||
) -> dict[str, Any]:
|
|
||||||
"""Fail closed when duplicate work is already in flight for an issue."""
|
|
||||||
reasons: list[str] = []
|
|
||||||
outcome = OUTCOME_DUPLICATE_WORK_NOT_PREVENTED
|
|
||||||
prs = list(open_prs or [])
|
|
||||||
branches = list(branch_names or [])
|
|
||||||
pattern = _issue_pattern(issue_number)
|
|
||||||
|
|
||||||
linked = _linked_open_pr(issue_number, prs)
|
|
||||||
if linked:
|
|
||||||
reasons.append(
|
|
||||||
f"open PR #{linked.get('number')} already covers issue "
|
|
||||||
f"#{issue_number} (fail closed)"
|
|
||||||
)
|
|
||||||
outcome = OUTCOME_DUPLICATE_PR_PREVENTED
|
|
||||||
|
|
||||||
conflicting_branches = _matching_branches(
|
|
||||||
issue_number, branches, locked_branch=locked_branch
|
|
||||||
)
|
|
||||||
if conflicting_branches:
|
|
||||||
names = ", ".join(conflicting_branches[:5])
|
|
||||||
reasons.append(
|
|
||||||
f"remote branch(es) already match issue pattern '{pattern}': "
|
|
||||||
f"{names} (fail closed)"
|
|
||||||
)
|
|
||||||
if outcome == OUTCOME_DUPLICATE_WORK_NOT_PREVENTED:
|
|
||||||
outcome = OUTCOME_DUPLICATE_BRANCH_PREVENTED
|
|
||||||
|
|
||||||
entry = claim_entry or {}
|
|
||||||
if entry.get("linked_open_pr") and not linked:
|
|
||||||
reasons.append(
|
|
||||||
f"claim inventory reports open PR #{entry['linked_open_pr']} "
|
|
||||||
f"for issue #{issue_number} (fail closed)"
|
|
||||||
)
|
|
||||||
outcome = OUTCOME_DUPLICATE_PR_PREVENTED
|
|
||||||
|
|
||||||
status = (entry.get("status") or "").strip().lower()
|
|
||||||
if status in _ACTIVE_CLAIM_STATUSES and not linked:
|
|
||||||
heartbeat = entry.get("latest_heartbeat") or {}
|
|
||||||
claim_branch = (heartbeat.get("branch") or "").strip()
|
|
||||||
if locked_branch and claim_branch and claim_branch != locked_branch:
|
|
||||||
reasons.append(
|
|
||||||
f"active claim lease on branch '{claim_branch}' blocks "
|
|
||||||
f"work on '{locked_branch}' for issue #{issue_number} "
|
|
||||||
"(fail closed)"
|
|
||||||
)
|
|
||||||
if outcome == OUTCOME_DUPLICATE_WORK_NOT_PREVENTED:
|
|
||||||
outcome = OUTCOME_DUPLICATE_BRANCH_PREVENTED
|
|
||||||
elif not locked_branch and status == "active":
|
|
||||||
reasons.append(
|
|
||||||
f"issue #{issue_number} has an active claim lease "
|
|
||||||
"(fail closed)"
|
|
||||||
)
|
|
||||||
if outcome == OUTCOME_DUPLICATE_WORK_NOT_PREVENTED:
|
|
||||||
outcome = OUTCOME_DUPLICATE_BRANCH_PREVENTED
|
|
||||||
|
|
||||||
if phase in {PHASE_COMMIT, PHASE_PUSH} and reasons:
|
|
||||||
if outcome == OUTCOME_DUPLICATE_PR_PREVENTED:
|
|
||||||
outcome = OUTCOME_DUPLICATE_COMMIT_PREVENTED
|
|
||||||
elif outcome == OUTCOME_DUPLICATE_BRANCH_PREVENTED:
|
|
||||||
outcome = OUTCOME_DUPLICATE_COMMIT_PREVENTED
|
|
||||||
|
|
||||||
block = bool(reasons)
|
|
||||||
return {
|
|
||||||
"block": block,
|
|
||||||
"performed": not block,
|
|
||||||
"issue_number": issue_number,
|
|
||||||
"phase": phase,
|
|
||||||
"outcome": outcome,
|
|
||||||
"linked_open_pr": linked.get("number") if linked else entry.get("linked_open_pr"),
|
|
||||||
"conflicting_branches": conflicting_branches,
|
|
||||||
"claim_status": status or None,
|
|
||||||
"reasons": reasons,
|
|
||||||
"safe_next_action": (
|
|
||||||
"stop before mutating; preserve local work and produce a "
|
|
||||||
"reconciliation handoff if a concurrent PR appeared after push"
|
|
||||||
if block and phase == PHASE_CREATE_PR
|
|
||||||
else "stop before mutating; do not commit or push duplicate work"
|
|
||||||
if block
|
|
||||||
else "proceed"
|
|
||||||
),
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def assess_work_issue_duplicate_report(report_text: str) -> dict[str, Any]:
|
|
||||||
"""Require explicit duplicate-work outcome wording in work-issue reports."""
|
|
||||||
text = (report_text or "").lower()
|
|
||||||
markers = {
|
|
||||||
OUTCOME_DUPLICATE_PR_PREVENTED: (
|
|
||||||
"duplicate pr prevented",
|
|
||||||
"duplicate_pr_prevented",
|
|
||||||
),
|
|
||||||
OUTCOME_DUPLICATE_BRANCH_PREVENTED: (
|
|
||||||
"duplicate branch prevented",
|
|
||||||
"duplicate_branch_prevented",
|
|
||||||
),
|
|
||||||
OUTCOME_DUPLICATE_COMMIT_PREVENTED: (
|
|
||||||
"duplicate commit prevented",
|
|
||||||
"duplicate_commit_prevented",
|
|
||||||
),
|
|
||||||
OUTCOME_DUPLICATE_WORK_NOT_PREVENTED: (
|
|
||||||
"duplicate work not prevented",
|
|
||||||
"duplicate_work_not_prevented",
|
|
||||||
"no duplicate work",
|
|
||||||
),
|
|
||||||
}
|
|
||||||
matched = [
|
|
||||||
key for key, phrases in markers.items()
|
|
||||||
if any(phrase in text for phrase in phrases)
|
|
||||||
]
|
|
||||||
if len(matched) != 1:
|
|
||||||
return {
|
|
||||||
"complete": False,
|
|
||||||
"downgraded": True,
|
|
||||||
"reasons": [
|
|
||||||
"work-issue report must state exactly one duplicate-work "
|
|
||||||
"outcome (duplicate PR/branch/commit prevented, or "
|
|
||||||
"duplicate work not prevented)"
|
|
||||||
],
|
|
||||||
}
|
|
||||||
return {
|
|
||||||
"complete": True,
|
|
||||||
"downgraded": False,
|
|
||||||
"outcome": matched[0],
|
|
||||||
"reasons": [],
|
|
||||||
}
|
|
||||||
+19
-4
@@ -3622,21 +3622,33 @@ def assess_work_issue_mode_isolation(report_text: str) -> dict:
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def assess_work_issue_duplicate_prevention_report(report_text, **kwargs):
|
||||||
|
"""#400: work-issue reports must classify duplicate-work prevention."""
|
||||||
|
from author_duplicate_work_gate import (
|
||||||
|
assess_work_issue_duplicate_prevention_report as _assess,
|
||||||
|
)
|
||||||
|
|
||||||
|
return _assess(report_text, **kwargs)
|
||||||
|
|
||||||
|
|
||||||
def assess_work_issue_final_report(report_text: str) -> dict:
|
def assess_work_issue_final_report(report_text: str) -> dict:
|
||||||
"""#139: composite verifier for work-issue final reports."""
|
"""#139: composite verifier for work-issue final reports."""
|
||||||
from issue_work_duplicate_gate import assess_work_issue_duplicate_report
|
|
||||||
|
|
||||||
checks = {
|
checks = {
|
||||||
"workflow_source": assess_work_issue_workflow_source(report_text),
|
"workflow_source": assess_work_issue_workflow_source(report_text),
|
||||||
"mode_isolation": assess_work_issue_mode_isolation(report_text),
|
"mode_isolation": assess_work_issue_mode_isolation(report_text),
|
||||||
"duplicate_work_outcome": assess_work_issue_duplicate_report(report_text),
|
"duplicate_prevention": assess_work_issue_duplicate_prevention_report(
|
||||||
|
report_text
|
||||||
|
),
|
||||||
}
|
}
|
||||||
|
|
||||||
reasons = []
|
reasons = []
|
||||||
downgraded = False
|
downgraded = False
|
||||||
for name, result in checks.items():
|
for name, result in checks.items():
|
||||||
verdict = result.get("verdict")
|
verdict = result.get("verdict")
|
||||||
if verdict in ("missing", "incomplete"):
|
if result.get("block"):
|
||||||
|
downgraded = True
|
||||||
|
reasons.extend(result.get("reasons") or [])
|
||||||
|
elif verdict in ("missing", "incomplete"):
|
||||||
downgraded = True
|
downgraded = True
|
||||||
reasons.extend(result.get("reasons") or [])
|
reasons.extend(result.get("reasons") or [])
|
||||||
elif result.get("downgraded") or not result.get("complete", True):
|
elif result.get("downgraded") or not result.get("complete", True):
|
||||||
@@ -3644,6 +3656,9 @@ def assess_work_issue_final_report(report_text: str) -> dict:
|
|||||||
reasons.extend(
|
reasons.extend(
|
||||||
f"{name}: {r}" for r in (result.get("reasons") or [])
|
f"{name}: {r}" for r in (result.get("reasons") or [])
|
||||||
)
|
)
|
||||||
|
elif result.get("proven") is False:
|
||||||
|
downgraded = True
|
||||||
|
reasons.extend(result.get("reasons") or [])
|
||||||
|
|
||||||
grade = "A" if not downgraded else "downgraded"
|
grade = "A" if not downgraded else "downgraded"
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -1,6 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
set -euo pipefail
|
|
||||||
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
||||||
repo_root="$(cd "$script_dir/.." && pwd)"
|
|
||||||
cd "$repo_root"
|
|
||||||
exec python3 -m webui "$@"
|
|
||||||
@@ -277,6 +277,24 @@ Do not select an issue based only on memory from a previous session.
|
|||||||
|
|
||||||
Before claiming or working on an issue, check whether there is already an open PR, branch, or active claim for that issue.
|
Before claiming or working on an issue, check whether there is already an open PR, branch, or active claim for that issue.
|
||||||
|
|
||||||
|
Run `gitea_assess_author_duplicate_work` at these stages and stop when `block` is true:
|
||||||
|
|
||||||
|
* `claim` — before `gitea_mark_issue`
|
||||||
|
* `lock` — before `gitea_lock_issue`
|
||||||
|
* `worktree` / `edit` — before creating a worktree or editing files
|
||||||
|
* `commit` — immediately before `git commit`
|
||||||
|
* `push` — immediately before `git push`
|
||||||
|
* `create_pr` — immediately before `gitea_create_pr` (also enforced server-side)
|
||||||
|
|
||||||
|
`gitea_mark_issue`, `gitea_lock_issue`, and `gitea_create_pr` enforce the same gate server-side and fail closed.
|
||||||
|
|
||||||
|
If a concurrent open PR appears after work begins:
|
||||||
|
|
||||||
|
* before commit or push — stop and preserve local work without pushing
|
||||||
|
* after push but before PR creation — produce a reconciliation handoff instead of opening a PR
|
||||||
|
|
||||||
|
Final reports must name the duplicate-work outcome (`duplicate PR prevented`, `duplicate branch prevented`, `duplicate commit prevented`, `duplicate push prevented`, `duplicate work not prevented`, or `reconciliation handoff`).
|
||||||
|
|
||||||
If an open PR already exists for the issue, do not implement duplicate work.
|
If an open PR already exists for the issue, do not implement duplicate work.
|
||||||
|
|
||||||
Classify the issue as:
|
Classify the issue as:
|
||||||
@@ -297,36 +315,6 @@ Report:
|
|||||||
|
|
||||||
Do not create another branch/PR for the same issue unless the project explicitly allows taking over or updating existing work and exact capability is proven.
|
Do not create another branch/PR for the same issue unless the project explicitly allows taking over or updating existing work and exact capability is proven.
|
||||||
|
|
||||||
### 10A. Duplicate-work gate phases (#400)
|
|
||||||
|
|
||||||
Before any file edits, prove duplicate-work clearance with
|
|
||||||
`gitea_assess_work_issue_duplicate` or `gitea_lock_issue` (which runs the same
|
|
||||||
gate). The gate checks live:
|
|
||||||
|
|
||||||
* open PRs linked to the issue (head branch or Closes/Fixes reference),
|
|
||||||
* remote branches matching `issue-<number>`,
|
|
||||||
* active claim leases from structured heartbeats.
|
|
||||||
|
|
||||||
Re-check immediately before:
|
|
||||||
|
|
||||||
* `gitea_commit_files` (commit),
|
|
||||||
* branch push,
|
|
||||||
* `gitea_create_pr` (PR creation).
|
|
||||||
|
|
||||||
If a concurrent open PR appears after work begins:
|
|
||||||
|
|
||||||
* before commit/push → stop and preserve local work without pushing,
|
|
||||||
* after commit but before push → stop without pushing,
|
|
||||||
* after push but before PR creation → stop and produce a reconciliation
|
|
||||||
handoff instead of opening a PR.
|
|
||||||
|
|
||||||
Final reports must state exactly one duplicate-work outcome:
|
|
||||||
|
|
||||||
* `duplicate PR prevented`
|
|
||||||
* `duplicate branch prevented`
|
|
||||||
* `duplicate commit prevented`
|
|
||||||
* `duplicate work not prevented`
|
|
||||||
|
|
||||||
## 11. Claim or lock the issue before implementation
|
## 11. Claim or lock the issue before implementation
|
||||||
|
|
||||||
Claim/lock the issue before implementation if the project provides a claim/lock mechanism.
|
Claim/lock the issue before implementation if the project provides a claim/lock mechanism.
|
||||||
@@ -747,12 +735,6 @@ Use only precise categories:
|
|||||||
* External-state mutations:
|
* External-state mutations:
|
||||||
* Read-only diagnostics:
|
* Read-only diagnostics:
|
||||||
|
|
||||||
Issue-lock file (`/tmp/gitea_issue_lock.json`) read/write/delete is always an
|
|
||||||
external-state mutation. Never claim `External-state mutations: none` after
|
|
||||||
seeding, restoring, or removing that file. Manual lock seeding is not a normal
|
|
||||||
recovery path (#447); use `gitea_lock_issue` or the #442 adoption recovery path
|
|
||||||
instead. Link broader redesign: #438.
|
|
||||||
|
|
||||||
`git fetch`, `git remote update`, and any command that updates refs must be listed under `Git ref mutations`, not read-only diagnostics.
|
`git fetch`, `git remote update`, and any command that updates refs must be listed under `Git ref mutations`, not read-only diagnostics.
|
||||||
|
|
||||||
If `git reset --hard`, checkout, clean, worktree add/remove, merge simulation, merge abort, or similar commands occurred, report them under `Worktree/index mutations`.
|
If `git reset --hard`, checkout, clean, worktree add/remove, merge simulation, merge abort, or similar commands occurred, report them under `Worktree/index mutations`.
|
||||||
|
|||||||
@@ -80,10 +80,7 @@ class TestIssueLockArtifactWarning(unittest.TestCase):
|
|||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
self._env_patcher.stop()
|
self._env_patcher.stop()
|
||||||
|
|
||||||
@patch(
|
@patch("mcp_server.api_get_all", return_value=[])
|
||||||
"mcp_server.issue_duplicate_context_fetcher",
|
|
||||||
return_value=([], [], {"status": "not_claimed"}),
|
|
||||||
)
|
|
||||||
@patch("mcp_server._auth", return_value="token x")
|
@patch("mcp_server._auth", return_value="token x")
|
||||||
@patch("mcp_server._resolve", return_value=("h", "o", "r"))
|
@patch("mcp_server._resolve", return_value=("h", "o", "r"))
|
||||||
@patch("mcp_server.ISSUE_LOCK_FILE", new_callable=lambda: tempfile.mktemp())
|
@patch("mcp_server.ISSUE_LOCK_FILE", new_callable=lambda: tempfile.mktemp())
|
||||||
|
|||||||
@@ -0,0 +1,102 @@
|
|||||||
|
"""Tests for early author duplicate-work gate (#400)."""
|
||||||
|
import sys
|
||||||
|
import unittest
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
||||||
|
|
||||||
|
from author_duplicate_work_gate import ( # noqa: E402
|
||||||
|
ELIGIBILITY_OPEN_PR_EXISTS,
|
||||||
|
assess_author_duplicate_work,
|
||||||
|
assess_work_issue_duplicate_prevention_report,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _open_pr(number: int = 397, issue: int = 395) -> dict:
|
||||||
|
return {
|
||||||
|
"number": number,
|
||||||
|
"head": {"ref": f"feat/issue-{issue}-example"},
|
||||||
|
"title": f"feat: example (Closes #{issue})",
|
||||||
|
"body": f"Closes #{issue}",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class TestAuthorDuplicateWorkGate(unittest.TestCase):
|
||||||
|
def test_clear_when_no_duplicates(self):
|
||||||
|
result = assess_author_duplicate_work(
|
||||||
|
400,
|
||||||
|
stage="claim",
|
||||||
|
open_prs=[],
|
||||||
|
branch_names=["master", "feat/issue-399-other"],
|
||||||
|
)
|
||||||
|
self.assertTrue(result["allowed"])
|
||||||
|
self.assertFalse(result["block"])
|
||||||
|
|
||||||
|
def test_open_pr_blocks_claim(self):
|
||||||
|
result = assess_author_duplicate_work(
|
||||||
|
395,
|
||||||
|
stage="claim",
|
||||||
|
open_prs=[_open_pr()],
|
||||||
|
branch_names=[],
|
||||||
|
)
|
||||||
|
self.assertFalse(result["allowed"])
|
||||||
|
self.assertEqual(result["eligibility_class"], ELIGIBILITY_OPEN_PR_EXISTS)
|
||||||
|
|
||||||
|
def test_matching_branch_blocks_lock_not_create_pr(self):
|
||||||
|
branches = ["feat/issue-400-early-duplicate-work-gate"]
|
||||||
|
lock = assess_author_duplicate_work(
|
||||||
|
400,
|
||||||
|
stage="lock",
|
||||||
|
open_prs=[],
|
||||||
|
branch_names=branches,
|
||||||
|
)
|
||||||
|
self.assertFalse(lock["allowed"])
|
||||||
|
|
||||||
|
create_pr = assess_author_duplicate_work(
|
||||||
|
400,
|
||||||
|
stage="create_pr",
|
||||||
|
open_prs=[],
|
||||||
|
branch_names=branches,
|
||||||
|
matching_branches=[],
|
||||||
|
)
|
||||||
|
self.assertTrue(create_pr["allowed"])
|
||||||
|
|
||||||
|
def test_open_pr_blocks_create_pr_stage(self):
|
||||||
|
result = assess_author_duplicate_work(
|
||||||
|
395,
|
||||||
|
stage="create_pr",
|
||||||
|
open_prs=[_open_pr()],
|
||||||
|
branch_names=["feat/issue-395-proof-backed-review-handoff"],
|
||||||
|
)
|
||||||
|
self.assertFalse(result["allowed"])
|
||||||
|
self.assertEqual(result["outcome"], "duplicate_pr_prevented")
|
||||||
|
|
||||||
|
def test_push_stage_blocks_on_concurrent_pr(self):
|
||||||
|
result = assess_author_duplicate_work(
|
||||||
|
395,
|
||||||
|
stage="push",
|
||||||
|
open_prs=[_open_pr()],
|
||||||
|
branch_names=[],
|
||||||
|
)
|
||||||
|
self.assertFalse(result["allowed"])
|
||||||
|
self.assertEqual(result["outcome"], "duplicate_push_prevented")
|
||||||
|
|
||||||
|
def test_duplicate_prevention_report_requires_outcome(self):
|
||||||
|
bad = assess_work_issue_duplicate_prevention_report(
|
||||||
|
"Duplicate work detected for issue #395."
|
||||||
|
)
|
||||||
|
self.assertFalse(bad["proven"])
|
||||||
|
|
||||||
|
good = assess_work_issue_duplicate_prevention_report(
|
||||||
|
"Duplicate PR prevented; reconciliation handoff produced."
|
||||||
|
)
|
||||||
|
self.assertTrue(good["proven"])
|
||||||
|
|
||||||
|
def test_exported_from_review_proofs(self):
|
||||||
|
from review_proofs import assess_work_issue_duplicate_prevention_report as exported
|
||||||
|
|
||||||
|
self.assertTrue(callable(exported))
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
unittest.main()
|
||||||
@@ -76,14 +76,7 @@ class CommitFilesCapabilityBase(unittest.TestCase):
|
|||||||
with open(self.config_path, "w", encoding="utf-8") as fh:
|
with open(self.config_path, "w", encoding="utf-8") as fh:
|
||||||
fh.write(json.dumps(CONFIG))
|
fh.write(json.dumps(CONFIG))
|
||||||
|
|
||||||
self._dup_fetcher_patcher = patch(
|
|
||||||
"mcp_server.issue_duplicate_context_fetcher",
|
|
||||||
return_value=([], [], {"status": "not_claimed"}),
|
|
||||||
)
|
|
||||||
self._dup_fetcher_patcher.start()
|
|
||||||
|
|
||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
self._dup_fetcher_patcher.stop()
|
|
||||||
self._remotes.stop()
|
self._remotes.stop()
|
||||||
mcp_server._IDENTITY_CACHE.clear()
|
mcp_server._IDENTITY_CACHE.clear()
|
||||||
mcp_server._preflight_whoami_called, mcp_server._preflight_capability_called = (
|
mcp_server._preflight_whoami_called, mcp_server._preflight_capability_called = (
|
||||||
|
|||||||
@@ -67,15 +67,6 @@ class TestCommitPayloads(unittest.TestCase):
|
|||||||
self.locked_worktree_path = os.path.realpath(self.locked_worktree_dir.name)
|
self.locked_worktree_path = os.path.realpath(self.locked_worktree_dir.name)
|
||||||
|
|
||||||
self.lock_file_path = "/tmp/gitea_issue_lock.json"
|
self.lock_file_path = "/tmp/gitea_issue_lock.json"
|
||||||
import issue_lock_provenance
|
|
||||||
|
|
||||||
work_lease = {
|
|
||||||
"operation_type": "author_issue_work",
|
|
||||||
"issue_number": 263,
|
|
||||||
"branch": "feat/issue-263-native-commit-payloads",
|
|
||||||
"claimant": {"username": "test-user", "profile": "test-author"},
|
|
||||||
"expires_at": "2999-01-01T00:00:00Z",
|
|
||||||
}
|
|
||||||
self.lock_data = {
|
self.lock_data = {
|
||||||
"issue_number": 263,
|
"issue_number": 263,
|
||||||
"branch_name": "feat/issue-263-native-commit-payloads",
|
"branch_name": "feat/issue-263-native-commit-payloads",
|
||||||
@@ -83,11 +74,6 @@ class TestCommitPayloads(unittest.TestCase):
|
|||||||
"org": "Example-Org",
|
"org": "Example-Org",
|
||||||
"repo": "Example-Repo",
|
"repo": "Example-Repo",
|
||||||
"worktree_path": self.locked_worktree_path,
|
"worktree_path": self.locked_worktree_path,
|
||||||
"work_lease": work_lease,
|
|
||||||
"lock_provenance": issue_lock_provenance.build_sanctioned_lock_provenance(
|
|
||||||
tool="gitea_lock_issue",
|
|
||||||
claimant=work_lease.get("claimant"),
|
|
||||||
),
|
|
||||||
}
|
}
|
||||||
with open(self.lock_file_path, "w", encoding="utf-8") as fh:
|
with open(self.lock_file_path, "w", encoding="utf-8") as fh:
|
||||||
fh.write(json.dumps(self.lock_data))
|
fh.write(json.dumps(self.lock_data))
|
||||||
@@ -98,14 +84,7 @@ class TestCommitPayloads(unittest.TestCase):
|
|||||||
mcp_server._preflight_whoami_called = True
|
mcp_server._preflight_whoami_called = True
|
||||||
mcp_server._preflight_capability_called = True
|
mcp_server._preflight_capability_called = True
|
||||||
|
|
||||||
self._dup_fetcher_patcher = patch(
|
|
||||||
"mcp_server.issue_duplicate_context_fetcher",
|
|
||||||
return_value=([], [], {"status": "not_claimed"}),
|
|
||||||
)
|
|
||||||
self._dup_fetcher_patcher.start()
|
|
||||||
|
|
||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
self._dup_fetcher_patcher.stop()
|
|
||||||
self._remotes.stop()
|
self._remotes.stop()
|
||||||
mcp_server._IDENTITY_CACHE.clear()
|
mcp_server._IDENTITY_CACHE.clear()
|
||||||
|
|
||||||
|
|||||||
@@ -1,145 +0,0 @@
|
|||||||
import os
|
|
||||||
import sys
|
|
||||||
import unittest
|
|
||||||
from pathlib import Path
|
|
||||||
from unittest.mock import patch, MagicMock
|
|
||||||
|
|
||||||
# Ensure we import from the repo root
|
|
||||||
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
|
||||||
|
|
||||||
import gitea_mcp_server as srv
|
|
||||||
|
|
||||||
FAKE_AUTH = {"Authorization": "token test-token"}
|
|
||||||
# Stable control checkout (parent of branches/), not the MCP server worktree root.
|
|
||||||
CONTROL_CHECKOUT_ROOT = str(Path(__file__).resolve().parents[3])
|
|
||||||
PROJECT_ROOT = srv.PROJECT_ROOT
|
|
||||||
|
|
||||||
|
|
||||||
class TestCreateIssueWorkspaceGuard(unittest.TestCase):
|
|
||||||
|
|
||||||
def setUp(self):
|
|
||||||
# Reset preflight flags
|
|
||||||
srv._preflight_whoami_called = True
|
|
||||||
srv._preflight_capability_called = True
|
|
||||||
srv._preflight_resolved_role = "author"
|
|
||||||
srv._preflight_whoami_violation = False
|
|
||||||
srv._preflight_capability_violation = False
|
|
||||||
|
|
||||||
# Disable early return in verify_preflight_purity for testing
|
|
||||||
self._orig_in_test = srv._preflight_in_test_mode
|
|
||||||
srv._preflight_in_test_mode = lambda: False
|
|
||||||
|
|
||||||
def tearDown(self):
|
|
||||||
srv._preflight_in_test_mode = self._orig_in_test
|
|
||||||
|
|
||||||
@patch("gitea_mcp_server._auth", return_value=FAKE_AUTH)
|
|
||||||
@patch("gitea_mcp_server._profile_permission_block", return_value=None)
|
|
||||||
@patch("gitea_mcp_server._namespace_mutation_block", return_value=None)
|
|
||||||
@patch("gitea_mcp_server.role_session_router.check_author_mutation_after_reviewer_stop", return_value=(True, []))
|
|
||||||
@patch("gitea_mcp_server.api_request")
|
|
||||||
@patch("gitea_mcp_server.api_get_all", return_value=[])
|
|
||||||
@patch("gitea_mcp_server.issue_lock_worktree.read_worktree_git_state", return_value={"current_branch": "feat/issue-1"})
|
|
||||||
def test_create_issue_stable_checkout_rejected(self, _git, _get_all, mock_api, _role, _ns, _prof, _auth):
|
|
||||||
# Without worktree_path/env hints, workspace resolves to PROJECT_ROOT. When that
|
|
||||||
# path is the stable control checkout (not under branches/), mutation must fail.
|
|
||||||
with patch.object(srv, "PROJECT_ROOT", CONTROL_CHECKOUT_ROOT):
|
|
||||||
with self.assertRaises(RuntimeError) as ctx:
|
|
||||||
srv.gitea_create_issue(title="Test issue", body="body text")
|
|
||||||
self.assertIn("stable control checkout", str(ctx.exception))
|
|
||||||
|
|
||||||
@patch("gitea_mcp_server._auth", return_value=FAKE_AUTH)
|
|
||||||
@patch("gitea_mcp_server._profile_permission_block", return_value=None)
|
|
||||||
@patch("gitea_mcp_server._namespace_mutation_block", return_value=None)
|
|
||||||
@patch("gitea_mcp_server.role_session_router.check_author_mutation_after_reviewer_stop", return_value=(True, []))
|
|
||||||
@patch("gitea_mcp_server.api_request")
|
|
||||||
@patch("gitea_mcp_server.api_get_all", return_value=[])
|
|
||||||
@patch("gitea_mcp_server.issue_lock_worktree.read_worktree_git_state", return_value={"current_branch": "feat/issue-1"})
|
|
||||||
@patch("os.path.exists", return_value=True)
|
|
||||||
@patch("os.path.isdir", return_value=True)
|
|
||||||
@patch("subprocess.run")
|
|
||||||
def test_create_issue_valid_worktree_succeeds(self, mock_run, mock_isdir, mock_exists, _git, _get_all, mock_api, _role, _ns, _prof, _auth):
|
|
||||||
# Mock subprocess.run for git --git-common-dir to return PROJECT_ROOT/.git
|
|
||||||
mock_res = MagicMock()
|
|
||||||
mock_res.stdout = f"{CONTROL_CHECKOUT_ROOT}/.git\n"
|
|
||||||
mock_run.return_value = mock_res
|
|
||||||
|
|
||||||
mock_api.return_value = {"number": 42, "html_url": "https://gitea.example.com/issues/42"}
|
|
||||||
|
|
||||||
# Provide a valid branches path under the control checkout root
|
|
||||||
valid_path = os.path.join(CONTROL_CHECKOUT_ROOT, "branches", "feat-issue-1")
|
|
||||||
|
|
||||||
with patch.object(srv, "PROJECT_ROOT", CONTROL_CHECKOUT_ROOT):
|
|
||||||
with patch("gitea_mcp_server._get_workspace_porcelain", return_value=""):
|
|
||||||
res = srv.gitea_create_issue(
|
|
||||||
title="Test issue", body="body", worktree_path=valid_path
|
|
||||||
)
|
|
||||||
|
|
||||||
self.assertEqual(res["number"], 42)
|
|
||||||
mock_api.assert_called_once()
|
|
||||||
|
|
||||||
@patch("gitea_mcp_server._auth", return_value=FAKE_AUTH)
|
|
||||||
@patch("gitea_mcp_server._profile_permission_block", return_value=None)
|
|
||||||
@patch("gitea_mcp_server._namespace_mutation_block", return_value=None)
|
|
||||||
@patch("gitea_mcp_server.role_session_router.check_author_mutation_after_reviewer_stop", return_value=(True, []))
|
|
||||||
@patch("gitea_mcp_server.api_request")
|
|
||||||
@patch("gitea_mcp_server.api_get_all", return_value=[])
|
|
||||||
@patch("gitea_mcp_server.issue_lock_worktree.read_worktree_git_state", return_value={"current_branch": "feat/issue-1"})
|
|
||||||
def test_create_issue_missing_worktree_fails_closed(self, _git, _get_all, mock_api, _role, _ns, _prof, _auth):
|
|
||||||
# Path under branches/ but doesn't exist
|
|
||||||
missing_path = os.path.join(
|
|
||||||
CONTROL_CHECKOUT_ROOT, "branches", "nonexistent-worktree-path-999"
|
|
||||||
)
|
|
||||||
|
|
||||||
with patch.object(srv, "PROJECT_ROOT", CONTROL_CHECKOUT_ROOT):
|
|
||||||
with self.assertRaises(RuntimeError) as ctx:
|
|
||||||
srv.gitea_create_issue(
|
|
||||||
title="Test issue", body="body", worktree_path=missing_path
|
|
||||||
)
|
|
||||||
self.assertIn("does not exist (fail closed)", str(ctx.exception))
|
|
||||||
|
|
||||||
@patch("gitea_mcp_server._auth", return_value=FAKE_AUTH)
|
|
||||||
@patch("gitea_mcp_server._profile_permission_block", return_value=None)
|
|
||||||
@patch("gitea_mcp_server._namespace_mutation_block", return_value=None)
|
|
||||||
@patch("gitea_mcp_server.role_session_router.check_author_mutation_after_reviewer_stop", return_value=(True, []))
|
|
||||||
@patch("gitea_mcp_server.api_request")
|
|
||||||
@patch("gitea_mcp_server.api_get_all", return_value=[])
|
|
||||||
@patch("gitea_mcp_server.issue_lock_worktree.read_worktree_git_state", return_value={"current_branch": "feat/issue-1"})
|
|
||||||
@patch("os.path.exists", return_value=True)
|
|
||||||
@patch("os.path.isdir", return_value=True)
|
|
||||||
@patch("subprocess.run")
|
|
||||||
def test_create_issue_wrong_repo_fails_closed(self, mock_run, mock_isdir, mock_exists, _git, _get_all, mock_api, _role, _ns, _prof, _auth):
|
|
||||||
# Mock subprocess.run for git --git-common-dir to return a different path
|
|
||||||
mock_res = MagicMock()
|
|
||||||
mock_res.stdout = "/Users/jasonwalker/Development/some-other-repo/.git\n"
|
|
||||||
mock_run.return_value = mock_res
|
|
||||||
|
|
||||||
wrong_repo_path = os.path.join(CONTROL_CHECKOUT_ROOT, "branches", "feat-issue-1")
|
|
||||||
|
|
||||||
with patch.object(srv, "PROJECT_ROOT", CONTROL_CHECKOUT_ROOT):
|
|
||||||
with self.assertRaises(RuntimeError) as ctx:
|
|
||||||
srv.gitea_create_issue(
|
|
||||||
title="Test issue", body="body", worktree_path=wrong_repo_path
|
|
||||||
)
|
|
||||||
self.assertIn("does not belong to the target repository", str(ctx.exception))
|
|
||||||
|
|
||||||
@patch("gitea_mcp_server._auth", return_value=FAKE_AUTH)
|
|
||||||
@patch("gitea_mcp_server._profile_permission_block", return_value=None)
|
|
||||||
@patch("gitea_mcp_server._namespace_mutation_block", return_value=None)
|
|
||||||
def test_create_issue_fails_without_whoami_preflight(self, _ns, _prof, _auth):
|
|
||||||
srv._preflight_whoami_called = False
|
|
||||||
with self.assertRaises(RuntimeError) as ctx:
|
|
||||||
srv.gitea_create_issue(title="Test issue", body="body")
|
|
||||||
self.assertIn("Identity (gitea_whoami) has not been verified", str(ctx.exception))
|
|
||||||
|
|
||||||
@patch("gitea_mcp_server._auth", return_value=FAKE_AUTH)
|
|
||||||
@patch("gitea_mcp_server._profile_permission_block", return_value=None)
|
|
||||||
@patch("gitea_mcp_server._namespace_mutation_block", return_value=None)
|
|
||||||
def test_create_issue_fails_without_capability_preflight(self, _ns, _prof, _auth):
|
|
||||||
srv._preflight_capability_called = False
|
|
||||||
with self.assertRaises(RuntimeError) as ctx:
|
|
||||||
srv.gitea_create_issue(title="Test issue", body="body")
|
|
||||||
self.assertIn("Task capability (gitea_resolve_task_capability) has not been resolved", str(ctx.exception))
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
unittest.main()
|
|
||||||
@@ -1,124 +0,0 @@
|
|||||||
"""Unit tests for own-branch lock adoption decision (#442)."""
|
|
||||||
import sys
|
|
||||||
import unittest
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
|
||||||
|
|
||||||
from issue_lock_adoption import ( # noqa: E402
|
|
||||||
ADOPT,
|
|
||||||
BLOCK_COMPETING,
|
|
||||||
NO_MATCH,
|
|
||||||
assess_own_branch_adoption,
|
|
||||||
build_adoption_proof,
|
|
||||||
)
|
|
||||||
|
|
||||||
REQ = "feat/issue-420-server-code-parity"
|
|
||||||
|
|
||||||
|
|
||||||
class TestAssessOwnBranchAdoption(unittest.TestCase):
|
|
||||||
def test_exact_own_branch_is_adopted(self):
|
|
||||||
result = assess_own_branch_adoption(
|
|
||||||
issue_number=420,
|
|
||||||
requested_branch=REQ,
|
|
||||||
existing_branches=[{"name": REQ, "commit_sha": "934688a"}],
|
|
||||||
)
|
|
||||||
self.assertEqual(result["outcome"], ADOPT)
|
|
||||||
self.assertTrue(result["adopt"])
|
|
||||||
self.assertFalse(result["block"])
|
|
||||||
self.assertEqual(result["matched_branch"], REQ)
|
|
||||||
self.assertEqual(result["matched_head_sha"], "934688a")
|
|
||||||
|
|
||||||
def test_exact_own_branch_adopted_when_sha_missing(self):
|
|
||||||
result = assess_own_branch_adoption(
|
|
||||||
issue_number=420, requested_branch=REQ, existing_branches=[REQ]
|
|
||||||
)
|
|
||||||
self.assertEqual(result["outcome"], ADOPT)
|
|
||||||
self.assertIsNone(result["matched_head_sha"])
|
|
||||||
|
|
||||||
def test_different_branch_same_issue_blocks(self):
|
|
||||||
result = assess_own_branch_adoption(
|
|
||||||
issue_number=420,
|
|
||||||
requested_branch=REQ,
|
|
||||||
existing_branches=[{"name": "feat/issue-420-other-work"}],
|
|
||||||
)
|
|
||||||
self.assertEqual(result["outcome"], BLOCK_COMPETING)
|
|
||||||
self.assertTrue(result["block"])
|
|
||||||
self.assertFalse(result["adopt"])
|
|
||||||
self.assertIn("feat/issue-420-other-work", result["competing_branches"])
|
|
||||||
self.assertIn("fail closed", result["reason"])
|
|
||||||
|
|
||||||
def test_own_branch_plus_competing_branch_blocks(self):
|
|
||||||
# Ambiguous ownership: fail closed even though the exact branch exists.
|
|
||||||
result = assess_own_branch_adoption(
|
|
||||||
issue_number=420,
|
|
||||||
requested_branch=REQ,
|
|
||||||
existing_branches=[{"name": REQ}, {"name": "feat/issue-420-rogue"}],
|
|
||||||
)
|
|
||||||
self.assertEqual(result["outcome"], BLOCK_COMPETING)
|
|
||||||
self.assertTrue(result["block"])
|
|
||||||
self.assertEqual(result["competing_branches"], ["feat/issue-420-rogue"])
|
|
||||||
|
|
||||||
def test_no_matching_branch_is_normal_path(self):
|
|
||||||
result = assess_own_branch_adoption(
|
|
||||||
issue_number=420,
|
|
||||||
requested_branch=REQ,
|
|
||||||
existing_branches=[{"name": "feat/issue-999-unrelated"}],
|
|
||||||
)
|
|
||||||
self.assertEqual(result["outcome"], NO_MATCH)
|
|
||||||
self.assertFalse(result["block"])
|
|
||||||
self.assertFalse(result["adopt"])
|
|
||||||
|
|
||||||
def test_empty_branch_list_is_normal_path(self):
|
|
||||||
result = assess_own_branch_adoption(
|
|
||||||
issue_number=420, requested_branch=REQ, existing_branches=[]
|
|
||||||
)
|
|
||||||
self.assertEqual(result["outcome"], NO_MATCH)
|
|
||||||
|
|
||||||
def test_substring_issue_number_not_falsely_matched_as_exact(self):
|
|
||||||
# A different issue's branch must not be adopted as ours.
|
|
||||||
result = assess_own_branch_adoption(
|
|
||||||
issue_number=42,
|
|
||||||
requested_branch="feat/issue-42-thing",
|
|
||||||
existing_branches=[{"name": "feat/issue-420-server-code-parity"}],
|
|
||||||
)
|
|
||||||
# 'issue-42' is a substring of 'issue-420', so marker matches but the
|
|
||||||
# name differs -> competing block, never adoption of the wrong branch.
|
|
||||||
self.assertEqual(result["outcome"], BLOCK_COMPETING)
|
|
||||||
self.assertNotEqual(result["matched_branch"], "feat/issue-420-server-code-parity")
|
|
||||||
|
|
||||||
|
|
||||||
class TestBuildAdoptionProof(unittest.TestCase):
|
|
||||||
def test_proof_has_all_required_fields(self):
|
|
||||||
assessment = assess_own_branch_adoption(
|
|
||||||
issue_number=420,
|
|
||||||
requested_branch=REQ,
|
|
||||||
existing_branches=[{"name": REQ, "commit_sha": "934688a"}],
|
|
||||||
)
|
|
||||||
proof = build_adoption_proof(
|
|
||||||
issue_number=420,
|
|
||||||
branch_name=REQ,
|
|
||||||
assessment=assessment,
|
|
||||||
open_pr_checked=True,
|
|
||||||
competing_lock_checked=True,
|
|
||||||
lock_file_path="/tmp/gitea_issue_lock.json",
|
|
||||||
lock_file_status="written",
|
|
||||||
)
|
|
||||||
for key in (
|
|
||||||
"issue_number",
|
|
||||||
"branch_name",
|
|
||||||
"branch_head_commit",
|
|
||||||
"adoption_reason",
|
|
||||||
"no_existing_pr_proof",
|
|
||||||
"no_competing_live_lock_proof",
|
|
||||||
"lock_file_path",
|
|
||||||
"lock_file_status",
|
|
||||||
):
|
|
||||||
self.assertIn(key, proof)
|
|
||||||
self.assertEqual(proof["branch_head_commit"], "934688a")
|
|
||||||
self.assertTrue(proof["no_existing_pr_proof"])
|
|
||||||
self.assertTrue(proof["no_competing_live_lock_proof"])
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
unittest.main()
|
|
||||||
@@ -1,130 +0,0 @@
|
|||||||
"""Tests for issue-lock provenance and external-state disclosure (#447)."""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import sys
|
|
||||||
import unittest
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
|
||||||
|
|
||||||
import issue_lock_provenance as ilp # noqa: E402
|
|
||||||
from final_report_validator import assess_final_report_validator # noqa: E402
|
|
||||||
|
|
||||||
|
|
||||||
def _sanctioned_lock(**overrides):
|
|
||||||
work_lease = {
|
|
||||||
"operation_type": "author_issue_work",
|
|
||||||
"issue_number": 447,
|
|
||||||
"branch": "feat/issue-447-lock-provenance",
|
|
||||||
"claimant": {"username": "jcwalker3", "profile": "prgs-author"},
|
|
||||||
"expires_at": "2999-01-01T00:00:00Z",
|
|
||||||
}
|
|
||||||
data = {
|
|
||||||
"issue_number": 447,
|
|
||||||
"branch_name": "feat/issue-447-lock-provenance",
|
|
||||||
"work_lease": work_lease,
|
|
||||||
"lock_provenance": ilp.build_sanctioned_lock_provenance(
|
|
||||||
tool="gitea_lock_issue",
|
|
||||||
claimant=work_lease["claimant"],
|
|
||||||
),
|
|
||||||
}
|
|
||||||
data.update(overrides)
|
|
||||||
return data
|
|
||||||
|
|
||||||
|
|
||||||
class TestLockProvenanceForCreatePr(unittest.TestCase):
|
|
||||||
def test_sanctioned_lock_passes(self):
|
|
||||||
result = ilp.assess_lock_file_for_create_pr(_sanctioned_lock())
|
|
||||||
self.assertTrue(result["proven"])
|
|
||||||
self.assertFalse(result["block"])
|
|
||||||
|
|
||||||
def test_manual_seed_without_provenance_blocked(self):
|
|
||||||
result = ilp.assess_lock_file_for_create_pr(
|
|
||||||
{"issue_number": 420, "branch_name": "feat/x", "work_lease": {}}
|
|
||||||
)
|
|
||||||
self.assertTrue(result["block"])
|
|
||||||
self.assertIn("lock_provenance", result["reasons"][0])
|
|
||||||
|
|
||||||
def test_operator_override_requires_reason(self):
|
|
||||||
result = ilp.assess_lock_file_for_create_pr(
|
|
||||||
_sanctioned_lock(
|
|
||||||
lock_provenance=ilp.build_sanctioned_lock_provenance(
|
|
||||||
tool="operator_override",
|
|
||||||
source=ilp.SOURCE_OPERATOR_OVERRIDE,
|
|
||||||
)
|
|
||||||
)
|
|
||||||
)
|
|
||||||
self.assertTrue(result["block"])
|
|
||||||
|
|
||||||
|
|
||||||
class TestExternalStateReportRules(unittest.TestCase):
|
|
||||||
def test_seed_with_external_none_blocked(self):
|
|
||||||
report = (
|
|
||||||
"Restored /tmp/gitea_issue_lock.json to unblock PR creation.\n"
|
|
||||||
"- External-state mutations: none\n"
|
|
||||||
)
|
|
||||||
result = ilp.assess_issue_lock_external_state_report(report)
|
|
||||||
self.assertTrue(result["block"])
|
|
||||||
|
|
||||||
def test_seed_with_disclosure_passes(self):
|
|
||||||
report = (
|
|
||||||
"Restored /tmp/gitea_issue_lock.json after MCP restart.\n"
|
|
||||||
"- External-state mutations: wrote /tmp/gitea_issue_lock.json\n"
|
|
||||||
)
|
|
||||||
result = ilp.assess_issue_lock_external_state_report(report)
|
|
||||||
self.assertTrue(result["proven"])
|
|
||||||
|
|
||||||
def test_remove_claimed_as_cleanup_only_blocked(self):
|
|
||||||
report = (
|
|
||||||
"rm /tmp/gitea_issue_lock.json after PR creation.\n"
|
|
||||||
"- Cleanup mutations: lock removed\n"
|
|
||||||
"- External-state mutations: none\n"
|
|
||||||
)
|
|
||||||
result = ilp.assess_issue_lock_external_state_report(report)
|
|
||||||
self.assertTrue(result["block"])
|
|
||||||
|
|
||||||
def test_manual_lock_pr_without_override_blocked(self):
|
|
||||||
report = (
|
|
||||||
"Programmatically seeded gitea_issue_lock.json then gitea_create_pr.\n"
|
|
||||||
"PR #444 created.\n"
|
|
||||||
)
|
|
||||||
result = ilp.assess_manual_lock_pr_without_override(report)
|
|
||||||
self.assertTrue(result["block"])
|
|
||||||
|
|
||||||
def test_author_reviewer_same_run_blocked(self):
|
|
||||||
report = (
|
|
||||||
"gitea_create_pr opened PR #444.\n"
|
|
||||||
"Submitted approve review on PR #444.\n"
|
|
||||||
)
|
|
||||||
result = ilp.assess_author_reviewer_same_run_report(report)
|
|
||||||
self.assertTrue(result["block"])
|
|
||||||
|
|
||||||
|
|
||||||
class TestFinalReportValidatorIntegration(unittest.TestCase):
|
|
||||||
def test_work_issue_blocks_hidden_lock_mutation(self):
|
|
||||||
report = (
|
|
||||||
"## Controller Handoff\n"
|
|
||||||
"- Task: work issue #420\n"
|
|
||||||
"- External-state mutations: none\n"
|
|
||||||
"Restored /tmp/gitea_issue_lock.json before PR creation.\n"
|
|
||||||
)
|
|
||||||
result = assess_final_report_validator(report, "work_issue")
|
|
||||||
rule_ids = {f["rule_id"] for f in result["findings"]}
|
|
||||||
self.assertIn("shared.issue_lock_external_state", rule_ids)
|
|
||||||
self.assertTrue(result["blocked"])
|
|
||||||
|
|
||||||
def test_review_pr_blocks_create_and_approve(self):
|
|
||||||
report = (
|
|
||||||
"## Controller Handoff\n"
|
|
||||||
"- Task: review PR #444\n"
|
|
||||||
"- Review decision: approve\n"
|
|
||||||
"Created PR #444 via gitea_create_pr earlier in this run.\n"
|
|
||||||
)
|
|
||||||
result = assess_final_report_validator(report, "review_pr")
|
|
||||||
rule_ids = {f["rule_id"] for f in result["findings"]}
|
|
||||||
self.assertIn("shared.author_reviewer_same_run", rule_ids)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
unittest.main()
|
|
||||||
@@ -1,251 +0,0 @@
|
|||||||
"""Tests for early duplicate-work detection (#400)."""
|
|
||||||
import json
|
|
||||||
import os
|
|
||||||
import sys
|
|
||||||
import tempfile
|
|
||||||
import unittest
|
|
||||||
from pathlib import Path
|
|
||||||
from unittest.mock import patch
|
|
||||||
|
|
||||||
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
|
||||||
|
|
||||||
import issue_work_duplicate_gate as dup_gate
|
|
||||||
import mcp_server
|
|
||||||
from issue_work_duplicate_gate import (
|
|
||||||
OUTCOME_DUPLICATE_BRANCH_PREVENTED,
|
|
||||||
OUTCOME_DUPLICATE_COMMIT_PREVENTED,
|
|
||||||
OUTCOME_DUPLICATE_PR_PREVENTED,
|
|
||||||
OUTCOME_DUPLICATE_WORK_NOT_PREVENTED,
|
|
||||||
PHASE_COMMIT,
|
|
||||||
PHASE_CREATE_PR,
|
|
||||||
PHASE_LOCK,
|
|
||||||
assess_work_issue_duplicate_gate,
|
|
||||||
assess_work_issue_duplicate_report,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class TestDuplicateGateAssessment(unittest.TestCase):
|
|
||||||
def test_clear_issue_passes(self):
|
|
||||||
result = assess_work_issue_duplicate_gate(
|
|
||||||
400,
|
|
||||||
open_prs=[],
|
|
||||||
branch_names=["feat/other-issue-99"],
|
|
||||||
claim_entry={"status": "not_claimed"},
|
|
||||||
locked_branch="feat/issue-400-duplicate-work-preflight",
|
|
||||||
phase=PHASE_LOCK,
|
|
||||||
)
|
|
||||||
self.assertFalse(result["block"])
|
|
||||||
self.assertEqual(result["outcome"], OUTCOME_DUPLICATE_WORK_NOT_PREVENTED)
|
|
||||||
|
|
||||||
def test_open_pr_blocks(self):
|
|
||||||
prs = [{
|
|
||||||
"number": 397,
|
|
||||||
"title": "feat: handoff",
|
|
||||||
"body": "Closes #395",
|
|
||||||
"head": {"ref": "feat/issue-395-proof-backed-review-handoff"},
|
|
||||||
}]
|
|
||||||
result = assess_work_issue_duplicate_gate(
|
|
||||||
395,
|
|
||||||
open_prs=prs,
|
|
||||||
branch_names=[],
|
|
||||||
phase=PHASE_LOCK,
|
|
||||||
)
|
|
||||||
self.assertTrue(result["block"])
|
|
||||||
self.assertEqual(result["outcome"], OUTCOME_DUPLICATE_PR_PREVENTED)
|
|
||||||
|
|
||||||
def test_conflicting_remote_branch_blocks(self):
|
|
||||||
result = assess_work_issue_duplicate_gate(
|
|
||||||
395,
|
|
||||||
open_prs=[],
|
|
||||||
branch_names=["feat/issue-395-proof-backed-handoff-claims"],
|
|
||||||
locked_branch="feat/issue-395-new-attempt",
|
|
||||||
phase=PHASE_LOCK,
|
|
||||||
)
|
|
||||||
self.assertTrue(result["block"])
|
|
||||||
self.assertEqual(result["outcome"], OUTCOME_DUPLICATE_BRANCH_PREVENTED)
|
|
||||||
|
|
||||||
def test_active_claim_on_other_branch_blocks(self):
|
|
||||||
result = assess_work_issue_duplicate_gate(
|
|
||||||
398,
|
|
||||||
open_prs=[],
|
|
||||||
branch_names=[],
|
|
||||||
claim_entry={
|
|
||||||
"status": "active",
|
|
||||||
"latest_heartbeat": {
|
|
||||||
"branch": "feat/issue-398-validation-cwd-proof",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
locked_branch="feat/issue-398-other-branch",
|
|
||||||
phase=PHASE_LOCK,
|
|
||||||
)
|
|
||||||
self.assertTrue(result["block"])
|
|
||||||
|
|
||||||
def test_commit_phase_maps_to_commit_outcome(self):
|
|
||||||
prs = [{
|
|
||||||
"number": 411,
|
|
||||||
"title": "x",
|
|
||||||
"body": "Closes #398",
|
|
||||||
"head": {"ref": "feat/issue-398-validation-cwd-proof"},
|
|
||||||
}]
|
|
||||||
result = assess_work_issue_duplicate_gate(
|
|
||||||
398,
|
|
||||||
open_prs=prs,
|
|
||||||
branch_names=[],
|
|
||||||
locked_branch="feat/issue-398-alt",
|
|
||||||
phase=PHASE_COMMIT,
|
|
||||||
)
|
|
||||||
self.assertTrue(result["block"])
|
|
||||||
self.assertEqual(result["outcome"], OUTCOME_DUPLICATE_COMMIT_PREVENTED)
|
|
||||||
|
|
||||||
def test_stale_claim_does_not_block_by_status_alone(self):
|
|
||||||
result = assess_work_issue_duplicate_gate(
|
|
||||||
400,
|
|
||||||
open_prs=[],
|
|
||||||
branch_names=[],
|
|
||||||
claim_entry={"status": "reclaimable", "reasons": ["stale"]},
|
|
||||||
locked_branch="feat/issue-400-duplicate-work-preflight",
|
|
||||||
phase=PHASE_LOCK,
|
|
||||||
)
|
|
||||||
self.assertFalse(result["block"])
|
|
||||||
|
|
||||||
|
|
||||||
class TestDuplicateReportOutcome(unittest.TestCase):
|
|
||||||
def test_requires_exactly_one_outcome(self):
|
|
||||||
bad = assess_work_issue_duplicate_report("work finished")
|
|
||||||
self.assertFalse(bad["complete"])
|
|
||||||
|
|
||||||
good = assess_work_issue_duplicate_report(
|
|
||||||
"Duplicate work not prevented for issue #400."
|
|
||||||
)
|
|
||||||
self.assertTrue(good["complete"])
|
|
||||||
self.assertEqual(good["outcome"], OUTCOME_DUPLICATE_WORK_NOT_PREVENTED)
|
|
||||||
|
|
||||||
|
|
||||||
class TestInjectableDuplicateFetcher(unittest.TestCase):
|
|
||||||
@patch("mcp_server.get_auth_header", return_value="token x")
|
|
||||||
def test_lock_issue_uses_injected_fetcher(self, _auth):
|
|
||||||
seen = {}
|
|
||||||
|
|
||||||
def fetcher(h, o, r, auth, issue_number):
|
|
||||||
seen["issue_number"] = issue_number
|
|
||||||
return [], [], {"status": "not_claimed"}
|
|
||||||
|
|
||||||
with patch(
|
|
||||||
"mcp_server.issue_duplicate_context_fetcher",
|
|
||||||
side_effect=fetcher,
|
|
||||||
), patch(
|
|
||||||
"mcp_server.issue_lock_worktree.read_worktree_git_state",
|
|
||||||
return_value={
|
|
||||||
"current_branch": "master",
|
|
||||||
"porcelain_status": "",
|
|
||||||
"base_equivalent": True,
|
|
||||||
},
|
|
||||||
), patch.dict(os.environ, {
|
|
||||||
"GITEA_ALLOWED_OPERATIONS": "gitea.issue.comment",
|
|
||||||
}, clear=True):
|
|
||||||
with patch.object(mcp_server, "ISSUE_LOCK_FILE", tempfile.mktemp()):
|
|
||||||
mcp_server.gitea_lock_issue(
|
|
||||||
issue_number=400,
|
|
||||||
branch_name="feat/issue-400-duplicate-work-preflight",
|
|
||||||
remote="prgs",
|
|
||||||
)
|
|
||||||
self.assertEqual(seen["issue_number"], 400)
|
|
||||||
|
|
||||||
|
|
||||||
class TestMcpDuplicateRecheck(unittest.TestCase):
|
|
||||||
def setUp(self):
|
|
||||||
self._dir = tempfile.TemporaryDirectory()
|
|
||||||
self.lock_path = os.path.join(self._dir.name, "gitea_issue_lock.json")
|
|
||||||
self._lock_patch = patch.object(
|
|
||||||
mcp_server, "ISSUE_LOCK_FILE", self.lock_path
|
|
||||||
)
|
|
||||||
self._lock_patch.start()
|
|
||||||
self._remotes = patch.dict(mcp_server.REMOTES, {
|
|
||||||
"prgs": {"host": "gitea.example.com", "org": "Example-Org",
|
|
||||||
"repo": "Example-Repo"},
|
|
||||||
})
|
|
||||||
self._remotes.start()
|
|
||||||
mcp_server._IDENTITY_CACHE.clear()
|
|
||||||
|
|
||||||
def tearDown(self):
|
|
||||||
patch.stopall()
|
|
||||||
self._dir.cleanup()
|
|
||||||
|
|
||||||
def _write_lock(self, issue_number=400, branch="feat/issue-400-x"):
|
|
||||||
with open(self.lock_path, "w", encoding="utf-8") as fh:
|
|
||||||
json.dump({
|
|
||||||
"issue_number": issue_number,
|
|
||||||
"branch_name": branch,
|
|
||||||
"remote": "prgs",
|
|
||||||
}, fh)
|
|
||||||
|
|
||||||
@patch("mcp_server._assess_issue_duplicate_gate")
|
|
||||||
@patch("mcp_server.get_profile", return_value={
|
|
||||||
"profile_name": "test-author",
|
|
||||||
"allowed_operations": ["gitea.read", "gitea.repo.commit"],
|
|
||||||
"forbidden_operations": [],
|
|
||||||
"audit_label": "test-author",
|
|
||||||
})
|
|
||||||
@patch("mcp_server.get_auth_header", return_value="token x")
|
|
||||||
def test_commit_files_blocked_on_recheck(self, _auth, _profile, mock_gate):
|
|
||||||
self._write_lock()
|
|
||||||
mock_gate.return_value = {
|
|
||||||
"block": True,
|
|
||||||
"reasons": ["open PR #412 already covers issue #400"],
|
|
||||||
"outcome": OUTCOME_DUPLICATE_COMMIT_PREVENTED,
|
|
||||||
"safe_next_action": "stop",
|
|
||||||
}
|
|
||||||
mcp_server.record_preflight_check("whoami")
|
|
||||||
mcp_server.record_preflight_check("capability", resolved_role="author")
|
|
||||||
with patch(
|
|
||||||
"mcp_server.role_session_router.check_author_mutation_after_reviewer_stop",
|
|
||||||
return_value=(True, []),
|
|
||||||
):
|
|
||||||
result = mcp_server.gitea_commit_files(
|
|
||||||
files=[{
|
|
||||||
"operation": "create",
|
|
||||||
"path": "a.txt",
|
|
||||||
"content_plain": "hi",
|
|
||||||
}],
|
|
||||||
message="test",
|
|
||||||
remote="prgs",
|
|
||||||
)
|
|
||||||
self.assertFalse(result["success"])
|
|
||||||
self.assertIn("duplicate_gate", result)
|
|
||||||
|
|
||||||
@patch("mcp_server._assess_issue_duplicate_gate")
|
|
||||||
@patch("mcp_server.get_profile", return_value={
|
|
||||||
"profile_name": "test-author",
|
|
||||||
"allowed_operations": ["gitea.read", "gitea.pr.create"],
|
|
||||||
"forbidden_operations": [],
|
|
||||||
"audit_label": "test-author",
|
|
||||||
})
|
|
||||||
@patch("mcp_server.get_auth_header", return_value="token x")
|
|
||||||
def test_create_pr_returns_handoff_on_duplicate(self, _auth, _profile, mock_gate):
|
|
||||||
self._write_lock()
|
|
||||||
mock_gate.return_value = {
|
|
||||||
"block": True,
|
|
||||||
"reasons": ["open PR #412 already covers issue #400"],
|
|
||||||
"outcome": OUTCOME_DUPLICATE_PR_PREVENTED,
|
|
||||||
"safe_next_action": "reconciliation handoff",
|
|
||||||
}
|
|
||||||
mcp_server.record_preflight_check("whoami")
|
|
||||||
mcp_server.record_preflight_check("capability", resolved_role="author")
|
|
||||||
with patch(
|
|
||||||
"mcp_server.role_session_router.check_author_mutation_after_reviewer_stop",
|
|
||||||
return_value=(True, []),
|
|
||||||
):
|
|
||||||
result = mcp_server.gitea_create_pr(
|
|
||||||
title="feat: x (Closes #400)",
|
|
||||||
head="feat/issue-400-x",
|
|
||||||
base="master",
|
|
||||||
body="Closes #400",
|
|
||||||
remote="prgs",
|
|
||||||
)
|
|
||||||
self.assertFalse(result["success"])
|
|
||||||
self.assertIsNone(result.get("number"))
|
|
||||||
self.assertIn("duplicate_gate", result)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
unittest.main()
|
|
||||||
@@ -95,6 +95,12 @@ def test_create_issue_workflow_contract():
|
|||||||
assert "## 9. Duplicate search before mutation" in text
|
assert "## 9. Duplicate search before mutation" in text
|
||||||
|
|
||||||
|
|
||||||
|
def test_author_duplicate_work_gate_exported():
|
||||||
|
from review_proofs import assess_work_issue_duplicate_prevention_report
|
||||||
|
|
||||||
|
assert callable(assess_work_issue_duplicate_prevention_report)
|
||||||
|
|
||||||
|
|
||||||
def test_work_issue_workflow_contract():
|
def test_work_issue_workflow_contract():
|
||||||
text = (SKILL_DIR / "workflows" / "work-issue.md").read_text(encoding="utf-8")
|
text = (SKILL_DIR / "workflows" / "work-issue.md").read_text(encoding="utf-8")
|
||||||
assert "canonical: true" in text
|
assert "canonical: true" in text
|
||||||
|
|||||||
+25
-180
@@ -101,36 +101,17 @@ ISSUE_LOCK_FILE = "/tmp/gitea_issue_lock.json"
|
|||||||
|
|
||||||
|
|
||||||
def _sample_issue_lock(issue_number=123, branch_name="feat/x", **overrides):
|
def _sample_issue_lock(issue_number=123, branch_name="feat/x", **overrides):
|
||||||
import issue_lock_provenance
|
|
||||||
|
|
||||||
work_lease = {
|
|
||||||
"operation_type": "author_issue_work",
|
|
||||||
"issue_number": issue_number,
|
|
||||||
"branch": branch_name,
|
|
||||||
"claimant": {"username": "test-user", "profile": "test-author"},
|
|
||||||
"expires_at": "2999-01-01T00:00:00Z",
|
|
||||||
}
|
|
||||||
record = {
|
record = {
|
||||||
"issue_number": issue_number,
|
"issue_number": issue_number,
|
||||||
"branch_name": branch_name,
|
"branch_name": branch_name,
|
||||||
"remote": "dadeschools",
|
"remote": "dadeschools",
|
||||||
"org": "Scaled-Tech-Consulting",
|
"org": "Scaled-Tech-Consulting",
|
||||||
"repo": "Gitea-Tools",
|
"repo": "Gitea-Tools",
|
||||||
"work_lease": work_lease,
|
|
||||||
"lock_provenance": issue_lock_provenance.build_sanctioned_lock_provenance(
|
|
||||||
tool="gitea_lock_issue",
|
|
||||||
claimant=work_lease.get("claimant"),
|
|
||||||
),
|
|
||||||
}
|
}
|
||||||
record.update(overrides)
|
record.update(overrides)
|
||||||
return record
|
return record
|
||||||
|
|
||||||
|
|
||||||
def _clear_duplicate_context_fetcher(*_args, **_kwargs):
|
|
||||||
"""Default injectable duplicate-work context for lock/create_pr tests."""
|
|
||||||
return [], [], {"status": "not_claimed"}
|
|
||||||
|
|
||||||
|
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
# Create Issue
|
# Create Issue
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
@@ -185,17 +166,13 @@ class TestCreateIssue(unittest.TestCase):
|
|||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
class TestCreatePR(unittest.TestCase):
|
class TestCreatePR(unittest.TestCase):
|
||||||
|
|
||||||
@patch(
|
|
||||||
"mcp_server.issue_duplicate_context_fetcher",
|
|
||||||
return_value=([], [], {"status": "not_claimed"}),
|
|
||||||
)
|
|
||||||
@patch("mcp_server.role_session_router.check_author_mutation_after_reviewer_stop",
|
@patch("mcp_server.role_session_router.check_author_mutation_after_reviewer_stop",
|
||||||
return_value=(True, []))
|
return_value=(True, []))
|
||||||
@patch("mcp_server.api_request")
|
@patch("mcp_server.api_request")
|
||||||
@patch("mcp_server.get_auth_header", return_value=FAKE_AUTH)
|
@patch("mcp_server.get_auth_header", return_value=FAKE_AUTH)
|
||||||
@patch("os.path.exists", return_value=True)
|
@patch("os.path.exists", return_value=True)
|
||||||
@patch("builtins.open")
|
@patch("builtins.open")
|
||||||
def test_creates_pr(self, mock_open, mock_exists, _auth, mock_api, _role, _dup_fetcher):
|
def test_creates_pr(self, mock_open, mock_exists, _auth, mock_api, _role):
|
||||||
lock_json = json.dumps(_sample_issue_lock(issue_number=123, branch_name="feat/x"))
|
lock_json = json.dumps(_sample_issue_lock(issue_number=123, branch_name="feat/x"))
|
||||||
mock_open.return_value.__enter__.return_value.read.return_value = lock_json
|
mock_open.return_value.__enter__.return_value.read.return_value = lock_json
|
||||||
mock_api.return_value = {"number": 3, "html_url": "https://example.com/pulls/3"}
|
mock_api.return_value = {"number": 3, "html_url": "https://example.com/pulls/3"}
|
||||||
@@ -210,17 +187,13 @@ class TestCreatePR(unittest.TestCase):
|
|||||||
self.assertEqual(payload["base"], "main")
|
self.assertEqual(payload["base"], "main")
|
||||||
self.assertIn("Closes #123", payload["title"])
|
self.assertIn("Closes #123", payload["title"])
|
||||||
|
|
||||||
@patch(
|
|
||||||
"mcp_server.issue_duplicate_context_fetcher",
|
|
||||||
return_value=([], [], {"status": "not_claimed"}),
|
|
||||||
)
|
|
||||||
@patch("mcp_server.role_session_router.check_author_mutation_after_reviewer_stop",
|
@patch("mcp_server.role_session_router.check_author_mutation_after_reviewer_stop",
|
||||||
return_value=(True, []))
|
return_value=(True, []))
|
||||||
@patch("mcp_server.api_request")
|
@patch("mcp_server.api_request")
|
||||||
@patch("mcp_server.get_auth_header", return_value=FAKE_AUTH)
|
@patch("mcp_server.get_auth_header", return_value=FAKE_AUTH)
|
||||||
@patch("os.path.exists", return_value=True)
|
@patch("os.path.exists", return_value=True)
|
||||||
@patch("builtins.open")
|
@patch("builtins.open")
|
||||||
def test_create_pr_reveal_opt_in_includes_url(self, mock_open, mock_exists, _auth, mock_api, _role, _dup_fetcher):
|
def test_create_pr_reveal_opt_in_includes_url(self, mock_open, mock_exists, _auth, mock_api, _role):
|
||||||
lock_json = json.dumps(_sample_issue_lock(issue_number=123, branch_name="feat/x"))
|
lock_json = json.dumps(_sample_issue_lock(issue_number=123, branch_name="feat/x"))
|
||||||
mock_open.return_value.__enter__.return_value.read.return_value = lock_json
|
mock_open.return_value.__enter__.return_value.read.return_value = lock_json
|
||||||
mock_api.return_value = {"number": 3, "html_url": "https://example.com/pulls/3"}
|
mock_api.return_value = {"number": 3, "html_url": "https://example.com/pulls/3"}
|
||||||
@@ -3071,14 +3044,8 @@ class TestIssueLocking(unittest.TestCase):
|
|||||||
def setUp(self):
|
def setUp(self):
|
||||||
self._env_patcher = patch.dict(os.environ, ISSUE_WRITE_ENV, clear=True)
|
self._env_patcher = patch.dict(os.environ, ISSUE_WRITE_ENV, clear=True)
|
||||||
self._env_patcher.start()
|
self._env_patcher.start()
|
||||||
self._dup_fetcher_patcher = patch(
|
|
||||||
"mcp_server.issue_duplicate_context_fetcher",
|
|
||||||
return_value=([], [], {"status": "not_claimed"}),
|
|
||||||
)
|
|
||||||
self.mock_dup_fetcher = self._dup_fetcher_patcher.start()
|
|
||||||
|
|
||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
self._dup_fetcher_patcher.stop()
|
|
||||||
self._env_patcher.stop()
|
self._env_patcher.stop()
|
||||||
if os.path.exists(ISSUE_LOCK_FILE):
|
if os.path.exists(ISSUE_LOCK_FILE):
|
||||||
os.remove(ISSUE_LOCK_FILE)
|
os.remove(ISSUE_LOCK_FILE)
|
||||||
@@ -3087,9 +3054,10 @@ class TestIssueLocking(unittest.TestCase):
|
|||||||
"mcp_server.issue_lock_worktree.read_worktree_git_state",
|
"mcp_server.issue_lock_worktree.read_worktree_git_state",
|
||||||
return_value=_clean_master_git_state_for_lock(),
|
return_value=_clean_master_git_state_for_lock(),
|
||||||
)
|
)
|
||||||
@patch("mcp_server.api_get_all", return_value=[])
|
@patch("mcp_server.api_get_all")
|
||||||
@patch("mcp_server.get_auth_header", return_value=FAKE_AUTH)
|
@patch("mcp_server.get_auth_header", return_value=FAKE_AUTH)
|
||||||
def test_lock_issue_success(self, _auth, _api, _git_state):
|
def test_lock_issue_success(self, _auth, mock_api, _git_state):
|
||||||
|
mock_api.return_value = [] # no open PRs
|
||||||
res = gitea_lock_issue(issue_number=196, branch_name="feat/issue-196-mutations", remote="prgs")
|
res = gitea_lock_issue(issue_number=196, branch_name="feat/issue-196-mutations", remote="prgs")
|
||||||
self.assertTrue(res["success"])
|
self.assertTrue(res["success"])
|
||||||
self.assertEqual(res["work_lease"]["operation_type"], "author_issue_work")
|
self.assertEqual(res["work_lease"]["operation_type"], "author_issue_work")
|
||||||
@@ -3114,147 +3082,52 @@ class TestIssueLocking(unittest.TestCase):
|
|||||||
"mcp_server.issue_lock_worktree.read_worktree_git_state",
|
"mcp_server.issue_lock_worktree.read_worktree_git_state",
|
||||||
return_value=_clean_master_git_state_for_lock(),
|
return_value=_clean_master_git_state_for_lock(),
|
||||||
)
|
)
|
||||||
|
@patch("mcp_server.api_get_all")
|
||||||
@patch("mcp_server.get_auth_header", return_value=FAKE_AUTH)
|
@patch("mcp_server.get_auth_header", return_value=FAKE_AUTH)
|
||||||
def test_lock_issue_reused_by_open_pr_branch(self, _auth, _git_state):
|
def test_lock_issue_reused_by_open_pr_branch(self, _auth, mock_api, _git_state):
|
||||||
self.mock_dup_fetcher.return_value = ([{
|
mock_api.return_value = [{
|
||||||
"number": 200,
|
"number": 200,
|
||||||
"head": {"ref": "feat/issue-196-boundary"},
|
"head": {"ref": "feat/issue-196-boundary"},
|
||||||
"title": "Some PR",
|
"title": "Some PR",
|
||||||
"body": "No closes ref",
|
"body": "No closes ref"
|
||||||
}], [], {"status": "not_claimed"})
|
}]
|
||||||
with self.assertRaises(ValueError) as ctx:
|
with self.assertRaises(ValueError) as ctx:
|
||||||
gitea_lock_issue(issue_number=196, branch_name="feat/issue-196-mutations", remote="prgs")
|
gitea_lock_issue(issue_number=196, branch_name="feat/issue-196-mutations", remote="prgs")
|
||||||
self.assertIn("open PR #200 already covers issue", str(ctx.exception))
|
self.assertIn("already tied to an open PR", str(ctx.exception))
|
||||||
|
|
||||||
@patch(
|
@patch(
|
||||||
"mcp_server.issue_lock_worktree.read_worktree_git_state",
|
"mcp_server.issue_lock_worktree.read_worktree_git_state",
|
||||||
return_value=_clean_master_git_state_for_lock(),
|
return_value=_clean_master_git_state_for_lock(),
|
||||||
)
|
)
|
||||||
|
@patch("mcp_server.api_get_all")
|
||||||
@patch("mcp_server.get_auth_header", return_value=FAKE_AUTH)
|
@patch("mcp_server.get_auth_header", return_value=FAKE_AUTH)
|
||||||
def test_lock_issue_reused_by_open_pr_closes_ref(self, _auth, _git_state):
|
def test_lock_issue_reused_by_open_pr_closes_ref(self, _auth, mock_api, _git_state):
|
||||||
self.mock_dup_fetcher.return_value = ([{
|
mock_api.return_value = [{
|
||||||
"number": 200,
|
"number": 200,
|
||||||
"head": {"ref": "feat/other-branch"},
|
"head": {"ref": "feat/other-branch"},
|
||||||
"title": "Some PR",
|
"title": "Some PR",
|
||||||
"body": "fixes #196",
|
"body": "fixes #196"
|
||||||
}], [], {"status": "not_claimed"})
|
}]
|
||||||
with self.assertRaises(ValueError) as ctx:
|
with self.assertRaises(ValueError) as ctx:
|
||||||
gitea_lock_issue(issue_number=196, branch_name="feat/issue-196-mutations", remote="prgs")
|
gitea_lock_issue(issue_number=196, branch_name="feat/issue-196-mutations", remote="prgs")
|
||||||
self.assertIn("open PR #200 already covers issue", str(ctx.exception))
|
self.assertIn("already tied to an open PR", str(ctx.exception))
|
||||||
|
|
||||||
@patch(
|
@patch(
|
||||||
"mcp_server.issue_lock_worktree.read_worktree_git_state",
|
"mcp_server.issue_lock_worktree.read_worktree_git_state",
|
||||||
return_value=_clean_master_git_state_for_lock(),
|
return_value=_clean_master_git_state_for_lock(),
|
||||||
)
|
)
|
||||||
|
@patch("mcp_server.api_get_all")
|
||||||
@patch("mcp_server.get_auth_header", return_value=FAKE_AUTH)
|
@patch("mcp_server.get_auth_header", return_value=FAKE_AUTH)
|
||||||
def test_lock_issue_reused_by_remote_branch(self, _auth, _git_state):
|
def test_lock_issue_reused_by_remote_branch(self, _auth, mock_api, _git_state):
|
||||||
self.mock_dup_fetcher.return_value = (
|
mock_api.side_effect = [
|
||||||
[],
|
[],
|
||||||
["feat/issue-196-existing-work"],
|
[{"name": "feat/issue-196-existing-work"}],
|
||||||
{"status": "not_claimed"},
|
]
|
||||||
)
|
|
||||||
with self.assertRaises(ValueError) as ctx:
|
with self.assertRaises(ValueError) as ctx:
|
||||||
gitea_lock_issue(issue_number=196, branch_name="feat/issue-196-mutations", remote="prgs")
|
gitea_lock_issue(issue_number=196, branch_name="feat/issue-196-mutations", remote="prgs")
|
||||||
self.assertIn("remote branch(es) already match issue pattern", str(ctx.exception))
|
self.assertIn("already has matching branch", str(ctx.exception))
|
||||||
|
|
||||||
@patch(
|
def test_lock_issue_blocks_active_same_operation_lease(self):
|
||||||
"mcp_server.issue_lock_worktree.read_worktree_git_state",
|
|
||||||
return_value=_clean_master_git_state_for_lock(),
|
|
||||||
)
|
|
||||||
@patch("mcp_server.api_get_all")
|
|
||||||
@patch("mcp_server.get_auth_header", return_value=FAKE_AUTH)
|
|
||||||
def test_lock_issue_adopts_own_existing_branch(self, _auth, mock_api, _git_state):
|
|
||||||
# #442: the issue's own already-pushed branch is adoptable for recovery.
|
|
||||||
sha = "934688a71dd19d9b46369e73fb3ac356ee0cc211"
|
|
||||||
|
|
||||||
def _api(url, *a, **k):
|
|
||||||
if "/pulls" in url:
|
|
||||||
return []
|
|
||||||
if "/branches" in url:
|
|
||||||
return [{"name": "feat/issue-196-mutations", "commit": {"id": sha}}]
|
|
||||||
return []
|
|
||||||
|
|
||||||
mock_api.side_effect = _api
|
|
||||||
res = gitea_lock_issue(
|
|
||||||
issue_number=196, branch_name="feat/issue-196-mutations", remote="prgs"
|
|
||||||
)
|
|
||||||
self.assertTrue(res["success"])
|
|
||||||
self.assertIn("adoption", res)
|
|
||||||
proof = res["adoption"]
|
|
||||||
self.assertEqual(proof["issue_number"], 196)
|
|
||||||
self.assertEqual(proof["branch_name"], "feat/issue-196-mutations")
|
|
||||||
self.assertEqual(proof["branch_head_commit"], sha)
|
|
||||||
self.assertTrue(proof["no_existing_pr_proof"])
|
|
||||||
self.assertTrue(proof["no_competing_live_lock_proof"])
|
|
||||||
self.assertEqual(proof["lock_file_path"], ISSUE_LOCK_FILE)
|
|
||||||
self.assertIn("adopt", proof["adoption_reason"].lower())
|
|
||||||
self.assertTrue(os.path.exists(ISSUE_LOCK_FILE))
|
|
||||||
|
|
||||||
@patch(
|
|
||||||
"mcp_server.issue_lock_worktree.read_worktree_git_state",
|
|
||||||
return_value=_clean_master_git_state_for_lock(),
|
|
||||||
)
|
|
||||||
@patch("mcp_server.get_auth_header", return_value=FAKE_AUTH)
|
|
||||||
def test_lock_issue_open_pr_blocks_adoption(self, _auth, _git_state):
|
|
||||||
# Even with the exact own branch present, an open PR blocks adoption.
|
|
||||||
self.mock_dup_fetcher.return_value = ([{
|
|
||||||
"number": 200,
|
|
||||||
"head": {"ref": "feat/issue-196-mutations"},
|
|
||||||
"title": "WIP",
|
|
||||||
"body": "",
|
|
||||||
}], ["feat/issue-196-mutations"], {"status": "not_claimed"})
|
|
||||||
with self.assertRaises(ValueError) as ctx:
|
|
||||||
gitea_lock_issue(
|
|
||||||
issue_number=196, branch_name="feat/issue-196-mutations", remote="prgs"
|
|
||||||
)
|
|
||||||
self.assertIn("open PR #200 already covers issue", str(ctx.exception))
|
|
||||||
self.assertFalse(os.path.exists(ISSUE_LOCK_FILE))
|
|
||||||
|
|
||||||
@patch("mcp_server.role_session_router.check_author_mutation_after_reviewer_stop",
|
|
||||||
return_value=(True, []))
|
|
||||||
@patch(
|
|
||||||
"mcp_server.issue_lock_worktree.read_worktree_git_state",
|
|
||||||
return_value=_clean_master_git_state_for_lock(),
|
|
||||||
)
|
|
||||||
@patch("mcp_server.api_request")
|
|
||||||
@patch("mcp_server.api_get_all")
|
|
||||||
@patch("mcp_server.get_auth_header", return_value=FAKE_AUTH)
|
|
||||||
def test_create_pr_proceeds_after_adopted_lock(
|
|
||||||
self, _auth, mock_api, mock_req, _git_state, _role
|
|
||||||
):
|
|
||||||
# #442 recovery goal: after adopting the own branch, create_pr proceeds.
|
|
||||||
sha = "934688a71dd19d9b46369e73fb3ac356ee0cc211"
|
|
||||||
|
|
||||||
def _api(url, *a, **k):
|
|
||||||
if "/pulls" in url:
|
|
||||||
return []
|
|
||||||
if "/branches" in url:
|
|
||||||
return [{"name": "feat/issue-196-mutations", "commit": {"id": sha}}]
|
|
||||||
return []
|
|
||||||
|
|
||||||
mock_api.side_effect = _api
|
|
||||||
lock_res = gitea_lock_issue(
|
|
||||||
issue_number=196, branch_name="feat/issue-196-mutations", remote="prgs"
|
|
||||||
)
|
|
||||||
self.assertIn("adoption", lock_res)
|
|
||||||
|
|
||||||
mock_req.return_value = {"number": 7, "html_url": "https://gitea.prgs.cc/pulls/7"}
|
|
||||||
with patch.dict(os.environ, CREATE_PR_ENV, clear=True):
|
|
||||||
pr = gitea_create_pr(
|
|
||||||
title="feat: parity gate Closes #196",
|
|
||||||
head="feat/issue-196-mutations",
|
|
||||||
base="master",
|
|
||||||
remote="prgs",
|
|
||||||
)
|
|
||||||
self.assertEqual(pr["number"], 7)
|
|
||||||
|
|
||||||
@patch(
|
|
||||||
"mcp_server.issue_lock_worktree.read_worktree_git_state",
|
|
||||||
return_value=_clean_master_git_state_for_lock(),
|
|
||||||
)
|
|
||||||
@patch("mcp_server.api_get_all", return_value=[])
|
|
||||||
@patch("mcp_server.get_auth_header", return_value=FAKE_AUTH)
|
|
||||||
def test_lock_issue_blocks_active_same_operation_lease(self, _auth, _api, _git_state):
|
|
||||||
with open(ISSUE_LOCK_FILE, "w", encoding="utf-8") as f:
|
with open(ISSUE_LOCK_FILE, "w", encoding="utf-8") as f:
|
||||||
json.dump({
|
json.dump({
|
||||||
"issue_number": 196,
|
"issue_number": 196,
|
||||||
@@ -3269,13 +3142,7 @@ class TestIssueLocking(unittest.TestCase):
|
|||||||
gitea_lock_issue(issue_number=196, branch_name="feat/issue-196-mutations", remote="prgs")
|
gitea_lock_issue(issue_number=196, branch_name="feat/issue-196-mutations", remote="prgs")
|
||||||
self.assertIn("already has an active author_issue_work lease", str(ctx.exception))
|
self.assertIn("already has an active author_issue_work lease", str(ctx.exception))
|
||||||
|
|
||||||
@patch(
|
def test_lock_issue_blocks_expired_same_operation_lease_for_recovery(self):
|
||||||
"mcp_server.issue_lock_worktree.read_worktree_git_state",
|
|
||||||
return_value=_clean_master_git_state_for_lock(),
|
|
||||||
)
|
|
||||||
@patch("mcp_server.api_get_all", return_value=[])
|
|
||||||
@patch("mcp_server.get_auth_header", return_value=FAKE_AUTH)
|
|
||||||
def test_lock_issue_blocks_expired_same_operation_lease_for_recovery(self, _auth, _api, _git_state):
|
|
||||||
with open(ISSUE_LOCK_FILE, "w", encoding="utf-8") as f:
|
with open(ISSUE_LOCK_FILE, "w", encoding="utf-8") as f:
|
||||||
json.dump({
|
json.dump({
|
||||||
"issue_number": 196,
|
"issue_number": 196,
|
||||||
@@ -3417,28 +3284,6 @@ class TestIssueLocking(unittest.TestCase):
|
|||||||
)
|
)
|
||||||
self.assertIn("does not match locked worktree", str(ctx.exception))
|
self.assertIn("does not match locked worktree", str(ctx.exception))
|
||||||
|
|
||||||
@patch("mcp_server.role_session_router.check_author_mutation_after_reviewer_stop",
|
|
||||||
return_value=(True, []))
|
|
||||||
@patch("mcp_server.get_auth_header", return_value=FAKE_AUTH)
|
|
||||||
def test_create_pr_manual_lock_seed_blocked(self, _auth, _role):
|
|
||||||
with open(ISSUE_LOCK_FILE, "w", encoding="utf-8") as f:
|
|
||||||
json.dump(
|
|
||||||
_sample_issue_lock(
|
|
||||||
issue_number=447,
|
|
||||||
branch_name="feat/issue-447-lock-provenance",
|
|
||||||
lock_provenance=None,
|
|
||||||
),
|
|
||||||
f,
|
|
||||||
)
|
|
||||||
with patch.dict(os.environ, CREATE_PR_ENV, clear=True):
|
|
||||||
with self.assertRaises(RuntimeError) as ctx:
|
|
||||||
gitea_create_pr(
|
|
||||||
title="feat: lock provenance Closes #447",
|
|
||||||
head="feat/issue-447-lock-provenance",
|
|
||||||
remote="prgs",
|
|
||||||
)
|
|
||||||
self.assertIn("lock provenance", str(ctx.exception).lower())
|
|
||||||
|
|
||||||
@patch("mcp_server.api_request")
|
@patch("mcp_server.api_request")
|
||||||
@patch("mcp_server.role_session_router.check_author_mutation_after_reviewer_stop",
|
@patch("mcp_server.role_session_router.check_author_mutation_after_reviewer_stop",
|
||||||
return_value=(True, []))
|
return_value=(True, []))
|
||||||
|
|||||||
@@ -2346,7 +2346,6 @@ class TestWorkIssueFinalReport(unittest.TestCase):
|
|||||||
"- Safe next action: open PR",
|
"- Safe next action: open PR",
|
||||||
"- Next: open PR",
|
"- Next: open PR",
|
||||||
"- Safety statement: no review/merge",
|
"- Safety statement: no review/merge",
|
||||||
"- Duplicate work outcome: duplicate work not prevented",
|
|
||||||
])
|
])
|
||||||
|
|
||||||
def test_complete_work_issue_report_earns_a(self):
|
def test_complete_work_issue_report_earns_a(self):
|
||||||
|
|||||||
@@ -1,111 +0,0 @@
|
|||||||
"""Tests for web UI project registry (#427)."""
|
|
||||||
import json
|
|
||||||
import sys
|
|
||||||
import tempfile
|
|
||||||
import unittest
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
|
||||||
|
|
||||||
from starlette.testclient import TestClient
|
|
||||||
|
|
||||||
from webui.app import create_app
|
|
||||||
from webui.project_registry import (
|
|
||||||
default_registry_path,
|
|
||||||
load_registry,
|
|
||||||
project_to_dict,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
class TestProjectRegistryLoader(unittest.TestCase):
|
|
||||||
def test_default_registry_loads_gitea_tools(self):
|
|
||||||
registry = load_registry()
|
|
||||||
self.assertEqual(registry.version, 1)
|
|
||||||
self.assertEqual(len(registry.projects), 1)
|
|
||||||
project = registry.projects[0]
|
|
||||||
self.assertEqual(project.id, "gitea-tools")
|
|
||||||
self.assertEqual(project.repo_name, "Gitea-Tools")
|
|
||||||
self.assertEqual(project.gitea_owner, "Scaled-Tech-Consulting")
|
|
||||||
self.assertEqual(project.remote_host, "https://gitea.prgs.cc")
|
|
||||||
self.assertEqual(project.profiles["author"], "prgs-author")
|
|
||||||
self.assertEqual(project.profiles["reviewer"], "prgs-reviewer")
|
|
||||||
self.assertEqual(project.profiles["reconciler"], "prgs-reconciler")
|
|
||||||
self.assertIn("skill", project.workflow_paths)
|
|
||||||
self.assertGreaterEqual(len(project.onboarding_checklist), 4)
|
|
||||||
|
|
||||||
def test_registry_rejects_credential_keys(self):
|
|
||||||
payload = {
|
|
||||||
"version": 1,
|
|
||||||
"projects": [
|
|
||||||
{
|
|
||||||
"id": "bad",
|
|
||||||
"repo_name": "Bad",
|
|
||||||
"gitea_owner": "Org",
|
|
||||||
"remote_host": "https://gitea.example.invalid",
|
|
||||||
"default_branch": "main",
|
|
||||||
"local_checkout_path": ".",
|
|
||||||
"profiles": {
|
|
||||||
"author": "a",
|
|
||||||
"reviewer": "r",
|
|
||||||
"reconciler": "c",
|
|
||||||
},
|
|
||||||
"workflow_paths": {"skill": "skills/x.md"},
|
|
||||||
"api_token": "secret",
|
|
||||||
}
|
|
||||||
],
|
|
||||||
}
|
|
||||||
with tempfile.NamedTemporaryFile("w", suffix=".json", delete=False) as handle:
|
|
||||||
json.dump(payload, handle)
|
|
||||||
path = Path(handle.name)
|
|
||||||
try:
|
|
||||||
with self.assertRaises(ValueError):
|
|
||||||
load_registry(path)
|
|
||||||
finally:
|
|
||||||
path.unlink(missing_ok=True)
|
|
||||||
|
|
||||||
def test_default_registry_path_points_at_packaged_data(self):
|
|
||||||
path = default_registry_path()
|
|
||||||
self.assertTrue(path.name == "projects.registry.json")
|
|
||||||
self.assertTrue(path.parent.name == "data")
|
|
||||||
|
|
||||||
|
|
||||||
class TestProjectRegistryRoutes(unittest.TestCase):
|
|
||||||
def setUp(self):
|
|
||||||
self.client = TestClient(create_app())
|
|
||||||
|
|
||||||
def test_projects_page_lists_gitea_tools(self):
|
|
||||||
response = self.client.get("/projects")
|
|
||||||
self.assertEqual(response.status_code, 200)
|
|
||||||
self.assertIn("Gitea-Tools", response.text)
|
|
||||||
self.assertIn("Scaled-Tech-Consulting", response.text)
|
|
||||||
self.assertIn("prgs-author", response.text)
|
|
||||||
self.assertNotIn("child issue", response.text.lower())
|
|
||||||
|
|
||||||
def test_project_detail_renders_checklist(self):
|
|
||||||
response = self.client.get("/projects/gitea-tools")
|
|
||||||
self.assertEqual(response.status_code, 200)
|
|
||||||
self.assertIn("Onboarding checklist", response.text)
|
|
||||||
self.assertIn("Configure execution profiles", response.text)
|
|
||||||
self.assertIn("branches/", response.text)
|
|
||||||
|
|
||||||
def test_project_detail_404(self):
|
|
||||||
response = self.client.get("/projects/unknown-repo")
|
|
||||||
self.assertEqual(response.status_code, 404)
|
|
||||||
|
|
||||||
def test_api_projects_json(self):
|
|
||||||
response = self.client.get("/api/projects")
|
|
||||||
self.assertEqual(response.status_code, 200)
|
|
||||||
data = response.json()
|
|
||||||
self.assertEqual(data["version"], 1)
|
|
||||||
self.assertEqual(len(data["projects"]), 1)
|
|
||||||
self.assertEqual(data["projects"][0]["id"], "gitea-tools")
|
|
||||||
self.assertIn("onboarding_checklist", data["projects"][0])
|
|
||||||
|
|
||||||
def test_project_to_dict_is_json_safe(self):
|
|
||||||
registry = load_registry()
|
|
||||||
encoded = json.dumps(project_to_dict(registry.projects[0]))
|
|
||||||
self.assertIn("gitea-tools", encoded)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
unittest.main()
|
|
||||||
@@ -1,90 +0,0 @@
|
|||||||
"""Tests for web UI prompt library (#428)."""
|
|
||||||
import json
|
|
||||||
import sys
|
|
||||||
import unittest
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
|
||||||
|
|
||||||
from starlette.testclient import TestClient
|
|
||||||
|
|
||||||
from webui.app import create_app
|
|
||||||
from webui.prompt_library import find_prompt, library_to_dict, load_prompt_library, prompt_to_dict
|
|
||||||
|
|
||||||
REQUIRED_PROMPT_SLUGS = frozenset({
|
|
||||||
"review-pr",
|
|
||||||
"work-issue",
|
|
||||||
"create-issue",
|
|
||||||
"comment-issue",
|
|
||||||
"cleanup",
|
|
||||||
"audit",
|
|
||||||
"onboarding",
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
class TestPromptLibraryLoader(unittest.TestCase):
|
|
||||||
def test_library_loads_required_prompts(self):
|
|
||||||
entries = load_prompt_library()
|
|
||||||
slugs = {entry.slug for entry in entries}
|
|
||||||
self.assertEqual(slugs, REQUIRED_PROMPT_SLUGS)
|
|
||||||
|
|
||||||
def test_workflow_hashes_present(self):
|
|
||||||
review = find_prompt("review-pr")
|
|
||||||
self.assertIsNotNone(review)
|
|
||||||
assert review is not None
|
|
||||||
self.assertTrue(review.workflow_hash)
|
|
||||||
self.assertEqual(len(review.workflow_hash), 64)
|
|
||||||
|
|
||||||
def test_prompt_text_is_short(self):
|
|
||||||
for entry in load_prompt_library():
|
|
||||||
self.assertLess(len(entry.prompt_text), 400)
|
|
||||||
self.assertNotIn("Do not improvise around the gates", entry.prompt_text)
|
|
||||||
|
|
||||||
|
|
||||||
class TestPromptLibraryRoutes(unittest.TestCase):
|
|
||||||
def setUp(self):
|
|
||||||
self.client = TestClient(create_app())
|
|
||||||
|
|
||||||
def test_prompts_page_lists_all_entries(self):
|
|
||||||
response = self.client.get("/prompts")
|
|
||||||
self.assertEqual(response.status_code, 200)
|
|
||||||
for label in (
|
|
||||||
"Review PR",
|
|
||||||
"Work issue",
|
|
||||||
"Create issue",
|
|
||||||
"Comment on issue",
|
|
||||||
"Post-merge cleanup",
|
|
||||||
"Reconciliation audit",
|
|
||||||
"Project onboarding",
|
|
||||||
):
|
|
||||||
self.assertIn(label, response.text)
|
|
||||||
self.assertIn("Copy prompt", response.text)
|
|
||||||
self.assertIn("sha256:", response.text)
|
|
||||||
self.assertNotIn("child issue", response.text.lower())
|
|
||||||
|
|
||||||
def test_prompt_detail_route(self):
|
|
||||||
response = self.client.get("/prompts/work-issue")
|
|
||||||
self.assertEqual(response.status_code, 200)
|
|
||||||
self.assertIn("work-issue.md", response.text)
|
|
||||||
self.assertIn("Copy prompt", response.text)
|
|
||||||
|
|
||||||
def test_prompt_detail_404(self):
|
|
||||||
self.assertEqual(self.client.get("/prompts/missing").status_code, 404)
|
|
||||||
|
|
||||||
def test_api_prompts_json(self):
|
|
||||||
response = self.client.get("/api/prompts")
|
|
||||||
self.assertEqual(response.status_code, 200)
|
|
||||||
data = response.json()
|
|
||||||
self.assertEqual(data["count"], 7)
|
|
||||||
review = next(item for item in data["prompts"] if item["slug"] == "review-pr")
|
|
||||||
self.assertIn("workflow_hash", review)
|
|
||||||
self.assertIn("review-merge-pr.md", review["workflow_path"])
|
|
||||||
|
|
||||||
def test_prompt_to_dict_roundtrip(self):
|
|
||||||
entry = load_prompt_library()[0]
|
|
||||||
encoded = json.dumps(prompt_to_dict(entry))
|
|
||||||
self.assertIn("workflow_path", encoded)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
unittest.main()
|
|
||||||
@@ -1,288 +0,0 @@
|
|||||||
"""Tests for web UI live queue dashboard (#429)."""
|
|
||||||
import sys
|
|
||||||
import unittest
|
|
||||||
from datetime import datetime, timedelta, timezone
|
|
||||||
from pathlib import Path
|
|
||||||
from unittest import mock
|
|
||||||
|
|
||||||
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
|
||||||
|
|
||||||
from starlette.testclient import TestClient
|
|
||||||
|
|
||||||
from webui.app import create_app
|
|
||||||
from webui.queue_loader import (
|
|
||||||
PaginationMeta,
|
|
||||||
QueueSnapshot,
|
|
||||||
_classify_issue,
|
|
||||||
_classify_pr,
|
|
||||||
_extract_linked_issue,
|
|
||||||
load_queue_snapshot,
|
|
||||||
snapshot_to_dict,
|
|
||||||
)
|
|
||||||
from webui.queue_views import render_queue_page
|
|
||||||
|
|
||||||
_RECENT = datetime.now(timezone.utc).isoformat()
|
|
||||||
_STALE = (datetime.now(timezone.utc) - timedelta(days=30)).isoformat()
|
|
||||||
|
|
||||||
_SAMPLE_PRS = [
|
|
||||||
{
|
|
||||||
"number": 100,
|
|
||||||
"title": "feat: queue dashboard (Closes #429)",
|
|
||||||
"body": "",
|
|
||||||
"mergeable": True,
|
|
||||||
"updated_at": _RECENT,
|
|
||||||
"head": {"ref": "feat/issue-429", "sha": "abc123def456"},
|
|
||||||
"base": {"ref": "master"},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"number": 99,
|
|
||||||
"title": "fix: conflict",
|
|
||||||
"body": "Closes #50",
|
|
||||||
"mergeable": False,
|
|
||||||
"updated_at": _STALE,
|
|
||||||
"head": {"ref": "fix/issue-50", "sha": "deadbeef0001"},
|
|
||||||
"base": {"ref": "master"},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"number": 98,
|
|
||||||
"title": "feat: duplicate A (Closes #60)",
|
|
||||||
"body": "",
|
|
||||||
"mergeable": True,
|
|
||||||
"updated_at": _RECENT,
|
|
||||||
"head": {"ref": "feat/issue-60-a", "sha": "111111111111"},
|
|
||||||
"base": {"ref": "master"},
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"number": 97,
|
|
||||||
"title": "feat: duplicate B (Closes #60)",
|
|
||||||
"body": "",
|
|
||||||
"mergeable": True,
|
|
||||||
"updated_at": _RECENT,
|
|
||||||
"head": {"ref": "feat/issue-60-b", "sha": "222222222222"},
|
|
||||||
"base": {"ref": "master"},
|
|
||||||
},
|
|
||||||
]
|
|
||||||
|
|
||||||
_SAMPLE_ISSUES = [
|
|
||||||
{
|
|
||||||
"number": 429,
|
|
||||||
"title": "Web UI queue dashboard",
|
|
||||||
"state": "open",
|
|
||||||
"labels": [{"name": "status:in-progress"}],
|
|
||||||
"assignee": None,
|
|
||||||
"updated_at": _RECENT,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"number": 60,
|
|
||||||
"title": "Duplicate PR target",
|
|
||||||
"state": "open",
|
|
||||||
"labels": [],
|
|
||||||
"assignee": None,
|
|
||||||
"updated_at": _RECENT,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"number": 50,
|
|
||||||
"title": "Blocked PR target",
|
|
||||||
"state": "open",
|
|
||||||
"labels": [],
|
|
||||||
"assignee": None,
|
|
||||||
"updated_at": _STALE,
|
|
||||||
},
|
|
||||||
]
|
|
||||||
|
|
||||||
|
|
||||||
def _mock_pagination(count: int) -> PaginationMeta:
|
|
||||||
return PaginationMeta(
|
|
||||||
page=1,
|
|
||||||
per_page=50,
|
|
||||||
returned_count=count,
|
|
||||||
has_more=False,
|
|
||||||
is_final_page=True,
|
|
||||||
inventory_complete=True,
|
|
||||||
pages_fetched=1,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def _mock_fetch_prs(*_args, **_kwargs):
|
|
||||||
return list(_SAMPLE_PRS), _mock_pagination(len(_SAMPLE_PRS))
|
|
||||||
|
|
||||||
|
|
||||||
def _mock_fetch_issues(*_args, **_kwargs):
|
|
||||||
return list(_SAMPLE_ISSUES), _mock_pagination(len(_SAMPLE_ISSUES))
|
|
||||||
|
|
||||||
|
|
||||||
class TestQueueClassification(unittest.TestCase):
|
|
||||||
def test_extract_linked_issue_from_title(self):
|
|
||||||
self.assertEqual(
|
|
||||||
_extract_linked_issue("feat: X (Closes #429)", ""),
|
|
||||||
429,
|
|
||||||
)
|
|
||||||
|
|
||||||
def test_classify_pr_blocked_and_stale(self):
|
|
||||||
pr = _SAMPLE_PRS[1]
|
|
||||||
badges = _classify_pr(
|
|
||||||
pr,
|
|
||||||
issue_claimed=set(),
|
|
||||||
issue_to_prs={50: [99]},
|
|
||||||
)
|
|
||||||
self.assertIn("blocked", badges)
|
|
||||||
self.assertIn("stale", badges)
|
|
||||||
|
|
||||||
def test_classify_pr_duplicate(self):
|
|
||||||
badges = _classify_pr(
|
|
||||||
_SAMPLE_PRS[2],
|
|
||||||
issue_claimed=set(),
|
|
||||||
issue_to_prs={60: [98, 97]},
|
|
||||||
)
|
|
||||||
self.assertIn("duplicate", badges)
|
|
||||||
self.assertIn("in-review", badges)
|
|
||||||
|
|
||||||
def test_classify_issue_claimed_and_duplicate(self):
|
|
||||||
claimed = _classify_issue(_SAMPLE_ISSUES[0], linked_prs=[])
|
|
||||||
self.assertIn("claimed", claimed)
|
|
||||||
duplicate = _classify_issue(_SAMPLE_ISSUES[1], linked_prs=[98, 97])
|
|
||||||
self.assertIn("duplicate", duplicate)
|
|
||||||
|
|
||||||
|
|
||||||
class TestQueueLoader(unittest.TestCase):
|
|
||||||
def test_snapshot_with_mock_fetch(self):
|
|
||||||
snapshot = load_queue_snapshot(
|
|
||||||
fetch_prs=_mock_fetch_prs,
|
|
||||||
fetch_issues=_mock_fetch_issues,
|
|
||||||
)
|
|
||||||
self.assertEqual(snapshot.project_id, "gitea-tools")
|
|
||||||
self.assertIsNone(snapshot.fetch_error)
|
|
||||||
self.assertEqual(len(snapshot.prs), 4)
|
|
||||||
self.assertEqual(len(snapshot.issues), 3)
|
|
||||||
self.assertTrue(snapshot.pr_pagination.inventory_complete)
|
|
||||||
self.assertTrue(snapshot.issue_pagination.inventory_complete)
|
|
||||||
|
|
||||||
pr100 = next(p for p in snapshot.prs if p.number == 100)
|
|
||||||
self.assertEqual(pr100.extra["linked_issue"], "429")
|
|
||||||
self.assertIn("claimed", pr100.badges)
|
|
||||||
|
|
||||||
def test_snapshot_dict_export(self):
|
|
||||||
snapshot = load_queue_snapshot(
|
|
||||||
fetch_prs=_mock_fetch_prs,
|
|
||||||
fetch_issues=_mock_fetch_issues,
|
|
||||||
)
|
|
||||||
data = snapshot_to_dict(snapshot)
|
|
||||||
self.assertEqual(data["project_id"], "gitea-tools")
|
|
||||||
self.assertIsNone(data["fetch_error"])
|
|
||||||
self.assertEqual(len(data["prs"]), 4)
|
|
||||||
self.assertTrue(data["pagination"]["prs"]["inventory_complete"])
|
|
||||||
|
|
||||||
|
|
||||||
class TestQueueRoutes(unittest.TestCase):
|
|
||||||
def setUp(self):
|
|
||||||
self.client = TestClient(create_app())
|
|
||||||
self._patch = mock.patch(
|
|
||||||
"webui.app.load_queue_snapshot",
|
|
||||||
return_value=load_queue_snapshot(
|
|
||||||
fetch_prs=_mock_fetch_prs,
|
|
||||||
fetch_issues=_mock_fetch_issues,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
self._patch.start()
|
|
||||||
|
|
||||||
def tearDown(self):
|
|
||||||
self._patch.stop()
|
|
||||||
|
|
||||||
def test_queue_page_renders_tables_and_pagination(self):
|
|
||||||
response = self.client.get("/queue")
|
|
||||||
self.assertEqual(response.status_code, 200)
|
|
||||||
self.assertIn("Live queue", response.text)
|
|
||||||
self.assertIn("Open pull requests", response.text)
|
|
||||||
self.assertIn("Open issues", response.text)
|
|
||||||
self.assertIn("pages_fetched", response.text)
|
|
||||||
self.assertIn("Gitea-Tools", response.text)
|
|
||||||
self.assertNotIn("child issue", response.text.lower())
|
|
||||||
|
|
||||||
def test_api_queue_json(self):
|
|
||||||
response = self.client.get("/api/queue")
|
|
||||||
self.assertEqual(response.status_code, 200)
|
|
||||||
data = response.json()
|
|
||||||
self.assertEqual(data["repo"], "Scaled-Tech-Consulting/Gitea-Tools")
|
|
||||||
self.assertEqual(data["pagination"]["issues"]["returned_count"], 3)
|
|
||||||
|
|
||||||
def test_queue_fail_closed_without_credentials(self):
|
|
||||||
with mock.patch("webui.queue_loader.get_auth_header", return_value=None):
|
|
||||||
snapshot = load_queue_snapshot()
|
|
||||||
self.assertIsNotNone(snapshot.fetch_error)
|
|
||||||
self.assertEqual(len(snapshot.prs), 0)
|
|
||||||
|
|
||||||
|
|
||||||
def _empty_pagination() -> PaginationMeta:
|
|
||||||
return PaginationMeta(
|
|
||||||
page=1,
|
|
||||||
per_page=50,
|
|
||||||
returned_count=0,
|
|
||||||
has_more=False,
|
|
||||||
is_final_page=True,
|
|
||||||
inventory_complete=True,
|
|
||||||
pages_fetched=1,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def _empty_fetch(*_args, **_kwargs):
|
|
||||||
return [], _empty_pagination()
|
|
||||||
|
|
||||||
|
|
||||||
class TestQueueFailClosedUx(unittest.TestCase):
|
|
||||||
"""Regression tests for #458 fail-closed empty-state copy."""
|
|
||||||
|
|
||||||
def test_fail_closed_view_suppresses_empty_queue_copy(self):
|
|
||||||
snapshot = QueueSnapshot(
|
|
||||||
project_id="gitea-tools",
|
|
||||||
repo_label="Scaled-Tech-Consulting/Gitea-Tools",
|
|
||||||
prs=(),
|
|
||||||
issues=(),
|
|
||||||
pr_pagination=None,
|
|
||||||
issue_pagination=None,
|
|
||||||
fetch_error="Gitea credentials unavailable for gitea.prgs.cc",
|
|
||||||
)
|
|
||||||
html = render_queue_page(snapshot)
|
|
||||||
self.assertIn("Queue unavailable", html)
|
|
||||||
self.assertIn("Not loaded", html)
|
|
||||||
self.assertNotIn("No open items.", html)
|
|
||||||
self.assertIn("pagination:</strong> unavailable", html)
|
|
||||||
|
|
||||||
def test_fail_closed_route_does_not_show_empty_queue_copy(self):
|
|
||||||
client = TestClient(create_app())
|
|
||||||
snapshot = load_queue_snapshot(
|
|
||||||
fetch_prs=_empty_fetch,
|
|
||||||
fetch_issues=_empty_fetch,
|
|
||||||
)
|
|
||||||
snapshot = QueueSnapshot(
|
|
||||||
project_id=snapshot.project_id,
|
|
||||||
repo_label=snapshot.repo_label,
|
|
||||||
prs=(),
|
|
||||||
issues=(),
|
|
||||||
pr_pagination=None,
|
|
||||||
issue_pagination=None,
|
|
||||||
fetch_error="Gitea credentials unavailable for gitea.prgs.cc",
|
|
||||||
)
|
|
||||||
with mock.patch("webui.app.load_queue_snapshot", return_value=snapshot):
|
|
||||||
response = client.get("/queue")
|
|
||||||
self.assertEqual(response.status_code, 200)
|
|
||||||
self.assertIn("Queue unavailable", response.text)
|
|
||||||
self.assertNotIn("No open items.", response.text)
|
|
||||||
|
|
||||||
def test_successful_empty_inventory_shows_empty_copy(self):
|
|
||||||
snapshot = load_queue_snapshot(
|
|
||||||
fetch_prs=_empty_fetch,
|
|
||||||
fetch_issues=_empty_fetch,
|
|
||||||
)
|
|
||||||
self.assertIsNone(snapshot.fetch_error)
|
|
||||||
self.assertEqual(len(snapshot.prs), 0)
|
|
||||||
self.assertEqual(len(snapshot.issues), 0)
|
|
||||||
self.assertTrue(snapshot.pr_pagination.inventory_complete)
|
|
||||||
|
|
||||||
html = render_queue_page(snapshot)
|
|
||||||
self.assertNotIn("Queue unavailable", html)
|
|
||||||
self.assertEqual(html.count("No open items."), 2)
|
|
||||||
self.assertIn("pagination (complete)", html)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
unittest.main()
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
"""Tests for internal web UI skeleton (#426)."""
|
|
||||||
import sys
|
|
||||||
import unittest
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
sys.path.insert(0, str(Path(__file__).resolve().parent.parent))
|
|
||||||
|
|
||||||
from starlette.testclient import TestClient
|
|
||||||
|
|
||||||
from webui.app import create_app
|
|
||||||
|
|
||||||
|
|
||||||
class TestWebuiSkeleton(unittest.TestCase):
|
|
||||||
def setUp(self):
|
|
||||||
self.client = TestClient(create_app())
|
|
||||||
|
|
||||||
def test_health_returns_json(self):
|
|
||||||
response = self.client.get("/health")
|
|
||||||
self.assertEqual(response.status_code, 200)
|
|
||||||
data = response.json()
|
|
||||||
self.assertEqual(data["status"], "ok")
|
|
||||||
self.assertEqual(data["service"], "mcp-control-plane-webui")
|
|
||||||
self.assertEqual(data["mode"], "read-only-mvp")
|
|
||||||
self.assertIn("timestamp", data)
|
|
||||||
|
|
||||||
def test_home_renders(self):
|
|
||||||
response = self.client.get("/")
|
|
||||||
self.assertEqual(response.status_code, 200)
|
|
||||||
self.assertIn("Operator console", response.text)
|
|
||||||
self.assertIn("Read-only MVP", response.text)
|
|
||||||
|
|
||||||
def test_route_stubs_render(self):
|
|
||||||
for path in ("/runtime", "/audit"):
|
|
||||||
with self.subTest(path=path):
|
|
||||||
response = self.client.get(path)
|
|
||||||
self.assertEqual(response.status_code, 200)
|
|
||||||
self.assertIn("child issue", response.text.lower())
|
|
||||||
|
|
||||||
def test_prompts_is_implemented(self):
|
|
||||||
response = self.client.get("/prompts")
|
|
||||||
self.assertEqual(response.status_code, 200)
|
|
||||||
self.assertIn("Prompt library", response.text)
|
|
||||||
|
|
||||||
def test_projects_is_implemented(self):
|
|
||||||
response = self.client.get("/projects")
|
|
||||||
self.assertEqual(response.status_code, 200)
|
|
||||||
self.assertIn("Gitea-Tools", response.text)
|
|
||||||
|
|
||||||
def test_extra_stub_routes(self):
|
|
||||||
for path in ("/worktrees", "/leases"):
|
|
||||||
with self.subTest(path=path):
|
|
||||||
self.assertEqual(self.client.get(path).status_code, 200)
|
|
||||||
|
|
||||||
def test_post_is_rejected(self):
|
|
||||||
response = self.client.post("/health")
|
|
||||||
self.assertEqual(response.status_code, 405)
|
|
||||||
self.assertEqual(response.json()["error"], "read-only-mvp")
|
|
||||||
|
|
||||||
def test_queue_route_renders(self):
|
|
||||||
response = self.client.get("/queue")
|
|
||||||
self.assertEqual(response.status_code, 200)
|
|
||||||
self.assertIn("Live queue", response.text)
|
|
||||||
|
|
||||||
def test_nav_links_on_all_pages(self):
|
|
||||||
for path in ("/", "/queue", "/projects", "/prompts", "/runtime", "/audit"):
|
|
||||||
with self.subTest(path=path):
|
|
||||||
text = self.client.get(path).text
|
|
||||||
for href in ("/queue", "/projects", "/prompts", "/runtime", "/audit"):
|
|
||||||
self.assertIn(f'href="{href}"', text)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
unittest.main()
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
"""Internal MCP Control Plane web UI (read-only MVP skeleton, #426)."""
|
|
||||||
|
|
||||||
from webui.app import create_app
|
|
||||||
|
|
||||||
__all__ = ["create_app"]
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
"""Run the internal web UI: ``python -m webui``."""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import os
|
|
||||||
|
|
||||||
import uvicorn
|
|
||||||
|
|
||||||
from webui.app import create_app
|
|
||||||
|
|
||||||
|
|
||||||
def main() -> None:
|
|
||||||
host = os.environ.get("WEBUI_HOST", "127.0.0.1")
|
|
||||||
port = int(os.environ.get("WEBUI_PORT", "8765"))
|
|
||||||
uvicorn.run(create_app(), host=host, port=port, log_level="info")
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
main()
|
|
||||||
-180
@@ -1,180 +0,0 @@
|
|||||||
"""Starlette application for the internal read-only web UI (#426)."""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
from datetime import datetime, timezone
|
|
||||||
|
|
||||||
from starlette.applications import Starlette
|
|
||||||
from starlette.requests import Request
|
|
||||||
from starlette.responses import HTMLResponse, JSONResponse, Response
|
|
||||||
from starlette.routing import Route
|
|
||||||
|
|
||||||
from webui.layout import render_page
|
|
||||||
from webui.project_registry import find_project, load_registry, registry_to_dict
|
|
||||||
from webui.project_views import render_project_detail, render_projects_list
|
|
||||||
from webui.prompt_library import find_prompt, library_to_dict
|
|
||||||
from webui.prompt_views import render_prompt_detail, render_prompts_page
|
|
||||||
from webui.queue_loader import load_queue_snapshot, snapshot_to_dict
|
|
||||||
from webui.queue_views import render_queue_page
|
|
||||||
|
|
||||||
_READ_ONLY_METHODS = frozenset({"GET", "HEAD", "OPTIONS"})
|
|
||||||
|
|
||||||
|
|
||||||
def _stub_page(title: str, description: str) -> HTMLResponse:
|
|
||||||
body = (
|
|
||||||
f"<h2>{title}</h2>"
|
|
||||||
f'<div class="stub"><p>{description}</p>'
|
|
||||||
"<p>Implementation tracked in a child issue of #425.</p></div>"
|
|
||||||
)
|
|
||||||
return HTMLResponse(render_page(title=title, body_html=body))
|
|
||||||
|
|
||||||
|
|
||||||
async def home(_request: Request) -> HTMLResponse:
|
|
||||||
body = (
|
|
||||||
"<h2>Operator console</h2>"
|
|
||||||
"<p>Local entry point for MCP Control Plane operational views.</p>"
|
|
||||||
"<ul>"
|
|
||||||
"<li><strong>Queue</strong> — live PR and issue dashboard (#429)</li>"
|
|
||||||
"<li><strong>Projects</strong> — registry and onboarding (#427)</li>"
|
|
||||||
"<li><strong>Prompts</strong> — canonical workflow prompt library (#428)</li>"
|
|
||||||
"<li><strong>Runtime</strong> — MCP health and stale-runtime detection (#430)</li>"
|
|
||||||
"<li><strong>Audit</strong> — final-report paste and validator preview (#431)</li>"
|
|
||||||
"<li><strong>Worktrees</strong> — branch hygiene dashboard (#432)</li>"
|
|
||||||
"<li><strong>Leases</strong> — collision and lease visibility (#433)</li>"
|
|
||||||
"</ul>"
|
|
||||||
)
|
|
||||||
return HTMLResponse(render_page(title="Home", body_html=body))
|
|
||||||
|
|
||||||
|
|
||||||
async def health(_request: Request) -> JSONResponse:
|
|
||||||
return JSONResponse({
|
|
||||||
"status": "ok",
|
|
||||||
"service": "mcp-control-plane-webui",
|
|
||||||
"mode": "read-only-mvp",
|
|
||||||
"timestamp": datetime.now(timezone.utc).isoformat(),
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
async def queue(_request: Request) -> HTMLResponse:
|
|
||||||
snapshot = load_queue_snapshot()
|
|
||||||
return HTMLResponse(render_page(title="Queue", body_html=render_queue_page(snapshot)))
|
|
||||||
|
|
||||||
|
|
||||||
async def api_queue(_request: Request) -> JSONResponse:
|
|
||||||
return JSONResponse(snapshot_to_dict(load_queue_snapshot()))
|
|
||||||
|
|
||||||
|
|
||||||
async def projects(_request: Request) -> HTMLResponse:
|
|
||||||
registry = load_registry()
|
|
||||||
return HTMLResponse(render_projects_list(registry))
|
|
||||||
|
|
||||||
|
|
||||||
async def project_detail(request: Request) -> HTMLResponse:
|
|
||||||
project_id = request.path_params["project_id"]
|
|
||||||
registry = load_registry()
|
|
||||||
project = find_project(registry, project_id)
|
|
||||||
if project is None:
|
|
||||||
return HTMLResponse(
|
|
||||||
render_page(
|
|
||||||
title="Project not found",
|
|
||||||
body_html=(
|
|
||||||
"<h2>Project not found</h2>"
|
|
||||||
f"<p>No registry entry for <code>{project_id}</code>.</p>"
|
|
||||||
'<p><a href="/projects">← All projects</a></p>'
|
|
||||||
),
|
|
||||||
),
|
|
||||||
status_code=404,
|
|
||||||
)
|
|
||||||
return HTMLResponse(render_project_detail(project))
|
|
||||||
|
|
||||||
|
|
||||||
async def api_projects(_request: Request) -> JSONResponse:
|
|
||||||
registry = load_registry()
|
|
||||||
return JSONResponse(registry_to_dict(registry))
|
|
||||||
|
|
||||||
|
|
||||||
async def prompts(_request: Request) -> HTMLResponse:
|
|
||||||
return HTMLResponse(render_prompts_page())
|
|
||||||
|
|
||||||
|
|
||||||
async def prompt_detail(request: Request) -> HTMLResponse:
|
|
||||||
prompt_id = request.path_params["prompt_id"]
|
|
||||||
prompt = find_prompt(prompt_id)
|
|
||||||
if prompt is None:
|
|
||||||
return HTMLResponse(
|
|
||||||
render_page(
|
|
||||||
title="Prompt not found",
|
|
||||||
body_html=(
|
|
||||||
"<h2>Prompt not found</h2>"
|
|
||||||
f"<p>No library entry for <code>{prompt_id}</code>.</p>"
|
|
||||||
'<p><a href="/prompts">← All prompts</a></p>'
|
|
||||||
),
|
|
||||||
),
|
|
||||||
status_code=404,
|
|
||||||
)
|
|
||||||
return HTMLResponse(render_prompt_detail(prompt))
|
|
||||||
|
|
||||||
|
|
||||||
async def api_prompts(_request: Request) -> JSONResponse:
|
|
||||||
return JSONResponse(library_to_dict())
|
|
||||||
|
|
||||||
|
|
||||||
async def runtime(_request: Request) -> HTMLResponse:
|
|
||||||
return _stub_page(
|
|
||||||
"Runtime",
|
|
||||||
"Runtime health will report MCP profile, preflight, and stale-server signals.",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
async def audit(_request: Request) -> HTMLResponse:
|
|
||||||
return _stub_page(
|
|
||||||
"Audit",
|
|
||||||
"Report audit will accept pasted final reports and run validator previews.",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
async def worktrees(_request: Request) -> HTMLResponse:
|
|
||||||
return _stub_page(
|
|
||||||
"Worktrees",
|
|
||||||
"Worktree hygiene will summarize branches/ session folders and cleanup risk.",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
async def leases(_request: Request) -> HTMLResponse:
|
|
||||||
return _stub_page(
|
|
||||||
"Leases",
|
|
||||||
"Lease visibility will show active issue and reviewer PR leases.",
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
async def method_not_allowed(request: Request, _exc: Exception) -> Response:
|
|
||||||
if request.method not in _READ_ONLY_METHODS:
|
|
||||||
return JSONResponse(
|
|
||||||
{"error": "read-only-mvp", "detail": f"{request.method} not permitted"},
|
|
||||||
status_code=405,
|
|
||||||
)
|
|
||||||
return JSONResponse({"error": "not_found"}, status_code=404)
|
|
||||||
|
|
||||||
|
|
||||||
def create_app() -> Starlette:
|
|
||||||
"""Build the read-only MVP Starlette app."""
|
|
||||||
return Starlette(
|
|
||||||
debug=False,
|
|
||||||
routes=[
|
|
||||||
Route("/", home, methods=["GET"]),
|
|
||||||
Route("/health", health, methods=["GET"]),
|
|
||||||
Route("/queue", queue, methods=["GET"]),
|
|
||||||
Route("/api/queue", api_queue, methods=["GET"]),
|
|
||||||
Route("/projects", projects, methods=["GET"]),
|
|
||||||
Route("/projects/{project_id}", project_detail, methods=["GET"]),
|
|
||||||
Route("/api/projects", api_projects, methods=["GET"]),
|
|
||||||
Route("/prompts", prompts, methods=["GET"]),
|
|
||||||
Route("/prompts/{prompt_id}", prompt_detail, methods=["GET"]),
|
|
||||||
Route("/api/prompts", api_prompts, methods=["GET"]),
|
|
||||||
Route("/runtime", runtime, methods=["GET"]),
|
|
||||||
Route("/audit", audit, methods=["GET"]),
|
|
||||||
Route("/worktrees", worktrees, methods=["GET"]),
|
|
||||||
Route("/leases", leases, methods=["GET"]),
|
|
||||||
],
|
|
||||||
exception_handlers={405: method_not_allowed},
|
|
||||||
)
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
{
|
|
||||||
"version": 1,
|
|
||||||
"projects": [
|
|
||||||
{
|
|
||||||
"id": "gitea-tools",
|
|
||||||
"repo_name": "Gitea-Tools",
|
|
||||||
"gitea_owner": "Scaled-Tech-Consulting",
|
|
||||||
"remote_host": "https://gitea.prgs.cc",
|
|
||||||
"default_branch": "master",
|
|
||||||
"local_checkout_path": ".",
|
|
||||||
"profiles": {
|
|
||||||
"author": "prgs-author",
|
|
||||||
"reviewer": "prgs-reviewer",
|
|
||||||
"reconciler": "prgs-reconciler"
|
|
||||||
},
|
|
||||||
"workflow_paths": {
|
|
||||||
"skill": "skills/llm-project-workflow/SKILL.md",
|
|
||||||
"work_issue": "skills/llm-project-workflow/workflows/work-issue.md",
|
|
||||||
"review_merge": "skills/llm-project-workflow/workflows/review-merge-pr.md"
|
|
||||||
},
|
|
||||||
"schema_paths": {
|
|
||||||
"mcp_config_v2": "gitea-mcp.v2-contexts.example.json",
|
|
||||||
"mcp_config_v1": "gitea-mcp.example.json"
|
|
||||||
},
|
|
||||||
"onboarding_checklist": [
|
|
||||||
{
|
|
||||||
"id": "profiles",
|
|
||||||
"title": "Configure execution profiles",
|
|
||||||
"description": "Install author, reviewer, and reconciler MCP profiles (prgs-author, prgs-reviewer, prgs-reconciler) in separate namespaces. Tokens stay in keychain — never in this registry."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "mcp_config",
|
|
||||||
"title": "Wire MCP v2 contexts",
|
|
||||||
"description": "Copy and customize gitea-mcp.v2-contexts.example.json for your machine. Map this repo path under projects with default_owner Scaled-Tech-Consulting and default_repo Gitea-Tools."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "wiki_gate",
|
|
||||||
"title": "Wiki publication readiness",
|
|
||||||
"description": "For wiki-tracked work, satisfy the live Gitea Wiki proof gate (#224) before closing issues. See docs/wiki/Safety-and-Gates.md."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "branches_layout",
|
|
||||||
"title": "Isolate work under branches/",
|
|
||||||
"description": "All LLM task edits happen in worktrees under branches/. Main checkout stays clean; use skills/llm-project-workflow templates for start-issue and review flows."
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
-176
@@ -1,176 +0,0 @@
|
|||||||
"""Shared HTML layout for the internal web UI."""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
NAV_ITEMS = (
|
|
||||||
("/", "Home"),
|
|
||||||
("/queue", "Queue"),
|
|
||||||
("/projects", "Projects"),
|
|
||||||
("/prompts", "Prompts"),
|
|
||||||
("/runtime", "Runtime"),
|
|
||||||
("/audit", "Audit"),
|
|
||||||
("/worktrees", "Worktrees"),
|
|
||||||
("/leases", "Leases"),
|
|
||||||
)
|
|
||||||
|
|
||||||
MVP_NOTICE = (
|
|
||||||
"Read-only MVP — Gitea, MCP tools, and canonical workflows remain the "
|
|
||||||
"source of truth. No mutation endpoints."
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def render_page(*, title: str, body_html: str, extra_head: str = "") -> str:
|
|
||||||
nav_links = "".join(
|
|
||||||
f'<a href="{href}">{label}</a>' for href, label in NAV_ITEMS
|
|
||||||
)
|
|
||||||
return f"""<!DOCTYPE html>
|
|
||||||
<html lang="en">
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8">
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
|
||||||
<title>{title} · MCP Control Plane</title>
|
|
||||||
<style>
|
|
||||||
:root {{
|
|
||||||
--bg: #0f1419;
|
|
||||||
--surface: #1a2332;
|
|
||||||
--text: #e7ecf3;
|
|
||||||
--muted: #8b9cb3;
|
|
||||||
--accent: #5b9fd4;
|
|
||||||
--border: #2a3648;
|
|
||||||
}}
|
|
||||||
* {{ box-sizing: border-box; }}
|
|
||||||
body {{
|
|
||||||
margin: 0;
|
|
||||||
font-family: system-ui, -apple-system, sans-serif;
|
|
||||||
background: var(--bg);
|
|
||||||
color: var(--text);
|
|
||||||
line-height: 1.5;
|
|
||||||
}}
|
|
||||||
header {{
|
|
||||||
background: var(--surface);
|
|
||||||
border-bottom: 1px solid var(--border);
|
|
||||||
padding: 0.75rem 1.25rem;
|
|
||||||
}}
|
|
||||||
header h1 {{
|
|
||||||
margin: 0 0 0.5rem;
|
|
||||||
font-size: 1.1rem;
|
|
||||||
font-weight: 600;
|
|
||||||
}}
|
|
||||||
nav {{
|
|
||||||
display: flex;
|
|
||||||
flex-wrap: wrap;
|
|
||||||
gap: 0.75rem 1rem;
|
|
||||||
}}
|
|
||||||
nav a {{
|
|
||||||
color: var(--accent);
|
|
||||||
text-decoration: none;
|
|
||||||
font-size: 0.9rem;
|
|
||||||
}}
|
|
||||||
nav a:hover {{ text-decoration: underline; }}
|
|
||||||
main {{
|
|
||||||
max-width: 52rem;
|
|
||||||
margin: 0 auto;
|
|
||||||
padding: 1.5rem 1.25rem 2.5rem;
|
|
||||||
}}
|
|
||||||
.notice {{
|
|
||||||
color: var(--muted);
|
|
||||||
font-size: 0.85rem;
|
|
||||||
margin-bottom: 1.25rem;
|
|
||||||
padding: 0.65rem 0.85rem;
|
|
||||||
border: 1px solid var(--border);
|
|
||||||
border-radius: 6px;
|
|
||||||
background: var(--surface);
|
|
||||||
}}
|
|
||||||
h2 {{ margin-top: 0; font-size: 1.35rem; }}
|
|
||||||
p {{ color: var(--muted); }}
|
|
||||||
.stub {{
|
|
||||||
border-left: 3px solid var(--accent);
|
|
||||||
padding-left: 0.85rem;
|
|
||||||
margin: 1rem 0;
|
|
||||||
}}
|
|
||||||
.meta {{ font-size: 0.85rem; }}
|
|
||||||
table.registry, table.detail {{
|
|
||||||
width: 100%;
|
|
||||||
border-collapse: collapse;
|
|
||||||
margin: 1rem 0;
|
|
||||||
font-size: 0.9rem;
|
|
||||||
}}
|
|
||||||
table.registry th, table.registry td,
|
|
||||||
table.detail th, table.detail td {{
|
|
||||||
text-align: left;
|
|
||||||
padding: 0.45rem 0.6rem;
|
|
||||||
border-bottom: 1px solid var(--border);
|
|
||||||
}}
|
|
||||||
table.registry th, table.detail th {{
|
|
||||||
color: var(--muted);
|
|
||||||
font-weight: 500;
|
|
||||||
}}
|
|
||||||
code {{
|
|
||||||
font-family: ui-monospace, monospace;
|
|
||||||
font-size: 0.85em;
|
|
||||||
color: var(--text);
|
|
||||||
}}
|
|
||||||
ol.checklist {{
|
|
||||||
padding-left: 1.25rem;
|
|
||||||
margin: 0.5rem 0 1.5rem;
|
|
||||||
}}
|
|
||||||
ol.checklist li {{ margin-bottom: 0.85rem; }}
|
|
||||||
ol.checklist p {{ margin: 0.25rem 0 0; font-size: 0.9rem; }}
|
|
||||||
.prompt-card {{
|
|
||||||
margin: 1.25rem 0 1.75rem;
|
|
||||||
padding: 1rem 1.1rem;
|
|
||||||
border: 1px solid var(--border);
|
|
||||||
border-radius: 8px;
|
|
||||||
background: var(--surface);
|
|
||||||
}}
|
|
||||||
.prompt-card h3 {{ margin: 0 0 0.5rem; font-size: 1.05rem; }}
|
|
||||||
pre.prompt-text {{
|
|
||||||
white-space: pre-wrap;
|
|
||||||
word-break: break-word;
|
|
||||||
margin: 0.75rem 0;
|
|
||||||
padding: 0.75rem 0.85rem;
|
|
||||||
border-radius: 6px;
|
|
||||||
background: var(--bg);
|
|
||||||
border: 1px solid var(--border);
|
|
||||||
font-size: 0.9rem;
|
|
||||||
color: var(--text);
|
|
||||||
}}
|
|
||||||
.copy-btn {{
|
|
||||||
background: var(--accent);
|
|
||||||
color: #0b1219;
|
|
||||||
border: none;
|
|
||||||
border-radius: 6px;
|
|
||||||
padding: 0.4rem 0.85rem;
|
|
||||||
font-size: 0.85rem;
|
|
||||||
cursor: pointer;
|
|
||||||
}}
|
|
||||||
.copy-btn:hover {{ filter: brightness(1.08); }}
|
|
||||||
.muted {{ color: var(--muted); }}
|
|
||||||
.badges {{ display: inline-flex; flex-wrap: wrap; gap: 0.35rem; margin-left: 0.5rem; }}
|
|
||||||
.badge {{
|
|
||||||
font-size: 0.72rem;
|
|
||||||
padding: 0.1rem 0.45rem;
|
|
||||||
border-radius: 999px;
|
|
||||||
border: 1px solid var(--border);
|
|
||||||
color: var(--muted);
|
|
||||||
text-transform: lowercase;
|
|
||||||
}}
|
|
||||||
.badge-claimed {{ color: #8fd19e; border-color: #3d6b4a; }}
|
|
||||||
.badge-blocked {{ color: #f0a8a8; border-color: #7a3b3b; }}
|
|
||||||
.badge-in-review {{ color: #9ec8f0; border-color: #3d5f7a; }}
|
|
||||||
.badge-duplicate {{ color: #e0c27a; border-color: #6b5730; }}
|
|
||||||
.badge-stale {{ color: #c9b8e8; border-color: #5a4a78; }}
|
|
||||||
</style>
|
|
||||||
{extra_head}
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<header>
|
|
||||||
<h1>MCP Control Plane</h1>
|
|
||||||
<nav>{nav_links}</nav>
|
|
||||||
</header>
|
|
||||||
<main>
|
|
||||||
<p class="notice">{MVP_NOTICE}</p>
|
|
||||||
{body_html}
|
|
||||||
</main>
|
|
||||||
</body>
|
|
||||||
</html>"""
|
|
||||||
@@ -1,196 +0,0 @@
|
|||||||
"""Load and validate the web UI project registry (#427)."""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import json
|
|
||||||
import os
|
|
||||||
from dataclasses import dataclass
|
|
||||||
from pathlib import Path
|
|
||||||
from typing import Any
|
|
||||||
|
|
||||||
_FORBIDDEN_EXACT_KEYS = frozenset({
|
|
||||||
"token",
|
|
||||||
"password",
|
|
||||||
"secret",
|
|
||||||
"credential",
|
|
||||||
"auth",
|
|
||||||
"api_key",
|
|
||||||
"api-key",
|
|
||||||
})
|
|
||||||
_FORBIDDEN_KEY_PREFIXES = ("auth_", "api_key_", "api-key_")
|
|
||||||
_FORBIDDEN_KEY_SUFFIXES = ("_token", "_secret", "_password", "_credential", "_auth")
|
|
||||||
|
|
||||||
|
|
||||||
def _is_forbidden_key(key: str) -> bool:
|
|
||||||
lowered = key.lower()
|
|
||||||
if lowered in _FORBIDDEN_EXACT_KEYS:
|
|
||||||
return True
|
|
||||||
return (
|
|
||||||
lowered.startswith(_FORBIDDEN_KEY_PREFIXES)
|
|
||||||
or lowered.endswith(_FORBIDDEN_KEY_SUFFIXES)
|
|
||||||
)
|
|
||||||
|
|
||||||
_REQUIRED_PROJECT_FIELDS = (
|
|
||||||
"id",
|
|
||||||
"repo_name",
|
|
||||||
"gitea_owner",
|
|
||||||
"remote_host",
|
|
||||||
"default_branch",
|
|
||||||
"local_checkout_path",
|
|
||||||
"profiles",
|
|
||||||
"workflow_paths",
|
|
||||||
)
|
|
||||||
|
|
||||||
_REQUIRED_PROFILE_ROLES = ("author", "reviewer", "reconciler")
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class OnboardingStep:
|
|
||||||
id: str
|
|
||||||
title: str
|
|
||||||
description: str
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class ProjectRecord:
|
|
||||||
id: str
|
|
||||||
repo_name: str
|
|
||||||
gitea_owner: str
|
|
||||||
remote_host: str
|
|
||||||
default_branch: str
|
|
||||||
local_checkout_path: str
|
|
||||||
profiles: dict[str, str]
|
|
||||||
workflow_paths: dict[str, str]
|
|
||||||
schema_paths: dict[str, str]
|
|
||||||
onboarding_checklist: tuple[OnboardingStep, ...]
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class ProjectRegistry:
|
|
||||||
version: int
|
|
||||||
projects: tuple[ProjectRecord, ...]
|
|
||||||
source_path: Path
|
|
||||||
|
|
||||||
|
|
||||||
def default_registry_path() -> Path:
|
|
||||||
override = os.environ.get("WEBUI_PROJECT_REGISTRY", "").strip()
|
|
||||||
if override:
|
|
||||||
return Path(override).expanduser().resolve()
|
|
||||||
return (Path(__file__).resolve().parent / "data" / "projects.registry.json").resolve()
|
|
||||||
|
|
||||||
|
|
||||||
def _reject_credential_keys(obj: Any, *, path: str = "") -> None:
|
|
||||||
if isinstance(obj, dict):
|
|
||||||
for key, value in obj.items():
|
|
||||||
key_path = f"{path}.{key}" if path else key
|
|
||||||
if _is_forbidden_key(key):
|
|
||||||
raise ValueError(f"registry must not store credentials ({key_path})")
|
|
||||||
_reject_credential_keys(value, path=key_path)
|
|
||||||
elif isinstance(obj, list):
|
|
||||||
for index, item in enumerate(obj):
|
|
||||||
_reject_credential_keys(item, path=f"{path}[{index}]")
|
|
||||||
|
|
||||||
|
|
||||||
def _parse_onboarding(raw: list[dict[str, Any]] | None) -> tuple[OnboardingStep, ...]:
|
|
||||||
if not raw:
|
|
||||||
return ()
|
|
||||||
steps: list[OnboardingStep] = []
|
|
||||||
for item in raw:
|
|
||||||
steps.append(
|
|
||||||
OnboardingStep(
|
|
||||||
id=str(item["id"]),
|
|
||||||
title=str(item["title"]),
|
|
||||||
description=str(item["description"]),
|
|
||||||
)
|
|
||||||
)
|
|
||||||
return tuple(steps)
|
|
||||||
|
|
||||||
|
|
||||||
def _parse_project(raw: dict[str, Any]) -> ProjectRecord:
|
|
||||||
missing = [field for field in _REQUIRED_PROJECT_FIELDS if field not in raw]
|
|
||||||
if missing:
|
|
||||||
raise ValueError(f"project missing required fields: {', '.join(missing)}")
|
|
||||||
|
|
||||||
profiles = raw["profiles"]
|
|
||||||
if not isinstance(profiles, dict):
|
|
||||||
raise ValueError("profiles must be an object")
|
|
||||||
for role in _REQUIRED_PROFILE_ROLES:
|
|
||||||
if role not in profiles or not profiles[role]:
|
|
||||||
raise ValueError(f"profiles.{role} is required")
|
|
||||||
|
|
||||||
workflow_paths = raw["workflow_paths"]
|
|
||||||
if not isinstance(workflow_paths, dict) or not workflow_paths:
|
|
||||||
raise ValueError("workflow_paths must be a non-empty object")
|
|
||||||
|
|
||||||
schema_paths = raw.get("schema_paths") or {}
|
|
||||||
if not isinstance(schema_paths, dict):
|
|
||||||
raise ValueError("schema_paths must be an object when present")
|
|
||||||
|
|
||||||
return ProjectRecord(
|
|
||||||
id=str(raw["id"]),
|
|
||||||
repo_name=str(raw["repo_name"]),
|
|
||||||
gitea_owner=str(raw["gitea_owner"]),
|
|
||||||
remote_host=str(raw["remote_host"]),
|
|
||||||
default_branch=str(raw["default_branch"]),
|
|
||||||
local_checkout_path=str(raw["local_checkout_path"]),
|
|
||||||
profiles={role: str(profiles[role]) for role in _REQUIRED_PROFILE_ROLES},
|
|
||||||
workflow_paths={key: str(value) for key, value in workflow_paths.items()},
|
|
||||||
schema_paths={key: str(value) for key, value in schema_paths.items()},
|
|
||||||
onboarding_checklist=_parse_onboarding(raw.get("onboarding_checklist")),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def load_registry(path: Path | None = None) -> ProjectRegistry:
|
|
||||||
"""Load the versioned project registry from disk."""
|
|
||||||
source = (path or default_registry_path()).resolve()
|
|
||||||
raw_text = source.read_text(encoding="utf-8")
|
|
||||||
payload = json.loads(raw_text)
|
|
||||||
if not isinstance(payload, dict):
|
|
||||||
raise ValueError("registry root must be an object")
|
|
||||||
|
|
||||||
version = payload.get("version")
|
|
||||||
if version != 1:
|
|
||||||
raise ValueError(f"unsupported registry version: {version!r}")
|
|
||||||
|
|
||||||
_reject_credential_keys(payload)
|
|
||||||
|
|
||||||
projects_raw = payload.get("projects")
|
|
||||||
if not isinstance(projects_raw, list) or not projects_raw:
|
|
||||||
raise ValueError("projects must be a non-empty array")
|
|
||||||
|
|
||||||
projects = tuple(_parse_project(item) for item in projects_raw)
|
|
||||||
return ProjectRegistry(version=version, projects=projects, source_path=source)
|
|
||||||
|
|
||||||
|
|
||||||
def project_to_dict(project: ProjectRecord) -> dict[str, Any]:
|
|
||||||
"""Serialize a project for JSON API responses."""
|
|
||||||
return {
|
|
||||||
"id": project.id,
|
|
||||||
"repo_name": project.repo_name,
|
|
||||||
"gitea_owner": project.gitea_owner,
|
|
||||||
"remote_host": project.remote_host,
|
|
||||||
"default_branch": project.default_branch,
|
|
||||||
"local_checkout_path": project.local_checkout_path,
|
|
||||||
"profiles": dict(project.profiles),
|
|
||||||
"workflow_paths": dict(project.workflow_paths),
|
|
||||||
"schema_paths": dict(project.schema_paths),
|
|
||||||
"onboarding_checklist": [
|
|
||||||
{"id": step.id, "title": step.title, "description": step.description}
|
|
||||||
for step in project.onboarding_checklist
|
|
||||||
],
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def registry_to_dict(registry: ProjectRegistry) -> dict[str, Any]:
|
|
||||||
return {
|
|
||||||
"version": registry.version,
|
|
||||||
"source_path": str(registry.source_path),
|
|
||||||
"projects": [project_to_dict(project) for project in registry.projects],
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def find_project(registry: ProjectRegistry, project_id: str) -> ProjectRecord | None:
|
|
||||||
for project in registry.projects:
|
|
||||||
if project.id == project_id:
|
|
||||||
return project
|
|
||||||
return None
|
|
||||||
@@ -1,93 +0,0 @@
|
|||||||
"""HTML views for project registry pages (#427)."""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import html
|
|
||||||
|
|
||||||
from webui.layout import render_page
|
|
||||||
from webui.project_registry import ProjectRecord, ProjectRegistry
|
|
||||||
|
|
||||||
|
|
||||||
def _escape(text: str) -> str:
|
|
||||||
return html.escape(text, quote=True)
|
|
||||||
|
|
||||||
|
|
||||||
def render_projects_list(registry: ProjectRegistry) -> str:
|
|
||||||
rows = []
|
|
||||||
for project in registry.projects:
|
|
||||||
rows.append(
|
|
||||||
"<tr>"
|
|
||||||
f"<td><a href=\"/projects/{_escape(project.id)}\">{_escape(project.repo_name)}</a></td>"
|
|
||||||
f"<td>{_escape(project.gitea_owner)}</td>"
|
|
||||||
f"<td>{_escape(project.remote_host)}</td>"
|
|
||||||
f"<td>{_escape(project.default_branch)}</td>"
|
|
||||||
f"<td><code>{_escape(project.profiles['author'])}</code></td>"
|
|
||||||
"</tr>"
|
|
||||||
)
|
|
||||||
table = (
|
|
||||||
"<table class=\"registry\">"
|
|
||||||
"<thead><tr>"
|
|
||||||
"<th>Repository</th><th>Owner</th><th>Remote</th>"
|
|
||||||
"<th>Branch</th><th>Author profile</th>"
|
|
||||||
"</tr></thead>"
|
|
||||||
f"<tbody>{''.join(rows)}</tbody></table>"
|
|
||||||
)
|
|
||||||
body = (
|
|
||||||
"<h2>Projects</h2>"
|
|
||||||
"<p>Configured repositories managed by the MCP Control Plane.</p>"
|
|
||||||
f"<p class=\"meta\">Registry: <code>{_escape(str(registry.source_path))}</code> "
|
|
||||||
f"(version {registry.version})</p>"
|
|
||||||
f"{table}"
|
|
||||||
"<p><a href=\"/api/projects\">JSON API</a></p>"
|
|
||||||
)
|
|
||||||
return render_page(title="Projects", body_html=body)
|
|
||||||
|
|
||||||
|
|
||||||
def render_project_detail(project: ProjectRecord) -> str:
|
|
||||||
profile_rows = "".join(
|
|
||||||
f"<tr><th>{_escape(role)}</th><td><code>{_escape(name)}</code></td></tr>"
|
|
||||||
for role, name in project.profiles.items()
|
|
||||||
)
|
|
||||||
workflow_rows = "".join(
|
|
||||||
f"<tr><th>{_escape(key)}</th><td><code>{_escape(path)}</code></td></tr>"
|
|
||||||
for key, path in project.workflow_paths.items()
|
|
||||||
)
|
|
||||||
schema_rows = "".join(
|
|
||||||
f"<tr><th>{_escape(key)}</th><td><code>{_escape(path)}</code></td></tr>"
|
|
||||||
for key, path in project.schema_paths.items()
|
|
||||||
)
|
|
||||||
checklist_items = []
|
|
||||||
for index, step in enumerate(project.onboarding_checklist, start=1):
|
|
||||||
checklist_items.append(
|
|
||||||
"<li>"
|
|
||||||
f"<strong>{index}. {_escape(step.title)}</strong>"
|
|
||||||
f"<p>{_escape(step.description)}</p>"
|
|
||||||
"</li>"
|
|
||||||
)
|
|
||||||
checklist_html = (
|
|
||||||
"<ol class=\"checklist\">" + "".join(checklist_items) + "</ol>"
|
|
||||||
if checklist_items
|
|
||||||
else "<p>No onboarding steps defined.</p>"
|
|
||||||
)
|
|
||||||
body = (
|
|
||||||
f"<h2>{_escape(project.repo_name)}</h2>"
|
|
||||||
"<p><a href=\"/projects\">← All projects</a></p>"
|
|
||||||
"<h3>Identity</h3>"
|
|
||||||
"<table class=\"detail\">"
|
|
||||||
f"<tr><th>Registry id</th><td><code>{_escape(project.id)}</code></td></tr>"
|
|
||||||
f"<tr><th>Gitea owner</th><td>{_escape(project.gitea_owner)}</td></tr>"
|
|
||||||
f"<tr><th>Remote host</th><td>{_escape(project.remote_host)}</td></tr>"
|
|
||||||
f"<tr><th>Default branch</th><td><code>{_escape(project.default_branch)}</code></td></tr>"
|
|
||||||
f"<tr><th>Local checkout</th><td><code>{_escape(project.local_checkout_path)}</code></td></tr>"
|
|
||||||
"</table>"
|
|
||||||
"<h3>Profiles</h3>"
|
|
||||||
f"<table class=\"detail\">{profile_rows}</table>"
|
|
||||||
"<h3>Workflow paths</h3>"
|
|
||||||
f"<table class=\"detail\">{workflow_rows}</table>"
|
|
||||||
"<h3>Schema paths</h3>"
|
|
||||||
f"<table class=\"detail\">{schema_rows}</table>"
|
|
||||||
"<h3>Onboarding checklist</h3>"
|
|
||||||
"<p class=\"meta\">Read-only MVP — complete these steps outside the UI.</p>"
|
|
||||||
f"{checklist_html}"
|
|
||||||
)
|
|
||||||
return render_page(title=project.repo_name, body_html=body)
|
|
||||||
@@ -1,197 +0,0 @@
|
|||||||
"""Canonical workflow prompt library for the internal web UI (#428)."""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import hashlib
|
|
||||||
import os
|
|
||||||
import re
|
|
||||||
from dataclasses import dataclass
|
|
||||||
from pathlib import Path
|
|
||||||
from typing import Any
|
|
||||||
|
|
||||||
_WORKFLOW_ROOT = Path("skills/llm-project-workflow/workflows")
|
|
||||||
|
|
||||||
_DEFAULT_PROMPT_RE = re.compile(
|
|
||||||
r"\*\*Default task prompt:\*\*\s*\n+>\s*(.+?)(?=\n\n|\nDo not improvise)",
|
|
||||||
re.DOTALL,
|
|
||||||
)
|
|
||||||
_FRONTMATTER_TASK_MODE_RE = re.compile(r"^task_mode:\s*(\S+)", re.MULTILINE)
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class PromptEntry:
|
|
||||||
slug: str
|
|
||||||
label: str
|
|
||||||
prompt_text: str
|
|
||||||
workflow_path: str
|
|
||||||
task_mode: str | None
|
|
||||||
workflow_hash: str | None
|
|
||||||
source_note: str
|
|
||||||
|
|
||||||
|
|
||||||
def _repo_root() -> Path:
|
|
||||||
override = (os.environ.get("WEBUI_REPO_ROOT") or "").strip()
|
|
||||||
if override:
|
|
||||||
return Path(override).resolve()
|
|
||||||
return Path(__file__).resolve().parent.parent
|
|
||||||
|
|
||||||
|
|
||||||
def _workflow_file(path: str) -> Path:
|
|
||||||
return _repo_root() / path
|
|
||||||
|
|
||||||
|
|
||||||
def _sha256_hex(content: str) -> str:
|
|
||||||
return hashlib.sha256(content.encode("utf-8")).hexdigest()
|
|
||||||
|
|
||||||
|
|
||||||
def _read_workflow(path: str) -> tuple[str, str]:
|
|
||||||
file_path = _workflow_file(path)
|
|
||||||
text = file_path.read_text(encoding="utf-8")
|
|
||||||
return text, _sha256_hex(text)
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_default_prompt(markdown: str) -> str | None:
|
|
||||||
match = _DEFAULT_PROMPT_RE.search(markdown)
|
|
||||||
if not match:
|
|
||||||
return None
|
|
||||||
lines = [line.strip() for line in match.group(1).splitlines()]
|
|
||||||
return " ".join(line for line in lines if line)
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_task_mode(markdown: str) -> str | None:
|
|
||||||
match = _FRONTMATTER_TASK_MODE_RE.search(markdown)
|
|
||||||
return match.group(1) if match else None
|
|
||||||
|
|
||||||
|
|
||||||
def _entry_from_workflow(
|
|
||||||
*,
|
|
||||||
slug: str,
|
|
||||||
label: str,
|
|
||||||
workflow_path: str,
|
|
||||||
prompt_override: str | None = None,
|
|
||||||
source_note: str = "",
|
|
||||||
) -> PromptEntry:
|
|
||||||
markdown, digest = _read_workflow(workflow_path)
|
|
||||||
prompt_text = prompt_override or _extract_default_prompt(markdown)
|
|
||||||
if not prompt_text:
|
|
||||||
raise ValueError(f"No default task prompt found in {workflow_path}")
|
|
||||||
return PromptEntry(
|
|
||||||
slug=slug,
|
|
||||||
label=label,
|
|
||||||
prompt_text=prompt_text,
|
|
||||||
workflow_path=workflow_path,
|
|
||||||
task_mode=_extract_task_mode(markdown),
|
|
||||||
workflow_hash=digest,
|
|
||||||
source_note=source_note,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def _static_entry(
|
|
||||||
*,
|
|
||||||
slug: str,
|
|
||||||
label: str,
|
|
||||||
prompt_text: str,
|
|
||||||
workflow_path: str,
|
|
||||||
source_note: str,
|
|
||||||
) -> PromptEntry:
|
|
||||||
path = _workflow_file(workflow_path)
|
|
||||||
digest = _sha256_hex(path.read_text(encoding="utf-8")) if path.is_file() else None
|
|
||||||
markdown = path.read_text(encoding="utf-8") if path.is_file() else ""
|
|
||||||
return PromptEntry(
|
|
||||||
slug=slug,
|
|
||||||
label=label,
|
|
||||||
prompt_text=prompt_text,
|
|
||||||
workflow_path=workflow_path,
|
|
||||||
task_mode=_extract_task_mode(markdown) if markdown else None,
|
|
||||||
workflow_hash=digest,
|
|
||||||
source_note=source_note,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def load_prompt_library() -> tuple[PromptEntry, ...]:
|
|
||||||
"""Load operator prompts derived from canonical workflows."""
|
|
||||||
entries = (
|
|
||||||
_entry_from_workflow(
|
|
||||||
slug="review-pr",
|
|
||||||
label="Review PR",
|
|
||||||
workflow_path=str(_WORKFLOW_ROOT / "review-merge-pr.md"),
|
|
||||||
),
|
|
||||||
_entry_from_workflow(
|
|
||||||
slug="work-issue",
|
|
||||||
label="Work issue",
|
|
||||||
workflow_path=str(_WORKFLOW_ROOT / "work-issue.md"),
|
|
||||||
),
|
|
||||||
_entry_from_workflow(
|
|
||||||
slug="create-issue",
|
|
||||||
label="Create issue",
|
|
||||||
workflow_path=str(_WORKFLOW_ROOT / "create-issue.md"),
|
|
||||||
),
|
|
||||||
_static_entry(
|
|
||||||
slug="comment-issue",
|
|
||||||
label="Comment on issue",
|
|
||||||
workflow_path=str(_WORKFLOW_ROOT / "create-issue.md"),
|
|
||||||
prompt_text=(
|
|
||||||
"Comment on the target Gitea issue only if exact comment_issue "
|
|
||||||
"capability is proven. Load the canonical create-issue workflow "
|
|
||||||
"first and follow §16 (comment-on-existing issue rule). Include "
|
|
||||||
"specific evidence; do not duplicate existing comments."
|
|
||||||
),
|
|
||||||
source_note="Derived from create-issue.md §16; full policy remains in the workflow file.",
|
|
||||||
),
|
|
||||||
_static_entry(
|
|
||||||
slug="cleanup",
|
|
||||||
label="Post-merge cleanup",
|
|
||||||
workflow_path="skills/llm-project-workflow/templates/worktree-cleanup.md",
|
|
||||||
prompt_text=(
|
|
||||||
"Task: clean up branch/worktree for PR #<pr> / issue #<n> after merge. "
|
|
||||||
"Confirm the merge on remote master before any deletion; never "
|
|
||||||
"force-remove a dirty worktree."
|
|
||||||
),
|
|
||||||
source_note="Full cleanup steps live in templates/worktree-cleanup.md.",
|
|
||||||
),
|
|
||||||
_entry_from_workflow(
|
|
||||||
slug="audit",
|
|
||||||
label="Reconciliation audit",
|
|
||||||
workflow_path=str(_WORKFLOW_ROOT / "reconcile-landed-pr.md"),
|
|
||||||
),
|
|
||||||
_static_entry(
|
|
||||||
slug="onboarding",
|
|
||||||
label="Project onboarding",
|
|
||||||
workflow_path="skills/llm-project-workflow/SKILL.md",
|
|
||||||
prompt_text=(
|
|
||||||
"Onboard this repository into the MCP Control Plane: prove identity "
|
|
||||||
"and task capability, configure author/reviewer/reconciler profiles "
|
|
||||||
"in separate namespaces, then complete the checklist at /projects. "
|
|
||||||
"Canonical router: skills/llm-project-workflow/SKILL.md."
|
|
||||||
),
|
|
||||||
source_note="Checklist details live in webui/data/projects.registry.json and /projects.",
|
|
||||||
),
|
|
||||||
)
|
|
||||||
return entries
|
|
||||||
|
|
||||||
|
|
||||||
def find_prompt(slug: str) -> PromptEntry | None:
|
|
||||||
for entry in load_prompt_library():
|
|
||||||
if entry.slug == slug:
|
|
||||||
return entry
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def prompt_to_dict(entry: PromptEntry) -> dict[str, Any]:
|
|
||||||
return {
|
|
||||||
"slug": entry.slug,
|
|
||||||
"label": entry.label,
|
|
||||||
"prompt_text": entry.prompt_text,
|
|
||||||
"workflow_path": entry.workflow_path,
|
|
||||||
"task_mode": entry.task_mode,
|
|
||||||
"workflow_hash": entry.workflow_hash,
|
|
||||||
"source_note": entry.source_note,
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def library_to_dict() -> dict[str, Any]:
|
|
||||||
entries = load_prompt_library()
|
|
||||||
return {
|
|
||||||
"count": len(entries),
|
|
||||||
"prompts": [prompt_to_dict(entry) for entry in entries],
|
|
||||||
}
|
|
||||||
@@ -1,87 +0,0 @@
|
|||||||
"""HTML views for the prompt library (#428)."""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import html
|
|
||||||
|
|
||||||
from webui.layout import render_page
|
|
||||||
from webui.prompt_library import PromptEntry, load_prompt_library
|
|
||||||
|
|
||||||
|
|
||||||
def _escape(text: str) -> str:
|
|
||||||
return html.escape(text, quote=True)
|
|
||||||
|
|
||||||
|
|
||||||
def _render_prompt_card(entry: PromptEntry) -> str:
|
|
||||||
hash_short = (
|
|
||||||
f"<code>{_escape(entry.workflow_hash[:12])}</code>"
|
|
||||||
if entry.workflow_hash
|
|
||||||
else "<span class=\"muted\">n/a</span>"
|
|
||||||
)
|
|
||||||
task_mode = (
|
|
||||||
f"<code>{_escape(entry.task_mode)}</code>"
|
|
||||||
if entry.task_mode
|
|
||||||
else "<span class=\"muted\">n/a</span>"
|
|
||||||
)
|
|
||||||
note = (
|
|
||||||
f'<p class="meta">{_escape(entry.source_note)}</p>'
|
|
||||||
if entry.source_note
|
|
||||||
else ""
|
|
||||||
)
|
|
||||||
prompt_id = f"prompt-{entry.slug}"
|
|
||||||
return (
|
|
||||||
f'<section class="prompt-card" id="{_escape(entry.slug)}">'
|
|
||||||
f"<h3>{_escape(entry.label)}</h3>"
|
|
||||||
f'<p class="meta">Workflow: <code>{_escape(entry.workflow_path)}</code> · '
|
|
||||||
f"task_mode: {task_mode} · sha256: {hash_short}</p>"
|
|
||||||
f'<pre class="prompt-text" id="{prompt_id}">{_escape(entry.prompt_text)}</pre>'
|
|
||||||
f'<button type="button" class="copy-btn" data-copy-target="{prompt_id}">'
|
|
||||||
"Copy prompt</button>"
|
|
||||||
f"{note}"
|
|
||||||
"</section>"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
PROMPT_PAGE_SCRIPT = """
|
|
||||||
<script>
|
|
||||||
document.querySelectorAll('.copy-btn').forEach((btn) => {
|
|
||||||
btn.addEventListener('click', async () => {
|
|
||||||
const targetId = btn.getAttribute('data-copy-target');
|
|
||||||
const node = document.getElementById(targetId);
|
|
||||||
if (!node) return;
|
|
||||||
const text = node.textContent || '';
|
|
||||||
try {
|
|
||||||
await navigator.clipboard.writeText(text);
|
|
||||||
const prior = btn.textContent;
|
|
||||||
btn.textContent = 'Copied';
|
|
||||||
setTimeout(() => { btn.textContent = prior; }, 1200);
|
|
||||||
} catch (_err) {
|
|
||||||
btn.textContent = 'Copy failed';
|
|
||||||
}
|
|
||||||
});
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
"""
|
|
||||||
|
|
||||||
|
|
||||||
def render_prompts_page() -> str:
|
|
||||||
entries = load_prompt_library()
|
|
||||||
cards = "".join(_render_prompt_card(entry) for entry in entries)
|
|
||||||
body = (
|
|
||||||
"<h2>Prompt library</h2>"
|
|
||||||
"<p>Short copy/paste task prompts derived from canonical workflows. "
|
|
||||||
"Full policy remains in the cited workflow files — not duplicated here.</p>"
|
|
||||||
f"{cards}"
|
|
||||||
"<p><a href=\"/api/prompts\">JSON API</a></p>"
|
|
||||||
f"{PROMPT_PAGE_SCRIPT}"
|
|
||||||
)
|
|
||||||
return render_page(title="Prompts", body_html=body)
|
|
||||||
|
|
||||||
|
|
||||||
def render_prompt_detail(entry: PromptEntry) -> str:
|
|
||||||
body = (
|
|
||||||
f"<p><a href=\"/prompts\">← All prompts</a></p>"
|
|
||||||
f"{_render_prompt_card(entry)}"
|
|
||||||
f"{PROMPT_PAGE_SCRIPT}"
|
|
||||||
)
|
|
||||||
return render_page(title=entry.label, body_html=body)
|
|
||||||
@@ -1,385 +0,0 @@
|
|||||||
"""Load live Gitea PR/issue queue state for the web UI dashboard (#429)."""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import re
|
|
||||||
from dataclasses import dataclass
|
|
||||||
from datetime import datetime, timezone
|
|
||||||
from typing import Any, Callable
|
|
||||||
from urllib.parse import urlparse
|
|
||||||
|
|
||||||
from gitea_auth import api_fetch_page, get_auth_header, repo_api_url
|
|
||||||
|
|
||||||
from webui.project_registry import ProjectRecord, load_registry
|
|
||||||
|
|
||||||
_CLOSES_RE = re.compile(r"(?:closes|fixes|resolves)\s+#(\d+)", re.I)
|
|
||||||
_ISSUE_REF_RE = re.compile(r"#(\d+)")
|
|
||||||
_STALE_DAYS = 14
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class PaginationMeta:
|
|
||||||
page: int
|
|
||||||
per_page: int
|
|
||||||
returned_count: int
|
|
||||||
has_more: bool
|
|
||||||
is_final_page: bool
|
|
||||||
inventory_complete: bool
|
|
||||||
pages_fetched: int
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class QueueItem:
|
|
||||||
number: int
|
|
||||||
title: str
|
|
||||||
badges: tuple[str, ...]
|
|
||||||
extra: dict[str, str]
|
|
||||||
|
|
||||||
|
|
||||||
@dataclass(frozen=True)
|
|
||||||
class QueueSnapshot:
|
|
||||||
project_id: str
|
|
||||||
repo_label: str
|
|
||||||
prs: tuple[QueueItem, ...]
|
|
||||||
issues: tuple[QueueItem, ...]
|
|
||||||
pr_pagination: PaginationMeta | None
|
|
||||||
issue_pagination: PaginationMeta | None
|
|
||||||
fetch_error: str | None = None
|
|
||||||
|
|
||||||
|
|
||||||
def _host_from_url(remote_host: str) -> str:
|
|
||||||
parsed = urlparse(remote_host.strip())
|
|
||||||
return parsed.netloc or remote_host.strip().rstrip("/")
|
|
||||||
|
|
||||||
|
|
||||||
def _extract_linked_issue(title: str | None, body: str | None = None) -> int | None:
|
|
||||||
for text in (title, body):
|
|
||||||
if not text:
|
|
||||||
continue
|
|
||||||
match = _CLOSES_RE.search(text)
|
|
||||||
if match:
|
|
||||||
return int(match.group(1))
|
|
||||||
if body:
|
|
||||||
refs = _ISSUE_REF_RE.findall(body)
|
|
||||||
if refs:
|
|
||||||
return int(refs[0])
|
|
||||||
return None
|
|
||||||
|
|
||||||
|
|
||||||
def _is_stale(updated_at: str | None) -> bool:
|
|
||||||
if not updated_at:
|
|
||||||
return False
|
|
||||||
try:
|
|
||||||
normalized = updated_at.replace("Z", "+00:00")
|
|
||||||
parsed = datetime.fromisoformat(normalized)
|
|
||||||
if parsed.tzinfo is None:
|
|
||||||
parsed = parsed.replace(tzinfo=timezone.utc)
|
|
||||||
age = datetime.now(timezone.utc) - parsed.astimezone(timezone.utc)
|
|
||||||
return age.days >= _STALE_DAYS
|
|
||||||
except ValueError:
|
|
||||||
return False
|
|
||||||
|
|
||||||
|
|
||||||
def _classify_pr(
|
|
||||||
pr: dict,
|
|
||||||
*,
|
|
||||||
issue_claimed: set[int],
|
|
||||||
issue_to_prs: dict[int, list[int]],
|
|
||||||
) -> tuple[str, ...]:
|
|
||||||
badges: list[str] = []
|
|
||||||
mergeable = pr.get("mergeable")
|
|
||||||
if mergeable is False:
|
|
||||||
badges.append("blocked")
|
|
||||||
linked = _extract_linked_issue(pr.get("title"), pr.get("body"))
|
|
||||||
if linked is not None:
|
|
||||||
if linked in issue_claimed:
|
|
||||||
badges.append("claimed")
|
|
||||||
if len(issue_to_prs.get(linked, [])) > 1:
|
|
||||||
badges.append("duplicate")
|
|
||||||
if _is_stale(pr.get("updated_at")):
|
|
||||||
badges.append("stale")
|
|
||||||
if mergeable is True and "blocked" not in badges:
|
|
||||||
badges.append("in-review")
|
|
||||||
if not badges:
|
|
||||||
badges.append("open")
|
|
||||||
return tuple(dict.fromkeys(badges))
|
|
||||||
|
|
||||||
|
|
||||||
def _classify_issue(
|
|
||||||
issue: dict,
|
|
||||||
*,
|
|
||||||
linked_prs: list[int],
|
|
||||||
) -> tuple[str, ...]:
|
|
||||||
badges: list[str] = []
|
|
||||||
labels = [lb.get("name", "") for lb in issue.get("labels", [])]
|
|
||||||
if "status:in-progress" in labels:
|
|
||||||
badges.append("claimed")
|
|
||||||
if len(linked_prs) > 1:
|
|
||||||
badges.append("duplicate")
|
|
||||||
elif linked_prs and "claimed" not in badges:
|
|
||||||
badges.append("in-review")
|
|
||||||
if _is_stale(issue.get("updated_at")):
|
|
||||||
badges.append("stale")
|
|
||||||
if not badges:
|
|
||||||
badges.append("open")
|
|
||||||
return tuple(dict.fromkeys(badges))
|
|
||||||
|
|
||||||
|
|
||||||
def _format_pr_item(pr: dict, badges: tuple[str, ...]) -> QueueItem:
|
|
||||||
head = pr.get("head") or {}
|
|
||||||
base = pr.get("base") or {}
|
|
||||||
mergeable = pr.get("mergeable")
|
|
||||||
merge_label = (
|
|
||||||
"mergeable" if mergeable is True else "conflicted" if mergeable is False else "unknown"
|
|
||||||
)
|
|
||||||
linked = _extract_linked_issue(pr.get("title"), pr.get("body"))
|
|
||||||
return QueueItem(
|
|
||||||
number=int(pr["number"]),
|
|
||||||
title=str(pr.get("title") or ""),
|
|
||||||
badges=badges,
|
|
||||||
extra={
|
|
||||||
"branch": f"{head.get('ref', '?')} → {base.get('ref', '?')}",
|
|
||||||
"head_sha": str(head.get("sha") or "")[:12],
|
|
||||||
"mergeable": merge_label,
|
|
||||||
"linked_issue": str(linked) if linked is not None else "",
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def _format_issue_item(issue: dict, badges: tuple[str, ...]) -> QueueItem:
|
|
||||||
labels = ", ".join(lb.get("name", "") for lb in issue.get("labels", []))
|
|
||||||
assignee = (issue.get("assignee") or {}).get("login", "")
|
|
||||||
return QueueItem(
|
|
||||||
number=int(issue["number"]),
|
|
||||||
title=str(issue.get("title") or ""),
|
|
||||||
badges=badges,
|
|
||||||
extra={
|
|
||||||
"labels": labels or "—",
|
|
||||||
"assignee": assignee or "unassigned",
|
|
||||||
"state": str(issue.get("state") or ""),
|
|
||||||
},
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def _pagination_from_pages(
|
|
||||||
*,
|
|
||||||
per_page: int,
|
|
||||||
pages_fetched: int,
|
|
||||||
returned_count: int,
|
|
||||||
is_final_page: bool,
|
|
||||||
) -> PaginationMeta:
|
|
||||||
return PaginationMeta(
|
|
||||||
page=1,
|
|
||||||
per_page=per_page,
|
|
||||||
returned_count=returned_count,
|
|
||||||
has_more=not is_final_page,
|
|
||||||
is_final_page=is_final_page,
|
|
||||||
inventory_complete=is_final_page,
|
|
||||||
pages_fetched=pages_fetched,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def _fetch_prs(
|
|
||||||
host: str,
|
|
||||||
org: str,
|
|
||||||
repo: str,
|
|
||||||
auth: str,
|
|
||||||
*,
|
|
||||||
per_page: int = 50,
|
|
||||||
) -> tuple[list[dict], PaginationMeta]:
|
|
||||||
url = f"{repo_api_url(host, org, repo)}/pulls?state=open"
|
|
||||||
all_raw: list[dict] = []
|
|
||||||
pages_fetched = 0
|
|
||||||
is_final = False
|
|
||||||
page = 1
|
|
||||||
while pages_fetched < 20:
|
|
||||||
raw_page, meta = api_fetch_page(url, auth, page=page, limit=per_page)
|
|
||||||
pages_fetched += 1
|
|
||||||
all_raw.extend(raw_page)
|
|
||||||
is_final = bool(meta["is_final_page"])
|
|
||||||
if is_final:
|
|
||||||
break
|
|
||||||
page += 1
|
|
||||||
pagination = _pagination_from_pages(
|
|
||||||
per_page=per_page,
|
|
||||||
pages_fetched=pages_fetched,
|
|
||||||
returned_count=len(all_raw),
|
|
||||||
is_final_page=is_final,
|
|
||||||
)
|
|
||||||
return all_raw, pagination
|
|
||||||
|
|
||||||
|
|
||||||
def _fetch_issues(
|
|
||||||
host: str,
|
|
||||||
org: str,
|
|
||||||
repo: str,
|
|
||||||
auth: str,
|
|
||||||
*,
|
|
||||||
per_page: int = 50,
|
|
||||||
) -> tuple[list[dict], PaginationMeta]:
|
|
||||||
url = f"{repo_api_url(host, org, repo)}/issues?state=open&type=issues"
|
|
||||||
all_raw: list[dict] = []
|
|
||||||
page = 1
|
|
||||||
pages_fetched = 0
|
|
||||||
is_final = False
|
|
||||||
while pages_fetched < 20:
|
|
||||||
raw_page, meta = api_fetch_page(url, auth, page=page, limit=per_page)
|
|
||||||
pages_fetched += 1
|
|
||||||
all_raw.extend(raw_page)
|
|
||||||
is_final = bool(meta["is_final_page"])
|
|
||||||
if is_final:
|
|
||||||
break
|
|
||||||
page += 1
|
|
||||||
pagination = _pagination_from_pages(
|
|
||||||
per_page=per_page,
|
|
||||||
pages_fetched=pages_fetched,
|
|
||||||
returned_count=len(all_raw),
|
|
||||||
is_final_page=is_final,
|
|
||||||
)
|
|
||||||
return all_raw, pagination
|
|
||||||
|
|
||||||
|
|
||||||
def load_queue_snapshot(
|
|
||||||
project_id: str | None = None,
|
|
||||||
*,
|
|
||||||
fetch_prs: Callable[..., tuple[list[dict], PaginationMeta]] | None = None,
|
|
||||||
fetch_issues: Callable[..., tuple[list[dict], PaginationMeta]] | None = None,
|
|
||||||
) -> QueueSnapshot:
|
|
||||||
"""Load open PR and issue queues for a registry project (default: first entry)."""
|
|
||||||
registry = load_registry()
|
|
||||||
project: ProjectRecord | None = None
|
|
||||||
if project_id:
|
|
||||||
for entry in registry.projects:
|
|
||||||
if entry.id == project_id:
|
|
||||||
project = entry
|
|
||||||
break
|
|
||||||
else:
|
|
||||||
project = registry.projects[0] if registry.projects else None
|
|
||||||
|
|
||||||
if project is None:
|
|
||||||
return QueueSnapshot(
|
|
||||||
project_id=project_id or "",
|
|
||||||
repo_label="",
|
|
||||||
prs=(),
|
|
||||||
issues=(),
|
|
||||||
pr_pagination=None,
|
|
||||||
issue_pagination=None,
|
|
||||||
fetch_error="project not found in registry",
|
|
||||||
)
|
|
||||||
|
|
||||||
host = _host_from_url(project.remote_host)
|
|
||||||
pr_fetch = fetch_prs or _fetch_prs
|
|
||||||
issue_fetch = fetch_issues or _fetch_issues
|
|
||||||
using_live_fetch = fetch_prs is None or fetch_issues is None
|
|
||||||
auth = get_auth_header(host) if using_live_fetch else "test-auth"
|
|
||||||
if using_live_fetch and not auth:
|
|
||||||
return QueueSnapshot(
|
|
||||||
project_id=project.id,
|
|
||||||
repo_label=f"{project.gitea_owner}/{project.repo_name}",
|
|
||||||
prs=(),
|
|
||||||
issues=(),
|
|
||||||
pr_pagination=None,
|
|
||||||
issue_pagination=None,
|
|
||||||
fetch_error=(
|
|
||||||
f"Gitea credentials unavailable for {host}; "
|
|
||||||
"queue cannot be loaded (fail closed — not showing empty queue)"
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
try:
|
|
||||||
raw_prs, pr_pagination = pr_fetch(
|
|
||||||
host, project.gitea_owner, project.repo_name, auth
|
|
||||||
)
|
|
||||||
raw_issues, issue_pagination = issue_fetch(
|
|
||||||
host, project.gitea_owner, project.repo_name, auth
|
|
||||||
)
|
|
||||||
except Exception as exc: # noqa: BLE001 — surface operator-visible fetch errors
|
|
||||||
return QueueSnapshot(
|
|
||||||
project_id=project.id,
|
|
||||||
repo_label=f"{project.gitea_owner}/{project.repo_name}",
|
|
||||||
prs=(),
|
|
||||||
issues=(),
|
|
||||||
pr_pagination=None,
|
|
||||||
issue_pagination=None,
|
|
||||||
fetch_error=f"Gitea fetch failed: {exc}",
|
|
||||||
)
|
|
||||||
|
|
||||||
issue_to_prs: dict[int, list[int]] = {}
|
|
||||||
for pr in raw_prs:
|
|
||||||
linked = _extract_linked_issue(pr.get("title"), pr.get("body"))
|
|
||||||
if linked is not None:
|
|
||||||
issue_to_prs.setdefault(linked, []).append(int(pr["number"]))
|
|
||||||
|
|
||||||
issue_claimed = {
|
|
||||||
int(i["number"])
|
|
||||||
for i in raw_issues
|
|
||||||
if any(lb.get("name") == "status:in-progress" for lb in i.get("labels", []))
|
|
||||||
}
|
|
||||||
|
|
||||||
pr_items = tuple(
|
|
||||||
_format_pr_item(
|
|
||||||
pr,
|
|
||||||
_classify_pr(
|
|
||||||
pr,
|
|
||||||
issue_claimed=issue_claimed,
|
|
||||||
issue_to_prs=issue_to_prs,
|
|
||||||
),
|
|
||||||
)
|
|
||||||
for pr in sorted(raw_prs, key=lambda p: int(p["number"]), reverse=True)
|
|
||||||
)
|
|
||||||
issue_items = tuple(
|
|
||||||
_format_issue_item(
|
|
||||||
issue,
|
|
||||||
_classify_issue(
|
|
||||||
issue,
|
|
||||||
linked_prs=issue_to_prs.get(int(issue["number"]), []),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
for issue in sorted(raw_issues, key=lambda i: int(i["number"]), reverse=True)
|
|
||||||
)
|
|
||||||
|
|
||||||
return QueueSnapshot(
|
|
||||||
project_id=project.id,
|
|
||||||
repo_label=f"{project.gitea_owner}/{project.repo_name}",
|
|
||||||
prs=pr_items,
|
|
||||||
issues=issue_items,
|
|
||||||
pr_pagination=pr_pagination,
|
|
||||||
issue_pagination=issue_pagination,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def snapshot_to_dict(snapshot: QueueSnapshot) -> dict[str, Any]:
|
|
||||||
"""JSON-serializable export for /api/queue."""
|
|
||||||
|
|
||||||
def _page(meta: PaginationMeta | None) -> dict[str, Any] | None:
|
|
||||||
if meta is None:
|
|
||||||
return None
|
|
||||||
return {
|
|
||||||
"page": meta.page,
|
|
||||||
"per_page": meta.per_page,
|
|
||||||
"returned_count": meta.returned_count,
|
|
||||||
"has_more": meta.has_more,
|
|
||||||
"is_final_page": meta.is_final_page,
|
|
||||||
"inventory_complete": meta.inventory_complete,
|
|
||||||
"pages_fetched": meta.pages_fetched,
|
|
||||||
}
|
|
||||||
|
|
||||||
def _item(item: QueueItem) -> dict[str, Any]:
|
|
||||||
return {
|
|
||||||
"number": item.number,
|
|
||||||
"title": item.title,
|
|
||||||
"badges": list(item.badges),
|
|
||||||
**item.extra,
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
"project_id": snapshot.project_id,
|
|
||||||
"repo": snapshot.repo_label,
|
|
||||||
"fetch_error": snapshot.fetch_error,
|
|
||||||
"prs": [_item(p) for p in snapshot.prs],
|
|
||||||
"issues": [_item(i) for i in snapshot.issues],
|
|
||||||
"pagination": {
|
|
||||||
"prs": _page(snapshot.pr_pagination),
|
|
||||||
"issues": _page(snapshot.issue_pagination),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
@@ -1,119 +0,0 @@
|
|||||||
"""HTML views for the live Gitea queue dashboard (#429)."""
|
|
||||||
|
|
||||||
from __future__ import annotations
|
|
||||||
|
|
||||||
import html
|
|
||||||
|
|
||||||
from webui.queue_loader import PaginationMeta, QueueItem, QueueSnapshot
|
|
||||||
|
|
||||||
|
|
||||||
def _badge_html(badges: tuple[str, ...]) -> str:
|
|
||||||
if not badges:
|
|
||||||
return ""
|
|
||||||
chips = "".join(
|
|
||||||
f'<span class="badge badge-{html.escape(b)}">{html.escape(b)}</span>'
|
|
||||||
for b in badges
|
|
||||||
)
|
|
||||||
return f'<span class="badges">{chips}</span>'
|
|
||||||
|
|
||||||
|
|
||||||
def _pagination_html(label: str, meta: PaginationMeta | None) -> str:
|
|
||||||
if meta is None:
|
|
||||||
return (
|
|
||||||
f"<p class='muted'><strong>{html.escape(label)} pagination:</strong> "
|
|
||||||
"unavailable</p>"
|
|
||||||
)
|
|
||||||
status = "complete" if meta.inventory_complete else "partial"
|
|
||||||
more = "yes" if meta.has_more else "no"
|
|
||||||
return (
|
|
||||||
f"<p class='meta'><strong>{html.escape(label)} pagination ({status}):</strong> "
|
|
||||||
f"returned {meta.returned_count} · per_page {meta.per_page} · "
|
|
||||||
f"pages_fetched {meta.pages_fetched} · has_more {more} · "
|
|
||||||
f"final_page {'yes' if meta.is_final_page else 'no'}</p>"
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def _queue_table(
|
|
||||||
*,
|
|
||||||
title: str,
|
|
||||||
items: tuple[QueueItem, ...],
|
|
||||||
columns: tuple[tuple[str, str], ...],
|
|
||||||
fetch_failed: bool = False,
|
|
||||||
) -> str:
|
|
||||||
if fetch_failed:
|
|
||||||
return (
|
|
||||||
f"<h3>{html.escape(title)}</h3>"
|
|
||||||
"<p class='muted'>Not loaded — queue fetch did not complete.</p>"
|
|
||||||
)
|
|
||||||
if not items:
|
|
||||||
return f"<h3>{html.escape(title)}</h3><p class='muted'>No open items.</p>"
|
|
||||||
|
|
||||||
headers = "".join(f"<th>{html.escape(label)}</th>" for _, label in columns)
|
|
||||||
rows = []
|
|
||||||
for item in items:
|
|
||||||
cells = []
|
|
||||||
for key, _ in columns:
|
|
||||||
if key == "number":
|
|
||||||
cells.append(f"<td>#{item.number}</td>")
|
|
||||||
elif key == "title":
|
|
||||||
cells.append(
|
|
||||||
f"<td>{html.escape(item.title)}{_badge_html(item.badges)}</td>"
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
cells.append(f"<td>{html.escape(item.extra.get(key, ''))}</td>")
|
|
||||||
rows.append("<tr>" + "".join(cells) + "</tr>")
|
|
||||||
|
|
||||||
body = (
|
|
||||||
f"<h3>{html.escape(title)}</h3>"
|
|
||||||
f"<table class='registry'><thead><tr>{headers}</tr></thead>"
|
|
||||||
f"<tbody>{''.join(rows)}</tbody></table>"
|
|
||||||
)
|
|
||||||
return body
|
|
||||||
|
|
||||||
|
|
||||||
def render_queue_page(snapshot: QueueSnapshot) -> str:
|
|
||||||
error_block = ""
|
|
||||||
if snapshot.fetch_error:
|
|
||||||
error_block = (
|
|
||||||
f'<div class="stub"><p><strong>Queue unavailable:</strong> '
|
|
||||||
f"{html.escape(snapshot.fetch_error)}</p></div>"
|
|
||||||
)
|
|
||||||
|
|
||||||
fetch_failed = bool(snapshot.fetch_error)
|
|
||||||
pr_section = _queue_table(
|
|
||||||
title="Open pull requests",
|
|
||||||
items=snapshot.prs,
|
|
||||||
fetch_failed=fetch_failed,
|
|
||||||
columns=(
|
|
||||||
("number", "#"),
|
|
||||||
("title", "Title"),
|
|
||||||
("branch", "Branch"),
|
|
||||||
("head_sha", "Head"),
|
|
||||||
("mergeable", "Mergeable"),
|
|
||||||
("linked_issue", "Linked issue"),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
issue_section = _queue_table(
|
|
||||||
title="Open issues",
|
|
||||||
items=snapshot.issues,
|
|
||||||
fetch_failed=fetch_failed,
|
|
||||||
columns=(
|
|
||||||
("number", "#"),
|
|
||||||
("title", "Title"),
|
|
||||||
("labels", "Labels"),
|
|
||||||
("assignee", "Assignee"),
|
|
||||||
("state", "State"),
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
return (
|
|
||||||
"<h2>Live queue</h2>"
|
|
||||||
f"<p class='meta'>Repository: <code>{html.escape(snapshot.repo_label)}</code> "
|
|
||||||
f"· project <code>{html.escape(snapshot.project_id)}</code></p>"
|
|
||||||
f"{error_block}"
|
|
||||||
f"{_pagination_html('PR', snapshot.pr_pagination)}"
|
|
||||||
f"{pr_section}"
|
|
||||||
f"{_pagination_html('Issue', snapshot.issue_pagination)}"
|
|
||||||
f"{issue_section}"
|
|
||||||
"<p class='muted'>Read-only MVP — claims, reviews, and merges stay in Gitea/MCP tools.</p>"
|
|
||||||
)
|
|
||||||
Reference in New Issue
Block a user