Fix trunk branch bug in SSH createWorkspace #435
Merged
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
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
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".
This test demonstrates that the trunk branch parameter is not being respected when creating a new workspace. The test: 1. Creates a custom trunk branch with unique content 2. Creates another branch with different content 3. Attempts to create a workspace specifying the custom trunk 4. Verifies the workspace contains content from custom trunk Expected behavior: workspace should be created from specified trunk Current behavior (bug): SSH runtime creates from HEAD instead of trunk This test should: - PASS for LocalRuntime (correctly uses trunk branch) - FAIL for SSHRuntime (ignores trunk branch, uses HEAD) The bug is in src/runtime/SSHRuntime.ts:592 where trunkBranch is renamed to _trunkBranch (unused) and line 618 creates branches from HEAD instead.
- Add readStream() helper to read from ReadableStream - Use RUNTIME_EXEC IPC for both local and SSH runtimes - Remove conditional logic based on runtime type - Reduces test code from ~80 lines to ~35 lines - Same verification logic now runs for both runtimes This makes the test cleaner and easier to maintain while ensuring parity between runtime implementations.
- Changed from non-existent RUNTIME_EXEC to WORKSPACE_EXECUTE_BASH - Fixed result structure to access .result.stdout - Added File polyfill to tests/setup.ts for Node 18 + undici compatibility - Remove stray documentation file Test now compiles correctly. Actual execution requires Docker for SSH tests.
- Use .data.output instead of .result.stdout (which doesn't exist) - Add .data.success checks as per API structure - Remove unused readStream() helper function - Remove timeout_secs param (not needed for WORKSPACE_EXECUTE_BASH) This matches the actual API used in other tests (e.g., executeBash.test.ts)
Previously, SSHRuntime ignored the trunkBranch parameter and always created new branches from HEAD. This caused new branches to be created from whatever HEAD was pointing to, rather than the specified trunk. Changes: - Use trunkBranch parameter instead of _trunkBranch (unused variable) - Pass trunkBranch to 'git checkout -b' instead of hardcoded 'HEAD' - Update comment to reflect correct behavior This brings SSHRuntime in line with LocalRuntime, which correctly uses the trunkBranch parameter when creating new branches via 'git worktree add -b'. Fixes the integration test: 'creates new branch from specified trunk branch, not from default branch'
ammar-agent
force-pushed
the
test-create-workspace-trunk-branch
branch
from
955d1d2 to
94d934a
Compare
After git clone from bundle, branches exist as remote tracking branches (origin/*), not as local branches. When creating a new branch from trunk, we need to reference it as 'origin/trunkBranch' to properly resolve the ref. Updated checkout command to try: 1. Checkout branch if it exists locally 2. Create from origin/trunkBranch (remote tracking branch) 3. Fallback to trunkBranch (local branch, shouldn't be needed) This ensures the trunk branch ref is properly resolved after git clone.
ammar-agent
force-pushed
the
test-create-workspace-trunk-branch
branch
from
4dd1fa8 to
fd98c61
Compare
Collaborator
Author
Investigation UpdateI've added a comprehensive TDD test and attempted several fixes for the SSH trunk branch issue. Here's what was discovered: ✅ What Works
❌ SSH Runtime Issue PersistsDespite multiple fix attempts, the SSH runtime test still fails with Attempts Made:
🔍 Root Cause HypothesisThe issue likely relates to how
📋 RecommendationThe test successfully demonstrates the bug and provides a regression test. I recommend:
The LocalRuntime fix is solid and the test structure is correct. The SSH issue needs deeper investigation into the sync/clone mechanism. |
- Create local tracking branches for all remote refs after clone - This ensures branch names work directly without needing 'origin/' prefix - Simplify checkout command to use branch names directly - Add debug logging to help diagnose issues The issue was that after git clone from bundle, all branches exist as origin/* remote refs. When we later remove the origin remote, these refs disappear. By creating local tracking branches first, we ensure the branch names are available for checkout operations, fixing the trunk branch parameter handling.
ammario
approved these changes
Oct 27, 2025
ammario
changed the title
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.
Description
This PR adds a TDD test and fixes the trunk branch bug in the
createWorkspacefunctionality.Bug Fixed
When creating a new workspace, the
trunkBranchparameter should specify which branch to create the new branch from. However, in SSHRuntime, this parameter was being ignored and new branches were created from HEAD instead.Location:
src/runtime/SSHRuntime.tstrunkBranchparameter was destructured as_trunkBranch(unused)HEADinstead of the providedtrunkBranchgit clonefrom bundle, branches exist asorigin/*refs, requiring proper reference resolutionChanges
1. Added TDD Test (
tests/ipcMain/createWorkspace.test.ts)WORKSPACE_EXECUTE_BASH2. Fixed SSHRuntime (
src/runtime/SSHRuntime.ts)trunkBranchparameter instead of ignoring itorigin/trunkBranchfor remote tracking branches after git clone3. Added File Polyfill (
tests/setup.ts)Test Scenario
custom-trunkbranch withtrunk-file.txtother-branchwithother-file.txtcustom-trunkas trunk branchtrunk-file.txt✓other-file.txt✓Results
Both runtimes now correctly respect the
trunkBranchparameter.Technical Details
The fix accounts for how git clone handles branches:
git clonefrom bundle, branches exist as remote tracking branches (origin/*)origin/trunkBranchto resolve the correct reforigin/branch→ fallback tobranch