feat (desktop): rename branches one word and smaller

[AviPeltz]

Description

Related Issues

Type of Change

• Bug fix
• New feature
• Documentation
• Refactor
• Other (please describe):

Testing

Screenshots (if applicable)

Additional Notes

Summary by CodeRabbit

• Bug Fixes

  • Workspace creation now generates more robust default branch names to reduce name conflicts during setup.

• Chores

  • Replaced name-generation dependency (added friendly-words, removed unique-names-generator).
  • Added TypeScript types for the new word list.

_{✏️ Tip: You can customize this high-level summary in your review settings.}

[coderabbitai]

Caution

Review failed

The pull request is closed.

📝 Walkthrough

Walkthrough

Workspace branch-name generation now avoids collisions by listing existing local and remote branches and using a friendly-words-based generator. The repo dependency was switched from unique-names-generator to friendly-words and a TypeScript declaration for it was added.

Changes

Cohort / File(s)	Summary
Package manifest apps/desktop/package.json	Replaced unique-names-generator with friendly-words dependency.
Workspace creation router apps/desktop/src/lib/trpc/routers/workspaces/procedures/create.ts	Fetches local+remote branches via listBranches and passes them to generateBranchName; uses `input.branchName?.trim()
Git utilities apps/desktop/src/lib/trpc/routers/workspaces/utils/git.ts	Reworked generateBranchName(existingBranches: string[] = []) to use friendly-words, add collision-avoidance with retries/fallbacks, and added/used listBranches.
Types apps/desktop/src/types/friendly-words.d.ts	Added ambient module declaration for friendly-words exposing friendlyWords arrays (objects, predicates, teams, collections).

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

Possibly related PRs

• feat(desktop): use unique-names-generator for workspace names #252 — Also modifies generateBranchName in apps/desktop/.../git.ts; related to name-generation strategy changes.
• conditional render #152 — Changes the same workspaces/utils/git.ts file (adds worktree existence checks); related at the git-utils surface.

Poem

I'm a rabbit in code, nibbling names with glee 🐇
Friendly words I gather, no collisions I see 🌿
One-hop, two-hop, a branch made fine —
If a name's taken, I'll try again in time ⏳
Hooray for clean branches and a tidy tree 🌳

🚥 Pre-merge checks | ✅ 1 | ❌ 2

❌ Failed checks (2 warnings)

Check name	Status	Explanation	Resolution
Description check	⚠️ Warning	The description uses the repository template but provides no concrete details about the changes, implementation, testing, or rationale. Only the 'Refactor' checkbox is checked; all substantive sections remain empty or contain only template comments.	Fill in the Description section with details about the branch naming refactor, add related issue links if applicable, and describe testing steps to verify the collision-avoidance logic works correctly.
Docstring Coverage	⚠️ Warning	Docstring coverage is 33.33% which is insufficient. The required threshold is 80.00%.	Write docstrings for the functions missing them to satisfy the coverage threshold.

✅ Passed checks (1 passed)

Check name	Status	Explanation
Title check	✅ Passed	The title describes the main change: replacing the two-word branch naming scheme (unique-names-generator) with a single friendly word approach (friendly-words), which directly corresponds to the changeset's primary objective.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing touches

• 📝 Generate docstrings

---

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[github-actions]

🚀 Preview Deployment

🔗 Preview Links

Service	Status	Link
Database (Neon)	✅	View Branch
Electric (Fly.io)	✅	View App
API (Vercel)	✅	Open Preview
Web (Vercel)	✅	Open Preview
Marketing (Vercel)	✅	Open Preview
Admin (Vercel)	✅	Open Preview
Docs (Vercel)	✅	Open Preview

---

Preview updates automatically with new commits

[coderabbitai]

Actionable comments posted: 1

🤖 Fix all issues with AI agents

In `@apps/desktop/src/lib/trpc/routers/workspaces/utils/git.ts`:
- Around line 292-311: The generateBranchName function should avoid magic
numbers and ensure the fallback cannot collide: introduce named constants (e.g.,
MAX_ATTEMPTS and FALLBACK_MAX_SUFFIX) and use them instead of 10 and 100, keep
the existingSet from existingBranches for case-insensitive checks, and change
the fallback to loop up to MAX_ATTEMPTS (or another bounded count) generating
candidates like `${word}-${n}` with n in [0, FALLBACK_MAX_SUFFIX) and returning
the first candidate that is not in existingSet; if none found after the bounded
attempts, return a deterministic safe value (e.g., append Date.now() or an
increment) to guarantee uniqueness. Ensure all membership checks use the same
lowercasing logic as before and reference generateBranchName, words, and
existingSet when implementing.