svamp-cli 0.1.57 → 0.1.59

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/cli.mjs CHANGED
@@ -1,4 +1,4 @@
1
- import { b as stopDaemon, s as startDaemon, d as daemonStatus } from './run-Dn2eJUkz.mjs';
1
+ import { b as stopDaemon, s as startDaemon, d as daemonStatus } from './run-Ct_XgELJ.mjs';
2
2
  import 'os';
3
3
  import 'fs/promises';
4
4
  import 'fs';
@@ -109,7 +109,7 @@ async function main() {
109
109
  const { handleServiceCommand } = await import('./commands-Dvftls28.mjs');
110
110
  await handleServiceCommand();
111
111
  } else if (subcommand === "process" || subcommand === "proc") {
112
- const { processCommand } = await import('./commands-Dpl6J2YR.mjs');
112
+ const { processCommand } = await import('./commands-Cs3IShSz.mjs');
113
113
  let machineId;
114
114
  const processArgs = args.slice(1);
115
115
  const mIdx = processArgs.findIndex((a) => a === "--machine" || a === "-m");
@@ -127,7 +127,7 @@ async function main() {
127
127
  } else if (!subcommand || subcommand === "start") {
128
128
  await handleInteractiveCommand();
129
129
  } else if (subcommand === "--version" || subcommand === "-v") {
130
- const pkg = await import('./package-Db816RJ1.mjs').catch(() => ({ default: { version: "unknown" } }));
130
+ const pkg = await import('./package-CHMwNqVN.mjs').catch(() => ({ default: { version: "unknown" } }));
131
131
  console.log(`svamp version: ${pkg.default.version}`);
132
132
  } else {
133
133
  console.error(`Unknown command: ${subcommand}`);
@@ -136,7 +136,7 @@ async function main() {
136
136
  }
137
137
  }
138
138
  async function handleInteractiveCommand() {
139
- const { runInteractive } = await import('./run-Vy8jjMbh.mjs');
139
+ const { runInteractive } = await import('./run-D7RQy1VK.mjs');
140
140
  const interactiveArgs = subcommand === "start" ? args.slice(1) : args;
141
141
  let directory = process.cwd();
142
142
  let resumeSessionId;
@@ -181,7 +181,7 @@ async function handleAgentCommand() {
181
181
  return;
182
182
  }
183
183
  if (agentArgs[0] === "list") {
184
- const { KNOWN_ACP_AGENTS, KNOWN_MCP_AGENTS: KNOWN_MCP_AGENTS2 } = await import('./run-Dn2eJUkz.mjs').then(function (n) { return n.i; });
184
+ const { KNOWN_ACP_AGENTS, KNOWN_MCP_AGENTS: KNOWN_MCP_AGENTS2 } = await import('./run-Ct_XgELJ.mjs').then(function (n) { return n.i; });
185
185
  console.log("Known agents:");
186
186
  for (const [name, config2] of Object.entries(KNOWN_ACP_AGENTS)) {
187
187
  console.log(` ${name.padEnd(12)} ${config2.command} ${config2.args.join(" ")} (ACP)`);
@@ -193,7 +193,7 @@ async function handleAgentCommand() {
193
193
  console.log('Use "svamp agent -- <command> [args]" for a custom ACP agent.');
194
194
  return;
195
195
  }
196
- const { resolveAcpAgentConfig, KNOWN_MCP_AGENTS } = await import('./run-Dn2eJUkz.mjs').then(function (n) { return n.i; });
196
+ const { resolveAcpAgentConfig, KNOWN_MCP_AGENTS } = await import('./run-Ct_XgELJ.mjs').then(function (n) { return n.i; });
197
197
  let cwd = process.cwd();
198
198
  const filteredArgs = [];
199
199
  for (let i = 0; i < agentArgs.length; i++) {
@@ -217,12 +217,12 @@ async function handleAgentCommand() {
217
217
  console.log(`Starting ${config.agentName} agent in ${cwd}...`);
218
218
  let backend;
219
219
  if (KNOWN_MCP_AGENTS[config.agentName]) {
220
- const { CodexMcpBackend } = await import('./run-Dn2eJUkz.mjs').then(function (n) { return n.j; });
220
+ const { CodexMcpBackend } = await import('./run-Ct_XgELJ.mjs').then(function (n) { return n.j; });
221
221
  backend = new CodexMcpBackend({ cwd, log: logFn });
222
222
  } else {
223
- const { AcpBackend } = await import('./run-Dn2eJUkz.mjs').then(function (n) { return n.h; });
224
- const { GeminiTransport } = await import('./run-Dn2eJUkz.mjs').then(function (n) { return n.G; });
225
- const { DefaultTransport } = await import('./run-Dn2eJUkz.mjs').then(function (n) { return n.D; });
223
+ const { AcpBackend } = await import('./run-Ct_XgELJ.mjs').then(function (n) { return n.h; });
224
+ const { GeminiTransport } = await import('./run-Ct_XgELJ.mjs').then(function (n) { return n.G; });
225
+ const { DefaultTransport } = await import('./run-Ct_XgELJ.mjs').then(function (n) { return n.D; });
226
226
  const transportHandler = config.agentName === "gemini" ? new GeminiTransport() : new DefaultTransport(config.agentName);
227
227
  backend = new AcpBackend({
228
228
  agentName: config.agentName,
@@ -340,7 +340,7 @@ async function handleSessionCommand() {
340
340
  printSessionHelp();
341
341
  return;
342
342
  }
343
- const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait, sessionShare, sessionRalphStart, sessionRalphCancel, sessionRalphStatus, sessionQueueAdd, sessionQueueList, sessionQueueClear } = await import('./commands-CrNk2TV0.mjs');
343
+ const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait, sessionShare, sessionRalphStart, sessionRalphCancel, sessionRalphStatus, sessionQueueAdd, sessionQueueList, sessionQueueClear } = await import('./commands-D-_qHKWM.mjs');
344
344
  const parseFlagStr = (flag, shortFlag) => {
345
345
  for (let i = 1; i < sessionArgs.length; i++) {
346
346
  if ((sessionArgs[i] === flag || shortFlag) && i + 1 < sessionArgs.length) {
@@ -400,7 +400,7 @@ async function handleSessionCommand() {
400
400
  allowDomain.push(sessionArgs[++i]);
401
401
  }
402
402
  }
403
- const { parseShareArg } = await import('./commands-CrNk2TV0.mjs');
403
+ const { parseShareArg } = await import('./commands-D-_qHKWM.mjs');
404
404
  const shareEntries = share.map((s) => parseShareArg(s));
405
405
  await sessionSpawn(agent, dir, targetMachineId, {
406
406
  message,
@@ -484,7 +484,7 @@ async function handleSessionCommand() {
484
484
  console.error("Usage: svamp session approve <session-id> [request-id] [--json]");
485
485
  process.exit(1);
486
486
  }
487
- const { sessionApprove } = await import('./commands-CrNk2TV0.mjs');
487
+ const { sessionApprove } = await import('./commands-D-_qHKWM.mjs');
488
488
  const approveReqId = sessionArgs[2] && !sessionArgs[2].startsWith("--") ? sessionArgs[2] : void 0;
489
489
  await sessionApprove(sessionArgs[1], approveReqId, targetMachineId, {
490
490
  json: hasFlag("--json")
@@ -494,7 +494,7 @@ async function handleSessionCommand() {
494
494
  console.error("Usage: svamp session deny <session-id> [request-id] [--json]");
495
495
  process.exit(1);
496
496
  }
497
- const { sessionDeny } = await import('./commands-CrNk2TV0.mjs');
497
+ const { sessionDeny } = await import('./commands-D-_qHKWM.mjs');
498
498
  const denyReqId = sessionArgs[2] && !sessionArgs[2].startsWith("--") ? sessionArgs[2] : void 0;
499
499
  await sessionDeny(sessionArgs[1], denyReqId, targetMachineId, {
500
500
  json: hasFlag("--json")
@@ -563,7 +563,7 @@ async function handleMachineCommand() {
563
563
  return;
564
564
  }
565
565
  if (machineSubcommand === "share") {
566
- const { machineShare } = await import('./commands-CrNk2TV0.mjs');
566
+ const { machineShare } = await import('./commands-D-_qHKWM.mjs');
567
567
  let machineId;
568
568
  const shareArgs = [];
569
569
  for (let i = 1; i < machineArgs.length; i++) {
@@ -593,7 +593,7 @@ async function handleMachineCommand() {
593
593
  }
594
594
  await machineShare(machineId, { add, remove, list, configPath, showConfig });
595
595
  } else if (machineSubcommand === "exec") {
596
- const { machineExec } = await import('./commands-CrNk2TV0.mjs');
596
+ const { machineExec } = await import('./commands-D-_qHKWM.mjs');
597
597
  let machineId;
598
598
  let cwd;
599
599
  const cmdParts = [];
@@ -613,7 +613,7 @@ async function handleMachineCommand() {
613
613
  }
614
614
  await machineExec(machineId, command, cwd);
615
615
  } else if (machineSubcommand === "info") {
616
- const { machineInfo } = await import('./commands-CrNk2TV0.mjs');
616
+ const { machineInfo } = await import('./commands-D-_qHKWM.mjs');
617
617
  let machineId;
618
618
  for (let i = 1; i < machineArgs.length; i++) {
619
619
  if ((machineArgs[i] === "--machine" || machineArgs[i] === "-m") && i + 1 < machineArgs.length) {
@@ -622,7 +622,7 @@ async function handleMachineCommand() {
622
622
  }
623
623
  await machineInfo(machineId);
624
624
  } else if (machineSubcommand === "ls") {
625
- const { machineLs } = await import('./commands-CrNk2TV0.mjs');
625
+ const { machineLs } = await import('./commands-D-_qHKWM.mjs');
626
626
  let machineId;
627
627
  let showHidden = false;
628
628
  let path;
@@ -1,11 +1,11 @@
1
1
  import { writeFileSync, readFileSync } from 'fs';
2
2
  import { resolve } from 'path';
3
- import { connectAndGetMachine } from './commands-CrNk2TV0.mjs';
3
+ import { connectAndGetMachine } from './commands-D-_qHKWM.mjs';
4
4
  import 'node:fs';
5
5
  import 'node:child_process';
6
6
  import 'node:path';
7
7
  import 'node:os';
8
- import './run-Dn2eJUkz.mjs';
8
+ import './run-Ct_XgELJ.mjs';
9
9
  import 'os';
10
10
  import 'fs/promises';
11
11
  import 'url';
@@ -2,7 +2,7 @@ import { existsSync, readFileSync } from 'node:fs';
2
2
  import { execSync } from 'node:child_process';
3
3
  import { resolve, join } from 'node:path';
4
4
  import os from 'node:os';
5
- import { l as loadSecurityContextConfig, e as resolveSecurityContext, f as buildSecurityContextFromFlags, m as mergeSecurityContexts, c as connectToHypha } from './run-Dn2eJUkz.mjs';
5
+ import { l as loadSecurityContextConfig, e as resolveSecurityContext, f as buildSecurityContextFromFlags, m as mergeSecurityContexts, c as connectToHypha } from './run-Ct_XgELJ.mjs';
6
6
  import 'os';
7
7
  import 'fs/promises';
8
8
  import 'fs';
package/dist/index.mjs CHANGED
@@ -1,4 +1,4 @@
1
- export { c as connectToHypha, d as daemonStatus, g as getHyphaServerUrl, r as registerMachineService, a as registerSessionService, s as startDaemon, b as stopDaemon } from './run-Dn2eJUkz.mjs';
1
+ export { c as connectToHypha, d as daemonStatus, g as getHyphaServerUrl, r as registerMachineService, a as registerSessionService, s as startDaemon, b as stopDaemon } from './run-Ct_XgELJ.mjs';
2
2
  import 'os';
3
3
  import 'fs/promises';
4
4
  import 'fs';
@@ -1,5 +1,5 @@
1
1
  var name = "svamp-cli";
2
- var version = "0.1.57";
2
+ var version = "0.1.59";
3
3
  var description = "Svamp CLI — AI workspace daemon on Hypha Cloud";
4
4
  var author = "Amun AI AB";
5
5
  var license = "SEE LICENSE IN LICENSE";
@@ -4985,7 +4985,20 @@ async function startDaemon(options) {
4985
4985
  logger.log(`Hypha connection permanently lost: ${reason}`);
4986
4986
  requestShutdown("hypha-disconnected", String(reason));
4987
4987
  });
4988
+ let lastHyphaMessageAt = Date.now();
4989
+ const attachMessageTimestampListener = () => {
4990
+ const conn = server.rpc?._connection;
4991
+ const ws = conn?._websocket;
4992
+ if (ws) {
4993
+ ws.addEventListener("message", () => {
4994
+ lastHyphaMessageAt = Date.now();
4995
+ });
4996
+ lastHyphaMessageAt = Date.now();
4997
+ }
4998
+ };
4999
+ attachMessageTimestampListener();
4988
5000
  server.on("services_registered", () => {
5001
+ attachMessageTimestampListener();
4989
5002
  if (consecutiveHeartbeatFailures > 0) {
4990
5003
  logger.log(`Hypha reconnection successful \u2014 services re-registered (resetting ${consecutiveHeartbeatFailures} failures)`);
4991
5004
  consecutiveHeartbeatFailures = 0;
@@ -6734,7 +6747,7 @@ The automated loop has finished. Review the progress above and let me know if yo
6734
6747
  console.log(` Service: svamp-machine-${machineId}`);
6735
6748
  console.log(` Log file: ${logger.logFilePath}`);
6736
6749
  const HEARTBEAT_INTERVAL_MS = 1e4;
6737
- const PING_TIMEOUT_MS = 15e3;
6750
+ const GHOST_TIMEOUT_MS = 6e4;
6738
6751
  const MAX_FAILURES = 60;
6739
6752
  const POST_RECONNECT_GRACE_MS = 2e4;
6740
6753
  let heartbeatRunning = false;
@@ -6779,44 +6792,31 @@ The automated loop has finished. Review the progress above and let me know if yo
6779
6792
  }
6780
6793
  }
6781
6794
  const inGrace = lastReconnectAt > 0 && Date.now() - lastReconnectAt < POST_RECONNECT_GRACE_MS;
6782
- if (!inGrace) {
6783
- try {
6784
- const pingStart = Date.now();
6785
- await Promise.race([
6786
- server.echo("ping"),
6787
- new Promise((_, reject) => setTimeout(() => reject(new Error("Ping timed out")), PING_TIMEOUT_MS))
6788
- ]);
6789
- const pingMs = Date.now() - pingStart;
6790
- if (pingMs > 5e3) {
6791
- logger.log(`Slow ping: ${pingMs}ms (server under load)`);
6792
- }
6793
- if (consecutiveHeartbeatFailures > 0) {
6794
- logger.log(`Heartbeat recovered after ${consecutiveHeartbeatFailures} failures`);
6795
- consecutiveHeartbeatFailures = 0;
6796
- }
6797
- } catch (err) {
6795
+ const timeSinceMsg = Date.now() - lastHyphaMessageAt;
6796
+ if (!inGrace && timeSinceMsg > GHOST_TIMEOUT_MS) {
6797
+ const conn = server.rpc?._connection;
6798
+ const ws = conn?._websocket;
6799
+ if (ws?.readyState === 1) {
6798
6800
  consecutiveHeartbeatFailures++;
6799
6801
  if (consecutiveHeartbeatFailures === 1) {
6800
- logger.log(`Ping failed: ${err.message}`);
6802
+ logger.log(`No message from server in ${Math.round(timeSinceMsg / 1e3)}s \u2014 ghost connection, force-closing WebSocket`);
6801
6803
  } else if (consecutiveHeartbeatFailures % 6 === 0) {
6802
- logger.log(`Connection down for ${consecutiveHeartbeatFailures * HEARTBEAT_INTERVAL_MS / 1e3}s (${consecutiveHeartbeatFailures}/${MAX_FAILURES})`);
6804
+ logger.log(`Still reconnecting \u2014 ${consecutiveHeartbeatFailures} failures (${consecutiveHeartbeatFailures * HEARTBEAT_INTERVAL_MS / 1e3}s)`);
6803
6805
  }
6804
- if (consecutiveHeartbeatFailures === 1 || consecutiveHeartbeatFailures % 3 === 0) {
6805
- const conn = server.rpc?._connection;
6806
- const ws = conn?._websocket;
6807
- if (ws?.readyState === 1) {
6808
- logger.log("Force-closing stale WebSocket to trigger reconnection");
6809
- try {
6810
- ws.close(4e3, "Stale connection");
6811
- } catch {
6812
- }
6813
- }
6806
+ try {
6807
+ ws.close(4e3, "Ghost connection");
6808
+ } catch {
6814
6809
  }
6815
6810
  if (consecutiveHeartbeatFailures >= MAX_FAILURES) {
6816
6811
  logger.log(`Heartbeat failed ${MAX_FAILURES} times. Shutting down.`);
6817
- requestShutdown("heartbeat-timeout", err.message);
6812
+ requestShutdown("heartbeat-timeout", `No messages for ${Math.round(timeSinceMsg / 1e3)}s`);
6818
6813
  }
6814
+ } else {
6815
+ lastHyphaMessageAt = Date.now();
6819
6816
  }
6817
+ } else if (consecutiveHeartbeatFailures > 0 && timeSinceMsg < GHOST_TIMEOUT_MS / 2) {
6818
+ logger.log(`Heartbeat recovered after ${consecutiveHeartbeatFailures} failures`);
6819
+ consecutiveHeartbeatFailures = 0;
6820
6820
  }
6821
6821
  } finally {
6822
6822
  heartbeatRunning = false;
@@ -2,7 +2,7 @@ import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(im
2
2
  import os from 'node:os';
3
3
  import { join, resolve } from 'node:path';
4
4
  import { mkdirSync, writeFileSync, existsSync, unlinkSync, readFileSync, watch } from 'node:fs';
5
- import { c as connectToHypha, a as registerSessionService } from './run-Dn2eJUkz.mjs';
5
+ import { c as connectToHypha, a as registerSessionService } from './run-Ct_XgELJ.mjs';
6
6
  import { createServer } from 'node:http';
7
7
  import { spawn } from 'node:child_process';
8
8
  import { createInterface } from 'node:readline';
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "svamp-cli",
3
- "version": "0.1.57",
3
+ "version": "0.1.59",
4
4
  "description": "Svamp CLI — AI workspace daemon on Hypha Cloud",
5
5
  "author": "Amun AI AB",
6
6
  "license": "SEE LICENSE IN LICENSE",