@speclife/cli 0.9.0 → 0.9.2

package/templates/commands/start.md

@@ -4,272 +4,20 @@ id: speclife-start
 category: SpecLife
 description: Create a new branch for a change, optionally in a worktree for parallel work.
 ---
-# /speclife start
-
-Create a new branch for a change, optionally in a worktree for parallel work.
-
-## ⚡ Execution
-
-**When this command is invoked, IMMEDIATELY execute the workflow below.**
-
-- Do NOT skip steps or jump straight to implementation
-- If mid-conversation, treat the invocation as "start fresh with this workflow"
-- If required inputs are missing (description), prompt the user
-- If user says "based on context", derive the description from recent discussion
-- **STOP after scaffolding proposal—do NOT auto-invoke `/openspec-apply`**
-
-## Usage
-
-```
-/speclife start <description>               # New proposal, worktree (default)
-/speclife start <description> in a branch   # New proposal, branch-only
-/speclife start "resume <change-id>"        # Resume existing proposal, worktree
-/speclife start "implement <change-id>"     # Resume if exists, create if not
-/speclife start                             # Interactive
-```
-
-## Goal
-
-Set up a workspace for a new change with proper git branch.
-
-## Mode Detection
-
-Parse the input for workflow hints in this order:
-
-### 1. Resume Intent Detection
-
-| Phrase in input | Meaning |
-|-----------------|---------|
-| "resume <change-id>", "continue <change-id>", "pick up <change-id>" | **Resume existing proposal** (error if not found) |
-| "implement <change-id>" | **Resume if exists**, create new if not |
-
-Examples:
-- `"resume fix-release-and-init"` → resume mode, change-id = `fix-release-and-init`
-- `"continue working on add-oauth-login"` → resume mode, change-id = `add-oauth-login`
-- `"implement fix-email-validation"` → try resume, fallback to new
-
-### 2. Worktree Mode Detection
-
-| Phrase in input | Mode |
-|-----------------|------|
-| "in a branch", "branch only", "no worktree", "simple" | **Branch-only** |
-| "in a worktree", "with worktree", "parallel" | **Worktree** |
-| Neither | **Worktree** (default) |
-
-### 3. Parsing Order
-
-1. Check for resume keywords → extract change-id
-2. Check for mode keywords → determine worktree/branch
-3. Strip workflow hints → derive description (new proposals only)
-
-Examples:
-- `"resume fix-bug in a branch"` → resume mode, branch-only
-- `"implement oauth with worktree"` → resume/new mode, worktree
-
-## Steps
-
-### 1. Check for Resume Intent
-
-Parse input for resume keywords (`resume`, `continue`, `pick up`, `implement`):
-
-**If resume intent detected:**
-```bash
-CHANGE_ID=<extracted-from-input>  # e.g., "fix-release-and-init"
-PROPOSAL_DIR="openspec/changes/${CHANGE_ID}"
-
-if [[ ! -d "$PROPOSAL_DIR" ]]; then
-  echo "❌ Proposal '${CHANGE_ID}' not found"
-  echo ""
-  echo "Available proposals:"
-  ls -1 openspec/changes/ | grep -v archive
-  exit 1
-fi
-
-echo "✓ Found existing proposal at ${PROPOSAL_DIR}/"
-# Skip to step 3 (create branch/worktree)
-```
-
-**If "implement" keyword and proposal doesn't exist:**
-- Continue as new proposal (steps 2-5)
-
-**If no resume intent:**
-- Continue to step 2
-
-### 2. Derive change-id (New Proposals Only)
-
-Convert description to kebab-case:
-- "Add user authentication" → `add-user-auth`
-- Prefix with verb: add-, fix-, update-, remove-, refactor-
-- Keep it short (3-5 words max)
-
-### 3. Create branch/worktree
-
-**Branch-only mode:**
-```bash
-git checkout -b spec/<change-id>
-```
-- Works in current directory
-- One change at a time (switch branches to context-switch)
-
-**Worktree mode (default):**
-```bash
-speclife worktree create <change-id>
-```
-- Creates `worktrees/<change-id>/`
-- Creates branch `spec/<change-id>`
-- Parallel changes possible
-
-### 4. Scaffold proposal (New Proposals Only)
-
-**Skip this step if resuming an existing proposal.**
-
-Invoke `/openspec-proposal` with the description (minus workflow hints)
-- Creates `openspec/changes/<change-id>/proposal.md`
-- Creates `openspec/changes/<change-id>/tasks.md`
-
-### 5. Report and STOP
-
-**New Proposal - Branch-only:**
-```
-✓ Derived change-id: add-oauth-login
-✓ Created branch spec/add-oauth-login
-✓ Scaffolded proposal at openspec/changes/add-oauth-login/
-
-Next: Review the proposal, then run `/openspec-apply` to implement.
-```
-
-**New Proposal - Worktree:**
-```
-✓ Derived change-id: add-oauth-login
-✓ Created worktree at worktrees/add-oauth-login/
-✓ Created branch spec/add-oauth-login
-✓ Scaffolded proposal at openspec/changes/add-oauth-login/
-
-⚠️  IMPORTANT: You must work from the worktree directory!
-
-Next steps:
-1. Switch to worktree: cd worktrees/add-oauth-login/
-2. Invoke /openspec-apply from there
-
-🚨 CRITICAL: All file edits MUST happen in:
-   worktrees/add-oauth-login/openspec/...
-   worktrees/add-oauth-login/packages/...
-   
-   NOT in the main repo paths!
-```
-
-**Resume Proposal - Branch-only:**
-```
-✓ Found existing proposal at openspec/changes/fix-release-and-init/
-✓ Created branch spec/fix-release-and-init
-ℹ️ Proposal already defined - ready to implement
-
-Next: Run `/openspec-apply` to implement tasks.
-```
-
-**Resume Proposal - Worktree:**
-```
-✓ Found existing proposal at openspec/changes/fix-release-and-init/
-✓ Created worktree at worktrees/fix-release-and-init/
-✓ Created branch spec/fix-release-and-init
-ℹ️ Proposal already defined - ready to implement
-
-Next: cd worktrees/fix-release-and-init/ then run `/openspec-apply`.
-```
-
-**⛔ STOP HERE.** Do NOT proceed to implementation. Wait for user to:
-1. Review the proposal (if new)
-2. Switch to worktree directory (if worktree mode)
-3. Invoke `/openspec-apply` or `/speclife implement`
-
-## Examples
-
-**New proposals:**
-```
-User: /speclife start "Add OAuth login support"
-→ Creates worktree (default), scaffolds new proposal
-
-User: /speclife start "Add OAuth login" in a branch
-→ Creates branch only, scaffolds new proposal
-
-User: /speclife start "fix login bug" branch only
-→ Creates branch only, scaffolds new proposal
-```
-
-**Resume existing proposals:**
-```
-User: /speclife start "resume fix-release-and-init"
-→ Creates worktree, uses existing proposal
-
-User: /speclife start "continue working on add-oauth-login"
-→ Creates worktree, uses existing proposal
-
-User: /speclife start "pick up fix-email-validation in a branch"
-→ Creates branch only, uses existing proposal
-
-User: /speclife start "implement add-user-auth"
-→ If proposal exists: resumes it
-→ If not: creates new proposal
-```
-
-**Error case:**
-```
-User: /speclife start "resume nonexistent-change"
-
-Agent:
-❌ Proposal 'nonexistent-change' not found
-
-Available proposals:
-  fix-release-and-init
-  add-oauth-login
-  fix-email-validation
-```
-
-**Interactive:**
-```
-User: /speclife start
-→ Prompts: "Describe your change" then "Worktree (default) or branch-only?"
-```
-
-## Tradeoffs
-
-| Aspect | Worktree | Branch-only |
-|--------|----------|-------------|
-| Parallel changes | ✓ Multiple worktrees | One at a time |
-| IDE support | May need reload | Seamless |
-| Setup complexity | More dirs | Simpler |
-| Context switching | cd to worktree | git checkout |
-
-## Naming Conventions
-
-- Use kebab-case for change-id
-- Prefix with action verb: `add-`, `fix-`, `update-`, `remove-`, `refactor-`
-- Keep it descriptive but concise
-- Examples:
-  - `add-user-auth`
-  - `fix-login-redirect`
-  - `update-api-docs`
-  - `remove-deprecated-endpoint`
-  - `refactor-database-layer`
-
-## Notes
-
-### General
-- Branch name is always `spec/<change-id>` regardless of mode
-- If branch exists, error and suggest using existing
-- Branch-only: uncommitted changes carry over (stash if needed)
-- Worktree: clean checkout from main
-- To switch modes later, use `/speclife convert`
-
-### Resume Behavior
-- Resume keywords: `resume`, `continue`, `pick up`, `implement`
-- Proposals must exist in `openspec/changes/<change-id>/`
-- Archived proposals are not searched (move from archive first if needed)
-- Resume skips `/openspec-proposal` scaffolding
-- "implement" keyword tries resume first, creates new if not found
-- Combine with mode: "resume X in a branch" or "resume X with worktree"
-
-### Next Steps
-- After creating new proposal: Review, refine, then `/openspec-apply`
-- After resuming proposal: Directly run `/openspec-apply` to implement tasks
-- Both workflows converge at implementation phase
+**Guardrails**
+- Execute immediately when invoked
+- Parse input for resume keywords (`resume`, `continue`, `pick up`, `implement <id>`)
+- Parse for mode keywords: "in a branch" → branch-only, otherwise → worktree (default)
+- STOP after scaffolding—do NOT auto-invoke `/openspec-apply`
+
+**Steps**
+1. If resume intent detected, verify `openspec/changes/<id>/` exists; error with available proposals if not found.
+2. For new proposals: derive kebab-case change-id from description (prefix: add-, fix-, update-, remove-, refactor-).
+3. Create workspace: branch-only → `git checkout -b spec/<id>`, worktree → `speclife worktree create <id>`.
+4. For new proposals only: scaffold `proposal.md` and `tasks.md` under `openspec/changes/<id>/` (follow `/openspec-proposal` for format), then run `openspec validate <id> --strict`.
+5. Report: change-id, branch/worktree created, path to work directory. If worktree, emphasize: "All edits must happen in worktrees/<id>/".
+
+**Reference**
+- Branch name always `spec/<change-id>` regardless of mode
+- Resume skips proposal scaffolding; proceed directly to `/openspec-apply`
+- Use `/speclife convert` to switch modes later

package/templates/commands/sync.md

@@ -4,167 +4,19 @@ id: speclife-sync
 category: SpecLife
 description: Update current branch with latest changes from main.
 ---
-# /speclife sync
-
-Update your branch with latest main. Handles conflicts with guidance.
-
-## ⚡ Execution
-
-**When this command is invoked, IMMEDIATELY execute the workflow below.**
-
-- Check prerequisites first (not on main, clean working directory)
-- Default to rebase unless `--merge` is specified
-- If conflicts occur, guide the user through resolution
-- Push after successful sync
-
-## TL;DR
-
-```
-/speclife sync          # Rebase onto main (default)
-/speclife sync --merge  # Merge main into branch
-```
-
-**Quick flow:**
-1. Check prerequisites (not on main, clean working dir)
-2. Fetch latest
-3. Rebase or merge
-4. Handle conflicts if any
-5. Force push (if rebased)
-
-## Prerequisites
-
-- Not on main branch
-- Working directory clean (commit or stash first)
-
-## Core Steps
-
-### 1. Check State
-```bash
-BRANCH=$(git branch --show-current)
-[[ "$BRANCH" == "main" ]] && echo "Already on main" && exit
-
-# Check for uncommitted changes
-[[ -n $(git status --porcelain) ]] && echo "Commit or stash changes first"
-```
-
-### 2. Fetch & Check
-```bash
-git fetch origin main
-BEHIND=$(git rev-list --count HEAD..origin/main)
-[[ "$BEHIND" == "0" ]] && echo "Already up to date" && exit
-```
-
-### 3. Rebase (default) or Merge
-```bash
-# Rebase (cleaner history)
-git rebase origin/main
-
-# Or merge (preserves history)
-git merge origin/main
-```
-
-### 4. Handle Conflicts
-If conflicts:
-```bash
-# List conflicts
-git diff --name-only --diff-filter=U
-```
-
-Tell user:
-```
-⚠️ Conflicts in 3 files:
-   - src/auth/login.ts
-   - package.json
-   
-To resolve:
-1. Edit files, remove <<<<<<< ======= >>>>>>> markers
-2. git add <resolved-files>
-3. git rebase --continue
-
-Or abort: git rebase --abort
-```
-
-### 5. Push
-```bash
-# After rebase (force required)
-git push --force-with-lease origin <branch>
-
-# After merge (normal push)
-git push origin <branch>
-```
-
-### 6. Report
-```
-✓ Rebased onto main (5 commits)
-✓ No conflicts
-✓ Pushed
-```
-
----
-
-<!-- REFERENCE SECTIONS - Read only when needed -->
-
-## Appendix: Conflict Resolution
-
-**Conflict markers:**
-```
-<<<<<<< HEAD (yours)
-const timeout = 5000;
-=======
-const timeout = 10000;
->>>>>>> origin/main (theirs)
-```
-
-**Resolution strategies:**
-- Keep yours: delete their section + markers
-- Keep theirs: delete your section + markers
-- Combine: merge logic, delete markers
-
-**Common conflicts:**
-- `package.json` version → keep higher (main)
-- Import conflicts → combine imports
-
-## Appendix: Error Handling
-
-**On main:**
-```
-ℹ️ Already on main - nothing to sync.
-```
-
-**Uncommitted changes:**
-```
-⚠️ Uncommitted changes detected.
-Commit or stash, then retry.
-```
-
-**Rebase in progress:**
-```
-⚠️ Rebase already in progress.
-Continue: git rebase --continue
-Abort: git rebase --abort
-```
-
-## Appendix: Examples
-
-**Clean sync:**
-```
-User: /speclife sync
-
-Agent:
-✓ Fetched latest
-ℹ️ 3 commits behind main
-✓ Rebased - no conflicts
-✓ Force pushed
-```
-
-**With conflicts:**
-```
-User: /speclife sync
-
-Agent:
-⚠️ Conflicts in 2 files:
-   - src/auth.ts
-   - package.json
-
-[Offers to help resolve]
-```
+**Guardrails**
+- Execute immediately—default to rebase unless `--merge` specified
+- Require: not on main, working directory clean
+- Guide user through conflict resolution if any
+
+**Steps**
+1. Check state: error if on main or uncommitted changes exist.
+2. Fetch and check: `git fetch origin main`; if already up to date, report and exit.
+3. Rebase (default) or merge: `git rebase origin/main` or `git merge origin/main`.
+4. If conflicts: list conflicting files, explain resolution (edit files, `git add`, `git rebase --continue`), offer to help resolve.
+5. Push: `git push --force-with-lease` (rebase) or `git push` (merge).
+6. Report: commits synced, conflicts resolved (if any), pushed.
+
+**Reference**
+- Conflict markers: `<<<<<<< HEAD`, `=======`, `>>>>>>> origin/main`
+- Abort rebase: `git rebase --abort`