svamp-cli 0.2.256 → 0.2.258

package/dist/{commands-CRvH25K7.mjs → commands-Dd8xEIf0.mjs}

@@ -1,7 +1,7 @@
 import os from 'os';
 import fs__default from 'fs';
 import { resolve, join, relative } from 'path';
-import { T as parseFrontmatter, U as getSkillsServer, V as getSkillsWorkspaceName, W as getSkillsCollectionName, X as fetchWithTimeout, Y as searchSkills, Z as SKILLS_DIR, _ as getSkillInfo, $ as downloadSkillFile, a0 as listSkillFiles } from './run-BDX-RaEm.mjs';
+import { T as parseFrontmatter, U as getSkillsServer, V as getSkillsWorkspaceName, W as getSkillsCollectionName, X as fetchWithTimeout, Y as searchSkills, Z as SKILLS_DIR, _ as getSkillInfo, $ as downloadSkillFile, a0 as listSkillFiles } from './run-C1Unk4Zx.mjs';
 import 'fs/promises';
 import 'url';
 import 'child_process';

package/dist/{commands-C6_ClNDg.mjs → commands-DrfYv705.mjs}

@@ -1,11 +1,11 @@
 import { writeFileSync, readFileSync } from 'fs';
 import { resolve } from 'path';
-import { connectAndGetMachine } from './commands-BrTyEX8u.mjs';
+import { connectAndGetMachine } from './commands-D8l74hsL.mjs';
 import 'node:fs';
 import 'node:child_process';
 import 'node:path';
 import 'node:os';
-import './run-BDX-RaEm.mjs';
+import './run-C1Unk4Zx.mjs';
 import 'os';
 import 'fs/promises';
 import 'url';

package/dist/{commands-DPKRLSJZ.mjs → commands-DutfM3U7.mjs}

@@ -1,8 +1,8 @@
 import { existsSync } from 'node:fs';
 import { resolve } from 'node:path';
-import { connectAndGetMachine, resolveSessionId, createWorktree, connectAndResolveSession } from './commands-BrTyEX8u.mjs';
+import { connectAndGetMachine, resolveSessionId, createWorktree, connectAndResolveSession } from './commands-D8l74hsL.mjs';
 import { execSync } from 'node:child_process';
-import { u as updateIssue, t as addComment, v as addIssue, k as shortId } from './run-BDX-RaEm.mjs';
+import { u as updateIssue, t as addComment, v as addIssue, k as shortId } from './run-C1Unk4Zx.mjs';
 import 'node:os';
 import 'os';
 import 'fs/promises';
@@ -169,6 +169,9 @@ function removeWorktree(worktreePath) {
     }
   }
 }
+function resolveNotifyLead(leadId, childParentSessionId, childId) {
+  return leadId || childParentSessionId || childId;
+}
 
 function isStandaloneChild(crew) {
   return !!crew && crew.standalone === true;
@@ -554,25 +557,24 @@ async function featureMerge(childPartial, opts = {}) {
       console.error("Could not determine the lead project root (base worktree).");
       process.exit(1);
     }
-    if (leadId) {
-      try {
-        await inbox(
-          machine,
-          leadId,
-          childId,
-          `<crew-freeze>Your lead is merging branch ${branch} into ${base}. Stop editing files now; do not commit until told.</crew-freeze>`,
-          "crew: freeze for merge"
-        );
-      } catch {
-      }
+    const notifyLead = resolveNotifyLead(leadId, meta?.parentSessionId, childId);
+    try {
+      await inbox(
+        machine,
+        notifyLead,
+        childId,
+        `<crew-freeze>Your lead is merging branch ${branch} into ${base}. Stop editing files now; do not commit until told.</crew-freeze>`,
+        "crew: freeze for merge"
+      );
+    } catch {
     }
     const r = mergeBack({ projectRoot, branch, worktreePath, baseBranch: base, deleteBranch: opts.deleteBranch });
     if (!r.ok) {
-      if (r.rework && leadId) {
+      if (r.rework) {
         try {
           await inbox(
             machine,
-            leadId,
+            notifyLead,
             childId,
             `<crew-rework branch="${branch}">
 Merge was not applied: ${r.detail}
@@ -585,7 +587,21 @@ Resolve and run \`svamp feature done\` again.
         console.error(`Merge deferred (rework) at ${r.stage}: ${r.detail}`);
         console.error(`Child ${childId.slice(0, 8)} re-woken with guidance; left running.`);
       } else {
+        try {
+          await inbox(
+            machine,
+            notifyLead,
+            childId,
+            `<crew-blocked branch="${branch}">
+Merge could not be applied (${r.stage}): ${r.detail}
+Stop editing and hold \u2014 do not keep working. Once the blocker is resolved, the lead can retry \`svamp feature merge\`.
+</crew-blocked>`,
+            "crew: merge blocked"
+          );
+        } catch {
+        }
         console.error(`Merge failed at ${r.stage}: ${r.detail}`);
+        console.error(`Child ${childId.slice(0, 8)} notified + left running (un-merged work preserved). Resolve the blocker, then retry \`svamp feature merge ${childId.slice(0, 8)}\`.`);
       }
       process.exit(1);
     }

package/dist/{fleet-DT3LusNA.mjs → fleet-UvQnIWT1.mjs}

@@ -1,7 +1,7 @@
 import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import os from 'node:os';
-import { c as connectToHypha } from './run-BDX-RaEm.mjs';
+import { c as connectToHypha } from './run-C1Unk4Zx.mjs';
 import { PINNED_CLAUDE_CODE_VERSION } from './pinnedClaudeCode-DuLXaoGP.mjs';
 import 'os';
 import 'fs/promises';

package/dist/{frpc--8kUn3Em.mjs → frpc-IXxyfgPn.mjs}

@@ -4,7 +4,7 @@ import { mkdirSync, writeFileSync, unlinkSync, existsSync, chmodSync, readFileSy
 import { join } from 'path';
 import { homedir, platform, arch } from 'os';
 import { randomUUID, createHash } from 'crypto';
-import { h as getFrpsSubdomainHost, i as getFrpsServerPort, j as getFrpsServerAddr } from './run-BDX-RaEm.mjs';
+import { h as getFrpsSubdomainHost, i as getFrpsServerPort, j as getFrpsServerAddr } from './run-C1Unk4Zx.mjs';
 import 'fs/promises';
 import 'url';
 import 'node:crypto';

package/dist/{headlessCli-DJIDtYga.mjs → headlessCli-BK7WSS3D.mjs}

@@ -1,5 +1,5 @@
-import { a1 as resolveModel, ae as describeMisconfiguration, af as buildMachineDeps } from './run-BDX-RaEm.mjs';
-import { handleRealtimeEvent, initMachineVoiceSession } from './sideband-BQ4pkLIQ.mjs';
+import { a1 as resolveModel, ae as describeMisconfiguration, af as buildMachineDeps } from './run-C1Unk4Zx.mjs';
+import { handleRealtimeEvent, initMachineVoiceSession } from './sideband-DMPZ-ZoR.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-BDX-RaEm.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-C1Unk4Zx.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';

package/dist/{package-CBpvrZJs.mjs → package-BdZX5mDv.mjs}

@@ -1,5 +1,5 @@
 var name = "svamp-cli";
-var version = "0.2.256";
+var version = "0.2.258";
 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 bin/commands && mkdir -p bin/skills && cp -r ../../skills/artifact bin/skills/artifact && cp -r ../../skills/crew bin/skills/crew && cp -r ../../commands bin/commands && tsc --noEmit && pkgroll",
 	typecheck: "tsc --noEmit",
-	test: "npx tsx test/test-context-window.mjs && npx tsx test/test-ratelimit-retry.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-sharing-notify-sync.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-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-btw-proxy-env.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-store.mjs && npx tsx test/test-inbox.mjs && npx tsx test/test-inbox-cross-machine.mjs && npx tsx test/test-issue-store.mjs && npx tsx test/test-issue-close-gate.mjs && npx tsx test/test-loop-verify.mjs && npx tsx test/test-issue-rpc.mjs && npx tsx test/test-issue-pause.mjs && npx tsx test/test-workflow-store.mjs && npx tsx test/test-workflow-rpc.mjs && npx tsx test/test-workflow-scheduler.mjs && npx tsx test/test-cron.mjs && npx tsx test/test-workflow-runs.mjs && npx tsx test/test-workflow-idle.mjs && npx tsx test/test-serve-link-subdomain.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-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-hotreload-seam.mjs && npx tsx test/test-hot-reload.mjs && npx tsx test/test-hot-reload-live.mjs && npx tsx test/test-session-core.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-shared-session-identity.mjs && npx tsx test/test-wise-agent-auth.mjs && npx tsx test/test-channel-http.mjs && npx tsx test/test-channel-upload.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 && npx tsx test/test-crew-verdict-routing.mjs && npx tsx test/test-crew-standalone.mjs && npx tsx test/test-session-links.mjs && npx tsx test/test-issue-loop-pause-guard.mjs && npx tsx test/test-artifact-guard.mjs && npx tsx test/test-graceful-restart.mjs",
+	test: "npx tsx test/test-context-window.mjs && npx tsx test/test-ratelimit-retry.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-sharing-notify-sync.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-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-btw-proxy-env.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-store.mjs && npx tsx test/test-inbox.mjs && npx tsx test/test-inbox-cross-machine.mjs && npx tsx test/test-issue-store.mjs && npx tsx test/test-issue-close-gate.mjs && npx tsx test/test-loop-verify.mjs && npx tsx test/test-issue-rpc.mjs && npx tsx test/test-issue-pause.mjs && npx tsx test/test-workflow-store.mjs && npx tsx test/test-workflow-rpc.mjs && npx tsx test/test-workflow-scheduler.mjs && npx tsx test/test-cron.mjs && npx tsx test/test-workflow-runs.mjs && npx tsx test/test-workflow-idle.mjs && npx tsx test/test-serve-link-subdomain.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-static-file-server.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-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-hotreload-seam.mjs && npx tsx test/test-hot-reload.mjs && npx tsx test/test-hot-reload-live.mjs && npx tsx test/test-session-core.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-shared-session-identity.mjs && npx tsx test/test-wise-agent-auth.mjs && npx tsx test/test-channel-http.mjs && npx tsx test/test-channel-upload.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 && npx tsx test/test-crew-verdict-routing.mjs && npx tsx test/test-crew-standalone.mjs && npx tsx test/test-session-links.mjs && npx tsx test/test-issue-loop-pause-guard.mjs && npx tsx test/test-artifact-guard.mjs && npx tsx test/test-graceful-restart.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/{rpc-DPlerDzK.mjs → rpc-CyACkgY1.mjs}

@@ -1,4 +1,4 @@
-import { n as resolveProjectRoot, z as getRun, A as listRuns, B as getWorkflow, C as runWorkflow, D as setWorkflowEnabled, E as removeWorkflow, F as saveWorkflow, G as rawWorkflow, H as listWorkflows } from './run-BDX-RaEm.mjs';
+import { n as resolveProjectRoot, z as getRun, A as listRuns, B as getWorkflow, C as runWorkflow, D as setWorkflowEnabled, E as removeWorkflow, F as saveWorkflow, G as rawWorkflow, H as listWorkflows } from './run-C1Unk4Zx.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';

package/dist/{rpc-BV_9jVwX.mjs → rpc-D7DB3XCH.mjs}

@@ -1,4 +1,4 @@
-import { n as resolveProjectRoot, u as updateIssue, o as getIssue, p as resumeIssue, q as pauseIssue, t as addComment, v as addIssue, w as listIssues, x as searchIssues, y as isVisibleTo } from './run-BDX-RaEm.mjs';
+import { n as resolveProjectRoot, u as updateIssue, o as getIssue, p as resumeIssue, q as pauseIssue, t as addComment, v as addIssue, w as listIssues, x as searchIssues, y as isVisibleTo } from './run-C1Unk4Zx.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';

package/dist/{run-BDX-RaEm.mjs → run-C1Unk4Zx.mjs}

@@ -2985,7 +2985,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--8kUn3Em.mjs');
+        const { FrpcTunnel } = await import('./frpc-IXxyfgPn.mjs');
         const tunnel = new FrpcTunnel({
           name: params.name,
           ports: params.ports,
@@ -3452,7 +3452,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-BQ4pkLIQ.mjs');
+          const { toolsForRole } = await import('./sideband-DMPZ-ZoR.mjs');
           const r2 = await runWiseAgent({ message: params.message, sender, config: { tools: toolsForRole(role2) }, deps, transport, model: resolved.model });
           return fmt(r2);
         }
@@ -3551,7 +3551,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-BrTyEX8u.mjs');
+    const { queryCore } = await import('./commands-D8l74hsL.mjs');
     const timeout = c.reply?.timeout_sec || 120;
     let result;
     try {
@@ -10239,21 +10239,37 @@ class ProcessSupervisor {
    *   a desired-stopped intent so a daemon restart does not resurrect it. `stopAll` (a daemon
    *   shutdown, not a user action) passes false so keepAlive processes auto-restore (#nightly).
    */
+  /**
+   * #0347: run `fn` in the entry's lifecycle critical section. Each call awaits the previous
+   * lifecycle op's SETTLEMENT before running, so stop/restart/apply/update/remove are strictly
+   * serialized per entry and can never interleave across an `await killChild` (which is what let
+   * two ops double-spawn an orphan, or resurrect a just-stopped process). The chain tail never
+   * rejects (a failed op must not wedge the queue); the caller still gets the real result/error.
+   */
+  runExclusive(entry, fn) {
+    const prev = entry.opLock ?? Promise.resolve();
+    const result = prev.then(fn, fn);
+    entry.opLock = result.then(() => void 0, () => void 0);
+    return result;
+  }
   async stop(idOrName, opts) {
     const entry = this.require(idOrName);
     entry.stopping = true;
     this.clearTimers(entry);
-    if (entry.child) {
-      await this.killChild(entry.child);
-      entry.child = void 0;
-    }
-    entry.state.status = "stopped";
-    entry.state.stoppedAt = Date.now();
-    entry.state.pid = void 0;
-    if (opts?.markDesiredStopped !== false && !entry.deleted && !entry.spec.desiredStopped) {
-      entry.spec.desiredStopped = true;
-      await this.persistSpec(entry.spec);
-    }
+    return this.runExclusive(entry, async () => {
+      entry.stopping = true;
+      if (entry.child) {
+        await this.killChild(entry.child);
+        entry.child = void 0;
+      }
+      entry.state.status = "stopped";
+      entry.state.stoppedAt = Date.now();
+      entry.state.pid = void 0;
+      if (opts?.markDesiredStopped !== false && !entry.deleted && !entry.spec.desiredStopped) {
+        entry.spec.desiredStopped = true;
+        await this.persistSpec(entry.spec);
+      }
+    });
   }
   /** Restart a process (stop if running, then start again). */
   async restart(idOrName) {
@@ -10261,25 +10277,27 @@ class ProcessSupervisor {
     if (entry.deleted) throw new Error(`Process '${idOrName}' has been removed`);
     if (entry.restarting) return;
     entry.restarting = true;
-    try {
-      if (entry.child) {
-        entry.stopping = true;
-        this.clearTimers(entry);
-        await this.killChild(entry.child);
-        entry.child = void 0;
-      }
-      if (entry.deleted) return;
-      entry.stopping = false;
-      this.resetFailureTracking(entry);
-      if (entry.spec.desiredStopped) {
-        entry.spec.desiredStopped = false;
-        await this.persistSpec(entry.spec);
+    return this.runExclusive(entry, async () => {
+      try {
+        if (entry.child) {
+          entry.stopping = true;
+          this.clearTimers(entry);
+          await this.killChild(entry.child);
+          entry.child = void 0;
+        }
+        if (entry.deleted) return;
+        entry.stopping = false;
+        this.resetFailureTracking(entry);
+        if (entry.spec.desiredStopped) {
+          entry.spec.desiredStopped = false;
+          await this.persistSpec(entry.spec);
+        }
+        entry.state.restartCount++;
+        await this.startEntry(entry, false);
+      } finally {
+        entry.restarting = false;
       }
-      entry.state.restartCount++;
-      await this.startEntry(entry, false);
-    } finally {
-      entry.restarting = false;
-    }
+    });
   }
   /** Stop the process and remove it from supervision (deletes persisted spec). */
   async remove(idOrName) {
@@ -10288,15 +10306,17 @@ class ProcessSupervisor {
     entry.deleted = true;
     entry.stopping = true;
     this.clearTimers(entry);
-    if (entry.child) {
-      await this.killChild(entry.child);
-      entry.child = void 0;
-    }
-    entry.state.status = "stopped";
-    entry.state.stoppedAt = Date.now();
-    entry.state.pid = void 0;
-    this.entries.delete(id);
-    await this.deleteSpec(id);
+    return this.runExclusive(entry, async () => {
+      if (entry.child) {
+        await this.killChild(entry.child);
+        entry.child = void 0;
+      }
+      entry.state.status = "stopped";
+      entry.state.stoppedAt = Date.now();
+      entry.state.pid = void 0;
+      this.entries.delete(id);
+      await this.deleteSpec(id);
+    });
   }
   /** List all supervised processes. */
   list() {
@@ -10330,26 +10350,28 @@ class ProcessSupervisor {
     if (this.specsEqual(existing.spec, spec)) {
       return { action: "no-change", info: this.toInfo(existing) };
     }
-    const updatedSpec = {
-      ...spec,
-      id: existing.spec.id,
-      createdAt: existing.spec.createdAt
-      // preserve original creation time
-    };
-    existing.spec = updatedSpec;
-    await this.persistSpec(updatedSpec);
-    existing.stopping = true;
-    this.clearTimers(existing);
-    if (existing.child) {
-      await this.killChild(existing.child);
-      existing.child = void 0;
-    }
-    if (existing.deleted) return { action: "updated", info: this.toInfo(existing) };
-    existing.stopping = false;
-    this.resetFailureTracking(existing);
-    existing.state.status = "starting";
-    this.spawnProcess(existing);
-    return { action: "updated", info: this.toInfo(existing) };
+    return this.runExclusive(existing, async () => {
+      const updatedSpec = {
+        ...spec,
+        id: existing.spec.id,
+        createdAt: existing.spec.createdAt
+        // preserve original creation time
+      };
+      existing.spec = updatedSpec;
+      await this.persistSpec(updatedSpec);
+      existing.stopping = true;
+      this.clearTimers(existing);
+      if (existing.child) {
+        await this.killChild(existing.child);
+        existing.child = void 0;
+      }
+      if (existing.deleted) return { action: "updated", info: this.toInfo(existing) };
+      existing.stopping = false;
+      this.resetFailureTracking(existing);
+      existing.state.status = "starting";
+      this.spawnProcess(existing);
+      return { action: "updated", info: this.toInfo(existing) };
+    });
   }
   /**
    * Update a running process's spec and restart it.
@@ -10358,21 +10380,23 @@ class ProcessSupervisor {
   async update(idOrName, partialSpec) {
     const entry = this.require(idOrName);
     if (entry.deleted) throw new Error(`Process '${idOrName}' has been removed`);
-    const updatedSpec = { ...entry.spec, ...partialSpec };
-    entry.spec = updatedSpec;
-    await this.persistSpec(updatedSpec);
-    entry.stopping = true;
-    this.clearTimers(entry);
-    if (entry.child) {
-      await this.killChild(entry.child);
-      entry.child = void 0;
-    }
-    if (entry.deleted) return this.toInfo(entry);
-    entry.stopping = false;
-    this.resetFailureTracking(entry);
-    entry.state.status = "starting";
-    this.spawnProcess(entry);
-    return this.toInfo(entry);
+    return this.runExclusive(entry, async () => {
+      const updatedSpec = { ...entry.spec, ...partialSpec };
+      entry.spec = updatedSpec;
+      await this.persistSpec(updatedSpec);
+      entry.stopping = true;
+      this.clearTimers(entry);
+      if (entry.child) {
+        await this.killChild(entry.child);
+        entry.child = void 0;
+      }
+      if (entry.deleted) return this.toInfo(entry);
+      entry.stopping = false;
+      this.resetFailureTracking(entry);
+      entry.state.status = "starting";
+      this.spawnProcess(entry);
+      return this.toInfo(entry);
+    });
   }
   // ── Spec equality ─────────────────────────────────────────────────────────
   /** Compare two specs for equality (ignoring id, createdAt, and runtime state). */
@@ -13534,7 +13558,7 @@ async function startDaemon(options) {
     try {
       const dir = loadSessionIndex()[sessionId]?.directory;
       if (!dir) return;
-      const { reconcileServiceLinks } = await import('./agentCommands-DfTICQUR.mjs');
+      const { reconcileServiceLinks } = await import('./agentCommands-CQ89BZon.mjs');
       const configPath = getSvampConfigPath(dir, sessionId);
       const config = readSvampConfig(configPath);
       const entries = Array.from(urls.entries());
@@ -13552,7 +13576,7 @@ async function startDaemon(options) {
     }
   }
   async function createExposedTunnel(spec) {
-    const { FrpcTunnel } = await import('./frpc--8kUn3Em.mjs');
+    const { FrpcTunnel } = await import('./frpc-IXxyfgPn.mjs');
     const tunnel = new FrpcTunnel({
       name: spec.name,
       ports: spec.ports,
@@ -13573,7 +13597,7 @@ async function startDaemon(options) {
   }
   const tunnelRecreateState = /* @__PURE__ */ new Map();
   const tunnelRecreateInFlight = /* @__PURE__ */ new Set();
-  const { ServeManager } = await import('./serveManager-CQGY6nFz.mjs');
+  const { ServeManager } = await import('./serveManager-BszV0oIl.mjs');
   const serveManager = new ServeManager(SVAMP_HOME, (msg) => logger.log(`[SERVE] ${msg}`), hyphaServerUrl);
   ensureAutoInstalledSkills(logger).catch(() => {
   });
@@ -15689,11 +15713,11 @@ ${capturedError}${buildClaudeErrorHint(capturedError)}`;
               });
             },
             onIssue: async (params) => {
-              const { issueRpc } = await import('./rpc-BV_9jVwX.mjs');
+              const { issueRpc } = await import('./rpc-D7DB3XCH.mjs');
               return issueRpc(params?.cwd || directory, params || {}, { notifySession: notifyIssueOwner, rekickLoopOwner });
             },
             onWorkflow: async (params) => {
-              const { workflowRpc } = await import('./rpc-DPlerDzK.mjs');
+              const { workflowRpc } = await import('./rpc-CyACkgY1.mjs');
               return workflowRpc(params?.cwd || directory, params || {});
             },
             onRipgrep: async (args, cwd) => {
@@ -16242,11 +16266,11 @@ ${capturedError}${buildClaudeErrorHint(capturedError)}`;
               });
             },
             onIssue: async (params) => {
-              const { issueRpc } = await import('./rpc-BV_9jVwX.mjs');
+              const { issueRpc } = await import('./rpc-D7DB3XCH.mjs');
               return issueRpc(params?.cwd || directory, params || {}, { notifySession: notifyIssueOwner, rekickLoopOwner });
             },
             onWorkflow: async (params) => {
-              const { workflowRpc } = await import('./rpc-DPlerDzK.mjs');
+              const { workflowRpc } = await import('./rpc-CyACkgY1.mjs');
               return workflowRpc(params?.cwd || directory, params || {});
             },
             onRipgrep: async (args, cwd) => {
@@ -17211,7 +17235,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-CueRBYz_.mjs');
+    const { WorkflowScheduler } = await import('./scheduler-7wve0Fy3.mjs');
     const workflowScheduler = new WorkflowScheduler({
       projectRoots: () => {
         const dirs = /* @__PURE__ */ new Set();

package/dist/{run-19FUjQ96.mjs → run-C1ufZjIW.mjs}

@@ -1,4 +1,4 @@
-import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import { ag as applyClaudeProxyEnv, ah as composeSessionId, ai as generateFriendlyName, c as connectToHypha, a as createSessionStore, r as registerMachineService, aj as generateHookSettings } from './run-BDX-RaEm.mjs';
+import{createRequire as _pkgrollCR}from"node:module";const require=_pkgrollCR(import.meta.url);import { ag as applyClaudeProxyEnv, ah as composeSessionId, ai as generateFriendlyName, c as connectToHypha, a as createSessionStore, r as registerMachineService, aj as generateHookSettings } from './run-C1Unk4Zx.mjs';
 import os from 'node:os';
 import { resolve, join } from 'node:path';
 import { existsSync, readFileSync, watch } from 'node:fs';

package/dist/{scheduler-CueRBYz_.mjs → scheduler-7wve0Fy3.mjs}

@@ -1,4 +1,4 @@
-import { n as resolveProjectRoot, H as listWorkflows, I as isWorkflowEnabled, J as workflowCrons, C as runWorkflow, K as cronMatches } from './run-BDX-RaEm.mjs';
+import { n as resolveProjectRoot, H as listWorkflows, I as isWorkflowEnabled, J as workflowCrons, C as runWorkflow, K as cronMatches } from './run-C1Unk4Zx.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';

package/dist/{serveCommands-DRP03-lg.mjs → serveCommands-iQJJLsMJ.mjs}

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