fix(core): conditionally expose additional_permissions in shell tool (#23729)

Co-authored-by: Sandy Tao <sandytao520@icloud.com>

packages/core/src/policy/policy-engine.ts

@@ -702,15 +702,6 @@ export class PolicyEngine {
       }
     }
 
-    // Sandbox Expansion requests MUST always be confirmed by the user,
-    // even if the base command is otherwise ALLOWED by the policy engine.
-    if (
-      decision === PolicyDecision.ALLOW &&
-      toolCall.args?.['additional_permissions']
-    ) {
-      decision = PolicyDecision.ASK_USER;
-    }
-
     return {
       decision: this.applyNonInteractiveMode(decision),
       rule: matchedRule,

packages/core/src/tools/definitions/coreTools.ts

@@ -233,13 +233,19 @@ export {
 export function getShellDefinition(
   enableInteractiveShell: boolean,
   enableEfficiency: boolean,
+  enableToolSandboxing: boolean = false,
 ): ToolDefinition {
   return {
-    base: getShellDeclaration(enableInteractiveShell, enableEfficiency),
+    base: getShellDeclaration(
+      enableInteractiveShell,
+      enableEfficiency,
+      enableToolSandboxing,
+    ),
     overrides: (modelId) =>
       getToolSet(modelId).run_shell_command(
         enableInteractiveShell,
         enableEfficiency,
+        enableToolSandboxing,
       ),
   };
 }

packages/core/src/tools/definitions/coreToolsModelSnapshots.test.ts

@@ -69,7 +69,7 @@ describe('coreTools snapshots for specific models', () => {
     { name: 'list_directory', definition: LS_DEFINITION },
     {
       name: 'run_shell_command',
-      definition: getShellDefinition(true, true),
+      definition: getShellDefinition(true, true, true),
     },
     { name: 'replace', definition: EDIT_DEFINITION },
     { name: 'google_web_search', definition: WEB_SEARCH_DEFINITION },

packages/core/src/tools/definitions/dynamic-declaration-helpers.ts

@@ -81,6 +81,7 @@ export function getCommandDescription(): string {
 export function getShellDeclaration(
   enableInteractiveShell: boolean,
   enableEfficiency: boolean,
+  enableToolSandboxing: boolean = false,
 ): FunctionDeclaration {
   return {
     name: SHELL_TOOL_NAME,
@@ -110,6 +111,8 @@ export function getShellDeclaration(
           description:
             'Set to true if this command should be run in the background (e.g. for long-running servers or watchers). The command will be started, allowed to run for a brief moment to check for immediate errors, and then moved to the background.',
         },
+        ...(enableToolSandboxing
+          ? {
               [PARAM_ADDITIONAL_PERMISSIONS]: {
                 type: 'object',
                 description:
@@ -139,6 +142,8 @@ export function getShellDeclaration(
                   },
                 },
               },
+            }
+          : {}),
       },
       required: [SHELL_PARAM_COMMAND],
     },

packages/core/src/tools/definitions/model-family-sets/default-legacy.ts

@@ -332,8 +332,16 @@ export const DEFAULT_LEGACY_SET: CoreToolSet = {
     },
   },
 
-  run_shell_command: (enableInteractiveShell, enableEfficiency) =>
+  run_shell_command: (
-    getShellDeclaration(enableInteractiveShell, enableEfficiency),
+    enableInteractiveShell,
+    enableEfficiency,
+    enableToolSandboxing,
+  ) =>
+    getShellDeclaration(
+      enableInteractiveShell,
+      enableEfficiency,
+      enableToolSandboxing,
+    ),
 
   replace: {
     name: EDIT_TOOL_NAME,

packages/core/src/tools/definitions/model-family-sets/gemini-3.ts

@@ -338,8 +338,16 @@ export const GEMINI_3_SET: CoreToolSet = {
     },
   },
 
-  run_shell_command: (enableInteractiveShell, enableEfficiency) =>
+  run_shell_command: (
-    getShellDeclaration(enableInteractiveShell, enableEfficiency),
+    enableInteractiveShell,
+    enableEfficiency,
+    enableToolSandboxing,
+  ) =>
+    getShellDeclaration(
+      enableInteractiveShell,
+      enableEfficiency,
+      enableToolSandboxing,
+    ),
 
   replace: {
     name: EDIT_TOOL_NAME,

packages/core/src/tools/definitions/types.ts

@@ -37,6 +37,7 @@ export interface CoreToolSet {
   run_shell_command: (
     enableInteractiveShell: boolean,
     enableEfficiency: boolean,
+    enableToolSandboxing: boolean,
   ) => FunctionDeclaration;
   replace: FunctionDeclaration;
   google_web_search: FunctionDeclaration;

packages/core/src/tools/shell.test.ts

@@ -137,6 +137,7 @@ describe('ShellTool', () => {
       getShellToolInactivityTimeout: vi.fn().mockReturnValue(1000),
       getEnableInteractiveShell: vi.fn().mockReturnValue(false),
       getEnableShellOutputEfficiency: vi.fn().mockReturnValue(true),
+      getSandboxEnabled: vi.fn().mockReturnValue(false),
       sanitizationConfig: {},
       sandboxManager: new NoopSandboxManager(),
     } as unknown as Config;

packages/core/src/tools/shell.ts

@@ -696,6 +696,7 @@ export class ShellTool extends BaseDeclarativeTool<
     const definition = getShellDefinition(
       context.config.getEnableInteractiveShell(),
       context.config.getEnableShellOutputEfficiency(),
+      context.config.getSandboxEnabled(),
     );
     super(
       ShellTool.Name,
@@ -745,6 +746,7 @@ export class ShellTool extends BaseDeclarativeTool<
     const definition = getShellDefinition(
       this.context.config.getEnableInteractiveShell(),
       this.context.config.getEnableShellOutputEfficiency(),
+      this.context.config.getSandboxEnabled(),
     );
     return resolveToolDeclaration(definition, modelId);
   }