svamp-cli 0.2.323 → 0.2.325

package/dist/{run-BiwqH1hw.mjs → run-CO4F7ZaJ.mjs}

@@ -9,7 +9,7 @@ import { execFile, execSync, spawn, exec as exec$1 } from 'child_process';
 import * as crypto from 'crypto';
 import { randomUUID, createHash } from 'crypto';
 import { randomUUID as randomUUID$1, randomBytes, createHash as createHash$1, timingSafeEqual } from 'node:crypto';
-import { existsSync, readFileSync, mkdirSync as mkdirSync$1, writeFileSync as writeFileSync$1, chmodSync as chmodSync$1, rmSync as rmSync$1, cpSync, statSync, realpathSync, readdirSync, renameSync, appendFileSync, openSync, readSync, closeSync, unlinkSync as unlinkSync$1 } from 'node:fs';
+import { existsSync, readFileSync, mkdirSync as mkdirSync$1, writeFileSync as writeFileSync$1, chmodSync as chmodSync$1, rmSync as rmSync$1, cpSync, statSync, realpathSync, readdirSync, renameSync, appendFileSync, openSync, readSync, closeSync, unlinkSync as unlinkSync$1, writeSync } from 'node:fs';
 import { exec, spawn as spawn$1, execSync as execSync$1, execFile as execFile$1, execFileSync } from 'node:child_process';
 import { promisify } from 'util';
 import * as http from 'http';
@@ -3793,16 +3793,26 @@ a{color:#0969da;text-decoration:none;font-weight:500}a:hover{text-decoration:und
     const ownerEmail = (target.ownerEmail || "").toLowerCase();
     const isOwner = !!ownerEmail && userEmail.toLowerCase() === ownerEmail;
     if (!isOwner) {
+      const principal = { user: { email: userEmail } };
+      let granted = false;
       const sharing = target.sharing;
-      if (!sharing || !sharing.enabled) {
-        this.log(`Files-gateway DENY '${sessionId}': ${userEmail} not owner and session not shared`);
-        deny(403, "Access denied");
-        return;
+      if (sharing && sharing.enabled) {
+        try {
+          authorizeRequest(principal, sharing, "admin");
+          granted = true;
+        } catch {
+        }
       }
-      try {
-        authorizeRequest({ user: { email: userEmail } }, sharing, "admin");
-      } catch (err) {
-        this.log(`Files-gateway DENY '${sessionId}': ${userEmail} \u2014 ${err?.message || "not admin"}`);
+      const machineSharing = target.machineSharing;
+      if (!granted && machineSharing && machineSharing.enabled) {
+        try {
+          authorizeRequest(principal, machineSharing, "admin");
+          granted = true;
+        } catch {
+        }
+      }
+      if (!granted) {
+        this.log(`Files-gateway DENY '${sessionId}': ${userEmail} not owner and not a session/machine admin`);
         deny(403, "Access denied");
         return;
       }
@@ -3811,7 +3821,7 @@ a{color:#0969da;text-decoration:none;font-weight:500}a:hover{text-decoration:und
     const normRel = this.toSessionRelative(rootDir, m[2] || "");
     if (method === "GET" || method === "HEAD") {
       if (url.searchParams.get("list") === "1") {
-        const lex = containedPath(rootDir, normRel);
+        const lex = this.resolveContainedPath(rootDir, normRel);
         if (!lex) {
           deny(403, "Forbidden");
           return;
@@ -4414,6 +4424,29 @@ var serveManager = /*#__PURE__*/Object.freeze({
     sanitizeMountForRole: sanitizeMountForRole
 });
 
+const EXEC_MAX_BUFFER = 16 * 1024 * 1024;
+function execFailureOutcome(err, stdout, stderr) {
+  const e = err || {};
+  const rawCode = e.code;
+  const enobufs = rawCode === "ENOBUFS";
+  const timedOut = rawCode === "ETIMEDOUT" || e.killed === true && !!e.signal;
+  let exitCode;
+  if (typeof rawCode === "number") exitCode = rawCode;
+  else if (timedOut) exitCode = 124;
+  else exitCode = 1;
+  const base = stderr || e.message || "";
+  let text = base;
+  if (enobufs) {
+    text = `output exceeded the ${Math.round(EXEC_MAX_BUFFER / (1024 * 1024))} MB buffer and was truncated (the command may have completed): ${base}`;
+  } else if (timedOut) {
+    text = `command timed out and was killed (it may have partially completed): ${base}`;
+  }
+  return { success: false, stdout: stdout || "", stderr: text, exitCode };
+}
+function execSuccessOutcome(stdout, stderr) {
+  return { success: true, stdout: stdout || "", stderr: stderr || "", exitCode: 0 };
+}
+
 const EXAMPLE_HYPHA_PROXY_URL = "https://proxy.hypha.aicell.io";
 const MODE_KEY = "SVAMP_CLAUDE_PROXY";
 const HYPHA_PROXY_URL_KEY = "SVAMP_HYPHA_PROXY_URL";
@@ -4844,6 +4877,13 @@ function stripV1(url) {
   }
   return trimmed;
 }
+function promptCacheTtlEnv(env, subscription) {
+  if (env.FORCE_PROMPT_CACHING_5M) return void 0;
+  if (!subscription) {
+    return env.ENABLE_PROMPT_CACHING_1H === "1" ? "1" : void 0;
+  }
+  return env.ENABLE_PROMPT_CACHING_1H === "0" ? void 0 : "1";
+}
 function resolveAccountEnv(account, env = process.env, svampHome) {
   switch (account.method) {
     case "anthropic-api-key":
@@ -4852,7 +4892,9 @@ function resolveAccountEnv(account, env = process.env, svampHome) {
         claudeEnv: {
           ANTHROPIC_API_KEY: account.secret,
           ANTHROPIC_BASE_URL: account.baseUrl ? stripV1(account.baseUrl) : void 0,
-          CLAUDE_CODE_OAUTH_TOKEN: void 0
+          CLAUDE_CODE_OAUTH_TOKEN: void 0,
+          // #0986: metered first-party key — the 1h TTL costs 2.0x per cache write.
+          ENABLE_PROMPT_CACHING_1H: promptCacheTtlEnv(env, false)
         },
         describe: `anthropic API key (${account.label})`
       };
@@ -4863,7 +4905,9 @@ function resolveAccountEnv(account, env = process.env, svampHome) {
         claudeEnv: {
           ANTHROPIC_BASE_URL: url,
           ANTHROPIC_API_KEY: account.secret,
-          CLAUDE_CODE_OAUTH_TOKEN: void 0
+          CLAUDE_CODE_OAUTH_TOKEN: void 0,
+          // #0986: an arbitrary gateway's billing model is unknown — opt-in only.
+          ENABLE_PROMPT_CACHING_1H: promptCacheTtlEnv(env, false)
         },
         describe: `anthropic gateway ${url} (${account.label})`
       };
@@ -4880,7 +4924,7 @@ function resolveAccountEnv(account, env = process.env, svampHome) {
           ANTHROPIC_API_KEY: token,
           CLAUDE_CODE_OAUTH_TOKEN: void 0,
           // #0203: subscription backend qualifies for the free 1h prompt-cache TTL.
-          ENABLE_PROMPT_CACHING_1H: env.FORCE_PROMPT_CACHING_5M ? void 0 : "1"
+          ENABLE_PROMPT_CACHING_1H: promptCacheTtlEnv(env, true)
         },
         describe: `hypha proxy ${url} (${account.label})`
       };
@@ -4891,7 +4935,9 @@ function resolveAccountEnv(account, env = process.env, svampHome) {
         claudeEnv: {
           CLAUDE_CODE_OAUTH_TOKEN: account.secret,
           ANTHROPIC_BASE_URL: void 0,
-          ANTHROPIC_API_KEY: void 0
+          ANTHROPIC_API_KEY: void 0,
+          // #0986: subscription token — free 1h TTL.
+          ENABLE_PROMPT_CACHING_1H: promptCacheTtlEnv(env, true)
         },
         describe: `claude subscription token (${account.label})`
       };
@@ -4901,7 +4947,9 @@ function resolveAccountEnv(account, env = process.env, svampHome) {
         claudeEnv: {
           CLAUDE_CODE_OAUTH_TOKEN: account.accessToken,
           ANTHROPIC_BASE_URL: void 0,
-          ANTHROPIC_API_KEY: void 0
+          ANTHROPIC_API_KEY: void 0,
+          // #0986: subscription OAuth — free 1h TTL.
+          ENABLE_PROMPT_CACHING_1H: promptCacheTtlEnv(env, true)
         },
         describe: `claude subscription oauth (${account.label})`
       };
@@ -5521,10 +5569,16 @@ const genKey = () => "ck_" + randomBytes(18).toString("base64url");
 const DEFAULT_TEMPLATE = `<inbound-message from="\${sender.name}" sender-type="\${sender.kind}" verified="\${sender.verified}" channel="\${channel.name}" call-id="\${call.id}" at="\${now}">
 \${body.message}
 </inbound-message>`;
+const CHANNEL_ID_RE = /^[A-Za-z0-9_.-]{1,64}$/;
+function isValidChannelId(id) {
+  return typeof id === "string" && CHANNEL_ID_RE.test(id) && id !== "." && id !== "..";
+}
 function validateChannel(c) {
   const errs = [];
   if (!c || typeof c !== "object") return ["channel must be an object"];
   if (!c.name) errs.push("name required");
+  if (c.id !== void 0 && !isValidChannelId(c.id))
+    errs.push("id must match [A-Za-z0-9_.-]{1,64} (no path separators)");
   const m = c.identity?.mode;
   if (!["per-key", "caller-supplied", "fixed"].includes(m)) errs.push("identity.mode must be per-key|caller-supplied|fixed");
   if (m === "fixed" && !c.identity.fixed?.name) errs.push("identity.fixed.name required for fixed mode");
@@ -5591,10 +5645,14 @@ class ChannelStore {
     } catch {
     }
   }
+  // #0982: reject a traversing/oversized id at the path boundary itself, so no
+  // caller (RPC, HTTP, CLI) can reach outside this.dir regardless of its own checks.
   _path(id) {
+    if (!isValidChannelId(id)) throw new Error(`invalid channel id: ${String(id).slice(0, 64)}`);
     return join$1(this.dir, `${id}.json`);
   }
   _lock(id) {
+    if (!isValidChannelId(id)) throw new Error(`invalid channel id: ${String(id).slice(0, 64)}`);
     return join$1(this.dir, `${id}.json.lock`);
   }
   // #0679: the actual validate + atomic write, WITHOUT the lock, so a locked RMW mutator can
@@ -6463,6 +6521,15 @@ async function registerMachineService(server, machineId, metadata, daemonState,
     serveCallerTrusted(context),
     process.env.SVAMP_OWNER_EMAIL
   );
+  const assertMayReplaceMount = (sm, name, context) => {
+    const existingMount = sm.getMount(name);
+    if (!existingMount || serveCallerTrusted(context)) return;
+    const callerEmail = (context?.user?.email || "").toLowerCase();
+    const mountOwner = (existingMount.ownerEmail || "").toLowerCase();
+    if (!callerEmail || !mountOwner || callerEmail !== mountOwner) {
+      throw new Error(`Not authorized to replace mount '${name}' (owned by another user)`);
+    }
+  };
   let lastInboundRpcAt = Date.now();
   const trackInbound = () => {
     lastInboundRpcAt = Date.now();
@@ -6603,6 +6670,21 @@ async function registerMachineService(server, machineId, metadata, daemonState,
         }
         return result;
       },
+      /**
+       * #0970: list ARCHIVED (stopped-but-persisted) sessions.
+       *
+       * Kept as its own method rather than a flag on listSessions so no existing caller's
+       * view silently gains stopped rows. Machine-level `view` only: an archived session has
+       * no live RPC handler, so the per-session sharing check listSessions falls back to
+       * cannot run — rather than guess, this returns nothing to a caller without machine
+       * access. That is the conservative direction (a session-shared user simply keeps
+       * today's behaviour).
+       */
+      listArchivedSessions: async (context) => {
+        trackInbound();
+        authorizeRequest(context, currentMetadata.sharing, "view");
+        return handlers.getArchivedSessions?.() || [];
+      },
       /**
        * Get summary info for all sessions (metadata, agent state, activity).
        * Replaces the need to discover and query N individual session services.
@@ -7080,14 +7162,9 @@ async function registerMachineService(server, machineId, metadata, daemonState,
         const { exec } = await import('child_process');
         const { homedir } = await import('os');
         return new Promise((resolve) => {
-          exec(command, { cwd: cwd || homedir(), timeout: 3e4, maxBuffer: 16 * 1024 * 1024 }, (err, stdout, stderr) => {
-            if (err) {
-              const enobufs = err.code === "ENOBUFS";
-              const errText = enobufs ? `output exceeded the 16 MB buffer and was truncated (the command may have completed): ${stderr || err.message}` : stderr || err.message;
-              resolve({ success: false, stdout: stdout || "", stderr: errText, exitCode: err.code ?? 1 });
-            } else {
-              resolve({ success: true, stdout, stderr: stderr || "", exitCode: 0 });
-            }
+          exec(command, { cwd: cwd || homedir(), timeout: 3e4, maxBuffer: EXEC_MAX_BUFFER }, (err, stdout, stderr) => {
+            if (err) resolve(execFailureOutcome(err, stdout, stderr));
+            else resolve(execSuccessOutcome(stdout, stderr));
           });
         });
       },
@@ -7632,6 +7709,7 @@ async function registerMachineService(server, machineId, metadata, daemonState,
         if (params.sessionId && !serveCallerTrusted(context)) {
           await authorizeSessionAccess(params.sessionId, "admin", context);
         }
+        assertMayReplaceMount(sm, params.name, context);
         const ownerEmail2 = resolveMountOwnerEmailFor(params.ownerEmail, context);
         const access = params.access || "owner";
         return sm.addMount(params.name, params.directory, params.sessionId, access, ownerEmail2);
@@ -7652,14 +7730,7 @@ async function registerMachineService(server, machineId, metadata, daemonState,
         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();
-          const mountOwner = (existingMount.ownerEmail || "").toLowerCase();
-          if (!callerEmail || !mountOwner || callerEmail !== mountOwner) {
-            throw new Error(`Not authorized to replace mount '${params.name}' (owned by another user)`);
-          }
-        }
+        assertMayReplaceMount(sm, params.name, context);
         const ownerEmail2 = resolveMountOwnerEmailFor(params.ownerEmail, context);
         const access = params.access ?? "owner";
         return sm.applyMount({
@@ -8030,7 +8101,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-L0YNMJhj.mjs');
+          const { toolsForRole } = await import('./sideband-CadJ3gg1.mjs');
           const r2 = await runWiseAgent({ message: params.message, sender, config: { tools: toolsForRole(role2) }, deps, transport, model: resolved.model });
           return fmt(r2);
         }
@@ -8135,7 +8206,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-C8im5Q2J.mjs');
+    const { queryCore } = await import('./commands-D4R66JMe.mjs');
     const timeout = c.reply?.timeout_sec || 120;
     let result;
     try {
@@ -10242,7 +10313,7 @@ function createSessionStore(server, sessionId, initialMetadata, initialAgentStat
           return { ok: result.status === "completed", call_id: callId, correlationId: callId, status: result.status, reply: result.reply, tool_calls: result.toolCalls, error: result.error };
         }
         if (c.action?.kind === "loop") return { error: "loop channels are served by the channel server, not channelSend" };
-        if (params.no_reply && c.action?.kind === "message") {
+        if (params.no_reply && c.action?.kind === "message" && r.sender.verified) {
           const envelope = renderMessage(c, { sender: r.sender, body: { message: params.message }, callId });
           const wire = JSON.stringify({ role: "user", content: { type: "text", text: envelope } });
           await deliverUserMessageCore(wire, params.localId || callId, void 0, true);
@@ -17851,6 +17922,197 @@ function shouldForceReconnect(consecutiveHeartbeatFailures) {
   return consecutiveHeartbeatFailures === 2 || consecutiveHeartbeatFailures % 3 === 0;
 }
 
+function acquireSupervisorLock(pidFile, pid = process.pid) {
+  try {
+    const fd = openSync(pidFile, "wx");
+    try {
+      writeSync(fd, String(pid));
+    } finally {
+      closeSync(fd);
+    }
+    return { acquired: true };
+  } catch (err) {
+    if (err?.code !== "EEXIST") throw err;
+  }
+  let existingPid = 0;
+  try {
+    existingPid = parseInt(readFileSync(pidFile, "utf-8").trim(), 10);
+  } catch {
+  }
+  if (!existingPid || Number.isNaN(existingPid) || existingPid <= 0) {
+    try {
+      unlinkSync$1(pidFile);
+    } catch {
+    }
+    return { acquired: false, staleCleaned: true };
+  }
+  if (isPidAlive(existingPid)) {
+    return { acquired: false, heldBy: existingPid };
+  }
+  try {
+    unlinkSync$1(pidFile);
+  } catch {
+  }
+  return { acquired: false, staleCleaned: true };
+}
+function acquireSupervisorLockWithRetry(pidFile, pid = process.pid) {
+  let result = acquireSupervisorLock(pidFile, pid);
+  if (!result.acquired && result.staleCleaned) {
+    result = acquireSupervisorLock(pidFile, pid);
+  }
+  return { acquired: result.acquired, heldBy: result.heldBy };
+}
+function releaseSupervisorLock(pidFile, pid = process.pid) {
+  try {
+    if (!existsSync(pidFile)) return;
+    const content = parseInt(readFileSync(pidFile, "utf-8").trim(), 10);
+    if (content === pid) unlinkSync$1(pidFile);
+  } catch {
+  }
+}
+function isPidAlive(pid) {
+  if (!pid || Number.isNaN(pid) || pid <= 0) return false;
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch (err) {
+    return err?.code === "EPERM";
+  }
+}
+function isSupervisorPid(pid) {
+  if (!pid || Number.isNaN(pid) || pid <= 0) return false;
+  if (process.platform === "win32") return null;
+  try {
+    const out = execFileSync("ps", ["-o", "command=", "-p", String(pid)], {
+      encoding: "utf-8",
+      timeout: 5e3,
+      stdio: ["ignore", "pipe", "ignore"]
+    }).trim();
+    if (!out) return false;
+    return /daemon\s+start-supervised/.test(out);
+  } catch {
+    return null;
+  }
+}
+function shouldSignalSupervisor(opts) {
+  const { pid, alive, isSupervisor } = opts;
+  if (!pid || Number.isNaN(pid) || pid <= 0) return false;
+  if (!alive) return false;
+  if (isSupervisor === false) return false;
+  return true;
+}
+function findOrphanedSyncPids(currentSupervisorPid = process.pid) {
+  if (process.platform === "win32") return [];
+  const pids = [];
+  try {
+    const uid = typeof process.getuid === "function" ? process.getuid() : void 0;
+    const pgrepArgs = uid !== void 0 ? ["-u", String(uid), "-af", "svamp daemon start-sync"] : ["-af", "svamp daemon start-sync"];
+    const output = execFileSync("pgrep", pgrepArgs, {
+      encoding: "utf-8",
+      timeout: 5e3
+    });
+    for (const line of output.split("\n")) {
+      const trimmed = line.trim();
+      if (!trimmed) continue;
+      const match = trimmed.match(/^(\d+)\s/);
+      if (!match) continue;
+      const pid = parseInt(match[1], 10);
+      if (Number.isNaN(pid) || pid <= 0) continue;
+      if (pid === process.pid) continue;
+      const ppid = getPpid(pid);
+      if (ppid === currentSupervisorPid) continue;
+      pids.push(pid);
+    }
+  } catch (err) {
+    if (err?.status !== 1) ;
+  }
+  return pids;
+}
+function getPpid(pid) {
+  if (process.platform === "win32") return 0;
+  try {
+    const out = execFileSync("ps", ["-o", "ppid=", "-p", String(pid)], {
+      encoding: "utf-8",
+      timeout: 2e3
+    }).trim();
+    const ppid = parseInt(out, 10);
+    return Number.isNaN(ppid) ? 0 : ppid;
+  } catch {
+    return 0;
+  }
+}
+async function killOrphanedSyncs(pids, opts = {}) {
+  if (pids.length === 0) return;
+  const log = opts.log || (() => {
+  });
+  const gracePeriodMs = opts.gracePeriodMs ?? 3e3;
+  log(`Killing ${pids.length} orphan sync daemon(s): ${pids.join(", ")}`);
+  for (const pid of pids) {
+    try {
+      process.kill(pid, "SIGTERM");
+    } catch {
+    }
+  }
+  const pollStep = 100;
+  const steps = Math.max(1, Math.ceil(gracePeriodMs / pollStep));
+  for (let i = 0; i < steps; i++) {
+    await new Promise((r) => setTimeout(r, pollStep));
+    if (pids.every((p) => !isPidAlive(p))) {
+      log("All orphan daemons exited cleanly");
+      return;
+    }
+  }
+  const survivors = pids.filter(isPidAlive);
+  if (survivors.length > 0) {
+    log(`Force-killing survivors: ${survivors.join(", ")}`);
+    for (const pid of survivors) {
+      try {
+        process.kill(pid, "SIGKILL");
+      } catch {
+      }
+    }
+  }
+}
+function watchParentLiveness(opts) {
+  if (process.env.SVAMP_SUPERVISED !== "1") {
+    return () => {
+    };
+  }
+  const supervisorPid = process.ppid;
+  if (!supervisorPid || supervisorPid === 1) {
+    return () => {
+    };
+  }
+  const intervalMs = opts.intervalMs ?? 5e3;
+  let fired = false;
+  const timer = setInterval(() => {
+    if (fired) return;
+    if (!isPidAlive(supervisorPid)) {
+      fired = true;
+      clearInterval(timer);
+      opts.onParentDeath();
+    }
+  }, intervalMs);
+  timer.unref?.();
+  return () => {
+    clearInterval(timer);
+  };
+}
+
+var supervisorLock = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    acquireSupervisorLock: acquireSupervisorLock,
+    acquireSupervisorLockWithRetry: acquireSupervisorLockWithRetry,
+    findOrphanedSyncPids: findOrphanedSyncPids,
+    getPpid: getPpid,
+    isPidAlive: isPidAlive,
+    isSupervisorPid: isSupervisorPid,
+    killOrphanedSyncs: killOrphanedSyncs,
+    releaseSupervisorLock: releaseSupervisorLock,
+    shouldSignalSupervisor: shouldSignalSupervisor,
+    watchParentLiveness: watchParentLiveness
+});
+
 const SVAMP_HOME$1 = process.env.SVAMP_HOME || join$1(os.homedir(), ".svamp");
 function generateHookSettings(portOrOptions = {}) {
   const opts = typeof portOrOptions === "number" ? { sessionStartPort: portOrOptions } : portOrOptions;
@@ -18811,7 +19073,9 @@ function spawnHeadlessEvaluator(prompt, opts) {
     const evalArgs = [
       "--print",
       prompt,
-      // Read-only reviewer (mirrors .claude/agents/loop-evaluator.md): it inspects real repo
+      // Read-only reviewer (#0995: NOT the retired .claude/agents/loop-evaluator.md subagent —
+      // this is a separate `claude --print` process whose prompt buildEvaluatorPrompt owns,
+      // which is what keeps the #0189 independence invariant): it inspects real repo
       // state but must not mutate the working tree it's judging. The allowedTools whitelist
       // already excludes mutation tools; --disallowedTools is belt-and-suspenders. Kept to
       // Write/Edit only — MultiEdit/NotebookEdit aren't known tool names on some claude builds
@@ -19337,6 +19601,26 @@ function clearSessionArchivedFlag(sessionId) {
     return null;
   }
 }
+function loadArchivedSessionInfos(isLive) {
+  const out = [];
+  const index = loadSessionIndex();
+  for (const [sessionId, entry] of Object.entries(index)) {
+    if (isLive(sessionId)) continue;
+    try {
+      const data = JSON.parse(readFileSync$1(getSessionFilePath(entry.directory, sessionId), "utf-8"));
+      if (!data?.sessionId) continue;
+      out.push({
+        sessionId: data.sessionId,
+        startedBy: data.startedBy || "unknown",
+        directory: data.directory || entry.directory,
+        active: false,
+        metadata: data.metadata
+      });
+    } catch {
+    }
+  }
+  return out;
+}
 function loadPersistedSessions() {
   const sessions = [];
   const index = loadSessionIndex();
@@ -19487,7 +19771,7 @@ async function startDaemon(options) {
   process.on("SIGINT", () => requestShutdown("os-signal"));
   process.on("SIGTERM", () => requestShutdown("os-signal"));
   process.on("SIGUSR1", () => requestShutdown("os-signal-cleanup"));
-  const { watchParentLiveness } = await import('./supervisorLock-DmfzJx7B.mjs');
+  const { watchParentLiveness } = await Promise.resolve().then(function () { return supervisorLock; });
   const cancelParentWatchdog = watchParentLiveness({
     intervalMs: 5e3,
     onParentDeath: () => {
@@ -19680,7 +19964,7 @@ async function startDaemon(options) {
     try {
       const dir = loadSessionIndex()[sessionId]?.directory;
       if (!dir) return;
-      const { reconcileServiceLinks } = await import('./agentCommands-CjbndvZ2.mjs');
+      const { reconcileServiceLinks } = await import('./agentCommands-BE3bFu8e.mjs');
       const configPath = getSvampConfigPath(dir, sessionId);
       const config = readSvampConfig(configPath);
       const entries = Array.from(urls.entries());
@@ -19702,7 +19986,7 @@ async function startDaemon(options) {
     try {
       const dir = loadSessionIndex()[sessionId]?.directory;
       if (!dir) return;
-      const { reconcileServiceLinks } = await import('./agentCommands-CjbndvZ2.mjs');
+      const { reconcileServiceLinks } = await import('./agentCommands-BE3bFu8e.mjs');
       const configPath = getSvampConfigPath(dir, sessionId);
       const config = readSvampConfig(configPath);
       const incoming = [{
@@ -19723,7 +20007,7 @@ async function startDaemon(options) {
     try {
       const dir = loadSessionIndex()[sessionId]?.directory;
       if (!dir) return;
-      const { dropServiceLinks } = await import('./agentCommands-CjbndvZ2.mjs');
+      const { dropServiceLinks } = await import('./agentCommands-BE3bFu8e.mjs');
       const configPath = getSvampConfigPath(dir, sessionId);
       const config = readSvampConfig(configPath);
       if (dropServiceLinks(config, "serve", mountName)) {
@@ -19766,7 +20050,7 @@ async function startDaemon(options) {
   ensureAutoInstalledCommands(logger);
   (async () => {
     try {
-      const { beginClaudeVersionReconcile } = await import('./pinnedClaudeCode-C8CmQv3y.mjs');
+      const { beginClaudeVersionReconcile } = await import('./pinnedClaudeCode-8SZDu7O-.mjs');
       beginClaudeVersionReconcile((msg) => logger.log(msg));
     } catch (e) {
       logger.log(`[claude-version] check failed: ${e?.message || e}`);
@@ -22086,21 +22370,18 @@ ${capturedError}${buildClaudeErrorHint(capturedError)}`;
               logger.log(`[Session ${sessionId}] Bash: ${command} (cwd: ${cwd || directory}, timeout: ${execTimeout}ms)`);
               const { exec: exec2 } = await import('child_process');
               return new Promise((resolve2) => {
-                exec2(command, { cwd: cwd || directory, timeout: execTimeout, maxBuffer: 1024 * 1024 }, (err, stdout, stderr) => {
-                  if (err) {
-                    resolve2({ success: false, stdout: stdout || "", stderr: stderr || err.message, exitCode: err.code ?? 1 });
-                  } else {
-                    resolve2({ success: true, stdout, stderr: stderr || "", exitCode: 0 });
-                  }
+                exec2(command, { cwd: cwd || directory, timeout: execTimeout, maxBuffer: EXEC_MAX_BUFFER }, (err, stdout, stderr) => {
+                  if (err) resolve2(execFailureOutcome(err, stdout, stderr));
+                  else resolve2(execSuccessOutcome(stdout, stderr));
                 });
               });
             },
             onIssue: async (params) => {
-              const { issueRpc } = await import('./rpc-BosOiRY-.mjs');
+              const { issueRpc } = await import('./rpc-D_pFjWr1.mjs');
               return issueRpc(params?.cwd || directory, params || {}, { notifySession: notifyIssueOwner, rekickLoopOwner });
             },
             onWorkflow: async (params) => {
-              const { workflowRpc } = await import('./rpc-DP4CiR0g.mjs');
+              const { workflowRpc } = await import('./rpc-D9LFUW93.mjs');
               return workflowRpc(params?.cwd || directory, params || {});
             },
             onRipgrep: async (args, cwd) => {
@@ -22797,21 +23078,18 @@ ${capturedError}${buildClaudeErrorHint(capturedError)}`;
               const execTimeout = timeout || 12e4;
               const { exec: exec2 } = await import('child_process');
               return new Promise((resolve2) => {
-                exec2(command, { cwd: cwd || directory, timeout: execTimeout, maxBuffer: 1024 * 1024 }, (err, stdout, stderr) => {
-                  if (err) {
-                    resolve2({ success: false, stdout: stdout || "", stderr: stderr || err.message, exitCode: err.code ?? 1 });
-                  } else {
-                    resolve2({ success: true, stdout, stderr: stderr || "", exitCode: 0 });
-                  }
+                exec2(command, { cwd: cwd || directory, timeout: execTimeout, maxBuffer: EXEC_MAX_BUFFER }, (err, stdout, stderr) => {
+                  if (err) resolve2(execFailureOutcome(err, stdout, stderr));
+                  else resolve2(execSuccessOutcome(stdout, stderr));
                 });
               });
             },
             onIssue: async (params) => {
-              const { issueRpc } = await import('./rpc-BosOiRY-.mjs');
+              const { issueRpc } = await import('./rpc-D_pFjWr1.mjs');
               return issueRpc(params?.cwd || directory, params || {}, { notifySession: notifyIssueOwner, rekickLoopOwner });
             },
             onWorkflow: async (params) => {
-              const { workflowRpc } = await import('./rpc-DP4CiR0g.mjs');
+              const { workflowRpc } = await import('./rpc-D9LFUW93.mjs');
               return workflowRpc(params?.cwd || directory, params || {});
             },
             onRipgrep: async (args, cwd) => {
@@ -23640,6 +23918,11 @@ ${oracle.output.trim().slice(0, 500)}`, "\u{1F501} Continuing loop");
         logger.log("Shutdown requested via hypha-app (ignored \u2014 daemon never self-terminates)");
       },
       getTrackedSessions: getCurrentChildren,
+      // #0970: archived (stopped-but-persisted) sessions, so CLI id resolution can find them.
+      getArchivedSessions: () => {
+        const live = new Set(getCurrentChildren().map((c) => c.sessionId));
+        return loadArchivedSessionInfos((id) => live.has(id));
+      },
       getSessionRPCHandlers: (sessionId) => {
         for (const [, session] of pidToTrackedSession) {
           if (session.svampSessionId === sessionId && !session.stopped && session.sessionRPCHandlers) {
@@ -23814,10 +24097,17 @@ ${oracle.output.trim().slice(0, 500)}`, "\u{1F501} Continuing loop");
           } catch {
             sharing = null;
           }
+          let machineSharing = null;
+          try {
+            machineSharing = machineService.getCurrentMetadata()?.sharing ?? null;
+          } catch {
+            machineSharing = null;
+          }
           return {
             cwd: session.directory,
             sharing,
-            ownerEmail: sharing?.owner || daemonOwnerEmail
+            ownerEmail: sharing?.owner || daemonOwnerEmail,
+            machineSharing
           };
         }
       }
@@ -23863,7 +24153,7 @@ ${oracle.output.trim().slice(0, 500)}`, "\u{1F501} Continuing loop");
     }
     if (persistedSessions.length > 0) {
       try {
-        const { awaitClaudeVersionReady } = await import('./pinnedClaudeCode-C8CmQv3y.mjs');
+        const { awaitClaudeVersionReady } = await import('./pinnedClaudeCode-8SZDu7O-.mjs');
         await awaitClaudeVersionReady();
       } catch {
       }
@@ -23964,8 +24254,16 @@ ${oracle.output.trim().slice(0, 500)}`, "\u{1F501} Continuing loop");
           const supPidFile = join(SVAMP_HOME, "supervisor.pid");
           const supPid = existsSync$1(supPidFile) ? parseInt(readFileSync$1(supPidFile, "utf-8").trim(), 10) : NaN;
           if (supPid && !isNaN(supPid)) {
-            process.kill(supPid, "SIGUSR2");
-            return;
+            const ok = shouldSignalSupervisor({
+              pid: supPid,
+              alive: isPidAlive(supPid),
+              isSupervisor: isSupervisorPid(supPid)
+            });
+            if (ok) {
+              process.kill(supPid, "SIGUSR2");
+              return;
+            }
+            logger.log(`[graceful-restart] supervisor.pid ${supPid} is stale or not a supervisor \u2014 not signalling`);
           }
         } catch {
         }
@@ -24112,7 +24410,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-BN9GuvGN.mjs');
+    const { WorkflowScheduler } = await import('./scheduler-bgEMu7PK.mjs');
     const workflowProjectRoots = () => {
       const dirs = /* @__PURE__ */ new Set();
       for (const s of pidToTrackedSession.values()) {
@@ -24745,4 +25043,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, 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 };
+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, supervisorLock as aC, run as aD, 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 };