@mstar-harness/cli 3.6.0-alpha.3 → 3.6.0

package/dist/mstar-harness.js

@@ -6,22 +6,38 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
-  for (let key of __getOwnPropNames(mod))
-    if (!__hasOwnProp.call(to, key))
-      __defProp(to, key, {
-        get: () => mod[key],
-        enumerable: true
-      });
+  if (mod && typeof mod === "object" || typeof mod === "function") {
+    for (let key of __getOwnPropNames(mod))
+      if (!__hasOwnProp.call(to, key))
+        __defProp(to, key, {
+          get: __accessProp.bind(mod, key),
+          enumerable: true
+        });
+  }
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
 
-// ../../node_modules/cli-width/index.js
-var require_cli_width = __commonJS((exports, module) => {
+// ../../node_modules/.bun/cli-width@4.1.0/node_modules/cli-width/index.js
+var require_cli_width = __commonJS(function(exports, module) {
   module.exports = cliWidth;
   function normalizeOpts(options) {
     const defaultOpts = {
@@ -60,8 +76,8 @@ var require_cli_width = __commonJS((exports, module) => {
   }
 });
 
-// ../../node_modules/mute-stream/lib/index.js
-var require_lib = __commonJS((exports, module) => {
+// ../../node_modules/.bun/mute-stream@3.0.0/node_modules/mute-stream/lib/index.js
+var require_lib = __commonJS(function(exports, module) {
   var Stream = __require("stream");
 
   class MuteStream extends Stream {
@@ -180,8 +196,8 @@ var require_lib = __commonJS((exports, module) => {
   module.exports = MuteStream;
 });
 
-// ../../node_modules/picocolors/picocolors.js
-var require_picocolors = __commonJS((exports, module) => {
+// ../../node_modules/.bun/picocolors@1.1.1/node_modules/picocolors/picocolors.js
+var require_picocolors = __commonJS(function(exports, module) {
   var p = process || {};
   var argv = p.argv || [];
   var env = p.env || {};
@@ -250,8 +266,8 @@ var require_picocolors = __commonJS((exports, module) => {
   module.exports.createColors = createColors;
 });
 
-// ../../node_modules/commander/lib/error.js
-var require_error = __commonJS((exports) => {
+// ../../node_modules/.bun/commander@14.0.3/node_modules/commander/lib/error.js
+var require_error = __commonJS(function(exports) {
   class CommanderError extends Error {
     constructor(exitCode, code, message) {
       super(message);
@@ -274,8 +290,8 @@ var require_error = __commonJS((exports) => {
   exports.InvalidArgumentError = InvalidArgumentError;
 });
 
-// ../../node_modules/commander/lib/argument.js
-var require_argument = __commonJS((exports) => {
+// ../../node_modules/.bun/commander@14.0.3/node_modules/commander/lib/argument.js
+var require_argument = __commonJS(function(exports) {
   var { InvalidArgumentError } = require_error();
 
   class Argument {
@@ -354,8 +370,8 @@ var require_argument = __commonJS((exports) => {
   exports.humanReadableArgName = humanReadableArgName;
 });
 
-// ../../node_modules/commander/lib/help.js
-var require_help = __commonJS((exports) => {
+// ../../node_modules/.bun/commander@14.0.3/node_modules/commander/lib/help.js
+var require_help = __commonJS(function(exports) {
   var { humanReadableArgName } = require_argument();
 
   class Help {
@@ -711,8 +727,8 @@ ${itemIndentStr}`);
   exports.stripColor = stripColor;
 });
 
-// ../../node_modules/commander/lib/option.js
-var require_option = __commonJS((exports) => {
+// ../../node_modules/.bun/commander@14.0.3/node_modules/commander/lib/option.js
+var require_option = __commonJS(function(exports) {
   var { InvalidArgumentError } = require_error();
 
   class Option {
@@ -895,8 +911,8 @@ var require_option = __commonJS((exports) => {
   exports.DualOptions = DualOptions;
 });
 
-// ../../node_modules/commander/lib/suggestSimilar.js
-var require_suggestSimilar = __commonJS((exports) => {
+// ../../node_modules/.bun/commander@14.0.3/node_modules/commander/lib/suggestSimilar.js
+var require_suggestSimilar = __commonJS(function(exports) {
   var maxDistance = 3;
   function editDistance(a, b) {
     if (Math.abs(a.length - b.length) > maxDistance)
@@ -968,8 +984,8 @@ var require_suggestSimilar = __commonJS((exports) => {
   exports.suggestSimilar = suggestSimilar;
 });
 
-// ../../node_modules/commander/lib/command.js
-var require_command = __commonJS((exports) => {
+// ../../node_modules/.bun/commander@14.0.3/node_modules/commander/lib/command.js
+var require_command = __commonJS(function(exports) {
   var EventEmitter = __require("node:events").EventEmitter;
   var childProcess = __require("node:child_process");
   var path2 = __require("node:path");
@@ -1222,7 +1238,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
         this._exitCallback = (err) => {
           if (err.code !== "commander.executeSubCommandAsync") {
             throw err;
-          } else {}
+          }
         };
       }
       return this;
@@ -2323,8 +2339,8 @@ Expecting one of '${allowedValues.join("', '")}'`);
   exports.useColor = useColor;
 });
 
-// ../../node_modules/commander/index.js
-var require_commander = __commonJS((exports) => {
+// ../../node_modules/.bun/commander@14.0.3/node_modules/commander/index.js
+var require_commander = __commonJS(function(exports) {
   var { Argument } = require_argument();
   var { Command } = require_command();
   var { CommanderError, InvalidArgumentError } = require_error();
@@ -2343,8 +2359,8 @@ var require_commander = __commonJS((exports) => {
   exports.InvalidOptionArgumentError = InvalidArgumentError;
 });
 
-// ../../node_modules/picocolors/picocolors.js
-var require_picocolors2 = __commonJS((exports, module) => {
+// ../../node_modules/.bun/picocolors@1.1.1/node_modules/picocolors/picocolors.js
+var require_picocolors2 = __commonJS(function(exports, module) {
   var p = process || {};
   var argv = p.argv || [];
   var env = p.env || {};
@@ -2415,10 +2431,10 @@ var require_picocolors2 = __commonJS((exports, module) => {
 
 // src/index.ts
 import { execFileSync as execFileSync10 } from "child_process";
+import { createHash, randomUUID as randomUUID3 } from "crypto";
 import fs8 from "fs";
 import path12 from "path";
-
-// ../../node_modules/@inquirer/core/dist/lib/key.js
+// ../../node_modules/.bun/@inquirer+core@12.0.2+1c220d1d55e2409f/node_modules/@inquirer/core/dist/lib/key.js
 var keybindings = ["emacs", "vim"];
 var keybindingLookup = new Set(keybindings);
 function isKeybinding(value) {
@@ -2435,7 +2451,7 @@ var isDownKey = (key, keybindings2 = []) => key.name === "down" || keybindings2.
 var isBackspaceKey = (key) => key.name === "backspace";
 var isNumberKey = (key) => "1234567890".includes(key.name);
 var isEnterKey = (key) => key.name === "enter" || key.name === "return";
-// ../../node_modules/@inquirer/core/dist/lib/errors.js
+// ../../node_modules/.bun/@inquirer+core@12.0.2+1c220d1d55e2409f/node_modules/@inquirer/core/dist/lib/errors.js
 class AbortPromptError extends Error {
   name = "AbortPromptError";
   message = "Prompt was aborted";
@@ -2461,10 +2477,10 @@ class HookError extends Error {
 class ValidationError extends Error {
   name = "ValidationError";
 }
-// ../../node_modules/@inquirer/core/dist/lib/use-state.js
+// ../../node_modules/.bun/@inquirer+core@12.0.2+1c220d1d55e2409f/node_modules/@inquirer/core/dist/lib/use-state.js
 import { AsyncResource as AsyncResource2 } from "node:async_hooks";
 
-// ../../node_modules/@inquirer/core/dist/lib/hook-engine.js
+// ../../node_modules/.bun/@inquirer+core@12.0.2+1c220d1d55e2409f/node_modules/@inquirer/core/dist/lib/hook-engine.js
 import { AsyncLocalStorage, AsyncResource } from "node:async_hooks";
 var hookStorage = new AsyncLocalStorage;
 function createStore(rl) {
@@ -2569,7 +2585,7 @@ var effectScheduler = {
   }
 };
 
-// ../../node_modules/@inquirer/core/dist/lib/use-state.js
+// ../../node_modules/.bun/@inquirer+core@12.0.2+1c220d1d55e2409f/node_modules/@inquirer/core/dist/lib/use-state.js
 function isFactory(value) {
   return typeof value === "function";
 }
@@ -2578,7 +2594,7 @@ function isReducer(value) {
 }
 function useState(defaultValue) {
   return withPointer((pointer) => {
-    const setState = AsyncResource2.bind(function setState(newValue) {
+    const setState = AsyncResource2.bind(function setState2(newValue) {
       const currentValue = pointer.get();
       const nextValue = isReducer(newValue) ? newValue(currentValue) : newValue;
       if (!Object.is(currentValue, nextValue)) {
@@ -2595,7 +2611,7 @@ function useState(defaultValue) {
   });
 }
 
-// ../../node_modules/@inquirer/core/dist/lib/use-effect.js
+// ../../node_modules/.bun/@inquirer+core@12.0.2+1c220d1d55e2409f/node_modules/@inquirer/core/dist/lib/use-effect.js
 function useEffect(cb, depArray) {
   withPointer((pointer) => {
     const oldDeps = pointer.get();
@@ -2607,10 +2623,10 @@ function useEffect(cb, depArray) {
   });
 }
 
-// ../../node_modules/@inquirer/core/dist/lib/theme.js
+// ../../node_modules/.bun/@inquirer+core@12.0.2+1c220d1d55e2409f/node_modules/@inquirer/core/dist/lib/theme.js
 import { styleText } from "node:util";
 
-// ../../node_modules/@inquirer/figures/dist/index.js
+// ../../node_modules/.bun/@inquirer+figures@2.0.9/node_modules/@inquirer/figures/dist/index.js
 import process2 from "node:process";
 function isUnicodeSupported() {
   if (!process2.platform.startsWith("win")) {
@@ -2899,7 +2915,7 @@ var figures = shouldUseMain ? mainSymbols : fallbackSymbols;
 var dist_default = figures;
 var replacements = Object.entries(specialMainSymbols);
 
-// ../../node_modules/@inquirer/core/dist/lib/theme.js
+// ../../node_modules/.bun/@inquirer+core@12.0.2+1c220d1d55e2409f/node_modules/@inquirer/core/dist/lib/theme.js
 var defaultTheme = {
   prefix: {
     idle: styleText("blue", "?"),
@@ -2927,7 +2943,7 @@ function getDefaultTheme() {
   };
 }
 
-// ../../node_modules/@inquirer/core/dist/lib/make-theme.js
+// ../../node_modules/.bun/@inquirer+core@12.0.2+1c220d1d55e2409f/node_modules/@inquirer/core/dist/lib/make-theme.js
 function isPlainObject(value) {
   if (typeof value !== "object" || value === null)
     return false;
@@ -2955,7 +2971,7 @@ function makeTheme(...themes) {
   return deepMerge(...themesToMerge);
 }
 
-// ../../node_modules/@inquirer/core/dist/lib/use-prefix.js
+// ../../node_modules/.bun/@inquirer+core@12.0.2+1c220d1d55e2409f/node_modules/@inquirer/core/dist/lib/use-prefix.js
 function usePrefix({ status = "idle", theme }) {
   const [showLoader, setShowLoader] = useState(false);
   const [tick, setTick] = useState(0);
@@ -2985,7 +3001,7 @@ function usePrefix({ status = "idle", theme }) {
   const iconName = status === "loading" ? "idle" : status;
   return typeof prefix === "string" ? prefix : prefix[iconName] ?? prefix["idle"];
 }
-// ../../node_modules/@inquirer/core/dist/lib/use-memo.js
+// ../../node_modules/.bun/@inquirer+core@12.0.2+1c220d1d55e2409f/node_modules/@inquirer/core/dist/lib/use-memo.js
 function useMemo(fn, dependencies) {
   return withPointer((pointer) => {
     const prev = pointer.get();
@@ -2997,11 +3013,11 @@ function useMemo(fn, dependencies) {
     return prev.value;
   });
 }
-// ../../node_modules/@inquirer/core/dist/lib/use-ref.js
+// ../../node_modules/.bun/@inquirer+core@12.0.2+1c220d1d55e2409f/node_modules/@inquirer/core/dist/lib/use-ref.js
 function useRef(val) {
   return useState({ current: val })[0];
 }
-// ../../node_modules/@inquirer/core/dist/lib/use-keypress.js
+// ../../node_modules/.bun/@inquirer+core@12.0.2+1c220d1d55e2409f/node_modules/@inquirer/core/dist/lib/use-keypress.js
 function useKeypress(userHandler) {
   const signal = useRef(userHandler);
   signal.current = userHandler;
@@ -3019,10 +3035,10 @@ function useKeypress(userHandler) {
     };
   }, []);
 }
-// ../../node_modules/@inquirer/core/dist/lib/utils.js
+// ../../node_modules/.bun/@inquirer+core@12.0.2+1c220d1d55e2409f/node_modules/@inquirer/core/dist/lib/utils.js
 var import_cli_width = __toESM(require_cli_width(), 1);
 
-// ../../node_modules/fast-string-truncated-width/dist/utils.js
+// ../../node_modules/.bun/fast-string-truncated-width@3.0.3/node_modules/fast-string-truncated-width/dist/utils.js
 var getCodePointsLength = (() => {
   const SURROGATE_PAIR_RE = /[\uD800-\uDBFF][\uDC00-\uDFFF]/g;
   return (input) => {
@@ -3041,7 +3057,7 @@ var isWideNotCJKTNotEmoji = (x) => {
   return x === 8987 || x === 9001 || x >= 12272 && x <= 12287 || x >= 12289 && x <= 12350 || x >= 12441 && x <= 12543 || x >= 12549 && x <= 12591 || x >= 12593 && x <= 12686 || x >= 12688 && x <= 12771 || x >= 12783 && x <= 12830 || x >= 12832 && x <= 12871 || x >= 12880 && x <= 19903 || x >= 65040 && x <= 65049 || x >= 65072 && x <= 65106 || x >= 65108 && x <= 65126 || x >= 65128 && x <= 65131 || x >= 127488 && x <= 127490 || x >= 127504 && x <= 127547 || x >= 127552 && x <= 127560 || x >= 131072 && x <= 196605 || x >= 196608 && x <= 262141;
 };
 
-// ../../node_modules/fast-string-truncated-width/dist/index.js
+// ../../node_modules/.bun/fast-string-truncated-width@3.0.3/node_modules/fast-string-truncated-width/dist/index.js
 var ANSI_RE = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]|\u001b\]8;[^;]*;.*?(?:\u0007|\u001b\u005c)/y;
 var CONTROL_RE = /[\x00-\x08\x0A-\x1F\x7F-\x9F]{1,1000}/y;
 var CJKT_WIDE_RE = /(?:(?![\uFF61-\uFF9F\uFF00-\uFFEF])[\p{Script=Han}\p{Script=Hiragana}\p{Script=Katakana}\p{Script=Hangul}\p{Script=Tangut}]){1,1000}/yu;
@@ -3140,7 +3156,7 @@ var getStringTruncatedWidth = (input, truncationOptions = {}, widthOptions = {})
 };
 var dist_default2 = getStringTruncatedWidth;
 
-// ../../node_modules/fast-string-width/dist/index.js
+// ../../node_modules/.bun/fast-string-width@3.0.2/node_modules/fast-string-width/dist/index.js
 var NO_TRUNCATION2 = {
   limit: Infinity,
   ellipsis: "",
@@ -3151,7 +3167,7 @@ var fastStringWidth = (input, options = {}) => {
 };
 var dist_default3 = fastStringWidth;
 
-// ../../node_modules/fast-wrap-ansi/lib/main.js
+// ../../node_modules/.bun/fast-wrap-ansi@0.2.2/node_modules/fast-wrap-ansi/lib/main.js
 var ESC = "\x1B";
 var CSI = "\u009b";
 var END_CODE = 39;
@@ -3363,7 +3379,7 @@ function wrapAnsi(string, columns, options) {
 `);
 }
 
-// ../../node_modules/@inquirer/core/dist/lib/utils.js
+// ../../node_modules/.bun/@inquirer+core@12.0.2+1c220d1d55e2409f/node_modules/@inquirer/core/dist/lib/utils.js
 function breakLines(content, width) {
   return content.split(`
 `).flatMap((line) => wrapAnsi(line, width, { trim: false, wordWrap: false }).split(`
@@ -3374,7 +3390,7 @@ function readlineWidth() {
   return import_cli_width.default({ defaultWidth: 80, output: readline().output });
 }
 
-// ../../node_modules/@inquirer/core/dist/lib/pagination/use-pagination.js
+// ../../node_modules/.bun/@inquirer+core@12.0.2+1c220d1d55e2409f/node_modules/@inquirer/core/dist/lib/pagination/use-pagination.js
 function usePointerPosition({ active, renderedItems, pageSize, loop }) {
   const state = useRef({
     lastPointer: active,
@@ -3440,12 +3456,12 @@ function usePagination({ items, active, renderItem, pageSize, loop = true }) {
   return pageBuffer.filter((line) => typeof line === "string").join(`
 `);
 }
-// ../../node_modules/@inquirer/core/dist/lib/create-prompt.js
+// ../../node_modules/.bun/@inquirer+core@12.0.2+1c220d1d55e2409f/node_modules/@inquirer/core/dist/lib/create-prompt.js
 var import_mute_stream = __toESM(require_lib(), 1);
 import * as readline2 from "node:readline";
 import { AsyncResource as AsyncResource3 } from "node:async_hooks";
 
-// ../../node_modules/signal-exit/dist/mjs/signals.js
+// ../../node_modules/.bun/signal-exit@4.1.0/node_modules/signal-exit/dist/mjs/signals.js
 var signals = [];
 signals.push("SIGHUP", "SIGINT", "SIGTERM");
 if (process.platform !== "win32") {
@@ -3455,7 +3471,7 @@ if (process.platform === "linux") {
   signals.push("SIGIO", "SIGPOLL", "SIGPWR", "SIGSTKFLT");
 }
 
-// ../../node_modules/signal-exit/dist/mjs/index.js
+// ../../node_modules/.bun/signal-exit@4.1.0/node_modules/signal-exit/dist/mjs/index.js
 var processOk = (process3) => !!process3 && typeof process3 === "object" && typeof process3.removeListener === "function" && typeof process3.emit === "function" && typeof process3.reallyExit === "function" && typeof process3.listeners === "function" && typeof process3.kill === "function" && typeof process3.pid === "number" && typeof process3.on === "function";
 var kExitEmitter = Symbol.for("signal-exit emitter");
 var global = globalThis;
@@ -3653,10 +3669,10 @@ var {
   unload
 } = signalExitWrap(processOk(process3) ? new SignalExit(process3) : new SignalExitFallback);
 
-// ../../node_modules/@inquirer/core/dist/lib/screen-manager.js
+// ../../node_modules/.bun/@inquirer+core@12.0.2+1c220d1d55e2409f/node_modules/@inquirer/core/dist/lib/screen-manager.js
 import { stripVTControlCharacters } from "node:util";
 
-// ../../node_modules/@inquirer/ansi/dist/index.js
+// ../../node_modules/.bun/@inquirer+ansi@2.0.8/node_modules/@inquirer/ansi/dist/index.js
 var ESC2 = "\x1B[";
 var cursorLeft = ESC2 + "G";
 var cursorHide = ESC2 + "?25l";
@@ -3672,7 +3688,7 @@ var cursorTo = (x, y) => {
 var eraseLine = ESC2 + "2K";
 var eraseLines = (lines) => lines > 0 ? (eraseLine + cursorUp(1)).repeat(lines - 1) + eraseLine + cursorLeft : "";
 
-// ../../node_modules/@inquirer/core/dist/lib/screen-manager.js
+// ../../node_modules/.bun/@inquirer+core@12.0.2+1c220d1d55e2409f/node_modules/@inquirer/core/dist/lib/screen-manager.js
 var height = (content) => content.split(`
 `).length;
 var lastLine = (content) => content.split(`
@@ -3738,7 +3754,7 @@ class ScreenManager {
   }
 }
 
-// ../../node_modules/@inquirer/core/dist/lib/promise-polyfill.js
+// ../../node_modules/.bun/@inquirer+core@12.0.2+1c220d1d55e2409f/node_modules/@inquirer/core/dist/lib/promise-polyfill.js
 class PromisePolyfill extends Promise {
   static withResolver() {
     let resolve;
@@ -3751,7 +3767,7 @@ class PromisePolyfill extends Promise {
   }
 }
 
-// ../../node_modules/@inquirer/core/dist/lib/create-prompt.js
+// ../../node_modules/.bun/@inquirer+core@12.0.2+1c220d1d55e2409f/node_modules/@inquirer/core/dist/lib/create-prompt.js
 import path from "node:path";
 var nativeSetImmediate = globalThis.setImmediate;
 function getCallSites() {
@@ -3862,7 +3878,7 @@ function createPrompt(view) {
   };
   return prompt;
 }
-// ../../node_modules/@inquirer/core/dist/lib/Separator.js
+// ../../node_modules/.bun/@inquirer+core@12.0.2+1c220d1d55e2409f/node_modules/@inquirer/core/dist/lib/Separator.js
 import { styleText as styleText2 } from "node:util";
 class Separator {
   separator = styleText2("dim", Array.from({ length: 15 }).join(dist_default.line));
@@ -3876,7 +3892,7 @@ class Separator {
     return Boolean(choice && typeof choice === "object" && "type" in choice && choice.type === "separator");
   }
 }
-// ../../node_modules/@inquirer/select/dist/index.js
+// ../../node_modules/.bun/@inquirer+select@5.2.4+1c220d1d55e2409f/node_modules/@inquirer/select/dist/index.js
 import { styleText as styleText3 } from "node:util";
 var selectTheme = {
   icon: { cursor: dist_default.pointer },
@@ -4051,7 +4067,7 @@ var dist_default4 = createPrompt((config, done) => {
 // src/index.ts
 var import_picocolors2 = __toESM(require_picocolors(), 1);
 
-// ../../node_modules/commander/esm.mjs
+// ../../node_modules/.bun/commander@14.0.3/node_modules/commander/esm.mjs
 var import__ = __toESM(require_commander(), 1);
 var {
   program,
@@ -8544,6 +8560,9 @@ function prReviewSeatPrompt(opts) {
   if (!isAbsolute9(worktreePath)) {
     throw new TypeError(`prReviewSeatPrompt: worktreePath must be an absolute path - got ${JSON.stringify(opts.worktreePath)}`);
   }
+  if (opts.diffFile !== undefined && opts.diffFile !== "" && !isAbsolute9(opts.diffFile)) {
+    throw new TypeError(`prReviewSeatPrompt: diffFile must be an absolute path - got ${JSON.stringify(opts.diffFile)}`);
+  }
   const slug = `${domain}-${seat}`;
   const lines = [];
   lines.push(`# PR review audit seat \u2014 Stage ${opts.stage}${opts.securitySeat === true ? " (security)" : ""}`);
@@ -8569,6 +8588,9 @@ function prReviewSeatPrompt(opts) {
   const sections = opts.stage === 1 ? tier === "quick" ? "Scoping, Evidence rules" : "Review pipeline, Worktree isolation, Scoping, Evidence rules" : "Merge class, Attack and vet, Evidence rules, Sizing & change shape";
   lines.push(`1. \`${prReviewRef}\` \u2014 read at least these sections: ${sections}.`);
   lines.push(`2. The review worktree: \`${worktreePath}\` \u2014 your ONLY working directory this session; read-only (no edits, no fixes, no stash, no commits, no posts).`);
+  if (opts.diffFile) {
+    lines.push(`- Read the pinned diff snapshot FIRST: \`${opts.diffFile}\` \u2014 it is the review's diff basis (already computed at setup); read it before opening files.`);
+  }
   if (opts.stage === 2) {
     lines.push(`3. \`${join15(skillRoot, "references", "finding-format.md")}\` \u2014 the template every finding follows.`);
     if (opts.securitySeat === true) {
@@ -11455,8 +11477,13 @@ function addTimeoutMs() {
   const parsed = Number(raw);
   return Number.isFinite(parsed) && parsed > 0 ? parsed : DSH_ADD_TIMEOUT_MS;
 }
-var DSH_PLUGIN_SPECS = ["@mstar-harness/dsh", "dsh-llm-fallbacks"];
+var DSH_FALLBACKS_VERSION = "0.4.1";
+var DSH_PLUGIN_SPECS = ["@mstar-harness/dsh", `dsh-llm-fallbacks@${DSH_FALLBACKS_VERSION}`];
 var DSH_FALLBACKS_SPEC = DSH_PLUGIN_SPECS[1];
+function dshLoaderName(spec) {
+  const at = spec.lastIndexOf("@");
+  return at > 0 ? spec.slice(0, at) : spec;
+}
 var DSH_INSTALL_HINT = "Install the DeepSeek Harness CLI (@deepseek-ai/dsh), e.g. `pnpm add -g @deepseek-ai/dsh` or `npm install -g @deepseek-ai/dsh`, then re-run init.";
 function runDsh(args, dryRun, timeoutMs) {
   return runCliCommand([DSH_BIN, ...args], { dryRun, timeoutMs, env: process.env });
@@ -11533,7 +11560,7 @@ function runInit2(scope, dryRun, initFlags) {
       notes.push(`skipped-by-flag: ${spec} (--no-fallbacks)`);
       continue;
     }
-    if (!dryRun && installed.has(spec)) {
+    if (!dryRun && (installed.has(spec) || installed.has(dshLoaderName(spec)))) {
       notes.push(`skipped-existing: ${spec} (already installed in profile ${DSH_PROFILE})`);
       continue;
     }
@@ -11578,7 +11605,7 @@ function runDoctor2(scope) {
   }
   const byName = new Map(entries.map((entry) => [entry.name, entry]));
   for (const spec of DSH_PLUGIN_SPECS) {
-    const entry = byName.get(spec);
+    const entry = byName.get(spec) ?? byName.get(dshLoaderName(spec));
     const state = !entry ? "uninstalled" : entry.enabled ? "mounted" : "disabled";
     notes.push(`${spec}: ${state}`);
     if (state === "mounted")
@@ -11599,9 +11626,8 @@ var dshAdapter = {
 import fs5 from "node:fs";
 import path8 from "node:path";
 import { execFileSync as execFileSync8 } from "node:child_process";
-var OMP_PLUGIN_MARKER = ".omp-plugin/plugin.json";
-var CLAUDE_PLUGIN_MARKER = ".claude-plugin/plugin.json";
-var PACKAGE_NAMES = new Set(["morning-star", PLUGIN_NAME, "github:btspoony/mstar-harness"]);
+var OMP_PACKAGE_REL = path8.join("packages", "omp");
+var PACKAGE_NAMES = new Set(["morning-star", PLUGIN_NAME, "github:btspoony/mstar-harness", "@mstar-harness/omp"]);
 var SKILL_SMOKE = ["mstar-host", "mstar-harness-core", "pm"];
 var COMMAND_SMOKE = ["iteration-start", "iteration-drive", "iteration-loop", "codebase-audit"];
 function ompAvailable() {
@@ -11664,11 +11690,9 @@ function findInstalledPlugin(plugins) {
 }
 function validatePluginTree(pluginRoot) {
   const errors2 = [];
-  for (const marker of [OMP_PLUGIN_MARKER, CLAUDE_PLUGIN_MARKER]) {
-    const markerPath = path8.join(pluginRoot, marker);
-    if (!fs5.existsSync(markerPath)) {
-      errors2.push(`Missing omp plugin marker: ${markerPath}`);
-    }
+  const markerPath = path8.join(pluginRoot, "plugin.json");
+  if (!fs5.existsSync(markerPath)) {
+    errors2.push(`Missing omp plugin marker: ${markerPath}`);
   }
   for (const skill of SKILL_SMOKE) {
     const skillPath = path8.join(pluginRoot, "skills", skill, "SKILL.md");
@@ -11705,9 +11729,33 @@ function runInit3(scope, dryRun) {
     }
   }
   if (!ompAvailable()) {
-    notes.push("omp CLI not found on PATH. Install Oh My Pi (`omp`), then re-run init or manually: omp plugin install github:btspoony/mstar-harness");
+    notes.push("omp CLI not found on PATH. Install Oh My Pi (`omp`), then re-run init or manually: omp plugin install @mstar-harness/omp");
   } else {
-    const linkArgs = ["plugin", "link", HARNESS_REPO_PATH];
+    const ompPackagePath = path8.join(HARNESS_REPO_PATH, OMP_PACKAGE_REL);
+    if (!dryRun && !fs5.existsSync(path8.join(ompPackagePath, "plugin.json"))) {
+      try {
+        runCliCommand(["bun", "install"], { cwd: HARNESS_REPO_PATH, dryRun });
+        runCliCommand(["bun", "run", "engine:build"], { cwd: HARNESS_REPO_PATH, dryRun });
+        runCliCommand(["bun", "run", "omp:build"], { cwd: HARNESS_REPO_PATH, dryRun });
+        notes.push("Built the omp package (engine dist + discovery mirrors) before linking.");
+      } catch (buildError) {
+        const buildMessage = buildError instanceof Error ? buildError.message : String(buildError);
+        notes.push(`Warning: could not build packages/omp (${buildMessage}). Falling back to: omp plugin install @mstar-harness/omp`);
+        const installArgs = ["plugin", "install", "@mstar-harness/omp"];
+        if (scope === "project")
+          installArgs.push("--scope", "project");
+        try {
+          runOmp(installArgs, dryRun);
+          notes.push(`Installed @mstar-harness/omp via omp plugin install (${scope}).`);
+        } catch (installError) {
+          notes.push(`omp plugin install also failed: ${installError instanceof Error ? installError.message : String(installError)}`);
+        }
+        notes.push(...postInstallNotes(scope, dryRun, projectRoot));
+        return { location: HARNESS_REPO_PATH, notes };
+      }
+    }
+    notes.push(`Linked omp plugin tree resolved via the workspace engine member; dist + root mirrors are gitignored build outputs (rebuilt automatically above when absent)`);
+    const linkArgs = ["plugin", "link", ompPackagePath];
     if (scope === "project")
       linkArgs.push("--scope", "project");
     if (dryRun) {
@@ -11715,16 +11763,16 @@ function runInit3(scope, dryRun) {
     } else {
       try {
         runOmp(linkArgs, dryRun);
-        notes.push(`Linked local harness into omp plugins (${scope}): omp plugin link ${HARNESS_REPO_PATH}${scope === "project" ? " --scope project" : ""}`);
+        notes.push(`Linked local harness omp package into omp plugins (${scope}): omp plugin link ${ompPackagePath}${scope === "project" ? " --scope project" : ""}`);
       } catch (error) {
         const message = error instanceof Error ? error.message : String(error);
-        notes.push(`omp plugin link failed (${message}). Falling back guidance: omp plugin install github:btspoony/mstar-harness`);
+        notes.push(`omp plugin link failed (${message}). Falling back guidance: omp plugin install @mstar-harness/omp`);
         try {
-          const installArgs = ["plugin", "install", "github:btspoony/mstar-harness"];
+          const installArgs = ["plugin", "install", "@mstar-harness/omp"];
           if (scope === "project")
             installArgs.push("--scope", "project");
           runOmp(installArgs, dryRun);
-          notes.push(`Installed github:btspoony/mstar-harness via omp plugin install (${scope}).`);
+          notes.push(`Installed @mstar-harness/omp via omp plugin install (${scope}).`);
         } catch (installError) {
           const installMessage = installError instanceof Error ? installError.message : String(installError);
           notes.push(`omp plugin install also failed: ${installMessage}`);
@@ -11739,16 +11787,28 @@ function runInit3(scope, dryRun) {
   notes.push("Verify with: omp plugin list");
   notes.push("Enter PM with /skill:pm ; commands: /iteration-start /iteration-drive /iteration-loop /codebase-audit");
   notes.push(`Host adapter: mstar-host \u2192 references/omp.md (skill://mstar-host/references/omp.md)`);
-  notes.push(`Alternate install without CLI link: omp plugin install ${REPO_URL.replace("https://github.com/", "github:").replace(/\.git$/, "")}`);
+  notes.push(`Alternate install without CLI link: omp plugin install @mstar-harness/omp`);
   return {
     location: HARNESS_REPO_PATH,
     notes
   };
 }
+function postInstallNotes(scope, dryRun, projectRoot) {
+  const notes = [];
+  if (scope === "project") {
+    notes.push(...appendHarnessProjectGitignore(projectRoot, dryRun));
+    notes.push(...appendGitignore(projectRoot, [".omp/plugins/", ".omp/plugin-overrides.json", ".omp/plugins/installed_plugins.json"], dryRun));
+  }
+  notes.push("Verify with: omp plugin list");
+  notes.push("Enter PM with /skill:pm ; commands: /iteration-start /iteration-drive /iteration-loop /codebase-audit");
+  notes.push(`Host adapter: mstar-host \u2192 references/omp.md (skill://mstar-host/references/omp.md)`);
+  notes.push(`Alternate install without CLI link: omp plugin install @mstar-harness/omp`);
+  return notes;
+}
 function runDoctor3(scope) {
   const errors2 = [];
   errors2.push(...validateLocalHarnessRepo());
-  errors2.push(...validatePluginTree(HARNESS_REPO_PATH));
+  errors2.push(...validatePluginTree(path8.join(HARNESS_REPO_PATH, OMP_PACKAGE_REL)));
   if (!ompAvailable()) {
     errors2.push("omp CLI not found on PATH (required for omp target doctor checks).");
   } else {
@@ -14136,6 +14196,9 @@ prReviewCommand.command("validate-report").description("Validate a saved local P
 function gitSync(args, cwd) {
   return execFileSync10("git", args, { cwd, encoding: "utf8", stdio: ["ignore", "pipe", "pipe"] }).trim();
 }
+function gitRaw(args, cwd) {
+  return execFileSync10("git", args, { cwd, stdio: ["ignore", "pipe", "pipe"], maxBuffer: GIT_CAPTURE_MAX_BYTES });
+}
 function ghSync(args, input) {
   return execFileSync10("gh", args, { encoding: "utf8", stdio: ["ignore", "pipe", "pipe"], ...input !== undefined ? { input } : {} }).trim();
 }
@@ -14161,7 +14224,11 @@ function refResolves(ref, cwd) {
 }
 function probeChangesetEmpty(diffCmdArgs, cwd, worktreePath) {
   if (diffCmdArgs[0] === "__working_tree__") {
-    const dirty = gitIf(["diff"], worktreePath).length > 0 || gitIf(["diff", "--cached"], worktreePath).length > 0;
+    const diffOut = gitProbe(["diff"], worktreePath);
+    const cachedOut = gitProbe(["diff", "--cached"], worktreePath);
+    if (diffOut === null || cachedOut === null)
+      return false;
+    const dirty = diffOut.length > 0 || cachedOut.length > 0;
     if (dirty)
       return false;
     let untracked = "";
@@ -14178,17 +14245,26 @@ function probeChangesetEmpty(diffCmdArgs, cwd, worktreePath) {
     const sha = diffCmdArgs[1];
     const EMPTY_TREE = "4b825dc642cb6eb9a060e54bf8d69288fbee4904";
     const diffFrom = refResolves(`${sha}^`, worktreePath) ? `${sha}^` : EMPTY_TREE;
-    return gitIf(["diff", diffFrom, sha], worktreePath).trim().length === 0;
+    const probe2 = gitProbe(["diff", diffFrom, sha], worktreePath);
+    return probe2 === null ? false : probe2.trim().length === 0;
   }
-  return gitIf(diffCmdArgs, worktreePath).length === 0;
+  const probe = gitProbe(diffCmdArgs, worktreePath);
+  return probe === null ? false : probe.length === 0;
 }
 function gitIf(args, cwd) {
   try {
-    return execFileSync10("git", args, { cwd, encoding: "utf8", stdio: ["ignore", "pipe", "ignore"] });
+    return execFileSync10("git", args, { cwd, encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], maxBuffer: GIT_CAPTURE_MAX_BYTES });
   } catch {
     return "";
   }
 }
+function gitProbe(args, cwd) {
+  try {
+    return execFileSync10("git", args, { cwd, encoding: "utf8", stdio: ["ignore", "pipe", "ignore"], maxBuffer: GIT_CAPTURE_MAX_BYTES });
+  } catch {
+    return null;
+  }
+}
 function probeChangesetEmptyPreworktree(mode, headSpec, cwd) {
   if (mode === "working-tree")
     return probeChangesetEmpty(["__working_tree__"], cwd, cwd);
@@ -14315,7 +14391,7 @@ function ghApi(apiPath, payload) {
     input: payload
   });
 }
-prReviewCommand.command("worktree-setup").description("Create the isolated review worktree per pr-review.md \xA7 Worktree isolation: resolves the real base, picks a " + "collision-free branch name, fetches with explicit refspecs, creates the worktree, computes the diff basis INSIDE it, " + "and records a sidecar json consumed by worktree-cleanup; prints {reviewBranch, worktreePath, base, mergeBase, diffCmd} " + "(input modes: --pr <n> | --branch <b> | --diff | --working-tree | --commit <sha>)").option("--pr <n>", "PR number input mode (pull/<n>/head via gh)").option("--branch <name>", "Bare remote-branch input mode").option("--diff", "Arbitrary diff input mode \u2014 no worktree, no refs").option("--working-tree", "Uncommitted working-tree input mode \u2014 no worktree, no refs").option("--commit <sha>", "Single-commit input mode").option("--path <dir>", "Worktree target directory (default: ../<repo-name>.review-pr<N> beside the repo)").action((options) => {
+prReviewCommand.command("worktree-setup").description("Create the isolated review worktree per pr-review.md \xA7 Worktree isolation: resolves the real base, picks a " + "collision-free branch name, fetches with explicit refspecs, creates the worktree, computes the diff basis INSIDE it, " + "and records a sidecar json consumed by worktree-cleanup; prints {reviewBranch, worktreePath, base, mergeBase, diffCmd, diffFile} " + "(input modes: --pr <n> | --branch <b> | --diff | --working-tree | --commit <sha>)").option("--pr <n>", "PR number input mode (pull/<n>/head via gh)").option("--branch <name>", "Bare remote-branch input mode").option("--diff", "Arbitrary diff input mode \u2014 no worktree, no refs").option("--working-tree", "Uncommitted working-tree input mode \u2014 no worktree, no refs").option("--commit <sha>", "Single-commit input mode").option("--path <dir>", "Worktree target directory (default: <repo>/.worktrees/review-<branch>)").action((options) => {
   try {
     const modesDeclared = [
       options.pr !== undefined,
@@ -14355,7 +14431,7 @@ prReviewCommand.command("worktree-setup").description("Create the isolated revie
         process.exitCode = 1;
         return;
       }
-      console.log(JSON.stringify({ reviewBranch: null, worktreePath: repoRoot, base: null, mergeBase: null, diffCmd: mode === "diff" ? "(provided changeset)" : "git diff + git diff --cached + ls-files --others" }, null, 2));
+      console.log(JSON.stringify({ reviewBranch: null, worktreePath: repoRoot, base: null, mergeBase: null, diffCmd: mode === "diff" ? "(provided changeset)" : "git diff + git diff --cached + ls-files --others", diffFile: null }, null, 2));
       return;
     }
     let prNumber = 0;
@@ -14405,7 +14481,21 @@ prReviewCommand.command("worktree-setup").description("Create the isolated revie
     const baseCandidate = mode === "pr" ? namePrNumber : Number(String(Math.abs([...headSpec].reduce((h, ch) => (h * 31 + ch.charCodeAt(0)) % 1000003, 7))));
     const reviewBranch = pickReviewBranchName(existing, baseCandidate === 0 ? 1 : baseCandidate, cliToday().replace(/-/g, ""));
     const branchSuffix = mode === "pr" ? "" : `-${headSpec.slice(0, 8)}`;
-    const worktreePath = path12.resolve(options.path ?? joinDirnameBeside(repoRoot, `.review-${reviewBranch}${branchSuffix}`));
+    const worktreePath = path12.resolve(options.path ?? path12.join(repoRoot, ".worktrees", `review-${reviewBranch}${branchSuffix}`));
+    if (options.path === undefined) {
+      fs8.mkdirSync(path12.join(repoRoot, ".worktrees"), { recursive: true });
+      if (gitIf(["check-ignore", ".worktrees/"], repoRoot) === "") {
+        const excludePath = path12.join(repoRoot, ".git", "info", "exclude");
+        const existing2 = fs8.existsSync(excludePath) ? fs8.readFileSync(excludePath, "utf8") : "";
+        if (!existing2.split(`
+`).some((line) => line.trim() === ".worktrees/")) {
+          fs8.appendFileSync(excludePath, `${existing2 === "" || existing2.endsWith(`
+`) ? "" : `
+`}.worktrees/
+`);
+        }
+      }
+    }
     const originUrl = gitIf(["remote", "get-url", "origin"], repoRoot);
     let fetched = true;
     try {
@@ -14421,7 +14511,11 @@ prReviewCommand.command("worktree-setup").description("Create the isolated revie
     } catch {
       fetched = false;
     }
-    const rollbackNewWorktree = (branchToDelete) => {
+    let wroteSnapshot = false;
+    let wroteSidecar = false;
+    let pendingSidecar;
+    let sidecarFd;
+    const cleanupOnFailure = (branchToDelete) => {
       try {
         if (fs8.existsSync(worktreePath))
           gitSync(["worktree", "remove", "--force", worktreePath], repoRoot);
@@ -14429,6 +14523,12 @@ prReviewCommand.command("worktree-setup").description("Create the isolated revie
         if (branchToDelete !== "" && !existing.has(branchToDelete)) {
           gitSync(["branch", "-D", branchToDelete], repoRoot);
         }
+        if (wroteSidecar && sidecarFd !== undefined) {
+          removeOwnedFreshSidecarFile(sidecarFd, worktreePath);
+          sidecarFd = undefined;
+        }
+        if (wroteSnapshot && pendingSidecar !== undefined)
+          removeOwnedSnapshotFile(worktreePath, pendingSidecar);
       } catch {}
     };
     const fetchedHeadResolves = mode === "pr" ? refResolves(reviewBranch, repoRoot) : mode === "branch" ? originUrl !== "" && refResolves(`origin/${options.branch}`, repoRoot) : mode === "commit" ? Boolean(gitIf(["rev-parse", "--verify", "--quiet", `${headSpec}^{commit}`], repoRoot).trim()) : refResolves(headSpec, repoRoot);
@@ -14461,48 +14561,222 @@ prReviewCommand.command("worktree-setup").description("Create the isolated revie
     const changesetEmpty = probeChangesetEmpty(diffArgs, worktreePath, worktreePath);
     const emptyGate = preflightChangeset(mode, { refsResolve: true, changesetEmpty });
     if (changesetEmpty) {
-      rollbackNewWorktree(mode === "pr" ? reviewBranch : "");
+      cleanupOnFailure(mode === "pr" ? reviewBranch : "");
     }
     if (!emptyGate.ok && emptyGate.violations.some((v) => v.code === "prreview.preflight.changeset-empty")) {
       printChecklist("pr-review worktree-setup preflight", emptyGate);
       process.exitCode = 1;
       return;
     }
-    const recordedBase = mode === "pr" || mode !== "commit" && !baseRef.startsWith("origin/") ? `origin/${baseRef}` : baseRef;
-    const sidecar = {
-      reviewBranch: mode === "pr" ? reviewBranch : "",
-      worktreePath,
-      base: recordedBase,
-      mergeBase,
-      diffCmd,
-      reportSaved: false,
-      createdAt: new Date().toISOString(),
-      repoRoot
+    const captureAndRecordSnapshot = () => {
+      const diffFile = prReviewArtifactPathFor(worktreePath, "diff");
+      const sidecarPath = prReviewArtifactPathFor(worktreePath, "json");
+      const snapshotParts = [];
+      if (mode === "commit") {
+        snapshotParts.push(Buffer.from(`# Review package: ${baseRef} (single commit)
+
+## Commits
+`), gitRaw(["log", "--oneline", "-1", headSpec], worktreePath), Buffer.from(`
+## Files changed
+`), gitRaw(["show", "--stat", headSpec], worktreePath), Buffer.from(`
+## Diff
+`), gitRaw(["show", "-U10", headSpec], worktreePath));
+      } else {
+        const range = diffArgs[1];
+        const [rangeBase, rangeHead] = range.split("...");
+        snapshotParts.push(Buffer.from(`# Review package: ${baseRef}..${headSpec}
+
+## Commits
+`), gitRaw(["log", "--oneline", `${rangeBase}..${rangeHead}`], worktreePath), Buffer.from(`
+## Files changed
+`), gitRaw(["diff", "--stat", range], worktreePath), Buffer.from(`
+## Diff
+`), gitRaw(["diff", "-U10", range], worktreePath));
+      }
+      const snapshot = Buffer.concat(snapshotParts);
+      const recordedBase = mode === "pr" || mode !== "commit" && !baseRef.startsWith("origin/") ? `origin/${baseRef}` : baseRef;
+      const sidecar2 = {
+        reviewBranch: mode === "pr" ? reviewBranch : "",
+        worktreePath,
+        base: recordedBase,
+        mergeBase,
+        diffCmd,
+        reportSaved: false,
+        createdAt: new Date().toISOString(),
+        repoRoot,
+        diffFile,
+        diffFileSha256: createHash("sha256").update(snapshot).digest("hex")
+      };
+      try {
+        sidecarFd = fs8.openSync(sidecarPath, "wx+");
+      } catch (error) {
+        if (error.code !== "EEXIST" && error.code !== "EISDIR")
+          throw error;
+        throw new Error(`cannot record setup sidecar at ${sidecarPath} - run mstar pr-review worktree-cleanup first (never cleaning a foreign review)`);
+      }
+      writeFdSync(sidecarFd, Buffer.from(JSON.stringify(sidecar2, null, 2), "utf8"));
+      wroteSidecar = true;
+      try {
+        fs8.writeFileSync(diffFile, snapshot, { flag: "wx" });
+      } catch (error) {
+        if (error.code !== "EEXIST" && error.code !== "EISDIR")
+          throw error;
+        throw new Error(`refusing to overwrite pre-existing non-snapshot path ${diffFile}`);
+      }
+      wroteSnapshot = true;
+      const snapshotStat = fs8.lstatSync(diffFile);
+      sidecar2.diffFileDev = snapshotStat.dev;
+      sidecar2.diffFileIno = String(snapshotStat.ino);
+      sidecar2.diffFileMtimeMs = snapshotStat.mtimeMs;
+      pendingSidecar = sidecar2;
+      fs8.ftruncateSync(sidecarFd, 0);
+      writeFdSync(sidecarFd, Buffer.from(JSON.stringify(sidecar2, null, 2), "utf8"));
+      fs8.closeSync(sidecarFd);
+      sidecarFd = undefined;
+      return sidecar2;
     };
-    fs8.writeFileSync(sidecarPathFor(worktreePath), JSON.stringify(sidecar, null, 2));
+    let sidecar;
+    try {
+      sidecar = captureAndRecordSnapshot();
+    } catch (error) {
+      cleanupOnFailure(mode === "pr" ? reviewBranch : "");
+      throw error;
+    }
     console.log(JSON.stringify({
       reviewBranch: sidecar.reviewBranch === "" ? null : sidecar.reviewBranch,
       worktreePath: sidecar.worktreePath,
       base: sidecar.base,
       mergeBase: sidecar.mergeBase === "" ? null : sidecar.mergeBase,
-      diffCmd: sidecar.diffCmd
+      diffCmd: sidecar.diffCmd,
+      diffFile: sidecar.diffFile
     }, null, 2));
   } catch (error) {
     failScript(error, "pr-review worktree-setup");
   }
 });
-function sidecarPathFor(worktreePath) {
+function prReviewArtifactPathFor(worktreePath, suffix) {
   const parent = path12.dirname(path12.resolve(worktreePath));
   const name = path12.basename(path12.resolve(worktreePath));
-  return path12.join(parent, `.${name}.prreview.json`);
+  return path12.join(parent, `.${name}.prreview.${suffix}`);
+}
+function writeFdSync(fd, buf) {
+  let written = 0;
+  while (written < buf.length)
+    written += fs8.writeSync(fd, buf, written, buf.length - written, written);
+}
+function removeOwnedSnapshotFile(worktreePath, sidecar) {
+  const snapshotPath = prReviewArtifactPathFor(worktreePath, "diff");
+  let fd;
+  try {
+    fd = fs8.openSync(snapshotPath, "r");
+  } catch (error) {
+    if (error.code === "ENOENT")
+      return;
+    console.error(import_picocolors2.default.yellow(`worktree-cleanup: snapshot at ${snapshotPath} left in place (cannot open: ${error.message})`));
+    return;
+  }
+  try {
+    const st = fs8.fstatSync(fd);
+    if (!st.isFile())
+      return;
+    const recordedIno = sidecar.diffFileIno;
+    const recordedDev = sidecar.diffFileDev;
+    const recordedMtimeMs = sidecar.diffFileMtimeMs;
+    const owned = typeof recordedIno === "string" && recordedIno !== "" && typeof recordedDev === "number" && Number.isFinite(recordedDev) && typeof recordedMtimeMs === "number" && Number.isFinite(recordedMtimeMs) && String(st.ino) === recordedIno && st.dev === recordedDev && st.mtimeMs === recordedMtimeMs;
+    if (!owned) {
+      console.error(import_picocolors2.default.yellow(`worktree-cleanup: snapshot at ${snapshotPath} left in place (file identity does not match the recorded snapshot)`));
+      return;
+    }
+    if (st.nlink !== 1) {
+      console.error(import_picocolors2.default.yellow(`worktree-cleanup: snapshot at ${snapshotPath} left in place (link count does not match the recorded snapshot)`));
+      return;
+    }
+    const tmp = `${snapshotPath}.cleanup.${process.pid}.${randomUUID3()}`;
+    try {
+      fs8.renameSync(snapshotPath, tmp);
+    } catch (error) {
+      console.error(import_picocolors2.default.yellow(`worktree-cleanup: snapshot at ${snapshotPath} left in place (cannot detach: ${error.message})`));
+      return;
+    }
+    const st2 = fs8.fstatSync(fd);
+    let tmpStat;
+    try {
+      tmpStat = fs8.lstatSync(tmp);
+    } catch {
+      tmpStat = undefined;
+    }
+    if (tmpStat !== undefined && tmpStat.ino === st2.ino && tmpStat.dev === st2.dev && st2.nlink === 1 && tmpStat.nlink === 1) {
+      fs8.unlinkSync(tmp);
+      const st3 = fs8.fstatSync(fd);
+      if (st3.nlink !== 0) {
+        console.error(import_picocolors2.default.yellow(`worktree-cleanup: unlink at ${tmp} detached a pathname replacement, not the verified snapshot inode (${snapshotPath} still holds ${st3.nlink} link(s)) - the replacement is gone, the verified snapshot was NOT deleted`));
+      }
+    } else {
+      try {
+        fs8.linkSync(tmp, snapshotPath);
+        fs8.unlinkSync(tmp);
+      } catch (error) {
+        if (error.code === "EEXIST") {
+          console.error(import_picocolors2.default.yellow(`worktree-cleanup: snapshot replacement left at ${tmp} (snapshot path was recreated concurrently)`));
+        } else {
+          console.error(import_picocolors2.default.yellow(`worktree-cleanup: snapshot replacement left at ${tmp} (restore failed: ${error.message})`));
+        }
+      }
+    }
+  } finally {
+    fs8.closeSync(fd);
+  }
 }
-function joinDirnameBeside(repoRoot, leaf) {
-  return path12.join(path12.dirname(path12.resolve(repoRoot)), leaf);
+function removeOwnedFreshSidecarFile(sidecarFd, worktreePath) {
+  const sidecarPath = prReviewArtifactPathFor(worktreePath, "json");
+  try {
+    const st = fs8.fstatSync(sidecarFd);
+    if (!st.isFile() || st.nlink !== 1) {
+      console.error(import_picocolors2.default.yellow(`worktree-setup rollback: sidecar at ${sidecarPath} left in place (identity no longer held)`));
+      return;
+    }
+    const tmp = `${sidecarPath}.cleanup.${process.pid}.${randomUUID3()}`;
+    try {
+      fs8.renameSync(sidecarPath, tmp);
+    } catch (error) {
+      console.error(import_picocolors2.default.yellow(`worktree-setup rollback: sidecar at ${sidecarPath} left in place (cannot detach: ${error.message})`));
+      return;
+    }
+    const st2 = fs8.fstatSync(sidecarFd);
+    let tmpStat;
+    try {
+      tmpStat = fs8.lstatSync(tmp);
+    } catch {
+      tmpStat = undefined;
+    }
+    if (tmpStat !== undefined && tmpStat.ino === st2.ino && tmpStat.dev === st2.dev) {
+      fs8.unlinkSync(tmp);
+      const st3 = fs8.fstatSync(sidecarFd);
+      if (st3.nlink !== 0) {
+        console.error(import_picocolors2.default.yellow(`worktree-setup rollback: unlink at ${tmp} detached a pathname replacement, not the verified sidecar inode (${sidecarPath} still holds ${st3.nlink} link(s)) - the replacement is gone, the verified sidecar was NOT deleted`));
+      }
+    } else {
+      try {
+        fs8.linkSync(tmp, sidecarPath);
+        fs8.unlinkSync(tmp);
+      } catch (error) {
+        if (error.code === "EEXIST") {
+          console.error(import_picocolors2.default.yellow(`worktree-setup rollback: sidecar replacement left at ${tmp} (sidecar path was recreated concurrently)`));
+        } else {
+          console.error(import_picocolors2.default.yellow(`worktree-setup rollback: sidecar replacement left at ${tmp} (restore failed: ${error.message})`));
+        }
+      }
+    }
+  } finally {
+    try {
+      fs8.closeSync(sidecarFd);
+    } catch {}
+  }
 }
 prReviewCommand.command("worktree-cleanup").description("Remove the review worktree per pr-review.md \xA7 Worktree isolation cleanup: refuses unless --report-saved is given OR the " + "setup sidecar records report-saved; removes the worktree, prunes, and deletes EXACTLY the recorded review branch \u2014 a " + "--branch argument that disagrees with the sidecar is refused (never delete a foreign/pre-existing branch)").requiredOption("--path <dir>", "Worktree directory created by worktree-setup").requiredOption("--branch <name>", "The recorded review branch (must match the setup sidecar for PR mode)").option("--report-saved", "Assert the local report has been saved before removal").action((options) => {
   try {
     const worktreePath = path12.resolve(resolveCliPath(options.path));
-    const sidecarPath = sidecarPathFor(worktreePath);
+    const sidecarPath = prReviewArtifactPathFor(worktreePath, "json");
     if (!fs8.existsSync(sidecarPath)) {
       throw new Error(`no setup sidecar found at ${sidecarPath} - run pr-review worktree-setup first (foreign worktrees are never cleaned here)`);
     }
@@ -14534,6 +14808,7 @@ prReviewCommand.command("worktree-cleanup").description("Remove the review workt
       }
       gitSync(["branch", "-D", sidecar.reviewBranch], gitRoot);
     }
+    removeOwnedSnapshotFile(worktreePath, sidecar);
     fs8.rmSync(sidecarPath, { force: true });
     console.log(import_picocolors2.default.green(`worktree-cleanup: removed ${worktreePath}${sidecar.reviewBranch !== "" ? ` + deleted ${sidecar.reviewBranch}` : " (no local branch to delete)"}`));
   } catch (error) {
@@ -14583,7 +14858,7 @@ function measureLargestTouchedTotal(diffOutput, headRef, cwd) {
   }
   return maxTotal;
 }
-prReviewCommand.command("seat-prompt").description("Generate the read-only audit-seat prompt per pr-review.md \xA7 Seat prompts (Hard Rules 4/5 verbatim, payload-return contract, " + "no-verdict/no-post clauses, slug <domain>-<seat>, Merge-class instruction on stage 2); prints the prompt").requiredOption("--stage <1|2>", "Pipeline stage (1 = collect, 2 = domain/security)").requiredOption("--domain <d>", "Review domain for this seat").requiredOption("--seat <id>", "Seat id (slug becomes <domain>-<seat>)").requiredOption("--worktree <path>", "Absolute review worktree path").option("--security", "Mark this seat as the security-lens seat (stage 2)").option("--skill-root <dir>", "Skill root containing references/pr-review.md (default: resolved skills/mstar-audit)").option("--recon <facts...>", "Recon facts (variadic: --recon fact1 fact2 ...)").option("--tier <quick|default|deep>", "Prompt tier (SP-A): quick shrinks read-first + folds the security lens in-seat; deep adds cross-domain security seat + stage-as-wave (default: default)").action((options) => {
+prReviewCommand.command("seat-prompt").description("Generate the read-only audit-seat prompt per pr-review.md \xA7 Seat prompts (Hard Rules 4/5 verbatim, payload-return contract, " + "no-verdict/no-post clauses, slug <domain>-<seat>, Merge-class instruction on stage 2); prints the prompt").requiredOption("--stage <1|2>", "Pipeline stage (1 = collect, 2 = domain/security)").requiredOption("--domain <d>", "Review domain for this seat").requiredOption("--seat <id>", "Seat id (slug becomes <domain>-<seat>)").requiredOption("--worktree <path>", "Absolute review worktree path").option("--security", "Mark this seat as the security-lens seat (stage 2)").option("--skill-root <dir>", "Skill root containing references/pr-review.md (default: resolved skills/mstar-audit)").option("--recon <facts...>", "Recon facts (variadic: --recon fact1 fact2 ...)").option("--tier <quick|default|deep>", "Prompt tier (SP-A): quick shrinks read-first + folds the security lens in-seat; deep adds cross-domain security seat + stage-as-wave (default: default)").option("--diff-file <path>", "Absolute path to the pinned diff snapshot written by worktree-setup (read-first ingredient)").action((options) => {
   try {
     if (options.stage !== "1" && options.stage !== "2") {
       throw new SddScriptError(`usage: pr-review seat-prompt \u2014 --stage must be 1 or 2, got ${JSON.stringify(options.stage)}`, 2);
@@ -14601,7 +14876,8 @@ prReviewCommand.command("seat-prompt").description("Generate the read-only audit
       worktreePath: path12.resolve(options.worktree),
       reconFacts: options.recon ?? [],
       ...options.security === true ? { securitySeat: true } : {},
-      ...tier !== undefined ? { tier } : {}
+      ...tier !== undefined ? { tier } : {},
+      ...options.diffFile !== undefined && options.diffFile !== "" ? { diffFile: path12.resolve(resolveCliPath(options.diffFile)) } : {}
     });
     console.log(prompt);
   } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mstar-harness/cli",
-  "version": "3.6.0-alpha.3",
+  "version": "3.6.0",
   "description": "Morning Star harness CLI — installer bootstrap + mstar workflow verbs (path/status/lease/sdd/iteration/dispatch/worktree/lint/design-md/audit/compound/host/skill).",
   "license": "MIT",
   "repository": {