troubleshoot-worktree

troubleshoot-worktree is a skill for Claude Code, Codex from dryvist/claude-code-plugins. It costs 19 tokens per session (461 once invoked), scanned A, original, Apache-2.0.

A guide for diagnosing Git worktree, branch, and reference-name problems. Git worktrees let one repository have multiple working folders checked out at different branches.

In plain words
What is it for?
Use it to inspect worktrees and branches, find ambiguous references, and recover from common checkout or branch issues.
Why use it?
It helps explain errors caused by missing branches, uncommitted changes, wrong paths, or two Git references sharing a name.

Skill for Claude CodeCodex

Part of the git-workflows plugin — 6 skills shipped together

Install

Getting it into your agent

One page per mod, every tool's command on it. A separate URL per tool would split the same page into five that compete with each other.

agentmods
npx agentmods add skills/dryvist/claude-code-plugins/troubleshoot-worktree
Any agent
npx skills add dryvist/claude-code-plugins --skill troubleshoot-worktree
Clone the repo
git clone --depth 1 https://github.com/dryvist/claude-code-plugins

Made for: Claude Code, Codex.

Or install git-workflows, the plugin that ships this one along with the rest of its 6 skills.

Wrote this? Show the measurements

A badge with what this costs and how it scanned, read live from this page, so it follows the numbers instead of freezing them. Markdown for a README, HTML for a documentation site or a project page.

agentmods badge for troubleshoot-worktree

README.md
[![agentmods](https://agentmods.dev/badge/skills/dryvist/claude-code-plugins/troubleshoot-worktree.svg)](https://agentmods.dev/skills/dryvist/claude-code-plugins/troubleshoot-worktree)
Your own site
<a href="https://agentmods.dev/skills/dryvist/claude-code-plugins/troubleshoot-worktree"><img src="https://agentmods.dev/badge/skills/dryvist/claude-code-plugins/troubleshoot-worktree.svg" alt="Measured on agentmods" height="20"></a>
Per session 19 Skills are progressive disclosure: only the name and description are preloaded; the body loads when the skill is used.
When invoked 461 The whole file, excluding the scripts and references it only reads on demand.
Security scan A 0 findings. Scan, not verified.
Origin original No closer match found in the catalogue.
Token cost

What it costs to keep this loaded

Counted locally with the o200k_base tokenizer, which is exact for GPT models; Claude uses its own tokenizer and its counts differ. Treat this as one consistent yardstick across the catalogue rather than a bill. Prices are per million input tokens.

ModelPer sessionOnce invoked
Fable 5 $0.00019 $0.00461
Opus 5 $0.00010 $0.00230
Sonnet 5 $0.00004 $0.00092
Haiku 4.5 $0.00002 $0.00046

Measured 4d ago against content hash 173fe636b7f8, method: parsed. Prices are Anthropic first-party input rates as of 2026-08-30, from the pricing page.

Security

Grade A, and why

troubleshoot-worktree scanned grade A with 0 findings against 26 rules in 11 categories — prompt injection, anti-refusal, data exfiltration, privilege escalation, supply chain, agent snooping, system-prompt leakage, SSRF and excessive agency — measured 4d ago.

A static scan of the body, not an audit. Every finding is printed with the line that produced it so you can judge whether it matters here. A mod is markdown that instructs an agent; that is exactly why what it instructs is worth reading.

Nothing flagged

None of the 26 patterns this scan looks for appear in this file: no shell pipes, no recursive deletes, no credential paths, no hidden text, no instruction-override or anti-refusal phrasing, no agent-config snooping. That is not a guarantee, it is the absence of the things that are checkable.

git-workflows/skills/troubleshoot-worktree/SKILL.md · 73 lines

What it actually says

Git Worktree Troubleshooting

Diagnose and fix worktree, branch, and reference issues.

Quick Diagnostics

Always run first:

git worktree list
git branch -a
git status
pwd

Worktree Discovery

Never assume paths - always discover with git worktree list. The first column is the path; the bracketed name is the branch checked out there.

Critical: Ambiguous Refname

Warning: warning: refname 'origin/main' is ambiguous

Means TWO things named origin/main:

  • refs/heads/origin/main - LOCAL branch (bad)
  • refs/remotes/origin/main - remote tracking (good)

Diagnose: git show-ref origin/main

Fix: git branch -D origin/main then verify only 1 line remains with git show-ref origin/main.

The same ambiguity can occur for any branch name, not just main — on a git-flow repo (default branch develop) watch for origin/develop too. Substitute the branch name in the diagnose/fix commands above.

Common Errors

Branch Not Found

git fetch origin --force
git branch -a | grep -i "<branch>"

Uncommitted Changes

git add . && git commit -m "WIP"          # Commit
git stash push -m "before operation"      # Stash (temporary)
git checkout -- .                         # Discard (DESTRUCTIVE)

Embedded Git Repository

git rm --cached <folder>
echo "<folder>/" >> .gitignore
  • troubleshoot-rebase (git-workflows) — Diagnose and recover from git rebase failures
  • troubleshoot-precommit (git-workflows) — Troubleshoot pre-commit hook failures
  • refresh-repo (github-workflows) — Default-branch sync
  • prune-branches (github-workflows) — Worktree and branch cleanup
Changes

What this file has done since we first saw it

Hashed on every crawl. A supply-chain change to an agent config is a question of when, not whether, so the history is kept rather than the latest state alone.

  1. 4d ago First seen · 73 lines · 19 tokens per session scan A 173fe636b7f8

Subscribe to this mod's changes

troubleshoot-worktree is a skill published in the GitHub repository dryvist/claude-code-plugins (3 stars, last pushed yesterday), licensed Apache-2.0. It adds 19 tokens to every session and 461 once invoked, about $0.0001 per session on Opus 5. A static security scan graded it A with 0 findings. No closer match exists in the catalogue, so it is treated as the original; first seen 2026-08-31.

Related

Other skills, from other repositories

rspec

This skill should be used when the user asks to "write specs", "create spec", "add RSpec tests", "fix failing spec", or mentions RSpec, describe blocks, it blocks, expect syntax, test doubles, or matchers. Should also be used when editing spec.rb files, working in spec/ directory, planning implementation phases that…

hoblin/claude-ruby-marketplace · 125 tokens

activerecord

This skill should be used when the user asks to "write a migration", "add a column", "add column to table", "create an index", "add a foreign key", "set up associations", "fix N+1 queries", "optimize queries", "add validations", "create callbacks", "use eager loading", or mentions ActiveRecord, belongsto, hasmany…

hoblin/claude-ruby-marketplace · 180 tokens

dragonruby

This skill should be used when the user asks to "create a game", "make a game", "game development", "dragonruby", "drgtk", "game loop", "tick method", "sprite rendering", "game state", or mentions args.outputs, args.state, args.inputs, coordinate system, collision detection, animation frames, or scene management.…

hoblin/claude-ruby-marketplace · 100 tokens

draper-decorators

This skill should be used when the user asks to "create a decorator", "write a decorator", "move logic into decorator", "clean logic out of the view", "isn't it decorator logic", "test a decorator", or mentions Draper, keeping views clean, or representation logic in decorators. Should also be used when editing…

hoblin/claude-ruby-marketplace · 131 tokens

mcp-server

This skill should be used when the user asks to "create an MCP server", "build MCP tools", "define MCP prompts", "register MCP resources", "implement Model Context Protocol", or mentions the mcp gem, MCP::Server, MCP::Tool, JSON-RPC transport, stdio transport, or streamable HTTP transport. Should also be used when…

hoblin/claude-ruby-marketplace · 98 tokens

ratatui-ruby

This skill should be used when the user asks to "create a TUI", "terminal interface", "terminal UI", "ratatui", "ratatui-ruby", "inline viewport", "full-screen terminal app", "terminal widgets", "tui.draw", "tui.pollevent", or mentions RatatuiRuby.run, managed loop, terminal rendering, Tea MVU, or building CLI…

hoblin/claude-ruby-marketplace · 119 tokens