svamp-cli 0.2.106 → 0.2.108

package/dist/{run-9j9_wlx5.mjs → run-LyzVTe3J.mjs}

@@ -1,6 +1,6 @@
 import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import os$1, { homedir as homedir$1 } from 'os';
 import fs, { mkdir as mkdir$1, readdir as readdir$1, readFile, writeFile as writeFile$1, rename, unlink } from 'fs/promises';
-import { readFileSync as readFileSync$1, mkdirSync as mkdirSync$1, writeFileSync as writeFileSync$1, renameSync as renameSync$1, existsSync as existsSync$1, rmSync as rmSync$1, unlinkSync as unlinkSync$1, copyFileSync, watch, rmdirSync, readdirSync as readdirSync$1 } from 'fs';
+import { readFileSync as readFileSync$1, mkdirSync as mkdirSync$1, writeFileSync as writeFileSync$1, renameSync as renameSync$1, existsSync as existsSync$1, rmSync as rmSync$1, unlinkSync as unlinkSync$1, copyFileSync, readdirSync as readdirSync$1, watch, rmdirSync } from 'fs';
 import path__default, { join as join$1, dirname, basename, resolve } from 'path';
 import { fileURLToPath } from 'url';
 import { execFile, spawn as spawn$1, execSync as execSync$1, spawnSync } from 'child_process';
@@ -2527,7 +2527,7 @@ async function registerMachineService(server, machineId, metadata, daemonState,
         const tunnels = handlers.tunnels;
         if (!tunnels) throw new Error("Tunnel management not available");
         if (tunnels.has(params.name)) throw new Error(`Tunnel '${params.name}' already running`);
-        const { FrpcTunnel } = await import('./frpc-D9HsqQ7e.mjs');
+        const { FrpcTunnel } = await import('./frpc-C5Bhpsdw.mjs');
         const tunnel = new FrpcTunnel({
           name: params.name,
           ports: params.ports,
@@ -2788,7 +2788,7 @@ QUESTION: ${params.question || "Summarize this concisely."}` }
           }
           const deps = buildSessionDeps(rpc, { cwd, ownerEmail: owner });
           const sender = { name: context?.user?.email || context?.user?.id || "user", kind: "user", verified: true };
-          const { toolsForRole } = await import('./sideband-CnnaC4xC.mjs');
+          const { toolsForRole } = await import('./sideband-CgiHKPJo.mjs');
           const r2 = await runWiseAgent({ message: params.message, sender, config: { tools: toolsForRole(role2) }, deps, transport, model: resolved.model });
           return fmt(r2);
         }
@@ -2887,7 +2887,7 @@ QUESTION: ${params.question || "Summarize this concisely."}` }
     if (r.error || !r.sender) return { error: r.error || "unauthorized" };
     const callId = "call_" + Math.random().toString(16).slice(2, 12);
     const rendered = renderMessage(c, { sender: r.sender, body: { message: kwargs.message }, callId });
-    const { queryCore } = await import('./commands-Cectk2JF.mjs');
+    const { queryCore } = await import('./commands-DOsK9QRw.mjs');
     const timeout = c.reply?.timeout_sec || 120;
     let result;
     try {
@@ -3130,17 +3130,24 @@ class RoutineRunner {
     }
     const resolved = this.resolveAction(routine, payload);
     let outcome = "delivered";
+    const refundDailyCap = () => {
+      if (!routine.daily_cap) return;
+      const rb = this.store.get(routine.id);
+      if (rb?.daily?.date === today && rb.daily.n > 0) {
+        rb.daily.n -= 1;
+        this.store.save(rb);
+      }
+    };
     try {
-      await this.deliver({ routine, action: routine.action, resolved, payload, via });
+      const res = await this.deliver({ routine, action: routine.action, resolved, payload, via });
+      if (res && res.skipped) {
+        outcome = `skipped (${res.skipped})`;
+        this.log(`[routine] ${routine.id || routine.name}: ${outcome}`);
+        refundDailyCap();
+      }
     } catch (e) {
       outcome = "error: " + (e?.message || e);
-      if (routine.daily_cap) {
-        const rb = this.store.get(routine.id);
-        if (rb?.daily?.date === today && rb.daily.n > 0) {
-          rb.daily.n -= 1;
-          this.store.save(rb);
-        }
-      }
+      refundDailyCap();
     } finally {
       this.active.delete(routine.id);
     }
@@ -9691,29 +9698,36 @@ function writeSvampConfig(configPath, config) {
   renameSync$1(tmpPath, configPath);
   return content;
 }
-function getLoopDir(directory) {
+function getLoopDir(directory, sessionId) {
+  if (sessionId) {
+    const scoped = join$1(directory, ".svamp", sessionId, "loop");
+    if (existsSync$1(join$1(scoped, "loop-state.json"))) return scoped;
+    const legacy = join$1(directory, ".claude", "loop");
+    if (existsSync$1(join$1(legacy, "loop-state.json"))) return legacy;
+    return scoped;
+  }
   return join$1(directory, ".claude", "loop");
 }
-function readLoopState(directory) {
+function readLoopState(directory, sessionId) {
   try {
-    const p = join$1(getLoopDir(directory), "loop-state.json");
+    const p = join$1(getLoopDir(directory, sessionId), "loop-state.json");
     if (!existsSync$1(p)) return null;
     return JSON.parse(readFileSync$1(p, "utf-8"));
   } catch {
     return null;
   }
 }
-function isLoopActive(directory) {
-  const s = readLoopState(directory);
+function isLoopActive(directory, sessionId) {
+  const s = readLoopState(directory, sessionId);
   return !!s && s.active !== false && s.phase !== "done" && s.phase !== "gave_up" && s.phase !== "cancelled";
 }
-function loopOwnerSession(directory) {
-  const s = readLoopState(directory);
+function loopOwnerSession(directory, sessionId) {
+  const s = readLoopState(directory, sessionId);
   if (!s || s.active === false || s.phase === "done" || s.phase === "gave_up" || s.phase === "cancelled") return null;
   return typeof s.session_id === "string" ? s.session_id : null;
 }
 function isLoopActiveForSession(directory, sessionId) {
-  const s = readLoopState(directory);
+  const s = readLoopState(directory, sessionId);
   if (!s || s.active === false || s.phase === "done" || s.phase === "gave_up" || s.phase === "cancelled") return false;
   if (typeof s.session_id !== "string") return true;
   return s.session_id === sessionId;
@@ -9739,9 +9753,9 @@ function initLoop(directory, cfg) {
   const res = spawnSync(process.execPath, args, { encoding: "utf-8", timeout: 3e4 });
   return res.status === 0;
 }
-function deactivateLoop(directory) {
+function deactivateLoop(directory, sessionId) {
   try {
-    const p = join$1(getLoopDir(directory), "loop-state.json");
+    const p = join$1(getLoopDir(directory, sessionId), "loop-state.json");
     if (!existsSync$1(p)) return;
     const s = JSON.parse(readFileSync$1(p, "utf-8"));
     s.active = false;
@@ -9866,7 +9880,7 @@ function createSvampConfigChecker(directory, sessionId, getMetadata, setMetadata
           logger.log(`[svampConfig] Loop init failed \u2014 loop-init.mjs not found`);
         }
       } else {
-        deactivateLoop(directory);
+        deactivateLoop(directory, sessionId);
         sessionService.pushMessage({ type: "message", message: "Loop cancelled." }, "event");
         logger.log(`[svampConfig] Loop cancelled`);
       }
@@ -10300,7 +10314,7 @@ async function startDaemon(options) {
     const list = loadExposedTunnels().filter((t) => t.name !== name);
     saveExposedTunnels(list);
   }
-  const { ServeManager } = await import('./serveManager-ClBIhxJK.mjs');
+  const { ServeManager } = await import('./serveManager-QZxNxQq0.mjs');
   const serveManager = new ServeManager(SVAMP_HOME, (msg) => logger.log(`[SERVE] ${msg}`), hyphaServerUrl);
   ensureAutoInstalledSkills(logger).catch(() => {
   });
@@ -10539,7 +10553,7 @@ async function startDaemon(options) {
           stuckWatchdogTimer = setInterval(() => {
             if (!claudeProcess || claudeProcess.exitCode !== null) return;
             if (!sessionWasProcessing) return;
-            if (!isLoopActive(directory)) return;
+            if (!isLoopActive(directory, sessionId)) return;
             if (claudeProcess.pid && hasActiveChildren(claudeProcess.pid)) {
               lastOutputTime = Date.now();
               return;
@@ -10553,7 +10567,7 @@ async function startDaemon(options) {
               );
               claudeProcess.kill("SIGTERM");
               setTimeout(() => {
-                if (!trackedSession.stopped && isLoopActive(directory)) {
+                if (!trackedSession.stopped && isLoopActive(directory, sessionId)) {
                   logger.log(`[Session ${sessionId}] Stuck watchdog: nudging loop to resume`);
                   enqueueLoopContinue();
                   processMessageQueueRef?.();
@@ -10661,7 +10675,7 @@ async function startDaemon(options) {
           if (options2.forceIsolation || sessionMetadata.sharing?.enabled) {
             rawPermissionMode = rawPermissionMode === "default" ? "auto-approve-all" : rawPermissionMode;
           }
-          if (isLoopActive(directory)) {
+          if (isLoopActiveForSession(directory, sessionId)) {
             rawPermissionMode = "bypassPermissions";
           }
           const permissionMode = toClaudePermissionMode(rawPermissionMode);
@@ -10934,7 +10948,7 @@ async function startDaemon(options) {
                     }
                   }
                   if (msg.type === "result") {
-                    const loopActive = isLoopActive(directory);
+                    const loopActive = isLoopActiveForSession(directory, sessionId);
                     if (!turnInitiatedByUser && !loopActive) {
                       logger.log(`[Session ${sessionId}] Skipping stale result from SDK-initiated turn`);
                       const hasBackgroundTasks = backgroundTaskCount > 0;
@@ -12457,7 +12471,7 @@ ${capturedError}${buildClaudeErrorHint(capturedError)}`;
       const wasInMemory = teardownTrackedSession(sessionId);
       const markedArchived = markSessionAsArchived(sessionId);
       if (loopDir && isLoopActiveForSession(loopDir, sessionId)) {
-        deactivateLoop(loopDir);
+        deactivateLoop(loopDir, sessionId);
         logger.log(`Deactivated loop for archived session ${sessionId}`);
       }
       if (wasInMemory || markedArchived) {
@@ -12514,7 +12528,7 @@ ${capturedError}${buildClaudeErrorHint(capturedError)}`;
       teardownTrackedSession(sessionId);
       deletePersistedSession(sessionId);
       if (loopDir && isLoopActiveForSession(loopDir, sessionId)) {
-        deactivateLoop(loopDir);
+        deactivateLoop(loopDir, sessionId);
       }
       logger.log(`Session ${sessionId} deleted`);
       return true;
@@ -12662,7 +12676,7 @@ ${capturedError}${buildClaudeErrorHint(capturedError)}`;
       const specs = loadExposedTunnels();
       if (specs.length === 0) return;
       logger.log(`[exposed-tunnels] Restoring ${specs.length} tunnel(s) from ${EXPOSED_TUNNELS_FILE}`);
-      const { FrpcTunnel } = await import('./frpc-D9HsqQ7e.mjs');
+      const { FrpcTunnel } = await import('./frpc-C5Bhpsdw.mjs');
       for (const spec of specs) {
         if (tunnels.has(spec.name)) continue;
         try {
@@ -12750,10 +12764,21 @@ ${capturedError}${buildClaudeErrorHint(capturedError)}`;
       for (const p of persistedSessions) {
         if (sweptDirs.has(p.directory)) continue;
         sweptDirs.add(p.directory);
-        const owner = loopOwnerSession(p.directory);
-        if (owner && !knownSessionIds.has(owner)) {
+        try {
+          for (const ent of readdirSync$1(join$1(p.directory, ".svamp"), { withFileTypes: true })) {
+            if (!ent.isDirectory() || knownSessionIds.has(ent.name)) continue;
+            const owner = loopOwnerSession(p.directory, ent.name);
+            if (owner && !knownSessionIds.has(owner)) {
+              deactivateLoop(p.directory, ent.name);
+              logger.log(`[loop] Deactivated stale loop-state for ${ent.name} in ${p.directory} (owner no longer known)`);
+            }
+          }
+        } catch {
+        }
+        const legacyOwner = loopOwnerSession(p.directory);
+        if (legacyOwner && !knownSessionIds.has(legacyOwner)) {
           deactivateLoop(p.directory);
-          logger.log(`[loop] Deactivated stale loop-state in ${p.directory} (owner session ${owner} no longer known)`);
+          logger.log(`[loop] Deactivated stale legacy loop-state in ${p.directory} (owner session ${legacyOwner} no longer known)`);
         }
       }
     }

package/dist/{run-Cysre19E.mjs → run-TjecLji1.mjs}

@@ -2,7 +2,7 @@ import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(im
 import os from 'node:os';
 import { resolve, join } from 'node:path';
 import { existsSync, readFileSync, watch } from 'node:fs';
-import { c as connectToHypha, a as createSessionStore, r as registerMachineService, P as generateHookSettings } from './run-9j9_wlx5.mjs';
+import { c as connectToHypha, a as createSessionStore, r as registerMachineService, P as generateHookSettings } from './run-LyzVTe3J.mjs';
 import { createServer } from 'node:http';
 import { spawn } from 'node:child_process';
 import { createInterface } from 'node:readline';

package/dist/{serveCommands-JHbRf6Vz.mjs → serveCommands-XlqflmVF.mjs}

@@ -54,7 +54,7 @@ async function handleServeCommand() {
   }
 }
 async function serveAdd(args, machineId) {
-  const { connectAndGetMachine } = await import('./commands-Cectk2JF.mjs');
+  const { connectAndGetMachine } = await import('./commands-DOsK9QRw.mjs');
   const pos = positionalArgs(args);
   const name = pos[0];
   if (!name) {
@@ -93,7 +93,7 @@ async function serveAdd(args, machineId) {
   }
 }
 async function serveApply(args, machineId) {
-  const { connectAndGetMachine } = await import('./commands-Cectk2JF.mjs');
+  const { connectAndGetMachine } = await import('./commands-DOsK9QRw.mjs');
   const fs = await import('fs');
   const yaml = await import('yaml');
   const file = positionalArgs(args)[0];
@@ -182,7 +182,7 @@ async function serveApply(args, machineId) {
   }
 }
 async function serveRemove(args, machineId) {
-  const { connectAndGetMachine } = await import('./commands-Cectk2JF.mjs');
+  const { connectAndGetMachine } = await import('./commands-DOsK9QRw.mjs');
   const pos = positionalArgs(args);
   const name = pos[0];
   if (!name) {
@@ -202,7 +202,7 @@ async function serveRemove(args, machineId) {
   }
 }
 async function serveList(args, machineId) {
-  const { connectAndGetMachine } = await import('./commands-Cectk2JF.mjs');
+  const { connectAndGetMachine } = await import('./commands-DOsK9QRw.mjs');
   const all = hasFlag(args, "--all", "-a");
   const json = hasFlag(args, "--json");
   const sessionId = getFlag(args, "--session");
@@ -235,7 +235,7 @@ async function serveList(args, machineId) {
   }
 }
 async function serveInfo(machineId) {
-  const { connectAndGetMachine } = await import('./commands-Cectk2JF.mjs');
+  const { connectAndGetMachine } = await import('./commands-DOsK9QRw.mjs');
   const { machine, server } = await connectAndGetMachine(machineId);
   try {
     const info = await machine.serveInfo();

package/dist/{serveManager-ClBIhxJK.mjs → serveManager-QZxNxQq0.mjs}

@@ -4,7 +4,7 @@ import * as fs from 'fs';
 import * as http from 'http';
 import * as net from 'net';
 import * as path from 'path';
-import { k as getHyphaServerUrl, S as ServeAuth, l as hasCookieToken } from './run-9j9_wlx5.mjs';
+import { k as getHyphaServerUrl, S as ServeAuth, l as hasCookieToken } from './run-LyzVTe3J.mjs';
 import 'os';
 import 'fs/promises';
 import 'url';
@@ -713,7 +713,7 @@ class ServeManager {
     const mount = this.mounts.get(mountName);
     const subdomainOverride = mount?.access === "link" && mount.linkToken ? /* @__PURE__ */ new Map([[this.port, `static-${subdomainSafe}-${mount.linkToken}`]]) : void 0;
     try {
-      const { FrpcTunnel } = await import('./frpc-D9HsqQ7e.mjs');
+      const { FrpcTunnel } = await import('./frpc-C5Bhpsdw.mjs');
       let tunnel;
       tunnel = new FrpcTunnel({
         name: tunnelName,

package/dist/{sideband-CnnaC4xC.mjs → sideband-CgiHKPJo.mjs}

@@ -1,4 +1,4 @@
-import { z as READ_ONLY_TOOLS, A as loadMachineContext, B as buildMachineInstructions, C as machineToolsForRole, D as buildMachineTools } from './run-9j9_wlx5.mjs';
+import { z as READ_ONLY_TOOLS, A as loadMachineContext, B as buildMachineInstructions, C as machineToolsForRole, D as buildMachineTools } from './run-LyzVTe3J.mjs';
 import 'node:child_process';
 import 'os';
 import 'fs/promises';

package/package.json

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