Skip to content

Commit 3ea3576

Browse files
committed
fix(composer): retain each repeated explicit pick until its reply
1 parent 5e8ca8f commit 3ea3576

2 files changed

Lines changed: 46 additions & 42 deletions

File tree

‎apps/web/src/composerDraftStore.test.ts‎

Lines changed: 39 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1601,28 +1601,45 @@ describe("composerDraftStore modelSelection", () => {
16011601
expect(draftFor(threadId, TEST_ENVIRONMENT_ID)).toBe(latest);
16021602
});
16031603

1604-
it("releases an accepted pick only while it is still the draft's latest choice", () => {
1605-
const store = useComposerDraftStore.getState();
1606-
store.setModelSelection(threadRef, modelSelection(CODEX_DRIVER, "gpt-5.5"), {
1607-
explicit: true,
1608-
});
1609-
const first = draftFor(threadId, TEST_ENVIRONMENT_ID)!.modelSelectionByProvider[
1610-
CODEX_INSTANCE
1611-
]!;
1612-
store.setModelSelection(threadRef, modelSelection(CODEX_DRIVER, "gpt-5.4"), {
1613-
explicit: true,
1614-
});
1615-
store.setModelSelection(threadRef, modelSelection(CODEX_DRIVER, "gpt-5.5"), {
1616-
explicit: true,
1617-
});
1618-
const latest = draftFor(threadId, TEST_ENVIRONMENT_ID)!;
1619-
1620-
// An older acknowledgement of the same model is not the latest pick.
1621-
store.releaseModelSelection(threadRef, first);
1622-
expect(draftFor(threadId, TEST_ENVIRONMENT_ID)).toBe(latest);
1623-
store.releaseModelSelection(threadRef, latest.modelSelectionByProvider[CODEX_INSTANCE]!);
1624-
expect(draftFor(threadId, TEST_ENVIRONMENT_ID)).toBeUndefined();
1625-
});
1604+
it.each(["consecutive model", "consecutive options", "returning model"] as const)(
1605+
"releases only the latest accepted pick after %s picks",
1606+
(kind) => {
1607+
const store = useComposerDraftStore.getState();
1608+
store.setPrompt(threadRef, "keep this follow-up");
1609+
const select = () => {
1610+
if (kind === "consecutive options") {
1611+
store.setProviderModelOptions(
1612+
threadRef,
1613+
CODEX_DRIVER,
1614+
toSelections({ reasoningEffort: "high" }),
1615+
{ instanceId: CODEX_INSTANCE, model: "gpt-5.5" },
1616+
);
1617+
} else {
1618+
store.setModelSelection(threadRef, modelSelection(CODEX_DRIVER, "gpt-5.5"), {
1619+
explicit: true,
1620+
});
1621+
}
1622+
};
1623+
select();
1624+
const first = draftFor(threadId, TEST_ENVIRONMENT_ID)!.modelSelectionByProvider[
1625+
CODEX_INSTANCE
1626+
]!;
1627+
if (kind === "returning model") {
1628+
store.setModelSelection(threadRef, modelSelection(CODEX_DRIVER, "gpt-5.4"), {
1629+
explicit: true,
1630+
});
1631+
}
1632+
select();
1633+
const latest = draftFor(threadId, TEST_ENVIRONMENT_ID)!;
1634+
1635+
store.releaseModelSelection(threadRef, first);
1636+
expect(draftFor(threadId, TEST_ENVIRONMENT_ID)).toBe(latest);
1637+
store.releaseModelSelection(threadRef, latest.modelSelectionByProvider[CODEX_INSTANCE]!);
1638+
expect(draftFor(threadId, TEST_ENVIRONMENT_ID)?.modelSelectionExplicit).toBeUndefined();
1639+
expect(draftFor(threadId, TEST_ENVIRONMENT_ID)?.modelSelectionByProvider).toEqual({});
1640+
expect(draftFor(threadId, TEST_ENVIRONMENT_ID)?.prompt).toBe("keep this follow-up");
1641+
},
1642+
);
16261643

16271644
it("releases an inactive thread pick only after its queued model becomes durable", () => {
16281645
const store = useComposerDraftStore.getState();

‎apps/web/src/composerDraftStore.ts‎

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3040,9 +3040,10 @@ const composerDraftStore = create<ComposerDraftStoreState>()(
30403040
}
30413041
const nextActiveProvider = normalized?.instanceId ?? base.activeProvider;
30423042
if (
3043+
opts?.explicit !== true &&
30433044
Equal.equals(base.modelSelectionByProvider, nextMap) &&
30443045
base.activeProvider === nextActiveProvider &&
3045-
(base.modelSelectionExplicit ?? false) === (opts?.explicit === true)
3046+
!base.modelSelectionExplicit
30463047
) {
30473048
return state;
30483049
}
@@ -3104,16 +3105,11 @@ const composerDraftStore = create<ComposerDraftStoreState>()(
31043105

31053106
const nextMap = { ...base.modelSelectionByProvider };
31063107
const currentForProvider = nextMap[instanceKey];
3107-
if (providerOpts) {
3108-
nextMap[instanceKey] = createModelSelection(
3109-
instanceKey,
3110-
currentForProvider?.model ?? fallbackModel,
3111-
providerOpts,
3112-
);
3113-
} else if (currentForProvider && (currentForProvider.options?.length ?? 0) > 0) {
3114-
const { options: _, ...rest } = currentForProvider;
3115-
nextMap[instanceKey] = rest as ModelSelection;
3116-
}
3108+
nextMap[instanceKey] = createModelSelection(
3109+
instanceKey,
3110+
currentForProvider?.model ?? fallbackModel,
3111+
providerOpts,
3112+
);
31173113

31183114
let nextStickyMap = state.stickyModelSelectionByProvider;
31193115
let nextOptionsByModel = state.stickyOptionsByModelByProvider;
@@ -3155,15 +3151,6 @@ const composerDraftStore = create<ComposerDraftStoreState>()(
31553151
: (base.activeProvider ?? instanceKey);
31563152
}
31573153

3158-
if (
3159-
Equal.equals(base.modelSelectionByProvider, nextMap) &&
3160-
Equal.equals(state.stickyModelSelectionByProvider, nextStickyMap) &&
3161-
Equal.equals(state.stickyOptionsByModelByProvider, nextOptionsByModel) &&
3162-
state.stickyActiveProvider === nextStickyActiveProvider
3163-
) {
3164-
return state;
3165-
}
3166-
31673154
const { modelSelectionExplicit: _previousExplicit, ...restBase } = base;
31683155
const nextDraft: ComposerThreadDraftState = {
31693156
...restBase,

0 commit comments

Comments
 (0)