Skip to content

Commit 78201b0

Browse files
Muzammil-Bitclaudejuliusmarminge
authored
fix(server): text generation fallback respects project provider settings (#33741)
Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: Julius Marminge <[email protected]>
1 parent 9cd7a04 commit 78201b0

7 files changed

Lines changed: 52 additions & 11 deletions

File tree

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ export type GitBranchPullRequest = NonNullable<VcsStatusResult["pr"]> & {
114114

115115
interface SourceControlTextGenerationSettings {
116116
readonly modelSelection: ModelSelection;
117+
readonly projectId: ProjectId | null;
117118
readonly style: SourceControlWritingStyleSettings;
118119
}
119120

@@ -2156,6 +2157,7 @@ export const make = Effect.gen(function* () {
21562157
...(input.includeBranch ? { includeBranch: true } : {}),
21572158
...(policy ? { policy } : {}),
21582159
modelSelection: input.settings.modelSelection,
2160+
projectId: input.settings.projectId,
21592161
})
21602162
.pipe(Effect.map((result) => sanitizeCommitMessage(result)));
21612163

@@ -2386,6 +2388,7 @@ export const make = Effect.gen(function* () {
23862388
...(threadContext ? { threadContext } : {}),
23872389
...(policy ? { policy } : {}),
23882390
modelSelection: settings.modelSelection,
2391+
projectId: settings.projectId,
23892392
});
23902393

23912394
const bodyFile = path.join(
@@ -3231,6 +3234,7 @@ export const make = Effect.gen(function* () {
32313234
settings.sourceControlWriterModelSelection === null
32323235
? Effect.succeed({
32333236
modelSelection: settings.textGenerationModelSelection,
3237+
projectId,
32343238
style: settings.sourceControlWritingStyle,
32353239
})
32363240
: providerRegistry.getProviders.pipe(
@@ -3240,6 +3244,7 @@ export const make = Effect.gen(function* () {
32403244
providers,
32413245
projectId,
32423246
),
3247+
projectId,
32433248
style: settings.sourceControlWritingStyle,
32443249
})),
32453250
),

‎apps/server/src/orchestration-v2/ThreadLaunchService.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,7 @@ const make = Effect.gen(function* () {
361361
attachments: message.attachments,
362362
...(message.context ? { context: message.context } : {}),
363363
modelSelection,
364+
projectId: input.projectId,
364365
})
365366
.pipe(
366367
Effect.map((result) => ({

‎apps/server/src/orchestration-v2/ThreadTitleRegenerationService.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ const make = Effect.gen(function* () {
175175
...(inherited === undefined ? {} : { forkSource: inherited }),
176176
instructions: settings.threadTitleInstructions,
177177
modelSelection: settings.textGenerationModelSelection,
178+
projectId: projection.thread.projectId,
178179
});
179180
const generatedTitle = result.title.trim();
180181
return generatedTitle === "New thread" ||

‎apps/server/src/pullRequest/PullRequestReviewGuideService.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -403,6 +403,7 @@ const make = Effect.gen(function* () {
403403
...reviewGuideInputFromPullRequest(detail, activity, checkout.baseCommit),
404404
cwd: checkout.path,
405405
modelSelection,
406+
projectId: input.projectId,
406407
instructions: projectSettings.reviewGuideInstructions,
407408
stack: checkout.stack,
408409
}),

‎apps/server/src/textGeneration/CodexTextGeneration.test.ts‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import {
22
DEFAULT_TEXT_GENERATION_MODEL_BY_PROVIDER,
3+
ProjectId,
34
ProviderDriverKind,
45
type ModelSelection,
56
type ServerProvider,
@@ -542,6 +543,7 @@ const PREFLIGHT_PRIMARY_STATES = [
542543
"pending",
543544
"exhausted",
544545
"not installed",
546+
"not installed, fallback disabled for project",
545547
"signed out",
546548
"signed out, fallback failed",
547549
] as const;
@@ -550,6 +552,7 @@ it.effect.each(PREFLIGHT_PRIMARY_STATES)("text generation preflight: %s", (prima
550552
Effect.gen(function* () {
551553
const primary = ProviderInstanceId.make("codex");
552554
const fallback = ProviderInstanceId.make("claude_work");
555+
const projectId = ProjectId.make("project-a");
553556
const selection = {
554557
instanceId: primary,
555558
model: "chat-model",
@@ -573,7 +576,7 @@ it.effect.each(PREFLIGHT_PRIMARY_STATES)("text generation preflight: %s", (prima
573576
...(primaryState === "pending" && instanceId === primary
574577
? { installed: false, status: "warning", auth: { status: "unknown" } }
575578
: {}),
576-
...(primaryState === "not installed" && instanceId === primary
579+
...(primaryState.startsWith("not installed") && instanceId === primary
577580
? { installed: false, status: "error", auth: { status: "unknown" } }
578581
: {}),
579582
...(primaryState.startsWith("signed out") && instanceId === primary
@@ -625,6 +628,13 @@ it.effect.each(PREFLIGHT_PRIMARY_STATES)("text generation preflight: %s", (prima
625628
providerInstances: {
626629
[fallback]: { driver: ProviderDriverKind.make("claudeAgent"), config: {} },
627630
},
631+
...(primaryState === "not installed, fallback disabled for project"
632+
? {
633+
projectSettingsOverrides: {
634+
[projectId]: { providerInstances: { [fallback]: { enabled: false } } },
635+
},
636+
}
637+
: {}),
628638
}),
629639
Layer.mock(TextGenerators.TextGenerators)({ runner: () => Effect.undefined }),
630640
Layer.mock(SourceControlProviderRegistry.SourceControlProviderRegistry)({
@@ -639,11 +649,13 @@ it.effect.each(PREFLIGHT_PRIMARY_STATES)("text generation preflight: %s", (prima
639649
message: "hello",
640650
linkedContext: "",
641651
modelSelection: selection,
652+
projectId,
642653
}),
643654
).toEqual({ title: "Generated title" });
644655
expect(calls).toEqual([
645656
primaryState === "ready" ||
646657
primaryState === "pending" ||
658+
primaryState === "not installed, fallback disabled for project" ||
647659
primaryState === "signed out, fallback failed"
648660
? selection
649661
: {

‎apps/server/src/textGeneration/TextGeneration.ts‎

Lines changed: 25 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import * as Context from "effect/Context";
22
import * as Effect from "effect/Effect";
33
import * as Layer from "effect/Layer";
4-
import type { ModelSelection, ProviderInstanceId } from "@t3tools/contracts";
4+
import type { ModelSelection, ProjectId, ProviderInstanceId } from "@t3tools/contracts";
55
import {
66
isProviderAvailable,
77
isProviderTextGenerationCapable,
@@ -81,6 +81,7 @@ export const make = Effect.gen(function* () {
8181
const generate = Effect.fn("TextGeneration.generate")(function* <A>(
8282
operation: TextGenerationOp,
8383
selection: ModelSelection,
84+
projectId: ProjectId | null | undefined,
8485
invoke: (
8586
service: ProviderTextGeneration,
8687
modelSelection: ModelSelection,
@@ -129,7 +130,7 @@ export const make = Effect.gen(function* () {
129130
return (
130131
instanceId !== selection.instanceId &&
131132
provider?.enabled === true &&
132-
resolveProjectProviderInstanceEnabled(settings, null, instanceId) &&
133+
resolveProjectProviderInstanceEnabled(settings, projectId ?? null, instanceId) &&
133134
provider.installed &&
134135
provider.auth.status !== "unauthenticated" &&
135136
provider.status !== "error" &&
@@ -155,23 +156,35 @@ export const make = Effect.gen(function* () {
155156
});
156157
return TextGeneration.of({
157158
generateCommitMessage: Effect.fn("TextGeneration.generateCommitMessage")(function (input) {
158-
return generate("generateCommitMessage", input.modelSelection, (service, modelSelection) =>
159-
service.generateCommitMessage({ ...input, modelSelection }),
159+
return generate(
160+
"generateCommitMessage",
161+
input.modelSelection,
162+
input.projectId,
163+
(service, modelSelection) => service.generateCommitMessage({ ...input, modelSelection }),
160164
);
161165
}),
162166
generatePrContent: Effect.fn("TextGeneration.generatePrContent")(function (input) {
163-
return generate("generatePrContent", input.modelSelection, (service, modelSelection) =>
164-
service.generatePrContent({ ...input, modelSelection }),
167+
return generate(
168+
"generatePrContent",
169+
input.modelSelection,
170+
input.projectId,
171+
(service, modelSelection) => service.generatePrContent({ ...input, modelSelection }),
165172
);
166173
}),
167174
generateBranchName: Effect.fn("TextGeneration.generateBranchName")(function (input) {
168-
return generate("generateBranchName", input.modelSelection, (service, modelSelection) =>
169-
service.generateBranchName({ ...input, modelSelection }),
175+
return generate(
176+
"generateBranchName",
177+
input.modelSelection,
178+
input.projectId,
179+
(service, modelSelection) => service.generateBranchName({ ...input, modelSelection }),
170180
);
171181
}),
172182
generateReviewGuide: Effect.fn("TextGeneration.generateReviewGuide")(function (input) {
173-
return generate("generateReviewGuide", input.modelSelection, (service, modelSelection) =>
174-
service.generateReviewGuide({ ...input, modelSelection }),
183+
return generate(
184+
"generateReviewGuide",
185+
input.modelSelection,
186+
input.projectId,
187+
(service, modelSelection) => service.generateReviewGuide({ ...input, modelSelection }),
175188
);
176189
}),
177190
generateTranscriptionPostProcessing: Effect.fn(
@@ -180,6 +193,7 @@ export const make = Effect.gen(function* () {
180193
return generate(
181194
"generateTranscriptionPostProcessing",
182195
input.modelSelection,
196+
null,
183197
(service, modelSelection) =>
184198
service.generateTranscriptionPostProcessing({ ...input, modelSelection }),
185199
);
@@ -188,6 +202,7 @@ export const make = Effect.gen(function* () {
188202
return generate(
189203
"generateThreadTitle",
190204
input.modelSelection,
205+
input.projectId,
191206
(textGeneration, modelSelection) =>
192207
Effect.gen(function* () {
193208
const linkedContext =

‎packages/provider-core/src/server/textGeneration.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import type {
22
BranchNamingOptions,
33
ChatAttachment,
44
ModelSelection,
5+
ProjectId,
56
PullRequestReviewGuide,
67
TextGenerationError,
78
} from "@t3tools/contracts";
@@ -18,6 +19,7 @@ export interface CommitMessageGenerationInput {
1819
includeBranch?: boolean;
1920
policy?: TextGenerationPolicy | undefined;
2021
modelSelection: ModelSelection;
22+
projectId?: ProjectId | null | undefined;
2123
}
2224

2325
export interface CommitMessageGenerationResult {
@@ -37,6 +39,7 @@ export interface PrContentGenerationInput {
3739
threadContext?: string | undefined;
3840
policy?: TextGenerationPolicy | undefined;
3941
modelSelection: ModelSelection;
42+
projectId?: ProjectId | null | undefined;
4043
}
4144

4245
export interface PrContentGenerationResult {
@@ -50,6 +53,7 @@ export interface BranchNameGenerationInput {
5053
message: string;
5154
attachments?: ReadonlyArray<ChatAttachment> | undefined;
5255
modelSelection: ModelSelection;
56+
projectId?: ProjectId | null | undefined;
5357
}
5458

5559
export interface BranchNameGenerationResult {
@@ -65,6 +69,7 @@ export interface ThreadTitleGenerationInput {
6569
attachments?: ReadonlyArray<ChatAttachment> | undefined;
6670
instructions?: string | undefined;
6771
modelSelection: ModelSelection;
72+
projectId?: ProjectId | null | undefined;
6873
}
6974

7075
export interface ThreadTitleGenerationResult {
@@ -90,6 +95,7 @@ export interface ReviewGuideGenerationInput {
9095
instructions?: string | undefined;
9196
stack?: ReadonlyArray<ReviewGuideStackLayer> | undefined;
9297
modelSelection: ModelSelection;
98+
projectId?: ProjectId | null | undefined;
9399
}
94100

95101
export type ReviewGuideGenerationResult = Omit<

0 commit comments

Comments
 (0)