svamp-cli 0.1.53 → 0.1.54

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { b as stopDaemon, s as startDaemon, d as daemonStatus } from './run-CBhm4Jop.mjs';
+import { b as stopDaemon, s as startDaemon, d as daemonStatus } from './run-xuIB35Y4.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';
@@ -113,7 +113,7 @@ async function main() {
   } else if (!subcommand || subcommand === "start") {
     await handleInteractiveCommand();
   } else if (subcommand === "--version" || subcommand === "-v") {
-    const pkg = await import('./package-DbeynOln.mjs').catch(() => ({ default: { version: "unknown" } }));
+    const pkg = await import('./package-HcoejbYj.mjs').catch(() => ({ default: { version: "unknown" } }));
     console.log(`svamp version: ${pkg.default.version}`);
   } else {
     console.error(`Unknown command: ${subcommand}`);
@@ -122,7 +122,7 @@ async function main() {
   }
 }
 async function handleInteractiveCommand() {
-  const { runInteractive } = await import('./run-Y0b60UYS.mjs');
+  const { runInteractive } = await import('./run-Bus1nAOe.mjs');
   const interactiveArgs = subcommand === "start" ? args.slice(1) : args;
   let directory = process.cwd();
   let resumeSessionId;
@@ -167,7 +167,7 @@ async function handleAgentCommand() {
     return;
   }
   if (agentArgs[0] === "list") {
-    const { KNOWN_ACP_AGENTS, KNOWN_MCP_AGENTS: KNOWN_MCP_AGENTS2 } = await import('./run-CBhm4Jop.mjs').then(function (n) { return n.i; });
+    const { KNOWN_ACP_AGENTS, KNOWN_MCP_AGENTS: KNOWN_MCP_AGENTS2 } = await import('./run-xuIB35Y4.mjs').then(function (n) { return n.i; });
     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)`);
@@ -179,7 +179,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-CBhm4Jop.mjs').then(function (n) { return n.i; });
+  const { resolveAcpAgentConfig, KNOWN_MCP_AGENTS } = await import('./run-xuIB35Y4.mjs').then(function (n) { return n.i; });
   let cwd = process.cwd();
   const filteredArgs = [];
   for (let i = 0; i < agentArgs.length; i++) {
@@ -203,12 +203,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-CBhm4Jop.mjs').then(function (n) { return n.j; });
+    const { CodexMcpBackend } = await import('./run-xuIB35Y4.mjs').then(function (n) { return n.j; });
     backend = new CodexMcpBackend({ cwd, log: logFn });
   } else {
-    const { AcpBackend } = await import('./run-CBhm4Jop.mjs').then(function (n) { return n.h; });
-    const { GeminiTransport } = await import('./run-CBhm4Jop.mjs').then(function (n) { return n.G; });
-    const { DefaultTransport } = await import('./run-CBhm4Jop.mjs').then(function (n) { return n.D; });
+    const { AcpBackend } = await import('./run-xuIB35Y4.mjs').then(function (n) { return n.h; });
+    const { GeminiTransport } = await import('./run-xuIB35Y4.mjs').then(function (n) { return n.G; });
+    const { DefaultTransport } = await import('./run-xuIB35Y4.mjs').then(function (n) { return n.D; });
     const transportHandler = config.agentName === "gemini" ? new GeminiTransport() : new DefaultTransport(config.agentName);
     backend = new AcpBackend({
       agentName: config.agentName,
@@ -326,7 +326,7 @@ async function handleSessionCommand() {
     printSessionHelp();
     return;
   }
-  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait, sessionShare, sessionRalphStart, sessionRalphCancel, sessionRalphStatus, sessionQueueAdd, sessionQueueList, sessionQueueClear } = await import('./commands-VGt5ofDo.mjs');
+  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait, sessionShare, sessionRalphStart, sessionRalphCancel, sessionRalphStatus, sessionQueueAdd, sessionQueueList, sessionQueueClear } = await import('./commands-DawcW7Ty.mjs');
   const parseFlagStr = (flag, shortFlag) => {
     for (let i = 1; i < sessionArgs.length; i++) {
       if ((sessionArgs[i] === flag || shortFlag) && i + 1 < sessionArgs.length) {
@@ -386,7 +386,7 @@ async function handleSessionCommand() {
         allowDomain.push(sessionArgs[++i]);
       }
     }
-    const { parseShareArg } = await import('./commands-VGt5ofDo.mjs');
+    const { parseShareArg } = await import('./commands-DawcW7Ty.mjs');
     const shareEntries = share.map((s) => parseShareArg(s));
     await sessionSpawn(agent, dir, targetMachineId, {
       message,
@@ -470,7 +470,7 @@ async function handleSessionCommand() {
       console.error("Usage: svamp session approve <session-id> [request-id] [--json]");
       process.exit(1);
     }
-    const { sessionApprove } = await import('./commands-VGt5ofDo.mjs');
+    const { sessionApprove } = await import('./commands-DawcW7Ty.mjs');
     const approveReqId = sessionArgs[2] && !sessionArgs[2].startsWith("--") ? sessionArgs[2] : void 0;
     await sessionApprove(sessionArgs[1], approveReqId, targetMachineId, {
       json: hasFlag("--json")
@@ -480,7 +480,7 @@ async function handleSessionCommand() {
       console.error("Usage: svamp session deny <session-id> [request-id] [--json]");
       process.exit(1);
     }
-    const { sessionDeny } = await import('./commands-VGt5ofDo.mjs');
+    const { sessionDeny } = await import('./commands-DawcW7Ty.mjs');
     const denyReqId = sessionArgs[2] && !sessionArgs[2].startsWith("--") ? sessionArgs[2] : void 0;
     await sessionDeny(sessionArgs[1], denyReqId, targetMachineId, {
       json: hasFlag("--json")
@@ -549,7 +549,7 @@ async function handleMachineCommand() {
     return;
   }
   if (machineSubcommand === "share") {
-    const { machineShare } = await import('./commands-VGt5ofDo.mjs');
+    const { machineShare } = await import('./commands-DawcW7Ty.mjs');
     let machineId;
     const shareArgs = [];
     for (let i = 1; i < machineArgs.length; i++) {
@@ -579,7 +579,7 @@ async function handleMachineCommand() {
     }
     await machineShare(machineId, { add, remove, list, configPath, showConfig });
   } else if (machineSubcommand === "exec") {
-    const { machineExec } = await import('./commands-VGt5ofDo.mjs');
+    const { machineExec } = await import('./commands-DawcW7Ty.mjs');
     let machineId;
     let cwd;
     const cmdParts = [];
@@ -599,7 +599,7 @@ async function handleMachineCommand() {
     }
     await machineExec(machineId, command, cwd);
   } else if (machineSubcommand === "info") {
-    const { machineInfo } = await import('./commands-VGt5ofDo.mjs');
+    const { machineInfo } = await import('./commands-DawcW7Ty.mjs');
     let machineId;
     for (let i = 1; i < machineArgs.length; i++) {
       if ((machineArgs[i] === "--machine" || machineArgs[i] === "-m") && i + 1 < machineArgs.length) {
@@ -608,7 +608,7 @@ async function handleMachineCommand() {
     }
     await machineInfo(machineId);
   } else if (machineSubcommand === "ls") {
-    const { machineLs } = await import('./commands-VGt5ofDo.mjs');
+    const { machineLs } = await import('./commands-DawcW7Ty.mjs');
     let machineId;
     let showHidden = false;
     let path;

package/dist/{commands-VGt5ofDo.mjs → commands-DawcW7Ty.mjs}

@@ -2,7 +2,7 @@ import { existsSync, readFileSync } from 'node:fs';
 import { execSync } from 'node:child_process';
 import { resolve, join } from 'node:path';
 import os from 'node:os';
-import { l as loadSecurityContextConfig, e as resolveSecurityContext, f as buildSecurityContextFromFlags, m as mergeSecurityContexts, c as connectToHypha } from './run-CBhm4Jop.mjs';
+import { l as loadSecurityContextConfig, e as resolveSecurityContext, f as buildSecurityContextFromFlags, m as mergeSecurityContexts, c as connectToHypha } from './run-xuIB35Y4.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-CBhm4Jop.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-xuIB35Y4.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';

package/dist/{package-BRivSAkK.mjs → package-HcoejbYj.mjs}

@@ -1,5 +1,5 @@
 var name = "svamp-cli";
-var version = "0.1.51";
+var version = "0.1.54";
 var description = "Svamp CLI — AI workspace daemon on Hypha Cloud";
 var author = "Amun AI AB";
 var license = "SEE LICENSE IN LICENSE";
@@ -17,7 +17,7 @@ var exports$1 = {
 	"./cli": "./dist/cli.mjs"
 };
 var scripts = {
-	build: "tsc --noEmit && pkgroll",
+	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",
 	"test:hypha": "node --no-warnings test/test-hypha-service.mjs",

package/dist/{run-BYJX5syg.mjs → run-Bus1nAOe.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-eYBOEaWw.mjs';
+import { c as connectToHypha, a as registerSessionService } from './run-xuIB35Y4.mjs';
 import { createServer } from 'node:http';
 import { spawn } from 'node:child_process';
 import { createInterface } from 'node:readline';

package/dist/{run-CBhm4Jop.mjs → run-xuIB35Y4.mjs}

@@ -32,14 +32,19 @@ async function getConnectToServer() {
 async function connectToHypha(config) {
   const connectToServer = await getConnectToServer();
   const workspace = config.token ? parseWorkspaceFromToken(config.token) : void 0;
-  const server = await connectToServer({
-    server_url: config.serverUrl,
-    token: config.token,
-    client_id: config.clientId,
-    name: config.name || "svamp-cli",
-    workspace,
-    ...config.transport ? { transport: config.transport } : {}
-  });
+  const server = await Promise.race([
+    connectToServer({
+      server_url: config.serverUrl,
+      token: config.token,
+      client_id: config.clientId,
+      name: config.name || "svamp-cli",
+      workspace,
+      ...config.transport ? { transport: config.transport } : {}
+    }),
+    new Promise((_, reject) => setTimeout(() => reject(new Error(
+      "Timeout connecting to Hypha server (30s). A previous daemon may still be connected. Retrying..."
+    )), 3e4))
+  ]);
   return server;
 }
 function parseWorkspaceFromToken(token) {
@@ -1599,6 +1604,11 @@ var DefaultTransport$1 = /*#__PURE__*/Object.freeze({
     DefaultTransport: DefaultTransport
 });
 
+function expandHome(p) {
+  if (p === "~") return homedir();
+  if (p.startsWith("~/")) return join$1(homedir(), p.slice(2));
+  return p;
+}
 function wrapWithIsolation(originalCommand, originalArgs, config) {
   switch (config.method) {
     case "nono":
@@ -1630,22 +1640,22 @@ function wrapWithNono(command, args, config) {
   }
   if (config.nonoConfig?.allowDirs) {
     for (const dir of config.nonoConfig.allowDirs) {
-      nonoArgs.push("--allow", dir);
+      nonoArgs.push("--allow", expandHome(dir));
     }
   }
   if (config.nonoConfig?.readDirs) {
     for (const dir of config.nonoConfig.readDirs) {
-      nonoArgs.push("--read", dir);
+      nonoArgs.push("--read", expandHome(dir));
     }
   }
   if (config.nonoConfig?.allowFiles) {
     for (const file of config.nonoConfig.allowFiles) {
-      nonoArgs.push("--allow-file", file);
+      nonoArgs.push("--allow-file", expandHome(file));
     }
   }
   if (config.nonoConfig?.readFiles) {
     for (const file of config.nonoConfig.readFiles) {
-      nonoArgs.push("--read-file", file);
+      nonoArgs.push("--read-file", expandHome(file));
     }
   }
   if (config.nonoConfig?.netBlock) {
@@ -4261,9 +4271,13 @@ function readDaemonStateFile() {
     return null;
   }
 }
-function cleanupDaemonStateFile() {
+function cleanupDaemonStateFile(onlyIfOwnedByMe = false) {
   try {
     if (existsSync$1(DAEMON_STATE_FILE)) {
+      if (onlyIfOwnedByMe) {
+        const state = readDaemonStateFile();
+        if (state && state.pid !== process.pid) return;
+      }
       fs.unlink(DAEMON_STATE_FILE).catch(() => {
       });
     }
@@ -6328,7 +6342,7 @@ The automated loop has finished. Review the progress above and let me know if yo
         await server.disconnect();
       } catch {
       }
-      cleanupDaemonStateFile();
+      cleanupDaemonStateFile(true);
       logger.log("Cleanup complete");
     };
     const shutdownReq = await resolvesWhenShutdownRequested;
@@ -6339,7 +6353,7 @@ The automated loop has finished. Review the progress above and let me know if yo
     process.exit(0);
   } catch (error) {
     logger.error("Fatal error:", error);
-    cleanupDaemonStateFile();
+    cleanupDaemonStateFile(true);
     if (server) {
       try {
         await server.disconnect();
@@ -6361,7 +6375,7 @@ async function stopDaemon(options) {
     process.kill(state.pid, 0);
     process.kill(state.pid, signal);
     console.log(`Sent ${signal} to daemon PID ${state.pid} \u2014 ${mode}`);
-    for (let i = 0; i < 30; i++) {
+    for (let i = 0; i < 100; i++) {
       await new Promise((r) => setTimeout(r, 100));
       try {
         process.kill(state.pid, 0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "svamp-cli",
-  "version": "0.1.53",
+  "version": "0.1.54",
   "description": "Svamp CLI — AI workspace daemon on Hypha Cloud",
   "author": "Amun AI AB",
   "license": "SEE LICENSE IN LICENSE",
@@ -18,7 +18,7 @@
     "./cli": "./dist/cli.mjs"
   },
   "scripts": {
-    "build": "tsc --noEmit && pkgroll",
+    "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",
     "test:hypha": "node --no-warnings test/test-hypha-service.mjs",