@vscode/vscode-settings-history 0.0.2-66 → 0.0.2-67

package/dist/history.json

@@ -461051,5 +461051,192 @@
 				}
 			}
 		]
+	},
+	{
+		"version": "1.134.0-insider+2026081705",
+		"base": {
+			"version": "1.134.0-insider+2026081421"
+		},
+		"patch": [
+			{
+				"op": "replace",
+				"path": "/chat.agentSessions.showExternal/enumDescriptions/3",
+				"value": "Shows external sessions updated in the last 7 days. This is the default."
+			},
+			{
+				"op": "remove",
+				"path": "/terminal.integrated.defaultProfile.linux/markdownEnumDescriptions/13"
+			},
+			{
+				"op": "remove",
+				"path": "/terminal.integrated.defaultProfile.linux/enum/13"
+			},
+			{
+				"op": "add",
+				"path": "/chat.agentHost.agentMerge.enabled",
+				"value": {
+					"type": "boolean",
+					"description": "Enables the experimental Agent Merge controller and its commands. Agent Merge can monitor an agent session's pull request, ask the agent to address selected blockers, and optionally merge the pull request when it is ready.",
+					"default": true,
+					"scope": 1,
+					"tags": [
+						"experimental"
+					],
+					"agentHost": {
+						"key": "agentMerge.enabled"
+					},
+					"section": {
+						"id": "chatAgentHostStarter",
+						"title": "Chat Agent Host Starter"
+					},
+					"defaultDefaultValue": true,
+					"restricted": false
+				}
+			},
+			{
+				"op": "add",
+				"path": "/chat.agentHost.agentMerge.addressReviews",
+				"value": {
+					"type": "boolean",
+					"description": "Controls whether enabled Agent Merge sessions address unresolved review threads, changes-requested reviews, and new pull request comments from repository maintainers or the Copilot pull request reviewer.",
+					"default": true,
+					"scope": 1,
+					"tags": [
+						"experimental"
+					],
+					"agentHost": {
+						"key": "agentMerge.addressReviews"
+					},
+					"section": {
+						"id": "chatAgentHostStarter",
+						"title": "Chat Agent Host Starter"
+					},
+					"defaultDefaultValue": true,
+					"restricted": false
+				}
+			},
+			{
+				"op": "add",
+				"path": "/chat.agentHost.agentMerge.fixCI",
+				"value": {
+					"type": "boolean",
+					"description": "Controls whether enabled Agent Merge sessions ask the agent to fix failed required CI checks.",
+					"default": true,
+					"scope": 1,
+					"tags": [
+						"experimental"
+					],
+					"agentHost": {
+						"key": "agentMerge.fixCI"
+					},
+					"section": {
+						"id": "chatAgentHostStarter",
+						"title": "Chat Agent Host Starter"
+					},
+					"defaultDefaultValue": true,
+					"restricted": false
+				}
+			},
+			{
+				"op": "add",
+				"path": "/chat.agentHost.agentMerge.resolveConflicts",
+				"value": {
+					"type": "boolean",
+					"description": "Controls whether enabled Agent Merge sessions ask the agent to update branches that are behind or resolve merge conflicts.",
+					"default": true,
+					"scope": 1,
+					"tags": [
+						"experimental"
+					],
+					"agentHost": {
+						"key": "agentMerge.resolveConflicts"
+					},
+					"section": {
+						"id": "chatAgentHostStarter",
+						"title": "Chat Agent Host Starter"
+					},
+					"defaultDefaultValue": true,
+					"restricted": false
+				}
+			},
+			{
+				"op": "add",
+				"path": "/chat.agentHost.agentMerge.mergePullRequest",
+				"value": {
+					"type": "boolean",
+					"description": "Controls whether the Agent Host automatically merges or enqueues pull requests for enabled Agent Merge sessions after all selected maintenance work is complete.",
+					"default": false,
+					"scope": 1,
+					"tags": [
+						"experimental"
+					],
+					"agentHost": {
+						"key": "agentMerge.mergePullRequest"
+					},
+					"section": {
+						"id": "chatAgentHostStarter",
+						"title": "Chat Agent Host Starter"
+					},
+					"defaultDefaultValue": false,
+					"restricted": false
+				}
+			},
+			{
+				"op": "add",
+				"path": "/chat.agentHost.agentMerge.mergeMethod",
+				"value": {
+					"type": "string",
+					"enum": [
+						"auto",
+						"squash",
+						"merge",
+						"rebase"
+					],
+					"enumDescriptions": [
+						"Uses the first repository-compatible method in this order: squash, merge commit, rebase.",
+						"Uses squash merge when the repository permits it.",
+						"Uses a merge commit when the repository permits it.",
+						"Uses rebase merge when the repository permits it."
+					],
+					"description": "Controls the native merge method used by Agent Merge.",
+					"default": "auto",
+					"scope": 1,
+					"tags": [
+						"experimental"
+					],
+					"agentHost": {
+						"key": "agentMerge.mergeMethod"
+					},
+					"section": {
+						"id": "chatAgentHostStarter",
+						"title": "Chat Agent Host Starter"
+					},
+					"defaultDefaultValue": "auto",
+					"restricted": false
+				}
+			},
+			{
+				"op": "add",
+				"path": "/chat.agentHost.agentMerge.replyAttribution",
+				"value": {
+					"type": "boolean",
+					"description": "Controls whether review-thread replies posted by Agent Merge include an automated-reply attribution note.",
+					"default": true,
+					"scope": 1,
+					"tags": [
+						"experimental"
+					],
+					"agentHost": {
+						"key": "agentMerge.replyAttribution"
+					},
+					"section": {
+						"id": "chatAgentHostStarter",
+						"title": "Chat Agent Host Starter"
+					},
+					"defaultDefaultValue": true,
+					"restricted": false
+				}
+			}
+		]
 	}
 ]

package/dist/vscode-settings.d.ts

@@ -13204,6 +13204,19 @@ export type VscodeSettings_1_134_0_insider_2026081421 = Patch<VscodeSettings_1_1
 	readonly 'markdown.experimental.richLinks.enabled'?: boolean;
 }, 'github.copilot.chat.preferLongContext.enabled'>;
 
+// ── 1.134.0-insider+2026081705: +7, ~2 ──
+export type VscodeSettings_1_134_0_insider_2026081705 = Patch<VscodeSettings_1_134_0_insider_2026081421, {
+	readonly 'chat.agentHost.agentMerge.addressReviews'?: boolean;
+	readonly 'chat.agentHost.agentMerge.enabled'?: boolean;
+	readonly 'chat.agentHost.agentMerge.fixCI'?: boolean;
+	readonly 'chat.agentHost.agentMerge.mergeMethod'?: 'auto' | 'squash' | 'merge' | 'rebase';
+	readonly 'chat.agentHost.agentMerge.mergePullRequest'?: boolean;
+	readonly 'chat.agentHost.agentMerge.replyAttribution'?: boolean;
+	readonly 'chat.agentHost.agentMerge.resolveConflicts'?: boolean;
+	readonly 'chat.agentSessions.showExternal'?: 'none' | 'all' | 'last24Hours' | 'last7Days';
+	readonly 'terminal.integrated.defaultProfile.linux'?: null | 'sh' | 'bash' | 'bash (2)' | 'rbash' | 'rbash (2)' | 'sh (2)' | 'dash' | 'dash (2)' | 'tmux' | 'screen' | 'pwsh' | 'pwsh (2)';
+}, never>;
+
 // ── Version map ──
 // Stable entries map directly to their settings type.
 // Insider entries map to a nested record keyed by 10-digit build release date
@@ -13350,12 +13363,13 @@ interface VscodeVersionMap {
 		'2026081318': VscodeSettings_1_134_0_insider_2026081318;
 		'2026081414': VscodeSettings_1_134_0_insider_2026081414;
 		'2026081421': VscodeSettings_1_134_0_insider_2026081421;
+		'2026081705': VscodeSettings_1_134_0_insider_2026081705;
 	}>;
 }
 
 export type LatestVscodeSettings = VscodeSettings_1_133_0;
 
-export type LatestInsiderVscodeSettings = VscodeSettings_1_134_0_insider_2026081421;
+export type LatestInsiderVscodeSettings = VscodeSettings_1_134_0_insider_2026081705;
 
 export type VscodeVersion = keyof VscodeVersionMap;
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vscode/vscode-settings-history",
-	"version": "0.0.2-66",
+	"version": "0.0.2-67",
 	"type": "module",
 	"description": "Tracks VS Code settings schema changes across versions",
 	"license": "MIT",
@@ -37,5 +37,5 @@
 		"tsx": "4.22.4",
 		"vitest": "^4.1.4"
 	},
-	"gitHead": "98afcf082daa03049d7225fc5d69f9beb2151ba8"
+	"gitHead": "be7a34f206495b27bb51dfd81bd236f1c401528f"
 }