Skip to content

fix(server): accept explicit false in Claude managed policy #24402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maria-rcks merged 6 commits into from
Oct 30, 2026
Merged

fix(server): accept explicit false in Claude managed policy #24402

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
650cc75
fix(server): accept explicit false in Claude managed policy
iamzaydk Oct 24, 2026
463cffd
Merge remote-tracking branch 'origin/main' into fix/claude-managed-po…
iamzaydk Oct 24, 2026
449a1ec
chore: merge current main into claude policy fix
maria-rcks Oct 26, 2026
479e459
test(server): preserve restrictions alongside false claude switches
maria-rcks Oct 26, 2026
190d9b5
chore: merge main
maria-rcks Oct 29, 2026
2ccb3fd
fix(server): normalize launch-arg bypass flags before the SDK
iamzaydk Oct 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3489,6 +3489,32 @@ describe("ClaudeAdapterV2 background wake turns", () => {
const restricted = yield* open;
assert.equal(restricted.permissionMode, "default");
assert.isUndefined(restricted.allowDangerouslySkipPermissions);
yield* fileSystem.writeFileString(
remoteFile,
JSON.stringify({
permissions: { disableBypassPermissionsMode: false, disableAutoMode: false },
disableAutoMode: false,
managedSourcesBehavior: "merge",
}),
);
const unrestricted = yield* open;
assert.equal(unrestricted.permissionMode, "bypassPermissions");
assert.equal(unrestricted.allowDangerouslySkipPermissions, true);
yield* fileSystem.writeFileString(
remoteFile,
JSON.stringify({
permissions: { disableBypassPermissionsMode: "disable", disableAutoMode: "disable" },
disableAutoMode: false,
}),
);
const mixed = yield* open;
assert.equal(mixed.permissionMode, "default");
assert.isUndefined(mixed.allowDangerouslySkipPermissions);
yield* fileSystem.writeFileString(
remoteFile,
JSON.stringify({ permissions: { disableBypassPermissionsMode: true } }),
);
assert.equal((yield* open).permissionMode, "auto");
yield* fileSystem.remove(remoteFile);
assert.equal((yield* open).permissionMode, "bypassPermissions");
const launchRestricted = yield* openWith(
Expand Down
34 changes: 29 additions & 5 deletions apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2589,12 +2589,12 @@ export function claudeRuntimeQueryPolicyForRuntimePolicy(

const ClaudeBypassSettings = Schema.StructWithRest(
Schema.Struct({
disableAutoMode: Schema.optionalKey(Schema.Literal("disable")),
disableAutoMode: Schema.optionalKey(Schema.Literals(["disable", false])),
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
permissions: Schema.optionalKey(
Schema.StructWithRest(
Schema.Struct({
disableBypassPermissionsMode: Schema.optionalKey(Schema.Literal("disable")),
disableAutoMode: Schema.optionalKey(Schema.Literal("disable")),
disableBypassPermissionsMode: Schema.optionalKey(Schema.Literals(["disable", false])),
disableAutoMode: Schema.optionalKey(Schema.Literals(["disable", false])),
}),
[Schema.Record(Schema.String, Schema.Unknown)],
),
Expand All @@ -2607,6 +2607,28 @@ const decodeClaudeBypassSettings = Schema.decodeUnknownEffect(
);
const decodeClaudeLaunchArgBypassSettings = Schema.decodeUnknownEffect(ClaudeBypassSettings);

function claudeSdkBypassSettings(settings: typeof ClaudeBypassSettings.Type) {
const { disableAutoMode, permissions, ...rest } = settings;
const {
disableBypassPermissionsMode,
disableAutoMode: nestedAutoMode,
...permissionRest
} = permissions ?? {};
return {
...rest,
...(disableAutoMode === "disable" ? { disableAutoMode } : {}),
...(permissions
? {
permissions: {
...permissionRest,
...(disableBypassPermissionsMode === "disable" ? { disableBypassPermissionsMode } : {}),
...(nestedAutoMode === "disable" ? { disableAutoMode: nestedAutoMode } : {}),
},
}
: {}),
};
}

const ClaudePromptCacheTtl = Schema.Literals(["5m", "1h"]);
const decodeClaudePromptCacheTtl = Schema.decodeUnknownOption(ClaudePromptCacheTtl);
const decodeClaudeSubagentCacheSettings = Schema.decodeUnknownEffect(
Expand Down Expand Up @@ -4393,7 +4415,9 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
const readBypassSettings = (filePath: string) =>
fileSystem.readFileString(filePath).pipe(
Effect.flatMap(decodeClaudeBypassSettings),
Effect.catchReason("PlatformError", "NotFound", () => Effect.succeed({})),
Effect.catchReason("PlatformError", "NotFound", () =>
Effect.succeed({} as typeof ClaudeBypassSettings.Type),
),
);
const resolveBypassAvailability = Effect.fn("ClaudeAdapterV2.resolveBypassAvailability")(
function* (cwd: string | null) {
Expand All @@ -4407,7 +4431,7 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
resolveClaudeSettings({
...(cwd === null ? {} : { cwd }),
settingSources: customHome ? ["project", "local"] : ["user", "project", "local"],
serverManagedSettings: remote,
serverManagedSettings: claudeSdkBypassSettings(remote),
}),
);
const launchArgSettings = yield* readClaudeLaunchArgSettings({
Expand Down
Loading