@codingame/monaco-vscode-api 30.0.0 → 31.0.0

package/vscode/src/vs/workbench/contrib/terminalContrib/chatAgentTools/common/terminalChatAgentToolsConfiguration.js

@@ -1,5 +1,6 @@
 
 import { localize } from '../../../../../nls.js';
+import { AgentSandboxSettingId, AgentSandboxEnabledValue } from '../../../../../platform/sandbox/common/settings.js';
 import { TerminalSettingId } from '../../../../../platform/terminal/common/terminal.js';
 import { terminalProfileBaseProperties } from '../../../../../platform/terminal/common/terminalPlatformConfiguration.js';
 import { PolicyCategory } from '../../../../../base/common/policy.js';
@@ -12,25 +13,20 @@ var TerminalChatAgentToolsSettingId;
     TerminalChatAgentToolsSettingId["IgnoreDefaultAutoApproveRules"] = "chat.tools.terminal.ignoreDefaultAutoApproveRules";
     TerminalChatAgentToolsSettingId["BlockDetectedFileWrites"] = "chat.tools.terminal.blockDetectedFileWrites";
     TerminalChatAgentToolsSettingId["ShellIntegrationTimeout"] = "chat.tools.terminal.shellIntegrationTimeout";
-    TerminalChatAgentToolsSettingId["AutoReplyToPrompts"] = "chat.tools.terminal.autoReplyToPrompts";
     TerminalChatAgentToolsSettingId["OutputLocation"] = "chat.tools.terminal.outputLocation";
-    TerminalChatAgentToolsSettingId["AgentSandboxEnabled"] = "chat.agent.sandbox";
-    TerminalChatAgentToolsSettingId["AgentSandboxNetworkAllowedDomains"] = "chat.agent.sandboxNetwork.allowedDomains";
-    TerminalChatAgentToolsSettingId["AgentSandboxNetworkDeniedDomains"] = "chat.agent.sandboxNetwork.deniedDomains";
-    TerminalChatAgentToolsSettingId["AgentSandboxLinuxFileSystem"] = "chat.agent.sandboxFileSystem.linux";
-    TerminalChatAgentToolsSettingId["AgentSandboxMacFileSystem"] = "chat.agent.sandboxFileSystem.mac";
+    TerminalChatAgentToolsSettingId["AgentSandboxLinuxFileSystem"] = "chat.agent.sandbox.fileSystem.linux";
+    TerminalChatAgentToolsSettingId["AgentSandboxMacFileSystem"] = "chat.agent.sandbox.fileSystem.mac";
+    TerminalChatAgentToolsSettingId["AgentSandboxAdvancedRuntime"] = "chat.agent.sandbox.advanced.runtime";
     TerminalChatAgentToolsSettingId["PreventShellHistory"] = "chat.tools.terminal.preventShellHistory";
     TerminalChatAgentToolsSettingId["EnforceTimeoutFromModel"] = "chat.tools.terminal.enforceTimeoutFromModel";
+    TerminalChatAgentToolsSettingId["DetachBackgroundProcesses"] = "chat.tools.terminal.detachBackgroundProcesses";
+    TerminalChatAgentToolsSettingId["BackgroundNotifications"] = "chat.tools.terminal.backgroundNotifications";
     TerminalChatAgentToolsSettingId["IdlePollInterval"] = "chat.tools.terminal.idlePollInterval";
     TerminalChatAgentToolsSettingId["TerminalProfileLinux"] = "chat.tools.terminal.terminalProfile.linux";
     TerminalChatAgentToolsSettingId["TerminalProfileMacOs"] = "chat.tools.terminal.terminalProfile.osx";
     TerminalChatAgentToolsSettingId["TerminalProfileWindows"] = "chat.tools.terminal.terminalProfile.windows";
-    TerminalChatAgentToolsSettingId["DeprecatedTerminalSandboxEnabled"] = "chat.tools.terminal.sandbox.enabled";
-    TerminalChatAgentToolsSettingId["DeprecatedTerminalSandboxNetwork"] = "chat.tools.terminal.sandbox.network";
-    TerminalChatAgentToolsSettingId["DeprecatedTerminalSandboxNetworkAllowedDomains"] = "chat.tools.terminal.sandbox.network.allowedDomains";
-    TerminalChatAgentToolsSettingId["DeprecatedTerminalSandboxNetworkDeniedDomains"] = "chat.tools.terminal.sandbox.network.deniedDomains";
-    TerminalChatAgentToolsSettingId["DeprecatedTerminalSandboxLinuxFileSystem"] = "chat.tools.terminal.sandbox.linuxFileSystem";
-    TerminalChatAgentToolsSettingId["DeprecatedTerminalSandboxMacFileSystem"] = "chat.tools.terminal.sandbox.macFileSystem";
+    TerminalChatAgentToolsSettingId["DeprecatedAgentSandboxLinuxFileSystem"] = "chat.agent.sandboxFileSystem.linux";
+    TerminalChatAgentToolsSettingId["DeprecatedAgentSandboxMacFileSystem"] = "chat.agent.sandboxFileSystem.mac";
     TerminalChatAgentToolsSettingId["DeprecatedAutoApproveCompatible"] = "chat.agent.terminal.autoApprove";
     TerminalChatAgentToolsSettingId["DeprecatedAutoApprove1"] = "chat.agent.terminal.allowList";
     TerminalChatAgentToolsSettingId["DeprecatedAutoApprove2"] = "chat.agent.terminal.denyList";
@@ -40,9 +36,9 @@ var TerminalChatAgentToolsSettingId;
 const autoApproveBoolean = {
     type: "boolean",
     enum: [true, false],
-    enumDescriptions: [( localize(13974, "Automatically approve the pattern.")), ( localize(13975, "Require explicit approval for the pattern."))],
+    enumDescriptions: [( localize(14124, "Automatically approve the pattern.")), ( localize(14125, "Require explicit approval for the pattern."))],
     description: ( localize(
-        13976,
+        14126,
         "The start of a command to match against. A regular expression can be provided by wrapping the string in `/` characters."
     ))
 };
@@ -51,7 +47,7 @@ const terminalChatAgentProfileSchema = {
     required: ["path"],
     properties: {
         path: {
-            description: ( localize(13977, "A path to a shell executable.")),
+            description: ( localize(14127, "A path to a shell executable.")),
             type: "string"
         },
         ...terminalProfileBaseProperties
@@ -60,7 +56,7 @@ const terminalChatAgentProfileSchema = {
 const terminalChatAgentToolsConfiguration = {
     [TerminalChatAgentToolsSettingId.EnableAutoApprove]: {
         description: ( localize(
-            13978,
+            14128,
             "Controls whether to allow auto approval in the run in terminal tool."
         )),
         type: "boolean",
@@ -73,7 +69,7 @@ const terminalChatAgentToolsConfiguration = {
                 description: {
                     key: "autoApproveMode.description",
                     value: ( localize(
-                        13978,
+                        14128,
                         "Controls whether to allow auto approval in the run in terminal tool."
                     ))
                 }
@@ -82,18 +78,18 @@ const terminalChatAgentToolsConfiguration = {
     },
     [TerminalChatAgentToolsSettingId.AutoApprove]: {
         markdownDescription: [( localize(
-            13979,
+            14129,
             "A list of commands or regular expressions that control whether the run in terminal tool commands require explicit approval. These will be matched against the start of a command. A regular expression can be provided by wrapping the string in {0} characters followed by optional flags such as {1} for case-insensitivity.",
             "`/`",
             "`i`"
         )), ( localize(
-            13980,
+            14130,
             "Set to {0} to automatically approve commands, {1} to always require explicit approval or {2} to unset the value.",
             "`true`",
             "`false`",
             "`null`"
         )), ( localize(
-            13981,
+            14131,
             "Note that these commands and regular expressions are evaluated for every _sub-command_ within the full _command line_, so {0} for example will need both {1} and {2} to match a {3} entry and must not match a {4} entry in order to auto approve. Inline commands such as {5} (process substitution) should also be detected.",
             "`foo && bar`",
             "`foo`",
@@ -102,34 +98,34 @@ const terminalChatAgentToolsConfiguration = {
             "`false`",
             "`<(foo)`"
         )), ( localize(
-            13982,
+            14132,
             "An object can be used to match against the full command line instead of matching sub-commands and inline commands, for example {0}. In order to be auto approved _both_ the sub-command and command line must not be explicitly denied, then _either_ all sub-commands or command line needs to be approved.",
             "`{ approve: false, matchCommandLine: true }`"
         )), ( localize(
-            13983,
+            14133,
             "Note that there's a default set of rules to allow and also deny commands. Consider setting {0} to {1} to ignore all default rules to ensure there are no conflicts with your own rules. Do this at your own risk, the default denial rules are designed to protect you against running dangerous commands.",
             `\`#${TerminalChatAgentToolsSettingId.IgnoreDefaultAutoApproveRules}#\``,
             "`true`"
-        )), [( localize(13984, "Examples:")), `|${( localize(13985, "Value"))}|${( localize(13986, "Description"))}|`, "|---|---|", "| `\"mkdir\": true` | " + ( localize(13987, "Allow all commands starting with {0}", "`mkdir`")), "| `\"npm run build\": true` | " + ( localize(13988, "Allow all commands starting with {0}", "`npm run build`")), "| `\"bin/test.sh\": true` | " + ( localize(
-            13989,
+        )), [( localize(14134, "Examples:")), `|${( localize(14135, "Value"))}|${( localize(14136, "Description"))}|`, "|---|---|", "| `\"mkdir\": true` | " + ( localize(14137, "Allow all commands starting with {0}", "`mkdir`")), "| `\"npm run build\": true` | " + ( localize(14138, "Allow all commands starting with {0}", "`npm run build`")), "| `\"bin/test.sh\": true` | " + ( localize(
+            14139,
             "Allow all commands that match the path {0} ({1}, {2}, etc.)",
             "`bin/test.sh`",
             "`bin\\test.sh`",
             "`./bin/test.sh`"
         )), "| `\"/^git (status\\|show\\\\b.*)$/\": true` | " + ( localize(
-            13990,
+            14140,
             "Allow {0} and all commands starting with {1}",
             "`git status`",
             "`git show`"
-        )), "| `\"/^Get-ChildItem\\\\b/i\": true` | " + ( localize(13991, "will allow {0} commands regardless of casing", "`Get-ChildItem`")), "| `\"/.*/\": true` | " + ( localize(13992, "Allow all commands (denied commands still require approval)")), "| `\"rm\": false` | " + ( localize(
-            13993,
+        )), "| `\"/^Get-ChildItem\\\\b/i\": true` | " + ( localize(14141, "will allow {0} commands regardless of casing", "`Get-ChildItem`")), "| `\"/.*/\": true` | " + ( localize(14142, "Allow all commands (denied commands still require approval)")), "| `\"rm\": false` | " + ( localize(
+            14143,
             "Require explicit approval for all commands starting with {0}",
             "`rm`"
         )), "| `\"/\\\\.ps1/i\": { approve: false, matchCommandLine: true }` | " + ( localize(
-            13994,
+            14144,
             "Require explicit approval for any _command line_ that contains {0} regardless of casing",
             "`\".ps1\"`"
-        )), "| `\"rm\": null` | " + ( localize(13995, "Unset the default {0} value for {1}", "`false`", "`rm`"))].join("\n")].join("\n\n"),
+        )), "| `\"rm\": null` | " + ( localize(14145, "Unset the default {0} value for {1}", "`false`", "`rm`"))].join("\n")].join("\n\n"),
         type: "object",
         additionalProperties: {
             anyOf: [autoApproveBoolean, {
@@ -139,12 +135,12 @@ const terminalChatAgentToolsConfiguration = {
                     matchCommandLine: {
                         type: "boolean",
                         enum: [true, false],
-                        enumDescriptions: [( localize(13996, "Match against the full command line, eg. `foo && bar`.")), ( localize(
-                            13997,
+                        enumDescriptions: [( localize(14146, "Match against the full command line, eg. `foo && bar`.")), ( localize(
+                            14147,
                             "Match against sub-commands and inline commands, eg. `foo && bar` will need both `foo` and `bar` to match."
                         ))],
                         description: ( localize(
-                            13998,
+                            14148,
                             "Whether to match against the full command line, as opposed to splitting by sub-commands and inline commands."
                         ))
                     }
@@ -153,7 +149,7 @@ const terminalChatAgentToolsConfiguration = {
             }, {
                 type: "null",
                 description: ( localize(
-                    13999,
+                    14149,
                     "Ignore the pattern, this is useful for unsetting the same pattern set at a higher scope."
                 ))
             }]
@@ -288,7 +284,7 @@ const terminalChatAgentToolsConfiguration = {
         default: false,
         tags: ["experimental"],
         markdownDescription: ( localize(
-            14000,
+            14150,
             "Whether to ignore the built-in default auto-approve rules used by the run in terminal tool as defined in {0}. When this setting is enabled, the run in terminal tool will ignore any rule that comes from the default set but still follow rules defined in the user, remote and workspace settings. Use this setting at your own risk; the default auto-approve rules are designed to protect you against running dangerous commands.",
             `\`#${TerminalChatAgentToolsSettingId.AutoApprove}#\``
         ))
@@ -299,27 +295,27 @@ const terminalChatAgentToolsConfiguration = {
         default: true,
         tags: ["experimental"],
         markdownDescription: ( localize(
-            14001,
+            14151,
             "Whether to automatically approve npm, yarn, and pnpm run commands when the script is defined in a workspace package.json file. Since the workspace is trusted, scripts defined in package.json are considered safe to run without explicit approval."
         ))
     },
     [TerminalChatAgentToolsSettingId.BlockDetectedFileWrites]: {
         type: "string",
         enum: ["never", "outsideWorkspace", "all"],
-        enumDescriptions: [( localize(14002, "Allow all detected file writes.")), ( localize(
-            14003,
+        enumDescriptions: [( localize(14152, "Allow all detected file writes.")), ( localize(
+            14153,
             "Block file writes detected outside the workspace. This depends on the shell integration feature working correctly to determine the current working directory of the terminal."
-        )), ( localize(14004, "Block all detected file writes."))],
+        )), ( localize(14154, "Block all detected file writes."))],
         default: "outsideWorkspace",
         tags: ["experimental"],
         markdownDescription: ( localize(
-            14005,
+            14155,
             "Controls whether detected file write operations are blocked in the run in terminal tool. When detected, this will require explicit approval regardless of whether the command would normally be auto approved. Note that this cannot detect all possible methods of writing files, this is what is currently detected:\n\n- File redirection (detected via the bash or PowerShell tree sitter grammar)\n- `sed` in-place editing (`-i`, `-I`, `--in-place`)"
         ))
     },
     [TerminalChatAgentToolsSettingId.ShellIntegrationTimeout]: {
         markdownDescription: ( localize(
-            14006,
+            14156,
             "Configures the duration in milliseconds to wait for shell integration to be detected when the run in terminal tool launches a new terminal. Set to `0` to skip the wait entirely, the default value `-1` uses a variable wait time based on the value of {0} and whether it's a remote window. A large value can be useful if your shell starts very slowly.",
             `\`#${TerminalSettingId.ShellIntegrationEnabled}#\``
         )),
@@ -328,14 +324,14 @@ const terminalChatAgentToolsConfiguration = {
         maximum: 60000,
         default: -1,
         markdownDeprecationMessage: ( localize(
-            14007,
+            14157,
             "Use {0} instead",
             `\`#${TerminalSettingId.ShellIntegrationTimeout}#\``
         ))
     },
     [TerminalChatAgentToolsSettingId.IdlePollInterval]: {
         markdownDescription: ( localize(
-            14008,
+            14158,
             "Configures the idle poll interval in milliseconds used by the run in terminal tool to detect when commands have finished executing. Lower values make command detection faster but may cause false positives on slow systems. This primarily affects terminals without shell integration where idle detection is used instead of shell integration events."
         )),
         type: "integer",
@@ -346,7 +342,7 @@ const terminalChatAgentToolsConfiguration = {
     [TerminalChatAgentToolsSettingId.TerminalProfileLinux]: {
         restricted: true,
         markdownDescription: ( localize(
-            14009,
+            14159,
             "The terminal profile to use on Linux for chat agent's run in terminal tool."
         )),
         type: ["object", "null"],
@@ -363,7 +359,7 @@ const terminalChatAgentToolsConfiguration = {
     [TerminalChatAgentToolsSettingId.TerminalProfileMacOs]: {
         restricted: true,
         markdownDescription: ( localize(
-            14010,
+            14160,
             "The terminal profile to use on macOS for chat agent's run in terminal tool."
         )),
         type: ["object", "null"],
@@ -380,7 +376,7 @@ const terminalChatAgentToolsConfiguration = {
     [TerminalChatAgentToolsSettingId.TerminalProfileWindows]: {
         restricted: true,
         markdownDescription: ( localize(
-            14011,
+            14161,
             "The terminal profile to use on Windows for chat agent's run in terminal tool."
         )),
         type: ["object", "null"],
@@ -394,81 +390,65 @@ const terminalChatAgentToolsConfiguration = {
             }
         }]
     },
-    [TerminalChatAgentToolsSettingId.AutoReplyToPrompts]: {
-        type: "boolean",
-        default: false,
-        tags: ["experimental"],
-        markdownDescription: ( localize(
-            14012,
-            "Whether to automatically respond to prompts in the terminal such as `Confirm? y/n`. This is an experimental feature and may not work in all scenarios.\n\n**This feature is inherently risky to use as you're deferring potentially sensitive decisions to an LLM. Use at your own risk.**"
-        ))
-    },
     [TerminalChatAgentToolsSettingId.OutputLocation]: {
-        markdownDescription: ( localize(14013, "Where to show the output from the run in terminal tool.")),
+        markdownDescription: ( localize(14162, "Where to show the output from the run in terminal tool.")),
         type: "string",
         enum: ["terminal", "chat"],
-        enumDescriptions: [( localize(14014, "Reveal the terminal in the panel or editor in addition to chat.")), ( localize(14015, "Reveal the terminal output within chat only."))],
+        enumDescriptions: [( localize(14163, "Reveal the terminal in the panel or editor in addition to chat.")), ( localize(14164, "Reveal the terminal output within chat only."))],
         default: "chat",
         tags: ["experimental"],
         experiment: {
             mode: "auto"
         }
     },
-    [TerminalChatAgentToolsSettingId.AgentSandboxEnabled]: {
+    [AgentSandboxSettingId.AgentSandboxEnabled]: {
         markdownDescription: ( localize(
-            14016,
+            14165,
             "Controls whether agent mode uses sandboxing to restrict what tools can do. When enabled, tools like the terminal are run in a sandboxed environment to limit access to the system."
         )),
-        type: "boolean",
-        default: false,
+        type: "string",
+        enum: [AgentSandboxEnabledValue.Off, AgentSandboxEnabledValue.On],
+        enumDescriptions: [( localize(14166, "Disable sandboxing for agent mode tools.")), ( localize(14167, "Enable sandboxing for agent mode tools."))],
+        default: AgentSandboxEnabledValue.Off,
         tags: ["preview"],
         restricted: true,
         experiment: {
             mode: "auto"
-        }
-    },
-    [TerminalChatAgentToolsSettingId.AgentSandboxNetworkAllowedDomains]: {
-        markdownDescription: ( localize(
-            14017,
-            "Note: this setting is applicable only when {0} is enabled. Allowed domains for network access in sandbox. Supports wildcards like {1} and an empty list means no network access.",
-            `\`#${TerminalChatAgentToolsSettingId.AgentSandboxEnabled}#\``,
-            "`*.example.com`"
-        )),
-        type: "array",
-        items: {
-            type: "string"
         },
-        default: [],
-        tags: ["preview"],
-        restricted: true
-    },
-    [TerminalChatAgentToolsSettingId.AgentSandboxNetworkDeniedDomains]: {
-        markdownDescription: ( localize(
-            14018,
-            "Note: this setting is applicable only when {0} is enabled. Array of denied domains for network access in sandbox (checked first, takes precedence over {1}).",
-            `\`#${TerminalChatAgentToolsSettingId.AgentSandboxEnabled}#\``,
-            `\`#${TerminalChatAgentToolsSettingId.AgentSandboxNetworkAllowedDomains}#\``
-        )),
-        type: "array",
-        items: {
-            type: "string"
-        },
-        default: [],
-        tags: ["preview"],
-        restricted: true
+        policy: {
+            name: "ChatAgentSandboxEnabled",
+            category: PolicyCategory.IntegratedTerminal,
+            minimumVersion: "1.116",
+            localization: {
+                description: {
+                    key: "agentSandbox.enabledSetting",
+                    value: ( localize(
+                        14165,
+                        "Controls whether agent mode uses sandboxing to restrict what tools can do. When enabled, tools like the terminal are run in a sandboxed environment to limit access to the system."
+                    ))
+                },
+                enumDescriptions: [{
+                    key: "agentSandbox.enabledSetting.offDescription",
+                    value: ( localize(14166, "Disable sandboxing for agent mode tools."))
+                }, {
+                    key: "agentSandbox.enabledSetting.onDescription",
+                    value: ( localize(14167, "Enable sandboxing for agent mode tools."))
+                }]
+            }
+        }
     },
     [TerminalChatAgentToolsSettingId.AgentSandboxLinuxFileSystem]: {
         markdownDescription: ( localize(
-            14019,
+            14168,
             "Note: this setting is applicable only when {0} is enabled. Controls file system access in sandbox on Linux. Paths do not support glob patterns, only literal paths (ex: ./src/, ~/.ssh, .env). **bubblewrap** and **socat** should be installed for this setting to work.",
-            `\`#${TerminalChatAgentToolsSettingId.AgentSandboxEnabled}#\``
+            `\`#${AgentSandboxSettingId.AgentSandboxEnabled}#\``
         )),
         type: "object",
         properties: {
             denyRead: {
                 type: "array",
                 description: ( localize(
-                    14020,
+                    14169,
                     "Array of paths to deny read access. Leave empty to allow reading all paths."
                 )),
                 items: {
@@ -479,7 +459,7 @@ const terminalChatAgentToolsConfiguration = {
             allowWrite: {
                 type: "array",
                 description: ( localize(
-                    14021,
+                    14170,
                     "Array of paths to allow write access. Leave empty to disallow all writes."
                 )),
                 items: {
@@ -490,7 +470,7 @@ const terminalChatAgentToolsConfiguration = {
             denyWrite: {
                 type: "array",
                 description: ( localize(
-                    14022,
+                    14171,
                     "Array of paths to deny write access within allowed paths (takes precedence over allowWrite)."
                 )),
                 items: {
@@ -509,16 +489,16 @@ const terminalChatAgentToolsConfiguration = {
     },
     [TerminalChatAgentToolsSettingId.AgentSandboxMacFileSystem]: {
         markdownDescription: ( localize(
-            14023,
+            14172,
             "Note: this setting is applicable only when {0} is enabled. Controls file system access in sandbox on macOS. Paths also support git-style glob patterns(ex: *.ts, ./src, ./src/**/*.ts, file?.txt).",
-            `\`#${TerminalChatAgentToolsSettingId.AgentSandboxEnabled}#\``
+            `\`#${AgentSandboxSettingId.AgentSandboxEnabled}#\``
         )),
         type: "object",
         properties: {
             denyRead: {
                 type: "array",
                 description: ( localize(
-                    14024,
+                    14173,
                     "Array of paths to deny read access. Leave empty to allow reading all paths."
                 )),
                 items: {
@@ -529,7 +509,7 @@ const terminalChatAgentToolsConfiguration = {
             allowWrite: {
                 type: "array",
                 description: ( localize(
-                    14025,
+                    14174,
                     "Array of paths to allow write access. Leave empty to disallow all writes."
                 )),
                 items: {
@@ -540,7 +520,7 @@ const terminalChatAgentToolsConfiguration = {
             denyWrite: {
                 type: "array",
                 description: ( localize(
-                    14026,
+                    14175,
                     "Array of paths to deny write access within allowed paths (takes precedence over allowWrite)."
                 )),
                 items: {
@@ -557,23 +537,36 @@ const terminalChatAgentToolsConfiguration = {
         tags: ["preview"],
         restricted: true
     },
+    [TerminalChatAgentToolsSettingId.AgentSandboxAdvancedRuntime]: {
+        included: false,
+        markdownDescription: ( localize(
+            14176,
+            "Note: this setting is applicable only when {0} is enabled. Key/value pairs are passed through to the root of the sandbox runtime configuration.",
+            `\`#${AgentSandboxSettingId.AgentSandboxEnabled}#\``
+        )),
+        type: "object",
+        default: {},
+        additionalProperties: true,
+        tags: ["preview"],
+        restricted: true
+    },
     [TerminalChatAgentToolsSettingId.PreventShellHistory]: {
         type: "boolean",
         default: true,
         markdownDescription: [( localize(
-            14027,
+            14177,
             "Whether to exclude commands run by the terminal tool from the shell history. See below for the supported shells and the method used for each:"
         )), `- \`bash\`: ${( localize(
-            14028,
+            14178,
             "Sets `HISTCONTROL=ignorespace` and prepends the command with space"
         ))}`, `- \`zsh\`: ${( localize(
-            14029,
+            14179,
             "Sets `HIST_IGNORE_SPACE` option and prepends the command with space"
         ))}`, `- \`fish\`: ${( localize(
-            14030,
+            14180,
             "Sets `fish_private_mode` to prevent any command from entering history"
         ))}`, `- \`pwsh\`: ${( localize(
-            14031,
+            14181,
             "Sets a custom history handler via PSReadLine's `AddToHistoryHandler` to prevent any command from entering history"
         ))}`].join("\n")
     },
@@ -586,9 +579,35 @@ const terminalChatAgentToolsConfiguration = {
             mode: "auto"
         },
         markdownDescription: ( localize(
-            14032,
+            14182,
             "Whether to enforce the timeout value provided by the model in the run in terminal tool. When enabled, if the model provides a timeout parameter, the tool will stop tracking the command after that duration and return the output collected so far."
         ))
+    },
+    [TerminalChatAgentToolsSettingId.DetachBackgroundProcesses]: {
+        included: false,
+        restricted: true,
+        type: "boolean",
+        default: false,
+        tags: ["experimental"],
+        markdownDescription: ( localize(
+            14183,
+            "Whether to detach persistent terminal processes so they survive when VS Code exits. When enabled, commands started with `mode: \"async\"` (legacy: `isBackground: true`) are wrapped with `nohup` (POSIX) or `Start-Process` (Windows) so the process continues running after the terminal is disposed."
+        ))
+    },
+    [TerminalChatAgentToolsSettingId.BackgroundNotifications]: {
+        restricted: true,
+        type: "boolean",
+        default: true,
+        tags: ["experimental"],
+        deprecated: true,
+        markdownDeprecationMessage: ( localize(
+            14184,
+            "This setting is deprecated. Terminal completion and input-needed notifications are now always enabled."
+        )),
+        markdownDescription: ( localize(
+            14185,
+            "This setting is deprecated and no longer has any effect. Terminal completion and input-needed notifications are now always enabled for any command that continues running after the tool returns."
+        ))
     }
 };
 for (const id of [
@@ -601,71 +620,38 @@ for (const id of [
     terminalChatAgentToolsConfiguration[id] = {
         deprecated: true,
         markdownDeprecationMessage: ( localize(
-            14033,
+            14186,
             "Use {0} instead",
             `\`#${TerminalChatAgentToolsSettingId.AutoApprove}#\``
         ))
     };
 }
-terminalChatAgentToolsConfiguration[TerminalChatAgentToolsSettingId.DeprecatedTerminalSandboxNetwork] = {
+terminalChatAgentToolsConfiguration[TerminalChatAgentToolsSettingId.DeprecatedAgentSandboxLinuxFileSystem] = {
     type: "object",
     deprecated: true,
     markdownDeprecationMessage: ( localize(
-        14034,
-        "This setting has been split into {0} and {1}.",
-        `\`#${TerminalChatAgentToolsSettingId.AgentSandboxNetworkAllowedDomains}#\``,
-        `\`#${TerminalChatAgentToolsSettingId.AgentSandboxNetworkDeniedDomains}#\``
-    ))
-};
-terminalChatAgentToolsConfiguration[TerminalChatAgentToolsSettingId.DeprecatedTerminalSandboxEnabled] = {
-    type: "boolean",
-    deprecated: true,
-    markdownDeprecationMessage: ( localize(
-        14035,
-        "Use {0} instead",
-        `\`#${TerminalChatAgentToolsSettingId.AgentSandboxEnabled}#\``
-    ))
-};
-terminalChatAgentToolsConfiguration[TerminalChatAgentToolsSettingId.DeprecatedTerminalSandboxNetworkAllowedDomains] = {
-    type: "array",
-    items: {
-        type: "string"
-    },
-    deprecated: true,
-    markdownDeprecationMessage: ( localize(
-        14036,
+        14187,
         "Use {0} instead",
-        `\`#${TerminalChatAgentToolsSettingId.AgentSandboxNetworkAllowedDomains}#\``
-    ))
-};
-terminalChatAgentToolsConfiguration[TerminalChatAgentToolsSettingId.DeprecatedTerminalSandboxNetworkDeniedDomains] = {
-    type: "array",
-    items: {
-        type: "string"
-    },
-    deprecated: true,
-    markdownDeprecationMessage: ( localize(
-        14037,
-        "Use {0} instead",
-        `\`#${TerminalChatAgentToolsSettingId.AgentSandboxNetworkDeniedDomains}#\``
+        `\`#${TerminalChatAgentToolsSettingId.AgentSandboxLinuxFileSystem}#\``
     ))
 };
-terminalChatAgentToolsConfiguration[TerminalChatAgentToolsSettingId.DeprecatedTerminalSandboxLinuxFileSystem] = {
+terminalChatAgentToolsConfiguration[TerminalChatAgentToolsSettingId.DeprecatedAgentSandboxMacFileSystem] = {
     type: "object",
     deprecated: true,
     markdownDeprecationMessage: ( localize(
-        14038,
+        14188,
         "Use {0} instead",
-        `\`#${TerminalChatAgentToolsSettingId.AgentSandboxLinuxFileSystem}#\``
+        `\`#${TerminalChatAgentToolsSettingId.AgentSandboxMacFileSystem}#\``
     ))
 };
-terminalChatAgentToolsConfiguration[TerminalChatAgentToolsSettingId.DeprecatedTerminalSandboxMacFileSystem] = {
-    type: "object",
+terminalChatAgentToolsConfiguration[AgentSandboxSettingId.DeprecatedAgentSandboxEnabled] = {
+    type: "boolean",
     deprecated: true,
+    included: false,
     markdownDeprecationMessage: ( localize(
-        14039,
+        14189,
         "Use {0} instead",
-        `\`#${TerminalChatAgentToolsSettingId.AgentSandboxMacFileSystem}#\``
+        `\`#${AgentSandboxSettingId.AgentSandboxEnabled}#\``
     ))
 };
 

package/vscode/src/vs/workbench/contrib/terminalContrib/commandGuide/common/terminalCommandGuideConfiguration.js

@@ -10,7 +10,7 @@ const terminalCommandGuideConfiguration = {
     [TerminalCommandGuideSettingId.ShowCommandGuide]: {
         restricted: true,
         markdownDescription: ( localize(
-            14058,
+            14208,
             "Whether to show the command guide when hovering over a command in the terminal."
         )),
         type: "boolean",

package/vscode/src/vs/workbench/contrib/terminalContrib/history/common/terminal.history.js

@@ -19,7 +19,7 @@ const terminalHistoryConfiguration = {
     [TerminalHistorySettingId.ShellIntegrationCommandHistory]: {
         restricted: true,
         markdownDescription: ( localize(
-            14119,
+            14269,
             "Controls the number of recently used commands to keep in the terminal command history. Set to 0 to disable terminal command history."
         )),
         type: "number",

package/vscode/src/vs/workbench/contrib/terminalContrib/inlineHint/common/terminalInitialHintConfiguration.d.ts

@@ -1,6 +1,7 @@
 import { IStringDictionary } from "../../../../../base/common/collections.js";
 import { IConfigurationPropertySchema } from "../../../../../platform/configuration/common/configurationRegistry.js";
 export declare enum TerminalInitialHintSettingId {
-    Enabled = "terminal.integrated.initialHint"
+    Enabled = "terminal.integrated.initialHint",
+    CopilotCli = "terminal.integrated.initialHintCopilotCli"
 }
 export declare const terminalInitialHintConfiguration: IStringDictionary<IConfigurationPropertySchema>;

package/vscode/src/vs/workbench/contrib/terminalContrib/inlineHint/common/terminalInitialHintConfiguration.js

@@ -5,17 +5,32 @@ import { TerminalSettingId } from '../../../../../platform/terminal/common/termi
 var TerminalInitialHintSettingId;
 (function(TerminalInitialHintSettingId) {
     TerminalInitialHintSettingId["Enabled"] = "terminal.integrated.initialHint";
+    TerminalInitialHintSettingId["CopilotCli"] = "terminal.integrated.initialHintCopilotCli";
 })(TerminalInitialHintSettingId || (TerminalInitialHintSettingId = {}));
 const terminalInitialHintConfiguration = {
     [TerminalInitialHintSettingId.Enabled]: {
         restricted: true,
         markdownDescription: ( localize(
-            14130,
+            14282,
             "Controls if the first terminal without input will show a hint about available actions when it is focused. This will only show when {0} is disabled.",
             `\`#${TerminalSettingId.SendKeybindingsToShell}#\``
         )),
         type: "boolean",
         default: true
+    },
+    [TerminalInitialHintSettingId.CopilotCli]: {
+        restricted: true,
+        markdownDescription: ( localize(
+            14283,
+            "When enabled, the terminal initial hint will suggest using Copilot CLI by typing {0} instead of opening Copilot Chat.",
+            "`copilot`"
+        )),
+        type: "boolean",
+        default: false,
+        tags: ["experimental"],
+        experiment: {
+            mode: "auto"
+        }
     }
 };