claude-task-worker 0.104.0 → 0.106.0

package/README.md

@@ -105,7 +105,8 @@ claude-task-worker init --force   # 強制上書き
 
 | ラベル | 用途 |
 |---|---|
-| `cc-triage-scope` | トリアージ対象マーク（Issue/PR） |
+| `cc-triage-scope` | トリアージ対象マーク（Issue/PR）＝ワーカーのキュー合流口 |
+| `cc-issue-request` | 人が Issue テンプレートから作成を依頼した印。起票者を assignee に自動設定するワークフローの発火条件（`cc-triage-scope` と役割を分けてあり、ワーカーの自動起票では付かない） |
 | `cc-issue-created` | `create-issue` 由来の Issue マーク |
 | `cc-update-issue` / `cc-answer-issue-questions` / `cc-exec-issue` | Issue の更新 / 確認事項回答 / 実行トリガー |
 | `cc-fix-onetime` / `cc-resolve-conflict` | PR の修正 / コンフリクト解消トリガー |

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");
@@ -4794,7 +4861,7 @@ var updateDesignMdWorker = createScheduledWorker({
 init_table();
 
 // src/commands/init.ts
-import { mkdir as mkdir2, readFile as readFile2, writeFile as writeFile2, access } from "node:fs/promises";
+import { mkdir as mkdir2, readFile as readFile2, rm as rm2, writeFile as writeFile2, access } from "node:fs/promises";
 import { basename as basename3 } from "node:path";
 
 // src/commands/codegraph.ts
@@ -4917,14 +4984,20 @@ var LABELS = [
   // vivid bronze (H46 S100 L29 / L*50 C*56)
   { name: "cc-ui-design-ready", color: "0c73e9" },
   // vivid azure (H212 S90 L48 / L*50 C*69)
-  { name: CLOUD_DONE_LABEL, color: "33cfff" }
+  { name: CLOUD_DONE_LABEL, color: "33cfff" },
   // vivid sky blue (H194 S100 L60 / L*78 C*42)
+  // 追加時点で有彩色ラベルが色相環をほぼ埋めており、上記6点を全て満たす色は残っていない。
+  // 最寄り色相との差は27°が上限（H185 が最大）で、その相手は cc-cloud-done（クラウド実行中だけ
+  // 現れる短命なマーカー・L*78 と明度が倍近く違う）＝見分けたい相手ではない側に倒してある。
+  { name: "cc-issue-request", color: "03656d" }
+  // vivid deep teal (H185 S95 L22 / L*39 C*24)
 ];
 var ISSUE_TEMPLATE = `name: "[claude-task-worker] Issue\u4F5C\u6210\u4F9D\u983C"
 description: claude-task-worker\u3067GitHub Issue\u3092\u4F5C\u6210\u3059\u308B
 title: "[claude-task-worker] Issue\u4F5C\u6210\u4F9D\u983C"
 labels:
   - cc-triage-scope
+  - cc-issue-request
 body:
   - type: textarea
     id: request
@@ -4934,7 +5007,7 @@ body:
     validations:
       required: true
 `;
-var ASSIGN_CREATOR_WORKFLOW = `name: Assign creator on cc-triage-scope
+var ASSIGN_CREATOR_WORKFLOW = `name: Assign creator on issue request
 
 on:
   issues:
@@ -4942,7 +5015,7 @@ on:
 
 jobs:
   assign:
-    if: contains(github.event.issue.labels.*.name, 'cc-triage-scope')
+    if: contains(github.event.issue.labels.*.name, 'cc-issue-request')
     runs-on: ubuntu-latest
     permissions:
       issues: write
@@ -5000,6 +5073,25 @@ async function ensureLocalConfigGitIgnore() {
   await writeFile2(path2, next, "utf-8");
   console.log(`[init] Added ${entry} to ${path2}`);
 }
+var LEGACY_PATHS = [
+  ".github/ISSUE_TEMPLATE/cc-triage-scope.yml",
+  ".github/workflows/assign-creator-on-cc-triage-scope.yml"
+];
+function isContentMismatch(result, expected, actual) {
+  return result === "skipped" && actual !== expected;
+}
+async function removeLegacyIssueRequestFiles() {
+  for (const path2 of LEGACY_PATHS) {
+    try {
+      await rm2(path2);
+      console.log(`[init] Removed legacy file: ${path2}`);
+    } catch (err) {
+      if (err.code !== "ENOENT") {
+        throw err;
+      }
+    }
+  }
+}
 async function init(options = {}) {
   const force = options.force ?? false;
   console.log(`[init] Creating labels...${force ? " (force mode)" : ""}`);
@@ -5013,12 +5105,25 @@ async function init(options = {}) {
   }
   console.log("[init] Creating issue template...");
   await mkdir2(".github/ISSUE_TEMPLATE", { recursive: true });
-  const templatePath = ".github/ISSUE_TEMPLATE/cc-triage-scope.yml";
-  logWriteResult(await writeFileWithMode(templatePath, ISSUE_TEMPLATE, force), templatePath);
+  const templatePath = ".github/ISSUE_TEMPLATE/cc-issue-request.yml";
+  const templateResult = await writeFileWithMode(templatePath, ISSUE_TEMPLATE, force);
+  logWriteResult(templateResult, templatePath);
   console.log("[init] Creating GitHub Actions workflow...");
   await mkdir2(".github/workflows", { recursive: true });
-  const workflowPath = ".github/workflows/assign-creator-on-cc-triage-scope.yml";
-  logWriteResult(await writeFileWithMode(workflowPath, ASSIGN_CREATOR_WORKFLOW, force), workflowPath);
+  const workflowPath = ".github/workflows/assign-creator-on-issue-request.yml";
+  const workflowResult = await writeFileWithMode(workflowPath, ASSIGN_CREATOR_WORKFLOW, force);
+  logWriteResult(workflowResult, workflowPath);
+  if (isContentMismatch(templateResult, ISSUE_TEMPLATE, await readFile2(templatePath, "utf-8"))) {
+    throw new Error(
+      `[init] ${templatePath} \u306F\u65E2\u5B58\u306E\u5185\u5BB9\u304C\u6700\u65B0\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002--force \u3067\u518D\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u65E7\u30D5\u30A1\u30A4\u30EB\u306F\u524A\u9664\u3057\u3066\u3044\u307E\u305B\u3093\u3002`
+    );
+  }
+  if (isContentMismatch(workflowResult, ASSIGN_CREATOR_WORKFLOW, await readFile2(workflowPath, "utf-8"))) {
+    throw new Error(
+      `[init] ${workflowPath} \u306F\u65E2\u5B58\u306E\u5185\u5BB9\u304C\u6700\u65B0\u306E\u30EF\u30FC\u30AF\u30D5\u30ED\u30FC\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002--force \u3067\u518D\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u65E7\u30D5\u30A1\u30A4\u30EB\u306F\u524A\u9664\u3057\u3066\u3044\u307E\u305B\u3093\u3002`
+    );
+  }
+  await removeLegacyIssueRequestFiles();
   console.log("[init] Creating config file...");
   await createConfig(force);
   await ensureLocalConfigGitIgnore();

package/package.json

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