@surething/cockpit 1.0.244 → 1.0.245

package/dist/wsServer.mjs

@@ -2,7 +2,7 @@ import {
   addRunListener,
   getGlobalSessionsSnapshot,
   getRunSnapshot
-} from "./chunk-3X4GQZL4.mjs";
+} from "./chunk-RUNUGDPP.mjs";
 import {
   addExitListener,
   addOutputListener,
@@ -18,7 +18,7 @@ import {
   resolvePendingRequest,
   unregisterBrowser,
   writeStdinToCommand
-} from "./chunk-FMJUH423.mjs";
+} from "./chunk-GOOVG5NZ.mjs";
 import {
   AppError,
   Effect_exports,
@@ -33,7 +33,7 @@ import {
   Stream_exports,
   ValidationError,
   WSError
-} from "./chunk-BFESJMNO.mjs";
+} from "./chunk-BRW4ZEIC.mjs";
 import "./chunk-7P6ASYW6.mjs";
 
 // src/lib/wsServer.ts
@@ -665,7 +665,7 @@ var handleJupyter = (conn, bubbleId, cwd) => Effect_exports.gen(function* () {
     Effect_exports.annotateLogs("cwd", cwd)
   );
   const { kernelManager } = yield* Effect_exports.tryPromise({
-    try: () => import("./server-HKW65PHP.mjs"),
+    try: () => import("./server-SVZ344NE.mjs"),
     catch: (cause) => new AppError({
       message: "failed to import kernel manager",
       cause
@@ -1162,8 +1162,182 @@ var runTerminalHandler = (ws, projectCwd) => {
   });
 };
 
-// src/lib/effect/sessionStreamHandler.ts
+// 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);
+}
+var handleBash = (conn, defaultCwd) => Effect_exports.gen(function* () {
+  yield* Effect_exports.logInfo("ws/bash start").pipe(
+    Effect_exports.annotateLogs("cwd", defaultCwd ?? "")
+  );
+  const children = /* @__PURE__ */ new Map();
+  yield* Effect_exports.addFinalizer(
+    () => Effect_exports.sync(() => {
+      for (const child of children.values()) killChild(child);
+      children.clear();
+    })
+  );
+  const shell = resolveBashShell();
+  const startExec = (msg) => {
+    const id = msg.id;
+    const command = msg.command;
+    const cwd = msg.cwd || defaultCwd || process.cwd();
+    if (!id || typeof id !== "string") return;
+    if (!shell) {
+      Effect_exports.runFork(
+        conn.send({
+          type: "error",
+          id: id || "",
+          message: "bash not found \u2014 install Git Bash or WSL on Windows"
+        })
+      );
+      return;
+    }
+    if (!command || typeof command !== "string") {
+      Effect_exports.runFork(
+        conn.send({ type: "error", id: id || "", message: "missing command" })
+      );
+      return;
+    }
+    if (children.has(id)) {
+      Effect_exports.runFork(
+        conn.send({ type: "error", id, message: "duplicate command id" })
+      );
+      return;
+    }
+    let child;
+    try {
+      child = spawn4(shell, ["--login", "-c", command], {
+        cwd,
+        env: { ...process.env, FORCE_COLOR: "0" },
+        stdio: ["ignore", "pipe", "pipe"],
+        detached: true
+      });
+    } catch (e) {
+      Effect_exports.runFork(
+        conn.send({ type: "error", id, message: e.message })
+      );
+      return;
+    }
+    children.set(id, child);
+    child.stdout?.on("data", (d) => {
+      Effect_exports.runFork(conn.send({ type: "stdout", id, data: d.toString() }));
+    });
+    child.stderr?.on("data", (d) => {
+      Effect_exports.runFork(conn.send({ type: "stderr", id, data: d.toString() }));
+    });
+    child.on("close", (code) => {
+      if (children.get(id) === child) children.delete(id);
+      Effect_exports.runFork(conn.send({ type: "exit", id, code: code ?? 0 }));
+    });
+    child.on("error", (err) => {
+      if (children.get(id) === child) children.delete(id);
+      Effect_exports.runFork(conn.send({ type: "error", id, message: err.message }));
+    });
+  };
+  const dispatch = (raw) => Effect_exports.sync(() => {
+    const msg = raw;
+    const type = msg.type;
+    if (type === "exec") {
+      startExec(msg);
+    } else if (type === "kill") {
+      const id = msg.id;
+      const child = children.get(id);
+      if (child) {
+        children.delete(id);
+        killChild(child);
+      }
+    }
+  });
+  yield* Effect_exports.forkScoped(
+    Effect_exports.repeat(conn.send({ type: "ping" }), HEARTBEAT6)
+  );
+  yield* conn.messages.pipe(
+    Stream_exports.mapEffect(dispatch),
+    Stream_exports.runDrain
+  );
+}).pipe(Effect_exports.withSpan("ws.handleBash", { attributes: { cwd: defaultCwd ?? "" } }));
+var runBashHandler = (ws, cwd) => {
+  const program = Effect_exports.scoped(
+    Effect_exports.gen(function* () {
+      const conn = yield* fromWebSocket(ws, "bash");
+      yield* handleBash(conn, cwd);
+    })
+  ).pipe(
+    Effect_exports.catchTag(
+      "ValidationError",
+      (e) => Effect_exports.sync(() => ws.close(4400, e.reason))
+    ),
+    Effect_exports.catchAll(
+      (e) => Effect_exports.logError("[ws/bash]").pipe(
+        Effect_exports.annotateLogs("error", JSON.stringify(e))
+      )
+    )
+  );
+  const fiber = Effect_exports.runFork(program);
+  ws.on("close", () => {
+    Effect_exports.runFork(fiber.interruptAsFork(fiber.id()));
+  });
+};
+
+// src/lib/effect/sessionStreamHandler.ts
+var HEARTBEAT7 = Schedule_exports.spaced("30 seconds");
 var handleSessionStream = (conn, sessionId) => Effect_exports.gen(function* () {
   if (!sessionId) {
     return yield* Effect_exports.fail(
@@ -1195,7 +1369,7 @@ var handleSessionStream = (conn, sessionId) => Effect_exports.gen(function* () {
     yield* conn.send({ type: "run-idle" });
   }
   yield* Effect_exports.forkScoped(
-    Effect_exports.repeat(conn.send({ type: "ping" }), HEARTBEAT6)
+    Effect_exports.repeat(conn.send({ type: "ping" }), HEARTBEAT7)
   );
   yield* Stream_exports.fromQueue(queue).pipe(
     Stream_exports.filter((ev) => ev.seq > snapshotSeq),
@@ -3971,6 +4145,16 @@ function broadcastToGlobalState(msg) {
 
 // src/lib/wsServer.ts
 wireCodeIndexToFileWatcher();
+function isSameOriginWs(req) {
+  const origin = req.headers.origin;
+  const host = req.headers.host;
+  if (!origin || !host) return false;
+  try {
+    return new URL(origin).host === host;
+  } catch {
+    return false;
+  }
+}
 var g_ws = globalThis;
 var wss = g_ws.__cockpitWss ?? (() => {
   const server = new WebSocketServer({ noServer: true });
@@ -3985,6 +4169,15 @@ var wss = g_ws.__cockpitWss ?? (() => {
       runGlobalStateHandler(ws);
     } else if (pathname === "/ws/terminal") {
       runTerminalHandler(ws, query.projectCwd);
+    } else if (pathname === "/ws/bash") {
+      if (!isSameOriginWs(req)) {
+        try {
+          ws.close(4403, "forbidden origin");
+        } catch {
+        }
+      } else {
+        runBashHandler(ws, query.cwd);
+      }
     } else if (pathname === "/ws/browser") {
       runBrowserHandler(
         ws,
@@ -4004,7 +4197,7 @@ var wss = g_ws.__cockpitWss ?? (() => {
 })();
 function handleUpgrade(req, socket, head) {
   const { pathname } = parse(req.url || "", true);
-  if (pathname === "/ws/watch" || pathname === "/ws/global-state" || pathname === "/ws/terminal" || pathname === "/ws/browser" || pathname === "/ws/terminal-follow" || pathname === "/ws/jupyter" || pathname === "/ws/session-stream") {
+  if (pathname === "/ws/watch" || pathname === "/ws/global-state" || pathname === "/ws/terminal" || pathname === "/ws/bash" || pathname === "/ws/browser" || pathname === "/ws/terminal-follow" || pathname === "/ws/jupyter" || pathname === "/ws/session-stream") {
     wss.handleUpgrade(req, socket, head, (ws) => {
       wss.emit("connection", ws, req);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@surething/cockpit",
-  "version": "1.0.244",
+  "version": "1.0.245",
   "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",