@staff0rd/assist 0.546.1 → 0.547.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.546.1",
+  version: "0.547.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -16953,19 +16953,16 @@ function codexStatusFor(event, autoDecided) {
     return { status: "running", source: "prompt" };
   if (event === "PreToolUse") return { status: "running", source: "pretool" };
   if (event === "PostToolUse") return { status: "running", source: "posttool" };
-  if (event === "Stop") return { status: "waiting", source: "stop", ack: true };
+  if (event === "Stop") return { status: "waiting", source: "stop" };
   if (event !== "PermissionRequest") return void 0;
-  return autoDecided ? { status: "running", source: "permission" } : { status: "waiting", source: "permission", ack: true };
+  return autoDecided ? { status: "running", source: "permission" } : { status: "waiting", source: "permission" };
 }
 
 // src/commands/codexHook/reportCodexStatus.ts
 async function reportCodexStatus(event, autoDecided) {
   const report2 = codexStatusFor(event, autoDecided);
   if (!report2) return;
-  await setSessionStatus(report2.status, {
-    source: report2.source,
-    ack: report2.ack
-  });
+  await setSessionStatus(report2.status, { source: report2.source, ack: true });
 }
 
 // src/commands/codexHook/index.ts
@@ -30452,6 +30449,17 @@ function toSessionRunInfo({
   };
 }
 
+// src/commands/sessions/daemon/worktree/joinRefusal.ts
+import { existsSync as existsSync68 } from "fs";
+function joinRefusal(session) {
+  if (session.commandType === "run") return "a server run has no agent stream";
+  if (session.closing === true) return "the session is closing";
+  if (!session.cwd) return "the session has no working directory";
+  if (!existsSync68(session.cwd))
+    return "the session's workspace no longer exists";
+  return void 0;
+}
+
 // src/commands/sessions/daemon/toSessionInfo.ts
 function toSessionInfo(session) {
   const {
@@ -30496,7 +30504,8 @@ function toSessionInfo(session) {
     design,
     verifying,
     pendingPrPreview,
-    undurable
+    undurable,
+    joinable: joinRefusal(session) === void 0
   };
 }
 
@@ -30606,11 +30615,11 @@ function sessionBase(id, status3) {
 }
 
 // src/commands/sessions/daemon/spawnPty.ts
-import { existsSync as existsSync69 } from "fs";
+import { existsSync as existsSync70 } from "fs";
 import * as pty from "node-pty";
 
 // src/commands/sessions/daemon/ensureSpawnHelperExecutable.ts
-import { chmodSync, existsSync as existsSync68, statSync as statSync11 } from "fs";
+import { chmodSync, existsSync as existsSync69, statSync as statSync11 } from "fs";
 import { createRequire as createRequire3 } from "module";
 import path69 from "path";
 var require4 = createRequire3(import.meta.url);
@@ -30625,7 +30634,7 @@ function ensureSpawnHelperExecutable() {
     `${process.platform}-${process.arch}`,
     "spawn-helper"
   );
-  if (!existsSync68(helper)) return;
+  if (!existsSync69(helper)) return;
   const mode = statSync11(helper).mode;
   if ((mode & 73) === 0) chmodSync(helper, mode | 493);
 }
@@ -30661,7 +30670,7 @@ function spawnPty(args, cwd, sessionId, extraEnv) {
   });
 }
 function refuseMissingCwd(cwd, sessionId) {
-  if (!cwd || existsSync69(cwd)) return;
+  if (!cwd || existsSync70(cwd)) return;
   daemonLog(
     `${sessionId ? `session ${sessionId}` : "pty"} not spawned: working directory ${cwd} no longer exists`
   );
@@ -30830,11 +30839,11 @@ function setStatus2(session, newStatus) {
 }
 
 // src/commands/sessions/daemon/worktree/reapWorktree.ts
-import { existsSync as existsSync71 } from "fs";
+import { existsSync as existsSync72 } from "fs";
 import { basename as basename20 } from "path";
 
 // src/commands/sessions/daemon/worktree/deleteStrandedTree.ts
-import { existsSync as existsSync70 } from "fs";
+import { existsSync as existsSync71 } from "fs";
 import { join as join86 } from "path";
 
 // src/commands/sessions/daemon/worktree/deleteTreeDirectly.ts
@@ -30904,7 +30913,7 @@ async function deleteStrandedTree(clone, worktreePath, cause) {
   );
 }
 function strandedReason(worktreePath, cause) {
-  if (!existsSync70(join86(worktreePath, ".git")))
+  if (!existsSync71(join86(worktreePath, ".git")))
     return "its .git link is already gone";
   if (/not a working tree|not a git repository/i.test(reason2(cause)))
     return "git no longer recognises it as a working tree";
@@ -30956,7 +30965,7 @@ function reason3(error) {
 
 // src/commands/sessions/daemon/worktree/reapWorktree.ts
 async function reapWorktree(worktreePath, force = false) {
-  if (!existsSync71(worktreePath)) {
+  if (!existsSync72(worktreePath)) {
     forgetWorktree(worktreePath);
     daemonLog(
       `worktree ${worktreePath} already gone; its record was forgotten`
@@ -30981,7 +30990,7 @@ async function reapWorktree(worktreePath, force = false) {
 }
 function owningClone(worktreePath) {
   const recorded = worktreeAttributionIncludingReaped(worktreePath)?.clone;
-  if (recorded && existsSync71(recorded)) return recorded;
+  if (recorded && existsSync72(recorded)) return recorded;
   const detected = mainWorktree(worktreePath);
   if (detected) return detected;
   daemonLog(
@@ -31109,12 +31118,12 @@ function closeGateApplies(sessions, session) {
 }
 
 // src/commands/sessions/daemon/worktree/watchGitState.ts
-import { existsSync as existsSync72, watch } from "fs";
+import { existsSync as existsSync73, watch } from "fs";
 var DEBOUNCE_MS = 500;
 var POLL_MS = 3e4;
 function watchGitState(cwd, onChange) {
   const common = gitCommonDir(cwd);
-  if (!common || !existsSync72(common)) return void 0;
+  if (!common || !existsSync73(common)) return void 0;
   const watchers = [
     watchGitDir(common, onChange),
     pollGitState(cwd, onChange)
@@ -31559,10 +31568,10 @@ function emitSessionOutput(session, clients, data) {
 }
 
 // src/commands/sessions/daemon/exitReason.ts
-import { existsSync as existsSync73 } from "fs";
+import { existsSync as existsSync74 } from "fs";
 import { resolve as resolve20 } from "path";
 function exitDetail(session) {
-  if (session.cwd && !existsSync73(session.cwd))
+  if (session.cwd && !existsSync74(session.cwd))
     return `working directory ${session.cwd} no longer exists`;
   return missingRunConfigCwd(session);
 }
@@ -31576,7 +31585,7 @@ function missingRunConfigCwd(session) {
   const config = resolveRunConfig(session.runName, dir);
   if (!config?.cwd) return void 0;
   const configured = resolve20(runConfigBaseDirFrom(dir), config.cwd);
-  if (existsSync73(configured)) return void 0;
+  if (existsSync74(configured)) return void 0;
   return `run config "${config.name}": cwd ${configured} does not exist`;
 }
 
@@ -31617,7 +31626,7 @@ function handleFailedResume(session, exitCode, onStatusChange) {
 }
 
 // src/commands/sessions/daemon/watchActivity.ts
-import { existsSync as existsSync74, mkdirSync as mkdirSync31, watch as watch2 } from "fs";
+import { existsSync as existsSync75, mkdirSync as mkdirSync31, watch as watch2 } from "fs";
 import { dirname as dirname37 } from "path";
 
 // src/commands/sessions/daemon/applyActivityToSession.ts
@@ -31703,7 +31712,7 @@ function watchActivity(session, notify2, onClaudeSessionId) {
     if (timer) clearTimeout(timer);
     timer = setTimeout(read, DEBOUNCE_MS2);
   });
-  if (existsSync74(path73)) read();
+  if (existsSync75(path73)) read();
 }
 function refreshActivity(session) {
   if (session.commandType !== "assist" || !session.cwd) return;
@@ -33086,7 +33095,7 @@ function rearmStoppedSessions(sessions, notify2) {
 }
 
 // src/commands/sessions/daemon/worktree/reconcileWorktreesOnRestore.ts
-import { existsSync as existsSync77 } from "fs";
+import { existsSync as existsSync78 } from "fs";
 import { basename as basename22 } from "path";
 
 // src/commands/sessions/daemon/worktree/accountedTrees.ts
@@ -33176,9 +33185,9 @@ function capped(lines2) {
 }
 
 // src/commands/sessions/daemon/worktree/reclaimVanishedWorktrees.ts
-import { existsSync as existsSync76 } from "fs";
+import { existsSync as existsSync77 } from "fs";
 async function reclaimVanishedWorktrees(clone, paths) {
-  if (!existsSync76(clone)) {
+  if (!existsSync77(clone)) {
     for (const { path: path73 } of paths) forgetWorktree(path73);
     daemonLog(
       `clone ${clone} is gone; forgot ${paths.length} worktree record(s) it owned`
@@ -33285,7 +33294,7 @@ async function recoverOrphanedWorktrees(sessions, spawnWith, notify2) {
   const accounted = accountedTrees(sessions);
   const vanished = /* @__PURE__ */ new Map();
   for (const { path: path73, clone } of readWorktreeRegistry()) {
-    if (!existsSync77(path73)) {
+    if (!existsSync78(path73)) {
       logVanishedTree(sessions, path73);
       vanished.set(clone, [
         ...vanished.get(clone) ?? [],
@@ -33882,13 +33891,13 @@ async function defaultConnect() {
 }
 
 // src/commands/sessions/daemon/hasPersistedWindowsSessions.ts
-import { existsSync as existsSync78, readFileSync as readFileSync55 } from "fs";
+import { existsSync as existsSync79, readFileSync as readFileSync55 } from "fs";
 import { posix } from "path";
 function hasPersistedWindowsSessions() {
   const sessionsFile = windowsSessionsFileFromWsl();
   if (!sessionsFile) return false;
   try {
-    if (!existsSync78(sessionsFile)) return false;
+    if (!existsSync79(sessionsFile)) return false;
     const data = JSON.parse(readFileSync55(sessionsFile, "utf8"));
     return Array.isArray(data) && data.length > 0;
   } catch (error) {
@@ -34430,11 +34439,8 @@ var WindowsProxy = class {
 function joinableStream(sessions, targetId) {
   const target = sessions.get(targetId);
   if (!target) return { reason: "no such session" };
-  if (target.commandType === "run")
-    return { reason: "a server run has no agent stream" };
-  if (target.closing === true) return { reason: "the session is closing" };
-  if (!target.cwd) return { reason: "the session has no working directory" };
-  return { session: target };
+  const reason4 = joinRefusal(target);
+  return reason4 ? { reason: reason4 } : { session: target };
 }
 
 // src/commands/sessions/daemon/worktree/spawnIntoStream.ts
@@ -34468,7 +34474,7 @@ function addAgentToStream(ctx, targetId, prompt, harness) {
 }
 
 // src/commands/sessions/daemon/worktree/spawnInTree.ts
-import { existsSync as existsSync81 } from "fs";
+import { existsSync as existsSync82 } from "fs";
 
 // src/commands/sessions/daemon/createAssistSession.ts
 function createAssistSession(id, assistArgs, cwd, meta, holdPty) {
@@ -34520,10 +34526,10 @@ function resumeSession(id, sessionId, cwd, name, holdPty) {
 }
 
 // src/commands/sessions/daemon/worktree/resumeInReplacementTree.ts
-import { existsSync as existsSync80 } from "fs";
+import { existsSync as existsSync81 } from "fs";
 
 // src/commands/sessions/daemon/worktree/carryTranscriptToTree.ts
-import { copyFileSync as copyFileSync7, existsSync as existsSync79, mkdirSync as mkdirSync33 } from "fs";
+import { copyFileSync as copyFileSync7, existsSync as existsSync80, mkdirSync as mkdirSync33 } from "fs";
 import { join as join88 } from "path";
 function carryTranscriptToTree(claudeSessionId, fromCwd, toCwd) {
   const dir = projectDirForCwd(toCwd);
@@ -34534,7 +34540,7 @@ function carryTranscriptToTree(claudeSessionId, fromCwd, toCwd) {
     return;
   }
   const dest = join88(dir, `${claudeSessionId}.jsonl`);
-  if (existsSync79(dest)) {
+  if (existsSync80(dest)) {
     daemonLog(`transcript ${claudeSessionId} already present in ${dir}`);
     return;
   }
@@ -34578,7 +34584,7 @@ function resumeInReplacementTree(ctx, claudeSessionId, missingCwd, name) {
 }
 function cloneForReapedTree(missingCwd) {
   const clone = worktreeAttributionIncludingReaped(missingCwd)?.clone;
-  if (!clone || !existsSync80(clone))
+  if (!clone || !existsSync81(clone))
     throw new Error(
       `working directory no longer exists and no clone is recorded to re-allocate from: ${missingCwd}`
     );
@@ -34612,7 +34618,7 @@ function spawnAssistInTree(ctx, assistArgs, cwd, meta, context) {
   return id;
 }
 function resumeInTree(ctx, sessionId, cwd, name) {
-  if (!existsSync81(cwd))
+  if (!existsSync82(cwd))
     return resumeInReplacementTree(ctx, sessionId, cwd, name);
   const id = ctx.spawnWith((sid) => resumeSession(sid, sessionId, cwd, name));
   daemonLog(`session ${id} resuming ${sessionId} in ${cwd}`);
@@ -34945,9 +34951,9 @@ function safeParse2(line) {
 }
 
 // src/commands/sessions/daemon/repoDirExists.ts
-import { existsSync as existsSync82 } from "fs";
+import { existsSync as existsSync83 } from "fs";
 function repoDirExists(cwd) {
-  return existsSync82(toGitCwd(cwd));
+  return existsSync83(toGitCwd(cwd));
 }
 
 // src/commands/sessions/daemon/withRepoGroups.ts

package/package.json

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