Skip to content

Commit c1316b9

Browse files
feat: text generators let model APIs write titles, commits, and transcript cleanup
Thread titles, commit and PR text, branch names, and transcript cleanup could only run through a coding agent, which starts a full session per request. A model API is enough for that, and much faster. Text generators are a separate concept from provider instances: a `textGenerators` setting holds OpenAI-compatible (OpenAI, OpenRouter, Ollama, LM Studio, ...) or Anthropic endpoints with a secret API key. Their id fills a model selection's instanceId, so the existing text generation, source control writer, and cleanup selections can pick one; TextGeneration routes it to the API through the same Runner every provider uses. Agent surfaces never list them, review guides fall back to an agent that can read the checkout, and a managed provider allow-list turns them off. Models are discovered from the API on first use and cached on the server until refreshed or reconfigured. Supersedes #33007. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent d5290e9 commit c1316b9

34 files changed

Lines changed: 1591 additions & 85 deletions

‎apps/server/src/observability/RpcInstrumentation.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ const RPC_AGGREGATES = {
8686
[WS_METHODS.serverGetResourceTelemetryHistory]: "server",
8787
[WS_METHODS.serverRetryResourceTelemetry]: "server",
8888
[WS_METHODS.serverCheckOtlpEndpoint]: "server",
89+
[WS_METHODS.serverListTextGeneratorModels]: "server",
8990
[WS_METHODS.serverPrepareTriage]: "server",
9091
[WS_METHODS.serverGetUsageSummary]: "server",
9192
[WS_METHODS.serverRefreshUsageRates]: "server",

‎apps/server/src/policy/managedProviders.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,8 @@ export function makeManagedProviders(
389389
const result: ServerSettings = {
390390
...settings,
391391
providerInstances: providerInstances as ServerSettings["providerInstances"],
392+
// An allow-list names agent drivers; text generators would send code to any other API.
393+
...(allowed === undefined ? {} : { textGenerators: {} }),
392394
sourceControlWriterModelSelection: allowedSelection(
393395
settings,
394396
settings.sourceControlWriterModelSelection,

‎apps/server/src/serverSettings.test.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1641,8 +1641,17 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("server settings"
16411641
const antigravity = ProviderInstanceId.make("antigravity");
16421642
const openCode = ProviderInstanceId.make("opencode");
16431643
const hub = UsageLimitSourceId.make("hub");
1644+
const router = ProviderInstanceId.make("openrouter");
16441645
const withUsage = yield* serverSettings.updateSettings({
16451646
cloudSpeechCredentials: { openai: usageReference, xai: "literal-fixture" },
1647+
textGenerators: {
1648+
[router]: {
1649+
kind: "openaiCompatible",
1650+
baseUrl: "https://openrouter.ai/api/v1",
1651+
apiKey: usageReference,
1652+
enabled: true,
1653+
},
1654+
},
16461655
usageLimitSources: {
16471656
[hub]: {
16481657
kind: "cliproxy",
@@ -1695,6 +1704,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("server settings"
16951704
});
16961705
assert.equal(legacy.sourceControlHosts.bitbucket?.accessToken, SECRET_REDACTED);
16971706
assert.equal(legacy.usageLimitSources[hub]?.managementKey, SECRET_REDACTED);
1707+
assert.equal(legacy.textGenerators[router]?.apiKey, SECRET_REDACTED);
16981708
assert.equal(legacy.easDeviceHosts[0]?.accessToken, SECRET_REDACTED);
16991709
assert.equal(legacy.simlockDeviceHosts[0]?.agentToken, SECRET_REDACTED);
17001710
const configOf = (settings: ServerSettings, id: ProviderInstanceId) =>
@@ -1705,6 +1715,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("server settings"
17051715
cloudSpeechCredentials: legacy.cloudSpeechCredentials,
17061716
sourceControlHosts: legacy.sourceControlHosts,
17071717
usageLimitSources: legacy.usageLimitSources,
1718+
textGenerators: legacy.textGenerators,
17081719
easDeviceHosts: legacy.easDeviceHosts,
17091720
simlockDeviceHosts: legacy.simlockDeviceHosts,
17101721
providerInstances: legacy.providerInstances,
@@ -1715,6 +1726,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("server settings"
17151726
"ghe.acme.test": "ghp_ghe",
17161727
});
17171728
assert.deepEqual(echoed.usageLimitSources[hub]?.managementKey, usageReference);
1729+
assert.deepEqual(echoed.textGenerators[router]?.apiKey, usageReference);
17181730
assert.deepEqual(echoed.cloudSpeechCredentials, {
17191731
openai: usageReference,
17201732
xai: "literal-fixture",
@@ -1820,6 +1832,7 @@ it.layer(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer))("server settings"
18201832
"easDeviceHosts.[].accessToken",
18211833
"simlockDeviceHosts.[].agentToken",
18221834
"usageLimitSources.*.managementKey",
1835+
"textGenerators.*.apiKey",
18231836
]);
18241837
}),
18251838
);

‎apps/server/src/settingsSecrets.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
type ServerSettings,
99
type SettingsSecretValue,
1010
SimlockDeviceHostConfig,
11+
TextGeneratorConfig,
1112
UsageLimitSourceConfig,
1213
isSecretReference,
1314
secretSettingsFields,
@@ -46,6 +47,7 @@ const providerSecretFields = new Map([
4647
),
4748
]);
4849
const usageLimitSecretFields = secretSettingsFields(UsageLimitSourceConfig);
50+
const textGeneratorSecretFields = secretSettingsFields(TextGeneratorConfig);
4951
const voiceSecretFields = secretSettingsFields(CloudSpeechCredentials);
5052
const easDeviceHostSecretFields = secretSettingsFields(EasDeviceHostConfig);
5153
const simlockDeviceHostSecretFields = secretSettingsFields(SimlockDeviceHostConfig);
@@ -209,6 +211,19 @@ function mapSecretFieldGroups(
209211
]),
210212
) as ServerSettings["usageLimitSources"];
211213

214+
const textGenerators = Object.fromEntries(
215+
Object.entries(settings.textGenerators).map(([id, generator]) => [
216+
id,
217+
mapFields(
218+
generator,
219+
textGeneratorSecretFields,
220+
(field, serverHost) =>
221+
`text-generator-${encode(id)}-${encode(field)}` +
222+
(serverHost === null ? "" : `-${encode(serverHost)}`),
223+
),
224+
]),
225+
) as ServerSettings["textGenerators"];
226+
212227
const easDeviceHosts = settings.easDeviceHosts.map(
213228
(host) =>
214229
mapFields(
@@ -242,6 +257,7 @@ function mapSecretFieldGroups(
242257
providerInstances,
243258
sourceControlHosts,
244259
usageLimitSources,
260+
textGenerators,
245261
easDeviceHosts,
246262
simlockDeviceHosts,
247263
};

‎apps/server/src/sourceControl/sourceControlHostSecrets.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ it.effect("reads a collected reference again once it is invalidated", () =>
178178
sourceControlHosts: hosts,
179179
cloudSpeechCredentials: { openai: source("voice#key"), xai: "", openrouter: "" },
180180
usageLimitSources,
181+
textGenerators: {},
181182
easDeviceHosts,
182183
simlockDeviceHosts,
183184
}),

‎apps/server/src/sourceControl/sourceControlHostSecrets.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ export const invalidateSettingsSecrets = Effect.fn("SettingsSecrets.invalidate")
120120
ServerSettings,
121121
| "sourceControlHosts"
122122
| "usageLimitSources"
123+
| "textGenerators"
123124
| "easDeviceHosts"
124125
| "simlockDeviceHosts"
125126
| "cloudSpeechCredentials"
@@ -131,6 +132,9 @@ export const invalidateSettingsSecrets = Effect.fn("SettingsSecrets.invalidate")
131132
Effect.map((current) => [
132133
...collectSourceControlHostSecretReferences(current.sourceControlHosts),
133134
...collectUsageLimitSecretReferences(current.usageLimitSources),
135+
...Object.values(current.textGenerators).flatMap(({ apiKey }) =>
136+
isSecretReference(apiKey) ? [apiKey] : [],
137+
),
134138
...collectDeviceHostSecretReferences(current),
135139
...Object.values(current.cloudSpeechCredentials).filter(isSecretReference),
136140
]),

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

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import { CodexSettings, ProviderInstanceId } from "@t3tools/contracts";
2727
import * as ServerConfig from "../config.ts";
2828
import { makeProcessProbe, processProbeSource } from "../testUtils/processProbe.ts";
2929
import * as TextGeneration from "./TextGeneration.ts";
30+
import * as TextGenerators from "./TextGenerators.ts";
3031
import { makeCodexTextGeneration } from "./CodexTextGeneration.ts";
3132
import { writeFakeCli } from "@t3tools/provider-testing/fakeCli";
3233
const decodeCodexSettings = Schema.decodeSync(CodexSettings);
@@ -625,6 +626,7 @@ it.effect.each(PREFLIGHT_PRIMARY_STATES)("text generation preflight: %s", (prima
625626
[fallback]: { driver: ProviderDriverKind.make("claudeAgent"), config: {} },
626627
},
627628
}),
629+
Layer.mock(TextGenerators.TextGenerators)({ runner: () => Effect.undefined }),
628630
Layer.mock(SourceControlProviderRegistry.SourceControlProviderRegistry)({
629631
resolveLink: () => Effect.die("unused"),
630632
}),
@@ -652,3 +654,76 @@ it.effect.each(PREFLIGHT_PRIMARY_STATES)("text generation preflight: %s", (prima
652654
]);
653655
}),
654656
);
657+
658+
it.effect(
659+
"a review guide aimed at a text generator falls back to an agent that can read the checkout",
660+
() =>
661+
Effect.gen(function* () {
662+
const claude = ProviderInstanceId.make("claudeAgent");
663+
const driver = ProviderDriverKind.make("claudeAgent");
664+
const calls: ModelSelection[] = [];
665+
const instance = {
666+
instanceId: claude,
667+
driverKind: driver,
668+
continuationIdentity: { driverKind: driver, continuationKey: claude },
669+
displayName: undefined,
670+
enabled: true,
671+
snapshot: {
672+
getSnapshot: Effect.succeed<ServerProvider>({
673+
instanceId: claude,
674+
driver,
675+
enabled: true,
676+
installed: true,
677+
status: "ready",
678+
auth: { status: "authenticated" },
679+
version: null,
680+
checkedAt: "1970-01-01T00:00:00Z",
681+
models: [],
682+
slashCommands: [],
683+
skills: [],
684+
}),
685+
} as ProviderInstance["snapshot"],
686+
orchestrationAdapter: {} as ProviderInstance["orchestrationAdapter"],
687+
textGeneration: TextGeneration.TextGeneration.of({
688+
generateCommitMessage: () => Effect.die("unused"),
689+
generatePrContent: () => Effect.die("unused"),
690+
generateBranchName: () => Effect.die("unused"),
691+
generateThreadTitle: () => Effect.die("unused"),
692+
generateTranscriptionPostProcessing: () => Effect.die("unused"),
693+
generateReviewGuide: (input) =>
694+
Effect.sync(() => {
695+
calls.push(input.modelSelection);
696+
return {} as TextGeneration.ReviewGuideGenerationResult;
697+
}),
698+
}),
699+
} satisfies ProviderInstance;
700+
const service = yield* TextGeneration.make.pipe(
701+
Effect.provide(
702+
Layer.mergeAll(
703+
Layer.mock(ProviderInstanceRegistry.ProviderInstanceRegistry)({
704+
listInstances: Effect.succeed([instance]),
705+
getInstance: (id) => Effect.succeed(id === claude ? instance : undefined),
706+
}),
707+
ServerSettings.layerTest({}),
708+
Layer.mock(TextGenerators.TextGenerators)({
709+
runner: () => Effect.succeed(() => Effect.die("a text generator cannot investigate")),
710+
}),
711+
Layer.mock(SourceControlProviderRegistry.SourceControlProviderRegistry)({
712+
resolveLink: () => Effect.die("unused"),
713+
}),
714+
),
715+
),
716+
);
717+
yield* service.generateReviewGuide({
718+
cwd: "/tmp",
719+
number: 1,
720+
title: "Change",
721+
description: "",
722+
baseBranch: "main",
723+
baseCommit: "abc",
724+
settledReview: "",
725+
modelSelection: { instanceId: ProviderInstanceId.make("openrouter"), model: "some/model" },
726+
});
727+
expect(calls.map((selection) => selection.instanceId)).toEqual([claude]);
728+
}),
729+
);

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

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ import * as ProviderInstanceRegistry from "../provider/ProviderInstanceRegistry.
2121
import type { ProviderInstance } from "@t3tools/provider-core/server/driver";
2222
import * as SourceControlProviderRegistry from "../sourceControl/SourceControlProviderRegistry.ts";
2323
import * as ThreadTitleLinks from "./ThreadTitleLinks.ts";
24+
import * as TextGenerators from "./TextGenerators.ts";
25+
import * as TextGenerationOperations from "@t3tools/provider-core/server/textGenerationOperations";
2426

2527
export type {
2628
BranchNameGenerationInput,
@@ -75,6 +77,7 @@ export const make = Effect.gen(function* () {
7577
const registry = yield* ProviderInstanceRegistry.ProviderInstanceRegistry;
7678
const sourceControl = yield* SourceControlProviderRegistry.SourceControlProviderRegistry;
7779
const serverSettings = yield* ServerSettings.ServerSettingsService;
80+
const textGenerators = yield* TextGenerators.TextGenerators;
7881
const generate = Effect.fn("TextGeneration.generate")(function* <A>(
7982
operation: TextGenerationOp,
8083
selection: ModelSelection,
@@ -83,6 +86,16 @@ export const make = Effect.gen(function* () {
8386
modelSelection: ModelSelection,
8487
) => Effect.Effect<A, TextGenerationError>,
8588
) {
89+
const textGenerator = yield* textGenerators.runner(selection.instanceId);
90+
// A review guide reaches a text generator only through a fallback; it needs an agent instead.
91+
const textGeneratorCannotRun =
92+
textGenerator !== undefined && operation === "generateReviewGuide";
93+
if (textGenerator !== undefined && !textGeneratorCannotRun) {
94+
return yield* invoke(
95+
TextGenerationOperations.fromRunner("TextGenerator", textGenerator),
96+
selection,
97+
);
98+
}
8699
const snapshots = yield* registry.listInstances.pipe(
87100
Effect.flatMap((instances) =>
88101
Effect.forEach(instances, (instance) => instance.snapshot.getSnapshot),
@@ -92,9 +105,10 @@ export const make = Effect.gen(function* () {
92105
const selected = snapshots.find((provider) => provider.instanceId === selection.instanceId);
93106
// Only a failed probe counts: a pending one is also not installed yet.
94107
const unusable =
95-
selected?.enabled === true &&
96-
selected.status === "error" &&
97-
(!selected.installed || selected.auth.status === "unauthenticated");
108+
textGeneratorCannotRun ||
109+
(selected?.enabled === true &&
110+
selected.status === "error" &&
111+
(!selected.installed || selected.auth.status === "unauthenticated"));
98112
if (unusable || exhaustedUsageWindow(selected, now, selection.model)) {
99113
const settings = yield* serverSettings.getSettings.pipe(
100114
Effect.mapError(
@@ -187,4 +201,6 @@ export const make = Effect.gen(function* () {
187201
});
188202
});
189203

190-
export const layer = Layer.effect(TextGeneration, make);
204+
export const layer = Layer.effect(TextGeneration, make).pipe(
205+
Layer.provideMerge(TextGenerators.layer),
206+
);

0 commit comments

Comments
 (0)