Finishing a Development Branch
obra/superpowers
Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.
A skill your agent uses when starting a new feature, Linear ticket, or bugfix in this repo — establishes the branch + worktree + env + DB + dev-server conventions so the work is immediately ready to…
$ npx skills add trycompai/comp --skill new-feature-setup -a claude-codeProject install by default; add -g for ~/.claude/skills/.
$ gh skill install trycompai/comp new-feature-setup --agent claude-codeProject scope by default; add --scope user for a personal install. Needs GitHub CLI 2.90.0 or later (public preview).
$ git clone --depth 1 https://github.com/trycompai/comp.git skills-src && mkdir -p .claude/skills && cp -r skills-src/.agents/skills/new-feature-setup .claude/skills/new-feature-setup && rm -rf skills-srcUse ~/.claude/skills/ instead of .claude/skills for a personal install. The folder must contain SKILL.md.
Claude Code skills documentation · loads skills from .claude/skills/
Install the "new-feature-setup" agent skill from https://github.com/trycompai/comp/tree/main/.agents/skills/new-feature-setup into .claude/skills/new-feature-setup/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "new-feature-setup", then confirm the skill loads.Claude Code copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$skill-installer install https://github.com/trycompai/comp/tree/main/.agents/skills/new-feature-setupType this inside Codex. $skill-installer <name> installs a curated skill from openai/skills. The installer writes to $CODEX_HOME/skills (default ~/.codex/skills). Restart Codex if the skill does not show up.
$ npx skills add trycompai/comp --skill new-feature-setup -a codexProject install goes to .agents/skills/; add -g for ~/.codex/skills/.
$ gh skill install trycompai/comp new-feature-setup --agent codexProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/trycompai/comp.git skills-src && mkdir -p .agents/skills && cp -r skills-src/.agents/skills/new-feature-setup .agents/skills/new-feature-setup && rm -rf skills-srcUse ~/.agents/skills/ instead of .agents/skills for a personal install.
Codex skills documentation · loads skills from .agents/skills/
Install the "new-feature-setup" agent skill from https://github.com/trycompai/comp/tree/main/.agents/skills/new-feature-setup into .agents/skills/new-feature-setup/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "new-feature-setup", then confirm the skill loads.Codex copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ npx skills add trycompai/comp --skill new-feature-setup -a cursorProject install goes to .agents/skills/; add -g for ~/.cursor/skills/.
$ gh skill install trycompai/comp new-feature-setup --agent cursorProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/trycompai/comp.git skills-src && mkdir -p .cursor/skills && cp -r skills-src/.agents/skills/new-feature-setup .cursor/skills/new-feature-setup && rm -rf skills-srcUse ~/.cursor/skills/ instead of .cursor/skills for a personal install.
Cursor skills documentation · loads skills from .cursor/skills/, .agents/skills/, .claude/skills/, .codex/skills/
Install the "new-feature-setup" agent skill from https://github.com/trycompai/comp/tree/main/.agents/skills/new-feature-setup into .cursor/skills/new-feature-setup/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "new-feature-setup", then confirm the skill loads.Cursor copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ gemini skills install https://github.com/trycompai/comp.git --path .agents/skills/new-feature-setup--scope user (default) or --scope workspace; --path is the subfolder of the repo that holds the skill; --consent skips the security confirmation prompt.
$ npx skills add trycompai/comp --skill new-feature-setup -a gemini-cliProject install goes to .agents/skills/; add -g for ~/.gemini/skills/.
$ gh skill install trycompai/comp new-feature-setup --agent gemini-cliProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/trycompai/comp.git skills-src && mkdir -p .gemini/skills && cp -r skills-src/.agents/skills/new-feature-setup .gemini/skills/new-feature-setup && rm -rf skills-srcUse ~/.gemini/skills/ instead of .gemini/skills for a personal install, then run /skills reload.
Gemini CLI skills documentation · loads skills from .gemini/skills/, .agents/skills/
Install the "new-feature-setup" agent skill from https://github.com/trycompai/comp/tree/main/.agents/skills/new-feature-setup into .gemini/skills/new-feature-setup/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "new-feature-setup", then confirm the skill loads.Gemini CLI copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ gh skill install trycompai/comp new-feature-setupInstalls for Copilot at project scope by default; add --scope user for a personal install. Preview a skill first with gh skill preview. Needs GitHub CLI 2.90.0 or later (public preview).
$ npx skills add trycompai/comp --skill new-feature-setup -a github-copilotProject install goes to .agents/skills/; add -g for ~/.copilot/skills/.
$ git clone --depth 1 https://github.com/trycompai/comp.git skills-src && mkdir -p .github/skills && cp -r skills-src/.agents/skills/new-feature-setup .github/skills/new-feature-setup && rm -rf skills-srcUse ~/.copilot/skills/ instead of .github/skills for a personal install. Commit .github/skills so cloud agent and code review can use it.
GitHub Copilot skills documentation · loads skills from .github/skills/, .claude/skills/, .agents/skills/
Install the "new-feature-setup" agent skill from https://github.com/trycompai/comp/tree/main/.agents/skills/new-feature-setup into .github/skills/new-feature-setup/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "new-feature-setup", then confirm the skill loads.GitHub Copilot copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
$ npx skills add trycompai/comp --skill new-feature-setup -a opencodeOpenCode documents no install command of its own. Project install goes to .agents/skills/; add -g for ~/.config/opencode/skills/.
$ gh skill install trycompai/comp new-feature-setup --agent opencodeProject scope by default (.agents/skills/); add --scope user for a personal install.
$ git clone --depth 1 https://github.com/trycompai/comp.git skills-src && mkdir -p .opencode/skills && cp -r skills-src/.agents/skills/new-feature-setup .opencode/skills/new-feature-setup && rm -rf skills-srcUse ~/.config/opencode/skills/ instead of .opencode/skills for a personal install.
OpenCode skills documentation · loads skills from .opencode/skills/, .claude/skills/, .agents/skills/
Install the "new-feature-setup" agent skill from https://github.com/trycompai/comp/tree/main/.agents/skills/new-feature-setup into .opencode/skills/new-feature-setup/ in this project. Copy the whole folder (SKILL.md and every file beside it), keep the folder name "new-feature-setup", then confirm the skill loads.OpenCode copies the folder itself, the same result as the manual copy. Check what it changed before you commit it.
new-feature-setupA skill your agent uses when starting a new feature, Linear ticket, or bugfix in this repo — establishes the branch + worktree + env + DB + dev-server conventions so the work is immediately ready to…
New Feature Setup is an agent skill from trycompai/comp. Use when starting a new feature, Linear ticket, or bugfix in this repo — establishes the branch + worktree + env + DB + dev-server conventions so the work is immediately ready to code without fighting infra. Triggers on "start a new feature", "spin up a worktree", "begin ticket", "new branch".
Its SKILL.md is about 1.4k tokens, which your agent loads only when the skill is triggered. It is a single SKILL.md file with no bundled scripts.
It sits in Development, covering Git worktrees. The repository describes itself as: AI Native platform to get companies compliant - Vanta & Drata Alternative. The licence is AGPL-3.0.
5 steps, taken from the step headings in SKILL.md.
Read from SKILL.md and the folder at commit 1bf4d52. It shows what the files ask for, not the result of running them.
Pre-approves nothing: there is no allowed-tools line, so your agent's usual permission prompts apply.
From allowed-tools in the SKILL.md frontmatter.
Shell commands in SKILL.md call:
bungitbunxFrom the folder's file list and the shell code blocks in SKILL.md.
No URLs in SKILL.md. Its commands use git and bunx, which can reach the network depending on how they are called.
From URLs in SKILL.md, links to its own repository left out.
Names no API keys, tokens, secrets or passwords.
From names ending in _API_KEY, _TOKEN, _SECRET, _KEY or _PASSWORD in SKILL.md.
New Feature Setup loads about 1.4k tokens when it runs. Until then it costs about 78 tokens; SKILL.md has 610 words of instructions outside code blocks.
Estimates: characters ÷ 4, the usual rule of thumb; real counts depend on the model's tokenizer. Scripts and assets cost tokens only if the agent reads them.
The automated check noted patterns worth knowing about, such as sudo or a known installer.
- Before copying `.env` files around by hand2. Links `.env*` files from the main clone (copies the ones with `DATABASE_URL`, rewriting it to the isolated URL; symli01` (or `3334`, etc.) to the worktree's `.env.local`. `.env.local` is not symlinked and stays per-worktree.orktree (no trigger dev, custom port via .env.local)echo "PORT=3001" >> apps/app/.env.local- `cp` or `ln -s` to copy `.env` files into a worktree| Editing `.env` in a worktree and expecting it to propagate | If it's a symlink, yes; if it's a real copy (has `DATABASut `PORT=<free-port>` in the worktree's `.env.local` |Automated static check — not a guarantee. Review scripts before installing. It scans the text of SKILL.md for risky patterns (piping downloads into a shell, reading credential files, hidden Unicode, destructive commands); files beside SKILL.md are not scanned.
The full file from trycompai/comp at commit 1bf4d52, republished under its AGPL-3.0 licence (© trycompai). 610 words, ~1,385 tokens.
.claude/skills/new-feature-setup/SKILL.md (or your agent's skills folder).This repo has a lot of infrastructure pre-wired into git worktree add. Use it. Don't reinvent env copying, database setup, or dependency install flows in every new session.
bun install / bun run db:generate manually in a new directory.env files around by hand.githooks/README.md instead)origin/maincd /Users/mariano/code/comp # must be the MAIN clone, not another worktree
git fetch origin main
git worktree add .worktrees/<short-slug> -b <branch-name> origin/mainmariano/<ticket-slug>).mariano/<short-descriptive-name> or chore/<topic>.<short-slug> on the worktree path should match the branch's suffix (it becomes the Postgres DB slug after tr '-' '_').git worktree add fires the post-checkout hook at .githooks/post-checkout, which runs synchronously:
compdev_<slug> Postgres database (isolated per worktree).env* files from the main clone (copies the ones with DATABASE_URL, rewriting it to the isolated URL; symlinks the rest so API keys auto-propagate)bun install, applies Prisma migrations, regenerates clientsDo not run any of these by hand. If the hook logs a failure, diagnose and fix at the source — don't paper over with a manual install.
Skip toggles (rare):
SKIP_WORKTREE_DB=1 — share the main comp DB (drift risk; only for read-only worktrees)SKIP_WORKTREE_SETUP=1 — skip install + migrate + generate (for a "just files" worktree)SETUP_WORKTREE_WITH_BUILD=1 — also run bun run build (adds minutes; only when you need the built artifacts)Trigger.dev's trigger dev CLI cannot be isolated per worktree. Running bun run dev in multiple worktrees stomps on task registration.
bun run dev (full stack with trigger dev).bun run --filter '@trycompai/app' dev:no-trigger # Next.js only
bun run --filter '@trycompai/api' dev:no-trigger # NestJS onlyPORT to avoid collision — add PORT=3001 (or 3334, etc.) to the worktree's .env.local. .env.local is not symlinked and stays per-worktree.bun run dev first so task registration is clean.Standard repo conventions apply (see AGENTS.md). Highlights:
superpowers:test-driven-development)superpowers:brainstorming)audit-design-system after any frontend component editbunx turbo run typecheck --filter=<pkg>)Use the stale-worktree-cleanup skill when worktrees accumulate. It handles both git worktree remove and dropping the compdev_<slug> database in one pass. Never leave orphan databases — they pile up silently because git has no pre-worktree-remove hook.
# Spin up a new worktree (does env + DB + install + migrate + generate automatically)
git worktree add .worktrees/<slug> -b mariano/<branch-name> origin/main
# Start dev — ONLY in the worktree you're actively iterating on
cd .worktrees/<slug>
bun run dev
# Start dev in a background worktree (no trigger dev, custom port via .env.local)
echo "PORT=3001" >> apps/app/.env.local
bun run --filter '@trycompai/app' dev:no-trigger
# Clean up when branch is done
# (use the stale-worktree-cleanup skill)If you catch yourself doing any of these, stop — the hook should have handled it:
bun install manually in a new worktreecp or ln -s to copy .env files into a worktreebun run db:migrate in a worktree right after creating itbun run dev in two worktrees instead of swapping to dev:no-trigger| Mistake | Fix |
|---|---|
| Creating the worktree from another worktree instead of the main clone | Always cd to /Users/mariano/code/comp first |
Editing .env in a worktree and expecting it to propagate | If it's a symlink, yes; if it's a real copy (has DATABASE_URL), no. Check with ls -la. |
Forgetting to bump PORT → two dev servers collide | Put PORT=<free-port> in the worktree's .env.local |
Running trigger dev in multiple worktrees | Switch to dev:no-trigger in all but one |
Not cleaning up → orphan compdev_* databases piling up | Use the stale-worktree-cleanup skill regularly |
© trycompai, AGPL-3.0. Rendered from Markdown: HTML in the file is shown as text, images as links, and headings moved down two levels. Raw file
Just SKILL.md in .agents/skills/new-feature-setup of trycompai/comp.
Open the folder on GitHubat commit 1bf4d52
New Feature Setup next to the 5 skills that share the most tags, products or categories with it. Stars are the repository's; “used in” counts other GitHub owners with a copy.
| Skill | Stars | Used in | Tokens | Auto-check | Licence | Repo updated |
|---|---|---|---|---|---|---|
| New Feature Setup this skilltrycompai/comp | 2k | — | ~1.4k | Automated safety check: Notes | AGPL-3.0 | |
| Finishing a Development Branchobra/superpowers | 296k | 5 repos | ~1.9k | Automated safety check: Pass | MIT | |
| Migrate Core Code to Submodulestinyhumansai/openhuman | 41k | — | ~2.6k | Automated safety check: Pass | GPL-3.0 | |
| Finishing A Development Branchfarm-fe/farm | 5.6k | 33 repos | ~1.8k | Automated safety check: Pass | MIT | |
| Git Worktree Cleanuplobehub/lobehub | 83k | — | ~2.8k | Automated safety check: Pass | Custom licence | |
| Keep Codex Fastvibeforge1111/keep-codex-fast | 1.6k | — | ~3.1k | Automated safety check: Pass | MIT |
obra/superpowers
Walks the last step of a branch: confirm tests pass, detect the git environment, ask how to integrate, carry out your choice and clean up the worktree.
tinyhumansai/openhuman
Plans and carries out moving non-host-specific code and its tests from the OpenHuman core into vendored tiny submodule libraries, then releases the submodule and re-pins the host.
farm-fe/farm
A skill your agent uses when implementation is complete, all tests pass, and you need to decide how to integrate the work - guides completion of development work by presenting structured options for…
lobehub/lobehub
Audits stale Git worktrees and branches with a bundled script, classifies each one, and deletes only after you approve the exact candidates.
vibeforge1111/keep-codex-fast
A skill your agent uses when Codex feels slow or bloated, when local sessions/logs/worktrees/config have grown over time, or when a user wants safe maintenance for Codex Desktop/CLI state.
jamiepine/voicebox
Sorts a backlog of open pull requests into must-merge, candidate, superseded and deferred, writes a triage doc and works the merge loop before a release.
trycompai/comp
The contract every new or modified API endpoint must follow so it is correct for the public OpenAPI spec, the MCP server (npm @trycompai/mcp-server), the ValidationPipe, and the docs.
trycompai/comp
How to reuse ANY integration check's results in a feature via the universal CheckResultsService (apps/api integration-platform).
trycompai/comp
A skill your agent uses when implementing data fetching, API calls, server/client components, or SWR hooks
trycompai/comp
A skill your agent uses when SDK generation failed or seeing errors.
trycompai/comp
A skill your agent uses when building forms - covers React Hook Form, Zod validation, and form patterns
trycompai/comp
A skill your agent uses when writing TypeScript/React code - covers type safety, component patterns, and file organization
Categories
A skill your agent uses when starting a new feature, Linear ticket, or bugfix in this repo — establishes the branch + worktree + env + DB + dev-server conventions so the work is immediately ready to…. New Feature Setup is an agent skill from trycompai/comp. Use when starting a new feature, Linear ticket, or bugfix in this repo — establishes the branch + worktree + env + DB + dev-server conventions so the work is immediately ready to code without fighting infra.
New Feature Setup fits situations like: starting a new feature; start a new feature; spin up a worktree.
Run `npx skills add trycompai/comp --skill new-feature-setup -a claude-code`. Or copy the skill folder (.agents/skills/new-feature-setup in trycompai/comp) into .claude/skills/new-feature-setup in your project. Claude Code loads it when a task matches its description.
Run `npx skills add trycompai/comp --skill new-feature-setup -a codex`. Or copy the skill folder (.agents/skills/new-feature-setup in trycompai/comp) into .agents/skills/new-feature-setup in your project. Codex loads it when a task matches its description.
Cursor, Gemini CLI, GitHub Copilot and OpenCode also load SKILL.md folders. With the skills CLI, run `npx skills add trycompai/comp --skill new-feature-setup -a cursor` (or -a gemini-cli, github-copilot or opencode for the others). To copy it by hand, put the folder in .cursor/skills/new-feature-setup, .gemini/skills/new-feature-setup, .github/skills/new-feature-setup and .opencode/skills/new-feature-setup in your project.
Going by SKILL.md and its folder, New Feature Setup needs the command-line tools its instructions call (bun, git and bunx).
SKILL.md contains no URLs. Its commands use git, which can reach the network depending on how they are called. This is read from the text; nothing was executed.
Our automated static check of SKILL.md found notes only (mentions a .env file), nothing it rates as a warning. It is not a guarantee. Review the folder before installing.
New Feature Setup is published under the AGPL-3.0 licence (the repository's licence). It allows redistribution, so the full SKILL.md is shown on this page.
About 1.4k tokens (SKILL.md is roughly 5.5k characters). Agents keep only the skill's name and description in context until a task matches; then they load SKILL.md in full.
Skills that share tags, products or a category with New Feature Setup: Finishing a Development Branch (obra/superpowers, 296k stars), Migrate Core Code to Submodules (tinyhumansai/openhuman, 41k stars), Finishing A Development Branch (farm-fe/farm, 5.6k stars) and Git Worktree Cleanup (lobehub/lobehub, 83k stars). The comparison table on this page puts their stars, adoption, token cost, safety result and licence side by side.
trycompai (a GitHub organization) maintains it in trycompai/comp, which has 2,016 GitHub stars. The repository holds 31 skills in this directory. The repository was last updated on October 2, 2026.
Source: trycompai/comp on GitHub. Facts on this page come from the repository at the commit we read; the author's words are quoted as theirs.