@damper/cli 0.6.13 → 0.6.14
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/services/claude.js
CHANGED
|
@@ -265,9 +265,7 @@ export async function postTaskFlow(options) {
|
|
|
265
265
|
await execa('git', ['checkout', 'main'], { cwd: projectRoot, stdio: 'pipe' });
|
|
266
266
|
// Merge the feature branch
|
|
267
267
|
await execa('git', ['merge', currentBranch, '--no-edit'], { cwd: projectRoot, stdio: 'inherit' });
|
|
268
|
-
|
|
269
|
-
await execa('git', ['push', 'origin', 'main'], { cwd: projectRoot, stdio: 'inherit' });
|
|
270
|
-
console.log(pc.green('✓ Merged to main and pushed\n'));
|
|
268
|
+
console.log(pc.green('✓ Merged to main locally\n'));
|
|
271
269
|
}
|
|
272
270
|
catch (err) {
|
|
273
271
|
console.log(pc.red('Failed to merge. You may need to resolve conflicts manually.\n'));
|
|
@@ -24,11 +24,10 @@ ${planSection}
|
|
|
24
24
|
- \`.claude/settings.local.json\`
|
|
25
25
|
|
|
26
26
|
**Your responsibilities (via Damper MCP):**
|
|
27
|
-
1.
|
|
28
|
-
2. Use \`
|
|
29
|
-
3.
|
|
30
|
-
4.
|
|
31
|
-
5. If stopping early: call \`abandon_task\` with what remains and blockers
|
|
27
|
+
1. Use \`add_commit\` after each git commit
|
|
28
|
+
2. Use \`add_note\` ONLY for non-obvious approach decisions (e.g. "Decision: chose X because Y")
|
|
29
|
+
3. When done: call \`complete_task\` with a one-line summary
|
|
30
|
+
4. If stopping early: call \`abandon_task\` with what remains and blockers
|
|
32
31
|
|
|
33
32
|
The CLI just bootstrapped this environment - YOU handle the task lifecycle.
|
|
34
33
|
`.trim();
|