Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
97 changes: 97 additions & 0 deletions apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
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 All @@ -3508,6 +3534,77 @@ describe("ClaudeAdapterV2 background wake turns", () => {
),
);

it.effect("drops false bypass switches from --settings before they reach the SDK", () =>
Effect.gen(function* () {
const fileSystem = yield* FileSystem.FileSystem;
const home = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-launch-" });
const cwd = yield* fileSystem.makeTempDirectoryScoped({ prefix: "t3-claude-launch-cwd-" });
const sdk = yield* Effect.promise(() =>
vi.importActual<typeof ClaudeSdk>("@anthropic-ai/claude-agent-sdk"),
);
vi.mocked(ClaudeSdk.resolveSettings).mockImplementation(sdk.resolveSettings);
const openWith = (settings: Record<string, unknown>) =>
Effect.scoped(
Effect.gen(function* () {
const harness = yield* makeWakeHarnessWithOptions({
settings: {
...DEFAULT_CLAUDE_SETTINGS,
homePath: home,
launchArgs: `--settings '${JSON.stringify(settings)}'`,
},
});
yield* harness.runtime.startTurn(
makeClaudeTestTurnInput({
threadId: harness.threadId,
providerThread: harness.providerThread,
now: yield* DateTime.now,
attemptId: RunAttemptId.make("attempt-launch-arg-settings"),
text: "Run git status.",
attachments: [],
runtimePolicy: ProviderAdapter.ProviderAdapterV2RuntimePolicy.make({
runtimeMode: "full-access",
interactionMode: "default",
cwd,
}),
}),
);
const options = harness.getOpenedOptions()!;
return {
permissionMode: options.permissionMode,
settings: options.settings as {
disableAutoMode?: unknown;
permissions?: Record<string, unknown>;
env?: Record<string, unknown>;
},
};
}),
);
const unrestricted = yield* openWith({
disableAutoMode: false,
permissions: { disableBypassPermissionsMode: false, disableAutoMode: false, allow: [] },
env: { KEPT: "1" },
});
assert.equal(unrestricted.permissionMode, "bypassPermissions");
assert.notProperty(unrestricted.settings, "disableAutoMode");
assert.deepEqual(unrestricted.settings.permissions, { allow: [] });
assert.equal(unrestricted.settings.env?.KEPT, "1");
const restricted = yield* openWith({
disableAutoMode: false,
permissions: { disableBypassPermissionsMode: "disable", disableAutoMode: "disable" },
});
assert.equal(restricted.permissionMode, "default");
assert.notProperty(restricted.settings, "disableAutoMode");
assert.deepEqual(restricted.settings.permissions, {
disableBypassPermissionsMode: "disable",
disableAutoMode: "disable",
});
}).pipe(
Effect.provide(
Layer.mergeAll(IdAllocator.layer, McpProviderSessions.layer, NodeServices.layer),
),
),
);

it.effect("asks before restricted Full access tools and follows policy across turns", () =>
Effect.gen(function* () {
const resolveSettings = vi
Expand Down
49 changes: 43 additions & 6 deletions apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
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,39 @@ 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 } : {}),
},
}
: {}),
};
}

// --settings travels to the SDK as options.settings, whose type only allows "disable".
// Shapes the schema rejects keep their current pass-through; resolveBypassAvailability
// already treats them as a bypass failure.
const decodeClaudeLaunchArgBypassSettingsOption = Schema.decodeUnknownOption(ClaudeBypassSettings);
function claudeSdkLaunchArgSettings(settings: ClaudeSdkSettings): ClaudeSdkSettings {
const decoded = decodeClaudeLaunchArgBypassSettingsOption(settings);
return Option.isNone(decoded)
? settings
: (claudeSdkBypassSettings(decoded.value) as ClaudeSdkSettings);
}

const ClaudePromptCacheTtl = Schema.Literals(["5m", "1h"]);
const decodeClaudePromptCacheTtl = Schema.decodeUnknownOption(ClaudePromptCacheTtl);
const decodeClaudeSubagentCacheSettings = Schema.decodeUnknownEffect(
Expand Down Expand Up @@ -4393,7 +4426,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 +4442,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 Expand Up @@ -9923,7 +9958,9 @@ export const makeClaudeAdapterV2 = Effect.fn("makeClaudeAdapterV2")(function* (
cwd: turnInput.runtimePolicy.cwd,
attachmentsDir,
settings: adapterOptions.settings,
...(launchArgSettings === undefined ? {} : { sdkSettings: launchArgSettings }),
...(launchArgSettings === undefined
? {}
: { sdkSettings: claudeSdkLaunchArgSettings(launchArgSettings) }),
environment: claudeQueryEnvironment(
adapterOptions.environment,
turnInput.appThread,
Expand Down
Loading