@staff0rd/assist 0.542.0 → 0.543.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.542.0",
+  version: "0.543.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -8215,7 +8215,8 @@ function deriveHistoryFields(commandName, commandArgs, name) {
   return fields;
 }
 function deriveSessionType(commandName, name) {
-  if (commandName === "review-pr-comments") return "review";
+  if (commandName === "review-pr-comments" || commandName === "fix-conflict")
+    return "review";
   if (KNOWN.includes(commandName))
     return commandName;
   if (commandName || name) return "prompt";
@@ -20650,7 +20651,7 @@ async function reviewPrComments(number, options2 = {}) {
 
 // src/commands/fixConflict.ts
 import { randomUUID as randomUUID7 } from "crypto";
-async function fixConflict(number) {
+async function fixConflict(number, options2 = {}) {
   if (number) await checkoutPr(number);
   const claudeSessionId = randomUUID7();
   emitActivity({
@@ -20658,16 +20659,21 @@ async function fixConflict(number) {
     name: "fix-conflict",
     claudeSessionId
   });
-  const { done: done2 } = spawnClaude("/fix-conflict", {
-    permissionMode: "acceptEdits",
-    sessionId: claudeSessionId
-  });
+  const { done: done2 } = spawnClaude(
+    options2.rebase === true ? "/fix-conflict --rebase" : "/fix-conflict",
+    {
+      permissionMode: "auto",
+      sessionId: claudeSessionId
+    }
+  );
   await done2;
 }
 
 // src/commands/registerFixConflict.ts
 function registerFixConflict(program2) {
-  program2.command("fix-conflict").argument("[number]", "PR number to check out first").description("Launch Claude in /fix-conflict mode (single session)").action((number) => fixConflict(number));
+  program2.command("fix-conflict").argument("[number]", "PR number to check out first").option("--rebase", "Rebase onto the remote default instead of merging").description("Launch Claude in /fix-conflict mode (single session)").action(
+    (number, options2) => fixConflict(number, options2)
+  );
 }
 
 // src/commands/registerLaunch.ts
@@ -33400,7 +33406,11 @@ function isBacklogRunArgs(args) {
 }
 
 // src/commands/sessions/daemon/worktree/isPrCheckoutArgs.ts
-var CHECKOUT_COMMANDS = /* @__PURE__ */ new Set(["review", "review-pr-comments"]);
+var CHECKOUT_COMMANDS = /* @__PURE__ */ new Set([
+  "review",
+  "review-pr-comments",
+  "fix-conflict"
+]);
 function isPrCheckoutArgs(args) {
   const [command, ...rest] = args;
   if (!command || !CHECKOUT_COMMANDS.has(command)) return false;

package/package.json

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