@machina.ai/cell-cli-core 1.36.0-rc1 → 1.38.1-rc2

package/dist/src/sandbox/windows/commandSafety.test.js

@@ -0,0 +1,42 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, expect, it } from 'vitest';
+import { isKnownSafeCommand, isDangerousCommand } from './commandSafety.js';
+describe('Windows commandSafety', () => {
+    describe('isKnownSafeCommand', () => {
+        it('should identify known safe commands', () => {
+            expect(isKnownSafeCommand(['dir'])).toBe(true);
+            expect(isKnownSafeCommand(['echo', 'hello'])).toBe(true);
+            expect(isKnownSafeCommand(['whoami'])).toBe(true);
+        });
+        it('should strip .exe extension for safe commands', () => {
+            expect(isKnownSafeCommand(['dir.exe'])).toBe(true);
+            expect(isKnownSafeCommand(['ECHO.EXE', 'hello'])).toBe(true);
+            expect(isKnownSafeCommand(['WHOAMI.exe'])).toBe(true);
+        });
+        it('should reject unknown commands', () => {
+            expect(isKnownSafeCommand(['unknown'])).toBe(false);
+            expect(isKnownSafeCommand(['npm', 'install'])).toBe(false);
+        });
+    });
+    describe('isDangerousCommand', () => {
+        it('should identify dangerous commands', () => {
+            expect(isDangerousCommand(['del', 'file.txt'])).toBe(true);
+            expect(isDangerousCommand(['powershell', '-Command', 'echo'])).toBe(true);
+            expect(isDangerousCommand(['cmd', '/c', 'dir'])).toBe(true);
+        });
+        it('should strip .exe extension for dangerous commands', () => {
+            expect(isDangerousCommand(['del.exe', 'file.txt'])).toBe(true);
+            expect(isDangerousCommand(['POWERSHELL.EXE', '-Command', 'echo'])).toBe(true);
+            expect(isDangerousCommand(['cmd.exe', '/c', 'dir'])).toBe(true);
+        });
+        it('should not flag safe commands as dangerous', () => {
+            expect(isDangerousCommand(['dir'])).toBe(false);
+            expect(isDangerousCommand(['echo', 'hello'])).toBe(false);
+        });
+    });
+});
+//# sourceMappingURL=commandSafety.test.js.map

package/dist/src/sandbox/windows/commandSafety.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"commandSafety.test.js","sourceRoot":"","sources":["../../../../src/sandbox/windows/commandSafety.test.ts"],"names":[],"mappings":"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"}

package/dist/src/sandbox/windows/windowsSandboxDenialUtils.d.ts

@@ -0,0 +1,13 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { type ParsedSandboxDenial } from '../../services/sandboxManager.js';
+import type { ShellExecutionResult } from '../../services/shellExecutionService.js';
+import { type SandboxDenialCache } from '../utils/sandboxDenialUtils.js';
+/**
+ * Windows-specific sandbox denial detection.
+ * Extracts paths from "Access is denied" and related errors.
+ */
+export declare function parseWindowsSandboxDenials(result: ShellExecutionResult, cache?: SandboxDenialCache): ParsedSandboxDenial | undefined;

package/dist/src/sandbox/windows/windowsSandboxDenialUtils.js

@@ -0,0 +1,69 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import {} from '../../services/sandboxManager.js';
+import { sanitizeExtractedPath, } from '../utils/sandboxDenialUtils.js';
+/**
+ * Windows-specific sandbox denial detection.
+ * Extracts paths from "Access is denied" and related errors.
+ */
+export function parseWindowsSandboxDenials(result, cache) {
+    const output = result.output || '';
+    const errorOutput = result.error?.message;
+    const fullText = output + '\n' + (errorOutput || '');
+    const combined = fullText.toLowerCase();
+    // Cache by the first 200 characters of the error to handle variable data (timestamps, PIDs)
+    const cacheKey = combined.trim().slice(0, 200);
+    if (cacheKey && cache?.has(cacheKey)) {
+        return undefined;
+    }
+    const isFileDenial = [
+        'access is denied',
+        'access to the path',
+        'unauthorizedaccessexception',
+        '0x80070005',
+        'eperm: operation not permitted',
+    ].some((keyword) => combined.includes(keyword));
+    const isNetworkDenial = [
+        'eacces: permission denied',
+        'an attempt was made to access a socket in a way forbidden by its access permissions',
+        // 10013 is WSAEACCES
+        '10013',
+    ].some((keyword) => combined.includes(keyword));
+    if (!isFileDenial && !isNetworkDenial) {
+        return undefined;
+    }
+    const filePaths = new Set();
+    // Regex for Windows absolute paths (e.g., C:\Path or \\?\C:\Path)
+    // Handles drive letters and potentially quoted paths.
+    // We use two passes: one for quoted paths (which can contain spaces)
+    // and one for unquoted paths (which end at common separators).
+    // 1. Quoted paths: 'C:\Foo Bar' or "C:\Foo Bar"
+    const quotedRegex = /['"]((?:\\\\(?:\?|\.)\\)?[a-zA-Z]:[\\/][^'"]+)['"]/g;
+    for (const match of fullText.matchAll(quotedRegex)) {
+        const sanitized = sanitizeExtractedPath(match[1]);
+        if (sanitized)
+            filePaths.add(sanitized);
+    }
+    // 2. Unquoted paths or paths in PowerShell error format: PermissionDenied: (C:\path:String)
+    const generalRegex = /(?:^|[\s(])((?:\\\\(?:\?|\.)\\)?[a-zA-Z]:[\\/][^"'\s()<>|?*]+)/g;
+    for (const match of fullText.matchAll(generalRegex)) {
+        // Clean up trailing colon which might be part of the error message rather than the path
+        let p = match[1];
+        if (p.endsWith(':'))
+            p = p.slice(0, -1);
+        const sanitized = sanitizeExtractedPath(p);
+        if (sanitized)
+            filePaths.add(sanitized);
+    }
+    if (cacheKey && cache) {
+        cache.set(cacheKey, true);
+    }
+    return {
+        network: isNetworkDenial || undefined,
+        filePaths: filePaths.size > 0 ? Array.from(filePaths) : undefined,
+    };
+}
+//# sourceMappingURL=windowsSandboxDenialUtils.js.map

package/dist/src/sandbox/windows/windowsSandboxDenialUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"windowsSandboxDenialUtils.js","sourceRoot":"","sources":["../../../../src/sandbox/windows/windowsSandboxDenialUtils.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAA4B,MAAM,kCAAkC,CAAC;AAE5E,OAAO,EAEL,qBAAqB,GACtB,MAAM,gCAAgC,CAAC;AAExC;;;GAGG;AACH,MAAM,UAAU,0BAA0B,CACxC,MAA4B,EAC5B,KAA0B;IAE1B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;IACnC,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC;IAC1C,MAAM,QAAQ,GAAG,MAAM,GAAG,IAAI,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC;IACrD,MAAM,QAAQ,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;IAExC,4FAA4F;IAC5F,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC/C,IAAI,QAAQ,IAAI,KAAK,EAAE,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;QACrC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,YAAY,GAAG;QACnB,kBAAkB;QAClB,oBAAoB;QACpB,6BAA6B;QAC7B,YAAY;QACZ,gCAAgC;KACjC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAEhD,MAAM,eAAe,GAAG;QACtB,2BAA2B;QAC3B,qFAAqF;QACrF,qBAAqB;QACrB,OAAO;KACR,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC;IAEhD,IAAI,CAAC,YAAY,IAAI,CAAC,eAAe,EAAE,CAAC;QACtC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IAEpC,kEAAkE;IAClE,sDAAsD;IACtD,qEAAqE;IACrE,+DAA+D;IAE/D,gDAAgD;IAChD,MAAM,WAAW,GAAG,qDAAqD,CAAC;IAC1E,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QACnD,MAAM,SAAS,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAClD,IAAI,SAAS;YAAE,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC;IAED,4FAA4F;IAC5F,MAAM,YAAY,GAChB,iEAAiE,CAAC;IACpE,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QACpD,wFAAwF;QACxF,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QACjB,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACxC,MAAM,SAAS,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAC3C,IAAI,SAAS;YAAE,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC1C,CAAC;IAED,IAAI,QAAQ,IAAI,KAAK,EAAE,CAAC;QACtB,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;IAED,OAAO;QACL,OAAO,EAAE,eAAe,IAAI,SAAS;QACrC,SAAS,EAAE,SAAS,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;KAClE,CAAC;AACJ,CAAC"}

package/dist/src/sandbox/windows/windowsSandboxDenialUtils.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/sandbox/windows/windowsSandboxDenialUtils.test.js

@@ -0,0 +1,68 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect } from 'vitest';
+import { parseWindowsSandboxDenials } from './windowsSandboxDenialUtils.js';
+describe('parseWindowsSandboxDenials', () => {
+    it('should detect CMD "Access is denied" and extract paths', () => {
+        const parsed = parseWindowsSandboxDenials({
+            output: 'Access is denied.\r\n',
+            error: new Error('Command failed: dir C:\\Windows\\System32\\config'),
+        });
+        expect(parsed).toBeDefined();
+        expect(parsed?.filePaths).toContain('C:\\Windows\\System32\\config');
+    });
+    it('should detect PowerShell "Access to the path is denied"', () => {
+        const parsed = parseWindowsSandboxDenials({
+            output: "Set-Content : Access to the path 'C:\\test.txt' is denied.\r\nAt line:1 char:1\r\n",
+        });
+        expect(parsed).toBeDefined();
+        expect(parsed?.filePaths).toContain('C:\\test.txt');
+    });
+    it('should detect Node.js EPERM on Windows', () => {
+        const parsed = parseWindowsSandboxDenials({
+            error: {
+                message: "Error: EPERM: operation not permitted, open 'D:\\project\\file.ts'",
+            },
+        });
+        expect(parsed).toBeDefined();
+        expect(parsed?.filePaths).toContain('D:\\project\\file.ts');
+    });
+    it('should detect network denial (EACCES)', () => {
+        const parsed = parseWindowsSandboxDenials({
+            output: 'Error: listen EACCES: permission denied 0.0.0.0:3000',
+        });
+        expect(parsed).toBeDefined();
+        expect(parsed?.network).toBe(true);
+    });
+    it('should detect native Windows error code 0x80070005', () => {
+        const parsed = parseWindowsSandboxDenials({
+            output: 'HRESULT: 0x80070005',
+        });
+        expect(parsed).toBeDefined();
+        // No path in output, but recognized as denial
+    });
+    it('should handle extended-length paths', () => {
+        const parsed = parseWindowsSandboxDenials({
+            output: 'Access is denied to \\\\?\\C:\\Very\\Long\\Path\\file.txt',
+        });
+        expect(parsed).toBeDefined();
+        expect(parsed?.filePaths).toContain('\\\\?\\C:\\Very\\Long\\Path\\file.txt');
+    });
+    it('should detect Windows paths with forward slashes', () => {
+        const parsed = parseWindowsSandboxDenials({
+            output: "Error: EPERM: operation not permitted, open 'C:/project/file.ts'",
+        });
+        expect(parsed).toBeDefined();
+        expect(parsed?.filePaths).toContain('C:/project/file.ts');
+    });
+    it('should return undefined if no denial detected', () => {
+        const parsed = parseWindowsSandboxDenials({
+            output: 'Directory of C:\\Users\r\n03/26/2026  11:40 AM    <DIR>          .',
+        });
+        expect(parsed).toBeUndefined();
+    });
+});
+//# sourceMappingURL=windowsSandboxDenialUtils.test.js.map

package/dist/src/sandbox/windows/windowsSandboxDenialUtils.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"windowsSandboxDenialUtils.test.js","sourceRoot":"","sources":["../../../../src/sandbox/windows/windowsSandboxDenialUtils.test.ts"],"names":[],"mappings":"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"}

package/dist/src/scheduler/policy.js

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { ToolErrorType } from '../tools/tool-error.js';
-import { ApprovalMode, PolicyDecision, } from '../policy/types.js';
+import { ApprovalMode, MODES_BY_PERMISSIVENESS, PolicyDecision, } from '../policy/types.js';
 import { MessageBusType, } from '../confirmation-bus/types.js';
 import { ToolConfirmationOutcome, } from '../tools/tools.js';
 import { buildFilePathArgsPattern } from '../policy/utils.js';
@@ -72,6 +72,19 @@ export async function updatePolicy(tool, outcome, confirmationDetails, context,
     }
     // Determine persist scope if we are persisting.
     let persistScope;
+    let modes;
+    const currentMode = context.config.getApprovalMode();
+    // If this is an 'Always Allow' selection, we restrict it to the current mode
+    // and more permissive modes.
+    if (outcome === ToolConfirmationOutcome.ProceedAlways ||
+        outcome === ToolConfirmationOutcome.ProceedAlwaysTool ||
+        outcome === ToolConfirmationOutcome.ProceedAlwaysServer ||
+        outcome === ToolConfirmationOutcome.ProceedAlwaysAndSave) {
+        const modeIndex = MODES_BY_PERMISSIVENESS.indexOf(currentMode);
+        if (modeIndex !== -1) {
+            modes = MODES_BY_PERMISSIVENESS.slice(modeIndex);
+        }
+    }
     if (outcome === ToolConfirmationOutcome.ProceedAlwaysAndSave) {
         // If folder is trusted and workspace policies are enabled, we prefer workspace scope.
         if (context.config &&
@@ -85,11 +98,11 @@ export async function updatePolicy(tool, outcome, confirmationDetails, context,
     }
     // Specialized Tools (MCP)
     if (confirmationDetails?.type === 'mcp') {
-        await handleMcpPolicyUpdate(tool, outcome, confirmationDetails, messageBus, persistScope);
+        await handleMcpPolicyUpdate(tool, outcome, confirmationDetails, messageBus, persistScope, modes);
         return;
     }
     // Generic Fallback (Shell, Info, etc.)
-    await handleStandardPolicyUpdate(tool, outcome, confirmationDetails, messageBus, persistScope, toolInvocation, context.config);
+    await handleStandardPolicyUpdate(tool, outcome, confirmationDetails, messageBus, persistScope, toolInvocation, context.config, modes);
 }
 /**
  * Returns true if the user's 'Always Allow' selection for a specific tool
@@ -106,7 +119,7 @@ function isAutoEditTransition(tool, outcome) {
  * Handles policy updates for standard tools (Shell, Info, etc.), including
  * session-level and persistent approvals.
  */
-async function handleStandardPolicyUpdate(tool, outcome, confirmationDetails, messageBus, persistScope, toolInvocation, config) {
+async function handleStandardPolicyUpdate(tool, outcome, confirmationDetails, messageBus, persistScope, toolInvocation, config, modes) {
     if (outcome === ToolConfirmationOutcome.ProceedAlways ||
         outcome === ToolConfirmationOutcome.ProceedAlwaysAndSave) {
         const options = toolInvocation?.getPolicyUpdateOptions?.(outcome) || {};
@@ -124,6 +137,7 @@ async function handleStandardPolicyUpdate(tool, outcome, confirmationDetails, me
             toolName: tool.name,
             persist: outcome === ToolConfirmationOutcome.ProceedAlwaysAndSave,
             persistScope,
+            modes,
             ...options,
         });
     }
@@ -132,7 +146,7 @@ async function handleStandardPolicyUpdate(tool, outcome, confirmationDetails, me
  * Handles policy updates specifically for MCP tools, including session-level
  * and persistent approvals.
  */
-async function handleMcpPolicyUpdate(tool, outcome, confirmationDetails, messageBus, persistScope) {
+async function handleMcpPolicyUpdate(tool, outcome, confirmationDetails, messageBus, persistScope, modes) {
     const isMcpAlways = outcome === ToolConfirmationOutcome.ProceedAlways ||
         outcome === ToolConfirmationOutcome.ProceedAlwaysTool ||
         outcome === ToolConfirmationOutcome.ProceedAlwaysServer ||
@@ -152,6 +166,7 @@ async function handleMcpPolicyUpdate(tool, outcome, confirmationDetails, message
         mcpName: confirmationDetails.serverName,
         persist,
         persistScope,
+        modes,
     });
 }
 //# sourceMappingURL=policy.js.map

package/dist/src/scheduler/policy.js.map

@@ -1 +1 @@
-{"version":3,"file":"policy.js","sourceRoot":"","sources":["../../../src/scheduler/policy.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"policy.js","sourceRoot":"","sources":["../../../src/scheduler/policy.ts"],"names":[],"mappings":"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"}

package/dist/src/scheduler/policy.test.js

@@ -20,6 +20,7 @@ describe('policy.ts', () => {
                 check: vi.fn().mockResolvedValue({ decision: PolicyDecision.ALLOW }),
             };
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
             };
             mockConfig.config =
@@ -37,6 +38,7 @@ describe('policy.ts', () => {
                 check: vi.fn().mockResolvedValue({ decision: PolicyDecision.ALLOW }),
             };
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
             };
             mockConfig.config =
@@ -56,6 +58,7 @@ describe('policy.ts', () => {
                 check: vi.fn().mockResolvedValue({ decision: PolicyDecision.ALLOW }),
             };
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
                 getDisableAlwaysAllow: vi.fn().mockReturnValue(true),
             };
@@ -77,6 +80,7 @@ describe('policy.ts', () => {
                 check: vi.fn().mockResolvedValue({ decision: PolicyDecision.ASK_USER }),
             };
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
                 isInteractive: vi.fn().mockReturnValue(false),
             };
@@ -93,6 +97,7 @@ describe('policy.ts', () => {
                 check: vi.fn().mockResolvedValue({ decision: PolicyDecision.DENY }),
             };
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
             };
             mockConfig.config =
@@ -109,6 +114,7 @@ describe('policy.ts', () => {
                 check: vi.fn().mockResolvedValue({ decision: PolicyDecision.ASK_USER }),
             };
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
                 isInteractive: vi.fn().mockReturnValue(true),
             };
@@ -126,6 +132,7 @@ describe('policy.ts', () => {
                 check: vi.fn().mockResolvedValue({ decision: PolicyDecision.ASK_USER }),
             };
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
                 isInteractive: vi.fn().mockReturnValue(true),
             };
@@ -141,6 +148,7 @@ describe('policy.ts', () => {
                 check: vi.fn().mockResolvedValue({ decision: PolicyDecision.DENY }),
             };
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 getPolicyEngine: vi.fn().mockReturnValue(mockPolicyEngine),
             };
             const toolCall = {
@@ -154,6 +162,7 @@ describe('policy.ts', () => {
     describe('updatePolicy', () => {
         it('should set AUTO_EDIT mode for auto-edit transition tools', async () => {
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 setApprovalMode: vi.fn(),
             };
             mockConfig.config =
@@ -170,6 +179,7 @@ describe('policy.ts', () => {
         });
         it('should handle standard policy updates (persist=false)', async () => {
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 setApprovalMode: vi.fn(),
             };
             mockConfig.config =
@@ -189,6 +199,7 @@ describe('policy.ts', () => {
         });
         it('should handle standard policy updates with persistence', async () => {
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 isTrustedFolder: vi.fn().mockReturnValue(false),
                 getWorkspacePoliciesDir: vi.fn().mockReturnValue(undefined),
                 setApprovalMode: vi.fn(),
@@ -210,6 +221,7 @@ describe('policy.ts', () => {
         });
         it('should handle shell command prefixes', async () => {
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 setApprovalMode: vi.fn(),
             };
             mockConfig.config =
@@ -237,6 +249,7 @@ describe('policy.ts', () => {
         });
         it('should handle MCP policy updates (server scope)', async () => {
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 setApprovalMode: vi.fn(),
             };
             mockConfig.config =
@@ -265,6 +278,7 @@ describe('policy.ts', () => {
         });
         it('should NOT publish update for ProceedOnce', async () => {
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 setApprovalMode: vi.fn(),
             };
             mockConfig.config =
@@ -281,6 +295,7 @@ describe('policy.ts', () => {
         });
         it('should NOT publish update for Cancel', async () => {
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 setApprovalMode: vi.fn(),
             };
             mockConfig.config =
@@ -296,6 +311,7 @@ describe('policy.ts', () => {
         });
         it('should NOT publish update for ModifyWithEditor', async () => {
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 setApprovalMode: vi.fn(),
             };
             mockConfig.config =
@@ -311,6 +327,7 @@ describe('policy.ts', () => {
         });
         it('should handle MCP ProceedAlwaysTool (specific tool name)', async () => {
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 setApprovalMode: vi.fn(),
             };
             mockConfig.config =
@@ -339,6 +356,7 @@ describe('policy.ts', () => {
         });
         it('should handle MCP ProceedAlways (persist: false)', async () => {
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 setApprovalMode: vi.fn(),
             };
             mockConfig.config =
@@ -367,6 +385,7 @@ describe('policy.ts', () => {
         });
         it('should handle MCP ProceedAlwaysAndSave (persist: true)', async () => {
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 isTrustedFolder: vi.fn().mockReturnValue(false),
                 getWorkspacePoliciesDir: vi.fn().mockReturnValue(undefined),
                 setApprovalMode: vi.fn(),
@@ -397,6 +416,7 @@ describe('policy.ts', () => {
         });
         it('should determine persistScope: workspace in trusted folders', async () => {
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 isTrustedFolder: vi.fn().mockReturnValue(true),
                 getWorkspacePoliciesDir: vi
                     .fn()
@@ -416,6 +436,7 @@ describe('policy.ts', () => {
         });
         it('should determine persistScope: user in untrusted folders', async () => {
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 isTrustedFolder: vi.fn().mockReturnValue(false),
                 getWorkspacePoliciesDir: vi
                     .fn()
@@ -435,6 +456,7 @@ describe('policy.ts', () => {
         });
         it('should narrow edit tools with argsPattern', async () => {
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 isTrustedFolder: vi.fn().mockReturnValue(false),
                 getWorkspacePoliciesDir: vi.fn().mockReturnValue(undefined),
                 getTargetDir: vi.fn().mockReturnValue('/mock/dir'),
@@ -463,6 +485,7 @@ describe('policy.ts', () => {
         });
         it('should work when context is created via Object.create (prototype chain)', async () => {
             const mockConfig = {
+                getApprovalMode: vi.fn().mockReturnValue(ApprovalMode.DEFAULT),
                 setApprovalMode: vi.fn(),
             };
             const mockMessageBus = {
@@ -589,5 +612,62 @@ describe('Plan Mode Denial Consistency', () => {
         expect(resultMessage).toBe('Tool execution denied by policy.');
         expect(resultErrorType).toBe(ToolErrorType.POLICY_VIOLATION);
     });
+    describe('updatePolicy - context-aware modes', () => {
+        const testCases = [
+            {
+                currentMode: ApprovalMode.DEFAULT,
+                expectedModes: [
+                    ApprovalMode.DEFAULT,
+                    ApprovalMode.AUTO_EDIT,
+                    ApprovalMode.YOLO,
+                ],
+                description: 'include current and more permissive modes in DEFAULT mode',
+            },
+            {
+                currentMode: ApprovalMode.AUTO_EDIT,
+                expectedModes: [ApprovalMode.AUTO_EDIT, ApprovalMode.YOLO],
+                description: 'include current and more permissive modes in AUTO_EDIT mode',
+            },
+            {
+                currentMode: ApprovalMode.YOLO,
+                expectedModes: [ApprovalMode.YOLO],
+                description: 'include current and more permissive modes in YOLO mode',
+            },
+            {
+                currentMode: ApprovalMode.PLAN,
+                expectedModes: [
+                    ApprovalMode.PLAN,
+                    ApprovalMode.DEFAULT,
+                    ApprovalMode.AUTO_EDIT,
+                    ApprovalMode.YOLO,
+                ],
+                description: 'include all modes explicitly when granted in PLAN mode',
+            },
+        ];
+        testCases.forEach(({ currentMode, expectedModes, description }) => {
+            it(`should ${description}`, async () => {
+                const mockConfig = {
+                    getApprovalMode: vi.fn().mockReturnValue(currentMode),
+                    isTrustedFolder: vi.fn().mockReturnValue(false),
+                    getWorkspacePoliciesDir: vi.fn().mockReturnValue(undefined),
+                };
+                const mockMessageBus = {
+                    publish: vi.fn(),
+                };
+                const context = {
+                    config: mockConfig,
+                    messageBus: mockMessageBus,
+                };
+                const tool = { name: 'test-tool' };
+                await updatePolicy(tool, ToolConfirmationOutcome.ProceedAlwaysAndSave, undefined, context, mockMessageBus);
+                expect(mockMessageBus.publish).toHaveBeenCalledWith(expect.objectContaining({
+                    type: MessageBusType.UPDATE_POLICY,
+                    toolName: 'test-tool',
+                    persist: true,
+                    modes: expectedModes,
+                }));
+            });
+        });
+    });
 });
 //# sourceMappingURL=policy.test.js.map