@xevy/skills 0.1.32 → 0.1.35
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.claude-plugin/plugin.json +2 -2
- package/README.md +3 -2
- package/package.json +1 -1
- package/skills/create-artifact/SKILL.md +20 -8
- package/skills/create-artifact/evals/evals.json +14 -0
- package/skills/create-xevy-task/SKILL.md +4 -0
- package/skills/merge/SKILL.md +26 -50
- package/skills/merge-pull-request/SKILL.md +71 -0
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "xevy",
|
|
3
3
|
"displayName": "Xevy",
|
|
4
|
-
"description": "Native /xevy:* SDLC workflow commands driven through the Xevy MCP server.
|
|
5
|
-
"version": "0.1.
|
|
4
|
+
"description": "Native /xevy:* SDLC workflow commands driven through the Xevy MCP server. Analyze, plan, execute, fix, and move-to-qa run locally by default and accept --cloud for the server Web Agent. Merge stays local; merge-pull-request evaluates and lands the remote PR.",
|
|
5
|
+
"version": "0.1.35",
|
|
6
6
|
"author": {
|
|
7
7
|
"name": "Xevy"
|
|
8
8
|
},
|
package/README.md
CHANGED
|
@@ -114,13 +114,14 @@ with `codex mcp add`.
|
|
|
114
114
|
| `plan [task] [--cloud]` | Planning + review (local by default) |
|
|
115
115
|
| `execute [task] [--cloud]` | Build, verify, and open a PR (local by default) |
|
|
116
116
|
| `fix [task] [--cloud]` | Rework after review (local by default) |
|
|
117
|
-
| `merge [task]
|
|
117
|
+
| `merge [task]` | Merge a task branch locally for review; leaves remotes and pull requests unchanged |
|
|
118
|
+
| `merge-pull-request [URL\|number\|branch]` | Evaluate a PR, repair conflicts, handle blockers, and merge it remotely |
|
|
118
119
|
| `move-to-qa [task] [--cloud]` | QA handoff (local by default) |
|
|
119
120
|
| `deploy` | Coolify preview/main |
|
|
120
121
|
| `investigate` | Diagnose with ephemeral scripts (.env; no secrets) |
|
|
121
122
|
| `create-xevy-task` | Capture session work into a task |
|
|
122
123
|
|
|
123
|
-
The
|
|
124
|
+
The analyze, plan, execute, fix, and move-to-qa skills run in the current coding-agent session by default. Add the exact `--cloud` flag before or after the task code to delegate one of those workflows to Xevy's server agent, for example `execute VI22-01 --cloud`. Merge stays local; `merge-pull-request` evaluates and lands an open pull request.
|
|
124
125
|
|
|
125
126
|
## Security
|
|
126
127
|
|
package/package.json
CHANGED
|
@@ -42,12 +42,22 @@ Apply the rules for the selected format:
|
|
|
42
42
|
|
|
43
43
|
Return a complete document with `<!doctype html>`, `<html>`, `<head>`, viewport metadata, and `<body>`. Keep CSS and JavaScript inline by default.
|
|
44
44
|
|
|
45
|
-
For a report, assessment, proposal, strategy, or other long-form decision document, you may instead use Xevy's optional built-in report theme. It is a convenience, not a requirement.
|
|
45
|
+
For a report, assessment, proposal, strategy, or other long-form decision document, you may instead use Xevy's optional built-in report theme. It is a convenience, not a requirement.
|
|
46
|
+
|
|
47
|
+
Before authoring themed HTML, resolve the theme from Xevy's public manifest:
|
|
48
|
+
|
|
49
|
+
1. Resolve the Xevy HTTP(S) origin from the active environment; use `https://xevy.ai` when no environment-specific origin is available.
|
|
50
|
+
2. Fetch `<xevy-origin>/artifact-assets/xevy-report/manifest.json` as a read-only authoring step.
|
|
51
|
+
3. Accept only a manifest with `schemaVersion: 1`, a `current` version, non-empty `current.assets.stylesheet` and `current.assets.script` paths, and a matching entry in `versions`. Asset paths must be root-relative paths under `/artifact-assets/xevy-report/<version>/` and must match the selected version.
|
|
52
|
+
4. If the user requests a supported version, use its `versions` entry. Otherwise use `recommendedByUseCase` for the document type when that version exists, falling back to `current`.
|
|
53
|
+
5. Resolve the selected stylesheet and script paths into the HTML before saving it. Use the exact immutable paths returned by the manifest; do not substitute a guessed version.
|
|
54
|
+
6. Do not fetch the manifest from inside the Artifact. Artifact network access remains disabled.
|
|
55
|
+
|
|
56
|
+
If the manifest cannot be fetched, parsed, or validated, create self-contained HTML with inline CSS and JavaScript. Do not rely on a remembered or stale theme version.
|
|
57
|
+
|
|
58
|
+
After inserting the two resolved asset elements in `<head>`, use the stable markup hooks:
|
|
46
59
|
|
|
47
60
|
```html
|
|
48
|
-
<link rel="stylesheet" href="/artifact-assets/xevy-report/v2/xevy-report.css">
|
|
49
|
-
<script defer src="/artifact-assets/xevy-report/v2/xevy-report.js"></script>
|
|
50
|
-
</head>
|
|
51
61
|
<body
|
|
52
62
|
data-xevy-report
|
|
53
63
|
data-report-title="Report title"
|
|
@@ -70,16 +80,18 @@ For a report, assessment, proposal, strategy, or other long-form decision docume
|
|
|
70
80
|
</body>
|
|
71
81
|
```
|
|
72
82
|
|
|
73
|
-
|
|
83
|
+
Treat the manifest as the theme contract. Use its `flavor`, `capabilities`, `authoring`, and selected version metadata to understand the current components and behavior. The stable markup includes summary metrics (`.xr-summary`, `.xr-stat-value`), verdicts (`.xr-verdict`), evidence cards (`.xr-grid-2`, `.xr-card`), findings (`.xr-finding`), priorities (`.xr-priority-list`, `.xr-priority`), phased delivery (`.xr-timeline`, `.xr-phase`), offers (`.xr-offer`), callouts (`.xr-callout`), statuses (`.xr-status`), responsive tables and print styles. The dependency-free script progressively enhances the document, which must remain readable if JavaScript does not run.
|
|
84
|
+
|
|
85
|
+
Use `.xr-wide` for every top-level report section by default so the document keeps one consistent report canvas. Use `.xr-prose` only when the user explicitly asks for a narrower editorial reading measure. Do not alternate between wide and prose sections without that explicit direction, and do not wrap content that should remain wide in a nested `.xr-prose`.
|
|
74
86
|
|
|
75
|
-
Choose
|
|
87
|
+
Choose self-contained HTML when the Artifact must remain portable outside Xevy, needs a distinct visual direction, the shared theme does not fit, or the public manifest cannot be validated. Every versioned theme asset published through the manifest is immutable; the stable manifest is the only pointer that changes when a new version becomes recommended.
|
|
76
88
|
|
|
77
|
-
|
|
89
|
+
The built-in helper deliberately keeps the Artifact in an opaque sandbox. Absolute HTTP(S) links use browser-enforced, user-activated navigation in the top-level viewer; they cannot navigate it without a user click. The print action sends only the documented `xevy:artifact-print` request and page height to the viewer. Xevy verifies the source frame, bounds the height, and asks the user to confirm in a viewer-owned control before opening the browser print UI. Do not add popup, modal, same-origin, form, download or unrestricted parent access to an Artifact.
|
|
78
90
|
|
|
79
91
|
- Make the main information or interaction immediately clear.
|
|
80
92
|
- Use semantic HTML, visible keyboard focus, labelled controls, sufficient contrast, responsive layout, and `prefers-reduced-motion` where motion is present.
|
|
81
93
|
- Use system fonts, inline SVG, CSS, and data URLs only. Do not reference CDNs, remote fonts, images, APIs, iframes, server-submitting forms, or any script or stylesheet other than the optional built-in Xevy report theme above.
|
|
82
|
-
- Keep state local. Do not assume cookies, same-origin access, parent-page DOM access, or unrestricted storage.
|
|
94
|
+
- Keep state local. Do not assume cookies, same-origin access, parent-page DOM access, or unrestricted storage. The manifest-selected built-in script may use only its documented one-way print `postMessage`; custom Artifact code must not inspect or control the parent.
|
|
83
95
|
- Escape user-supplied values inserted into markup or JavaScript.
|
|
84
96
|
- Include real content. Do not leave placeholder controls, lorem ipsum, TODOs, or buttons that do nothing.
|
|
85
97
|
|
|
@@ -60,6 +60,20 @@
|
|
|
60
60
|
"create_attachment uses textContent, application/vnd.excalidraw+json, an .excalidraw filename, and public false.",
|
|
61
61
|
"The final response reports the returned viewer URL and notes that the downloaded file remains editable."
|
|
62
62
|
]
|
|
63
|
+
},
|
|
64
|
+
{
|
|
65
|
+
"id": 6,
|
|
66
|
+
"prompt": "Create a polished HTML assessment report with an executive view, evidence findings, recommendations, a roadmap, and delivery details. Use the built-in Xevy report theme and save it privately in this project Drive.",
|
|
67
|
+
"expected_output": "A responsive themed HTML report that resolves the recommended immutable assets from the public manifest before authoring and consistently uses the wide report canvas unless the user explicitly requests a narrow editorial measure.",
|
|
68
|
+
"files": [],
|
|
69
|
+
"expectations": [
|
|
70
|
+
"The agent fetches and validates the public Xevy report-theme manifest before selecting the optional built-in theme.",
|
|
71
|
+
"The stored HTML uses the exact immutable stylesheet and script paths returned by the manifest and does not fetch the manifest at runtime.",
|
|
72
|
+
"If the manifest is unavailable or invalid, the agent falls back to self-contained HTML instead of guessing or reusing a stale version.",
|
|
73
|
+
"Every top-level report content section uses class xr-wide by default.",
|
|
74
|
+
"No top-level section uses xr-prose because the user did not request a narrow editorial measure.",
|
|
75
|
+
"create_attachment is called with textContent, mimeType text/html, an .html filename, and public false."
|
|
76
|
+
]
|
|
63
77
|
}
|
|
64
78
|
]
|
|
65
79
|
}
|
|
@@ -41,6 +41,8 @@ Call `create_task` with:
|
|
|
41
41
|
|
|
42
42
|
Check `list_tasks`/`find_task` once more before creating to avoid a duplicate.
|
|
43
43
|
|
|
44
|
+
**Call order (mandatory):** `create_task` must succeed and return `task.id` before ANY call that takes a taskId (`create_task_note`, `update_task`, `update_task_status`, `create_decision`). Never invent or placeholder a taskId — use the real id from the create result.
|
|
45
|
+
|
|
44
46
|
## 4b. Raise open questions (when ambiguous)
|
|
45
47
|
After the task exists, if scope, approach, category/epic placement, or trade-offs are **genuinely ambiguous** — don't bury them in the description or guess:
|
|
46
48
|
- Call `mcp__xevy__create_decision` with preset choices + explanations (optional follow-up per choice).
|
|
@@ -50,6 +52,7 @@ After the task exists, if scope, approach, category/epic placement, or trade-off
|
|
|
50
52
|
- In **ordinary mode**, this is the primary way to capture unresolved intake ambiguities.
|
|
51
53
|
|
|
52
54
|
## 5. Attach reviewer/QA guidance + set status
|
|
55
|
+
- **404 recovery:** If a note call returns `Task not found`, do NOT retry it — the task doesn't exist yet; call `create_task` first and use its returned `task.id`.
|
|
53
56
|
- **Who picks it up next?** If `$ARGUMENTS` has `--review` or `--qa`, use that; otherwise ask: a **developer** (code review → `for_review`) or **QA** (testing → `for_qa`)?
|
|
54
57
|
- **For developer review:** add a `Technical Review Instructions` note (`create_task_note`) — what changed and where, how to run it locally, and the risk areas to scrutinise.
|
|
55
58
|
- **For QA:** add a `QA Re-Testing Guide` note — non-technical and UI-verifiable: (1) preconditions, (2) step-by-step reproduction with expected vs actual, (3) validation checks, (4) evidence to capture, (5) final verdict.
|
|
@@ -62,6 +65,7 @@ No AI work to capture (or a fresh, unrelated task): create the task from `$ARGUM
|
|
|
62
65
|
Give the task **code + the `url` returned by the create/update tool** (always show this link so the user can open and review it), its **status**, any **open decisions** (call `list_task_decisions` if you raised questions), and a one-line summary of what was captured (PR link, branch, preview URL). Tell the user a developer/QA can now pick it up directly from Xevy (capture mode) or that they should answer open questions and analyze/plan while draft (ordinary mode). After planning, AI Agent-owned Process Owner stages advance automatically; human-owned stages wait for the user to run `/xevy:mark-ready`.
|
|
63
66
|
|
|
64
67
|
## Rules
|
|
68
|
+
- Call order: `create_task` first, then any taskId-dependent call with its returned `task.id`; never retry a `Task not found` note call.
|
|
65
69
|
- Evidence before claims — gather PR/branch/changes/tests from git and the session; never invent them.
|
|
66
70
|
- One task per piece of work — update an existing task instead of duplicating.
|
|
67
71
|
- Open questions belong on decisions (`create_decision`), not buried as assumptions in the description.
|
package/skills/merge/SKILL.md
CHANGED
|
@@ -1,64 +1,40 @@
|
|
|
1
1
|
---
|
|
2
2
|
name: merge
|
|
3
|
-
description: Merge a task branch
|
|
4
|
-
argument-hint: "[task]
|
|
3
|
+
description: Merge a task branch into the current branch in the local coding-agent session, resolve conflicts, and verify the result without pushing or changing a pull request. Use for a local integration preview. Use merge-pull-request when the user wants a pull request reviewed and merged remotely.
|
|
4
|
+
argument-hint: "[task]"
|
|
5
5
|
disable-model-invocation: true
|
|
6
|
-
allowed-tools: "Read Grep Edit Bash mcp__xevy__find_task
|
|
6
|
+
allowed-tools: "Read Grep Edit Bash mcp__xevy__find_task"
|
|
7
7
|
---
|
|
8
8
|
|
|
9
|
-
# /xevy:merge — merge locally
|
|
9
|
+
# /xevy:merge — merge locally
|
|
10
10
|
|
|
11
|
-
|
|
11
|
+
Merge the task branch into the current checked-out branch so the user can inspect the integrated result locally. This command leaves every remote branch and pull request unchanged.
|
|
12
12
|
|
|
13
|
-
##
|
|
13
|
+
## 1. Resolve the task and branches
|
|
14
14
|
|
|
15
|
-
-
|
|
16
|
-
-
|
|
17
|
-
-
|
|
18
|
-
- If the Local workflow cannot be completed, stop and report exactly what is blocking it, then let the user decide whether to rerun with `--cloud`. Never switch engines mid-run and never run both.
|
|
19
|
-
- With `--cloud`, follow the **Cloud workflow** and do not duplicate the work locally beyond the review-and-correct step it defines.
|
|
15
|
+
- Resolve `$ARGUMENTS` as a task code, task id, title, or branch name. Use the in-context task when the argument is empty and the context identifies one task clearly.
|
|
16
|
+
- Identify the canonical feature branch and the current checked-out target branch. Confirm the target from repository context when it is clear; ask the user when choosing a target would change the result materially.
|
|
17
|
+
- Treat `--cloud` as an unsupported argument. Stop and direct the user to `/xevy:merge-pull-request` for remote pull-request evaluation and merging.
|
|
20
18
|
|
|
21
|
-
##
|
|
19
|
+
## 2. Merge locally
|
|
22
20
|
|
|
23
|
-
|
|
21
|
+
- Inspect `git status` first and preserve unrelated user changes. Stop when existing changes overlap the merge or make the result unsafe to interpret.
|
|
22
|
+
- Fetch the feature branch when it exists only on the remote, then merge it into the current checked-out branch.
|
|
23
|
+
- Resolve conflicts directly when the intended result follows from the task, surrounding code, tests, and repository conventions. List every conflict file resolved.
|
|
24
|
+
- Ask the user about any conflict whose correct behavior depends on a product or data decision.
|
|
25
|
+
- Stage the resolved files and complete the local merge commit.
|
|
24
26
|
|
|
25
|
-
##
|
|
27
|
+
## 3. Review and verify
|
|
26
28
|
|
|
27
|
-
|
|
29
|
+
- Inspect the merged diff and `git status`.
|
|
30
|
+
- Run the project's relevant type-check, lint, test, and build checks for the merged scope.
|
|
31
|
+
- Fix failures introduced by the conflict resolution, then rerun the affected checks.
|
|
32
|
+
- Report `PASS`, `PARTIAL`, or `FAIL`, the merged source and target branches, the merge commit, conflicts resolved, and verification evidence.
|
|
28
33
|
|
|
29
|
-
|
|
34
|
+
## Local safety
|
|
30
35
|
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
- The merge stays in this working copy. Do not `git push` anything — not the base branch, not the feature branch, not tags.
|
|
38
|
-
- Do not open, update, or merge a pull request, and do not call the GitHub merge API, `gh pr merge`, or `gh pr create`. Landing the branch on the remote is the Cloud workflow's job and requires `--cloud`.
|
|
39
|
-
- Do not change task status; in particular, do not move the task to `done`.
|
|
40
|
-
- Do not deploy main, and do not "land it through a PR first" to make the merge visible remotely. If the user wants main updated, say the merge is local and unpushed, and let them decide what to do next.
|
|
41
|
-
- The user pushes manually from the main worktree.
|
|
42
|
-
- Keep the task worktree for iteration; do not delete it.
|
|
43
|
-
|
|
44
|
-
## 2B. Cloud workflow (`--cloud`)
|
|
45
|
-
|
|
46
|
-
### Run the server action
|
|
47
|
-
|
|
48
|
-
- Call `mcp__xevy__start_ai_action({ taskId, action: "merge", stream: true })`; always pass `stream: true`. Report live progress, conflicts, and verification results as they arrive. Do not use fire-and-forget or sleep/manual polling loops.
|
|
49
|
-
- Only if the streamed call returns before a terminal status because of a genuine disconnect, resume with `mcp__xevy__get_ai_execution` (use `list_ai_executions` if needed).
|
|
50
|
-
- On failure, surface the output and offer to retry or rerun `/xevy:merge` without `--cloud` for a local-only merge.
|
|
51
|
-
|
|
52
|
-
The server agent verifies the open-subtasks gate, syncs the base into the feature branch, then lands the feature into the remote base/default branch through the GitHub merge API when possible or a local merge and push otherwise. The action does not change task status.
|
|
53
|
-
|
|
54
|
-
### Review and correct
|
|
55
|
-
|
|
56
|
-
- Fetch origin and inspect the merged branch. Confirm the merge is clean, the base was integrated, and build/tests pass.
|
|
57
|
-
- If conflicts remain or tests fail, fix them on the feature branch; never push a protected branch directly. Re-verify before finishing.
|
|
58
|
-
- Report PASS/PARTIAL/FAIL with evidence. Merge mode must not move the task to `done`.
|
|
59
|
-
|
|
60
|
-
## 3. Main deploy — cloud workflow only (optional, policy-aware)
|
|
61
|
-
|
|
62
|
-
This step does not apply to the Local workflow. After a local merge, report that the merge is local and unpushed, so main cannot reflect it, and stop there.
|
|
63
|
-
|
|
64
|
-
In the Cloud workflow, if the user wants main updated, `mcp__xevy__deploy_main` deploys the project's remote default branch. Never push protected branches (`master`, `main`, `develop`, `staging`) to make main reflect local work, and warn that main shows the remote/PR-merged state. Report the main URL.
|
|
36
|
+
- Keep the merge in this working copy. Do not push branches or tags.
|
|
37
|
+
- Leave pull requests unchanged. Do not call the GitHub merge API or run `gh pr merge`, `gh pr create`, or `gh pr edit`.
|
|
38
|
+
- Keep the task status unchanged.
|
|
39
|
+
- Keep task worktrees available for follow-up work.
|
|
40
|
+
- Leave deployment unchanged.
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
---
|
|
2
|
+
name: merge-pull-request
|
|
3
|
+
description: Evaluate a GitHub pull request, repair merge conflicts and PR-caused failures on its head branch, verify it, and merge it when ready. Use whenever the user asks to review and merge a PR, resolve a PR conflict before merging, or replace the former merge --cloud workflow. Raise remaining issues and blockers with evidence, then ask whether to create Xevy tasks or explicitly disregard them before proceeding.
|
|
4
|
+
argument-hint: "[pull-request URL|number|branch]"
|
|
5
|
+
disable-model-invocation: true
|
|
6
|
+
allowed-tools: "Read Grep Edit Bash mcp__xevy__find_task mcp__xevy__list_tasks mcp__xevy__get_project_workbreakdown mcp__xevy__create_task"
|
|
7
|
+
---
|
|
8
|
+
|
|
9
|
+
# /xevy:merge-pull-request — evaluate, repair, and merge a pull request
|
|
10
|
+
|
|
11
|
+
Review the exact pull request, repair merge conflicts and PR-caused failures on its head branch, and merge it after the evidence supports release. The command may push repairs to the pull-request branch and merge the pull request. It keeps task status, deployments, and worktrees unchanged.
|
|
12
|
+
|
|
13
|
+
## 1. Resolve the pull request
|
|
14
|
+
|
|
15
|
+
- Resolve `$ARGUMENTS` as a GitHub pull-request URL, pull-request number, or head branch. When it is empty, use the pull request associated with the current branch only when exactly one open pull request matches.
|
|
16
|
+
- Verify GitHub CLI authentication and repository identity before making changes.
|
|
17
|
+
- Read the pull request with `gh pr view`, including its number, URL, state, draft state, head and base branches, mergeability, merge-state status, review decision, checks, commits, and changed files.
|
|
18
|
+
- Stop with a clear blocker when the pull request is closed, already merged, missing, or belongs to a different repository than the checkout.
|
|
19
|
+
- Record the exact head repository and branch. Repairs belong on the pull-request head branch; protected base branches receive changes through the pull request.
|
|
20
|
+
|
|
21
|
+
## 2. Evaluate the change
|
|
22
|
+
|
|
23
|
+
- Fetch the base and head refs, inspect the complete pull-request diff, and read the relevant callers, tests, migrations, configuration, and established patterns.
|
|
24
|
+
- Check the pull request against its stated goal and repository instructions. Focus on correctness, security, data integrity, backward compatibility, operational safety, and test coverage.
|
|
25
|
+
- Run the project-relevant type-check, lint, test, and build checks. Separate failures caused by the pull request from known baseline failures when evidence permits.
|
|
26
|
+
- Inspect required GitHub checks, requested reviews, branch protection, draft state, and merge queue requirements.
|
|
27
|
+
- Classify each remaining finding as:
|
|
28
|
+
- `BLOCKER`: merging can cause incorrect behavior, security exposure, data loss, an incompatible contract, a failed required check, or a branch-protection violation.
|
|
29
|
+
- `ISSUE`: a valid follow-up concern whose impact does not make this pull request unsafe to merge.
|
|
30
|
+
- Give every finding a concise title, evidence, affected path or check, impact, and recommended action.
|
|
31
|
+
|
|
32
|
+
## 3. Repair conflicts and PR-caused failures
|
|
33
|
+
|
|
34
|
+
- Work from a clean checkout of the pull-request head branch. Preserve unrelated user changes and use an existing task worktree when it already owns that branch.
|
|
35
|
+
- Merge the latest remote base branch into the head branch. Resolve conflicts from repository behavior, task intent, tests, and surrounding code.
|
|
36
|
+
- Repair verification failures introduced by the pull request or by the conflict resolution when the fix is clear and stays within the pull request's scope.
|
|
37
|
+
- Pause for a product decision when a conflict has multiple valid outcomes with materially different behavior.
|
|
38
|
+
- Stage and commit the repairs with an evidence-based message, then push the pull-request head branch. Never push a protected base branch directly.
|
|
39
|
+
- Rerun affected local checks and refresh the GitHub pull-request state after the push. Wait for required checks through GitHub's supported check-watching command when they are running.
|
|
40
|
+
|
|
41
|
+
## 4. Handle remaining findings
|
|
42
|
+
|
|
43
|
+
- Present all remaining `BLOCKER` and `ISSUE` findings before merging.
|
|
44
|
+
- A remaining blocker pauses the merge. Ask one direct question that lists the blockers and offers these choices:
|
|
45
|
+
- **Create task:** create a draft Xevy task for each coherent blocker and leave the pull request open.
|
|
46
|
+
- **Disregard and merge:** record the user's explicit override and continue to the merge attempt. GitHub branch protection and required checks still govern whether the merge can complete.
|
|
47
|
+
- Accept an override only from the user's explicit reply in the current conversation. Silence, earlier urgency, or a general request to merge does not resolve a newly discovered blocker.
|
|
48
|
+
- Keep security exposure, credential leakage, malicious behavior, and credible data-loss findings blocked until the underlying condition is removed. Report that these findings require a fix.
|
|
49
|
+
- Report non-blocking issues in the final result. Create follow-up tasks only with the user's approval.
|
|
50
|
+
|
|
51
|
+
### Creating blocker tasks
|
|
52
|
+
|
|
53
|
+
- Resolve the linked Xevy task or project from `.xevy/project.json`, pull-request metadata, and `find_task`/`list_tasks`.
|
|
54
|
+
- Check for an existing task that already covers the blocker.
|
|
55
|
+
- Use `get_project_workbreakdown` to select the fitting category and epic.
|
|
56
|
+
- Create a draft task with the blocker title, user impact, pull-request URL, affected path or check, exact evidence, reproduction or verification steps, and the desired safe outcome.
|
|
57
|
+
- Return every created task's code and URL. Keep the pull request open.
|
|
58
|
+
|
|
59
|
+
## 5. Merge when ready
|
|
60
|
+
|
|
61
|
+
- Refresh the pull-request state immediately before merging. A ready pull request is open, non-draft, conflict-free, free of unresolved blockers, and compliant with required checks and repository protection.
|
|
62
|
+
- Follow the repository's established merge method. Infer it from repository settings and recent merged pull requests; use squash when the repository permits multiple methods and no convention is evident.
|
|
63
|
+
- Merge with `gh pr merge` and keep branch deletion separate from this command.
|
|
64
|
+
- Confirm the remote pull request reports a merged timestamp and merge commit. Report the pull-request URL, merge method, commit, repaired conflicts, verification results, and any approved disregards or follow-up issues.
|
|
65
|
+
|
|
66
|
+
## Boundaries
|
|
67
|
+
|
|
68
|
+
- Keep the Xevy task status unchanged. Merge approval and SDLC completion remain separate gates.
|
|
69
|
+
- Leave deployments and worktrees unchanged.
|
|
70
|
+
- Avoid broad refactors while repairing a pull request. Raise out-of-scope work as an issue or blocker with evidence.
|
|
71
|
+
- Report authentication, permission, fork-push, branch-protection, and infrastructure failures as operational blockers with the exact failing command or GitHub state.
|