svamp-cli 0.2.21 → 0.2.22

package/dist/{serveCommands-PxeZcd-5.mjs → serveCommands-C515r-sl.mjs}

@@ -52,7 +52,7 @@ async function handleServeCommand() {
   }
 }
 async function serveAdd(args, machineId) {
-  const { connectAndGetMachine } = await import('./commands-DVCdUK0p.mjs');
+  const { connectAndGetMachine } = await import('./commands-CNDLej2C.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-DVCdUK0p.mjs');
+  const { connectAndGetMachine } = await import('./commands-CNDLej2C.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-DVCdUK0p.mjs');
+  const { connectAndGetMachine } = await import('./commands-CNDLej2C.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-DVCdUK0p.mjs');
+  const { connectAndGetMachine } = await import('./commands-CNDLej2C.mjs');
   const { machine, server } = await connectAndGetMachine(machineId);
   try {
     const info = await machine.serveInfo();

package/dist/{serveManager-Be7Dgpoe.mjs → serveManager-6vRqOXK_.mjs}

@@ -530,47 +530,26 @@ button{padding:10px 24px;background:#0969da;color:#fff;border:none;border-radius
       server.on("error", reject);
     });
   }
-  /** Start frpc tunnel for the Caddy port, or add K8s backend on cloud. */
+  /** Start frpc tunnel for the Caddy port. */
   async ensureTunnel() {
     try {
-      const { getSandboxEnv } = await import('./api-BRbsyqJ4.mjs');
-      const env = getSandboxEnv();
-      if (env.sandboxId) {
-        const { createServiceGroup, addBackend } = await import('./api-BRbsyqJ4.mjs');
-        try {
-          const group = await createServiceGroup(this.serviceName, [this.port]);
-          this.serviceUrl = group.ports?.[0]?.url || group.url || null;
-          await addBackend(this.serviceName);
-          this.log(`Cloud backend added. URL: ${this.serviceUrl}`);
-        } catch (err) {
-          if (err.message?.includes("already exists")) {
-            const { getServiceGroup } = await import('./api-BRbsyqJ4.mjs');
-            const existing = await getServiceGroup(this.serviceName);
-            this.serviceUrl = existing.ports?.[0]?.url || existing.url || null;
-            this.log(`Reusing existing service group. URL: ${this.serviceUrl}`);
-          } else {
-            throw err;
+      const { FrpcTunnel } = await import('./frpc-Dz3UhcgJ.mjs');
+      this.frpcTunnel = new FrpcTunnel({
+        name: this.serviceName,
+        ports: [this.port],
+        onError: (err) => this.log(`frpc error: ${err.message}`),
+        onConnect: () => {
+          const url = this.frpcTunnel?.getUrls().get(this.port);
+          if (url) {
+            this.serviceUrl = url;
+            this.log(`frpc tunnel connected. URL: ${this.serviceUrl}`);
           }
-        }
-      } else {
-        const { FrpcTunnel } = await import('./frpc-Ckiiq9Lw.mjs');
-        this.frpcTunnel = new FrpcTunnel({
-          name: this.serviceName,
-          ports: [this.port],
-          onError: (err) => this.log(`frpc error: ${err.message}`),
-          onConnect: () => {
-            const url = this.frpcTunnel?.getUrls().get(this.port);
-            if (url) {
-              this.serviceUrl = url;
-              this.log(`frpc tunnel connected. URL: ${this.serviceUrl}`);
-            }
-          },
-          onDisconnect: () => this.log("frpc tunnel disconnected, will auto-reconnect...")
-        });
-        await this.frpcTunnel.connect();
-        this.serviceUrl = this.frpcTunnel.getUrls().get(this.port) || null;
-        this.log(`frpc tunnel started. URL: ${this.serviceUrl}`);
-      }
+        },
+        onDisconnect: () => this.log("frpc tunnel disconnected, will auto-reconnect...")
+      });
+      await this.frpcTunnel.connect();
+      this.serviceUrl = this.frpcTunnel.getUrls().get(this.port) || null;
+      this.log(`frpc tunnel started. URL: ${this.serviceUrl}`);
     } catch (err) {
       this.log(`Warning: could not expose server externally: ${err.message}`);
       this.log(`Server available locally at http://127.0.0.1:${this.port}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svamp-cli",
-  "version": "0.2.21",
+  "version": "0.2.22",
   "description": "Svamp CLI — AI workspace daemon on Hypha Cloud",
   "author": "Amun AI AB",
   "license": "SEE LICENSE IN LICENSE",
@@ -20,11 +20,12 @@
   "scripts": {
     "build": "rm -rf dist && tsc --noEmit && pkgroll",
     "typecheck": "tsc --noEmit",
-    "test": "npx tsx test/test-authorize.mjs && npx tsx test/test-session-helpers.mjs && npx tsx test/test-cli-routing.mjs && npx tsx test/test-security-context.mjs && npx tsx test/test-ralph-loop.mjs && npx tsx test/test-message-helpers.mjs && npx tsx test/test-agent-config.mjs && npx tsx test/test-wrap-command.mjs && npx tsx test/test-credential-staging.mjs && npx tsx test/test-output-formatters.mjs && npx tsx test/test-agent-types.mjs && npx tsx test/test-transport.mjs && npx tsx test/test-session-update-handlers.mjs && npx tsx test/test-session-scanner.mjs && npx tsx test/test-hypha-client.mjs && npx tsx test/test-hook-settings.mjs && npx tsx test/test-session-service-logic.mjs && npx tsx test/test-daemon-persistence.mjs && npx tsx test/test-detect-isolation.mjs && npx tsx test/test-machine-service-logic.mjs && npx tsx test/test-interactive-helpers.mjs && npx tsx test/test-codex-backend.mjs && npx tsx test/test-acp-backend.mjs && npx tsx test/test-acp-bridge.mjs && npx tsx test/test-hook-server.mjs && npx tsx test/test-session-commands.mjs && npx tsx test/test-interactive-console.mjs && npx tsx test/test-session-messages.mjs && npx tsx test/test-skills.mjs && npx tsx test/test-agent-grouping.mjs && npx tsx test/test-ralph-loop-integration.mjs && npx tsx test/test-ralph-loop-modes.mjs && npx tsx test/test-machine-list-directory.mjs && npx tsx test/test-service-commands.mjs && npx tsx test/test-supervisor.mjs && npx tsx test/test-clear-detection.mjs && npx tsx test/test-session-consolidation.mjs && npx tsx test/test-inbox.mjs && npx tsx test/test-session-rpc-dispatch.mjs && npx tsx test/test-sandbox-cli.mjs && npx tsx test/test-serve-manager.mjs && npx tsx test/test-service-stability.mjs && npx tsx test/test-serve-stability.mjs",
+    "test": "npx tsx test/test-authorize.mjs && npx tsx test/test-session-helpers.mjs && npx tsx test/test-cli-routing.mjs && npx tsx test/test-security-context.mjs && npx tsx test/test-ralph-loop.mjs && npx tsx test/test-message-helpers.mjs && npx tsx test/test-agent-config.mjs && npx tsx test/test-wrap-command.mjs && npx tsx test/test-credential-staging.mjs && npx tsx test/test-output-formatters.mjs && npx tsx test/test-agent-types.mjs && npx tsx test/test-transport.mjs && npx tsx test/test-session-update-handlers.mjs && npx tsx test/test-session-scanner.mjs && npx tsx test/test-hypha-client.mjs && npx tsx test/test-hook-settings.mjs && npx tsx test/test-session-service-logic.mjs && npx tsx test/test-daemon-persistence.mjs && npx tsx test/test-detect-isolation.mjs && npx tsx test/test-machine-service-logic.mjs && npx tsx test/test-interactive-helpers.mjs && npx tsx test/test-codex-backend.mjs && npx tsx test/test-acp-backend.mjs && npx tsx test/test-acp-bridge.mjs && npx tsx test/test-hook-server.mjs && npx tsx test/test-session-commands.mjs && npx tsx test/test-interactive-console.mjs && npx tsx test/test-session-messages.mjs && npx tsx test/test-skills.mjs && npx tsx test/test-agent-grouping.mjs && npx tsx test/test-ralph-loop-integration.mjs && npx tsx test/test-ralph-loop-modes.mjs && npx tsx test/test-machine-list-directory.mjs && npx tsx test/test-service-commands.mjs && npx tsx test/test-supervisor.mjs && npx tsx test/test-clear-detection.mjs && npx tsx test/test-session-consolidation.mjs && npx tsx test/test-inbox.mjs && npx tsx test/test-session-rpc-dispatch.mjs && npx tsx test/test-sandbox-cli.mjs && npx tsx test/test-serve-manager.mjs && npx tsx test/test-serve-stability.mjs && npx tsx test/test-frpc-e2e.mjs --unit-only",
     "test:hypha": "node --no-warnings test/test-hypha-service.mjs",
     "dev": "tsx src/cli.ts",
     "dev:daemon": "tsx src/cli.ts daemon start-sync",
-    "test:e2e": "node --no-warnings test/e2e-session-tests.mjs"
+    "test:e2e": "node --no-warnings test/e2e-session-tests.mjs",
+    "test:frpc": "npx tsx test/test-frpc-e2e.mjs"
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "^0.14.1",

package/dist/api-BRbsyqJ4.mjs

@@ -1,147 +0,0 @@
-function getSandboxEnv() {
-  return {
-    apiUrl: process.env.SANDBOX_API_URL || "https://agent-sandbox.aicell.io",
-    apiKey: process.env.SANDBOX_API_KEY || process.env.HYPHA_TOKEN || "",
-    namespace: process.env.SANDBOX_NAMESPACE || process.env.HYPHA_WORKSPACE || "",
-    sandboxId: process.env.SANDBOX_ID || ""
-  };
-}
-function requireSandboxEnv() {
-  const env = getSandboxEnv();
-  if (!env.apiKey) {
-    throw new Error(
-      'No API credentials found.\nRun "svamp login" to authenticate with Hypha, or set SANDBOX_API_KEY directly.'
-    );
-  }
-  if (!env.namespace) {
-    throw new Error(
-      'No namespace/workspace found.\nRun "svamp login" to set HYPHA_WORKSPACE, or set SANDBOX_NAMESPACE directly.'
-    );
-  }
-  return env;
-}
-function requireSandboxApiEnv() {
-  const env = getSandboxEnv();
-  if (!env.apiKey) {
-    throw new Error(
-      'No API credentials found.\nRun "svamp login" to authenticate with Hypha, or set SANDBOX_API_KEY directly.'
-    );
-  }
-  return env;
-}
-async function sandboxFetch(env, path, init, timeoutMs = 3e4) {
-  const url = `${env.apiUrl.replace(/\/+$/, "")}${path}`;
-  const headers = {
-    "Authorization": `Bearer ${env.apiKey}`,
-    "Content-Type": "application/json",
-    ...init?.headers || {}
-  };
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), timeoutMs);
-  let res;
-  try {
-    res = await fetch(url, { ...init, headers, signal: controller.signal });
-  } finally {
-    clearTimeout(timer);
-  }
-  if (!res.ok) {
-    const body = await res.text().catch(() => "");
-    let detail = body;
-    try {
-      detail = JSON.parse(body).detail || body;
-    } catch {
-    }
-    throw new Error(`${res.status} ${res.statusText}: ${detail}`);
-  }
-  return res;
-}
-async function createServiceGroup(name, ports, options) {
-  const env = requireSandboxEnv();
-  const body = {};
-  if (ports.length === 1 && options?.subdomain) {
-    body.port = ports[0];
-    body.subdomain = options.subdomain;
-  } else {
-    body.ports = ports.map((p) => ({ port: p }));
-  }
-  if (options?.healthPath) {
-    body.health_path = options.healthPath;
-    if (options.healthInterval) {
-      body.health_interval = options.healthInterval;
-    }
-  }
-  const res = await sandboxFetch(env, `/services/${env.namespace}/${name}`, {
-    method: "POST",
-    body: JSON.stringify(body)
-  });
-  return res.json();
-}
-async function listServiceGroups() {
-  const env = requireSandboxEnv();
-  const res = await sandboxFetch(env, `/services/${env.namespace}`);
-  return res.json();
-}
-async function getServiceGroup(name) {
-  const env = requireSandboxEnv();
-  const res = await sandboxFetch(env, `/services/${env.namespace}/${name}`);
-  return res.json();
-}
-async function deleteServiceGroup(name) {
-  const env = requireSandboxEnv();
-  const res = await sandboxFetch(env, `/services/${env.namespace}/${name}`, {
-    method: "DELETE"
-  });
-  return res.json();
-}
-async function addPort(name, port, subdomain) {
-  const env = requireSandboxEnv();
-  const res = await sandboxFetch(env, `/services/${env.namespace}/${name}/ports`, {
-    method: "POST",
-    body: JSON.stringify({ port, subdomain })
-  });
-  return res.json();
-}
-async function removePort(name, port) {
-  const env = requireSandboxEnv();
-  const res = await sandboxFetch(env, `/services/${env.namespace}/${name}/ports/${port}`, {
-    method: "DELETE"
-  });
-  return res.json();
-}
-async function renameSubdomain(name, port, subdomain) {
-  const env = requireSandboxEnv();
-  const res = await sandboxFetch(env, `/services/${env.namespace}/${name}/subdomain`, {
-    method: "PUT",
-    body: JSON.stringify({ port, subdomain })
-  });
-  return res.json();
-}
-async function addBackend(name, sandboxId) {
-  const env = requireSandboxEnv();
-  const sid = sandboxId || env.sandboxId;
-  if (!sid) {
-    throw new Error(
-      "No sandbox ID provided and SANDBOX_ID is not set.\nUse --sandbox-id <id> to specify which sandbox to add."
-    );
-  }
-  const res = await sandboxFetch(env, `/services/${env.namespace}/${name}/backends`, {
-    method: "POST",
-    body: JSON.stringify({ sandbox_id: sid })
-  });
-  return res.json();
-}
-async function removeBackend(name, sandboxId) {
-  const env = requireSandboxEnv();
-  const sid = sandboxId || env.sandboxId;
-  if (!sid) {
-    throw new Error(
-      "No sandbox ID provided and SANDBOX_ID is not set.\nUse --sandbox-id <id> to specify which sandbox to remove."
-    );
-  }
-  const res = await sandboxFetch(env, `/services/${env.namespace}/${name}/backends/${sid}`, {
-    method: "DELETE"
-  });
-  return res.json();
-}
-
-export { addBackend, addPort, createServiceGroup, deleteServiceGroup, getSandboxEnv, getServiceGroup, listServiceGroups, removeBackend, removePort, renameSubdomain, requireSandboxApiEnv, requireSandboxEnv };