Skip to content

Keep worktree Python commands on repo venv #437

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NagyVikt merged 1 commit into from
Apr 27, 2026
Merged

Keep worktree Python commands on repo venv #437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions scripts/agent-branch-start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,7 @@ if [[ -n "$auto_transfer_stash_ref" ]]; then
fi
fi

hydrate_dependency_dir_symlink_in_worktree "$repo_root" "$worktree_path" ".venv"
hydrate_dependency_dir_symlink_in_worktree "$repo_root" "$worktree_path" "node_modules"
hydrate_dependency_dir_symlink_in_worktree "$repo_root" "$worktree_path" "apps/frontend/node_modules"
hydrate_dependency_dir_symlink_in_worktree "$repo_root" "$worktree_path" "apps/backend/node_modules"
Expand Down
1 change: 1 addition & 0 deletions templates/scripts/agent-branch-start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,6 +681,7 @@ if [[ -n "$auto_transfer_stash_ref" ]]; then
fi
fi

hydrate_dependency_dir_symlink_in_worktree "$repo_root" "$worktree_path" ".venv"
hydrate_dependency_dir_symlink_in_worktree "$repo_root" "$worktree_path" "node_modules"
hydrate_dependency_dir_symlink_in_worktree "$repo_root" "$worktree_path" "apps/frontend/node_modules"
hydrate_dependency_dir_symlink_in_worktree "$repo_root" "$worktree_path" "apps/backend/node_modules"
Expand Down
14 changes: 11 additions & 3 deletions test/branch.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ test('agent-branch-start leaves removed workflow helpers out of new worktrees',
});


test('agent-branch-start links dependency node_modules directories into new worktrees when present', () => {
test('agent-branch-start links dependency directories into new worktrees when present', () => {
const repoDir = initRepo();
seedCommit(repoDir);

Expand All @@ -284,19 +284,22 @@ test('agent-branch-start links dependency node_modules directories into new work
assert.equal(result.status, 0, result.stderr || result.stdout);

const infoExcludePath = path.join(repoDir, '.git', 'info', 'exclude');
fs.appendFileSync(infoExcludePath, '\napps/frontend/node_modules\napps/backend/node_modules\n', 'utf8');
fs.appendFileSync(infoExcludePath, '\n.venv\napps/frontend/node_modules\napps/backend/node_modules\n', 'utf8');

const dependencyDirs = ['node_modules', 'apps/frontend/node_modules', 'apps/backend/node_modules'];
const dependencyDirs = ['.venv', 'node_modules', 'apps/frontend/node_modules', 'apps/backend/node_modules'];
for (const relativeDir of dependencyDirs) {
const sourceDir = path.join(repoDir, relativeDir);
fs.mkdirSync(sourceDir, { recursive: true });
fs.writeFileSync(path.join(sourceDir, '.guardex-link-marker'), 'present\n', 'utf8');
}
fs.mkdirSync(path.join(repoDir, '.venv', 'bin'), { recursive: true });
fs.writeFileSync(path.join(repoDir, '.venv', 'bin', 'python3'), '#!/usr/bin/env python3\n', 'utf8');

result = runBranchStart(['hydrate-deps', 'bot'], repoDir, {
GUARDEX_PROTECTED_BRANCHES: 'main',
});
assert.equal(result.status, 0, result.stderr || result.stdout);
assert.match(result.stdout, /Linked dependency dir in worktree: \.venv/);
assert.match(result.stdout, /Linked dependency dir in worktree: node_modules/);
assert.match(result.stdout, /Linked dependency dir in worktree: apps\/frontend\/node_modules/);
assert.match(result.stdout, /Linked dependency dir in worktree: apps\/backend\/node_modules/);
Expand All @@ -314,6 +317,11 @@ test('agent-branch-start links dependency node_modules directories into new work
`symlink should expose source contents: ${relativeDir}`,
);
}
assert.equal(
fs.existsSync(path.join(createdWorktree, '.venv', 'bin', 'python3')),
true,
'worktree-local .venv/bin/python3 should resolve through the source venv symlink',
);
});


Expand Down
Loading