@staff0rd/assist 0.775.1 → 0.775.3

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.775.1",
+  version: "0.775.3",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -124,7 +124,7 @@ var package_default = {
 
 // src/commands/new/registerNew/newCli.ts
 import { execSync as execSync6 } from "child_process";
-import { basename as basename2, resolve as resolve6 } from "path";
+import { basename as basename3, resolve as resolve6 } from "path";
 
 // src/commands/verify/init.ts
 import chalk17 from "chalk";
@@ -1925,11 +1925,15 @@ import * as net from "net";
 
 // src/commands/sessions/daemon/daemonPaths.ts
 import { homedir as homedir2 } from "os";
-import { join as join9 } from "path";
+import { basename as basename2, join as join9 } from "path";
 var DAEMON_DIR = join9(homedir2(), ".assist", "daemon");
+function perUserWindowsPipe() {
+  const user = basename2(homedir2()).replace(/[^\w.-]/g, "_");
+  return String.raw`\\.\pipe\assist-sessions-daemon-${user}`;
+}
 var daemonPaths = {
   dir: DAEMON_DIR,
-  socket: process.platform === "win32" ? String.raw`\\.\pipe\assist-sessions-daemon` : join9(DAEMON_DIR, "daemon.sock"),
+  socket: process.platform === "win32" ? perUserWindowsPipe() : join9(DAEMON_DIR, "daemon.sock"),
   log: join9(DAEMON_DIR, "daemon.log"),
   pid: join9(DAEMON_DIR, "daemon.pid"),
   spawnLock: join9(DAEMON_DIR, "spawn.lock"),
@@ -2406,7 +2410,7 @@ program.parse();
 
 // src/commands/new/registerNew/newCli.ts
 async function newCli() {
-  const name = basename2(resolve6("."));
+  const name = basename3(resolve6("."));
   initGit();
   initPackageJson(name);
   console.log("Installing dependencies...");
@@ -2768,7 +2772,7 @@ function adviceContextFor(cwd) {
 
 // src/commands/advise/loadAdviceFragments.ts
 import { readdirSync, readFileSync as readFileSync12 } from "fs";
-import { basename as basename3, join as join13 } from "path";
+import { basename as basename4, join as join13 } from "path";
 
 // src/commands/advise/adviceDir.ts
 import { existsSync as existsSync17 } from "fs";
@@ -2809,7 +2813,7 @@ function parseAdviceFragment(name, content) {
 function loadAdviceFragments(dir = adviceDir()) {
   return readdirSync(dir).filter((file) => file.endsWith(".md")).sort().map(
     (file) => parseAdviceFragment(
-      basename3(file, ".md"),
+      basename4(file, ".md"),
       readFileSync12(join13(dir, file), "utf8")
     )
   );
@@ -7217,9 +7221,10 @@ function pullIfConfigured() {
     return;
   }
   try {
-    execSync15("git pull --ff-only", { stdio: "inherit" });
+    execSync15("git fetch", { stdio: "inherit" });
+    execSync15("git merge --ff-only @{u}", { stdio: "inherit" });
   } catch {
-    console.error(chalk59.red("git pull --ff-only failed; aborting."));
+    console.error(chalk59.red("git fast-forward to upstream failed; aborting."));
     process.exit(1);
   }
 }
@@ -7416,7 +7421,7 @@ function buildArgs(prompt, options2) {
 
 // src/commands/backlog/ensureStoryBranch.ts
 import { execSync as execSync18 } from "child_process";
-import { basename as basename5 } from "path";
+import { basename as basename6 } from "path";
 
 // src/commands/branch/createBranch.ts
 import { execSync as execSync17 } from "child_process";
@@ -7616,7 +7621,7 @@ function worktreeBranchInPlay() {
   const tree = linkedWorktree(process.cwd());
   if (!tree) return null;
   const head = currentBranch();
-  return head === basename5(tree.root) ? head : null;
+  return head === basename6(tree.root) ? head : null;
 }
 function currentBranch() {
   try {
@@ -13354,16 +13359,16 @@ function handleServerRuns(req, res) {
 import { execFile as execFile5 } from "child_process";
 import { readFileSync as readFileSync21 } from "fs";
 import { homedir as homedir14 } from "os";
-import { basename as basename11, join as join38 } from "path";
+import { basename as basename12, join as join38 } from "path";
 import { promisify as promisify5 } from "util";
 
 // src/commands/sessions/web/findSynthesisForBranch.ts
 import { existsSync as existsSync33, readdirSync as readdirSync5, statSync as statSync6 } from "fs";
-import { basename as basename10, dirname as dirname22, join as join37 } from "path";
+import { basename as basename11, dirname as dirname22, join as join37 } from "path";
 function findSynthesisForBranch(repoReviewsDir, branch2) {
   const branchKeyPath = join37(repoReviewsDir, `${branch2}-`);
   const parent = dirname22(branchKeyPath);
-  const branchPrefix = basename10(branchKeyPath);
+  const branchPrefix = basename11(branchKeyPath);
   if (!existsSync33(parent)) return null;
   const synthesisFiles = readdirSync5(parent).filter((name) => name.startsWith(branchPrefix)).map((name) => join37(parent, name, "synthesis.md")).filter((path106) => existsSync33(path106)).map((path106) => ({ path: path106, mtime: statSync6(path106).mtimeMs })).sort((a, b) => b.mtime - a.mtime);
   return synthesisFiles[0]?.path ?? null;
@@ -13387,7 +13392,7 @@ async function resolveSynthesisPath(cwd) {
     homedir14(),
     ".assist",
     "reviews",
-    basename11(repoRoot2)
+    basename12(repoRoot2)
   );
   return findSynthesisForBranch(repoReviewsDir, branch2);
 }
@@ -13746,8 +13751,8 @@ function subsequenceScore(text17, query) {
 function scoreFilePath(path106, query) {
   const needle = query.trim().toLowerCase();
   if (!needle) return 0;
-  const basename33 = path106.slice(path106.lastIndexOf("/") + 1);
-  const inBasename = subsequenceScore(basename33, needle);
+  const basename34 = path106.slice(path106.lastIndexOf("/") + 1);
+  const inBasename = subsequenceScore(basename34, needle);
   if (inBasename !== null) return BASENAME_WEIGHT + inBasename;
   return subsequenceScore(path106, needle);
 }
@@ -17116,7 +17121,7 @@ function stripAnsi(text17) {
 // src/commands/sessions/daemon/worktree/watcherLogPath.ts
 import { createHash as createHash2 } from "crypto";
 import { homedir as homedir16 } from "os";
-import { basename as basename12, join as join42 } from "path";
+import { basename as basename13, join as join42 } from "path";
 
 // src/commands/sessions/daemon/worktree/canonicalTreePath.ts
 import { realpathSync as realpathSync2 } from "fs";
@@ -17134,7 +17139,7 @@ function watcherLogPath(cwd) {
   const clone = canonicalTreePath(cwd);
   const key = createHash2("sha1").update(clone).digest("hex").slice(0, 8);
   const dir = process.env.ASSIST_WATCHER_LOG_DIR ?? join42(homedir16(), ".assist", "watchers");
-  return join42(dir, `${basename12(clone) || "root"}-${key}.log`);
+  return join42(dir, `${basename13(clone) || "root"}-${key}.log`);
 }
 
 // src/commands/sessions/web/updates/readUpdateHistory.ts
@@ -18325,7 +18330,7 @@ function registerBranch(program2) {
 }
 
 // src/commands/cliHook.ts
-import { basename as basename13 } from "path";
+import { basename as basename14 } from "path";
 
 // src/shared/splitCompound.ts
 import { parse } from "shell-quote";
@@ -19335,7 +19340,7 @@ async function cliHook() {
       logDeniedToolCall({
         tool: input.toolName,
         command: input.command,
-        repo: basename13(process.cwd()),
+        repo: basename14(process.cwd()),
         sessionId: process.env.CLAUDE_SESSION_ID,
         denyReason: decision.permissionDecisionReason
       });
@@ -21631,7 +21636,7 @@ function signPreflightProblem(source) {
 
 // src/commands/criteriaExtension/stageCriteriaExtension.ts
 import { cp as cp3, mkdir as mkdir5, readFile as readFile5, rm, writeFile as writeFile4 } from "fs/promises";
-import { basename as basename14, join as join55 } from "path";
+import { basename as basename15, join as join55 } from "path";
 
 // src/commands/criteriaExtension/stampManifestVersion.ts
 function stampManifestVersion(manifest, version2) {
@@ -21646,7 +21651,7 @@ async function stageCriteriaExtension(source, staging, version2) {
   await mkdir5(staging, { recursive: true });
   await cp3(source, staging, {
     recursive: true,
-    filter: (path106) => basename14(path106) !== "updates.json"
+    filter: (path106) => basename15(path106) !== "updates.json"
   });
   const manifest = join55(staging, "manifest.json");
   const stamped = stampManifestVersion(
@@ -22020,7 +22025,7 @@ function registerDeploy(program2) {
 
 // src/commands/devlog/list.ts
 import { execFileSync as execFileSync6 } from "child_process";
-import { basename as basename16 } from "path";
+import { basename as basename17 } from "path";
 
 // src/commands/devlog/loadBlogSkipDays.ts
 import { homedir as homedir22 } from "os";
@@ -22039,7 +22044,7 @@ import chalk146 from "chalk";
 
 // src/shared/getRepoName.ts
 import { existsSync as existsSync51, readFileSync as readFileSync33 } from "fs";
-import { basename as basename15, join as join60 } from "path";
+import { basename as basename16, join as join60 } from "path";
 function getRepoName() {
   const config = loadConfig();
   if (config.devlog?.name) {
@@ -22056,7 +22061,7 @@ function getRepoName() {
     } catch {
     }
   }
-  return basename15(process.cwd());
+  return basename16(process.cwd());
 }
 
 // src/commands/devlog/loadDevlogEntries.ts
@@ -22192,7 +22197,7 @@ function list2(options2) {
   const config = loadConfig();
   const days = options2.days ?? 30;
   const ignore3 = options2.ignore ?? config.devlog?.ignore ?? [];
-  const repoName = basename16(process.cwd());
+  const repoName = basename17(process.cwd());
   const skipDays = loadBlogSkipDays(repoName);
   const devlogEntries = loadDevlogEntries(repoName);
   const args = ["log"];
@@ -25114,7 +25119,7 @@ function attachArgs(attachments) {
 
 // src/commands/prs/runGhWithAttachments.ts
 import { execFileSync as execFileSync10 } from "child_process";
-import { basename as basename17 } from "path";
+import { basename as basename18 } from "path";
 
 // src/shared/removeStagedAttachments.ts
 import { rmSync as rmSync4 } from "fs";
@@ -25131,7 +25136,7 @@ function removeStagedAttachments(attachments) {
 var PLACED_URL = /https:\/\/\S+\/(pull|issues)\/\d+/;
 function reportPartialFailure(attachments, stderr) {
   const failed3 = attachments.filter(
-    ({ path: path106 }) => stderr.includes(path106) || stderr.includes(basename17(path106))
+    ({ path: path106 }) => stderr.includes(path106) || stderr.includes(basename18(path106))
   );
   const named = failed3.length > 0 ? failed3 : attachments;
   console.error(
@@ -25917,15 +25922,15 @@ function recentDaemonLogLines(includeRelayed = true) {
 
 // src/commands/sessions/daemon/worktree/createWorktree.ts
 import { existsSync as existsSync57 } from "fs";
-import { basename as basename19, dirname as dirname29 } from "path";
+import { basename as basename20, dirname as dirname29 } from "path";
 
 // src/commands/sessions/daemon/worktree/planAllocation.ts
-import { basename as basename18, join as join67 } from "path";
+import { basename as basename19, join as join67 } from "path";
 function planAllocation(clone, boundTreeRoots2) {
   return boundTreeRoots2.has(clone) ? "spill" : "primary";
 }
 function nextWorktreePath(clone, base, isTaken) {
-  const name = basename18(clone);
+  const name = basename19(clone);
   for (let n = 2; n < 1e3; n++) {
     const candidate = join67(base, `${name}-${n}`);
     if (!isTaken(candidate)) return candidate;
@@ -25963,7 +25968,7 @@ function createWorktree(clone, strategy, boundTreeRoots2, preferredPath) {
   const base = strategy.root ? expandTilde2(strategy.root) : dirname29(clone);
   const registered = new Set(listWorktreePaths(clone));
   const branches = new Set(listLocalBranches(clone));
-  const isTaken = (candidate) => registered.has(candidate) || existsSync57(candidate) || boundTreeRoots2.has(candidate) || branches.has(basename19(candidate));
+  const isTaken = (candidate) => registered.has(candidate) || existsSync57(candidate) || boundTreeRoots2.has(candidate) || branches.has(basename20(candidate));
   const path106 = preferredPath && !isTaken(preferredPath) ? preferredPath : nextWorktreePath(clone, base, isTaken);
   const start2 = worktreeStartPoint(clone, strategy.trunk);
   gitSync(clone, [
@@ -25971,13 +25976,13 @@ function createWorktree(clone, strategy, boundTreeRoots2, preferredPath) {
     "add",
     start2.track ? "--track" : "--no-track",
     "-b",
-    basename19(path106),
+    basename20(path106),
     path106,
     start2.ref
   ]);
   recordWorktree(path106, clone, getCurrentOrigin(clone));
   daemonLog(
-    start2.track ? `worktree allocated ${path106} (branch ${basename19(path106)} tracking ${start2.ref}) for clone ${clone}` : `worktree allocated ${path106} (branch ${basename19(path106)} off ${start2.ref}, no mainline tracking) for clone ${clone}`
+    start2.track ? `worktree allocated ${path106} (branch ${basename20(path106)} tracking ${start2.ref}) for clone ${clone}` : `worktree allocated ${path106} (branch ${basename20(path106)} off ${start2.ref}, no mainline tracking) for clone ${clone}`
   );
   return path106;
 }
@@ -26765,7 +26770,7 @@ import chalk175 from "chalk";
 
 // src/commands/mermaid/exportFile.ts
 import { readFileSync as readFileSync39, writeFileSync as writeFileSync32 } from "fs";
-import { basename as basename20, extname as extname3, resolve as resolve18 } from "path";
+import { basename as basename21, extname as extname3, resolve as resolve18 } from "path";
 import chalk174 from "chalk";
 
 // src/commands/mermaid/renderBlock.ts
@@ -26792,7 +26797,7 @@ async function renderBlock(krokiUrl, source) {
 async function exportFile(file, outDir, krokiUrl, onlyIndex) {
   const content = readFileSync39(file, "utf8");
   const blocks = extractMermaidBlocks(content);
-  const stem = basename20(file, extname3(file));
+  const stem = basename21(file, extname3(file));
   if (onlyIndex !== void 0) {
     if (onlyIndex < 1 || onlyIndex > blocks.length) {
       console.error(
@@ -34199,7 +34204,7 @@ function groupFilesByDirectory(files) {
 }
 
 // src/commands/review/highLevel/buildHighLevelTree.ts
-function basename21(path106) {
+function basename22(path106) {
   return path106.slice(path106.lastIndexOf("/") + 1);
 }
 function sum(nodes, key) {
@@ -34215,7 +34220,7 @@ function nodesOf(at2, prefix2) {
   const files = at2.files.map(
     (file) => ({
       kind: "file",
-      name: basename21(file.path),
+      name: basename22(file.path),
       ...file
     })
   );
@@ -36715,13 +36720,13 @@ ${annotateDiffWithLineNumbers(context.diff.trimEnd())}
 
 // src/commands/review/buildReviewPaths.ts
 import { homedir as homedir25 } from "os";
-import { basename as basename22, join as join83 } from "path";
+import { basename as basename23, join as join83 } from "path";
 function buildReviewPaths(repoRoot2, key) {
   const reviewDir = join83(
     homedir25(),
     ".assist",
     "reviews",
-    basename22(repoRoot2),
+    basename23(repoRoot2),
     key
   );
   return {
@@ -38908,7 +38913,7 @@ function list3() {
 
 // src/commands/transcript/move.ts
 import { existsSync as existsSync77, mkdirSync as mkdirSync32, renameSync as renameSync2, writeFileSync as writeFileSync50 } from "fs";
-import { basename as basename26, join as join97 } from "path";
+import { basename as basename27, join as join97 } from "path";
 
 // src/commands/transcript/convertVttToMarkdown.ts
 function convertVttToMarkdown(inputPath) {
@@ -38929,13 +38934,13 @@ function move(file, options2) {
     process.exit(1);
   }
   const { vttDir, transcriptsDir, summaryDir } = getTranscriptConfig();
-  const filename = basename26(file);
+  const filename = basename27(file);
   const sourcePath = join97(vttDir, filename);
   if (!existsSync77(sourcePath)) {
     console.error(`Error: VTT file not found: ${sourcePath}`);
     process.exit(1);
   }
-  const base = basename26(filename, ".vtt").replace(/ Transcription$/, "");
+  const base = basename27(filename, ".vtt").replace(/ Transcription$/, "");
   const outputName = `${date} ${base}.md`;
   const formattedDir = join97(transcriptsDir, client);
   mkdirSync32(formattedDir, { recursive: true });
@@ -38949,7 +38954,7 @@ function move(file, options2) {
 
 // src/commands/transcript/merge.ts
 import { existsSync as existsSync78, writeFileSync as writeFileSync51 } from "fs";
-import { basename as basename27 } from "path";
+import { basename as basename28 } from "path";
 
 // src/commands/transcript/failTranscript.ts
 function failTranscript(message3) {
@@ -39095,7 +39100,7 @@ function readSource3(file) {
   if (!existsSync78(file)) failTranscript(`VTT file not found: ${file}`);
   const cues = readCleanedCues(file);
   if (cues.length === 0) failTranscript(`no cues found in: ${file}`);
-  return { path: file, name: basename27(file), cues };
+  return { path: file, name: basename28(file), cues };
 }
 function wholePassages(sources) {
   return sources.map((source) => ({
@@ -39756,7 +39761,7 @@ function listMigrationFiles(dir) {
 
 // src/commands/verify/migrations/readBaselineMigrations.ts
 import { execSync as execSync63 } from "child_process";
-import { basename as basename28 } from "path";
+import { basename as basename29 } from "path";
 var MIGRATION_FILE3 = /^migration\d+[A-Za-z0-9]*\.ts$/;
 function readBaselineMigrations(repoRelativeDir, ref) {
   const baseline = /* @__PURE__ */ new Map();
@@ -39769,7 +39774,7 @@ function readBaselineMigrations(repoRelativeDir, ref) {
   } catch {
     return baseline;
   }
-  const paths = listing.split("\n").map((line) => line.trim()).filter(Boolean).filter((path106) => MIGRATION_FILE3.test(basename28(path106)));
+  const paths = listing.split("\n").map((line) => line.trim()).filter(Boolean).filter((path106) => MIGRATION_FILE3.test(basename29(path106)));
   for (const path106 of paths) {
     try {
       const content = execSync63(`git show "${ref}:${path106}"`, {
@@ -39777,7 +39782,7 @@ function readBaselineMigrations(repoRelativeDir, ref) {
         maxBuffer: 16 * 1024 * 1024,
         stdio: ["pipe", "pipe", "pipe"]
       });
-      baseline.set(basename28(path106), content);
+      baseline.set(basename29(path106), content);
     } catch {
     }
   }
@@ -42508,7 +42513,7 @@ function setStatus2(session, newStatus) {
 
 // src/commands/sessions/daemon/worktree/reapWorktree.ts
 import { existsSync as existsSync87 } from "fs";
-import { basename as basename29 } from "path";
+import { basename as basename30 } from "path";
 
 // src/commands/sessions/daemon/worktree/deleteStrandedTree.ts
 import { existsSync as existsSync86 } from "fs";
@@ -42651,7 +42656,7 @@ async function reapWorktree(worktreePath, force = false) {
   const clone = owningClone(worktreePath);
   const removal = await removeTree(clone, worktreePath, force);
   if (!removal.removed) return removal;
-  await deleteWorktreeBranch(clone, basename29(worktreePath));
+  await deleteWorktreeBranch(clone, basename30(worktreePath));
   forgetWorktree(worktreePath);
   daemonLog(`worktree ${worktreePath} reaped${force ? " (forced)" : ""}`);
   return removal;
@@ -45556,7 +45561,7 @@ function rearmStoppedSessions(sessions, notify2) {
 
 // src/commands/sessions/daemon/worktree/reconcileWorktreesOnRestore.ts
 import { existsSync as existsSync93 } from "fs";
-import { basename as basename31 } from "path";
+import { basename as basename32 } from "path";
 
 // src/commands/sessions/daemon/worktree/accountedTrees.ts
 function accountedTrees(sessions) {
@@ -45664,7 +45669,7 @@ function capped2(lines2) {
 }
 
 // src/commands/sessions/daemon/worktree/resurfaceOrphanedWorktree.ts
-import { basename as basename30 } from "path";
+import { basename as basename31 } from "path";
 function resurfaceOrphanedWorktree(sessions, spawnWith, recovered, notify2) {
   const { orphan, reason: reason4, held } = recovered;
   let id;
@@ -45687,7 +45692,7 @@ function orphanedSession(id, recovered) {
   const { orphan, reason: reason4, held } = recovered;
   return {
     ...sessionBase(id, "stopped"),
-    name: `recovered ${basename30(orphan.path)}`,
+    name: `recovered ${basename31(orphan.path)}`,
     subtitle: `${held.summary} in ${orphan.path}`,
     commandType: "claude",
     pty: null,
@@ -45748,7 +45753,7 @@ async function recoverOrphanedWorktrees(sessions, spawnWith, notify2) {
       logVanishedTree(sessions, path106);
       vanished.set(clone, [
         ...vanished.get(clone) ?? [],
-        { path: path106, branch: basename31(path106) }
+        { path: path106, branch: basename32(path106) }
       ]);
       continue;
     }

package/package.json

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