@venturewild/workspace 0.1.6 → 0.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@venturewild/workspace",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "Claude Code Web — Replit/Lovable-style chat-first browser UI that wraps the AI agent already installed on your machine.",
   "license": "MIT",
   "bin": {

package/server/bin/wild-workspace.mjs

@@ -710,12 +710,16 @@ async function main() {
     } catch {}
   }
 
+  // Hard safety net: even if stop() ever wedges, never leave the user staring at
+  // "shutting down…". Unref'd so the timer itself doesn't keep us alive.
+  const forceExitSoon = () => { setTimeout(() => process.exit(0), 3000).unref(); };
   process.on('SIGINT', async () => {
     console.log('\nshutting down…');
-    await server.stop();
+    forceExitSoon();
+    try { await server.stop(); } catch {}
     process.exit(0);
   });
-  process.on('SIGTERM', async () => { await server.stop(); process.exit(0); });
+  process.on('SIGTERM', async () => { forceExitSoon(); try { await server.stop(); } catch {} process.exit(0); });
 }
 
 main().catch((err) => {

package/server/src/agent.mjs

@@ -19,21 +19,51 @@ import { spawn } from 'node:child_process';
 import { promisify } from 'node:util';
 import { execFile as execFileCb } from 'node:child_process';
 import { EventEmitter } from 'node:events';
+import os from 'node:os';
+import fs from 'node:fs';
 import { DEFAULT_AGENTS } from './config.mjs';
 
 const execFile = promisify(execFileCb);
 
 const PATH_LOOKUP_TIMEOUT_MS = 1500;
 
+// Where `claude` (and other user-installed CLIs) actually live on macOS/Linux.
+// The native installer drops it in ~/.local/bin; Homebrew uses /opt/homebrew/bin
+// (Apple Silicon) or /usr/local/bin; our no-sudo npm prefix is ~/.npm-global/bin.
+function toolDirs(home = os.homedir()) {
+  return [`${home}/.local/bin`, '/opt/homebrew/bin', '/usr/local/bin', `${home}/.npm-global/bin`];
+}
+
+// GUI / launchd-launched processes inherit a MINIMAL PATH that omits all of the
+// above and never reads ~/.zshrc — so a server started by the macOS always-on
+// LaunchAgent can't find `claude` (spawn ENOENT). Idempotently add the real tool
+// dirs so detection + spawn work regardless of how the process was launched.
+export function ensureToolPath(env = process.env, { platform = process.platform, home = os.homedir() } = {}) {
+  if (platform === 'win32') return env.PATH; // HKCU\Run inherits the full user PATH
+  const have = (env.PATH || '').split(':').filter(Boolean);
+  const add = toolDirs(home).filter((d) => !have.includes(d));
+  if (add.length) env.PATH = [...have, ...add].join(':');
+  return env.PATH;
+}
+
 async function isOnPath(binary) {
+  ensureToolPath(); // make sure the tool dirs are on PATH before we look
   const probe = process.platform === 'win32' ? 'where.exe' : 'which';
   try {
     const { stdout } = await execFile(probe, [binary], { timeout: PATH_LOOKUP_TIMEOUT_MS });
     const lines = stdout.split(/\r?\n/).filter(Boolean);
-    return lines.length > 0 ? lines[0].trim() : null;
-  } catch {
-    return null;
+    if (lines.length > 0) return lines[0].trim();
+  } catch { /* fall through to a direct probe */ }
+  // which/where can still miss a freshly-installed binary in a stripped launchd
+  // environment — probe the known install dirs directly and return an ABSOLUTE
+  // path, which spawn uses verbatim (no PATH needed at spawn time).
+  if (process.platform !== 'win32') {
+    for (const dir of toolDirs()) {
+      const candidate = `${dir}/${binary}`;
+      try { fs.accessSync(candidate, fs.constants.X_OK); return candidate; } catch { /* next */ }
+    }
   }
+  return null;
 }
 
 export async function detectAgents(candidates = DEFAULT_AGENTS) {

package/server/src/index.mjs

@@ -1328,7 +1328,14 @@ export async function createServer(overrides = {}) {
       // The daemon is deliberately NOT stopped here — it is detached so sync
       // keeps running after wild-workspace closes. `wild-workspace daemon
       // stop` is the explicit off-switch.
+      // Terminate live WebSockets first — wss.close() stops the server accepting
+      // new connections but leaves existing client sockets open, and those keep
+      // httpServer.close() hanging forever ("stuck shutting down" on Ctrl+C).
+      try { wss.clients.forEach((c) => { try { c.terminate(); } catch {} }); } catch {}
       try { wss.close(); } catch {}
+      // Drop lingering keep-alive HTTP sockets too (Node 18.2+) so close resolves
+      // promptly instead of waiting on idle browser connections.
+      try { httpServer.closeAllConnections?.(); } catch {}
       await new Promise((resolve) => httpServer.close(resolve));
     },
   };