@surething/cockpit 1.0.261 → 1.0.263

package/dist/wsServer.mjs

@@ -4,7 +4,7 @@ import {
   getRunSnapshot,
   recoverStashedCodexRollouts,
   recoverStashedTranscripts
-} from "./chunk-B5LXMESP.mjs";
+} from "./chunk-FBAFMLUC.mjs";
 import {
   addExitListener,
   addOutputListener,
@@ -20,7 +20,7 @@ import {
   resolvePendingRequest,
   unregisterBrowser,
   writeStdinToCommand
-} from "./chunk-CLPJYIFC.mjs";
+} from "./chunk-H6AI4XJC.mjs";
 import {
   AppError,
   Effect_exports,
@@ -36,7 +36,7 @@ import {
   ValidationError,
   WSError,
   sanitizedSpawnEnv
-} from "./chunk-TU3GL2HK.mjs";
+} from "./chunk-ZE2JXL6E.mjs";
 import "./chunk-7P6ASYW6.mjs";
 
 // src/lib/wsServer.ts
@@ -717,7 +717,7 @@ var handleJupyter = (conn, bubbleId, cwd) => Effect_exports.gen(function* () {
     Effect_exports.annotateLogs("cwd", cwd)
   );
   const { kernelManager } = yield* Effect_exports.tryPromise({
-    try: () => import("./server-2UJDVZ32.mjs"),
+    try: () => import("./server-HRP33LCV.mjs"),
     catch: (cause) => new AppError({
       message: "failed to import kernel manager",
       cause
@@ -844,13 +844,85 @@ var runJupyterHandler = (ws, bubbleId, cwd) => {
 };
 
 // src/lib/effect/terminalHandler.ts
-import { spawn, execFileSync, execSync } from "child_process";
+import { spawn as spawn2, execSync as execSync2 } from "child_process";
 import * as nodePty from "node-pty";
+
+// src/lib/shell.ts
+import { existsSync as existsSync3 } from "fs";
+import { execSync, spawn } from "child_process";
+var bashCache;
+var gitBashCache;
+var pwshCache;
+function resolveGitBash() {
+  if (!isWindows) return null;
+  if (gitBashCache !== void 0) return gitBashCache;
+  const envShell = process.env.SHELL;
+  const candidates = [
+    ...envShell && /bash(\.exe)?$/i.test(envShell) ? [envShell] : [],
+    "C:\\Program Files\\Git\\bin\\bash.exe",
+    "C:\\Program Files (x86)\\Git\\bin\\bash.exe",
+    ...process.env.ProgramFiles ? [`${process.env.ProgramFiles}\\Git\\bin\\bash.exe`] : []
+  ];
+  for (const c of candidates) {
+    if (existsSync3(c)) return gitBashCache = c;
+  }
+  return null;
+}
+function resolveWindowsPowerShell() {
+  if (pwshCache !== void 0) return pwshCache;
+  try {
+    const found = execSync("where pwsh", { encoding: "utf-8", timeout: 3e3 }).trim().split(/\r?\n/)[0];
+    if (found && existsSync3(found)) return pwshCache = found;
+  } catch {
+  }
+  return pwshCache = "powershell.exe";
+}
+function resolveBashShell() {
+  if (!isWindows) return getDefaultShell();
+  if (bashCache !== void 0) return bashCache;
+  const gitBash = resolveGitBash();
+  if (gitBash) return bashCache = gitBash;
+  try {
+    const found = execSync("where bash", { encoding: "utf-8", timeout: 3e3 }).trim().split(/\r?\n/)[0];
+    if (found && existsSync3(found)) return bashCache = found;
+  } catch {
+  }
+  return null;
+}
+function killProcessTree(child) {
+  const pid = child.pid;
+  if (!pid) return;
+  if (isWindows) {
+    try {
+      spawn("taskkill", ["/PID", String(pid), "/T", "/F"], { stdio: "ignore" });
+    } catch {
+    }
+    return;
+  }
+  const signal = (sig) => {
+    try {
+      process.kill(-pid, sig);
+    } catch {
+      try {
+        process.kill(pid, sig);
+      } catch {
+      }
+    }
+  };
+  signal("SIGTERM");
+  const timer = setTimeout(() => {
+    if (child.exitCode === null && child.signalCode === null) signal("SIGKILL");
+  }, 1e3);
+  if (typeof timer.unref === "function") timer.unref();
+  child.once("exit", () => clearTimeout(timer));
+}
+
+// src/lib/effect/terminalHandler.ts
 var HEARTBEAT5 = Schedule_exports.spaced("30 seconds");
 var OPEN_PREFERRED_SHELL_COMMAND = "__cockpit_open_preferred_shell__";
 function commandPath(command) {
   try {
-    const found = execSync(`command -v ${command}`, {
+    const found = execSync2(`command -v ${command}`, {
       encoding: "utf-8",
       timeout: 3e3
     }).trim().split(/\r?\n/)[0];
@@ -865,66 +937,83 @@ function loginShellArgs(shell) {
 }
 function resolvePreferredPtyShell(cwd) {
   if (isWindows) {
-    try {
-      const wslShell = execFileSync(
-        "wsl.exe",
-        [
-          "sh",
-          "-lc",
-          "command -v zsh >/dev/null 2>&1 && printf zsh || { command -v bash >/dev/null 2>&1 && printf bash; }"
-        ],
-        { encoding: "utf-8", timeout: 3e3 }
-      ).trim();
-      if (wslShell === "zsh" || wslShell === "bash") {
-        return {
-          file: "wsl.exe",
-          args: ["--cd", cwd, "--exec", wslShell, ...loginShellArgs(wslShell)],
-          cwd: process.cwd(),
-          name: wslShell
-        };
-      }
-    } catch {
-    }
-  } else {
-    for (const shell of ["zsh", "bash", "sh"]) {
-      const file = commandPath(shell);
-      if (file) return { file, args: loginShellArgs(shell), cwd, name: shell };
+    const gitBash = resolveGitBash();
+    if (gitBash) {
+      return { file: gitBash, args: ["--login", "-i"], cwd, name: "bash" };
     }
+    const pwsh = resolveWindowsPowerShell();
+    const pwshName = pwsh.split(/[\\/]/).pop()?.replace(/\.exe$/i, "") || "powershell";
+    return { file: pwsh, args: ["-NoLogo"], cwd, name: pwshName };
+  }
+  for (const shell of ["zsh", "bash", "sh"]) {
+    const file = commandPath(shell);
+    if (file) return { file, args: loginShellArgs(shell), cwd, name: shell };
   }
   const fallback = getDefaultShell();
   const fallbackName = fallback.split(/[\\/]/).pop() || fallback;
   return {
     file: fallback,
-    args: isWindows ? [] : loginShellArgs(fallbackName),
+    args: loginShellArgs(fallbackName),
     cwd,
     name: fallbackName
   };
 }
+function resolveCommandShell() {
+  if (!isWindows) return getDefaultShell();
+  const bash = resolveBashShell();
+  if (bash) return bash;
+  throw new Error(
+    "bash not found \u2014 install Git Bash or WSL on Windows to run commands"
+  );
+}
+function windowsChildPidMap() {
+  const out = execSync2(
+    'powershell -NoProfile -NonInteractive -Command "Get-CimInstance Win32_Process | Select-Object ProcessId,ParentProcessId | ConvertTo-Csv -NoTypeInformation"',
+    { encoding: "utf-8", timeout: 5e3 }
+  );
+  const byParent = /* @__PURE__ */ new Map();
+  for (const line of out.split(/\r?\n/).slice(1)) {
+    const m = line.match(/^"?(\d+)"?,"?(\d+)"?/);
+    if (!m) continue;
+    const child = Number(m[1]);
+    const parent = Number(m[2]);
+    const bucket = byParent.get(parent);
+    if (bucket) bucket.push(child);
+    else byParent.set(parent, [child]);
+  }
+  return byParent;
+}
 function getDescendantPids(pid) {
   const descendants = [];
+  if (isWindows) {
+    let byParent;
+    try {
+      byParent = windowsChildPidMap();
+    } catch {
+      return descendants;
+    }
+    const seen = /* @__PURE__ */ new Set([pid]);
+    const walk = (parentPid) => {
+      for (const child of byParent.get(parentPid) ?? []) {
+        if (seen.has(child)) continue;
+        seen.add(child);
+        walk(child);
+        descendants.push(child);
+      }
+    };
+    walk(pid);
+    return descendants;
+  }
   function collect(parentPid) {
     try {
-      let result;
-      if (isWindows) {
-        result = execSync(
-          `wmic process where (ParentProcessId=${parentPid}) get ProcessId /format:list`,
-          { encoding: "utf-8", timeout: 3e3 }
-        ).trim();
-        const childPids = result.split("\n").map((l) => l.replace(/\r/, "").match(/ProcessId=(\d+)/)?.[1]).filter(Boolean).map(Number);
-        for (const cp of childPids) {
-          collect(cp);
-          descendants.push(cp);
-        }
-      } else {
-        result = execSync(`pgrep -P ${parentPid}`, {
-          encoding: "utf-8",
-          timeout: 3e3
-        }).trim();
-        const childPids = result.split("\n").filter(Boolean).map(Number);
-        for (const cp of childPids) {
-          collect(cp);
-          descendants.push(cp);
-        }
+      const result = execSync2(`pgrep -P ${parentPid}`, {
+        encoding: "utf-8",
+        timeout: 3e3
+      }).trim();
+      const childPids = result.split("\n").filter(Boolean).map(Number);
+      for (const cp of childPids) {
+        collect(cp);
+        descendants.push(cp);
       }
     } catch {
     }
@@ -1062,13 +1151,12 @@ var dispatchMessage = (msg, projectCwd, registry, send) => Effect_exports.sync((
       ...env
     };
     try {
-      const userShell = getDefaultShell();
       if (usePty) {
         const ptyEnv = { PATH: getDefaultPath() };
         for (const [k, v] of Object.entries(childEnv)) {
           if (v !== void 0) ptyEnv[k] = v;
         }
-        const ptyTarget = command === OPEN_PREFERRED_SHELL_COMMAND ? resolvePreferredPtyShell(cwd) : { file: userShell, args: ["--login", "-c", command], cwd, name: command };
+        const ptyTarget = command === OPEN_PREFERRED_SHELL_COMMAND ? resolvePreferredPtyShell(cwd) : { file: resolveCommandShell(), args: ["--login", "-c", command], cwd, name: command };
         const ptyProcess = nodePty.spawn(
           ptyTarget.file,
           ptyTarget.args,
@@ -1080,7 +1168,6 @@ var dispatchMessage = (msg, projectCwd, registry, send) => Effect_exports.sync((
             env: ptyEnv
           }
         );
-        const dummyChild = spawn("true", [], { stdio: "ignore" });
         registerCommand({
           commandId,
           command: ptyTarget.name,
@@ -1088,7 +1175,6 @@ var dispatchMessage = (msg, projectCwd, registry, send) => Effect_exports.sync((
           projectCwd,
           tabId,
           pid: ptyProcess.pid,
-          process: dummyChild,
           ptyProcess,
           usePty: true,
           timestamp: (/* @__PURE__ */ new Date()).toISOString(),
@@ -1099,7 +1185,7 @@ var dispatchMessage = (msg, projectCwd, registry, send) => Effect_exports.sync((
           attachPtyListeners(registry, send, commandId, ptyProcess)
         );
       } else {
-        const child = spawn(userShell, ["--login", "-c", command], {
+        const child = spawn2(resolveCommandShell(), ["--login", "-c", command], {
           cwd,
           env: childEnv,
           stdio: ["pipe", "pipe", "pipe"],
@@ -1168,7 +1254,7 @@ var dispatchMessage = (msg, projectCwd, registry, send) => Effect_exports.sync((
       Effect_exports.runFork(
         attachPtyListeners(registry, send, commandId, cmd.ptyProcess)
       );
-    } else {
+    } else if (cmd.process) {
       Effect_exports.runFork(
         attachPipeListeners(registry, send, commandId, cmd.process)
       );
@@ -1270,60 +1356,6 @@ var runTerminalHandler = (ws, projectCwd) => {
 
 // src/lib/effect/bashStreamHandler.ts
 import { spawn as spawn4 } from "child_process";
-
-// src/lib/shell.ts
-import { existsSync as existsSync3 } from "fs";
-import { execSync as execSync2, spawn as spawn3 } from "child_process";
-var bashCache;
-function resolveBashShell() {
-  if (!isWindows) return getDefaultShell();
-  if (bashCache !== void 0) return bashCache;
-  const envShell = process.env.SHELL;
-  const candidates = [
-    ...envShell && /bash(\.exe)?$/i.test(envShell) ? [envShell] : [],
-    "C:\\Program Files\\Git\\bin\\bash.exe",
-    "C:\\Program Files (x86)\\Git\\bin\\bash.exe",
-    ...process.env.ProgramFiles ? [`${process.env.ProgramFiles}\\Git\\bin\\bash.exe`] : []
-  ];
-  for (const c of candidates) {
-    if (existsSync3(c)) return bashCache = c;
-  }
-  try {
-    const found = execSync2("where bash", { encoding: "utf-8", timeout: 3e3 }).trim().split(/\r?\n/)[0];
-    if (found && existsSync3(found)) return bashCache = found;
-  } catch {
-  }
-  return null;
-}
-function killProcessTree(child) {
-  const pid = child.pid;
-  if (!pid) return;
-  if (isWindows) {
-    try {
-      spawn3("taskkill", ["/PID", String(pid), "/T", "/F"], { stdio: "ignore" });
-    } catch {
-    }
-    return;
-  }
-  const signal = (sig) => {
-    try {
-      process.kill(-pid, sig);
-    } catch {
-      try {
-        process.kill(pid, sig);
-      } catch {
-      }
-    }
-  };
-  signal("SIGTERM");
-  const timer = setTimeout(() => {
-    if (child.exitCode === null && child.signalCode === null) signal("SIGKILL");
-  }, 1e3);
-  if (typeof timer.unref === "function") timer.unref();
-  child.once("exit", () => clearTimeout(timer));
-}
-
-// src/lib/effect/bashStreamHandler.ts
 var HEARTBEAT6 = Schedule_exports.spaced("30 seconds");
 function killChild(child) {
   killProcessTree(child);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@surething/cockpit",
-  "version": "1.0.261",
+  "version": "1.0.263",
   "description": "The open-source Claude Code GUI — an IDE-like workbench for parallel AI coding. Drive Claude (default), Codex, DeepSeek, Kimi, or local Ollama in tabs. Terminal, browser & DB bubbles, code review. Self-host on a shared dev box — a seat for every teammate. Local-first, MIT.",
   "author": "Robert",
   "license": "MIT",