Fixes commit message action conflict with Assistant

samclark2015 · web-flow · commit b87121ed5145 · 2025-09-26T13:15:50.000-05:00
diff --git a/package.json b/package.json
@@ -3114,7 +3114,7 @@
 			"scm/inputBox": [
 				{
 					"command": "github.copilot.git.generateCommitMessage",
-					"when": "scmProvider == git"
+					"when": "scmProvider == git && github.copilot-chat.activated && (!config.positron.assistant.enable || !config.positron.assistant.gitIntegration.enable)"
 				}
 			],
 			"testing/message/context": [

Original file line number	Diff line number	Diff line change
`@@ -3114,7 +3114,7 @@`
`3114`	`3114`	`"scm/inputBox": [`
`3115`	`3115`	`{`
`3116`	`3116`	`"command": "github.copilot.git.generateCommitMessage",`
`3117`		`- "when": "scmProvider == git"`
	`3117`	`+ "when": "scmProvider == git && github.copilot-chat.activated && (!config.positron.assistant.enable \|\| !config.positron.assistant.gitIntegration.enable)"`
`3118`	`3118`	`}`
`3119`	`3119`	`],`
`3120`	`3120`	`"testing/message/context": [`