Skip to content

Commit 632d47f

Browse files
author
Tejas Parmar
committed
fix(git): honor project provider settings
1 parent 60b35a1 commit 632d47f

2 files changed

Lines changed: 53 additions & 9 deletions

File tree

‎apps/server/src/git/GitManager.test.ts‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2695,6 +2695,44 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
26952695
}),
26962696
);
26972697

2698+
it.effect("uses an explicit project's provider settings for generated commit text", () =>
2699+
Effect.gen(function* () {
2700+
const repoDir = yield* makeTempDir("t3code-git-manager-");
2701+
yield* initRepo(repoDir);
2702+
NodeFS.writeFileSync(NodePath.join(repoDir, "README.md"), "hello\nproject\n");
2703+
const projectId = ProjectId.make("project:git-action-settings");
2704+
const disabledInstanceId = DEFAULT_SERVER_SETTINGS.textGenerationModelSelection.instanceId;
2705+
let generatedModelSelection:
2706+
| TextGeneration.CommitMessageGenerationInput["modelSelection"]
2707+
| undefined;
2708+
2709+
const { manager } = yield* makeManager({
2710+
serverSettings: {
2711+
projectSettingsOverrides: {
2712+
[projectId]: {
2713+
providerInstances: { [disabledInstanceId]: { enabled: false } },
2714+
},
2715+
},
2716+
},
2717+
textGeneration: {
2718+
generateCommitMessage: (input) => {
2719+
generatedModelSelection = input.modelSelection;
2720+
return Effect.succeed({ subject: "Use the project writer", body: "" });
2721+
},
2722+
},
2723+
});
2724+
2725+
yield* manager.runStackedAction({
2726+
actionId: "test-project-action-settings",
2727+
cwd: repoDir,
2728+
action: "commit",
2729+
projectId,
2730+
});
2731+
2732+
expect(generatedModelSelection?.instanceId).toBe(ProviderInstanceId.make("claudeAgent"));
2733+
}),
2734+
);
2735+
26982736
it.effect("applies a V2-native thread's project settings to generated commit text", () =>
26992737
Effect.gen(function* () {
27002738
const repoDir = yield* makeTempDir("t3code-git-manager-");

‎apps/server/src/git/GitManager.ts‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -737,19 +737,25 @@ export const make = Effect.gen(function* () {
737737
const projectSettingsFor = Effect.fnUntraced(function* (input: {
738738
readonly cwd: string;
739739
readonly threadId?: ThreadId | undefined;
740+
readonly projectId?: ProjectId | undefined;
740741
}) {
741742
const settings = yield* serverSettingsService.getSettings;
742743
if (!hasProjectSettingsOverrides(settings))
743744
return { settings, projectId: null as ProjectId | null };
744-
const projectId: ProjectId | null = yield* input.threadId !== undefined
745-
? threads.getThreadShell(input.threadId).pipe(
746-
Effect.map((thread) => thread?.projectId ?? null),
747-
Effect.orElseSucceed(() => null),
748-
)
749-
: projects.findActiveByWorkspaceRoot(input.cwd).pipe(
750-
Effect.map((project) => Option.getOrNull(project)?.projectId ?? null),
751-
Effect.orElseSucceed(() => null),
752-
);
745+
const threadProjectId =
746+
input.threadId === undefined
747+
? null
748+
: yield* threads.getThreadShell(input.threadId).pipe(
749+
Effect.map((thread) => thread?.projectId ?? null),
750+
Effect.orElseSucceed(() => null),
751+
);
752+
const projectId =
753+
threadProjectId ??
754+
input.projectId ??
755+
(yield* projects.findActiveByWorkspaceRoot(input.cwd).pipe(
756+
Effect.map((project) => Option.getOrNull(project)?.projectId ?? null),
757+
Effect.orElseSucceed(() => null),
758+
));
753759
return { settings: resolveProjectSettings(settings, projectId).settings, projectId };
754760
});
755761
const readThreadContext = Effect.fnUntraced(

0 commit comments

Comments
 (0)