feat(scm): add generate commit message action to the Source Control view

apps/vscode-e2e/src/visual/electron.visual.ts

@@ -5,6 +5,7 @@ import {
 	attachFailureArtifacts,
 	CHAT_RESULT,
 	extensionDevelopmentPath,
+	SCM_ACTION_TITLE,
 	startScene,
 	stopScene,
 	vscodeVersion,
@@ -119,3 +120,32 @@ for (const scenario of scenarios) {
 		}
 	})
 }
+
+const scmScenario: VisualScenario = {
+	name: "scm-title-dark",
+	scene: "scm",
+	themeId: "Default Dark Modern",
+	landmark: SCM_ACTION_TITLE,
+}
+
+test("renders the Generate Commit Message action in the Source Control title bar", async ({
+	browserName: _browserName,
+}, testInfo) => {
+	const running = await startScene(vscodeExecutablePath, scmScenario, testInfo)
+	try {
+		// Keep the pointer away from the sidebar so no action shows a hover state or tooltip.
+		await running.page.mouse.move(900, 400)
+		// `has` takes a locator relative to each header, so it names only the action itself.
+		const header = running.page
+			.locator(".part.sidebar .pane-header")
+			.filter({ has: running.page.locator(`[aria-label="${SCM_ACTION_TITLE}"]`) })
+		await expect(header).toHaveCount(1)
+		await expect(header.locator(`[aria-label="${SCM_ACTION_TITLE}"]`)).toBeVisible()
+		await expect(header).toHaveScreenshot("electron-scm-title-dark-header.png")
+	} catch (error) {
+		await attachFailureArtifacts(running, testInfo)
+		throw error
+	} finally {
+		await stopScene(running, testInfo)
+	}
+})

apps/vscode-e2e/src/visual/electronHarness.ts

@@ -1,7 +1,9 @@
+import { execFile } from "child_process"
 import fs from "fs/promises"
 import { readFileSync } from "fs"
 import os from "os"
 import path from "path"
+import { promisify } from "util"
 
 import { LLMock } from "@copilotkit/aimock"
 import { _electron, expect, type ElectronApplication, type Page, type TestInfo } from "@playwright/test"
@@ -18,10 +20,26 @@ export const vscodeVersion = packageJson.devDependencies["@types/vscode"]
 
 const CHAT_PROMPT = "electron-visual-smoke: render a deterministic completion"
 export const CHAT_RESULT = "Electron visual smoke response rendered inside the real VS Code webview."
+export const SCM_ACTION_TITLE = "Generate Commit Message (Zoo Code)"
+
+const execFileAsync = promisify(execFile)
+
+/**
+ * Makes the workspace a Git repository with one staged file, so the Source Control view shows the
+ * Git provider and its title actions. The branch name, author, and file are fixed for a stable scene.
+ */
+async function initGitWorkspace(workspacePath: string) {
+	const git = (...args: string[]) => execFileAsync("git", args, { cwd: workspacePath })
+	await git("init", "--initial-branch=main")
+	await git("config", "user.name", "Zoo Code Visual")
+	await git("config", "user.email", "visual@example.invalid")
+	await fs.writeFile(path.join(workspacePath, "notes.md"), "# Notes\n", "utf8")
+	await git("add", "notes.md")
+}
 
 export interface VisualScenario {
 	name: string
-	scene: "welcome" | "chat"
+	scene: "welcome" | "chat" | "scm"
 	themeId: "Default Dark Modern" | "Default High Contrast"
 	landmark: string
 	webviewSnapshot?: string
@@ -105,6 +123,9 @@ export async function startScene(
 		for (const result of directories) {
 			if (result.status === "rejected") throw result.reason
 		}
+		if (scenario.scene === "scm") {
+			await initGitWorkspace(workspacePath)
+		}
 		if (scenario.startMock) {
 			mock = new LLMock({ port: 0 })
 			mock.addFixture({
@@ -147,6 +168,7 @@ export async function startScene(
 				ROO_CODE_VISUAL_READY_PATH: readyPath,
 				ROO_CODE_VISUAL_SCENE: scenario.scene,
 				ROO_CODE_VISUAL_THEME: scenario.themeId,
+				ROO_CODE_VISUAL_SCM_ACTION_TITLE: SCM_ACTION_TITLE,
 				ROO_CODE_THEME_FIXTURE_PROBE: "1",
 			},
 			locale: "en-US",

apps/vscode-e2e/src/visual/sceneController.ts

@@ -13,6 +13,11 @@ import {
 import { isCompletedAsk } from "../suite/utils"
 
 const POLL_INTERVAL_MS = 100
+
+/** The parts of the built-in Git extension API (`vscode.git`, version 1) that the scm scene reads. */
+interface GitExtension {
+	getAPI(version: 1): { repositories: Array<{ state: { indexChanges: unknown[] } }> }
+}
 const SCENE_TIMEOUT_MS = 60_000
 
 const themeKinds: Record<string, vscode.ColorThemeKind> = {
@@ -68,7 +73,9 @@ export async function run(): Promise<void> {
 	}
 	const log = (message: string) => fs.appendFile(logPath, `${message}\n`, "utf8")
 	await log(`scene=${scene} theme=${themeId}`)
-	if (scene !== "welcome" && scene !== "chat") throw new Error(`Unknown Electron visual scene: ${scene}`)
+	if (scene !== "welcome" && scene !== "chat" && scene !== "scm") {
+		throw new Error(`Unknown Electron visual scene: ${scene}`)
+	}
 	if (!themeKinds[themeId]) throw new Error(`Unsupported Electron visual theme: ${themeId}`)
 
 	const extension = vscode.extensions.getExtension<RooCodeTestAPI>("ZooCodeOrganization.zoo-code")
@@ -145,6 +152,25 @@ export async function run(): Promise<void> {
 		landmark = result
 	}
 
+	if (scene === "scm") {
+		// Show view title actions without hover, so the screenshot does not depend on the pointer.
+		await vscode.workspace
+			.getConfiguration("workbench.view")
+			.update("alwaysShowHeaderActions", true, vscode.ConfigurationTarget.Global)
+		const gitExtension = vscode.extensions.getExtension<GitExtension>("vscode.git")
+		if (!gitExtension) throw new Error("The built-in Git extension is not available")
+		const git = (gitExtension.isActive ? gitExtension.exports : await gitExtension.activate()).getAPI(1)
+		await poll(
+			async () => git.repositories.map((repository) => repository.state.indexChanges.length),
+			(stagedCounts) => stagedCounts.length === 1 && stagedCounts[0] === 1,
+			"one Git repository with one staged file",
+		)
+		await vscode.commands.executeCommand("workbench.view.scm")
+		await log("scm-ready")
+		landmark = process.env.ROO_CODE_VISUAL_SCM_ACTION_TITLE ?? ""
+		if (!landmark) throw new Error("The Source Control action title is required for the scm scene")
+	}
+
 	await fs.writeFile(
 		readyPath,
 		`${JSON.stringify({ scene, themeId, landmark, themeFixture, taskIds: api.getCurrentTaskStack() }, null, 2)}\n`,

packages/types/src/vscode.ts

@@ -48,6 +48,8 @@ export const commandIds = [
 	"retryWebviewRecovery",
 	"toggleAutoApprove",
 
+	"generateGitCommitMessage",
+
 	"showRipgrepDiagnostic",
 	"createDiagnosticsReport",
 ] as const

src/activate/__tests__/registerCommands.spec.ts

@@ -100,6 +100,10 @@ vi.mock("../../services/diagnostics", () => ({
 	createDiagnosticsReport: vi.fn().mockResolvedValue(undefined),
 }))
 
+vi.mock("../../services/git/commitMessageGenerator", () => ({
+	generateCommitMessage: vi.fn().mockResolvedValue(undefined),
+}))
+
 describe("getVisibleProviderOrLog", () => {
 	let mockOutputChannel: vscode.OutputChannel
 
@@ -282,6 +286,32 @@ describe("registerCommands handlers", () => {
 		})
 	})
 
+	it("generateGitCommitMessage calls generateCommitMessage with visible provider and context", async () => {
+		const { generateCommitMessage } = await import("../../services/git/commitMessageGenerator")
+		const mockScmContext = { rootUri: { fsPath: "/mock/repo" } }
+
+		await handlers["zoo-code.generateGitCommitMessage"](mockScmContext)
+
+		expect(generateCommitMessage).toHaveBeenCalledWith({
+			provider: mockVisibleProviderInstance,
+			outputChannel: mockOutputChannel,
+			context: mockScmContext,
+		})
+	})
+
+	it("generateGitCommitMessage falls back to default provider when no visible provider", async () => {
+		const { generateCommitMessage } = await import("../../services/git/commitMessageGenerator")
+		;(ClineProvider.getVisibleInstance as Mock).mockReturnValue(undefined)
+
+		await handlers["zoo-code.generateGitCommitMessage"]()
+
+		expect(generateCommitMessage).toHaveBeenCalledWith({
+			provider: mockProvider,
+			outputChannel: mockOutputChannel,
+			context: undefined,
+		})
+	})
+
 	it("settingsButtonClicked posts both settingsButtonClicked and didBecomeVisible actions", () => {
 		handlers["zoo-code.settingsButtonClicked"]()
 

src/activate/registerCommands.ts

@@ -14,6 +14,7 @@ import { importSettingsWithFeedback } from "../core/config/importExport"
 import { MdmService } from "../services/mdm/MdmService"
 import { registerRipgrepDiagnosticCommand } from "../services/ripgrep/diagnostic"
 import { createDiagnosticsReport } from "../services/diagnostics"
+import { generateCommitMessage } from "../services/git/commitMessageGenerator"
 
 /**
  * Helper to get the visible ClineProvider instance or log if not found.
@@ -225,6 +226,14 @@ const getCommandsMap = ({
 			outputChannel.appendLine(`[toggleAutoApprove] postMessageToWebview failed: ${error}`)
 		}
 	},
+	generateGitCommitMessage: async (context?: unknown) => {
+		const visibleProvider = ClineProvider.getVisibleInstance() ?? provider
+		await generateCommitMessage({
+			provider: visibleProvider,
+			outputChannel,
+			context,
+		})
+	},
 })
 
 type OpenClineInNewTabOptions = {

src/package.json

@@ -179,9 +179,21 @@
 				"command": "zoo-code.toggleAutoApprove",
 				"title": "%command.toggleAutoApprove.title%",
 				"category": "%configuration.title%"
+			},
+			{
+				"command": "zoo-code.generateGitCommitMessage",
+				"title": "%command.generateGitCommitMessage.title%",
+				"icon": "$(wand)"
 			}
 		],
 		"menus": {
+			"scm/title": [
+				{
+					"command": "zoo-code.generateGitCommitMessage",
+					"group": "navigation",
+					"when": "scmProvider == git"
+				}
+			],
 			"editor/context": [
 				{
 					"submenu": "zoo-code.contextMenu",

src/package.nls.json

@@ -27,6 +27,7 @@
 	"command.showRipgrepDiagnostic.title": "Show Ripgrep Diagnostic",
 	"command.createDiagnosticsReport.title": "Create Diagnostics Report",
 	"command.toggleAutoApprove.title": "Toggle Auto-Approve",
+	"command.generateGitCommitMessage.title": "Generate Commit Message (Zoo Code)",
 	"configuration.title": "Zoo Code",
 	"commands.allowedCommands.description": "Commands that can be auto-executed when 'Always approve execute operations' is enabled",
 	"commands.deniedCommands.description": "Command prefixes that will be automatically denied without asking for approval. In case of conflicts with allowed commands, the longest prefix match takes precedence. Add * to deny all commands.",