claude-task-worker 0.106.0 → 0.107.0

package/dist/index.js

@@ -1917,9 +1917,8 @@ var SCHEDULED_WORKER_NAMES = [
   "update-design-md"
 ];
 var CLOUD_DONE_LABEL = "cc-cloud-done";
-var CLOUD_ALLOWED_WORKERS = ["exec-issue", "fix-review-point"];
-function isCloudWorker(name) {
-  return hasCloudFlag() && CLOUD_ALLOWED_WORKERS.includes(name);
+function isCloudWorker(_name) {
+  return hasCloudFlag();
 }
 function checkCloudAuth(input) {
   if (input.status.kind === "unknown") return [];
@@ -2594,14 +2593,14 @@ function appendCloudDoneInstruction(prompt, target) {
   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`;
   return [prompt, checkoutInstruction, worktreeInstruction, reportInstruction, labelInstruction].filter((part) => part !== "").join("\n\n");
 }
-var CLOUD_WORKTREE_EXEMPT_SKILLS = ["exec-issue", "fix-review-point"];
+var CLOUD_WORKTREE_EXEMPT_SKILLS = ["exec-issue", "fix-review-point", "create-ui-design"];
 function buildCloudWorktreeInstruction(prompt) {
   const skill = prompt.trim().split(/\s+/)[0] ?? "";
   if (!CLOUD_WORKTREE_EXEMPT_SKILLS.some((name) => skill.endsWith(`:${name}`))) return "";
   return "\u3053\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u306F\u30AF\u30E9\u30A6\u30C9\u5B9F\u884C\u306E\u305F\u3081 worktree \u3092\u6301\u305F\u305A\u3001cwd \u306F\u30EA\u30DD\u30B8\u30C8\u30EA\u30EB\u30FC\u30C8\u3067\u3042\u308B\uFF08\u30EF\u30FC\u30AB\u30FC\u306F\u30AF\u30E9\u30A6\u30C9\u5B9F\u884C\u6642\u306B worktree \u3092\u4F5C\u3089\u306A\u3044\uFF09\u3002\u30B9\u30AD\u30EB\u672C\u6587\u306E\u30D5\u30A7\u30FC\u30BA0\u306B\u3042\u308B\u300C`pwd` \u304C `.claude/worktrees/` \u914D\u4E0B\u3067\u306A\u3051\u308C\u3070\u4E2D\u65AD\u3059\u308B\u300D\u78BA\u8A8D\u306F\u3001\u3053\u306E\u6307\u793A\u304C\u3042\u308B\u5834\u5408\u306B\u9650\u308A\u9069\u7528\u3057\u306A\u3044\u3053\u3068\u3002\u305F\u3060\u3057\u30AC\u30FC\u30C9\u306E\u76EE\u7684\u3067\u3042\u308B\u300C\u30C7\u30D5\u30A9\u30EB\u30C8\u30D6\u30E9\u30F3\u30C1\u3067\u4F5C\u696D\u3057\u306A\u3044\u300D\u306F\u7DAD\u6301\u3059\u308B\u3053\u3068 \u2014 \u540C\u3058\u30D5\u30A7\u30FC\u30BA0\u306E\u300C\u30C7\u30D5\u30A9\u30EB\u30C8\u30D6\u30E9\u30F3\u30C1\u540D\u3092\u53D6\u5F97\u3057\u3001\u73FE\u5728\u30D6\u30E9\u30F3\u30C1\u3068\u4E00\u81F4\u3059\u308B\u5834\u5408\u306F\u4E2D\u65AD\u3059\u308B\uFF08\u53D6\u5F97\u5931\u6557\u3082\u4E2D\u65AD\uFF09\u300D\u306F\u5FC5\u305A\u5B9F\u884C\u3057\u3001\u4E00\u81F4\u3057\u305F\u5834\u5408\u306F\u5F93\u6765\u3069\u304A\u308A\u4E2D\u65AD\u3059\u308B\u3053\u3068\u3002";
 }
 function buildCloudCheckoutInstruction(target) {
-  if (target.type !== "pr") return "";
+  if (target.type !== "pr" || !target.onBranch) return "";
   return `\u3053\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u306F PR #${target.number} \u306E head \u30D6\u30E9\u30F3\u30C1\u4E0A\u3067\u958B\u59CB\u3057\u3066\u3044\u308B\uFF08\u30EF\u30FC\u30AB\u30FC\u304C \`--on-branch\` \u3067\u6307\u5B9A\u6E08\u307F\uFF09\u3002\u30B9\u30AD\u30EB\u672C\u6587\u304C\u6307\u793A\u3059\u308B \`gh pr checkout\` \u306F\u5B9F\u884C\u3057\u306A\u3044\u3053\u3068\uFF08\u30AF\u30E9\u30A6\u30C9\u3067\u306F GraphQL \u30B2\u30FC\u30C8\u306B\u3088\u308A 403 \u3067\u5931\u6557\u3057\u3001\u304B\u3064\u65E2\u306B\u30D6\u30E9\u30F3\u30C1\u4E0A\u306B\u3044\u308B\u306E\u3067\u4E0D\u8981\uFF09\u3002\u30D6\u30E9\u30F3\u30C1\u306E\u78BA\u8A8D\u304C\u8981\u308B\u5834\u5408\u306F \`git rev-parse --abbrev-ref HEAD\` \u3092\u4F7F\u3046\u3053\u3068\u3002`;
 }
 function buildCloudGitHubAccessInstruction() {
@@ -2899,8 +2898,7 @@ async function pollCloudWaiters() {
     const now = Date.now();
     for (const [key, waiter] of [...cloudWaiters.entries()]) {
       const done = doneKeys.get(waiter.type);
-      const number = Number(key.split(":")[1]);
-      if (done?.has(number)) {
+      if (done?.has(waiter.number)) {
         waiter.settle("completed");
         cloudWaiters.delete(key);
       } else if (now >= waiter.deadline) {
@@ -2915,19 +2913,21 @@ async function pollCloudWaiters() {
     }
   }
 }
-function waitForCloudTask(id, type) {
+function waitForCloudTask(id, target) {
   return new Promise((resolve3) => {
-    cloudWaiters.set(`${type}:${id}`, {
-      type,
+    cloudWaiters.set(`${target.type}:${target.number}:${id}`, {
+      type: target.type,
+      number: target.number,
       deadline: Date.now() + CLOUD_TASK_TIMEOUT_MS,
       settle: resolve3
     });
     ensureCloudPollLoop();
   });
 }
-async function flagOrphanedCloudSession(target, id, reason, cloudSessionId) {
-  await addLabel(target, id, "cc-need-human-check").catch((err) => {
-    console.error(`[worker] failed to add cc-need-human-check to ${target} #${id}: ${err}`);
+async function flagOrphanedCloudSession(target, reason, cloudSessionId) {
+  const { type, number: id } = target;
+  await addLabel(type, id, "cc-need-human-check").catch((err) => {
+    console.error(`[worker] failed to add cc-need-human-check to ${type} #${id}: ${err}`);
   });
   const causeLine = reason === "session-id" ? "\u30BB\u30C3\u30B7\u30E7\u30F3ID\u306E\u62BD\u51FA\u306B\u5931\u6557\u3057\u3066\u5F85\u6A5F\u3092\u6253\u3061\u5207\u308A\u307E\u3057\u305F\u3002\u30D7\u30ED\u30F3\u30D7\u30C8\u306F\u6295\u5165\u6E08\u307F\u3067\u3001\u30AF\u30E9\u30A6\u30C9\u30BB\u30C3\u30B7\u30E7\u30F3\u306F\u72EC\u7ACB\u3057\u3066\u7A3C\u50CD\u3057\u3066\u3044\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002" : "\u30EF\u30FC\u30AB\u30FC\u306E\u30B7\u30E3\u30C3\u30C8\u30C0\u30A6\u30F3\u3067\u5F85\u6A5F\u3092\u6253\u3061\u5207\u308A\u307E\u3057\u305F\u3002\u30AF\u30E9\u30A6\u30C9\u30BB\u30C3\u30B7\u30E7\u30F3\u306F\u7D99\u7D9A\u3057\u3066\u3044\u308B\u53EF\u80FD\u6027\u304C\u9AD8\u3044\u3067\u3059\u3002";
   const sessionLine = cloudSessionId ? `https://claude.ai/code/${cloudSessionId}` : "\u30BB\u30C3\u30B7\u30E7\u30F3URL\u4E0D\u660E\uFF08ID\u62BD\u51FA\u306B\u5931\u6557\uFF09";
@@ -2938,9 +2938,9 @@ async function flagOrphanedCloudSession(target, id, reason, cloudSessionId) {
 **\u30BB\u30C3\u30B7\u30E7\u30F3URL**: ${sessionLine}
 
 **\u518D\u958B\u65B9\u6CD5**: \u5B64\u7ACB\u30BB\u30C3\u30B7\u30E7\u30F3\u306E\u6210\u679C\u7269\u304C\u5C4A\u3044\u3066\u3044\u306A\u3044\u304B\u78BA\u8A8D\u3057\u305F\u3046\u3048\u3067\u3001\`cc-need-human-check\` \u30E9\u30D9\u30EB\u3092\u5916\u3059\u3068\u30DD\u30FC\u30EA\u30F3\u30B0\u5BFE\u8C61\u306B\u623B\u308A\u307E\u3059\u3002`;
-  const commentFn = target === "issue" ? commentOnIssue : commentOnPR;
+  const commentFn = type === "issue" ? commentOnIssue : commentOnPR;
   await commentFn(id, body).catch((err) => {
-    console.error(`[worker] failed to comment on ${target} #${id} about the orphaned cloud session: ${err}`);
+    console.error(`[worker] failed to comment on ${type} #${id} about the orphaned cloud session: ${err}`);
   });
 }
 async function createCloudSession(args, initialPrompt, cwd, env) {
@@ -2992,11 +2992,7 @@ 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 ? { type: cloudTarget, number: id } : void 0
-  );
+  const initialPrompt = buildCloudPrompt(prompt, model ?? "", cloudTarget);
   let result;
   let cloudSessionId;
   try {
@@ -3007,17 +3003,20 @@ async function runViaCloud(args, prompt, id, onComplete, cwd, env, cloudTarget,
       result = { status: "completed", output: createOutput };
     } else {
       const outcome = await waitForCloudTask(id, cloudTarget);
+      const { type: targetType, number: targetNumber } = cloudTarget;
       if (outcome === "completed") {
-        await removeLabel(cloudTarget, id, CLOUD_DONE_LABEL).catch((err) => {
-          console.error(`[worker] failed to remove ${CLOUD_DONE_LABEL} from ${cloudTarget} #${id}: ${err}`);
+        await removeLabel(targetType, targetNumber, CLOUD_DONE_LABEL).catch((err) => {
+          console.error(`[worker] failed to remove ${CLOUD_DONE_LABEL} from ${targetType} #${targetNumber}: ${err}`);
         });
         let reportBody = null;
         const startedAt = tasks.get(id)?.startedAt;
         if (startedAt) {
           try {
-            reportBody = await findCommentSince(id, startedAt, CLOUD_REPORT_HEADING);
+            reportBody = await findCommentSince(targetNumber, startedAt, CLOUD_REPORT_HEADING);
           } catch (err) {
-            console.error(`[worker] failed to fetch the cloud report comment for ${cloudTarget} #${id}: ${err}`);
+            console.error(
+              `[worker] failed to fetch the cloud report comment for ${targetType} #${targetNumber}: ${err}`
+            );
           }
         }
         result = {
@@ -3026,8 +3025,8 @@ async function runViaCloud(args, prompt, id, onComplete, cwd, env, cloudTarget,
 [worker] detected completion via the ${CLOUD_DONE_LABEL} label`
         };
       } else if (outcome === "timeout") {
-        await addLabel(cloudTarget, id, "cc-need-human-check").catch((err) => {
-          console.error(`[worker] failed to add cc-need-human-check to ${cloudTarget} #${id}: ${err}`);
+        await addLabel(targetType, targetNumber, "cc-need-human-check").catch((err) => {
+          console.error(`[worker] failed to add cc-need-human-check to ${targetType} #${targetNumber}: ${err}`);
         });
         result = {
           status: "failed",
@@ -3035,7 +3034,7 @@ async function runViaCloud(args, prompt, id, onComplete, cwd, env, cloudTarget,
 [worker] timed out waiting for the ${CLOUD_DONE_LABEL} label after ${CLOUD_TASK_TIMEOUT_MS / 1e3 / 60} minutes. Possible causes: the session stopped on AskUserQuestion, the cloud VM crashed, the plugin was not installed, or label assignment itself failed.`
         };
       } else {
-        await flagOrphanedCloudSession(cloudTarget, id, "shutdown", cloudSessionId);
+        await flagOrphanedCloudSession(cloudTarget, "shutdown", cloudSessionId);
         result = {
           status: "failed",
           output: `${createOutput}
@@ -3049,7 +3048,7 @@ async function runViaCloud(args, prompt, id, onComplete, cwd, env, cloudTarget,
     let orphanNote = "[worker] note: with the 1-command launch, the cloud session may already have started working independently even though this task is being reported as failed locally (orphaned session).";
     if (cloudTarget) {
       const reason = herdrAbortSignal.aborted ? "shutdown" : "session-id";
-      await flagOrphanedCloudSession(cloudTarget, id, reason, cloudSessionId);
+      await flagOrphanedCloudSession(cloudTarget, reason, cloudSessionId);
       orphanNote += " added cc-need-human-check so a human can verify whether it completed on its own.";
     }
     result = {
@@ -3985,7 +3984,7 @@ function createIssuePollingWorker(config) {
               buildClaudeEnv(mode, cloud),
               execution.prompt,
               cloud,
-              cloud ? "issue" : void 0,
+              cloud ? { type: "issue", number: issue.number } : void 0,
               model
             );
           } catch (err) {
@@ -4242,7 +4241,7 @@ function createPrPollingWorker(config) {
               buildClaudeEnv(mode, isCloud),
               execution.prompt,
               isCloud,
-              isCloud ? "pr" : void 0,
+              isCloud ? { type: "pr", number: pr.number, onBranch: true } : void 0,
               model
             );
           } catch (err) {
@@ -4715,7 +4714,7 @@ async function publishLastRunPr(workerName, defaultBranch, at) {
     writeLastRun(cwd, workerName, at);
     if (!hasLastRunChange(await git(cwd, ["status", "--porcelain", CONFIG_FILE]))) {
       console.log(`[${workerName}] lastRun unchanged, skipping PR`);
-      return;
+      return null;
     }
     await git(cwd, ["add", CONFIG_FILE]);
     await git(cwd, ["commit", "-m", lastRunPrTitle(workerName)]);
@@ -4723,7 +4722,7 @@ async function publishLastRunPr(workerName, defaultBranch, at) {
     const existing = await findOpenPrNumberByHeadRef(branch);
     if (existing !== null) {
       console.log(`[${workerName}] updated lastRun PR #${existing}`);
-      return;
+      return existing;
     }
     const prNumber = await createPullRequest(
       defaultBranch,
@@ -4733,6 +4732,7 @@ async function publishLastRunPr(workerName, defaultBranch, at) {
       { labels: [LABEL_TRIAGE_SCOPE2], assignee: await getCurrentUser() }
     );
     console.log(`[${workerName}] opened lastRun PR #${prNumber}`);
+    return prNumber;
   } finally {
     await removeWorktree(branch).catch((err) => console.error(`[${workerName}] removeWorktree failed: ${err}`));
   }
@@ -4742,6 +4742,7 @@ async function publishLastRunPr(workerName, defaultBranch, at) {
 var SCHEDULE_INTERVAL_HOURS = 24;
 var SCHEDULE_INTERVAL_MS = SCHEDULE_INTERVAL_HOURS * 60 * 60 * 1e3;
 var SCOPE_DAYS = SCHEDULE_INTERVAL_HOURS / 24;
+var LABEL_IN_PROGRESS2 = "cc-in-progress";
 function createScheduledWorker(config) {
   return async () => {
     const { owner, name: repoName, defaultBranch } = await getRepoInfo();
@@ -4775,9 +4776,23 @@ function createScheduledWorker(config) {
           permissionMode: getPermissionMode(),
           ...cloud ? { cloud: true, baseRef: defaultBranch, remoteEnvId: getRemoteEnvId() ?? "" } : {}
         });
-        await publishLastRunPr(config.name, defaultBranch, new Date(now)).catch(
-          (err) => console.error(`[${config.name}] publishLastRunPr failed: ${err}`)
-        );
+        const lastRunPr = await publishLastRunPr(config.name, defaultBranch, new Date(now)).catch((err) => {
+          console.error(`[${config.name}] publishLastRunPr failed: ${err}`);
+          return null;
+        });
+        if (cloud && lastRunPr === null) {
+          console.warn(
+            `[${config.name}] no lastRun PR to carry the cc-cloud-done label; the cloud session will be reported as completed as soon as it is created`
+          );
+        }
+        if (cloud && lastRunPr !== null) {
+          await removeLabel("pr", lastRunPr, CLOUD_DONE_LABEL).catch(
+            (err) => console.error(`[${config.name}] removeLabel ${CLOUD_DONE_LABEL} failed for PR #${lastRunPr}: ${err}`)
+          );
+          await addLabel("pr", lastRunPr, LABEL_IN_PROGRESS2).catch(
+            (err) => console.error(`[${config.name}] addLabel ${LABEL_IN_PROGRESS2} failed for PR #${lastRunPr}: ${err}`)
+          );
+        }
         let cwd;
         if (cloud) {
           console.log(`[${config.name}] cloud execution, running without worktree on ${defaultBranch}`);
@@ -4804,6 +4819,13 @@ function createScheduledWorker(config) {
             } catch (err) {
               console.error(`[${config.name}] post-task error: ${err}`);
             } finally {
+              if (cloud && lastRunPr !== null) {
+                await removeLabel("pr", lastRunPr, LABEL_IN_PROGRESS2).catch(
+                  (err) => console.error(
+                    `[${config.name}] removeLabel ${LABEL_IN_PROGRESS2} failed for PR #${lastRunPr}: ${err}`
+                  )
+                );
+              }
               if (!cloud) {
                 await removeWorktree(worktreeId).catch(
                   (err) => console.error(`[${config.name}] removeWorktree failed: ${err}`)
@@ -4815,7 +4837,7 @@ function createScheduledWorker(config) {
           buildClaudeEnv(mode, cloud),
           execution.prompt,
           cloud,
-          void 0,
+          cloud && lastRunPr !== null ? { type: "pr", number: lastRunPr } : void 0,
           model
         );
       } catch (err) {
@@ -5297,6 +5319,9 @@ var CLOUD_SETTINGS_DEFAULTS = {
   outputStyle: "Proactive",
   language: "Japanese"
 };
+var CLOUD_SETTINGS_ENV = {
+  CLAUDE_CODE_DISABLE_BACKGROUND_TASKS: "1"
+};
 function claudeSettingsPath() {
   const dir = process.env.CLAUDE_CONFIG_DIR;
   return join8(dir && dir.length > 0 ? dir : join8(homedir6(), ".claude"), "settings.json");
@@ -5312,6 +5337,11 @@ function withCloudDefaults(existing, force) {
     throw new Error("`permissions` is not an object");
   }
   const permissions = { ...current };
+  const currentEnv = settings["env"] ?? {};
+  if (typeof currentEnv !== "object" || currentEnv === null || Array.isArray(currentEnv)) {
+    throw new Error("`env` is not an object");
+  }
+  const env = { ...currentEnv };
   let changed = false;
   const set = (target, key, value) => {
     if (key in target && !force) return;
@@ -5321,8 +5351,9 @@ function withCloudDefaults(existing, force) {
   };
   set(permissions, "defaultMode", CLOUD_DEFAULT_PERMISSION_MODE);
   for (const [key, value] of Object.entries(CLOUD_SETTINGS_DEFAULTS)) set(settings, key, value);
+  for (const [key, value] of Object.entries(CLOUD_SETTINGS_ENV)) set(env, key, value);
   if (!changed) return null;
-  return `${JSON.stringify({ ...settings, permissions }, null, 2)}
+  return `${JSON.stringify({ ...settings, permissions, env }, null, 2)}
 `;
 }
 async function writeClaudeSettings(force) {
@@ -5650,9 +5681,7 @@ async function assertCloudAvailable() {
     process.exit(1);
   }
   if (cloud) {
-    console.log(
-      `[worker] cloud execution enabled (--cloud); only these workers run in the cloud: ${CLOUD_ALLOWED_WORKERS.join(", ")} (all others stay local)`
-    );
+    console.log("[worker] cloud execution enabled (--cloud); every worker started by this process runs in the cloud");
   }
 }
 async function assertRunPrerequisites() {

package/package.json

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