svamp-cli 0.2.44 → 0.2.46

package/dist/{run-DBqJkrp6.mjs → run-yJ1mtT8S.mjs}

@@ -1,8 +1,8 @@
 import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import { randomUUID } from 'node:crypto';
 import os from 'node:os';
-import { join, resolve } from 'node:path';
-import { mkdirSync, writeFileSync, existsSync, unlinkSync, readFileSync, watch } from 'node:fs';
-import { c as connectToHypha, a as registerSessionService } from './run-DwnThKiy.mjs';
+import { resolve, join } from 'node:path';
+import { existsSync, readFileSync, watch } from 'node:fs';
+import { c as connectToHypha, a as registerSessionService, h as generateHookSettings } from './run-wfhhtkl1.mjs';
 import { createServer } from 'node:http';
 import { spawn } from 'node:child_process';
 import { createInterface } from 'node:readline';
@@ -66,56 +66,6 @@ async function startHookServer(onSessionHook, log) {
   });
 }
 
-const SVAMP_HOME$1 = process.env.SVAMP_HOME || join(os.homedir(), ".svamp");
-function generateHookSettings(port) {
-  const hooksDir = join(SVAMP_HOME$1, "tmp", "hooks");
-  mkdirSync(hooksDir, { recursive: true });
-  const forwarderPath = join(hooksDir, `forwarder-${process.pid}.cjs`);
-  const forwarderCode = `#!/usr/bin/env node
-const http = require('http');
-const port = parseInt(process.argv[2], 10);
-if (!port || isNaN(port)) process.exit(1);
-const chunks = [];
-process.stdin.on('data', c => chunks.push(c));
-process.stdin.on('end', () => {
-    const body = Buffer.concat(chunks);
-    const req = http.request({
-        host: '127.0.0.1', port, method: 'POST',
-        path: '/hook/session-start',
-        headers: { 'Content-Type': 'application/json', 'Content-Length': body.length }
-    }, res => res.resume());
-    req.on('error', () => {});
-    req.end(body);
-});
-process.stdin.resume();
-`;
-  writeFileSync(forwarderPath, forwarderCode, { mode: 493 });
-  const settingsPath = join(hooksDir, `session-hook-${process.pid}.json`);
-  const hookCommand = `node "${forwarderPath}" ${port}`;
-  const settings = {
-    hooks: {
-      SessionStart: [
-        {
-          matcher: "*",
-          hooks: [{ type: "command", command: hookCommand }]
-        }
-      ]
-    }
-  };
-  writeFileSync(settingsPath, JSON.stringify(settings, null, 2));
-  const cleanup = () => {
-    try {
-      if (existsSync(settingsPath)) unlinkSync(settingsPath);
-    } catch {
-    }
-    try {
-      if (existsSync(forwarderPath)) unlinkSync(forwarderPath);
-    } catch {
-    }
-  };
-  return { settingsPath, cleanup };
-}
-
 const INTERNAL_EVENT_TYPES = /* @__PURE__ */ new Set([
   "file-history-snapshot",
   "change",

package/dist/{serveCommands-By_bSGUl.mjs → serveCommands-DhtNhaur.mjs}

@@ -52,7 +52,7 @@ async function handleServeCommand() {
   }
 }
 async function serveAdd(args, machineId) {
-  const { connectAndGetMachine } = await import('./commands-vzP5AWB0.mjs');
+  const { connectAndGetMachine } = await import('./commands-B6zZtCuh.mjs');
   const pos = positionalArgs(args);
   const name = pos[0];
   if (!name) {
@@ -84,7 +84,7 @@ async function serveAdd(args, machineId) {
   }
 }
 async function serveRemove(args, machineId) {
-  const { connectAndGetMachine } = await import('./commands-vzP5AWB0.mjs');
+  const { connectAndGetMachine } = await import('./commands-B6zZtCuh.mjs');
   const pos = positionalArgs(args);
   const name = pos[0];
   if (!name) {
@@ -104,7 +104,7 @@ async function serveRemove(args, machineId) {
   }
 }
 async function serveList(args, machineId) {
-  const { connectAndGetMachine } = await import('./commands-vzP5AWB0.mjs');
+  const { connectAndGetMachine } = await import('./commands-B6zZtCuh.mjs');
   const all = hasFlag(args, "--all", "-a");
   const json = hasFlag(args, "--json");
   const sessionId = getFlag(args, "--session");
@@ -137,7 +137,7 @@ async function serveList(args, machineId) {
   }
 }
 async function serveInfo(machineId) {
-  const { connectAndGetMachine } = await import('./commands-vzP5AWB0.mjs');
+  const { connectAndGetMachine } = await import('./commands-B6zZtCuh.mjs');
   const { machine, server } = await connectAndGetMachine(machineId);
   try {
     const info = await machine.serveInfo();

package/dist/{serveManager-DOXI2QzY.mjs → serveManager-CUcu_V3q.mjs}

@@ -375,6 +375,7 @@ class ServeManager {
     return {
       url: firstUrl,
       port: running ? this.caddy?.port ?? this.port : 0,
+      authProxyPort: running ? this.port : 0,
       running,
       mountCount: this.mounts.size,
       mounts: Array.from(this.mounts.values()).map((m) => ({
@@ -510,6 +511,18 @@ class ServeManager {
           basePath = mountName ? url.pathname.slice(`/${mountName}`.length) || "/" : url.pathname;
         }
         const mount = mountName ? this.mounts.get(mountName) : void 0;
+        if (basePath === "/__svamp_health" || url.pathname === "/__svamp_health") {
+          res.writeHead(200, {
+            "Content-Type": "application/json",
+            "Cache-Control": "no-store"
+          });
+          res.end(JSON.stringify({
+            ok: true,
+            mount: mountName || null,
+            ts: Date.now()
+          }));
+          return;
+        }
         if (basePath === "/__login__" || url.pathname === "/__login__") {
           const returnUrl = url.searchParams.get("return") || "/";
           const safeReturn = returnUrl.startsWith("/__login__") ? "/" : returnUrl;
@@ -634,10 +647,17 @@ class ServeManager {
     const subdomainSafe = mountName.toLowerCase().replace(/[^a-z0-9-]/g, "-");
     const tunnelName = `static-${subdomainSafe}`;
     try {
-      const { FrpcTunnel } = await import('./frpc-DzRFx60H.mjs');
-      const tunnel = new FrpcTunnel({
+      const { FrpcTunnel } = await import('./frpc-j60b46eU.mjs');
+      let tunnel;
+      tunnel = new FrpcTunnel({
         name: tunnelName,
         ports: [this.port],
+        // End-to-end probe: the daemon's health loop watches probe.ok
+        // to detect ghosted tunnel registrations (frpc says "connected"
+        // but no traffic actually flows). The sentinel route is served
+        // by the auth proxy without auth.
+        probePath: "/__svamp_health",
+        probeIntervalMs: 3e4,
         onError: (err) => this.log(`frpc error [${mountName}]: ${err.message}`),
         onConnect: () => {
           const url2 = tunnel.getUrls().get(this.port);
@@ -650,7 +670,8 @@ class ServeManager {
             this.log(`frpc tunnel connected for '${mountName}'. URL: ${url2}/`);
           }
         },
-        onDisconnect: () => this.log(`frpc tunnel for '${mountName}' disconnected, will auto-reconnect...`)
+        onDisconnect: () => this.log(`frpc tunnel for '${mountName}' disconnected, will auto-reconnect...`),
+        onProbeFail: (err) => this.log(`probe fail [${mountName}]: ${err.message}`)
       });
       await tunnel.connect();
       this.mountTunnels.set(mountName, tunnel);

package/dist/{supervisorLock-DwNAn0VN.mjs → supervisorLock-DmfzJx7B.mjs}

@@ -54,15 +54,17 @@ function isPidAlive(pid) {
   try {
     process.kill(pid, 0);
     return true;
-  } catch {
-    return false;
+  } catch (err) {
+    return err?.code === "EPERM";
   }
 }
 function findOrphanedSyncPids(currentSupervisorPid = process.pid) {
   if (process.platform === "win32") return [];
   const pids = [];
   try {
-    const output = execFileSync("pgrep", ["-af", "svamp daemon start-sync"], {
+    const uid = typeof process.getuid === "function" ? process.getuid() : void 0;
+    const pgrepArgs = uid !== void 0 ? ["-u", String(uid), "-af", "svamp daemon start-sync"] : ["-af", "svamp daemon start-sync"];
+    const output = execFileSync("pgrep", pgrepArgs, {
       encoding: "utf-8",
       timeout: 5e3
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svamp-cli",
-  "version": "0.2.44",
+  "version": "0.2.46",
   "description": "Svamp CLI — AI workspace daemon on Hypha Cloud",
   "author": "Amun AI AB",
   "license": "SEE LICENSE IN LICENSE",