open-azdo 0.3.3 → 0.3.4

package/dist/open-azdo.js

@@ -66831,7 +66831,7 @@ var extractDiffLineMaps = (diffText) => {
 };
 var buildTargetRefCandidates = (targetBranch) => {
   const normalized = targetBranch.replace(/^refs\/heads\//, "");
-  return [targetBranch, `refs/remotes/origin/${normalized}`, `refs/heads/${normalized}`, normalized];
+  return [`refs/remotes/origin/${normalized}`, targetBranch, `refs/heads/${normalized}`, normalized];
 };
 var runGit = (workspace, operation, args2, allowNonZeroExit = false) => exports_Effect.gen(function* () {
   const git = yield* GitExec;
@@ -66842,6 +66842,7 @@ var runGit = (workspace, operation, args2, allowNonZeroExit = false) => exports_
     allowNonZeroExit
   });
 });
+var resolveCommitRef = (workspace, operation, ref) => runGit(workspace, operation, ["rev-parse", "--verify", `${ref}^{commit}`]).pipe(exports_Effect.map((result4) => result4.stdout.trim()));
 var resolveHeadReviewedSourceCommitCandidate = (workspace) => runGit(workspace, "Git.resolveReviewedSourceCommit.revList", ["rev-list", "--parents", "-n", "1", "HEAD"]).pipe(exports_Effect.map((result4) => {
   const hashes = result4.stdout.trim().split(/\s+/);
   return hashes.length === 3 ? "HEAD^2" : "HEAD";
@@ -66876,6 +66877,36 @@ var isAncestor = ({ workspace, ancestorRef, headRef }) => exports_Effect.gen(fun
     remediation: "Use `checkout: self` with `fetchDepth: 0` so the relevant commit history is available locally."
   });
 });
+var hasTargetMergeCommitInRange = ({
+  workspace,
+  baseRef,
+  headRef,
+  currentTargetRef
+}) => exports_Effect.gen(function* () {
+  const history = yield* runGit(workspace, "Git.hasTargetMergeCommitInRange.revList", [
+    "rev-list",
+    "--first-parent",
+    "--parents",
+    `${baseRef}..${headRef}`
+  ]);
+  for (const line of history.stdout.split(`
+`).map((entry) => entry.trim()).filter(Boolean)) {
+    const [, , ...mergedParents] = line.split(/\s+/);
+    if (mergedParents.length === 0) {
+      continue;
+    }
+    for (const mergedParent of mergedParents) {
+      if (yield* isAncestor({
+        workspace,
+        ancestorRef: mergedParent,
+        headRef: currentTargetRef
+      })) {
+        return true;
+      }
+    }
+  }
+  return false;
+});
 var resolveDiffRange = ({ workspace, baseRef, headRef }) => exports_Effect.gen(function* () {
   const diff = yield* runGit(workspace, "Git.resolveDiffRange.diff", [
     "diff",
@@ -66924,6 +66955,8 @@ var resolveTargetRef = ({ workspace, targetBranch }) => exports_Effect.gen(funct
   });
 });
 var resolvePullRequestDiff = (input) => exports_Effect.gen(function* () {
+  const targetRef = yield* resolveTargetRef(input);
+  const targetCommit = yield* resolveCommitRef(input.workspace, "Git.resolvePullRequestDiff.targetCommit", targetRef);
   const parents = yield* runGit(input.workspace, "Git.resolvePullRequestDiff.revList", [
     "rev-list",
     "--parents",
@@ -66934,10 +66967,10 @@ var resolvePullRequestDiff = (input) => exports_Effect.gen(function* () {
   const hashes = parents.stdout.trim().split(/\s+/);
   let baseRef = "";
   const headRef = "HEAD";
-  if (hashes.length === 3) {
-    baseRef = "HEAD^1";
+  const matchingTargetParent = hashes.slice(1).find((hash3) => hash3 === targetCommit);
+  if (matchingTargetParent) {
+    baseRef = matchingTargetParent;
   } else {
-    const targetRef = yield* resolveTargetRef(input);
     const mergeBase = yield* runGit(input.workspace, "Git.resolvePullRequestDiff.mergeBase", [
       "merge-base",
       targetRef,
@@ -70159,7 +70192,16 @@ var withSubscriptionLifetime = (client2, lifetime) => ({
   })
 });
 var sessionStatusKey = (status) => status.type === "retry" ? `${status.type}:${status.attempt}` : status.type;
-var TOOL_TITLE_INPUT_KEYS = ["title", "filePath", "path", "command", "query", "url"];
+var TOOL_TITLE_INPUT_KEYS = ["title", "filePath", "command", "query", "pattern", "path", "url"];
+var TOOL_PROGRESS_ICONS = {
+  bash: "\uD83D\uDD27",
+  read: "\uD83D\uDCD6",
+  glob: "\u2731",
+  edit: "\u270F\uFE0F",
+  grep: "\uD83D\uDD0E",
+  list: "\uD83D\uDCC2",
+  webfetch: "\uD83C\uDF10"
+};
 var titleFromToolInput = (input) => {
   for (const key of TOOL_TITLE_INPUT_KEYS) {
     const candidate = input[key];
@@ -70199,14 +70241,13 @@ var getToolProgressFields = (part) => {
     ...durationMs !== undefined ? { durationMs } : {}
   };
 };
+var getToolProgressIcon = (toolName) => TOOL_PROGRESS_ICONS[toolName] ?? "\u2699\uFE0F";
 var getToolProgressMessage = (phase, part, fields) => {
   const title = fields.title ? truncateForLog(String(fields.title), 160) : undefined;
-  const icon = part.tool === "bash" ? "\uD83D\uDD27" : part.tool === "read" ? "\uD83D\uDCD6" : part.tool === "edit" ? "\u270F\uFE0F" : part.tool === "grep" ? "\uD83D\uDD0E" : part.tool === "list" ? "\uD83D\uDCC2" : part.tool === "webfetch" ? "\uD83C\uDF10" : "\u2699\uFE0F";
+  const icon = getToolProgressIcon(part.tool);
   switch (phase) {
     case "started":
       return title ? `${icon} ${title}` : `${icon} ${part.tool}`;
-    case "completed":
-      return title ? `${icon} done: ${title}` : `${icon} done`;
     case "failed":
       return title ? `\u26A0\uFE0F ${part.tool}: ${title}` : `\u26A0\uFE0F ${part.tool}`;
   }
@@ -71761,6 +71802,38 @@ var resolveReviewScope = ({
     return;
   }));
   if (previousCommitIsAncestor === true) {
+    const followUpContainsTargetMerge = yield* hasTargetMergeCommitInRange({
+      workspace: config.workspace,
+      baseRef: previousReviewedCommit,
+      headRef: reviewedSourceCommit,
+      currentTargetRef: fullPullRequestDiff.baseRef
+    }).pipe(exports_Effect.orElseSucceed(() => {
+      return;
+    }));
+    if (followUpContainsTargetMerge === true) {
+      yield* logInfo2("Follow-up range includes a merge from the target branch. Falling back to a full review to avoid reviewing target-only merge changes.", {
+        previousReviewedCommit,
+        reviewedSourceCommit,
+        currentPullRequestBaseRef: fullPullRequestDiff.baseRef
+      });
+      return {
+        reviewMode: "full",
+        scopedDiff: fullPullRequestDiff,
+        previousReviewedCommit
+      };
+    }
+    if (followUpContainsTargetMerge === undefined) {
+      yield* logInfo2("Could not validate whether the follow-up range includes a merge from the target branch. Falling back to a full review.", {
+        previousReviewedCommit,
+        reviewedSourceCommit,
+        currentPullRequestBaseRef: fullPullRequestDiff.baseRef
+      });
+      return {
+        reviewMode: "full",
+        scopedDiff: fullPullRequestDiff,
+        previousReviewedCommit
+      };
+    }
     return {
       reviewMode: "follow-up",
       scopedDiff: yield* resolveDiffRange({
@@ -73076,7 +73149,7 @@ var sandboxCaptureCommand = make34("capture", sandboxCaptureCommandConfig).pipe(
 var sandboxCommand = make34("sandbox").pipe(withDescription3("Sandbox tooling for live capture and local preview."), withSubcommands([sandboxCaptureCommand]));
 var openAzdoCli = make34("open-azdo").pipe(withDescription3("Secure Azure DevOps pull-request review CLI powered by OpenCode."), withSubcommands([reviewCommand, sandboxCommand]));
 // package.json
-var version2 = "0.3.3";
+var version2 = "0.3.4";
 
 // src/Main.ts
 var cliProgram = run3(openAzdoCli, { version: version2 }).pipe(exports_Effect.scoped, exports_Effect.provide(BaseRuntimeLayer));
@@ -73085,4 +73158,4 @@ var main = () => runMain2(cliProgram, { disableErrorReporting: true });
 // bin/open-azdo.ts
 main();
 
-//# debugId=19FF78D0D39C785464756E2164756E21
+//# debugId=2B0BDD0B7FAF788564756E2164756E21