[{"data":1,"prerenderedAt":-1},["ShallowReactive",2],{"skill:01M6AEXXVCVS2316QEKF8DEFSM":3,"skill-same:01M6AEXXVCVS2316QEKF8DEFSM":72},{"skillNo":4,"name":5,"nameZh":6,"description":7,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":16,"categories":17,"keywords":18,"publishedAt":40,"linkOnly":41,"markdownContent":42,"markdownBody":43,"frontMatter":44,"refName":48,"commitSha":49,"skillDirectory":50,"forksCount":51,"repositoryHtmlUrl":52,"repositoryHomepageUrl":53,"ownerHtmlUrl":54,"ownerBlogUrl":55,"ownerDescription":56,"updatedAt":57,"install":58,"resources":71},"01M6AEXXVCVS2316QEKF8DEFSM","worktree-guide",null,"Interactive guide for parallel development with Ghostty, git worktrees, and Lazygit. Use when setting up multi-task workflows or learning the worktree system.","davila7\u002Fclaude-code-templates","davila7","https:\u002F\u002Favatars.githubusercontent.com\u002Fu\u002F6216945?v=4","01M6ADEWWFPS191NFM0Y1EX1JH","Daniel Avila","01M6ADJHGM78PHQRD3XZTFDVKK",33481,"MIT","https:\u002F\u002Fgithub.com\u002Fdavila7\u002Fclaude-code-templates\u002Fblob\u002Fmain\u002Fcli-tool\u002Fcomponents\u002Fskills\u002Fdevelopment\u002Fworktree-guide\u002FSKILL.md",[],[19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39],"worktree","worktree guide","guide","parallel","when","for","with","task","worktrees","up","use","git worktrees","interactive","workflows","system","learning","ghostty","templates","git","code","development","2026-11-10 10:12:30",false,"---\nname: worktree-guide\ndescription: Interactive guide for parallel development with Ghostty, git worktrees, and Lazygit. Use when setting up multi-task workflows or learning the worktree system.\nlicense: MIT\nmetadata:\n  author: claude-code-templates\n  version: \"1.0\"\n---\n\nGuide the user through parallel development workflows using Ghostty terminal panels, git worktrees, and Lazygit. This is both a teaching experience and a practical reference.\n\n---\n\n## Preflight\n\nBefore starting, detect the user's environment:\n\n```bash\ngit rev-parse --is-inside-work-tree 2>&1 && echo \"GIT_OK\" || echo \"NOT_GIT\"\n```\n\n**If not a git repo:**\n> This isn't a git repository. Navigate to a git project first, then come back to `\u002Fworktree-guide`.\n\nCheck if we're in a worktree or main repo:\n```bash\ngit worktree list\npwd\n```\n\nNote the context for later guidance.\n\n---\n\n## Phase 1: Welcome & Context Detection\n\nDisplay based on environment:\n\n**If in main repo:**\n```\n## Worktree Parallel Development Guide\n\nWelcome! I'll guide you through setting up and using parallel worktrees for multi-task development.\n\n┌─────────────────────────────────────────────────────────────┐\n│  Ghostty Terminal                                           │\n│  ┌──────────────────────┬──────────────────────┐           │\n│  │                      │                      │           │\n│  │   Claude (Task 1)    │   Claude (Task 2)    │           │\n│  │   claude\u002Flogin-page   │   claude\u002Ffix-auth-bug │           │\n│  │                      │                      │           │\n│  ├──────────────────────┴──────────────────────┤           │\n│  │              Lazygit (monitoring)           │           │\n│  └─────────────────────────────────────────────┘           │\n└─────────────────────────────────────────────────────────────┘\n\n**Your workflow:**\n1. Create worktrees → `\u002Fworktree-init`\n2. Open Ghostty panels → `Cmd+D` \u002F `Cmd+Shift+D`\n3. Run Claude in each panel → `cd \u003Cworktree> && claude`\n4. Deliver when done → `\u002Fworktree-deliver`\n5. Clean up → `\u002Fworktree-cleanup`\n\nWhat would you like to do?\n```\n\nUse AskUserQuestion:\n- \"Learn the full workflow\" — Start from Phase 2\n- \"Just show keybindings\" — Jump to Quick Reference\n- \"Create worktrees now\" — Suggest `\u002Fworktree-init`\n- \"Something else\" — Ask what they need\n\n**If already in a worktree:**\n```\n## Worktree Status\n\nYou're already inside a worktree! Let me check your status.\n```\n\nThen run the equivalent of `\u002Fworktree-check` and provide contextual guidance.\n\n---\n\n## Phase 2: Ghostty Essentials\n\n**EXPLAIN:**\n```\n## Ghostty Panel Management\n\nGhostty's panel system is perfect for parallel development. Here are the essential keybindings:\n```\n\n**SHOW:**\n```\n┌─────────────────────────────────────────────────────────────┐\n│                    GHOSTTY KEYBINDINGS                      │\n├─────────────────────────────────────────────────────────────┤\n│                                                             │\n│  SPLITTING                                                  │\n│  ─────────                                                  │\n│  Cmd+D           Split panel to the right                   │\n│  Cmd+Shift+D     Split panel below                          │\n│                                                             │\n│  NAVIGATION                                                 │\n│  ─────────                                                  │\n│  Cmd+Alt+←\u002F→\u002F↑\u002F↓ Move focus between panels                  │\n│  Cmd+[\u002F]         Cycle through panels                       │\n│                                                             │\n│  SIZING                                                     │\n│  ─────────                                                  │\n│  Cmd+Shift+E     Equalize all panel sizes                   │\n│  Cmd+Shift+F     Toggle zoom (fullscreen current panel)     │\n│                                                             │\n│  CLOSING                                                    │\n│  ─────────                                                  │\n│  Cmd+W           Close current panel                        │\n│                                                             │\n└─────────────────────────────────────────────────────────────┘\n\n**Pro tip:** Use Cmd+Shift+F to zoom into a panel when you need focus, then press it again to return to the multi-panel view.\n```\n\n**PAUSE** - \"Ready to learn about Lazygit? (Or skip to workflow)\"\n\n---\n\n## Phase 3: Lazygit Essentials\n\n**EXPLAIN:**\n```\n## Lazygit for Monitoring Worktrees\n\nLazygit gives you a visual overview of all your worktrees and their changes. Run it from your main repo to monitor everything.\n```\n\n**SHOW:**\n```\n┌─────────────────────────────────────────────────────────────┐\n│                    LAZYGIT KEYBINDINGS                      │\n├─────────────────────────────────────────────────────────────┤\n│                                                             │\n│  WORKTREES (navigate to Worktrees panel)                    │\n│  ─────────                                                  │\n│  w              Switch to worktree panel (or create new)    │\n│  Enter          Switch to selected worktree                 │\n│  n              Create new worktree                         │\n│  d              Delete worktree (with confirmation)         │\n│                                                             │\n│  FILES & STAGING                                            │\n│  ─────────                                                  │\n│  Space          Stage\u002Funstage file                          │\n│  a              Stage all files                             │\n│  Enter          View file diff (with Delta highlighting)    │\n│                                                             │\n│  COMMITS                                                    │\n│  ─────────                                                  │\n│  c              Commit staged changes                       │\n│  C              Commit with editor                          │\n│  A              Amend last commit                           │\n│                                                             │\n│  SYNC                                                       │\n│  ─────────                                                  │\n│  P              Push                                        │\n│  p              Pull                                        │\n│  f              Fetch                                       │\n│                                                             │\n│  GENERAL                                                    │\n│  ─────────                                                  │\n│  ?              Help (context-sensitive)                    │\n│  q              Quit \u002F go back                              │\n│  Tab            Switch panels                               │\n│                                                             │\n└─────────────────────────────────────────────────────────────┘\n\n**Monitoring workflow:**\n1. Open lazygit in the main repo (or a dedicated Ghostty panel)\n2. Press `w` to see all worktrees\n3. Use Enter to dive into any worktree's changes\n4. Press `q` to go back to the worktree list\n```\n\n**PAUSE** - \"Ready for the full workflow walkthrough?\"\n\n---\n\n## Phase 4: Complete Workflow (Guided)\n\n**EXPLAIN:**\n```\n## Full Parallel Development Workflow\n\nLet me walk you through the complete cycle. We'll go step by step.\n```\n\n### Step 4.1: Create Worktrees\n\n**EXPLAIN:**\n```\n### Step 1: Create Worktrees\n\nFirst, define the tasks you want to work on in parallel. The `\u002Fworktree-init` command creates a worktree for each task.\n```\n\n**DO:** Show example command:\n```\nExample usage:\n\n\u002Fworktree-init add user authentication | fix login bug | improve dashboard performance\n\nThis creates:\n├── ..\u002Fworktrees\u002F\u003Crepo>\u002Fclaude-add-user-authentication\u002F\n├── ..\u002Fworktrees\u002F\u003Crepo>\u002Fclaude-fix-login-bug\u002F\n└── ..\u002Fworktrees\u002F\u003Crepo>\u002Fclaude-improve-dashboard-performance\u002F\n```\n\n### Step 4.2: Open Ghostty Panels\n\n**EXPLAIN:**\n```\n### Step 2: Open Ghostty Panels\n\nNow split your terminal into panels—one for each task, plus optionally one for Lazygit monitoring.\n```\n\n**DO:**\n```\n1. Press Cmd+D to split right (first worktree)\n2. Press Cmd+D again (second worktree)\n3. Optionally press Cmd+Shift+D on any panel for Lazygit below\n\nResulting layout:\n┌──────────┬──────────┬──────────┐\n│ Task 1   │ Task 2   │ Task 3   │\n│ claude   │ claude   │ claude   │\n├──────────┴──────────┴──────────┤\n│           lazygit              │\n└────────────────────────────────┘\n```\n\n### Step 4.3: Work in Each Panel\n\n**EXPLAIN:**\n```\n### Step 3: Work Independently\n\nIn each panel:\n1. cd to the worktree path (from the commands output)\n2. Run `claude` to start a Claude session\n3. Use `\u002Fworktree-check` anytime to verify which task you're working on\n4. Work normally—Claude doesn't know about other panels\n```\n\n### Step 4.4: Deliver Completed Work\n\n**EXPLAIN:**\n```\n### Step 4: Deliver When Done\n\nWhen you finish a task in any panel, use `\u002Fworktree-deliver` to:\n1. Review your changes\n2. Create a commit\n3. Push to remote\n4. Create a pull request\n```\n\n### Step 4.5: Clean Up\n\n**EXPLAIN:**\n```\n### Step 5: Clean Up After Merging\n\nAfter your PRs are merged on GitHub:\n1. Go back to the main repo (not a worktree)\n2. Run `\u002Fworktree-cleanup --all`\n3. It removes merged worktrees and branches\n```\n\n---\n\n## Phase 5: Troubleshooting\n\n**SHOW:**\n```\n## Troubleshooting\n\n### \"I'm not sure which worktree I'm in\"\n\nRun `\u002Fworktree-check` — it shows your branch, task, and status.\n\nAlternatively:\n$ git branch --show-current    # Shows claude\u002F\u003Cname>\n$ pwd                          # Shows the worktree path\n\n---\n\n### \"I have uncommitted changes and want to switch tasks\"\n\n**Option 1:** Commit work-in-progress\n$ git add . && git commit -m \"wip: progress on feature\"\n\n**Option 2:** Stash changes (temporary)\n$ git stash push -m \"wip: parking changes\"\n\nThen in the other panel, continue working. Come back later with:\n$ git stash pop\n\n---\n\n### \"I accidentally started working in the wrong worktree\"\n\n1. Stash your changes: `git stash push -m \"work done in wrong place\"`\n2. Navigate to the correct worktree\n3. Apply the stash: `git stash pop`\n\n---\n\n### \"My worktree has merge conflicts\"\n\n1. Run `git fetch origin` to get latest\n2. Run `git rebase origin\u002Fmain` (or merge if you prefer)\n3. Resolve conflicts in your editor\n4. `git add .` then `git rebase --continue`\n\n---\n\n### \"I want to abandon a worktree\"\n\nFrom the main repo:\n$ git worktree remove ..\u002Fworktrees\u002Frepo\u002Fclaude-\u003Cname> --force\n$ git branch -D claude\u002F\u003Cname>\n\nNote: Force is needed if there are uncommitted changes.\n\n---\n\n### \"\u002Fworktree-deliver failed on push\"\n\nUsually means the remote branch doesn't exist yet or there's a conflict.\n\nTry:\n$ git push -u origin HEAD\n\nIf there's a conflict with remote, pull first:\n$ git pull --rebase origin claude\u002F\u003Cname>\n\n---\n\n### \"The worktree path doesn't exist anymore\"\n\nThe worktree was probably deleted manually. Clean up the git state:\n$ git worktree prune\n```\n\n---\n\n## Phase 6: Quick Reference Card\n\n**SHOW:**\n```\n┌─────────────────────────────────────────────────────────────────────────────┐\n│                         WORKTREE QUICK REFERENCE                            │\n├─────────────────────────────────────────────────────────────────────────────┤\n│                                                                             │\n│  COMMANDS                                                                   │\n│  ─────────                                                                  │\n│  \u002Fworktree-init \u003Ctask1> | \u003Ctask2>    Create worktrees for parallel tasks    │\n│  \u002Fworktree-check                     Show current worktree status & task    │\n│  \u002Fworktree-deliver                   Commit, push, and create PR            │\n│  \u002Fworktree-cleanup --all             Remove merged worktrees and branches   │\n│  \u002Fworktree-cleanup --dry-run         Preview what would be cleaned up       │\n│                                                                             │\n│  GHOSTTY                                                                    │\n│  ─────────                                                                  │\n│  Cmd+D              Split right     │  Cmd+Shift+E    Equalize panels      │\n│  Cmd+Shift+D        Split down      │  Cmd+Shift+F    Zoom toggle          │\n│  Cmd+Alt+Arrows     Navigate        │  Cmd+W          Close panel          │\n│                                                                             │\n│  LAZYGIT                                                                    │\n│  ─────────                                                                  │\n│  w                  Worktrees panel │  Space          Stage\u002Funstage        │\n│  Enter              View diff       │  c              Commit               │\n│  P                  Push            │  ?              Help                 │\n│                                                                             │\n│  GIT (manual)                                                               │\n│  ─────────                                                                  │\n│  git worktree list                   List all worktrees                     │\n│  git worktree add -b claude\u002Fname path Create worktree manually               │\n│  git worktree remove path            Remove a worktree                      │\n│  git worktree prune                  Clean up stale worktree refs           │\n│                                                                             │\n│  WORKFLOW                                                                   │\n│  ─────────                                                                  │\n│  1. \u002Fworktree-init tasks...          Create worktrees                       │\n│  2. Cmd+D (split panels)             Open Ghostty panels                    │\n│  3. cd \u003Cpath> && claude              Start Claude in each                   │\n│  4. \u002Fworktree-deliver                PR when done                           │\n│  5. \u002Fworktree-cleanup                Clean up after merge                   │\n│                                                                             │\n└─────────────────────────────────────────────────────────────────────────────┘\n```\n\n---\n\n## Guardrails\n\n- **Never execute destructive commands** without confirmation (worktree remove, branch delete)\n- **Always verify location** before suggesting worktree operations\n- **If user seems lost**, offer `\u002Fworktree-check` first\n- **Never force-delete** branches that aren't merged\n- **Don't assume tools are installed** — check for lazygit availability if suggesting it\n- **Respect user's pace** — don't rush through sections if they want to practice\n- **Keep the reference card available** — offer to show it whenever relevant\n","Guide the user through parallel development workflows using Ghostty terminal panels, git worktrees, and Lazygit. This is both a teaching experience and a practical reference.\n\n---\n\n## Preflight\n\nBefore starting, detect the user's environment:\n\n```bash\ngit rev-parse --is-inside-work-tree 2>&1 && echo \"GIT_OK\" || echo \"NOT_GIT\"\n```\n\n**If not a git repo:**\n> This isn't a git repository. Navigate to a git project first, then come back to `\u002Fworktree-guide`.\n\nCheck if we're in a worktree or main repo:\n```bash\ngit worktree list\npwd\n```\n\nNote the context for later guidance.\n\n---\n\n## Phase 1: Welcome & Context Detection\n\nDisplay based on environment:\n\n**If in main repo:**\n```\n## Worktree Parallel Development Guide\n\nWelcome! I'll guide you through setting up and using parallel worktrees for multi-task development.\n\n┌─────────────────────────────────────────────────────────────┐\n│  Ghostty Terminal                                           │\n│  ┌──────────────────────┬──────────────────────┐           │\n│  │                      │                      │           │\n│  │   Claude (Task 1)    │   Claude (Task 2)    │           │\n│  │   claude\u002Flogin-page   │   claude\u002Ffix-auth-bug │           │\n│  │                      │                      │           │\n│  ├──────────────────────┴──────────────────────┤           │\n│  │              Lazygit (monitoring)           │           │\n│  └─────────────────────────────────────────────┘           │\n└─────────────────────────────────────────────────────────────┘\n\n**Your workflow:**\n1. Create worktrees → `\u002Fworktree-init`\n2. Open Ghostty panels → `Cmd+D` \u002F `Cmd+Shift+D`\n3. Run Claude in each panel → `cd \u003Cworktree> && claude`\n4. Deliver when done → `\u002Fworktree-deliver`\n5. Clean up → `\u002Fworktree-cleanup`\n\nWhat would you like to do?\n```\n\nUse AskUserQuestion:\n- \"Learn the full workflow\" — Start from Phase 2\n- \"Just show keybindings\" — Jump to Quick Reference\n- \"Create worktrees now\" — Suggest `\u002Fworktree-init`\n- \"Something else\" — Ask what they need\n\n**If already in a worktree:**\n```\n## Worktree Status\n\nYou're already inside a worktree! Let me check your status.\n```\n\nThen run the equivalent of `\u002Fworktree-check` and provide contextual guidance.\n\n---\n\n## Phase 2: Ghostty Essentials\n\n**EXPLAIN:**\n```\n## Ghostty Panel Management\n\nGhostty's panel system is perfect for parallel development. Here are the essential keybindings:\n```\n\n**SHOW:**\n```\n┌─────────────────────────────────────────────────────────────┐\n│                    GHOSTTY KEYBINDINGS                      │\n├─────────────────────────────────────────────────────────────┤\n│                                                             │\n│  SPLITTING                                                  │\n│  ─────────                                                  │\n│  Cmd+D           Split panel to the right                   │\n│  Cmd+Shift+D     Split panel below                          │\n│                                                             │\n│  NAVIGATION                                                 │\n│  ─────────                                                  │\n│  Cmd+Alt+←\u002F→\u002F↑\u002F↓ Move focus between panels                  │\n│  Cmd+[\u002F]         Cycle through panels                       │\n│                                                             │\n│  SIZING                                                     │\n│  ─────────                                                  │\n│  Cmd+Shift+E     Equalize all panel sizes                   │\n│  Cmd+Shift+F     Toggle zoom (fullscreen current panel)     │\n│                                                             │\n│  CLOSING                                                    │\n│  ─────────                                                  │\n│  Cmd+W           Close current panel                        │\n│                                                             │\n└─────────────────────────────────────────────────────────────┘\n\n**Pro tip:** Use Cmd+Shift+F to zoom into a panel when you need focus, then press it again to return to the multi-panel view.\n```\n\n**PAUSE** - \"Ready to learn about Lazygit? (Or skip to workflow)\"\n\n---\n\n## Phase 3: Lazygit Essentials\n\n**EXPLAIN:**\n```\n## Lazygit for Monitoring Worktrees\n\nLazygit gives you a visual overview of all your worktrees and their changes. Run it from your main repo to monitor everything.\n```\n\n**SHOW:**\n```\n┌─────────────────────────────────────────────────────────────┐\n│                    LAZYGIT KEYBINDINGS                      │\n├─────────────────────────────────────────────────────────────┤\n│                                                             │\n│  WORKTREES (navigate to Worktrees panel)                    │\n│  ─────────                                                  │\n│  w              Switch to worktree panel (or create new)    │\n│  Enter          Switch to selected worktree                 │\n│  n              Create new worktree                         │\n│  d              Delete worktree (with confirmation)         │\n│                                                             │\n│  FILES & STAGING                                            │\n│  ─────────                                                  │\n│  Space          Stage\u002Funstage file                          │\n│  a              Stage all files                             │\n│  Enter          View file diff (with Delta highlighting)    │\n│                                                             │\n│  COMMITS                                                    │\n│  ─────────                                                  │\n│  c              Commit staged changes                       │\n│  C              Commit with editor                          │\n│  A              Amend last commit                           │\n│                                                             │\n│  SYNC                                                       │\n│  ─────────                                                  │\n│  P              Push                                        │\n│  p              Pull                                        │\n│  f              Fetch                                       │\n│                                                             │\n│  GENERAL                                                    │\n│  ─────────                                                  │\n│  ?              Help (context-sensitive)                    │\n│  q              Quit \u002F go back                              │\n│  Tab            Switch panels                               │\n│                                                             │\n└─────────────────────────────────────────────────────────────┘\n\n**Monitoring workflow:**\n1. Open lazygit in the main repo (or a dedicated Ghostty panel)\n2. Press `w` to see all worktrees\n3. Use Enter to dive into any worktree's changes\n4. Press `q` to go back to the worktree list\n```\n\n**PAUSE** - \"Ready for the full workflow walkthrough?\"\n\n---\n\n## Phase 4: Complete Workflow (Guided)\n\n**EXPLAIN:**\n```\n## Full Parallel Development Workflow\n\nLet me walk you through the complete cycle. We'll go step by step.\n```\n\n### Step 4.1: Create Worktrees\n\n**EXPLAIN:**\n```\n### Step 1: Create Worktrees\n\nFirst, define the tasks you want to work on in parallel. The `\u002Fworktree-init` command creates a worktree for each task.\n```\n\n**DO:** Show example command:\n```\nExample usage:\n\n\u002Fworktree-init add user authentication | fix login bug | improve dashboard performance\n\nThis creates:\n├── ..\u002Fworktrees\u002F\u003Crepo>\u002Fclaude-add-user-authentication\u002F\n├── ..\u002Fworktrees\u002F\u003Crepo>\u002Fclaude-fix-login-bug\u002F\n└── ..\u002Fworktrees\u002F\u003Crepo>\u002Fclaude-improve-dashboard-performance\u002F\n```\n\n### Step 4.2: Open Ghostty Panels\n\n**EXPLAIN:**\n```\n### Step 2: Open Ghostty Panels\n\nNow split your terminal into panels—one for each task, plus optionally one for Lazygit monitoring.\n```\n\n**DO:**\n```\n1. Press Cmd+D to split right (first worktree)\n2. Press Cmd+D again (second worktree)\n3. Optionally press Cmd+Shift+D on any panel for Lazygit below\n\nResulting layout:\n┌──────────┬──────────┬──────────┐\n│ Task 1   │ Task 2   │ Task 3   │\n│ claude   │ claude   │ claude   │\n├──────────┴──────────┴──────────┤\n│           lazygit              │\n└────────────────────────────────┘\n```\n\n### Step 4.3: Work in Each Panel\n\n**EXPLAIN:**\n```\n### Step 3: Work Independently\n\nIn each panel:\n1. cd to the worktree path (from the commands output)\n2. Run `claude` to start a Claude session\n3. Use `\u002Fworktree-check` anytime to verify which task you're working on\n4. Work normally—Claude doesn't know about other panels\n```\n\n### Step 4.4: Deliver Completed Work\n\n**EXPLAIN:**\n```\n### Step 4: Deliver When Done\n\nWhen you finish a task in any panel, use `\u002Fworktree-deliver` to:\n1. Review your changes\n2. Create a commit\n3. Push to remote\n4. Create a pull request\n```\n\n### Step 4.5: Clean Up\n\n**EXPLAIN:**\n```\n### Step 5: Clean Up After Merging\n\nAfter your PRs are merged on GitHub:\n1. Go back to the main repo (not a worktree)\n2. Run `\u002Fworktree-cleanup --all`\n3. It removes merged worktrees and branches\n```\n\n---\n\n## Phase 5: Troubleshooting\n\n**SHOW:**\n```\n## Troubleshooting\n\n### \"I'm not sure which worktree I'm in\"\n\nRun `\u002Fworktree-check` — it shows your branch, task, and status.\n\nAlternatively:\n$ git branch --show-current    # Shows claude\u002F\u003Cname>\n$ pwd                          # Shows the worktree path\n\n---\n\n### \"I have uncommitted changes and want to switch tasks\"\n\n**Option 1:** Commit work-in-progress\n$ git add . && git commit -m \"wip: progress on feature\"\n\n**Option 2:** Stash changes (temporary)\n$ git stash push -m \"wip: parking changes\"\n\nThen in the other panel, continue working. Come back later with:\n$ git stash pop\n\n---\n\n### \"I accidentally started working in the wrong worktree\"\n\n1. Stash your changes: `git stash push -m \"work done in wrong place\"`\n2. Navigate to the correct worktree\n3. Apply the stash: `git stash pop`\n\n---\n\n### \"My worktree has merge conflicts\"\n\n1. Run `git fetch origin` to get latest\n2. Run `git rebase origin\u002Fmain` (or merge if you prefer)\n3. Resolve conflicts in your editor\n4. `git add .` then `git rebase --continue`\n\n---\n\n### \"I want to abandon a worktree\"\n\nFrom the main repo:\n$ git worktree remove ..\u002Fworktrees\u002Frepo\u002Fclaude-\u003Cname> --force\n$ git branch -D claude\u002F\u003Cname>\n\nNote: Force is needed if there are uncommitted changes.\n\n---\n\n### \"\u002Fworktree-deliver failed on push\"\n\nUsually means the remote branch doesn't exist yet or there's a conflict.\n\nTry:\n$ git push -u origin HEAD\n\nIf there's a conflict with remote, pull first:\n$ git pull --rebase origin claude\u002F\u003Cname>\n\n---\n\n### \"The worktree path doesn't exist anymore\"\n\nThe worktree was probably deleted manually. Clean up the git state:\n$ git worktree prune\n```\n\n---\n\n## Phase 6: Quick Reference Card\n\n**SHOW:**\n```\n┌─────────────────────────────────────────────────────────────────────────────┐\n│                         WORKTREE QUICK REFERENCE                            │\n├─────────────────────────────────────────────────────────────────────────────┤\n│                                                                             │\n│  COMMANDS                                                                   │\n│  ─────────                                                                  │\n│  \u002Fworktree-init \u003Ctask1> | \u003Ctask2>    Create worktrees for parallel tasks    │\n│  \u002Fworktree-check                     Show current worktree status & task    │\n│  \u002Fworktree-deliver                   Commit, push, and create PR            │\n│  \u002Fworktree-cleanup --all             Remove merged worktrees and branches   │\n│  \u002Fworktree-cleanup --dry-run         Preview what would be cleaned up       │\n│                                                                             │\n│  GHOSTTY                                                                    │\n│  ─────────                                                                  │\n│  Cmd+D              Split right     │  Cmd+Shift+E    Equalize panels      │\n│  Cmd+Shift+D        Split down      │  Cmd+Shift+F    Zoom toggle          │\n│  Cmd+Alt+Arrows     Navigate        │  Cmd+W          Close panel          │\n│                                                                             │\n│  LAZYGIT                                                                    │\n│  ─────────                                                                  │\n│  w                  Worktrees panel │  Space          Stage\u002Funstage        │\n│  Enter              View diff       │  c              Commit               │\n│  P                  Push            │  ?              Help                 │\n│                                                                             │\n│  GIT (manual)                                                               │\n│  ─────────                                                                  │\n│  git worktree list                   List all worktrees                     │\n│  git worktree add -b claude\u002Fname path Create worktree manually               │\n│  git worktree remove path            Remove a worktree                      │\n│  git worktree prune                  Clean up stale worktree refs           │\n│                                                                             │\n│  WORKFLOW                                                                   │\n│  ─────────                                                                  │\n│  1. \u002Fworktree-init tasks...          Create worktrees                       │\n│  2. Cmd+D (split panels)             Open Ghostty panels                    │\n│  3. cd \u003Cpath> && claude              Start Claude in each                   │\n│  4. \u002Fworktree-deliver                PR when done                           │\n│  5. \u002Fworktree-cleanup                Clean up after merge                   │\n│                                                                             │\n└─────────────────────────────────────────────────────────────────────────────┘\n```\n\n---\n\n## Guardrails\n\n- **Never execute destructive commands** without confirmation (worktree remove, branch delete)\n- **Always verify location** before suggesting worktree operations\n- **If user seems lost**, offer `\u002Fworktree-check` first\n- **Never force-delete** branches that aren't merged\n- **Don't assume tools are installed** — check for lazygit availability if suggesting it\n- **Respect user's pace** — don't rush through sections if they want to practice\n- **Keep the reference card available** — offer to show it whenever relevant\n",{"name":5,"license":15,"metadata":45,"description":7},{"author":46,"version":47},"claude-code-templates","1.0","main","2b749c82b5d11fac39d9a6e021ce3f5b8a541bd1","cli-tool\u002Fcomponents\u002Fskills\u002Fdevelopment\u002Fworktree-guide",3931,"https:\u002F\u002Fgithub.com\u002Fdavila7\u002Fclaude-code-templates","https:\u002F\u002Faitmpl.com","https:\u002F\u002Fgithub.com\u002Fdavila7","https:\u002F\u002Fdanielavila.me","Building AI dev tools with LLMs","2026-11-14 06:14:46",{"source":8,"skillName":5,"commands":59,"prompt":69,"zipAvailable":70},[60,63,66],{"tool":61,"command":62},"npx","npx skills add davila7\u002Fclaude-code-templates --skill worktree-guide",{"tool":64,"command":65},"bunx","bunx skills add davila7\u002Fclaude-code-templates --skill worktree-guide",{"tool":67,"command":68},"pnpm","pnpm dlx skills add davila7\u002Fclaude-code-templates --skill worktree-guide","安装技能，技能地址：https:\u002F\u002Fgithub.com\u002Fdavila7\u002Fclaude-code-templates\u002Fblob\u002Fmain\u002Fcli-tool\u002Fcomponents\u002Fskills\u002Fdevelopment\u002Fworktree-guide\u002FSKILL.md",true,[],[73,101,127,160,195,219],{"skillNo":74,"name":75,"nameZh":6,"description":76,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":77,"categories":78,"keywords":84,"publishedAt":40},"01M70NHBTQ8BV0A2SCAZXEPHCX","wealthville-pool-scoring","Score DeFi liquidity pools before providing liquidity. Returns a 0-100 pool score and an Enter\u002FHold\u002FExit\u002FReduce\u002FAvoid verdict with calibrated confidence for ~68,800 Solana pools and 575 EVM pools, plus a public miss-inclusive track record. Use when asked whether a pool is worth LPing into, which pools look best right now, or how accurate the scores have actually been.","https:\u002F\u002Fgithub.com\u002Fdavila7\u002Fclaude-code-templates\u002Fblob\u002Fmain\u002Fcli-tool\u002Fcomponents\u002Fskills\u002Fweb-data\u002Fwealthville-pool-scoring\u002FSKILL.md",[79],{"categoryNo":80,"categoryName":81,"taxonomyType":82,"taxonomyTypeDesc":83},"01JBSEEDCAT000000000000023","Skill与智能体开发","SCENARIO","使用场景",[85,86,87,88,89,24,90,91,29,23,92,25,93,94,95,96,97,98,99,100],"scoring","pool","wealthville pool scoring","liquidity","which","exit","now","reduce","record","track","verdict","evm","solana","how","public","look",{"skillNo":102,"name":103,"nameZh":6,"description":104,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":105,"categories":106,"keywords":108,"publishedAt":40},"01M70MB6VR8ERJ4EM8D5KHBMEV","technical-debt-auditor","Scans a codebase and produces a quantified technical debt report with a prioritized remediation plan. Analyzes dead code, TODO\u002FFIXME\u002FHACK markers, dependency staleness, complexity hotspots, code duplication signals, test coverage gaps, unused exports, and outdated patterns. Use this skill when the user asks to audit their codebase for tech debt, wants a health check of their code quality, says things like \"where should I focus refactoring\", \"find code smells\", \"audit my codebase\", \"what technical debt do we have\", \"prioritize cleanup work\", or asks about code quality metrics. Also trigger when the user mentions \"code rot\", \"legacy cleanup\", \"refactoring priorities\", or wants to understand the overall health of a project before a major effort. Trigger even if the user doesn't say \"technical debt\" explicitly — any request to systematically assess code quality and identify improvement priorities belongs here.","https:\u002F\u002Fgithub.com\u002Fdavila7\u002Fclaude-code-templates\u002Fblob\u002Fmain\u002Fcli-tool\u002Fcomponents\u002Fskills\u002Fdevelopment\u002Ftechnical-debt-auditor\u002FSKILL.md",[107],{"categoryNo":80,"categoryName":81,"taxonomyType":82,"taxonomyTypeDesc":83},[109,110,111,112,113,114,115,116,117,118,119,23,38,120,121,122,123,124,125,126],"technical debt","debt","technical","technical debt auditor","auditor","coverage","complexity","markers","project","cleanup","unused","todo","work","plan","focus","signals","audit","dependency",{"skillNo":128,"name":129,"nameZh":6,"description":130,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":15,"licenseFileUrl":6,"sourceHtmlUrl":131,"categories":132,"keywords":142,"publishedAt":40},"01M70KPYH9QNHCNME5GJQGE22K","readonly-sql-guard","Make an agent's database access provably read-only. Use when an agent runs caller-supplied SQL against a production\u002FERP\u002Fanalytics database (a \"query\" MCP tool, text-to-SQL, an admin console), or when reviewing DB-access code for write\u002FDDL\u002Fside-effect\u002Ftransaction-escape risks. Checks what a statement CALLS, not just its shape.","https:\u002F\u002Fgithub.com\u002Fdavila7\u002Fclaude-code-templates\u002Fblob\u002Fmain\u002Fcli-tool\u002Fcomponents\u002Fskills\u002Fdatabase\u002Freadonly-sql-guard\u002FSKILL.md",[133,136,137],{"categoryNo":134,"categoryName":135,"taxonomyType":82,"taxonomyTypeDesc":83},"01JBSEEDCAT000000000000010","后端与接口",{"categoryNo":80,"categoryName":81,"taxonomyType":82,"taxonomyTypeDesc":83},{"categoryNo":138,"categoryName":139,"taxonomyType":140,"taxonomyTypeDesc":141},"01JBSEEDCAT000000000000033","数据分析师","PROFESSION","适用职业",[143,144,145,146,147,148,149,24,150,151,152,153,154,155,156,29,157,158,23,159],"readonly","guard","sql guard","sql","readonly sql guard","erp","effect","read-only","db","just","tool","calls","only","MCP","access","database","query",{"skillNo":161,"name":162,"nameZh":6,"description":163,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":164,"licenseFileUrl":165,"sourceHtmlUrl":166,"categories":167,"keywords":171,"publishedAt":40},"01M6AFY6F7CC2BBZP1QD6VTNVC","web-artifacts-builder","Suite of tools for creating elaborate, multi-component claude.ai HTML artifacts using modern frontend web technologies (React, Tailwind CSS, shadcn\u002Fui). Use for complex artifacts requiring state management, routing, or shadcn\u002Fui components - not for simple single-file HTML\u002FJSX artifacts.","Apache-2.0","https:\u002F\u002Fgithub.com\u002Fdavila7\u002Fclaude-code-templates\u002Fblob\u002Fmain\u002Fcli-tool\u002Fcomponents\u002Fskills\u002Futilities\u002Fweb-artifacts-builder\u002FLICENSE.txt","https:\u002F\u002Fgithub.com\u002Fdavila7\u002Fclaude-code-templates\u002Fblob\u002Fmain\u002Fcli-tool\u002Fcomponents\u002Fskills\u002Futilities\u002Fweb-artifacts-builder\u002FSKILL.md",[168],{"categoryNo":169,"categoryName":170,"taxonomyType":82,"taxonomyTypeDesc":83},"01JBSEEDCAT000000000000009","前端开发",[172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,24,194],"artifacts builder","web","web artifacts builder","artifacts","builder","state","routing","state management","component","css","frontend","ui","Tools","file","components","shadcn","react","Tailwind","suite","jsx","html","single-file","ui components",{"skillNo":196,"name":197,"nameZh":6,"description":198,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":164,"licenseFileUrl":199,"sourceHtmlUrl":200,"categories":201,"keywords":206,"publishedAt":40},"01M6AFWF33SFV9Z3SF4PEEE4BF","webapp-testing","Toolkit for interacting with and testing local web applications using Playwright. Supports verifying frontend functionality, debugging UI behavior, capturing browser screenshots, and viewing browser logs.","https:\u002F\u002Fgithub.com\u002Fdavila7\u002Fclaude-code-templates\u002Fblob\u002Fmain\u002Fcli-tool\u002Fcomponents\u002Fskills\u002Fsecurity\u002Fwebapp-testing\u002FLICENSE.txt","https:\u002F\u002Fgithub.com\u002Fdavila7\u002Fclaude-code-templates\u002Fblob\u002Fmain\u002Fcli-tool\u002Fcomponents\u002Fskills\u002Fsecurity\u002Fwebapp-testing\u002FSKILL.md",[202,205],{"categoryNo":203,"categoryName":204,"taxonomyType":82,"taxonomyTypeDesc":83},"01JBSEEDCAT000000000000008","测试与质量",{"categoryNo":169,"categoryName":170,"taxonomyType":82,"taxonomyTypeDesc":83},[207,208,209,210,211,173,212,182,183,213,214,215,216,24,217,25,218],"webapp testing","testing","webapp","browser","playwright","applications","debugging","toolkit","logs","screenshots","local","behavior",{"skillNo":220,"name":221,"nameZh":6,"description":222,"descriptionZh":6,"repositoryFullName":8,"ownerLogin":9,"ownerAvatarUrl":10,"ownerAccountNo":11,"ownerDisplayName":12,"repositoryNo":13,"starsCount":14,"licenseSpdxId":164,"licenseFileUrl":223,"sourceHtmlUrl":224,"categories":225,"keywords":233,"publishedAt":40},"01M6AF67Q67JJJ5V51JR2P52KA","discernment-nudge","After you give a substantive answer or draft that the user may act on — advice or recommendations, drafted artifacts such as goals, plans, pitches, proposals, or emails, estimates or projections, analysis or interpretation of data, factual claims they may rely on, or a multi-step argument — invoke this skill BEFORE finalizing your reply and then, if it applies, append 2-3 short follow-up questions, each tied to something specific in what you just produced, that help the user check key facts, probe the reasoning or assumptions, and notice missing context. Do this at most once per conversation. Skip it when the user asked a trivial how-to or simple lookup, wants a purely educational explanation, asked you only to format, convert, or assemble a file from content they provided, is writing code they will run, is doing creative writing or casual chat, or already asked you to double-check, cite, or review — the skill file explains these boundaries and the exact output format.","https:\u002F\u002Fgithub.com\u002Fdavila7\u002Fclaude-code-templates\u002Fblob\u002Fmain\u002Fcli-tool\u002Fcomponents\u002Fskills\u002Fproductivity\u002Fdiscernment-nudge\u002FLICENSE.txt","https:\u002F\u002Fgithub.com\u002Fdavila7\u002Fclaude-code-templates\u002Fblob\u002Fmain\u002Fcli-tool\u002Fcomponents\u002Fskills\u002Fproductivity\u002Fdiscernment-nudge\u002FSKILL.md",[226,229,230],{"categoryNo":227,"categoryName":228,"taxonomyType":82,"taxonomyTypeDesc":83},"01JBSEEDCAT000000000000018","写作与文案",{"categoryNo":80,"categoryName":81,"taxonomyType":82,"taxonomyTypeDesc":83},{"categoryNo":231,"categoryName":232,"taxonomyType":140,"taxonomyTypeDesc":141},"01JBSEEDCAT000000000000036","内容创作者",[234,235,236,237,238,239,240,241,175,242,185,38,243,244,245,246,28,155,247,23,248,249,250,251,252,98,253],"discernment nudge","nudge","interpretation","help","run","reasoning","data","writing","lookup","content","review","conversation","short","invoke","you","analysis","claims","argument","assemble","recommendations"]