Compare commits
7
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
95d01b07fe | ||
|
|
183e9f08b8 | ||
|
|
eb3560d949 | ||
|
|
216fa5cf46 | ||
|
|
7a28d09b5d | ||
|
|
2111c84e7d | ||
|
|
b4e04f4dfb |
@@ -5,7 +5,7 @@
|
|||||||
- **Related:** #77 (repo/branch/PR → job mapping, designed separately)
|
- **Related:** #77 (repo/branch/PR → job mapping, designed separately)
|
||||||
- **Date:** 2026-07-02
|
- **Date:** 2026-07-02
|
||||||
|
|
||||||
Note on naming: This design used historical `jenkins-readonly` skill name in Gitea-Tools. Actual package/server is `jenkins-mcp` (see mcp-control-plane registration in #55). The server boundary now contains gated trigger (see #56), but read tools remain as designed.
|
Note on naming: This design used historical `jenkins-readonly` skill name in Gitea-Tools. Actual package/server is `jenkins-mcp` (see mcp-control-plane registration in #55). The read server boundary remains read-only; gated triggers live on the separate `jenkins-write-mcp` / `jenkins_mcp.write_server` boundary (see #56 / #152).
|
||||||
Client registration and reload instructions live in
|
Client registration and reload instructions live in
|
||||||
[`../mcp-client-registration.md`](../mcp-client-registration.md).
|
[`../mcp-client-registration.md`](../mcp-client-registration.md).
|
||||||
|
|
||||||
@@ -18,7 +18,9 @@ detail (build URL, number, timing, result) to report or investigate.
|
|||||||
Phase 1 is **primarily read-only**, per ADR-0001
|
Phase 1 is **primarily read-only**, per ADR-0001
|
||||||
([`adr-0001-mcp-control-plane-boundaries.md`](adr-0001-mcp-control-plane-boundaries.md)):
|
([`adr-0001-mcp-control-plane-boundaries.md`](adr-0001-mcp-control-plane-boundaries.md)):
|
||||||
|
|
||||||
- Build triggers are gated behind dedicated profile + exact confirmation (landed in #4, boundary correction in #56).
|
- Build triggers are outside this read-only surface and require the separate
|
||||||
|
`jenkins-write-mcp` boundary, a dedicated profile, exact confirmation, and
|
||||||
|
fail-closed mutation audit (landed in #4, boundary correction in #56 / #152).
|
||||||
- **Excluded: deploy triggers.**
|
- **Excluded: deploy triggers.**
|
||||||
- **Excluded: parameterized job launches.**
|
- **Excluded: parameterized job launches.**
|
||||||
- Excluded: job creation/deletion/config changes, queue manipulation, node
|
- Excluded: job creation/deletion/config changes, queue manipulation, node
|
||||||
@@ -109,7 +111,7 @@ by #76):
|
|||||||
`forbidden_operations: ["jenkins.build.trigger", "jenkins.deploy", "jenkins.job.configure"]`
|
`forbidden_operations: ["jenkins.build.trigger", "jenkins.deploy", "jenkins.job.configure"]`
|
||||||
as belt-and-braces even though no mutating tool exists.
|
as belt-and-braces even though no mutating tool exists.
|
||||||
- Missing URL/user/token/profile ⇒ **fail closed** with a clear message.
|
- Missing URL/user/token/profile ⇒ **fail closed** with a clear message.
|
||||||
- Since every tool is read-only, no confirmation gates are needed — but
|
- Since every tool on `jenkins-mcp` is read-only, no confirmation gates are needed — but
|
||||||
identity (`jenkins_whoami`) must still work so workflows can prove which
|
identity (`jenkins_whoami`) must still work so workflows can prove which
|
||||||
Jenkins account they act as.
|
Jenkins account they act as.
|
||||||
|
|
||||||
|
|||||||
@@ -229,6 +229,62 @@ Legacy environment-only setups keep working unchanged until migrated.
|
|||||||
Each runbook names the **profile role** it runs under, the steps, and a safe
|
Each runbook names the **profile role** it runs under, the steps, and a safe
|
||||||
prompt. Confirm the active profile first (`gitea_get_profile` / `gitea_whoami`).
|
prompt. Confirm the active profile first (`gitea_get_profile` / `gitea_whoami`).
|
||||||
|
|
||||||
|
## Work Selection Rule for LLMs
|
||||||
|
|
||||||
|
Before starting any issue or PR work, acquire or verify a work lease. Do not
|
||||||
|
begin coding, reviewing, fixing, branching, committing, pushing, commenting,
|
||||||
|
or creating a PR until you prove the target is not already being worked.
|
||||||
|
|
||||||
|
Required checks:
|
||||||
|
|
||||||
|
1. List open PRs.
|
||||||
|
2. Search for PRs linked to the target issue.
|
||||||
|
3. Search local and remote branches for the issue number.
|
||||||
|
4. Search registered worktrees for the issue branch.
|
||||||
|
5. Check dirty worktrees.
|
||||||
|
6. Check active leases or recent handoffs.
|
||||||
|
7. Check whether the issue was already completed by a merged PR.
|
||||||
|
|
||||||
|
If another active LLM/session owns the lease, stop. Allowed responses:
|
||||||
|
continue as the lease owner; review the existing PR if reviewer capability
|
||||||
|
allows; produce a handoff; request takeover after lease expiry; stop with
|
||||||
|
"work already claimed."
|
||||||
|
|
||||||
|
Never create a parallel branch or PR for the same issue unless the old branch
|
||||||
|
is proven abandoned and the takeover is recorded.
|
||||||
|
|
||||||
|
Gitea-Tools lease gates: `gitea_lock_issue` (fail-closed before author
|
||||||
|
mutations), `status:in-progress`, and claim comments. Full portable wording:
|
||||||
|
[`skills/llm-project-workflow/SKILL.md`](../skills/llm-project-workflow/SKILL.md).
|
||||||
|
|
||||||
|
## Global LLM Worktree Rule
|
||||||
|
|
||||||
|
The main project checkout is a stable control checkout. It must stay on the
|
||||||
|
configured stable branch: `master`, `main`, or `dev`.
|
||||||
|
|
||||||
|
All LLM task work must happen inside the project's `branches/` directory.
|
||||||
|
|
||||||
|
Before any mutation, prove:
|
||||||
|
|
||||||
|
1. current project root
|
||||||
|
2. current working directory
|
||||||
|
3. current branch
|
||||||
|
4. stable branch for the main checkout
|
||||||
|
5. session-owned worktree path under `branches/`
|
||||||
|
|
||||||
|
If `cwd` is not inside `branches/`, stop. Do not edit, create, delete, format,
|
||||||
|
test-write, commit, merge, rebase, checkout task branches, resolve conflicts,
|
||||||
|
or run cleanup.
|
||||||
|
|
||||||
|
There are no exceptions for small fixes, docs, tests, cleanup, PR review fixes,
|
||||||
|
conflict resolution, or emergencies.
|
||||||
|
|
||||||
|
The main checkout may only be used for read-only inspection, fetching,
|
||||||
|
stable-branch update after merged PRs, creating `branches/` worktrees, or
|
||||||
|
explicit control-checkout repair.
|
||||||
|
|
||||||
|
Portable wording: [`skills/llm-project-workflow/SKILL.md`](../skills/llm-project-workflow/SKILL.md).
|
||||||
|
|
||||||
## Branch worktree isolation
|
## Branch worktree isolation
|
||||||
|
|
||||||
All LLM implementation and review work happens in an isolated branch worktree
|
All LLM implementation and review work happens in an isolated branch worktree
|
||||||
|
|||||||
@@ -9,9 +9,14 @@ Use these exact MCP server names in clients:
|
|||||||
|
|
||||||
| Server name | Boundary | Default capability |
|
| Server name | Boundary | Default capability |
|
||||||
|---|---|---|
|
|---|---|---|
|
||||||
| `jenkins-mcp` | Jenkins CI inspection | Read-only build/job inspection |
|
| `jenkins-mcp` | Jenkins CI inspection (read) | Read-only build/job inspection |
|
||||||
|
| `jenkins-write-mcp` | Jenkins build trigger (write) | Gated `jenkins_trigger_build` only |
|
||||||
| `glitchtip-mcp` | GlitchTip observability inspection | Read-only issue/event inspection |
|
| `glitchtip-mcp` | GlitchTip observability inspection | Read-only issue/event inspection |
|
||||||
|
|
||||||
|
The write boundary (`jenkins-write-mcp`) is **not** registered by default (#152).
|
||||||
|
It exposes a single mutating tool and requires operator approval of a dedicated
|
||||||
|
trigger profile before any client config references it.
|
||||||
|
|
||||||
Historical names such as `jenkins-readonly` and `glitchtip-readonly` are
|
Historical names such as `jenkins-readonly` and `glitchtip-readonly` are
|
||||||
descriptive profile labels only. They are not the canonical MCP server names
|
descriptive profile labels only. They are not the canonical MCP server names
|
||||||
unless an operator intentionally creates aliases and documents them.
|
unless an operator intentionally creates aliases and documents them.
|
||||||
@@ -54,7 +59,7 @@ entry, reconnect or reload the MCP client before claiming the tools are usable.
|
|||||||
Before using either server in a task, prove the expected tools are visible in
|
Before using either server in a task, prove the expected tools are visible in
|
||||||
the client. It is not enough for the config entry to exist.
|
the client. It is not enough for the config entry to exist.
|
||||||
|
|
||||||
Expected Jenkins tools:
|
Expected Jenkins read tools (`jenkins-mcp` only):
|
||||||
|
|
||||||
- `jenkins_whoami`
|
- `jenkins_whoami`
|
||||||
- `jenkins_list_jobs`
|
- `jenkins_list_jobs`
|
||||||
@@ -62,6 +67,10 @@ Expected Jenkins tools:
|
|||||||
- `jenkins_build_status`
|
- `jenkins_build_status`
|
||||||
- `jenkins_get_build`
|
- `jenkins_get_build`
|
||||||
|
|
||||||
|
`jenkins_trigger_build` must **not** appear on `jenkins-mcp`. When an operator
|
||||||
|
explicitly enables the write boundary, the only expected tool on
|
||||||
|
`jenkins-write-mcp` is `jenkins_trigger_build`.
|
||||||
|
|
||||||
Expected GlitchTip tools:
|
Expected GlitchTip tools:
|
||||||
|
|
||||||
- `glitchtip_whoami`
|
- `glitchtip_whoami`
|
||||||
@@ -78,8 +87,13 @@ back to shell commands, raw service APIs, or unrelated MCP servers.
|
|||||||
## Boundary Rules
|
## Boundary Rules
|
||||||
|
|
||||||
- `jenkins-mcp` read profiles must not expose build trigger tools.
|
- `jenkins-mcp` read profiles must not expose build trigger tools.
|
||||||
- Jenkins build triggers require a separately named write profile, exact
|
- Build triggers live on the separate `jenkins-write-mcp` server
|
||||||
confirmation, and fail-closed mutation audit.
|
(`jenkins_mcp.write_server`), not on `jenkins-mcp`.
|
||||||
|
- Jenkins build triggers require a dedicated trigger profile with
|
||||||
|
`jenkins.build.trigger` allowed, exact confirmation
|
||||||
|
(`TRIGGER BUILD <job-path>`), and fail-closed mutation audit.
|
||||||
|
- Do not register `jenkins-write-mcp` until an operator approves a trigger
|
||||||
|
profile; no shipped profile carries trigger capability by default.
|
||||||
- `glitchtip-mcp` remains read-only. It must not file or mutate Gitea issues.
|
- `glitchtip-mcp` remains read-only. It must not file or mutate Gitea issues.
|
||||||
- GlitchTip-to-Gitea filing is a separate orchestrator that composes GlitchTip
|
- GlitchTip-to-Gitea filing is a separate orchestrator that composes GlitchTip
|
||||||
read tools with Gitea issue-write tools.
|
read tools with Gitea issue-write tools.
|
||||||
|
|||||||
@@ -21,5 +21,10 @@ Note on naming: Historical design docs used `jenkins-readonly` / `glitchtip-read
|
|||||||
|
|
||||||
## 5. Mutation Gating
|
## 5. Mutation Gating
|
||||||
Any mutating action (e.g., Gitea issue creation from GlitchTip, or Jenkins builds) must be explicitly allowed by the execution profile.
|
Any mutating action (e.g., Gitea issue creation from GlitchTip, or Jenkins builds) must be explicitly allowed by the execution profile.
|
||||||
- **Jenkins build triggers** exist in jenkins-mcp (landed #4) but require dedicated profile/identity and exact confirmation; not on standard reader profiles. See #56 for boundary correction.
|
- **Jenkins build triggers** are gated on a separate write boundary
|
||||||
- **GlitchTip to Gitea issue filing** is documented as a gated, orchestrated workflow (not in glitchtip-mcp), currently partial (mocked, dedup not wired, audit missing). See #57.
|
(`jenkins-write-mcp` / `jenkins_mcp.write_server`), not on the read-only
|
||||||
|
`jenkins-mcp` surface. Triggers require a dedicated profile with
|
||||||
|
`jenkins.build.trigger`, exact confirmation, and fail-closed mutation audit.
|
||||||
|
No default profile carries trigger capability (#152 / mcp-control-plane #56).
|
||||||
|
- **GlitchTip to Gitea issue filing** is a library-only orchestrator in
|
||||||
|
mcp-control-plane (not on `glitchtip-mcp`). See #153 / mcp-control-plane #57.
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ Handbook for LLM operators and human developers using the Gitea-Tools MCP server
|
|||||||
3. **One unit of work per session** — Implement one claimed issue *or* review/merge one PR; do not mix author and reviewer mutations in one session.
|
3. **One unit of work per session** — Implement one claimed issue *or* review/merge one PR; do not mix author and reviewer mutations in one session.
|
||||||
4. **No self-review / no self-merge** — The authenticated Gitea user must not approve or merge a PR they authored.
|
4. **No self-review / no self-merge** — The authenticated Gitea user must not approve or merge a PR they authored.
|
||||||
5. **Follow the gates** — Prompts express intent; MCP tools enforce safety. Never bypass gates via prompt instructions.
|
5. **Follow the gates** — Prompts express intent; MCP tools enforce safety. Never bypass gates via prompt instructions.
|
||||||
|
6. **Global LLM Worktree Rule** — Main checkout stays on `master`/`main`/`dev`; all mutations happen under `branches/`. Prove project root, `cwd`, branch, stable main-checkout branch, and session worktree path before editing. No exceptions.
|
||||||
|
|
||||||
## Supported Gitea instances
|
## Supported Gitea instances
|
||||||
|
|
||||||
|
|||||||
@@ -14,6 +14,12 @@
|
|||||||
|
|
||||||
## Step 2: Implement issues (author profile)
|
## Step 2: Implement issues (author profile)
|
||||||
|
|
||||||
|
0. Work Selection Rule — verify a work lease before any mutations (open PRs,
|
||||||
|
issue-linked PRs, branches, worktrees, dirty worktrees, active leases/
|
||||||
|
handoffs, merged-PR completion). Stop if another session owns the lease.
|
||||||
|
0b. Global LLM Worktree Rule — main checkout on `master`/`main`/`dev` only;
|
||||||
|
mutate only from a `branches/` worktree after proving root, cwd, branch,
|
||||||
|
stable main-checkout branch, and session worktree path (no exceptions).
|
||||||
1. `gitea_resolve_task_capability` for the author task.
|
1. `gitea_resolve_task_capability` for the author task.
|
||||||
2. `gitea_lock_issue` before implementation mutations.
|
2. `gitea_lock_issue` before implementation mutations.
|
||||||
3. Claim with `gitea_mark_issue` / `status:in-progress` label.
|
3. Claim with `gitea_mark_issue` / `status:in-progress` label.
|
||||||
|
|||||||
@@ -3460,11 +3460,40 @@ _GUIDE_RULES = {
|
|||||||
"Conflicting or stale PR state (e.g. prior said merged but live open, or head/updated mismatch) is a hard blocker: report it explicitly and stop until live state is unambiguous.",
|
"Conflicting or stale PR state (e.g. prior said merged but live open, or head/updated mismatch) is a hard blocker: report it explicitly and stop until live state is unambiguous.",
|
||||||
"After merge, re-list PRs and re-view the PR (plus verify master contains the merge) before claiming completion.",
|
"After merge, re-list PRs and re-view the PR (plus verify master contains the merge) before claiming completion.",
|
||||||
],
|
],
|
||||||
|
"work_selection": (
|
||||||
|
"Before any issue or PR work, acquire or verify a work lease. Do not "
|
||||||
|
"code, review, branch, commit, push, comment, or open a PR until you "
|
||||||
|
"prove the target is not already being worked. Required checks: list "
|
||||||
|
"open PRs; search PRs linked to the issue; search local/remote "
|
||||||
|
"branches for the issue number; search worktrees for the issue "
|
||||||
|
"branch; check dirty worktrees; check active leases or recent "
|
||||||
|
"handoffs; check whether a merged PR already completed the issue. If "
|
||||||
|
"another session owns the lease, stop (continue as owner, review the "
|
||||||
|
"existing PR, hand off, request takeover after expiry, or report "
|
||||||
|
"'work already claimed'). Never create a parallel branch/PR unless "
|
||||||
|
"the old branch is proven abandoned and takeover is recorded. "
|
||||||
|
"gitea_lock_issue is the fail-closed author lease gate."),
|
||||||
|
"global_worktree": (
|
||||||
|
"Main checkout is a stable control checkout on master/main/dev only. "
|
||||||
|
"All LLM task work happens under branches/. Before any mutation, prove "
|
||||||
|
"project root, cwd, branch, main-checkout stable branch, and "
|
||||||
|
"session-owned branches/ worktree path. If cwd is not under "
|
||||||
|
"branches/, stop — no edit/create/delete/format/test-write/commit/"
|
||||||
|
"merge/rebase/checkout/cleanup, with no exceptions (docs, tests, "
|
||||||
|
"small fixes, review fixes, conflicts, emergencies). Main checkout: "
|
||||||
|
"read-only inspect, fetch, create worktrees, post-merge stable "
|
||||||
|
"update, explicit repair only."),
|
||||||
}
|
}
|
||||||
|
|
||||||
_COMMON_WORKFLOWS = [
|
_COMMON_WORKFLOWS = [
|
||||||
"task routing: resolve task capability via gitea_resolve_task_capability "
|
"task routing: resolve task capability via gitea_resolve_task_capability "
|
||||||
"to check required permission/role kind and identify the safe next action.",
|
"to check required permission/role kind and identify the safe next action.",
|
||||||
|
"work selection: acquire or verify a work lease before any issue/PR work "
|
||||||
|
"(open PRs, linked PRs, branches, worktrees, dirty worktrees, leases, "
|
||||||
|
"merged completion); stop if another session owns the lease.",
|
||||||
|
"global worktree: main checkout on master/main/dev only; mutate only "
|
||||||
|
"from a branches/ worktree after proving root, cwd, branch, stable "
|
||||||
|
"main-checkout branch, and session worktree path.",
|
||||||
"issue authoring: verify identity, create/claim the issue, keep scope "
|
"issue authoring: verify identity, create/claim the issue, keep scope "
|
||||||
"explicit (remote/org/repo).",
|
"explicit (remote/org/repo).",
|
||||||
"implementation: claim issue, branch from fresh master, implement only "
|
"implementation: claim issue, branch from fresh master, implement only "
|
||||||
@@ -4074,6 +4103,90 @@ def gitea_get_profile(
|
|||||||
return result
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
_RUNTIME_CAPABILITY_TASKS = (
|
||||||
|
"create_issue",
|
||||||
|
"comment_issue",
|
||||||
|
"create_pr",
|
||||||
|
"review_pr",
|
||||||
|
"merge_pr",
|
||||||
|
"close_issue",
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _matching_configured_profiles(
|
||||||
|
config: dict | None,
|
||||||
|
required_permission: str,
|
||||||
|
) -> list[str]:
|
||||||
|
"""Profile names that allow *required_permission* (redacted metadata only)."""
|
||||||
|
if not config or "profiles" not in config:
|
||||||
|
return []
|
||||||
|
matches: list[str] = []
|
||||||
|
for p_name, p_data in config["profiles"].items():
|
||||||
|
if not p_data.get("enabled", True):
|
||||||
|
continue
|
||||||
|
p_allowed = p_data.get("allowed_operations") or []
|
||||||
|
p_forbidden = p_data.get("forbidden_operations") or []
|
||||||
|
p_allowed_n = []
|
||||||
|
for op in p_allowed:
|
||||||
|
try:
|
||||||
|
p_allowed_n.append(gitea_config.normalize_operation(op))
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
p_forbidden_n = []
|
||||||
|
for op in p_forbidden:
|
||||||
|
try:
|
||||||
|
p_forbidden_n.append(gitea_config.normalize_operation(op))
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
|
ok, _ = gitea_config.check_operation(
|
||||||
|
required_permission, p_allowed_n, p_forbidden_n
|
||||||
|
)
|
||||||
|
if ok:
|
||||||
|
matches.append(p_name)
|
||||||
|
return sorted(matches)
|
||||||
|
|
||||||
|
|
||||||
|
def _build_runtime_task_capabilities(
|
||||||
|
allowed: list[str],
|
||||||
|
forbidden: list[str],
|
||||||
|
config: dict | None,
|
||||||
|
) -> dict:
|
||||||
|
"""Per-task capability summary for role-aware runtime context (#139)."""
|
||||||
|
task_entries = []
|
||||||
|
flags: dict[str, bool] = {}
|
||||||
|
flag_keys = {
|
||||||
|
"create_issue": "can_create_issues",
|
||||||
|
"comment_issue": "can_comment_on_issues",
|
||||||
|
"create_pr": "can_author_prs",
|
||||||
|
"review_pr": "can_review_prs",
|
||||||
|
"merge_pr": "can_merge_prs",
|
||||||
|
"close_issue": "can_close_issues",
|
||||||
|
}
|
||||||
|
for task in _RUNTIME_CAPABILITY_TASKS:
|
||||||
|
permission = task_capability_map.required_permission(task)
|
||||||
|
allowed_here, _ = gitea_config.check_operation(
|
||||||
|
permission, allowed, forbidden
|
||||||
|
)
|
||||||
|
entry = {
|
||||||
|
"task": task,
|
||||||
|
"required_permission": permission,
|
||||||
|
"required_role_kind": task_capability_map.required_role(task),
|
||||||
|
"allowed_in_current_session": allowed_here,
|
||||||
|
"matching_configured_profiles": _matching_configured_profiles(
|
||||||
|
config, permission
|
||||||
|
),
|
||||||
|
}
|
||||||
|
task_entries.append(entry)
|
||||||
|
flag_name = flag_keys.get(task)
|
||||||
|
if flag_name:
|
||||||
|
flags[flag_name] = allowed_here
|
||||||
|
return {
|
||||||
|
**flags,
|
||||||
|
"issue_comment_not_implied_by_pr_comment": True,
|
||||||
|
"task_capabilities": task_entries,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@mcp.tool()
|
@mcp.tool()
|
||||||
def gitea_get_runtime_context(
|
def gitea_get_runtime_context(
|
||||||
remote: str = "dadeschools",
|
remote: str = "dadeschools",
|
||||||
@@ -4161,6 +4274,10 @@ def gitea_get_runtime_context(
|
|||||||
"or ask the operator to update GITEA_MCP_PROFILE to a reviewer profile."
|
"or ask the operator to update GITEA_MCP_PROFILE to a reviewer profile."
|
||||||
)
|
)
|
||||||
|
|
||||||
|
session_capabilities = _build_runtime_task_capabilities(
|
||||||
|
allowed, forbidden, config
|
||||||
|
)
|
||||||
|
|
||||||
preflight = assess_preflight_status()
|
preflight = assess_preflight_status()
|
||||||
if not preflight["preflight_ready"]:
|
if not preflight["preflight_ready"]:
|
||||||
safe_next_action = (
|
safe_next_action = (
|
||||||
@@ -4185,6 +4302,7 @@ def gitea_get_runtime_context(
|
|||||||
"safe_next_action": safe_next_action,
|
"safe_next_action": safe_next_action,
|
||||||
"preflight_ready": preflight["preflight_ready"],
|
"preflight_ready": preflight["preflight_ready"],
|
||||||
"preflight_block_reasons": preflight["preflight_block_reasons"],
|
"preflight_block_reasons": preflight["preflight_block_reasons"],
|
||||||
|
"session_capabilities": session_capabilities,
|
||||||
}
|
}
|
||||||
|
|
||||||
if reveal and h:
|
if reveal and h:
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ After registering or changing external MCP servers, reload your client to discov
|
|||||||
- Gemini / Grok / ChatGPT Desktop: Restart the client or run the reload slash command if available.
|
- Gemini / Grok / ChatGPT Desktop: Restart the client or run the reload slash command if available.
|
||||||
- Claude Desktop: Use 'Developer -> Reload' or restart the app.
|
- Claude Desktop: Use 'Developer -> Reload' or restart the app.
|
||||||
- General MCP Clients: Restart the process or reload the server config.
|
- General MCP Clients: Restart the process or reload the server config.
|
||||||
-------------------------------------------
|
===========================================
|
||||||
"""
|
"""
|
||||||
|
|
||||||
def parse_gitea_mcp_config(path):
|
def parse_gitea_mcp_config(path):
|
||||||
|
|||||||
+5
-2
@@ -6,14 +6,17 @@ Runs over stdio. All tools authenticate via macOS keychain (git credential fill)
|
|||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from role_session_router import python_bytes_have_conflict_markers
|
from role_session_router import (
|
||||||
|
python_bytes_have_conflict_markers,
|
||||||
|
skip_python_scan_walk_root,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
# Startup health check: scan all python files in the Gitea-Tools directory for unresolved conflict markers.
|
# Startup health check: scan all python files in the Gitea-Tools directory for unresolved conflict markers.
|
||||||
def check_conflict_markers():
|
def check_conflict_markers():
|
||||||
dir_path = os.path.dirname(os.path.abspath(__file__))
|
dir_path = os.path.dirname(os.path.abspath(__file__))
|
||||||
for root, dirs, files in os.walk(dir_path):
|
for root, dirs, files in os.walk(dir_path):
|
||||||
if any(p in root for p in ("venv", ".git", ".pytest_cache", "branches")):
|
if skip_python_scan_walk_root(dir_path, root):
|
||||||
continue
|
continue
|
||||||
for file in files:
|
for file in files:
|
||||||
if file.endswith(".py"):
|
if file.endswith(".py"):
|
||||||
|
|||||||
+22
-1
@@ -32,6 +32,27 @@ def python_bytes_have_conflict_markers(content: bytes) -> bool:
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
def skip_python_scan_walk_root(project_root: str, walk_root: str) -> bool:
|
||||||
|
"""Skip venv/git/cache and sibling worktrees under orchestration checkout.
|
||||||
|
|
||||||
|
When *project_root* is itself a worktree inside ``branches/``, still scan
|
||||||
|
that tree — do not treat the ``branches`` path segment as a skip signal.
|
||||||
|
"""
|
||||||
|
rel = os.path.relpath(walk_root, project_root)
|
||||||
|
if rel == ".":
|
||||||
|
return False
|
||||||
|
head = rel.split(os.sep, 1)[0]
|
||||||
|
if head in ("venv", ".git", ".pytest_cache"):
|
||||||
|
return True
|
||||||
|
if head == "branches":
|
||||||
|
nested = os.path.join(project_root, "branches")
|
||||||
|
if os.path.isdir(nested) and (
|
||||||
|
walk_root == nested or walk_root.startswith(nested + os.sep)
|
||||||
|
):
|
||||||
|
return True
|
||||||
|
return False
|
||||||
|
|
||||||
|
|
||||||
REVIEWER_TASKS = frozenset({
|
REVIEWER_TASKS = frozenset({
|
||||||
"review_pr",
|
"review_pr",
|
||||||
"merge_pr",
|
"merge_pr",
|
||||||
@@ -281,7 +302,7 @@ def first_conflict_marker_path(project_root: str | None = None) -> str | None:
|
|||||||
"""Return the first .py path containing a git conflict marker, or None."""
|
"""Return the first .py path containing a git conflict marker, or None."""
|
||||||
root_dir = project_root or os.path.dirname(os.path.abspath(__file__))
|
root_dir = project_root or os.path.dirname(os.path.abspath(__file__))
|
||||||
for root, dirs, files in os.walk(root_dir):
|
for root, dirs, files in os.walk(root_dir):
|
||||||
if any(p in root for p in ("venv", ".git", ".pytest_cache", "branches")):
|
if skip_python_scan_walk_root(root_dir, root):
|
||||||
continue
|
continue
|
||||||
for file in files:
|
for file in files:
|
||||||
if not file.endswith(".py"):
|
if not file.endswith(".py"):
|
||||||
|
|||||||
@@ -53,10 +53,73 @@ Additional issue-first rules:
|
|||||||
owner decision.** Do not create a new repository or a new tracker unless
|
owner decision.** Do not create a new repository or a new tracker unless
|
||||||
explicitly approved by the owner.
|
explicitly approved by the owner.
|
||||||
|
|
||||||
|
## Work Selection Rule for LLMs
|
||||||
|
|
||||||
|
Before starting any issue or PR work, acquire or verify a work lease.
|
||||||
|
|
||||||
|
Do not begin coding, reviewing, fixing, branching, committing, pushing,
|
||||||
|
commenting, or creating a PR until you prove the target is not already being
|
||||||
|
worked.
|
||||||
|
|
||||||
|
Required checks:
|
||||||
|
|
||||||
|
1. List open PRs.
|
||||||
|
2. Search for PRs linked to the target issue.
|
||||||
|
3. Search local and remote branches for the issue number.
|
||||||
|
4. Search registered worktrees for the issue branch.
|
||||||
|
5. Check dirty worktrees.
|
||||||
|
6. Check active leases or recent handoffs.
|
||||||
|
7. Check whether the issue was already completed by a merged PR.
|
||||||
|
|
||||||
|
If another active LLM/session owns the lease, stop.
|
||||||
|
|
||||||
|
Allowed responses:
|
||||||
|
|
||||||
|
- continue as the lease owner,
|
||||||
|
- review the existing PR if reviewer capability allows,
|
||||||
|
- produce a handoff,
|
||||||
|
- request takeover after lease expiry,
|
||||||
|
- stop with "work already claimed."
|
||||||
|
|
||||||
|
Never create a parallel branch or PR for the same issue unless the old branch
|
||||||
|
is proven abandoned and the takeover is recorded.
|
||||||
|
|
||||||
|
For Gitea-Tools: `gitea_lock_issue` is the fail-closed lease gate before author
|
||||||
|
mutations; `status:in-progress` and claim comments are supporting lease signals.
|
||||||
|
Use `review_proofs.classify_issue_for_selection` when reporting fresh issue
|
||||||
|
selection (#188).
|
||||||
|
|
||||||
|
## Global LLM Worktree Rule
|
||||||
|
|
||||||
|
The main project checkout is a stable control checkout. It must stay on the
|
||||||
|
configured stable branch: `master`, `main`, or `dev`.
|
||||||
|
|
||||||
|
All LLM task work must happen inside the project's `branches/` directory.
|
||||||
|
|
||||||
|
Before any mutation, prove:
|
||||||
|
|
||||||
|
1. current project root
|
||||||
|
2. current working directory
|
||||||
|
3. current branch
|
||||||
|
4. stable branch for the main checkout
|
||||||
|
5. session-owned worktree path under `branches/`
|
||||||
|
|
||||||
|
If `cwd` is not inside `branches/`, stop. Do not edit, create, delete, format,
|
||||||
|
test-write, commit, merge, rebase, checkout task branches, resolve conflicts,
|
||||||
|
or run cleanup.
|
||||||
|
|
||||||
|
There are no exceptions for small fixes, docs, tests, cleanup, PR review fixes,
|
||||||
|
conflict resolution, or emergencies.
|
||||||
|
|
||||||
|
The main checkout may only be used for read-only inspection, fetching,
|
||||||
|
stable-branch update after merged PRs, creating `branches/` worktrees, or
|
||||||
|
explicit control-checkout repair.
|
||||||
|
|
||||||
## B. Isolated worktree rule
|
## B. Isolated worktree rule
|
||||||
|
|
||||||
**Never implement or review in the main checkout.** The main checkout is for
|
**Never implement or review in the main checkout** (Global LLM Worktree Rule).
|
||||||
orchestration and status only (issue creation, `git status`, creating worktrees).
|
The main checkout is for orchestration and status only (issue creation,
|
||||||
|
`git status`, creating worktrees) and must remain on the stable branch.
|
||||||
|
|
||||||
- Each issue gets its own branch worktree under an ignored `branches/` directory.
|
- Each issue gets its own branch worktree under an ignored `branches/` directory.
|
||||||
- Review work uses a **separate** review worktree, never the author's folder.
|
- Review work uses a **separate** review worktree, never the author's folder.
|
||||||
@@ -142,7 +205,12 @@ Worktree folder = branch with `/` replaced by `-`
|
|||||||
|
|
||||||
## E. Start-work workflow
|
## E. Start-work workflow
|
||||||
|
|
||||||
1. Verify the orchestration checkout (right repo, clean tree).
|
0. Acquire or verify a work lease (Work Selection Rule) — complete all seven
|
||||||
|
checks before any claim, branch, or PR work.
|
||||||
|
0b. Global LLM Worktree Rule — prove project root, `cwd`, branch, main-checkout
|
||||||
|
stable branch, and session-owned `branches/` worktree path. If `cwd` is not
|
||||||
|
under `branches/`, stop before any mutation (no exceptions).
|
||||||
|
1. Verify the orchestration checkout (right repo, clean tree, on stable branch).
|
||||||
2. Fetch/prune: `git fetch <remote> --prune`.
|
2. Fetch/prune: `git fetch <remote> --prune`.
|
||||||
3. Confirm local `master` equals remote `master` (`git rev-list --left-right --count <remote>/master...master` → `0 0`).
|
3. Confirm local `master` equals remote `master` (`git rev-list --left-right --count <remote>/master...master` → `0 0`).
|
||||||
4. Create/claim the issue (§A).
|
4. Create/claim the issue (§A).
|
||||||
|
|||||||
@@ -13,6 +13,21 @@ Rules (llm-project-workflow):
|
|||||||
- Do not self-review or self-merge.
|
- Do not self-review or self-merge.
|
||||||
|
|
||||||
Steps:
|
Steps:
|
||||||
|
0. Work Selection Rule — before any claim, branch, or file edits, acquire or
|
||||||
|
verify a work lease. Required checks: list open PRs; search PRs linked to
|
||||||
|
the target issue; search local/remote branches for the issue number; search
|
||||||
|
registered worktrees for the issue branch; check dirty worktrees; check
|
||||||
|
active leases or recent handoffs; check whether a merged PR already
|
||||||
|
completed the issue. If another session owns the lease, stop (continue only
|
||||||
|
as lease owner, review the existing PR, hand off, request takeover after
|
||||||
|
expiry, or report "work already claimed"). Never open a parallel branch/PR
|
||||||
|
unless the old branch is proven abandoned and takeover is recorded.
|
||||||
|
0b. Global LLM Worktree Rule — before any mutation, prove and state: project
|
||||||
|
root; cwd; current branch; stable branch for the main checkout (master/main/dev);
|
||||||
|
session-owned worktree path under branches/. If cwd is not inside branches/,
|
||||||
|
STOP (no exceptions — not for docs, tests, small fixes, review fixes, conflicts,
|
||||||
|
or cleanup). Main checkout is control-only: read-only inspect, fetch, create
|
||||||
|
worktrees, stable-branch update after merge, explicit repair.
|
||||||
1. Identity Checklist: Before claiming work, verify and state:
|
1. Identity Checklist: Before claiming work, verify and state:
|
||||||
- Required identity/profile for this task: author (allowed to push branches / create PRs)
|
- Required identity/profile for this task: author (allowed to push branches / create PRs)
|
||||||
- Current authenticated identity (from whoami): <username>
|
- Current authenticated identity (from whoami): <username>
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
"""Documentation checks for external Jenkins/GlitchTip MCP registration (#151)."""
|
"""Documentation checks for external Jenkins/GlitchTip MCP registration (#151/#152)."""
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
|
|
||||||
REPO_ROOT = Path(__file__).resolve().parent.parent
|
REPO_ROOT = Path(__file__).resolve().parent.parent
|
||||||
@@ -52,11 +52,20 @@ def test_registration_doc_preserves_boundaries():
|
|||||||
"Do not add Jenkins or GlitchTip credentials to the Gitea MCP server",
|
"Do not add Jenkins or GlitchTip credentials to the Gitea MCP server",
|
||||||
"do not add Gitea write credentials to the GlitchTip server",
|
"do not add Gitea write credentials to the GlitchTip server",
|
||||||
"must not expose build trigger tools",
|
"must not expose build trigger tools",
|
||||||
|
"jenkins-write-mcp",
|
||||||
|
"jenkins_mcp.write_server",
|
||||||
"remains read-only",
|
"remains read-only",
|
||||||
):
|
):
|
||||||
assert phrase in text
|
assert phrase in text
|
||||||
|
|
||||||
|
|
||||||
|
def test_registration_doc_separates_jenkins_trigger_from_read_surface():
|
||||||
|
text = _doc_text()
|
||||||
|
assert "jenkins_trigger_build" in text
|
||||||
|
assert "must **not** appear on `jenkins-mcp`" in text
|
||||||
|
assert "not" in text.lower() and "registered by default" in text.lower()
|
||||||
|
|
||||||
|
|
||||||
def test_registration_doc_has_no_secret_material_or_live_urls():
|
def test_registration_doc_has_no_secret_material_or_live_urls():
|
||||||
text = _doc_text()
|
text = _doc_text()
|
||||||
for marker in (
|
for marker in (
|
||||||
@@ -80,3 +89,14 @@ def test_related_docs_link_registration_doc():
|
|||||||
text = (REPO_ROOT / name).read_text(encoding="utf-8")
|
text = (REPO_ROOT / name).read_text(encoding="utf-8")
|
||||||
assert "mcp-client-registration.md" in text, (
|
assert "mcp-client-registration.md" in text, (
|
||||||
f"{name} does not link docs/mcp-client-registration.md")
|
f"{name} does not link docs/mcp-client-registration.md")
|
||||||
|
|
||||||
|
|
||||||
|
def test_related_docs_keep_jenkins_trigger_off_read_surface():
|
||||||
|
for name in (
|
||||||
|
"docs/safety-model.md",
|
||||||
|
"docs/architecture/jenkins-readonly-build-status-design.md",
|
||||||
|
):
|
||||||
|
text = (REPO_ROOT / name).read_text(encoding="utf-8")
|
||||||
|
assert "jenkins-write-mcp" in text
|
||||||
|
assert "jenkins_mcp.write_server" in text
|
||||||
|
assert "jenkins-mcp" in text
|
||||||
|
|||||||
@@ -132,7 +132,8 @@ class TestControlPlaneGuide(GuideTestBase):
|
|||||||
rules = g["rules"]
|
rules = g["rules"]
|
||||||
for key in ("hard_stops", "fail_closed", "head_sha_pinning",
|
for key in ("hard_stops", "fail_closed", "head_sha_pinning",
|
||||||
"merge_confirmation", "redaction", "separation",
|
"merge_confirmation", "redaction", "separation",
|
||||||
"profile_switching", "identity_verification"):
|
"profile_switching", "identity_verification",
|
||||||
|
"work_selection", "global_worktree"):
|
||||||
self.assertIn(key, rules)
|
self.assertIn(key, rules)
|
||||||
self.assertIn("MERGE PR", json.dumps(rules["merge_confirmation"]))
|
self.assertIn("MERGE PR", json.dumps(rules["merge_confirmation"]))
|
||||||
self.assertTrue(rules["hard_stops"])
|
self.assertTrue(rules["hard_stops"])
|
||||||
|
|||||||
@@ -1051,6 +1051,10 @@ class TestControllerHandoff(unittest.TestCase):
|
|||||||
self.assertIn("## Controller Handoff", skill)
|
self.assertIn("## Controller Handoff", skill)
|
||||||
self.assertIn("assess_controller_handoff", skill)
|
self.assertIn("assess_controller_handoff", skill)
|
||||||
self.assertIn("issue #182", skill)
|
self.assertIn("issue #182", skill)
|
||||||
|
self.assertIn("## Work Selection Rule for LLMs", skill)
|
||||||
|
self.assertIn("work already claimed", skill)
|
||||||
|
self.assertIn("## Global LLM Worktree Rule", skill)
|
||||||
|
self.assertIn("branches/", skill)
|
||||||
|
|
||||||
def test_handoff_rejects_none_workspace_mutations_when_local_edits_exist(self):
|
def test_handoff_rejects_none_workspace_mutations_when_local_edits_exist(self):
|
||||||
# 1. Workspace mutations: none is rejected when local_edits is True
|
# 1. Workspace mutations: none is rejected when local_edits is True
|
||||||
|
|||||||
@@ -205,6 +205,30 @@ class TestRoleSessionRouter(unittest.TestCase):
|
|||||||
|
|
||||||
|
|
||||||
class TestCheckMidMerge(unittest.TestCase):
|
class TestCheckMidMerge(unittest.TestCase):
|
||||||
|
def test_skip_scan_walk_root_skips_sibling_worktrees_only(self):
|
||||||
|
worktree_root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||||
|
main_root = os.path.dirname(os.path.dirname(worktree_root))
|
||||||
|
self.assertFalse(
|
||||||
|
role_session_router.skip_python_scan_walk_root(
|
||||||
|
main_root, main_root
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self.assertTrue(
|
||||||
|
role_session_router.skip_python_scan_walk_root(
|
||||||
|
main_root, os.path.join(main_root, "branches", "fix-issue-1")
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self.assertFalse(
|
||||||
|
role_session_router.skip_python_scan_walk_root(
|
||||||
|
worktree_root, worktree_root
|
||||||
|
)
|
||||||
|
)
|
||||||
|
self.assertFalse(
|
||||||
|
role_session_router.skip_python_scan_walk_root(
|
||||||
|
worktree_root, os.path.join(worktree_root, "tests")
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
def test_decorative_equals_banner_is_not_mid_merge(self):
|
def test_decorative_equals_banner_is_not_mid_merge(self):
|
||||||
self.assertFalse(role_session_router.check_mid_merge())
|
self.assertFalse(role_session_router.check_mid_merge())
|
||||||
|
|
||||||
|
|||||||
@@ -95,9 +95,13 @@ class TestRuntimeClarity(unittest.TestCase):
|
|||||||
# -------------------------------------------------------------------------
|
# -------------------------------------------------------------------------
|
||||||
# gitea_get_runtime_context
|
# gitea_get_runtime_context
|
||||||
# -------------------------------------------------------------------------
|
# -------------------------------------------------------------------------
|
||||||
|
@patch(
|
||||||
|
"mcp_server.assess_preflight_status",
|
||||||
|
return_value={"preflight_ready": True, "preflight_block_reasons": []},
|
||||||
|
)
|
||||||
@patch("mcp_server.api_request", return_value={"login": "author-user"})
|
@patch("mcp_server.api_request", return_value={"login": "author-user"})
|
||||||
@patch("mcp_server.get_auth_header", return_value="token author-pass")
|
@patch("mcp_server.get_auth_header", return_value="token author-pass")
|
||||||
def test_get_runtime_context_author(self, _auth, _api):
|
def test_get_runtime_context_author(self, _auth, _api, _preflight):
|
||||||
with patch.dict(os.environ, self._env("author-profile"), clear=True):
|
with patch.dict(os.environ, self._env("author-profile"), clear=True):
|
||||||
ctx = mcp_server.gitea_get_runtime_context(remote="dadeschools")
|
ctx = mcp_server.gitea_get_runtime_context(remote="dadeschools")
|
||||||
self.assertEqual(ctx["active_profile"], "author-profile")
|
self.assertEqual(ctx["active_profile"], "author-profile")
|
||||||
@@ -110,10 +114,26 @@ class TestRuntimeClarity(unittest.TestCase):
|
|||||||
self.assertEqual(ctx["suggested_fix"], "reviewer namespace")
|
self.assertEqual(ctx["suggested_fix"], "reviewer namespace")
|
||||||
self.assertIn("does not permit review or merge", ctx["review_merge_blocked_reasons"][0])
|
self.assertIn("does not permit review or merge", ctx["review_merge_blocked_reasons"][0])
|
||||||
self.assertIn("Switch to the reviewer MCP session", ctx["safe_next_action"])
|
self.assertIn("Switch to the reviewer MCP session", ctx["safe_next_action"])
|
||||||
|
caps = ctx["session_capabilities"]
|
||||||
|
self.assertTrue(caps["can_author_prs"])
|
||||||
|
self.assertFalse(caps["can_create_issues"])
|
||||||
|
self.assertFalse(caps["can_comment_on_issues"])
|
||||||
|
self.assertFalse(caps["can_review_prs"])
|
||||||
|
self.assertFalse(caps["can_merge_prs"])
|
||||||
|
self.assertTrue(caps["issue_comment_not_implied_by_pr_comment"])
|
||||||
|
merge_entry = next(
|
||||||
|
t for t in caps["task_capabilities"] if t["task"] == "merge_pr"
|
||||||
|
)
|
||||||
|
self.assertFalse(merge_entry["allowed_in_current_session"])
|
||||||
|
self.assertIn("reviewer-profile", merge_entry["matching_configured_profiles"])
|
||||||
|
|
||||||
|
@patch(
|
||||||
|
"mcp_server.assess_preflight_status",
|
||||||
|
return_value={"preflight_ready": True, "preflight_block_reasons": []},
|
||||||
|
)
|
||||||
@patch("mcp_server.api_request", return_value={"login": "reviewer-user"})
|
@patch("mcp_server.api_request", return_value={"login": "reviewer-user"})
|
||||||
@patch("mcp_server.get_auth_header", return_value="token reviewer-pass")
|
@patch("mcp_server.get_auth_header", return_value="token reviewer-pass")
|
||||||
def test_get_runtime_context_reviewer(self, _auth, _api):
|
def test_get_runtime_context_reviewer(self, _auth, _api, _preflight):
|
||||||
with patch.dict(os.environ, self._env("reviewer-profile"), clear=True):
|
with patch.dict(os.environ, self._env("reviewer-profile"), clear=True):
|
||||||
ctx = mcp_server.gitea_get_runtime_context(remote="dadeschools")
|
ctx = mcp_server.gitea_get_runtime_context(remote="dadeschools")
|
||||||
self.assertEqual(ctx["active_profile"], "reviewer-profile")
|
self.assertEqual(ctx["active_profile"], "reviewer-profile")
|
||||||
@@ -121,6 +141,15 @@ class TestRuntimeClarity(unittest.TestCase):
|
|||||||
self.assertTrue(ctx["review_merge_allowed"])
|
self.assertTrue(ctx["review_merge_allowed"])
|
||||||
self.assertEqual(ctx["suggested_fix"], "none")
|
self.assertEqual(ctx["suggested_fix"], "none")
|
||||||
self.assertEqual(ctx["safe_next_action"], "None; ready for operations.")
|
self.assertEqual(ctx["safe_next_action"], "None; ready for operations.")
|
||||||
|
caps = ctx["session_capabilities"]
|
||||||
|
self.assertFalse(caps["can_author_prs"])
|
||||||
|
self.assertFalse(caps["can_create_issues"])
|
||||||
|
self.assertFalse(caps["can_review_prs"])
|
||||||
|
self.assertTrue(caps["can_merge_prs"])
|
||||||
|
merge_entry = next(
|
||||||
|
t for t in caps["task_capabilities"] if t["task"] == "merge_pr"
|
||||||
|
)
|
||||||
|
self.assertTrue(merge_entry["allowed_in_current_session"])
|
||||||
|
|
||||||
# -------------------------------------------------------------------------
|
# -------------------------------------------------------------------------
|
||||||
# gitea_list_profiles
|
# gitea_list_profiles
|
||||||
|
|||||||
Reference in New Issue
Block a user