Skip to content

Commit 4fbcb8e

Browse files
cursoragentMats Varnskühler
andcommitted
fix(server): fall Claude full access back past auto when auto is locked
Honor disableAutoMode as well as disableBypassPermissionsMode so a locked Auto fallback does not send another forbidden mode. Swap CLAUDE_CONFIG_DIR only around settings resolve and restore it if resolve throws. Co-authored-by: Mats Varnskühler <[email protected]>
1 parent 81ae174 commit 4fbcb8e

3 files changed

Lines changed: 322 additions & 30 deletions

File tree

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

Lines changed: 250 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,23 @@ const BYPASS_DISABLED_CLAUDE_SETTINGS = {
166166
},
167167
},
168168
} as const;
169+
const AUTO_DISABLED_CLAUDE_SETTINGS = {
170+
effective: {
171+
disableAutoMode: "disable",
172+
permissions: {
173+
disableAutoMode: "disable",
174+
},
175+
},
176+
} as const;
177+
const BYPASS_AND_AUTO_DISABLED_CLAUDE_SETTINGS = {
178+
effective: {
179+
disableAutoMode: "disable",
180+
permissions: {
181+
disableBypassPermissionsMode: "disable",
182+
disableAutoMode: "disable",
183+
},
184+
},
185+
} as const;
169186

170187
function makeHarness(config?: {
171188
readonly nativeEventLogPath?: string;
@@ -175,6 +192,7 @@ function makeHarness(config?: {
175192
readonly claudeConfig?: Partial<ClaudeSettings>;
176193
readonly instanceId?: ProviderInstanceId;
177194
readonly resolveSettings?: ClaudeAdapterLiveOptions["resolveSettings"];
195+
readonly resolveSdkSettings?: ClaudeAdapterLiveOptions["resolveSdkSettings"];
178196
}) {
179197
const query = new FakeClaudeQuery();
180198
let createInput:
@@ -190,7 +208,12 @@ function makeHarness(config?: {
190208
createInput = input;
191209
return query;
192210
},
193-
resolveSettings: config?.resolveSettings ?? (() => Effect.succeed(PERMISSIVE_CLAUDE_SETTINGS)),
211+
...(config?.resolveSdkSettings
212+
? { resolveSdkSettings: config.resolveSdkSettings }
213+
: {
214+
resolveSettings:
215+
config?.resolveSettings ?? (() => Effect.succeed(PERMISSIVE_CLAUDE_SETTINGS)),
216+
}),
194217
...(config?.nativeEventLogger
195218
? {
196219
nativeEventLogger: config.nativeEventLogger,
@@ -540,6 +563,28 @@ describe("ClaudeAdapterLive", () => {
540563
);
541564
});
542565

566+
it.effect("starts supervised when policy disables both bypass and auto for full access", () => {
567+
const harness = makeHarness({
568+
resolveSettings: () => Effect.succeed(BYPASS_AND_AUTO_DISABLED_CLAUDE_SETTINGS),
569+
});
570+
return Effect.gen(function* () {
571+
const adapter = yield* ClaudeAdapter;
572+
const session = yield* adapter.startSession({
573+
threadId: THREAD_ID,
574+
provider: ProviderDriverKind.make("claudeAgent"),
575+
runtimeMode: "full-access",
576+
});
577+
578+
const createInput = harness.getLastCreateQueryInput();
579+
assert.equal(session.runtimeMode, "full-access");
580+
assert.equal(createInput?.options.permissionMode, undefined);
581+
assert.equal(createInput?.options.allowDangerouslySkipPermissions, undefined);
582+
}).pipe(
583+
Effect.provideService(Random.Random, makeDeterministicRandomService()),
584+
Effect.provide(harness.layer),
585+
);
586+
});
587+
543588
it.effect("treats settings resolution failure as bypass disabled for full access", () => {
544589
const harness = makeHarness({
545590
resolveSettings: () => Effect.fail(new ClaudeSettingsResolveError({})),
@@ -639,6 +684,210 @@ describe("ClaudeAdapterLive", () => {
639684
);
640685
});
641686

687+
it.effect("starts supervised when policy disables auto for auto runtime", () => {
688+
const harness = makeHarness({
689+
resolveSettings: () => Effect.succeed(AUTO_DISABLED_CLAUDE_SETTINGS),
690+
});
691+
return Effect.gen(function* () {
692+
const adapter = yield* ClaudeAdapter;
693+
const session = yield* adapter.startSession({
694+
threadId: THREAD_ID,
695+
provider: ProviderDriverKind.make("claudeAgent"),
696+
runtimeMode: "auto",
697+
});
698+
699+
const createInput = harness.getLastCreateQueryInput();
700+
assert.equal(session.runtimeMode, "auto");
701+
assert.equal(createInput?.options.permissionMode, undefined);
702+
assert.equal(createInput?.options.allowDangerouslySkipPermissions, undefined);
703+
}).pipe(
704+
Effect.provideService(Random.Random, makeDeterministicRandomService()),
705+
Effect.provide(harness.layer),
706+
);
707+
});
708+
709+
it.effect("honors permissions.disableAutoMode without the top-level copy", () => {
710+
const harness = makeHarness({
711+
resolveSettings: () =>
712+
Effect.succeed({
713+
effective: {
714+
permissions: {
715+
disableAutoMode: "disable",
716+
},
717+
},
718+
}),
719+
});
720+
return Effect.gen(function* () {
721+
const adapter = yield* ClaudeAdapter;
722+
yield* adapter.startSession({
723+
threadId: THREAD_ID,
724+
provider: ProviderDriverKind.make("claudeAgent"),
725+
runtimeMode: "auto",
726+
});
727+
728+
const createInput = harness.getLastCreateQueryInput();
729+
assert.equal(createInput?.options.permissionMode, undefined);
730+
}).pipe(
731+
Effect.provideService(Random.Random, makeDeterministicRandomService()),
732+
Effect.provide(harness.layer),
733+
);
734+
});
735+
736+
it.effect("honors top-level disableAutoMode without the permissions copy", () => {
737+
const harness = makeHarness({
738+
resolveSettings: () =>
739+
Effect.succeed({
740+
effective: {
741+
disableAutoMode: "disable",
742+
},
743+
}),
744+
});
745+
return Effect.gen(function* () {
746+
const adapter = yield* ClaudeAdapter;
747+
yield* adapter.startSession({
748+
threadId: THREAD_ID,
749+
provider: ProviderDriverKind.make("claudeAgent"),
750+
runtimeMode: "auto",
751+
});
752+
753+
const createInput = harness.getLastCreateQueryInput();
754+
assert.equal(createInput?.options.permissionMode, undefined);
755+
}).pipe(
756+
Effect.provideService(Random.Random, makeDeterministicRandomService()),
757+
Effect.provide(harness.layer),
758+
);
759+
});
760+
761+
it.effect("keeps bypass when auto is locked but bypass is allowed", () => {
762+
const harness = makeHarness({
763+
resolveSettings: () => Effect.succeed(AUTO_DISABLED_CLAUDE_SETTINGS),
764+
});
765+
return Effect.gen(function* () {
766+
const adapter = yield* ClaudeAdapter;
767+
yield* adapter.startSession({
768+
threadId: THREAD_ID,
769+
provider: ProviderDriverKind.make("claudeAgent"),
770+
runtimeMode: "full-access",
771+
});
772+
773+
const createInput = harness.getLastCreateQueryInput();
774+
assert.equal(createInput?.options.permissionMode, "bypassPermissions");
775+
assert.equal(createInput?.options.allowDangerouslySkipPermissions, true);
776+
}).pipe(
777+
Effect.provideService(Random.Random, makeDeterministicRandomService()),
778+
Effect.provide(harness.layer),
779+
);
780+
});
781+
782+
it.effect(
783+
"restores default after plan when full access was policy-downgraded to supervised",
784+
() => {
785+
const harness = makeHarness({
786+
resolveSettings: () => Effect.succeed(BYPASS_AND_AUTO_DISABLED_CLAUDE_SETTINGS),
787+
});
788+
return Effect.gen(function* () {
789+
const adapter = yield* ClaudeAdapter;
790+
const session = yield* adapter.startSession({
791+
threadId: THREAD_ID,
792+
provider: ProviderDriverKind.make("claudeAgent"),
793+
runtimeMode: "full-access",
794+
});
795+
796+
yield* adapter.sendTurn({
797+
threadId: session.threadId,
798+
input: "plan this",
799+
interactionMode: "plan",
800+
attachments: [],
801+
});
802+
803+
const turnCompletedFiber = yield* Stream.filter(
804+
adapter.streamEvents,
805+
(event) => event.type === "turn.completed",
806+
).pipe(Stream.runHead, Effect.forkChild);
807+
808+
harness.query.emit({
809+
type: "result",
810+
subtype: "success",
811+
is_error: false,
812+
errors: [],
813+
session_id: "sdk-session-policy-default",
814+
uuid: "result-policy-default",
815+
} as unknown as SDKMessage);
816+
817+
yield* Fiber.join(turnCompletedFiber);
818+
819+
yield* adapter.sendTurn({
820+
threadId: session.threadId,
821+
input: "now do it",
822+
interactionMode: "default",
823+
attachments: [],
824+
});
825+
826+
assert.deepEqual(harness.query.setPermissionModeCalls, ["plan", "default"]);
827+
}).pipe(
828+
Effect.provideService(Random.Random, makeDeterministicRandomService()),
829+
Effect.provide(harness.layer),
830+
);
831+
},
832+
);
833+
834+
it.effect("resolves Claude settings with the instance CLAUDE_CONFIG_DIR", () => {
835+
const homePath = "/tmp/claude-policy-home-test";
836+
const seenConfigDirs: Array<string | undefined> = [];
837+
const previousConfigDir = process.env.CLAUDE_CONFIG_DIR;
838+
const harness = makeHarness({
839+
claudeConfig: { homePath },
840+
resolveSdkSettings: async () => {
841+
seenConfigDirs.push(process.env.CLAUDE_CONFIG_DIR);
842+
return BYPASS_DISABLED_CLAUDE_SETTINGS;
843+
},
844+
});
845+
return Effect.gen(function* () {
846+
const adapter = yield* ClaudeAdapter;
847+
const session = yield* adapter.startSession({
848+
threadId: THREAD_ID,
849+
provider: ProviderDriverKind.make("claudeAgent"),
850+
runtimeMode: "full-access",
851+
});
852+
853+
const createInput = harness.getLastCreateQueryInput();
854+
assert.equal(session.runtimeMode, "full-access");
855+
assert.equal(createInput?.options.permissionMode, "auto");
856+
assert.equal(createInput?.options.allowDangerouslySkipPermissions, undefined);
857+
assert.deepEqual(seenConfigDirs, [homePath]);
858+
assert.equal(process.env.CLAUDE_CONFIG_DIR, previousConfigDir);
859+
}).pipe(
860+
Effect.provideService(Random.Random, makeDeterministicRandomService()),
861+
Effect.provide(harness.layer),
862+
);
863+
});
864+
865+
it.effect("restores CLAUDE_CONFIG_DIR when settings resolution throws", () => {
866+
const homePath = "/tmp/claude-policy-home-throw";
867+
const previousConfigDir = process.env.CLAUDE_CONFIG_DIR;
868+
const harness = makeHarness({
869+
claudeConfig: { homePath },
870+
resolveSdkSettings: async () => {
871+
throw new Error("sdk resolve boom");
872+
},
873+
});
874+
return Effect.gen(function* () {
875+
const adapter = yield* ClaudeAdapter;
876+
yield* adapter.startSession({
877+
threadId: THREAD_ID,
878+
provider: ProviderDriverKind.make("claudeAgent"),
879+
runtimeMode: "full-access",
880+
});
881+
882+
const createInput = harness.getLastCreateQueryInput();
883+
assert.equal(createInput?.options.permissionMode, "auto");
884+
assert.equal(process.env.CLAUDE_CONFIG_DIR, previousConfigDir);
885+
}).pipe(
886+
Effect.provideService(Random.Random, makeDeterministicRandomService()),
887+
Effect.provide(harness.layer),
888+
);
889+
});
890+
642891
it.effect("forwards claude effort levels into query options", () => {
643892
const harness = makeHarness();
644893
return Effect.gen(function* () {

0 commit comments

Comments
 (0)