create-claude-workspace 2.3.14 → 2.3.16

package/dist/scheduler/loop.mjs

@@ -911,34 +911,57 @@ async function pollAndMergePR(task, pipeline, branch, platform, projectDir, work
             return true;
         if (prStatus.status === 'closed')
             return false;
-        // CI failed — spawn agent to fix
-        if (prStatus.ciStatus === 'failed' && pipeline.ciFixes < MAX_CI_FIXES) {
+        // Ready to merge — CI passed and mergeable
+        if (prStatus.mergeable) {
+            logger.info(`[${task.id}] PR mergeable — merging`);
+            return mergePR(projectDir, platform, prStatus.number);
+        }
+        // CI still running or not started — poll
+        if (prStatus.ciStatus === 'pending' || prStatus.ciStatus === 'not-found') {
+            logger.info(`[${task.id}] CI: ${prStatus.ciStatus} — polling...`);
+            await sleep(PR_POLL_INTERVAL);
+            continue;
+        }
+        // CI passed but not mergeable (needs approval, merge checks, etc.) — poll
+        if (prStatus.ciStatus === 'passed' && !prStatus.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') {
+            if (pipeline.ciFixes >= MAX_CI_FIXES) {
+                logger.error(`[${task.id}] CI fix limit (${MAX_CI_FIXES}) reached — giving up`);
+                return false;
+            }
             pipeline.ciFixes++;
-            logger.warn(`[${task.id}] CI failed — fix attempt ${pipeline.ciFixes}/${MAX_CI_FIXES}`);
+            logger.warn(`[${task.id}] CI failed — delegating fix to agent (attempt ${pipeline.ciFixes}/${MAX_CI_FIXES})`);
             const logs = fetchFailureLogs(branch, platform === 'github' ? 'github' : 'gitlab', projectDir);
-            if (logs) {
-                const fixResult = await spawnAgent(pool, pipeline.workerId, {
-                    agent: pipeline.assignedAgent ?? undefined,
-                    cwd: worktreePath,
-                    prompt: buildCIFixPrompt({ task, worktreePath, projectDir }, logs),
-                    model: getAgentModel(pipeline.assignedAgent, agents, task),
-                }, state, task.id, logger, onMessage, onSpawnStart, onSpawnEnd);
-                if (fixResult.success) {
-                    commitInWorktree(worktreePath, `fix: CI failure for ${task.title}`);
+            const fixResult = await spawnAgent(pool, pipeline.workerId, {
+                agent: pipeline.assignedAgent ?? undefined,
+                cwd: worktreePath,
+                prompt: buildCIFixPrompt({ task, worktreePath, projectDir }, logs ?? 'No logs available — check the CI pipeline manually'),
+                model: getAgentModel(pipeline.assignedAgent, agents, task),
+            }, state, task.id, logger, onMessage, onSpawnStart, onSpawnEnd);
+            if (fixResult.success) {
+                const sha = commitInWorktree(worktreePath, `fix: CI failure for ${task.title}`);
+                if (sha) {
                     forcePushWorktree(worktreePath);
+                    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;
                 }
             }
-            if (pipeline.ciFixes >= MAX_CI_FIXES) {
-                logger.error(`[${task.id}] CI fix limit (${MAX_CI_FIXES}) reached`);
-                return false;
-            }
+            // Fix didn't produce changes — poll and let next iteration re-evaluate
+            await sleep(PR_POLL_INTERVAL);
+            continue;
         }
         // Unresolved PR comments — spawn agent to address
         const comments = getPRComments(projectDir, platform, prStatus.number);
         const unresolved = comments.filter(c => !c.resolved);
         if (unresolved.length > 0) {
-            logger.info(`[${task.id}] ${unresolved.length} unresolved PR comments — addressing`);
+            logger.info(`[${task.id}] ${unresolved.length} unresolved PR comments — delegating to agent`);
             const commentText = unresolved
                 .map(c => `${c.path ?? 'general'}${c.line ? `:${c.line}` : ''} — ${c.author}: ${c.body}`)
                 .join('\n\n');
@@ -949,25 +972,14 @@ async function pollAndMergePR(task, pipeline, branch, platform, projectDir, work
                 model: getAgentModel(pipeline.assignedAgent, agents, task),
             }, state, task.id, logger, onMessage, onSpawnStart, onSpawnEnd);
             if (commentResult.success) {
-                commitInWorktree(worktreePath, `fix: address PR review comments`);
-                forcePushWorktree(worktreePath);
-                appendEvent(projectDir, createEvent('pr_comment_resolved', { taskId: task.id, detail: `${unresolved.length} comments` }));
-                continue;
+                const sha = commitInWorktree(worktreePath, 'fix: address PR review comments');
+                if (sha) {
+                    forcePushWorktree(worktreePath);
+                    appendEvent(projectDir, createEvent('pr_comment_resolved', { taskId: task.id, detail: `${unresolved.length} comments` }));
+                    await waitForCIRefresh(task.id, projectDir, platform, branch, logger);
+                    continue;
+                }
             }
-        }
-        // Ready to merge
-        if (prStatus.mergeable) {
-            const merged = mergePR(projectDir, platform, prStatus.number);
-            return merged;
-        }
-        // CI pending or waiting for approval — keep polling
-        if (prStatus.ciStatus === 'pending' || prStatus.ciStatus === 'not-found') {
-            await sleep(PR_POLL_INTERVAL);
-            continue;
-        }
-        // CI passed but not mergeable (needs approval?) — wait
-        if (prStatus.ciStatus === 'passed' && !prStatus.mergeable) {
-            logger.info(`[${task.id}] CI passed but not mergeable (waiting for approval?)`);
             await sleep(PR_POLL_INTERVAL);
             continue;
         }
@@ -976,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.14",
+  "version": "2.3.16",
   "author": "",
   "repository": {
     "type": "git",