Skip to content

Commit fc32707

Browse files
fix(web): inherited runtime modes yield to the managed policy ceiling
A project's last-used runtime mode above the administrator's ceiling no longer becomes a new draft's default; the server's policy-clamped default applies instead, matching mobile. AI-assisted; verified with the tests and tools listed above.
1 parent a913b30 commit fc32707

6 files changed

Lines changed: 40 additions & 8 deletions

File tree

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ import {
262262
useThreadCheckpointSummaries,
263263
} from "../state/entities";
264264
import { resolveDefaultRuntimeMode } from "../lib/chatThreadActions";
265+
import { useManagedPolicy } from "../state/managedPolicy";
265266
import { useEnvironmentShellHasSnapshot } from "../state/shell";
266267
import { ChatComposer, type ChatComposerHandle } from "./chat/ChatComposer";
267268
import { DraftHeroHeadline } from "./chat/DraftHeroHeadline";
@@ -938,6 +939,7 @@ export default function ChatView(props: ChatViewProps) {
938939
const [, setThreadErrorBannerDismissTick] = useState(0);
939940
const threadErrorIsServerRuntimeError =
940941
localServerError === null && visibleThreadError === serverRuntime?.lastError;
942+
const managedPolicy = useManagedPolicy(environmentId);
941943
const draftLastUsedRuntimeMode = useProjectLastUsedRuntimeMode(
942944
!isServerThread && activeThread
943945
? scopeProjectRef(activeThread.environmentId, activeThread.projectId)
@@ -946,6 +948,7 @@ export default function ChatView(props: ChatViewProps) {
946948
const defaultRuntimeMode = resolveDefaultRuntimeMode(
947949
resolveProjectSettings(settings, activeThread?.projectId ?? null),
948950
draftLastUsedRuntimeMode,
951+
managedPolicy,
949952
);
950953
const runtimeMode =
951954
composerRuntimeMode ??

‎apps/web/src/components/chat/DraftHeroHeadline.tsx‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,13 +195,15 @@ export function DraftHeroHeadline({
195195
void openProjectDraft(scopeProjectRef(project.environmentId, project.id));
196196
return;
197197
}
198+
const targetServerConfig = environments.find(
199+
(environment) => environment.environmentId === project.environmentId,
200+
)?.serverConfig;
198201
retargetDraftToProject({
199202
draftId,
200203
projectRef: scopeProjectRef(project.environmentId, project.id),
201204
project,
202-
environmentSettings: environments.find(
203-
(environment) => environment.environmentId === project.environmentId,
204-
)?.serverConfig?.settings,
205+
environmentSettings: targetServerConfig?.settings,
206+
managedPolicy: targetServerConfig?.managedPolicy,
205207
providers: providersByEnvironment.get(project.environmentId) ?? [],
206208
threads,
207209
logicalProjectKey,

‎apps/web/src/components/chat/useDraftEnvironmentRouting.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@ export function useDraftEnvironmentRouting(input: DraftEnvironmentRoutingInput)
125125
project.environmentId === target.environmentId && project.id === target.projectId,
126126
) ?? null,
127127
environmentSettings: environmentById.get(target.environmentId)?.serverConfig?.settings,
128+
managedPolicy: environmentById.get(target.environmentId)?.serverConfig?.managedPolicy,
128129
providers: providersByEnvironment.get(target.environmentId) ?? [],
129130
threads: readThreadShells(),
130131
logicalProjectKey: null,
@@ -236,6 +237,7 @@ export function useDraftEnvironmentRouting(input: DraftEnvironmentRoutingInput)
236237
projectRef: scopeProjectRef(target.environmentId, project.id),
237238
project,
238239
environmentSettings: environmentById.get(target.environmentId)?.serverConfig?.settings,
240+
managedPolicy: environmentById.get(target.environmentId)?.serverConfig?.managedPolicy,
239241
providers: providersByEnvironment.get(target.environmentId) ?? [],
240242
threads: readThreadShells(),
241243
logicalProjectKey: activeProjectIsScratch

‎apps/web/src/hooks/useHandleNewThread.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ export function createNewThreadHandler(router: AnyRouter) {
147147
projectSettings,
148148
lastUsed: resolveProjectLastUsedSettings(readThreadShells(), projectRef),
149149
serverSettings: targetServerSettings,
150+
managedPolicy: environmentServerConfigs.get(projectRef.environmentId)?.managedPolicy,
150151
providers: environmentServerConfigs.get(projectRef.environmentId)?.providers ?? [],
151152
hasStickyProvider: useComposerDraftStore.getState().stickyActiveProvider !== null,
152153
now: Date.now(),

‎apps/web/src/lib/chatThreadActions.test.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {
44
ProjectId,
55
ProviderInstanceId,
66
ThreadId,
7+
type ManagedPolicySummary,
78
type ModelSelection,
89
type ServerSettings,
910
} from "@t3tools/contracts";
@@ -46,12 +47,14 @@ function settingsFor(overrides: Partial<ServerSettings> = {}) {
4647
const resolveDefaults = (
4748
projectSettings: ReturnType<typeof settingsFor>,
4849
last: typeof lastUsed | null,
50+
managedPolicy?: ManagedPolicySummary,
4951
) =>
5052
resolveNewThreadDefaults({
5153
projectId,
5254
projectSettings,
5355
lastUsed: last,
5456
serverSettings: undefined,
57+
managedPolicy,
5558
providers: [],
5659
hasStickyProvider: false,
5760
now: 0,
@@ -65,6 +68,15 @@ describe("resolveNewThreadDefaults", () => {
6568
});
6669
});
6770

71+
it("drops a last-used runtime mode above the policy ceiling for the environment default", () => {
72+
const policy = {
73+
organization: "Example",
74+
lockedSettings: [],
75+
limits: { maxRuntimeMode: "auto-accept-edits" },
76+
} as const;
77+
expect(resolveDefaults(settingsFor(), lastUsed, policy).runtimeMode).toBe("approval-required");
78+
});
79+
6880
it("falls back to environment defaults for a project nobody has used", () => {
6981
expect(resolveDefaults(settingsFor(), null)).toEqual({
7082
modelSelection: ENVIRONMENT_DEFAULT,
@@ -134,6 +146,7 @@ describe("retargetDraftToProject", () => {
134146
defaultModelSelection: ENVIRONMENT_DEFAULT,
135147
defaultRuntimeMode: "approval-required",
136148
},
149+
managedPolicy: undefined,
137150
providers: [],
138151
threads: [],
139152
logicalProjectKey: null,

‎apps/web/src/lib/chatThreadActions.ts‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ import {
66
} from "@t3tools/client-runtime/state/project-last-used-settings";
77
import {
88
DEFAULT_SERVER_SETTINGS,
9+
managedRuntimeModeDenial,
10+
type ManagedPolicySummary,
911
type EnvironmentId,
1012
type ModelSelection,
1113
type ProjectId,
@@ -64,15 +66,20 @@ export function resolveNewDraftStartFromOrigin(input: {
6466
return input.envMode === "worktree" && input.newWorktreesStartFromOrigin;
6567
}
6668

67-
/** A runtime mode configured on the project wins over the project's last-used one. */
69+
/**
70+
* A runtime mode configured on the project wins over the project's last-used one,
71+
* which yields to the server's policy-clamped default when the policy denies it.
72+
*/
6873
export function resolveDefaultRuntimeMode(
6974
projectSettings: ResolvedProjectSettings,
7075
lastUsedRuntimeMode: RuntimeMode | null,
76+
managedPolicy: ManagedPolicySummary | undefined,
7177
): RuntimeMode {
72-
return (
73-
(projectSettings.sources.defaultRuntimeMode === "environment" ? lastUsedRuntimeMode : null) ??
74-
projectSettings.settings.defaultRuntimeMode
75-
);
78+
const inherited =
79+
projectSettings.sources.defaultRuntimeMode === "environment" ? lastUsedRuntimeMode : null;
80+
return inherited !== null && managedRuntimeModeDenial(managedPolicy, inherited) === undefined
81+
? inherited
82+
: projectSettings.settings.defaultRuntimeMode;
7683
}
7784

7885
/**
@@ -86,6 +93,7 @@ export function resolveNewThreadDefaults(input: {
8693
readonly projectSettings: ResolvedProjectSettings;
8794
readonly lastUsed: ProjectLastUsedSettings | null;
8895
readonly serverSettings: ServerSettings | undefined;
96+
readonly managedPolicy: ManagedPolicySummary | undefined;
8997
readonly providers: ReadonlyArray<ServerProvider>;
9098
readonly hasStickyProvider: boolean;
9199
readonly now: number;
@@ -97,6 +105,7 @@ export function resolveNewThreadDefaults(input: {
97105
const runtimeMode = resolveDefaultRuntimeMode(
98106
input.projectSettings,
99107
input.lastUsed?.runtimeMode ?? null,
108+
input.managedPolicy,
100109
);
101110
const projectSelection =
102111
sources.defaultModelSelection === "environment" ? null : settings.defaultModelSelection;
@@ -136,6 +145,7 @@ export function retargetDraftToProject(input: {
136145
readonly projectRef: ScopedProjectRef;
137146
readonly project: LegacyProjectSettingsFields | null;
138147
readonly environmentSettings: ServerSettings | undefined;
148+
readonly managedPolicy: ManagedPolicySummary | undefined;
139149
readonly providers: ReadonlyArray<ServerProvider>;
140150
readonly threads: ReadonlyArray<ProjectLastUsedSettingsThread>;
141151
readonly logicalProjectKey: string | null;
@@ -156,6 +166,7 @@ export function retargetDraftToProject(input: {
156166
),
157167
lastUsed: resolveProjectLastUsedSettings(input.threads, input.projectRef),
158168
serverSettings: input.environmentSettings,
169+
managedPolicy: input.managedPolicy,
159170
providers: input.providers,
160171
hasStickyProvider: store.stickyActiveProvider !== null,
161172
now: Date.now(),

0 commit comments

Comments
 (0)