Commit 9f40b2f563c662b43887b11ff99c466fe871c1af | the-knife

apps/mobile/src/features/threads/ThreadRouteScreen.tsx+18-3

 @@ -7,12 +7,21 @@ import {
 } from "@react-navigation/native";
 import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from "react";
 import * as Option from "effect/Option";
-import { EnvironmentId, ThreadId, type ProjectScript } from "@t3tools/contracts";
+import {
+  DEFAULT_SERVER_SETTINGS,
+  EnvironmentId,
+  ThreadId,
+  type ProjectScript,
+} from "@t3tools/contracts";
 import {
   requestOlderThreadTurns,
   threadHasOlderTurns,
 } from "@t3tools/client-runtime/state/threads";
-import { projectScriptCwd, projectScriptRuntimeEnv } from "@t3tools/shared/projectScripts";
+import {
+  projectScriptCwd,
+  projectScriptRuntimeEnv,
+  resolveProjectScripts,
+} from "@t3tools/shared/projectScripts";
 import { Platform, ScrollView, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
 import { useWorkspaceState } from "../../state/workspace";
 @@ -627,7 +636,12 @@ function ThreadRouteContent(
     gitOperationLabel: gitState.gitOperationLabel,
     canOpenTerminal: Boolean(selectedThreadProject?.workspaceRoot),
     canOpenFiles: Boolean(selectedThreadProject?.workspaceRoot),
-    projectScripts: selectedThreadProject?.scripts ?? [],
+    projectScripts: selectedThreadProject
+      ? resolveProjectScripts(
+          routeEnvironmentRuntime?.serverConfig?.settings ?? DEFAULT_SERVER_SETTINGS,
+          selectedThreadProject,
+        )
+      : [],
     terminalSessions: terminalMenuSessions,
     showDirectFileControl: layout.usesSplitView,
     onOpenTerminal: handleOpenTerminal,
 @@ -819,6 +833,7 @@ function ThreadRouteContent(
     <>
       {activeInspectorRenderer ? <InspectorPaneRoleActivation /> : null}
       <NativeStackScreenOptions
+        optionsVersion={threadGitControlProps.projectScripts}
         options={{
           // Android draws its own in-flow header (AndroidScreenHeader below);
           // the native stack header stays iOS-only.

apps/mobile/src/features/threads/new-task-flow-provider.tsx+3-1

 @@ -427,7 +427,9 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
   );
   const projectDefaultModelSelection = resolveDefaultableModelSelection(
     selectedEnvironmentServerConfig,
-    selectedProject?.defaultModelSelection ?? null,
+    selectedProject?.defaultModelSelection ??
+      selectedEnvironmentServerConfig?.settings.defaultModelSelection ??
+      null,
   );
   const storedStickyModelSelection = useStickyComposerModelSelection();
   const stickyModelSelection = resolveDefaultableModelSelection(

apps/server/src/project/ProjectSetupScriptRunner.test.ts+61

...	@@ -6,6 +6,7 @@ import * as Option from "effect/Option";	...	@@ -6,6 +6,7 @@ import * as Option from "effect/Option";
6	import * as Schema from "effect/Schema";	6	import * as Schema from "effect/Schema";
7		7
8	import * as ProjectionSnapshotQuery from "../orchestration/Services/ProjectionSnapshotQuery.ts";	8	import * as ProjectionSnapshotQuery from "../orchestration/Services/ProjectionSnapshotQuery.ts";
		9	import * as ServerSettings from "../serverSettings.ts";
9	import * as TerminalManager from "../terminal/Manager.ts";	10	import * as TerminalManager from "../terminal/Manager.ts";
10	import * as ProjectSetupScriptRunner from "./ProjectSetupScriptRunner.ts";	11	import * as ProjectSetupScriptRunner from "./ProjectSetupScriptRunner.ts";
11		12
...	@@ -68,13 +69,73 @@ const makeTerminalManagerLayer = (	...	@@ -68,13 +69,73 @@ const makeTerminalManagerLayer = (
68	const testLayer = (	69	const testLayer = (
69	project: OrchestrationProject,	70	project: OrchestrationProject,
70	terminal: Pick<TerminalManager.TerminalManager["Service"], "open" \| "write">,	71	terminal: Pick<TerminalManager.TerminalManager["Service"], "open" \| "write">,
		72	settings = ServerSettings.layerTest(),
71	) =>	73	) =>
72	ProjectSetupScriptRunner.layer.pipe(	74	ProjectSetupScriptRunner.layer.pipe(
73	Layer.provideMerge(makeProjectionSnapshotQueryLayer(project)),	75	Layer.provideMerge(makeProjectionSnapshotQueryLayer(project)),
74	Layer.provideMerge(makeTerminalManagerLayer(terminal)),	76	Layer.provideMerge(makeTerminalManagerLayer(terminal)),
		77	Layer.provide(settings),
75	);	78	);
76		79
77	describe("ProjectSetupScriptRunner", () => {	80	describe("ProjectSetupScriptRunner", () => {
		81	it.effect("runs the inherited machine setup action in the checkout's worktree", () => {
		82	const open = vi.fn(() =>
		83	Effect.succeed({
		84	threadId: "thread-1",
		85	terminalId: "setup-default-setup",
		86	cwd: "/repo/worktrees/a",
		87	worktreePath: "/repo/worktrees/a",
		88	status: "running" as const,
		89	pid: 123,
		90	history: "",
		91	exitCode: null,
		92	exitSignal: null,
		93	label: "setup-default-setup",
		94	updatedAt: "2026-01-01T00:00:00.000Z",
		95	}),
		96	);
		97	const write = vi.fn(() => Effect.void);
		98	return Effect.gen(function* () {
		99	const runner = yield* ProjectSetupScriptRunner.ProjectSetupScriptRunner;
		100	const result = yield* runner.runForThread({
		101	threadId: "thread-1",
		102	projectId: "project-1",
		103	worktreePath: "/repo/worktrees/a",
		104	});
		105	expect(result).toMatchObject({ status: "started", scriptId: "default-setup" });
		106	expect(open).toHaveBeenCalledWith({
		107	threadId: "thread-1",
		108	terminalId: "setup-default-setup",
		109	cwd: "/repo/worktrees/a",
		110	worktreePath: "/repo/worktrees/a",
		111	env: { T3CODE_PROJECT_ROOT: "/repo/project", T3CODE_WORKTREE_PATH: "/repo/worktrees/a" },
		112	});
		113	expect(write).toHaveBeenCalledWith({
		114	threadId: "thread-1",
		115	terminalId: "setup-default-setup",
		116	data: "npm install\r",
		117	});
		118	}).pipe(
		119	Effect.provide(
		120	testLayer(
		121	makeProject([]),
		122	{ open, write },
		123	ServerSettings.layerTest({
		124	defaultProjectScripts: [
		125	{
		126	id: "default-setup",
		127	name: "Setup",
		128	command: "npm install",
		129	icon: "configure",
		130	runOnWorktreeCreate: true,
		131	},
		132	],
		133	}),
		134	),
		135	),
		136	);
		137	});
		138
78	it.effect("returns no-script when no setup script exists", () => {	139	it.effect("returns no-script when no setup script exists", () => {
79	const open = vi.fn(() => Effect.die("unexpected open"));	140	const open = vi.fn(() => Effect.die("unexpected open"));
80	const write = vi.fn(() => Effect.die("unexpected write"));	141	const write = vi.fn(() => Effect.die("unexpected write"));

apps/server/src/project/ProjectSetupScriptRunner.ts+19-3

 @@ -1,5 +1,9 @@
 import { ProjectId } from "@t3tools/contracts";
-import { projectScriptRuntimeEnv, setupProjectScript } from "@t3tools/shared/projectScripts";
+import {
+  projectScriptRuntimeEnv,
+  resolveProjectScripts,
+  setupProjectScript,
+} from "@t3tools/shared/projectScripts";
 import * as Context from "effect/Context";
 import * as Effect from "effect/Effect";
 import * as Layer from "effect/Layer";
 @@ -7,6 +11,7 @@ import * as Option from "effect/Option";
 import * as Schema from "effect/Schema";
 import * as ProjectionSnapshotQuery from "../orchestration/Services/ProjectionSnapshotQuery.ts";
+import * as ServerSettings from "../serverSettings.ts";
 import * as TerminalManager from "../terminal/Manager.ts";
 export interface ProjectSetupScriptRunnerResultNoScript {
 @@ -40,7 +45,7 @@ export class ProjectSetupScriptOperationError extends Schema.TaggedErrorClass<Pr
     projectId: Schema.optional(Schema.String),
     projectCwd: Schema.optional(Schema.String),
     worktreePath: Schema.String,
-    operation: Schema.Literals(["resolveProject", "openTerminal", "writeCommand"]),
+    operation: Schema.Literals(["resolveProject", "readSettings", "openTerminal", "writeCommand"]),
     cause: Schema.Defect(),
   },
 ) {
 @@ -81,6 +86,7 @@ export class ProjectSetupScriptRunner extends Context.Service<
 export const make = Effect.gen(function* () {
   const projectionSnapshotQuery = yield* ProjectionSnapshotQuery.ProjectionSnapshotQuery;
   const terminalManager = yield* TerminalManager.TerminalManager;
+  const serverSettings = yield* ServerSettings.ServerSettingsService;
   const runForThread: ProjectSetupScriptRunner["Service"]["runForThread"] = Effect.fn(
     "ProjectSetupScriptRunner.runForThread",
 @@ -124,7 +130,17 @@ export const make = Effect.gen(function* () {
       return yield* new ProjectSetupScriptProjectNotFoundError(errorContext);
     }
-    const script = setupProjectScript(project.scripts);
+    const settings = yield* serverSettings.getSettings.pipe(
+      Effect.mapError(
+        (cause) =>
+          new ProjectSetupScriptOperationError({
+            ...errorContext,
+            operation: "readSettings",
+            cause,
+          }),
+      ),
+    );
+    const script = setupProjectScript(resolveProjectScripts(settings, project));
     if (!script) {
       return {
         status: "no-script",

apps/server/src/provider/Layers/ProviderService.test.ts+80-2

...	@@ -19,6 +19,8 @@ import {	...	@@ -19,6 +19,8 @@ import {
19	EnvironmentId,	19	EnvironmentId,
20	EventId,	20	EventId,
21	MessageId,	21	MessageId,
		22	OrchestrationThreadShell,
		23	ProjectId,
22	PROVIDER_SEND_TURN_MAX_INPUT_CHARS,	24	PROVIDER_SEND_TURN_MAX_INPUT_CHARS,
23	ProviderDriverKind,	25	ProviderDriverKind,
24	ProviderInstanceId,	26	ProviderInstanceId,
...	@@ -75,6 +77,7 @@ import * as ServerConfig from "../../config.ts";	...	@@ -75,6 +77,7 @@ import * as ServerConfig from "../../config.ts";
75	import * as ServerSettings from "../../serverSettings.ts";	77	import * as ServerSettings from "../../serverSettings.ts";
76	import * as AnalyticsService from "../../telemetry/AnalyticsService.ts";	78	import * as AnalyticsService from "../../telemetry/AnalyticsService.ts";
77	import { makeAdapterRegistryMock } from "../testUtils/providerAdapterRegistryMock.ts";	79	import { makeAdapterRegistryMock } from "../testUtils/providerAdapterRegistryMock.ts";
		80	import * as ProjectionSnapshotQuery from "../../orchestration/Services/ProjectionSnapshotQuery.ts";
78		81
79	const defaultServerSettingsLayer = ServerSettings.ServerSettingsService.layerTest();	82	const defaultServerSettingsLayer = ServerSettings.ServerSettingsService.layerTest();
80	const serverConfigTestLayer = ServerConfig.layerTest(process.cwd(), process.cwd()).pipe(	83	const serverConfigTestLayer = ServerConfig.layerTest(process.cwd(), process.cwd()).pipe(
...	@@ -4302,10 +4305,17 @@ boundedListing.layer("ProviderServiceLive session listing", (it) => {	...	@@ -4302,10 +4305,17 @@ boundedListing.layer("ProviderServiceLive session listing", (it) => {
4302	);	4305	);
4303	});	4306	});
4304		4307
		4308	const decodeBrowserAccessThreadShell = Schema.decodeUnknownEffect(OrchestrationThreadShell);
		4309
4305	describe("agent browser access", () => {	4310	describe("agent browser access", () => {
4306	const revokedThreads: Array<ThreadId> = [];	4311	const revokedThreads: Array<ThreadId> = [];
		4312	const projectId = ProjectId.make("project-browser-access");
4307		4313
4308	const startSessionWith = (enableAgentBrowserAccess: boolean, threadId: ThreadId) =>	4314	const startSessionWith = (
		4315	enableAgentBrowserAccess: boolean,
		4316	threadId: ThreadId,
		4317	projectOverride?: boolean,
		4318	) =>
4309	Effect.gen(function* () {	4319	Effect.gen(function* () {
4310	const issued: Array<ThreadId> = [];	4320	const issued: Array<ThreadId> = [];
4311	const codex = makeFakeCodexAdapter();	4321	const codex = makeFakeCodexAdapter();
...	@@ -4319,6 +4329,49 @@ describe("agent browser access", () => {	...	@@ -4319,6 +4329,49 @@ describe("agent browser access", () => {
4319	const directoryLayer = ProviderSessionDirectoryLive.pipe(	4329	const directoryLayer = ProviderSessionDirectoryLive.pipe(
4320	Layer.provide(runtimeRepositoryLayer),	4330	Layer.provide(runtimeRepositoryLayer),
4321	);	4331	);
		4332	const projectionLayer = Layer.succeed(ProjectionSnapshotQuery.ProjectionSnapshotQuery, {
		4333	getImportedAgentSessionSources: () => Effect.die("unused"),
		4334	getUserInputActivity: () => Effect.die("unused"),
		4335	getCommandReadModel: () => Effect.die("unused"),
		4336	getSnapshot: () => Effect.die("unused"),
		4337	getShellSnapshot: () => Effect.die("unused"),
		4338	getArchivedShellSnapshot: () => Effect.die("unused"),
		4339	getSnapshotSequence: () => Effect.die("unused"),
		4340	getCounts: () => Effect.die("unused"),
		4341	getEventReplayStats: () => Effect.die("unused"),
		4342	getActiveProjectByWorkspaceRoot: () => Effect.die("unused"),
		4343	getProjectShellById: () => Effect.die("unused"),
		4344	getFirstActiveThreadIdByProjectId: () => Effect.die("unused"),
		4345	getThreadCheckpointContext: () => Effect.die("unused"),
		4346	getFullThreadDiffContext: () => Effect.die("unused"),
		4347	getThreadRuntimeContext: () => Effect.die("unused"),
		4348	getThreadShellById: (requestedThreadId) =>
		4349	Effect.gen(function* () {
		4350	assert.equal(requestedThreadId, threadId);
		4351	return Option.some(
		4352	yield* decodeBrowserAccessThreadShell({
		4353	id: threadId,
		4354	projectId,
		4355	title: "Browser access test",
		4356	modelSelection: createModelSelection(codexInstanceId, "gpt-5.4"),
		4357	runtimeMode: "full-access",
		4358	branch: null,
		4359	worktreePath: null,
		4360	latestTurn: null,
		4361	createdAt: "2026-01-01T00:00:00.000Z",
		4362	updatedAt: "2026-01-01T00:00:00.000Z",
		4363	session: null,
		4364	latestUserMessageAt: null,
		4365	hasPendingApprovals: false,
		4366	hasPendingUserInput: false,
		4367	hasActionableProposedPlan: false,
		4368	}),
		4369	);
		4370	}).pipe(Effect.orDie),
		4371	getThreadDetailById: () => Effect.die("unused"),
		4372	getThreadDetailSnapshot: () => Effect.die("unused"),
		4373	searchThreads: () => Effect.die("unused"),
		4374	});
4322	const providerLayer = makeProviderServiceLive({	4375	const providerLayer = makeProviderServiceLive({
4323	issueMcpCredential: (request) =>	4376	issueMcpCredential: (request) =>
4324	Effect.sync(() => {	4377	Effect.sync(() => {
...	@@ -4329,7 +4382,14 @@ describe("agent browser access", () => {	...	@@ -4329,7 +4382,14 @@ describe("agent browser access", () => {
4329	}).pipe(	4382	}).pipe(
4330	Layer.provide(providerAdapterLayer),	4383	Layer.provide(providerAdapterLayer),
4331	Layer.provide(directoryLayer),	4384	Layer.provide(directoryLayer),
4332	Layer.provide(ServerSettings.ServerSettingsService.layerTest({ enableAgentBrowserAccess })),	4385	Layer.provide(projectionLayer),
		4386	Layer.provide(
		4387	ServerSettings.ServerSettingsService.layerTest({
		4388	enableAgentBrowserAccess,
		4389	projectAgentBrowserAccessOverrides:
		4390	projectOverride === undefined ? {} : { [projectId]: projectOverride },
		4391	}),
		4392	),
4333	Layer.provide(serverConfigTestLayer),	4393	Layer.provide(serverConfigTestLayer),
4334	Layer.provide(AnalyticsService.layerTest),	4394	Layer.provide(AnalyticsService.layerTest),
4335	Layer.provide(	4395	Layer.provide(
...	@@ -4387,4 +4447,22 @@ describe("agent browser access", () => {	...	@@ -4387,4 +4447,22 @@ describe("agent browser access", () => {
4387	assert.deepEqual(issued, [threadId]);	4447	assert.deepEqual(issued, [threadId]);
4388	}).pipe(Effect.provide(NodeServices.layer)),	4448	}).pipe(Effect.provide(NodeServices.layer)),
4389	);	4449	);
		4450
		4451	it.effect("withholds and revokes MCP credentials when the project disables browser access", () =>
		4452	Effect.gen(function* () {
		4453	const threadId = asThreadId("thread-project-browser-off");
		4454	revokedThreads.length = 0;
		4455	const issued = yield* startSessionWith(true, threadId, false);
		4456	assert.deepEqual(issued, []);
		4457	assert.deepEqual(revokedThreads, [threadId]);
		4458	}).pipe(Effect.provide(NodeServices.layer)),
		4459	);
		4460
		4461	it.effect("requests an MCP credential when the project overrides browser access to on", () =>
		4462	Effect.gen(function* () {
		4463	const threadId = asThreadId("thread-project-browser-on");
		4464	const issued = yield* startSessionWith(false, threadId, true);
		4465	assert.deepEqual(issued, [threadId]);
		4466	}).pipe(Effect.provide(NodeServices.layer)),
		4467	);
4390	});	4468	});

apps/server/src/provider/Layers/ProviderService.ts+19-3

 @@ -32,6 +32,7 @@ import {
 import { expandAssistantCitationsForProvider } from "@t3tools/shared/assistantCitations";
 import { causeErrorTag } from "@t3tools/shared/observability";
 import { getModelSelectionStringOptionValue } from "@t3tools/shared/model";
+import { resolveProjectAgentBrowserAccess } from "@t3tools/shared/serverSettings";
 import * as DateTime from "effect/DateTime";
 import * as Deferred from "effect/Deferred";
 import * as Effect from "effect/Effect";
 @@ -72,6 +73,7 @@ import * as AnalyticsService from "../../telemetry/AnalyticsService.ts";
 import * as McpProviderSession from "../../mcp/McpProviderSession.ts";
 import * as McpSessionRegistry from "../../mcp/McpSessionRegistry.ts";
 import * as ServerSettings from "../../serverSettings.ts";
+import * as ProjectionSnapshotQuery from "../../orchestration/Services/ProjectionSnapshotQuery.ts";
 const isModelSelection = Schema.is(ModelSelection);
 interface PendingCompaction {
 @@ -323,6 +325,9 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
   const registry = yield* ProviderAdapterRegistry.ProviderAdapterRegistry;
   const directory = yield* ProviderSessionDirectory.ProviderSessionDirectory;
   const serverSettings = yield* ServerSettings.ServerSettingsService;
+  const projectionQuery = yield* Effect.serviceOption(
+    ProjectionSnapshotQuery.ProjectionSnapshotQuery,
+  );
   const issueMcpCredential =
     options?.issueMcpCredential ?? McpSessionRegistry.issueActiveMcpCredential;
   const revokeMcpCredential =
 @@ -714,8 +719,19 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
    * "off" silently becoming "on" would violate the user's stated choice,
    * whereas the reverse costs an agent one toolset and is visible immediately.
    */
-  const agentBrowserAccessEnabled = serverSettings.getSettings.pipe(
+  const agentBrowserAccessEnabled = Effect.fn("ProviderService.agentBrowserAccessEnabled")(
-    Effect.map((settings) => settings.enableAgentBrowserAccess),
+    function* (threadId: ThreadId) {
+      const settings = yield* serverSettings.getSettings;
+      if (Object.keys(settings.projectAgentBrowserAccessOverrides).length === 0) {
+        return settings.enableAgentBrowserAccess;
+      }
+      // Provider-only runtimes may omit orchestration. An unresolved project
+      // must not bypass an explicit browser override.
+      if (Option.isNone(projectionQuery)) return false;
+      const thread = yield* projectionQuery.value.getThreadShellById(threadId);
+      if (Option.isNone(thread)) return false;
+      return resolveProjectAgentBrowserAccess(settings, thread.value.projectId);
+    },
     Effect.catch((cause) =>
       Effect.logWarning(
         "Could not read server settings; withholding agent browser access for this session.",
 @@ -726,7 +742,7 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
   const prepareMcpSession = (threadId: ThreadId, providerInstanceId: ProviderInstanceId) =>
     Effect.gen(function* () {
-      if (!(yield* agentBrowserAccessEnabled)) {
+      if (!(yield* agentBrowserAccessEnabled(threadId))) {
         // Revoke as well as clear. Every other prepare path reaches
         // `issueActiveMcpCredential`, which revokes the thread first, so
         // skipping it here would leave a previously issued bearer token valid

apps/server/src/server.ts+4-2

...	@@ -317,7 +317,7 @@ const PullRequestServiceLive = PullRequestService.layer.pipe(	...	@@ -317,7 +317,7 @@ const PullRequestServiceLive = PullRequestService.layer.pipe(
317	);	317	);
318		318
319	const GitManagerLayerLive = GitManager.layer.pipe(	319	const GitManagerLayerLive = GitManager.layer.pipe(
320	Layer.provideMerge(ProjectSetupScriptRunner.layer),	320	Layer.provideMerge(ProjectSetupScriptRunner.layer.pipe(Layer.provide(ServerSettingsLayerLive))),
321	Layer.provideMerge(GitVcsDriver.layer),	321	Layer.provideMerge(GitVcsDriver.layer),
322	Layer.provideMerge(SourceControlProviderRegistryLayerLive),	322	Layer.provideMerge(SourceControlProviderRegistryLayerLive),
323	Layer.provideMerge(TextGeneration.layer),	323	Layer.provideMerge(TextGeneration.layer),
...	@@ -353,7 +353,9 @@ const VcsLayerLive = Layer.empty.pipe(	...	@@ -353,7 +353,9 @@ const VcsLayerLive = Layer.empty.pipe(
353	Layer.provideMerge(	353	Layer.provideMerge(
354	VcsStatusBroadcaster.layer.pipe(	354	VcsStatusBroadcaster.layer.pipe(
355	Layer.provide(GitWorkflowLayerLive),	355	Layer.provide(GitWorkflowLayerLive),
356	Layer.provide(VcsStatusBroadcaster.autoPullPolicyLayer),	356	Layer.provide(
		357	VcsStatusBroadcaster.autoPullPolicyLayer.pipe(Layer.provide(ServerSettingsLayerLive)),
		358	),
357	),	359	),
358	),	360	),
359	);	361	);

apps/server/src/serverRuntimeStartup.test.ts+54-10

 @@ -14,6 +14,7 @@ import * as ServerConfig from "./config.ts";
 import * as OrchestrationEngine from "./orchestration/Services/OrchestrationEngine.ts";
 import * as ProjectionSnapshotQuery from "./orchestration/Services/ProjectionSnapshotQuery.ts";
 import * as ServerRuntimeStartup from "./serverRuntimeStartup.ts";
+import * as ServerSettings from "./serverSettings.ts";
 import * as GitVcsDriver from "./vcs/GitVcsDriver.ts";
 it.effect("automatic pull only updates enabled, behind, clean default-branch checkouts", () =>
 @@ -40,7 +41,7 @@ it.effect("automatic pull only updates enabled, behind, clean default-branch che
         }),
     } as unknown as GitVcsDriver.GitVcsDriver["Service"];
     const project = (workspaceRoot: string, autoPull = true) =>
-      ({ workspaceRoot, autoPull }) as never;
+      ({ id: ProjectId.make(workspaceRoot), workspaceRoot, autoPull }) as never;
     yield* ServerRuntimeStartup.autoPullProjects([
       project("/clean"),
 @@ -52,6 +53,16 @@ it.effect("automatic pull only updates enabled, behind, clean default-branch che
     ]).pipe(Effect.provideService(GitVcsDriver.GitVcsDriver, git));
     assert.deepStrictEqual(pulled, ["/clean"]);
+    pulled.length = 0;
+    yield* ServerRuntimeStartup.autoPullProjects(
+      [project("/inherited", false), project("/opted-out"), project("/dirty", false)],
+      {
+        defaultAutoPull: true,
+        projectAutoPullOverrides: { [ProjectId.make("/opted-out")]: false },
+      },
+    ).pipe(Effect.provideService(GitVcsDriver.GitVcsDriver, git));
+    assert.deepStrictEqual(pulled, ["/inherited"]);
   }),
 );
 @@ -124,6 +135,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets returns existing project and threa
   return Effect.gen(function* () {
     const dispatchCalls = yield* Ref.make<ReadonlyArray<string>>([]);
     const targets = yield* ServerRuntimeStartup.resolveAutoBootstrapWelcomeTargets.pipe(
+      Effect.provide(ServerSettings.layerTest()),
       Effect.provideService(ServerConfig.ServerConfig, {
         cwd: "/tmp/startup-project",
         autoBootstrapProjectFromCwd: true,
 @@ -189,8 +201,19 @@ it.effect("resolveAutoBootstrapWelcomeTargets returns existing project and threa
   });
 });
-it.effect("resolveAutoBootstrapWelcomeTargets creates a project and thread when missing", () =>
+it.effect.each([
+  { existing: false, machineModel: null, projectModel: null },
+  { existing: false, machineModel: "claude-sonnet-4-6", projectModel: null },
+  { existing: true, machineModel: "claude-sonnet-4-6", projectModel: null },
+  { existing: true, machineModel: "claude-sonnet-4-6", projectModel: "gpt-5.4" },
+])("auto-bootstrap model precedence: %j", ({ existing, machineModel, projectModel }) =>
   Effect.gen(function* () {
+    const machineSelection = machineModel
+      ? { instanceId: ProviderInstanceId.make("claude-code"), model: machineModel }
+      : null;
+    const projectSelection = projectModel
+      ? { instanceId: ProviderInstanceId.make("codex"), model: projectModel }
+      : null;
     const dispatchCalls = yield* Ref.make<
       ReadonlyArray<{
         readonly type: string;
 @@ -199,6 +222,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets creates a project and thread when
       }>
     >([]);
     const targets = yield* ServerRuntimeStartup.resolveAutoBootstrapWelcomeTargets.pipe(
+      Effect.provide(ServerSettings.layerTest({ defaultModelSelection: machineSelection })),
       Effect.provideService(ServerConfig.ServerConfig, {
         cwd: "/tmp/startup-project",
         autoBootstrapProjectFromCwd: true,
 @@ -212,7 +236,21 @@ it.effect("resolveAutoBootstrapWelcomeTargets creates a project and thread when
         getSnapshotSequence: () => Effect.die("unused"),
         getCounts: () => Effect.die("unused"),
         getEventReplayStats: () => Effect.die("unused"),
-        getActiveProjectByWorkspaceRoot: () => Effect.succeed(Option.none()),
+        getActiveProjectByWorkspaceRoot: () =>
+          Effect.succeed(
+            existing
+              ? Option.some({
+                  id: ProjectId.make("existing-project"),
+                  title: "Startup Project",
+                  workspaceRoot: "/tmp/startup-project",
+                  defaultModelSelection: projectSelection,
+                  scripts: [],
+                  createdAt: "2026-01-01T00:00:00.000Z",
+                  updatedAt: "2026-01-01T00:00:00.000Z",
+                  deletedAt: null,
+                })
+              : Option.none(),
+          ),
         getProjectShellById: () => Effect.die("unused"),
         getFirstActiveThreadIdByProjectId: () => Effect.succeed(Option.none()),
         getImportedAgentSessionSources: () => Effect.die("unused"),
 @@ -241,18 +279,22 @@ it.effect("resolveAutoBootstrapWelcomeTargets creates a project and thread when
     assert.equal(typeof targets.bootstrapProjectId, "string");
     assert.equal(typeof targets.bootstrapThreadId, "string");
-    assert.equal(targets.bootstrapProjectCreated, true);
+    assert.equal(targets.bootstrapProjectCreated, !existing);
     assert.equal(targets.bootstrapThreadCreated, true);
     const commands = yield* Ref.get(dispatchCalls);
     assert.deepStrictEqual(
       commands.map((command) => command.type),
-      ["project.create", "thread.create"],
+      existing ? ["thread.create"] : ["project.create", "thread.create"],
+    );
+    if (!existing) assert.equal("defaultModelSelection" in commands[0]!, false);
+    assert.deepStrictEqual(
+      commands.at(-1)?.modelSelection,
+      projectSelection ??
+        machineSelection ?? {
+          instanceId: ProviderInstanceId.make("codex"),
+          model: DEFAULT_MODEL,
+        },
     );
-    assert.equal("defaultModelSelection" in commands[0]!, false);
-    assert.deepStrictEqual(commands[1]?.modelSelection, {
-      instanceId: ProviderInstanceId.make("codex"),
-      model: DEFAULT_MODEL,
-    });
   }),
 );
 @@ -262,6 +304,7 @@ it.effect(
     Effect.gen(function* () {
       const dispatchCalls = yield* Ref.make<ReadonlyArray<string>>([]);
       const targets = yield* ServerRuntimeStartup.resolveAutoBootstrapWelcomeTargets.pipe(
+        Effect.provide(ServerSettings.layerTest()),
         Effect.provideService(ServerConfig.ServerConfig, {
           cwd: "/tmp/startup-project",
           autoBootstrapProjectFromCwd: true,
 @@ -322,6 +365,7 @@ it.effect("resolveAutoBootstrapWelcomeTargets preserves typed UUID generation fa
     const dispatchCalls = yield* Ref.make<ReadonlyArray<string>>([]);
     const error = yield* ServerRuntimeStartup.resolveAutoBootstrapWelcomeTargets.pipe(
+      Effect.provide(ServerSettings.layerTest()),
       Effect.provideService(ServerConfig.ServerConfig, {
         cwd: "/tmp/startup-project",
         autoBootstrapProjectFromCwd: true,

apps/server/src/serverRuntimeStartup.ts+17-4

 @@ -2,6 +2,7 @@ import {
   CommandId,
   DEFAULT_MODEL,
   DEFAULT_PROVIDER_INTERACTION_MODE,
+  DEFAULT_SERVER_SETTINGS,
   type ModelSelection,
   type OrchestrationProjectShell,
   ProjectId,
 @@ -9,6 +10,7 @@ import {
   ThreadId,
   TurnId,
 } from "@t3tools/contracts";
+import { resolveProjectAutoPull } from "@t3tools/shared/serverSettings";
 import * as Cause from "effect/Cause";
 import * as Console from "effect/Console";
 import * as Context from "effect/Context";
 @@ -198,6 +200,9 @@ export const resolveAutoBootstrapWelcomeTargets = Effect.gen(function* () {
   let bootstrapThreadCreated = false;
   if (serverConfig.autoBootstrapProjectFromCwd) {
+    const settings = yield* (yield* ServerSettings.ServerSettingsService).getSettings;
+    const defaultModelSelection =
+      settings.defaultModelSelection ?? getAutoBootstrapThreadModelSelection();
     yield* Effect.gen(function* () {
       const existingProject = yield* projectionReadModelQuery.getActiveProjectByWorkspaceRoot(
         serverConfig.cwd,
 @@ -209,7 +214,7 @@ export const resolveAutoBootstrapWelcomeTargets = Effect.gen(function* () {
         const createdAt = DateTime.formatIso(yield* DateTime.now);
         nextProjectId = ProjectId.make(yield* randomUUID);
         const bootstrapProjectTitle = path.basename(serverConfig.cwd) || "project";
-        nextThreadModelSelection = getAutoBootstrapThreadModelSelection();
+        nextThreadModelSelection = defaultModelSelection;
         yield* orchestrationEngine.dispatch({
           type: "project.create",
           commandId: CommandId.make(yield* randomUUID),
 @@ -224,7 +229,7 @@ export const resolveAutoBootstrapWelcomeTargets = Effect.gen(function* () {
         nextProjectId = existingProject.value.id;
         bootstrapProjectId = nextProjectId;
         nextThreadModelSelection =
-          existingProject.value.defaultModelSelection ?? getAutoBootstrapThreadModelSelection();
+          existingProject.value.defaultModelSelection ?? defaultModelSelection;
       }
       yield* Effect.gen(function* () {
 @@ -737,12 +742,16 @@ interface StartupOptions {
 export const autoPullProjects = Effect.fn("autoPullProjects")(function* (
   projects: ReadonlyArray<OrchestrationProjectShell>,
+  settings: Pick<
+    typeof DEFAULT_SERVER_SETTINGS,
+    "defaultAutoPull" | "projectAutoPullOverrides"
+  > = DEFAULT_SERVER_SETTINGS,
 ) {
   const git = yield* GitVcsDriver.GitVcsDriver;
   const workspaceRoots = [
     ...new Set(
       projects
-        .filter((project) => project.autoPull === true)
+        .filter((project) => resolveProjectAutoPull(settings, project.id, project.autoPull))
         .map((project) => project.workspaceRoot),
     ),
   ];
 @@ -813,7 +822,11 @@ export const make = (options?: StartupOptions) =>
     const reactorScope = yield* Scope.make("sequential");
     const syncAutoPullProjects = projectionSnapshotQuery.getShellSnapshot().pipe(
-      Effect.flatMap((snapshot) => autoPullProjects(snapshot.projects)),
+      Effect.flatMap((snapshot) =>
+        serverSettings.getSettings.pipe(
+          Effect.flatMap((settings) => autoPullProjects(snapshot.projects, settings)),
+        ),
+      ),
       Effect.catch((cause) =>
         Effect.logWarning("Failed to load projects for automatic pull", { cause }),
       ),

apps/server/src/vcs/VcsStatusBroadcaster.ts+12-5

 @@ -22,10 +22,12 @@ import type {
   VcsStatusStreamEvent,
 } from "@t3tools/contracts";
 import { mergeGitStatusParts } from "@t3tools/shared/git";
+import { resolveProjectAutoPull } from "@t3tools/shared/serverSettings";
 import * as BackgroundPolicy from "../background/BackgroundPolicy.ts";
 import * as GitWorkflowService from "../git/GitWorkflowService.ts";
 import * as ProjectionSnapshotQuery from "../orchestration/Services/ProjectionSnapshotQuery.ts";
+import * as ServerSettings from "../serverSettings.ts";
 const DEFAULT_VCS_STATUS_REFRESH_INTERVAL = Duration.seconds(30);
 const VCS_STATUS_REFRESH_FAILURE_BASE_DELAY = Duration.seconds(30);
 @@ -151,12 +153,17 @@ export const autoPullPolicyLayer = Layer.effect(
   VcsAutoPullPolicy,
   Effect.gen(function* () {
     const snapshots = yield* ProjectionSnapshotQuery.ProjectionSnapshotQuery;
+    const serverSettings = yield* ServerSettings.ServerSettingsService;
     return {
-      isEnabled: (cwd: string) =>
+      isEnabled: Effect.fn("VcsAutoPullPolicy.isEnabled")(
-        snapshots.getActiveProjectByWorkspaceRoot(cwd).pipe(
+        function* (cwd: string) {
-          Effect.map((project) => project._tag === "Some" && project.value.autoPull === true),
+          const project = yield* snapshots.getActiveProjectByWorkspaceRoot(cwd);
-          Effect.orElseSucceed(() => false),
+          if (project._tag === "None") return false;
-        ),
+          const settings = yield* serverSettings.getSettings;
+          return resolveProjectAutoPull(settings, project.value.id, project.value.autoPull);
+        },
+        Effect.orElseSucceed(() => false),
+      ),
     };
   }),
 );

apps/web/src/components/ChatView.tsx+53-36

 @@ -53,7 +53,11 @@ import {
   createModelSelection,
   resolvePromptInjectedEffort,
 } from "@t3tools/shared/model";
-import { projectScriptCwd, projectScriptRuntimeEnv } from "@t3tools/shared/projectScripts";
+import {
+  projectScriptCwd,
+  projectScriptRuntimeEnv,
+  resolveProjectScripts,
+} from "@t3tools/shared/projectScripts";
 import { truncate } from "@t3tools/shared/String";
 import { resolveThreadReferenceCopyTarget } from "@t3tools/shared/threadReference";
 import {
 @@ -276,7 +280,6 @@ import { appendReviewCommentsToPrompt, type ReviewCommentContext } from "../revi
 import { environmentCatalog } from "../connection/catalog";
 import { selectThreadTerminalUiState, useTerminalUiStateStore } from "../terminalUiStateStore";
 import { useKnownTerminalSessions, useThreadRunningTerminalIds } from "../state/terminalSessions";
-import { projectEnvironment } from "../state/projects";
 import { useEnvironmentQuery } from "../state/query";
 import {
   environmentServerConfigsAtom,
 @@ -1386,7 +1389,9 @@ export default function ChatView(props: ChatViewProps) {
     [environmentId, threadId],
   );
   const routeThreadKey = useMemo(() => scopedThreadKey(routeThreadRef), [routeThreadRef]);
-  const updateProject = useAtomCommand(projectEnvironment.update, { reportFailure: false });
+  const updateProjectScriptSettings = useAtomCommand(serverEnvironment.updateSettings, {
+    reportFailure: false,
+  });
   const upsertKeybinding = useAtomCommand(serverEnvironment.upsertKeybinding, {
     reportFailure: false,
   });
 @@ -1474,9 +1479,6 @@ export default function ChatView(props: ChatViewProps) {
   }, [routeKind, routeThreadRef, routeThreadState]);
   const markThreadVisited = useUiStateStore((store) => store.markThreadVisited);
   const settings = useEnvironmentSettings(environmentId);
-  // New-thread defaults live in the primary environment's settings.json (the
-  // settings UI never writes to remote environments), so read them from the
-  // primary server rather than the thread's environment.
   const primaryServerSettings = useAtomValue(primaryServerSettingsAtom);
   const setStickyComposerModelSelection = useComposerDraftStore(
     (store) => store.setStickyModelSelection,
 @@ -1758,10 +1760,17 @@ export default function ChatView(props: ChatViewProps) {
         ? buildLocalDraftThread(
             threadId,
             draftThread,
-            fallbackDraftProject?.defaultModelSelection ?? NO_PROVIDER_MODEL_SELECTION,
+            fallbackDraftProject?.defaultModelSelection ??
+              settings.defaultModelSelection ??
+              NO_PROVIDER_MODEL_SELECTION,
           )
         : undefined,
-    [draftThread, fallbackDraftProject?.defaultModelSelection, threadId],
+    [
+      draftThread,
+      fallbackDraftProject?.defaultModelSelection,
+      settings.defaultModelSelection,
+      threadId,
+    ],
   );
   // Promotion is data-driven: the draft route keeps rendering while the
   // server thread (same pre-allocated ref) starts, so live state must not
 @@ -1987,6 +1996,12 @@ export default function ChatView(props: ChatViewProps) {
     [activeThread?.environmentId, activeThread?.projectId],
   );
   const activeProject = useProject(activeProjectRef);
+  const activeProjectScripts = useMemo(
+    () => (activeProject ? resolveProjectScripts(settings, activeProject) : []),
+    [activeProject, settings],
+  );
+  const activeProjectDefaultModelSelection =
+    activeProject?.defaultModelSelection ?? settings.defaultModelSelection;
   const handleNewThreadInActiveProject = useCallback(() => {
     startNewThreadForProject(activeProjectRef, handleNewThread);
   }, [activeProjectRef, handleNewThread]);
 @@ -2035,8 +2050,8 @@ export default function ChatView(props: ChatViewProps) {
     [activeProjectKey],
   );
   const configuredPreviewUrls = useMemo(
-    () => getConfiguredPreviewUrls(activeProject?.scripts),
+    () => getConfiguredPreviewUrls(activeProjectScripts),
-    [activeProject?.scripts],
+    [activeProjectScripts],
   );
   useEffect(() => {
 @@ -2280,7 +2295,7 @@ export default function ChatView(props: ChatViewProps) {
   const selectedProviderByThreadId = composerActiveProvider ?? null;
   const threadProvider =
     activeThread?.modelSelection.instanceId ??
-    activeProject?.defaultModelSelection?.instanceId ??
+    activeProjectDefaultModelSelection?.instanceId ??
     null;
   const lockedProvider = deriveLockedProvider({
     thread: activeThread,
 @@ -2514,14 +2529,14 @@ export default function ChatView(props: ChatViewProps) {
           selectedProviderByThreadId,
           activeThread?.session?.providerInstanceId,
           activeThread?.modelSelection.instanceId,
-          activeProject?.defaultModelSelection?.instanceId,
+          activeProjectDefaultModelSelection?.instanceId,
         ],
         lockedProvider,
         lockedInstanceId:
           activeThread?.session?.providerInstanceId ?? activeThread?.modelSelection.instanceId,
       }),
     [
-      activeProject?.defaultModelSelection?.instanceId,
+      activeProjectDefaultModelSelection?.instanceId,
       activeThread?.modelSelection.instanceId,
       activeThread?.session?.providerInstanceId,
       lockedProvider,
 @@ -3652,11 +3667,14 @@ export default function ChatView(props: ChatViewProps) {
       keybindingCommand: KeybindingCommand;
     }): Promise<AtomCommandResult<void, unknown>> => {
       const updateResult = mapAtomCommandResult(
-        await updateProject({
+        await updateProjectScriptSettings({
           environmentId,
           input: {
-            projectId: input.projectId,
+            patch: {
-            scripts: input.nextScripts,
+              projectScriptOverrides: {
+                [input.projectId]: input.nextScripts,
+              },
+            },
           },
         }),
         () => undefined,
 @@ -3681,7 +3699,7 @@ export default function ChatView(props: ChatViewProps) {
       }
       return updateResult;
     },
-    [environmentId, updateProject, upsertKeybinding],
+    [environmentId, updateProjectScriptSettings, upsertKeybinding],
   );
   const saveProjectScript = useCallback(
     async (input: NewProjectScriptInput): Promise<AtomCommandResult<void, unknown>> => {
 @@ -3690,28 +3708,28 @@ export default function ChatView(props: ChatViewProps) {
       }
       const nextId = nextProjectScriptId(
         input.name,
-        activeProject.scripts.map((script) => script.id),
+        activeProjectScripts.map((script) => script.id),
       );
       const nextScript = buildProjectScript(nextId, input);
       const nextScripts = input.runOnWorktreeCreate
         ? [
-            ...activeProject.scripts.map((script) =>
+            ...activeProjectScripts.map((script) =>
               script.runOnWorktreeCreate ? { ...script, runOnWorktreeCreate: false } : script,
             ),
             nextScript,
           ]
-        : [...activeProject.scripts, nextScript];
+        : [...activeProjectScripts, nextScript];
       return persistProjectScripts({
         projectId: activeProject.id,
         projectCwd: activeProject.workspaceRoot,
-        previousScripts: activeProject.scripts,
+        previousScripts: activeProjectScripts,
         nextScripts,
         keybinding: input.keybinding,
         keybindingCommand: commandForProjectScript(nextId),
       });
     },
-    [activeProject, persistProjectScripts],
+    [activeProject, activeProjectScripts, persistProjectScripts],
   );
   const updateProjectScript = useCallback(
     async (
 @@ -3721,13 +3739,13 @@ export default function ChatView(props: ChatViewProps) {
       if (!activeProject) {
         return AsyncResult.success(undefined);
       }
-      const existingScript = activeProject.scripts.find((script) => script.id === scriptId);
+      const existingScript = activeProjectScripts.find((script) => script.id === scriptId);
       if (!existingScript) {
         return AsyncResult.failure(Cause.fail(new Error("Script not found.")));
       }
       const updatedScript = buildProjectScript(existingScript.id, input);
-      const nextScripts = activeProject.scripts.map((script) =>
+      const nextScripts = activeProjectScripts.map((script) =>
         script.id === scriptId
           ? updatedScript
           : input.runOnWorktreeCreate
 @@ -3738,27 +3756,27 @@ export default function ChatView(props: ChatViewProps) {
       return persistProjectScripts({
         projectId: activeProject.id,
         projectCwd: activeProject.workspaceRoot,
-        previousScripts: activeProject.scripts,
+        previousScripts: activeProjectScripts,
         nextScripts,
         keybinding: input.keybinding,
         keybindingCommand: commandForProjectScript(scriptId),
       });
     },
-    [activeProject, persistProjectScripts],
+    [activeProject, activeProjectScripts, persistProjectScripts],
   );
   const deleteProjectScript = useCallback(
     async (scriptId: string): Promise<AtomCommandResult<void, unknown>> => {
       if (!activeProject) {
         return AsyncResult.success(undefined);
       }
-      const nextScripts = activeProject.scripts.filter((script) => script.id !== scriptId);
+      const nextScripts = activeProjectScripts.filter((script) => script.id !== scriptId);
-      const deletedName = activeProject.scripts.find((s) => s.id === scriptId)?.name;
+      const deletedName = activeProjectScripts.find((s) => s.id === scriptId)?.name;
       const result = await persistProjectScripts({
         projectId: activeProject.id,
         projectCwd: activeProject.workspaceRoot,
-        previousScripts: activeProject.scripts,
+        previousScripts: activeProjectScripts,
         nextScripts,
         keybinding: null,
         keybindingCommand: commandForProjectScript(scriptId),
 @@ -3780,7 +3798,7 @@ export default function ChatView(props: ChatViewProps) {
       }
       return result;
     },
-    [activeProject, persistProjectScripts],
+    [activeProject, activeProjectScripts, persistProjectScripts],
   );
   const handleRuntimeModeChange = useCallback(
 @@ -6061,7 +6079,7 @@ export default function ChatView(props: ChatViewProps) {
       const scriptId = projectScriptIdFromCommand(command);
       if (!scriptId || !activeProject) return;
-      const script = activeProject.scripts.find((entry) => entry.id === scriptId);
+      const script = activeProjectScripts.find((entry) => entry.id === scriptId);
       if (!script) return;
       event.preventDefault();
       event.stopPropagation();
 @@ -6072,6 +6090,7 @@ export default function ChatView(props: ChatViewProps) {
   }, [
     activeProject,
     activeRightPanelSurface,
+    activeProjectScripts,
     addTerminalSurface,
     activeThreadRef,
     activeThreadPinned,
 @@ -6747,7 +6766,7 @@ export default function ChatView(props: ChatViewProps) {
     const title = truncate(titleSeed);
     const threadCreateModelSelection = createModelSelection(
       ctxSelectedModelSelection.instanceId,
-      ctxSelectedModel || activeProject.defaultModelSelection?.model || DEFAULT_MODEL,
+      ctxSelectedModel || activeProjectDefaultModelSelection?.model || DEFAULT_MODEL,
       ctxSelectedModelSelection.options,
     );
 @@ -7885,7 +7904,7 @@ export default function ChatView(props: ChatViewProps) {
             activeProjectFaviconPath={activeProject?.faviconPath ?? null}
             activeProjectIcon={activeProject?.projectIcon ?? null}
             openInCwd={gitCwd}
-            activeProjectScripts={activeProject?.scripts}
+            activeProjectScripts={activeProjectScripts}
             preferredScriptId={
               activeProject ? (lastInvokedScriptByProjectId[activeProject.id] ?? null) : null
             }
 @@ -8124,9 +8143,7 @@ export default function ChatView(props: ChatViewProps) {
                             interactionMode={interactionMode}
                             lockedProvider={lockedProvider}
                             providerStatuses={providerStatuses as ServerProvider[]}
-                            activeProjectDefaultModelSelection={
+                            activeProjectDefaultModelSelection={activeProjectDefaultModelSelection}
-                              activeProject?.defaultModelSelection
-                            }
                             activeThreadModelSelection={activeThread?.modelSelection}
                             activeContextWindow={activeContextWindow}
                             compactThreadUnavailable={compactThreadUnavailable}

apps/web/src/components/CommandPalette.tsx+2

...	@@ -1791,6 +1791,8 @@ function OpenCommandPaletteDialog(props: {	...	@@ -1791,6 +1791,8 @@ function OpenCommandPaletteDialog(props: {
1791	run: async () => {	1791	run: async () => {
1792	await navigate({	1792	await navigate({
1793	to: item.to,	1793	to: item.to,
		1794	search: (previous) =>
		1795	item.to === "/settings/projects" ? { ...previous, project: undefined } : previous,
1794	hash: item.targetId ?? item.id,	1796	hash: item.targetId ?? item.id,
1795	replace: pathname === item.to,	1797	replace: pathname === item.to,
1796	hashScrollIntoView: false,	1798	hashScrollIntoView: false,

apps/web/src/components/chat/DraftHeroHeadline.tsx+7-2

 @@ -149,8 +149,13 @@ export function DraftHeroHeadline({
             );
             if (!hasExplicitComposerModelSelection(currentDraft)) {
               applyStickyState(draftId);
-              if (project.defaultModelSelection) {
+              const defaultModelSelection =
-                setModelSelection(draftId, project.defaultModelSelection, {
+                project.defaultModelSelection ??
+                environments.find(
+                  (environment) => environment.environmentId === project.environmentId,
+                )?.serverConfig?.settings.defaultModelSelection;
+              if (defaultModelSelection) {
+                setModelSelection(draftId, defaultModelSelection, {
                   replaceOptions: true,
                 });
               }

apps/web/src/components/desktop/DesktopAppActivationCoordinator.tsx+1-6

apps/web/src/components/onboarding/WelcomeWizard.tsx+1-6

apps/web/src/components/settings/IntegrationsSettings.test.tsx+13-1

 @@ -1,4 +1,10 @@
 import { DEFAULT_CLIENT_SETTINGS, DEFAULT_UNIFIED_SETTINGS } from "@t3tools/contracts";
+import {
+  createMemoryHistory,
+  createRootRoute,
+  createRouter,
+  RouterProvider,
+} from "@tanstack/react-router";
 import { act, StrictMode, type ReactNode } from "react";
 import { create, type ReactTestRenderer } from "react-test-renderer";
 import { afterEach, beforeEach, describe, expect, it, vi } from "vite-plus/test";
 @@ -44,13 +50,19 @@ afterEach(async () => {
 });
 async function openSettings() {
+  const router = createRouter({
+    routeTree: createRootRoute({ component: IntegrationsSettingsPanel }),
+    history: createMemoryHistory(),
+  });
+  await router.load();
   await act(() => {
     renderer = create(
       <StrictMode>
-        <IntegrationsSettingsPanel />
+        <RouterProvider router={router} />
       </StrictMode>,
     );
   });
+  expect(renderer!.root.findByType(IntegrationsSettingsPanel)).toBeDefined();
 }
 describe("Integrations browser discovery", () => {

apps/web/src/components/settings/IntegrationsSettings.tsx+10-30

 @@ -20,7 +20,6 @@ import {
   DEFAULT_BROWSER_RECORDING_FRAME_RATE,
   DEFAULT_BROWSER_VIEWPORT,
   DEFAULT_PREVIEW_APPEARANCE,
-  DEFAULT_UNIFIED_SETTINGS,
   DEFAULT_PREVIEW_ZOOM_FACTOR,
   FILL_PREVIEW_VIEWPORT,
   PREVIEW_VIEWPORT_MAX_AREA,
 @@ -35,6 +34,7 @@ import {
   type PreviewViewportSetting,
 } from "@t3tools/contracts";
 import { PREVIEW_VIEWPORT_PRESETS } from "@t3tools/shared/previewViewport";
+import { Link } from "@tanstack/react-router";
 import { InfoIcon, MoreVertical, Plus as PlusIcon } from "lucide-react";
 import { useCallback, useRef, useState, type ReactNode } from "react";
 @@ -86,7 +86,6 @@ import {
   persistClientSettingsUpdate,
   useClientSettings,
   useClientSettingsHydrated,
-  usePrimarySettings,
   useUpdatePrimarySettings,
 } from "~/hooks/useSettings";
 @@ -552,39 +551,20 @@ function BrowserLinkTargetSetting({ disabled }: { readonly disabled: boolean })
 }
 function AgentBrowserAccessSetting() {
-  const settings = usePrimarySettings();
-  const updateSettings = useUpdatePrimarySettings();
   return (
     <SettingsRow
-      serverScoped
       {...searchableSetting("agent-browser-access")}
-      description="Allow agents to use the preview browser. Off hides browser tools from agents, not you."
+      description="Choose whether agents can use the preview browser for all projects or a specific project."
-      status={
-        settings.enableAgentBrowserAccess
-          ? undefined
-          : "Applies to sessions started from now on; a running agent keeps the tools it was given."
-      }
-      resetAction={
-        settings.enableAgentBrowserAccess !== DEFAULT_UNIFIED_SETTINGS.enableAgentBrowserAccess ? (
-          <SettingResetButton
-            label="agent browser access"
-            onClick={() =>
-              updateSettings({
-                enableAgentBrowserAccess: DEFAULT_UNIFIED_SETTINGS.enableAgentBrowserAccess,
-              })
-            }
-          />
-        ) : null
-      }
       control={
-        <Switch
+        <Button
-          checked={settings.enableAgentBrowserAccess}
+          render={
-          onCheckedChange={(checked) =>
+            <Link to="/settings/projects" search={{ project: undefined, machine: undefined }} />
-            updateSettings({ enableAgentBrowserAccess: Boolean(checked) })
           }
-          aria-label="Allow agent browser access"
+          size="sm"
-        />
+          variant="outline"
+        >
+          Project settings
+        </Button>
       }
     />
   );

apps/web/src/components/settings/ProjectActionsList.tsx created+69

...	@@ -0,0 +1,69 @@
1	import type { ProjectScript, ResolvedKeybindingsConfig } from "@t3tools/contracts";
2	import { SettingsIcon } from "lucide-react";
3	import { shortcutLabelForCommand } from "../../keybindings";
4	import { commandForProjectScript } from "../../projectScripts";
5	import { ScriptIcon } from "../projectScriptEditor";
6	import { Button } from "../ui/button";
7	import { SettingsRow } from "./settingsLayout";
8
9	export function ProjectActionsList({
10	scripts,
11	keybindings,
12	disabled,
13	onEdit,
14	}: {
15	scripts: readonly ProjectScript[];
16	keybindings: ResolvedKeybindingsConfig;
17	disabled: boolean;
18	onEdit: (script: ProjectScript) => void;
19	}) {
20	if (scripts.length === 0)
21	return (
22	<p className="px-3 py-2 text-base text-muted-foreground sm:px-4 sm:text-sm">
23	No actions configured.
24	</p>
25	);
26	return scripts.map((script) => {
27	const shortcutLabel = shortcutLabelForCommand(keybindings, commandForProjectScript(script.id));
28	return (
29	<SettingsRow
30	key={script.id}
31	className="group py-2"
32	title={
33	<span className="flex min-w-0 items-center gap-2">
34	<ScriptIcon icon={script.icon} className="size-4 shrink-0 text-muted-foreground" />
35	<span className="min-w-0 truncate">{script.name}</span>
36	{script.runOnWorktreeCreate ? (
37	<span className="shrink-0 rounded-sm border border-border/60 px-1.5 py-px text-[11px] font-normal text-muted-foreground">
38	setup
39	</span>
40	) : null}
41	{script.previewUrl ? (
42	<span className="shrink-0 rounded-sm border border-border/60 px-1.5 py-px text-[11px] font-normal text-muted-foreground max-sm:hidden">
43	preview · desktop only
44	</span>
45	) : null}
46	</span>
47	}
48	description={<code className="block max-w-full truncate font-mono">{script.command}</code>}
49	control={
50	<>
51	{shortcutLabel ? (
52	<span className="text-xs text-muted-foreground">{shortcutLabel}</span>
53	) : null}
54	<Button
55	size="icon-xs"
56	variant="ghost"
57	className="shrink-0 text-muted-foreground opacity-0 group-focus-within:opacity-100 group-hover:opacity-100"
58	aria-label={`Edit ${script.name}`}
59	disabled={disabled}
60	onClick={() => onEdit(script)}
61	>
62	<SettingsIcon className="size-3.5" />
63	</Button>
64	</>
65	}
66	/>
67	);
68	});
69	}

apps/web/src/components/settings/ProjectDefaultActionsSettings.tsx created+114

...	@@ -0,0 +1,114 @@
1	import type { EnvironmentId } from "@t3tools/contracts";
2	import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
3	import { PlusIcon } from "lucide-react";
4	import { useState } from "react";
5	import { useEnvironments } from "../../state/environments";
6	import {
7	EMPTY_PROJECT_SCRIPT_INPUT,
8	editorRequestForScript,
9	ProjectScriptEditorDialog,
10	type ProjectScriptEditorRequest,
11	} from "../projectScriptEditor";
12	import { Button } from "../ui/button";
13	import { ProjectActionsList } from "./ProjectActionsList";
14	import { useProjectScriptSettings } from "./ProjectSettingsPanel";
15	import { SettingResetButton, SettingsRow, SettingsSection } from "./settingsLayout";
16
17	export function ProjectDefaultActionsSettings({
18	environmentId,
19	}: {
20	environmentId: EnvironmentId \| null;
21	}) {
22	const { environments } = useEnvironments();
23	const targets = environments.filter(
24	(environment) =>
25	(environmentId === null \|\| environment.environmentId === environmentId) &&
26	environment.connection.phase === "connected" &&
27	environment.serverConfig !== null,
28	);
29	const representative = targets[0]?.serverConfig;
30	const scripts = representative?.settings.defaultProjectScripts ?? [];
31	const keybindings = representative?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
32	const mixed = targets.some(
33	(target) =>
34	JSON.stringify(target.serverConfig?.settings.defaultProjectScripts) !==
35	JSON.stringify(scripts),
36	);
37	const [request, setRequest] = useState<ProjectScriptEditorRequest \| null>(null);
38	const { saving, persist, submit } = useProjectScriptSettings(
39	targets.flatMap(({ environmentId, serverConfig }) =>
40	serverConfig
41	? [
42	{
43	environmentId,
44	settings: serverConfig.settings,
45	keybindings: serverConfig.keybindings,
46	},
47	]
48	: [],
49	),
50	);
51
52	return (
53	<SettingsSection title="Actions">
54	<SettingsRow
55	title="Import scripts"
56	aria-disabled
57	description="Select a project to import actions from its checkout's t3.json."
58	control={
59	<Button size="xs" variant="ghost" disabled>
60	Import scripts
61	</Button>
62	}
63	/>
64	<SettingsRow
65	title="Default actions"
66	description="Available in every inheriting checkout. Commands run in that checkout or its worktree."
67	resetAction={
68	targets.some(
69	(target) => (target.serverConfig?.settings.defaultProjectScripts.length ?? 0) > 0,
70	) ? (
71	<SettingResetButton
72	label="default actions"
73	disabled={saving}
74	onClick={() => void persist(() => [])}
75	/>
76	) : null
77	}
78	control={
79	<Button
80	size="xs"
81	variant="outline"
82	disabled={saving \|\| targets.length === 0}
83	onClick={() => setRequest({ scriptId: null, initial: EMPTY_PROJECT_SCRIPT_INPUT })}
84	>
85	<PlusIcon className="size-3.5" />
86	Add action
87	</Button>
88	}
89	/>
90	{mixed ? (
91	<SettingsRow
92	title="Different actions across machines"
93	description="Select a machine to edit its actions. Adding an action applies to all selected connected machines."
94	/>
95	) : (
96	<ProjectActionsList
97	scripts={scripts}
98	keybindings={keybindings}
99	disabled={saving}
100	onEdit={(script) => setRequest(editorRequestForScript(script, keybindings))}
101	/>
102	)}
103	<ProjectScriptEditorDialog
104	request={request}
105	scripts={scripts}
106	onSubmit={submit}
107	onDelete={(id) =>
108	void persist((current) => current.filter((script) => script.id !== id), id, null)
109	}
110	onClose={() => setRequest(null)}
111	/>
112	</SettingsSection>
113	);
114	}

apps/web/src/components/settings/ProjectDefaultsSettings.tsx created+474

...	@@ -0,0 +1,474 @@
1	import {
2	DEFAULT_CLIENT_SETTINGS,
3	DEFAULT_SERVER_SETTINGS,
4	type EnvironmentId,
5	type ModelSelection,
6	type ProviderInstanceId,
7	type ServerSettingsPatch,
8	} from "@t3tools/contracts";
9	import { createModelSelection } from "@t3tools/shared/model";
10	import { useNavigate } from "@tanstack/react-router";
11	import { useRef, useState } from "react";
12	import { Trash2Icon } from "lucide-react";
13
14	import { useClientSettings, useUpdateClientSettings } from "../../hooks/useSettings";
15	import { getCustomModelOptionsByInstance } from "../../modelSelection";
16	import {
17	applyProviderInstanceSettings,
18	deriveProviderInstanceEntries,
19	resolveDefaultProviderModelSelection,
20	sortProviderInstanceEntries,
21	} from "../../providerInstances";
22	import { useEnvironments, usePrimaryEnvironmentId } from "../../state/environments";
23	import { EMPTY_SERVER_PROVIDERS, serverEnvironment } from "../../state/server";
24	import { useAtomCommand } from "../../state/use-atom-command";
25	import { resolveEnvModeLabel } from "../BranchToolbar.logic";
26	import { ProviderModelPicker } from "../chat/ProviderModelPicker";
27	import { TraitsPicker } from "../chat/TraitsPicker";
28	import { Select, SelectItem, SelectPopup, SelectTrigger, SelectValue } from "../ui/select";
29	import { toastManager } from "../ui/toast";
30	import { Switch } from "../ui/switch";
31	import { Button } from "../ui/button";
32	import { Input } from "../ui/input";
33	import { PROJECT_GROUPING_MODE_LABELS } from "./ProjectSettingsPanel";
34	import { ProjectDefaultActionsSettings } from "./ProjectDefaultActionsSettings";
35	import { searchableSetting } from "./settingsSearch";
36	import {
37	SETTINGS_PICKER_TRIGGER_CLASSNAME,
38	SettingResetButton,
39	SettingsPageContainer,
40	SettingsRow,
41	SettingsSection,
42	} from "./settingsLayout";
43
44	/** Defaults are written only to the machines selected on the projects settings page. */
45	export function ProjectDefaultsSettings({
46	environmentId,
47	}: {
48	environmentId: EnvironmentId \| null;
49	}) {
50	const { environments } = useEnvironments();
51	const primaryEnvironmentId = usePrimaryEnvironmentId();
52	const clientSettings = useClientSettings();
53	const updateClientSettings = useUpdateClientSettings();
54	const navigate = useNavigate();
55	const updateSettings = useAtomCommand(
56	serverEnvironment.updateSettings,
57	"project defaults update",
58	);
59	const savingRef = useRef(new Set<string>());
60	const [saving, setSaving] = useState<ReadonlySet<string>>(new Set());
61	const scoped = environments.filter(
62	(environment) => environmentId === null \|\| environment.environmentId === environmentId,
63	);
64	const targets = scoped.filter(
65	(environment) =>
66	environment.connection.phase === "connected" && environment.serverConfig !== null,
67	);
68	const representative =
69	targets.find((environment) => environment.environmentId === primaryEnvironmentId) ?? targets[0];
70	const serverSettings = representative?.serverConfig?.settings ?? DEFAULT_SERVER_SETTINGS;
71	const providers = representative?.serverConfig?.providers ?? EMPTY_SERVER_PROVIDERS;
72	const settings = { ...serverSettings, ...clientSettings };
73	const storedSelection = serverSettings.defaultModelSelection;
74	const selection = resolveDefaultProviderModelSelection(providers, storedSelection);
75	const entries = sortProviderInstanceEntries(
76	applyProviderInstanceSettings(deriveProviderInstanceEntries(providers), settings),
77	);
78	const modelOptions = getCustomModelOptionsByInstance(
79	settings,
80	providers,
81	selection?.instanceId,
82	selection?.model,
83	);
84	const activeEntry = entries.find((entry) => entry.instanceId === selection?.instanceId);
85	const mixedModel = targets.some(
86	(target) =>
87	JSON.stringify(target.serverConfig?.settings.defaultModelSelection) !==
88	JSON.stringify(storedSelection),
89	);
90	const mixedWorkspace = targets.some(
91	(target) =>
92	target.serverConfig?.settings.defaultThreadEnvMode !== serverSettings.defaultThreadEnvMode,
93	);
94	const mixedBrowser = targets.some(
95	(target) =>
96	target.serverConfig?.settings.enableAgentBrowserAccess !==
97	serverSettings.enableAgentBrowserAccess,
98	);
99	const disabled = (key: keyof ServerSettingsPatch) => targets.length === 0 \|\| saving.has(key);
100	const mixedAutoPull = targets.some(
101	(target) => target.serverConfig?.settings.defaultAutoPull !== serverSettings.defaultAutoPull,
102	);
103
104	function modelDisabledReason(instanceId: ProviderInstanceId, model: string): string \| null {
105	const sourceEntry = entries.find((entry) => entry.instanceId === instanceId);
106	for (const target of targets) {
107	const config = target.serverConfig;
108	if (!config) continue;
109	const entry = applyProviderInstanceSettings(
110	deriveProviderInstanceEntries(config.providers),
111	config.settings,
112	).find((candidate) => candidate.instanceId === instanceId);
113	const options = getCustomModelOptionsByInstance(
114	{ ...config.settings, ...clientSettings },
115	config.providers,
116	).get(instanceId);
117	if (
118	!entry?.enabled \|\|
119	!entry.isAvailable \|\|
120	entry.driverKind !== sourceEntry?.driverKind \|\|
121	!options?.some((option) => option.slug === model && !option.isUnavailable)
122	) {
123	return `This model is unavailable on ${target.label}. Select that machine to choose its default separately.`;
124	}
125	}
126	return null;
127	}
128
129	async function save(patch: ServerSettingsPatch) {
130	const keys = Object.keys(patch);
131	if (targets.length === 0 \|\| keys.some((key) => savingRef.current.has(key))) return;
132	const nextModel = patch.defaultModelSelection;
133	const reason = nextModel ? modelDisabledReason(nextModel.instanceId, nextModel.model) : null;
134	if (reason) {
135	toastManager.add({ type: "error", title: "Default model not saved", description: reason });
136	return;
137	}
138	for (const key of keys) savingRef.current.add(key);
139	setSaving(new Set(savingRef.current));
140	try {
141	const results = await Promise.all(
142	targets.map((target) =>
143	updateSettings({ environmentId: target.environmentId, input: { patch } }),
144	),
145	);
146	const failedTargets = targets.filter((_, index) => results[index]?._tag === "Failure");
147	if (failedTargets.length > 0) {
148	toastManager.add({
149	type: "error",
150	title: "Project defaults not saved on every machine",
151	description: `Could not update ${failedTargets.map((target) => target.label).join(", ")}. Other machines may have saved the change.`,
152	});
153	}
154	} finally {
155	for (const key of keys) savingRef.current.delete(key);
156	setSaving(new Set(savingRef.current));
157	}
158	}
159
160	const setModel = (value: ModelSelection \| null) => void save({ defaultModelSelection: value });
161	return (
162	<SettingsPageContainer>
163	<SettingsSection
164	id={searchableSetting("project-defaults").id}
165	title="Project defaults"
166	hideTitle
167	>
168	<SettingsRow
169	title="Name"
170	aria-disabled
171	description="Select a project to change its name."
172	control={
173	<Input
174	size="sm"
175	className="w-full sm:w-64"
176	aria-label="Project name"
177	placeholder="Select a project"
178	disabled
179	/>
180	}
181	/>
182	<SettingsRow
183	title="Project icon"
184	aria-disabled
185	description="Select a project to change its icon."
186	control={
187	<div className="flex items-center gap-2">
188	<Button size="sm" variant="outline" disabled>
189	Choose icon
190	</Button>
191	<Button size="sm" variant="outline" disabled>
192	Choose file
193	</Button>
194	</div>
195	}
196	/>
197	{scoped.length > targets.length \|\| targets.length === 0 ? (
198	<p role="status" className="px-4 py-3 text-sm text-muted-foreground">
199	{targets.length === 0
200	? "Connect a machine to change its project defaults."
201	: "Changes apply to connected machines only. Offline machines keep their current defaults."}
202	</p>
203	) : null}
204	<SettingsRow
205	title="Model"
206	description="Default model for new threads. Projects can override it."
207	status={
208	targets.length === 0
209	? undefined
210	: mixedModel
211	? "Differs by machine"
212	: storedSelection === null
213	? "Automatic"
214	: undefined
215	}
216	resetAction={
217	storedSelection !== null \|\| mixedModel ? (
218	<SettingResetButton
219	label="default model"
220	disabled={disabled("defaultModelSelection")}
221	onClick={() => setModel(null)}
222	/>
223	) : null
224	}
225	control={
226	selection && activeEntry ? (
227	<fieldset
228	disabled={disabled("defaultModelSelection")}
229	className="flex min-w-0 flex-wrap items-center justify-end gap-1.5 disabled:opacity-50"
230	>
231	<ProviderModelPicker
232	activeInstanceId={selection.instanceId}
233	model={selection.model}
234	lockedProvider={null}
235	instanceEntries={entries}
236	modelOptionsByInstance={modelOptions}
237	disabled={disabled("defaultModelSelection")}
238	triggerVariant="outline"
239	triggerClassName={SETTINGS_PICKER_TRIGGER_CLASSNAME}
240	getModelDisabledReason={modelDisabledReason}
241	onOpenProviderSetup={(instanceId) => {
242	if (representative)
243	void navigate({
244	to: "/settings/providers",
245	search: { environmentId: representative.environmentId, instanceId },
246	});
247	}}
248	onInstanceModelChange={(instanceId, model) =>
249	setModel(createModelSelection(instanceId, model))
250	}
251	/>
252	{!mixedModel ? (
253	<TraitsPicker
254	provider={activeEntry.driverKind}
255	models={activeEntry.models}
256	model={selection.model}
257	prompt=""
258	onPromptChange={() => {}}
259	modelOptions={selection.options ?? []}
260	allowPromptInjectedEffort={false}
261	planModeEnabled={settings.planModeEnabled}
262	triggerVariant="outline"
263	triggerClassName={SETTINGS_PICKER_TRIGGER_CLASSNAME}
264	onModelOptionsChange={(options) =>
265	setModel(createModelSelection(selection.instanceId, selection.model, options))
266	}
267	/>
268	) : null}
269	</fieldset>
270	) : (
271	<span className="text-sm text-muted-foreground">No providers available</span>
272	)
273	}
274	/>
275	<SettingsRow
276	id={searchableSetting("new-threads").id}
277	title="Workspace"
278	description="Where new threads start, unless overridden by the project or t3.json."
279	resetAction={
280	mixedWorkspace \|\|
281	serverSettings.defaultThreadEnvMode !== DEFAULT_SERVER_SETTINGS.defaultThreadEnvMode ? (
282	<SettingResetButton
283	label="default workspace"
284	disabled={disabled("defaultThreadEnvMode")}
285	onClick={() =>
286	void save({ defaultThreadEnvMode: DEFAULT_SERVER_SETTINGS.defaultThreadEnvMode })
287	}
288	/>
289	) : null
290	}
291	control={
292	<Select
293	disabled={disabled("defaultThreadEnvMode")}
294	value={mixedWorkspace ? "mixed" : serverSettings.defaultThreadEnvMode}
295	onValueChange={(value) => {
296	if (value === "local" \|\| value === "worktree")
297	void save({ defaultThreadEnvMode: value });
298	}}
299	>
300	<SelectTrigger size="sm" aria-label="Default workspace">
301	<SelectValue>
302	{targets.length === 0
303	? "Unavailable"
304	: mixedWorkspace
305	? "Differs by machine"
306	: resolveEnvModeLabel(serverSettings.defaultThreadEnvMode)}
307	</SelectValue>
308	</SelectTrigger>
309	<SelectPopup align="end" alignItemWithTrigger={false}>
310	<SelectItem value="local">{resolveEnvModeLabel("local")}</SelectItem>
311	<SelectItem value="worktree">{resolveEnvModeLabel("worktree")}</SelectItem>
312	</SelectPopup>
313	</Select>
314	}
315	/>
316	<SettingsRow
317	title="Automatically pull"
318	description="Keeps the default branch current when the checkout has no local changes or commits. Projects can override it."
319	status={mixedAutoPull ? "Differs by machine" : undefined}
320	resetAction={
321	serverSettings.defaultAutoPull \|\| mixedAutoPull ? (
322	<SettingResetButton
323	label="default automatic pull"
324	tooltip="Reset automatic pull to off"
325	disabled={disabled("defaultAutoPull")}
326	onClick={() => void save({ defaultAutoPull: false })}
327	/>
328	) : null
329	}
330	control={
331	<Switch
332	aria-label="Default automatic pull"
333	checked={serverSettings.defaultAutoPull}
334	disabled={disabled("defaultAutoPull")}
335	onCheckedChange={(enabled) => void save({ defaultAutoPull: enabled })}
336	/>
337	}
338	/>
339	<SettingsRow
340	id={searchableSetting("agent-browser-access").id}
341	title="Agent browser access"
342	description="Allow agents to use the shared browser. Projects can override it."
343	resetAction={
344	mixedBrowser \|\|
345	serverSettings.enableAgentBrowserAccess !==
346	DEFAULT_SERVER_SETTINGS.enableAgentBrowserAccess ? (
347	<SettingResetButton
348	label="default browser access"
349	disabled={disabled("enableAgentBrowserAccess")}
350	onClick={() =>
351	void save({
352	enableAgentBrowserAccess: DEFAULT_SERVER_SETTINGS.enableAgentBrowserAccess,
353	})
354	}
355	/>
356	) : null
357	}
358	control={
359	<Select
360	disabled={disabled("enableAgentBrowserAccess")}
361	value={
362	mixedBrowser
363	? "mixed"
364	: serverSettings.enableAgentBrowserAccess
365	? "enabled"
366	: "disabled"
367	}
368	onValueChange={(value) => {
369	if (value === "enabled" \|\| value === "disabled")
370	void save({ enableAgentBrowserAccess: value === "enabled" });
371	}}
372	>
373	<SelectTrigger size="sm" aria-label="Default agent browser access">
374	<SelectValue>
375	{targets.length === 0
376	? "Unavailable"
377	: mixedBrowser
378	? "Differs by machine"
379	: serverSettings.enableAgentBrowserAccess
380	? "Enabled"
381	: "Disabled"}
382	</SelectValue>
383	</SelectTrigger>
384	<SelectPopup align="end" alignItemWithTrigger={false}>
385	<SelectItem value="enabled">Enabled</SelectItem>
386	<SelectItem value="disabled">Disabled</SelectItem>
387	</SelectPopup>
388	</Select>
389	}
390	/>
391	</SettingsSection>
392	<SettingsSection title="Checkout">
393	<SettingsRow
394	title="Checkout"
395	aria-disabled
396	description="Select a project to choose one of its checkouts."
397	control={
398	<Select disabled>
399	<SelectTrigger size="sm" aria-label="Checkout">
400	<SelectValue placeholder="Select a project" />
401	</SelectTrigger>
402	</Select>
403	}
404	/>
405	<SettingsRow
406	title="Project grouping"
407	description="Default grouping across all machines in this client. Individual checkout overrides are preserved."
408	resetAction={
409	clientSettings.sidebarProjectGroupingMode !==
410	DEFAULT_CLIENT_SETTINGS.sidebarProjectGroupingMode ? (
411	<SettingResetButton
412	label="default project grouping"
413	onClick={() =>
414	void updateClientSettings({
415	sidebarProjectGroupingMode: DEFAULT_CLIENT_SETTINGS.sidebarProjectGroupingMode,
416	})
417	}
418	/>
419	) : null
420	}
421	control={
422	<Select
423	value={clientSettings.sidebarProjectGroupingMode}
424	onValueChange={(value) => {
425	if (value === "repository" \|\| value === "repository_path" \|\| value === "separate")
426	void updateClientSettings({ sidebarProjectGroupingMode: value });
427	}}
428	>
429	<SelectTrigger size="sm" aria-label="Default project grouping">
430	<SelectValue>
431	{PROJECT_GROUPING_MODE_LABELS[clientSettings.sidebarProjectGroupingMode]}
432	</SelectValue>
433	</SelectTrigger>
434	<SelectPopup align="end" alignItemWithTrigger={false}>
435	<SelectItem value="repository">
436	{PROJECT_GROUPING_MODE_LABELS.repository}
437	</SelectItem>
438	<SelectItem value="repository_path">
439	{PROJECT_GROUPING_MODE_LABELS.repository_path}
440	</SelectItem>
441	<SelectItem value="separate">{PROJECT_GROUPING_MODE_LABELS.separate}</SelectItem>
442	</SelectPopup>
443	</Select>
444	}
445	/>
446	<SettingsRow
447	title="Remove checkout"
448	aria-disabled
449	description="Select a project to remove one of its checkouts."
450	control={
451	<Button size="sm" variant="destructive-outline" disabled>
452	<Trash2Icon className="size-3.5" />
453	Remove checkout
454	</Button>
455	}
456	/>
457	</SettingsSection>
458	<ProjectDefaultActionsSettings environmentId={environmentId} />
459	<SettingsSection title="Danger">
460	<SettingsRow
461	title="Remove project"
462	aria-disabled
463	description="Select a project to remove its entries and threads. Files on disk are not touched."
464	control={
465	<Button size="sm" variant="destructive-outline" disabled>
466	<Trash2Icon />
467	Remove project
468	</Button>
469	}
470	/>
471	</SettingsSection>
472	</SettingsPageContainer>
473	);
474	}

apps/web/src/components/settings/ProjectSettingsPanel.tsx+599-459

 @@ -12,52 +12,53 @@ import {
   deriveProjectGroupingOverrideKey,
   selectProjectGroupingSettings,
 } from "../../logicalProject";
-import type {
+import {
-  ContextMenuItem,
+  type EnvironmentId,
-  ModelSelection,
+  type ModelSelection,
-  ProjectIconOverride,
+  type ProjectIconOverride,
-  ProviderDriverKind,
+  type ProjectId,
-  SidebarProjectGroupingMode,
+  type ProjectScript,
-  T3ProjectFileScript,
+  type ResolvedKeybindingsConfig,
-  ThreadEnvMode,
+  type ServerSettings,
+  type ProviderDriverKind,
+  type SidebarProjectGroupingMode,
+  type T3ProjectFileScript,
+  type ThreadEnvMode,
 } from "@t3tools/contracts";
 import { resolveEnvModeLabel } from "../BranchToolbar.logic";
 import { createModelSelection } from "@t3tools/shared/model";
+import { resolveProjectAutoPull } from "@t3tools/shared/serverSettings";
+import {
+  projectScriptsInheritDefaults,
+  resolveProjectScripts,
+} from "@t3tools/shared/projectScripts";
 import { DEFAULT_RESOLVED_KEYBINDINGS } from "@t3tools/shared/keybindings";
-import { useCanGoBack, useNavigate } from "@tanstack/react-router";
+import { useNavigate } from "@tanstack/react-router";
+import * as Equal from "effect/Equal";
 import * as Cause from "effect/Cause";
-import { ChevronDownIcon, CopyIcon, PlusIcon, SettingsIcon, Trash2Icon } from "lucide-react";
+import { ChevronDownIcon, PlusIcon, Trash2Icon } from "lucide-react";
-import {
+import { lazy, Suspense, useCallback, useEffect, useMemo, useRef, useState } from "react";
-  lazy,
-  Suspense,
-  useCallback,
-  useEffect,
-  useMemo,
-  useRef,
-  useState,
-  type MouseEvent as ReactMouseEvent,
-} from "react";
 import { useComposerDraftStore } from "../../composerDraftStore";
-import { isElectron } from "../../env";
 import {
   useClientSettings,
   useEnvironmentSettings,
   useUpdateClientSettings,
-  usePrimarySettings,
 } from "../../hooks/useSettings";
-import { useCopyToClipboard } from "../../hooks/useCopyToClipboard";
 import { useT3ProjectFileState } from "../../hooks/useT3ProjectFileScripts";
-import { shortcutLabelForCommand } from "../../keybindings";
+import { ProjectActionsList } from "./ProjectActionsList";
-import { keybindingValueForCommand } from "../../lib/projectScriptKeybindings";
+import { isElectron } from "../../env";
-import { releaseProjectDraftUploads } from "../../lib/composerDraftUploads";
+import {
-import { readLocalApi } from "../../localApi";
+  decodeProjectScriptKeybindingRule,
+  keybindingValueForCommand,
+} from "../../lib/projectScriptKeybindings";
 import {
   buildProjectScript,
   commandForProjectScript,
   nextProjectScriptId,
 } from "../../projectScripts";
-import { decodeProjectScriptKeybindingRule } from "../../lib/projectScriptKeybindings";
+import { releaseProjectDraftUploads } from "../../lib/composerDraftUploads";
+import { readLocalApi } from "../../localApi";
 import {
   applyProviderInstanceSettings,
   deriveProviderInstanceEntries,
 @@ -98,16 +99,8 @@ import {
   MenuTrigger,
 } from "../ui/menu";
 import { Select, SelectItem, SelectPopup, SelectTrigger, SelectValue } from "../ui/select";
-import { SidebarInset } from "../ui/sidebar";
 import { Switch } from "../ui/switch";
 import { stackedThreadToast, toastManager } from "../ui/toast";
-import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
-import {
-  WorkspaceBreadcrumb,
-  WorkspaceBreadcrumbItem,
-  WorkspaceBreadcrumbSeparator,
-} from "../WorkspaceBreadcrumb";
-import { WorkspacePageHeader } from "../WorkspacePageHeader";
 import {
   SETTINGS_PICKER_TRIGGER_CLASSNAME,
   SettingResetButton,
 @@ -127,14 +120,14 @@ const ProjectIconPickerDialog = lazy(() =>
   })),
 );
-const PROJECT_GROUPING_MODE_LABELS: Record<SidebarProjectGroupingMode, string> = {
+export const PROJECT_GROUPING_MODE_LABELS: Record<SidebarProjectGroupingMode, string> = {
   repository: "Group by repository",
   repository_path: "Group by repository path",
   separate: "Keep separate",
 };
 /** Logical project groups for the settings page, sorted by display name. */
-function useSettingsProjectGroups(): SidebarProjectSnapshot[] {
+export function useSettingsProjectGroups(): SidebarProjectSnapshot[] {
   const projects = useProjects();
   const projectGroupingSettings = useClientSettings(selectProjectGroupingSettings);
   const primaryEnvironmentId = usePrimaryEnvironmentId();
 @@ -162,132 +155,59 @@ function memberKey(member: { environmentId: string; id: string }): string {
   return `${member.environmentId}:${member.id}`;
 }
-export function ProjectSettingsPage({ projectKey }: { projectKey: string }) {
+export function ProjectSettingsPanel({
-  const navigate = useNavigate();
+  projectKey,
-  const canGoBack = useCanGoBack();
+  environmentId = null,
-  const navigateBackWithinApp = useCallback(() => {
+}: {
-    if (canGoBack) {
+  projectKey: string;
-      window.history.back();
+  environmentId?: EnvironmentId | null;
-      return;
+}) {
-    }
-    void navigate({ to: "/" });
-  }, [canGoBack, navigate]);
-  useEffect(() => {
-    const onKeyDown = (event: KeyboardEvent) => {
-      if (event.defaultPrevented) return;
-      if (event.key !== "Escape") return;
-      event.preventDefault();
-      const activeElement = document.activeElement;
-      if (activeElement instanceof HTMLElement) {
-        activeElement.blur();
-      }
-      navigateBackWithinApp();
-    };
-    window.addEventListener("keydown", onKeyDown);
-    return () => window.removeEventListener("keydown", onKeyDown);
-  }, [navigateBackWithinApp]);
-  return (
-    <SidebarInset className="h-dvh min-h-0 overflow-hidden overscroll-y-none bg-background text-foreground isolate">
-      <div className="flex min-h-0 min-w-0 flex-1 flex-col bg-background text-foreground">
-        <WorkspacePageHeader electron={isElectron}>
-          <ProjectSettingsBreadcrumb projectKey={projectKey} />
-        </WorkspacePageHeader>
-        <ProjectSettingsPanel projectKey={projectKey} />
-      </div>
-    </SidebarInset>
-  );
-}
-function ProjectSettingsBreadcrumb({ projectKey }: { projectKey: string }) {
-  const groups = useSettingsProjectGroups();
-  const navigate = useNavigate();
-  const selected = groups.find((group) => group.projectKey === projectKey) ?? null;
-  const openProjectMenu = (event: ReactMouseEvent<HTMLButtonElement>) => {
-    const api = readLocalApi();
-    if (!api) return;
-    const rect = event.currentTarget.getBoundingClientRect();
-    const items: ContextMenuItem<string>[] = groups.map((group) => ({
-      id: group.projectKey,
-      label: group.displayName,
-    }));
-    void settlePromise(() =>
-      api.contextMenu.show(items, { x: rect.left, y: rect.bottom + 4 }),
-    ).then((clicked) => {
-      if (clicked._tag === "Failure" || clicked.value === null) return;
-      void navigate({
-        to: "/projects/$projectKey",
-        params: { projectKey: clicked.value },
-        replace: true,
-        hashScrollIntoView: false,
-      });
-    });
-  };
-  return (
-    <WorkspaceBreadcrumb ariaLabel="Project settings breadcrumb">
-      <WorkspaceBreadcrumbItem>Projects</WorkspaceBreadcrumbItem>
-      <WorkspaceBreadcrumbSeparator />
-      <WorkspaceBreadcrumbItem current>
-        {selected ? (
-          <button
-            type="button"
-            aria-haspopup="menu"
-            aria-label="Switch project"
-            onClick={openProjectMenu}
-            className="group/project-title inline-flex min-w-0 max-w-64 cursor-pointer items-center gap-1 rounded-sm text-left focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-ring"
-          >
-            <span className="min-w-0 truncate">{selected.displayName}</span>
-            <ChevronDownIcon
-              aria-hidden
-              className="size-3.5 shrink-0 text-muted-foreground opacity-0 transition-opacity group-hover/project-title:opacity-100 group-focus-visible/project-title:opacity-100"
-            />
-          </button>
-        ) : (
-          <span className="truncate text-muted-foreground">Unavailable project</span>
-        )}
-      </WorkspaceBreadcrumbItem>
-    </WorkspaceBreadcrumb>
-  );
-}
-function ProjectSettingsPanel({ projectKey }: { projectKey: string }) {
   const groups = useSettingsProjectGroups();
   const navigate = useNavigate();
   const selected = groups.find((group) => group.projectKey === projectKey) ?? null;
+  const members = useMemo(
+    () =>
+      selected?.memberProjects.filter(
+        (member) => environmentId === null || member.environmentId === environmentId,
+      ) ?? [],
+    [selected, environmentId],
+  );
   // Remember the members of the last rendered group so a grouping-rule change
   // (which changes the group key) can follow the project to its new group.
-  const lastSelectionRef = useRef<{ key: string; memberKeys: string[] } | null>(null);
+  const lastSelectionRef = useRef<{
+    key: string;
+    environmentId: EnvironmentId | null;
+    memberKeys: string[];
+  } | null>(null);
   useEffect(() => {
-    if (!selected) return;
+    if (!selected || members.length === 0) return;
     lastSelectionRef.current = {
       key: selected.projectKey,
-      memberKeys: selected.memberProjects.map((member) => member.physicalProjectKey),
+      environmentId,
+      memberKeys: members.map((member) => member.physicalProjectKey),
     };
-  }, [selected]);
+  }, [selected, members, environmentId]);
   // A grouping-rule change replaces the group key mid-visit; follow the
   // project to its new key instead of parking on the not-found state.
   useEffect(() => {
-    if (selected !== null) return;
+    if (members.length > 0) return;
     const last = lastSelectionRef.current;
-    if (last?.key !== projectKey) return;
+    if (last?.key !== projectKey || last.environmentId !== environmentId) return;
     const successor = groups.find((group) =>
       group.memberProjects.some((member) => last.memberKeys.includes(member.physicalProjectKey)),
     );
     if (successor) {
       void navigate({
-        to: "/projects/$projectKey",
+        to: "/settings/projects",
-        params: { projectKey: successor.projectKey },
+        search: { project: successor.projectKey, machine: environmentId ?? undefined },
         replace: true,
         hashScrollIntoView: false,
       });
     }
-  }, [groups, navigate, projectKey, selected]);
+  }, [groups, navigate, projectKey, members.length, environmentId]);
   if (!selected) {
     return (
 @@ -298,17 +218,185 @@ function ProjectSettingsPanel({ projectKey }: { projectKey: string }) {
       </div>
     );
   }
-  return <ProjectDetail key={selected.projectKey} group={selected} />;
+  if (members.length === 0)
+    return (
+      <p className="p-8 text-sm text-muted-foreground">
+        This project has no checkout on this machine.
+      </p>
+    );
+  const scopedGroup = {
+    ...selected,
+    memberProjects: members,
+    environmentId: members[0]!.environmentId,
+    id: members[0]!.id,
+  };
+  return (
+    <ProjectDetail
+      key={`${selected.projectKey}:${environmentId ?? "all"}`}
+      group={scopedGroup}
+      hasOtherMembers={members.length < selected.memberProjects.length}
+    />
+  );
+}
+function reportScriptFailure(result: AtomCommandResult<unknown, unknown>) {
+  if (result._tag === "Failure" && !isAtomCommandInterrupted(result)) {
+    const error = squashAtomCommandFailure(result);
+    toastManager.add({
+      type: "error",
+      title: "Failed to save project actions",
+      description: error instanceof Error ? error.message : "An error occurred.",
+    });
+  }
+  return mapAtomCommandResult(result, () => undefined);
+}
+export function useProjectScriptSettings(
+  targets: readonly {
+    environmentId: EnvironmentId;
+    settings: ServerSettings;
+    keybindings: ResolvedKeybindingsConfig;
+    project?: { id: ProjectId; scripts: readonly ProjectScript[] };
+  }[],
+) {
+  const projects = useProjects();
+  const [saving, setSaving] = useState(false);
+  const savingRef = useRef(false);
+  const updateSettings = useAtomCommand(serverEnvironment.updateSettings, "project actions update");
+  const upsertKeybinding = useAtomCommand(
+    serverEnvironment.upsertKeybinding,
+    "action shortcut update",
+  );
+  const removeKeybinding = useAtomCommand(
+    serverEnvironment.removeKeybinding,
+    "action shortcut removal",
+  );
+  async function persist(
+    transform: (current: readonly ProjectScript[]) => readonly ProjectScript[] | null,
+    scriptId?: string,
+    keybinding?: string | null,
+  ): Promise<AtomCommandResult<void, unknown>> {
+    if (savingRef.current || targets.length === 0) {
+      const message = "No available machine, or another action change is saving.";
+      toastManager.add({ type: "error", title: "Actions not saved", description: message });
+      return AsyncResult.failure(Cause.fail(new Error(message)));
+    }
+    savingRef.current = true;
+    setSaving(true);
+    try {
+      for (const { environmentId, settings, keybindings, project } of targets) {
+        const current = project
+          ? resolveProjectScripts(settings, project)
+          : settings.defaultProjectScripts;
+        const nextScripts = transform(current);
+        const effectiveScripts = nextScripts ?? settings.defaultProjectScripts;
+        const result = await updateSettings({
+          environmentId,
+          input: {
+            patch: project
+              ? { projectScriptOverrides: { [project.id]: nextScripts } }
+              : { defaultProjectScripts: nextScripts ?? [] },
+          },
+        });
+        if (result._tag === "Failure") return reportScriptFailure(result);
+        if (!isElectron) continue;
+        const changedIds = scriptId
+          ? [scriptId]
+          : current
+              .filter((script) => !effectiveScripts.some((next) => next.id === script.id))
+              .map((script) => script.id);
+        for (const id of changedIds) {
+          const command = commandForProjectScript(id);
+          const previousValue = keybindingValueForCommand(keybindings, command);
+          const previous = previousValue
+            ? decodeProjectScriptKeybindingRule({ keybinding: previousValue, command })
+            : null;
+          const next = decodeProjectScriptKeybindingRule({ keybinding, command });
+          const retainedElsewhere =
+            !nextScripts?.some((script) => script.id === id) &&
+            ((project && settings.defaultProjectScripts.some((script) => script.id === id)) ||
+              Object.entries(settings.projectScriptOverrides).some(
+                ([projectId, scripts]) =>
+                  projectId !== project?.id && scripts?.some((script) => script.id === id),
+              ) ||
+              projects.some(
+                (other) =>
+                  other.environmentId === environmentId &&
+                  other.id !== project?.id &&
+                  (project ? resolveProjectScripts(settings, other) : other.scripts).some(
+                    (script) => script.id === id,
+                  ),
+              ));
+          const bindingResult = next
+            ? await upsertKeybinding({
+                environmentId,
+                input:
+                  previous && previous.key !== next.key ? { ...next, replace: previous } : next,
+              })
+            : previous && !retainedElsewhere
+              ? await removeKeybinding({ environmentId, input: previous })
+              : null;
+          if (bindingResult?._tag === "Failure") return reportScriptFailure(bindingResult);
+        }
+      }
+      return AsyncResult.success(undefined);
+    } finally {
+      savingRef.current = false;
+      setSaving(false);
+    }
+  }
+  function submit(scriptId: string | null, input: NewProjectScriptInput) {
+    const existingIds = [
+      ...projects.flatMap((project) => project.scripts.map((script) => script.id)),
+      ...targets.flatMap(({ settings, project }) =>
+        [
+          ...settings.defaultProjectScripts,
+          ...Object.values(settings.projectScriptOverrides).flatMap((scripts) => scripts ?? []),
+          ...(project?.scripts ?? []),
+        ].map((script) => script.id),
+      ),
+    ];
+    const id = scriptId ?? nextProjectScriptId(input.name, existingIds);
+    const next = buildProjectScript(id, input);
+    return persist(
+      (current) => {
+        const updated = current.map((script) =>
+          script.id === id
+            ? next
+            : input.runOnWorktreeCreate
+              ? { ...script, runOnWorktreeCreate: false }
+              : script,
+        );
+        return scriptId === null ? [...updated, next] : updated;
+      },
+      id,
+      input.keybinding,
+    );
+  }
+  return { saving, persist, submit };
 }
-function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
+function ProjectDetail({
+  group,
+  hasOtherMembers,
+}: {
+  group: SidebarProjectSnapshot;
+  hasOtherMembers: boolean;
+}) {
   const navigate = useNavigate();
   const primaryEnvironmentId = usePrimaryEnvironmentId();
+  const { environments } = useEnvironments();
+  const environmentById = useMemo(
+    () => new Map(environments.map((environment) => [environment.environmentId, environment])),
+    [environments],
+  );
   const representative =
     group.memberProjects.find(
-      (member) => member.environmentId === group.environmentId && member.id === group.id,
+      (member) => environmentById.get(member.environmentId)?.serverConfig != null,
     ) ?? group.memberProjects[0]!;
-  const settings = usePrimarySettings();
   // Provider instances and model options belong to the environment that runs
   // the project's threads. The hosted app has no primary environment, so
   // reading them from there would show "No providers available" everywhere.
 @@ -320,28 +408,78 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
   const projectGroupingSettings = useClientSettings(selectProjectGroupingSettings);
   const threads = useThreadShells();
   const updateProject = useAtomCommand(projectEnvironment.update, { reportFailure: false });
-  const deleteProject = useAtomCommand(projectEnvironment.delete, { reportFailure: false });
+  const updateServerSettings = useAtomCommand(serverEnvironment.updateSettings, "project setting");
-  const upsertKeybinding = useAtomCommand(serverEnvironment.upsertKeybinding, {
+  const [savingBrowserAccess, setSavingBrowserAccess] = useState(false);
-    reportFailure: false,
+  const savingBrowserAccessRef = useRef(false);
-  });
+  const browserOverrides = group.memberProjects.map(
-  const removeKeybinding = useAtomCommand(serverEnvironment.removeKeybinding, {
+    (member) =>
-    reportFailure: false,
+      environmentById.get(member.environmentId)?.serverConfig?.settings
+        .projectAgentBrowserAccessOverrides[member.id],
+  );
+  const browserOverride = projectSettings.projectAgentBrowserAccessOverrides[representative.id];
+  const browserMixed = group.memberProjects.some((member, index) => {
+    const settings = environmentById.get(member.environmentId)?.serverConfig?.settings;
+    if (!settings || !environmentById.get(representative.environmentId)?.serverConfig) return false;
+    return (
+      browserOverrides[index] !== browserOverride ||
+      (browserOverrides[index] ?? settings.enableAgentBrowserAccess) !==
+        (browserOverride ?? projectSettings.enableAgentBrowserAccess)
+    );
   });
+  const setBooleanOverride = async (
+    key: "projectAgentBrowserAccessOverrides" | "projectAutoPullOverrides",
+    enabled: boolean | undefined,
+  ) => {
+    if (savingBrowserAccessRef.current) return;
+    savingBrowserAccessRef.current = true;
+    setSavingBrowserAccess(true);
+    try {
+      const environmentIds = new Set(group.memberProjects.map((member) => member.environmentId));
+      for (const environmentId of environmentIds) {
+        const environment = environmentById.get(environmentId);
+        if (!environment?.serverConfig || environment.connection.phase !== "connected") {
+          toastManager.add({
+            type: "warning",
+            title: "Setting not saved",
+            description: `Connect ${environment?.label ?? "this machine"} and try again.`,
+          });
+          return;
+        }
+      }
+      if (key === "projectAutoPullOverrides" && enabled === undefined) {
+        const result = await updateAllMembers(
+          { autoPull: false },
+          "Failed to reset automatic pull",
+        );
+        if (result._tag === "Failure") return;
+      }
+      for (const environmentId of environmentIds) {
+        const overrides = Object.fromEntries(
+          group.memberProjects
+            .filter((member) => member.environmentId === environmentId)
+            .map((member) => [member.id, enabled ?? null]),
+        );
+        const result = await updateServerSettings({
+          environmentId,
+          input: { patch: { [key]: overrides } },
+        });
+        if (result._tag === "Failure") {
+          reportFailure(
+            `Failed to save project setting on ${environmentById.get(environmentId)?.label ?? "this machine"}`,
+            mapAtomCommandResult(result, () => undefined),
+          );
+          return;
+        }
+      }
+    } finally {
+      savingBrowserAccessRef.current = false;
+      setSavingBrowserAccess(false);
+    }
+  };
+  const setBrowserAccess = (enabled: boolean | undefined) =>
+    setBooleanOverride("projectAgentBrowserAccessOverrides", enabled);
+  const deleteProject = useAtomCommand(projectEnvironment.delete, { reportFailure: false });
   const projectNameEditedRef = useRef(false);
-  const { copyToClipboard: copyPathToClipboard } = useCopyToClipboard<{ path: string }>({
-    onCopy: ({ path }) => {
-      toastManager.add({ type: "success", title: "Path copied", description: path });
-    },
-    onError: (error) => {
-      toastManager.add(
-        stackedThreadToast({
-          type: "error",
-          title: "Failed to copy path",
-          description: error instanceof Error ? error.message : "An error occurred.",
-        }),
-      );
-    },
-  });
   const faviconPath = representative.faviconPath ?? null;
   const projectIcon = representative.projectIcon ?? null;
 @@ -355,14 +493,6 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
       ? window.desktopBridge?.pickProjectFavicon
       : undefined;
-  const threadCountByMember = useMemo(() => {
-    const counts = new Map<string, number>();
-    for (const thread of threads) {
-      const key = `${thread.environmentId}:${thread.projectId}`;
-      counts.set(key, (counts.get(key) ?? 0) + 1);
-    }
-    return counts;
-  }, [threads]);
   const reportFailure = useCallback((title: string, result: AtomCommandResult<void, unknown>) => {
     if (result._tag !== "Failure" || isAtomCommandInterrupted(result)) return;
     const error = squashAtomCommandFailure(result);
 @@ -437,7 +567,25 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
   // ----- default model -----
   const storedSelection = representative.defaultModelSelection;
-  const resolvedSelection = resolveDefaultProviderModelSelection(serverProviders, storedSelection);
+  const resolvedSelection = resolveDefaultProviderModelSelection(
+    serverProviders,
+    storedSelection ?? projectSettings.defaultModelSelection,
+  );
+  const mixedModel = group.memberProjects.some((member) => {
+    const config = environmentById.get(member.environmentId)?.serverConfig;
+    return (
+      !Equal.equals(member.defaultModelSelection, storedSelection) ||
+      (config !== null &&
+        config !== undefined &&
+        environmentById.get(representative.environmentId)?.serverConfig != null &&
+        JSON.stringify(
+          resolveDefaultProviderModelSelection(
+            config.providers,
+            member.defaultModelSelection ?? config.settings.defaultModelSelection,
+          ),
+        ) !== JSON.stringify(resolvedSelection))
+    );
+  });
   const resolvedInstanceId = resolvedSelection?.instanceId ?? null;
   const resolvedModel = resolvedSelection?.model ?? null;
   const instanceEntries = useMemo(
 @@ -461,14 +609,45 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
     [resolvedInstanceId, resolvedModel, serverProviders, projectSettings],
   );
   const activeEntry = instanceEntries.find((entry) => entry.instanceId === resolvedInstanceId);
-  const setDefaultModel = useCallback(
+  const setDefaultModel = (selection: ModelSelection | null) => {
-    (selection: ModelSelection | null) =>
+    if (selection !== null) {
-      void updateAllMembers({ defaultModelSelection: selection }, "Failed to update default model"),
+      for (const member of group.memberProjects) {
-    [updateAllMembers],
+        const environment = environmentById.get(member.environmentId);
-  );
+        const config = environment?.serverConfig;
+        const entry = config
+          ? applyProviderInstanceSettings(
+              deriveProviderInstanceEntries(config.providers),
+              config.settings,
+            ).find((candidate) => candidate.instanceId === selection.instanceId)
+          : undefined;
+        const options = config
+          ? getCustomModelOptionsByInstance(
+              { ...projectSettings, ...config.settings },
+              config.providers,
+            ).get(selection.instanceId)
+          : undefined;
+        if (
+          !entry?.enabled ||
+          !entry.isAvailable ||
+          !options?.some((model) => model.slug === selection.model && !model.isUnavailable)
+        ) {
+          toastManager.add({
+            type: "warning",
+            title: "Project model not saved",
+            description: `This model is unavailable on ${environment?.label ?? "a selected machine"}. Select a machine to choose its model separately.`,
+          });
+          return;
+        }
+      }
+    }
+    void updateAllMembers({ defaultModelSelection: selection }, "Failed to update default model");
+  };
   // ----- new-thread workspace mode -----
   const storedEnvMode = representative.defaultThreadEnvMode ?? null;
+  const mixedWorkspace = group.memberProjects.some(
+    (member) => member.defaultThreadEnvMode !== storedEnvMode,
+  );
   const setDefaultThreadEnvMode = useCallback(
     (mode: ThreadEnvMode | null) =>
       void updateAllMembers(
 @@ -478,12 +657,24 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
     [updateAllMembers],
   );
-  const autoPull = representative.autoPull ?? false;
+  const autoPull = resolveProjectAutoPull(
-  const setAutoPull = useCallback(
+    projectSettings,
-    (enabled: boolean) =>
+    representative.id,
-      void updateAllMembers({ autoPull: enabled }, "Failed to update automatic pull setting"),
+    representative.autoPull,
-    [updateAllMembers],
   );
+  const autoPullOverridden = group.memberProjects.some(
+    (member) =>
+      member.autoPull ||
+      environmentById.get(member.environmentId)?.serverConfig?.settings.projectAutoPullOverrides[
+        member.id
+      ] !== undefined,
+  );
+  const mixedAutoPull = group.memberProjects.some((member) => {
+    const settings = environmentById.get(member.environmentId)?.serverConfig?.settings;
+    return settings && resolveProjectAutoPull(settings, member.id, member.autoPull) !== autoPull;
+  });
+  const setAutoPull = (enabled: boolean | undefined) =>
+    setBooleanOverride("projectAutoPullOverrides", enabled);
   // ----- project icon -----
   const [faviconPickerOpen, setFaviconPickerOpen] = useState(false);
 @@ -506,27 +697,39 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
   );
   // ----- checkout selection and scripts -----
-  const [selectedCheckoutKey, setSelectedCheckoutKey] = useState(representative.physicalProjectKey);
+  const hasMultipleCheckouts = group.memberProjects.length > 1;
-  const selectedCheckout =
+  const [selectedCheckoutKey, setSelectedCheckoutKey] = useState<string | null>(null);
-    group.memberProjects.find((member) => member.physicalProjectKey === selectedCheckoutKey) ??
+  const selectedCheckoutMatch = group.memberProjects.find(
-    representative;
+    (member) => member.physicalProjectKey === selectedCheckoutKey,
+  );
+  const selectedCheckout = selectedCheckoutMatch ?? representative;
   const selectedServerConfig = useAtomValue(
     serverEnvironment.configValueAtom(selectedCheckout.environmentId),
   );
   const keybindings = selectedServerConfig?.keybindings ?? DEFAULT_RESOLVED_KEYBINDINGS;
-  const scripts = selectedCheckout.scripts;
+  const scriptSettings = useEnvironmentSettings(selectedCheckout.environmentId);
+  const scripts = resolveProjectScripts(scriptSettings, selectedCheckout);
+  const scriptsInherited = projectScriptsInheritDefaults(scriptSettings, selectedCheckout);
   const [editorRequest, setEditorRequest] = useState<ProjectScriptEditorRequest | null>(null);
-  // Script writes replace the whole array, so two overlapping writes computed
+  const {
-  // from the same snapshot would drop each other's changes. One at a time.
+    saving: isSavingScripts,
-  const [isSavingScripts, setIsSavingScripts] = useState(false);
+    persist: persistScripts,
-  const savingScriptsRef = useRef(false);
+    submit: submitScript,
+  } = useProjectScriptSettings([
+    {
+      environmentId: selectedCheckout.environmentId,
+      settings: scriptSettings,
+      keybindings,
+      project: selectedCheckout,
+    },
+  ]);
   const t3File = useT3ProjectFileState(
     selectedCheckout.environmentId,
     selectedCheckout.workspaceRoot,
   );
   // What the "Default" option resolves to while no override is set: the
   // repo's t3.json value when present, otherwise the global setting.
-  const inheritedEnvMode = t3File.file?.defaultThreadEnvMode ?? settings.defaultThreadEnvMode;
+  const inheritedEnvMode = t3File.file?.defaultThreadEnvMode ?? scriptSettings.defaultThreadEnvMode;
   const inheritedEnvModeSource = t3File.file?.defaultThreadEnvMode != null ? "t3.json" : "global";
   const importableScripts = useMemo(
     () =>
 @@ -541,135 +744,12 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
     [scripts, t3File.scripts],
   );
-  const persistScripts = useCallback(
+  const deleteScript = (scriptId: string) =>
-    async (
+    void persistScripts(
-      nextScripts: ReadonlyArray<ReturnType<typeof buildProjectScript>>,
+      (current) => current.filter((script) => script.id !== scriptId),
-      keybinding: string | null | undefined,
+      scriptId,
-      keybindingCommand: ReturnType<typeof commandForProjectScript>,
+      null,
-    ): Promise<AtomCommandResult<void, unknown>> => {
+    );
-      if (savingScriptsRef.current) {
-        return AsyncResult.failure(
-          Cause.fail(new Error("Another script change is still saving. Try again.")),
-        );
-      }
-      savingScriptsRef.current = true;
-      setIsSavingScripts(true);
-      try {
-        // Captured before the write so a cleared or deleted binding can be
-        // removed from the keybindings config afterwards.
-        const previousKeybinding = keybindingValueForCommand(keybindings, keybindingCommand);
-        const updateResult = mapAtomCommandResult(
-          await updateProject({
-            environmentId: selectedCheckout.environmentId,
-            input: { projectId: selectedCheckout.id, scripts: nextScripts },
-          }),
-          () => undefined,
-        );
-        if (updateResult._tag === "Failure") {
-          reportFailure("Failed to save scripts", updateResult);
-          return updateResult;
-        }
-        const keybindingRule = decodeProjectScriptKeybindingRule({
-          keybinding,
-          command: keybindingCommand,
-        });
-        if (!isElectron) return updateResult;
-        const environmentIds = [selectedCheckout.environmentId];
-        const previousTarget = previousKeybinding
-          ? decodeProjectScriptKeybindingRule({
-              keybinding: previousKeybinding,
-              command: keybindingCommand,
-            })
-          : null;
-        if (keybindingRule) {
-          // `replace` swaps the command's previous rule instead of appending a
-          // second one that would keep the old shortcut alive.
-          const input =
-            previousTarget && previousTarget.key !== keybindingRule.key
-              ? { ...keybindingRule, replace: previousTarget }
-              : keybindingRule;
-          for (const environmentId of environmentIds) {
-            const result = mapAtomCommandResult(
-              await upsertKeybinding({ environmentId, input }),
-              () => undefined,
-            );
-            if (result._tag === "Failure") {
-              reportFailure("Failed to save keybinding", result);
-              return result;
-            }
-          }
-        } else if (previousTarget) {
-          for (const environmentId of environmentIds) {
-            const result = mapAtomCommandResult(
-              await removeKeybinding({ environmentId, input: previousTarget }),
-              () => undefined,
-            );
-            if (result._tag === "Failure") {
-              reportFailure("Failed to remove keybinding", result);
-              return result;
-            }
-          }
-        }
-        return updateResult;
-      } finally {
-        savingScriptsRef.current = false;
-        setIsSavingScripts(false);
-      }
-    },
-    [
-      keybindings,
-      removeKeybinding,
-      reportFailure,
-      selectedCheckout.environmentId,
-      selectedCheckout.id,
-      updateProject,
-      upsertKeybinding,
-    ],
-  );
-  const submitScript = useCallback(
-    async (
-      scriptId: string | null,
-      input: NewProjectScriptInput,
-    ): Promise<AtomCommandResult<void, unknown>> => {
-      if (scriptId === null) {
-        const nextId = nextProjectScriptId(
-          input.name,
-          scripts.map((script) => script.id),
-        );
-        const nextScript = buildProjectScript(nextId, input);
-        const nextScripts = input.runOnWorktreeCreate
-          ? [
-              ...scripts.map((script) =>
-                script.runOnWorktreeCreate ? { ...script, runOnWorktreeCreate: false } : script,
-              ),
-              nextScript,
-            ]
-          : [...scripts, nextScript];
-        return persistScripts(nextScripts, input.keybinding, commandForProjectScript(nextId));
-      }
-      const updatedScript = buildProjectScript(scriptId, input);
-      const nextScripts = scripts.map((script) =>
-        script.id === scriptId
-          ? updatedScript
-          : input.runOnWorktreeCreate
-            ? { ...script, runOnWorktreeCreate: false }
-            : script,
-      );
-      return persistScripts(nextScripts, input.keybinding, commandForProjectScript(scriptId));
-    },
-    [persistScripts, scripts],
-  );
-  const deleteScript = useCallback(
-    (scriptId: string) => {
-      const nextScripts = scripts.filter((script) => script.id !== scriptId);
-      void persistScripts(nextScripts, null, commandForProjectScript(scriptId));
-    },
-    [persistScripts, scripts],
-  );
   const importFileScript = useCallback(
     async (fileScript: T3ProjectFileScript) => {
 @@ -692,7 +772,7 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
         });
       }
     },
-    [submitScript],
+    [submitScript, setEditorRequest],
   );
   // ----- checkouts -----
 @@ -720,14 +800,15 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
         memberKeys.has(`${thread.environmentId}:${thread.projectId}`),
       );
       const isWholeGroup = members.length === group.memberProjects.length;
+      const targetKind = hasOtherMembers || !isWholeGroup ? "checkout" : "project";
       const singleMember = members.length === 1 ? members[0]! : null;
       const targetLabel = singleMember?.title ?? group.displayName;
       const confirmed = await settlePromise(() =>
         api.dialogs.confirm(
           [
             projectThreads.length > 0
-              ? `Remove project "${targetLabel}" and delete its ${projectThreads.length} thread${projectThreads.length === 1 ? "" : "s"}?`
+              ? `Remove ${targetKind} "${targetLabel}" and delete its ${projectThreads.length} thread${projectThreads.length === 1 ? "" : "s"}?`
-              : `Remove project "${targetLabel}"?`,
+              : `Remove ${targetKind} "${targetLabel}"?`,
             ...(singleMember
               ? [
                   `Path: ${singleMember.workspaceRoot}`,
 @@ -741,7 +822,7 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
                   "This permanently clears conversation history for those threads and any archived threads.",
                 ]
               : ["This permanently clears any archived conversation history."]),
-            isWholeGroup
+            isWholeGroup && !hasOtherMembers
               ? "This removes only the project entries, not the files on disk."
               : "Other entries in this grouped project are unaffected.",
             "This action cannot be undone.",
 @@ -783,33 +864,50 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
         draftStore.clearProjectDraftThreadId(projectRef);
       }
-      // The project's settings page just deleted itself; there is no projects
-      // listing to fall back to, so leave settings entirely.
       if (isWholeGroup) {
-        void navigate({ to: "/", replace: true });
+        if (hasOtherMembers) {
+          void navigate({
+            to: "/settings/projects",
+            search: { project: group.projectKey, machine: undefined },
+            replace: true,
+          });
+        } else {
+          void navigate({ to: "/", replace: true });
+        }
       }
     },
     [
       deleteProject,
       group.displayName,
       group.memberProjects.length,
+      group.projectKey,
+      hasOtherMembers,
       navigate,
       reportFailure,
       threads,
     ],
   );
-  const selectedCheckoutThreadCount = threadCountByMember.get(memberKey(selectedCheckout)) ?? 0;
   const selectedCheckoutGrouping =
     projectGroupingSettings.sidebarProjectGroupingOverrides?.[
       deriveProjectGroupingOverrideKey(selectedCheckout)
     ] ?? "inherit";
-  const selectedCheckoutLabel = selectedCheckout.environmentLabel ?? "This machine";
+  const checkoutLabel = (member: SidebarProjectGroupMember) => {
+    const label = member.environmentLabel ?? "This machine";
+    return group.memberProjects.some(
+      (other) =>
+        other.physicalProjectKey !== member.physicalProjectKey &&
+        (other.environmentLabel ?? "This machine") === label,
+    )
+      ? `${label} · ${member.workspaceRoot}`
+      : label;
+  };
+  const selectedCheckoutLabel = checkoutLabel(selectedCheckout);
   return (
     <>
-      <SettingsPageContainer width="wide" className="gap-8">
+      <SettingsPageContainer className="gap-6">
-        <SettingsSection title="Project">
+        <SettingsSection title="Project" hideTitle>
           <SettingsRow
             title="Name"
             description="The shared name for this project group in the sidebar and thread lists."
 @@ -887,11 +985,23 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
           />
           <SettingsRow
             title="Model"
-            description="New threads in this project start with this model. Applies to every checkout in this group."
+            status={
+              mixedModel
+                ? "Mixed defaults or overrides. Choosing a model updates all selected checkouts."
+                : storedSelection === null
+                  ? "Inherited"
+                  : "Overridden"
+            }
+            description={
+              storedSelection === null
+                ? "Inherited from machine defaults. New threads use the default model."
+                : "Overridden for this project. Reset to use the default model."
+            }
             resetAction={
-              storedSelection !== null ? (
+              group.memberProjects.some((member) => member.defaultModelSelection !== null) ? (
                 <SettingResetButton
                   label="project default model"
+                  tooltip="Reset to inherited model"
                   onClick={() => setDefaultModel(null)}
                 />
               ) : null
 @@ -946,11 +1056,23 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
           />
           <SettingsRow
             title="Workspace"
-            description="Where new threads in this project start. Overrides t3.json and the global default; applies to every checkout in this group."
+            status={
+              mixedWorkspace
+                ? "Mixed overrides. Choosing a workspace updates all selected checkouts."
+                : storedEnvMode === null
+                  ? "Inherited"
+                  : "Overridden"
+            }
+            description={
+              storedEnvMode === null
+                ? "Inherited from t3.json or machine defaults."
+                : "Overridden for this project. Reset to inherit its workspace default."
+            }
             resetAction={
-              storedEnvMode !== null ? (
+              group.memberProjects.some((member) => member.defaultThreadEnvMode !== null) ? (
                 <SettingResetButton
                   label="project workspace default"
+                  tooltip="Reset to inherited workspace"
                   onClick={() => setDefaultThreadEnvMode(null)}
                 />
               ) : null
 @@ -990,79 +1112,130 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
           <SettingsRow
             title="Automatically pull"
             description="Keeps the default branch current in the background when the checkout has no local changes or commits."
+            status={
+              mixedAutoPull
+                ? "Mixed"
+                : autoPullOverridden
+                  ? "Overridden"
+                  : `Inherited (${autoPull ? "on" : "off"})`
+            }
             resetAction={
-              autoPull ? (
+              autoPullOverridden ? (
-                <SettingResetButton label="automatic pull" onClick={() => setAutoPull(false)} />
+                <SettingResetButton
+                  label="automatic pull"
+                  tooltip="Reset to inherited automatic pull setting"
+                  disabled={savingBrowserAccess}
+                  onClick={() => void setAutoPull(undefined)}
+                />
               ) : null
             }
             control={
               <Switch
                 checked={autoPull}
+                disabled={savingBrowserAccess}
                 aria-label="Automatically pull the default branch"
-                onCheckedChange={setAutoPull}
+                onCheckedChange={(enabled) => void setAutoPull(enabled)}
               />
             }
           />
+          <SettingsRow
+            title="Agent browser access"
+            description={
+              browserMixed
+                ? "Mixed defaults or overrides across selected checkouts."
+                : browserOverride === undefined
+                  ? "Inherited from machine defaults. Controls agent access to the preview browser."
+                  : "Overridden for this project. Applies when the agent session next starts."
+            }
+            resetAction={
+              browserOverrides.some((value) => value !== undefined) ? (
+                <SettingResetButton
+                  label="project browser access"
+                  tooltip="Reset to inherited browser access"
+                  disabled={savingBrowserAccess}
+                  onClick={() => void setBrowserAccess(undefined)}
+                />
+              ) : null
+            }
+            control={
+              <Select
+                value={
+                  browserMixed
+                    ? "mixed"
+                    : browserOverride === undefined
+                      ? "inherit"
+                      : browserOverride
+                        ? "enabled"
+                        : "disabled"
+                }
+                disabled={savingBrowserAccess}
+                onValueChange={(value) => {
+                  if (value === "inherit") void setBrowserAccess(undefined);
+                  else if (value === "enabled" || value === "disabled")
+                    void setBrowserAccess(value === "enabled");
+                }}
+              >
+                <SelectTrigger size="sm" aria-label="Project agent browser access">
+                  <SelectValue>
+                    {browserMixed
+                      ? "Mixed"
+                      : browserOverride === undefined
+                        ? `Inherit (${projectSettings.enableAgentBrowserAccess ? "on" : "off"})`
+                        : browserOverride
+                          ? "On"
+                          : "Off"}
+                  </SelectValue>
+                </SelectTrigger>
+                <SelectPopup align="end" alignItemWithTrigger={false}>
+                  <SelectItem value="inherit">Inherit defaults</SelectItem>
+                  <SelectItem value="enabled">On</SelectItem>
+                  <SelectItem value="disabled">Off</SelectItem>
+                </SelectPopup>
+              </Select>
+            }
+          />
         </SettingsSection>
-        <SettingsSection
+        <SettingsSection title="Checkout">
-          title="Checkout"
+          {hasMultipleCheckouts ? (
-          headerAction={
+            <SettingsRow
-            <Select
+              title="Checkout"
-              value={selectedCheckout.physicalProjectKey}
+              description="Actions and grouping belong to this checkout."
-              onValueChange={(value) => setSelectedCheckoutKey(String(value))}
+              control={
-            >
+                <Select
-              <SelectTrigger size="sm" className="max-w-64" aria-label="Selected checkout">
+                  value={selectedCheckout.physicalProjectKey}
-                <SelectValue>{selectedCheckoutLabel}</SelectValue>
+                  onValueChange={(value) => {
-              </SelectTrigger>
+                    if (value) setSelectedCheckoutKey(value);
-              <SelectPopup align="end" alignItemWithTrigger={false}>
+                  }}
-                {group.memberProjects.map((member) => (
+                >
-                  <SelectItem
+                  <SelectTrigger size="sm" aria-label="Checkout">
-                    key={member.physicalProjectKey}
+                    <SelectValue className="max-w-96 truncate">{selectedCheckoutLabel}</SelectValue>
-                    hideIndicator
+                  </SelectTrigger>
-                    value={member.physicalProjectKey}
+                  <SelectPopup align="end" alignItemWithTrigger={false}>
-                  >
+                    {group.memberProjects.map((member) => (
-                    {member.environmentLabel ?? "This machine"} · {member.workspaceRoot}
+                      <SelectItem key={member.physicalProjectKey} value={member.physicalProjectKey}>
-                  </SelectItem>
+                        <span className="max-w-96 whitespace-normal break-all">
-                ))}
+                          {checkoutLabel(member)}
-              </SelectPopup>
+                        </span>
-            </Select>
+                      </SelectItem>
-          }
+                    ))}
-        >
+                  </SelectPopup>
-          <div className="px-3 py-2 sm:px-4">
+                </Select>
-            <div className="flex min-w-0 items-center rounded-lg bg-muted/30 p-1 text-base text-muted-foreground sm:text-sm">
+              }
-              <Tooltip>
+            />
-                <TooltipTrigger
+          ) : null}
-                  render={
-                    <button
-                      aria-label="Copy checkout path"
-                      className="group flex min-w-0 flex-1 cursor-pointer items-center gap-2 rounded-md px-2 py-1 text-left outline-none hover:bg-accent/60 hover:text-foreground focus-visible:ring-2 focus-visible:ring-ring"
-                      type="button"
-                      onClick={() =>
-                        copyPathToClipboard(selectedCheckout.workspaceRoot, {
-                          path: selectedCheckout.workspaceRoot,
-                        })
-                      }
-                    >
-                      <code className="min-w-0 flex-1 truncate font-mono">
-                        {selectedCheckout.workspaceRoot}
-                      </code>
-                      <CopyIcon className="size-4 shrink-0 opacity-60 group-hover:opacity-100" />
-                    </button>
-                  }
-                />
-                <TooltipPopup side="top">Copy path</TooltipPopup>
-              </Tooltip>
-              <div className="shrink-0 border-l border-border/60 px-2 tabular-nums">
-                {selectedCheckoutThreadCount === 1
-                  ? "1 thread"
-                  : `${selectedCheckoutThreadCount} threads`}
-              </div>
-            </div>
-          </div>
           <SettingsRow
             title="Project grouping"
             description="How this checkout joins project groups in the sidebar. Changing it can move you to a different project group."
+            resetAction={
+              selectedCheckoutGrouping !== "inherit" ? (
+                <SettingResetButton
+                  label="project grouping"
+                  tooltip="Reset to inherited project grouping"
+                  onClick={() => updateGroupingPreference(selectedCheckout, "inherit")}
+                />
+              ) : null
+            }
             control={
               <Select
                 value={selectedCheckoutGrouping}
 @@ -1121,10 +1294,20 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
             <div className="min-w-0">
               <h3 className="text-base font-semibold text-foreground">Actions</h3>
               <p className="text-pretty text-sm text-muted-foreground">
-                Saved and run only in {selectedCheckoutLabel}.
+                {scriptsInherited
+                  ? "Inherited from machine defaults."
+                  : `Overridden for ${selectedCheckoutLabel}.`}
               </p>
             </div>
             <div className="flex w-full flex-wrap gap-1.5 sm:w-auto sm:shrink-0 sm:justify-end">
+              {!scriptsInherited ? (
+                <SettingResetButton
+                  label="project actions"
+                  tooltip="Reset to inherited actions"
+                  disabled={isSavingScripts}
+                  onClick={() => void persistScripts(() => null)}
+                />
+              ) : null}
               {importableScripts.length > 0 ? (
                 <Menu>
                   <MenuTrigger
 @@ -1173,65 +1356,12 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
               </Button>
             </div>
           </div>
-          {scripts.length === 0 ? (
+          <ProjectActionsList
-            <p className="px-3 py-2 text-base text-muted-foreground sm:px-4 sm:text-sm">
+            scripts={scripts}
-              No actions configured for this checkout.
+            keybindings={keybindings}
-            </p>
+            disabled={isSavingScripts}
-          ) : (
+            onEdit={(script) => setEditorRequest(editorRequestForScript(script, keybindings))}
-            scripts.map((script) => {
+          />
-              const shortcutLabel = shortcutLabelForCommand(
-                keybindings,
-                commandForProjectScript(script.id),
-              );
-              return (
-                <SettingsRow
-                  key={script.id}
-                  className="group py-2"
-                  title={
-                    <span className="flex min-w-0 items-center gap-2">
-                      <ScriptIcon
-                        icon={script.icon}
-                        className="size-4 shrink-0 text-muted-foreground"
-                      />
-                      <span className="min-w-0 truncate">{script.name}</span>
-                      {script.runOnWorktreeCreate ? (
-                        <span className="shrink-0 rounded-sm border border-border/60 px-1.5 py-px text-[11px] font-normal text-muted-foreground">
-                          setup
-                        </span>
-                      ) : null}
-                      {script.previewUrl ? (
-                        <span className="shrink-0 rounded-sm border border-border/60 px-1.5 py-px text-[11px] font-normal text-muted-foreground max-sm:hidden">
-                          preview · desktop only
-                        </span>
-                      ) : null}
-                    </span>
-                  }
-                  description={
-                    <code className="block max-w-full truncate font-mono">{script.command}</code>
-                  }
-                  control={
-                    <>
-                      {shortcutLabel ? (
-                        <span className="text-xs text-muted-foreground">{shortcutLabel}</span>
-                      ) : null}
-                      <Button
-                        size="icon-xs"
-                        variant="ghost"
-                        className="shrink-0 text-muted-foreground opacity-0 group-focus-within:opacity-100 group-hover:opacity-100"
-                        aria-label={`Edit ${script.name}`}
-                        disabled={isSavingScripts}
-                        onClick={() =>
-                          setEditorRequest(editorRequestForScript(script, keybindings))
-                        }
-                      >
-                        <SettingsIcon className="size-3.5" />
-                      </Button>
-                    </>
-                  }
-                />
-              );
-            })
-          )}
           {t3File.status === "invalid" ? (
             <SettingsRow
               title="t3.json is invalid"
 @@ -1244,12 +1374,18 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
         <SettingsSection title="Danger">
           <SettingsRow
             title={
-              group.memberProjects.length > 1 ? "Remove this project everywhere" : "Remove project"
+              hasOtherMembers
+                ? "Remove checkout"
+                : group.memberProjects.length > 1
+                  ? "Remove this project everywhere"
+                  : "Remove project"
             }
             description={
-              group.memberProjects.length > 1
+              hasOtherMembers
-                ? `Deletes all ${group.memberProjects.length} checkout entries and their threads on every machine. Files on disk are not touched.`
+                ? "Deletes the selected machine's checkout entries and their threads. Other machines and files on disk are not touched."
-                : "Deletes the project entry and its threads. Files on disk are not touched."
+                : group.memberProjects.length > 1
+                  ? `Deletes all ${group.memberProjects.length} checkout entries and their threads on every machine. Files on disk are not touched.`
+                  : "Deletes the project entry and its threads. Files on disk are not touched."
             }
             control={
               <Button
 @@ -1258,7 +1394,11 @@ function ProjectDetail({ group }: { group: SidebarProjectSnapshot }) {
                 onClick={() => void removeMembers(group.memberProjects)}
               >
                 <Trash2Icon />
-                {group.memberProjects.length > 1 ? "Remove all entries" : "Remove project"}
+                {hasOtherMembers
+                  ? "Remove checkout"
+                  : group.memberProjects.length > 1
+                    ? "Remove all entries"
+                    : "Remove project"}
               </Button>
             }
           />

apps/web/src/components/settings/ProjectsSettings.tsx created+160

...	@@ -0,0 +1,160 @@
1	import { resolveEnvironmentMachineKind } from "@t3tools/contracts";
2	import { FolderIcon } from "lucide-react";
3	import type { ReactNode } from "react";
4	import { EnvironmentMachineIcon } from "../EnvironmentMachineIcon";
5	import { ProjectFavicon } from "../ProjectFavicon";
6	import { WorkspacePageContainer } from "../WorkspacePageContainer";
7	import { useEnvironments } from "../../state/environments";
8	import { Toggle, ToggleGroup } from "../ui/toggle-group";
9	import { Select, SelectItem, SelectPopup, SelectTrigger, SelectValue } from "../ui/select";
10	import { ProjectSettingsPanel, useSettingsProjectGroups } from "./ProjectSettingsPanel";
11	import { ProjectDefaultsSettings } from "./ProjectDefaultsSettings";
12
13	function ScopePicker({
14	label,
15	value,
16	options,
17	onChange,
18	}: {
19	label: "project" \| "machine";
20	value: string \| null;
21	options: ReadonlyArray<{ value: string; label: string; icon?: ReactNode }>;
22	onChange: (value: string \| null) => void;
23	}) {
24	const selected = options.find((option) => option.value === value);
25	const allIcon =
26	label === "project" ? <FolderIcon aria-hidden className="size-3.5 shrink-0" /> : null;
27	return (
28	<Select
29	value={value ?? "all"}
30	onValueChange={(next) => {
31	if (next) onChange(next === "all" ? null : next);
32	}}
33	>
34	<SelectTrigger
35	size="compact"
36	aria-label={`${label === "project" ? "Project" : "Machine"} scope`}
37	className="w-auto min-w-0 max-w-52"
38	>
39	<SelectValue className="flex min-w-0 items-center gap-1.5">
40	{value === null ? allIcon : selected?.icon}
41	<span className="truncate">
42	{value === null ? `All ${label}s` : (selected?.label ?? `Unavailable ${label}`)}
43	</span>
44	</SelectValue>
45	</SelectTrigger>
46	<SelectPopup align="start" alignItemWithTrigger={false}>
47	<SelectItem value="all">
48	<span className="flex items-center gap-2">
49	{allIcon}All {label}s
50	</span>
51	</SelectItem>
52	{options.map((option) => (
53	<SelectItem key={option.value} value={option.value}>
54	<span className="flex items-center gap-2">
55	{option.icon}
56	{option.label}
57	</span>
58	</SelectItem>
59	))}
60	</SelectPopup>
61	</Select>
62	);
63	}
64
65	export function ProjectsSettings({
66	projectKey,
67	machineId,
68	onScopeChange,
69	}: {
70	projectKey: string \| null;
71	machineId: string \| null;
72	onScopeChange: (project: string \| null, machine: string \| null) => void;
73	}) {
74	const groups = useSettingsProjectGroups();
75	const { environments } = useEnvironments();
76	const machine = environments.find((environment) => environment.environmentId === machineId);
77	const machineOptions = environments.map((environment) => ({
78	value: environment.environmentId,
79	label: environment.label,
80	icon: (
81	<EnvironmentMachineIcon
82	aria-hidden
83	kind={resolveEnvironmentMachineKind(environment.serverConfig)}
84	className="size-3.5 shrink-0"
85	/>
86	),
87	}));
88	return (
89	<div className="flex min-h-0 flex-1 flex-col">
90	<div className="scrollbar-gutter-both shrink-0 overflow-y-auto">
91	<WorkspacePageContainer className="pb-0">
92	<div
93	className="flex flex-wrap items-center gap-2"
94	role="group"
95	aria-label="Settings scope"
96	>
97	{environments.length > 3 ? (
98	<ScopePicker
99	label="machine"
100	value={machineId}
101	options={machineOptions}
102	onChange={(value) => onScopeChange(projectKey, value)}
103	/>
104	) : (
105	<ToggleGroup
106	aria-label="Machine scope"
107	variant="segmented"
108	className="max-w-full flex-wrap"
109	value={[machineId ?? "all"]}
110	onValueChange={(next) => {
111	const value = next[0];
112	if (value) onScopeChange(projectKey, value === "all" ? null : value);
113	}}
114	>
115	<Toggle value="all">All machines</Toggle>
116	{machineOptions.map((option) => (
117	<Toggle key={option.value} value={option.value} title={option.label}>
118	{option.icon}
119	<span className="max-w-36 truncate">{option.label}</span>
120	</Toggle>
121	))}
122	</ToggleGroup>
123	)}
124	<div className="ms-auto">
125	<ScopePicker
126	label="project"
127	value={projectKey}
128	options={groups.map((group) => ({
129	value: group.projectKey,
130	label: group.displayName,
131	icon: (
132	<ProjectFavicon
133	environmentId={group.environmentId}
134	cwd={group.workspaceRoot}
135	projectName={group.title}
136	faviconPath={group.faviconPath}
137	projectIcon={group.projectIcon}
138	className="size-3.5"
139	/>
140	),
141	}))}
142	onChange={(value) => onScopeChange(value, machineId)}
143	/>
144	</div>
145	</div>
146	</WorkspacePageContainer>
147	</div>
148	{machineId !== null && !machine ? (
149	<p className="p-8 text-sm text-muted-foreground">This machine is no longer available.</p>
150	) : projectKey === null ? (
151	<ProjectDefaultsSettings environmentId={machine?.environmentId ?? null} />
152	) : (
153	<ProjectSettingsPanel
154	projectKey={projectKey}
155	environmentId={machine?.environmentId ?? null}
156	/>
157	)}
158	</div>
159	);
160	}

apps/web/src/components/settings/SettingsPanels.tsx+10-41

...	@@ -2557,55 +2557,24 @@ export function GeneralSettingsPanel() {	...	@@ -2557,55 +2557,24 @@ export function GeneralSettingsPanel() {
2557		2557
2558	<SettingsSection id="projects-and-threads" title="Projects & threads">	2558	<SettingsSection id="projects-and-threads" title="Projects & threads">
2559	<SettingsRow	2559	<SettingsRow
2560	serverScoped
2561	{...searchableSetting("new-threads")}	2560	{...searchableSetting("new-threads")}
2562	description="Pick the default workspace mode for newly created draft threads."	2561	description="Choose the default model and workspace for all projects or a specific project."
2563	resetAction={
2564	settings.defaultThreadEnvMode !== DEFAULT_UNIFIED_SETTINGS.defaultThreadEnvMode \|\|
2565	settings.newWorktreesStartFromOrigin !==
2566	DEFAULT_UNIFIED_SETTINGS.newWorktreesStartFromOrigin ? (
2567	<SettingResetButton
2568	label="new threads"
2569	onClick={() =>
2570	updateSettings({
2571	defaultThreadEnvMode: DEFAULT_UNIFIED_SETTINGS.defaultThreadEnvMode,
2572	newWorktreesStartFromOrigin:
2573	DEFAULT_UNIFIED_SETTINGS.newWorktreesStartFromOrigin,
2574	})
2575	}
2576	/>
2577	) : null
2578	}
2579	control={	2562	control={
2580	<Select	2563	<Button
2581	value={settings.defaultThreadEnvMode}	2564	render={
2582	onValueChange={(value) => {	2565	<Link to="/settings/projects" search={{ project: undefined, machine: undefined }} />
2583	if (value === "local" \|\| value === "worktree") {	2566	}
2584	updateSettings({ defaultThreadEnvMode: value });	2567	size="sm"
2585	}	2568	variant="outline"
2586	}}
2587	>	2569	>
2588	<SelectTrigger size="sm" className="w-full sm:w-44" aria-label="Default thread mode">	2570	Project settings
2589	<SelectValue>	2571	</Button>
2590	{settings.defaultThreadEnvMode === "worktree" ? "New worktree" : "Local"}
2591	</SelectValue>
2592	</SelectTrigger>
2593	<SelectPopup align="end" alignItemWithTrigger={false}>
2594	<SelectItem hideIndicator value="local">
2595	Local
2596	</SelectItem>
2597	<SelectItem hideIndicator value="worktree">
2598	New worktree
2599	</SelectItem>
2600	</SelectPopup>
2601	</Select>
2602	}	2572	}
2603	/>	2573	/>
2604		2574
2605	<SettingsRow	2575	<SettingsRow
2606	serverScoped	2576	serverScoped
2607	className="bg-muted/20 sm:pl-9"	2577	{...searchableSetting("start-from-origin")}
2608	title={searchableSetting("start-from-origin").title}
2609	description="Creates the worktree from the latest matching branch on origin instead of your local branch."	2578	description="Creates the worktree from the latest matching branch on origin instead of your local branch."
2610	resetAction={	2579	resetAction={
2611	settings.newWorktreesStartFromOrigin !==	2580	settings.newWorktreesStartFromOrigin !==

apps/web/src/components/settings/SettingsSidebarNav.tsx+9-1

 @@ -15,6 +15,7 @@ import {
   BlocksIcon,
   BotIcon,
   GitBranchIcon,
+  PanelsTopLeftIcon,
   KeyboardIcon,
   Link2Icon,
   PaletteIcon,
 @@ -72,6 +73,7 @@ const SETTINGS_SECTION_ICONS: Readonly<
 > = {
   "/settings/general": Settings2Icon,
   "/settings/appearance": PaletteIcon,
+  "/settings/projects": PanelsTopLeftIcon,
   "/settings/keybindings": KeyboardIcon,
   "/settings/providers": BotIcon,
   "/settings/integrations": BlocksIcon,
 @@ -274,12 +276,18 @@ export function SettingsSidebarNav({ pathname }: { pathname: string }) {
         setOpenMobile(false);
       }
       const targetId = item.targetId ?? item.id;
-      if (pathname === item.to && currentHash.replace(/^#/, "") === targetId) {
+      if (
+        item.to !== "/settings/projects" &&
+        pathname === item.to &&
+        currentHash.replace(/^#/, "") === targetId
+      ) {
         scrollToSettingsTarget(targetId);
         return;
       }
       void navigate({
         to: item.to,
+        search: (previous) =>
+          item.to === "/settings/projects" ? { ...previous, project: undefined } : previous,
         hash: targetId,
         replace: true,
         hashScrollIntoView: false,

apps/web/src/components/settings/settingsLayout.tsx+8-2

 @@ -284,7 +284,11 @@ export function SettingsRow({
       ref={targetRef}
       tabIndex={rowProps.id ? -1 : rowProps.tabIndex}
       data-slot="settings-row"
-      className={cn("rounded-xl px-3 sm:px-4", children ? "pt-3 pb-1" : "py-3", className)}
+      className={cn(
+        "rounded-xl px-3 sm:px-4 aria-disabled:opacity-50 aria-disabled:[&_*]:text-muted-foreground",
+        children ? "pt-3 pb-1" : "py-3",
+        className,
+      )}
     >
       <div className="flex flex-col gap-3 sm:grid sm:grid-cols-[minmax(0,1fr)_minmax(10rem,auto)] sm:items-center sm:gap-8">
         <div className="min-w-0 flex-1 space-y-1">
 @@ -320,10 +324,12 @@ export function SettingsRow({
 export function SettingResetButton({
   label,
+  tooltip = "Reset to default",
   disabled = false,
   onClick,
 }: {
   label: string;
+  tooltip?: string;
   disabled?: boolean;
   onClick: () => void;
 }) {
 @@ -345,7 +351,7 @@ export function SettingResetButton({
           </Button>
         }
       />
-      <TooltipPopup side="top">Reset to default</TooltipPopup>
+      <TooltipPopup side="top">{tooltip}</TooltipPopup>
     </Tooltip>
   );
 }

apps/web/src/components/settings/settingsSearch.ts+12-3

 @@ -2,6 +2,7 @@ import { isElectron } from "~/env";
 import { isMacPlatform, isWindowsPlatform, normalizeSearchText } from "~/lib/utils";
 export type SettingsPath =
+  | "/settings/projects"
   | "/settings/general"
   | "/settings/appearance"
   | "/settings/keybindings"
 @@ -49,6 +50,7 @@ export interface SettingsSearchAvailability {
 export const SETTINGS_SECTION_LABELS: Readonly<Record<SettingsPath, string>> = {
   "/settings/general": "General",
   "/settings/appearance": "Appearance",
+  "/settings/projects": "Projects",
   "/settings/keybindings": "Keybindings",
   "/settings/providers": "Providers",
   "/settings/integrations": "Integrations",
 @@ -63,6 +65,14 @@ export const SETTINGS_SECTION_LABELS: Readonly<Record<SettingsPath, string>> = {
  * that may not be mounted point at their nearest stable section instead.
  */
 export const SETTINGS_SEARCH_ITEMS = [
+  {
+    id: "project-defaults",
+    title: "Project defaults and overrides",
+    to: "/settings/projects",
+    searchTerms: [
+      "model workspace browser machines projects inheritance automatic pull checkout grouping actions scripts",
+    ],
+  },
   {
     id: "color-scheme",
     title: "Color scheme",
 @@ -235,14 +245,13 @@ export const SETTINGS_SEARCH_ITEMS = [
   {
     id: "new-threads",
     title: "New threads",
-    to: "/settings/general",
+    to: "/settings/projects",
     searchTerms: ["default workspace mode draft local worktree"],
   },
   {
     id: "start-from-origin",
     title: "Start from origin",
     to: "/settings/general",
-    targetId: "new-threads",
     searchTerms: ["new worktrees latest matching remote branch local"],
   },
   {
 @@ -345,7 +354,7 @@ export const SETTINGS_SEARCH_ITEMS = [
   {
     id: "agent-browser-access",
     title: "Agent browser access",
-    to: "/settings/integrations",
+    to: "/settings/projects",
     searchTerms: ["allow open drive preview tools sessions"],
   },
   {

apps/web/src/hooks/useHandleNewThread.test.ts+23-3

...	@@ -49,14 +49,31 @@ const testState = vi.hoisted(() => {	...	@@ -49,14 +49,31 @@ const testState = vi.hoisted(() => {
49	});	49	});
50		50
51	vi.mock("@effect/atom-react", () => ({	51	vi.mock("@effect/atom-react", () => ({
52	useAtomValue: () => ({ defaultThreadEnvMode: "local", newWorktreesStartFromOrigin: false }),	52	useAtomValue: (atom: unknown) =>
		53	atom === "primary-settings"
		54	? { newWorktreesStartFromOrigin: false }
		55	: new Map([
		56	[
		57	"environment-ssh",
		58	{
		59	settings: {
		60	defaultThreadEnvMode: "local",
		61	newWorktreesStartFromOrigin: false,
		62	defaultModelSelection: null,
		63	},
		64	},
		65	],
		66	]),
53	}));	67	}));
54	vi.mock("@t3tools/client-runtime/environment", () => ({	68	vi.mock("@t3tools/client-runtime/environment", () => ({
55	scopedProjectKey: () => "remote-project",	69	scopedProjectKey: () => "remote-project",
56	scopeProjectRef: (environmentId: string, projectId: string) => ({ environmentId, projectId }),	70	scopeProjectRef: (environmentId: string, projectId: string) => ({ environmentId, projectId }),
57	scopeThreadRef: (environmentId: string, threadId: string) => ({ environmentId, threadId }),	71	scopeThreadRef: (environmentId: string, threadId: string) => ({ environmentId, threadId }),
58	}));	72	}));
59	vi.mock("@t3tools/contracts", () => ({ DEFAULT_RUNTIME_MODE: "default" }));	73	vi.mock("@t3tools/contracts", () => ({
		74	DEFAULT_RUNTIME_MODE: "default",
		75	DEFAULT_SERVER_SETTINGS: {},
		76	}));
60	vi.mock("@t3tools/shared/threadEnvMode", () => ({	77	vi.mock("@t3tools/shared/threadEnvMode", () => ({
61	resolveDefaultThreadEnvMode: (input: {	78	resolveDefaultThreadEnvMode: (input: {
62	readonly projectFile: "local" \| "worktree" \| null;	79	readonly projectFile: "local" \| "worktree" \| null;
...	@@ -113,7 +130,10 @@ vi.mock("../state/entities", () => ({	...	@@ -113,7 +130,10 @@ vi.mock("../state/entities", () => ({
113	useProjects: () => [],	130	useProjects: () => [],
114	useThread: () => null,	131	useThread: () => null,
115	}));	132	}));
116	vi.mock("../state/server", () => ({ primaryServerSettingsAtom: {} }));	133	vi.mock("../state/server", () => ({
		134	environmentServerConfigsAtom: {},
		135	primaryServerSettingsAtom: "primary-settings",
		136	}));
117	vi.mock("../threadRoutes", () => ({ resolveThreadRouteTarget: () => null }));	137	vi.mock("../threadRoutes", () => ({ resolveThreadRouteTarget: () => null }));
118	vi.mock("../uiStateStore", () => ({	138	vi.mock("../uiStateStore", () => ({
119	legacyProjectCwdPreferenceKey: () => "remote-project",	139	legacyProjectCwdPreferenceKey: () => "remote-project",

apps/web/src/hooks/useHandleNewThread.ts+20-10

 @@ -4,7 +4,12 @@ import {
   scopeProjectRef,
   scopeThreadRef,
 } from "@t3tools/client-runtime/environment";
-import { DEFAULT_RUNTIME_MODE, type ScopedProjectRef, type ThreadId } from "@t3tools/contracts";
+import {
+  DEFAULT_RUNTIME_MODE,
+  DEFAULT_SERVER_SETTINGS,
+  type ScopedProjectRef,
+  type ThreadId,
+} from "@t3tools/contracts";
 import { useParams, useRouter } from "@tanstack/react-router";
 import { useCallback, useMemo } from "react";
 import {
 @@ -30,7 +35,7 @@ import {
   resolveNewThreadModelSelectionOverride,
 } from "../lib/chatThreadActions";
 import { readT3ProjectFileDefaultThreadEnvMode } from "../lib/t3ProjectFileDefaults";
-import { primaryServerSettingsAtom } from "../state/server";
+import { environmentServerConfigsAtom, primaryServerSettingsAtom } from "../state/server";
 import { resolveThreadRouteTarget } from "../threadRoutes";
 import { legacyProjectCwdPreferenceKey, useUiStateStore } from "../uiStateStore";
 import { useClientSettings } from "./useSettings";
 @@ -55,11 +60,7 @@ function pickExplicitWorkspaceOptions(options: NewThreadWorkspaceOptions | undef
 }
 export function useNewThreadHandler() {
-  // New-thread defaults are a user preference, and the settings UI only ever
+  const environmentServerConfigs = useAtomValue(environmentServerConfigsAtom);
-  // edits the primary environment's settings.json. Reading the target
-  // environment's own settings here would silently reset remote projects to
-  // the decoded defaults ("local" mode, current branch), since nothing can
-  // set those values on a remote server.
   const primaryServerSettings = useAtomValue(primaryServerSettingsAtom);
   const projectGroupingSettings = useClientSettings(selectProjectGroupingSettings);
   const router = useRouter();
 @@ -83,6 +84,8 @@ export function useNewThreadHandler() {
       // up again and finding whichever draft it happens to hold.
     ): Promise<{ draftId: DraftId; threadId: ThreadId } | null> => {
       const projects = readProjects();
+      const targetServerSettings =
+        environmentServerConfigs.get(projectRef.environmentId)?.settings ?? DEFAULT_SERVER_SETTINGS;
       const {
         getComposerDraft,
         getDraftSessionByLogicalProjectKey,
 @@ -138,7 +141,8 @@ export function useNewThreadHandler() {
       );
       const resolveModelSelectionOverride = (destinationDraftId: DraftId) =>
         resolveNewThreadModelSelectionOverride({
-          projectDefaultSelection: project?.defaultModelSelection ?? null,
+          projectDefaultSelection:
+            project?.defaultModelSelection ?? targetServerSettings.defaultModelSelection ?? null,
           carrySelection: carryModelSelection,
           carrySourceDraftId:
             currentRouteTarget?.kind === "draft" ? currentRouteTarget.draftId : null,
 @@ -157,7 +161,7 @@ export function useNewThreadHandler() {
                 project.workspaceRoot,
               )
             : null,
-          globalDefault: primaryServerSettings.defaultThreadEnvMode,
+          globalDefault: targetServerSettings.defaultThreadEnvMode,
         });
       };
       const logicalProjectKey = project
 @@ -429,7 +433,13 @@ export function useNewThreadHandler() {
         return { draftId, threadId };
       })();
     },
-    [getCurrentRouteTarget, primaryServerSettings, projectGroupingSettings, router],
+    [
+      environmentServerConfigs,
+      getCurrentRouteTarget,
+      primaryServerSettings.newWorktreesStartFromOrigin,
+      projectGroupingSettings,
+      router,
+    ],
   );
 }

apps/web/src/routeTree.gen.ts+21

...	@@ -18,6 +18,7 @@ import { Route as ChatRouteImport } from './routes/_chat'	...	@@ -18,6 +18,7 @@ import { Route as ChatRouteImport } from './routes/_chat'
18	import { Route as ChatIndexRouteImport } from './routes/_chat.index'	18	import { Route as ChatIndexRouteImport } from './routes/_chat.index'
19	import { Route as SettingsSourceControlRouteImport } from './routes/settings.source-control'	19	import { Route as SettingsSourceControlRouteImport } from './routes/settings.source-control'
20	import { Route as SettingsProvidersRouteImport } from './routes/settings.providers'	20	import { Route as SettingsProvidersRouteImport } from './routes/settings.providers'
		21	import { Route as SettingsProjectsRouteImport } from './routes/settings.projects'
21	import { Route as SettingsKeybindingsRouteImport } from './routes/settings.keybindings'	22	import { Route as SettingsKeybindingsRouteImport } from './routes/settings.keybindings'
22	import { Route as SettingsIntegrationsRouteImport } from './routes/settings.integrations'	23	import { Route as SettingsIntegrationsRouteImport } from './routes/settings.integrations'
23	import { Route as SettingsGeneralRouteImport } from './routes/settings.general'	24	import { Route as SettingsGeneralRouteImport } from './routes/settings.general'
...	@@ -75,6 +76,11 @@ const SettingsProvidersRoute = SettingsProvidersRouteImport.update({	...	@@ -75,6 +76,11 @@ const SettingsProvidersRoute = SettingsProvidersRouteImport.update({
75	path: '/providers',	76	path: '/providers',
76	getParentRoute: () => SettingsRoute,	77	getParentRoute: () => SettingsRoute,
77	} as any)	78	} as any)
		79	const SettingsProjectsRoute = SettingsProjectsRouteImport.update({
		80	id: '/projects',
		81	path: '/projects',
		82	getParentRoute: () => SettingsRoute,
		83	} as any)
78	const SettingsKeybindingsRoute = SettingsKeybindingsRouteImport.update({	84	const SettingsKeybindingsRoute = SettingsKeybindingsRouteImport.update({
79	id: '/keybindings',	85	id: '/keybindings',
80	path: '/keybindings',	86	path: '/keybindings',
...	@@ -154,6 +160,7 @@ export interface FileRoutesByFullPath {	...	@@ -154,6 +160,7 @@ export interface FileRoutesByFullPath {
154	'/settings/general': typeof SettingsGeneralRoute	160	'/settings/general': typeof SettingsGeneralRoute
155	'/settings/integrations': typeof SettingsIntegrationsRoute	161	'/settings/integrations': typeof SettingsIntegrationsRoute
156	'/settings/keybindings': typeof SettingsKeybindingsRoute	162	'/settings/keybindings': typeof SettingsKeybindingsRoute
		163	'/settings/projects': typeof SettingsProjectsRoute
157	'/settings/providers': typeof SettingsProvidersRoute	164	'/settings/providers': typeof SettingsProvidersRoute
158	'/settings/source-control': typeof SettingsSourceControlRoute	165	'/settings/source-control': typeof SettingsSourceControlRoute
159	'/$environmentId/$threadId': typeof ChatEnvironmentIdThreadIdRoute	166	'/$environmentId/$threadId': typeof ChatEnvironmentIdThreadIdRoute
...	@@ -175,6 +182,7 @@ export interface FileRoutesByTo {	...	@@ -175,6 +182,7 @@ export interface FileRoutesByTo {
175	'/settings/general': typeof SettingsGeneralRoute	182	'/settings/general': typeof SettingsGeneralRoute
176	'/settings/integrations': typeof SettingsIntegrationsRoute	183	'/settings/integrations': typeof SettingsIntegrationsRoute
177	'/settings/keybindings': typeof SettingsKeybindingsRoute	184	'/settings/keybindings': typeof SettingsKeybindingsRoute
		185	'/settings/projects': typeof SettingsProjectsRoute
178	'/settings/providers': typeof SettingsProvidersRoute	186	'/settings/providers': typeof SettingsProvidersRoute
179	'/settings/source-control': typeof SettingsSourceControlRoute	187	'/settings/source-control': typeof SettingsSourceControlRoute
180	'/': typeof ChatIndexRoute	188	'/': typeof ChatIndexRoute
...	@@ -199,6 +207,7 @@ export interface FileRoutesById {	...	@@ -199,6 +207,7 @@ export interface FileRoutesById {
199	'/settings/general': typeof SettingsGeneralRoute	207	'/settings/general': typeof SettingsGeneralRoute
200	'/settings/integrations': typeof SettingsIntegrationsRoute	208	'/settings/integrations': typeof SettingsIntegrationsRoute
201	'/settings/keybindings': typeof SettingsKeybindingsRoute	209	'/settings/keybindings': typeof SettingsKeybindingsRoute
		210	'/settings/projects': typeof SettingsProjectsRoute
202	'/settings/providers': typeof SettingsProvidersRoute	211	'/settings/providers': typeof SettingsProvidersRoute
203	'/settings/source-control': typeof SettingsSourceControlRoute	212	'/settings/source-control': typeof SettingsSourceControlRoute
204	'/_chat/': typeof ChatIndexRoute	213	'/_chat/': typeof ChatIndexRoute
...	@@ -224,6 +233,7 @@ export interface FileRouteTypes {	...	@@ -224,6 +233,7 @@ export interface FileRouteTypes {
224	\| '/settings/general'	233	\| '/settings/general'
225	\| '/settings/integrations'	234	\| '/settings/integrations'
226	\| '/settings/keybindings'	235	\| '/settings/keybindings'
		236	\| '/settings/projects'
227	\| '/settings/providers'	237	\| '/settings/providers'
228	\| '/settings/source-control'	238	\| '/settings/source-control'
229	\| '/$environmentId/$threadId'	239	\| '/$environmentId/$threadId'
...	@@ -245,6 +255,7 @@ export interface FileRouteTypes {	...	@@ -245,6 +255,7 @@ export interface FileRouteTypes {
245	\| '/settings/general'	255	\| '/settings/general'
246	\| '/settings/integrations'	256	\| '/settings/integrations'
247	\| '/settings/keybindings'	257	\| '/settings/keybindings'
		258	\| '/settings/projects'
248	\| '/settings/providers'	259	\| '/settings/providers'
249	\| '/settings/source-control'	260	\| '/settings/source-control'
250	\| '/'	261	\| '/'
...	@@ -268,6 +279,7 @@ export interface FileRouteTypes {	...	@@ -268,6 +279,7 @@ export interface FileRouteTypes {
268	\| '/settings/general'	279	\| '/settings/general'
269	\| '/settings/integrations'	280	\| '/settings/integrations'
270	\| '/settings/keybindings'	281	\| '/settings/keybindings'
		282	\| '/settings/projects'
271	\| '/settings/providers'	283	\| '/settings/providers'
272	\| '/settings/source-control'	284	\| '/settings/source-control'
273	\| '/_chat/'	285	\| '/_chat/'
...	@@ -351,6 +363,13 @@ declare module '@tanstack/react-router' {	...	@@ -351,6 +363,13 @@ declare module '@tanstack/react-router' {
351	preLoaderRoute: typeof SettingsProvidersRouteImport	363	preLoaderRoute: typeof SettingsProvidersRouteImport
352	parentRoute: typeof SettingsRoute	364	parentRoute: typeof SettingsRoute
353	}	365	}
		366	'/settings/projects': {
		367	id: '/settings/projects'
		368	path: '/projects'
		369	fullPath: '/settings/projects'
		370	preLoaderRoute: typeof SettingsProjectsRouteImport
		371	parentRoute: typeof SettingsRoute
		372	}
354	'/settings/keybindings': {	373	'/settings/keybindings': {
355	id: '/settings/keybindings'	374	id: '/settings/keybindings'
356	path: '/keybindings'	375	path: '/keybindings'
...	@@ -462,6 +481,7 @@ interface SettingsRouteChildren {	...	@@ -462,6 +481,7 @@ interface SettingsRouteChildren {
462	SettingsGeneralRoute: typeof SettingsGeneralRoute	481	SettingsGeneralRoute: typeof SettingsGeneralRoute
463	SettingsIntegrationsRoute: typeof SettingsIntegrationsRoute	482	SettingsIntegrationsRoute: typeof SettingsIntegrationsRoute
464	SettingsKeybindingsRoute: typeof SettingsKeybindingsRoute	483	SettingsKeybindingsRoute: typeof SettingsKeybindingsRoute
		484	SettingsProjectsRoute: typeof SettingsProjectsRoute
465	SettingsProvidersRoute: typeof SettingsProvidersRoute	485	SettingsProvidersRoute: typeof SettingsProvidersRoute
466	SettingsSourceControlRoute: typeof SettingsSourceControlRoute	486	SettingsSourceControlRoute: typeof SettingsSourceControlRoute
467	}	487	}
...	@@ -474,6 +494,7 @@ const SettingsRouteChildren: SettingsRouteChildren = {	...	@@ -474,6 +494,7 @@ const SettingsRouteChildren: SettingsRouteChildren = {
474	SettingsGeneralRoute: SettingsGeneralRoute,	494	SettingsGeneralRoute: SettingsGeneralRoute,
475	SettingsIntegrationsRoute: SettingsIntegrationsRoute,	495	SettingsIntegrationsRoute: SettingsIntegrationsRoute,
476	SettingsKeybindingsRoute: SettingsKeybindingsRoute,	496	SettingsKeybindingsRoute: SettingsKeybindingsRoute,
		497	SettingsProjectsRoute: SettingsProjectsRoute,
477	SettingsProvidersRoute: SettingsProvidersRoute,	498	SettingsProvidersRoute: SettingsProvidersRoute,
478	SettingsSourceControlRoute: SettingsSourceControlRoute,	499	SettingsSourceControlRoute: SettingsSourceControlRoute,
479	}	500	}

apps/web/src/routes/projects.$projectKey.tsx+6-4

 @@ -1,15 +1,17 @@
 import { createFileRoute, redirect } from "@tanstack/react-router";
-import { ProjectSettingsPage } from "../components/settings/ProjectSettingsPanel";
 export const Route = createFileRoute("/projects/$projectKey")({
-  beforeLoad: async ({ context }) => {
+  beforeLoad: async ({ context, params }) => {
     if (
       context.authGateState.status !== "authenticated" &&
       context.authGateState.status !== "hosted-static"
     ) {
       throw redirect({ to: "/pair", replace: true });
     }
+    throw redirect({
+      to: "/settings/projects",
+      search: { project: params.projectKey, machine: undefined },
+      replace: true,
+    });
   },
-  component: () => <ProjectSettingsPage projectKey={Route.useParams().projectKey} />,
 });

apps/web/src/routes/settings.projects.tsx created+27

...	@@ -0,0 +1,27 @@
1	import { createFileRoute } from "@tanstack/react-router";
2	import { ProjectsSettings } from "../components/settings/ProjectsSettings";
3
4	export const Route = createFileRoute("/settings/projects")({
5	validateSearch: (search: Record<string, unknown>) => ({
6	project: typeof search.project === "string" ? search.project : undefined,
7	machine: typeof search.machine === "string" ? search.machine : undefined,
8	}),
9	component: ProjectsRoute,
10	});
11
12	function ProjectsRoute() {
13	const { project, machine } = Route.useSearch();
14	const navigate = Route.useNavigate();
15	return (
16	<ProjectsSettings
17	projectKey={project ?? null}
18	machineId={machine ?? null}
19	onScopeChange={(project, machine) => {
20	void navigate({
21	search: { project: project ?? undefined, machine: machine ?? undefined },
22	replace: true,
23	});
24	}}
25	/>
26	);
27	}

docs/user/project-settings.md+19-2

...	@@ -1,11 +1,28 @@	...	@@ -1,11 +1,28 @@
1	# Project settings	1	# Project settings
2		2
3	Open Settings → Projects and select a project to change its preferences.	3	Open Settings → Projects. The project and machine pickers start at All projects and
		4	All machines.
		5
		6	Change the default model, workspace, automatic pull, agent browser access, or actions for projects that inherit those values.
		7	Select an individual project to override a default. Reset its row to inherit again. Changing a
		8	default preserves explicit project overrides. Workspace preferences in `t3.json` take precedence
		9	over machine defaults when the project has no explicit workspace override.
		10
		11	Select a machine to limit edits to it. All machines writes defaults to connected machines;
		12	offline machines keep their previous values. Mixed values are indicated when selected machines
		13	or checkouts disagree. Browser access changes apply when an agent session next starts.
		14
		15	Project grouping has a client-wide default across machines, with individual checkout overrides.
		16	Shared actions apply to inheriting projects; editing a project's actions creates an independent list.
		17	Reset that list to use shared actions again. Existing project actions are preserved.
		18
		19	Project names, icons, removal, and importing actions from a checkout remain project-specific.
		20	When there are several checkouts, the checkout picker selects which actions and grouping to edit.
4		21
5	## Project icons	22	## Project icons
6		23
7	Choose an icon, emoji, or image from the project to make it easier to recognize. The choice applies	24	Choose an icon, emoji, or image from the project to make it easier to recognize. The choice applies
8	to every checkout in the project group and appears on connected clients. Choose Automatic to	25	to selected checkouts in the project group and appears on connected clients. Choose Automatic to
9	let T3 Code detect an icon again.	26	let T3 Code detect an icon again.
10		27
11	## Keep the default branch current	28	## Keep the default branch current

packages/client-runtime/src/state/sharedSettings.test.ts+13-3

 @@ -44,13 +44,19 @@ describe("splitSharedServerPatch", () => {
       sidebarAutoSettleOnMerge: false,
       continueThreadsAfterServerUpdate: true,
       enableAgentBrowserAccess: false,
+      defaultThreadEnvMode: "worktree",
+      newWorktreesStartFromOrigin: true,
     });
     expect(sharedPatch).toEqual({
       sidebarAutoSettleAfterDays: 7,
       sidebarAutoSettleOnMerge: false,
       continueThreadsAfterServerUpdate: true,
+      newWorktreesStartFromOrigin: true,
+    });
+    expect(localPatch).toEqual({
+      enableAgentBrowserAccess: false,
+      defaultThreadEnvMode: "worktree",
     });
-    expect(localPatch).toEqual({ enableAgentBrowserAccess: false });
   });
 });
 @@ -60,7 +66,6 @@ describe("pickSharedServerSettings", () => {
       Object.keys(pickSharedServerSettings(DEFAULT_SERVER_SETTINGS, restartCapabilities)).sort(),
     ).toEqual([
       "continueThreadsAfterServerUpdate",
-      "defaultThreadEnvMode",
       "newWorktreesStartFromOrigin",
       "sidebarAutoSettleAfterDays",
       "sidebarAutoSettleOnMerge",
 @@ -206,7 +211,12 @@ describe("findSharedSettingsMismatches", () => {
           environmentId: boxId,
           label: "Remote Box",
           syncEligible: true,
-          settings: { ...primarySettings, enableAgentBrowserAccess: false },
+          settings: {
+            ...primarySettings,
+            enableAgentBrowserAccess: false,
+            defaultThreadEnvMode:
+              primarySettings.defaultThreadEnvMode === "local" ? "worktree" : "local",
+          },
         },
       ],
     });

packages/client-runtime/src/state/sharedSettings.ts-1

...	@@ -24,7 +24,6 @@ const SHARED_SERVER_SETTING_KEYS = [	...	@@ -24,7 +24,6 @@ const SHARED_SERVER_SETTING_KEYS = [
24	"continueThreadsAfterServerUpdate",	24	"continueThreadsAfterServerUpdate",
25	"sidebarAutoSettleAfterDays",	25	"sidebarAutoSettleAfterDays",
26	"sidebarAutoSettleOnMerge",	26	"sidebarAutoSettleOnMerge",
27	"defaultThreadEnvMode",
28	"newWorktreesStartFromOrigin",	27	"newWorktreesStartFromOrigin",
29	"sourceControlWritingStyle",	28	"sourceControlWritingStyle",
30	] as const satisfies ReadonlyArray<keyof ServerSettings & keyof ServerSettingsPatch>;	29	] as const satisfies ReadonlyArray<keyof ServerSettings & keyof ServerSettingsPatch>;

packages/contracts/src/settings.ts+35-2

...	@@ -2,7 +2,12 @@ import * as Effect from "effect/Effect";	...	@@ -2,7 +2,12 @@ import * as Effect from "effect/Effect";
2	import * as Duration from "effect/Duration";	2	import * as Duration from "effect/Duration";
3	import * as Schema from "effect/Schema";	3	import * as Schema from "effect/Schema";
4	import * as SchemaTransformation from "effect/SchemaTransformation";	4	import * as SchemaTransformation from "effect/SchemaTransformation";
5	import { ForwardCompatibleNullable, TrimmedNonEmptyString, TrimmedString } from "./baseSchemas.ts";	5	import {
		6	ForwardCompatibleNullable,
		7	ProjectId,
		8	TrimmedNonEmptyString,
		9	TrimmedString,
		10	} from "./baseSchemas.ts";
6	import { UsageLimitSourceId } from "./usageLimitSourceId.ts";	11	import { UsageLimitSourceId } from "./usageLimitSourceId.ts";
7	import { EnvironmentMachineKind, ThreadEnvMode } from "./environment.ts";	12	import { EnvironmentMachineKind, ThreadEnvMode } from "./environment.ts";
8	import {	13	import {
...	@@ -11,7 +16,7 @@ import {	...	@@ -11,7 +16,7 @@ import {
11	DEFAULT_TEXT_GENERATION_REASONING_EFFORT,	16	DEFAULT_TEXT_GENERATION_REASONING_EFFORT,
12	ProviderOptionSelections,	17	ProviderOptionSelections,
13	} from "./model.ts";	18	} from "./model.ts";
14	import { ModelSelection } from "./orchestration.ts";	19	import { ModelSelection, ProjectScript } from "./orchestration.ts";
15	import { BrowserProfile, BrowserProfileId, DEFAULT_BROWSER_PROFILE_ID } from "./browserProfile.ts";	20	import { BrowserProfile, BrowserProfileId, DEFAULT_BROWSER_PROFILE_ID } from "./browserProfile.ts";
16	import {	21	import {
17	DEFAULT_PREVIEW_APPEARANCE,	22	DEFAULT_PREVIEW_APPEARANCE,
...	@@ -856,6 +861,22 @@ export const ServerSettings = Schema.Struct({	...	@@ -856,6 +861,22 @@ export const ServerSettings = Schema.Struct({
856	* between a desktop window and a phone attached to the same server.	861	* between a desktop window and a phone attached to the same server.
857	*/	862	*/
858	enableAgentBrowserAccess: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),	863	enableAgentBrowserAccess: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(true))),
		864	projectAgentBrowserAccessOverrides: Schema.Record(ProjectId, Schema.Boolean).pipe(
		865	Schema.withDecodingDefault(Effect.succeed({})),
		866	),
		867	defaultAutoPull: Schema.Boolean.pipe(Schema.withDecodingDefault(Effect.succeed(false))),
		868	defaultProjectScripts: Schema.Array(ProjectScript).pipe(
		869	Schema.withDecodingDefault(Effect.succeed([])),
		870	),
		871	projectScriptOverrides: Schema.Record(ProjectId, Schema.NullOr(Schema.Array(ProjectScript))).pipe(
		872	Schema.withDecodingDefault(Effect.succeed({})),
		873	),
		874	projectAutoPullOverrides: Schema.Record(ProjectId, Schema.Boolean).pipe(
		875	Schema.withDecodingDefault(Effect.succeed({})),
		876	),
		877	defaultModelSelection: Schema.NullOr(ModelSelection).pipe(
		878	Schema.withDecodingDefault(Effect.succeed(null)),
		879	),
859	sidebarAutoSettleAfterDays: Schema.NullOr(SidebarAutoSettleAfterDays).pipe(	880	sidebarAutoSettleAfterDays: Schema.NullOr(SidebarAutoSettleAfterDays).pipe(
860	Schema.withDecodingDefault(Effect.succeed(DEFAULT_SIDEBAR_AUTO_SETTLE_AFTER_DAYS)),	881	Schema.withDecodingDefault(Effect.succeed(DEFAULT_SIDEBAR_AUTO_SETTLE_AFTER_DAYS)),
861	),	882	),
...	@@ -1116,6 +1137,18 @@ export const ServerSettingsPatch = Schema.Struct({	...	@@ -1116,6 +1137,18 @@ export const ServerSettingsPatch = Schema.Struct({
1116	enableProviderUpdateChecks: Schema.optionalKey(Schema.Boolean),	1137	enableProviderUpdateChecks: Schema.optionalKey(Schema.Boolean),
1117	continueThreadsAfterServerUpdate: Schema.optionalKey(Schema.Boolean),	1138	continueThreadsAfterServerUpdate: Schema.optionalKey(Schema.Boolean),
1118	enableAgentBrowserAccess: Schema.optionalKey(Schema.Boolean),	1139	enableAgentBrowserAccess: Schema.optionalKey(Schema.Boolean),
		1140	projectAgentBrowserAccessOverrides: Schema.optionalKey(
		1141	Schema.Record(ProjectId, Schema.NullOr(Schema.Boolean)),
		1142	),
		1143	defaultAutoPull: Schema.optionalKey(Schema.Boolean),
		1144	defaultProjectScripts: Schema.optionalKey(Schema.Array(ProjectScript)),
		1145	projectScriptOverrides: Schema.optionalKey(
		1146	Schema.Record(ProjectId, Schema.NullOr(Schema.Array(ProjectScript))),
		1147	),
		1148	projectAutoPullOverrides: Schema.optionalKey(
		1149	Schema.Record(ProjectId, Schema.NullOr(Schema.Boolean)),
		1150	),
		1151	defaultModelSelection: Schema.optionalKey(Schema.NullOr(ModelSelection)),
1119	sidebarAutoSettleAfterDays: Schema.optionalKey(Schema.NullOr(SidebarAutoSettleAfterDays)),	1152	sidebarAutoSettleAfterDays: Schema.optionalKey(Schema.NullOr(SidebarAutoSettleAfterDays)),
1120	sidebarAutoSettleOnMerge: Schema.optionalKey(Schema.Boolean),	1153	sidebarAutoSettleOnMerge: Schema.optionalKey(Schema.Boolean),
1121	backgroundActivity: Schema.optionalKey(	1154	backgroundActivity: Schema.optionalKey(

packages/shared/src/projectScripts.ts+21-1

...	@@ -1,4 +1,24 @@	...	@@ -1,4 +1,24 @@
1	import type { ProjectScript } from "@t3tools/contracts";	1	import type { ProjectId, ProjectScript, ServerSettings } from "@t3tools/contracts";
		2
		3	/** Missing entries preserve existing actions; null explicitly resets a checkout to machine defaults. */
		4	export function resolveProjectScripts(
		5	settings: Pick<ServerSettings, "defaultProjectScripts" \| "projectScriptOverrides">,
		6	project: { id: ProjectId; scripts: readonly ProjectScript[] },
		7	): readonly ProjectScript[] {
		8	const override = settings.projectScriptOverrides[project.id];
		9	if (override === null) return settings.defaultProjectScripts;
		10	return (
		11	override ?? (project.scripts.length > 0 ? project.scripts : settings.defaultProjectScripts)
		12	);
		13	}
		14
		15	export function projectScriptsInheritDefaults(
		16	settings: Pick<ServerSettings, "projectScriptOverrides">,
		17	project: { id: ProjectId; scripts: readonly ProjectScript[] },
		18	): boolean {
		19	const override = settings.projectScriptOverrides[project.id];
		20	return override === null \|\| (override === undefined && project.scripts.length === 0);
		21	}
2		22
3	interface ProjectScriptRuntimeEnvInput {	23	interface ProjectScriptRuntimeEnvInput {
4	project: {	24	project: {

packages/shared/src/serverSettings.test.ts+168

...	@@ -1,5 +1,6 @@	...	@@ -1,5 +1,6 @@
1	import {	1	import {
2	DEFAULT_SERVER_SETTINGS,	2	DEFAULT_SERVER_SETTINGS,
		3	ProjectId,
3	ProviderDriverKind,	4	ProviderDriverKind,
4	ProviderInstanceId,	5	ProviderInstanceId,
5	UsageLimitSourceId,	6	UsageLimitSourceId,
...	@@ -9,14 +10,181 @@ import * as Duration from "effect/Duration";	...	@@ -9,14 +10,181 @@ import * as Duration from "effect/Duration";
9	import { describe, expect, it } from "vite-plus/test";	10	import { describe, expect, it } from "vite-plus/test";
10	import { resolveServerBackgroundActivitySettings } from "./backgroundActivitySettings.ts";	11	import { resolveServerBackgroundActivitySettings } from "./backgroundActivitySettings.ts";
11	import { createModelSelection } from "./model.ts";	12	import { createModelSelection } from "./model.ts";
		13	import { resolveProjectScripts, projectScriptsInheritDefaults } from "./projectScripts.ts";
12	import {	14	import {
13	applyServerSettingsPatch,	15	applyServerSettingsPatch,
14	isModelSelectionProviderEnabled,	16	isModelSelectionProviderEnabled,
15	parsePersistedServerObservabilitySettings,	17	parsePersistedServerObservabilitySettings,
16	resolveSourceControlWriterModelSelection,	18	resolveSourceControlWriterModelSelection,
		19	resolveProjectAgentBrowserAccess,
		20	resolveProjectAutoPull,
17	} from "./serverSettings.ts";	21	} from "./serverSettings.ts";
18		22
19	describe("serverSettings helpers", () => {	23	describe("serverSettings helpers", () => {
		24	it("inherits actions, preserves existing actions, and supports empty overrides and reset", () => {
		25	const project = { id: ProjectId.make("project-actions"), scripts: [] };
		26	const action = {
		27	id: "check",
		28	name: "Check",
		29	command: "npm test",
		30	icon: "play" as const,
		31	runOnWorktreeCreate: false,
		32	};
		33	const defaults = applyServerSettingsPatch(DEFAULT_SERVER_SETTINGS, {
		34	defaultProjectScripts: [action],
		35	});
		36	expect(resolveProjectScripts(defaults, project)).toEqual([action]);
		37	expect(projectScriptsInheritDefaults(defaults, project)).toBe(true);
		38	const existing = { ...project, scripts: [{ ...action, command: "npm run lint" }] };
		39	expect(resolveProjectScripts(defaults, existing)).toEqual(existing.scripts);
		40	expect(projectScriptsInheritDefaults(defaults, existing)).toBe(false);
		41	const disabled = applyServerSettingsPatch(defaults, {
		42	projectScriptOverrides: { [project.id]: [] },
		43	});
		44	expect(resolveProjectScripts(disabled, project)).toEqual([]);
		45	expect(projectScriptsInheritDefaults(disabled, project)).toBe(false);
		46	const changedDefault = applyServerSettingsPatch(disabled, {
		47	defaultProjectScripts: [{ ...action, command: "npm run build" }],
		48	});
		49	expect(resolveProjectScripts(changedDefault, project)).toEqual([]);
		50	const reset = applyServerSettingsPatch(changedDefault, {
		51	projectScriptOverrides: { [project.id]: null },
		52	});
		53	expect(resolveProjectScripts(reset, existing)).toEqual(changedDefault.defaultProjectScripts);
		54	expect(projectScriptsInheritDefaults(reset, existing)).toBe(true);
		55	expect(
		56	resolveProjectScripts(
		57	applyServerSettingsPatch(reset, { defaultProjectScripts: [] }),
		58	existing,
		59	),
		60	).toEqual([]);
		61	});
		62
		63	it("preserves other projects' actions when overriding, clearing, or resetting one project", () => {
		64	const firstProject = { id: ProjectId.make("first-project"), scripts: [] };
		65	const secondProject = { id: ProjectId.make("second-project"), scripts: [] };
		66	const defaultAction = {
		67	id: "check",
		68	name: "Check",
		69	command: "npm test",
		70	icon: "play" as const,
		71	runOnWorktreeCreate: false,
		72	};
		73	const firstAction = { ...defaultAction, command: "npm run lint" };
		74	const secondAction = { ...defaultAction, command: "npm run build" };
		75	const firstUpdate = applyServerSettingsPatch(DEFAULT_SERVER_SETTINGS, {
		76	defaultProjectScripts: [defaultAction],
		77	projectScriptOverrides: { [firstProject.id]: [firstAction] },
		78	});
		79	const secondUpdate = applyServerSettingsPatch(firstUpdate, {
		80	projectScriptOverrides: { [secondProject.id]: [secondAction] },
		81	});
		82	expect(resolveProjectScripts(secondUpdate, firstProject)).toEqual([firstAction]);
		83	expect(resolveProjectScripts(secondUpdate, secondProject)).toEqual([secondAction]);
		84
		85	const cleared = applyServerSettingsPatch(secondUpdate, {
		86	projectScriptOverrides: { [firstProject.id]: [] },
		87	});
		88	expect(resolveProjectScripts(cleared, firstProject)).toEqual([]);
		89	expect(resolveProjectScripts(cleared, secondProject)).toEqual([secondAction]);
		90
		91	const reset = applyServerSettingsPatch(cleared, {
		92	projectScriptOverrides: { [firstProject.id]: null },
		93	});
		94	expect(resolveProjectScripts(reset, { ...firstProject, scripts: [firstAction] })).toEqual([
		95	defaultAction,
		96	]);
		97	expect(resolveProjectScripts(reset, secondProject)).toEqual([secondAction]);
		98	expect(resolveProjectScripts(secondUpdate, firstProject)).toEqual([firstAction]);
		99	});
		100
		101	it("inherits automatic pull while preserving legacy opt-ins and explicit overrides", () => {
		102	const projectId = ProjectId.make("project-pull");
		103	expect(resolveProjectAutoPull(DEFAULT_SERVER_SETTINGS, projectId, false)).toBe(false);
		104	expect(resolveProjectAutoPull(DEFAULT_SERVER_SETTINGS, projectId, true)).toBe(true);
		105	const enabled = applyServerSettingsPatch(DEFAULT_SERVER_SETTINGS, { defaultAutoPull: true });
		106	expect(resolveProjectAutoPull(enabled, projectId, false)).toBe(true);
		107	const overridden = applyServerSettingsPatch(enabled, {
		108	projectAutoPullOverrides: { [projectId]: false },
		109	});
		110	expect(resolveProjectAutoPull(overridden, projectId, true)).toBe(false);
		111	const reset = applyServerSettingsPatch(overridden, {
		112	projectAutoPullOverrides: { [projectId]: null },
		113	});
		114	expect(resolveProjectAutoPull(reset, projectId, false)).toBe(true);
		115	const disabled = applyServerSettingsPatch(reset, {
		116	defaultAutoPull: false,
		117	projectAutoPullOverrides: { [projectId]: true },
		118	});
		119	expect(resolveProjectAutoPull(disabled, projectId, false)).toBe(true);
		120	expect(resolveProjectAutoPull(disabled, ProjectId.make("other-project"), false)).toBe(false);
		121	});
		122
		123	it("inherits browser access and restores inheritance when a project override is removed", () => {
		124	const projectId = ProjectId.make("project-browser");
		125	const otherProjectId = ProjectId.make("other-project");
		126	const overridden = applyServerSettingsPatch(DEFAULT_SERVER_SETTINGS, {
		127	projectAgentBrowserAccessOverrides: { [projectId]: false },
		128	});
		129	expect(resolveProjectAgentBrowserAccess(overridden, projectId)).toBe(false);
		130	expect(resolveProjectAgentBrowserAccess(overridden, otherProjectId)).toBe(true);
		131	const reset = applyServerSettingsPatch(overridden, {
		132	projectAgentBrowserAccessOverrides: { [projectId]: null },
		133	});
		134	expect(resolveProjectAgentBrowserAccess(reset, projectId)).toBe(true);
		135	const enabled = applyServerSettingsPatch(reset, {
		136	enableAgentBrowserAccess: false,
		137	projectAgentBrowserAccessOverrides: { [projectId]: true },
		138	});
		139	expect(resolveProjectAgentBrowserAccess(enabled, projectId)).toBe(true);
		140	expect(resolveProjectAgentBrowserAccess(enabled, otherProjectId)).toBe(false);
		141	});
		142
		143	it("preserves other projects' boolean overrides across separate updates and resets", () => {
		144	const firstProjectId = ProjectId.make("first-project");
		145	const secondProjectId = ProjectId.make("second-project");
		146	const firstUpdate = applyServerSettingsPatch(DEFAULT_SERVER_SETTINGS, {
		147	defaultAutoPull: true,
		148	projectAutoPullOverrides: { [firstProjectId]: false },
		149	projectAgentBrowserAccessOverrides: { [firstProjectId]: false },
		150	});
		151	const secondUpdate = applyServerSettingsPatch(firstUpdate, {
		152	projectAutoPullOverrides: { [secondProjectId]: false },
		153	projectAgentBrowserAccessOverrides: { [secondProjectId]: false },
		154	});
		155	for (const projectId of [firstProjectId, secondProjectId]) {
		156	expect(resolveProjectAutoPull(secondUpdate, projectId, false)).toBe(false);
		157	expect(resolveProjectAgentBrowserAccess(secondUpdate, projectId)).toBe(false);
		158	}
		159
		160	const reset = applyServerSettingsPatch(secondUpdate, {
		161	projectAutoPullOverrides: { [firstProjectId]: null },
		162	projectAgentBrowserAccessOverrides: { [firstProjectId]: null },
		163	});
		164	expect(resolveProjectAutoPull(reset, firstProjectId, false)).toBe(true);
		165	expect(resolveProjectAgentBrowserAccess(reset, firstProjectId)).toBe(true);
		166	expect(resolveProjectAutoPull(reset, secondProjectId, false)).toBe(false);
		167	expect(resolveProjectAgentBrowserAccess(reset, secondProjectId)).toBe(false);
		168	expect(reset.projectAutoPullOverrides[firstProjectId]).toBeUndefined();
		169	expect(reset.projectAgentBrowserAccessOverrides[firstProjectId]).toBeUndefined();
		170	expect(resolveProjectAutoPull(secondUpdate, firstProjectId, false)).toBe(false);
		171	expect(resolveProjectAgentBrowserAccess(secondUpdate, firstProjectId)).toBe(false);
		172	});
		173
		174	it("replaces and clears conversation model defaults without retaining old options", () => {
		175	const current = applyServerSettingsPatch(DEFAULT_SERVER_SETTINGS, {
		176	defaultModelSelection: createModelSelection(ProviderInstanceId.make("codex"), "gpt-5.4", [
		177	{ id: "reasoningEffort", value: "high" },
		178	]),
		179	});
		180	const selection = createModelSelection(ProviderInstanceId.make("claudeAgent"), "sonnet");
		181	const updated = applyServerSettingsPatch(current, { defaultModelSelection: selection });
		182	expect(updated.defaultModelSelection).toEqual(selection);
		183	expect(
		184	applyServerSettingsPatch(updated, { defaultModelSelection: null }).defaultModelSelection,
		185	).toBeNull();
		186	});
		187
20	it("ignores missing and blank persisted observability URLs", () => {	188	it("ignores missing and blank persisted observability URLs", () => {
21	expect(parsePersistedServerObservabilitySettings("{}")).toEqual({	189	expect(parsePersistedServerObservabilitySettings("{}")).toEqual({
22	otlpTracesUrl: undefined,	190	otlpTracesUrl: undefined,

packages/shared/src/serverSettings.ts+54

...	@@ -3,6 +3,7 @@ import {	...	@@ -3,6 +3,7 @@ import {
3	isProviderAvailable,	3	isProviderAvailable,
4	resolveProviderInstanceEnabled,	4	resolveProviderInstanceEnabled,
5	type ModelSelection,	5	type ModelSelection,
		6	type ProjectId,
6	type ProviderDriverKind,	7	type ProviderDriverKind,
7	type ServerProvider,	8	type ServerProvider,
8	ServerSettings,	9	ServerSettings,
...	@@ -23,6 +24,27 @@ import {	...	@@ -23,6 +24,27 @@ import {
23	const ServerSettingsJson = fromLenientJson(ServerSettings);	24	const ServerSettingsJson = fromLenientJson(ServerSettings);
24	const decodeServerSettingsJson = Schema.decodeUnknownOption(ServerSettingsJson);	25	const decodeServerSettingsJson = Schema.decodeUnknownOption(ServerSettingsJson);
25		26
		27	export function resolveProjectAgentBrowserAccess(
		28	settings: Pick<ServerSettings, "enableAgentBrowserAccess" \| "projectAgentBrowserAccessOverrides">,
		29	projectId: ProjectId,
		30	): boolean {
		31	return (
		32	settings.projectAgentBrowserAccessOverrides[projectId] ?? settings.enableAgentBrowserAccess
		33	);
		34	}
		35
		36	export function resolveProjectAutoPull(
		37	settings: Pick<ServerSettings, "defaultAutoPull" \| "projectAutoPullOverrides">,
		38	projectId: ProjectId,
		39	legacyAutoPull: boolean \| undefined,
		40	): boolean {
		41	// Existing opt-ins stay enabled until explicitly overridden or reset.
		42	return (
		43	settings.projectAutoPullOverrides[projectId] ??
		44	(legacyAutoPull === true \|\| settings.defaultAutoPull)
		45	);
		46	}
		47
26	type LegacyProviderSettings = ServerSettings["providers"][keyof ServerSettings["providers"]];	48	type LegacyProviderSettings = ServerSettings["providers"][keyof ServerSettings["providers"]];
27		49
28	const getLegacyProviderSettings = (	50	const getLegacyProviderSettings = (
...	@@ -151,6 +173,8 @@ export function applyServerSettingsPatch(	...	@@ -151,6 +173,8 @@ export function applyServerSettingsPatch(
151	// Merged per entry below; its `null` removals must not reach deepMerge.	173	// Merged per entry below; its `null` removals must not reach deepMerge.
152	usageLimitSources: usageLimitSourcesPatch,	174	usageLimitSources: usageLimitSourcesPatch,
153	usagePriceOverrides: usagePriceOverridesPatch,	175	usagePriceOverrides: usagePriceOverridesPatch,
		176	projectAgentBrowserAccessOverrides: projectAgentBrowserAccessOverridesPatch,
		177	projectAutoPullOverrides: projectAutoPullOverridesPatch,
154	...patchForMerge	178	...patchForMerge
155	} = patch;	179	} = patch;
156	const currentBackgroundActivity = normalizeServerBackgroundActivitySettings(current);	180	const currentBackgroundActivity = normalizeServerBackgroundActivitySettings(current);
...	@@ -207,6 +231,36 @@ export function applyServerSettingsPatch(	...	@@ -207,6 +231,36 @@ export function applyServerSettingsPatch(
207	...(patch.providerInstances !== undefined	231	...(patch.providerInstances !== undefined
208	? { providerInstances: patch.providerInstances }	232	? { providerInstances: patch.providerInstances }
209	: {}),	233	: {}),
		234	...(projectAgentBrowserAccessOverridesPatch !== undefined
		235	? {
		236	projectAgentBrowserAccessOverrides: mergeSettingsEntries(
		237	current.projectAgentBrowserAccessOverrides,
		238	projectAgentBrowserAccessOverridesPatch,
		239	),
		240	}
		241	: {}),
		242	...(projectAutoPullOverridesPatch !== undefined
		243	? {
		244	projectAutoPullOverrides: mergeSettingsEntries(
		245	current.projectAutoPullOverrides,
		246	projectAutoPullOverridesPatch,
		247	),
		248	}
		249	: {}),
		250	...(patch.defaultModelSelection !== undefined
		251	? { defaultModelSelection: patch.defaultModelSelection }
		252	: {}),
		253	...(patch.defaultProjectScripts !== undefined
		254	? { defaultProjectScripts: patch.defaultProjectScripts }
		255	: {}),
		256	...(patch.projectScriptOverrides !== undefined
		257	? {
		258	projectScriptOverrides: {
		259	...current.projectScriptOverrides,
		260	...patch.projectScriptOverrides,
		261	},
		262	}
		263	: {}),
210	...(usageLimitSourcesPatch !== undefined	264	...(usageLimitSourcesPatch !== undefined
211	? {	265	? {
212	usageLimitSources: mergeSettingsEntries(	266	usageLimitSources: mergeSettingsEntries(

author	maria <maria@kuuro.net> 2026-09-06 02:32:48-03:00
committer	GitHub <noreply@github.com> 2026-09-06 02:32:48-03:00
log	9f40b2f563c662b43887b11ff99c466fe871c1af
tree	34d644f558304f7b09335a4b44a7aa890b22531f
parent	b972f1c1dfc827c2fb074af92f52a9f8fc1fcda5
signature	Signed by PGP key B5690EEEBB952194

...	@@ -6,7 +6,6 @@ import { handleDesktopAppActivationRequest } from "../../desktopAppActivation";	...	@@ -6,7 +6,6 @@ import { handleDesktopAppActivationRequest } from "../../desktopAppActivation";
6	import { useNewThreadHandler } from "../../hooks/useHandleNewThread";	6	import { useNewThreadHandler } from "../../hooks/useHandleNewThread";
7	import { findProjectByPath, inferProjectTitleFromPath } from "../../lib/projectPaths";	7	import { findProjectByPath, inferProjectTitleFromPath } from "../../lib/projectPaths";
8	import { newProjectId } from "../../lib/utils";	8	import { newProjectId } from "../../lib/utils";
9	import { resolveDefaultProviderModelSelection } from "../../providerInstances";
10	import { readProjects, waitForProject } from "../../state/entities";	9	import { readProjects, waitForProject } from "../../state/entities";
11	import { usePrimaryEnvironment } from "../../state/environments";	10	import { usePrimaryEnvironment } from "../../state/environments";
12	import { projectEnvironment } from "../../state/projects";	11	import { projectEnvironment } from "../../state/projects";
...	@@ -52,10 +51,6 @@ export function DesktopAppActivationCoordinator() {	...	@@ -52,10 +51,6 @@ export function DesktopAppActivationCoordinator() {
52	) ?? null,	51	) ?? null,
53	createProject: async (environmentId, workspaceRoot) => {	52	createProject: async (environmentId, workspaceRoot) => {
54	const projectId = newProjectId();	53	const projectId = newProjectId();
55	const providers =
56	primaryEnvironment?.environmentId === environmentId
57	? (primaryEnvironment.serverConfig?.providers ?? [])
58	: [];
59	const result = await createProject({	54	const result = await createProject({
60	environmentId,	55	environmentId,
61	input: {	56	input: {
...	@@ -63,7 +58,7 @@ export function DesktopAppActivationCoordinator() {	...	@@ -63,7 +58,7 @@ export function DesktopAppActivationCoordinator() {
63	title: inferProjectTitleFromPath(workspaceRoot),	58	title: inferProjectTitleFromPath(workspaceRoot),
64	workspaceRoot,	59	workspaceRoot,
65	createWorkspaceRootIfMissing: false,	60	createWorkspaceRootIfMissing: false,
66	defaultModelSelection: resolveDefaultProviderModelSelection(providers, null),	61	defaultModelSelection: null,
67	},	62	},
68	});	63	});
69	if (result._tag === "Failure") {	64	if (result._tag === "Failure") {

...	@@ -51,7 +51,6 @@ import {	...	@@ -51,7 +51,6 @@ import {
51	} from "../../onboarding/targetEnvironment.logic";	51	} from "../../onboarding/targetEnvironment.logic";
52	import { useCopyToClipboard } from "../../hooks/useCopyToClipboard";	52	import { useCopyToClipboard } from "../../hooks/useCopyToClipboard";
53	import { newProjectId, randomUUID } from "../../lib/utils";	53	import { newProjectId, randomUUID } from "../../lib/utils";
54	import { resolveDefaultProviderModelSelection } from "../../providerInstances";
55	import { agentSessionImport, agentSessionScan } from "../../state/agentSessions";	54	import { agentSessionImport, agentSessionScan } from "../../state/agentSessions";
56	import { readProjects, useProjects } from "../../state/entities";	55	import { readProjects, useProjects } from "../../state/entities";
57	import { useEnvironments, usePrimaryEnvironment } from "../../state/environments";	56	import { useEnvironments, usePrimaryEnvironment } from "../../state/environments";
...	@@ -1029,9 +1028,6 @@ function ImportStep({	...	@@ -1029,9 +1028,6 @@ function ImportStep({
1029	const targetEnvironment = useOnboardingTargetEnvironment(mode, pairedEnvironmentId);	1028	const targetEnvironment = useOnboardingTargetEnvironment(mode, pairedEnvironmentId);
1030	const environmentId = targetEnvironment?.environmentId ?? null;	1029	const environmentId = targetEnvironment?.environmentId ?? null;
1031	const machineLabel = targetEnvironment?.label ?? "this machine";	1030	const machineLabel = targetEnvironment?.label ?? "this machine";
1032	const providers = useAtomValue(
1033	serverEnvironment.providersValueAtom(environmentId ?? ("" as EnvironmentId)),
1034	);
1035	const scan = useEnvironmentQuery(	1031	const scan = useEnvironmentQuery(
1036	environmentId === null ? null : agentSessionScan({ environmentId, input: {} }),	1032	environmentId === null ? null : agentSessionScan({ environmentId, input: {} }),
1037	);	1033	);
...	@@ -1123,7 +1119,6 @@ function ImportStep({	...	@@ -1123,7 +1119,6 @@ function ImportStep({
1123	const importGeneration = importGenerationRef.current;	1119	const importGeneration = importGenerationRef.current;
1124	const importedProjects = importedProjectsRef.current;	1120	const importedProjects = importedProjectsRef.current;
1125	const projectAttempts = projectAttemptsRef.current;	1121	const projectAttempts = projectAttemptsRef.current;
1126	const defaultModelSelection = resolveDefaultProviderModelSelection(providers ?? [], null);
1127	// Interrupted imports are neither failures nor successes — the command was	1122	// Interrupted imports are neither failures nor successes — the command was
1128	// superseded or the environment dropped — but they still didn't land, so	1123	// superseded or the environment dropped — but they still didn't land, so
1129	// they must not read as "imported everything". Retries skip paths that	1124	// they must not read as "imported everything". Retries skip paths that
...	@@ -1164,7 +1159,7 @@ function ImportStep({	...	@@ -1164,7 +1159,7 @@ function ImportStep({
1164	title: candidate.title,	1159	title: candidate.title,
1165	workspaceRoot: candidate.path,	1160	workspaceRoot: candidate.path,
1166	createWorkspaceRootIfMissing: false,	1161	createWorkspaceRootIfMissing: false,
1167	defaultModelSelection,	1162	defaultModelSelection: null,
1168	},	1163	},
1169	});	1164	});
1170	if (	1165	if (

feat(settings): add shared project defaults and scoped overrides (#9754)