opencodekit 0.15.21 → 0.16.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/dist/index.js +5 -7
- package/dist/template/.opencode/AGENTS.md +21 -20
- package/dist/template/.opencode/agent/build.md +88 -7
- package/dist/template/.opencode/agent/explore.md +1 -1
- package/dist/template/.opencode/agent/general.md +54 -4
- package/dist/template/.opencode/agent/looker.md +1 -1
- package/dist/template/.opencode/agent/painter.md +1 -1
- package/dist/template/.opencode/agent/plan.md +52 -0
- package/dist/template/.opencode/agent/review.md +1 -1
- package/dist/template/.opencode/agent/scout.md +3 -3
- package/dist/template/.opencode/agent/vision.md +1 -1
- package/dist/template/.opencode/command/create.md +201 -95
- package/dist/template/.opencode/command/design.md +5 -7
- package/dist/template/.opencode/command/handoff.md +7 -0
- package/dist/template/.opencode/command/init.md +25 -47
- package/dist/template/.opencode/command/plan.md +35 -16
- package/dist/template/.opencode/command/resume.md +7 -18
- package/dist/template/.opencode/command/ship.md +156 -0
- package/dist/template/.opencode/command/start.md +315 -28
- package/dist/template/.opencode/command/ui-review.md +5 -7
- package/dist/template/.opencode/command/verify.md +279 -0
- package/dist/template/.opencode/memory/_templates/README.md +57 -19
- package/dist/template/.opencode/memory/_templates/prd.md +29 -0
- package/dist/template/.opencode/memory/_templates/project/tech-stack.md +50 -0
- package/dist/template/.opencode/memory/_templates/proposal.md +38 -0
- package/dist/template/.opencode/memory/_templates/spec.md +66 -0
- package/dist/template/.opencode/memory/_templates/tasks.md +198 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-add-skills-vs-commands-to-global-agents-.md +15 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-build-agent-auto-loads-skills-contextual.md +31 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-fixed-agent-configuration-for-opencodeki.md +25 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-focused-agents-md-upgrade-for-opencode-k.md +14 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-implement-tier-1-permission-upgrades.md +15 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-instructions-config-explicit-paths-not-w.md +40 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-merged-context-into-memory-project-singl.md +42 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-oracle-tool-should-use-review-agent-not-.md +14 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-plan-agent-auto-loads-skills-contextuall.md +31 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-plan-phased-oracle-command-merge-into-ne.md +14 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-prd-workflow-uses-prd-and-prd-task-skill.md +23 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-prefer-review-agent-via-opencode-cli-ove.md +14 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-remove-oracle-tool-add-ship-command-with.md +14 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-remove-oracle-tool-and-add-ship-command-.md +14 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-remove-oracle-tool-and-add-ship-command.md +14 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-remove-skills-vs-commands-section-from-a.md +14 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-replace-oracle-tool-with-ship-command-fl.md +14 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-replace-oracle-with-ship-command-workflo.md +14 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-replace-proxypal-oracle-with-cli-review-.md +14 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-simplified-dist-template-only-tech-stack.md +50 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-simplified-templates-only-tech-stack-md.md +26 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-subagents-load-minimal-skills-stay-lean.md +29 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-decision-user-approved-permission-upgrades-in-ope.md +15 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-discovery-verify-command-already-implemented.md +28 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-feature-openspec-phase-b-complete-template-upgra.md +43 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-learning-build-agent-should-use-dynamic-lsp-not-f.md +14 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-learning-kimi-k2-5-model-requires-temperature-1-0.md +22 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-learning-opencode-context-injection-already-imple.md +27 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-learning-opencode-context-injection-uses-instruct.md +35 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-learning-update-build-agent-prompt-to-use-context.md +14 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-learning-upgrade-agents-md-using-opencode-expert-.md +14 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-learning-upgrade-agents-md-with-opencode-expert-g.md +14 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-learning-upgrade-agents-md-with-opencode-expert-r.md +14 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-learning-user-prefers-copilot-gpt-5-2-codex-mediu.md +14 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-learning-user-wants-general-agent-prompt-contextu.md +15 -0
- package/dist/template/.opencode/memory/observations/2026-02-01-learning-user-wants-general-agent-prompt-reviewed.md +15 -0
- package/dist/template/.opencode/memory/project/command-rules.md +122 -0
- package/dist/template/.opencode/memory/project/tech-stack.md +50 -0
- package/dist/template/.opencode/memory/research/ccpm-analysis.md +334 -0
- package/dist/template/.opencode/memory/research/openspec-analysis.md +226 -0
- package/dist/template/.opencode/opencode.json +916 -803
- package/dist/template/.opencode/skill/tool-priority/SKILL.md +2 -2
- package/package.json +1 -1
- package/dist/template/.opencode/command/accessibility-check.md +0 -331
- package/dist/template/.opencode/command/agent-browser.md +0 -21
- package/dist/template/.opencode/command/analyze-mockup.md +0 -423
- package/dist/template/.opencode/command/analyze-project.md +0 -295
- package/dist/template/.opencode/command/brainstorm.md +0 -373
- package/dist/template/.opencode/command/cloudflare.md +0 -70
- package/dist/template/.opencode/command/commit.md +0 -245
- package/dist/template/.opencode/command/complete-next-task.md +0 -77
- package/dist/template/.opencode/command/design-audit.md +0 -480
- package/dist/template/.opencode/command/edit-image.md +0 -242
- package/dist/template/.opencode/command/finish.md +0 -255
- package/dist/template/.opencode/command/fix-ci.md +0 -109
- package/dist/template/.opencode/command/fix-types.md +0 -104
- package/dist/template/.opencode/command/fix-ui.md +0 -117
- package/dist/template/.opencode/command/fix.md +0 -168
- package/dist/template/.opencode/command/frontend-design.md +0 -21
- package/dist/template/.opencode/command/generate-diagram.md +0 -349
- package/dist/template/.opencode/command/generate-icon.md +0 -283
- package/dist/template/.opencode/command/generate-image.md +0 -246
- package/dist/template/.opencode/command/generate-pattern.md +0 -247
- package/dist/template/.opencode/command/generate-storyboard.md +0 -250
- package/dist/template/.opencode/command/implement.md +0 -609
- package/dist/template/.opencode/command/import-plan.md +0 -406
- package/dist/template/.opencode/command/index-knowledge.md +0 -25
- package/dist/template/.opencode/command/integration-test.md +0 -424
- package/dist/template/.opencode/command/issue.md +0 -102
- package/dist/template/.opencode/command/new-feature.md +0 -651
- package/dist/template/.opencode/command/opensrc.md +0 -58
- package/dist/template/.opencode/command/quick-build.md +0 -238
- package/dist/template/.opencode/command/ralph.md +0 -41
- package/dist/template/.opencode/command/research-and-implement.md +0 -148
- package/dist/template/.opencode/command/research-ui.md +0 -466
- package/dist/template/.opencode/command/restore-image.md +0 -424
- package/dist/template/.opencode/command/revert-feature.md +0 -386
- package/dist/template/.opencode/command/skill-create.md +0 -517
- package/dist/template/.opencode/command/skill-optimize.md +0 -556
- package/dist/template/.opencode/command/summarize.md +0 -412
- package/dist/template/.opencode/command/triage.md +0 -398
- package/dist/template/.opencode/memory/_templates/project/architecture.md +0 -60
- package/dist/template/.opencode/memory/_templates/project/commands.md +0 -72
- package/dist/template/.opencode/memory/_templates/project/conventions.md +0 -68
- package/dist/template/.opencode/memory/_templates/project/gotchas.md +0 -41
- package/dist/template/.opencode/skill/notebooklm/SKILL.md +0 -272
- package/dist/template/.opencode/skill/notebooklm/references/setup.md +0 -353
- package/dist/template/.opencode/tool/notebooklm.ts +0 -488
- package/dist/template/.opencode/tool/oracle.ts +0 -240
|
@@ -1,386 +0,0 @@
|
|
|
1
|
-
---
|
|
2
|
-
description: Smart git-aware revert for a bead/feature with safety checks
|
|
3
|
-
argument-hint: "<bead-id> [--phase=N] [--task=N] [--soft] [--dry-run] [--interactive]"
|
|
4
|
-
agent: build
|
|
5
|
-
model: proxypal/gemini-3-flash-preview
|
|
6
|
-
---
|
|
7
|
-
|
|
8
|
-
# Revert Feature: $ARGUMENTS
|
|
9
|
-
|
|
10
|
-
**Load skills:**
|
|
11
|
-
|
|
12
|
-
```typescript
|
|
13
|
-
skill({ name: "beads" }); // Session protocol
|
|
14
|
-
skill({ name: "verification-before-completion" });
|
|
15
|
-
```
|
|
16
|
-
|
|
17
|
-
Intelligently revert changes for a bead with comprehensive safety checks.
|
|
18
|
-
|
|
19
|
-
## Parse Arguments
|
|
20
|
-
|
|
21
|
-
| Argument | Default | Description |
|
|
22
|
-
| ---------------------- | -------- | --------------------------------- |
|
|
23
|
-
| Bead ID | required | Feature to revert |
|
|
24
|
-
| `--phase=N` | all | Revert only specific phase |
|
|
25
|
-
| `--task=N` | all | Revert only specific task |
|
|
26
|
-
| `--soft` | false | Stage reverts without committing |
|
|
27
|
-
| `--dry-run` | false | Preview changes without executing |
|
|
28
|
-
| `--interactive` | false | Choose which commits to revert |
|
|
29
|
-
| `--include-migrations` | false | Also revert database migrations |
|
|
30
|
-
|
|
31
|
-
---
|
|
32
|
-
|
|
33
|
-
## Phase 1: Pre-Revert Checklist
|
|
34
|
-
|
|
35
|
-
Before any action, verify:
|
|
36
|
-
|
|
37
|
-
!`git status --short`
|
|
38
|
-
!`gh run list --limit 1`
|
|
39
|
-
!`git branch --show-current`
|
|
40
|
-
|
|
41
|
-
### Safety Gates
|
|
42
|
-
|
|
43
|
-
| Check | Pass | Action if Fail |
|
|
44
|
-
| ------------------ | ---------------------- | -------------------------- |
|
|
45
|
-
| Clean working tree | No uncommitted changes | Stash or commit first |
|
|
46
|
-
| CI passing | Latest run succeeded | Warn, confirm continue |
|
|
47
|
-
| Not on main/master | On feature branch | Require `--force` for main |
|
|
48
|
-
| Bead exists | `bd show` returns data | Abort with error |
|
|
49
|
-
|
|
50
|
-
---
|
|
51
|
-
|
|
52
|
-
## Phase 2: Analyze Bead History
|
|
53
|
-
|
|
54
|
-
!`bd show [bead-id]`
|
|
55
|
-
|
|
56
|
-
!`git log --oneline --all --grep="[bead-id]"`
|
|
57
|
-
!`git log --name-only --grep="[bead-id]" --pretty=format:""`
|
|
58
|
-
!`git log --shortstat --grep="[bead-id]"`
|
|
59
|
-
|
|
60
|
-
### Impact Report
|
|
61
|
-
|
|
62
|
-
```
|
|
63
|
-
Revert Analysis: [bead-id]
|
|
64
|
-
━━━━━━━━━━━━━━━━━━━━━━━━━━
|
|
65
|
-
|
|
66
|
-
Bead: [title]
|
|
67
|
-
Status: [in_progress/closed]
|
|
68
|
-
Created: [date]
|
|
69
|
-
|
|
70
|
-
Commits found: 5
|
|
71
|
-
├── abc1234 feat: add login form (Phase 1)
|
|
72
|
-
├── def5678 feat: add validation (Phase 1)
|
|
73
|
-
├── ghi9012 feat: JWT tokens (Phase 2)
|
|
74
|
-
├── jkl3456 test: add auth tests (Phase 3)
|
|
75
|
-
└── mno7890 docs: update README (Phase 3)
|
|
76
|
-
|
|
77
|
-
Files affected: 12
|
|
78
|
-
├── src/auth/login.ts (created)
|
|
79
|
-
├── src/auth/jwt.ts (created)
|
|
80
|
-
├── src/api/routes.ts (modified)
|
|
81
|
-
├── tests/auth.test.ts (created)
|
|
82
|
-
└── ... 8 more files
|
|
83
|
-
|
|
84
|
-
Lines: +456 / -23
|
|
85
|
-
```
|
|
86
|
-
|
|
87
|
-
---
|
|
88
|
-
|
|
89
|
-
## Phase 3: Check Downstream Impact
|
|
90
|
-
|
|
91
|
-
Before reverting, check what depends on this:
|
|
92
|
-
|
|
93
|
-
!`bd list --status all --limit 50`
|
|
94
|
-
|
|
95
|
-
# Filter for beads that depend on this one
|
|
96
|
-
|
|
97
|
-
!`grep -r "from './auth/" src/ --include="*.ts"`
|
|
98
|
-
!`git log --oneline --all -- src/auth/ | grep -v "[bead-id]"`
|
|
99
|
-
|
|
100
|
-
### Downstream Report
|
|
101
|
-
|
|
102
|
-
````
|
|
103
|
-
Downstream Impact Analysis
|
|
104
|
-
━━━━━━━━━━━━━━━━━━━━━━━━━━
|
|
105
|
-
|
|
106
|
-
Dependent beads:
|
|
107
|
-
⚠ bd-xyz789: "User dashboard" imports from src/auth/
|
|
108
|
-
⚠ bd-uvw456: "Profile page" uses JWT utilities
|
|
109
|
-
|
|
110
|
-
Other code referencing these files:
|
|
111
|
-
- src/api/middleware.ts:15 imports { verifyToken }
|
|
112
|
-
- src/pages/profile.tsx:8 imports { useAuth }
|
|
113
|
-
|
|
114
|
-
Database migrations:
|
|
115
|
-
- 001_create_users.sql (would need revert)
|
|
116
|
-
- 002_add_sessions.sql (would need revert)
|
|
117
|
-
|
|
118
|
-
Feature flags:
|
|
119
|
-
- AUTH_ENABLED flag in production
|
|
120
|
-
|
|
121
|
-
CAUTION: Reverting may break dependent features.
|
|
122
|
-
|
|
123
|
-
```typescript
|
|
124
|
-
question({
|
|
125
|
-
questions: [{
|
|
126
|
-
header: "Confirm",
|
|
127
|
-
question: "Ready to revert $ARGUMENTS? Breaking changes detected.",
|
|
128
|
-
options: [
|
|
129
|
-
{ label: "Proceed with revert", description: "Execute revert with backups" },
|
|
130
|
-
{ label: "Abort", description: "Cancel this operation" },
|
|
131
|
-
{ label: "Revert cascade", description: "Revert dependent features too" }
|
|
132
|
-
]
|
|
133
|
-
}]
|
|
134
|
-
});
|
|
135
|
-
````
|
|
136
|
-
|
|
137
|
-
---
|
|
138
|
-
|
|
139
|
-
## Phase 4: Determine Revert Scope
|
|
140
|
-
|
|
141
|
-
| Scope | Flag | What Gets Reverted |
|
|
142
|
-
| ----------- | --------------- | -------------------------------- |
|
|
143
|
-
| Full | (default) | All commits for bead |
|
|
144
|
-
| Phase | `--phase=N` | Only commits tagged with phase N |
|
|
145
|
-
| Task | `--task=N` | Only commits for specific task |
|
|
146
|
-
| Interactive | `--interactive` | User selects commits |
|
|
147
|
-
|
|
148
|
-
### Interactive Mode
|
|
149
|
-
|
|
150
|
-
```
|
|
151
|
-
Select commits to revert:
|
|
152
|
-
━━━━━━━━━━━━━━━━━━━━━━━━
|
|
153
|
-
|
|
154
|
-
[x] abc1234 feat: add login form
|
|
155
|
-
[x] def5678 feat: add validation
|
|
156
|
-
[ ] ghi9012 feat: JWT tokens (skip - needed by other features)
|
|
157
|
-
[x] jkl3456 test: add auth tests
|
|
158
|
-
[ ] mno7890 docs: update README (skip - harmless)
|
|
159
|
-
|
|
160
|
-
Selected: 3 commits
|
|
161
|
-
Press Enter to continue, or 'a' to abort
|
|
162
|
-
```
|
|
163
|
-
|
|
164
|
-
---
|
|
165
|
-
|
|
166
|
-
## Phase 5: Create Backup
|
|
167
|
-
|
|
168
|
-
Before reverting, create safety backup:
|
|
169
|
-
|
|
170
|
-
```bash
|
|
171
|
-
# Create backup branch
|
|
172
|
-
git branch backup/[bead-id]-pre-revert
|
|
173
|
-
|
|
174
|
-
# Or stash current state
|
|
175
|
-
git stash push -m "pre-revert-[bead-id]"
|
|
176
|
-
```
|
|
177
|
-
|
|
178
|
-
```
|
|
179
|
-
Backup Created
|
|
180
|
-
━━━━━━━━━━━━━━
|
|
181
|
-
|
|
182
|
-
Branch: backup/[bead-id]-pre-revert
|
|
183
|
-
Commit: [current-sha]
|
|
184
|
-
|
|
185
|
-
To undo this revert later:
|
|
186
|
-
git checkout backup/[bead-id]-pre-revert
|
|
187
|
-
git cherry-pick [reverted-commits]
|
|
188
|
-
```
|
|
189
|
-
|
|
190
|
-
---
|
|
191
|
-
|
|
192
|
-
## Phase 6: Handle Database Migrations
|
|
193
|
-
|
|
194
|
-
If `--include-migrations` or migrations detected:
|
|
195
|
-
|
|
196
|
-
!`git log --name-only --grep="[bead-id]" -- "**/migrations/**"`
|
|
197
|
-
|
|
198
|
-
### Migration Revert Strategy
|
|
199
|
-
|
|
200
|
-
| Scenario | Action |
|
|
201
|
-
| ------------------------------ | ------------------------------ |
|
|
202
|
-
| Migrations not yet run in prod | Safe to delete migration files |
|
|
203
|
-
| Migrations run in prod | Need down migration |
|
|
204
|
-
| No down migration exists | Manual intervention required |
|
|
205
|
-
|
|
206
|
-
```bash
|
|
207
|
-
# Run down migrations (if applicable)
|
|
208
|
-
npm run migrate:down -- --to=[pre-feature-version]
|
|
209
|
-
# or
|
|
210
|
-
python manage.py migrate [app] [previous_migration]
|
|
211
|
-
```
|
|
212
|
-
|
|
213
|
-
**CAUTION:** Database reverts can cause data loss. Always backup first.
|
|
214
|
-
|
|
215
|
-
---
|
|
216
|
-
|
|
217
|
-
## Phase 7: Handle Feature Flags
|
|
218
|
-
|
|
219
|
-
If feature is behind a flag:
|
|
220
|
-
|
|
221
|
-
```bash
|
|
222
|
-
# Disable feature flag first
|
|
223
|
-
# This prevents errors while code is being reverted
|
|
224
|
-
|
|
225
|
-
# Example: Update feature flag config
|
|
226
|
-
echo "AUTH_ENABLED=false" >> .env
|
|
227
|
-
```
|
|
228
|
-
|
|
229
|
-
### Feature Flag Checklist
|
|
230
|
-
|
|
231
|
-
- [ ] Disable flag in development
|
|
232
|
-
- [ ] Disable flag in staging
|
|
233
|
-
- [ ] Disable flag in production
|
|
234
|
-
- [ ] THEN revert code
|
|
235
|
-
|
|
236
|
-
---
|
|
237
|
-
|
|
238
|
-
## Phase 8: Execute Revert
|
|
239
|
-
|
|
240
|
-
### Dry Run (--dry-run)
|
|
241
|
-
|
|
242
|
-
```bash
|
|
243
|
-
# Show what WOULD be reverted
|
|
244
|
-
git revert --no-commit [commits...] --dry-run 2>&1 || \
|
|
245
|
-
git diff [oldest-commit]^..[newest-commit] --stat
|
|
246
|
-
```
|
|
247
|
-
|
|
248
|
-
```
|
|
249
|
-
DRY RUN - No changes made
|
|
250
|
-
━━━━━━━━━━━━━━━━━━━━━━━━━
|
|
251
|
-
|
|
252
|
-
Would revert:
|
|
253
|
-
├── abc1234 feat: add login form
|
|
254
|
-
├── def5678 feat: add validation
|
|
255
|
-
└── jkl3456 test: add auth tests
|
|
256
|
-
|
|
257
|
-
Files that would be modified:
|
|
258
|
-
├── src/auth/login.ts (deleted)
|
|
259
|
-
├── src/api/routes.ts (restored to previous)
|
|
260
|
-
└── tests/auth.test.ts (deleted)
|
|
261
|
-
|
|
262
|
-
Run without --dry-run to execute.
|
|
263
|
-
```
|
|
264
|
-
|
|
265
|
-
### Soft Revert (--soft)
|
|
266
|
-
|
|
267
|
-
```bash
|
|
268
|
-
git revert --no-commit [commits...]
|
|
269
|
-
# Changes staged but not committed
|
|
270
|
-
```
|
|
271
|
-
|
|
272
|
-
### Hard Revert (default)
|
|
273
|
-
|
|
274
|
-
```bash
|
|
275
|
-
git revert --no-commit [commits...]
|
|
276
|
-
git commit -m "revert([bead-id]): [scope description]
|
|
277
|
-
|
|
278
|
-
Reverts commits: [list]
|
|
279
|
-
Reason: [user-provided or default]
|
|
280
|
-
|
|
281
|
-
Backup branch: backup/[bead-id]-pre-revert"
|
|
282
|
-
```
|
|
283
|
-
|
|
284
|
-
---
|
|
285
|
-
|
|
286
|
-
## Phase 9: Handle Conflicts
|
|
287
|
-
|
|
288
|
-
If conflicts occur:
|
|
289
|
-
|
|
290
|
-
```
|
|
291
|
-
Conflicts Detected
|
|
292
|
-
━━━━━━━━━━━━━━━━━━
|
|
293
|
-
|
|
294
|
-
Conflicting files:
|
|
295
|
-
├── src/api/routes.ts
|
|
296
|
-
└── src/config/index.ts
|
|
297
|
-
|
|
298
|
-
Options:
|
|
299
|
-
1. Abort revert (git revert --abort)
|
|
300
|
-
2. Resolve manually and continue
|
|
301
|
-
3. Accept theirs (keep current)
|
|
302
|
-
4. Accept ours (use reverted)
|
|
303
|
-
|
|
304
|
-
Select option (1/2/3/4):
|
|
305
|
-
```
|
|
306
|
-
|
|
307
|
-
### Conflict Resolution Guidance
|
|
308
|
-
|
|
309
|
-
```bash
|
|
310
|
-
# To abort
|
|
311
|
-
git revert --abort
|
|
312
|
-
|
|
313
|
-
# To resolve manually
|
|
314
|
-
# Edit conflicting files, then:
|
|
315
|
-
git add [resolved-files]
|
|
316
|
-
git revert --continue
|
|
317
|
-
|
|
318
|
-
# To accept one side
|
|
319
|
-
git checkout --theirs [file] # Keep current
|
|
320
|
-
git checkout --ours [file] # Use reverted
|
|
321
|
-
```
|
|
322
|
-
|
|
323
|
-
---
|
|
324
|
-
|
|
325
|
-
## Phase 10: Update Bead Status
|
|
326
|
-
|
|
327
|
-
```bash
|
|
328
|
-
bd close [bead-id] --reason "Reverted: [brief reason]"
|
|
329
|
-
```
|
|
330
|
-
|
|
331
|
-
---
|
|
332
|
-
|
|
333
|
-
## Output
|
|
334
|
-
|
|
335
|
-
```
|
|
336
|
-
Revert Complete: [bead-id]
|
|
337
|
-
━━━━━━━━━━━━━━━━━━━━━━━━━━
|
|
338
|
-
|
|
339
|
-
Commits reverted: 3
|
|
340
|
-
Files restored: 8
|
|
341
|
-
Lines removed: +456 / -23 → net -433
|
|
342
|
-
|
|
343
|
-
Revert commit: [new-sha]
|
|
344
|
-
Backup branch: backup/[bead-id]-pre-revert
|
|
345
|
-
|
|
346
|
-
Bead status: Updated to 'open'
|
|
347
|
-
|
|
348
|
-
To undo this revert:
|
|
349
|
-
git revert [new-sha]
|
|
350
|
-
# or
|
|
351
|
-
git cherry-pick [original-commits]
|
|
352
|
-
|
|
353
|
-
Next steps:
|
|
354
|
-
├── Verify app works: npm test
|
|
355
|
-
├── Check dependent features
|
|
356
|
-
└── Re-implement if needed: /implement [bead-id]
|
|
357
|
-
```
|
|
358
|
-
|
|
359
|
-
---
|
|
360
|
-
|
|
361
|
-
## Undo the Revert
|
|
362
|
-
|
|
363
|
-
If the revert was wrong:
|
|
364
|
-
|
|
365
|
-
```bash
|
|
366
|
-
# Option 1: Revert the revert
|
|
367
|
-
git revert [revert-commit-sha]
|
|
368
|
-
|
|
369
|
-
# Option 2: Cherry-pick original commits
|
|
370
|
-
git cherry-pick [original-commits...]
|
|
371
|
-
|
|
372
|
-
# Option 3: Restore from backup branch
|
|
373
|
-
git checkout backup/[bead-id]-pre-revert -- .
|
|
374
|
-
git commit -m "restore: [bead-id] from backup"
|
|
375
|
-
```
|
|
376
|
-
|
|
377
|
-
---
|
|
378
|
-
|
|
379
|
-
## Related Commands
|
|
380
|
-
|
|
381
|
-
| Need | Command |
|
|
382
|
-
| -------------------- | ---------------------- |
|
|
383
|
-
| View bead history | `bd show [bead-id]` |
|
|
384
|
-
| Re-implement feature | `/implement [bead-id]` |
|
|
385
|
-
| Check status | `/status [bead-id]` |
|
|
386
|
-
| Create new feature | `/new-feature` |
|