claude-task-worker 0.69.0 → 0.70.0

package/dist/index.js

@@ -1364,6 +1364,11 @@ async function findPrStateByHeadRef(headRefName) {
   if (prs.length === 0) return null;
   return { number: prs[0].number, state: prs[0].state, mergedAt: prs[0].mergedAt ?? null };
 }
+async function getPrMergeable(prNumber) {
+  const output = await execGh(["pr", "view", String(prNumber), "--json", "mergeable"]);
+  const parsed = JSON.parse(output);
+  return typeof parsed?.mergeable === "string" ? parsed.mergeable : "UNKNOWN";
+}
 async function getIssueBody(issueNumber) {
   const output = await execGh(["issue", "view", String(issueNumber), "--json", "body"]);
   const parsed = JSON.parse(output);
@@ -3323,7 +3328,7 @@ function createPrPollingWorker(config) {
                 lastCompletionAt = Date.now();
                 try {
                   if (status === "completed") {
-                    await config.onCompleted?.(pr);
+                    await config.onCompleted?.(pr, output);
                     await notifyTaskCompleted(config.name, name, pr.number, pr.title, prUrl, output);
                   } else {
                     await notifyTaskFailed(config.name, name, pr.number, pr.title, prUrl, output);
@@ -3468,14 +3473,32 @@ var triagePrWorker = createPrPollingWorker({
   name: "triage-pr",
   command: "/claude-task-worker:triage-pr",
   triggerLabel: "cc-triage-scope",
-  excludeLabels: ["cc-fix-onetime", "cc-resolve-conflict", "cc-release-ready"]
+  excludeLabels: ["cc-fix-onetime", "cc-resolve-conflict", "cc-release-ready", "cc-need-human-check"]
 });
 
 // src/workers/resolve-conflict.ts
+var LABEL_NEED_HUMAN_CHECK = "cc-need-human-check";
+function shouldFlagUnresolvedConflict(output, mergeable) {
+  return /aborted/i.test(output) && mergeable === "CONFLICTING";
+}
 var resolveConflictWorker = createPrPollingWorker({
   name: "resolve-conflict",
   command: "/claude-task-worker:resolve-pr-conflict",
-  triggerLabel: "cc-resolve-conflict"
+  triggerLabel: "cc-resolve-conflict",
+  onCompleted: async (pr, output) => {
+    const mergeable = await getPrMergeable(pr.number);
+    if (!shouldFlagUnresolvedConflict(output, mergeable)) return;
+    await addLabel("pr", pr.number, LABEL_NEED_HUMAN_CHECK);
+    await commentOnPR(
+      pr.number,
+      [
+        "\u30B3\u30F3\u30D5\u30EA\u30AF\u30C8\u3092\u81EA\u52D5\u89E3\u6D88\u3067\u304D\u306A\u304B\u3063\u305F\u305F\u3081\u3001`cc-need-human-check` \u30E9\u30D9\u30EB\u3092\u4ED8\u4E0E\u3057\u307E\u3057\u305F\u3002",
+        "",
+        "- \u624B\u52D5\u3067\u30B3\u30F3\u30D5\u30EA\u30AF\u30C8\u3092\u89E3\u6D88\u3057\u305F\u5834\u5408: `cc-need-human-check` \u30E9\u30D9\u30EB\u3092\u5916\u3057\u3066\u304F\u3060\u3055\u3044\uFF08`triage-pr` \u304C\u518D\u958B\u3057\u307E\u3059\uFF09",
+        "- \u81EA\u52D5\u89E3\u6D88\u3092\u3084\u308A\u76F4\u3059\u5834\u5408: `cc-need-human-check` \u30E9\u30D9\u30EB\u3092\u5916\u3057\u3001`cc-resolve-conflict` \u30E9\u30D9\u30EB\u3092\u4ED8\u3051\u76F4\u3057\u3066\u304F\u3060\u3055\u3044"
+      ].join("\n")
+    );
+  }
 });
 
 // src/workers/check-dependabot.ts

package/package.json

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