@staff0rd/assist 0.625.0 → 0.626.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.625.0",
+  version: "0.626.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -13796,6 +13796,7 @@ function toPreviewDecision(msg) {
     reviewAfter: msg.reviewAfter === true,
     announceAfter: msg.announceAfter === true,
     draft: typeof msg.draft === "boolean" ? msg.draft : void 0,
+    autoMerge: msg.autoMerge === true,
     selection: toSelection(msg.selection)
   };
 }
@@ -26534,6 +26535,22 @@ function warn(reason4) {
   console.error(`Warning: could not chain sessions after raising: ${reason4}`);
 }
 
+// src/commands/prs/enableAutoMerge.ts
+import { execFileSync as execFileSync16 } from "child_process";
+function enableAutoMerge() {
+  try {
+    execFileSync16(
+      "gh",
+      ["pr", "merge", getCurrentBranch2(), "--auto", "--squash"],
+      { stdio: "inherit" }
+    );
+  } catch (error) {
+    console.error(
+      `Warning: could not enable auto-merge: ${error instanceof Error ? error.message : String(error)}`
+    );
+  }
+}
+
 // src/commands/prs/previewAndPlace.ts
 async function previewAndPlace(args) {
   const decision = await awaitPreviewApproval("PR preview", {
@@ -26547,6 +26564,7 @@ async function previewAndPlace(args) {
   const body = appendScreenshots(args.body, decision.screenshots ?? []);
   const options2 = decision.draft === void 0 ? args.options : { ...args.options, draft: decision.draft };
   await placePr(args.prNumber, args.title, body, options2);
+  if (decision.autoMerge === true) enableAutoMerge();
   await chainAfterRaise(args.prNumber, decision);
 }
 
@@ -33289,9 +33307,9 @@ function registerVoice(program2) {
 }
 
 // src/commands/watch/resolveUpstream.ts
-import { execFileSync as execFileSync16 } from "child_process";
+import { execFileSync as execFileSync17 } from "child_process";
 function runGit3(args, cwd) {
-  return execFileSync16("git", args, {
+  return execFileSync17("git", args, {
     encoding: "utf8",
     stdio: ["pipe", "pipe", "pipe"],
     cwd
@@ -33697,13 +33715,13 @@ import { spawn as spawn9 } from "child_process";
 import { existsSync as existsSync81 } from "fs";
 
 // src/commands/run/resolveCommand.ts
-import { execFileSync as execFileSync17 } from "child_process";
+import { execFileSync as execFileSync18 } from "child_process";
 import { existsSync as existsSync80 } from "fs";
 import { dirname as dirname37, join as join92, resolve as resolve20 } from "path";
 function resolveCommand2(command) {
   if (process.platform !== "win32" || command !== "bash") return command;
   try {
-    const gitPath = execFileSync17("where", ["git"], { encoding: "utf8" }).trim().split("\r\n")[0];
+    const gitPath = execFileSync18("where", ["git"], { encoding: "utf8" }).trim().split("\r\n")[0];
     const gitRoot = resolve20(dirname37(gitPath), "..");
     const gitBash = join92(gitRoot, "bin", "bash.exe");
     if (existsSync80(gitBash)) return gitBash;
@@ -33825,11 +33843,11 @@ async function reportSyncOrExit() {
 }
 
 // src/commands/watch/fetchQuietly.ts
-import { execFileSync as execFileSync18 } from "child_process";
+import { execFileSync as execFileSync19 } from "child_process";
 var MIN_FETCH_TIMEOUT_MS = 6e4;
 function fetchQuietly(cwd, intervalMs) {
   try {
-    execFileSync18("git", ["fetch", "--quiet"], {
+    execFileSync19("git", ["fetch", "--quiet"], {
       stdio: ["pipe", "pipe", "pipe"],
       cwd,
       timeout: Math.max(intervalMs, MIN_FETCH_TIMEOUT_MS)
@@ -34131,7 +34149,7 @@ async function auth() {
 }
 
 // src/commands/roam/postRoamActivity.ts
-import { execFileSync as execFileSync19 } from "child_process";
+import { execFileSync as execFileSync20 } from "child_process";
 import { readdirSync as readdirSync21, readFileSync as readFileSync60, statSync as statSync12 } from "fs";
 import { join as join93 } from "path";
 function findPortFile(roamDir) {
@@ -34170,7 +34188,7 @@ function postRoamActivity(app, event) {
   const pid = PID_BY_APP[app] ?? 99999;
   const url = `http://127.0.0.1:${port}/api/v1/activity/${app}/${event}?pid=${pid}`;
   try {
-    execFileSync19("curl", ["-sf", "--max-time", "0.2", "-X", "POST", url], {
+    execFileSync20("curl", ["-sf", "--max-time", "0.2", "-X", "POST", url], {
       stdio: "ignore"
     });
   } catch {
@@ -34648,11 +34666,11 @@ function screenshot(processName) {
 }
 
 // src/commands/sessions/daemon/listDaemonPids.ts
-import { execFileSync as execFileSync20 } from "child_process";
+import { execFileSync as execFileSync21 } from "child_process";
 function listDaemonPids() {
   if (process.platform === "win32") return [];
   try {
-    const out = execFileSync20("ps", ["-eo", "pid=,args="], {
+    const out = execFileSync21("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));
@@ -35875,7 +35893,7 @@ function decidePrPreview(sessions, waiters, notify2, d) {
   const commentCount = Array.isArray(d.comments) ? d.comments.length : 0;
   const screenshotCount = Array.isArray(d.screenshots) ? d.screenshots.length : 0;
   daemonLog(
-    `pr-decision received: id=${id} requestId=${requestId} decision=${d.decision} comments=${commentCount} screenshots=${screenshotCount} reviewAfter=${d.reviewAfter === true} announceAfter=${d.announceAfter === true} draft=${d.draft}`
+    `pr-decision received: id=${id} requestId=${requestId} decision=${d.decision} comments=${commentCount} screenshots=${screenshotCount} reviewAfter=${d.reviewAfter === true} announceAfter=${d.announceAfter === true} draft=${d.draft} autoMerge=${d.autoMerge === true}`
   );
   const waiter = waiters.get(id);
   if (waiter)
@@ -35889,7 +35907,8 @@ function decidePrPreview(sessions, waiters, notify2, d) {
       body: d.body,
       reviewAfter: d.reviewAfter,
       announceAfter: d.announceAfter,
-      draft: d.draft
+      draft: d.draft,
+      autoMerge: d.autoMerge
     });
   waiters.delete(id);
   session.pendingPrPreview = void 0;
@@ -40369,7 +40388,7 @@ function cleanupOwnedFiles() {
 import * as net3 from "net";
 
 // src/commands/sessions/daemon/findPortHolderPid.ts
-import { execFileSync as execFileSync21 } from "child_process";
+import { execFileSync as execFileSync22 } from "child_process";
 var PROBE_TIMEOUT_MS = 3e3;
 function findPortHolderPid(port) {
   try {
@@ -40379,7 +40398,7 @@ function findPortHolderPid(port) {
   }
 }
 function probe(command, args) {
-  return execFileSync21(command, args, {
+  return execFileSync22(command, args, {
     encoding: "utf8",
     timeout: PROBE_TIMEOUT_MS,
     stdio: ["ignore", "pipe", "ignore"]
@@ -40618,7 +40637,7 @@ function summaryPathFor(jsonlPath2) {
 }
 
 // src/commands/sessions/summarise/summariseSession.ts
-import { execFileSync as execFileSync22 } from "child_process";
+import { execFileSync as execFileSync23 } from "child_process";
 function summariseSession(jsonlPath2) {
   const firstMessage = extractFirstUserMessage(jsonlPath2);
   const backlogIds = scanSessionBacklogRefs(jsonlPath2);
@@ -40627,7 +40646,7 @@ function summariseSession(jsonlPath2) {
   }
   const prompt = buildPrompt6(firstMessage, backlogIds);
   try {
-    const output = execFileSync22("claude", ["-p", "--model", "haiku", prompt], {
+    const output = execFileSync23("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.625.0",
+	"version": "0.626.0",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {