claude-task-worker 0.21.0 → 0.22.0

package/dist/index.js

@@ -595,12 +595,12 @@ async function getIssueState(issueNumber) {
   const parsed = JSON.parse(output);
   return parsed.state;
 }
-async function findPrNumberClosingIssue(issueNumber) {
+async function findPrNumberClosingIssue(issueNumber, expectedHeadRefName) {
   const { owner, name } = await getRepoInfo();
   const query = `query($owner: String!, $name: String!, $number: Int!) {
     repository(owner: $owner, name: $name) {
       issue(number: $number) {
-        closedByPullRequestsReferences(first: 10, includeClosedPrs: true) { nodes { number state } }
+        closedByPullRequestsReferences(first: 10, includeClosedPrs: true) { nodes { number state headRefName } }
       }
     }
   }`;
@@ -618,7 +618,9 @@ async function findPrNumberClosingIssue(issueNumber) {
   ]);
   const parsed = JSON.parse(output);
   const nodes = parsed?.data?.repository?.issue?.closedByPullRequestsReferences?.nodes ?? [];
-  const validPr = nodes.find((node) => node.state === "MERGED" || node.state === "OPEN");
+  const validPr = nodes.find(
+    (node) => (node.state === "MERGED" || node.state === "OPEN") && node.headRefName === expectedHeadRefName
+  );
   return validPr ? validPr.number : null;
 }
 async function getIssueSubIssuesSummary(issueNumber) {
@@ -745,14 +747,10 @@ async function createLabel(name, color, force) {
 
 // src/claude-args.ts
 var DISALLOWED_TOOLS = [
-  // 遅延 / yield: 後続ウェイクアップ前提。print モードには再起動ループが無いため、
+  // 遅延 / yield: 後続ウェイクアップ前提。print モードではウェイクアップが発火せず、
   // 呼ぶと処理未完のままプロセスが終了する。
   "Monitor",
   "ScheduleWakeup",
-  // SendMessage は過去に起動したサブエージェントをバックグラウンドでしか再開できず、
-  // 「完了通知を待ちます」でターンを終える誘因になる。未完のサブエージェントへの追加指示は
-  // フォアグラウンドの新規 Agent 起動で代替させる。
-  "SendMessage",
   // 対話 / 承認: 自律実行セッションには回答・承認するユーザーが存在しない。
   "AskUserQuestion",
   "EnterPlanMode",
@@ -768,15 +766,17 @@ var DISALLOWED_TOOLS = [
   "EnterWorktree"
 ];
 var DISALLOWED_TOOLS_ARG = DISALLOWED_TOOLS.join(",");
-var SUBAGENT_SYSTEM_PROMPT = `\u3042\u306A\u305F\u306F claude-task-worker \u306E\u30EF\u30FC\u30AB\u30FC\u304C \`claude -p\`\uFF08\u975E\u5BFE\u8A71 print \u30E2\u30FC\u30C9\uFF09\u3067\u81EA\u52D5\u8D77\u52D5\u3057\u305F\u30BB\u30C3\u30B7\u30E7\u30F3\u5185\u306E\u30B5\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3067\u3059\u3002print \u30E2\u30FC\u30C9\u306B\u306F\u518D\u8D77\u52D5\u30EB\u30FC\u30D7\u304C\u7121\u304F\u3001\u89AA\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u304C\u30BF\u30FC\u30F3\u3092\u7D42\u3048\u305F\u6642\u70B9\u3067\u30D7\u30ED\u30BB\u30B9\u304C\u6B63\u5E38\u7D42\u4E86\u3057\u307E\u3059\u3002\u3042\u306A\u305F\u304C\u51E6\u7406\u3092\u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u5316\u3057\u3066\u672A\u5B8C\u306E\u307E\u307E\u5236\u5FA1\u3092\u8FD4\u3059\u3068\u3001\u5916\u5074\u306E\u30EF\u30FC\u30AB\u30FC\u304C\u300C\u6B63\u5E38\u5B8C\u4E86\u300D\u3068\u8AA4\u8A8D\u3057\u3066 GitHub Issue/PR \u306E\u30E9\u30D9\u30EB\u72B6\u614B\u304C\u58CA\u308C\u307E\u3059\u3002\u4EE5\u4E0B\u306E\u30EB\u30FC\u30EB\u3092\u5FC5\u305A\u9075\u5B88\u3057\u3066\u304F\u3060\u3055\u3044\u3002
+var CLAUDE_SPAWN_ENV = {
+  CLAUDE_CODE_DISABLE_BACKGROUND_TASKS: "1",
+  CLAUDE_CODE_PRINT_BG_WAIT_CEILING_MS: "0"
+};
+var SYSTEM_PROMPT = `\u3053\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u306F \`claude-task-worker\` \u306E\u30EF\u30FC\u30AB\u30FC\u304B\u3089 \`claude -p\`\uFF08\u975E\u5BFE\u8A71 print \u30E2\u30FC\u30C9\uFF09\u3067\u81EA\u52D5\u8D77\u52D5\u3055\u308C\u3066\u3044\u308B\u3002\u30E6\u30FC\u30B6\u30FC\u3078\u306E\u78BA\u8A8D\u30FB\u8CEA\u554F\u306F\u884C\u308F\u305A\uFF08\u56DE\u7B54\u3059\u308B\u30E6\u30FC\u30B6\u30FC\u306F\u5B58\u5728\u3057\u306A\u3044\uFF09\u3001\u8D77\u52D5\u3055\u308C\u305F\u30B9\u30AD\u30EB\u306E\u30EB\u30FC\u30EB\u306B\u5F93\u3063\u3066\u81EA\u5F8B\u7684\u306B\u5224\u65AD\u3057\u3001\u5168\u30B9\u30C6\u30C3\u30D7\u3092\u5B8C\u9042\u3057\u3066\u304B\u3089\uFF08\u307E\u305F\u306F\u4E2D\u65AD\u6761\u4EF6\u306B\u8A72\u5F53\u3057\u305F\u5834\u5408\u306F\u7406\u7531\u3092\u51FA\u529B\u3057\u3066\uFF09\u7D42\u4E86\u3059\u308B\u3053\u3068\u3002\u66D6\u6627\u306A\u5834\u5408\u306F\u300C\u3088\u308A\u5B89\u5168\u306A\u5074\uFF08\u7834\u58CA\u7684\u3067\u306A\u3044\u5074\uFF09\u300D\u3092\u9078\u629E\u3057\u3001\u305D\u306E\u5224\u65AD\u3068\u6839\u62E0\u3092\u6700\u7D42\u5831\u544A\u306B\u660E\u8A18\u3059\u308B\u3002`;
+var SUBAGENT_SYSTEM_PROMPT = `\u3042\u306A\u305F\u306F claude-task-worker \u306E\u30EF\u30FC\u30AB\u30FC\u304C \`claude -p\`\uFF08\u975E\u5BFE\u8A71 print \u30E2\u30FC\u30C9\uFF09\u3067\u81EA\u52D5\u8D77\u52D5\u3057\u305F\u30BB\u30C3\u30B7\u30E7\u30F3\u5185\u306E\u30B5\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u3067\u3059\u3002\u4EE5\u4E0B\u306E\u81EA\u5F8B\u5B9F\u884C\u539F\u5247\u3092\u5FC5\u305A\u9075\u5B88\u3057\u3066\u304F\u3060\u3055\u3044\u3002
 
-- \`Bash\` \u3092 \`run_in_background: true\` \u3067\u547C\u3070\u306A\u3044\u3002\u30B3\u30DE\u30F3\u30C9\u672B\u5C3E\u306B \`&\` \u3092\u4ED8\u3051\u305A\u3001\`nohup\` / \`disown\` / \`setsid\` \u3067\u30D7\u30ED\u30BB\u30B9\u3092\u30C7\u30BF\u30C3\u30C1\u3057\u306A\u3044
-- \`Agent\` \u30C4\u30FC\u30EB\u306F\u65E2\u5B9A\u304C\u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u5B9F\u884C\u306E\u305F\u3081\u3001\u547C\u3073\u51FA\u3057\u3054\u3068\u306B\u5FC5\u305A \`run_in_background: false\` \u3092\u660E\u793A\u3057\u3001\u30D5\u30A9\u30A2\u30B0\u30E9\u30A6\u30F3\u30C9\u3067\u5B8C\u4E86\u3092\u5F85\u3063\u3066\u304B\u3089\u6B21\u3078\u9032\u3080
-- \`Skill\` \u30C4\u30FC\u30EB\u306B \`run_in_background: true\` \u3092\u6307\u5B9A\u3057\u306A\u3044
-- \`Monitor\` / \`ScheduleWakeup\` / \`SendMessage\` \u306A\u3069\u3067\u51E6\u7406\u3092\u5F8C\u56DE\u3057\u306B\u3057\u306A\u3044\u3002\u300C\u5B8C\u4E86\u901A\u77E5\u3092\u5F85\u3061\u307E\u3059\u300D\u306E\u3088\u3046\u306A\u901A\u77E5\u5F85\u3061\u72B6\u614B\u3067\u30BF\u30FC\u30F3\u3092\u7D42\u3048\u306A\u3044
-- E2E \u30C6\u30B9\u30C8\u306E\u3088\u3046\u306B\u6642\u9593\u306E\u304B\u304B\u308B\u51E6\u7406\u3082\u3001\u540C\u671F\u5B9F\u884C\u3067\u5B8C\u4E86\u3092\u5F85\u3064\u306E\u304C\u6B63\u3057\u3044\u6319\u52D5\u3067\u3042\u308A\u3001\u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u5316\u3057\u3066\u5F85\u305F\u305A\u306B\u9032\u3093\u3067\u306F\u306A\u3089\u306A\u3044
-- \u30D0\u30C3\u30AF\u30B0\u30E9\u30A6\u30F3\u30C9\u30BF\u30B9\u30AF\u304C\u6B8B\u3063\u305F\u72B6\u614B\u3067\u5B8C\u4E86\u5831\u544A\u3057\u3066\u30BF\u30FC\u30F3\u3092\u7D42\u3048\u306A\u3044\u3002\u672A\u5B8C\u306E\u51E6\u7406\u306F\u30D5\u30A9\u30A2\u30B0\u30E9\u30A6\u30F3\u30C9\u3067\u5B8C\u4E86\u307E\u3067\u5B9F\u884C\u3057\u5207\u3063\u3066\u304B\u3089\u5831\u544A\u3059\u308B
-- \u30E6\u30FC\u30B6\u30FC\u3078\u306E\u78BA\u8A8D\u30FB\u8CEA\u554F\u306F\u884C\u308F\u306A\u3044\uFF08\u56DE\u7B54\u3059\u308B\u30E6\u30FC\u30B6\u30FC\u306F\u5B58\u5728\u3057\u306A\u3044\uFF09\u3002\u66D6\u6627\u306A\u5834\u5408\u306F\u7834\u58CA\u7684\u3067\u306A\u3044\u5074\u3092\u9078\u3073\u3001\u305D\u306E\u5224\u65AD\u3068\u6839\u62E0\u3092\u6700\u7D42\u5831\u544A\u306B\u660E\u8A18\u3059\u308B`;
+- \u30E6\u30FC\u30B6\u30FC\u3078\u306E\u78BA\u8A8D\u30FB\u8CEA\u554F\u306F\u884C\u308F\u306A\u3044\uFF08\u56DE\u7B54\u3059\u308B\u30E6\u30FC\u30B6\u30FC\u306F\u5B58\u5728\u3057\u306A\u3044\uFF09\u3002\u5224\u65AD\u306F\u3059\u3079\u3066\u59D4\u8B72\u3055\u308C\u305F\u6307\u793A\uFF08\u30D7\u30ED\u30F3\u30D7\u30C8\u3067\u660E\u793A\u7684\u306B\u6E21\u3055\u308C\u305F\u5185\u5BB9\uFF09\u306B\u5F93\u3063\u3066\u81EA\u52D5\u3067\u6C7A\u5B9A\u3059\u308B
+- \u66D6\u6627\u306A\u5834\u5408\u306F\u300C\u3088\u308A\u5B89\u5168\u306A\u5074\uFF08\u7834\u58CA\u7684\u3067\u306A\u3044\u5074\uFF09\u300D\u3092\u9078\u629E\u3057\u3001\u305D\u306E\u5224\u65AD\u3068\u6839\u62E0\u3092\u6700\u7D42\u5831\u544A\u306B\u660E\u8A18\u3059\u308B
+- \u59D4\u8B72\u3055\u308C\u305F\u30BF\u30B9\u30AF\u306F\u6700\u5F8C\u307E\u3067\u5B8C\u9042\u3057\u3066\u304B\u3089\u6700\u7D42\u5831\u544A\u3059\u308B\u3002\u6307\u793A\u306B\u5B9A\u7FA9\u3055\u308C\u305F\u4E2D\u65AD\u6761\u4EF6\u306B\u8A72\u5F53\u3057\u305F\u5834\u5408\u306E\u307F\u3001\u7406\u7531\u3092\u51FA\u529B\u3057\u3066\u7D42\u4E86\u3059\u308B
+- \u5B50\u30B5\u30D6\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8\u306B\u4F5C\u696D\u3092\u59D4\u8B72\u3057\u305F\u5834\u5408\u3001\u305D\u306E\u5B8C\u4E86\u5831\u544A\u3092\u9D5C\u5451\u307F\u306B\u3057\u306A\u3044\u3002\`git diff\` \u7B49\u3067\u5B9F\u969B\u306E\u6210\u679C\u7269\u3092\u691C\u8A3C\u3057\u3066\u304B\u3089\u5B8C\u4E86\u6271\u3044\u306B\u3059\u308B`;
 
 // src/config.ts
 import { readFileSync } from "node:fs";
@@ -1162,7 +1162,7 @@ function ensureRenderInterval() {
   renderInterval = setInterval(renderTable, 1e3);
   renderInterval.unref();
 }
-function run(command, args, id, title, workerName, path, onComplete, cwd) {
+function run(command, args, id, title, workerName, path, onComplete, cwd, env) {
   tasks.set(id, {
     id,
     title,
@@ -1176,7 +1176,8 @@ function run(command, args, id, title, workerName, path, onComplete, cwd) {
   const child = spawn(command, args, {
     stdio: ["ignore", "pipe", "pipe"],
     detached: true,
-    ...cwd ? { cwd } : {}
+    ...cwd ? { cwd } : {},
+    ...env ? { env: { ...process.env, ...env } } : {}
   });
   childProcesses.set(id, child);
   const outputChunks = [];
@@ -1870,8 +1871,11 @@ function createIssuePollingWorker(config) {
               "-p",
               `${command} ${issue.number}`,
               "--dangerously-skip-permissions",
+              "--chrome",
               "--disallowedTools",
               DISALLOWED_TOOLS_ARG,
+              "--append-system-prompt",
+              SYSTEM_PROMPT,
               "--append-subagent-system-prompt",
               SUBAGENT_SYSTEM_PROMPT,
               "--model",
@@ -1933,7 +1937,8 @@ function createIssuePollingWorker(config) {
                   );
                 }
               },
-              cwd
+              cwd,
+              { ...CLAUDE_SPAWN_ENV }
             );
           } catch (err) {
             console.error(`[${config.name}] setup error for #${issue.number}: ${err}`);
@@ -1983,7 +1988,7 @@ var execIssueWorker = (opts = {}) => createIssuePollingWorker({
       console.log(`[exec-issue] #${issueNumber}: issue closed by skill (no-change path), skip cc-pr-created`);
       return;
     }
-    const prNumber = await findPrNumberByHeadRef(worktreeId, "all") ?? await findPrNumberClosingIssue(issueNumber);
+    const prNumber = await findPrNumberByHeadRef(worktreeId, "all") ?? await findPrNumberClosingIssue(issueNumber, worktreeId);
     if (prNumber !== null) {
       await addLabel("issue", issueNumber, "cc-pr-created");
       return;
@@ -2048,8 +2053,11 @@ function createPrPollingWorker(config) {
                 "-p",
                 `${command} ${pr.number}`,
                 "--dangerously-skip-permissions",
+                "--chrome",
                 "--disallowedTools",
                 DISALLOWED_TOOLS_ARG,
+                "--append-system-prompt",
+                SYSTEM_PROMPT,
                 "--append-subagent-system-prompt",
                 SUBAGENT_SYSTEM_PROMPT,
                 "--model",
@@ -2098,7 +2106,8 @@ function createPrPollingWorker(config) {
                   );
                 }
               },
-              cwd
+              cwd,
+              { ...CLAUDE_SPAWN_ENV }
             );
           } catch (err) {
             console.error(`[${config.name}] setup error for PR #${pr.number}: ${err}`);

package/package.json

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