🤖 fix: allow non-git directories and clarify trunk branch requirement #1068
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
ℹ️ About Codex in GitHub
Codex has been enabled to automatically 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 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
b65aaa9 to
e9b8042
Compare
**Two issues addressed:** 1. **Trunk branch warning was confusing on local workspaces** - Local runtime doesn't use trunk branch at all - Now trunkBranch is optional in workspace.create API - Backend validates trunk branch only for worktree/SSH runtimes - UI hides trunk branch selector for local runtime (already was) 2. **Git repo requirement was unnecessary** - Projects can now be non-git directories - Non-git repos are restricted to local runtime only - listBranches returns empty array for non-git repos - Runtime selector disables worktree/SSH with tooltip 'Requires git repository' **Changes:** - src/common/orpc/schemas/api.ts: make trunkBranch optional - src/common/orpc/schemas/message.ts: recommendedTrunk nullable - src/node/utils/pathUtils.ts: validateProjectPath no longer requires .git, new isGitRepository helper - src/node/services/projectService.ts: listBranches returns empty for non-git - src/node/services/workspaceService.ts: trunk branch validation only for worktree/SSH - src/browser/components/RuntimeIconSelector.tsx: new disabledModes prop with tooltip - src/browser/components/ChatInput/CreationControls.tsx: force local runtime for non-git repos _Generated with mux_
Fixes issue where git projects would incorrectly get local runtime selected on first render because branches start as empty while listBranches is loading. Added branchesLoaded flag to track when the API call completes, and only force local runtime after branches have actually loaded (when branches is still empty at that point, it's a genuine non-git directory).
6ce64d1 to
ce398eb
Compare
- Local runtime: 'You are working in a directory' (no git mention) - Worktree/SSH: 'You are in a git worktree' (git context) This aligns the system prompt with the actual runtime environment.
ce398eb to
5646bdf
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Two issues addressed:
1. Trunk branch warning was confusing on local workspaces
Local runtime doesn't use trunk branch at all (it works directly in the project directory). The trunk branch selector was already hidden for local runtime, but the backend still required a trunk branch value - this led to confusing validation errors.
Fix: Made
trunkBranchoptional in the API. Backend now only validates trunk branch for worktree/SSH runtimes that actually need it.2. Git repo requirement was unnecessary
Users should be able to add any directory as a project, even if it's not a git repository. Non-git directories are perfectly valid for local runtime which just runs Claude in the directory.
Fix:
validateProjectPathisGitRepositoryhelper to check git status separatelylistBranchesreturns empty array (not error) for non-git reposChanges
src/common/orpc/schemas/api.tstrunkBranchoptionalsrc/common/orpc/schemas/message.tsrecommendedTrunknullablesrc/node/utils/pathUtils.tsisGitRepositoryhelpersrc/node/services/projectService.tssrc/node/services/workspaceService.tssrc/browser/components/RuntimeIconSelector.tsxdisabledModesprop with tooltipsrc/browser/components/ChatInput/CreationControls.tsxTesting
pathUtils.test.ts- validates non-git directories passprojectCreate.test.ts- validates non-git projects work with local runtimeGenerated with
mux