truecourse 0.7.0-next.8 → 0.7.0-next.9

package/cli.mjs

@@ -972,8 +972,8 @@ var require_command = __commonJS({
   "node_modules/.pnpm/commander@12.1.0/node_modules/commander/lib/command.js"(exports) {
     var EventEmitter2 = __require("node:events").EventEmitter;
     var childProcess = __require("node:child_process");
-    var path80 = __require("node:path");
-    var fs71 = __require("node:fs");
+    var path81 = __require("node:path");
+    var fs72 = __require("node:fs");
     var process2 = __require("node:process");
     var { Argument: Argument2, humanReadableArgName } = require_argument();
     var { CommanderError: CommanderError2 } = require_error();
@@ -1905,11 +1905,11 @@ Expecting one of '${allowedValues.join("', '")}'`);
         let launchWithNode = false;
         const sourceExt = [".js", ".ts", ".tsx", ".mjs", ".cjs"];
         function findFile(baseDir, baseName) {
-          const localBin = path80.resolve(baseDir, baseName);
-          if (fs71.existsSync(localBin)) return localBin;
-          if (sourceExt.includes(path80.extname(baseName))) return void 0;
+          const localBin = path81.resolve(baseDir, baseName);
+          if (fs72.existsSync(localBin)) return localBin;
+          if (sourceExt.includes(path81.extname(baseName))) return void 0;
           const foundExt = sourceExt.find(
-            (ext2) => fs71.existsSync(`${localBin}${ext2}`)
+            (ext2) => fs72.existsSync(`${localBin}${ext2}`)
           );
           if (foundExt) return `${localBin}${foundExt}`;
           return void 0;
@@ -1921,21 +1921,21 @@ Expecting one of '${allowedValues.join("', '")}'`);
         if (this._scriptPath) {
           let resolvedScriptPath;
           try {
-            resolvedScriptPath = fs71.realpathSync(this._scriptPath);
+            resolvedScriptPath = fs72.realpathSync(this._scriptPath);
           } catch (err) {
             resolvedScriptPath = this._scriptPath;
           }
-          executableDir = path80.resolve(
-            path80.dirname(resolvedScriptPath),
+          executableDir = path81.resolve(
+            path81.dirname(resolvedScriptPath),
             executableDir
           );
         }
         if (executableDir) {
           let localFile = findFile(executableDir, executableFile);
           if (!localFile && !subcommand._executableFile && this._scriptPath) {
-            const legacyName = path80.basename(
+            const legacyName = path81.basename(
               this._scriptPath,
-              path80.extname(this._scriptPath)
+              path81.extname(this._scriptPath)
             );
             if (legacyName !== this._name) {
               localFile = findFile(
@@ -1946,7 +1946,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
           }
           executableFile = localFile || executableFile;
         }
-        launchWithNode = sourceExt.includes(path80.extname(executableFile));
+        launchWithNode = sourceExt.includes(path81.extname(executableFile));
         let proc;
         if (process2.platform !== "win32") {
           if (launchWithNode) {
@@ -2786,7 +2786,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @return {Command}
        */
       nameFromFilename(filename) {
-        this._name = path80.basename(filename, path80.extname(filename));
+        this._name = path81.basename(filename, path81.extname(filename));
         return this;
       }
       /**
@@ -2800,9 +2800,9 @@ Expecting one of '${allowedValues.join("', '")}'`);
        * @param {string} [path]
        * @return {(string|null|Command)}
        */
-      executableDir(path81) {
-        if (path81 === void 0) return this._executableDir;
-        this._executableDir = path81;
+      executableDir(path82) {
+        if (path82 === void 0) return this._executableDir;
+        this._executableDir = path82;
         return this;
       }
       /**
@@ -5206,8 +5206,8 @@ var init_parseUtil = __esm({
     init_errors();
     init_en();
     makeIssue = (params) => {
-      const { data, path: path80, errorMaps, issueData } = params;
-      const fullPath = [...path80, ...issueData.path || []];
+      const { data, path: path81, errorMaps, issueData } = params;
+      const fullPath = [...path81, ...issueData.path || []];
       const fullIssue = {
         ...issueData,
         path: fullPath
@@ -5515,11 +5515,11 @@ var init_types = __esm({
     init_parseUtil();
     init_util();
     ParseInputLazyPath = class {
-      constructor(parent, value, path80, key4) {
+      constructor(parent, value, path81, key4) {
         this._cachedPath = [];
         this.parent = parent;
         this.data = value;
-        this._path = path80;
+        this._path = path81;
         this._key = key4;
       }
       get path() {
@@ -11976,10 +11976,10 @@ var require_src3 = __commonJS({
     var fs_1 = __require("fs");
     var debug_1 = __importDefault(require_src2());
     var log2 = debug_1.default("@kwsites/file-exists");
-    function check(path80, isFile, isDirectory) {
-      log2(`checking %s`, path80);
+    function check(path81, isFile, isDirectory) {
+      log2(`checking %s`, path81);
       try {
-        const stat = fs_1.statSync(path80);
+        const stat = fs_1.statSync(path81);
         if (stat.isFile() && isFile) {
           log2(`[OK] path represents a file`);
           return true;
@@ -11999,8 +11999,8 @@ var require_src3 = __commonJS({
         throw e;
       }
     }
-    function exists2(path80, type2 = exports.READABLE) {
-      return check(path80, (type2 & exports.FILE) > 0, (type2 & exports.FOLDER) > 0);
+    function exists2(path81, type2 = exports.READABLE) {
+      return check(path81, (type2 & exports.FILE) > 0, (type2 & exports.FOLDER) > 0);
     }
     exports.exists = exists2;
     exports.FILE = 1;
@@ -12073,8 +12073,8 @@ function pathspec(...paths) {
   cache.set(key4, paths);
   return key4;
 }
-function isPathSpec(path80) {
-  return path80 instanceof String && cache.has(path80);
+function isPathSpec(path81) {
+  return path81 instanceof String && cache.has(path81);
 }
 function toPaths(pathSpec) {
   return cache.get(pathSpec) || [];
@@ -12118,8 +12118,8 @@ function toLinesWithContent(input = "", trimmed2 = true, separator = "\n") {
 function forEachLineWithContent(input, callback) {
   return toLinesWithContent(input, true).map((line) => callback(line));
 }
-function folderExists(path80) {
-  return (0, import_file_exists.exists)(path80, import_file_exists.FOLDER);
+function folderExists(path81) {
+  return (0, import_file_exists.exists)(path81, import_file_exists.FOLDER);
 }
 function append(target, item) {
   if (Array.isArray(target)) {
@@ -12310,8 +12310,8 @@ function checkIsRepoRootTask() {
     commands,
     format: "utf-8",
     onError,
-    parser(path80) {
-      return /^\.(git)?$/.test(path80.trim());
+    parser(path81) {
+      return /^\.(git)?$/.test(path81.trim());
     }
   };
 }
@@ -12567,11 +12567,11 @@ function parseGrep(grep) {
   const paths = /* @__PURE__ */ new Set();
   const results = {};
   forEachLineWithContent(grep, (input) => {
-    const [path80, line, preview] = input.split(NULL);
-    paths.add(path80);
-    (results[path80] = results[path80] || []).push({
+    const [path81, line, preview] = input.split(NULL);
+    paths.add(path81);
+    (results[path81] = results[path81] || []).push({
       line: asNumber(line),
-      path: path80,
+      path: path81,
       preview
     });
   });
@@ -12868,14 +12868,14 @@ function hashObjectTask(filePath, write) {
   }
   return straightThroughStringTask(commands, true);
 }
-function parseInit(bare, path80, text4) {
+function parseInit(bare, path81, text4) {
   const response = String(text4).trim();
   let result;
   if (result = initResponseRegex.exec(response)) {
-    return new InitSummary(bare, path80, false, result[1]);
+    return new InitSummary(bare, path81, false, result[1]);
   }
   if (result = reInitResponseRegex.exec(response)) {
-    return new InitSummary(bare, path80, true, result[1]);
+    return new InitSummary(bare, path81, true, result[1]);
   }
   let gitDir = "";
   const tokens = response.split(" ");
@@ -12886,12 +12886,12 @@ function parseInit(bare, path80, text4) {
       break;
     }
   }
-  return new InitSummary(bare, path80, /^re/i.test(response), gitDir);
+  return new InitSummary(bare, path81, /^re/i.test(response), gitDir);
 }
 function hasBareCommand(command) {
   return command.includes(bareCommand);
 }
-function initTask(bare = false, path80, customArgs) {
+function initTask(bare = false, path81, customArgs) {
   const commands = ["init", ...customArgs];
   if (bare && !hasBareCommand(commands)) {
     commands.splice(1, 0, bareCommand);
@@ -12900,7 +12900,7 @@ function initTask(bare = false, path80, customArgs) {
     commands,
     format: "utf-8",
     parser(text4) {
-      return parseInit(commands.includes("--bare"), path80, text4);
+      return parseInit(commands.includes("--bare"), path81, text4);
     }
   };
 }
@@ -13179,14 +13179,14 @@ function splitLine(result, lineStr) {
     default:
       return;
   }
-  function data(index, workingDir, path80) {
+  function data(index, workingDir, path81) {
     const raw = `${index}${workingDir}`;
     const handler = parsers6.get(raw);
     if (handler) {
-      handler(result, path80);
+      handler(result, path81);
     }
     if (raw !== "##" && raw !== "!!") {
-      result.files.push(new FileStatusSummary(path80, index, workingDir));
+      result.files.push(new FileStatusSummary(path81, index, workingDir));
     }
   }
 }
@@ -13373,8 +13373,8 @@ function deleteBranchTask(branch, forceDelete = false) {
   return task;
 }
 function toPath(input) {
-  const path80 = input.trim().replace(/^["']|["']$/g, "");
-  return path80 && normalize(path80);
+  const path81 = input.trim().replace(/^["']|["']$/g, "");
+  return path81 && normalize(path81);
 }
 function checkIgnoreTask(paths) {
   return {
@@ -13513,8 +13513,8 @@ function stashListTask(opt = {}, customArgs) {
     parser: parser4
   };
 }
-function addSubModuleTask(repo, path80) {
-  return subModuleTask(["add", repo, path80]);
+function addSubModuleTask(repo, path81) {
+  return subModuleTask(["add", repo, path81]);
 }
 function initSubModuleTask(customArgs) {
   return subModuleTask(["init", ...customArgs]);
@@ -14826,9 +14826,9 @@ var init_esm2 = __esm({
       "src/lib/responses/InitSummary.ts"() {
         "use strict";
         InitSummary = class {
-          constructor(bare, path80, existing, gitDir) {
+          constructor(bare, path81, existing, gitDir) {
             this.bare = bare;
-            this.path = path80;
+            this.path = path81;
             this.existing = existing;
             this.gitDir = gitDir;
           }
@@ -15362,12 +15362,12 @@ var init_esm2 = __esm({
         "use strict";
         fromPathRegex = /^(.+)\0(.+)$/;
         FileStatusSummary = class {
-          constructor(path80, index, working_dir) {
-            this.path = path80;
+          constructor(path81, index, working_dir) {
+            this.path = path81;
             this.index = index;
             this.working_dir = working_dir;
             if (index === "R" || working_dir === "R") {
-              const detail = fromPathRegex.exec(path80) || [null, path80, path80];
+              const detail = fromPathRegex.exec(path81) || [null, path81, path81];
               this.from = detail[2] || "";
               this.path = detail[1] || "";
             }
@@ -15630,9 +15630,9 @@ var init_esm2 = __esm({
               next
             );
           }
-          hashObject(path80, write) {
+          hashObject(path81, write) {
             return this._runTask(
-              hashObjectTask(path80, write === true),
+              hashObjectTask(path81, write === true),
               trailingFunctionArgument(arguments)
             );
           }
@@ -16269,8 +16269,8 @@ var init_esm2 = __esm({
           }
           return this._runTask(straightThroughStringTask2(command, this._trimmed), next);
         };
-        Git2.prototype.submoduleAdd = function(repo, path80, then) {
-          return this._runTask(addSubModuleTask2(repo, path80), trailingFunctionArgument2(arguments));
+        Git2.prototype.submoduleAdd = function(repo, path81, then) {
+          return this._runTask(addSubModuleTask2(repo, path81), trailingFunctionArgument2(arguments));
         };
         Git2.prototype.submoduleUpdate = function(args, then) {
           return this._runTask(
@@ -16896,7 +16896,7 @@ var require_ignore = __commonJS({
       //   path matching.
       // - check `string` either `MODE_IGNORE` or `MODE_CHECK_IGNORE`
       // @returns {TestResult} true if a file is ignored
-      test(path80, checkUnignored, mode) {
+      test(path81, checkUnignored, mode) {
         let ignored = false;
         let unignored = false;
         let matchedRule;
@@ -16905,7 +16905,7 @@ var require_ignore = __commonJS({
           if (unignored === negative && ignored !== unignored || negative && !ignored && !unignored && !checkUnignored) {
             return;
           }
-          const matched = rule[mode].test(path80);
+          const matched = rule[mode].test(path81);
           if (!matched) {
             return;
           }
@@ -16926,17 +16926,17 @@ var require_ignore = __commonJS({
     var throwError2 = (message, Ctor) => {
       throw new Ctor(message);
     };
-    var checkPath = (path80, originalPath, doThrow) => {
-      if (!isString(path80)) {
+    var checkPath = (path81, originalPath, doThrow) => {
+      if (!isString(path81)) {
         return doThrow(
           `path must be a string, but got \`${originalPath}\``,
           TypeError
         );
       }
-      if (!path80) {
+      if (!path81) {
         return doThrow(`path must not be empty`, TypeError);
       }
-      if (checkPath.isNotRelative(path80)) {
+      if (checkPath.isNotRelative(path81)) {
         const r = "`path.relative()`d";
         return doThrow(
           `path should be a ${r} string, but got "${originalPath}"`,
@@ -16945,7 +16945,7 @@ var require_ignore = __commonJS({
       }
       return true;
     };
-    var isNotRelative = (path80) => REGEX_TEST_INVALID_PATH.test(path80);
+    var isNotRelative = (path81) => REGEX_TEST_INVALID_PATH.test(path81);
     checkPath.isNotRelative = isNotRelative;
     checkPath.convert = (p2) => p2;
     var Ignore = class {
@@ -16975,19 +16975,19 @@ var require_ignore = __commonJS({
       }
       // @returns {TestResult}
       _test(originalPath, cache3, checkUnignored, slices) {
-        const path80 = originalPath && checkPath.convert(originalPath);
+        const path81 = originalPath && checkPath.convert(originalPath);
         checkPath(
-          path80,
+          path81,
           originalPath,
           this._strictPathCheck ? throwError2 : RETURN_FALSE
         );
-        return this._t(path80, cache3, checkUnignored, slices);
+        return this._t(path81, cache3, checkUnignored, slices);
       }
-      checkIgnore(path80) {
-        if (!REGEX_TEST_TRAILING_SLASH.test(path80)) {
-          return this.test(path80);
+      checkIgnore(path81) {
+        if (!REGEX_TEST_TRAILING_SLASH.test(path81)) {
+          return this.test(path81);
         }
-        const slices = path80.split(SLASH).filter(Boolean);
+        const slices = path81.split(SLASH).filter(Boolean);
         slices.pop();
         if (slices.length) {
           const parent = this._t(
@@ -17000,18 +17000,18 @@ var require_ignore = __commonJS({
             return parent;
           }
         }
-        return this._rules.test(path80, false, MODE_CHECK_IGNORE);
+        return this._rules.test(path81, false, MODE_CHECK_IGNORE);
       }
-      _t(path80, cache3, checkUnignored, slices) {
-        if (path80 in cache3) {
-          return cache3[path80];
+      _t(path81, cache3, checkUnignored, slices) {
+        if (path81 in cache3) {
+          return cache3[path81];
         }
         if (!slices) {
-          slices = path80.split(SLASH).filter(Boolean);
+          slices = path81.split(SLASH).filter(Boolean);
         }
         slices.pop();
         if (!slices.length) {
-          return cache3[path80] = this._rules.test(path80, checkUnignored, MODE_IGNORE);
+          return cache3[path81] = this._rules.test(path81, checkUnignored, MODE_IGNORE);
         }
         const parent = this._t(
           slices.join(SLASH) + SLASH,
@@ -17019,29 +17019,29 @@ var require_ignore = __commonJS({
           checkUnignored,
           slices
         );
-        return cache3[path80] = parent.ignored ? parent : this._rules.test(path80, checkUnignored, MODE_IGNORE);
+        return cache3[path81] = parent.ignored ? parent : this._rules.test(path81, checkUnignored, MODE_IGNORE);
       }
-      ignores(path80) {
-        return this._test(path80, this._ignoreCache, false).ignored;
+      ignores(path81) {
+        return this._test(path81, this._ignoreCache, false).ignored;
       }
       createFilter() {
-        return (path80) => !this.ignores(path80);
+        return (path81) => !this.ignores(path81);
       }
       filter(paths) {
         return makeArray(paths).filter(this.createFilter());
       }
       // @returns {TestResult}
-      test(path80) {
-        return this._test(path80, this._testCache, true);
+      test(path81) {
+        return this._test(path81, this._testCache, true);
       }
     };
     var factory = (options) => new Ignore(options);
-    var isPathValid = (path80) => checkPath(path80 && checkPath.convert(path80), path80, RETURN_FALSE);
+    var isPathValid = (path81) => checkPath(path81 && checkPath.convert(path81), path81, RETURN_FALSE);
     var setupWindows = () => {
       const makePosix = (str2) => /^\\\\\?\\/.test(str2) || /["<>|\u0000-\u001F]+/u.test(str2) ? str2 : str2.replace(/\\/g, "/");
       checkPath.convert = makePosix;
       const REGEX_TEST_WINDOWS_PATH_ABSOLUTE = /^[a-z]:\//i;
-      checkPath.isNotRelative = (path80) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path80) || isNotRelative(path80);
+      checkPath.isNotRelative = (path81) => REGEX_TEST_WINDOWS_PATH_ABSOLUTE.test(path81) || isNotRelative(path81);
     };
     if (
       // Detect `process` so that it can run in browsers.
@@ -18782,18 +18782,18 @@ function extractRouterMount(callNode, filePath) {
   const routerName = args[0]?.type === "identifier" ? args[0].text : null;
   if (!routerName)
     return null;
-  let path80 = "/";
+  let path81 = "/";
   for (const arg of args) {
     if (arg.type === "keyword_argument") {
       const key4 = arg.childForFieldName("name")?.text;
       const value = arg.childForFieldName("value");
       if ((key4 === "url_prefix" || key4 === "prefix") && value) {
-        path80 = value.text.replace(/^["']|["']$/g, "");
+        path81 = value.text.replace(/^["']|["']$/g, "");
       }
     }
   }
   return {
-    path: path80,
+    path: path81,
     routerName,
     location: {
       filePath,
@@ -18817,11 +18817,11 @@ function extractChainedRoute(outerCall, filePath) {
   const innerArgs = innerCall.childForFieldName("arguments");
   if (!innerArgs)
     return null;
-  let path80 = null;
+  let path81 = null;
   let httpMethod = methodName3 === "route" ? "GET" : methodName3.toUpperCase();
   for (const arg of innerArgs.namedChildren) {
-    if (!path80 && arg.type === "string") {
-      path80 = arg.text.replace(/^["']|["']$/g, "");
+    if (!path81 && arg.type === "string") {
+      path81 = arg.text.replace(/^["']|["']$/g, "");
     }
     if (arg.type === "keyword_argument") {
       const key4 = arg.childForFieldName("name")?.text;
@@ -18833,14 +18833,14 @@ function extractChainedRoute(outerCall, filePath) {
       }
     }
   }
-  if (!path80)
+  if (!path81)
     return null;
   const outerArgs = outerCall.childForFieldName("arguments");
   const handlerArg = outerArgs?.namedChildren[0];
   const handlerName = handlerArg?.type === "identifier" ? handlerArg.text : "anonymous";
   return {
     httpMethod,
-    path: path80,
+    path: path81,
     handlerName,
     location: {
       filePath,
@@ -18902,11 +18902,11 @@ function collectGroupPrefixes(root2) {
         const fn = child.childForFieldName("function");
         if (fn?.type === "member_access_expression" && fn.childForFieldName("name")?.text === "MapGroup") {
           const args = child.childForFieldName("arguments");
-          const path80 = args ? extractFirstStringArg(args) : null;
-          if (name && path80) {
+          const path81 = args ? extractFirstStringArg(args) : null;
+          if (name && path81) {
             const receiver = fn.childForFieldName("expression")?.text ?? "";
             const parentPrefix = prefixes.get(receiver) ?? "";
-            prefixes.set(name, joinRoute(parentPrefix, path80));
+            prefixes.set(name, joinRoute(parentPrefix, path81));
           }
         }
       }
@@ -18930,9 +18930,9 @@ function extractClassRoutePrefix(classNode) {
         continue;
       const args = childOfType(attr, "attribute_argument_list");
       if (args) {
-        const path80 = extractFirstStringArg(args);
-        if (path80)
-          return path80;
+        const path81 = extractFirstStringArg(args);
+        if (path81)
+          return path81;
       }
     }
   }
@@ -18955,16 +18955,16 @@ function extractAttributeRoute(methodNode, filePath, classContext) {
         httpMethod = method;
         const args = childOfType(attr, "attribute_argument_list");
         if (args) {
-          const path80 = extractFirstStringArg(args);
-          if (path80)
-            routePath = path80;
+          const path81 = extractFirstStringArg(args);
+          if (path81)
+            routePath = path81;
         }
       } else if (name === "Route" && !routePath) {
         const args = childOfType(attr, "attribute_argument_list");
         if (args) {
-          const path80 = extractFirstStringArg(args);
-          if (path80)
-            routePath = path80;
+          const path81 = extractFirstStringArg(args);
+          if (path81)
+            routePath = path81;
         }
       }
     }
@@ -18998,12 +18998,12 @@ function extractMinimalApiRoute(callNode, filePath, groupPrefixes) {
   const argsNode = callNode.childForFieldName("arguments");
   if (!argsNode)
     return null;
-  const path80 = extractFirstStringArg(argsNode);
-  if (path80 === null)
+  const path81 = extractFirstStringArg(argsNode);
+  if (path81 === null)
     return null;
   const receiver = funcNode.childForFieldName("expression")?.text ?? "";
   const prefix = groupPrefixes.get(receiver) ?? "";
-  let fullPath = joinRoute(prefix, path80);
+  let fullPath = joinRoute(prefix, path81);
   if (!fullPath.startsWith("/"))
     fullPath = "/" + fullPath;
   let handlerName = "anonymous";
@@ -19030,11 +19030,11 @@ function childOfType(node2, type2) {
   }
   return null;
 }
-function joinRoute(prefix, path80) {
+function joinRoute(prefix, path81) {
   const p2 = prefix.replace(/\/$/, "");
-  const s = path80.replace(/^\//, "");
+  const s = path81.replace(/^\//, "");
   if (!p2)
-    return path80;
+    return path81;
   if (!s)
     return p2;
   return `${p2}/${s}`;
@@ -19143,8 +19143,8 @@ function extractRoute(methodName3, argsNode, filePath, callNode) {
   const firstArg = argsNode.namedChild(0);
   if (!firstArg)
     return null;
-  const path80 = extractStringLiteral(firstArg);
-  if (!path80)
+  const path81 = extractStringLiteral(firstArg);
+  if (!path81)
     return null;
   const argCount = argsNode.namedChildCount;
   if (argCount < 2)
@@ -19157,7 +19157,7 @@ function extractRoute(methodName3, argsNode, filePath, callNode) {
     return null;
   return {
     httpMethod: methodName3.toUpperCase(),
-    path: path80,
+    path: path81,
     handlerName,
     location: {
       filePath,
@@ -19174,8 +19174,8 @@ function extractMount(argsNode, filePath, callNode) {
   const firstArg = argsNode.namedChild(0);
   if (!firstArg)
     return null;
-  const path80 = extractStringLiteral(firstArg);
-  if (!path80)
+  const path81 = extractStringLiteral(firstArg);
+  if (!path81)
     return null;
   const secondArg = argsNode.namedChild(1);
   if (!secondArg)
@@ -19184,7 +19184,7 @@ function extractMount(argsNode, filePath, callNode) {
   if (!routerName)
     return null;
   return {
-    path: path80,
+    path: path81,
     routerName,
     location: {
       filePath,
@@ -21715,11 +21715,11 @@ function buildCSharpSymbolIndex(files, rootPath) {
     byFullName.get(full).push(decl);
   }
   const stats = { resolvedRefs: 0, ambiguousRefs: 0 };
-  function resolveQualified(path80) {
-    const exact = byFullName.get(path80);
+  function resolveQualified(path81) {
+    const exact = byFullName.get(path81);
     if (exact)
       return exact;
-    const parts = path80.split(".");
+    const parts = path81.split(".");
     for (let i = parts.length - 1; i > 0; i--) {
       const prefix = parts.slice(0, i).join(".");
       const found = byFullName.get(prefix);
@@ -21733,8 +21733,8 @@ function buildCSharpSymbolIndex(files, rootPath) {
       const firstDot = ref.name.indexOf(".");
       const head = ref.name.slice(0, firstDot);
       const aliasTarget2 = aliases.get(head);
-      const path80 = aliasTarget2 ? `${aliasTarget2}${ref.name.slice(firstDot)}` : ref.name;
-      return resolveQualified(path80).filter((d3) => isDeclVisibleFrom(d3, ctx.project, fileProjects.get(d3.filePath)));
+      const path81 = aliasTarget2 ? `${aliasTarget2}${ref.name.slice(firstDot)}` : ref.name;
+      return resolveQualified(path81).filter((d3) => isDeclVisibleFrom(d3, ctx.project, fileProjects.get(d3.filePath)));
     }
     const aliasTarget = aliases.get(ref.name);
     if (aliasTarget) {
@@ -24855,9 +24855,9 @@ function detectDockerComposeServices(rootPath, allFiles) {
   ];
   let composePath2 = null;
   for (const file of composeFiles) {
-    const path80 = join8(rootPath, file);
-    if (existsSync7(path80)) {
-      composePath2 = path80;
+    const path81 = join8(rootPath, file);
+    if (existsSync7(path81)) {
+      composePath2 = path81;
       break;
     }
   }
@@ -28077,9 +28077,9 @@ function findSimpleCycles(component, componentSet, adjacency) {
       for (const next of successors) {
         if (!componentSet.has(next))
           continue;
-        if (next === start && path80.length >= 2) {
-          const chain = [...path80, start];
-          const minNode = path80.reduce((a, b) => a < b ? a : b);
+        if (next === start && path81.length >= 2) {
+          const chain = [...path81, start];
+          const minNode = path81.reduce((a, b) => a < b ? a : b);
           if (minNode === start) {
             cycles.push(chain);
           }
@@ -28087,15 +28087,15 @@ function findSimpleCycles(component, componentSet, adjacency) {
         }
         if (!visited.has(next) && !seen.has(next)) {
           visited.add(next);
-          path80.push(next);
+          path81.push(next);
           dfs2(next);
-          path80.pop();
+          path81.pop();
           visited.delete(next);
         }
       }
     };
     var dfs = dfs2;
-    const path80 = [start];
+    const path81 = [start];
     const visited = /* @__PURE__ */ new Set([start]);
     dfs2(start);
     seen.add(start);
@@ -28117,7 +28117,7 @@ function findShortestCycle(start, componentSet, adjacency) {
     visited.add(next);
   }
   while (queue.length > 0) {
-    const { node: node2, path: path80 } = queue.shift();
+    const { node: node2, path: path81 } = queue.shift();
     const nexts = adjacency.get(node2);
     if (!nexts)
       continue;
@@ -28125,11 +28125,11 @@ function findShortestCycle(start, componentSet, adjacency) {
       if (!componentSet.has(next))
         continue;
       if (next === start) {
-        return [...path80, start];
+        return [...path81, start];
       }
       if (!visited.has(next)) {
         visited.add(next);
-        queue.push({ node: next, path: [...path80, next] });
+        queue.push({ node: next, path: [...path81, next] });
       }
     }
   }
@@ -105838,11 +105838,8 @@ var init_guard = __esm({
 });
 
 // packages/shared/dist/spec/overlap-resolution.js
-function coveringRelationInAreas(relations, a, b, areas) {
-  return relations.find((r) => {
-    const samePair = r.older === a && r.newer === b || r.older === b && r.newer === a;
-    return samePair && (r.scope === void 0 || areas.includes(r.scope));
-  });
+function normalizeQuote(text4) {
+  return text4.replace(/[`*_~]/g, "").toLowerCase().replace(/\s+/g, " ").trim();
 }
 function dedupeCrossAreaOverlaps(entries) {
   const byPair = /* @__PURE__ */ new Map();
@@ -105916,9 +105913,23 @@ function dedupeCrossAreaOverlaps(entries) {
   });
   return merged;
 }
+function resolutionMatchesConflict(r, a, b, sections) {
+  if (!samePair(r.docA, r.docB, a, b))
+    return false;
+  const rSide = (doc) => doc === r.docA ? { anchor: r.anchorA, quote: r.quoteA } : { anchor: r.anchorB, quote: r.quoteB };
+  const cSide = (doc) => (sections ?? []).find((s) => s.doc === doc);
+  const bothHaveQuotes = !!r.quoteA && !!r.quoteB && !!cSide(a)?.quote && !!cSide(b)?.quote;
+  if (bothHaveQuotes) {
+    const quoteMatch = (doc) => normalizeQuote(rSide(doc).quote ?? "") === normalizeQuote(cSide(doc)?.quote ?? "");
+    return quoteMatch(a) && quoteMatch(b);
+  }
+  const anchorMatch = (doc) => anchorKey(rSide(doc).anchor) === anchorKey(cSide(doc)?.heading);
+  return anchorMatch(a) && anchorMatch(b);
+}
+function matchResolution(decisions, a, b, sections) {
+  return (decisions.conflictResolutions ?? []).find((r) => resolutionMatchesConflict(r, a, b, sections));
+}
 function buildCorpusConflicts(corpus, decisions) {
-  const userRelations = decisions.relations ?? [];
-  const effectiveRels = [...corpus.relations, ...userRelations];
   const excludes = new Set(decisions.manualExcludes ?? []);
   const entries = [];
   for (const area of corpus.areas)
@@ -105928,43 +105939,46 @@ function buildCorpusConflicts(corpus, decisions) {
   const flagged = [];
   for (const m of mergedOverlaps) {
     const [a, b] = m.overlap.docs;
-    const relation = coveringRelationInAreas(effectiveRels, a, b, m.areas);
-    const userRelation = coveringRelationInAreas(userRelations, a, b, m.areas);
+    const sections = m.overlap.sections ? [...m.overlap.sections] : void 0;
     const excludedRef = excludes.has(a) ? a : excludes.has(b) ? b : void 0;
+    const resolution = matchResolution(decisions, a, b, sections);
     flagged.push({
       area: m.area,
       areas: m.areas,
       a,
       b,
       note: m.overlap.note ?? "",
-      resolved: relation !== void 0 || excludedRef !== void 0,
-      synthesized: false,
-      ...relation ? { relation } : {},
-      ...userRelation ? { userRelation } : {},
-      ...excludedRef ? { excludedRef } : {}
+      ...sections ? { sections } : {},
+      resolved: excludedRef !== void 0 || resolution !== void 0,
+      ...excludedRef ? { excludedRef } : {},
+      ...resolution ? { resolution } : {}
     });
   }
-  const coversFlagged = (r) => flagged.some((o) => {
-    const samePair = o.a === r.older && o.b === r.newer || o.a === r.newer && o.b === r.older;
-    return samePair && (r.scope === void 0 || o.areas.includes(r.scope));
-  });
-  const synthesized = userRelations.filter((r) => !coversFlagged(r)).map((r) => ({
-    area: r.scope ?? "",
-    areas: r.scope ? [r.scope] : [],
-    a: r.older,
-    b: r.newer,
-    note: r.note ?? "",
-    resolved: true,
-    synthesized: true,
-    relation: r,
-    userRelation: r
-  }));
-  return [...flagged, ...synthesized];
+  return flagged;
 }
 function openConflicts(corpus, decisions) {
   return buildCorpusConflicts(corpus, decisions).filter((c2) => !c2.resolved);
 }
-var PREAMBLE_PTR, NUL, unorderedPairKey, sectionPointerKeys, preambleCount;
+function orphanedConflictResolutions(corpus, decisions) {
+  const resolutions = decisions.conflictResolutions ?? [];
+  if (resolutions.length === 0)
+    return [];
+  const conflicts2 = buildCorpusConflicts(corpus, decisions);
+  return resolutions.filter((r) => !conflicts2.some((c2) => resolutionMatchesConflict(r, c2.a, c2.b, c2.sections)));
+}
+function suppressedClaims(corpus, decisions) {
+  const out = [];
+  for (const c2 of buildCorpusConflicts(corpus, decisions)) {
+    const r = c2.resolution;
+    if (!r || r.verdict === "dismissed")
+      continue;
+    const loser = r.verdict === "a" ? { doc: r.docB, anchor: r.anchorB, quote: r.quoteB } : { doc: r.docA, anchor: r.anchorA, quote: r.quoteA };
+    if (loser.quote && loser.quote.trim())
+      out.push({ doc: loser.doc, anchor: loser.anchor, quote: loser.quote });
+  }
+  return out;
+}
+var PREAMBLE_PTR, NUL, unorderedPairKey, sectionPointerKeys, preambleCount, samePair, anchorKey;
 var init_overlap_resolution = __esm({
   "packages/shared/dist/spec/overlap-resolution.js"() {
     "use strict";
@@ -105973,6 +105987,8 @@ var init_overlap_resolution = __esm({
     unorderedPairKey = (a, b) => a < b ? `${a}${NUL}${b}` : `${b}${NUL}${a}`;
     sectionPointerKeys = (ov) => (ov.sections ?? []).map((s) => `${s.doc}${NUL}${s.heading ?? PREAMBLE_PTR}`);
     preambleCount = (ov) => (ov.sections ?? []).filter((s) => s.heading === null || s.heading === void 0).length;
+    samePair = (a1, b1, a2, b2) => a1 === a2 && b1 === b2 || a1 === b2 && b1 === a2;
+    anchorKey = (h) => h === null || h === void 0 ? null : h.replace(/[`*_~]/g, "").trim().toLowerCase();
   }
 });
 
@@ -112402,14 +112418,14 @@ var init_missing_error_status_code = __esm({
 });
 
 // packages/analyzer/dist/rules/architecture/visitors/javascript/route-without-auth-middleware.js
-function isPublicPath(path80) {
-  return PUBLIC_PATH_PATTERNS.some((re2) => re2.test(path80));
+function isPublicPath(path81) {
+  return PUBLIC_PATH_PATTERNS.some((re2) => re2.test(path81));
 }
-function isUrlCredentialAuthedPath(path80) {
-  return URL_CREDENTIAL_PARAMS.test(path80);
+function isUrlCredentialAuthedPath(path81) {
+  return URL_CREDENTIAL_PARAMS.test(path81);
 }
-function isApiDocsPath(path80) {
-  return API_DOCS_PATH.test(path80);
+function isApiDocsPath(path81) {
+  return API_DOCS_PATH.test(path81);
 }
 function isFrameworkRequestHandler(arg) {
   if (!arg)
@@ -112558,14 +112574,14 @@ var init_route_without_auth_middleware = __esm({
           return null;
         const firstArg = args.namedChildren[0];
         if (firstArg?.type === "string" || firstArg?.type === "template_string") {
-          const path80 = firstArg.text.replace(/^['"`]|['"`]$/g, "");
-          if (isPublicPath(path80))
+          const path81 = firstArg.text.replace(/^['"`]|['"`]$/g, "");
+          if (isPublicPath(path81))
             return null;
-          if (isUrlCredentialAuthedPath(path80))
+          if (isUrlCredentialAuthedPath(path81))
             return null;
-          if (isApiDocsPath(path80))
+          if (isApiDocsPath(path81))
             return null;
-          if (path80 === "*" || path80 === "(.*)" || path80 === "/*") {
+          if (path81 === "*" || path81 === "(.*)" || path81 === "/*") {
             if (isFrameworkRequestHandler(args.namedChildren[args.namedChildren.length - 1])) {
               return null;
             }
@@ -147471,8 +147487,8 @@ var require_windows = __commonJS({
   "node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/windows.js"(exports, module) {
     module.exports = isexe;
     isexe.sync = sync;
-    var fs71 = __require("fs");
-    function checkPathExt(path80, options) {
+    var fs72 = __require("fs");
+    function checkPathExt(path81, options) {
       var pathext = options.pathExt !== void 0 ? options.pathExt : process.env.PATHEXT;
       if (!pathext) {
         return true;
@@ -147483,25 +147499,25 @@ var require_windows = __commonJS({
       }
       for (var i = 0; i < pathext.length; i++) {
         var p2 = pathext[i].toLowerCase();
-        if (p2 && path80.substr(-p2.length).toLowerCase() === p2) {
+        if (p2 && path81.substr(-p2.length).toLowerCase() === p2) {
           return true;
         }
       }
       return false;
     }
-    function checkStat(stat, path80, options) {
+    function checkStat(stat, path81, options) {
       if (!stat.isSymbolicLink() && !stat.isFile()) {
         return false;
       }
-      return checkPathExt(path80, options);
+      return checkPathExt(path81, options);
     }
-    function isexe(path80, options, cb) {
-      fs71.stat(path80, function(er, stat) {
-        cb(er, er ? false : checkStat(stat, path80, options));
+    function isexe(path81, options, cb) {
+      fs72.stat(path81, function(er, stat) {
+        cb(er, er ? false : checkStat(stat, path81, options));
       });
     }
-    function sync(path80, options) {
-      return checkStat(fs71.statSync(path80), path80, options);
+    function sync(path81, options) {
+      return checkStat(fs72.statSync(path81), path81, options);
     }
   }
 });
@@ -147511,14 +147527,14 @@ var require_mode = __commonJS({
   "node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/mode.js"(exports, module) {
     module.exports = isexe;
     isexe.sync = sync;
-    var fs71 = __require("fs");
-    function isexe(path80, options, cb) {
-      fs71.stat(path80, function(er, stat) {
+    var fs72 = __require("fs");
+    function isexe(path81, options, cb) {
+      fs72.stat(path81, function(er, stat) {
         cb(er, er ? false : checkStat(stat, options));
       });
     }
-    function sync(path80, options) {
-      return checkStat(fs71.statSync(path80), options);
+    function sync(path81, options) {
+      return checkStat(fs72.statSync(path81), options);
     }
     function checkStat(stat, options) {
       return stat.isFile() && checkMode(stat, options);
@@ -147542,7 +147558,7 @@ var require_mode = __commonJS({
 // node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/index.js
 var require_isexe = __commonJS({
   "node_modules/.pnpm/isexe@2.0.0/node_modules/isexe/index.js"(exports, module) {
-    var fs71 = __require("fs");
+    var fs72 = __require("fs");
     var core2;
     if (process.platform === "win32" || global.TESTING_WINDOWS) {
       core2 = require_windows();
@@ -147551,7 +147567,7 @@ var require_isexe = __commonJS({
     }
     module.exports = isexe;
     isexe.sync = sync;
-    function isexe(path80, options, cb) {
+    function isexe(path81, options, cb) {
       if (typeof options === "function") {
         cb = options;
         options = {};
@@ -147561,7 +147577,7 @@ var require_isexe = __commonJS({
           throw new TypeError("callback not provided");
         }
         return new Promise(function(resolve12, reject) {
-          isexe(path80, options || {}, function(er, is) {
+          isexe(path81, options || {}, function(er, is) {
             if (er) {
               reject(er);
             } else {
@@ -147570,7 +147586,7 @@ var require_isexe = __commonJS({
           });
         });
       }
-      core2(path80, options || {}, function(er, is) {
+      core2(path81, options || {}, function(er, is) {
         if (er) {
           if (er.code === "EACCES" || options && options.ignoreErrors) {
             er = null;
@@ -147580,9 +147596,9 @@ var require_isexe = __commonJS({
         cb(er, is);
       });
     }
-    function sync(path80, options) {
+    function sync(path81, options) {
       try {
-        return core2.sync(path80, options || {});
+        return core2.sync(path81, options || {});
       } catch (er) {
         if (options && options.ignoreErrors || er.code === "EACCES") {
           return false;
@@ -147598,7 +147614,7 @@ var require_isexe = __commonJS({
 var require_which = __commonJS({
   "node_modules/.pnpm/which@2.0.2/node_modules/which/which.js"(exports, module) {
     var isWindows = process.platform === "win32" || process.env.OSTYPE === "cygwin" || process.env.OSTYPE === "msys";
-    var path80 = __require("path");
+    var path81 = __require("path");
     var COLON = isWindows ? ";" : ":";
     var isexe = require_isexe();
     var getNotFoundError = (cmd) => Object.assign(new Error(`not found: ${cmd}`), { code: "ENOENT" });
@@ -147636,7 +147652,7 @@ var require_which = __commonJS({
           return opt.all && found.length ? resolve12(found) : reject(getNotFoundError(cmd));
         const ppRaw = pathEnv[i];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-        const pCmd = path80.join(pathPart, cmd);
+        const pCmd = path81.join(pathPart, cmd);
         const p2 = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
         resolve12(subStep(p2, i, 0));
       });
@@ -147663,7 +147679,7 @@ var require_which = __commonJS({
       for (let i = 0; i < pathEnv.length; i++) {
         const ppRaw = pathEnv[i];
         const pathPart = /^".*"$/.test(ppRaw) ? ppRaw.slice(1, -1) : ppRaw;
-        const pCmd = path80.join(pathPart, cmd);
+        const pCmd = path81.join(pathPart, cmd);
         const p2 = !pathPart && /^\.[\\\/]/.test(cmd) ? cmd.slice(0, 2) + pCmd : pCmd;
         for (let j2 = 0; j2 < pathExt.length; j2++) {
           const cur = p2 + pathExt[j2];
@@ -147711,7 +147727,7 @@ var require_path_key = __commonJS({
 var require_resolveCommand = __commonJS({
   "node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/resolveCommand.js"(exports, module) {
     "use strict";
-    var path80 = __require("path");
+    var path81 = __require("path");
     var which = require_which();
     var getPathKey = require_path_key();
     function resolveCommandAttempt(parsed, withoutPathExt) {
@@ -147729,7 +147745,7 @@ var require_resolveCommand = __commonJS({
       try {
         resolved = which.sync(parsed.command, {
           path: env[getPathKey({ env })],
-          pathExt: withoutPathExt ? path80.delimiter : void 0
+          pathExt: withoutPathExt ? path81.delimiter : void 0
         });
       } catch (e) {
       } finally {
@@ -147738,7 +147754,7 @@ var require_resolveCommand = __commonJS({
         }
       }
       if (resolved) {
-        resolved = path80.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
+        resolved = path81.resolve(hasCustomCwd ? parsed.options.cwd : "", resolved);
       }
       return resolved;
     }
@@ -147792,8 +147808,8 @@ var require_shebang_command = __commonJS({
       if (!match4) {
         return null;
       }
-      const [path80, argument] = match4[0].replace(/#! ?/, "").split(" ");
-      const binary2 = path80.split("/").pop();
+      const [path81, argument] = match4[0].replace(/#! ?/, "").split(" ");
+      const binary2 = path81.split("/").pop();
       if (binary2 === "env") {
         return argument;
       }
@@ -147806,16 +147822,16 @@ var require_shebang_command = __commonJS({
 var require_readShebang = __commonJS({
   "node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/util/readShebang.js"(exports, module) {
     "use strict";
-    var fs71 = __require("fs");
+    var fs72 = __require("fs");
     var shebangCommand = require_shebang_command();
     function readShebang(command) {
       const size = 150;
       const buffer = Buffer.alloc(size);
       let fd;
       try {
-        fd = fs71.openSync(command, "r");
-        fs71.readSync(fd, buffer, 0, size, 0);
-        fs71.closeSync(fd);
+        fd = fs72.openSync(command, "r");
+        fs72.readSync(fd, buffer, 0, size, 0);
+        fs72.closeSync(fd);
       } catch (e) {
       }
       return shebangCommand(buffer.toString());
@@ -147828,7 +147844,7 @@ var require_readShebang = __commonJS({
 var require_parse = __commonJS({
   "node_modules/.pnpm/cross-spawn@7.0.6/node_modules/cross-spawn/lib/parse.js"(exports, module) {
     "use strict";
-    var path80 = __require("path");
+    var path81 = __require("path");
     var resolveCommand = require_resolveCommand();
     var escape2 = require_escape();
     var readShebang = require_readShebang();
@@ -147853,7 +147869,7 @@ var require_parse = __commonJS({
       const needsShell = !isExecutableRegExp.test(commandFile);
       if (parsed.options.forceShell || needsShell) {
         const needsDoubleEscapeMetaChars = isCmdShimRegExp.test(commandFile);
-        parsed.command = path80.normalize(parsed.command);
+        parsed.command = path81.normalize(parsed.command);
         parsed.command = escape2.command(parsed.command);
         parsed.args = parsed.args.map((arg) => escape2.argument(arg, needsDoubleEscapeMetaChars));
         const shellCommand = [parsed.command].concat(parsed.args).join(" ");
@@ -148219,8 +148235,8 @@ var require_package = __commonJS({
 // node_modules/.pnpm/dotenv@16.6.1/node_modules/dotenv/lib/main.js
 var require_main = __commonJS({
   "node_modules/.pnpm/dotenv@16.6.1/node_modules/dotenv/lib/main.js"(exports, module) {
-    var fs71 = __require("fs");
-    var path80 = __require("path");
+    var fs72 = __require("fs");
+    var path81 = __require("path");
     var os15 = __require("os");
     var crypto6 = __require("crypto");
     var packageJson = require_package();
@@ -148328,7 +148344,7 @@ var require_main = __commonJS({
       if (options && options.path && options.path.length > 0) {
         if (Array.isArray(options.path)) {
           for (const filepath of options.path) {
-            if (fs71.existsSync(filepath)) {
+            if (fs72.existsSync(filepath)) {
               possibleVaultPath = filepath.endsWith(".vault") ? filepath : `${filepath}.vault`;
             }
           }
@@ -148336,15 +148352,15 @@ var require_main = __commonJS({
           possibleVaultPath = options.path.endsWith(".vault") ? options.path : `${options.path}.vault`;
         }
       } else {
-        possibleVaultPath = path80.resolve(process.cwd(), ".env.vault");
+        possibleVaultPath = path81.resolve(process.cwd(), ".env.vault");
       }
-      if (fs71.existsSync(possibleVaultPath)) {
+      if (fs72.existsSync(possibleVaultPath)) {
         return possibleVaultPath;
       }
       return null;
     }
     function _resolveHome(envPath) {
-      return envPath[0] === "~" ? path80.join(os15.homedir(), envPath.slice(1)) : envPath;
+      return envPath[0] === "~" ? path81.join(os15.homedir(), envPath.slice(1)) : envPath;
     }
     function _configVault(options) {
       const debug2 = Boolean(options && options.debug);
@@ -148361,7 +148377,7 @@ var require_main = __commonJS({
       return { parsed };
     }
     function configDotenv(options) {
-      const dotenvPath = path80.resolve(process.cwd(), ".env");
+      const dotenvPath = path81.resolve(process.cwd(), ".env");
       let encoding = "utf8";
       const debug2 = Boolean(options && options.debug);
       const quiet = options && "quiet" in options ? options.quiet : true;
@@ -148385,13 +148401,13 @@ var require_main = __commonJS({
       }
       let lastError;
       const parsedAll = {};
-      for (const path81 of optionPaths) {
+      for (const path82 of optionPaths) {
         try {
-          const parsed = DotenvModule.parse(fs71.readFileSync(path81, { encoding }));
+          const parsed = DotenvModule.parse(fs72.readFileSync(path82, { encoding }));
           DotenvModule.populate(parsedAll, parsed, options);
         } catch (e) {
           if (debug2) {
-            _debug(`Failed to load ${path81} ${e.message}`);
+            _debug(`Failed to load ${path82} ${e.message}`);
           }
           lastError = e;
         }
@@ -148406,7 +148422,7 @@ var require_main = __commonJS({
         const shortPaths = [];
         for (const filePath of optionPaths) {
           try {
-            const relative2 = path80.relative(process.cwd(), filePath);
+            const relative2 = path81.relative(process.cwd(), filePath);
             shortPaths.push(relative2);
           } catch (e) {
             if (debug2) {
@@ -149265,8 +149281,8 @@ var init_cli_provider = __esm({
         this._repoId = repoId;
       }
       /** Set target repo path — used as cwd when spawning CLI so Read tool accesses the right files. */
-      setRepoPath(path80) {
-        this._repoPath = path80;
+      setRepoPath(path81) {
+        this._repoPath = path81;
       }
       flushUsage() {
         if (this._usageRecords.length === 0)
@@ -161397,11 +161413,11 @@ var require_mime_types = __commonJS({
       }
       return exts[0];
     }
-    function lookup(path80) {
-      if (!path80 || typeof path80 !== "string") {
+    function lookup(path81) {
+      if (!path81 || typeof path81 !== "string") {
         return false;
       }
-      var extension2 = extname("x." + path80).toLowerCase().substr(1);
+      var extension2 = extname("x." + path81).toLowerCase().substr(1);
       if (!extension2) {
         return false;
       }
@@ -162506,11 +162522,11 @@ var require_form_data = __commonJS({
     "use strict";
     var CombinedStream = require_combined_stream();
     var util2 = __require("util");
-    var path80 = __require("path");
+    var path81 = __require("path");
     var http = __require("http");
     var https = __require("https");
     var parseUrl = __require("url").parse;
-    var fs71 = __require("fs");
+    var fs72 = __require("fs");
     var Stream = __require("stream").Stream;
     var crypto6 = __require("crypto");
     var mime = require_mime_types();
@@ -162577,7 +162593,7 @@ var require_form_data = __commonJS({
         if (value.end != void 0 && value.end != Infinity && value.start != void 0) {
           callback(null, value.end + 1 - (value.start ? value.start : 0));
         } else {
-          fs71.stat(value.path, function(err, stat) {
+          fs72.stat(value.path, function(err, stat) {
             if (err) {
               callback(err);
               return;
@@ -162634,11 +162650,11 @@ var require_form_data = __commonJS({
     FormData2.prototype._getContentDisposition = function(value, options) {
       var filename;
       if (typeof options.filepath === "string") {
-        filename = path80.normalize(options.filepath).replace(/\\/g, "/");
+        filename = path81.normalize(options.filepath).replace(/\\/g, "/");
       } else if (options.filename || value && (value.name || value.path)) {
-        filename = path80.basename(options.filename || value && (value.name || value.path));
+        filename = path81.basename(options.filename || value && (value.name || value.path));
       } else if (value && value.readable && hasOwn(value, "httpVersion")) {
-        filename = path80.basename(value.client._httpMessage.path || "");
+        filename = path81.basename(value.client._httpMessage.path || "");
       }
       if (filename) {
         return 'filename="' + filename + '"';
@@ -163195,8 +163211,8 @@ var require_node2 = __commonJS({
           }
           break;
         case "FILE":
-          var fs71 = __require("fs");
-          stream2 = new fs71.SyncWriteStream(fd2, { autoClose: false });
+          var fs72 = __require("fs");
+          stream2 = new fs72.SyncWriteStream(fd2, { autoClose: false });
           stream2._type = "fs";
           break;
         case "PIPE":
@@ -164292,9 +164308,9 @@ var require_axios = __commonJS({
     function removeBrackets(key4) {
       return utils$1.endsWith(key4, "[]") ? key4.slice(0, -2) : key4;
     }
-    function renderKey(path80, key4, dots) {
-      if (!path80) return key4;
-      return path80.concat(key4).map(function each(token, i) {
+    function renderKey(path81, key4, dots) {
+      if (!path81) return key4;
+      return path81.concat(key4).map(function each(token, i) {
         token = removeBrackets(token);
         return !dots && i ? "[" + token + "]" : token;
       }).join(dots ? "." : "");
@@ -164342,13 +164358,13 @@ var require_axios = __commonJS({
         }
         return value;
       }
-      function defaultVisitor(value, key4, path80) {
+      function defaultVisitor(value, key4, path81) {
         let arr = value;
         if (utils$1.isReactNative(formData) && utils$1.isReactNativeBlob(value)) {
-          formData.append(renderKey(path80, key4, dots), convertValue(value));
+          formData.append(renderKey(path81, key4, dots), convertValue(value));
           return false;
         }
-        if (value && !path80 && typeof value === "object") {
+        if (value && !path81 && typeof value === "object") {
           if (utils$1.endsWith(key4, "{}")) {
             key4 = metaTokens ? key4 : key4.slice(0, -2);
             value = JSON.stringify(value);
@@ -164367,7 +164383,7 @@ var require_axios = __commonJS({
         if (isVisitable(value)) {
           return true;
         }
-        formData.append(renderKey(path80, key4, dots), convertValue(value));
+        formData.append(renderKey(path81, key4, dots), convertValue(value));
         return false;
       }
       const stack2 = [];
@@ -164376,16 +164392,16 @@ var require_axios = __commonJS({
         convertValue,
         isVisitable
       });
-      function build8(value, path80) {
+      function build8(value, path81) {
         if (utils$1.isUndefined(value)) return;
         if (stack2.indexOf(value) !== -1) {
-          throw Error("Circular reference detected in " + path80.join("."));
+          throw Error("Circular reference detected in " + path81.join("."));
         }
         stack2.push(value);
         utils$1.forEach(value, function each(el, key4) {
-          const result = !(utils$1.isUndefined(el) || el === null) && visitor.call(formData, el, utils$1.isString(key4) ? key4.trim() : key4, path80, exposedHelpers);
+          const result = !(utils$1.isUndefined(el) || el === null) && visitor.call(formData, el, utils$1.isString(key4) ? key4.trim() : key4, path81, exposedHelpers);
           if (result === true) {
-            build8(el, path80 ? path80.concat(key4) : [key4]);
+            build8(el, path81 ? path81.concat(key4) : [key4]);
           }
         });
         stack2.pop();
@@ -164574,7 +164590,7 @@ var require_axios = __commonJS({
     };
     function toURLEncodedForm(data, options) {
       return toFormData(data, new platform.classes.URLSearchParams(), {
-        visitor: function(value, key4, path80, helpers) {
+        visitor: function(value, key4, path81, helpers) {
           if (platform.isNode && utils$1.isBuffer(value)) {
             this.append(key4, value.toString("base64"));
             return false;
@@ -164602,11 +164618,11 @@ var require_axios = __commonJS({
       return obj;
     }
     function formDataToJSON(formData) {
-      function buildPath(path80, value, target, index) {
-        let name = path80[index++];
+      function buildPath(path81, value, target, index) {
+        let name = path81[index++];
         if (name === "__proto__") return true;
         const isNumericKey = Number.isFinite(+name);
-        const isLast = index >= path80.length;
+        const isLast = index >= path81.length;
         name = !name && utils$1.isArray(target) ? target.length : name;
         if (isLast) {
           if (utils$1.hasOwnProp(target, name)) {
@@ -164619,7 +164635,7 @@ var require_axios = __commonJS({
         if (!target[name] || !utils$1.isObject(target[name])) {
           target[name] = [];
         }
-        const result = buildPath(path80, value, target[name], index);
+        const result = buildPath(path81, value, target[name], index);
         if (result && utils$1.isArray(target[name])) {
           target[name] = arrayToObject(target[name]);
         }
@@ -165937,9 +165953,9 @@ var require_axios = __commonJS({
           auth = urlUsername + ":" + urlPassword;
         }
         auth && headers.delete("authorization");
-        let path80;
+        let path81;
         try {
-          path80 = buildURL(parsed.pathname + parsed.search, config2.params, config2.paramsSerializer).replace(/^\?/, "");
+          path81 = buildURL(parsed.pathname + parsed.search, config2.params, config2.paramsSerializer).replace(/^\?/, "");
         } catch (err) {
           const customErr = new Error(err.message);
           customErr.config = config2;
@@ -165949,7 +165965,7 @@ var require_axios = __commonJS({
         }
         headers.set("Accept-Encoding", "gzip, compress, deflate" + (isBrotliSupported ? ", br" : ""), false);
         const options = {
-          path: path80,
+          path: path81,
           method,
           headers: headers.toJSON(),
           agents: {
@@ -166155,14 +166171,14 @@ var require_axios = __commonJS({
     var cookies = platform.hasStandardBrowserEnv ? (
       // Standard browser envs support document.cookie
       {
-        write(name, value, expires, path80, domain, secure, sameSite) {
+        write(name, value, expires, path81, domain, secure, sameSite) {
           if (typeof document === "undefined") return;
           const cookie = [`${name}=${encodeURIComponent(value)}`];
           if (utils$1.isNumber(expires)) {
             cookie.push(`expires=${new Date(expires).toUTCString()}`);
           }
-          if (utils$1.isString(path80)) {
-            cookie.push(`path=${path80}`);
+          if (utils$1.isString(path81)) {
+            cookie.push(`path=${path81}`);
           }
           if (utils$1.isString(domain)) {
             cookie.push(`domain=${domain}`);
@@ -167683,8 +167699,8 @@ function createGetModuleFromFilename(basePath = process.argv[1] ? dirname10(proc
     return decodedFile;
   };
 }
-function normalizeWindowsPath(path80) {
-  return path80.replace(/^[A-Z]:/, "").replace(/\\/g, "/");
+function normalizeWindowsPath(path81) {
+  return path81.replace(/^[A-Z]:/, "").replace(/\\/g, "/");
 }
 async function addSourceContext(frames) {
   const filesToLines = {};
@@ -167729,9 +167745,9 @@ async function addSourceContext(frames) {
   LRU_FILE_CONTENTS_CACHE.reduce();
   return frames;
 }
-function getContextLinesFromFile(path80, ranges, output) {
+function getContextLinesFromFile(path81, ranges, output) {
   return new Promise((resolve12) => {
-    const stream = createReadStream(path80);
+    const stream = createReadStream(path81);
     const lineReaded = createInterface2({
       input: stream
     });
@@ -167749,7 +167765,7 @@ function getContextLinesFromFile(path80, ranges, output) {
     let rangeStart = range2[0];
     let rangeEnd = range2[1];
     function onStreamError() {
-      LRU_FILE_CONTENTS_FS_READ_FAILED.set(path80, 1);
+      LRU_FILE_CONTENTS_FS_READ_FAILED.set(path81, 1);
       lineReaded.close();
       lineReaded.removeAllListeners();
       destroyStreamAndResolve();
@@ -167826,8 +167842,8 @@ function clearLineContext(frame) {
   delete frame.context_line;
   delete frame.post_context;
 }
-function shouldSkipContextLinesForFile(path80) {
-  return path80.startsWith("node:") || path80.endsWith(".min.js") || path80.endsWith(".min.cjs") || path80.endsWith(".min.mjs") || path80.startsWith("data:");
+function shouldSkipContextLinesForFile(path81) {
+  return path81.startsWith("node:") || path81.endsWith(".min.js") || path81.endsWith(".min.cjs") || path81.endsWith(".min.mjs") || path81.startsWith("data:");
 }
 function shouldSkipContextLinesForFrame(frame) {
   if (frame.lineno !== void 0 && frame.lineno > MAX_CONTEXTLINES_LINENO) {
@@ -171176,7 +171192,7 @@ function readToolVersion() {
   if (cachedVersion)
     return cachedVersion;
   if (true) {
-    cachedVersion = "0.7.0-next.8";
+    cachedVersion = "0.7.0-next.9";
     return cachedVersion;
   }
   try {
@@ -173582,13 +173598,13 @@ var init_pexprs_toFailure = __esm({
       return new Failure(this, "a Unicode [" + this.categoryOrProp + "] character", "description");
     };
     Alt.prototype.toFailure = function(grammar2) {
-      const fs71 = this.terms.map((t2) => t2.toFailure(grammar2));
-      const description = "(" + fs71.join(" or ") + ")";
+      const fs72 = this.terms.map((t2) => t2.toFailure(grammar2));
+      const description = "(" + fs72.join(" or ") + ")";
       return new Failure(this, description, "description");
     };
     Seq.prototype.toFailure = function(grammar2) {
-      const fs71 = this.factors.map((f2) => f2.toFailure(grammar2));
-      const description = "(" + fs71.join(" ") + ")";
+      const fs72 = this.factors.map((f2) => f2.toFailure(grammar2));
+      const description = "(" + fs72.join(" ") + ")";
       return new Failure(this, description, "description");
     };
     Iter.prototype.toFailure = function(grammar2) {
@@ -175425,9 +175441,9 @@ function buildGrammar2(match4, namespace, optOhmGrammarForTesting, options) {
         decl.withSuperGrammar(namespace[superGrammarName]);
       }
     },
-    Rule_define(n, fs71, d3, _2, b) {
+    Rule_define(n, fs72, d3, _2, b) {
       currentRuleName = n.visit();
-      currentRuleFormals = fs71.children.map((c2) => c2.visit())[0] || [];
+      currentRuleFormals = fs72.children.map((c2) => c2.visit())[0] || [];
       if (!decl.defaultStartRule && decl.ensureSuperGrammar() !== Grammar.ProtoBuiltInRules) {
         decl.withDefaultStartRule(currentRuleName);
       }
@@ -175436,9 +175452,9 @@ function buildGrammar2(match4, namespace, optOhmGrammarForTesting, options) {
       const source = this.source.trimmed();
       return decl.define(currentRuleName, currentRuleFormals, body, description, source);
     },
-    Rule_override(n, fs71, _2, b) {
+    Rule_override(n, fs72, _2, b) {
       currentRuleName = n.visit();
-      currentRuleFormals = fs71.children.map((c2) => c2.visit())[0] || [];
+      currentRuleFormals = fs72.children.map((c2) => c2.visit())[0] || [];
       const source = this.source.trimmed();
       decl.ensureSuperGrammarRuleForOverriding(currentRuleName, source);
       overriding = true;
@@ -175446,9 +175462,9 @@ function buildGrammar2(match4, namespace, optOhmGrammarForTesting, options) {
       overriding = false;
       return decl.override(currentRuleName, currentRuleFormals, body, null, source);
     },
-    Rule_extend(n, fs71, _2, b) {
+    Rule_extend(n, fs72, _2, b) {
       currentRuleName = n.visit();
-      currentRuleFormals = fs71.children.map((c2) => c2.visit())[0] || [];
+      currentRuleFormals = fs72.children.map((c2) => c2.visit())[0] || [];
       const body = b.visit();
       const source = this.source.trimmed();
       return decl.extend(currentRuleName, currentRuleFormals, body, null, source);
@@ -175475,8 +175491,8 @@ function buildGrammar2(match4, namespace, optOhmGrammarForTesting, options) {
         return builder.alt(...args).withSource(this.source);
       }
     },
-    Formals(opointy, fs71, cpointy) {
-      return fs71.visit();
+    Formals(opointy, fs72, cpointy) {
+      return fs72.visit();
     },
     Params(opointy, ps, cpointy) {
       return ps.visit();
@@ -175638,8 +175654,8 @@ function initPrototypeParser(grammar2) {
         formals: optFormals.children.map((c2) => c2.parse())[0] || []
       };
     },
-    Formals(oparen, fs71, cparen) {
-      return fs71.asIteration().children.map((c2) => c2.parse());
+    Formals(oparen, fs72, cparen) {
+      return fs72.asIteration().children.map((c2) => c2.parse());
     },
     name(first2, rest) {
       return this.sourceString;
@@ -178960,8 +178976,8 @@ function parseAndResolve(files) {
   const parsed = files.map((f2) => parseOne(f2.path, f2.source));
   return resolve10(parsed);
 }
-function parseTcFile(path80, source) {
-  return parseOne(path80, source);
+function parseTcFile(path81, source) {
+  return parseOne(path81, source);
 }
 var LineMap, OP_VALUES;
 var init_parser_ohm = __esm({
@@ -180350,13 +180366,13 @@ function extractStarletteRoutesFromFile(filePath, source, tree) {
     const identities = starletteIdentitiesForPath(rawPath);
     const line = node2.startPosition.row + 1;
     for (const method of methods) {
-      for (const path80 of identities) {
+      for (const path81 of identities) {
         out.push({
-          identity: `${method} ${path80}`,
+          identity: `${method} ${path81}`,
           contract: {
             protocol: "http",
             method,
-            path: path80,
+            path: path81,
             responses: [],
             tags: []
           },
@@ -180533,14 +180549,14 @@ function parseRouteDecorator(dec, source, stringVars) {
   const args = call.childForFieldName("arguments");
   if (!args)
     return null;
-  let path80 = null;
+  let path81 = null;
   let successStatus = "200";
   for (let i = 0; i < args.namedChildCount; i++) {
     const a = args.namedChild(i);
     if (!a)
       continue;
-    if (path80 === null && a.type === "string")
-      path80 = pyStr(a, source);
+    if (path81 === null && a.type === "string")
+      path81 = pyStr(a, source);
     else if (a.type === "keyword_argument") {
       const name = a.childForFieldName("name");
       const value = a.childForFieldName("value");
@@ -180549,17 +180565,17 @@ function parseRouteDecorator(dec, source, stringVars) {
       }
     }
   }
-  if (path80 === null) {
+  if (path81 === null) {
     const firstArg = args.namedChild(0);
     if (firstArg?.type === "identifier") {
       const resolved = stringVars.get(source.slice(firstArg.startIndex, firstArg.endIndex));
       if (resolved !== void 0)
-        path80 = resolved;
+        path81 = resolved;
     }
   }
-  if (path80 === null)
+  if (path81 === null)
     return null;
-  return { method, path: path80, routerVar, successStatus };
+  return { method, path: path81, routerVar, successStatus };
 }
 function extractResponses2(body, source, successStatus) {
   const byStatus = /* @__PURE__ */ new Map();
@@ -180692,9 +180708,9 @@ function looksLikeModel(p2, source) {
   const text4 = source.slice(type2.startIndex, type2.endIndex);
   return /^[A-Z]/.test(text4);
 }
-function joinPath(prefix, path80) {
+function joinPath(prefix, path81) {
   const a = prefix.replace(/\/$/, "");
-  const b = path80.startsWith("/") ? path80 : `/${path80}`;
+  const b = path81.startsWith("/") ? path81 : `/${path81}`;
   return a + b || "/";
 }
 function callName(call, source) {
@@ -197012,8 +197028,8 @@ async function runRulesReset({ ruleKey }) {
 
 // tools/cli/src/commands/contracts.ts
 init_dist4();
-import fs68 from "node:fs";
-import path73 from "node:path";
+import fs69 from "node:fs";
+import path74 from "node:path";
 
 // packages/spec-consolidator/dist/types.js
 init_zod();
@@ -197051,6 +197067,26 @@ var RelationSchema = external_exports.object({
   /** Optional human-readable rationale. */
   note: external_exports.string().optional()
 });
+var ConflictResolutionSchema = external_exports.object({
+  /** Repo-relative path / DocRef of the first doc in the dispute. */
+  docA: external_exports.string(),
+  /** docA's conflicting section heading, or `null` for its preamble/lead. */
+  anchorA: external_exports.string().nullable(),
+  /** docA's verbatim disputed sentence, when the detector captured one. */
+  quoteA: external_exports.string().optional(),
+  /** Repo-relative path / DocRef of the second doc in the dispute. */
+  docB: external_exports.string(),
+  /** docB's conflicting section heading, or `null` for its preamble/lead. */
+  anchorB: external_exports.string().nullable(),
+  /** docB's verbatim disputed sentence, when the detector captured one. */
+  quoteB: external_exports.string().optional(),
+  /** Which side wins, or `dismissed` (not a real conflict). */
+  verdict: external_exports.enum(["a", "b", "dismissed"]),
+  /** ISO timestamp the resolution was recorded. */
+  resolvedAt: external_exports.string(),
+  /** Optional human-readable rationale. */
+  note: external_exports.string().optional()
+});
 var ManualAreaSchema = external_exports.object({
   /** Repo-relative path / DocRef of the doc. */
   doc: external_exports.string(),
@@ -197075,7 +197111,13 @@ var DecisionsFileSchema = external_exports.object({
   /** User-authored doc→doc relations (replace/precedence/keep-both). */
   relations: external_exports.array(RelationSchema).default([]),
   /** User overrides of a doc's auto-assigned area tags. */
-  manualAreas: external_exports.array(ManualAreaSchema).default([])
+  manualAreas: external_exports.array(ManualAreaSchema).default([]),
+  /**
+   * SECTION-scoped conflict verdicts (plan item 31) — pick-a-side / dismissal on
+   * one flagged disagreement, keyed by dispute identity. Optional with a `[]`
+   * default so a decisions.json written before item 31 still parses.
+   */
+  conflictResolutions: external_exports.array(ConflictResolutionSchema).default([])
 });
 
 // packages/spec-consolidator/dist/corpus-types.js
@@ -198015,6 +198057,7 @@ init_transport();
 init_dist5();
 
 // packages/spec-consolidator/dist/pointer-verifier.js
+init_dist5();
 var MIN_MEANINGFUL_SCORE = 1.5;
 var NEGLIGIBLE_RATIO = 0.25;
 var STOPWORDS2 = /* @__PURE__ */ new Set([
@@ -198164,16 +198207,13 @@ function splitDocSections(body, drop) {
 function headingKey(h) {
   return h.replace(/[`*_~]/g, "").trim().toLowerCase();
 }
-function normalizeForQuote(text4) {
-  return text4.replace(/[`*_~]/g, "").toLowerCase().replace(/\s+/g, " ").trim();
-}
 function locateQuote(sections, quote) {
-  const needle = normalizeForQuote(quote);
+  const needle = normalizeQuote(quote);
   if (!needle)
     return [];
   const hits = [];
   for (let i = 0; i < sections.length; i++) {
-    if (normalizeForQuote(sections[i].text).includes(needle))
+    if (normalizeQuote(sections[i].text).includes(needle))
       hits.push(i);
   }
   return hits;
@@ -198250,7 +198290,6 @@ async function flagOverlaps(repoRoot5, areas, docs, opts = {}) {
   if (opts.enabled === false)
     return result;
   const byPath = new Map(docs.map((d3) => [d3.path, d3]));
-  const resolved = resolvedPairKeys(opts.relations ?? []);
   const maxPairs = opts.maxPairsPerArea ?? DEFAULT_MAX_PAIRS_PER_AREA;
   const vocab = opts.vocab;
   const pairs2 = [];
@@ -198265,8 +198304,6 @@ async function flagOverlaps(repoRoot5, areas, docs, opts = {}) {
       const b = byPath.get(y);
       if (!a || !b)
         return;
-      if (isResolved(resolved, area.id, x, y))
-        return;
       const key4 = x < y ? `${x}\0${y}` : `${y}\0${x}`;
       if (seen.has(key4))
         return;
@@ -198369,22 +198406,6 @@ async function examineOne(repoRoot5, areaId, a, b, runner) {
   await writeCache3(repoRoot5, cacheKey, verdict);
   return verdict;
 }
-function resolvedPairKeys(relations) {
-  const set2 = /* @__PURE__ */ new Set();
-  for (const r of relations) {
-    if (r.scope)
-      set2.add(scopedKey2(r.scope, r.older, r.newer));
-    else
-      set2.add(globalKey(r.older, r.newer));
-  }
-  return set2;
-}
-var sortedPair = (x, y) => [x, y].sort().join(" ");
-var globalKey = (x, y) => `* ${sortedPair(x, y)}`;
-var scopedKey2 = (scope, x, y) => `${scope} ${sortedPair(x, y)}`;
-function isResolved(set2, areaId, x, y) {
-  return set2.has(globalKey(x, y)) || set2.has(scopedKey2(areaId, x, y));
-}
 var OVERLAP_DETECTOR_SYSTEM_PROMPT = `You compare TWO documentation files that both cover the same AREA of a software system and decide whether they may DISAGREE.
 
 ${OUTPUT_ONLY_GUARDRAIL}
@@ -198697,12 +198718,12 @@ function prefilterDocs(docs, manualIncludes = []) {
     if (reason)
       reasons.set(doc.path, reason);
   }
-  for (const { path: path80, reason } of dedupeNearDuplicates(docs.filter((d3) => !manualSet.has(d3.path) && !reasons.has(d3.path)))) {
-    reasons.set(path80, reason);
+  for (const { path: path81, reason } of dedupeNearDuplicates(docs.filter((d3) => !manualSet.has(d3.path) && !reasons.has(d3.path)))) {
+    reasons.set(path81, reason);
   }
   return {
     toClassify: docs.filter((d3) => !reasons.has(d3.path)),
-    skipped: [...reasons].map(([path80, reason]) => ({ path: path80, reason }))
+    skipped: [...reasons].map(([path81, reason]) => ({ path: path81, reason }))
   };
 }
 async function planRelevanceWork(repoRoot5, docs, manualIncludes = []) {
@@ -199020,7 +199041,6 @@ async function curate(repoRoot5, opts = {}) {
   const overlapsByArea = await flagOverlaps(repoRoot5, grouped.areas, docs, {
     runner: opts.overlapRunner,
     enabled: opts.disableOverlapDetection !== true,
-    relations,
     vocab,
     transport: opts.transport,
     model: models.overlap,
@@ -199066,7 +199086,8 @@ var EMPTY_DECISIONS = {
   manualIncludes: [],
   manualExcludes: [],
   relations: [],
-  manualAreas: []
+  manualAreas: [],
+  conflictResolutions: []
 };
 function readCorpusDecisions(repoRoot5) {
   const file = path31.join(repoRoot5, ".truecourse", "specs", "decisions.json");
@@ -199088,7 +199109,8 @@ var EMPTY_DECISIONS2 = {
   manualIncludes: [],
   manualExcludes: [],
   relations: [],
-  manualAreas: []
+  manualAreas: [],
+  conflictResolutions: []
 };
 function decisionsPath(repoRoot5) {
   return path32.join(repoRoot5, ".truecourse", "specs", "decisions.json");
@@ -199268,8 +199290,8 @@ function canonicalIdentity(_kind, identity) {
   let id = identity.trim().replace(/\s+/g, " ");
   const op = HTTP_METHOD.exec(id);
   if (op) {
-    const path80 = op[2].replace(/\/+$/, "").replace(/:([A-Za-z_][A-Za-z0-9_]*)/g, "{$1}");
-    id = `${op[1].toUpperCase()} ${path80}`;
+    const path81 = op[2].replace(/\/+$/, "").replace(/:([A-Za-z_][A-Za-z0-9_]*)/g, "{$1}");
+    id = `${op[1].toUpperCase()} ${path81}`;
   }
   return id;
 }
@@ -203166,6 +203188,7 @@ function describeStageResolutions(repoDir = resolveRepoDir(process.cwd())) {
 }
 
 // packages/core/dist/commands/spec-in-process.js
+init_dist5();
 init_transport();
 
 // packages/core/dist/lib/llm-call-log.js
@@ -207432,8 +207455,8 @@ init_dist5();
 
 // packages/guard-generator/dist/section-plan.js
 init_zod();
-import fs59 from "node:fs";
-import path63 from "node:path";
+import fs60 from "node:fs";
+import path64 from "node:path";
 import { createHash as createHash15 } from "node:crypto";
 init_dist5();
 
@@ -207575,6 +207598,11 @@ function buildExtractUserPrompt(ctx) {
     ctx.viewText,
     '"""'
   ];
+  if (ctx.suppressed && ctx.suppressed.length > 0) {
+    lines.push("", "RESOLVED \u2014 STALE, DO NOT EXTRACT. A conflict resolution judged the following", "sentence(s) in this document stale (another document is authoritative here).", "Extract NO claim that asserts what any of them says \u2014 treat them as if absent:");
+    for (const q2 of ctx.suppressed)
+      lines.push(`- "${q2}"`);
+  }
   if (ctx.correction) {
     lines.push("", "CORRECTION \u2014 your previous response was NOT valid. You returned:", ctx.correction.invalidOutput, 'Return exactly ONE JSON object with "claims" and "untestable" arrays matching', 'the schema above, and NOTHING else. Every "driver" is one of cli|api|web|tui;', 'every "sectionAnchor" is an anchor copied verbatim from the outline.');
   }
@@ -207743,17 +207771,127 @@ function buildRecipeUserPrompt(input) {
   return lines.join("\n");
 }
 
-// packages/guard-generator/dist/section-plan.js
+// packages/guard-generator/dist/suppression.js
+init_zod();
+init_dist5();
+import fs59 from "node:fs";
+import path63 from "node:path";
+var OverlapSectionShape = external_exports.object({ doc: external_exports.string(), heading: external_exports.string().nullable().optional(), quote: external_exports.string().optional() }).passthrough();
+var OverlapShape = external_exports.object({
+  docs: external_exports.tuple([external_exports.string(), external_exports.string()]),
+  note: external_exports.string().optional(),
+  sections: external_exports.array(OverlapSectionShape).optional(),
+  areas: external_exports.array(external_exports.string()).optional()
+}).passthrough();
+var RelationShape = external_exports.object({ older: external_exports.string(), newer: external_exports.string(), scope: external_exports.string().optional() }).passthrough();
 var CorpusShape2 = external_exports.object({
+  areas: external_exports.array(external_exports.object({ id: external_exports.string(), overlaps: external_exports.array(OverlapShape).optional() }).passthrough()).optional(),
+  relations: external_exports.array(RelationShape).optional()
+}).passthrough();
+var ConflictResolutionShape = external_exports.object({
+  docA: external_exports.string(),
+  anchorA: external_exports.string().nullable().optional(),
+  quoteA: external_exports.string().optional(),
+  docB: external_exports.string(),
+  anchorB: external_exports.string().nullable().optional(),
+  quoteB: external_exports.string().optional(),
+  verdict: external_exports.enum(["a", "b", "dismissed"]),
+  resolvedAt: external_exports.string().optional(),
+  note: external_exports.string().optional()
+}).passthrough();
+var DecisionsShape = external_exports.object({
+  relations: external_exports.array(RelationShape).optional(),
+  manualExcludes: external_exports.array(external_exports.string()).optional(),
+  conflictResolutions: external_exports.array(ConflictResolutionShape).optional()
+}).passthrough();
+function readJsonTolerant(file, schema2) {
+  if (!fs59.existsSync(file))
+    return void 0;
+  try {
+    const parsed = schema2.safeParse(JSON.parse(fs59.readFileSync(file, "utf-8")));
+    return parsed.success ? parsed.data : void 0;
+  } catch {
+    return void 0;
+  }
+}
+function readSuppressedClaims(repoRoot5) {
+  const specDir = path63.join(repoRoot5, ".truecourse", "specs");
+  const corpus = readJsonTolerant(path63.join(specDir, "corpus.json"), CorpusShape2);
+  if (!corpus)
+    return [];
+  const decisions = readJsonTolerant(path63.join(specDir, "decisions.json"), DecisionsShape);
+  const corpusLike = {
+    areas: (corpus.areas ?? []).map((a) => ({
+      id: a.id,
+      overlaps: (a.overlaps ?? []).map((o) => ({
+        docs: o.docs,
+        note: o.note,
+        sections: (o.sections ?? []).map((s) => ({ doc: s.doc, heading: s.heading ?? null, quote: s.quote })),
+        areas: o.areas
+      }))
+    })),
+    relations: corpus.relations ?? []
+  };
+  const decisionsLike = {
+    relations: decisions?.relations ?? [],
+    manualExcludes: decisions?.manualExcludes ?? [],
+    conflictResolutions: (decisions?.conflictResolutions ?? []).map((r) => ({
+      docA: r.docA,
+      anchorA: r.anchorA ?? null,
+      quoteA: r.quoteA,
+      docB: r.docB,
+      anchorB: r.anchorB ?? null,
+      quoteB: r.quoteB,
+      verdict: r.verdict,
+      resolvedAt: r.resolvedAt,
+      note: r.note
+    }))
+  };
+  return suppressedClaims(corpusLike, decisionsLike);
+}
+function readSuppressionIndex(repoRoot5) {
+  const map2 = /* @__PURE__ */ new Map();
+  for (const claim of readSuppressedClaims(repoRoot5)) {
+    const list = map2.get(claim.doc);
+    if (list)
+      list.push(claim.quote);
+    else
+      map2.set(claim.doc, [claim.quote]);
+  }
+  return map2;
+}
+function suppressedQuotesIn(text4, docQuotes) {
+  if (docQuotes.length === 0)
+    return [];
+  const haystack = normalizeQuote(text4);
+  const seen = /* @__PURE__ */ new Set();
+  const hits = [];
+  for (const q2 of docQuotes) {
+    const needle = normalizeQuote(q2);
+    if (!needle || seen.has(needle) || !haystack.includes(needle))
+      continue;
+    seen.add(needle);
+    hits.push(q2);
+  }
+  return hits.sort((a, b) => normalizeQuote(a) < normalizeQuote(b) ? -1 : 1);
+}
+function suppressionKey(quotes) {
+  if (quotes.length === 0)
+    return "";
+  return [...quotes].map(normalizeQuote).sort().join("\0");
+}
+
+// packages/guard-generator/dist/section-plan.js
+var CorpusShape3 = external_exports.object({
   docs: external_exports.array(external_exports.object({ ref: external_exports.string(), areaTags: external_exports.array(external_exports.string()).optional() }).passthrough()).optional()
 }).passthrough();
 function readCorpusAreaTags(repoRoot5) {
-  const file = path63.join(repoRoot5, ".truecourse", "specs", "corpus.json");
+  const file = path64.join(repoRoot5, ".truecourse", "specs", "corpus.json");
   const map2 = /* @__PURE__ */ new Map();
-  if (!fs59.existsSync(file))
+  if (!fs60.existsSync(file))
     return map2;
   try {
-    const parsed = CorpusShape2.safeParse(JSON.parse(fs59.readFileSync(file, "utf-8")));
+    const parsed = CorpusShape3.safeParse(JSON.parse(fs60.readFileSync(file, "utf-8")));
     if (!parsed.success)
       return map2;
     for (const d3 of parsed.data.docs ?? [])
@@ -207762,29 +207900,35 @@ function readCorpusAreaTags(repoRoot5) {
   }
   return map2;
 }
-function generationInputsHash(fingerprint2, recipeFingerprint) {
-  return "sha256:" + createHash15("sha256").update([
+function generationInputsHash(fingerprint2, recipeFingerprint, suppressionFingerprint = "") {
+  const parts = [
     fingerprint2,
     recipeFingerprint,
     String(GUARD_FORMAT_VERSION),
     EXTRACT_PROMPT_FINGERPRINT2,
     GENERATE_PROMPT_FINGERPRINT
-  ].join("\0")).digest("hex");
+  ];
+  if (suppressionFingerprint)
+    parts.push(suppressionFingerprint);
+  return "sha256:" + createHash15("sha256").update(parts.join("\0")).digest("hex");
 }
 function hasGuardUniverse(repoRoot5) {
-  return fs59.existsSync(path63.join(repoRoot5, ".truecourse", "specs", "corpus.json"));
+  return fs60.existsSync(path64.join(repoRoot5, ".truecourse", "specs", "corpus.json"));
 }
 function planGuardWork(repoRoot5, recipeFingerprint) {
   const recipeFp = recipeFingerprint ?? computeRecipeFingerprint(repoRoot5);
-  const recipeMissing = !fs59.existsSync(recipePath(repoRoot5));
+  const recipeMissing = !fs60.existsSync(recipePath(repoRoot5));
   const hasUniverse = hasGuardUniverse(repoRoot5);
   const { indexes } = indexRepoDocs(repoRoot5, []);
   const areaTags = readCorpusAreaTags(repoRoot5);
+  const suppressionIndex = readSuppressionIndex(repoRoot5);
   const sections = [];
   for (const [doc, index] of indexes) {
-    const texts = extractSectionTexts(doc, fs59.readFileSync(path63.resolve(repoRoot5, doc), "utf-8"));
+    const texts = extractSectionTexts(doc, fs60.readFileSync(path64.resolve(repoRoot5, doc), "utf-8"));
+    const docQuotes = suppressionIndex.get(doc) ?? [];
     for (const s of index.sections) {
       const t2 = texts.get(s.anchor);
+      const fullText = t2?.fullText ?? "";
       sections.push({
         doc,
         anchor: s.anchor,
@@ -207792,8 +207936,9 @@ function planGuardWork(repoRoot5, recipeFingerprint) {
         headingText: s.headingText,
         level: s.level,
         ownText: t2?.ownText ?? "",
-        fullText: t2?.fullText ?? "",
-        areaTags: areaTags.get(doc) ?? []
+        fullText,
+        areaTags: areaTags.get(doc) ?? [],
+        suppressionFingerprint: suppressionKey(suppressedQuotesIn(fullText, docQuotes))
       });
     }
   }
@@ -207806,12 +207951,12 @@ function planGuardWork(repoRoot5, recipeFingerprint) {
     const key4 = `${s.doc}\0${s.anchor}`;
     seen.add(key4);
     const prior = byKey.get(key4);
-    const inputsHash = generationInputsHash(s.fingerprint, recipeFp);
+    const inputsHash = generationInputsHash(s.fingerprint, recipeFp, s.suppressionFingerprint);
     if (!prior || prior.generationInputsHash !== inputsHash)
       work.push(s);
   }
   const orphaned = (manifest?.sections ?? []).filter((e) => !seen.has(`${e.doc}\0${e.anchor}`));
-  return { hasUniverse, sections, work, orphaned, recipeFingerprint: recipeFp, recipeMissing };
+  return { hasUniverse, sections, work, orphaned, recipeFingerprint: recipeFp, recipeMissing, suppressionIndex };
 }
 function collectWorkDocs(repoRoot5, plan) {
   const workDocs = new Set(plan.work.map((s) => s.doc));
@@ -207827,8 +207972,9 @@ function collectWorkDocs(repoRoot5, plan) {
   }
   return [...byDoc].map(([doc, sections]) => ({
     doc,
-    content: fs59.readFileSync(path63.resolve(repoRoot5, doc), "utf-8"),
-    sections
+    content: fs60.readFileSync(path64.resolve(repoRoot5, doc), "utf-8"),
+    sections,
+    suppressedQuotes: plan.suppressionIndex.get(doc) ?? []
   }));
 }
 
@@ -207911,8 +208057,13 @@ function flattenZodError(error) {
 // packages/guard-generator/dist/extract.js
 var EXTRACT_CACHE_NAME2 = "guard/extract";
 var EXTRACT_VIEW_BUDGET = 16e3;
-function viewCacheKey(viewText) {
-  return createHash16("sha256").update(`${EXTRACT_PROMPT_FINGERPRINT2}::${sha(viewText)}`).digest("hex");
+function viewCacheKey(viewText, suppressed = []) {
+  const base2 = `${EXTRACT_PROMPT_FINGERPRINT2}::${sha(viewText)}`;
+  const suppression = suppressionKey(suppressed);
+  return createHash16("sha256").update(suppression ? `${base2}::${suppression}` : base2).digest("hex");
+}
+function suppressedForView(doc, viewText) {
+  return suppressedQuotesIn(viewText, doc.suppressedQuotes);
 }
 function sha(text4) {
   return createHash16("sha256").update(text4).digest("hex");
@@ -207958,7 +208109,7 @@ function countExtractViews(doc) {
 async function countUncachedExtractViews(repoRoot5, doc) {
   let n = 0;
   for (const v of planViews(doc)) {
-    if (!await getCacheEntry(repoRoot5, EXTRACT_CACHE_NAME2, viewCacheKey(v.text)))
+    if (!await getCacheEntry(repoRoot5, EXTRACT_CACHE_NAME2, viewCacheKey(v.text, suppressedForView(doc, v.text))))
       n++;
   }
   return n;
@@ -207967,7 +208118,7 @@ async function extractDocClaims(repoRoot5, doc, runner, limit, onView) {
   const outline = outlineOf(doc.sections);
   const views = planViews(doc);
   const run = limit ?? ((fn) => fn());
-  const attempts = await Promise.all(views.map((v) => run(() => extractView(repoRoot5, doc.doc, outline, v, runner)).then((got) => {
+  const attempts = await Promise.all(views.map((v) => run(() => extractView(repoRoot5, doc.doc, outline, v, suppressedForView(doc, v.text), runner)).then((got) => {
     onView?.();
     return got;
   })));
@@ -207988,15 +208139,21 @@ async function extractDocClaims(repoRoot5, doc, runner, limit, onView) {
     return { ok: false, reason: firstError || "all extraction views failed" };
   return { ok: true, data: snap(merged, doc.sections), complete: failedViews === 0, failedViews };
 }
-async function extractView(repoRoot5, docPath, outline, view, runner) {
-  const cacheKey = viewCacheKey(view.text);
+async function extractView(repoRoot5, docPath, outline, view, suppressed, runner) {
+  const cacheKey = viewCacheKey(view.text, suppressed);
   const cached = await getCacheEntry(repoRoot5, EXTRACT_CACHE_NAME2, cacheKey);
   if (cached) {
     const parsed = DocExtractionSchema.safeParse(cached);
     if (parsed.success)
       return { data: parsed.data };
   }
-  const ctx = { doc: docPath, outline, viewText: view.text, view: view.view };
+  const ctx = {
+    doc: docPath,
+    outline,
+    viewText: view.text,
+    view: view.view,
+    ...suppressed.length > 0 ? { suppressed } : {}
+  };
   const attempt = await callExtractWithReask(ctx, runner);
   if ("data" in attempt)
     await setCacheEntry(repoRoot5, EXTRACT_CACHE_NAME2, cacheKey, attempt.data);
@@ -208075,7 +208232,7 @@ function snap(raw, sections) {
 
 // packages/guard-generator/dist/ground.js
 init_zod();
-import path64 from "node:path";
+import path65 from "node:path";
 import { createHash as createHash17 } from "node:crypto";
 var GROUND_CACHE_NAME = "guard/ground";
 var PROBE_TIMEOUT_MS = 2e4;
@@ -208131,7 +208288,7 @@ function toProbeArgv(fragment, programNames) {
   const tokens = fragment.trim().split(/\s+/).filter(Boolean);
   if (tokens.length === 0)
     return null;
-  if (programNames.has(tokens[0]) || programNames.has(path64.basename(tokens[0])))
+  if (programNames.has(tokens[0]) || programNames.has(path65.basename(tokens[0])))
     tokens.shift();
   if (tokens.length === 0)
     return [];
@@ -208152,7 +208309,7 @@ function programNamesOf(entry) {
   return names;
 }
 function addName(set2, arg) {
-  const base2 = path64.basename(arg);
+  const base2 = path65.basename(arg);
   if (base2)
     set2.add(base2);
   const stem = base2.replace(/\.[^.]+$/, "");
@@ -208214,9 +208371,9 @@ function truncate3(text4) {
 }
 
 // packages/guard-generator/dist/recipe-discovery.js
-import fs60 from "node:fs";
+import fs61 from "node:fs";
 import os13 from "node:os";
-import path65 from "node:path";
+import path66 from "node:path";
 import { createHash as createHash18 } from "node:crypto";
 var RECIPE_CACHE_NAME = "guard/recipe";
 var DISCOVERY_INPUTS = ["package.json", "pnpm-lock.yaml", "package-lock.json", "yarn.lock", "turbo.json"];
@@ -208270,13 +208427,13 @@ async function discoverRecipe(repoRoot5, runner) {
     ...proposal.env ? { env: proposal.env } : {}
   };
   const target = recipePath(repoRoot5);
-  fs60.mkdirSync(path65.dirname(target), { recursive: true });
-  fs60.writeFileSync(target, JSON.stringify(recipe, null, 2) + "\n");
+  fs61.mkdirSync(path66.dirname(target), { recursive: true });
+  fs61.writeFileSync(target, JSON.stringify(recipe, null, 2) + "\n");
   return {
     status: "discovered",
     recipe,
     fingerprint: computeRecipeFingerprint(repoRoot5),
-    wrotePath: path65.relative(repoRoot5, target)
+    wrotePath: path66.relative(repoRoot5, target)
   };
 }
 async function proposeRecipeWithReask(input, runner) {
@@ -208301,14 +208458,14 @@ async function proposeRecipeWithReask(input, runner) {
   return { error: `recipe proposal invalid after re-ask: ${flattenZodError(reParsed.error)}` };
 }
 function readDiscoveryInputs(repoRoot5) {
-  const pkgPath = path65.join(repoRoot5, "package.json");
-  const packageJson = fs60.existsSync(pkgPath) ? fs60.readFileSync(pkgPath, "utf-8") : "(no package.json)";
-  const presentInputs = DISCOVERY_INPUTS.filter((f2) => fs60.existsSync(path65.join(repoRoot5, f2)));
+  const pkgPath = path66.join(repoRoot5, "package.json");
+  const packageJson = fs61.existsSync(pkgPath) ? fs61.readFileSync(pkgPath, "utf-8") : "(no package.json)";
+  const presentInputs = DISCOVERY_INPUTS.filter((f2) => fs61.existsSync(path66.join(repoRoot5, f2)));
   return { packageJson, presentInputs };
 }
 async function probeEntry(repoRoot5, entry) {
   const resolved = resolveEntry(repoRoot5, entry);
-  const cwd = fs60.mkdtempSync(path65.join(os13.tmpdir(), "tc-guard-probe-"));
+  const cwd = fs61.mkdtempSync(path66.join(os13.tmpdir(), "tc-guard-probe-"));
   try {
     for (const args of [["--help"], []]) {
       const capture = await executeStep({
@@ -208325,7 +208482,7 @@ async function probeEntry(repoRoot5, entry) {
       reason: `entrypoint ${JSON.stringify(entry)} did not answer to \`--help\` or a bare invocation`
     };
   } finally {
-    fs60.rmSync(cwd, { recursive: true, force: true });
+    fs61.rmSync(cwd, { recursive: true, force: true });
   }
 }
 
@@ -208372,8 +208529,8 @@ async function birthValidate(repoRoot5, candidates, opts = {}) {
 }
 
 // packages/guard-generator/dist/serialize.js
-import fs61 from "node:fs";
-import path66 from "node:path";
+import fs62 from "node:fs";
+import path67 from "node:path";
 init_dist5();
 function anchorLeaf(anchor) {
   const segs = anchor.split("/").filter(Boolean);
@@ -208392,7 +208549,7 @@ function assignScenarioId(anchor, used) {
 function areaOrDocSlug(section) {
   if (section.areaTags.length > 0)
     return slugifyHeading(section.areaTags[0]) || "area";
-  const base2 = path66.basename(section.doc).replace(/\.[^.]+$/, "");
+  const base2 = path67.basename(section.doc).replace(/\.[^.]+$/, "");
   return slugifyHeading(base2) || "doc";
 }
 function buildScenario(section, raw, id) {
@@ -208415,15 +208572,15 @@ function scenarioFileIndex(repoRoot5) {
   const root2 = scenariosDir(repoRoot5);
   const map2 = /* @__PURE__ */ new Map();
   const walk20 = (dir) => {
-    if (!fs61.existsSync(dir))
+    if (!fs62.existsSync(dir))
       return;
-    for (const entry of fs61.readdirSync(dir, { withFileTypes: true })) {
-      const full = path66.join(dir, entry.name);
+    for (const entry of fs62.readdirSync(dir, { withFileTypes: true })) {
+      const full = path67.join(dir, entry.name);
       if (entry.isDirectory())
         walk20(full);
       else if (entry.isFile() && /\.ya?ml$/i.test(entry.name)) {
         try {
-          const doc = jsYaml.load(fs61.readFileSync(full, "utf-8"));
+          const doc = jsYaml.load(fs62.readFileSync(full, "utf-8"));
           if (doc && typeof doc.id === "string")
             map2.set(doc.id, full);
         } catch {
@@ -208441,18 +208598,18 @@ function serializeScenarioYaml(scenario) {
   return jsYaml.dump(scenario, { lineWidth: -1, noRefs: true });
 }
 function writeScenarioFile(repoRoot5, slug2, scenario) {
-  const dir = path66.join(scenariosDir(repoRoot5), slug2);
-  fs61.mkdirSync(dir, { recursive: true });
-  const file = path66.join(dir, `${scenario.id}.yaml`);
-  fs61.writeFileSync(file, serializeScenarioYaml(scenario));
-  return path66.relative(repoRoot5, file);
+  const dir = path67.join(scenariosDir(repoRoot5), slug2);
+  fs62.mkdirSync(dir, { recursive: true });
+  const file = path67.join(dir, `${scenario.id}.yaml`);
+  fs62.writeFileSync(file, serializeScenarioYaml(scenario));
+  return path67.relative(repoRoot5, file);
 }
 function deleteScenarioFiles(repoRoot5, ids) {
   const index = scenarioFileIndex(repoRoot5);
   for (const id of ids) {
     const file = index.get(id);
-    if (file && fs61.existsSync(file))
-      fs61.rmSync(file);
+    if (file && fs62.existsSync(file))
+      fs62.rmSync(file);
   }
 }
 
@@ -208672,7 +208829,7 @@ async function generateGuards(options) {
       anchor: section.anchor,
       fingerprint: section.fingerprint,
       scenarioIds: scenarioIds.slice().sort(),
-      generationInputsHash: generationInputsHash(section.fingerprint, recipeFingerprint),
+      generationInputsHash: generationInputsHash(section.fingerprint, recipeFingerprint, section.suppressionFingerprint),
       ...classification ? { classification } : {}
     });
     settledKeys.add(k);
@@ -209157,8 +209314,8 @@ init_context_router();
 
 // packages/core/dist/services/llm/model-prices.js
 init_paths();
-import fs62 from "node:fs";
-import path67 from "node:path";
+import fs63 from "node:fs";
+import path68 from "node:path";
 var OPENROUTER_URL = "https://openrouter.ai/api/v1/models";
 var CACHE_TTL_MS = 24 * 60 * 60 * 1e3;
 var FETCH_TIMEOUT_MS = 8e3;
@@ -209174,11 +209331,11 @@ function tierOf(id) {
   return s.includes("opus") ? "opus" : s.includes("sonnet") ? "sonnet" : s.includes("haiku") ? "haiku" : null;
 }
 function cacheFilePath() {
-  return path67.join(getGlobalDir(), "cache", CACHE_FILE);
+  return path68.join(getGlobalDir(), "cache", CACHE_FILE);
 }
 function readCache7() {
   try {
-    const t2 = JSON.parse(fs62.readFileSync(cacheFilePath(), "utf-8"));
+    const t2 = JSON.parse(fs63.readFileSync(cacheFilePath(), "utf-8"));
     if (t2 && t2.tiers && t2.byId && typeof t2.fetchedAt === "number")
       return t2;
   } catch {
@@ -209187,8 +209344,8 @@ function readCache7() {
 }
 function writeCache7(t2) {
   try {
-    fs62.mkdirSync(path67.dirname(cacheFilePath()), { recursive: true });
-    fs62.writeFileSync(cacheFilePath(), JSON.stringify(t2));
+    fs63.mkdirSync(path68.dirname(cacheFilePath()), { recursive: true });
+    fs63.writeFileSync(cacheFilePath(), JSON.stringify(t2));
   } catch {
   }
 }
@@ -209567,16 +209724,16 @@ function changedSubject(total, changed, noun) {
 
 // packages/core/dist/commands/spec-in-process.js
 init_dist8();
-import fs67 from "node:fs";
-import path72 from "node:path";
+import fs68 from "node:fs";
+import path73 from "node:path";
 init_git();
 import { createHash as createHash20, randomUUID as randomUUID27 } from "node:crypto";
 
 // packages/core/dist/lib/verify-store.js
 init_atomic_write();
 init_analysis_store();
-import fs63 from "node:fs";
-import path68 from "node:path";
+import fs64 from "node:fs";
+import path69 from "node:path";
 
 // packages/core/dist/types/verify-snapshot.js
 function driftKey(d3) {
@@ -209624,23 +209781,23 @@ var LATEST_FILE3 = "LATEST.json";
 var HISTORY_FILE3 = "history.json";
 var DIFF_FILE2 = "diff.json";
 function verifierDir(repoPath) {
-  return path68.join(repoPath, TRUECOURSE_DIR4, VERIFIER_DIR);
+  return path69.join(repoPath, TRUECOURSE_DIR4, VERIFIER_DIR);
 }
 function runsDir(repoPath) {
-  return path68.join(verifierDir(repoPath), RUNS_DIR2);
+  return path69.join(verifierDir(repoPath), RUNS_DIR2);
 }
 function verifyRunPath(repoPath, filename) {
-  return path68.join(runsDir(repoPath), filename);
+  return path69.join(runsDir(repoPath), filename);
 }
 function verifyLatestPath(repoPath) {
-  return path68.join(verifierDir(repoPath), LATEST_FILE3);
+  return path69.join(verifierDir(repoPath), LATEST_FILE3);
 }
 function verifyHistoryPath(repoPath) {
-  return path68.join(verifierDir(repoPath), HISTORY_FILE3);
+  return path69.join(verifierDir(repoPath), HISTORY_FILE3);
 }
 function verifyDiffPath(repoPath, scope) {
   const file = scope ? `diff-${sanitizeScope(scope)}.json` : DIFF_FILE2;
-  return path68.join(verifierDir(repoPath), file);
+  return path69.join(verifierDir(repoPath), file);
 }
 function sanitizeScope(scope) {
   return scope.replace(/[^a-zA-Z0-9._-]/g, "_");
@@ -209674,7 +209831,7 @@ var FileVerifyStore = class {
     const file = verifyLatestPath(repoPath);
     let mtime;
     try {
-      mtime = fs63.statSync(file).mtimeMs;
+      mtime = fs64.statSync(file).mtimeMs;
     } catch (err) {
       if (err.code === "ENOENT") {
         latestCache2.delete(repoPath);
@@ -209685,7 +209842,7 @@ var FileVerifyStore = class {
     const cached = latestCache2.get(repoPath);
     if (cached && cached.mtime === mtime)
       return cached.data;
-    const data = JSON.parse(fs63.readFileSync(file, "utf-8"));
+    const data = JSON.parse(fs64.readFileSync(file, "utf-8"));
     latestCache2.set(repoPath, { mtime, data });
     return data;
   }
@@ -209695,7 +209852,7 @@ var FileVerifyStore = class {
   }
   async deleteVerifyLatest(repoPath) {
     try {
-      fs63.unlinkSync(verifyLatestPath(repoPath));
+      fs64.unlinkSync(verifyLatestPath(repoPath));
     } catch (err) {
       if (err.code !== "ENOENT")
         throw err;
@@ -209709,21 +209866,21 @@ var FileVerifyStore = class {
   }
   async readVerifyRun(repoPath, filename) {
     const file = verifyRunPath(repoPath, filename);
-    if (!fs63.existsSync(file))
+    if (!fs64.existsSync(file))
       return null;
-    return JSON.parse(fs63.readFileSync(file, "utf-8"));
+    return JSON.parse(fs64.readFileSync(file, "utf-8"));
   }
   async listVerifyRuns(repoPath) {
     const dir = runsDir(repoPath);
-    if (!fs63.existsSync(dir))
+    if (!fs64.existsSync(dir))
       return [];
-    return fs63.readdirSync(dir).filter((n) => n.endsWith(".json")).sort();
+    return fs64.readdirSync(dir).filter((n) => n.endsWith(".json")).sort();
   }
   async readVerifyHistory(repoPath) {
     const file = verifyHistoryPath(repoPath);
-    if (!fs63.existsSync(file))
+    if (!fs64.existsSync(file))
       return { runs: [] };
-    return JSON.parse(fs63.readFileSync(file, "utf-8"));
+    return JSON.parse(fs64.readFileSync(file, "utf-8"));
   }
   async appendVerifyHistory(repoPath, entry) {
     const history = await this.readVerifyHistory(repoPath);
@@ -209736,7 +209893,7 @@ var FileVerifyStore = class {
     if (!entry)
       return false;
     try {
-      fs63.unlinkSync(verifyRunPath(repoPath, entry.filename));
+      fs64.unlinkSync(verifyRunPath(repoPath, entry.filename));
     } catch (err) {
       if (err.code !== "ENOENT")
         throw err;
@@ -209758,16 +209915,16 @@ var FileVerifyStore = class {
   }
   async readVerifyDiff(repoPath, scope) {
     const file = verifyDiffPath(repoPath, scope);
-    if (!fs63.existsSync(file))
+    if (!fs64.existsSync(file))
       return null;
-    return JSON.parse(fs63.readFileSync(file, "utf-8"));
+    return JSON.parse(fs64.readFileSync(file, "utf-8"));
   }
   async writeVerifyDiff(repoPath, diff, scope) {
     atomicWriteJson(verifyDiffPath(repoPath, scope), diff);
   }
   async deleteVerifyDiff(repoPath, scope) {
     try {
-      fs63.unlinkSync(verifyDiffPath(repoPath, scope));
+      fs64.unlinkSync(verifyDiffPath(repoPath, scope));
     } catch (err) {
       if (err.code !== "ENOENT")
         throw err;
@@ -209801,8 +209958,8 @@ async function repoRef(repoRoot5, commitOverride) {
 }
 
 // packages/core/dist/lib/contract-store.js
-import fs64 from "node:fs";
-import path69 from "node:path";
+import fs65 from "node:fs";
+import path70 from "node:path";
 var KIND_REL = {
   contracts: [".truecourse", "contracts"],
   // The inferred tree lives at contracts/_inferred (matches `writeInferred`).
@@ -209812,13 +209969,13 @@ function countTcFiles(dir) {
   let n = 0;
   let entries;
   try {
-    entries = fs64.readdirSync(dir, { withFileTypes: true });
+    entries = fs65.readdirSync(dir, { withFileTypes: true });
   } catch {
     return 0;
   }
   for (const e of entries) {
     if (e.isDirectory())
-      n += countTcFiles(path69.join(dir, e.name));
+      n += countTcFiles(path70.join(dir, e.name));
     else if (e.isFile() && e.name.endsWith(".tc"))
       n += 1;
   }
@@ -209829,7 +209986,7 @@ function walkTcRel(dir, excludeInferred) {
   const walk20 = (rel) => {
     let entries;
     try {
-      entries = fs64.readdirSync(path69.join(dir, rel), { withFileTypes: true });
+      entries = fs65.readdirSync(path70.join(dir, rel), { withFileTypes: true });
     } catch {
       return;
     }
@@ -209853,50 +210010,50 @@ function safeResolve(root2, rel) {
     return null;
   if (norm.split("/").some((s) => s === ".." || s === "." || s === ""))
     return null;
-  const base2 = path69.resolve(root2);
-  const dest = path69.resolve(base2, norm);
-  if (dest !== base2 && !dest.startsWith(base2 + path69.sep))
+  const base2 = path70.resolve(root2);
+  const dest = path70.resolve(base2, norm);
+  if (dest !== base2 && !dest.startsWith(base2 + path70.sep))
     return null;
   return dest;
 }
 var FileContractStore = class {
   materializesInPlace = true;
   async saveContracts(ref, kind, _sourceDir) {
-    const dir = path69.join(ref.repoKey, ...KIND_REL[kind]);
+    const dir = path70.join(ref.repoKey, ...KIND_REL[kind]);
     return { manifest: {}, fileCount: countTcFiles(dir), objectsWritten: 0, manifestHash: "" };
   }
   async loadContracts(ref, kind) {
-    const dir = path69.join(ref.repoKey, ...KIND_REL[kind]);
-    if (!fs64.existsSync(dir))
+    const dir = path70.join(ref.repoKey, ...KIND_REL[kind]);
+    if (!fs65.existsSync(dir))
       return null;
     return { dir, cleanup: async () => {
     } };
   }
   async hasContracts(ref, kind) {
-    return fs64.existsSync(path69.join(ref.repoKey, ...KIND_REL[kind]));
+    return fs65.existsSync(path70.join(ref.repoKey, ...KIND_REL[kind]));
   }
   // The file impl reads the live repo tree, which is whatever is checked out —
   // there is no per-commit history, so `commitSha` is ignored (OSS is latest).
   async listContractFiles(repoKey, kind, _commitSha) {
-    return walkTcRel(path69.join(repoKey, ...KIND_REL[kind]), kind === "contracts");
+    return walkTcRel(path70.join(repoKey, ...KIND_REL[kind]), kind === "contracts");
   }
   async readContractFile(repoKey, kind, relPath, _commitSha) {
-    const dest = safeResolve(path69.join(repoKey, ...KIND_REL[kind]), relPath);
-    if (!dest || !fs64.existsSync(dest) || !fs64.statSync(dest).isFile())
+    const dest = safeResolve(path70.join(repoKey, ...KIND_REL[kind]), relPath);
+    if (!dest || !fs65.existsSync(dest) || !fs65.statSync(dest).isFile())
       return null;
-    return fs64.readFileSync(dest, "utf-8");
+    return fs65.readFileSync(dest, "utf-8");
   }
   async putContractFile(ref, kind, relPath, content) {
-    const dest = safeResolve(path69.join(ref.repoKey, ...KIND_REL[kind]), relPath);
+    const dest = safeResolve(path70.join(ref.repoKey, ...KIND_REL[kind]), relPath);
     if (!dest)
       throw new Error(`[contract-store] unsafe contract path: ${relPath}`);
-    fs64.mkdirSync(path69.dirname(dest), { recursive: true });
-    fs64.writeFileSync(dest, content);
+    fs65.mkdirSync(path70.dirname(dest), { recursive: true });
+    fs65.writeFileSync(dest, content);
   }
   async deleteContractFile(ref, kind, relPath) {
-    const dest = safeResolve(path69.join(ref.repoKey, ...KIND_REL[kind]), relPath);
+    const dest = safeResolve(path70.join(ref.repoKey, ...KIND_REL[kind]), relPath);
     if (dest)
-      fs64.rmSync(dest, { force: true });
+      fs65.rmSync(dest, { force: true });
   }
   // OSS/local has no workspace concept (mirrors the spec store). Writing throws
   // (fail loud — a caller that reached here is mis-wired); reads are empty so an
@@ -209923,10 +210080,10 @@ var loadWorkspaceContracts = (ref, kind) => active8.loadWorkspaceContracts(ref,
 var contractsMaterializeInPlace = () => active8.materializesInPlace;
 
 // packages/core/dist/lib/spec-store.js
-import fs65 from "node:fs";
-import path70 from "node:path";
+import fs66 from "node:fs";
+import path71 from "node:path";
 function specPath(repoKey, artifact) {
-  return path70.join(repoKey, ".truecourse", "specs", `${artifact}.json`);
+  return path71.join(repoKey, ".truecourse", "specs", `${artifact}.json`);
 }
 function isPrDecisionsRef(commitSha) {
   return /^_pr\/\d+$/.test(commitSha ?? "");
@@ -209939,18 +210096,18 @@ var FileSpecStore = class {
       throw new Error(PR_DECISIONS_FILE_ERROR);
     }
     const file = specPath(ref.repoKey, artifact);
-    fs65.mkdirSync(path70.dirname(file), { recursive: true });
-    fs65.writeFileSync(file, JSON.stringify(json2, null, 2) + "\n", "utf-8");
+    fs66.mkdirSync(path71.dirname(file), { recursive: true });
+    fs66.writeFileSync(file, JSON.stringify(json2, null, 2) + "\n", "utf-8");
   }
   async loadSpec(ref, artifact) {
     if (artifact === "decisions" && isPrDecisionsRef(ref.commitSha)) {
       throw new Error(PR_DECISIONS_FILE_ERROR);
     }
     const file = specPath(ref.repoKey, artifact);
-    if (!fs65.existsSync(file))
+    if (!fs66.existsSync(file))
       return null;
     try {
-      return JSON.parse(fs65.readFileSync(file, "utf-8"));
+      return JSON.parse(fs66.readFileSync(file, "utf-8"));
     } catch {
       return null;
     }
@@ -209960,8 +210117,8 @@ var FileSpecStore = class {
       throw new Error(PR_DECISIONS_FILE_ERROR);
     }
     const file = specPath(ref.repoKey, artifact);
-    if (fs65.existsSync(file))
-      fs65.rmSync(file);
+    if (fs66.existsSync(file))
+      fs66.rmSync(file);
   }
   // The file impl is single-document-per-repo, so "latest" === read the file.
   async loadLatest(repoKey, artifact) {
@@ -209988,23 +210145,23 @@ var loadLatestSpec = (repoKey, artifact) => active9.loadLatest(repoKey, artifact
 var specsMaterializeInPlace = () => active9.materializesInPlace;
 
 // packages/core/dist/lib/inferred-action-store.js
-import fs66 from "node:fs";
-import path71 from "node:path";
+import fs67 from "node:fs";
+import path72 from "node:path";
 function actionsFile(repoKey) {
-  return path71.join(repoKey, ".truecourse", "specs", "inferred-actions.json");
+  return path72.join(repoKey, ".truecourse", "specs", "inferred-actions.json");
 }
 var FileInferredActionStore = class {
   read(repoKey) {
     try {
-      return JSON.parse(fs66.readFileSync(actionsFile(repoKey), "utf-8"));
+      return JSON.parse(fs67.readFileSync(actionsFile(repoKey), "utf-8"));
     } catch {
       return [];
     }
   }
   write(repoKey, actions) {
     const file = actionsFile(repoKey);
-    fs66.mkdirSync(path71.dirname(file), { recursive: true });
-    fs66.writeFileSync(file, JSON.stringify(actions, null, 2) + "\n", "utf-8");
+    fs67.mkdirSync(path72.dirname(file), { recursive: true });
+    fs67.writeFileSync(file, JSON.stringify(actions, null, 2) + "\n", "utf-8");
   }
   async setAction(repoKey, action) {
     const next = this.read(repoKey).filter((a) => !(a.kind === action.kind && a.identity === action.identity));
@@ -210133,13 +210290,13 @@ function resolveTransport(options) {
   }
   return getDefaultTransport();
 }
-var GENERATED_MARKER_REL = path72.join(".truecourse", "contracts", "result.json");
+var GENERATED_MARKER_REL = path73.join(".truecourse", "contracts", "result.json");
 function generatedMarkerPath(repoRoot5) {
-  return path72.join(repoRoot5, GENERATED_MARKER_REL);
+  return path73.join(repoRoot5, GENERATED_MARKER_REL);
 }
 function stampGeneratedMarker(repoRoot5, summary) {
   const file = generatedMarkerPath(repoRoot5);
-  fs67.mkdirSync(path72.dirname(file), { recursive: true });
+  fs68.mkdirSync(path73.dirname(file), { recursive: true });
   const body = {
     generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
     written: summary?.written ?? 0,
@@ -210147,7 +210304,7 @@ function stampGeneratedMarker(repoRoot5, summary) {
     validationIssues: summary?.validationIssues ?? [],
     enumerateFailures: summary?.enumerateFailures ?? []
   };
-  fs67.writeFileSync(file, JSON.stringify(body, null, 2) + "\n");
+  fs68.writeFileSync(file, JSON.stringify(body, null, 2) + "\n");
 }
 function resolveCurateModels(repoRoot5) {
   return {
@@ -210271,22 +210428,22 @@ async function curateInProcess(repoRoot5, options = {}) {
   }
 }
 function buildPriorContracts(repoRoot5) {
-  const dir = path72.join(repoRoot5, ".truecourse", "contracts");
-  if (!fs67.existsSync(dir))
+  const dir = path73.join(repoRoot5, ".truecourse", "contracts");
+  if (!fs68.existsSync(dir))
     return void 0;
   const targets = [];
   const bodyByKey = /* @__PURE__ */ new Map();
   const walk20 = (d3) => {
-    for (const e of fs67.readdirSync(d3, { withFileTypes: true })) {
+    for (const e of fs68.readdirSync(d3, { withFileTypes: true })) {
       if (e.isDirectory()) {
         if (e.name === "_inferred")
           continue;
-        walk20(path72.join(d3, e.name));
+        walk20(path73.join(d3, e.name));
       } else if (e.name.endsWith(".tc")) {
-        const abs = path72.join(d3, e.name);
-        const src = fs67.readFileSync(abs, "utf-8");
+        const abs = path73.join(d3, e.name);
+        const src = fs68.readFileSync(abs, "utf-8");
         try {
-          const file = parser_ohm_exports.parseTcFile(path72.relative(dir, abs), src);
+          const file = parser_ohm_exports.parseTcFile(path73.relative(dir, abs), src);
           for (const key4 of resolver_exports.resolve([file]).index.keys()) {
             const colon = key4.indexOf(":");
             if (colon < 0)
@@ -210446,18 +210603,18 @@ function resolverHardError(result) {
   const detail = reasons.length ? reasons.slice(0, 3).join("; ") : "duplicate or conflicting artifact identities";
   return new Error(`Contract corpus failed to resolve \u2014 ${detail}`);
 }
-var LEGACY_VERIFY_STATE_REL = path72.join(".truecourse", ".cache", "verifier", "verify-state.json");
+var LEGACY_VERIFY_STATE_REL = path73.join(".truecourse", ".cache", "verifier", "verify-state.json");
 function legacyVerifyStatePath(repoRoot5) {
-  return path72.join(repoRoot5, LEGACY_VERIFY_STATE_REL);
+  return path73.join(repoRoot5, LEGACY_VERIFY_STATE_REL);
 }
 async function withContracts(repoRoot5, options, tracker, fn) {
-  const fallbackPath = path72.join(repoRoot5, ".truecourse", "contracts");
+  const fallbackPath = path73.join(repoRoot5, ".truecourse", "contracts");
   const wsMat = options.workspaceOrgId ? await loadWorkspaceContracts({ workspaceOrgId: options.workspaceOrgId }, "contracts") : null;
   let repoMat = null;
   try {
     let recorded;
     if (options.contractsDir) {
-      if (!fs67.existsSync(options.contractsDir)) {
+      if (!fs68.existsSync(options.contractsDir)) {
         const err = new Error(`Contracts directory not found at ${options.contractsDir}. Run \`truecourse contracts generate\` first.`);
         tracker?.error("load", err.message);
         throw err;
@@ -210502,7 +210659,7 @@ async function verifyInProcess(repoRoot5, options = {}) {
     tracker?.start("compare");
     tracker?.done("compare", `${result.drifts.length} drift${result.drifts.length === 1 ? "" : "s"}`);
     if (options.ref) {
-      result.drifts = result.drifts.map((d3) => d3.filePath && path72.isAbsolute(d3.filePath) ? { ...d3, filePath: path72.relative(repoRoot5, d3.filePath).split(path72.sep).join("/") } : d3);
+      result.drifts = result.drifts.map((d3) => d3.filePath && path73.isAbsolute(d3.filePath) ? { ...d3, filePath: path73.relative(repoRoot5, d3.filePath).split(path73.sep).join("/") } : d3);
     }
     const verifiedAt = (/* @__PURE__ */ new Date()).toISOString();
     const { branch, commitHash } = await gitMeta(repoRoot5);
@@ -210546,7 +210703,7 @@ async function verifyInProcess(repoRoot5, options = {}) {
         bySeverity: summary.bySeverity
       });
       await deleteVerifyDiff(storeKey);
-      fs67.rmSync(legacyVerifyStatePath(repoRoot5), { force: true });
+      fs68.rmSync(legacyVerifyStatePath(repoRoot5), { force: true });
     }
     const state = {
       verifiedAt,
@@ -210594,7 +210751,7 @@ async function runWithStash(repoRoot5, skipStash, tracker, fn) {
       const status = await stashGit.status();
       if (!status.isClean()) {
         const gitRoot = (await stashGit.revparse(["--show-toplevel"])).trim();
-        if (path72.resolve(repoRoot5) === path72.resolve(gitRoot)) {
+        if (path73.resolve(repoRoot5) === path73.resolve(gitRoot)) {
           tracker?.detail?.("load", "Stashing pending changes...");
           const res = await stashGit.stash(["push", "--include-untracked", "-m", "truecourse-verify-stash"]);
           didStash = !res.includes("No local changes");
@@ -210696,7 +210853,7 @@ async function verifyDiffInProcess(repoRoot5, options = {}) {
 async function inferInProcess(repoRoot5, options = {}) {
   const startedAt = Date.now();
   const codeDir = options.codeDir ?? autodetectCodeDir(repoRoot5);
-  let contractsDir = options.contractsDir ?? path72.join(repoRoot5, ".truecourse", "contracts");
+  let contractsDir = options.contractsDir ?? path73.join(repoRoot5, ".truecourse", "contracts");
   let releaseContracts = async () => {
   };
   if (!options.contractsDir && options.ref) {
@@ -210740,7 +210897,7 @@ async function persistInferred(repoRoot5, options, contractsDir, codeDir, starte
     });
   }
   if (!options.dryRun && options.ref) {
-    await saveContracts(options.ref, "contracts_inferred", path72.join(contractsDir, "_inferred"));
+    await saveContracts(options.ref, "contracts_inferred", path73.join(contractsDir, "_inferred"));
   }
   const rendered = result.decisions.map((d3) => renderDecision(d3));
   const decisionPaths = rendered.map((r) => r.relPath);
@@ -210763,8 +210920,8 @@ async function persistInferred(repoRoot5, options, contractsDir, codeDir, starte
   return { infer: result, written, proposed, decisionPaths, summaries };
 }
 function autodetectCodeDir(repoRoot5) {
-  const codeSubdir = path72.join(repoRoot5, "code");
-  if (fs67.existsSync(codeSubdir) && fs67.statSync(codeSubdir).isDirectory()) {
+  const codeSubdir = path73.join(repoRoot5, "code");
+  if (fs68.existsSync(codeSubdir) && fs68.statSync(codeSubdir).isDirectory()) {
     return codeSubdir;
   }
   return repoRoot5;
@@ -210774,7 +210931,8 @@ var EMPTY_DECISIONS3 = {
   manualIncludes: [],
   manualExcludes: [],
   relations: [],
-  manualAreas: []
+  manualAreas: [],
+  conflictResolutions: []
 };
 var DECISIONS_REF = "_repo";
 var prDecisionsRef = (pr) => `_pr/${pr}`;
@@ -210828,7 +210986,12 @@ function mergeDecisions(base2, overlay) {
     ...(base2.manualAreas ?? []).filter((a) => !overlayAreaDocs.has(a.doc)),
     ...overlay.manualAreas ?? []
   ];
-  return { version: 1, manualIncludes, manualExcludes, relations, manualAreas };
+  const overlayResKeys = new Set((overlay.conflictResolutions ?? []).map(conflictResolutionKey));
+  const conflictResolutions = [
+    ...(base2.conflictResolutions ?? []).filter((r) => !overlayResKeys.has(conflictResolutionKey(r))),
+    ...overlay.conflictResolutions ?? []
+  ];
+  return { version: 1, manualIncludes, manualExcludes, relations, manualAreas, conflictResolutions };
 }
 function uniqueStrings(items) {
   return [...new Set(items)];
@@ -210837,6 +211000,13 @@ function getCorpus(repoKey) {
   return loadLatestSpec(repoKey, "corpus");
 }
 var relationKey = (r) => `${[r.older, r.newer].sort().join(" ")} ${r.scope ?? ""}`;
+var conflictResolutionKey = (r) => {
+  const sides = [
+    `${r.docA}#${r.anchorA ?? ""}`,
+    `${r.docB}#${r.anchorB ?? ""}`
+  ].sort();
+  return sides.join(" \0 ");
+};
 function applyAddRelation(existing, input) {
   if (input.older === input.newer) {
     throw new Error("addRelation: older and newer must be different docs");
@@ -210849,20 +211019,22 @@ function applyAddRelation(existing, input) {
     manualIncludes: existing.manualIncludes ?? [],
     manualExcludes: existing.manualExcludes ?? [],
     relations: [...dedup, relation],
-    manualAreas: existing.manualAreas ?? []
+    manualAreas: existing.manualAreas ?? [],
+    conflictResolutions: existing.conflictResolutions ?? []
   };
 }
 function applyRemoveRelation(existing, input) {
   const matches = (r) => {
-    const samePair = r.older === input.older && r.newer === input.newer || r.older === input.newer && r.newer === input.older;
-    return samePair && (input.scope === void 0 || r.scope === input.scope);
+    const samePair2 = r.older === input.older && r.newer === input.newer || r.older === input.newer && r.newer === input.older;
+    return samePair2 && (input.scope === void 0 || r.scope === input.scope);
   };
   return {
     version: 1,
     manualIncludes: existing.manualIncludes ?? [],
     manualExcludes: existing.manualExcludes ?? [],
     relations: (existing.relations ?? []).filter((r) => !matches(r)),
-    manualAreas: existing.manualAreas ?? []
+    manualAreas: existing.manualAreas ?? [],
+    conflictResolutions: existing.conflictResolutions ?? []
   };
 }
 function applyAddManualInclude(existing, docPath) {
@@ -210875,7 +211047,8 @@ function applyAddManualInclude(existing, docPath) {
     manualIncludes: includes.includes(docPath) ? includes : [...includes, docPath],
     manualExcludes: excludes.filter((p2) => p2 !== docPath),
     relations: existing.relations ?? [],
-    manualAreas: existing.manualAreas ?? []
+    manualAreas: existing.manualAreas ?? [],
+    conflictResolutions: existing.conflictResolutions ?? []
   };
 }
 function applyRemoveManualInclude(existing, docPath) {
@@ -210884,7 +211057,8 @@ function applyRemoveManualInclude(existing, docPath) {
     manualIncludes: (existing.manualIncludes ?? []).filter((p2) => p2 !== docPath),
     manualExcludes: existing.manualExcludes ?? [],
     relations: existing.relations ?? [],
-    manualAreas: existing.manualAreas ?? []
+    manualAreas: existing.manualAreas ?? [],
+    conflictResolutions: existing.conflictResolutions ?? []
   };
 }
 function applyAddManualExclude(existing, docPath) {
@@ -210897,7 +211071,8 @@ function applyAddManualExclude(existing, docPath) {
     manualIncludes: includes.filter((p2) => p2 !== docPath),
     manualExcludes: excludes.includes(docPath) ? excludes : [...excludes, docPath],
     relations: existing.relations ?? [],
-    manualAreas: existing.manualAreas ?? []
+    manualAreas: existing.manualAreas ?? [],
+    conflictResolutions: existing.conflictResolutions ?? []
   };
 }
 function applyRemoveManualExclude(existing, docPath) {
@@ -210906,7 +211081,23 @@ function applyRemoveManualExclude(existing, docPath) {
     manualIncludes: existing.manualIncludes ?? [],
     manualExcludes: (existing.manualExcludes ?? []).filter((p2) => p2 !== docPath),
     relations: existing.relations ?? [],
-    manualAreas: existing.manualAreas ?? []
+    manualAreas: existing.manualAreas ?? [],
+    conflictResolutions: existing.conflictResolutions ?? []
+  };
+}
+function applyAddConflictResolution(existing, input) {
+  if (input.docA === input.docB) {
+    throw new Error("addConflictResolution: docA and docB must be different docs");
+  }
+  const key4 = conflictResolutionKey(input);
+  const dedup = (existing.conflictResolutions ?? []).filter((r) => conflictResolutionKey(r) !== key4);
+  return {
+    version: 1,
+    manualIncludes: existing.manualIncludes ?? [],
+    manualExcludes: existing.manualExcludes ?? [],
+    relations: existing.relations ?? [],
+    manualAreas: existing.manualAreas ?? [],
+    conflictResolutions: [...dedup, input]
   };
 }
 async function addRelation(repoRoot5, input, opts) {
@@ -210943,6 +211134,11 @@ async function removeManualExclude(repoRoot5, docPath, opts) {
   await storeDecisions(repoRoot5, next, opts);
   return next;
 }
+async function addConflictResolution(repoRoot5, input, opts) {
+  const next = applyAddConflictResolution(await loadDecisions(repoRoot5, opts), input);
+  await storeDecisions(repoRoot5, next, opts);
+  return next;
+}
 
 // tools/cli/src/commands/contracts.ts
 init_progress();
@@ -211119,8 +211315,8 @@ async function runContractsGenerate(options = {}) {
 }
 async function runContractsList(options = {}) {
   const repoRoot5 = options.cwd ?? process.cwd();
-  const contractsDir = path73.join(repoRoot5, ".truecourse", "contracts");
-  if (!fs68.existsSync(contractsDir)) {
+  const contractsDir = path74.join(repoRoot5, ".truecourse", "contracts");
+  if (!fs69.existsSync(contractsDir)) {
     O2.info("No contracts found. Run `truecourse contracts generate` first.");
     return;
   }
@@ -211128,12 +211324,12 @@ async function runContractsList(options = {}) {
   const fileNodes = [];
   let parseErrors = 0;
   const visit = (dir) => {
-    for (const entry of fs68.readdirSync(dir, { withFileTypes: true })) {
-      const full = path73.join(dir, entry.name);
+    for (const entry of fs69.readdirSync(dir, { withFileTypes: true })) {
+      const full = path74.join(dir, entry.name);
       if (entry.isDirectory()) visit(full);
       else if (entry.isFile() && entry.name.endsWith(".tc")) {
         try {
-          fileNodes.push(parserOhm.parseTcFile(full, fs68.readFileSync(full, "utf-8")));
+          fileNodes.push(parserOhm.parseTcFile(full, fs69.readFileSync(full, "utf-8")));
         } catch {
           parseErrors += 1;
         }
@@ -211160,7 +211356,7 @@ async function runContractsList(options = {}) {
   mt(`Contracts \u2014 ${artifacts.length} ${scope}artifact${artifacts.length === 1 ? "" : "s"}`);
   for (const a of artifacts) {
     const conf = a.confidence ? `[${a.confidence}] ` : "";
-    const loc = a.origin ? a.origin.lines[0] >= 0 ? `${a.origin.source}:${a.origin.lines[0]}` : a.origin.source : `${path73.relative(repoRoot5, a.declarationLoc.filePath)}:${a.declarationLoc.lineStart}`;
+    const loc = a.origin ? a.origin.lines[0] >= 0 ? `${a.origin.source}:${a.origin.lines[0]}` : a.origin.source : `${path74.relative(repoRoot5, a.declarationLoc.filePath)}:${a.declarationLoc.lineStart}`;
     console.log(`  ${conf}${a.ref.type}:${a.ref.identity}  ${loc}`);
   }
   if (parseErrors > 0) {
@@ -211172,8 +211368,8 @@ async function runContractsList(options = {}) {
 }
 async function runContractsValidate(options = {}) {
   const repoRoot5 = options.cwd ?? process.cwd();
-  const contractsDir = path73.join(repoRoot5, ".truecourse", "contracts");
-  if (!fs68.existsSync(contractsDir)) {
+  const contractsDir = path74.join(repoRoot5, ".truecourse", "contracts");
+  if (!fs69.existsSync(contractsDir)) {
     O2.error("No .truecourse/contracts/ directory found.");
     process.exit(1);
   }
@@ -211181,14 +211377,14 @@ async function runContractsValidate(options = {}) {
   const fileNodes = [];
   const issues = [];
   const visit = (dir) => {
-    for (const entry of fs68.readdirSync(dir, { withFileTypes: true })) {
-      const full = path73.join(dir, entry.name);
+    for (const entry of fs69.readdirSync(dir, { withFileTypes: true })) {
+      const full = path74.join(dir, entry.name);
       if (entry.isDirectory()) visit(full);
       else if (entry.isFile() && entry.name.endsWith(".tc")) {
         try {
-          fileNodes.push(parserOhm.parseTcFile(full, fs68.readFileSync(full, "utf-8")));
+          fileNodes.push(parserOhm.parseTcFile(full, fs69.readFileSync(full, "utf-8")));
         } catch (e) {
-          issues.push(`${path73.relative(repoRoot5, full)}: parse error: ${e instanceof Error ? e.message : e}`);
+          issues.push(`${path74.relative(repoRoot5, full)}: parse error: ${e instanceof Error ? e.message : e}`);
         }
       }
     }
@@ -211196,11 +211392,11 @@ async function runContractsValidate(options = {}) {
   visit(contractsDir);
   const resolution = resolver.resolve(fileNodes);
   for (const err of resolution.errors) {
-    issues.push(`${path73.relative(repoRoot5, err.filePath)}:${err.line} ${err.message}`);
+    issues.push(`${path74.relative(repoRoot5, err.filePath)}:${err.line} ${err.message}`);
   }
   const trulyUnresolved = resolution.unresolvedRefs.filter((u2) => u2.ref.type !== "Unknown");
   for (const u2 of trulyUnresolved) {
-    issues.push(`${path73.relative(repoRoot5, u2.usedAt.filePath)}:${u2.usedAt.lineStart} unresolved ${u2.ref.type}:${u2.ref.identity}`);
+    issues.push(`${path74.relative(repoRoot5, u2.usedAt.filePath)}:${u2.usedAt.lineStart} unresolved ${u2.ref.type}:${u2.ref.identity}`);
   }
   if (issues.length === 0) {
     O2.success(`Validated ${resolution.index.size} artifact${resolution.index.size === 1 ? "" : "s"} \u2014 no issues.`);
@@ -211214,7 +211410,7 @@ async function runContractsValidate(options = {}) {
 
 // tools/cli/src/commands/spec.ts
 init_dist4();
-import path74 from "node:path";
+import path75 from "node:path";
 init_dist5();
 init_progress();
 init_registry();
@@ -211265,17 +211461,18 @@ async function runSpecScan(opts = {}) {
     O2.warn("Manual includes outside spec.include (never discovered \u2014 widen the scope to pick them up):");
     for (const inc of s.outOfScopeManualIncludes) O2.message(`  \u2022 ${inc}`);
   }
-  if (s.openOverlaps.length > 0) {
+  const open = openConflicts(curate2.corpus, curate2.decisions);
+  if (open.length > 0) {
     O2.message("");
-    O2.message("Open overlaps (areas where two docs may disagree \u2014 resolve with a relation):");
-    for (const o of s.openOverlaps.slice(0, 10)) {
+    O2.message("Open overlaps (two docs may disagree \u2014 pick a side or dismiss with `spec conflicts resolve`):");
+    for (const o of open.slice(0, 10)) {
       O2.message(`  \u2022 ${o.area}:  ${o.a}  \u2194  ${o.b}`);
     }
-    if (s.openOverlaps.length > 10) {
-      O2.message(`  \u2026 (+${s.openOverlaps.length - 10} more)`);
+    if (open.length > 10) {
+      O2.message(`  \u2026 (+${open.length - 10} more)`);
     }
   }
-  const openCount = s.openOverlaps.length;
+  const openCount = open.length;
   gt(
     openCount === 0 ? "Corpus written to .truecourse/specs/corpus.json. Run `truecourse guard generate`." : `Corpus written to .truecourse/specs/corpus.json. ${openCount} conflict${openCount === 1 ? "" : "s"} to resolve (\`truecourse spec conflicts list\`), then \`truecourse guard generate\`.`
   );
@@ -211307,6 +211504,14 @@ async function runSpecStatus(opts = {}) {
     const ov = area.overlaps.length ? ` \xB7 ${area.overlaps.length} overlap${area.overlaps.length === 1 ? "" : "s"}` : "";
     O2.message(`  ${area.id.padEnd(30)} ${area.docRefs.length} doc${area.docRefs.length === 1 ? "" : "s"}${ov}`);
   }
+  const orphaned = orphanedConflictResolutions(corpus, decisions);
+  if (orphaned.length > 0) {
+    O2.message("");
+    O2.warn(
+      `${orphaned.length} orphaned conflict resolution${orphaned.length === 1 ? "" : "s"} (no longer match a flagged dispute \u2014 review with \`spec conflicts list\`):`
+    );
+    for (const o of orphaned.slice(0, 10)) O2.message(`  \u2022 ${o.docA}  \u2194  ${o.docB}  (${o.verdict})`);
+  }
   gt(
     open === 0 ? "No open overlaps \u2014 run `truecourse guard generate`." : "Open overlaps \u2014 see `truecourse spec conflicts list`."
   );
@@ -211334,7 +211539,7 @@ async function runVerify(opts = {}) {
       O2.message("");
       O2.message("Drifts:");
       for (const d3 of verify2.drifts.slice(0, 20)) {
-        const loc = d3.filePath ? ` ${path74.relative(root2, d3.filePath)}:${d3.lineStart ?? "?"}` : "";
+        const loc = d3.filePath ? ` ${path75.relative(root2, d3.filePath)}:${d3.lineStart ?? "?"}` : "";
         O2.message(`  [${d3.severity}] ${d3.obligationKey}${loc}`);
         O2.message(`    \u2192 ${d3.message}`);
       }
@@ -211368,7 +211573,7 @@ async function runVerifyDiff(opts) {
       O2.message("");
       O2.message(`${label}:`);
       for (const d3 of drifts.slice(0, 20)) {
-        const loc = d3.filePath ? ` ${path74.relative(root2, d3.filePath)}:${d3.lineStart ?? "?"}` : "";
+        const loc = d3.filePath ? ` ${path75.relative(root2, d3.filePath)}:${d3.lineStart ?? "?"}` : "";
         O2.message(`  [${d3.severity}] ${d3.obligationKey}${loc}`);
       }
       if (drifts.length > 20) O2.message(`  \u2026 (+${drifts.length - 20} more)`);
@@ -211423,8 +211628,8 @@ async function runInfer(opts = {}) {
 
 // tools/cli/src/commands/spec-conflicts.ts
 init_dist4();
-import fs69 from "node:fs";
-import path75 from "node:path";
+import fs70 from "node:fs";
+import path76 from "node:path";
 init_dist5();
 var root = (opts) => opts.cwd ?? process.cwd();
 var base = (ref) => ref.split("/").pop() ?? ref;
@@ -211436,25 +211641,47 @@ function loadCorpusOrExit(repoRoot5) {
   }
   return corpus;
 }
+function resolvedLabel(c2) {
+  if (c2.resolution) {
+    if (c2.resolution.verdict === "dismissed") return "dismissed (not a real conflict)";
+    const winner = c2.resolution.verdict === "a" ? c2.resolution.docA : c2.resolution.docB;
+    return `${base(winner)} is right (loser\u2019s claim suppressed at generate)`;
+  }
+  if (c2.excludedRef) return `${base(c2.excludedRef)} excluded`;
+  return "resolved";
+}
 async function runSpecConflictsList(opts = {}) {
   const repoRoot5 = root(opts);
   const corpus = loadCorpusOrExit(repoRoot5);
-  const conflicts2 = buildCorpusConflicts(corpus, readCorpusDecisions(repoRoot5));
+  const decisions = readCorpusDecisions(repoRoot5);
+  const conflicts2 = buildCorpusConflicts(corpus, decisions);
   const open = conflicts2.filter((c2) => !c2.resolved);
-  const resolved = conflicts2.length - open.length;
-  mt("Overlaps (areas where docs may disagree)");
-  for (const c2 of open) {
-    O2.warn(`${c2.area}`);
-    O2.message(`  ${base(c2.a)}  \u2194  ${base(c2.b)}${c2.note ? `   \xB7 ${c2.note}` : ""}`);
-    O2.message(`  resolve: truecourse spec conflicts resolve ${c2.area} --older ${c2.a} --newer ${c2.b} --precedence`);
+  const orphaned = orphanedConflictResolutions(corpus, decisions);
+  mt("Overlaps (where two docs\u2019 sections may disagree)");
+  conflicts2.forEach((c2, i) => {
+    const n = i + 1;
+    if (c2.resolved) {
+      O2.step(`${n}. ${c2.area}  \xB7  ${base(c2.a)}  \u2194  ${base(c2.b)}  \u2014 resolved: ${resolvedLabel(c2)}`);
+    } else {
+      O2.warn(`${n}. ${c2.area}  \xB7  ${base(c2.a)}  \u2194  ${base(c2.b)}${c2.note ? `   \xB7 ${c2.note}` : ""}`);
+      O2.message(`   pick a side: truecourse spec conflicts resolve ${n} --right ${c2.a}   (or --right ${c2.b}, or --dismiss)`);
+    }
+  });
+  if (conflicts2.length === 0) O2.step("No overlaps flagged.");
+  if (orphaned.length > 0) {
+    O2.warn(
+      `${orphaned.length} orphaned resolution${orphaned.length === 1 ? "" : "s"} \u2014 recorded but no longer match a flagged conflict (the docs changed):`
+    );
+    for (const o of orphaned) O2.message(`   ${base(o.docA)}  \u2194  ${base(o.docB)}  (${o.verdict})`);
   }
-  if (open.length === 0) O2.step("No open overlaps.");
-  gt(`${open.length} open \xB7 ${resolved} resolved. Inspect with \`spec conflicts show <area>\`.`);
+  gt(
+    `${open.length} open \xB7 ${conflicts2.length - open.length} resolved${orphaned.length ? ` \xB7 ${orphaned.length} orphaned` : ""}. Inspect with \`spec conflicts show <area>\`.`
+  );
 }
 function excerpt(repoRoot5, ref, note, max = 20) {
   let text4;
   try {
-    text4 = fs69.readFileSync(path75.join(repoRoot5, ref), "utf-8");
+    text4 = fs70.readFileSync(path76.join(repoRoot5, ref), "utf-8");
   } catch {
     return `    (could not read ${ref})`;
   }
@@ -211478,47 +211705,76 @@ async function runSpecConflictsShow(area, opts = {}) {
   for (const ov of a.overlaps) {
     const [da, db] = ov.docs;
     const c2 = conflicts2.find(
-      (x) => x.area === area && (x.a === da && x.b === db || x.a === db && x.b === da)
+      (x) => (x.areas.includes(area) || x.area === area) && (x.a === da && x.b === db || x.a === db && x.b === da)
     );
     O2.warn(`${base(da)}  \u2194  ${base(db)}${ov.note ? `   \xB7 ${ov.note}` : ""}`);
-    if (c2?.relation) O2.message(`  resolved \u2192 ${c2.relation.type} (${c2.relation.older} \u21D2 ${c2.relation.newer})`);
-    else if (c2?.excludedRef) O2.message(`  resolved \u2192 ${c2.excludedRef} excluded`);
-    else O2.message("  open");
+    O2.message(c2 && c2.resolved ? `  resolved \u2192 ${resolvedLabel(c2)}` : "  open");
     O2.message(`  ${da}:`);
     O2.message(excerpt(repoRoot5, da, ov.note));
     O2.message(`  ${db}:`);
     O2.message(excerpt(repoRoot5, db, ov.note));
   }
-  gt("resolve with `spec conflicts resolve <area> --older P --newer P --replace|--precedence|--keep-both`.");
+  gt("resolve with `spec conflicts resolve <n|area> --right <docPath>` (pick a side) or `--dismiss`.");
 }
-async function runSpecConflictsResolve(area, opts) {
+function pickConflict(target, conflicts2, right) {
+  if (/^\d+$/.test(target)) {
+    const idx = Number(target) - 1;
+    if (idx < 0 || idx >= conflicts2.length) {
+      return { error: `No conflict #${target}. Run \`spec conflicts list\` (${conflicts2.length} listed).` };
+    }
+    return conflicts2[idx];
+  }
+  let inArea = conflicts2.filter((c2) => c2.areas.includes(target) || c2.area === target);
+  if (inArea.length === 0) return { error: `No conflicts in area ${target}. List them with \`spec conflicts list\`.` };
+  if (right) inArea = inArea.filter((c2) => c2.a === right || c2.b === right);
+  if (inArea.length === 0) return { error: `No conflict in ${target} involves ${right}.` };
+  if (inArea.length > 1) {
+    return { error: `Area ${target} has ${inArea.length} conflicts \u2014 address one by its number (\`spec conflicts list\`).` };
+  }
+  return inArea[0];
+}
+function buildResolution(c2, verdict, note) {
+  const secOf = (doc) => (c2.sections ?? []).find((s) => s.doc === doc);
+  return {
+    docA: c2.a,
+    anchorA: secOf(c2.a)?.heading ?? null,
+    quoteA: secOf(c2.a)?.quote,
+    docB: c2.b,
+    anchorB: secOf(c2.b)?.heading ?? null,
+    quoteB: secOf(c2.b)?.quote,
+    verdict,
+    resolvedAt: (/* @__PURE__ */ new Date()).toISOString(),
+    note
+  };
+}
+async function runSpecConflictsResolve(target, opts) {
   const repoRoot5 = root(opts);
-  if (!opts.older || !opts.newer) return fail("resolve needs --older <path> and --newer <path>");
-  if (opts.older === opts.newer) return fail("--older and --newer must be different docs");
   const corpus = loadCorpusOrExit(repoRoot5);
-  const a = corpus.areas.find((x) => x.id === area);
-  if (!a) return fail(`No such area: ${area}.`);
-  const known = new Set(a.docRefs);
-  for (const ref of [opts.older, opts.newer]) {
-    if (!known.has(ref)) return fail(`${ref} is not a doc in area ${area}. Docs: ${a.docRefs.join(", ")}`);
+  const decisions = readCorpusDecisions(repoRoot5);
+  if (!opts.right && !opts.dismiss) {
+    return fail("Pass --right <docPath> (pick a side) or --dismiss. Doc-level relations live in `spec chains add` and never resolve a conflict.");
+  }
+  if (opts.right && opts.dismiss) return fail("Pass either --right <docPath> or --dismiss, not both.");
+  const conflicts2 = buildCorpusConflicts(corpus, decisions);
+  const picked = pickConflict(target, conflicts2, opts.right);
+  if ("error" in picked) return fail(picked.error);
+  let verdict;
+  if (opts.dismiss) {
+    verdict = "dismissed";
+  } else {
+    if (opts.right !== picked.a && opts.right !== picked.b) {
+      return fail(`--right must be one of the disputing docs: ${picked.a} or ${picked.b}.`);
+    }
+    verdict = opts.right === picked.a ? "a" : "b";
+  }
+  await addConflictResolution(repoRoot5, buildResolution(picked, verdict, opts.note));
+  if (verdict === "dismissed") {
+    gt(`Dismissed: ${base(picked.a)} \u2194 ${base(picked.b)} is not a real conflict.`);
+  } else {
+    const winner = verdict === "a" ? picked.a : picked.b;
+    const loser = verdict === "a" ? picked.b : picked.a;
+    gt(`Recorded: ${base(winner)} is right. ${base(loser)}\u2019s disputed claim is suppressed at \`truecourse guard generate\`.`);
   }
-  const conflict = buildCorpusConflicts(corpus, readCorpusDecisions(repoRoot5)).find(
-    (c2) => c2.a === opts.older && c2.b === opts.newer || c2.a === opts.newer && c2.b === opts.older
-  );
-  const scope = conflict && conflict.areas.length > 1 ? void 0 : area;
-  await addRelation(repoRoot5, {
-    type: opts.type,
-    older: opts.older,
-    newer: opts.newer,
-    scope,
-    detectedFrom: "manual",
-    note: opts.note
-  });
-  const s = fe();
-  s.start("Re-scanning to apply the relation");
-  await curateInProcess(repoRoot5, {});
-  s.stop("Re-scanned");
-  gt(`Recorded ${opts.type}: ${opts.older} \u21D2 ${opts.newer} (scope ${scope ?? "all areas"}).`);
 }
 function fail(msg) {
   pt(msg);
@@ -211687,7 +211943,7 @@ function fail3(msg) {
 
 // tools/cli/src/commands/drifts.ts
 init_dist4();
-import path76 from "node:path";
+import path77 from "node:path";
 var DRIFT_SEVERITIES = [
   "critical",
   "high",
@@ -211724,7 +211980,7 @@ async function runDriftsList(opts = {}) {
   O2.message("");
   O2.message("Drifts:");
   for (const d3 of page) {
-    const loc = d3.filePath ? ` ${path76.relative(root2, d3.filePath)}:${d3.lineStart ?? "?"}` : "";
+    const loc = d3.filePath ? ` ${path77.relative(root2, d3.filePath)}:${d3.lineStart ?? "?"}` : "";
     O2.message(`  [${d3.severity}] ${d3.obligationKey}${loc}`);
     O2.message(`    \u2192 ${d3.message}`);
   }
@@ -211755,7 +212011,7 @@ function parseDriftSeverityFlag(raw) {
 
 // tools/cli/src/commands/guard.ts
 init_dist4();
-import path77 from "node:path";
+import path78 from "node:path";
 init_progress();
 
 // packages/core/dist/commands/guard-in-process.js
@@ -212200,7 +212456,7 @@ async function runGuardGenerate(opts = {}) {
     return;
   }
   const report4 = readGuardResult(repoRoot5) ?? { ...guard, generatedAt: (/* @__PURE__ */ new Date()).toISOString() };
-  printGuardGenerateSummary(report4, path77.relative(repoRoot5, guardResultPath(repoRoot5)));
+  printGuardGenerateSummary(report4, path78.relative(repoRoot5, guardResultPath(repoRoot5)));
   if (guard.written.length === 0 && guard.birthFindings.length === 0 && guard.errors.length === 0) {
     gt("No scenarios written.");
     return;
@@ -212408,7 +212664,7 @@ function printLoadErrors(loadErrors) {
 
 // tools/cli/src/commands/config.ts
 init_dist4();
-import path78 from "node:path";
+import path79 from "node:path";
 var STAGE_LABEL = {
   "spec.relevance": "Spec   \xB7 doc relevance",
   "spec.areaTag": "Spec   \xB7 area tag",
@@ -212439,7 +212695,7 @@ async function runConfigLlmShow(options = {}) {
   const repoRoot5 = options.cwd ?? process.cwd();
   const { stages, fallbackModel } = describeStageResolutions(repoRoot5);
   mt("LLM model resolution");
-  O2.info(`repoRoot   ${path78.relative(process.cwd(), repoRoot5) || "."}`);
+  O2.info(`repoRoot   ${path79.relative(process.cwd(), repoRoot5) || "."}`);
   O2.info(`fallback   ${fallbackModel ?? "(not configured)"}`);
   for (const stage of stages) {
     const label = STAGE_LABEL[stage.stageId];
@@ -212455,8 +212711,8 @@ async function runConfigLlmShow(options = {}) {
 
 // tools/cli/src/commands/hooks.ts
 import { execSync as execSync4 } from "node:child_process";
-import fs70 from "node:fs";
-import path79 from "node:path";
+import fs71 from "node:fs";
+import path80 from "node:path";
 init_dist4();
 init_paths();
 init_registry();
@@ -212490,17 +212746,17 @@ pre-commit:
 function findGitDir(from) {
   let dir = from;
   while (true) {
-    const gitPath = path79.join(dir, ".git");
-    if (fs70.existsSync(gitPath)) {
-      const stat = fs70.statSync(gitPath);
+    const gitPath = path80.join(dir, ".git");
+    if (fs71.existsSync(gitPath)) {
+      const stat = fs71.statSync(gitPath);
       if (stat.isDirectory()) return gitPath;
       if (stat.isFile()) {
-        const content = fs70.readFileSync(gitPath, "utf-8").trim();
+        const content = fs71.readFileSync(gitPath, "utf-8").trim();
         const match4 = content.match(/^gitdir:\s*(.+)$/);
-        if (match4) return path79.resolve(dir, match4[1]);
+        if (match4) return path80.resolve(dir, match4[1]);
       }
     }
-    const parent = path79.dirname(dir);
+    const parent = path80.dirname(dir);
     if (parent === dir) return null;
     dir = parent;
   }
@@ -212508,18 +212764,18 @@ function findGitDir(from) {
 function findProjectRoot(from) {
   let dir = from;
   while (true) {
-    if (fs70.existsSync(path79.join(dir, ".git"))) return dir;
-    const parent = path79.dirname(dir);
+    if (fs71.existsSync(path80.join(dir, ".git"))) return dir;
+    const parent = path80.dirname(dir);
     if (parent === dir) return null;
     dir = parent;
   }
 }
 function loadConfig(projectRoot) {
-  const configPath = path79.join(projectRoot, ".truecourse", "hooks.yaml");
-  if (!fs70.existsSync(configPath)) return null;
+  const configPath = path80.join(projectRoot, ".truecourse", "hooks.yaml");
+  if (!fs71.existsSync(configPath)) return null;
   let parsed;
   try {
-    const raw = fs70.readFileSync(configPath, "utf-8");
+    const raw = fs71.readFileSync(configPath, "utf-8");
     parsed = jsYaml.load(raw) || {};
   } catch (err) {
     console.error(`Error parsing ${configPath}: ${err.message}`);
@@ -212570,11 +212826,11 @@ async function runHooksInstall() {
   } else {
     console.log(INSTALL_WARNING);
   }
-  const hooksDir = path79.join(gitDir, "hooks");
-  fs70.mkdirSync(hooksDir, { recursive: true });
-  const hookPath = path79.join(hooksDir, "pre-commit");
-  if (fs70.existsSync(hookPath)) {
-    const existing = fs70.readFileSync(hookPath, "utf-8");
+  const hooksDir = path80.join(gitDir, "hooks");
+  fs71.mkdirSync(hooksDir, { recursive: true });
+  const hookPath = path80.join(hooksDir, "pre-commit");
+  if (fs71.existsSync(hookPath)) {
+    const existing = fs71.readFileSync(hookPath, "utf-8");
     if (!existing.includes(HOOK_IDENTIFIER)) {
       console.error(
         "Error: A pre-commit hook already exists and was not installed by TrueCourse."
@@ -212584,16 +212840,16 @@ async function runHooksInstall() {
       process.exit(1);
     }
   }
-  fs70.writeFileSync(hookPath, HOOK_SCRIPT, { mode: 493 });
+  fs71.writeFileSync(hookPath, HOOK_SCRIPT, { mode: 493 });
   console.log("TrueCourse pre-commit hook installed.");
   console.log(`  ${hookPath}`);
   const projectRoot = findProjectRoot(process.cwd());
   if (projectRoot) {
-    const cfgDir = path79.join(projectRoot, ".truecourse");
-    const cfgPath = path79.join(cfgDir, "hooks.yaml");
-    if (!fs70.existsSync(cfgPath)) {
-      fs70.mkdirSync(cfgDir, { recursive: true });
-      fs70.writeFileSync(cfgPath, HOOKS_YAML_TEMPLATE);
+    const cfgDir = path80.join(projectRoot, ".truecourse");
+    const cfgPath = path80.join(cfgDir, "hooks.yaml");
+    if (!fs71.existsSync(cfgPath)) {
+      fs71.mkdirSync(cfgDir, { recursive: true });
+      fs71.writeFileSync(cfgPath, HOOKS_YAML_TEMPLATE);
       console.log(`  ${cfgPath} (starter config \u2014 edit to customize, commit to share with the team)`);
     }
   }
@@ -212604,17 +212860,17 @@ function runHooksUninstall() {
     console.error("Error: Not a git repository.");
     process.exit(1);
   }
-  const hookPath = path79.join(gitDir, "hooks", "pre-commit");
-  if (!fs70.existsSync(hookPath)) {
+  const hookPath = path80.join(gitDir, "hooks", "pre-commit");
+  if (!fs71.existsSync(hookPath)) {
     console.log("No pre-commit hook installed.");
     return;
   }
-  const content = fs70.readFileSync(hookPath, "utf-8");
+  const content = fs71.readFileSync(hookPath, "utf-8");
   if (!content.includes(HOOK_IDENTIFIER)) {
     console.error("Error: The pre-commit hook was not installed by TrueCourse. Leaving it in place.");
     process.exit(1);
   }
-  fs70.unlinkSync(hookPath);
+  fs71.unlinkSync(hookPath);
   console.log("TrueCourse pre-commit hook removed.");
 }
 function runHooksStatus() {
@@ -212623,8 +212879,8 @@ function runHooksStatus() {
     console.error("Error: Not a git repository.");
     process.exit(1);
   }
-  const hookPath = path79.join(gitDir, "hooks", "pre-commit");
-  const installed = fs70.existsSync(hookPath) && fs70.readFileSync(hookPath, "utf-8").includes(HOOK_IDENTIFIER);
+  const hookPath = path80.join(gitDir, "hooks", "pre-commit");
+  const installed = fs71.existsSync(hookPath) && fs71.readFileSync(hookPath, "utf-8").includes(HOOK_IDENTIFIER);
   if (installed) {
     console.log("TrueCourse pre-commit hook: installed");
     console.log(`  ${hookPath}`);
@@ -212733,7 +212989,7 @@ async function runHooksRun() {
 
 // tools/cli/src/index.ts
 var program2 = new Command();
-program2.name("truecourse").version("0.7.0-next.8").description("TrueCourse CLI \u2014 analyze your repository and open the dashboard");
+program2.name("truecourse").version("0.7.0-next.9").description("TrueCourse CLI \u2014 analyze your repository and open the dashboard");
 function warnDiscontinued(command) {
   process.stderr.write(
     `\u26A0 \`${command}\` is discontinued in favor of \`truecourse guard\` \u2014 see the README. Planned removal: 0.8.
@@ -212814,19 +213070,18 @@ specCmd.command("status").description("Summary of docs, areas, relations, and op
   await runSpecStatus();
 });
 var conflictsCmd = specCmd.command("conflicts").description("Inspect and resolve flagged within-area doc overlaps (agent-friendly)");
-conflictsCmd.command("list").description("List flagged overlaps still awaiting a relation").action(async () => {
+conflictsCmd.command("list").description("List flagged overlaps still awaiting a verdict").action(async () => {
   await runSpecConflictsList();
 });
 conflictsCmd.command("show <area>").description("Show an area's overlapping docs with prose excerpts").action(async (area) => {
   await runSpecConflictsShow(area);
 });
-conflictsCmd.command("resolve <area>").description("Resolve an overlap by recording a doc\u2192doc relation").requiredOption("--older <path>", "Repo-relative path of the older / superseded doc").requiredOption("--newer <path>", "Repo-relative path of the newer / authoritative doc").option("--replace", "`newer` fully supersedes `older` (excluded from generate)").option("--precedence", "Both feed generate; `newer` wins where they overlap").option("--keep-both", "Both are current peers (combine)").option("--note <text>", "Optional rationale").action(async (area, opts) => {
-  const type2 = opts.replace ? "replace" : opts.precedence ? "precedence" : opts.keepBoth ? "keep-both" : void 0;
-  if (!type2) {
-    console.error("Pass one of --replace | --precedence | --keep-both");
-    process.exit(1);
-  }
-  await runSpecConflictsResolve(area, { older: opts.older, newer: opts.newer, type: type2, note: opts.note });
+conflictsCmd.command("resolve <n|area>").description("Resolve a flagged overlap: pick a side (--right) or dismiss it (--dismiss)").option("--right <path>", "Pick a side: this doc is right; the other side's disputed claim is suppressed at generate").option("--dismiss", "Not a real conflict \u2014 dismiss the detector false-positive").option("--note <text>", "Optional rationale").action(async (target, opts) => {
+  await runSpecConflictsResolve(target, {
+    right: opts.right,
+    dismiss: opts.dismiss,
+    note: opts.note
+  });
 });
 var chainsCmd = specCmd.command("chains").description("Manage doc\u2192doc relations (supersession / precedence overrides)");
 chainsCmd.command("list").description("List effective relations (auto-detected + user-authored)").action(async () => {