claude-task-worker 0.134.0 → 0.135.0

package/dist/{chunk-QN2PCVKX.js → chunk-5O66VYMR.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);
@@ -1350,6 +1366,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}`]);
 }
@@ -3070,6 +3100,7 @@ export {
   findOpenPrNumberByHeadRef,
   findPrNumberByHeadRef,
   findPrStateByHeadRef,
+  listPrsByHeadRef,
   getPrMergeable,
   getIssueBody,
   getIssueState,
@@ -3120,6 +3151,8 @@ export {
   buildClaudeEnv,
   syncDefaultBranch,
   ensureEpicBranch,
+  remoteTrackingSha,
+  restartBranchFromBase,
   setShuttingDown,
   isShuttingDown,
   isRunning,

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-5O66VYMR.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-5O66VYMR.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.135.0",
   "description": "CLI tool that polls GitHub Issues/PRs and delegates work to Claude CLI",
   "type": "module",
   "main": "dist/index.js",