fix(shell): delegate VS Code profile reads to Terminal methods

Author: edelauna

src/integrations/terminal/__tests__/shell-system-prompt-divergence.spec.ts

@@ -1,14 +1,14 @@
 // Regression test for https://github.com/Zoo-Code-Org/Zoo-Code/issues/634
 //
-// When the user sets terminal.integrated.defaultProfile.windows in *workspace*
-// settings, getShell() (used for the system prompt) picks it up via config.get()
-// which merges all scopes, but Terminal.getConfiguredDefaultProfileName() only
-// reads inspect().globalValue ?? inspect().defaultValue — intentionally excluding
-// workspace for security.
+// Root cause: getShell() (system prompt) used config.get() which merges all scopes
+// including workspace, while Terminal.getConfiguredDefaultProfileName() used
+// inspect().globalValue — intentionally excluding workspace scope for security.
+// terminal.integrated.defaultProfile.* is APPLICATION-scoped; workspace values are
+// technically accepted by VS Code but ignored by the terminal itself.
 //
-// The result: the system prompt tells the model "you have PowerShell" but the
-// actual terminal VS Code opens defaults to cmd.exe (or whatever VS Code picks
-// when no global/default profile is set), so every PowerShell command fails.
+// Fix: getShell() now delegates to Terminal.getConfiguredDefaultProfileName() and
+// Terminal.getConfiguredProfiles(), so both paths read the same inspect()-based values
+// and can never disagree.
 //
 // Run: node_modules/.bin/vitest run integrations/terminal/__tests__/shell-system-prompt-divergence.spec.ts
 
@@ -44,12 +44,9 @@ describe("issue #634 — system prompt shell vs actual terminal shell divergence
 
 	/**
 	 * Stubs VS Code config to simulate a workspace-scoped default profile.
-	 *
-	 * getShell() (shell.ts) uses getConfiguration("terminal.integrated").get() which
-	 * returns the merged/effective value across all scopes — workspace value wins.
-	 *
-	 * Terminal.getConfiguredDefaultProfileName() uses inspect().globalValue ?? defaultValue,
-	 * intentionally excluding workspace scope for security. Both undefined here.
+	 * globalValue is undefined for both the profile name and profiles map,
+	 * so Terminal (which reads only globalValue ?? defaultValue) sees no profile.
+	 * The workspace-scoped value is present to verify it is correctly ignored.
 	 */
 	function stubWorkspaceScopedProfile(profileName: string, profilePath: string) {
 		const profiles = { [profileName]: { path: profilePath } }
@@ -148,22 +145,23 @@ describe("issue #634 — system prompt shell vs actual terminal shell divergence
 		expect(shellForSystemPrompt).toBe(profilePath)
 	})
 
-	it("divergence: getShell() reports PowerShell but Terminal sees no profile when set at workspace scope only", () => {
+	it("convergence: getShell() and Terminal both ignore a workspace-scoped-only profile (fix verification)", () => {
+		// beforeEach mocks existsSync to return true only for PS7 path.
+		// Here we want to test the no-profile fallback, so make existsSync return false.
+		mockedExistsSync.mockReturnValue(false)
 		stubWorkspaceScopedProfile("PowerShell", "C:\\Program Files\\PowerShell\\7\\pwsh.exe")
 
-		// getShell() uses config.get() → picks up workspace value → sees "PowerShell" name
-		// → name-match path returns pwsh.exe (since existsSync mocked true for it)
-		const shellForSystemPrompt = getShell()
-		expect(shellForSystemPrompt).toContain("PowerShell")
-
-		// Terminal.getConfiguredDefaultProfileName() uses inspect().globalValue → undefined
+		// Terminal reads only inspect().globalValue → no profile configured at global scope.
 		const terminalSeesProfileName = Terminal.getConfiguredDefaultProfileName("win32")
 		expect(terminalSeesProfileName).toBeUndefined()
 
-		// Terminal therefore can't identify the active shell as PowerShell
-		expect(Terminal.isActiveShellPowerShell("win32")).toBe(false)
+		// After the fix, getShell() delegates to Terminal's inspect()-based methods,
+		// so it also sees no profile. It falls back to the Windows no-profile default
+		// (PS legacy, since existsSync returns false for PS7 in this test).
+		const shellForSystemPrompt = getShell()
+		expect(shellForSystemPrompt).toBe("C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe")
 
-		// Divergence: system prompt claims PowerShell, Terminal has no profile → falls
-		// through to VS Code's own autodetect which may open cmd.exe on this machine.
+		// Both paths agree: no profile resolved → no active shell identified as PowerShell.
+		expect(Terminal.isActiveShellPowerShell("win32")).toBe(false)
 	})
 })

src/utils/__tests__/shell.spec.ts

@@ -36,23 +36,29 @@ describe("Shell Detection Tests", () => {
 	 * how Terminal.getConfiguredDefaultProfileName and Terminal.getConfiguredProfiles
 	 * read config (globalValue only — workspace excluded per APPLICATION scope).
 	 */
-	function mockVsCodeConfig(_platformKey: string, defaultProfileName: string | null, profiles: Record<string, any>) {
+	function mockVsCodeConfig(platformKey: string, defaultProfileName: string | null, profiles: Record<string, any>) {
 		vscode.workspace.getConfiguration = (section?: string) => {
 			if (section === "terminal.integrated") {
 				return {
-					inspect: (_key: string) => ({
-						defaultValue: undefined,
-						globalValue: defaultProfileName ?? undefined,
-					}),
+					inspect: (key: string) => {
+						expect(key).toBe(`defaultProfile.${platformKey}`)
+						return {
+							defaultValue: undefined,
+							globalValue: defaultProfileName ?? undefined,
+						}
+					},
 					get: () => undefined,
 				} as any
 			}
 			if (section === "terminal.integrated.profiles") {
 				return {
-					inspect: (_key: string) => ({
-						defaultValue: undefined,
-						globalValue: profiles,
-					}),
+					inspect: (key: string) => {
+						expect(key).toBe(platformKey)
+						return {
+							defaultValue: undefined,
+							globalValue: profiles,
+						}
+					},
 					get: () => undefined,
 				} as any
 			}
@@ -450,7 +456,7 @@ describe("Shell Detection Tests", () => {
 			expect(getShell()).toBe("/bin/bash")
 		})
 
-		it("should validate array shell paths and use first allowlisted path", () => {
+		it("should resolve array shell paths and use first path", () => {
 			Object.defineProperty(process, "platform", { value: "win32" })
 			vi.mocked(existsSync).mockImplementation((p: any) => p === "C:\\Program Files\\PowerShell\\7\\pwsh.exe")
 			mockVsCodeConfig("windows", "PowerShell", {

src/utils/shell.ts

@@ -127,6 +127,10 @@ const SHELL_PATHS = {
  *
  * Returns null when no profile is configured or the profile has no resolvable path.
  */
+function preferredWindowsPowerShell(): string {
+	return existsSync(SHELL_PATHS.POWERSHELL_7) ? SHELL_PATHS.POWERSHELL_7 : SHELL_PATHS.POWERSHELL_LEGACY
+}
+
 function getShellFromVSCode(): string | null {
 	try {
 		const profileName = Terminal.getConfiguredDefaultProfileName()
@@ -136,7 +140,7 @@ function getShellFromVSCode(): string | null {
 			// auto-detects and prefers PowerShell 7 when installed. Mirror that so
 			// the system prompt matches what VS Code will actually open. (issue #82)
 			if (process.platform === "win32") {
-				return existsSync(SHELL_PATHS.POWERSHELL_7) ? SHELL_PATHS.POWERSHELL_7 : SHELL_PATHS.POWERSHELL_LEGACY
+				return preferredWindowsPowerShell()
 			}
 			return null
 		}
@@ -156,7 +160,7 @@ function getShellFromVSCode(): string | null {
 		// source-only PowerShell profiles (e.g. { source: "PowerShell" }) have no
 		// path but we can still identify the shell type from the source field.
 		if (typeof profile.source === "string" && profile.source.toLowerCase().includes("powershell")) {
-			return existsSync(SHELL_PATHS.POWERSHELL_7) ? SHELL_PATHS.POWERSHELL_7 : SHELL_PATHS.POWERSHELL_LEGACY
+			return preferredWindowsPowerShell()
 		}
 
 		// source-only WSL profiles