create-claude-workspace 2.3.15 → 2.3.16

package/dist/scheduler/loop.mjs

@@ -905,10 +905,6 @@ const PR_MAX_POLL_TIME = 30 * 60_000;
 async function pollAndMergePR(task, pipeline, branch, platform, projectDir, worktreePath, agents, deps) {
     const { pool, logger, state, onMessage, onSpawnStart, onSpawnEnd } = deps;
     const startTime = Date.now();
-    let lastSeenCIStatus = 'none'; // Track CI transitions to detect stale status
-    // Initial wait — give CI time to pick up the new push
-    logger.info(`[${task.id}] Waiting for CI pipeline to start...`);
-    await sleep(PR_POLL_INTERVAL);
     while (Date.now() - startTime < PR_MAX_POLL_TIME) {
         const prStatus = getPRStatus(projectDir, platform, branch);
         if (prStatus.status === 'merged')
@@ -918,37 +914,22 @@ async function pollAndMergePR(task, pipeline, branch, platform, projectDir, work
         // Ready to merge — CI passed and mergeable
         if (prStatus.mergeable) {
             logger.info(`[${task.id}] PR mergeable — merging`);
-            const merged = mergePR(projectDir, platform, prStatus.number);
-            return merged;
+            return mergePR(projectDir, platform, prStatus.number);
         }
-        // CI still running or not started — wait
+        // CI still running or not started — poll
         if (prStatus.ciStatus === 'pending' || prStatus.ciStatus === 'not-found') {
-            if (prStatus.ciStatus !== lastSeenCIStatus) {
-                logger.info(`[${task.id}] CI: ${prStatus.ciStatus} — waiting...`);
-                lastSeenCIStatus = prStatus.ciStatus;
-            }
+            logger.info(`[${task.id}] CI: ${prStatus.ciStatus} — polling...`);
             await sleep(PR_POLL_INTERVAL);
             continue;
         }
-        // CI passed but not mergeable (needs approval, merge checks, etc.)
+        // CI passed but not mergeable (needs approval, merge checks, etc.) — poll
         if (prStatus.ciStatus === 'passed' && !prStatus.mergeable) {
-            if (lastSeenCIStatus !== 'passed-not-mergeable') {
-                logger.info(`[${task.id}] CI passed but not mergeable — waiting for approval or checks`);
-                lastSeenCIStatus = 'passed-not-mergeable';
-            }
+            logger.info(`[${task.id}] CI passed, not yet mergeable — polling...`);
             await sleep(PR_POLL_INTERVAL);
             continue;
         }
         // CI failed — delegate to implementing agent to fix
         if (prStatus.ciStatus === 'failed') {
-            // Avoid re-fixing if we just pushed and the old pipeline result is stale
-            if (lastSeenCIStatus === 'fix-pushed') {
-                // We just pushed a fix — wait for new pipeline to start
-                logger.info(`[${task.id}] Waiting for new CI pipeline after fix push...`);
-                lastSeenCIStatus = 'pending-after-fix';
-                await sleep(PR_POLL_INTERVAL * 2); // Extra wait for new pipeline
-                continue;
-            }
             if (pipeline.ciFixes >= MAX_CI_FIXES) {
                 logger.error(`[${task.id}] CI fix limit (${MAX_CI_FIXES}) reached — giving up`);
                 return false;
@@ -966,13 +947,13 @@ async function pollAndMergePR(task, pipeline, branch, platform, projectDir, work
                 const sha = commitInWorktree(worktreePath, `fix: CI failure for ${task.title}`);
                 if (sha) {
                     forcePushWorktree(worktreePath);
-                    lastSeenCIStatus = 'fix-pushed';
-                    logger.info(`[${task.id}] Fix pushed — waiting for new CI pipeline`);
-                    await sleep(PR_POLL_INTERVAL * 2); // Wait for new pipeline to start
+                    logger.info(`[${task.id}] Fix pushed — polling for new CI pipeline`);
+                    // Poll until CI status changes from 'failed' (= new pipeline picked up)
+                    await waitForCIRefresh(task.id, projectDir, platform, branch, logger);
                     continue;
                 }
             }
-            // Fix didn't produce changes or failed — wait and retry
+            // Fix didn't produce changes — poll and let next iteration re-evaluate
             await sleep(PR_POLL_INTERVAL);
             continue;
         }
@@ -994,8 +975,9 @@ async function pollAndMergePR(task, pipeline, branch, platform, projectDir, work
                 const sha = commitInWorktree(worktreePath, 'fix: address PR review comments');
                 if (sha) {
                     forcePushWorktree(worktreePath);
-                    lastSeenCIStatus = 'fix-pushed';
                     appendEvent(projectDir, createEvent('pr_comment_resolved', { taskId: task.id, detail: `${unresolved.length} comments` }));
+                    await waitForCIRefresh(task.id, projectDir, platform, branch, logger);
+                    continue;
                 }
             }
             await sleep(PR_POLL_INTERVAL);
@@ -1006,6 +988,24 @@ async function pollAndMergePR(task, pipeline, branch, platform, projectDir, work
     logger.warn(`[${task.id}] PR poll timeout (${PR_MAX_POLL_TIME / 60_000}min)`);
     return false;
 }
+/** Poll until CI status is no longer the previous 'failed' (= new pipeline started) */
+async function waitForCIRefresh(taskId, projectDir, platform, branch, logger) {
+    const maxWait = 5 * 60_000; // 5 min max to wait for new pipeline
+    const start = Date.now();
+    while (Date.now() - start < maxWait) {
+        await sleep(PR_POLL_INTERVAL);
+        try {
+            const status = getPRStatus(projectDir, platform, branch);
+            if (status.ciStatus !== 'failed') {
+                logger.info(`[${taskId}] New CI pipeline detected: ${status.ciStatus}`);
+                return;
+            }
+            logger.info(`[${taskId}] CI still shows previous failure — polling...`);
+        }
+        catch { /* ignore */ }
+    }
+    logger.warn(`[${taskId}] Timed out waiting for new CI pipeline`);
+}
 function buildPRBody(task, pipeline) {
     const lines = [
         `## Summary`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-claude-workspace",
-  "version": "2.3.15",
+  "version": "2.3.16",
   "author": "",
   "repository": {
     "type": "git",