@simplysm/sd-claude 13.0.70 → 13.0.71
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.
|
@@ -50,7 +50,7 @@ type(scope): short description
|
|
|
50
50
|
| ------------- | ---------------------------------------------------------------------------- |
|
|
51
51
|
| `type` | `feat`, `fix`, `refactor`, `docs`, `test`, `chore`, `build`, `style`, `perf` |
|
|
52
52
|
| `scope` | package name or area (e.g., `solid`, `core-common`, `orm-node`) |
|
|
53
|
-
| `description` | imperative, lowercase, no period at end
|
|
53
|
+
| `description` | written in the system's configured language, imperative, lowercase, no period at end |
|
|
54
54
|
|
|
55
55
|
Examples:
|
|
56
56
|
|
|
@@ -6,6 +6,49 @@ model: haiku
|
|
|
6
6
|
|
|
7
7
|
# sd-worktree
|
|
8
8
|
|
|
9
|
+
## CRITICAL SAFETY RULES — MERGE & STASH
|
|
10
|
+
|
|
11
|
+
**These rules are ABSOLUTE. No exceptions. Applies to ALL modes (yolo, normal, plan, etc.).**
|
|
12
|
+
|
|
13
|
+
1. **NEVER run `git stash drop`, `git stash pop`, or `git stash clear`.**
|
|
14
|
+
- If you stashed something, ONLY use `git stash apply` (which keeps the stash intact).
|
|
15
|
+
- If stash is no longer needed, ASK the user before dropping it.
|
|
16
|
+
|
|
17
|
+
2. **If `merge` fails or produces conflicts → STOP IMMEDIATELY and show this message:**
|
|
18
|
+
```
|
|
19
|
+
⚠️ merge 중 문제가 발생했습니다.
|
|
20
|
+
직접 수동으로 merge를 진행해 주세요.
|
|
21
|
+
(에러 내용: <에러/충돌 정보 그대로 출력>)
|
|
22
|
+
```
|
|
23
|
+
- Do NOT attempt to resolve conflicts yourself.
|
|
24
|
+
- Do NOT run `git merge --abort` without asking.
|
|
25
|
+
- Do NOT proceed to `clean` after a failed merge.
|
|
26
|
+
- Do NOT retry or work around the error.
|
|
27
|
+
- Just show the message above and STOP. Do nothing else.
|
|
28
|
+
|
|
29
|
+
3. **If `rebase` fails or produces conflicts → STOP IMMEDIATELY and show this message:**
|
|
30
|
+
```
|
|
31
|
+
⚠️ rebase 중 문제가 발생했습니다.
|
|
32
|
+
직접 수동으로 rebase를 진행해 주세요.
|
|
33
|
+
(에러 내용: <에러/충돌 정보 그대로 출력>)
|
|
34
|
+
```
|
|
35
|
+
- Same rules as merge. Do NOT auto-resolve. Just show the message and STOP.
|
|
36
|
+
|
|
37
|
+
4. **NEVER run destructive git commands during worktree workflows:**
|
|
38
|
+
- `git reset --hard`, `git checkout -- .`, `git restore .`, `git clean -f`
|
|
39
|
+
- `git branch -D` (force delete) — only `-d` (safe delete) is allowed
|
|
40
|
+
- `git stash drop`, `git stash pop`, `git stash clear`
|
|
41
|
+
|
|
42
|
+
5. **Before ANY merge/rebase, verify:**
|
|
43
|
+
- Both main and worktree have NO uncommitted changes (`git status --porcelain`)
|
|
44
|
+
- If uncommitted changes exist → ask the user (do NOT auto-stash)
|
|
45
|
+
|
|
46
|
+
6. **After merge completes, verify success before proceeding:**
|
|
47
|
+
- Check `git status` — if merge conflicts exist, STOP and report
|
|
48
|
+
- Do NOT proceed to `clean` until merge is confirmed successful
|
|
49
|
+
|
|
50
|
+
**Violation of these rules causes IRREVERSIBLE DATA LOSS.**
|
|
51
|
+
|
|
9
52
|
## Overview
|
|
10
53
|
|
|
11
54
|
Create, merge, and clean up git worktrees under `.worktrees/`. Uses the current branch of the main working tree as the source branch.
|
|
@@ -44,6 +87,7 @@ node .claude/skills/sd-worktree/sd-worktree.mjs rebase [name]
|
|
|
44
87
|
- Rebases the worktree branch onto the latest commit of the main branch
|
|
45
88
|
- Errors if uncommitted changes exist → commit or stash first
|
|
46
89
|
- Use when you want a clean history before merging
|
|
90
|
+
- **If rebase fails or conflicts → STOP. Report to user. Do NOT auto-resolve.**
|
|
47
91
|
|
|
48
92
|
### merge — Merge into main branch
|
|
49
93
|
|
|
@@ -56,6 +100,13 @@ node .claude/skills/sd-worktree/sd-worktree.mjs merge [name]
|
|
|
56
100
|
- Errors if uncommitted changes exist → commit or stash first
|
|
57
101
|
- After merge, always `cd <project-root>` (required for subsequent clean)
|
|
58
102
|
|
|
103
|
+
**MERGE SAFETY PROTOCOL:**
|
|
104
|
+
1. Before merge: check BOTH main and worktree for uncommitted changes
|
|
105
|
+
2. If the script exits with non-zero → show "직접 수동으로 merge해 주세요" message and STOP.
|
|
106
|
+
3. After merge: run `git status` in main to confirm no conflicts
|
|
107
|
+
4. If conflicts or errors → show "직접 수동으로 merge해 주세요" message and STOP.
|
|
108
|
+
5. Only proceed to `clean` after confirming merge was fully successful
|
|
109
|
+
|
|
59
110
|
### clean — Remove worktree and delete branch
|
|
60
111
|
|
|
61
112
|
```bash
|