supbuddy 3.0.1 → 3.0.2

package/dist/bin.js

@@ -9251,11 +9251,11 @@ var require_mime_types = __commonJS({
       }
       return exts[0];
     }
-    function lookup(path11) {
-      if (!path11 || typeof path11 !== "string") {
+    function lookup(path12) {
+      if (!path12 || typeof path12 !== "string") {
         return false;
       }
-      var extension2 = extname("x." + path11).toLowerCase().substr(1);
+      var extension2 = extname("x." + path12).toLowerCase().substr(1);
       if (!extension2) {
         return false;
       }
@@ -12630,11 +12630,11 @@ var require_server = __commonJS({
        * @protected
        */
       _computePath(options) {
-        let path11 = (options.path || "/engine.io").replace(/\/$/, "");
+        let path12 = (options.path || "/engine.io").replace(/\/$/, "");
         if (options.addTrailingSlash !== false) {
-          path11 += "/";
+          path12 += "/";
         }
-        return path11;
+        return path12;
       }
       /**
        * Returns a list of available transports for upgrade given a certain transport.
@@ -13133,10 +13133,10 @@ var require_server = __commonJS({
        * @param {Object} options
        */
       attach(server, options = {}) {
-        const path11 = this._computePath(options);
+        const path12 = this._computePath(options);
         const destroyUpgradeTimeout = options.destroyUpgradeTimeout || 1e3;
         function check(req) {
-          return path11 === req.url.slice(0, path11.length);
+          return path12 === req.url.slice(0, path12.length);
         }
         const listeners = server.listeners("request").slice(0);
         server.removeAllListeners("request");
@@ -13144,7 +13144,7 @@ var require_server = __commonJS({
         server.on("listening", this.init.bind(this));
         server.on("request", (req, res) => {
           if (check(req)) {
-            debug('intercepting request for path "%s"', path11);
+            debug('intercepting request for path "%s"', path12);
             this.handleRequest(req, res);
           } else {
             let i = 0;
@@ -13983,8 +13983,8 @@ var require_userver = __commonJS({
        * @param options
        */
       attach(app, options = {}) {
-        const path11 = this._computePath(options);
-        app.any(path11, this.handleRequest.bind(this)).ws(path11, {
+        const path12 = this._computePath(options);
+        app.any(path12, this.handleRequest.bind(this)).ws(path12, {
           compression: options.compression,
           idleTimeout: options.idleTimeout,
           maxBackpressure: options.maxBackpressure,
@@ -18397,7 +18397,7 @@ var require_dist2 = __commonJS({
     var zlib_1 = __require("zlib");
     var accepts = require_accepts();
     var stream_1 = __require("stream");
-    var path11 = __require("path");
+    var path12 = __require("path");
     var engine_io_1 = require_engine_io();
     var client_1 = require_client();
     var events_1 = __require("events");
@@ -18592,7 +18592,7 @@ var require_dist2 = __commonJS({
             res.writeHeader("cache-control", "public, max-age=0");
             res.writeHeader("content-type", "application/" + (isMap ? "json" : "javascript") + "; charset=utf-8");
             res.writeHeader("etag", expectedEtag);
-            const filepath = path11.join(__dirname, "../client-dist/", filename);
+            const filepath = path12.join(__dirname, "../client-dist/", filename);
             (0, uws_1.serveFile)(res, filepath);
           });
         }
@@ -18674,7 +18674,7 @@ var require_dist2 = __commonJS({
        * @private
        */
       static sendFile(filename, req, res) {
-        const readStream = (0, fs_1.createReadStream)(path11.join(__dirname, "../client-dist/", filename));
+        const readStream = (0, fs_1.createReadStream)(path12.join(__dirname, "../client-dist/", filename));
         const encoding = accepts(req).encodings(["br", "gzip", "deflate"]);
         const onError = (err) => {
           if (err) {
@@ -19599,6 +19599,33 @@ var init_state_dir = __esm({
   }
 });
 
+// src/caddy-resolve.ts
+import { createRequire } from "module";
+import path4 from "path";
+function caddyPackageName(platform = process.platform, arch = process.arch) {
+  if (platform === "darwin") {
+    return arch === "arm64" ? "@supbuddy/caddy-darwin-arm64" : "@supbuddy/caddy-darwin-amd64";
+  }
+  return null;
+}
+function resolvePackagedCaddyDir(deps = {}) {
+  const pkgName = deps.pkgName !== void 0 ? deps.pkgName : caddyPackageName();
+  if (!pkgName) return null;
+  const resolve = deps.resolve ?? ((id) => requireFromHere.resolve(id));
+  try {
+    return path4.dirname(resolve(`${pkgName}/package.json`));
+  } catch {
+    return null;
+  }
+}
+var requireFromHere;
+var init_caddy_resolve = __esm({
+  "src/caddy-resolve.ts"() {
+    "use strict";
+    requireFromHere = createRequire(import.meta.url);
+  }
+});
+
 // ../../packages/shared/types/isolation.ts
 var init_isolation = __esm({
   "../../packages/shared/types/isolation.ts"() {
@@ -20281,8 +20308,8 @@ var init_parseUtil = __esm({
     init_errors();
     init_en();
     makeIssue = (params) => {
-      const { data, path: path11, errorMaps, issueData } = params;
-      const fullPath = [...path11, ...issueData.path || []];
+      const { data, path: path12, errorMaps, issueData } = params;
+      const fullPath = [...path12, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -20593,11 +20620,11 @@ var init_types2 = __esm({
     init_parseUtil();
     init_util();
     ParseInputLazyPath = class {
-      constructor(parent, value, path11, key) {
+      constructor(parent, value, path12, key) {
         this._cachedPath = [];
         this.parent = parent;
         this.data = value;
-        this._path = path11;
+        this._path = path12;
         this._key = key;
       }
       get path() {
@@ -24770,7 +24797,7 @@ var init_shared = __esm({
 import { spawn as spawn2 } from "child_process";
 import { fileURLToPath } from "url";
 import fs4 from "fs";
-import path4 from "path";
+import path5 from "path";
 function resolveWorkerEntry(deps = {}) {
   const binDir = deps.binDir ?? __dirname2;
   const repoRoot = deps.repoRoot ?? REPO_ROOT;
@@ -24778,27 +24805,32 @@ function resolveWorkerEntry(deps = {}) {
   const exists = deps.exists ?? fs4.existsSync;
   const bundle = env2.SUPBUDDY_WORKER_BUNDLE;
   if (bundle) {
-    return { cmd: process.execPath, args: [bundle], workerEntry: bundle, cwd: path4.dirname(bundle) };
+    return { cmd: process.execPath, args: [bundle], workerEntry: bundle, cwd: path5.dirname(bundle), mode: "host" };
   }
-  const pkgWorker = path4.join(binDir, "daemon", "worker.cjs");
+  const pkgWorker = path5.join(binDir, "daemon", "worker.cjs");
   if (exists(pkgWorker)) {
-    return { cmd: process.execPath, args: [pkgWorker], workerEntry: pkgWorker, cwd: path4.dirname(pkgWorker) };
+    return { cmd: process.execPath, args: [pkgWorker], workerEntry: pkgWorker, cwd: path5.dirname(pkgWorker), mode: "npm" };
   }
-  const bootstrap = path4.join(repoRoot, "apps", "cli", "src", "worker-bootstrap.ts");
+  const bootstrap = path5.join(repoRoot, "apps", "cli", "src", "worker-bootstrap.ts");
   if (exists(bootstrap)) {
-    const workerEntry = path4.join(repoRoot, "packages", "core", "index.ts");
-    return { cmd: process.execPath, args: ["--import", "tsx", bootstrap], workerEntry, cwd: repoRoot };
+    const workerEntry = path5.join(repoRoot, "packages", "core", "index.ts");
+    return { cmd: process.execPath, args: ["--import", "tsx", bootstrap], workerEntry, cwd: repoRoot, mode: "dev" };
   }
   throw new WorkerUnavailableError();
 }
 async function startDaemon(opts = {}) {
   const { stateDir, workerPort, assumeYes, quiet } = opts;
   const effectiveStateDir = stateDir ?? defaultStateDir();
-  const { cmd, args, workerEntry, cwd } = resolveWorkerEntry();
+  const { cmd, args, workerEntry, cwd, mode } = resolveWorkerEntry();
   const env2 = { ...process.env, NODE_ENV: process.env.NODE_ENV ?? "development" };
   env2.SUPBUDDY_WORKER_ENTRY = workerEntry;
   env2.SUPBUDDY_STATE_DIR = effectiveStateDir;
   if (workerPort) env2.WORKER_PORT = String(workerPort);
+  if (mode === "npm" && !env2.SUPBUDDY_BIN_DIR) {
+    const caddyDir = resolvePackagedCaddyDir();
+    if (!caddyDir) throw new CaddyUnavailableError();
+    env2.SUPBUDDY_BIN_DIR = caddyDir;
+  }
   const child = spawn2(cmd, args, { stdio: ["ignore", "pipe", "pipe", "ipc"], env: env2, cwd });
   const startedAt = (/* @__PURE__ */ new Date()).toISOString();
   const baseSocketPort = workerPort ?? DEFAULT_WORKER_PORT;
@@ -24950,7 +24982,7 @@ async function runDaemonDetached(opts = {}) {
   }
   const entry = process.argv[1];
   const isTsEntry = entry.endsWith(".ts");
-  const execPath = isTsEntry ? path4.join(REPO_ROOT, "node_modules", ".bin", "tsx") : process.execPath;
+  const execPath = isTsEntry ? path5.join(REPO_ROOT, "node_modules", ".bin", "tsx") : process.execPath;
   const args = [entry, "daemon"];
   if (opts.stateDir) args.push(`--state-dir=${opts.stateDir}`);
   if (opts.workerPort) args.push(`--worker-port=${opts.workerPort}`);
@@ -24967,7 +24999,7 @@ async function runDaemonDetached(opts = {}) {
   console.error("[daemon] detached start did not produce daemon.json in time");
   return 1;
 }
-var __dirname2, REPO_ROOT, WorkerUnavailableError;
+var __dirname2, REPO_ROOT, WorkerUnavailableError, CaddyUnavailableError;
 var init_daemon = __esm({
   "src/daemon.ts"() {
     "use strict";
@@ -24977,9 +25009,10 @@ var init_daemon = __esm({
     init_relay_server();
     init_network_monitor();
     init_state_dir();
+    init_caddy_resolve();
     init_shared();
-    __dirname2 = path4.dirname(fileURLToPath(import.meta.url));
-    REPO_ROOT = path4.resolve(__dirname2, "..", "..", "..");
+    __dirname2 = path5.dirname(fileURLToPath(import.meta.url));
+    REPO_ROOT = path5.resolve(__dirname2, "..", "..", "..");
     WorkerUnavailableError = class extends Error {
       constructor() {
         super(
@@ -24988,6 +25021,17 @@ var init_daemon = __esm({
         this.name = "WorkerUnavailableError";
       }
     };
+    CaddyUnavailableError = class extends Error {
+      constructor() {
+        const pkg = caddyPackageName();
+        super(
+          pkg ? `The standalone daemon needs its bundled Caddy (${pkg}), which is not installed.
+Reinstall the CLI so npm can fetch it:  npm install -g supbuddy
+(if your npm skipped optional dependencies, run it without --no-optional).` : `The standalone daemon has no bundled Caddy for your platform yet (${process.platform}/${process.arch}). Install the Supbuddy desktop app, or run from a source checkout.`
+        );
+        this.name = "CaddyUnavailableError";
+      }
+    };
   }
 });
 
@@ -25756,10 +25800,10 @@ __export(install_exports, {
 });
 import { spawnSync } from "child_process";
 import readline2 from "readline";
-import path5 from "path";
+import path6 from "path";
 function isEphemeralNpx() {
   const argv1 = process.argv[1] || "";
-  if (argv1.includes(`${path5.sep}_npx${path5.sep}`) || argv1.includes("/_npx/")) return true;
+  if (argv1.includes(`${path6.sep}_npx${path6.sep}`) || argv1.includes("/_npx/")) return true;
   if (process.env.npm_command === "exec") return true;
   return false;
 }
@@ -25834,7 +25878,7 @@ import net from "net";
 import http from "http";
 import fs5 from "fs/promises";
 import os4 from "os";
-import path6 from "path";
+import path7 from "path";
 function getFreePort() {
   return new Promise((resolve, reject) => {
     const srv = net.createServer();
@@ -25918,7 +25962,7 @@ async function main() {
   const workerPort = await getFreePort();
   let mcpPort = await getFreePort();
   if (mcpPort === workerPort) mcpPort = await getFreePort();
-  const stateDir = await fs5.mkdtemp(path6.join(os4.tmpdir(), "supbuddy-selftest-"));
+  const stateDir = await fs5.mkdtemp(path7.join(os4.tmpdir(), "supbuddy-selftest-"));
   const seed = {
     projects: [],
     mappings: [],
@@ -25928,7 +25972,7 @@ async function main() {
       mcp: { enabled: true, port: mcpPort, audit_cap: 5e3, trash_ttl_days: 7 }
     }
   };
-  await fs5.writeFile(path6.join(stateDir, "state.json"), JSON.stringify(seed, null, 2));
+  await fs5.writeFile(path7.join(stateDir, "state.json"), JSON.stringify(seed, null, 2));
   console.log(`isolated state dir: ${stateDir}`);
   console.log(`worker (Socket.IO) port: ${workerPort}   MCP port: ${mcpPort}
 `);
@@ -25980,7 +26024,7 @@ import https from "https";
 import fs6 from "fs/promises";
 import { createWriteStream } from "fs";
 import os5 from "os";
-import path7 from "path";
+import path8 from "path";
 import crypto from "crypto";
 import readline3 from "readline";
 import { execFile, execFileSync as execFileSync2, spawn as spawn3 } from "child_process";
@@ -26106,7 +26150,7 @@ function sq(p) {
   return `'${p.replace(/'/g, "'\\''")}'`;
 }
 async function swapApp(newApp) {
-  const dir = path7.dirname(INSTALLED_APP);
+  const dir = path8.dirname(INSTALLED_APP);
   if (await canWrite(dir)) {
     const bak = `${INSTALLED_APP}.bak-${process.pid}`;
     if (await fs6.stat(INSTALLED_APP).then(() => true).catch(() => false)) {
@@ -26181,10 +26225,10 @@ supbuddy update: could not reach the release server \u2014 ${e.message}`);
       return 0;
     }
   }
-  const tmp = await fs6.mkdtemp(path7.join(os5.tmpdir(), "supbuddy-update-"));
-  const tar = path7.join(tmp, TAR_ASSET);
-  const shaFile = path7.join(tmp, SHA_ASSET);
-  const extractDir = path7.join(tmp, "extracted");
+  const tmp = await fs6.mkdtemp(path8.join(os5.tmpdir(), "supbuddy-update-"));
+  const tar = path8.join(tmp, TAR_ASSET);
+  const shaFile = path8.join(tmp, SHA_ASSET);
+  const extractDir = path8.join(tmp, "extracted");
   try {
     console.log("Downloading\u2026");
     await downloadAsset(pick.tarUrl, tar);
@@ -26198,7 +26242,7 @@ supbuddy update: could not reach the release server \u2014 ${e.message}`);
     }
     await fs6.mkdir(extractDir, { recursive: true });
     execFileSync2("tar", ["-xzf", tar, "-C", extractDir]);
-    const newApp = path7.join(extractDir, "Supbuddy.app");
+    const newApp = path8.join(extractDir, "Supbuddy.app");
     if (!await fs6.stat(newApp).then(() => true).catch(() => false)) {
       console.error("supbuddy update: the archive did not contain Supbuddy.app.");
       return 1;
@@ -26321,11 +26365,11 @@ __export(run_exports, {
 });
 import { spawn as spawn4, execSync } from "child_process";
 import fs7 from "fs";
-import path8 from "path";
+import path9 from "path";
 function readMetaLoopbackIp(startDir) {
   let dir = startDir;
   for (; ; ) {
-    const metaPath = path8.join(dir, ".supbuddy", "meta.json");
+    const metaPath = path9.join(dir, ".supbuddy", "meta.json");
     if (fs7.existsSync(metaPath)) {
       try {
         return JSON.parse(fs7.readFileSync(metaPath, "utf-8")).loopbackIp;
@@ -26333,7 +26377,7 @@ function readMetaLoopbackIp(startDir) {
         return void 0;
       }
     }
-    const parent = path8.dirname(dir);
+    const parent = path9.dirname(dir);
     if (parent === dir) return void 0;
     dir = parent;
   }
@@ -26413,7 +26457,7 @@ __export(service_exports, {
 });
 import fs8 from "fs/promises";
 import os6 from "os";
-import path9 from "path";
+import path10 from "path";
 import { fileURLToPath as fileURLToPath2 } from "url";
 import { spawnSync as spawnSync2 } from "child_process";
 function launchdPlist(o) {
@@ -26436,9 +26480,9 @@ function launchdPlist(o) {
   <key>KeepAlive</key>
   <true/>
   <key>StandardOutPath</key>
-  <string>${path9.join(o.logDir, "daemon.log")}</string>
+  <string>${path10.join(o.logDir, "daemon.log")}</string>
   <key>StandardErrorPath</key>
-  <string>${path9.join(o.logDir, "daemon-error.log")}</string>
+  <string>${path10.join(o.logDir, "daemon-error.log")}</string>
 </dict>
 </plist>
 `;
@@ -26458,16 +26502,16 @@ WantedBy=default.target
 `;
 }
 function launchdPlistPath() {
-  return path9.join(os6.homedir(), "Library", "LaunchAgents", `${LAUNCHD_LABEL}.plist`);
+  return path10.join(os6.homedir(), "Library", "LaunchAgents", `${LAUNCHD_LABEL}.plist`);
 }
 function systemdUnitPath() {
-  const configHome = process.env.XDG_CONFIG_HOME ?? path9.join(os6.homedir(), ".config");
-  return path9.join(configHome, "systemd", "user", SYSTEMD_SERVICE);
+  const configHome = process.env.XDG_CONFIG_HOME ?? path10.join(os6.homedir(), ".config");
+  return path10.join(configHome, "systemd", "user", SYSTEMD_SERVICE);
 }
 function resolveBinPath() {
-  const __dirname3 = path9.dirname(fileURLToPath2(import.meta.url));
-  const repoRoot = path9.resolve(__dirname3, "..", "..", "..");
-  return path9.join(repoRoot, "apps", "cli", "dist", "bin.js");
+  const __dirname3 = path10.dirname(fileURLToPath2(import.meta.url));
+  const repoRoot = path10.resolve(__dirname3, "..", "..", "..");
+  return path10.join(repoRoot, "apps", "cli", "dist", "bin.js");
 }
 async function installService(opts = {}, run = defaultRunner) {
   const platform = process.platform;
@@ -26487,11 +26531,11 @@ Run \`yarn workspace supbuddy build\` first.`
     return 1;
   }
   const stateDir = opts.stateDir ?? defaultStateDir();
-  const logDir = path9.join(stateDir, "logs");
+  const logDir = path10.join(stateDir, "logs");
   await fs8.mkdir(logDir, { recursive: true });
   if (platform === "darwin") {
     const plistPath = launchdPlistPath();
-    await fs8.mkdir(path9.dirname(plistPath), { recursive: true });
+    await fs8.mkdir(path10.dirname(plistPath), { recursive: true });
     const content2 = launchdPlist({ label: LAUNCHD_LABEL, nodePath, binPath, stateDir, logDir });
     await fs8.writeFile(plistPath, content2, { encoding: "utf8", mode: 420 });
     run("launchctl", ["unload", plistPath]);
@@ -26504,7 +26548,7 @@ Run \`yarn workspace supbuddy build\` first.`
     return 0;
   }
   const unitPath = systemdUnitPath();
-  await fs8.mkdir(path9.dirname(unitPath), { recursive: true });
+  await fs8.mkdir(path10.dirname(unitPath), { recursive: true });
   const content = systemdUnit({ label: LAUNCHD_LABEL, nodePath, binPath, stateDir, logDir });
   await fs8.writeFile(unitPath, content, { encoding: "utf8", mode: 420 });
   const reload = run("systemctl", ["--user", "daemon-reload"]);
@@ -26620,7 +26664,7 @@ init_state_dir();
 import { realpathSync } from "fs";
 import { spawnSync as spawnSync3 } from "child_process";
 import { fileURLToPath as fileURLToPath3 } from "url";
-import path10 from "path";
+import path11 from "path";
 
 // src/commands.ts
 init_client();
@@ -27660,12 +27704,12 @@ async function runCommand(argv, flags, clientFactory) {
         return 0;
       }
       if (sub === "env-read") {
-        const path11 = rest[0];
-        if (!path11) {
+        const path12 = rest[0];
+        if (!path12) {
           console.error("usage: supbuddy project env-read <path> [--key K]");
           return 1;
         }
-        const args = { path: path11 };
+        const args = { path: path12 };
         if (typeof flags.key === "string") args.key = flags.key;
         print(await client.call("read_env_file", args), flags);
         return 0;
@@ -27913,8 +27957,8 @@ async function runCommand(argv, flags, clientFactory) {
         return 0;
       }
       if (sub === "write") {
-        const [path11, ...pairs] = rest;
-        if (!path11 || pairs.length === 0) {
+        const [path12, ...pairs] = rest;
+        if (!path12 || pairs.length === 0) {
           console.error("usage: supbuddy env write <path> <key=val>...");
           return 1;
         }
@@ -27929,7 +27973,7 @@ async function runCommand(argv, flags, clientFactory) {
           const v = pair.slice(eqIdx + 1);
           patch[k] = v === "" ? null : v;
         }
-        print(await client.call("write_env_file", { path: path11, patch }), flags);
+        print(await client.call("write_env_file", { path: path12, patch }), flags);
         return 0;
       }
       console.error("usage: supbuddy env copy|write ...");
@@ -28429,9 +28473,9 @@ async function runShell(opts, stateDir, module) {
   const os7 = await import("os");
   const fs9 = await import("fs");
   const shellEntry = fileURLToPath3(new URL("../../tui/src/shell/bin.tsx", import.meta.url));
-  const REPO_ROOT2 = path10.resolve(fileURLToPath3(import.meta.url), "..", "..", "..", "..");
-  const tsxBin = path10.join(REPO_ROOT2, "node_modules", ".bin", "tsx");
-  const resultFile = path10.join(os7.tmpdir(), `supbuddy-shell-${process.pid}-${Date.now()}.json`);
+  const REPO_ROOT2 = path11.resolve(fileURLToPath3(import.meta.url), "..", "..", "..", "..");
+  const tsxBin = path11.join(REPO_ROOT2, "node_modules", ".bin", "tsx");
+  const resultFile = path11.join(os7.tmpdir(), `supbuddy-shell-${process.pid}-${Date.now()}.json`);
   const env2 = { ...process.env, SUPBUDDY_SHELL_RESULT: resultFile };
   if (stateDir) env2.SUPBUDDY_STATE_DIR = stateDir;
   if (module) env2.SUPBUDDY_SHELL_MODULE = module;
@@ -28528,8 +28572,8 @@ async function dispatch(argv, opts) {
     case "tui":
     case "dash": {
       const tuiEntry = fileURLToPath3(new URL("../../tui/src/bin.tsx", import.meta.url));
-      const REPO_ROOT2 = path10.resolve(fileURLToPath3(import.meta.url), "..", "..", "..", "..");
-      const tsxBin = path10.join(REPO_ROOT2, "node_modules", ".bin", "tsx");
+      const REPO_ROOT2 = path11.resolve(fileURLToPath3(import.meta.url), "..", "..", "..", "..");
+      const tsxBin = path11.join(REPO_ROOT2, "node_modules", ".bin", "tsx");
       const env2 = { ...process.env };
       if (typeof flags["state-dir"] === "string") env2.SUPBUDDY_STATE_DIR = flags["state-dir"];
       if (typeof flags["url"] === "string") env2.SUPBUDDY_DAEMON_URL = flags["url"];