stale-checkout-recovery

Create a sibling worktree from origin/main and validate the starting SHA.

3|3|Updated Apr 13, 2026
One-click install
npx skills add https://github.com/quaid-app/quaid --skill stale-checkout-recovery
Or copy as Structured Prompt for Agent
Please help me install this Agent Skill.
Skill: stale-checkout-recovery
Source: https://github.com/quaid-app/quaid/tree/main/.squad/skills/stale-checkout-recovery
Command: npx skills add https://github.com/quaid-app/quaid --skill stale-checkout-recovery

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This skill ensures you start implementation from a clean, up-to-date base by recovering from a working tree parked on a stale branch, preventing divergence between local and origin/main.

Core Features & Use Cases

  • Create a sibling worktree from origin/main to isolate the recovery process.
  • Verify the starting state (branch, commits, and SHA) before beginning new work.
  • Read task status from origin/main (not the stale local checkout) to ensure accurate batch progress.
  • Avoid modifying the stale main clone and preserve it for reference only.
  • Apply this pattern whenever batch work must begin from a known-good base.

Quick Start

Create a sibling worktree from origin/main and start implementation there.

Frequently Asked Questions about stale-checkout-recovery

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I recover from a stale git branch before starting new batch work?

To recover from a stale git branch, create a sibling worktree directly from origin/main. This isolates the recovery process, validates the starting SHA, and ensures you begin implementation from a clean, up-to-date base without modifying the original checkout.

Why does my local checkout show incorrect task status during batch development?

Incorrect task status occurs because a local checkout parked on a stale branch falls behind origin/main. Reading task status directly from origin/main instead of the local stale branch ensures accurate batch progress and prevents missing tasks or conflicting changes.

What is the best way to align a working tree with origin/main without losing local changes?

The best way to align a working tree with origin/main is creating a fresh sibling worktree from the remote main branch. This preserves the stale local clone for reference only while validating the correct starting SHA for new batch cycles.

Can I use a git worktree to isolate batch work from a stale main clone?

Yes, creating a sibling git worktree from origin/main isolates batch work from a stale main clone. This approach verifies the starting branch and commits before beginning work, preventing divergence between local and remote repositories.

When do I need to validate the starting SHA before beginning git batch work?

You need to validate the starting SHA whenever batch work must begin from a known-good base. Verifying the starting state, including branch and commits, prevents missed tasks and incorrect completion status during new batch development cycles.