Skip to content

Commit 9f40b2f

Browse files
authored
feat(settings): add shared project defaults and scoped overrides (pingdotgg#9754)
Co-authored-by: maria-rcks <[email protected]>
1 parent b972f1c commit 9f40b2f

38 files changed

Lines changed: 2236 additions & 646 deletions

‎apps/mobile/src/features/threads/ThreadRouteScreen.tsx‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,21 @@ import {
77
} from "@react-navigation/native";
88
import { useCallback, useEffect, useMemo, useRef, useState, type ReactNode } from "react";
99
import * as Option from "effect/Option";
10-
import { EnvironmentId, ThreadId, type ProjectScript } from "@t3tools/contracts";
10+
import {
11+
DEFAULT_SERVER_SETTINGS,
12+
EnvironmentId,
13+
ThreadId,
14+
type ProjectScript,
15+
} from "@t3tools/contracts";
1116
import {
1217
requestOlderThreadTurns,
1318
threadHasOlderTurns,
1419
} from "@t3tools/client-runtime/state/threads";
15-
import { projectScriptCwd, projectScriptRuntimeEnv } from "@t3tools/shared/projectScripts";
20+
import {
21+
projectScriptCwd,
22+
projectScriptRuntimeEnv,
23+
resolveProjectScripts,
24+
} from "@t3tools/shared/projectScripts";
1625
import { Platform, ScrollView, View } from "react-native";
1726
import { useSafeAreaInsets } from "react-native-safe-area-context";
1827
import { useWorkspaceState } from "../../state/workspace";
@@ -627,7 +636,12 @@ function ThreadRouteContent(
627636
gitOperationLabel: gitState.gitOperationLabel,
628637
canOpenTerminal: Boolean(selectedThreadProject?.workspaceRoot),
629638
canOpenFiles: Boolean(selectedThreadProject?.workspaceRoot),
630-
projectScripts: selectedThreadProject?.scripts ?? [],
639+
projectScripts: selectedThreadProject
640+
? resolveProjectScripts(
641+
routeEnvironmentRuntime?.serverConfig?.settings ?? DEFAULT_SERVER_SETTINGS,
642+
selectedThreadProject,
643+
)
644+
: [],
631645
terminalSessions: terminalMenuSessions,
632646
showDirectFileControl: layout.usesSplitView,
633647
onOpenTerminal: handleOpenTerminal,
@@ -819,6 +833,7 @@ function ThreadRouteContent(
819833
<>
820834
{activeInspectorRenderer ? <InspectorPaneRoleActivation /> : null}
821835
<NativeStackScreenOptions
836+
optionsVersion={threadGitControlProps.projectScripts}
822837
options={{
823838
// Android draws its own in-flow header (AndroidScreenHeader below);
824839
// the native stack header stays iOS-only.

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -427,7 +427,9 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
427427
);
428428
const projectDefaultModelSelection = resolveDefaultableModelSelection(
429429
selectedEnvironmentServerConfig,
430-
selectedProject?.defaultModelSelection ?? null,
430+
selectedProject?.defaultModelSelection ??
431+
selectedEnvironmentServerConfig?.settings.defaultModelSelection ??
432+
null,
431433
);
432434
const storedStickyModelSelection = useStickyComposerModelSelection();
433435
const stickyModelSelection = resolveDefaultableModelSelection(

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

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import * as Option from "effect/Option";
66
import * as Schema from "effect/Schema";
77

88
import * as ProjectionSnapshotQuery from "../orchestration/Services/ProjectionSnapshotQuery.ts";
9+
import * as ServerSettings from "../serverSettings.ts";
910
import * as TerminalManager from "../terminal/Manager.ts";
1011
import * as ProjectSetupScriptRunner from "./ProjectSetupScriptRunner.ts";
1112

@@ -68,13 +69,73 @@ const makeTerminalManagerLayer = (
6869
const testLayer = (
6970
project: OrchestrationProject,
7071
terminal: Pick<TerminalManager.TerminalManager["Service"], "open" | "write">,
72+
settings = ServerSettings.layerTest(),
7173
) =>
7274
ProjectSetupScriptRunner.layer.pipe(
7375
Layer.provideMerge(makeProjectionSnapshotQueryLayer(project)),
7476
Layer.provideMerge(makeTerminalManagerLayer(terminal)),
77+
Layer.provide(settings),
7578
);
7679

7780
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+
78139
it.effect("returns no-script when no setup script exists", () => {
79140
const open = vi.fn(() => Effect.die("unexpected open"));
80141
const write = vi.fn(() => Effect.die("unexpected write"));

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

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
import { ProjectId } from "@t3tools/contracts";
2-
import { projectScriptRuntimeEnv, setupProjectScript } from "@t3tools/shared/projectScripts";
2+
import {
3+
projectScriptRuntimeEnv,
4+
resolveProjectScripts,
5+
setupProjectScript,
6+
} from "@t3tools/shared/projectScripts";
37
import * as Context from "effect/Context";
48
import * as Effect from "effect/Effect";
59
import * as Layer from "effect/Layer";
610
import * as Option from "effect/Option";
711
import * as Schema from "effect/Schema";
812

913
import * as ProjectionSnapshotQuery from "../orchestration/Services/ProjectionSnapshotQuery.ts";
14+
import * as ServerSettings from "../serverSettings.ts";
1015
import * as TerminalManager from "../terminal/Manager.ts";
1116

1217
export interface ProjectSetupScriptRunnerResultNoScript {
@@ -40,7 +45,7 @@ export class ProjectSetupScriptOperationError extends Schema.TaggedErrorClass<Pr
4045
projectId: Schema.optional(Schema.String),
4146
projectCwd: Schema.optional(Schema.String),
4247
worktreePath: Schema.String,
43-
operation: Schema.Literals(["resolveProject", "openTerminal", "writeCommand"]),
48+
operation: Schema.Literals(["resolveProject", "readSettings", "openTerminal", "writeCommand"]),
4449
cause: Schema.Defect(),
4550
},
4651
) {
@@ -81,6 +86,7 @@ export class ProjectSetupScriptRunner extends Context.Service<
8186
export const make = Effect.gen(function* () {
8287
const projectionSnapshotQuery = yield* ProjectionSnapshotQuery.ProjectionSnapshotQuery;
8388
const terminalManager = yield* TerminalManager.TerminalManager;
89+
const serverSettings = yield* ServerSettings.ServerSettingsService;
8490

8591
const runForThread: ProjectSetupScriptRunner["Service"]["runForThread"] = Effect.fn(
8692
"ProjectSetupScriptRunner.runForThread",
@@ -124,7 +130,17 @@ export const make = Effect.gen(function* () {
124130
return yield* new ProjectSetupScriptProjectNotFoundError(errorContext);
125131
}
126132

127-
const script = setupProjectScript(project.scripts);
133+
const settings = yield* serverSettings.getSettings.pipe(
134+
Effect.mapError(
135+
(cause) =>
136+
new ProjectSetupScriptOperationError({
137+
...errorContext,
138+
operation: "readSettings",
139+
cause,
140+
}),
141+
),
142+
);
143+
const script = setupProjectScript(resolveProjectScripts(settings, project));
128144
if (!script) {
129145
return {
130146
status: "no-script",

‎apps/server/src/provider/Layers/ProviderService.test.ts‎

Lines changed: 80 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ import {
1919
EnvironmentId,
2020
EventId,
2121
MessageId,
22+
OrchestrationThreadShell,
23+
ProjectId,
2224
PROVIDER_SEND_TURN_MAX_INPUT_CHARS,
2325
ProviderDriverKind,
2426
ProviderInstanceId,
@@ -75,6 +77,7 @@ import * as ServerConfig from "../../config.ts";
7577
import * as ServerSettings from "../../serverSettings.ts";
7678
import * as AnalyticsService from "../../telemetry/AnalyticsService.ts";
7779
import { makeAdapterRegistryMock } from "../testUtils/providerAdapterRegistryMock.ts";
80+
import * as ProjectionSnapshotQuery from "../../orchestration/Services/ProjectionSnapshotQuery.ts";
7881

7982
const defaultServerSettingsLayer = ServerSettings.ServerSettingsService.layerTest();
8083
const serverConfigTestLayer = ServerConfig.layerTest(process.cwd(), process.cwd()).pipe(
@@ -4302,10 +4305,17 @@ boundedListing.layer("ProviderServiceLive session listing", (it) => {
43024305
);
43034306
});
43044307

4308+
const decodeBrowserAccessThreadShell = Schema.decodeUnknownEffect(OrchestrationThreadShell);
4309+
43054310
describe("agent browser access", () => {
43064311
const revokedThreads: Array<ThreadId> = [];
4312+
const projectId = ProjectId.make("project-browser-access");
43074313

4308-
const startSessionWith = (enableAgentBrowserAccess: boolean, threadId: ThreadId) =>
4314+
const startSessionWith = (
4315+
enableAgentBrowserAccess: boolean,
4316+
threadId: ThreadId,
4317+
projectOverride?: boolean,
4318+
) =>
43094319
Effect.gen(function* () {
43104320
const issued: Array<ThreadId> = [];
43114321
const codex = makeFakeCodexAdapter();
@@ -4319,6 +4329,49 @@ describe("agent browser access", () => {
43194329
const directoryLayer = ProviderSessionDirectoryLive.pipe(
43204330
Layer.provide(runtimeRepositoryLayer),
43214331
);
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+
});
43224375
const providerLayer = makeProviderServiceLive({
43234376
issueMcpCredential: (request) =>
43244377
Effect.sync(() => {
@@ -4329,7 +4382,14 @@ describe("agent browser access", () => {
43294382
}).pipe(
43304383
Layer.provide(providerAdapterLayer),
43314384
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+
),
43334393
Layer.provide(serverConfigTestLayer),
43344394
Layer.provide(AnalyticsService.layerTest),
43354395
Layer.provide(
@@ -4387,4 +4447,22 @@ describe("agent browser access", () => {
43874447
assert.deepEqual(issued, [threadId]);
43884448
}).pipe(Effect.provide(NodeServices.layer)),
43894449
);
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+
);
43904468
});

‎apps/server/src/provider/Layers/ProviderService.ts‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import {
3232
import { expandAssistantCitationsForProvider } from "@t3tools/shared/assistantCitations";
3333
import { causeErrorTag } from "@t3tools/shared/observability";
3434
import { getModelSelectionStringOptionValue } from "@t3tools/shared/model";
35+
import { resolveProjectAgentBrowserAccess } from "@t3tools/shared/serverSettings";
3536
import * as DateTime from "effect/DateTime";
3637
import * as Deferred from "effect/Deferred";
3738
import * as Effect from "effect/Effect";
@@ -72,6 +73,7 @@ import * as AnalyticsService from "../../telemetry/AnalyticsService.ts";
7273
import * as McpProviderSession from "../../mcp/McpProviderSession.ts";
7374
import * as McpSessionRegistry from "../../mcp/McpSessionRegistry.ts";
7475
import * as ServerSettings from "../../serverSettings.ts";
76+
import * as ProjectionSnapshotQuery from "../../orchestration/Services/ProjectionSnapshotQuery.ts";
7577
const isModelSelection = Schema.is(ModelSelection);
7678

7779
interface PendingCompaction {
@@ -323,6 +325,9 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
323325
const registry = yield* ProviderAdapterRegistry.ProviderAdapterRegistry;
324326
const directory = yield* ProviderSessionDirectory.ProviderSessionDirectory;
325327
const serverSettings = yield* ServerSettings.ServerSettingsService;
328+
const projectionQuery = yield* Effect.serviceOption(
329+
ProjectionSnapshotQuery.ProjectionSnapshotQuery,
330+
);
326331
const issueMcpCredential =
327332
options?.issueMcpCredential ?? McpSessionRegistry.issueActiveMcpCredential;
328333
const revokeMcpCredential =
@@ -714,8 +719,19 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
714719
* "off" silently becoming "on" would violate the user's stated choice,
715720
* whereas the reverse costs an agent one toolset and is visible immediately.
716721
*/
717-
const agentBrowserAccessEnabled = serverSettings.getSettings.pipe(
718-
Effect.map((settings) => settings.enableAgentBrowserAccess),
722+
const agentBrowserAccessEnabled = Effect.fn("ProviderService.agentBrowserAccessEnabled")(
723+
function* (threadId: ThreadId) {
724+
const settings = yield* serverSettings.getSettings;
725+
if (Object.keys(settings.projectAgentBrowserAccessOverrides).length === 0) {
726+
return settings.enableAgentBrowserAccess;
727+
}
728+
// Provider-only runtimes may omit orchestration. An unresolved project
729+
// must not bypass an explicit browser override.
730+
if (Option.isNone(projectionQuery)) return false;
731+
const thread = yield* projectionQuery.value.getThreadShellById(threadId);
732+
if (Option.isNone(thread)) return false;
733+
return resolveProjectAgentBrowserAccess(settings, thread.value.projectId);
734+
},
719735
Effect.catch((cause) =>
720736
Effect.logWarning(
721737
"Could not read server settings; withholding agent browser access for this session.",
@@ -726,7 +742,7 @@ const makeProviderService = Effect.fn("makeProviderService")(function* (
726742

727743
const prepareMcpSession = (threadId: ThreadId, providerInstanceId: ProviderInstanceId) =>
728744
Effect.gen(function* () {
729-
if (!(yield* agentBrowserAccessEnabled)) {
745+
if (!(yield* agentBrowserAccessEnabled(threadId))) {
730746
// Revoke as well as clear. Every other prepare path reaches
731747
// `issueActiveMcpCredential`, which revokes the thread first, so
732748
// skipping it here would leave a previously issued bearer token valid

‎apps/server/src/server.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -317,7 +317,7 @@ const PullRequestServiceLive = PullRequestService.layer.pipe(
317317
);
318318

319319
const GitManagerLayerLive = GitManager.layer.pipe(
320-
Layer.provideMerge(ProjectSetupScriptRunner.layer),
320+
Layer.provideMerge(ProjectSetupScriptRunner.layer.pipe(Layer.provide(ServerSettingsLayerLive))),
321321
Layer.provideMerge(GitVcsDriver.layer),
322322
Layer.provideMerge(SourceControlProviderRegistryLayerLive),
323323
Layer.provideMerge(TextGeneration.layer),
@@ -353,7 +353,9 @@ const VcsLayerLive = Layer.empty.pipe(
353353
Layer.provideMerge(
354354
VcsStatusBroadcaster.layer.pipe(
355355
Layer.provide(GitWorkflowLayerLive),
356-
Layer.provide(VcsStatusBroadcaster.autoPullPolicyLayer),
356+
Layer.provide(
357+
VcsStatusBroadcaster.autoPullPolicyLayer.pipe(Layer.provide(ServerSettingsLayerLive)),
358+
),
357359
),
358360
),
359361
);

0 commit comments

Comments
 (0)