claude-task-worker 0.134.0 → 0.136.0

package/dist/{chunk-QN2PCVKX.js → chunk-NWYH24MB.js}

@@ -145,6 +145,22 @@ async function findPrStateByHeadRef(headRefName) {
   if (prs.length === 0) return null;
   return { number: prs[0].number, state: prs[0].state, mergedAt: prs[0].mergedAt ?? null };
 }
+async function listPrsByHeadRef(headRefName) {
+  const output = await execGh([
+    "pr",
+    "list",
+    "--state",
+    "all",
+    "--head",
+    headRefName,
+    "--json",
+    "number,state,mergedAt,headRefOid",
+    "--limit",
+    "100"
+  ]);
+  const prs = JSON.parse(output);
+  return prs.map((pr) => ({ ...pr, mergedAt: pr.mergedAt ?? null }));
+}
 async function getPrMergeable(prNumber) {
   const output = await execGh(["pr", "view", String(prNumber), "--json", "mergeable"]);
   const parsed = JSON.parse(output);
@@ -1087,6 +1103,7 @@ import { mkdirSync, renameSync, writeFileSync as writeFileSync2 } from "node:fs"
 import os from "node:os";
 import path from "node:path";
 var CLOUD_REPORT_HEADING = "## claude-task-worker \u5B9F\u884C\u7D50\u679C";
+var ORPHANED_CLOUD_SESSION_HEADING = "## \u5B64\u7ACB\u30AF\u30E9\u30A6\u30C9\u30BB\u30C3\u30B7\u30E7\u30F3\u306E\u53EF\u80FD\u6027";
 var DISALLOWED_TOOLS = [
   // 遅延 / yield: 後続ウェイクアップ前提。print モードではウェイクアップが発火せず、
   // 呼ぶと処理未完のままプロセスが終了する。
@@ -1254,13 +1271,18 @@ function buildClaudeArgs({
 function buildCloudCreateArgs(commonArgs, prompt) {
   return ["--cloud", prompt, ...commonArgs];
 }
-function appendCloudDoneInstruction(prompt, target, debug = false) {
+function appendCloudDoneInstruction(prompt, target, debug = false, startedAt) {
   const targetLabel = target.type === "issue" ? `Issue #${target.number}` : `PR #${target.number}`;
   const checkoutInstruction = buildCloudCheckoutInstruction(target);
   const worktreeInstruction = buildCloudWorktreeInstruction(prompt);
   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\u3002\u4ED8\u4E0E\u306F \`bash \${CLAUDE_PLUGIN_ROOT}/scripts/gh-compat.sh add-label ${target.number} ${CLOUD_DONE_LABEL}\` \u3067\u884C\u3044\u3001\u5931\u6557\u3057\u305F\u5834\u5408\u306E\u307F \`gh api -X POST repos/{owner}/{repo}/issues/${target.number}/labels -f "labels[]=${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**GitHub MCP \u306E \`issue_write\` / \`pull_request_write\`\uFF08method: \`update\`\uFF09\u306F\u4F7F\u308F\u306A\u3044\u3053\u3068** \u2014 \u540C\u30C4\u30FC\u30EB\u306E \`labels\` \u306F\u5168\u7F6E\u63DB\u3067\u3001\`${CLOUD_DONE_LABEL}\` \u3092\u8DB3\u3059\u3064\u3082\u308A\u306E\u547C\u3073\u51FA\u3057\u304C\u65E2\u5B58\u30E9\u30D9\u30EB\uFF08\`cc-triage-scope\` / \`cc-in-progress\` \u7B49\uFF09\u3092\u5DFB\u304D\u6DFB\u3048\u3067\u6D88\u3057\u3001\u305D\u306E Issue/PR \u304C\u30EF\u30FC\u30AB\u30FC\u306E\u30DD\u30FC\u30EA\u30F3\u30B0\u5BFE\u8C61\u304B\u3089\u5916\u308C\u308B\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");
+  const orphanInstruction = startedAt ? buildCloudOrphanCleanupInstruction(target, startedAt) : "";
+  return [prompt, checkoutInstruction, worktreeInstruction, reportInstruction, orphanInstruction, labelInstruction].filter((part) => part !== "").join("\n\n");
+}
+function buildCloudOrphanCleanupInstruction(target, startedAt) {
+  const targetLabel = target.type === "issue" ? `Issue #${target.number}` : `PR #${target.number}`;
+  return `\`${CLOUD_DONE_LABEL}\` \u3092\u4ED8\u3051\u308B\u76F4\u524D\u306B\u3001${targetLabel} \u306B \`cc-need-human-check\` \u30E9\u30D9\u30EB\u304C\u4ED8\u3044\u3066\u3044\u308B\u304B\u3092\u78BA\u8A8D\u3059\u308B\u3053\u3068\u3002\u4ED8\u3044\u3066\u3044\u3066\u3001\u304B\u3064 ${startedAt.toISOString()} \u3088\u308A\u5F8C\u306B \`${ORPHANED_CLOUD_SESSION_HEADING}\` \u3092\u898B\u51FA\u3057\u3068\u3059\u308B\u30B3\u30E1\u30F3\u30C8\u304C\u6295\u7A3F\u3055\u308C\u3066\u3044\u308B\u5834\u5408\u306F\u3001\u30EF\u30FC\u30AB\u30FC\u304C\u3053\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u306E\u5B8C\u4E86\u3092\u5F85\u305F\u305A\u306B\u505C\u6B62\u3057\u305F\u3053\u3068\u3092\u793A\u3059\u306E\u3067\u3001\`bash \${CLAUDE_PLUGIN_ROOT}/scripts/gh-compat.sh remove-label ${target.number} cc-need-human-check\` \u3067\u5916\u3059\u3053\u3068\uFF08MCP \u306E \`issue_write\` / \`pull_request_write\` \u306F\u4F7F\u308F\u306A\u3044\uFF09\u3002\u305F\u3060\u3057\u3001\u3053\u306E\u30BB\u30C3\u30B7\u30E7\u30F3\u81EA\u8EAB\u304C\u30B9\u30AD\u30EB\u306E\u624B\u9806\u3068\u3057\u3066 \`cc-need-human-check\` \u3092\u4ED8\u3051\u305F\u5834\u5408\u3001\u304A\u3088\u3073\u30BF\u30B9\u30AF\u3092\u5B8C\u9042\u3067\u304D\u306A\u304B\u3063\u305F\u5834\u5408\u306F\u5916\u3055\u306A\u3044\u3053\u3068\u3002`;
 }
 var CLOUD_WORKTREE_EXEMPT_SKILLS = ["exec-issue", "fix-review-point", "create-ui-design"];
 function buildCloudWorktreeInstruction(prompt) {
@@ -1278,7 +1300,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, debug = false) {
+function buildCloudPrompt(prompt, model, target, debug = false, startedAt) {
   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)}
@@ -1289,7 +1311,7 @@ ${buildCloudGitHubAccessInstruction()}`;
   const withPrinciples = `${prompt}
 
 ${principles}`;
-  return target ? appendCloudDoneInstruction(withPrinciples, target, debug) : withPrinciples;
+  return target ? appendCloudDoneInstruction(withPrinciples, target, debug, startedAt) : withPrinciples;
 }
 function shellQuote(value) {
   return `'${value.replace(/'/g, "'\\''")}'`;
@@ -1350,6 +1372,20 @@ async function ensureEpicBranch(epicBranch, defaultBranch) {
   await fetchRemoteTracking(epicBranch);
   await assertRemoteTrackingExists(epicBranch);
 }
+async function remoteTrackingSha(branch) {
+  const { stdout } = await execFileAsync("git", ["rev-parse", `refs/remotes/origin/${branch}`]);
+  return stdout.trim();
+}
+async function restartBranchFromBase(branch, baseBranch, expectedSha) {
+  await fetchRemoteTracking(baseBranch);
+  await execFileAsync("git", [
+    "push",
+    `--force-with-lease=refs/heads/${branch}:${expectedSha}`,
+    "origin",
+    `refs/remotes/origin/${baseBranch}:refs/heads/${branch}`
+  ]);
+  await fetchRemoteTracking(branch);
+}
 async function fetchRemoteTracking(branch) {
   await execFileAsync("git", ["fetch", "--no-prune", "origin", `+refs/heads/${branch}:refs/remotes/origin/${branch}`]);
 }
@@ -1560,24 +1596,31 @@ function ensureCloudPollLoop() {
     }
   })();
 }
+async function fetchCloudDoneNumbers() {
+  const pendingTypes = /* @__PURE__ */ new Set();
+  for (const waiter of cloudWaiters.values()) pendingTypes.add(waiter.type);
+  const doneKeys = /* @__PURE__ */ new Map();
+  for (const type of pendingTypes) {
+    try {
+      const numbers = await listNumbersWithLabel(type, CLOUD_DONE_LABEL);
+      doneKeys.set(type, new Set(numbers));
+    } catch (err) {
+      console.error(`[worker] failed to poll ${CLOUD_DONE_LABEL} for ${type}: ${err}`);
+    }
+  }
+  return doneKeys;
+}
 async function pollCloudWaiters() {
   while (cloudWaiters.size > 0) {
     if (herdrAbortSignal.aborted) {
-      for (const waiter of cloudWaiters.values()) waiter.settle("aborted");
+      const doneKeys2 = await fetchCloudDoneNumbers();
+      for (const waiter of cloudWaiters.values()) {
+        waiter.settle(doneKeys2.get(waiter.type)?.has(waiter.number) ? "completed" : "aborted");
+      }
       cloudWaiters.clear();
       break;
     }
-    const pendingTypes = /* @__PURE__ */ new Set();
-    for (const waiter of cloudWaiters.values()) pendingTypes.add(waiter.type);
-    const doneKeys = /* @__PURE__ */ new Map();
-    for (const type of pendingTypes) {
-      try {
-        const numbers = await listNumbersWithLabel(type, CLOUD_DONE_LABEL);
-        doneKeys.set(type, new Set(numbers));
-      } catch (err) {
-        console.error(`[worker] failed to poll ${CLOUD_DONE_LABEL} for ${type}: ${err}`);
-      }
-    }
+    const doneKeys = await fetchCloudDoneNumbers();
     const now = Date.now();
     for (const [key, waiter] of [...cloudWaiters.entries()]) {
       const done = doneKeys.get(waiter.type);
@@ -1614,7 +1657,7 @@ async function flagOrphanedCloudSession(target, reason, cloudSessionId) {
   });
   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";
-  const body = `## \u5B64\u7ACB\u30AF\u30E9\u30A6\u30C9\u30BB\u30C3\u30B7\u30E7\u30F3\u306E\u53EF\u80FD\u6027
+  const body = `${ORPHANED_CLOUD_SESSION_HEADING}
 
 **\u539F\u56E0**: ${causeLine}
 
@@ -1676,7 +1719,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 debug = hasDebugFlag();
-  const initialPrompt = buildCloudPrompt(prompt, model ?? "", cloudTarget, debug);
+  const initialPrompt = buildCloudPrompt(prompt, model ?? "", cloudTarget, debug, tasks.get(id)?.startedAt);
   let result;
   let cloudSessionId;
   try {
@@ -3070,6 +3113,7 @@ export {
   findOpenPrNumberByHeadRef,
   findPrNumberByHeadRef,
   findPrStateByHeadRef,
+  listPrsByHeadRef,
   getPrMergeable,
   getIssueBody,
   getIssueState,
@@ -3120,6 +3164,8 @@ export {
   buildClaudeEnv,
   syncDefaultBranch,
   ensureEpicBranch,
+  remoteTrackingSha,
+  restartBranchFromBase,
   setShuttingDown,
   isShuttingDown,
   isRunning,

package/dist/claude-args.d.ts

@@ -1,5 +1,6 @@
 import { type PermissionMode, type RunMode } from "./user-config";
 export declare const CLOUD_REPORT_HEADING = "## claude-task-worker \u5B9F\u884C\u7D50\u679C";
+export declare const ORPHANED_CLOUD_SESSION_HEADING = "## \u5B64\u7ACB\u30AF\u30E9\u30A6\u30C9\u30BB\u30C3\u30B7\u30E7\u30F3\u306E\u53EF\u80FD\u6027";
 export declare const DISALLOWED_TOOLS: readonly ["Monitor", "ScheduleWakeup", "AskUserQuestion", "EnterPlanMode", "CronCreate", "CronDelete", "CronList", "RemoteTrigger", "EnterWorktree"];
 export declare const DISALLOWED_TOOLS_ARG: string;
 export declare const CLAUDE_SPAWN_ENV: {
@@ -34,12 +35,13 @@ export interface CloudPromptTarget {
     number: number;
     onBranch?: boolean;
 }
-export declare function appendCloudDoneInstruction(prompt: string, target: CloudPromptTarget, debug?: boolean): string;
+export declare function appendCloudDoneInstruction(prompt: string, target: CloudPromptTarget, debug?: boolean, startedAt?: Date): string;
+export declare function buildCloudOrphanCleanupInstruction(target: CloudPromptTarget, startedAt: Date): string;
 export declare function buildCloudWorktreeInstruction(prompt: string): string;
 export declare function buildCloudCheckoutInstruction(target: CloudPromptTarget): string;
 export declare function buildCloudGitHubAccessInstruction(): string;
 export declare function buildCloudToolRestriction(): string;
-export declare function buildCloudPrompt(prompt: string, model: string, target?: CloudPromptTarget, debug?: boolean): string;
+export declare function buildCloudPrompt(prompt: string, model: string, target?: CloudPromptTarget, debug?: boolean, startedAt?: Date): string;
 export declare function shellQuote(value: string): string;
 export declare function buildScriptCommand(command: string, args: string[], platform?: string): {
     command: string;

package/dist/gh.d.ts

@@ -42,6 +42,10 @@ export interface PullRequestStateInfo {
     mergedAt: string | null;
 }
 export declare function findPrStateByHeadRef(headRefName: string): Promise<PullRequestStateInfo | null>;
+export interface HeadRefPr extends PullRequestStateInfo {
+    headRefOid: string;
+}
+export declare function listPrsByHeadRef(headRefName: string): Promise<HeadRefPr[]>;
 export declare function getPrMergeable(prNumber: number): Promise<string>;
 export declare function getIssueBody(issueNumber: number): Promise<string>;
 export declare function getIssueState(issueNumber: number): Promise<string>;

package/dist/git.d.ts

@@ -5,3 +5,10 @@ export declare function syncDefaultBranch(branch: string): void;
  * 完了時点で origin/<epicBranch> が必ず解決できることを保証する（できなければ throw）。
  */
 export declare function ensureEpicBranch(epicBranch: string, defaultBranch: string): Promise<void>;
+/** refs/remotes/origin/<branch> が指すコミット。 */
+export declare function remoteTrackingSha(branch: string): Promise<string>;
+/**
+ * リモートの <branch> を <baseBranch> の先端へ付け替える。呼び出し側が上書きしてよいと確かめた先端
+ * （expectedSha）から動いていれば push を拒否させ、確認後に届いたコミットを消さない。
+ */
+export declare function restartBranchFromBase(branch: string, baseBranch: string, expectedSha: string): Promise<void>;

package/dist/index.js

@@ -47,21 +47,24 @@ import {
   isWorkerEnabled,
   linkClosingPr,
   listOpenPrsByBase,
+  listPrsByHeadRef,
   listPrsClosingIssue,
   listPrsCrossReferencingIssue,
   loadConfig,
   parseClosingIssueNumbers,
   partitionEnabledWorkers,
+  remoteTrackingSha,
   removeStaleWorktrees,
   renderTable,
   resolveInheritConfigSource,
   resolveWorkerFilePath,
+  restartBranchFromBase,
   send,
   setShuttingDown,
   shutdown,
   waitForAllProcesses,
   writeLastRun
-} from "./chunk-QN2PCVKX.js";
+} from "./chunk-NWYH24MB.js";
 import {
   UserConfigError,
   assertCloudCompatibleCommand,
@@ -127,6 +130,10 @@ function classifyDesignPr(pr) {
   if (pr.state === "OPEN") return "wait";
   return "needs-human";
 }
+function shouldRestartDesignBranch(prs, tipSha) {
+  if (prs.some((pr) => pr.state === "OPEN")) return false;
+  return prs.some((pr) => (pr.state === "MERGED" || pr.mergedAt !== null) && pr.headRefOid === tipSha);
+}
 function designPrMissingComment(issueNumber) {
   return [
     "## \u30C7\u30B6\u30A4\u30F3PR\u3092\u78BA\u8A8D\u3067\u304D\u307E\u305B\u3093\uFF08\u8981\u4EBA\u624B\u78BA\u8A8D\uFF09",
@@ -165,7 +172,14 @@ function designReferenceFailureComment(heading, cause) {
     "",
     "## \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-ui-design-pr-created` \u30E9\u30D9\u30EB\u3092\u4ED8\u3051\u76F4\u3057\u3066\u304F\u3060\u3055\u3044",
-    "- \u624B\u52D5\u3067 description \u306B\u53C2\u7167\u3092\u8FFD\u8A18\u3057\u305F\u5834\u5408: `cc-need-human-check` \u30E9\u30D9\u30EB\u3092\u5916\u3057\u3001`cc-ui-design-ready` \u3068 `cc-exec-issue` \u30E9\u30D9\u30EB\u3092\u4ED8\u3051\u3066\u304F\u3060\u3055\u3044"
+    "- \u624B\u52D5\u3067 description \u306B\u53C2\u7167\u3092\u8FFD\u8A18\u3057\u305F\u5834\u5408: `cc-need-human-check` \u30E9\u30D9\u30EB\u3092\u5916\u3057\u3001`cc-ui-design-ready` \u3068 `cc-exec-issue` \u30E9\u30D9\u30EB\u3092\u4ED8\u3051\u3066\u304F\u3060\u3055\u3044\u3002\u53C2\u7167\u306F\u6B21\u306E\u5F62\u3067\u66F8\u3044\u3066\u304F\u3060\u3055\u3044\uFF08`\u30C7\u30B6\u30A4\u30F3\u30D5\u30A1\u30A4\u30EB:` \u306E\u884C\u304C\u7121\u3044\u3001\u307E\u305F\u306F\u5024\u304C `.pen` \u3067\u7D42\u308F\u3089\u306A\u3044\u3068 `exec-issue` \u304C\u6B62\u307E\u308A\u307E\u3059\uFF09",
+    "",
+    "```markdown",
+    DESIGN_REFERENCE_HEADING,
+    "",
+    "- \u30C7\u30B6\u30A4\u30F3\u30D5\u30A1\u30A4\u30EB: `<.pen \u306E\u30D1\u30B9>`",
+    "- \u30C7\u30B6\u30A4\u30F3PR: #<\u30C7\u30B6\u30A4\u30F3PR\u756A\u53F7>\uFF08\u30DE\u30FC\u30B8\u6E08\u307F\uFF09",
+    "```"
   ].join("\n");
 }
 function designReferenceMissingComment(issueNumber) {
@@ -474,10 +488,18 @@ var createUiDesignWorker = defineWorker({
       triggerLabels: ["cc-create-ui-design"],
       excludeLabels: ["cc-ui-design-pr-created", "cc-ui-design-ready", "cc-exec-issue", "cc-pr-created"],
       // セッションの作業ブランチをスキルの固定ブランチに揃え、デザインPRの作り直しを不要にする。
-      // 既にある場合（デザインのやり直し）は作り直さず、スキルのフェーズ4と同じく既存先端から始める。
+      // 既にある場合は既存先端から始めるが、先端が前回ラウンドでマージ済みのままならベースから作り直す
+      // （スキルのフェーズ4と同じ判断。クラウドではセッションが最初からこのブランチ上にいるため、ここで揃える）。
       cloudOnBranch: async (issue, baseBranch) => {
         const branch = designBranchName(issue.number);
         await ensureEpicBranch(branch, baseBranch);
+        const [prs, tip] = await Promise.all([listPrsByHeadRef(branch), remoteTrackingSha(branch)]);
+        if (shouldRestartDesignBranch(prs, tip)) {
+          await restartBranchFromBase(branch, baseBranch, tip);
+          console.log(
+            `[create-ui-design] #${issue.number}: ${branch} was already merged, restarted it from ${baseBranch}`
+          );
+        }
         return branch;
       },
       onCompleted: async (issueNumber, _worktreeId, _output, ctx) => {

package/dist/lib.js

@@ -55,7 +55,7 @@ import {
   removeWorktreeByBranch,
   run,
   syncDefaultBranch
-} from "./chunk-QN2PCVKX.js";
+} from "./chunk-NWYH24MB.js";
 import {
   getPermissionMode,
   getRunMode,

package/dist/workers/ui-design.d.ts

@@ -8,6 +8,11 @@ export declare function classifyDesignPr(pr: {
     state: string;
     mergedAt: string | null;
 } | null): DesignPrDisposition;
+export declare function shouldRestartDesignBranch(prs: {
+    state: string;
+    mergedAt: string | null;
+    headRefOid: string;
+}[], tipSha: string): boolean;
 export declare function designPrMissingComment(issueNumber: number): string;
 export declare function designPrNotCreatedComment(issueNumber: number): string;
 export declare function designReferenceMissingComment(issueNumber: number): string;

package/package.json

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