@gethmy/agent 1.19.0 → 1.20.0

package/dist/cli.js

@@ -731,9 +731,29 @@ var init_config_validation = __esm(() => {
   };
 });
 // ../harmony-shared/dist/branchRef.js
-var BRANCH_REF_PATTERN, SAFE_GIT_REF_PATTERN;
+function extractBranchRef(description) {
+  if (!description)
+    return null;
+  for (const match of description.matchAll(BRANCH_REF_PATTERN)) {
+    const branch = match[1];
+    if (SAFE_GIT_REF_PATTERN.test(branch))
+      return branch;
+  }
+  return null;
+}
+function hasUnsafeDaemonBranchLine(description) {
+  if (!description)
+    return false;
+  for (const match of description.matchAll(DAEMON_BRANCH_LINE_PATTERN)) {
+    if (!SAFE_GIT_REF_PATTERN.test(match[1]))
+      return true;
+  }
+  return false;
+}
+var BRANCH_REF_PATTERN, DAEMON_BRANCH_LINE_PATTERN, SAFE_GIT_REF_PATTERN;
 var init_branchRef = __esm(() => {
-  BRANCH_REF_PATTERN = /Branch:\s*`([^`]+)`/;
+  BRANCH_REF_PATTERN = /Branch:\s*`([^`]+)`/g;
+  DAEMON_BRANCH_LINE_PATTERN = /^[ \t]*Branch:\s*`([^`]+)`/gm;
   SAFE_GIT_REF_PATTERN = /^[a-zA-Z0-9/_.+-]+$/;
 });
 
@@ -1540,6 +1560,7 @@ __export(exports_git_pr, {
   findExistingPr: () => findExistingPr,
   extractReviewedSha: () => extractReviewedSha,
   extractPrUrl: () => extractPrUrl,
+  extractAzurePrId: () => extractAzurePrId,
   detectGitProvider: () => detectGitProvider,
   deriveCiStatus: () => deriveCiStatus,
   decidePrBranch: () => decidePrBranch,
@@ -1734,13 +1755,18 @@ async function checkPrMergeStatus(prUrl, cwd, provider) {
     return "unknown";
   }
 }
-function decidePrBranch(provider, rawJson) {
-  if (provider !== "github") {
-    return {
-      kind: "skip",
-      reason: `PR-link review not yet supported for provider "${provider}" (GitHub only)`
-    };
+function stripHeadsPrefix(ref) {
+  return ref.replace(/^refs\/heads\//, "");
+}
+function branchOrSkip(branch) {
+  if (!branch)
+    return { kind: "skip", reason: "PR has no head branch name" };
+  if (!SAFE_GIT_REF_PATTERN.test(branch)) {
+    return { kind: "skip", reason: `unsafe git ref: ${branch}` };
   }
+  return { kind: "branch", branch };
+}
+function decideGithubPrBranch(rawJson) {
   if (rawJson === null) {
     return { kind: "skip", reason: "gh pr view failed" };
   }
@@ -1759,25 +1785,74 @@ function decidePrBranch(provider, rawJson) {
       reason: "fork PR (cross-repo head branch not on origin)"
     };
   }
-  const branch = typeof parsed.headRefName === "string" ? parsed.headRefName : null;
-  if (!branch) {
-    return { kind: "skip", reason: "PR has no head branch name" };
+  return branchOrSkip(typeof parsed.headRefName === "string" ? parsed.headRefName : null);
+}
+function decideAzurePrBranch(rawJson) {
+  if (rawJson === null) {
+    return { kind: "skip", reason: "az repos pr show failed" };
   }
-  if (!SAFE_GIT_REF_PATTERN.test(branch)) {
-    return { kind: "skip", reason: `unsafe git ref: ${branch}` };
+  let parsed;
+  try {
+    parsed = JSON.parse(rawJson.trim());
+  } catch {
+    return { kind: "skip", reason: "unparseable az repos pr show output" };
+  }
+  if (typeof parsed !== "object" || parsed === null) {
+    return { kind: "skip", reason: "unparseable az repos pr show output" };
+  }
+  if (parsed.forkSource != null) {
+    return {
+      kind: "skip",
+      reason: "fork PR (cross-repo head branch not on origin)"
+    };
+  }
+  const ref = typeof parsed.sourceRefName === "string" ? parsed.sourceRefName : null;
+  return branchOrSkip(ref ? stripHeadsPrefix(ref) : null);
+}
+function decidePrBranch(provider, rawJson) {
+  switch (provider) {
+    case "github":
+      return decideGithubPrBranch(rawJson);
+    case "azure":
+      return decideAzurePrBranch(rawJson);
+    default:
+      return {
+        kind: "skip",
+        reason: `PR-link review not yet supported for provider "${provider}"`
+      };
   }
-  return { kind: "branch", branch };
+}
+function extractAzurePrId(prUrl) {
+  const m = prUrl.match(/pullrequest\/(\d+)/i);
+  return m ? m[1] : null;
 }
 async function resolvePrHeadBranch(prUrl, cwd, provider) {
-  if (provider !== "github")
-    return decidePrBranch(provider, null);
-  try {
-    const { stdout } = await execFileAsync("gh", ["pr", "view", prUrl, "--json", "headRefName,isCrossRepository"], { cwd, encoding: "utf-8", timeout: 1e4 });
-    return decidePrBranch("github", stdout);
-  } catch (err) {
-    log.warn(TAG2, `gh pr view failed for ${prUrl}: ${err instanceof Error ? err.message : String(err)}`);
-    return decidePrBranch("github", null);
+  if (provider === "github") {
+    try {
+      const { stdout } = await execFileAsync("gh", ["pr", "view", prUrl, "--json", "headRefName,isCrossRepository"], { cwd, encoding: "utf-8", timeout: 1e4 });
+      return decidePrBranch("github", stdout);
+    } catch (err) {
+      log.warn(TAG2, `gh pr view failed for ${prUrl}: ${err instanceof Error ? err.message : String(err)}`);
+      return decidePrBranch("github", null);
+    }
+  }
+  if (provider === "azure") {
+    const prId = extractAzurePrId(prUrl);
+    if (!prId) {
+      return {
+        kind: "skip",
+        reason: `could not parse Azure PR id from ${prUrl}`
+      };
+    }
+    try {
+      const { stdout } = await execFileAsync("az", ["repos", "pr", "show", "--id", prId, "--output", "json"], { cwd, encoding: "utf-8", timeout: 1e4 });
+      return decidePrBranch("azure", stdout);
+    } catch (err) {
+      log.warn(TAG2, `az repos pr show failed for ${prUrl}: ${err instanceof Error ? err.message : String(err)}`);
+      return decidePrBranch("azure", null);
+    }
   }
+  return decidePrBranch(provider, null);
 }
 function extractPrUrl(description) {
   if (!description)
@@ -1909,7 +1984,11 @@ function buildPrBody(card, commitLog) {
   ].join(`
 `);
 }
-function createPullRequest(card, branchName, worktreePath, config, provider) {
+function createPullRequest(card, branchName, worktreePath, config, provider, existingPrUrl) {
+  if (existingPrUrl) {
+    log.info(TAG2, `Reusing existing PR from card description: ${existingPrUrl}`);
+    return existingPrUrl;
+  }
   let commitLog = "";
   try {
     commitLog = execFileSync("git", ["log", "--oneline", `origin/${config.worktree.baseBranch}..HEAD`], { cwd: worktreePath, encoding: "utf-8" }).trim();
@@ -2545,12 +2624,9 @@ function checkoutExistingBranch(basePath, branchName) {
   return worktreeDir;
 }
 function extractBranchFromDescription(description) {
-  if (!description)
-    return null;
-  const branch = description.match(BRANCH_REF_PATTERN)?.[1] ?? null;
-  if (branch && !SAFE_GIT_REF_PATTERN.test(branch)) {
-    log.warn(TAG7, `Extracted branch name contains unsafe characters: ${branch}`);
-    return null;
+  const branch = extractBranchRef(description);
+  if (!branch && hasUnsafeDaemonBranchLine(description)) {
+    log.warn(TAG7, "Daemon Branch: line contains unsafe characters; ignoring it");
   }
   return branch;
 }
@@ -2568,6 +2644,11 @@ async function resolveReviewBranch(description, cwd) {
   const resolved = await resolvePrHeadBranch(prUrl, cwd, provider);
   return resolved;
 }
+function reviewedFromPrUrl(description) {
+  if (extractBranchFromDescription(description))
+    return null;
+  return extractPrUrl(description ?? null);
+}
 var TAG7 = "review-worktree";
 var init_review_worktree = __esm(() => {
   init_dist();
@@ -5459,7 +5540,7 @@ async function postReviewComment(client, card, commentType, body) {
     log.error(TAG20, `Failed to post review comment to #${card.short_id}: ${err instanceof Error ? err.message : err}`);
   }
 }
-async function runReviewCompletion(client, card, result, config, worktreePath, branchName, sessionStats, runLogPath, workspaceId, agentSessionId, stateStore) {
+async function runReviewCompletion(client, card, result, config, worktreePath, branchName, sessionStats, runLogPath, workspaceId, agentSessionId, stateStore, resolvedFromPrUrl) {
   let freshDesc;
   try {
     const { card: fresh } = await client.getCard(card.id);
@@ -5522,7 +5603,7 @@ ${runLogTail}
       }
       if (config.review.createPR && approvedBranch) {
         const provider = detectGitProvider(worktreePath);
-        prUrl = createPullRequest(card, approvedBranch, worktreePath, config, provider);
+        prUrl = createPullRequest(card, approvedBranch, worktreePath, config, provider, resolvedFromPrUrl ?? null);
       }
     }
     await addLabelByName(client, card, config.review.approvedLabel, config.review.approvedLabelColor);
@@ -6602,7 +6683,7 @@ class ReviewWorker {
         currentTask: `Processing ${result.verdict} verdict`,
         progressPercent: 80
       });
-      await runReviewCompletion(this.client, card, result, this.config, cwd, this.branchName, sessionStats, this.lastRunLogPath, this.workspaceId, this.sessionId, this.stateStore);
+      await runReviewCompletion(this.client, card, result, this.config, cwd, this.branchName, sessionStats, this.lastRunLogPath, this.workspaceId, this.sessionId, this.stateStore, reviewedFromPrUrl(card.description));
       await this.collectReviewGate(card, result);
     } catch (err) {
       this.state = "error";

package/dist/index.js

@@ -730,9 +730,29 @@ var init_config_validation = __esm(() => {
   };
 });
 // ../harmony-shared/dist/branchRef.js
-var BRANCH_REF_PATTERN, SAFE_GIT_REF_PATTERN;
+function extractBranchRef(description) {
+  if (!description)
+    return null;
+  for (const match of description.matchAll(BRANCH_REF_PATTERN)) {
+    const branch = match[1];
+    if (SAFE_GIT_REF_PATTERN.test(branch))
+      return branch;
+  }
+  return null;
+}
+function hasUnsafeDaemonBranchLine(description) {
+  if (!description)
+    return false;
+  for (const match of description.matchAll(DAEMON_BRANCH_LINE_PATTERN)) {
+    if (!SAFE_GIT_REF_PATTERN.test(match[1]))
+      return true;
+  }
+  return false;
+}
+var BRANCH_REF_PATTERN, DAEMON_BRANCH_LINE_PATTERN, SAFE_GIT_REF_PATTERN;
 var init_branchRef = __esm(() => {
-  BRANCH_REF_PATTERN = /Branch:\s*`([^`]+)`/;
+  BRANCH_REF_PATTERN = /Branch:\s*`([^`]+)`/g;
+  DAEMON_BRANCH_LINE_PATTERN = /^[ \t]*Branch:\s*`([^`]+)`/gm;
   SAFE_GIT_REF_PATTERN = /^[a-zA-Z0-9/_.+-]+$/;
 });
 
@@ -1539,6 +1559,7 @@ __export(exports_git_pr, {
   findExistingPr: () => findExistingPr,
   extractReviewedSha: () => extractReviewedSha,
   extractPrUrl: () => extractPrUrl,
+  extractAzurePrId: () => extractAzurePrId,
   detectGitProvider: () => detectGitProvider,
   deriveCiStatus: () => deriveCiStatus,
   decidePrBranch: () => decidePrBranch,
@@ -1733,13 +1754,18 @@ async function checkPrMergeStatus(prUrl, cwd, provider) {
     return "unknown";
   }
 }
-function decidePrBranch(provider, rawJson) {
-  if (provider !== "github") {
-    return {
-      kind: "skip",
-      reason: `PR-link review not yet supported for provider "${provider}" (GitHub only)`
-    };
+function stripHeadsPrefix(ref) {
+  return ref.replace(/^refs\/heads\//, "");
+}
+function branchOrSkip(branch) {
+  if (!branch)
+    return { kind: "skip", reason: "PR has no head branch name" };
+  if (!SAFE_GIT_REF_PATTERN.test(branch)) {
+    return { kind: "skip", reason: `unsafe git ref: ${branch}` };
   }
+  return { kind: "branch", branch };
+}
+function decideGithubPrBranch(rawJson) {
   if (rawJson === null) {
     return { kind: "skip", reason: "gh pr view failed" };
   }
@@ -1758,25 +1784,74 @@ function decidePrBranch(provider, rawJson) {
       reason: "fork PR (cross-repo head branch not on origin)"
     };
   }
-  const branch = typeof parsed.headRefName === "string" ? parsed.headRefName : null;
-  if (!branch) {
-    return { kind: "skip", reason: "PR has no head branch name" };
+  return branchOrSkip(typeof parsed.headRefName === "string" ? parsed.headRefName : null);
+}
+function decideAzurePrBranch(rawJson) {
+  if (rawJson === null) {
+    return { kind: "skip", reason: "az repos pr show failed" };
   }
-  if (!SAFE_GIT_REF_PATTERN.test(branch)) {
-    return { kind: "skip", reason: `unsafe git ref: ${branch}` };
+  let parsed;
+  try {
+    parsed = JSON.parse(rawJson.trim());
+  } catch {
+    return { kind: "skip", reason: "unparseable az repos pr show output" };
+  }
+  if (typeof parsed !== "object" || parsed === null) {
+    return { kind: "skip", reason: "unparseable az repos pr show output" };
+  }
+  if (parsed.forkSource != null) {
+    return {
+      kind: "skip",
+      reason: "fork PR (cross-repo head branch not on origin)"
+    };
+  }
+  const ref = typeof parsed.sourceRefName === "string" ? parsed.sourceRefName : null;
+  return branchOrSkip(ref ? stripHeadsPrefix(ref) : null);
+}
+function decidePrBranch(provider, rawJson) {
+  switch (provider) {
+    case "github":
+      return decideGithubPrBranch(rawJson);
+    case "azure":
+      return decideAzurePrBranch(rawJson);
+    default:
+      return {
+        kind: "skip",
+        reason: `PR-link review not yet supported for provider "${provider}"`
+      };
   }
-  return { kind: "branch", branch };
+}
+function extractAzurePrId(prUrl) {
+  const m = prUrl.match(/pullrequest\/(\d+)/i);
+  return m ? m[1] : null;
 }
 async function resolvePrHeadBranch(prUrl, cwd, provider) {
-  if (provider !== "github")
-    return decidePrBranch(provider, null);
-  try {
-    const { stdout } = await execFileAsync("gh", ["pr", "view", prUrl, "--json", "headRefName,isCrossRepository"], { cwd, encoding: "utf-8", timeout: 1e4 });
-    return decidePrBranch("github", stdout);
-  } catch (err) {
-    log.warn(TAG2, `gh pr view failed for ${prUrl}: ${err instanceof Error ? err.message : String(err)}`);
-    return decidePrBranch("github", null);
+  if (provider === "github") {
+    try {
+      const { stdout } = await execFileAsync("gh", ["pr", "view", prUrl, "--json", "headRefName,isCrossRepository"], { cwd, encoding: "utf-8", timeout: 1e4 });
+      return decidePrBranch("github", stdout);
+    } catch (err) {
+      log.warn(TAG2, `gh pr view failed for ${prUrl}: ${err instanceof Error ? err.message : String(err)}`);
+      return decidePrBranch("github", null);
+    }
+  }
+  if (provider === "azure") {
+    const prId = extractAzurePrId(prUrl);
+    if (!prId) {
+      return {
+        kind: "skip",
+        reason: `could not parse Azure PR id from ${prUrl}`
+      };
+    }
+    try {
+      const { stdout } = await execFileAsync("az", ["repos", "pr", "show", "--id", prId, "--output", "json"], { cwd, encoding: "utf-8", timeout: 1e4 });
+      return decidePrBranch("azure", stdout);
+    } catch (err) {
+      log.warn(TAG2, `az repos pr show failed for ${prUrl}: ${err instanceof Error ? err.message : String(err)}`);
+      return decidePrBranch("azure", null);
+    }
   }
+  return decidePrBranch(provider, null);
 }
 function extractPrUrl(description) {
   if (!description)
@@ -1908,7 +1983,11 @@ function buildPrBody(card, commitLog) {
   ].join(`
 `);
 }
-function createPullRequest(card, branchName, worktreePath, config, provider) {
+function createPullRequest(card, branchName, worktreePath, config, provider, existingPrUrl) {
+  if (existingPrUrl) {
+    log.info(TAG2, `Reusing existing PR from card description: ${existingPrUrl}`);
+    return existingPrUrl;
+  }
   let commitLog = "";
   try {
     commitLog = execFileSync("git", ["log", "--oneline", `origin/${config.worktree.baseBranch}..HEAD`], { cwd: worktreePath, encoding: "utf-8" }).trim();
@@ -2544,12 +2623,9 @@ function checkoutExistingBranch(basePath, branchName) {
   return worktreeDir;
 }
 function extractBranchFromDescription(description) {
-  if (!description)
-    return null;
-  const branch = description.match(BRANCH_REF_PATTERN)?.[1] ?? null;
-  if (branch && !SAFE_GIT_REF_PATTERN.test(branch)) {
-    log.warn(TAG7, `Extracted branch name contains unsafe characters: ${branch}`);
-    return null;
+  const branch = extractBranchRef(description);
+  if (!branch && hasUnsafeDaemonBranchLine(description)) {
+    log.warn(TAG7, "Daemon Branch: line contains unsafe characters; ignoring it");
   }
   return branch;
 }
@@ -2567,6 +2643,11 @@ async function resolveReviewBranch(description, cwd) {
   const resolved = await resolvePrHeadBranch(prUrl, cwd, provider);
   return resolved;
 }
+function reviewedFromPrUrl(description) {
+  if (extractBranchFromDescription(description))
+    return null;
+  return extractPrUrl(description ?? null);
+}
 var TAG7 = "review-worktree";
 var init_review_worktree = __esm(() => {
   init_dist();
@@ -5458,7 +5539,7 @@ async function postReviewComment(client, card, commentType, body) {
     log.error(TAG20, `Failed to post review comment to #${card.short_id}: ${err instanceof Error ? err.message : err}`);
   }
 }
-async function runReviewCompletion(client, card, result, config, worktreePath, branchName, sessionStats, runLogPath, workspaceId, agentSessionId, stateStore) {
+async function runReviewCompletion(client, card, result, config, worktreePath, branchName, sessionStats, runLogPath, workspaceId, agentSessionId, stateStore, resolvedFromPrUrl) {
   let freshDesc;
   try {
     const { card: fresh } = await client.getCard(card.id);
@@ -5521,7 +5602,7 @@ ${runLogTail}
       }
       if (config.review.createPR && approvedBranch) {
         const provider = detectGitProvider(worktreePath);
-        prUrl = createPullRequest(card, approvedBranch, worktreePath, config, provider);
+        prUrl = createPullRequest(card, approvedBranch, worktreePath, config, provider, resolvedFromPrUrl ?? null);
       }
     }
     await addLabelByName(client, card, config.review.approvedLabel, config.review.approvedLabelColor);
@@ -6601,7 +6682,7 @@ class ReviewWorker {
         currentTask: `Processing ${result.verdict} verdict`,
         progressPercent: 80
       });
-      await runReviewCompletion(this.client, card, result, this.config, cwd, this.branchName, sessionStats, this.lastRunLogPath, this.workspaceId, this.sessionId, this.stateStore);
+      await runReviewCompletion(this.client, card, result, this.config, cwd, this.branchName, sessionStats, this.lastRunLogPath, this.workspaceId, this.sessionId, this.stateStore, reviewedFromPrUrl(card.description));
       await this.collectReviewGate(card, result);
     } catch (err) {
       this.state = "error";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gethmy/agent",
-  "version": "1.19.0",
+  "version": "1.20.0",
   "description": "Push-based agent daemon for Harmony — watches board assignments and spawns Claude CLI workers",
   "type": "module",
   "main": "dist/index.js",