claude-task-worker 0.107.0 → 0.109.0

package/README.md

@@ -122,7 +122,7 @@ claude-task-worker init --force   # 強制上書き
 ## コマンド
 
 ```bash
-claude-task-worker <command> [--epic <issue-number>]... [--label <label>]... [--project <name>]... [--cloud]
+claude-task-worker <command> [--epic <issue-number>]... [--label <label>]... [--project <name>]... [--cloud] [--debug]
 ```
 
 | コマンド | 内容 |
@@ -210,6 +210,19 @@ npx claude-task-worker cloud-setup
 
 詳細は [`docs/prd-cloud-worker-execution.md`](./docs/prd-cloud-worker-execution.md) を参照。
 
+### `--debug`
+
+各タスクの最終報告を対象 Issue/PR へコメントとして残す。ローカル実行（`default` / `herdr`）でもクラウド実行（`--cloud`）でも使える。
+
+```bash
+claude-task-worker exec-issue --debug
+claude-task-worker exec-issue --cloud --debug
+```
+
+既定（`--debug` なし）では最終報告は Slack 通知にのみ載り、Issue/PR にはコメントされない。毎タスク投稿すると Issue/PR がワーカーの実行ログで埋まるため。
+
+投稿の担当は実行形態で違う。ローカルはワーカーが報告そのもの（`claude -p` の stdout / transcript）を持っているのでワーカーが投稿し、クラウドはワーカーに報告が届かないのでセッション自身に投稿させる（ワーカーはそれを回収して Slack へ載せる）。定期ワーカー（`update-*`）の投稿先は実行記録PR（`ctw-last-run-<ワーカー名>`）。クラウド実行の完了検知（`cc-cloud-done`）はフラグの有無に関わらず従来どおり動く。
+
 ### Pen CLI のログイン
 
 `.pen` を扱うスキルは Pen CLI の認証を必要とする。UIデザイン先行ワークフローを使うなら一度ログインしておく。

package/dist/index.js

@@ -1609,6 +1609,11 @@ async function addLabel(type, number, label) {
     }
   });
 }
+async function addAssignee(type, number, login) {
+  await withRetry(async () => {
+    await execGh([type, "edit", String(number), "--add-assignee", login]);
+  });
+}
 async function hasLabel(type, number, label) {
   return withRetry(async () => {
     const output = await execGh([type, "view", String(number), "--json", "labels"]);
@@ -1668,10 +1673,8 @@ async function commentOnPR(prNumber, body) {
 async function commentOnIssue(issueNumber, body) {
   await execGh(["issue", "comment", String(issueNumber), "--body", body]);
 }
-async function createPullRequest(base, head, title, body, options) {
+async function createPullRequest(base, head, title, body) {
   const args = ["pr", "create", "--base", base, "--head", head, "--title", title, "--body", body];
-  for (const label of options?.labels ?? []) args.push("--label", label);
-  if (options?.assignee) args.push("--assignee", options.assignee);
   const url = await execGh(args);
   const matched = url.match(/\/pull\/(\d+)/);
   if (!matched) throw new Error(`gh pr create returned an unexpected output: ${url}`);
@@ -1732,6 +1735,13 @@ function hasCloudFlag() {
   }
   return cachedCloudFlag;
 }
+var cachedDebugFlag;
+function hasDebugFlag() {
+  if (cachedDebugFlag === void 0) {
+    cachedDebugFlag = process.argv.includes("--debug");
+  }
+  return cachedDebugFlag;
+}
 function assertCloudCompatibleCommand(command) {
   if (FLAG_INCOMPATIBLE_COMMANDS.includes(command)) {
     console.error(`[worker] --cloud cannot be used with the "${command}" command`);
@@ -2585,12 +2595,12 @@ function buildClaudeArgs({
 function buildCloudCreateArgs(commonArgs, prompt) {
   return ["--cloud", prompt, ...commonArgs];
 }
-function appendCloudDoneInstruction(prompt, target) {
+function appendCloudDoneInstruction(prompt, target, debug = false) {
   const targetLabel = target.type === "issue" ? `Issue #${target.number}` : `PR #${target.number}`;
   const checkoutInstruction = buildCloudCheckoutInstruction(target);
   const worktreeInstruction = buildCloudWorktreeInstruction(prompt);
-  const reportInstruction = `\`${CLOUD_DONE_LABEL}\` \u30E9\u30D9\u30EB\u3092\u4ED8\u3051\u308B\u76F4\u524D\u306B\u3001${targetLabel} \u3078 \`${CLOUD_REPORT_HEADING}\` \u3092\u898B\u51FA\u3057\u3068\u3059\u308B\u30B3\u30E1\u30F3\u30C8\u30921\u4EF6\u6295\u7A3F\u3057\u3001\u672C\u6587\u306B\u6700\u7D42\u5831\u544A\uFF08\u5B8C\u4E86\u30FB\u4E2D\u65AD\u306B\u304B\u304B\u308F\u3089\u305A\uFF09\u3092\u66F8\u304F\u3053\u3068\u3002GitHub MCP\uFF08\`add_issue_comment\`\uFF09\u3092\u512A\u5148\u3057\u3001\u5931\u6557\u3057\u305F\u5834\u5408\u306E\u307F \`gh ${target.type} comment ${target.number} --body-file -\` \u3078\u30D5\u30A9\u30FC\u30EB\u30D0\u30C3\u30AF\u3059\u308B\u3053\u3068\uFF08\u30D5\u30A9\u30FC\u30EB\u30D0\u30C3\u30AF\u306F1\u56DE\u307E\u3067\uFF09\u3002\u30EF\u30FC\u30AB\u30FC\u306F\u3053\u306E\u30B3\u30E1\u30F3\u30C8\u3092\u6700\u7D42\u30EC\u30DD\u30FC\u30C8\u3068\u3057\u3066\u56DE\u53CE\u3057 Slack \u901A\u77E5\u306B\u8F09\u305B\u308B\u3002`;
-  const labelInstruction = `\u4E0A\u8A18\u30B3\u30E1\u30F3\u30C8\u306E\u6295\u7A3F\u5F8C\u3001\u3053\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u306E\u6700\u5F8C\u306E\u64CD\u4F5C\u3068\u3057\u3066 ${targetLabel} \u306B \`${CLOUD_DONE_LABEL}\` \u30E9\u30D9\u30EB\u3092\u4ED8\u4E0E\u3059\u308B\u3053\u3068\u3002GitHub MCP\uFF08\`issue_write\` / method: \`update\`\uFF09\u3092\u512A\u5148\u3057\u3001\u5931\u6557\u3057\u305F\u5834\u5408\u306E\u307F \`gh ${target.type} edit ${target.number} --add-label ${CLOUD_DONE_LABEL}\` \u3078\u30D5\u30A9\u30FC\u30EB\u30D0\u30C3\u30AF\u3059\u308B\u3053\u3068\uFF08\u30D5\u30A9\u30FC\u30EB\u30D0\u30C3\u30AF\u306F1\u56DE\u307E\u3067\uFF09\u3002\u30EF\u30FC\u30AB\u30FC\u306F\u3053\u306E\u30E9\u30D9\u30EB\u3067\u30BF\u30B9\u30AF\u306E\u7D42\u4E86\u3092\u691C\u77E5\u3057\u3066\u304A\u308A\u3001\u4ED8\u4E0E\u3055\u308C\u306A\u3044\u3068\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\u307E\u3067\u5B8C\u4E86\u6271\u3044\u306B\u306A\u3089\u306A\u3044\u3002`;
+  const reportInstruction = debug ? `\`${CLOUD_DONE_LABEL}\` \u30E9\u30D9\u30EB\u3092\u4ED8\u3051\u308B\u76F4\u524D\u306B\u3001${targetLabel} \u3078 \`${CLOUD_REPORT_HEADING}\` \u3092\u898B\u51FA\u3057\u3068\u3059\u308B\u30B3\u30E1\u30F3\u30C8\u30921\u4EF6\u6295\u7A3F\u3057\u3001\u672C\u6587\u306B\u6700\u7D42\u5831\u544A\uFF08\u5B8C\u4E86\u30FB\u4E2D\u65AD\u306B\u304B\u304B\u308F\u3089\u305A\uFF09\u3092\u66F8\u304F\u3053\u3068\u3002GitHub MCP\uFF08\`add_issue_comment\`\uFF09\u3092\u512A\u5148\u3057\u3001\u5931\u6557\u3057\u305F\u5834\u5408\u306E\u307F \`gh ${target.type} comment ${target.number} --body-file -\` \u3078\u30D5\u30A9\u30FC\u30EB\u30D0\u30C3\u30AF\u3059\u308B\u3053\u3068\uFF08\u30D5\u30A9\u30FC\u30EB\u30D0\u30C3\u30AF\u306F1\u56DE\u307E\u3067\uFF09\u3002\u30EF\u30FC\u30AB\u30FC\u306F\u3053\u306E\u30B3\u30E1\u30F3\u30C8\u3092\u6700\u7D42\u30EC\u30DD\u30FC\u30C8\u3068\u3057\u3066\u56DE\u53CE\u3057 Slack \u901A\u77E5\u306B\u8F09\u305B\u308B\u3002` : "";
+  const labelInstruction = `${debug ? "\u4E0A\u8A18\u30B3\u30E1\u30F3\u30C8\u306E\u6295\u7A3F\u5F8C\u3001" : ""}\u3053\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u306E\u6700\u5F8C\u306E\u64CD\u4F5C\u3068\u3057\u3066 ${targetLabel} \u306B \`${CLOUD_DONE_LABEL}\` \u30E9\u30D9\u30EB\u3092\u4ED8\u4E0E\u3059\u308B\u3053\u3068\u3002GitHub MCP\uFF08\`issue_write\` / method: \`update\`\uFF09\u3092\u512A\u5148\u3057\u3001\u5931\u6557\u3057\u305F\u5834\u5408\u306E\u307F \`gh ${target.type} edit ${target.number} --add-label ${CLOUD_DONE_LABEL}\` \u3078\u30D5\u30A9\u30FC\u30EB\u30D0\u30C3\u30AF\u3059\u308B\u3053\u3068\uFF08\u30D5\u30A9\u30FC\u30EB\u30D0\u30C3\u30AF\u306F1\u56DE\u307E\u3067\uFF09\u3002\u30EF\u30FC\u30AB\u30FC\u306F\u3053\u306E\u30E9\u30D9\u30EB\u3067\u30BF\u30B9\u30AF\u306E\u7D42\u4E86\u3092\u691C\u77E5\u3057\u3066\u304A\u308A\u3001\u4ED8\u4E0E\u3055\u308C\u306A\u3044\u3068\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8\u307E\u3067\u5B8C\u4E86\u6271\u3044\u306B\u306A\u3089\u306A\u3044\u3002`;
   return [prompt, checkoutInstruction, worktreeInstruction, reportInstruction, labelInstruction].filter((part) => part !== "").join("\n\n");
 }
 var CLOUD_WORKTREE_EXEMPT_SKILLS = ["exec-issue", "fix-review-point", "create-ui-design"];
@@ -2609,7 +2619,7 @@ function buildCloudGitHubAccessInstruction() {
 function buildCloudToolRestriction() {
   return `\u30AF\u30E9\u30A6\u30C9\u5B9F\u884C\u3067\u306F \`--disallowedTools\` \u30D5\u30E9\u30B0\u306B\u3088\u308B\u30C4\u30FC\u30EB\u5236\u9650\u304C\u53CD\u6620\u3055\u308C\u306A\u3044\u305F\u3081\u3001\u4EE5\u4E0B\u306E\u30C4\u30FC\u30EB\u3092\u4F7F\u308F\u306A\u3044\u3053\u3068: ${DISALLOWED_TOOLS.join(", ")}`;
 }
-function buildCloudPrompt(prompt, model, target) {
+function buildCloudPrompt(prompt, model, target, debug = false) {
   const principles = `\u4EE5\u4E0B\u306F\u3053\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u306E\u5B9F\u884C\u539F\u5247\u3067\u3042\u308B\u3002\u30AF\u30E9\u30A6\u30C9\u5B9F\u884C\u3067\u306F\u30B7\u30B9\u30C6\u30E0\u30D7\u30ED\u30F3\u30D7\u30C8\u306B\u3088\u308B\u6CE8\u5165\u304C\u53CD\u6620\u3055\u308C\u306A\u3044\u305F\u3081\u3001\u30D7\u30ED\u30F3\u30D7\u30C8\u672C\u6587\u3068\u3057\u3066\u6E21\u3057\u3066\u3044\u308B\u3002
 
 ${systemPromptFor(model)}
@@ -2620,7 +2630,7 @@ ${buildCloudGitHubAccessInstruction()}`;
   const withPrinciples = `${prompt}
 
 ${principles}`;
-  return target ? appendCloudDoneInstruction(withPrinciples, target) : withPrinciples;
+  return target ? appendCloudDoneInstruction(withPrinciples, target, debug) : withPrinciples;
 }
 function shellQuote2(value) {
   return `'${value.replace(/'/g, "'\\''")}'`;
@@ -2819,6 +2829,21 @@ async function finishTask(id, result, onComplete) {
   pruneTaskHistory();
   renderTable();
 }
+function onCompleteWithDebugReport(onComplete, target) {
+  if (!target || !hasDebugFlag()) return onComplete;
+  return async (status, output, cloudSessionId) => {
+    const body = output.trim();
+    if (body !== "") {
+      const comment = target.type === "issue" ? commentOnIssue : commentOnPR;
+      await comment(target.number, `${CLOUD_REPORT_HEADING}
+
+${body}`).catch(
+        (err) => console.error(`[worker] failed to post the debug report to ${target.type} #${target.number}: ${err}`)
+      );
+    }
+    await onComplete?.(status, output, cloudSessionId);
+  };
+}
 function resolveProjectName(cwd = process.cwd()) {
   const injected = process.env.CTW_PROJECT_NAME;
   if (injected && injected.length > 0) return injected;
@@ -2992,7 +3017,8 @@ async function createCloudSession(args, initialPrompt, cwd, env) {
 }
 async function runViaCloud(args, prompt, id, onComplete, cwd, env, cloudTarget, model) {
   herdrTasks.set(id, { paneId: "", tabId: "" });
-  const initialPrompt = buildCloudPrompt(prompt, model ?? "", cloudTarget);
+  const debug = hasDebugFlag();
+  const initialPrompt = buildCloudPrompt(prompt, model ?? "", cloudTarget, debug);
   let result;
   let cloudSessionId;
   try {
@@ -3010,7 +3036,7 @@ async function runViaCloud(args, prompt, id, onComplete, cwd, env, cloudTarget,
         });
         let reportBody = null;
         const startedAt = tasks.get(id)?.startedAt;
-        if (startedAt) {
+        if (debug && startedAt) {
           try {
             reportBody = await findCommentSince(targetNumber, startedAt, CLOUD_REPORT_HEADING);
           } catch (err) {
@@ -3080,8 +3106,9 @@ function run(command, args, id, title, workerName, path2, onComplete, cwd, env,
     void runViaCloud(args, prompt ?? "", id, onComplete, cwd, env, cloudTarget, model);
     return;
   }
+  const onCompleteWithReport = onCompleteWithDebugReport(onComplete, cloudTarget);
   if (getRunMode() === "herdr") {
-    void runViaHerdr(args, prompt ?? "", id, onComplete, cwd, env);
+    void runViaHerdr(args, prompt ?? "", id, onCompleteWithReport, cwd, env);
     return;
   }
   const child = spawn(command, args, {
@@ -3117,12 +3144,12 @@ function run(command, args, id, title, workerName, path2, onComplete, cwd, env,
       Buffer.concat(outputChunks).toString("utf-8"),
       Buffer.concat(stderrChunks).toString("utf-8").slice(-STDERR_TAIL_LIMIT)
     );
-    await finishTask(id, result, onComplete);
+    await finishTask(id, result, onCompleteWithReport);
     childProcesses.delete(id);
   });
   child.on("error", async (err) => {
     console.error(`[worker] failed to spawn process for #${id}: ${err.message}`);
-    await finishTask(id, { status: "failed", output: err.message }, onComplete);
+    await finishTask(id, { status: "failed", output: err.message }, onCompleteWithReport);
     childProcesses.delete(id);
   });
 }
@@ -3656,11 +3683,12 @@ async function notifyError(workerName, repoName, error) {
 }
 
 // src/worktree.ts
-import { execFile as execFile2 } from "node:child_process";
+import { createRequire as createRequire3 } from "node:module";
 import { promisify as promisify3 } from "node:util";
 import { readdir, rm, stat } from "node:fs/promises";
 import { basename as basename2, resolve as resolve2, sep } from "node:path";
-var execFileAsync2 = promisify3(execFile2);
+var childProcess3 = createRequire3(import.meta.url)("node:child_process");
+var execFileAsync2 = (command, args) => promisify3(childProcess3.execFile)(command, args);
 var WORKTREES_DIR = ".claude/worktrees";
 function isManagedWorktreePath(path2) {
   return resolve2(path2).startsWith(resolve2(WORKTREES_DIR) + sep);
@@ -3984,7 +4012,9 @@ function createIssuePollingWorker(config) {
               buildClaudeEnv(mode, cloud),
               execution.prompt,
               cloud,
-              cloud ? { type: "issue", number: issue.number } : void 0,
+              // クラウドでは cc-cloud-done の探索先、ローカルでは --debug の報告コメントの
+              // 投稿先。どちらも対象は同じ Issue なので実行形態で出し分けない。
+              { type: "issue", number: issue.number },
               model
             );
           } catch (err) {
@@ -4241,7 +4271,9 @@ function createPrPollingWorker(config) {
               buildClaudeEnv(mode, isCloud),
               execution.prompt,
               isCloud,
-              isCloud ? { type: "pr", number: pr.number, onBranch: true } : void 0,
+              // クラウドでは cc-cloud-done の探索先、ローカルでは --debug の報告コメントの
+              // 投稿先。onBranch は `--on-branch` を渡したか（＝クラウドのみ）を表す。
+              { type: "pr", number: pr.number, onBranch: isCloud },
               model
             );
           } catch (err) {
@@ -4678,9 +4710,10 @@ var applyUiDesignWorker = async (opts = {}) => {
 };
 
 // src/last-run-pr.ts
-import { execFile as execFile3 } from "node:child_process";
+import { createRequire as createRequire4 } from "node:module";
 import { promisify as promisify4 } from "node:util";
-var execFileAsync3 = promisify4(execFile3);
+var childProcess4 = createRequire4(import.meta.url)("node:child_process");
+var execFileAsync3 = (command, args) => promisify4(childProcess4.execFile)(command, args);
 var CONFIG_FILE = "claude-task-worker.json";
 var LABEL_TRIAGE_SCOPE2 = "cc-triage-scope";
 function lastRunBranchName(workerName) {
@@ -4720,18 +4753,14 @@ async function publishLastRunPr(workerName, defaultBranch, at) {
     await git(cwd, ["commit", "-m", lastRunPrTitle(workerName)]);
     await git(cwd, ["push", "--force", "origin", `HEAD:refs/heads/${branch}`]);
     const existing = await findOpenPrNumberByHeadRef(branch);
-    if (existing !== null) {
-      console.log(`[${workerName}] updated lastRun PR #${existing}`);
-      return existing;
-    }
-    const prNumber = await createPullRequest(
-      defaultBranch,
-      branch,
-      lastRunPrTitle(workerName),
-      lastRunPrBody(workerName, at),
-      { labels: [LABEL_TRIAGE_SCOPE2], assignee: await getCurrentUser() }
+    const prNumber = existing ?? await createPullRequest(defaultBranch, branch, lastRunPrTitle(workerName), lastRunPrBody(workerName, at));
+    console.log(`[${workerName}] ${existing !== null ? "updated" : "opened"} lastRun PR #${prNumber}`);
+    await addLabel("pr", prNumber, LABEL_TRIAGE_SCOPE2).catch(
+      (err) => console.error(`[${workerName}] addLabel ${LABEL_TRIAGE_SCOPE2} failed for PR #${prNumber}: ${err}`)
+    );
+    await addAssignee("pr", prNumber, await getCurrentUser()).catch(
+      (err) => console.error(`[${workerName}] addAssignee failed for PR #${prNumber}: ${err}`)
     );
-    console.log(`[${workerName}] opened lastRun PR #${prNumber}`);
     return prNumber;
   } finally {
     await removeWorktree(branch).catch((err) => console.error(`[${workerName}] removeWorktree failed: ${err}`));
@@ -4837,7 +4866,9 @@ function createScheduledWorker(config) {
           buildClaudeEnv(mode, cloud),
           execution.prompt,
           cloud,
-          cloud && lastRunPr !== null ? { type: "pr", number: lastRunPr } : void 0,
+          // 定期ワーカーは Issue/PR を起点に走らないため、クラウドの cc-cloud-done も
+          // ローカル --debug の報告コメントも実行記録PRを置き先にする。
+          lastRunPr !== null ? { type: "pr", number: lastRunPr } : void 0,
           model
         );
       } catch (err) {
@@ -5491,9 +5522,9 @@ function version() {
 }
 
 // src/index.ts
-import { execFile as execFile4 } from "node:child_process";
+import { execFile as execFile2 } from "node:child_process";
 import { promisify as promisify5 } from "node:util";
-var execFileAsync4 = promisify5(execFile4);
+var execFileAsync4 = promisify5(execFile2);
 var WORKERS = {
   "exec-issue": execIssueWorker,
   "fix-review-point": fixReviewPointWorker,
@@ -5543,6 +5574,7 @@ Workers:
 
 Options:
   --project <name>  Dispatch to project(s) via herdr instead of running the worker locally. Accepts a project name, a project group name, or "all". Repeatable.
+  --debug           Post each task's final report as a comment on the target Issue/PR (off by default; the report is only sent to Slack). Works in both local and --cloud runs.
   --epic <number>   Limit issue-based workers to sub-issues of the specified epic issue. Repeatable: any matching parent (OR).
   --label <name>    Limit issue-based workers to issues that also carry the specified label. Repeatable: all must be present (AND).
 

package/package.json

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