neural-loom 0.2.40 → 0.2.41

package/src/app/components/IdeLayout.tsx

@@ -156,7 +156,8 @@ export default function IdeLayout({ sessionId, workspaceRoot, scopedDirs, onClos
 
   const [editorMode, setEditorMode] = useState<'edit' | 'split' | 'preview'>('edit');
   const [explorerVisible, setExplorerVisible] = useState(true);
-  const [activeTab, setActiveTab] = useState<"explorer" | "git" | "analytics" | "auditor">("explorer");
+  const [activeTab, setActiveTab] = useState<"explorer" | "git" | "analytics" | "auditor" | "browser">("explorer");
+  const [browserUrlInput, setBrowserUrlInput] = useState("http://localhost:3000");
   const [isRefreshing, setIsRefreshing] = useState(false);
 
   // Layout sizing states
@@ -806,6 +807,25 @@ export default function IdeLayout({ sessionId, workspaceRoot, scopedDirs, onClos
     }
   };
 
+  const handleOpenBrowserTab = (url: string) => {
+    const formattedUrl = url.trim();
+    if (!formattedUrl) return;
+    const browserPath = `browser:${formattedUrl}`;
+    const alreadyOpen = openFiles.find(f => f.path === browserPath);
+    if (!alreadyOpen) {
+      setOpenFiles(prev => [
+        ...prev,
+        {
+          name: `Browser: ${formattedUrl.replace(/^https?:\/\//, "")}`,
+          path: browserPath,
+          content: formattedUrl,
+          isModified: false,
+        }
+      ]);
+    }
+    setActiveFilePath(browserPath);
+  };
+
   const activeFile = openFiles.find((f) => f.path === activeFilePath);
   const isMarkdown = activeFile ? activeFile.path.toLowerCase().endsWith(".md") : false;
   const currentMode = isMarkdown ? editorMode : "edit";
@@ -821,7 +841,7 @@ export default function IdeLayout({ sessionId, workspaceRoot, scopedDirs, onClos
   };
 
   const handleSaveFile = useCallback(async () => {
-    if (!activeFile) return;
+    if (!activeFile || activeFile.path.startsWith("diff:") || activeFile.path.startsWith("browser:")) return;
     try {
       const res = await fetch("/api/files", {
         method: "POST",
@@ -968,6 +988,26 @@ export default function IdeLayout({ sessionId, workspaceRoot, scopedDirs, onClos
           >
             🔍
           </div>
+
+          {/* Web Browser Tab */}
+          <div
+            onClick={() => {
+              if (activeTab === "browser") {
+                setExplorerVisible(!explorerVisible);
+              } else {
+                setActiveTab("browser");
+                setExplorerVisible(true);
+              }
+            }}
+            style={{
+              ...sidebarIconStyle,
+              backgroundColor: activeTab === "browser" && explorerVisible ? "rgba(255,255,255,0.08)" : "transparent",
+              borderLeft: activeTab === "browser" && explorerVisible ? "2px solid var(--primary)" : "2px solid transparent",
+            }}
+            title="Local Web Browser Test Preview"
+          >
+            🌐
+          </div>
         </div>
 
         <div
@@ -989,6 +1029,7 @@ export default function IdeLayout({ sessionId, workspaceRoot, scopedDirs, onClos
               {activeTab === "git" && "Source Control"}
               {activeTab === "analytics" && "Telemetry & Cost"}
               {activeTab === "auditor" && "Session Auditor"}
+              {activeTab === "browser" && "Browser Preview"}
             </span>
             {activeTab === "explorer" && (
               <div style={{ display: "flex", gap: "0.25rem" }}>
@@ -1254,6 +1295,105 @@ export default function IdeLayout({ sessionId, workspaceRoot, scopedDirs, onClos
               </div>
             )}
 
+            {activeTab === "browser" && (
+              <div style={{ padding: "1rem", display: "flex", flexDirection: "column", gap: "1rem" }}>
+                <div>
+                  <label style={{ fontSize: "0.7rem", fontWeight: 700, textTransform: "uppercase", color: "var(--muted)", display: "block", marginBottom: "0.4rem" }}>
+                    Url Address
+                  </label>
+                  <div style={{ display: "flex", gap: "0.25rem" }}>
+                    <input
+                      type="text"
+                      value={browserUrlInput}
+                      onChange={(e) => setBrowserUrlInput(e.target.value)}
+                      placeholder="http://localhost:3000"
+                      style={{
+                        flex: 1,
+                        backgroundColor: "#05070a",
+                        border: "1px solid var(--border)",
+                        borderRadius: "4px",
+                        padding: "0.35rem 0.5rem",
+                        color: "#ffffff",
+                        fontSize: "0.75rem",
+                        outline: "none"
+                      }}
+                      onKeyDown={(e) => {
+                        if (e.key === "Enter") {
+                          handleOpenBrowserTab(browserUrlInput);
+                        }
+                      }}
+                    />
+                    <button
+                      onClick={() => handleOpenBrowserTab(browserUrlInput)}
+                      style={{
+                        backgroundColor: "var(--primary)",
+                        border: "none",
+                        color: "#ffffff",
+                        padding: "0.35rem 0.75rem",
+                        borderRadius: "4px",
+                        fontSize: "0.75rem",
+                        fontWeight: 600,
+                        cursor: "pointer"
+                      }}
+                    >
+                      Go
+                    </button>
+                  </div>
+                </div>
+
+                <div>
+                  <label style={{ fontSize: "0.7rem", fontWeight: 700, textTransform: "uppercase", color: "var(--muted)", display: "block", marginBottom: "0.5rem" }}>
+                    Quick Launch Ports
+                  </label>
+                  <div style={{ display: "flex", flexDirection: "column", gap: "0.35rem" }}>
+                    {[
+                      { label: "Next.js App (3000)", url: "http://localhost:3000" },
+                      { label: "WebSocket Gateway (3001)", url: "http://localhost:3001" },
+                      { label: "Vite Server (5173)", url: "http://localhost:5173" }
+                    ].map((item, idx) => (
+                      <div
+                        key={idx}
+                        onClick={() => {
+                          setBrowserUrlInput(item.url);
+                          handleOpenBrowserTab(item.url);
+                        }}
+                        style={{
+                          display: "flex",
+                          alignItems: "center",
+                          justifyContent: "space-between",
+                          padding: "0.5rem 0.75rem",
+                          borderRadius: "4px",
+                          backgroundColor: "rgba(255,255,255,0.02)",
+                          border: "1px solid var(--border)",
+                          cursor: "pointer",
+                          fontSize: "0.75rem",
+                          transition: "all 0.15s ease"
+                        }}
+                        onMouseEnter={(e) => e.currentTarget.style.backgroundColor = "rgba(255,255,255,0.06)"}
+                        onMouseLeave={(e) => e.currentTarget.style.backgroundColor = "rgba(255,255,255,0.02)"}
+                      >
+                        <span style={{ color: "var(--foreground)" }}>{item.label}</span>
+                        <span style={{ color: "var(--primary)", fontSize: "0.8rem" }}>🌐➔</span>
+                      </div>
+                    ))}
+                  </div>
+                </div>
+
+                <div style={{
+                  marginTop: "auto",
+                  padding: "0.5rem",
+                  borderRadius: "6px",
+                  backgroundColor: "rgba(234, 179, 8, 0.05)",
+                  border: "1px solid rgba(234, 179, 8, 0.15)",
+                  fontSize: "0.65rem",
+                  color: "var(--muted)",
+                  lineHeight: "1.4"
+                }}>
+                  <span style={{ color: "#eab308", fontWeight: 700 }}>⚠️ Iframe CSP Note</span>: Some public websites (e.g. Google, GitHub) block loading inside frames via security headers. Use this tab primarily to preview and debug local development webservers.
+                </div>
+              </div>
+            )}
+
             {activeTab === "analytics" && (
               <div style={{ padding: "0.5rem 1rem", display: "flex", flexDirection: "column", gap: "1.25rem" }}>
                 <div>
@@ -1552,7 +1692,7 @@ export default function IdeLayout({ sessionId, workspaceRoot, scopedDirs, onClos
               ))}
             </div>
 
-            {activeFile && !activeFile.path.startsWith("diff:") && (
+            {activeFile && !activeFile.path.startsWith("diff:") && !activeFile.path.startsWith("browser:") && (
               <div style={{ display: "flex", alignItems: "center", gap: "0.75rem" }}>
                 {isMarkdown && (
                   <div style={modeToggleContainerStyle}>
@@ -1612,28 +1752,10 @@ export default function IdeLayout({ sessionId, workspaceRoot, scopedDirs, onClos
           {/* Editor contents */}
           <div style={editorWorkspaceStyle}>
             {activeFile ? (
-              activeFile.path.startsWith("diff:") ? (
-                <div style={{ fontFamily: "var(--font-mono)", fontSize: "0.8rem", padding: "1rem", overflow: "auto", height: "100%", backgroundColor: "#0b101b", lineHeight: 1.5 }}>
-                  {activeFile.content.split("\n").map((line, i) => {
-                    let color = "#e2e8f0";
-                    let bg = "transparent";
-                    if (line.startsWith("+")) {
-                      color = "#4ade80";
-                      bg = "rgba(74, 222, 128, 0.08)";
-                    } else if (line.startsWith("-")) {
-                      color = "#f87171";
-                      bg = "rgba(248, 113, 113, 0.08)";
-                    } else if (line.startsWith("@@")) {
-                      color = "#60a5fa";
-                      bg = "rgba(96, 165, 250, 0.05)";
-                    }
-                    return (
-                      <div key={i} style={{ color, backgroundColor: bg, whiteSpace: "pre-wrap", padding: "0.1rem 0.5rem" }}>
-                        {line}
-                      </div>
-                    );
-                  })}
-                </div>
+              activeFile.path.startsWith("browser:") ? (
+                <BrowserView url={activeFile.content} />
+              ) : activeFile.path.startsWith("diff:") ? (
+                <DiffView content={activeFile.content} filePath={activeFile.path.substring(5)} />
               ) : isMarkdown ? (
                 currentMode === 'preview' ? (
                   <div style={{ height: "100%", overflow: "hidden" }}>
@@ -2785,6 +2907,359 @@ function GitFileRow({ file, isStaged, onAction, onSelect, onIgnore, onDiscard }:
   );
 }
 
+interface BrowserViewProps {
+  url: string;
+}
+
+function BrowserView({ url }: BrowserViewProps) {
+  const [currentUrl, setCurrentUrl] = useState(url);
+  const [iframeUrl, setIframeUrl] = useState(url);
+  const [refreshKey, setRefreshKey] = useState(0);
+
+  useEffect(() => {
+    setCurrentUrl(url);
+    setIframeUrl(url);
+  }, [url]);
+
+  const handleGo = () => {
+    let targetUrl = currentUrl.trim();
+    if (targetUrl && !/^https?:\/\//i.test(targetUrl)) {
+      targetUrl = "http://" + targetUrl;
+    }
+    setCurrentUrl(targetUrl);
+    setIframeUrl(targetUrl);
+  };
+
+  const handleReload = () => {
+    setRefreshKey(prev => prev + 1);
+  };
+
+  const handleOpenExternal = () => {
+    window.open(iframeUrl, "_blank");
+  };
+
+  return (
+    <div style={{ display: "flex", flexDirection: "column", width: "100%", height: "100%", backgroundColor: "#0b101b" }}>
+      {/* Navigation Toolbar */}
+      <div style={{
+        display: "flex",
+        alignItems: "center",
+        gap: "0.5rem",
+        padding: "0.5rem",
+        backgroundColor: "#05070a",
+        borderBottom: "1px solid var(--border)",
+      }}>
+        <button
+          onClick={handleReload}
+          title="Hard Reload Frame"
+          style={{
+            background: "none",
+            border: "1px solid var(--border)",
+            borderRadius: "4px",
+            color: "var(--muted)",
+            cursor: "pointer",
+            fontSize: "0.85rem",
+            padding: "0.25rem 0.5rem",
+            display: "flex",
+            alignItems: "center",
+            backgroundColor: "rgba(255,255,255,0.02)"
+          }}
+          onMouseEnter={(e) => e.currentTarget.style.color = "var(--foreground)"}
+          onMouseLeave={(e) => e.currentTarget.style.color = "var(--muted)"}
+        >
+          🔄
+        </button>
+
+        <input
+          type="text"
+          value={currentUrl}
+          onChange={(e) => setCurrentUrl(e.target.value)}
+          onKeyDown={(e) => {
+            if (e.key === "Enter") {
+              handleGo();
+            }
+          }}
+          style={{
+            flex: 1,
+            backgroundColor: "#080c14",
+            border: "1px solid var(--border)",
+            borderRadius: "4px",
+            padding: "0.25rem 0.75rem",
+            color: "#ffffff",
+            fontSize: "0.8rem",
+            outline: "none",
+            fontFamily: "var(--font-mono), monospace"
+          }}
+        />
+
+        <button
+          onClick={handleGo}
+          title="Go to URL"
+          style={{
+            background: "none",
+            border: "1px solid var(--border)",
+            borderRadius: "4px",
+            color: "var(--primary)",
+            cursor: "pointer",
+            fontSize: "0.8rem",
+            padding: "0.25rem 0.5rem",
+            display: "flex",
+            alignItems: "center",
+            backgroundColor: "rgba(255,255,255,0.02)"
+          }}
+        >
+          ➔
+        </button>
+
+        <button
+          onClick={handleOpenExternal}
+          title="Open in External Browser"
+          style={{
+            background: "none",
+            border: "1px solid var(--border)",
+            borderRadius: "4px",
+            color: "var(--muted)",
+            cursor: "pointer",
+            fontSize: "0.85rem",
+            padding: "0.25rem 0.5rem",
+            display: "flex",
+            alignItems: "center",
+            backgroundColor: "rgba(255,255,255,0.02)"
+          }}
+          onMouseEnter={(e) => e.currentTarget.style.color = "var(--foreground)"}
+          onMouseLeave={(e) => e.currentTarget.style.color = "var(--muted)"}
+        >
+          🌐
+        </button>
+      </div>
+
+      {/* Frame Wrapper */}
+      <div style={{ flex: 1, position: "relative", width: "100%", height: "100%", backgroundColor: "#ffffff" }}>
+        <iframe
+          key={refreshKey}
+          src={iframeUrl}
+          style={{
+            width: "100%",
+            height: "100%",
+            border: "none",
+            backgroundColor: "#ffffff",
+          }}
+          sandbox="allow-scripts allow-same-origin allow-popups allow-forms"
+        />
+      </div>
+    </div>
+  );
+}
+
+interface DiffViewProps {
+  content: string;
+  filePath: string;
+}
+
+function DiffView({ content, filePath }: DiffViewProps) {
+  const lines = content.split(/\r?\n/);
+  
+  let oldLineNum = 0;
+  let newLineNum = 0;
+  
+  let additions = 0;
+  let deletions = 0;
+  
+  const parsedLines = lines.map((line) => {
+    let type: 'meta' | 'header' | 'hunk' | 'addition' | 'deletion' | 'normal' = 'normal';
+    let lineContent = line;
+    let oldNum: number | null = null;
+    let newNum: number | null = null;
+    
+    if (line.startsWith("diff --git") || line.startsWith("index ") || line.startsWith("--- ") || line.startsWith("+++ ")) {
+      type = 'header';
+    } else if (line.startsWith("@@")) {
+      type = 'hunk';
+      const match = line.match(/^@@\s+-(\d+)(?:,\d+)?\s+\+(\d+)(?:,\d+)?\s+@@/);
+      if (match) {
+        oldLineNum = parseInt(match[1], 10);
+        newLineNum = parseInt(match[2], 10);
+      }
+    } else if (line.startsWith("+")) {
+      type = 'addition';
+      lineContent = line.substring(1);
+      newNum = newLineNum++;
+      additions++;
+    } else if (line.startsWith("-")) {
+      type = 'deletion';
+      lineContent = line.substring(1);
+      oldNum = oldLineNum++;
+      deletions++;
+    } else {
+      type = 'normal';
+      if (line.startsWith(" ")) {
+        lineContent = line.substring(1);
+      }
+      if (oldLineNum > 0) {
+        oldNum = oldLineNum++;
+      }
+      if (newLineNum > 0) {
+        newNum = newLineNum++;
+      }
+    }
+    
+    return {
+      type,
+      content: lineContent,
+      oldNum,
+      newNum,
+      raw: line
+    };
+  });
+
+  return (
+    <div style={{ display: "flex", flexDirection: "column", height: "100%", backgroundColor: "#0b101b" }}>
+      <div style={{
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "space-between",
+        padding: "0.5rem 1rem",
+        backgroundColor: "#05070a",
+        borderBottom: "1px solid var(--border)",
+      }}>
+        <div style={{ display: "flex", alignItems: "center", gap: "0.5rem" }}>
+          <span style={{ fontSize: "1rem" }}>📄</span>
+          <span style={{ fontWeight: 600, fontSize: "0.85rem", color: "var(--foreground)", fontFamily: "var(--font-mono)" }}>
+            {filePath}
+          </span>
+        </div>
+        <div style={{ display: "flex", alignItems: "center", gap: "0.75rem", fontSize: "0.75rem" }}>
+          {additions > 0 && (
+            <span style={{ color: "#4ade80", backgroundColor: "rgba(74, 222, 128, 0.1)", padding: "0.15rem 0.4rem", borderRadius: "4px", fontWeight: 600 }}>
+              +{additions} lines
+            </span>
+          )}
+          {deletions > 0 && (
+            <span style={{ color: "#f87171", backgroundColor: "rgba(248, 113, 113, 0.1)", padding: "0.15rem 0.4rem", borderRadius: "4px", fontWeight: 600 }}>
+              -{deletions} lines
+            </span>
+          )}
+          <span style={{ color: "var(--muted)" }}>
+            {parsedLines.length} lines in diff
+          </span>
+        </div>
+      </div>
+      
+      <div style={{ flex: 1, overflow: "auto", padding: "0.5rem 0" }}>
+        <table style={{ width: "100%", borderCollapse: "collapse", fontFamily: "var(--font-mono), monospace", fontSize: "0.8rem", lineHeight: 1.5 }}>
+          <tbody>
+            {parsedLines.map((lineObj, idx) => {
+              if (lineObj.type === 'header') {
+                return (
+                  <tr key={idx} style={{ backgroundColor: "rgba(255,255,255,0.02)" }}>
+                    <td colSpan={4} style={{ color: "var(--muted)", padding: "0.25rem 1rem", fontSize: "0.75rem", borderBottom: "1px solid rgba(255,255,255,0.03)" }}>
+                      {lineObj.raw}
+                    </td>
+                  </tr>
+                );
+              }
+              if (lineObj.type === 'hunk') {
+                return (
+                  <tr key={idx} style={{ backgroundColor: "rgba(96, 165, 250, 0.05)" }}>
+                    <td colSpan={2} style={{
+                      width: "80px",
+                      textAlign: "center",
+                      color: "rgba(96, 165, 250, 0.6)",
+                      borderRight: "1px solid rgba(96, 165, 250, 0.15)",
+                      userSelect: "none",
+                      padding: "0.25rem 0",
+                      fontSize: "0.7rem",
+                    }}>
+                      @@
+                    </td>
+                    <td style={{
+                      width: "25px",
+                      borderRight: "1px solid rgba(255, 255, 255, 0.05)",
+                    }}></td>
+                    <td style={{ color: "#60a5fa", padding: "0.25rem 1rem", fontStyle: "italic", fontSize: "0.75rem" }}>
+                      {lineObj.raw}
+                    </td>
+                  </tr>
+                );
+              }
+              
+              let rowBg = "transparent";
+              let codeColor = "var(--foreground)";
+              let sign = " ";
+              let signColor = "transparent";
+              
+              if (lineObj.type === 'addition') {
+                rowBg = "rgba(74, 222, 128, 0.08)";
+                codeColor = "#4ade80";
+                sign = "+";
+                signColor = "rgba(74, 222, 128, 0.4)";
+              } else if (lineObj.type === 'deletion') {
+                rowBg = "rgba(248, 113, 113, 0.08)";
+                codeColor = "#f87171";
+                sign = "-";
+                signColor = "rgba(248, 113, 113, 0.4)";
+              }
+              
+              return (
+                <tr key={idx} style={{ backgroundColor: rowBg }}>
+                  {/* Old line number */}
+                  <td style={{
+                    width: "40px",
+                    textAlign: "right",
+                    paddingRight: "0.75rem",
+                    color: "var(--muted)",
+                    opacity: lineObj.oldNum ? 0.6 : 0.2,
+                    userSelect: "none",
+                    borderRight: "1px solid rgba(255, 255, 255, 0.05)",
+                    fontSize: "0.75rem"
+                  }}>
+                    {lineObj.oldNum || ""}
+                  </td>
+                  {/* New line number */}
+                  <td style={{
+                    width: "40px",
+                    textAlign: "right",
+                    paddingRight: "0.75rem",
+                    color: "var(--muted)",
+                    opacity: lineObj.newNum ? 0.6 : 0.2,
+                    userSelect: "none",
+                    borderRight: "1px solid rgba(255, 255, 255, 0.05)",
+                    fontSize: "0.75rem"
+                  }}>
+                    {lineObj.newNum || ""}
+                  </td>
+                  {/* Sign (+ / -) */}
+                  <td style={{
+                    width: "25px",
+                    textAlign: "center",
+                    color: signColor,
+                    userSelect: "none",
+                    fontWeight: "bold",
+                    fontSize: "0.85rem",
+                    borderRight: "1px solid rgba(255, 255, 255, 0.05)",
+                  }}>
+                    {sign}
+                  </td>
+                  {/* Code line content */}
+                  <td style={{
+                    paddingLeft: "0.75rem",
+                    color: codeColor,
+                    whiteSpace: "pre-wrap",
+                    wordBreak: "break-all"
+                  }}>
+                    {lineObj.content}
+                  </td>
+                </tr>
+              );
+            })}
+          </tbody>
+        </table>
+      </div>
+    </div>
+  );
+}
+
+
 const commitTextareaStyle: React.CSSProperties = {
   width: "100%",
   minHeight: "60px",

package/src/app/components/TerminalConsole.tsx

@@ -25,9 +25,9 @@ export default function TerminalConsole({ sessionId, height = "400px", wsPort =
     // Initialize xterm
     const term = new Terminal({
       cursorBlink: true,
-      fontFamily: "var(--font-mono), monospace",
+      fontFamily: 'ui-monospace, SFMono-Regular, "SF Mono", Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
       fontSize: 13,
-      lineHeight: 1.4,
+      lineHeight: 1.2,
       scrollback: 5000,
       theme: {
         background: "#05070a",

package/src/app/layout.tsx

@@ -20,7 +20,6 @@ export const metadata: Metadata = {
     shortcut: "/logo.png",
     apple: "/logo.png",
   },
-  manifest: "/manifest.json",
 };
 
 export default function RootLayout({

package/src/app/page.tsx

@@ -145,11 +145,19 @@ export default function Home() {
     };
     initFetch();
     
-    // Register PWA Service Worker for standalone taskbar icon installation
+    // Unregister any active Service Workers to disable PWA interceptions
     if ('serviceWorker' in navigator) {
-      navigator.serviceWorker.register('/sw.js')
-        .then((reg) => console.log('Service Worker registered:', reg.scope))
-        .catch((err) => console.error('Service Worker registration failed:', err));
+      navigator.serviceWorker.getRegistrations().then((registrations) => {
+        for (const registration of registrations) {
+          registration.unregister()
+            .then((success) => {
+              if (success) {
+                console.log('Service Worker unregistered successfully.');
+              }
+            })
+            .catch((err) => console.error('Failed to unregister Service Worker:', err));
+        }
+      });
     }
 
     const interval = setInterval(fetchSessions, 4000);

package/src/lib/agents/AiderRunner.ts

@@ -6,9 +6,7 @@ import { AgentRunner, RunnerStatus } from "./AgentRunner";
 import { SessionPersister } from "./SessionPersister";
 
 function isWindows(): boolean {
-  if (typeof process === "undefined") return false;
-  const key = Object.keys(process).find(k => k.startsWith("plat") && k.endsWith("form"));
-  return !!key && (process as unknown as Record<string, unknown>)[key] === "win32";
+  return typeof process !== "undefined" && process.platform === "win32";
 }
 
 function findGitBash(): string | null {
@@ -106,12 +104,14 @@ export class AiderRunner extends AgentRunner {
     this.appendLog(`\x1b[1;36m       NEURALLOOM AIDER AGENT ROUTE (${this.type.toUpperCase()})    \x1b[0m\r\n`);
     this.appendLog("\x1b[1;35m==================================================\x1b[0m\r\n");
 
-    const bashPath = findGitBash();
-    if (!bashPath) {
+    const useCmd = isWindows();
+    const shellPath = useCmd ? (process.env.COMSPEC || "cmd.exe") : findGitBash();
+    if (!shellPath) {
       this.status = 'stopped';
-      this.appendLog("\x1b[1;31m[System Error] Git Bash not found. Cannot spawn terminal.\x1b[0m\r\n");
+      this.appendLog("\x1b[1;31m[System Error] Shell not found. Cannot spawn terminal.\x1b[0m\r\n");
       return;
     }
+    const shellArgs = useCmd ? ["/c"] : ["-c"];
 
     try {
       if (!this.ptyModule) {
@@ -214,7 +214,7 @@ export class AiderRunner extends AgentRunner {
 
         const dockerCmd = `docker run -it --name neural-loom-session-${this.id} --rm ${mountsStr} -w /workspace ${envFlagsStr} paulgauthier/aider ${modelFlag} ${extraFlags} --no-fancy-input ${loadAllFilesFlag}`.trim();
 
-        this.ptyProcess = this.ptyModule!.spawn(bashPath, ["-c", dockerCmd], {
+        this.ptyProcess = this.ptyModule!.spawn(shellPath, [...shellArgs, dockerCmd], {
           name: "xterm-256color",
           cols: 120,
           rows: 30,
@@ -245,7 +245,7 @@ export class AiderRunner extends AgentRunner {
         this.appendLog("[System] Spawning local Aider CLI...\r\n");
         const localCmd = `aider ${modelFlag} ${extraFlags} --no-fancy-input ${loadAllFilesFlag}`.trim();
 
-        this.ptyProcess = this.ptyModule!.spawn(bashPath, ["-c", localCmd], {
+        this.ptyProcess = this.ptyModule!.spawn(shellPath, [...shellArgs, localCmd], {
           name: "xterm-256color",
           cols: 120,
           rows: 30,