Skip to content

fix(server): honor submodule settings when creating worktrees #15594

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
juliusmarminge merged 1 commit into from
Oct 5, 2026
Merged

fix(server): honor submodule settings when creating worktrees #15594

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
20 changes: 20 additions & 0 deletions apps/server/src/git/GitManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ import {
type SourceControlProviderKind,
type SourceControlWritingStyleSettings,
type ThreadId,
type VcsCreateWorktreeInput,
type VcsCreateWorktreeResult,
} from "@t3tools/contracts";
import {
hasProjectSettingsOverrides,
Expand Down Expand Up @@ -103,6 +105,10 @@ interface SourceControlTextGenerationSettings {
export class GitManager extends Context.Service<
GitManager,
{
readonly createWorktree: (
input: VcsCreateWorktreeInput,
options?: GitVcsDriver.CreateWorktreeOptions,
) => Effect.Effect<VcsCreateWorktreeResult, GitCommandError>;
readonly status: (
input: VcsStatusInput,
) => Effect.Effect<VcsStatusResult, GitManagerServiceError>;
Expand Down Expand Up @@ -727,6 +733,19 @@ export const make = Effect.gen(function* () {
);
return resolveProjectSettings(settings, projectId).settings;
});
const createWorktree: GitManager["Service"]["createWorktree"] = Effect.fn(
"GitManager.createWorktree",
)(function* (input, options) {
const submodules =
options?.submodules !== undefined
? options.submodules
: yield* projectSettingsFor(input).pipe(
Effect.map((settings) => settings.worktreeSubmodules),
Effect.orElseSucceed(() => null),
);
return yield* gitCore.createWorktree(input, { ...options, submodules });
});

const readRepositoryInstructions = (cwd: string, fileName: string) =>
Effect.gen(function* () {
const root = yield* fileSystem.realPath(cwd);
Expand Down Expand Up @@ -2848,6 +2867,7 @@ export const make = Effect.gen(function* () {
);

return GitManager.of({
createWorktree,
localStatus,
remoteStatus,
status,
Expand Down
2 changes: 1 addition & 1 deletion apps/server/src/git/GitWorkflowService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ export const make = Effect.gen(function* () {
),
createWorktree: (input, options) =>
ensureGitCommand("GitWorkflowService.createWorktree", input.cwd).pipe(
Effect.andThen(git.createWorktree(input, options)),
Effect.andThen(gitManager.createWorktree(input, options)),
),
listLocalBranchNames: (cwd) =>
ensureGitCommand("GitWorkflowService.listLocalBranchNames", cwd).pipe(
Expand Down
Loading