TypeScript
fix(web): drafts saved by older versions load instead of being wiped (#29828)
Alex Southwell228e28950624
diff --git a/apps/web/src/composerDraftStore.test.ts b/apps/web/src/composerDraftStore.test.tsindex d92417ba96d..eee264170e0 100644--- a/apps/web/src/composerDraftStore.test.ts+++ b/apps/web/src/composerDraftStore.test.ts@@ -2160,6 +2160,52 @@ describe("composerDraftStore model seed migration", () => {vi.useRealTimers();}});++ it("upgrades v5 selections that name a provider and keep options in an object", async () => {+ vi.useFakeTimers();+ try {+ const legacySelection = {+ provider: "codex",+ model: "gpt-5.4",+ options: { reasoningEffort: "high", fastMode: true },+ };+ const storage = useComposerDraftStore.persist.getOptions().storage;+ expect(storage).toBeDefined();+ storage?.setItem(COMPOSER_DRAFT_STORAGE_KEY, {+ version: 5,+ state: {+ draftsByThreadKey: {+ [serverThreadKey]: {+ prompt: "keep this draft",+ attachments: [],+ modelSelectionByProvider: { codex: legacySelection },+ activeProvider: "codex",+ },+ },+ draftThreadsByThreadKey: {},+ stickyModelSelectionByProvider: { codex: legacySelection },+ stickyActiveProvider: "codex",+ },+ } as never);+ await vi.advanceTimersByTimeAsync(300);++ await useComposerDraftStore.persist.rehydrate();++ const upgraded = modelSelection(CODEX_DRIVER, "gpt-5.4", {+ reasoningEffort: "high",+ fastMode: true,+ });+ expect(draftByKey(serverThreadKey)).toMatchObject({+ prompt: "keep this draft",+ modelSelectionByProvider: { [CODEX_INSTANCE]: upgraded },+ });+ expect(useComposerDraftStore.getState().stickyModelSelectionByProvider).toEqual({+ [CODEX_INSTANCE]: upgraded,+ });+ } finally {+ vi.useRealTimers();+ }+ });});function createMockStorage() {diff --git a/apps/web/src/composerDraftStore.ts b/apps/web/src/composerDraftStore.tsindex 4e6dfe04a7e..669b186c592 100644--- a/apps/web/src/composerDraftStore.ts+++ b/apps/web/src/composerDraftStore.ts@@ -1786,6 +1786,22 @@ function normalizePersistedDraftThreads(return { draftThreadsByThreadKey, logicalProjectDraftThreadKeyByLogicalProjectKey };}+const decodePersistedModelSelection = Schema.decodeUnknownOption(ModelSelection);++/** Storage v3-v5 wrote `provider` and object-shaped options; the schema upgrades both. */+function normalizePersistedModelSelectionByProvider(+ value: object,+): Partial<Record<ProviderInstanceId, ModelSelection>> {+ return Object.fromEntries(+ Object.entries(value).flatMap(([instanceId, selection]) =>+ Option.match(decodePersistedModelSelection(selection), {+ onNone: () => [],+ onSome: (decoded) => [[instanceId, decoded] as const],+ }),+ ),+ );+}+function normalizePersistedDraftsByThreadId(rawDraftMap: unknown,draftThreadsByThreadKey: PersistedComposerDraftStoreState["draftThreadsByThreadKey"],@@ -1913,9 +1929,9 @@ function normalizePersistedDraftsByThreadId(draftCandidate.modelSelectionByProvider &&typeof draftCandidate.modelSelectionByProvider === "object") {- modelSelectionByProvider = draftCandidate.modelSelectionByProvider as Partial<- Record<ProviderInstanceId, ModelSelection>- >;+ modelSelectionByProvider = normalizePersistedModelSelectionByProvider(+ draftCandidate.modelSelectionByProvider,+ );activeProvider = normalizeProviderInstanceId(draftCandidate.activeProvider);modelSelectionExplicit = draftCandidate.modelSelectionExplicit === true ? true : undefined;} else {@@ -2210,10 +2226,9 @@ function normalizeCurrentPersistedComposerDraftStoreState(normalizedPersistedState.stickyModelSelectionByProvider &&typeof normalizedPersistedState.stickyModelSelectionByProvider === "object") {- stickyModelSelectionByProvider =- normalizedPersistedState.stickyModelSelectionByProvider as Partial<- Record<ProviderInstanceId, ModelSelection>- >;+ stickyModelSelectionByProvider = normalizePersistedModelSelectionByProvider(+ normalizedPersistedState.stickyModelSelectionByProvider,+ );stickyActiveProvider = normalizeProviderInstanceId(normalizedPersistedState.stickyActiveProvider,);