canopycms 0.12.0 → 0.13.0

package/dist/worker/task-runner.d.ts

@@ -15,7 +15,7 @@ import type { WorkerContext } from './worker-context.js';
  * here that reads branch metadata written by the rebase loop MUST re-read it
  * rather than trust a snapshot.
  */
-export type TaskRunnerContext = Pick<WorkerContext, 'baseBranch' | 'sanitizedBaseBranch' | 'taskDir' | 'remoteGitPath' | 'contentBranchesPath' | 'taskTimeoutMs' | 'gitSyncIntervalMs' | 'maxTasksPerCycle' | 'maxRetries' | 'log' | 'github' | 'branchWorkspacePath' | 'executeTask' | 'pushBranchToGitHub' | 'isRunning' | 'isDraining' | 'shutdownSignal' | 'ensureStatusReport'>;
+export type TaskRunnerContext = Pick<WorkerContext, 'baseBranch' | 'sanitizedBaseBranch' | 'taskDir' | 'remoteGitPath' | 'contentBranchesPath' | 'taskTimeoutMs' | 'gitSyncIntervalMs' | 'maxTasksPerCycle' | 'maxRetries' | 'log' | 'github' | 'branchWorkspacePath' | 'executeTask' | 'pushBranchToGitHub' | 'isRunning' | 'isDraining' | 'shutdownSignal' | 'ensureStatusReport' | 'requestBranchSync'>;
 /**
  * An error inherent to the task itself (malformed payload, unknown action):
  * retrying can never succeed, so the task should fail fast instead of

package/dist/worker/task-runner.js

@@ -14,7 +14,9 @@ import { pushToGitHub } from './github-transfer.js';
 import { clearHistoryRewrittenMarker, readPublishedSha } from './history-rewrite.js';
 import { writeWorkerStatus } from '../task-queue/worker-status.js';
 import { SYNC_PR_COMMENTS_ACTION, refreshCommentsBlock, renderPrCommentsBody } from '../pr-comments.js';
+import { SYNC_BRANCH_ACTION } from '../base-update.js';
 import { COMMIT_ID, REWRITTEN_PUSH_REFUSAL, SEEN_COMMIT_GONE_PUSH_REFUSAL, enqueueReviewBlockSync, } from './github-commits.js';
+import { getHttpStatus, isRateLimitSignal403 } from './github-errors.js';
 import { workerLog, workerLogError, workerLogWarn } from './log.js';
 import { assertSharedRepoConfig } from './shared-repo-git.js';
 /**
@@ -84,45 +86,6 @@ export function isPermanentTaskFailure(err) {
         return false;
     return status >= 400 && status < 500;
 }
-/** Extract an HTTP status from an error, if present (Octokit RequestError shape). */
-function getHttpStatus(err) {
-    if (err instanceof Error && 'status' in err) {
-        const status = err.status;
-        if (typeof status === 'number')
-            return status;
-    }
-    return null;
-}
-/** Narrow an unknown value to a response-headers record, if present (Octokit lowercases header names). */
-function getResponseHeaders(err) {
-    if (typeof err !== 'object' || err === null || !('response' in err))
-        return null;
-    const response = err.response;
-    if (typeof response !== 'object' || response === null || !('headers' in response))
-        return null;
-    const headers = response.headers;
-    if (typeof headers !== 'object' || headers === null)
-        return null;
-    return headers;
-}
-/**
- * Whether a 403 is a GitHub rate-limit response rather than a plain permission
- * denial. GitHub signals rate limiting on 403s three ways: the primary limit
- * zeroes `x-ratelimit-remaining`, secondary limits often carry `retry-after`,
- * and both produce a message containing "rate limit".
- */
-function isRateLimitSignal403(err) {
-    const headers = getResponseHeaders(err);
-    if (headers) {
-        if (headers['x-ratelimit-remaining'] === '0')
-            return true;
-        if (typeof headers['retry-after'] === 'string' && headers['retry-after'].length > 0)
-            return true;
-    }
-    if (err instanceof Error && /rate limit/i.test(err.message))
-        return true;
-    return false;
-}
 // Payload validation helpers — fail fast with clear errors instead of silent `as` casts
 /**
  * Whether `branch` carries the reserved settings-branch prefix, which routes a submit to a push
@@ -491,6 +454,13 @@ export async function executeTask(ctx, task, signal) {
             workerLog(`Updated the comment and review blocks of PR #${prNumber} for ${branch}`);
             return { updated: true };
         }
+        case SYNC_BRANCH_ACTION: {
+            // Only a wake-up: the git sync does the work, so the fetch, the schema gate and the locks
+            // keep one path. The request itself is recorded on branch.json, which outlives this.
+            const branch = requireString(payload, 'branch');
+            ctx.requestBranchSync(branch);
+            return { requested: true };
+        }
         default:
             throw new PermanentTaskError(`Unknown task action: ${action}`);
     }
@@ -535,11 +505,15 @@ function editorBranchOf(payload, branch) {
 /**
  * The branch whose metadata records a task's outcome, or null when none does. A
  * delete-remote-branch task names a branch already deleted here, so a workspace under that
- * name is leftover or a newer branch's that reused the name.
+ * name is leftover or a newer branch's that reused the name. A sync-branch task syncs nothing
+ * with GitHub, so recording it would clear the branch's own failed sync.
  */
 function metadataBranchOf(task) {
-    if (task.action === 'delete-remote-branch' || task.action === SYNC_PR_COMMENTS_ACTION)
+    if (task.action === 'delete-remote-branch' ||
+        task.action === SYNC_PR_COMMENTS_ACTION ||
+        task.action === SYNC_BRANCH_ACTION) {
         return null;
+    }
     return typeof task.payload.branch === 'string' ? task.payload.branch : null;
 }
 /**
@@ -590,6 +564,7 @@ export async function updateBranchMetadata(ctx, task, result) {
             return;
         }
         let found = false;
+        let newPullRequest = false;
         // Bookkeeping: the save that queued this already said when the branch last changed.
         await meta.update((existing) => {
             if (existing?.branch.name !== branch)
@@ -614,6 +589,7 @@ export async function updateBranchMetadata(ctx, task, result) {
             if (result.prUrl && !archived)
                 updates.pullRequestUrl = result.prUrl;
             if (result.prNumber && !archived) {
+                newPullRequest = existing.branch.pullRequestNumber !== result.prNumber;
                 updates.pullRequestNumber = result.prNumber;
                 // As soon as the PR exists the field reads 'open', rather than staying
                 // absent until the next poll cycle observes it. Exception: the git-sync
@@ -629,6 +605,9 @@ export async function updateBranchMetadata(ctx, task, result) {
         }, { keepUpdatedAt: true });
         if (!found)
             noMetadataToRecord(branch, `${task.action} outcome`);
+        // The sync its push woke may have run before the number was recorded, and skipped the branch.
+        if (newPullRequest)
+            ctx.requestBranchSync(branch);
     }
     catch (err) {
         workerLogError(`Failed to update metadata for ${branch}:`, err instanceof Error ? err.message : err);
@@ -836,6 +815,7 @@ export async function pushBranchToGitHub(ctx, branch, signal) {
         // has moved past the rewritten commit and the marker is spent.
         await clearHistoryRewrittenMarker(ctx, branchPath, branch);
         await recordPushedToGitHub(ctx, branchPath, branch, outgoingSha);
+        wakeForConflictsStatus(ctx, branch, outcome);
         logPushOutcome(ctx, branch, outcome, 'GitHub had already moved past the rewritten commit');
         return;
     }
@@ -847,8 +827,17 @@ export async function pushBranchToGitHub(ctx, branch, signal) {
         await clearHistoryRewrittenMarker(ctx, branchPath, branch);
     }
     await recordPushedToGitHub(ctx, branchPath, branch, outgoingSha);
+    wakeForConflictsStatus(ctx, branch, outcome);
     logPushOutcome(ctx, branch, outcome);
 }
+/**
+ * A pull request's new head has no conflicts status until a git sync sets one
+ * (worker/conflicts-status.ts), and a required check waits on it: wake the sync for the branch.
+ */
+function wakeForConflictsStatus(ctx, branch, outcome) {
+    if (outcome.moved && !isSettingsBranch(branch))
+        ctx.requestBranchSync(branch);
+}
 /** An unmoved ref is routine (a task re-run after a crash), so it is logged at debug level. */
 function logPushOutcome(ctx, branch, outcome, note) {
     const suffix = note === undefined ? '' : `; ${note}`;

package/dist/worker/worker-context.d.ts

@@ -111,8 +111,30 @@ export interface WorkerContext {
      */
     warnedDivergences(): Map<string, string>;
     /**
-     * Test hook: fires when the rebase has reported conflicted files and is about
-     * to `checkout --theirs` them. No-op in production.
+     * The conflicts status this worker last set on each branch's pull request head, by branch name,
+     * and the tip each `not-head:` key last woke a sync for (worker/conflicts-status.ts). Held per
+     * instance, so a restarted worker sets each once again.
+     */
+    conflictsStatusesSet(): Map<string, string>;
+    /**
+     * Run the git sync early, coalesced: once it has rested `EARLY_RUN_MIN_REST_MS` (cms-worker.ts),
+     * or its own interval if shorter, counting from when the last cycle ended, so a request during a
+     * cycle waits that long after it. `branchRef`, when given, is synced ahead of the rest. In memory only: a restart loses
+     * it, and the request recorded on the branch's branch.json still gets its answer from the next
+     * regular cycle (worker/rebase.ts).
+     */
+    requestBranchSync(branchRef?: string): void;
+    /**
+     * What was asked since the last call, which clears it: the branches, by workspace directory name,
+     * and whether anything asked at all (a request with no branch wakes the sync too).
+     */
+    takeBranchSyncRequests(): {
+        branches: Set<string>;
+        requested: boolean;
+    };
+    /**
+     * Test hook: fires when a rebase round has reported conflicted files, before
+     * the rebase is aborted for a merge. No-op in production.
      */
     afterConflictDetectedForTesting(): Promise<void>;
     /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "//": "@codemirror/language, @lezer/highlight: workaround — @mdxeditor/editor uses cm6-theme-basic-light which peer-requires these but mdxeditor doesn't declare them as dependencies",
   "name": "canopycms",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "CanopyCMS core package: schema-driven content, branch-aware editing, and editor UI for Next.js.",
   "license": "MIT",
   "repository": {