@llipe.com/dev-tasks 0.6.1 → 0.6.5
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/agents/developer.md +294 -0
- package/.claude/agents/github-ops.md +407 -0
- package/.claude/agents/housekeeping.md +109 -0
- package/.claude/agents/technical-writer.md +390 -0
- package/.claude/agents/ux-engineer.md +184 -0
- package/.claude/agents/verifier.md +276 -0
- package/.claude/commands/developer.md +272 -0
- package/.claude/commands/github-ops.md +10 -0
- package/.claude/commands/housekeeping.md +10 -0
- package/.claude/commands/planner.md +506 -0
- package/.claude/commands/product-engineer.md +263 -0
- package/.claude/commands/technical-writer.md +10 -0
- package/.claude/commands/ux-engineer.md +10 -0
- package/.claude/commands/verifier-audit.md +10 -0
- package/.claude/commands/verifier-design.md +10 -0
- package/.claude/hooks/git-guard.sh +95 -0
- package/.claude/skills/activity-contract-test-design/SKILL.md +122 -0
- package/.claude/skills/activity-drift-reconciliation/SKILL.md +133 -0
- package/.claude/skills/activity-e2e-test-design/SKILL.md +124 -0
- package/.claude/skills/activity-edge-case-refinement/SKILL.md +146 -0
- package/.claude/skills/activity-generate-spec/SKILL.md +137 -0
- package/.claude/skills/activity-generate-stories/SKILL.md +243 -0
- package/.claude/skills/activity-init/SKILL.md +162 -0
- package/.claude/skills/activity-publish-github/SKILL.md +116 -0
- package/.claude/skills/activity-random-test-tactics/SKILL.md +181 -0
- package/.claude/skills/activity-refine/SKILL.md +236 -0
- package/.claude/skills/git-ops/SKILL.md +221 -0
- package/.claude/skills/implement/SKILL.md +129 -0
- package/.claude/skills/memo-cli-usage/REFERENCE.md +798 -0
- package/.claude/skills/memo-cli-usage/SKILL.md +144 -0
- package/.claude/skills/plan/SKILL.md +145 -0
- package/.claude/skills/webapp-mockup/SKILL.md +76 -0
- package/.claude/skills/webapp-mockup/scripts/scaffold-mockup.sh +469 -0
- package/.github/agents/developer.agent.md +293 -0
- package/.github/agents/github-ops.agent.md +416 -0
- package/.github/agents/housekeeping.agent.md +109 -0
- package/.github/agents/planner.agent.md +496 -0
- package/.github/agents/product-engineer.agent.md +262 -0
- package/.github/agents/technical-writer.agent.md +389 -0
- package/.github/agents/ux-engineer.agent.md +183 -0
- package/.github/agents/verifier.agent.md +275 -0
- package/.github/instructions/domain/nextjs-pages-components.instructions.md +375 -0
- package/.github/instructions/implement.instructions.md +128 -0
- package/.github/instructions/plan.instructions.md +144 -0
- package/.github/prompts/developer-execute.prompt.md +13 -0
- package/.github/prompts/github-ops.prompt.md +16 -0
- package/.github/prompts/housekeeping.prompt.md +16 -0
- package/.github/prompts/planner-resume.prompt.md +13 -0
- package/.github/prompts/planner.prompt.md +18 -0
- package/.github/prompts/product-engineer-feature.prompt.md +21 -0
- package/.github/prompts/product-engineer-init.prompt.md +16 -0
- package/.github/prompts/product-engineer-issue.prompt.md +19 -0
- package/.github/prompts/technical-writer.prompt.md +21 -0
- package/.github/prompts/ux-engineer.prompt.md +14 -0
- package/.github/prompts/verifier-audit.prompt.md +33 -0
- package/.github/prompts/verifier-design.prompt.md +28 -0
- package/.github/skills/activity-contract-test-design/SKILL.md +117 -0
- package/.github/skills/activity-drift-reconciliation/SKILL.md +128 -0
- package/.github/skills/activity-e2e-test-design/SKILL.md +119 -0
- package/.github/skills/activity-edge-case-refinement/SKILL.md +141 -0
- package/.github/skills/activity-generate-spec/SKILL.md +132 -0
- package/.github/skills/activity-generate-stories/SKILL.md +238 -0
- package/.github/skills/activity-init/SKILL.md +157 -0
- package/.github/skills/activity-publish-github/SKILL.md +111 -0
- package/.github/skills/activity-random-test-tactics/SKILL.md +176 -0
- package/.github/skills/activity-refine/SKILL.md +231 -0
- package/.github/skills/git-ops/SKILL.md +216 -0
- package/.github/skills/memo-cli-usage/REFERENCE.md +798 -0
- package/.github/skills/memo-cli-usage/SKILL.md +144 -0
- package/.github/skills/webapp-mockup/SKILL.md +71 -0
- package/.github/skills/webapp-mockup/scripts/scaffold-mockup.sh +469 -0
- package/.kiro/agents/developer.md +305 -0
- package/.kiro/agents/github-ops.md +428 -0
- package/.kiro/agents/housekeeping.md +122 -0
- package/.kiro/agents/planner.md +530 -0
- package/.kiro/agents/product-engineer.md +294 -0
- package/.kiro/agents/technical-writer.md +408 -0
- package/.kiro/agents/ux-engineer.md +200 -0
- package/.kiro/agents/verifier.md +275 -0
- package/.kiro/hooks/git-guard.json +16 -0
- package/.kiro/hooks/scripts/git-guard.sh +116 -0
- package/.kiro/skills/activity-contract-test-design/SKILL.md +122 -0
- package/.kiro/skills/activity-drift-reconciliation/SKILL.md +133 -0
- package/.kiro/skills/activity-e2e-test-design/SKILL.md +124 -0
- package/.kiro/skills/activity-edge-case-refinement/SKILL.md +146 -0
- package/.kiro/skills/activity-generate-spec/SKILL.md +137 -0
- package/.kiro/skills/activity-generate-stories/SKILL.md +243 -0
- package/.kiro/skills/activity-init/SKILL.md +162 -0
- package/.kiro/skills/activity-publish-github/SKILL.md +116 -0
- package/.kiro/skills/activity-random-test-tactics/SKILL.md +181 -0
- package/.kiro/skills/activity-refine/SKILL.md +236 -0
- package/.kiro/skills/git-ops/SKILL.md +221 -0
- package/.kiro/skills/memo-cli-usage/REFERENCE.md +798 -0
- package/.kiro/skills/memo-cli-usage/SKILL.md +144 -0
- package/.kiro/skills/webapp-mockup/SKILL.md +76 -0
- package/.kiro/steering/git-guard-notice.md +11 -0
- package/.kiro/steering/implement.md +129 -0
- package/.kiro/steering/nextjs-pages-components.md +376 -0
- package/.kiro/steering/plan.md +145 -0
- package/AGENTS.md +122 -0
- package/CHANGELOG.md +40 -2
- package/CLAUDE.md +94 -0
- package/README.md +33 -18
- package/dist/adapters/cli/extract-all.js +4 -4
- package/dist/adapters/cli/extract-component.d.ts +1 -1
- package/dist/adapters/cli/extract-component.js +4 -4
- package/dist/adapters/cli/parse-args.d.ts +1 -0
- package/dist/adapters/cli/parse-args.d.ts.map +1 -1
- package/dist/adapters/cli/parse-args.js +4 -0
- package/dist/adapters/cli/parse-args.js.map +1 -1
- package/dist/bin/dev-tasks.js +23 -9
- package/dist/bin/dev-tasks.js.map +1 -1
- package/dist/bin/dt.js +3 -3
- package/dist/core/distribution/index.d.ts +5 -3
- package/dist/core/distribution/index.d.ts.map +1 -1
- package/dist/core/distribution/index.js +3 -2
- package/dist/core/distribution/index.js.map +1 -1
- package/dist/core/distribution/install.d.ts +20 -8
- package/dist/core/distribution/install.d.ts.map +1 -1
- package/dist/core/distribution/install.js +76 -36
- package/dist/core/distribution/install.js.map +1 -1
- package/dist/core/distribution/manifest.d.ts +25 -2
- package/dist/core/distribution/manifest.d.ts.map +1 -1
- package/dist/core/distribution/manifest.js +29 -2
- package/dist/core/distribution/manifest.js.map +1 -1
- package/dist/core/distribution/migrate.d.ts +6 -3
- package/dist/core/distribution/migrate.d.ts.map +1 -1
- package/dist/core/distribution/migrate.js +21 -19
- package/dist/core/distribution/migrate.js.map +1 -1
- package/dist/core/distribution/profiles.d.ts +30 -0
- package/dist/core/distribution/profiles.d.ts.map +1 -0
- package/dist/core/distribution/profiles.js +57 -0
- package/dist/core/distribution/profiles.js.map +1 -0
- package/dist/core/distribution/update.d.ts +6 -4
- package/dist/core/distribution/update.d.ts.map +1 -1
- package/dist/core/distribution/update.js +22 -22
- package/dist/core/distribution/update.js.map +1 -1
- package/dist/core/extract/component.d.ts +9 -9
- package/dist/core/extract/component.js +5 -5
- package/dist/core/extract/report.d.ts +1 -1
- package/dist/core/extract/report.js +1 -1
- package/package.json +37 -18
- package/skills/.gitkeep +0 -0
|
@@ -0,0 +1,216 @@
|
|
|
1
|
+
# Git Operations
|
|
2
|
+
|
|
3
|
+
Reusable procedures for git branch management, merge, rebase, and conflict resolution. This skill describes _procedures_ — merge authority policies remain in `github-ops.agent.md`. Any agent can invoke this skill when encountering git operations.
|
|
4
|
+
|
|
5
|
+
---
|
|
6
|
+
|
|
7
|
+
## When to Use
|
|
8
|
+
|
|
9
|
+
- Creating feature or story branches
|
|
10
|
+
- Rebasing a branch onto a target
|
|
11
|
+
- Merging PRs or branches
|
|
12
|
+
- Resolving merge conflicts
|
|
13
|
+
- Recovering from failed git operations
|
|
14
|
+
|
|
15
|
+
---
|
|
16
|
+
|
|
17
|
+
## Procedures
|
|
18
|
+
|
|
19
|
+
### 1. Create Branch from Latest Default
|
|
20
|
+
|
|
21
|
+
```bash
|
|
22
|
+
# Fetch latest remote state
|
|
23
|
+
git fetch origin
|
|
24
|
+
|
|
25
|
+
# Switch to the default branch and pull
|
|
26
|
+
git checkout main
|
|
27
|
+
git pull origin main
|
|
28
|
+
|
|
29
|
+
# Create and switch to the new branch
|
|
30
|
+
git checkout -b <branch-name>
|
|
31
|
+
```
|
|
32
|
+
|
|
33
|
+
**Naming conventions** (defer to `github-ops` for policy):
|
|
34
|
+
|
|
35
|
+
- Story branches: `story/<story-id>-<short-description>`
|
|
36
|
+
- Issue branches: `issue/<issue-number>-<short-description>`
|
|
37
|
+
- Integration branches: `integrate/<milestone-or-prd-name>`
|
|
38
|
+
|
|
39
|
+
### 2. Create Branch from Integration Branch
|
|
40
|
+
|
|
41
|
+
When working under a `planner` orchestration with an integration branch:
|
|
42
|
+
|
|
43
|
+
```bash
|
|
44
|
+
git fetch origin
|
|
45
|
+
git checkout <integration-branch>
|
|
46
|
+
git pull origin <integration-branch>
|
|
47
|
+
git checkout -b <story-branch>
|
|
48
|
+
```
|
|
49
|
+
|
|
50
|
+
### 3. Update Branch (Rebase onto Target)
|
|
51
|
+
|
|
52
|
+
Preferred method to keep a branch up-to-date with its target:
|
|
53
|
+
|
|
54
|
+
```bash
|
|
55
|
+
git fetch origin
|
|
56
|
+
git rebase origin/<target-branch>
|
|
57
|
+
```
|
|
58
|
+
|
|
59
|
+
**If conflicts occur** → jump to [Resolve Merge Conflicts](#6-resolve-merge-conflicts).
|
|
60
|
+
|
|
61
|
+
**If rebase is too complex** (many commits, repeated conflicts), fall back to merge:
|
|
62
|
+
|
|
63
|
+
```bash
|
|
64
|
+
git fetch origin
|
|
65
|
+
git merge origin/<target-branch>
|
|
66
|
+
```
|
|
67
|
+
|
|
68
|
+
### 4. Pre-Merge Checks
|
|
69
|
+
|
|
70
|
+
Before merging any PR or branch, verify:
|
|
71
|
+
|
|
72
|
+
1. **Branch is up-to-date** with the target:
|
|
73
|
+
```bash
|
|
74
|
+
git fetch origin
|
|
75
|
+
git log --oneline origin/<target-branch>..HEAD # should show only your commits
|
|
76
|
+
```
|
|
77
|
+
2. **No merge conflicts**:
|
|
78
|
+
```bash
|
|
79
|
+
git merge-tree $(git merge-base HEAD origin/<target-branch>) HEAD origin/<target-branch>
|
|
80
|
+
```
|
|
81
|
+
3. **Tests pass locally** (if applicable):
|
|
82
|
+
```bash
|
|
83
|
+
# Run project-specific test command
|
|
84
|
+
```
|
|
85
|
+
4. **CI status is green** (check via GitHub API or `gh` CLI):
|
|
86
|
+
```bash
|
|
87
|
+
gh pr checks <pr-number>
|
|
88
|
+
```
|
|
89
|
+
|
|
90
|
+
### 5. Merge Strategies
|
|
91
|
+
|
|
92
|
+
Choose the appropriate strategy based on context:
|
|
93
|
+
|
|
94
|
+
| Strategy | When to Use | Command |
|
|
95
|
+
| ---------------- | ----------------------------------------------------------------------------------- | --------------------------- |
|
|
96
|
+
| **Squash merge** | Story/issue PRs → integration or main branch. Produces clean single-commit history. | `gh pr merge <pr> --squash` |
|
|
97
|
+
| **Merge commit** | Integration branch → main. Preserves the full story history. | `gh pr merge <pr> --merge` |
|
|
98
|
+
| **Rebase merge** | Small PRs with clean linear history. Avoid for multi-commit stories. | `gh pr merge <pr> --rebase` |
|
|
99
|
+
|
|
100
|
+
**Default**: Squash merge for story PRs, merge commit for integration PRs to main.
|
|
101
|
+
|
|
102
|
+
### 6. Resolve Merge Conflicts
|
|
103
|
+
|
|
104
|
+
When a rebase or merge produces conflicts:
|
|
105
|
+
|
|
106
|
+
#### Step 1: Identify conflicting files
|
|
107
|
+
|
|
108
|
+
```bash
|
|
109
|
+
git diff --name-only --diff-filter=U
|
|
110
|
+
```
|
|
111
|
+
|
|
112
|
+
#### Step 2: For each conflicting file
|
|
113
|
+
|
|
114
|
+
1. Open the file and locate conflict markers (`<<<<<<<`, `=======`, `>>>>>>>`)
|
|
115
|
+
2. Determine ownership:
|
|
116
|
+
- If the file was primarily modified by the current branch → prefer current branch changes
|
|
117
|
+
- If the file was primarily modified by the target → prefer target changes
|
|
118
|
+
- If both branches made meaningful changes → manual merge required
|
|
119
|
+
3. Resolve the conflict by editing the file to the correct final state
|
|
120
|
+
4. Remove all conflict markers
|
|
121
|
+
|
|
122
|
+
#### Step 3: Mark resolved and continue
|
|
123
|
+
|
|
124
|
+
```bash
|
|
125
|
+
# After resolving each file
|
|
126
|
+
git add <resolved-file>
|
|
127
|
+
|
|
128
|
+
# Continue the rebase or complete the merge
|
|
129
|
+
git rebase --continue # if rebasing
|
|
130
|
+
git commit # if merging
|
|
131
|
+
```
|
|
132
|
+
|
|
133
|
+
#### Step 4: Verify
|
|
134
|
+
|
|
135
|
+
```bash
|
|
136
|
+
# Ensure no remaining conflict markers in the codebase
|
|
137
|
+
grep -rn '<<<<<<<\|=======\|>>>>>>>' --include='*.ts' --include='*.tsx' --include='*.js' --include='*.json' --include='*.md' .
|
|
138
|
+
|
|
139
|
+
# Run tests to verify the resolution is correct
|
|
140
|
+
```
|
|
141
|
+
|
|
142
|
+
### 7. Recovery from Failed Rebase
|
|
143
|
+
|
|
144
|
+
If a rebase goes wrong or produces unexpected results:
|
|
145
|
+
|
|
146
|
+
```bash
|
|
147
|
+
# Abort the in-progress rebase
|
|
148
|
+
git rebase --abort
|
|
149
|
+
|
|
150
|
+
# Verify you're back to the pre-rebase state
|
|
151
|
+
git log --oneline -5
|
|
152
|
+
git status
|
|
153
|
+
```
|
|
154
|
+
|
|
155
|
+
If you already completed a bad rebase:
|
|
156
|
+
|
|
157
|
+
```bash
|
|
158
|
+
# Find the pre-rebase commit using reflog
|
|
159
|
+
git reflog
|
|
160
|
+
|
|
161
|
+
# Reset to the state before the rebase
|
|
162
|
+
git reset --hard <pre-rebase-sha>
|
|
163
|
+
```
|
|
164
|
+
|
|
165
|
+
**Always report** what happened to the user before and after recovery.
|
|
166
|
+
|
|
167
|
+
### 8. Recovery from Failed Merge
|
|
168
|
+
|
|
169
|
+
```bash
|
|
170
|
+
# Abort an in-progress merge
|
|
171
|
+
git merge --abort
|
|
172
|
+
|
|
173
|
+
# Verify clean state
|
|
174
|
+
git status
|
|
175
|
+
```
|
|
176
|
+
|
|
177
|
+
If a merge was already committed but is wrong:
|
|
178
|
+
|
|
179
|
+
```bash
|
|
180
|
+
# Revert the merge commit (keeps history clean)
|
|
181
|
+
git revert -m 1 <merge-commit-sha>
|
|
182
|
+
```
|
|
183
|
+
|
|
184
|
+
### 9. Force Push Safety
|
|
185
|
+
|
|
186
|
+
Force pushing **MUST** only be used on branches owned exclusively by the current agent/developer. Never force push shared branches.
|
|
187
|
+
|
|
188
|
+
```bash
|
|
189
|
+
# Safe force push (fails if someone else pushed)
|
|
190
|
+
git push --force-with-lease origin <branch-name>
|
|
191
|
+
```
|
|
192
|
+
|
|
193
|
+
**Never use** `git push --force` without `--with-lease`.
|
|
194
|
+
|
|
195
|
+
---
|
|
196
|
+
|
|
197
|
+
## Conflict Resolution Heuristics
|
|
198
|
+
|
|
199
|
+
When resolving conflicts automatically, apply these heuristics in order:
|
|
200
|
+
|
|
201
|
+
1. **Non-overlapping changes**: Accept both sides (most common — different parts of the file changed)
|
|
202
|
+
2. **Import/dependency additions**: Accept both sides (both branches added different imports)
|
|
203
|
+
3. **Configuration file conflicts**: Merge both entries, ensure no duplicates
|
|
204
|
+
4. **Schema/migration conflicts**: **Stop and ask the user** — schema conflicts require human judgment
|
|
205
|
+
5. **Test file conflicts**: Accept both sides if tests are additive; flag if test logic conflicts
|
|
206
|
+
6. **Business logic conflicts**: **Stop and ask the user** — business logic requires human judgment
|
|
207
|
+
|
|
208
|
+
---
|
|
209
|
+
|
|
210
|
+
## Integration with Agents
|
|
211
|
+
|
|
212
|
+
| Agent | Typical Usage |
|
|
213
|
+
| ------------ | ---------------------------------------------------------------------------------------------- |
|
|
214
|
+
| `developer` | Branch creation, rebase before PR, conflict resolution during implementation |
|
|
215
|
+
| `planner` | Integration branch management, merging story PRs, rebasing integration onto main |
|
|
216
|
+
| `github-ops` | PR merge execution (policy enforcement stays with github-ops, procedures come from this skill) |
|