claude-task-worker 0.19.0 → 0.21.0

package/dist/index.js

@@ -572,11 +572,14 @@ async function listIssuesByNumbers(assignee, labels, excludeLabels, numbers) {
   return results;
 }
 async function findOpenPrNumberByHeadRef(headRefName) {
+  return findPrNumberByHeadRef(headRefName, "open");
+}
+async function findPrNumberByHeadRef(headRefName, state = "open") {
   const output = await execGh([
     "pr",
     "list",
     "--state",
-    "open",
+    state,
     "--head",
     headRefName,
     "--json",
@@ -587,6 +590,37 @@ async function findOpenPrNumberByHeadRef(headRefName) {
   const prs = JSON.parse(output);
   return prs.length > 0 ? prs[0].number : null;
 }
+async function getIssueState(issueNumber) {
+  const output = await execGh(["issue", "view", String(issueNumber), "--json", "state"]);
+  const parsed = JSON.parse(output);
+  return parsed.state;
+}
+async function findPrNumberClosingIssue(issueNumber) {
+  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 } }
+      }
+    }
+  }`;
+  const output = await execGh([
+    "api",
+    "graphql",
+    "-f",
+    `query=${query}`,
+    "-F",
+    `owner=${owner}`,
+    "-F",
+    `name=${name}`,
+    "-F",
+    `number=${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");
+  return validPr ? validPr.number : null;
+}
 async function getIssueSubIssuesSummary(issueNumber) {
   const output = await execGh(["issue", "view", String(issueNumber), "--json", "subIssuesSummary"]);
   const parsed = JSON.parse(output);
@@ -694,6 +728,9 @@ async function removeLabel(type, number, label) {
 async function commentOnPR(prNumber, body) {
   await execGh(["pr", "comment", String(prNumber), "--body", body]);
 }
+async function commentOnIssue(issueNumber, body) {
+  await execGh(["issue", "comment", String(issueNumber), "--body", body]);
+}
 async function createLabel(name, color, force) {
   try {
     const args = ["label", "create", name];
@@ -712,6 +749,10 @@ var DISALLOWED_TOOLS = [
   // 呼ぶと処理未完のままプロセスが終了する。
   "Monitor",
   "ScheduleWakeup",
+  // SendMessage は過去に起動したサブエージェントをバックグラウンドでしか再開できず、
+  // 「完了通知を待ちます」でターンを終える誘因になる。未完のサブエージェントへの追加指示は
+  // フォアグラウンドの新規 Agent 起動で代替させる。
+  "SendMessage",
   // 対話 / 承認: 自律実行セッションには回答・承認するユーザーが存在しない。
   "AskUserQuestion",
   "EnterPlanMode",
@@ -727,6 +768,15 @@ 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
+
+- \`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`;
 
 // src/config.ts
 import { readFileSync } from "node:fs";
@@ -972,8 +1022,32 @@ async function assertRemoteTrackingExists(epicBranch) {
 // src/process-manager.ts
 import { spawn } from "node:child_process";
 init_table();
-var childProcesses = /* @__PURE__ */ new Map();
+
+// src/task-result.ts
 var TASK_TIMEOUT_MS = 90 * 60 * 1e3;
+var STDERR_TAIL_LIMIT = 8 * 1024;
+function buildTaskResult(code, timedOut, stdout, stderrTail) {
+  const emptyOutput = stdout.trim() === "";
+  const completed = !timedOut && code === 0 && !emptyOutput;
+  let output = stdout;
+  if (timedOut) {
+    output += `
+[worker] task timed out after ${TASK_TIMEOUT_MS / 1e3}s`;
+  } else if (code === 0 && emptyOutput) {
+    output += "[worker] claude exited with code 0 but produced no output (session aborted before the model ran; e.g. a skill preamble command failed)";
+  } else if (!completed) {
+    output += `
+[worker] claude exited with code ${code}`;
+  }
+  if (!completed && stderrTail.trim() !== "") {
+    output += `
+[stderr] ${stderrTail.trim()}`;
+  }
+  return { status: completed ? "completed" : "failed", output };
+}
+
+// src/process-manager.ts
+var childProcesses = /* @__PURE__ */ new Map();
 var tasks = /* @__PURE__ */ new Map();
 var shuttingDown = false;
 function setShuttingDown() {
@@ -1105,11 +1179,20 @@ function run(command, args, id, title, workerName, path, onComplete, cwd) {
     ...cwd ? { cwd } : {}
   });
   childProcesses.set(id, child);
-  child.stderr?.resume();
   const outputChunks = [];
   child.stdout?.on("data", (chunk) => {
     outputChunks.push(chunk);
   });
+  const stderrChunks = [];
+  let stderrLen = 0;
+  child.stderr?.on("data", (chunk) => {
+    stderrChunks.push(chunk);
+    stderrLen += chunk.length;
+    while (stderrChunks.length > 1 && stderrLen - stderrChunks[0].length >= STDERR_TAIL_LIMIT) {
+      stderrLen -= stderrChunks[0].length;
+      stderrChunks.shift();
+    }
+  });
   let timedOut = false;
   const timeoutHandle = setTimeout(() => {
     timedOut = true;
@@ -1128,9 +1211,12 @@ function run(command, args, id, title, workerName, path, onComplete, cwd) {
   timeoutHandle.unref();
   child.on("close", async (code) => {
     clearTimeout(timeoutHandle);
-    const output = Buffer.concat(outputChunks).toString("utf-8") + (timedOut ? `
-[worker] task timed out after ${TASK_TIMEOUT_MS / 1e3}s` : "");
-    const finalStatus = !timedOut && code === 0 ? "completed" : "failed";
+    const { status: finalStatus, output } = buildTaskResult(
+      code,
+      timedOut,
+      Buffer.concat(outputChunks).toString("utf-8"),
+      Buffer.concat(stderrChunks).toString("utf-8").slice(-STDERR_TAIL_LIMIT)
+    );
     try {
       await Promise.race([
         onComplete?.(finalStatus, output) ?? Promise.resolve(),
@@ -1651,6 +1737,14 @@ async function deleteLocalBranch(branchName) {
     console.error(`[worktree] Failed to delete local branch ${branchName}: ${stderr.trim()}`);
   }
 }
+async function localBranchExists(branchName) {
+  try {
+    await execFileAsync2("git", ["rev-parse", "--verify", "--quiet", `refs/heads/${branchName}`]);
+    return true;
+  } catch {
+    return false;
+  }
+}
 function getWorktreePath(worktreeId) {
   return `${WORKTREES_DIR}/${worktreeId}`;
 }
@@ -1778,6 +1872,8 @@ function createIssuePollingWorker(config) {
               "--dangerously-skip-permissions",
               "--disallowedTools",
               DISALLOWED_TOOLS_ARG,
+              "--append-subagent-system-prompt",
+              SUBAGENT_SYSTEM_PROMPT,
               "--model",
               model,
               "--effort",
@@ -1814,13 +1910,20 @@ function createIssuePollingWorker(config) {
                 }
                 try {
                   if (status === "completed") {
-                    await config.onCompleted?.(issue.number);
-                    await notifyTaskCompleted(config.name, name, issue.number, issue.title, issueUrl, output);
+                    const verified = await config.onCompleted?.(issue.number, worktreeId) ?? true;
+                    if (verified === false) {
+                      await notifyTaskFailed(config.name, name, issue.number, issue.title, issueUrl, output);
+                    } else {
+                      await notifyTaskCompleted(config.name, name, issue.number, issue.title, issueUrl, output);
+                    }
                   } else {
                     await notifyTaskFailed(config.name, name, issue.number, issue.title, issueUrl, output);
                   }
                 } catch (err) {
                   console.error(`[${config.name}] post-task error for #${issue.number}: ${err}`);
+                  await notifyTaskFailed(config.name, name, issue.number, issue.title, issueUrl, output).catch(
+                    (notifyErr) => console.error(`[${config.name}] notifyTaskFailed failed for #${issue.number}: ${notifyErr}`)
+                  );
                 } finally {
                   await removeLabel("issue", issue.number, "cc-in-progress").catch(
                     (err) => console.error(`[${config.name}] removeLabel cc-in-progress failed for #${issue.number}: ${err}`)
@@ -1852,18 +1955,47 @@ function createIssuePollingWorker(config) {
 }
 
 // src/workers/exec-issue.ts
+function prMissingComment(worktreeId) {
+  return [
+    "## PR\u672A\u4F5C\u6210\u306E\u307E\u307E\u81EA\u52D5\u5B9F\u884C\u304C\u7D42\u4E86\u3057\u307E\u3057\u305F\uFF08\u8981\u4EBA\u624B\u78BA\u8A8D\uFF09",
+    `exec-issue \u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u306F\u6B63\u5E38\u7D42\u4E86\uFF08exit 0\uFF09\u3057\u307E\u3057\u305F\u304C\u3001\u3053\u306E\u5B9F\u884C\u306E\u4F5C\u696D\u30D6\u30E9\u30F3\u30C1\uFF08\`${worktreeId}\`\uFF09\u3092 head \u3068\u3059\u308BPR\u3082\u3001\u672CIssue\u3092 closing \u53C2\u7167\u3059\u308BPR\u3082\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002PR\u4F5C\u6210\u524D\u306B\u30BB\u30C3\u30B7\u30E7\u30F3\u304C\u7D42\u4E86\u3057\u305F\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002`,
+    "",
+    "## \u72B6\u614B\u306E\u78BA\u8A8D",
+    `- \u5909\u66F4\u304C push \u6E08\u307F\u306E\u5834\u5408\u306F\u30EA\u30E2\u30FC\u30C8\u30D6\u30E9\u30F3\u30C1 \`${worktreeId}\` \u304C\u6B8B\u3063\u3066\u3044\u307E\u3059\u3002\u5185\u5BB9\u3092\u78BA\u8A8D\u3057\u3001\u5FC5\u8981\u306A\u3089\u624B\u52D5\u3067PR\u3092\u4F5C\u6210\u3057\u3066\u304F\u3060\u3055\u3044`,
+    "",
+    "## \u5BFE\u5FDC\u5F8C\u306E\u9032\u3081\u65B9",
+    "- \u81EA\u52D5\u5B9F\u884C\u3092\u3084\u308A\u76F4\u3059\u5834\u5408: `cc-need-human-check` \u30E9\u30D9\u30EB\u3092\u5916\u3057\u3001`cc-exec-issue` \u30E9\u30D9\u30EB\u3092\u4ED8\u3051\u76F4\u3057\u3066\u304F\u3060\u3055\u3044",
+    "- \u624B\u52D5\u3067PR\u3092\u4F5C\u6210\u3057\u305F\u5834\u5408\u306A\u3069\u5BFE\u5FDC\u6E08\u307F\u306E\u5834\u5408: `cc-need-human-check` \u30E9\u30D9\u30EB\u3092\u5916\u3057\u3066\u304F\u3060\u3055\u3044"
+  ].join("\n");
+}
 var execIssueWorker = (opts = {}) => createIssuePollingWorker({
   name: "exec-issue",
   command: "/claude-task-worker:exec-issue",
   triggerLabels: ["cc-exec-issue"],
   epicFilters: opts.epicFilters,
   labelFilters: opts.labelFilters,
-  onCompleted: async (issueNumber) => {
+  onCompleted: async (issueNumber, worktreeId) => {
     if (await hasLabel("issue", issueNumber, "cc-need-human-check")) {
       console.log(`[exec-issue] #${issueNumber}: cc-need-human-check present, skip cc-pr-created`);
+      return false;
+    }
+    if (await getIssueState(issueNumber) === "CLOSED") {
+      console.log(`[exec-issue] #${issueNumber}: issue closed by skill (no-change path), skip cc-pr-created`);
       return;
     }
-    await addLabel("issue", issueNumber, "cc-pr-created");
+    const prNumber = await findPrNumberByHeadRef(worktreeId, "all") ?? await findPrNumberClosingIssue(issueNumber);
+    if (prNumber !== null) {
+      await addLabel("issue", issueNumber, "cc-pr-created");
+      return;
+    }
+    console.error(
+      `[exec-issue] #${issueNumber}: session exited without a PR (branch: ${worktreeId}); marking cc-need-human-check`
+    );
+    await addLabel("issue", issueNumber, "cc-need-human-check");
+    await commentOnIssue(issueNumber, prMissingComment(worktreeId)).catch(
+      (err) => console.error(`[exec-issue] commentOnIssue failed for #${issueNumber}: ${err}`)
+    );
+    return false;
   }
 })();
 
@@ -1897,6 +2029,14 @@ function createPrPollingWorker(config) {
           try {
             await removeWorktreeByBranch(pr.headRefName);
             await deleteLocalBranch(pr.headRefName);
+            if (await localBranchExists(pr.headRefName)) {
+              console.error(
+                `[${config.name}] PR #${pr.number}: branch ${pr.headRefName} is still checked out by another worktree; skipping this tick`
+              );
+              await removeLabel("pr", pr.number, LABEL_IN_PROGRESS).catch(() => {
+              });
+              continue;
+            }
             syncDefaultBranch(defaultBranch);
             await createWorktreeFromBranch(worktreeId, defaultBranch);
             const cwd = getWorktreePath(worktreeId);
@@ -1910,6 +2050,8 @@ function createPrPollingWorker(config) {
                 "--dangerously-skip-permissions",
                 "--disallowedTools",
                 DISALLOWED_TOOLS_ARG,
+                "--append-subagent-system-prompt",
+                SUBAGENT_SYSTEM_PROMPT,
                 "--model",
                 model,
                 "--effort",
@@ -2074,6 +2216,19 @@ var checkDependabotWorker = createPrPollingWorker({
 });
 
 // src/workers/epic-issue.ts
+function epicPrMissingComment(issueNumber) {
+  return [
+    "## Epic PR\u672A\u4F5C\u6210\u306E\u307E\u307E\u81EA\u52D5\u5B9F\u884C\u304C\u7D42\u4E86\u3057\u307E\u3057\u305F\uFF08\u8981\u4EBA\u624B\u78BA\u8A8D\uFF09",
+    `create-epic-pr \u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u306F\u6B63\u5E38\u7D42\u4E86\uFF08exit 0\uFF09\u3057\u307E\u3057\u305F\u304C\u3001Epic \u30D6\u30E9\u30F3\u30C1 \`cc-epic-${issueNumber}\` \u3092 head \u3068\u3059\u308B\u30AA\u30FC\u30D7\u30F3\u306APR\u304C\u898B\u3064\u304B\u308A\u307E\u305B\u3093\u3067\u3057\u305F\u3002PR\u4F5C\u6210\u524D\u306B\u30BB\u30C3\u30B7\u30E7\u30F3\u304C\u7D42\u4E86\u3057\u305F\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002`,
+    "",
+    "## \u72B6\u614B\u306E\u78BA\u8A8D",
+    `- \u5909\u66F4\u304C push \u6E08\u307F\u306E\u5834\u5408\u306F\u30EA\u30E2\u30FC\u30C8\u30D6\u30E9\u30F3\u30C1 \`cc-epic-${issueNumber}\` \u304C\u6B8B\u3063\u3066\u3044\u307E\u3059\u3002\u5185\u5BB9\u3092\u78BA\u8A8D\u3057\u3001\u5FC5\u8981\u306A\u3089\u624B\u52D5\u3067PR\u3092\u4F5C\u6210\u3057\u3066\u304F\u3060\u3055\u3044`,
+    "",
+    "## \u5BFE\u5FDC\u5F8C\u306E\u9032\u3081\u65B9",
+    "- \u81EA\u52D5\u5B9F\u884C\u3092\u3084\u308A\u76F4\u3059\u5834\u5408: `cc-need-human-check` \u30E9\u30D9\u30EB\u3092\u5916\u3057\u3001`cc-epic-issue` \u30E9\u30D9\u30EB\u3092\u4ED8\u3051\u76F4\u3057\u3066\u304F\u3060\u3055\u3044",
+    "- \u624B\u52D5\u3067PR\u3092\u4F5C\u6210\u3057\u305F\u5834\u5408\u306A\u3069\u5BFE\u5FDC\u6E08\u307F\u306E\u5834\u5408: `cc-need-human-check` \u30E9\u30D9\u30EB\u3092\u5916\u3057\u3066\u304F\u3060\u3055\u3044"
+  ].join("\n");
+}
 var epicIssueWorker = (opts = {}) => createIssuePollingWorker({
   name: "epic-issue",
   command: "/claude-task-worker:create-epic-pr",
@@ -2088,12 +2243,16 @@ var epicIssueWorker = (opts = {}) => createIssuePollingWorker({
     return "proceed";
   },
   onCompleted: async (issueNumber) => {
-    await addLabel("issue", issueNumber, "cc-pr-created");
     const prNumber = await findOpenPrNumberByHeadRef(`cc-epic-${issueNumber}`);
     if (prNumber === null) {
-      console.error(`[epic-issue] Epic PR for branch cc-epic-${issueNumber} not found; skip labeling`);
-      return;
+      console.error(`[epic-issue] Epic PR for branch cc-epic-${issueNumber} not found; skip cc-pr-created`);
+      await addLabel("issue", issueNumber, "cc-need-human-check");
+      await commentOnIssue(issueNumber, epicPrMissingComment(issueNumber)).catch(
+        (err) => console.error(`[epic-issue] commentOnIssue failed for #${issueNumber}: ${err}`)
+      );
+      return false;
     }
+    await addLabel("issue", issueNumber, "cc-pr-created");
     await addLabel("pr", prNumber, "cc-epic-issue");
     await addLabel("pr", prNumber, "cc-triage-scope");
   }

package/package.json

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