forge-workflow 0.0.4 → 0.0.6
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/commands/dev.md +345 -340
- package/.claude/commands/plan.md +566 -521
- package/.claude/commands/premerge.md +186 -176
- package/.claude/commands/research.md +42 -42
- package/.claude/commands/review.md +448 -442
- package/.claude/commands/rollback.md +721 -721
- package/.claude/commands/ship.md +212 -164
- package/.claude/commands/sonarcloud.md +152 -152
- package/.claude/commands/status.md +90 -48
- package/.claude/commands/validate.md +288 -282
- package/.claude/commands/verify.md +269 -221
- package/.claude/rules/greptile-review-process.md +285 -285
- package/.claude/rules/workflow.md +121 -105
- package/.claude/scripts/greptile-resolve.sh +558 -526
- package/.claude/scripts/load-env.sh +32 -32
- package/.cline/workflows/dev.md +342 -337
- package/.cline/workflows/plan.md +563 -518
- package/.cline/workflows/premerge.md +183 -173
- package/.cline/workflows/research.md +39 -39
- package/.cline/workflows/review.md +445 -439
- package/.cline/workflows/rollback.md +718 -718
- package/.cline/workflows/ship.md +209 -161
- package/.cline/workflows/sonarcloud.md +146 -146
- package/.cline/workflows/status.md +87 -45
- package/.cline/workflows/validate.md +285 -279
- package/.cline/workflows/verify.md +266 -218
- package/.codex/config.toml +11 -11
- package/.codex/skills/dev/SKILL.md +345 -340
- package/.codex/skills/plan/SKILL.md +566 -521
- package/.codex/skills/premerge/SKILL.md +186 -176
- package/.codex/skills/research/SKILL.md +42 -42
- package/.codex/skills/review/SKILL.md +448 -442
- package/.codex/skills/rollback/SKILL.md +721 -721
- package/.codex/skills/ship/SKILL.md +212 -164
- package/.codex/skills/sonarcloud/SKILL.md +149 -149
- package/.codex/skills/status/SKILL.md +90 -48
- package/.codex/skills/validate/SKILL.md +288 -282
- package/.codex/skills/verify/SKILL.md +269 -221
- package/.cursor/commands/dev.md +342 -337
- package/.cursor/commands/plan.md +563 -518
- package/.cursor/commands/premerge.md +183 -173
- package/.cursor/commands/research.md +39 -39
- package/.cursor/commands/review.md +445 -439
- package/.cursor/commands/rollback.md +718 -718
- package/.cursor/commands/ship.md +209 -161
- package/.cursor/commands/sonarcloud.md +146 -146
- package/.cursor/commands/status.md +87 -45
- package/.cursor/commands/validate.md +285 -279
- package/.cursor/commands/verify.md +266 -218
- package/.cursor/rules/permissions-guidance.mdc +37 -37
- package/.forge/hooks/check-tdd.js +240 -240
- package/.github/PLUGIN_TEMPLATE.json +32 -32
- package/.github/prompts/dev.prompt.md +347 -342
- package/.github/prompts/plan.prompt.md +568 -523
- package/.github/prompts/premerge.prompt.md +188 -178
- package/.github/prompts/research.prompt.md +44 -44
- package/.github/prompts/review.prompt.md +450 -444
- package/.github/prompts/rollback.prompt.md +723 -723
- package/.github/prompts/ship.prompt.md +214 -166
- package/.github/prompts/sonarcloud.prompt.md +151 -151
- package/.github/prompts/status.prompt.md +92 -50
- package/.github/prompts/validate.prompt.md +290 -284
- package/.github/prompts/verify.prompt.md +271 -223
- package/.github/workflows/beads-to-github.yml +56 -0
- package/.github/workflows/github-to-beads.yml +97 -0
- package/.kilocode/workflows/dev.md +346 -341
- package/.kilocode/workflows/plan.md +567 -522
- package/.kilocode/workflows/premerge.md +187 -177
- package/.kilocode/workflows/research.md +43 -43
- package/.kilocode/workflows/review.md +449 -443
- package/.kilocode/workflows/rollback.md +722 -722
- package/.kilocode/workflows/ship.md +213 -165
- package/.kilocode/workflows/sonarcloud.md +150 -150
- package/.kilocode/workflows/status.md +91 -49
- package/.kilocode/workflows/validate.md +289 -283
- package/.kilocode/workflows/verify.md +270 -222
- package/.mcp.json.example +12 -12
- package/.opencode/commands/dev.md +345 -340
- package/.opencode/commands/plan.md +566 -521
- package/.opencode/commands/premerge.md +186 -176
- package/.opencode/commands/research.md +42 -42
- package/.opencode/commands/review.md +448 -442
- package/.opencode/commands/rollback.md +721 -721
- package/.opencode/commands/ship.md +212 -164
- package/.opencode/commands/sonarcloud.md +149 -149
- package/.opencode/commands/status.md +90 -48
- package/.opencode/commands/validate.md +288 -282
- package/.opencode/commands/verify.md +269 -221
- package/.roo/commands/dev.md +346 -341
- package/.roo/commands/plan.md +567 -522
- package/.roo/commands/premerge.md +187 -177
- package/.roo/commands/research.md +43 -43
- package/.roo/commands/review.md +449 -443
- package/.roo/commands/rollback.md +722 -722
- package/.roo/commands/ship.md +213 -165
- package/.roo/commands/sonarcloud.md +150 -150
- package/.roo/commands/status.md +91 -49
- package/.roo/commands/validate.md +289 -283
- package/.roo/commands/verify.md +270 -222
- package/AGENTS.md +272 -175
- package/CLAUDE.md +110 -100
- package/README.md +429 -416
- package/bin/forge-cmd.js +317 -313
- package/bin/forge-preflight.js +322 -309
- package/bin/forge.js +4765 -4303
- package/docs/AGENT_INSTALL_PROMPT.md +342 -342
- package/docs/BEADS_GITHUB_SYNC.md +251 -251
- package/docs/ENHANCED_ONBOARDING.md +612 -602
- package/docs/EXAMPLES.md +482 -482
- package/docs/GREPTILE_SETUP.md +400 -400
- package/docs/MANUAL_REVIEW_GUIDE.md +106 -106
- package/docs/ROADMAP.md +359 -359
- package/docs/SETUP.md +663 -631
- package/docs/TOOLCHAIN.md +653 -630
- package/docs/VALIDATION.md +363 -363
- package/install.sh +40 -1056
- package/lefthook.yml +50 -39
- package/lib/agents/README.md +198 -198
- package/lib/agents/claude.plugin.json +28 -28
- package/lib/agents/cline.plugin.json +22 -22
- package/lib/agents/codex.plugin.json +19 -19
- package/lib/agents/copilot.plugin.json +24 -24
- package/lib/agents/cursor.plugin.json +25 -25
- package/lib/agents/kilocode.plugin.json +22 -22
- package/lib/agents/opencode.plugin.json +20 -20
- package/lib/agents/roo.plugin.json +23 -23
- package/lib/agents-config.js +2112 -2112
- package/lib/beads-health-check.js +143 -0
- package/lib/beads-setup.js +341 -0
- package/lib/beads-sync-scaffold.js +260 -0
- package/lib/commands/_registry.js +134 -0
- package/lib/commands/clean.js +181 -0
- package/lib/commands/dev.js +571 -513
- package/lib/commands/plan.js +692 -692
- package/lib/commands/push.js +196 -0
- package/lib/commands/recommend.js +119 -119
- package/lib/commands/ship.js +377 -377
- package/lib/commands/status.js +378 -378
- package/lib/commands/sync.js +55 -0
- package/lib/commands/team.js +37 -0
- package/lib/commands/test.js +207 -0
- package/lib/commands/validate.js +602 -602
- package/lib/commands/worktree.js +310 -0
- package/lib/context-merge.js +359 -359
- package/lib/dep-guard/analyzer.js +294 -294
- package/lib/dep-guard/behavior-detector.js +98 -98
- package/lib/dep-guard/contract-detector.js +162 -162
- package/lib/dep-guard/import-detector.js +498 -498
- package/lib/dep-guard/path-utils.js +13 -13
- package/lib/dep-guard/rubric.js +120 -120
- package/lib/dep-guard/task-parser.js +318 -318
- package/lib/detect-agent.js +191 -191
- package/lib/detect-worktree.js +47 -47
- package/lib/docs-command.js +51 -0
- package/lib/docs-copy.js +50 -0
- package/lib/file-hash.js +26 -26
- package/lib/freshness-token.js +148 -0
- package/lib/greptile-match.js +80 -0
- package/lib/husky-migration.js +450 -0
- package/lib/lefthook-check.js +65 -0
- package/lib/pat-setup.js +207 -0
- package/lib/plugin-catalog.js +350 -350
- package/lib/plugin-manager.js +166 -166
- package/lib/plugin-recommender.js +141 -141
- package/lib/project-discovery.js +491 -491
- package/lib/reset.js +309 -0
- package/lib/setup-action-log.js +139 -139
- package/lib/setup-summary-renderer.js +106 -106
- package/lib/setup-utils.js +96 -0
- package/lib/setup.js +192 -192
- package/lib/smart-merge.js +64 -0
- package/lib/symlink-utils.js +81 -0
- package/lib/task-ownership.js +117 -0
- package/lib/workflow-profiles.js +197 -197
- package/package.json +131 -128
- package/scripts/beads-context.sh +426 -0
- package/scripts/beads-context.test.js +567 -0
- package/scripts/behavioral-judge.sh +378 -0
- package/scripts/benchmark.js +85 -0
- package/scripts/branch-protection.js +183 -0
- package/scripts/check-agents.js +172 -0
- package/scripts/check-forge-token.js +98 -0
- package/scripts/commitlint.js +42 -0
- package/scripts/conflict-detect.sh +323 -0
- package/scripts/dep-guard-analyze.js +71 -0
- package/scripts/dep-guard.sh +789 -0
- package/scripts/eval_win.py +249 -0
- package/scripts/file-index.sh +493 -0
- package/scripts/forge-team/index.sh +86 -0
- package/scripts/forge-team/lib/agent-prompt.sh +52 -0
- package/scripts/forge-team/lib/claim.sh +256 -0
- package/scripts/forge-team/lib/dashboard.sh +341 -0
- package/scripts/forge-team/lib/epic.sh +332 -0
- package/scripts/forge-team/lib/hooks.sh +253 -0
- package/scripts/forge-team/lib/identity.sh +235 -0
- package/scripts/forge-team/lib/sync-github.sh +317 -0
- package/scripts/forge-team/lib/verify.sh +284 -0
- package/scripts/forge-team/lib/workload.sh +296 -0
- package/scripts/forge-team/tests/agent-prompt.test.sh +72 -0
- package/scripts/forge-team/tests/claim.test.sh +179 -0
- package/scripts/forge-team/tests/dashboard.test.sh +170 -0
- package/scripts/forge-team/tests/dispatcher.test.sh +79 -0
- package/scripts/forge-team/tests/epic.test.sh +176 -0
- package/scripts/forge-team/tests/hooks.test.sh +239 -0
- package/scripts/forge-team/tests/identity.test.sh +176 -0
- package/scripts/forge-team/tests/integration.test.sh +371 -0
- package/scripts/forge-team/tests/sync-github.test.sh +209 -0
- package/scripts/forge-team/tests/verify.test.sh +314 -0
- package/scripts/forge-team/tests/workflow-integration.test.sh +43 -0
- package/scripts/forge-team/tests/workload.test.sh +209 -0
- package/scripts/github-beads-sync/comment.mjs +64 -0
- package/scripts/github-beads-sync/config.mjs +148 -0
- package/scripts/github-beads-sync/github-api.mjs +131 -0
- package/scripts/github-beads-sync/index.mjs +332 -0
- package/scripts/github-beads-sync/label-mapper.mjs +54 -0
- package/scripts/github-beads-sync/mapping.mjs +78 -0
- package/scripts/github-beads-sync/reverse-sync-cli.mjs +31 -0
- package/scripts/github-beads-sync/reverse-sync.mjs +138 -0
- package/scripts/github-beads-sync/run-bd.mjs +159 -0
- package/scripts/github-beads-sync/sanitize.mjs +121 -0
- package/scripts/github-beads-sync.config.json +26 -0
- package/scripts/improve-command.js +375 -0
- package/scripts/lib/eval-runner.js +268 -0
- package/scripts/lib/eval-schema.js +135 -0
- package/scripts/lib/eval-storage.js +78 -0
- package/scripts/lib/grading.js +203 -0
- package/scripts/lib/jsonl-lock.sh +48 -0
- package/scripts/lib/sanitize.sh +116 -0
- package/scripts/lib/transcript-parser.js +63 -0
- package/scripts/lint.js +47 -0
- package/scripts/migrate-to-bun-test.js +412 -0
- package/scripts/pr-coordinator.sh +706 -0
- package/scripts/run-command-eval.js +236 -0
- package/scripts/smart-status.sh +809 -0
- package/scripts/sync-commands.js +571 -0
- package/scripts/sync-utils.sh +455 -0
- package/scripts/test-dashboard.js +123 -0
- package/scripts/test.js +46 -0
- package/scripts/validate.sh +94 -0
- package/skills/parallel-deep-research/SKILL.md +108 -108
- package/skills/parallel-deep-research/evals/README.md +27 -27
- package/skills/parallel-deep-research/evals/evals.json +62 -62
- package/skills/sonarcloud-analysis/SKILL.md +171 -171
- package/skills/sonarcloud-analysis/evals/README.md +27 -27
- package/skills/sonarcloud-analysis/evals/evals.json +50 -50
- package/skills/sonarcloud-analysis/references/api-reference.md +466 -466
- package/.cursor/hooks/state/continual-learning-index.json +0 -19
- package/.cursor/hooks/state/continual-learning.json +0 -8
|
@@ -1,218 +1,266 @@
|
|
|
1
|
-
|
|
2
|
-
Verify that the merge landed correctly and everything is running properly after merge.
|
|
3
|
-
|
|
4
|
-
# Verify
|
|
5
|
-
|
|
6
|
-
This command runs AFTER the user has merged the PR. It checks system health — not documentation (that was handled in `/premerge`).
|
|
7
|
-
|
|
8
|
-
## Usage
|
|
9
|
-
|
|
10
|
-
```bash
|
|
11
|
-
/verify
|
|
12
|
-
```
|
|
13
|
-
|
|
14
|
-
## What This Command Does
|
|
15
|
-
|
|
16
|
-
### Step 1: Switch to Main and Pull
|
|
17
|
-
|
|
18
|
-
```bash
|
|
19
|
-
git checkout master
|
|
20
|
-
git pull
|
|
21
|
-
```
|
|
22
|
-
|
|
23
|
-
Confirm the merge actually landed on main. If the PR isn't merged yet, stop and tell the user to merge first.
|
|
24
|
-
|
|
25
|
-
### Step 2: Confirm PR Is Merged
|
|
26
|
-
|
|
27
|
-
Detect the most recently merged PR from the current HEAD commit:
|
|
28
|
-
|
|
29
|
-
```bash
|
|
30
|
-
gh pr list --state merged --base master --limit 1 --json number,state,mergedAt,mergedBy
|
|
31
|
-
```
|
|
32
|
-
|
|
33
|
-
- `state` should be `MERGED`
|
|
34
|
-
- If no PR found: the merge may not have landed yet — stop and tell the user to merge first
|
|
35
|
-
- If the wrong PR appears: user can specify the number directly with `gh pr view <number> --json state,mergedAt,mergedBy`
|
|
36
|
-
|
|
37
|
-
### Step 3: Check CI on Main After Merge
|
|
38
|
-
|
|
39
|
-
```bash
|
|
40
|
-
gh run list --branch master --limit 5
|
|
41
|
-
```
|
|
42
|
-
|
|
43
|
-
Check the most recent workflow runs on `master`:
|
|
44
|
-
- All should be passing or in progress
|
|
45
|
-
- If any failed: identify which workflow and what failed
|
|
46
|
-
- Failed CI on main after merge may need a hotfix PR
|
|
47
|
-
|
|
48
|
-
### Step 4: Check Deployments (if applicable)
|
|
49
|
-
|
|
50
|
-
Check if the project has a deployment target:
|
|
51
|
-
|
|
52
|
-
```bash
|
|
53
|
-
# Check deployment status from latest run
|
|
54
|
-
gh run list --branch master --limit 1
|
|
55
|
-
|
|
56
|
-
# Check Vercel deployments for the merged PR (use number from Step 2)
|
|
57
|
-
gh pr view <number> --json deployments
|
|
58
|
-
```
|
|
59
|
-
|
|
60
|
-
If deployments exist:
|
|
61
|
-
- Are they showing as successful?
|
|
62
|
-
- Is the production/preview URL responding?
|
|
63
|
-
|
|
64
|
-
### Step 5: Report Status
|
|
65
|
-
|
|
66
|
-
**If everything is clean**:
|
|
67
|
-
```
|
|
68
|
-
✅ Merge verified — everything is healthy
|
|
69
|
-
|
|
70
|
-
PR: #<number> merged by <user> at <time>
|
|
71
|
-
CI on master: ✓ All passing
|
|
72
|
-
Deployments: ✓ Up (if applicable)
|
|
73
|
-
|
|
74
|
-
Ready for next feature → run /status
|
|
75
|
-
```
|
|
76
|
-
|
|
77
|
-
**If issues found**:
|
|
78
|
-
```
|
|
79
|
-
⚠️ Post-merge issues detected
|
|
80
|
-
|
|
81
|
-
PR: #<number> merged ✓
|
|
82
|
-
CI on master: ✗ <workflow-name> failing
|
|
83
|
-
- Error: <description>
|
|
84
|
-
- Action needed: <hotfix or investigation>
|
|
85
|
-
|
|
86
|
-
Deployments: ✗ <deployment> not responding
|
|
87
|
-
|
|
88
|
-
Next: Create hotfix branch or investigate root cause
|
|
89
|
-
```
|
|
90
|
-
|
|
91
|
-
### Step 6: Clean Up Worktree and Branch
|
|
92
|
-
|
|
93
|
-
Only run this step after CI is confirmed healthy (Step 3 passed).
|
|
94
|
-
|
|
95
|
-
Get the merged branch name:
|
|
96
|
-
|
|
97
|
-
```bash
|
|
98
|
-
gh pr view <number> --json headRefName --jq '.headRefName'
|
|
99
|
-
```
|
|
100
|
-
|
|
101
|
-
If the branch name cannot be determined (empty output or error), skip cleanup and tell the user to run `git worktree list` and clean up manually.
|
|
102
|
-
|
|
103
|
-
Find and remove the matching worktree (if it exists):
|
|
104
|
-
|
|
105
|
-
```bash
|
|
106
|
-
# Get the worktree path for this exact branch
|
|
107
|
-
WORKTREE_PATH=$(git worktree list --porcelain \
|
|
108
|
-
| awk -v branch="refs/heads/<branch>" '
|
|
109
|
-
/^worktree / { path=substr($0, 10) }
|
|
110
|
-
$0 == "branch " branch { print path }
|
|
111
|
-
')
|
|
112
|
-
|
|
113
|
-
if [ -n "$WORKTREE_PATH" ]; then
|
|
114
|
-
git worktree remove "$WORKTREE_PATH" --force
|
|
115
|
-
echo "Worktree: removed ✓ ($WORKTREE_PATH)"
|
|
116
|
-
else
|
|
117
|
-
echo "Worktree: not found (already removed or never created) — skipping"
|
|
118
|
-
fi
|
|
119
|
-
```
|
|
120
|
-
|
|
121
|
-
If no worktree is found for that branch, skip gracefully with a note: "Worktree: not found (already removed or never created)".
|
|
122
|
-
|
|
123
|
-
Delete the local branch (safe delete only):
|
|
124
|
-
|
|
125
|
-
```bash
|
|
126
|
-
git branch -d <branch> 2>/dev/null || echo "Branch: already deleted — skipping"
|
|
127
|
-
```
|
|
128
|
-
|
|
129
|
-
The `|| echo` fallback handles the case where the branch is already gone (e.g., deleted by a previous run or the remote), so the command never fails the verify step.
|
|
130
|
-
|
|
131
|
-
Report cleanup in output:
|
|
132
|
-
```
|
|
133
|
-
Worktree: removed ✓
|
|
134
|
-
Branch: <branch-name> deleted ✓
|
|
135
|
-
```
|
|
136
|
-
|
|
137
|
-
### Step 7: If Issues Found — Create Beads Issue
|
|
138
|
-
|
|
139
|
-
**Never commit inline.** If something is wrong, create a tracking issue:
|
|
140
|
-
|
|
141
|
-
```bash
|
|
142
|
-
bd create --title="Post-merge: <description of issue>" --type=bug --priority=1
|
|
143
|
-
```
|
|
144
|
-
|
|
145
|
-
### Step 8: Close Beads
|
|
146
|
-
|
|
147
|
-
If everything is clean, close
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
```
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
<
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
1
|
+
|
|
2
|
+
Verify that the merge landed correctly and everything is running properly after merge.
|
|
3
|
+
|
|
4
|
+
# Verify
|
|
5
|
+
|
|
6
|
+
This command runs AFTER the user has merged the PR. It checks system health — not documentation (that was handled in `/premerge`).
|
|
7
|
+
|
|
8
|
+
## Usage
|
|
9
|
+
|
|
10
|
+
```bash
|
|
11
|
+
/verify
|
|
12
|
+
```
|
|
13
|
+
|
|
14
|
+
## What This Command Does
|
|
15
|
+
|
|
16
|
+
### Step 1: Switch to Main and Pull
|
|
17
|
+
|
|
18
|
+
```bash
|
|
19
|
+
git checkout master
|
|
20
|
+
git pull
|
|
21
|
+
```
|
|
22
|
+
|
|
23
|
+
Confirm the merge actually landed on main. If the PR isn't merged yet, stop and tell the user to merge first.
|
|
24
|
+
|
|
25
|
+
### Step 2: Confirm PR Is Merged
|
|
26
|
+
|
|
27
|
+
Detect the most recently merged PR from the current HEAD commit:
|
|
28
|
+
|
|
29
|
+
```bash
|
|
30
|
+
gh pr list --state merged --base master --limit 1 --json number,state,mergedAt,mergedBy
|
|
31
|
+
```
|
|
32
|
+
|
|
33
|
+
- `state` should be `MERGED`
|
|
34
|
+
- If no PR found: the merge may not have landed yet — stop and tell the user to merge first
|
|
35
|
+
- If the wrong PR appears: user can specify the number directly with `gh pr view <number> --json state,mergedAt,mergedBy`
|
|
36
|
+
|
|
37
|
+
### Step 3: Check CI on Main After Merge
|
|
38
|
+
|
|
39
|
+
```bash
|
|
40
|
+
gh run list --branch master --limit 5
|
|
41
|
+
```
|
|
42
|
+
|
|
43
|
+
Check the most recent workflow runs on `master`:
|
|
44
|
+
- All should be passing or in progress
|
|
45
|
+
- If any failed: identify which workflow and what failed
|
|
46
|
+
- Failed CI on main after merge may need a hotfix PR
|
|
47
|
+
|
|
48
|
+
### Step 4: Check Deployments (if applicable)
|
|
49
|
+
|
|
50
|
+
Check if the project has a deployment target:
|
|
51
|
+
|
|
52
|
+
```bash
|
|
53
|
+
# Check deployment status from latest run
|
|
54
|
+
gh run list --branch master --limit 1
|
|
55
|
+
|
|
56
|
+
# Check Vercel deployments for the merged PR (use number from Step 2)
|
|
57
|
+
gh pr view <number> --json deployments
|
|
58
|
+
```
|
|
59
|
+
|
|
60
|
+
If deployments exist:
|
|
61
|
+
- Are they showing as successful?
|
|
62
|
+
- Is the production/preview URL responding?
|
|
63
|
+
|
|
64
|
+
### Step 5: Report Status
|
|
65
|
+
|
|
66
|
+
**If everything is clean**:
|
|
67
|
+
```
|
|
68
|
+
✅ Merge verified — everything is healthy
|
|
69
|
+
|
|
70
|
+
PR: #<number> merged by <user> at <time>
|
|
71
|
+
CI on master: ✓ All passing
|
|
72
|
+
Deployments: ✓ Up (if applicable)
|
|
73
|
+
|
|
74
|
+
Ready for next feature → run /status
|
|
75
|
+
```
|
|
76
|
+
|
|
77
|
+
**If issues found**:
|
|
78
|
+
```
|
|
79
|
+
⚠️ Post-merge issues detected
|
|
80
|
+
|
|
81
|
+
PR: #<number> merged ✓
|
|
82
|
+
CI on master: ✗ <workflow-name> failing
|
|
83
|
+
- Error: <description>
|
|
84
|
+
- Action needed: <hotfix or investigation>
|
|
85
|
+
|
|
86
|
+
Deployments: ✗ <deployment> not responding
|
|
87
|
+
|
|
88
|
+
Next: Create hotfix branch or investigate root cause
|
|
89
|
+
```
|
|
90
|
+
|
|
91
|
+
### Step 6: Clean Up Worktree and Branch
|
|
92
|
+
|
|
93
|
+
Only run this step after CI is confirmed healthy (Step 3 passed).
|
|
94
|
+
|
|
95
|
+
Get the merged branch name:
|
|
96
|
+
|
|
97
|
+
```bash
|
|
98
|
+
gh pr view <number> --json headRefName --jq '.headRefName'
|
|
99
|
+
```
|
|
100
|
+
|
|
101
|
+
If the branch name cannot be determined (empty output or error), skip cleanup and tell the user to run `git worktree list` and clean up manually.
|
|
102
|
+
|
|
103
|
+
Find and remove the matching worktree (if it exists):
|
|
104
|
+
|
|
105
|
+
```bash
|
|
106
|
+
# Get the worktree path for this exact branch
|
|
107
|
+
WORKTREE_PATH=$(git worktree list --porcelain \
|
|
108
|
+
| awk -v branch="refs/heads/<branch>" '
|
|
109
|
+
/^worktree / { path=substr($0, 10) }
|
|
110
|
+
$0 == "branch " branch { print path }
|
|
111
|
+
')
|
|
112
|
+
|
|
113
|
+
if [ -n "$WORKTREE_PATH" ]; then
|
|
114
|
+
git worktree remove "$WORKTREE_PATH" --force
|
|
115
|
+
echo "Worktree: removed ✓ ($WORKTREE_PATH)"
|
|
116
|
+
else
|
|
117
|
+
echo "Worktree: not found (already removed or never created) — skipping"
|
|
118
|
+
fi
|
|
119
|
+
```
|
|
120
|
+
|
|
121
|
+
If no worktree is found for that branch, skip gracefully with a note: "Worktree: not found (already removed or never created)".
|
|
122
|
+
|
|
123
|
+
Delete the local branch (safe delete only):
|
|
124
|
+
|
|
125
|
+
```bash
|
|
126
|
+
git branch -d <branch> 2>/dev/null || echo "Branch: already deleted — skipping"
|
|
127
|
+
```
|
|
128
|
+
|
|
129
|
+
The `|| echo` fallback handles the case where the branch is already gone (e.g., deleted by a previous run or the remote), so the command never fails the verify step.
|
|
130
|
+
|
|
131
|
+
Report cleanup in output:
|
|
132
|
+
```
|
|
133
|
+
Worktree: removed ✓
|
|
134
|
+
Branch: <branch-name> deleted ✓
|
|
135
|
+
```
|
|
136
|
+
|
|
137
|
+
### Step 7: If Issues Found — Create Beads Issue
|
|
138
|
+
|
|
139
|
+
**Never commit inline.** If something is wrong, create a tracking issue:
|
|
140
|
+
|
|
141
|
+
```bash
|
|
142
|
+
bd create --title="Post-merge: <description of issue>" --type=bug --priority=1
|
|
143
|
+
```
|
|
144
|
+
|
|
145
|
+
### Step 8: Close Beads Issues (if healthy)
|
|
146
|
+
|
|
147
|
+
If everything is clean, close all Beads issues referenced in the merged PR.
|
|
148
|
+
|
|
149
|
+
**Auto-detect beads issues from PR body and branch name:**
|
|
150
|
+
|
|
151
|
+
```bash
|
|
152
|
+
# Get PR body and branch name
|
|
153
|
+
PR_BODY=$(gh pr view <number> --json body --jq '.body')
|
|
154
|
+
PR_BRANCH=$(gh pr view <number> --json headRefName --jq '.headRefName')
|
|
155
|
+
|
|
156
|
+
# Extract beads IDs from PR body (matches "Closes beads-xxx", "closes forge-xxx", etc.)
|
|
157
|
+
# Patterns: "Closes <prefix>-<id>", "Fixes <prefix>-<id>", "Resolves <prefix>-<id>"
|
|
158
|
+
BEADS_IDS=$(echo "$PR_BODY" | grep -oiE '(closes|fixes|resolves):?\s+[a-z]+-[a-z0-9]+' | grep -oiE '[a-z]+-[a-z0-9]{3,6}$')
|
|
159
|
+
|
|
160
|
+
# Validate each ID exists in beads
|
|
161
|
+
VALID_IDS=""
|
|
162
|
+
for id in $BEADS_IDS; do
|
|
163
|
+
if bd show "$id" >/dev/null 2>&1; then
|
|
164
|
+
VALID_IDS="$VALID_IDS $id"
|
|
165
|
+
fi
|
|
166
|
+
done
|
|
167
|
+
BEADS_IDS="$VALID_IDS"
|
|
168
|
+
|
|
169
|
+
# Also check branch name for beads ID — extract segment after last /
|
|
170
|
+
# then validate with bd show to avoid false matches like "pr-templa"
|
|
171
|
+
BRANCH_SLUG=$(echo "$PR_BRANCH" | sed 's|.*/||')
|
|
172
|
+
BRANCH_ID=$(echo "$BRANCH_SLUG" | grep -oE '[a-z]+-[a-z0-9]{3,6}' | head -1)
|
|
173
|
+
if [ -n "$BRANCH_ID" ] && ! bd show "$BRANCH_ID" >/dev/null 2>&1; then
|
|
174
|
+
BRANCH_ID="" # Not a valid beads ID — discard
|
|
175
|
+
fi
|
|
176
|
+
```
|
|
177
|
+
|
|
178
|
+
**Close each matched issue:**
|
|
179
|
+
|
|
180
|
+
```bash
|
|
181
|
+
# Close issues found in PR body
|
|
182
|
+
for id in $BEADS_IDS; do
|
|
183
|
+
bd close "$id" --reason="Merged and verified on master (PR #<number>)" 2>&1 || echo "Warning: could not close $id"
|
|
184
|
+
done
|
|
185
|
+
|
|
186
|
+
# If no issues found in body, try branch name match (skip if already closed above)
|
|
187
|
+
if [ -z "$BEADS_IDS" ] && [ -n "$BRANCH_ID" ]; then
|
|
188
|
+
bd close "$BRANCH_ID" --reason="Merged and verified on master (PR #<number>)" 2>&1 || echo "Warning: could not close $BRANCH_ID"
|
|
189
|
+
elif [ -n "$BRANCH_ID" ] && ! echo "$BEADS_IDS" | grep -qw "$BRANCH_ID"; then
|
|
190
|
+
bd close "$BRANCH_ID" --reason="Merged and verified on master (PR #<number>)" 2>&1 || echo "Warning: could not close $BRANCH_ID"
|
|
191
|
+
fi
|
|
192
|
+
```
|
|
193
|
+
|
|
194
|
+
**If no beads issues detected at all**, prompt the user:
|
|
195
|
+
```
|
|
196
|
+
⚠ No beads issue ID found in PR body or branch name.
|
|
197
|
+
If this PR closes a beads issue, run: bd close <id> --reason="Merged and verified on master (PR #<number>)"
|
|
198
|
+
```
|
|
199
|
+
|
|
200
|
+
```
|
|
201
|
+
<HARD-GATE: /verify exit>
|
|
202
|
+
Do NOT declare /verify complete until:
|
|
203
|
+
1. gh run list --branch master --limit 3 shows actual CI output (not "should be fine")
|
|
204
|
+
2. If healthy: Beads issues extracted from PR body/branch and closed (bd close run and confirmed)
|
|
205
|
+
- If no beads ID found: user was warned and given manual close command
|
|
206
|
+
3. If issues found: Beads tracking issue created for every problem
|
|
207
|
+
4. Worktree removed (or confirmed already gone) — OR Step 6 was intentionally skipped because CI was unhealthy; if skipped, state explicitly: "cleanup deferred, CI was not healthy"
|
|
208
|
+
"It should be fine" is not evidence. Run the command. Show the output.
|
|
209
|
+
</HARD-GATE>
|
|
210
|
+
```
|
|
211
|
+
|
|
212
|
+
## Rules
|
|
213
|
+
|
|
214
|
+
- **Never commits** — this command is read-only
|
|
215
|
+
- **Never creates PRs** — if fixes are needed, that's a new /dev cycle
|
|
216
|
+
- **Runs after user confirms merge** — not before
|
|
217
|
+
- **Reports honestly** — if CI is broken on main, say so clearly
|
|
218
|
+
|
|
219
|
+
## Example Output (Healthy)
|
|
220
|
+
|
|
221
|
+
```
|
|
222
|
+
✅ Merge verified — everything is healthy
|
|
223
|
+
|
|
224
|
+
PR: #89 merged by harshanandak at 2026-02-24T14:30:00Z
|
|
225
|
+
Branch: feat/auth-refresh deleted ✓
|
|
226
|
+
CI on master:
|
|
227
|
+
✓ Test Suite (ubuntu, node 20): passing
|
|
228
|
+
✓ Test Suite (windows, node 22): passing
|
|
229
|
+
✓ ESLint: passing
|
|
230
|
+
✓ SonarCloud: passing
|
|
231
|
+
✓ CodeQL: passing
|
|
232
|
+
Deployments: N/A (no deployment configured)
|
|
233
|
+
|
|
234
|
+
Ready for next feature → run /status
|
|
235
|
+
```
|
|
236
|
+
|
|
237
|
+
## Example Output (Issues Found)
|
|
238
|
+
|
|
239
|
+
```
|
|
240
|
+
⚠️ Post-merge issues detected
|
|
241
|
+
|
|
242
|
+
PR: #89 merged ✓
|
|
243
|
+
CI on master:
|
|
244
|
+
✓ Test Suite: passing
|
|
245
|
+
✗ SonarCloud: quality gate failing
|
|
246
|
+
- 2 new code smells introduced
|
|
247
|
+
- Action: investigate or create hotfix
|
|
248
|
+
|
|
249
|
+
Created Beads issue: forge-xyz
|
|
250
|
+
"Post-merge: SonarCloud quality gate failing on master after PR #89"
|
|
251
|
+
|
|
252
|
+
Run /status to assess next steps
|
|
253
|
+
```
|
|
254
|
+
|
|
255
|
+
## Integration with Workflow
|
|
256
|
+
|
|
257
|
+
```
|
|
258
|
+
Utility: /status → Understand current context before starting
|
|
259
|
+
Stage 1: /plan → Design intent → research → branch + worktree + task list
|
|
260
|
+
Stage 2: /dev → Implement each task with subagent-driven TDD
|
|
261
|
+
Stage 3: /validate → Type check, lint, tests, security — all fresh output
|
|
262
|
+
Stage 4: /ship → Push + create PR
|
|
263
|
+
Stage 5: /review → Address GitHub Actions, Greptile, SonarCloud
|
|
264
|
+
Stage 6: /premerge → Update docs, hand off PR to user
|
|
265
|
+
Stage 7: /verify → Post-merge CI check on main (you are here) ✓
|
|
266
|
+
```
|
package/.codex/config.toml
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
# OpenAI Codex CLI project configuration
|
|
2
|
-
# https://developers.openai.com/codex/config-reference/
|
|
3
|
-
#
|
|
4
|
-
# approval_policy options:
|
|
5
|
-
# untrusted = require approval for all state-changing commands
|
|
6
|
-
# on-request = agent decides when to ask (recommended for interactive dev)
|
|
7
|
-
# never = no prompts (for CI / fully automated runs)
|
|
8
|
-
approval_policy = "on-request"
|
|
9
|
-
|
|
10
|
-
# Restrict file access to project workspace only (prevents access outside project root)
|
|
11
|
-
sandbox_mode = "workspace-write"
|
|
1
|
+
# OpenAI Codex CLI project configuration
|
|
2
|
+
# https://developers.openai.com/codex/config-reference/
|
|
3
|
+
#
|
|
4
|
+
# approval_policy options:
|
|
5
|
+
# untrusted = require approval for all state-changing commands
|
|
6
|
+
# on-request = agent decides when to ask (recommended for interactive dev)
|
|
7
|
+
# never = no prompts (for CI / fully automated runs)
|
|
8
|
+
approval_policy = "on-request"
|
|
9
|
+
|
|
10
|
+
# Restrict file access to project workspace only (prevents access outside project root)
|
|
11
|
+
sandbox_mode = "workspace-write"
|