svamp-cli 0.2.255 → 0.2.257

package/dist/{commands-yoeiGRYI.mjs → commands-B6BkPRui.mjs}

@@ -1,8 +1,8 @@
 import { existsSync } from 'node:fs';
 import { resolve } from 'node:path';
-import { connectAndGetMachine, resolveSessionId, createWorktree, connectAndResolveSession } from './commands-E4FV1Mrf.mjs';
+import { connectAndGetMachine, resolveSessionId, createWorktree, connectAndResolveSession } from './commands-CE1PdEJJ.mjs';
 import { execSync } from 'node:child_process';
-import { u as updateIssue, t as addComment, v as addIssue, k as shortId } from './run-DsAMQZUu.mjs';
+import { u as updateIssue, t as addComment, v as addIssue, k as shortId } from './run-BtGnnEMI.mjs';
 import 'node:os';
 import 'os';
 import 'fs/promises';
@@ -106,7 +106,7 @@ ${childStatus}`
     return { ok: false, stage: "merge", rework: true, detail: `merge conflict \u2014 aborted:
 ${detail.trim()}` };
   }
-  try {
+  if (!isMainWorkingTree(projectRoot, worktreePath)) try {
     git(projectRoot, `worktree remove --force ${worktreePath}`);
   } catch (e) {
     try {
@@ -123,7 +123,7 @@ ${detail.trim()}` };
       return { ok: false, stage: "remove-worktree", detail: `merged OK but worktree removal failed: ${detail.trim()}` };
     }
   }
-  if (input.deleteBranch !== false) {
+  if (input.deleteBranch !== false && branch !== baseBranch) {
     try {
       git(projectRoot, `branch -d ${branch}`);
     } catch {
@@ -131,12 +131,47 @@ ${detail.trim()}` };
   }
   return { ok: true, stage: "done", detail: `merged ${branch} into ${baseBranch}` };
 }
+function isMainWorkingTree(projectRoot, worktreePath) {
+  if (resolve(worktreePath) === resolve(projectRoot)) return true;
+  try {
+    const first = git(projectRoot, "worktree list --porcelain").split("\n").find((l) => l.startsWith("worktree "));
+    if (first) return resolve(first.slice("worktree ".length).trim()) === resolve(worktreePath);
+  } catch {
+  }
+  return false;
+}
 function projectRootFromWorktree(worktreePath) {
   const marker = "/.dev/worktree/";
   const idx = worktreePath.indexOf(marker);
   if (idx === -1) return null;
   return worktreePath.slice(0, idx);
 }
+function removeWorktree(worktreePath) {
+  const projectRoot = projectRootFromWorktree(worktreePath);
+  if (!projectRoot) return;
+  let branch = null;
+  try {
+    branch = currentBranch(worktreePath);
+  } catch {
+  }
+  try {
+    git(projectRoot, `worktree remove --force ${worktreePath}`);
+  } catch {
+  }
+  try {
+    git(projectRoot, "worktree prune");
+  } catch {
+  }
+  if (branch) {
+    try {
+      git(projectRoot, `branch -D ${branch}`);
+    } catch {
+    }
+  }
+}
+function resolveNotifyLead(leadId, childParentSessionId, childId) {
+  return leadId || childParentSessionId || childId;
+}
 
 function isStandaloneChild(crew) {
   return !!crew && crew.standalone === true;
@@ -204,13 +239,13 @@ async function featureStart(brief, opts = {}) {
   }
   const leadId = requireLead(opts.leadId);
   const { server, machine } = await connectAndGetMachine(opts.machineId);
+  let wt = null;
   try {
     const sessions = await machine.listSessions();
     const lead = resolveSessionId(sessions, leadId);
     const standalone = !!opts.noWorktree;
     let childDir;
     let base = "";
-    let wt = null;
     if (standalone) {
       const dir = opts.directory;
       if (!dir) {
@@ -248,6 +283,13 @@ async function featureStart(brief, opts = {}) {
       ...opts.model ? { model: opts.model } : {}
     });
     if (result.type !== "success" || !result.sessionId) {
+      if (wt) {
+        try {
+          removeWorktree(wt.path);
+          console.error(`Cleaned up worktree ${wt.branch}.`);
+        } catch {
+        }
+      }
       console.error(`Failed to spawn feature child: ${result.errorMessage || result.type}`);
       process.exit(1);
     }
@@ -329,6 +371,15 @@ async function featureStart(brief, opts = {}) {
       console.log(`  branch: ${wt.branch}  (merges back to ${base})`);
     }
     console.log(judges.length ? `  gate:   ${judges.map((j) => j.type).join(" \u2192 ")} (oracle auto-approves \u2192 lead ${standalone ? "closes" : "merges"})` : `  gate:   none \u2014 child runs \`feature done\` when complete; lead ${standalone ? "detaches & closes" : "reviews & merges"}`);
+  } catch (e) {
+    if (wt) {
+      try {
+        removeWorktree(wt.path);
+        console.error(`Cleaned up worktree ${wt.branch} after error.`);
+      } catch {
+      }
+    }
+    throw e;
   } finally {
     await server.disconnect();
   }
@@ -506,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}
@@ -537,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);
     }
@@ -548,7 +612,8 @@ Resolve and run \`svamp feature done\` again.
         console.warn(`Merged, but could not archive child: ${e.message}`);
       }
     }
-    console.log(`\u2705 Merged ${branch} \u2192 ${base}; worktree removed; child ${childId.slice(0, 8)} ${opts.keepChild ? "kept" : "archived"}.`);
+    const cleanup = isMainWorkingTree(projectRoot, worktreePath) ? "ran in the lead tree (no worktree to remove)" : "worktree removed";
+    console.log(`\u2705 Merged ${branch} \u2192 ${base}; ${cleanup}; child ${childId.slice(0, 8)} ${opts.keepChild ? "kept" : "archived"}.`);
   } finally {
     await server.disconnect();
   }

package/dist/{commands-BjhpfRPs.mjs → commands-BCmpKBjg.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-DsAMQZUu.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-BtGnnEMI.mjs';
 import 'fs/promises';
 import 'url';
 import 'child_process';

package/dist/{commands-zkbQRqlq.mjs → commands-BpNDUqvv.mjs}

@@ -58,7 +58,7 @@ async function serviceExpose(args) {
     process.exit(1);
   }
   if (foreground) {
-    const { runFrpcTunnel } = await import('./frpc-C6yDezIg.mjs');
+    const { runFrpcTunnel } = await import('./frpc-QESvQN-s.mjs');
     await runFrpcTunnel(name, ports, void 0, {
       group,
       groupKey,
@@ -68,7 +68,7 @@ async function serviceExpose(args) {
     });
     return;
   }
-  const { connectAndGetMachine } = await import('./commands-E4FV1Mrf.mjs');
+  const { connectAndGetMachine } = await import('./commands-CE1PdEJJ.mjs');
   const { server, machine } = await connectAndGetMachine();
   try {
     const status = await machine.tunnelStart({
@@ -90,7 +90,7 @@ async function serviceExpose(args) {
         console.log(`  port ${port}: ${url}`);
       }
       if (process.env.SVAMP_SESSION_ID) {
-        const { autoAddSessionLink } = await import('./agentCommands-Bd7sTL72.mjs');
+        const { autoAddSessionLink } = await import('./agentCommands-fCsOp7ko.mjs');
         let added = 0;
         for (const [port, url] of urlEntries) {
           const label = urlEntries.length > 1 ? `${name}:${port}` : name;
@@ -136,7 +136,7 @@ async function serviceServe(args) {
     };
     process.on("SIGINT", cleanup);
     process.on("SIGTERM", cleanup);
-    const { runFrpcTunnel } = await import('./frpc-C6yDezIg.mjs');
+    const { runFrpcTunnel } = await import('./frpc-QESvQN-s.mjs');
     await runFrpcTunnel(name, [caddyPort]);
   } catch (err) {
     console.error(`Error serving directory: ${err.message}`);
@@ -145,7 +145,7 @@ async function serviceServe(args) {
 }
 async function serviceList(_args) {
   try {
-    const { connectAndGetMachine } = await import('./commands-E4FV1Mrf.mjs');
+    const { connectAndGetMachine } = await import('./commands-CE1PdEJJ.mjs');
     const { server, machine } = await connectAndGetMachine();
     try {
       const tunnels = await machine.tunnelList({});
@@ -185,7 +185,7 @@ async function serviceDelete(args) {
     process.exit(1);
   }
   try {
-    const { connectAndGetMachine } = await import('./commands-E4FV1Mrf.mjs');
+    const { connectAndGetMachine } = await import('./commands-CE1PdEJJ.mjs');
     const { server, machine } = await connectAndGetMachine();
     try {
       await machine.tunnelStop({ name });

package/dist/{commands-DwXWC_ka.mjs → commands-BzF6GzdR.mjs}

@@ -1,7 +1,7 @@
 import { execSync } from 'node:child_process';
 import { existsSync, readFileSync } from 'node:fs';
 import { join } from 'node:path';
-import { n as resolveProjectRoot, x as searchIssues, w as listIssues, p as resumeIssue, q as pauseIssue, t as addComment, u as updateIssue, o as getIssue, y as isVisibleTo, L as summarize, v as addIssue } from './run-DsAMQZUu.mjs';
+import { n as resolveProjectRoot, x as searchIssues, w as listIssues, p as resumeIssue, q as pauseIssue, t as addComment, u as updateIssue, o as getIssue, y as isVisibleTo, L as summarize, v as addIssue } from './run-BtGnnEMI.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';

package/dist/{commands-E4FV1Mrf.mjs → commands-CE1PdEJJ.mjs}

@@ -2,7 +2,7 @@ import { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import { execSync } from 'node:child_process';
 import { basename, resolve, join, isAbsolute } from 'node:path';
 import os from 'node:os';
-import { a2 as formatHandle, a3 as normalizeAllowedUser, a4 as loadSecurityContextConfig, a5 as resolveSecurityContext, a6 as buildSecurityContextFromFlags, a7 as mergeSecurityContexts, c as connectToHypha, a8 as buildSessionShareUrl, a9 as computeOutboundHop, k as shortId, aa as registerAwaitingReply, ab as buildMachineShareUrl, ac as parseHandle, ad as handleMatchesMetadata } from './run-DsAMQZUu.mjs';
+import { a2 as formatHandle, a3 as normalizeAllowedUser, a4 as loadSecurityContextConfig, a5 as resolveSecurityContext, a6 as buildSecurityContextFromFlags, a7 as mergeSecurityContexts, c as connectToHypha, a8 as buildSessionShareUrl, a9 as computeOutboundHop, k as shortId, aa as registerAwaitingReply, ab as buildMachineShareUrl, ac as parseHandle, ad as handleMatchesMetadata } from './run-BtGnnEMI.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';

package/dist/{commands-DSFK1j6n.mjs → commands-DNIxtTXe.mjs}

@@ -1,11 +1,11 @@
 import { writeFileSync, readFileSync } from 'fs';
 import { resolve } from 'path';
-import { connectAndGetMachine } from './commands-E4FV1Mrf.mjs';
+import { connectAndGetMachine } from './commands-CE1PdEJJ.mjs';
 import 'node:fs';
 import 'node:child_process';
 import 'node:path';
 import 'node:os';
-import './run-DsAMQZUu.mjs';
+import './run-BtGnnEMI.mjs';
 import 'os';
 import 'fs/promises';
 import 'url';

package/dist/{fleet-B_38I5pd.mjs → fleet-XYsLuf-3.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-DsAMQZUu.mjs';
+import { c as connectToHypha } from './run-BtGnnEMI.mjs';
 import { PINNED_CLAUDE_CODE_VERSION } from './pinnedClaudeCode-DuLXaoGP.mjs';
 import 'os';
 import 'fs/promises';

package/dist/{frpc-C6yDezIg.mjs → frpc-QESvQN-s.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-DsAMQZUu.mjs';
+import { h as getFrpsSubdomainHost, i as getFrpsServerPort, j as getFrpsServerAddr } from './run-BtGnnEMI.mjs';
 import 'fs/promises';
 import 'url';
 import 'node:crypto';

package/dist/{headlessCli-0He_Dybz.mjs → headlessCli-DuCmcrAL.mjs}

@@ -1,5 +1,5 @@
-import { a1 as resolveModel, ae as describeMisconfiguration, af as buildMachineDeps } from './run-DsAMQZUu.mjs';
-import { handleRealtimeEvent, initMachineVoiceSession } from './sideband-CQJ-0LbS.mjs';
+import { a1 as resolveModel, ae as describeMisconfiguration, af as buildMachineDeps } from './run-BtGnnEMI.mjs';
+import { handleRealtimeEvent, initMachineVoiceSession } from './sideband-C_ifGgde.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-DsAMQZUu.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-BtGnnEMI.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';

package/dist/{package-Dm1gKqm5.mjs → package-BA3c2JLu.mjs}

@@ -1,5 +1,5 @@
 var name = "svamp-cli";
-var version = "0.2.255";
+var version = "0.2.257";
 var description = "Svamp CLI — AI workspace daemon on Hypha Cloud";
 var author = "Amun AI AB";
 var license = "SEE LICENSE IN LICENSE";

package/dist/{rpc-D_d_zq8R.mjs → rpc-Bscxex4z.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-DsAMQZUu.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-BtGnnEMI.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';

package/dist/{rpc-BAhRday-.mjs → rpc-DCeDG4c7.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-DsAMQZUu.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-BtGnnEMI.mjs';
 import 'os';
 import 'fs/promises';
 import 'fs';

package/dist/{run-ClMTHM__.mjs → run-BmOCcZRG.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-DsAMQZUu.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-BtGnnEMI.mjs';
 import os from 'node:os';
 import { resolve, join } from 'node:path';
 import { existsSync, readFileSync, watch } from 'node:fs';