---
name: cleanup
description: Safely clean up the current worktree after verifying no unmerged work would be lost
title: cleanup
canonical_url: https://skilld.dev/gh/sandharbor/meadow/cleanup
last_updated: 2026-10-08T17:30:29.000Z
---

> Index of every page on this site: [llms.txt](https://skilld.dev/llms.txt)

> **Skill from skilld.dev.** Follow the user's requested action.
> If the user asked to fork this Skill, follow the fork workflow below. Do not execute the Skill instructions while copying it.
> Otherwise, follow the instructions below for this session. You do not need to install anything.
>
> If the user asked to install this Skill, run `npx skilld install sandharbor/meadow/cleanup`. Install writes the Skill files into the project, so every session loads them.
>
> ## Fork workflow
>
> A fork creates an editable local Skill with its original author and licence. The request authorizes copying and local installation.
> 1. Check `./skills/cleanup`, the project lockfile, and selected Agent targets together. If the local directory or installed Skill exists, stop. Never overwrite an existing directory or Agent target.
> 2. Read [source metadata](https://skilld.dev/api/v1/skills/sandharbor/meadow/cleanup) once. Use sourceUrl, sourceCommit, skillPath, sourceGone, and license. If the source is gone or its path is missing, stop. If license is null, read licence files at the source commit.
> 3. Fetch only the source commit into a temporary Git repository. Do not clone full history. Derive repository_url from sourceUrl, including repository renames. If sourceCommit is absent, resolve the sourceUrl ref once. Set source_commit to that actual commit. Run these commands in one shell call:
>
> ```sh
> git init --quiet "$temporary_dir"
> git -C "$temporary_dir" fetch --quiet --depth=1 "$repository_url" "$source_commit"
> git -C "$temporary_dir" checkout --quiet --detach FETCH_HEAD
> ```
>
> Read applicable licence declarations and notices at that commit. If copying is not permitted, report the restriction and stop.
> 4. Inspect source entries together, then copy the directory containing skillPath into `./skills/cleanup`. Use the user's path if selected. Keep the original SKILL.md, relative links, scripts, binary assets, and executable modes. Exclude .git metadata. Reject symlinks and paths outside the Skill directory. After checking entries, use cp -a where available. A regular source directory needs no custom copy script. Do not save this page wrapper as SKILL.md.
> Preserve author credit, notices, and applicable licence files from repository or parent directories. Add PROVENANCE.md with the Skill page, source URL, actual commit, original path, and licence. Retain any existing PROVENANCE.md and record new provenance separately. Batch source inspection, copying, and provenance work where practical.
> 5. In the project root, run `skilld install ./skills/cleanup --mode copy --plain`. If skilld is unavailable, use `npx skilld install ./skills/cleanup --mode copy --plain`. This known command needs no help lookup. Install does not support --json. Use detected Agent targets, or add --agent for the targets the user selected. Install the local path, never the upstream selector. If installation fails, preserve the local copy and report the exact failure.
> 6. Confirm the local lockfile source and installed Agent copies once. Report the local path, actual commit, and Agent targets. After edits, reinstall the same local path. Upstream updates must not replace it. Do not publish or push unless the user asks.

# Clean Up Current Worktree

Safely remove the current worktree and its branch, but only after verifying
that no work would be lost.

## Step 1: Preflight checks

Run all of these. If any check fails, tell the user why and stop.

1. Run `git rev-parse --git-dir` and confirm we are inside a worktree (the
   git-dir path will contain `/worktrees/`). If not, stop.
2. Run `git status --porcelain`. If there is any output, stop — there are
   uncommitted changes.
3. Record the current state for later steps:
   ```bash
   BRANCH=$(git branch --show-current)
   WORKTREE_PATH=$(git rev-parse --show-toplevel)
   MAIN_REPO=$(git rev-parse --path-format=absolute --git-common-dir | sed 's|/\.git$||')
   ```

## Step 2: Determine if it is safe to delete

There are exactly two safe conditions. Check them in order:

### Condition A: No work done — branch is identical to main

```bash
git diff main...HEAD --quiet
git rev-list main..HEAD --count   # must be 0
```

If both pass, the branch has no unique work. It is safe to delete.

### Condition B: All work has been merged to main

```bash
git rev-list main..HEAD --count   # greater than 0 means there are commits
git branch --contains HEAD main   # if main appears, all commits are merged
```

If there are commits but main contains HEAD, everything is already merged.
It is safe to delete.

### Neither condition met

Tell the user:

> This branch has commits that are not yet on main. Use `/merge` to merge
> first, or confirm you want to discard the work.

Do **not** delete anything. Stop here.

## Step 3: Clean up

First, capture the worktree name for tmux cleanup:

```bash
WORKTREE_NAME=$(basename "$WORKTREE_PATH")
```

Kill any tmux sessions associated with this worktree:

```bash
# Kill the dev server session (format: meadow_dev_<worktree-name>)
tmux kill-session -t "meadow_dev_${WORKTREE_NAME}" 2>/dev/null || true

# Kill any other sessions containing the worktree name
tmux list-sessions -F '#{session_name}' 2>/dev/null | grep "$WORKTREE_NAME" | while read -r sess; do
  tmux kill-session -t "$sess" 2>/dev/null || true
done
```

Navigate out of the worktree, then remove it and the branch:

```bash
cd "$MAIN_REPO"
git worktree remove --force "$WORKTREE_PATH"
git branch -D "$BRANCH"
git worktree prune
```

## Step 4: Summary

Print what was cleaned up:

- Worktree path that was removed
- Branch that was deleted
- Tmux sessions that were killed (if any)
- Which condition applied (no work done, or already merged to main)
