@playdrop/playdrop-cli 0.5.5 → 0.5.6

package/dist/commands/devServer.js

@@ -7,8 +7,11 @@ exports.DEV_ROUTER_PORT = void 0;
 exports.parseMountConflictError = parseMountConflictError;
 exports.buildLocalDevAppUrl = buildLocalDevAppUrl;
 exports.ensureDevRouterRunning = ensureDevRouterRunning;
+exports.updateMountedDevRuntimeAssetManifest = updateMountedDevRuntimeAssetManifest;
 exports.startDevServer = startDevServer;
 exports.isDevServerAvailable = isDevServerAvailable;
+exports.createDevRouterServer = createDevRouterServer;
+exports.listenDevRouterServer = listenDevRouterServer;
 exports.runDevRouterServer = runDevRouterServer;
 const node_http_1 = __importDefault(require("node:http"));
 const node_fs_1 = require("node:fs");
@@ -18,6 +21,7 @@ const node_crypto_1 = require("node:crypto");
 exports.DEV_ROUTER_PORT = 8888;
 const DEV_ROUTER_HOST = '127.0.0.1';
 const CONTROL_PREFIX = '/_playdrop';
+const DEV_ROUTER_PROTOCOL_VERSION = 3;
 const CONTENT_TYPE_BY_EXTENSION = {
     '.html': 'text/html; charset=utf-8',
     '.js': 'application/javascript; charset=utf-8',
@@ -128,6 +132,19 @@ function cleanupStaleRouterMounts() {
         }
     }
 }
+function findRouterMountByCreatorAndApp(creatorUsername, appName) {
+    let match = null;
+    for (const mount of routerMountsById.values()) {
+        if (mount.creatorUsername !== creatorUsername || mount.appName !== appName) {
+            continue;
+        }
+        if (match) {
+            throw new Error(`ambiguous_mount_lookup:${creatorUsername}/${appName}`);
+        }
+        match = mount;
+    }
+    return match;
+}
 function resolveStaticPath(staticRoot, rawRelativePath) {
     const normalizedRelativePath = (0, node_path_1.normalize)(rawRelativePath.replace(/^\/+/, ''));
     if (!normalizedRelativePath || normalizedRelativePath === '.' || normalizedRelativePath.startsWith('..')) {
@@ -159,6 +176,13 @@ function parseMountPath(pathname) {
         assetPath: rest.map((entry) => decodeURIComponent(entry)).join('/'),
     };
 }
+function getOwnedRuntimeAssetFile(mount, ownedAssetName, role) {
+    const files = mount.runtimeAssetManifest?.ownedAssetFiles?.[ownedAssetName];
+    if (!files) {
+        return null;
+    }
+    return files[role.trim().toLowerCase()] ?? null;
+}
 async function readJsonBody(req) {
     const chunks = [];
     for await (const chunk of req) {
@@ -192,7 +216,7 @@ async function fetchRouterJson(path, init = {}, port = exports.DEV_ROUTER_PORT)
     }
     return await response.json();
 }
-async function isRouterHealthy(port = exports.DEV_ROUTER_PORT, timeoutMs = 400) {
+async function fetchRouterHealth(port = exports.DEV_ROUTER_PORT, timeoutMs = 400) {
     const controller = new AbortController();
     const timeout = setTimeout(() => controller.abort(), timeoutMs);
     timeout.unref?.();
@@ -201,18 +225,34 @@ async function isRouterHealthy(port = exports.DEV_ROUTER_PORT, timeoutMs = 400)
             method: 'GET',
             signal: controller.signal,
         });
-        return response.ok;
+        if (!response.ok) {
+            return null;
+        }
+        const payload = await response.json().catch(() => null);
+        if (!payload || typeof payload !== 'object' || payload.status !== 'ok') {
+            return null;
+        }
+        return payload;
     }
     catch {
-        return false;
+        return null;
     }
     finally {
         clearTimeout(timeout);
     }
 }
+function isCompatibleRouterHealth(health) {
+    return health.protocolVersion === DEV_ROUTER_PROTOCOL_VERSION
+        && health.capabilities?.runtimeAssetManifest === true
+        && health.capabilities?.runtimeAssetManifestLookup === true;
+}
 async function ensureDevRouterRunning(port = exports.DEV_ROUTER_PORT) {
-    if (await isRouterHealthy(port)) {
-        return;
+    const existingHealth = await fetchRouterHealth(port);
+    if (existingHealth) {
+        if (isCompatibleRouterHealth(existingHealth)) {
+            return;
+        }
+        throw new Error(`dev_router_incompatible:port_${port}`);
     }
     const cliEntrypoint = getCliEntrypointPath();
     const child = (0, node_child_process_1.spawn)(process.execPath, [cliEntrypoint, 'project', '_dev-router', 'serve'], {
@@ -226,7 +266,8 @@ async function ensureDevRouterRunning(port = exports.DEV_ROUTER_PORT) {
     child.unref();
     const deadline = Date.now() + 5000;
     while (Date.now() < deadline) {
-        if (await isRouterHealthy(port, 250)) {
+        const health = await fetchRouterHealth(port, 250);
+        if (health && isCompatibleRouterHealth(health)) {
             return;
         }
         await new Promise((resolveTimeout) => setTimeout(resolveTimeout, 150));
@@ -271,8 +312,24 @@ async function unregisterDevMount(mountId, port = exports.DEV_ROUTER_PORT) {
         throw new Error(`mount_unregister_failed:${response.status}`);
     }
 }
+async function updateMountedDevRuntimeAssetManifest(input) {
+    const port = input.port ?? exports.DEV_ROUTER_PORT;
+    const response = await fetch(`http://${DEV_ROUTER_HOST}:${port}${CONTROL_PREFIX}/apps/dev/${encodeURIComponent(input.creatorUsername)}/${encodeURIComponent(input.appName)}/runtime-assets`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+            runtimeAssetManifest: input.runtimeAssetManifest ?? null,
+        }),
+    });
+    if (!response.ok) {
+        const payload = await response.json().catch(() => null);
+        throw new Error(typeof payload?.error === 'string'
+            ? payload.error
+            : `runtime_asset_manifest_update_failed:${response.status}`);
+    }
+}
 async function startDevServer(options) {
-    const { appName, appType, creatorUsername, htmlPath, port, projectInfo } = options;
+    const { appName, appType, creatorUsername, htmlPath, port, projectInfo, runtimeAssetManifest } = options;
     const ownerPid = process.pid;
     let closing = false;
     const devProcess = spawnDevScript(projectInfo);
@@ -301,6 +358,7 @@ async function startDevServer(options) {
             staticRoot,
             repoRoot,
             ownerPid,
+            runtimeAssetManifest: runtimeAssetManifest ?? null,
         }, port);
         mountId = registeredMount.mountId;
         appUrl = registeredMount.appUrl;
@@ -355,7 +413,8 @@ async function isDevServerAvailable(input, timeoutMs = 1000) {
         clearTimeout(timeout);
     }
 }
-async function runDevRouterServer(port = Number(process.env.PLAYDROP_DEV_ROUTER_PORT) || exports.DEV_ROUTER_PORT) {
+function createDevRouterServer(initialPort = exports.DEV_ROUTER_PORT) {
+    let activePort = initialPort;
     // eslint-disable-next-line complexity
     const handleRequest = async (req, res) => {
         const method = req.method || 'GET';
@@ -369,16 +428,86 @@ async function runDevRouterServer(port = Number(process.env.PLAYDROP_DEV_ROUTER_
             res.end();
             return;
         }
-        let pathname = '/';
+        let requestUrl;
         try {
-            pathname = decodeURIComponent(new URL(req.url || '/', `http://${DEV_ROUTER_HOST}:${port}`).pathname);
+            requestUrl = new URL(req.url || '/', `http://${DEV_ROUTER_HOST}:${activePort}`);
         }
         catch {
             respondWithText(res, method, 400, 'Invalid URL path');
             return;
         }
+        const pathname = decodeURIComponent(requestUrl.pathname);
+        const searchParams = requestUrl.searchParams;
         if (pathname === `${CONTROL_PREFIX}/health` && method === 'GET') {
-            sendJson(res, 200, { status: 'ok' });
+            sendJson(res, 200, {
+                status: 'ok',
+                protocolVersion: DEV_ROUTER_PROTOCOL_VERSION,
+                capabilities: {
+                    runtimeAssetManifest: true,
+                    runtimeAssetManifestLookup: true,
+                },
+            });
+            return;
+        }
+        if (pathname.startsWith(`${CONTROL_PREFIX}/apps/dev/`) && pathname.endsWith('/runtime-assets') && method === 'GET') {
+            cleanupStaleRouterMounts();
+            const segments = pathname.split('/').filter(Boolean);
+            if (segments.length !== 6) {
+                sendJson(res, 404, { error: 'runtime_asset_manifest_not_found' });
+                return;
+            }
+            const creatorUsername = decodeURIComponent(segments[3] ?? '');
+            const appName = decodeURIComponent(segments[4] ?? '');
+            if (!creatorUsername || !appName) {
+                sendJson(res, 400, { error: 'invalid_runtime_asset_manifest_lookup' });
+                return;
+            }
+            let mount;
+            try {
+                mount = findRouterMountByCreatorAndApp(creatorUsername, appName);
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : 'ambiguous_mount_lookup';
+                sendJson(res, 409, { error: message });
+                return;
+            }
+            if (!mount?.runtimeAssetManifest) {
+                sendJson(res, 404, { error: 'runtime_asset_manifest_not_found' });
+                return;
+            }
+            sendJson(res, 200, mount.runtimeAssetManifest.response);
+            return;
+        }
+        if (pathname.startsWith(`${CONTROL_PREFIX}/apps/dev/`) && pathname.endsWith('/runtime-assets') && method === 'POST') {
+            cleanupStaleRouterMounts();
+            const segments = pathname.split('/').filter(Boolean);
+            if (segments.length !== 6) {
+                sendJson(res, 404, { error: 'runtime_asset_manifest_not_found' });
+                return;
+            }
+            const creatorUsername = decodeURIComponent(segments[3] ?? '');
+            const appName = decodeURIComponent(segments[4] ?? '');
+            if (!creatorUsername || !appName) {
+                sendJson(res, 400, { error: 'invalid_runtime_asset_manifest_lookup' });
+                return;
+            }
+            let mount;
+            try {
+                mount = findRouterMountByCreatorAndApp(creatorUsername, appName);
+            }
+            catch (error) {
+                const message = error instanceof Error ? error.message : 'ambiguous_mount_lookup';
+                sendJson(res, 409, { error: message });
+                return;
+            }
+            if (!mount) {
+                sendJson(res, 404, { error: 'runtime_asset_manifest_not_found' });
+                return;
+            }
+            const body = await readJsonBody(req);
+            mount.runtimeAssetManifest = body.runtimeAssetManifest ?? null;
+            mount.updatedAt = Date.now();
+            sendJson(res, 200, { ok: true });
             return;
         }
         if (pathname === `${CONTROL_PREFIX}/mounts` && method === 'POST') {
@@ -414,9 +543,10 @@ async function runDevRouterServer(port = Number(process.env.PLAYDROP_DEV_ROUTER_
                     }
                     existingMount.ownerPid = ownerPid;
                     existingMount.updatedAt = Date.now();
+                    existingMount.runtimeAssetManifest = body.runtimeAssetManifest ?? null;
                     sendJson(res, 200, {
                         mountId: existingMount.id,
-                        appUrl: buildLocalDevAppUrl({ creatorUsername, appType, appName, port }),
+                        appUrl: buildLocalDevAppUrl({ creatorUsername, appType, appName, port: activePort }),
                         creatorUsername,
                         appType,
                         appName,
@@ -436,12 +566,13 @@ async function runDevRouterServer(port = Number(process.env.PLAYDROP_DEV_ROUTER_
                 repoRoot,
                 ownerPid,
                 updatedAt: Date.now(),
+                runtimeAssetManifest: body.runtimeAssetManifest ?? null,
             };
             routerMountsById.set(mount.id, mount);
             routerMountIdsByKey.set(key, mount.id);
             sendJson(res, 200, {
                 mountId: mount.id,
-                appUrl: buildLocalDevAppUrl({ creatorUsername, appType, appName, port }),
+                appUrl: buildLocalDevAppUrl({ creatorUsername, appType, appName, port: activePort }),
                 creatorUsername,
                 appType,
                 appName,
@@ -494,6 +625,40 @@ async function runDevRouterServer(port = Number(process.env.PLAYDROP_DEV_ROUTER_
             respondWithText(res, method, 404, 'Not found');
             return;
         }
+        if (parsedMountPath.assetPath === '_playdrop/runtime-assets') {
+            if (!mount.runtimeAssetManifest) {
+                sendJson(res, 500, { error: 'runtime_asset_manifest_not_registered' });
+                return;
+            }
+            sendJson(res, 200, mount.runtimeAssetManifest.response);
+            return;
+        }
+        if (parsedMountPath.assetPath.startsWith('_playdrop/runtime-assets/files/')) {
+            const ownedAssetName = parsedMountPath.assetPath.slice('_playdrop/runtime-assets/files/'.length).trim();
+            const role = (searchParams.get('role') || 'primary').trim().toLowerCase();
+            if (!ownedAssetName || !role) {
+                respondWithText(res, method, 400, 'Invalid runtime asset file request');
+                return;
+            }
+            const ownedFile = getOwnedRuntimeAssetFile(mount, ownedAssetName, role);
+            if (!ownedFile) {
+                respondWithText(res, method, 404, 'Not found');
+                return;
+            }
+            try {
+                const stats = (0, node_fs_1.statSync)(ownedFile.absolutePath);
+                if (!stats.isFile()) {
+                    respondWithText(res, method, 404, 'Not found');
+                    return;
+                }
+                const content = (0, node_fs_1.readFileSync)(ownedFile.absolutePath);
+                respondWithBuffer(res, method, 200, ownedFile.contentType || resolveContentType(ownedFile.absolutePath), content);
+            }
+            catch {
+                respondWithText(res, method, 404, 'Not found');
+            }
+            return;
+        }
         if (parsedMountPath.assetPath === 'index.html') {
             try {
                 const freshHtml = (0, node_fs_1.readFileSync)(mount.htmlPath);
@@ -525,6 +690,15 @@ async function runDevRouterServer(port = Number(process.env.PLAYDROP_DEV_ROUTER_
     const server = node_http_1.default.createServer((req, res) => {
         void handleRequest(req, res);
     });
+    server.on('listening', () => {
+        const address = server.address();
+        if (address && typeof address === 'object' && typeof address.port === 'number') {
+            activePort = address.port;
+        }
+    });
+    return server;
+}
+async function listenDevRouterServer(server, port = exports.DEV_ROUTER_PORT) {
     await new Promise((resolveListen, rejectListen) => {
         const onError = (error) => {
             server.off('listening', onListening);
@@ -538,6 +712,15 @@ async function runDevRouterServer(port = Number(process.env.PLAYDROP_DEV_ROUTER_
         server.once('listening', onListening);
         server.listen(port, DEV_ROUTER_HOST);
     });
+    const address = server.address();
+    if (!address || typeof address !== 'object' || typeof address.port !== 'number') {
+        throw new Error('dev_router_port_unavailable');
+    }
+    return address.port;
+}
+async function runDevRouterServer(port = Number(process.env.PLAYDROP_DEV_ROUTER_PORT) || exports.DEV_ROUTER_PORT) {
+    const server = createDevRouterServer(port);
+    await listenDevRouterServer(server, port);
     await new Promise(() => {
         // Keep the router alive until the process exits.
     });

package/dist/commands/init.js

@@ -10,10 +10,9 @@ const promises_1 = __importDefault(require("node:readline/promises"));
 const node_process_1 = require("node:process");
 const node_child_process_1 = require("node:child_process");
 const types_1 = require("@playdrop/types");
-const config_1 = require("../config");
 const apiClient_1 = require("../apiClient");
+const commandContext_1 = require("../commandContext");
 const http_1 = require("../http");
-const environment_1 = require("../environment");
 const messages_1 = require("../messages");
 const clientInfo_1 = require("../clientInfo");
 const DEFAULT_CATALOGUE = '{}\n';
@@ -197,31 +196,14 @@ async function init(targetPath, options = {}) {
     (0, node_fs_1.mkdirSync)(resolved, { recursive: true });
     const cataloguePath = (0, node_path_1.join)(resolved, 'catalogue.json');
     const catalogueExisted = (0, node_fs_1.existsSync)(cataloguePath);
-    const cfg = (0, config_1.loadConfig)();
-    if (!cfg.token) {
-        (0, messages_1.printLoginRequired)('Bootstrapping a Playdrop project', 'project init');
-        process.exitCode = 1;
-        return null;
-    }
-    if (!cfg.env) {
-        (0, messages_1.printConfigEnvironmentMissing)('project init');
-        process.exitCode = 1;
+    const ctx = await (0, commandContext_1.resolveAuthenticatedEnvironmentContext)('project init', 'Bootstrapping a Playdrop project', { workspacePath: resolved });
+    if (!ctx) {
         return null;
     }
-    const preferredEnv = cfg.env;
-    const envConfig = (0, environment_1.resolveEnvironmentConfig)(preferredEnv);
-    if (!envConfig) {
-        const choices = (0, environment_1.formatEnvironmentList)();
-        (0, messages_1.printUnknownEnvironment)(preferredEnv || '', choices, 'project init');
-        process.exitCode = 1;
-        return null;
-    }
-    if (envConfig.allowInsecureRequests) {
-        process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
-    }
+    const { envConfig, token } = ctx;
     let bootstrap = null;
     try {
-        bootstrap = await fetchBootstrap(envConfig.apiBase, cfg.token);
+        bootstrap = await fetchBootstrap(envConfig.apiBase, token);
     }
     catch (error) {
         if (error instanceof http_1.CLIUnsupportedClientError) {
@@ -240,7 +222,7 @@ async function init(targetPath, options = {}) {
     const agentsExisted = (0, node_fs_1.existsSync)(agentsPath);
     let username = null;
     try {
-        username = await resolveUsername(envConfig.apiBase, cfg.token);
+        username = await resolveUsername(envConfig.apiBase, token);
     }
     catch (error) {
         if (error instanceof http_1.CLIUnsupportedClientError) {

package/dist/commands/search.d.ts

@@ -1,6 +1,10 @@
 type SearchOptions = {
     kind?: string;
+    creator?: string;
     appType?: string;
+    auth?: string;
+    controller?: string;
+    surface?: string;
     assetCategory?: string;
     assetSubcategory?: string;
     assetSpec?: string;

package/dist/commands/search.js

@@ -7,6 +7,7 @@ const errors_1 = require("../errors");
 const messages_1 = require("../messages");
 const output_1 = require("../output");
 const refs_1 = require("../refs");
+const CREATOR_USERNAME_FILTER_REGEX = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 function parseSearchKind(raw) {
     if (!raw || raw.trim().length === 0) {
         return 'all';
@@ -123,12 +124,6 @@ function buildCountsSuffix(item) {
         if (typeof item.item.viewCount === 'number') {
             parts.push(`view ${formatCountValue(item.item.viewCount)}`);
         }
-        if (typeof item.item.downloadCount === 'number') {
-            parts.push(`download ${formatCountValue(item.item.downloadCount)}`);
-        }
-        if (typeof item.item.playCount === 'number') {
-            parts.push(`play ${formatCountValue(item.item.playCount)}`);
-        }
     }
     if (item.kind === 'asset-pack' && typeof item.item.downloadCount === 'number') {
         parts.push(`download ${formatCountValue(item.item.downloadCount)}`);
@@ -206,7 +201,11 @@ function buildSearchRequest(input) {
         page: 1,
         pageSize: input.limit + input.offset,
         ...(input.sort ? { sort: input.sort } : {}),
+        ...(input.creatorUsername ? { creatorUsername: input.creatorUsername } : {}),
         appType: input.appType,
+        auth: input.auth,
+        controller: input.controller,
+        surface: input.surface,
         assetCategory: input.assetCategory,
         assetSubcategory: input.assetSubcategory,
         assetSpec: input.assetSpec,
@@ -219,8 +218,27 @@ function buildSearchRequest(input) {
 }
 async function search(query, options = {}) {
     const trimmedQuery = typeof query === 'string' ? query.trim() : '';
-    if (!trimmedQuery) {
-        (0, messages_1.printErrorWithHelp)('A search query is required.', ['Example: playdrop search "city builder"'], { command: 'search' });
+    const creatorUsername = normalizeOptionalString(options.creator)?.toLowerCase();
+    if (creatorUsername && !CREATOR_USERNAME_FILTER_REGEX.test(creatorUsername)) {
+        (0, messages_1.printErrorWithHelp)('The --creator value is invalid.', ['Use a creator username like playdrop or olivier-dev.'], { command: 'search' });
+        process.exitCode = 1;
+        return;
+    }
+    const hasScopeFilters = Boolean(creatorUsername)
+        || Boolean(options.appType)
+        || Boolean(options.auth)
+        || Boolean(options.controller)
+        || Boolean(options.surface)
+        || Boolean(options.assetCategory)
+        || Boolean(options.assetSubcategory)
+        || Boolean(options.assetSpec)
+        || Boolean(options.assetSpecOwner)
+        || Boolean(options.assetSpecName)
+        || Boolean(options.packContainsCategory)
+        || Boolean(options.packContainsSubcategory)
+        || Array.isArray(options.tag) && options.tag.length > 0;
+    if (!trimmedQuery && !hasScopeFilters) {
+        (0, messages_1.printErrorWithHelp)('A search query or filter is required.', ['Example: playdrop search "city builder"', 'Example: playdrop search --creator playdrop --kind app'], { command: 'search' });
         process.exitCode = 1;
         return;
     }
@@ -244,7 +262,7 @@ async function search(query, options = {}) {
     }
     const sort = parseSearchSort(options.sort);
     if (sort === null) {
-        (0, messages_1.printErrorWithHelp)(`Sort "${options.sort ?? ''}" is not supported.`, ['Use one of: relevance, recent, likes, downloads, remixes, comments, assets, apps, alpha.'], { command: 'search' });
+        (0, messages_1.printErrorWithHelp)(`Sort "${options.sort ?? ''}" is not supported.`, ['Use one of: relevance, views, likes, used, newest, updated, downloads, remixes, comments, assets, apps, alpha.'], { command: 'search' });
         process.exitCode = 1;
         return;
     }
@@ -254,6 +272,30 @@ async function search(query, options = {}) {
         process.exitCode = 1;
         return;
     }
+    const auth = options.auth === undefined ? undefined : (0, types_1.parseAppAuthFilter)(options.auth);
+    if (options.auth !== undefined && !auth) {
+        (0, messages_1.printErrorWithHelp)(`Auth filter "${options.auth}" is not supported.`, ['Use one of: required, optional, none.'], { command: 'search' });
+        process.exitCode = 1;
+        return;
+    }
+    const controller = options.controller === undefined ? undefined : (0, types_1.parseAppControllerFilter)(options.controller);
+    if (options.controller !== undefined && !controller) {
+        (0, messages_1.printErrorWithHelp)(`Controller filter "${options.controller}" is not supported.`, ['Use one of: required, optional, none.'], { command: 'search' });
+        process.exitCode = 1;
+        return;
+    }
+    const surface = options.surface === undefined ? undefined : (0, types_1.parseAppSurfaceFilter)(options.surface);
+    if (options.surface !== undefined && !surface) {
+        (0, messages_1.printErrorWithHelp)(`Surface filter "${options.surface}" is not supported.`, ['Use one of: desktop, mobile-portrait, mobile-landscape.'], { command: 'search' });
+        process.exitCode = 1;
+        return;
+    }
+    const hasCapabilityFilters = Boolean(auth || controller || surface);
+    if (hasCapabilityFilters && kind !== 'all' && kind !== 'app') {
+        (0, messages_1.printErrorWithHelp)('Capability filters only support app search.', ['Use --kind app, or omit --kind to search across app results only.'], { command: 'search' });
+        process.exitCode = 1;
+        return;
+    }
     const assetCategory = parseAssetCategory(options.assetCategory);
     if (assetCategory === null) {
         (0, messages_1.printErrorWithHelp)(`Asset category "${options.assetCategory}" is not supported.`, ['Use a canonical asset category like IMAGE, VIDEO, AUDIO, SPRITESHEET, or MODEL_3D.'], { command: 'search' });
@@ -278,6 +320,17 @@ async function search(query, options = {}) {
         process.exitCode = 1;
         return;
     }
+    if (hasCapabilityFilters && (assetCategory
+        || assetSubcategory
+        || normalizeOptionalString(options.assetSpec)
+        || normalizeOptionalString(options.assetSpecOwner)
+        || normalizeOptionalString(options.assetSpecName)
+        || packContainsCategory
+        || packContainsSubcategory)) {
+        (0, messages_1.printErrorWithHelp)('Capability filters cannot be combined with asset or pack search filters.', ['Use app search filters only when passing --auth, --surface, or --controller.'], { command: 'search' });
+        process.exitCode = 1;
+        return;
+    }
     const tags = normalizeTagFilters(options.tag);
     if (tags === null) {
         (0, messages_1.printErrorWithHelp)('The --tag value is invalid.', ['Use canonical refs like theme/pirate or visual-style/pixel-art.', 'Pass at most 5 unique tag refs.'], { command: 'search' });
@@ -289,10 +342,14 @@ async function search(query, options = {}) {
             const response = await client.search(buildSearchRequest({
                 trimmedQuery,
                 kind,
+                ...(creatorUsername ? { creatorUsername } : {}),
                 limit,
                 offset,
                 sort: sort ?? undefined,
                 appType: appType,
+                auth: auth ?? undefined,
+                controller: controller ?? undefined,
+                surface: surface ?? undefined,
                 assetCategory: assetCategory ?? undefined,
                 assetSubcategory: assetSubcategory ?? undefined,
                 assetSpec: normalizeOptionalString(options.assetSpec),
@@ -317,11 +374,11 @@ async function search(query, options = {}) {
                 return;
             }
             if (items.length === 0) {
-                console.log(`No results found for "${trimmedQuery}".`);
+                console.log(trimmedQuery ? `No results found for "${trimmedQuery}".` : 'No results found.');
                 console.log('Next: adjust your filters or run "playdrop browse" to explore available content.');
                 return;
             }
-            console.log(`Search results for "${trimmedQuery}":\n`);
+            console.log(trimmedQuery ? `Search results for "${trimmedQuery}":\n` : 'Search results:\n');
             for (const [index, item] of items.entries()) {
                 const displayName = item.item.displayName || item.item.name;
                 console.log(`${index + 1}. [${item.kind}] ${item.ref} | ${displayName} | @${item.item.creatorUsername} | ${itemSummary(item)}${buildCountsSuffix(item)}${buildTagSuffix(item.item.tags)}`);

package/dist/commands/upload-content.d.ts

@@ -1,6 +1,6 @@
 import type { ApiClient } from '@playdrop/api-client';
 import { type AssetPackUploadedLocalAsset } from '@playdrop/types';
-import type { AssetPackTask, AssetSpecTask, AssetTask, EmbeddedAssetTask } from '../catalogue';
+import type { AssetPackTask, AssetSpecTask, AssetTask, OwnedAssetTask, PackOwnedAssetTask } from '../catalogue';
 import type { CliTask } from '../taskUtils';
 export type CurrentUserRole = 'USER' | 'CREATOR' | 'ADMIN' | null;
 export type UploadedAssetInfo = {
@@ -70,11 +70,11 @@ export declare function parseUnversionedAssetTaskRef(rawRef: string, fallbackCre
     name: string;
 } | null;
 export declare function buildAssetPackUploadPlans(tasks: CliTask[], defaultCreator: string, currentUserRole: CurrentUserRole): PackUploadPlanningResult;
-export declare function uploadAssetTask(client: ApiClient, task: AssetTask | EmbeddedAssetTask, sourceAppVersionId?: number, creatorUsername?: string, options?: {
+export declare function uploadAssetTask(client: ApiClient, task: AssetTask | OwnedAssetTask, sourceAppVersionId?: number, creatorUsername?: string, options?: {
     clearTags?: boolean;
 }): Promise<UploadedAssetInfo>;
 export declare function uploadAssetSpecTask(client: ApiClient, task: AssetSpecTask, creatorUsername?: string): Promise<UploadedAssetSpecInfo>;
-export declare function uploadAssetPackTask(client: ApiClient, task: AssetPackTask, creatorUsername: string, uploadedAssets: Map<string, UploadedAssetInfo>, localAssetTasks: AssetTask[], uploadKeyByAssetKey: Map<string, string>, targetCreatorUsername?: string, options?: {
+export declare function uploadAssetPackTask(client: ApiClient, task: AssetPackTask, creatorUsername: string, uploadedAssets: Map<string, UploadedAssetInfo>, localAssetTasks: PackOwnedAssetTask[], uploadKeyByAssetKey: Map<string, string>, targetCreatorUsername?: string, options?: {
     clearTags?: boolean;
 }): Promise<UploadedPackInfo>;
 export {};