@dreamerbird/camera-studio 0.1.0 → 0.3.0

package/dist/assetLibrary/importPipeline.js

@@ -1,17 +1,28 @@
 import { translate } from '@dreamerbird/studio/i18n';
 import { classifyModel, validatePoseJson } from './classify';
 import { createGLTFLoader } from './gltfLoader';
+import { createResourceUrlModifier } from './gltfResourceSet';
 import { exportAnimationGLB, exportModelGLB } from './exportGLB';
 import { hashBytes } from './hash';
 import { collectBoneNames, meshStats, rigIdOf } from './rig';
-export const realImportDeps = () => ({
-    load: defaultLoad,
+export const realImportDeps = (files) => ({
+    load: (file) => defaultLoad(file, files),
     exportModel: exportModelGLB,
     exportAnimation: exportAnimationGLB,
 });
-async function defaultLoad(file) {
+async function defaultLoad(file, resourceFiles) {
     const { FBXLoader } = await import('three-stdlib');
     const { LoadingManager } = await import('three');
+    if (resourceFiles && /\.gltf$/i.test(file.name)) {
+        const resources = createResourceUrlModifier(resourceFiles);
+        try {
+            const gltf = await createGLTFLoader(resources.manager).parseAsync(await file.text(), '');
+            return { root: gltf.scene, animations: gltf.animations };
+        }
+        finally {
+            resources.dispose();
+        }
+    }
     const url = URL.createObjectURL(file);
     try {
         if (/\.glb$|\.gltf$/i.test(file.name)) {
@@ -81,6 +92,7 @@ export async function planImport(files, library, deps, tr = translate) {
                 items.push({
                     type: 'skip',
                     name: file.name,
+                    sourceFile: file.name,
                     reason: tr('pg.import.reason.badPoseJson'),
                 });
             }
@@ -88,6 +100,7 @@ export async function planImport(files, library, deps, tr = translate) {
                 items.push({
                     type: 'pose',
                     name: baseName(file.name),
+                    sourceFile: file.name,
                     rig: parsed.rig,
                     bones: parsed.bones,
                 });
@@ -102,6 +115,7 @@ export async function planImport(files, library, deps, tr = translate) {
             items.push({
                 type: 'skip',
                 name: file.name,
+                sourceFile: file.name,
                 reason: tr('pg.import.reason.parseFailed'),
             });
             continue;
@@ -111,6 +125,7 @@ export async function planImport(files, library, deps, tr = translate) {
             items.push({
                 type: 'skip',
                 name: file.name,
+                sourceFile: file.name,
                 reason: tr('pg.import.reason.noContent'),
             });
             continue;
@@ -128,6 +143,7 @@ export async function planImport(files, library, deps, tr = translate) {
                 items.push({
                     type: 'skip',
                     name: baseName(file.name),
+                    sourceFile: file.name,
                     reason: tr('pg.import.reason.modelExportFailed'),
                 });
             }
@@ -140,6 +156,7 @@ export async function planImport(files, library, deps, tr = translate) {
                     const index = items.push({
                         type: 'model',
                         name: baseName(file.name),
+                        sourceFile: file.name,
                         rig,
                         contentHash,
                         boneCount,
@@ -163,7 +180,9 @@ export async function planImport(files, library, deps, tr = translate) {
                     items.push({
                         type: 'skip',
                         name: baseName(file.name),
+                        sourceFile: file.name,
                         reason: tr('pg.import.reason.modelExists', { name: dup.name }),
+                        duplicate: true,
                     });
                 }
                 // dup 命中:模型跳过,下面的动作照常提取
@@ -180,6 +199,7 @@ export async function planImport(files, library, deps, tr = translate) {
                 items.push({
                     type: 'skip',
                     name: `${baseName(file.name)}/${clip.name}`,
+                    sourceFile: file.name,
                     reason: tr('pg.import.reason.animationExportFailed'),
                 });
                 continue;
@@ -189,13 +209,16 @@ export async function planImport(files, library, deps, tr = translate) {
                 items.push({
                     type: 'skip',
                     name: `${baseName(file.name)}/${clip.name}`,
+                    sourceFile: file.name,
                     reason: tr('pg.import.reason.animationExists'),
+                    duplicate: true,
                 });
                 continue;
             }
             items.push({
                 type: 'animation',
                 name: clip.name || baseName(file.name),
+                sourceFile: file.name,
                 rig,
                 contentHash,
                 duration: clip.duration,
@@ -205,6 +228,14 @@ export async function planImport(files, library, deps, tr = translate) {
     }
     return { items, similar, summary: summarize(items, tr) };
 }
+export class ImportItemWriteError extends Error {
+    constructor(item, cause) {
+        super(`导入项 ${item.name} 写入失败: ${cause instanceof Error ? cause.message : String(cause)}`);
+        this.item = item;
+        this.cause = cause;
+        this.name = 'ImportItemWriteError';
+    }
+}
 /** 落库:choices 与 plan.similar 一一对应,'reuse' 丢弃对应 model 项 */
 export async function executeImport(plan, choices, library) {
     const drop = new Set(plan.similar.filter((_, i) => choices[i] === 'reuse').map((s) => s.index));
@@ -212,42 +243,47 @@ export async function executeImport(plan, choices, library) {
         const item = plan.items[i];
         if (item.type === 'skip')
             continue;
-        if (item.type === 'model') {
-            if (drop.has(i))
-                continue;
-            await library.putBlobWithEntry(new Blob([item.glb]), (blobId) => ({
-                id: newId(),
-                kind: 'model',
-                name: item.name,
-                rig: item.rig,
-                blobId,
-                contentHash: item.contentHash,
-                boneCount: item.boneCount,
-                vertexCount: item.vertexCount,
-                createdAt: Date.now(),
-            }));
-        }
-        else if (item.type === 'animation') {
-            await library.putBlobWithEntry(new Blob([item.glb]), (blobId) => ({
-                id: newId(),
-                kind: 'animation',
-                name: item.name,
-                rig: item.rig,
-                blobId,
-                contentHash: item.contentHash,
-                duration: item.duration,
-                createdAt: Date.now(),
-            }));
+        try {
+            if (item.type === 'model') {
+                if (drop.has(i))
+                    continue;
+                await library.putBlobWithEntry(new Blob([item.glb]), (blobId) => ({
+                    id: newId(),
+                    kind: 'model',
+                    name: item.name,
+                    rig: item.rig,
+                    blobId,
+                    contentHash: item.contentHash,
+                    boneCount: item.boneCount,
+                    vertexCount: item.vertexCount,
+                    createdAt: Date.now(),
+                }));
+            }
+            else if (item.type === 'animation') {
+                await library.putBlobWithEntry(new Blob([item.glb]), (blobId) => ({
+                    id: newId(),
+                    kind: 'animation',
+                    name: item.name,
+                    rig: item.rig,
+                    blobId,
+                    contentHash: item.contentHash,
+                    duration: item.duration,
+                    createdAt: Date.now(),
+                }));
+            }
+            else {
+                await library.putEntry({
+                    id: newId(),
+                    kind: 'pose',
+                    name: item.name,
+                    rig: item.rig,
+                    bones: item.bones,
+                    createdAt: Date.now(),
+                });
+            }
         }
-        else {
-            await library.putEntry({
-                id: newId(),
-                kind: 'pose',
-                name: item.name,
-                rig: item.rig,
-                bones: item.bones,
-                createdAt: Date.now(),
-            });
+        catch (error) {
+            throw new ImportItemWriteError(item, error);
         }
     }
 }

package/dist/assetLibrary/importPipeline.test.js

@@ -185,4 +185,29 @@ describe('executeImport', () => {
         await executeImport(plan, ['keep'], lib);
         expect((await backend.listEntries('model')).length).toBe(1);
     });
+    it('第二个模型写库失败时保留实际失败项与原始错误', async () => {
+        const backend = memoryBackend();
+        let writes = 0;
+        backend.putBlob = async () => {
+            writes++;
+            if (writes === 2)
+                throw new Error('disk full');
+            return `blob-${writes}`;
+        };
+        const lib = new Library({ sources: [backend] });
+        const deps = depsFor({
+            'a.fbx': { root: skinnedModel('Hips'), animations: [] },
+            'b.fbx': { root: skinnedModel('Spine'), animations: [] },
+        });
+        deps.exportModel = async (root) => {
+            const names = [];
+            root.traverse((object) => names.push(object.name));
+            return new TextEncoder().encode(names.join('|')).buffer;
+        };
+        const plan = await planImportZh([file('a.fbx'), file('b.fbx')], backend, deps);
+        await expect(executeImport(plan, [], lib)).rejects.toMatchObject({
+            item: { name: 'b', sourceFile: 'b.fbx' },
+            cause: new Error('disk full'),
+        });
+    });
 });

package/dist/assetLibrary/library.d.ts

@@ -84,6 +84,7 @@ export declare class Library {
     listBlobIds(): Promise<string[]>;
     /** 所有条目引用的 blob id 集合(模型 blobId + thumbnailId) */
     private referencedBlobIds;
+    private referencedBlobIdsForRollback;
     /** 删条目并清理它的 blob;blob 被其他条目共享时保留 */
     deleteEntryDeep(id: string): Promise<void>;
     /** 清理无条目引用的孤儿 blob,返回删除数量 */

package/dist/assetLibrary/library.d.ts.map

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

package/dist/assetLibrary/library.js

@@ -238,7 +238,16 @@ export class Library {
         await this.enqueue(async () => {
             const writable = this.requireWritable();
             const blobId = await writable.putBlob(data);
-            await writable.putEntry(makeEntry(blobId));
+            try {
+                await writable.putEntry(makeEntry(blobId));
+            }
+            catch (error) {
+                const referenced = await this.referencedBlobIdsForRollback().catch(() => undefined);
+                if (referenced && !referenced.has(blobId)) {
+                    await writable.deleteBlob(blobId).catch(() => { });
+                }
+                throw error;
+            }
             this.emit();
         });
     }
@@ -265,6 +274,18 @@ export class Library {
         }
         return ids;
     }
+    async referencedBlobIdsForRollback() {
+        const catalogs = await Promise.all(this.sources.map((source) => source.listEntries()));
+        const ids = new Set();
+        for (const entry of catalogs.flat()) {
+            if ('blobId' in entry)
+                ids.add(entry.blobId);
+            if ('thumbnailId' in entry && entry.thumbnailId) {
+                ids.add(entry.thumbnailId);
+            }
+        }
+        return ids;
+    }
     /** 删条目并清理它的 blob;blob 被其他条目共享时保留 */
     async deleteEntryDeep(id) {
         await this.enqueue(async () => {

package/dist/assetLibrary/library.test.js

@@ -400,6 +400,82 @@ describe('骨架族别名并集读(终审 M-4)', () => {
     });
 });
 describe('blob 生命周期', () => {
+    test('putBlobWithEntry rolls back the upload when entry creation fails', async () => {
+        const backend = memoryBackend();
+        const failure = new Error('entry write failed');
+        backend.putEntry = async () => {
+            throw failure;
+        };
+        backend.deleteBlob = jest.fn(async () => { });
+        const lib = new Library({ sources: [backend] });
+        await expect(lib.putBlobWithEntry(new Blob(['model']), model)).rejects.toBe(failure);
+        expect(backend.deleteBlob).toHaveBeenCalledWith('blob-x');
+    });
+    test('putBlobWithEntry preserves a blob referenced by an existing entry after a later failure', async () => {
+        const backend = new IndexedDBBackend();
+        const lib = new Library({ sources: [backend] });
+        const bytes = new Blob(['shared-model-bytes']);
+        let sharedBlobId = '';
+        await lib.putBlobWithEntry(bytes, (blobId) => {
+            sharedBlobId = blobId;
+            return { ...model('shared-original'), blobId, contentHash: blobId };
+        });
+        const failure = new Error('second entry write failed');
+        backend.putEntry = async () => {
+            throw failure;
+        };
+        await expect(lib.putBlobWithEntry(bytes, (blobId) => ({
+            ...model('shared-second'),
+            blobId,
+            contentHash: blobId,
+        }))).rejects.toBe(failure);
+        expect(await lib.listBlobIds()).toContain(sharedBlobId);
+        expect(await lib.getEntry('shared-original')).toMatchObject({
+            blobId: sharedBlobId,
+        });
+    });
+    test('putBlobWithEntry preserves shared bytes and the original error when any source cannot be enumerated', async () => {
+        const backend = new IndexedDBBackend();
+        const sourceFailure = new Error('catalog source unavailable');
+        let sourceEntries = [];
+        let sourceUnavailable = false;
+        const unavailableSource = {
+            id: 'unavailable-source',
+            listEntries: async () => {
+                if (sourceUnavailable)
+                    throw sourceFailure;
+                return sourceEntries;
+            },
+            getEntry: async (id) => sourceEntries.find((entry) => entry.id === id),
+            getBlobUrl: async () => {
+                throw sourceFailure;
+            },
+        };
+        const lib = new Library({ sources: [backend, unavailableSource] });
+        const bytes = new Blob(['shared-partial-catalog-bytes']);
+        let sharedBlobId = '';
+        await lib.putBlobWithEntry(bytes, (blobId) => {
+            sharedBlobId = blobId;
+            return { ...model('shared-partial-original'), blobId, contentHash: blobId };
+        });
+        sourceEntries = [(await backend.getEntry('shared-partial-original'))];
+        await backend.deleteEntry('shared-partial-original');
+        sourceUnavailable = true;
+        const failure = new Error('partial catalog entry write failed');
+        backend.putEntry = async () => {
+            throw failure;
+        };
+        await expect(lib.putBlobWithEntry(bytes, (blobId) => ({
+            ...model('shared-partial-second'),
+            blobId,
+            contentHash: blobId,
+        }))).rejects.toBe(failure);
+        await expect(backend.getBlobUrl(sharedBlobId)).resolves.toBe('blob:mock-url');
+        expect(await unavailableSource.getEntry('shared-partial-original')).toMatchObject({
+            blobId: sharedBlobId,
+        });
+        await backend.deleteBlob(sharedBlobId);
+    });
     test('deleteEntryDeep: 缩略图被两个模型共享时,删一个不删 blob', async () => {
         const lib = new Library({ sources: [new IndexedDBBackend()] });
         const thumbId = await lib.putBlob(new Blob(['thumb']));

package/dist/assetLibrary/seedAssetsManifest.js

@@ -3,7 +3,7 @@ export const seedAssetsManifest = {
         {
             key: 'y-bot',
             file: 'Y Bot.glb',
-            contentHash: '95cbcdd2192dbe68',
+            contentHash: 'fc55d96ed9b27445',
             name: 'Y Bot',
             rig: 'rig-16a71e249f45355b',
             boneCount: 117,

package/dist/bootstrap.d.ts

@@ -7,7 +7,7 @@ export interface BootCtx {
     library: Library;
     unregisterEditors: () => void;
     /** 节流通道手动 flush:dispose 时调用,尾部变更不丢 */
-    flushState: () => void;
+    flushState: () => Promise<void>;
     /**
      * 状态通道入口:生产由 project 历史指针订阅喂入,测试可直接调。
      * 尾部节流(缺省 1000ms)后转给 config.state.onStateChange。
@@ -34,4 +34,5 @@ export declare function isBootedWithDifferentConfig(config: CameraStudioConfig):
 export declare function getBootConfig(): CameraStudioConfig | undefined;
 export declare function initCameraStudio(config: CameraStudioConfig): Promise<BootCtx>;
 export declare function disposeCameraStudio(ctx?: BootCtx): Promise<void>;
+export declare function resetCameraStudio(): Promise<void>;
 //# sourceMappingURL=bootstrap.d.ts.map

package/dist/bootstrap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":"AAuBA,OAAO,qBAAqB,CAAA;AAO5B,OAAO,KAAK,EAAC,gBAAgB,EAAE,kBAAkB,EAAC,MAAM,UAAU,CAAA;AAKlE,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,wBAAwB,CAAA;AAmBnD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,aAAa,CAAA;AAOhD,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,kBAAkB,CAAA;IAC1B,OAAO,EAAE,OAAO,CAAA;IAChB,iBAAiB,EAAE,MAAM,IAAI,CAAA;IAC7B,sCAAsC;IACtC,UAAU,EAAE,MAAM,IAAI,CAAA;IACtB;;;OAGG;IACH,iBAAiB,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;IAC7C,UAAU,EAAE,gBAAgB,CAAA;IAC5B,uDAAuD;IACvD,GAAG,EAAE,eAAe,CAAA;CACrB;AAYD;;;GAGG;AACH,wBAAgB,2BAA2B,IAAI,MAAM,CAEpD;AACD,wBAAgB,2BAA2B,IAAI,MAAM,CAEpD;AAqBD,+DAA+D;AAC/D,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,kBAAkB,GACzB,gBAAgB,CAMlB;AA0CD;;;GAGG;AACH,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAIT;AAED,0DAA0D;AAC1D,wBAAgB,aAAa,IAAI,kBAAkB,GAAG,SAAS,CAE9D;AA6QD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CA4B7E;AAED,wBAAsB,mBAAmB,CAAC,GAAG,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAMtE"}
+{"version":3,"file":"bootstrap.d.ts","sourceRoot":"","sources":["../src/bootstrap.ts"],"names":[],"mappings":"AAwBA,OAAO,qBAAqB,CAAA;AAS5B,OAAO,KAAK,EAAC,gBAAgB,EAAE,kBAAkB,EAAC,MAAM,UAAU,CAAA;AAKlE,OAAO,KAAK,EAAC,OAAO,EAAC,MAAM,wBAAwB,CAAA;AAqBnD,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,aAAa,CAAA;AAOhD,MAAM,WAAW,OAAO;IACtB,MAAM,EAAE,kBAAkB,CAAA;IAC1B,OAAO,EAAE,OAAO,CAAA;IAChB,iBAAiB,EAAE,MAAM,IAAI,CAAA;IAC7B,sCAAsC;IACtC,UAAU,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/B;;;OAGG;IACH,iBAAiB,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,IAAI,CAAA;IAC7C,UAAU,EAAE,gBAAgB,CAAA;IAC5B,uDAAuD;IACvD,GAAG,EAAE,eAAe,CAAA;CACrB;AAaD;;;GAGG;AACH,wBAAgB,2BAA2B,IAAI,MAAM,CAEpD;AACD,wBAAgB,2BAA2B,IAAI,MAAM,CAEpD;AAuBD,+DAA+D;AAC/D,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,kBAAkB,GACzB,gBAAgB,CASlB;AA0CD;;;GAGG;AACH,wBAAgB,2BAA2B,CACzC,MAAM,EAAE,kBAAkB,GACzB,OAAO,CAIT;AAED,0DAA0D;AAC1D,wBAAgB,aAAa,IAAI,kBAAkB,GAAG,SAAS,CAE9D;AAoRD,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC,OAAO,CAAC,CA6B7E;AAED,wBAAsB,mBAAmB,CAAC,GAAG,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAMtE;AAED,wBAAgB,iBAAiB,IAAI,OAAO,CAAC,IAAI,CAAC,CA4CjD"}

package/dist/bootstrap.js

@@ -5,7 +5,8 @@
  *
  * 生命周期分层(R14):
  * - boot 级(一次性,initPromise 保留):Library 单例、IDB 连接、词典、
- *   theatre.init、project 解析、节流机械。重挂幂等复用,dispose 不拆。
+ *   theatre.init、project 解析、节流机械。重挂幂等复用,dispose 不拆;
+ *   显式场景切换可在全部消费者卸载后经 resetCameraStudio 清空重 boot。
  * - 会话级(每次挂载 acquire,dispose 拆解):3 个自定义属性编辑器注册、
  *   state 通道订阅、studio.ui 显隐。picker 注册表与宿主句柄由各自模块
  *   自管(CameraScene 组件挂载时接线),这里不碰。
@@ -18,6 +19,8 @@ import theatre, { getProject, getStudio, getStudioSync, onChange, } from '@dream
 import '@dreamerbird/studio';
 import { initState } from '@dreamerbird/core/initState';
 import { privateAPI } from '@dreamerbird/core/privateAPIs';
+import projectsSingleton from '@dreamerbird/core/projects/projectsSingleton';
+import getStudioInternal from '@dreamerbird/studio/getStudio';
 import { registerCustomPropEditor, unregisterCustomPropEditor, } from '@dreamerbird/studio/propEditors/customPropEditors';
 import { cameraErrorFromLibrary, cameraErrorFromUnknown } from './errors';
 import { registerCameraMessages } from './i18n';
@@ -28,9 +31,11 @@ import { StaticCatalogSource } from './assetLibrary/staticCatalogSource';
 import { isWritableSource } from './assetLibrary/source';
 import { cleanupLegacySeeds } from './assetLibrary/legacySeedCleanup';
 import { setUiConfig } from './uiConfig';
+import { mountStudioRootWhenReady } from './studioRoot';
 import PosePropEditor from './poseMode/PosePropEditor';
 import { GesturePropEditorLeft, GesturePropEditorRight, } from './gesturePropsEditor';
 import { createAgentRuntime } from './agent/runtime';
+import { clearSceneSheetObjects } from './agent/runtime/objectRuntime';
 import { activateCameraStudioApi, disposeCameraStudioApi, getActiveAgentRegistry, getCameraStudioApi, } from './agent/api';
 import { createAgentBridgeClient } from './agent/bridgeClient';
 /** 内置 IDB 缺省库名(与现状一字不差,硬约束:老用户浏览器里的库零迁移) */
@@ -40,6 +45,7 @@ let initPromise;
 let bootConfig;
 /** 漂移告警只发一次(同页多次重挂不同 config 不刷屏) */
 let warnedConfigDrift = false;
+let resetPromise;
 /** 会话拆解函数;undefined = 当前无活跃会话(acquire 幂等守卫) */
 let sessionTeardown;
 /** 消费者计数由 hook 管(acquire/release 成对);dispose 据此做末位守卫 */
@@ -65,7 +71,12 @@ function resolveProject(config) {
     }
     const name = config.project ?? 'Space';
     const initialState = config.state?.initialState;
-    return getProject(name, initialState === undefined ? {} : { state: initialState });
+    return getProject(name, {
+        ...(initialState === undefined ? {} : { state: initialState }),
+        ...(config.ui?.projectName === undefined
+            ? {}
+            : { name: config.ui.projectName }),
+    });
 }
 /** sceneProps 同步解析(hook 首帧就要返回;getProject 渲染期调用安全,App 既有先例) */
 export function resolveSceneProps(config) {
@@ -73,6 +84,9 @@ export function resolveSceneProps(config) {
         project: resolveProject(config),
         onFlows: config.flows?.onFlows,
         onError: config.onError,
+        ...(config.scene?.includeDemoModel === undefined
+            ? {}
+            : { includeDemoModel: config.scene.includeDemoModel }),
     };
 }
 /** 参与漂移比对的顶层配置键(flows 回调引用每次渲染都新,不比) */
@@ -185,6 +199,13 @@ async function boot(config) {
     if (config.ui?.hideLeftStrip) {
         withStudioUi((ui) => ui.setLeftStripHidden(true));
     }
+    if (config.ui?.panels) {
+        const panels = config.ui.panels;
+        withStudioUi((ui) => ui.setPanelVisibility(panels));
+    }
+    withStudioUi(() => {
+        void mountStudioRootWhenReady(config.ui?.portalContainer);
+    });
     // 1. 数据源:可写源(若有) + 内置目录,聚合进 Library 单例
     const { sources, idbName } = resolveSources(config);
     const catalog = new StaticCatalogSource({
@@ -238,7 +259,7 @@ async function boot(config) {
     let pendingContent;
     let hasPending = false;
     let timer;
-    const flushState = () => {
+    const flushState = async () => {
         if (timer !== undefined) {
             clearTimeout(timer);
             timer = undefined;
@@ -248,7 +269,7 @@ async function boot(config) {
         hasPending = false;
         const content = pendingContent;
         pendingContent = undefined;
-        config.state?.onStateChange?.(content);
+        await config.state?.onStateChange?.(content);
     };
     const notifyStateChange = (content) => {
         if (!config.state?.onStateChange)
@@ -277,7 +298,7 @@ async function boot(config) {
 }
 /** studio.ui 显隐操作:studio 未挂载(宿主以 studio:false init 等)时静默降级 */
 function withStudioUi(fn) {
-    Promise.resolve()
+    return Promise.resolve()
         .then(() => getStudio())
         .then(async (studio) => {
         // 必须等 studio 初始化收尾(持久化/同步状态恢复落库)再读写显隐:
@@ -352,11 +373,13 @@ function acquireSession(ctx) {
         ctx.unregisterEditors();
         unsubState?.();
         // 先断订阅再 flush:尾部变更带给宿主,不丢
-        ctx.flushState();
-        withStudioUi((ui) => ui.hide());
+        await ctx.flushState();
+        await withStudioUi((ui) => ui.hide());
     };
 }
 export function initCameraStudio(config) {
+    if (resetPromise)
+        return resetPromise.then(() => initCameraStudio(config));
     if (!initPromise) {
         bootConfig = config;
         const p = boot(config);
@@ -392,3 +415,42 @@ export async function disposeCameraStudio(ctx) {
         return;
     await sessionTeardown?.();
 }
+export function resetCameraStudio() {
+    if (resetPromise)
+        return resetPromise;
+    const previousInit = initPromise;
+    resetPromise = (async () => {
+        if (activeConsumers > 0) {
+            throw new Error('resetCameraStudio requires all camera-studio consumers to be unmounted');
+        }
+        const previousCtx = previousInit
+            ? await previousInit.catch(() => undefined)
+            : undefined;
+        if (activeConsumers > 0) {
+            throw new Error('resetCameraStudio requires all camera-studio consumers to be unmounted');
+        }
+        await sessionTeardown?.();
+        clearSceneSheetObjects();
+        if (previousCtx) {
+            const projectId = previousCtx.sceneProps.project.address.projectId;
+            projectsSingleton.remove(projectId);
+            const studio = getStudioInternal();
+            if (studio) {
+                studio.transaction(({ stateEditors }) => {
+                    stateEditors.deleteProject({ projectId });
+                }, false);
+                studio.ephemeralAtom.reduceByPointer((p) => p.coreByProject, (projects) => {
+                    const next = { ...projects };
+                    delete next[projectId];
+                    return next;
+                });
+            }
+        }
+        initPromise = undefined;
+        bootConfig = undefined;
+        warnedConfigDrift = false;
+    })().finally(() => {
+        resetPromise = undefined;
+    });
+    return resetPromise;
+}