tarsk 0.5.46 → 0.5.47

package/dist/index.js

@@ -2240,6 +2240,7 @@ var init_database = __esm({
 
 // src/server.ts
 init_dist();
+import { createAdaptorServer } from "@hono/node-server";
 import { serveStatic } from "@hono/node-server/serve-static";
 import fs3 from "fs";
 import { Hono as Hono28 } from "hono";
@@ -31690,6 +31691,9 @@ function createSystemPermissionsRoutes() {
 var __filename = fileURLToPath3(import.meta.url);
 var __dirname = path5.dirname(__filename);
 var startPromise = null;
+function isBunRuntime() {
+  return typeof Bun !== "undefined" && typeof Bun.serve === "function";
+}
 async function startTarskServer(options) {
   if (startPromise) {
     return startPromise;
@@ -31700,7 +31704,6 @@ async function startTarskServer(options) {
 async function startTarskServerInternal(options) {
   const { isDebug: isDebug2, publicDir: publicDirOverride } = options;
   const initialPort = isDebug2 ? 462 : process.env.PORT ? parseInt(process.env.PORT) : 641;
-  const { upgradeWebSocket, websocket } = (await import("hono/bun")).createBunWebSocket();
   const app = new Hono28();
   app.use("/*", cors());
   app.use("/*", async (c, next) => {
@@ -31722,6 +31725,19 @@ async function startTarskServerInternal(options) {
     }
     return next();
   });
+  let upgradeWebSocket;
+  let injectNodeWebSocket;
+  let bunWebSocketSupport;
+  if (isBunRuntime()) {
+    const { createBunWebSocket } = await import("hono/bun");
+    bunWebSocketSupport = createBunWebSocket();
+    upgradeWebSocket = bunWebSocketSupport.upgradeWebSocket;
+  } else {
+    const { createNodeWebSocket } = await import("@hono/node-ws");
+    const nodeWebSocket = createNodeWebSocket({ app });
+    upgradeWebSocket = nodeWebSocket.upgradeWebSocket;
+    injectNodeWebSocket = nodeWebSocket.injectWebSocket;
+  }
   const dataDir = getDataDir();
   const metadataManager = new MetadataManager(dataDir);
   const gitManager2 = new GitManagerImpl();
@@ -31872,46 +31888,114 @@ async function startTarskServerInternal(options) {
   });
   const serverBindMode = readServerBindMode();
   const hostname2 = getServerBindHostname(serverBindMode);
-  let port = initialPort;
-  while (true) {
-    try {
-      const server = Bun.serve({
-        fetch: app.fetch,
-        hostname: hostname2,
-        port,
-        websocket
-      });
-      listeningPort = server.port ?? port;
-      process.stdout.write(`Tarsk started on http://localhost:${listeningPort}
+  const onListening = (boundPort) => {
+    listeningPort = boundPort;
+    const url = `http://localhost:${boundPort}`;
+    process.stdout.write(`Tarsk started on ${url}
 `);
-      if (serverBindMode === "network") {
-        for (const address of getLocalNetworkAddresses()) {
-          process.stdout.write(`  Network: http://${address}:${listeningPort}
+    if (serverBindMode === "network") {
+      for (const address of getLocalNetworkAddresses()) {
+        process.stdout.write(`  Network: http://${address}:${boundPort}
 `);
-        }
       }
-      if (options.openBrowser) {
-        open4(`http://localhost:${listeningPort}`).catch(() => {
+    }
+    if (options.openBrowser) {
+      open4(url).catch(() => {
+      });
+    }
+  };
+  if (isBunRuntime()) {
+    if (!bunWebSocketSupport) {
+      startPromise = null;
+      throw new Error("Bun WebSocket support was not initialized.");
+    }
+    let port2 = initialPort;
+    while (true) {
+      try {
+        const server = Bun.serve({
+          fetch: app.fetch,
+          hostname: hostname2,
+          port: port2,
+          websocket: bunWebSocketSupport.websocket
         });
-      }
-      return {
-        url: `http://localhost:${listeningPort}`,
-        port: listeningPort,
-        bound: true,
-        isDevMode: listeningPort !== initialPort
-      };
-    } catch (error) {
-      const errno = error;
-      if (errno.code === "EADDRINUSE") {
-        process.stdout.write(`Port ${port} is already in use, trying ${port + 1}.
+        onListening(server.port ?? port2);
+        return {
+          url: `http://localhost:${server.port ?? port2}`,
+          port: server.port ?? port2,
+          bound: true,
+          isDevMode: (server.port ?? port2) !== initialPort
+        };
+      } catch (error) {
+        const errno = error;
+        if (errno.code === "EADDRINUSE") {
+          process.stdout.write(`Port ${port2} is already in use, trying ${port2 + 1}.
 `);
-        port += 1;
-        continue;
+          port2 += 1;
+          continue;
+        }
+        startPromise = null;
+        throw error;
       }
-      startPromise = null;
-      throw error;
     }
   }
+  if (!injectNodeWebSocket) {
+    startPromise = null;
+    throw new Error("Node.js WebSocket support was not initialized.");
+  }
+  const port = await listenForTarskServer({
+    fetch: app.fetch,
+    hostname: hostname2,
+    injectWebSocket: injectNodeWebSocket,
+    onPortConflict: (candidatePort) => {
+      process.stdout.write(
+        `Port ${candidatePort} is already in use, trying ${candidatePort + 1}.
+`
+      );
+    },
+    onListening,
+    port: initialPort
+  });
+  return {
+    url: `http://localhost:${port}`,
+    port,
+    bound: true,
+    isDevMode: port !== initialPort
+  };
+}
+async function listenForTarskServer(options) {
+  let port = options.port;
+  while (true) {
+    const server = createAdaptorServer({
+      fetch: options.fetch,
+      hostname: options.hostname,
+      port
+    });
+    options.injectWebSocket(server);
+    const result = await new Promise((resolve8, reject) => {
+      server.once("error", (error) => {
+        if (error.code === "EADDRINUSE") {
+          resolve8("in-use");
+          return;
+        }
+        startPromise = null;
+        reject(error);
+      });
+      function onListening() {
+        resolve8("listening");
+      }
+      if (options.hostname) {
+        server.listen(port, options.hostname, onListening);
+      } else {
+        server.listen(port, onListening);
+      }
+    });
+    if (result === "listening") {
+      options.onListening(port);
+      return port;
+    }
+    options.onPortConflict(port);
+    port += 1;
+  }
 }
 
 // src/index.ts

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tarsk",
-  "version": "0.5.46",
+  "version": "0.5.47",
   "description": "CLI for Tarsk - Project Threads Manager",
   "keywords": [
     "cli",
@@ -42,6 +42,7 @@
     "@earendil-works/pi-agent-core": "0.79.6",
     "@earendil-works/pi-ai": "0.79.6",
     "@hono/node-server": "1.19.13",
+    "@hono/node-ws": "1.3.1",
     "@libsql/client": "0.17.2",
     "@modelcontextprotocol/sdk": "1.29.0",
     "@sinclair/typebox": "0.34.49",