@staff0rd/assist 0.541.1 → 0.542.0

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.541.1",
+  version: "0.542.0",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -20648,6 +20648,28 @@ async function reviewPrComments(number, options2 = {}) {
   await done2;
 }
 
+// src/commands/fixConflict.ts
+import { randomUUID as randomUUID7 } from "crypto";
+async function fixConflict(number) {
+  if (number) await checkoutPr(number);
+  const claudeSessionId = randomUUID7();
+  emitActivity({
+    kind: "command",
+    name: "fix-conflict",
+    claudeSessionId
+  });
+  const { done: done2 } = spawnClaude("/fix-conflict", {
+    permissionMode: "acceptEdits",
+    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));
+}
+
 // src/commands/registerLaunch.ts
 var RESUME_SESSION_FLAG = "Resume an interrupted Claude session (used by the sessions daemon on restart)";
 function registerNext(program2) {
@@ -20692,6 +20714,7 @@ function registerLaunch(program2) {
     "Launch Claude in /bug mode, chain into next on /next signal"
   );
   registerReviewPrComments(program2);
+  registerFixConflict(program2);
   registerRefineLaunch(program2, RESUME_SESSION_FLAG);
 }
 
@@ -21753,7 +21776,7 @@ function comment2(path73, line, body, startLine) {
 }
 
 // src/commands/prs/edit.ts
-import { randomUUID as randomUUID7 } from "crypto";
+import { randomUUID as randomUUID8 } from "crypto";
 
 // src/commands/prs/appendScreenshots.ts
 function appendScreenshots(body, screenshots) {
@@ -21967,7 +21990,7 @@ async function edit(options2) {
   if (process.env.ASSIST_SESSION === "1" && sessionId) {
     const decision = await awaitPreviewApproval("PR preview", {
       sessionId,
-      requestId: randomUUID7(),
+      requestId: randomUUID8(),
       title: options2.title ?? title,
       body: newBody,
       prNumber: number
@@ -22553,7 +22576,7 @@ async function placePr(prNumber, title, body, options2) {
 }
 
 // src/commands/prs/previewAndPlace.ts
-import { randomUUID as randomUUID8 } from "crypto";
+import { randomUUID as randomUUID9 } from "crypto";
 
 // src/commands/sessions/shared/requestSession.ts
 function parseIncoming(line, type) {
@@ -22688,7 +22711,7 @@ function warn(reason4) {
 async function previewAndPlace(args) {
   const decision = await awaitPreviewApproval("PR preview", {
     sessionId: args.sessionId,
-    requestId: randomUUID8(),
+    requestId: randomUUID9(),
     title: args.title,
     body: args.body,
     prNumber: args.prNumber
@@ -30427,7 +30450,7 @@ var ClientHub = class extends Set {
 };
 
 // src/commands/sessions/daemon/createSession.ts
-import { randomUUID as randomUUID9 } from "crypto";
+import { randomUUID as randomUUID10 } from "crypto";
 
 // src/commands/sessions/daemon/sessionBase.ts
 function sessionBase(id, status3) {
@@ -30618,7 +30641,7 @@ function spawnRun(opts) {
 function createSession(id, prompt, cwd, design, harness, holdPty) {
   if (harness && harness !== "claude")
     return createHarnessSession(id, harness, prompt, cwd, holdPty);
-  const claudeSessionId = randomUUID9();
+  const claudeSessionId = randomUUID10();
   return {
     ...sessionBase(id, prompt ? "running" : "waiting"),
     name: `Session ${id}`,
@@ -32449,7 +32472,7 @@ function assistResumeArgs(session) {
 }
 
 // src/commands/sessions/daemon/interactiveRespawnPlan.ts
-import { randomUUID as randomUUID10 } from "crypto";
+import { randomUUID as randomUUID11 } from "crypto";
 function interactiveRespawnPlan(session, resumes) {
   const { claudeSessionId, cwd, initialPrompt } = session;
   if (!resumes) return null;
@@ -32467,7 +32490,7 @@ function interactiveRespawnPlan(session, resumes) {
   return null;
 }
 function freshClaudePlan(session, prompt, cwd) {
-  const claudeSessionId = randomUUID10();
+  const claudeSessionId = randomUUID11();
   return {
     spawn: () => {
       session.claudeSessionId = claudeSessionId;
@@ -33270,10 +33293,10 @@ function startReusedRunPty(session, assistArgs, itemId2, hold, clients, onStatus
 }
 
 // src/commands/sessions/daemon/createWatcherSession.ts
-import { randomUUID as randomUUID11 } from "crypto";
+import { randomUUID as randomUUID12 } from "crypto";
 var WATCH_PROMPT = "/watch";
 function createWatcherSession(id, cwd) {
-  const claudeSessionId = randomUUID11();
+  const claudeSessionId = randomUUID12();
   return {
     ...sessionBase(id, "running"),
     name: `Session ${id}`,

package/package.json

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