@rpamis/comet 0.1.5 → 0.1.6

package/assets/skills/comet/SKILL.md

@@ -75,6 +75,7 @@ phase: build
 design_doc: docs/superpowers/specs/YYYY-MM-DD-topic-design.md
 plan: docs/superpowers/plans/YYYY-MM-DD-feature.md
 build_mode: subagent-driven-development
+isolation: branch
 verify_mode: light
 verify_result: pending
 verified_at: null
@@ -90,6 +91,7 @@ Field meanings:
 | `design_doc` | Associated Superpowers Design Doc path, can be empty |
 | `plan` | Associated Superpowers Plan path, can be empty |
 | `build_mode` | Selected execution mode, can be empty |
+| `isolation` | `branch` or `worktree`, workspace isolation method, defaults to `branch` |
 | `verify_mode` | `light` or `full`, can be empty |
 | `verify_result` | `pending`, `pass`, or `fail` |
 | `verified_at` | Verification pass time, can be empty |

package/assets/skills/comet/scripts/comet-yaml-validate.sh

@@ -49,7 +49,7 @@ warn_msg() { warn "  WARN: $1"; WARNINGS=$((WARNINGS + 1)); }
 echo "[VALIDATE] $YAML" >&2
 
 # --- Required fields ---
-REQUIRED_FIELDS="workflow phase design_doc plan build_mode verify_mode verify_result verified_at archived"
+REQUIRED_FIELDS="workflow phase design_doc plan build_mode isolation verify_mode verify_result verified_at archived"
 for field in $REQUIRED_FIELDS; do
   if ! grep -q "^${field}:" "$YAML" 2>/dev/null; then
     fail "missing required field '$field'"
@@ -78,6 +78,7 @@ validate_enum() {
 workflow=$(field_value "workflow")
 phase=$(field_value "phase")
 build_mode=$(field_value "build_mode")
+isolation=$(field_value "isolation")
 verify_mode=$(field_value "verify_mode")
 verify_result=$(field_value "verify_result")
 archived=$(field_value "archived")
@@ -87,6 +88,7 @@ plan=$(field_value "plan")
 validate_enum "workflow"      "$workflow"      "full hotfix tweak"
 validate_enum "phase"         "$phase"          "design build verify archive"
 validate_enum "build_mode"    "$build_mode"     "subagent-driven-development executing-plans direct"
+validate_enum "isolation"     "$isolation"      "branch worktree"
 validate_enum "verify_mode"   "$verify_mode"    "light full"
 validate_enum "verify_result" "$verify_result"  "pending pass fail"
 validate_enum "archived"      "$archived"       "true false"
@@ -106,7 +108,7 @@ if [ -n "$plan" ] && [ "$plan" != "null" ]; then
 fi
 
 # --- Unknown keys check ---
-KNOWN_KEYS="workflow phase design_doc plan build_mode verify_mode verify_result verified_at archived"
+KNOWN_KEYS="workflow phase design_doc plan build_mode isolation verify_mode verify_result verified_at archived"
 while IFS=: read -r key _; do
   key="${key// /}"
   [ -z "$key" ] && continue

package/assets/skills/comet-build/SKILL.md

@@ -68,7 +68,49 @@ plan: docs/superpowers/plans/YYYY-MM-DD-feature.md
   Confirm plan line value is "docs/superpowers/plans/YYYY-MM-DD-feature.md"
   If not matching, retry write then verify again. Maximum 2 retries, report error and terminate if still fails.
 
-### 3. Select Execution Method
+### 3. Workspace Isolation
+
+Plan has been written to the current branch. Before starting execution, choose workspace isolation method:
+
+| Option | Method | Description |
+|--------|--------|-------------|
+| A | Create branch | Create a new branch in the current repo, simple and fast |
+| B | Create Worktree | Isolated workspace, fully independent, suitable for parallel development |
+
+**Recommendation rules**:
+- Change involves ≤ 3 files → Recommend A
+- Need parallel development, current branch has uncommitted work → Recommend B
+
+After user selection, merge and update `isolation` in `openspec/changes/<name>/.comet.yaml` (keep other fields unchanged). `isolation` only allows one of the following values:
+
+- `branch`
+- `worktree`
+
+Few-shot examples:
+
+```yaml
+# User selects create branch / A
+isolation: branch
+```
+
+```yaml
+# User selects create worktree / B
+isolation: worktree
+```
+
+【Write verification】After update completion, must verify:
+  cat openspec/changes/<name>/.comet.yaml
+  Confirm isolation line value is "<branch or worktree>"
+  If not matching, retry write then verify again. Maximum 2 retries, report error and terminate if still fails.
+
+**Execute isolation**:
+
+- **branch**: Run `git checkout -b <change-name>`, subsequent work on the new branch
+- **worktree**: Invoke `superpowers:using-git-worktrees` skill or use native `EnterWorktree` tool to create isolated workspace
+
+After creating isolation, confirm plan file is accessible (naturally accessible with branch method; for worktree method, confirm plan has been committed).
+
+### 4. Select Execution Method
 
 Present plan summary to user (task count, involved modules), then ask for execution method:
 
@@ -114,7 +156,7 @@ After the skill loads, follow its guidance to execute:
 - Complete tasks.md check (`- [ ]` → `- [x]`)
 - Commit code after each task completion
 
-### 4. Spec Incremental Updates
+### 5. Spec Incremental Updates
 
 When the initial spec is found incomplete during implementation, handle by scale:
 

package/assets/skills/comet-hotfix/SKILL.md

@@ -64,6 +64,7 @@ phase: build
 design_doc: null
 plan: null
 build_mode: direct
+isolation: branch
 verify_mode: light
 verify_result: pending
 verified_at: null
@@ -77,6 +78,7 @@ archived: false
   Confirm design_doc line value is "null"
   Confirm plan line value is "null"
   Confirm build_mode line value is "direct"
+  Confirm isolation line value is "branch"
   Confirm verify_mode line value is "light"
   Confirm verify_result line value is "pending"
   Confirm verified_at line value is "null"

package/assets/skills/comet-tweak/SKILL.md

@@ -65,6 +65,7 @@ phase: build
 design_doc: null
 plan: null
 build_mode: direct
+isolation: branch
 verify_mode: light
 verify_result: pending
 verified_at: null
@@ -78,6 +79,7 @@ archived: false
   Confirm design_doc line value is "null"
   Confirm plan line value is "null"
   Confirm build_mode line value is "direct"
+  Confirm isolation line value is "branch"
   Confirm verify_mode line value is "light"
   Confirm verify_result line value is "pending"
   Confirm verified_at line value is "null"

package/assets/skills-zh/comet/SKILL.md

@@ -75,6 +75,7 @@ phase: build
 design_doc: docs/superpowers/specs/YYYY-MM-DD-topic-design.md
 plan: docs/superpowers/plans/YYYY-MM-DD-feature.md
 build_mode: subagent-driven-development
+isolation: branch
 verify_mode: light
 verify_result: pending
 verified_at: null
@@ -90,6 +91,7 @@ archived: false
 | `design_doc` | 关联的 Superpowers Design Doc 路径，可为空 |
 | `plan` | 关联的 Superpowers Plan 路径，可为空 |
 | `build_mode` | 已选择的执行方式，可为空 |
+| `isolation` | `branch` 或 `worktree`，工作区隔离方式，默认 `branch` |
 | `verify_mode` | `light` 或 `full`，可为空 |
 | `verify_result` | `pending`、`pass` 或 `fail` |
 | `verified_at` | 验证通过时间，可为空 |

package/assets/skills-zh/comet-build/SKILL.md

@@ -68,7 +68,49 @@ plan: docs/superpowers/plans/YYYY-MM-DD-feature.md
   确认 plan 行的值为 "docs/superpowers/plans/YYYY-MM-DD-feature.md"
   如不匹配，重试写入后再次验证。最多重试 2 次，仍失败则报告错误并终止。
 
-### 3. 选择执行方式
+### 3. 工作区隔离
+
+计划已写入当前分支。在开始执行前，选择工作区隔离方式：
+
+| 选项 | 方式 | 说明 |
+|------|------|------|
+| A | 创建分支 | 在当前仓库创建新分支，简单快速 |
+| B | 创建 Worktree | 隔离工作区，完全独立，适合并行开发 |
+
+**推荐规则**：
+- 变更涉及 ≤ 3 个文件 → 推荐 A
+- 需要并行开发、当前分支有未提交工作 → 推荐 B
+
+用户选择后，在 `openspec/changes/<name>/.comet.yaml` 中合并更新 `isolation`（保留其他字段不变）。`isolation` 只允许以下值之一：
+
+- `branch`
+- `worktree`
+
+Few-shot 示例：
+
+```yaml
+# 用户选择创建分支 / A
+isolation: branch
+```
+
+```yaml
+# 用户选择创建 worktree / B
+isolation: worktree
+```
+
+【写入验证】更新完成后必须验证：
+  cat openspec/changes/<name>/.comet.yaml
+  确认 isolation 行的值为 "<branch 或 worktree>"
+  如不匹配，重试写入后再次验证。最多重试 2 次，仍失败则报告错误并终止。
+
+**执行隔离**：
+
+- **branch**：执行 `git checkout -b <change-name>`，后续工作在新分支上进行
+- **worktree**：调用 `superpowers:using-git-worktrees` 技能或使用原生 `EnterWorktree` 工具创建隔离工作区
+
+创建隔离后，确认计划文件可访问（分支方式天然可访问；worktree 方式需确认计划已提交）。
+
+### 4. 选择执行方式
 
 向用户展示计划摘要（任务数、涉及模块），然后询问执行方式：
 
@@ -114,7 +156,7 @@ build_mode: executing-plans
 - 完成 tasks.md 勾选（`- [ ]` → `- [x]`）
 - 每个任务完成后提交代码
 
-### 4. Spec 增量更新
+### 5. Spec 增量更新
 
 实施过程中发现初版 spec 不完整时，按变更规模分级处理：
 

package/assets/skills-zh/comet-hotfix/SKILL.md

@@ -64,6 +64,7 @@ phase: build
 design_doc: null
 plan: null
 build_mode: direct
+isolation: branch
 verify_mode: light
 verify_result: pending
 verified_at: null
@@ -77,6 +78,7 @@ archived: false
   确认 design_doc 行的值为 "null"
   确认 plan 行的值为 "null"
   确认 build_mode 行的值为 "direct"
+  确认 isolation 行的值为 "branch"
   确认 verify_mode 行的值为 "light"
   确认 verify_result 行的值为 "pending"
   确认 verified_at 行的值为 "null"

package/assets/skills-zh/comet-tweak/SKILL.md

@@ -65,6 +65,7 @@ phase: build
 design_doc: null
 plan: null
 build_mode: direct
+isolation: branch
 verify_mode: light
 verify_result: pending
 verified_at: null
@@ -78,6 +79,7 @@ archived: false
   确认 design_doc 行的值为 "null"
   确认 plan 行的值为 "null"
   确认 build_mode 行的值为 "direct"
+  确认 isolation 行的值为 "branch"
   确认 verify_mode 行的值为 "light"
   确认 verify_result 行的值为 "pending"
   确认 verified_at 行的值为 "null"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpamis/comet",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "description": "OpenSpec + Superpowers dual-star development workflow",
   "keywords": [
     "comet",