Merge pull request #313 from chr1syy/fix-ssh-local-override

Fix ssh remote Agents & dev:win script

Author: pedramamini

scripts/start-dev.ps1

@@ -10,7 +10,13 @@ $repoRootEscaped = $repoRoot -replace "'","''"
 $cmdRenderer = "Set-Location -LiteralPath '$repoRootEscaped'; npm run dev:renderer"
 Start-Process powershell -ArgumentList '-NoExit', '-Command', $cmdRenderer
 
-$cmdBuild = "Set-Location -LiteralPath '$repoRootEscaped'; npm run build:prompts; npx tsc -p tsconfig.main.json; `$env:NODE_ENV='development'; npx electron ."
+# Wait for renderer dev server to start before launching main process
+# This ensures the Vite dev server is ready on http://localhost:5173
+Write-Host "Waiting for renderer dev server to start..." -ForegroundColor Yellow
+Start-Sleep -Seconds 5
+
+$cmdBuild = "Set-Location -LiteralPath '$repoRootEscaped'; npm run build:prompts; npx tsc -p tsconfig.main.json; npm run build:preload; `$env:NODE_ENV='development'; npx electron ."
 Start-Process powershell -ArgumentList '-NoExit', '-Command', $cmdBuild
 
 Write-Host "Launched renderer and main developer windows." -ForegroundColor Green
+

src/main/ipc/handlers/process.ts

@@ -393,6 +393,12 @@ export function registerProcessHandlers(deps: ProcessHandlerDependencies): void
 						// For SSH, env vars are passed in the stdin script, not locally
 						customEnvVarsToPass = undefined;
 
+						// CRITICAL: When using SSH, do NOT use shell execution
+						// SSH needs direct stdin/stdout/stderr access for the script passthrough to work
+						// Running SSH through a shell breaks stdin passthrough and the agent never gets the script
+						useShell = false;
+						shellToUse = undefined;
+
 						logger.info(`SSH command built with stdin passthrough`, LOG_CONTEXT, {
 							sessionId: config.sessionId,
 							toolType: config.toolType,

src/renderer/components/NewInstanceModal.tsx

@@ -785,7 +785,9 @@ export function NewInstanceModal({
 													)}
 													<span className="font-medium">{agent.name}</span>
 													{/* "Beta" badge for Codex, OpenCode, and Factory Droid */}
-													{(agent.id === 'codex' || agent.id === 'opencode' || agent.id === 'factory-droid') && (
+													{(agent.id === 'codex' ||
+														agent.id === 'opencode' ||
+														agent.id === 'factory-droid') && (
 														<span
 															className="text-[9px] px-1.5 py-0.5 rounded font-bold uppercase"
 															style={{
@@ -1748,6 +1750,7 @@ export function EditAgentModal({
 								onRefreshAgent={handleRefreshAgent}
 								refreshingAgent={refreshingAgent}
 								showBuiltInEnvVars
+								isSshEnabled={isSshEnabled}
 							/>
 						</div>
 					)}

src/renderer/components/shared/AgentConfigPanel.tsx

@@ -258,6 +258,8 @@ export interface AgentConfigPanelProps {
 	compact?: boolean;
 	// Show built-in environment variables section
 	showBuiltInEnvVars?: boolean;
+	// SSH remote execution enabled for this session
+	isSshEnabled?: boolean;
 }
 
 export function AgentConfigPanel({
@@ -287,6 +289,7 @@ export function AgentConfigPanel({
 	refreshingAgent = false,
 	compact = false,
 	showBuiltInEnvVars = false,
+	isSshEnabled = false,
 }: AgentConfigPanelProps): JSX.Element {
 	const padding = compact ? 'p-2' : 'p-3';
 	const spacing = compact ? 'space-y-2' : 'space-y-3';
@@ -350,6 +353,7 @@ export function AgentConfigPanel({
 	return (
 		<div className={spacing}>
 			{/* Path input - pre-filled with detected path, editable to override */}
+			{/* When SSH is enabled and no custom path is set, show the remote binary name instead of local path */}
 			<div
 				className={`${padding} rounded border`}
 				style={{ borderColor: theme.colors.border, backgroundColor: theme.colors.bgMain }}
@@ -358,8 +362,8 @@ export function AgentConfigPanel({
 					className="block text-xs font-medium mb-2 flex items-center justify-between"
 					style={{ color: theme.colors.textDim }}
 				>
-					<span>Path</span>
-					{onRefreshAgent && (
+					<span>{isSshEnabled ? 'Remote Command' : 'Path'}</span>
+					{onRefreshAgent && !isSshEnabled && (
 						<button
 							onClick={onRefreshAgent}
 							className="p-1 rounded hover:bg-white/10 transition-colors flex items-center gap-1"
@@ -374,30 +378,39 @@ export function AgentConfigPanel({
 				<div className="flex gap-2">
 					<input
 						type="text"
-						value={customPath || agent.path || ''}
+						value={customPath || (isSshEnabled ? agent.binaryName : agent.path) || ''}
 						onChange={(e) => onCustomPathChange(e.target.value)}
 						onBlur={onCustomPathBlur}
 						onClick={(e) => e.stopPropagation()}
 						placeholder={`/path/to/${agent.binaryName}`}
+						// When showing default SSH binary name, make field read-only to prevent accidental modification
+						readOnly={isSshEnabled && !customPath}
 						className="flex-1 p-2 rounded border bg-transparent outline-none text-xs font-mono"
-						style={{ borderColor: theme.colors.border, color: theme.colors.textMain }}
+						style={{
+							borderColor: theme.colors.border,
+							color: theme.colors.textMain,
+							// Slightly dim read-only fields to show they're not editable
+							opacity: isSshEnabled && !customPath ? 0.7 : 1,
+						}}
 					/>
-					{customPath && customPath !== agent.path && (
+					{customPath && (
 						<button
 							onClick={(e) => {
 								e.stopPropagation();
 								onCustomPathClear();
 							}}
 							className="px-2 py-1.5 rounded text-xs"
 							style={{ backgroundColor: theme.colors.bgActivity, color: theme.colors.textDim }}
-							title="Reset to detected path"
+							title={isSshEnabled ? 'Reset to remote binary name' : 'Reset to detected path'}
 						>
 							Reset
 						</button>
 					)}
 				</div>
 				<p className="text-xs opacity-50 mt-2">
-					Path to the {agent.binaryName} binary. Edit to override the auto-detected path.
+					{isSshEnabled
+						? `Remote command/binary for ${agent.binaryName}. Leave empty to use default.`
+						: `Path to the ${agent.binaryName} binary. Edit to override the auto-detected path.`}
 				</p>
 			</div>