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
2 changes: 1 addition & 1 deletion cli/src/codex/codexLocalLauncher.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ describe('codexLocalLauncher', () => {
expect(harness.launches).toHaveLength(1);
expect(harness.launches[0]?.codexArgs).toEqual([
'--ask-for-approval',
'on-failure',
'on-request',
'--sandbox',
'workspace-write',
'--model',
Expand Down
6 changes: 3 additions & 3 deletions cli/src/codex/utils/appServerConfig.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,15 @@ describe('appServerConfig', () => {
});
});

it('keeps on-failure approvals for safe-yolo threads', () => {
it('keeps supported escalation approvals for safe-yolo threads', () => {
const params = buildThreadStartParams({
cwd: '/workspace/project',
mode: { permissionMode: 'safe-yolo', collaborationMode: 'default' },
mcpServers
});

expect(params.sandbox).toBe('workspace-write');
expect(params.approvalPolicy).toBe('on-failure');
expect(params.approvalPolicy).toBe('on-request');
});

it('allows MCP elicitation without enabling sandbox prompts for read-only threads', () => {
Expand Down Expand Up @@ -460,7 +460,7 @@ describe('appServerConfig', () => {
cliOverrides: { sandbox: 'read-only', approvalPolicy: 'never' }
});

expect(params.approvalPolicy).toBe('on-failure');
expect(params.approvalPolicy).toBe('on-request');
expect(params.sandboxPolicy).toEqual({ type: 'workspaceWrite' });
expect(params.collaborationMode).toEqual({
mode: 'default',
Expand Down
4 changes: 2 additions & 2 deletions cli/src/codex/utils/permissionModeConfig.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ describe('resolveCodexPermissionModeConfig', () => {
});
});

it('keeps safe-yolo escalation on failure', () => {
it('keeps safe-yolo escalation available with a supported approval policy', () => {
expect(resolveCodexPermissionModeConfig('safe-yolo')).toEqual({
approvalPolicy: 'on-failure',
approvalPolicy: 'on-request',
sandbox: 'workspace-write',
sandboxPolicy: { type: 'workspaceWrite' }
});
Expand Down
6 changes: 4 additions & 2 deletions cli/src/codex/utils/permissionModeConfig.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,10 @@ export function resolveCodexPermissionModeConfig(mode: CodexPermissionMode): Cod
};
case 'safe-yolo':
return {
// Keep escalation available when the workspace-write sandbox blocks a command.
approvalPolicy: 'on-failure',
// Current Codex versions reject the removed `on-failure` policy. Keep
// escalation available through `on-request`; HAPI auto-approves these
// requests in safe-yolo mode.
approvalPolicy: 'on-request',
sandbox: 'workspace-write',
sandboxPolicy: { type: 'workspaceWrite' }
};
Expand Down
Loading