Skip to content

Commit 72d7752

Browse files
committed
fix(clients): keep title regeneration feedback reliable
1 parent e139edc commit 72d7752

4 files changed

Lines changed: 22 additions & 8 deletions

File tree

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

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ import { useUiStateStore } from "../../uiStateStore";
4949
import { type ChatMessage, DEFAULT_INTERACTION_MODE } from "../../types";
5050
import { AlarmClockIcon, CheckCircle2Icon } from "lucide-react";
5151
import { stackedThreadToast, toastManager } from "../ui/toast";
52+
import { titleRegenerationToast } from "../threadTitleRegenerationToast";
5253
import { newMessageId } from "~/lib/utils";
5354
import { buildThreadRouteParams } from "../../threadRoutes";
5455
import { composerDraftHasUserContent, useComposerDraftStore } from "../../composerDraftStore";
@@ -186,6 +187,9 @@ export function useThreadLifecycle(input: ThreadLifecycleInput) {
186187
const updateThreadMetadata = useOrchestrationCommand(threadEnvironment.updateMetadata, {
187188
reportFailure: false,
188189
});
190+
const regenerateThreadTitle = useOrchestrationCommand(threadEnvironment.regenerateTitle, {
191+
reportFailure: false,
192+
});
189193
const startThreadTurn = useOrchestrationCommand(threadEnvironment.startTurn, {
190194
reportFailure: false,
191195
});
@@ -688,10 +692,13 @@ export function useThreadLifecycle(input: ThreadLifecycleInput) {
688692
if (!readEnvironmentScope(environmentId, AuthOrchestrationOperateScope)) return false;
689693
if (!activeThreadShell || !activeThreadRef || !serverConfigLoaded) return;
690694
if (activeThreadShell.titleRegeneration != null) return;
691-
void updateThreadMetadata({
695+
void regenerateThreadTitle({
692696
environmentId: activeThreadRef.environmentId,
693-
input: { threadId: activeThreadRef.threadId, regenerateTitle: true },
694-
}).then(toastThreadActionFailure("Failed to regenerate thread title"));
697+
input: { threadId: activeThreadRef.threadId },
698+
}).then((result) => {
699+
const toast = titleRegenerationToast([result]);
700+
if (toast) toastManager.add(toast);
701+
});
695702
},
696703
} satisfies ChatShortcutCommands;
697704
return {

‎packages/client-runtime/src/state/threadCommands.test.ts‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,9 @@ const makeHarness = Effect.fn("TestThreadCommands.makeHarness")(function* (optio
155155
),
156156
),
157157
);
158-
const snapshotAtom = Atom.family((_environmentId: EnvironmentId) => Atom.make(SNAPSHOT));
158+
const snapshotAtom = Atom.family((_environmentId: EnvironmentId) =>
159+
Atom.make<OrchestrationV2ShellSnapshot | null>(SNAPSHOT),
160+
);
159161
const commands = createThreadEnvironmentAtoms(runtime, snapshotAtom);
160162
const registry = AtomRegistry.make();
161163
yield* Effect.addFinalizer(() => Effect.sync(() => registry.dispose()));
@@ -295,6 +297,7 @@ describe("title regeneration", () => {
295297
completedAt: NOW,
296298
};
297299

300+
h.registry.set(source, null);
298301
const result = h.commands.regenerateTitle.run(h.registry, target);
299302
const request = yield* Queue.take(h.requests);
300303
const requestId = request.command.commandId;
@@ -314,9 +317,11 @@ describe("title regeneration", () => {
314317
h.registry.set(source, {
315318
...SNAPSHOT,
316319
snapshotSequence: 3,
317-
threads: [
320+
threads: [],
321+
archivedThreads: [
318322
{
319323
...thread,
324+
archivedAt: NOW,
320325
titleRegeneration: null,
321326
lastTitleRegeneration: {
322327
requestId,

‎packages/client-runtime/src/state/threadTitleRegeneration.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,11 @@ function settledOutcome(
2121
snapshot: OrchestrationV2ShellSnapshot | null,
2222
request: TitleRegenerationRequest,
2323
): ThreadTitleRegenerationOutcome | null | undefined {
24-
if (snapshot === null) return null;
24+
if (snapshot === null) return undefined;
2525
if (snapshot.snapshotSequence < request.sequence) return undefined;
26-
const thread = snapshot.threads.find((candidate) => candidate.id === request.threadId);
26+
const thread =
27+
snapshot.threads.find((candidate) => candidate.id === request.threadId) ??
28+
snapshot.archivedThreads.find((candidate) => candidate.id === request.threadId);
2729
if (thread === undefined) return null;
2830
const last = thread.lastTitleRegeneration;
2931
if (last?.requestId === request.requestId) {

‎packages/contracts/src/orchestratorMcp.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ export const OrchestratorMcpThreadDetail = Schema.Struct({
447447
linkedPullRequest: Schema.NullOr(ThreadLinkedPullRequest),
448448
pullRequests: Schema.optional(Schema.Array(OrchestratorMcpThreadPullRequest)),
449449
titleRegeneration: Schema.NullOr(ThreadTitleRegeneration),
450-
lastTitleRegeneration: Schema.NullOr(LastThreadTitleRegeneration),
450+
lastTitleRegeneration: Schema.optional(Schema.NullOr(LastThreadTitleRegeneration)),
451451
branch: Schema.NullOr(Schema.String),
452452
worktreePath: Schema.NullOr(Schema.String),
453453
parentThreadId: Schema.NullOr(ThreadId),

0 commit comments

Comments
 (0)