Skip to content

Commit a65a1d4

Browse files
vitalyiegorovclaude
andcommitted
fix(server,mobile): unpicked follow-ups skip monitor updates and goal stops
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent bd05aac commit a65a1d4

6 files changed

Lines changed: 51 additions & 11 deletions

File tree

‎apps/mobile/src/state/use-composer-drafts.test.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -549,17 +549,17 @@ describe("mobile composer drafts", () => {
549549
expect(getComposerDraftSnapshot(key)).toEqual({ ...before, modelSelection: undefined });
550550
});
551551

552-
it("releases a pick once a message carrying it is delivered", () => {
552+
it("releases a pick once a message carrying it is delivered", async () => {
553553
const key = "environment-1:thread-1";
554554
const pick = { instanceId: ProviderInstanceId.make("claudeAgent"), model: "claude-opus-5-5" };
555555
setComposerDraftText(key, "next follow-up");
556556
updateComposerDraftSettings(key, { modelSelection: pick, interactionMode: "plan" });
557557
const before = getComposerDraftSnapshot(key);
558558

559-
releaseDeliveredComposerModelPick(key, { ...pick, model: "claude-sonnet-5-5" });
559+
await releaseDeliveredComposerModelPick(key, { ...pick, model: "claude-sonnet-5-5" });
560560
expect(getComposerDraftSnapshot(key)).toEqual(before);
561561

562-
releaseDeliveredComposerModelPick(key, {
562+
await releaseDeliveredComposerModelPick(key, {
563563
...pick,
564564
options: [{ id: "fastMode", value: false }],
565565
});

‎apps/mobile/src/state/use-composer-drafts.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1443,10 +1443,11 @@ export function updateComposerDraftSettings(
14431443
});
14441444
}
14451445

1446-
export function releaseDeliveredComposerModelPick(
1446+
export async function releaseDeliveredComposerModelPick(
14471447
draftKey: string,
14481448
delivered: ModelSelection,
1449-
): void {
1449+
): Promise<void> {
1450+
await waitForComposerDraftsLoaded();
14501451
updateComposerDrafts((current) => {
14511452
const draft = current[draftKey];
14521453
if (!draft?.modelSelection || !draftModelPickMatchesThread(draft.modelSelection, delivered)) {

‎apps/mobile/src/state/use-thread-outbox-drain.permissions.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ vi.mock("./use-composer-drafts", async () => {
144144
}),
145145
replaceComposerDraftAttachments: vi.fn(),
146146
undoComposerDraftMerge: vi.fn(),
147-
releaseDeliveredComposerModelPick: vi.fn(),
147+
releaseDeliveredComposerModelPick: vi.fn(async () => {}),
148148
updateComposerDraftSettings: vi.fn(),
149149
waitForComposerDraftsLoaded: vi.fn(),
150150
};

‎apps/mobile/src/state/use-thread-outbox-drain.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,7 @@ export function useThreadOutboxDrain(): void {
888888
}
889889
acknowledgedExistingThreadMessageIdsRef.current.add(persistedMessage.messageId);
890890
if (queuedMessage.modelSelection) {
891-
releaseDeliveredComposerModelPick(
891+
await releaseDeliveredComposerModelPick(
892892
scopedThreadKey(queuedMessage.environmentId, queuedMessage.threadId),
893893
queuedMessage.modelSelection,
894894
);

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5479,11 +5479,20 @@ const makeOrchestrator = Effect.fn("orchestrationV2.Orchestrator.layer")(functio
54795479
(command.creationSource === "web" || command.creationSource === "mobile") &&
54805480
command.scheduledTaskId === undefined;
54815481
// A queued pick reaches the thread only when its run starts; unpicked messages behind it follow it.
5482-
const newestQueuedRun =
5483-
shouldQueue && sentByUserFromClient && command.modelSelection === undefined
5484-
? queuedRunsInDeliveryOrder(projection).at(-1)
5482+
// Monitor updates follow whatever runs before them, and a goal stop runs ahead of the queue.
5483+
const newestQueuedPick =
5484+
shouldQueue &&
5485+
sentByUserFromClient &&
5486+
command.modelSelection === undefined &&
5487+
goalStopRunId === undefined
5488+
? queuedRunsInDeliveryOrder(projection).findLast(
5489+
(run) =>
5490+
!followsCurrentConversation(
5491+
projection.messages.find((message) => message.id === run.userMessageId),
5492+
),
5493+
)
54855494
: undefined;
5486-
if (newestQueuedRun) modelSelection = queuedRunModelSelection(projection, newestQueuedRun);
5495+
if (newestQueuedPick) modelSelection = newestQueuedPick.modelSelection;
54875496
const heldRunsToRelease =
54885497
sentByUserFromClient && startsOrQueuesRun && !worktreeSetupUnresolved
54895498
? projection.runs.filter((run) => run.status === "queued" && run.queueHeld === true)

‎apps/server/src/orchestration-v2/testkit/ProviderSwitch.integration.test.ts‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1804,6 +1804,36 @@ describe("orchestration v2 provider switching", () => {
18041804
["queued", CLAUDE_MODEL_SELECTION.instanceId],
18051805
],
18061806
);
1807+
yield* orchestrator.dispatch({
1808+
type: "message.dispatch",
1809+
createdBy: "agent",
1810+
creationSource: "server",
1811+
commandId: CommandId.make("command:queued-unpicked-follow-up:monitor"),
1812+
threadId,
1813+
messageId: MessageId.make("message:queued-unpicked-follow-up:monitor"),
1814+
text: "Monitor update",
1815+
attachments: [],
1816+
dispatchMode: { type: "queue_after_active" },
1817+
notification: { source: { kind: "monitor" }, outcome: "updated", summary: "Update" },
1818+
});
1819+
yield* orchestrator.dispatch({
1820+
type: "message.dispatch",
1821+
createdBy: "user",
1822+
creationSource: "mobile",
1823+
commandId: CommandId.make("command:queued-unpicked-follow-up:after-monitor"),
1824+
threadId,
1825+
messageId: MessageId.make("message:queued-unpicked-follow-up:after-monitor"),
1826+
text: "Follow-up after a monitor update",
1827+
attachments: [],
1828+
dispatchMode: { type: "queue_after_active" },
1829+
});
1830+
const afterMonitor = yield* orchestrator.getThreadProjection(threadId);
1831+
assert.equal(
1832+
afterMonitor.runs.find(
1833+
(run) => run.userMessageId === "message:queued-unpicked-follow-up:after-monitor",
1834+
)?.modelSelection.instanceId,
1835+
CLAUDE_MODEL_SELECTION.instanceId,
1836+
);
18071837
yield* orchestrator.dispatch({
18081838
type: "message.dispatch",
18091839
createdBy: "user",

0 commit comments

Comments
 (0)