canopycms 0.0.56 → 0.0.58

package/dist/api/assets.js

@@ -1,65 +1,359 @@
 import { z } from 'zod';
 import { defineEndpoint } from './route-builder.js';
+import { ASSET_PREFIXES } from '../assets/keys.js';
+import { ALLOWED_UPLOAD_CONTENT_TYPES } from '../assets/pipeline.js';
+import { finalizeStagedUpload } from '../assets/finalize.js';
+import { assetSrc } from '../assets/asset-src.js';
+import { formatDirectives, parseTransformPath } from '../assets/transform-directives.js';
+import { applyTransform } from '../assets/transform.js';
+function toAssetRecord(meta) {
+    return { ...meta, src: assetSrc(meta) };
+}
+const MOCK_ASSET_RECORD = {
+    hash32: 'a'.repeat(32),
+    filename: 'sample.png',
+    slug: 'sample',
+    ext: 'png',
+    mime: 'image/png',
+    size: 1024,
+    width: 100,
+    height: 100,
+    kind: 'raster',
+    uploadedAt: '2024-01-01T00:00:00.000Z',
+    src: '/assets/t/orig/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/sample.png',
+};
 // ============================================================================
 // Zod Schemas for Validation
 // ============================================================================
-const uploadAssetBodySchema = z.object({
-    key: z.string().min(1),
-    contentType: z.string().optional(),
-    data: z.instanceof(Buffer).or(z.instanceof(Uint8Array)),
+const filenameSchema = z.string().min(1).max(255);
+const presignAssetBodySchema = z.object({
+    filename: filenameSchema,
+    contentType: z.string().min(1),
+    size: z.number().int().positive().optional(),
+});
+const finalizeAssetBodySchema = z.object({
+    stagingKey: z.string().min(1),
+    filename: filenameSchema,
 });
 /**
- * List assets - any authenticated user can list assets.
- *
  * Declared as `params` (not just parsed ad hoc from req.query) so the client
  * generator (scripts/generate-client.ts) sees a paramsSchema and emits a
- * method that accepts and forwards `prefix` (API-H4) instead of a no-arg
- * `assets.list()` that can never pass it.
+ * method that accepts and forwards `cursor`/`limit` (API-H4) instead of a
+ * no-arg `assets.list()` that can never pass them.
  */
 const listAssetsParamsSchema = z.object({
-    prefix: z.string().optional(),
+    cursor: z.string().optional(),
+    limit: z.coerce.number().int().positive().max(100).optional(),
 });
-const listAssetsHandler = async (ctx, req) => {
+/** hash32 is a sha-256 truncated to 32 hex chars (keys.ts's `hashBytes`) - never any other shape. */
+const hash32Schema = z
+    .string()
+    .regex(/^[a-f0-9]{32}$/, 'key must be a 32-character lowercase hex string');
+const deleteAssetParamsSchema = z.object({ key: hash32Schema });
+// ============================================================================
+// Handlers
+// ============================================================================
+/**
+ * Presign a direct (or proxied) upload target. Any authenticated user - there
+ * is no finer "editor" role, and upload needs to work for every non-admin
+ * user too (see guard semantics in .claude/future-tasks/assets-media-system.md).
+ */
+const presignAssetHandler = async (ctx, _req, body) => {
     if (!ctx.assetStore)
         return { ok: false, status: 501, error: 'Asset store not configured' };
-    const query = listAssetsParamsSchema.safeParse(req.query ?? {});
-    if (!query.success) {
-        return { ok: false, status: 400, error: query.error.message };
+    if (!ALLOWED_UPLOAD_CONTENT_TYPES.has(body.contentType)) {
+        return { ok: false, status: 415, error: `Unsupported content type: ${body.contentType}` };
+    }
+    const target = await ctx.assetStore.beginUpload({
+        filename: body.filename,
+        contentType: body.contentType,
+        size: body.size,
+    });
+    // The client-declared size is only a fast, up-front UX check - the store's
+    // own presigned target (S3's content-length-range condition, or the local
+    // store's own cap) is what actually enforces the limit at upload time.
+    if (body.size !== undefined && body.size > target.maxBytes) {
+        return { ok: false, status: 413, error: `File exceeds the ${target.maxBytes}-byte limit` };
     }
-    const assets = await ctx.assetStore.list(query.data.prefix ?? '');
-    return { ok: true, status: 200, data: { assets } };
+    return { ok: true, status: 200, data: { upload: target } };
 };
 /**
- * Upload asset - requires privileged access (Admin or Reviewer).
+ * Finalize a staged upload: read the staged bytes, run the finalize pipeline
+ * (sniff/hash/dims/sanitize), write originals + meta, and return the result.
+ * Any authenticated user (same rationale as presign).
  */
-const uploadAssetHandler = async (_gc, ctx, req, body) => {
+const finalizeAssetHandler = async (ctx, req, body) => {
     if (!ctx.assetStore)
         return { ok: false, status: 501, error: 'Asset store not configured' };
-    const asset = await ctx.assetStore.upload(body.key, body.data, body.contentType);
-    return { ok: true, status: 200, data: { asset } };
+    const result = await finalizeStagedUpload(ctx.assetStore, body.stagingKey, body.filename, req.user.userId);
+    if (!result.ok) {
+        return { ok: false, status: result.status, error: result.error };
+    }
+    return { ok: true, status: 200, data: { asset: toAssetRecord(result.meta) } };
 };
 /**
- * Delete asset - requires Admin access.
- *
- * Declared as `params` (see listAssetsParamsSchema above) so the generated
- * client's `assets.delete()` method accepts and forwards `key` (API-H4).
+ * Proxied upload for stores that don't support direct-to-storage presigning
+ * (LocalAssetStore in dev). Reads a multipart/form-data body (a `file` part,
+ * plus an optional `filename` field overriding `file.name`) rather than JSON -
+ * this route sets `bodyFormat: 'multipart'` below so the core handler skips
+ * its default `req.json()` parsing, since the body stream can only be read
+ * once (see http/handler.ts). Any authenticated user (same rationale as
+ * presign/finalize).
  */
-const deleteAssetParamsSchema = z.object({ key: z.string().min(1) });
-const deleteAssetHandler = async (_gc, ctx, req) => {
+const uploadProxiedHandler = async (ctx, req) => {
     if (!ctx.assetStore)
         return { ok: false, status: 501, error: 'Asset store not configured' };
-    const deleteQuery = deleteAssetParamsSchema.safeParse(req.query ?? {});
-    if (!deleteQuery.success) {
-        return { ok: false, status: 400, error: 'key query parameter required' };
+    if (ctx.assetStore.capabilities.directUpload) {
+        return {
+            ok: false,
+            status: 400,
+            error: 'This asset store supports direct upload - use POST /assets/presign instead',
+        };
     }
-    await ctx.assetStore.delete(deleteQuery.data.key);
+    if (!req.rawRequest?.formData) {
+        return {
+            ok: false,
+            status: 400,
+            error: 'This server adapter does not support multipart form-data uploads',
+        };
+    }
+    // Early size guard from the Content-Length header, BEFORE the multipart
+    // body is ever read - `formData()`/`filePart.arrayBuffer()` below fully
+    // buffer the upload into memory, so without this an over-cap request still
+    // pays the full read cost before the (correct, but too-late) post-read
+    // check further down rejects it. `beginUpload()` is the store-agnostic way
+    // to learn "the store's max" (mirrors presignAssetHandler's own use of it)
+    // - filename/contentType are placeholders here since only `.maxBytes` is
+    // read; the real `beginUpload()` call below (with the actual filename)
+    // still runs after the body is read to build the real staging target.
+    const contentLengthHeader = req.rawRequest.header('content-length');
+    if (contentLengthHeader !== null) {
+        const contentLength = Number(contentLengthHeader);
+        if (Number.isFinite(contentLength)) {
+            const { maxBytes } = await ctx.assetStore.beginUpload({
+                filename: 'upload',
+                contentType: 'application/octet-stream',
+            });
+            if (contentLength > maxBytes) {
+                return { ok: false, status: 413, error: `File exceeds the ${maxBytes}-byte limit` };
+            }
+        }
+    }
+    let formData;
+    try {
+        formData = await req.rawRequest.formData();
+    }
+    catch {
+        return { ok: false, status: 400, error: 'Could not parse multipart form-data body' };
+    }
+    const filePart = formData.get('file');
+    if (!(filePart instanceof Blob)) {
+        return { ok: false, status: 400, error: 'A "file" part is required' };
+    }
+    const filenameOverride = formData.get('filename');
+    const filename = typeof filenameOverride === 'string' && filenameOverride.length > 0
+        ? filenameOverride
+        : filePart instanceof File
+            ? filePart.name
+            : 'upload';
+    const data = new Uint8Array(await filePart.arrayBuffer());
+    const target = await ctx.assetStore.beginUpload({
+        filename,
+        contentType: filePart.type || 'application/octet-stream',
+        size: data.byteLength,
+    });
+    // Defense-in-depth: the Content-Length guard above is the primary check
+    // (it runs before the body is buffered at all) but a missing or lying
+    // Content-Length header would skip it entirely, so the actual byte count
+    // is still re-checked here against the same store-provided bound.
+    if (data.byteLength > target.maxBytes) {
+        return { ok: false, status: 413, error: `File exceeds the ${target.maxBytes}-byte limit` };
+    }
+    await ctx.assetStore.writeStaging(target.stagingKey, data, filePart.type || undefined);
+    const result = await finalizeStagedUpload(ctx.assetStore, target.stagingKey, filename, req.user.userId);
+    if (!result.ok) {
+        return { ok: false, status: result.status, error: result.error };
+    }
+    return { ok: true, status: 200, data: { asset: toAssetRecord(result.meta) } };
+};
+/**
+ * List assets - any authenticated user can list assets (key enumeration is
+ * accepted: unlisted != private, see assets-media-system.md).
+ */
+const listAssetsHandler = async (ctx, _req, params) => {
+    if (!ctx.assetStore)
+        return { ok: false, status: 501, error: 'Asset store not configured' };
+    const { items, nextCursor } = await ctx.assetStore.listMeta({
+        cursor: params.cursor,
+        limit: params.limit,
+    });
+    return { ok: true, status: 200, data: { assets: items.map(toAssetRecord), nextCursor } };
+};
+/**
+ * Delete asset - requires Admin access. `key` is the asset's hash32 and is
+ * validated (32 lowercase hex chars) by `deleteAssetParamsSchema` before this
+ * handler ever runs. Deletes the meta sidecar only - blobs are immortal until
+ * a future GC worker task (see assets-media-system.md).
+ */
+const deleteAssetHandler = async (_gc, ctx, _req, params) => {
+    if (!ctx.assetStore)
+        return { ok: false, status: 501, error: 'Asset store not configured' };
+    await ctx.assetStore.deleteMeta(params.key);
     return { ok: true, status: 200, data: { deleted: true } };
 };
+/** Cache-Control applied to every transform output this route writes/serves - matches finalize.ts's PUBLIC_CACHE_CONTROL for static public objects. */
+const TRANSFORM_CACHE_CONTROL = 'public, max-age=31536000, immutable';
+/**
+ * Lazy dev-mode emulation of the prod transform Lambda (PR 7 reuses
+ * `parseTransformPath`/`formatDirectives`/`applyTransform` unchanged): parse
+ * the request, load the original, transform it, write the result back under
+ * its CANONICAL key (so a non-canonically-ordered directive string still
+ * dedupes with any equivalent request), then serve the bytes just computed
+ * (no re-read from the store).
+ *
+ * `key` here is the full store key already confirmed to start with the
+ * `assets/t/` prefix and to have missed the cache-hit `readPublicObject`
+ * check in `rawAssetHandler`.
+ */
+async function serveLazyTransform(assetStore, key) {
+    const rest = key.slice(ASSET_PREFIXES.transform.length + 1);
+    const parsed = parseTransformPath(rest.split('/'));
+    if (!parsed.ok) {
+        return { ok: false, status: 400, error: parsed.error };
+    }
+    const meta = await assetStore.getMeta(parsed.hash32);
+    if (!meta) {
+        return { ok: false, status: 404, error: 'Not found' };
+    }
+    if (meta.kind !== 'raster') {
+        return { ok: false, status: 400, error: 'Not a raster asset - svg/pdf are served statically' };
+    }
+    // When the URL omits an explicit `f=` format, the transform preserves the
+    // source format, so the URL's `{ext}` must match the source's real ext
+    // exactly - the parser alone can't check this (it doesn't know the source
+    // format until this meta lookup).
+    const requestedFormat = parsed.directives.identity ? undefined : parsed.directives.format;
+    if (requestedFormat === undefined && parsed.ext !== meta.ext) {
+        return { ok: false, status: 400, error: 'Extension does not match the source format' };
+    }
+    const original = await assetStore.readOriginal(parsed.hash32);
+    if (!original) {
+        return { ok: false, status: 404, error: 'Not found' };
+    }
+    const transformed = await applyTransform({ data: original.data, ext: original.ext }, parsed.directives);
+    if (!transformed.ok) {
+        return { ok: false, status: 502, error: transformed.error };
+    }
+    const canonicalKey = `${ASSET_PREFIXES.transform}/${formatDirectives(parsed.directives)}/${parsed.hash32}/${parsed.slug}.${parsed.ext}`;
+    await assetStore.putPublicObject({
+        key: canonicalKey,
+        data: transformed.data,
+        contentType: transformed.contentType,
+        cacheControl: TRANSFORM_CACHE_CONTROL,
+    });
+    return {
+        kind: 'binary',
+        status: 200,
+        body: transformed.data,
+        headers: { contentType: transformed.contentType, cacheControl: TRANSFORM_CACHE_CONTROL },
+    };
+}
+/**
+ * Serve a public asset object (sanitized svg/pdf finalize wrote, or a
+ * previously-computed transform output) for dev-mode `/assets/*` rewrites.
+ * Hand-built (not `defineEndpoint`) rather than registered in
+ * `ASSET_ROUTES`/the client generator: this route returns raw bytes
+ * (`CanopyBinaryResponse`), not a JSON envelope, so a generated client
+ * method that calls `response.json()` would be actively wrong. Consumers hit
+ * this route directly (an `<img>`/`<a>` src, or a framework rewrite), never
+ * through `client.ts`.
+ *
+ * Transform outputs (`assets/t/...`) are cache-checked exactly like any
+ * other public object first - only a MISS under the `assets/t/` prefix falls
+ * through to `serveLazyTransform`, which computes and caches the bytes. This
+ * mirrors the prod design (CloudFront origin-group -> S3 -> Lambda on miss).
+ */
+const rawAssetHandler = async (ctx, _req, params) => {
+    if (!ctx.assetStore)
+        return { ok: false, status: 501, error: 'Asset store not configured' };
+    const key = params.key ?? '';
+    const publicPrefix = `${ASSET_PREFIXES.public}/`;
+    const transformPrefix = `${ASSET_PREFIXES.transform}/`;
+    // Defense-in-depth: the local store re-guards path traversal on its own key
+    // resolution, but reject obviously-wrong keys before ever touching the
+    // store, and never distinguish "malformed key" from "not found" in the
+    // response (no oracle for probing).
+    if (!key.startsWith(publicPrefix) || key.includes('..')) {
+        return { ok: false, status: 404, error: 'Not found' };
+    }
+    const object = await ctx.assetStore.readPublicObject(key);
+    if (object) {
+        return {
+            kind: 'binary',
+            status: 200,
+            body: object.data,
+            headers: {
+                contentType: object.contentType,
+                contentDisposition: object.contentDisposition,
+                cacheControl: object.cacheControl,
+            },
+        };
+    }
+    if (!key.startsWith(transformPrefix)) {
+        return { ok: false, status: 404, error: 'Not found' };
+    }
+    return serveLazyTransform(ctx.assetStore, key);
+};
 // ============================================================================
 // Route Definitions with defineEndpoint
 // ============================================================================
 /**
- * List all assets
+ * POST /assets/presign
+ */
+const presignAsset = defineEndpoint({
+    namespace: 'assets',
+    name: 'presign',
+    method: 'POST',
+    path: '/assets/presign',
+    body: presignAssetBodySchema,
+    bodyType: 'PresignAssetBody',
+    responseType: 'PresignAssetResponse',
+    response: {},
+    defaultMockData: {
+        upload: { mode: 'proxied', stagingKey: 'asset-staging/mock', maxBytes: 52428800 },
+    },
+    handler: presignAssetHandler,
+});
+/**
+ * POST /assets/finalize
+ */
+const finalizeAsset = defineEndpoint({
+    namespace: 'assets',
+    name: 'finalize',
+    method: 'POST',
+    path: '/assets/finalize',
+    body: finalizeAssetBodySchema,
+    bodyType: 'FinalizeAssetBody',
+    responseType: 'FinalizeAssetResponse',
+    response: {},
+    defaultMockData: { asset: MOCK_ASSET_RECORD },
+    handler: finalizeAssetHandler,
+});
+/**
+ * POST /assets/upload (proxied, multipart/form-data - dev/local-store only)
+ */
+const uploadProxied = defineEndpoint({
+    namespace: 'assets',
+    name: 'uploadProxied',
+    method: 'POST',
+    path: '/assets/upload',
+    bodyFormat: 'multipart',
+    responseType: 'FinalizeAssetResponse',
+    response: {},
+    defaultMockData: { asset: MOCK_ASSET_RECORD },
+    handler: uploadProxiedHandler,
+});
+/**
  * GET /assets
  */
 const listAssets = defineEndpoint({
@@ -74,25 +368,7 @@ const listAssets = defineEndpoint({
     handler: listAssetsHandler,
 });
 /**
- * Upload an asset
- * POST /assets
- */
-const uploadAsset = defineEndpoint({
-    namespace: 'assets',
-    name: 'upload',
-    method: 'POST',
-    path: '/assets',
-    body: uploadAssetBodySchema,
-    bodyType: 'UploadAssetBody',
-    responseType: 'AssetUploadResponse',
-    response: {},
-    defaultMockData: { asset: { key: '', url: '' } },
-    guards: ['privileged'],
-    handler: uploadAssetHandler,
-});
-/**
- * Delete an asset
- * DELETE /assets?key=...
+ * DELETE /assets?key={hash32}
  */
 const deleteAsset = defineEndpoint({
     namespace: 'assets',
@@ -107,11 +383,22 @@ const deleteAsset = defineEndpoint({
     handler: deleteAssetHandler,
 });
 /**
- * Exported routes for router registration
+ * Exported routes for router registration and client codegen.
  */
 export const ASSET_ROUTES = {
+    presign: presignAsset,
+    finalize: finalizeAsset,
+    uploadProxied,
     list: listAssets,
-    upload: uploadAsset,
     delete: deleteAsset,
 };
+/**
+ * GET /assets/raw/{key...} - see `rawAssetHandler` above for why this is
+ * registered separately from `ASSET_ROUTES` instead of through defineEndpoint.
+ */
+export const assetRawRoute = {
+    method: 'GET',
+    pattern: ['assets', 'raw', '...key'],
+    handler: rawAssetHandler,
+};
 //# sourceMappingURL=assets.js.map

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.d.ts

@@ -19,6 +19,12 @@ export type BranchListResponse = ApiResponse<{
 /** Response type for branch deletion */
 export type BranchDeleteResponse = ApiResponse<{
     deleted: boolean;
+    /**
+     * Set when branch.json was removed (so the branch is logically gone from
+     * the registry) but the full directory removal failed -- an orphan clone
+     * persists on disk, invisible to the API, until manually cleaned up.
+     */
+    cleanupWarning?: string;
 }>;
 declare const createBranchBodySchema: z.ZodObject<{
     branch: z.ZodType<import("../paths").BranchName, z.ZodTypeDef, import("../paths").BranchName>;

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

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

package/dist/api/branch.js

@@ -3,6 +3,7 @@ import path from 'node:path';
 import { z } from 'zod';
 import { BranchWorkspaceManager } from '../branch-workspace.js';
 import { getBranchMetadataFileManager } from '../branch-metadata.js';
+import { withOccFileLock } from '../utils/occ-json-write.js';
 import { defineEndpoint } from './route-builder.js';
 import { createDebugLogger } from '../utils/debug.js';
 import { clientOperatingStrategy } from '../operating-mode/index.js';
@@ -210,24 +211,56 @@ export const deleteBranchHandler = async (ctx, req, params) => {
             error: 'Cannot delete branch with open pull request',
         };
     }
-    // Delete branch metadata file so it disappears from registry scans
+    // Delete branch metadata file so it disappears from registry scans.
+    // Hold the same server-enforced lockfile branch-metadata saves hold
+    // (see utils/occ-json-write.ts): an unguarded unlink racing a concurrent
+    // save() would let the save's create path resurrect a phantom branch.json
+    // inside a deleted branch, which the registry's next scan would list as a
+    // live branch with no clone. The directory removal happens inside the
+    // same hold so a racing save cannot slip between unlink and rm either.
     const metadataFile = path.join(branchContext.branchRoot, '.canopy-meta', 'branch.json');
+    let cleanupWarning;
     try {
-        await fs.unlink(metadataFile);
+        await withOccFileLock(metadataFile, async () => {
+            try {
+                await fs.unlink(metadataFile);
+            }
+            catch (err) {
+                if (!isNotFoundError(err)) {
+                    console.error(`CanopyCMS: Failed to delete branch metadata for ${branchName}:`, getErrorMessage(err));
+                }
+            }
+            // In multi-branch modes, also delete the entire branch directory.
+            // Retry transient EFS/NFS errors (ENOTEMPTY from a concurrent writer,
+            // EBUSY) a few times before giving up -- rm's failure must never be
+            // swallowed: metadata is gone either way (the branch is logically
+            // deleted and will no longer appear in listings), but silently
+            // succeeding here would leave a full orphan clone on disk with
+            // nothing in the API surfacing its existence.
+            if (branchContext.branchRoot !== branchContext.baseRoot) {
+                try {
+                    await fs.rm(branchContext.branchRoot, {
+                        recursive: true,
+                        force: true,
+                        maxRetries: 3,
+                        retryDelay: 100,
+                    });
+                }
+                catch (err) {
+                    cleanupWarning = `Failed to fully remove branch directory: ${getErrorMessage(err)}`;
+                    console.error(`CanopyCMS: Failed to delete branch directory for ${branchName}:`, getErrorMessage(err));
+                }
+            }
+        });
     }
     catch (err) {
-        if (!isNotFoundError(err)) {
-            console.error(`CanopyCMS: Failed to delete branch metadata for ${branchName}:`, getErrorMessage(err));
-        }
-    }
-    // In multi-branch modes, also delete the entire branch directory
-    if (branchContext.branchRoot !== branchContext.baseRoot) {
-        try {
-            await fs.rm(branchContext.branchRoot, { recursive: true, force: true });
-        }
-        catch (err) {
-            console.error(`CanopyCMS: Failed to delete branch directory for ${branchName}:`, getErrorMessage(err));
-        }
+        // Lock acquisition failed (e.g. contention past the retry budget) —
+        // surface as an error rather than silently skipping the delete.
+        return {
+            ok: false,
+            status: 409,
+            error: `Branch is busy, try again: ${getErrorMessage(err)}`,
+        };
     }
     // Invalidate registry cache so next list() will regenerate without this branch
     if (!ctx.services.registry) {
@@ -238,7 +271,11 @@ export const deleteBranchHandler = async (ctx, req, params) => {
         };
     }
     await ctx.services.registry.invalidate();
-    return { ok: true, status: 200, data: { deleted: true } };
+    return {
+        ok: true,
+        status: 200,
+        data: { deleted: true, ...(cleanupWarning && { cleanupWarning }) },
+    };
 };
 /**
  * Check if a user can modify branch access.
@@ -271,10 +308,17 @@ export const updateBranchAccessHandler = async (ctx, req, params, body) => {
             error: 'You do not have permission to modify this branch',
         };
     }
-    // Build new access control
-    const newAccess = {
-        ...branchContext.branch.access,
-    };
+    // Build the access DELTA from only the keys the caller actually supplied —
+    // never spread branchContext.branch.access (a snapshot resolved before
+    // this handler acquired anything) wholesale. save()'s field-level merge
+    // (branch-metadata.ts) takes the incoming access object's keys over the
+    // freshly-reloaded on-disk ones, so a full stale spread here would
+    // silently revert any key a concurrent request changed via the OTHER key
+    // in the gap between this handler's getBranchContext() and its save()
+    // call. An omitted key must be ABSENT from this object (not merely
+    // undefined-valued) so save()'s spread-merge leaves the on-disk value
+    // untouched; a supplied `[]` still comes through and clears the field.
+    const newAccess = {};
     if (body.allowedUsers !== undefined) {
         newAccess.allowedUsers = body.allowedUsers;
     }