Updates SCM menu options

Author: eamodio

contributions.json

@@ -290,7 +290,7 @@
 						"order": 2
 					}
 				],
-				"gitlens/scm/title": [
+				"gitlens/scm/title/ai": [
 					{
 						"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted",
 						"group": "1_gitlens",
@@ -353,7 +353,7 @@
 		"gitlens.ai.switchProvider:scm": {
 			"label": "Switch GitLens AI Provider/Model...",
 			"menus": {
-				"gitlens/scm/title": [
+				"gitlens/scm/title/ai": [
 					{
 						"when": "scmProvider == git && gitlens:enabled && gitlens:gk:organization:ai:enabled",
 						"group": "9_gitlens",
@@ -520,14 +520,14 @@
 					{
 						"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted",
 						"group": "1_gitlens",
-						"order": 2
+						"order": 1
 					}
 				],
 				"gitlens/scm/title/ai": [
 					{
 						"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted",
 						"group": "1_gitlens",
-						"order": 1
+						"order": 2
 					}
 				],
 				"scm/resourceGroup/context": [
@@ -4078,6 +4078,13 @@
 			"icon": "$(gitlens-graph)",
 			"commandPalette": "gitlens:enabled",
 			"menus": {
+				"gitlens/scm/title": [
+					{
+						"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted",
+						"group": "8_gitlens",
+						"order": 1
+					}
+				],
 				"gitlens/views/grouped/commits": [
 					{
 						"when": "gitlens:views:scm:grouped:view == commits && !gitlens:plus:disabled",
@@ -16244,6 +16251,13 @@
 			"label": "Visualize Repository History",
 			"icon": "$(graph-scatter)",
 			"menus": {
+				"gitlens/scm/title": [
+					{
+						"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted",
+						"group": "8_gitlens",
+						"order": 2
+					}
+				],
 				"scm/sourceControl": [
 					{
 						"when": "scmProvider == git && gitlens:enabled && !gitlens:plus:disabled && scmProviderRootUri not in gitlens:plus:disallowedRepos && config.gitlens.menus.scm.visualHistory",
@@ -16725,11 +16739,11 @@
 		},
 		"gitlens/scm/title": {
 			"label": "GitLens",
-			"icon": "$(sparkle)",
+			"icon": "$(gitlens-gitlens)",
 			"menus": {
 				"scm/title": [
 					{
-						"when": "scmProvider == git && gitlens:enabled && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
+						"when": "scmProvider == git && gitlens:enabled && (!gitlens:gk:organization:ai:enabled || !config.gitlens.ai.enabled)",
 						"group": "navigation",
 						"order": -3
 					}
@@ -16738,11 +16752,11 @@
 		},
 		"gitlens/scm/title/ai": {
 			"label": "GitLens",
-			"icon": "$(gitlens-gitlens)",
+			"icon": "$(sparkle)",
 			"menus": {
 				"scm/title": [
 					{
-						"when": "scmProvider == git && gitlens:enabled && (!gitlens:gk:organization:ai:enabled || !config.gitlens.ai.enabled)",
+						"when": "scmProvider == git && gitlens:enabled && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
 						"group": "navigation",
 						"order": -3
 					}

package.json

@@ -15467,26 +15467,36 @@
 			],
 			"gitlens/scm/title": [
 				{
-					"command": "gitlens.ai.generateCommitMessage:scm",
+					"command": "gitlens.composeCommits:scm",
 					"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted",
 					"group": "1_gitlens@1"
 				},
 				{
-					"command": "gitlens.composeCommits:scm",
+					"command": "gitlens.showGraph",
 					"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted",
-					"group": "1_gitlens@2"
+					"group": "8_gitlens@1"
 				},
 				{
-					"command": "gitlens.ai.switchProvider:scm",
-					"when": "scmProvider == git && gitlens:enabled && gitlens:gk:organization:ai:enabled",
-					"group": "9_gitlens@1"
+					"command": "gitlens.visualizeHistory.repo:scm",
+					"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted",
+					"group": "8_gitlens@2"
 				}
 			],
 			"gitlens/scm/title/ai": [
 				{
-					"command": "gitlens.composeCommits:scm",
+					"command": "gitlens.ai.generateCommitMessage:scm",
 					"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted",
 					"group": "1_gitlens@1"
+				},
+				{
+					"command": "gitlens.composeCommits:scm",
+					"when": "scmProvider == git && gitlens:enabled && !gitlens:readonly && !gitlens:untrusted",
+					"group": "1_gitlens@2"
+				},
+				{
+					"command": "gitlens.ai.switchProvider:scm",
+					"when": "scmProvider == git && gitlens:enabled && gitlens:gk:organization:ai:enabled",
+					"group": "9_gitlens@1"
 				}
 			],
 			"gitlens/share": [
@@ -17081,12 +17091,12 @@
 			"scm/title": [
 				{
 					"submenu": "gitlens/scm/title",
-					"when": "scmProvider == git && gitlens:enabled && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
+					"when": "scmProvider == git && gitlens:enabled && (!gitlens:gk:organization:ai:enabled || !config.gitlens.ai.enabled)",
 					"group": "navigation@-3"
 				},
 				{
 					"submenu": "gitlens/scm/title/ai",
-					"when": "scmProvider == git && gitlens:enabled && (!gitlens:gk:organization:ai:enabled || !config.gitlens.ai.enabled)",
+					"when": "scmProvider == git && gitlens:enabled && gitlens:gk:organization:ai:enabled && config.gitlens.ai.enabled",
 					"group": "navigation@-3"
 				},
 				{
@@ -23796,12 +23806,12 @@
 			{
 				"id": "gitlens/scm/title",
 				"label": "GitLens",
-				"icon": "$(sparkle)"
+				"icon": "$(gitlens-gitlens)"
 			},
 			{
 				"id": "gitlens/scm/title/ai",
 				"label": "GitLens",
-				"icon": "$(gitlens-gitlens)"
+				"icon": "$(sparkle)"
 			},
 			{
 				"id": "gitlens/share",