@danmoisan/drm-copilot-mcp 1.1.11 → 1.1.12

package/out/mcp-server.js

@@ -16321,12 +16321,14 @@ function resolveCollectCommitContextToolInput(rawInput, fallbackWorkspaceRoot) {
 }
 function resolveCollectPrContextToolInput(rawInput, fallbackWorkspaceRoot) {
   const args = asToolArgumentObject(rawInput);
+  const targetRef = normalizeOptionalText(args["target_ref"], "target_ref");
   return {
     workspaceRoot: normalizeWorkspaceRoot(
       args["workspace_root"],
       fallbackWorkspaceRoot
     ),
-    base: normalizeRequiredText(args["base"], "base")
+    base: normalizeRequiredText(args["base"], "base"),
+    ...targetRef === void 0 ? {} : { targetRef }
   };
 }
 function resolveRunCodexNativeConverterToolInput(rawInput, fallbackWorkspaceRoot) {
@@ -17163,6 +17165,10 @@ var REPO_AUTOMATION_TOOL_DEFINITIONS = [
         base: {
           type: "string",
           description: "Explicit base branch or ref used for PR context collection."
+        },
+        target_ref: {
+          type: "string",
+          description: "Optional explicit head ref naming the branch to collect PR context for. When omitted, the invoking session's current HEAD is used as a fallback, and the fallback is recorded on the returned result and in the summary artifact."
         }
       },
       required: ["workspace_root", "base"],
@@ -17880,6 +17886,9 @@ function toMcpToolResult(result) {
     ...result.destinationPath === void 0 ? {} : { destination_path: result.destinationPath },
     ...result.renderedTree === void 0 ? {} : { rendered_tree: result.renderedTree },
     ...result.targetRepository === void 0 ? {} : { target_repository: result.targetRepository },
+    ...result.targetResolution === void 0 ? {} : { target_resolution: result.targetResolution },
+    ...result.resolvedHeadRef === void 0 ? {} : { resolved_head_ref: result.resolvedHeadRef },
+    ...result.resolvedHeadSha === void 0 ? {} : { resolved_head_sha: result.resolvedHeadSha },
     ...result.warnings === void 0 ? {} : { warnings: result.warnings }
   };
 }
@@ -18922,9 +18931,32 @@ var ARTIFACT_DIRECTORY3 = "artifacts/codex-and-agents-customizations";
 var ROOT_FOLDERS = [".codex", ".agents"];
 var PACK_MANIFEST_SUBDIR = "pack-manifests";
 var ROUTING_CONFIG_RELATIVE_PATH = "config/orchestration-routing.json";
+var VIRTUAL_RESOURCE_PAIRS = [
+  [ROUTING_CONFIG_RELATIVE_PATH, ROUTING_CONFIG_RELATIVE_PATH],
+  [
+    "config/orchestration-handoff-registry.json",
+    "config/orchestration-handoff-registry.json"
+  ],
+  [
+    "config/orchestration-handoff.schema.json",
+    "config/orchestration-handoff.schema.json"
+  ],
+  [
+    ".codex/lib/codex-routing/CodexTopology.psm1",
+    "lib/codex-routing/CodexTopology.psm1"
+  ],
+  [
+    ".codex/lib/codex-routing/CodexDeployment.psm1",
+    "lib/codex-routing/CodexDeployment.psm1"
+  ]
+];
+var VIRTUAL_ROOT_FOLDERS = [
+  "config",
+  ".codex/lib/codex-routing"
+];
 var PUBLISHED_ROOT_FOLDERS = [
   ...ROOT_FOLDERS,
-  "config"
+  ...VIRTUAL_ROOT_FOLDERS
 ];
 function passthroughRewrite(text2) {
   return [text2, 0, 0, []];
@@ -19010,36 +19042,46 @@ var CodexFilteringFileSystem = class {
 var RoutingConfigFileSystem = class {
   constructor(inner, options) {
     this.inner = inner;
-    this.virtualPath = joinPosix4(
-      options.sourceRoot,
-      ROUTING_CONFIG_RELATIVE_PATH
+    const resourceRoot = parentPosix(options.bundleRoot);
+    this.virtualPaths = new Map(
+      VIRTUAL_RESOURCE_PAIRS.map(
+        ([destination, resource]) => [
+          joinPosix4(options.sourceRoot, destination),
+          joinPosix4(resourceRoot, resource)
+        ]
+      )
     );
-    this.virtualRoot = joinPosix4(options.sourceRoot, "config");
-    this.resourcePath = joinPosix4(
-      parentPosix(options.bundleRoot),
-      ROUTING_CONFIG_RELATIVE_PATH
+    this.virtualRoots = new Set(
+      VIRTUAL_ROOT_FOLDERS.map((root) => joinPosix4(options.sourceRoot, root))
     );
   }
   inner;
-  virtualPath;
-  virtualRoot;
-  resourcePath;
+  virtualPaths;
+  virtualRoots;
+  resolve(path16) {
+    return this.virtualPaths.get(normalizePosix(path16)) ?? path16;
+  }
   listFiles(root) {
-    if (normalizePosix(root) === this.virtualRoot) {
-      return this.inner.isFile(this.resourcePath) ? [this.virtualPath] : [];
+    const normalizedRoot = normalizePosix(root);
+    if (!this.virtualRoots.has(normalizedRoot)) {
+      return this.inner.listFiles(root);
     }
-    return this.inner.listFiles(root);
+    const listed = [];
+    for (const [virtualPath, resourcePath] of this.virtualPaths) {
+      if (parentPosix(virtualPath) === normalizedRoot && this.inner.isFile(resourcePath)) {
+        listed.push(virtualPath);
+      }
+    }
+    return listed;
   }
   isDir(path16) {
     return this.inner.isDir(path16);
   }
   isFile(path16) {
-    return normalizePosix(path16) === this.virtualPath ? this.inner.isFile(this.resourcePath) : this.inner.isFile(path16);
+    return this.inner.isFile(this.resolve(path16));
   }
   readTextFile(path16) {
-    return this.inner.readTextFile(
-      normalizePosix(path16) === this.virtualPath ? this.resourcePath : path16
-    );
+    return this.inner.readTextFile(this.resolve(path16));
   }
   writeTextFile(path16, content) {
     this.inner.writeTextFile(path16, content);
@@ -31774,8 +31816,8 @@ function isInsidersSession(envLookup) {
   return false;
 }
 function resolveCodeCli(whichLookup, envLookup) {
-  const candidateNames = isInsidersSession(envLookup) ? ["code-insiders", "code"] : ["code", "code-insiders"];
-  for (const candidateName of candidateNames) {
+  const candidateNames2 = isInsidersSession(envLookup) ? ["code-insiders", "code"] : ["code", "code-insiders"];
+  for (const candidateName of candidateNames2) {
     const resolvedCommand = whichLookup(candidateName);
     if (resolvedCommand) {
       return resolvedCommand;
@@ -31894,7 +31936,56 @@ function newPotentialBugEntryServiceCall(input) {
 }
 
 // ../../extensions/drm-copilot/src/lib/pr-context/pr-context-service-call.ts
+var import_node_path2 = require("node:path");
+
+// ../../extensions/drm-copilot/src/lib/executable-resolver.ts
+var import_node_fs = require("node:fs");
 var import_node_path = require("node:path");
+var DEFAULT_PATHEXT = ".COM;.EXE;.BAT;.CMD";
+function splitNonEmpty(value, delimiter4) {
+  return value.split(delimiter4).filter((entry) => entry.length > 0);
+}
+function candidateNames(name, platform, pathExtValue) {
+  if (platform !== "win32") {
+    return [name];
+  }
+  const extensions = splitNonEmpty(
+    pathExtValue === void 0 || pathExtValue === "" ? DEFAULT_PATHEXT : pathExtValue,
+    ";"
+  );
+  const lowerName = name.toLowerCase();
+  const hasKnownExtension = extensions.some(
+    (ext) => lowerName.endsWith(ext.toLowerCase())
+  );
+  const withExtensions = extensions.map((ext) => `${name}${ext}`);
+  return hasKnownExtension ? [name, ...withExtensions] : withExtensions;
+}
+function resolveExecutableOnPath(options) {
+  const { name, pathValue, pathExtValue, platform, exists } = options;
+  if (pathValue === void 0 || pathValue === "") {
+    return void 0;
+  }
+  const pathApi = platform === "win32" ? import_node_path.win32 : import_node_path.posix;
+  const names = candidateNames(name, platform, pathExtValue);
+  for (const directory of splitNonEmpty(pathValue, pathApi.delimiter)) {
+    for (const candidateName of names) {
+      const candidate = pathApi.join(directory, candidateName);
+      if (exists(candidate)) {
+        return candidate;
+      }
+    }
+  }
+  return void 0;
+}
+function defaultWhichGh() {
+  return resolveExecutableOnPath({
+    name: "gh",
+    pathValue: process.env["PATH"],
+    pathExtValue: process.env["PATHEXT"],
+    platform: process.platform,
+    exists: import_node_fs.existsSync
+  });
+}
 
 // ../../extensions/drm-copilot/src/lib/pr-context/models.ts
 var SECTION_LINE = "===== {title} =====";
@@ -31910,6 +32001,9 @@ var CONVENTIONAL_TYPES = [
   "ci",
   "style"
 ];
+var ISSUE_REFERENCE_PATTERN = /(?<!\w)#\d+(?!\w)/u;
+var AUTOCLOSE_UNVERIFIED_ANNOTATION = "Unverified: the issues listed above come from feature metadata only and were not checked against GitHub (GitHub CLI unavailable).";
+var AUTOCLOSE_PENDING_NOT_OPEN_TEXT = "None (deterministic pending issue is not an open issue)";
 function section(title) {
   return "\n" + SECTION_LINE.replace("{title}", title) + "\n";
 }
@@ -32658,6 +32752,149 @@ function isRecord5(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 
+// ../../extensions/drm-copilot/src/lib/pr-context/autoclose.ts
+function classifyReferences(options) {
+  const {
+    gh,
+    ghAvailable,
+    featureIssueRefs,
+    branchRefs,
+    pathRefs,
+    referencedIssuesSet,
+    referencedPrsSet,
+    invalidRefsSet
+  } = options;
+  if (ghAvailable) {
+    for (const ref of featureIssueRefs) {
+      classifyOne(
+        gh,
+        ref,
+        referencedIssuesSet,
+        referencedPrsSet,
+        invalidRefsSet
+      );
+    }
+    for (const ref of [...branchRefs, ...pathRefs]) {
+      classifyOne(
+        gh,
+        ref,
+        referencedIssuesSet,
+        referencedPrsSet,
+        invalidRefsSet
+      );
+    }
+  } else {
+    for (const ref of featureIssueRefs) {
+      referencedIssuesSet.add(formatRef(ref));
+    }
+    for (const ref of [...branchRefs, ...pathRefs]) {
+      referencedIssuesSet.add(formatRef(ref));
+    }
+  }
+}
+function classifyOne(gh, ref, issuesSet, prsSet, invalidSet) {
+  const formatted = formatRef(ref);
+  const entity = gh.classifyEntity(ref.replace(/^#+/u, ""));
+  if (entity === "issue") {
+    issuesSet.add(formatted);
+  } else if (entity === "pull") {
+    prsSet.add(formatted);
+  } else {
+    invalidSet.add(formatted);
+  }
+}
+function formatRef(ref) {
+  return ref.startsWith("#") ? ref : `#${ref}`;
+}
+function selectPendingPrimary(options) {
+  const { gh, ghAvailable, pendingPrimary } = options;
+  if (!ghAvailable) {
+    return {
+      kept: [...pendingPrimary],
+      excluded: false,
+      fetchedDetails: /* @__PURE__ */ new Map()
+    };
+  }
+  const kept = [];
+  const fetchedDetails = /* @__PURE__ */ new Map();
+  let excluded = false;
+  for (const ref of pendingPrimary) {
+    const numberRef = normalizeReference(ref);
+    if (gh.classifyEntity(numberRef) !== "issue") {
+      excluded = true;
+      continue;
+    }
+    const details = gh.issueDetails(numberRef);
+    fetchedDetails.set(ref, details);
+    if (details.state.toLowerCase() === "open") {
+      kept.push(ref);
+    } else {
+      excluded = true;
+    }
+  }
+  return { kept, excluded, fetchedDetails };
+}
+function buildCloseCandidatesSection(params) {
+  const { verified, authorAsserted, referenced, verifiedReason, authorReason } = params;
+  const authorAutoClose = [...new Set(authorAsserted)].sort(compareCodePoint2);
+  const closing = /* @__PURE__ */ new Set([...verified, ...authorAsserted]);
+  const referencedOnly = [...new Set(referenced)].filter((ref) => !closing.has(ref)).sort(compareCodePoint2);
+  return [
+    section("Close candidates"),
+    "Auto-close issues (verified from GitHub PR metadata):",
+    formatList(verified, verifiedReason),
+    "",
+    "Auto-close issues (author asserted):",
+    formatList(authorAutoClose, authorReason),
+    "",
+    "Referenced issues (detected):",
+    formatList(referencedOnly, "(none)")
+  ].join("\n");
+}
+function buildIssuesToAutocloseSection(params) {
+  const {
+    verified,
+    pendingPrimary,
+    readinessSignals,
+    ghAvailable = true,
+    pendingPrimaryExcluded = false
+  } = params;
+  const ordered = [];
+  for (const issue2 of [...verified, ...pendingPrimary]) {
+    if (issue2 && !ordered.includes(issue2)) {
+      ordered.push(issue2);
+    }
+  }
+  let body;
+  if (ordered.length > 0) {
+    body = formatList(ordered, "(none)");
+    if (!ghAvailable) {
+      body = `${body}
+${AUTOCLOSE_UNVERIFIED_ANNOTATION}`;
+    }
+  } else if (!ghAvailable) {
+    body = "None (GitHub CLI unavailable; closing issues not verified)";
+  } else if (pendingPrimaryExcluded) {
+    body = AUTOCLOSE_PENDING_NOT_OPEN_TEXT;
+  } else if (readinessSignals.some((signal) => signal === "PASS")) {
+    body = "None (no verified closing issues and no deterministic pending issue)";
+  } else {
+    body = "None (no verified closing issues and readiness not PASS)";
+  }
+  return [section("Issues to autoclose (verified or pending)"), body].join(
+    "\n"
+  );
+}
+function compareCodePoint2(left, right) {
+  if (left < right) {
+    return -1;
+  }
+  if (left > right) {
+    return 1;
+  }
+  return 0;
+}
+
 // ../../extensions/drm-copilot/src/lib/pr-context/render-pr-helpers.ts
 var DEFAULT_BASE_CANDIDATES = [
   "origin/main",
@@ -32724,14 +32961,14 @@ function extensionSummary(files) {
     const ext = suffix2 ? suffix2 : "(noext)";
     counts.set(ext, (counts.get(ext) ?? 0) + 1);
   }
-  const lines = [...counts.keys()].sort(compareCodePoint2).map((key) => `${padCount(counts.get(key))}  ${key}`);
+  const lines = [...counts.keys()].sort(compareCodePoint3).map((key) => `${padCount(counts.get(key))}  ${key}`);
   return lines.join("\n");
 }
 function extractIssueReferences(text2) {
   if (!text2) {
     return [];
   }
-  const matches = text2.match(/(?<!\w)#\d+|\b[A-Z][A-Z0-9]+-\d+\b/gu) ?? [];
+  const matches = text2.match(new RegExp(ISSUE_REFERENCE_PATTERN, "gu")) ?? [];
   const seen = /* @__PURE__ */ new Set();
   const ordered = [];
   for (const item of matches) {
@@ -32751,7 +32988,7 @@ function extractMergePrNumbers(subjects) {
       numbers.add(`#${match[1]}`);
     }
   }
-  return [...numbers].sort(compareCodePoint2);
+  return [...numbers].sort(compareCodePoint3);
 }
 function summarizeConventionalCommits(subjects) {
   const counts = /* @__PURE__ */ new Map();
@@ -32775,43 +33012,6 @@ function summarizeConventionalCommits(subjects) {
   }
   return nonZero.map(([name, value]) => `${padName(name)} : ${value}`).join("\n");
 }
-function buildCloseCandidatesSection(params) {
-  const { verified, authorAsserted, referenced, verifiedReason, authorReason } = params;
-  const allAutoClose = /* @__PURE__ */ new Set([...verified, ...authorAsserted, ...referenced]);
-  const authorAutoClose = [...allAutoClose].sort(compareCodePoint2);
-  const referencedOnly = referenced.filter((ref) => !allAutoClose.has(ref)).filter((ref, index, arr) => arr.indexOf(ref) === index).sort(compareCodePoint2);
-  return [
-    section("Close candidates"),
-    "Auto-close issues (verified from GitHub PR metadata):",
-    formatList(verified, verifiedReason),
-    "",
-    "Auto-close issues (author asserted):",
-    formatList(authorAutoClose, authorReason),
-    "",
-    "Referenced issues (detected):",
-    formatList(referencedOnly, "(none)")
-  ].join("\n");
-}
-function buildIssuesToAutocloseSection(params) {
-  const { verified, pendingPrimary, readinessSignals } = params;
-  const ordered = [];
-  for (const issue2 of [...verified, ...pendingPrimary]) {
-    if (issue2 && !ordered.includes(issue2)) {
-      ordered.push(issue2);
-    }
-  }
-  let body;
-  if (ordered.length > 0) {
-    body = formatList(ordered, "(none)");
-  } else if (readinessSignals.some((signal) => signal === "PASS")) {
-    body = "None (no verified closing issues and no deterministic pending issue)";
-  } else {
-    body = "None (no verified closing issues and readiness not PASS)";
-  }
-  return [section("Issues to autoclose (verified or pending)"), body].join(
-    "\n"
-  );
-}
 function extractChangedPaths(contextText) {
   const paths = [];
   let capture = false;
@@ -32852,7 +33052,7 @@ function padName(name) {
 function isDigits(value) {
   return value.length > 0 && /^\d+$/u.test(value);
 }
-function compareCodePoint2(left, right) {
+function compareCodePoint3(left, right) {
   if (left < right) {
     return -1;
   }
@@ -33087,9 +33287,9 @@ function errorMessage(exc) {
   return exc instanceof Error ? exc.message : String(exc);
 }
 function sortedSet2(values) {
-  return [...new Set(values)].sort(compareCodePoint3);
+  return [...new Set(values)].sort(compareCodePoint4);
 }
-function compareCodePoint3(left, right) {
+function compareCodePoint4(left, right) {
   if (left < right) {
     return -1;
   }
@@ -33139,7 +33339,7 @@ function extractIssueReferences2(text2) {
   if (!text2) {
     return [];
   }
-  const matches = text2.match(/(?<!\w)#\d+|\b[A-Z][A-Z0-9]+-\d+\b/gu) ?? [];
+  const matches = text2.match(new RegExp(ISSUE_REFERENCE_PATTERN, "gu")) ?? [];
   const seen = /* @__PURE__ */ new Set();
   const ordered = [];
   for (const item of matches) {
@@ -33184,7 +33384,7 @@ function readText(fs12, path16) {
   return fs12.exists(path16) ? fs12.readTextFile(path16) : "";
 }
 function latestGlobPath(fs12, directory, pattern) {
-  const matches = [...fs12.glob(directory, pattern)].sort(compareCodePoint4);
+  const matches = [...fs12.glob(directory, pattern)].sort(compareCodePoint5);
   return matches.length > 0 ? matches[matches.length - 1] : null;
 }
 function verificationText(planText) {
@@ -33228,7 +33428,7 @@ function parseReadinessValue(text2) {
 }
 function resolveReadinessSignal(fs12, featureDir) {
   const auditFiles = [...fs12.glob(featureDir, "feature-audit.*.md")].sort(
-    compareCodePoint4
+    compareCodePoint5
   );
   for (let index = auditFiles.length - 1; index >= 0; index -= 1) {
     const auditPath = auditFiles[index];
@@ -33247,7 +33447,7 @@ function relativeToPosix6(root, path16) {
   }
   return normalized.replace(/^\/+/u, "");
 }
-function compareCodePoint4(left, right) {
+function compareCodePoint5(left, right) {
   if (left < right) {
     return -1;
   }
@@ -33285,7 +33485,7 @@ function discoverCanonicalEvidenceFiles(fs12, root, feature) {
       }
     }
   }
-  return [...discovered].sort(compareCodePoint5);
+  return [...discovered].sort(compareCodePoint6);
 }
 function parseVerificationEvidenceMarkdown(params) {
   const { feature, sourceFile, markdown } = params;
@@ -33381,7 +33581,7 @@ function relativeToPosix7(root, absolute) {
   }
   return normalized.replace(/^\/+/u, "");
 }
-function compareCodePoint5(left, right) {
+function compareCodePoint6(left, right) {
   if (left < right) {
     return -1;
   }
@@ -33429,7 +33629,7 @@ function gatherFeatureExcerpts2(fs12, root, changedFiles) {
   const excerpts = [];
   const baseDir = `${normalizedRoot}/docs/features/active`;
   const promotedDir = `${normalizedRoot}/docs/features/potential/promoted`;
-  for (const feature of [...features].sort(compareCodePoint4)) {
+  for (const feature of [...features].sort(compareCodePoint5)) {
     const featureDir = resolveFeatureDir2(fs12, baseDir, feature);
     const promotedFeatureDir = resolveFeatureDir2(fs12, promotedDir, feature);
     if (featureDir === null && promotedFeatureDir === null) {
@@ -33583,7 +33783,7 @@ function buildContextFiles(params) {
     feature
   );
   return [.../* @__PURE__ */ new Set([...contextFiles, ...evidenceContextFiles])].sort(
-    compareCodePoint4
+    compareCodePoint5
   );
 }
 
@@ -33884,6 +34084,29 @@ function bucketText(name, entries) {
   ];
   return lines.join("\n");
 }
+function buildBaseHeadSection(ctx, head, workspaceRoot) {
+  const lines = [
+    section("Base/Head"),
+    `Base ref (requested): ${ctx.baseRef ?? "(default)"}`,
+    `Base ref (resolved): ${ctx.resolvedBase ?? "(unknown)"} @ ${ctx.baseSha ?? "(unknown)"}`,
+    `Head ref (resolved): ${ctx.headRef ?? head ?? "(unknown)"} @ ${ctx.headSha ?? "(unknown)"}`,
+    renderHeadRefSourceLine(head, workspaceRoot),
+    `Merge base: ${ctx.mergeBase ?? "(unknown)"}`,
+    `Range: ${ctx.revRange ?? "(unknown)"}`
+  ];
+  if (ctx.baseRef && ctx.resolvedBase && !ctx.resolvedBase.startsWith("origin/")) {
+    lines.push(
+      `WARNING: Requested base is local and may be stale; prefer origin/${ctx.baseRef}`
+    );
+  }
+  return lines;
+}
+function renderHeadRefSourceLine(head, workspaceRoot) {
+  if (head !== null) {
+    return `Head ref (source): explicit target '${head}'`;
+  }
+  return `Head ref (source): session fallback (no target_ref supplied; derived from workspace root '${workspaceRoot}')`;
+}
 function parseSection3(markdown, heading) {
   const escaped = heading.replace(/[.*+?^${}()|[\]\\]/gu, "\\$&");
   const pattern = new RegExp(
@@ -33996,11 +34219,11 @@ function collectPrContext(options) {
     referencedPrsSet,
     invalidRefsSet
   });
-  const referencedIssues = [...referencedIssuesSet].sort(compareCodePoint6);
-  const referencedPrs = [...referencedPrsSet].sort(compareCodePoint6);
-  const invalidRefs = [...invalidRefsSet].sort(compareCodePoint6);
-  let authorAsserted = [];
-  const authorReasonInitial = "None (author has not asserted autoclose issues)";
+  const referencedIssues = [...referencedIssuesSet].sort(compareCodePoint7);
+  const referencedPrs = [...referencedPrsSet].sort(compareCodePoint7);
+  const invalidRefs = [...invalidRefsSet].sort(compareCodePoint7);
+  const authorAsserted = [];
+  const authorReason = "None (author has not asserted autoclose issues)";
   const verified = ghAvailable ? contextResult.verifiedClosing : [];
   let verifiedReason;
   if (!ghAvailable) {
@@ -34012,11 +34235,6 @@ function collectPrContext(options) {
   } else {
     verifiedReason = "(verified from GitHub PR metadata)";
   }
-  let authorReason = authorReasonInitial;
-  if (referencedIssues.length > 0) {
-    authorAsserted = sortedSet3([...authorAsserted, ...referencedIssues]);
-    authorReason = "Detected issue references (classified)";
-  }
   const pendingPrimary = [];
   for (const featureDoc of featureDocs) {
     if (featureDoc.readinessSignal !== "PASS") {
@@ -34032,20 +34250,25 @@ function collectPrContext(options) {
   const readinessSignals = sortedSet3(
     featureDocs.map((doc) => doc.readinessSignal).filter((signal) => Boolean(signal))
   );
+  const selection = selectPendingPrimary({ gh, ghAvailable, pendingPrimary });
   const issuesToAutocloseSection = buildIssuesToAutocloseSection({
     verified,
-    pendingPrimary,
-    readinessSignals
+    pendingPrimary: selection.kept,
+    readinessSignals,
+    ghAvailable,
+    pendingPrimaryExcluded: selection.excluded
   });
   const issuesToFetch = sortedSet3([
     ...verified,
-    ...authorAsserted,
-    ...referencedIssues
+    ...referencedIssues,
+    ...selection.kept
   ]);
   const issueDetails = [];
   if (ghAvailable) {
     for (const ref of issuesToFetch) {
-      issueDetails.push(gh.issueDetails(ref.replace(/^#+/u, "")));
+      issueDetails.push(
+        selection.fetchedDetails.get(ref) ?? gh.issueDetails(ref.replace(/^#+/u, ""))
+      );
     }
   }
   const prDetailsList = [];
@@ -34141,66 +34364,13 @@ function collectPrContext(options) {
     head
   };
 }
-function classifyReferences(options) {
-  const {
-    gh,
-    ghAvailable,
-    featureIssueRefs,
-    branchRefs,
-    pathRefs,
-    referencedIssuesSet,
-    referencedPrsSet,
-    invalidRefsSet
-  } = options;
-  if (ghAvailable) {
-    for (const ref of featureIssueRefs) {
-      classifyOne(
-        gh,
-        ref,
-        referencedIssuesSet,
-        referencedPrsSet,
-        invalidRefsSet
-      );
-    }
-    for (const ref of [...branchRefs, ...pathRefs]) {
-      classifyOne(
-        gh,
-        ref,
-        referencedIssuesSet,
-        referencedPrsSet,
-        invalidRefsSet
-      );
-    }
-  } else {
-    for (const ref of featureIssueRefs) {
-      referencedIssuesSet.add(formatRef(ref));
-    }
-    for (const ref of [...branchRefs, ...pathRefs]) {
-      referencedIssuesSet.add(formatRef(ref));
-    }
-  }
-}
-function classifyOne(gh, ref, issuesSet, prsSet, invalidSet) {
-  const formatted = formatRef(ref);
-  const entity = gh.classifyEntity(ref.replace(/^#+/u, ""));
-  if (entity === "issue") {
-    issuesSet.add(formatted);
-  } else if (entity === "pull") {
-    prsSet.add(formatted);
-  } else {
-    invalidSet.add(formatted);
-  }
-}
-function formatRef(ref) {
-  return ref.startsWith("#") ? ref : `#${ref}`;
-}
 function errorMessage2(exc) {
   return exc instanceof Error ? exc.message : String(exc);
 }
 function sortedSet3(values) {
-  return [...new Set(values)].sort(compareCodePoint6);
+  return [...new Set(values)].sort(compareCodePoint7);
 }
-function compareCodePoint6(left, right) {
+function compareCodePoint7(left, right) {
   if (left < right) {
     return -1;
   }
@@ -34273,18 +34443,8 @@ function buildSummaryText(collected, fs12, appendixPath, generatedSection) {
     section("GitHub CLI status"),
     ghStatusText,
     intentBlock,
-    section("Base/Head"),
-    `Base ref (requested): ${ctx.baseRef ?? "(default)"}`,
-    `Base ref (resolved): ${ctx.resolvedBase ?? "(unknown)"} @ ${ctx.baseSha ?? "(unknown)"}`,
-    `Head ref (resolved): ${ctx.headRef ?? collected.head ?? "(unknown)"} @ ${ctx.headSha ?? "(unknown)"}`,
-    `Merge base: ${ctx.mergeBase ?? "(unknown)"}`,
-    `Range: ${ctx.revRange ?? "(unknown)"}`
+    ...buildBaseHeadSection(ctx, collected.head, collected.resolvedRoot)
   ];
-  if (ctx.baseRef && ctx.resolvedBase && !ctx.resolvedBase.startsWith("origin/")) {
-    summarySections.push(
-      `WARNING: Requested base is local and may be stale; prefer origin/${ctx.baseRef}`
-    );
-  }
   const issueDigests = collected.issueDetails.map((detail) => issueDigest(detail)).join("\n\n");
   const prDigests = collected.prDetailsList.map((detail) => prDigest(detail)).join("\n\n");
   const featureSummary = buildFeatureSummary(collected.featureDocs);
@@ -34405,7 +34565,16 @@ function collectAndWrite(options) {
   const log = options.log ?? (() => void 0);
   log(`Wrote context summary to: ${options.out}`);
   log(`Wrote context appendix to: ${options.appendixOut}`);
-  return { summaryText, appendixText };
+  const ctx = collected.contextResult;
+  return {
+    summaryText,
+    appendixText,
+    mergeBase: ctx.mergeBase,
+    headSha: ctx.headSha,
+    resolvedHeadRef: ctx.headRef ?? collected.head ?? null,
+    resolvedBase: ctx.resolvedBase,
+    changedFileCount: collected.bucketCore.length + collected.bucketRenames.length + collected.bucketDocs.length
+  };
 }
 function resolveGhStatusText(collected) {
   let ghStatusText = collected.ghStatusOverride || collected.ghStatusMessage || "GitHub CLI authenticated.";
@@ -34474,6 +34643,25 @@ function parentDir(path16) {
   return index <= 0 ? "" : normalized.slice(0, index);
 }
 
+// ../../extensions/drm-copilot/src/lib/pr-context/diff-emptiness.ts
+function classifyPrContextDiffState(input) {
+  if (input.mergeBase === null || input.headSha === null) {
+    const attemptedHead = input.attemptedHeadRef ?? "(session HEAD)";
+    const underlyingFailure = input.resolvedBase === null ? `base '${input.requestedBase}' did not resolve to a commit` : `head '${attemptedHead}' did not resolve to a commit`;
+    return {
+      kind: "refs-unresolved",
+      message: `Could not resolve PR context refs for requested base '${input.requestedBase}' and attempted head '${attemptedHead}': ${underlyingFailure}. Correct the 'base' argument (or 'target_ref', if supplied) and retry.`
+    };
+  }
+  if (input.changedFileCount === 0) {
+    return {
+      kind: "refs-resolved-no-change",
+      message: `PR context diff is empty: resolved head ref '${input.resolvedHeadRef ?? "(unknown)"}' at head SHA '${input.headSha}' has no changes relative to merge base '${input.mergeBase}' and resolved base '${input.resolvedBase ?? "(unknown)"}'. This guard cannot detect a wrong target whose branch has commits ahead of the base; supply or correct 'target_ref' if this diff was not expected to be empty. The working-tree sections and the current-PR lookup remain scoped to 'workspace_root' even when 'target_ref' is supplied.`
+    };
+  }
+  return { kind: "populated" };
+}
+
 // ../../extensions/drm-copilot/src/lib/pr-context/pr-context-service-call.ts
 var SUMMARY_OUT = "artifacts/pr_context.summary.txt";
 var APPENDIX_OUT = "artifacts/pr_context.appendix.txt";
@@ -34496,10 +34684,10 @@ function verifyWrittenArtifact(fileSystem, artifactPath, expected) {
 }
 function collectPrContextServiceCall(input) {
   const summaryOut = normalizeGeneratedPath(
-    (0, import_node_path.join)(input.workspaceRoot, SUMMARY_OUT)
+    (0, import_node_path2.join)(input.workspaceRoot, SUMMARY_OUT)
   );
   const appendixOut = normalizeGeneratedPath(
-    (0, import_node_path.join)(input.workspaceRoot, APPENDIX_OUT)
+    (0, import_node_path2.join)(input.workspaceRoot, APPENDIX_OUT)
   );
   const rendered = collectAndWrite({
     base: input.base,
@@ -34510,15 +34698,33 @@ function collectPrContextServiceCall(input) {
     includeUntracked: true,
     fs: input.fileSystem,
     runner: input.runner,
+    whichGh: input.whichGh ?? defaultWhichGh,
+    ...input.targetRef === void 0 ? {} : { head: input.targetRef },
     ...input.log === void 0 ? {} : { log: input.log }
   });
   verifyWrittenArtifact(input.fileSystem, summaryOut, rendered.summaryText);
   verifyWrittenArtifact(input.fileSystem, appendixOut, rendered.appendixText);
+  const targetResolution = input.targetRef === void 0 ? "session-fallback" : "explicit";
+  const diffState = classifyPrContextDiffState({
+    mergeBase: rendered.mergeBase,
+    headSha: rendered.headSha,
+    resolvedHeadRef: rendered.resolvedHeadRef,
+    resolvedBase: rendered.resolvedBase,
+    changedFileCount: rendered.changedFileCount,
+    requestedBase: input.base,
+    attemptedHeadRef: input.targetRef ?? null
+  });
+  if (diffState.kind !== "populated") {
+    throw new Error(diffState.message);
+  }
   return {
     tool: "collect_pr_context",
     workspaceRoot: input.workspaceRoot,
     summary: `Collected PR context against base '${input.base}'.`,
-    artifacts: [summaryOut, appendixOut]
+    artifacts: [summaryOut, appendixOut],
+    targetResolution,
+    resolvedHeadRef: rendered.resolvedHeadRef,
+    resolvedHeadSha: rendered.headSha
   };
 }
 
@@ -35676,8 +35882,8 @@ function isInsidersSession2(envLookup = defaultEnvLookup2) {
   return false;
 }
 function resolveCodeCli2(whichLookup = defaultWhichLookup2, envLookup = defaultEnvLookup2) {
-  const candidateNames = isInsidersSession2(envLookup) ? ["code-insiders", "code"] : ["code", "code-insiders"];
-  for (const candidateName of candidateNames) {
+  const candidateNames2 = isInsidersSession2(envLookup) ? ["code-insiders", "code"] : ["code", "code-insiders"];
+  for (const candidateName of candidateNames2) {
     const resolvedCommand = whichLookup(candidateName);
     if (resolvedCommand) {
       return resolvedCommand;
@@ -36998,6 +37204,7 @@ var DefaultRepoAutomationService = class {
       fileSystem: this.fileSystem,
       workspaceRoot: input.workspaceRoot,
       base: input.base,
+      ...input.targetRef === void 0 ? {} : { targetRef: input.targetRef },
       log: (message) => this.output.appendLine(message)
     });
   }