From c260cc824eb87694db78732c9a3f641fae98542e Mon Sep 17 00:00:00 2001
From: chr1syy <ch.bleuel@me.com>
Date: Thu, 5 Feb 2026 07:45:02 +0100
Subject: [PATCH 1/6] MAESTRO: Implement model selection for OpenCode moderator
 - Task 3.1

- Add customModel field to ModeratorConfig type for storing selected model
- Update NewGroupChatModal to pass agentConfig.model through moderatorConfig
- Update App.tsx handleCreateGroupChat to accept customModel parameter
- Update spawnModeratorSynthesis to pass sessionCustomModel from moderatorConfig
- Update initial moderator spawn to pass sessionCustomModel for both spawns
- Verify modelArgs config produces correct --model flag in arguments

This enables users to select a custom model when creating a group chat,
and ensures the selected model is applied when spawning the OpenCode moderator.
---
 src/main/group-chat/group-chat-router.ts      |  6 +++++-
 src/renderer/App.tsx                          |  1 +
 src/renderer/components/NewGroupChatModal.tsx | 11 ++++++-----
 src/shared/group-chat-types.ts                |  2 ++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/main/group-chat/group-chat-router.ts b/src/main/group-chat/group-chat-router.ts
index 032a5062..406a22ab 100644
--- a/src/main/group-chat/group-chat-router.ts
+++ b/src/main/group-chat/group-chat-router.ts
@@ -452,6 +452,7 @@ ${message}`;
 			});
 			const configResolution = applyAgentConfigOverrides(agent, baseArgs, {
 				agentConfigValues,
+				sessionCustomModel: chat.moderatorConfig?.customModel,
 				sessionCustomArgs: chat.moderatorConfig?.customArgs,
 				sessionCustomEnvVars: chat.moderatorConfig?.customEnvVars,
 			});
@@ -849,7 +850,9 @@ export async function routeModeratorResponse(
 
 				// Apply SSH wrapping if configured for this session
 				if (sshStore && matchingSession?.sshRemoteConfig) {
-					console.log(`[GroupChat:Debug] Applying SSH wrapping for participant ${participantName}...`);
+					console.log(
+						`[GroupChat:Debug] Applying SSH wrapping for participant ${participantName}...`
+					);
 					const sshWrapped = await wrapSpawnWithSsh(
 						{
 							command: spawnCommand,
@@ -1149,6 +1152,7 @@ Review the agent responses above. Either:
 	});
 	const configResolution = applyAgentConfigOverrides(agent, baseArgs, {
 		agentConfigValues,
+		sessionCustomModel: chat.moderatorConfig?.customModel,
 		sessionCustomArgs: chat.moderatorConfig?.customArgs,
 		sessionCustomEnvVars: chat.moderatorConfig?.customEnvVars,
 	});
diff --git a/src/renderer/App.tsx b/src/renderer/App.tsx
index a57d9bd7..0c56cc9b 100644
--- a/src/renderer/App.tsx
+++ b/src/renderer/App.tsx
@@ -8394,6 +8394,7 @@ You are taking over this conversation. Based on the context above, provide a bri
 				customPath?: string;
 				customArgs?: string;
 				customEnvVars?: Record<string, string>;
+				customModel?: string;
 			}
 		) => {
 			const chat = await window.maestro.groupChat.create(name, moderatorAgentId, moderatorConfig);
diff --git a/src/renderer/components/NewGroupChatModal.tsx b/src/renderer/components/NewGroupChatModal.tsx
index c04d7c07..458f357d 100644
--- a/src/renderer/components/NewGroupChatModal.tsx
+++ b/src/renderer/components/NewGroupChatModal.tsx
@@ -163,15 +163,18 @@ export function NewGroupChatModal({
 
 	// Build moderator config from state
 	const buildModeratorConfig = useCallback((): ModeratorConfig | undefined => {
-		const hasConfig = customPath || customArgs || Object.keys(customEnvVars).length > 0;
+		const customModelValue = agentConfig.model;
+		const hasConfig =
+			customPath || customArgs || Object.keys(customEnvVars).length > 0 || customModelValue;
 		if (!hasConfig) return undefined;
 
 		return {
 			customPath: customPath || undefined,
 			customArgs: customArgs || undefined,
 			customEnvVars: Object.keys(customEnvVars).length > 0 ? customEnvVars : undefined,
+			customModel: customModelValue || undefined,
 		};
-	}, [customPath, customArgs, customEnvVars]);
+	}, [customPath, customArgs, customEnvVars, agentConfig]);
 
 	const handleCreate = useCallback(() => {
 		if (name.trim() && selectedAgent) {
@@ -351,9 +354,7 @@ export function NewGroupChatModal({
 								>
 									{availableTiles.map((tile) => {
 										const isBeta =
-											tile.id === 'codex' ||
-											tile.id === 'opencode' ||
-											tile.id === 'factory-droid';
+											tile.id === 'codex' || tile.id === 'opencode' || tile.id === 'factory-droid';
 										return (
 											<option key={tile.id} value={tile.id}>
 												{tile.name}
diff --git a/src/shared/group-chat-types.ts b/src/shared/group-chat-types.ts
index 5fea9675..53e6a48f 100644
--- a/src/shared/group-chat-types.ts
+++ b/src/shared/group-chat-types.ts
@@ -73,6 +73,8 @@ export interface ModeratorConfig {
 	customArgs?: string;
 	/** Custom environment variables */
 	customEnvVars?: Record<string, string>;
+	/** Custom model selection (e.g., 'ollama/qwen3:8b') */
+	customModel?: string;
 	/** SSH remote config for remote execution */
 	sshRemoteConfig?: {
 		enabled: boolean;

From 5616e6107ba76cf287c7bbe5b9ce304bdf3d8d35 Mon Sep 17 00:00:00 2001
From: chr1syy <ch.bleuel@me.com>
Date: Thu, 5 Feb 2026 15:46:50 +0100
Subject: [PATCH 2/6] fix: resolve select dropdown z-index issue in group chat
 modals

The native HTML select element's dropdown menu was being rendered behind
the modal overlay, making it impossible to interact with the options. This
was caused by a z-index stacking context issue where the modal's overlay
had a higher z-index than the select element.

Fixed by explicitly setting zIndex: 10000 on the select container and
select element, and zIndex: 10001 on the icon, ensuring the dropdown
renders above the modal overlay (z-index: 9999).

Fixes the issue in both NewGroupChatModal and EditGroupChatModal.
---
 src/renderer/components/EditGroupChatModal.tsx | 11 +++++------
 src/renderer/components/NewGroupChatModal.tsx  |  7 ++++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/renderer/components/EditGroupChatModal.tsx b/src/renderer/components/EditGroupChatModal.tsx
index d375cf93..13120e15 100644
--- a/src/renderer/components/EditGroupChatModal.tsx
+++ b/src/renderer/components/EditGroupChatModal.tsx
@@ -347,23 +347,22 @@ export function EditGroupChatModal({
 					) : (
 						<div className="flex items-center gap-2">
 							{/* Dropdown */}
-							<div className="relative flex-1">
+							<div className="relative flex-1" style={{ zIndex: 10000 }}>
 								<select
 									value={selectedAgent || ''}
 									onChange={(e) => handleAgentChange(e.target.value)}
-									className="w-full px-3 py-2 pr-10 rounded-lg border outline-none appearance-none cursor-pointer text-sm"
+									className="w-full px-3 py-2 pr-10 rounded-lg border outline-none appearance-none cursor-pointer text-sm relative"
 									style={{
 										backgroundColor: theme.colors.bgMain,
 										borderColor: theme.colors.border,
 										color: theme.colors.textMain,
+										zIndex: 10000,
 									}}
 									aria-label="Select moderator agent"
 								>
 									{availableTiles.map((tile) => {
 										const isBeta =
-											tile.id === 'codex' ||
-											tile.id === 'opencode' ||
-											tile.id === 'factory-droid';
+											tile.id === 'codex' || tile.id === 'opencode' || tile.id === 'factory-droid';
 										return (
 											<option key={tile.id} value={tile.id}>
 												{tile.name}
@@ -374,7 +373,7 @@ export function EditGroupChatModal({
 								</select>
 								<ChevronDown
 									className="absolute right-3 top-1/2 -translate-y-1/2 w-4 h-4 pointer-events-none"
-									style={{ color: theme.colors.textDim }}
+									style={{ color: theme.colors.textDim, zIndex: 10001 }}
 								/>
 							</div>
 
diff --git a/src/renderer/components/NewGroupChatModal.tsx b/src/renderer/components/NewGroupChatModal.tsx
index 458f357d..8d25541d 100644
--- a/src/renderer/components/NewGroupChatModal.tsx
+++ b/src/renderer/components/NewGroupChatModal.tsx
@@ -340,15 +340,16 @@ export function NewGroupChatModal({
 					) : (
 						<div className="flex items-center gap-2">
 							{/* Dropdown */}
-							<div className="relative flex-1">
+							<div className="relative flex-1" style={{ zIndex: 10000 }}>
 								<select
 									value={selectedAgent || ''}
 									onChange={(e) => handleAgentChange(e.target.value)}
-									className="w-full px-3 py-2 pr-10 rounded-lg border outline-none appearance-none cursor-pointer text-sm"
+									className="w-full px-3 py-2 pr-10 rounded-lg border outline-none appearance-none cursor-pointer text-sm relative"
 									style={{
 										backgroundColor: theme.colors.bgMain,
 										borderColor: theme.colors.border,
 										color: theme.colors.textMain,
+										zIndex: 10000,
 									}}
 									aria-label="Select moderator agent"
 								>
@@ -365,7 +366,7 @@ export function NewGroupChatModal({
 								</select>
 								<ChevronDown
 									className="absolute right-3 top-1/2 -translate-y-1/2 w-4 h-4 pointer-events-none"
-									style={{ color: theme.colors.textDim }}
+									style={{ color: theme.colors.textDim, zIndex: 10001 }}
 								/>
 							</div>
 

From 32e4fc33a6ef1a188be6358aca01c4bf461dc4ad Mon Sep 17 00:00:00 2001
From: chr1syy <ch.bleuel@me.com>
Date: Thu, 5 Feb 2026 17:47:43 +0100
Subject: [PATCH 3/6] fix: add nvm4w node path detection for Windows

OpenCode installed via npm in nvm4w Node installations was not being
detected because C:\nvm4w\nodejs\ path was not included in the expanded
PATH environment. This fix adds support for nvm4w and fallback paths so
OpenCode can be properly discovered and selected as a group chat moderator.
---
 src/main/agents/path-prober.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/agents/path-prober.ts b/src/main/agents/path-prober.ts
index 07c3278d..4a246aed 100644
--- a/src/main/agents/path-prober.ts
+++ b/src/main/agents/path-prober.ts
@@ -84,6 +84,9 @@ export function getExpandedEnv(): NodeJS.ProcessEnv {
 			// Node.js
 			path.join(programFiles, 'nodejs'),
 			path.join(localAppData, 'Programs', 'node'),
+			// Node Version Manager for Windows (nvm4w) - OpenCode commonly installed here
+			'C:\\nvm4w\\nodejs',
+			path.join(home, 'nvm4w', 'nodejs'),
 			// Scoop package manager (OpenCode, other tools)
 			path.join(home, 'scoop', 'shims'),
 			path.join(home, 'scoop', 'apps', 'opencode', 'current'),

From e65266f8d95c261696935797a557bd56370bda2d Mon Sep 17 00:00:00 2001
From: chr1syy <ch.bleuel@me.com>
Date: Thu, 5 Feb 2026 17:52:49 +0100
Subject: [PATCH 4/6] test: add Windows nvm4w path detection test

Verifies that nvm4w Node.js installation paths are properly included in
the expanded PATH environment on Windows, ensuring OpenCode and other
npm-installed tools are detected correctly.
---
 src/__tests__/main/agents/path-prober.test.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/__tests__/main/agents/path-prober.test.ts b/src/__tests__/main/agents/path-prober.test.ts
index 816cc7a6..e0d028da 100644
--- a/src/__tests__/main/agents/path-prober.test.ts
+++ b/src/__tests__/main/agents/path-prober.test.ts
@@ -63,6 +63,21 @@ describe('path-prober', () => {
 			}
 		});
 
+		it('should include nvm4w and npm paths on Windows', () => {
+			const originalPlatform = process.platform;
+			Object.defineProperty(process, 'platform', { value: 'win32', configurable: true });
+
+			try {
+				const env = getExpandedEnv();
+				// Check for nvm4w paths (OpenCode commonly installed here)
+				expect(env.PATH).toContain('C:\\nvm4w\\nodejs');
+				// Check for npm global paths
+				expect(env.PATH).toMatch(/AppData[\\\/](npm|Roaming[\\\/]npm)/);
+			} finally {
+				Object.defineProperty(process, 'platform', { value: originalPlatform, configurable: true });
+			}
+		});
+
 		it('should preserve existing PATH entries', () => {
 			const originalPath = process.env.PATH;
 			const testPath = '/test/custom/path';

From 3a0affb149b99ad1a30273642592b0f4beec7535 Mon Sep 17 00:00:00 2001
From: chr1syy <ch.bleuel@me.com>
Date: Thu, 5 Feb 2026 18:21:06 +0100
Subject: [PATCH 5/6] feat: prefer PowerShell and auto-detect shell scripts on
 Windows

Improvements to Windows shell execution for OpenCode and other shell-based tools:

1. **Binary detection priority**: Changed Windows detection to prefer extensionless
   shell scripts (like opencode) over .cmd wrappers. The .cmd files execute through
   cmd.exe which has command line length limits and less robust script handling.

2. **Auto-detect shell scripts**: Added shebang detection in ChildProcessSpawner to
   automatically enable shell execution for POSIX scripts, preventing ENOENT errors
   when trying to execute shell scripts without explicit shell.

3. **Use PowerShell by default**: Changed Windows agent execution to prefer PowerShell
   over cmd.exe when available via PSHOME environment variable. PowerShell provides:
   - Better handling of POSIX shell scripts (with shebangs)
   - Avoids cmd.exe command line length limitations
   - Better compatibility with modern tooling

   Falls back to cmd.exe if PowerShell unavailable, respects user customizations.

4. **Improved path detection**: Updated Windows path probing to correctly prefer
   .exe > extensionless scripts > .cmd in the selection order.
---
 src/main/agents/path-prober.ts                | 11 +++++++----
 src/main/ipc/handlers/process.ts              | 19 ++++++++++++++++---
 .../spawners/ChildProcessSpawner.ts           | 19 +++++++++++++++++++
 3 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/src/main/agents/path-prober.ts b/src/main/agents/path-prober.ts
index 4a246aed..975112a3 100644
--- a/src/main/agents/path-prober.ts
+++ b/src/main/agents/path-prober.ts
@@ -474,13 +474,16 @@ export async function checkBinaryExists(binaryName: string): Promise<BinaryDetec
 				.filter((p) => p);
 
 			if (process.platform === 'win32' && matches.length > 0) {
-				// On Windows, prefer .exe over .cmd over extensionless
-				// This helps with proper execution handling
+				// On Windows, prefer .exe > extensionless (shell scripts) > .cmd
+				// This helps avoid cmd.exe limitations and supports PowerShell/bash scripts
 				const exeMatch = matches.find((p) => p.toLowerCase().endsWith('.exe'));
 				const cmdMatch = matches.find((p) => p.toLowerCase().endsWith('.cmd'));
+				const extensionlessMatch = matches.find(
+					(p) => !p.toLowerCase().endsWith('.exe') && !p.toLowerCase().endsWith('.cmd')
+				);
 
-				// Return the best match: .exe > .cmd > first result
-				let bestMatch = exeMatch || cmdMatch || matches[0];
+				// Return the best match: .exe > extensionless shell scripts > .cmd > first result
+				let bestMatch = exeMatch || extensionlessMatch || cmdMatch || matches[0];
 
 				// If the first match doesn't have an extension, check if .cmd or .exe version exists
 				// This handles cases where 'where' returns a path without extension
diff --git a/src/main/ipc/handlers/process.ts b/src/main/ipc/handlers/process.ts
index 900e5658..3a689be0 100644
--- a/src/main/ipc/handlers/process.ts
+++ b/src/main/ipc/handlers/process.ts
@@ -283,7 +283,8 @@ export function registerProcessHandlers(deps: ProcessHandlerDependencies): void
 					) as Record<string, string>;
 
 					// Determine an explicit shell to use when forcing shell execution on Windows.
-					// Prefer a user-configured custom shell path, otherwise fall back to COMSPEC/cmd.exe.
+					// Prefer a user-configured custom shell path, then PowerShell, then ComSpec/cmd.exe.
+					// PowerShell is preferred over cmd.exe for better script handling and to avoid cmd.exe limits.
 					const customShellPath = settingsStore.get('customShellPath', '') as string;
 					if (customShellPath && customShellPath.trim()) {
 						shellToUse = customShellPath.trim();
@@ -291,8 +292,20 @@ export function registerProcessHandlers(deps: ProcessHandlerDependencies): void
 							customShellPath: shellToUse,
 						});
 					} else if (!shellToUse) {
-						// Use COMSPEC if available, otherwise default to cmd.exe
-						shellToUse = process.env.ComSpec || 'cmd.exe';
+						// Try PowerShell if available (common on modern Windows)
+						// If not, fall back to ComSpec/cmd.exe
+						// PowerShell handles shell scripts better and avoids cmd.exe command line length limits
+						const powerShellPath = process.env.PSHOME
+							? `${process.env.PSHOME}\\powershell.exe`
+							: 'powershell';
+						shellToUse = powerShellPath;
+						logger.debug(
+							'Using PowerShell for agent execution on Windows (shell script support)',
+							LOG_CONTEXT,
+							{
+								shellPath: shellToUse,
+							}
+						);
 					}
 
 					logger.info(`Forcing shell execution for agent on Windows for PATH access`, LOG_CONTEXT, {
diff --git a/src/main/process-manager/spawners/ChildProcessSpawner.ts b/src/main/process-manager/spawners/ChildProcessSpawner.ts
index 4391366f..e28bd4d3 100644
--- a/src/main/process-manager/spawners/ChildProcessSpawner.ts
+++ b/src/main/process-manager/spawners/ChildProcessSpawner.ts
@@ -3,6 +3,7 @@
 import { spawn } from 'child_process';
 import { EventEmitter } from 'events';
 import * as path from 'path';
+import * as fs from 'fs';
 import { logger } from '../../utils/logger';
 import { getOutputParser } from '../../parsers';
 import { getAgentCapabilities } from '../../agents';
@@ -184,6 +185,24 @@ export class ChildProcessSpawner {
 				);
 			}
 
+			// Auto-enable shell for Windows when command is a shell script (extensionless with shebang)
+			// This handles tools like OpenCode installed via npm with shell scripts
+			if (isWindows && !useShell && !commandExt && commandHasPath) {
+				try {
+					const fileContent = fs.readFileSync(spawnCommand, 'utf8');
+					if (fileContent.startsWith('#!')) {
+						useShell = true;
+						logger.info(
+							'[ProcessManager] Auto-enabling shell for Windows to execute shell script',
+							'ProcessManager',
+							{ command: spawnCommand, shebang: fileContent.split('\n')[0] }
+						);
+					}
+				} catch {
+					// If we can't read the file, just continue without special handling
+				}
+			}
+
 			if (isWindows && useShell) {
 				logger.debug(
 					'[ProcessManager] Forcing shell=true for agent spawn on Windows (runInShell or auto)',

From d2206c254849d7e9aafa9eca3b7c047bfa1b292c Mon Sep 17 00:00:00 2001
From: chr1syy <ch.bleuel@me.com>
Date: Thu, 5 Feb 2026 20:00:30 +0100
Subject: [PATCH 6/6] feat: add Volta Node version manager support

Added support for Volta (https://docs.volta.sh/), a Node version manager
for Windows/macOS/Linux. This resolves issue #295 where OpenCode installed
via Volta was not being detected.

Changes:
- Added ~/.volta/bin to Windows path expansion in getExpandedEnv()
- Added Volta paths to Windows OpenCode detection in probeWindowsPaths()
- Volta's shim directory (~/.volta/bin) is now searched when detecting tools

Users with OpenCode installed via Volta will now see it automatically
detected in the Wizard and available for group chat moderator selection.
---
 src/main/agents/path-prober.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/agents/path-prober.ts b/src/main/agents/path-prober.ts
index 975112a3..c30b5497 100644
--- a/src/main/agents/path-prober.ts
+++ b/src/main/agents/path-prober.ts
@@ -87,6 +87,8 @@ export function getExpandedEnv(): NodeJS.ProcessEnv {
 			// Node Version Manager for Windows (nvm4w) - OpenCode commonly installed here
 			'C:\\nvm4w\\nodejs',
 			path.join(home, 'nvm4w', 'nodejs'),
+			// Volta - Node version manager for Windows/macOS/Linux (installs shims to .volta/bin)
+			path.join(home, '.volta', 'bin'),
 			// Scoop package manager (OpenCode, other tools)
 			path.join(home, 'scoop', 'shims'),
 			path.join(home, 'scoop', 'apps', 'opencode', 'current'),
@@ -255,6 +257,9 @@ function getWindowsKnownPaths(binaryName: string): string[] {
 			// Scoop installation (recommended for OpenCode)
 			path.join(home, 'scoop', 'shims', 'opencode.exe'),
 			path.join(home, 'scoop', 'apps', 'opencode', 'current', 'opencode.exe'),
+			// Volta - Node version manager (OpenCode commonly installed via Volta)
+			path.join(home, '.volta', 'bin', 'opencode'),
+			path.join(home, '.volta', 'bin', 'opencode.cmd'),
 			// Chocolatey installation
 			path.join(
 				process.env.ChocolateyInstall || 'C:\\ProgramData\\chocolatey',