svamp-cli 0.1.21 → 0.1.22

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { s as startDaemon, b as stopDaemon, d as daemonStatus } from './run-DMW8ibIw.mjs';
+import { s as startDaemon, b as stopDaemon, d as daemonStatus } from './run-DwK3dfHd.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';
@@ -75,7 +75,7 @@ async function main() {
   } else if (subcommand === "--help" || subcommand === "-h" || !subcommand) {
     printHelp();
   } else if (subcommand === "--version" || subcommand === "-v") {
-    const pkg = await import('./package-Bnij-ZtR.mjs').catch(() => ({ default: { version: "unknown" } }));
+    const pkg = await import('./package-JqEt5Ib4.mjs').catch(() => ({ default: { version: "unknown" } }));
     console.log(`svamp version: ${pkg.default.version}`);
   } else {
     console.error(`Unknown command: ${subcommand}`);
@@ -90,7 +90,7 @@ async function handleAgentCommand() {
     return;
   }
   if (agentArgs[0] === "list") {
-    const { KNOWN_ACP_AGENTS } = await import('./run-DMW8ibIw.mjs').then(function (n) { return n.f; });
+    const { KNOWN_ACP_AGENTS } = await import('./run-DwK3dfHd.mjs').then(function (n) { return n.f; });
     console.log("Known ACP agents:");
     for (const [name, config2] of Object.entries(KNOWN_ACP_AGENTS)) {
       console.log(`  ${name.padEnd(12)} ${config2.command} ${config2.args.join(" ")}`);
@@ -99,10 +99,10 @@ async function handleAgentCommand() {
     console.log('Use "svamp agent -- <command> [args]" for a custom ACP agent.');
     return;
   }
-  const { resolveAcpAgentConfig } = await import('./run-DMW8ibIw.mjs').then(function (n) { return n.f; });
-  const { AcpBackend } = await import('./run-DMW8ibIw.mjs').then(function (n) { return n.e; });
-  const { GeminiTransport } = await import('./run-DMW8ibIw.mjs').then(function (n) { return n.G; });
-  const { DefaultTransport } = await import('./run-DMW8ibIw.mjs').then(function (n) { return n.D; });
+  const { resolveAcpAgentConfig } = await import('./run-DwK3dfHd.mjs').then(function (n) { return n.f; });
+  const { AcpBackend } = await import('./run-DwK3dfHd.mjs').then(function (n) { return n.e; });
+  const { GeminiTransport } = await import('./run-DwK3dfHd.mjs').then(function (n) { return n.G; });
+  const { DefaultTransport } = await import('./run-DwK3dfHd.mjs').then(function (n) { return n.D; });
   let cwd = process.cwd();
   const filteredArgs = [];
   for (let i = 0; i < agentArgs.length; i++) {
@@ -231,7 +231,7 @@ async function handleSessionCommand() {
     printSessionHelp();
     return;
   }
-  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach } = await import('./commands-1CYZC6Xh.mjs');
+  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach } = await import('./commands-CKpC8R9T.mjs');
   if (sessionSubcommand === "list" || sessionSubcommand === "ls") {
     await sessionList();
   } else if (sessionSubcommand === "spawn") {

package/dist/commands-CKpC8R9T.mjs

@@ -0,0 +1,481 @@
+import { existsSync, readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import os from 'node:os';
+import { c as connectToHypha } from './run-DwK3dfHd.mjs';
+import 'os';
+import 'fs/promises';
+import 'fs';
+import 'path';
+import 'url';
+import 'child_process';
+import 'crypto';
+import 'node:crypto';
+import 'node:child_process';
+import '@agentclientprotocol/sdk';
+
+const SVAMP_HOME = process.env.SVAMP_HOME || join(os.homedir(), ".svamp");
+const DAEMON_STATE_FILE = join(SVAMP_HOME, "daemon.state.json");
+const ENV_FILE = join(SVAMP_HOME, ".env");
+function loadDotEnv() {
+  if (!existsSync(ENV_FILE)) return;
+  const lines = readFileSync(ENV_FILE, "utf-8").split("\n");
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (!trimmed || trimmed.startsWith("#")) continue;
+    const eqIdx = trimmed.indexOf("=");
+    if (eqIdx === -1) continue;
+    const key = trimmed.slice(0, eqIdx).trim();
+    const value = trimmed.slice(eqIdx + 1).trim().replace(/^["']|["']$/g, "");
+    if (!process.env[key]) {
+      process.env[key] = value;
+    }
+  }
+}
+function readDaemonState() {
+  if (!existsSync(DAEMON_STATE_FILE)) return null;
+  try {
+    return JSON.parse(readFileSync(DAEMON_STATE_FILE, "utf-8"));
+  } catch {
+    return null;
+  }
+}
+function isDaemonAlive(state) {
+  try {
+    process.kill(state.pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function connectAndGetMachine() {
+  loadDotEnv();
+  const state = readDaemonState();
+  if (!state || !isDaemonAlive(state)) {
+    console.error('Daemon is not running. Start it with "svamp daemon start".');
+    process.exit(1);
+  }
+  const serverUrl = process.env.HYPHA_SERVER_URL || state.hyphaServerUrl;
+  const token = process.env.HYPHA_TOKEN;
+  if (!serverUrl) {
+    console.error('No Hypha server URL. Run "svamp login <url>" first.');
+    process.exit(1);
+  }
+  const origLog = console.log;
+  const origWarn = console.warn;
+  const origInfo = console.info;
+  const origError = console.error;
+  const stdoutWrite = process.stdout.write.bind(process.stdout);
+  const stderrWrite = process.stderr.write.bind(process.stderr);
+  const isHyphaLog = (chunk) => typeof chunk === "string" && (chunk.includes("WebSocket connection") || chunk.includes("Connection established") || chunk.includes("registering service built-in") || chunk.includes("registered service") || chunk.includes("registered all") || chunk.includes("Subscribing to client_") || chunk.includes("subscribed to client_") || chunk.includes("subscribe to client_") || chunk.includes("Cleaning up all sessions") || chunk.includes("WebSocket connection disconnected") || chunk.includes("local RPC disconnection") || chunk.includes("Timeout registering service") || chunk.includes("Failed to subscribe to client_disconnected") || chunk.includes("Timeout subscribing to client_disconnected"));
+  console.log = () => {
+  };
+  console.warn = () => {
+  };
+  console.info = () => {
+  };
+  console.error = (...args) => {
+    if (args.some((a) => isHyphaLog(a))) return;
+    origError(...args);
+  };
+  process.stdout.write = (chunk, ...args) => {
+    if (isHyphaLog(chunk)) return true;
+    return stdoutWrite(chunk, ...args);
+  };
+  process.stderr.write = (chunk, ...args) => {
+    if (isHyphaLog(chunk)) return true;
+    return stderrWrite(chunk, ...args);
+  };
+  const restoreConsole = () => {
+    console.log = origLog;
+    console.warn = origWarn;
+    console.info = origInfo;
+    console.error = origError;
+  };
+  let server;
+  try {
+    server = await connectToHypha({
+      serverUrl,
+      token,
+      name: "svamp-session-cli"
+    });
+  } catch (err) {
+    restoreConsole();
+    console.error(`Failed to connect to Hypha: ${err.message}`);
+    process.exit(1);
+  }
+  let machine;
+  if (state.machineId) {
+    try {
+      machine = await server.getService(`svamp-machine-${state.machineId}`);
+    } catch {
+    }
+  }
+  if (!machine) {
+    try {
+      const services = await server.listServices();
+      const machineServices = services.filter((svc) => {
+        const sid = svc.id || svc.name || "";
+        return sid.includes("svamp-machine-");
+      });
+      if (machineServices.length === 0) {
+        restoreConsole();
+        console.error("No machine service found. Is the daemon registered on Hypha?");
+        await server.disconnect();
+        process.exit(1);
+      }
+      const svcId = machineServices[0].id || machineServices[0].name;
+      machine = await server.getService(svcId);
+    } catch (err) {
+      restoreConsole();
+      console.error(`Failed to discover machine service: ${err.message}`);
+      await server.disconnect();
+      process.exit(1);
+    }
+  }
+  restoreConsole();
+  return { server, machine };
+}
+function resolveSessionId(sessions, partial) {
+  const exact = sessions.find((s) => s.sessionId === partial);
+  if (exact) return exact;
+  const matches = sessions.filter((s) => s.sessionId.startsWith(partial));
+  if (matches.length === 1) return matches[0];
+  if (matches.length === 0) {
+    console.error(`No session found matching: ${partial}`);
+    console.error('Run "svamp session list" to see active sessions.');
+    process.exit(1);
+  }
+  console.error(`Ambiguous session ID "${partial}". Matches:`);
+  for (const s of matches) {
+    console.error(`  ${s.sessionId}`);
+  }
+  process.exit(1);
+}
+function truncate(str, max) {
+  if (str.length <= max) return str;
+  return "..." + str.slice(str.length - max + 3);
+}
+function renderMessage(msg) {
+  const content = msg.content;
+  if (!content) return;
+  const role = content.role;
+  if (role === "user") {
+    const data = content.content;
+    let text;
+    if (typeof data === "string") {
+      try {
+        const parsed = JSON.parse(data);
+        text = parsed?.text || parsed?.content?.text || data;
+      } catch {
+        text = data;
+      }
+    } else if (data?.text) {
+      text = data.text;
+    } else if (data?.type === "text") {
+      text = data.text || "";
+    } else {
+      text = typeof data === "object" ? JSON.stringify(data) : String(data || "");
+    }
+    console.log(`\x1B[36m[user]\x1B[0m ${text}`);
+  } else if (role === "agent" || role === "assistant") {
+    const data = content.content?.data || content.content;
+    if (!data) return;
+    if (data.type === "assistant" && Array.isArray(data.content)) {
+      for (const block of data.content) {
+        if (block.type === "text" && block.text) {
+          process.stdout.write(block.text);
+          if (!block.text.endsWith("\n")) process.stdout.write("\n");
+        } else if (block.type === "tool_use") {
+          const argsStr = JSON.stringify(block.input || {}).slice(0, 120);
+          console.log(`\x1B[33m[tool]\x1B[0m ${block.name}(${argsStr})`);
+        } else if (block.type === "tool_result") {
+          const resultStr = typeof block.content === "string" ? block.content : JSON.stringify(block.content || "");
+          console.log(`\x1B[90m[result]\x1B[0m ${resultStr.slice(0, 200)}${resultStr.length > 200 ? "..." : ""}`);
+        } else if (block.type === "thinking") {
+          const text = block.thinking || block.text || "";
+          if (text) console.log(`\x1B[90m[thinking] ${text.slice(0, 200)}\x1B[0m`);
+        }
+      }
+    } else if (data.type === "result") {
+      if (data.result) console.log(`\x1B[32m[done]\x1B[0m ${data.result}`);
+    } else if (data.type === "output") {
+      const inner = data.data;
+      if (inner?.type === "assistant" && Array.isArray(inner.content)) {
+        for (const block of inner.content) {
+          if (block.type === "text" && block.text) {
+            process.stdout.write(block.text);
+            if (!block.text.endsWith("\n")) process.stdout.write("\n");
+          } else if (block.type === "tool_use") {
+            const argsStr = JSON.stringify(block.input || {}).slice(0, 120);
+            console.log(`\x1B[33m[tool]\x1B[0m ${block.name}(${argsStr})`);
+          } else if (block.type === "tool_result") {
+            const resultStr = typeof block.content === "string" ? block.content : JSON.stringify(block.content || "");
+            console.log(`\x1B[90m[result]\x1B[0m ${resultStr.slice(0, 200)}${resultStr.length > 200 ? "..." : ""}`);
+          }
+        }
+      } else if (inner?.type === "result") {
+        if (inner.result) console.log(`\x1B[32m[done]\x1B[0m ${inner.result}`);
+      }
+    }
+  } else if (role === "session") {
+    const data = content.content?.data;
+    if (data?.type === "system" && data?.subtype === "init") {
+      console.log(`\x1B[90m[session init]\x1B[0m`);
+    }
+  }
+}
+async function sessionList() {
+  const { server, machine } = await connectAndGetMachine();
+  try {
+    const sessions = await machine.listSessions();
+    if (sessions.length === 0) {
+      console.log("No active sessions.");
+      return;
+    }
+    const enriched = [];
+    for (const s of sessions) {
+      let flavor = "claude";
+      let name = "";
+      if (s.metadata) {
+        flavor = s.metadata.flavor || "claude";
+        name = s.metadata.name || "";
+      }
+      if (!name && s.active) {
+        try {
+          const svc = await server.getService(`svamp-session-${s.sessionId}`);
+          const { metadata } = await svc.getMetadata();
+          flavor = metadata?.flavor || flavor;
+          name = metadata?.name || "";
+        } catch {
+        }
+      }
+      enriched.push({ ...s, flavor, name });
+    }
+    const header = `${"ID".padEnd(10)} ${"AGENT".padEnd(10)} ${"STATUS".padEnd(9)} ${"NAME".padEnd(25)} ${"DIRECTORY".padEnd(35)}`;
+    console.log(header);
+    console.log("-".repeat(header.length));
+    for (const s of enriched) {
+      const id = s.sessionId.slice(0, 8);
+      const agent = (s.flavor || "claude").padEnd(10);
+      const status = s.active ? "\x1B[32mactive\x1B[0m  " : "\x1B[90minactive\x1B[0m";
+      const name = truncate(s.name || "-", 25).padEnd(25);
+      const dir = truncate(s.directory || "-", 33).padEnd(35);
+      console.log(`${id.padEnd(10)} ${agent} ${status} ${name} ${dir}`);
+    }
+  } finally {
+    await server.disconnect();
+  }
+}
+async function sessionSpawn(agent, directory) {
+  const { server, machine } = await connectAndGetMachine();
+  try {
+    console.log(`Spawning ${agent} session in ${directory}...`);
+    const result = await machine.spawnSession({
+      directory,
+      agent
+    });
+    if (result.type === "success") {
+      console.log(`Session started: ${result.sessionId}`);
+      if (result.message) console.log(`  ${result.message}`);
+    } else if (result.type === "requestToApproveDirectoryCreation") {
+      console.error(`Directory ${result.directory} does not exist. Create it first or use an existing directory.`);
+      process.exit(1);
+    } else {
+      console.error(`Failed: ${result.errorMessage || "Unknown error"}`);
+      process.exit(1);
+    }
+  } finally {
+    await server.disconnect();
+  }
+}
+async function sessionStop(sessionId) {
+  const { server, machine } = await connectAndGetMachine();
+  try {
+    const sessions = await machine.listSessions();
+    const match = resolveSessionId(sessions, sessionId);
+    const success = await machine.stopSession(match.sessionId);
+    if (success) {
+      console.log(`Session ${match.sessionId.slice(0, 8)} stopped.`);
+    } else {
+      console.error("Failed to stop session (not found on daemon).");
+      process.exit(1);
+    }
+  } finally {
+    await server.disconnect();
+  }
+}
+async function sessionInfo(sessionId) {
+  const { server, machine } = await connectAndGetMachine();
+  try {
+    const sessions = await machine.listSessions();
+    const match = resolveSessionId(sessions, sessionId);
+    const fullId = match.sessionId;
+    let metadata = {};
+    let activity = {};
+    try {
+      const svc = await server.getService(`svamp-session-${fullId}`);
+      const metaResult = await svc.getMetadata();
+      metadata = metaResult.metadata || {};
+      activity = await svc.getActivityState();
+    } catch {
+    }
+    console.log(`Session:    ${fullId}`);
+    console.log(`Agent:      ${metadata.flavor || "claude"}`);
+    console.log(`Name:       ${metadata.name || "(unnamed)"}`);
+    console.log(`Directory:  ${metadata.path || match.directory || "-"}`);
+    console.log(`Host:       ${metadata.host || "-"}`);
+    console.log(`State:      ${metadata.lifecycleState || "unknown"}`);
+    console.log(`Active:     ${activity.active ?? "-"}`);
+    console.log(`Thinking:   ${activity.thinking ?? "-"}`);
+    console.log(`Started by: ${metadata.startedBy || match.startedBy || "-"}`);
+    if (metadata.summary?.text) {
+      console.log(`Summary:    ${metadata.summary.text}`);
+    }
+    if (metadata.claudeSessionId) {
+      console.log(`Claude ID:  ${metadata.claudeSessionId}`);
+    }
+    if (metadata.sessionLink?.url) {
+      console.log(`Link:       ${metadata.sessionLink.url}`);
+    }
+  } finally {
+    await server.disconnect();
+  }
+}
+async function sessionMessages(sessionId, last) {
+  const { server, machine } = await connectAndGetMachine();
+  try {
+    const sessions = await machine.listSessions();
+    const match = resolveSessionId(sessions, sessionId);
+    const fullId = match.sessionId;
+    const svc = await server.getService(`svamp-session-${fullId}`);
+    const { messages } = await svc.getMessages(0, 1e3);
+    const toShow = last ? messages.slice(-last) : messages;
+    if (toShow.length === 0) {
+      console.log("No messages yet.");
+      return;
+    }
+    for (const msg of toShow) {
+      renderMessage(msg);
+    }
+  } finally {
+    await server.disconnect();
+  }
+}
+async function sessionAttach(sessionId) {
+  const { server, machine } = await connectAndGetMachine();
+  const sessions = await machine.listSessions();
+  const match = resolveSessionId(sessions, sessionId);
+  const fullId = match.sessionId;
+  let svc;
+  try {
+    svc = await server.getService(`svamp-session-${fullId}`);
+  } catch (err) {
+    console.error(`Could not find session service: ${err.message}`);
+    await server.disconnect();
+    process.exit(1);
+  }
+  const { metadata } = await svc.getMetadata();
+  const flavor = metadata?.flavor || "claude";
+  const name = metadata?.name || fullId.slice(0, 8);
+  console.log(`Attached to ${flavor} session "${name}". Commands: /quit /abort /kill
+`);
+  const seenMessageIds = /* @__PURE__ */ new Set();
+  let replayDone = false;
+  await svc.registerListener({
+    onUpdate: (update) => {
+      if (update.type === "new-message") {
+        const msg = update.message;
+        if (!msg?.id) return;
+        if (seenMessageIds.has(msg.id)) return;
+        seenMessageIds.add(msg.id);
+        if (!replayDone) return;
+        renderMessage(msg);
+      } else if (update.type === "activity") {
+        if (!replayDone) return;
+        if (update.thinking) {
+          process.stdout.write("\x1B[90m[thinking...]\x1B[0m\r");
+        } else if (!update.active) {
+          process.stdout.write("\n> ");
+        }
+      } else if (update.type === "update-session") ;
+    }
+  });
+  await new Promise((r) => setTimeout(r, 500));
+  replayDone = true;
+  console.log(`\x1B[90m(${seenMessageIds.size} messages in history)\x1B[0m`);
+  process.stdout.write("> ");
+  const readline = await import('readline');
+  const rl = readline.createInterface({
+    input: process.stdin,
+    output: process.stdout,
+    terminal: true
+  });
+  rl.on("line", async (line) => {
+    const trimmed = line.trim();
+    if (!trimmed) {
+      process.stdout.write("> ");
+      return;
+    }
+    if (trimmed === "/quit" || trimmed === "/detach") {
+      console.log("Detaching (session continues running)...");
+      rl.close();
+      await server.disconnect();
+      process.exit(0);
+    }
+    if (trimmed === "/abort" || trimmed === "/cancel") {
+      try {
+        await svc.abort();
+        console.log("Abort sent.");
+      } catch (err) {
+        console.error(`Abort failed: ${err.message}`);
+      }
+      process.stdout.write("> ");
+      return;
+    }
+    if (trimmed === "/kill") {
+      try {
+        await svc.killSession();
+        console.log("Session killed.");
+      } catch (err) {
+        console.error(`Kill failed: ${err.message}`);
+      }
+      rl.close();
+      await server.disconnect();
+      process.exit(0);
+    }
+    if (trimmed === "/info") {
+      try {
+        const { metadata: m } = await svc.getMetadata();
+        const act = await svc.getActivityState();
+        console.log(`  Agent: ${m?.flavor || "claude"}, State: ${m?.lifecycleState || "?"}, Active: ${act?.active}, Thinking: ${act?.thinking}`);
+      } catch (err) {
+        console.error(`Info failed: ${err.message}`);
+      }
+      process.stdout.write("> ");
+      return;
+    }
+    try {
+      await svc.sendMessage(
+        JSON.stringify({
+          role: "user",
+          content: { type: "text", text: trimmed }
+        })
+      );
+    } catch (err) {
+      console.error(`Send failed: ${err.message}`);
+      process.stdout.write("> ");
+    }
+  });
+  rl.on("close", async () => {
+    await server.disconnect();
+    process.exit(0);
+  });
+  process.on("SIGINT", async () => {
+    console.log("\nDetaching (session continues running)...");
+    rl.close();
+    await server.disconnect();
+    process.exit(0);
+  });
+}
+
+export { sessionAttach, sessionInfo, sessionList, sessionMessages, sessionSpawn, sessionStop };

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-DMW8ibIw.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-DwK3dfHd.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';

package/dist/package-JqEt5Ib4.mjs

@@ -0,0 +1,57 @@
+var name = "svamp-cli";
+var version = "0.1.22";
+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.15",
+	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 };