Skip to content

Commit 77eac40

Browse files
fix(mobile): keep a model pick in the draft until the thread runs on it
Delivery released the draft pick as soon as the server accepted the queued message, so a second follow-up sent before that run started went out on the old thread model. Leave the pick to the existing reconciliation, which keeps it until the authoritative thread matches. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent bff132f commit 77eac40

4 files changed

Lines changed: 0 additions & 46 deletions

File tree

‎apps/mobile/src/state/threadOutboxDelivery.permissions.test.ts‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ vi.mock("./use-composer-drafts", async () => {
154154
replaceComposerDraftAttachments: vi.fn(),
155155
setFreshSessionPending: vi.fn(),
156156
undoComposerDraftMerge: vi.fn(),
157-
releaseDeliveredComposerModelPick: vi.fn(async () => {}),
158157
updateComposerDraftSettings: vi.fn(),
159158
waitForComposerDraftsLoaded: vi.fn(),
160159
};
@@ -164,7 +163,6 @@ import { appAtomRegistry } from "./atom-registry";
164163
import { environmentSession } from "./session";
165164
import { dispatchingQueuedMessageIdAtom, editingQueuedMessageIdsAtom } from "./use-thread-outbox";
166165
import { createThreadOutboxDelivery } from "./threadOutboxDelivery";
167-
import { releaseDeliveredComposerModelPick } from "./use-composer-drafts";
168166

169167
const message = (overrides: Partial<QueuedThreadMessage> = {}): QueuedThreadMessage => ({
170168
environmentId: EnvironmentId.make("secondary"),
@@ -360,10 +358,6 @@ describe("queued follow-up model", () => {
360358

361359
expect(state.start).toHaveBeenCalledOnce();
362360
expect(state.start.mock.calls[0]?.[0].input.modelSelection).toEqual(picked);
363-
expect(releaseDeliveredComposerModelPick).toHaveBeenCalledExactlyOnceWith(
364-
"secondary:thread",
365-
picked,
366-
);
367361
});
368362
});
369363

‎apps/mobile/src/state/threadOutboxDelivery.ts‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ import {
8383
undoComposerDraftMerge,
8484
updateComposerDraftSettings,
8585
waitForComposerDraftsLoaded,
86-
releaseDeliveredComposerModelPick,
8786
} from "./use-composer-drafts";
8887
import {
8988
dispatchingQueuedMessageIdAtom,
@@ -974,12 +973,6 @@ export function createThreadOutboxDelivery(): {
974973
return restoreQueuedMessage(persistedMessage, failure.message);
975974
}
976975
acknowledgedExistingThreadMessageIds.add(persistedMessage.messageId);
977-
if (queuedMessage.modelSelection) {
978-
await releaseDeliveredComposerModelPick(
979-
scopedThreadKey(queuedMessage.environmentId, queuedMessage.threadId),
980-
queuedMessage.modelSelection,
981-
);
982-
}
983976
const delivered =
984977
(await completeQueuedMessageDelivery(
985978
persistedMessage,

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

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@ import {
181181
archiveCloudComposerDrafts,
182182
clearComposerDraftContent,
183183
clearComposerDraftContentState,
184-
releaseDeliveredComposerModelPick,
185184
subscribeComposerDraftModelReconciliation,
186185
clearComposerDraftsEnvironment,
187186
ComposerDraftPersistenceError,
@@ -553,23 +552,6 @@ describe("mobile composer drafts", () => {
553552
expect(getComposerDraftSnapshot(key)).toEqual({ ...before, modelSelection: undefined });
554553
});
555554

556-
it("releases a pick once a message carrying it is delivered", async () => {
557-
const key = "environment-1:thread-1";
558-
const pick = { instanceId: ProviderInstanceId.make("claudeAgent"), model: "claude-opus-5-5" };
559-
setComposerDraftText(key, "next follow-up");
560-
updateComposerDraftSettings(key, { modelSelection: pick, interactionMode: "plan" });
561-
const before = getComposerDraftSnapshot(key);
562-
563-
await releaseDeliveredComposerModelPick(key, { ...pick, model: "claude-sonnet-5-5" });
564-
expect(getComposerDraftSnapshot(key)).toEqual(before);
565-
566-
await releaseDeliveredComposerModelPick(key, {
567-
...pick,
568-
options: [{ id: "fastMode", value: false }],
569-
});
570-
expect(getComposerDraftSnapshot(key)).toEqual({ ...before, modelSelection: undefined });
571-
});
572-
573555
it("retains an unavailable provider pick through differing durable model updates", () => {
574556
const environmentId = EnvironmentId.make("environment-1");
575557
const threadId = ThreadId.make("thread-1");

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1542,21 +1542,6 @@ export function updateComposerDraftSettings(
15421542
});
15431543
}
15441544

1545-
export async function releaseDeliveredComposerModelPick(
1546-
draftKey: string,
1547-
delivered: ModelSelection,
1548-
): Promise<void> {
1549-
await waitForComposerDraftsLoaded();
1550-
updateComposerDrafts((current) => {
1551-
const draft = current[draftKey];
1552-
if (!draft?.modelSelection || !draftModelPickMatchesThread(draft.modelSelection, delivered)) {
1553-
return current;
1554-
}
1555-
const { modelSelection: _modelSelection, ...rest } = draft;
1556-
return withComposerDraft(current, draftKey, rest);
1557-
});
1558-
}
1559-
15601545
/** Lets the thread's model show again once the server accepted this exact pick. */
15611546
export function releaseComposerDraftModelSelection(
15621547
draftKey: string,

0 commit comments

Comments
 (0)