canopycms 0.0.60 → 0.0.61-int.74

package/dist/api/admin.js

@@ -0,0 +1,338 @@
+/**
+ * Admin observability endpoints: task queue stats/listing and worker
+ * liveness (PR-A1), plus task recovery actions — retry a failed task or
+ * delete a stuck/corrupt task file (PR-A2) — for an admin-only dashboard.
+ * Branch-health scan + purge/repair actions (PR-A3) live in
+ * admin-branch-health.ts and are merged into ADMIN_ROUTES below.
+ */
+import fs from 'node:fs/promises';
+import path from 'node:path';
+import { z } from 'zod';
+import { getQueueStats, listTasks, listCorruptTaskFiles, requeueFailedTask, } from '../worker/task-queue.js';
+import { getTaskQueueDir } from '../worker/task-queue-config.js';
+import { WORKER_STATUS_FILE } from '../worker/worker-status.js';
+import { defineEndpoint } from './route-builder.js';
+import { getErrorMessage, isNotFoundError } from '../utils/error.js';
+import { ADMIN_BRANCH_HEALTH_ROUTES } from './admin-branch-health.js';
+// ============================================================================
+// Worker lock liveness
+// ============================================================================
+/**
+ * 60_000 = DEFAULT_LOCK_STALE_MS in worker/cms-worker.ts, hardcoded here
+ * rather than imported/threaded through config: an adopter overriding
+ * `lockStaleMs` on their worker will skew this classification (documented
+ * limitation — the observability endpoint doesn't know the worker's actual
+ * config). +90_000 absorbs the EFS/NFS attribute-cache staleness window: a
+ * freshly-refreshed heartbeat can still appear up to ~60s old to a reader on
+ * a different host, since NFS clients cache file attributes.
+ */
+const LIVENESS_THRESHOLD_MS = 60_000 + 90_000;
+const DEFAULT_ADMIN_TASKS_LIMIT = 50;
+const MAX_ADMIN_TASKS_LIMIT = 200;
+/** Classify worker liveness from the `.worker-lock` directory's mtime. */
+async function classifyWorkerLiveness(taskDir) {
+    const lockPath = path.join(taskDir, '.worker-lock');
+    let stat;
+    try {
+        stat = await fs.stat(lockPath);
+    }
+    catch (err) {
+        if (isNotFoundError(err))
+            return { state: 'absent' };
+        throw err;
+    }
+    // Clamped like getOldestPendingAgeMs below: filesystem mtime precision/
+    // rounding (observed on APFS) can put mtimeMs a fraction of a millisecond
+    // ahead of a Date.now() sampled immediately afterward, which would
+    // otherwise report a nonsensical negative age.
+    const lockAgeMs = Math.max(0, Date.now() - stat.mtimeMs);
+    return {
+        state: lockAgeMs < LIVENESS_THRESHOLD_MS ? 'alive' : 'stale',
+        lockMtime: stat.mtime.toISOString(),
+        lockAgeMs,
+    };
+}
+/** Read + parse worker-status.json (written by the worker daemon, PR-W1). */
+async function readWorkerStatus(taskDir) {
+    const statusPath = path.join(taskDir, WORKER_STATUS_FILE);
+    let content;
+    try {
+        content = await fs.readFile(statusPath, 'utf-8');
+    }
+    catch (err) {
+        if (isNotFoundError(err))
+            return { workerStatus: null };
+        return { workerStatus: null, statusReadError: getErrorMessage(err) };
+    }
+    try {
+        // Trust boundary: this file is written only by the CMS worker daemon
+        // (PR-W1), never derived from request input — cast rather than
+        // runtime-validate every field.
+        const parsed = JSON.parse(content);
+        return { workerStatus: parsed };
+    }
+    catch (err) {
+        return { workerStatus: null, statusReadError: getErrorMessage(err) };
+    }
+}
+/** Age (ms) of the oldest file in pending/, or undefined if empty/missing. */
+async function getOldestPendingAgeMs(taskDir) {
+    const pendingDir = path.join(taskDir, 'pending');
+    let files;
+    try {
+        files = await fs.readdir(pendingDir);
+    }
+    catch (err) {
+        if (isNotFoundError(err))
+            return undefined;
+        throw err;
+    }
+    let oldestMtimeMs;
+    for (const fileName of files.filter((f) => f.endsWith('.json'))) {
+        try {
+            const stat = await fs.stat(path.join(pendingDir, fileName));
+            if (oldestMtimeMs === undefined || stat.mtimeMs < oldestMtimeMs) {
+                oldestMtimeMs = stat.mtimeMs;
+            }
+        }
+        catch (err) {
+            if (isNotFoundError(err))
+                continue;
+            throw err;
+        }
+    }
+    return oldestMtimeMs === undefined ? undefined : Math.max(0, Date.now() - oldestMtimeMs);
+}
+// ============================================================================
+// Zod Schemas for Validation
+// ============================================================================
+const adminTaskStatusSchema = z.enum(['pending', 'processing', 'completed', 'failed', 'corrupt']);
+const listAdminTasksParamsSchema = z.object({
+    status: adminTaskStatusSchema,
+    // GET query params arrive as strings — coerce instead of rejecting them
+    // (consistent with api/entries.ts's listEntriesParamsSchema).
+    limit: z.coerce.number().int().min(1).max(MAX_ADMIN_TASKS_LIMIT).optional(),
+});
+// Task ids are crypto.randomUUID() output — keep the regex conservative (no
+// dots/slashes) rather than trying to validate exact UUID shape.
+const retryTaskParamsSchema = z.object({
+    taskId: z.string().regex(/^[A-Za-z0-9-]{1,80}$/),
+});
+// processing/ and completed/ are deliberately excluded: processing/ is
+// worker-owned (deleting there races completeTask's read-then-unlink), and
+// completed/ is retained history, not a recovery target.
+const deletableTaskStatusSchema = z.enum(['pending', 'failed', 'corrupt']);
+const deleteTaskParamsSchema = z.object({
+    status: deletableTaskStatusSchema,
+    fileName: z
+        .string()
+        .regex(/^[A-Za-z0-9._-]{1,120}\.json$/)
+        .refine((v) => !v.includes('..'), { message: 'fileName must not contain ..' }),
+});
+// ============================================================================
+// Handlers
+// ============================================================================
+const getAdminStatusHandler = async (_gc, ctx, _req) => {
+    const taskDir = getTaskQueueDir(ctx.services.config);
+    try {
+        const [queueStats, oldestPendingAgeMs, worker, { workerStatus, statusReadError }] = await Promise.all([
+            getQueueStats(taskDir),
+            getOldestPendingAgeMs(taskDir),
+            classifyWorkerLiveness(taskDir),
+            readWorkerStatus(taskDir),
+        ]);
+        return {
+            ok: true,
+            status: 200,
+            data: {
+                generatedAt: new Date().toISOString(),
+                mode: ctx.services.config.mode,
+                queue: {
+                    ...queueStats,
+                    ...(oldestPendingAgeMs !== undefined ? { oldestPendingAgeMs } : {}),
+                },
+                worker,
+                workerStatus,
+                ...(statusReadError ? { statusReadError } : {}),
+            },
+        };
+    }
+    catch (err) {
+        return { ok: false, status: 500, error: getErrorMessage(err) };
+    }
+};
+const listAdminTasksHandler = async (_gc, ctx, _req, params) => {
+    const taskDir = getTaskQueueDir(ctx.services.config);
+    const limit = params.limit ?? DEFAULT_ADMIN_TASKS_LIMIT;
+    try {
+        if (params.status === 'corrupt') {
+            return {
+                ok: true,
+                status: 200,
+                data: { corruptFiles: await listCorruptTaskFiles(taskDir, limit) },
+            };
+        }
+        return {
+            ok: true,
+            status: 200,
+            data: { tasks: await listTasks(taskDir, params.status, limit) },
+        };
+    }
+    catch (err) {
+        return { ok: false, status: 500, error: getErrorMessage(err) };
+    }
+};
+/**
+ * Requeue a permanently-failed task as a brand-new pending task (see
+ * `requeueFailedTask` for why the ID must be fresh, not reused).
+ *
+ * Accepted races (surfaced in the admin UI's confirm modal): retrying may
+ * duplicate work if two admins race each other on the same failed task —
+ * task actions are idempotent-or-benign by design, so a duplicate run is
+ * expected to be harmless rather than prevented.
+ */
+const retryTaskHandler = async (_gc, ctx, _req, params) => {
+    const taskDir = getTaskQueueDir(ctx.services.config);
+    try {
+        const result = await requeueFailedTask(taskDir, params.taskId);
+        if ('error' in result) {
+            if (result.error === 'not-found') {
+                return { ok: false, status: 404, error: 'Task not found in failed/' };
+            }
+            return {
+                ok: false,
+                status: 409,
+                error: 'Failed task file is unparseable; delete it instead of retrying',
+            };
+        }
+        return { ok: true, status: 200, data: { newTaskId: result.newTaskId } };
+    }
+    catch (err) {
+        return { ok: false, status: 500, error: getErrorMessage(err) };
+    }
+};
+/**
+ * Delete a task file from pending/, failed/, or corrupt/. processing/ and
+ * completed/ are not reachable here (see `deletableTaskStatusSchema`).
+ *
+ * Accepted races (surfaced in the admin UI's confirm modal): deleting from
+ * pending/ does not guarantee the task never runs — the worker may have
+ * already dequeued it, and if this unlink lands mid-dequeue (after the
+ * worker's processing/ copy is written but before it unlinks the pending
+ * source) the pending file is simply gone and the processing/ copy proceeds
+ * normally; if instead the unlink races a copy that gets orphaned, that
+ * orphan resurrects as a fresh pending task at the next worker restart via
+ * `recoverOrphanedTasks`. Task actions are idempotent-or-benign by design,
+ * so a task that ends up running anyway is not a correctness problem.
+ */
+const deleteTaskHandler = async (_gc, ctx, _req, params) => {
+    const taskDir = getTaskQueueDir(ctx.services.config);
+    const dir = path.join(taskDir, params.status);
+    const resolvedDir = path.resolve(dir);
+    const filePath = path.resolve(dir, params.fileName);
+    const dirWithSep = resolvedDir.endsWith(path.sep) ? resolvedDir : resolvedDir + path.sep;
+    // Belt-and-suspenders on top of the regex: guards against the resolved
+    // path escaping the status directory (matches LocalAssetStore.resolveKey's
+    // pattern in assets/store-local.ts).
+    if (!filePath.startsWith(dirWithSep)) {
+        return { ok: false, status: 400, error: 'Invalid task file name' };
+    }
+    try {
+        await fs.unlink(filePath);
+        return { ok: true, status: 200, data: { deleted: true } };
+    }
+    catch (err) {
+        if (isNotFoundError(err)) {
+            return { ok: false, status: 404, error: 'Task file not found' };
+        }
+        return { ok: false, status: 500, error: getErrorMessage(err) };
+    }
+};
+// ============================================================================
+// Route Definitions with defineEndpoint
+// ============================================================================
+/**
+ * Task queue stats + worker liveness snapshot
+ * GET /admin/status
+ */
+const getAdminStatus = defineEndpoint({
+    namespace: 'admin',
+    name: 'status',
+    method: 'GET',
+    path: '/admin/status',
+    responseType: 'AdminStatusResponse',
+    response: {},
+    defaultMockData: {
+        generatedAt: '2024-01-01T00:00:00.000Z',
+        mode: 'prod',
+        queue: { pending: 0, processing: 0, completed: 0, failed: 0, corrupt: 0 },
+        worker: { state: 'absent' },
+        workerStatus: null,
+    },
+    guards: ['admin'],
+    handler: getAdminStatusHandler,
+});
+/**
+ * List task files for a given status (or quarantined corrupt/ files)
+ * GET /admin/tasks/:status
+ */
+const listAdminTasks = defineEndpoint({
+    namespace: 'admin',
+    name: 'listTasks',
+    method: 'GET',
+    path: '/admin/tasks/:status',
+    params: listAdminTasksParamsSchema,
+    responseType: 'AdminTasksResponse',
+    response: {},
+    defaultMockData: { tasks: [] },
+    guards: ['admin'],
+    handler: listAdminTasksHandler,
+});
+/**
+ * Requeue a failed task as a fresh pending task
+ * POST /admin/tasks/:taskId/retry
+ */
+const retryTask = defineEndpoint({
+    namespace: 'admin',
+    name: 'retryTask',
+    method: 'POST',
+    path: '/admin/tasks/:taskId/retry',
+    params: retryTaskParamsSchema,
+    responseType: 'AdminRetryTaskResponse',
+    response: {},
+    defaultMockData: { newTaskId: '00000000-0000-0000-0000-000000000000' },
+    guards: ['admin'],
+    handler: retryTaskHandler,
+});
+/**
+ * Delete a task file from pending/, failed/, or corrupt/
+ * DELETE /admin/tasks/:status/:fileName
+ */
+const deleteTask = defineEndpoint({
+    namespace: 'admin',
+    name: 'deleteTask',
+    method: 'DELETE',
+    path: '/admin/tasks/:status/:fileName',
+    params: deleteTaskParamsSchema,
+    responseType: 'AdminDeleteTaskResponse',
+    response: {},
+    defaultMockData: { deleted: true },
+    guards: ['admin'],
+    handler: deleteTaskHandler,
+});
+/**
+ * Exported routes for router registration.
+ *
+ * Branch-health scan + purge/repair (PR-A3) live in admin-branch-health.ts
+ * (kept out of this file to stay under its size budget) and are merged in
+ * here so the router (http/router.ts) and generate-client.ts keep a single
+ * `ADMIN_ROUTES` import.
+ */
+export const ADMIN_ROUTES = {
+    status: getAdminStatus,
+    listTasks: listAdminTasks,
+    retryTask,
+    deleteTask,
+    ...ADMIN_BRANCH_HEALTH_ROUTES,
+};
+//# sourceMappingURL=admin.js.map

package/dist/api/admin.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"admin.js","sourceRoot":"","sources":["../../src/api/admin.ts"],"names":[],"mappings":"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"}

package/dist/api/assets.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../src/api/assets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,KAAK,EAA0B,WAAW,EAAE,MAAM,SAAS,CAAA;AAElE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAErD,OAAO,KAAK,EAAE,SAAS,EAAc,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAQhF,6EAA6E;AAC7E,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAA;AAoBrD,uCAAuC;AACvC,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC;IAAE,MAAM,EAAE,WAAW,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAAA;AAE5F,6CAA6C;AAC7C,MAAM,MAAM,oBAAoB,GAAG,WAAW,CAAC;IAAE,MAAM,EAAE,kBAAkB,CAAA;CAAE,CAAC,CAAA;AAE9E,iEAAiE;AACjE,MAAM,MAAM,qBAAqB,GAAG,WAAW,CAAC;IAAE,KAAK,EAAE,WAAW,CAAA;CAAE,CAAC,CAAA;AAEvE,0CAA0C;AAC1C,MAAM,MAAM,mBAAmB,GAAG,WAAW,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAAA;AAQnE,QAAA,MAAM,sBAAsB;;;;;;;;;;;;EAI1B,CAAA;AACF,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAA;AAErE,QAAA,MAAM,uBAAuB;;;;;;;;;EAG3B,CAAA;AACF,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAA;AAEvE;;;;;GAKG;AACH,QAAA,MAAM,sBAAsB;;;;;;;;;EAG1B,CAAA;AACF,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAA;AAOrE,QAAA,MAAM,uBAAuB;;;;;;EAAkC,CAAA;AAC/D,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAA;AA6ZvE;;GAEG;AACH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAMf,CAAA;AAEV;;;GAGG;AACH,eAAO,MAAM,aAAa,EAAE,eAI3B,CAAA"}
+{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../src/api/assets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,KAAK,EAA0B,WAAW,EAAE,MAAM,SAAS,CAAA;AAElE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAErD,OAAO,KAAK,EAAE,SAAS,EAAc,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAQhF,6EAA6E;AAC7E,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAA;AAoBrD,uCAAuC;AACvC,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC;IAAE,MAAM,EAAE,WAAW,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAAA;AAE5F,6CAA6C;AAC7C,MAAM,MAAM,oBAAoB,GAAG,WAAW,CAAC;IAAE,MAAM,EAAE,kBAAkB,CAAA;CAAE,CAAC,CAAA;AAE9E,iEAAiE;AACjE,MAAM,MAAM,qBAAqB,GAAG,WAAW,CAAC;IAAE,KAAK,EAAE,WAAW,CAAA;CAAE,CAAC,CAAA;AAEvE,0CAA0C;AAC1C,MAAM,MAAM,mBAAmB,GAAG,WAAW,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAAA;AAQnE,QAAA,MAAM,sBAAsB;;;;;;;;;;;;EAI1B,CAAA;AACF,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAA;AAErE,QAAA,MAAM,uBAAuB;;;;;;;;;EAG3B,CAAA;AACF,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAA;AAEvE;;;;;GAKG;AACH,QAAA,MAAM,sBAAsB;;;;;;;;;EAG1B,CAAA;AACF,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAA;AAOrE,QAAA,MAAM,uBAAuB;;;;;;EAAkC,CAAA;AAC/D,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAA;AAiavE;;GAEG;AACH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAMf,CAAA;AAEV;;;GAGG;AACH,eAAO,MAAM,aAAa,EAAE,eAI3B,CAAA"}

package/dist/api/assets.js

@@ -307,6 +307,10 @@ const rawAssetHandler = async (ctx, _req, params) => {
 // ============================================================================
 // Route Definitions with defineEndpoint
 // ============================================================================
+//
+// Deliberately no 'writableBranch' guard on any endpoint below: none take a
+// :branch param -- the asset store is branch-agnostic (a single global store,
+// see assets/factory.ts), so the protected-base-branch predicate doesn't apply.
 /**
  * POST /assets/presign
  */

package/dist/api/assets.js.map

@@ -1 +1 @@
-{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../src/api/assets.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../src/api/assets.ts"],"names":[],"mappings":"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"}

package/dist/api/branch-merge.d.ts

@@ -13,6 +13,12 @@ export type BranchMergeResponse = ApiResponse<{
 /**
  * Mark a branch as merged and archived after PR is merged on GitHub
  * POST /:branch/mark-merged
+ *
+ * Deliberately no 'submittableBranch' guard: needs no new guard because the
+ * handler above already requires status === 'submitted' AND a recorded
+ * pullRequestNumber, both unreachable for the base branch once the submit
+ * guard lands (and a deployed instance's stranded main has no PR number, so
+ * it's refused there too).
  */
 export declare const markAsMerged: import("./route-builder").RouteDefinition<z.ZodObject<{
     branch: z.ZodType<import("../paths").BranchName, z.ZodTypeDef, import("../paths").BranchName>;

package/dist/api/branch-merge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"branch-merge.d.ts","sourceRoot":"","sources":["../../src/api/branch-merge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,KAAK,EAA0B,WAAW,EAAE,MAAM,SAAS,CAAA;AASlE,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAA;CACf;AAED,gDAAgD;AAChD,MAAM,MAAM,mBAAmB,GAAG,WAAW,CAAC;IAC5C,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAA;CACzC,CAAC,CAAA;AA2EF;;;GAGG;AACH,eAAO,MAAM,YAAY;;;;;;;;;;mCAWvB,CAAA"}
+{"version":3,"file":"branch-merge.d.ts","sourceRoot":"","sources":["../../src/api/branch-merge.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,KAAK,EAA0B,WAAW,EAAE,MAAM,SAAS,CAAA;AASlE,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,MAAM,CAAA;CACf;AAED,gDAAgD;AAChD,MAAM,MAAM,mBAAmB,GAAG,WAAW,CAAC;IAC5C,MAAM,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAA;CACzC,CAAC,CAAA;AA+EF;;;;;;;;;GASG;AACH,eAAO,MAAM,YAAY;;;;;;;;;;mCAWvB,CAAA"}

package/dist/api/branch-merge.js

@@ -8,12 +8,16 @@ const markAsMergedParamsSchema = z.object({
 const markAsMergedHandler = async (gc, ctx, _req, params) => {
     const { branchContext } = gc;
     const { branch: branchName } = params;
-    // Verify branch is submitted with a PR
-    if (branchContext.branch.status !== 'submitted') {
+    // Verify branch is submitted or approved with a PR. Approved is included
+    // because the worker's merge-poll (pollMergeState) archives merged PRs
+    // from either state — the manual fallback must reach everything the
+    // automatic path does (worker down, PR merged then branch deleted on
+    // GitHub before the poll, dev mode).
+    if (branchContext.branch.status !== 'submitted' && branchContext.branch.status !== 'approved') {
         return {
             ok: false,
             status: 400,
-            error: `Cannot mark as merged: branch status is "${branchContext.branch.status}", expected "submitted"`,
+            error: `Cannot mark as merged: branch status is "${branchContext.branch.status}", expected "submitted" or "approved"`,
         };
     }
     if (!branchContext.branch.pullRequestNumber) {
@@ -67,6 +71,12 @@ const markAsMergedHandler = async (gc, ctx, _req, params) => {
 /**
  * Mark a branch as merged and archived after PR is merged on GitHub
  * POST /:branch/mark-merged
+ *
+ * Deliberately no 'submittableBranch' guard: needs no new guard because the
+ * handler above already requires status === 'submitted' AND a recorded
+ * pullRequestNumber, both unreachable for the base branch once the submit
+ * guard lands (and a deployed instance's stranded main has no PR number, so
+ * it's refused there too).
  */
 export const markAsMerged = defineEndpoint({
     namespace: 'workflow',

package/dist/api/branch-merge.js.map

@@ -1 +1 @@
-{"version":3,"file":"branch-merge.js","sourceRoot":"","sources":["../../src/api/branch-merge.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"branch-merge.js","sourceRoot":"","sources":["../../src/api/branch-merge.ts"],"names":[],"mappings":"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"}

package/dist/api/branch-status.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"branch-status.d.ts","sourceRoot":"","sources":["../../src/api/branch-status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAIvB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAW9C,YAAY,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AAgIzD;;GAEG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAOlB,CAAA"}
+{"version":3,"file":"branch-status.d.ts","sourceRoot":"","sources":["../../src/api/branch-status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAIvB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAW9C,YAAY,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AA8IzD;;GAEG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAOlB,CAAA"}

package/dist/api/branch-status.js

@@ -4,7 +4,7 @@ import { withdrawBranch } from './branch-withdraw.js';
 import { requestChanges, approveBranch } from './branch-review.js';
 import { markAsMerged } from './branch-merge.js';
 import { defineEndpoint } from './route-builder.js';
-import { canPerformWorkflowAction } from '../authorization/index.js';
+import { canPerformWorkflowAction, getBranchProtection } from '../authorization/index.js';
 import { syncSubmitPr } from './github-sync.js';
 import { getErrorMessage, redactCredentials, sanitizeErrorMessage } from '../utils/error.js';
 const getBranchStatusHandler = async (gc, _ctx, _req, _params) => {
@@ -13,9 +13,14 @@ const getBranchStatusHandler = async (gc, _ctx, _req, _params) => {
 };
 const submitBranchForMergeHandler = async (gc, ctx, req, _params) => {
     const { branchContext } = gc;
-    // Check if user can perform workflow actions (creator OR ACL access)
+    // Check if user can perform workflow actions (creator OR ACL access). isProtectedBranch
+    // is passed for defense-in-depth (disables the system-branch grant); the 'submittableBranch'
+    // guard above already refuses base-branch submits outright before the handler runs.
     const defaultAccess = ctx.services.config.defaultBranchAccess ?? 'deny';
-    const canSubmit = canPerformWorkflowAction(branchContext, req.user, defaultAccess);
+    const { isProtected } = getBranchProtection(ctx.services.config, branchContext.branch.name, branchContext.branch.baseBranch);
+    const canSubmit = canPerformWorkflowAction(branchContext, req.user, defaultAccess, {
+        isProtectedBranch: isProtected,
+    });
     if (!canSubmit) {
         return {
             ok: false,
@@ -51,6 +56,10 @@ const submitBranchForMergeHandler = async (gc, ctx, req, _params) => {
             pullRequestUrl: prResult.prUrl ?? branchContext.branch.pullRequestUrl,
             pullRequestNumber: prResult.prNumber ?? branchContext.branch.pullRequestNumber,
             ...(prResult.syncStatus !== undefined ? { syncStatus: prResult.syncStatus } : {}),
+            // PR-W2 (M2): the rebase loop skips submitted/approved branches, so a
+            // pre-submit rebase-failure record would otherwise stick as a stale
+            // warning through review and archive.
+            rebaseFailure: undefined,
         },
     });
     return { ok: true, status: 200, data: { branch: updated.branch } };
@@ -106,8 +115,9 @@ const submitBranchForMerge = defineEndpoint({
         },
     },
     // Branch-level access not checked here — handler uses canPerformWorkflowAction() for
-    // finer-grained authorization (creator OR ACL access).
-    guards: ['branch'],
+    // finer-grained authorization (creator OR ACL access). 'submittableBranch' blocks the
+    // base branch outright (both modes — submitting it would push straight to itself).
+    guards: ['branch', 'submittableBranch'],
     handler: submitBranchForMergeHandler,
 });
 /**

package/dist/api/branch-status.js.map

@@ -1 +1 @@
-{"version":3,"file":"branch-status.js","sourceRoot":"","sources":["../../src/api/branch-status.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"branch-status.js","sourceRoot":"","sources":["../../src/api/branch-status.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAIhD,OAAO,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAA;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;AAKzF,MAAM,sBAAsB,GAAG,KAAK,EAClC,EAAoC,EACpC,IAAgB,EAChB,IAAgB,EAChB,OAA0C,EACjB,EAAE;IAC3B,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,CAAA;IAE5B,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,aAAa,CAAC,MAAM,EAAE,EAAE,CAAA;AAC1E,CAAC,CAAA;AAED,MAAM,2BAA2B,GAAG,KAAK,EACvC,EAAoC,EACpC,GAAe,EACf,GAAe,EACf,OAA0C,EACjB,EAAE;IAC3B,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,CAAA;IAE5B,wFAAwF;IACxF,6FAA6F;IAC7F,oFAAoF;IACpF,MAAM,aAAa,GAAG,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,mBAAmB,IAAI,MAAM,CAAA;IACvE,MAAM,EAAE,WAAW,EAAE,GAAG,mBAAmB,CACzC,GAAG,CAAC,QAAQ,CAAC,MAAM,EACnB,aAAa,CAAC,MAAM,CAAC,IAAI,EACzB,aAAa,CAAC,MAAM,CAAC,UAAU,CAChC,CAAA;IACD,MAAM,SAAS,GAAG,wBAAwB,CAAC,aAAa,EAAE,GAAG,CAAC,IAAI,EAAE,aAAa,EAAE;QACjF,iBAAiB,EAAE,WAAW;KAC/B,CAAC,CAAA;IACF,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,OAAO;YACL,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,GAAG;YACX,KAAK,EAAE,qFAAqF;SAC7F,CAAA;IACH,CAAC;IAED,0BAA0B;IAC1B,IAAI,CAAC;QACH,MAAM,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAA;IAC7D,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,eAAe,CAAC,GAAG,CAAC,CAAA;QACpC,2EAA2E;QAC3E,2EAA2E;QAC3E,yEAAyE;QACzE,2EAA2E;QAC3E,OAAO,CAAC,KAAK,CACX,6CAA6C,aAAa,CAAC,UAAU,IAAI,EACzE,iBAAiB,CAAC,OAAO,CAAC,CAC3B,CAAA;QACD,OAAO;YACL,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,GAAG;YACX,KAAK,EAAE,kCAAkC,oBAAoB,CAAC,OAAO,CAAC,EAAE;SACzE,CAAA;IACH,CAAC;IAED,wEAAwE;IACxE,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,GAAG,EAAE,aAAa,CAAC,CAAA;IAEvD,0CAA0C;IAC1C,MAAM,IAAI,GAAG,4BAA4B,CAAC,aAAa,CAAC,UAAU,EAAE,aAAa,CAAC,QAAQ,CAAC,CAAA;IAC3F,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;QAC9B,MAAM,EAAE;YACN,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,IAAI;YAC/B,MAAM,EAAE,WAAW;YACnB,cAAc,EAAE,QAAQ,CAAC,KAAK,IAAI,aAAa,CAAC,MAAM,CAAC,cAAc;YACrE,iBAAiB,EAAE,QAAQ,CAAC,QAAQ,IAAI,aAAa,CAAC,MAAM,CAAC,iBAAiB;YAC9E,GAAG,CAAC,QAAQ,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACjF,sEAAsE;YACtE,oEAAoE;YACpE,sCAAsC;YACtC,aAAa,EAAE,SAAS;SACzB;KACF,CAAC,CAAA;IAEF,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,EAAE,CAAA;AACpE,CAAC,CAAA;AAED,+EAA+E;AAC/E,wCAAwC;AACxC,+EAA+E;AAE/E;;;GAGG;AACH,MAAM,eAAe,GAAG,cAAc,CAAC;IACrC,SAAS,EAAE,UAAU;IACrB,IAAI,EAAE,WAAW;IACjB,MAAM,EAAE,KAAK;IACb,IAAI,EAAE,iBAAiB;IACvB,MAAM,EAAE,iBAAiB;IACzB,YAAY,EAAE,gBAAgB;IAC9B,QAAQ,EAAE,EAAoB;IAC9B,eAAe,EAAE;QACf,MAAM,EAAE;YACN,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,EAAE;YACV,SAAS,EAAE,QAAQ;YACnB,SAAS,EAAE,YAAY;YACvB,SAAS,EAAE,YAAY;SACxB;KACF;IACD,MAAM,EAAE,CAAC,cAAc,CAAU;IACjC,OAAO,EAAE,sBAAsB;CAChC,CAAC,CAAA;AAEF;;;GAGG;AACH,MAAM,oBAAoB,GAAG,cAAc,CAAC;IAC1C,SAAS,EAAE,UAAU;IACrB,IAAI,EAAE,QAAQ;IACd,MAAM,EAAE,MAAM;IACd,IAAI,EAAE,iBAAiB;IACvB,MAAM,EAAE,iBAAiB;IACzB,YAAY,EAAE,gBAAgB;IAC9B,QAAQ,EAAE,EAAoB;IAC9B,eAAe,EAAE;QACf,MAAM,EAAE;YACN,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE,WAAW;YACnB,MAAM,EAAE,EAAE;YACV,SAAS,EAAE,QAAQ;YACnB,SAAS,EAAE,YAAY;YACvB,SAAS,EAAE,YAAY;SACxB;KACF;IACD,qFAAqF;IACrF,sFAAsF;IACtF,mFAAmF;IACnF,MAAM,EAAE,CAAC,QAAQ,EAAE,mBAAmB,CAAU;IAChD,OAAO,EAAE,2BAA2B;CACrC,CAAC,CAAA;AAEF;;GAEG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG;IAC7B,SAAS,EAAE,eAAe;IAC1B,MAAM,EAAE,oBAAoB;IAC5B,QAAQ,EAAE,cAAc;IACxB,cAAc,EAAE,cAAc;IAC9B,OAAO,EAAE,aAAa;IACtB,UAAU,EAAE,YAAY;CAChB,CAAA"}

package/dist/api/branch-withdraw.d.ts

@@ -3,6 +3,12 @@ import type { BranchResponse } from './branch';
 /**
  * Withdraw a submitted branch, converting the PR to draft and unlocking editing
  * POST /:branch/withdraw
+ *
+ * Deliberately no 'submittableBranch' guard: withdraw is the only self-serve
+ * recovery path for a base branch wrongly stuck in 'submitted' (e.g. a failed
+ * submit backstop, see services.ts submitBranch / github-sync.ts syncSubmitPr).
+ * The handler restricts it on protected branches via canPerformWorkflowAction's
+ * isProtectedBranch option instead of blocking it outright.
  */
 export declare const withdrawBranch: import("./route-builder").RouteDefinition<z.ZodObject<{
     branch: z.ZodType<import("../paths").BranchName, z.ZodTypeDef, import("../paths").BranchName>;

package/dist/api/branch-withdraw.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"branch-withdraw.d.ts","sourceRoot":"","sources":["../../src/api/branch-withdraw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAIvB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AA+D9C;;;GAGG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;8BAoBzB,CAAA"}
+{"version":3,"file":"branch-withdraw.d.ts","sourceRoot":"","sources":["../../src/api/branch-withdraw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAIvB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAyE9C;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;8BAoBzB,CAAA"}

package/dist/api/branch-withdraw.js

@@ -1,13 +1,19 @@
 import { branchParamSchema } from './validators.js';
 import { getBranchMetadataFileManager } from '../branch-metadata.js';
 import { defineEndpoint } from './route-builder.js';
-import { canPerformWorkflowAction } from '../authorization/index.js';
+import { canPerformWorkflowAction, getBranchProtection } from '../authorization/index.js';
 import { syncConvertToDraft } from './github-sync.js';
 const withdrawBranchHandler = async (gc, ctx, req, _params) => {
     const { branchContext } = gc;
-    // Check if user can perform workflow actions (creator OR ACL access)
+    // Check if user can perform workflow actions (creator OR ACL access). On the
+    // protected base branch, the system-branch grant is disabled -- withdraw is
+    // still allowed (it's the only self-serve recovery for a base branch wrongly
+    // stuck in 'submitted'), but restricted to privileged/creator/ACL users.
     const defaultAccess = ctx.services.config.defaultBranchAccess ?? 'deny';
-    const canWithdraw = canPerformWorkflowAction(branchContext, req.user, defaultAccess);
+    const { isProtected } = getBranchProtection(ctx.services.config, branchContext.branch.name, branchContext.branch.baseBranch);
+    const canWithdraw = canPerformWorkflowAction(branchContext, req.user, defaultAccess, {
+        isProtectedBranch: isProtected,
+    });
     if (!canWithdraw) {
         return {
             ok: false,
@@ -50,6 +56,12 @@ const withdrawBranchHandler = async (gc, ctx, req, _params) => {
 /**
  * Withdraw a submitted branch, converting the PR to draft and unlocking editing
  * POST /:branch/withdraw
+ *
+ * Deliberately no 'submittableBranch' guard: withdraw is the only self-serve
+ * recovery path for a base branch wrongly stuck in 'submitted' (e.g. a failed
+ * submit backstop, see services.ts submitBranch / github-sync.ts syncSubmitPr).
+ * The handler restricts it on protected branches via canPerformWorkflowAction's
+ * isProtectedBranch option instead of blocking it outright.
  */
 export const withdrawBranch = defineEndpoint({
     namespace: 'workflow',