Skip to content

Commit d4d0e78

Browse files
chore(lint): enforce oxc/no-accumulating-spread
1 parent 8b92df3 commit d4d0e78

5 files changed

Lines changed: 46 additions & 26 deletions

File tree

‎apps/server/src/orchestration-v2/ThreadTitleRegenerationService.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,15 @@ const make = Effect.gen(function* () {
9090
thread: OrchestrationV2AppThread,
9191
) {
9292
let title: string | undefined;
93-
let history: Array<OrchestrationV2ConversationMessage> = [];
93+
const history: Array<ReadonlyArray<OrchestrationV2ConversationMessage>> = [];
9494
let forkedFrom = thread.forkedFrom;
9595
while (forkedFrom?.type === "run") {
9696
const source = yield* messagesThroughRun(forkedFrom.threadId, forkedFrom.runId);
97-
history = [...source.messages, ...history];
97+
history.push(source.messages);
9898
title ??= source.thread.title;
9999
forkedFrom = source.thread.forkedFrom;
100100
}
101-
const context = formatThreadTitleContext(history);
101+
const context = formatThreadTitleContext(history.reverse().flat());
102102
return title === undefined || context.message.length === 0
103103
? undefined
104104
: { title, history: context.message };

‎packages/client-runtime/src/state/shell.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ export const makeEnvironmentShellState = Effect.fn("EnvironmentShellState.make")
211211
) {
212212
const initial = yield* SubscriptionRef.get(state);
213213
let waiting = yield* Ref.get(awaitingCompletion);
214+
/* oxlint-disable oxc/no-accumulating-spread -- This copies a fixed-shape state record, not a growing collection. */
214215
let next = initial;
215216
let receivedSnapshot = false;
216217
for (const item of items) {
@@ -260,6 +261,7 @@ export const makeEnvironmentShellState = Effect.fn("EnvironmentShellState.make")
260261
: new Map(next.removedAt).set(removal.threadId, removal.sequence),
261262
};
262263
}
264+
/* oxlint-enable oxc/no-accumulating-spread */
263265
yield* Ref.set(awaitingCompletion, waiting);
264266
if (next === initial) return;
265267
if (pendingLinkIds !== undefined && Option.isSome(next.snapshot)) {

‎packages/shared/src/serverSettings.test.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -770,6 +770,13 @@ describe("worktreesDirectory", () => {
770770
});
771771

772772
describe("synchronized model preferences", () => {
773+
it("supports provider identifiers that match inherited object keys", () => {
774+
const provider = ProviderInstanceId.make("toString");
775+
const next = applyServerSettingsPatch(DEFAULT_SERVER_SETTINGS, {
776+
setModelsHidden: [{ provider, model: "example", hidden: true }],
777+
});
778+
expect(next.providerModelPreferences?.[provider]?.hiddenModels).toEqual(["example"]);
779+
});
773780
const provider = ProviderInstanceId.make("codex_work");
774781
const legacy = {
775782
favorites: [{ provider, model: "sol" }],
@@ -783,6 +790,7 @@ describe("synchronized model preferences", () => {
783790
const remove = { setModelFavorites: [{ provider, model: "sol", favorite: false }] };
784791
const removed = applyServerSettingsPatch(first, remove);
785792
expect(applyServerSettingsPatch(removed, remove).favorites).toEqual([]);
793+
expect(first.favorites).toEqual([{ provider, model: "sol" }]);
786794
});
787795

788796
it("preserves unrelated models and providers during bulk visibility and order edits", () => {
@@ -803,6 +811,9 @@ describe("synchronized model preferences", () => {
803811
],
804812
setProviderModelOrder: { provider, modelOrder: ["sol", "luna", "astra"] },
805813
});
814+
expect(initial.providerModelPreferences?.[provider]).toEqual(
815+
legacy.providerModelPreferences[provider],
816+
);
806817
expect(web.providerModelPreferences?.[provider]).toEqual({
807818
hiddenModels: ["luna", "sol"],
808819
modelOrder: ["sol", "luna", "astra"],

‎packages/shared/src/serverSettings.ts‎

Lines changed: 29 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -432,35 +432,41 @@ export function applyServerSettingsPatch(
432432
const initialFavorites =
433433
patch.favorites ?? current.favorites ?? migrateModelPreferences?.favorites ?? null;
434434
const favorites =
435-
setModelFavorites?.reduce((current, change) => {
436-
const exists = current.some(
437-
(favorite) => favorite.provider === change.provider && favorite.model === change.model,
438-
);
439-
return change.favorite
440-
? exists
441-
? current
442-
: [...current, { provider: change.provider, model: change.model }]
443-
: current.filter(
444-
(favorite) => favorite.provider !== change.provider || favorite.model !== change.model,
445-
);
446-
}, initialFavorites ?? []) ?? initialFavorites;
435+
setModelFavorites?.reduce(
436+
(current, change) => {
437+
const exists = current.some(
438+
(favorite) => favorite.provider === change.provider && favorite.model === change.model,
439+
);
440+
if (change.favorite) {
441+
if (!exists) current.push({ provider: change.provider, model: change.model });
442+
return current;
443+
}
444+
return current.filter(
445+
(favorite) => favorite.provider !== change.provider || favorite.model !== change.model,
446+
);
447+
},
448+
[...(initialFavorites ?? [])],
449+
) ?? initialFavorites;
447450
const initialModelPreferences =
448451
providerModelPreferences ??
449452
current.providerModelPreferences ??
450453
migrateModelPreferences?.providerModelPreferences ??
451454
null;
452455
let nextModelPreferences = initialModelPreferences;
453-
for (const change of setModelsHidden ?? []) {
454-
const preferences = nextModelPreferences?.[change.provider] ?? {
455-
hiddenModels: [],
456-
modelOrder: [],
457-
};
458-
const hiddenModels = preferences.hiddenModels.filter((model) => model !== change.model);
459-
if (change.hidden) hiddenModels.push(change.model);
460-
nextModelPreferences = {
461-
...nextModelPreferences,
462-
[change.provider]: { ...preferences, hiddenModels },
463-
};
456+
if (setModelsHidden?.length) {
457+
const updated = { ...initialModelPreferences };
458+
for (const change of setModelsHidden) {
459+
const preferences = (Object.hasOwn(updated, change.provider)
460+
? updated[change.provider]
461+
: undefined) ?? {
462+
hiddenModels: [],
463+
modelOrder: [],
464+
};
465+
const hiddenModels = preferences.hiddenModels.filter((model) => model !== change.model);
466+
if (change.hidden) hiddenModels.push(change.model);
467+
updated[change.provider] = { ...preferences, hiddenModels };
468+
}
469+
nextModelPreferences = updated;
464470
}
465471
if (setProviderModelOrder) {
466472
const preferences = nextModelPreferences?.[setProviderModelOrder.provider] ?? {

‎vite.config.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ export default defineConfig({
216216
perf: "warn",
217217
},
218218
rules: {
219+
"oxc/no-accumulating-spread": "error",
219220
"eslint/no-control-regex": "off",
220221
"typescript/no-this-alias": "off",
221222
"unicorn/prefer-add-event-listener": "off",

0 commit comments

Comments
 (0)