neural-loom 0.2.40 → 0.2.41

package/src/lib/agents/ClaudeRunner.ts

@@ -1,13 +1,13 @@
 import fs from "fs";
 import path from "path";
+import os from "os";
+import { execSync } from "child_process";
 import type { IPty } from "node-pty";
 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 {
@@ -60,12 +60,14 @@ export class ClaudeRunner extends AgentRunner {
     if (this.status === 'running') return;
 
     // Detect Git Bash on Windows
-    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. Please install Git for Windows.\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 {
       // Dynamic import to prevent bundler SSR/Turbopack errors on server start
@@ -96,24 +98,47 @@ export class ClaudeRunner extends AgentRunner {
         }
       }
 
-      const claudeCmd = `claude ${extraFlags}`.trim();
+      // Setup process environment with injected keys
+      const customEnv = {
+        ...process.env,
+        TERM: "xterm-256color",
+        COLORTERM: "truecolor",
+      } as Record<string, string>;
+
+      if (isWindows()) {
+        const vsNode = "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Microsoft\\VisualStudio\\NodeJs";
+        const localNpm = path.join(os.homedir(), "AppData", "Local", "npm");
+        const existingPath = process.env.Path || process.env.PATH || "";
+        const winPath = [vsNode, localNpm, existingPath].filter(Boolean).join(";");
+
+        for (const key of Object.keys(customEnv)) {
+          if (key.toLowerCase() === "path") {
+            delete customEnv[key];
+          }
+        }
+        customEnv.Path = winPath;
+        customEnv.PATH = winPath;
+      }
+
+      // Check if 'claude' command exists in PATH, fallback to npx if not
+      let baseCmd = "claude";
+      try {
+        const checkCmd = isWindows() ? "where.exe claude" : "which claude";
+        execSync(checkCmd, { env: customEnv, stdio: "ignore" });
+      } catch {
+        baseCmd = "npx -y @anthropic-ai/claude-code";
+      }
+
+      const claudeCmd = `${baseCmd} ${extraFlags}`.trim();
       this.appendLog(`[System] Spawning command: ${claudeCmd}\r\n`);
 
-      // Spawn bash and run 'claude' command
-      this.ptyProcess = this.ptyModule!.spawn(bashPath, ["-c", claudeCmd], {
+      // Spawn shell and run 'claude' command
+      this.ptyProcess = this.ptyModule!.spawn(shellPath, [...shellArgs, claudeCmd], {
         name: "xterm-256color",
         cols: 120,
         rows: 30,
         cwd: targetCwd,
-        env: {
-          ...process.env,
-          TERM: "xterm-256color",
-          COLORTERM: "truecolor",
-          // Inject custom path just in case child processes need Visual Studio Node on Windows
-          ...(isWindows() ? {
-            PATH: "C:\\Program Files\\Microsoft Visual Studio\\2022\\Community\\MSBuild\\Microsoft\\VisualStudio\\NodeJs;" + process.env.PATH
-          } : {})
-        },
+        env: customEnv,
       });
 
       // Capture output

package/src/lib/agents/DockerRunner.ts

@@ -5,9 +5,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 {

package/src/lib/agents/SSHRunner.ts

@@ -5,9 +5,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 {

package/src/lib/agents/ShellRunner.ts

@@ -4,9 +4,7 @@ import type { IPty } from "node-pty";
 import { AgentRunner, RunnerStatus } from "./AgentRunner";
 
 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 {

package/src/lib/agents/WebSocketServer.ts

@@ -44,11 +44,9 @@ export function initWebSocketServer(port = 3001, getSession?: (id: string) => Ag
         console.log(`[WebSocketServer] WebSocket gateway successfully listening on port ${currentPort}.`);
       });
 
-      wss.on("connection", (ws: WebSocket & { sessionId?: string }) => {
+      wss.on("connection", (ws: WebSocket & { sessionId?: string; outputListener?: (data: string) => void }) => {
         console.log("[WebSocketServer] New client connected via gateway.");
 
-        let activeSessionId: string | null = null;
-        let outputListener: ((data: string) => void) | null = null;
         let mockBuffer = "";
 
         ws.on("message", async (rawMsg) => {
@@ -58,20 +56,29 @@ export function initWebSocketServer(port = 3001, getSession?: (id: string) => Ag
             // Client handshake to establish connection to a specific session
             if (msg.type === "handshake") {
               const { sessionId } = msg;
+
+              // Clean up previous registration for this connection if it exists
+              if (ws.sessionId && ws.outputListener) {
+                const oldSession = getSessionCallback ? getSessionCallback(ws.sessionId) : null;
+                if (oldSession) {
+                  oldSession.offOutput(ws.outputListener);
+                }
+              }
+
               const session = getSessionCallback ? getSessionCallback(sessionId) : null;
 
               if (session) {
-                activeSessionId = sessionId;
                 ws.sessionId = sessionId;
                 console.log(`[WebSocketServer] Client connected to active session: ${sessionId}`);
 
                 // Subscribe to runner output events
-                outputListener = (data: string) => {
+                const listener = (data: string) => {
                   if (ws.readyState === WebSocket.OPEN) {
                     ws.send(JSON.stringify({ type: "output", data }));
                   }
                 };
-                session.onOutput(outputListener);
+                ws.outputListener = listener;
+                session.onOutput(listener);
 
                 // Send handshake acknowledgment and full historical logs
                 ws.send(
@@ -87,8 +94,8 @@ export function initWebSocketServer(port = 3001, getSession?: (id: string) => Ag
             }
 
             // User terminal input routing
-            if (msg.type === "input" && activeSessionId) {
-              const session = getSessionCallback ? getSessionCallback(activeSessionId) : null;
+            if (msg.type === "input" && ws.sessionId) {
+              const session = getSessionCallback ? getSessionCallback(ws.sessionId) : null;
               if (session && session.status === "running") {
                 if (session.type === "mock") {
                   // Buffer input for simulated command parsing in MockRunner
@@ -115,9 +122,9 @@ export function initWebSocketServer(port = 3001, getSession?: (id: string) => Ag
             }
 
             // User terminal resize routing
-            if (msg.type === "resize" && activeSessionId) {
+            if (msg.type === "resize" && ws.sessionId) {
               const { cols, rows } = msg;
-              const session = getSessionCallback ? getSessionCallback(activeSessionId) : null;
+              const session = getSessionCallback ? getSessionCallback(ws.sessionId) : null;
               if (session) {
                 session.resize(cols, rows);
               }
@@ -128,10 +135,10 @@ export function initWebSocketServer(port = 3001, getSession?: (id: string) => Ag
         });
 
         ws.on("close", () => {
-          if (activeSessionId && outputListener) {
-            const session = getSessionCallback ? getSessionCallback(activeSessionId) : null;
+          if (ws.sessionId && ws.outputListener) {
+            const session = getSessionCallback ? getSessionCallback(ws.sessionId) : null;
             if (session) {
-              session.offOutput(outputListener);
+              session.offOutput(ws.outputListener);
             }
           }
           console.log("[WebSocketServer] Client connection closed.");

package/.next/BUILD_ID

@@ -1 +0,0 @@
-5uGIuH8oXybqivkeHIrqb

package/.next/app-path-routes-manifest.json

@@ -1,20 +0,0 @@
-{
-  "/_global-error/page": "/_global-error",
-  "/_not-found/page": "/_not-found",
-  "/api/context/aider/route": "/api/context/aider",
-  "/api/context/claude/route": "/api/context/claude",
-  "/api/context/route": "/api/context",
-  "/api/context/ssh/route": "/api/context/ssh",
-  "/api/files/route": "/api/files",
-  "/api/git/route": "/api/git",
-  "/api/recents/route": "/api/recents",
-  "/api/sessions/inject/route": "/api/sessions/inject",
-  "/api/sessions/input/route": "/api/sessions/input",
-  "/api/sessions/launch/route": "/api/sessions/launch",
-  "/api/sessions/route": "/api/sessions",
-  "/api/sessions/scope/route": "/api/sessions/scope",
-  "/api/sessions/start/route": "/api/sessions/start",
-  "/api/sessions/stats/route": "/api/sessions/stats",
-  "/api/sessions/stop/route": "/api/sessions/stop",
-  "/page": "/"
-}

package/.next/diagnostics/route-bundle-stats.json

@@ -1,25 +0,0 @@
-[
-  {
-    "route": "/",
-    "firstLoadUncompressedJsBytes": 536938,
-    "firstLoadChunkPaths": [
-      ".next\\static\\chunks\\0dbhjjzl8qfwv.js",
-      ".next\\static\\chunks\\07-tub5vqy.fk.js",
-      ".next\\static\\chunks\\0fpki3y6aj230.js",
-      ".next\\static\\chunks\\140ovxvjat1ch.js",
-      ".next\\static\\chunks\\07lhk_q6pmm3r.js",
-      ".next\\static\\chunks\\turbopack-08fpdsd.-ns2y.js"
-    ]
-  },
-  {
-    "route": "/_not-found",
-    "firstLoadUncompressedJsBytes": 514388,
-    "firstLoadChunkPaths": [
-      ".next\\static\\chunks\\0dbhjjzl8qfwv.js",
-      ".next\\static\\chunks\\0fpki3y6aj230.js",
-      ".next\\static\\chunks\\140ovxvjat1ch.js",
-      ".next\\static\\chunks\\07lhk_q6pmm3r.js",
-      ".next\\static\\chunks\\turbopack-08fpdsd.-ns2y.js"
-    ]
-  }
-]

package/.next/export-marker.json

@@ -1,6 +0,0 @@
-{
-  "version": 1,
-  "hasExportPathMap": false,
-  "exportTrailingSlash": false,
-  "isNextImageImported": false
-}

package/.next/images-manifest.json

@@ -1,68 +0,0 @@
-{
-  "version": 1,
-  "images": {
-    "deviceSizes": [
-      640,
-      750,
-      828,
-      1080,
-      1200,
-      1920,
-      2048,
-      3840
-    ],
-    "imageSizes": [
-      32,
-      48,
-      64,
-      96,
-      128,
-      256,
-      384
-    ],
-    "path": "/_next/image",
-    "loader": "default",
-    "loaderFile": "",
-    "domains": [],
-    "disableStaticImages": false,
-    "minimumCacheTTL": 14400,
-    "formats": [
-      "image/webp"
-    ],
-    "maximumRedirects": 3,
-    "maximumResponseBody": 50000000,
-    "dangerouslyAllowLocalIP": false,
-    "dangerouslyAllowSVG": false,
-    "contentSecurityPolicy": "script-src 'none'; frame-src 'none'; sandbox;",
-    "contentDispositionType": "attachment",
-    "localPatterns": [
-      {
-        "pathname": "^(?:(?!(?:^|\\/)\\.{1,2}(?:\\/|$))(?:(?:(?!(?:^|\\/)\\.{1,2}(?:\\/|$)).)*?)\\/?)$",
-        "search": ""
-      }
-    ],
-    "remotePatterns": [],
-    "qualities": [
-      75
-    ],
-    "unoptimized": false,
-    "customCacheHandler": false,
-    "sizes": [
-      640,
-      750,
-      828,
-      1080,
-      1200,
-      1920,
-      2048,
-      3840,
-      32,
-      48,
-      64,
-      96,
-      128,
-      256,
-      384
-    ]
-  }
-}

package/.next/prerender-manifest.json

@@ -1,85 +0,0 @@
-{
-  "version": 4,
-  "routes": {
-    "/": {
-      "experimentalBypassFor": [
-        {
-          "type": "header",
-          "key": "next-action"
-        },
-        {
-          "type": "header",
-          "key": "content-type",
-          "value": "multipart/form-data;.*"
-        }
-      ],
-      "initialRevalidateSeconds": false,
-      "srcRoute": "/",
-      "dataRoute": "/index.rsc",
-      "allowHeader": [
-        "host",
-        "x-matched-path",
-        "x-prerender-revalidate",
-        "x-prerender-revalidate-if-generated",
-        "x-next-revalidated-tags",
-        "x-next-revalidate-tag-token"
-      ]
-    },
-    "/_global-error": {
-      "experimentalBypassFor": [
-        {
-          "type": "header",
-          "key": "next-action"
-        },
-        {
-          "type": "header",
-          "key": "content-type",
-          "value": "multipart/form-data;.*"
-        }
-      ],
-      "initialRevalidateSeconds": false,
-      "srcRoute": "/_global-error",
-      "dataRoute": "/_global-error.rsc",
-      "allowHeader": [
-        "host",
-        "x-matched-path",
-        "x-prerender-revalidate",
-        "x-prerender-revalidate-if-generated",
-        "x-next-revalidated-tags",
-        "x-next-revalidate-tag-token"
-      ]
-    },
-    "/_not-found": {
-      "initialStatus": 404,
-      "experimentalBypassFor": [
-        {
-          "type": "header",
-          "key": "next-action"
-        },
-        {
-          "type": "header",
-          "key": "content-type",
-          "value": "multipart/form-data;.*"
-        }
-      ],
-      "initialRevalidateSeconds": false,
-      "srcRoute": "/_not-found",
-      "dataRoute": "/_not-found.rsc",
-      "allowHeader": [
-        "host",
-        "x-matched-path",
-        "x-prerender-revalidate",
-        "x-prerender-revalidate-if-generated",
-        "x-next-revalidated-tags",
-        "x-next-revalidate-tag-token"
-      ]
-    }
-  },
-  "dynamicRoutes": {},
-  "notFoundRoutes": [],
-  "preview": {
-    "previewModeId": "bbfc1b1aba1e28878cd386df9646fb77",
-    "previewModeSigningKey": "2141cd2ce4e2ff748107a61645b3daa7d420b95f846ca67c449a521b7459ed3c",
-    "previewModeEncryptionKey": "4fb87ad6d0cdecfde6bfe26b7601a6933ae11f2c38e5982a057ac21b5b49c046"
-  }
-}