@staff0rd/assist 0.557.1 → 0.557.3

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.557.1",
+  version: "0.557.3",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -9981,7 +9981,7 @@ import { existsSync as existsSync28, mkdirSync as mkdirSync11, readFileSync as r
 import { homedir as homedir12 } from "os";
 import { join as join26 } from "path";
 function getStoreDir() {
-  return join26(homedir12(), ".assist");
+  return process.env.ASSIST_STORE_DIR || join26(homedir12(), ".assist");
 }
 function getStorePath(filename) {
   return join26(getStoreDir(), filename);
@@ -34197,41 +34197,6 @@ function bindResumedWorktree(session, cwd, notify2) {
   notify2();
 }
 
-// src/commands/sessions/daemon/worktree/describeHeldWork.ts
-var MAX_ITEMS = 20;
-async function describeHeldWork(path77, reason4) {
-  if (reason4.startsWith("uncommitted")) return await changedFiles(path77);
-  if (reason4.startsWith("unpushed")) return await unpushedCommits(path77, reason4);
-  return { summary: reason4, items: [] };
-}
-async function changedFiles(path77) {
-  const status3 = await gitResult(path77, ["status", "--porcelain"]);
-  const lines2 = status3.ok ? nonEmptyLines(status3.out) : [];
-  return {
-    summary: `${lines2.length} uncommitted ${lines2.length === 1 ? "file" : "files"}`,
-    items: capped(lines2)
-  };
-}
-async function unpushedCommits(path77, reason4) {
-  const log2 = await gitResult(path77, ["log", "--oneline", "@{upstream}..HEAD"]);
-  if (!log2.ok) return { summary: reason4, items: [] };
-  const lines2 = nonEmptyLines(log2.out);
-  return {
-    summary: `${lines2.length} unpushed ${lines2.length === 1 ? "commit" : "commits"}`,
-    items: capped(lines2)
-  };
-}
-function nonEmptyLines(out) {
-  return out.split("\n").map((line) => line.trim()).filter((line) => line !== "");
-}
-function capped(lines2) {
-  if (lines2.length <= MAX_ITEMS) return lines2;
-  return [
-    ...lines2.slice(0, MAX_ITEMS),
-    `\u2026 and ${lines2.length - MAX_ITEMS} more`
-  ];
-}
-
 // src/commands/sessions/daemon/worktree/reclaimVanishedWorktrees.ts
 import { existsSync as existsSync78 } from "fs";
 async function reclaimVanishedWorktrees(clone, paths) {
@@ -34270,6 +34235,76 @@ async function reclaimBranch(clone, branch2) {
   }
 }
 
+// src/commands/sessions/daemon/worktree/logVanishedTree.ts
+function logVanishedTree(sessions, path77) {
+  const claimants = [...sessions.values()].filter(
+    (s) => s.cwd === path77 || s.worktree?.path === path77
+  );
+  if (claimants.length === 0) {
+    daemonLog(`worktree ${path77} gone from disk and unclaimed; reclaiming it`);
+    return;
+  }
+  for (const s of claimants)
+    daemonLog(
+      `session ${s.id} ("${s.name}") claims worktree ${path77}, which is gone from disk; reclaiming it`
+    );
+}
+
+// src/commands/sessions/daemon/worktree/underTempRoot.ts
+import { realpathSync as realpathSync3 } from "fs";
+import { tmpdir as tmpdir9 } from "os";
+import { sep as sep2 } from "path";
+function tempRoots() {
+  const raw = tmpdir9();
+  const roots = /* @__PURE__ */ new Set([raw]);
+  try {
+    roots.add(realpathSync3(raw));
+  } catch {
+    return [...roots];
+  }
+  return [...roots];
+}
+function underTempRoot(path77) {
+  return tempRoots().some(
+    (root) => path77.startsWith(root.endsWith(sep2) ? root : root + sep2)
+  );
+}
+
+// src/commands/sessions/daemon/worktree/describeHeldWork.ts
+var MAX_ITEMS = 20;
+async function describeHeldWork(path77, reason4) {
+  if (reason4.startsWith("uncommitted")) return await changedFiles(path77);
+  if (reason4.startsWith("unpushed")) return await unpushedCommits(path77, reason4);
+  return { summary: reason4, items: [] };
+}
+async function changedFiles(path77) {
+  const status3 = await gitResult(path77, ["status", "--porcelain"]);
+  const lines2 = status3.ok ? nonEmptyLines(status3.out) : [];
+  return {
+    summary: `${lines2.length} uncommitted ${lines2.length === 1 ? "file" : "files"}`,
+    items: capped(lines2)
+  };
+}
+async function unpushedCommits(path77, reason4) {
+  const log2 = await gitResult(path77, ["log", "--oneline", "@{upstream}..HEAD"]);
+  if (!log2.ok) return { summary: reason4, items: [] };
+  const lines2 = nonEmptyLines(log2.out);
+  return {
+    summary: `${lines2.length} unpushed ${lines2.length === 1 ? "commit" : "commits"}`,
+    items: capped(lines2)
+  };
+}
+function nonEmptyLines(out) {
+  return out.split("\n").map((line) => line.trim()).filter((line) => line !== "");
+}
+function capped(lines2) {
+  if (lines2.length <= MAX_ITEMS) return lines2;
+  return [
+    ...lines2.slice(0, MAX_ITEMS),
+    `\u2026 and ${lines2.length - MAX_ITEMS} more`
+  ];
+}
+
 // src/commands/sessions/daemon/worktree/resurfaceOrphanedWorktree.ts
 import { basename as basename22 } from "path";
 function resurfaceOrphanedWorktree(sessions, spawnWith, recovered, notify2) {
@@ -34318,19 +34353,21 @@ function recoveryNotice({ orphan, held }) {
   ].join("");
 }
 
-// src/commands/sessions/daemon/worktree/logVanishedTree.ts
-function logVanishedTree(sessions, path77) {
-  const claimants = [...sessions.values()].filter(
-    (s) => s.cwd === path77 || s.worktree?.path === path77
-  );
-  if (claimants.length === 0) {
-    daemonLog(`worktree ${path77} gone from disk and unclaimed; reclaiming it`);
+// src/commands/sessions/daemon/worktree/recoverOrphan.ts
+async function recoverOrphan(sessions, spawnWith, orphan, notify2) {
+  daemonLog(`worktree ${orphan.path} orphaned across restart; reconciling`);
+  const durability = await checkDurability(orphan.path);
+  if (durability.durable) {
+    await reapWorktree(orphan.path);
     return;
   }
-  for (const s of claimants)
-    daemonLog(
-      `session ${s.id} ("${s.name}") claims worktree ${path77}, which is gone from disk; reclaiming it`
-    );
+  const held = await describeHeldWork(orphan.path, durability.reason);
+  resurfaceOrphanedWorktree(
+    sessions,
+    spawnWith,
+    { orphan, reason: durability.reason, held },
+    notify2
+  );
 }
 
 // src/commands/sessions/daemon/worktree/reconcileWorktreesOnRestore.ts
@@ -34342,6 +34379,13 @@ async function recoverOrphanedWorktrees(sessions, spawnWith, notify2) {
   const accounted = accountedTrees(sessions);
   const vanished = /* @__PURE__ */ new Map();
   for (const { path: path77, clone } of readWorktreeRegistry()) {
+    if (underTempRoot(path77)) {
+      forgetWorktree(path77);
+      daemonLog(
+        `worktree ${path77} lies outside any project root; pruned from the registry rather than recovered`
+      );
+      continue;
+    }
     if (!existsSync79(path77)) {
       logVanishedTree(sessions, path77);
       vanished.set(clone, [
@@ -34356,21 +34400,6 @@ async function recoverOrphanedWorktrees(sessions, spawnWith, notify2) {
   for (const [clone, paths] of vanished)
     await reclaimVanishedWorktrees(clone, paths);
 }
-async function recoverOrphan(sessions, spawnWith, orphan, notify2) {
-  daemonLog(`worktree ${orphan.path} orphaned across restart; reconciling`);
-  const durability = await checkDurability(orphan.path);
-  if (durability.durable) {
-    await reapWorktree(orphan.path);
-    return;
-  }
-  const held = await describeHeldWork(orphan.path, durability.reason);
-  resurfaceOrphanedWorktree(
-    sessions,
-    spawnWith,
-    { orphan, reason: durability.reason, held },
-    notify2
-  );
-}
 
 // src/commands/sessions/daemon/restoreAllSessions.ts
 function restoreAllSessions(spawner, sessions, notify2) {

package/package.json

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