Skip to content

Commit 32d7785

Browse files
committed
fix(mobile): stored follow-ups from older builds no longer carry a stale model
Older builds stored this client's cached thread model on every queued follow-up. Mark stored models as picks and drop an unmarked one from a follow-up when reading it, so its delivery leaves the model to the server. Delivery also skips the client-side availability check without a pick: the server checks the thread's own model, which a just-reconnected client can misreport.
1 parent bec335e commit 32d7785

4 files changed

Lines changed: 69 additions & 8 deletions

File tree

‎apps/mobile/src/state/thread-outbox-model.ts‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,9 @@ export const QueuedThreadMessageSchema = Schema.Struct({
5454
context: Schema.optional(OrchestrationMessageContext),
5555
attachments: Schema.Array(DraftComposerAttachmentSchema),
5656
modelSelection: Schema.optional(ModelSelection),
57+
// Written with every stored model since follow-ups carry only the user's pick. Entries without it
58+
// come from builds that stored this client's cached thread model on every follow-up.
59+
modelPicked: Schema.optional(Schema.Literal(true)),
5760
dispatchMode: Schema.optional(Schema.Literals(["auto", "queue", "steer", "restart"])),
5861
runtimeMode: Schema.optional(RuntimeMode),
5962
interactionMode: Schema.optional(ProviderInteractionMode),
@@ -131,12 +134,16 @@ export function encodeQueuedThreadMessage(message: QueuedThreadMessage): unknown
131134
return encodeStoredQueuedThreadMessage({
132135
schemaVersion: THREAD_OUTBOX_SCHEMA_VERSION,
133136
...message,
137+
...(message.modelSelection === undefined ? {} : { modelPicked: true as const }),
134138
});
135139
}
136140

137141
export function decodeQueuedThreadMessage(value: unknown): QueuedThreadMessage {
138-
const { schemaVersion: _, ...message } = decodeStoredQueuedThreadMessage(value);
139-
return message;
142+
const { schemaVersion: _, modelPicked, ...message } = decodeStoredQueuedThreadMessage(value);
143+
if (message.creation !== undefined || modelPicked === true) return message;
144+
// Possibly a stale cached model rather than a pick: let the server use the thread's own.
145+
const { modelSelection: _unconfirmed, ...followUp } = message;
146+
return followUp;
140147
}
141148

142149
export function groupQueuedThreadMessages(

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,37 @@ describe("thread outbox", () => {
137137
decodeQueuedThreadMessage(JSON.parse(JSON.stringify(encodeQueuedThreadMessage(message)))),
138138
).toEqual(message);
139139
});
140+
it("keeps a picked follow-up model through a persisted round trip", () => {
141+
const message: QueuedThreadMessage = {
142+
...queuedMessage({ messageId: "picked-model", createdAt: "2026-10-23T23:00:00.000Z" }),
143+
modelSelection: { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5.6-sol" },
144+
};
145+
146+
expect(
147+
decodeQueuedThreadMessage(JSON.parse(JSON.stringify(encodeQueuedThreadMessage(message)))),
148+
).toEqual(message);
149+
});
150+
151+
it("drops the model an older build stored on a follow-up, so the server keeps the thread's own", () => {
152+
const stale = { instanceId: "claudeAgent", model: "claude-opus-5-5" };
153+
const base = queuedMessage({ messageId: "older-entry", createdAt: "2026-10-23T23:00:00.000Z" });
154+
const stored = { schemaVersion: 3, ...base, modelSelection: stale };
155+
156+
expect(decodeQueuedThreadMessage(stored)).toEqual(base);
157+
// A new thread needs its model, so an older creation entry keeps it.
158+
const creation = {
159+
projectId: ProjectId.make("project-1"),
160+
workspaceMode: "local" as const,
161+
branch: null,
162+
worktreePath: null,
163+
};
164+
expect(decodeQueuedThreadMessage({ ...stored, creation })).toEqual({
165+
...base,
166+
modelSelection: stale,
167+
creation,
168+
});
169+
});
170+
140171
it.each(["read", "json", "schema"] as const)(
141172
"recovers usable messages without permitting cleanup after a record %s failure",
142173
async (failure) => {

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

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ const state = vi.hoisted(() => ({
2222
interaction: vi.fn(),
2323
prepare: vi.fn(),
2424
checkout: vi.fn(),
25+
cachedModelUnavailable: false,
2526
manager: null as unknown as ReturnType<
2627
typeof import("./thread-outbox-manager").createThreadOutboxManager
2728
>,
@@ -82,7 +83,10 @@ vi.mock("./threads", async () => {
8283
});
8384
vi.mock("./use-atom-command", () => ({ useAtomCommand: <A>(command: A) => command }));
8485
vi.mock("./git", () => ({ gitEnvironment: { preparePullRequestThread: state.checkout } }));
85-
vi.mock("../lib/modelOptions", () => ({ isModelSelectionUnavailable: () => false }));
86+
vi.mock("../lib/modelOptions", () => ({
87+
isModelSelectionUnavailable: () => state.cachedModelUnavailable,
88+
describeUnavailableModelSelection: () => ({ title: "Unavailable", detail: "Pick another model" }),
89+
}));
8690
vi.mock("../lib/uuid", () => ({ uuidv4: () => "uuid", randomHex: () => "abcd" }));
8791
vi.mock("../lib/attachmentUpload", () => ({ prepareTurnAttachments: state.prepare }));
8892
vi.mock("./use-remote-environment-registry", () => ({
@@ -173,6 +177,7 @@ function runDrain() {
173177
beforeEach(() => {
174178
state.grantedEnvironments = new Set(["primary"]);
175179
state.draftText = "Keep this draft separate";
180+
state.cachedModelUnavailable = false;
176181
appAtomRegistry.set(state.manager.queuedMessagesByThreadKeyAtom, {});
177182
appAtomRegistry.set(dispatchingQueuedMessageIdAtom, null);
178183
for (const command of [
@@ -295,6 +300,17 @@ describe("queued follow-up model", () => {
295300
expect(state.start.mock.calls[0]?.[0].input).not.toHaveProperty("modelSelection");
296301
});
297302

303+
it("delivers a follow-up without a pick even when this client's copy of the thread model looks unavailable", async () => {
304+
state.grantedEnvironments.add("secondary");
305+
state.cachedModelUnavailable = true;
306+
await state.manager.enqueue(message());
307+
308+
await runDrain();
309+
310+
expect(state.start).toHaveBeenCalledOnce();
311+
expect(remaining()).toEqual([]);
312+
});
313+
298314
it("delivers the model the user picked with the follow-up", async () => {
299315
state.grantedEnvironments.add("secondary");
300316
const picked = { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5.6-sol" };

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,13 @@ export function useThreadOutboxDrain(): void {
743743
);
744744
if (!serverConfig) return false;
745745
const settings = resolveQueuedThreadSettings(queuedMessage, thread, serverConfig.providers);
746-
if (isModelSelectionUnavailable(serverConfig, settings.modelSelection, thread.projectId)) {
746+
// Without a pick the server delivers on the thread's own model, which this client's copy
747+
// of the thread can misreport right after reconnecting; the server checks that one itself.
748+
const picked = queuedMessage.modelSelection !== undefined;
749+
if (
750+
picked &&
751+
isModelSelectionUnavailable(serverConfig, settings.modelSelection, thread.projectId)
752+
) {
747753
const { title, detail } = describeUnavailableModelSelection(
748754
serverConfig,
749755
settings.modelSelection,
@@ -827,7 +833,10 @@ export function useThreadOutboxDrain(): void {
827833
serverEnvironment.configValueAtom(queuedMessage.environmentId),
828834
);
829835
if (!currentConfig) return false;
830-
if (isModelSelectionUnavailable(currentConfig, settings.modelSelection, thread.projectId)) {
836+
if (
837+
picked &&
838+
isModelSelectionUnavailable(currentConfig, settings.modelSelection, thread.projectId)
839+
) {
831840
const { title, detail } = describeUnavailableModelSelection(
832841
currentConfig,
833842
settings.modelSelection,
@@ -861,9 +870,7 @@ export function useThreadOutboxDrain(): void {
861870
),
862871
attachments: prepared.attachments,
863872
},
864-
...(queuedMessage.modelSelection === undefined
865-
? {}
866-
: { modelSelection: sendSettings.modelSelection }),
873+
...(picked ? { modelSelection: sendSettings.modelSelection } : {}),
867874
titleSeed: deriveThreadTitleSeed({
868875
text: queuedMessage.text,
869876
attachments: queuedMessage.attachments,

0 commit comments

Comments
 (0)