@laitszkin/apollo-toolkit 3.4.1 → 3.6.0
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/AGENTS.md +3 -0
- package/CHANGELOG.md +16 -0
- package/README.md +5 -0
- package/analyse-app-logs/scripts/__pycache__/filter_logs_by_time.cpython-312.pyc +0 -0
- package/analyse-app-logs/scripts/__pycache__/log_cli_utils.cpython-312.pyc +0 -0
- package/analyse-app-logs/scripts/__pycache__/search_logs.cpython-312.pyc +0 -0
- package/docs-to-voice/scripts/__pycache__/docs_to_voice.cpython-312.pyc +0 -0
- package/generate-spec/SKILL.md +8 -2
- package/generate-spec/agents/openai.yaml +1 -1
- package/generate-spec/scripts/__pycache__/create-specscpython-312.pyc +0 -0
- package/implement-specs-with-subagents/SKILL.md +122 -0
- package/implement-specs-with-subagents/agents/openai.yaml +4 -0
- package/katex/scripts/__pycache__/render_katex.cpython-312.pyc +0 -0
- package/merge-changes-from-local-branches/SKILL.md +9 -19
- package/open-github-issue/scripts/__pycache__/open_github_issue.cpython-312.pyc +0 -0
- package/package.json +1 -1
- package/read-github-issue/scripts/__pycache__/find_issues.cpython-312.pyc +0 -0
- package/read-github-issue/scripts/__pycache__/read_issue.cpython-312.pyc +0 -0
- package/resolve-review-comments/scripts/__pycache__/review_threads.cpython-312.pyc +0 -0
- package/review-spec-related-changes/LICENSE +21 -0
- package/review-spec-related-changes/README.md +53 -0
- package/review-spec-related-changes/SKILL.md +110 -0
- package/review-spec-related-changes/agents/openai.yaml +4 -0
- package/text-to-short-video/scripts/__pycache__/enforce_video_aspect_ratio.cpython-312.pyc +0 -0
package/AGENTS.md
CHANGED
|
@@ -39,6 +39,8 @@ This repository enables users to install and run a curated set of reusable agent
|
|
|
39
39
|
- Users can learn new or improved skills from recent Codex conversation history.
|
|
40
40
|
- Users can audit and maintain the skill catalog itself, including dependency classification and shared-skill extraction decisions.
|
|
41
41
|
- Users can implement approved spec planning sets directly in the current checkout and commit them to the active branch.
|
|
42
|
+
- Users can implement approved spec planning sets inside isolated git worktrees and keep the parent checkout clean.
|
|
43
|
+
- Users can coordinate approved multi-spec implementation batches by assigning each spec directory to an independent worktree-backed subagent with bounded concurrency.
|
|
42
44
|
- Users can summarize mistakes into separate multiple-choice and long-answer error books backed by structured reference files and rendered PDFs.
|
|
43
45
|
- Users can build or review marginfi protocol integrations using official SDK, CLI, protocol, and The Arena documentation.
|
|
44
46
|
- Users can create or maintain `AGENTS.md` so project constraints stay aligned with the repository.
|
|
@@ -50,6 +52,7 @@ This repository enables users to install and run a curated set of reusable agent
|
|
|
50
52
|
- Users can record multi-account spending and balance changes in monthly Excel ledgers with summary analytics and charts.
|
|
51
53
|
- Users can recover missing or archived `docs/plans/...` spec sets from issue context, git history, and repository evidence before continuing feature work.
|
|
52
54
|
- Users can review the current git change set from an unbiased reviewer perspective to find abstraction opportunities and simplification candidates.
|
|
55
|
+
- Users can review recent or user-specified spec-backed changes against the governing planning documents, treating unmet business goals as the most severe findings before secondary edge-case, security, and code-review checks.
|
|
53
56
|
- Users can process GitHub pull request review comments and resolve addressed threads.
|
|
54
57
|
- Users can perform repository-wide code reviews and publish confirmed findings as GitHub issues.
|
|
55
58
|
- Users can schedule a bounded project runtime window, stop it automatically, and analyze module health from captured logs.
|
package/CHANGELOG.md
CHANGED
|
@@ -7,6 +7,22 @@ All notable changes to this repository are documented in this file.
|
|
|
7
7
|
### Added
|
|
8
8
|
- (None yet)
|
|
9
9
|
|
|
10
|
+
## [v3.6.0] - 2026-04-28
|
|
11
|
+
|
|
12
|
+
### Added
|
|
13
|
+
- Add `review-spec-related-changes`, a spec-compliance review skill that checks recent or named planning documents against implementation evidence and treats unmet business goals as the most severe findings before secondary edge-case, security, and code-review checks.
|
|
14
|
+
|
|
15
|
+
### Changed
|
|
16
|
+
- Remove the post-merge code-review gate from `merge-changes-from-local-branches` so spec-related review now lives in the dedicated `review-spec-related-changes` skill.
|
|
17
|
+
|
|
18
|
+
## [v3.5.0] - 2026-04-28
|
|
19
|
+
|
|
20
|
+
### Added
|
|
21
|
+
- Add `implement-specs-with-subagents`, a coordinator skill that assigns each approved spec directory to an independent worktree-backed subagent with staggered starts and a maximum of four active implementation agents.
|
|
22
|
+
|
|
23
|
+
### Changed
|
|
24
|
+
- Tighten `generate-spec` so current templates remain the binding format even when older project specs use different layouts.
|
|
25
|
+
|
|
10
26
|
## [v3.4.1] - 2026-04-28
|
|
11
27
|
|
|
12
28
|
### Changed
|
package/README.md
CHANGED
|
@@ -23,6 +23,8 @@ A curated skill catalog for Codex, OpenClaw, Trae, Agents, and Claude Code with
|
|
|
23
23
|
- generate-spec
|
|
24
24
|
- harden-app-security
|
|
25
25
|
- implement-specs
|
|
26
|
+
- implement-specs-with-subagents
|
|
27
|
+
- implement-specs-with-worktree
|
|
26
28
|
- improve-observability
|
|
27
29
|
- iterative-code-performance
|
|
28
30
|
- iterative-code-quality
|
|
@@ -43,6 +45,7 @@ A curated skill catalog for Codex, OpenClaw, Trae, Agents, and Claude Code with
|
|
|
43
45
|
- resolve-review-comments
|
|
44
46
|
- review-change-set
|
|
45
47
|
- review-codebases
|
|
48
|
+
- review-spec-related-changes
|
|
46
49
|
- scheduled-runtime-health-check
|
|
47
50
|
- shadow-api-model-research
|
|
48
51
|
- solana-development
|
|
@@ -196,9 +199,11 @@ The install commands below were checked with the Skills CLI unless otherwise not
|
|
|
196
199
|
Compatibility note:
|
|
197
200
|
|
|
198
201
|
- `generate-spec` is a local skill used by `develop-new-features` and `enhance-existing-features`, and it can produce either a single spec set under `docs/plans/{YYYY-MM-DD}/{change_name}/` or a coordinated parallel batch under `docs/plans/{YYYY-MM-DD}/{batch_name}/{change_name}/` with shared `coordination.md`.
|
|
202
|
+
- `implement-specs-with-subagents` coordinates one `implement-specs-with-worktree` subagent per spec directory for approved multi-spec batches, with staggered launches and a maximum of four active implementation subagents.
|
|
199
203
|
- `recover-missing-plan` is a local skill used by `enhance-existing-features` and `ship-github-issue-fix` when a referenced `docs/plans/...` spec set is missing or archived.
|
|
200
204
|
- `maintain-skill-catalog` can conditionally use `find-skills`, but its install source is not verified in this repository, so it is intentionally omitted from the table.
|
|
201
205
|
- `read-github-issue` uses GitHub CLI (`gh`) directly for remote issue discovery and inspection, so it does not add any extra skill dependency.
|
|
206
|
+
- `review-spec-related-changes` is a local skill that depends on `review-change-set`, `discover-edge-cases`, and `harden-app-security` for secondary code-practice checks after business-goal completion is reviewed against the governing specs.
|
|
202
207
|
|
|
203
208
|
## Release publishing
|
|
204
209
|
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
package/generate-spec/SKILL.md
CHANGED
|
@@ -15,8 +15,8 @@ description: Generate and maintain shared feature planning artifacts (`spec.md`,
|
|
|
15
15
|
## Standards
|
|
16
16
|
|
|
17
17
|
- Evidence: Review the relevant code, configs, and authoritative docs before filling requirements or test plans; when external dependencies, libraries, frameworks, APIs, or platforms are involved, checking their official documentation is mandatory during spec creation.
|
|
18
|
-
- Execution: Generate the planning files first, keep each spec set tightly scoped, split broader work into multiple independent spec sets when needed, ensure every batch spec is independently completable and truly parallel-implementable without depending on another spec set to land first, surface shared-file or shared-contract collision risks during planning, resolve those coordination rules before implementation starts, complete them with traceable requirements and risks, handle clarification updates, then wait for explicit approval before implementation.
|
|
19
|
-
- Quality: Keep `spec.md`, `tasks.md`, `checklist.md`, `contract.md`, and `design.md` synchronized, use `test-case-strategy` to map each planned test to a concrete risk or requirement, and tailor the templates so only applicable items remain active.
|
|
18
|
+
- Execution: Generate the planning files from this skill's current templates first, keep each spec set tightly scoped, split broader work into multiple independent spec sets when needed, ensure every batch spec is independently completable and truly parallel-implementable without depending on another spec set to land first, surface shared-file or shared-contract collision risks during planning, resolve those coordination rules before implementation starts, complete them with traceable requirements and risks, handle clarification updates, then wait for explicit approval before implementation.
|
|
19
|
+
- Quality: Keep `spec.md`, `tasks.md`, `checklist.md`, `contract.md`, and `design.md` synchronized, use `test-case-strategy` to map each planned test to a concrete risk or requirement, preserve the actual headings and field structure from this skill's templates, and tailor the templates so only applicable items remain active.
|
|
20
20
|
- Output: Store planning artifacts under `docs/plans/{YYYY-MM-DD}/{change_name}/` for single-spec work, or `docs/plans/{YYYY-MM-DD}/{batch_name}/{change_name}/` plus `coordination.md` for multi-spec parallel work whose member specs remain independently approvable, independently implementable, and ready for concurrent worktree execution with pre-agreed collision rules, and keep them concise, executable, and easy to update.
|
|
21
21
|
|
|
22
22
|
## Goal
|
|
@@ -36,6 +36,8 @@ Own the shared planning-doc lifecycle for feature work so other skills can reuse
|
|
|
36
36
|
- Inspect existing `docs/plans/` directories before deciding whether to edit an existing plan set.
|
|
37
37
|
- Reuse an existing plan set only when it clearly matches the same requested issue/change scope.
|
|
38
38
|
- If the requested work is adjacent to, but not actually covered by, an existing plan set, create a new directory instead of overwriting the neighboring one.
|
|
39
|
+
- Treat existing or archived project-local specs as scope evidence only, not as formatting authority.
|
|
40
|
+
- Do not copy older spec layouts, condensed repo conventions, or neighboring plan structures when they differ from this skill's current templates.
|
|
39
41
|
|
|
40
42
|
### 2) Generate the planning files
|
|
41
43
|
|
|
@@ -63,6 +65,8 @@ Own the shared planning-doc lifecycle for feature work so other skills can reuse
|
|
|
63
65
|
- `references/templates/design.md`
|
|
64
66
|
- Generate `references/templates/coordination.md` at the batch root when multiple spec sets are intentionally created for parallel implementation.
|
|
65
67
|
- Save files under `docs/plans/{YYYY-MM-DD}/{change_name}/` or `docs/plans/{YYYY-MM-DD}/{batch_name}/{change_name}/`.
|
|
68
|
+
- After generation, fill the files in place without renaming, removing, or collapsing template headings unless a heading is explicitly template-only and not applicable to the real scope.
|
|
69
|
+
- Before approval, compare the drafted files against the current template headings and required fields; fix any drift caused by following older project examples.
|
|
66
70
|
|
|
67
71
|
### 3) Fill `spec.md`
|
|
68
72
|
|
|
@@ -174,6 +178,8 @@ Own the shared planning-doc lifecycle for feature work so other skills can reuse
|
|
|
174
178
|
- Use kebab-case for `change_name`; avoid spaces and special characters.
|
|
175
179
|
- Path rule: `scripts/...` and `references/...` in this file always mean paths under the current skill folder, not the target project root.
|
|
176
180
|
- Never overwrite a nearby issue's plan set just because the technical area overlaps; shared modules are not sufficient evidence that the scope is the same.
|
|
181
|
+
- Template authority rule: the current `references/templates/*.md` files in this skill are the binding format for new or refreshed spec documents. Older `docs/plans/...` files may inform scope, terminology, and historical decisions, but they must not override the current template structure.
|
|
182
|
+
- Before presenting specs for approval, run a template-drift pass: verify the expected template sections are present, remove stale placeholder examples, and ensure any removed section has a scope-based reason rather than being omitted because an older project spec omitted it.
|
|
177
183
|
|
|
178
184
|
## References
|
|
179
185
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
interface:
|
|
2
2
|
display_name: "generate-spec"
|
|
3
3
|
short_description: "Generate shared feature spec, task, and checklist docs before coding"
|
|
4
|
-
default_prompt: "Use $generate-spec to create or update single-spec plans under docs/plans/<date>/<change_name>/ or parallel batches under docs/plans/<date>/<batch_name>/<change_name>/ with a shared coordination.md,
|
|
4
|
+
default_prompt: "Use $generate-spec to create or update single-spec plans under docs/plans/<date>/<change_name>/ or parallel batches under docs/plans/<date>/<batch_name>/<change_name>/ with a shared coordination.md, treating this skill's current references/templates/*.md files as the binding format even when older project specs use different layouts; ensure every batch spec remains independently approvable, independently implementable, and safe for true parallel execution without depending on another batch spec landing first; surface shared-file or shared-contract collision risks during planning, settle ownership and additive-only rules in coordination.md before implementation starts, fill BDD requirements, use $test-case-strategy for risk-driven test planning and unit drift checks, make tasks.md an atomic implementation queue with concrete outputs and verification hooks, document external dependency contracts in contract.md when they materially constrain the change, write the architecture/design delta in design.md, process clarification updates, and wait for explicit approval before implementation."
|
|
Binary file
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
---
|
|
2
|
+
name: implement-specs-with-subagents
|
|
3
|
+
description: >-
|
|
4
|
+
Coordinate parallel implementation of multiple approved spec sets by assigning
|
|
5
|
+
each `docs/plans/.../<change_name>/` spec directory to a separate subagent that
|
|
6
|
+
uses `implement-specs-with-worktree`. Use when a user asks to implement a
|
|
7
|
+
multi-spec batch with subagents, parallel agents, delegated agents, or isolated
|
|
8
|
+
workers while keeping at most four implementation subagents active at once,
|
|
9
|
+
staggering starts to avoid rate-limit bursts, preserving independent subagent
|
|
10
|
+
contexts, and using the user's requested model when specified.
|
|
11
|
+
---
|
|
12
|
+
|
|
13
|
+
# Implement Specs with Subagents
|
|
14
|
+
|
|
15
|
+
## Dependencies
|
|
16
|
+
|
|
17
|
+
- Required: `implement-specs-with-worktree` for each delegated spec implementation.
|
|
18
|
+
- Conditional: `generate-spec` if the batch needs clarification before implementation; `review-change-set` if the user asks for an integration review after subagents finish.
|
|
19
|
+
- Optional: none.
|
|
20
|
+
- Fallback: If the environment cannot start independent subagents, report that limitation and fall back only if the user explicitly approves serial `implement-specs-with-worktree` execution.
|
|
21
|
+
|
|
22
|
+
## Standards
|
|
23
|
+
|
|
24
|
+
- Evidence: Read the batch-level `coordination.md` when present, enumerate the exact spec directories to implement, and verify each delegated spec has the required planning files before starting subagents.
|
|
25
|
+
- Execution: Assign exactly one implementation subagent per spec directory, keep no more than four implementation subagents active at the same time, start subagents one at a time rather than in a burst, give each subagent an independent task-local context, and instruct every subagent to use `implement-specs-with-worktree` for its assigned spec.
|
|
26
|
+
- Quality: Preserve spec ownership boundaries, avoid duplicate delegation for the same spec, track branch/worktree/commit/test outcomes for every subagent, and pause new launches when a shared blocker, collision, or rate-limit pressure appears.
|
|
27
|
+
- Output: Return a concise implementation ledger covering each spec, its subagent result, worktree branch, commit or blocker, verification run, and any integration follow-up needed.
|
|
28
|
+
|
|
29
|
+
## Goal
|
|
30
|
+
|
|
31
|
+
Coordinate a multi-spec implementation batch safely by delegating each approved spec set to an isolated subagent-backed worktree implementation.
|
|
32
|
+
|
|
33
|
+
## Workflow
|
|
34
|
+
|
|
35
|
+
### 1) Identify the batch and implementation queue
|
|
36
|
+
|
|
37
|
+
- Locate the requested batch under `docs/plans/{YYYY-MM-DD}/{batch_name}/`.
|
|
38
|
+
- Read `coordination.md` first when it exists.
|
|
39
|
+
- Enumerate only the spec directories that are in scope for this request.
|
|
40
|
+
- For each spec directory, verify the presence of:
|
|
41
|
+
- `spec.md`
|
|
42
|
+
- `tasks.md`
|
|
43
|
+
- `checklist.md`
|
|
44
|
+
- `contract.md`
|
|
45
|
+
- `design.md`
|
|
46
|
+
- Do not delegate archived, sibling, or approximate specs unless the user explicitly includes them.
|
|
47
|
+
- If `coordination.md` says the batch is not ready for parallel implementation, stop and report the blocking coordination item instead of spawning subagents.
|
|
48
|
+
|
|
49
|
+
### 2) Build a delegation plan
|
|
50
|
+
|
|
51
|
+
- Create one queue item per spec directory.
|
|
52
|
+
- Assign one subagent to one spec only; never ask one subagent to implement multiple spec directories.
|
|
53
|
+
- Keep a visible ledger with:
|
|
54
|
+
- spec path
|
|
55
|
+
- intended branch/worktree name if known
|
|
56
|
+
- assigned subagent
|
|
57
|
+
- status
|
|
58
|
+
- commit
|
|
59
|
+
- tests
|
|
60
|
+
- blockers
|
|
61
|
+
- Determine the model policy before launch:
|
|
62
|
+
- If the user specifies a model, use that model for the implementation subagents when the environment supports model selection.
|
|
63
|
+
- If the user does not specify a model, let subagents use the same model or default model policy as the coordinating agent.
|
|
64
|
+
- If the environment does not expose model selection, state that the requested model cannot be enforced and continue only when the platform's default subagent model is acceptable.
|
|
65
|
+
|
|
66
|
+
### 3) Launch subagents gradually
|
|
67
|
+
|
|
68
|
+
- Maintain a maximum of four active implementation subagents at any time.
|
|
69
|
+
- Start subagents independently and one at a time.
|
|
70
|
+
- After each start, confirm that the subagent was accepted or is running before starting the next one.
|
|
71
|
+
- If a start fails due to throttling, rate limits, capacity, or platform pressure, wait before retrying and do not start additional subagents during the cooldown.
|
|
72
|
+
- Prefer steady scheduling over maximum burst parallelism; four is the ceiling, not a target that must always be filled.
|
|
73
|
+
|
|
74
|
+
### 4) Give each subagent independent context
|
|
75
|
+
|
|
76
|
+
For each subagent, provide only task-local instructions:
|
|
77
|
+
|
|
78
|
+
- Repository root.
|
|
79
|
+
- Exact spec directory path.
|
|
80
|
+
- Parent `coordination.md` path when present.
|
|
81
|
+
- Requirement to use `implement-specs-with-worktree`.
|
|
82
|
+
- Requirement to read the full spec bundle before editing.
|
|
83
|
+
- Requirement to implement inside its own isolated worktree.
|
|
84
|
+
- Requirement to run relevant tests.
|
|
85
|
+
- Requirement to backfill the spec documents after implementation.
|
|
86
|
+
- Requirement to commit locally unless the user explicitly changes the completion boundary.
|
|
87
|
+
- Requirement to report branch, worktree path, commit hash, tests, and blockers.
|
|
88
|
+
|
|
89
|
+
Do not pass the coordinating agent's full reasoning, unrelated sibling specs, or other subagents' private work unless a concrete coordination conflict requires it.
|
|
90
|
+
|
|
91
|
+
### 5) Monitor and coordinate
|
|
92
|
+
|
|
93
|
+
- While subagents run, track completions and blockers in the ledger.
|
|
94
|
+
- When one subagent finishes, record its branch, worktree path, commit, verification results, and changed ownership boundaries.
|
|
95
|
+
- Start the next queued spec only when the active count drops below four and no shared blocker is unresolved.
|
|
96
|
+
- If two subagents report overlapping edits to a shared file or contract, pause new launches, inspect the conflict against `coordination.md`, and resolve the ownership question before continuing.
|
|
97
|
+
- If a subagent fails for a spec-local issue, keep other independent subagents running, but do not launch additional work that depends on the failed scope.
|
|
98
|
+
- If failures indicate a batch-wide planning defect, stop scheduling new subagents and report the defect.
|
|
99
|
+
|
|
100
|
+
### 6) Finish the batch report
|
|
101
|
+
|
|
102
|
+
- Do not merge branches, archive specs, push, or release unless the user explicitly requests that follow-up.
|
|
103
|
+
- Summarize every spec outcome from the ledger.
|
|
104
|
+
- Distinguish completed local commits from blocked or partial specs.
|
|
105
|
+
- Report any integration review, merge order, or post-merge validation required by `coordination.md`.
|
|
106
|
+
|
|
107
|
+
## Working Rules
|
|
108
|
+
|
|
109
|
+
- One spec directory maps to one implementation subagent.
|
|
110
|
+
- Maximum active implementation subagents: four.
|
|
111
|
+
- Subagents must be started gradually, not all at once.
|
|
112
|
+
- Every subagent must have independent context scoped to its assigned spec.
|
|
113
|
+
- Every implementation subagent must use `implement-specs-with-worktree`.
|
|
114
|
+
- The coordinating agent owns scheduling, ledger tracking, and conflict escalation; implementation subagents own their assigned worktree commits.
|
|
115
|
+
- User-specified subagent model choices should be honored when supported; otherwise inherit the coordinating agent's model/default model policy.
|
|
116
|
+
- Do not use this skill for a single spec unless the user explicitly wants subagent delegation.
|
|
117
|
+
|
|
118
|
+
## References
|
|
119
|
+
|
|
120
|
+
- `implement-specs-with-worktree`: required per-spec worktree implementation workflow.
|
|
121
|
+
- `generate-spec`: clarification and planning repair workflow when a batch is not ready for parallel implementation.
|
|
122
|
+
- `review-change-set`: optional post-implementation review workflow before merge or submission.
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
interface:
|
|
2
|
+
display_name: "Implement Specs with Subagents"
|
|
3
|
+
short_description: "Coordinate parallel spec worktree implementations"
|
|
4
|
+
default_prompt: "Use $implement-specs-with-subagents to assign each approved docs/plans spec directory to one independent subagent that uses $implement-specs-with-worktree, launch at most four implementation subagents at once with staggered starts, honor any requested model when supported, track each branch, commit, test result, and blocker, and report the batch ledger without merging or pushing unless explicitly requested."
|
|
Binary file
|
|
@@ -5,21 +5,18 @@ description: >-
|
|
|
5
5
|
into the current local branch. When conflicts arise, auto-resolve them by
|
|
6
6
|
keeping correct functionality (preferring the more recent change on the same
|
|
7
7
|
line, or the change that preserves working behavior). After merge verification,
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
pushes on that same local branch. Use when the user asks to consolidate local
|
|
14
|
-
branch work, merge named branches into the current branch, or prepare the
|
|
15
|
-
current branch for integration.
|
|
8
|
+
run `archive-specs` so completed plan sets are archived and durable project
|
|
9
|
+
docs are synchronized, then hand the current branch state to `commit-and-push`
|
|
10
|
+
so the final submit workflow commits and pushes on that same local branch.
|
|
11
|
+
Use when the user asks to consolidate local branch work, merge named branches
|
|
12
|
+
into the current branch, or prepare the current branch for integration.
|
|
16
13
|
---
|
|
17
14
|
|
|
18
15
|
# Merge Changes from Local Branches
|
|
19
16
|
|
|
20
17
|
## Dependencies
|
|
21
18
|
|
|
22
|
-
- Required: `
|
|
19
|
+
- Required: `archive-specs` to archive completed plan sets and synchronize durable project docs after merge verification, and `commit-and-push` for the final current-branch submission flow.
|
|
23
20
|
- Conditional: none.
|
|
24
21
|
- Optional: none.
|
|
25
22
|
- Fallback: If git operations fail, stop and report the error.
|
|
@@ -27,7 +24,7 @@ description: >-
|
|
|
27
24
|
## Standards
|
|
28
25
|
|
|
29
26
|
- Evidence: Inspect the original current branch, local branches, branch-name matches provided by the user or active spec names, actual conflicting files, and any active batch-spec `coordination.md` merge-order guidance before deciding what to merge.
|
|
30
|
-
- Execution: Merge only the relevant named branches back into the original current branch, read any active batch-spec `coordination.md` and honor its documented merge order when present, resolve conflicts by reading both sides and editing the merged result to preserve shipped behavior, verify the merged state,
|
|
27
|
+
- Execution: Merge only the relevant named branches back into the original current branch, read any active batch-spec `coordination.md` and honor its documented merge order when present, resolve conflicts by reading both sides and editing the merged result to preserve shipped behavior, verify the merged state, delete each successfully merged source branch and its detached worktree only after the merged result is confirmed, run `archive-specs` after merge verification so completed plan sets are archived and durable docs are synchronized, then hand the final current-branch state to `commit-and-push` so changelog/readiness/commit/push work happens through the shared submission workflow on the same branch.
|
|
31
28
|
- Quality: Never use blanket timestamp rules or default `-X ours/theirs` conflict resolution as the primary merge strategy, never infer in-scope branches from ancestry heuristics when branch names already define the target set, and do not declare success until the final current-branch state has been checked, verified, and cleared for post-merge archival/doc-sync work.
|
|
32
29
|
- Output: Produce a clean current branch with all relevant named-branch changes integrated and ready for the shared submit workflow.
|
|
33
30
|
|
|
@@ -118,16 +115,9 @@ For each in-scope named branch:
|
|
|
118
115
|
```
|
|
119
116
|
- If verification fails, fix the merged state on the current branch before proceeding.
|
|
120
117
|
|
|
121
|
-
### 4.5) Review the merged change set before submission
|
|
122
|
-
|
|
123
|
-
- After merge verification passes, invoke `review-change-set` on the merged current branch.
|
|
124
|
-
- Compare the merged code against the active spec documents and any relevant `docs/plans/` artifacts that governed the merge.
|
|
125
|
-
- Do not proceed to archival or submission until the review returns no actionable findings and the merged state is confirmed to match the spec documents.
|
|
126
|
-
- If review finds a problem or spec mismatch, fix the current branch, rerun verification, and review again before continuing.
|
|
127
|
-
|
|
128
118
|
### 5) Archive completed specs and sync durable project docs
|
|
129
119
|
|
|
130
|
-
- After all in-scope merges succeed
|
|
120
|
+
- After all in-scope merges succeed and the current-branch state has been verified, invoke `archive-specs`.
|
|
131
121
|
- Let `archive-specs` convert and archive any completed `docs/plans/...` spec sets that now reflect the delivered outcome.
|
|
132
122
|
- Let `archive-specs` synchronize durable project docs and `AGENTS.md` when the merged result changed operator workflows, repository guidance, or user-visible behavior.
|
|
133
123
|
- Do not proceed to the final submission commit while required archival or documentation updates remain unfinished.
|
|
@@ -150,7 +140,7 @@ For each in-scope named branch:
|
|
|
150
140
|
- the currently checked-out branch
|
|
151
141
|
- branches that were skipped, failed to merge, or still need manual follow-up
|
|
152
142
|
- If `git branch -d` refuses deletion because the branch is not actually merged, stop and report the branch instead of forcing deletion with `-D`.
|
|
153
|
-
- Once merge verification
|
|
143
|
+
- Once merge verification and archival/doc synchronization pass, invoke `commit-and-push` for the original current branch so the final submission flow owns:
|
|
154
144
|
- `CHANGELOG.md` readiness
|
|
155
145
|
- the final commit creation on the original current branch
|
|
156
146
|
- the user-requested push on that same branch
|
|
Binary file
|
package/package.json
CHANGED
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
MIT License
|
|
2
|
+
|
|
3
|
+
Copyright (c) 2026 LaiTszKin
|
|
4
|
+
|
|
5
|
+
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
6
|
+
of this software and associated documentation files (the "Software"), to deal
|
|
7
|
+
in the Software without restriction, including without limitation the rights
|
|
8
|
+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
9
|
+
copies of the Software, and to permit persons to whom the Software is
|
|
10
|
+
furnished to do so, subject to the following conditions:
|
|
11
|
+
|
|
12
|
+
The above copyright notice and this permission notice shall be included in all
|
|
13
|
+
copies or substantial portions of the Software.
|
|
14
|
+
|
|
15
|
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
16
|
+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
17
|
+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
18
|
+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
19
|
+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
20
|
+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
21
|
+
SOFTWARE.
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
# review-spec-related-changes
|
|
2
|
+
|
|
3
|
+
`review-spec-related-changes` reviews implementation changes against recent or user-specified planning documents.
|
|
4
|
+
|
|
5
|
+
## What this skill does
|
|
6
|
+
|
|
7
|
+
This skill:
|
|
8
|
+
|
|
9
|
+
1. Resolves the governing `docs/plans/...` spec scope from user input or recent repository changes.
|
|
10
|
+
2. Checks whether each business goal and acceptance criterion is actually implemented.
|
|
11
|
+
3. Treats unmet business goals as the most severe review findings.
|
|
12
|
+
4. Runs secondary code-practice review through `review-change-set`, `discover-edge-cases`, and `harden-app-security` for code-affecting scopes.
|
|
13
|
+
5. Reports business-goal gaps separately from edge-case, security, and maintainability findings.
|
|
14
|
+
|
|
15
|
+
## When to use
|
|
16
|
+
|
|
17
|
+
Use this skill when the task asks you to:
|
|
18
|
+
|
|
19
|
+
- review whether recent spec-backed implementation work is complete,
|
|
20
|
+
- compare current changes against a named spec directory,
|
|
21
|
+
- check whether delivered code satisfies `spec.md`, `tasks.md`, `checklist.md`, `contract.md`, or `design.md`,
|
|
22
|
+
- perform a final spec-compliance review before archive, submission, PR, or release work.
|
|
23
|
+
|
|
24
|
+
## Core principles
|
|
25
|
+
|
|
26
|
+
- Business-goal completion is reviewed first.
|
|
27
|
+
- Missing required behavior is more severe than ordinary code-practice issues.
|
|
28
|
+
- Secondary edge-case, security, and code-review findings remain clearly separated.
|
|
29
|
+
- Findings must cite concrete spec and code evidence.
|
|
30
|
+
|
|
31
|
+
## Example
|
|
32
|
+
|
|
33
|
+
Prompt example:
|
|
34
|
+
|
|
35
|
+
```text
|
|
36
|
+
Use $review-spec-related-changes to review the changes related to docs/plans/2026-04-28/order-routing.
|
|
37
|
+
List any business goals that were not fully achieved, then run edge-case, security, and code-review checks on the related code.
|
|
38
|
+
```
|
|
39
|
+
|
|
40
|
+
Expected behavior:
|
|
41
|
+
|
|
42
|
+
- the named spec set is read before judging the code,
|
|
43
|
+
- business-goal gaps are listed first and treated as highest severity,
|
|
44
|
+
- secondary review skills are invoked for the same implementation scope,
|
|
45
|
+
- the final report separates spec-compliance findings from edge-case, security, and code-review findings.
|
|
46
|
+
|
|
47
|
+
## References
|
|
48
|
+
|
|
49
|
+
- [`SKILL.md`](./SKILL.md) - full workflow and execution rules.
|
|
50
|
+
|
|
51
|
+
## License
|
|
52
|
+
|
|
53
|
+
MIT
|
|
@@ -0,0 +1,110 @@
|
|
|
1
|
+
---
|
|
2
|
+
name: review-spec-related-changes
|
|
3
|
+
description: Review recent or user-specified spec-related changes against the governing `docs/plans/...` spec documents, treat unmet business goals as the most severe findings, and then run code-practice cross-checks through `review-change-set`, `discover-edge-cases`, and `harden-app-security`. Use when users ask whether implemented work actually satisfies a spec, wants a spec compliance review, or asks to review changes related to recent or named planning documents.
|
|
4
|
+
---
|
|
5
|
+
|
|
6
|
+
# Review Spec Related Changes
|
|
7
|
+
|
|
8
|
+
## Dependencies
|
|
9
|
+
|
|
10
|
+
- Required: `review-change-set`, `discover-edge-cases`, and `harden-app-security` for code-affecting spec-related changes.
|
|
11
|
+
- Conditional: none.
|
|
12
|
+
- Optional: none.
|
|
13
|
+
- Fallback: If any required review dependency is unavailable for a code-affecting scope, stop and report the missing dependency instead of returning a partial pass.
|
|
14
|
+
|
|
15
|
+
## Standards
|
|
16
|
+
|
|
17
|
+
- Evidence: Read the governing spec documents, the related git changes, and the minimum implementation context before deciding whether the business goal was met.
|
|
18
|
+
- Execution: Resolve the spec scope first, review business-goal completion before any secondary code-practice review, then run the required review skills on the same implementation scope.
|
|
19
|
+
- Quality: Treat unmet or partially met business goals as the highest-severity findings, keep secondary edge-case/security/code-review findings outside the business-goal verdict, and avoid speculative issues that are not backed by code or spec evidence.
|
|
20
|
+
- Output: Return a prioritized issue list with business-goal gaps first, followed by edge-case, security, and code-review findings, each tied to specific spec and code evidence.
|
|
21
|
+
|
|
22
|
+
## Goal
|
|
23
|
+
|
|
24
|
+
Determine whether the implementation actually satisfies the relevant planning documents, then separately assess whether the related code is safe, robust, and maintainable.
|
|
25
|
+
|
|
26
|
+
## Scope Resolution
|
|
27
|
+
|
|
28
|
+
### User-specified spec documents
|
|
29
|
+
|
|
30
|
+
- If the user names a spec directory or file, read every governing document in that spec set, including `spec.md`, `tasks.md`, `checklist.md`, `contract.md`, `design.md`, and batch-level `coordination.md` when present.
|
|
31
|
+
- Treat the named spec documents as the authoritative business goal unless the repository contains a newer superseding plan that the user explicitly referenced.
|
|
32
|
+
- Map the spec to implementation changes using task entries, owned files, git diff paths, branch names, commit messages, and code references from the spec.
|
|
33
|
+
|
|
34
|
+
### Recent spec-related changes
|
|
35
|
+
|
|
36
|
+
- If the user asks for recent spec-related review without naming a spec, inspect the current git state first:
|
|
37
|
+
```bash
|
|
38
|
+
git status -sb
|
|
39
|
+
git diff --name-only
|
|
40
|
+
git diff --cached --name-only
|
|
41
|
+
```
|
|
42
|
+
- Look for changed or recently touched planning documents under `docs/plans/`, `docs/archive/plans/`, or the repository's documented planning location.
|
|
43
|
+
- If no planning document changed, inspect recent commits and active plan directories to identify the most recent spec set that plausibly governs the current implementation.
|
|
44
|
+
- If multiple candidate spec sets remain plausible and cannot be separated by changed files or branch names, stop and report the ambiguity instead of guessing.
|
|
45
|
+
|
|
46
|
+
## Workflow
|
|
47
|
+
|
|
48
|
+
### 1) Build the spec baseline
|
|
49
|
+
|
|
50
|
+
- Read the governing spec documents end-to-end.
|
|
51
|
+
- Extract the concrete business goals, acceptance criteria, non-goals, deferred work, and explicit verification requirements.
|
|
52
|
+
- Build a compact checklist of claims that can be proven or disproven from code, tests, docs, or command output.
|
|
53
|
+
- Keep business goals separate from implementation-quality expectations. A clean implementation does not compensate for an unmet business requirement.
|
|
54
|
+
|
|
55
|
+
### 2) Map implementation evidence
|
|
56
|
+
|
|
57
|
+
- Read the related diff, staged changes, commits, or changed files that correspond to the spec scope.
|
|
58
|
+
- Follow the minimum dependency chain needed to understand whether the behavior is actually implemented.
|
|
59
|
+
- Run or inspect the verification commands named by the spec when they are available and safe to run.
|
|
60
|
+
- Mark each business goal as:
|
|
61
|
+
- `Met`: direct implementation and verification evidence exists.
|
|
62
|
+
- `Partially met`: some required behavior exists, but an acceptance criterion, integration path, or verification proof is missing.
|
|
63
|
+
- `Not met`: implementation evidence is absent or contradicts the spec.
|
|
64
|
+
- `Deferred/N/A`: the spec explicitly excludes or defers the item.
|
|
65
|
+
|
|
66
|
+
### 3) Review business-goal completion first
|
|
67
|
+
|
|
68
|
+
- Report every `Not met` and `Partially met` business goal before secondary review findings.
|
|
69
|
+
- Assign the highest severity to business-goal failures because they mean the delivered change does not satisfy the requested work.
|
|
70
|
+
- Include exact spec evidence and code evidence for each gap.
|
|
71
|
+
- Do not continue into archival, submission, or release recommendations while business-goal failures remain unresolved.
|
|
72
|
+
|
|
73
|
+
### 4) Run secondary code-practice reviews
|
|
74
|
+
|
|
75
|
+
After the business-goal pass is complete, invoke the required review skills on the same code-affecting scope:
|
|
76
|
+
|
|
77
|
+
- Use `review-change-set` to identify architecture, abstraction, and simplification findings in the related diff.
|
|
78
|
+
- Use `discover-edge-cases` to identify reproducible boundary, failure-path, state, and observability risks.
|
|
79
|
+
- Use `harden-app-security` to identify reproducible vulnerabilities and adversarial trust-boundary failures.
|
|
80
|
+
|
|
81
|
+
Keep these findings separate from the business-goal verdict unless the issue also prevents a required acceptance criterion from being satisfied.
|
|
82
|
+
|
|
83
|
+
### 5) Produce the final review
|
|
84
|
+
|
|
85
|
+
Return findings in this order:
|
|
86
|
+
|
|
87
|
+
1. Business-goal failures
|
|
88
|
+
- Severity: always highest for unmet or partially met required goals.
|
|
89
|
+
- Include spec evidence, implementation evidence, and the missing acceptance criterion.
|
|
90
|
+
2. Edge-case findings
|
|
91
|
+
- Include reproduction or concrete trigger evidence.
|
|
92
|
+
3. Security findings
|
|
93
|
+
- Include exploit path, protected asset, and reproducibility evidence.
|
|
94
|
+
4. Code-review findings
|
|
95
|
+
- Include architecture, abstraction, simplification, or maintainability evidence.
|
|
96
|
+
5. Passing evidence
|
|
97
|
+
- Summarize the business goals that were confirmed met.
|
|
98
|
+
6. Residual uncertainty
|
|
99
|
+
- List unverified checks, commands not run, ambiguous spec mappings, or external dependencies that could not be proven.
|
|
100
|
+
|
|
101
|
+
If no actionable issue is found, state that no business-goal, edge-case, security, or code-review findings were identified, and still list the spec documents and verification evidence reviewed.
|
|
102
|
+
|
|
103
|
+
## Working Rules
|
|
104
|
+
|
|
105
|
+
- Do not edit code, tests, or specs during this review.
|
|
106
|
+
- Do not archive specs, commit, push, tag, or release from this skill.
|
|
107
|
+
- Do not let secondary code quality findings bury business-goal failures.
|
|
108
|
+
- Do not treat checked tasks as proof by themselves; verify the implementation.
|
|
109
|
+
- Do not infer success from author intent, branch names, or prior conversation context unless the repository evidence supports it.
|
|
110
|
+
- Prefer fewer confirmed findings over broad speculative feedback.
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
interface:
|
|
2
|
+
display_name: "Review Spec Related Changes"
|
|
3
|
+
short_description: "Review spec-backed changes for business-goal completion and secondary code-practice risks"
|
|
4
|
+
default_prompt: "Use $review-spec-related-changes to resolve the recent or user-specified spec documents, verify each business goal and acceptance criterion against the related implementation evidence, treat unmet business goals as the most severe findings, and then run $review-change-set, $discover-edge-cases, and $harden-app-security on the same code-affecting scope for secondary code-practice review."
|