Skip to content

Commit e6ca378

Browse files
refactor: rename sticky runtime mode to last-used
Use lastUsed naming for the per-project remembered access mode so it does not collide with machine defaultRuntimeMode. Keep a read path for the old persisted sticky keys. Co-authored-by: Cursor <[email protected]>
1 parent 2cf0041 commit e6ca378

13 files changed

Lines changed: 163 additions & 112 deletions

‎apps/mobile/src/features/threads/new-task-flow-provider.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ import {
5353
scheduleUnusedComposerAttachmentCleanup,
5454
setComposerDraftText,
5555
setStickyComposerModelSelection,
56-
setStickyComposerRuntimeMode,
56+
setLastUsedComposerRuntimeMode,
5757
updateComposerDraftSettings,
5858
useComposerDraft,
5959
useStickyComposerModelSelection,
60-
useStickyComposerRuntimeMode,
60+
useLastUsedComposerRuntimeMode,
6161
} from "../../state/use-composer-drafts";
6262
import { resolveNewThreadRuntimeMode } from "@t3tools/shared/runtimeMode";
6363
import {
@@ -473,10 +473,10 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
473473
selectedEnvironmentServerConfig,
474474
storedStickyModelSelection,
475475
);
476-
const stickyRuntimeMode = useStickyComposerRuntimeMode(selectedProjectKey);
476+
const lastUsedRuntimeMode = useLastUsedComposerRuntimeMode(selectedProjectKey);
477477
const runtimeMode = resolveNewThreadRuntimeMode({
478478
draftRuntimeMode: selectedProjectDraft.runtimeMode,
479-
stickyRuntimeMode,
479+
lastUsedRuntimeMode,
480480
configuredRuntimeMode: selectedEnvironmentServerConfig?.settings.defaultRuntimeMode,
481481
});
482482
const modelOptions = useMemo(
@@ -883,7 +883,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
883883
updateComposerDraftSettings(selectedProjectDraftKey, { runtimeMode: value });
884884
}
885885
if (selectedProjectKey) {
886-
setStickyComposerRuntimeMode(selectedProjectKey, value);
886+
setLastUsedComposerRuntimeMode(selectedProjectKey, value);
887887
}
888888
},
889889
[selectedProjectDraftKey, selectedProjectKey],
@@ -968,7 +968,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
968968
? editingPendingTask?.creation?.projectCwd
969969
: selectedProject.workspaceRoot;
970970
if (selectedProjectKey) {
971-
setStickyComposerRuntimeMode(selectedProjectKey, runtimeMode);
971+
setLastUsedComposerRuntimeMode(selectedProjectKey, runtimeMode);
972972
}
973973
return {
974974
environmentId: selectedProject.environmentId,

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

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -178,9 +178,9 @@ import {
178178
setComposerDraftAttachmentUpload,
179179
waitForComposerDraftsLoaded,
180180
setStickyComposerModelSelection,
181-
setStickyComposerRuntimeMode,
181+
setLastUsedComposerRuntimeMode,
182182
stickyComposerModelSelectionAtom,
183-
stickyComposerRuntimeModeByProjectKeyAtom,
183+
lastUsedComposerRuntimeModeByProjectKeyAtom,
184184
undoComposerDraftMerge,
185185
undoComposerDraftMergeState,
186186
} from "./use-composer-drafts";
@@ -204,7 +204,7 @@ afterEach(() => {
204204
appAtomRegistry.set(composerDraftsAtom, {});
205205
appAtomRegistry.set(composerCloudDraftsAtom, { accountId: null, signedOut: {} });
206206
appAtomRegistry.set(stickyComposerModelSelectionAtom, null);
207-
appAtomRegistry.set(stickyComposerRuntimeModeByProjectKeyAtom, {});
207+
appAtomRegistry.set(lastUsedComposerRuntimeModeByProjectKeyAtom, {});
208208
appAtomRegistry.set(threadOutboxManager.queuedMessagesByThreadKeyAtom, {});
209209
composerAttachmentCleanupMocks.remove.mockClear();
210210
composerAttachmentCleanupMocks.releaseUploads.mockReset();
@@ -213,30 +213,44 @@ afterEach(() => {
213213
incomingShareStorageMocks.load.mockResolvedValue([]);
214214
});
215215

216-
describe("mobile sticky runtime mode", () => {
217-
it("round-trips sticky runtime modes per project", () => {
216+
describe("mobile last-used runtime mode", () => {
217+
it("round-trips last-used runtime modes per project", () => {
218218
expect(
219219
decodePersistedComposerState({
220220
schemaVersion: 1,
221221
drafts: {},
222-
stickyRuntimeModeByProjectKey: {
222+
lastUsedRuntimeModeByProjectKey: {
223223
"env:project-a": "approval-required",
224224
"env:project-b": "auto-accept-edits",
225225
},
226-
}).stickyRuntimeModeByProjectKey,
226+
}).lastUsedRuntimeModeByProjectKey,
227227
).toEqual({
228228
"env:project-a": "approval-required",
229229
"env:project-b": "auto-accept-edits",
230230
});
231231
});
232232

233-
it("stores sticky runtime mode updates in memory", () => {
234-
setStickyComposerRuntimeMode("env:project-a", "approval-required");
235-
expect(appAtomRegistry.get(stickyComposerRuntimeModeByProjectKeyAtom)).toEqual({
233+
it("reads legacy stickyRuntimeModeByProjectKey as last-used", () => {
234+
expect(
235+
decodePersistedComposerState({
236+
schemaVersion: 1,
237+
drafts: {},
238+
stickyRuntimeModeByProjectKey: {
239+
"env:project-a": "approval-required",
240+
},
241+
}).lastUsedRuntimeModeByProjectKey,
242+
).toEqual({
243+
"env:project-a": "approval-required",
244+
});
245+
});
246+
247+
it("stores last-used runtime mode updates in memory", () => {
248+
setLastUsedComposerRuntimeMode("env:project-a", "approval-required");
249+
expect(appAtomRegistry.get(lastUsedComposerRuntimeModeByProjectKeyAtom)).toEqual({
236250
"env:project-a": "approval-required",
237251
});
238-
setStickyComposerRuntimeMode("env:project-a", null);
239-
expect(appAtomRegistry.get(stickyComposerRuntimeModeByProjectKeyAtom)).toEqual({});
252+
setLastUsedComposerRuntimeMode("env:project-a", null);
253+
expect(appAtomRegistry.get(lastUsedComposerRuntimeModeByProjectKeyAtom)).toEqual({});
240254
});
241255
});
242256

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

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,8 @@ const PersistedComposerDraftsSchema = Schema.Struct({
127127
schemaVersion: Schema.Literal(COMPOSER_DRAFTS_SCHEMA_VERSION),
128128
drafts: Schema.Record(Schema.String, ComposerDraftSchema),
129129
stickyModelSelection: Schema.optional(ModelSelectionSchema),
130+
lastUsedRuntimeModeByProjectKey: Schema.optional(Schema.Record(Schema.String, RuntimeModeSchema)),
131+
/** @deprecated Renamed to lastUsedRuntimeModeByProjectKey. */
130132
stickyRuntimeModeByProjectKey: Schema.optional(Schema.Record(Schema.String, RuntimeModeSchema)),
131133
cloudAccountId: Schema.optional(Schema.String),
132134
signedOutDrafts: Schema.optional(
@@ -159,9 +161,9 @@ export const stickyComposerModelSelectionAtom = Atom.make<ModelSelection | null>
159161
Atom.withLabel("mobile:sticky-composer-model-selection"),
160162
);
161163

162-
export const stickyComposerRuntimeModeByProjectKeyAtom = Atom.make<
164+
export const lastUsedComposerRuntimeModeByProjectKeyAtom = Atom.make<
163165
Partial<Record<string, RuntimeMode>>
164-
>({}).pipe(Atom.keepAlive, Atom.withLabel("mobile:sticky-composer-runtime-mode-by-project"));
166+
>({}).pipe(Atom.keepAlive, Atom.withLabel("mobile:last-used-composer-runtime-mode-by-project"));
165167

166168
interface SignedOutDrafts {
167169
readonly drafts: Record<string, ComposerDraft>;
@@ -278,7 +280,7 @@ export function migrateLegacyNewTaskDraft(
278280
export function decodePersistedComposerState(value: unknown): {
279281
readonly drafts: Record<string, ComposerDraft>;
280282
readonly stickyModelSelection: ModelSelection | null;
281-
readonly stickyRuntimeModeByProjectKey: Partial<Record<string, RuntimeMode>>;
283+
readonly lastUsedRuntimeModeByProjectKey: Partial<Record<string, RuntimeMode>>;
282284
readonly cloudDrafts: ComposerCloudDraftState;
283285
} {
284286
const parsed = decodePersistedComposerDraftsDocument(value);
@@ -313,8 +315,8 @@ export function decodePersistedComposerState(value: unknown): {
313315
.filter(([, draft]) => !isEmptyDraft(draft) || (draft.importedShareIds?.length ?? 0) > 0),
314316
),
315317
stickyModelSelection: parsed.stickyModelSelection ?? null,
316-
stickyRuntimeModeByProjectKey: normalizeStickyRuntimeModeByProjectKey(
317-
parsed.stickyRuntimeModeByProjectKey,
318+
lastUsedRuntimeModeByProjectKey: normalizeLastUsedRuntimeModeByProjectKey(
319+
parsed.lastUsedRuntimeModeByProjectKey ?? parsed.stickyRuntimeModeByProjectKey,
318320
),
319321
cloudDrafts: {
320322
accountId: parsed.cloudAccountId ?? null,
@@ -337,7 +339,7 @@ export function decodePersistedComposerState(value: unknown): {
337339
};
338340
}
339341

340-
function normalizeStickyRuntimeModeByProjectKey(
342+
function normalizeLastUsedRuntimeModeByProjectKey(
341343
value: Partial<Record<string, RuntimeMode>> | undefined,
342344
): Partial<Record<string, RuntimeMode>> {
343345
if (!value) {
@@ -371,7 +373,7 @@ async function loadPersistedComposerState(): Promise<
371373
return {
372374
drafts: {},
373375
stickyModelSelection: null,
374-
stickyRuntimeModeByProjectKey: {},
376+
lastUsedRuntimeModeByProjectKey: {},
375377
cloudDrafts: { accountId: null, signedOut: {} },
376378
};
377379
}
@@ -392,8 +394,8 @@ async function loadPersistedComposerState(): Promise<
392394
async function writePersistedComposerState(
393395
drafts: Record<string, ComposerDraft>,
394396
stickyModelSelection: ModelSelection | null,
395-
stickyRuntimeModeByProjectKey: Partial<Record<string, RuntimeMode>> = appAtomRegistry.get(
396-
stickyComposerRuntimeModeByProjectKeyAtom,
397+
lastUsedRuntimeModeByProjectKey: Partial<Record<string, RuntimeMode>> = appAtomRegistry.get(
398+
lastUsedComposerRuntimeModeByProjectKeyAtom,
397399
),
398400
cloudDrafts = appAtomRegistry.get(composerCloudDraftsAtom),
399401
): Promise<void> {
@@ -404,17 +406,17 @@ async function writePersistedComposerState(
404406
const nonEmptyDrafts = Object.fromEntries(
405407
Object.entries(drafts).filter(([, draft]) => !isEmptyDraft(draft)),
406408
);
407-
const stickyRuntimeModes = Object.fromEntries(
408-
Object.entries(stickyRuntimeModeByProjectKey).filter(
409+
const lastUsedRuntimeModes = Object.fromEntries(
410+
Object.entries(lastUsedRuntimeModeByProjectKey).filter(
409411
(entry): entry is [string, RuntimeMode] => entry[1] !== undefined,
410412
),
411413
);
412414
const document = {
413415
schemaVersion: COMPOSER_DRAFTS_SCHEMA_VERSION,
414416
drafts: nonEmptyDrafts,
415417
...(stickyModelSelection ? { stickyModelSelection } : {}),
416-
...(Object.keys(stickyRuntimeModes).length > 0
417-
? { stickyRuntimeModeByProjectKey: stickyRuntimeModes }
418+
...(Object.keys(lastUsedRuntimeModes).length > 0
419+
? { lastUsedRuntimeModeByProjectKey: lastUsedRuntimeModes }
418420
: {}),
419421
...(cloudDrafts.accountId ? { cloudAccountId: cloudDrafts.accountId } : {}),
420422
...(Object.keys(cloudDrafts.signedOut).length > 0
@@ -667,7 +669,7 @@ function schedulePersistComposerState(): void {
667669
await writePersistedComposerState(
668670
appAtomRegistry.get(composerDraftsAtom),
669671
appAtomRegistry.get(stickyComposerModelSelectionAtom),
670-
appAtomRegistry.get(stickyComposerRuntimeModeByProjectKeyAtom),
672+
appAtomRegistry.get(lastUsedComposerRuntimeModeByProjectKeyAtom),
671673
);
672674
persistRetryNeeded = false;
673675
} catch (error) {
@@ -700,10 +702,10 @@ export function ensureComposerDraftsLoaded(): void {
700702
) {
701703
appAtomRegistry.set(stickyComposerModelSelectionAtom, persisted.stickyModelSelection);
702704
}
703-
if (Object.keys(persisted.stickyRuntimeModeByProjectKey).length > 0) {
704-
const current = appAtomRegistry.get(stickyComposerRuntimeModeByProjectKeyAtom);
705-
appAtomRegistry.set(stickyComposerRuntimeModeByProjectKeyAtom, {
706-
...persisted.stickyRuntimeModeByProjectKey,
705+
if (Object.keys(persisted.lastUsedRuntimeModeByProjectKey).length > 0) {
706+
const current = appAtomRegistry.get(lastUsedComposerRuntimeModeByProjectKeyAtom);
707+
appAtomRegistry.set(lastUsedComposerRuntimeModeByProjectKeyAtom, {
708+
...persisted.lastUsedRuntimeModeByProjectKey,
707709
...current,
708710
});
709711
}
@@ -938,23 +940,23 @@ export function setStickyComposerModelSelection(modelSelection: ModelSelection):
938940
schedulePersistComposerState();
939941
}
940942

941-
export function getStickyComposerRuntimeMode(projectKey: string): RuntimeMode | null {
943+
export function getLastUsedComposerRuntimeMode(projectKey: string): RuntimeMode | null {
942944
const key = projectKey.trim();
943945
if (key.length === 0) {
944946
return null;
945947
}
946-
return appAtomRegistry.get(stickyComposerRuntimeModeByProjectKeyAtom)[key] ?? null;
948+
return appAtomRegistry.get(lastUsedComposerRuntimeModeByProjectKeyAtom)[key] ?? null;
947949
}
948950

949-
export function setStickyComposerRuntimeMode(
951+
export function setLastUsedComposerRuntimeMode(
950952
projectKey: string,
951953
runtimeMode: RuntimeMode | null | undefined,
952954
): void {
953955
const key = projectKey.trim();
954956
if (key.length === 0) {
955957
return;
956958
}
957-
const current = appAtomRegistry.get(stickyComposerRuntimeModeByProjectKeyAtom);
959+
const current = appAtomRegistry.get(lastUsedComposerRuntimeModeByProjectKeyAtom);
958960
const nextMode = runtimeMode ?? null;
959961
if ((current[key] ?? null) === nextMode) {
960962
return;
@@ -965,7 +967,7 @@ export function setStickyComposerRuntimeMode(
965967
} else {
966968
next[key] = nextMode;
967969
}
968-
appAtomRegistry.set(stickyComposerRuntimeModeByProjectKeyAtom, next);
970+
appAtomRegistry.set(lastUsedComposerRuntimeModeByProjectKeyAtom, next);
969971
schedulePersistComposerState();
970972
}
971973

@@ -1569,13 +1571,13 @@ export function useStickyComposerModelSelection(): ModelSelection | null {
15691571
return selection;
15701572
}
15711573

1572-
export function useStickyComposerRuntimeMode(projectKey: string | null): RuntimeMode | null {
1573-
const stickyByProject = useAtomValue(stickyComposerRuntimeModeByProjectKeyAtom);
1574+
export function useLastUsedComposerRuntimeMode(projectKey: string | null): RuntimeMode | null {
1575+
const lastUsedByProject = useAtomValue(lastUsedComposerRuntimeModeByProjectKeyAtom);
15741576
useEffect(() => {
15751577
ensureComposerDraftsLoaded();
15761578
}, []);
15771579
if (!projectKey) {
15781580
return null;
15791581
}
1580-
return stickyByProject[projectKey] ?? null;
1582+
return lastUsedByProject[projectKey] ?? null;
15811583
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ import {
4848
removeComposerDraftAttachment,
4949
scheduleUnusedComposerAttachmentCleanup,
5050
setComposerDraftText,
51-
setStickyComposerRuntimeMode,
51+
setLastUsedComposerRuntimeMode,
5252
updateComposerDraftSettings,
5353
useComposerDraft,
5454
} from "./use-composer-drafts";
@@ -591,7 +591,7 @@ export function useThreadComposerState() {
591591
return;
592592
}
593593
updateComposerDraftSettings(selectedThreadKey, { runtimeMode: value });
594-
setStickyComposerRuntimeMode(
594+
setLastUsedComposerRuntimeMode(
595595
scopedProjectKey(selectedThreadShell.environmentId, selectedThreadShell.projectId),
596596
value,
597597
);

‎apps/web/src/components/ChatView.tsx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1499,8 +1499,8 @@ export default function ChatView(props: ChatViewProps) {
14991499
const setStickyComposerModelSelection = useComposerDraftStore(
15001500
(store) => store.setStickyModelSelection,
15011501
);
1502-
const setStickyRuntimeMode = useComposerDraftStore((store) => store.setStickyRuntimeMode);
1503-
const getStickyRuntimeMode = useComposerDraftStore((store) => store.getStickyRuntimeMode);
1502+
const setLastUsedRuntimeMode = useComposerDraftStore((store) => store.setLastUsedRuntimeMode);
1503+
const getLastUsedRuntimeMode = useComposerDraftStore((store) => store.getLastUsedRuntimeMode);
15041504
const timestampFormat = settings.timestampFormat;
15051505
const navigate = useNavigate();
15061506
const citationLocation = useLocation({
@@ -2267,7 +2267,7 @@ export default function ChatView(props: ChatViewProps) {
22672267
const nextDraftId = newDraftId();
22682268
const nextThreadId = newThreadId();
22692269
const resolvedRuntimeMode = resolveNewThreadRuntimeMode({
2270-
stickyRuntimeMode: getStickyRuntimeMode(logicalProjectKey),
2270+
lastUsedRuntimeMode: getLastUsedRuntimeMode(logicalProjectKey),
22712271
configuredRuntimeMode: settings.defaultRuntimeMode,
22722272
});
22732273
setLogicalProjectDraftThreadId(logicalProjectKey, activeProjectRef, nextDraftId, {
@@ -2288,7 +2288,7 @@ export default function ChatView(props: ChatViewProps) {
22882288
draftId,
22892289
getDraftSession,
22902290
getDraftSessionByLogicalProjectKey,
2291-
getStickyRuntimeMode,
2291+
getLastUsedRuntimeMode,
22922292
isServerThread,
22932293
navigate,
22942294
projectGroupingSettings,
@@ -4045,7 +4045,7 @@ export default function ChatView(props: ChatViewProps) {
40454045
setDraftThreadContext(composerDraftTarget, { runtimeMode: mode });
40464046
}
40474047
if (activeLogicalProjectKey) {
4048-
setStickyRuntimeMode(activeLogicalProjectKey, mode);
4048+
setLastUsedRuntimeMode(activeLogicalProjectKey, mode);
40494049
}
40504050
scheduleComposerFocus();
40514051
},
@@ -4057,7 +4057,7 @@ export default function ChatView(props: ChatViewProps) {
40574057
composerDraftTarget,
40584058
setComposerDraftRuntimeMode,
40594059
setDraftThreadContext,
4060-
setStickyRuntimeMode,
4060+
setLastUsedRuntimeMode,
40614061
],
40624062
);
40634063

‎apps/web/src/components/settings/ProjectDefaultsSettings.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ export function ProjectDefaultsSettings({
328328
<SettingsRow
329329
id={searchableSetting("default-access").id}
330330
title="Default access"
331-
description="Permission mode for new threads when nothing carries from the current view and the project has no sticky last-used mode."
331+
description="Permission mode for new threads when nothing carries from the current view and the project has no last-used mode."
332332
status={
333333
targets.length === 0 ? undefined : mixedRuntimeMode ? "Differs by machine" : undefined
334334
}

0 commit comments

Comments
 (0)