@staff0rd/assist 0.767.0 → 0.767.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.767.0",
+  version: "0.767.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -13696,8 +13696,8 @@ function subsequenceScore(text17, query) {
 function scoreFilePath(path106, query) {
   const needle = query.trim().toLowerCase();
   if (!needle) return 0;
-  const basename32 = path106.slice(path106.lastIndexOf("/") + 1);
-  const inBasename = subsequenceScore(basename32, needle);
+  const basename33 = path106.slice(path106.lastIndexOf("/") + 1);
+  const inBasename = subsequenceScore(basename33, needle);
   if (inBasename !== null) return BASENAME_WEIGHT + inBasename;
   return subsequenceScore(path106, needle);
 }
@@ -15211,12 +15211,9 @@ var attachmentMimeTypes = {
   "image/gif": "gif",
   "image/webp": "webp",
   "image/svg+xml": "svg",
-  "image/bmp": "bmp",
-  "image/avif": "avif",
   "video/mp4": "mp4",
   "video/webm": "webm",
-  "video/quicktime": "mov",
-  "video/ogg": "ogv"
+  "video/quicktime": "mov"
 };
 
 // src/commands/sessions/web/attachmentContentType.ts
@@ -16972,20 +16969,29 @@ function extensionFromMime(contentType) {
   const subtype = mime.split("/")[1]?.replace(/^x-/, "").replace(/\+.*$/, "");
   return subtype && /^[a-z0-9]+$/.test(subtype) ? subtype : void 0;
 }
+var ghAttachableExtensions = /* @__PURE__ */ new Set([
+  ...Object.values(attachmentMimeTypes),
+  "jpeg"
+]);
 function pickExtension(name, contentType) {
   const fromName = extname2(name).replace(/^\./, "").toLowerCase();
-  if (/^[a-z0-9]+$/.test(fromName)) return fromName;
-  return extensionFromMime(contentType) ?? "png";
+  const ext = /^[a-z0-9]+$/.test(fromName) ? fromName : extensionFromMime(contentType) ?? "png";
+  if (!ghAttachableExtensions.has(ext))
+    throw new Error(
+      `gh cannot attach .${ext} files (supported: ${[...ghAttachableExtensions].join(", ")}).`
+    );
+  return ext;
 }
 function safeBaseName(name) {
   const base = name.replace(/\.[^.]+$/, "").replace(/[^a-zA-Z0-9_-]+/g, "-");
   return base.replace(/^-+|-+$/g, "").slice(0, 60) || "screenshot";
 }
 async function stageAttachment(name, contentType, body) {
+  const ext = pickExtension(name, contentType);
   await mkdir4(stagedAttachmentsDir, { recursive: true });
   const dir = await mkdtemp(join41(stagedAttachmentsDir, "upload-"));
   const alt = safeBaseName(name);
-  const filePath = join41(dir, `${alt}.${pickExtension(name, contentType)}`);
+  const filePath = join41(dir, `${alt}.${ext}`);
   await writeFile2(filePath, body);
   return { dir, filePath, alt };
 }
@@ -24631,10 +24637,7 @@ async function reviewProposedIssue(title, body, metadata2 = []) {
 
 // src/commands/prs/attachArgs.ts
 function attachArgs(attachments) {
-  return attachments.flatMap(({ path: path106, alt }) => [
-    "--attach",
-    alt ? `${path106}#${alt}` : path106
-  ]);
+  return attachments.flatMap(({ path: path106 }) => ["--attach", path106]);
 }
 
 // src/commands/prs/runGhWithAttachments.ts
@@ -41014,7 +41017,7 @@ function requestDrain(socket, lines2) {
 }
 
 // src/commands/sessions/daemon/runDaemon.ts
-import { mkdirSync as mkdirSync37 } from "fs";
+import { mkdirSync as mkdirSync38 } from "fs";
 
 // src/commands/sessions/daemon/createAutoExit.ts
 var DEFAULT_GRACE_MS = 6e4;
@@ -41249,6 +41252,10 @@ function resizeSession(sessions, id, cols, rows, viewer = {}) {
   if (isInactiveViewer(s, viewer)) return;
   claimViewer(s, viewer, "resize");
   const unchanged = s.cols === cols && s.rows === rows;
+  if (!unchanged || viewer.claim)
+    daemonLog(
+      `session ${id} resize ${s.cols}x${s.rows} -> ${cols}x${rows} by ${viewer.viewerId ?? "unknown viewer"} on ${viewer.viewerNode ?? "unknown node"}${viewer.claim ? " (takeover)" : ""}`
+    );
   s.cols = cols;
   s.rows = rows;
   const resize = (c, r) => resizePty(s, c, r);
@@ -42719,10 +42726,37 @@ function startSessionTitleGeneration(session, notify2) {
   runSessionTitleGeneration(session, prompt, notify2, singleLineTitle(prompt));
 }
 
+// src/commands/sessions/daemon/worktree/appendWatcherLog.ts
+import { appendFileSync as appendFileSync3, mkdirSync as mkdirSync34 } from "fs";
+import { dirname as dirname42 } from "path";
+
+// src/commands/sessions/daemon/worktree/watcherLogPath.ts
+import { createHash as createHash4 } from "crypto";
+import { homedir as homedir26 } from "os";
+import { basename as basename29, join as join102 } from "path";
+function watcherLogPath(cwd) {
+  const clone = canonicalTreePath(cwd);
+  const key = createHash4("sha1").update(clone).digest("hex").slice(0, 8);
+  const dir = process.env.ASSIST_WATCHER_LOG_DIR ?? join102(homedir26(), ".assist", "watchers");
+  return join102(dir, `${basename29(clone) || "root"}-${key}.log`);
+}
+
+// src/commands/sessions/daemon/worktree/appendWatcherLog.ts
+function appendWatcherLog(session, data) {
+  if (session.watcher !== true || !session.cwd) return;
+  try {
+    const path106 = watcherLogPath(session.cwd);
+    mkdirSync34(dirname42(path106), { recursive: true });
+    appendFileSync3(path106, data);
+  } catch {
+  }
+}
+
 // src/commands/sessions/daemon/emitSessionOutput.ts
 var MAX_SCROLLBACK = 256 * 1024;
 function emitSessionOutput(session, clients, data) {
   session.scrollback += data;
+  appendWatcherLog(session, data);
   if (session.scrollback.length > MAX_SCROLLBACK) {
     session.scrollback = session.scrollback.slice(-MAX_SCROLLBACK);
   }
@@ -42795,8 +42829,8 @@ function handleRefusedRun(session, exitCode, onStatusChange) {
 }
 
 // src/commands/sessions/daemon/watchActivity.ts
-import { existsSync as existsSync90, mkdirSync as mkdirSync34, watch as watch2 } from "fs";
-import { dirname as dirname42 } from "path";
+import { existsSync as existsSync90, mkdirSync as mkdirSync35, watch as watch2 } from "fs";
+import { dirname as dirname43 } from "path";
 
 // src/commands/sessions/daemon/applyActivityToSession.ts
 function applyActivityToSession(session, activity2) {
@@ -42858,9 +42892,9 @@ var DEBOUNCE_MS2 = 50;
 function watchActivity(session, notify2, onClaudeSessionId) {
   if (session.commandType !== "assist" || !session.cwd) return;
   const path106 = activityPath(session.id);
-  const dir = dirname42(path106);
+  const dir = dirname43(path106);
   try {
-    mkdirSync34(dir, { recursive: true });
+    mkdirSync35(dir, { recursive: true });
   } catch {
     return;
   }
@@ -43064,10 +43098,10 @@ function headContainsSessionId(filePath, claudeSessionId) {
 }
 
 // src/commands/sessions/daemon/ensureProjectDirExists.ts
-import { mkdirSync as mkdirSync35 } from "fs";
+import { mkdirSync as mkdirSync36 } from "fs";
 function ensureProjectDirExists(dir, sessionId) {
   try {
-    mkdirSync35(dir, { recursive: true });
+    mkdirSync36(dir, { recursive: true });
     return true;
   } catch (error) {
     daemonLog(
@@ -44046,12 +44080,42 @@ function createAssistSession(id, assistArgs, cwd, meta, holdPty) {
   };
 }
 
+// src/commands/sessions/daemon/worktree/seedWatcherScrollback.ts
+import { readFileSync as readFileSync65, writeFileSync as writeFileSync54 } from "fs";
+var SCROLLBACK_TAIL = 256 * 1024;
+var MAX_LOG_SIZE = 4 * 1024 * 1024;
+function readLogTail2(path106) {
+  let log2;
+  try {
+    log2 = readFileSync65(path106, "utf8");
+  } catch {
+    return "";
+  }
+  if (log2.length > MAX_LOG_SIZE) {
+    log2 = log2.slice(-SCROLLBACK_TAIL);
+    writeFileSync54(path106, log2);
+    daemonLog(`watcher log ${path106} trimmed to its last ${log2.length} chars`);
+  }
+  return log2.slice(-SCROLLBACK_TAIL);
+}
+function seedWatcherScrollback(cwd, event) {
+  const path106 = watcherLogPath(cwd);
+  const history = readLogTail2(path106);
+  const note = watcherNote(`${event} at ${(/* @__PURE__ */ new Date()).toLocaleString()}`);
+  appendWatcherLog({ watcher: true, cwd }, note);
+  daemonLog(
+    `watcher in ${cwd} seeded with ${history.length} chars of history from ${path106} (${event})`
+  );
+  return history + note;
+}
+
 // src/commands/sessions/daemon/createWatcherSession.ts
 var WATCHER_ARGS = ["watch", "loop"];
 function createWatcherSession(id, cwd) {
   return {
     ...createAssistSession(id, WATCHER_ARGS, cwd),
-    watcher: true
+    watcher: true,
+    scrollback: seedWatcherScrollback(cwd, "watcher started")
   };
 }
 
@@ -45030,7 +45094,17 @@ function relaunchConsoleWatcher(id, persisted, base) {
   daemonLog(
     `relaunching watcher session ${id} running ${command.join(" ")} in ${persisted.cwd ?? "(no cwd)"}`
   );
-  return runningSession(base, persisted, spawnPty(command, persisted.cwd, id));
+  const session = runningSession(
+    base,
+    persisted,
+    spawnPty(command, persisted.cwd, id)
+  );
+  if (persisted.cwd)
+    session.scrollback = seedWatcherScrollback(
+      persisted.cwd,
+      "daemon restarted; watcher relaunched"
+    );
+  return session;
 }
 
 // src/commands/sessions/daemon/restoreSession.ts
@@ -45137,7 +45211,7 @@ function rearmStoppedSessions(sessions, notify2) {
 
 // src/commands/sessions/daemon/worktree/reconcileWorktreesOnRestore.ts
 import { existsSync as existsSync93 } from "fs";
-import { basename as basename30 } from "path";
+import { basename as basename31 } from "path";
 
 // src/commands/sessions/daemon/worktree/accountedTrees.ts
 function accountedTrees(sessions) {
@@ -45245,7 +45319,7 @@ function capped2(lines2) {
 }
 
 // src/commands/sessions/daemon/worktree/resurfaceOrphanedWorktree.ts
-import { basename as basename29 } from "path";
+import { basename as basename30 } from "path";
 function resurfaceOrphanedWorktree(sessions, spawnWith, recovered, notify2) {
   const { orphan, reason: reason4, held } = recovered;
   let id;
@@ -45268,7 +45342,7 @@ function orphanedSession(id, recovered) {
   const { orphan, reason: reason4, held } = recovered;
   return {
     ...sessionBase(id, "stopped"),
-    name: `recovered ${basename29(orphan.path)}`,
+    name: `recovered ${basename30(orphan.path)}`,
     subtitle: `${held.summary} in ${orphan.path}`,
     commandType: "claude",
     pty: null,
@@ -45329,7 +45403,7 @@ async function recoverOrphanedWorktrees(sessions, spawnWith, notify2) {
       logVanishedTree(sessions, path106);
       vanished.set(clone, [
         ...vanished.get(clone) ?? [],
-        { path: path106, branch: basename30(path106) }
+        { path: path106, branch: basename31(path106) }
       ]);
       continue;
     }
@@ -46449,8 +46523,8 @@ function resumeSession(id, sessionId, cwd, name, holdPty, harness) {
 import { existsSync as existsSync95 } from "fs";
 
 // src/commands/sessions/daemon/worktree/carryTranscriptToTree.ts
-import { copyFileSync as copyFileSync5, existsSync as existsSync94, mkdirSync as mkdirSync36 } from "fs";
-import { join as join103 } from "path";
+import { copyFileSync as copyFileSync5, existsSync as existsSync94, mkdirSync as mkdirSync37 } from "fs";
+import { join as join104 } from "path";
 function carryTranscriptToTree(claudeSessionId, fromCwd, toCwd) {
   const dir = projectDirForCwd(toCwd);
   if (dir === projectDirForCwd(fromCwd)) {
@@ -46459,7 +46533,7 @@ function carryTranscriptToTree(claudeSessionId, fromCwd, toCwd) {
     );
     return;
   }
-  const dest = join103(dir, `${claudeSessionId}.jsonl`);
+  const dest = join104(dir, `${claudeSessionId}.jsonl`);
   if (existsSync94(dest)) {
     daemonLog(`transcript ${claudeSessionId} already present in ${dir}`);
     return;
@@ -46472,7 +46546,7 @@ function carryTranscriptToTree(claudeSessionId, fromCwd, toCwd) {
     return;
   }
   try {
-    mkdirSync36(dir, { recursive: true });
+    mkdirSync37(dir, { recursive: true });
     copyFileSync5(source, dest);
     daemonLog(
       `transcript ${source} copied to ${dest} so ${toCwd} can resume it`
@@ -47347,10 +47421,10 @@ function handleConnection(socket, manager) {
 }
 
 // src/commands/sessions/daemon/onListening.ts
-import { unlinkSync as unlinkSync22, writeFileSync as writeFileSync54 } from "fs";
+import { unlinkSync as unlinkSync22, writeFileSync as writeFileSync55 } from "fs";
 
 // src/commands/sessions/daemon/startPidFileWatchdog.ts
-import { readFileSync as readFileSync65 } from "fs";
+import { readFileSync as readFileSync66 } from "fs";
 var WATCHDOG_INTERVAL_MS = 5e3;
 function startPidFileWatchdog(onLost, intervalMs = WATCHDOG_INTERVAL_MS) {
   const timer = setInterval(() => {
@@ -47361,7 +47435,7 @@ function startPidFileWatchdog(onLost, intervalMs = WATCHDOG_INTERVAL_MS) {
 }
 function ownsPidFile() {
   try {
-    return readFileSync65(daemonPaths.pid, "utf8").trim() === String(process.pid);
+    return readFileSync66(daemonPaths.pid, "utf8").trim() === String(process.pid);
   } catch {
     return false;
   }
@@ -47369,7 +47443,7 @@ function ownsPidFile() {
 
 // src/commands/sessions/daemon/onListening.ts
 function onListening(manager, checkAutoExit) {
-  writeFileSync54(daemonPaths.pid, String(process.pid));
+  writeFileSync55(daemonPaths.pid, String(process.pid));
   startPidFileWatchdog(() => {
     daemonLog("lost daemon.pid ownership; shutting down sessions and exiting");
     void manager.flushActiveMs().finally(() => {
@@ -47457,7 +47531,7 @@ async function recoverFromAddrInUse(server, manager, checkAutoExit) {
 
 // src/commands/sessions/daemon/runDaemon.ts
 async function runDaemon() {
-  mkdirSync37(daemonPaths.dir, { recursive: true });
+  mkdirSync38(daemonPaths.dir, { recursive: true });
   daemonLog(
     `starting (reason: ${process.env.ASSIST_DAEMON_SPAWN_REASON ?? "manual"})`
   );

package/package.json

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