@staff0rd/assist 0.490.1 → 0.490.3

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.490.1",
+  version: "0.490.3",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -28936,38 +28936,22 @@ function createRunSession(id, runName, runArgs, cwd, meta = serverRunMeta(runNam
   };
 }
 
-// src/commands/sessions/daemon/killPtyTree.ts
-function killPtyTree(pty2) {
-  if (process.platform === "win32") {
-    pty2.kill();
-    return;
+// src/commands/sessions/daemon/setStatus.ts
+function setStatus2(session, newStatus) {
+  const now = Date.now();
+  if (session.status === "running" && session.runningSince != null) {
+    session.runningMs += now - session.runningSince;
   }
-  try {
-    process.kill(-pty2.pid, "SIGHUP");
-  } catch {
-    try {
-      pty2.kill();
-    } catch {
-    }
+  session.runningSince = newStatus === "running" ? now : null;
+  session.waitingSince = newStatus === "waiting" ? now : null;
+  session.status = newStatus;
+  if (newStatus === "waiting") {
+    daemonLog(
+      `session ${session.id} waiting since ${new Date(now).toISOString()}`
+    );
   }
 }
 
-// src/commands/sessions/daemon/worktree/treeUnderClose.ts
-function treeUnderClose(session) {
-  if (session.worktree) return { path: session.worktree.path, removable: true };
-  if (session.cwd) return { path: session.cwd, removable: false };
-  return void 0;
-}
-
-// src/commands/sessions/daemon/worktree/otherTreeHolders.ts
-function otherTreeHolders(sessions, session) {
-  const tree = treeUnderClose(session)?.path;
-  if (!tree) return [];
-  return [...sessions.values()].filter(
-    (s) => s.id !== session.id && treeUnderClose(s)?.path === tree
-  );
-}
-
 // src/commands/sessions/daemon/worktree/reapWorktree.ts
 import { existsSync as existsSync64 } from "fs";
 import { basename as basename18 } from "path";
@@ -28982,10 +28966,11 @@ import { rm as rm2 } from "fs/promises";
 import { join as join74 } from "path";
 async function deleteTreeDirectly(clone, worktreePath, why) {
   if (holdsAGitDirectoryRatherThanALink(worktreePath)) {
+    const refusal = "it is a clone of its own, not a linked worktree";
     daemonLog(
-      `worktree ${worktreePath} not deleted directly (${why}): it is a clone of its own, not a linked worktree`
+      `worktree ${worktreePath} not deleted directly (${why}): ${refusal}`
     );
-    return false;
+    return { removed: false, reason: refusal };
   }
   daemonLog(`worktree ${worktreePath} deleting its directory directly: ${why}`);
   try {
@@ -28999,11 +28984,11 @@ async function deleteTreeDirectly(clone, worktreePath, why) {
     daemonLog(
       `worktree ${worktreePath} directory delete failed, left in place for the next reconcile: ${reason(error)}`
     );
-    return false;
+    return { removed: false, reason: reason(error) };
   }
   daemonLog(`worktree ${worktreePath} directory deleted directly`);
   await pruneBookkeeping(clone, worktreePath);
-  return true;
+  return { removed: true };
 }
 function holdsAGitDirectoryRatherThanALink(worktreePath) {
   return statSync12(join74(worktreePath, ".git"), {
@@ -29033,7 +29018,7 @@ async function deleteStrandedTree(clone, worktreePath, cause) {
     daemonLog(
       `worktree ${worktreePath} left in place for the next reconcile: ${reason2(cause)}`
     );
-    return false;
+    return { removed: false, reason: reason2(cause) };
   }
   return await deleteTreeDirectly(
     clone,
@@ -29062,7 +29047,7 @@ async function removeTree(clone, worktreePath, force) {
   ]);
   try {
     await remove2(force);
-    return true;
+    return { removed: true };
   } catch (error) {
     daemonLog(`worktree ${worktreePath} removal failed: ${reason3(error)}`);
     if (force)
@@ -29080,7 +29065,7 @@ async function removeIgnoringLeftovers(clone, remove2, worktreePath) {
     daemonLog(
       `worktree ${worktreePath} removed on retry; only ignored files remained, its work is landed`
     );
-    return true;
+    return { removed: true };
   } catch (error) {
     daemonLog(
       `worktree ${worktreePath} forced removal failed: ${reason3(error)}`
@@ -29095,23 +29080,27 @@ function reason3(error) {
 // src/commands/sessions/daemon/worktree/reapWorktree.ts
 async function reapWorktree(worktreePath, force = false) {
   if (!existsSync64(worktreePath)) {
-    daemonLog(`worktree ${worktreePath} already gone; skipping reap`);
-    return false;
+    forgetWorktree(worktreePath);
+    daemonLog(
+      `worktree ${worktreePath} already gone; its record was forgotten`
+    );
+    return { removed: true };
   }
   if (!force) {
     const durability = await checkDurability(worktreePath);
     if (!durability.durable) {
       daemonLog(`worktree ${worktreePath} not reaped: ${durability.reason}`);
-      return false;
+      return { removed: false, reason: durability.reason };
     }
   }
   stopInstall(worktreePath);
   const clone = owningClone(worktreePath);
-  if (!await removeTree(clone, worktreePath, force)) return false;
+  const removal = await removeTree(clone, worktreePath, force);
+  if (!removal.removed) return removal;
   await deleteWorktreeBranch(clone, basename18(worktreePath));
   forgetWorktree(worktreePath);
   daemonLog(`worktree ${worktreePath} reaped${force ? " (forced)" : ""}`);
-  return true;
+  return removal;
 }
 function owningClone(worktreePath) {
   const recorded = worktreeAttributionIncludingReaped(worktreePath)?.clone;
@@ -29137,6 +29126,63 @@ async function deleteWorktreeBranch(clone, branch2) {
   }
 }
 
+// src/commands/sessions/daemon/discardTree.ts
+async function discardTree(session, discarded, notify2) {
+  if (session.worktree) {
+    const removal = await reapWorktree(session.worktree.path, true);
+    if (!removal.removed) {
+      holdFailedDiscard(session, removal.reason, notify2);
+      return;
+    }
+    session.worktree = void 0;
+  }
+  discarded();
+}
+function holdFailedDiscard(session, reason4, notify2) {
+  daemonLog(
+    `session ${session.id} discard failed for ${session.worktree?.path}: ${reason4}; card kept so the workspace is not orphaned invisibly`
+  );
+  session.closing = void 0;
+  session.undurable = {
+    reason: `discard failed: ${reason4}`,
+    removesTree: true
+  };
+  setStatus2(session, "stopped");
+  notify2();
+}
+
+// src/commands/sessions/daemon/killPtyTree.ts
+function killPtyTree(pty2) {
+  if (process.platform === "win32") {
+    pty2.kill();
+    return;
+  }
+  try {
+    process.kill(-pty2.pid, "SIGHUP");
+  } catch {
+    try {
+      pty2.kill();
+    } catch {
+    }
+  }
+}
+
+// src/commands/sessions/daemon/worktree/treeUnderClose.ts
+function treeUnderClose(session) {
+  if (session.worktree) return { path: session.worktree.path, removable: true };
+  if (session.cwd) return { path: session.cwd, removable: false };
+  return void 0;
+}
+
+// src/commands/sessions/daemon/worktree/otherTreeHolders.ts
+function otherTreeHolders(sessions, session) {
+  const tree = treeUnderClose(session)?.path;
+  if (!tree) return [];
+  return [...sessions.values()].filter(
+    (s) => s.id !== session.id && treeUnderClose(s)?.path === tree
+  );
+}
+
 // src/commands/sessions/daemon/dismissSession.ts
 function dismissSession(sessions, id) {
   const s = sessions.get(id);
@@ -29185,22 +29231,6 @@ function closeGateApplies(sessions, session) {
   return worktreeConfigFor(session.cwd).enabled === true;
 }
 
-// src/commands/sessions/daemon/setStatus.ts
-function setStatus2(session, newStatus) {
-  const now = Date.now();
-  if (session.status === "running" && session.runningSince != null) {
-    session.runningMs += now - session.runningSince;
-  }
-  session.runningSince = newStatus === "running" ? now : null;
-  session.waitingSince = newStatus === "waiting" ? now : null;
-  session.status = newStatus;
-  if (newStatus === "waiting") {
-    daemonLog(
-      `session ${session.id} waiting since ${new Date(now).toISOString()}`
-    );
-  }
-}
-
 // src/commands/sessions/daemon/worktree/watchGitState.ts
 import { existsSync as existsSync65, watch } from "fs";
 var DEBOUNCE_MS = 500;
@@ -29297,19 +29327,13 @@ function dismissSessionGated(sessions, id, notify2, discard = false) {
   const removeCard = () => {
     if (dismissSession(sessions, id)) notify2();
   };
-  const discardWork = async () => {
-    if (s.worktree) {
-      await reapWorktree(s.worktree.path, true);
-      s.worktree = void 0;
-    }
-    removeCard();
-  };
+  const settle = discard ? () => void discardTree(s, removeCard, notify2) : () => void resolveCloseDurability(s, removeCard, notify2);
   s.closing = true;
   daemonLog(
     `session ${id} closing: ${discard ? "discarding" : "checking durability of"} ${tree.path}`
   );
   if (s.pty) {
-    s.pendingDismiss = discard ? () => void discardWork() : () => void resolveCloseDurability(s, removeCard, notify2);
+    s.pendingDismiss = settle;
     daemonLog(
       `session ${id} ${discard ? "discard" : "dismiss"} requested: killing process tree first`
     );
@@ -29318,8 +29342,7 @@ function dismissSessionGated(sessions, id, notify2, discard = false) {
     return;
   }
   notify2();
-  if (discard) void discardWork();
-  else void resolveCloseDurability(s, removeCard, notify2);
+  settle();
 }
 
 // src/commands/sessions/daemon/drainSessions.ts

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.490.1",
+	"version": "0.490.3",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {