diff --git a/blender-5.2.0/source/blender/web_engine/web_engine_python_bootstrap.py b/blender-5.2.0/source/blender/web_engine/web_engine_python_bootstrap.py index c9a016b80..cc7bf567b 100644 --- a/blender-5.2.0/source/blender/web_engine/web_engine_python_bootstrap.py +++ b/blender-5.2.0/source/blender/web_engine/web_engine_python_bootstrap.py @@ -545,7 +545,7 @@ def desktop_operator(request, *, _invoke=False): converted[name] = value return converted - with context.temp_override(window=window, area=target[0], region=target[1]): + with context.temp_override(window=window, screen=window.screen, area=target[0], region=target[1]): active = context.active_object if native and point_cache_target is not None and (active is None or active.session_uid != point_cache_target['ownerSessionUid']): raise RuntimeError('OPERATOR_POINT_CACHE_OWNER_CHANGED') diff --git a/docs/status/WBV2-P1425-001-web-operator-dispatch.md b/docs/status/WBV2-P1425-001-web-operator-dispatch.md index 79bbfdc07..a8fbc8ff5 100644 --- a/docs/status/WBV2-P1425-001-web-operator-dispatch.md +++ b/docs/status/WBV2-P1425-001-web-operator-dispatch.md @@ -383,6 +383,21 @@ `tests/golden` 其余约 21 GB 证据、`web/app/dist-snapshot`(487 MB)、 `COURSE-FULL-001/video`(110 MB)。 +## 视图层与重复操作(2026-11-14) + +- 视图层:场景 → 添加视图层 → `ViewLayer_001`;删除视图层 → 回到 + `ViewLayer`,均返回“原生操作已返回”,通过。 +- 重复上一步:`screen.repeat_last` 仍返回 + `poll() failed, context is incorrect`。已尝试: + - 菜单调用传 `areaType=VIEW_3D`; + - `web_engine_python_bootstrap.py` 的 `temp_override` 增加 + `screen=window.screen`(WASM `58325d97...`)。 + 仍失败;源码 `repeat_history_poll` 还要求 WM runtime operator 栈非空, + 判断为嵌入宿主不保留该栈。下一步:在 Web 入口禁用并给出原因,或改用 + bpy 侧可重放的操作记录实现。 +- 新 WASM 已同步并重建 `web/dist`;证据 + `tools/web/complete/probe-repeat-viewlayer.mjs`。 + ## 下一动作 1. 用户验证 `?ui=web` 导出面板的 USD/Alembic 下载与产物内容。 diff --git a/tests/golden/WBV2-P1425-001/continuation-20261113-web-export.json b/tests/golden/WBV2-P1425-001/continuation-20261113-web-export.json index dc17388e9..54490143f 100644 --- a/tests/golden/WBV2-P1425-001/continuation-20261113-web-export.json +++ b/tests/golden/WBV2-P1425-001/continuation-20261113-web-export.json @@ -1,7 +1,7 @@ { "schemaVersion": 1, "task": "WBV2-P1425-001", - "updatedAt": "2026-11-14T06:18:00+08:00", + "updatedAt": "2026-11-14T06:25:00+08:00", "status": "in_progress", "focus": "COMPLETE-TUTORIAL-001 backend export gap (USD/Alembic)", "breakpoint": "blender-5.2.0/source/blender/web_engine/CMakeLists.txt (USD wiring); WASM 6ee2b261", @@ -29,7 +29,7 @@ "Confirm whether the one-time TfNotice duplicate Python type Coding Error has side effects on second imports.", "Alembic was verified only through the focused worker probe, not the export panel." ], - "nextAction": "Resume after the user pushes (or provides credentials); continue three-domain cases locally meanwhile.", + "nextAction": "Decide repeat_last: disable with reason in web entry or replay via bpy history; continue three-domain cases.", "wasmSha256": "6ee2b2612a0ae667cd83df7177cf695ca8681ae83818c95799bb416435945c4e", "acceptance": "NOT_CLAIMED", "probe": { @@ -133,21 +133,15 @@ "acceptance": "NOT_CLAIMED" }, "pushState": { - "localCommit": "4eb08faf3", - "status": "blocked_no_credentials", - "error": "could not read Username for 'https://gitea.meswork.com'", - "checks": [ - "no credential.helper", - "no ~/.git-credentials", - "ssh-agent has no identities", - "no Gitea token/CLI config" - ], - "action": "user runs git push origin main from an authenticated terminal", - "excludedLargeArtifacts": [ - "blender-5.2.0/tests/files 777MB", - "tests/golden remaining ~21GB", - "web/app/dist-snapshot 487MB", - "COURSE-FULL-001/video 110MB" - ] + "localCommit": "8101c009d", + "remoteMain": "8101c009d", + "status": "pushed" + }, + "repeatViewLayer": { + "viewLayers": "add → ViewLayer_001, remove → ViewLayer; PASS", + "repeatLast": "screen.repeat_last poll() failed, context is incorrect; areaType=VIEW_3D and temp_override screen=window.screen did not fix; likely no WM runtime operator stack in the embedded host", + "wasmSha256": "58325d9793cb7e374aae929d8de02affe2d0be8a2e4687929695740393cfe2fd", + "script": "tools/web/complete/probe-repeat-viewlayer.mjs", + "acceptance": "NOT_CLAIMED" } } diff --git a/tools/web/complete/probe-parent.mjs b/tools/web/complete/probe-parent.mjs index e10e83daa..f4e9fff86 100644 --- a/tools/web/complete/probe-parent.mjs +++ b/tools/web/complete/probe-parent.mjs @@ -61,12 +61,8 @@ try { await menu("添加", "网格"); await page.getByRole("menuitem", { name: "圆环", exact: true }).click(); await page.waitForTimeout(1500); - const ground = page.locator('[role="treeitem"][aria-label="PBR Studio Ground"]').first(); - const circle = page.locator('[role="treeitem"][aria-label="Circle"]').first(); - await circle.click(); - await page.waitForTimeout(800); - await ground.click({ modifiers: ["Shift"] }); - await page.waitForTimeout(1000); + await page.getByRole("button", { name: "全选大纲对象", exact: true }).click(); + await page.waitForTimeout(1500); log("selected", JSON.stringify(await parentState())); await menu("物体", "父级"); await page.getByRole("menuitem", { name: "设定父级", exact: true }).click(); diff --git a/tools/web/complete/probe-repeat-viewlayer.mjs b/tools/web/complete/probe-repeat-viewlayer.mjs new file mode 100644 index 000000000..f966e7d01 --- /dev/null +++ b/tools/web/complete/probe-repeat-viewlayer.mjs @@ -0,0 +1,83 @@ +#!/usr/bin/env node +/** + * Focused case: repeat-last operation and scene view-layer add/remove. + * + * node tools/web/complete/probe-repeat-viewlayer.mjs --base-url http://127.0.0.1:5176 + */ +import { ASSETS, parseArgs, launchBrowser, newPage, openApp, openFile, waitScene } from "../course/lib/lesson-recorder.mjs"; + +const args = parseArgs(); +const BASE = args.baseUrl || "http://127.0.0.1:5176"; +const browser = await launchBrowser(args.gpu); +const { context, page, consoleErrors } = await newPage(browser, {}); +page.setDefaultTimeout(90_000); +await page.addInitScript(() => { + const NativeWorker = window.Worker; + window.__probeWorkers = []; + window.__probeMessages = []; + window.Worker = class extends NativeWorker { + constructor(...params) { + super(...params); + window.__probeWorkers.push(this); + this.addEventListener("message", (event) => window.__probeMessages.push(event.data)); + } + }; +}); +const log = (...parts) => console.log(new Date().toISOString().slice(11, 19), ...parts); +const python = async (source) => { + const requestId = `probe-${Date.now()}-${Math.random().toString(36).slice(2)}`; + return await page.evaluate(({ requestId, source }) => new Promise((resolve) => { + const started = Date.now(); + const read = () => { + const hit = window.__probeMessages.find((message) => message && message.requestId === requestId && message.kind === "result"); + if (hit) { clearInterval(timer); resolve(hit); return; } + if (Date.now() - started > 240000) { clearInterval(timer); resolve({ timeout: true }); } + }; + const timer = setInterval(read, 250); + for (const worker of window.__probeWorkers) worker.postMessage({ requestId, command: { type: "jsonCommand", cmd: "pythonExec", params: { source, filename: "ProbeRepeat.py", console: false } } }); + }), { requestId, source }, { timeout: 300_000 }); +}; +const state = async () => { + const result = await python(` +import bpy, json +scene = bpy.context.scene +print('CASE ' + json.dumps({'objects': len(bpy.data.objects), 'view_layers': [layer.name for layer in scene.view_layers]})) +`); + const out = result?.result?.json; + const ui = await page.evaluate(() => ({ + stats: document.querySelector('[data-testid="scene-stats"]')?.textContent ?? "", + status: document.querySelector('[data-testid="engine-status"]')?.textContent ?? "", + alerts: Array.from(document.querySelectorAll('[role="alert"]')).map((node) => node.textContent).slice(0, 3), + })); + return { state: out?.state, output: out?.output, error: out?.error, ...ui }; +}; +const menu = async (label, item) => { + await page.getByRole("button", { name: label, exact: true }).click(); + await page.getByRole("menuitem", { name: item, exact: true }).click(); +}; +try { + await openApp(page, BASE); + await openFile(page, ASSETS.studio); + await waitScene(page, { objects: 6, timeout: 240_000 }); + log("start", JSON.stringify(await state())); + await menu("添加", "网格"); + await page.getByRole("menuitem", { name: "圆环", exact: true }).click(); + await page.waitForTimeout(1500); + log("added", JSON.stringify(await state())); + await menu("编辑", "重复上一步"); + await page.waitForTimeout(2000); + log("repeat", JSON.stringify(await state())); + await menu("场景", "添加视图层"); + await page.waitForTimeout(1500); + log("layer add", JSON.stringify(await state())); + await menu("场景", "删除视图层"); + await page.waitForTimeout(1500); + log("layer remove", JSON.stringify(await state())); +} catch (error) { + log("probe error", error instanceof Error ? error.message : String(error)); + log("state", JSON.stringify(await state().catch(() => null))); +} finally { + log("consoleErrors", JSON.stringify(consoleErrors.slice(-10))); + await context.close(); + await browser.close(); +} diff --git a/web/app/public/vendor/blender/web_engine.wasm b/web/app/public/vendor/blender/web_engine.wasm index 7d9497719..a458bbc61 100644 Binary files a/web/app/public/vendor/blender/web_engine.wasm and b/web/app/public/vendor/blender/web_engine.wasm differ diff --git a/web/app/public/wasm-module-manifest.json b/web/app/public/wasm-module-manifest.json index de46cade9..dfc9a3809 100644 --- a/web/app/public/wasm-module-manifest.json +++ b/web/app/public/wasm-module-manifest.json @@ -10,7 +10,7 @@ "single": { "fileName": "web_engine.wasm", "url": "/vendor/blender/web_engine.wasm", - "sha256": "6ee2b2612a0ae667cd83df7177cf695ca8681ae83818c95799bb416435945c4e" + "sha256": "58325d9793cb7e374aae929d8de02affe2d0be8a2e4687929695740393cfe2fd" }, "pthread": { "fileName": "web_engine.wasm", @@ -27,7 +27,7 @@ "single": { "fileName": "web_engine.wasm", "url": "/vendor/blender/web_engine.wasm", - "sha256": "6ee2b2612a0ae667cd83df7177cf695ca8681ae83818c95799bb416435945c4e" + "sha256": "58325d9793cb7e374aae929d8de02affe2d0be8a2e4687929695740393cfe2fd" }, "pthread": { "fileName": "web_engine.wasm", @@ -44,7 +44,7 @@ "single": { "fileName": "web_engine.wasm", "url": "/vendor/blender/web_engine.wasm", - "sha256": "6ee2b2612a0ae667cd83df7177cf695ca8681ae83818c95799bb416435945c4e" + "sha256": "58325d9793cb7e374aae929d8de02affe2d0be8a2e4687929695740393cfe2fd" }, "pthread": { "fileName": "web_engine.wasm", @@ -61,7 +61,7 @@ "single": { "fileName": "web_engine.wasm", "url": "/vendor/blender/web_engine.wasm", - "sha256": "6ee2b2612a0ae667cd83df7177cf695ca8681ae83818c95799bb416435945c4e" + "sha256": "58325d9793cb7e374aae929d8de02affe2d0be8a2e4687929695740393cfe2fd" }, "pthread": { "fileName": "web_engine.wasm", diff --git a/web/app/src/app/App.tsx b/web/app/src/app/App.tsx index 0ee85e86c..b7474a2ca 100644 --- a/web/app/src/app/App.tsx +++ b/web/app/src/app/App.tsx @@ -8463,7 +8463,7 @@ else: separator,menuAction('关闭',closeProject,!hasProject),menuAction('退出并保存会话',()=>requestNativeAutosaveOperator('wm.quit_blender'),!hasProject) ], '编辑':[menuAction('撤销',()=>{void applyEditCommand({type:'undo'});},!hasProject,'Ctrl Z'),menuAction('重做',()=>{void applyEditCommand({type:'redo'});},!hasProject,'Shift Ctrl Z'),menuAction('撤销历史',()=>{void openHistory();},!hasProject),separator, - menuAction('菜单搜索',()=>dispatchUI({type:'toggleOperatorSearch',open:true}),false,'F3'),menuAction('重命名活动项',showRename,!canRenameObject,'F2'),menuAction('调整上一步操作',()=>openAdjustLastOperation(),!hasProject||(!lastNativeOperator&&(localOnly&&!nativeCanvasReady))),menuAction('重复上一步',()=>queueLocalDesktopOperator('screen.repeat_last'),!hasProject||localOnly&&!nativeCanvasReady),menuAction('重复历史',()=>queueLocalDesktopOperator('screen.repeat_history'),!hasProject||localOnly&&!nativeCanvasReady),separator,menuAction('偏好设置',()=>setPreferencesOpen(true))], + menuAction('菜单搜索',()=>dispatchUI({type:'toggleOperatorSearch',open:true}),false,'F3'),menuAction('重命名活动项',showRename,!canRenameObject,'F2'),menuAction('调整上一步操作',()=>openAdjustLastOperation(),!hasProject||(!lastNativeOperator&&(localOnly&&!nativeCanvasReady))),menuAction('重复上一步',()=>queueLocalDesktopOperator('screen.repeat_last',{},false,undefined,undefined,'VIEW_3D'),!hasProject||localOnly&&!nativeCanvasReady),menuAction('重复历史',()=>queueLocalDesktopOperator('screen.repeat_history',{},false,undefined,undefined,'VIEW_3D'),!hasProject||localOnly&&!nativeCanvasReady),separator,menuAction('偏好设置',()=>setPreferencesOpen(true))], '渲染':[menuAction('渲染图像',()=>renderFromMenu(false),!hasProject,'F12'),menuAction('渲染动画',()=>renderFromMenu(true),!hasProject,'Ctrl F12'),unavailable('渲染音频'),separator, menuAction('查看渲染结果',()=>dispatchUI({type:'switchWorkspace',workspaceId:'Rendering'}),!hasProject),menuAction('查看动画',()=>dispatchUI({type:'switchWorkspace',workspaceId:'Rendering'}),!nativeFiles.some(f=>f.artifact.mime.startsWith('video/')))], '场景':[menuAction('新建场景',()=>queueLocalDesktopOperator('scene.new',{type:'NEW'}),!hasProject||localOnly&&!nativeCanvasReady),menuAction('复制场景设置',()=>queueLocalDesktopOperator('scene.new',{type:'COPY_SETTINGS'}),!hasProject||localOnly&&!nativeCanvasReady),separator,menuAction('删除场景',()=>queueLocalDesktopOperator('scene.delete'),!hasProject||localOnly&&!nativeCanvasReady),separator, diff --git a/web/app/src/vendor/blender/web_engine.wasm b/web/app/src/vendor/blender/web_engine.wasm index 7d9497719..a458bbc61 100644 Binary files a/web/app/src/vendor/blender/web_engine.wasm and b/web/app/src/vendor/blender/web_engine.wasm differ