From e4a15b6d525cacbb8726d8a9b0584efbffa2ca67 Mon Sep 17 00:00:00 2001 From: Drew Ritter Date: Mon, 13 Apr 2026 16:29:44 -0700 Subject: [PATCH] docs: drop instruction file enumeration per PR #1121 review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Jesse flagged that the verbose CLAUDE.md/AGENTS.md/GEMINI.md/.cursorrules enumeration (a) chews tokens, (b) confuses models that anchor on exact strings, and (c) is repeated DRY-violatingly across 3+ locations. Replace with abstract "your instructions" framing in four spots: - skills/using-git-worktrees/SKILL.md Step 0 → Step 1 transition - skills/using-git-worktrees/SKILL.md Step 1b Directory Selection - docs/superpowers/plans/2026-04-06-worktree-rototill.md (both mirror locations) Same intent, harness-agnostic phrasing, ~half the tokens. Co-Authored-By: Claude Opus 4.6 (1M context) --- docs/superpowers/plans/2026-04-06-worktree-rototill.md | 4 ++-- skills/using-git-worktrees/SKILL.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/superpowers/plans/2026-04-06-worktree-rototill.md b/docs/superpowers/plans/2026-04-06-worktree-rototill.md index aa7b6c0d..ae5acec1 100644 --- a/docs/superpowers/plans/2026-04-06-worktree-rototill.md +++ b/docs/superpowers/plans/2026-04-06-worktree-rototill.md @@ -251,7 +251,7 @@ Report with branch state: **If `GIT_DIR == GIT_COMMON` (or in a submodule):** You are in a normal repo checkout. -If the user has not already made their preferences about worktree isolation clear — check global and project agent instruction files (`CLAUDE.md`, `AGENTS.md`, `GEMINI.md`, `.cursorrules`, or equivalent) — ask for consent before creating a worktree: +Has the user already indicated their worktree preference in your instructions? If not, ask for consent before creating a worktree: > "Would you like me to set up an isolated worktree? It protects your current branch from changes." @@ -289,7 +289,7 @@ Follow this priority order: ``` If found, use it (backward compatibility with legacy global path). -3. **Check your project's agent instruction file** (CLAUDE.md, GEMINI.md, AGENTS.md, .cursorrules, or equivalent) for a worktree directory preference. If specified, use it without asking. +3. **Check your instructions for a worktree directory preference.** If specified, use it without asking. 4. **Default to `.worktrees/`.** diff --git a/skills/using-git-worktrees/SKILL.md b/skills/using-git-worktrees/SKILL.md index 66dcbdac..1114d879 100644 --- a/skills/using-git-worktrees/SKILL.md +++ b/skills/using-git-worktrees/SKILL.md @@ -38,7 +38,7 @@ Report with branch state: **If `GIT_DIR == GIT_COMMON` (or in a submodule):** You are in a normal repo checkout. -If the user has not already made their preferences about worktree isolation clear — check global and project agent instruction files (`CLAUDE.md`, `AGENTS.md`, `GEMINI.md`, `.cursorrules`, or equivalent) — ask for consent before creating a worktree: +Has the user already indicated their worktree preference in your instructions? If not, ask for consent before creating a worktree: > "Would you like me to set up an isolated worktree? It protects your current branch from changes." @@ -64,7 +64,7 @@ Only proceed to Step 1b if you have no native worktree tool available. Follow this priority order. Explicit user preference always beats observed filesystem state. -1. **Check global and project agent instruction files** (`~/.claude/CLAUDE.md`, `~/.config/gemini/AGENTS.md`, project-level `CLAUDE.md`, `AGENTS.md`, `GEMINI.md`, `.cursorrules`, or equivalent) for a declared worktree directory preference. If specified, use it without asking. +1. **Check your instructions for a declared worktree directory preference.** If the user has already specified one, use it without asking. 2. **Check for an existing project-local worktree directory:** ```bash