Skip to content

Commit 675876c

Browse files
committed
fix(web): harden next prompt suggestions and scoped settings
1 parent f239f84 commit 675876c

19 files changed

Lines changed: 630 additions & 26 deletions

‎apps/server/src/orchestration-v2/NextPromptSuggestionService.test.ts‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ import {
1414
} from "@t3tools/contracts";
1515
import * as DateTime from "effect/DateTime";
1616
import * as Effect from "effect/Effect";
17+
import * as Deferred from "effect/Deferred";
18+
import * as Fiber from "effect/Fiber";
1719
import * as Layer from "effect/Layer";
1820
import * as Option from "effect/Option";
1921
import * as TestClock from "effect/testing/TestClock";
@@ -359,6 +361,62 @@ describe("NextPromptSuggestionService", () => {
359361
}),
360362
);
361363

364+
it.effect.each(["new message", "rollback"] as const)(
365+
"drops a reply invalidated by %s while the model is generating",
366+
(change) =>
367+
Effect.gen(function* () {
368+
const started = yield* Deferred.make<void>();
369+
const release = yield* Deferred.make<{ suggestion: string }>();
370+
const harness = makeHarness({
371+
generate: () =>
372+
Deferred.succeed(started, undefined).pipe(Effect.andThen(Deferred.await(release))),
373+
});
374+
yield* Effect.gen(function* () {
375+
const suggestions = yield* NextPromptSuggestion.NextPromptSuggestionService;
376+
const { threadId, runId } = yield* seedExchange({
377+
thread: `thread:next:race:${change}`,
378+
user: "Hello",
379+
assistant: "Hi",
380+
});
381+
const pending = yield* suggestions
382+
.suggest({ threadId, afterMessageId: assistantOf(runId) })
383+
.pipe(Effect.forkChild);
384+
yield* Deferred.await(started);
385+
if (change === "new message") {
386+
yield* TestClock.adjust("1 second");
387+
yield* recordRun({
388+
threadId,
389+
runId: RunId.make("run:race:2"),
390+
ordinal: 2,
391+
user: "Actually, stop",
392+
assistant: "Stopped",
393+
});
394+
} else {
395+
const threads = yield* ThreadManagement.ThreadManagementService;
396+
const eventSink = yield* EventSink.EventSinkV2;
397+
const projection = yield* threads.getThreadRecords(threadId, ["runs"]);
398+
const run = projection.runs[0]!;
399+
const now = yield* DateTime.now;
400+
yield* eventSink.write({
401+
events: [
402+
{
403+
id: EventId.make("rollback:in-flight"),
404+
type: "run.updated",
405+
threadId,
406+
runId: run.id,
407+
occurredAt: now,
408+
payload: { ...run, status: "rolled_back" },
409+
},
410+
],
411+
});
412+
}
413+
yield* Deferred.succeed(release, { suggestion: "Stale suggestion" });
414+
assert.deepEqual(yield* Fiber.join(pending), { suggestion: null });
415+
assert.equal(harness.generateNextPrompt.mock.calls.length, 1);
416+
}).pipe(Effect.provide(harness.layer));
417+
}),
418+
);
419+
362420
it.effect("returns no suggestion when generation fails", () =>
363421
Effect.gen(function* () {
364422
const harness = makeHarness({

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

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,17 +37,17 @@ const make = Effect.gen(function* () {
3737
const serverSettings = yield* ServerSettings.ServerSettingsService;
3838
const textGeneration = yield* TextGeneration.TextGeneration;
3939

40-
const suggest: NextPromptSuggestionService["Service"]["suggest"] = Effect.fn(
41-
"NextPromptSuggestionService.suggest",
42-
)(function* (input) {
40+
const readContext = Effect.fn("NextPromptSuggestionService.readContext")(function* (
41+
input: OrchestrationV2SuggestNextPromptInput,
42+
) {
4343
const projection = yield* threads.getThreadRecords(input.threadId, ["messages", "runs"], {
4444
messageRoles: ["user", "assistant"],
4545
});
4646
const settings = resolveProjectSettings(
4747
yield* serverSettings.getSettings,
4848
projection.thread.projectId,
4949
).settings;
50-
if (!settings.nextPromptSuggestionsEnabled) return NO_SUGGESTION;
50+
if (!settings.nextPromptSuggestionsEnabled) return null;
5151

5252
const rolledBack = new Set(
5353
projection.runs.filter((run) => run.status === "rolled_back").map((run) => run.id),
@@ -57,15 +57,24 @@ const make = Effect.gen(function* () {
5757
);
5858
// A newer message, or a rollback, means the user has moved on from the reply this was asked for.
5959
const latest = messages.at(-1);
60-
if (latest?.id !== input.afterMessageId || latest.role !== "assistant") return NO_SUGGESTION;
60+
if (latest?.id !== input.afterMessageId || latest.role !== "assistant") return null;
61+
62+
return { projection, settings, messages };
63+
});
6164

65+
const suggest: NextPromptSuggestionService["Service"]["suggest"] = Effect.fn(
66+
"NextPromptSuggestionService.suggest",
67+
)(function* (input) {
68+
const source = yield* readContext(input);
69+
if (source === null) return NO_SUGGESTION;
70+
const { projection, settings, messages } = source;
6271
const context = formatThreadTitleContext(messages);
6372
if (context.message.length === 0) return NO_SUGGESTION;
6473

6574
const project = yield* projects.get(projection.thread.projectId);
6675
if (Option.isNone(project)) return NO_SUGGESTION;
6776

68-
return yield* textGeneration
77+
const result = yield* textGeneration
6978
.generateNextPrompt({
7079
cwd: projection.thread.worktreePath ?? project.value.workspaceRoot,
7180
message: context.message,
@@ -83,6 +92,8 @@ const make = Effect.gen(function* () {
8392
}).pipe(Effect.as({ suggestion: null })),
8493
),
8594
);
95+
if (result.suggestion === null) return NO_SUGGESTION;
96+
return (yield* readContext(input)) === null ? NO_SUGGESTION : result;
8697
});
8798

8899
return NextPromptSuggestionService.of({ suggest });

‎apps/server/src/orchestration-v2/ProviderEventIngestor.test.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,7 @@ it.effect("refreshes the failing instance snapshot after a committed usage_limit
255255
generateBranchName: () => Effect.die("unused"),
256256
generateCommitMessage: () => Effect.die("unused"),
257257
generatePrContent: () => Effect.die("unused"),
258+
generateNextPrompt: () => Effect.die("unused"),
258259
generateThreadTitle: () => Effect.die("unused"),
259260
generateReviewGuide: () => Effect.die("unused"),
260261
},

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -490,6 +490,7 @@ it.effect.each([false, true])("text generation preflight: exhausted=%s", (exhaus
490490
generatePrContent: () => Effect.die("unused"),
491491
generateBranchName: () => Effect.die("unused"),
492492
generateReviewGuide: () => Effect.die("unused"),
493+
generateNextPrompt: () => Effect.die("unused"),
493494
generateThreadTitle: (input) =>
494495
Effect.sync(() => {
495496
calls.push(input.modelSelection);
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
import { describe, expect, it, vi } from "@effect/vitest";
2+
import { ProviderDriverKind, ProviderInstanceId, type ServerProvider } from "@t3tools/contracts";
3+
import type { ProviderInstance } from "@t3tools/provider-core/server/driver";
4+
import * as Effect from "effect/Effect";
5+
import * as Layer from "effect/Layer";
6+
7+
import * as ProviderInstanceRegistry from "../provider/ProviderInstanceRegistry.ts";
8+
import * as ServerSettings from "../serverSettings.ts";
9+
import * as SourceControlProviderRegistry from "../sourceControl/SourceControlProviderRegistry.ts";
10+
import * as TextGeneration from "./TextGeneration.ts";
11+
12+
function snapshot(id: string, driver: string): ServerProvider {
13+
return {
14+
instanceId: ProviderInstanceId.make(id),
15+
driver: ProviderDriverKind.make(driver),
16+
enabled: true,
17+
installed: true,
18+
status: "ready",
19+
version: null,
20+
auth: { status: "authenticated" },
21+
checkedAt: "2026-10-29T00:00:00.000Z",
22+
models: [],
23+
slashCommands: [],
24+
skills: [],
25+
};
26+
}
27+
28+
describe("next prompt text generation routing", () => {
29+
it.effect("uses the normal fallback when the selected provider has exhausted its allowance", () =>
30+
Effect.gen(function* () {
31+
const selected = snapshot("codex", "codex");
32+
const fallback = snapshot("claudeAgent", "claudeAgent");
33+
const generateSelected = vi.fn(() => Effect.succeed({ suggestion: "Selected" }));
34+
const generateFallback = vi.fn(() => Effect.succeed({ suggestion: "Fallback" }));
35+
const instances = [selected, fallback].map(
36+
(provider, index) =>
37+
({
38+
instanceId: provider.instanceId,
39+
snapshot: {
40+
getSnapshot: Effect.succeed(
41+
index === 0
42+
? {
43+
...provider,
44+
usageLimits: {
45+
checkedAt: provider.checkedAt,
46+
windows: [
47+
{
48+
id: "session",
49+
label: "Session",
50+
kind: "session",
51+
usedPercent: 100,
52+
resetsAt: null,
53+
},
54+
],
55+
},
56+
}
57+
: provider,
58+
),
59+
},
60+
textGeneration: {
61+
generateNextPrompt: index === 0 ? generateSelected : generateFallback,
62+
},
63+
}) as unknown as ProviderInstance,
64+
);
65+
const layer = Layer.mergeAll(
66+
Layer.mock(ProviderInstanceRegistry.ProviderInstanceRegistry)({
67+
listInstances: Effect.succeed(instances),
68+
getInstance: (id) =>
69+
Effect.succeed(instances.find((instance) => instance.instanceId === id)),
70+
}),
71+
Layer.mock(SourceControlProviderRegistry.SourceControlProviderRegistry)({
72+
resolveLink: () => Effect.die("unused"),
73+
}),
74+
ServerSettings.layerTest({
75+
providerInstances: {
76+
[selected.instanceId]: { driver: selected.driver, enabled: true, config: {} },
77+
[fallback.instanceId]: { driver: fallback.driver, enabled: true, config: {} },
78+
},
79+
}),
80+
);
81+
const service = yield* TextGeneration.make.pipe(Effect.provide(layer));
82+
const result = yield* service.generateNextPrompt({
83+
cwd: "/repo",
84+
message: "User: hello",
85+
instructions: "Keep it short",
86+
modelSelection: { instanceId: selected.instanceId, model: "gpt-6.1-sol" },
87+
});
88+
expect(result).toEqual({ suggestion: "Fallback" });
89+
expect(generateSelected).not.toHaveBeenCalled();
90+
expect(generateFallback).toHaveBeenCalledWith(
91+
expect.objectContaining({
92+
instructions: "Keep it short",
93+
modelSelection: expect.objectContaining({ instanceId: fallback.instanceId }),
94+
}),
95+
);
96+
}),
97+
);
98+
});

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ export const make = Effect.gen(function* () {
146146
);
147147
}),
148148
generateNextPrompt: Effect.fn("TextGeneration.generateNextPrompt")(function (input) {
149-
return resolveInstance(registry, "generateNextPrompt", input.modelSelection.instanceId).pipe(
150-
Effect.flatMap((textGeneration) => textGeneration.generateNextPrompt(input)),
149+
return generate("generateNextPrompt", input.modelSelection, (service, modelSelection) =>
150+
service.generateNextPrompt({ ...input, modelSelection }),
151151
);
152152
}),
153153
generateReviewGuide: Effect.fn("TextGeneration.generateReviewGuide")(function (input) {

‎apps/web/src/components/chat/ChatComposer.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2191,7 +2191,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
21912191
!showPlanFollowUpPrompt &&
21922192
!projectSelectionRequired &&
21932193
!showProviderUnavailable &&
2194-
!isConnecting
2194+
environmentUnavailable === null
21952195
? { text: nextPrompt.suggestion, dismiss: nextPrompt.dismiss }
21962196
: null;
21972197

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
import { DraftId } from "../../composerDraftStore";
2+
import { describe, expect, it, vi } from "vite-plus/test";
3+
4+
import { composerCommandKeyHandler } from "./composerCommandKey";
5+
6+
function setup() {
7+
const dismiss = vi.fn();
8+
const submit = vi.fn();
9+
const saveDraft = vi.fn();
10+
const promptRef = { current: "" };
11+
const handler = composerCommandKeyHandler({
12+
keybindings: [],
13+
sendShortcut: "enter",
14+
routeKind: "draft",
15+
phase: "ready",
16+
isCompacting: false,
17+
followUpBehavior: "queue",
18+
isSoftwareKeyboardOpen: false,
19+
planModeUiEnabled: false,
20+
isLiteralPendingAnswer: false,
21+
pendingUserInputs: [],
22+
promptHistoryMessages: [],
23+
promptHistoryPositionRef: { current: null },
24+
composerDraftTarget: DraftId.make("draft"),
25+
promptRef,
26+
composerImagesRef: { current: [] },
27+
composerFilesRef: { current: [] },
28+
composerTerminalContextsRef: { current: [] },
29+
composerPreviewAnnotations: [],
30+
composerReviewComments: [],
31+
promptSuggestion: { text: "Run tests", dismiss },
32+
composerEditorRef: { current: null },
33+
composerMenuOpenRef: { current: false },
34+
composerMenuItemsRef: { current: [] },
35+
activeComposerMenuItemRef: { current: null },
36+
setComposerDraftPrompt: saveDraft,
37+
setComposerCursor: vi.fn(),
38+
setComposerTrigger: vi.fn(),
39+
setComposerHighlightedItemId: vi.fn(),
40+
dismissComposerTrigger: vi.fn(),
41+
toggleInteractionMode: vi.fn(),
42+
nudgeComposerMenuHighlight: vi.fn(),
43+
onSelectComposerItem: vi.fn(),
44+
resolveActiveComposerTrigger: () => ({ trigger: null }),
45+
readComposerSnapshot: () => ({ value: "" }),
46+
applyPromptReplacement: () => false,
47+
submitComposer: submit,
48+
});
49+
return { handler, dismiss, submit, saveDraft, promptRef };
50+
}
51+
52+
describe("next prompt keyboard acceptance", () => {
53+
it.each(["Tab", "ArrowRight"])("accepts and consumes on %s without sending", (key) => {
54+
const { handler, dismiss, submit, saveDraft, promptRef } = setup();
55+
expect(
56+
handler(key, {
57+
key,
58+
shiftKey: false,
59+
altKey: false,
60+
metaKey: false,
61+
ctrlKey: false,
62+
isComposing: false,
63+
} as KeyboardEvent),
64+
).toBe(true);
65+
expect(promptRef.current).toBe("Run tests");
66+
expect(saveDraft).toHaveBeenCalledWith(DraftId.make("draft"), "Run tests");
67+
expect(dismiss).toHaveBeenCalledOnce();
68+
expect(submit).not.toHaveBeenCalled();
69+
});
70+
71+
it("dismisses on Escape without changing or sending the draft", () => {
72+
const { handler, dismiss, submit, saveDraft } = setup();
73+
expect(
74+
handler("Escape", {
75+
key: "Escape",
76+
shiftKey: false,
77+
altKey: false,
78+
metaKey: false,
79+
ctrlKey: false,
80+
isComposing: false,
81+
} as KeyboardEvent),
82+
).toBe(true);
83+
expect(dismiss).toHaveBeenCalledOnce();
84+
expect(saveDraft).not.toHaveBeenCalled();
85+
expect(submit).not.toHaveBeenCalled();
86+
});
87+
});

‎apps/web/src/components/chat/composerCommandKey.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ export function composerCommandKeyHandler(input: {
202202
const plain = !event.shiftKey && !event.altKey && !event.metaKey && !event.ctrlKey;
203203
// Accepting only fills the draft; the user still reviews it and sends.
204204
if (plain && (key === "Tab" || key === "ArrowRight")) {
205+
promptSuggestion.dismiss();
205206
replacePromptFromHistory(promptSuggestion.text);
206207
return true;
207208
}

0 commit comments

Comments
 (0)