Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
99 changes: 98 additions & 1 deletion apps/server/src/git/GitManager.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ import type {
GitActionProgressEvent,
GitPreparePullRequestThreadInput,
ModelSelection,
ServerProvider,
} from "@t3tools/contracts";

import {
Expand Down Expand Up @@ -601,6 +602,7 @@ function makeManager(input?: {
sourceControlProvider?: SourceControlProvider["Service"];
textGeneration?: Partial<FakeGitTextGeneration>;
serverSettings?: Parameters<typeof ServerSettings.layerTest>[0];
providers?: ReadonlyArray<ServerProvider>;
setupScriptRunner?: ProjectSetupScriptRunner.ProjectSetupScriptRunner["Service"];
gitConfigReads?: string[];
gitCommands?: string[];
Expand Down Expand Up @@ -707,7 +709,7 @@ function makeManager(input?: {
const layerManager = Layer.mergeAll(
Layer.succeed(TextGeneration.TextGeneration, textGeneration),
Layer.mock(ProviderRegistry.ProviderRegistry)({
getProviders: Effect.succeed([]),
getProviders: Effect.succeed(input?.providers ?? []),
}),
Layer.succeed(
ProjectSetupScriptRunner.ProjectSetupScriptRunner,
Expand Down Expand Up @@ -746,6 +748,22 @@ const layerGitManagerTest = GitVcsDriver.layer.pipe(
Layer.provideMerge(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)),
);

const WRITER_INSTANCE_ID = ProviderInstanceId.make("claudeAgent");
const WRITER = { instanceId: WRITER_INSTANCE_ID, model: "claude-sonnet-4-5" };
const WRITER_SNAPSHOT: ServerProvider = {
instanceId: WRITER_INSTANCE_ID,
driver: ProviderDriverKind.make("claudeAgent"),
enabled: true,
installed: true,
status: "ready",
auth: { status: "authenticated" },
version: null,
checkedAt: "1970-01-01T00:00:00Z",
models: [],
slashCommands: [],
skills: [],
};

it.layer(layerGitManagerTest)("GitManager", (it) => {
it.effect(
"publishes local Git changes during a held PR lookup without caching its old branch",
Expand Down Expand Up @@ -3016,6 +3034,85 @@ it.layer(layerGitManagerTest)("GitManager", (it) => {
}),
);

it.effect.each([
{ name: "no writer", writer: null, providers: [], expected: "textGeneration" },
{
name: "an available writer",
writer: WRITER,
providers: [WRITER_SNAPSHOT],
expected: "sourceControlWriter",
},
{
name: "an unavailable writer",
writer: WRITER,
providers: [{ ...WRITER_SNAPSHOT, availability: "unavailable" }],
expected: "textGeneration",
},
] as const)(
"a failed commit message names the setting that picked its model with $name",
({ writer, providers, expected }) =>
Effect.gen(function* () {
const repoDir = yield* makeTempDir("t3code-git-manager-");
yield* initRepo(repoDir);
NodeFS.writeFileSync(NodePath.join(repoDir, "README.md"), "hello\nwriter\n");
const { manager } = yield* makeManager({
serverSettings: { sourceControlWriterModelSelection: writer },
providers,
textGeneration: {
generateCommitMessage: () =>
Effect.fail(
new TextGenerationError({
operation: "generateCommitMessage",
detail: "model rejected",
}),
),
},
});

const error = yield* runStackedAction(manager, { cwd: repoDir, action: "commit" }).pipe(
Effect.flip,
);

expect(error).toBeInstanceOf(TextGenerationError);
expect(error).toMatchObject({ modelSetting: expected });
}),
);

it.effect("failed pull request content names the writer setting that picked its model", () =>
Effect.gen(function* () {
const repoDir = yield* makeTempDir("t3code-git-manager-");
yield* initRepo(repoDir);
yield* runGit(repoDir, ["checkout", "-b", "feature/writer-failure"]);
const remoteDir = yield* createBareRemote();
yield* runGit(repoDir, ["remote", "add", "origin", remoteDir]);
NodeFS.writeFileSync(NodePath.join(repoDir, "writer.txt"), "writer\n");
yield* runGit(repoDir, ["add", "writer.txt"]);
yield* runGit(repoDir, ["commit", "-m", "Writer failure"]);
yield* runGit(repoDir, ["push", "-u", "origin", "feature/writer-failure"]);
const { manager, providerCalls } = yield* makeManager({
serverSettings: { sourceControlWriterModelSelection: WRITER },
providers: [WRITER_SNAPSHOT],
textGeneration: {
generatePrContent: () =>
Effect.fail(
new TextGenerationError({
operation: "generatePrContent",
detail: "model rejected",
}),
),
},
});

const error = yield* runStackedAction(manager, { cwd: repoDir, action: "create_pr" }).pipe(
Effect.flip,
);

expect(error).toBeInstanceOf(TextGenerationError);
expect(error).toMatchObject({ modelSetting: "sourceControlWriter" });
expect(created(providerCalls)).toHaveLength(0);
}),
);

it.effect("uses an explicit project's provider settings for generated commit text", () =>
Effect.gen(function* () {
const repoDir = yield* makeTempDir("t3code-git-manager-");
Expand Down
71 changes: 51 additions & 20 deletions apps/server/src/git/GitManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import {
type ProjectId,
SourceControlProviderError,
type SourceControlWritingStyleSettings,
type TextGenerationModelSetting,
type ThreadId,
type ThreadPullRequestKey,
type VcsCreateWorktreeInput,
Expand All @@ -65,7 +66,11 @@ import {
} from "../sourceControl/threadPullRequests.ts";
import { sourceControlDefinitions } from "../sourceControl/sourceControlDefinitions.ts";

import { GitManagerError, GitPullRequestMaterializationError } from "@t3tools/contracts";
import {
GitManagerError,
GitPullRequestMaterializationError,
TextGenerationError,
} from "@t3tools/contracts";
import {
historicalMessage,
renderHistory,
Expand Down Expand Up @@ -114,9 +119,20 @@ export type GitBranchPullRequest = NonNullable<VcsStatusResult["pr"]> & {

interface SourceControlTextGenerationSettings {
readonly modelSelection: ModelSelection;
readonly modelSetting: TextGenerationModelSetting;
readonly style: SourceControlWritingStyleSettings;
}

const withModelSetting = (error: TextGenerationError, modelSetting: TextGenerationModelSetting) =>
new TextGenerationError({
operation: error.operation,
detail: error.detail,
...(error.instanceId === undefined ? {} : { instanceId: error.instanceId }),
...(error.model === undefined ? {} : { model: error.model }),
modelSetting,
...(error.cause === undefined ? {} : { cause: error.cause }),
});

export class GitManager extends Context.Service<
GitManager,
{
Expand Down Expand Up @@ -2147,7 +2163,10 @@ export const make = Effect.gen(function* () {
...(policy ? { policy } : {}),
modelSelection: input.settings.modelSelection,
})
.pipe(Effect.map((result) => sanitizeCommitMessage(result)));
.pipe(
Effect.map((result) => sanitizeCommitMessage(result)),
Effect.mapError((error) => withModelSetting(error, input.settings.modelSetting)),
);

return {
subject: generated.subject,
Expand Down Expand Up @@ -2337,18 +2356,20 @@ export const make = Effect.gen(function* () {
: undefined;
const threadContext = yield* readThreadContext(threadId);

const generated = yield* textGeneration.generatePrContent({
cwd,
baseBranch,
headBranch: headContext.headBranch,
commitSummary: limitContext(rangeContext.commitSummary, 20_000),
diffSummary: limitContext(rangeContext.diffSummary, 20_000),
diffPatch: limitContext(rangeContext.diffPatch, 60_000),
...(changeRequestTemplate ? { changeRequestTemplate } : {}),
...(threadContext ? { threadContext } : {}),
...(policy ? { policy } : {}),
modelSelection: settings.modelSelection,
});
const generated = yield* textGeneration
.generatePrContent({
cwd,
baseBranch,
headBranch: headContext.headBranch,
commitSummary: limitContext(rangeContext.commitSummary, 20_000),
diffSummary: limitContext(rangeContext.diffSummary, 20_000),
diffPatch: limitContext(rangeContext.diffPatch, 60_000),
...(changeRequestTemplate ? { changeRequestTemplate } : {}),
...(threadContext ? { threadContext } : {}),
...(policy ? { policy } : {}),
modelSelection: settings.modelSelection,
})
.pipe(Effect.mapError((error) => withModelSetting(error, settings.modelSetting)));

const bodyFile = path.join(
tempDir,
Expand Down Expand Up @@ -3191,19 +3212,29 @@ export const make = Effect.gen(function* () {
const textGenerationSettings = yield* projectSettingsFor(input).pipe(
Effect.flatMap(({ settings, projectId }) =>
settings.sourceControlWriterModelSelection === null
? Effect.succeed({
? Effect.succeed<SourceControlTextGenerationSettings>({
modelSelection: settings.textGenerationModelSelection,
modelSetting: "textGeneration",
style: settings.sourceControlWritingStyle,
})
: providerRegistry.getProviders.pipe(
Effect.map((providers) => ({
modelSelection: ServerSettings.resolveSourceControlWriterModelSelection(
Effect.map((providers): SourceControlTextGenerationSettings => {
const modelSelection = ServerSettings.resolveSourceControlWriterModelSelection(
settings,
providers,
projectId,
),
style: settings.sourceControlWritingStyle,
})),
);
return {
modelSelection,
// The resolver returns the writer's own selection or falls back to the
// general one; a fallback is fixed in the general setting.
modelSetting:
modelSelection === settings.sourceControlWriterModelSelection
? "sourceControlWriter"
: "textGeneration",
style: settings.sourceControlWritingStyle,
};
}),
),
),
Effect.mapError(
Expand Down
66 changes: 53 additions & 13 deletions apps/server/src/textGeneration/CodexTextGeneration.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import * as Scope from "effect/Scope";
import { createModelSelection } from "@t3tools/shared/model";
import { expect } from "vite-plus/test";

import { CodexSettings, ProviderInstanceId } from "@t3tools/contracts";
import { CodexSettings, ProviderInstanceId, TextGenerationError } from "@t3tools/contracts";

import * as ServerConfig from "../config.ts";
import { makeProcessProbe, processProbeSource } from "../testUtils/processProbe.ts";
Expand Down Expand Up @@ -545,16 +545,13 @@ const PREFLIGHT_PRIMARY_STATES = [
"signed out, fallback failed",
] as const;

it.effect.each(PREFLIGHT_PRIMARY_STATES)("text generation preflight: %s", (primaryState) =>
const makePreflightTextGeneration = (
primaryState: (typeof PREFLIGHT_PRIMARY_STATES)[number],
generateThreadTitle: TextGeneration.TextGeneration["Service"]["generateThreadTitle"],
) =>
Effect.gen(function* () {
const primary = ProviderInstanceId.make("codex");
const fallback = ProviderInstanceId.make("claude_work");
const selection = {
instanceId: primary,
model: "chat-model",
options: [{ id: "effort", value: "high" }],
};
const calls: ModelSelection[] = [];
const instances: ProviderInstance[] = [primary, fallback].map((instanceId) => {
const driver = ProviderDriverKind.make(instanceId === primary ? "codex" : "claudeAgent");
const snapshot: ServerProvider = {
Expand Down Expand Up @@ -604,11 +601,7 @@ it.effect.each(PREFLIGHT_PRIMARY_STATES)("text generation preflight: %s", (prima
generateBranchName: () => Effect.die("unused"),
generateReviewGuide: () => Effect.die("unused"),
generateTranscriptionPostProcessing: () => Effect.die("unused"),
generateThreadTitle: (input) =>
Effect.sync(() => {
calls.push(input.modelSelection);
return { title: "Generated title" };
}),
generateThreadTitle,
}),
};
});
Expand All @@ -631,6 +624,23 @@ it.effect.each(PREFLIGHT_PRIMARY_STATES)("text generation preflight: %s", (prima
),
),
);
return { service, primary, fallback };
});

it.effect.each(PREFLIGHT_PRIMARY_STATES)("text generation preflight: %s", (primaryState) =>
Effect.gen(function* () {
const selection = {
instanceId: ProviderInstanceId.make("codex"),
model: "chat-model",
options: [{ id: "effort", value: "high" }],
};
const calls: ModelSelection[] = [];
const { service, fallback } = yield* makePreflightTextGeneration(primaryState, (input) =>
Effect.sync(() => {
calls.push(input.modelSelection);
return { title: "Generated title" };
}),
);
expect(
yield* service.generateThreadTitle({
cwd: "/tmp",
Expand All @@ -652,3 +662,33 @@ it.effect.each(PREFLIGHT_PRIMARY_STATES)("text generation preflight: %s", (prima
]);
}),
);

it.effect.each([false, true])(
"a text generation failure names the model that ran: exhausted=%s",
(exhausted) =>
Effect.gen(function* () {
const { service, primary, fallback } = yield* makePreflightTextGeneration(
exhausted ? "exhausted" : "ready",
() =>
Effect.fail(
new TextGenerationError({ operation: "generateThreadTitle", detail: "model rejected" }),
),
);
const error = yield* service
.generateThreadTitle({
cwd: "/tmp",
message: "hello",
linkedContext: "",
modelSelection: { instanceId: primary, model: "chat-model" },
})
.pipe(Effect.flip);
const fallbackModel =
DEFAULT_TEXT_GENERATION_MODEL_BY_PROVIDER[ProviderDriverKind.make("claudeAgent")];

expect(error.message).toBe(
exhausted
? `Text generation failed in generateThreadTitle using ${fallbackModel} (${fallback}): model rejected`
: `Text generation failed in generateThreadTitle using chat-model (${primary}): model rejected`,
);
}),
);
13 changes: 13 additions & 0 deletions apps/server/src/textGeneration/TextGeneration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,19 @@ export const make = Effect.gen(function* () {
}
return yield* resolveInstance(registry, operation, selection.instanceId).pipe(
Effect.flatMap((service) => invoke(service, selection)),
// Drivers report what went wrong, not which model ran; after a usage-limit fallback only
// this layer knows.
Effect.mapError(
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
(error) =>
new TextGenerationError({
operation: error.operation,
detail: error.detail,
instanceId: selection.instanceId,
model: selection.model,
...(error.modelSetting === undefined ? {} : { modelSetting: error.modelSetting }),
...(error.cause === undefined ? {} : { cause: error.cause }),
}),
),
);
});
return TextGeneration.of({
Expand Down
Loading
Loading