The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 22, 04:30 UTC
fix(web): drafts saved by older versions load instead of being wiped (#29828)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Alex Southwell committed
Nov 3, 2026 at 23:27 UTC
228e2895062459db8b00895d314388fa7df71ff1
2 files changed
+68
-7
apps/web/src/composerDraftStore.test.ts
+46
@@ -2160,6 +2160,52 @@ describe("composerDraftStore model seed migration", () => {
2160
vi.useRealTimers();
2161
}
2162
});
2163
+
2164
+ it("upgrades v5 selections that name a provider and keep options in an object", async () => {
2165
+ vi.useFakeTimers();
2166
+ try {
2167
+ const legacySelection = {
2168
+ provider: "codex",
2169
+ model: "gpt-5.4",
2170
+ options: { reasoningEffort: "high", fastMode: true },
2171
+ };
2172
+ const storage = useComposerDraftStore.persist.getOptions().storage;
2173
+ expect(storage).toBeDefined();
2174
+ storage?.setItem(COMPOSER_DRAFT_STORAGE_KEY, {
2175
+ version: 5,
2176
+ state: {
2177
+ draftsByThreadKey: {
2178
+ [serverThreadKey]: {
2179
+ prompt: "keep this draft",
2180
+ attachments: [],
2181
+ modelSelectionByProvider: { codex: legacySelection },
2182
+ activeProvider: "codex",
2183
+ },
2184
+ },
2185
+ draftThreadsByThreadKey: {},
2186
+ stickyModelSelectionByProvider: { codex: legacySelection },
2187
+ stickyActiveProvider: "codex",
2188
+ },
2189
+ } as never);
2190
+ await vi.advanceTimersByTimeAsync(300);
2191
+
2192
+ await useComposerDraftStore.persist.rehydrate();
2193
+
2194
+ const upgraded = modelSelection(CODEX_DRIVER, "gpt-5.4", {
2195
+ reasoningEffort: "high",
2196
+ fastMode: true,
2197
+ });
2198
+ expect(draftByKey(serverThreadKey)).toMatchObject({
2199
+ prompt: "keep this draft",
2200
+ modelSelectionByProvider: { [CODEX_INSTANCE]: upgraded },
2201
+ });
2202
+ expect(useComposerDraftStore.getState().stickyModelSelectionByProvider).toEqual({
2203
+ [CODEX_INSTANCE]: upgraded,
2204
+ });
2205
+ } finally {
2206
+ vi.useRealTimers();
2207
+ }
2208
+ });
2209
});
2210
2211
function createMockStorage() {
apps/web/src/composerDraftStore.ts
+22
-7
@@ -1786,6 +1786,22 @@ function normalizePersistedDraftThreads(
1786
return { draftThreadsByThreadKey, logicalProjectDraftThreadKeyByLogicalProjectKey };
1787
}
1788
1789
+const decodePersistedModelSelection = Schema.decodeUnknownOption(ModelSelection);
1790
+
1791
+/** Storage v3-v5 wrote `provider` and object-shaped options; the schema upgrades both. */
1792
+function normalizePersistedModelSelectionByProvider(
1793
+ value: object,
1794
+): Partial<Record<ProviderInstanceId, ModelSelection>> {
1795
+ return Object.fromEntries(
1796
+ Object.entries(value).flatMap(([instanceId, selection]) =>
1797
+ Option.match(decodePersistedModelSelection(selection), {
1798
+ onNone: () => [],
1799
+ onSome: (decoded) => [[instanceId, decoded] as const],
1800
+ }),
1801
+ ),
1802
+ );
1803
+}
1804
+
1805
function normalizePersistedDraftsByThreadId(
1806
rawDraftMap: unknown,
1807
draftThreadsByThreadKey: PersistedComposerDraftStoreState["draftThreadsByThreadKey"],
@@ -1913,9 +1929,9 @@ function normalizePersistedDraftsByThreadId(
1929
draftCandidate.modelSelectionByProvider &&
1930
typeof draftCandidate.modelSelectionByProvider === "object"
1931
) {
1916
- modelSelectionByProvider = draftCandidate.modelSelectionByProvider as Partial<
1917
- Record<ProviderInstanceId, ModelSelection>
1918
- >;
1932
+ modelSelectionByProvider = normalizePersistedModelSelectionByProvider(
1933
+ draftCandidate.modelSelectionByProvider,
1934
+ );
1935
activeProvider = normalizeProviderInstanceId(draftCandidate.activeProvider);
1936
modelSelectionExplicit = draftCandidate.modelSelectionExplicit === true ? true : undefined;
1937
} else {
@@ -2210,10 +2226,9 @@ function normalizeCurrentPersistedComposerDraftStoreState(
2226
normalizedPersistedState.stickyModelSelectionByProvider &&
2227
typeof normalizedPersistedState.stickyModelSelectionByProvider === "object"
2228
) {
2213
- stickyModelSelectionByProvider =
2214
- normalizedPersistedState.stickyModelSelectionByProvider as Partial<
2215
- Record<ProviderInstanceId, ModelSelection>
2216
- >;
2229
+ stickyModelSelectionByProvider = normalizePersistedModelSelectionByProvider(
2230
+ normalizedPersistedState.stickyModelSelectionByProvider,
2231
+ );
2232
stickyActiveProvider = normalizeProviderInstanceId(
2233
normalizedPersistedState.stickyActiveProvider,
2234
);