svamp-cli 0.2.319 → 0.2.320

package/dist/{run-09AkgeGM.mjs → run-CvwPIrfo.mjs}

@@ -1261,11 +1261,11 @@ async function killDescendant(rootPid, targetPid, signal = "SIGTERM") {
   }
 }
 
-function svampHome() {
+function svampHome$1() {
   return process.env.SVAMP_HOME || join(homedir(), ".svamp");
 }
 function cacheFile() {
-  return join(svampHome(), "instance-config.json");
+  return join(svampHome$1(), "instance-config.json");
 }
 const CONFIG_FILENAME = "svamp.json";
 let _config = null;
@@ -1308,7 +1308,7 @@ function readCache() {
 }
 function writeCache(cfg) {
   try {
-    mkdirSync(svampHome(), { recursive: true });
+    mkdirSync(svampHome$1(), { recursive: true });
     writeFileSync(cacheFile(), JSON.stringify(cfg, null, 2) + "\n", "utf-8");
   } catch {
   }
@@ -1444,7 +1444,7 @@ function getSkillsCollection() {
 }
 
 function getMachineFingerprint() {
-  const idFile = join(homedir(), ".svamp", "machine-id");
+  const idFile = join(svampHome(), "machine-id");
   try {
     const existing = readFileSync$1(idFile, "utf-8").trim();
     if (existing) return existing;
@@ -1452,15 +1452,18 @@ function getMachineFingerprint() {
   }
   const id = randomUUID();
   try {
-    mkdirSync(join(homedir(), ".svamp"), { recursive: true });
+    mkdirSync(svampHome(), { recursive: true });
     writeFileSync(idFile, id + "\n");
   } catch {
   }
   return id;
 }
+function svampHome() {
+  return process.env.SVAMP_HOME || join(homedir(), ".svamp");
+}
 const FRP_VERSION = "0.68.0";
-const BIN_DIR = join(homedir(), ".svamp", "bin");
-const FRPC_BIN = join(BIN_DIR, platform() === "win32" ? "frpc.exe" : "frpc");
+const binDir = () => join(svampHome(), "bin");
+const frpcBin = () => join(binDir(), platform() === "win32" ? "frpc.exe" : "frpc");
 const _livingFrpcPids = /* @__PURE__ */ new Set();
 function isFrpcSubdomainConflict(errorLine) {
   return /router config conflict|already exists/i.test(errorLine);
@@ -1469,15 +1472,17 @@ function shouldGiveUpOnConflict(args) {
   if (args.everStartedProxy) return false;
   return args.conflictCount >= args.minAttempts && args.elapsedMs >= args.minElapsedMs;
 }
-function selectOrphanedFrpcPids(psOutput, selfPid, livingPids) {
+function selectOrphanedFrpcPids(psOutput, selfPid, livingPids, managedBinPath = frpcBin()) {
   const pids = [];
   for (const line of psOutput.split("\n")) {
-    const m = /^\s*(\d+)\s+(.*)$/.exec(line);
+    const m = /^\s*(\d+)\s+(\d+)\s+(.*)$/.exec(line);
     if (!m) continue;
     const pid = Number(m[1]);
-    const cmd = m[2];
-    if (!cmd.includes(".svamp/bin/frpc")) continue;
+    const ppid = Number(m[2]);
+    const cmd = m[3];
+    if (!cmd.includes(".svamp/bin/frpc") && !cmd.includes(managedBinPath)) continue;
     if (pid === selfPid || livingPids.has(pid)) continue;
+    if (ppid !== 1) continue;
     pids.push(pid);
   }
   return pids;
@@ -1485,7 +1490,7 @@ function selectOrphanedFrpcPids(psOutput, selfPid, livingPids) {
 function killOrphanedFrpc(log) {
   if (process.platform === "win32") return;
   try {
-    const out = execSync("ps -axo pid=,command=", { encoding: "utf-8" });
+    const out = execSync("ps -axo pid=,ppid=,command=", { encoding: "utf-8" });
     const pids = selectOrphanedFrpcPids(out, process.pid, _livingFrpcPids);
     for (const pid of pids) {
       try {
@@ -1494,7 +1499,7 @@ function killOrphanedFrpc(log) {
       }
     }
     if (pids.length) {
-      log(`Reaped ${pids.length} orphaned frpc process(es) from a prior daemon generation \u2014 they were retrying stale subdomains and causing frps router-config-conflict churn.`);
+      log(`Reaped ${pids.length} orphaned frpc process(es) (reparented to init) from a prior daemon generation \u2014 they were retrying stale subdomains and causing frps router-config-conflict churn.`);
     }
   } catch {
   }
@@ -1542,10 +1547,10 @@ function getFrpcDownloadUrl() {
 }
 let _frpcDownloadInFlight = null;
 async function ensureFrpc(log) {
-  if (existsSync$1(FRPC_BIN)) {
+  if (existsSync$1(frpcBin())) {
     try {
-      const out = execSync(`"${FRPC_BIN}" --version`, { stdio: "pipe", timeout: 5e3 }).toString().trim();
-      if (out === FRP_VERSION) return FRPC_BIN;
+      const out = execSync(`"${frpcBin()}" --version`, { stdio: "pipe", timeout: 5e3 }).toString().trim();
+      if (out === FRP_VERSION) return frpcBin();
       (log || console.log)(`frpc version mismatch: ${out} \u2260 ${FRP_VERSION}, re-downloading...`);
     } catch {
       (log || console.log)("frpc binary broken or invalid signature, re-downloading...");
@@ -1559,11 +1564,11 @@ async function ensureFrpc(log) {
 }
 async function downloadFrpc(log) {
   try {
-    if (existsSync$1(FRPC_BIN)) unlinkSync(FRPC_BIN);
+    if (existsSync$1(frpcBin())) unlinkSync(frpcBin());
   } catch {
   }
   const logger = log || console.log;
-  mkdirSync(BIN_DIR, { recursive: true });
+  mkdirSync(binDir(), { recursive: true });
   const url = getFrpcDownloadUrl();
   logger(`Downloading frpc ${FRP_VERSION} from ${url}...`);
   const ctrl = new AbortController();
@@ -1584,23 +1589,23 @@ async function downloadFrpc(log) {
   if (platform() === "win32") {
     throw new Error("Windows ZIP extraction not implemented \u2014 please install frpc manually");
   }
-  const tmpTar = join(BIN_DIR, `frpc-${FRP_VERSION}-${process.pid}-${Math.random().toString(36).slice(2, 8)}.tar.gz`);
+  const tmpTar = join(binDir(), `frpc-${FRP_VERSION}-${process.pid}-${Math.random().toString(36).slice(2, 8)}.tar.gz`);
   writeFileSync(tmpTar, buffer);
   try {
     const dirName = `frp_${FRP_VERSION}_${platform() === "darwin" ? "darwin" : "linux"}_${arch() === "x64" ? "amd64" : arch()}`;
     execSync(
-      `tar -xzf "${tmpTar}" -C "${BIN_DIR}" --strip-components=1 "${dirName}/frpc"`,
+      `tar -xzf "${tmpTar}" -C "${binDir()}" --strip-components=1 "${dirName}/frpc"`,
       { stdio: "pipe" }
     );
-    chmodSync(FRPC_BIN, 493);
-    logger(`frpc installed at ${FRPC_BIN}`);
+    chmodSync(frpcBin(), 493);
+    logger(`frpc installed at ${frpcBin()}`);
   } finally {
     try {
       unlinkSync(tmpTar);
     } catch {
     }
   }
-  return FRPC_BIN;
+  return frpcBin();
 }
 function tomlStr(v) {
   return String(v).replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n").replace(/\r/g, "\\r").replace(/\t/g, "\\t");
@@ -1799,7 +1804,7 @@ class FrpcTunnel {
         healthCheckInterval: options.healthCheckInterval
       };
     });
-    const configDir = join(homedir(), ".svamp", "frpc");
+    const configDir = join(svampHome(), "frpc");
     mkdirSync(configDir, { recursive: true, mode: 448 });
     try {
       chmodSync(configDir, 448);
@@ -2967,9 +2972,9 @@ const NON_ADMIN_SECRET_DIR_SEGMENTS = /* @__PURE__ */ new Set([
   ".azure",
   ".npmrc"
 ]);
-function assertNonAdminMountDirSafe(directory, homeDir) {
-  const resolved = path.resolve(directory);
-  const home = path.resolve(homeDir);
+function assertNonAdminMountDirSafe(directory, homeDir, resolveReal = defaultResolveReal) {
+  const resolved = resolveReal(path.resolve(directory));
+  const home = resolveReal(path.resolve(homeDir));
   if (resolved === home) {
     throw new Error("Access denied: shared users may not serve the home directory root (exposes all dotfiles)");
   }
@@ -2978,12 +2983,24 @@ function assertNonAdminMountDirSafe(directory, homeDir) {
   if (!insideHome) {
     throw new Error("Access denied: shared users may only serve directories within the home directory");
   }
-  for (const seg of resolved.split(path.sep)) {
-    if (NON_ADMIN_SECRET_DIR_SEGMENTS.has(seg)) {
-      throw new Error(`Access denied: refusing to serve a sensitive directory (${seg})`);
+  for (const seg of rel.split(path.sep)) {
+    if (seg.startsWith(".")) {
+      const known = NON_ADMIN_SECRET_DIR_SEGMENTS.has(seg);
+      throw new Error(known ? `Access denied: refusing to serve a sensitive directory (${seg})` : `Access denied: shared users may not serve a hidden directory (${seg}) \u2014 it may hold credentials`);
     }
   }
 }
+function defaultResolveReal(p) {
+  try {
+    return fs.realpathSync(p);
+  } catch {
+    return p;
+  }
+}
+function resolveMountOwnerEmail(suppliedOwnerEmail, callerEmail, machineOwnerEmail, callerIsTrusted, envOwnerEmail) {
+  const supplied = callerIsTrusted ? suppliedOwnerEmail : void 0;
+  return supplied || callerEmail || machineOwnerEmail || envOwnerEmail || void 0;
+}
 function sanitizeMountForRole(mount, isAdmin) {
   if (isAdmin) return mount;
   const { linkToken: _lt, directory: _dir, process: proc, url, ...rest } = mount;
@@ -3132,6 +3149,16 @@ class ServeManager {
   hyphaServerUrl;
   /** #126: daemon-provided lookup of sessionId → { cwd, sharing, ownerEmail } for the files gateway. */
   sessionResolver = null;
+  /**
+   * #0944/#0945: daemon-provided "this mount no longer backs that session's Launch Pad entry"
+   * hook. Fired with the OWNING session id, which is the only correct target — the CLI-side
+   * removeSessionLinkByService() defaults to the AMBIENT $SVAMP_SESSION_ID and resolves
+   * `.svamp/<id>/config.json` relative to its own CWD, so it silently no-ops when the teardown
+   * is run from a plain shell, from another session, or against a mount in another project dir.
+   * Living here means EVERY path — the serveRemove RPC, the CLI, the app's Launch Pad "Remove &
+   * stop", and a cross-session replace — drops the right link.
+   */
+  onMountUnbound = null;
   constructor(svampHome, logger, hyphaServerUrl) {
     this.persistFile = path.join(svampHome, "serve-mounts.json");
     this.managedPidDir = path.join(svampHome, "serve-managed");
@@ -3151,6 +3178,23 @@ class ServeManager {
   setSessionResolver(fn) {
     this.sessionResolver = fn;
   }
+  /**
+   * #0944/#0945: register the daemon's "drop this session's Launch Pad link for this mount"
+   * callback. Fired when a mount stops backing a session's Pad entry — on a real removal, and
+   * on a replace whose new owner is a DIFFERENT session. Best-effort by contract: the callback
+   * must never throw, because Launch Pad bookkeeping may not fail a teardown the user asked for.
+   */
+  setMountUnboundHook(fn) {
+    this.onMountUnbound = fn;
+  }
+  /** Fire the unbind hook, swallowing anything it throws (bookkeeping is never load-bearing). */
+  fireMountUnbound(sessionId, mountName) {
+    if (!sessionId || !this.onMountUnbound) return;
+    try {
+      this.onMountUnbound(sessionId, mountName);
+    } catch {
+    }
+  }
   /**
    * #126: bring up the always-on, per-machine session-files gateway. Idempotent. `stableToken`
    * must be a stable per-machine hex/alnum string (DNS-label-safe) so the gateway's subdomain is
@@ -3235,9 +3279,14 @@ class ServeManager {
     if (resolvedDir && !fs.existsSync(resolvedDir)) {
       throw new Error(`Path does not exist: ${resolvedDir}`);
     }
-    if (this.mounts.has(spec.name)) {
+    const replaced = this.mounts.get(spec.name);
+    if (replaced) {
       await this.removeMount(spec.name, { replacing: true });
     }
+    if (replaced?.sessionId && replaced.sessionId !== spec.sessionId) {
+      this.log(`Mount '${spec.name}': taken over by session ${spec.sessionId || "(none)"} from ${replaced.sessionId} \u2014 the previous owner's Launch Pad link is being dropped (its URL no longer resolves).`);
+      this.fireMountUnbound(replaced.sessionId, spec.name);
+    }
     const access = spec.access ?? "link";
     if (access === "owner" && !spec.ownerEmail) {
       this.log(`\u26A0 Mount '${spec.name}': access='owner' but no owner email could be resolved \u2014 NO ONE will be able to sign in. Use an explicit email allowlist instead, e.g. access: ["you@example.com"].`);
@@ -3276,10 +3325,12 @@ class ServeManager {
    * Remove a mount. If no mounts remain, stop Caddy + auth proxy.
    */
   async removeMount(name, opts) {
-    if (!this.mounts.has(name)) {
+    const removed = this.mounts.get(name);
+    if (!removed) {
       throw new Error(`Mount '${name}' not found`);
     }
     this.mounts.delete(name);
+    if (!opts?.replacing) this.fireMountUnbound(removed.sessionId, name);
     await this.stopManagedProcess(name).catch(() => {
     });
     const tunnel = this.mountTunnels.get(name);
@@ -4264,6 +4315,10 @@ Connection: close\r
   async startMountTunnel(mountName) {
     if (this.mountTunnels.has(mountName)) return;
     if (!this.port) throw new Error("Auth proxy not running \u2014 call ensureRunning() first");
+    if (process.env.SVAMP_SERVE_NO_TUNNEL === "1") {
+      this.log(`Mount '${mountName}': tunnel skipped (SVAMP_SERVE_NO_TUNNEL=1) \u2014 local only at http://127.0.0.1:${this.port}/${mountName}/`);
+      return;
+    }
     const subdomainSafe = mountName.toLowerCase().replace(/[^a-z0-9-]/g, "-");
     const tunnelName = `static-${subdomainSafe}`;
     const mount = this.mounts.get(mountName);
@@ -4319,6 +4374,7 @@ var serveManager = /*#__PURE__*/Object.freeze({
     ServeManager: ServeManager,
     assertNonAdminMountDirSafe: assertNonAdminMountDirSafe,
     buildLinkSubdomain: buildLinkSubdomain,
+    resolveMountOwnerEmail: resolveMountOwnerEmail,
     sanitizeMountForRole: sanitizeMountForRole
 });
 
@@ -4469,6 +4525,10 @@ function setClaudeAuthCustom(baseUrl, apiKey) {
     ANTHROPIC_API_KEY: apiKey
   });
 }
+function applyPromptCacheTtl(spawnEnv) {
+  const cacheOverride = spawnEnv.ENABLE_PROMPT_CACHING_1H ?? process.env.ENABLE_PROMPT_CACHING_1H ?? spawnEnv.FORCE_PROMPT_CACHING_5M ?? process.env.FORCE_PROMPT_CACHING_5M;
+  if (cacheOverride === void 0) spawnEnv.ENABLE_PROMPT_CACHING_1H = "1";
+}
 function applyClaudeProxyEnv(spawnEnv) {
   const mode = currentMode();
   if (mode === "hypha") {
@@ -4486,8 +4546,7 @@ function applyClaudeProxyEnv(spawnEnv) {
     }
     spawnEnv.ANTHROPIC_BASE_URL = proxyUrl;
     spawnEnv.ANTHROPIC_API_KEY = token;
-    const cacheOverride = spawnEnv.ENABLE_PROMPT_CACHING_1H ?? process.env.ENABLE_PROMPT_CACHING_1H ?? spawnEnv.FORCE_PROMPT_CACHING_5M ?? process.env.FORCE_PROMPT_CACHING_5M;
-    if (cacheOverride === void 0) spawnEnv.ENABLE_PROMPT_CACHING_1H = "1";
+    applyPromptCacheTtl(spawnEnv);
     return `hypha proxy (${proxyUrl}, 1h cache TTL)`;
   }
   if (mode === "custom") {
@@ -4500,7 +4559,8 @@ function applyClaudeProxyEnv(spawnEnv) {
     }
     spawnEnv.ANTHROPIC_BASE_URL = url;
     spawnEnv.ANTHROPIC_API_KEY = key;
-    return `custom proxy (${url})`;
+    applyPromptCacheTtl(spawnEnv);
+    return `custom proxy (${url}, 1h cache TTL)`;
   }
   delete spawnEnv.ANTHROPIC_BASE_URL;
   delete spawnEnv.ANTHROPIC_API_KEY;
@@ -6360,6 +6420,13 @@ async function registerMachineService(server, machineId, metadata, daemonState,
   } catch {
   }
   const serveCallerTrusted = (context) => !context?.user || isSameOwnerWorkspace(context) || roleAtLeast(getEffectiveRole(context, currentMetadata.sharing), "admin");
+  const resolveMountOwnerEmailFor = (supplied, context) => resolveMountOwnerEmail(
+    supplied,
+    context?.user?.email,
+    currentMetadata.sharing?.owner,
+    serveCallerTrusted(context),
+    process.env.SVAMP_OWNER_EMAIL
+  );
   let lastInboundRpcAt = Date.now();
   const trackInbound = () => {
     lastInboundRpcAt = Date.now();
@@ -7526,7 +7593,10 @@ async function registerMachineService(server, machineId, metadata, daemonState,
           const { homedir } = await import('os');
           assertNonAdminMountDirSafe(params.directory, homedir());
         }
-        const ownerEmail2 = params.ownerEmail || context?.user?.email || currentMetadata.sharing?.owner || process.env.SVAMP_OWNER_EMAIL || void 0;
+        if (params.sessionId && !serveCallerTrusted(context)) {
+          await authorizeSessionAccess(params.sessionId, "admin", context);
+        }
+        const ownerEmail2 = resolveMountOwnerEmailFor(params.ownerEmail, context);
         const access = params.access || "owner";
         return sm.addMount(params.name, params.directory, params.sessionId, access, ownerEmail2);
       },
@@ -7543,6 +7613,9 @@ async function registerMachineService(server, machineId, metadata, daemonState,
           const { homedir } = await import('os');
           assertNonAdminMountDirSafe(params.directory, homedir());
         }
+        if (params.sessionId && !serveCallerTrusted(context)) {
+          await authorizeSessionAccess(params.sessionId, "admin", context);
+        }
         const existingMount = sm.getMount(params.name);
         if (existingMount && !serveCallerTrusted(context)) {
           const callerEmail = (context?.user?.email || "").toLowerCase();
@@ -7551,7 +7624,7 @@ async function registerMachineService(server, machineId, metadata, daemonState,
             throw new Error(`Not authorized to replace mount '${params.name}' (owned by another user)`);
           }
         }
-        const ownerEmail2 = params.ownerEmail || context?.user?.email || currentMetadata.sharing?.owner || process.env.SVAMP_OWNER_EMAIL || void 0;
+        const ownerEmail2 = resolveMountOwnerEmailFor(params.ownerEmail, context);
         const access = params.access ?? "owner";
         return sm.applyMount({
           name: params.name,
@@ -7921,7 +7994,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-C1db5sMF.mjs');
+          const { toolsForRole } = await import('./sideband-D1dsa-t0.mjs');
           const r2 = await runWiseAgent({ message: params.message, sender, config: { tools: toolsForRole(role2) }, deps, transport, model: resolved.model });
           return fmt(r2);
         }
@@ -8026,7 +8099,7 @@ QUESTION: ${params.question || "Summarize this concisely."}` }
       return { ok: false, call_id: callId, status: "busy", error: "channel is busy (too many concurrent requests) \u2014 retry shortly" };
     }
     const rendered = renderMessage(c, { sender: r.sender, body: { message: kwargs.message }, callId });
-    const { queryCore } = await import('./commands-BY1lmXaM.mjs');
+    const { queryCore } = await import('./commands-CubsoWG-.mjs');
     const timeout = c.reply?.timeout_sec || 120;
     let result;
     try {
@@ -8238,6 +8311,9 @@ ${d?.error || "not found"}`;
       });
     },
     getLastInboundRpcAt: () => lastInboundRpcAt,
+    resetInboundClock: () => {
+      lastInboundRpcAt = Date.now();
+    },
     getCurrentMetadata: () => currentMetadata,
     setHandlers: (newHandlers) => {
       handlers = newHandlers;
@@ -16370,8 +16446,12 @@ function isVisibleTo(issue, session) {
   if (!issue.owner && !issue.session) return true;
   return false;
 }
+function normalizeIssueRef(id) {
+  const s = String(id ?? "").trim().replace(/^#+/, "");
+  return /^\d+$/.test(s) ? s.padStart(4, "0") : s;
+}
 function getIssue(projectRoot, id) {
-  const padded = /^\d+$/.test(id) ? id.padStart(4, "0") : id;
+  const padded = normalizeIssueRef(id);
   let best = null;
   for (const p of [issuePath(projectRoot, padded), issuePath(projectRoot, padded, true)]) {
     if (!existsSync(p)) continue;
@@ -16383,7 +16463,14 @@ function getIssue(projectRoot, id) {
     } catch {
     }
   }
-  return best ? best.issue : null;
+  if (best) return best.issue;
+  try {
+    for (const issue of listIssues(projectRoot, { includeArchived: true })) {
+      if (normalizeIssueRef(issue.id) === padded) return issue;
+    }
+  } catch {
+  }
+  return null;
 }
 function atomicWrite(path, content) {
   mkdirSync$1(dirname(path), { recursive: true });
@@ -16432,8 +16519,7 @@ function addIssue(projectRoot, fields) {
   throw new Error("addIssue: could not allocate a free issue id");
 }
 function issueLockPath(projectRoot, id) {
-  const padded = /^\d+$/.test(id) ? id.padStart(4, "0") : id;
-  return join$1(issuesDir(projectRoot), `${padded}.lock`);
+  return join$1(issuesDir(projectRoot), `${normalizeIssueRef(id)}.lock`);
 }
 function withIssueLock(projectRoot, id, fn) {
   try {
@@ -16446,16 +16532,20 @@ function _updateIssueUnlocked(projectRoot, id, patch) {
   const cur = getIssue(projectRoot, id);
   if (!cur) return null;
   const wasArchived = cur.status === "archived";
-  const next = { ...cur, ...patch, id: cur.id };
+  const canonicalId = normalizeIssueRef(cur.id);
+  const next = { ...cur, ...patch, id: canonicalId };
   if (patch.status) next.status = normalizeStatus(patch.status);
   const nowArchived = next.status === "archived";
   if (nowArchived && !next.closed) next.closed = (/* @__PURE__ */ new Date()).toISOString();
   if (!nowArchived) next.closed = null;
   atomicWrite(issuePath(projectRoot, next.id, nowArchived), serializeIssue(next));
-  if (wasArchived !== nowArchived) {
-    const oldPath = issuePath(projectRoot, cur.id, wasArchived);
+  for (const stale of [
+    issuePath(projectRoot, cur.id, wasArchived),
+    issuePath(projectRoot, cur.id, nowArchived)
+  ]) {
+    if (stale === issuePath(projectRoot, next.id, nowArchived)) continue;
     try {
-      if (existsSync(oldPath)) unlinkSync$1(oldPath);
+      if (existsSync(stale)) unlinkSync$1(stale);
     } catch {
     }
   }
@@ -17439,6 +17529,19 @@ function parseEvaluatorVerdict(text) {
   }
   return null;
 }
+function buildStaleSafeOracleGuidance(oracleOutput, now = /* @__PURE__ */ new Date()) {
+  const reading = (oracleOutput || "").trim().slice(0, 500);
+  return [
+    `The loop oracle reported unfinished work as of ${now.toISOString()}:`,
+    reading || "(no detail)",
+    "",
+    "That is a POINT-IN-TIME reading, not a fact about right now \u2014 the backlog may have changed",
+    "since (an item can be closed or paused out-of-band while this message was queued). RE-RUN",
+    "the oracle yourself and treat ITS CURRENT OUTPUT as the truth. If it is now empty, the goal",
+    "is complete: say so rather than chasing the items listed above. Otherwise keep working until",
+    "it is genuinely empty."
+  ].join("\n");
+}
 async function runLoopVerification(cfg, deps) {
   const log = deps.log || (() => {
   });
@@ -17453,9 +17556,11 @@ async function runLoopVerification(cfg, deps) {
         return { action: "gave_up", reason: `oracle still reports pending work after ${holds} verification hold(s): ${oracleOutput.trim().slice(0, 200)}` };
       }
       log(`[loopVerify] oracle reports pending work \u2014 re-kicking instead of marking done`);
-      return { action: "rekick", reason: "oracle reports pending work", guidance: `The loop oracle still reports unfinished work, so the goal is NOT complete:
-${oracleOutput.trim().slice(0, 500)}
-Keep working until it is genuinely empty.` };
+      return {
+        action: "rekick",
+        reason: "oracle reports pending work",
+        guidance: buildStaleSafeOracleGuidance(oracleOutput)
+      };
     }
   } catch (e) {
     log(`[loopVerify] oracle runner error (continuing to evaluator): ${e?.message || e}`);
@@ -17684,6 +17789,16 @@ function compactUnsupportedWarning(version) {
   return `\u26A0\uFE0F /compact did not run${v} \u2014 Claude Code forwarded it as a normal message, so nothing was compacted. In-session /compact needs a newer Claude Code (>= 2.1.205). Ask the machine owner to upgrade (e.g. \`svamp fleet upgrade-claude\`), then try again.`;
 }
 
+function shouldRunZombieProbe(args) {
+  return args.hasActiveSessions && !args.inGrace && args.consecutiveHeartbeatFailures === 0 && args.inboundSilenceMs > args.thresholdMs;
+}
+function nextFailuresAfterZombieProbeFailure(consecutiveHeartbeatFailures) {
+  return consecutiveHeartbeatFailures + 1;
+}
+function shouldForceReconnect(consecutiveHeartbeatFailures) {
+  return consecutiveHeartbeatFailures === 2 || consecutiveHeartbeatFailures % 3 === 0;
+}
+
 const SVAMP_HOME$1 = process.env.SVAMP_HOME || join$1(os.homedir(), ".svamp");
 function generateHookSettings(portOrOptions = {}) {
   const opts = typeof portOrOptions === "number" ? { sessionStartPort: portOrOptions } : portOrOptions;
@@ -18555,9 +18670,11 @@ function atomicWriteLoopState(path, obj) {
   writeFileSync(tmp, JSON.stringify(obj, null, 2));
   renameSync$1(tmp, path);
 }
-function safeBacklogPendingCount(projectRoot, sessionId) {
+function safeBacklogPendingCount(directory, selfSessionId, oracle) {
   try {
-    return backlogOraclePending(projectRoot, sessionId).length;
+    const root = resolveProjectRoot(directory);
+    const scope = oracleScopeSessionId(typeof oracle === "string" ? oracle : void 0, selfSessionId);
+    return backlogOraclePending(root, scope).length;
   } catch {
     return 0;
   }
@@ -19510,7 +19627,7 @@ async function startDaemon(options) {
     try {
       const dir = loadSessionIndex()[sessionId]?.directory;
       if (!dir) return;
-      const { reconcileServiceLinks } = await import('./agentCommands-BJeGwkeX.mjs');
+      const { reconcileServiceLinks } = await import('./agentCommands-CoCcX8K1.mjs');
       const configPath = getSvampConfigPath(dir, sessionId);
       const config = readSvampConfig(configPath);
       const entries = Array.from(urls.entries());
@@ -19532,7 +19649,7 @@ async function startDaemon(options) {
     try {
       const dir = loadSessionIndex()[sessionId]?.directory;
       if (!dir) return;
-      const { reconcileServiceLinks } = await import('./agentCommands-BJeGwkeX.mjs');
+      const { reconcileServiceLinks } = await import('./agentCommands-CoCcX8K1.mjs');
       const configPath = getSvampConfigPath(dir, sessionId);
       const config = readSvampConfig(configPath);
       const incoming = [{
@@ -19548,6 +19665,22 @@ async function startDaemon(options) {
       logger.log(`[serve] Link reconcile failed for mount ${mountName}: ${err?.message || err}`);
     }
   }
+  async function dropMountSessionLink(sessionId, mountName) {
+    if (!sessionId) return;
+    try {
+      const dir = loadSessionIndex()[sessionId]?.directory;
+      if (!dir) return;
+      const { dropServiceLinks } = await import('./agentCommands-CoCcX8K1.mjs');
+      const configPath = getSvampConfigPath(dir, sessionId);
+      const config = readSvampConfig(configPath);
+      if (dropServiceLinks(config, "serve", mountName)) {
+        writeSvampConfig(configPath, config);
+        logger.log(`[serve] Dropped Launch Pad link for mount ${mountName} \u2190 session ${sessionId}`);
+      }
+    } catch (err) {
+      logger.log(`[serve] Link drop failed for mount ${mountName}: ${err?.message || err}`);
+    }
+  }
   async function createExposedTunnel(spec) {
     const { FrpcTunnel } = await Promise.resolve().then(function () { return frpc; });
     const tunnel = new FrpcTunnel({
@@ -19572,12 +19705,15 @@ async function startDaemon(options) {
   const tunnelRecreateInFlight = /* @__PURE__ */ new Set();
   const { ServeManager } = await Promise.resolve().then(function () { return serveManager; });
   const serveManager$1 = new ServeManager(SVAMP_HOME, (msg) => logger.log(`[SERVE] ${msg}`), hyphaServerUrl);
+  serveManager$1.setMountUnboundHook((sessionId, mountName) => {
+    void dropMountSessionLink(sessionId, mountName);
+  });
   ensureAutoInstalledSkills(logger).catch(() => {
   });
   ensureAutoInstalledCommands(logger);
   (async () => {
     try {
-      const { beginClaudeVersionReconcile } = await import('./pinnedClaudeCode-dbXgsGNK.mjs');
+      const { beginClaudeVersionReconcile } = await import('./pinnedClaudeCode-BkZfX5pW.mjs');
       beginClaudeVersionReconcile((msg) => logger.log(msg));
     } catch (e) {
       logger.log(`[claude-version] check failed: ${e?.message || e}`);
@@ -19690,10 +19826,14 @@ ${v.guidance ? v.guidance + "\n" : ""}Criteria: ${v.criteria || "(none)"}
       }
     };
     server.on("services_registered", () => {
+      lastReconnectAt = Date.now();
+      try {
+        machineService.resetInboundClock?.();
+      } catch {
+      }
       if (consecutiveHeartbeatFailures > 0) {
         logger.log(`Hypha reconnection successful \u2014 services re-registered (resetting ${consecutiveHeartbeatFailures} failures)`);
         consecutiveHeartbeatFailures = 0;
-        lastReconnectAt = Date.now();
       }
       const reEmitLiveness = (phase) => {
         try {
@@ -20259,26 +20399,33 @@ ${parts.join("\n")}`);
           const oracleCmd = typeof ls.oracle === "string" && ls.oracle.trim() ? ls.oracle.trim() : void 0;
           try {
             sessionService.pushMessage({ type: "message", message: "\u{1F50D} Verifying loop completion (independent review)\u2026" }, "event");
-            const result = await runLoopVerification(
-              { task: ls.goal_task || ls.task, until: ls.until, oracle: oracleCmd, startedAt, sessionId, holds, maxHolds: 3 },
-              {
-                projectRoot,
-                runOracle: async (cmd) => {
-                  if (cmd) {
-                    return await new Promise((resolve2) => {
-                      exec$1(cmd, { cwd: directory, timeout: 12e4, maxBuffer: 16 * 1024 * 1024 }, (err, stdout, stderr) => {
-                        if (err) resolve2({ ok: false, output: (String(stdout || "") + String(stderr || "")).slice(-500) });
-                        else resolve2({ ok: true, output: "" });
-                      });
-                    });
-                  }
-                  const pending = backlogOraclePending(projectRoot, sessionId);
-                  return { ok: pending.length === 0, output: pending.length ? `${pending.length} pending: ${pending.map((i) => "#" + i.id).join(" ")}` : "No pending issues." };
-                },
-                runEvaluator: (prompt) => runHeadlessEvaluator(prompt),
-                log: (m) => logger.log(`[Session ${sessionId}] ${m}`)
+            const runOracle = async (cmd) => {
+              if (cmd) {
+                return await new Promise((resolve2) => {
+                  exec$1(cmd, { cwd: directory, timeout: 12e4, maxBuffer: 16 * 1024 * 1024 }, (err, stdout, stderr) => {
+                    if (err) resolve2({ ok: false, output: (String(stdout || "") + String(stderr || "")).slice(-500) });
+                    else resolve2({ ok: true, output: "" });
+                  });
+                });
               }
-            );
+              const pending = backlogOraclePending(projectRoot, sessionId);
+              return { ok: pending.length === 0, output: pending.length ? `${pending.length} pending: ${pending.map((i) => "#" + i.id).join(" ")}` : "No pending issues." };
+            };
+            const verifyDeps = {
+              projectRoot,
+              runOracle,
+              runEvaluator: (prompt) => runHeadlessEvaluator(prompt),
+              log: (m) => logger.log(`[Session ${sessionId}] ${m}`)
+            };
+            const verifyCfg = { task: ls.goal_task || ls.task, until: ls.until, oracle: oracleCmd, startedAt, sessionId, holds, maxHolds: 3 };
+            let result = await runLoopVerification(verifyCfg, verifyDeps);
+            if (result.action === "rekick" && result.reason === "oracle reports pending work") {
+              const fresh = await runOracle(oracleCmd);
+              if (fresh.ok) {
+                logger.log(`[Session ${sessionId}] [#0194] oracle went CLEAN during verification \u2014 re-running the gate instead of re-kicking on the stale reading`);
+                result = await runLoopVerification(verifyCfg, { ...verifyDeps, runOracle: async () => fresh });
+              }
+            }
             if (loopCancelledDuringVerify(readLoopState(directory, sessionId))) {
               logger.log(`[Session ${sessionId}] loop was cancelled during verification \u2014 not re-kicking (#0308)`);
               return;
@@ -20958,7 +21105,7 @@ ${parts.join("\n")}`);
                         const maxExt = resolveMaxExtensions(process.env.SVAMP_LOOP_MAX_EXTENSIONS);
                         const effMaxIters = effectiveSoftCap(ls.max_iterations, ls.extensions, maxExt);
                         const budgetCheck = process.env.SVAMP_LOOP_BUDGET === "0" ? { exceeded: false, kind: void 0 } : checkLoopBudget(ledger, { max_iterations: effMaxIters, ...ls.budget || {} }, now, startedAt);
-                        const pending = safeBacklogPendingCount(resolveProjectRoot(directory), sessionId);
+                        const pending = safeBacklogPendingCount(directory, sessionId, ls.oracle);
                         const prog = updateLoopProgress(ls, pending, now);
                         ls.progress_history = prog.progress_history;
                         ls.auto_resumes = prog.auto_resumes;
@@ -21894,11 +22041,11 @@ ${capturedError}${buildClaudeErrorHint(capturedError)}`;
               });
             },
             onIssue: async (params) => {
-              const { issueRpc } = await import('./rpc-TXF-di9u.mjs');
+              const { issueRpc } = await import('./rpc-DVtlZahE.mjs');
               return issueRpc(params?.cwd || directory, params || {}, { notifySession: notifyIssueOwner, rekickLoopOwner });
             },
             onWorkflow: async (params) => {
-              const { workflowRpc } = await import('./rpc-FGp88Yxp.mjs');
+              const { workflowRpc } = await import('./rpc-rpH-yXR7.mjs');
               return workflowRpc(params?.cwd || directory, params || {});
             },
             onRipgrep: async (args, cwd) => {
@@ -22605,11 +22752,11 @@ ${capturedError}${buildClaudeErrorHint(capturedError)}`;
               });
             },
             onIssue: async (params) => {
-              const { issueRpc } = await import('./rpc-TXF-di9u.mjs');
+              const { issueRpc } = await import('./rpc-DVtlZahE.mjs');
               return issueRpc(params?.cwd || directory, params || {}, { notifySession: notifyIssueOwner, rekickLoopOwner });
             },
             onWorkflow: async (params) => {
-              const { workflowRpc } = await import('./rpc-FGp88Yxp.mjs');
+              const { workflowRpc } = await import('./rpc-rpH-yXR7.mjs');
               return workflowRpc(params?.cwd || directory, params || {});
             },
             onRipgrep: async (args, cwd) => {
@@ -22958,7 +23105,7 @@ ${capturedError}${buildClaudeErrorHint(capturedError)}`;
             const acpMaxExt = resolveMaxExtensions(process.env.SVAMP_LOOP_MAX_EXTENSIONS);
             const acpEffMax = effectiveSoftCap(ls.max_iterations, ls.extensions, acpMaxExt);
             const budgetCheck = process.env.SVAMP_LOOP_BUDGET === "0" ? { exceeded: false, kind: void 0 } : checkLoopBudget(ledger, { max_iterations: acpEffMax, ...ls.budget || {} }, now, startedAt);
-            const acpPending = safeBacklogPendingCount(projectRoot, sessionId);
+            const acpPending = safeBacklogPendingCount(projectRoot, sessionId, ls.oracle);
             const acpProg = updateLoopProgress(ls, acpPending, now);
             ls.progress_history = acpProg.progress_history;
             ls.auto_resumes = acpProg.auto_resumes;
@@ -23660,7 +23807,7 @@ ${oracle.output.trim().slice(0, 500)}`, "\u{1F501} Continuing loop");
     }
     if (persistedSessions.length > 0) {
       try {
-        const { awaitClaudeVersionReady } = await import('./pinnedClaudeCode-dbXgsGNK.mjs');
+        const { awaitClaudeVersionReady } = await import('./pinnedClaudeCode-BkZfX5pW.mjs');
         await awaitClaudeVersionReady();
       } catch {
       }
@@ -23700,7 +23847,11 @@ ${oracle.output.trim().slice(0, 500)}`, "\u{1F501} Continuing loop");
               isOrphaned: !!isOrphaned,
               loopActive: isLoopActiveForSession(persisted.directory, persisted.sessionId),
               loopArmed: _loopArmed,
-              armedHasPendingWork: _loopArmed ? safeBacklogPendingCount(persisted.directory, persisted.sessionId) > 0 : false
+              armedHasPendingWork: _loopArmed ? safeBacklogPendingCount(
+                persisted.directory,
+                persisted.sessionId,
+                readLoopState(persisted.directory, persisted.sessionId)?.oracle
+              ) > 0 : false
             });
             if (_loopArmed) {
               logger.log(`[loop] Restored DORMANT loop for ${persisted.sessionId} \u2192 ${_restoreAction === "loop-resume" ? "re-arming (pending work found)" : "staying dormant/watching (backlog empty)"}`);
@@ -23905,7 +24056,7 @@ ${oracle.output.trim().slice(0, 500)}`, "\u{1F501} Continuing loop");
     const PING_TIMEOUT_MS = 15e3;
     const POST_RECONNECT_GRACE_MS = 2e4;
     const RECONNECT_JITTER_MS = 2500;
-    const { WorkflowScheduler } = await import('./scheduler-b-ysyKIj.mjs');
+    const { WorkflowScheduler } = await import('./scheduler-CYyGe6kn.mjs');
     const workflowProjectRoots = () => {
       const dirs = /* @__PURE__ */ new Set();
       for (const s of pidToTrackedSession.values()) {
@@ -23981,10 +24132,11 @@ ${oracle.output.trim().slice(0, 500)}`, "\u{1F501} Continuing loop");
             }
           }
         }
+        const inGrace = lastReconnectAt > 0 && Date.now() - lastReconnectAt < POST_RECONNECT_GRACE_MS;
         const INBOUND_SILENCE_THRESHOLD_MS = 12e4;
         const inboundSilenceMs = Date.now() - machineService.getLastInboundRpcAt();
         const hasActiveSessions = pidToTrackedSession.size > 0;
-        if (hasActiveSessions && inboundSilenceMs > INBOUND_SILENCE_THRESHOLD_MS && consecutiveHeartbeatFailures === 0) {
+        if (shouldRunZombieProbe({ hasActiveSessions, inboundSilenceMs, consecutiveHeartbeatFailures, inGrace, thresholdMs: INBOUND_SILENCE_THRESHOLD_MS })) {
           logger.log(`No inbound RPC for ${Math.round(inboundSilenceMs / 1e3)}s with ${pidToTrackedSession.size} active session(s) \u2014 zombie probe`);
           try {
             const machineServiceId = `${server.config.client_id}:default`;
@@ -23993,11 +24145,10 @@ ${oracle.output.trim().slice(0, 500)}`, "\u{1F501} Continuing loop");
               new Promise((_, reject) => setTimeout(() => reject(new Error("Zombie probe timed out")), PING_TIMEOUT_MS))
             ]);
           } catch (err) {
-            logger.log(`Zombie detection probe failed: ${err.message} \u2014 forcing reconnection`);
-            consecutiveHeartbeatFailures = 2;
+            logger.log(`Zombie detection probe failed: ${err.message} \u2014 raising suspicion (two-strike)`);
+            consecutiveHeartbeatFailures = nextFailuresAfterZombieProbeFailure(consecutiveHeartbeatFailures);
           }
         }
-        const inGrace = lastReconnectAt > 0 && Date.now() - lastReconnectAt < POST_RECONNECT_GRACE_MS;
         if (!inGrace) {
           try {
             const pingStart = Date.now();
@@ -24022,7 +24173,7 @@ ${oracle.output.trim().slice(0, 500)}`, "\u{1F501} Continuing loop");
             } else if (consecutiveHeartbeatFailures % 6 === 0) {
               logger.log(`Connection down for ${consecutiveHeartbeatFailures * HEARTBEAT_INTERVAL_MS / 1e3}s (${consecutiveHeartbeatFailures} failures, retrying indefinitely)`);
             }
-            if (consecutiveHeartbeatFailures === 2 || consecutiveHeartbeatFailures % 3 === 0) {
+            if (shouldForceReconnect(consecutiveHeartbeatFailures)) {
               const jitterMs = Math.floor(Math.random() * RECONNECT_JITTER_MS);
               if (jitterMs > 0) await new Promise((r) => setTimeout(r, jitterMs));
               const conn = server.rpc?._connection;
@@ -24539,4 +24690,4 @@ var run = /*#__PURE__*/Object.freeze({
     writeStopMarker: writeStopMarker
 });
 
-export { listSkillFiles as $, saveWorkflow as A, rawWorkflow as B, listWorkflows as C, isWorkflowEnabled as D, workflowSchedules as E, inZone as F, cronMatches as G, summarize as H, workflowSteps as I, parseJwtEmail as J, computeCollectionConfigUpdate as K, SYSTEM_COLLECTION_CONFIG as L, loadMachineContext as M, buildMachineInstructions as N, machineToolsForRole as O, buildMachineTools as P, parseFrontmatter as Q, READ_ONLY_TOOLS as R, SharingNotificationSync as S, getSkillsServer as T, getSkillsWorkspaceName as U, getSkillsCollectionName as V, fetchWithTimeout as W, searchSkills as X, SKILLS_DIR as Y, getSkillInfo as Z, downloadSkillFile as _, createSessionStore as a, resolveModel as a0, clearStopMarker as a1, stopMarkerExists as a2, formatHandle as a3, normalizeAllowedUser as a4, loadSecurityContextConfig as a5, resolveSecurityContext as a6, buildSecurityContextFromFlags as a7, mergeSecurityContexts as a8, buildSessionShareUrl as a9, kimiSetup as aA, api as aB, run as aC, computeOutboundHop as aa, registerAwaitingReply as ab, buildMachineShareUrl as ac, parseHandle as ad, handleMatchesMetadata as ae, PINNED_CODEX_VERSION as af, withFileLock as ag, describeMisconfiguration as ah, buildMachineDeps as ai, applyClaudeProxyEnv as aj, composeSessionId as ak, generateFriendlyName as al, generateHookSettings as am, instanceConfig as an, frpc as ao, staticFileServer as ap, claudeAuth as aq, codexProvider as ar, projectInfo as as, DefaultTransport$1 as at, acpBackend as au, acpAgentConfig as av, codexAppServerBackend as aw, GeminiTransport$1 as ax, KimiTransport$1 as ay, kimiProvider as az, stopDaemon as b, connectToHypha as c, daemonStatus as d, shortId as e, resolveProjectRoot as f, getHyphaServerUrl$1 as g, getIssue as h, resumeIssue as i, addComment as j, addIssue as k, listIssues as l, isPendingIssue as m, searchIssues as n, isVisibleTo as o, pauseIssue as p, getRun as q, registerMachineService as r, startDaemon as s, listRuns as t, updateIssue as u, getWorkflow as v, runWorkflow as w, setWorkflowEnabled as x, removeWorkflow as y, validateWorkflowName as z };
+export { listSkillFiles as $, saveWorkflow as A, rawWorkflow as B, listWorkflows as C, isWorkflowEnabled as D, workflowSchedules as E, inZone as F, cronMatches as G, summarize as H, workflowSteps as I, parseJwtEmail as J, computeCollectionConfigUpdate as K, SYSTEM_COLLECTION_CONFIG as L, loadMachineContext as M, buildMachineInstructions as N, machineToolsForRole as O, buildMachineTools as P, parseFrontmatter as Q, READ_ONLY_TOOLS as R, SharingNotificationSync as S, getSkillsServer as T, getSkillsWorkspaceName as U, getSkillsCollectionName as V, fetchWithTimeout as W, searchSkills as X, SKILLS_DIR as Y, getSkillInfo as Z, downloadSkillFile as _, createSessionStore as a, resolveModel as a0, formatHandle as a1, normalizeAllowedUser as a2, loadSecurityContextConfig as a3, resolveSecurityContext as a4, buildSecurityContextFromFlags as a5, mergeSecurityContexts as a6, buildSessionShareUrl as a7, computeOutboundHop as a8, registerAwaitingReply as a9, kimiSetup as aA, api as aB, run as aC, buildMachineShareUrl as aa, parseHandle as ab, handleMatchesMetadata as ac, PINNED_CODEX_VERSION as ad, clearStopMarker as ae, stopMarkerExists as af, withFileLock as ag, describeMisconfiguration as ah, buildMachineDeps as ai, applyClaudeProxyEnv as aj, composeSessionId as ak, generateFriendlyName as al, generateHookSettings as am, instanceConfig as an, frpc as ao, staticFileServer as ap, claudeAuth as aq, codexProvider as ar, projectInfo as as, DefaultTransport$1 as at, acpBackend as au, acpAgentConfig as av, codexAppServerBackend as aw, GeminiTransport$1 as ax, KimiTransport$1 as ay, kimiProvider as az, stopDaemon as b, connectToHypha as c, daemonStatus as d, shortId as e, resolveProjectRoot as f, getHyphaServerUrl$1 as g, getIssue as h, resumeIssue as i, addComment as j, addIssue as k, listIssues as l, isPendingIssue as m, searchIssues as n, isVisibleTo as o, pauseIssue as p, getRun as q, registerMachineService as r, startDaemon as s, listRuns as t, updateIssue as u, getWorkflow as v, runWorkflow as w, setWorkflowEnabled as x, removeWorkflow as y, validateWorkflowName as z };