@playdrop/playdrop-cli 0.12.27 → 0.12.28

package/dist/commands/upload.js

@@ -1,38 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveUploadOwner = resolveUploadOwner;
+exports.resolveDefaultUploadCreator = resolveDefaultUploadCreator;
 exports.upload = upload;
 exports.assertTaskPlaytestEvidenceManifest = assertTaskPlaytestEvidenceManifest;
 exports.publishWorkerAppProject = publishWorkerAppProject;
@@ -53,6 +22,7 @@ const uploadLog_1 = require("../uploadLog");
 const upload_content_1 = require("./upload-content");
 const appUrls_1 = require("../appUrls");
 const devRuntimeAssets_1 = require("./devRuntimeAssets");
+const ownedRuntimeImageValidation_1 = require("./ownedRuntimeImageValidation");
 const listingPreflight_1 = require("../listingPreflight");
 const upload_graph_1 = require("./upload-graph");
 function normalizeSavedItemKinds(kinds) {
@@ -222,6 +192,19 @@ function normalizeCreatorUsername(username) {
     }
     return trimmed;
 }
+function resolveUploadOwner(actorUsername, workspaceOwnerUsername) {
+    const workspaceOwner = workspaceOwnerUsername?.trim() ?? '';
+    if (workspaceOwner) {
+        return workspaceOwner;
+    }
+    const actor = actorUsername?.trim() ?? '';
+    return actor || 'unknown';
+}
+function resolveDefaultUploadCreator(owner, actorUsername) {
+    return normalizeCreatorUsername(owner ?? null)
+        ?? normalizeCreatorUsername(actorUsername ?? null)
+        ?? 'unknown';
+}
 function isNotFoundApiError(error) {
     return error instanceof types_1.ApiError && error.status === 404;
 }
@@ -1059,7 +1042,7 @@ async function flushGraphState(client, graphState, results) {
 }
 async function processUploadTasks(client, tasks, owner, ownerUsername, currentUserRole, localTagGroups, currentUser, token, warnings, apiBase, webBase, options) {
     const portalBase = normalizePortalBase(webBase);
-    const defaultCreator = normalizeCreatorUsername(ownerUsername) ?? owner;
+    const defaultCreator = resolveDefaultUploadCreator(owner, ownerUsername);
     const results = [];
     const preflight = await buildUploadPreflight(client, tasks, defaultCreator, currentUserRole, localTagGroups);
     const sortedTasks = preflight.nodes.map((node) => node.task);
@@ -1177,9 +1160,7 @@ async function upload(pathOrName, options) {
         }
         throw error;
     }
-    const owner = typeof userInfo.username === 'string' && userInfo.username.trim().length > 0
-        ? userInfo.username.trim()
-        : 'unknown';
+    const owner = resolveUploadOwner(userInfo.username, ctx.workspaceAuth?.config.ownerUsername);
     const tagGroupLoad = (0, catalogue_1.resolveCatalogueTagGroups)(workspaceRoot);
     if (tagGroupLoad.errors.length > 0) {
         (0, taskSelection_1.reportTaskErrors)(tagGroupLoad.errors.map((message) => ({
@@ -1234,8 +1215,6 @@ const WORKER_SUPERVISOR_BUNDLE_EXCLUDES = [
     'assets/marketing/',
     'listing/',
 ];
-const OWNED_RUNTIME_IMAGE_CHECK_SIZE = 96;
-const OWNED_RUNTIME_IMAGE_GRID_CHECK_SIZE = 512;
 function appTaskSatisfiesPlaydropAssetRequirement(task, requirement) {
     if (!requirement) {
         return true;
@@ -1253,361 +1232,6 @@ function appTaskSatisfiesPlaydropAssetRequirement(task, requirement) {
     });
     return hasFirstPartyPack || hasFirstPartyAsset || task.ownedAssets.length > 0;
 }
-function isUnsafeDirectPlaydropAiImageAsset(detail, parsedRevision) {
-    const asset = detail?.asset;
-    if (!asset || asset.category !== 'IMAGE') {
-        return false;
-    }
-    const currentVersion = asset.currentVersion;
-    if (!currentVersion || Number(currentVersion.revision) !== parsedRevision) {
-        return false;
-    }
-    const sourceKind = typeof currentVersion.sourceKind === 'string' ? currentVersion.sourceKind.toUpperCase() : '';
-    if (sourceKind !== 'AI') {
-        return false;
-    }
-    const format = typeof currentVersion.format === 'string' ? currentVersion.format.toUpperCase() : '';
-    const files = Array.isArray(currentVersion.fileManifest?.files) ? currentVersion.fileManifest.files : [];
-    const primary = files.find((file) => file?.role === 'primary');
-    const primaryContentType = typeof primary?.contentType === 'string' ? primary.contentType.toLowerCase() : '';
-    return format === 'JPEG' || primaryContentType === 'image/jpeg' || primaryContentType === 'image/jpg';
-}
-async function assertNewGameDirectPlaydropAssetsAreRuntimeSafe(input) {
-    const unsafeRefs = [];
-    for (const dependency of input.task.uses.assets) {
-        const parsed = (0, types_1.parseContentVersionRef)(dependency.ref);
-        if (!parsed || parsed.kind !== 'asset' || parsed.creatorUsername.toLowerCase() !== 'playdrop') {
-            continue;
-        }
-        const detail = await input.client.fetchAssetBySlug(parsed.creatorUsername, parsed.name);
-        if (isUnsafeDirectPlaydropAiImageAsset(detail, parsed.revision)) {
-            unsafeRefs.push((0, types_1.formatContentVersionRef)(parsed));
-        }
-    }
-    if (unsafeRefs.length > 0) {
-        throw new Error(`agent_task_playdrop_direct_ai_image_asset_unsafe: direct PlayDrop AI JPEG image assets cannot be used as new-game runtime sprites because their backgrounds are baked into the image. Use a PlayDrop asset pack or create clean owned PNG assets through the PlayDrop make-assets workflow instead. Unsafe refs: ${unsafeRefs.join(', ')}`);
-    }
-}
-function isOwnedRuntimeImageAsset(task, ownedAsset) {
-    if (!ownedAsset.runtimeKey || ownedAsset.category !== 'IMAGE') {
-        return false;
-    }
-    const primaryPath = ownedAsset.filePaths?.primary;
-    if (!primaryPath) {
-        return false;
-    }
-    const relativePath = primaryPath.slice((0, node_path_1.resolve)(task.projectDir).length + 1).replace(/\\/g, '/');
-    return !relativePath.startsWith('assets/marketing/') && !relativePath.startsWith('listing/');
-}
-function isBackgroundLikeOwnedRuntimeImageAsset(ownedAsset) {
-    const value = `${ownedAsset.name ?? ''} ${ownedAsset.runtimeKey ?? ''}`.toLowerCase();
-    return /\b(background|backdrop|scene|sky|floor|ground|wall|terrain|landscape|level|arena)\b/i.test(value);
-}
-function looksLikeBakedCheckerboardPreview(input) {
-    const { data, width, height, channels } = input;
-    if (width < 24 || height < 24 || channels < 4) {
-        return false;
-    }
-    const border = Math.max(8, Math.floor(Math.min(width, height) * 0.16));
-    let sampled = 0;
-    let transparent = 0;
-    let opaqueGray = 0;
-    let lowGray = 0;
-    let highGray = 0;
-    for (let y = 0; y < height; y += 1) {
-        for (let x = 0; x < width; x += 1) {
-            const inBorder = x < border || y < border || x >= width - border || y >= height - border;
-            if (!inBorder) {
-                continue;
-            }
-            sampled += 1;
-            const offset = (y * width + x) * channels;
-            const red = data[offset] ?? 0;
-            const green = data[offset + 1] ?? 0;
-            const blue = data[offset + 2] ?? 0;
-            const alpha = data[offset + 3] ?? 255;
-            if (alpha < 32) {
-                transparent += 1;
-                continue;
-            }
-            const brightness = (red + green + blue) / 3;
-            const grayish = Math.max(Math.abs(red - green), Math.abs(red - blue), Math.abs(green - blue)) <= 10;
-            if (alpha > 240 && grayish && brightness >= 70 && brightness <= 210) {
-                opaqueGray += 1;
-                if (brightness < 125) {
-                    lowGray += 1;
-                }
-                else if (brightness > 145) {
-                    highGray += 1;
-                }
-            }
-        }
-    }
-    if (sampled === 0 || transparent / sampled > 0.18) {
-        return false;
-    }
-    return opaqueGray / sampled > 0.58
-        && lowGray / sampled > 0.08
-        && highGray / sampled > 0.18;
-}
-function looksLikeBakedSolidMattePreview(input) {
-    const { data, width, height, channels } = input;
-    if (width < 24 || height < 24 || channels < 4) {
-        return false;
-    }
-    const border = Math.max(8, Math.floor(Math.min(width, height) * 0.18));
-    let sampled = 0;
-    let transparent = 0;
-    let matteLike = 0;
-    for (let y = 0; y < height; y += 1) {
-        for (let x = 0; x < width; x += 1) {
-            const inBorder = x < border || y < border || x >= width - border || y >= height - border;
-            if (!inBorder) {
-                continue;
-            }
-            sampled += 1;
-            const offset = (y * width + x) * channels;
-            const red = data[offset] ?? 0;
-            const green = data[offset + 1] ?? 0;
-            const blue = data[offset + 2] ?? 0;
-            const alpha = data[offset + 3] ?? 255;
-            if (alpha < 32) {
-                transparent += 1;
-                continue;
-            }
-            const dominant = Math.max(red, green, blue);
-            const weakest = Math.min(red, green, blue);
-            const chroma = dominant - weakest;
-            const brightGreenMatte = green >= 220 && green - Math.max(red, blue) >= 65 && Math.max(red, blue) >= 70;
-            const brightRedMatte = red >= 220 && red - Math.max(green, blue) >= 65;
-            const brightBlueMatte = blue >= 220 && blue - Math.max(red, green) >= 65;
-            const brightTwoChannelMatte = dominant >= 220
-                && chroma >= 65
-                && ((red >= 220 && green >= 220) || (red >= 220 && blue >= 220) || (green >= 220 && blue >= 220));
-            if (brightGreenMatte || brightRedMatte || brightBlueMatte || brightTwoChannelMatte) {
-                matteLike += 1;
-            }
-        }
-    }
-    if (sampled === 0 || transparent / sampled > 0.18) {
-        return false;
-    }
-    return matteLike / sampled > 0.58;
-}
-function looksLikeBakedNeutralSolidMattePreview(input) {
-    const { data, width, height, channels } = input;
-    if (width < 24 || height < 24 || channels < 4) {
-        return false;
-    }
-    const border = Math.max(8, Math.floor(Math.min(width, height) * 0.18));
-    let sampled = 0;
-    let transparent = 0;
-    let neutralMatteLike = 0;
-    for (let y = 0; y < height; y += 1) {
-        for (let x = 0; x < width; x += 1) {
-            const inBorder = x < border || y < border || x >= width - border || y >= height - border;
-            if (!inBorder) {
-                continue;
-            }
-            sampled += 1;
-            const offset = (y * width + x) * channels;
-            const red = data[offset] ?? 0;
-            const green = data[offset + 1] ?? 0;
-            const blue = data[offset + 2] ?? 0;
-            const alpha = data[offset + 3] ?? 255;
-            if (alpha < 32) {
-                transparent += 1;
-                continue;
-            }
-            const brightness = (red + green + blue) / 3;
-            const grayish = Math.max(Math.abs(red - green), Math.abs(red - blue), Math.abs(green - blue)) <= 12;
-            if (alpha > 240 && grayish && (brightness >= 235 || brightness <= 20)) {
-                neutralMatteLike += 1;
-            }
-        }
-    }
-    if (sampled === 0 || transparent / sampled > 0.18) {
-        return false;
-    }
-    return neutralMatteLike / sampled > 0.58;
-}
-function looksLikeResidualMatteGridArtifact(input) {
-    const { data, width, height, channels } = input;
-    if (width < 48 || height < 48 || channels < 4) {
-        return false;
-    }
-    const rowCounts = new Uint32Array(height);
-    const columnCounts = new Uint32Array(width);
-    let matteLike = 0;
-    for (let y = 0; y < height; y += 1) {
-        for (let x = 0; x < width; x += 1) {
-            const offset = (y * width + x) * channels;
-            const red = data[offset] ?? 0;
-            const green = data[offset + 1] ?? 0;
-            const blue = data[offset + 2] ?? 0;
-            const alpha = data[offset + 3] ?? 255;
-            if (alpha < 24 || alpha > 190) {
-                continue;
-            }
-            const greenMatte = green >= 35 && green - Math.max(red, blue) >= 25 && red <= 110 && blue <= 110;
-            const redMatte = red >= 35 && red - Math.max(green, blue) >= 25 && green <= 120 && blue <= 120;
-            const blueMatte = blue >= 35 && blue - Math.max(red, green) >= 25 && red <= 120 && green <= 120;
-            const purpleMatte = red >= 35 && blue >= 35 && Math.min(red, blue) - green >= 25 && green <= 120;
-            if (!greenMatte && !redMatte && !blueMatte && !purpleMatte) {
-                continue;
-            }
-            matteLike += 1;
-            rowCounts[y] += 1;
-            columnCounts[x] += 1;
-        }
-    }
-    const matteRatio = matteLike / (width * height);
-    if (matteRatio < 0.0015) {
-        return false;
-    }
-    let rowsWithLines = 0;
-    for (const count of rowCounts) {
-        if (count / width >= 0.12) {
-            rowsWithLines += 1;
-        }
-    }
-    let columnsWithLines = 0;
-    for (const count of columnCounts) {
-        if (count / height >= 0.12) {
-            columnsWithLines += 1;
-        }
-    }
-    return rowsWithLines + columnsWithLines >= 3
-        && (rowsWithLines >= 2 || columnsWithLines >= 2);
-}
-function looksLikeResidualTransparentGridLineArtifact(input) {
-    const { data, width, height, channels } = input;
-    if (width < 48 || height < 48 || channels < 4) {
-        return false;
-    }
-    const rowVisibleCounts = new Uint32Array(height);
-    const rowSemiCounts = new Uint32Array(height);
-    const columnVisibleCounts = new Uint32Array(width);
-    const columnSemiCounts = new Uint32Array(width);
-    for (let y = 0; y < height; y += 1) {
-        for (let x = 0; x < width; x += 1) {
-            const offset = (y * width + x) * channels;
-            const alpha = data[offset + 3] ?? 255;
-            if (alpha <= 0) {
-                continue;
-            }
-            rowVisibleCounts[y] += 1;
-            columnVisibleCounts[x] += 1;
-            if (alpha < 255) {
-                rowSemiCounts[y] += 1;
-                columnSemiCounts[x] += 1;
-            }
-        }
-    }
-    let rowsWithLines = 0;
-    for (let row = 0; row < height; row += 1) {
-        const visibleRatio = rowVisibleCounts[row] / width;
-        const semiRatio = rowSemiCounts[row] / width;
-        if (visibleRatio >= 0.94 && semiRatio >= 0.72) {
-            rowsWithLines += 1;
-        }
-    }
-    let columnsWithLines = 0;
-    for (let column = 0; column < width; column += 1) {
-        const visibleRatio = columnVisibleCounts[column] / height;
-        const semiRatio = columnSemiCounts[column] / height;
-        if (visibleRatio >= 0.94 && semiRatio >= 0.72) {
-            columnsWithLines += 1;
-        }
-    }
-    return rowsWithLines + columnsWithLines >= 3
-        && (rowsWithLines >= 2 || columnsWithLines >= 2);
-}
-async function imageHasBakedPreviewBackground(filePath, options = {}) {
-    let sharp;
-    try {
-        const sharpModule = await Promise.resolve().then(() => __importStar(require('sharp')));
-        sharp = sharpModule.default ?? sharpModule;
-    }
-    catch {
-        return false;
-    }
-    try {
-        const { data, info } = await sharp(filePath, { failOn: 'error' })
-            .rotate()
-            .resize(OWNED_RUNTIME_IMAGE_CHECK_SIZE, OWNED_RUNTIME_IMAGE_CHECK_SIZE, { fit: 'fill' })
-            .ensureAlpha()
-            .raw()
-            .toBuffer({ resolveWithObject: true });
-        const hasPreviewBackground = looksLikeBakedCheckerboardPreview({
-            data,
-            width: info.width,
-            height: info.height,
-            channels: info.channels,
-        }) || looksLikeBakedSolidMattePreview({
-            data,
-            width: info.width,
-            height: info.height,
-            channels: info.channels,
-        }) || (!options.allowNeutralSolidMatte && looksLikeBakedNeutralSolidMattePreview({
-            data,
-            width: info.width,
-            height: info.height,
-            channels: info.channels,
-        }));
-        if (hasPreviewBackground) {
-            return true;
-        }
-    }
-    catch {
-        return false;
-    }
-    try {
-        const { data, info } = await sharp(filePath, { failOn: 'error' })
-            .rotate()
-            .resize(OWNED_RUNTIME_IMAGE_GRID_CHECK_SIZE, OWNED_RUNTIME_IMAGE_GRID_CHECK_SIZE, { fit: 'inside', withoutEnlargement: true })
-            .ensureAlpha()
-            .raw()
-            .toBuffer({ resolveWithObject: true });
-        if (looksLikeResidualMatteGridArtifact({
-            data,
-            width: info.width,
-            height: info.height,
-            channels: info.channels,
-        }) || looksLikeResidualTransparentGridLineArtifact({
-            data,
-            width: info.width,
-            height: info.height,
-            channels: info.channels,
-        })) {
-            return true;
-        }
-    }
-    catch {
-        return false;
-    }
-    return false;
-}
-async function assertNewGameOwnedRuntimeImageAssetsAreClean(task) {
-    const unsafeAssets = [];
-    for (const ownedAsset of task.ownedAssets) {
-        if (!isOwnedRuntimeImageAsset(task, ownedAsset)) {
-            continue;
-        }
-        const primaryPath = ownedAsset.filePaths?.primary;
-        if (!primaryPath) {
-            continue;
-        }
-        if (await imageHasBakedPreviewBackground(primaryPath, {
-            allowNeutralSolidMatte: isBackgroundLikeOwnedRuntimeImageAsset(ownedAsset),
-        })) {
-            unsafeAssets.push(`${ownedAsset.name}:${ownedAsset.runtimeKey}`);
-        }
-    }
-    if (unsafeAssets.length > 0) {
-        throw new Error(`agent_task_owned_image_asset_checkerboard_background: owned runtime image assets must not contain baked transparency checkerboard, matte-color, or preview backgrounds. Recreate the asset through the PlayDrop make-assets workflow, use a cleaner PlayDrop asset, or use the image as non-runtime listing art only. Unsafe owned assets: ${unsafeAssets.join(', ')}`);
-    }
-}
 const RUNTIME_SOURCE_EXTENSIONS = new Set([
     '.html',
     '.js',
@@ -2242,11 +1866,7 @@ async function publishWorkerAppProject(input) {
         throw new Error('agent_task_playdrop_asset_dependency_missing: the creator asked for PlayDrop assets, but catalogue.json does not declare a matching uses.assets, uses.packs, or ownedAssets dependency.');
     }
     if (input.kind === 'NEW_GAME' || input.kind === 'REMIX_GAME') {
-        await assertNewGameDirectPlaydropAssetsAreRuntimeSafe({
-            client: input.client,
-            task,
-        });
-        await assertNewGameOwnedRuntimeImageAssetsAreClean(task);
+        await (0, ownedRuntimeImageValidation_1.assertOwnedRuntimeImagesAreValid)(task);
     }
     assertRequestedPlaydropAssetsAreUsedAtRuntime({
         task,

package/dist/commands/worker.d.ts

@@ -310,6 +310,22 @@ export declare function acquireWorkerSupervisorLock(input: {
     file?: string;
 }): WorkerSupervisorLock;
 export declare function releaseWorkerSupervisorLock(lock: WorkerSupervisorLock): void;
+export type TaskUploadLockOwner = {
+    schemaVersion: 1;
+    command: 'task upload';
+    pid: number;
+    processStartIdentity: string;
+    createdAt: string;
+};
+export type TaskUploadLock = {
+    file: string;
+    owner: TaskUploadLockOwner;
+};
+export declare function resolveTaskUploadLockFile(workspaceDir: string): string;
+export declare function removeStaleTaskUploadLockIfUnchanged(file: string, observedHolder: TaskUploadLockOwner): boolean;
+export declare function acquireTaskUploadLock(workspaceDir: string): TaskUploadLock;
+export declare function releaseTaskUploadLock(lock: TaskUploadLock): void;
+export declare function withTaskUploadLock<T>(workspaceDir: string, work: () => Promise<T>): Promise<T>;
 export declare function readActivePersonalWorkerRuntimeState(): WorkerRuntimeState | null;
 export declare function parseLaunchAgentProgramArguments(plist: string): string[];
 export declare function assertLaunchAgentPlistCompatible(input: {