svamp-cli 0.1.37 → 0.1.39

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { s as startDaemon, b as stopDaemon, d as daemonStatus } from './run-fEuWMTdD.mjs';
+import { s as startDaemon, b as stopDaemon, d as daemonStatus } from './run-CXrEt0TM.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';
@@ -91,7 +91,7 @@ async function main() {
   } else if (!subcommand || subcommand === "start") {
     await handleInteractiveCommand();
   } else if (subcommand === "--version" || subcommand === "-v") {
-    const pkg = await import('./package-BK_ln_DQ.mjs').catch(() => ({ default: { version: "unknown" } }));
+    const pkg = await import('./package-BbzWWqQK.mjs').catch(() => ({ default: { version: "unknown" } }));
     console.log(`svamp version: ${pkg.default.version}`);
   } else {
     console.error(`Unknown command: ${subcommand}`);
@@ -100,7 +100,7 @@ async function main() {
   }
 }
 async function handleInteractiveCommand() {
-  const { runInteractive } = await import('./run-LXKUEpHX.mjs');
+  const { runInteractive } = await import('./run-D19RL_zw.mjs');
   const interactiveArgs = subcommand === "start" ? args.slice(1) : args;
   let directory = process.cwd();
   let resumeSessionId;
@@ -145,7 +145,7 @@ async function handleAgentCommand() {
     return;
   }
   if (agentArgs[0] === "list") {
-    const { KNOWN_ACP_AGENTS, KNOWN_MCP_AGENTS: KNOWN_MCP_AGENTS2 } = await import('./run-fEuWMTdD.mjs').then(function (n) { return n.f; });
+    const { KNOWN_ACP_AGENTS, KNOWN_MCP_AGENTS: KNOWN_MCP_AGENTS2 } = await import('./run-CXrEt0TM.mjs').then(function (n) { return n.f; });
     console.log("Known agents:");
     for (const [name, config2] of Object.entries(KNOWN_ACP_AGENTS)) {
       console.log(`  ${name.padEnd(12)} ${config2.command} ${config2.args.join(" ")}  (ACP)`);
@@ -157,7 +157,7 @@ async function handleAgentCommand() {
     console.log('Use "svamp agent -- <command> [args]" for a custom ACP agent.');
     return;
   }
-  const { resolveAcpAgentConfig, KNOWN_MCP_AGENTS } = await import('./run-fEuWMTdD.mjs').then(function (n) { return n.f; });
+  const { resolveAcpAgentConfig, KNOWN_MCP_AGENTS } = await import('./run-CXrEt0TM.mjs').then(function (n) { return n.f; });
   let cwd = process.cwd();
   const filteredArgs = [];
   for (let i = 0; i < agentArgs.length; i++) {
@@ -181,12 +181,12 @@ async function handleAgentCommand() {
   console.log(`Starting ${config.agentName} agent in ${cwd}...`);
   let backend;
   if (KNOWN_MCP_AGENTS[config.agentName]) {
-    const { CodexMcpBackend } = await import('./run-fEuWMTdD.mjs').then(function (n) { return n.h; });
+    const { CodexMcpBackend } = await import('./run-CXrEt0TM.mjs').then(function (n) { return n.h; });
     backend = new CodexMcpBackend({ cwd, log: logFn });
   } else {
-    const { AcpBackend } = await import('./run-fEuWMTdD.mjs').then(function (n) { return n.e; });
-    const { GeminiTransport } = await import('./run-fEuWMTdD.mjs').then(function (n) { return n.G; });
-    const { DefaultTransport } = await import('./run-fEuWMTdD.mjs').then(function (n) { return n.D; });
+    const { AcpBackend } = await import('./run-CXrEt0TM.mjs').then(function (n) { return n.e; });
+    const { GeminiTransport } = await import('./run-CXrEt0TM.mjs').then(function (n) { return n.G; });
+    const { DefaultTransport } = await import('./run-CXrEt0TM.mjs').then(function (n) { return n.D; });
     const transportHandler = config.agentName === "gemini" ? new GeminiTransport() : new DefaultTransport(config.agentName);
     backend = new AcpBackend({
       agentName: config.agentName,
@@ -304,7 +304,7 @@ async function handleSessionCommand() {
     printSessionHelp();
     return;
   }
-  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait } = await import('./commands-EjpBlIl0.mjs');
+  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait } = await import('./commands-Du-fdLLu.mjs');
   const parseFlagStr = (flag, shortFlag) => {
     for (let i = 1; i < sessionArgs.length; i++) {
       if ((sessionArgs[i] === flag || shortFlag) && i + 1 < sessionArgs.length) {

package/dist/{commands-EjpBlIl0.mjs → commands-Du-fdLLu.mjs}

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import os from 'node:os';
-import { c as connectToHypha } from './run-fEuWMTdD.mjs';
+import { c as connectToHypha } from './run-CXrEt0TM.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { c as connectToHypha, d as daemonStatus, g as getHyphaServerUrl, r as registerMachineService, a as registerSessionService, s as startDaemon, b as stopDaemon } from './run-fEuWMTdD.mjs';
+export { c as connectToHypha, d as daemonStatus, g as getHyphaServerUrl, r as registerMachineService, a as registerSessionService, s as startDaemon, b as stopDaemon } from './run-CXrEt0TM.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';

package/dist/{package-BK_ln_DQ.mjs → package-BbzWWqQK.mjs}

@@ -1,5 +1,5 @@
 var name = "svamp-cli";
-var version = "0.1.37";
+var version = "0.1.39";
 var description = "Svamp CLI — AI workspace daemon on Hypha Cloud";
 var author = "Amun AI AB";
 var license = "SEE LICENSE IN LICENSE";

package/dist/{run-fEuWMTdD.mjs → run-CXrEt0TM.mjs}

@@ -3556,8 +3556,34 @@ async function startDaemon() {
     }
   });
   if (isDaemonAlive()) {
-    console.log("Svamp daemon is already running");
-    process.exit(0);
+    const supervised = process.env.SVAMP_SUPERVISED === "1";
+    if (supervised) {
+      const state = readDaemonStateFile();
+      if (state) {
+        console.log(`Supervised daemon: taking over from existing PID ${state.pid}`);
+        try {
+          process.kill(state.pid, "SIGTERM");
+        } catch {
+        }
+        for (let i = 0; i < 50; i++) {
+          await new Promise((r) => setTimeout(r, 200));
+          try {
+            process.kill(state.pid, 0);
+          } catch {
+            break;
+          }
+        }
+        try {
+          process.kill(state.pid, 0);
+          process.kill(state.pid, "SIGKILL");
+        } catch {
+        }
+        cleanupDaemonStateFile();
+      }
+    } else {
+      console.log("Svamp daemon is already running");
+      process.exit(0);
+    }
   }
   const hyphaServerUrl = process.env.HYPHA_SERVER_URL;
   if (!hyphaServerUrl) {
@@ -4782,6 +4808,7 @@ async function startDaemon() {
           logger.log(`svamp-cli version changed on disk: ${DAEMON_VERSION} \u2192 ${installedVersion}. Self-restarting...`);
           const supervised2 = process.env.SVAMP_SUPERVISED === "1";
           if (!supervised2) {
+            cleanupDaemonStateFile();
             const { spawn: spawnSelf } = await import('child_process');
             spawnSelf(process.argv[0], process.argv.slice(1), {
               detached: true,

package/dist/{run-LXKUEpHX.mjs → run-D19RL_zw.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-fEuWMTdD.mjs';
+import { c as connectToHypha, a as registerSessionService } from './run-CXrEt0TM.mjs';
 import { createServer } from 'node:http';
 import { spawn } from 'node:child_process';
 import { createInterface } from 'node:readline';
@@ -417,6 +417,10 @@ async function runClaudeTurn(opts) {
     args.push(...opts.claudeArgs);
   }
   opts.log(`[remote] Spawning: claude ${args.join(" ")}`);
+  process.stderr.write(`
+\x1B[34m  \u25B6 User:\x1B[0m ${opts.message}
+
+`);
   const spawnEnv = { ...process.env, CLAUDE_CODE_ENTRYPOINT: "sdk-ts" };
   delete spawnEnv.CLAUDECODE;
   const child = spawn(opts.claudeBin, args, {
@@ -517,11 +521,9 @@ function handleSDKMessage(msg, opts, write) {
       break;
     }
     case "result": {
-      if (msg.result) {
-        write(`
-\x1B[32m[done]\x1B[0m ${msg.result}
+      write(`
+\x1B[32m[done]\x1B[0m
 `);
-      }
       break;
     }
     default:
@@ -821,9 +823,19 @@ async function runInteractive(options) {
   restoreConsoleLogs();
   console.log(`\x1B[36mSvamp interactive mode\x1B[0m`);
   if (server && sessionService) {
+    const serviceId = sessionService.serviceInfo?.id || `svamp-session-${sessionId}`;
+    const slashIdx = serviceId.indexOf("/");
+    const colonIdx = serviceId.indexOf(":");
+    let serviceUrl = "";
+    if (slashIdx > 0 && colonIdx > slashIdx) {
+      const workspace = serviceId.slice(0, slashIdx);
+      const clientAndService = serviceId.slice(slashIdx + 1);
+      serviceUrl = `${serverUrl}/${workspace}/services/${clientAndService}`;
+    }
     console.log(`\x1B[90mSession synced to Hypha \u2014 visible in the web app\x1B[0m`);
-    console.log(`\x1B[90mServer:     ${serverUrl}\x1B[0m`);
-    console.log(`\x1B[90mService ID: ${sessionService.serviceInfo?.id || `svamp-session-${sessionId}`}\x1B[0m`);
+    if (serviceUrl) {
+      console.log(`\x1B[90mService:    ${serviceUrl}\x1B[0m`);
+    }
     console.log(`\x1B[90mSession ID: ${sessionId.slice(0, 8)}\x1B[0m`);
   }
   console.log("");
@@ -856,7 +868,10 @@ async function runInteractive(options) {
       onMessage: (msg) => {
         if (!sessionService) return;
         if (msg.type === "assistant" && msg.message) {
-          sessionService.pushMessage(msg.message, "agent");
+          sessionService.pushMessage({
+            type: "assistant",
+            message: msg.message
+          }, "agent");
         } else if (msg.type === "user" && msg.message) {
           const text = typeof msg.message.content === "string" ? msg.message.content : msg.message.content?.text || JSON.stringify(msg.message.content);
           sessionService.pushMessage({ type: "text", text }, "user");

package/package.json

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

package/dist/package-DqJE7fYO.mjs

@@ -1,57 +0,0 @@
-var name = "svamp-cli";
-var version = "0.1.36";
-var description = "Svamp CLI — AI workspace daemon on Hypha Cloud";
-var author = "Amun AI AB";
-var license = "SEE LICENSE IN LICENSE";
-var type = "module";
-var bin = {
-	svamp: "./bin/svamp.mjs"
-};
-var files = [
-	"dist",
-	"bin"
-];
-var main = "./dist/index.mjs";
-var exports$1 = {
-	".": "./dist/index.mjs",
-	"./cli": "./dist/cli.mjs"
-};
-var scripts = {
-	build: "tsc --noEmit && pkgroll",
-	typecheck: "tsc --noEmit",
-	"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"
-};
-var dependencies = {
-	"@agentclientprotocol/sdk": "^0.14.1",
-	"@modelcontextprotocol/sdk": "^1.25.3",
-	"hypha-rpc": "0.21.20",
-	zod: "^3.24.4"
-};
-var devDependencies = {
-	"@types/node": ">=20",
-	pkgroll: "^2.14.2",
-	tsx: "^4.20.6",
-	typescript: "5.9.3"
-};
-var packageManager = "yarn@1.22.22";
-var _package = {
-	name: name,
-	version: version,
-	description: description,
-	author: author,
-	license: license,
-	type: type,
-	bin: bin,
-	files: files,
-	main: main,
-	exports: exports$1,
-	scripts: scripts,
-	dependencies: dependencies,
-	devDependencies: devDependencies,
-	packageManager: packageManager
-};
-
-export { author, bin, _package as default, dependencies, description, devDependencies, exports$1 as exports, files, license, main, name, packageManager, scripts, type, version };