claude-task-worker 0.104.0 → 0.105.0

package/dist/index.js

@@ -1470,6 +1470,61 @@ async function listPrsClosingIssue(issueNumber) {
     createdAt: node.createdAt ?? ""
   }));
 }
+async function fetchPrRef(owner, name, prNumber) {
+  try {
+    const parsed = JSON.parse(await execGh(["api", `repos/${owner}/${name}/pulls/${prNumber}`]));
+    return {
+      number: prNumber,
+      state: parsed?.merged_at ? "MERGED" : String(parsed?.state ?? "").toUpperCase(),
+      headRefName: parsed?.head?.ref ?? "",
+      baseRefName: parsed?.base?.ref ?? "",
+      createdAt: parsed?.created_at ?? "",
+      body: typeof parsed?.body === "string" ? parsed.body : ""
+    };
+  } catch (err) {
+    console.error(`[gh] failed to read PR #${prNumber}: ${err}`);
+    return null;
+  }
+}
+function bodyClosesIssue(body, issueNumber) {
+  const pattern = new RegExp(`\\b(close[sd]?|fix(?:e[sd])?|resolve[sd]?)\\s*:?\\s*#${issueNumber}\\b(?!\\d)`, "i");
+  return pattern.test(body);
+}
+async function listPrsCrossReferencingIssue(issueNumber) {
+  const { owner, name } = await getRepoInfo();
+  const output = await execGh(["api", `repos/${owner}/${name}/issues/${issueNumber}/timeline`, "--paginate"]);
+  const events = JSON.parse(output);
+  const numbers = [
+    ...new Set(
+      events.filter(
+        (e) => e.event === "cross-referenced" && e.source?.issue?.pull_request != null && e.source.issue.repository?.full_name === `${owner}/${name}` && typeof e.source.issue.number === "number"
+      ).map((e) => e.source?.issue?.number)
+    )
+  ];
+  const refs = await Promise.all(numbers.map((number) => fetchPrRef(owner, name, number)));
+  return refs.filter((ref) => ref !== null && bodyClosesIssue(ref.body, issueNumber)).map(({ body: _body, ...ref }) => ref);
+}
+var ADD_CLOSE_ISSUE_REFERENCES = `mutation($issueId: ID!, $prId: ID!) {
+  addCloseIssueReferences(input: { issueId: $issueId, pullRequestIds: [$prId] }) { issue { number } }
+}`;
+async function linkClosingPr(issueNumber, prNumber) {
+  const { owner, name } = await getRepoInfo();
+  const issueId = JSON.parse(await execGh(["api", `repos/${owner}/${name}/issues/${issueNumber}`]))?.node_id;
+  const prId = JSON.parse(await execGh(["api", `repos/${owner}/${name}/pulls/${prNumber}`]))?.node_id;
+  if (typeof issueId !== "string" || typeof prId !== "string") {
+    throw new Error(`node_id not found (issue #${issueNumber} / PR #${prNumber})`);
+  }
+  await execGh([
+    "api",
+    "graphql",
+    "-f",
+    `query=${ADD_CLOSE_ISSUE_REFERENCES}`,
+    "-F",
+    `issueId=${issueId}`,
+    "-F",
+    `prId=${prId}`
+  ]);
+}
 async function getIssueSubIssuesSummary(issueNumber) {
   const output = await execGh(["issue", "view", String(issueNumber), "--json", "subIssuesSummary"]);
   const parsed = JSON.parse(output);
@@ -4007,19 +4062,31 @@ async function verifyPrCreated(issueNumber, worktreeId, output, ctx) {
     console.log(`[exec-issue] #${issueNumber}: issue closed by skill (no-change path), skip cc-pr-created`);
     return;
   }
+  const ownership = {
+    cloud: ctx.cloud,
+    expectedHeadRefName: worktreeId,
+    baseBranch: ctx.baseBranch,
+    startedAt: ctx.startedAt,
+    now: Date.now()
+  };
   let prNumber = null;
   if (!ctx.cloud) {
     prNumber = await findPrNumberByHeadRef(worktreeId, "all");
   }
   if (prNumber === null) {
-    const candidates = await listPrsClosingIssue(issueNumber);
-    prNumber = selectOwnedClosingPr(candidates, {
-      cloud: ctx.cloud,
-      expectedHeadRefName: worktreeId,
-      baseBranch: ctx.baseBranch,
-      startedAt: ctx.startedAt,
-      now: Date.now()
+    prNumber = selectOwnedClosingPr(await listPrsClosingIssue(issueNumber), ownership);
+  }
+  if (prNumber === null) {
+    const candidates = await listPrsCrossReferencingIssue(issueNumber).catch((err) => {
+      console.error(`[exec-issue] listPrsCrossReferencingIssue failed for #${issueNumber}: ${err}`);
+      return [];
     });
+    prNumber = selectOwnedClosingPr(candidates, ownership);
+    if (prNumber !== null) {
+      await linkClosingPr(issueNumber, prNumber).catch(
+        (err) => console.error(`[exec-issue] linkClosingPr failed for #${issueNumber} -> #${prNumber}: ${err}`)
+      );
+    }
   }
   if (prNumber !== null) {
     await addLabel("issue", issueNumber, "cc-pr-created");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-task-worker",
-  "version": "0.104.0",
+  "version": "0.105.0",
   "description": "CLI tool that polls GitHub Issues/PRs and delegates work to Claude CLI",
   "type": "module",
   "main": "dist/index.js",