Skip to content

Commit a3a7717

Browse files
akjclaude
andcommitted
fix(server): clearing a project's model or thread mode also clears the record copy
Until settings are folded, resolving falls back to the project row once the override is gone, so a reset has to reach the row too. Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent c488e07 commit a3a7717

3 files changed

Lines changed: 45 additions & 0 deletions

File tree

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ export interface ProjectMetaUpdateCommand {
2929
readonly projectId: ProjectId;
3030
readonly title?: string;
3131
readonly workspaceRoot?: string;
32+
// Only ever cleared here: until settings are folded, resolving falls back to
33+
// the row's copy once the override is gone, so a reset must reach it too.
34+
readonly defaultModelSelection?: null;
35+
readonly defaultThreadEnvMode?: null;
3236
readonly faviconPath?: string | null;
3337
readonly projectIcon?: ProjectIconOverride | null;
3438
}
@@ -183,6 +187,12 @@ export function planProjectCommand(input: {
183187
projectId: command.projectId,
184188
...(command.title === undefined ? {} : { title: command.title }),
185189
...(command.workspaceRoot === undefined ? {} : { workspaceRoot: command.workspaceRoot }),
190+
...(command.defaultModelSelection === undefined
191+
? {}
192+
: { defaultModelSelection: command.defaultModelSelection }),
193+
...(command.defaultThreadEnvMode === undefined
194+
? {}
195+
: { defaultThreadEnvMode: command.defaultThreadEnvMode }),
186196
...(command.faviconPath === undefined ? {} : { faviconPath: command.faviconPath }),
187197
...(command.projectIcon === undefined ? {} : { projectIcon: command.projectIcon }),
188198
updatedAt: occurredAt,

‎apps/server/src/project/ProjectService.test.ts‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,39 @@ it.layer(layerTest)("ProjectService", (it) => {
209209
}),
210210
);
211211

212+
it.effect("clears a row's legacy model and thread mode before settings are folded", () =>
213+
Effect.gen(function* () {
214+
const service = yield* ProjectService.ProjectService;
215+
const sql = yield* SqlClient.SqlClient;
216+
const projectId = ProjectId.make("project:unfolded-reset");
217+
yield* service.create({
218+
commandId: CommandId.make("command:unfolded-reset:create"),
219+
projectId,
220+
title: "Unfolded reset",
221+
workspaceRoot: "/work/unfolded-reset",
222+
});
223+
yield* sql`
224+
UPDATE projection_projects
225+
SET default_model_selection_json = ${JSON.stringify({ instanceId: "codex", model: "gpt-5.5" })},
226+
default_thread_env_mode = 'worktree'
227+
WHERE project_id = ${projectId}
228+
`;
229+
assert.equal(
230+
Option.getOrThrow(yield* service.getById(projectId)).defaultThreadEnvMode,
231+
"worktree",
232+
);
233+
234+
const reset = yield* service.update({
235+
commandId: CommandId.make("command:unfolded-reset:reset"),
236+
projectId,
237+
defaultModelSelection: null,
238+
defaultThreadEnvMode: null,
239+
});
240+
assert.isNull(reset.defaultModelSelection);
241+
assert.isNull(reset.defaultThreadEnvMode);
242+
}),
243+
);
244+
212245
it.effect("rejects active workspace collisions", () =>
213246
Effect.gen(function* () {
214247
const service = yield* ProjectService.ProjectService;

‎apps/server/src/project/ProjectService.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -496,6 +496,8 @@ export const make = Effect.gen(function* () {
496496
projectId: input.projectId,
497497
...(input.title === undefined ? {} : { title: input.title }),
498498
...(workspaceRoot === previousRoot ? {} : { workspaceRoot }),
499+
...(input.defaultModelSelection === null ? { defaultModelSelection: null } : {}),
500+
...(input.defaultThreadEnvMode === null ? { defaultThreadEnvMode: null } : {}),
499501
...(input.projectIcon === undefined ? {} : { projectIcon: input.projectIcon }),
500502
...(input.faviconPath === undefined ? {} : { faviconPath: input.faviconPath }),
501503
},

0 commit comments

Comments
 (0)