From e872e15efa5514dcfea84a1a9e276bad3290cbc3 Mon Sep 17 00:00:00 2001 From: Trevin Chow Date: Mon, 30 Mar 2026 00:49:19 -0700 Subject: [PATCH] feat(ce-work): suggest branch rename when worktree name is meaningless (#451) Co-authored-by: Claude Opus 4.6 (1M context) --- .../skills/ce-work-beta/SKILL.md | 13 +++++++++++-- .../compound-engineering/skills/ce-work/SKILL.md | 13 +++++++++++-- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/plugins/compound-engineering/skills/ce-work-beta/SKILL.md b/plugins/compound-engineering/skills/ce-work-beta/SKILL.md index 8328e58..ce84d73 100644 --- a/plugins/compound-engineering/skills/ce-work-beta/SKILL.md +++ b/plugins/compound-engineering/skills/ce-work-beta/SKILL.md @@ -74,8 +74,17 @@ Determine how to proceed based on what was provided in ``. ``` **If already on a feature branch** (not the default branch): - - Ask: "Continue working on `[current_branch]`, or create a new branch?" - - If continuing, proceed to step 3 + + First, check whether the branch name is **meaningful** — a name like `feat/crowd-sniff` or `fix/email-validation` tells future readers what the work is about. Auto-generated worktree names (e.g., `worktree-jolly-beaming-raven`) or other opaque names do not. + + If the branch name is meaningless or auto-generated, suggest renaming it before continuing: + ```bash + git branch -m + ``` + Derive the new name from the plan title or work description (e.g., `feat/crowd-sniff`). Present the rename as a recommended option alongside continuing as-is. + + Then ask: "Continue working on `[current_branch]`, or create a new branch?" + - If continuing (with or without rename), proceed to step 3 - If creating new, follow Option A or B below **If on the default branch**, choose how to proceed: diff --git a/plugins/compound-engineering/skills/ce-work/SKILL.md b/plugins/compound-engineering/skills/ce-work/SKILL.md index 6644f1a..0e601d1 100644 --- a/plugins/compound-engineering/skills/ce-work/SKILL.md +++ b/plugins/compound-engineering/skills/ce-work/SKILL.md @@ -73,8 +73,17 @@ Determine how to proceed based on what was provided in ``. ``` **If already on a feature branch** (not the default branch): - - Ask: "Continue working on `[current_branch]`, or create a new branch?" - - If continuing, proceed to step 3 + + First, check whether the branch name is **meaningful** — a name like `feat/crowd-sniff` or `fix/email-validation` tells future readers what the work is about. Auto-generated worktree names (e.g., `worktree-jolly-beaming-raven`) or other opaque names do not. + + If the branch name is meaningless or auto-generated, suggest renaming it before continuing: + ```bash + git branch -m + ``` + Derive the new name from the plan title or work description (e.g., `feat/crowd-sniff`). Present the rename as a recommended option alongside continuing as-is. + + Then ask: "Continue working on `[current_branch]`, or create a new branch?" + - If continuing (with or without rename), proceed to step 3 - If creating new, follow Option A or B below **If on the default branch**, choose how to proceed: