svamp-cli 0.1.63 → 0.1.65

package/dist/{run-COqTRwXb.mjs → run-DTwMJ7dx.mjs}

@@ -2,7 +2,7 @@ import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(im
 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-BaMf-bAo.mjs';
+import { c as connectToHypha, a as registerSessionService } from './run-DPhSmbr1.mjs';
 import { createServer } from 'node:http';
 import { spawn } from 'node:child_process';
 import { createInterface } from 'node:readline';
@@ -203,9 +203,9 @@ function createSessionScanner(opts) {
     },
     sync: readAndSync,
     cleanup() {
-      stopped = true;
       stopWatching();
       if (currentSessionId) readAndSync();
+      stopped = true;
     }
   };
 }
@@ -432,11 +432,18 @@ async function runClaudeTurn(opts) {
   opts.onThinkingChange(true);
   let currentText = "";
   return new Promise((resolve) => {
+    let killTimer;
     const abortHandler = () => {
       try {
         child.kill("SIGTERM");
       } catch {
       }
+      killTimer = setTimeout(() => {
+        try {
+          child.kill("SIGKILL");
+        } catch {
+        }
+      }, 5e3);
     };
     if (opts.signal.aborted) {
       abortHandler();
@@ -458,18 +465,31 @@ async function runClaudeTurn(opts) {
         currentText += text;
       });
     });
+    rl.on("error", (err) => {
+      opts.log(`[remote] readline error: ${err.message}`);
+    });
     if (child.stderr) {
       child.stderr.on("data", (data) => {
         opts.log(`[remote:stderr] ${data.toString().trim()}`);
       });
     }
     child.on("error", (err) => {
+      if (killTimer) {
+        clearTimeout(killTimer);
+        killTimer = void 0;
+      }
+      rl.close();
       opts.log(`[remote] Error: ${err.message}`);
       opts.onThinkingChange(false);
       if (currentText && !currentText.endsWith("\n")) process.stdout.write("\n");
       resolve("error");
     });
     child.on("exit", (code, signal) => {
+      if (killTimer) {
+        clearTimeout(killTimer);
+        killTimer = void 0;
+      }
+      rl.close();
       opts.log(`[remote] Exit: code=${code}, signal=${signal}`);
       opts.onThinkingChange(false);
       if (currentText && !currentText.endsWith("\n")) process.stdout.write("\n");
@@ -570,18 +590,25 @@ async function loop(opts) {
             abortController.abort();
           }
         }, 500);
-        const result = await runLocalMode({
-          cwd: opts.cwd,
-          claudeSessionId,
-          onSessionFound,
-          onMessage: opts.onMessage,
-          onThinkingChange: opts.onThinkingChange,
-          abort: abortController.signal,
-          hookSettingsPath: opts.hookSettingsPath,
-          claudeArgs: opts.claudeArgs,
-          log
-        });
-        if (messageWatcher) clearInterval(messageWatcher);
+        let result;
+        try {
+          result = await runLocalMode({
+            cwd: opts.cwd,
+            claudeSessionId,
+            onSessionFound,
+            onMessage: opts.onMessage,
+            onThinkingChange: opts.onThinkingChange,
+            abort: abortController.signal,
+            hookSettingsPath: opts.hookSettingsPath,
+            claudeArgs: opts.claudeArgs,
+            log
+          });
+        } finally {
+          if (messageWatcher) {
+            clearInterval(messageWatcher);
+            messageWatcher = null;
+          }
+        }
         if (result.type === "switch") {
           mode = "remote";
           opts.onModeChange(mode);
@@ -664,8 +691,8 @@ async function runInteractive(options) {
     if (messageQueue.length > 0) {
       return Promise.resolve(messageQueue.shift());
     }
-    return new Promise((resolve) => {
-      messageWaiter = { resolve };
+    return new Promise((resolve2) => {
+      messageWaiter = { resolve: resolve2 };
     });
   }
   function hasRemoteMessage() {
@@ -706,9 +733,9 @@ async function runInteractive(options) {
         log("[hypha] Restart requested");
         return { success: false, message: "Restart not supported in interactive mode" };
       },
-      onKillSession: () => {
+      onKillSession: async () => {
         log("[hypha] Kill requested");
-        cleanup();
+        await cleanup();
         process.exit(0);
       },
       // File system operations — run locally since we have direct access
@@ -728,28 +755,43 @@ async function runInteractive(options) {
           return { output: err.stdout || "", error: err.message, exitCode: err.status || 1 };
         }
       },
-      onReadFile: async (path) => {
+      onReadFile: async (filePath) => {
+        const resolvedPath = resolve(cwd, filePath);
+        if (resolvedPath !== resolve(cwd) && !resolvedPath.startsWith(resolve(cwd) + "/")) {
+          throw new Error("Path outside working directory");
+        }
         try {
           const { readFileSync: readFileSync2 } = await import('fs');
-          return readFileSync2(path, "utf-8");
+          const buf = readFileSync2(resolvedPath);
+          return buf.toString("base64");
         } catch (err) {
           throw new Error(`Cannot read file: ${err.message}`);
         }
       },
-      onWriteFile: async (path, content) => {
+      onWriteFile: async (filePath, content) => {
+        const resolvedPath = resolve(cwd, filePath);
+        if (resolvedPath !== resolve(cwd) && !resolvedPath.startsWith(resolve(cwd) + "/")) {
+          throw new Error("Path outside working directory");
+        }
         try {
-          const { writeFileSync } = await import('fs');
-          writeFileSync(path, content, "utf-8");
+          const { writeFileSync, mkdirSync } = await import('fs');
+          const { dirname: dir } = await import('path');
+          mkdirSync(dir(resolvedPath), { recursive: true });
+          writeFileSync(resolvedPath, Buffer.from(content, "base64"));
         } catch (err) {
           throw new Error(`Cannot write file: ${err.message}`);
         }
       },
-      onListDirectory: async (path) => {
+      onListDirectory: async (dirPath) => {
+        const resolvedDir = resolve(cwd, dirPath || ".");
+        if (resolvedDir !== resolve(cwd) && !resolvedDir.startsWith(resolve(cwd) + "/")) {
+          throw new Error("Path outside working directory");
+        }
         const { readdirSync, statSync } = await import('fs');
         const { join: joinPath } = await import('path');
-        return readdirSync(path).map((name) => {
+        return readdirSync(resolvedDir).map((name) => {
           try {
-            const st = statSync(joinPath(path, name));
+            const st = statSync(joinPath(resolvedDir, name));
             return { name, type: st.isDirectory() ? "directory" : "file", size: st.size };
           } catch {
             return { name, type: "unknown", size: 0 };
@@ -803,7 +845,10 @@ async function runInteractive(options) {
   let keepAliveInterval = null;
   if (sessionService) {
     keepAliveInterval = setInterval(() => {
-      sessionService.sendKeepAlive(false);
+      try {
+        sessionService.sendKeepAlive(false);
+      } catch {
+      }
     }, 3e4);
   }
   const cleanup = async () => {
@@ -870,11 +915,18 @@ async function runInteractive(options) {
       onModeChange: (mode) => {
         log(`Mode changed: ${mode}`);
         currentMode = mode;
+        if (mode === "local" && messageWaiter) {
+          messageWaiter = null;
+        }
         if (sessionService) {
           sessionService.updateAgentState({
             controlledByUser: mode === "local"
           });
-          sessionService.updateMetadata({ ...metadata, lifecycleState: "running" });
+          sessionService.updateMetadata({
+            ...metadata,
+            claudeSessionId: claudeSessionId || void 0,
+            lifecycleState: "running"
+          });
           sessionService.sendKeepAlive(false, mode);
         }
       },

package/dist/{tunnel-dl6vFKgd.mjs → tunnel-C3UsqTxi.mjs}

@@ -1,6 +1,5 @@
 import * as os from 'os';
-import * as http from 'http';
-import { requireSandboxApiEnv } from './api-Cegey1dh.mjs';
+import { requireSandboxApiEnv } from './api-BRbsyqJ4.mjs';
 import { WebSocket } from 'ws';
 
 class TunnelClient {
@@ -98,6 +97,7 @@ class TunnelClient {
     } catch {
       return;
     }
+    if (!msg || typeof msg !== "object") return;
     switch (msg.type) {
       case "ping":
         this.send({ type: "pong" });
@@ -124,72 +124,56 @@ class TunnelClient {
   async proxyRequest(req) {
     this.requestCount++;
     const port = req.port || this.options.ports[0];
+    const url = `http://${this.options.localHost}:${port}${req.path}`;
+    const controller = new AbortController();
+    const timeout = setTimeout(() => controller.abort(), this.options.requestTimeout);
     const forwardHeaders = { ...req.headers };
-    forwardHeaders["accept-encoding"] = "identity";
-    const chunks = [];
-    const status_holder = { status: 502, headers: {} };
-    await new Promise((resolve, reject) => {
-      const timeout = setTimeout(() => reject(new Error("timeout")), this.options.requestTimeout);
-      const options = {
-        hostname: this.options.localHost,
-        port,
-        path: req.path,
-        method: req.method,
-        headers: forwardHeaders
-      };
-      const httpReq = http.request(options, (res) => {
-        status_holder.status = res.statusCode ?? 502;
-        const rawHeaders = res.headers;
-        for (const [key, value] of Object.entries(rawHeaders)) {
-          if (Array.isArray(value)) {
-            status_holder.headers[key] = value.join(", ");
-          } else if (value !== void 0) {
-            status_holder.headers[key] = value;
-          }
-        }
-        res.on("data", (chunk) => chunks.push(chunk));
-        res.on("end", () => {
-          clearTimeout(timeout);
-          resolve();
-        });
-        res.on("error", (e) => {
-          clearTimeout(timeout);
-          reject(e);
-        });
-      });
-      httpReq.on("error", (e) => {
-        clearTimeout(timeout);
-        reject(e);
+    delete forwardHeaders["accept-encoding"];
+    delete forwardHeaders["Accept-Encoding"];
+    const init = {
+      method: req.method,
+      headers: forwardHeaders,
+      signal: controller.signal
+    };
+    if (req.body && !["GET", "HEAD"].includes(req.method.toUpperCase())) {
+      init.body = Buffer.from(req.body, "base64");
+    }
+    try {
+      const res = await fetch(url, init);
+      clearTimeout(timeout);
+      const bodyBuffer = await res.arrayBuffer();
+      const bodyBase64 = bodyBuffer.byteLength > 0 ? Buffer.from(bodyBuffer).toString("base64") : void 0;
+      const headers = {};
+      res.headers.forEach((value, key) => {
+        headers[key] = value;
       });
-      if (req.body && !["GET", "HEAD"].includes(req.method.toUpperCase())) {
-        httpReq.write(Buffer.from(req.body, "base64"));
-      }
-      httpReq.end();
-    }).then(() => {
-      const bodyBuffer = Buffer.concat(chunks);
-      const bodyBase64 = bodyBuffer.length > 0 ? bodyBuffer.toString("base64") : void 0;
-      for (const h of ["connection", "keep-alive", "transfer-encoding"]) {
-        delete status_holder.headers[h];
-      }
       this.send({
         type: "response",
         id: req.id,
-        status: status_holder.status,
-        headers: status_holder.headers,
+        status: res.status,
+        headers,
         body: bodyBase64
       });
-    }).catch((err) => {
-      const isTimeout = err.message === "timeout";
-      this.send({
-        type: "response",
-        id: req.id,
-        status: isTimeout ? 504 : 502,
-        headers: { "content-type": "text/plain" },
-        body: Buffer.from(
-          isTimeout ? "Tunnel: request timeout" : `Tunnel: local service error: ${err.message}`
-        ).toString("base64")
-      });
-    });
+    } catch (err) {
+      clearTimeout(timeout);
+      if (err.name === "AbortError") {
+        this.send({
+          type: "response",
+          id: req.id,
+          status: 504,
+          headers: { "content-type": "text/plain" },
+          body: Buffer.from("Tunnel: request timeout").toString("base64")
+        });
+      } else {
+        this.send({
+          type: "response",
+          id: req.id,
+          status: 502,
+          headers: { "content-type": "text/plain" },
+          body: Buffer.from(`Tunnel: local service error: ${err.message}`).toString("base64")
+        });
+      }
+    }
   }
   // ── WebSocket proxying ───────────────────────────────────────────────
   async handleWsOpen(msg) {
@@ -225,10 +209,14 @@ class TunnelClient {
     const localWs = this.localWebSockets.get(msg.id);
     if (!localWs || localWs.readyState !== WebSocket.OPEN) return;
     const buf = Buffer.from(msg.data, "base64");
-    if (msg.is_text) {
-      localWs.send(buf.toString("utf8"));
-    } else {
-      localWs.send(buf);
+    try {
+      if (msg.is_text) {
+        localWs.send(buf.toString("utf8"));
+      } else {
+        localWs.send(buf);
+      }
+    } catch (err) {
+      this.options.onError?.(err);
     }
   }
   handleWsClose(msg) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svamp-cli",
-  "version": "0.1.63",
+  "version": "0.1.65",
   "description": "Svamp CLI — AI workspace daemon on Hypha Cloud",
   "author": "Amun AI AB",
   "license": "SEE LICENSE IN LICENSE",
@@ -20,7 +20,7 @@
   "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-tunnel-proxy.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",
     "test:hypha": "node --no-warnings test/test-hypha-service.mjs",
     "dev": "tsx src/cli.ts",
     "dev:daemon": "tsx src/cli.ts daemon start-sync",