fix: use && for cmd.exe to preserve conditional execution semantics

hannesrudolph · hannesrudolph · commit b467dd32e331 · 2026-01-07T17:09:41.000-07:00
- Update getCommandChainOperator() to return &amp;&amp; for cmd.exe (already done)
- Update getCommandChainNote() to document &amp;&amp; instead of &amp; for cmd.exe
- Update JSDoc to reflect cmd.exe uses &amp;&amp; for conditional execution
- Update tests to expect &amp;&amp; for cmd.exe

cmd.exe supports &amp;&amp; for conditional execution (run next command only if
previous succeeds), which provides the same semantics as Unix shells.
diff --git a/src/core/prompts/__tests__/sections.spec.ts b/src/core/prompts/__tests__/sections.spec.ts
@@ -128,7 +128,9 @@ describe("getCommandChainOperator", () => {
 	})
 
 	it("returns ; for PowerShell", () => {
-		vi.spyOn(shellUtils, "getShell").mockReturnValue("C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe")
+		vi.spyOn(shellUtils, "getShell").mockReturnValue(
+			"C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe",
+		)
 		expect(getCommandChainOperator()).toBe(";")
 	})
 
@@ -137,9 +139,9 @@ describe("getCommandChainOperator", () => {
 		expect(getCommandChainOperator()).toBe(";")
 	})
 
-	it("returns & for cmd.exe", () => {
+	it("returns && for cmd.exe", () => {
 		vi.spyOn(shellUtils, "getShell").mockReturnValue("C:\\Windows\\System32\\cmd.exe")
-		expect(getCommandChainOperator()).toBe("&")
+		expect(getCommandChainOperator()).toBe("&&")
 	})
 
 	it("returns && for Git Bash on Windows", () => {
@@ -170,23 +172,27 @@ describe("getRulesSection shell-aware command chaining", () => {
 	})
 
 	it("uses ; for PowerShell in command chaining example", () => {
-		vi.spyOn(shellUtils, "getShell").mockReturnValue("C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe")
+		vi.spyOn(shellUtils, "getShell").mockReturnValue(
+			"C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe",
+		)
 		const result = getRulesSection(cwd)
 
 		expect(result).toContain("cd (path to project) ; (command")
 		expect(result).toContain("Note: Using `;` for PowerShell command chaining")
 	})
 
-	it("uses & for cmd.exe in command chaining example", () => {
+	it("uses && for cmd.exe in command chaining example", () => {
 		vi.spyOn(shellUtils, "getShell").mockReturnValue("C:\\Windows\\System32\\cmd.exe")
 		const result = getRulesSection(cwd)
 
-		expect(result).toContain("cd (path to project) & (command")
-		expect(result).toContain("Note: Using `&` for cmd.exe command chaining")
+		expect(result).toContain("cd (path to project) && (command")
+		expect(result).toContain("Note: Using `&&` for cmd.exe command chaining")
 	})
 
 	it("includes Unix utility guidance for PowerShell", () => {
-		vi.spyOn(shellUtils, "getShell").mockReturnValue("C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe")
+		vi.spyOn(shellUtils, "getShell").mockReturnValue(
+			"C:\\Windows\\System32\\WindowsPowerShell\\v1.0\\powershell.exe",
+		)
 		const result = getRulesSection(cwd)
 
 		expect(result).toContain("IMPORTANT: When using PowerShell, avoid Unix-specific utilities")
diff --git a/src/core/prompts/sections/rules.ts b/src/core/prompts/sections/rules.ts
@@ -7,7 +7,7 @@ import { getShell } from "../../../utils/shell"
  * Returns the appropriate command chaining operator based on the user's shell.
  * - Unix shells (bash, zsh, etc.): `&&` (run next command only if previous succeeds)
  * - PowerShell: `;` (semicolon for command separation)
- * - cmd.exe: `&` (single ampersand for command chaining)
+ * - cmd.exe: `&&` (conditional execution, same as Unix)
  * @internal Exported for testing purposes
  */
 export function getCommandChainOperator(): string {
@@ -20,7 +20,7 @@ export function getCommandChainOperator(): string {
 
 	// Check for cmd.exe
 	if (shell.includes("cmd.exe")) {
-	return "&&"
+		return "&&"
 	}
 
 	// Default to Unix-style && for bash, zsh, sh, and other shells
@@ -41,7 +41,7 @@ function getCommandChainNote(): string {
 
 	// Check for cmd.exe
 	if (shell.includes("cmd.exe")) {
-		return "Note: Using `&` for cmd.exe command chaining. For bash/zsh use `&&`, for PowerShell use `;`. IMPORTANT: When using cmd.exe, avoid Unix-specific utilities like `sed`, `grep`, `awk`, `cat`, `rm`, `cp`, `mv`. Use built-in commands like `type` for cat, `del` for rm, `copy` for cp, `move` for mv, `find`/`findstr` for grep, or consider using PowerShell commands instead."
+		return "Note: Using `&&` for cmd.exe command chaining (conditional execution). For bash/zsh use `&&`, for PowerShell use `;`. IMPORTANT: When using cmd.exe, avoid Unix-specific utilities like `sed`, `grep`, `awk`, `cat`, `rm`, `cp`, `mv`. Use built-in commands like `type` for cat, `del` for rm, `copy` for cp, `move` for mv, `find`/`findstr` for grep, or consider using PowerShell commands instead."
 	}
 
 	// Unix shells
