svamp-cli 0.2.129 → 0.2.131

package/dist/{frpc-BpBOWRbL.mjs → frpc-DjCP6NoG.mjs}

@@ -1,9 +1,10 @@
 import { spawn, execSync } from 'child_process';
+import { createServer } from 'net';
 import { mkdirSync, writeFileSync, unlinkSync, existsSync, chmodSync, readFileSync } from 'fs';
 import { join } from 'path';
 import { homedir, platform, arch } from 'os';
-import { createHash, randomUUID } from 'crypto';
-import { h as getFrpsSubdomainHost, i as getFrpsServerPort, j as getFrpsServerAddr } from './run-BaTwfE1Q.mjs';
+import { randomUUID, createHash } from 'crypto';
+import { h as getFrpsSubdomainHost, i as getFrpsServerPort, j as getFrpsServerAddr } from './run-BIwWpHSR.mjs';
 import 'fs/promises';
 import 'url';
 import 'node:crypto';
@@ -124,7 +125,7 @@ async function ensureFrpc(log) {
   }
   return FRPC_BIN;
 }
-function generateFrpcConfig(config, proxies) {
+function generateFrpcConfig(config, proxies, admin) {
   const useWSS = config.serverPort === 443;
   const lines = [
     "# Auto-generated by svamp \u2014 do not edit",
@@ -154,6 +155,14 @@ function generateFrpcConfig(config, proxies) {
     'log.level = "info"',
     ""
   ];
+  if (admin) {
+    lines.push("# Local admin/status API (loopback only \u2014 polled by the svamp daemon)");
+    lines.push('webServer.addr = "127.0.0.1"');
+    lines.push(`webServer.port = ${admin.port}`);
+    lines.push(`webServer.user = "${admin.user}"`);
+    lines.push(`webServer.password = "${admin.password}"`);
+    lines.push("");
+  }
   for (const proxy of proxies) {
     lines.push(`[[proxies]]`);
     lines.push(`name = "${proxy.name}"`);
@@ -189,6 +198,42 @@ function generateFrpcConfig(config, proxies) {
   }
   return lines.join("\n");
 }
+function getFreePort() {
+  return new Promise((resolve, reject) => {
+    const srv = createServer();
+    srv.unref();
+    srv.on("error", reject);
+    srv.listen(0, "127.0.0.1", () => {
+      const addr = srv.address();
+      const port = typeof addr === "object" && addr ? addr.port : 0;
+      srv.close(() => port ? resolve(port) : reject(new Error("no port")));
+    });
+  });
+}
+function parseFrpcStatus(payload, proxyNames) {
+  const byName = /* @__PURE__ */ new Map();
+  if (payload && typeof payload === "object") {
+    for (const group of Object.values(payload)) {
+      if (!Array.isArray(group)) continue;
+      for (const p of group) {
+        if (p && typeof p.name === "string") {
+          byName.set(p.name, { status: String(p.status ?? ""), err: p.err ? String(p.err) : void 0 });
+        }
+      }
+    }
+  }
+  const missing = [];
+  const failed = [];
+  for (const name of proxyNames) {
+    const entry = byName.get(name);
+    if (!entry) {
+      missing.push(name);
+      continue;
+    }
+    if (entry.status !== "running") failed.push({ name, status: entry.status, err: entry.err });
+  }
+  return { allRunning: missing.length === 0 && failed.length === 0, missing, failed };
+}
 class FrpcTunnel {
   process = null;
   _connected = false;
@@ -211,6 +256,11 @@ class FrpcTunnel {
   _lastProbeOkAt = 0;
   _lastProbeFailAt = 0;
   _probeOk = false;
+  // frpc admin/status API state (set when options.adminStatus is true).
+  _adminPort = 0;
+  _adminUser = "svamp";
+  _adminPassword = randomUUID();
+  _statusTimer = null;
   constructor(options) {
     this.options = options;
     this.log = options.log || ((msg) => console.log(`[FRPC] ${msg}`));
@@ -255,7 +305,18 @@ class FrpcTunnel {
     if (this._destroyed) return;
     if (this.process) return;
     const frpcPath = await ensureFrpc(this.log);
-    const configContent = generateFrpcConfig(this.serverConfig, this.proxies);
+    let admin;
+    if (this.options.adminStatus) {
+      if (!this._adminPort) {
+        try {
+          this._adminPort = await getFreePort();
+        } catch (err) {
+          this.log(`admin port alloc failed: ${err?.message ?? err}`);
+        }
+      }
+      if (this._adminPort) admin = { port: this._adminPort, user: this._adminUser, password: this._adminPassword };
+    }
+    const configContent = generateFrpcConfig(this.serverConfig, this.proxies, admin);
     writeFileSync(this.configPath, configContent);
     this.log(`Config written to ${this.configPath}`);
     return new Promise((resolve, reject) => {
@@ -335,6 +396,8 @@ class FrpcTunnel {
             }
           }
         });
+      } else if (this.options.adminStatus && this._adminPort) {
+        this.startAdminStatusLoop();
       }
       setTimeout(() => {
         if (!resolved) {
@@ -433,11 +496,86 @@ class FrpcTunnel {
       this._probeTimer = null;
     }
   }
+  /**
+   * Poll frpc's loopback admin API (`/api/status`) to track whether this
+   * tunnel's proxies are registered ("running"). Feeds the same `_probeOk` /
+   * staleness fields the daemon health loop watches, so a ghosted/stuck proxy
+   * is detected and recreated even with no HTTP health endpoint on the backend.
+   *
+   * Conservative semantics (critical infra — must not churn healthy tunnels):
+   *  - all proxies "running"        → ok (refresh lastProbeOkAt)
+   *  - a proxy present but not running, or missing after a grace period
+   *                                 → fail (sets lastProbeFailAt; daemon recreates after staleness)
+   *  - admin API unreachable        → INCONCLUSIVE: leave _probeOk untouched
+   *                                   (a transient blip can't flip ok→fail)
+   */
+  startAdminStatusLoop() {
+    this.stopAdminStatusLoop();
+    if (!this._adminPort) return;
+    const proxyNames = this.proxies.map((p) => p.name);
+    const intervalMs = this.options.probeIntervalMs ?? 3e4;
+    const startedAt = Date.now();
+    const auth = "Basic " + Buffer.from(`${this._adminUser}:${this._adminPassword}`).toString("base64");
+    this._probeOk = true;
+    this._lastProbeOkAt = Date.now();
+    let inFlight = false;
+    const poll = async () => {
+      if (this._destroyed || inFlight || !this.process) return;
+      inFlight = true;
+      try {
+        const ctrl = new AbortController();
+        const timer = setTimeout(() => ctrl.abort(), 5e3);
+        let payload;
+        try {
+          const resp = await fetch(`http://127.0.0.1:${this._adminPort}/api/status`, {
+            headers: { Authorization: auth },
+            signal: ctrl.signal
+          });
+          if (!resp.ok) throw new Error(`admin status ${resp.status}`);
+          payload = await resp.json();
+        } finally {
+          clearTimeout(timer);
+        }
+        const { allRunning, missing, failed } = parseFrpcStatus(payload, proxyNames);
+        const graceElapsed = Date.now() - startedAt > 2e4;
+        if (allRunning || !failed.length && !graceElapsed) {
+          const wasFailing = !this._probeOk;
+          this._probeOk = true;
+          this._lastProbeOkAt = Date.now();
+          if (wasFailing) this.log(`admin status ok: all proxies running`);
+        } else {
+          const wasOk = this._probeOk;
+          this._probeOk = false;
+          this._lastProbeFailAt = Date.now();
+          if (wasOk) {
+            const detail = [
+              ...failed.map((f) => `${f.name}=${f.status}${f.err ? ` (${f.err})` : ""}`),
+              ...missing.map((m) => `${m}=missing`)
+            ].join(", ");
+            this.log(`admin status fail: ${detail}`);
+            this.options.onProbeFail?.(new Error(`frpc proxy not running: ${detail}`));
+          }
+        }
+      } catch {
+      } finally {
+        inFlight = false;
+      }
+    };
+    if (intervalMs > 0) this._statusTimer = setInterval(poll, intervalMs);
+    setTimeout(() => void poll(), 3e3);
+  }
+  stopAdminStatusLoop() {
+    if (this._statusTimer) {
+      clearInterval(this._statusTimer);
+      this._statusTimer = null;
+    }
+  }
   /** Disconnect and stop the frpc process. */
   destroy() {
     this._destroyed = true;
     this._connected = false;
     this.stopProbeLoop();
+    this.stopAdminStatusLoop();
     if (this.process) {
       this.process.kill("SIGTERM");
       const p = this.process;
@@ -473,8 +611,8 @@ class FrpcTunnel {
       firstErrorAt: this._firstErrorAt,
       restartAttempts: this._restartAttempts,
       failingDurationMs: this._firstErrorAt > 0 ? Date.now() - this._firstErrorAt : 0,
-      probe: this.resolveProbeUrl() ? {
-        url: this.resolveProbeUrl(),
+      probe: this.resolveProbeUrl() || this.options.adminStatus && this._adminPort ? {
+        url: this.resolveProbeUrl() || `frpc-admin:${this._adminPort}/api/status`,
         ok: this._probeOk,
         lastOkAt: this._lastProbeOkAt,
         lastFailAt: this._lastProbeFailAt,
@@ -485,7 +623,8 @@ class FrpcTunnel {
   /** Update the Hypha token. Rewrites config; takes effect on next frpc restart. */
   updateToken(newToken) {
     this.serverConfig.hyphaToken = newToken;
-    const configContent = generateFrpcConfig(this.serverConfig, this.proxies);
+    const admin = this.options.adminStatus && this._adminPort ? { port: this._adminPort, user: this._adminUser, password: this._adminPassword } : void 0;
+    const configContent = generateFrpcConfig(this.serverConfig, this.proxies, admin);
     writeFileSync(this.configPath, configContent);
     this.log("Config updated with fresh token");
   }
@@ -539,4 +678,4 @@ async function runFrpcTunnel(name, ports, serverConfig, tunnelOptions) {
   }
 }
 
-export { FrpcTunnel, ensureFrpc, generateFrpcConfig, runFrpcTunnel };
+export { FrpcTunnel, ensureFrpc, generateFrpcConfig, getFreePort, parseFrpcStatus, runFrpcTunnel };

package/dist/{headlessCli-Cj4WQsCx.mjs → headlessCli-B4ajzkit.mjs}

@@ -1,5 +1,5 @@
-import { D as resolveModel, V as describeMisconfiguration, W as buildMachineDeps } from './run-BaTwfE1Q.mjs';
-import { handleRealtimeEvent, initMachineVoiceSession } from './sideband-D_Hzijan.mjs';
+import { D as resolveModel, V as describeMisconfiguration, W as buildMachineDeps } from './run-BIwWpHSR.mjs';
+import { handleRealtimeEvent, initMachineVoiceSession } from './sideband-BnEpfp8h.mjs';
 import { WebSocket } from 'ws';
 import { execSync, spawn } from 'child_process';
 import 'os';

package/dist/index.mjs

@@ -1,4 +1,4 @@
-export { c as connectToHypha, a as createSessionStore, d as daemonStatus, g as getHyphaServerUrl, r as registerMachineService, s as startDaemon, b as stopDaemon } from './run-BaTwfE1Q.mjs';
+export { c as connectToHypha, a as createSessionStore, d as daemonStatus, g as getHyphaServerUrl, r as registerMachineService, s as startDaemon, b as stopDaemon } from './run-BIwWpHSR.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';

package/dist/{package-DzPfT1Xs.mjs → package-B2OzFsgB.mjs}

@@ -1,5 +1,5 @@
 var name = "svamp-cli";
-var version = "0.2.129";
+var version = "0.2.131";
 var description = "Svamp CLI — AI workspace daemon on Hypha Cloud";
 var author = "Amun AI AB";
 var license = "SEE LICENSE IN LICENSE";
@@ -19,7 +19,7 @@ var exports$1 = {
 var scripts = {
 	build: "rm -rf dist bin/skills && mkdir -p bin/skills && cp -r ../../skills/artifact bin/skills/artifact && cp -r ../../skills/loop bin/skills/loop && cp -r ../../skills/crew bin/skills/crew && tsc --noEmit && pkgroll",
 	typecheck: "tsc --noEmit",
-	test: "npx tsx test/test-context-window.mjs && npx tsx test/test-instance-config.mjs && npx tsx test/test-authorize.mjs && npx tsx test/test-normalize-allowed-user.mjs && npx tsx test/test-share-url.mjs && npx tsx test/test-update-sharing-normalization.mjs && npx tsx test/test-staged-homes-sweep.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-isolation-decision.mjs && npx tsx test/test-loop-activation.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-claude-auth.mjs && npx tsx test/test-output-formatters.mjs && npx tsx test/test-inbox-guard.mjs && npx tsx test/test-auto-topic.mjs && npx tsx test/test-project-info.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-session-send-query.mjs && npx tsx test/test-skills.mjs && npx tsx test/test-agent-grouping.mjs && npx tsx test/test-machine-list-directory.mjs && npx tsx test/test-service-commands.mjs && npx tsx test/test-supervisor.mjs && npx tsx test/test-supervisor-lock.mjs && node test/test-supervisor-restart.mjs && npx tsx test/test-clear-detection.mjs && npx tsx test/test-session-consolidation.mjs && npx tsx test/test-inbox.mjs && npx tsx test/test-checklist.mjs && npx tsx test/test-short-id.mjs && npx tsx test/test-transcript-edit.mjs && npx tsx test/test-edit-history.mjs && npx tsx test/test-friendly-name.mjs && npx tsx test/test-session-rpc-dispatch.mjs && npx tsx test/test-sandbox-cli.mjs && npx tsx test/test-serve-manager.mjs && npx tsx test/test-serve-stability.mjs && npx tsx test/test-frpc-e2e.mjs --unit-only && node test/pinnedClaudeCode.test.mjs && node test/fleet.test.mjs && npx tsx test/test-routine.mjs && npx tsx test/test-routine-rpc.mjs && npx tsx test/test-checklist-watchdog.mjs && npx tsx test/test-session-file.mjs && npx tsx test/test-channel-rpc.mjs && npx tsx test/test-wise-agent.mjs && npx tsx test/test-channel-agent.mjs && npx tsx test/test-channels-service.mjs && npx tsx test/test-channel-async-reply.mjs && npx tsx test/test-channel-binding.mjs && npx tsx test/test-channel-identity.mjs && npx tsx test/test-wise-agent-auth.mjs && npx tsx test/test-channel-http.mjs && npx tsx test/test-wise-voice.mjs && npx tsx test/test-wise-headless.mjs && npx tsx test/test-wise-machine.mjs && npx tsx test/test-crew-merge.mjs",
+	test: "npx tsx test/test-context-window.mjs && npx tsx test/test-instance-config.mjs && npx tsx test/test-authorize.mjs && npx tsx test/test-normalize-allowed-user.mjs && npx tsx test/test-share-url.mjs && npx tsx test/test-update-sharing-normalization.mjs && npx tsx test/test-staged-homes-sweep.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-isolation-decision.mjs && npx tsx test/test-loop-activation.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-claude-auth.mjs && npx tsx test/test-output-formatters.mjs && npx tsx test/test-inbox-guard.mjs && npx tsx test/test-auto-topic.mjs && npx tsx test/test-project-info.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-session-send-query.mjs && npx tsx test/test-skills.mjs && npx tsx test/test-agent-grouping.mjs && npx tsx test/test-machine-list-directory.mjs && npx tsx test/test-service-commands.mjs && npx tsx test/test-supervisor.mjs && npx tsx test/test-supervisor-lock.mjs && node test/test-supervisor-restart.mjs && npx tsx test/test-clear-detection.mjs && npx tsx test/test-session-consolidation.mjs && npx tsx test/test-inbox.mjs && npx tsx test/test-checklist.mjs && npx tsx test/test-short-id.mjs && npx tsx test/test-transcript-edit.mjs && npx tsx test/test-edit-history.mjs && npx tsx test/test-friendly-name.mjs && npx tsx test/test-session-rpc-dispatch.mjs && npx tsx test/test-sandbox-cli.mjs && npx tsx test/test-serve-manager.mjs && npx tsx test/test-serve-stability.mjs && npx tsx test/test-frpc-e2e.mjs --unit-only && npx tsx test/test-frpc-status.mjs && node test/pinnedClaudeCode.test.mjs && node test/fleet.test.mjs && npx tsx test/test-routine.mjs && npx tsx test/test-routine-rpc.mjs && npx tsx test/test-checklist-watchdog.mjs && npx tsx test/test-session-file.mjs && npx tsx test/test-channel-rpc.mjs && npx tsx test/test-wise-agent.mjs && npx tsx test/test-channel-agent.mjs && npx tsx test/test-channels-service.mjs && npx tsx test/test-channel-async-reply.mjs && npx tsx test/test-channel-binding.mjs && npx tsx test/test-channel-identity.mjs && npx tsx test/test-wise-agent-auth.mjs && npx tsx test/test-channel-http.mjs && npx tsx test/test-wise-voice.mjs && npx tsx test/test-wise-headless.mjs && npx tsx test/test-wise-machine.mjs && npx tsx test/test-crew-merge.mjs",
 	"test:hypha": "node --no-warnings test/test-hypha-service.mjs",
 	dev: "tsx src/cli.ts",
 	"dev:daemon": "tsx src/cli.ts daemon start-sync",

package/dist/{run-BaTwfE1Q.mjs → run-BIwWpHSR.mjs}

@@ -2677,7 +2677,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-BpBOWRbL.mjs');
+        const { FrpcTunnel } = await import('./frpc-DjCP6NoG.mjs');
         const tunnel = new FrpcTunnel({
           name: params.name,
           ports: params.ports,
@@ -2686,6 +2686,10 @@ async function registerMachineService(server, machineId, metadata, daemonState,
           healthCheckType: params.healthCheckType,
           healthCheckPath: params.healthCheckPath,
           healthCheckInterval: params.healthCheckInterval,
+          // Poll frpc's loopback admin API for backend-agnostic
+          // ghost/stuck-proxy detection (the daemon health loop recreates
+          // on persistent failure).
+          adminStatus: true,
           onError: (err) => console.error(`[FRPC] ${params.name}: ${err.message}`),
           onConnect: () => console.log(`[FRPC] ${params.name}: connected`),
           onDisconnect: () => console.log(`[FRPC] ${params.name}: disconnected, will auto-reconnect`)
@@ -2718,14 +2722,47 @@ async function registerMachineService(server, machineId, metadata, daemonState,
         handlers.forgetExposedTunnel?.(params.name);
         return { name: params.name, stopped: true };
       },
-      /** List active tunnels with health status. */
+      /**
+       * List the full CONFIGURED set of daemon-managed tunnels with a
+       * derived per-tunnel `state`, not just the ones currently live. The
+       * configured set comes from the persisted specs (survives restarts +
+       * mid-recreate gaps); each is joined with its live FrpcTunnel status
+       * if present. A tunnel that's persisted but not live (failed restore,
+       * recreating) shows up as `reconnecting` instead of silently vanishing.
+       */
       tunnelList: async (context) => {
         authorizeRequest(context, currentMetadata.sharing, "view");
         const tunnels = handlers.tunnels;
         if (!tunnels) return [];
-        return Array.from(tunnels.entries()).map(([, tunnel]) => ({
-          ...tunnel.status
-        }));
+        const specs = handlers.listExposedTunnels?.() ?? [];
+        const seen = /* @__PURE__ */ new Set();
+        const rows = [];
+        const stateOf = (s) => {
+          if (!s) return "reconnecting";
+          if (s.probe && !s.probe.ok) return "failed";
+          if (s.connected) return "connected";
+          return s.restartAttempts > 0 ? "reconnecting" : "failed";
+        };
+        for (const spec of specs) {
+          seen.add(spec.name);
+          const tunnel = tunnels.get(spec.name);
+          const status = tunnel ? tunnel.status : null;
+          rows.push({
+            name: spec.name,
+            ports: spec.ports,
+            group: spec.group,
+            configured: true,
+            live: !!tunnel,
+            state: stateOf(status),
+            ...status ?? {}
+          });
+        }
+        for (const [name, tunnel] of tunnels) {
+          if (seen.has(name)) continue;
+          const status = tunnel.status;
+          rows.push({ ...status, name, configured: false, live: true, state: stateOf(status) });
+        }
+        return rows;
       },
       // ── Shared static file server ────────────────────────────────────
       /** Add a mount to the shared static file server. */
@@ -2938,7 +2975,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-D_Hzijan.mjs');
+          const { toolsForRole } = await import('./sideband-BnEpfp8h.mjs');
           const r2 = await runWiseAgent({ message: params.message, sender, config: { tools: toolsForRole(role2) }, deps, transport, model: resolved.model });
           return fmt(r2);
         }
@@ -3037,7 +3074,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-BV30A1zt.mjs');
+    const { queryCore } = await import('./commands-CP0LaCNP.mjs');
     const timeout = c.reply?.timeout_sec || 120;
     let result;
     try {
@@ -3519,9 +3556,20 @@ function patchStoredText(msg, newText) {
       return true;
     }
     if (data?.type === "assistant" && Array.isArray(data?.message?.content)) {
-      const textBlocks = data.message.content.filter((b) => b && b.type === "text" && typeof b.text === "string");
-      if (textBlocks.length === 1) {
+      const content = data.message.content;
+      const isText = (b) => b && b.type === "text" && typeof b.text === "string";
+      const textBlocks = content.filter(isText);
+      if (textBlocks.length >= 1) {
         textBlocks[0].text = newText;
+        let seen = false;
+        data.message.content = content.filter((b) => {
+          if (!isText(b)) return true;
+          if (!seen) {
+            seen = true;
+            return true;
+          }
+          return false;
+        });
         return true;
       }
     }
@@ -7734,11 +7782,21 @@ function applyTranscriptEdit(file, index, newText) {
   if (target.type === "assistant") {
     const content = target?.message?.content;
     if (!Array.isArray(content)) return { ok: false, reason: "assistant content is not a block array" };
-    const textBlocks = content.filter((b) => b && b.type === "text" && typeof b.text === "string");
-    if (textBlocks.length !== 1) {
-      return { ok: false, reason: `expected exactly 1 text block, found ${textBlocks.length}` };
+    const isText = (b) => b && b.type === "text" && typeof b.text === "string";
+    const textBlocks = content.filter(isText);
+    if (textBlocks.length === 0) {
+      return { ok: false, reason: "expected at least 1 text block, found 0" };
     }
     textBlocks[0].text = newText;
+    let seen = false;
+    target.message.content = content.filter((b) => {
+      if (!isText(b)) return true;
+      if (!seen) {
+        seen = true;
+        return true;
+      }
+      return false;
+    });
   } else if (target.type === "user") {
     if (typeof target?.message?.content !== "string") {
       return { ok: false, reason: "user content is not a string" };
@@ -11328,7 +11386,28 @@ async function startDaemon(options) {
     const list = loadExposedTunnels().filter((t) => t.name !== name);
     saveExposedTunnels(list);
   }
-  const { ServeManager } = await import('./serveManager-cPgahjYE.mjs');
+  async function createExposedTunnel(spec) {
+    const { FrpcTunnel } = await import('./frpc-DjCP6NoG.mjs');
+    const tunnel = new FrpcTunnel({
+      name: spec.name,
+      ports: spec.ports,
+      group: spec.group,
+      groupKey: spec.groupKey,
+      healthCheckType: spec.healthCheckType,
+      healthCheckPath: spec.healthCheckPath,
+      healthCheckInterval: spec.healthCheckInterval,
+      // Backend-agnostic ghost/stuck-proxy detection via frpc's loopback
+      // admin API — exposed backends rarely have an HTTP health endpoint.
+      adminStatus: true,
+      onError: (err) => logger.log(`[FRPC ${spec.name}] ${err.message}`),
+      onConnect: () => logger.log(`[FRPC ${spec.name}] connected`),
+      onDisconnect: () => logger.log(`[FRPC ${spec.name}] disconnected, will auto-reconnect`)
+    });
+    await tunnel.connect();
+    return tunnel;
+  }
+  const tunnelRecreateState = /* @__PURE__ */ new Map();
+  const { ServeManager } = await import('./serveManager-D7_YZY-E.mjs');
   const serveManager = new ServeManager(SVAMP_HOME, (msg) => logger.log(`[SERVE] ${msg}`), hyphaServerUrl);
   ensureAutoInstalledSkills(logger).catch(() => {
   });
@@ -13988,7 +14067,8 @@ ${capturedError}${buildClaudeErrorHint(capturedError)}`;
         serveManager,
         sharingNotificationSync,
         persistExposedTunnel,
-        forgetExposedTunnel
+        forgetExposedTunnel,
+        listExposedTunnels: () => loadExposedTunnels().map((t) => ({ name: t.name, ports: t.ports, group: t.group, addedAt: t.addedAt }))
       }
     );
     logger.log(`Machine service registered: svamp-machine-${machineId}`);
@@ -14016,23 +14096,10 @@ ${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-BpBOWRbL.mjs');
       for (const spec of specs) {
         if (tunnels.has(spec.name)) continue;
         try {
-          const tunnel = new FrpcTunnel({
-            name: spec.name,
-            ports: spec.ports,
-            group: spec.group,
-            groupKey: spec.groupKey,
-            healthCheckType: spec.healthCheckType,
-            healthCheckPath: spec.healthCheckPath,
-            healthCheckInterval: spec.healthCheckInterval,
-            onError: (err) => logger.log(`[FRPC ${spec.name}] ${err.message}`),
-            onConnect: () => logger.log(`[FRPC ${spec.name}] connected (restored)`),
-            onDisconnect: () => logger.log(`[FRPC ${spec.name}] disconnected, will auto-reconnect`)
-          });
-          await tunnel.connect();
+          const tunnel = await createExposedTunnel(spec);
           tunnels.set(spec.name, tunnel);
           logger.log(`[exposed-tunnels] Restored: ${spec.name} \u2192 ports ${spec.ports.join(",")}`);
         } catch (err) {
@@ -14124,7 +14191,8 @@ ${capturedError}${buildClaudeErrorHint(capturedError)}`;
     }
     if (persistedSessions.length > 0) {
       logger.log(`Restoring ${persistedSessions.length} persisted session(s)...`);
-      for (const persisted of persistedSessions) {
+      const restoreConcurrency = Math.max(1, parseInt(process.env.SVAMP_RESTORE_CONCURRENCY || "8", 10) || 8);
+      const restoreOne = async (persisted) => {
         try {
           const isOrphaned = persisted.machineId && persisted.machineId !== machineId;
           if (isOrphaned) {
@@ -14175,7 +14243,19 @@ ${capturedError}${buildClaudeErrorHint(capturedError)}`;
         } catch (err) {
           logger.error(`Error restoring session ${persisted.sessionId}:`, err.message);
         }
-      }
+      };
+      let restoreCursor = 0;
+      const restoreWorker = async () => {
+        while (restoreCursor < persistedSessions.length) {
+          const persisted = persistedSessions[restoreCursor++];
+          await restoreOne(persisted);
+        }
+      };
+      const t0 = Date.now();
+      await Promise.all(
+        Array.from({ length: Math.min(restoreConcurrency, persistedSessions.length) }, () => restoreWorker())
+      );
+      logger.log(`Restored ${persistedSessions.length} session(s) in ${Date.now() - t0}ms (concurrency ${restoreConcurrency})`);
     }
     if (sessionsToAutoContinue.length > 0 && !options?.noAutoContinue) {
       logger.log(`Auto-continuing ${sessionsToAutoContinue.length} interrupted session(s)...`);
@@ -14390,11 +14470,39 @@ ${capturedError}${buildClaudeErrorHint(capturedError)}`;
         for (const [name, tunnel] of tunnels) {
           const health = tunnel.status;
           const reason = tunnelLooksDead(health);
-          if (reason) {
-            logger.log(`frpc tunnel '${name}' ${reason} \u2014 destroying stale tunnel`);
-            tunnel.destroy();
+          if (!reason) {
+            tunnelRecreateState.delete(name);
+            continue;
+          }
+          const spec = loadExposedTunnels().find((t) => t.name === name);
+          if (!spec) {
+            logger.log(`frpc tunnel '${name}' ${reason}, no persisted spec \u2014 destroying (cannot recreate)`);
+            try {
+              tunnel.destroy();
+            } catch {
+            }
             tunnels.delete(name);
+            tunnelRecreateState.delete(name);
+            continue;
           }
+          const now = Date.now();
+          const st = tunnelRecreateState.get(name) ?? { nextAttemptAt: 0, attempts: 0 };
+          if (now < st.nextAttemptAt) continue;
+          st.attempts++;
+          st.nextAttemptAt = now + Math.min(15e3 * Math.pow(2, st.attempts - 1), 5 * 6e4);
+          tunnelRecreateState.set(name, st);
+          logger.log(`frpc tunnel '${name}' ${reason} \u2014 recreating (attempt ${st.attempts})`);
+          try {
+            tunnel.destroy();
+          } catch {
+          }
+          tunnels.delete(name);
+          createExposedTunnel(spec).then((fresh) => {
+            tunnels.set(name, fresh);
+            logger.log(`frpc tunnel '${name}' recreated`);
+          }).catch((err) => {
+            logger.log(`frpc tunnel '${name}' recreate failed: ${err.message} (will retry)`);
+          });
         }
       } finally {
         heartbeatRunning = false;

package/dist/{run-C6Q6ZlNu.mjs → run-DwKCJsbF.mjs}

@@ -1,4 +1,4 @@
-import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import { X as generateFriendlyName, m as shortId, c as connectToHypha, a as createSessionStore, r as registerMachineService, Y as generateHookSettings } from './run-BaTwfE1Q.mjs';
+import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import { X as generateFriendlyName, m as shortId, c as connectToHypha, a as createSessionStore, r as registerMachineService, Y as generateHookSettings } from './run-BIwWpHSR.mjs';
 import os from 'node:os';
 import { resolve, join } from 'node:path';
 import { existsSync, readFileSync, watch } from 'node:fs';

package/dist/{serveCommands-GzGpHWlP.mjs → serveCommands-IUmUvv8B.mjs}

@@ -54,7 +54,7 @@ async function handleServeCommand() {
   }
 }
 async function serveAdd(args, machineId) {
-  const { connectAndGetMachine } = await import('./commands-BV30A1zt.mjs');
+  const { connectAndGetMachine } = await import('./commands-CP0LaCNP.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-BV30A1zt.mjs');
+  const { connectAndGetMachine } = await import('./commands-CP0LaCNP.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-BV30A1zt.mjs');
+  const { connectAndGetMachine } = await import('./commands-CP0LaCNP.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-BV30A1zt.mjs');
+  const { connectAndGetMachine } = await import('./commands-CP0LaCNP.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-BV30A1zt.mjs');
+  const { connectAndGetMachine } = await import('./commands-CP0LaCNP.mjs');
   const { machine, server } = await connectAndGetMachine(machineId);
   try {
     const info = await machine.serveInfo();

package/dist/{serveManager-cPgahjYE.mjs → serveManager-D7_YZY-E.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-BaTwfE1Q.mjs';
+import { k as getHyphaServerUrl, S as ServeAuth, l as hasCookieToken } from './run-BIwWpHSR.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-BpBOWRbL.mjs');
+      const { FrpcTunnel } = await import('./frpc-DjCP6NoG.mjs');
       let tunnel;
       tunnel = new FrpcTunnel({
         name: tunnelName,

package/dist/{sideband-D_Hzijan.mjs → sideband-BnEpfp8h.mjs}

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