🤖 Add trunk branch selector for workspace creation #100

ThomasK33 · 2025-10-08T17:02:24Z

Adds ability to select a trunk/base branch when creating a new workspace.

Changes

UI

Command palette: Added trunk branch selection field with fuzzy search
Modal (CMD+N): Added dropdown to select trunk branch
Both UIs load local branches and show them as options
Trunk branch selection is optional (defaults to HEAD if not selected)

Backend

Added listLocalBranches() to enumerate local branches
Updated createWorktree() to accept optional trunkBranch parameter
New logic: if trunk is specified, always create new branch from trunk
- Ignores remote branches when trunk is explicitly selected
- Errors if local branch already exists (prevents overwrite)
Without trunk: preserves existing behavior (checkout remote or create from HEAD)

IPC Layer

Added WORKSPACE_LIST_BRANCHES channel to fetch branches for a project
Updated workspace.create to accept and pass through trunkBranch
Wired through preload.ts, ipcMain.ts, and type definitions

Integration

Updated App.tsx to pass trunk branch from modal to backend
Updated command palette prompts to collect trunk branch selection
Command palette supports async option loading with fuzzy filtering

Use Cases

This enables creating feature branches from any local branch:

Creating branches from main instead of current HEAD
Starting new work from a specific release branch
Isolating work from unrelated changes on current branch

Testing

✅ All lint checks pass
✅ All TypeScript checks pass
✅ Command palette trunk selection works
✅ Modal trunk selection works
✅ Trunk branch parameter flows through entire stack

Generated with cmux

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

package.json

ThomasK33

@chatgpt-codex-connector Addressed the notarization config issue - restored the flag that was accidentally removed during rebase.

chatgpt-codex-connector · 2025-10-08T17:22:56Z

To use Codex here, create an environment for this repo.

ThomasK33 · 2025-10-08T17:23:20Z

✅ Addressed Codex feedback on notarization config

Fixed the P1 issue - restored notarize: true flag in package.json that was accidentally removed during rebase. The flag is now back and macOS builds will be properly notarized.

ThomasK33 · 2025-10-08T17:23:47Z

@codex review

chatgpt-codex-connector · 2025-10-08T17:35:43Z

Codex Review: Didn't find any major issues. Another round soon, please!

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

ammario · 2025-10-08T17:56:40Z

src/components/CommandPalette.tsx

    ? (activePrompt.fields[activePrompt.idx] ?? null)
    : null;
+
+  useEffect(() => {


this code is kind of monstrous -- needs comment or simplification

ammario · 2025-10-08T17:58:57Z

src/components/NewWorkspaceModal.tsx

+    const loadBranches = async () => {
+      setIsLoadingBranches(true);
+      try {
+        const branchList = await window.api.workspace.listBranches(projectPath);


this is the wrong scoping for listBranches -- its an operation on the project. The IPC doesn't have a projects section. Working on reworking the IPC so the frontend doesn't directly access config and there is instead safe operations via a projects section.

ammario · 2025-10-08T18:00:12Z

src/git.ts

+  trunkBranch?: string;
+}
+
+export async function listLocalBranches(projectPath: string): Promise<string[]> {


should have a test

alternatively and better would be to add a test for createWorktree

ammario

good shit

ammario · 2025-10-09T18:19:01Z

src/components/CommandPalette.tsx

(essentially ignoring this file for the purpose of review)

ammario · 2025-10-09T18:19:41Z

src/components/NewWorkspaceModal.tsx

  projectPath: string;
  onClose: () => void;
-  onAdd: (branchName: string) => Promise<void>;
+  onAdd: (branchName: string, trunkBranch?: string) => Promise<void>;


why not make the trunkBranch required throughout? That should simplify the code paths.

We can still infer a reasonable default from what's checked out in the project root — so i mean this from a code perspective not a UX perspective

ammario · 2025-10-09T18:22:32Z

src/components/NewWorkspaceModal.tsx

+            {isLoadingBranches ? (
+              <option value="">Loading branches...</option>
+            ) : (
+              <option value="">-- Select trunk branch (optional) --</option>


would rather we just default to the branch we found and will use vs. making this optional -- such behavior would have saved me a bunch of time as i've accidenally created workspaces off a detached head state vs. main

ammario · 2025-10-09T18:22:56Z

src/services/ipcMain.ts

    ipcMain.handle(
      IPC_CHANNELS.WORKSPACE_CREATE,
-      async (_event, projectPath: string, branchName: string) => {
+      async (_event, projectPath: string, branchName: string, trunkBranch?: string) => {


again re optional

ammario · 2025-10-09T18:23:45Z

src/App.tsx

+    try {
+      return await window.api.projects.listBranches(projectPath);
+    } catch (error) {
+      console.error("Failed to list branches:", error);


better for the error to propagate to the caller imo so that it can be displayed in a useful place vs the console

ammario · 2025-10-09T18:24:08Z

src/git.test.ts

+    for (let i = 1; i < branches.length; i += 1) {
+      expect(branches[i - 1].localeCompare(branches[i])).toBeLessThanOrEqual(0);
+    }
+  });


appreciate the tests

ammario · 2025-10-09T18:24:44Z

src/git.ts

-          b.trim() === `remotes/origin/${branchName}`
-      );
+    // If trunk branch is specified, always create a new branch from it
+    if (trunkBranch) {


again, this code would be simplified if it wasn't optional

Adds ability to select a trunk/base branch when creating a new workspace. When a trunk branch is selected, the new workspace branch is created from that trunk instead of from HEAD or an existing remote branch. UI Changes: - Command palette: Added trunk branch selection field with fuzzy search - Modal (CMD+N): Added dropdown to select trunk branch - Both UIs load local branches and show them as options - Trunk branch selection is optional (defaults to HEAD if not selected) Backend Changes: - Added listLocalBranches() to git.ts to enumerate local branches - Updated createWorktree() to accept optional trunkBranch parameter - New logic: if trunk is specified, always create new branch from trunk - Ignores remote branches when trunk is explicitly selected - Errors if local branch already exists (prevents overwrite) - Without trunk: preserves existing behavior (checkout remote or create from HEAD) IPC Layer: - Added WORKSPACE_LIST_BRANCHES channel to fetch branches for a project - Updated workspace.create to accept and pass through trunkBranch - Wired through preload.ts, ipcMain.ts, and type definitions Integration: - Updated App.tsx to pass trunk branch from modal to backend - Updated command palette prompts to collect trunk branch selection - Added getBranchesForProject callback to command registry context - Command palette supports async option loading with fuzzy filtering This enables creating feature branches from any local branch, useful for: - Creating branches from main instead of current HEAD - Starting new work from a specific release branch - Isolating work from unrelated changes on current branch _Generated with `cmux`_ Change-Id: Ic2a710104f3a5925e0e6bdff1d0e5ed772bcf108 Signed-off-by: Thomas Kosiewski <tk@coder.com> 🤖 Restore macOS notarization configuration The notarization flag was accidentally removed during rebase. This flag is required to submit the DMG for notarization so that distributed builds are not blocked by Gatekeeper on macOS 10.15+. Restores the 'notarize: true' flag in the mac build configuration. _Generated with `cmux`_ Change-Id: I3d4e4be981cdbb0cee0c822dd973b1a71e000108 Signed-off-by: Thomas Kosiewski <tk@coder.com>

ammario

there's minor ui stuff like the caret on the select is misaligned - but this an essential feature that i need desperately so lets get it in

ThomasK33 force-pushed the trunk-branch branch 2 times, most recently from db7f61b to cfdbc06 Compare October 8, 2025 17:08

ThomasK33 marked this pull request as ready for review October 8, 2025 17:14

chatgpt-codex-connector bot reviewed Oct 8, 2025

View reviewed changes

package.json Outdated Show resolved Hide resolved

ThomasK33 commented Oct 8, 2025

View reviewed changes

ammario requested changes Oct 8, 2025

View reviewed changes

ThomasK33 force-pushed the trunk-branch branch 3 times, most recently from 061f6ff to 6d6623e Compare October 9, 2025 17:23

ThomasK33 requested a review from ammario October 9, 2025 17:24

ThomasK33 force-pushed the trunk-branch branch from 6d6623e to 7afd242 Compare October 9, 2025 18:02

ammario requested changes Oct 9, 2025

View reviewed changes

ThomasK33 force-pushed the trunk-branch branch from 7afd242 to 06fd0c5 Compare October 9, 2025 19:30

ThomasK33 changed the base branch from main to thomask33/10-10-add_nix_formatter_ci October 10, 2025 16:44

ThomasK33 force-pushed the trunk-branch branch from 06fd0c5 to a919035 Compare October 10, 2025 16:44

Base automatically changed from thomask33/10-10-add_nix_formatter_ci to main October 10, 2025 16:48

ThomasK33 force-pushed the trunk-branch branch from a919035 to d44f319 Compare October 10, 2025 17:31

ThomasK33 requested a review from ammario October 10, 2025 17:37

ThomasK33 force-pushed the trunk-branch branch from d44f319 to af99432 Compare October 10, 2025 17:46

ammario approved these changes Oct 10, 2025

View reviewed changes

ammario added this pull request to the merge queue Oct 10, 2025

Merged via the queue into main with commit 4241982 Oct 10, 2025
8 of 9 checks passed

ammario deleted the trunk-branch branch October 10, 2025 18:23

🤖 Add trunk branch selector for workspace creation #100

🤖 Add trunk branch selector for workspace creation #100

Uh oh!

Conversation

ThomasK33 commented Oct 8, 2025

Changes

UI

Backend

IPC Layer

Integration

Use Cases

Testing

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

ThomasK33 left a comment

Choose a reason for hiding this comment

Uh oh!

chatgpt-codex-connector bot commented Oct 8, 2025

Uh oh!

ThomasK33 commented Oct 8, 2025

Uh oh!

ThomasK33 commented Oct 8, 2025

Uh oh!

chatgpt-codex-connector bot commented Oct 8, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ammario left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ammario left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

ammario left a comment •

edited

Loading