@staff0rd/assist 0.574.0 → 0.575.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.574.0",
+  version: "0.575.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -4946,14 +4946,14 @@ function findRuleViolations(data, rule) {
   }
   return violations;
 }
-function findForbiddenStrings(rules2, readJson) {
-  return rules2.flatMap((rule) => findRuleViolations(readJson(rule.file), rule));
+function findForbiddenStrings(rules3, readJson) {
+  return rules3.flatMap((rule) => findRuleViolations(readJson(rule.file), rule));
 }
 
 // src/commands/verify/forbiddenStrings/index.ts
 function forbiddenStrings() {
-  const rules2 = loadConfig().forbiddenStrings ?? [];
-  if (rules2.length === 0) {
+  const rules3 = loadConfig().forbiddenStrings ?? [];
+  if (rules3.length === 0) {
     console.log("No forbidden-strings rules configured.");
     process.exit(0);
   }
@@ -4974,7 +4974,7 @@ function forbiddenStrings() {
     cache5.set(file, parsed);
     return parsed;
   };
-  const violations = findForbiddenStrings(rules2, readJson);
+  const violations = findForbiddenStrings(rules3, readJson);
   if (violations.length === 0) {
     console.log("No forbidden strings found.");
     process.exit(0);
@@ -13979,6 +13979,7 @@ function toPreviewDecision(msg) {
     reason: msg.reason,
     comments: Array.isArray(msg.comments) ? msg.comments : void 0,
     screenshots: Array.isArray(msg.screenshots) ? msg.screenshots : void 0,
+    body: typeof msg.body === "string" ? msg.body : void 0,
     reviewAfter: msg.reviewAfter === true,
     announceAfter: msg.announceAfter === true,
     draft: typeof msg.draft === "boolean" ? msg.draft : void 0
@@ -14029,7 +14030,7 @@ function requestPreviewDecision(request) {
 }
 
 // src/commands/sessions/shared/awaitPreviewApproval.ts
-async function awaitPreviewApproval(subject, request) {
+async function awaitPreviewApproval(subject, request, saveEditedBody) {
   console.log("Awaiting your approval in the assist web UI preview pane\u2026");
   let decision;
   try {
@@ -14040,6 +14041,7 @@ async function awaitPreviewApproval(subject, request) {
     );
     process.exit(1);
   }
+  if (decision.body !== void 0) saveEditedBody?.(decision.body);
   if (decision.decision === "reject") reportPreviewRejection(subject, decision);
   return decision;
 }
@@ -20797,6 +20799,11 @@ async function createIssue(options2) {
   }
 }
 
+// src/commands/sessions/shared/inWebSession.ts
+function inWebSession() {
+  return process.env.ASSIST_SESSION === "1" && !!process.env.ASSIST_SESSION_ID;
+}
+
 // src/commands/github/issue/fetchIssue.ts
 import { execFileSync as execFileSync8 } from "child_process";
 function fetchIssue2(number, repo) {
@@ -20835,20 +20842,48 @@ function pushIssueBody(number, repo, bodyPath) {
   }
 }
 
+// src/commands/github/issue/pushUnchangedIssue.ts
+function pushUnchangedIssue(number, repo, target, fetchedAt, bodyPath) {
+  if (fetchIssue2(number, repo).updatedAt !== fetchedAt) {
+    console.error(
+      `${target} was updated on GitHub after it was fetched. Nothing was pushed; the markdown is at ${bodyPath}`
+    );
+    process.exit(1);
+  }
+  pushIssueBody(number, repo, bodyPath);
+  console.log(`Issue body updated on ${target}`);
+}
+
 // src/commands/github/issue/reviewProposedIssueEdit.ts
 import { randomUUID as randomUUID9 } from "crypto";
-async function reviewProposedIssueEdit(title, body) {
+async function reviewProposedIssueEdit(title, body, saveEditedBody) {
   const sessionId = process.env.ASSIST_SESSION_ID;
-  if (process.env.ASSIST_SESSION !== "1" || !sessionId) return false;
-  await awaitPreviewApproval("GitHub issue edit preview", {
-    sessionId,
-    requestId: randomUUID9(),
-    title,
-    body,
-    prNumber: null,
-    kind: "github-issue-edit"
-  });
-  return true;
+  if (process.env.ASSIST_SESSION !== "1" || !sessionId) return body;
+  const decision = await awaitPreviewApproval(
+    "GitHub issue edit preview",
+    {
+      sessionId,
+      requestId: randomUUID9(),
+      title,
+      body,
+      prNumber: null,
+      kind: "github-issue-edit"
+    },
+    saveEditedBody
+  );
+  return decision.body ?? body;
+}
+
+// src/commands/github/issue/viewIssue.ts
+import { execFileSync as execFileSync10 } from "child_process";
+function viewIssue(number, repo) {
+  const args = ["issue", "view", String(number)];
+  if (repo) args.push("--repo", repo);
+  try {
+    execFileSync10("gh", args, { stdio: "inherit" });
+  } catch {
+    process.exit(1);
+  }
 }
 
 // src/commands/github/issue/writeIssueWorkingFile.ts
@@ -20885,18 +20920,16 @@ function slugFromUrl(url) {
   const match = /github\.com\/([^/]+\/[^/]+)\//.exec(url ?? "");
   return match ? match[1] : "unknown/unknown";
 }
-function abandon(reason4, bodyPath) {
-  console.error(
-    `${reason4}. Nothing was pushed; the markdown is at ${bodyPath}`
-  );
-  process.exit(1);
-}
 async function editIssue(numberArg, options2) {
   const number = Number.parseInt(numberArg, 10);
   if (!Number.isInteger(number) || number <= 0) {
     console.error(USAGE3);
     process.exit(1);
   }
+  if (!inWebSession()) {
+    viewIssue(number, options2.repo);
+    return;
+  }
   const issue = fetchIssue2(number, options2.repo);
   const slug = options2.repo ?? slugFromUrl(issue.url);
   const target = `${slug}#${number}`;
@@ -20905,26 +20938,19 @@ async function editIssue(numberArg, options2) {
     issue.title,
     issue.body
   );
-  const bodyPath = writeIssueWorkingFile(
-    slug,
-    number,
-    target,
-    issue.updatedAt,
-    issue.body
-  );
-  const reviewed = await reviewProposedIssueEdit(
+  const save = (markdown) => writeIssueWorkingFile(slug, number, target, issue.updatedAt, markdown);
+  const bodyPath = save(issue.body);
+  const edited = await reviewProposedIssueEdit(
     `Edit ${target}: ${issue.title}`,
-    issue.body
+    issue.body,
+    save
   );
-  if (!reviewed)
-    abandon(
-      `${target} can only be edited through the assist web preview pane`,
-      bodyPath
-    );
-  if (fetchIssue2(number, options2.repo).updatedAt !== issue.updatedAt)
-    abandon(`${target} was updated on GitHub after it was fetched`, bodyPath);
-  pushIssueBody(number, options2.repo, bodyPath);
-  console.log(`Issue body updated on ${target}`);
+  validateProposedContent(
+    { subject: "Issue", context: "GitHub issues" },
+    issue.title,
+    edited
+  );
+  pushUnchangedIssue(number, options2.repo, target, issue.updatedAt, bodyPath);
 }
 
 // src/commands/prs/readBodyArgument.ts
@@ -21342,7 +21368,7 @@ async function jiraAuth() {
 
 // src/commands/jira/viewIssue.ts
 import chalk163 from "chalk";
-function viewIssue(issueKey) {
+function viewIssue2(issueKey) {
   const parsed = fetchIssue(issueKey, "summary,description");
   const fields = parsed?.fields;
   const summary = fields?.summary;
@@ -21372,7 +21398,7 @@ function registerJira(program2) {
   const jiraCommand = program2.command("jira").description("Jira utilities");
   jiraCommand.command("auth").description("Authenticate with Jira via API token").action(() => jiraAuth());
   jiraCommand.command("ac <issue-key>").description("Print acceptance criteria for a Jira issue").action((issueKey) => acceptanceCriteria(issueKey));
-  jiraCommand.command("view <issue-key>").description("Print the title and description of a Jira issue").action((issueKey) => viewIssue(issueKey));
+  jiraCommand.command("view <issue-key>").description("Print the title and description of a Jira issue").action((issueKey) => viewIssue2(issueKey));
   configHelp(jiraCommand, jiraConfigHelp);
 }
 
@@ -21396,7 +21422,7 @@ function registerRefineLaunch(program2, resumeFlag) {
 import { randomUUID as randomUUID10 } from "crypto";
 
 // src/commands/review/checkoutPr.ts
-import { execFileSync as execFileSync11 } from "child_process";
+import { execFileSync as execFileSync12 } from "child_process";
 import chalk164 from "chalk";
 
 // src/commands/sessions/daemon/daemonLog.ts
@@ -21956,10 +21982,10 @@ async function moveToPrCheckoutTree() {
 }
 
 // src/commands/review/prHeadBranch.ts
-import { execFileSync as execFileSync10 } from "child_process";
+import { execFileSync as execFileSync11 } from "child_process";
 function prHeadBranch(number) {
   try {
-    const out = execFileSync10(
+    const out = execFileSync11(
       "gh",
       ["pr", "view", number, "--json", "headRefName", "-q", ".headRefName"],
       { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] }
@@ -22007,7 +22033,7 @@ async function checkoutPr(number) {
   if (headRef && moveToExistingCheckout(number, headRef)) return;
   await moveToPrCheckoutTree();
   try {
-    execFileSync11("gh", ["pr", "checkout", number], { stdio: "inherit" });
+    execFileSync12("gh", ["pr", "checkout", number], { stdio: "inherit" });
   } catch {
     console.error(chalk164.red(`gh pr checkout ${number} failed; aborting.`));
     process.exit(1);
@@ -23221,13 +23247,13 @@ ${screenshots.join("\n\n")}`;
 }
 
 // src/commands/prs/applyEdit.ts
-import { execFileSync as execFileSync12 } from "child_process";
+import { execFileSync as execFileSync13 } from "child_process";
 function applyEdit(number, title, body) {
   const args = ["pr", "edit", String(number)];
   if (title) args.push("--title", title);
   args.push("--body", body);
   try {
-    execFileSync12("gh", args, { stdio: "inherit" });
+    execFileSync13("gh", args, { stdio: "inherit" });
   } catch {
     process.exit(1);
   }
@@ -24023,7 +24049,7 @@ function buildValidatedBody(options2, usage) {
 }
 
 // src/commands/prs/placePr.ts
-import { execFileSync as execFileSync13 } from "child_process";
+import { execFileSync as execFileSync14 } from "child_process";
 
 // src/commands/prs/buildCreateArgs.ts
 function buildEditArgs(number, title, body) {
@@ -24090,7 +24116,7 @@ async function recordPrActivity() {
 // src/commands/prs/placePr.ts
 function hasUpstream2() {
   try {
-    execFileSync13(
+    execFileSync14(
       "git",
       ["rev-parse", "--abbrev-ref", "--symbolic-full-name", "@{u}"],
       { stdio: "pipe" }
@@ -24102,13 +24128,13 @@ function hasUpstream2() {
 }
 function ensureBranchPushed() {
   const args = hasUpstream2() ? ["push"] : ["push", "--set-upstream", "origin", "HEAD"];
-  execFileSync13("git", args, { stdio: "inherit" });
+  execFileSync14("git", args, { stdio: "inherit" });
 }
 async function placePr(prNumber, title, body, options2) {
   const args = prNumber !== null ? buildEditArgs(prNumber, title, body) : buildCreateArgs(title, body, options2);
   try {
     if (prNumber === null && !options2.head) ensureBranchPushed();
-    execFileSync13("gh", args, { stdio: "inherit" });
+    execFileSync14("gh", args, { stdio: "inherit" });
   } catch {
     process.exit(1);
   }
@@ -30358,9 +30384,9 @@ function registerVoice(program2) {
 import { join as join84 } from "path";
 
 // src/commands/watch/resolveUpstream.ts
-import { execFileSync as execFileSync14 } from "child_process";
+import { execFileSync as execFileSync15 } from "child_process";
 function runGit3(args, cwd) {
-  return execFileSync14("git", args, {
+  return execFileSync15("git", args, {
     encoding: "utf8",
     stdio: ["pipe", "pipe", "pipe"],
     cwd
@@ -30426,7 +30452,8 @@ function renderWatchReport({
   version: version2,
   commits: commits2,
   newShas,
-  restarts
+  restarts,
+  syncs
 }) {
   const isNew = new Set(newShas);
   const lines2 = [`**Version** ${version2}`, ""];
@@ -30445,6 +30472,10 @@ function renderWatchReport({
   lines2.push(
     ...restarts.length === 0 ? ["- none needed"] : restarts.map((restart) => `- ${restart}`)
   );
+  lines2.push("", "**Sync**", "");
+  lines2.push(
+    ...syncs.length === 0 ? ["- not needed"] : syncs.map((sync2) => `- ${sync2}`)
+  );
   return lines2.join("\n");
 }
 
@@ -30465,17 +30496,52 @@ function restartAdvice(paths) {
   return rules.filter((rule) => paths.some(rule.matches)).map((rule) => rule.advice);
 }
 
+// src/commands/watch/syncAdvice.ts
+var rules2 = [
+  {
+    matches: (path80) => path80.startsWith("claude/commands/"),
+    reason: "claude/commands changed"
+  },
+  {
+    matches: (path80) => path80.startsWith("claude/skills/"),
+    reason: "claude/skills changed"
+  },
+  {
+    matches: (path80) => path80 === "claude/settings.json",
+    reason: "claude/settings.json changed"
+  },
+  {
+    matches: (path80) => path80 === "claude/CLAUDE.md",
+    reason: "claude/CLAUDE.md changed"
+  },
+  {
+    matches: (path80) => path80 === "claude/design-system-prompt.md",
+    reason: "claude/design-system-prompt.md changed"
+  },
+  {
+    matches: (path80) => path80.startsWith("codex/"),
+    reason: "codex sources changed"
+  },
+  {
+    matches: (path80) => path80.startsWith("pi/"),
+    reason: "pi sources changed"
+  }
+];
+function syncAdvice(paths) {
+  return rules2.filter((rule) => paths.some(rule.matches)).map((rule) => rule.reason);
+}
+
 // src/commands/watch/buildWatchReport.ts
 var lines = (output) => output.split("\n").filter((line) => line.length > 0);
 function buildWatchReport(from, cwd) {
   const range = from ? `${from}..HEAD` : void 0;
+  const changed = range ? lines(runGit3(["diff", "--name-only", range], cwd)) : [];
   return renderWatchReport({
     version: readBuiltVersion(cwd),
     commits: readRecentCommits(10, cwd),
     newShas: range ? lines(runGit3(["rev-list", range], cwd)) : [],
-    restarts: restartAdvice(
-      range ? lines(runGit3(["diff", "--name-only", range], cwd)) : []
-    )
+    restarts: restartAdvice(changed),
+    syncs: syncAdvice(changed)
   });
 }
 
@@ -30721,13 +30787,13 @@ import { spawn as spawn9 } from "child_process";
 import { existsSync as existsSync69 } from "fs";
 
 // src/commands/run/resolveCommand.ts
-import { execFileSync as execFileSync15 } from "child_process";
+import { execFileSync as execFileSync16 } from "child_process";
 import { existsSync as existsSync68 } from "fs";
 import { dirname as dirname35, join as join85, resolve as resolve19 } from "path";
 function resolveCommand2(command) {
   if (process.platform !== "win32" || command !== "bash") return command;
   try {
-    const gitPath = execFileSync15("where", ["git"], { encoding: "utf8" }).trim().split("\r\n")[0];
+    const gitPath = execFileSync16("where", ["git"], { encoding: "utf8" }).trim().split("\r\n")[0];
     const gitRoot = resolve19(dirname35(gitPath), "..");
     const gitBash = join85(gitRoot, "bin", "bash.exe");
     if (existsSync68(gitBash)) return gitBash;
@@ -30824,11 +30890,11 @@ async function reportBuildOrExit(entry) {
 }
 
 // src/commands/watch/fetchQuietly.ts
-import { execFileSync as execFileSync16 } from "child_process";
+import { execFileSync as execFileSync17 } from "child_process";
 var MIN_FETCH_TIMEOUT_MS = 6e4;
 function fetchQuietly(cwd, intervalMs) {
   try {
-    execFileSync16("git", ["fetch", "--quiet"], {
+    execFileSync17("git", ["fetch", "--quiet"], {
       stdio: ["pipe", "pipe", "pipe"],
       cwd,
       timeout: Math.max(intervalMs, MIN_FETCH_TIMEOUT_MS)
@@ -30961,10 +31027,10 @@ function registerWatch(program2) {
     (options2) => watchWait(options2)
   );
   watchCommand.command("report").description(
-    "Print the built version, the last 10 commits as a markdown table, and the restarts the new commits make necessary"
+    "Print the built version, the last 10 commits as a markdown table, the restarts the new commits make necessary, and whether ~/.claude needs a sync"
   ).option(
     "--from <sha>",
-    "Mark commits reachable from HEAD but not <sha> as new, and derive restart advice from the files they changed"
+    "Mark commits reachable from HEAD but not <sha> as new, and derive the restart and sync advice from the files they changed"
   ).action((options2) => watchReport(options2));
 }
 
@@ -31128,7 +31194,7 @@ async function auth() {
 }
 
 // src/commands/roam/postRoamActivity.ts
-import { execFileSync as execFileSync17 } from "child_process";
+import { execFileSync as execFileSync18 } from "child_process";
 import { readdirSync as readdirSync20, readFileSync as readFileSync52, statSync as statSync11 } from "fs";
 import { join as join86 } from "path";
 function findPortFile(roamDir) {
@@ -31161,7 +31227,7 @@ function postRoamActivity(app, event) {
   }
   const url = `http://127.0.0.1:${port}/api/v1/activity/${app}/${event}?pid=${app === "codex" ? 99998 : 99999}`;
   try {
-    execFileSync17("curl", ["-sf", "--max-time", "0.2", "-X", "POST", url], {
+    execFileSync18("curl", ["-sf", "--max-time", "0.2", "-X", "POST", url], {
       stdio: "ignore"
     });
   } catch {
@@ -31637,11 +31703,11 @@ function screenshot(processName) {
 }
 
 // src/commands/sessions/daemon/listDaemonPids.ts
-import { execFileSync as execFileSync18 } from "child_process";
+import { execFileSync as execFileSync19 } from "child_process";
 function listDaemonPids() {
   if (process.platform === "win32") return [];
   try {
-    const out = execFileSync18("ps", ["-eo", "pid=,args="], {
+    const out = execFileSync19("ps", ["-eo", "pid=,args="], {
       encoding: "utf8"
     });
     return out.split("\n").filter((line) => line.includes("assist") && / daemon run\b/.test(line)).map((line) => Number.parseInt(line.trim(), 10)).filter((pid) => Number.isInteger(pid));
@@ -32875,6 +32941,7 @@ function decidePrPreview(sessions, waiters, notify2, d) {
       reason: d.reason,
       comments: d.comments,
       screenshots: d.screenshots,
+      body: d.body,
       reviewAfter: d.reviewAfter,
       announceAfter: d.announceAfter,
       draft: d.draft
@@ -37206,7 +37273,7 @@ function cleanupOwnedFiles() {
 import * as net3 from "net";
 
 // src/commands/sessions/daemon/findPortHolderPid.ts
-import { execFileSync as execFileSync19 } from "child_process";
+import { execFileSync as execFileSync20 } from "child_process";
 var PROBE_TIMEOUT_MS = 3e3;
 function findPortHolderPid(port) {
   try {
@@ -37216,7 +37283,7 @@ function findPortHolderPid(port) {
   }
 }
 function probe(command, args) {
-  return execFileSync19(command, args, {
+  return execFileSync20(command, args, {
     encoding: "utf8",
     timeout: PROBE_TIMEOUT_MS,
     stdio: ["ignore", "pipe", "ignore"]
@@ -37423,7 +37490,7 @@ function summaryPathFor(jsonlPath2) {
 }
 
 // src/commands/sessions/summarise/summariseSession.ts
-import { execFileSync as execFileSync20 } from "child_process";
+import { execFileSync as execFileSync21 } from "child_process";
 function summariseSession(jsonlPath2) {
   const firstMessage = extractFirstUserMessage(jsonlPath2);
   const backlogIds = scanSessionBacklogRefs(jsonlPath2);
@@ -37432,7 +37499,7 @@ function summariseSession(jsonlPath2) {
   }
   const prompt = buildPrompt6(firstMessage, backlogIds);
   try {
-    const output = execFileSync20("claude", ["-p", "--model", "haiku", prompt], {
+    const output = execFileSync21("claude", ["-p", "--model", "haiku", prompt], {
       encoding: "utf8",
       timeout: 3e4,
       stdio: ["ignore", "pipe", "ignore"]

package/package.json

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