svamp-cli 0.1.71 → 0.1.73

package/dist/cli.mjs

@@ -1,4 +1,4 @@
-import { b as stopDaemon, s as startDaemon, d as daemonStatus } from './run-DGKMT1Af.mjs';
+import { b as stopDaemon, s as startDaemon, d as daemonStatus } from './run-DWTcdCOS.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';
@@ -109,7 +109,7 @@ async function main() {
     const { handleServiceCommand } = await import('./commands-BLjcT1Vl.mjs');
     await handleServiceCommand();
   } else if (subcommand === "process" || subcommand === "proc") {
-    const { processCommand } = await import('./commands-CheZ8rae.mjs');
+    const { processCommand } = await import('./commands-CPy4F-7w.mjs');
     let machineId;
     const processArgs = args.slice(1);
     const mIdx = processArgs.findIndex((a) => a === "--machine" || a === "-m");
@@ -127,7 +127,7 @@ async function main() {
   } else if (!subcommand || subcommand === "start") {
     await handleInteractiveCommand();
   } else if (subcommand === "--version" || subcommand === "-v") {
-    const pkg = await import('./package-CxTZatXO.mjs').catch(() => ({ default: { version: "unknown" } }));
+    const pkg = await import('./package-BAXhI1Iz.mjs').catch(() => ({ default: { version: "unknown" } }));
     console.log(`svamp version: ${pkg.default.version}`);
   } else {
     console.error(`Unknown command: ${subcommand}`);
@@ -136,7 +136,7 @@ async function main() {
   }
 }
 async function handleInteractiveCommand() {
-  const { runInteractive } = await import('./run-6vD6-456.mjs');
+  const { runInteractive } = await import('./run-C2UwUIgR.mjs');
   const interactiveArgs = subcommand === "start" ? args.slice(1) : args;
   let directory = process.cwd();
   let resumeSessionId;
@@ -181,7 +181,7 @@ async function handleAgentCommand() {
     return;
   }
   if (agentArgs[0] === "list") {
-    const { KNOWN_ACP_AGENTS, KNOWN_MCP_AGENTS: KNOWN_MCP_AGENTS2 } = await import('./run-DGKMT1Af.mjs').then(function (n) { return n.i; });
+    const { KNOWN_ACP_AGENTS, KNOWN_MCP_AGENTS: KNOWN_MCP_AGENTS2 } = await import('./run-DWTcdCOS.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)`);
@@ -193,7 +193,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-DGKMT1Af.mjs').then(function (n) { return n.i; });
+  const { resolveAcpAgentConfig, KNOWN_MCP_AGENTS } = await import('./run-DWTcdCOS.mjs').then(function (n) { return n.i; });
   let cwd = process.cwd();
   const filteredArgs = [];
   for (let i = 0; i < agentArgs.length; i++) {
@@ -217,12 +217,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-DGKMT1Af.mjs').then(function (n) { return n.j; });
+    const { CodexMcpBackend } = await import('./run-DWTcdCOS.mjs').then(function (n) { return n.j; });
     backend = new CodexMcpBackend({ cwd, log: logFn });
   } else {
-    const { AcpBackend } = await import('./run-DGKMT1Af.mjs').then(function (n) { return n.h; });
-    const { GeminiTransport } = await import('./run-DGKMT1Af.mjs').then(function (n) { return n.G; });
-    const { DefaultTransport } = await import('./run-DGKMT1Af.mjs').then(function (n) { return n.D; });
+    const { AcpBackend } = await import('./run-DWTcdCOS.mjs').then(function (n) { return n.h; });
+    const { GeminiTransport } = await import('./run-DWTcdCOS.mjs').then(function (n) { return n.G; });
+    const { DefaultTransport } = await import('./run-DWTcdCOS.mjs').then(function (n) { return n.D; });
     const transportHandler = config.agentName === "gemini" ? new GeminiTransport() : new DefaultTransport(config.agentName);
     backend = new AcpBackend({
       agentName: config.agentName,
@@ -340,7 +340,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-DDqf8dQ_.mjs');
+  const { sessionList, sessionSpawn, sessionStop, sessionInfo, sessionMessages, sessionAttach, sessionMachines, sessionSend, sessionWait, sessionShare, sessionRalphStart, sessionRalphCancel, sessionRalphStatus, sessionQueueAdd, sessionQueueList, sessionQueueClear } = await import('./commands-gghG16ZB.mjs');
   const parseFlagStr = (flag, shortFlag) => {
     for (let i = 1; i < sessionArgs.length; i++) {
       if ((sessionArgs[i] === flag || shortFlag) && i + 1 < sessionArgs.length) {
@@ -400,7 +400,7 @@ async function handleSessionCommand() {
         allowDomain.push(sessionArgs[++i]);
       }
     }
-    const { parseShareArg } = await import('./commands-DDqf8dQ_.mjs');
+    const { parseShareArg } = await import('./commands-gghG16ZB.mjs');
     const shareEntries = share.map((s) => parseShareArg(s));
     await sessionSpawn(agent, dir, targetMachineId, {
       message,
@@ -484,7 +484,7 @@ async function handleSessionCommand() {
       console.error("Usage: svamp session approve <session-id> [request-id] [--json]");
       process.exit(1);
     }
-    const { sessionApprove } = await import('./commands-DDqf8dQ_.mjs');
+    const { sessionApprove } = await import('./commands-gghG16ZB.mjs');
     const approveReqId = sessionArgs[2] && !sessionArgs[2].startsWith("--") ? sessionArgs[2] : void 0;
     await sessionApprove(sessionArgs[1], approveReqId, targetMachineId, {
       json: hasFlag("--json")
@@ -494,7 +494,7 @@ async function handleSessionCommand() {
       console.error("Usage: svamp session deny <session-id> [request-id] [--json]");
       process.exit(1);
     }
-    const { sessionDeny } = await import('./commands-DDqf8dQ_.mjs');
+    const { sessionDeny } = await import('./commands-gghG16ZB.mjs');
     const denyReqId = sessionArgs[2] && !sessionArgs[2].startsWith("--") ? sessionArgs[2] : void 0;
     await sessionDeny(sessionArgs[1], denyReqId, targetMachineId, {
       json: hasFlag("--json")
@@ -597,7 +597,7 @@ async function handleMachineCommand() {
     return;
   }
   if (machineSubcommand === "share") {
-    const { machineShare } = await import('./commands-DDqf8dQ_.mjs');
+    const { machineShare } = await import('./commands-gghG16ZB.mjs');
     let machineId;
     const shareArgs = [];
     for (let i = 1; i < machineArgs.length; i++) {
@@ -627,7 +627,7 @@ async function handleMachineCommand() {
     }
     await machineShare(machineId, { add, remove, list, configPath, showConfig });
   } else if (machineSubcommand === "exec") {
-    const { machineExec } = await import('./commands-DDqf8dQ_.mjs');
+    const { machineExec } = await import('./commands-gghG16ZB.mjs');
     let machineId;
     let cwd;
     const cmdParts = [];
@@ -647,7 +647,7 @@ async function handleMachineCommand() {
     }
     await machineExec(machineId, command, cwd);
   } else if (machineSubcommand === "info") {
-    const { machineInfo } = await import('./commands-DDqf8dQ_.mjs');
+    const { machineInfo } = await import('./commands-gghG16ZB.mjs');
     let machineId;
     for (let i = 1; i < machineArgs.length; i++) {
       if ((machineArgs[i] === "--machine" || machineArgs[i] === "-m") && i + 1 < machineArgs.length) {
@@ -670,7 +670,7 @@ async function handleMachineCommand() {
     const { machineNotify } = await import('./agentCommands-C6iGblcL.mjs');
     await machineNotify(message, level);
   } else if (machineSubcommand === "ls") {
-    const { machineLs } = await import('./commands-DDqf8dQ_.mjs');
+    const { machineLs } = await import('./commands-gghG16ZB.mjs');
     let machineId;
     let showHidden = false;
     let path;

package/dist/{commands-CheZ8rae.mjs → commands-CPy4F-7w.mjs}

@@ -1,11 +1,11 @@
 import { writeFileSync, readFileSync } from 'fs';
 import { resolve } from 'path';
-import { connectAndGetMachine } from './commands-DDqf8dQ_.mjs';
+import { connectAndGetMachine } from './commands-gghG16ZB.mjs';
 import 'node:fs';
 import 'node:child_process';
 import 'node:path';
 import 'node:os';
-import './run-DGKMT1Af.mjs';
+import './run-DWTcdCOS.mjs';
 import 'os';
 import 'fs/promises';
 import 'url';

package/dist/{commands-DDqf8dQ_.mjs → commands-gghG16ZB.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-DGKMT1Af.mjs';
+import { l as loadSecurityContextConfig, e as resolveSecurityContext, f as buildSecurityContextFromFlags, m as mergeSecurityContexts, c as connectToHypha } from './run-DWTcdCOS.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';
@@ -181,28 +181,56 @@ async function connectAndGetMachine(machineId) {
         });
         if (prefixMatches.length === 1) {
           selectedService = prefixMatches[0];
-        } else if (prefixMatches.length === 0) {
-          const substringMatches = services.filter((s) => {
-            const id = s.id || s.name || "";
-            return id.includes(machineId);
-          });
-          if (substringMatches.length === 1) {
-            selectedService = substringMatches[0];
-          } else {
-            restoreConsole();
-            console.error(`No machine found matching: ${machineId}`);
-            console.error("Available machines:");
-            for (const s of services) {
-              console.error(`  ${s.id || s.name}`);
-            }
-            await server.disconnect();
-            process.exit(1);
+        }
+      }
+      if (!selectedService) {
+        const query = machineId.toLowerCase();
+        const resolved = [];
+        await Promise.all(services.map(async (svc) => {
+          const svcId2 = svc.id || svc.name;
+          try {
+            const machineSvc = await server.getService(svcId2);
+            const info = await machineSvc.getMachineInfo();
+            resolved.push({
+              svc,
+              machineId: (info.machineId || svcId2).toLowerCase(),
+              host: (info.metadata?.host || "").toLowerCase(),
+              displayName: (info.metadata?.displayName || "").toLowerCase()
+            });
+          } catch {
+          }
+        }));
+        let matches = resolved.filter(
+          (r) => r.machineId === query || r.host === query || r.displayName === query
+        );
+        if (matches.length === 0) {
+          matches = resolved.filter(
+            (r) => r.machineId.startsWith(query) || r.host.startsWith(query) || r.displayName.startsWith(query)
+          );
+        }
+        if (matches.length === 0) {
+          matches = resolved.filter(
+            (r) => r.machineId.includes(query) || r.host.includes(query) || r.displayName.includes(query)
+          );
+        }
+        if (matches.length === 1) {
+          selectedService = matches[0].svc;
+        } else if (matches.length > 1) {
+          restoreConsole();
+          console.error(`Ambiguous machine "${machineId}". Matches:`);
+          for (const m of matches) {
+            console.error(`  ${m.machineId}  (${m.host})`);
           }
+          await server.disconnect();
+          process.exit(1);
         } else {
           restoreConsole();
-          console.error(`Ambiguous machine ID "${machineId}". Matches:`);
-          for (const s of prefixMatches) {
-            console.error(`  ${s.id || s.name}`);
+          console.error(`No machine found matching: ${machineId}`);
+          if (resolved.length > 0) {
+            console.error("Available machines:");
+            for (const r of resolved) {
+              console.error(`  ${r.machineId}  (${r.host})`);
+            }
           }
           await server.disconnect();
           process.exit(1);

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

package/dist/{package-CxTZatXO.mjs → package-BAXhI1Iz.mjs}

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

package/dist/{run-6vD6-456.mjs → run-C2UwUIgR.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-DGKMT1Af.mjs';
+import { c as connectToHypha, a as registerSessionService } from './run-DWTcdCOS.mjs';
 import { createServer } from 'node:http';
 import { spawn } from 'node:child_process';
 import { createInterface } from 'node:readline';

package/dist/{run-DGKMT1Af.mjs → run-DWTcdCOS.mjs}

@@ -907,7 +907,7 @@ function createSessionStore(server, sessionId, initialMetadata, initialAgentStat
   let agentState = initialAgentState ? { ...initialAgentState } : null;
   let agentStateVersion = 1;
   let lastActivity = {
-    active: false,
+    active: true,
     thinking: false,
     mode: "remote",
     time: Date.now()
@@ -5585,6 +5585,8 @@ async function startDaemon(options) {
         let lastSpawnMeta = persisted?.spawnMeta || {};
         let sessionWasProcessing = !!options2.wasProcessing;
         let lastAssistantText = "";
+        let consecutiveRalphErrors = 0;
+        const MAX_RALPH_ERRORS = 3;
         let spawnHasReceivedInit = false;
         let startupFailureRetryPending = false;
         let startupRetryMessage;
@@ -5905,6 +5907,33 @@ async function startDaemon(options) {
                       sessionService.pushMessage({ type: "session_event", message: taskInfo }, "session");
                     }
                     const queueLen = sessionMetadata.messageQueue?.length ?? 0;
+                    if (msg.is_error) {
+                      const rlStateForError = readRalphState(getRalphStateFilePath(directory, sessionId));
+                      if (rlStateForError) {
+                        consecutiveRalphErrors++;
+                        logger.log(`[Session ${sessionId}] Ralph loop: error result (consecutive=${consecutiveRalphErrors}/${MAX_RALPH_ERRORS})`);
+                        if (consecutiveRalphErrors >= MAX_RALPH_ERRORS) {
+                          logger.log(`[Session ${sessionId}] Ralph loop: ${MAX_RALPH_ERRORS} consecutive errors \u2014 stopping loop`);
+                          removeRalphState(getRalphStateFilePath(directory, sessionId));
+                          if (lastSpawnMeta.appendSystemPrompt) {
+                            const { appendSystemPrompt: _, ...rest } = lastSpawnMeta;
+                            lastSpawnMeta = rest;
+                          }
+                          sessionMetadata = { ...sessionMetadata, ralphLoop: { active: false }, lifecycleState: "idle" };
+                          sessionService.updateMetadata(sessionMetadata);
+                          sessionService.pushMessage(
+                            { type: "message", message: `Ralph loop stopped \u2014 ${consecutiveRalphErrors} consecutive errors. Last error: ${msg.result || "unknown"}`, level: "error" },
+                            "event"
+                          );
+                          consecutiveRalphErrors = 0;
+                          signalProcessing(false);
+                          sessionService.sendSessionEnd();
+                          break;
+                        }
+                      }
+                    } else {
+                      consecutiveRalphErrors = 0;
+                    }
                     if (queueLen > 0 && claudeResumeId && !trackedSession.stopped) {
                       setTimeout(() => processMessageQueueRef?.(), 200);
                     } else if (claudeResumeId) {
@@ -7381,6 +7410,12 @@ The automated loop has finished. Review the progress above and let me know if yo
           });
           if (result.type === "success") {
             logger.log(`Restored session ${persisted.sessionId} (resume=${persisted.claudeResumeId}, wasProcessing=${persisted.wasProcessing})`);
+            for (const [, tracked] of pidToTrackedSession) {
+              if (tracked.svampSessionId === persisted.sessionId && tracked.hyphaService) {
+                tracked.hyphaService.sendKeepAlive(false);
+                break;
+              }
+            }
             if (isOrphaned) {
               for (const [, tracked] of pidToTrackedSession) {
                 if (tracked.svampSessionId === persisted.sessionId && tracked.hyphaService) {

package/package.json

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