@staff0rd/assist 0.414.0 → 0.415.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.414.0",
+  version: "0.415.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -220,15 +220,38 @@ function mergeDenyRules(globalDeny, projectDeny) {
   const globalOnly = globalDeny.filter((r) => !projectPatterns.has(r.pattern));
   return [...globalOnly, ...projectDeny];
 }
+function runKey(r) {
+  return typeof r.name === "string" ? r.name : void 0;
+}
+function mergeRunConfigs(globalRun, projectRun) {
+  if (!globalRun && !projectRun) return void 0;
+  if (!globalRun) return projectRun;
+  if (!projectRun) return globalRun;
+  const projectNames = new Set(
+    projectRun.map(runKey).filter((n) => n !== void 0)
+  );
+  const globalOnly = globalRun.filter((r) => {
+    const key = runKey(r);
+    return key === void 0 || !projectNames.has(key);
+  });
+  return [...globalOnly, ...projectRun];
+}
 function mergeRawConfigs(globalRaw, projectRaw) {
   const deny = mergeDenyRules(
     globalRaw.deny,
     projectRaw.deny
   );
+  const run4 = mergeRunConfigs(
+    globalRaw.run,
+    projectRaw.run
+  );
   const merged = { ...globalRaw, ...projectRaw };
   if (deny !== void 0) {
     merged.deny = deny;
   }
+  if (run4 !== void 0) {
+    merged.run = run4;
+  }
   const globalSubtasks = globalRaw.subtasks;
   const projectSubtasks = projectRaw.subtasks;
   if (globalSubtasks || projectSubtasks) {
@@ -3597,9 +3620,9 @@ function forbiddenStrings() {
     console.log("No forbidden-strings rules configured.");
     process.exit(0);
   }
-  const cache = /* @__PURE__ */ new Map();
+  const cache2 = /* @__PURE__ */ new Map();
   const readJson = (file) => {
-    if (cache.has(file)) return cache.get(file);
+    if (cache2.has(file)) return cache2.get(file);
     if (!existsSync12(file)) {
       console.log(`Forbidden-strings file not found: ${file}`);
       process.exit(1);
@@ -3611,7 +3634,7 @@ function forbiddenStrings() {
       console.log(`Could not parse ${file}: ${error.message}`);
       process.exit(1);
     }
-    cache.set(file, parsed);
+    cache2.set(file, parsed);
     return parsed;
   };
   const violations = findForbiddenStrings(rules, readJson);
@@ -8003,18 +8026,18 @@ import { dirname as dirname19, join as join22 } from "path";
 import { fileURLToPath as fileURLToPath4 } from "url";
 function createBundleHandler(importMetaUrl, bundlePath) {
   const dir = dirname19(fileURLToPath4(importMetaUrl));
-  let cache;
+  let cache2;
   return (req, res) => {
-    if (!cache) {
+    if (!cache2) {
       const body = readFileSync18(join22(dir, bundlePath), "utf8");
       const etag = `"${createHash("sha256").update(body).digest("hex").slice(0, 16)}"`;
-      cache = { body, etag };
+      cache2 = { body, etag };
     }
     const headers = {
-      ETag: cache.etag,
+      ETag: cache2.etag,
       "Cache-Control": "no-cache"
     };
-    if (req.headers["if-none-match"] === cache.etag) {
+    if (req.headers["if-none-match"] === cache2.etag) {
       res.writeHead(304, headers);
       res.end();
       return;
@@ -8023,7 +8046,7 @@ function createBundleHandler(importMetaUrl, bundlePath) {
       "Content-Type": "application/javascript",
       ...headers
     });
-    res.end(cache.body);
+    res.end(cache2.body);
   };
 }
 
@@ -8531,9 +8554,24 @@ function getCwdParam(req, res) {
   return cwd;
 }
 
+// src/commands/sessions/web/windowsCwdToWslPath.ts
+function windowsCwdToWslPath(cwd) {
+  const match = /^([A-Za-z]):[\\/](.*)$/.exec(cwd);
+  if (!match) return cwd;
+  const drive = match[1].toLowerCase();
+  const rest = match[2].replace(/\\/g, "/");
+  return `/mnt/${drive}/${rest}`;
+}
+
+// src/commands/sessions/web/toGitCwd.ts
+function toGitCwd(cwd) {
+  return detectPlatform() === "wsl" ? windowsCwdToWslPath(cwd) : cwd;
+}
+
 // src/commands/sessions/web/handleServerRuns.ts
-function getServerRuns(cwd) {
+function getServerRuns(rawCwd) {
   try {
+    const cwd = toGitCwd(rawCwd);
     const { run: run4 } = loadConfigFrom(cwd);
     return resolveRunConfigs(run4, getConfigDirFrom(cwd)).filter((r) => r.server).map((r) => ({ name: r.name, port: r.port }));
   } catch {
@@ -8565,20 +8603,6 @@ function findSynthesisForBranch(repoReviewsDir, branch2) {
   return synthesisFiles[0]?.path ?? null;
 }
 
-// src/commands/sessions/web/windowsCwdToWslPath.ts
-function windowsCwdToWslPath(cwd) {
-  const match = /^([A-Za-z]):[\\/](.*)$/.exec(cwd);
-  if (!match) return cwd;
-  const drive = match[1].toLowerCase();
-  const rest = match[2].replace(/\\/g, "/");
-  return `/mnt/${drive}/${rest}`;
-}
-
-// src/commands/sessions/web/toGitCwd.ts
-function toGitCwd(cwd) {
-  return detectPlatform() === "wsl" ? windowsCwdToWslPath(cwd) : cwd;
-}
-
 // src/commands/sessions/web/getReviewSynthesis.ts
 var execFileAsync2 = promisify2(execFile2);
 function runGit(cwd, args) {
@@ -8979,11 +9003,11 @@ var execFileAsync4 = promisify5(execFile4);
 var CACHE_TTL_MS = 3e4;
 function createCachedGhJson(args, parse3, fallback, options2 = {}) {
   const { cacheFallback = true } = options2;
-  const cache = /* @__PURE__ */ new Map();
+  const cache2 = /* @__PURE__ */ new Map();
   return async (cwd, extraArgs = []) => {
     const key = extraArgs.length ? `${cwd}\0${extraArgs.join("\0")}` : cwd;
     const now = Date.now();
-    const cached = cache.get(key);
+    const cached = cache2.get(key);
     if (cached && cached.expires > now) return cached.value;
     let value = fallback;
     try {
@@ -8996,7 +9020,7 @@ function createCachedGhJson(args, parse3, fallback, options2 = {}) {
       value = fallback;
     }
     if (cacheFallback || value !== fallback)
-      cache.set(key, { value, expires: now + CACHE_TTL_MS });
+      cache2.set(key, { value, expires: now + CACHE_TTL_MS });
     return value;
   };
 }
@@ -9196,22 +9220,22 @@ import { readFileSync as readFileSync21 } from "fs";
 import { createRequire as createRequire2 } from "module";
 var require3 = createRequire2(import.meta.url);
 function createCssHandler(packageEntry) {
-  let cache;
+  let cache2;
   return (req, res) => {
-    if (!cache) {
+    if (!cache2) {
       const resolved = require3.resolve(packageEntry);
       const body = readFileSync21(resolved, "utf8");
       const etag = `"${createHash2("sha256").update(body).digest("hex").slice(0, 16)}"`;
-      cache = { body, etag };
+      cache2 = { body, etag };
     }
-    const headers = { ETag: cache.etag, "Cache-Control": "no-cache" };
-    if (req.headers["if-none-match"] === cache.etag) {
+    const headers = { ETag: cache2.etag, "Cache-Control": "no-cache" };
+    if (req.headers["if-none-match"] === cache2.etag) {
       res.writeHead(304, headers);
       res.end();
       return;
     }
     res.writeHead(200, { "Content-Type": "text/css", ...headers });
-    res.end(cache.body);
+    res.end(cache2.body);
   };
 }
 
@@ -17723,20 +17747,20 @@ function resolveThread(threadId) {
   }
 }
 function requireCache(prNumber) {
-  const cache = loadCommentsCache(prNumber);
-  if (!cache) {
+  const cache2 = loadCommentsCache(prNumber);
+  if (!cache2) {
     console.error(
       `Error: No cached comments found for PR #${prNumber}. Run "assist prs list-comments" first.`
     );
     process.exit(1);
   }
-  return cache;
+  return cache2;
 }
 function findLineComment(comments3, commentId) {
   return comments3.find((c) => c.type === "line" && c.id === commentId);
 }
-function requireLineComment(cache, commentId) {
-  const comment3 = findLineComment(cache.comments, commentId);
+function requireLineComment(cache2, commentId) {
+  const comment3 = findLineComment(cache2.comments, commentId);
   if (!comment3 || comment3.type !== "line" || !comment3.threadId) {
     console.error(
       `Error: Comment #${commentId} not found or has no thread ID.`
@@ -17745,8 +17769,8 @@ function requireLineComment(cache, commentId) {
   }
   return comment3;
 }
-function cleanupCacheIfDone(cache, prNumber, commentId) {
-  const hasRemaining = cache.comments.some(
+function cleanupCacheIfDone(cache2, prNumber, commentId) {
+  const hasRemaining = cache2.comments.some(
     (c) => c.type === "line" && c.id !== commentId
   );
   if (!hasRemaining) deleteCommentsCache(prNumber);
@@ -17754,13 +17778,13 @@ function cleanupCacheIfDone(cache, prNumber, commentId) {
 function resolveCommentWithReply(commentId, message) {
   const prNumber = getCurrentPrNumber();
   const { org, repo } = getRepoInfo();
-  const cache = requireCache(prNumber);
-  const comment3 = requireLineComment(cache, commentId);
+  const cache2 = requireCache(prNumber);
+  const comment3 = requireLineComment(cache2, commentId);
   replyToComment(org, repo, prNumber, commentId, message);
   console.log("Reply posted successfully.");
   resolveThread(comment3.threadId);
   console.log("Thread resolved successfully.");
-  cleanupCacheIfDone(cache, prNumber, commentId);
+  cleanupCacheIfDone(cache2, prNumber, commentId);
 }
 
 // src/commands/prs/fixed.ts
@@ -24777,6 +24801,17 @@ function broadcast(clients, msg) {
   }
 }
 
+// src/commands/sessions/daemon/originForCwd.ts
+var cache = /* @__PURE__ */ new Map();
+function originForCwd(cwd) {
+  if (!cwd) return void 0;
+  const cached = cache.get(cwd);
+  if (cached !== void 0) return cached;
+  const origin = getCurrentOrigin(cwd);
+  cache.set(cwd, origin);
+  return origin;
+}
+
 // src/commands/sessions/daemon/toSessionInfo.ts
 function toSessionInfo({
   id,
@@ -24793,6 +24828,7 @@ function toSessionInfo({
   runArgs,
   server,
   serverPort,
+  serverOrigin,
   assistArgs,
   cwd,
   restored,
@@ -24820,6 +24856,7 @@ function toSessionInfo({
     runArgs,
     server,
     port: serverPort,
+    remoteOrigin: serverOrigin ?? originForCwd(cwd),
     assistArgs,
     cwd,
     restored,

package/package.json

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