svamp-cli 0.1.30 → 0.1.32

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { s as startDaemon, b as stopDaemon, d as daemonStatus } from './run-dBWhjQRf.mjs';
+import { s as startDaemon, b as stopDaemon, d as daemonStatus } from './run-fEuWMTdD.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';
@@ -89,7 +89,7 @@ async function main() {
   } else if (subcommand === "--help" || subcommand === "-h" || !subcommand) {
     printHelp();
   } else if (subcommand === "--version" || subcommand === "-v") {
-    const pkg = await import('./package-CKOQ5lA7.mjs').catch(() => ({ default: { version: "unknown" } }));
+    const pkg = await import('./package-CMmjP_vD.mjs').catch(() => ({ default: { version: "unknown" } }));
     console.log(`svamp version: ${pkg.default.version}`);
   } else {
     console.error(`Unknown command: ${subcommand}`);
@@ -104,19 +104,19 @@ async function handleAgentCommand() {
     return;
   }
   if (agentArgs[0] === "list") {
-    const { KNOWN_ACP_AGENTS } = await import('./run-dBWhjQRf.mjs').then(function (n) { return n.f; });
-    console.log("Known ACP agents:");
+    const { KNOWN_ACP_AGENTS, KNOWN_MCP_AGENTS: KNOWN_MCP_AGENTS2 } = await import('./run-fEuWMTdD.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(" ")}`);
+      console.log(`  ${name.padEnd(12)} ${config2.command} ${config2.args.join(" ")}  (ACP)`);
+    }
+    for (const [name, config2] of Object.entries(KNOWN_MCP_AGENTS2)) {
+      console.log(`  ${name.padEnd(12)} ${config2.command} ${config2.args.join(" ")}  (MCP)`);
     }
     console.log('\nUse "svamp agent <name>" to start an interactive session.');
     console.log('Use "svamp agent -- <command> [args]" for a custom ACP agent.');
     return;
   }
-  const { resolveAcpAgentConfig } = await import('./run-dBWhjQRf.mjs').then(function (n) { return n.f; });
-  const { AcpBackend } = await import('./run-dBWhjQRf.mjs').then(function (n) { return n.e; });
-  const { GeminiTransport } = await import('./run-dBWhjQRf.mjs').then(function (n) { return n.G; });
-  const { DefaultTransport } = await import('./run-dBWhjQRf.mjs').then(function (n) { return n.D; });
+  const { resolveAcpAgentConfig, KNOWN_MCP_AGENTS } = await import('./run-fEuWMTdD.mjs').then(function (n) { return n.f; });
   let cwd = process.cwd();
   const filteredArgs = [];
   for (let i = 0; i < agentArgs.length; i++) {
@@ -134,20 +134,28 @@ async function handleAgentCommand() {
     console.error(err.message);
     process.exit(1);
   }
+  const logFn = (...logArgs) => {
+    if (process.env.DEBUG) console.error("[debug]", ...logArgs);
+  };
   console.log(`Starting ${config.agentName} agent in ${cwd}...`);
-  const transportHandler = config.agentName === "gemini" ? new GeminiTransport() : new DefaultTransport(config.agentName);
-  const backend = new AcpBackend({
-    agentName: config.agentName,
-    cwd,
-    command: config.command,
-    args: config.args,
-    transportHandler,
-    log: (...logArgs) => {
-      if (process.env.DEBUG) {
-        console.error("[debug]", ...logArgs);
-      }
-    }
-  });
+  let backend;
+  if (KNOWN_MCP_AGENTS[config.agentName]) {
+    const { CodexMcpBackend } = await import('./run-fEuWMTdD.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 transportHandler = config.agentName === "gemini" ? new GeminiTransport() : new DefaultTransport(config.agentName);
+    backend = new AcpBackend({
+      agentName: config.agentName,
+      cwd,
+      command: config.command,
+      args: config.args,
+      transportHandler,
+      log: logFn
+    });
+  }
   let currentText = "";
   backend.onMessage((msg) => {
     switch (msg.type) {
@@ -255,7 +263,7 @@ async function handleSessionCommand() {
     printSessionHelp();
     return;
   }
-  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait } = await import('./commands-C5pW2VmI.mjs');
+  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait } = await import('./commands-EjpBlIl0.mjs');
   const parseFlagStr = (flag, shortFlag) => {
     for (let i = 1; i < sessionArgs.length; i++) {
       if ((sessionArgs[i] === flag || shortFlag) && i + 1 < sessionArgs.length) {
@@ -660,8 +668,8 @@ Usage:
   svamp session spawn        Spawn a new session on the daemon
   svamp session attach <id>  Attach to a session (interactive)
   svamp session --help       Show all session commands
-  svamp agent list           List known ACP agents
-  svamp agent <name>         Start local ACP agent session
+  svamp agent list           List known agents
+  svamp agent <name>         Start local agent session (gemini, codex)
   svamp agent -- <cmd>       Start custom ACP agent
   svamp --version            Show version
   svamp --help               Show this help
@@ -689,7 +697,7 @@ Usage:
 }
 function printSessionHelp() {
   console.log(`
-svamp session \u2014 Manage daemon sessions (Claude, Gemini, OpenCode)
+svamp session \u2014 Manage daemon sessions (Claude, Gemini, Codex)
 
 Usage:
   svamp session list [--active] [--json]                     List sessions (alias: ls)
@@ -708,7 +716,7 @@ Usage:
 Options:
   --machine <id>, -m <id>  Target a specific machine (prefix match supported)
 
-Agents: claude (default), gemini, opencode
+Agents: claude (default), gemini, codex
 
 Session and machine IDs can be abbreviated (prefix match, like Docker).
 
@@ -730,20 +738,20 @@ Examples:
 }
 function printAgentHelp() {
   console.log(`
-svamp agent \u2014 Interactive ACP agent sessions
+svamp agent \u2014 Interactive agent sessions (local, no daemon required)
 
 Usage:
-  svamp agent list                 List known ACP agents
+  svamp agent list                 List known agents
   svamp agent <name> [-d <path>]   Start interactive agent session
   svamp agent -- <cmd> [args]      Start custom ACP agent
 
 Examples:
   svamp agent gemini               Start Gemini agent in current directory
   svamp agent gemini -d /tmp/proj  Start Gemini agent in /tmp/proj
-  svamp agent opencode             Start OpenCode agent
+  svamp agent codex                Start Codex agent
   svamp agent -- mycli --acp       Start custom ACP-compatible agent
 
-Known agents: gemini, opencode
+Known agents: gemini (ACP), codex (MCP)
 `);
 }
 main().catch((err) => {

package/dist/{commands-B2xQb9u7.mjs → commands-EjpBlIl0.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-CtCTd6if.mjs';
+import { c as connectToHypha } from './run-fEuWMTdD.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';
@@ -186,7 +186,15 @@ async function connectAndGetMachine(machineId) {
         }
       }
     } else {
-      selectedService = services[0];
+      if (state.machineId) {
+        const localMatch = services.find((s) => {
+          const id = s.id || s.name || "";
+          return id.includes(state.machineId);
+        });
+        selectedService = localMatch || services[0];
+      } else {
+        selectedService = services[0];
+      }
     }
     const svcId = selectedService.id || selectedService.name;
     machine = await server.getService(svcId);
@@ -199,6 +207,81 @@ async function connectAndGetMachine(machineId) {
   restoreConsole();
   return { server, machine };
 }
+async function connectAndGetAllMachines() {
+  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))) 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);
+  }
+  const machines = [];
+  try {
+    const services = await server.listServices({ type: "svamp-machine" });
+    for (const svc of services) {
+      try {
+        const svcId = svc.id || svc.name;
+        machines.push(await server.getService(svcId));
+      } catch {
+      }
+    }
+  } catch (err) {
+    restoreConsole();
+    console.error(`Failed to discover machine services: ${err.message}`);
+    await server.disconnect();
+    process.exit(1);
+  }
+  restoreConsole();
+  if (machines.length === 0) {
+    console.error("No machine service found. Is the daemon registered on Hypha?");
+    await server.disconnect();
+    process.exit(1);
+  }
+  return { server, machines };
+}
 async function sessionMachines() {
   loadDotEnv();
   const state = readDaemonState();
@@ -497,66 +580,90 @@ async function waitForBusyThenIdle(server, sessionId, timeoutMs = 3e5, busyTimeo
   throw new Error("Timeout waiting for agent to become idle");
 }
 async function sessionList(machineId, opts) {
-  const { server, machine } = await connectAndGetMachine(machineId);
-  try {
-    const sessions = await machine.listSessions();
-    const filtered = opts?.active ? sessions.filter((s) => s.active) : sessions;
-    if (filtered.length === 0) {
-      if (opts?.json) {
-        console.log(formatJson([]));
-      } else {
-        console.log("No active sessions.");
-      }
-      return;
+  if (machineId) {
+    const { server, machine } = await connectAndGetMachine(machineId);
+    try {
+      await listSessionsFromMachines(server, [machine], opts);
+    } finally {
+      await server.disconnect();
     }
-    const enriched = [];
-    for (const s of filtered) {
-      let flavor = "claude";
-      let name = "";
-      let path = s.directory || "";
-      let host = "";
-      if (s.metadata) {
-        flavor = s.metadata.flavor || "claude";
-        name = s.metadata.name || "";
-      }
-      if (s.active) {
-        try {
-          const svc = await server.getService(`svamp-session-${s.sessionId}`);
-          const { metadata } = await svc.getMetadata();
-          flavor = metadata?.flavor || flavor;
-          name = metadata?.name || name;
-          path = metadata?.path || path;
-          host = metadata?.host || "";
-        } catch {
-        }
+  } else {
+    const { server, machines } = await connectAndGetAllMachines();
+    try {
+      await listSessionsFromMachines(server, machines, opts);
+    } finally {
+      await server.disconnect();
+    }
+  }
+}
+async function listSessionsFromMachines(server, machines, opts) {
+  const allSessions = [];
+  for (const machine of machines) {
+    try {
+      const info = await machine.getMachineInfo();
+      const sessions = await machine.listSessions();
+      for (const s of sessions) {
+        s.machineHost = info.metadata?.displayName || info.metadata?.host || info.machineId;
       }
-      enriched.push({ ...s, flavor, name, path, host });
+      allSessions.push(...sessions);
+    } catch {
     }
+  }
+  const filtered = opts?.active ? allSessions.filter((s) => s.active) : allSessions;
+  if (filtered.length === 0) {
     if (opts?.json) {
-      console.log(formatJson(enriched.map((s) => ({
-        sessionId: s.sessionId,
-        agent: s.flavor,
-        name: s.name,
-        path: s.path,
-        host: s.host,
-        active: s.active,
-        directory: s.directory
-      }))));
+      console.log(formatJson([]));
     } else {
-      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}`);
+      console.log("No active sessions.");
+    }
+    return;
+  }
+  const enriched = [];
+  for (const s of filtered) {
+    let flavor = "claude";
+    let name = "";
+    let path = s.directory || "";
+    let host = s.machineHost || "";
+    if (s.metadata) {
+      flavor = s.metadata.flavor || "claude";
+      name = s.metadata.name || "";
+    }
+    if (s.active) {
+      try {
+        const svc = await server.getService(`svamp-session-${s.sessionId}`);
+        const { metadata } = await svc.getMetadata();
+        flavor = metadata?.flavor || flavor;
+        name = metadata?.name || name;
+        path = metadata?.path || path;
+        host = metadata?.host || host;
+      } catch {
       }
     }
-  } finally {
-    await server.disconnect();
+    enriched.push({ ...s, flavor, name, path, host });
+  }
+  if (opts?.json) {
+    console.log(formatJson(enriched.map((s) => ({
+      sessionId: s.sessionId,
+      agent: s.flavor,
+      name: s.name,
+      path: s.path,
+      host: s.host,
+      active: s.active,
+      directory: s.directory
+    }))));
+  } else {
+    const header = `${"ID".padEnd(10)} ${"AGENT".padEnd(10)} ${"STATUS".padEnd(9)} ${"NAME".padEnd(25)} ${"MACHINE".padEnd(18)} ${"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 machine = truncate(s.host || "-", 16).padEnd(18);
+      const dir = truncate(s.directory || "-", 33).padEnd(35);
+      console.log(`${id.padEnd(10)} ${agent} ${status} ${name} ${machine} ${dir}`);
+    }
   }
 }
 async function sessionSpawn(agent, directory, machineId, opts) {

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

package/dist/{package-CKOQ5lA7.mjs → package-CMmjP_vD.mjs}

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

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

@@ -2172,8 +2172,7 @@ var acpBackend = /*#__PURE__*/Object.freeze({
 });
 
 const KNOWN_ACP_AGENTS = {
-  gemini: { command: "gemini", args: ["--experimental-acp"] },
-  opencode: { command: "opencode", args: ["acp"] }
+  gemini: { command: "gemini", args: ["--experimental-acp"] }
 };
 const KNOWN_MCP_AGENTS = {
   codex: { command: "codex", args: ["mcp-server"] }
@@ -2196,7 +2195,7 @@ function resolveAcpAgentConfig(cliArgs) {
   const agentName = cliArgs[0];
   const knownAcp = KNOWN_ACP_AGENTS[agentName];
   if (knownAcp) {
-    const passthroughArgs = cliArgs.slice(1).filter((arg) => !(agentName === "opencode" && arg === "--acp"));
+    const passthroughArgs = cliArgs.slice(1).filter(Boolean);
     return {
       agentName,
       command: knownAcp.command,
@@ -2818,6 +2817,11 @@ class CodexMcpBackend {
   }
 }
 
+var codexMcpBackend = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    CodexMcpBackend: CodexMcpBackend
+});
+
 const GEMINI_TIMEOUTS = {
   init: 12e4,
   toolCall: 12e4,
@@ -4974,4 +4978,4 @@ function daemonStatus() {
   }
 }
 
-export { DefaultTransport$1 as D, GeminiTransport$1 as G, registerSessionService as a, stopDaemon as b, connectToHypha as c, daemonStatus as d, acpBackend as e, acpAgentConfig as f, getHyphaServerUrl as g, registerMachineService as r, startDaemon as s };
+export { DefaultTransport$1 as D, GeminiTransport$1 as G, registerSessionService as a, stopDaemon as b, connectToHypha as c, daemonStatus as d, acpBackend as e, acpAgentConfig as f, getHyphaServerUrl as g, codexMcpBackend as h, registerMachineService as r, startDaemon as s };

package/package.json

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