@playcraft/cli 0.0.32 → 0.0.34

package/dist/commands/build.js

@@ -343,12 +343,12 @@ export async function buildCommand(projectPath, options) {
                     console.log(`\n🎬 选中场景: 全部场景`);
                 }
                 else if (scenesInput === 'default') {
-                    // 打包默认场景
+                    // 打包默认场景（manifest.scenes 首位 = 当前活跃场景）
                     const projectScenes = await detectProjectScenes(resolvedProjectPath);
-                    const defaultScene = projectScenes.find(s => s.isMain === true) || projectScenes[0];
+                    const defaultScene = projectScenes[0];
                     if (defaultScene) {
                         selectedScenes = [defaultScene.name || String(defaultScene.id)];
-                        console.log(`\n🎬 选中场景: ${defaultScene.name || defaultScene.id}${defaultScene.isMain ? ' (默认场景)' : ' (第一个场景)'}`);
+                        console.log(`\n🎬 选中场景: ${defaultScene.name || defaultScene.id} (默认场景)`);
                     }
                     else {
                         console.log(`\n⚠️  未找到默认场景，将打包所有场景`);

package/dist/commands/prefab.js

@@ -2,8 +2,10 @@ import { inspect } from 'node:util';
 import { readFileSync, writeFileSync, readdirSync, statSync, existsSync } from 'fs';
 import { join, resolve } from 'path';
 import JSON5 from 'json5';
-import { THEME_SCHEMA_PATH, THEME_INDEX_PATH, THEME_DIR, DEFAULT_GAME_PATH, MANIFEST_PATH, ASSETS_JSON_PATH, LITE_CREATOR_EXTENSIONS_DIR, themeDataPath, scenePath, defaultValueFromJsonSchemaProperty, buildThemeIndexTs, parseThemeIndexImportPath, parseThemePrefabs, mergeThemeDataKey, deleteThemeDataKey, parseExtensionMetaData, parseGameConfig, buildExtensionPrefabs, updateGameConfigValue, updateGameConfigExtensions, findConfigKeyCaseInsensitive, parseConfigKey, listScenesFromManifest, resolveGameConfigPath, validateThemeValue, validateConfigValue, describeJsonSchemaFields, describeConfigSchemaFields, getPrefabFieldDescriptors, getPrefabFieldDiffs, prefabHasSchemaDiff, } from '@playcraft/common/prefab';
+import { THEME_SCHEMA_PATH, THEME_INDEX_PATH, THEME_DIR, DEFAULT_GAME_PATH, MANIFEST_PATH, ASSETS_JSON_PATH, LITE_CREATOR_EXTENSIONS_DIR, themeDataPath, scenePath, defaultValueFromJsonSchemaProperty, buildThemeIndexTs, parseThemeIndexImportPath, parseThemePrefabs, mergeThemeDataKey, deleteThemeDataKey, parseExtensionMetaData, parseGameConfig, buildExtensionPrefabs, updateGameConfigValue, updateGameConfigExtensions, findConfigKeyCaseInsensitive, parseConfigKey, listScenesFromManifest, listScenesWithGameConfig, resolveGameConfigPath, getActiveSceneIdFromManifest, reorderManifestDefaultScene, validateThemeValue, validateConfigValue, describeJsonSchemaFields, describeConfigSchemaFields, getPrefabFieldDescriptors, getPrefabFieldDiffs, prefabHasSchemaDiff, } from '@playcraft/common/prefab';
 const DEFAULT_PAGE_LIMIT = 50;
+/** 场景在 manifest / CLI 中列出但解析不到 GameConfig 时的人读标签 */
+const NO_SCENE_GAMECONFIG_LABEL = '（无场景级 GameConfig）';
 /** 无法识别 External / PlayCanvas 项目类型（供测试在 mock process.exit 后通过 instanceof 识别）。 */
 export class ProjectDetectError extends Error {
     name = 'ProjectDetectError';
@@ -186,7 +188,7 @@ function resolveVariantResolved(projectDir, systemType, opts) {
     if (systemType === 'external-theme') {
         return resolveThemeId(projectDir, opts);
     }
-    return null;
+    return getMainSceneId(projectDir);
 }
 // ─── External Theme helpers ──────────────────────────────────────────────────
 function loadThemeSchema(projectDir) {
@@ -240,6 +242,22 @@ function resolveThemeId(projectDir, opts) {
     throw new Error('unreachable');
 }
 // ─── PlayCanvas / LiteCreator helpers ────────────────────────────────────────
+/**
+ * 当前活跃场景 ID = manifest.scenes[0]。
+ *
+ * 与 Remix 编辑器和后端 `setDefaultScene`（将目标场景移到首位）的 SSOT 一致。
+ */
+function getMainSceneId(projectDir) {
+    if (!fileExists(projectDir, MANIFEST_PATH))
+        return null;
+    try {
+        const manifestJson = JSON.parse(readLocalFile(projectDir, MANIFEST_PATH));
+        return getActiveSceneIdFromManifest(manifestJson);
+    }
+    catch {
+        return null;
+    }
+}
 function loadGameConfig(projectDir, configPath) {
     const raw = readLocalFile(projectDir, configPath);
     return JSON.parse(raw);
@@ -266,24 +284,102 @@ function scanExtensionMetaData(projectDir) {
     }
     return map;
 }
-function resolveGameConfigPathForVariant(projectDir, variantId) {
-    if (!variantId)
-        return DEFAULT_GAME_PATH;
-    if (!fileExists(projectDir, scenePath(variantId)))
-        return DEFAULT_GAME_PATH;
-    const sceneJson = JSON.parse(readLocalFile(projectDir, scenePath(variantId)));
+function extensionMetaDataFile(projectDir, extensionName) {
+    return join(projectDir, LITE_CREATOR_EXTENSIONS_DIR, extensionName, 'MetaData.json');
+}
+function mutateExtensionMetaData(projectDir, extensionName, apply) {
+    const metaPath = extensionMetaDataFile(projectDir, extensionName);
+    const raw = readFileSync(metaPath, 'utf-8');
+    const metaData = JSON.parse(raw);
+    const configSchema = metaData.configSchema;
+    if (!configSchema) {
+        throw new Error(`MetaData.json for "${extensionName}" has no configSchema`);
+    }
+    apply(configSchema);
+    writeFileSync(metaPath, JSON.stringify(metaData, null, 2), 'utf-8');
+}
+function writeMetaDataDefault(projectDir, extensionName, field, value) {
+    mutateExtensionMetaData(projectDir, extensionName, (configSchema) => {
+        if (!configSchema[field]) {
+            throw new Error(`MetaData.json for "${extensionName}" has no configSchema.${field}`);
+        }
+        configSchema[field].default = value;
+    });
+}
+function writeMetaDataDefaults(projectDir, extensionName, values) {
+    mutateExtensionMetaData(projectDir, extensionName, (configSchema) => {
+        for (const [field, value] of Object.entries(values)) {
+            if (configSchema[field]) {
+                configSchema[field].default = value;
+            }
+        }
+    });
+}
+/** 仅按场景 ID 解析 GameConfig（不查活跃场景）。 */
+function resolveGameConfigPathForSceneId(projectDir, sceneId) {
+    if (!fileExists(projectDir, scenePath(sceneId)))
+        return null;
+    const sceneJson = JSON.parse(readLocalFile(projectDir, scenePath(sceneId)));
     if (!fileExists(projectDir, ASSETS_JSON_PATH))
-        return DEFAULT_GAME_PATH;
+        return null;
     const assetsJson = JSON.parse(readLocalFile(projectDir, ASSETS_JSON_PATH));
-    const resolved = resolveGameConfigPath(sceneJson, assetsJson);
-    return resolved ?? DEFAULT_GAME_PATH;
+    return resolveGameConfigPath(sceneJson, assetsJson);
+}
+/**
+ * 解析当前变体下的 GameConfig 路径。无法解析时返回 null（list 回退 DefaultGame 扩展；set 可写 MetaData）。
+ * 未传 variantId 时用 manifest 首位场景（当前活跃场景）。
+ */
+function resolveGameConfigPathForVariant(projectDir, variantId) {
+    const sceneId = variantId ?? getMainSceneId(projectDir);
+    if (!sceneId)
+        return null;
+    return resolveGameConfigPathForSceneId(projectDir, sceneId);
+}
+/** PlayCanvas：`prefab list` 等人读「变体上下文」一行话。 */
+function liteCreatorVariantHumanNote(projectDir, explicitVariant) {
+    if (explicitVariant) {
+        const p = resolveGameConfigPathForSceneId(projectDir, explicitVariant);
+        return p != null ? `场景 ${explicitVariant} → ${p}` : `场景 ${explicitVariant}（${NO_SCENE_GAMECONFIG_LABEL}；set 可走 MetaData）`;
+    }
+    const mainId = getMainSceneId(projectDir);
+    const gc = resolveGameConfigPathForVariant(projectDir, undefined);
+    if (mainId != null) {
+        return gc != null
+            ? `活跃场景 ${mainId} → ${gc}`
+            : `活跃场景 ${mainId}（未解析到 GameConfig；list 读 ${DEFAULT_GAME_PATH} 扩展，set 写 MetaData）`;
+    }
+    return `无场景 → 扩展列表：${DEFAULT_GAME_PATH}；set / set-batch：各扩展 MetaData.json`;
 }
 function listLocalScenes(projectDir) {
     if (!fileExists(projectDir, MANIFEST_PATH))
         return [];
     const manifestJson = JSON.parse(readLocalFile(projectDir, MANIFEST_PATH));
+    if (fileExists(projectDir, ASSETS_JSON_PATH)) {
+        const assetsJson = JSON.parse(readLocalFile(projectDir, ASSETS_JSON_PATH));
+        return listScenesWithGameConfig(manifestJson, (sceneId) => {
+            const sp = scenePath(sceneId);
+            if (!fileExists(projectDir, sp))
+                return null;
+            return JSON.parse(readLocalFile(projectDir, sp));
+        }, assetsJson);
+    }
     return listScenesFromManifest(manifestJson);
 }
+/** 列表展示：补全 GameConfig 路径，并用活跃场景 ID 标记 isActive（与未指定 --variant 的 prefab 上下文一致）。 */
+function annotatePlaycanvasScenesForMainScene(projectDir, scenes) {
+    const mainSceneId = getMainSceneId(projectDir);
+    const annotated = scenes.map((s) => {
+        const resolved = s.gameConfigPath ?? resolveGameConfigPathForSceneId(projectDir, s.id);
+        const out = {
+            ...s,
+            isActive: mainSceneId !== null && s.id === mainSceneId,
+        };
+        if (resolved != null)
+            out.gameConfigPath = resolved;
+        return out;
+    });
+    return { scenes: annotated, mainSceneId };
+}
 function loadPrefabs(projectDir, systemType, opts) {
     if (systemType === 'external-theme') {
         const themeId = resolveThemeId(projectDir, opts);
@@ -291,11 +387,19 @@ function loadPrefabs(projectDir, systemType, opts) {
         const data = loadThemeData(projectDir, themeId);
         return parseThemePrefabs(schema, data, themeId);
     }
-    const configPath = resolveGameConfigPathForVariant(projectDir, opts.variant);
-    const gameConfigJson = loadGameConfig(projectDir, configPath);
-    const { extensions, config } = parseGameConfig(gameConfigJson);
     const metaMap = scanExtensionMetaData(projectDir);
-    return buildExtensionPrefabs(metaMap, { extensions, config }, configPath);
+    const configPath = resolveGameConfigPathForVariant(projectDir, opts.variant);
+    if (configPath) {
+        const gameConfigJson = loadGameConfig(projectDir, configPath);
+        const { extensions, config } = parseGameConfig(gameConfigJson);
+        return buildExtensionPrefabs(metaMap, { extensions, config }, configPath);
+    }
+    if (fileExists(projectDir, DEFAULT_GAME_PATH)) {
+        const defaultGameJson = loadGameConfig(projectDir, DEFAULT_GAME_PATH);
+        const { extensions } = parseGameConfig(defaultGameJson);
+        return buildExtensionPrefabs(metaMap, { extensions, config: {} }, DEFAULT_GAME_PATH);
+    }
+    return buildExtensionPrefabs(metaMap, { extensions: [], config: {} }, '');
 }
 // ─── dotpath helper ──────────────────────────────────────────────────────────
 function getByDotPath(obj, path) {
@@ -422,8 +526,18 @@ export function registerPrefabCommands(program) {
             });
         }
         else {
-            const scenes = listLocalScenes(projectDir);
-            const payload = { projectType: 'playcanvas', variants: scenes };
+            const scenesRaw = listLocalScenes(projectDir);
+            const { scenes, mainSceneId } = annotatePlaycanvasScenesForMainScene(projectDir, scenesRaw);
+            const gameConfigPath = resolveGameConfigPathForVariant(projectDir, undefined);
+            const payload = {
+                projectType: 'playcanvas',
+                variants: scenes,
+                context: {
+                    mainSceneId,
+                    gameConfigPath,
+                    usesMetaDataForSet: gameConfigPath == null,
+                },
+            };
             outputResult(asJson, payload, () => {
                 console.log(`项目类型: ${projectTypeLabel('lite-creator')}`);
                 console.log('');
@@ -432,8 +546,19 @@ export function registerPrefabCommands(program) {
                     return;
                 }
                 for (const s of scenes) {
-                    const gc = s.gameConfigPath ? `  [${s.gameConfigPath}]` : '';
-                    console.log(`  ${s.name}  (${s.id})${gc}`);
+                    const mark = s.isActive ? ' *' : '';
+                    const pathLabel = s.gameConfigPath ?? NO_SCENE_GAMECONFIG_LABEL;
+                    console.log(`  ${s.name}  (${s.id})  [${pathLabel}]${mark}`);
+                }
+                if (scenes.some((v) => v.isActive)) {
+                    console.log('');
+                    console.log('标 *：manifest 首位场景（当前活跃场景，与 Remix 编辑器一致）。' +
+                        ' 未带 --variant：优先该场景 GameConfig；若无路径则 list 读 DefaultGame 扩展、set 写 MetaData。' +
+                        ' 可用 `prefab switch <sceneId>` 切换活跃场景。');
+                }
+                else {
+                    console.log('');
+                    console.log(`无场景：未带 --variant 时扩展来自 ${DEFAULT_GAME_PATH}，set / set-batch 写入各扩展 MetaData.json。`);
                 }
             });
         }
@@ -466,6 +591,9 @@ export function registerPrefabCommands(program) {
             if (systemType === 'external-theme' && !opts.variant) {
                 variantNote = resolveThemeId(projectDir, opts);
             }
+            else if (systemType === 'lite-creator') {
+                variantNote = liteCreatorVariantHumanNote(projectDir, opts.variant);
+            }
             const summary = buildSummary(systemType, variantResolved, all);
             const filtered = filterPrefabsList(all, {
                 match: opts.match,
@@ -818,18 +946,12 @@ export function registerPrefabCommands(program) {
             });
         }
         else {
-            const configPath = resolveGameConfigPathForVariant(projectDir, opts.variant);
-            const gameConfigJson = loadGameConfig(projectDir, configPath);
-            const { config } = parseGameConfig(gameConfigJson);
             const metaMap = scanExtensionMetaData(projectDir);
             const meta = metaMap.get(key);
             if (!meta) {
                 console.error(`Error: extension "${key}" 不存在。`);
                 process.exit(1);
             }
-            const configKey = meta.configPath ? parseConfigKey(meta.configPath) : meta.name;
-            const existingKey = findConfigKeyCaseInsensitive(config, configKey);
-            const currentValues = (existingKey ? config[existingKey] : {}) ?? {};
             const fieldDef = meta.configSchema?.[field];
             const fieldType = fieldDef?.type ?? 'string';
             const coerced = coerceValue(rawValue, fieldType);
@@ -840,9 +962,20 @@ export function registerPrefabCommands(program) {
                     process.exit(1);
                 }
             }
-            const newValues = { ...currentValues, [field]: coerced };
-            const updated = updateGameConfigValue(gameConfigJson, configKey, newValues);
-            writeGameConfig(projectDir, configPath, updated);
+            const configPath = resolveGameConfigPathForVariant(projectDir, opts.variant);
+            if (configPath) {
+                const gameConfigJson = loadGameConfig(projectDir, configPath);
+                const { config } = parseGameConfig(gameConfigJson);
+                const configKey = meta.configPath ? parseConfigKey(meta.configPath) : meta.name;
+                const existingKey = findConfigKeyCaseInsensitive(config, configKey);
+                const currentValues = (existingKey ? config[existingKey] : {}) ?? {};
+                const newValues = { ...currentValues, [field]: coerced };
+                const updated = updateGameConfigValue(gameConfigJson, configKey, newValues);
+                writeGameConfig(projectDir, configPath, updated);
+            }
+            else {
+                writeMetaDataDefault(projectDir, key, field, coerced);
+            }
             const payload = { success: true, key, field, value: coerced };
             outputResult(asJson, payload, () => {
                 console.log(`已更新 ${key}.${field} = ${formatHumanValue(coerced)}`);
@@ -940,38 +1073,65 @@ export function registerPrefabCommands(program) {
             }
             else {
                 const configPath = resolveGameConfigPathForVariant(projectDir, opts.variant);
-                let gameConfigJson = loadGameConfig(projectDir, configPath);
                 const metaMap = scanExtensionMetaData(projectDir);
-                for (const [extKey, fieldMap] of Object.entries(batch)) {
-                    if (!fieldMap || typeof fieldMap !== 'object' || Array.isArray(fieldMap)) {
-                        throw new Error(`extension "${extKey}" 的值必须是对象（字段 map）`);
-                    }
-                    const meta = metaMap.get(extKey);
-                    if (!meta) {
-                        throw new Error(`extension "${extKey}" 不存在`);
+                if (configPath) {
+                    let gameConfigJson = loadGameConfig(projectDir, configPath);
+                    for (const [extKey, fieldMap] of Object.entries(batch)) {
+                        if (!fieldMap || typeof fieldMap !== 'object' || Array.isArray(fieldMap)) {
+                            throw new Error(`extension "${extKey}" 的值必须是对象（字段 map）`);
+                        }
+                        const meta = metaMap.get(extKey);
+                        if (!meta) {
+                            throw new Error(`extension "${extKey}" 不存在`);
+                        }
+                        const configKey = meta.configPath ? parseConfigKey(meta.configPath) : meta.name;
+                        const { config } = parseGameConfig(gameConfigJson);
+                        const existingKey = findConfigKeyCaseInsensitive(config, configKey);
+                        let currentValues = (existingKey ? config[existingKey] : {}) ?? {};
+                        currentValues = typeof currentValues === 'object' && !Array.isArray(currentValues)
+                            ? { ...currentValues }
+                            : {};
+                        for (const [field, rawVal] of Object.entries(fieldMap)) {
+                            const fieldDef = meta.configSchema?.[field];
+                            const fieldType = fieldDef?.type ?? 'string';
+                            const coerced = coerceBatchLeaf(rawVal, fieldType);
+                            if (fieldDef) {
+                                const result = validateConfigValue(fieldDef, coerced);
+                                if (!result.valid) {
+                                    throw new Error(`${extKey}.${field}: ${result.errors.join('; ')}`);
+                                }
+                            }
+                            currentValues = setByDotPath(currentValues, field, coerced);
+                        }
+                        gameConfigJson = updateGameConfigValue(gameConfigJson, configKey, currentValues);
                     }
-                    const configKey = meta.configPath ? parseConfigKey(meta.configPath) : meta.name;
-                    const { config } = parseGameConfig(gameConfigJson);
-                    const existingKey = findConfigKeyCaseInsensitive(config, configKey);
-                    let currentValues = (existingKey ? config[existingKey] : {}) ?? {};
-                    currentValues = typeof currentValues === 'object' && !Array.isArray(currentValues)
-                        ? { ...currentValues }
-                        : {};
-                    for (const [field, rawVal] of Object.entries(fieldMap)) {
-                        const fieldDef = meta.configSchema?.[field];
-                        const fieldType = fieldDef?.type ?? 'string';
-                        const coerced = coerceBatchLeaf(rawVal, fieldType);
-                        if (fieldDef) {
-                            const result = validateConfigValue(fieldDef, coerced);
-                            if (!result.valid) {
-                                throw new Error(`${extKey}.${field}: ${result.errors.join('; ')}`);
+                    writeGameConfig(projectDir, configPath, gameConfigJson);
+                }
+                else {
+                    for (const [extKey, fieldMap] of Object.entries(batch)) {
+                        if (!fieldMap || typeof fieldMap !== 'object' || Array.isArray(fieldMap)) {
+                            throw new Error(`extension "${extKey}" 的值必须是对象（字段 map）`);
+                        }
+                        const meta = metaMap.get(extKey);
+                        if (!meta) {
+                            throw new Error(`extension "${extKey}" 不存在`);
+                        }
+                        const coercedValues = {};
+                        for (const [field, rawVal] of Object.entries(fieldMap)) {
+                            const fieldDef = meta.configSchema?.[field];
+                            const fieldType = fieldDef?.type ?? 'string';
+                            const coerced = coerceBatchLeaf(rawVal, fieldType);
+                            if (fieldDef) {
+                                const result = validateConfigValue(fieldDef, coerced);
+                                if (!result.valid) {
+                                    throw new Error(`${extKey}.${field}: ${result.errors.join('; ')}`);
+                                }
                             }
+                            coercedValues[field] = coerced;
                         }
-                        currentValues = setByDotPath(currentValues, field, coerced);
+                        writeMetaDataDefaults(projectDir, extKey, coercedValues);
                     }
-                    gameConfigJson = updateGameConfigValue(gameConfigJson, configKey, currentValues);
                 }
-                writeGameConfig(projectDir, configPath, gameConfigJson);
             }
             const payload = { success: true, updatedKeys: Object.keys(batch) };
             outputResult(asJson, payload, () => {
@@ -1011,7 +1171,7 @@ export function registerPrefabCommands(program) {
             });
         }
         else {
-            const configPath = resolveGameConfigPathForVariant(projectDir, opts.variant);
+            const configPath = resolveGameConfigPathForVariant(projectDir, opts.variant) ?? DEFAULT_GAME_PATH;
             const gameConfigJson = loadGameConfig(projectDir, configPath);
             const { extensions } = parseGameConfig(gameConfigJson);
             if (extensions.includes(key)) {
@@ -1055,7 +1215,7 @@ export function registerPrefabCommands(program) {
             });
         }
         else {
-            const configPath = resolveGameConfigPathForVariant(projectDir, opts.variant);
+            const configPath = resolveGameConfigPathForVariant(projectDir, opts.variant) ?? DEFAULT_GAME_PATH;
             const gameConfigJson = loadGameConfig(projectDir, configPath);
             const { extensions } = parseGameConfig(gameConfigJson);
             const filtered = extensions.filter((n) => n !== key);
@@ -1105,14 +1265,19 @@ export function registerPrefabCommands(program) {
                 console.error(`Error: 场景 "${variant}" 不存在。可用: ${scenes.map((s) => `${s.name}(${s.id})`).join(', ')}`);
                 process.exit(1);
             }
+            const manifestRaw = readLocalFile(projectDir, MANIFEST_PATH);
+            const manifestJson = JSON.parse(manifestRaw);
+            const reordered = reorderManifestDefaultScene(manifestJson, found.id);
+            if (reordered && reordered !== manifestJson) {
+                writeFileSync(join(projectDir, MANIFEST_PATH), JSON.stringify(reordered, null, 2), 'utf-8');
+            }
             const payload = {
                 success: true,
                 activeVariant: found.id,
-                message: `PlayCanvas 场景上下文已设为 "${found.name}"。后续命令使用 --variant ${found.id} 来操作此场景的配置。`,
+                message: `PlayCanvas 场景已切换为 "${found.name}" 并写入 manifest.json。`,
             };
             outputResult(asJson, payload, () => {
-                console.log(`PlayCanvas 场景上下文已设为「${found.name}」 (${found.id})。`);
-                console.log(`后续命令请使用 --variant ${found.id} 操作该场景的配置。`);
+                console.log(`已切换活跃场景为「${found.name}」 (${found.id})，manifest.json 已更新。`);
             });
         }
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@playcraft/cli",
-  "version": "0.0.32",
+  "version": "0.0.34",
   "private": false,
   "type": "module",
   "bin": {
@@ -23,8 +23,8 @@
     "release": "node scripts/release.js"
   },
   "dependencies": {
-    "@playcraft/build": "^0.0.33",
-    "@playcraft/common": "^0.0.20",
+    "@playcraft/build": "^0.0.35",
+    "@playcraft/common": "^0.0.22",
     "chokidar": "^4.0.3",
     "commander": "^13.1.0",
     "cors": "^2.8.6",