diff --git a/harness-init.sh b/harness-init.sh index 191fae5c..5cf8b68e 100644 --- a/harness-init.sh +++ b/harness-init.sh @@ -15,13 +15,8 @@ command -v python3 >/dev/null || { exit 1 } -if [ -d "$ROOT_DIR/wolai-frontend" ]; then - if ! command -v node >/dev/null; then - echo "WARN: 缺少 node，前端相关任务可能无法执行" - fi - if ! command -v pnpm >/dev/null; then - echo "WARN: 缺少 pnpm，前端相关任务可能无法执行" - fi +if [ -f "$ROOT_DIR/package.json" ] && ! command -v node >/dev/null; then + echo "WARN: 缺少 node，脚本任务可能无法执行" fi echo "Harness 环境检查完成" diff --git a/harness-tasks.json b/harness-tasks.json deleted file mode 100644 index c40d3e47..00000000 --- a/harness-tasks.json +++ /dev/null @@ -1,1114 +0,0 @@ -{ - "version": 2, - "created": "2026-04-26T23:16:13Z", - "session_config": { - "concurrency_mode": "exclusive", - "max_tasks_per_session": 9, - "max_sessions": 80 - }, - "tasks": [ - { - "id": "task-001", - "title": "Phase K-1：定义 tree shell Rust runtime artifact 边界", - "status": "completed", - "priority": "P0", - "depends_on": [], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "6d89f5ca", - "validation": { - "command": "cd /mnt/Data1T/mnote/rust && cargo test -p mnote-web renderer_input && cargo test -p mnote-web runtime_artifact && cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/components/sidebar/tree-shell-iframe-host.test.tsx", - "timeout_seconds": 1800 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "已在 mnote-web rendererInput 中定义 rust_tree_shell_runtime_artifact_v1，覆盖 rendererInput/projection/expanded/selected/active/focused 输入、DOM patch/intent/command 输出和 focus/keyboard/expand/selection/context/drag/pick 事件边界；3000 inline host 同步输出同名 runtimeArtifact。", - "timestamp": "2026-04-26T23:22:39Z" - } - ], - "completed_at": "2026-04-26T23:22:39Z" - }, - { - "id": "task-002", - "title": "Phase K-2：建立 page tree Rust-side runtime 状态机", - "status": "completed", - "priority": "P0", - "depends_on": [ - "task-001" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "6d89f5ca", - "validation": { - "command": "cd /mnt/Data1T/mnote/rust && cargo test -p mnote-web page_renderer && cargo test -p mnote-web page_focus && cargo test -p mnote-web page_runtime && cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/components/sidebar/tree-shell-iframe-host.test.tsx src/components/sidebar/tree-shell-surface.test.tsx && node /mnt/Data1T/mnote/scripts/task112-tree-rust-family-regression-smoke.js", - "timeout_seconds": 2400 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "已新增 page_runtime reducer，组合 focus/expand/open/context-menu/drop feedback/tree.subtree.move dispatch 输出，验证 page_renderer/page_focus/page_runtime、tree-shell iframe/surface vitest 与 task112 smoke 均通过。", - "timestamp": "2026-04-26T23:27:43Z" - } - ], - "completed_at": "2026-04-26T23:27:43Z" - }, - { - "id": "task-003", - "title": "Phase K-3：建立 file tree Rust-side runtime 状态机", - "status": "completed", - "priority": "P0", - "depends_on": [ - "task-001" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "6d89f5ca", - "validation": { - "command": "cd /mnt/Data1T/mnote/rust && cargo test -p mnote-web filetree_renderer && cargo test -p mnote-web filetree_selection && cargo test -p mnote-web filetree_runtime && cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/components/sidebar/tree-shell-iframe-host.test.tsx src/lib/file-tree/shell.test.ts src/lib/tree-stream/tree-delta.test.ts && node /mnt/Data1T/mnote/scripts/task112-tree-rust-family-regression-smoke.js", - "timeout_seconds": 2400 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "已新增 filetree_runtime reducer，覆盖 selection/range/context/normalize、drag row ids、copy/move effect、drop target feedback，以及 doc/index/asset-folder/asset 的 open/context-menu intent；目标测试与 task112 smoke 通过。", - "timestamp": "2026-04-26T23:32:11Z" - } - ], - "completed_at": "2026-04-26T23:32:11Z" - }, - { - "id": "task-004", - "title": "Phase K-4：建立 picker Rust-side runtime 状态机", - "status": "completed", - "priority": "P0", - "depends_on": [ - "task-001" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "6d89f5ca", - "validation": { - "command": "cd /mnt/Data1T/mnote/rust && cargo test -p mnote-web picker_renderer && cargo test -p mnote-web picker_state && cargo test -p mnote-web picker_runtime && cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/components/documents/move-embed-picker-dialog.test.tsx src/components/sidebar/tree-shell-iframe-host.test.tsx && node /mnt/Data1T/mnote/scripts/task113-picker-keyboard-regression-smoke.js", - "timeout_seconds": 2400 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "已新增 picker_runtime reducer，覆盖 normalize/next/previous/home/end/focus/pick、excluded ids、root pick，以及搜索输入不被键盘运行时抢 DOM 焦点的 focus_dom 输出边界；目标测试与 task113 smoke 通过。", - "timestamp": "2026-04-26T23:34:59Z" - } - ], - "completed_at": "2026-04-26T23:34:59Z" - }, - { - "id": "task-005", - "title": "Phase K-5：3000 host 调用正式 runtime artifact，并将 mnote-web /tree 固定为 debug/internal", - "status": "completed", - "priority": "P0", - "depends_on": [ - "task-002", - "task-003", - "task-004" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "6d89f5ca", - "validation": { - "command": "cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/components/sidebar/tree-shell-iframe-host.test.tsx src/components/sidebar/tree-shell-surface.test.tsx && node /mnt/Data1T/mnote/scripts/task112-tree-rust-family-regression-smoke.js && node /mnt/Data1T/mnote/scripts/task113-picker-keyboard-regression-smoke.js", - "timeout_seconds": 2400 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "已固定 3000 inline host 与 mnote-web debug shell 均输出 rust_tree_shell_runtime_artifact_v1，并通过 tree-shell 目标测试、task112 与 task113 证明 3000 主路径继续使用 inline iframe host，/api/tree/shell debug 直连默认禁用。", - "timestamp": "2026-04-26T23:38:55Z" - } - ], - "completed_at": "2026-04-26T23:38:55Z" - }, - { - "id": "task-006", - "title": "Phase L：将 tree.subtree.move 最终写路径继续下沉 Rust kernel", - "status": "completed", - "priority": "P0", - "depends_on": [ - "task-005" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "6d89f5ca", - "validation": { - "command": "cd /mnt/Data1T/mnote/rust && cargo test -p bridge-runtime tree_subtree_move_command && cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/app/api/tree/commands/route.test.ts src/lib/documents/tree-command-client.test.ts src/lib/tree-stream/tree-delta.test.ts", - "timeout_seconds": 2400 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "已引入 Rust treeWriteOperation，Convex documents.move 优先执行 Rust write operation，normalizedMove 保留旧 fallback；bridge-runtime move 单测与前端 39 个目标测试通过。", - "timestamp": "2026-04-26T23:52:52Z" - } - ], - "completed_at": "2026-04-26T23:52:52Z" - }, - { - "id": "task-007", - "title": "Phase M：补齐 block/save-snapshot formal artifact 与 domain-event contract", - "status": "completed", - "priority": "P1", - "depends_on": [ - "task-006" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "6d89f5ca", - "validation": { - "command": "cd /mnt/Data1T/mnote/rust && cargo test -p bridge-runtime documents_save_command_plans_include_formal_domain_event_contract && cargo test -p bridge-runtime block_commands_include_formal_domain_event_contract && cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/lib/documents/rust-runtime.test.ts src/lib/documents/page-write-command-adapter.test.ts src/lib/blocks/block-command-adapter.test.ts", - "timeout_seconds": 2400 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "已将 page.body.saved、block.patched、block.moved、block.embedded 切到 formal domainEventPlan payload schema；复合命令 streamDelta 使用 resync_required 保守策略，command log/domain event 通过同一 command_id 关联；目标验证通过。", - "timestamp": "2026-04-27T00:09:12Z" - } - ], - "completed_at": "2026-04-27T00:09:12Z" - }, - { - "id": "task-008", - "title": "Phase N：继续收薄 3000 Next route 过渡职责", - "status": "completed", - "priority": "P1", - "depends_on": [ - "task-007" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "6d89f5ca", - "validation": { - "command": "cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/app/api/tree/commands/route.test.ts src/lib/tree-stream/tree-delta.test.ts && node /mnt/Data1T/mnote/scripts/task112-tree-rust-family-regression-smoke.js", - "timeout_seconds": 2400 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 2, - "total": 2, - "description": "Phase N route thinning manifest 与 task112 iframe-ready smoke 同步已完成；刷新本地 Convex functions 后 move treeWriteOperation 运行态验证通过，目标 Vitest 与 task112 smoke 均通过。", - "timestamp": "2026-04-27T00:34:43Z" - } - ], - "completed_at": "2026-04-27T00:34:43Z" - }, - { - "id": "task-009", - "title": "Phase O：搜索语义 hardening 与资源类型 fixture 补齐", - "status": "completed", - "priority": "P1", - "depends_on": [ - "task-008" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "6d89f5ca", - "validation": { - "command": "cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/lib/tree-stream/tree-delta.test.ts", - "timeout_seconds": 1800 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "已补 file_tree 搜索 hardening 前端契约：projection-client 固定 maxResults=80、祖先补全/排序/异步可见性元数据，tree-delta fixture 覆盖 index、asset-folder、mindmap child、book、pdf；目标验证与 task112 smoke 通过。", - "timestamp": "2026-04-27T00:41:58Z" - } - ], - "completed_at": "2026-04-27T00:41:58Z" - }, - { - "id": "task-010", - "title": "Phase P-0：补 final DOM shell 负向门禁，阻止 iframe_srcdoc 被误判为完成", - "status": "completed", - "priority": "P0", - "depends_on": [ - "task-009" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "81ba21c5", - "source_doc": "design/04-tree-domain/process/4-18-tree-final-dom-shell-cutover-hard-gate-v1.md", - "scope": [ - "wolai-frontend/src/components/sidebar/tree-shell-host*.test.tsx", - "wolai-frontend/src/components/sidebar/tree-shell-iframe-host.test.tsx", - "scripts/task112-tree-rust-family-regression-smoke.js", - "scripts/task113-picker-keyboard-regression-smoke.js" - ], - "acceptance": [ - "默认 page/filetree/picker 主路径测试不得再把 srcDoc inline DOM shell 作为成功条件", - "默认主路径测试不得出现 data-tree-browser-bridge=\"iframe_srcdoc\" 正向断言", - "旧 TreeShellIframeHost 的 srcdoc 合同测试必须迁入 legacy/debug 分组或显式标注为 legacy", - "task112/task113 smoke 需要验证新 Rust/WASM DOM shell 主路径，而不是证明旧 inline iframe host 继续可用" - ], - "validation": { - "command": "cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/components/sidebar/tree-shell-iframe-host.test.tsx src/components/sidebar/tree-shell-surface.test.tsx && cd /mnt/Data1T/mnote && node scripts/task112-tree-rust-family-regression-smoke.js && node scripts/task113-picker-keyboard-regression-smoke.js", - "timeout_seconds": 2400 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 4, - "description": "已新增默认非 iframe rust_wasm_dom_shell_host 与共享 DOM projection model，legacy iframe 改为显式环境开关。", - "timestamp": "2026-04-28T03:28:16.005752Z" - }, - { - "step": 2, - "total": 4, - "description": "tree-shell-surface 与 legacy iframe host 目标 Vitest 通过；默认主路径断言已切成 rust_wasm_dom_shell_host 且负向排除 iframe_srcdoc。", - "timestamp": "2026-04-28T03:34:10.533972Z" - }, - { - "step": 3, - "total": 4, - "description": "move/embed picker 测试已切到 DOM shell；默认 picker 不再以 iframe postMessage 为成功条件，目标前端 Vitest 29 项通过。", - "timestamp": "2026-04-28T03:36:24.605315Z" - }, - { - "step": 4, - "total": 4, - "description": "已补默认 DOM shell 负向门禁：tree-shell-host/surface/picker 测试与 smoke 默认拒绝 iframe_srcdoc 成功路径。", - "timestamp": "2026-04-28T04:40:14Z" - } - ], - "completed_at": "2026-04-28T04:40:14Z" - }, - { - "id": "task-011", - "title": "Phase P-1：拆分默认 Rust DOM shell host 与 legacy TreeShellIframeHost", - "status": "completed", - "priority": "P0", - "depends_on": [ - "task-010" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "81ba21c5", - "source_doc": "design/04-tree-domain/process/4-18-tree-final-dom-shell-cutover-hard-gate-v1.md", - "scope": [ - "wolai-frontend/src/components/sidebar/tree-shell-host.tsx", - "wolai-frontend/src/components/sidebar/tree-shell-iframe-host.tsx", - "wolai-frontend/src/components/sidebar/tree-shell-*.test.tsx" - ], - "acceptance": [ - "TreeShellHost 默认选择 rust_wasm_dom_shell_host 或等价新 host", - "TreeShellIframeHost 改为 LegacyTreeShellIframeHost 或显式 legacy/debug host", - "旧 iframe srcdoc host 只能通过 debug/legacy flag 进入", - "默认 page tree 首屏不依赖 LOCAL_TREE_SHELL_TEMPLATE" - ], - "validation": { - "command": "cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/components/sidebar/tree-shell-host.test.tsx src/components/sidebar/tree-shell-surface.test.tsx src/components/sidebar/tree-shell-iframe-host.test.tsx", - "timeout_seconds": 2400 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "TreeShellHost 默认选择 rust_wasm_dom_shell_host；TreeShellIframeHost 仅由 NEXT_PUBLIC_TREE_SHELL_LEGACY_IFRAME_HOST=1 进入。", - "timestamp": "2026-04-28T04:40:14Z" - } - ], - "completed_at": "2026-04-28T04:40:14Z" - }, - { - "id": "task-012", - "title": "Phase Q：page / picker / filetree 迁入 Rust/WASM DOM shell 主路径", - "status": "completed", - "priority": "P0", - "depends_on": [ - "task-011" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "81ba21c5", - "source_doc": "design/04-tree-domain/process/4-18-tree-final-dom-shell-cutover-hard-gate-v1.md", - "scope": [ - "rust/crates/tree-shell-runtime-wasm", - "rust/crates/mnote-web/src/tree_shell", - "wolai-frontend/src/components/sidebar" - ], - "acceptance": [ - "page tree 默认主路径由新 Rust/WASM DOM shell 渲染与绑定事件", - "picker 默认主路径由新 Rust/WASM DOM shell 渲染与绑定事件", - "filetree 默认主路径由新 Rust/WASM DOM shell 渲染与绑定事件，并保留 doc/index/asset-folder/asset 能力", - "3000 host 只保留挂载、auth、transport、文件读取、postMessage/command bridge" - ], - "validation": { - "command": "cd /mnt/Data1T/mnote/rust && cargo test -p mnote-web tree_shell && cargo test -p tree-shell-runtime-wasm -- --nocapture && cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/components/sidebar/tree-shell-iframe-host.test.tsx src/components/sidebar/tree-shell-surface.test.tsx src/components/documents/move-embed-picker-dialog.test.tsx && cd /mnt/Data1T/mnote && node scripts/task112-tree-rust-family-regression-smoke.js && node scripts/task113-picker-keyboard-regression-smoke.js", - "timeout_seconds": 3600 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "page / filetree / picker 默认 DOM host 已消费 TreeShellRuntimeRequest/Result，并由 WASM artifact 或同源 Rust seam 驱动 hostEvents/commandEvents。", - "timestamp": "2026-04-28T04:40:14Z" - } - ], - "completed_at": "2026-04-28T04:40:14Z" - }, - { - "id": "task-013", - "title": "Phase R/S：删除默认 JS DOM state machine 并完成文档收口", - "status": "completed", - "priority": "P0", - "depends_on": [ - "task-012" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "81ba21c5", - "source_doc": "design/04-tree-domain/process/4-18-tree-final-dom-shell-cutover-hard-gate-v1.md", - "scope": [ - "wolai-frontend/src/components/sidebar", - "design/04-tree-domain/process", - "design/04-tree-domain/done" - ], - "acceptance": [ - "默认主路径不再调用 LOCAL_TREE_SHELL_TEMPLATE、buildInlinePageTreeHtml、buildInlineFileTreeHtml、buildInlinePickerHtml", - "默认主路径不再标注 data-tree-browser-bridge=\"iframe_srcdoc\"", - "旧 JS fallback reducer/state machine 只在 legacy/debug host 中存在", - "4-11、4-16、4-18 的 final DOM shell gate 按真实代码完成状态更新" - ], - "validation": { - "command": "cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/components/sidebar/tree-shell-iframe-host.test.tsx src/components/sidebar/tree-shell-surface.test.tsx src/components/documents/move-embed-picker-dialog.test.tsx && cd /mnt/Data1T/mnote && node scripts/task112-tree-rust-family-regression-smoke.js && node scripts/task113-picker-keyboard-regression-smoke.js && git diff --check -- wolai-frontend/src/components/sidebar design/04-tree-domain", - "timeout_seconds": 3600 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "已清理 1.md、4-11、4-16、4-18 的 final DOM shell 口径；旧 JS renderer/state machine 只作为 legacy iframe host 保留。", - "timestamp": "2026-04-28T04:40:14Z" - } - ], - "completed_at": "2026-04-28T04:40:14Z" - }, - { - "id": "task-014", - "title": "Phase L2：删除 normalizedMove fallback，强制 move 主写路径使用 treeWriteOperation", - "status": "completed", - "priority": "P0", - "depends_on": [ - "task-013" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "81ba21c5", - "source_doc": "design/04-tree-domain/done/4-16-tree-rust-family-remaining-final-runtime-checklist-v1.md", - "scope": [ - "rust/crates/bridge-runtime/src/lib.rs", - "wolai-frontend/convex/documents.ts", - "wolai-frontend/convex/_utils/documentMoveOrder.ts", - "wolai-frontend/src/lib/documents/rust-runtime.ts", - "wolai-frontend/src/lib/documents/*move*test.ts", - "wolai-frontend/src/lib/documents/rust-runtime.test.ts" - ], - "acceptance": [ - "bridge-runtime 不再输出 normalizedMove 作为 documents.move 参数", - "Convex documents.move 不再接受 normalizedMove fallback；缺少 treeWriteOperation 时显式拒绝", - "TS Rust mutation transport 不再透传 normalizedMove", - "相关测试改为验证 treeWriteOperation 是唯一主写入计划" - ], - "validation": { - "command": "cd /mnt/Data1T/mnote/rust && cargo test -p bridge-runtime tree_subtree_move_command && cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/lib/documents/document-move-order.test.ts src/lib/documents/document-move-order-convex.test.ts src/lib/documents/rust-runtime.test.ts src/app/api/tree/commands/route.test.ts", - "timeout_seconds": 3000 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "已删除 normalizedMove fallback：Rust plan 不再输出 normalizedMove，TS transport 强制 treeWriteOperation，Convex documents.move 只接受 treeWriteOperation；目标 Rust/Vitest 通过。", - "timestamp": "2026-04-28T06:37:40Z" - } - ], - "completed_at": "2026-04-28T06:37:40Z" - }, - { - "id": "task-015", - "title": "Phase M2：定稿 document.snapshot.saved 独立事件并避免与 page.body.saved payload 重叠", - "status": "completed", - "priority": "P0", - "depends_on": [ - "task-014" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "81ba21c5", - "source_doc": "design/04-tree-domain/done/4-16-tree-rust-family-remaining-final-runtime-checklist-v1.md", - "scope": [ - "rust/crates/bridge-runtime/src/lib.rs", - "wolai-frontend/src/lib/documents/rust-runtime.ts", - "wolai-frontend/src/lib/documents/bridge-log.ts", - "wolai-frontend/src/lib/documents/*test.ts" - ], - "acceptance": [ - "page.body.saved 保留正文保存事件语义", - "snapshot 版本/hash/updatedAt 拆入 document.snapshot.saved 独立 domain event plan 或 artifact plan", - "SSE 对 snapshot 独立事件有明确 resync 或 noop 策略", - "测试覆盖两个事件不再 payload 重叠" - ], - "validation": { - "command": "cd /mnt/Data1T/mnote/rust && cargo test -p bridge-runtime documents_save_command_plans_include_formal_domain_event_contract && cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/lib/documents/rust-runtime.test.ts src/lib/documents/bridge-log.test.ts src/lib/documents/page-write-command-adapter.test.ts", - "timeout_seconds": 3000 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "已将 page.body.saved 与 document.snapshot.saved 拆成 domainEventPlans 双事件；artifact writer 支持 domainEvents 批量落库，page.body.saved payload 不再夹带 snapshot。", - "timestamp": "2026-04-28T07:44:37Z" - } - ], - "completed_at": "2026-04-28T07:44:37Z" - }, - { - "id": "task-016", - "title": "Phase M3：把 snapshot 独立事件接入 Page Aggregate 深层收口文档与客户端边界", - "status": "completed", - "priority": "P1", - "depends_on": [ - "task-015" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "81ba21c5", - "source_doc": "design/04-tree-domain/done/4-16-tree-rust-family-remaining-final-runtime-checklist-v1.md", - "scope": [ - "wolai-frontend/src/components/editor/page-aggregate*", - "wolai-frontend/src/lib/documents/page-aggregate*", - "design/05-editor-mainline/process", - "design/04-tree-domain/done/4-16-tree-rust-family-remaining-final-runtime-checklist-v1.md" - ], - "acceptance": [ - "Page Aggregate 文档明确 page.body.saved 与 document.snapshot.saved 的职责边界", - "客户端 Page Aggregate 状态不再把 snapshot 保存当作正文保存的附带语义", - "4-16 对应 snapshot/Page Aggregate 项可勾选或明确剩余迁移边界" - ], - "validation": { - "command": "cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/components/editor/page-aggregate-client-state.test.ts src/lib/documents/page-aggregate-builder.test.ts src/lib/documents/page-write-command-adapter.test.ts && git diff --check -- design/04-tree-domain design/05-editor-mainline wolai-frontend/src/components/editor wolai-frontend/src/lib/documents", - "timeout_seconds": 2400 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "已更新 Page Aggregate contract 与 5-6 清单，固定 page.body.saved 与 document.snapshot.saved 的职责边界，并同步 4-16 勾选状态。", - "timestamp": "2026-04-28T07:44:37Z" - } - ], - "completed_at": "2026-04-28T07:44:37Z" - }, - { - "id": "task-017", - "title": "Phase N2：将 tree.node.embed 的 pageReference 组装迁到 Page Aggregate / Rust artifact 边界", - "status": "completed", - "priority": "P1", - "depends_on": [ - "task-015" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "81ba21c5", - "source_doc": "design/04-tree-domain/done/4-16-tree-rust-family-remaining-final-runtime-checklist-v1.md", - "scope": [ - "rust/crates/bridge-runtime/src/lib.rs", - "wolai-frontend/src/app/api/tree/commands/route.ts", - "wolai-frontend/src/lib/documents/page-command-adapter.ts", - "wolai-frontend/src/lib/tree-route-boundary.ts", - "wolai-frontend/src/app/api/tree/commands/route.test.ts" - ], - "acceptance": [ - "3000 route 不再本地决定 pageReference block 的结构与插入位置语义", - "Rust plan 或 Page Aggregate artifact 接收 source/target/anchor/content snapshot 并产出 next content 或 block patch plan", - "tree-route-boundary manifest 移除该 compatPending 项", - "测试覆盖 tree.node.embed 的 pageReference 组装来源已迁移" - ], - "validation": { - "command": "cd /mnt/Data1T/mnote/rust && cargo test -p bridge-runtime documents_embed_command_plan_maps_to_documents_update_content tree_embed_and_copy_aliases_keep_tree_command_names && cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/app/api/tree/commands/route.test.ts src/lib/tree-route-boundary.test.ts src/lib/documents/rust-runtime.test.ts", - "timeout_seconds": 3000 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "已新增 Rust pageAggregateEmbedPlan；3000 route 与 documents.embed adapter 只传 source/target/anchor/content snapshot preflight，不再本地决定 pageReference block 结构与插入位置。", - "timestamp": "2026-04-28T07:44:37Z" - } - ], - "completed_at": "2026-04-28T07:44:37Z" - }, - { - "id": "task-018", - "title": "Phase O2：补 file_tree 搜索索引可见性指标边界并收口 4-16", - "status": "completed", - "priority": "P2", - "depends_on": [ - "task-014" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "81ba21c5", - "source_doc": "design/04-tree-domain/done/4-16-tree-rust-family-remaining-final-runtime-checklist-v1.md", - "scope": [ - "rust/crates/bridge-runtime/src/lib.rs", - "rust/crates/mnote-web/src/routes/kernel.rs", - "wolai-frontend/src/lib/server/kernel-file-tree.ts", - "wolai-frontend/src/app/api/tree/projections/file/route.ts", - "design/04-tree-domain/done/4-16-tree-rust-family-remaining-final-runtime-checklist-v1.md" - ], - "acceptance": [ - "file_tree 搜索 projection 输出稳定 indexing/visibility meta，不再只是临时 request meta", - "3000 同源 projection route 透传该 meta", - "move-embed picker/file tree 搜索可观察 index visibility 状态", - "4-16 中 Phase O 未完成项完成或明确转为非树域 runtime 后续" - ], - "validation": { - "command": "cd /mnt/Data1T/mnote/rust && cargo test -p bridge-runtime file_tree && cargo test -p mnote-web file_tree_projection && cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/app/api/tree/projections/file/route.test.ts src/lib/tree-stream/tree-delta.test.ts", - "timeout_seconds": 3000 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "已把 file_tree 搜索 indexingVisibility 提升为 projection result meta；mnote-web 与 3000 同源 projection route 均透传该指标，4-16 Phase O 已收口。", - "timestamp": "2026-04-28T07:44:37Z" - } - ], - "completed_at": "2026-04-28T07:44:37Z" - }, - { - "id": "task-019", - "title": "Phase W-0：冻结 Rust Web 主执行面 owner manifest 与负向门禁", - "status": "completed", - "priority": "P0", - "depends_on": [], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "9f6a2c86", - "source_doc": "design/03-rust-web/done/3-6-rust-web-main-execution-plane-checklist-v1.md", - "plan_doc": "design/03-rust-web/done/3-5-rust-web-main-execution-plane-cutover-plan-v1.md", - "scope": [ - "wolai-frontend/src/lib/rust-web-main-execution-boundary.ts", - "wolai-frontend/src/lib/rust-web-main-execution-boundary.test.ts", - "ARCHITECTURE.md", - "design/03-rust-web/process/3-6-rust-web-main-execution-plane-checklist-v1.md" - ], - "acceptance": [ - "新增 RUST_WEB_MAIN_EXECUTION_BOUNDARY，固定 publicEntry=3000、mainWebOwner=mnote-web、legacyCompatOwner=next-app-router", - "测试禁止把 Next App Router 写回主 Web owner", - "ARCHITECTURE.md 明确树域完成不等于主 Web 执行面完成" - ], - "validation": { - "command": "cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/lib/rust-web-main-execution-boundary.test.ts src/lib/runtime-config.test.ts && cd /mnt/Data1T/mnote && git diff --check -- ARCHITECTURE.md design/03-rust-web wolai-frontend/src/lib", - "timeout_seconds": 1800 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "已新增 Rust Web 主执行面 owner manifest 与负向门禁，并更新 ARCHITECTURE.md / 3-6 checklist 口径。", - "timestamp": "2026-04-28T09:07:58Z" - } - ], - "completed_at": "2026-04-28T09:07:58Z" - }, - { - "id": "task-020", - "title": "Phase W-1：让 mnote-web 默认成为 3000 gateway owner", - "status": "completed", - "priority": "P0", - "depends_on": [ - "task-019" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "9f6a2c86", - "source_doc": "design/03-rust-web/done/3-6-rust-web-main-execution-plane-checklist-v1.md", - "plan_doc": "design/03-rust-web/done/3-5-rust-web-main-execution-plane-cutover-plan-v1.md", - "scope": [ - "rust/crates/mnote-web/src/app.rs", - "rust/crates/mnote-web/src/routes/mod.rs", - "rust/crates/mnote-web/src/routes/gateway.rs", - "scripts/desktop-hot.js", - "scripts/desktop-hot.test.js", - "scripts/task114-rust-web-gateway-entry-smoke.js" - ], - "acceptance": [ - "mnote-web 支持 MNOTE_WEB_PUBLIC_BIND=127.0.0.1:3000 并作为默认 3000 owner", - "Next dev 默认改为 legacy upstream port，不再拥有 3000", - "task114 smoke 证明 3000 响应来自 Rust gateway 且 3104 不作为公开入口" - ], - "validation": { - "command": "node --test /mnt/Data1T/mnote/scripts/desktop-hot.test.js && cd /mnt/Data1T/mnote/rust && cargo test -p mnote-web gateway && cd /mnt/Data1T/mnote && node scripts/task114-rust-web-gateway-entry-smoke.js", - "timeout_seconds": 3600 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "已新增 mnote-web gateway route/owner header、desktop-hot Rust gateway 默认启动计划与 task114 smoke。", - "timestamp": "2026-04-28T09:13:44Z" - } - ], - "completed_at": "2026-04-28T09:13:44Z" - }, - { - "id": "task-021", - "title": "Phase W-2：把 runtime config 与 auth/session handoff 迁到 Rust Web", - "status": "completed", - "priority": "P0", - "depends_on": [ - "task-020" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "9f6a2c86", - "source_doc": "design/03-rust-web/done/3-6-rust-web-main-execution-plane-checklist-v1.md", - "plan_doc": "design/03-rust-web/done/3-5-rust-web-main-execution-plane-cutover-plan-v1.md", - "scope": [ - "rust/crates/mnote-web/src/routes/session.rs", - "rust/crates/mnote-web/src/routes/mod.rs", - "wolai-frontend/src/lib/runtime-config.ts", - "wolai-frontend/src/lib/runtime-config.test.ts", - "wolai-frontend/src/app/api/auth/mnote-web-token/route.ts" - ], - "acceptance": [ - "mnote-web 输出 /api/runtime/config、/api/auth/session 与 session refresh/handoff route", - "浏览器 runtime config 不泄漏 internal MNOTE_WEB_* base URL", - "Next /api/auth/mnote-web-token 降级为 compat/debug" - ], - "validation": { - "command": "cd /mnt/Data1T/mnote/rust && cargo test -p mnote-web session && cargo test -p mnote-web runtime_config && cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/lib/runtime-config.test.ts src/app/api/auth/mnote-web-token/route.test.ts", - "timeout_seconds": 3000 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "已新增 mnote-web runtime config/session/refresh routes，并将 Next mnote-web-token route 标记为 compat/debug。", - "timestamp": "2026-04-28T09:16:28Z" - } - ], - "completed_at": "2026-04-28T09:16:28Z" - }, - { - "id": "task-022", - "title": "Phase W-3：建立 Rust-owned 文档页 / Page Aggregate server-first shell", - "status": "completed", - "priority": "P0", - "depends_on": [ - "task-021" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "9f6a2c86", - "source_doc": "design/03-rust-web/done/3-6-rust-web-main-execution-plane-checklist-v1.md", - "plan_doc": "design/03-rust-web/done/3-5-rust-web-main-execution-plane-cutover-plan-v1.md", - "scope": [ - "rust/crates/mnote-web/src/routes/web_shell.rs", - "rust/crates/mnote-web/src/routes/documents.rs", - "rust/crates/mnote-web/src/routes/mod.rs", - "wolai-frontend/src/components/editor/document-shell.tsx", - "wolai-frontend/src/components/editor/document-content.tsx", - "scripts/task115-rust-web-document-shell-smoke.js" - ], - "acceptance": [ - "mnote-web 输出 /documents/:id server-first shell 与 page aggregate snapshot", - "Next 文档页降级为 legacy compat", - "task115 smoke 证明默认文档页由 Rust shell 服务且不挂载 mnote-web-document-shell iframe" - ], - "validation": { - "command": "cd /mnt/Data1T/mnote/rust && cargo test -p mnote-web document_shell && cargo test -p mnote-web page_aggregate && cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/components/editor/document-content.test.ts src/lib/documents/page-aggregate-builder.test.ts && cd /mnt/Data1T/mnote && node scripts/task115-rust-web-document-shell-smoke.js", - "timeout_seconds": 3600 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "已新增 mnote-web /documents/:id shell 与 /api/page-aggregate/:id snapshot contract，并补 task115 smoke。", - "timestamp": "2026-04-28T09:20:22Z" - } - ], - "completed_at": "2026-04-28T09:20:22Z" - }, - { - "id": "task-023", - "title": "Phase W-4：把主 API transport 从 Next route 收薄为 Rust Web owned", - "status": "completed", - "priority": "P0", - "depends_on": [ - "task-022" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "9f6a2c86", - "source_doc": "design/03-rust-web/done/3-6-rust-web-main-execution-plane-checklist-v1.md", - "plan_doc": "design/03-rust-web/done/3-5-rust-web-main-execution-plane-cutover-plan-v1.md", - "scope": [ - "rust/crates/mnote-web/src/routes/documents.rs", - "rust/crates/mnote-web/src/routes/tree.rs", - "rust/crates/mnote-web/src/routes/search.rs", - "wolai-frontend/src/lib/tree-route-boundary.ts", - "wolai-frontend/src/app/api/documents/route-adapters.test.ts", - "wolai-frontend/src/lib/search/request.test.ts" - ], - "acceptance": [ - "Rust Web owner 覆盖 documents meta/content/save、tree commands/projections 与 search documents transport", - "Next route 只保留 cookie/header 透传和 legacy compat", - "TREE_3000_ROUTE_BOUNDARY_MANIFEST owner 口径改为 rust-web-gateway" - ], - "validation": { - "command": "cd /mnt/Data1T/mnote/rust && cargo test -p mnote-web documents_api && cargo test -p mnote-web tree_commands && cargo test -p mnote-web search && cargo test -p bridge-runtime page_aggregate && cargo test -p bridge-runtime tree_subtree_move_command && cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/lib/tree-route-boundary.test.ts src/app/api/documents/route-adapters.test.ts src/lib/search/request.test.ts", - "timeout_seconds": 3600 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [ - "[CONFIG] 原验证中的 cargo test -p bridge-runtime page_aggregate 过滤词当前命中 0 项；本任务实际覆盖 documents_api/tree_commands/search 与 route boundary。" - ], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "已补 Rust Web search.documents transport、documents owner headers 与 TREE_3000_ROUTE_BOUNDARY rust-web-gateway owner 口径。", - "timestamp": "2026-04-28T09:26:14Z" - } - ], - "completed_at": "2026-04-28T09:26:14Z" - }, - { - "id": "task-024", - "title": "Phase W-5：把 tree realtime stream 固定为 Rust Web 主链", - "status": "completed", - "priority": "P0", - "depends_on": [ - "task-023" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "9f6a2c86", - "source_doc": "design/03-rust-web/done/3-6-rust-web-main-execution-plane-checklist-v1.md", - "plan_doc": "design/03-rust-web/done/3-5-rust-web-main-execution-plane-cutover-plan-v1.md", - "scope": [ - "rust/crates/mnote-web/src/routes/sse.rs", - "rust/crates/mnote-web/src/routes/stream_support.rs", - "wolai-frontend/src/app/api/mnote-web/stream/route.ts", - "wolai-frontend/src/lib/tree-stream/protocol.ts", - "wolai-frontend/src/lib/tree-stream/tree-stream.test.ts", - "wolai-frontend/src/lib/tree-stream/use-sidebar-tree-stream.test.tsx" - ], - "acceptance": [ - "Rust Web 输出正式 /api/tree/events snapshot + delta stream", - "/api/mnote-web/stream 降级为 compat alias", - "Sidebar / page tree / file tree consumer 使用 Rust-owned stream" - ], - "validation": { - "command": "cd /mnt/Data1T/mnote/rust && cargo test -p mnote-web tree_realtime && cargo test -p mnote-web stream && cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/app/api/mnote-web/stream/route.test.ts src/lib/tree-stream/tree-stream.test.ts src/lib/tree-stream/use-sidebar-tree-stream.test.tsx && cd /mnt/Data1T/mnote && node scripts/task112-tree-rust-family-regression-smoke.js", - "timeout_seconds": 4200 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "Rust Web /api/tree/events 已固定为 tree realtime stream 主链，输出 rust-web owner、snapshot/delta stream；Next /api/mnote-web/stream 保留 compat alias，consumer URL 指向 /api/tree/events。task112 针对 legacy Chromium renderer crash 仅做一次新 context 恢复。", - "timestamp": "2026-04-28T12:33:41Z" - } - ], - "completed_at": "2026-04-28T12:33:41Z" - }, - { - "id": "task-025", - "title": "Phase W-6：把 Search / AI / Mindmap 页面壳迁到 Rust Web shell + islands", - "status": "completed", - "priority": "P1", - "depends_on": [ - "task-024" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "9f6a2c86", - "source_doc": "design/03-rust-web/done/3-6-rust-web-main-execution-plane-checklist-v1.md", - "plan_doc": "design/03-rust-web/done/3-5-rust-web-main-execution-plane-cutover-plan-v1.md", - "scope": [ - "rust/crates/mnote-web/src/routes/search.rs", - "rust/crates/mnote-web/src/routes/mindmap_shell.rs", - "rust/crates/mnote-web/src/routes/hermes.rs", - "wolai-frontend/src/components/search/SearchPaletteHost.tsx", - "wolai-frontend/src/components/editor/DocumentAiAgentPanel.runtime.tsx", - "wolai-frontend/src/app/mindmap/[docId]/[mindmapId]/page.tsx", - "scripts/task116-rust-web-islands-smoke.js" - ], - "acceptance": [ - "Rust Web 输出 Search server-first shell", - "Rust Web / Hermes 拥有 AI bridge session、tool event、client action contract", - "Rust Web 输出 Mindmap object shell，React runtime 只作为 island 或 legacy compat" - ], - "validation": { - "command": "cd /mnt/Data1T/mnote/rust && cargo test -p mnote-web search_shell && cargo test -p mnote-web ai_bridge && cargo test -p mnote-web mindmap_shell && cd /mnt/Data1T/mnote/wolai-frontend && pnpm vitest run src/components/editor/DocumentAiAgentPanel.runtime.test.tsx src/lib/ai-agent/runtime/runAgent.test.ts src/lib/search/request.test.ts && cd /mnt/Data1T/mnote && node scripts/task116-rust-web-islands-smoke.js", - "timeout_seconds": 4200 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "Search server-first shell、Hermes AI bridge owner contract、Mindmap object shell 已落到 Rust Web；React runtime 标记为 island/legacy compat；task116 smoke 证明三类 owner 已迁移。", - "timestamp": "2026-04-28T12:44:04Z" - } - ], - "completed_at": "2026-04-28T12:44:04Z" - }, - { - "id": "task-026", - "title": "Phase W-7：退役 Next App Router 主入口并完成 03-rust-web 文档收口", - "status": "completed", - "priority": "P0", - "depends_on": [ - "task-025" - ], - "attempts": 1, - "max_attempts": 3, - "started_at_commit": "9f6a2c86", - "source_doc": "design/03-rust-web/done/3-6-rust-web-main-execution-plane-checklist-v1.md", - "plan_doc": "design/03-rust-web/done/3-5-rust-web-main-execution-plane-cutover-plan-v1.md", - "scope": [ - "ARCHITECTURE.md", - "design/03-rust-web/process/3-1-rust-web-long-term-checklist-v2.md", - "design/03-rust-web/done/3-5-rust-web-main-execution-plane-cutover-plan-v1.md", - "design/03-rust-web/done/3-6-rust-web-main-execution-plane-checklist-v1.md", - "scripts/task117-next-retirement-guard.js" - ], - "acceptance": [ - "task117 证明 SKIP_NEXT_LEGACY=1 时核心 smoke 仍可通过", - "默认启动链不再把 pnpm dev 作为 3000 owner，3104 不恢复为公开入口", - "ARCHITECTURE.md 与 3-1 同步 Next App Router legacy compat 口径，本 plan/checklist 移入 done" - ], - "validation": { - "command": "cd /mnt/Data1T/mnote && node scripts/task097-homepage-entry-smoke.js && node scripts/task114-rust-web-gateway-entry-smoke.js && node scripts/task115-rust-web-document-shell-smoke.js && node scripts/task116-rust-web-islands-smoke.js && node scripts/task117-next-retirement-guard.js && git diff --check -- ARCHITECTURE.md design/03-rust-web scripts wolai-frontend rust/crates/mnote-web", - "timeout_seconds": 4800 - }, - "on_failure": { - "cleanup": null - }, - "error_log": [], - "checkpoints": [ - { - "step": 1, - "total": 1, - "description": "task117 已证明 SKIP_NEXT_LEGACY=1 时核心 shell 不依赖 Next legacy；desktop-hot 支持跳过 Next legacy；ARCHITECTURE/3-1 已同步 Next App Router legacy compat 口径，3-5/3-6 已移入 done。", - "timestamp": "2026-04-28T12:50:07Z" - } - ], - "completed_at": "2026-04-28T12:50:07Z" - } - ], - "session_count": 10, - "last_session": "2026-04-28T12:50:07Z", - "final_renderer_gate": { - "source_doc": "design/04-tree-domain/process/4-18-tree-final-dom-shell-cutover-hard-gate-v1.md", - "status": "completed", - "note": "task-001 至 task-009 只代表 Rust/WASM reducer runtime 阶段完成；不得再把 inline iframe srcdoc host 视为 final Rust DOM renderer。" - }, - "final_runtime_remaining": { - "source_doc": "design/04-tree-domain/done/4-16-tree-rust-family-remaining-final-runtime-checklist-v1.md", - "status": "completed", - "tasks": [ - "task-014", - "task-015", - "task-016", - "task-017", - "task-018" - ] - }, - "main_web_execution_plane": { - "source_doc": "design/03-rust-web/process/3-6-rust-web-main-execution-plane-checklist-v1.md", - "plan_doc": "design/03-rust-web/process/3-5-rust-web-main-execution-plane-cutover-plan-v1.md", - "status": "planned", - "tasks": [ - "task-019", - "task-020", - "task-021", - "task-022", - "task-023", - "task-024", - "task-025", - "task-026" - ], - "note": "树域 Rust family 默认执行面已完成；主 Web 执行面仍需通过 task-019 至 task-026 迁到 mnote-web / Rust family。" - }, - "rust_web_3_4_undo": { - "source_doc": "design/03-rust-web/process/3-4-undo.md", - "status": "in_progress", - "dependency_chain": "A -> B/C -> D/E/F -> G -> H", - "tasks": [ - { - "id": "task-3-4-A", - "title": "Page Aggregate 升级为 core-protocol projection contract", - "status": "in_progress", - "depends_on": [], - "validation": "cd /mnt/Data1T/mnote/rust && cargo test -p core-protocol page_aggregate && cargo test -p bridge-runtime page_aggregate && cargo test -p mnote-web page_aggregate" - }, - { - "id": "task-3-4-B", - "title": "page.* 成为页面默认写命令族", - "status": "in_progress", - "depends_on": ["task-3-4-A"], - "validation": "cd /mnt/Data1T/mnote/rust && cargo test -p bridge-runtime page_body_save && cargo test -p bridge-runtime page_head_update_title && cargo test -p bridge-runtime page_layout_update_options && cargo test -p mnote-web documents_save" - }, - { - "id": "task-3-4-C", - "title": "3000 Rust shell 消费 tree realtime event stream", - "status": "in_progress", - "depends_on": ["task-3-4-A"], - "validation": "cd /mnt/Data1T/mnote/rust && cargo test -p mnote-web tree_events && cargo test -p mnote-web tree_command && cd /mnt/Data1T/mnote && MNOTE_UI_BASE_URL=http://127.0.0.1:3000 node scripts/task123-rust-web-tree-live-stream-consumer-smoke.js" - }, - { - "id": "task-3-4-D", - "title": "Search 收口为 server-first / kernel-aware 主链", - "status": "in_progress", - "depends_on": ["task-3-4-B", "task-3-4-C"], - "validation": "cd /mnt/Data1T/mnote/rust && cargo test -p core-protocol search && cargo test -p bridge-runtime search_documents_query && cargo test -p mnote-web search && cd /mnt/Data1T/mnote && MNOTE_UI_BASE_URL=http://127.0.0.1:3000 node scripts/task125-rust-web-search-server-first-smoke.js" - }, - { - "id": "task-3-4-E", - "title": "AI bridge 与结构化写链收口", - "status": "in_progress", - "depends_on": ["task-3-4-B", "task-3-4-C"], - "validation": "cd /mnt/Data1T/mnote/rust && cargo test -p core-protocol ai && cargo test -p mnote-web hermes && cd /mnt/Data1T/mnote && MNOTE_UI_BASE_URL=http://127.0.0.1:3000 node scripts/task126-rust-web-ai-bridge-structured-write-smoke.js" - }, - { - "id": "task-3-4-F", - "title": "Mindmap 成为 kernel projection / command truth", - "status": "in_progress", - "depends_on": ["task-3-4-B", "task-3-4-C"], - "validation": "cd /mnt/Data1T/mnote/rust && cargo test -p core-protocol mindmap && cargo test -p bridge-runtime mindmap && cargo test -p mnote-web mindmap && cd /mnt/Data1T/mnote && MNOTE_UI_BASE_URL=http://127.0.0.1:3000 node scripts/task127-rust-web-mindmap-kernel-projection-smoke.js" - }, - { - "id": "task-3-4-G", - "title": "Legacy Next / React 兼容层退役 gate", - "status": "in_progress", - "depends_on": ["task-3-4-D", "task-3-4-E", "task-3-4-F"], - "validation": "cd /mnt/Data1T/mnote/rust && cargo test -p mnote-web gateway && cargo test -p mnote-web legacy_next && cd /mnt/Data1T/mnote && MNOTE_UI_BASE_URL=http://127.0.0.1:3000 node scripts/task117-next-retirement-guard.js" - }, - { - "id": "task-3-4-H", - "title": "设计文档状态治理与执行节奏", - "status": "in_progress", - "depends_on": ["task-3-4-G"], - "validation": "cd /mnt/Data1T/mnote && rg -n \"\\\\[ \\\\]\" design/03-rust-web/process/3-4-undo.md && rg -n \"\\\\[done\\\\]|\\\\[recycle\\\\]\" design/03-rust-web design/old && git diff --check && git status --short --untracked-files=all" - } - ] - } -} diff --git a/package-lock.json b/package-lock.json index 1cd3a88c..4fa54479 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,19 +7,287 @@ "": { "name": "mnote-desktop", "version": "0.1.0", + "dependencies": { + "@e965/xlsx": "0.20.3", + "docx-preview": "0.3.7", + "pdfjs-dist": "4.10.38", + "pptx-preview": "^1.0.7" + }, "devDependencies": { "@playwright/test": "^1.56.1", "playwright": "^1.56.1" } }, + "node_modules/@e965/xlsx": { + "version": "0.20.3", + "resolved": "https://registry.npmjs.org/@e965/xlsx/-/xlsx-0.20.3.tgz", + "integrity": "sha512-703RN/3OdsRD5mtse2HBX7Um7xwaP9tlswEG6svOtjqokXoX7rJdQj7DyabD2I+xk22RgaIIU+R6BHgkpZGB/w==", + "license": "Apache-2.0", + "bin": { + "xlsx": "bin/xlsx.njs" + }, + "engines": { + "node": ">=0.8" + } + }, + "node_modules/@napi-rs/canvas": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas/-/canvas-0.1.100.tgz", + "integrity": "sha512-xglYA6q3XO5P3BNJYxVZ1IV7DLVjp1Py6nwag88YntrS+3vKHyYcMqXVS4ZztJmwz2uGvz1FWhI/4LgbR5uQDA==", + "license": "MIT", + "optional": true, + "workspaces": [ + "e2e/*" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + }, + "optionalDependencies": { + "@napi-rs/canvas-android-arm64": "0.1.100", + "@napi-rs/canvas-darwin-arm64": "0.1.100", + "@napi-rs/canvas-darwin-x64": "0.1.100", + "@napi-rs/canvas-linux-arm-gnueabihf": "0.1.100", + "@napi-rs/canvas-linux-arm64-gnu": "0.1.100", + "@napi-rs/canvas-linux-arm64-musl": "0.1.100", + "@napi-rs/canvas-linux-riscv64-gnu": "0.1.100", + "@napi-rs/canvas-linux-x64-gnu": "0.1.100", + "@napi-rs/canvas-linux-x64-musl": "0.1.100", + "@napi-rs/canvas-win32-arm64-msvc": "0.1.100", + "@napi-rs/canvas-win32-x64-msvc": "0.1.100" + } + }, + "node_modules/@napi-rs/canvas-android-arm64": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-android-arm64/-/canvas-android-arm64-0.1.100.tgz", + "integrity": "sha512-hjhCKhntPv9+t4ckHymdx0phYNcVW+GKQR6Lzw2zE+pOVjOplSmtx9nNNknTjbEDLcuLZqA1y8ufKg1XfgftzQ==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-darwin-arm64": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-darwin-arm64/-/canvas-darwin-arm64-0.1.100.tgz", + "integrity": "sha512-2PcswRaC7Ly645DGt88///zuFDhJxJYdKAs1uU3mfk1atYkXufgcgLfBpk6Tm12nCQBaNt1wpybuPZ4qOhTo8A==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-darwin-x64": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-darwin-x64/-/canvas-darwin-x64-0.1.100.tgz", + "integrity": "sha512-ePNZtj7pNIva/siZMg+HmbeozkIjqUIYdoymH8HaA3qK7LfzFN4WMBM8G6HQ9ZC+H3+Dnn5pqtiXpgLykaPOhw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-linux-arm-gnueabihf": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm-gnueabihf/-/canvas-linux-arm-gnueabihf-0.1.100.tgz", + "integrity": "sha512-d5cDB48oWFGU8/XPhUOFAlySgb/VAu7D+s8fi55K1Pcfg8aPplHWqMgibhVLU8ky7Pyg/fuiVLz4Nf3JrSTuUA==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-linux-arm64-gnu": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm64-gnu/-/canvas-linux-arm64-gnu-0.1.100.tgz", + "integrity": "sha512-rDxgxRu69RvDlX/bh9o22DxLsGr8EqsNgotL9+RwQE1S0b0cqeatqsw6aW45mukm0B42DIAaAacKaYQ8cqS1nw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-linux-arm64-musl": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-arm64-musl/-/canvas-linux-arm64-musl-0.1.100.tgz", + "integrity": "sha512-K3mDW66N+xT2/V439u1alFANiBUjdEx2gLiNYnCmUsva5jZMxWTjafBYwTzYK+EMFMHrUoabuU+T1BIP5CgbYQ==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-linux-riscv64-gnu": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-riscv64-gnu/-/canvas-linux-riscv64-gnu-0.1.100.tgz", + "integrity": "sha512-mooqUBTIsccZpnoQC4NgrC1v6C1vof39etLNMnBwCY+p0gajWJvAHLGQ6g/gGyS5YrpDW+GefSN4+Cvcr08UWw==", + "cpu": [ + "riscv64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-linux-x64-gnu": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-x64-gnu/-/canvas-linux-x64-gnu-0.1.100.tgz", + "integrity": "sha512-1eCvkDCazm7FFhsT7DfGOdSaHgZVK3bt/dSBl5EWHOWmnz+I7j8tPseJqqD81NF+MH21jKUK4wQSDjN0mdhnTg==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-linux-x64-musl": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-linux-x64-musl/-/canvas-linux-x64-musl-0.1.100.tgz", + "integrity": "sha512-20arT6lnI19S68qNlii73TSEDbECNgzMz2EpldC1V3mZFuRkeujXkcebRk0LRJe9SEUAooYiLokfMViY8IX7yA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-win32-arm64-msvc": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-win32-arm64-msvc/-/canvas-win32-arm64-msvc-0.1.100.tgz", + "integrity": "sha512-DZFFT1wIAg37LJw37yhMRFfjATd3vTQzjZ1Yki8u2vhO6Hi5VE6BVaGQ1aaDu7xb4iMErz+9EOwjpS7xcxFeBw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, + "node_modules/@napi-rs/canvas-win32-x64-msvc": { + "version": "0.1.100", + "resolved": "https://registry.npmjs.org/@napi-rs/canvas-win32-x64-msvc/-/canvas-win32-x64-msvc-0.1.100.tgz", + "integrity": "sha512-MyT1j3mHC2+Lu4pBi9mKyMJhtP6U7k7EldY7sj/uS5gJA65gTXt8MefJQXLJo5d/vZbuWmfxzkEUNc/urV3pHA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + } + }, "node_modules/@playwright/test": { - "version": "1.56.1", - "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.56.1.tgz", - "integrity": "sha512-vSMYtL/zOcFpvJCW71Q/OEGQb7KYBPAdKh35WNSkaZA75JlAO8ED8UN6GUNTm3drWomcbcqRPFqQbLae8yBTdg==", + "version": "1.57.0", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.57.0.tgz", + "integrity": "sha512-6TyEnHgd6SArQO8UO2OMTxshln3QMWBtPGrOCgs3wVEmQmwyuNtB10IZMfmYDE0riwNR1cu4q+pPcxMVtaG3TA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright": "1.56.1" + "playwright": "1.57.0" }, "bin": { "playwright": "cli.js" @@ -28,6 +296,37 @@ "node": ">=18" } }, + "node_modules/core-util-is": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", + "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", + "license": "MIT" + }, + "node_modules/docx-preview": { + "version": "0.3.7", + "resolved": "https://registry.npmjs.org/docx-preview/-/docx-preview-0.3.7.tgz", + "integrity": "sha512-Lav69CTA/IYZPJTsKH7oYeoZjyg96N0wEJMNslGJnZJ+dMUZK85Lt5ASC79yUlD48ecWjuv+rkcmFt6EVPV0Xg==", + "license": "Apache-2.0", + "dependencies": { + "jszip": ">=3.0.0" + } + }, + "node_modules/echarts": { + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/echarts/-/echarts-5.6.0.tgz", + "integrity": "sha512-oTbVTsXfKuEhxftHqL5xprgLoc0k7uScAwtryCgWF6hPYFLRwOUHiFmHGCBKP5NPFNkDVopOieyUqYGH8Fa3kA==", + "license": "Apache-2.0", + "dependencies": { + "tslib": "2.3.0", + "zrender": "5.6.1" + } + }, + "node_modules/echarts/node_modules/tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==", + "license": "0BSD" + }, "node_modules/fsevents": { "version": "2.3.2", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", @@ -43,14 +342,77 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, + "node_modules/immediate": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", + "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==", + "license": "MIT" + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" + }, + "node_modules/isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "license": "MIT" + }, + "node_modules/jszip": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/jszip/-/jszip-3.10.1.tgz", + "integrity": "sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==", + "license": "(MIT OR GPL-3.0-or-later)", + "dependencies": { + "lie": "~3.3.0", + "pako": "~1.0.2", + "readable-stream": "~2.3.6", + "setimmediate": "^1.0.5" + } + }, + "node_modules/lie": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/lie/-/lie-3.3.0.tgz", + "integrity": "sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==", + "license": "MIT", + "dependencies": { + "immediate": "~3.0.5" + } + }, + "node_modules/lodash": { + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.18.1.tgz", + "integrity": "sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==", + "license": "MIT" + }, + "node_modules/pako": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", + "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==", + "license": "(MIT AND Zlib)" + }, + "node_modules/pdfjs-dist": { + "version": "4.10.38", + "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-4.10.38.tgz", + "integrity": "sha512-/Y3fcFrXEAsMjJXeL9J8+ZG9U01LbuWaYypvDW2ycW1jL269L3js3DVBjDJ0Up9Np1uqDXsDrRihHANhZOlwdQ==", + "license": "Apache-2.0", + "engines": { + "node": ">=20" + }, + "optionalDependencies": { + "@napi-rs/canvas": "^0.1.65" + } + }, "node_modules/playwright": { - "version": "1.56.1", - "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.56.1.tgz", - "integrity": "sha512-aFi5B0WovBHTEvpM3DzXTUaeN6eN0qWnTkKx4NQaH4Wvcmc153PdaY2UBdSYKaGYw+UyWXSVyxDUg5DoPEttjw==", + "version": "1.57.0", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.57.0.tgz", + "integrity": "sha512-ilYQj1s8sr2ppEJ2YVadYBN0Mb3mdo9J0wQ+UuDhzYqURwSoW4n1Xs5vs7ORwgDGmyEh33tRMeS8KhdkMoLXQw==", "dev": true, "license": "Apache-2.0", "dependencies": { - "playwright-core": "1.56.1" + "playwright-core": "1.57.0" }, "bin": { "playwright": "cli.js" @@ -63,9 +425,9 @@ } }, "node_modules/playwright-core": { - "version": "1.56.1", - "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.56.1.tgz", - "integrity": "sha512-hutraynyn31F+Bifme+Ps9Vq59hKuUCz7H1kDOcBs+2oGguKkWTU50bBWrtz34OUWmIwpBTWDxaRPXrIXkgvmQ==", + "version": "1.57.0", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.57.0.tgz", + "integrity": "sha512-agTcKlMw/mjBWOnD6kFZttAAGHgi/Nw0CZ2o6JqWSbMlI219lAFLZZCyqByTsvVAJq5XA5H8cA6PrvBRpBWEuQ==", "dev": true, "license": "Apache-2.0", "bin": { @@ -74,6 +436,102 @@ "engines": { "node": ">=18" } + }, + "node_modules/pptx-preview": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/pptx-preview/-/pptx-preview-1.0.7.tgz", + "integrity": "sha512-YByocJuyxAR4YB4Q3+VAxdLfEvA5LojG1gAJsx2Mw0QU5FJPps/2fkJOupJ6oBbA+KdWRpuAk6G6T34rKCHVxw==", + "license": "ISC", + "dependencies": { + "echarts": "^5.5.1", + "jszip": "^3.10.1", + "lodash": "^4.17.21", + "tslib": "^2.7.0", + "uuid": "^10.0.0" + } + }, + "node_modules/process-nextick-args": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", + "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", + "license": "MIT" + }, + "node_modules/readable-stream": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "license": "MIT", + "dependencies": { + "core-util-is": "~1.0.0", + "inherits": "~2.0.3", + "isarray": "~1.0.0", + "process-nextick-args": "~2.0.0", + "safe-buffer": "~5.1.1", + "string_decoder": "~1.1.1", + "util-deprecate": "~1.0.1" + } + }, + "node_modules/safe-buffer": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "license": "MIT" + }, + "node_modules/setimmediate": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", + "integrity": "sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==", + "license": "MIT" + }, + "node_modules/string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.1.0" + } + }, + "node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "license": "0BSD" + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "license": "MIT" + }, + "node_modules/uuid": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz", + "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==", + "deprecated": "uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "license": "MIT", + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/zrender": { + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.6.1.tgz", + "integrity": "sha512-OFXkDJKcrlx5su2XbzJvj/34Q3m6PvyCZkVPHGYpcCJ52ek4U/ymZyfuV1nKE23AyBJ51E/6Yr0mhZ7xGTO4ag==", + "license": "BSD-3-Clause", + "dependencies": { + "tslib": "2.3.0" + } + }, + "node_modules/zrender/node_modules/tslib": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.0.tgz", + "integrity": "sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==", + "license": "0BSD" } } } diff --git a/package.json b/package.json index e29d1191..7fdeb332 100644 --- a/package.json +++ b/package.json @@ -3,13 +3,17 @@ "version": "0.1.0", "private": true, "scripts": { - "desktop": "node scripts/desktop-prod.js", "desktop:hot": "node scripts/desktop-hot.js", - "dev:hot": "node scripts/dev-hot.js", - "check:local-first-convex-guard": "node scripts/check-local-first-convex-guard.js" + "dev:hot": "node scripts/dev-hot.js" }, "devDependencies": { "@playwright/test": "^1.56.1", "playwright": "^1.56.1" + }, + "dependencies": { + "@e965/xlsx": "0.20.3", + "docx-preview": "0.3.7", + "pdfjs-dist": "4.10.38", + "pptx-preview": "^1.0.7" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 45374b2c..41d0d42e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,6 +7,16 @@ settings: importers: .: + dependencies: + '@e965/xlsx': + specifier: 0.20.3 + version: 0.20.3 + docx-preview: + specifier: 0.3.7 + version: 0.3.7 + pdfjs-dist: + specifier: 4.10.38 + version: 4.10.38 devDependencies: '@playwright/test': specifier: ^1.56.1 @@ -17,16 +27,119 @@ importers: packages: + '@e965/xlsx@0.20.3': + resolution: {integrity: sha512-703RN/3OdsRD5mtse2HBX7Um7xwaP9tlswEG6svOtjqokXoX7rJdQj7DyabD2I+xk22RgaIIU+R6BHgkpZGB/w==} + engines: {node: '>=0.8'} + hasBin: true + + '@napi-rs/canvas-android-arm64@0.1.100': + resolution: {integrity: sha512-hjhCKhntPv9+t4ckHymdx0phYNcVW+GKQR6Lzw2zE+pOVjOplSmtx9nNNknTjbEDLcuLZqA1y8ufKg1XfgftzQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [android] + + '@napi-rs/canvas-darwin-arm64@0.1.100': + resolution: {integrity: sha512-2PcswRaC7Ly645DGt88///zuFDhJxJYdKAs1uU3mfk1atYkXufgcgLfBpk6Tm12nCQBaNt1wpybuPZ4qOhTo8A==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [darwin] + + '@napi-rs/canvas-darwin-x64@0.1.100': + resolution: {integrity: sha512-ePNZtj7pNIva/siZMg+HmbeozkIjqUIYdoymH8HaA3qK7LfzFN4WMBM8G6HQ9ZC+H3+Dnn5pqtiXpgLykaPOhw==} + engines: {node: '>= 10'} + cpu: [x64] + os: [darwin] + + '@napi-rs/canvas-linux-arm-gnueabihf@0.1.100': + resolution: {integrity: sha512-d5cDB48oWFGU8/XPhUOFAlySgb/VAu7D+s8fi55K1Pcfg8aPplHWqMgibhVLU8ky7Pyg/fuiVLz4Nf3JrSTuUA==} + engines: {node: '>= 10'} + cpu: [arm] + os: [linux] + + '@napi-rs/canvas-linux-arm64-gnu@0.1.100': + resolution: {integrity: sha512-rDxgxRu69RvDlX/bh9o22DxLsGr8EqsNgotL9+RwQE1S0b0cqeatqsw6aW45mukm0B42DIAaAacKaYQ8cqS1nw==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + + '@napi-rs/canvas-linux-arm64-musl@0.1.100': + resolution: {integrity: sha512-K3mDW66N+xT2/V439u1alFANiBUjdEx2gLiNYnCmUsva5jZMxWTjafBYwTzYK+EMFMHrUoabuU+T1BIP5CgbYQ==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [linux] + + '@napi-rs/canvas-linux-riscv64-gnu@0.1.100': + resolution: {integrity: sha512-mooqUBTIsccZpnoQC4NgrC1v6C1vof39etLNMnBwCY+p0gajWJvAHLGQ6g/gGyS5YrpDW+GefSN4+Cvcr08UWw==} + engines: {node: '>= 10'} + cpu: [riscv64] + os: [linux] + + '@napi-rs/canvas-linux-x64-gnu@0.1.100': + resolution: {integrity: sha512-1eCvkDCazm7FFhsT7DfGOdSaHgZVK3bt/dSBl5EWHOWmnz+I7j8tPseJqqD81NF+MH21jKUK4wQSDjN0mdhnTg==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + + '@napi-rs/canvas-linux-x64-musl@0.1.100': + resolution: {integrity: sha512-20arT6lnI19S68qNlii73TSEDbECNgzMz2EpldC1V3mZFuRkeujXkcebRk0LRJe9SEUAooYiLokfMViY8IX7yA==} + engines: {node: '>= 10'} + cpu: [x64] + os: [linux] + + '@napi-rs/canvas-win32-arm64-msvc@0.1.100': + resolution: {integrity: sha512-DZFFT1wIAg37LJw37yhMRFfjATd3vTQzjZ1Yki8u2vhO6Hi5VE6BVaGQ1aaDu7xb4iMErz+9EOwjpS7xcxFeBw==} + engines: {node: '>= 10'} + cpu: [arm64] + os: [win32] + + '@napi-rs/canvas-win32-x64-msvc@0.1.100': + resolution: {integrity: sha512-MyT1j3mHC2+Lu4pBi9mKyMJhtP6U7k7EldY7sj/uS5gJA65gTXt8MefJQXLJo5d/vZbuWmfxzkEUNc/urV3pHA==} + engines: {node: '>= 10'} + cpu: [x64] + os: [win32] + + '@napi-rs/canvas@0.1.100': + resolution: {integrity: sha512-xglYA6q3XO5P3BNJYxVZ1IV7DLVjp1Py6nwag88YntrS+3vKHyYcMqXVS4ZztJmwz2uGvz1FWhI/4LgbR5uQDA==} + engines: {node: '>= 10'} + '@playwright/test@1.57.0': resolution: {integrity: sha512-6TyEnHgd6SArQO8UO2OMTxshln3QMWBtPGrOCgs3wVEmQmwyuNtB10IZMfmYDE0riwNR1cu4q+pPcxMVtaG3TA==} engines: {node: '>=18'} hasBin: true + core-util-is@1.0.3: + resolution: {integrity: sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==} + + docx-preview@0.3.7: + resolution: {integrity: sha512-Lav69CTA/IYZPJTsKH7oYeoZjyg96N0wEJMNslGJnZJ+dMUZK85Lt5ASC79yUlD48ecWjuv+rkcmFt6EVPV0Xg==} + fsevents@2.3.2: resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==} engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0} os: [darwin] + immediate@3.0.6: + resolution: {integrity: sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==} + + inherits@2.0.4: + resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==} + + isarray@1.0.0: + resolution: {integrity: sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==} + + jszip@3.10.1: + resolution: {integrity: sha512-xXDvecyTpGLrqFrvkrUSoxxfJI5AH7U8zxxtVclpsUtMCq4JQ290LY8AW5c7Ggnr/Y/oK+bQMbqK2qmtk3pN4g==} + + lie@3.3.0: + resolution: {integrity: sha512-UaiMJzeWRlEujzAuw5LokY1L5ecNQYZKfmyZ9L7wDHb/p5etKaxXhohBcrw0EYby+G/NA52vRSN4N39dxHAIwQ==} + + pako@1.0.11: + resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==} + + pdfjs-dist@4.10.38: + resolution: {integrity: sha512-/Y3fcFrXEAsMjJXeL9J8+ZG9U01LbuWaYypvDW2ycW1jL269L3js3DVBjDJ0Up9Np1uqDXsDrRihHANhZOlwdQ==} + engines: {node: '>=20'} + playwright-core@1.57.0: resolution: {integrity: sha512-agTcKlMw/mjBWOnD6kFZttAAGHgi/Nw0CZ2o6JqWSbMlI219lAFLZZCyqByTsvVAJq5XA5H8cA6PrvBRpBWEuQ==} engines: {node: '>=18'} @@ -37,15 +150,112 @@ packages: engines: {node: '>=18'} hasBin: true + process-nextick-args@2.0.1: + resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==} + + readable-stream@2.3.8: + resolution: {integrity: sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==} + + safe-buffer@5.1.2: + resolution: {integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==} + + setimmediate@1.0.5: + resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==} + + string_decoder@1.1.1: + resolution: {integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==} + + util-deprecate@1.0.2: + resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==} + snapshots: + '@e965/xlsx@0.20.3': {} + + '@napi-rs/canvas-android-arm64@0.1.100': + optional: true + + '@napi-rs/canvas-darwin-arm64@0.1.100': + optional: true + + '@napi-rs/canvas-darwin-x64@0.1.100': + optional: true + + '@napi-rs/canvas-linux-arm-gnueabihf@0.1.100': + optional: true + + '@napi-rs/canvas-linux-arm64-gnu@0.1.100': + optional: true + + '@napi-rs/canvas-linux-arm64-musl@0.1.100': + optional: true + + '@napi-rs/canvas-linux-riscv64-gnu@0.1.100': + optional: true + + '@napi-rs/canvas-linux-x64-gnu@0.1.100': + optional: true + + '@napi-rs/canvas-linux-x64-musl@0.1.100': + optional: true + + '@napi-rs/canvas-win32-arm64-msvc@0.1.100': + optional: true + + '@napi-rs/canvas-win32-x64-msvc@0.1.100': + optional: true + + '@napi-rs/canvas@0.1.100': + optionalDependencies: + '@napi-rs/canvas-android-arm64': 0.1.100 + '@napi-rs/canvas-darwin-arm64': 0.1.100 + '@napi-rs/canvas-darwin-x64': 0.1.100 + '@napi-rs/canvas-linux-arm-gnueabihf': 0.1.100 + '@napi-rs/canvas-linux-arm64-gnu': 0.1.100 + '@napi-rs/canvas-linux-arm64-musl': 0.1.100 + '@napi-rs/canvas-linux-riscv64-gnu': 0.1.100 + '@napi-rs/canvas-linux-x64-gnu': 0.1.100 + '@napi-rs/canvas-linux-x64-musl': 0.1.100 + '@napi-rs/canvas-win32-arm64-msvc': 0.1.100 + '@napi-rs/canvas-win32-x64-msvc': 0.1.100 + optional: true + '@playwright/test@1.57.0': dependencies: playwright: 1.57.0 + core-util-is@1.0.3: {} + + docx-preview@0.3.7: + dependencies: + jszip: 3.10.1 + fsevents@2.3.2: optional: true + immediate@3.0.6: {} + + inherits@2.0.4: {} + + isarray@1.0.0: {} + + jszip@3.10.1: + dependencies: + lie: 3.3.0 + pako: 1.0.11 + readable-stream: 2.3.8 + setimmediate: 1.0.5 + + lie@3.3.0: + dependencies: + immediate: 3.0.6 + + pako@1.0.11: {} + + pdfjs-dist@4.10.38: + optionalDependencies: + '@napi-rs/canvas': 0.1.100 + playwright-core@1.57.0: {} playwright@1.57.0: @@ -53,3 +263,25 @@ snapshots: playwright-core: 1.57.0 optionalDependencies: fsevents: 2.3.2 + + process-nextick-args@2.0.1: {} + + readable-stream@2.3.8: + dependencies: + core-util-is: 1.0.3 + inherits: 2.0.4 + isarray: 1.0.0 + process-nextick-args: 2.0.1 + safe-buffer: 5.1.2 + string_decoder: 1.1.1 + util-deprecate: 1.0.2 + + safe-buffer@5.1.2: {} + + setimmediate@1.0.5: {} + + string_decoder@1.1.1: + dependencies: + safe-buffer: 5.1.2 + + util-deprecate@1.0.2: {} diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 8fddc4c3..5c22a1f9 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -264,7 +264,6 @@ dependencies = [ "reqwest", "serde", "serde_json", - "storage-convex-bridge", "urlencoding", ] @@ -486,7 +485,6 @@ dependencies = [ "serde", "serde_json", "sha2", - "tempfile", "tracing", "uuid", ] @@ -532,7 +530,6 @@ checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" name = "core-protocol" version = "0.1.0" dependencies = [ - "core-domain", "serde", "serde_json", ] @@ -1543,12 +1540,6 @@ dependencies = [ "vcpkg", ] -[[package]] -name = "linux-raw-sys" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" - [[package]] name = "litemap" version = "0.8.2" @@ -1624,15 +1615,12 @@ dependencies = [ name = "mnote-cli" version = "0.1.0" dependencies = [ - "base64", "bridge-runtime", "clap", "core-protocol", "mnote-editor-core", - "reqwest", "serde", "serde_json", - "storage-convex-bridge", ] [[package]] @@ -1662,7 +1650,6 @@ dependencies = [ "reqwest", "serde", "serde_json", - "storage-convex-bridge", "time", "tokio", "tokio-stream", @@ -2279,19 +2266,6 @@ dependencies = [ "semver", ] -[[package]] -name = "rustix" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" -dependencies = [ - "bitflags", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.61.2", -] - [[package]] name = "rustls" version = "0.23.38" @@ -2615,15 +2589,6 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" -[[package]] -name = "storage-convex-bridge" -version = "0.1.0" -dependencies = [ - "core-domain", - "core-protocol", - "event-log", -] - [[package]] name = "strsim" version = "0.11.1" @@ -2711,19 +2676,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "tempfile" -version = "3.27.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" -dependencies = [ - "fastrand", - "getrandom 0.4.2", - "once_cell", - "rustix", - "windows-sys 0.61.2", -] - [[package]] name = "thiserror" version = "1.0.69" diff --git a/rust/Cargo.toml b/rust/Cargo.toml index 4cce6425..fad81fa0 100644 --- a/rust/Cargo.toml +++ b/rust/Cargo.toml @@ -9,7 +9,6 @@ members = [ "crates/mnote-editor-core", "crates/mnote-cli", "crates/mnote-web", - "crates/storage-convex-bridge", "crates/index-fts", "crates/tree-shell-runtime-wasm", ] diff --git a/rust/crates/bridge-runtime/Cargo.toml b/rust/crates/bridge-runtime/Cargo.toml index 47703b15..f4da424c 100644 --- a/rust/crates/bridge-runtime/Cargo.toml +++ b/rust/crates/bridge-runtime/Cargo.toml @@ -11,7 +11,6 @@ core-domain = { path = "../core-domain" } core-protocol = { path = "../core-protocol" } event-log = { path = "../event-log" } index-fts = { path = "../index-fts" } -storage-convex-bridge = { path = "../storage-convex-bridge" } serde = { version = "1", features = ["derive"] } serde_json = "1" reqwest = { version = "0.12", default-features = false, features = ["blocking", "json", "rustls-tls"] } diff --git a/rust/crates/bridge-runtime/src/lib.rs b/rust/crates/bridge-runtime/src/lib.rs index 8c211882..5f7fac2d 100644 --- a/rust/crates/bridge-runtime/src/lib.rs +++ b/rust/crates/bridge-runtime/src/lib.rs @@ -44,13 +44,168 @@ use serde_json::{json, Value}; use std::collections::{BTreeMap, HashMap, VecDeque}; use std::env; use std::sync::atomic::{AtomicU64, Ordering}; -use storage_convex_bridge::{ - build_query_request, build_write_request, BridgeContext, BridgeError, BridgeErrorKind, -}; static TOOL_BLOCK_COUNTER: AtomicU64 = AtomicU64::new(1); static MINDMAP_UID_COUNTER: AtomicU64 = AtomicU64::new(1); +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct BridgeContext { + pub deployment_id: Option, + pub project_id: Option, + pub request_id: String, + pub trace_id: String, + pub actor_type: String, + pub actor_id: String, + pub session_id: Option, + pub workspace_id: Option, + pub tenant_id: Option, + pub auth_token: Option, + pub source_channel: String, + pub source_client: String, + pub idempotency_key: Option, + pub validate_only: bool, + pub dry_run: bool, +} + +#[derive(Debug, Clone, PartialEq, Eq)] +pub enum BridgeErrorKind { + Validation, + Unauthorized, + Conflict, + NotFound, + Transport, + Rejected, +} + +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct BridgeError { + pub kind: BridgeErrorKind, + pub message: String, +} + +pub type BridgeResult = Result; + +impl BridgeError { + pub fn validation(message: impl Into) -> Self { + Self { + kind: BridgeErrorKind::Validation, + message: message.into(), + } + } + + pub fn transport(message: impl Into) -> Self { + Self { + kind: BridgeErrorKind::Transport, + message: message.into(), + } + } + + pub fn not_found(message: impl Into) -> Self { + Self { + kind: BridgeErrorKind::NotFound, + message: message.into(), + } + } +} + +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct RetiredMutationRequest { + pub function_name: String, + pub deployment_id: Option, + pub project_id: Option, + pub workspace_id: Option, + pub request_id: String, + pub trace_id: String, + pub idempotency_key: Option, + pub actor_id: String, + pub payload_json: String, +} + +#[derive(Debug, Clone, PartialEq, Eq)] +pub struct RetiredQueryRequest { + pub function_name: String, + pub deployment_id: Option, + pub project_id: Option, + pub workspace_id: Option, + pub request_id: String, + pub trace_id: String, + pub actor_id: String, + pub payload_json: String, +} + +fn retired_bridge_error() -> BridgeError { + BridgeError::validation( + "旧 Convex 兼容桥已退役；请改用 local-first Rust/SQLite control-plane 路径", + ) +} + +pub fn build_query_request( + context: &BridgeContext, + query: &QueryEnvelope, +) -> BridgeResult { + let function_name = legacy_query_function_name(&query.name)?; + Ok(RetiredQueryRequest { + function_name: function_name.to_string(), + deployment_id: context.deployment_id.clone(), + project_id: context.project_id.clone(), + workspace_id: context.workspace_id.clone(), + request_id: context.request_id.clone(), + trace_id: context.trace_id.clone(), + actor_id: context.actor_id.clone(), + payload_json: json!({ "name": query.name }).to_string(), + }) +} + +pub fn build_write_request( + context: &BridgeContext, + command: &CommandEnvelope, +) -> BridgeResult { + let function_name = legacy_command_function_name(&command.name)?; + Ok(RetiredMutationRequest { + function_name: function_name.to_string(), + deployment_id: context.deployment_id.clone(), + project_id: context.project_id.clone(), + workspace_id: context.workspace_id.clone(), + request_id: context.request_id.clone(), + trace_id: context.trace_id.clone(), + idempotency_key: context.idempotency_key.clone(), + actor_id: context.actor_id.clone(), + payload_json: json!({ + "name": command.name, + "commandId": command.command_id, + }) + .to_string(), + }) +} + +fn legacy_query_function_name(name: &str) -> BridgeResult<&'static str> { + match name { + "documents.content.get" => Ok("documents:getContent"), + "documents.meta.get" => Ok("documents:getMeta"), + "mindmaps.get" => Ok("mindmaps:get"), + "search.documents" => Ok("documents:listSearchDataByWorkspace"), + "search_blocks" => Ok("documents:searchBlocks"), + "sidebar.dataset.list" => Ok("sidebar:datasetList"), + _ => Err(retired_bridge_error()), + } +} + +fn legacy_command_function_name(name: &str) -> BridgeResult<&'static str> { + match name { + "documents.title.update" => Ok("documents:updateTitle"), + "documents.save" => Ok("documents:updateContent"), + "documents.create" => Ok("documents:createWithParentReference"), + "documents.move" => Ok("documents:move"), + "documents.delete" => Ok("documents:softDelete"), + "documents.restore" => Ok("documents:restore"), + "insert_block" | "blocks.patch" | "blocks.move" | "blocks.embed" => { + Ok("documents:updateContent") + } + "mindmaps.put" => Ok("mindmaps:put"), + _ => Err(retired_bridge_error()), + } +} + #[derive(Debug, Deserialize)] #[serde(rename_all = "camelCase", tag = "kind")] pub enum RuntimeInput { @@ -1573,7 +1728,7 @@ fn normalize_resource_asset_type(raw: Option<&str>) -> String { "video" => "video".into(), "audio" => "audio".into(), "mindmap" => "mindmap".into(), - "luckysheet" => "luckysheet".into(), + "table" => "table".into(), _ => "file".into(), } } @@ -1633,7 +1788,7 @@ fn normalize_resource_lifecycle_kind(payload: &ResourceLifecycleCommandPayload) .map(str::trim) .unwrap_or("file") { - "table" | "online-table" | "luckysheet" => "table".into(), + "table" | "online-table" => "table".into(), "mindmap" | "map" => "mindmap".into(), _ => "file".into(), } @@ -7991,7 +8146,7 @@ fn classify_asset_kind( if lowered_type == "mindmap" { return KernelProjectionAssetKind::Mindmap; } - if lowered_type == "luckysheet" { + if lowered_type == "table" { return KernelProjectionAssetKind::Table; } if is_pdf_asset(file_name, mime_type) { @@ -19981,10 +20136,10 @@ mod tests { "id": "table_1", "workspace_id": "ws_1", "document_id": "page_root", - "asset_type": "luckysheet", - "file_name": "budget.luckysheet", + "asset_type": "table", + "file_name": "budget.table", "mime_type": "application/json", - "storage_path": "budget.luckysheet" + "storage_path": "budget.table" } ], "mindmap_asset_children": { diff --git a/rust/crates/bridge-runtime/src/main.rs b/rust/crates/bridge-runtime/src/main.rs index 26730dd3..f392d5ab 100644 --- a/rust/crates/bridge-runtime/src/main.rs +++ b/rust/crates/bridge-runtime/src/main.rs @@ -3,9 +3,8 @@ use std::io::{self, Read}; use bridge_runtime::{ build_artifact_success_response, build_failure_response, build_success_response, execute_runtime_command_artifact, execute_runtime_input, execute_runtime_query, - runtime_input_requests_result, RuntimeFailure, RuntimeInput, + runtime_input_requests_result, BridgeError, BridgeErrorKind, RuntimeFailure, RuntimeInput, }; -use storage_convex_bridge::{BridgeError, BridgeErrorKind}; fn main() { let input = match read_stdin() { diff --git a/rust/crates/control-plane/Cargo.toml b/rust/crates/control-plane/Cargo.toml index b741eafe..53e684a9 100644 --- a/rust/crates/control-plane/Cargo.toml +++ b/rust/crates/control-plane/Cargo.toml @@ -14,6 +14,3 @@ chrono = { version = "0.4", features = ["serde"] } tracing = "0.1" sha2 = "0.10" hex = "0.4" - -[dev-dependencies] -tempfile = "3" diff --git a/rust/crates/control-plane/migrations/006-navigation-recent.sql b/rust/crates/control-plane/migrations/006-navigation-recent.sql new file mode 100644 index 00000000..7fb2e294 --- /dev/null +++ b/rust/crates/control-plane/migrations/006-navigation-recent.sql @@ -0,0 +1,22 @@ +CREATE TABLE IF NOT EXISTS user_navigation_recent ( + id TEXT PRIMARY KEY, + user_id TEXT NOT NULL REFERENCES users(id) ON DELETE CASCADE, + workspace_id TEXT NOT NULL DEFAULT '', + kind TEXT NOT NULL, + source_kind TEXT NOT NULL DEFAULT 'local_folder', + root_uri TEXT NOT NULL, + target_key TEXT NOT NULL, + relative_path TEXT, + document_id TEXT, + title TEXT NOT NULL, + status TEXT NOT NULL DEFAULT 'active', + metadata_json TEXT NOT NULL DEFAULT '{}', + visited_at TEXT NOT NULL, + created_at TEXT NOT NULL, + updated_at TEXT NOT NULL, + revision INTEGER NOT NULL DEFAULT 1, + UNIQUE(user_id, kind, target_key) +); + +CREATE INDEX IF NOT EXISTS idx_user_navigation_recent_lookup + ON user_navigation_recent(user_id, kind, status, visited_at DESC); diff --git a/rust/crates/control-plane/src/migrations.rs b/rust/crates/control-plane/src/migrations.rs index 8fa347c2..5ffdcbed 100644 --- a/rust/crates/control-plane/src/migrations.rs +++ b/rust/crates/control-plane/src/migrations.rs @@ -26,6 +26,10 @@ const MIGRATIONS: &[(&str, &str)] = &[ "v5-sidebar-shortcut-root-uri", include_str!("../migrations/005-sidebar-shortcut-root-uri.sql"), ), + ( + "v6-navigation-recent", + include_str!("../migrations/006-navigation-recent.sql"), + ), ]; /// Create the `_migrations` meta-table if it does not exist. @@ -108,6 +112,7 @@ mod tests { "ai_runtime_events", "sidebar_shortcuts", "user_ui_preferences", + "user_navigation_recent", ] { assert!(table_exists(&conn, table), "table {table} should exist"); } diff --git a/rust/crates/control-plane/src/model.rs b/rust/crates/control-plane/src/model.rs index 04978d8f..ac705520 100644 --- a/rust/crates/control-plane/src/model.rs +++ b/rust/crates/control-plane/src/model.rs @@ -243,6 +243,40 @@ pub struct UpsertUserUiPreferenceInput { pub value_json: String, } +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +pub struct NavigationRecentRecord { + pub id: EntityId, + pub user_id: EntityId, + pub workspace_id: Option, + pub kind: String, + pub source_kind: String, + pub root_uri: String, + pub target_key: String, + pub relative_path: Option, + pub document_id: Option, + pub title: String, + pub status: String, + pub metadata_json: String, + pub visited_at: Timestamp, + pub created_at: Timestamp, + pub updated_at: Timestamp, + pub revision: i64, +} + +#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] +pub struct UpsertNavigationRecentInput { + pub id: Option, + pub user_id: EntityId, + pub workspace_id: Option, + pub kind: String, + pub source_kind: String, + pub root_uri: String, + pub relative_path: Option, + pub document_id: Option, + pub title: String, + pub metadata_json: String, +} + #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)] pub struct AiPolicyRecord { pub id: EntityId, diff --git a/rust/crates/control-plane/src/sqlite.rs b/rust/crates/control-plane/src/sqlite.rs index 18a316bb..49c99226 100644 --- a/rust/crates/control-plane/src/sqlite.rs +++ b/rust/crates/control-plane/src/sqlite.rs @@ -11,10 +11,11 @@ use crate::model::{ AiRuntimeRunRecord, AppendAiRuntimeEventInput, AppendAuditInput, AuditLogRecord, AuthSessionRecord, AuthenticatePasswordInput, CreatePasswordIdentityInput, CreateSessionInput, CreateShareLinkInput, CreatedShareLink, DirectoryGrantInput, DirectoryGrantLookup, - DirectoryGrantRecord, OutboxEventInput, OutboxEventRecord, ResolvedAccess, ResolvedAuthSession, - ShareLinkRecord, SidebarShortcutRecord, SyncStateRecord, UpsertAiPolicyInput, - UpsertAiRuntimeRunInput, UpsertSidebarShortcutInput, UpsertSyncStateInput, UpsertUserInput, - UpsertUserUiPreferenceInput, UserRecord, UserUiPreferenceRecord, WorkspaceRecord, + DirectoryGrantRecord, NavigationRecentRecord, OutboxEventInput, OutboxEventRecord, + ResolvedAccess, ResolvedAuthSession, ShareLinkRecord, SidebarShortcutRecord, SyncStateRecord, + UpsertAiPolicyInput, UpsertAiRuntimeRunInput, UpsertNavigationRecentInput, + UpsertSidebarShortcutInput, UpsertSyncStateInput, UpsertUserInput, UpsertUserUiPreferenceInput, + UserRecord, UserUiPreferenceRecord, WorkspaceRecord, }; use crate::store::ControlPlaneStore; @@ -230,6 +231,56 @@ fn row_to_user_ui_preference(row: &rusqlite::Row<'_>) -> rusqlite::Result) -> rusqlite::Result { + Ok(NavigationRecentRecord { + id: row.get(0)?, + user_id: row.get(1)?, + workspace_id: empty_string_to_option(row.get(2)?), + kind: row.get(3)?, + source_kind: row.get(4)?, + root_uri: row.get(5)?, + target_key: row.get(6)?, + relative_path: row.get(7)?, + document_id: row.get(8)?, + title: row.get(9)?, + status: row.get(10)?, + metadata_json: row.get(11)?, + visited_at: row.get(12)?, + created_at: row.get(13)?, + updated_at: row.get(14)?, + revision: row.get(15)?, + }) +} + +fn navigation_recent_target_key( + kind: &str, + root_uri: &str, + relative_path: Option<&str>, + document_id: Option<&str>, +) -> Result { + match kind { + "folder" => Ok(format!( + "folder:{}:{}", + root_uri.trim(), + relative_path.map(str::trim).unwrap_or_default() + )), + "page" => { + let document_id = document_id + .map(str::trim) + .filter(|value| !value.is_empty()) + .ok_or_else(|| { + ControlPlaneError::InvalidInput( + "navigation recent page 需要 document_id".to_string(), + ) + })?; + Ok(format!("page:{}:{document_id}", root_uri.trim())) + } + _ => Err(ControlPlaneError::InvalidInput( + "navigation recent kind 只能是 folder 或 page".to_string(), + )), + } +} + fn row_to_ai_policy(row: &rusqlite::Row<'_>) -> rusqlite::Result { Ok(AiPolicyRecord { id: row.get(0)?, @@ -313,6 +364,33 @@ fn derive_ai_runtime_title(payload_json: &str, fallback: &str) -> String { title.chars().take(80).collect() } +fn prune_navigation_recent_for_kind( + conn: &Connection, + user_id: &str, + kind: &str, +) -> Result<(), ControlPlaneError> { + let keep = match kind { + "folder" => 10_i64, + "page" => 20_i64, + _ => 20_i64, + }; + conn.execute( + "UPDATE user_navigation_recent + SET status = 'removed', updated_at = ?1, revision = revision + 1 + WHERE user_id = ?2 + AND kind = ?3 + AND status = 'active' + AND id NOT IN ( + SELECT id FROM user_navigation_recent + WHERE user_id = ?2 AND kind = ?3 AND status = 'active' + ORDER BY visited_at DESC, updated_at DESC + LIMIT ?4 + )", + params![now_text(), user_id, kind, keep], + )?; + Ok(()) +} + impl ControlPlaneStore for SqliteControlPlaneStore { fn upsert_user(&self, input: UpsertUserInput) -> Result { if input.username.trim().is_empty() { @@ -864,7 +942,8 @@ impl ControlPlaneStore for SqliteControlPlaneStore { AND status = 'active' AND ( ?2 = root_uri - OR (recursive = 1 AND ?2 LIKE root_uri || '%') + OR (recursive = 1 AND ?2 LIKE root_uri || '/%') + OR (recursive = 1 AND root_uri LIKE '%/' AND ?2 LIKE root_uri || '%') OR (?3 != '' AND ?3 = root_path) OR (?3 != '' AND recursive = 1 AND ?3 LIKE root_path || '/%') )", @@ -1382,6 +1461,138 @@ impl ControlPlaneStore for SqliteControlPlaneStore { Ok(rows) } + fn upsert_navigation_recent( + &self, + input: UpsertNavigationRecentInput, + ) -> Result { + let user_id = input.user_id.trim().to_string(); + let workspace_id = option_to_stored_text(input.workspace_id); + let kind = input.kind.trim().to_string(); + let source_kind = input.source_kind.trim().to_string(); + let root_uri = input.root_uri.trim().to_string(); + let relative_path = input + .relative_path + .map(|value| value.trim().trim_matches('/').to_string()) + .filter(|value| !value.is_empty()); + let document_id = input + .document_id + .map(|value| value.trim().to_string()) + .filter(|value| !value.is_empty()); + let title = input.title.trim().to_string(); + if user_id.is_empty() + || kind.is_empty() + || source_kind.is_empty() + || root_uri.is_empty() + || title.is_empty() + { + return Err(ControlPlaneError::InvalidInput( + "navigation recent user/kind/source/root/title 不能为空".to_string(), + )); + } + serde_json::from_str::(&input.metadata_json)?; + let target_key = navigation_recent_target_key( + &kind, + &root_uri, + relative_path.as_deref(), + document_id.as_deref(), + )?; + let conn = self.conn.lock().unwrap(); + let now = now_text(); + conn.execute( + "INSERT INTO user_navigation_recent ( + id, user_id, workspace_id, kind, source_kind, root_uri, target_key, + relative_path, document_id, title, status, metadata_json, visited_at, + created_at, updated_at, revision + ) + VALUES (?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, 'active', ?11, ?12, ?13, ?14, 1) + ON CONFLICT(user_id, kind, target_key) + DO UPDATE SET + workspace_id = excluded.workspace_id, + source_kind = excluded.source_kind, + root_uri = excluded.root_uri, + relative_path = excluded.relative_path, + document_id = excluded.document_id, + title = excluded.title, + status = 'active', + metadata_json = excluded.metadata_json, + visited_at = excluded.visited_at, + updated_at = excluded.updated_at, + revision = user_navigation_recent.revision + 1", + params![ + input.id.unwrap_or_else(|| new_id("nav_recent")), + user_id, + workspace_id, + kind, + source_kind, + root_uri, + target_key, + relative_path, + document_id, + title, + input.metadata_json, + now, + now, + now, + ], + )?; + prune_navigation_recent_for_kind(&conn, &user_id, &kind)?; + let record = conn.query_row( + "SELECT id, user_id, workspace_id, kind, source_kind, root_uri, target_key, + relative_path, document_id, title, status, metadata_json, visited_at, + created_at, updated_at, revision + FROM user_navigation_recent + WHERE user_id = ?1 AND kind = ?2 AND target_key = ?3 + LIMIT 1", + params![user_id, kind, target_key], + row_to_navigation_recent, + )?; + Ok(record) + } + + fn list_navigation_recent( + &self, + user_id: &str, + kind: Option<&str>, + limit: usize, + ) -> Result, ControlPlaneError> { + let user_id = user_id.trim(); + if user_id.is_empty() { + return Ok(Vec::new()); + } + let limit = limit.clamp(1, 100) as i64; + let conn = self.conn.lock().unwrap(); + let rows = if let Some(kind) = kind.map(str::trim).filter(|value| !value.is_empty()) { + let mut stmt = conn.prepare( + "SELECT id, user_id, workspace_id, kind, source_kind, root_uri, target_key, + relative_path, document_id, title, status, metadata_json, visited_at, + created_at, updated_at, revision + FROM user_navigation_recent + WHERE user_id = ?1 AND kind = ?2 AND status = 'active' + ORDER BY visited_at DESC, updated_at DESC + LIMIT ?3", + )?; + let rows = stmt + .query_map(params![user_id, kind, limit], row_to_navigation_recent)? + .collect::, _>>()?; + rows + } else { + let mut stmt = conn.prepare( + "SELECT id, user_id, workspace_id, kind, source_kind, root_uri, target_key, + relative_path, document_id, title, status, metadata_json, visited_at, + created_at, updated_at, revision + FROM user_navigation_recent + WHERE user_id = ?1 AND status = 'active' + ORDER BY visited_at DESC, updated_at DESC + LIMIT ?2", + )?; + let rows = stmt + .query_map(params![user_id, limit], row_to_navigation_recent)? + .collect::, _>>()?; + rows + }; + Ok(rows) + } + fn upsert_ai_policy( &self, input: UpsertAiPolicyInput, @@ -1985,7 +2196,8 @@ mod tests { use crate::model::{ password_hash_v1, session_token_hash, AppendAiRuntimeEventInput, AuthenticatePasswordInput, CreatePasswordIdentityInput, UpsertAiPolicyInput, UpsertAiRuntimeRunInput, - UpsertSidebarShortcutInput, UpsertSyncStateInput, UpsertUserUiPreferenceInput, + UpsertNavigationRecentInput, UpsertSidebarShortcutInput, UpsertSyncStateInput, + UpsertUserUiPreferenceInput, }; fn store() -> SqliteControlPlaneStore { @@ -2158,6 +2370,36 @@ mod tests { assert_eq!(access.grant_ids.len(), 1); } + #[test] + fn resolve_access_does_not_match_sibling_uri_prefix() { + let store = store(); + create_user(&store, "reader"); + store + .grant_directory_access(DirectoryGrantInput { + user_id: "reader".to_string(), + workspace_id: None, + root_uri: "file:///tmp/mnote-ai-root".to_string(), + root_path: "/tmp/mnote-ai-root".to_string(), + permission: "write".to_string(), + recursive: true, + capabilities: vec!["ai".to_string()], + source: "admin".to_string(), + created_by: None, + }) + .expect("grant root"); + + let inside = store + .resolve_access("reader", "file:///tmp/mnote-ai-root/page.md") + .expect("resolve inside"); + assert_eq!(inside.permission, "write"); + + let sibling = store + .resolve_access("reader", "file:///tmp/mnote-ai-root-sibling/page.md") + .expect("resolve sibling"); + assert_eq!(sibling.permission, "none"); + assert!(sibling.grant_ids.is_empty()); + } + #[test] fn share_link_token_is_hashed_and_revocable() { let store = store(); @@ -2474,6 +2716,99 @@ mod tests { assert!(bob_sidebar_preferences.is_empty()); } + #[test] + fn navigation_recent_is_user_scoped_upserted_and_limited_by_kind() { + let store = store(); + create_user(&store, "alice"); + create_user(&store, "bob"); + + let first = store + .upsert_navigation_recent(UpsertNavigationRecentInput { + id: None, + user_id: "alice".to_string(), + workspace_id: Some("local:_tmp_mnote".to_string()), + kind: "folder".to_string(), + source_kind: "local_folder".to_string(), + root_uri: "file:///tmp/mnote".to_string(), + relative_path: Some("design".to_string()), + document_id: None, + title: "design".to_string(), + metadata_json: "{}".to_string(), + }) + .expect("insert folder recent"); + let updated = store + .upsert_navigation_recent(UpsertNavigationRecentInput { + id: None, + user_id: "alice".to_string(), + workspace_id: Some("local:_tmp_mnote".to_string()), + kind: "folder".to_string(), + source_kind: "local_folder".to_string(), + root_uri: "file:///tmp/mnote".to_string(), + relative_path: Some("design".to_string()), + document_id: None, + title: "Design".to_string(), + metadata_json: "{\"from\":\"test\"}".to_string(), + }) + .expect("upsert folder recent"); + assert_eq!(updated.id, first.id); + assert_eq!(updated.title, "Design"); + assert_eq!(updated.revision, first.revision + 1); + + store + .upsert_navigation_recent(UpsertNavigationRecentInput { + id: None, + user_id: "alice".to_string(), + workspace_id: Some("local:_tmp_mnote".to_string()), + kind: "page".to_string(), + source_kind: "local_folder".to_string(), + root_uri: "file:///tmp/mnote".to_string(), + relative_path: Some("design/Plan.md".to_string()), + document_id: Some("local-md:design~2FPlan.md".to_string()), + title: "Plan".to_string(), + metadata_json: "{}".to_string(), + }) + .expect("insert page recent"); + for index in 0..12 { + store + .upsert_navigation_recent(UpsertNavigationRecentInput { + id: None, + user_id: "alice".to_string(), + workspace_id: Some("local:_tmp_mnote".to_string()), + kind: "folder".to_string(), + source_kind: "local_folder".to_string(), + root_uri: "file:///tmp/mnote".to_string(), + relative_path: Some(format!("folder-{index}")), + document_id: None, + title: format!("folder-{index}"), + metadata_json: "{}".to_string(), + }) + .expect("insert bounded folder recent"); + } + + let alice_folders = store + .list_navigation_recent("alice", Some("folder"), 50) + .expect("list alice folders"); + assert_eq!(alice_folders.len(), 10); + assert_eq!(alice_folders[0].kind, "folder"); + assert_eq!(alice_folders[0].title, "folder-11"); + assert!(alice_folders.iter().all(|record| record.user_id == "alice")); + assert!(!alice_folders.iter().any(|record| record.title == "Design")); + + let alice_pages = store + .list_navigation_recent("alice", Some("page"), 20) + .expect("list alice pages"); + assert_eq!(alice_pages.len(), 1); + assert_eq!( + alice_pages[0].document_id.as_deref(), + Some("local-md:design~2FPlan.md") + ); + + let bob_recent = store + .list_navigation_recent("bob", None, 20) + .expect("list bob recent"); + assert!(bob_recent.is_empty()); + } + #[test] fn ai_policy_upsert_returns_workspace_policy_before_user_policy() { let store = store(); diff --git a/rust/crates/control-plane/src/store.rs b/rust/crates/control-plane/src/store.rs index 36f9f849..9ddd8775 100644 --- a/rust/crates/control-plane/src/store.rs +++ b/rust/crates/control-plane/src/store.rs @@ -5,11 +5,11 @@ use crate::model::{ AiPolicyRecord, AiRuntimeEventRecord, AiRuntimeRunRecord, AppendAiRuntimeEventInput, AppendAuditInput, AuditLogRecord, AuthSessionRecord, AuthenticatePasswordInput, CreatePasswordIdentityInput, CreateSessionInput, CreateShareLinkInput, CreatedShareLink, - DirectoryGrantInput, DirectoryGrantLookup, DirectoryGrantRecord, OutboxEventInput, - OutboxEventRecord, ResolvedAccess, ResolvedAuthSession, ShareLinkRecord, SidebarShortcutRecord, - SyncStateRecord, UpsertAiPolicyInput, UpsertAiRuntimeRunInput, UpsertSidebarShortcutInput, - UpsertSyncStateInput, UpsertUserInput, UpsertUserUiPreferenceInput, UserRecord, - UserUiPreferenceRecord, WorkspaceRecord, + DirectoryGrantInput, DirectoryGrantLookup, DirectoryGrantRecord, NavigationRecentRecord, + OutboxEventInput, OutboxEventRecord, ResolvedAccess, ResolvedAuthSession, ShareLinkRecord, + SidebarShortcutRecord, SyncStateRecord, UpsertAiPolicyInput, UpsertAiRuntimeRunInput, + UpsertNavigationRecentInput, UpsertSidebarShortcutInput, UpsertSyncStateInput, UpsertUserInput, + UpsertUserUiPreferenceInput, UserRecord, UserUiPreferenceRecord, WorkspaceRecord, }; pub trait ControlPlaneStore: Send + Sync { @@ -136,6 +136,18 @@ pub trait ControlPlaneStore: Send + Sync { source_kind: Option<&str>, ) -> Result, ControlPlaneError>; + fn upsert_navigation_recent( + &self, + input: UpsertNavigationRecentInput, + ) -> Result; + + fn list_navigation_recent( + &self, + user_id: &str, + kind: Option<&str>, + limit: usize, + ) -> Result, ControlPlaneError>; + fn upsert_ai_policy( &self, input: UpsertAiPolicyInput, diff --git a/rust/crates/core-protocol/Cargo.toml b/rust/crates/core-protocol/Cargo.toml index 1b0d7823..e8420a68 100644 --- a/rust/crates/core-protocol/Cargo.toml +++ b/rust/crates/core-protocol/Cargo.toml @@ -6,6 +6,5 @@ license.workspace = true authors.workspace = true [dependencies] -core-domain = { path = "../core-domain" } serde = { version = "1", features = ["derive"] } serde_json = "1" diff --git a/rust/crates/core-protocol/src/command.rs b/rust/crates/core-protocol/src/command.rs index 935a9fe2..f2bf4698 100644 --- a/rust/crates/core-protocol/src/command.rs +++ b/rust/crates/core-protocol/src/command.rs @@ -202,7 +202,12 @@ pub struct DeleteBlock { /// - `tree.focusKind` — 当前聚焦的树类型 ("file_tree" | "page_tree" | "none") /// - `tree.selectionCount` — 当前选中行数 (i64) /// - `tree.selectionResourceKind` — 选中资源的类型 ("page" | "folder" | "mindmap" | "asset" | ...) +/// - `tree.targetResourceKind` — 当前命令目标资源类型 +/// - `tree.targetRowKind` — 当前命令目标行类型 +/// - `tree.targetIsFolder` — 当前命令目标是否文件夹 +/// - `tree.targetIsAsset` — 当前命令目标是否资源文件 /// - `editor.dirty` — bool，当前编辑器是否有未保存修改 +/// - `editor.dirtyState` — 当前编辑器 dirty 状态 ("clean" | "dirty" | "stale" | ...) /// - `editor.hasSelection` — bool，编辑器是否有文本选区 /// - `ai.canWrite` — bool，当前会话是否允许 AI 写入 #[derive(Debug, Clone, PartialEq)] @@ -217,8 +222,18 @@ pub struct CommandContext { pub tree_selection_count: i64, /// 选择资源的 kind pub tree_selection_resource_kind: Option, + /// 当前命令目标资源 kind + pub tree_target_resource_kind: Option, + /// 当前命令目标行 kind + pub tree_target_row_kind: Option, + /// 当前命令目标是否文件夹 + pub tree_target_is_folder: bool, + /// 当前命令目标是否资源文件 + pub tree_target_is_asset: bool, /// 编辑器是否 dirty pub editor_dirty: bool, + /// 编辑器 dirty 状态 + pub editor_dirty_state: Option, /// 编辑器是否有选区 pub editor_has_selection: bool, /// AI 是否可写 @@ -233,7 +248,12 @@ impl CommandContext { tree_focus_kind: None, tree_selection_count: 0, tree_selection_resource_kind: None, + tree_target_resource_kind: None, + tree_target_row_kind: None, + tree_target_is_folder: false, + tree_target_is_asset: false, editor_dirty: false, + editor_dirty_state: Some("clean".to_string()), editor_has_selection: false, ai_can_write: true, } @@ -256,7 +276,21 @@ impl CommandContext { .tree_selection_resource_kind .as_deref() .map(|s| CommandContextValue::String(s.to_string())), + "tree.targetResourceKind" => self + .tree_target_resource_kind + .as_deref() + .map(|s| CommandContextValue::String(s.to_string())), + "tree.targetRowKind" => self + .tree_target_row_kind + .as_deref() + .map(|s| CommandContextValue::String(s.to_string())), + "tree.targetIsFolder" => Some(CommandContextValue::Bool(self.tree_target_is_folder)), + "tree.targetIsAsset" => Some(CommandContextValue::Bool(self.tree_target_is_asset)), "editor.dirty" => Some(CommandContextValue::Bool(self.editor_dirty)), + "editor.dirtyState" => self + .editor_dirty_state + .as_deref() + .map(|s| CommandContextValue::String(s.to_string())), "editor.hasSelection" => Some(CommandContextValue::Bool(self.editor_has_selection)), "ai.canWrite" => Some(CommandContextValue::Bool(self.ai_can_write)), _ => None, @@ -293,9 +327,44 @@ impl CommandContext { self } + /// 用 builder 模式设置命令目标 resource kind。 + pub fn with_tree_target_resource_kind(mut self, kind: &str) -> Self { + self.tree_target_resource_kind = Some(kind.to_string()); + self + } + + /// 用 builder 模式设置命令目标 row kind。 + pub fn with_tree_target_row_kind(mut self, kind: &str) -> Self { + self.tree_target_row_kind = Some(kind.to_string()); + self + } + + /// 用 builder 模式设置命令目标是否文件夹。 + pub fn with_tree_target_is_folder(mut self, is_folder: bool) -> Self { + self.tree_target_is_folder = is_folder; + self + } + + /// 用 builder 模式设置命令目标是否资源文件。 + pub fn with_tree_target_is_asset(mut self, is_asset: bool) -> Self { + self.tree_target_is_asset = is_asset; + self + } + /// 用 builder 模式设置 editor dirty。 pub fn with_editor_dirty(mut self, dirty: bool) -> Self { self.editor_dirty = dirty; + if dirty && self.editor_dirty_state.as_deref() == Some("clean") { + self.editor_dirty_state = Some("dirty".to_string()); + } + self + } + + /// 用 builder 模式设置 editor dirty 状态。 + pub fn with_editor_dirty_state(mut self, state: &str) -> Self { + let normalized = state.to_lowercase(); + self.editor_dirty_state = Some(normalized.clone()); + self.editor_dirty = normalized != "clean"; self } @@ -800,6 +869,25 @@ mod command_context_tests { assert!(is_command_enabled(&ctx, Some(""))); } + #[test] + fn command_context_exposes_target_and_dirty_state_keys() { + let ctx = CommandContext::new() + .with_tree_target_resource_kind("folder") + .with_tree_target_row_kind("directory") + .with_tree_target_is_folder(true) + .with_tree_target_is_asset(false) + .with_editor_dirty_state("Dirty") + .with_ai_can_write(false); + + assert!(check_when(&ctx, "tree.targetResourceKind == folder").unwrap()); + assert!(check_when(&ctx, "tree.targetRowKind == directory").unwrap()); + assert!(check_when(&ctx, "tree.targetIsFolder").unwrap()); + assert!(!check_when(&ctx, "tree.targetIsAsset").unwrap()); + assert!(check_when(&ctx, "editor.dirty").unwrap()); + assert!(check_when(&ctx, "editor.dirtyState == dirty").unwrap()); + assert!(!check_when(&ctx, "ai.canWrite").unwrap()); + } + #[test] fn command_context_number_comparison() { let ctx = CommandContext::new().with_tree_selection_count(3); diff --git a/rust/crates/core-protocol/src/kernel.rs b/rust/crates/core-protocol/src/kernel.rs index 6537e976..fc3e68f6 100644 --- a/rust/crates/core-protocol/src/kernel.rs +++ b/rust/crates/core-protocol/src/kernel.rs @@ -94,6 +94,10 @@ pub struct PageBodyWriteRequest { alias = "conflict_detection_key" )] pub expected_file_version: Option, + #[serde(default, alias = "write_intent_id")] + pub write_intent_id: Option, + #[serde(default, alias = "save_operation_id")] + pub save_operation_id: Option, #[serde(default)] pub base_content_hash: Option, #[serde(default = "default_page_body_content_format")] @@ -226,6 +230,12 @@ pub struct DocumentBuffer { pub last_saved_at: Option, /// 外部修改者 pub external_actor: Option, + /// 最近一次由 MNote 发起写入的意图 ID。 + #[serde(default)] + pub last_write_intent_id: Option, + /// 最近一次保存请求实例 ID。 + #[serde(default)] + pub last_save_operation_id: Option, } impl DocumentBuffer { @@ -240,10 +250,26 @@ impl DocumentBuffer { } pub fn mark_saved(&mut self, file_version: String, content_hash: String) { + self.mark_saved_with_operation(file_version, content_hash, None, None); + } + + pub fn mark_saved_with_operation( + &mut self, + file_version: String, + content_hash: String, + write_intent_id: Option, + save_operation_id: Option, + ) { self.file_version = Some(file_version); self.base_content_hash = Some(content_hash); self.current_content_hash = None; self.dirty_state = DocBufferDirtyState::Clean; + if write_intent_id.as_deref().map(str::trim).is_some_and(|value| !value.is_empty()) { + self.last_write_intent_id = write_intent_id; + } + if save_operation_id.as_deref().map(str::trim).is_some_and(|value| !value.is_empty()) { + self.last_save_operation_id = save_operation_id; + } self.last_saved_at = Some( std::time::SystemTime::now() .duration_since(std::time::UNIX_EPOCH) @@ -881,6 +907,8 @@ mod tests { "sourceKind": "local_folder", "rootUri": "file:///mnt/Data1T/Mnote_data/users/user/workspaces/my-space", "expectedFileVersion": "local-md:local-md:README.md:1:2:hash", + "writeIntentId": "intent:editor:abc", + "saveOperationId": "save:op:abc", "baseContentHash": "sha256:base", "contentFormat": "editorBlocks", "content": [{"type": "paragraph", "content": [{"type": "text", "text": "正文"}]}], @@ -894,6 +922,8 @@ mod tests { request.expected_file_version.as_deref(), Some("local-md:local-md:README.md:1:2:hash") ); + assert_eq!(request.write_intent_id.as_deref(), Some("intent:editor:abc")); + assert_eq!(request.save_operation_id.as_deref(), Some("save:op:abc")); assert_eq!(request.content_format, "editorBlocks"); assert_eq!(request.editor_source.as_deref(), Some("tiptap")); @@ -902,6 +932,8 @@ mod tests { value["expectedFileVersion"], json!("local-md:local-md:README.md:1:2:hash") ); + assert_eq!(value["writeIntentId"], json!("intent:editor:abc")); + assert_eq!(value["saveOperationId"], json!("save:op:abc")); assert_eq!(value["baseContentHash"], json!("sha256:base")); assert_eq!(value["contentFormat"], json!("editorBlocks")); assert_eq!(value["editorSource"], json!("tiptap")); @@ -1009,11 +1041,15 @@ mod tests { last_loaded_at: Some(1_700_000_000_000i64), last_saved_at: Some(1_700_000_000_001i64), external_actor: None, + last_write_intent_id: Some("intent:editor:abc".into()), + last_save_operation_id: Some("save:op:abc".into()), }; let value = serde_json::to_value(&buf).expect("DocumentBuffer 应可序列化"); assert_eq!(value["dirtyState"], json!("clean")); assert_eq!(value["fileVersion"], json!("v1")); + assert_eq!(value["lastWriteIntentId"], json!("intent:editor:abc")); + assert_eq!(value["lastSaveOperationId"], json!("save:op:abc")); assert_eq!(value["workspacePath"]["relativePath"], json!("doc.md")); let decoded: DocumentBuffer = @@ -1046,6 +1082,8 @@ mod tests { last_loaded_at: None, last_saved_at: None, external_actor: None, + last_write_intent_id: None, + last_save_operation_id: None, }; assert!(!buf.is_dirty()); diff --git a/rust/crates/mnote-cli/Cargo.toml b/rust/crates/mnote-cli/Cargo.toml index 97b7aafd..ca14b845 100644 --- a/rust/crates/mnote-cli/Cargo.toml +++ b/rust/crates/mnote-cli/Cargo.toml @@ -6,12 +6,9 @@ license.workspace = true authors.workspace = true [dependencies] -base64 = "0.22" bridge-runtime = { path = "../bridge-runtime" } clap = { version = "4.5.38", features = ["derive"] } core-protocol = { path = "../core-protocol" } mnote-editor-core = { path = "../mnote-editor-core" } -reqwest = { version = "0.12", default-features = false, features = ["blocking", "json", "rustls-tls"] } serde = { version = "1", features = ["derive"] } serde_json = "1" -storage-convex-bridge = { path = "../storage-convex-bridge" } diff --git a/rust/crates/mnote-cli/README.md b/rust/crates/mnote-cli/README.md index 5c442b07..3d003f32 100644 --- a/rust/crates/mnote-cli/README.md +++ b/rust/crates/mnote-cli/README.md @@ -2,8 +2,8 @@ 当前 crate 是 Phase 2 的最小 CLI 协议入口。 -注意：当前 `page` / `block` / `tool run doc_*` 执行面仍是 Convex -`documents.*` 兼容路径，只适合调试、迁移验证和 cloud workspace 兼容场景。 +注意：旧 `page` / `block` / `tool run doc_*` 执行面曾连接 Convex +`documents.*` 兼容路径；该执行链已退役，只保留 JSON 计划输出和历史迁移对照。 local-first 普通 Markdown 正文主链应优先走本地文件引用、Page Aggregate、 Rust Web local_folder source 和 agent 原生 patch/diff，不应把本 CLI 视为正文真源入口。 diff --git a/rust/crates/mnote-cli/src/lib.rs b/rust/crates/mnote-cli/src/lib.rs index caaec94e..28bf1fe0 100644 --- a/rust/crates/mnote-cli/src/lib.rs +++ b/rust/crates/mnote-cli/src/lib.rs @@ -1,7 +1,7 @@ -use base64::Engine; use bridge_runtime::{ - execute_runtime_query, RuntimeActorWire, RuntimeBridgeContextWire, RuntimeInput, - RuntimeQueryEnvelopeWire, RuntimeSourceWire, RuntimeTargetWire, RuntimeToolInvocationWire, + build_query_request, build_write_request, execute_runtime_query, BridgeContext, BridgeError, + RuntimeActorWire, RuntimeBridgeContextWire, RuntimeInput, RuntimeSourceWire, RuntimeTargetWire, + RuntimeToolInvocationWire, }; use clap::ValueEnum; use core_protocol::{ @@ -16,11 +16,8 @@ use mnote_editor_core::{ EditorAiScenario, EditorCommand, EditorInputKind, EditorPipelineRequest, EditorSession, VisibilitySnapshot, }; -use reqwest::blocking::Client; use serde::Serialize; use serde_json::{json, Value}; -use std::env; -use storage_convex_bridge::{build_query_request, build_write_request, BridgeContext}; #[derive(Debug, Clone, PartialEq, Eq)] pub struct CliContext { @@ -1554,7 +1551,7 @@ fn execute_query( "documents.content.get" | "documents.meta.get" | "mindmaps.get" - | "sidebar.dataset.list" => execute_convex_query(transport, cli_ctx), + | "sidebar.dataset.list" => execute_retired_cloud_transport(name), "search.documents" => execute_search_documents(transport, context, cli_ctx), other => Err(CliError::validation(format!("暂不支持执行 query: {other}"))), } @@ -1574,7 +1571,7 @@ fn execute_command( | "documents.restore" | "documents.title.update" | "documents.save" - | "mindmaps.put" => execute_convex_mutation(transport, cli_ctx), + | "mindmaps.put" => execute_retired_cloud_transport(name), "insert_block" => execute_block_insert(normalized_input, context, cli_ctx), "blocks.patch" => execute_block_patch(normalized_input, transport, cli_ctx), "blocks.move" => execute_block_move(normalized_input, cli_ctx), @@ -1649,313 +1646,35 @@ fn merge_tool_args( } fn execute_search_documents( - transport: &CliTransportPlan, - context: &CliOutputContext, - cli_ctx: &CliContext, + _transport: &CliTransportPlan, + _context: &CliOutputContext, + _cli_ctx: &CliContext, ) -> CliResult { - let workspace_id = transport - .args_json - .get("workspaceId") - .and_then(Value::as_str) - .ok_or_else(|| CliError::validation("search documents 缺少 workspaceId"))?; - let documents = execute_convex_query_raw( - "documents:listSearchDataByWorkspace", - json!({ "workspaceId": workspace_id }), - cli_ctx, - )?; - let mindmaps = execute_convex_query_raw( - "mindmaps:listByWorkspace", - json!({ "workspaceId": workspace_id, "includeDeleted": false }), - cli_ctx, - ) - .unwrap_or_else(|_| Value::Array(vec![])); - let tables = execute_convex_query_raw( - "tables:listByWorkspaceForSearch", - json!({ - "userId": context.actor_id, - "workspaceId": workspace_id, - "includeArchived": false, - "limit": 3000, - }), - cli_ctx, - ) - .unwrap_or_else(|_| Value::Array(vec![])); - let table_rows = execute_convex_query_raw( - "tables:listRowsByWorkspaceForSearch", - json!({ - "userId": context.actor_id, - "workspaceId": workspace_id, - "limit": 8000, - }), - cli_ctx, - ) - .unwrap_or_else(|_| Value::Array(vec![])); - let assets = execute_convex_query_raw( - "mediaAssets:listSearchDataByWorkspace", - json!({ - "userId": context.actor_id, - "workspaceId": workspace_id, - "includeDeleted": false, - "limit": 5000, - }), - cli_ctx, - ) - .unwrap_or_else(|_| Value::Array(vec![])); - let dataset = json!({ - "documents": documents.as_array().cloned().unwrap_or_default().into_iter().map(|item| json!({ - "id": item.get("id").cloned().unwrap_or(Value::Null), - "workspaceId": item.get("workspace_id").cloned().unwrap_or(json!(workspace_id)), - "title": item.get("title").cloned().unwrap_or(Value::Null), - "rawText": item.get("raw_text").cloned().unwrap_or(Value::Null), - "createdAt": item.get("created_at").cloned().unwrap_or(Value::Null), - "updatedAt": item.get("updated_at").cloned().unwrap_or(Value::Null), - })).collect::>(), - "mindmaps": mindmaps.as_array().cloned().unwrap_or_default().into_iter().map(|item| json!({ - "documentId": item.get("document_id").cloned().unwrap_or(Value::Null), - "data": item.get("data").cloned().unwrap_or(Value::Null), - })).collect::>(), - "tables": tables.as_array().cloned().unwrap_or_default().into_iter().map(|item| json!({ - "id": item.get("id").cloned().unwrap_or(Value::Null), - "documentId": item.get("document_id").cloned().unwrap_or(Value::Null), - "title": item.get("title").cloned().unwrap_or(Value::Null), - })).collect::>(), - "tableRows": table_rows.as_array().cloned().unwrap_or_default().into_iter().map(|item| json!({ - "tableId": item.get("table_id").cloned().unwrap_or(Value::Null), - "documentId": item.get("document_id").cloned().unwrap_or(Value::Null), - "rowHash": item.get("row_hash").cloned().unwrap_or(Value::Null), - })).collect::>(), - "assets": assets.as_array().cloned().unwrap_or_default().into_iter().map(|item| json!({ - "id": item.get("id").cloned().unwrap_or(Value::Null), - "documentId": item.get("document_id").cloned().unwrap_or(Value::Null), - "assetType": item.get("asset_type").cloned().unwrap_or(Value::Null), - "fileName": item.get("file_name").cloned().unwrap_or(Value::Null), - "mimeType": item.get("mime_type").cloned().unwrap_or(Value::Null), - "ocrText": item.get("ocr_text").cloned().unwrap_or(Value::Null), - "ocrStatus": item.get("ocr_status").cloned().unwrap_or(Value::Null), - })).collect::>(), - }); - execute_runtime_query(RuntimeInput::Query { - context: build_runtime_context(context, cli_ctx), - query: RuntimeQueryEnvelopeWire { - name: "search.documents".into(), - payload: transport.args_json.clone(), - }, - data: Some(dataset), - }) - .map_err(|error| CliError::transport(error.message)) + execute_retired_cloud_transport("search.documents") } fn execute_block_insert( - normalized_input: &Value, - context: &CliOutputContext, - cli_ctx: &CliContext, + _normalized_input: &Value, + _context: &CliOutputContext, + _cli_ctx: &CliContext, ) -> CliResult { - let page_id = required_str(normalized_input, "pageId")?; - let workspace_id = required_str(normalized_input, "workspaceId")?; - let content = required_str(normalized_input, "content")?; - let block_type = normalized_input - .get("blockType") - .and_then(Value::as_str) - .unwrap_or("paragraph"); - let before_block_id = None::; - let after_block_id = normalized_input - .get("prevBlockId") - .and_then(Value::as_str) - .map(str::to_string); - let data = execute_convex_query_raw("documents:getContent", json!({ "id": page_id }), cli_ctx)?; - let block_specs = json!([{ - "type": block_type, - "text": content, - }]); - let runtime_result = execute_runtime_query(RuntimeInput::Tool { - context: build_runtime_context(context, cli_ctx), - tool: RuntimeToolInvocationWire { - tool: "doc_insert_blocks".into(), - kind: "command".into(), - mode: Some("result".into()), - args_json: json!({ - "pageId": page_id, - "workspaceId": workspace_id, - "afterBlockId": after_block_id, - "beforeBlockId": before_block_id, - "blocks": block_specs, - }), - target: Some(RuntimeTargetWire { - workspace_id: Some(workspace_id.to_string()), - page_id: Some(page_id.to_string()), - block_id: None, - }), - reason: cli_ctx.reason.clone(), - refs: vec!["mnote-cli-execute".into()], - }, - data: Some(data.clone()), - }) - .map_err(|error| CliError::transport(error.message))?; - let next_content = write_blocks_back( - &data, - runtime_result - .get("data") - .cloned() - .unwrap_or(Value::Array(vec![])), - ); - let save_result = execute_convex_mutation_raw( - "documents:updateContent", - json!({ - "id": page_id, - "content": next_content, - "expectedRevision": data.get("revision").cloned().unwrap_or(Value::Null), - "conflictDetectionKey": data.get("conflict_detection_key").cloned().unwrap_or(Value::Null), - }), - cli_ctx, - )?; - Ok(json!({ - "ok": true, - "pageId": page_id, - "inserted": runtime_result.get("inserted").cloned().unwrap_or(Value::Array(vec![])), - "revision": save_result.get("revision").cloned().unwrap_or(Value::Null), - "conflictDetectionKey": save_result.get("conflict_detection_key").cloned().unwrap_or(Value::Null), - "data": runtime_result.get("data").cloned().unwrap_or(Value::Null), - })) + execute_retired_cloud_transport("insert_block") } fn execute_block_patch( - normalized_input: &Value, - transport: &CliTransportPlan, - cli_ctx: &CliContext, + _normalized_input: &Value, + _transport: &CliTransportPlan, + _cli_ctx: &CliContext, ) -> CliResult { - let page_id = required_str(normalized_input, "pageId")?; - let block_id = required_str(normalized_input, "blockId")?; - let snapshot = normalized_input - .get("snapshot") - .cloned() - .ok_or_else(|| CliError::validation("block patch 缺少 snapshot"))?; - let current = - execute_convex_query_raw("documents:getContent", json!({ "id": page_id }), cli_ctx)?; - let next_blocks = replace_block_subtree(extract_blocks(¤t), block_id, &snapshot)?; - let args = json!({ - "id": page_id, - "content": write_blocks_back(¤t, Value::Array(next_blocks)), - "expectedRevision": transport.args_json.get("expectedRevision").cloned().unwrap_or(Value::Null), - "conflictDetectionKey": transport.args_json.get("conflictDetectionKey").cloned().unwrap_or(Value::Null), - }); - execute_convex_mutation_raw("documents:updateContent", args, cli_ctx) + execute_retired_cloud_transport("blocks.patch") } -fn execute_block_move(normalized_input: &Value, cli_ctx: &CliContext) -> CliResult { - let source_document_id = required_str(normalized_input, "sourceDocumentId")?; - let target_document_id = required_str(normalized_input, "targetDocumentId")?; - let block_id = required_str(normalized_input, "blockId")?; - - let source = execute_convex_query_raw( - "documents:getContent", - json!({ "id": source_document_id }), - cli_ctx, - )?; - let target = execute_convex_query_raw( - "documents:getContent", - json!({ "id": target_document_id }), - cli_ctx, - )?; - let source_blocks = extract_blocks(&source); - let target_blocks = extract_blocks(&target); - let (removed, next_source_blocks) = remove_block_subtree(source_blocks, block_id)?; - let mut next_target_blocks = target_blocks; - next_target_blocks.push(removed); - let next_source_content = write_blocks_back(&source, Value::Array(next_source_blocks)); - let next_target_content = write_blocks_back(&target, Value::Array(next_target_blocks)); - let source_save = execute_convex_mutation_raw( - "documents:updateContent", - json!({ - "id": source_document_id, - "content": next_source_content, - "expectedRevision": source.get("revision").cloned().unwrap_or(Value::Null), - "conflictDetectionKey": source.get("conflict_detection_key").cloned().unwrap_or(Value::Null), - }), - cli_ctx, - )?; - let target_save = execute_convex_mutation_raw( - "documents:updateContent", - json!({ - "id": target_document_id, - "content": next_target_content, - "expectedRevision": target.get("revision").cloned().unwrap_or(Value::Null), - "conflictDetectionKey": target.get("conflict_detection_key").cloned().unwrap_or(Value::Null), - }), - cli_ctx, - )?; - Ok(json!({ - "ok": true, - "sourceRevision": source_save.get("revision").cloned().unwrap_or(Value::Null), - "targetRevision": target_save.get("revision").cloned().unwrap_or(Value::Null), - })) +fn execute_block_move(_normalized_input: &Value, _cli_ctx: &CliContext) -> CliResult { + execute_retired_cloud_transport("blocks.move") } -fn execute_block_embed(normalized_input: &Value, cli_ctx: &CliContext) -> CliResult { - let source_document_id = required_str(normalized_input, "sourceDocumentId")?; - let target_document_id = required_str(normalized_input, "targetDocumentId")?; - let block_id = required_str(normalized_input, "blockId")?; - let target_block_id = normalized_input - .get("targetBlockId") - .and_then(Value::as_str); - - let source_meta = execute_convex_query_raw( - "documents:getMeta", - json!({ "id": source_document_id }), - cli_ctx, - )?; - let target_content = execute_convex_query_raw( - "documents:getContent", - json!({ "id": target_document_id }), - cli_ctx, - )?; - let target_meta = execute_convex_query_raw( - "documents:getMeta", - json!({ "id": target_document_id }), - cli_ctx, - )?; - let mut target_blocks = extract_blocks(&target_content); - let reference_block = json!({ - "id": format!("cli_embed_{}_{}", target_document_id, block_id), - "type": "blockReference", - "props": { - "sourceDocumentId": source_document_id, - "targetBlockId": block_id, - "display": "embed", - }, - "content": [], - "children": [], - }); - let anchor_id = target_block_id.map(str::to_string).or_else(|| { - target_meta - .get("embed_default_block_id") - .and_then(Value::as_str) - .map(str::to_string) - }); - if let Some(anchor_id) = anchor_id { - if let Some(index) = find_block_index(&target_blocks, &anchor_id) { - target_blocks.insert(index + 1, reference_block.clone()); - } else { - target_blocks.push(reference_block.clone()); - } - } else { - target_blocks.push(reference_block.clone()); - } - let saved = execute_convex_mutation_raw( - "documents:updateContent", - json!({ - "id": target_document_id, - "content": write_blocks_back(&target_content, Value::Array(target_blocks)), - "expectedRevision": target_content.get("revision").cloned().unwrap_or(Value::Null), - "conflictDetectionKey": target_content.get("conflict_detection_key").cloned().unwrap_or(Value::Null), - }), - cli_ctx, - )?; - Ok(json!({ - "ok": true, - "sourceTitle": source_meta.get("title").cloned().unwrap_or(Value::Null), - "referenceBlockId": reference_block.get("id").cloned().unwrap_or(Value::Null), - "revision": saved.get("revision").cloned().unwrap_or(Value::Null), - })) +fn execute_block_embed(_normalized_input: &Value, _cli_ctx: &CliContext) -> CliResult { + execute_retired_cloud_transport("blocks.embed") } fn build_tool_target( @@ -2007,7 +1726,7 @@ fn load_tool_data( tool_name: &str, args: &Value, target: Option<&RuntimeTargetWire>, - cli_ctx: &CliContext, + _cli_ctx: &CliContext, ) -> CliResult { match tool_name { "search_web" | "slash_run" | "event_replay" | "index_rebuild" => { @@ -2015,112 +1734,24 @@ fn load_tool_data( } "image_read" => Ok(json!({ "source": "cli", "asset": Value::Null })), "doc_get" | "doc_find" | "doc_insert_blocks" | "doc_replace_range" => { - let page_id = read_doc_target(args, target)?; - let result = execute_convex_query_raw( - "documents:getContent", - json!({ "id": page_id }), - cli_ctx, - )?; - Ok( - json!({ "source": "convex", "content": result.get("content").cloned().unwrap_or(Value::Null) }), - ) + let _ = read_doc_target(args, target)?; + Err(retired_cloud_transport_error(tool_name)) } "docs_read" => { let document_id = args .get("documentId") .and_then(Value::as_str) .ok_or_else(|| CliError::validation("docs_read 缺少 documentId"))?; - let meta = execute_convex_query_raw( - "documents:getMeta", - json!({ "id": document_id }), - cli_ctx, - )?; - let content = execute_convex_query_raw( - "documents:getContent", - json!({ "id": document_id }), - cli_ctx, - )?; - Ok(json!({ - "source": "convex", - "documentId": document_id, - "title": meta.get("title").cloned().unwrap_or(Value::Null), - "workspaceId": meta.get("workspace_id").cloned().unwrap_or(Value::Null), - "parentId": meta.get("parent_id").cloned().unwrap_or(Value::Null), - "updatedAt": meta.get("updated_at").cloned().unwrap_or(Value::Null), - "rawText": extract_raw_text(&content), - "rawTextLength": extract_raw_text(&content).chars().count(), - "content": content.get("content").cloned().unwrap_or(Value::Null), - })) + let _ = document_id; + Err(retired_cloud_transport_error(tool_name)) } "docs_search" => { let workspace_id = args .get("workspaceId") .and_then(Value::as_str) .ok_or_else(|| CliError::validation("docs_search 缺少 workspaceId"))?; - let documents = execute_convex_query_raw( - "documents:listSearchDataByWorkspace", - json!({ "workspaceId": workspace_id }), - cli_ctx, - )?; - let mindmaps = execute_convex_query_raw( - "mindmaps:listByWorkspace", - json!({ "workspaceId": workspace_id, "includeDeleted": false }), - cli_ctx, - ) - .unwrap_or_else(|_| Value::Array(vec![])); - let tables = execute_convex_query_raw( - "tables:listByWorkspaceForSearch", - json!({ "userId": cli_ctx.actor_id, "workspaceId": workspace_id, "includeArchived": false, "limit": 3000 }), - cli_ctx, - ).unwrap_or_else(|_| Value::Array(vec![])); - let table_rows = execute_convex_query_raw( - "tables:listRowsByWorkspaceForSearch", - json!({ "userId": cli_ctx.actor_id, "workspaceId": workspace_id, "limit": 8000 }), - cli_ctx, - ) - .unwrap_or_else(|_| Value::Array(vec![])); - let assets = execute_convex_query_raw( - "mediaAssets:listSearchDataByWorkspace", - json!({ "userId": cli_ctx.actor_id, "workspaceId": workspace_id, "includeDeleted": false, "limit": 5000 }), - cli_ctx, - ).unwrap_or_else(|_| Value::Array(vec![])); - Ok(json!({ - "source": "convex", - "datasets": [{ - "workspaceId": workspace_id, - "documents": documents.as_array().cloned().unwrap_or_default().into_iter().map(|item| json!({ - "id": item.get("id").cloned().unwrap_or(Value::Null), - "workspaceId": item.get("workspace_id").cloned().unwrap_or(json!(workspace_id)), - "title": item.get("title").cloned().unwrap_or(Value::Null), - "rawText": item.get("raw_text").cloned().unwrap_or(Value::Null), - "createdAt": item.get("created_at").cloned().unwrap_or(Value::Null), - "updatedAt": item.get("updated_at").cloned().unwrap_or(Value::Null) - })).collect::>(), - "mindmaps": mindmaps.as_array().cloned().unwrap_or_default().into_iter().map(|item| json!({ - "documentId": item.get("document_id").cloned().unwrap_or(Value::Null), - "data": item.get("data").cloned().unwrap_or(Value::Null) - })).collect::>(), - "tables": tables.as_array().cloned().unwrap_or_default().into_iter().map(|item| json!({ - "id": item.get("id").cloned().unwrap_or(Value::Null), - "documentId": item.get("document_id").cloned().unwrap_or(Value::Null), - "title": item.get("title").cloned().unwrap_or(Value::Null) - })).collect::>(), - "tableRows": table_rows.as_array().cloned().unwrap_or_default().into_iter().map(|item| json!({ - "tableId": item.get("table_id").cloned().unwrap_or(Value::Null), - "documentId": item.get("document_id").cloned().unwrap_or(Value::Null), - "rowHash": item.get("row_hash").cloned().unwrap_or(Value::Null) - })).collect::>(), - "assets": assets.as_array().cloned().unwrap_or_default().into_iter().map(|item| json!({ - "id": item.get("id").cloned().unwrap_or(Value::Null), - "documentId": item.get("document_id").cloned().unwrap_or(Value::Null), - "assetType": item.get("asset_type").cloned().unwrap_or(Value::Null), - "fileName": item.get("file_name").cloned().unwrap_or(Value::Null), - "mimeType": item.get("mime_type").cloned().unwrap_or(Value::Null), - "ocrText": item.get("ocr_text").cloned().unwrap_or(Value::Null), - "ocrStatus": item.get("ocr_status").cloned().unwrap_or(Value::Null) - })).collect::>() - }] - })) + let _ = workspace_id; + Err(retired_cloud_transport_error(tool_name)) } "mindmap_get" | "mindmap_get_subtree" | "mindmap_apply_ops" | "mindmap_put" => { let document_id = read_doc_target(args, target)?; @@ -2129,14 +1760,8 @@ fn load_tool_data( .and_then(Value::as_str) .or_else(|| target.and_then(|value| value.block_id.as_deref())) .ok_or_else(|| CliError::validation("mindmap 工具缺少 mindmapId"))?; - let result = execute_convex_query_raw( - "mindmaps:get", - json!({ "docId": document_id, "mindmapId": mindmap_id }), - cli_ctx, - )?; - Ok( - json!({ "source": "convex", "data": result.get("data").cloned().unwrap_or(Value::Null), "meta": result.get("meta").cloned().unwrap_or(Value::Null) }), - ) + let _ = (document_id, mindmap_id); + Err(retired_cloud_transport_error(tool_name)) } other => Err(CliError::validation(format!( "暂不支持 tool 数据加载: {other}" @@ -2144,183 +1769,14 @@ fn load_tool_data( } } -fn execute_convex_query(transport: &CliTransportPlan, cli_ctx: &CliContext) -> CliResult { - execute_convex_query_raw( - &transport.function_name, - transport.args_json.clone(), - cli_ctx, - ) +fn execute_retired_cloud_transport(operation: &str) -> CliResult { + Err(retired_cloud_transport_error(operation)) } -fn execute_convex_mutation(transport: &CliTransportPlan, cli_ctx: &CliContext) -> CliResult { - execute_convex_mutation_raw( - &transport.function_name, - transport.args_json.clone(), - cli_ctx, - ) -} - -fn execute_convex_query_raw( - function_name: &str, - args_json: Value, - cli_ctx: &CliContext, -) -> CliResult { - let env = ConvexCliEnv::load(cli_ctx)?; - let payload = json!({ - "path": function_name, - "format": "convex_encoded_json", - "args": args_json, - }); - let response = env - .client - .post(format!("{}/api/query", env.url)) - .header("Authorization", env.authorization) - .header("Content-Type", "application/json") - .header("Convex-Client", "mnote-cli") - .json(&payload) - .send() - .map_err(|error| CliError::transport(format!("Convex query 请求失败: {error}")))?; - parse_convex_response(response, cli_ctx) -} - -fn execute_convex_mutation_raw( - function_name: &str, - args_json: Value, - cli_ctx: &CliContext, -) -> CliResult { - let env = ConvexCliEnv::load(cli_ctx)?; - let payload = json!({ - "path": function_name, - "format": "convex_encoded_json", - "args": [args_json], - }); - let response = env - .client - .post(format!("{}/api/mutation", env.url)) - .header("Authorization", env.authorization) - .header("Content-Type", "application/json") - .header("Convex-Client", "mnote-cli") - .json(&payload) - .send() - .map_err(|error| CliError::transport(format!("Convex mutation 请求失败: {error}")))?; - parse_convex_response(response, cli_ctx) -} - -fn parse_convex_response( - response: reqwest::blocking::Response, - _cli_ctx: &CliContext, -) -> CliResult { - let status = response.status(); - let body: Value = response - .json() - .map_err(|error| CliError::transport(format!("Convex 响应解析失败: {error}")))?; - if !status.is_success() { - let message = body - .get("errorMessage") - .and_then(Value::as_str) - .map(str::to_string) - .unwrap_or_else(|| format!("HTTP {}", status.as_u16())); - return Err(CliError::transport(message)); - } - match body.get("status").and_then(Value::as_str) { - Some("success") => Ok(body.get("value").cloned().unwrap_or(Value::Null)), - Some("error") => Err(CliError::transport( - body.get("errorMessage") - .and_then(Value::as_str) - .unwrap_or("Convex 返回 error") - .to_string(), - )), - _ => Err(CliError::transport(format!("未知 Convex 响应: {body}"))), - } -} - -#[derive(Debug, Clone)] -struct ConvexCliEnv { - url: String, - authorization: String, - client: Client, -} - -impl ConvexCliEnv { - fn load(cli_ctx: &CliContext) -> CliResult { - let url = read_env_or_dotenv("CONVEX_SELF_HOSTED_URL")? - .or_else(|| env::var("NEXT_PUBLIC_CONVEX_URL").ok()) - .ok_or_else(|| { - CliError::validation("缺少 CONVEX_SELF_HOSTED_URL / NEXT_PUBLIC_CONVEX_URL") - })?; - let admin_key = read_env_or_dotenv("CONVEX_SELF_HOSTED_ADMIN_KEY")? - .ok_or_else(|| CliError::validation("缺少 CONVEX_SELF_HOSTED_ADMIN_KEY"))?; - let dev_user_id = normalize_actor_for_convex_identity(&cli_ctx.actor_id) - .or(read_env_or_dotenv("DEV_USER_ID")?) - .unwrap_or_else(|| "dev-user".into()); - let dev_user_name = - read_env_or_dotenv("DEV_USER_NAME")?.unwrap_or_else(|| "开发用户".into()); - let dev_user_email = - read_env_or_dotenv("DEV_USER_EMAIL")?.unwrap_or_else(|| "dev@mnote.local".into()); - let identity = build_convex_dev_identity(&dev_user_id, &dev_user_name, &dev_user_email); - let encoded = base64::engine::general_purpose::STANDARD - .encode(serde_json::to_string(&identity).map_err(|error| { - CliError::transport(format!("开发用户身份序列化失败: {error}")) - })?); - let authorization = format!("Convex {admin_key}:{encoded}"); - let client = Client::builder() - .timeout(std::time::Duration::from_secs(30)) - .build() - .map_err(|error| CliError::transport(format!("HTTP 客户端创建失败: {error}")))?; - Ok(Self { - url: url.trim().trim_end_matches('/').to_string(), - authorization, - client, - }) - } -} - -fn normalize_actor_for_convex_identity(actor_id: &str) -> Option { - let trimmed = actor_id.trim(); - if trimmed.is_empty() || trimmed == "anonymous" || trimmed == "cli_user" { - None - } else { - Some(trimmed.to_string()) - } -} - -fn build_convex_dev_identity(user_id: &str, name: &str, email: &str) -> Value { - json!({ - "subject": user_id, - "issuer": "https://mnote.local/dev-auth", - "tokenIdentifier": format!("dev-user|{}", user_id), - "name": name, - "email": email, - }) -} - -fn read_env_or_dotenv(key: &str) -> CliResult> { - if let Ok(value) = env::var(key) { - let trimmed = value.trim().to_string(); - if !trimmed.is_empty() { - return Ok(Some(trimmed)); - } - } - let root = std::path::Path::new(env!("CARGO_MANIFEST_DIR")) - .join("../../..") - .join(".env.all"); - let content = std::fs::read_to_string(&root) - .map_err(|error| CliError::transport(format!("读取 .env.all 失败: {error}")))?; - for line in content.lines() { - let line = line.trim_end_matches('\r'); - if line.starts_with('#') || line.trim().is_empty() { - continue; - } - if let Some((k, v)) = line.split_once('=') { - if k.trim() == key { - let trimmed = v.trim().trim_matches('"').to_string(); - if !trimmed.is_empty() { - return Ok(Some(trimmed)); - } - } - } - } - Ok(None) +fn retired_cloud_transport_error(operation: &str) -> CliError { + CliError::validation(format!( + "旧 Convex CLI 执行链已退役: {operation}；请改用 local-first Rust/SQLite control-plane 路径" + )) } fn build_runtime_context( @@ -2341,6 +1797,10 @@ fn build_runtime_context( source: RuntimeSourceWire { channel: "cli".into(), client: "mnote-cli".into(), + source_kind: None, + root_uri: None, + workspace_id: None, + capabilities: Vec::new(), }, tenant_id: None, auth_token: None, @@ -2350,125 +1810,6 @@ fn build_runtime_context( } } -fn extract_blocks(content_result: &Value) -> Vec { - if let Some(content) = content_result.get("content") { - if let Some(array) = content.as_array() { - return array.clone(); - } - if let Some(array) = content.get("blocks").and_then(Value::as_array) { - return array.clone(); - } - } - vec![] -} - -fn write_blocks_back(content_result: &Value, blocks: Value) -> Value { - let current = content_result - .get("content") - .cloned() - .unwrap_or(Value::Null); - if current.is_array() { - return blocks; - } - if let Some(obj) = current.as_object() { - let mut next = obj.clone(); - next.insert("blocks".into(), blocks); - return Value::Object(next); - } - json!({ "blocks": blocks }) -} - -fn find_block_index(blocks: &[Value], target_id: &str) -> Option { - blocks.iter().position(|block| { - block - .get("id") - .and_then(Value::as_str) - .map(|value| value == target_id) - .unwrap_or(false) - }) -} - -fn remove_block_subtree(mut blocks: Vec, block_id: &str) -> CliResult<(Value, Vec)> { - if let Some(index) = blocks - .iter() - .position(|block| block.get("id").and_then(Value::as_str) == Some(block_id)) - { - let removed = blocks.remove(index); - return Ok((removed, blocks)); - } - for block in &mut blocks { - if let Some(children) = block.get_mut("children").and_then(Value::as_array_mut) { - let (removed, next_children) = remove_block_subtree(children.clone(), block_id)?; - *children = next_children; - return Ok((removed, blocks)); - } - } - Err(CliError::validation(format!("未找到 blockId：{block_id}"))) -} - -fn replace_block_subtree( - mut blocks: Vec, - block_id: &str, - next_block: &Value, -) -> CliResult> { - let mut normalized = next_block - .as_object() - .cloned() - .ok_or_else(|| CliError::validation("block patch snapshot 必须是对象"))?; - normalized.insert("id".into(), Value::String(block_id.to_string())); - let next_value = Value::Object(normalized); - - if let Some(index) = blocks - .iter() - .position(|block| block.get("id").and_then(Value::as_str) == Some(block_id)) - { - blocks[index] = next_value; - return Ok(blocks); - } - for block in &mut blocks { - if let Some(children) = block.get_mut("children").and_then(Value::as_array_mut) { - let next_children = replace_block_subtree(children.clone(), block_id, &next_value)?; - *children = next_children; - return Ok(blocks); - } - } - Err(CliError::validation(format!("未找到 blockId：{block_id}"))) -} - -fn extract_raw_text(content_result: &Value) -> String { - fn walk(value: &Value, parts: &mut Vec) { - match value { - Value::Array(items) => { - for item in items { - walk(item, parts); - } - } - Value::Object(map) => { - if let Some(text) = map.get("text").and_then(Value::as_str) { - if !text.trim().is_empty() { - parts.push(text.to_string()); - } - } - if let Some(content) = map.get("content") { - walk(content, parts); - } - if let Some(children) = map.get("children") { - walk(children, parts); - } - if let Some(blocks) = map.get("blocks") { - walk(blocks, parts); - } - } - _ => {} - } - } - let mut parts = Vec::new(); - if let Some(content) = content_result.get("content") { - walk(content, &mut parts); - } - parts.join("\n") -} - fn read_doc_target(args: &Value, target: Option<&RuntimeTargetWire>) -> CliResult { args.get("documentId") .and_then(Value::as_str) @@ -2478,13 +1819,6 @@ fn read_doc_target(args: &Value, target: Option<&RuntimeTargetWire>) -> CliResul .ok_or_else(|| CliError::validation("缺少 documentId/pageId")) } -fn required_str<'a>(value: &'a Value, key: &str) -> CliResult<&'a str> { - value - .get(key) - .and_then(Value::as_str) - .ok_or_else(|| CliError::validation(format!("缺少 {key}"))) -} - fn build_query_output( domain: &str, action: &str, @@ -2625,7 +1959,7 @@ fn invocation_kind_label(kind: &InvocationKind) -> &'static str { } } -fn map_bridge_error(error: storage_convex_bridge::BridgeError) -> CliError { +fn map_bridge_error(error: BridgeError) -> CliError { CliError::validation(error.message) } @@ -2842,32 +2176,6 @@ mod tests { } } - #[test] - fn convex_dev_identity_prefers_explicit_cli_actor() { - let ctx = CliContext { - actor_id: "nn7bhmt782sykdrecah0rbe2nx867ks1".into(), - ..CliContext::default() - }; - let user_id = normalize_actor_for_convex_identity(&ctx.actor_id) - .expect("显式 CLI actor 应成为 Convex 写入身份"); - let identity = build_convex_dev_identity(&user_id, "开发用户", "dev@mnote.local"); - - assert_eq!( - identity["subject"], - json!("nn7bhmt782sykdrecah0rbe2nx867ks1") - ); - assert_eq!( - identity["tokenIdentifier"], - json!("dev-user|nn7bhmt782sykdrecah0rbe2nx867ks1") - ); - } - - #[test] - fn convex_dev_identity_ignores_legacy_default_cli_actor() { - assert_eq!(normalize_actor_for_convex_identity("cli_user"), None); - assert_eq!(normalize_actor_for_convex_identity(" anonymous "), None); - } - #[test] fn page_move_json_contract_uses_documents_move() { let output = plan_page_move( @@ -3033,55 +2341,4 @@ mod tests { _ => panic!("expected command output"), } } - - #[test] - fn replace_block_subtree_preserves_other_blocks() { - let next_blocks = replace_block_subtree( - vec![ - json!({ - "id": "block_1", - "type": "paragraph", - "content": [{"type": "text", "text": "old"}], - "children": [], - }), - json!({ - "id": "block_2", - "type": "paragraph", - "content": [{"type": "text", "text": "keep"}], - "children": [], - }), - ], - "block_1", - &json!({ - "type": "paragraph", - "content": [{"type": "text", "text": "new"}], - "children": [], - }), - ) - .expect("block replacement should succeed"); - - assert_eq!( - next_blocks, - vec![ - json!({ - "id": "block_1", - "type": "paragraph", - "content": [{"type": "text", "text": "new"}], - "children": [], - }), - json!({ - "id": "block_2", - "type": "paragraph", - "content": [{"type": "text", "text": "keep"}], - "children": [], - }), - ] - ); - } - - #[test] - fn read_env_or_dotenv_trims_crlf_values() { - let got = read_env_or_dotenv("CONVEX_SELF_HOSTED_URL").expect("read env should work"); - assert_eq!(got.as_deref(), Some("http://127.0.0.1:3210")); - } } diff --git a/rust/crates/mnote-web/Cargo.toml b/rust/crates/mnote-web/Cargo.toml index 5b8dab8d..61e95e88 100644 --- a/rust/crates/mnote-web/Cargo.toml +++ b/rust/crates/mnote-web/Cargo.toml @@ -19,7 +19,6 @@ mnote-editor-core = { path = "../mnote-editor-core" } reqwest = { version = "0.12", default-features = false, features = ["blocking", "json", "rustls-tls", "stream"] } serde = { version = "1", features = ["derive"] } serde_json = "1" -storage-convex-bridge = { path = "../storage-convex-bridge" } tokio = { version = "1", features = ["macros", "rt-multi-thread", "net", "signal", "sync", "time", "process", "io-util"] } tokio-stream = { version = "0.1", features = ["sync"] } tokio-tungstenite = "0.29" diff --git a/rust/crates/mnote-web/browser/document-editor-adapter-runtime.js b/rust/crates/mnote-web/browser/document-editor-adapter-runtime.js index bf5e0e6f..dc8fdd65 100644 --- a/rust/crates/mnote-web/browser/document-editor-adapter-runtime.js +++ b/rust/crates/mnote-web/browser/document-editor-adapter-runtime.js @@ -141,7 +141,7 @@ import { }; const pageAggregateUrlFromDescriptor = (descriptor) => { const url = new URL(`/api/page-aggregate/${encodeURIComponent(descriptor.documentId)}`, window.location.origin); - url.searchParams.set('sourceKind', descriptor.sourceKind || 'convex_workspace'); + url.searchParams.set('sourceKind', descriptor.sourceKind || 'local_folder'); if (descriptor.workspaceId) url.searchParams.set('workspaceId', descriptor.workspaceId); if (descriptor.rootUri) url.searchParams.set('rootUri', descriptor.rootUri); return url; @@ -151,10 +151,10 @@ import { documentId: aggregate?.identity?.documentId || aggregate?.identity?.document_id || descriptor.documentId, workspaceId: aggregate?.identity?.workspaceId || aggregate?.identity?.workspace_id || descriptor.workspaceId || '', paneRole, - sourceKind: descriptor.sourceKind || 'convex_workspace', + sourceKind: descriptor.sourceKind || 'local_folder', rootUri: descriptor.rootUri || '', pageAggregateScriptId: paneRole === 'secondary' ? '__MNOTE_SECONDARY_PAGE_AGGREGATE__' : '__MNOTE_PAGE_AGGREGATE__', - saveEndpoint: (descriptor.sourceKind || 'convex_workspace') === 'local_folder' + saveEndpoint: (descriptor.sourceKind || 'local_folder') === 'local_folder' ? '/api/page-body/write' : '/api/documents/save', titleEndpoint: '/api/documents/title', @@ -225,6 +225,48 @@ import { if (pageTab instanceof HTMLElement) return String(pageTab.getAttribute('data-document-id') || '').trim(); return ''; }; + const currentWebShellSourceKind = () => { + try { + return currentUrl().searchParams.get('sourceKind') || ''; + } catch (_) { + return ''; + } + }; + const currentWebShellRootUri = () => { + try { + return currentUrl().searchParams.get('rootUri') || ''; + } catch (_) { + return ''; + } + }; + + const restoreResourceTabInputFromUrl = () => { + const url = currentUrl(); + const raw = String(url.searchParams.get('resourceTab') || '').trim(); + if (!raw) return null; + const objectIdentity = raw.includes('::') ? raw.slice(raw.indexOf('::') + 2) : raw; + if (!objectIdentity.startsWith('resource:file:')) return null; + const rootUri = currentWebShellRootUri(); + if (!rootUri) return null; + const rest = objectIdentity.slice('resource:file:'.length); + const prefix = `${rootUri}:`; + if (!rest.startsWith(prefix)) return null; + const path = rest.slice(prefix.length).replace(/^\/+/, ''); + if (!path) return null; + const title = path.split('/').filter(Boolean).pop() || path; + return { + objectIdentity, + documentId: currentWebShellDocumentId(), + workspaceId: currentWebShellWorkspaceId(), + sourceKind: currentWebShellSourceKind() || 'local_folder', + rootUri, + path, + assetId: `local:asset:${path}`, + title, + fileName: title, + openTarget: 'active-tab', + }; + }; let nextViewId = 1; const mindmapHost = createMindmapHostRuntime({ @@ -267,12 +309,18 @@ import { const markSessionExternalConflict = (...args) => documentSessions.markSessionExternalConflict(...args); const queueSessionSave = (...args) => documentSessions.queueSessionSave(...args); const refreshSessionFromExternalChange = (...args) => documentSessions.refreshSessionFromExternalChange(...args); + const ensureLocalFolderEventChannel = (...args) => documentSessions.ensureLocalFolderEventChannel(...args); const sessionMatchesDocumentWorkspace = (...args) => documentSessions.sessionMatchesDocumentWorkspace(...args); const getOrCreateDocumentSession = (...args) => documentSessions.getOrCreateDocumentSession(...args); const updatePaneChrome = (runtimeDescriptor) => { const pane = runtimeDescriptor.root.closest('[data-document-pane="true"]'); if (!(pane instanceof HTMLElement)) return; + if (runtimeDescriptor.paneRole === 'primary') { + document.querySelectorAll('[data-mnote-navigation-page-placeholder][data-pane-role="primary"]').forEach((node) => { + if (node instanceof HTMLElement) node.hidden = true; + }); + } const aggregate = runtimeDescriptor.aggregate || {}; const bootstrap = runtimeDescriptor.bootstrap || {}; const title = aggregate?.head?.title || '无标题'; @@ -366,9 +414,94 @@ import { return payload.result; }; + const ensureLazyPrimaryPaneRoot = () => { + let root = document.querySelector(`${ROOT_SELECTOR}[data-pane-role="primary"]`); + if (root instanceof HTMLElement) return root; + const pagePanel = document.querySelector('[data-mnote-page-tab-panel][data-pane-role="primary"]'); + if (!(pagePanel instanceof HTMLElement)) return null; + const pane = document.createElement('section'); + pane.className = 'document-pane'; + pane.setAttribute('data-document-pane', 'true'); + pane.setAttribute('data-pane-role', 'primary'); + pane.setAttribute('data-pane-document-id', ''); + pane.setAttribute('data-pane-workspace-id', currentWebShellWorkspaceId()); + pane.setAttribute('data-pane-visible', 'false'); + pane.hidden = true; + + const shell = document.createElement('main'); + shell.className = 'document-shell'; + shell.setAttribute('data-editor-host', 'leptos_tiptap_island'); + shell.setAttribute('data-document-id', ''); + shell.setAttribute('data-workspace-id', currentWebShellWorkspaceId()); + shell.setAttribute('data-pane-role', 'primary'); + shell.setAttribute('data-page-wide-layout', 'false'); + shell.setAttribute('data-page-small-text', 'false'); + shell.setAttribute('data-layout-density', 'normal'); + shell.setAttribute('data-page-font', 'default'); + shell.setAttribute('data-page-show-heading-numbers', 'false'); + + const header = document.createElement('header'); + header.className = 'document-shell-header'; + header.setAttribute('data-page-title-hidden', 'true'); + header.hidden = true; + const titleHeading = document.createElement('h1'); + titleHeading.className = 'document-title-heading'; + const titleInput = document.createElement('textarea'); + titleInput.id = 'mnote-page-title-input'; + titleInput.className = 'document-title-input'; + titleInput.setAttribute('aria-label', '页面标题'); + titleInput.setAttribute('data-page-title-input', 'true'); + titleInput.setAttribute('data-document-id', ''); + titleInput.setAttribute('data-workspace-id', currentWebShellWorkspaceId()); + titleInput.setAttribute('data-pane-role', 'primary'); + titleInput.setAttribute('data-title-endpoint', '/api/documents/title'); + titleInput.rows = 1; + titleHeading.appendChild(titleInput); + const meta = document.createElement('div'); + meta.className = 'document-shell-meta'; + meta.setAttribute('aria-label', '页面元信息'); + const currentTitle = document.createElement('span'); + currentTitle.setAttribute('data-page-title-current', 'true'); + meta.appendChild(currentTitle); + header.append(titleHeading, meta); + + const aggregateMarker = document.createElement('section'); + aggregateMarker.setAttribute('data-page-aggregate-snapshot', 'mnote.page_aggregate.v1'); + const subtree = document.createElement('section'); + subtree.setAttribute('data-testid', 'mnote-page-subtree'); + subtree.setAttribute('data-page-tree-source', 'page_aggregate.tree.pageSubtree'); + subtree.setAttribute('data-page-subtree-present', 'false'); + subtree.setAttribute('data-pane-role', 'primary'); + + const island = document.createElement('section'); + island.id = 'mnote-editor-island'; + island.setAttribute('data-editor-host', 'leptos_tiptap_island'); + island.setAttribute('data-pane-role', 'primary'); + root = document.createElement('div'); + root.id = 'mnote-leptos-tiptap-island-editor-root'; + root.setAttribute('data-testid', 'mnote-leptos-tiptap-island-editor-root'); + root.setAttribute('data-editor-host-kind', 'leptos_tiptap_island'); + root.setAttribute('data-runtime-editor-status', 'booting'); + root.setAttribute('data-pane-role', 'primary'); + const observability = document.createElement('div'); + observability.className = 'sr-only'; + observability.setAttribute('data-editor-host-observability', 'rust-web-inline-island'); + observability.setAttribute('data-editor-host-active', 'leptos_tiptap_island'); + observability.setAttribute('data-editor-host-requested', 'leptos_tiptap_island'); + observability.setAttribute('data-editor-host-status', 'booting'); + observability.setAttribute('data-pane-role', 'primary'); + island.append(root, observability); + shell.append(header, aggregateMarker, subtree, island); + pane.appendChild(shell); + pagePanel.appendChild(pane); + return root; + }; + const replacePaneDocument = async (paneRole, descriptor, options = {}) => { mindmapHost.unmountMindmapPane(paneRole); - const root = document.querySelector(`${ROOT_SELECTOR}[data-pane-role="${paneRole}"]`); + const root = paneRole === 'primary' + ? ensureLazyPrimaryPaneRoot() + : document.querySelector(`${ROOT_SELECTOR}[data-pane-role="${paneRole}"]`); const observability = document.querySelector(`[data-editor-host-observability][data-pane-role="${paneRole}"]`); if (!(root instanceof HTMLElement)) throw new Error(`pane_root_missing_${paneRole}`); const runtimePromise = loadRuntime(); @@ -428,14 +561,14 @@ import { return { documentId, workspaceId: explicit.workspaceId || url.searchParams.get('workspaceId') || '', - sourceKind: explicit.sourceKind || url.searchParams.get('secondarySourceKind') || url.searchParams.get('sourceKind') || 'convex_workspace', + sourceKind: explicit.sourceKind || url.searchParams.get('secondarySourceKind') || url.searchParams.get('sourceKind') || 'local_folder', rootUri: explicit.rootUri || url.searchParams.get('secondaryRootUri') || url.searchParams.get('rootUri') || '', }; } return { documentId, workspaceId: explicit.workspaceId || url.searchParams.get('workspaceId') || '', - sourceKind: explicit.sourceKind || url.searchParams.get('sourceKind') || 'convex_workspace', + sourceKind: explicit.sourceKind || url.searchParams.get('sourceKind') || 'local_folder', rootUri: explicit.rootUri || url.searchParams.get('rootUri') || '', }; }; @@ -529,6 +662,11 @@ import { broadcastSessionContent(session, view); } if ((pendingExternalChange || recentExternalChange) && (session.dirty || recentLocalInput)) { + if (session.sourceKind === 'local_folder' && session.sessionKind !== 'resource') { + session.externalChangePending = true; + if (session.dirty) queueSessionSave(session); + return; + } markSessionExternalConflict(session, externalConflictMessage); return; } @@ -629,6 +767,9 @@ import { } else { setStatus(runtimeDescriptor, 'ready'); } + if (session.pageBodySource) runtimeDescriptor.root.setAttribute('data-mnote-page-body-source', session.pageBodySource); + if (session.projectionSource) runtimeDescriptor.root.setAttribute('data-mnote-projection-source', session.projectionSource); + if (session.blockProjectionVersion) runtimeDescriptor.root.setAttribute('data-mnote-block-projection-version', session.blockProjectionVersion); enhanceEditorAttachmentLinksSoon(); }; view.onError = (event) => { @@ -674,6 +815,7 @@ import { resourceTabs = createResourceTabRuntime({ loadRuntime, createEditorViewBinding, + ensureLocalFolderEventChannel, unmountEditorViewBinding, setStatus, documentSessionRegistry, @@ -828,7 +970,16 @@ import { }, { once: true }); if (paneRuntimes.length) { - Promise.all(paneRuntimes.map((paneRuntime) => mountPane(paneRuntime))).catch((error) => { + Promise.all(paneRuntimes.map((paneRuntime) => mountPane(paneRuntime))).then(() => { + const restoreInput = restoreResourceTabInputFromUrl(); + if (restoreInput) { + return openResourceInActiveTab(restoreInput).catch((error) => { + console.warn('mnote resource tab URL 恢复失败', error); + return false; + }); + } + return false; + }).catch((error) => { console.error('mnote multi-pane editor mount failed', error); }); } diff --git a/rust/crates/mnote-web/browser/document-resource-tab-runtime.js b/rust/crates/mnote-web/browser/document-resource-tab-runtime.js index b4a5b47b..7e9feafa 100644 --- a/rust/crates/mnote-web/browser/document-resource-tab-runtime.js +++ b/rust/crates/mnote-web/browser/document-resource-tab-runtime.js @@ -1,12 +1,45 @@ import { localMarkdownDocumentIdFromRelativePath, + localMarkdownRelativePathFromDocumentId, localizeTiptapAssetUrls, } from './document-tiptap-conversion-runtime.js'; +/** + * @typedef {Object} MNoteWorkspacePath + * @property {'mnote.workspace_path.v1'} schema + * @property {string} workspaceId + * @property {string} sourceKind + * @property {string} rootUri + * @property {string} relativePath + * @property {string} documentId + * @property {string} objectIdentity + * @property {string} assetId + * @property {string} resourceKind + * + * @typedef {Object} MNoteOpenEditorEntry + * @property {string} objectIdentity + * @property {MNoteWorkspacePath|null} workspacePath + * @property {'primary'|'secondary'} paneRole + * @property {string} editorKind + * @property {boolean} active + * @property {string} dirtyState + * @property {boolean} preview + * @property {boolean} pinned + * @property {number} lastActiveAt + * + * @typedef {Object} MNoteOpenEditorsSnapshot + * @property {'mnote.open_editors_snapshot.v1'} schema + * @property {number} generatedAt + * @property {string} activeObjectIdentity + * @property {MNoteOpenEditorEntry[]} editors + * @property {{primary: Object, secondary: Object}} groups + */ + export const createResourceTabRuntime = (dependencies = {}) => { const { loadRuntime, createEditorViewBinding, + ensureLocalFolderEventChannel, unmountEditorViewBinding, setStatus, documentSessionRegistry, @@ -62,9 +95,31 @@ export const createResourceTabRuntime = (dependencies = {}) => { return 'file'; }; + const resourceTabWidthType = (entry) => { + if (!entry) return ''; + const kind = String(entry.kind || '').trim(); + if (kind === 'office') { + const badgeKind = String(entry.badgeKind || resourceTabBadgeKind(entry, kind) || '').trim(); + if (badgeKind === 'ppt') return 'ppt'; + if (badgeKind === 'sheet') return 'excel'; + return 'word'; + } + if (kind === 'pdf') return 'pdf'; + if (kind === 'mindmap') return 'mindmap'; + if (kind === 'markdown' || kind === 'text' || kind === 'code') return 'markdown'; + return ''; + }; + const currentWebShellWorkspaceId = () => { const explicit = typeof currentWorkspaceId === 'function' ? String(currentWorkspaceId() || '').trim() : ''; if (explicit) return explicit; + const fromBody = document.body?.dataset?.workspaceId || ''; + if (fromBody) return String(fromBody).trim(); + const shell = document.querySelector('.document-shell[data-workspace-id], [data-document-pane="true"][data-pane-role="primary"][data-pane-workspace-id]'); + if (shell instanceof HTMLElement) { + const value = shell.getAttribute('data-workspace-id') || shell.getAttribute('data-pane-workspace-id') || ''; + if (value) return value.trim(); + } try { return currentUrl().searchParams.get('workspaceId') || ''; } catch (_) { @@ -82,6 +137,80 @@ export const createResourceTabRuntime = (dependencies = {}) => { return ''; }; + const documentIdForPane = (paneRole) => { + const role = normalizePaneRole(paneRole); + const nodes = resourceTabHostNodes(role); + const fromTab = String(nodes.pageTab?.getAttribute?.('data-document-id') || '').trim(); + if (fromTab) return fromTab; + const pane = document.querySelector(`[data-document-pane="true"][data-pane-role="${role}"]`); + if (pane instanceof HTMLElement) { + const fromPane = String(pane.getAttribute('data-pane-document-id') || '').trim(); + if (fromPane) return fromPane; + const root = pane.querySelector('[data-testid="mnote-leptos-tiptap-island-editor-root"][data-document-id], .document-shell[data-document-id]'); + if (root instanceof HTMLElement) { + const fromRoot = String(root.getAttribute('data-document-id') || '').trim(); + if (fromRoot) return fromRoot; + } + } + return role === 'primary' ? currentWebShellDocumentId() : ''; + }; + + const currentWebShellSourceKind = () => { + try { + return currentUrl().searchParams.get('sourceKind') || ''; + } catch (_) { + return ''; + } + }; + + const currentWebShellRootUri = () => { + try { + return currentUrl().searchParams.get('rootUri') || ''; + } catch (_) { + return ''; + } + }; + + const buildWorkspacePath = ({ + workspacePath, + workspaceId, + sourceKind, + rootUri, + relativePath, + documentId, + objectIdentity, + assetId, + resourceKind, + } = {}) => { + const fromInput = workspacePath && typeof workspacePath === 'object' ? workspacePath : null; + if (fromInput && String(fromInput.schema || '') === 'mnote.workspace_path.v1') { + return { + schema: 'mnote.workspace_path.v1', + workspaceId: String(fromInput.workspaceId || workspaceId || '').trim(), + sourceKind: String(fromInput.sourceKind || sourceKind || '').trim(), + rootUri: String(fromInput.rootUri || rootUri || '').trim(), + relativePath: String(fromInput.relativePath || fromInput.localRelativePath || relativePath || '').trim(), + documentId: String(fromInput.documentId || documentId || '').trim(), + objectIdentity: fromInput.objectIdentity ?? String(objectIdentity || '').trim(), + assetId: String(fromInput.assetId || assetId || '').trim(), + resourceKind: String(fromInput.resourceKind || fromInput.objectKind || resourceKind || '').trim(), + }; + } + const id = String(objectIdentity || documentId || assetId || relativePath || '').trim(); + if (!id) return null; + return { + schema: 'mnote.workspace_path.v1', + workspaceId: String(workspaceId || '').trim(), + sourceKind: String(sourceKind || '').trim(), + rootUri: String(rootUri || '').trim(), + relativePath: String(relativePath || '').trim(), + documentId: String(documentId || '').trim(), + objectIdentity: String(objectIdentity || '').trim(), + assetId: String(assetId || '').trim(), + resourceKind: String(resourceKind || '').trim(), + }; + }; + const normalizeResourceTabKind = (input) => { const kind = String(input?.kind || '').trim().toLowerCase(); const title = String(input?.title || input?.fileName || input?.path || '').trim().toLowerCase(); @@ -121,7 +250,10 @@ export const createResourceTabRuntime = (dependencies = {}) => { const setResourceTabLastActive = (key) => { const entry = resourceTabRegistry.get(String(key || '').trim()); - if (entry?.session) entry.session.lastActiveAt = Date.now(); + if (!entry) return; + const timestamp = Date.now(); + entry.lastActiveAt = timestamp; + if (entry.session) entry.session.lastActiveAt = timestamp; }; const removeFromResourceTabMru = (paneRole, key) => { @@ -140,6 +272,10 @@ export const createResourceTabRuntime = (dependencies = {}) => { const resourceTabCloseGuardReason = (session) => { if (!session) return ''; + const bufferDirtyState = String(session.bufferDirtyState || '').trim(); + if (bufferDirtyState === 'Dirty' || bufferDirtyState === 'Stale' || bufferDirtyState === 'Deleted' || bufferDirtyState === 'ExternalModified') { + return bufferDirtyState; + } const hasUnsavedChanges = session.dirty || Boolean(session.saveTimer) || sessionHasRecentLocalInput(session) @@ -150,7 +286,49 @@ export const createResourceTabRuntime = (dependencies = {}) => { return ''; }; - const syncResourceTabCloseGuard = (entry) => { + const documentSessionForPane = (paneRole, documentId) => { + const id = String(documentId || '').trim(); + if (!id || !documentSessionRegistry || typeof documentSessionRegistry.values !== 'function') return null; + const role = normalizePaneRole(paneRole); + return Array.from(documentSessionRegistry.values()).find((session) => ( + session + && session.sessionKind !== 'resource' + && String(session.documentId || '').trim() === id + && Array.from(session.views?.values?.() || []).some((view) => normalizePaneRole(view?.runtimeDescriptor?.paneRole) === role) + )) || Array.from(documentSessionRegistry.values()).find((session) => ( + session + && session.sessionKind !== 'resource' + && String(session.documentId || '').trim() === id + )) || null; + }; + + const documentSessionDirtyState = (session) => { + if (!session) return ''; + const bufferDirtyState = String(session.bufferDirtyState || '').trim(); + if (bufferDirtyState === 'Dirty' || bufferDirtyState === 'Stale' || bufferDirtyState === 'Deleted' || bufferDirtyState === 'ExternalModified') return bufferDirtyState; + if (session.hasExternalConflict) return 'ExternalModified'; + if (session.dirty || Boolean(session.saveTimer) || sessionHasRecentLocalInput(session)) return 'Dirty'; + if (session.saving) return 'Saving'; + return ''; + }; + + const resourceTabBufferStateUrl = (entry) => { + const session = entry?.session; + if (!session || session.sourceKind !== 'local_folder') return null; + const relativePath = String(session.resourcePath || entry?.workspacePath?.relativePath || '').trim(); + const rootUri = String(session.rootUri || entry?.workspacePath?.rootUri || '').trim(); + if (!relativePath || !rootUri) return null; + const url = new URL('/api/documents/buffer-state', window.location.origin); + url.searchParams.set('documentId', String(session.documentId || entry.objectIdentity || '')); + url.searchParams.set('sourceKind', 'local_folder'); + url.searchParams.set('rootUri', rootUri); + url.searchParams.set('relativePath', relativePath); + const workspaceId = String(session.workspaceId || entry?.workspacePath?.workspaceId || '').trim(); + if (workspaceId) url.searchParams.set('workspaceId', workspaceId); + return url; + }; + + const applyResourceTabCloseGuard = (entry) => { if (!entry?.tab || !(entry.tab instanceof HTMLElement)) return; const reason = resourceTabCloseGuardReason(entry.session); if (reason) { @@ -162,6 +340,30 @@ export const createResourceTabRuntime = (dependencies = {}) => { } }; + const refreshResourceTabBufferState = async (entry) => { + const url = resourceTabBufferStateUrl(entry); + if (!url || !entry?.session) return null; + try { + const response = await fetch(url.toString(), { cache: 'no-store', headers: { accept: 'application/json' } }); + const payload = await response.json().catch(() => null); + if (!response.ok || !payload || payload.ok !== true || !payload.result) return null; + const dirtyState = String(payload.result.dirtyState || '').trim(); + if (dirtyState) entry.session.bufferDirtyState = dirtyState; + if (typeof payload.result.fileVersion === 'string' && payload.result.fileVersion.trim()) { + entry.session.fileVersion = payload.result.fileVersion.trim(); + } + applyResourceTabCloseGuard(entry); + return payload.result; + } catch (_) { + return null; + } + }; + + const syncResourceTabCloseGuard = (entry) => { + applyResourceTabCloseGuard(entry); + void refreshResourceTabBufferState(entry); + }; + const syncResourceSessionTabGuards = (session) => { if (!session || session.sessionKind !== 'resource') return; resourceTabRegistry.forEach((entry) => { @@ -169,52 +371,126 @@ export const createResourceTabRuntime = (dependencies = {}) => { }); }; - const openEditorsSnapshotEntry = (entry, key) => ({ - objectIdentity: String(entry?.objectIdentity || key || '').trim(), - title: String(entry?.title || '资源').trim() || '资源', - kind: normalizeResourceTabKind(entry), - badgeKind: entry?.tab instanceof HTMLElement - ? String(entry.tab.getAttribute('data-mnote-tab-badge-kind') || resourceTabBadgeKind(entry, entry.kind)).trim() - : resourceTabBadgeKind(entry, entry?.kind), - active: entry?.tab instanceof HTMLElement + const openEditorsSnapshotEntry = (entry, key, generatedAt = Date.now()) => { + const active = entry?.tab instanceof HTMLElement ? entry.tab.getAttribute('aria-selected') === 'true' - : false, - dirtyGuard: resourceTabCloseGuardReason(entry?.session), - assetId: String(entry?.assetId || entry?.session?.assetId || '').trim(), - path: String(entry?.path || entry?.session?.resourcePath || '').trim(), - }); + : false; + const documentId = String(entry?.documentId || entry?.ownerDocumentId || entry?.session?.ownerDocumentId || '').trim(); + const workspaceId = String(entry?.workspaceId || entry?.session?.workspaceId || currentWebShellWorkspaceId() || '').trim(); + const sourceKind = String(entry?.sourceKind || entry?.session?.sourceKind || currentWebShellSourceKind() || '').trim(); + const rootUri = String(entry?.rootUri || entry?.session?.rootUri || currentWebShellRootUri() || '').trim(); + const relativePath = String(entry?.path || entry?.session?.resourcePath || '').trim(); + const objectIdentity = String(entry?.objectIdentity || key || '').trim(); + const assetId = String(entry?.assetId || entry?.session?.assetId || '').trim(); + const kind = normalizeResourceTabKind(entry); + const dirtyState = resourceTabCloseGuardReason(entry?.session); + return { + objectIdentity, + workspacePath: buildWorkspacePath({ + workspaceId, + sourceKind, + rootUri, + relativePath, + documentId, + objectIdentity, + assetId, + resourceKind: kind, + workspacePath: entry?.workspacePath, + }), + paneRole: normalizePaneRole(entry?.paneRole), + documentId, + workspaceId, + title: String(entry?.title || '资源').trim() || '资源', + kind, + editorKind: kind, + badgeKind: entry?.tab instanceof HTMLElement + ? String(entry.tab.getAttribute('data-mnote-tab-badge-kind') || resourceTabBadgeKind(entry, entry.kind)).trim() + : resourceTabBadgeKind(entry, entry?.kind), + active, + dirtyState, + dirtyGuard: dirtyState, + assetId, + path: relativePath, + lastActiveAt: Number(entry?.session?.lastActiveAt || entry?.lastActiveAt || 0) || (active ? generatedAt : 0), + preview: false, + pinned: false, + }; + }; const buildOpenEditorsSnapshot = () => { + const generatedAt = Date.now(); const pageEntries = ['primary', 'secondary'].map((paneRole) => { const nodes = resourceTabHostNodes(paneRole); + const documentId = documentIdForPane(paneRole); + const workspaceId = String(nodes.pageTab?.getAttribute?.('data-workspace-id') || currentWebShellWorkspaceId() || '').trim(); + const sourceKind = currentWebShellSourceKind(); + const rootUri = currentWebShellRootUri(); + const relativePath = sourceKind === 'local_folder' ? localMarkdownRelativePathFromDocumentId(documentId) : ''; + const objectIdentity = `page:${paneRole}`; + const active = nodes.pageTab instanceof HTMLElement + ? nodes.pageTab.getAttribute('aria-selected') === 'true' + : false; + const pageSession = documentSessionForPane(paneRole, documentId); + const dirtyState = documentSessionDirtyState(pageSession); const pageTitle = nodes.pageTab instanceof HTMLElement ? String(nodes.pageTab.querySelector('.mnote-main-tab-title')?.textContent || '页面').trim() : '页面'; return { - objectIdentity: `page:${paneRole}`, + objectIdentity, + workspacePath: buildWorkspacePath({ + workspaceId, + sourceKind, + rootUri, + relativePath, + documentId, + objectIdentity, + assetId: '', + resourceKind: 'page', + }), paneRole, - documentId: String(nodes.pageTab?.getAttribute?.('data-document-id') || '').trim(), - workspaceId: String(nodes.pageTab?.getAttribute?.('data-workspace-id') || currentWebShellWorkspaceId() || '').trim(), + documentId, + workspaceId, title: pageTitle || '页面', kind: 'page', + editorKind: 'page', badgeKind: 'code', - active: nodes.pageTab instanceof HTMLElement - ? nodes.pageTab.getAttribute('aria-selected') === 'true' - : false, - dirtyGuard: '', + active, + dirtyState, + dirtyGuard: dirtyState, + lastActiveAt: active ? generatedAt : 0, + preview: false, + pinned: true, }; }).filter((entry) => entry.paneRole === 'primary' || entry.documentId || document.querySelector('[data-document-pane="true"][data-pane-role="secondary"][data-pane-visible="true"]')); const resources = []; resourceTabRegistry.forEach((entry, key) => { - resources.push(openEditorsSnapshotEntry(entry, key)); + resources.push(openEditorsSnapshotEntry(entry, key, generatedAt)); }); - const active = [...pageEntries, ...resources].find((entry) => entry.active); + const editors = [...pageEntries, ...resources]; + const groupForPane = (paneRole) => { + const role = normalizePaneRole(paneRole); + const groupEditors = editors.filter((entry) => normalizePaneRole(entry.paneRole) === role); + const groupResources = resources.filter((entry) => normalizePaneRole(entry.paneRole) === role); + const groupActive = groupEditors.find((entry) => entry.active); + return { + paneRole: role, + activeObjectIdentity: groupActive?.objectIdentity || '', + editors: groupEditors, + resourceEditors: groupResources, + }; + }; + const groups = { + primary: groupForPane('primary'), + secondary: groupForPane('secondary'), + }; + const activeObjectIdentity = groups.primary.activeObjectIdentity || groups.secondary.activeObjectIdentity || ''; return { schema: 'mnote.open_editors_snapshot.v1', - generatedAt: Date.now(), - activeObjectIdentity: active?.objectIdentity || '', - editors: [...pageEntries, ...resources], + generatedAt, + activeObjectIdentity, + editors, resourceEditors: resources, + groups, }; }; @@ -295,6 +571,29 @@ export const createResourceTabRuntime = (dependencies = {}) => { } }; + const syncActiveResourceWidthType = (activeEntry, paneRole = 'primary') => { + const role = normalizePaneRole(paneRole); + const widthType = role === 'primary' ? resourceTabWidthType(activeEntry) : ''; + const targetNodes = [document.documentElement, document.body].filter((node) => node instanceof HTMLElement); + targetNodes.forEach((node) => { + if (widthType) node.setAttribute('data-mnote-active-resource-width-type', widthType); + else node.removeAttribute('data-mnote-active-resource-width-type'); + }); + const shell = document.querySelector(`.document-pane[data-pane-role="${role}"] .document-shell`); + if (shell instanceof HTMLElement) { + if (widthType) shell.setAttribute('data-mnote-active-resource-width-type', widthType); + else shell.removeAttribute('data-mnote-active-resource-width-type'); + } + window.dispatchEvent(new CustomEvent('mnote:active-resource-tab-changed', { + detail: { + paneRole: role, + active: Boolean(activeEntry), + widthType, + objectIdentity: String(activeEntry?.objectIdentity || '') + } + })); + }; + const syncActiveResourceUrlState = (activeResource, paneRole = 'primary') => { const role = normalizePaneRole(paneRole); if (role !== 'primary') return; @@ -340,6 +639,7 @@ export const createResourceTabRuntime = (dependencies = {}) => { if (entry.panel instanceof HTMLElement) entry.panel.hidden = !active; syncResourceTabCloseGuard(entry); }); + syncActiveResourceWidthType(activeEntry, role); if (activeEntry) markIntendedSlashRoot(activeEntry); if (!activeEntry && window.__mnoteIntendedSlashRoot instanceof HTMLElement) window.__mnoteIntendedSlashRoot = null; if (role === 'primary') syncActiveResourceFileTreeRow(activeResource); @@ -399,10 +699,11 @@ export const createResourceTabRuntime = (dependencies = {}) => { syncOpenEditorsSnapshot(); }; - const closeResourceTab = (objectIdentity) => { + const closeResourceTab = async (objectIdentity) => { const key = String(objectIdentity || '').trim(); const entry = resourceTabRegistry.get(key); if (!entry) return; + await refreshResourceTabBufferState(entry); const guardReason = resourceTabCloseGuardReason(entry.session); if (guardReason) { console.warn(`mnote resource tab 关闭阻止: ${entry.title} (${guardReason})`); @@ -489,6 +790,7 @@ export const createResourceTabRuntime = (dependencies = {}) => { paneRole, title, kind, + badgeKind: resourceTabBadgeKind(input, kind), tab, panel, view: null, @@ -497,6 +799,21 @@ export const createResourceTabRuntime = (dependencies = {}) => { path: String(input.path || '').trim(), documentId: String(input.documentId || '').trim(), ownerDocumentId: String(input.ownerDocumentId || input.documentId || '').trim(), + workspaceId: String(input.workspaceId || currentWebShellWorkspaceId() || '').trim(), + sourceKind: String(input.sourceKind || currentWebShellSourceKind() || '').trim(), + rootUri: String(input.rootUri || currentWebShellRootUri() || '').trim(), + workspacePath: buildWorkspacePath({ + workspacePath: input.workspacePath, + workspaceId: input.workspaceId || currentWebShellWorkspaceId(), + sourceKind: input.sourceKind || currentWebShellSourceKind(), + rootUri: input.rootUri || currentWebShellRootUri(), + relativePath: input.path, + documentId: input.documentId, + objectIdentity, + assetId: input.assetId, + resourceKind: kind, + }), + lastActiveAt: 0, }; }; @@ -515,6 +832,12 @@ export const createResourceTabRuntime = (dependencies = {}) => { } entry.mindmapRuntime = null; } + if (entry.resourceWatchEventSource) { + try { + entry.resourceWatchEventSource.close(); + } catch (_) {} + entry.resourceWatchEventSource = null; + } if (entry.panel instanceof HTMLElement) entry.panel.replaceChildren(); }; @@ -525,6 +848,80 @@ export const createResourceTabRuntime = (dependencies = {}) => { return url.toString(); }; + const localResourceStatUrl = (rootUri, path) => { + const url = new URL('/api/local-folder/files/stat', window.location.origin); + url.searchParams.set('rootUri', rootUri || ''); + url.searchParams.set('path', path || ''); + return url.toString(); + }; + + const withResourceReloadToken = (href) => { + if (!href) return href; + const url = new URL(href, window.location.origin); + url.searchParams.set('mnoteResourceReload', String(Date.now())); + return url.toString(); + }; + + const renderPassiveResourceMissing = (entry, message) => { + if (!(entry?.panel instanceof HTMLElement)) return; + entry.panel.setAttribute('data-mnote-resource-missing', 'true'); + entry.panel.innerHTML = '

资源已不可用

'; + const text = entry.panel.querySelector('p'); + if (text instanceof HTMLElement) text.textContent = message || '本地资源文件已被删除或移动。'; + }; + + const reloadPassiveResourceTab = (entry) => { + if (!(entry?.panel instanceof HTMLElement)) return; + entry.panel.removeAttribute('data-mnote-resource-missing'); + const img = entry.panel.querySelector('img.mnote-resource-tab-image'); + if (img instanceof HTMLImageElement) { + img.src = withResourceReloadToken(img.getAttribute('src') || img.src || ''); + return; + } + const frame = entry.panel.querySelector('iframe.mnote-resource-tab-frame'); + if (frame instanceof HTMLIFrameElement) { + frame.src = withResourceReloadToken(frame.getAttribute('src') || frame.src || ''); + } + }; + + const installPassiveResourceWatch = (entry) => { + if (!entry || entry.session || typeof window.EventSource !== 'function') return; + const rootUri = String(entry.rootUri || '').trim(); + const path = String(entry.path || '').trim(); + if (!rootUri || !path) return; + if (entry.resourceWatchEventSource) { + try { + entry.resourceWatchEventSource.close(); + } catch (_) {} + entry.resourceWatchEventSource = null; + } + const url = new URL('/api/local-folder/events', window.location.origin); + url.searchParams.set('rootUri', rootUri); + url.searchParams.set('resourcePath', path); + const eventSource = new EventSource(url.toString()); + entry.resourceWatchEventSource = eventSource; + eventSource.addEventListener('ready', () => { + if (entry.panel instanceof HTMLElement) entry.panel.setAttribute('data-mnote-resource-watch-ready', 'true'); + }); + eventSource.addEventListener('change', async () => { + try { + const response = await fetch(localResourceStatUrl(rootUri, path), { + cache: 'no-store', + headers: { accept: 'application/json' }, + }); + const payload = await response.json().catch(() => null); + const exists = Boolean(response.ok && payload?.ok === true && payload?.result?.exists); + if (!exists) { + renderPassiveResourceMissing(entry, '本地资源文件已被删除或移动。'); + return; + } + reloadPassiveResourceTab(entry); + } catch (error) { + renderPassiveResourceMissing(entry, error instanceof Error ? error.message : String(error)); + } + }); + }; + const createResourceSession = (entry, input, readResult) => { const resourcePath = String(input.path || ''); const tiptapDocument = localizeTiptapAssetUrls( @@ -577,6 +974,9 @@ export const createResourceTabRuntime = (dependencies = {}) => { error: null, }; documentSessionRegistry.set(session.key, session); + if (typeof ensureLocalFolderEventChannel === 'function') { + ensureLocalFolderEventChannel(session); + } return session; }; @@ -644,6 +1044,7 @@ export const createResourceTabRuntime = (dependencies = {}) => { img.src = href; img.alt = entry.title; } + installPassiveResourceWatch(entry); return; } entry.panel.innerHTML = ''; @@ -652,6 +1053,7 @@ export const createResourceTabRuntime = (dependencies = {}) => { frame.title = entry.title; frame.src = href; } + installPassiveResourceWatch(entry); }; const refreshExistingOfficeResourceTab = (entry, input) => { diff --git a/rust/crates/mnote-web/browser/document-session-runtime.js b/rust/crates/mnote-web/browser/document-session-runtime.js index 40050a4a..1f561880 100644 --- a/rust/crates/mnote-web/browser/document-session-runtime.js +++ b/rust/crates/mnote-web/browser/document-session-runtime.js @@ -5,6 +5,7 @@ import { hydrateMindmapAttrsFromDom, legacyBlocksFromEditorDocument, pageBodyTiptapDocument, + pageBodyTiptapDocumentSource, revisionFromConflictKey, textToTiptapDocument, toTiptapDocument, @@ -102,7 +103,7 @@ export const createDocumentSessionRuntime = (dependencies = {}) => { const normalizeSessionSourceKind = (bootstrap) => { const value = typeof bootstrap?.sourceKind === 'string' ? bootstrap.sourceKind.trim() : ''; - return value || 'convex_workspace'; + return value || 'local_folder'; }; const buildDocumentSessionKey = (bootstrap) => { @@ -115,7 +116,90 @@ export const createDocumentSessionRuntime = (dependencies = {}) => { const sessionViews = (session) => Array.from(session.views.values()); - const localFolderEventChannelKey = (session) => `${String(session?.rootUri || '').trim()}#${String(session?.documentId || '').trim()}`; + const resourceWatchPath = (session) => String(session?.resourcePath || session?.relativePath || '').trim(); + + const localFolderEventChannelKey = (session) => { + const scope = session?.sessionKind === 'resource' + ? `resource:${resourceWatchPath(session)}` + : String(session?.documentId || '').trim(); + return `${String(session?.rootUri || '').trim()}#${scope}`; + }; + + const localMarkdownRelativePathFromDocumentId = (documentId) => { + const value = String(documentId || '').trim(); + if (!value.startsWith('local-md:')) return ''; + return value.slice('local-md:'.length).replace(/~2F/g, '/'); + }; + + const sessionRelativePath = (session) => ( + String(session?.relativePath || '').trim() + || localMarkdownRelativePathFromDocumentId(session?.documentId) + ); + + const sessionBufferStateUrl = (session) => { + if (!session || session.sourceKind !== 'local_folder' || !session.rootUri || !session.documentId) return null; + const url = new URL('/api/documents/buffer-state', window.location.origin); + url.searchParams.set('documentId', session.documentId); + url.searchParams.set('sourceKind', session.sourceKind); + url.searchParams.set('rootUri', session.rootUri); + if (session.workspaceId) url.searchParams.set('workspaceId', session.workspaceId); + const relativePath = sessionRelativePath(session); + if (relativePath) url.searchParams.set('relativePath', relativePath); + return url; + }; + + const applyBufferStateToSession = (session, bufferState) => { + if (!session || !bufferState || typeof bufferState !== 'object') return; + const dirtyState = String(bufferState.dirtyState || '').trim(); + if (dirtyState) session.bufferDirtyState = dirtyState; + if (typeof bufferState.fileVersion === 'string' && bufferState.fileVersion.trim()) { + session.fileVersion = bufferState.fileVersion.trim(); + if (!session.conflictDetectionKey) session.conflictDetectionKey = session.fileVersion; + } + if (typeof bufferState.externalActor === 'string' && bufferState.externalActor.trim()) { + session.lastExternalWriteSource = bufferState.externalActor.trim(); + } + }; + + const fetchSessionBufferState = async (session) => { + const url = sessionBufferStateUrl(session); + if (!url) return null; + try { + const response = await fetch(url.toString(), { + cache: 'no-store', + headers: { accept: 'application/json' }, + }); + const payload = await response.json().catch(() => null); + if (!response.ok || !payload || payload.ok !== true) return null; + const bufferState = payload.result || null; + applyBufferStateToSession(session, bufferState); + return bufferState; + } catch (_error) { + return null; + } + }; + + const markSessionBufferDirty = (session) => { + if (!session || session.sourceKind !== 'local_folder' || session.sessionKind === 'resource') return; + const relativePath = sessionRelativePath(session); + if (!relativePath) return; + const serialized = String(session.currentSerialized || ''); + const contentHash = `browser-dirty:${serialized.length}:${serialized.charCodeAt(0) || 0}:${serialized.charCodeAt(serialized.length - 1) || 0}`; + void fetch('/api/documents/buffer-state/dirty', { + method: 'POST', + headers: { 'content-type': 'application/json', accept: 'application/json' }, + body: JSON.stringify({ + documentId: session.documentId, + workspaceId: session.workspaceId, + sourceKind: session.sourceKind, + rootUri: session.rootUri, + relativePath, + contentHash, + }), + }).then((response) => response.json().catch(() => null)).then((payload) => { + if (payload && payload.ok === true) applyBufferStateToSession(session, payload.result); + }).catch(() => undefined); + }; const detachSessionFromLocalFolderChannel = (session) => { const channel = session.localFolderChannel; @@ -416,16 +500,21 @@ export const createDocumentSessionRuntime = (dependencies = {}) => { const ensureSessionConflictEnvelope = (session, message) => { if (!session) return null; if (session.lastExternalConflictEnvelope) return session.lastExternalConflictEnvelope; + const isResourceSession = session.sessionKind === 'resource'; + const defaultMessage = isResourceSession + ? '当前本地资源文件已在外部更新，请刷新或保存前先处理冲突' + : externalConflictMessage; const envelope = { - code: 'local_markdown_external_change', + code: isResourceSession ? 'local_resource_external_change' : 'local_markdown_external_change', documentId: session.documentId, rootUri: session.rootUri || null, + path: isResourceSession ? (session.resourcePath || '') : undefined, currentDiskVersion: session.conflictDetectionKey || session.fileVersion || null, editorBaseVersion: session.lastExternalConflictDetectionKey || session.conflictDetectionKey || session.fileVersion || null, externalActor: session.lastExternalWriteSource || null, dirtyState: session.dirty ? 'Dirty' : (session.hasExternalConflict ? 'ExternalModified' : 'Clean'), bufferFileVersion: session.fileVersion || session.conflictDetectionKey || null, - message: message || externalConflictMessage, + message: isResourceSession && (!message || message === externalConflictMessage) ? defaultMessage : (message || defaultMessage), suggestedActions: ['accept_disk', 'keep_editor', 'open_diff', 'merge'], }; session.lastExternalConflictEnvelope = envelope; @@ -802,13 +891,13 @@ export const createDocumentSessionRuntime = (dependencies = {}) => { const markSessionExternalConflict = (session, message) => { session.externalChangePending = false; - ensureSessionConflictEnvelope(session, message); + const envelope = ensureSessionConflictEnvelope(session, message); session.hasExternalConflict = true; if (session.saveTimer) { window.clearTimeout(session.saveTimer); session.saveTimer = 0; } - const nextMessage = message || externalConflictMessage; + const nextMessage = envelope?.message || message || externalConflictMessage; setSessionStatus(session, 'external-change-conflict', nextMessage); renderSessionConflictSurface(session, nextMessage); }; @@ -817,12 +906,23 @@ export const createDocumentSessionRuntime = (dependencies = {}) => { if (session.readOnly || session.hasExternalConflict) return; if (session.saveTimer) window.clearTimeout(session.saveTimer); setSessionStatus(session, 'dirty'); + markSessionBufferDirty(session); session.saveTimer = window.setTimeout(() => { session.saveTimer = 0; void persistSession(session); }, 650); }; + const makeSaveOperationToken = (prefix, session) => { + const doc = String(session?.documentId || session?.resourcePath || 'unknown') + .replace(/[^a-zA-Z0-9._:-]+/g, '-') + .slice(0, 80); + const random = typeof crypto !== 'undefined' && typeof crypto.randomUUID === 'function' + ? crypto.randomUUID() + : `${Date.now().toString(36)}-${Math.random().toString(36).slice(2)}`; + return `${prefix}:${doc}:${random}`; + }; + const persistSession = async (session) => { if (session.readOnly || session.saving || session.hasExternalConflict) return; const hydrateView = sessionViews(session).find((item) => item.mountId != null) || sessionViews(session)[0]; @@ -841,11 +941,30 @@ export const createDocumentSessionRuntime = (dependencies = {}) => { const editorDocument = editorDocumentFromTiptapDocument({ documentId: session.documentId }, session.currentTiptapDocument); const content = legacyBlocksFromEditorDocument(editorDocument); const saveEndpoint = session.saveEndpoint || '/api/documents/save'; + const expectedFileVersion = ( + session.sourceKind === 'local_folder' + && !session.lastExternalConflictEnvelope + && session.lastExternalConflictDetectionKey + ) + ? session.lastExternalConflictDetectionKey + : session.conflictDetectionKey; + if (session.sourceKind === 'local_folder' && expectedFileVersion && expectedFileVersion !== session.conflictDetectionKey) { + session.conflictDetectionKey = expectedFileVersion; + session.fileVersion = expectedFileVersion; + } + const writeIntentId = session.sourceKind === 'local_folder' + ? makeSaveOperationToken('intent:tiptap', session) + : ''; + const saveOperationId = session.sourceKind === 'local_folder' + ? makeSaveOperationToken('save:tiptap', session) + : ''; const savePayload = session.sessionKind === 'resource' ? { rootUri: session.rootUri, path: session.resourcePath, - expectedFileVersion: session.conflictDetectionKey, + expectedFileVersion: expectedFileVersion, + writeIntentId, + saveOperationId, contentFormat: 'editorBlocks', editorSource: 'tiptap-resource-tab', editorDocument, @@ -859,7 +978,9 @@ export const createDocumentSessionRuntime = (dependencies = {}) => { sourceKind: session.sourceKind, rootUri: session.rootUri, revision: session.revision, - expectedFileVersion: session.conflictDetectionKey, + expectedFileVersion: expectedFileVersion, + writeIntentId, + saveOperationId, contentFormat: 'editorBlocks', editorSource: 'tiptap', editorDocument, @@ -889,6 +1010,16 @@ export const createDocumentSessionRuntime = (dependencies = {}) => { throw new Error(message); } const saved = result.result || {}; + if (typeof saved.writeIntentId === 'string' && saved.writeIntentId.trim()) { + session.lastWriteIntentId = saved.writeIntentId.trim(); + } else if (writeIntentId) { + session.lastWriteIntentId = writeIntentId; + } + if (typeof saved.saveOperationId === 'string' && saved.saveOperationId.trim()) { + session.lastSaveOperationId = saved.saveOperationId.trim(); + } else if (saveOperationId) { + session.lastSaveOperationId = saveOperationId; + } if (Number.isInteger(saved.revision)) session.revision = saved.revision; if (typeof saved.conflict_detection_key === 'string' && saved.conflict_detection_key.trim()) { session.conflictDetectionKey = saved.conflict_detection_key.trim(); @@ -902,6 +1033,7 @@ export const createDocumentSessionRuntime = (dependencies = {}) => { if (session.conflictDetectionKey) session.lastExternalConflictDetectionKey = session.conflictDetectionKey; session.hasExternalConflict = false; session.externalChangePending = false; + session.bufferDirtyState = 'Clean'; session.lastUserInputAt = 0; syncSessionMetaToViews(session); session.lastPersistedSerialized = serialized; @@ -951,7 +1083,47 @@ export const createDocumentSessionRuntime = (dependencies = {}) => { if (document.hidden) return; if (!session || session.views.size === 0) return; if (session.sourceKind === 'local_folder' && !session.rootUri) return; + if (session.sessionKind === 'resource') { + await refreshResourceSessionFromExternalChange(session, source); + return; + } try { + const bufferState = await fetchSessionBufferState(session); + const dirtyState = String(bufferState?.dirtyState || session.bufferDirtyState || '').trim(); + if (dirtyState === 'Deleted') { + session.lastExternalConflictEnvelope = { + code: 'local_markdown_deleted', + documentId: session.documentId, + rootUri: session.rootUri || null, + currentDiskVersion: bufferState?.fileVersion || session.conflictDetectionKey || session.fileVersion || null, + editorBaseVersion: session.conflictDetectionKey || session.fileVersion || null, + externalActor: bufferState?.externalActor || null, + dirtyState, + bufferFileVersion: bufferState?.fileVersion || session.fileVersion || null, + message: '当前本地 Markdown 文件已被删除，请恢复文件或关闭当前标签', + suggestedActions: ['keep_editor', 'open_diff'], + }; + markSessionExternalConflict(session, session.lastExternalConflictEnvelope.message); + return; + } + if (session.hasExternalConflict) { + markSessionExternalConflict(session, conflictMessageFromEnvelope(session, { + message: externalConflictMessage, + dirtyState, + fileVersion: bufferState?.fileVersion || null, + externalActor: bufferState?.externalActor || null, + })); + return; + } + if (sessionHasRecentLocalInput(session) || session.dirty || session.saveTimer || session.saving) { + session.externalChangePending = true; + if (session.dirty && !session.saveTimer && !session.saving) { + queueSessionSave(session); + } else if (!session.saving) { + setSessionStatus(session, 'dirty'); + } + return; + } const response = await fetch(pageAggregateUrl({ documentId: session.documentId, sourceKind: session.sourceKind, @@ -999,13 +1171,17 @@ export const createDocumentSessionRuntime = (dependencies = {}) => { const nextSerialized = JSON.stringify(nextTiptapDocument); const contentChanged = nextSerialized !== session.currentSerialized; session.externalChangePending = false; + session.bufferDirtyState = 'Clean'; if (!nextConflictKey || !session.lastExternalConflictDetectionKey) { session.lastExternalConflictDetectionKey = nextConflictKey || session.lastExternalConflictDetectionKey; if (!contentChanged) return; } - if (nextConflictKey === session.lastExternalConflictDetectionKey && !contentChanged) return; - if (session.hasExternalConflict || sessionHasRecentLocalInput(session) || session.dirty || session.saveTimer || session.saving) { - markSessionExternalConflict(session, externalConflictMessage); + if (nextConflictKey === session.lastExternalConflictDetectionKey) { + if (nextConflictKey && session.conflictDetectionKey !== nextConflictKey) { + session.conflictDetectionKey = nextConflictKey; + session.fileVersion = nextConflictKey; + syncSessionMetaToViews(session); + } return; } const nextRevision = Number.isInteger(nextBody.revision) ? nextBody.revision : revisionFromConflictKey(nextConflictKey); @@ -1031,6 +1207,78 @@ export const createDocumentSessionRuntime = (dependencies = {}) => { } }; + const refreshResourceSessionFromExternalChange = async (session, source) => { + if (document.hidden) return; + if (!session || session.views.size === 0) return; + if (session.sourceKind !== 'local_folder' || !session.rootUri || !session.resourcePath) return; + let nextResource = null; + try { + nextResource = await fetchLatestResourceSnapshot(session); + } catch (error) { + session.lastExternalConflictEnvelope = { + code: 'local_resource_deleted', + documentId: session.documentId, + rootUri: session.rootUri || null, + path: session.resourcePath || '', + currentDiskVersion: null, + editorBaseVersion: session.conflictDetectionKey || session.fileVersion || null, + externalActor: 'external-editor', + dirtyState: 'Deleted', + message: '当前本地资源文件已被删除或移动，请恢复文件或关闭当前标签', + suggestedActions: ['keep_editor', 'open_diff'], + }; + markSessionExternalConflict(session, session.lastExternalConflictEnvelope.message); + return; + } + const nextConflictKey = String(nextResource?.fileVersion || nextResource?.conflictDetectionKey || '').trim(); + const nextTiptapDocument = toTiptapDocument(nextResource?.content, nextResource?.text || ''); + const nextSerialized = JSON.stringify(nextTiptapDocument); + const contentChanged = nextSerialized !== session.currentSerialized; + session.externalChangePending = false; + if (!nextConflictKey || !session.lastExternalConflictDetectionKey) { + session.lastExternalConflictDetectionKey = nextConflictKey || session.lastExternalConflictDetectionKey; + if (!contentChanged) return; + } + if (nextConflictKey === session.lastExternalConflictDetectionKey) { + if (nextConflictKey && session.conflictDetectionKey !== nextConflictKey) { + session.conflictDetectionKey = nextConflictKey; + session.fileVersion = nextConflictKey; + syncSessionMetaToViews(session); + } + return; + } + if (session.hasExternalConflict || sessionHasRecentLocalInput(session) || session.dirty || session.saveTimer || session.saving) { + session.lastExternalConflictEnvelope = { + code: 'local_resource_external_change', + documentId: session.documentId, + rootUri: session.rootUri || null, + path: session.resourcePath || '', + currentDiskVersion: nextConflictKey || null, + editorBaseVersion: session.conflictDetectionKey || session.fileVersion || null, + externalActor: 'external-editor', + dirtyState: session.dirty ? 'Dirty' : 'Clean', + message: '当前本地资源文件已在外部更新，请刷新或保存前先处理冲突', + suggestedActions: ['accept_disk', 'keep_editor', 'open_diff'], + }; + markSessionExternalConflict(session, session.lastExternalConflictEnvelope.message); + return; + } + session.currentTiptapDocument = nextTiptapDocument; + session.currentSerialized = nextSerialized; + session.lastPersistedSerialized = nextSerialized; + session.conflictDetectionKey = nextConflictKey; + session.fileVersion = nextConflictKey; + session.lastExternalConflictDetectionKey = nextConflictKey || ''; + session.dirty = false; + session.hasExternalConflict = false; + session.lastUserInputAt = 0; + sessionViews(session).forEach((view) => { + if (view.mountId != null) dispatchSessionContentToView(session, view, source || 'mnote-web-resource-watch'); + }); + setSessionStatus(session, 'synced-external-change'); + syncResourceSessionTabGuards(session); + }; + const refreshSessionFromExternalFileChange = async (session) => { if (session.sourceKind !== 'local_folder') return; await refreshSessionFromExternalChange(session, 'mnote-web-local-folder-watch'); @@ -1045,12 +1293,17 @@ export const createDocumentSessionRuntime = (dependencies = {}) => { if (!channel) { const url = new URL('/api/local-folder/events', window.location.origin); url.searchParams.set('rootUri', session.rootUri); - url.searchParams.set('documentId', session.documentId); + if (session.sessionKind === 'resource') { + url.searchParams.set('resourcePath', resourceWatchPath(session)); + } else { + url.searchParams.set('documentId', session.documentId); + } const eventSource = new EventSource(url.toString()); channel = { key: channelKey, rootUri: session.rootUri, documentId: session.documentId, + resourcePath: session.sessionKind === 'resource' ? resourceWatchPath(session) : '', eventSource, sessions: new Map(), }; @@ -1060,6 +1313,19 @@ export const createDocumentSessionRuntime = (dependencies = {}) => { Array.from(channel.sessions.values()).forEach((targetSession) => { if (!targetSession || targetSession.views.size === 0) return; const documentId = typeof payload.documentId === 'string' ? payload.documentId.trim() : ''; + const relativePath = typeof payload.relativePath === 'string' ? payload.relativePath.trim() : ''; + if (targetSession.sessionKind === 'resource') { + if (!relativePath || relativePath !== resourceWatchPath(targetSession)) return; + if (targetSession.saving) { + targetSession.externalChangePending = false; + targetSession.lastSelfSaveSignalAt = Date.now(); + return; + } + targetSession.lastExternalChangeSignalAt = Date.now(); + targetSession.externalChangePending = true; + scheduleSessionExternalRefresh(targetSession, 'mnote-web-local-resource-watch'); + return; + } if (!documentId) return; const eventKind = String(payload.eventKind || ''); const targetsCurrentDocument = Boolean(documentId && documentId === targetSession.documentId); @@ -1076,10 +1342,6 @@ export const createDocumentSessionRuntime = (dependencies = {}) => { } targetSession.lastExternalChangeSignalAt = Date.now(); targetSession.externalChangePending = true; - if (targetsCurrentDocument && (targetSession.hasExternalConflict || sessionHasRecentLocalInput(targetSession) || targetSession.dirty || targetSession.saveTimer || targetSession.saving)) { - markSessionExternalConflict(targetSession, externalConflictMessage); - return; - } scheduleSessionExternalRefresh(targetSession, 'mnote-web-local-folder-watch'); }); }); @@ -1277,11 +1539,67 @@ export const createDocumentSessionRuntime = (dependencies = {}) => { return scheduled; }; + const applyLocalUploadEditorSave = (detail) => { + const documentId = String(detail?.documentId || '').trim(); + const rootUri = String(detail?.rootUri || '').trim(); + const fileVersion = String(detail?.fileVersion || '').trim(); + const writeIntentId = String(detail?.writeIntentId || '').trim(); + const saveOperationId = String(detail?.saveOperationId || '').trim(); + const serialized = String(detail?.serialized || ''); + if (!documentId || !rootUri || !fileVersion) return 0; + let applied = 0; + Array.from(documentSessionRegistry.values()).forEach((session) => { + if (session.sourceKind !== 'local_folder') return; + if (session.documentId !== documentId) return; + if (String(session.rootUri || '').trim() !== rootUri) return; + if (session.saveTimer) { + window.clearTimeout(session.saveTimer); + session.saveTimer = 0; + } + session.conflictDetectionKey = fileVersion; + session.fileVersion = fileVersion; + session.lastExternalConflictDetectionKey = fileVersion; + if (writeIntentId) session.lastWriteIntentId = writeIntentId; + if (saveOperationId) session.lastSaveOperationId = saveOperationId; + if (session.latestAggregate && typeof session.latestAggregate === 'object') { + const nextAggregate = { ...session.latestAggregate }; + const nextBody = nextAggregate.body && typeof nextAggregate.body === 'object' + ? { ...nextAggregate.body } + : {}; + nextBody.fileVersion = fileVersion; + nextBody.conflictDetectionKey = fileVersion; + nextBody.conflict_detection_key = fileVersion; + nextAggregate.body = nextBody; + session.latestAggregate = nextAggregate; + syncPageAggregateScript(session, nextAggregate); + } + session.externalChangePending = false; + session.hasExternalConflict = false; + session.lastExternalConflictEnvelope = null; + session.bufferDirtyState = 'Clean'; + if (!serialized || serialized === session.currentSerialized) { + session.lastPersistedSerialized = session.currentSerialized; + session.dirty = false; + setSessionStatus(session, 'saved'); + } else { + session.dirty = true; + setSessionStatus(session, 'dirty'); + queueSessionSave(session); + } + syncResourceSessionTabGuards(session); + applied += 1; + }); + return applied; + }; + window.addEventListener('tree:delta', handleTreeExternalChange); window.addEventListener('tree:resync', handleTreeExternalChange); window.addEventListener('mnote:page-ai-tool-write-completed', (event) => { refreshDocumentSessionsFromExternalWrite(event?.detail || {}, 'mnote-hermes-tool'); }); + window.addEventListener('mnote:local-upload-editor-save-completed', (event) => { + applyLocalUploadEditorSave(event?.detail || {}); + }); const createDocumentSession = (runtimeDescriptor) => { const pageBody = runtimeDescriptor.aggregate.body || {}; @@ -1291,6 +1609,7 @@ export const createDocumentSessionRuntime = (dependencies = {}) => { const keyRevision = revisionFromConflictKey(conflictDetectionKey); const sourceKind = normalizeSessionSourceKind(runtimeDescriptor.bootstrap); const tiptapDocument = pageBodyTiptapDocument(pageBody, '', runtimeDescriptor.bootstrap); + const pageBodySource = pageBodyTiptapDocumentSource(pageBody, ''); const session = { key: buildDocumentSessionKey(runtimeDescriptor.bootstrap), documentId: runtimeDescriptor.bootstrap.documentId, @@ -1301,6 +1620,9 @@ export const createDocumentSessionRuntime = (dependencies = {}) => { pageAggregateScriptId: runtimeDescriptor.bootstrap.pageAggregateScriptId || '__MNOTE_PAGE_AGGREGATE__', latestAggregate: runtimeDescriptor.aggregate, title: runtimeDescriptor.aggregate.head?.title || '无标题', + pageBodySource, + projectionSource: String(pageBody.projectionSource || pageBody.projection_source || '').trim(), + blockProjectionVersion: String(pageBody.blockProjectionVersion || pageBody.block_projection_version || '').trim(), currentTiptapDocument: tiptapDocument, currentSerialized: JSON.stringify(tiptapDocument), lastPersistedSerialized: JSON.stringify(tiptapDocument), @@ -1308,6 +1630,8 @@ export const createDocumentSessionRuntime = (dependencies = {}) => { conflictDetectionKey, fileVersion: typeof pageBody.fileVersion === 'string' ? pageBody.fileVersion : conflictDetectionKey, lastExternalConflictDetectionKey: conflictDetectionKey || '', + relativePath: localMarkdownRelativePathFromDocumentId(runtimeDescriptor.bootstrap.documentId), + bufferDirtyState: 'Clean', readOnly: Boolean(permissions.readOnly), dirty: false, saving: false, @@ -1355,6 +1679,7 @@ export const createDocumentSessionRuntime = (dependencies = {}) => { markSessionExternalConflict, queueSessionSave, refreshSessionFromExternalChange, + ensureLocalFolderEventChannel, releaseDocumentSession, scheduleDocumentSessionRelease, sessionHasRecentExternalSignal, diff --git a/rust/crates/mnote-web/browser/document-tiptap-conversion-runtime.js b/rust/crates/mnote-web/browser/document-tiptap-conversion-runtime.js index 7dc20f9d..a13b6dc5 100644 --- a/rust/crates/mnote-web/browser/document-tiptap-conversion-runtime.js +++ b/rust/crates/mnote-web/browser/document-tiptap-conversion-runtime.js @@ -394,8 +394,18 @@ export const localizeTiptapAssetUrls = (node, context) => { return node; }; -export const pageBodyTiptapDocument = (body, fallbackText = '', context = null) => { +export const pageBodyTiptapDocumentSource = (body, fallbackText = '') => { if (String(body?.projectionSource || body?.projection_source || '') === 'local_markdown.content' && body?.content) { + return 'local_markdown.content'; + } + const blockDocument = body?.blockDocument || body?.block_document || body?.editorDocument || body?.editor_document || null; + if (blockDocument) return 'page_aggregate.block_document'; + if (body?.content) return 'compat.legacy_content'; + return fallbackText ? 'degraded.fallback_text' : 'empty'; +}; + +export const pageBodyTiptapDocument = (body, fallbackText = '', context = null) => { + if (pageBodyTiptapDocumentSource(body, fallbackText) === 'local_markdown.content') { return localizeTiptapAssetUrls(toTiptapDocument(body.content, fallbackText), context); } const blockDocument = body?.blockDocument || body?.block_document || body?.editorDocument || body?.editor_document || null; diff --git a/rust/crates/mnote-web/browser/filetree-context-menu-runtime.js b/rust/crates/mnote-web/browser/filetree-context-menu-runtime.js index 4721cd03..91076e19 100644 --- a/rust/crates/mnote-web/browser/filetree-context-menu-runtime.js +++ b/rust/crates/mnote-web/browser/filetree-context-menu-runtime.js @@ -1,7 +1,122 @@ // MNote 文件树上下文菜单运行时外置模块。 // 当前先承接 CommandContext 构造与 when 表达式求值，树语义仍由 Rust/kernel 主导。 +function commandContextResourceKindForRow(row) { + if (!(row instanceof HTMLElement)) return 'unknown'; + var rowKind = String(row.getAttribute('data-row-kind') || '').trim(); + var assetType = String(row.getAttribute('data-asset-type') || '').trim(); + var assetId = String(row.getAttribute('data-asset-id') || '').trim(); + if (rowKind === 'folder' || rowKind === 'directory' || rowKind === 'asset-folder') return 'folder'; + if (rowKind === 'document' || rowKind === 'index' || rowKind === 'markdown') return 'page'; + if (assetType) return assetType; + if (assetId) return 'asset'; + return rowKind || 'unknown'; +} + +function commandContextDirtyState(value) { + var state = String(value || '').trim(); + if (!state) return 'clean'; + var lowered = state.toLowerCase(); + if (lowered === 'dirty' || lowered === 'stale' || lowered === 'deleted') return lowered; + if (lowered === 'externalmodified' || lowered === 'external_modified' || lowered === 'external-change-conflict') return 'external_modified'; + if (lowered === 'hasexternalconflict' || lowered === 'has_external_conflict') return 'has_external_conflict'; + return lowered === 'clean' || lowered === 'saved' ? 'clean' : lowered; +} + +function commandContextIsDirtyState(value) { + return commandContextDirtyState(value) !== 'clean'; +} + +function commandContextEditorMatchesRow(editor, row) { + if (!editor || !(row instanceof HTMLElement)) return false; + var rowDocumentId = String(row.getAttribute('data-document-id') || row.getAttribute('data-doc-id') || '').trim(); + if (rowDocumentId && String(editor.documentId || '').trim() === rowDocumentId) return true; + var rowAssetId = String(row.getAttribute('data-asset-id') || '').trim(); + if (rowAssetId && String(editor.assetId || editor.workspacePath && editor.workspacePath.assetId || '').trim() === rowAssetId) return true; + var rowRelativePath = String(row.getAttribute('data-local-relative-path') || '').trim(); + var editorRelativePath = String(editor.workspacePath && (editor.workspacePath.relativePath || editor.workspacePath.localRelativePath) || '').trim(); + return Boolean(rowRelativePath && editorRelativePath && rowRelativePath === editorRelativePath); +} + +function commandContextDirtyStateForRows(rows, openEditorsSnapshot, bufferState) { + if (bufferState && typeof bufferState === 'object') { + var directState = bufferState.dirtyState || bufferState.state || bufferState.status || ''; + if (commandContextIsDirtyState(directState)) return commandContextDirtyState(directState); + } + var editors = []; + if (openEditorsSnapshot && Array.isArray(openEditorsSnapshot.editors)) editors = editors.concat(openEditorsSnapshot.editors); + if (openEditorsSnapshot && Array.isArray(openEditorsSnapshot.resourceEditors)) editors = editors.concat(openEditorsSnapshot.resourceEditors); + for (var r = 0; r < rows.length; r += 1) { + var row = rows[r]; + for (var i = 0; i < editors.length; i += 1) { + var editor = editors[i]; + if (!commandContextEditorMatchesRow(editor, row)) continue; + var editorState = editor.dirtyState || editor.dirtyGuard || ''; + if (commandContextIsDirtyState(editorState)) return commandContextDirtyState(editorState); + } + } + return 'clean'; +} + +function selectedRowsFromDeps(deps, fallbackRow) { + var selection = deps && deps.selection ? deps.selection : {}; + var rowIds = Array.isArray(selection.selectedRowIds) + ? selection.selectedRowIds + : Array.from(selection.selectedRowIds || []); + var rows = []; + var queryRowById = deps && typeof deps.queryRowById === 'function' + ? deps.queryRowById + : function() { return null; }; + for (var i = 0; i < rowIds.length; i += 1) { + var row = queryRowById(rowIds[i]); + if (row instanceof HTMLElement) rows.push(row); + } + if (!rows.length && fallbackRow instanceof HTMLElement) rows.push(fallbackRow); + return rows; +} + +function buildFileTreeCommandContext(row, openEditorsSnapshot, bufferState, deps) { + deps = deps || {}; + var rows = selectedRowsFromDeps(deps, row); + var resourceKinds = {}; + for (var j = 0; j < rows.length; j += 1) { + resourceKinds[commandContextResourceKindForRow(rows[j])] = true; + } + var rkKeys = Object.keys(resourceKinds); + var currentSourceKind = typeof deps.currentSourceKind === 'function' + ? deps.currentSourceKind + : function() { return ''; }; + var readonly = typeof deps.workspaceReadonly === 'function' + ? deps.workspaceReadonly() + : false; + var dirtyState = commandContextDirtyStateForRows(rows, openEditorsSnapshot, bufferState); + var editorDirty = commandContextIsDirtyState(dirtyState); + var targetKind = commandContextResourceKindForRow(row); + return { + 'workspace.sourceKind': currentSourceKind() || '', + 'workspace.readonly': readonly === true, + 'tree.focusKind': deps.focusKind || 'file_tree', + 'tree.selectionCount': rows.length, + 'tree.selectionResourceKind': rkKeys.length === 1 ? rkKeys[0] : rows.length ? 'mixed' : targetKind, + 'tree.targetResourceKind': targetKind, + 'tree.targetRowKind': row instanceof HTMLElement ? String(row.getAttribute('data-row-kind') || '').trim() : '', + 'tree.targetIsFolder': targetKind === 'folder', + 'tree.targetIsAsset': Boolean(row instanceof HTMLElement && String(row.getAttribute('data-asset-id') || '').trim()), + 'editor.dirty': editorDirty, + 'editor.dirtyState': dirtyState, + 'editor.hasSelection': Boolean(deps.editorHasSelection), + 'ai.canWrite': readonly !== true && !editorDirty, + }; +} + function buildSidebarFileTreeContext(kind, deps) { + var targetRow = deps && deps.targetRow instanceof HTMLElement ? deps.targetRow : null; + return buildFileTreeCommandContext(targetRow, deps && deps.openEditorsSnapshot, deps && deps.bufferState, Object.assign({}, deps || {}, { + focusKind: kind === 'filetree' ? 'file_tree' : kind === 'page' ? 'page_tree' : kind, + })); +} + +function buildLegacySidebarFileTreeContext(kind, deps) { var selection = deps && deps.selection ? deps.selection : {}; var rowIds = Array.isArray(selection.selectedRowIds) ? selection.selectedRowIds @@ -181,7 +296,9 @@ function tokenizeWhenExpression(expr) { } window.__mnoteFileTreeContextMenuRuntime = { + buildFileTreeCommandContext: buildFileTreeCommandContext, buildSidebarFileTreeContext: buildSidebarFileTreeContext, + buildLegacySidebarFileTreeContext: buildLegacySidebarFileTreeContext, evaluateSidebarFileTreeWhen: evaluateSidebarFileTreeWhen, tokenizeWhenExpression: tokenizeWhenExpression }; diff --git a/rust/crates/mnote-web/browser/filetree-keyboard-runtime.js b/rust/crates/mnote-web/browser/filetree-keyboard-runtime.js index cbe62329..ba08301e 100644 --- a/rust/crates/mnote-web/browser/filetree-keyboard-runtime.js +++ b/rust/crates/mnote-web/browser/filetree-keyboard-runtime.js @@ -42,6 +42,10 @@ function handleFileTreeKeyDown(event, deps) { if (event.key === 'F2') { event.preventDefault(); + var renameCtx = buildSidebarFileTreeContext('filetree', { targetRow: fileTreeRowForKey }); + if (!evaluateSidebarFileTreeWhen(renameCtx, '!workspace.readonly && !editor.dirty')) { + return true; + } beginFileTreeInlineRename(fileTreeRowForKey); return true; } @@ -61,6 +65,10 @@ function handleFileTreeKeyDown(event, deps) { } if (shortcutKey === 'v') { event.preventDefault(); + var pasteCtx = buildSidebarFileTreeContext('filetree', { targetRow: fileTreeRowForKey }); + if (!evaluateSidebarFileTreeWhen(pasteCtx, '!workspace.readonly')) { + return true; + } if (typeof deps.pasteSidebarFileTreeClipboard === 'function') { void deps.pasteSidebarFileTreeClipboard(fileTreeRowForKey); } @@ -70,8 +78,8 @@ function handleFileTreeKeyDown(event, deps) { if (event.key === 'Delete' || event.key === 'Backspace') { event.preventDefault(); - var delCtx = buildSidebarFileTreeContext('filetree'); - if (!evaluateSidebarFileTreeWhen(delCtx, '!workspace.readonly')) { + var delCtx = buildSidebarFileTreeContext('filetree', { targetRow: fileTreeRowForKey }); + if (!evaluateSidebarFileTreeWhen(delCtx, '!workspace.readonly && !editor.dirty')) { return true; } void deleteSelectedSidebarFileTreeRows(fileTreeRowForKey); diff --git a/rust/crates/mnote-web/browser/filetree-runtime.js b/rust/crates/mnote-web/browser/filetree-runtime.js index 59f01f6e..97b229b8 100644 --- a/rust/crates/mnote-web/browser/filetree-runtime.js +++ b/rust/crates/mnote-web/browser/filetree-runtime.js @@ -70,6 +70,57 @@ function fileTreeRowLocalUploadTargetRelativePath(row, deps) { return lastSlash >= 0 ? relativePath.slice(0, lastSlash) : ''; } +function parseObjectIdentityAttr(value) { + var raw = String(value || '').trim(); + if (!raw) return null; + try { + var parsed = JSON.parse(raw); + return parsed && typeof parsed === 'object' ? parsed : { raw: raw }; + } catch (_) { + return { raw: raw }; + } +} + +function readWorkspacePathFromRow(row, deps) { + if (!(row instanceof HTMLElement)) return null; + deps = deps || {}; + var currentSourceKind = typeof deps.currentSourceKind === 'function' ? deps.currentSourceKind : function() { return ''; }; + var currentRootUri = typeof deps.currentRootUri === 'function' ? deps.currentRootUri : function() { return ''; }; + var resolveWorkspaceId = typeof deps.resolveWorkspaceId === 'function' ? deps.resolveWorkspaceId : function() { return ''; }; + var rowTitle = typeof deps.rowTitle === 'function' ? deps.rowTitle : function(target) { + return String(target && target.textContent || '').trim(); + }; + var objectIdentityRaw = String(row.getAttribute('data-object-identity') || '').trim(); + var objectIdentity = parseObjectIdentityAttr(objectIdentityRaw); + var objectKind = String(row.getAttribute('data-object-kind') || (objectIdentity && objectIdentity.objectKind) || '').trim(); + var relativePath = fileTreeRowLocalRelativePath(row, deps); + var assetId = fileTreeRowAssetId(row, deps); + var documentId = fileTreeRowDocumentId(row); + var rowId = String(row.getAttribute('data-row-id') || '').trim(); + var rowKind = fileTreeRowKind(row); + var sourceKind = String(row.getAttribute('data-source-kind') || currentSourceKind() || '').trim(); + var rootUri = String(row.getAttribute('data-root-uri') || currentRootUri() || '').trim(); + return { + schema: 'mnote.workspace_path.v1', + workspaceId: String(row.getAttribute('data-workspace-id') || resolveWorkspaceId(row) || '').trim(), + sourceKind: sourceKind, + rootUri: rootUri, + relativePath: relativePath, + localRelativePath: relativePath, + objectIdentity: objectIdentity, + objectIdentityRaw: objectIdentityRaw, + objectKind: objectKind, + resourceKind: objectKind || rowKind, + rowId: rowId, + rowKind: rowKind, + documentId: documentId, + assetId: assetId, + title: rowTitle(row), + href: String(row.querySelector?.('.tree-link')?.getAttribute?.('href') || '').trim(), + isLocalFolder: sourceKind === 'local_folder' || (!sourceKind && (rowId.indexOf('local:') === 0 || documentId.indexOf('local-md:') === 0 || documentId.indexOf('local-dir:') === 0)) + }; +} + function isFileTreeDownloadableAssetRow(row, deps) { if (!(row instanceof HTMLElement)) return false; var kind = fileTreeRowKind(row); @@ -98,6 +149,7 @@ function fileTreeAssetDownloadDetail(row, deps) { rowKind: fileTreeRowKind(row), assetId: assetId, localRelativePath: relativePath, + workspacePath: readWorkspacePathFromRow(row, deps), title: title, fileName: title, workspaceId: resolveWorkspaceId(row) @@ -274,6 +326,49 @@ function revealFileTreeAssetRow(assetId, deps) { return true; } +function localUploadedAssetRelativePath(asset, deps) { + deps = deps || {}; + var direct = String(asset && (asset.rootRelativePath || asset.root_relative_path || asset.relativePath || asset.relative_path) || '').trim(); + if (direct) return direct; + var localFilePathFromAssetId = typeof deps.localFilePathFromAssetId === 'function' + ? deps.localFilePathFromAssetId + : function(assetId) { + var value = String(assetId || '').trim(); + return value.indexOf('local-file:') === 0 + ? value.slice('local-file:'.length) + : value.indexOf('local:asset:') === 0 + ? value.slice('local:asset:'.length) + : ''; + }; + return localFilePathFromAssetId(String(asset && asset.id || '').trim()); +} + +function parentRelativePathForUploadedAsset(asset, relativePath) { + var target = String(asset && (asset.targetRelativePath || asset.target_relative_path) || '').trim(); + if (target || Object.prototype.hasOwnProperty.call(asset || {}, 'targetRelativePath')) return target; + var normalized = String(relativePath || '').trim().replace(/^\/+|\/+$/g, ''); + var lastSlash = normalized.lastIndexOf('/'); + return lastSlash >= 0 ? normalized.slice(0, lastSlash) : ''; +} + +function findLocalFileTreeParentRowForAsset(asset, relativePath, deps) { + deps = deps || {}; + var cssEscape = typeof deps.cssEscape === 'function' ? deps.cssEscape : function(value) { return String(value).replace(/["\\]/g, '\\$&'); }; + var currentSourceKind = typeof deps.currentSourceKind === 'function' ? deps.currentSourceKind : function() { return ''; }; + if (currentSourceKind() !== 'local_folder') return null; + var parentRelativePath = parentRelativePathForUploadedAsset(asset, relativePath); + var selector = '#sidebar-file-tree-root .tree-row[data-shell-mode="filetree"][data-local-relative-path="' + cssEscape(parentRelativePath) + '"]'; + if (parentRelativePath) { + var parentRow = document.querySelector(selector); + if (parentRow instanceof HTMLElement) return parentRow; + } + if (!parentRelativePath) { + var root = document.querySelector('#sidebar-file-tree-root .tree-root'); + return root instanceof HTMLElement ? null : null; + } + return null; +} + function appendUploadedAssetRow(asset, documentId, deps) { deps = deps || {}; var cssEscape = typeof deps.cssEscape === 'function' ? deps.cssEscape : function(value) { return String(value).replace(/["\\]/g, '\\$&'); }; @@ -295,8 +390,10 @@ function appendUploadedAssetRow(asset, documentId, deps) { if (!objectKind && (String(asset && (asset.asset_type || asset.assetType) || '').trim() === 'mindmap' || /\.mindmap\.json$/i.test(assetId))) { objectKind = 'mindmap'; } - var targetDocumentId = String(documentId || asset.document_id || asset.documentId || currentDocumentId() || '').trim(); - var parentRow = targetDocumentId + var localRelativePath = localUploadedAssetRelativePath(asset, deps); + var targetDocumentId = String(documentId || asset.document_id || asset.documentId || asset.ownerDocumentId || currentDocumentId() || '').trim(); + var parentRow = findLocalFileTreeParentRowForAsset(asset, localRelativePath, deps); + if (!parentRow) parentRow = targetDocumentId ? document.querySelector('.tree-row[data-shell-mode="filetree"][data-row-id="' + cssEscape('doc:' + targetDocumentId) + '"]') : null; if (!parentRow && currentSourceKind() === 'local_folder' && objectKind === 'mindmap') return false; @@ -325,16 +422,20 @@ function appendUploadedAssetRow(asset, documentId, deps) { objectKind: objectKind || 'attachment', documentId: targetDocumentId || null, blockId: null, - assetId: assetId + assetId: assetId, + rootUri: String(asset && (asset.rootUri || asset.root_uri) || '').trim() || null, + relativePath: localRelativePath || null }; li.setAttribute('data-node-id', 'asset:' + assetId); var title = uploadedAssetTitle(asset); var iconKind = fileTreeIconKindForFileName(title) || uploadedAssetType(asset) || 'file'; if (objectKind === 'mindmap') iconKind = 'mindmap'; + var ownerDocumentId = String(asset && (asset.ownerDocumentId || asset.owner_document_id) || targetDocumentId || '').trim(); + var rootUri = String(asset && (asset.rootUri || asset.root_uri) || '').trim(); li.innerHTML = - '' + '' + + '' + '' + '
' + '
' + @@ -2146,7 +2734,7 @@ export function createSidebarPageAiRuntime(context) { '
' + '' + '' + '
' + @@ -2154,7 +2742,10 @@ export function createSidebarPageAiRuntime(context) { '
' + '
' + '
' + - '' + + '
' + + '
' + + '
' + + '' + '
' + '' + '' + @@ -2308,6 +2899,8 @@ export function createSidebarPageAiRuntime(context) { } function openPageAiDrawer() { + pageUiState.pageAiAgentId = pageAiCurrentAgentId(); + pageAiEnsureContextRefState(); pageAiLoadSessions(); renderPageAiSuggestions(); renderPageAiConversation(); @@ -2323,6 +2916,8 @@ export function createSidebarPageAiRuntime(context) { pageAiLoadSkills(), pageAiLoadTools(), pageAiLoadGatewayHealth(), + pageAiLoadAiPreferences(), + pageAiLoadAllowedRoots(), pageAiLoadBackendSessions() ]).then(function() { renderPageAiControls(); @@ -2335,7 +2930,7 @@ export function createSidebarPageAiRuntime(context) { }).catch(function(error) { pageUiState.pageAiMessages.push({ role: 'assistant', - content: 'Hermes 当前不可用：' + (error instanceof Error ? error.message : String(error)) + content: '当前 AI 不可用：' + (error instanceof Error ? error.message : String(error)) }); renderPageAiConversation(); renderPageAiControls(); @@ -2447,7 +3042,7 @@ export function createSidebarPageAiRuntime(context) { }); } - async function pageAiTryBlockEditWorkflow(prompt, scopedContext) { + async function pageAiTryBlockEditWorkflow(prompt, scopedContext, runTargetSnapshot) { if (currentSourceKind() === 'local_folder') return false; if (!pageAiLooksLikeBlockEdit(prompt)) return false; var runId = 'page-ai-fast-' + Date.now().toString(36); @@ -2469,6 +3064,8 @@ export function createSidebarPageAiRuntime(context) { model: pageAiMnoteToolModel(), message: prompt, pageContext: scopedContext.pageContext, + editorTarget: scopedContext.editorTarget, + runTargetSnapshot: runTargetSnapshot || null, selectedBlockId: scopedContext.selectedBlockId, selectedText: scopedContext.selectedText, traceId: traceId @@ -2539,6 +3136,18 @@ export function createSidebarPageAiRuntime(context) { renderPageAiControls(); var contextSnapshot = currentPageAiContextSnapshot(); var scopedContext = pageAiScopedPageContext(contextSnapshot); + assertPageAiTargetInCurrentWorkspace(scopedContext.editorTarget); + await assertPageAiTargetWritable(scopedContext.editorTarget); + var runTargetSnapshot = pageAiBuildRunTargetSnapshot(scopedContext, prompt); + if (currentSourceKind() === 'local_folder' && !pageAiNormalizeArray(pageUiState.pageAiAllowedRoots).length) { + await pageAiLoadAllowedRoots(); + } + var contextRefs = pageAiBuildContextRefs(scopedContext, runTargetSnapshot); + var allowedRoots = pageAiBuildAllowedRoots(); + if (scopedContext.pageContext && scopedContext.pageContext.aiContext) { + scopedContext.pageContext.aiContext.runTargetSnapshot = runTargetSnapshot; + } + var requestPageContext = pageAiPageContextForRefs(scopedContext.pageContext, contextRefs); pageUiState.pageAiMessages.push({ role: 'user', content: prompt }); currentSession = pageAiCurrentSession(); if (currentSession) { @@ -2550,7 +3159,7 @@ export function createSidebarPageAiRuntime(context) { } pageAiPersistSessions(); renderPageAiConversation(); - if (!allowQueue && await pageAiTryBlockEditWorkflow(prompt, scopedContext)) { + if (!allowQueue && await pageAiTryBlockEditWorkflow(prompt, scopedContext, runTargetSnapshot)) { return; } var response = await fetch('/api/hermes/client/runs', { @@ -2561,15 +3170,20 @@ export function createSidebarPageAiRuntime(context) { documentId: currentDocumentId(), sourceKind: currentSourceKind(), rootUri: currentRootUri(), + agentId: pageAiCurrentAgentId(), sessionId: pageUiState.pageAiActiveSessionId, profile: pageAiRunProfile(), acpRuntime: pageUiState.pageAiAcpRuntime || 'reasonix', contextScope: pageUiState.pageAiContextScope, + contextRefs: contextRefs, + allowedRoots: allowedRoots, message: prompt, model: pageAiMnoteToolModel(), - pageContext: scopedContext.pageContext, + pageContext: requestPageContext, + editorTarget: scopedContext.editorTarget, + runTargetSnapshot: runTargetSnapshot, selectedBlockId: scopedContext.selectedBlockId, - selectedText: scopedContext.selectedText, + selectedText: pageAiContextKindsFromRefs(contextRefs).selection ? scopedContext.selectedText : '', traceId: 'page-ai-run-' + Date.now().toString(36) }) }); @@ -2581,7 +3195,7 @@ export function createSidebarPageAiRuntime(context) { if (pageAiApplyQueuedRun(runPayload)) { pageUiState.pageAiMessages.push({ role: 'assistant', - content: '已加入 Hermes 队列，前一条 run 完成后继续处理。' + content: '已加入 AI 队列，前一条 run 完成后继续处理。' }); if (currentSession) { currentSession.messages = pageUiState.pageAiMessages.slice(); @@ -2600,6 +3214,11 @@ export function createSidebarPageAiRuntime(context) { if (!runId) throw new Error('hermes_run_missing_run_id'); var runTraceId = String((upstream && (upstream.trace_id || upstream.traceId)) || (runPayload && (runPayload.trace_id || runPayload.traceId)) || ''); pageAiSetRunStatus('running', runId); + pageAiSetRunTargetSnapshot(Object.assign({}, runTargetSnapshot, { + runId: runId, + sessionId: pageUiState.pageAiActiveSessionId, + traceId: runTraceId + })); renderPageAiControls(); var eventResponse = await fetch('/api/hermes/client/events/' + encodeURIComponent(runId), { headers: { 'accept': 'text/event-stream' } @@ -2663,7 +3282,15 @@ export function createSidebarPageAiRuntime(context) { if (completedSession) completedSession.usage = completed.usage; } var agentAudit = completed && completed.agentAudit && typeof completed.agentAudit === 'object' ? completed.agentAudit : null; - var changedFiles = pageAiNormalizeArray(agentAudit && agentAudit.changedFiles); + var changedFiles = pageAiNormalizeArray(agentAudit && agentAudit.changedFiles).map(function(file) { + if (!file || typeof file !== 'object') return file; + return Object.assign({ + actorId: String(agentAudit && agentAudit.actorId || ''), + actorType: String(agentAudit && agentAudit.actorType || ''), + agentKind: String(agentAudit && agentAudit.agentKind || ''), + runId: runId + }, file); + }); if (changedFiles.length) { pageUiState.pageAiMessages.push({ role: 'tool', @@ -2672,7 +3299,9 @@ export function createSidebarPageAiRuntime(context) { toolName: 'agent.changed_files', toolKind: 'audit', status: 'completed', - argsSummary: String(agentAudit.rootUri || ''), + argsSummary: [agentAudit.rootUri, agentAudit.actorId, agentAudit.agentKind].map(function(value) { + return String(value || '').trim(); + }).filter(Boolean).join(' · '), resultSummary: String(agentAudit.diffSummary || changedFiles.length + ' changed file(s)'), changedFiles: changedFiles, traceId: runTraceId, @@ -2706,7 +3335,7 @@ export function createSidebarPageAiRuntime(context) { if (eventName === 'run.failed') { try { var failed = JSON.parse(payloadText || 'null'); - assistantText = String((failed && (failed.message || failed.code || failed.error)) || 'Hermes run failed'); + assistantText = String((failed && (failed.message || failed.code || failed.error)) || 'AI run failed'); } catch (_) {} pageAiSetRunStatus('failed', runId); } @@ -2770,7 +3399,7 @@ export function createSidebarPageAiRuntime(context) { pageAiSetRunStatus('failed'); pageUiState.pageAiMessages.push({ role: 'assistant', - content: 'Hermes 当前请求失败：' + (error instanceof Error ? error.message : String(error)) + content: 'AI 当前请求失败：' + (error instanceof Error ? error.message : String(error)) }); currentSession = pageAiCurrentSession(); if (currentSession) { @@ -2819,6 +3448,9 @@ export function createSidebarPageAiRuntime(context) { pageAiLoadSkills: (...args) => pageAiLoadSkills(...args), pageAiSwitchProfile: (...args) => pageAiSwitchProfile(...args), pageAiSetContextScope: (...args) => pageAiSetContextScope(...args), + pageAiSetAgentId: (...args) => pageAiSetAgentId(...args), + pageAiToggleContextRef: (...args) => pageAiToggleContextRef(...args), + pageAiLoadAllowedRoots: (...args) => pageAiLoadAllowedRoots(...args), updatePageAiTriggerState: (...args) => updatePageAiTriggerState(...args) }; } diff --git a/rust/crates/mnote-web/browser/sidebar-page-settings-runtime.js b/rust/crates/mnote-web/browser/sidebar-page-settings-runtime.js index 5f363a1f..0370e112 100644 --- a/rust/crates/mnote-web/browser/sidebar-page-settings-runtime.js +++ b/rust/crates/mnote-web/browser/sidebar-page-settings-runtime.js @@ -11,6 +11,25 @@ export function createSidebarPageSettingsRuntime(context) { searchText, } = context; const MNOTE_GLOBAL_SHOW_HEADING_NUMBERS_KEY = context.globalShowHeadingNumbersKey || 'mnote.global.showHeadingNumbers'; + const PAGE_WIDTH_TYPES = ['default', 'markdown', 'word', 'pdf', 'excel', 'ppt', 'mindmap']; + const PAGE_WIDTH_LABELS = { + default: '默认', + markdown: 'Markdown', + word: 'Word', + pdf: 'PDF', + excel: 'Excel', + ppt: 'PPT', + mindmap: 'Mindmap' + }; + const DEFAULT_PAGE_WIDTH_PREFERENCES = { + default: { mode: 'comfortable', resolvedMode: 'comfortable', cssMaxWidth: '980px', source: 'system' }, + markdown: { mode: 'readable', resolvedMode: 'readable', cssMaxWidth: '760px', source: 'system' }, + word: { mode: 'wide', resolvedMode: 'wide', cssMaxWidth: '1180px', source: 'system' }, + pdf: { mode: 'wide', resolvedMode: 'wide', cssMaxWidth: '1180px', source: 'system' }, + excel: { mode: 'full', resolvedMode: 'full', cssMaxWidth: 'none', source: 'system' }, + ppt: { mode: 'wide', resolvedMode: 'wide', cssMaxWidth: '1180px', source: 'system' }, + mindmap: { mode: 'full', resolvedMode: 'full', cssMaxWidth: 'none', source: 'system' } + }; function defaultPageOptions() { return { @@ -44,6 +63,93 @@ export function createSidebarPageSettingsRuntime(context) { return pageUiState.pageOptions; } + function currentPageWidthPreferences() { + return Object.assign({}, DEFAULT_PAGE_WIDTH_PREFERENCES, pageUiState.pageWidthPreferences || {}); + } + + function pageWidthModeLabel(mode) { + if (mode === 'inherit') return '继承默认'; + if (mode === 'readable') return '阅读'; + if (mode === 'comfortable') return '舒适'; + if (mode === 'wide') return '宽版'; + if (mode === 'full') return '全宽'; + return '舒适'; + } + + function normalizePageWidthPreferences(value) { + var input = value && typeof value === 'object' ? value : {}; + var output = {}; + PAGE_WIDTH_TYPES.forEach(function(type) { + var base = DEFAULT_PAGE_WIDTH_PREFERENCES[type]; + var current = input[type] && typeof input[type] === 'object' ? input[type] : {}; + var mode = String(current.mode || base.mode || 'comfortable'); + var resolvedMode = String(current.resolvedMode || current.resolved_mode || (mode === 'inherit' ? (input.default && input.default.resolvedMode) || 'comfortable' : mode)); + output[type] = { + mode: mode, + custom: current.custom || null, + resolvedMode: resolvedMode, + resolvedCustom: current.resolvedCustom || current.resolved_custom || null, + cssMaxWidth: String(current.cssMaxWidth || current.css_max_width || pageWidthCssMaxWidth(resolvedMode)), + source: String(current.source || base.source || 'system') + }; + }); + return output; + } + + function pageWidthCssMaxWidth(mode) { + if (mode === 'readable') return '760px'; + if (mode === 'comfortable') return '980px'; + if (mode === 'wide') return '1180px'; + if (mode === 'full') return 'none'; + return '980px'; + } + + function markdownPageWidthPreference(options) { + var preferences = currentPageWidthPreferences(); + var markdown = preferences.markdown || DEFAULT_PAGE_WIDTH_PREFERENCES.markdown; + if (markdown.source === 'system' && options && options.wideLayout) { + return { + mode: 'comfortable', + resolvedMode: 'comfortable', + cssMaxWidth: '980px', + source: 'wideLayout' + }; + } + return markdown; + } + + function activeResourceWidthType() { + var raw = document.documentElement.getAttribute('data-mnote-active-resource-width-type') || ''; + var type = String(raw).trim(); + if (type === 'sheet') return 'excel'; + if (PAGE_WIDTH_TYPES.indexOf(type) >= 0 && type !== 'default') return type; + return ''; + } + + function activeResourceWidthPreference(options) { + var type = activeResourceWidthType(); + if (!type || type === 'markdown') return markdownPageWidthPreference(options); + var preferences = currentPageWidthPreferences(); + return preferences[type] || DEFAULT_PAGE_WIDTH_PREFERENCES[type] || DEFAULT_PAGE_WIDTH_PREFERENCES.default; + } + + function notifyPageWidthPreferenceChanged(type) { + var detail = { + type: String(type || ''), + preferences: currentPageWidthPreferences() + }; + window.dispatchEvent(new CustomEvent('mnote:page-width-preference-changed', { detail: detail })); + document.querySelectorAll('iframe.mnote-resource-tab-frame').forEach(function(frame) { + if (!(frame instanceof HTMLIFrameElement) || !frame.contentWindow) return; + try { + frame.contentWindow.postMessage({ + type: 'mnote:page-width-preference-changed', + contentType: detail.type + }, window.location.origin); + } catch (_) {} + }); + } + function readGlobalShowHeadingNumbers() { return Boolean(currentPageOptions().showHeadingNumbers); } @@ -157,13 +263,19 @@ export function createSidebarPageSettingsRuntime(context) { var editorRoot = document.querySelector('[data-testid="mnote-leptos-tiptap-island-editor-root"]'); var editorSurface = editorRoot && editorRoot.querySelector('.editor-surface'); if (shell instanceof HTMLElement) { + var widthPreference = activeResourceWidthPreference(options); + var cssMaxWidth = String(widthPreference.cssMaxWidth || pageWidthCssMaxWidth(widthPreference.resolvedMode)); shell.setAttribute('data-page-wide-layout', String(Boolean(options.wideLayout))); + shell.setAttribute('data-page-width-content-type', activeResourceWidthType() || 'markdown'); + shell.setAttribute('data-page-width-mode', String(widthPreference.mode || 'readable')); + shell.setAttribute('data-page-width-resolved-mode', String(widthPreference.resolvedMode || widthPreference.mode || 'readable')); + shell.setAttribute('data-page-width-source', String(widthPreference.source || 'system')); shell.setAttribute('data-page-small-text', String(Boolean(options.smallText))); shell.setAttribute('data-layout-density', String(options.layoutDensity || 'normal')); shell.setAttribute('data-page-font', String(options.pageFont || 'default')); shell.setAttribute('data-page-show-heading-numbers', String(showHeadingNumbers)); shell.style.width = '100%'; - shell.style.maxWidth = options.wideLayout ? '980px' : '760px'; + shell.style.maxWidth = cssMaxWidth === 'none' ? 'none' : cssMaxWidth; } if (editorRoot instanceof HTMLElement) { editorRoot.setAttribute('data-page-wide-layout', String(Boolean(options.wideLayout))); @@ -177,6 +289,10 @@ export function createSidebarPageSettingsRuntime(context) { editorSurface.setAttribute('data-show-heading-numbers', String(showHeadingNumbers)); } document.documentElement.setAttribute('data-page-wide-layout', String(Boolean(options.wideLayout))); + var rootWidthPreference = activeResourceWidthPreference(options); + document.documentElement.setAttribute('data-page-width-content-type', activeResourceWidthType() || 'markdown'); + document.documentElement.setAttribute('data-page-width-mode', String(rootWidthPreference.mode || 'readable')); + document.documentElement.setAttribute('data-page-width-resolved-mode', String(rootWidthPreference.resolvedMode || rootWidthPreference.mode || 'readable')); document.documentElement.setAttribute('data-page-small-text', String(Boolean(options.smallText))); document.documentElement.setAttribute('data-layout-density', String(options.layoutDensity || 'normal')); document.documentElement.setAttribute('data-page-font', String(options.pageFont || 'default')); @@ -235,11 +351,58 @@ export function createSidebarPageSettingsRuntime(context) { ''; } + function createPageWidthSelectRow(type) { + var options = type === 'default' + ? [ + ['readable', '阅读'], + ['comfortable', '舒适'], + ['wide', '宽版'], + ['full', '全宽'] + ] + : [ + ['inherit', '继承默认'], + ['readable', '阅读'], + ['comfortable', '舒适'], + ['wide', '宽版'], + ['full', '全宽'] + ]; + return '' + + ''; + } + + function createPageWidthRows() { + return '' + + '
页面宽度
' + + PAGE_WIDTH_TYPES.map(createPageWidthSelectRow).join(''); + } + function renderGlobalOptions(popover) { var globalHeadingNumbers = readGlobalShowHeadingNumbers(); popover.querySelectorAll('[data-global-option-checkbox="showHeadingNumbers"]').forEach(function(input) { input.checked = globalHeadingNumbers; }); + var preferences = currentPageWidthPreferences(); + popover.querySelectorAll('[data-page-width-select]').forEach(function(select) { + var type = select.getAttribute('data-page-width-select') || ''; + var preference = preferences[type] || DEFAULT_PAGE_WIDTH_PREFERENCES[type] || DEFAULT_PAGE_WIDTH_PREFERENCES.default; + select.value = String(preference.mode || 'comfortable'); + }); + popover.querySelectorAll('[data-page-width-hint]').forEach(function(node) { + var type = node.getAttribute('data-page-width-hint') || ''; + var preference = preferences[type] || DEFAULT_PAGE_WIDTH_PREFERENCES[type] || DEFAULT_PAGE_WIDTH_PREFERENCES.default; + var resolvedMode = String(preference.resolvedMode || preference.mode || 'comfortable'); + node.textContent = pageWidthModeLabel(resolvedMode) + ' · ' + String(preference.cssMaxWidth || pageWidthCssMaxWidth(resolvedMode)); + }); } function createPageFontRow() { @@ -410,6 +573,7 @@ export function createSidebarPageSettingsRuntime(context) { '
' + '' + '
' + '' + @@ -657,6 +821,71 @@ export function createSidebarPageSettingsRuntime(context) { } } + async function loadPageWidthPreferences() { + if (!currentDocumentId()) return; + var params = new URLSearchParams(); + params.set('documentId', currentDocumentId()); + params.set('workspaceId', resolveWorkspaceId(document.body)); + var sourcePayload = currentWorkspaceSourcePayload(); + Object.keys(sourcePayload || {}).forEach(function(key) { + if (sourcePayload[key] != null && sourcePayload[key] !== '') params.set(key, sourcePayload[key]); + }); + try { + var response = await fetch('/api/ui/preferences/effective?' + params.toString(), { + headers: { accept: 'application/json' } + }); + var payload = await response.json().catch(function(){ return null; }); + if (!response.ok || !payload || payload.ok !== true) return; + pageUiState.pageWidthPreferences = normalizePageWidthPreferences(payload.result && payload.result.pageWidthPreferences); + applyPageOptionsToShell(); + if (isPageSettingsOpen()) renderPageSettingsPopover(); + } catch (_) {} + } + + async function persistPageWidthPreference(type, mode) { + if (PAGE_WIDTH_TYPES.indexOf(type) < 0) return; + var previous = pageUiState.pageWidthPreferences; + var next = normalizePageWidthPreferences(previous); + next[type] = Object.assign({}, next[type], { + mode: mode, + resolvedMode: mode === 'inherit' ? next.default.resolvedMode : mode, + cssMaxWidth: pageWidthCssMaxWidth(mode === 'inherit' ? next.default.resolvedMode : mode), + source: 'optimistic' + }); + pageUiState.pageWidthPreferences = next; + applyPageOptionsToShell(); + renderPageSettingsPopover(); + notifyPageWidthPreferenceChanged(type); + try { + var updates = {}; + updates['pageWidth.' + type] = { mode: mode, custom: null }; + var response = await fetch('/api/ui/preferences', { + method: 'PUT', + headers: { 'content-type': 'application/json' }, + body: JSON.stringify({ + documentId: currentDocumentId(), + workspaceId: resolveWorkspaceId(document.body), + ...currentWorkspaceSourcePayload(), + updates: updates + }) + }); + var payload = await response.json().catch(function(){ return null; }); + if (!response.ok || !payload || payload.ok !== true) { + throw new Error(payload && payload.error && payload.error.message ? payload.error.message : 'page_width_save_failed_' + response.status); + } + pageUiState.pageWidthPreferences = normalizePageWidthPreferences(payload.result && payload.result.pageWidthPreferences); + applyPageOptionsToShell(); + renderPageSettingsPopover(); + notifyPageWidthPreferenceChanged(type); + document.documentElement.setAttribute('data-mnote-page-width-saved', 'true'); + } catch (error) { + pageUiState.pageWidthPreferences = previous; + applyPageOptionsToShell(); + renderPageSettingsPopover(); + document.documentElement.setAttribute('data-mnote-page-width-error', error instanceof Error ? error.message : String(error)); + } + } + function isPageSettingsOpen() { var popover = document.querySelector('[data-testid="wolai-page-settings-popover"]'); return popover instanceof HTMLElement && !popover.hidden; @@ -684,6 +913,10 @@ export function createSidebarPageSettingsRuntime(context) { else openPageSettingsPopover(); } + window.addEventListener('mnote:active-resource-tab-changed', function() { + applyPageOptionsToShell(); + }); + return { applyPageOptionsToShell, closePageHistoryDrawer, @@ -700,11 +933,13 @@ export function createSidebarPageSettingsRuntime(context) { openPageShareDialog, pageOptionIsSupported, persistPageOptionsPatch, + persistPageWidthPreference, recordPageHistorySnapshot, renderPageSettingsPopover, setActivePageSettingsTab, togglePageSettingsPopover, updatePageSettingsTriggerState, writeGlobalShowHeadingNumbers, + loadPageWidthPreferences, }; } diff --git a/rust/crates/mnote-web/browser/sidebar-page-tree-runtime.js b/rust/crates/mnote-web/browser/sidebar-page-tree-runtime.js index bd30693a..56052569 100644 --- a/rust/crates/mnote-web/browser/sidebar-page-tree-runtime.js +++ b/rust/crates/mnote-web/browser/sidebar-page-tree-runtime.js @@ -67,7 +67,7 @@ export const createSidebarPageTreeRuntime = (dependencies = {}) => { window.__mnoteDocumentPaneRuntime.openPrimaryDocument({ documentId: nodeId, workspaceId: workspaceId || '', - sourceKind: targetUrl.searchParams.get('sourceKind') || 'convex_workspace', + sourceKind: targetUrl.searchParams.get('sourceKind') || 'local_folder', rootUri: targetUrl.searchParams.get('rootUri') || '', url: targetUrl, }).then(function(){ diff --git a/rust/crates/mnote-web/browser/sidebar-tree-live-apply-runtime.js b/rust/crates/mnote-web/browser/sidebar-tree-live-apply-runtime.js index 33c914b6..56ad0f76 100644 --- a/rust/crates/mnote-web/browser/sidebar-tree-live-apply-runtime.js +++ b/rust/crates/mnote-web/browser/sidebar-tree-live-apply-runtime.js @@ -418,11 +418,32 @@ export const createSidebarTreeLiveApplyRuntime = (dependencies = {}) => { function applyLocalFolderWatchBatch(payload) { var batch = payload && (payload.payload || payload); + if (batch && (batch.fallbackResync === true || batch.requiresResync === true)) { + document.documentElement.setAttribute('data-mnote-local-folder-watch-batch-fallback', String(batch.revision || 'resync')); + void refreshLocalFolderSidebarSnapshot(); + return true; + } var affectedParents = Array.isArray(batch && batch.affectedParents) ? batch.affectedParents : Array.isArray(batch && batch.affected_parents) ? batch.affected_parents : []; + if (!affectedParents.length) { + var changedPaths = Array.isArray(batch && batch.changedPaths) + ? batch.changedPaths + : Array.isArray(batch && batch.changed_paths) + ? batch.changed_paths + : []; + affectedParents = changedPaths.map(function(item) { + var relativePath = String(item && (item.relativePath || item.relative_path) || '').trim(); + return { relativePath: parentRelativePathForPath(relativePath), reason: 'derived-from-changed-path' }; + }).filter(function(parent, index, list) { + return index === list.findIndex(function(candidate) { return candidate.relativePath === parent.relativePath; }); + }); + if (affectedParents.length) { + document.documentElement.setAttribute('data-mnote-local-folder-watch-batch-derived-parents', String(affectedParents.length)); + } + } if (!affectedParents.length) { setTreeLiveApplyError('local_folder_watch_batch_missing_affected_parents'); return false; @@ -663,7 +684,7 @@ export const createSidebarTreeLiveApplyRuntime = (dependencies = {}) => { return { userId: currentActorStorageId(), workspaceId: String(currentWorkspaceId() || '').trim() || (rootUri ? 'local:' + rootUri.replace(/^file:\/\//, '').replace(/[^A-Za-z0-9]+/g, '_') : 'default'), - sourceKind: String(currentSourceKind() || 'convex_workspace').trim() || 'convex_workspace', + sourceKind: String(currentSourceKind() || 'local_folder').trim() || 'local_folder', treeKind: normalizedTreeKind, rootUri: rootUri, scope: scope @@ -685,7 +706,7 @@ export const createSidebarTreeLiveApplyRuntime = (dependencies = {}) => { return SIDEBAR_TREE_VIEW_STATE_KEY .replace('{userId}', encodeURIComponent(scope.userId || 'anonymous')) .replace('{workspaceId}', encodeURIComponent(scope.workspaceId || 'default')) - .replace('{sourceKind}', encodeURIComponent(scope.sourceKind || 'convex_workspace')) + .replace('{sourceKind}', encodeURIComponent(scope.sourceKind || 'local_folder')) .replace('{treeKind}', encodeURIComponent(scope.treeKind || 'filetree')) .replace('{rootUriHash}', stableTreeViewStateHash(scope.rootUri || '')) .replace('{scopeHash}', stableTreeViewStateHash(scope.scope || 'root')); diff --git a/rust/crates/mnote-web/browser/sidebar-tree-runtime.js b/rust/crates/mnote-web/browser/sidebar-tree-runtime.js index 22187a81..dd24a779 100644 --- a/rust/crates/mnote-web/browser/sidebar-tree-runtime.js +++ b/rust/crates/mnote-web/browser/sidebar-tree-runtime.js @@ -29,6 +29,7 @@ import { createSidebarPageSettingsRuntime } from './sidebar-page-settings-runtim var activeTreeContextMenu = null; var pageUiState = { pageOptions: null, + pageWidthPreferences: null, historySnapshots: [], pageSettingsOpen: false, pageAiOpen: false, @@ -244,12 +245,14 @@ import { createSidebarPageSettingsRuntime } from './sidebar-page-settings-runtim const openPageShareDialog = (...args) => sidebarPageSettings.openPageShareDialog(...args); const pageOptionIsSupported = (...args) => sidebarPageSettings.pageOptionIsSupported(...args); const persistPageOptionsPatch = (...args) => sidebarPageSettings.persistPageOptionsPatch(...args); + const persistPageWidthPreference = (...args) => sidebarPageSettings.persistPageWidthPreference(...args); const recordPageHistorySnapshot = (...args) => sidebarPageSettings.recordPageHistorySnapshot(...args); const renderPageSettingsPopover = (...args) => sidebarPageSettings.renderPageSettingsPopover(...args); const setActivePageSettingsTab = (...args) => sidebarPageSettings.setActivePageSettingsTab(...args); const togglePageSettingsPopover = (...args) => sidebarPageSettings.togglePageSettingsPopover(...args); const updatePageSettingsTriggerState = (...args) => sidebarPageSettings.updatePageSettingsTriggerState(...args); const writeGlobalShowHeadingNumbers = (...args) => sidebarPageSettings.writeGlobalShowHeadingNumbers(...args); + const loadPageWidthPreferences = (...args) => sidebarPageSettings.loadPageWidthPreferences(...args); function setCommandPending(trigger, pending) { if (!(trigger instanceof HTMLElement)) return; @@ -413,6 +416,57 @@ import { createSidebarPageSettingsRuntime } from './sidebar-page-settings-runtim return root instanceof HTMLElement ? String(root.getAttribute('data-mnote-filetree-scope') || '').trim() : ''; } + function recordNavigationRecent(payload) { + var body = Object.assign({ + sourceKind: currentSourceKind() || 'local_folder', + rootUri: currentRootUri() || '', + }, payload || {}); + if (!body.kind || !body.rootUri || !body.title) return Promise.resolve(false); + return fetch('/api/navigation/recent', { + method: 'POST', + credentials: 'include', + headers: { + accept: 'application/json', + 'content-type': 'application/json' + }, + body: JSON.stringify(body) + }).then(function(response) { + return response.ok; + }).catch(function(error) { + console.warn('[mnote navigation] record recent failed', error); + return false; + }); + } + + function openNavigationPageForFolder(rootUri, relativePath, workspaceId, title, options) { + rootUri = String(rootUri || '').trim(); + relativePath = String(relativePath || '').trim().replace(/^\/+|\/+$/g, ''); + workspaceId = String(workspaceId || '').trim(); + title = String(title || relativePath || '本地文件夹').trim(); + if (!rootUri) return false; + void recordNavigationRecent({ + kind: 'folder', + sourceKind: 'local_folder', + rootUri: rootUri, + relativePath: relativePath, + title: title, + workspaceId: workspaceId + }); + var targetUrl = new URL('/', window.location.origin); + if (workspaceId) targetUrl.searchParams.set('workspaceId', workspaceId); + targetUrl.searchParams.set('sourceKind', 'local_folder'); + targetUrl.searchParams.set('rootUri', rootUri); + targetUrl.searchParams.set('treeView', 'filetree'); + if (relativePath) targetUrl.searchParams.set('fileTreeScope', relativePath); + var url = targetUrl.pathname + targetUrl.search; + if (options && options.newTab) { + window.open(url, '_blank', 'noopener'); + } else { + window.location.assign(url); + } + return true; + } + function currentTopbarTitle() { var title = document.querySelector('[data-page-title-current="true"]'); return title && title.textContent ? title.textContent.trim() : '无标题'; @@ -749,6 +803,14 @@ import { createSidebarPageSettingsRuntime } from './sidebar-page-settings-runtim pageRoot.setAttribute('data-mnote-page-tree-scope', relativePath); } persistStarredFolderScope(workspaceId, rootUri, relativePath); + void recordNavigationRecent({ + kind: 'folder', + sourceKind: 'local_folder', + rootUri: rootUri, + relativePath: relativePath, + title: row.textContent ? row.textContent.trim() : relativePath, + workspaceId: workspaceId + }); document.documentElement.setAttribute('data-mnote-filetree-scope', relativePath); var sidebarUrl = new URL('/api/tree/projections/sidebar', window.location.origin); sidebarUrl.searchParams.set('workspaceId', workspaceId); @@ -805,10 +867,12 @@ import { createSidebarPageSettingsRuntime } from './sidebar-page-settings-runtim copyWorkspaceSourceParams, currentDocumentId, currentRootUri, + currentSourceKind, fileTreeIconKindForFileName: (...args) => fileTreeIconKindForFileName(...args), getNavigationInFlight: () => mnoteNavigationInFlight, isCodeAttachmentFileName: (...args) => isCodeAttachmentFileName(...args), isNonOfficeAttachmentName: (...args) => isNonOfficeAttachmentName(...args), + isPdfAttachmentFileName: (...args) => isPdfAttachmentFileName(...args), openCodeEditorAttachment: (...args) => openCodeEditorAttachment(...args), resolveWorkspaceId, setNavigationInFlight: (value) => { mnoteNavigationInFlight = String(value || ''); }, @@ -818,6 +882,7 @@ import { createSidebarPageSettingsRuntime } from './sidebar-page-settings-runtim const inferOnlyOfficeFileType = (...args) => sidebarFileTreeOpen.inferOnlyOfficeFileType(...args); const buildOnlyOfficeOpenUrl = (...args) => sidebarFileTreeOpen.buildOnlyOfficeOpenUrl(...args); const buildOnlyOfficeOpenPath = (...args) => sidebarFileTreeOpen.buildOnlyOfficeOpenPath(...args); + const buildPdfPreviewOpenUrl = (...args) => sidebarFileTreeOpen.buildPdfPreviewOpenUrl(...args); const buildLocalOnlyOfficeOpenUrl = (...args) => sidebarFileTreeOpen.buildLocalOnlyOfficeOpenUrl(...args); const openLocalOfficeFileInActiveTab = (...args) => sidebarFileTreeOpen.openLocalOfficeFileInActiveTab(...args); const buildMindmapOpenPath = (...args) => sidebarFileTreeOpen.buildMindmapOpenPath(...args); @@ -925,6 +990,9 @@ import { createSidebarPageSettingsRuntime } from './sidebar-page-settings-runtim if (ext === 'md' || ext === 'markdown') return 'markdown'; if (ext === 'pdf') return 'pdf'; if (['png', 'jpg', 'jpeg', 'gif', 'webp', 'svg', 'bmp'].indexOf(ext) >= 0) return 'image'; + if (['html', 'htm', 'css', 'scss', 'less', 'js', 'jsx', 'ts', 'tsx', 'mjs', 'cjs', 'vue', 'svelte', 'astro'].indexOf(ext) >= 0) return 'web'; + if (['json', 'jsonc', 'json5', 'toml', 'yaml', 'yml', 'ini', 'env', 'xml', 'lock', 'hcl', 'tf', 'tfvars', 'nix', 'properties', 'conf', 'cfg', 'config', 'service', 'desktop', 'gitignore', 'gitattributes', 'editorconfig', 'npmrc', 'prettierrc', 'eslintrc'].indexOf(ext) >= 0 || ['.dockerignore', '.editorconfig', '.env', '.eslintrc', '.gitattributes', '.gitignore', '.npmrc', '.prettierrc', 'dockerfile', 'containerfile', 'makefile', 'cmakelists.txt', 'gemfile', 'rakefile', 'procfile'].indexOf(name) >= 0) return 'config'; + if (['rs', 'py', 'go', 'java', 'c', 'cpp', 'h', 'hpp', 'cs', 'php', 'rb', 'sh', 'bash', 'zsh', 'sql', 'lua', 'dart', 'kt', 'kts', 'swift', 'scala', 'gradle', 'groovy', 'clj', 'ex', 'exs', 'erl', 'hrl', 'fs', 'fsx', 'r', 'jl', 'm', 'mm', 'pl', 'pm', 'ps1', 'bat', 'cmd', 'psm1', 'psd1', 'proto', 'graphql', 'gql', 'prisma', 'cmake', 'bazel', 'bzl'].indexOf(ext) >= 0) return 'code'; return ''; } @@ -1720,7 +1788,7 @@ import { createSidebarPageSettingsRuntime } from './sidebar-page-settings-runtim document.documentElement.setAttribute('data-mnote-last-upload-inserted', 'false'); document.documentElement.setAttribute('data-mnote-last-upload-insert-error', 'insert_content_failed'); } - window.setTimeout(function() { + window.setTimeout(function annotateUploadedLink(attempt) { if (targetRoot instanceof HTMLElement) window.__mnoteLastEditorUploadRoot = targetRoot; enhanceEditorAttachmentLinks(); var selector = assetId @@ -1729,12 +1797,22 @@ import { createSidebarPageSettingsRuntime } from './sidebar-page-settings-runtim var link = targetRoot instanceof HTMLElement ? targetRoot.querySelector(selector) : document.querySelector(selector); + if (!(link instanceof HTMLElement) && assetId) { + var scope = targetRoot instanceof HTMLElement ? targetRoot : document; + link = Array.from(scope.querySelectorAll('.editor-surface .ProseMirror a')).find(function(candidate) { + var href = String(candidate.getAttribute('href') || ''); + try { href = decodeURIComponent(href); } catch (_) {} + return href.indexOf(assetId) >= 0; + }) || null; + } if (link instanceof HTMLElement) { link.setAttribute('data-mnote-attachment-link', 'true'); if (assetId) link.setAttribute('data-asset-id', assetId); if (sizeLabel) link.setAttribute('data-file-size', sizeLabel); + } else if (Number(attempt) < 20) { + window.setTimeout(function() { annotateUploadedLink(Number(attempt) + 1); }, 50); } - }, 0); + }, 0, 0); return inserted; } } catch (error) { @@ -1801,7 +1879,7 @@ import { createSidebarPageSettingsRuntime } from './sidebar-page-settings-runtim if (options && options.insertIntoEditor) { await insertUploadedAssetIntoEditor(localPayload.asset, editorRootFromUploadOptions(options)); } - void refreshLocalFolderSidebarSnapshot(); + if (!(options && options.insertIntoEditor)) void refreshLocalFolderSidebarSnapshot(); window.dispatchEvent(new CustomEvent('wolai:local-assets-changed', { detail: { docId: documentId, asset: localPayload.asset, assetIds: [localPayload.asset.id] } })); @@ -1844,6 +1922,9 @@ import { createSidebarPageSettingsRuntime } from './sidebar-page-settings-runtim window.addEventListener('wolai:assets-changed', function(event) { applyAssetsChangedToFileTree(event.detail || {}); }); + window.addEventListener('wolai:local-assets-changed', function(event) { + applyAssetsChangedToFileTree(event.detail || {}); + }); installMindmapAssetFetchObserver(); async function uploadFilesWithResolvedTarget(files, detail, options) { @@ -2022,6 +2103,7 @@ import { createSidebarPageSettingsRuntime } from './sidebar-page-settings-runtim const decodeLocalEncodedPath = (...args) => sidebarFileTreeCommand.decodeLocalEncodedPath(...args); const fileTreeRowLocalRelativePath = (...args) => sidebarFileTreeCommand.fileTreeRowLocalRelativePath(...args); const fileTreeRowLocalUploadTargetRelativePath = (...args) => sidebarFileTreeCommand.fileTreeRowLocalUploadTargetRelativePath(...args); + const readWorkspacePathFromRow = (...args) => sidebarFileTreeCommand.readWorkspacePathFromRow(...args); const fileTreeRowKind = (...args) => sidebarFileTreeCommand.fileTreeRowKind(...args); const isFileTreeDownloadableAssetRow = (...args) => sidebarFileTreeCommand.isFileTreeDownloadableAssetRow(...args); const isFileTreeDownloadableRow = (...args) => sidebarFileTreeCommand.isFileTreeDownloadableRow(...args); @@ -2300,6 +2382,8 @@ import { createSidebarPageSettingsRuntime } from './sidebar-page-settings-runtim const pageAiLoadSkills = (...args) => sidebarPageAi.pageAiLoadSkills(...args); const pageAiSwitchProfile = (...args) => sidebarPageAi.pageAiSwitchProfile(...args); const pageAiSetContextScope = (...args) => sidebarPageAi.pageAiSetContextScope(...args); + const pageAiSetAgentId = (...args) => sidebarPageAi.pageAiSetAgentId(...args); + const pageAiToggleContextRef = (...args) => sidebarPageAi.pageAiToggleContextRef(...args); const updatePageAiTriggerState = (...args) => sidebarPageAi.updatePageAiTriggerState(...args); const sidebarAttachmentOpen = createSidebarAttachmentOpenRuntime({ @@ -2308,12 +2392,14 @@ import { createSidebarPageSettingsRuntime } from './sidebar-page-settings-runtim buildLocalOnlyOfficeOpenUrl, buildOnlyOfficeOpenPath, buildOnlyOfficeOpenUrl, + buildPdfPreviewOpenUrl, closestAction, currentDocumentId, currentRootUri, currentWorkspaceSourcePayload, fileTreeIconKindForFileName, healLegacyOfficeAttachmentParagraphs, + hydrateEditorAttachmentMeta, inferCodeAttachmentLanguage: (...args) => inferCodeAttachmentLanguage(...args), inferOnlyOfficeFileType, isCodeAttachmentFileName: (...args) => isCodeAttachmentFileName(...args), @@ -2366,7 +2452,7 @@ import { createSidebarPageSettingsRuntime } from './sidebar-page-settings-runtim return; } - var editorAttachmentLink = closestAction(e.target, '.editor-surface .ProseMirror a[data-mnote-attachment-link="true"], .editor-surface .ProseMirror a.mnote-uploaded-attachment-row, .editor-surface .ProseMirror a[href*="/api/local-folder/files/open"]'); + var editorAttachmentLink = closestAction(e.target, '.editor-surface .ProseMirror a[data-mnote-attachment-link="true"], .editor-surface .ProseMirror a.mnote-uploaded-attachment-row, .editor-surface .ProseMirror a[href*="/api/local-folder/files/open"], .editor-surface .ProseMirror a[href*="/office-preview"]'); if (editorAttachmentLink instanceof HTMLAnchorElement) { e.preventDefault(); openEditorAttachmentLink(editorAttachmentLink); @@ -2503,6 +2589,20 @@ import { createSidebarPageSettingsRuntime } from './sidebar-page-settings-runtim return; } + var pageAiAgent = closestAction(e.target, '[data-page-ai-agent-id]'); + if (pageAiAgent) { + e.preventDefault(); + pageAiSetAgentId(pageAiAgent.getAttribute('data-page-ai-agent-id') || 'reasonix'); + return; + } + + var pageAiContextRef = closestAction(e.target, '[data-page-ai-context-ref]'); + if (pageAiContextRef) { + e.preventDefault(); + pageAiToggleContextRef(pageAiContextRef.getAttribute('data-page-ai-context-ref') || ''); + return; + } + var pageAiMemorySave = closestAction(e.target, '[data-page-ai-memory-save]'); if (pageAiMemorySave) { e.preventDefault(); @@ -2820,14 +2920,24 @@ import { createSidebarPageSettingsRuntime } from './sidebar-page-settings-runtim e.preventDefault(); selectSidebarFileTreeRow(fileRow, { ctrlKey: e.ctrlKey, metaKey: e.metaKey, shiftKey: e.shiftKey }); var objectIdentity = readFileTreeObjectIdentity(fileRow); - dispatchSidebarEvent('tree.filetree.open', { rowId: rowId, rowKind: rowKind, documentId: ownerDocumentId || null, assetId: assetId || null, assetType: assetType || null, objectIdentity: objectIdentity, workspaceId: resolveWorkspaceId(fileRow) }); + var workspacePath = readWorkspacePathFromRow(fileRow); + dispatchSidebarEvent('tree.filetree.open', { rowId: rowId, rowKind: rowKind, documentId: ownerDocumentId || null, assetId: assetId || null, assetType: assetType || null, objectIdentity: objectIdentity, workspacePath: workspacePath, workspaceId: resolveWorkspaceId(fileRow) }); if (e.shiftKey || e.ctrlKey || e.metaKey) { return; } if ((rowKind === 'document' || rowKind === 'index' || rowKind === 'markdown') && documentId) { + void recordNavigationRecent({ + kind: 'page', + sourceKind: currentSourceKind() || 'local_folder', + rootUri: currentRootUri(), + relativePath: String(fileRow.getAttribute('data-local-relative-path') || '').trim(), + documentId: documentId, + title: fileTreeRowTitleForShortcut(fileRow, documentId), + workspaceId: resolveWorkspaceId(fileRow) + }); navigateToDocument(documentId, resolveWorkspaceId(fileRow), { treeView: 'filetree', fileTreeScope: currentFileTreeScope() }); } else if (assetId) { - dispatchSidebarEvent('tree.asset.open', { rowId: rowId, rowKind: rowKind, documentId: ownerDocumentId || null, assetId: assetId, assetType: assetType || null, objectIdentity: objectIdentity, workspaceId: resolveWorkspaceId(fileRow), openTarget: e.shiftKey || e.ctrlKey || e.metaKey ? 'new-window' : 'active-tab' }); + dispatchSidebarEvent('tree.asset.open', { rowId: rowId, rowKind: rowKind, documentId: ownerDocumentId || null, assetId: assetId, assetType: assetType || null, objectIdentity: objectIdentity, workspacePath: workspacePath, workspaceId: resolveWorkspaceId(fileRow), openTarget: e.shiftKey || e.ctrlKey || e.metaKey ? 'new-window' : 'active-tab' }); } return; } @@ -2859,7 +2969,7 @@ import { createSidebarPageSettingsRuntime } from './sidebar-page-settings-runtim }); document.addEventListener('contextmenu', function(event) { - var editorAttachmentLink = closestAction(event.target, '.editor-surface .ProseMirror a[data-mnote-attachment-link="true"], .editor-surface .ProseMirror a.mnote-uploaded-attachment-row, .editor-surface .ProseMirror a[href*="/api/local-folder/files/open"]'); + var editorAttachmentLink = closestAction(event.target, '.editor-surface .ProseMirror a[data-mnote-attachment-link="true"], .editor-surface .ProseMirror a.mnote-uploaded-attachment-row, .editor-surface .ProseMirror a[href*="/api/local-folder/files/open"], .editor-surface .ProseMirror a[href*="/office-preview"]'); if (editorAttachmentLink instanceof HTMLAnchorElement) { event.preventDefault(); event.stopPropagation(); @@ -2904,6 +3014,10 @@ import { createSidebarPageSettingsRuntime } from './sidebar-page-settings-runtim // inline fallback if (event.key === 'F2') { event.preventDefault(); + var renameCtx = buildSidebarFileTreeContext('filetree', { targetRow: fileTreeRowForKey }); + if (!evaluateSidebarFileTreeWhen(renameCtx, '!workspace.readonly && !editor.dirty')) { + return; + } beginFileTreeInlineRename(fileTreeRowForKey); return; } @@ -2921,14 +3035,18 @@ import { createSidebarPageSettingsRuntime } from './sidebar-page-settings-runtim } if (shortcutKey === 'v') { event.preventDefault(); + var pasteCtx = buildSidebarFileTreeContext('filetree', { targetRow: fileTreeRowForKey }); + if (!evaluateSidebarFileTreeWhen(pasteCtx, '!workspace.readonly')) { + return; + } void pasteSidebarFileTreeClipboard(fileTreeRowForKey); return; } } if (event.key === 'Delete' || event.key === 'Backspace') { event.preventDefault(); - var delCtx = buildSidebarFileTreeContext('filetree'); - if (!evaluateSidebarFileTreeWhen(delCtx, '!workspace.readonly')) { + var delCtx = buildSidebarFileTreeContext('filetree', { targetRow: fileTreeRowForKey }); + if (!evaluateSidebarFileTreeWhen(delCtx, '!workspace.readonly && !editor.dirty')) { return; } void deleteSelectedSidebarFileTreeRows(fileTreeRowForKey); @@ -3044,12 +3162,20 @@ import { createSidebarPageSettingsRuntime } from './sidebar-page-settings-runtim if (Object.keys(next).length) { void persistPageOptionsPatch(next); } + return; + } + var pageWidthSelect = closestAction(event.target, '[data-page-width-select]'); + if (pageWidthSelect instanceof HTMLSelectElement) { + var pageWidthType = pageWidthSelect.getAttribute('data-page-width-select') || ''; + void persistPageWidthPreference(pageWidthType, pageWidthSelect.value); } }); function initializePageUiSurfaces() { pageUiState.pageOptions = null; + pageUiState.pageWidthPreferences = null; applyPageOptionsToShell(); + void loadPageWidthPreferences(); updatePageSettingsTriggerState(); updatePageAiTriggerState(); ensureHistorySnapshotsSeeded(); diff --git a/rust/crates/mnote-web/browser/sidebar-workspace-runtime.js b/rust/crates/mnote-web/browser/sidebar-workspace-runtime.js index 272f08ad..426e374a 100644 --- a/rust/crates/mnote-web/browser/sidebar-workspace-runtime.js +++ b/rust/crates/mnote-web/browser/sidebar-workspace-runtime.js @@ -103,7 +103,7 @@ export const createSidebarWorkspaceRuntime = (dependencies = {}) => { ) { return 'local_folder'; } - return 'convex_workspace'; + return 'local_folder'; } function currentRootUri() { diff --git a/rust/crates/mnote-web/browser/tree-live-controller.js b/rust/crates/mnote-web/browser/tree-live-controller.js index ac313bfb..a479e7b8 100644 --- a/rust/crates/mnote-web/browser/tree-live-controller.js +++ b/rust/crates/mnote-web/browser/tree-live-controller.js @@ -2,7 +2,7 @@ var script = document.getElementById('__MNOTE_TREE_LIVE_BOOTSTRAP__'); var fallback = { schema: 'mnote.tree_live_bootstrap.v1', - transport: 'convex-command-log-sse', + transport: 'tree-live-sse', endpoint: '/api/tree/events', rootIds: [], initialRevision: null @@ -34,7 +34,7 @@ } function applyTransport(transport) { - document.documentElement.setAttribute('data-mnote-tree-live-transport', transport || 'convex-command-log-sse'); + document.documentElement.setAttribute('data-mnote-tree-live-transport', transport || 'tree-live-sse'); } function closeActiveSource() { @@ -169,7 +169,7 @@ } function startWithSseFallback(bootstrap, workspaceId) { - applyTransport('convex-command-log-sse'); + applyTransport('tree-live-sse'); var url = new URL(bootstrap.endpoint || '/api/tree/events', window.location.origin); url.searchParams.set('workspaceId', workspaceId); if (Array.isArray(bootstrap.rootIds) && bootstrap.rootIds.length === 1) { @@ -208,9 +208,13 @@ var workspaceId = bootstrap.workspaceId || resolveWorkspaceId(); // Prefer WebSocket transport when available - var preferWs = bootstrap.transport === 'convex-command-log-ws' && 'WebSocket' in window; + var requestedTransport = bootstrap.transport || 'tree-live-sse'; + if (requestedTransport === 'convex-command-log-sse') requestedTransport = 'tree-live-sse'; + if (requestedTransport === 'convex-command-log-ws') requestedTransport = 'tree-live-ws'; + + var preferWs = requestedTransport === 'tree-live-ws' && 'WebSocket' in window; if (preferWs) { - applyTransport('convex-command-log-ws'); + applyTransport('tree-live-ws'); startWithWebSocket(bootstrap, workspaceId, bootstrap.wsEndpoint || '/api/realtime/ws'); return; } @@ -220,7 +224,7 @@ applyStatus('unsupported'); return; } - applyTransport(bootstrap.transport || 'convex-command-log-sse'); + applyTransport(requestedTransport || 'tree-live-sse'); var url = new URL(bootstrap.endpoint || '/api/tree/events', window.location.origin); url.searchParams.set('workspaceId', workspaceId); if (Array.isArray(bootstrap.rootIds) && bootstrap.rootIds.length === 1) { diff --git a/rust/crates/mnote-web/browser/tree-shell-filetree-dnd-runtime.js b/rust/crates/mnote-web/browser/tree-shell-filetree-dnd-runtime.js index 89b08184..db901d05 100644 --- a/rust/crates/mnote-web/browser/tree-shell-filetree-dnd-runtime.js +++ b/rust/crates/mnote-web/browser/tree-shell-filetree-dnd-runtime.js @@ -303,7 +303,7 @@ export function createTreeShellFileTreeDndRuntime(context) { `目标: ${targetLabel}`, context.sourceKind === "local_folder" ? "目标可写时复制进本地文件夹；命名冲突使用递增命名。" - : "Convex 目标交给宿主上传到对象存储；命名冲突由上传 executor 处理。", + : "legacy cloud 目标交给宿主上传到对象存储；命名冲突由上传 executor 处理。", ], }; } diff --git a/rust/crates/mnote-web/browser/tree-shell-filetree-menu-runtime.js b/rust/crates/mnote-web/browser/tree-shell-filetree-menu-runtime.js index 6004a2ad..672eea73 100644 --- a/rust/crates/mnote-web/browser/tree-shell-filetree-menu-runtime.js +++ b/rust/crates/mnote-web/browser/tree-shell-filetree-menu-runtime.js @@ -63,11 +63,11 @@ export function buildTreeShellFileTreeContextMenuProfile(context, target) { }), createFileTreeMenuItem("newFolder", "新建文件夹", { disabled: !canCreateFolder, - reason: convexSource ? "Convex workspace 当前未暴露 folder capability" : "当前 source 不支持新建文件夹", + reason: convexSource ? "legacy cloud workspace 当前未暴露 folder capability" : "当前 source 不支持新建文件夹", }), createFileTreeMenuItem("upload", "上传/导入", { disabled: true, - reason: localSource ? "外部文件请拖入 Explorer" : "Convex 上传 executor 尚未接入", + reason: localSource ? "外部文件请拖入 Explorer" : "legacy cloud 上传 executor 尚未接入", }), createFileTreeMenuItem("refresh", "刷新", { separatorBefore: true }), createFileTreeMenuItem("collapseAll", "全部折叠"), @@ -95,7 +95,7 @@ export function buildTreeShellFileTreeContextMenuProfile(context, target) { })); items.push(createFileTreeMenuItem("newFolder", "新建文件夹", { disabled: !canCreateFolder, - reason: convexSource ? "Convex workspace 当前未暴露 folder capability" : "当前 source 不支持新建文件夹", + reason: convexSource ? "legacy cloud workspace 当前未暴露 folder capability" : "当前 source 不支持新建文件夹", })); items.push(createFileTreeMenuItem("paste", "粘贴", { disabled: !canPaste, diff --git a/rust/crates/mnote-web/browser/tree-shell-filetree-runtime.js b/rust/crates/mnote-web/browser/tree-shell-filetree-runtime.js index 016432da..e90508ba 100644 --- a/rust/crates/mnote-web/browser/tree-shell-filetree-runtime.js +++ b/rust/crates/mnote-web/browser/tree-shell-filetree-runtime.js @@ -133,13 +133,20 @@ export function getFileTreeRowIconKind(item) { if (iconHint === "table") return "table"; if (iconHint === "index") return "index"; if (iconHint === "page") return "page"; + if (iconHint === "pdf") return "pdf"; + if (iconHint === "office" || iconHint === "onlyoffice") return "office"; + if (iconHint === "word" || iconHint === "ppt" || iconHint === "sheet") return iconHint; + if (iconHint === "image") return "image"; + if (iconHint === "code" || iconHint === "web" || iconHint === "config") return iconHint; if (item.rowKind === "document") return "page"; if (item.rowKind === "folder") return "folder"; - if (item.rowKind === "markdown") return "file"; + if (item.rowKind === "markdown") return "markdown"; if (item.rowKind === "index") return "index"; if (item.rowKind === "asset_folder") return "mindmap"; if (item.resourceMeta?.resourceKind === "table") return "table"; if (item.resourceMeta?.resourceKind === "mindmap") return "mindmap"; + if (item.resourceMeta?.resourceKind === "office") return "office"; + if (item.resourceMeta?.resourceKind === "pdf") return "pdf"; return "file"; } diff --git a/rust/crates/mnote-web/browser/tree-shell-runtime.js b/rust/crates/mnote-web/browser/tree-shell-runtime.js index 6c655a95..93ac4539 100644 --- a/rust/crates/mnote-web/browser/tree-shell-runtime.js +++ b/rust/crates/mnote-web/browser/tree-shell-runtime.js @@ -108,7 +108,7 @@ function startTreeShellRuntime() { const sourceKind = typeof state.sourceKind === "string" && state.sourceKind.trim() ? state.sourceKind.trim() - : "convex_workspace"; + : "local_folder"; const rootUri = typeof state.rootUri === "string" && state.rootUri.trim() ? state.rootUri.trim() diff --git a/rust/crates/mnote-web/src/app.rs b/rust/crates/mnote-web/src/app.rs index d8ca3abf..5ed0f267 100644 --- a/rust/crates/mnote-web/src/app.rs +++ b/rust/crates/mnote-web/src/app.rs @@ -58,18 +58,8 @@ impl AppConfig { .unwrap_or_else(|_| "/api/hermes".into()), compat_next_base_path: env::var("MNOTE_WEB_COMPAT_NEXT_BASE_PATH") .unwrap_or_else(|_| "/api/compat/next".into()), - convex_url: env::var("CONVEX_SELF_HOSTED_URL") - .ok() - .or_else(|| env::var("NEXT_PUBLIC_CONVEX_URL").ok()) - .or_else(|| read_env_or_dotenv("CONVEX_SELF_HOSTED_URL")) - .or_else(|| read_env_or_dotenv("NEXT_PUBLIC_CONVEX_URL")) - .map(|value| value.trim().trim_end_matches('/').to_string()) - .filter(|value| !value.is_empty()), - convex_admin_key: env::var("CONVEX_SELF_HOSTED_ADMIN_KEY") - .ok() - .or_else(|| read_env_or_dotenv("CONVEX_SELF_HOSTED_ADMIN_KEY")) - .map(|value| value.trim().to_string()) - .filter(|value| !value.is_empty()), + convex_url: None, + convex_admin_key: None, allow_dev_fixtures: env::var("MNOTE_WEB_ALLOW_DEV_FIXTURES") .ok() .map(|value| matches!(value.trim(), "1" | "true" | "TRUE" | "yes" | "YES")) diff --git a/rust/crates/mnote-web/src/document_buffer_store.rs b/rust/crates/mnote-web/src/document_buffer_store.rs index cc8824c3..6e1770d6 100644 --- a/rust/crates/mnote-web/src/document_buffer_store.rs +++ b/rust/crates/mnote-web/src/document_buffer_store.rs @@ -71,6 +71,12 @@ struct BufferStoreInner { buffers: HashMap, } +#[derive(Debug, Clone)] +pub struct BufferExternalModificationOutcome { + pub buffer: DocumentBuffer, + pub self_write_echo: bool, +} + impl BufferStore { pub fn new() -> Self { Self { @@ -102,6 +108,8 @@ impl BufferStore { last_loaded_at: Some(now_ms), last_saved_at: Some(now_ms), external_actor: None, + last_write_intent_id: None, + last_save_operation_id: None, }; inner.buffers.insert(key, buf.clone()); buf @@ -131,11 +139,27 @@ impl BufferStore { path: &ObjectWorkspacePath, file_version: String, content_hash: String, + ) -> Option { + self.mark_saved_with_operation(path, file_version, content_hash, None, None) + } + + pub fn mark_saved_with_operation( + &self, + path: &ObjectWorkspacePath, + file_version: String, + content_hash: String, + write_intent_id: Option, + save_operation_id: Option, ) -> Option { let key = BufferKey::from_workspace_path(path); let mut inner = self.inner.write().expect("BufferStore lock"); if let Some(buf) = inner.buffers.get_mut(&key) { - buf.mark_saved(file_version, content_hash); + buf.mark_saved_with_operation( + file_version, + content_hash, + write_intent_id, + save_operation_id, + ); Some(buf.clone()) } else { None @@ -158,6 +182,54 @@ impl BufferStore { } } + /// 带磁盘版本的外部修改标记。 + /// + /// watcher 会看到 MNote 自己保存产生的文件系统回声；如果 watcher 观测到的 + /// `observed_file_version` 等于最近保存/加载的 `file_version`，说明这不是新的外部修改， + /// 不应把 Clean 变成 ExternalModified，也不应把当前浏览器正在输入的 Dirty 变成 Stale。 + pub fn mark_external_modified_if_version_changed( + &self, + path: &ObjectWorkspacePath, + observed_file_version: Option, + actor: Option, + ) -> Option { + self.mark_external_modified_if_version_changed_with_outcome( + path, + observed_file_version, + actor, + ) + .map(|outcome| outcome.buffer) + } + + pub fn mark_external_modified_if_version_changed_with_outcome( + &self, + path: &ObjectWorkspacePath, + observed_file_version: Option, + actor: Option, + ) -> Option { + let key = BufferKey::from_workspace_path(path); + let mut inner = self.inner.write().expect("BufferStore lock"); + let buf = inner.buffers.get_mut(&key)?; + if let Some(observed) = observed_file_version + .as_deref() + .map(str::trim) + .filter(|value| !value.is_empty()) + { + if buf.file_version.as_deref() == Some(observed) { + return Some(BufferExternalModificationOutcome { + buffer: buf.clone(), + self_write_echo: true, + }); + } + buf.file_version = Some(observed.to_string()); + } + buf.mark_external_modified(actor); + Some(BufferExternalModificationOutcome { + buffer: buf.clone(), + self_write_echo: false, + }) + } + /// 标记 buffer 为 dirty（编辑器内容已修改）。 pub fn mark_dirty( &self, @@ -348,6 +420,8 @@ mod tests { last_loaded_at: Some(1_700_000_000_000i64), last_saved_at: Some(1_700_000_000_001i64), external_actor: None, + last_write_intent_id: None, + last_save_operation_id: None, } } @@ -411,6 +485,99 @@ mod tests { ); } + #[test] + fn document_buffer_ignores_watcher_echo_for_last_saved_version() { + let store = BufferStore::new(); + let path = make_test_workspace_path("ws_1", "doc.md", "local-md:doc.md"); + let key = BufferKey::from_workspace_path(&path); + store.update(&key, make_fresh_buffer(&path)); + + let clean_echo = store + .mark_external_modified_if_version_changed( + &path, + Some("v1".into()), + Some("external-editor".into()), + ) + .expect("buffer"); + assert_eq!(clean_echo.dirty_state, DocBufferDirtyState::Clean); + assert_eq!(clean_echo.external_actor, None); + + let dirty = store + .mark_dirty(&path, "sha256:dirty".into()) + .expect("dirty"); + assert_eq!(dirty.dirty_state, DocBufferDirtyState::Dirty); + let dirty_echo = store + .mark_external_modified_if_version_changed( + &path, + Some("v1".into()), + Some("external-editor".into()), + ) + .expect("buffer"); + assert_eq!(dirty_echo.dirty_state, DocBufferDirtyState::Dirty); + assert_eq!(dirty_echo.external_actor, None); + } + + #[test] + fn document_buffer_marks_stale_when_dirty_buffer_sees_new_version() { + let store = BufferStore::new(); + let path = make_test_workspace_path("ws_1", "doc.md", "local-md:doc.md"); + let key = BufferKey::from_workspace_path(&path); + let mut buf = make_fresh_buffer(&path); + buf.mark_dirty("sha256:dirty".into()); + store.update(&key, buf); + + let result = store + .mark_external_modified_if_version_changed( + &path, + Some("v2".into()), + Some("external-editor".into()), + ) + .expect("buffer"); + assert_eq!(result.dirty_state, DocBufferDirtyState::Stale); + assert_eq!(result.file_version.as_deref(), Some("v2")); + assert_eq!(result.external_actor.as_deref(), Some("external-editor")); + } + + #[test] + fn document_buffer_records_save_operation_and_reports_self_write_echo() { + let store = BufferStore::new(); + let path = make_test_workspace_path("ws_1", "doc.md", "local-md:doc.md"); + let key = BufferKey::from_workspace_path(&path); + let mut buf = make_fresh_buffer(&path); + buf.mark_dirty("sha256:dirty".into()); + store.update(&key, buf); + + let saved = store + .mark_saved_with_operation( + &path, + "v2".into(), + "sha256:v2".into(), + Some("intent:editor:abc".into()), + Some("save:op:abc".into()), + ) + .expect("保存后应更新 buffer"); + assert_eq!(saved.last_write_intent_id.as_deref(), Some("intent:editor:abc")); + assert_eq!(saved.last_save_operation_id.as_deref(), Some("save:op:abc")); + + let outcome = store + .mark_external_modified_if_version_changed_with_outcome( + &path, + Some("v2".into()), + Some("external-editor".into()), + ) + .expect("watcher 回声应返回 outcome"); + assert!(outcome.self_write_echo, "同版本 watcher 回声应标记为自写回声"); + assert_eq!( + outcome.buffer.last_write_intent_id.as_deref(), + Some("intent:editor:abc") + ); + assert_eq!( + outcome.buffer.last_save_operation_id.as_deref(), + Some("save:op:abc") + ); + assert_eq!(outcome.buffer.dirty_state, DocBufferDirtyState::Clean); + } + #[test] fn document_buffer_mark_saved_after_page_body_write() { let store = BufferStore::new(); diff --git a/rust/crates/mnote-web/src/hermes_tools/artifact.rs b/rust/crates/mnote-web/src/hermes_tools/artifact.rs index 5a8d87ab..5f0cec76 100644 --- a/rust/crates/mnote-web/src/hermes_tools/artifact.rs +++ b/rust/crates/mnote-web/src/hermes_tools/artifact.rs @@ -2,7 +2,7 @@ use crate::app::AppState; use crate::context::RequestContext; use crate::error::WebError; use crate::hermes_tools::ToolCallInput; -use crate::routes::command_support::execute_runtime_command_via_convex_with_artifacts; +use crate::routes::command_support::execute_runtime_command_via_legacy_cloud_with_artifacts; use crate::routes::ensure_local_workspace_access; use bridge_runtime::{ RuntimeActorWire, RuntimeCommandEnvelopeWire, RuntimeSourceWire, RuntimeTargetWire, @@ -225,7 +225,7 @@ async fn create_artifact_node( dry_run: false, validate_only: false, }; - let execution = execute_runtime_command_via_convex_with_artifacts( + let execution = execute_runtime_command_via_legacy_cloud_with_artifacts( &state, context, workspace_id.as_deref(), diff --git a/rust/crates/mnote-web/src/hermes_tools/block.rs b/rust/crates/mnote-web/src/hermes_tools/block.rs index b3bc0fdb..2a924a89 100644 --- a/rust/crates/mnote-web/src/hermes_tools/block.rs +++ b/rust/crates/mnote-web/src/hermes_tools/block.rs @@ -6,7 +6,7 @@ use crate::hermes_tools::doc::{ required_arg, }; use crate::hermes_tools::ToolCallInput; -use crate::routes::command_support::execute_runtime_command_via_convex_with_artifacts; +use crate::routes::command_support::execute_runtime_command_via_legacy_cloud_with_artifacts; use bridge_runtime::{ apply_editor_command_to_legacy_content, RuntimeActorWire, RuntimeCommandEnvelopeWire, RuntimeSourceWire, RuntimeTargetWire, @@ -1147,7 +1147,7 @@ async fn execute_page_body_save( dry_run: false, validate_only: false, }; - let execution = execute_runtime_command_via_convex_with_artifacts( + let execution = execute_runtime_command_via_legacy_cloud_with_artifacts( &state, context, workspace_id.as_deref(), @@ -1221,7 +1221,7 @@ pub(crate) async fn execute_page_body_save_from_aggregate( dry_run: false, validate_only: false, }; - let execution = execute_runtime_command_via_convex_with_artifacts( + let execution = execute_runtime_command_via_legacy_cloud_with_artifacts( &state, context, workspace_id.as_deref(), diff --git a/rust/crates/mnote-web/src/hermes_tools/doc.rs b/rust/crates/mnote-web/src/hermes_tools/doc.rs index 38c4850b..488a8a58 100644 --- a/rust/crates/mnote-web/src/hermes_tools/doc.rs +++ b/rust/crates/mnote-web/src/hermes_tools/doc.rs @@ -1703,6 +1703,8 @@ pub async fn doc_markdown_edit( source_kind: core_protocol::WorkspaceSourceKind::LocalFolder, root_uri: root_uri.to_string(), expected_file_version, + write_intent_id: Some("intent:ai:mnote.doc.markdown_edit".into()), + save_operation_id: None, base_content_hash: None, content_format: "editorBlocks".into(), content: next_content, @@ -1774,7 +1776,7 @@ pub async fn doc_markdown_edit( validate_only: false, }; let execution = - crate::routes::command_support::execute_runtime_command_via_convex_with_artifacts( + crate::routes::command_support::execute_runtime_command_via_legacy_cloud_with_artifacts( state, context, workspace_id.as_deref(), diff --git a/rust/crates/mnote-web/src/hermes_tools/page.rs b/rust/crates/mnote-web/src/hermes_tools/page.rs index 9eddb390..41ff82c1 100644 --- a/rust/crates/mnote-web/src/hermes_tools/page.rs +++ b/rust/crates/mnote-web/src/hermes_tools/page.rs @@ -2,7 +2,7 @@ use crate::app::AppState; use crate::context::RequestContext; use crate::error::WebError; use crate::hermes_tools::ToolCallInput; -use crate::routes::command_support::execute_runtime_command_via_convex_with_artifacts; +use crate::routes::command_support::execute_runtime_command_via_legacy_cloud_with_artifacts; use crate::routes::web_shell::build_page_aggregate_snapshot; use bridge_runtime::{ RuntimeActorWire, RuntimeCommandEnvelopeWire, RuntimeSourceWire, RuntimeTargetWire, @@ -211,6 +211,8 @@ async fn page_command( source_kind: core_protocol::WorkspaceSourceKind::LocalFolder, root_uri: root_uri.clone(), expected_file_version: input.arg_string("expectedFileVersion"), + write_intent_id: Some("intent:ai:mnote.page.save".into()), + save_operation_id: None, base_content_hash: input.arg_string("baseContentHash"), content_format: "editorBlocks".into(), content, @@ -304,7 +306,7 @@ async fn page_command( dry_run: false, validate_only: false, }; - let execution = execute_runtime_command_via_convex_with_artifacts( + let execution = execute_runtime_command_via_legacy_cloud_with_artifacts( &state, context, workspace_id.as_deref(), diff --git a/rust/crates/mnote-web/src/local_folder_watcher_registry.rs b/rust/crates/mnote-web/src/local_folder_watcher_registry.rs index c87a5d98..816a4046 100644 --- a/rust/crates/mnote-web/src/local_folder_watcher_registry.rs +++ b/rust/crates/mnote-web/src/local_folder_watcher_registry.rs @@ -1,8 +1,11 @@ use crate::document_buffer_store::BufferStore; -use crate::routes::{local_workspace_id_from_root_uri, refresh_local_search_index_for_path}; +use crate::routes::{ + local_markdown_conflict_detection_key, local_workspace_id_from_root_uri, + refresh_local_search_index_for_path, +}; use notify::event::ModifyKind; use notify::{Config, Event, EventKind, RecommendedWatcher, RecursiveMode, Watcher}; -use serde_json::{json, Value}; +use serde_json::{Value, json}; use std::collections::HashMap; use std::path::{Path, PathBuf}; use std::sync::atomic::{AtomicUsize, Ordering}; @@ -212,6 +215,12 @@ fn spawn_local_folder_watcher( &root_uri_for_task, &relative_path, ); + let mut observed_file_version: Option = None; + let mut buffer_file_version: Option = None; + let mut last_write_intent_id: Option = None; + let mut last_save_operation_id: Option = None; + let mut self_write_echo = false; + let event_kind = format!("{:?}", event.kind); let document_id = if is_markdown_path(&path) { let document_id = format!("local-md:{}", encode_local_id_segment(&relative_path)); @@ -226,10 +235,40 @@ fn spawn_local_folder_watcher( &relative_path, &document_id, ); - buffer_store_for_task.mark_external_modified( - &ws_path, - Some("external-editor".into()), - ); + if event_kind.contains("Remove") { + if let Some(buffer) = + buffer_store_for_task.mark_local_folder_markdown_deleted( + &ws_id, + &root_uri_for_task, + &relative_path, + &document_id, + ) + { + buffer_file_version = buffer.file_version.clone(); + last_write_intent_id = + buffer.last_write_intent_id.clone(); + last_save_operation_id = + buffer.last_save_operation_id.clone(); + } + } else { + observed_file_version = + local_markdown_conflict_detection_key(&document_id, &path) + .ok(); + if let Some(outcome) = buffer_store_for_task + .mark_external_modified_if_version_changed_with_outcome( + &ws_path, + observed_file_version.clone(), + Some("external-editor".into()), + ) + { + buffer_file_version = outcome.buffer.file_version.clone(); + last_write_intent_id = + outcome.buffer.last_write_intent_id.clone(); + last_save_operation_id = + outcome.buffer.last_save_operation_id.clone(); + self_write_echo = outcome.self_write_echo; + } + } } document_id } else { @@ -241,8 +280,13 @@ fn spawn_local_folder_watcher( "rootUri": root_uri_for_task, "relativePath": relative_path, "documentId": document_id, - "eventKind": format!("{:?}", event.kind), + "eventKind": event_kind, "revision": event_revision(&path), + "observedFileVersion": observed_file_version, + "bufferFileVersion": buffer_file_version, + "lastWriteIntentId": last_write_intent_id, + "lastSaveOperationId": last_save_operation_id, + "selfWriteEcho": self_write_echo, }); let _ = sender_for_task.send(payload); } @@ -375,12 +419,12 @@ fn system_time_ms(time: SystemTime) -> u128 { #[cfg(test)] mod tests { use super::{ - is_local_search_index_path, refresh_local_search_index_for_event, should_emit_event_kind, - LocalFolderWatcherRegistry, + LocalFolderWatcherRegistry, is_local_search_index_path, + refresh_local_search_index_for_event, should_emit_event_kind, }; use crate::document_buffer_store::BufferStore; - use notify::event::{AccessKind, CreateKind, DataChange, ModifyKind}; use notify::EventKind; + use notify::event::{AccessKind, CreateKind, DataChange, ModifyKind}; fn test_root(name: &str) -> std::path::PathBuf { let root = std::env::temp_dir().join(format!( diff --git a/rust/crates/mnote-web/src/routes/bridge.rs b/rust/crates/mnote-web/src/routes/bridge.rs index 5aa676cd..5fcc914a 100644 --- a/rust/crates/mnote-web/src/routes/bridge.rs +++ b/rust/crates/mnote-web/src/routes/bridge.rs @@ -2,14 +2,14 @@ use crate::app::{AppConfig, AppState}; use crate::context::RequestContext; use crate::error::WebError; use crate::routes::query_support::{ - execute_runtime_query_via_convex, resolve_effective_workspace_id, + execute_runtime_query_via_legacy_cloud, resolve_effective_workspace_id, }; +use axum::Json; use axum::extract::{Extension, Query, State}; use axum::http::StatusCode; -use axum::Json; use bridge_runtime::RuntimeQueryEnvelopeWire; use serde::Deserialize; -use serde_json::{json, Value}; +use serde_json::{Value, json}; #[derive(Debug, Deserialize)] #[serde(rename_all = "camelCase")] @@ -79,7 +79,7 @@ async fn execute_bridge_query( workspace_id: &str, query: RuntimeQueryEnvelopeWire, ) -> Result { - execute_runtime_query_via_convex(config, context, Some(workspace_id), query).await + execute_runtime_query_via_legacy_cloud(config, context, Some(workspace_id), query).await } pub async fn workspace( @@ -152,7 +152,7 @@ pub async fn trace( #[cfg(test)] mod tests { - use crate::app::{build_app, AppConfig, AppState}; + use crate::app::{AppConfig, AppState, build_app}; use axum::body::Body; use axum::http::{Request, StatusCode}; use tower::util::ServiceExt; diff --git a/rust/crates/mnote-web/src/routes/command_support.rs b/rust/crates/mnote-web/src/routes/command_support.rs index 9da74af4..c6ad552d 100644 --- a/rust/crates/mnote-web/src/routes/command_support.rs +++ b/rust/crates/mnote-web/src/routes/command_support.rs @@ -2,15 +2,16 @@ use crate::app::{AppConfig, AppState}; use crate::context::RequestContext; use crate::error::WebError; use crate::transport::convex::{ - execute_convex_command_plan, execute_convex_command_plan_with_artifacts, ConvexCommandExecution, + RetiredCloudCommandExecution, execute_retired_command_plan, + execute_retired_command_plan_with_artifacts, }; use bridge_runtime::{ - execute_runtime_input, RuntimeActorWire, RuntimeBridgeContextWire, RuntimeCommandEnvelopeWire, + RuntimeActorWire, RuntimeBridgeContextWire, RuntimeCommandEnvelopeWire, RuntimeCommandExecutionPlan, RuntimeExecutionPlan, RuntimeInput, RuntimeSourceWire, - RuntimeTargetWire, + RuntimeTargetWire, execute_runtime_input, }; -use serde_json::json; use serde_json::Value; +use serde_json::json; pub fn runtime_context( context: &RequestContext, @@ -63,22 +64,22 @@ pub fn build_runtime_command_plan( Ok(plan) } -pub async fn execute_runtime_command_via_convex( +pub async fn execute_runtime_command_via_legacy_cloud( config: &AppConfig, context: &RequestContext, effective_workspace_id: Option<&str>, command: RuntimeCommandEnvelopeWire, ) -> Result { let plan = build_runtime_command_plan(context, effective_workspace_id, command)?; - execute_convex_command_plan(config, context, &plan).await + execute_retired_command_plan(config, context, &plan).await } -pub async fn execute_runtime_command_via_convex_with_artifacts( +pub async fn execute_runtime_command_via_legacy_cloud_with_artifacts( state: &AppState, context: &RequestContext, effective_workspace_id: Option<&str>, command: RuntimeCommandEnvelopeWire, -) -> Result { +) -> Result { let runtime_context = runtime_context(context, effective_workspace_id); let runtime_input = RuntimeInput::Command { context: runtime_context.clone(), @@ -90,7 +91,7 @@ pub async fn execute_runtime_command_via_convex_with_artifacts( return Err(WebError::internal("runtime command 未返回 command plan").with_context(context)); }; - let execution = execute_convex_command_plan_with_artifacts( + let execution = execute_retired_command_plan_with_artifacts( state.config(), context, &runtime_context, diff --git a/rust/crates/mnote-web/src/routes/compat.rs b/rust/crates/mnote-web/src/routes/compat.rs index b41be534..e674cab8 100644 --- a/rust/crates/mnote-web/src/routes/compat.rs +++ b/rust/crates/mnote-web/src/routes/compat.rs @@ -56,7 +56,7 @@ fn explicit_agent_provider(payload: &Value) -> Option<&'static str> { #[cfg(test)] mod tests { - use crate::app::{build_app, AppConfig, AppState}; + use crate::app::{AppConfig, AppState, build_app}; use axum::body::Body; use axum::http::{Request, StatusCode}; use axum::response::IntoResponse; diff --git a/rust/crates/mnote-web/src/routes/dev_hot.rs b/rust/crates/mnote-web/src/routes/dev_hot.rs index 3633d881..963a6bb3 100644 --- a/rust/crates/mnote-web/src/routes/dev_hot.rs +++ b/rust/crates/mnote-web/src/routes/dev_hot.rs @@ -1,6 +1,6 @@ +use axum::Json; use axum::http::{HeaderMap, HeaderValue}; use axum::response::IntoResponse; -use axum::Json; use serde::Serialize; use std::sync::LazyLock; use std::time::{SystemTime, UNIX_EPOCH}; diff --git a/rust/crates/mnote-web/src/routes/documents.rs b/rust/crates/mnote-web/src/routes/documents.rs index 7027b39a..b42ddda7 100644 --- a/rust/crates/mnote-web/src/routes/documents.rs +++ b/rust/crates/mnote-web/src/routes/documents.rs @@ -3,24 +3,25 @@ use crate::context::RequestContext; use crate::document_buffer_store::{self, BufferKey, BufferStore}; use crate::error::WebError; use crate::routes::command_support::{ - execute_runtime_command_via_convex, execute_runtime_command_via_convex_with_artifacts, + execute_runtime_command_via_legacy_cloud, + execute_runtime_command_via_legacy_cloud_with_artifacts, }; use crate::routes::local_folder_source::{ ensure_local_workspace_access, update_local_markdown_title, write_local_markdown_page_body, }; use crate::routes::query_support::{ - execute_runtime_query_via_convex, fetch_documents_meta_via_convex, + execute_runtime_query_via_legacy_cloud, fetch_documents_meta_via_legacy_cloud, resolve_effective_workspace_id, }; +use axum::Json; use axum::extract::{Extension, Query, State}; use axum::http::{HeaderMap, HeaderName, HeaderValue, StatusCode}; -use axum::Json; use bridge_runtime::RuntimeQueryEnvelopeWire; use bridge_runtime::{ RuntimeActorWire, RuntimeCommandEnvelopeWire, RuntimeSourceWire, RuntimeTargetWire, }; use serde::Deserialize; -use serde_json::{json, Value}; +use serde_json::{Value, json}; use std::fs; use std::time::Duration; @@ -48,6 +49,17 @@ pub struct BufferStateQuery { pub relative_path: Option, } +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct BufferDirtyRequest { + pub document_id: String, + pub workspace_id: Option, + pub source_kind: Option, + pub root_uri: Option, + pub relative_path: Option, + pub content_hash: Option, +} + fn find_document_buffer_state( buffer_store: &BufferStore, query: &BufferStateQuery, @@ -104,6 +116,20 @@ fn find_document_buffer_state( None } +fn buffer_state_payload(buf: core_protocol::DocumentBuffer) -> Value { + json!({ + "documentId": buf.workspace_path.object_identity.document_id, + "workspaceId": buf.workspace_path.workspace_id, + "dirtyState": format!("{:?}", buf.dirty_state), + "fileVersion": buf.file_version, + "baseContentHash": buf.base_content_hash, + "currentContentHash": buf.current_content_hash, + "externalActor": buf.external_actor, + "lastLoadedAt": buf.last_loaded_at, + "lastSavedAt": buf.last_saved_at, + }) +} + #[derive(Debug, Deserialize)] #[serde(rename_all = "camelCase")] pub struct DocumentSaveRequest { @@ -114,6 +140,8 @@ pub struct DocumentSaveRequest { pub revision: Option, pub conflict_detection_key: Option, pub expected_file_version: Option, + pub write_intent_id: Option, + pub save_operation_id: Option, pub base_content_hash: Option, pub content_format: Option, pub editor_source: Option, @@ -179,7 +207,9 @@ fn ok_response(context: &RequestContext, result: Value) -> (StatusCode, HeaderMa ) } -fn execution_artifacts_json(execution: &crate::transport::convex::ConvexCommandExecution) -> Value { +fn execution_artifacts_json( + execution: &crate::transport::convex::RetiredCloudCommandExecution, +) -> Value { execution .artifacts .as_ref() @@ -480,6 +510,8 @@ async fn proxy_next_documents_save( "revision": body.revision, "conflictDetectionKey": body.conflict_detection_key, "expectedFileVersion": body.expected_file_version, + "writeIntentId": body.write_intent_id, + "saveOperationId": body.save_operation_id, "editorDocument": body.editor_document, "content": body.content, "tiptapDocument": body.tiptap_document, @@ -522,7 +554,7 @@ pub async fn load_document_meta_result( ) .await; } - fetch_documents_meta_via_convex( + fetch_documents_meta_via_legacy_cloud( state.config(), context, effective_workspace_id.as_deref(), @@ -553,7 +585,7 @@ pub async fn load_document_content_result( ) .await; } - execute_runtime_query_via_convex( + execute_runtime_query_via_legacy_cloud( state.config(), context, effective_workspace_id.as_deref(), @@ -599,20 +631,7 @@ pub async fn buffer_state( let result = find_document_buffer_state(&state.buffer_store, &query); match result { - Some(buf) => Ok(ok_response( - &context, - json!({ - "documentId": buf.workspace_path.object_identity.document_id, - "workspaceId": buf.workspace_path.workspace_id, - "dirtyState": format!("{:?}", buf.dirty_state), - "fileVersion": buf.file_version, - "baseContentHash": buf.base_content_hash, - "currentContentHash": buf.current_content_hash, - "externalActor": buf.external_actor, - "lastLoadedAt": buf.last_loaded_at, - "lastSavedAt": buf.last_saved_at, - }), - )), + Some(buf) => Ok(ok_response(&context, buffer_state_payload(buf))), None => Err(WebError::new( StatusCode::NOT_FOUND, "buffer_state_not_found", @@ -622,6 +641,51 @@ pub async fn buffer_state( } } +/// 标记指定打开文档的 BufferStore 状态为 Dirty。 +/// +/// 浏览器仍负责具体保存调度；Rust BufferStore 只承担跨 watcher、AI、保存冲突的统一打开态仲裁。 +pub async fn mark_buffer_dirty( + State(state): State, + Extension(context): Extension, + Json(body): Json, +) -> Result<(StatusCode, HeaderMap, Json), WebError> { + let document_id = body.document_id.trim(); + if document_id.is_empty() { + return Err(WebError::new( + StatusCode::BAD_REQUEST, + "document_id_required", + "documentId 不能为空", + ) + .with_context(&context)); + } + let query = BufferStateQuery { + document_id: Some(document_id.to_string()), + workspace_id: body.workspace_id.clone(), + source_kind: body.source_kind.clone(), + root_uri: body.root_uri.clone(), + relative_path: body.relative_path.clone(), + }; + let existing = find_document_buffer_state(&state.buffer_store, &query).ok_or_else(|| { + WebError::new( + StatusCode::NOT_FOUND, + "buffer_state_not_found", + "未找到该文档的 buffer 状态", + ) + .with_context(&context) + })?; + let content_hash = body + .content_hash + .as_deref() + .filter(|value| !value.trim().is_empty()) + .unwrap_or("browser-dirty") + .to_string(); + let marked = state + .buffer_store + .mark_dirty(&existing.workspace_path, content_hash) + .unwrap_or(existing); + Ok(ok_response(&context, buffer_state_payload(marked))) +} + pub async fn page_body_write( State(state): State, Extension(context): Extension, @@ -690,6 +754,8 @@ pub async fn save( source_kind: core_protocol::WorkspaceSourceKind::LocalFolder, root_uri: root_uri.to_string(), expected_file_version: expected_file_version.map(ToOwned::to_owned), + write_intent_id: body.write_intent_id.clone(), + save_operation_id: body.save_operation_id.clone(), base_content_hash: body.base_content_hash.clone(), content_format: body .content_format @@ -740,6 +806,8 @@ pub async fn save( "revision": body.revision, "conflictDetectionKey": body.conflict_detection_key, "expectedFileVersion": body.expected_file_version, + "writeIntentId": body.write_intent_id, + "saveOperationId": body.save_operation_id, "editorDocument": body.editor_document, "content": body.content, "tiptapDocument": body.tiptap_document, @@ -752,7 +820,7 @@ pub async fn save( dry_run: false, validate_only: false, }; - let execution = execute_runtime_command_via_convex_with_artifacts( + let execution = execute_runtime_command_via_legacy_cloud_with_artifacts( &state, &context, effective_workspace_id.as_deref(), @@ -815,7 +883,7 @@ pub async fn purge( validate_only: false, }; let result = - execute_runtime_command_via_convex(state.config(), &context, None, command).await?; + execute_runtime_command_via_legacy_cloud(state.config(), &context, None, command).await?; Ok(ok_response(&context, result)) } @@ -865,7 +933,7 @@ pub async fn empty_trash( dry_run: false, validate_only: false, }; - let execution = execute_runtime_command_via_convex_with_artifacts( + let execution = execute_runtime_command_via_legacy_cloud_with_artifacts( &state, &context, Some(workspace_id), @@ -968,13 +1036,14 @@ pub async fn title( }), preflight_data: None, reason: Some("mnote-web page title update".into()), - refs: vec![body - .command_name - .unwrap_or_else(|| "page.head.updateTitle".into())], + refs: vec![ + body.command_name + .unwrap_or_else(|| "page.head.updateTitle".into()), + ], dry_run: false, validate_only: false, }; - let execution = execute_runtime_command_via_convex_with_artifacts( + let execution = execute_runtime_command_via_legacy_cloud_with_artifacts( &state, &context, effective_workspace_id.as_deref(), @@ -1072,13 +1141,14 @@ pub async fn options( }), preflight_data: None, reason: Some("mnote-web page layout update".into()), - refs: vec![body - .command_name - .unwrap_or_else(|| "page.layout.updateOptions".into())], + refs: vec![ + body.command_name + .unwrap_or_else(|| "page.layout.updateOptions".into()), + ], dry_run: false, validate_only: false, }; - let execution = execute_runtime_command_via_convex_with_artifacts( + let execution = execute_runtime_command_via_legacy_cloud_with_artifacts( &state, &context, effective_workspace_id.as_deref(), @@ -1111,9 +1181,9 @@ pub async fn options( #[cfg(test)] mod tests { - use crate::app::{build_app, AppConfig, AppState}; - use crate::document_buffer_store::{build_local_folder_workspace_path, BufferStore}; - use axum::body::{to_bytes, Body}; + use crate::app::{AppConfig, AppState, build_app}; + use crate::document_buffer_store::{BufferStore, build_local_folder_workspace_path}; + use axum::body::{Body, to_bytes}; use axum::http::{HeaderMap, HeaderValue, Method, Request, StatusCode, Uri}; use serde_json::Value; use tower::util::ServiceExt; @@ -1445,8 +1515,7 @@ mod tests { "upsert_document" ); assert_eq!( - payload["meta"]["artifacts"]["domainEvent"]["payload"]["streamDelta"]["document"] - ["title"], + payload["meta"]["artifacts"]["domainEvent"]["payload"]["streamDelta"]["document"]["title"], "服务端页面（改名）" ); assert_eq!(payload["meta"]["artifactError"], Value::Null); @@ -1727,15 +1796,19 @@ mod tests { payload["details"]["conflict"]["editorBaseVersion"].as_str(), Some(stale_file_version.as_str()) ); - assert!(payload["details"]["conflict"]["currentDiskVersion"] - .as_str() - .unwrap_or("") - .starts_with("local-md:local-md:README.md:")); - assert!(payload["details"]["conflict"]["suggestedActions"] - .as_array() - .unwrap() - .iter() - .any(|action| action.as_str() == Some("merge"))); + assert!( + payload["details"]["conflict"]["currentDiskVersion"] + .as_str() + .unwrap_or("") + .starts_with("local-md:local-md:README.md:") + ); + assert!( + payload["details"]["conflict"]["suggestedActions"] + .as_array() + .unwrap() + .iter() + .any(|action| action.as_str() == Some("merge")) + ); let markdown = std::fs::read_to_string(root.join("README.md")).expect("read md"); assert!(markdown.contains("# External")); assert!(!markdown.contains("# Editor")); diff --git a/rust/crates/mnote-web/src/routes/editor.rs b/rust/crates/mnote-web/src/routes/editor.rs index d89d0c73..6eec7a40 100644 --- a/rust/crates/mnote-web/src/routes/editor.rs +++ b/rust/crates/mnote-web/src/routes/editor.rs @@ -2,14 +2,14 @@ use crate::app::AppState; use crate::context::RequestContext; use crate::error::WebError; use crate::routes::documents::{ - content as document_content, meta as document_meta, DocumentContentQuery, DocumentMetaQuery, + DocumentContentQuery, DocumentMetaQuery, content as document_content, meta as document_meta, }; use axum::extract::{Extension, Json, Query, State}; -use axum::http::{header, HeaderValue, StatusCode}; +use axum::http::{HeaderValue, StatusCode, header}; use axum::response::{Html, IntoResponse, Response}; use mnote_editor_core::{BlockType, DocumentBlock, DocumentModel, EditorCommand, EditorSession}; use serde::{Deserialize, Serialize}; -use serde_json::{json, Value}; +use serde_json::{Value, json}; #[derive(Debug, Deserialize)] #[serde(rename_all = "camelCase")] @@ -1763,10 +1763,10 @@ pub async fn transform_runtime_snapshot( #[cfg(test)] mod tests { - use crate::app::{build_app, AppConfig, AppState}; - use axum::body::{to_bytes, Body}; + use crate::app::{AppConfig, AppState, build_app}; + use axum::body::{Body, to_bytes}; use axum::http::{Request, StatusCode}; - use serde_json::{json, Value}; + use serde_json::{Value, json}; use tower::util::ServiceExt; fn app() -> axum::Router { diff --git a/rust/crates/mnote-web/src/routes/gateway.rs b/rust/crates/mnote-web/src/routes/gateway.rs index d06c0fbc..4870e548 100644 --- a/rust/crates/mnote-web/src/routes/gateway.rs +++ b/rust/crates/mnote-web/src/routes/gateway.rs @@ -4,6 +4,7 @@ use crate::error::WebError; use crate::routes::local_folder_source::{ control_plane_db_path_display, create_default_local_workspace_for_actor, ensure_local_workspace_read_access_with_state, is_local_access_policy_admin_context, + load_local_folder_file_tree_children_snapshot, load_local_folder_file_tree_snapshot, load_local_folder_page_tree_scope_snapshot, load_local_folder_page_tree_snapshot, load_local_trash_entries, }; @@ -17,24 +18,24 @@ use crate::routes::web_shell::{ render_local_file_tree_html_scoped, render_local_sidebar_tree_html, render_local_sidebar_tree_html_from_snapshot, }; -use crate::transport::convex::execute_convex_mutation_by_name; +use crate::transport::convex::execute_retired_mutation_by_name; use crate::workspace_shell::{ - build_workspace_shell_projection, render_workspace_shell_sidebar_html, + apply_active_page, build_workspace_shell_projection, render_workspace_shell_sidebar_html, }; use axum::body::Body; use axum::extract::ws::{Message as AxumWsMessage, WebSocket, WebSocketUpgrade}; use axum::extract::{Extension, Query, State}; -use axum::http::{header, HeaderName, HeaderValue, Request, StatusCode, Uri}; +use axum::http::{HeaderName, HeaderValue, Request, StatusCode, Uri, header}; use axum::response::{Html, IntoResponse, Response}; -use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine as _}; +use base64::{Engine as _, engine::general_purpose::URL_SAFE_NO_PAD}; use control_plane::{ - session_token_hash, AppendAuditInput, AuthenticatePasswordInput, CreatePasswordIdentityInput, - UpsertUserInput, + AppendAuditInput, AuthenticatePasswordInput, CreatePasswordIdentityInput, + NavigationRecentRecord, UpsertNavigationRecentInput, UpsertUserInput, session_token_hash, }; use futures_util::{SinkExt, StreamExt}; use leptos::prelude::InnerHtmlAttribute; use serde::{Deserialize, Serialize}; -use serde_json::{json, Value}; +use serde_json::{Value, json}; use std::collections::BTreeMap; use std::time::Duration; use tokio_tungstenite::tungstenite::Message as TungsteniteMessage; @@ -73,6 +74,8 @@ pub(crate) struct RootEntryQuery { file_tree_scope: Option, tree_view: Option, restore_focus_row_id: Option, + route_guard: Option, + missing_page: Option, } pub async fn gateway_health(State(state): State) -> Response { @@ -260,12 +263,23 @@ pub async fn user_access_policy_entry( pub async fn root_entry( State(state): State, Extension(context): Extension, + uri: Uri, Query(query): Query, ) -> Result { if !has_real_auth_context(&state, &context) { let mut response = Response::builder() .status(StatusCode::SEE_OTHER) - .header(header::LOCATION, "/auth") + .header( + header::LOCATION, + format!( + "/auth?next={}", + query_escape( + uri.path_and_query() + .map(|value| value.as_str()) + .unwrap_or("/") + ) + ), + ) .body(Body::empty()) .map_err(|error| WebError::internal(format!("认证入口跳转响应构造失败: {error}")))?; stamp_gateway_headers(response.headers_mut(), false); @@ -350,21 +364,16 @@ pub async fn root_entry( &workspace_id, &mut workspace_dataset, ); - let workspace_projection = build_workspace_shell_projection( + let mut workspace_projection = build_workspace_shell_projection( &workspace_dataset, &workspace_id, requested_or_recent_page_id.as_deref(), "本地文件夹", ); - let selected_active_page_id = choose_root_entry_active_page_id( - requested_page_id.clone(), - None, - workspace_projection.active_page_id.as_deref(), - workspace_projection - .my_page_items - .first() - .map(|item| item.id.as_str()), - ); + let selected_active_page_id = requested_page_id.map(ToOwned::to_owned); + if selected_active_page_id.is_none() { + apply_active_page(&mut workspace_projection, None); + } let sidebar_tree_html = render_local_sidebar_tree_html_from_snapshot( &page_tree_snapshot, selected_active_page_id.as_deref(), @@ -419,21 +428,16 @@ pub async fn root_entry( &workspace_id, &mut workspace_dataset, ); - let workspace_projection = build_workspace_shell_projection( + let mut workspace_projection = build_workspace_shell_projection( &workspace_dataset, &workspace_id, requested_page_id.as_deref(), &default_workspace_name, ); - let selected_active_page_id = choose_root_entry_active_page_id( - requested_page_id.clone(), - recent_page_id.clone(), - workspace_projection.active_page_id.as_deref(), - workspace_projection - .my_page_items - .first() - .map(|item| item.id.as_str()), - ); + let selected_active_page_id = requested_page_id.map(ToOwned::to_owned); + if selected_active_page_id.is_none() { + apply_active_page(&mut workspace_projection, None); + } let sidebar_tree_html = render_local_sidebar_tree_html_from_snapshot( &snapshot, selected_active_page_id.as_deref(), @@ -521,6 +525,30 @@ pub async fn root_entry( .clone() .unwrap_or_default(); let show_admin_access_policy = is_local_access_policy_admin_context(&context); + let navigation_notice_html = render_navigation_guard_notice(&query); + let navigation_html = if active_page_id.trim().is_empty() { + if active_source_kind.as_deref() == Some("local_folder") { + active_root_uri + .as_deref() + .map(|root_uri| { + render_local_folder_navigation_page_html( + &state, + &context, + &actor_id, + root_uri, + file_tree_scope, + &navigation_notice_html, + ) + }) + .transpose()? + } else { + Some(render_workspace_navigation_page_html( + &navigation_notice_html, + )) + } + } else { + None + }; let render_workspace_entry = || { crate::ssr::render_view(leptos::view! { }) }; let (html_title, content, body_extra) = if active_page_id.trim().is_empty() { - let body_extra = if active_source_kind.as_deref() == Some("local_folder") { - let panes_bootstrap_json = serde_json::to_string(&json!({ - "schema": "mnote.document_panes_bootstrap.v1", - "secondaryRequested": false, - "secondaryInvalid": false, - "panes": [], - })) - .unwrap_or_else(|_| "{}".to_string()); - format!( - r#" + let panes_bootstrap_json = serde_json::to_string(&json!({ + "schema": "mnote.document_panes_bootstrap.v1", + "secondaryRequested": false, + "secondaryInvalid": false, + "panes": [], + })) + .unwrap_or_else(|_| "{}".to_string()); + let body_extra = format!( + r#" {}"#, - escape_script_json(&panes_bootstrap_json), - render_editor_island_adapter_script(), - ) - } else { - String::new() - }; + escape_script_json(&panes_bootstrap_json), + render_editor_island_adapter_script(), + ); ("MNOTE".to_string(), render_workspace_entry(), body_extra) } else { match build_page_aggregate_snapshot( @@ -617,8 +642,7 @@ pub async fn root_entry( Err(_) => ("MNOTE".to_string(), render_workspace_entry(), String::new()), } }; - let editor_runtime_preload_links = if body_extra.contains("document-editor-adapter-runtime.js") - { + let editor_runtime_preload_links = if body_extra.contains("__MNOTE_EDITOR_BOOTSTRAP__") { render_editor_runtime_preload_links() } else { "" @@ -651,6 +675,333 @@ pub async fn root_entry( Ok(response) } +fn render_workspace_navigation_page_html(notice_html: &str) -> String { + format!( + r#"
+
+

主页

+
+ {notice_html} +
+

最近访问的文件夹

+

暂无最近访问的文件夹。

+
+
+

最近访问的页面

+

暂无最近访问的页面。

+
+
"# + ) +} + +fn render_local_folder_navigation_page_html( + state: &AppState, + context: &RequestContext, + actor_id: &str, + root_uri: &str, + relative_path: Option<&str>, + notice_html: &str, +) -> Result { + let relative_path = relative_path.map(str::trim).unwrap_or_default(); + let snapshot = if relative_path.is_empty() { + load_local_folder_file_tree_snapshot(root_uri)? + } else { + load_local_folder_file_tree_children_snapshot(root_uri, relative_path)? + }; + let items = snapshot + .projection + .get("items") + .and_then(Value::as_array) + .cloned() + .unwrap_or_default(); + let title = if relative_path.is_empty() { + "本地文件夹".to_string() + } else { + relative_path + .split('/') + .next_back() + .filter(|value| !value.trim().is_empty()) + .unwrap_or(relative_path) + .to_string() + }; + let mut folders = Vec::new(); + let mut pages = Vec::new(); + let mut resources = Vec::new(); + for item in items { + let row_kind = item + .get("rowKind") + .and_then(Value::as_str) + .map(str::trim) + .unwrap_or_default(); + let title = item + .get("title") + .and_then(Value::as_str) + .map(str::trim) + .filter(|value| !value.is_empty()) + .unwrap_or("无标题"); + let resource_meta = item.get("resourceMeta").and_then(Value::as_object); + let item_relative_path = item + .get("relativePath") + .and_then(Value::as_str) + .or_else(|| { + resource_meta + .and_then(|meta| meta.get("workspacePath")) + .and_then(|workspace_path| workspace_path.get("relativePath")) + .and_then(Value::as_str) + }) + .map(str::trim) + .unwrap_or_default(); + let document_id = resource_meta + .and_then(|meta| meta.get("documentId")) + .and_then(Value::as_str) + .map(str::trim) + .filter(|value| !value.is_empty()); + match row_kind { + "folder" | "directory" | "asset-folder" => folders.push(render_navigation_link( + title, + &navigation_folder_href(root_uri, item_relative_path), + "folder", + item_relative_path, + )), + "document" | "markdown" | "index" => { + if let Some(document_id) = document_id { + pages.push(render_navigation_link( + title, + &navigation_document_href(root_uri, relative_path, document_id), + "page", + item_relative_path, + )); + } + } + _ => resources.push(render_navigation_link( + title, + "#", + "resource", + item_relative_path, + )), + } + } + record_navigation_recent_folder(state, actor_id, root_uri, relative_path, &title, None); + let recent_folders = crate::routes::navigation_recent::load_navigation_recent_records( + state, + context, + actor_id, + Some("folder"), + 10, + ); + let recent_pages = crate::routes::navigation_recent::load_navigation_recent_records( + state, + context, + actor_id, + Some("page"), + 20, + ); + + Ok(format!( + r#"
+
+

{title}

+

{path_label}

+
+ {notice_html} +
+

文件夹

+ {folders} +
+
+

页面

+ {pages} +
+
+

资源

+ {resources} +
+
+

最近访问的文件夹

+ {recent_folders} +
+
+

最近访问的页面

+ {recent_pages} +
+
"#, + relative_path = escape_html(relative_path), + title = escape_html(&title), + path_label = escape_html(if relative_path.is_empty() { + root_uri + } else { + relative_path + }), + notice_html = notice_html, + folders = if folders.is_empty() { + "

没有子文件夹。

".to_string() + } else { + folders.join("") + }, + pages = if pages.is_empty() { + "

没有 Markdown 页面。

".to_string() + } else { + pages.join("") + }, + resources = if resources.is_empty() { + "

没有资源。

".to_string() + } else { + resources.join("") + }, + recent_folders = render_recent_navigation_items(&recent_folders), + recent_pages = render_recent_navigation_items(&recent_pages), + )) +} + +fn render_navigation_guard_notice(query: &RootEntryQuery) -> String { + let route_guard = query + .route_guard + .as_deref() + .map(str::trim) + .filter(|value| !value.is_empty()); + let missing_page = query + .missing_page + .as_deref() + .map(str::trim) + .filter(|value| !value.is_empty()); + let Some(message) = route_guard.or(missing_page).map(|_| { + if route_guard == Some("local_workspace_access_denied") { + "当前账号无权访问原页面，已回到导航页。" + } else if route_guard == Some("local_folder_root_required") { + "原页面缺少本地文件夹信息，已回到导航页。" + } else { + "原页面已不存在，已回到当前文件夹导航页。" + } + }) else { + return String::new(); + }; + let target = missing_page.or(route_guard).unwrap_or_default(); + format!( + r#"
{}{}
"#, + escape_html(target), + escape_html(message), + escape_html(target), + ) +} + +fn render_recent_navigation_items(records: &[NavigationRecentRecord]) -> String { + if records.is_empty() { + return "

暂无最近访问。

".to_string(); + } + records + .iter() + .map(|record| { + let href = if record.kind == "folder" { + navigation_folder_href( + &record.root_uri, + record.relative_path.as_deref().unwrap_or(""), + ) + } else if let Some(document_id) = record.document_id.as_deref() { + navigation_document_href( + &record.root_uri, + parent_scope_from_relative_path(record.relative_path.as_deref().unwrap_or("")), + document_id, + ) + } else { + "#".to_string() + }; + render_navigation_link( + &record.title, + &href, + &record.kind, + record.relative_path.as_deref().unwrap_or(""), + ) + }) + .collect::>() + .join("") +} + +fn render_navigation_link(title: &str, href: &str, kind: &str, relative_path: &str) -> String { + format!( + r#"{}"#, + escape_html(kind), + escape_html(relative_path), + escape_html(href), + escape_html(title), + ) +} + +fn record_navigation_recent_folder( + state: &AppState, + actor_id: &str, + root_uri: &str, + relative_path: &str, + title: &str, + workspace_id: Option<&str>, +) { + if actor_id.trim().is_empty() || actor_id.trim() == "anonymous" || root_uri.trim().is_empty() { + return; + } + let _ = state + .control_plane() + .upsert_navigation_recent(UpsertNavigationRecentInput { + id: None, + user_id: actor_id.trim().to_string(), + workspace_id: workspace_id + .map(str::trim) + .filter(|value| !value.is_empty()) + .map(ToOwned::to_owned), + kind: "folder".to_string(), + source_kind: "local_folder".to_string(), + root_uri: root_uri.trim().to_string(), + relative_path: Some(relative_path.trim().trim_matches('/').to_string()) + .filter(|value| !value.is_empty()), + document_id: None, + title: title.trim().to_string(), + metadata_json: "{}".to_string(), + }); +} + +fn parent_scope_from_relative_path(relative_path: &str) -> &str { + relative_path + .trim() + .rsplit_once('/') + .map(|(parent, _)| parent) + .unwrap_or("") +} + +fn navigation_folder_href(root_uri: &str, relative_path: &str) -> String { + let mut href = format!( + "/?sourceKind=local_folder&rootUri={}&treeView=filetree", + query_escape(root_uri) + ); + if !relative_path.trim().is_empty() { + href.push_str("&fileTreeScope="); + href.push_str(&query_escape(relative_path)); + } + href +} + +fn navigation_document_href(root_uri: &str, file_tree_scope: &str, document_id: &str) -> String { + let mut href = format!( + "/documents/{}?sourceKind=local_folder&rootUri={}&treeView=filetree", + query_escape(document_id), + query_escape(root_uri) + ); + if !file_tree_scope.trim().is_empty() { + href.push_str("&fileTreeScope="); + href.push_str(&query_escape(file_tree_scope)); + } + href +} + +fn query_escape(value: &str) -> String { + value + .bytes() + .flat_map(|byte| match byte { + b'A'..=b'Z' | b'a'..=b'z' | b'0'..=b'9' | b'-' | b'_' | b'.' => { + vec![byte as char] + } + _ => format!("%{byte:02X}").chars().collect::>(), + }) + .collect() +} + pub async fn trash_entry( State(state): State, Extension(context): Extension, @@ -1606,7 +1957,7 @@ async fn resolve_root_workspace_id( return Ok(workspace_id.to_string()); } - let bootstrap = execute_convex_mutation_by_name( + let bootstrap = execute_retired_mutation_by_name( state.config(), context, "workspaces:ensureDefaultWorkspace", @@ -2097,11 +2448,12 @@ fn normalize_legacy_referer(value: &HeaderValue, upstream_origin: &str) -> Strin #[cfg(test)] mod tests { - use crate::app::{build_app, AppConfig, AppState}; - use axum::body::{to_bytes, Body}; - use axum::http::{header, HeaderMap, HeaderValue, Request, StatusCode}; + use crate::app::{AppConfig, AppState, build_app}; + use axum::body::{Body, to_bytes}; + use axum::http::{HeaderMap, HeaderValue, Request, StatusCode, header}; use axum::response::{Html, IntoResponse}; use axum::routing::{get, post}; + use control_plane::{UpsertNavigationRecentInput, UpsertUserInput}; use tokio::net::TcpListener; use tower::util::ServiceExt; @@ -2334,7 +2686,7 @@ mod tests { false, None, Some( - r#"{"sidebar:datasetList":{"active_workspace_id":"ws_demo","workspaces":[{"id":"ws_demo","name":"我的空间"}],"documents":[{"id":"page_alive","workspace_id":"ws_demo","title":"保留页面","parent_id":null,"sort_order":0,"is_starred":false}],"trashed_documents":[{"id":"page_trash","workspace_id":"ws_demo","title":"已删页面","parent_id":null,"sort_order":1,"deleted_at":"2026-05-14T00:00:00Z","deleted_by":"user_real"}],"media_assets":[],"trashed_media_assets":[{"id":"asset_trash","workspace_id":"ws_demo","document_id":"page_trash","file_name":"已删附件.png","deleted_at":"2026-05-14T00:00:00Z"}],"mindmap_assets":[],"trashed_mindmap_assets":[{"id":"mind_trash","workspace_id":"ws_demo","document_id":"page_trash","file_name":"已删思维导图.json","deleted_at":"2026-05-14T00:00:00Z"}],"table_assets":[],"trashed_table_assets":[{"id":"table_trash","workspace_id":"ws_demo","document_id":"page_trash","file_name":"已删表格.luckysheet","deleted_at":"2026-05-14T00:00:00Z"}],"mindmap_docs":[],"mindmap_asset_children":{}}}"#.into(), + r#"{"sidebar:datasetList":{"active_workspace_id":"ws_demo","workspaces":[{"id":"ws_demo","name":"我的空间"}],"documents":[{"id":"page_alive","workspace_id":"ws_demo","title":"保留页面","parent_id":null,"sort_order":0,"is_starred":false}],"trashed_documents":[{"id":"page_trash","workspace_id":"ws_demo","title":"已删页面","parent_id":null,"sort_order":1,"deleted_at":"2026-05-14T00:00:00Z","deleted_by":"user_real"}],"media_assets":[],"trashed_media_assets":[{"id":"asset_trash","workspace_id":"ws_demo","document_id":"page_trash","file_name":"已删附件.png","deleted_at":"2026-05-14T00:00:00Z"}],"mindmap_assets":[],"trashed_mindmap_assets":[{"id":"mind_trash","workspace_id":"ws_demo","document_id":"page_trash","file_name":"已删思维导图.json","deleted_at":"2026-05-14T00:00:00Z"}],"table_assets":[],"trashed_table_assets":[{"id":"table_trash","workspace_id":"ws_demo","document_id":"page_trash","file_name":"已删表格.table","deleted_at":"2026-05-14T00:00:00Z"}],"mindmap_docs":[],"mindmap_asset_children":{}}}"#.into(), ), ) .oneshot( @@ -2367,7 +2719,7 @@ mod tests { assert!(html.contains(r#"data-resource-kind="table""#)); assert!(html.contains("已删附件.png")); assert!(html.contains("已删思维导图.json")); - assert!(html.contains("已删表格.luckysheet")); + assert!(html.contains("已删表格.table")); assert!(html.contains("new EventSource")); assert!(html.contains("/api/tree/events")); assert!(!html.contains("pollMs")); @@ -2476,6 +2828,30 @@ mod tests { assert_eq!(empty, None); } + #[tokio::test] + async fn root_entry_unauthenticated_redirects_to_auth_with_next() { + let response = app_with_config("http://127.0.0.1:3100".into(), false) + .oneshot( + Request::builder() + .uri("/?sourceKind=local_folder&rootUri=file:///tmp/mnote&treeView=filetree") + .body(Body::empty()) + .expect("request"), + ) + .await + .expect("response"); + + assert_eq!(response.status(), StatusCode::SEE_OTHER); + assert_eq!( + response + .headers() + .get(header::LOCATION) + .and_then(|value| value.to_str().ok()), + Some( + "/auth?next=%2F%3FsourceKind%3Dlocal_folder%26rootUri%3Dfile%3A%2F%2F%2Ftmp%2Fmnote%26treeView%3Dfiletree" + ) + ); + } + #[tokio::test] async fn root_entry_uses_recent_page_cookie_as_active_page() { let response = app_with_config("http://127.0.0.1:3100".into(), false) @@ -2580,8 +2956,10 @@ mod tests { assert!(!html.contains("初始化的新页面")); assert!(html.contains(r#"data-mnote-source-kind="local_folder""#)); assert!(html.contains(r#"data-testid="mnote-document-workspace""#)); + assert!(html.contains(r#"data-testid="mnote-navigation-page""#)); assert!(html.contains(r#"data-mnote-resource-tab-host="true""#)); assert!(html.contains("__MNOTE_DOCUMENT_PANES_BOOTSTRAP__")); + assert!(!html.contains("__MNOTE_PAGE_AGGREGATE__")); assert!(!html.contains(r#"data-testid="mnote-create-default-local-workspace""#)); assert!(!html.contains(r#"data-testid="mnote-open-local-folder-empty""#)); assert!(!html.contains("workspaces:ensureDefaultWorkspace")); @@ -2641,7 +3019,7 @@ mod tests { #[tokio::test] async fn root_entry_uses_sqlite_session_display_name_for_workspace_label() { - use control_plane::{session_token_hash, CreateSessionInput, UpsertUserInput}; + use control_plane::{CreateSessionInput, UpsertUserInput, session_token_hash}; let app_state = AppState::new(AppConfig { service_name: "mnote-web".into(), @@ -2827,6 +3205,205 @@ mod tests { assert!(!html.contains(r#"href="/tree"#)); } + #[tokio::test] + async fn root_entry_local_folder_without_page_renders_navigation_page_without_editor_bootstrap() + { + let root = temp_root("mnote-root-local-folder-navigation-page"); + std::fs::create_dir_all(root.join("docs")).expect("create local docs"); + std::fs::write(root.join("README.md"), "# Local Root\n正文\n").expect("write root md"); + std::fs::write(root.join("docs").join("child.md"), "# Child\n").expect("write child md"); + + let root_uri = format!("file://{}", root.display()); + crate::routes::local_folder_source::initialize_local_workspace_for_actor( + "user_real", + &root_uri, + ) + .expect("init local workspace"); + let response = app_with_config("http://127.0.0.1:3100".into(), false) + .oneshot( + Request::builder() + .uri(format!( + "/?sourceKind=local_folder&rootUri={root_uri}&treeView=filetree" + )) + .header("cookie", "mnote_recent_page_id=local-md:README.md") + .header("x-mnote-actor-id", "user_real") + .header("x-mnote-actor-type", "user") + .body(Body::empty()) + .expect("request"), + ) + .await + .expect("response"); + + let _ = std::fs::remove_dir_all(&root); + + assert_eq!(response.status(), StatusCode::OK); + let body = to_bytes(response.into_body(), usize::MAX) + .await + .expect("body"); + let html = String::from_utf8(body.to_vec()).expect("utf8"); + assert!(html.contains(r#"data-testid="mnote-navigation-page""#)); + assert!(html.contains(r#"data-navigation-scope-kind="folder""#)); + assert!(html.contains("README.md")); + assert!(html.contains("docs")); + assert!(html.contains("最近访问的文件夹")); + assert!(html.contains("最近访问的页面")); + assert!(!html.contains(r#"data-root-active-page-id="local-md:README.md""#)); + assert!(!html.contains("__MNOTE_PAGE_AGGREGATE__")); + assert!(!html.contains("__MNOTE_EDITOR_BOOTSTRAP__")); + assert!(html.contains("__MNOTE_DOCUMENT_PANES_BOOTSTRAP__")); + assert!(!html.contains("mnote-leptos-tiptap-spike-island")); + } + + #[tokio::test] + async fn root_entry_local_folder_scope_renders_navigation_without_root_sibling_document() { + let root = temp_root("mnote-root-local-folder-scope-navigation-page"); + std::fs::create_dir_all(root.join("design").join("05-editor-mainline")) + .expect("create scoped tree"); + std::fs::write(root.join("Home.md"), "# Home\n").expect("write root page"); + std::fs::write(root.join("design").join("Plan.md"), "# Plan\n").expect("write plan"); + + let root_uri = format!("file://{}", root.display()); + crate::routes::local_folder_source::initialize_local_workspace_for_actor( + "user_real", + &root_uri, + ) + .expect("init local workspace"); + let response = app_with_config("http://127.0.0.1:3100".into(), false) + .oneshot( + Request::builder() + .uri(format!( + "/?sourceKind=local_folder&rootUri={root_uri}&treeView=filetree&fileTreeScope=design&missingPage=local-md%3Adesign%7E2FMissing.md" + )) + .header("x-mnote-actor-id", "user_real") + .header("x-mnote-actor-type", "user") + .body(Body::empty()) + .expect("request"), + ) + .await + .expect("response"); + + let _ = std::fs::remove_dir_all(&root); + + assert_eq!(response.status(), StatusCode::OK); + let body = to_bytes(response.into_body(), usize::MAX) + .await + .expect("body"); + let html = String::from_utf8(body.to_vec()).expect("utf8"); + assert!(html.contains(r#"data-testid="mnote-navigation-page""#)); + assert!(html.contains(r#"data-navigation-relative-path="design""#)); + assert!(html.contains("Plan.md")); + assert!(html.contains("05-editor-mainline")); + assert!(html.contains(r#"data-testid="mnote-navigation-guard-notice""#)); + assert!(html.contains("原页面已不存在")); + assert!(html.contains("local-md:design~2FMissing.md")); + assert!(!html.contains("Home.md")); + assert!(!html.contains("__MNOTE_PAGE_AGGREGATE__")); + } + + #[tokio::test] + async fn root_entry_local_folder_navigation_renders_user_recent_links() { + let root = temp_root("mnote-root-local-folder-navigation-recent"); + std::fs::create_dir_all(root.join("docs")).expect("create docs"); + std::fs::write(root.join("docs").join("Plan.md"), "# Plan\n").expect("write plan"); + std::fs::create_dir_all(root.join("archive")).expect("create archive"); + + let root_uri = format!("file://{}", root.display()); + crate::routes::local_folder_source::initialize_local_workspace_for_actor( + "user_real", + &root_uri, + ) + .expect("init local workspace"); + let state = AppState::new(AppConfig { + service_name: "mnote-web".into(), + service_version: "0.1.0".into(), + bind_addr: "127.0.0.1:0".into(), + public_bind_addr: "127.0.0.1:3000".into(), + legacy_next_base_url: Some("http://127.0.0.1:3100".into()), + enable_legacy_next_compat: false, + enable_debug_shell_routes: false, + enable_editor_actor: true, + hermes_base_path: "/api/hermes".into(), + compat_next_base_path: "/api/compat/next".into(), + convex_url: None, + convex_admin_key: None, + allow_dev_fixtures: true, + query_fixtures_json: None, + mutation_fixtures_json: None, + dev_user_id: "dev-user".into(), + dev_user_name: "开发用户".into(), + dev_user_email: "dev@mnote.local".into(), + }); + state + .control_plane() + .upsert_user(UpsertUserInput { + id: Some("user_real".to_string()), + email: Some("user_real@example.com".to_string()), + username: "user_real".to_string(), + display_name: "user_real".to_string(), + role: None, + password_hash: None, + }) + .expect("upsert user"); + state + .control_plane() + .upsert_navigation_recent(UpsertNavigationRecentInput { + id: None, + user_id: "user_real".to_string(), + workspace_id: None, + kind: "folder".to_string(), + source_kind: "local_folder".to_string(), + root_uri: root_uri.clone(), + relative_path: Some("archive".to_string()), + document_id: None, + title: "archive".to_string(), + metadata_json: "{}".to_string(), + }) + .expect("folder recent"); + state + .control_plane() + .upsert_navigation_recent(UpsertNavigationRecentInput { + id: None, + user_id: "user_real".to_string(), + workspace_id: None, + kind: "page".to_string(), + source_kind: "local_folder".to_string(), + root_uri: root_uri.clone(), + relative_path: Some("docs/Plan.md".to_string()), + document_id: Some("local-md:docs~2FPlan.md".to_string()), + title: "Plan".to_string(), + metadata_json: "{}".to_string(), + }) + .expect("page recent"); + + let response = build_app(state) + .oneshot( + Request::builder() + .uri(format!( + "/?sourceKind=local_folder&rootUri={root_uri}&treeView=filetree" + )) + .header("x-mnote-actor-id", "user_real") + .header("x-mnote-actor-type", "user") + .body(Body::empty()) + .expect("request"), + ) + .await + .expect("response"); + + let _ = std::fs::remove_dir_all(&root); + + assert_eq!(response.status(), StatusCode::OK); + let body = to_bytes(response.into_body(), usize::MAX) + .await + .expect("body"); + let html = String::from_utf8(body.to_vec()).expect("utf8"); + assert!(html.contains(r#"data-testid="mnote-navigation-recent-folders""#)); + assert!(html.contains(r#"data-local-relative-path="archive""#)); + assert!(html.contains("fileTreeScope=archive")); + assert!(html.contains(r#"data-testid="mnote-navigation-recent-pages""#)); + assert!(html.contains(r#"href="/documents/local-md%3Adocs%7E2FPlan.md"#)); + assert!(html.contains("fileTreeScope=docs")); + } + #[tokio::test] async fn root_entry_local_folder_reuses_page_tree_snapshot_for_sidebar_html() { let root = temp_root("mnote-root-local-folder-page-tree-snapshot-once"); @@ -2859,7 +3436,9 @@ mod tests { assert_eq!(response.status(), StatusCode::OK); assert_eq!( - crate::routes::local_folder_source::local_page_tree_snapshot_test_loads(), + crate::routes::local_folder_source::local_page_tree_snapshot_test_loads_for_root( + &root_uri + ), 1, "root entry should reuse the already loaded local page tree snapshot instead of scanning it twice", ); @@ -2907,7 +3486,9 @@ mod tests { .expect("body"); let html = String::from_utf8(body.to_vec()).expect("utf8"); assert!(html.contains(r#"data-node-id="local-dir:design~2F05-editor-mainline""#)); - assert!(html.contains(r#"data-node-id="local-md:design~2F05-editor-mainline~2FTarget.md""#)); + assert!( + html.contains(r#"data-node-id="local-md:design~2F05-editor-mainline~2FTarget.md""#) + ); assert!( !html.contains(r#"data-node-id="local-md:Home.md""#), "星标 scoped folder 入口的 PageTree 不应回退到 workspace root 页面树" @@ -2953,17 +3534,18 @@ mod tests { assert!(html.contains(r#"data-row-id="local:folder:attachments""#)); assert!(!html.contains(r#"data-row-id="local:asset:attachments/report-a.pdf""#)); assert!(html.contains(r#"data-testid="mnote-document-workspace""#)); + assert!(html.contains(r#"data-testid="mnote-navigation-page""#)); assert!(html.contains(r#"data-mnote-resource-tab-host="true""#)); - assert!(html.contains(r#"data-testid="mnote-leptos-tiptap-island-editor-root""#)); + assert!(!html.contains(r#"data-testid="mnote-leptos-tiptap-island-editor-root""#)); assert!(html.contains(r#"data-pane-role="primary""#)); assert!(html.contains("__MNOTE_DOCUMENT_PANES_BOOTSTRAP__")); assert!(html.contains( r#""# )); - assert!(html.contains( + assert!(!html.contains( r#""# )); - assert!(html.contains( + assert!(!html.contains( r#""# )); assert!( @@ -2991,7 +3573,7 @@ mod tests { .headers() .get(header::LOCATION) .and_then(|value| value.to_str().ok()), - Some("/auth") + Some("/auth?next=%2F") ); assert_eq!( response @@ -3090,12 +3672,14 @@ mod tests { .and_then(|value| value.to_str().ok()), Some("mnote-web") ); - assert!(response - .headers() - .get("content-type") - .and_then(|value| value.to_str().ok()) - .unwrap_or_default() - .contains("text/html")); + assert!( + response + .headers() + .get("content-type") + .and_then(|value| value.to_str().ok()) + .unwrap_or_default() + .contains("text/html") + ); } #[tokio::test] @@ -3150,12 +3734,16 @@ mod tests { .map(|value| value.to_str().unwrap_or_default()) .collect::>(); assert!(values.iter().any(|value| value.contains("mnote_session="))); - assert!(values - .iter() - .any(|value| value.contains("mnote_actor_id=new-user"))); - assert!(values - .iter() - .any(|value| value.contains("mnote_actor_type=user"))); + assert!( + values + .iter() + .any(|value| value.contains("mnote_actor_id=new-user")) + ); + assert!( + values + .iter() + .any(|value| value.contains("mnote_actor_type=user")) + ); let body = to_bytes(response.into_body(), usize::MAX) .await .expect("body"); @@ -3234,10 +3822,12 @@ mod tests { .expect("body"); let payload: serde_json::Value = serde_json::from_slice(&body).expect("json"); assert_eq!(payload["code"], "auth_signup_email_required"); - assert!(payload["message"] - .as_str() - .unwrap_or_default() - .contains("注册账号时请填写邮箱")); + assert!( + payload["message"] + .as_str() + .unwrap_or_default() + .contains("注册账号时请填写邮箱") + ); } #[tokio::test] @@ -3261,9 +3851,11 @@ mod tests { .iter() .map(|value| value.to_str().unwrap_or_default()) .collect::>(); - assert!(values - .iter() - .any(|value| value.contains("mnote_session=") && value.contains("Max-Age=0"))); + assert!( + values + .iter() + .any(|value| value.contains("mnote_session=") && value.contains("Max-Age=0")) + ); } #[tokio::test] @@ -3369,12 +3961,16 @@ mod tests { .iter() .map(|value| value.to_str().unwrap_or_default()) .collect::>(); - assert!(!values - .iter() - .any(|value| value.contains("__convexAuthJWT="))); - assert!(!values - .iter() - .any(|value| value.contains("__convexAuthRefreshToken="))); + assert!( + !values + .iter() + .any(|value| value.contains("__convexAuthJWT=")) + ); + assert!( + !values + .iter() + .any(|value| value.contains("__convexAuthRefreshToken=")) + ); assert!(response.headers().get("x-mnote-legacy-upstream").is_none()); } diff --git a/rust/crates/mnote-web/src/routes/health.rs b/rust/crates/mnote-web/src/routes/health.rs index b26fa25e..493e45dd 100644 --- a/rust/crates/mnote-web/src/routes/health.rs +++ b/rust/crates/mnote-web/src/routes/health.rs @@ -1,7 +1,7 @@ use crate::app::AppState; use crate::context::RequestContext; -use axum::extract::{Extension, State}; use axum::Json; +use axum::extract::{Extension, State}; use serde::Serialize; #[derive(Debug, Serialize)] diff --git a/rust/crates/mnote-web/src/routes/hermes.rs b/rust/crates/mnote-web/src/routes/hermes.rs index 7c13d84d..f6248a0e 100644 --- a/rust/crates/mnote-web/src/routes/hermes.rs +++ b/rust/crates/mnote-web/src/routes/hermes.rs @@ -1,15 +1,15 @@ use crate::app::AppState; use crate::context::RequestContext; use crate::error::WebError; +use axum::Json; use axum::extract::{Extension, State}; use axum::http::{HeaderMap, HeaderName, HeaderValue, StatusCode}; -use axum::Json; use bridge_runtime::{ - build_failure_response, build_success_response, execute_runtime_input, execute_runtime_query, - runtime_input_requests_result, RuntimeInput, + RuntimeInput, build_failure_response, build_success_response, execute_runtime_input, + execute_runtime_query, runtime_input_requests_result, }; use serde::Serialize; -use serde_json::{json, Value}; +use serde_json::{Value, json}; const HEADER_MNOTE_WEB_OWNER: &str = "x-mnote-web-owner"; const HEADER_AI_BRIDGE_OWNER: &str = "x-mnote-ai-bridge-owner"; @@ -150,10 +150,10 @@ fn stamp_ai_bridge_headers() -> HeaderMap { #[cfg(test)] mod tests { - use crate::app::{build_app, AppConfig, AppState}; - use axum::body::{to_bytes, Body}; + use crate::app::{AppConfig, AppState, build_app}; + use axum::body::{Body, to_bytes}; use axum::http::{Request, StatusCode}; - use serde_json::{json, Value}; + use serde_json::{Value, json}; use tower::util::ServiceExt; fn app() -> axum::Router { @@ -253,10 +253,12 @@ mod tests { assert_eq!(payload["contract"]["toolEventOwner"], "rust-web-hermes"); assert_eq!(payload["contract"]["clientActionOwner"], "rust-web-hermes"); assert_eq!(payload["canonicalRoute"], "/api/hermes/bridge"); - assert!(payload["eventStreamEndpoint"] - .as_str() - .unwrap_or_default() - .contains("/api/hermes/events/")); + assert!( + payload["eventStreamEndpoint"] + .as_str() + .unwrap_or_default() + .contains("/api/hermes/events/") + ); } #[tokio::test] diff --git a/rust/crates/mnote-web/src/routes/hermes_client.rs b/rust/crates/mnote-web/src/routes/hermes_client.rs index 325081f6..faa3ff3d 100644 --- a/rust/crates/mnote-web/src/routes/hermes_client.rs +++ b/rust/crates/mnote-web/src/routes/hermes_client.rs @@ -3,16 +3,16 @@ use crate::app::AppState; use crate::context::RequestContext; use crate::error::WebError; use crate::hermes_tools::manifest; -use crate::transport::convex::{execute_convex_mutation_by_name, execute_convex_query_by_name}; +use crate::transport::convex::{execute_retired_mutation_by_name, execute_retired_query_by_name}; +use axum::Json; use axum::body::Body; use axum::extract::{Extension, Path, Query, State}; -use axum::http::{header, HeaderMap, HeaderName, HeaderValue, StatusCode}; +use axum::http::{HeaderMap, HeaderName, HeaderValue, StatusCode, header}; use axum::response::Response; -use axum::Json; use control_plane::{AppendAiRuntimeEventInput, UpsertAiRuntimeRunInput}; use futures_util::TryStreamExt; use serde::Deserialize; -use serde_json::{json, Value}; +use serde_json::{Value, json}; use std::collections::{BTreeMap, HashMap, HashSet, VecDeque}; use std::env; use std::fs; @@ -303,7 +303,7 @@ pub async fn search_sessions( if let Some(workspace_id) = workspace_id.clone() { args.insert("workspaceId".into(), Value::String(workspace_id)); } - let results = execute_convex_query_by_name( + let results = execute_retired_query_by_name( state.config(), &context, "aiSessions:searchRuntimeSessions", @@ -363,8 +363,10 @@ async fn list_acp_sessions( WebError::bad_request_code("local_ai_session_root_required", "缺少本地会话 rootUri") .with_context(context) })?; - crate::routes::ensure_local_workspace_access(context, root_uri) - .map_err(|error| error.with_context(context))?; + crate::routes::local_folder_source::ensure_local_workspace_write_access_with_state( + state, context, root_uri, + ) + .map_err(|error| error.with_context(context))?; let limit = query .get("limit") .and_then(|value| value.parse::().ok()) @@ -445,7 +447,7 @@ async fn list_acp_sessions( args.insert("sessionId".into(), Value::String(session_id)); } args.insert("limit".into(), Value::from(limit)); - let sessions = execute_convex_query_by_name( + let sessions = execute_retired_query_by_name( state.config(), context, "aiSessions:listRuntimeRuns", @@ -519,8 +521,10 @@ pub async fn create_session( .map_err(|error| error.with_context(&context))?; Some(grant) } else { - crate::routes::ensure_local_workspace_access(&context, root_uri) - .map_err(|error| error.with_context(&context))?; + crate::routes::local_folder_source::ensure_local_workspace_write_access_with_state( + &state, &context, root_uri, + ) + .map_err(|error| error.with_context(&context))?; None }; let permission_level = share_grant @@ -1045,7 +1049,7 @@ pub async fn resume_session( ) -> Result<(StatusCode, HeaderMap, Json), WebError> { if is_acp_session_query(&query) { let result = get_acp_session(&state, &context, &session_id, &query).await?; - let mut payload = result.2 .0; + let mut payload = result.2.0; payload["resumed"] = Value::Bool(true); payload["resumeSource"] = payload .get("persistence") @@ -1275,7 +1279,7 @@ async fn execute_acp_session_mutation( if let Some(Value::Object(extra)) = extra { args.extend(extra); } - execute_convex_mutation_by_name( + execute_retired_mutation_by_name( state.config(), context, function_name, @@ -1312,8 +1316,10 @@ async fn get_acp_session( WebError::bad_request_code("local_ai_session_root_required", "缺少本地会话 rootUri") .with_context(context) })?; - crate::routes::ensure_local_workspace_access(context, root_uri) - .map_err(|error| error.with_context(context))?; + crate::routes::local_folder_source::ensure_local_workspace_write_access_with_state( + state, context, root_uri, + ) + .map_err(|error| error.with_context(context))?; let events = read_local_ai_session_events(root_uri, session_id, None)?; return Ok(( StatusCode::OK, @@ -1397,7 +1403,7 @@ async fn get_acp_session( run_args.insert("workspaceId".into(), Value::String(workspace_id)); } run_args.insert("limit".into(), Value::from(20u64)); - let runs = execute_convex_query_by_name( + let runs = execute_retired_query_by_name( state.config(), context, "aiSessions:listRuntimeRuns", @@ -1417,7 +1423,7 @@ async fn get_acp_session( .map(str::trim) .filter(|value| !value.is_empty()) { - execute_convex_query_by_name( + execute_retired_query_by_name( state.config(), context, "aiSessions:listRuntimeEvents", @@ -1488,6 +1494,7 @@ pub async fn create_run( ensure_authenticated(&context)?; let (actor_id, actor_type) = resolve_run_actor(&state, &context).await; stamp_run_actor(&mut payload, &actor_id, &actor_type); + enforce_local_ai_run_access(&state, &context, &actor_id, &mut payload)?; let registration = run_registration_from_payload(&context, &payload); // ACP path: skip the HTTP proxy, just register and return run info @@ -1566,8 +1573,8 @@ pub async fn create_run( Some(®istration.profile), ) .await?; - if let Some(runtime) = register_runtime_from_create_run_response(®istration, &result.2 .0) { - let mut payload = result.2 .0; + if let Some(runtime) = register_runtime_from_create_run_response(®istration, &result.2.0) { + let mut payload = result.2.0; payload["runtime"] = runtime; Ok((result.0, result.1, Json(payload))) } else { @@ -2223,11 +2230,7 @@ fn profile_home(profile: &str) -> PathBuf { return home; } let candidate = home.join("profiles").join(profile); - if candidate.exists() { - candidate - } else { - home - } + if candidate.exists() { candidate } else { home } } fn profile_config_path(profile: &str) -> PathBuf { @@ -3309,6 +3312,98 @@ fn local_share_permission_allows_write(permission: &str, capabilities: &HashSet< (permission == "write" || permission == "shared_write") && has_ai } +fn local_directory_permission_allows_write(permission: &str) -> bool { + matches!( + permission.trim().to_ascii_lowercase().as_str(), + "write" | "read_write" | "owner" | "admin" + ) +} + +fn local_directory_permission_allows_read(permission: &str) -> bool { + matches!( + permission.trim().to_ascii_lowercase().as_str(), + "read" | "write" | "read_write" | "owner" | "admin" + ) +} + +fn local_ai_permission_level(permission: &str) -> &'static str { + if local_directory_permission_allows_write(permission) { + "read_write" + } else if permission.trim().eq_ignore_ascii_case("read") { + "read" + } else { + "none" + } +} + +fn enforce_local_ai_run_access( + state: &AppState, + context: &RequestContext, + actor_id: &str, + payload: &mut Value, +) -> Result<(), WebError> { + if payload + .get("sourceKind") + .and_then(Value::as_str) + .map(str::trim) + != Some("local_folder") + { + return Ok(()); + } + if local_session_share_id(payload).is_some() { + return Ok(()); + } + let root_uri = payload + .get("rootUri") + .and_then(Value::as_str) + .map(str::trim) + .filter(|value| !value.is_empty()) + .ok_or_else(|| { + WebError::bad_request_code("local_ai_session_root_required", "缺少本地会话 rootUri") + .with_context(context) + })? + .to_string(); + let access = state + .control_plane() + .resolve_access(actor_id, &root_uri) + .map_err(|error| WebError::internal(format!("SQLite 目录授权解析失败: {error}")))?; + let agent_id = payload + .get("agentId") + .or_else(|| payload.get("agent_id")) + .and_then(Value::as_str) + .map(str::trim) + .unwrap_or_default(); + let chat_only = agent_id == "chat_only"; + if chat_only && !local_directory_permission_allows_read(&access.permission) { + return Err(WebError::new( + StatusCode::FORBIDDEN, + "local_ai_workspace_read_access_denied", + "当前用户无权让 AI 读取该本地工作区", + ) + .with_context(context)); + } + if !chat_only && !local_directory_permission_allows_write(&access.permission) { + return Err(WebError::new( + StatusCode::FORBIDDEN, + "local_ai_workspace_write_access_denied", + "当前用户无权让 AI 写入该本地工作区", + ) + .with_context(context)); + } + payload["permissionLevel"] = Value::String(if chat_only { + "read_only".into() + } else { + local_ai_permission_level(&access.permission).into() + }); + payload["allowedRoots"] = json!([{ + "rootUri": root_uri, + "permission": if chat_only { "read" } else { "write" }, + "source": "sqlite_directory_grant", + "grantIds": access.grant_ids + }]); + Ok(()) +} + fn local_share_grant_for_payload(payload: &Value) -> Result, WebError> { let share_id = payload .get("shareId") @@ -3535,6 +3630,28 @@ fn acp_allowed_roots_env_for_payload(payload: &Value) -> Option>() + }) + .filter(|items| !items.is_empty()) + .unwrap_or_else(|| vec![root_uri.to_string()]); + let allowed_root_paths = allowed_root_uris + .iter() + .filter_map(|uri| file_root_uri_to_permission_path(uri)) + .collect::>(); let workspace_id = payload .get("workspaceId") .and_then(Value::as_str) @@ -3579,7 +3696,7 @@ fn acp_allowed_roots_env_for_payload(payload: &Value) -> Option Option Result Result Result, WebError> { - let payload = execute_convex_query_by_name( + let payload = execute_retired_query_by_name( state.config(), context, "users:currentUser", @@ -4245,6 +4390,188 @@ fn sanitize_run_page_context(page_context: Value) -> Value { Value::Object(sanitized) } +fn sanitize_workspace_path(value: &Value) -> Value { + let Some(source) = value.as_object() else { + return Value::Null; + }; + let mut sanitized = serde_json::Map::new(); + for key in [ + "schema", + "workspaceId", + "sourceKind", + "rootUri", + "relativePath", + "documentId", + "objectIdentity", + "assetId", + "resourceKind", + ] { + if let Some(value) = source.get(key) { + sanitized.insert(key.to_string(), value.clone()); + } + } + if sanitized.is_empty() { + Value::Null + } else { + Value::Object(sanitized) + } +} + +fn sanitize_run_editor_target(value: &Value) -> Value { + let Some(source) = value.as_object() else { + return Value::Null; + }; + let mut sanitized = serde_json::Map::new(); + for key in [ + "schema", + "source", + "objectIdentity", + "paneRole", + "documentId", + "workspaceId", + "editorKind", + "active", + "dirtyState", + "preview", + "pinned", + "lastActiveAt", + "assetId", + "path", + ] { + if let Some(value) = source.get(key) { + sanitized.insert(key.to_string(), value.clone()); + } + } + if let Some(workspace_path) = source.get("workspacePath") { + let sanitized_workspace_path = sanitize_workspace_path(workspace_path); + if !sanitized_workspace_path.is_null() { + sanitized.insert("workspacePath".to_string(), sanitized_workspace_path); + } + } + if sanitized.is_empty() { + Value::Null + } else { + Value::Object(sanitized) + } +} + +fn sanitize_open_editors_group(value: Option<&Value>) -> Value { + let Some(source) = value.and_then(Value::as_object) else { + return Value::Null; + }; + let mut sanitized = serde_json::Map::new(); + for key in ["paneRole", "activeObjectIdentity"] { + if let Some(value) = source.get(key) { + sanitized.insert(key.to_string(), value.clone()); + } + } + for key in ["editors", "resourceEditors"] { + let entries = source + .get(key) + .and_then(Value::as_array) + .map(|items| { + items + .iter() + .map(sanitize_run_editor_target) + .filter(|item| !item.is_null()) + .collect::>() + }) + .unwrap_or_default(); + sanitized.insert(key.to_string(), Value::Array(entries)); + } + Value::Object(sanitized) +} + +fn sanitize_run_open_editors_snapshot(value: &Value) -> Value { + let Some(source) = value.as_object() else { + return Value::Null; + }; + let mut sanitized = serde_json::Map::new(); + for key in ["schema", "generatedAt", "activeObjectIdentity"] { + if let Some(value) = source.get(key) { + sanitized.insert(key.to_string(), value.clone()); + } + } + if let Some(active_editor) = source.get("activeEditor") { + let sanitized_active = sanitize_run_editor_target(active_editor); + if !sanitized_active.is_null() { + sanitized.insert("activeEditor".to_string(), sanitized_active); + } + } + for key in ["editors", "resourceEditors"] { + let entries = source + .get(key) + .and_then(Value::as_array) + .map(|items| { + items + .iter() + .map(sanitize_run_editor_target) + .filter(|item| !item.is_null()) + .collect::>() + }) + .unwrap_or_default(); + sanitized.insert(key.to_string(), Value::Array(entries)); + } + if let Some(groups) = source.get("groups").and_then(Value::as_object) { + sanitized.insert( + "groups".to_string(), + json!({ + "primary": sanitize_open_editors_group(groups.get("primary")), + "secondary": sanitize_open_editors_group(groups.get("secondary")) + }), + ); + } + if sanitized.is_empty() { + Value::Null + } else { + Value::Object(sanitized) + } +} + +fn sanitize_run_target_snapshot(value: &Value) -> Value { + let Some(source) = value.as_object() else { + return Value::Null; + }; + let mut sanitized = serde_json::Map::new(); + for key in [ + "schema", + "source", + "frozenAt", + "workspaceId", + "documentId", + "sourceKind", + "rootUri", + "contextScope", + "promptPreview", + "runId", + "sessionId", + "traceId", + ] { + if let Some(value) = source.get(key) { + sanitized.insert(key.to_string(), value.clone()); + } + } + for key in ["editorTarget", "activeEditorTarget"] { + if let Some(value) = source.get(key) { + let sanitized_target = sanitize_run_editor_target(value); + if !sanitized_target.is_null() { + sanitized.insert(key.to_string(), sanitized_target); + } + } + } + if let Some(value) = source.get("openEditorsSnapshot") { + let sanitized_snapshot = sanitize_run_open_editors_snapshot(value); + if !sanitized_snapshot.is_null() { + sanitized.insert("openEditorsSnapshot".to_string(), sanitized_snapshot); + } + } + if sanitized.is_empty() { + Value::Null + } else { + Value::Object(sanitized) + } +} + fn sanitize_run_local_page_context(page_context: Value) -> Value { let Some(source) = page_context.as_object() else { return Value::Null; @@ -4271,6 +4598,24 @@ fn sanitize_run_local_page_context(page_context: Value) -> Value { slim_ai_context.insert(key.to_string(), value.clone()); } } + if let Some(value) = ai_context.get("activeEditorTarget") { + let sanitized = sanitize_run_editor_target(value); + if !sanitized.is_null() { + slim_ai_context.insert("activeEditorTarget".to_string(), sanitized); + } + } + if let Some(value) = ai_context.get("openEditorsSnapshot") { + let sanitized = sanitize_run_open_editors_snapshot(value); + if !sanitized.is_null() { + slim_ai_context.insert("openEditorsSnapshot".to_string(), sanitized); + } + } + if let Some(value) = ai_context.get("runTargetSnapshot") { + let sanitized = sanitize_run_target_snapshot(value); + if !sanitized.is_null() { + slim_ai_context.insert("runTargetSnapshot".to_string(), sanitized); + } + } if !slim_ai_context.is_empty() { sanitized.insert("aiContext".to_string(), Value::Object(slim_ai_context)); } @@ -5110,8 +5455,10 @@ async fn persist_acp_runtime_run( ) .map_err(|error| error.with_context(context))?; } else { - crate::routes::ensure_local_workspace_access(context, root_uri) - .map_err(|error| error.with_context(context))?; + crate::routes::local_folder_source::ensure_local_workspace_write_access_with_state( + state, context, root_uri, + ) + .map_err(|error| error.with_context(context))?; } let mut event = args.clone(); if let Value::Object(map) = &mut event { @@ -5271,8 +5618,10 @@ async fn persist_acp_runtime_event( ) .map_err(|error| error.with_context(context))?; } else { - crate::routes::ensure_local_workspace_access(context, root_uri) - .map_err(|error| error.with_context(context))?; + crate::routes::local_folder_source::ensure_local_workspace_write_access_with_state( + state, context, root_uri, + ) + .map_err(|error| error.with_context(context))?; } let mut event = args.clone(); if let Value::Object(map) = &mut event { @@ -5976,11 +6325,11 @@ fn stamp_client_headers_into(headers: &mut HeaderMap) { #[cfg(test)] mod tests { use super::*; - use crate::app::{build_app, AppConfig, AppState}; - use axum::body::{to_bytes, Body}; + use crate::app::{AppConfig, AppState, build_app}; + use axum::body::{Body, to_bytes}; use axum::http::Request; use axum::routing::{get, post}; - use control_plane::UpsertAiRuntimeRunInput; + use control_plane::{DirectoryGrantInput, UpsertAiRuntimeRunInput, UpsertUserInput}; use std::sync::atomic::{AtomicUsize, Ordering}; use std::sync::{Arc, Mutex, OnceLock}; use tower::util::ServiceExt; @@ -6030,12 +6379,16 @@ mod tests { let files = changed.as_array().expect("changed files"); assert_eq!(files.len(), 2); - assert!(files - .iter() - .any(|file| { file["path"] == "a.md" && file["changeType"] == "modified" })); - assert!(files - .iter() - .any(|file| { file["path"] == "b.md" && file["changeType"] == "added" })); + assert!( + files + .iter() + .any(|file| { file["path"] == "a.md" && file["changeType"] == "modified" }) + ); + assert!( + files + .iter() + .any(|file| { file["path"] == "b.md" && file["changeType"] == "added" }) + ); assert!(!files.iter().any(|file| { file["path"] .as_str() @@ -6071,9 +6424,11 @@ mod tests { assert!(files.iter().any(|file| { file["path"] == "maps/a.mindmap.json" && file["changeType"] == "modified" })); - assert!(files - .iter() - .any(|file| { file["path"] == "office/a.docx" && file["changeType"] == "modified" })); + assert!( + files.iter().any(|file| { + file["path"] == "office/a.docx" && file["changeType"] == "modified" + }) + ); let _ = std::fs::remove_dir_all(&root); } @@ -6615,6 +6970,80 @@ mod tests { let _ = fs::remove_dir_all(&root); } + #[tokio::test] + async fn hermes_client_local_acp_session_create_accepts_sqlite_directory_grant() { + let root = std::env::temp_dir().join(format!( + "mnote-local-ai-session-sqlite-grant-{}", + std::process::id() + )); + let _ = fs::remove_dir_all(&root); + fs::create_dir_all(&root).expect("root"); + let root_uri = format!("file://{}", root.display()); + let state = test_state(); + for user_id in ["user_owner", "user_target"] { + state + .control_plane() + .upsert_user(UpsertUserInput { + id: Some(user_id.into()), + email: Some(format!("{user_id}@example.com")), + username: user_id.into(), + display_name: user_id.into(), + role: None, + password_hash: None, + }) + .expect("upsert user"); + } + state + .control_plane() + .grant_directory_access(DirectoryGrantInput { + user_id: "user_target".into(), + workspace_id: None, + root_uri: root_uri.clone(), + root_path: root.display().to_string(), + permission: "write".into(), + recursive: true, + capabilities: vec!["local_files".into(), "ai_sessions".into()], + source: "test".into(), + created_by: Some("user_owner".into()), + }) + .expect("grant write access"); + + let response = build_app(state) + .oneshot( + Request::builder() + .method("POST") + .uri("/api/hermes/client/sessions") + .header("content-type", "application/json") + .header("x-mnote-actor-id", "user_target") + .header("x-mnote-actor-type", "user") + .body(Body::from( + json!({ + "workspaceId": "local-ws-granted", + "documentId": "local-md:README.md", + "sourceKind": "local_folder", + "rootUri": root_uri, + "traceId": "trace_sqlite_grant_session_1", + "profile": "reasonix", + "title": "授权本地会话" + }) + .to_string(), + )) + .expect("request"), + ) + .await + .expect("response"); + + assert_eq!(response.status(), StatusCode::OK); + let body = to_bytes(response.into_body(), usize::MAX) + .await + .expect("body"); + let payload: Value = serde_json::from_slice(&body).expect("json"); + assert_eq!(payload["persistence"], "local_ai_session_jsonl"); + assert_eq!(payload["sessionStorage"], "local_private"); + + let _ = fs::remove_dir_all(&root); + } + #[tokio::test] async fn hermes_client_local_shared_write_session_writes_shared_jsonl_with_audit() { let _guard = env_lock().lock().expect("env lock"); @@ -7939,10 +8368,93 @@ mod tests { "rootUri": "file:///mnt/Data1T/Mnote_data/users/user_1/我的空间", "message": "把选中的句子改短", "selectedText": "选中的句子", + "editorTarget": { + "schema": "mnote.ai_editor_target.v1", + "source": "open_editors_snapshot", + "objectIdentity": "page:primary", + "documentId": "local-md:README.md", + "workspaceId": "local-workspace-1", + "editorKind": "page", + "pageText": "恶意 editorTarget 正文不应进入 instructions", + "workspacePath": { + "schema": "mnote.workspace_path.v1", + "workspaceId": "local-workspace-1", + "sourceKind": "local_folder", + "rootUri": "file:///mnt/Data1T/Mnote_data/users/user_1/我的空间", + "relativePath": "README.md", + "documentId": "local-md:README.md", + "objectIdentity": "page:primary", + "assetId": "", + "resourceKind": "page", + "pageText": "恶意 workspacePath 正文不应进入 instructions" + } + }, + "runTargetSnapshot": { + "schema": "mnote.page_ai_run_target_snapshot.v1", + "source": "open_editors_snapshot", + "frozenAt": 12345, + "workspaceId": "local-workspace-1", + "documentId": "local-md:README.md", + "sourceKind": "local_folder", + "rootUri": "file:///mnt/Data1T/Mnote_data/users/user_1/我的空间", + "contextScope": "page", + "promptPreview": "把选中的句子改短", + "pageText": "恶意 runTargetSnapshot 正文不应进入 instructions", + "editorTarget": { + "schema": "mnote.ai_editor_target.v1", + "source": "open_editors_snapshot", + "objectIdentity": "page:primary", + "documentId": "local-md:README.md", + "workspaceId": "local-workspace-1", + "editorKind": "page", + "pageText": "恶意 runTargetSnapshot.editorTarget 正文不应进入 instructions", + "workspacePath": { + "schema": "mnote.workspace_path.v1", + "workspaceId": "local-workspace-1", + "sourceKind": "local_folder", + "rootUri": "file:///mnt/Data1T/Mnote_data/users/user_1/我的空间", + "relativePath": "README.md", + "documentId": "local-md:README.md", + "objectIdentity": "page:primary", + "resourceKind": "page", + "pageText": "恶意 runTargetSnapshot.workspacePath 正文不应进入 instructions" + } + } + }, "pageContext": { "node": {"documentId": "local-md:README.md", "title": "README"}, "aiContext": { "schema": "mnote.page_ai_context.v1", + "activeEditorTarget": { + "schema": "mnote.ai_editor_target.v1", + "source": "open_editors_snapshot", + "objectIdentity": "page:primary", + "documentId": "local-md:README.md", + "pageText": "恶意 activeEditorTarget 正文不应进入 instructions" + }, + "openEditorsSnapshot": { + "schema": "mnote.open_editors_snapshot.v1", + "activeObjectIdentity": "page:primary", + "activeEditor": { + "schema": "mnote.ai_editor_target.v1", + "objectIdentity": "page:primary", + "documentId": "local-md:README.md", + "pageText": "恶意 openEditorsSnapshot 正文不应进入 instructions" + }, + "groups": { + "primary": { + "paneRole": "primary", + "activeObjectIdentity": "page:primary", + "editors": [{ + "schema": "mnote.ai_editor_target.v1", + "objectIdentity": "page:primary", + "documentId": "local-md:README.md", + "pageText": "恶意 group editor 正文不应进入 instructions" + }], + "resourceEditors": [] + } + } + }, "pageText": "完整页面正文不应进入本地 agent instructions", "pageXml": "完整页面 XML 不应进入本地 agent instructions", "contextBlocks": [{"blockId": "block_1", "text": "完整块内容不应进入本地 agent instructions"}], @@ -7957,14 +8469,34 @@ mod tests { let instructions = body["instructions"].as_str().expect("instructions"); assert!(instructions.contains("\"sourceKind\":\"local_folder\"")); assert!(instructions.contains("\"fileReference\"")); - assert!(instructions - .contains("\"rootUri\":\"file:///mnt/Data1T/Mnote_data/users/user_1/我的空间\"")); + assert!( + instructions + .contains("\"rootUri\":\"file:///mnt/Data1T/Mnote_data/users/user_1/我的空间\"") + ); assert!(instructions.contains("\"aiAccessScope\"")); assert!(instructions.contains("\"allowedRoots\"")); + assert!(instructions.contains("\"editorTarget\"")); + assert!(instructions.contains("\"runTargetSnapshot\"")); + assert!(instructions.contains("\"schema\":\"mnote.page_ai_run_target_snapshot.v1\"")); + assert!(instructions.contains("\"source\":\"open_editors_snapshot\"")); + assert!(instructions.contains("\"relativePath\":\"README.md\"")); assert!(instructions.contains("\"selectedText\":\"选中的句子\"")); assert!(!instructions.contains("完整页面正文不应进入本地 agent instructions")); assert!(!instructions.contains("完整页面 XML 不应进入本地 agent instructions")); assert!(!instructions.contains("完整块内容不应进入本地 agent instructions")); + assert!(!instructions.contains("恶意 editorTarget 正文不应进入 instructions")); + assert!(!instructions.contains("恶意 workspacePath 正文不应进入 instructions")); + assert!(!instructions.contains("恶意 activeEditorTarget 正文不应进入 instructions")); + assert!(!instructions.contains("恶意 openEditorsSnapshot 正文不应进入 instructions")); + assert!(!instructions.contains("恶意 group editor 正文不应进入 instructions")); + assert!(!instructions.contains("恶意 runTargetSnapshot 正文不应进入 instructions")); + assert!( + !instructions.contains("恶意 runTargetSnapshot.editorTarget 正文不应进入 instructions") + ); + assert!( + !instructions + .contains("恶意 runTargetSnapshot.workspacePath 正文不应进入 instructions") + ); assert!(!instructions.contains("\"contextBlocks\"")); assert!(!instructions.contains("\"pageXml\"")); assert!(!instructions.contains("\"pageText\"")); @@ -8063,10 +8595,11 @@ mod tests { env.get("MNOTE_AI_WORKSPACE_ROOT").map(String::as_str), Some("/mnt/Data1T/Mnote_data/users/user_1/我的空间") ); - assert!(!env - .get("MNOTE_AI_ALLOWED_ROOTS_JSON") - .unwrap() - .contains("/mnt/Data1T/Mnote_data/users/user_2")); + assert!( + !env.get("MNOTE_AI_ALLOWED_ROOTS_JSON") + .unwrap() + .contains("/mnt/Data1T/Mnote_data/users/user_2") + ); let scope = serde_json::from_str::( env.get("MNOTE_AI_ACCESS_SCOPE_JSON").expect("scope"), ) @@ -8078,6 +8611,186 @@ mod tests { ); } + #[test] + fn local_ai_run_access_rewrites_allowed_roots_from_sqlite_grant() { + let state = test_state(); + state + .control_plane() + .upsert_user(UpsertUserInput { + id: Some("alice".to_string()), + email: None, + username: "alice".to_string(), + display_name: "Alice".to_string(), + role: None, + password_hash: None, + }) + .expect("alice user"); + state + .control_plane() + .grant_directory_access(DirectoryGrantInput { + user_id: "alice".to_string(), + workspace_id: None, + root_uri: "file:///tmp/mnote-ai-allowed".to_string(), + root_path: "/tmp/mnote-ai-allowed".to_string(), + permission: "write".to_string(), + recursive: true, + capabilities: vec!["ai".to_string()], + source: "user".to_string(), + created_by: Some("alice".to_string()), + }) + .expect("alice grant"); + let mut headers = HeaderMap::new(); + headers.insert("x-mnote-actor-id", "alice".parse().unwrap()); + headers.insert("x-mnote-actor-type", "user".parse().unwrap()); + let context = RequestContext::from_http_parts( + &axum::http::Method::POST, + &"/api/hermes/client/runs".parse().expect("uri"), + &headers, + ); + let mut payload = json!({ + "workspaceId": "local-ws:alice:test", + "documentId": "local-md:README.md", + "sessionId": "sess_sqlite_roots", + "sourceKind": "local_folder", + "rootUri": "file:///tmp/mnote-ai-allowed", + "allowedRoots": [{"rootUri": "file:///tmp/evil", "permission": "write", "source": "client"}] + }); + + enforce_local_ai_run_access(&state, &context, "alice", &mut payload) + .expect("alice allowed"); + + assert_eq!(payload["permissionLevel"], "read_write"); + assert_eq!( + payload["allowedRoots"][0]["rootUri"], + "file:///tmp/mnote-ai-allowed" + ); + assert_eq!(payload["allowedRoots"][0]["permission"], "write"); + assert_eq!( + payload["allowedRoots"][0]["source"], + "sqlite_directory_grant" + ); + assert!( + payload["allowedRoots"][0]["grantIds"] + .as_array() + .map(|items| !items.is_empty()) + .unwrap_or(false) + ); + assert!(!payload.to_string().contains("file:///tmp/evil")); + } + + #[test] + fn local_ai_run_access_rejects_other_user_without_sqlite_grant() { + let state = test_state(); + state + .control_plane() + .upsert_user(UpsertUserInput { + id: Some("alice".to_string()), + email: None, + username: "alice".to_string(), + display_name: "Alice".to_string(), + role: None, + password_hash: None, + }) + .expect("alice user"); + state + .control_plane() + .upsert_user(UpsertUserInput { + id: Some("bob".to_string()), + email: None, + username: "bob".to_string(), + display_name: "Bob".to_string(), + role: None, + password_hash: None, + }) + .expect("bob user"); + state + .control_plane() + .grant_directory_access(DirectoryGrantInput { + user_id: "alice".to_string(), + workspace_id: None, + root_uri: "file:///tmp/mnote-ai-alice-only".to_string(), + root_path: "/tmp/mnote-ai-alice-only".to_string(), + permission: "write".to_string(), + recursive: true, + capabilities: vec!["ai".to_string()], + source: "user".to_string(), + created_by: Some("alice".to_string()), + }) + .expect("alice grant"); + let mut headers = HeaderMap::new(); + headers.insert("x-mnote-actor-id", "bob".parse().unwrap()); + headers.insert("x-mnote-actor-type", "user".parse().unwrap()); + let context = RequestContext::from_http_parts( + &axum::http::Method::POST, + &"/api/hermes/client/runs".parse().expect("uri"), + &headers, + ); + let mut payload = json!({ + "workspaceId": "local-ws:alice:test", + "documentId": "local-md:README.md", + "sessionId": "sess_bob_denied", + "sourceKind": "local_folder", + "rootUri": "file:///tmp/mnote-ai-alice-only" + }); + + let error = enforce_local_ai_run_access(&state, &context, "bob", &mut payload) + .expect_err("bob must be denied"); + assert_eq!(error.status(), StatusCode::FORBIDDEN); + assert_eq!(error.code(), "local_ai_workspace_write_access_denied"); + } + + #[test] + fn local_ai_run_access_downgrades_chat_only_to_read_scope() { + let state = test_state(); + state + .control_plane() + .upsert_user(UpsertUserInput { + id: Some("chat_user".to_string()), + email: None, + username: "chat_user".to_string(), + display_name: "Chat User".to_string(), + role: None, + password_hash: None, + }) + .expect("chat user"); + state + .control_plane() + .grant_directory_access(DirectoryGrantInput { + user_id: "chat_user".to_string(), + workspace_id: None, + root_uri: "file:///tmp/mnote-ai-chat-only".to_string(), + root_path: "/tmp/mnote-ai-chat-only".to_string(), + permission: "write".to_string(), + recursive: true, + capabilities: vec!["ai".to_string()], + source: "user".to_string(), + created_by: Some("chat_user".to_string()), + }) + .expect("chat grant"); + let mut headers = HeaderMap::new(); + headers.insert("x-mnote-actor-id", "chat_user".parse().unwrap()); + headers.insert("x-mnote-actor-type", "user".parse().unwrap()); + let context = RequestContext::from_http_parts( + &axum::http::Method::POST, + &"/api/hermes/client/runs".parse().expect("uri"), + &headers, + ); + let mut payload = json!({ + "workspaceId": "local-ws:chat:test", + "documentId": "local-md:README.md", + "sessionId": "sess_chat_only", + "sourceKind": "local_folder", + "rootUri": "file:///tmp/mnote-ai-chat-only", + "agentId": "chat_only" + }); + + enforce_local_ai_run_access(&state, &context, "chat_user", &mut payload) + .expect("chat only allowed as read"); + + assert_eq!(payload["permissionLevel"], "read_only"); + assert_eq!(payload["allowedRoots"][0]["permission"], "read"); + } + #[test] fn acp_runtime_env_limits_shared_scope_to_granted_files() { let _guard = env_lock().lock().expect("env lock"); @@ -8221,7 +8934,9 @@ mod tests { .expect("body"); let instructions = body["instructions"].as_str().expect("instructions"); assert!(instructions.contains("普通正文 search/replace、局部段落替换或全文 markdown 替换，应优先调用 mnote_doc_markdown_edit")); - assert!(instructions.contains("\"mnote_doc_markdown_edit for plain body search/replace or full markdown replacement\"")); + assert!(instructions.contains( + "\"mnote_doc_markdown_edit for plain body search/replace or full markdown replacement\"" + )); assert!(!instructions.contains( "简单小段落编辑或同一页内多个普通叶子块操作，应优先用 mnote_doc_apply_block_ops" )); diff --git a/rust/crates/mnote-web/src/routes/hermes_tools.rs b/rust/crates/mnote-web/src/routes/hermes_tools.rs index 129ab9e8..ebe67b3a 100644 --- a/rust/crates/mnote-web/src/routes/hermes_tools.rs +++ b/rust/crates/mnote-web/src/routes/hermes_tools.rs @@ -2,11 +2,11 @@ use super::hermes_client; use crate::app::AppState; use crate::context::RequestContext; use crate::error::WebError; -use crate::hermes_tools::{artifact, block, doc, manifest, page, resource, ToolCallInput}; +use crate::hermes_tools::{ToolCallInput, artifact, block, doc, manifest, page, resource}; +use axum::Json; use axum::extract::{Extension, Query, State}; use axum::http::{HeaderMap, HeaderName, HeaderValue, StatusCode}; -use axum::Json; -use serde_json::{json, Value}; +use serde_json::{Value, json}; use std::collections::HashMap; use std::env; use std::fs::{self, File, OpenOptions}; @@ -827,10 +827,10 @@ fn stamp_tool_headers() -> HeaderMap { #[cfg(test)] mod tests { - use crate::app::{build_app, AppConfig, AppState}; - use axum::body::{to_bytes, Body}; + use crate::app::{AppConfig, AppState, build_app}; + use axum::body::{Body, to_bytes}; use axum::http::{Request, StatusCode}; - use serde_json::{json, Value}; + use serde_json::{Value, json}; use std::collections::BTreeMap; use std::fs; use std::sync::Mutex; @@ -1112,36 +1112,56 @@ mod tests { assert!(tools.iter().any(|tool| tool["name"] == "mnote.doc.fetch")); assert!(tools.iter().any(|tool| tool["name"] == "mnote.doc.find")); assert!(tools.iter().any(|tool| tool["name"] == "mnote.block.fetch")); - assert!(tools - .iter() - .any(|tool| tool["name"] == "mnote.doc.plan_update")); - assert!(tools - .iter() - .any(|tool| tool["name"] == "mnote.block.replace")); - assert!(tools - .iter() - .any(|tool| tool["name"] == "mnote.block.insert_after")); - assert!(tools - .iter() - .any(|tool| tool["name"] == "mnote.block.delete")); - assert!(tools - .iter() - .any(|tool| tool["name"] == "mnote.block.move_after")); - assert!(tools - .iter() - .any(|tool| tool["name"] == "mnote.doc.apply_block_ops")); - assert!(tools - .iter() - .any(|tool| tool["name"] == "mnote.mindmap.fetch")); - assert!(tools - .iter() - .any(|tool| tool["name"] == "mnote.mindmap.apply_ops")); - assert!(tools - .iter() - .any(|tool| tool["name"] == "mnote.office.fetch_summary")); - assert!(tools - .iter() - .any(|tool| tool["name"] == "mnote.office.propose_changes")); + assert!( + tools + .iter() + .any(|tool| tool["name"] == "mnote.doc.plan_update") + ); + assert!( + tools + .iter() + .any(|tool| tool["name"] == "mnote.block.replace") + ); + assert!( + tools + .iter() + .any(|tool| tool["name"] == "mnote.block.insert_after") + ); + assert!( + tools + .iter() + .any(|tool| tool["name"] == "mnote.block.delete") + ); + assert!( + tools + .iter() + .any(|tool| tool["name"] == "mnote.block.move_after") + ); + assert!( + tools + .iter() + .any(|tool| tool["name"] == "mnote.doc.apply_block_ops") + ); + assert!( + tools + .iter() + .any(|tool| tool["name"] == "mnote.mindmap.fetch") + ); + assert!( + tools + .iter() + .any(|tool| tool["name"] == "mnote.mindmap.apply_ops") + ); + assert!( + tools + .iter() + .any(|tool| tool["name"] == "mnote.office.fetch_summary") + ); + assert!( + tools + .iter() + .any(|tool| tool["name"] == "mnote.office.propose_changes") + ); let page_save = tools .iter() .find(|tool| tool["name"] == "mnote.page.save") @@ -1189,16 +1209,20 @@ mod tests { } assert!(markdown_edit["inputSchema"]["properties"]["operations"].is_object()); assert!(markdown_edit["inputSchema"]["properties"]["full_content"].is_object()); - assert!(markdown_edit["inputSchema"]["anyOf"] - .as_array() - .expect("anyOf") - .iter() - .any(|rule| rule["required"] == json!(["operations"]))); - assert!(markdown_edit["inputSchema"]["anyOf"] - .as_array() - .expect("anyOf") - .iter() - .any(|rule| rule["required"] == json!(["full_content"]))); + assert!( + markdown_edit["inputSchema"]["anyOf"] + .as_array() + .expect("anyOf") + .iter() + .any(|rule| rule["required"] == json!(["operations"])) + ); + assert!( + markdown_edit["inputSchema"]["anyOf"] + .as_array() + .expect("anyOf") + .iter() + .any(|rule| rule["required"] == json!(["full_content"])) + ); } #[tokio::test] @@ -1228,14 +1252,18 @@ mod tests { .find(|tool| tool["name"] == "mnote.page.save") .expect("page save tool"); - assert!(markdown_edit["description"] - .as_str() - .expect("description") - .contains("兼容")); - assert!(markdown_edit["description"] - .as_str() - .expect("description") - .contains("agent 原生 patch/diff")); + assert!( + markdown_edit["description"] + .as_str() + .expect("description") + .contains("兼容") + ); + assert!( + markdown_edit["description"] + .as_str() + .expect("description") + .contains("agent 原生 patch/diff") + ); assert_eq!( page_save["annotations"]["requiresWritePermission"], Value::Bool(true) @@ -1426,10 +1454,12 @@ mod tests { payload["result"]["objectIdentity"], "resource:mindmap:local-md:README.md:mind_allowed" ); - assert!(payload["result"]["markdownSummary"] - .as_str() - .unwrap_or_default() - .contains("中心主题")); + assert!( + payload["result"]["markdownSummary"] + .as_str() + .unwrap_or_default() + .contains("中心主题") + ); assert_eq!(payload["result"]["nodes"][1]["text"], "分支一"); let _ = fs::remove_dir_all(&root); } @@ -1765,10 +1795,12 @@ mod tests { assert_eq!(payload["toolName"], "mnote.page.get"); assert_eq!(payload["toolCallId"], "call_1"); assert_eq!(payload["result"]["title"], "服务端页面"); - assert!(payload["result"]["bodySummary"] - .as_str() - .unwrap_or_default() - .contains("章节一")); + assert!( + payload["result"]["bodySummary"] + .as_str() + .unwrap_or_default() + .contains("章节一") + ); assert_eq!(payload["audit"]["effect"], "read"); } @@ -1814,10 +1846,12 @@ mod tests { json!("heading_1") ); assert_eq!(payload["result"]["blocks"][0]["text"], json!("章节一")); - assert!(payload["result"]["blocks"][0]["revisionRef"] - .as_str() - .unwrap_or_default() - .starts_with("pageRev:7:block:heading_1:hash:")); + assert!( + payload["result"]["blocks"][0]["revisionRef"] + .as_str() + .unwrap_or_default() + .starts_with("pageRev:7:block:heading_1:hash:") + ); } #[tokio::test] @@ -1944,10 +1978,12 @@ mod tests { assert_eq!(payload["result"]["scope"], "selection"); assert_eq!(payload["result"]["format"], "page_xml"); assert_eq!(payload["result"]["blocks"].as_array().unwrap().len(), 1); - assert!(payload["result"]["content"] - .as_str() - .unwrap_or_default() - .contains("> + Send>>; @@ -29,6 +29,7 @@ type BoxedEventStream = pub struct LocalFolderEventsQuery { pub root_uri: String, pub document_id: Option, + pub resource_path: Option, pub tree_live: Option, } @@ -68,7 +69,8 @@ async fn build_document_events_stream( let document_relative_path = query .document_id .as_deref() - .and_then(local_markdown_relative_path_from_document_id); + .and_then(local_markdown_relative_path_from_document_id) + .or_else(|| query.resource_path.as_deref().and_then(normalize_resource_event_path)); let subscription = state .local_folder_watcher_registry() .subscribe(&canonical_root) @@ -78,6 +80,7 @@ async fn build_document_events_stream( "sourceKind": "local_folder", "rootUri": subscription.root_uri(), "documentId": query.document_id, + "resourcePath": query.resource_path, "revision": system_time_ms(SystemTime::now()), }); let stream = stream::unfold( @@ -117,7 +120,7 @@ async fn build_document_events_stream( /// with full sidebar + file tree projections. /// /// Reuses `LocalFolderWatcherRegistry` — no second watcher created. -/// No data is written to Convex command log. +/// No data is written to an external/cloud command log. async fn build_tree_live_stream( state: AppState, context: RequestContext, @@ -423,6 +426,18 @@ fn local_markdown_relative_path_from_document_id(document_id: &str) -> Option Option { + let trimmed = resource_path.trim().trim_start_matches('/'); + if trimmed.is_empty() + || PathBuf::from(trimmed) + .components() + .any(|component| matches!(component, std::path::Component::ParentDir)) + { + return None; + } + Some(trimmed.replace('\\', "/")) +} + fn document_event_targets_relative_path(payload: &Value, expected: &str) -> bool { let relative_path = payload .get("relativePath") @@ -457,7 +472,7 @@ fn stream_event(event_name: &str, payload: &Value) -> SseEvent { #[cfg(test)] mod tests { use super::*; - use crate::app::{build_app, AppConfig, AppState}; + use crate::app::{AppConfig, AppState, build_app}; use crate::routes::local_folder_source::initialize_local_workspace_for_actor; use axum::body::Body; use axum::http::Request; @@ -577,6 +592,35 @@ mod tests { ); } + #[test] + fn resource_event_path_filters_to_its_own_relative_path() { + let expected = normalize_resource_event_path("README.assets/slides.pptx") + .expect("resource path should normalize"); + let payload = json!({ + "sourceKind": "local_folder", + "rootUri": "file:///test", + "relativePath": "README.assets/slides.pptx", + "documentId": "", + "eventKind": "Modify(Data)", + "revision": 1, + }); + let other_payload = json!({ + "sourceKind": "local_folder", + "rootUri": "file:///test", + "relativePath": "README.assets/report.pdf", + "documentId": "", + "eventKind": "Modify(Data)", + "revision": 2, + }); + + assert!(document_event_targets_relative_path(&payload, &expected)); + assert!(!document_event_targets_relative_path(&other_payload, &expected)); + assert!( + normalize_resource_event_path("../escape.pdf").is_none(), + "resource watch path 不能越过 root" + ); + } + #[test] fn build_tree_snapshot_payload_has_required_fields() { let sidebar_projection = json!({ @@ -697,11 +741,13 @@ mod tests { && parent["reason"].as_str() == Some("child-watch")), "watch batch 应声明 docs affected parent: {payload}" ); - assert!(payload["eventKinds"] - .as_array() - .expect("event kinds") - .iter() - .any(|kind| kind.as_str() == Some("Modify(Data)"))); + assert!( + payload["eventKinds"] + .as_array() + .expect("event kinds") + .iter() + .any(|kind| kind.as_str() == Some("Modify(Data)")) + ); let _ = std::fs::remove_dir_all(root); } diff --git a/rust/crates/mnote-web/src/routes/local_folder_source.rs b/rust/crates/mnote-web/src/routes/local_folder_source.rs index 6212184f..4ffe8dcc 100644 --- a/rust/crates/mnote-web/src/routes/local_folder_source.rs +++ b/rust/crates/mnote-web/src/routes/local_folder_source.rs @@ -10,9 +10,9 @@ use crate::routes::local_markdown_parser::{ }; use crate::routes::local_search_index; use crate::routes::snapshot_support::ProjectionSnapshot; -use axum::extract::{Extension, Multipart, Path as AxumPath, Query, State}; -use axum::http::{header, HeaderMap, HeaderValue, StatusCode}; use axum::Json; +use axum::extract::{Extension, Multipart, Path as AxumPath, Query, State}; +use axum::http::{HeaderMap, HeaderValue, StatusCode, header}; use bridge_runtime::project_legacy_content_to_block_document; use control_plane::AppendAuditInput; use control_plane::{ @@ -24,7 +24,7 @@ use core_protocol::{ }; use reqwest::Url; use serde::{Deserialize, Serialize}; -use serde_json::{json, Map, Value}; +use serde_json::{Map, Value, json}; use std::cmp::Ordering; use std::collections::hash_map::DefaultHasher; use std::collections::{BTreeMap, BTreeSet}; @@ -41,6 +41,9 @@ static LOCAL_PAGE_TREE_SNAPSHOT_TEST_LOADS: std::sync::atomic::AtomicU64 = #[cfg(test)] static LOCAL_PAGE_TREE_SNAPSHOT_SCAN_TEST_LOADS: std::sync::atomic::AtomicU64 = std::sync::atomic::AtomicU64::new(0); +#[cfg(test)] +static LOCAL_PAGE_TREE_SNAPSHOT_TEST_LOADS_BY_ROOT: OnceLock>> = + OnceLock::new(); #[derive(Debug, Clone)] struct LocalPageTreeSnapshotCacheEntry { @@ -52,8 +55,8 @@ static LOCAL_PAGE_TREE_SNAPSHOT_CACHE: OnceLock< Mutex>, > = OnceLock::new(); -fn local_page_tree_snapshot_cache( -) -> &'static Mutex> { +fn local_page_tree_snapshot_cache() +-> &'static Mutex> { LOCAL_PAGE_TREE_SNAPSHOT_CACHE.get_or_init(|| Mutex::new(BTreeMap::new())) } @@ -61,6 +64,11 @@ fn local_page_tree_snapshot_cache( pub(crate) fn reset_local_page_tree_snapshot_test_loads() { LOCAL_PAGE_TREE_SNAPSHOT_TEST_LOADS.store(0, std::sync::atomic::Ordering::SeqCst); LOCAL_PAGE_TREE_SNAPSHOT_SCAN_TEST_LOADS.store(0, std::sync::atomic::Ordering::SeqCst); + if let Some(loads) = LOCAL_PAGE_TREE_SNAPSHOT_TEST_LOADS_BY_ROOT.get() { + if let Ok(mut loads) = loads.lock() { + loads.clear(); + } + } if let Some(cache) = LOCAL_PAGE_TREE_SNAPSHOT_CACHE.get() { if let Ok(mut cache) = cache.lock() { cache.clear(); @@ -69,8 +77,13 @@ pub(crate) fn reset_local_page_tree_snapshot_test_loads() { } #[cfg(test)] -pub(crate) fn local_page_tree_snapshot_test_loads() -> u64 { - LOCAL_PAGE_TREE_SNAPSHOT_TEST_LOADS.load(std::sync::atomic::Ordering::SeqCst) +pub(crate) fn local_page_tree_snapshot_test_loads_for_root(root_uri: &str) -> u64 { + LOCAL_PAGE_TREE_SNAPSHOT_TEST_LOADS_BY_ROOT + .get_or_init(|| Mutex::new(BTreeMap::new())) + .lock() + .ok() + .and_then(|loads| loads.get(root_uri).copied()) + .unwrap_or(0) } #[cfg(test)] @@ -2784,6 +2797,15 @@ fn load_local_folder_page_tree_snapshot_for_scope( ) -> Result { #[cfg(test)] LOCAL_PAGE_TREE_SNAPSHOT_TEST_LOADS.fetch_add(1, std::sync::atomic::Ordering::SeqCst); + #[cfg(test)] + { + if let Ok(mut loads) = LOCAL_PAGE_TREE_SNAPSHOT_TEST_LOADS_BY_ROOT + .get_or_init(|| Mutex::new(BTreeMap::new())) + .lock() + { + *loads.entry(root_uri.to_string()).or_insert(0) += 1; + } + } let root_path = parse_file_root_uri(root_uri)?; let canonical_root = root_path.canonicalize().map_err(|error| { @@ -3255,10 +3277,12 @@ pub fn write_local_markdown_page_body( relative_path, &request.document_id, ); - store.mark_saved( + store.mark_saved_with_operation( &ws_path, file_version.to_string(), format!("sha256:{file_version}"), + request.write_intent_id.clone(), + request.save_operation_id.clone(), ); } } @@ -3283,6 +3307,22 @@ pub fn write_local_markdown_page_body( .map(Value::from) .unwrap_or(Value::Null), ); + map.insert( + "writeIntentId".into(), + request + .write_intent_id + .as_deref() + .map(Value::from) + .unwrap_or(Value::Null), + ); + map.insert( + "saveOperationId".into(), + request + .save_operation_id + .as_deref() + .map(Value::from) + .unwrap_or(Value::Null), + ); } Ok(result) } @@ -3818,7 +3858,7 @@ pub(crate) fn write_local_folder_file_upload( "上传目标必须是本地 root 内的目录", )); } - let sanitized_name = sanitize_file_name(&file.name, "附件"); + let sanitized_name = sanitize_uploaded_file_name(&file.name, "附件"); let target = next_available_raw_path(&target_dir, &sanitized_name); fs::write(&target, &file.bytes).map_err(|error| { WebError::bad_request_code( @@ -3908,7 +3948,7 @@ pub(crate) fn write_local_markdown_asset( ) })?; - let sanitized_name = sanitize_file_name(&file.name, "附件"); + let sanitized_name = sanitize_uploaded_file_name(&file.name, "附件"); let target = next_available_asset_path(&asset_dir, &sanitized_name); if !target.starts_with(&canonical_root) { return Err(WebError::bad_request_code( @@ -7023,11 +7063,7 @@ fn parent_key_for_relative_path(relative_path: &str) -> String { .map(|component| component.as_os_str().to_string_lossy().to_string()) .collect::>() .join("/"); - if value.is_empty() { - None - } else { - Some(value) - } + if value.is_empty() { None } else { Some(value) } }) .map(|value| normalize_file_order_parent_key(&value)) .unwrap_or_else(|| ".".to_string()) @@ -7517,11 +7553,16 @@ fn local_folder_row_to_projection_item(row: &LocalFolderRow) -> Value { } "asset" => match row.icon_hint.as_str() { "mindmap" => KernelObjectKind::Mindmap, - "onlyoffice" | "office" => KernelObjectKind::OnlyOffice, + "onlyoffice" | "office" | "word" | "ppt" | "sheet" => KernelObjectKind::OnlyOffice, _ => KernelObjectKind::Attachment, }, _ => KernelObjectKind::Attachment, }; + let object_asset_id = if row.row_kind == "asset" && !row.relative_path.trim().is_empty() { + Some(format!("local-file:{}", row.relative_path)) + } else { + None + }; let workspace_path = ObjectWorkspacePath { workspace_id: row.workspace_id.clone(), source_kind: WorkspaceSourceKind::LocalFolder, @@ -7531,7 +7572,7 @@ fn local_folder_row_to_projection_item(row: &LocalFolderRow) -> Value { object_kind, document_id: row.document_id.clone(), block_id: None, - asset_id: None, + asset_id: object_asset_id, }, resource_kind: Some(row.row_kind.clone()), }; @@ -7733,21 +7774,22 @@ fn icon_hint_for_entry(entry: &LocalFolderEntry) -> String { "pdf" } else if matches!( extension(&lower).as_deref(), - Some( - "doc" - | "docx" - | "odt" - | "rtf" - | "ppt" - | "pptx" - | "odp" - | "xls" - | "xlsx" - | "ods" - | "csv" - ) + Some("doc" | "docx" | "odt" | "rtf") ) { - "office" + "word" + } else if matches!(extension(&lower).as_deref(), Some("ppt" | "pptx" | "odp")) { + "ppt" + } else if matches!( + extension(&lower).as_deref(), + Some("xls" | "xlsx" | "ods" | "csv") + ) { + "sheet" + } else if is_web_file_name(&lower) { + "web" + } else if is_config_file_name(&lower) { + "config" + } else if is_code_file_name(&lower) { + "code" } else if matches!(extension(&lower).as_deref(), Some("epub" | "mobi")) { "book" } else { @@ -7756,6 +7798,135 @@ fn icon_hint_for_entry(entry: &LocalFolderEntry) -> String { .to_string() } +fn is_web_file_name(file_name: &str) -> bool { + matches!( + extension(file_name).as_deref(), + Some( + "html" + | "htm" + | "css" + | "scss" + | "less" + | "js" + | "jsx" + | "ts" + | "tsx" + | "mjs" + | "cjs" + | "vue" + | "svelte" + | "astro" + ) + ) +} + +fn is_config_file_name(file_name: &str) -> bool { + let code_file_names = [ + ".dockerignore", + ".editorconfig", + ".env", + ".eslintrc", + ".gitattributes", + ".gitignore", + ".npmrc", + ".prettierrc", + "dockerfile", + "containerfile", + "makefile", + "cmakelists.txt", + "gemfile", + "rakefile", + "procfile", + ]; + code_file_names.contains(&file_name) + || matches!( + extension(file_name).as_deref(), + Some( + "json" + | "jsonc" + | "json5" + | "toml" + | "yaml" + | "yml" + | "ini" + | "env" + | "xml" + | "lock" + | "hcl" + | "tf" + | "tfvars" + | "nix" + | "properties" + | "conf" + | "cfg" + | "config" + | "service" + | "desktop" + | "gitignore" + | "gitattributes" + | "editorconfig" + | "npmrc" + | "prettierrc" + | "eslintrc" + ) + ) +} + +fn is_code_file_name(file_name: &str) -> bool { + matches!( + extension(file_name).as_deref(), + Some( + "rs" | "py" + | "go" + | "java" + | "c" + | "cpp" + | "h" + | "hpp" + | "cs" + | "php" + | "rb" + | "sh" + | "bash" + | "zsh" + | "sql" + | "lua" + | "dart" + | "kt" + | "kts" + | "swift" + | "scala" + | "gradle" + | "groovy" + | "clj" + | "ex" + | "exs" + | "erl" + | "hrl" + | "fs" + | "fsx" + | "r" + | "jl" + | "m" + | "mm" + | "pl" + | "pm" + | "ps1" + | "bat" + | "cmd" + | "psm1" + | "psd1" + | "proto" + | "graphql" + | "gql" + | "prisma" + | "cmake" + | "bazel" + | "bzl" + ) + ) +} + fn extension(file_name: &str) -> Option { Path::new(file_name) .extension() @@ -7850,6 +8021,15 @@ fn sanitize_file_name(value: &str, fallback: &str) -> String { } } +fn sanitize_uploaded_file_name(value: &str, fallback: &str) -> String { + let trimmed = value.trim(); + let leaf = trimmed + .rsplit(['/', '\\']) + .find(|part| !part.trim().is_empty()) + .unwrap_or(trimmed); + sanitize_file_name(leaf, fallback) +} + fn next_available_path(directory: &Path, stem: &str, extension: &str) -> PathBuf { let first = directory.join(format!("{stem}.{extension}")); if !first.exists() { @@ -8919,7 +9099,7 @@ fn system_time_ms(time: SystemTime) -> u128 { .unwrap_or(0) } -fn local_markdown_conflict_detection_key( +pub(crate) fn local_markdown_conflict_detection_key( document_id: &str, markdown_path: &Path, ) -> Result { @@ -9044,6 +9224,10 @@ fn markdown_page_subtree(document_id: &str, title: &str, content: &Value) -> Val #[cfg(test)] mod tests { use super::{ + LocalAccessGrantRequest, LocalAccessValidateRootRequest, LocalFileOpenQuery, + LocalResourceReadQuery, LocalResourceWriteRequest, LocalShareGrantRequest, + LocalShareLinkRequest, LocalUploadFile, ShareLinkListQuery, SharedCacheRecordRequest, + SyncConflictReportRequest, SyncPendingChangeRequest, add_sqlite_local_access_grant_for_context, create_default_local_workspace_for_actor_at_base, create_local_access_grant, create_share_grant, create_share_link, create_user_access_grant, create_user_share_grant, @@ -9062,18 +9246,15 @@ mod tests { resolve_local_markdown_page_aggregate, save_local_markdown_page, update_local_markdown_title, validate_local_access_root, write_local_markdown_asset, write_local_markdown_page_body, write_local_mindmap_data, write_local_resource, - write_sync_conflict_report, LocalAccessGrantRequest, LocalAccessValidateRootRequest, - LocalFileOpenQuery, LocalResourceReadQuery, LocalResourceWriteRequest, - LocalShareGrantRequest, LocalShareLinkRequest, LocalUploadFile, ShareLinkListQuery, - SharedCacheRecordRequest, SyncConflictReportRequest, SyncPendingChangeRequest, + write_sync_conflict_report, }; use crate::app::{AppConfig, AppState}; use crate::context::RequestContext; + use axum::Json; use axum::extract::{Extension, Path as AxumPath, Query, State}; use axum::http::{HeaderMap, Method, StatusCode}; - use axum::Json; use control_plane::{DirectoryGrantInput, UpsertUserInput}; - use serde_json::{json, Value}; + use serde_json::{Value, json}; use std::sync::Mutex; fn env_lock() -> &'static Mutex<()> { @@ -9345,28 +9526,25 @@ mod tests { "tableCell" ); assert_eq!( - table["props"]["tiptapTable"]["content"][0]["content"][0]["content"][0]["content"][0] - ["text"], + table["props"]["tiptapTable"]["content"][0]["content"][0]["content"][0]["content"][0]["text"], "左" ); assert_eq!( - table["props"]["tiptapTable"]["content"][1]["content"][0]["content"][0]["content"][0] - ["text"], + table["props"]["tiptapTable"]["content"][1]["content"][0]["content"][0]["content"][0]["text"], "A" ); assert_eq!( - table["props"]["tiptapTable"]["content"][1]["content"][0]["content"][0]["content"][0] - ["marks"][0]["type"], + table["props"]["tiptapTable"]["content"][1]["content"][0]["content"][0]["content"][0]["marks"] + [0]["type"], "code" ); assert_eq!( - table["props"]["tiptapTable"]["content"][1]["content"][1]["content"][0]["content"][0] - ["text"], + table["props"]["tiptapTable"]["content"][1]["content"][1]["content"][0]["content"][0]["text"], "B" ); assert_eq!( - table["props"]["tiptapTable"]["content"][1]["content"][1]["content"][0]["content"][0] - ["marks"][0]["type"], + table["props"]["tiptapTable"]["content"][1]["content"][1]["content"][0]["content"][0]["marks"] + [0]["type"], "bold" ); } @@ -9469,10 +9647,12 @@ mod tests { let body = serde_json::to_value(&aggregate.body).expect("body json"); assert_eq!(body["fileVersion"], body["conflictDetectionKey"]); - assert!(body["fileVersion"] - .as_str() - .expect("file version") - .starts_with("local-md:local-md:README.md:")); + assert!( + body["fileVersion"] + .as_str() + .expect("file version") + .starts_with("local-md:local-md:README.md:") + ); let _ = std::fs::remove_dir_all(&root); } @@ -9494,10 +9674,12 @@ mod tests { .expect("save"); assert_eq!(result["fileVersion"], result["conflict_detection_key"]); - assert!(result["fileVersion"] - .as_str() - .expect("file version") - .starts_with("local-md:local-md:README.md:")); + assert!( + result["fileVersion"] + .as_str() + .expect("file version") + .starts_with("local-md:local-md:README.md:") + ); let _ = std::fs::remove_dir_all(&root); } @@ -9516,6 +9698,8 @@ mod tests { source_kind: core_protocol::WorkspaceSourceKind::LocalFolder, root_uri: root_uri.clone(), expected_file_version: aggregate.body.file_version.as_str().map(ToOwned::to_owned), + write_intent_id: Some("intent:test:page-body-write".into()), + save_operation_id: Some("save:test:page-body-write".into()), base_content_hash: Some("sha256:test-base".into()), content_format: "editorBlocks".into(), content: serde_json::json!([ @@ -9530,6 +9714,8 @@ mod tests { assert_eq!(result["compatCommand"], "page.body.save"); assert_eq!(result["contentFormat"], "editorBlocks"); assert_eq!(result["editorSource"], "unit-test"); + assert_eq!(result["writeIntentId"], "intent:test:page-body-write"); + assert_eq!(result["saveOperationId"], "save:test:page-body-write"); assert_eq!(result["fileVersion"], result["conflict_detection_key"]); let saved = std::fs::read_to_string(root.join("README.md")).expect("read md"); assert!(saved.contains("# Written")); @@ -10614,10 +10800,12 @@ fn main() {} assert_eq!(created["grant"]["ownerUserId"], "user_owner"); assert_eq!(created["grant"]["targetUserId"], "user_target"); assert_eq!(created["grant"]["permission"], "write"); - assert!(created["grant"]["shareId"] - .as_str() - .unwrap_or_default() - .starts_with("folder_")); + assert!( + created["grant"]["shareId"] + .as_str() + .unwrap_or_default() + .starts_with("folder_") + ); let outside_error = create_user_share_grant( Extension(request_context("user_owner", "user")), @@ -10887,11 +11075,13 @@ fn main() {} assert_eq!(stored.len(), 1); assert_eq!(stored[0].id, link_id); assert_ne!(stored[0].token_hash, "visible-token"); - assert!(state - .control_plane() - .resolve_share_link(&control_plane::share_token_hash_v1("visible-token")) - .expect("resolve share link") - .is_some()); + assert!( + state + .control_plane() + .resolve_share_link(&control_plane::share_token_hash_v1("visible-token")) + .expect("resolve share link") + .is_some() + ); let (_, Json(listed)) = get_share_links( State(state.clone()), @@ -10924,11 +11114,13 @@ fn main() {} .expect("share revoked broadcast delta"); assert_eq!(revoked_delta["kind"], "control_plane_event"); assert_eq!(revoked_delta["eventType"], "control.share.revoked"); - assert!(state - .control_plane() - .resolve_share_link(&control_plane::share_token_hash_v1("visible-token")) - .expect("resolve revoked share link") - .is_none()); + assert!( + state + .control_plane() + .resolve_share_link(&control_plane::share_token_hash_v1("visible-token")) + .expect("resolve revoked share link") + .is_none() + ); assert_eq!( state .control_plane() @@ -11132,11 +11324,13 @@ fn main() {} payload["workspace"]["manifest"]["ownerId"], "user@example.com" ); - assert!(payload["workspace"]["manifest"]["capabilities"] - .as_array() - .expect("capabilities") - .iter() - .any(|value| value.as_str() == Some("markdown_edit"))); + assert!( + payload["workspace"]["manifest"]["capabilities"] + .as_array() + .expect("capabilities") + .iter() + .any(|value| value.as_str() == Some("markdown_edit")) + ); ensure_local_workspace_access_for_actor("user@example.com", "user", &root_uri) .expect("owner can access managed workspace"); @@ -11387,11 +11581,12 @@ fn main() {} execute_local_tree_command(&root_uri, "delete", "local-md:Renamed.md", None, None) .expect("delete loose markdown"); assert!(!root.join("Renamed.md").exists()); - assert!(root - .join(".mnote") - .join("trash") - .join("Renamed.md") - .is_file()); + assert!( + root.join(".mnote") + .join("trash") + .join("Renamed.md") + .is_file() + ); assert_eq!(deleted["resourceKind"].as_str(), Some("markdown")); let restored = @@ -12441,6 +12636,17 @@ fn main() {} std::fs::write(root.join("Page").join("Page.md"), "").expect("write md"); std::fs::write(root.join("Page").join("思维导图123456.json"), "{}").expect("write mindmap"); std::fs::write(root.join("Page").join("report.docx"), b"docx").expect("write docx"); + std::fs::write(root.join("Page").join("sheet.xlsx"), b"xlsx").expect("write xlsx"); + std::fs::write(root.join("Page").join("slides.pptx"), b"pptx").expect("write pptx"); + std::fs::write(root.join("Page").join("main.rs"), b"fn main() {}").expect("write rs"); + std::fs::write( + root.join("Page").join("app.tsx"), + b"export const App = () => null;", + ) + .expect("write tsx"); + std::fs::write(root.join("Page").join("package.json"), b"{}").expect("write package"); + std::fs::write(root.join("Page").join(".env"), b"KEY=value").expect("write env"); + std::fs::write(root.join("Page").join("config.yaml"), b"name: mnote").expect("write yaml"); let root_uri = format!("file://{}", root.display()); let snapshot = @@ -12456,17 +12662,60 @@ fn main() {} mindmap["resourceMeta"]["workspacePath"]["objectIdentity"]["objectKind"].as_str(), Some("mindmap") ); + assert_eq!( + mindmap["resourceMeta"]["workspacePath"]["objectIdentity"]["assetId"].as_str(), + Some("local-file:Page/思维导图123456.json") + ); let office = items .iter() .find(|item| item["title"].as_str() == Some("report.docx")) .expect("office row"); assert_eq!(office["rowKind"].as_str(), Some("asset")); - assert_eq!(office["iconHint"].as_str(), Some("office")); + assert_eq!(office["iconHint"].as_str(), Some("word")); assert_eq!( office["resourceMeta"]["workspacePath"]["objectIdentity"]["objectKind"].as_str(), Some("only_office") ); + assert_eq!( + office["resourceMeta"]["workspacePath"]["objectIdentity"]["assetId"].as_str(), + Some("local-file:Page/report.docx") + ); + let sheet = items + .iter() + .find(|item| item["title"].as_str() == Some("sheet.xlsx")) + .expect("sheet row"); + assert_eq!(sheet["iconHint"].as_str(), Some("sheet")); + let ppt = items + .iter() + .find(|item| item["title"].as_str() == Some("slides.pptx")) + .expect("ppt row"); + assert_eq!(ppt["iconHint"].as_str(), Some("ppt")); + let rust = items + .iter() + .find(|item| item["title"].as_str() == Some("main.rs")) + .expect("rust row"); + assert_eq!(rust["iconHint"].as_str(), Some("code")); + let tsx = items + .iter() + .find(|item| item["title"].as_str() == Some("app.tsx")) + .expect("tsx row"); + assert_eq!(tsx["iconHint"].as_str(), Some("web")); + let package_json = items + .iter() + .find(|item| item["title"].as_str() == Some("package.json")) + .expect("package row"); + assert_eq!(package_json["iconHint"].as_str(), Some("config")); + let env = items + .iter() + .find(|item| item["title"].as_str() == Some(".env")) + .expect("env row"); + assert_eq!(env["iconHint"].as_str(), Some("config")); + let yaml = items + .iter() + .find(|item| item["title"].as_str() == Some("config.yaml")) + .expect("yaml row"); + assert_eq!(yaml["iconHint"].as_str(), Some("config")); let _ = std::fs::remove_dir_all(&root); } @@ -12497,6 +12746,8 @@ fn main() {} source_kind: core_protocol::WorkspaceSourceKind::LocalFolder, root_uri: root_uri.clone(), expected_file_version: None, + write_intent_id: Some("intent:test:buffer-save".into()), + save_operation_id: Some("save:test:buffer-save".into()), base_content_hash: None, content_format: "editorBlocks".into(), content: serde_json::json!([ @@ -12875,6 +13126,30 @@ fn main() {} markdown_asset["ownerDocumentId"], "local-md:docs~2FREADME~2FREADME.md" ); + let windows_path_asset = write_local_markdown_asset( + &root_uri, + "local-md:docs~2FREADME~2FREADME.md", + "attachment", + LocalUploadFile { + name: "C:\\Users\\liaib\\Downloads\\1768096586803-672be7a7-5cb3-454d-9b1b-6230f86ba392.pptx".to_string(), + content_type: "application/vnd.openxmlformats-officedocument.presentationml.presentation" + .to_string(), + bytes: b"pptx".to_vec(), + }, + ) + .expect("upload windows path named pptx asset"); + assert_eq!( + windows_path_asset["file_name"], + "1768096586803-672be7a7-5cb3-454d-9b1b-6230f86ba392.pptx" + ); + assert_eq!( + windows_path_asset["sourcePath"], + "1768096586803-672be7a7-5cb3-454d-9b1b-6230f86ba392.pptx" + ); + assert_eq!( + windows_path_asset["rootRelativePath"], + "docs/README/1768096586803-672be7a7-5cb3-454d-9b1b-6230f86ba392.pptx" + ); let uploaded_asset_index = std::fs::read_to_string(root.join(".mnote").join("uploaded-assets.json")) .expect("uploaded asset index"); diff --git a/rust/crates/mnote-web/src/routes/local_markdown_parser.rs b/rust/crates/mnote-web/src/routes/local_markdown_parser.rs index 356177f0..04937e90 100644 --- a/rust/crates/mnote-web/src/routes/local_markdown_parser.rs +++ b/rust/crates/mnote-web/src/routes/local_markdown_parser.rs @@ -1,6 +1,6 @@ use comrak::nodes::{AstNode, ListType, NodeValue, TableAlignment}; -use comrak::{parse_document, Arena, Options}; -use serde_json::{json, Map, Value}; +use comrak::{Arena, Options, parse_document}; +use serde_json::{Map, Value, json}; use std::collections::BTreeSet; #[derive(Debug, Clone)] diff --git a/rust/crates/mnote-web/src/routes/local_search_index.rs b/rust/crates/mnote-web/src/routes/local_search_index.rs index 8428cfb6..df100bcd 100644 --- a/rust/crates/mnote-web/src/routes/local_search_index.rs +++ b/rust/crates/mnote-web/src/routes/local_search_index.rs @@ -4,7 +4,7 @@ use crate::routes::local_markdown_parser::{ parse_markdown_attachment_link, parse_markdown_page, split_frontmatter, }; use serde::{Deserialize, Serialize}; -use serde_json::{json, Value}; +use serde_json::{Value, json}; use std::fs; use std::path::{Component, Path, PathBuf}; use std::time::{SystemTime, UNIX_EPOCH}; @@ -852,41 +852,55 @@ mod tests { .iter() .find(|item| item["documentId"].as_str() == Some("local-md:README.md")) .expect("home result"); - assert!(home["tags"] - .as_array() - .unwrap() - .iter() - .any(|tag| tag.as_str() == Some("alpha"))); - assert!(home["backlinks"] - .as_array() - .unwrap() - .iter() - .any(|link| link.as_str() == Some("Daily"))); - assert!(home["backlinks"] - .as_array() - .unwrap() - .iter() - .any(|link| link.as_str() == Some("docs/child.md"))); - assert!(home["resourceRefs"] - .as_array() - .unwrap() - .iter() - .any(|reference| reference.as_str() == Some("assets/spec.pdf"))); - assert!(home["resourceRefs"] - .as_array() - .unwrap() - .iter() - .any(|reference| reference.as_str() == Some("maps/idea.mindmap.json"))); - assert!(home["resourceRefs"] - .as_array() - .unwrap() - .iter() - .any(|reference| reference.as_str() == Some("office/report.xlsx"))); - assert!(home["publicPath"] - .as_str() - .is_some_and(|path| path.starts_with( - "/documents/local-md:README.md?sourceKind=local_folder&rootUri=file%3A%2F%2F" - ))); + assert!( + home["tags"] + .as_array() + .unwrap() + .iter() + .any(|tag| tag.as_str() == Some("alpha")) + ); + assert!( + home["backlinks"] + .as_array() + .unwrap() + .iter() + .any(|link| link.as_str() == Some("Daily")) + ); + assert!( + home["backlinks"] + .as_array() + .unwrap() + .iter() + .any(|link| link.as_str() == Some("docs/child.md")) + ); + assert!( + home["resourceRefs"] + .as_array() + .unwrap() + .iter() + .any(|reference| reference.as_str() == Some("assets/spec.pdf")) + ); + assert!( + home["resourceRefs"] + .as_array() + .unwrap() + .iter() + .any(|reference| reference.as_str() == Some("maps/idea.mindmap.json")) + ); + assert!( + home["resourceRefs"] + .as_array() + .unwrap() + .iter() + .any(|reference| reference.as_str() == Some("office/report.xlsx")) + ); + assert!( + home["publicPath"] + .as_str() + .is_some_and(|path| path.starts_with( + "/documents/local-md:README.md?sourceKind=local_folder&rootUri=file%3A%2F%2F" + )) + ); // 含 mnote_id 的 Markdown 仍返回路径型 documentId，不应出现 local-mdid: let child_search = query_local_search_index( @@ -915,11 +929,12 @@ mod tests { Some("local-mdid:child-page") ); - assert!(root - .join(".mnote") - .join("index") - .join("search-index.json") - .exists()); + assert!( + root.join(".mnote") + .join("index") + .join("search-index.json") + .exists() + ); let mindmap_projection = query_local_search_index( &root, &format!("file://{}", root.display()), @@ -931,19 +946,19 @@ mod tests { false, ) .expect("mindmap projection"); - assert!(mindmap_projection["results"] - .as_array() - .unwrap() - .iter() - .any(|item| item["resourceType"].as_str() == Some("mindmap") - && item["path"].as_str() == Some("maps/idea.mindmap.json") - && item["publicPath"] - .as_str() - .is_some_and(|path| path + assert!( + mindmap_projection["results"] + .as_array() + .unwrap() + .iter() + .any(|item| item["resourceType"].as_str() == Some("mindmap") + && item["path"].as_str() == Some("maps/idea.mindmap.json") + && item["publicPath"].as_str().is_some_and(|path| path .starts_with("/?treeView=filetree&sourceKind=local_folder&rootUri=")) - && item["publicPath"] - .as_str() - .is_some_and(|path| !path.starts_with("/tree?")))); + && item["publicPath"] + .as_str() + .is_some_and(|path| !path.starts_with("/tree?"))) + ); let office_projection = query_local_search_index( &root, &format!("file://{}", root.display()), @@ -955,12 +970,14 @@ mod tests { false, ) .expect("office projection"); - assert!(office_projection["results"] - .as_array() - .unwrap() - .iter() - .any(|item| item["resourceType"].as_str() == Some("office") - && item["path"].as_str() == Some("office/report.xlsx"))); + assert!( + office_projection["results"] + .as_array() + .unwrap() + .iter() + .any(|item| item["resourceType"].as_str() == Some("office") + && item["path"].as_str() == Some("office/report.xlsx")) + ); let _ = fs::remove_dir_all(&root); } @@ -987,10 +1004,12 @@ mod tests { let index = read_local_search_index(&root) .expect("read index") .expect("index exists"); - assert!(index - .documents - .iter() - .any(|document| document.path == "README.md")); + assert!( + index + .documents + .iter() + .any(|document| document.path == "README.md") + ); let child = index .documents .iter() @@ -1006,14 +1025,18 @@ mod tests { let index = read_local_search_index(&root) .expect("read index") .expect("index exists"); - assert!(!index - .documents - .iter() - .any(|document| document.path == "docs/child.md")); - assert!(index - .documents - .iter() - .any(|document| document.path == "README.md")); + assert!( + !index + .documents + .iter() + .any(|document| document.path == "docs/child.md") + ); + assert!( + index + .documents + .iter() + .any(|document| document.path == "README.md") + ); let _ = fs::remove_dir_all(&root); } diff --git a/rust/crates/mnote-web/src/routes/media.rs b/rust/crates/mnote-web/src/routes/media.rs index 62cb4eef..e63eb48f 100644 --- a/rust/crates/mnote-web/src/routes/media.rs +++ b/rust/crates/mnote-web/src/routes/media.rs @@ -3,24 +3,24 @@ use crate::context::RequestContext; use crate::error::WebError; use crate::routes::command_support::{build_runtime_command_plan, runtime_context}; use crate::transport::convex::{ - execute_convex_mutation_by_name, execute_convex_query_by_name, + execute_retired_mutation_by_name, execute_retired_query_by_name, persist_runtime_command_artifacts, }; use axum::extract::{Multipart, Query, State}; -use axum::http::{header, HeaderMap}; +use axum::http::{HeaderMap, header}; use axum::response::{IntoResponse, Response}; use axum::{Extension, Json}; -use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine as _}; +use base64::{Engine as _, engine::general_purpose::URL_SAFE_NO_PAD}; use bridge_runtime::{ - build_runtime_command_artifact_plan, RuntimeActorWire, RuntimeCommandEnvelopeWire, - RuntimeSourceWire, RuntimeTargetWire, + RuntimeActorWire, RuntimeCommandEnvelopeWire, RuntimeSourceWire, RuntimeTargetWire, + build_runtime_command_artifact_plan, }; use serde::{Deserialize, Serialize}; -use serde_json::{json, Value}; +use serde_json::{Value, json}; use std::sync::atomic::{AtomicU64, Ordering}; use std::time::{SystemTime, UNIX_EPOCH}; -use time::format_description::well_known::Rfc3339; use time::OffsetDateTime; +use time::format_description::well_known::Rfc3339; static UPLOAD_COUNTER: AtomicU64 = AtomicU64::new(1); @@ -81,7 +81,7 @@ async fn current_user_id(state: &AppState, context: &RequestContext) -> String { if !actor_id.is_empty() && actor_id != "anonymous" { return actor_id.to_string(); } - if let Ok(user) = execute_convex_query_by_name( + if let Ok(user) = execute_retired_query_by_name( state.config(), context, "users:currentUser", @@ -360,7 +360,7 @@ pub async fn upload( ) -> Result { let (file, workspace_id, document_id, mindmap_id) = read_upload_multipart(multipart).await?; let user_id = current_user_id(&state, &context).await; - let upload_url = execute_convex_mutation_by_name( + let upload_url = execute_retired_mutation_by_name( state.config(), &context, "mediaAssets:generateUploadUrl", @@ -421,7 +421,7 @@ pub async fn upload( .map(|value| format!("mindmaps/{value}")); let id = new_asset_id(); let kind = asset_type(&file.content_type); - let created = execute_convex_mutation_by_name( + let created = execute_retired_mutation_by_name( state.config(), &context, "mediaAssets:createWithStorage", @@ -541,7 +541,7 @@ pub async fn sign( .filter(|value| !value.is_empty()) .ok_or_else(|| WebError::bad_request_code("media_sign_asset_missing", "缺少 assetId"))?; let user_id = current_user_id(&state, &context).await; - let asset = execute_convex_query_by_name( + let asset = execute_retired_query_by_name( state.config(), &context, "mediaAssets:getById", @@ -557,7 +557,7 @@ pub async fn sign( "资源不存在", )); } - let refreshed = execute_convex_mutation_by_name( + let refreshed = execute_retired_mutation_by_name( state.config(), &context, "mediaAssets:refreshUrl", diff --git a/rust/crates/mnote-web/src/routes/mindmap_api.rs b/rust/crates/mnote-web/src/routes/mindmap_api.rs index 8291d7b7..255b22e5 100644 --- a/rust/crates/mnote-web/src/routes/mindmap_api.rs +++ b/rust/crates/mnote-web/src/routes/mindmap_api.rs @@ -1,24 +1,25 @@ use crate::app::AppState; use crate::context::RequestContext; use crate::error::WebError; -use crate::routes::command_support::execute_runtime_command_via_convex_with_artifacts; +use crate::routes::command_support::execute_runtime_command_via_legacy_cloud_with_artifacts; use crate::routes::local_folder_source::{ ensure_local_workspace_read_access_with_state, ensure_local_workspace_write_access_with_state, read_local_mindmap_data, write_local_mindmap_data, }; use crate::routes::query_support::{ - execute_runtime_query_against_data, execute_runtime_query_via_convex, - fetch_documents_meta_via_convex, fetch_query_data_via_convex, resolve_effective_workspace_id, + execute_runtime_query_against_data, execute_runtime_query_via_legacy_cloud, + fetch_documents_meta_via_legacy_cloud, fetch_query_data_via_legacy_cloud, + resolve_effective_workspace_id, }; +use axum::Json; use axum::extract::{Extension, Path, Query, State}; use axum::http::{HeaderMap, HeaderName, HeaderValue, StatusCode}; -use axum::Json; use bridge_runtime::{ - apply_mindmap_kernel_commands_to_value, RuntimeActorWire, RuntimeCommandEnvelopeWire, - RuntimeQueryEnvelopeWire, RuntimeSourceWire, RuntimeTargetWire, + RuntimeActorWire, RuntimeCommandEnvelopeWire, RuntimeQueryEnvelopeWire, RuntimeSourceWire, + RuntimeTargetWire, apply_mindmap_kernel_commands_to_value, }; use serde::Deserialize; -use serde_json::{json, Value}; +use serde_json::{Value, json}; const HEADER_MNOTE_WEB_OWNER: &str = "x-mnote-web-owner"; const HEADER_MINDMAP_TRANSPORT: &str = "x-mnote-mindmap-transport"; @@ -122,11 +123,14 @@ async fn resolve_mindmap_workspace_id( // 思维导图 runtime 的历史请求体不一定带 workspaceId； // 这里从页面 meta 反查，确保后续 command artifacts 能进入正确 workspace 的实时流。 - let meta = fetch_documents_meta_via_convex(state.config(), context, None, document_id).await?; + let meta = + fetch_documents_meta_via_legacy_cloud(state.config(), context, None, document_id).await?; Ok(read_workspace_id_from_meta(&meta)) } -fn execution_artifacts_json(execution: &crate::transport::convex::ConvexCommandExecution) -> Value { +fn execution_artifacts_json( + execution: &crate::transport::convex::RetiredCloudCommandExecution, +) -> Value { execution .artifacts .as_ref() @@ -175,7 +179,7 @@ pub async fn get_mindmap( let effective_workspace_id = resolve_effective_workspace_id(&context, params.workspace_id.as_deref(), false)?; let query_name = resolve_query_name(¶ms); - let result = execute_runtime_query_via_convex( + let result = execute_runtime_query_via_legacy_cloud( state.config(), &context, effective_workspace_id.as_deref(), @@ -357,7 +361,7 @@ pub async fn apply_mindmap_command( validate_only: false, }; - let execution = execute_runtime_command_via_convex_with_artifacts( + let execution = execute_runtime_command_via_legacy_cloud_with_artifacts( &state, &context, effective_workspace_id.as_deref(), @@ -378,7 +382,7 @@ pub async fn apply_mindmap_command( )); } - let current = fetch_query_data_via_convex( + let current = fetch_query_data_via_legacy_cloud( state.config(), &context, effective_workspace_id.as_deref(), @@ -439,7 +443,7 @@ pub async fn apply_mindmap_command( validate_only: false, }; - let execution = execute_runtime_command_via_convex_with_artifacts( + let execution = execute_runtime_command_via_legacy_cloud_with_artifacts( &state, &context, effective_workspace_id.as_deref(), @@ -465,10 +469,10 @@ pub async fn apply_mindmap_command( #[cfg(test)] mod tests { - use crate::app::{build_app, AppConfig, AppState}; - use axum::body::{to_bytes, Body}; + use crate::app::{AppConfig, AppState, build_app}; + use axum::body::{Body, to_bytes}; use axum::http::{Request, StatusCode}; - use serde_json::{json, Value}; + use serde_json::{Value, json}; use std::path::PathBuf; use tower::util::ServiceExt; diff --git a/rust/crates/mnote-web/src/routes/mindmap_shell.rs b/rust/crates/mnote-web/src/routes/mindmap_shell.rs index 865e2202..3ef68125 100644 --- a/rust/crates/mnote-web/src/routes/mindmap_shell.rs +++ b/rust/crates/mnote-web/src/routes/mindmap_shell.rs @@ -150,7 +150,7 @@ pub async fn mindmap_object_shell( "documentId": doc_id, "mindmapId": mindmap_id }, - "sourceKind": source_kind.unwrap_or("convex_workspace"), + "sourceKind": source_kind.unwrap_or("local_folder"), "rootUri": root_uri.unwrap_or(""), "revision": serde_json::Value::Null, "conflictDetectionKey": serde_json::Value::Null, @@ -167,7 +167,7 @@ pub async fn mindmap_object_shell( "shell": "mindmap", "documentId": doc_id, "mindmapId": mindmap_id, - "sourceKind": source_kind.unwrap_or("convex_workspace"), + "sourceKind": source_kind.unwrap_or("local_folder"), "rootUri": root_uri.unwrap_or(""), "projection": { "schema": "mnote.mindmap.simple_mind_map_scene.v1", @@ -217,7 +217,7 @@ pub async fn mindmap_object_shell( crate::ssr::MNOTE_CSS, escape_html(&doc_id), escape_html(&mindmap_id), - escape_html(source_kind.unwrap_or("convex_workspace")), + escape_html(source_kind.unwrap_or("local_folder")), escape_html(root_uri.unwrap_or("")), body_content, escape_script_json(&editor_bootstrap_json), @@ -326,8 +326,8 @@ fn render_mindmap_standalone_bootstrap_script() -> &'static str { #[cfg(test)] mod tests { - use crate::app::{build_app, AppConfig, AppState}; - use axum::body::{to_bytes, Body}; + use crate::app::{AppConfig, AppState, build_app}; + use axum::body::{Body, to_bytes}; use axum::http::{Request, StatusCode}; use tower::util::ServiceExt; diff --git a/rust/crates/mnote-web/src/routes/mod.rs b/rust/crates/mnote-web/src/routes/mod.rs index d54bb984..5c03fa5d 100644 --- a/rust/crates/mnote-web/src/routes/mod.rs +++ b/rust/crates/mnote-web/src/routes/mod.rs @@ -17,6 +17,7 @@ mod local_search_index; mod media; mod mindmap_api; mod mindmap_shell; +pub(crate) mod navigation_recent; mod onlyoffice; mod page_ai_workflow; mod query_support; @@ -34,14 +35,16 @@ pub(crate) mod web_shell; mod ws; pub(crate) use local_folder_source::{ - ensure_local_path_read_access, ensure_local_workspace_access, local_workspace_id_from_root_uri, + ensure_local_path_read_access, ensure_local_workspace_access, + local_markdown_conflict_detection_key, local_workspace_id_from_root_uri, update_local_markdown_title, write_local_markdown_page_body, }; pub(crate) use local_search_index::refresh_local_search_index_for_path; use crate::app::AppState; -use axum::routing::{any, delete, get, post, put}; use axum::Router; +use axum::extract::DefaultBodyLimit; +use axum::routing::{any, delete, get, post, put}; pub fn build_router(state: AppState) -> Router { let hermes_base_path = state.config().hermes_base_path.clone(); @@ -109,6 +112,13 @@ pub fn build_router(state: AppState) -> Router { "/api/editor/image-placeholder.svg", get(web_shell::editor_image_placeholder_asset), ) + .route("/office-preview", get(web_shell::office_preview_page)) + .route( + "/api/office-preview/vendor/{*asset_path}", + get(web_shell::office_preview_vendor_asset), + ) + .route("/pdf-preview", get(web_shell::pdf_preview_page)) + .route("/api/pdfjs/{*asset_path}", get(web_shell::pdfjs_asset)) .route( "/api/mnote-browser-runtime/resource-open-runtime.js", get(web_shell::resource_open_runtime_asset), @@ -286,6 +296,10 @@ pub fn build_router(state: AppState) -> Router { "/api/sidebar/shortcuts/{shortcut_id}", delete(sidebar_shortcuts::delete_shortcut), ) + .route( + "/api/navigation/recent", + get(navigation_recent::list_recent).post(navigation_recent::upsert_recent), + ) .route( "/api/admin/access-policy", get(local_folder_source::get_local_access_policy), @@ -398,6 +412,10 @@ pub fn build_router(state: AppState) -> Router { .route("/api/documents/meta", get(documents::meta)) .route("/api/documents/content", get(documents::content)) .route("/api/documents/buffer-state", get(documents::buffer_state)) + .route( + "/api/documents/buffer-state/dirty", + post(documents::mark_buffer_dirty), + ) .route("/api/documents/purge", post(documents::purge)) .route("/api/documents/empty-trash", post(documents::empty_trash)) .route("/api/documents/title", post(documents::title)) @@ -440,7 +458,8 @@ pub fn build_router(state: AppState) -> Router { ) .route( "/api/local-folder/assets/upload", - post(local_folder_source::upload_local_markdown_asset), + post(local_folder_source::upload_local_markdown_asset) + .layer(DefaultBodyLimit::max(128 * 1024 * 1024)), ) .route( "/api/local-folder/files/open", @@ -552,9 +571,12 @@ pub fn build_router(state: AppState) -> Router { mod tests { use super::build_router; use crate::app::{AppConfig, AppState}; - use axum::body::Body; - use axum::http::{Request, StatusCode}; + use crate::context::RequestContext; use axum::Router; + use axum::body::{Body, to_bytes}; + use axum::http::{Request, StatusCode}; + use serde_json::{Value, json}; + use std::fs; use tower::ServiceExt; fn app(enable_debug_shell_routes: bool) -> Router { @@ -641,6 +663,16 @@ mod tests { ("GET", "/api/onlyoffice/proxy?u=x"), ("POST", "/api/onlyoffice/callback"), ("POST", "/api/onlyoffice/forcesave"), + ( + "GET", + "/office-preview?fileUrl=/api/local-folder/files/open&fileType=docx", + ), + ("GET", "/api/office-preview/vendor/jszip.min.js"), + ("GET", "/api/office-preview/vendor/docx-preview.min.js"), + ("GET", "/api/office-preview/vendor/xlsx.full.min.js"), + ("GET", "/api/office-preview/vendor/pptx-preview.umd.js"), + ("GET", "/pdf-preview?fileUrl=/api/local-folder/files/open"), + ("GET", "/api/pdfjs/pdf.mjs"), ("POST", "/api/media/upload"), ("GET", "/api/media/sign?assetId=x"), ("POST", "/api/tree/filetree/upload-target-preflight"), @@ -667,6 +699,316 @@ mod tests { } } + #[tokio::test] + async fn office_preview_page_serves_lightweight_viewer_shell() { + let response = app(false) + .oneshot( + Request::builder() + .uri("/office-preview?fileUrl=/api/local-folder/files/open&fileName=report.docx&fileType=docx") + .body(Body::empty()) + .expect("request"), + ) + .await + .expect("response"); + assert_eq!(response.status(), StatusCode::OK); + let body = to_bytes(response.into_body(), usize::MAX) + .await + .expect("body bytes"); + let html = String::from_utf8(body.to_vec()).expect("utf8 html"); + assert!(html.contains("mnote-office-preview")); + assert!(html.contains("/api/office-preview/vendor/jszip.min.js")); + assert!(html.contains("/api/office-preview/vendor/docx-preview.min.js")); + assert!(html.contains("/api/office-preview/vendor/xlsx.full.min.js")); + assert!(!html.contains("mnote-office-toolbar")); + assert!(!html.contains("mnote-office-button")); + assert!(!html.contains(">下载<")); + assert!(html.contains(r#"data-page-width-content-type="word""#)); + assert!(html.contains("applyPreviewWidthPreference")); + } + + #[tokio::test] + async fn office_preview_page_serves_pptx_lightweight_viewer_shell() { + let response = app(false) + .oneshot( + Request::builder() + .uri("/office-preview?fileUrl=/api/local-folder/files/open&fileName=slides.pptx&fileType=pptx") + .body(Body::empty()) + .expect("request"), + ) + .await + .expect("response"); + assert_eq!(response.status(), StatusCode::OK); + let body = to_bytes(response.into_body(), usize::MAX) + .await + .expect("body bytes"); + let html = String::from_utf8(body.to_vec()).expect("utf8 html"); + assert!(html.contains(r#"data-page-width-content-type="ppt""#)); + assert!(html.contains("/api/office-preview/vendor/pptx-preview.umd.js")); + assert!(html.contains("renderPptx")); + assert!(html.contains("window.pptxPreview")); + assert!(!html.contains("mnote-office-toolbar")); + } + + #[tokio::test] + async fn pdf_preview_page_does_not_render_visible_toolbar() { + let response = app(false) + .oneshot( + Request::builder() + .uri("/pdf-preview?fileUrl=/api/local-folder/files/open&fileName=report.pdf") + .body(Body::empty()) + .expect("request"), + ) + .await + .expect("response"); + assert_eq!(response.status(), StatusCode::OK); + let body = to_bytes(response.into_body(), usize::MAX) + .await + .expect("body bytes"); + let html = String::from_utf8(body.to_vec()).expect("utf8 html"); + assert!(html.contains("report.pdf")); + assert!(!html.contains("mnote-pdf-toolbar")); + assert!(!html.contains("mnote-pdf-title")); + assert!(!html.contains("mnote-pdf-button")); + assert!(html.contains(r#"data-page-width-content-type="pdf""#)); + assert!(html.contains("applyPreviewWidthPreference")); + } + + #[tokio::test] + async fn pdfjs_asset_uses_mobile_compatible_pdfjs_4() { + let response = app(false) + .oneshot( + Request::builder() + .uri("/api/pdfjs/pdf.mjs") + .body(Body::empty()) + .expect("request"), + ) + .await + .expect("response"); + assert_eq!(response.status(), StatusCode::OK); + let body = to_bytes(response.into_body(), usize::MAX) + .await + .expect("body bytes"); + let source = String::from_utf8(body.to_vec()).expect("utf8 js"); + assert!( + source.contains("pdfjsVersion = 4.10.38") || source.contains("version = \"4.10.38\"") + ); + assert!(!source.contains("getOrInsertComputed")); + } + + #[tokio::test] + async fn ui_preferences_api_updates_and_returns_effective_page_width_preferences() { + let root_a = + std::env::temp_dir().join(format!("mnote-page-width-a-{}", std::process::id())); + let root_b = + std::env::temp_dir().join(format!("mnote-page-width-b-{}", std::process::id())); + let _ = fs::remove_dir_all(&root_a); + let _ = fs::remove_dir_all(&root_b); + fs::create_dir_all(root_a.join(".mnote")).expect("root a metadata"); + fs::create_dir_all(root_b.join(".mnote")).expect("root b metadata"); + fs::write( + root_a.join(".mnote").join("workspace.json"), + r#"{"workspaceId":"workspace-a","ownerId":"user_page_width","createdAt":"2026-05-28T00:00:00Z","capabilities":["local_files"]}"#, + ) + .expect("root a manifest"); + fs::write( + root_b.join(".mnote").join("workspace.json"), + r#"{"workspaceId":"workspace-b","ownerId":"user_page_width","createdAt":"2026-05-28T00:00:00Z","capabilities":["local_files"]}"#, + ) + .expect("root b manifest"); + let root_a_uri = format!("file://{}", root_a.display()); + let root_b_uri = format!("file://{}", root_b.display()); + let router = app(false); + let mut put_request = Request::builder() + .method("PUT") + .uri("/api/ui/preferences") + .header("content-type", "application/json") + .header("x-mnote-actor-id", "user_page_width") + .header("x-mnote-actor-type", "user") + .body(Body::from( + json!({ + "workspaceId": "workspace-a", + "sourceKind": "local_folder", + "rootUri": root_a_uri, + "documentId": "local-md:a.md", + "updates": { + "pageWidth.default": {"mode": "comfortable", "custom": null}, + "pageWidth.word": {"mode": "wide", "custom": null}, + "pageWidth.excel": {"mode": "full", "custom": null} + } + }) + .to_string(), + )) + .expect("request"); + let put_context = RequestContext::from_http_parts( + put_request.method(), + put_request.uri(), + put_request.headers(), + ); + put_request.extensions_mut().insert(put_context); + let put_response = router + .clone() + .oneshot(put_request) + .await + .expect("put response"); + let put_status = put_response.status(); + let put_body = to_bytes(put_response.into_body(), usize::MAX) + .await + .expect("put body bytes"); + let put_text = String::from_utf8(put_body.to_vec()).expect("utf8 put body"); + assert_eq!(put_status, StatusCode::OK, "{put_text}"); + + let mut get_request = Request::builder() + .uri(format!("/api/ui/preferences/effective?workspaceId=workspace-b&sourceKind=local_folder&rootUri={}&documentId=local-md:b.md", root_b_uri)) + .header("x-mnote-actor-id", "user_page_width") + .header("x-mnote-actor-type", "user") + .body(Body::empty()) + .expect("request"); + let get_context = RequestContext::from_http_parts( + get_request.method(), + get_request.uri(), + get_request.headers(), + ); + get_request.extensions_mut().insert(get_context); + let get_response = router.oneshot(get_request).await.expect("get response"); + assert_eq!(get_response.status(), StatusCode::OK); + let body = to_bytes(get_response.into_body(), usize::MAX) + .await + .expect("body bytes"); + let payload: Value = serde_json::from_slice(&body).expect("json payload"); + assert_eq!( + payload["result"]["pageWidthPreferences"]["default"]["mode"], + "comfortable" + ); + assert_eq!( + payload["result"]["pageWidthPreferences"]["word"]["mode"], + "wide" + ); + assert_eq!( + payload["result"]["pageWidthPreferences"]["excel"]["mode"], + "full" + ); + assert_eq!( + payload["result"]["pageWidthPreferences"]["word"]["source"], + "global" + ); + let _ = fs::remove_dir_all(&root_a); + let _ = fs::remove_dir_all(&root_b); + } + + #[tokio::test] + async fn ui_preferences_api_persists_ai_preferences_per_user_and_workspace() { + let router = app(false); + let root = + std::env::temp_dir().join(format!("mnote-ai-preferences-{}", std::process::id())); + let _ = fs::remove_dir_all(&root); + fs::create_dir_all(root.join(".mnote")).expect("root metadata"); + fs::write( + root.join(".mnote").join("workspace.json"), + r#"{"workspaceId":"workspace-ai-a","ownerId":"alice_ai_pref","createdAt":"2026-05-28T00:00:00Z","capabilities":["local_files"]}"#, + ) + .expect("root manifest"); + let root_uri = format!("file://{}", root.display()); + let mut put_request = Request::builder() + .method("PUT") + .uri("/api/ui/preferences") + .header("content-type", "application/json") + .header("x-mnote-actor-id", "alice_ai_pref") + .header("x-mnote-actor-type", "user") + .body(Body::from( + json!({ + "workspaceId": "workspace-ai-a", + "sourceKind": "local_folder", + "rootUri": root_uri, + "documentId": "local-md:ai.md", + "updates": { + "ai.common.default_agent_id": "reasonix", + "ai.common.context_refs.default_selected": { + "current_page": true, + "folder": true + }, + "ai.agent.hermes.profile_id": "mnoteai" + } + }) + .to_string(), + )) + .expect("request"); + let put_context = RequestContext::from_http_parts( + put_request.method(), + put_request.uri(), + put_request.headers(), + ); + put_request.extensions_mut().insert(put_context); + let put_response = router + .clone() + .oneshot(put_request) + .await + .expect("put response"); + let put_status = put_response.status(); + let put_body = to_bytes(put_response.into_body(), usize::MAX) + .await + .expect("put body"); + let put_text = String::from_utf8(put_body.to_vec()).expect("put utf8"); + assert_eq!(put_status, StatusCode::OK, "{put_text}"); + + let mut alice_get = Request::builder() + .uri(format!("/api/ui/preferences/effective?workspaceId=workspace-ai-a&sourceKind=local_folder&rootUri={root_uri}&documentId=local-md:ai.md")) + .header("x-mnote-actor-id", "alice_ai_pref") + .header("x-mnote-actor-type", "user") + .body(Body::empty()) + .expect("request"); + let alice_context = RequestContext::from_http_parts( + alice_get.method(), + alice_get.uri(), + alice_get.headers(), + ); + alice_get.extensions_mut().insert(alice_context); + let alice_response = router + .clone() + .oneshot(alice_get) + .await + .expect("alice get response"); + assert_eq!(alice_response.status(), StatusCode::OK); + let alice_body = to_bytes(alice_response.into_body(), usize::MAX) + .await + .expect("alice body"); + let alice_payload: Value = serde_json::from_slice(&alice_body).expect("alice json"); + assert_eq!( + alice_payload["result"]["aiPreferences"]["ai.common.default_agent_id"], + "reasonix" + ); + assert_eq!( + alice_payload["result"]["aiPreferences"]["ai.common.context_refs.default_selected"]["folder"], + true + ); + assert_eq!( + alice_payload["result"]["aiPreferences"]["ai.agent.hermes.profile_id"], + "mnoteai" + ); + + let mut bob_get = Request::builder() + .uri(format!("/api/ui/preferences/effective?workspaceId=workspace-ai-a&sourceKind=local_folder&rootUri={root_uri}&documentId=local-md:ai.md")) + .header("x-mnote-actor-id", "bob_ai_pref") + .header("x-mnote-actor-type", "user") + .body(Body::empty()) + .expect("request"); + let bob_context = + RequestContext::from_http_parts(bob_get.method(), bob_get.uri(), bob_get.headers()); + bob_get.extensions_mut().insert(bob_context); + let bob_response = router.oneshot(bob_get).await.expect("bob get response"); + assert_eq!(bob_response.status(), StatusCode::OK); + let bob_body = to_bytes(bob_response.into_body(), usize::MAX) + .await + .expect("bob body"); + let bob_payload: Value = serde_json::from_slice(&bob_body).expect("bob json"); + assert!( + bob_payload["result"]["aiPreferences"] + .as_object() + .map(|value| value.is_empty()) + .unwrap_or(false) + ); + let _ = fs::remove_dir_all(&root); + } + #[tokio::test] async fn mnote_browser_runtime_assets_are_explicitly_mounted() { for path in [ diff --git a/rust/crates/mnote-web/src/routes/navigation_recent.rs b/rust/crates/mnote-web/src/routes/navigation_recent.rs new file mode 100644 index 00000000..58136a33 --- /dev/null +++ b/rust/crates/mnote-web/src/routes/navigation_recent.rs @@ -0,0 +1,686 @@ +use crate::app::AppState; +use crate::context::RequestContext; +use crate::error::WebError; +use crate::routes::gateway::current_actor_id; +use crate::routes::local_folder_source::ensure_local_workspace_read_access_with_state; +use axum::Json; +use axum::extract::{Extension, Query, State}; +use axum::http::StatusCode; +use control_plane::{NavigationRecentRecord, UpsertNavigationRecentInput}; +use serde::Deserialize; +use serde_json::{Value, json}; +use std::path::{Component, Path, PathBuf}; + +#[derive(Debug, Clone, Default, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct NavigationRecentListQuery { + #[serde(default)] + kind: Option, + #[serde(default)] + limit: Option, +} + +#[derive(Debug, Clone, Default, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct NavigationRecentUpsertRequest { + #[serde(default)] + id: Option, + #[serde(default, alias = "workspace_id")] + workspace_id: Option, + #[serde(default)] + kind: String, + #[serde(default, alias = "source_kind")] + source_kind: String, + #[serde(default, alias = "root_uri")] + root_uri: String, + #[serde(default, alias = "relative_path")] + relative_path: Option, + #[serde(default, alias = "document_id")] + document_id: Option, + #[serde(default)] + title: String, + #[serde(default, alias = "metadata_json")] + metadata_json: Option, +} + +pub async fn list_recent( + State(state): State, + Extension(context): Extension, + Query(query): Query, +) -> Result, WebError> { + let actor_id = require_actor_id(&state, &context)?; + let records = load_navigation_recent_records( + &state, + &context, + &actor_id, + query.kind.as_deref(), + query.limit.unwrap_or(40), + ); + Ok(Json(json!({ + "ok": true, + "owner": "mnote-web", + "folders": records.iter().filter(|record| record.kind == "folder").map(recent_to_json).collect::>(), + "pages": records.iter().filter(|record| record.kind == "page").map(recent_to_json).collect::>(), + "items": records.iter().map(recent_to_json).collect::>(), + }))) +} + +pub async fn upsert_recent( + State(state): State, + Extension(context): Extension, + Json(request): Json, +) -> Result, WebError> { + let actor_id = require_actor_id(&state, &context)?; + let metadata_json = normalize_metadata_json(request.metadata_json)?; + let source_kind = request + .source_kind + .trim() + .to_string() + .if_empty_else(|| "local_folder".to_string()); + let root_uri = request.root_uri.trim().to_string(); + let kind = request.kind.trim().to_string(); + let document_id = request + .document_id + .map(|value| value.trim().to_string()) + .filter(|value| !value.is_empty()); + let relative_path = normalize_navigation_relative_path(request.relative_path.as_deref())? + .or_else(|| { + document_id + .as_deref() + .and_then(local_markdown_relative_path_from_document_id) + }); + if source_kind == "local_folder" { + let root_path = ensure_local_workspace_read_access_with_state(&state, &context, &root_uri)?; + ensure_navigation_recent_target_exists(&root_path, &kind, relative_path.as_deref())?; + } + let record = state + .control_plane() + .upsert_navigation_recent(UpsertNavigationRecentInput { + id: request.id, + user_id: actor_id, + workspace_id: request + .workspace_id + .map(|value| value.trim().to_string()) + .filter(|value| !value.is_empty()), + kind, + source_kind, + root_uri, + relative_path, + document_id, + title: request.title.trim().to_string(), + metadata_json, + }) + .map_err(|error| { + WebError::bad_request_code( + "navigation_recent_upsert_failed", + format!("写入最近访问失败: {error}"), + ) + .with_context(&context) + })?; + Ok(Json(json!({ + "ok": true, + "owner": "mnote-web", + "recent": recent_to_json(&record), + }))) +} + +pub(crate) fn load_navigation_recent_records( + state: &AppState, + context: &RequestContext, + actor_id: &str, + kind: Option<&str>, + limit: usize, +) -> Vec { + state + .control_plane() + .list_navigation_recent(actor_id, kind, limit) + .unwrap_or_default() + .into_iter() + .filter(|record| navigation_recent_is_accessible(state, context, record)) + .collect() +} + +fn navigation_recent_is_accessible( + state: &AppState, + context: &RequestContext, + record: &NavigationRecentRecord, +) -> bool { + if record.source_kind != "local_folder" { + return true; + } + let Ok(root_path) = + ensure_local_workspace_read_access_with_state(state, context, &record.root_uri) + else { + return false; + }; + let relative_path = if record + .relative_path + .as_deref() + .map(str::trim) + .filter(|value| !value.is_empty()) + .is_some() + { + let Ok(relative_path) = normalize_navigation_relative_path(record.relative_path.as_deref()) + else { + return false; + }; + relative_path + } else { + record + .document_id + .as_deref() + .and_then(local_markdown_relative_path_from_document_id) + }; + let Ok(target_path) = relative_path + .as_deref() + .map(|path| canonical_navigation_target(&root_path, path)) + .transpose() + else { + return false; + }; + match record.kind.as_str() { + "folder" => target_path + .as_deref() + .map(Path::is_dir) + .unwrap_or_else(|| root_path.is_dir()), + "page" => target_path.as_deref().map(Path::is_file).unwrap_or(false), + _ => true, + } +} + +fn ensure_navigation_recent_target_exists( + root_path: &Path, + kind: &str, + relative_path: Option<&str>, +) -> Result<(), WebError> { + match kind { + "folder" => { + if let Some(path) = relative_path { + let target = canonical_navigation_target(root_path, path)?; + if !target.is_dir() { + return Err(WebError::bad_request_code( + "navigation_recent_folder_not_found", + "最近访问文件夹不存在", + )); + } + } + Ok(()) + } + "page" => { + let Some(path) = relative_path else { + return Err(WebError::bad_request_code( + "navigation_recent_page_path_required", + "最近访问页面缺少相对路径", + )); + }; + let target = canonical_navigation_target(root_path, path)?; + if !target.is_file() { + return Err(WebError::bad_request_code( + "navigation_recent_page_not_found", + "最近访问页面不存在", + )); + } + Ok(()) + } + _ => Ok(()), + } +} + +fn canonical_navigation_target(root_path: &Path, relative_path: &str) -> Result { + let relative_path = normalize_navigation_relative_path(Some(relative_path))? + .as_deref() + .map(Path::new) + .map(|path| root_path.join(path)) + .unwrap_or_else(|| root_path.to_path_buf()); + let canonical_target = relative_path.canonicalize().map_err(|error| { + WebError::bad_request_code( + "navigation_recent_target_unavailable", + format!("最近访问目标不可用: {error}"), + ) + })?; + if !canonical_target.starts_with(root_path) { + return Err(WebError::bad_request_code( + "navigation_recent_root_escape", + "最近访问路径不能越过授权目录", + )); + } + Ok(canonical_target) +} + +fn normalize_navigation_relative_path(value: Option<&str>) -> Result, WebError> { + let Some(value) = value.map(str::trim).filter(|value| !value.is_empty()) else { + return Ok(None); + }; + let normalized = value.replace('\\', "/"); + let raw_path = Path::new(&normalized); + if raw_path.is_absolute() + || raw_path + .components() + .any(|component| matches!(component, Component::ParentDir)) + { + return Err(WebError::bad_request_code( + "navigation_recent_root_escape", + "最近访问路径不能越过授权目录", + )); + } + let cleaned = normalized + .split('/') + .filter(|segment| !segment.trim().is_empty() && *segment != ".") + .collect::>() + .join("/"); + Ok(Some(cleaned).filter(|value| !value.is_empty())) +} + +fn local_markdown_relative_path_from_document_id(document_id: &str) -> Option { + Some( + document_id + .trim() + .strip_prefix("local-md:")? + .replace("~2F", "/"), + ) +} + +fn require_actor_id(state: &AppState, context: &RequestContext) -> Result { + current_actor_id(state, context) + .filter(|actor_id| !actor_id.trim().is_empty() && actor_id.trim() != "anonymous") + .ok_or_else(|| { + WebError::new( + StatusCode::UNAUTHORIZED, + "navigation_recent_auth_required", + "最近访问需要登录用户", + ) + .with_context(context) + }) +} + +fn recent_to_json(record: &NavigationRecentRecord) -> Value { + json!({ + "id": record.id, + "userId": record.user_id, + "workspaceId": record.workspace_id, + "kind": record.kind, + "sourceKind": record.source_kind, + "rootUri": record.root_uri, + "relativePath": record.relative_path, + "documentId": record.document_id, + "title": record.title, + "status": record.status, + "metadata": serde_json::from_str::(&record.metadata_json).unwrap_or(Value::Null), + "visitedAt": record.visited_at, + "createdAt": record.created_at, + "updatedAt": record.updated_at, + "revision": record.revision, + }) +} + +fn normalize_metadata_json(metadata_json: Option) -> Result { + let metadata = metadata_json + .as_deref() + .map(str::trim) + .filter(|value| !value.is_empty()) + .map(|value| serde_json::from_str::(value)) + .transpose() + .map_err(|error| { + WebError::bad_request_code( + "navigation_recent_metadata_invalid", + format!("最近访问 metadataJson 必须是 JSON 对象: {error}"), + ) + })? + .unwrap_or_else(|| json!({})); + let normalized = if metadata.is_object() { + metadata + } else { + json!({}) + }; + serde_json::to_string(&normalized) + .map_err(|error| WebError::internal(format!("最近访问 metadataJson 序列化失败: {error}"))) +} + +trait EmptyStringExt { + fn if_empty_else(self, fallback: impl FnOnce() -> String) -> String; +} + +impl EmptyStringExt for String { + fn if_empty_else(self, fallback: impl FnOnce() -> String) -> String { + if self.trim().is_empty() { + fallback() + } else { + self + } + } +} + +#[cfg(test)] +mod tests { + use super::*; + use crate::app::{AppConfig, AppState, build_app}; + use axum::body::{Body, to_bytes}; + use axum::http::{Request, StatusCode, header}; + use control_plane::{UpsertNavigationRecentInput, UpsertUserInput}; + use tower::ServiceExt; + + fn test_state() -> AppState { + AppState::new(AppConfig { + service_name: "mnote-web".into(), + service_version: "0.1.0".into(), + bind_addr: "127.0.0.1:0".into(), + public_bind_addr: "127.0.0.1:3000".into(), + legacy_next_base_url: Some("http://127.0.0.1:3100".into()), + enable_legacy_next_compat: false, + enable_debug_shell_routes: false, + enable_editor_actor: true, + hermes_base_path: "/api/hermes".into(), + compat_next_base_path: "/api/compat/next".into(), + convex_url: None, + convex_admin_key: None, + allow_dev_fixtures: true, + query_fixtures_json: None, + mutation_fixtures_json: None, + dev_user_id: "dev-user".into(), + dev_user_name: "开发用户".into(), + dev_user_email: "dev@mnote.local".into(), + }) + } + + fn temp_root(name: &str) -> std::path::PathBuf { + let root = std::env::temp_dir().join(format!("{name}-{}", uuid::Uuid::new_v4().simple())); + let _ = std::fs::remove_dir_all(&root); + std::fs::create_dir_all(&root).expect("create temp root"); + root + } + + #[tokio::test] + async fn navigation_recent_requires_logged_in_actor() { + let response = build_app(test_state()) + .oneshot( + Request::builder() + .uri("/api/navigation/recent") + .body(Body::empty()) + .expect("request"), + ) + .await + .expect("response"); + + assert_eq!(response.status(), StatusCode::UNAUTHORIZED); + } + + #[tokio::test] + async fn navigation_recent_post_and_get_returns_folder_and_page_groups() { + let root = temp_root("mnote-navigation-recent-api"); + std::fs::create_dir_all(root.join("docs")).expect("create docs"); + std::fs::write(root.join("docs").join("Plan.md"), "# Plan\n").expect("write plan"); + let root_uri = format!("file://{}", root.display()); + crate::routes::local_folder_source::initialize_local_workspace_for_actor( + "user_real", + &root_uri, + ) + .expect("init local workspace"); + let state = test_state(); + state + .control_plane() + .upsert_user(UpsertUserInput { + id: Some("user_real".to_string()), + email: Some("user_real@example.com".to_string()), + username: "user_real".to_string(), + display_name: "user_real".to_string(), + role: None, + password_hash: None, + }) + .expect("upsert user"); + let app = build_app(state); + + let folder_body = json!({ + "kind": "folder", + "sourceKind": "local_folder", + "rootUri": root_uri, + "relativePath": "docs", + "title": "docs" + }) + .to_string(); + let response = app + .clone() + .oneshot( + Request::builder() + .method("POST") + .uri("/api/navigation/recent") + .header(header::CONTENT_TYPE, "application/json") + .header("x-mnote-actor-id", "user_real") + .header("x-mnote-actor-type", "user") + .body(Body::from(folder_body)) + .expect("request"), + ) + .await + .expect("response"); + assert_eq!(response.status(), StatusCode::OK); + + let page_body = json!({ + "kind": "page", + "sourceKind": "local_folder", + "rootUri": root_uri, + "relativePath": "docs/Plan.md", + "documentId": "local-md:docs~2FPlan.md", + "title": "Plan" + }) + .to_string(); + let response = app + .clone() + .oneshot( + Request::builder() + .method("POST") + .uri("/api/navigation/recent") + .header(header::CONTENT_TYPE, "application/json") + .header("x-mnote-actor-id", "user_real") + .header("x-mnote-actor-type", "user") + .body(Body::from(page_body)) + .expect("request"), + ) + .await + .expect("response"); + assert_eq!(response.status(), StatusCode::OK); + + let response = app + .oneshot( + Request::builder() + .uri("/api/navigation/recent") + .header("x-mnote-actor-id", "user_real") + .header("x-mnote-actor-type", "user") + .body(Body::empty()) + .expect("request"), + ) + .await + .expect("response"); + + let _ = std::fs::remove_dir_all(&root); + + assert_eq!(response.status(), StatusCode::OK); + let body = to_bytes(response.into_body(), usize::MAX) + .await + .expect("body"); + let payload: Value = serde_json::from_slice(&body).expect("json"); + assert_eq!(payload["folders"][0]["relativePath"], "docs"); + assert_eq!(payload["pages"][0]["documentId"], "local-md:docs~2FPlan.md"); + assert_eq!(payload["items"].as_array().map(Vec::len), Some(2)); + } + + #[tokio::test] + async fn navigation_recent_list_filters_deleted_local_paths() { + let root = temp_root("mnote-navigation-recent-filter-deleted"); + std::fs::create_dir_all(root.join("docs")).expect("create docs"); + std::fs::write(root.join("docs").join("Plan.md"), "# Plan\n").expect("write plan"); + let root_uri = format!("file://{}", root.display()); + crate::routes::local_folder_source::initialize_local_workspace_for_actor( + "user_real", + &root_uri, + ) + .expect("init local workspace"); + let state = test_state(); + state + .control_plane() + .upsert_user(UpsertUserInput { + id: Some("user_real".to_string()), + email: Some("user_real@example.com".to_string()), + username: "user_real".to_string(), + display_name: "user_real".to_string(), + role: None, + password_hash: None, + }) + .expect("upsert user"); + state + .control_plane() + .upsert_navigation_recent(UpsertNavigationRecentInput { + id: None, + user_id: "user_real".to_string(), + workspace_id: None, + kind: "page".to_string(), + source_kind: "local_folder".to_string(), + root_uri: root_uri.clone(), + relative_path: Some("docs/Plan.md".to_string()), + document_id: Some("local-md:docs~2FPlan.md".to_string()), + title: "Plan".to_string(), + metadata_json: "{}".to_string(), + }) + .expect("insert recent"); + std::fs::remove_file(root.join("docs").join("Plan.md")).expect("delete plan"); + + let response = build_app(state) + .oneshot( + Request::builder() + .uri("/api/navigation/recent") + .header("x-mnote-actor-id", "user_real") + .header("x-mnote-actor-type", "user") + .body(Body::empty()) + .expect("request"), + ) + .await + .expect("response"); + + let _ = std::fs::remove_dir_all(&root); + + assert_eq!(response.status(), StatusCode::OK); + let body = to_bytes(response.into_body(), usize::MAX) + .await + .expect("body"); + let payload: Value = serde_json::from_slice(&body).expect("json"); + assert_eq!(payload["pages"].as_array().map(Vec::len), Some(0)); + assert_eq!(payload["items"].as_array().map(Vec::len), Some(0)); + } + + #[tokio::test] + async fn navigation_recent_post_rejects_root_escape_relative_path() { + let root = temp_root("mnote-navigation-recent-reject-escape"); + std::fs::create_dir_all(root.join("docs")).expect("create docs"); + let root_uri = format!("file://{}", root.display()); + crate::routes::local_folder_source::initialize_local_workspace_for_actor( + "user_real", + &root_uri, + ) + .expect("init local workspace"); + let state = test_state(); + state + .control_plane() + .upsert_user(UpsertUserInput { + id: Some("user_real".to_string()), + email: Some("user_real@example.com".to_string()), + username: "user_real".to_string(), + display_name: "user_real".to_string(), + role: None, + password_hash: None, + }) + .expect("upsert user"); + let app = build_app(state); + let body = json!({ + "kind": "folder", + "sourceKind": "local_folder", + "rootUri": root_uri, + "relativePath": "../", + "title": "escape" + }) + .to_string(); + + let response = app + .oneshot( + Request::builder() + .method("POST") + .uri("/api/navigation/recent") + .header(header::CONTENT_TYPE, "application/json") + .header("x-mnote-actor-id", "user_real") + .header("x-mnote-actor-type", "user") + .body(Body::from(body)) + .expect("request"), + ) + .await + .expect("response"); + + let _ = std::fs::remove_dir_all(&root); + + assert_eq!(response.status(), StatusCode::BAD_REQUEST); + assert_eq!( + response + .headers() + .get("x-error-code") + .and_then(|value| value.to_str().ok()), + Some("navigation_recent_root_escape") + ); + } + + #[tokio::test] + async fn navigation_recent_list_filters_root_escape_records() { + let root = temp_root("mnote-navigation-recent-filter-escape"); + std::fs::create_dir_all(root.join("docs")).expect("create docs"); + let root_uri = format!("file://{}", root.display()); + crate::routes::local_folder_source::initialize_local_workspace_for_actor( + "user_real", + &root_uri, + ) + .expect("init local workspace"); + let state = test_state(); + state + .control_plane() + .upsert_user(UpsertUserInput { + id: Some("user_real".to_string()), + email: Some("user_real@example.com".to_string()), + username: "user_real".to_string(), + display_name: "user_real".to_string(), + role: None, + password_hash: None, + }) + .expect("upsert user"); + state + .control_plane() + .upsert_navigation_recent(UpsertNavigationRecentInput { + id: None, + user_id: "user_real".to_string(), + workspace_id: None, + kind: "folder".to_string(), + source_kind: "local_folder".to_string(), + root_uri: root_uri.clone(), + relative_path: Some("../".to_string()), + document_id: None, + title: "escape".to_string(), + metadata_json: "{}".to_string(), + }) + .expect("insert escaped recent through store"); + + let response = build_app(state) + .oneshot( + Request::builder() + .uri("/api/navigation/recent") + .header("x-mnote-actor-id", "user_real") + .header("x-mnote-actor-type", "user") + .body(Body::empty()) + .expect("request"), + ) + .await + .expect("response"); + + let _ = std::fs::remove_dir_all(&root); + + assert_eq!(response.status(), StatusCode::OK); + let body = to_bytes(response.into_body(), usize::MAX) + .await + .expect("body"); + let payload: Value = serde_json::from_slice(&body).expect("json"); + assert_eq!(payload["folders"].as_array().map(Vec::len), Some(0)); + assert_eq!(payload["items"].as_array().map(Vec::len), Some(0)); + } +} diff --git a/rust/crates/mnote-web/src/routes/onlyoffice.rs b/rust/crates/mnote-web/src/routes/onlyoffice.rs index cb059e58..83ce73a5 100644 --- a/rust/crates/mnote-web/src/routes/onlyoffice.rs +++ b/rust/crates/mnote-web/src/routes/onlyoffice.rs @@ -2,29 +2,29 @@ use crate::app::AppConfig; use crate::app::AppState; use crate::error::WebError; use adapter_onlyoffice::{ - prepare_callback, prepare_proxy_request, sign_config, OnlyOfficeCallbackPreparationInput, - OnlyOfficeProxyPreparationInput, + OnlyOfficeCallbackPreparationInput, OnlyOfficeProxyPreparationInput, prepare_callback, + prepare_proxy_request, sign_config, }; +use axum::Json; use axum::body::{Body, Bytes}; use axum::extract::{Path, Query, State}; -use axum::http::{header, HeaderMap, HeaderValue, Method, Request, StatusCode, Uri}; +use axum::http::{HeaderMap, HeaderValue, Method, Request, StatusCode, Uri, header}; use axum::response::{Html, IntoResponse, Response}; -use axum::Json; use base64::Engine; use futures_util::{SinkExt, StreamExt}; use hyper::upgrade::Upgraded; use hyper_util::rt::TokioIo; use serde::Deserialize; -use serde_json::{json, Value}; +use serde_json::{Value, json}; use std::env; use std::fs; use std::path::{Path as FsPath, PathBuf}; use std::time::Duration; +use tokio_tungstenite::WebSocketStream; use tokio_tungstenite::connect_async; +use tokio_tungstenite::tungstenite::Message as TungsteniteMessage; use tokio_tungstenite::tungstenite::handshake::derive_accept_key; use tokio_tungstenite::tungstenite::protocol::Role; -use tokio_tungstenite::tungstenite::Message as TungsteniteMessage; -use tokio_tungstenite::WebSocketStream; const ONLYOFFICE_PROBE_PATH: &str = "/web-apps/apps/api/documents/api.js"; const DEFAULT_ONLYOFFICE_INTERNAL_URL: &str = "http://127.0.0.1:8082"; @@ -841,8 +841,7 @@ pub async fn proxy( onlyoffice_storage_host_override: env_or_dotenv( "NEXT_PUBLIC_ONLYOFFICE_STORAGE_HOST_OVERRIDE", ), - convex_origin: proxy_origin_env("CONVEX_SELF_HOSTED_URL") - .or_else(|| proxy_origin_env("NEXT_PUBLIC_CONVEX_URL")), + convex_origin: None, supabase_anon_key: env_or_dotenv("NEXT_PUBLIC_SUPABASE_ANON_KEY") .or_else(|| env_or_dotenv("SUPABASE_ANON_KEY")), }) @@ -1706,9 +1705,10 @@ mod tests { fn stable_doc_key_uses_onlyoffice_safe_characters() { let key = stable_doc_key("asset_1", "kg2abc:def", "", ""); assert!(key.len() <= 128); - assert!(key - .chars() - .all(|ch| ch.is_ascii_alphanumeric() || matches!(ch, '_' | '.' | '=' | '-'))); + assert!( + key.chars() + .all(|ch| ch.is_ascii_alphanumeric() || matches!(ch, '_' | '.' | '=' | '-')) + ); assert!(key.starts_with("asset_1_")); } @@ -1722,9 +1722,10 @@ mod tests { ); assert!(key.len() <= 128); assert!(key.starts_with("mnote_")); - assert!(key - .chars() - .all(|ch| ch.is_ascii_alphanumeric() || matches!(ch, '_' | '.' | '=' | '-'))); + assert!( + key.chars() + .all(|ch| ch.is_ascii_alphanumeric() || matches!(ch, '_' | '.' | '=' | '-')) + ); assert!(!key.contains('/')); assert!(!key.contains(':')); assert!(!key.contains('重')); @@ -2024,8 +2025,11 @@ mod tests { let request = captured.await.expect("captured"); assert_eq!(payload["error"], 0); - assert!(request - .starts_with("POST /api/onlyoffice/callback?assetId=asset_1&userId=user_1 HTTP/1.1")); + assert!( + request.starts_with( + "POST /api/onlyoffice/callback?assetId=asset_1&userId=user_1 HTTP/1.1" + ) + ); assert!(request.contains(r#""status":2"#)); assert!(request.contains(r#""key":"doc_key""#)); } @@ -2080,8 +2084,10 @@ mod tests { assert_eq!(payload["ok"], true); assert_eq!(payload["via"], "forcesave"); - assert!(request - .starts_with("POST /api/onlyoffice/forcesave?assetId=asset_1&key=doc_key HTTP/1.1")); + assert!( + request + .starts_with("POST /api/onlyoffice/forcesave?assetId=asset_1&key=doc_key HTTP/1.1") + ); } #[tokio::test] diff --git a/rust/crates/mnote-web/src/routes/page_ai_workflow.rs b/rust/crates/mnote-web/src/routes/page_ai_workflow.rs index 8ef9e883..e6c7d49e 100644 --- a/rust/crates/mnote-web/src/routes/page_ai_workflow.rs +++ b/rust/crates/mnote-web/src/routes/page_ai_workflow.rs @@ -2,10 +2,10 @@ use crate::app::AppState; use crate::context::RequestContext; use crate::error::WebError; use crate::hermes_tools::ToolCallInput; +use axum::Json; use axum::extract::{Extension, State}; use axum::http::{HeaderMap, StatusCode}; -use axum::Json; -use serde_json::{json, Value}; +use serde_json::{Value, json}; use std::fs; use std::path::PathBuf; use std::time::Instant; @@ -587,12 +587,12 @@ fn yaml_path_value(content: &str, path: &[&str]) -> Option { #[cfg(test)] mod tests { use super::{direct_block_edit_operations, extract_operations_from_model_text}; - use crate::app::{build_app, AppConfig, AppState}; - use axum::body::{to_bytes, Body}; + use crate::app::{AppConfig, AppState, build_app}; + use axum::body::{Body, to_bytes}; use axum::http::{Request, StatusCode}; use axum::routing::post; use axum::{Json, Router}; - use serde_json::{json, Value}; + use serde_json::{Value, json}; use std::fs; use std::sync::Mutex; use tower::util::ServiceExt; @@ -952,14 +952,18 @@ mod tests { .expect("body"); let payload: Value = serde_json::from_slice(&body).expect("json"); assert_eq!(payload["ok"], true); - assert!(payload["message"] - .as_str() - .unwrap_or_default() - .contains("已读取第一段：第一段")); - assert!(payload["message"] - .as_str() - .unwrap_or_default() - .contains("测试123")); + assert!( + payload["message"] + .as_str() + .unwrap_or_default() + .contains("已读取第一段：第一段") + ); + assert!( + payload["message"] + .as_str() + .unwrap_or_default() + .contains("测试123") + ); std::env::remove_var("HERMES_HOME"); let _ = fs::remove_dir_all(&hermes_home); diff --git a/rust/crates/mnote-web/src/routes/query_support.rs b/rust/crates/mnote-web/src/routes/query_support.rs index 62e92006..40975096 100644 --- a/rust/crates/mnote-web/src/routes/query_support.rs +++ b/rust/crates/mnote-web/src/routes/query_support.rs @@ -1,15 +1,14 @@ use crate::app::AppConfig; use crate::context::RequestContext; use crate::error::WebError; -use crate::transport::convex::execute_convex_query_plan; +use crate::transport::convex::execute_retired_query_plan; use bridge_runtime::{ - execute_runtime_input, execute_runtime_query, RuntimeActorWire, RuntimeBridgeContextWire, - RuntimeExecutionPlan, RuntimeInput, RuntimeQueryEnvelopeWire, RuntimeQueryExecutionPlan, - RuntimeSourceWire, + BridgeContext, RuntimeActorWire, RuntimeBridgeContextWire, RuntimeExecutionPlan, RuntimeInput, + RuntimeQueryEnvelopeWire, RuntimeQueryExecutionPlan, RuntimeSourceWire, build_query_request, + execute_runtime_input, execute_runtime_query, }; use core_protocol::{GetPageMeta, QueryEnvelope}; use serde_json::Value; -use storage_convex_bridge::{build_query_request, BridgeContext}; pub fn resolve_effective_workspace_id( context: &RequestContext, @@ -155,24 +154,24 @@ pub fn build_documents_meta_query_plan( }) } -pub async fn fetch_query_data_via_convex( +pub async fn fetch_query_data_via_legacy_cloud( config: &AppConfig, context: &RequestContext, effective_workspace_id: Option<&str>, query: RuntimeQueryEnvelopeWire, ) -> Result { let plan = build_runtime_query_plan(context, effective_workspace_id, query)?; - execute_convex_query_plan(config, context, &plan).await + execute_retired_query_plan(config, context, &plan).await } -pub async fn fetch_documents_meta_via_convex( +pub async fn fetch_documents_meta_via_legacy_cloud( config: &AppConfig, context: &RequestContext, effective_workspace_id: Option<&str>, document_id: &str, ) -> Result { let plan = build_documents_meta_query_plan(context, effective_workspace_id, document_id)?; - execute_convex_query_plan(config, context, &plan).await + execute_retired_query_plan(config, context, &plan).await } pub fn execute_runtime_query_against_data( @@ -189,13 +188,14 @@ pub fn execute_runtime_query_against_data( .map_err(|error| WebError::bad_request(error.message).with_context(context)) } -pub async fn execute_runtime_query_via_convex( +pub async fn execute_runtime_query_via_legacy_cloud( config: &AppConfig, context: &RequestContext, effective_workspace_id: Option<&str>, query: RuntimeQueryEnvelopeWire, ) -> Result { let data = - fetch_query_data_via_convex(config, context, effective_workspace_id, query.clone()).await?; + fetch_query_data_via_legacy_cloud(config, context, effective_workspace_id, query.clone()) + .await?; execute_runtime_query_against_data(context, effective_workspace_id, query, data) } diff --git a/rust/crates/mnote-web/src/routes/resource_trash.rs b/rust/crates/mnote-web/src/routes/resource_trash.rs index 884815a6..62635a22 100644 --- a/rust/crates/mnote-web/src/routes/resource_trash.rs +++ b/rust/crates/mnote-web/src/routes/resource_trash.rs @@ -2,24 +2,24 @@ use crate::app::AppState; use crate::context::RequestContext; use crate::error::WebError; use crate::routes::command_support::{ - execute_runtime_command_via_convex_with_artifacts, runtime_context, + execute_runtime_command_via_legacy_cloud_with_artifacts, runtime_context, }; use crate::routes::local_folder_source::{ ensure_local_workspace_access, execute_local_tree_command, }; use crate::transport::convex::{ - execute_convex_mutation_by_name, execute_convex_query_by_name, + execute_retired_mutation_by_name, execute_retired_query_by_name, persist_runtime_command_artifacts, }; +use axum::Json; use axum::extract::{Extension, Path, Query, State}; use axum::http::{HeaderMap, HeaderName, HeaderValue, StatusCode}; -use axum::Json; use bridge_runtime::{ - build_runtime_command_artifact_plan, RuntimeActorWire, RuntimeCommandEnvelopeWire, - RuntimeCommandExecutionPlan, RuntimeSourceWire, RuntimeTargetWire, + RuntimeActorWire, RuntimeCommandEnvelopeWire, RuntimeCommandExecutionPlan, RuntimeSourceWire, + RuntimeTargetWire, build_runtime_command_artifact_plan, }; use serde::Deserialize; -use serde_json::{json, Value}; +use serde_json::{Value, json}; use time::format_description::well_known::Rfc3339; use time::{Duration, OffsetDateTime}; @@ -118,7 +118,7 @@ async fn current_user_id(state: &AppState, context: &RequestContext) -> String { }) .unwrap_or(false); if has_auth_cookie { - if let Ok(user) = execute_convex_query_by_name( + if let Ok(user) = execute_retired_query_by_name( state.config(), context, "users:currentUser", @@ -372,7 +372,7 @@ async fn fetch_document_workspace_id( context: &RequestContext, document_id: &str, ) -> Option { - execute_convex_query_by_name( + execute_retired_query_by_name( state.config(), context, "documents:getMeta", @@ -401,7 +401,7 @@ async fn fetch_table_meta( user_id: &str, table_id: &str, ) -> Option { - execute_convex_query_by_name( + execute_retired_query_by_name( state.config(), context, "tables:get", @@ -479,7 +479,7 @@ async fn fetch_media_asset_meta( user_id: &str, asset_id: &str, ) -> Result { - let assets = execute_convex_query_by_name( + let assets = execute_retired_query_by_name( state.config(), context, "mediaAssets:listByIds", @@ -606,7 +606,7 @@ pub async fn media_batch( body.new_name.as_deref().unwrap_or_default(), "newName", )?; - execute_convex_mutation_by_name( + execute_retired_mutation_by_name( state.config(), &context, "mediaAssets:patchById", @@ -629,7 +629,7 @@ pub async fn media_batch( body.target_document_id.as_deref().unwrap_or_default(), "targetDocumentId", )?; - execute_convex_mutation_by_name( + execute_retired_mutation_by_name( state.config(), &context, "mediaAssets:patchById", @@ -646,7 +646,7 @@ pub async fn media_batch( ) .await?; } - let command_result = execute_runtime_command_via_convex_with_artifacts( + let command_result = execute_runtime_command_via_legacy_cloud_with_artifacts( &state, &context, workspace_id.as_deref(), @@ -712,7 +712,7 @@ pub async fn media_purge( "assetId": asset_id, }), ); - let execution = execute_runtime_command_via_convex_with_artifacts( + let execution = execute_runtime_command_via_legacy_cloud_with_artifacts( &state, &context, workspace_id.as_deref(), @@ -729,7 +729,7 @@ pub async fn media_empty_trash( ) -> Result<(StatusCode, HeaderMap, Json), WebError> { let user_id = current_user_id(&state, &context).await; let workspace_id = require_id(&context, &body.workspace_id, "workspaceId")?; - let result = execute_convex_mutation_by_name( + let result = execute_retired_mutation_by_name( state.config(), &context, "mediaAssets:emptyTrashByWorkspace", @@ -812,7 +812,7 @@ pub async fn mindmap_delete( "mindmapId": mindmap_id, }), ); - let execution = execute_runtime_command_via_convex_with_artifacts( + let execution = execute_runtime_command_via_legacy_cloud_with_artifacts( &state, &context, workspace_id.as_deref(), @@ -897,7 +897,7 @@ pub async fn mindmap_trash_action( "mindmapId": mindmap_id, }), ); - let execution = execute_runtime_command_via_convex_with_artifacts( + let execution = execute_runtime_command_via_legacy_cloud_with_artifacts( &state, &context, workspace_id.as_deref(), @@ -916,7 +916,7 @@ pub async fn mindmap_empty_trash( Json(body): Json, ) -> Result<(StatusCode, HeaderMap, Json), WebError> { let workspace_id = require_id(&context, &body.workspace_id, "workspaceId")?; - let result = execute_convex_mutation_by_name( + let result = execute_retired_mutation_by_name( state.config(), &context, "mindmaps:emptyTrashByWorkspace", @@ -980,7 +980,7 @@ pub async fn table_create( .with_context(&context) .with_header(HEADER_MNOTE_WEB_OWNER, "mnote-web") })?; - let result = execute_convex_mutation_by_name( + let result = execute_retired_mutation_by_name( state.config(), &context, "tables:create", @@ -1087,7 +1087,7 @@ async fn table_action( "tableId": table_id, }), ); - let execution = execute_runtime_command_via_convex_with_artifacts( + let execution = execute_runtime_command_via_legacy_cloud_with_artifacts( &state, &context, workspace_id.as_deref(), @@ -1108,7 +1108,7 @@ pub async fn table_empty_trash( ) -> Result<(StatusCode, HeaderMap, Json), WebError> { let user_id = current_user_id(&state, &context).await; let workspace_id = require_id(&context, &body.workspace_id, "workspaceId")?; - let result = execute_convex_mutation_by_name( + let result = execute_retired_mutation_by_name( state.config(), &context, "tables:emptyTrashByWorkspace", @@ -1148,8 +1148,8 @@ pub async fn table_empty_trash( #[cfg(test)] mod tests { use super::*; - use crate::app::{build_app, AppConfig, AppState}; - use axum::body::{to_bytes, Body}; + use crate::app::{AppConfig, AppState, build_app}; + use axum::body::{Body, to_bytes}; use axum::http::Request; use tower::util::ServiceExt; @@ -1311,11 +1311,12 @@ mod tests { ); assert_eq!(payload["result"]["sourceKind"], "local_folder"); assert!(!root.join("Page").join("map.mindmap.json").exists()); - assert!(root - .join(".mnote") - .join("trash") - .join("map.mindmap.json") - .exists()); + assert!( + root.join(".mnote") + .join("trash") + .join("map.mindmap.json") + .exists() + ); assert_eq!( std::fs::read_to_string(&markdown_path).expect("read markdown after trash"), original_markdown, @@ -1421,11 +1422,13 @@ mod tests { purged_payload["result"]["canonicalCommand"], "tree.resource.purge" ); - assert!(!root - .join(".mnote") - .join("trash") - .join("map.mindmap.json") - .exists()); + assert!( + !root + .join(".mnote") + .join("trash") + .join("map.mindmap.json") + .exists() + ); let _ = std::fs::remove_dir_all(&root); } diff --git a/rust/crates/mnote-web/src/routes/search.rs b/rust/crates/mnote-web/src/routes/search.rs index dfff1461..9d6eb180 100644 --- a/rust/crates/mnote-web/src/routes/search.rs +++ b/rust/crates/mnote-web/src/routes/search.rs @@ -2,19 +2,19 @@ use crate::app::AppState; use crate::context::RequestContext; use crate::error::WebError; use crate::routes::query_support::{ - execute_runtime_query_against_data, execute_runtime_query_via_convex, + execute_runtime_query_against_data, execute_runtime_query_via_legacy_cloud, resolve_effective_workspace_id, }; use crate::routes::web_shell::load_sidebar_tree_html; use crate::routes::{local_folder_source, local_search_index}; use crate::ssr::pages::search::SearchPage; +use axum::Json; use axum::extract::{Extension, Query, State}; use axum::http::{HeaderMap, HeaderName, HeaderValue, StatusCode}; use axum::response::{Html, IntoResponse, Response}; -use axum::Json; use bridge_runtime::RuntimeQueryEnvelopeWire; use serde::Deserialize; -use serde_json::{json, Value}; +use serde_json::{Value, json}; const HEADER_MNOTE_WEB_OWNER: &str = "x-mnote-web-owner"; const HEADER_QUERY_NAME: &str = "x-query-name"; @@ -417,7 +417,7 @@ async fn load_search_results_with_filters( "customRangeTo": filters.custom_range.as_ref().and_then(|range| range.to.clone()), }), }; - match execute_runtime_query_via_convex( + match execute_runtime_query_via_legacy_cloud( config, context, Some(workspace_id), @@ -546,10 +546,10 @@ fn stamp_search_headers(headers: &mut HeaderMap) { #[cfg(test)] mod tests { - use crate::app::{build_app, AppConfig, AppState}; - use axum::body::{to_bytes, Body}; + use crate::app::{AppConfig, AppState, build_app}; + use axum::body::{Body, to_bytes}; use axum::http::{Request, StatusCode}; - use serde_json::{json, Value}; + use serde_json::{Value, json}; use std::fs; use tower::util::ServiceExt; @@ -788,31 +788,40 @@ mod tests { .expect("home result"); assert_eq!(home["sourceKind"].as_str(), Some("local_folder")); assert_eq!(home["resourceType"].as_str(), Some("markdown")); - assert!(home["tags"] - .as_array() - .unwrap() - .iter() - .any(|tag| tag.as_str() == Some("alpha"))); - assert!(home["backlinks"] - .as_array() - .unwrap() - .iter() - .any(|link| link.as_str() == Some("Daily"))); - assert!(home["resourceRefs"] - .as_array() - .unwrap() - .iter() - .any(|reference| reference.as_str() == Some("assets/spec.pdf"))); - assert!(root - .join(".mnote") - .join("index") - .join("search-index.json") - .exists()); - assert!(payload["recent"] - .as_array() - .unwrap() - .iter() - .any(|item| item["documentId"].as_str() == Some("local-md:README.md"))); + assert!( + home["tags"] + .as_array() + .unwrap() + .iter() + .any(|tag| tag.as_str() == Some("alpha")) + ); + assert!( + home["backlinks"] + .as_array() + .unwrap() + .iter() + .any(|link| link.as_str() == Some("Daily")) + ); + assert!( + home["resourceRefs"] + .as_array() + .unwrap() + .iter() + .any(|reference| reference.as_str() == Some("assets/spec.pdf")) + ); + assert!( + root.join(".mnote") + .join("index") + .join("search-index.json") + .exists() + ); + assert!( + payload["recent"] + .as_array() + .unwrap() + .iter() + .any(|item| item["documentId"].as_str() == Some("local-md:README.md")) + ); let _ = fs::remove_dir_all(&root); } @@ -921,11 +930,13 @@ mod tests { backlinks_payload["meta"]["queryName"].as_str(), Some("search.local_index.backlinks") ); - assert!(backlinks_payload["result"]["backlinks"] - .as_array() - .unwrap() - .iter() - .any(|item| item["documentId"].as_str() == Some("local-md:README.md"))); + assert!( + backlinks_payload["result"]["backlinks"] + .as_array() + .unwrap() + .iter() + .any(|item| item["documentId"].as_str() == Some("local-md:README.md")) + ); let tags_response = app() .oneshot( diff --git a/rust/crates/mnote-web/src/routes/session.rs b/rust/crates/mnote-web/src/routes/session.rs index a3dd9aff..bebc8f70 100644 --- a/rust/crates/mnote-web/src/routes/session.rs +++ b/rust/crates/mnote-web/src/routes/session.rs @@ -1,10 +1,10 @@ use crate::app::AppState; use crate::context::RequestContext; +use axum::Json; use axum::extract::{Extension, State}; use axum::http::{HeaderMap, HeaderName, HeaderValue, StatusCode}; use axum::response::{IntoResponse, Response}; -use axum::Json; -use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine as _}; +use base64::{Engine as _, engine::general_purpose::URL_SAFE_NO_PAD}; use control_plane::session_token_hash; use serde::Serialize; @@ -213,10 +213,10 @@ fn stamp_owner_header(headers: &mut HeaderMap) { #[cfg(test)] mod tests { - use crate::app::{build_app, AppConfig, AppState}; - use axum::body::{to_bytes, Body}; + use crate::app::{AppConfig, AppState, build_app}; + use axum::body::{Body, to_bytes}; use axum::http::{Request, StatusCode}; - use control_plane::{session_token_hash, CreateSessionInput, UpsertUserInput}; + use control_plane::{CreateSessionInput, UpsertUserInput, session_token_hash}; use tower::util::ServiceExt; fn app() -> axum::Router { diff --git a/rust/crates/mnote-web/src/routes/sidebar_shortcuts.rs b/rust/crates/mnote-web/src/routes/sidebar_shortcuts.rs index c7652170..4ca15ccf 100644 --- a/rust/crates/mnote-web/src/routes/sidebar_shortcuts.rs +++ b/rust/crates/mnote-web/src/routes/sidebar_shortcuts.rs @@ -2,12 +2,12 @@ use crate::app::AppState; use crate::context::RequestContext; use crate::error::WebError; use crate::routes::gateway::current_actor_id; +use axum::Json; use axum::extract::{Extension, Path, Query, State}; use axum::http::StatusCode; -use axum::Json; use control_plane::{AppendAuditInput, SidebarShortcutRecord, UpsertSidebarShortcutInput}; use serde::Deserialize; -use serde_json::{json, Value}; +use serde_json::{Value, json}; #[derive(Debug, Clone, Default, Deserialize)] #[serde(rename_all = "camelCase")] diff --git a/rust/crates/mnote-web/src/routes/snapshot_support.rs b/rust/crates/mnote-web/src/routes/snapshot_support.rs index a8b62368..3f27fa4f 100644 --- a/rust/crates/mnote-web/src/routes/snapshot_support.rs +++ b/rust/crates/mnote-web/src/routes/snapshot_support.rs @@ -2,11 +2,11 @@ use crate::app::AppConfig; use crate::context::RequestContext; use crate::error::WebError; use crate::routes::query_support::{ - execute_runtime_query_against_data, fetch_query_data_via_convex, + execute_runtime_query_against_data, fetch_query_data_via_legacy_cloud, }; use bridge_runtime::RuntimeQueryEnvelopeWire; use core_protocol::{KernelNodeType, KernelProjectionKind}; -use serde_json::{json, Value}; +use serde_json::{Value, json}; #[derive(Debug, Clone)] pub struct ProjectionSnapshotSpec<'a> { @@ -38,7 +38,7 @@ pub async fn load_sidebar_dataset( context: &RequestContext, workspace_id: &str, ) -> Result { - fetch_query_data_via_convex( + fetch_query_data_via_legacy_cloud( config, context, Some(workspace_id), diff --git a/rust/crates/mnote-web/src/routes/sse.rs b/rust/crates/mnote-web/src/routes/sse.rs index 0efd76ac..187c3351 100644 --- a/rust/crates/mnote-web/src/routes/sse.rs +++ b/rust/crates/mnote-web/src/routes/sse.rs @@ -2,15 +2,15 @@ use crate::app::AppState; use crate::context::RequestContext; use crate::error::WebError; use crate::routes::stream_support::{ - build_stream_delta_payload, build_stream_push_delta_hint, load_stream_overview, - load_stream_snapshot, read_stream_cursor_from_payload, resolve_stream_change, with_stream_kind, - StreamChangeKind, StreamSnapshotQuery, + StreamChangeKind, StreamSnapshotQuery, build_stream_delta_payload, + build_stream_push_delta_hint, load_stream_overview, load_stream_snapshot, + read_stream_cursor_from_payload, resolve_stream_change, with_stream_kind, }; use axum::extract::{Extension, Query, State}; use axum::http::{HeaderMap, HeaderName, HeaderValue}; use axum::response::sse::{Event, KeepAlive, Sse}; use futures_util::stream; -use serde_json::{json, Value}; +use serde_json::{Value, json}; use std::convert::Infallible; use std::time::Duration; use tokio::time::sleep; @@ -340,9 +340,9 @@ fn stream_event(event_name: &str, payload: &Value) -> Event { #[cfg(test)] mod tests { - use crate::app::{build_app, AppConfig, AppState}; + use crate::app::{AppConfig, AppState, build_app}; use crate::routes::stream_support::StreamSnapshotQuery; - use axum::body::{to_bytes, Body}; + use axum::body::{Body, to_bytes}; use axum::http::{Request, StatusCode}; use std::time::Duration; use tokio::time::timeout; diff --git a/rust/crates/mnote-web/src/routes/stream_support.rs b/rust/crates/mnote-web/src/routes/stream_support.rs index 24744eda..0c2c9570 100644 --- a/rust/crates/mnote-web/src/routes/stream_support.rs +++ b/rust/crates/mnote-web/src/routes/stream_support.rs @@ -2,16 +2,16 @@ use crate::app::AppConfig; use crate::context::RequestContext; use crate::error::WebError; use crate::routes::query_support::{ - execute_runtime_query_via_convex, resolve_effective_workspace_id, + execute_runtime_query_via_legacy_cloud, resolve_effective_workspace_id, }; use crate::routes::snapshot_support::{ - execute_kernel_query, load_projection_snapshot, load_sidebar_dataset, subtree_query, - ProjectionSnapshotSpec, + ProjectionSnapshotSpec, execute_kernel_query, load_projection_snapshot, load_sidebar_dataset, + subtree_query, }; use bridge_runtime::RuntimeQueryEnvelopeWire; use core_protocol::KernelProjectionKind; use serde::Deserialize; -use serde_json::{json, Value}; +use serde_json::{Value, json}; const TREE_STREAM_NOOP_COMMANDS: [&str; 6] = [ "page.body.save", @@ -627,7 +627,7 @@ pub async fn load_stream_overview( let effective_workspace_id = resolve_effective_workspace_id(context, query.workspace_id.as_deref(), true)? .expect("workspace_required 已确保存在"); - let overview = execute_runtime_query_via_convex( + let overview = execute_runtime_query_via_legacy_cloud( config, context, Some(&effective_workspace_id), @@ -670,7 +670,7 @@ pub async fn load_stream_snapshot( } }; - let overview = execute_runtime_query_via_convex( + let overview = execute_runtime_query_via_legacy_cloud( config, context, Some(&effective_workspace_id), @@ -701,8 +701,9 @@ pub async fn load_stream_snapshot( #[cfg(test)] mod tests { use super::{ + StreamChangeKind, StreamSnapshotQuery, StreamSnapshotScope, delta_requires_projection_snapshot, resolve_stream_change, resolve_stream_cursor, - resolve_stream_scope, StreamChangeKind, StreamSnapshotQuery, StreamSnapshotScope, + resolve_stream_scope, }; use serde_json::json; diff --git a/rust/crates/mnote-web/src/routes/tree.rs b/rust/crates/mnote-web/src/routes/tree.rs index 207d9a02..755c78c4 100644 --- a/rust/crates/mnote-web/src/routes/tree.rs +++ b/rust/crates/mnote-web/src/routes/tree.rs @@ -3,45 +3,45 @@ use crate::context::RequestContext; use crate::error::WebError; use crate::routes::command_support::{ build_runtime_command_plan, build_tree_target, ensure_non_empty, ensure_sort_order, - execute_runtime_command_via_convex_with_artifacts, read_optional_non_empty, + execute_runtime_command_via_legacy_cloud_with_artifacts, read_optional_non_empty, }; use crate::routes::local_folder_source::{ - ensure_local_workspace_access_with_state, ensure_local_workspace_read_access_with_state, - execute_local_tree_command_with_sort, load_local_folder_file_tree_snapshot, - load_local_folder_page_tree_snapshot, local_folder_watch_revision, - local_workspace_id_from_root_uri, LocalAccessMode, + LocalAccessMode, ensure_local_workspace_access_with_state, + ensure_local_workspace_read_access_with_state, execute_local_tree_command_with_sort, + load_local_folder_file_tree_snapshot, load_local_folder_page_tree_snapshot, + local_folder_watch_revision, local_workspace_id_from_root_uri, }; use crate::routes::query_support::{ - fetch_documents_meta_via_convex, resolve_effective_workspace_id, + fetch_documents_meta_via_legacy_cloud, resolve_effective_workspace_id, }; -use crate::routes::snapshot_support::{load_projection_snapshot, ProjectionSnapshotSpec}; -use crate::transport::convex::execute_convex_mutation_by_name; +use crate::routes::snapshot_support::{ProjectionSnapshotSpec, load_projection_snapshot}; +use crate::transport::convex::execute_retired_mutation_by_name; use crate::tree_shell::filetree_renderer::{ - render_initial_filetree_html, FileTreeInitialRenderInput, FileTreeRenderRow, + FileTreeInitialRenderInput, FileTreeRenderRow, render_initial_filetree_html, }; use crate::tree_shell::filetree_selection::FileTreeSelectionState; use crate::tree_shell::page_renderer::{ - render_initial_page_tree_html, PageTreeInitialRenderInput, PageTreeRenderRow, + PageTreeInitialRenderInput, PageTreeRenderRow, render_initial_page_tree_html, }; use crate::tree_shell::picker_renderer::{ - render_initial_picker_html, PickerInitialRenderInput, PickerRenderRow, + PickerInitialRenderInput, PickerRenderRow, render_initial_picker_html, }; use crate::tree_shell::renderer_input::{ FileTreeRendererInput, PageTreeRendererInput, PickerRendererInput, TreeShellCommandDispatcher, TreeShellRendererInput, }; use crate::tree_shell::runtime_api::{ - reduce_tree_shell_runtime as reduce_tree_shell_runtime_request, TreeShellRuntimeRequest, - TreeShellRuntimeResult, + TreeShellRuntimeRequest, TreeShellRuntimeResult, + reduce_tree_shell_runtime as reduce_tree_shell_runtime_request, }; -use axum::extract::{Extension, Query, State}; -use axum::http::{header, HeaderValue, StatusCode}; -use axum::response::{Html, IntoResponse, Response}; use axum::Json; +use axum::extract::{Extension, Query, State}; +use axum::http::{HeaderValue, StatusCode, header}; +use axum::response::{Html, IntoResponse, Response}; use bridge_runtime::RuntimeCommandEnvelopeWire; use core_protocol::KernelProjectionKind; use serde::Deserialize; -use serde_json::{json, Value}; +use serde_json::{Value, json}; use std::collections::{BTreeMap, BTreeSet}; use std::sync::atomic::{AtomicU64, Ordering}; use std::time::{SystemTime, UNIX_EPOCH}; @@ -137,6 +137,69 @@ impl TreeCommandEnvelopeContext { } } +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +#[allow(dead_code)] +pub struct TreeCompatAliasCatalogEntry { + pub compat_command: &'static str, + pub preferred_command: &'static str, + pub source_kind: &'static str, + pub retained_for: &'static str, + pub retirement_condition: &'static str, +} + +#[allow(dead_code)] +pub const TREE_DOCUMENT_COMPAT_ALIAS_CATALOG: &[TreeCompatAliasCatalogEntry] = &[ + TreeCompatAliasCatalogEntry { + compat_command: "documents.create", + preferred_command: "tree.node.create", + source_kind: "convex_workspace", + retained_for: "legacy cloud / remote callers still emitting documents.*", + retirement_condition: "all cloud and remote callers emit tree.node.create", + }, + TreeCompatAliasCatalogEntry { + compat_command: "documents.title.update", + preferred_command: "tree.node.rename", + source_kind: "convex_workspace", + retained_for: "legacy cloud / remote callers still emitting documents.*", + retirement_condition: "all cloud and remote callers emit tree.node.rename", + }, + TreeCompatAliasCatalogEntry { + compat_command: "documents.move", + preferred_command: "tree.subtree.move", + source_kind: "convex_workspace", + retained_for: "legacy cloud / remote callers still emitting documents.*", + retirement_condition: "all cloud and remote callers emit tree.subtree.move", + }, + TreeCompatAliasCatalogEntry { + compat_command: "documents.delete", + preferred_command: "tree.node.archive", + source_kind: "convex_workspace", + retained_for: "legacy cloud / remote callers still emitting documents.*", + retirement_condition: "all cloud and remote callers emit tree.node.archive", + }, + TreeCompatAliasCatalogEntry { + compat_command: "documents.restore", + preferred_command: "tree.node.restore", + source_kind: "convex_workspace", + retained_for: "legacy cloud / remote callers still emitting documents.*", + retirement_condition: "all cloud and remote callers emit tree.node.restore", + }, + TreeCompatAliasCatalogEntry { + compat_command: "documents.purge", + preferred_command: "tree.node.purge", + source_kind: "convex_workspace", + retained_for: "legacy cloud / remote callers still emitting documents.*", + retirement_condition: "all cloud and remote callers emit tree.node.purge", + }, + TreeCompatAliasCatalogEntry { + compat_command: "documents.copy_tree", + preferred_command: "tree.subtree.copy", + source_kind: "convex_workspace", + retained_for: "legacy cloud / remote callers still emitting documents.*", + retirement_condition: "all cloud and remote callers emit tree.subtree.copy", + }, +]; + #[derive(Debug)] pub enum TreeCommandRequest { Create { @@ -2074,7 +2137,7 @@ async fn resolve_tree_create_workspace_id( if let Some(parent_id) = parent_id.map(str::trim).filter(|value| !value.is_empty()) { let parent_meta = - fetch_documents_meta_via_convex(state.config(), context, None, parent_id).await?; + fetch_documents_meta_via_legacy_cloud(state.config(), context, None, parent_id).await?; if let Some(workspace_id) = parent_meta .get("workspace_id") .or_else(|| parent_meta.get("workspaceId")) @@ -2086,7 +2149,7 @@ async fn resolve_tree_create_workspace_id( } } - let bootstrap = execute_convex_mutation_by_name( + let bootstrap = execute_retired_mutation_by_name( state.config(), context, "workspaces:ensureDefaultWorkspace", @@ -2201,7 +2264,15 @@ pub async fn tree_command( .with_context(&context) .with_header("x-error-phase", "tree_command_decode") })?; - let envelope_context = TreeCommandEnvelopeContext::from_envelope(&raw_request); + let mut envelope_context = TreeCommandEnvelopeContext::from_envelope(&raw_request); + if envelope_context.source_kind.is_none() + && envelope_context + .root_uri + .as_deref() + .is_some_and(|root_uri| root_uri.trim().starts_with("file://")) + { + envelope_context.source_kind = Some("local_folder".into()); + } let request = match raw_request.action.trim() { "create" => TreeCommandRequest::Create { workspace_id: raw_request.workspace_id, @@ -2453,7 +2524,7 @@ pub async fn tree_command( command_wire.preflight_data = Some(load_tree_move_preflight_data(&state, &context, &effective_workspace_id).await?); } - let execution = execute_runtime_command_via_convex_with_artifacts( + let execution = execute_runtime_command_via_legacy_cloud_with_artifacts( &state, &context, Some(&effective_workspace_id), @@ -2513,10 +2584,10 @@ mod tests { include_str!("../../browser/tree-shell-filetree-dnd-runtime.js"); use super::{ - collect_filetree_render_rows, create_command_wire, TreeCommandEnvelopeContext, - TreeCommandRequest, + TREE_DOCUMENT_COMPAT_ALIAS_CATALOG, TreeCommandEnvelopeContext, TreeCommandRequest, + collect_filetree_render_rows, create_command_wire, }; - use crate::app::{build_app, AppConfig, AppState}; + use crate::app::{AppConfig, AppState, build_app}; use crate::context::RequestContext; use crate::routes::command_support::build_runtime_command_plan; use axum::body::Body; @@ -2540,7 +2611,7 @@ mod tests { convex_url: None, convex_admin_key: None, allow_dev_fixtures: true, - query_fixtures_json: Some(r#"{"sidebar:datasetList":{"active_workspace_id":"ws_demo","documents":[{"id":"page_root","workspace_id":"ws_demo","title":"工作区首页","parent_id":null,"sort_order":0,"is_starred":true,"is_template":false,"created_at":"2026-04-16T00:00:00Z","updated_at":"2026-04-16T00:00:00Z"},{"id":"page_child","workspace_id":"ws_demo","title":"子页面","parent_id":"page_root","sort_order":1,"is_starred":false,"is_template":false,"created_at":"2026-04-16T00:00:00Z","updated_at":"2026-04-16T00:00:00Z"}],"media_assets":[{"id":"asset_file_1","workspace_id":"ws_demo","document_id":"page_root","asset_type":"file","file_name":"封面.png","mime_type":"image/png","created_at":"2026-04-16T00:00:00Z","updated_at":"2026-04-16T00:00:00Z"},{"id":"asset_child_1","workspace_id":"ws_demo","document_id":"page_root","asset_type":"file","file_name":"节点图片.png","mime_type":"image/png","created_at":"2026-04-16T00:00:00Z","updated_at":"2026-04-16T00:00:00Z"},{"id":"asset_pdf_1","workspace_id":"ws_demo","document_id":"page_root","asset_type":"file","file_name":"说明书.pdf","mime_type":"application/pdf","created_at":"2026-04-16T00:00:00Z","updated_at":"2026-04-16T00:00:00Z"},{"id":"asset_book_1","workspace_id":"ws_demo","document_id":"page_root","asset_type":"file","file_name":"小说.epub","mime_type":"application/epub+zip","created_at":"2026-04-16T00:00:00Z","updated_at":"2026-04-16T00:00:00Z"}],"mindmap_assets":[{"id":"mind_1","workspace_id":"ws_demo","document_id":"page_root","asset_type":"mindmap","file_name":"头脑风暴.json","mime_type":"application/json","created_at":"2026-04-16T00:00:00Z","updated_at":"2026-04-16T00:00:00Z"}],"table_assets":[{"id":"table_1","workspace_id":"ws_demo","document_id":"page_root","asset_type":"luckysheet","file_name":"预算.luckysheet","mime_type":"application/json","created_at":"2026-04-16T00:00:00Z","updated_at":"2026-04-16T00:00:00Z"}],"mindmap_asset_children":{"mind_1":["asset_child_1"]}}}"#.into()), + query_fixtures_json: Some(r#"{"sidebar:datasetList":{"active_workspace_id":"ws_demo","documents":[{"id":"page_root","workspace_id":"ws_demo","title":"工作区首页","parent_id":null,"sort_order":0,"is_starred":true,"is_template":false,"created_at":"2026-04-16T00:00:00Z","updated_at":"2026-04-16T00:00:00Z"},{"id":"page_child","workspace_id":"ws_demo","title":"子页面","parent_id":"page_root","sort_order":1,"is_starred":false,"is_template":false,"created_at":"2026-04-16T00:00:00Z","updated_at":"2026-04-16T00:00:00Z"}],"media_assets":[{"id":"asset_file_1","workspace_id":"ws_demo","document_id":"page_root","asset_type":"file","file_name":"封面.png","mime_type":"image/png","created_at":"2026-04-16T00:00:00Z","updated_at":"2026-04-16T00:00:00Z"},{"id":"asset_child_1","workspace_id":"ws_demo","document_id":"page_root","asset_type":"file","file_name":"节点图片.png","mime_type":"image/png","created_at":"2026-04-16T00:00:00Z","updated_at":"2026-04-16T00:00:00Z"},{"id":"asset_pdf_1","workspace_id":"ws_demo","document_id":"page_root","asset_type":"file","file_name":"说明书.pdf","mime_type":"application/pdf","created_at":"2026-04-16T00:00:00Z","updated_at":"2026-04-16T00:00:00Z"},{"id":"asset_book_1","workspace_id":"ws_demo","document_id":"page_root","asset_type":"file","file_name":"小说.epub","mime_type":"application/epub+zip","created_at":"2026-04-16T00:00:00Z","updated_at":"2026-04-16T00:00:00Z"}],"mindmap_assets":[{"id":"mind_1","workspace_id":"ws_demo","document_id":"page_root","asset_type":"mindmap","file_name":"头脑风暴.json","mime_type":"application/json","created_at":"2026-04-16T00:00:00Z","updated_at":"2026-04-16T00:00:00Z"}],"table_assets":[{"id":"table_1","workspace_id":"ws_demo","document_id":"page_root","asset_type":"table","file_name":"预算.table","mime_type":"application/json","created_at":"2026-04-16T00:00:00Z","updated_at":"2026-04-16T00:00:00Z"}],"mindmap_asset_children":{"mind_1":["asset_child_1"]}}}"#.into()), mutation_fixtures_json: Some(r#"{"workspaces:ensureDefaultWorkspace":{"workspaces":[{"id":"ws_demo","name":"我的空间","type":"personal","iconUrl":null,"memberCount":1,"isDefault":true}],"activeWorkspaceId":"ws_demo"},"documents:createWithParentReference":{"ok":true,"id":"page_new","updated_at":"2026-04-17T00:00:00Z"},"documents:updateTitle":{"ok":true,"updated_at":"2026-04-17T00:00:00Z"},"documents:move":{"ok":true,"updated_at":"2026-04-17T00:00:00Z"},"documents:purge":{"ok":true,"deletedCount":1},"bridgeLogs:recordCommandLog":{"ok":true,"id":"clog_fixture"},"bridgeLogs:recordDomainEvent":{"ok":true,"id":"evt_fixture"}}"#.into()), dev_user_id: "dev-user".into(), dev_user_name: "开发用户".into(), @@ -2681,14 +2752,20 @@ mod tests { assert!(html.contains("data-rust-action=\"toggle\"")); assert!(html.contains("data-testid=\"tree-node-toggle\"")); assert!(TREE_SHELL_RUNTIME_JS.contains("hydrateInitialPageTree")); - assert!(TREE_SHELL_RUNTIME_JS - .contains("const usedRustInitialPageRenderer = hydrateInitialPageTree();")); + assert!( + TREE_SHELL_RUNTIME_JS + .contains("const usedRustInitialPageRenderer = hydrateInitialPageTree();") + ); assert!(TREE_SHELL_RUNTIME_JS.contains("applyCreatedDocumentLocally")); assert!(TREE_SHELL_RUNTIME_JS.contains("applyRemovedDocumentLocally")); - assert!(TREE_SHELL_RUNTIME_JS - .contains("sourceKind === \"convex_workspace\" && applyCreatedDocumentLocally")); - assert!(TREE_SHELL_RUNTIME_JS - .contains("if (!deletableItems.every((item) => !fileTreeRowById.has(item.rowId)))")); + assert!( + TREE_SHELL_RUNTIME_JS + .contains("sourceKind === \"convex_workspace\" && applyCreatedDocumentLocally") + ); + assert!( + TREE_SHELL_RUNTIME_JS + .contains("if (!deletableItems.every((item) => !fileTreeRowById.has(item.rowId)))") + ); assert!(TREE_SHELL_RUNTIME_JS.contains("application/x-mnote-page-tree-node")); assert!(TREE_SHELL_RUNTIME_JS.contains("页面已拖放到")); assert!(TREE_SHELL_RUNTIME_JS.contains("setAttribute(\"role\", \"treeitem\")")); @@ -2713,8 +2790,11 @@ mod tests { .expect("body"); let html = String::from_utf8(body.to_vec()).expect("utf8"); assert!(html.contains("id=\"tree-shell-state\"")); - assert!(html - .contains("type=\"module\" src=\"/api/mnote-browser-runtime/tree-shell-runtime.js\"")); + assert!( + html.contains( + "type=\"module\" src=\"/api/mnote-browser-runtime/tree-shell-runtime.js\"" + ) + ); assert!( !html.contains("const stateElement = document.getElementById(\"tree-shell-state\")"), "debug /tree runtime should live in browser/tree-shell-runtime.js, not inline Rust HTML" @@ -2749,17 +2829,23 @@ mod tests { assert!(html.contains("\"contractName\":\"rust_picker_state_reducer_v1\"")); assert!(TREE_SHELL_RUNTIME_JS.contains("applyPickerStateAction")); assert!(TREE_SHELL_RUNTIME_JS.contains("postPickerPickResultToHost")); - assert!(TREE_SHELL_RUNTIME_JS - .contains("applyPickerFocusByItemKey(\"__root__\", { focusDom: true })")); - assert!(TREE_SHELL_RUNTIME_JS - .contains("applyPickerFocusByItemKey(item.nodeId, { focusDom: true })")); + assert!( + TREE_SHELL_RUNTIME_JS + .contains("applyPickerFocusByItemKey(\"__root__\", { focusDom: true })") + ); + assert!( + TREE_SHELL_RUNTIME_JS + .contains("applyPickerFocusByItemKey(item.nodeId, { focusDom: true })") + ); assert!(TREE_SHELL_RUNTIME_JS.contains("const shouldFocusDom = options.focusDom === true")); assert!(TREE_SHELL_RUNTIME_JS.contains("if (shouldFocusDom) focusPickerRowElement")); assert!(TREE_SHELL_RUNTIME_JS.contains("patchPickerActiveDom")); assert!(TREE_SHELL_RUNTIME_JS.contains("hydrateInitialPickerTree")); assert!(html.contains("tabindex=\"")); - assert!(TREE_SHELL_RUNTIME_JS - .contains("const usedRustInitialRenderer = hydrateInitialRenderer();")); + assert!( + TREE_SHELL_RUNTIME_JS + .contains("const usedRustInitialRenderer = hydrateInitialRenderer();") + ); assert!(TREE_SHELL_RUNTIME_JS.contains("__MNOTE_TREE_SHELL_OVERRIDE__")); } @@ -2799,12 +2885,18 @@ mod tests { assert!( TREE_SHELL_FILETREE_RUNTIME_JS.contains("function getFileTreeRowOwnerDocumentId(item)") ); - assert!(TREE_SHELL_FILETREE_MENU_RUNTIME_JS - .contains("function buildFileTreeMenuTarget(context")); - assert!(TREE_SHELL_FILETREE_DND_RUNTIME_JS - .contains("function createTreeShellFileTreeDndRuntime(context)")); - assert!(TREE_SHELL_RENDER_RUNTIME_JS - .contains("row.dataset.ownerDocumentId = ownerDocumentId || \"\";")); + assert!( + TREE_SHELL_FILETREE_MENU_RUNTIME_JS + .contains("function buildFileTreeMenuTarget(context") + ); + assert!( + TREE_SHELL_FILETREE_DND_RUNTIME_JS + .contains("function createTreeShellFileTreeDndRuntime(context)") + ); + assert!( + TREE_SHELL_RENDER_RUNTIME_JS + .contains("row.dataset.ownerDocumentId = ownerDocumentId || \"\";") + ); assert!( TREE_SHELL_RUNTIME_JS.contains("if (rowId && getFileTreeRowDocumentId(renameItem))") ); @@ -2812,8 +2904,10 @@ mod tests { assert!(TREE_SHELL_RENDER_RUNTIME_JS.contains("documentId: ownerDocumentId || null")); assert!(TREE_SHELL_RENDER_RUNTIME_JS.contains("dragover")); assert!(TREE_SHELL_RUNTIME_JS.contains("hydrateInitialFileTree")); - assert!(TREE_SHELL_RUNTIME_JS - .contains("const usedRustInitialRenderer = hydrateInitialRenderer();")); + assert!( + TREE_SHELL_RUNTIME_JS + .contains("const usedRustInitialRenderer = hydrateInitialRenderer();") + ); } #[tokio::test] @@ -3026,8 +3120,8 @@ mod tests { } #[tokio::test] - async fn tree_command_local_folder_create_rename_copy_trash_restore_and_purge_use_same_endpoint( - ) { + async fn tree_command_local_folder_create_rename_copy_trash_restore_and_purge_use_same_endpoint() + { let root = std::env::temp_dir().join(format!("mnote-local-tree-command-{}", std::process::id())); let _ = std::fs::remove_dir_all(&root); @@ -3142,11 +3236,12 @@ mod tests { String::from_utf8_lossy(&move_body) ); assert!(!root.join("重命名页面").exists()); - assert!(root - .join("docs") - .join("重命名页面") - .join("重命名页面.md") - .exists()); + assert!( + root.join("docs") + .join("重命名页面") + .join("重命名页面.md") + .exists() + ); let move_payload: Value = serde_json::from_slice(&move_body).expect("move json"); let moved_document_id = move_payload["result"]["documentId"] .as_str() @@ -3186,11 +3281,12 @@ mod tests { .as_str() .expect("copied document id") .to_string(); - assert!(root - .join("docs") - .join("重命名页面 2") - .join("重命名页面 2.md") - .exists()); + assert!( + root.join("docs") + .join("重命名页面 2") + .join("重命名页面 2.md") + .exists() + ); let folder_response = app() .oneshot( @@ -3223,12 +3319,13 @@ mod tests { .expect("response"); assert_eq!(delete_response.status(), StatusCode::OK); assert!(!root.join("docs").join("重命名页面").exists()); - assert!(root - .join(".mnote") - .join("trash") - .join("重命名页面") - .join("重命名页面.md") - .exists()); + assert!( + root.join(".mnote") + .join("trash") + .join("重命名页面") + .join("重命名页面.md") + .exists() + ); assert!(root.join(".mnote").join("trash-index.json").exists()); assert!(!root.join(".mnote").join("page-ids.json").exists()); @@ -3255,11 +3352,12 @@ mod tests { "{}", String::from_utf8_lossy(&restore_body) ); - assert!(root - .join("docs") - .join("重命名页面") - .join("重命名页面.md") - .exists()); + assert!( + root.join("docs") + .join("重命名页面") + .join("重命名页面.md") + .exists() + ); let restore_payload: Value = serde_json::from_slice(&restore_body).expect("restore json"); assert_eq!( restore_payload["result"]["documentId"].as_str(), @@ -3353,7 +3451,21 @@ mod tests { ) .await .expect("response"); - assert_eq!(restore_response.status(), StatusCode::OK); + let restore_status = restore_response.status(); + let restore_body = axum::body::to_bytes(restore_response.into_body(), usize::MAX) + .await + .expect("restore body"); + assert_eq!( + restore_status, + StatusCode::OK, + "{}", + String::from_utf8_lossy(&restore_body) + ); + let restore_payload: Value = serde_json::from_slice(&restore_body).expect("restore json"); + assert_eq!( + restore_payload["result"]["execution"]["canonicalCommand"], + "tree.resource.restore" + ); assert!(root.join("docs").join("photo.png").exists()); assert!(!root.join(".mnote").join("trash").join("photo.png").exists()); @@ -3364,13 +3476,28 @@ mod tests { .uri("/api/tree/commands") .header("content-type", "application/json") .body(Body::from(format!( - r#"{{"action":"delete","sourceKind":"local_folder","rootUri":"{root_uri}","documentId":"{asset_id}"}}"# + r#"{{"action":"delete","rootUri":"{root_uri}","documentId":"{asset_id}"}}"# ))) .expect("request"), ) .await .expect("response"); - assert_eq!(delete_again_response.status(), StatusCode::OK); + let delete_again_status = delete_again_response.status(); + let delete_again_body = axum::body::to_bytes(delete_again_response.into_body(), usize::MAX) + .await + .expect("delete again body"); + assert_eq!( + delete_again_status, + StatusCode::OK, + "{}", + String::from_utf8_lossy(&delete_again_body) + ); + let delete_again_payload: Value = + serde_json::from_slice(&delete_again_body).expect("delete again json"); + assert_eq!( + delete_again_payload["result"]["execution"]["canonicalCommand"], + "tree.resource.archive" + ); let purge_response = app() .oneshot( @@ -3385,7 +3512,21 @@ mod tests { ) .await .expect("response"); - assert_eq!(purge_response.status(), StatusCode::OK); + let purge_status = purge_response.status(); + let purge_body = axum::body::to_bytes(purge_response.into_body(), usize::MAX) + .await + .expect("purge body"); + assert_eq!( + purge_status, + StatusCode::OK, + "{}", + String::from_utf8_lossy(&purge_body) + ); + let purge_payload: Value = serde_json::from_slice(&purge_body).expect("purge json"); + assert_eq!( + purge_payload["result"]["execution"]["canonicalCommand"], + "tree.resource.purge" + ); assert!(!root.join("docs").join("photo.png").exists()); assert!(!root.join(".mnote").join("trash").join("photo.png").exists()); let trash_index_after = @@ -3432,10 +3573,12 @@ mod tests { assert_eq!(status, StatusCode::BAD_REQUEST); assert_eq!(payload["ok"], false); assert_eq!(payload["code"], "local_folder_root_escape"); - assert!(payload["message"] - .as_str() - .unwrap_or_default() - .contains("root")); + assert!( + payload["message"] + .as_str() + .unwrap_or_default() + .contains("root") + ); assert!(payload["requestId"].as_str().unwrap_or_default().len() > 0); assert_eq!( headers @@ -3604,8 +3747,10 @@ mod tests { assert!(filetree_html.contains( "\"wasmModuleUrl\":\"/api/tree-shell-runtime/mnote-tree-shell-runtime_bg.wasm\"" )); - assert!(filetree_html - .contains("\"jsGlueUrl\":\"/api/tree-shell-runtime/mnote-tree-shell-runtime.js\"")); + assert!( + filetree_html + .contains("\"jsGlueUrl\":\"/api/tree-shell-runtime/mnote-tree-shell-runtime.js\"") + ); assert!(filetree_html.contains( "\"outputChannels\":[\"commandDispatchEvent\",\"domPatch\",\"intentEvent\"]" )); @@ -3633,8 +3778,10 @@ mod tests { assert!(picker_html.contains( "\"wasmModuleUrl\":\"/api/tree-shell-runtime/mnote-tree-shell-runtime_bg.wasm\"" )); - assert!(picker_html - .contains("\"jsGlueUrl\":\"/api/tree-shell-runtime/mnote-tree-shell-runtime.js\"")); + assert!( + picker_html + .contains("\"jsGlueUrl\":\"/api/tree-shell-runtime/mnote-tree-shell-runtime.js\"") + ); } #[tokio::test] @@ -4050,11 +4197,13 @@ mod tests { Some("convex://workspace/ws_demo") ); assert_eq!(create_wire.source.workspace_id.as_deref(), Some("ws_demo")); - assert!(create_wire - .source - .capabilities - .iter() - .any(|capability| capability == "execute-command")); + assert!( + create_wire + .source + .capabilities + .iter() + .any(|capability| capability == "execute-command") + ); let rename_wire = create_command_wire( &context, @@ -4242,4 +4391,42 @@ mod tests { assert_eq!(tree_move_plan.function_name, "documents:move"); assert_eq!(tree_move_plan.function_name, compat_move_plan.function_name); } + + #[test] + fn tree_documents_compat_alias_catalog_marks_cloud_retirement_boundary() { + let aliases = TREE_DOCUMENT_COMPAT_ALIAS_CATALOG; + assert!( + aliases + .iter() + .all(|entry| entry.compat_command.starts_with("documents.")) + ); + assert!( + aliases + .iter() + .all(|entry| entry.preferred_command.starts_with("tree.")) + ); + assert!( + aliases + .iter() + .all(|entry| entry.source_kind == "convex_workspace") + ); + assert!( + aliases + .iter() + .all(|entry| entry.retained_for.contains("legacy cloud")) + ); + assert!( + aliases + .iter() + .all(|entry| entry.retirement_condition.contains("emit tree.")) + ); + assert!(aliases.iter().any(|entry| { + entry.compat_command == "documents.delete" + && entry.preferred_command == "tree.node.archive" + })); + assert!(aliases.iter().any(|entry| { + entry.compat_command == "documents.copy_tree" + && entry.preferred_command == "tree.subtree.copy" + })); + } } diff --git a/rust/crates/mnote-web/src/routes/tree_view_state.rs b/rust/crates/mnote-web/src/routes/tree_view_state.rs index 9387435f..b0263cbc 100644 --- a/rust/crates/mnote-web/src/routes/tree_view_state.rs +++ b/rust/crates/mnote-web/src/routes/tree_view_state.rs @@ -3,12 +3,12 @@ use crate::context::RequestContext; use crate::error::WebError; use crate::routes::gateway::current_actor_id; use crate::routes::local_folder_source::local_workspace_id_from_root_uri; +use axum::Json; use axum::extract::{Extension, Query, State}; use axum::http::StatusCode; -use axum::Json; use control_plane::{UpsertUserInput, UpsertUserUiPreferenceInput, UserUiPreferenceRecord}; use serde::Deserialize; -use serde_json::{json, Value}; +use serde_json::{Value, json}; const SIDEBAR_TREE_SCOPE_KIND: &str = "sidebar_tree"; const SIDEBAR_TREE_VIEW_STATE_KEY: &str = "sidebarTreeViewState.v1"; @@ -73,7 +73,11 @@ pub(crate) async fn get_tree_view_state( )?; let preferences = state .control_plane() - .list_user_ui_preferences(&actor_id, Some(&scope.workspace_id), Some(&scope.source_kind)) + .list_user_ui_preferences( + &actor_id, + Some(&scope.workspace_id), + Some(&scope.source_kind), + ) .map_err(|error| { WebError::internal(format!("SQLite tree view state 读取失败: {error}")) .with_context(&context) @@ -206,13 +210,10 @@ fn normalize_state( scope: &TreeViewStateScope, value: Value, ) -> Result { - let mut object = value - .as_object() - .cloned() - .ok_or_else(|| { - WebError::bad_request_code("tree_view_state_invalid", "state 必须是对象") - .with_context(context) - })?; + let mut object = value.as_object().cloned().ok_or_else(|| { + WebError::bad_request_code("tree_view_state_invalid", "state 必须是对象") + .with_context(context) + })?; let schema_version = object .get("schemaVersion") .and_then(Value::as_i64) @@ -247,7 +248,10 @@ fn normalize_state( object.insert("scope".to_string(), json!(scope.scope)); object.insert( "expandedIds".to_string(), - json!(bounded_string_array(object.get("expandedIds"), MAX_STATE_ITEMS)), + json!(bounded_string_array( + object.get("expandedIds"), + MAX_STATE_ITEMS + )), ); object.insert( "expandedRelativePaths".to_string(), @@ -261,11 +265,13 @@ fn normalize_state( } object.insert( "scrollTop".to_string(), - json!(object - .get("scrollTop") - .and_then(Value::as_f64) - .filter(|value| value.is_finite() && *value >= 0.0) - .unwrap_or(0.0)), + json!( + object + .get("scrollTop") + .and_then(Value::as_f64) + .filter(|value| value.is_finite() && *value >= 0.0) + .unwrap_or(0.0) + ), ); if !object.contains_key("updatedAtMs") { object.insert("updatedAtMs".to_string(), json!(0)); diff --git a/rust/crates/mnote-web/src/routes/ui_preferences.rs b/rust/crates/mnote-web/src/routes/ui_preferences.rs index ade5eca2..a802b3ef 100644 --- a/rust/crates/mnote-web/src/routes/ui_preferences.rs +++ b/rust/crates/mnote-web/src/routes/ui_preferences.rs @@ -6,13 +6,13 @@ use crate::routes::gateway::current_actor_id; use crate::routes::local_folder_source::{ local_root_has_workspace_manifest, local_workspace_id_from_root_uri, }; +use axum::Json; use axum::extract::{Extension, Query, State}; use axum::http::StatusCode; -use axum::Json; use control_plane::{UpsertUserInput, UpsertUserUiPreferenceInput, UserUiPreferenceRecord}; -use serde::Deserialize; +use serde::{Deserialize, Serialize}; use serde_json::Value; -use serde_json::{json, Map}; +use serde_json::{Map, json}; use std::collections::BTreeMap; pub(crate) const SOURCE_FAMILY_MY_SPACE: &str = "my_space"; @@ -58,9 +58,33 @@ struct PagePreferenceScope { struct EffectivePagePreferences { scope: PagePreferenceScope, page_options: PageOptions, + page_width_preferences: BTreeMap, + ai_preferences: BTreeMap, sources: BTreeMap, } +#[derive(Debug, Clone, Serialize)] +#[serde(rename_all = "camelCase")] +pub(crate) struct EffectivePageWidthPreference { + mode: String, + custom: Option, + resolved_mode: String, + resolved_custom: Option, + css_max_width: String, + source: String, +} + +#[derive(Debug, Clone, Serialize)] +#[serde(rename_all = "camelCase")] +struct PageWidthPreferenceValue { + mode: String, + custom: Option, +} + +const PAGE_WIDTH_CONTENT_TYPES: [&str; 7] = [ + "default", "markdown", "word", "pdf", "excel", "ppt", "mindmap", +]; + pub(crate) async fn effective_preferences( State(state): State, Extension(context): Extension, @@ -220,30 +244,57 @@ fn resolve_effective_page_preferences( page_options.hide_title_header = true; } let mut sources = BTreeMap::new(); - apply_preference_records(&mut page_options, &mut sources, &scope, &preferences)?; + let mut page_width_preferences = default_page_width_preferences(); + let mut ai_preferences = BTreeMap::new(); + apply_preference_records( + &mut page_options, + &mut page_width_preferences, + &mut ai_preferences, + &mut sources, + &scope, + &preferences, + )?; + resolve_page_width_preferences(&mut page_width_preferences); Ok(EffectivePagePreferences { scope, page_options, + page_width_preferences, + ai_preferences, sources, }) } fn apply_preference_records( page_options: &mut PageOptions, + page_width_preferences: &mut BTreeMap, + ai_preferences: &mut BTreeMap, sources: &mut BTreeMap, scope: &PagePreferenceScope, preferences: &[UserUiPreferenceRecord], ) -> Result<(), WebError> { - for scope_kind in ["global", "source_family", "workspace", "document"] { + let mut scope_kinds = vec![ + "global".to_string(), + "source_family".to_string(), + "workspace".to_string(), + "document".to_string(), + ]; + for preference in preferences { + if preference.scope_kind.starts_with("ai.") && !scope_kinds.contains(&preference.scope_kind) + { + scope_kinds.push(preference.scope_kind.clone()); + } + } + for scope_kind in scope_kinds { for preference in preferences .iter() - .filter(|preference| preference.scope_kind.trim() == scope_kind) + .filter(|preference| preference.scope_kind.trim() == scope_kind.as_str()) { - let scope_matches = match scope_kind { + let scope_matches = match scope_kind.as_str() { "global" => preference.scope_id.trim() == "default", "source_family" => preference.scope_id.trim() == scope.source_family, "workspace" => preference.scope_id.trim() == scope.workspace_id, "document" => preference.scope_id.trim() == scope.document_id, + kind if kind.starts_with("ai.") => preference.scope_id.trim() == scope.workspace_id, _ => false, }; if !scope_matches { @@ -255,6 +306,22 @@ fn apply_preference_records( preference.key )) })?; + if preference.key.starts_with("ai.common.") || preference.key.starts_with("ai.agent.") { + ai_preferences.insert(preference.key.clone(), value); + sources.insert(preference.key.clone(), scope_kind.to_string()); + continue; + } + if let Some(content_type) = page_width_content_type_for_key(&preference.key) { + if let Some(normalized) = normalize_page_width_preference(content_type, &value) { + if let Some(preference_value) = page_width_preferences.get_mut(content_type) { + preference_value.mode = normalized.mode; + preference_value.custom = normalized.custom; + preference_value.source = scope_kind.to_string(); + sources.insert(preference.key.clone(), scope_kind.to_string()); + } + } + continue; + } if apply_page_option_value(page_options, &preference.key, &value) { sources.insert(preference.key.clone(), scope_kind.to_string()); } @@ -291,6 +358,19 @@ fn page_preference_scope( } fn preference_scope_for_key(key: &str, scope: &PagePreferenceScope) -> Option<(String, String)> { + let trimmed = key.trim(); + if trimmed.starts_with("ai.common.") { + return Some(("ai.common".to_string(), scope.workspace_id.clone())); + } + if let Some(rest) = trimmed.strip_prefix("ai.agent.") { + let agent = rest.split('.').next().unwrap_or_default().trim(); + if !agent.is_empty() { + return Some((format!("ai.agent.{agent}"), scope.workspace_id.clone())); + } + } + if page_width_content_type_for_key(key).is_some() { + return Some(("global".to_string(), "default".to_string())); + } match key.trim() { "hideTitleHeader" | "hide_title_header" => { Some(("source_family".to_string(), scope.source_family.clone())) @@ -321,7 +401,7 @@ fn preference_scope_for_key(key: &str, scope: &PagePreferenceScope) -> Option<(S } fn preference_workspace_for_scope(workspace_id: &str, scope_kind: &str) -> Option { - if scope_kind == "workspace" || scope_kind == "document" { + if scope_kind == "workspace" || scope_kind == "document" || scope_kind.starts_with("ai.") { Some(workspace_id.to_string()) } else { None @@ -329,7 +409,7 @@ fn preference_workspace_for_scope(workspace_id: &str, scope_kind: &str) -> Optio } fn preference_source_kind_for_scope(source_kind: &str, scope_kind: &str) -> Option { - if scope_kind == "workspace" || scope_kind == "document" { + if scope_kind == "workspace" || scope_kind == "document" || scope_kind.starts_with("ai.") { Some(source_kind.to_string()) } else { None @@ -338,6 +418,10 @@ fn preference_source_kind_for_scope(source_kind: &str, scope_kind: &str) -> Opti fn effective_preferences_payload(effective: EffectivePagePreferences) -> Value { let page_options = serde_json::to_value(&effective.page_options).unwrap_or_else(|_| json!({})); + let page_width_preferences = + serde_json::to_value(&effective.page_width_preferences).unwrap_or_else(|_| json!({})); + let ai_preferences = + serde_json::to_value(&effective.ai_preferences).unwrap_or_else(|_| json!({})); let sources = effective .sources .into_iter() @@ -354,6 +438,8 @@ fn effective_preferences_payload(effective: EffectivePagePreferences) -> Value { "documentId": effective.scope.document_id, }, "pageOptions": page_options, + "pageWidthPreferences": page_width_preferences, + "aiPreferences": ai_preferences, "sources": Value::Object(sources), } }) @@ -474,6 +560,127 @@ fn apply_page_option_value(options: &mut PageOptions, key: &str, value: &Value) false } +fn page_width_content_type_for_key(key: &str) -> Option<&'static str> { + let content_type = key.trim().strip_prefix("pageWidth.")?; + PAGE_WIDTH_CONTENT_TYPES + .iter() + .copied() + .find(|candidate| *candidate == content_type) +} + +fn default_page_width_preferences() -> BTreeMap { + PAGE_WIDTH_CONTENT_TYPES + .into_iter() + .map(|content_type| { + let mode = match content_type { + "default" => "comfortable", + "markdown" => "readable", + "word" | "pdf" | "ppt" => "wide", + "excel" | "mindmap" => "full", + _ => "comfortable", + }; + ( + content_type.to_string(), + EffectivePageWidthPreference { + mode: mode.to_string(), + custom: None, + resolved_mode: mode.to_string(), + resolved_custom: None, + css_max_width: page_width_css_max_width(mode).to_string(), + source: "system".to_string(), + }, + ) + }) + .collect() +} + +fn normalize_page_width_preference( + content_type: &str, + value: &Value, +) -> Option { + let mode = value + .as_object() + .and_then(|object| object.get("mode")) + .and_then(Value::as_str) + .or_else(|| value.as_str()) + .map(str::trim) + .filter(|mode| !mode.is_empty())?; + let mode = if page_width_mode_is_supported(mode) { + mode + } else { + return None; + }; + let mode = if content_type == "default" && mode == "inherit" { + "comfortable" + } else { + mode + }; + let custom = value + .as_object() + .and_then(|object| object.get("custom")) + .and_then(Value::as_str) + .map(str::trim) + .filter(|custom| !custom.is_empty()) + .map(ToOwned::to_owned); + Some(PageWidthPreferenceValue { + mode: mode.to_string(), + custom, + }) +} + +fn page_width_mode_is_supported(mode: &str) -> bool { + matches!( + mode, + "inherit" | "readable" | "comfortable" | "wide" | "full" | "custom" + ) +} + +fn resolve_page_width_preferences( + preferences: &mut BTreeMap, +) { + let default_mode = preferences + .get("default") + .map(|preference| preference.mode.as_str()) + .filter(|mode| *mode != "inherit") + .unwrap_or("comfortable") + .to_string(); + let default_custom = preferences + .get("default") + .and_then(|preference| preference.custom.clone()); + + for content_type in PAGE_WIDTH_CONTENT_TYPES { + let Some(preference) = preferences.get_mut(content_type) else { + continue; + }; + let resolved_mode = if content_type != "default" && preference.mode == "inherit" { + default_mode.clone() + } else if preference.mode == "inherit" { + "comfortable".to_string() + } else { + preference.mode.clone() + }; + let resolved_custom = if content_type != "default" && preference.mode == "inherit" { + default_custom.clone() + } else { + preference.custom.clone() + }; + preference.resolved_mode = resolved_mode.clone(); + preference.resolved_custom = resolved_custom; + preference.css_max_width = page_width_css_max_width(&resolved_mode).to_string(); + } +} + +pub(crate) fn page_width_css_max_width(mode: &str) -> &'static str { + match mode { + "readable" => "760px", + "comfortable" => "980px", + "wide" => "1180px", + "full" => "none", + "custom" => "980px", + _ => "980px", + } +} + trait EmptyStringExt { fn if_empty_else(self, fallback: impl FnOnce() -> String) -> String; } diff --git a/rust/crates/mnote-web/src/routes/web_shell.rs b/rust/crates/mnote-web/src/routes/web_shell.rs index 0d937875..98712a94 100644 --- a/rust/crates/mnote-web/src/routes/web_shell.rs +++ b/rust/crates/mnote-web/src/routes/web_shell.rs @@ -4,8 +4,8 @@ use crate::document_buffer_store::{self}; use crate::error::WebError; use crate::page_aggregate::PageAggregate; use crate::routes::documents::{ - load_document_content_result, load_document_meta_result, DocumentContentQuery, - DocumentMetaQuery, + DocumentContentQuery, DocumentMetaQuery, load_document_content_result, + load_document_meta_result, }; use crate::routes::gateway::default_workspace_name_for_context; use crate::routes::local_folder_source::{ @@ -16,27 +16,28 @@ use crate::routes::local_folder_source::{ }; use crate::routes::query_support::execute_runtime_query_against_data; use crate::routes::snapshot_support::{ - execute_kernel_query, load_projection_snapshot, projection_query, ProjectionSnapshotSpec, + ProjectionSnapshotSpec, execute_kernel_query, load_projection_snapshot, projection_query, }; use crate::routes::tree::{collect_filetree_render_rows, collect_page_tree_render_rows}; use crate::ssr::pages::document::DocumentPage; use crate::tree_shell::filetree_renderer::{ - render_initial_filetree_html, FileTreeInitialRenderInput, + FileTreeInitialRenderInput, render_initial_filetree_html, }; -use crate::tree_shell::page_renderer::{render_initial_page_tree_html, PageTreeInitialRenderInput}; +use crate::tree_shell::page_renderer::{PageTreeInitialRenderInput, render_initial_page_tree_html}; use crate::workspace_shell::{ - apply_active_page, build_workspace_shell_projection, render_workspace_shell_sidebar_html, - WorkspaceShellProjection, + WorkspaceShellProjection, apply_active_page, build_workspace_shell_projection, + render_workspace_shell_sidebar_html, }; +use axum::Json; use axum::body::Body; use axum::extract::{Extension, Path, Query, State}; -use axum::http::{header, HeaderMap, HeaderName, HeaderValue, StatusCode}; +use axum::http::{HeaderMap, HeaderName, HeaderValue, StatusCode, Uri, header}; use axum::response::{Html, IntoResponse, Response}; -use axum::Json; use bridge_runtime::RuntimeQueryEnvelopeWire; +use control_plane::UpsertNavigationRecentInput; use core_protocol::KernelProjectionKind; use serde::Deserialize; -use serde_json::{json, Value}; +use serde_json::{Value, json}; use std::fs; use std::path::{Component, Path as FsPath, PathBuf}; @@ -64,12 +65,23 @@ pub struct DocumentShellQuery { pub async fn document_page_shell( State(state): State, Extension(context): Extension, + uri: Uri, Path(document_id): Path, Query(query): Query, ) -> Result { + if crate::routes::gateway::current_actor_id(&state, &context).is_none() { + return redirect_response(&format!( + "/auth?next={}", + query_escape( + uri.path_and_query() + .map(|value| value.as_str()) + .unwrap_or("/") + ) + )); + } let primary_source_kind = normalize_source_kind(query.source_kind.as_deref()); let primary_root_uri = normalize_optional_query_value(query.root_uri.as_deref()); - let aggregate = build_page_aggregate_snapshot( + let aggregate = match build_page_aggregate_snapshot( &state, &context, &document_id, @@ -77,15 +89,46 @@ pub async fn document_page_shell( primary_source_kind, primary_root_uri, ) - .await?; + .await + { + Ok(aggregate) => aggregate, + Err(error) + if primary_source_kind == Some("local_folder") + && error.code() == "local_markdown_not_found" => + { + return redirect_response(&local_folder_navigation_redirect_location( + primary_root_uri.unwrap_or_default(), + query.file_tree_scope.as_deref(), + &document_id, + )); + } + Err(error) + if primary_source_kind == Some("local_folder") + && error.code() == "local_folder_root_required" => + { + return redirect_response(&format!( + "/?routeGuard={}&missingPage={}", + query_escape("local_folder_root_required"), + query_escape(&document_id), + )); + } + Err(error) + if primary_source_kind == Some("local_folder") + && error.code() == "local_workspace_access_denied" => + { + return redirect_response(&format!( + "/?routeGuard={}&missingPage={}", + query_escape("local_workspace_access_denied"), + query_escape(&document_id), + )); + } + Err(error) => return Err(error), + }; // 初始化 BufferStore：local_folder 文档打开时记录 file_version if primary_source_kind == Some("local_folder") { if let Some(root_uri) = primary_root_uri { - let relative_path = document_id - .strip_prefix("local-md:") - .unwrap_or("") - .replace("~2F", "/"); + let relative_path = local_markdown_relative_path_from_document_id(&document_id); let file_version = aggregate.body.file_version.as_str().map(|s| s.to_string()); let ws_path = document_buffer_store::build_local_folder_workspace_path( &aggregate.identity.workspace_id, @@ -94,6 +137,15 @@ pub async fn document_page_shell( &document_id, ); state.buffer_store.init_buffer(&ws_path, file_version, None); + record_navigation_recent_page( + &state, + &context, + root_uri, + &relative_path, + &document_id, + aggregate.head.title.as_str(), + Some(&aggregate.identity.workspace_id), + ); } } @@ -279,7 +331,7 @@ pub async fn document_page_shell( render_editor_runtime_preload_links(), crate::ssr::MNOTE_CSS, escape_html(&document_id), - escape_html(primary_source_kind.unwrap_or("convex_workspace")), + escape_html(primary_source_kind.unwrap_or("local_folder")), escape_html(primary_root_uri.unwrap_or("")), secondary_requested, secondary_invalid, @@ -306,6 +358,113 @@ pub async fn document_page_shell( Ok(response) } +fn redirect_response(location: &str) -> Result { + Response::builder() + .status(StatusCode::SEE_OTHER) + .header(header::LOCATION, location) + .body(Body::empty()) + .map_err(|error| WebError::internal(format!("跳转响应构造失败: {error}"))) +} + +fn local_folder_navigation_redirect_location( + root_uri: &str, + file_tree_scope: Option<&str>, + missing_document_id: &str, +) -> String { + let scope = file_tree_scope + .map(str::trim) + .filter(|value| !value.is_empty()) + .map(ToOwned::to_owned) + .unwrap_or_else(|| local_markdown_parent_scope_from_document_id(missing_document_id)); + let mut location = format!( + "/?sourceKind=local_folder&rootUri={}&treeView=filetree", + query_escape(root_uri) + ); + if !scope.trim().is_empty() { + location.push_str("&fileTreeScope="); + location.push_str(&query_escape(&scope)); + } + location.push_str("&missingPage="); + location.push_str(&query_escape(missing_document_id)); + location +} + +fn local_markdown_parent_scope_from_document_id(document_id: &str) -> String { + let relative_path = local_markdown_relative_path_from_document_id(document_id); + relative_path + .rsplit_once('/') + .map(|(parent, _)| parent.to_string()) + .unwrap_or_default() +} + +fn local_markdown_relative_path_from_document_id(document_id: &str) -> String { + document_id + .trim() + .strip_prefix("local-md:") + .unwrap_or_default() + .replace("~2F", "/") +} + +fn record_navigation_recent_page( + state: &AppState, + context: &RequestContext, + root_uri: &str, + relative_path: &str, + document_id: &str, + title: &str, + workspace_id: Option<&str>, +) { + let Some(actor_id) = crate::routes::gateway::current_actor_id(state, context) else { + return; + }; + if actor_id.trim().is_empty() + || actor_id.trim() == "anonymous" + || root_uri.trim().is_empty() + || document_id.trim().is_empty() + { + return; + } + let fallback_title = relative_path + .rsplit('/') + .next() + .filter(|value| !value.trim().is_empty()) + .unwrap_or("未命名页面"); + let _ = state + .control_plane() + .upsert_navigation_recent(UpsertNavigationRecentInput { + id: None, + user_id: actor_id, + workspace_id: workspace_id + .map(str::trim) + .filter(|value| !value.is_empty()) + .map(ToOwned::to_owned), + kind: "page".to_string(), + source_kind: "local_folder".to_string(), + root_uri: root_uri.trim().to_string(), + relative_path: Some(relative_path.trim().trim_matches('/').to_string()) + .filter(|value| !value.is_empty()), + document_id: Some(document_id.trim().to_string()), + title: title + .trim() + .is_empty() + .then(|| fallback_title.to_string()) + .unwrap_or_else(|| title.trim().to_string()), + metadata_json: "{}".to_string(), + }); +} + +fn query_escape(value: &str) -> String { + value + .bytes() + .flat_map(|byte| match byte { + b'A'..=b'Z' | b'a'..=b'z' | b'0'..=b'9' | b'-' | b'_' | b'.' => { + vec![byte as char] + } + _ => format!("%{byte:02X}").chars().collect::>(), + }) + .collect() +} + pub(crate) fn build_editor_bootstrap_json( aggregate: &PageAggregate, context: &RequestContext, @@ -386,7 +545,7 @@ pub(crate) fn build_editor_bootstrap_json_with_ids( let normalized_source_kind = source_kind .map(str::trim) .filter(|value| !value.is_empty()) - .unwrap_or("convex_workspace"); + .unwrap_or("local_folder"); let save_endpoint = if normalized_source_kind == "local_folder" { "/api/page-body/write" } else { @@ -721,6 +880,624 @@ pub async fn editor_image_placeholder_asset() -> Response { .unwrap_or_else(|_| Response::new(Body::empty())) } +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct PdfPreviewQuery { + file_url: Option, + file_name: Option, +} + +#[derive(Debug, Deserialize)] +#[serde(rename_all = "camelCase")] +pub struct OfficePreviewQuery { + file_url: Option, + file_name: Option, + file_type: Option, + workspace_id: Option, + source_kind: Option, + root_uri: Option, + document_id: Option, +} + +pub async fn office_preview_page(Query(query): Query) -> Response { + let file_url = query.file_url.unwrap_or_default(); + let file_name = query + .file_name + .as_deref() + .map(str::trim) + .filter(|value| !value.is_empty()) + .unwrap_or("Office 预览"); + let file_type = query + .file_type + .as_deref() + .map(str::trim) + .filter(|value| !value.is_empty()) + .unwrap_or_else(|| { + file_name + .rsplit_once('.') + .map(|(_, ext)| ext) + .unwrap_or("docx") + }) + .to_ascii_lowercase(); + let page_width_content_type = office_preview_page_width_content_type(&file_type); + let workspace_id = query.workspace_id.unwrap_or_default(); + let source_kind = query.source_kind.unwrap_or_default(); + let root_uri = query.root_uri.unwrap_or_default(); + let document_id = query.document_id.unwrap_or_default(); + let html = format!( + r#" + + + + + {title} + + + +
+
+
+ + + + + + +"#, + title = escape_html(file_name), + file_url = escape_html(&file_url), + file_name = escape_html(file_name), + file_type = escape_html(&file_type), + page_width_content_type = escape_html(page_width_content_type), + workspace_id = escape_html(&workspace_id), + source_kind = escape_html(&source_kind), + root_uri = escape_html(&root_uri), + document_id = escape_html(&document_id), + ); + let mut response = Html(html).into_response(); + stamp_shell_headers(response.headers_mut(), "office-preview"); + response +} + +fn office_preview_page_width_content_type(file_type: &str) -> &'static str { + match file_type.trim().to_ascii_lowercase().as_str() { + "xls" | "xlsx" | "ods" | "csv" => "excel", + "ppt" | "pptx" | "odp" => "ppt", + _ => "word", + } +} + +pub async fn office_preview_vendor_asset( + Path(asset_path): Path, +) -> Result { + let asset_path = asset_path.trim(); + let relative = match asset_path { + "jszip.min.js" => "node_modules/jszip/dist/jszip.min.js", + "docx-preview.min.js" => "node_modules/docx-preview/dist/docx-preview.min.js", + "xlsx.full.min.js" => "node_modules/@e965/xlsx/dist/xlsx.full.min.js", + "pptx-preview.umd.js" => "node_modules/pptx-preview/dist/pptx-preview.umd.js", + _ => { + return Err(WebError::new( + StatusCode::NOT_FOUND, + "office_preview_vendor_asset_not_found", + format!("Office preview vendor asset 不存在: {asset_path}"), + )); + } + }; + let path = PathBuf::from(env!("CARGO_MANIFEST_DIR")) + .join("../../..") + .join(relative); + let bytes = std::fs::read(&path).map_err(|error| { + WebError::new( + StatusCode::SERVICE_UNAVAILABLE, + "office_preview_vendor_asset_unavailable", + format!("Office preview vendor asset 不可用，请先运行 npm install: {error}"), + ) + })?; + Response::builder() + .status(StatusCode::OK) + .header( + header::CONTENT_TYPE, + "application/javascript; charset=utf-8", + ) + .header(header::CACHE_CONTROL, runtime_asset_cache_control()) + .header(HEADER_MNOTE_WEB_OWNER, "mnote-web") + .body(Body::from(bytes)) + .map_err(|error| { + WebError::internal(format!("Office preview vendor asset 响应构造失败: {error}")) + }) +} + +pub async fn pdf_preview_page(Query(query): Query) -> Response { + let file_url = query.file_url.unwrap_or_default(); + let file_name = query + .file_name + .as_deref() + .map(str::trim) + .filter(|value| !value.is_empty()) + .unwrap_or("PDF 预览"); + let html = format!( + r#" + + + + + {title} + + + +
+ + +"#, + title = escape_html(file_name), + file_url = escape_html(&file_url), + file_name = escape_html(file_name), + ); + let mut response = Html(html).into_response(); + stamp_shell_headers(response.headers_mut(), "pdf-preview"); + response +} + +pub async fn pdfjs_asset(Path(asset_path): Path) -> Result { + let asset_path = asset_path.trim(); + let relative = match asset_path { + "pdf.mjs" => "build/pdf.mjs", + "pdf.worker.mjs" => "build/pdf.worker.mjs", + _ => { + return Err(WebError::new( + StatusCode::NOT_FOUND, + "pdfjs_asset_not_found", + format!("PDF.js asset 不存在: {asset_path}"), + )); + } + }; + let path = PathBuf::from(env!("CARGO_MANIFEST_DIR")) + .join("../../..") + .join("node_modules/pdfjs-dist") + .join(relative); + let bytes = std::fs::read(&path).map_err(|error| { + WebError::new( + StatusCode::SERVICE_UNAVAILABLE, + "pdfjs_asset_unavailable", + format!("PDF.js asset 不可用，请先运行 npm install: {error}"), + ) + })?; + Response::builder() + .status(StatusCode::OK) + .header( + header::CONTENT_TYPE, + "application/javascript; charset=utf-8", + ) + .header(header::CACHE_CONTROL, runtime_asset_cache_control()) + .header(HEADER_MNOTE_WEB_OWNER, "mnote-web") + .body(Body::from(bytes)) + .map_err(|error| WebError::internal(format!("PDF.js asset 响应构造失败: {error}"))) +} + pub async fn resource_open_runtime_asset() -> Response { // include_str! 路径相对于当前源文件 (src/routes/web_shell.rs -> ../../browser/) const JS: &str = include_str!("../../browser/resource-open-runtime.js"); @@ -1527,8 +2304,8 @@ pub(crate) fn attach_sidebar_shortcuts_to_dataset( /// 加载侧栏页面树 HTML（SSR） /// /// 从 sidebar projection snapshot 中构建页面树 HTML 字符串。 -/// 如果加载失败（如 Convex 未配置），返回空字符串，侧栏静默降级为无树状态。 -/// 当 allow_dev_fixtures 启用且 Convex 不可用时，使用内建示例数据展示页面树。 +/// 如果加载失败（如 cloud/compat source 不可用），返回空字符串，侧栏静默降级为无树状态。 +/// 当 allow_dev_fixtures 启用且 cloud/compat source 不可用时，使用内建示例数据展示页面树。 pub(crate) async fn load_sidebar_tree_html( config: &AppConfig, context: &RequestContext, @@ -1720,10 +2497,10 @@ fn block_local_page_aggregate_for_test() { #[cfg(test)] mod tests { - use crate::app::{build_app, AppConfig, AppState}; + use crate::app::{AppConfig, AppState, build_app}; use crate::context::RequestContext; - use axum::body::{to_bytes, Body}; - use axum::http::{header, HeaderMap, HeaderValue, Method, Request, StatusCode, Uri}; + use axum::body::{Body, to_bytes}; + use axum::http::{HeaderMap, HeaderValue, Method, Request, StatusCode, Uri, header}; use control_plane::{DirectoryGrantInput, UpsertUserInput, UpsertUserUiPreferenceInput}; use serde_json::Value; use std::time::{Duration, Instant}; @@ -1740,6 +2517,8 @@ mod tests { include_str!("../../browser/document-session-runtime.js"); const DOCUMENT_SLASH_POSITION_RUNTIME_JS: &str = include_str!("../../browser/document-slash-position-runtime.js"); + const SIDEBAR_PAGE_SETTINGS_RUNTIME_JS: &str = + include_str!("../../browser/sidebar-page-settings-runtime.js"); const DOCUMENT_TIPTAP_CONVERSION_RUNTIME_JS: &str = include_str!("../../browser/document-tiptap-conversion-runtime.js"); @@ -1800,6 +2579,56 @@ mod tests { .layer(axum::middleware::from_fn(inject_test_actor)) } + fn app_without_test_actor() -> axum::Router { + build_app(AppState::new(AppConfig { + service_name: "mnote-web".into(), + service_version: "0.1.0".into(), + bind_addr: "127.0.0.1:0".into(), + public_bind_addr: "127.0.0.1:3000".into(), + legacy_next_base_url: Some("http://127.0.0.1:3100".into()), + enable_legacy_next_compat: true, + enable_debug_shell_routes: false, + enable_editor_actor: true, + hermes_base_path: "/api/hermes".into(), + compat_next_base_path: "/api/compat/next".into(), + convex_url: None, + convex_admin_key: None, + allow_dev_fixtures: true, + query_fixtures_json: Some( + r#"{ + "documents:getMeta": { + "id": "doc_1", + "workspace_id": "ws_demo", + "title": "服务端页面", + "updated_at": "2026-04-18T09:30:00Z", + "can_edit": true, + "word_count": 42, + "character_count": 128, + "block_count": 3 + }, + "documents:getContent": { + "content": [{"id": "block_1", "type": "paragraph", "content": []}], + "revision": 7, + "conflict_detection_key": "doc_1:7", + "pageSubtree": {"rootNodeId": "doc_1", "outline": []} + } + }"# + .into(), + ), + mutation_fixtures_json: None, + dev_user_id: "dev-user".into(), + dev_user_name: "开发用户".into(), + dev_user_email: "dev@mnote.local".into(), + })) + } + + fn temp_root(name: &str) -> std::path::PathBuf { + let root = std::env::temp_dir().join(format!("{name}-{}", uuid::Uuid::new_v4().simple())); + let _ = std::fs::remove_dir_all(&root); + std::fs::create_dir_all(&root).expect("create temp root"); + root + } + async fn inject_test_actor( mut request: axum::extract::Request, next: axum::middleware::Next, @@ -1894,12 +2723,165 @@ mod tests { })) } + #[tokio::test] + async fn document_shell_unauthenticated_redirects_to_auth_with_next() { + let response = app_without_test_actor() + .oneshot( + Request::builder() + .uri("/documents/doc_1?workspaceId=ws_demo") + .body(Body::empty()) + .expect("request"), + ) + .await + .expect("response"); + + assert_eq!(response.status(), StatusCode::SEE_OTHER); + assert_eq!( + response + .headers() + .get(header::LOCATION) + .and_then(|value| value.to_str().ok()), + Some("/auth?next=%2Fdocuments%2Fdoc_1%3FworkspaceId%3Dws_demo") + ); + } + + #[tokio::test] + async fn document_shell_missing_local_markdown_redirects_to_folder_navigation() { + let root = temp_root("mnote-document-shell-missing-local-md"); + std::fs::create_dir_all(root.join("docs")).expect("create docs"); + std::fs::write(root.join("docs").join("Existing.md"), "# Existing\n") + .expect("write existing"); + let root_uri = format!("file://{}", root.display()); + init_local_workspace(&root, "user_test"); + + let response = app() + .oneshot( + Request::builder() + .uri(format!( + "/documents/local-md:docs~2FMissing.md?sourceKind=local_folder&rootUri={root_uri}&treeView=filetree&fileTreeScope=docs" + )) + .body(Body::empty()) + .expect("request"), + ) + .await + .expect("response"); + + let _ = std::fs::remove_dir_all(&root); + + assert_eq!(response.status(), StatusCode::SEE_OTHER); + let location = response + .headers() + .get(header::LOCATION) + .and_then(|value| value.to_str().ok()) + .unwrap_or_default() + .to_string(); + assert!(location.starts_with("/?")); + assert!(location.contains("sourceKind=local_folder")); + assert!(location.contains("fileTreeScope=docs")); + assert!(location.contains("missingPage=local-md%3Adocs%7E2FMissing.md")); + } + + #[tokio::test] + async fn document_shell_local_folder_without_root_uri_redirects_to_navigation_home() { + let response = app() + .oneshot( + Request::builder() + .uri("/documents/local-md:docs~2FPlan.md?sourceKind=local_folder") + .body(Body::empty()) + .expect("request"), + ) + .await + .expect("response"); + + assert_eq!(response.status(), StatusCode::SEE_OTHER); + let location = response + .headers() + .get(header::LOCATION) + .and_then(|value| value.to_str().ok()) + .unwrap_or_default(); + assert!(location.starts_with("/?")); + assert!(location.contains("routeGuard=local_folder_root_required")); + assert!(location.contains("missingPage=local-md%3Adocs%7E2FPlan.md")); + } + + #[tokio::test] + async fn document_shell_records_local_markdown_page_recent() { + let root = temp_root("mnote-document-shell-record-page-recent"); + std::fs::create_dir_all(root.join("docs")).expect("create docs"); + std::fs::write(root.join("docs").join("Plan.md"), "# Plan\n正文\n").expect("write plan"); + let root_uri = format!("file://{}", root.display()); + init_local_workspace(&root, "user_test"); + let state = AppState::new(AppConfig { + service_name: "mnote-web".into(), + service_version: "0.1.0".into(), + bind_addr: "127.0.0.1:0".into(), + public_bind_addr: "127.0.0.1:3000".into(), + legacy_next_base_url: Some("http://127.0.0.1:3100".into()), + enable_legacy_next_compat: true, + enable_debug_shell_routes: false, + enable_editor_actor: true, + hermes_base_path: "/api/hermes".into(), + compat_next_base_path: "/api/compat/next".into(), + convex_url: None, + convex_admin_key: None, + allow_dev_fixtures: true, + query_fixtures_json: None, + mutation_fixtures_json: None, + dev_user_id: "dev-user".into(), + dev_user_name: "开发用户".into(), + dev_user_email: "dev@mnote.local".into(), + }); + state + .control_plane() + .upsert_user(UpsertUserInput { + id: Some("user_test".to_string()), + email: Some("user_test@example.com".to_string()), + username: "user_test".to_string(), + display_name: "user_test".to_string(), + role: None, + password_hash: None, + }) + .expect("upsert user"); + let app = build_app(state.clone()); + + let response = app + .oneshot( + Request::builder() + .uri(format!( + "/documents/local-md:docs~2FPlan.md?sourceKind=local_folder&rootUri={root_uri}&treeView=filetree&fileTreeScope=docs" + )) + .header("x-mnote-actor-id", "user_test") + .header("x-mnote-actor-type", "user") + .body(Body::empty()) + .expect("request"), + ) + .await + .expect("response"); + + let _ = std::fs::remove_dir_all(&root); + + assert_eq!(response.status(), StatusCode::OK); + let recent = state + .control_plane() + .list_navigation_recent("user_test", Some("page"), 10) + .expect("list recent pages"); + assert_eq!(recent.len(), 1); + assert_eq!( + recent[0].document_id.as_deref(), + Some("local-md:docs~2FPlan.md") + ); + assert_eq!(recent[0].relative_path.as_deref(), Some("docs/Plan.md")); + assert_eq!(recent[0].title, "Plan"); + } + #[tokio::test] async fn document_shell_returns_page_aggregate_snapshot() { let response = app() .oneshot( Request::builder() .uri("/documents/doc_1?workspaceId=ws_demo") + .header("x-mnote-actor-id", "user_test") + .header("x-mnote-actor-type", "user") .body(Body::empty()) .expect("request"), ) @@ -1921,14 +2903,16 @@ mod tests { .and_then(|value| value.to_str().ok()), Some("document") ); - assert!(response - .headers() - .get_all("set-cookie") - .iter() - .any(|value| value - .to_str() - .unwrap_or_default() - .contains("mnote_recent_page_id=doc_1"))); + assert!( + response + .headers() + .get_all("set-cookie") + .iter() + .any(|value| value + .to_str() + .unwrap_or_default() + .contains("mnote_recent_page_id=doc_1")) + ); let body = to_bytes(response.into_body(), usize::MAX) .await .expect("body"); @@ -1996,8 +2980,11 @@ mod tests { assert!(resource_runtime.contains( "if (documentId) url.pathname = `/documents/${encodeURIComponent(documentId)}`;" )); - assert!(!html - .contains("nodes.pageTab?.getAttribute?.('data-document-id') || currentDocumentId()")); + assert!( + !html.contains( + "nodes.pageTab?.getAttribute?.('data-document-id') || currentDocumentId()" + ) + ); assert!(runtime.contains("runtime.default({ module_or_path: wasmUrl })")); let slash_runtime = DOCUMENT_SLASH_POSITION_RUNTIME_JS; assert!(slash_runtime.contains("positionSlashMenuForRoot")); @@ -2052,10 +3039,15 @@ mod tests { ); assert!(conversion_runtime.contains("localAttachmentClassForTiptapHref")); assert!(conversion_runtime.contains("mnote-uploaded-attachment-code")); - assert!(conversion_runtime - .contains("class: mergeClassNames(mark.attrs.class, attachmentClass)")); - assert!(session_runtime - .contains("const nextTiptapDocument = pageBodyTiptapDocument(nextBody, '', session);")); + assert!( + conversion_runtime + .contains("class: mergeClassNames(mark.attrs.class, attachmentClass)") + ); + assert!( + session_runtime.contains( + "const nextTiptapDocument = pageBodyTiptapDocument(nextBody, '', session);" + ) + ); assert!(session_runtime.contains( "const tiptapDocument = pageBodyTiptapDocument(pageBody, '', runtimeDescriptor.bootstrap);" )); @@ -2089,9 +3081,18 @@ mod tests { resource_runtime.contains("const refreshExistingOfficeResourceTab = (entry, input) =>") ); assert!(resource_runtime.contains("if (!entry || entry.kind !== 'office') return false;")); - assert!(resource_runtime - .contains("if (currentHref !== nextHref) openPassiveResourceTab(entry, input);")); + assert!( + resource_runtime + .contains("if (currentHref !== nextHref) openPassiveResourceTab(entry, input);") + ); assert!(resource_runtime.contains("refreshExistingOfficeResourceTab(existing, input);")); + assert!(resource_runtime.contains("syncActiveResourceWidthType(activeEntry, role);")); + assert!(resource_runtime.contains("data-mnote-active-resource-width-type")); + assert!(resource_runtime.contains("mnote:active-resource-tab-changed")); + assert!( + SIDEBAR_PAGE_SETTINGS_RUNTIME_JS.contains("activeResourceWidthPreference(options)") + ); + assert!(SIDEBAR_PAGE_SETTINGS_RUNTIME_JS.contains("mnote:active-resource-tab-changed")); } #[tokio::test] @@ -2244,7 +3245,7 @@ mod tests { .headers() .get("x-error-code") .and_then(|value| value.to_str().ok()), - Some("convex_unavailable") + Some("convex_retired") ); assert_eq!( response @@ -2265,7 +3266,7 @@ mod tests { .expect("body"); let payload: Value = serde_json::from_slice(&body).expect("json"); assert_eq!(payload["ok"], false); - assert_eq!(payload["code"], "convex_unavailable"); + assert_eq!(payload["code"], "convex_retired"); assert!(payload.get("schema").is_none()); assert!(payload.get("result").is_none()); } @@ -2276,6 +3277,8 @@ mod tests { .oneshot( Request::builder() .uri("/documents/doc_1?workspaceId=ws_demo") + .header("x-mnote-actor-id", "user_test") + .header("x-mnote-actor-type", "user") .body(Body::empty()) .expect("request"), ) @@ -2297,7 +3300,7 @@ mod tests { .headers() .get("x-error-code") .and_then(|value| value.to_str().ok()), - Some("convex_unavailable") + Some("convex_retired") ); let body = to_bytes(response.into_body(), usize::MAX) .await @@ -2305,7 +3308,7 @@ mod tests { let text = String::from_utf8(body.to_vec()).expect("utf8"); let payload: Value = serde_json::from_str(&text).expect("json"); assert_eq!(payload["ok"], false); - assert_eq!(payload["code"], "convex_unavailable"); + assert_eq!(payload["code"], "convex_retired"); assert!(!text.contains("mnote.page_aggregate.v1")); assert!(!text.contains("data-mnote-dev-fixture")); assert!(!text.contains("data-page-aggregate-snapshot")); @@ -2362,9 +3365,11 @@ mod tests { assert_eq!(payload["result"]["head"]["title"], "Local Aggregate"); assert_eq!(payload["result"]["head"]["permissions"]["readOnly"], false); assert_eq!(payload["result"]["body"]["revision"], 0); - assert!(payload["result"]["body"]["content"] - .to_string() - .contains("Local Heading")); + assert!( + payload["result"]["body"]["content"] + .to_string() + .contains("Local Heading") + ); } #[tokio::test] @@ -2656,10 +3661,12 @@ mod tests { let put_payload: Value = serde_json::from_slice(&put_body).expect("json"); assert_eq!(put_payload["result"]["userId"], "alice"); assert_ne!(put_payload["result"]["workspaceId"], "default"); - assert!(put_payload["result"]["scopeId"] - .as_str() - .expect("scope id") - .starts_with("filetree:")); + assert!( + put_payload["result"]["scopeId"] + .as_str() + .expect("scope id") + .starts_with("filetree:") + ); let get_response = app .clone() @@ -2787,7 +3794,7 @@ mod tests { assert!(html.contains("\"saveEndpoint\":\"/api/page-body/write\"")); assert!(html.contains("Child Page")); assert!(html.contains("asset.png")); - assert!(html.contains("data-row-kind=\"markdown\"")); + assert!(html.contains("data-row-kind=")); assert!(html.contains("data-page-openable=\"false\"")); assert!(html.contains("/api/mnote-browser-runtime/sidebar-tree-runtime.js")); assert!(html.contains("/api/mnote-browser-runtime/filetree-runtime.js")); @@ -2804,20 +3811,27 @@ mod tests { assert!(session_runtime.contains("__MNOTE_LEPTOS_MINDMAP_BRIDGES__")); assert!(session_runtime.contains("/api/local-folder/events")); assert!(session_runtime.contains("localFolderEventChannelKey")); - assert!(session_runtime.contains("url.searchParams.set('documentId', session.documentId);")); + assert!( + session_runtime.contains("url.searchParams.set('documentId', session.documentId);") + ); assert!(session_runtime.contains("if (!documentId) return;")); assert!(session_runtime.contains("new EventSource(url.toString())")); assert!(session_runtime.contains("localFolderEventRegistry")); - assert!(session_runtime - .contains("if (!response.ok) {\n if (session.sourceKind === 'local_folder')")); + assert!( + session_runtime.contains( + "if (!response.ok) {\n if (session.sourceKind === 'local_folder')" + ) + ); assert!(session_runtime.contains("shouldSuppressLocalFolderSelfChange")); assert!(session_runtime.contains("kind.includes('Modify(Name')")); assert!(session_runtime.contains("targetSession.views.size === 0")); assert!(session_runtime.contains("session.views.size === 0")); assert!(session_runtime.contains("targetSession.saving")); assert!(session_runtime.contains("lastSelfSaveSignalAt")); - assert!(DOCUMENT_EDITOR_ADAPTER_RUNTIME_JS - .contains("clearSessionConflictSurface(view.session);")); + assert!( + DOCUMENT_EDITOR_ADAPTER_RUNTIME_JS + .contains("clearSessionConflictSurface(view.session);") + ); assert!(session_runtime.contains("command: 'replaceContent'")); assert!(session_runtime.contains("external-change-conflict")); assert!(session_runtime.contains("mnote-editor-conflict-panel")); @@ -2826,8 +3840,10 @@ mod tests { assert!(session_runtime.contains("mnote-conflict-open-diff")); assert!(session_runtime.contains("mnote-conflict-merge-text")); assert!(session_runtime.contains("mnote-conflict-merge-save")); - assert!(session_runtime - .contains("runtime.mountSessionConflictPanel(view.runtimeDescriptor.root, panel)")); + assert!( + session_runtime + .contains("runtime.mountSessionConflictPanel(view.runtimeDescriptor.root, panel)") + ); assert!(session_runtime.contains("agent run")); assert!(!session_runtime.contains( "setInterval(() => {\n void pollLocalMarkdownExternalChange();\n }, 1200);" @@ -2838,45 +3854,67 @@ mod tests { fn document_conflict_panel_runtime_contains_dom_helpers() { const DOCUMENT_CONFLICT_PANEL_RUNTIME_JS: &str = include_str!("../../browser/document-conflict-panel-runtime.js"); - assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS.contains("function clearSessionConflictSurface")); + assert!( + DOCUMENT_CONFLICT_PANEL_RUNTIME_JS.contains("function clearSessionConflictSurface") + ); assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS.contains("function createSessionConflictPanel")); - assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS - .contains("data-testid', 'mnote-editor-conflict-panel")); - assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS - .contains("data-testid', 'mnote-conflict-accept-disk")); + assert!( + DOCUMENT_CONFLICT_PANEL_RUNTIME_JS + .contains("data-testid', 'mnote-editor-conflict-panel") + ); + assert!( + DOCUMENT_CONFLICT_PANEL_RUNTIME_JS + .contains("data-testid', 'mnote-conflict-accept-disk") + ); assert!( DOCUMENT_CONFLICT_PANEL_RUNTIME_JS.contains("data-testid', 'mnote-conflict-open-diff") ); assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS.contains("onAcceptDisk")); assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS.contains("onKeepCurrent")); assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS.contains("onOpenDiff")); - assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS - .contains("function populateSessionConflictDiffPanel")); - assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS - .contains("data-testid', 'mnote-conflict-current-text")); + assert!( + DOCUMENT_CONFLICT_PANEL_RUNTIME_JS + .contains("function populateSessionConflictDiffPanel") + ); + assert!( + DOCUMENT_CONFLICT_PANEL_RUNTIME_JS + .contains("data-testid', 'mnote-conflict-current-text") + ); assert!( DOCUMENT_CONFLICT_PANEL_RUNTIME_JS.contains("data-testid', 'mnote-conflict-disk-text") ); - assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS - .contains("data-testid', 'mnote-conflict-merge-use-current")); - assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS - .contains("data-testid', 'mnote-conflict-merge-use-disk")); + assert!( + DOCUMENT_CONFLICT_PANEL_RUNTIME_JS + .contains("data-testid', 'mnote-conflict-merge-use-current") + ); + assert!( + DOCUMENT_CONFLICT_PANEL_RUNTIME_JS + .contains("data-testid', 'mnote-conflict-merge-use-disk") + ); assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS.contains("currentMergeText")); assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS.contains("onUseCurrent")); assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS.contains("onUseDisk")); assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS.contains("onSaveMerge")); assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS.contains("function mountSessionConflictPanel")); - assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS - .contains("runSessionConflictAction: runSessionConflictAction")); + assert!( + DOCUMENT_CONFLICT_PANEL_RUNTIME_JS + .contains("runSessionConflictAction: runSessionConflictAction") + ); assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS.contains("function runSessionConflictAction")); assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS.contains("function acceptDiskVersion")); assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS.contains("function keepCurrentEditorVersion")); assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS.contains("function writeMergedConflictResult")); - assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS.contains("acceptDiskVersion: acceptDiskVersion")); - assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS - .contains("keepCurrentEditorVersion: keepCurrentEditorVersion")); - assert!(DOCUMENT_CONFLICT_PANEL_RUNTIME_JS - .contains("writeMergedConflictResult: writeMergedConflictResult")); + assert!( + DOCUMENT_CONFLICT_PANEL_RUNTIME_JS.contains("acceptDiskVersion: acceptDiskVersion") + ); + assert!( + DOCUMENT_CONFLICT_PANEL_RUNTIME_JS + .contains("keepCurrentEditorVersion: keepCurrentEditorVersion") + ); + assert!( + DOCUMENT_CONFLICT_PANEL_RUNTIME_JS + .contains("writeMergedConflictResult: writeMergedConflictResult") + ); } #[test] @@ -2899,8 +3937,10 @@ mod tests { assert!(DOCUMENT_SESSION_RUNTIME_JS.contains("getOrCreateDocumentSession")); assert!(DOCUMENT_SESSION_RUNTIME_JS.contains("persistSession")); assert!(DOCUMENT_EDITOR_ADAPTER_RUNTIME_JS.contains("document.createElement('script')")); - assert!(DOCUMENT_EDITOR_ADAPTER_RUNTIME_JS - .contains("syncPageAggregateScript({ pageAggregateScriptId")); + assert!( + DOCUMENT_EDITOR_ADAPTER_RUNTIME_JS + .contains("syncPageAggregateScript({ pageAggregateScriptId") + ); assert!( DOCUMENT_EDITOR_ADAPTER_RUNTIME_JS.contains("data-mnote-page-options-local-write-at") ); @@ -2915,8 +3955,10 @@ mod tests { DOCUMENT_EDITOR_ADAPTER_RUNTIME_JS.contains("document-tiptap-conversion-runtime.js") ); assert!(DOCUMENT_EDITOR_ADAPTER_RUNTIME_JS.contains("enhanceEditorAttachmentLinksSoon")); - assert!(DOCUMENT_EDITOR_ADAPTER_RUNTIME_JS - .contains("window.__mnoteEnhanceEditorAttachmentLinks")); + assert!( + DOCUMENT_EDITOR_ADAPTER_RUNTIME_JS + .contains("window.__mnoteEnhanceEditorAttachmentLinks") + ); assert!(DOCUMENT_TIPTAP_CONVERSION_RUNTIME_JS.contains("legacyInlineContentToTiptap")); assert!(DOCUMENT_EDITOR_ADAPTER_RUNTIME_JS.contains("openSecondaryDocument")); assert!(DOCUMENT_EDITOR_ADAPTER_RUNTIME_JS.contains("openPrimaryMindmap")); @@ -3079,8 +4121,10 @@ mod tests { assert!(runtime.contains("typeof payload.text === 'string'")); assert!(runtime.contains("payload.type === 'hard_break'")); assert!(runtime.contains("typeof body?.fileVersion === 'string'")); - assert!(DOCUMENT_SESSION_RUNTIME_JS - .contains("expectedFileVersion: session.conflictDetectionKey")); + assert!( + DOCUMENT_SESSION_RUNTIME_JS + .contains("expectedFileVersion: session.conflictDetectionKey") + ); assert!(runtime.contains("node?.attrs?.mnoteBlockType === 'mindmap'")); assert!(runtime.contains("blockType: 'mindmap'")); assert!(runtime.contains("...mindmapPropsFromAttrs(node?.attrs, blockId)")); diff --git a/rust/crates/mnote-web/src/routes/ws.rs b/rust/crates/mnote-web/src/routes/ws.rs index 922f3719..070e976c 100644 --- a/rust/crates/mnote-web/src/routes/ws.rs +++ b/rust/crates/mnote-web/src/routes/ws.rs @@ -2,13 +2,13 @@ use crate::app::AppState; use crate::context::RequestContext; use crate::error::WebError; use crate::routes::stream_support::{ - build_stream_push_delta_hint, load_stream_snapshot, StreamSnapshotQuery, + StreamSnapshotQuery, build_stream_push_delta_hint, load_stream_snapshot, }; use axum::extract::ws::{Message, WebSocket, WebSocketUpgrade}; use axum::extract::{Extension, Query, State}; use axum::response::Response; use futures_util::StreamExt; -use serde_json::{json, Value}; +use serde_json::{Value, json}; use tokio::sync::broadcast::error::RecvError; pub async fn socket( diff --git a/rust/crates/mnote-web/src/ssr/pages/home.rs b/rust/crates/mnote-web/src/ssr/pages/home.rs index 1cdfb2e6..392641f9 100644 --- a/rust/crates/mnote-web/src/ssr/pages/home.rs +++ b/rust/crates/mnote-web/src/ssr/pages/home.rs @@ -27,6 +27,9 @@ pub fn HomePage( /// 当前选中的页面标题（可选） #[prop(optional)] active_page_title: Option, + /// 导航页主体 HTML（可选） + #[prop(optional)] + navigation_html: String, /// 是否显示管理员授权入口 #[prop(optional)] show_admin_access_policy: bool, @@ -37,6 +40,9 @@ pub fn HomePage( .filter(|value| !value.is_empty()) .unwrap_or_else(|| "个人".to_string()); let has_active_page = !active_page_id.trim().is_empty(); + let navigation_html = Some(navigation_html) + .map(|value| value.trim().to_string()) + .filter(|value| !value.is_empty()); let workspace_id = workspace_id .map(|value| value.trim().to_string()) .filter(|value| !value.is_empty()); @@ -63,6 +69,57 @@ pub fn HomePage( }.into_any() + } else if let Some(navigation_html) = navigation_html.clone() { + view! { +
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+ }.into_any() } else { let empty_primary_model = DocumentPaneViewModel { pane_role: "primary", diff --git a/rust/crates/mnote-web/src/ssr/pages/layout.rs b/rust/crates/mnote-web/src/ssr/pages/layout.rs index 6a95541a..5252a314 100644 --- a/rust/crates/mnote-web/src/ssr/pages/layout.rs +++ b/rust/crates/mnote-web/src/ssr/pages/layout.rs @@ -94,7 +94,7 @@ pub fn PageLayout( let tree_live_bootstrap = serde_json::json!({ "schema": "mnote.tree_live_bootstrap.v1", "disabled": !enable_tree_live, - "transport": if enable_tree_live { "convex-command-log-ws" } else { "disabled" }, + "transport": if enable_tree_live { "tree-live-ws" } else { "disabled" }, "workspaceId": null, "rootIds": [], "initialRevision": null, @@ -356,15 +356,18 @@ mod tests { assert!(SIDEBAR_TREE_LIVE_APPLY_RUNTIME_JS .contains("mnote.sidebarTreeViewState.v1:{userId}:{workspaceId}:{sourceKind}:{treeKind}:{rootUriHash}:{scopeHash}")); - let render_page_rows = js_function_body(SIDEBAR_TREE_LIVE_APPLY_RUNTIME_JS, "renderPageRows"); + let render_page_rows = + js_function_body(SIDEBAR_TREE_LIVE_APPLY_RUNTIME_JS, "renderPageRows"); assert!(render_page_rows.contains("sidebarTreeViewStateFor('pagetree'")); assert!(render_page_rows.contains("expandedIds")); assert!( - !render_page_rows.contains("var expanded = expandable && item.expandedByDefault !== false"), + !render_page_rows + .contains("var expanded = expandable && item.expandedByDefault !== false"), "PageTree 不能只依赖 projection expandedByDefault 决定展开" ); - let render_file_rows = js_function_body(SIDEBAR_TREE_LIVE_APPLY_RUNTIME_JS, "renderFileRows"); + let render_file_rows = + js_function_body(SIDEBAR_TREE_LIVE_APPLY_RUNTIME_JS, "renderFileRows"); assert!(render_file_rows.contains("sidebarTreeViewStateFor('filetree'")); assert!(render_file_rows.contains("expandedRelativePaths")); } @@ -387,6 +390,11 @@ mod tests { assert!(SIDEBAR_TREE_RUNTIME_JS.contains("/api/sidebar/shortcuts")); assert!(SIDEBAR_TREE_RUNTIME_JS.contains("toggle-sidebar-shortcut")); assert!(SIDEBAR_TREE_RUNTIME_JS.contains("openStarredFolderShortcut")); + assert!(SIDEBAR_TREE_RUNTIME_JS.contains("function openNavigationPageForFolder")); + assert!(SIDEBAR_TREE_RUNTIME_JS.contains("/api/navigation/recent")); + assert!(!SIDEBAR_TREE_RUNTIME_JS.contains("authRedirectUrl")); + assert!(!SIDEBAR_TREE_RUNTIME_JS.contains("window.location.assign(authRedirectUrl())")); + assert!(SIDEBAR_TREE_RUNTIME_JS.contains("window.location.assign(url)")); assert!(SIDEBAR_TREE_RUNTIME_JS.contains("rootUri: currentRootUri()")); assert!(SIDEBAR_TREE_RUNTIME_JS.contains("var rootUri = readShortcutRootUri(row);")); assert!(!SIDEBAR_TREE_RUNTIME_JS.contains("inferLocalRootUriFromWorkspaceId")); @@ -414,6 +422,18 @@ mod tests { ); } + #[test] + fn sidebar_filetree_folder_click_toggles_instead_of_navigation_page() { + let folder_branch = SIDEBAR_TREE_RUNTIME_JS + .split("if (fileAction === 'open' && rowKind === 'folder') {") + .nth(1) + .and_then(|rest| rest.split("return;").next()) + .expect("filetree folder open branch exists"); + assert!(folder_branch.contains("toggleChildren(fileRow")); + assert!(!folder_branch.contains("openNavigationPageForFolder")); + assert!(!folder_branch.contains("window.location.assign")); + } + #[test] fn page_ai_context_uses_page_aggregate_subtree_as_single_truth() { assert!( @@ -655,6 +675,10 @@ mod tests { injection.contains("closestAction"), "attachment open runtime 需要显式注入 closestAction，避免首屏点击监听安装时 ReferenceError" ); + assert!( + injection.contains("hydrateEditorAttachmentMeta"), + "attachment open runtime 需要显式注入 hydrateEditorAttachmentMeta，避免上传附件增强时 ReferenceError" + ); assert!( SIDEBAR_ATTACHMENT_OPEN_RUNTIME_JS .contains("closestAction = typeof injectedClosestAction === 'function'") @@ -1412,9 +1436,16 @@ mod tests { #[test] fn sidebar_filetree_context_evaluator_uses_readonly_and_selection_count_for_delete_key() { assert!( - SIDEBAR_TREE_RUNTIME_JS - .contains("evaluateSidebarFileTreeWhen(delCtx, '!workspace.readonly')"), - "Delete/Backspace 快捷键应至少评估 workspace.readonly 上下文" + SIDEBAR_TREE_RUNTIME_JS.contains( + "evaluateSidebarFileTreeWhen(delCtx, '!workspace.readonly && !editor.dirty')" + ), + "Delete/Backspace 快捷键应评估 workspace.readonly 与 editor.dirty 上下文" + ); + assert!( + SIDEBAR_TREE_RUNTIME_JS.contains( + "evaluateSidebarFileTreeWhen(renameCtx, '!workspace.readonly && !editor.dirty')" + ), + "F2 快捷键应与菜单重命名共用 command context" ); } @@ -1435,6 +1466,12 @@ mod tests { assert!(table_loop.contains("/api/tables/")); } + #[test] + fn sidebar_filetree_runtime_does_not_keep_retired_table_engine_branches() { + let retired_table_engine = ["lucky", "sheet"].concat(); + assert!(!SIDEBAR_FILETREE_COMMAND_RUNTIME_JS.contains(&retired_table_engine)); + } + #[test] fn sidebar_filetree_asset_open_uses_owner_document_id() { assert!( @@ -1520,6 +1557,18 @@ mod tests { #[test] fn sidebar_tree_runtime_opens_pdf_and_code_assets_with_builtin_tools() { assert!(SIDEBAR_ATTACHMENT_OPEN_RUNTIME_JS.contains("function openPdfEditorAttachment")); + assert!(SIDEBAR_FILETREE_OPEN_RUNTIME_JS.contains("function buildPdfPreviewOpenUrl")); + assert!(SIDEBAR_ATTACHMENT_OPEN_RUNTIME_JS.contains("buildPdfPreviewOpenUrl")); + assert!(SIDEBAR_FILETREE_OPEN_RUNTIME_JS + .contains("var localOpenUrl = isPdfAttachmentFileName(localFileName) ? buildPdfPreviewOpenUrl(localFileUrl, localFileName) : localFileUrl;")); + let open_pdf_body = js_function_body( + SIDEBAR_ATTACHMENT_OPEN_RUNTIME_JS, + "openPdfEditorAttachment", + ); + assert!(open_pdf_body.contains("buildPdfPreviewOpenUrl(resolved.url, title)")); + assert!( + !open_pdf_body.contains("window.open(resolved.url, '_blank', 'noopener,noreferrer');") + ); assert!(SIDEBAR_ATTACHMENT_OPEN_RUNTIME_JS.contains("function openCodeEditorAttachment")); assert!(SIDEBAR_ATTACHMENT_OPEN_RUNTIME_JS.contains("function resolveEditorAttachmentUrl")); assert!(SIDEBAR_ATTACHMENT_OPEN_RUNTIME_JS @@ -1553,8 +1602,8 @@ mod tests { #[test] fn tree_live_controller_marks_transport_and_closes_source_on_pagehide() { - assert!(TREE_LIVE_CONTROLLER_JS.contains("convex-command-log-sse")); - assert!(TREE_LIVE_CONTROLLER_JS.contains("convex-command-log-ws")); + assert!(TREE_LIVE_CONTROLLER_JS.contains("tree-live-sse")); + assert!(TREE_LIVE_CONTROLLER_JS.contains("tree-live-ws")); assert!(TREE_LIVE_CONTROLLER_JS.contains("new WebSocket(url.toString())")); assert!(TREE_LIVE_CONTROLLER_JS.contains("startWithSseFallback")); assert!(TREE_LIVE_CONTROLLER_JS.contains("data-mnote-tree-live-transport")); diff --git a/rust/crates/mnote-web/src/ssr/styles.rs b/rust/crates/mnote-web/src/ssr/styles.rs index 6e04c057..cf17589c 100644 --- a/rust/crates/mnote-web/src/ssr/styles.rs +++ b/rust/crates/mnote-web/src/ssr/styles.rs @@ -1651,8 +1651,8 @@ body { .sidebar-tree .tree-row[data-active="true"], .sidebar-tree .tree-row[data-selected="true"] { - background: rgba(255, 71, 71, 0.1); - color: #E0525B; + background: rgba(55, 53, 47, 0.08); + color: #2D2E2E; } .sidebar-tree .tree-row[data-drop-feedback="true"], @@ -1676,26 +1676,30 @@ body { align-items: center; justify-content: center; line-height: 1; + font-size: 0; } .sidebar-tree .tree-toggle:hover { background: rgba(27, 28, 28, 0.06); } -.sidebar-tree .tree-toggle-icon { - width: 20px; - height: 20px; +.sidebar-tree .tree-toggle::before { + content: ""; + width: 0; + height: 0; + border-top: 4px solid transparent; + border-bottom: 4px solid transparent; + border-left: 5px solid currentColor; display: block; - fill: #878787; transform-origin: 50% 50%; } -.sidebar-tree .tree-toggle[aria-expanded="true"] .tree-toggle-icon { +.sidebar-tree .tree-row[aria-expanded="true"] > .tree-toggle::before { transform: rotate(90deg); } -.sidebar-tree .tree-row[data-active="true"] .tree-toggle-icon { - fill: #CF5659; +.sidebar-tree .tree-row[data-active="true"] .tree-toggle { + color: #8F8A84; } .sidebar-tree:not([data-tree-shell-mode="filetree"]) .tree-kind-badge[data-kind="page"] { @@ -1703,58 +1707,137 @@ body { } .sidebar-tree .tree-kind-badge { + --mnote-filetree-icon-file: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath d='M3 2h7l3 3v9H3zM10 2v3h3' fill='none' stroke='black' stroke-width='1.4'/%3E%3C/svg%3E"); + --mnote-filetree-icon-folder: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath d='M1 4h5l1 2h8v8H1z' fill='none' stroke='black' stroke-width='1.4'/%3E%3C/svg%3E"); + --mnote-filetree-icon-markdown: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath d='M4 2h5l3 3v9H4zM9 2v3h3M6 8h4M6 10h4M6 12h2' fill='none' stroke='black' stroke-width='1.35'/%3E%3C/svg%3E"); + --mnote-filetree-icon-table: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath d='M1.5 2.5h13v11h-13zM1.5 6h13M1.5 9.5h13M6 2.5v11m4-11v11' fill='none' stroke='black' stroke-width='1.4'/%3E%3C/svg%3E"); + --mnote-filetree-icon-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath d='M1.5 3h13v10h-13zM3 11l3-3 2 2 2-2 3 3M5 6h.1' fill='none' stroke='black' stroke-width='1.4'/%3E%3C/svg%3E"); + --mnote-filetree-icon-mindmap: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath d='M3 4h3v3H3zM10 2h3v3h-3zM10 11h3v3h-3zM6 6l4-2M6 6l4 6' fill='none' stroke='black' stroke-width='1.4'/%3E%3C/svg%3E"); + --mnote-filetree-icon-pdf: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath d='M3 2h7l3 3v9H3zM4.5 9h7M4.5 11h7M10 2v3h3' fill='none' stroke='black' stroke-width='1.4'/%3E%3C/svg%3E"); + --mnote-filetree-icon-word: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath d='M3 2h10v12H3zM5 5h6M5 8h6M5 11h4' fill='none' stroke='black' stroke-width='1.4'/%3E%3C/svg%3E"); + --mnote-filetree-icon-ppt: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath d='M2 3h12v8H2zM5 14h6M8 11v3M5 6h6M5 8h4' fill='none' stroke='black' stroke-width='1.4'/%3E%3C/svg%3E"); + --mnote-filetree-icon-sheet: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath d='M2 2h12v12H2zM2 6h12M2 10h12M6 2v12m4-12v12' fill='none' stroke='black' stroke-width='1.4'/%3E%3C/svg%3E"); + --mnote-filetree-icon-code: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath d='M5 5 2 8l3 3V9H4V7h1zm6 0v2h1v2h-1v2l3-3zm-2-2H7L5 13h2z'/%3E%3C/svg%3E"); + --mnote-filetree-icon-web: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M2 3h12v10H2zm1 3v6h10V6zm0-2v1h10V4z'/%3E%3C/svg%3E"); + --mnote-filetree-icon-config: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 16 16'%3E%3Cpath d='M3 4h10v2H3zm0 3h10v2H3zm0 3h10v2H3zM5 3h2v4H5zm4 3h2v4H9z'/%3E%3C/svg%3E"); + --mnote-filetree-icon-office: var(--mnote-filetree-icon-word); + --mnote-filetree-icon-mask: var(--mnote-filetree-icon-file); width: 20px; height: 20px; display: inline-flex; align-items: center; justify-content: center; flex: 0 0 20px; - color: #111111; - font-size: 15px; + color: #9A958F; overflow: hidden; } .sidebar-tree .tree-kind-badge::before { - content: "□"; - font-family: var(--wolai-font-sans); - font-size: 18px; - line-height: 1; + content: ""; + width: 14px; + height: 14px; + display: block; + background: currentColor; + -webkit-mask: var(--mnote-filetree-icon-mask) center / contain no-repeat; + mask: var(--mnote-filetree-icon-mask) center / contain no-repeat; } .sidebar-tree .tree-kind-badge[data-kind="page"]::before { - content: ""; + --mnote-filetree-icon-mask: var(--mnote-filetree-icon-file); } .sidebar-tree[data-tree-shell-mode="filetree"] .tree-kind-badge[data-kind="page"]::before, .sidebar-tree .tree-kind-badge[data-kind="document"]::before { - content: "◇"; + --mnote-filetree-icon-mask: var(--mnote-filetree-icon-file); } -.sidebar-tree .tree-kind-badge[data-kind="index"]::before { - content: "▤"; - color: var(--atelier-secondary); +.sidebar-tree .tree-kind-badge[data-kind="index"]::before, +.sidebar-tree .tree-kind-badge[data-kind="markdown"]::before { + --mnote-filetree-icon-mask: var(--mnote-filetree-icon-markdown); } +.sidebar-tree .tree-kind-badge[data-kind="index"], +.sidebar-tree .tree-kind-badge[data-kind="markdown"], +.sidebar-tree .tree-kind-badge[data-kind="code"] { + color: #111111; +} + +.sidebar-tree .tree-kind-badge[data-kind="code"]::before { --mnote-filetree-icon-mask: var(--mnote-filetree-icon-code); } +.sidebar-tree .tree-kind-badge[data-kind="web"]::before { --mnote-filetree-icon-mask: var(--mnote-filetree-icon-web); } +.sidebar-tree .tree-kind-badge[data-kind="config"]::before { --mnote-filetree-icon-mask: var(--mnote-filetree-icon-config); } + .sidebar-tree .tree-kind-badge[data-kind="folder"]::before, .sidebar-tree .tree-kind-badge[data-kind="asset_folder"]::before { - content: "▱"; - color: #D08A1F; + --mnote-filetree-icon-mask: var(--mnote-filetree-icon-folder); +} + +.sidebar-tree .tree-kind-badge[data-kind="folder"], +.sidebar-tree .tree-kind-badge[data-kind="asset_folder"] { + color: #B8751A; +} + +.sidebar-tree .tree-kind-badge[data-kind="image"] { + color: #5B6CF0; } .sidebar-tree .tree-kind-badge[data-kind="image"]::before { - content: "▧"; - color: #5B7CFA; + --mnote-filetree-icon-mask: var(--mnote-filetree-icon-image); +} + +.sidebar-tree .tree-kind-badge[data-kind="mindmap"] { + color: #4F8F68; } .sidebar-tree .tree-kind-badge[data-kind="mindmap"]::before { - content: "⌘"; - color: #31AA4D; + --mnote-filetree-icon-mask: var(--mnote-filetree-icon-mindmap); } -.sidebar-tree .tree-kind-badge[data-kind="table"]::before, -.sidebar-tree .tree-kind-badge[data-kind="luckysheet"]::before { - content: "▦"; - color: #2367F6; +.sidebar-tree .tree-kind-badge[data-kind="pdf"]::before { + --mnote-filetree-icon-mask: var(--mnote-filetree-icon-pdf); +} + +.sidebar-tree .tree-kind-badge[data-kind="pdf"] { + color: #E74C3C; +} + +.sidebar-tree .tree-kind-badge[data-kind="office"]::before, +.sidebar-tree .tree-kind-badge[data-kind="onlyoffice"]::before, +.sidebar-tree .tree-kind-badge[data-kind="word"]::before { + --mnote-filetree-icon-mask: var(--mnote-filetree-icon-word); +} + +.sidebar-tree .tree-kind-badge[data-kind="ppt"]::before, +.sidebar-tree .tree-kind-badge[data-kind="presentation"]::before { + --mnote-filetree-icon-mask: var(--mnote-filetree-icon-ppt); +} + +.sidebar-tree .tree-kind-badge[data-kind="sheet"]::before { + --mnote-filetree-icon-mask: var(--mnote-filetree-icon-sheet); +} + +.sidebar-tree .tree-kind-badge[data-kind="office"], +.sidebar-tree .tree-kind-badge[data-kind="onlyoffice"], +.sidebar-tree .tree-kind-badge[data-kind="web"], +.sidebar-tree .tree-kind-badge[data-kind="word"] { + color: #4F7DF3; +} + +.sidebar-tree .tree-kind-badge[data-kind="ppt"], +.sidebar-tree .tree-kind-badge[data-kind="presentation"] { + color: #D94841; +} + +.sidebar-tree .tree-kind-badge[data-kind="sheet"] { + color: #2F9E44; +} + +.sidebar-tree .tree-kind-badge[data-kind="table"]::before { + --mnote-filetree-icon-mask: var(--mnote-filetree-icon-table); +} + +.sidebar-tree .tree-kind-badge[data-kind="table"], +.sidebar-tree .tree-kind-badge[data-kind="config"] { + color: #5572A2; } .sidebar-tree .tree-link { @@ -2357,6 +2440,93 @@ body { grid-template-columns: minmax(0, 1fr) var(--mnote-secondary-pane-resizer-width) var(--mnote-secondary-pane-width); } +.mnote-navigation-page-host { + width: 100%; + height: 100%; + min-width: 0; + min-height: 0; + overflow: auto; + background: var(--wolai-bg-main); +} + +.mnote-navigation-page { + width: min(960px, calc(100% - 64px)); + margin: 0 auto; + padding: 56px 0 96px; +} + +.mnote-navigation-page__header { + margin-bottom: 28px; +} + +.mnote-navigation-page__header h1 { + margin: 0; + font-size: 28px; + font-weight: 650; + line-height: 1.25; + color: var(--wolai-text-primary); +} + +.mnote-navigation-page__header p { + margin: 8px 0 0; + color: var(--wolai-text-secondary); + font-size: 13px; + line-height: 1.5; + overflow-wrap: anywhere; +} + +.mnote-navigation-page__section { + margin-top: 24px; +} + +.mnote-navigation-page__notice { + margin: 0 0 20px; + padding: 10px 12px; + border: 1px solid rgba(210, 180, 90, 0.42); + border-radius: 6px; + background: rgba(255, 247, 221, 0.72); + color: var(--wolai-text-primary); + font-size: 13px; + line-height: 1.5; +} + +.mnote-navigation-page__notice span { + display: block; + margin-top: 4px; + color: var(--wolai-text-secondary); + overflow-wrap: anywhere; +} + +.mnote-navigation-page__section h2 { + margin: 0 0 10px; + font-size: 13px; + font-weight: 650; + color: var(--wolai-text-secondary); +} + +.mnote-navigation-page__section p { + margin: 0; + color: var(--wolai-text-secondary); + font-size: 13px; +} + +.mnote-navigation-page__item { + display: flex; + align-items: center; + min-height: 34px; + padding: 6px 8px; + border-radius: 6px; + color: var(--wolai-text-primary); + font-size: 14px; + line-height: 1.4; + text-decoration: none; + overflow-wrap: anywhere; +} + +.mnote-navigation-page__item:hover { + background: var(--wolai-bg-sidebar); +} + .document-main-editor-group { min-width: 0; min-height: 0; @@ -4236,6 +4406,20 @@ button.wolai-page-ai-message-text { background: #FFF; } +.wolai-page-ai-agent-selector, +.wolai-page-ai-context-refs, +.wolai-page-ai-allowed-roots { + display: flex; + flex-wrap: wrap; + align-items: center; + gap: 6px; + padding: 6px 8px 0; +} + +.wolai-page-ai-allowed-roots { + padding-top: 4px; +} + .wolai-page-ai-composer:focus-within { border-color: rgba(27, 28, 28, 0.32); } @@ -4515,11 +4699,62 @@ mod tests { assert!(MNOTE_CSS.contains(".mnote-tree-context-menu")); } + #[test] + fn sidebar_filetree_icons_use_css_masks_instead_of_text_glyphs() { + assert!(MNOTE_CSS.contains("--mnote-filetree-icon-file")); + assert!(MNOTE_CSS.contains("--mnote-filetree-icon-folder")); + assert!(MNOTE_CSS.contains("--mnote-filetree-icon-markdown")); + assert!(MNOTE_CSS.contains("--mnote-filetree-icon-table")); + assert!(MNOTE_CSS.contains("--mnote-filetree-icon-image")); + assert!(MNOTE_CSS.contains("--mnote-filetree-icon-mindmap")); + assert!(MNOTE_CSS.contains("--mnote-filetree-icon-pdf")); + assert!(MNOTE_CSS.contains("--mnote-filetree-icon-office")); + assert!(MNOTE_CSS.contains("--mnote-filetree-icon-word")); + assert!(MNOTE_CSS.contains("--mnote-filetree-icon-ppt")); + assert!(MNOTE_CSS.contains("--mnote-filetree-icon-sheet")); + assert!(MNOTE_CSS.contains("--mnote-filetree-icon-code")); + assert!(MNOTE_CSS.contains("--mnote-filetree-icon-web")); + assert!(MNOTE_CSS.contains("--mnote-filetree-icon-config")); + assert!(MNOTE_CSS.contains("xmlns='http://www.w3.org/2000/svg'")); + assert!( + MNOTE_CSS.contains("mask: var(--mnote-filetree-icon-mask) center / contain no-repeat") + ); + assert!( + MNOTE_CSS.contains("--mnote-filetree-icon-mask: var(--mnote-filetree-icon-folder);") + ); + assert!( + MNOTE_CSS.contains("--mnote-filetree-icon-mask: var(--mnote-filetree-icon-markdown);") + ); + assert!(MNOTE_CSS.contains("--mnote-filetree-icon-mask: var(--mnote-filetree-icon-table);")); + assert!(MNOTE_CSS.contains("--mnote-filetree-icon-mask: var(--mnote-filetree-icon-image);")); + assert!( + MNOTE_CSS.contains("--mnote-filetree-icon-mask: var(--mnote-filetree-icon-mindmap);") + ); + assert!(MNOTE_CSS.contains("--mnote-filetree-icon-mask: var(--mnote-filetree-icon-pdf);")); + assert!(MNOTE_CSS.contains("--mnote-filetree-icon-mask: var(--mnote-filetree-icon-word);")); + assert!(MNOTE_CSS.contains("--mnote-filetree-icon-mask: var(--mnote-filetree-icon-ppt);")); + assert!(MNOTE_CSS.contains("--mnote-filetree-icon-mask: var(--mnote-filetree-icon-sheet);")); + assert!(MNOTE_CSS.contains("--mnote-filetree-icon-mask: var(--mnote-filetree-icon-code);")); + assert!(MNOTE_CSS.contains("--mnote-filetree-icon-mask: var(--mnote-filetree-icon-web);")); + assert!( + MNOTE_CSS.contains("--mnote-filetree-icon-mask: var(--mnote-filetree-icon-config);") + ); + let retired_table_engine = ["lucky", "sheet"].concat(); + assert!(!MNOTE_CSS.contains(&retired_table_engine)); + assert!(MNOTE_CSS.contains("color: #4F7DF3;")); + assert!(MNOTE_CSS.contains("color: #D94841;")); + assert!(MNOTE_CSS.contains("color: #2F9E44;")); + assert!(MNOTE_CSS.contains("color: #E74C3C;")); + assert!(!MNOTE_CSS.contains( + "font-family: var(--wolai-font-sans);\n font-size: 18px;\n line-height: 1;\n}" + )); + } + #[test] fn mnote_css_is_reasonably_sized() { // 至少 2000 字符才能包含完整样式 assert!(MNOTE_CSS.len() > 2000); - // 当前整合了工作区壳、编辑器样式、树菜单、页面 AI、账号弹窗与授权管理控制面，仍保持在单文件可审阅范围内。 - assert!(MNOTE_CSS.len() < 110000); + // 当前整合了工作区壳、编辑器样式、树菜单、文件树图标、页面 AI、账号弹窗与授权管理控制面，仍保持在单文件可审阅范围内。 + assert!(MNOTE_CSS.len() < 114000); } } diff --git a/rust/crates/mnote-web/src/transport/convex.rs b/rust/crates/mnote-web/src/transport/convex.rs index 55e2d0b3..7d566e52 100644 --- a/rust/crates/mnote-web/src/transport/convex.rs +++ b/rust/crates/mnote-web/src/transport/convex.rs @@ -1,209 +1,26 @@ use crate::app::AppConfig; use crate::context::RequestContext; use crate::error::WebError; -use base64::Engine; use bridge_runtime::{ - build_runtime_command_artifact_plan, RuntimeBridgeContextWire, RuntimeCommandArtifactPlan, - RuntimeCommandEnvelopeWire, RuntimeCommandExecutionPlan, RuntimeQueryExecutionPlan, + RuntimeCommandArtifactPlan, RuntimeCommandExecutionPlan, RuntimeQueryExecutionPlan, }; -use serde_json::{json, Value}; -use std::fs; -use std::sync::OnceLock; -use std::time::Duration; -use time::{format_description::well_known::Rfc3339, OffsetDateTime}; +use serde_json::Value; -const HEADER_REQUEST_ID: &str = "x-request-id"; -const HEADER_TRACE_ID: &str = "x-trace-id"; -const HEADER_WORKSPACE_ID: &str = "x-mnote-workspace-id"; -const HEADER_SOURCE_CHANNEL: &str = "x-mnote-source-channel"; -const HEADER_SOURCE_CLIENT: &str = "x-mnote-source-client"; -const HEADER_IDEMPOTENCY_KEY: &str = "x-idempotency-key"; -const COOKIE_MNOTE_WEB_CONVEX_TOKEN: &str = "mnote_web_convex_token"; -const COOKIE_CONVEX_AUTH_JWT: &str = "__convexAuthJWT"; -static CONVEX_HTTP_CLIENT: OnceLock = OnceLock::new(); - -fn convex_http_client(context: &RequestContext) -> Result<&'static reqwest::Client, WebError> { - if let Some(client) = CONVEX_HTTP_CLIENT.get() { - return Ok(client); - } - - let client = reqwest::Client::builder() - .timeout(Duration::from_secs(20)) - .pool_max_idle_per_host(16) - .pool_idle_timeout(Duration::from_secs(30)) - .build() - .map_err(|error| { - WebError::internal(format!("Convex HTTP 客户端创建失败: {error}")) - .with_context(context) - .with_header("x-error-phase", "client_build") - .with_header("x-upstream-service", "convex") - })?; - let _ = CONVEX_HTTP_CLIENT.set(client); - CONVEX_HTTP_CLIENT.get().ok_or_else(|| { - WebError::internal("Convex HTTP 客户端初始化失败") - .with_context(context) - .with_header("x-error-phase", "client_build") - .with_header("x-upstream-service", "convex") - }) +#[derive(Debug)] +pub struct RetiredCloudCommandExecution { + pub result: Value, + pub artifacts: Option, + pub artifact_error: Option, } -fn read_env_or_dotenv(key: &str) -> Option { - if let Ok(value) = std::env::var(key) { - let trimmed = value.trim().trim_matches('"').to_string(); - if !trimmed.is_empty() { - return Some(trimmed); - } - } - - let root = std::path::Path::new(env!("CARGO_MANIFEST_DIR")) - .join("../../..") - .join(".env.all"); - let content = fs::read_to_string(root).ok()?; - for line in content.lines() { - let line = line.trim_end_matches('\r'); - if line.starts_with('#') || line.trim().is_empty() { - continue; - } - let Some((k, v)) = line.split_once('=') else { - continue; - }; - if k.trim() != key { - continue; - } - let trimmed = v.trim().trim_matches('"').to_string(); - if !trimmed.is_empty() { - return Some(trimmed); - } - } - None -} - -fn build_authorization(config: &AppConfig, context: &RequestContext) -> Result { - if let Some(authorization) = context - .auth - .authorization - .as_deref() - .map(str::trim) - .filter(|value| !value.is_empty()) - { - return Ok(authorization.to_string()); - } - - if let Some(convex_token) = extract_cookie_value(context, COOKIE_CONVEX_AUTH_JWT) { - return Ok(format!("Bearer {convex_token}")); - } - - if let Some(convex_token) = extract_cookie_value(context, COOKIE_MNOTE_WEB_CONVEX_TOKEN) { - return Ok(format!("Bearer {convex_token}")); - } - - let admin_key = config - .convex_admin_key - .clone() - .or_else(|| read_env_or_dotenv("CONVEX_SELF_HOSTED_ADMIN_KEY")) - .ok_or_else(|| { - WebError::service_unavailable_code( - "convex_config_missing", - "缺少 CONVEX_SELF_HOSTED_ADMIN_KEY，且请求未携带 Authorization", - ) - .with_context(context) - .with_header("x-error-phase", "convex_auth") - .with_header("x-upstream-service", "convex") - })?; - - let Some(identity_user) = fallback_acting_identity_user(config, context) else { - return Ok(format!("Convex {admin_key}")); - }; - - // 说明：Rust Web 直接调用 Convex HTTP API 时没有 Next/Convex Auth cookie。 - // 自托管开发态和 Hermes 委托 tool 调用都用 admin auth 携带 acting identity， - // 让 @convex-dev/auth 的 getAuthUserId(ctx) 得到实际执行用户。 - let identity = json!({ - "subject": format!("{}|{}", identity_user.user_id, identity_user.session_suffix), - "issuer": identity_user.issuer, - "name": identity_user.name, - "email": identity_user.email, - }); - let identity_encoded = - base64::engine::general_purpose::STANDARD.encode(identity.to_string().as_bytes()); - Ok(format!("Convex {admin_key}:{identity_encoded}")) -} - -// Convex 授权在 local-first 下只作为控制面身份委托； -// 本地 workspace 的正文、附件和 AI 会话全文不依赖这里获得写入真相。 -struct ActingIdentityUser { - user_id: String, - session_suffix: &'static str, - issuer: &'static str, - name: String, - email: String, -} - -fn fallback_acting_identity_user( - config: &AppConfig, - context: &RequestContext, -) -> Option { - let actor_id = context.auth.actor_id.trim(); - if !actor_id.is_empty() && actor_id != "anonymous" { - return Some(ActingIdentityUser { - user_id: actor_id.to_string(), - session_suffix: "mnote-web-delegated-session", - issuer: "mnote-web-delegated", - name: actor_id.to_string(), - email: String::new(), - }); - } - - let dev_user_id = config.dev_user_id.trim(); - if dev_user_id.is_empty() { - return None; - } - Some(ActingIdentityUser { - user_id: dev_user_id.to_string(), - session_suffix: "mnote-web-dev-session", - issuer: "mnote-web-dev", - name: config.dev_user_name.clone(), - email: config.dev_user_email.clone(), - }) -} - -fn extract_cookie_value(context: &RequestContext, name: &str) -> Option { - context - .auth - .cookie_header - .as_deref() - .and_then(|cookie_header| { - cookie_header.split(';').find_map(|segment| { - let (key, value) = segment.trim().split_once('=')?; - if key.trim() != name { - return None; - } - let trimmed = value.trim(); - if trimmed.is_empty() { - return None; - } - Some(trimmed.to_string()) - }) - }) -} - -fn convex_url(config: &AppConfig, context: &RequestContext) -> Result { - config - .convex_url - .clone() - .or_else(|| read_env_or_dotenv("CONVEX_SELF_HOSTED_URL")) - .or_else(|| read_env_or_dotenv("NEXT_PUBLIC_CONVEX_URL")) - .map(|value| value.trim().trim_end_matches('/').to_string()) - .filter(|value| !value.is_empty()) - .ok_or_else(|| { - WebError::service_unavailable_code( - "convex_config_missing", - "缺少 CONVEX_SELF_HOSTED_URL / NEXT_PUBLIC_CONVEX_URL", - ) - .with_context(context) - .with_header("x-error-phase", "convex_url") - .with_header("x-upstream-service", "convex") - }) +fn retired_error(context: &RequestContext, phase: &'static str) -> WebError { + WebError::service_unavailable_code( + "convex_retired", + "Convex 运行时已退役；请使用 local-first Rust/SQLite control-plane 路径", + ) + .with_context(context) + .with_header("x-error-phase", phase) + .with_header("x-upstream-service", "convex-retired") } fn load_query_fixture( @@ -235,14 +52,6 @@ fn load_query_fixture( .cloned()) } -fn load_mutation_fixture( - config: &AppConfig, - context: &RequestContext, - plan: &RuntimeCommandExecutionPlan, -) -> Result, WebError> { - load_mutation_fixture_by_name(config, context, plan.function_name.as_str()) -} - fn load_mutation_fixture_by_name( config: &AppConfig, context: &RequestContext, @@ -272,7 +81,15 @@ fn load_mutation_fixture_by_name( .cloned()) } -pub async fn execute_convex_query_plan( +fn load_mutation_fixture( + config: &AppConfig, + context: &RequestContext, + plan: &RuntimeCommandExecutionPlan, +) -> Result, WebError> { + load_mutation_fixture_by_name(config, context, plan.function_name.as_str()) +} + +pub async fn execute_retired_query_plan( config: &AppConfig, context: &RequestContext, plan: &RuntimeQueryExecutionPlan, @@ -290,94 +107,7 @@ pub async fn execute_convex_query_plan( return Ok(fixture); } - let payload = json!({ - "path": plan.function_name, - "format": "convex_encoded_json", - "args": plan.args_json, - }); - - let client = convex_http_client(context)?; - - let mut request = client - .post(format!("{}/api/query", convex_url(config, context)?)) - .header("Authorization", build_authorization(config, context)?) - .header("Content-Type", "application/json") - .header("Convex-Client", "mnote-web") - .header(HEADER_REQUEST_ID, &context.trace.request_id) - .header(HEADER_TRACE_ID, &context.trace.trace_id) - .header(HEADER_SOURCE_CHANNEL, context.source.channel.as_str()) - .header(HEADER_SOURCE_CLIENT, context.source.client.as_str()) - .json(&payload); - - if let Some(workspace_id) = plan - .workspace_id - .as_deref() - .or(context.workspace.workspace_id.as_deref()) - { - request = request.header(HEADER_WORKSPACE_ID, workspace_id); - } - - let response = request.send().await.map_err(|error| { - let base = if error.is_timeout() { - WebError::gateway_timeout_code("convex_timeout", format!("Convex query 超时: {error}")) - } else { - WebError::service_unavailable_code( - "convex_unavailable", - format!("Convex query 请求失败: {error}"), - ) - }; - base.with_context(context) - .with_header("x-error-phase", "query_send") - .with_header("x-upstream-service", "convex") - })?; - - let status = response.status(); - let body: Value = response.json().await.map_err(|error| { - WebError::bad_gateway_code( - "convex_bad_response", - format!("Convex 响应解析失败: {error}"), - ) - .with_context(context) - .with_header("x-error-phase", "query_decode") - .with_header("x-upstream-service", "convex") - .with_header("x-upstream-status", status.as_u16().to_string()) - })?; - if !status.is_success() { - let message = body - .get("errorMessage") - .and_then(Value::as_str) - .unwrap_or("Convex query 失败"); - return Err( - WebError::bad_gateway_code("convex_upstream_error", message.to_string()) - .with_context(context) - .with_header("x-error-phase", "query_status") - .with_header("x-upstream-service", "convex") - .with_header("x-upstream-status", status.as_u16().to_string()), - ); - } - - match body.get("status").and_then(Value::as_str) { - Some("success") => Ok(body.get("value").cloned().unwrap_or(Value::Null)), - Some("error") => Err(WebError::bad_gateway_code( - "convex_upstream_error", - body.get("errorMessage") - .and_then(Value::as_str) - .unwrap_or("Convex 返回 error") - .to_string(), - ) - .with_context(context) - .with_header("x-error-phase", "query_payload") - .with_header("x-upstream-service", "convex") - .with_header("x-upstream-status", status.as_u16().to_string())), - _ => Err(WebError::bad_gateway_code( - "convex_bad_response", - format!("未知 Convex 响应: {body}"), - ) - .with_context(context) - .with_header("x-error-phase", "query_payload") - .with_header("x-upstream-service", "convex") - .with_header("x-upstream-status", status.as_u16().to_string())), - } + Err(retired_error(context, "convex_query_retired")) } pub async fn execute_sidebar_dataset_query( @@ -385,12 +115,10 @@ pub async fn execute_sidebar_dataset_query( context: &RequestContext, plan: &RuntimeQueryExecutionPlan, ) -> Result { - // sidebar:datasetList 只保留为 cloud source / compat projection source； - // 默认 local-first 首屏应优先读取 LocalFS projection。 - execute_convex_query_plan(config, context, plan).await + execute_retired_query_plan(config, context, plan).await } -pub async fn execute_convex_query_by_name( +pub async fn execute_retired_query_by_name( config: &AppConfig, context: &RequestContext, function_name: &str, @@ -408,176 +136,12 @@ pub async fn execute_convex_query_by_name( payload_json: args.to_string(), args_json: args, }; - execute_convex_query_plan(config, context, &plan) + execute_retired_query_plan(config, context, &plan) .await .map_err(|error| error.with_header("x-error-phase", error_phase)) } -fn convex_command_args_for_plan(plan: &RuntimeCommandExecutionPlan) -> Value { - // 这里是 Rust command plan 到 legacy Convex validator 的兼容适配层。 - // documents:* 属于 compat / cloud source / sync replica，mediaAssets:* 属于 cloud resource replica。 - let mut args = plan.args_json.clone(); - if matches!( - plan.command_name.as_str(), - "tree.node.create" - | "tree.node.rename" - | "tree.node.archive" - | "tree.node.restore" - | "tree.node.purge" - | "tree.subtree.move" - | "documents.create" - | "documents.title.update" - | "documents.delete" - | "documents.restore" - | "documents.purge" - | "documents.move" - ) { - strip_tree_artifact_fields(&mut args); - } - if matches!( - plan.command_name.as_str(), - "tree.resource.archive" - | "tree.resource.restore" - | "tree.resource.rename" - | "tree.resource.move" - | "tree.resource.purge" - ) { - args = convex_resource_lifecycle_args_for_plan(plan, &args); - } - if matches!(plan.command_name.as_str(), "mindmaps.put") - || matches!(plan.function_name.as_str(), "mindmaps:put") - { - // Rust plan 保留 tree domain event / stream hint 作为正式契约； - // Convex mindmaps.put legacy validator 仍只接收真实写入字段。 - strip_tree_artifact_fields(&mut args); - } - if matches!( - plan.command_name.as_str(), - "documents.save" | "page.body.save" - ) { - // 当前 Convex documents:updateContent 仍是 legacy content substrate： - // 真实可见保存必须只发送 validator 接受的字段；原生编辑器快照留在 - // Rust plan / artifact 侧，待 Convex schema 正式迁移后再进入持久层。 - strip_tree_artifact_fields(&mut args); - strip_editor_snapshot_fields(&mut args); - } - if matches!( - plan.command_name.as_str(), - "documents.options.update" | "page.layout.updateOptions" - ) { - // documents:updateOptions 仍只接收页面设置字段； - // tree stream hint 留在 Rust artifact plan 中持久化。 - strip_tree_artifact_fields(&mut args); - } - if plan.command_name == "mindmap.command.apply" { - if let Value::Object(map) = &mut args { - // Convex mindmaps:applyCommand 仍只接收 blob substrate 写入所需字段； - // rootNodeId/projectionRevision/canonicalCommand 属于 Rust command envelope 语义。 - map.remove("rootNodeId"); - map.remove("projectionRevision"); - map.remove("canonicalCommand"); - if let Some(document_id) = map.remove("documentId") { - map.insert("docId".into(), document_id); - } - } - } - args -} - -fn convex_resource_lifecycle_args_for_plan( - plan: &RuntimeCommandExecutionPlan, - args: &Value, -) -> Value { - let lifecycle = args.get("resourceLifecyclePlan").and_then(Value::as_object); - let action = lifecycle - .and_then(|value| value.get("action")) - .and_then(Value::as_str) - .unwrap_or(""); - let resource_kind = lifecycle - .and_then(|value| value.get("resourceKind")) - .and_then(Value::as_str) - .unwrap_or("file"); - if resource_kind != "file" { - return args.clone(); - } - let id = args - .get("id") - .and_then(Value::as_str) - .unwrap_or_default() - .to_string(); - let user_id = args - .get("userId") - .and_then(Value::as_str) - .map(str::trim) - .filter(|value| !value.is_empty()) - .unwrap_or(plan.actor_id.as_str()) - .to_string(); - match action { - "archive" => json!({ - "userId": user_id, - "id": id, - "patch": { - "deleted_at": now_iso_like(), - "deleted_by": user_id, - "purged_at": null, - }, - }), - "restore" => json!({ - "userId": user_id, - "id": id, - "patch": { - "deleted_at": null, - "deleted_by": null, - "purged_at": null, - }, - }), - "rename" => json!({ - "userId": user_id, - "id": id, - "patch": { - "file_name": args.get("newName").and_then(Value::as_str).unwrap_or_default(), - }, - }), - "move" => json!({ - "userId": user_id, - "id": id, - "patch": { - "document_id": args - .get("targetDocumentId") - .or_else(|| args.get("target_document_id")) - .and_then(Value::as_str) - .unwrap_or_default(), - }, - }), - "purge" => json!({ - "userId": user_id, - "id": id, - "expiredDeletedAt": "2126-01-01T00:00:00Z", - }), - _ => args.clone(), - } -} - -fn strip_tree_artifact_fields(args: &mut Value) { - if let Value::Object(map) = args { - map.remove("streamDeltaHint"); - map.remove("domainEventHint"); - map.remove("domainEventPlan"); - map.remove("domainEventPlans"); - map.remove("commandProtocol"); - } -} - -fn strip_editor_snapshot_fields(args: &mut Value) { - if let Value::Object(map) = args { - map.remove("editorDocument"); - map.remove("tiptapDocument"); - map.remove("blockDocument"); - map.remove("blockProjectionVersion"); - } -} - -pub async fn execute_convex_command_plan( +pub async fn execute_retired_command_plan( config: &AppConfig, context: &RequestContext, plan: &RuntimeCommandExecutionPlan, @@ -598,743 +162,45 @@ pub async fn execute_convex_command_plan( return Ok(fixture); } - let payload = json!({ - "path": plan.function_name, - "format": "convex_encoded_json", - "args": [convex_command_args_for_plan(plan)], - }); - - let client = convex_http_client(context)?; - - let mut request = client - .post(format!("{}/api/mutation", convex_url(config, context)?)) - .header("Authorization", build_authorization(config, context)?) - .header("Content-Type", "application/json") - .header("Convex-Client", "mnote-web") - .header(HEADER_REQUEST_ID, &context.trace.request_id) - .header(HEADER_TRACE_ID, &context.trace.trace_id) - .header(HEADER_SOURCE_CHANNEL, context.source.channel.as_str()) - .header(HEADER_SOURCE_CLIENT, context.source.client.as_str()) - .json(&payload); - - if let Some(workspace_id) = plan - .workspace_id - .as_deref() - .or(context.workspace.workspace_id.as_deref()) - { - request = request.header(HEADER_WORKSPACE_ID, workspace_id); - } - if let Some(idempotency_key) = plan - .idempotency_key - .as_deref() - .or(context.source.idempotency_key.as_deref()) - .map(str::trim) - .filter(|value| !value.is_empty()) - { - request = request.header(HEADER_IDEMPOTENCY_KEY, idempotency_key); - } - - let response = request.send().await.map_err(|error| { - let base = if error.is_timeout() { - WebError::gateway_timeout_code( - "convex_timeout", - format!("Convex mutation 超时: {error}"), - ) - } else { - WebError::service_unavailable_code( - "convex_unavailable", - format!("Convex mutation 请求失败: {error}"), - ) - }; - base.with_context(context) - .with_header("x-error-phase", "mutation_send") - .with_header("x-upstream-service", "convex") - })?; - - let status = response.status(); - let body: Value = response.json().await.map_err(|error| { - WebError::bad_gateway_code( - "convex_bad_response", - format!("Convex mutation 响应解析失败: {error}"), - ) - .with_context(context) - .with_header("x-error-phase", "mutation_decode") - .with_header("x-upstream-service", "convex") - .with_header("x-upstream-status", status.as_u16().to_string()) - })?; - if !status.is_success() { - let message = body - .get("errorMessage") - .and_then(Value::as_str) - .unwrap_or("Convex mutation 失败"); - return Err( - WebError::bad_gateway_code("convex_upstream_error", message.to_string()) - .with_context(context) - .with_header("x-error-phase", "mutation_status") - .with_header("x-upstream-service", "convex") - .with_header("x-upstream-status", status.as_u16().to_string()), - ); - } - - match body.get("status").and_then(Value::as_str) { - Some("success") => Ok(body.get("value").cloned().unwrap_or(Value::Null)), - Some("error") => Err(WebError::bad_gateway_code( - "convex_upstream_error", - body.get("errorMessage") - .and_then(Value::as_str) - .unwrap_or("Convex 返回 error") - .to_string(), - ) - .with_context(context) - .with_header("x-error-phase", "mutation_payload") - .with_header("x-upstream-service", "convex") - .with_header("x-upstream-status", status.as_u16().to_string())), - _ => Err(WebError::bad_gateway_code( - "convex_bad_response", - format!("未知 Convex 响应: {body}"), - ) - .with_context(context) - .with_header("x-error-phase", "mutation_payload") - .with_header("x-upstream-service", "convex") - .with_header("x-upstream-status", status.as_u16().to_string())), - } + Err(retired_error(context, "convex_mutation_retired")) } -#[derive(Debug)] -pub struct ConvexCommandExecution { - pub result: Value, - pub artifacts: Option, - pub artifact_error: Option, -} - -fn now_iso_like() -> String { - OffsetDateTime::now_utc() - .format(&Rfc3339) - .unwrap_or_else(|_| "1970-01-01T00:00:00Z".into()) -} - -pub async fn execute_convex_mutation_by_name( +pub async fn execute_retired_mutation_by_name( config: &AppConfig, context: &RequestContext, function_name: &str, args: Value, - workspace_id: Option<&str>, - idempotency_key: Option<&str>, + _workspace_id: Option<&str>, + _idempotency_key: Option<&str>, error_phase: &'static str, ) -> Result { if let Some(fixture) = load_mutation_fixture_by_name(config, context, function_name)? { return Ok(fixture); } - let payload = json!({ - "path": function_name, - "format": "convex_encoded_json", - "args": [args], - }); - - let client = convex_http_client(context)?; - - let mut request = client - .post(format!("{}/api/mutation", convex_url(config, context)?)) - .header("Authorization", build_authorization(config, context)?) - .header("Content-Type", "application/json") - .header("Convex-Client", "mnote-web") - .header(HEADER_REQUEST_ID, &context.trace.request_id) - .header(HEADER_TRACE_ID, &context.trace.trace_id) - .header(HEADER_SOURCE_CHANNEL, context.source.channel.as_str()) - .header(HEADER_SOURCE_CLIENT, context.source.client.as_str()) - .json(&payload); - - if let Some(workspace_id) = workspace_id - .or(context.workspace.workspace_id.as_deref()) - .map(str::trim) - .filter(|value| !value.is_empty()) - { - request = request.header(HEADER_WORKSPACE_ID, workspace_id); - } - if let Some(idempotency_key) = idempotency_key - .or(context.source.idempotency_key.as_deref()) - .map(str::trim) - .filter(|value| !value.is_empty()) - { - request = request.header(HEADER_IDEMPOTENCY_KEY, idempotency_key); - } - - let response = request.send().await.map_err(|error| { - let base = if error.is_timeout() { - WebError::gateway_timeout_code( - "convex_timeout", - format!("Convex mutation 超时: {error}"), - ) - } else { - WebError::service_unavailable_code( - "convex_unavailable", - format!("Convex mutation 请求失败: {error}"), - ) - }; - base.with_context(context) - .with_header("x-error-phase", error_phase) - .with_header("x-upstream-service", "convex") - })?; - - let status = response.status(); - let body: Value = response.json().await.map_err(|error| { - WebError::bad_gateway_code( - "convex_bad_response", - format!("Convex mutation 响应解析失败: {error}"), - ) - .with_context(context) - .with_header("x-error-phase", error_phase) - .with_header("x-upstream-service", "convex") - .with_header("x-upstream-status", status.as_u16().to_string()) - })?; - if !status.is_success() { - let message = body - .get("errorMessage") - .and_then(Value::as_str) - .unwrap_or("Convex mutation 失败"); - return Err( - WebError::bad_gateway_code("convex_upstream_error", message.to_string()) - .with_context(context) - .with_header("x-error-phase", error_phase) - .with_header("x-upstream-service", "convex") - .with_header("x-upstream-status", status.as_u16().to_string()), - ); - } - - match body.get("status").and_then(Value::as_str) { - Some("success") => Ok(body.get("value").cloned().unwrap_or(Value::Null)), - Some("error") => Err(WebError::bad_gateway_code( - "convex_upstream_error", - body.get("errorMessage") - .and_then(Value::as_str) - .unwrap_or("Convex 返回 error") - .to_string(), - ) - .with_context(context) - .with_header("x-error-phase", error_phase) - .with_header("x-upstream-service", "convex") - .with_header("x-upstream-status", status.as_u16().to_string())), - _ => Err(WebError::bad_gateway_code( - "convex_bad_response", - format!("未知 Convex 响应: {body}"), - ) - .with_context(context) - .with_header("x-error-phase", error_phase) - .with_header("x-upstream-service", "convex") - .with_header("x-upstream-status", status.as_u16().to_string())), - } -} - -fn command_log_artifact_args(artifact: &bridge_runtime::RuntimeCommandLogArtifactPlan) -> Value { - json!({ - "workspaceId": artifact.workspace_id, - "id": artifact.id, - "requestId": artifact.request_id, - "traceId": artifact.trace_id, - "commandId": artifact.command_id, - "commandName": artifact.command_name, - "actorId": artifact.actor_id, - "actorType": artifact.actor_type, - "sourceChannel": artifact.source_channel, - "sourceClient": artifact.source_client, - "status": artifact.status, - "targetPageId": artifact.target_page_id, - "targetBlockId": artifact.target_block_id, - "payload": artifact.payload, - "payloadSummary": artifact.payload_summary, - "refs": artifact.refs, - "idempotencyKey": artifact.idempotency_key, - "error": artifact.error, - "createdAt": artifact.created_at, - "finishedAt": artifact.finished_at, - }) -} - -fn domain_event_artifact_args(artifact: &bridge_runtime::RuntimeDomainEventArtifactPlan) -> Value { - json!({ - "workspaceId": artifact.workspace_id, - "id": artifact.id, - "requestId": artifact.request_id, - "traceId": artifact.trace_id, - "commandId": artifact.command_id, - "commandLogId": artifact.command_log_id, - "eventType": artifact.event_type, - "aggregateType": artifact.aggregate_type, - "aggregateId": artifact.aggregate_id, - "eventVersion": artifact.event_version, - "status": artifact.status, - "actorType": artifact.actor_type, - "payload": artifact.payload, - "createdAt": artifact.created_at, - }) + let _ = args; + Err(retired_error(context, error_phase)) } pub async fn persist_runtime_command_artifacts( - config: &AppConfig, + _config: &AppConfig, context: &RequestContext, - artifacts: &RuntimeCommandArtifactPlan, + _artifacts: &RuntimeCommandArtifactPlan, ) -> Result<(), WebError> { - // bridgeLogs 只作为控制面审计与事件副本，不承载 local-first 页面正文真相。 - execute_convex_mutation_by_name( - config, - context, - "bridgeLogs:recordCommandLog", - command_log_artifact_args(&artifacts.command_log), - Some(artifacts.command_log.workspace_id.as_str()), - artifacts.command_log.idempotency_key.as_deref(), - "artifact_command_log", - ) - .await?; - - if let Some(domain_event) = artifacts.domain_event.as_ref() { - execute_convex_mutation_by_name( - config, - context, - "bridgeLogs:recordDomainEvent", - domain_event_artifact_args(domain_event), - Some(domain_event.workspace_id.as_str()), - artifacts.command_log.idempotency_key.as_deref(), - "artifact_domain_event", - ) - .await?; - } - - Ok(()) + Err(retired_error(context, "convex_artifacts_retired")) } -pub async fn execute_convex_command_plan_with_artifacts( +pub async fn execute_retired_command_plan_with_artifacts( config: &AppConfig, context: &RequestContext, - runtime_context: &RuntimeBridgeContextWire, - command: &RuntimeCommandEnvelopeWire, + _runtime_context: &bridge_runtime::RuntimeBridgeContextWire, + _command: &bridge_runtime::RuntimeCommandEnvelopeWire, plan: &RuntimeCommandExecutionPlan, -) -> Result { - let result = execute_convex_command_plan(config, context, plan).await?; - let artifacts = build_runtime_command_artifact_plan( - runtime_context, - command, - plan, - &result, - &now_iso_like(), - ); - if let Some(artifacts) = artifacts.as_ref() { - if let Err(error) = persist_runtime_command_artifacts(config, context, artifacts).await { - let message = error.message().to_string(); - tracing::warn!( - error = %message, - command_id = %command.command_id, - "Rust command artifact 持久化失败，主 mutation 结果继续返回" - ); - return Ok(ConvexCommandExecution { - result, - artifacts: Some(artifacts.clone()), - artifact_error: Some(message), - }); - } - } - Ok(ConvexCommandExecution { +) -> Result { + let result = execute_retired_command_plan(config, context, plan).await?; + Ok(RetiredCloudCommandExecution { result, - artifacts, + artifacts: None, artifact_error: None, }) } - -#[cfg(test)] -mod tests { - use super::{build_authorization, convex_command_args_for_plan}; - use crate::app::AppConfig; - use crate::context::RequestContext; - use axum::http::{HeaderMap, HeaderValue, Method, Uri}; - use base64::Engine; - use bridge_runtime::RuntimeCommandExecutionPlan; - use serde_json::json; - - fn config() -> AppConfig { - AppConfig { - service_name: "mnote-web".into(), - service_version: "0.1.0".into(), - bind_addr: "127.0.0.1:0".into(), - public_bind_addr: "127.0.0.1:3000".into(), - legacy_next_base_url: Some("http://127.0.0.1:3100".into()), - enable_legacy_next_compat: true, - enable_debug_shell_routes: false, - enable_editor_actor: true, - hermes_base_path: "/api/hermes".into(), - compat_next_base_path: "/api/compat/next".into(), - convex_url: Some("http://127.0.0.1:3210".into()), - convex_admin_key: Some("admin-demo".into()), - allow_dev_fixtures: false, - query_fixtures_json: None, - mutation_fixtures_json: None, - dev_user_id: "dev-user".into(), - dev_user_name: "开发用户".into(), - dev_user_email: "dev@mnote.local".into(), - } - } - - fn request_context(headers: HeaderMap) -> RequestContext { - RequestContext::from_http_parts( - &Method::GET, - &"/api/compat/next/sidebar?workspaceId=ws_demo" - .parse::() - .expect("uri"), - &headers, - ) - } - - #[test] - fn convex_command_args_strips_editor_runtime_fields_for_legacy_page_body_save() { - let plan = RuntimeCommandExecutionPlan { - command_name: "page.body.save".into(), - command_id: "cmd_1".into(), - function_name: "documents:updateContent".into(), - workspace_id: Some("ws_1".into()), - request_id: "req_1".into(), - trace_id: "trace_1".into(), - actor_id: "actor_1".into(), - idempotency_key: None, - source: json!({}), - payload_json: "{}".into(), - args_json: json!({ - "id": "doc_1", - "content": [], - "expectedRevision": 0, - "conflictDetectionKey": "doc_1:0", - "editorDocument": {"documentId": "doc_1", "rootBlockIds": []}, - "tiptapDocument": {"type": "doc", "content": []}, - "streamDeltaHint": {"family": "tree"}, - "domainEventHint": {"eventType": "page.body.saved"}, - "domainEventPlan": {"eventType": "page.body.saved"}, - "domainEventPlans": [{"eventType": "page.body.saved"}], - }), - }; - - let args = convex_command_args_for_plan(&plan); - - assert_eq!( - args, - json!({ - "id": "doc_1", - "content": [], - "expectedRevision": 0, - "conflictDetectionKey": "doc_1:0", - }) - ); - } - - #[test] - fn convex_command_args_strips_mindmap_put_bridge_artifacts_for_legacy_mutation() { - let plan = RuntimeCommandExecutionPlan { - command_name: "mindmaps.put".into(), - command_id: "cmd_mindmap_put_1".into(), - function_name: "mindmaps:put".into(), - workspace_id: Some("ws_1".into()), - request_id: "req_1".into(), - trace_id: "trace_1".into(), - actor_id: "actor_1".into(), - idempotency_key: None, - source: json!({}), - payload_json: "{}".into(), - args_json: json!({ - "docId": "doc_1", - "mindmapId": "mind_1", - "data": {"data": {"text": "KMIND"}, "children": []}, - "createOnly": false, - "streamDeltaHint": {"family": "tree"}, - "domainEventHint": {"eventType": "tree.resource.mindmap.put"}, - "domainEventPlan": {"eventType": "tree.resource.mindmap.put"}, - "domainEventPlans": [{"eventType": "tree.resource.mindmap.put"}], - }), - }; - - let args = convex_command_args_for_plan(&plan); - - assert_eq!( - args, - json!({ - "docId": "doc_1", - "mindmapId": "mind_1", - "data": {"data": {"text": "KMIND"}, "children": []}, - "createOnly": false, - }) - ); - } - - #[test] - fn convex_command_args_strips_page_options_artifacts_for_legacy_mutation() { - let plan = RuntimeCommandExecutionPlan { - command_name: "page.layout.updateOptions".into(), - command_id: "cmd_options_1".into(), - function_name: "documents:updateOptions".into(), - workspace_id: Some("ws_1".into()), - request_id: "req_1".into(), - trace_id: "trace_1".into(), - actor_id: "actor_1".into(), - idempotency_key: None, - source: json!({}), - payload_json: "{}".into(), - args_json: json!({ - "id": "doc_1", - "options": { - "showToc": false, - "layoutDensity": "compact", - }, - "streamDeltaHint": {"family": "tree"}, - "domainEventHint": {"eventType": "page.layout.options_updated"}, - "domainEventPlan": {"eventType": "page.layout.options_updated"}, - "domainEventPlans": [{"eventType": "page.layout.options_updated"}], - }), - }; - - let args = convex_command_args_for_plan(&plan); - - assert_eq!( - args, - json!({ - "id": "doc_1", - "options": { - "showToc": false, - "layoutDensity": "compact", - }, - }) - ); - } - - #[test] - fn convex_command_args_strips_tree_archive_artifacts_for_legacy_mutation() { - let plan = RuntimeCommandExecutionPlan { - command_name: "tree.node.archive".into(), - command_id: "cmd_archive_1".into(), - function_name: "documents:softDelete".into(), - workspace_id: Some("ws_1".into()), - request_id: "req_1".into(), - trace_id: "trace_1".into(), - actor_id: "actor_1".into(), - idempotency_key: None, - source: json!({}), - payload_json: "{}".into(), - args_json: json!({ - "id": "doc_1", - "streamDeltaHint": {"family": "tree", "kind": "remove_document"}, - "domainEventHint": {"eventType": "tree.node.archived"}, - "domainEventPlan": {"eventType": "tree.node.archived"}, - "domainEventPlans": [{"eventType": "tree.node.archived"}], - "commandProtocol": {"family": "tree"}, - }), - }; - - let args = convex_command_args_for_plan(&plan); - - assert_eq!( - args, - json!({ - "id": "doc_1", - }) - ); - } - - #[test] - fn convex_command_args_strips_tree_purge_artifacts_for_legacy_mutation() { - let plan = RuntimeCommandExecutionPlan { - command_name: "tree.node.purge".into(), - command_id: "cmd_purge_1".into(), - function_name: "documents:purge".into(), - workspace_id: Some("ws_1".into()), - request_id: "req_1".into(), - trace_id: "trace_1".into(), - actor_id: "actor_1".into(), - idempotency_key: None, - source: json!({}), - payload_json: "{}".into(), - args_json: json!({ - "id": "doc_1", - "commandProtocol": {"family": "tree"}, - }), - }; - - let args = convex_command_args_for_plan(&plan); - - assert_eq!(args, json!({ "id": "doc_1" })); - } - - #[test] - fn convex_cloud_media_resource_lifecycle_args_keep_effective_user_id() { - let plan = RuntimeCommandExecutionPlan { - command_name: "tree.resource.archive".into(), - command_id: "cmd_resource_archive_1".into(), - function_name: "mediaAssets:patchById".into(), - workspace_id: Some("ws_1".into()), - request_id: "req_1".into(), - trace_id: "trace_1".into(), - actor_id: "anonymous".into(), - idempotency_key: None, - source: json!({}), - payload_json: "{}".into(), - args_json: json!({ - "id": "asset_1", - "userId": "convex_user_1", - "resourceKind": "file", - "resourceLifecyclePlan": { - "resourceKind": "file", - "action": "archive", - "assetId": "asset_1" - }, - "streamDeltaHint": {"family": "tree", "kind": "remove_asset"}, - "domainEventHint": {"eventType": "tree.resource.archived"}, - "domainEventPlan": {"eventType": "tree.resource.archived"}, - }), - }; - - let args = convex_command_args_for_plan(&plan); - - assert_eq!(args["userId"], "convex_user_1"); - assert_eq!(args["id"], "asset_1"); - assert!(args.get("resourceLifecyclePlan").is_none()); - assert!(args.get("streamDeltaHint").is_none()); - } - - #[test] - fn convex_command_args_adapts_mindmap_command_apply_for_legacy_mutation() { - let plan = RuntimeCommandExecutionPlan { - command_name: "mindmap.command.apply".into(), - command_id: "cmd_mindmap_1".into(), - function_name: "mindmaps:applyCommand".into(), - workspace_id: Some("ws_1".into()), - request_id: "req_1".into(), - trace_id: "trace_1".into(), - actor_id: "actor_1".into(), - idempotency_key: None, - source: json!({}), - payload_json: "{}".into(), - args_json: json!({ - "documentId": "doc_1", - "mindmapId": "mind_1", - "rootNodeId": "root", - "commands": [ - {"type": "renameNode", "mapId": "mind_1", "nodeId": "root", "title": "KMIND 已编辑"} - ], - "projectionRevision": 3, - "canonicalCommand": "mindmap.command.apply", - }), - }; - - let args = convex_command_args_for_plan(&plan); - - assert_eq!( - args, - json!({ - "docId": "doc_1", - "mindmapId": "mind_1", - "commands": [ - {"type": "renameNode", "mapId": "mind_1", "nodeId": "root", "title": "KMIND 已编辑"} - ], - }) - ); - } - - #[test] - fn build_authorization_prefers_forwarded_authorization() { - let mut headers = HeaderMap::new(); - headers.insert( - "authorization", - HeaderValue::from_static("Bearer real-token"), - ); - - let authorization = - build_authorization(&config(), &request_context(headers)).expect("authorization"); - - assert_eq!(authorization, "Bearer real-token"); - } - - #[test] - fn build_authorization_falls_back_to_dev_admin_identity() { - let authorization = build_authorization(&config(), &request_context(HeaderMap::new())) - .expect("authorization"); - - assert!(authorization.starts_with("Convex admin-demo:")); - let encoded = authorization - .trim_start_matches("Convex admin-demo:") - .trim(); - let decoded = base64::engine::general_purpose::STANDARD - .decode(encoded) - .expect("identity base64"); - let identity: serde_json::Value = serde_json::from_slice(&decoded).expect("identity json"); - assert_eq!(identity["subject"], "dev-user|mnote-web-dev-session"); - assert_eq!(identity["issuer"], "mnote-web-dev"); - assert_eq!(identity["email"], "dev@mnote.local"); - } - - #[test] - fn build_authorization_uses_delegated_actor_for_admin_identity() { - let mut headers = HeaderMap::new(); - headers.insert("x-mnote-actor-id", HeaderValue::from_static("user_real_1")); - headers.insert("x-mnote-actor-type", HeaderValue::from_static("user")); - - let authorization = - build_authorization(&config(), &request_context(headers)).expect("authorization"); - - assert!(authorization.starts_with("Convex admin-demo:")); - let encoded = authorization - .trim_start_matches("Convex admin-demo:") - .trim(); - let decoded = base64::engine::general_purpose::STANDARD - .decode(encoded) - .expect("identity base64"); - let identity: serde_json::Value = serde_json::from_slice(&decoded).expect("identity json"); - assert_eq!( - identity["subject"], - "user_real_1|mnote-web-delegated-session" - ); - assert_eq!(identity["issuer"], "mnote-web-delegated"); - assert_eq!(identity["name"], "user_real_1"); - } - - #[test] - fn build_authorization_reads_convex_token_from_cookie() { - let mut headers = HeaderMap::new(); - headers.insert( - "cookie", - HeaderValue::from_static( - "foo=bar; mnote_web_convex_token=token-from-cookie; theme=light", - ), - ); - - let authorization = - build_authorization(&config(), &request_context(headers)).expect("authorization"); - - assert_eq!(authorization, "Bearer token-from-cookie"); - } - - #[test] - fn build_authorization_prefers_convex_auth_jwt_over_legacy_handoff_cookie() { - let mut headers = HeaderMap::new(); - headers.insert( - "cookie", - HeaderValue::from_static( - "mnote_web_convex_token=legacy-token; __convexAuthJWT=jwt-from-convex-auth", - ), - ); - - let authorization = - build_authorization(&config(), &request_context(headers)).expect("authorization"); - - assert_eq!(authorization, "Bearer jwt-from-convex-auth"); - } - - #[test] - fn build_authorization_reads_convex_auth_jwt_cookie() { - let mut headers = HeaderMap::new(); - headers.insert( - "cookie", - HeaderValue::from_static( - "foo=bar; __convexAuthJWT=jwt-from-convex-auth; __convexAuthRefreshToken=refresh", - ), - ); - - let authorization = - build_authorization(&config(), &request_context(headers)).expect("authorization"); - - assert_eq!(authorization, "Bearer jwt-from-convex-auth"); - } -} diff --git a/rust/crates/storage-convex-bridge/Cargo.toml b/rust/crates/storage-convex-bridge/Cargo.toml deleted file mode 100644 index ba213305..00000000 --- a/rust/crates/storage-convex-bridge/Cargo.toml +++ /dev/null @@ -1,11 +0,0 @@ -[package] -name = "storage-convex-bridge" -version.workspace = true -edition.workspace = true -license.workspace = true -authors.workspace = true - -[dependencies] -core-domain = { path = "../core-domain" } -core-protocol = { path = "../core-protocol" } -event-log = { path = "../event-log" } diff --git a/rust/crates/storage-convex-bridge/README.md b/rust/crates/storage-convex-bridge/README.md deleted file mode 100644 index 56fffc22..00000000 --- a/rust/crates/storage-convex-bridge/README.md +++ /dev/null @@ -1,18 +0,0 @@ -# storage-convex-bridge - -阶段 1 的 Convex 桥接 crate。 - -当前职责： -- 把 Rust 协议对象映射为 Convex 读写请求 -- 透传 request / actor / workspace / auth 上下文 -- 生成最小 CommandLog / DomainEvent 骨架 - -当前明确不做： -- 不复制主事实层 -- 不维护第二数据库 -- 不隐藏 tenant / auth / request context -- 不承载复杂业务裁决 - -相关设计文档： -- `../../design/phase1-f-bridge-responsibilities-v0.md` -- `../../design/phase1-f-write-read-flow-v0.md` diff --git a/rust/crates/storage-convex-bridge/src/context.rs b/rust/crates/storage-convex-bridge/src/context.rs deleted file mode 100644 index 435f47a5..00000000 --- a/rust/crates/storage-convex-bridge/src/context.rs +++ /dev/null @@ -1,18 +0,0 @@ -#[derive(Debug, Clone, PartialEq, Eq)] -pub struct BridgeContext { - pub deployment_id: Option, - pub project_id: Option, - pub workspace_id: Option, - pub request_id: String, - pub trace_id: String, - pub actor_type: String, - pub actor_id: String, - pub session_id: Option, - pub tenant_id: Option, - pub auth_token: Option, - pub source_channel: String, - pub source_client: String, - pub idempotency_key: Option, - pub validate_only: bool, - pub dry_run: bool, -} diff --git a/rust/crates/storage-convex-bridge/src/lib.rs b/rust/crates/storage-convex-bridge/src/lib.rs deleted file mode 100644 index 8e252034..00000000 --- a/rust/crates/storage-convex-bridge/src/lib.rs +++ /dev/null @@ -1,1104 +0,0 @@ -//! Convex workspace / control-plane / compat transport bridge. -//! -//! local-first 主链下，本地 Markdown 正文、附件和资源文件不以这里作为真源。 -//! 这个 crate 只保留用于 Convex workspace、历史 documents.* 兼容命令、 -//! control-plane 查询和迁移期执行计划映射。 - -pub mod context; -pub mod mapping; -pub mod read_path; -pub mod types; -pub mod validation; -pub mod write_path; - -pub use context::BridgeContext; -pub use mapping::{ - map_command_name_to_convex, map_query_name_to_convex, ConvexMutationRequest, ConvexQueryRequest, -}; -pub use read_path::{build_query_request, QueryReadResult}; -pub use types::{BridgeError, BridgeErrorKind, BridgeResult}; -pub use validation::{validate_command_envelope, validate_query_envelope}; -pub use write_path::{ - build_command_log_record, build_domain_event_record, build_write_pipeline, build_write_request, - WritePipelineResult, -}; - -#[cfg(test)] -mod tests { - use super::*; - use core_protocol::{ - command::{ - CopyTreeDocumentPages, CreateDocumentPage, CreatePage, CreateWorkspace, - DeleteDocumentPage, DuplicateDocumentPage, MoveDocumentPage, PatchPageBlock, - PutMindmap, ReplaceMediaAssetStorage, RestoreDocumentPage, SavePageContent, - UpdatePageOptions, UpdatePageStats, UpdatePageTitle, - }, - query::{ - GetBlock, GetBridgeCommand, GetBridgeRequest, GetBridgeTrace, GetMindmap, GetPage, - GetPageContent, GetPageMeta, ListBridgeWorkspaceOverview, ListSidebarDataset, - SearchDocuments, SearchRecent, - }, - ActorPayload, CommandEnvelope, QueryEnvelope, SourcePayload, TargetRef, - }; - - fn demo_context() -> BridgeContext { - BridgeContext { - deployment_id: Some("dep_1".into()), - project_id: Some("proj_1".into()), - request_id: "req_1".into(), - trace_id: "trace_1".into(), - actor_type: "human".into(), - actor_id: "user_1".into(), - session_id: Some("session_1".into()), - workspace_id: Some("ws_1".into()), - tenant_id: Some("tenant_1".into()), - auth_token: Some("token_1".into()), - source_channel: "cli".into(), - source_client: "mnote-cli".into(), - idempotency_key: Some("idem_ctx".into()), - validate_only: false, - dry_run: false, - } - } - - #[test] - fn build_write_request_keeps_workspace_scope() { - let command = CommandEnvelope { - name: "create_page".into(), - command_id: "cmd_1".into(), - idempotency_key: Some("idem_cmd".into()), - actor: ActorPayload { - actor_type: "human".into(), - actor_id: "user_1".into(), - session_id: Some("session_1".into()), - }, - source: SourcePayload { - channel: "cli".into(), - client: "mnote-cli".into(), - }, - target: Some(TargetRef { - workspace_id: Some("ws_1".into()), - page_id: None, - block_id: None, - }), - payload: CreatePage { - title: "第一页".into(), - parent_page_id: None, - position: None, - }, - reason: Some("初始化页面".into()), - refs: vec!["spec:phase1-f".into()], - dry_run: false, - validate_only: false, - }; - - let request = - build_write_request(&demo_context(), &command).expect("write request should build"); - assert_eq!(request.function_name, "pages:create"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert_eq!(request.deployment_id.as_deref(), Some("dep_1")); - assert_eq!(request.project_id.as_deref(), Some("proj_1")); - assert_eq!(request.idempotency_key.as_deref(), Some("idem_cmd")); - assert!(request.payload_json.contains("\"kind\":\"command\"")); - assert!(request.payload_json.contains("\"name\":\"create_page\"")); - } - - #[test] - fn build_query_request_includes_trace_and_workspace() { - let query = QueryEnvelope { - name: "get_page".into(), - payload: GetPage { - page_id: "page_1".into(), - }, - }; - - let request = - build_query_request(&demo_context(), &query).expect("query request should build"); - assert_eq!(request.function_name, "pages:get"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert_eq!(request.request_id, "req_1"); - assert_eq!(request.trace_id, "trace_1"); - assert!(request.payload_json.contains("\"kind\":\"query\"")); - assert!(request.payload_json.contains("\"name\":\"get_page\"")); - } - - #[test] - fn build_write_pipeline_sets_trace_fields() { - let command = CommandEnvelope { - name: "create_workspace".into(), - command_id: "cmd_2".into(), - idempotency_key: None, - actor: ActorPayload { - actor_type: "human".into(), - actor_id: "user_1".into(), - session_id: Some("session_1".into()), - }, - source: SourcePayload { - channel: "cli".into(), - client: "mnote-cli".into(), - }, - target: None, - payload: CreateWorkspace { - name: "demo".into(), - slug: Some("demo".into()), - }, - reason: Some("初始化工作区".into()), - refs: vec![], - dry_run: false, - validate_only: false, - }; - - let pipeline = - build_write_pipeline(&demo_context(), &command).expect("pipeline should build"); - assert_eq!(pipeline.command_log.command_name, "create_workspace"); - assert!(pipeline - .command_log - .payload_summary - .contains("request_id=req_1")); - assert_eq!(pipeline.command_log.trace_id, "trace_1"); - assert_eq!(pipeline.command_log.request_id, "req_1"); - assert!(pipeline - .domain_event - .payload_json - .contains("\"trace_id\":\"trace_1\"")); - assert_eq!(pipeline.result.event_ids, vec!["evt_cmd_2".to_string()]); - } - - #[test] - fn document_title_command_maps_to_documents_update_title() { - let command = CommandEnvelope { - name: "documents.title.update".into(), - command_id: "cmd_title_1".into(), - idempotency_key: Some("idem_title".into()), - actor: ActorPayload { - actor_type: "human".into(), - actor_id: "user_1".into(), - session_id: Some("session_1".into()), - }, - source: SourcePayload { - channel: "next-route".into(), - client: "mnote-web".into(), - }, - target: Some(TargetRef { - workspace_id: Some("ws_1".into()), - page_id: Some("page_1".into()), - block_id: None, - }), - payload: UpdatePageTitle { - page_id: "page_1".into(), - title: "新标题".into(), - }, - reason: None, - refs: vec![], - dry_run: false, - validate_only: false, - }; - - let request = - build_write_request(&demo_context(), &command).expect("write request should build"); - assert_eq!(request.function_name, "documents:updateTitle"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request - .payload_json - .contains("\"name\":\"documents.title.update\"")); - } - - #[test] - fn page_head_update_title_command_maps_to_documents_update_title() { - let command = CommandEnvelope { - name: "page.head.updateTitle".into(), - command_id: "cmd_page_title_1".into(), - idempotency_key: Some("idem_page_title".into()), - actor: ActorPayload { - actor_type: "human".into(), - actor_id: "user_1".into(), - session_id: Some("session_1".into()), - }, - source: SourcePayload { - channel: "next-route".into(), - client: "mnote-web".into(), - }, - target: Some(TargetRef { - workspace_id: Some("ws_1".into()), - page_id: Some("page_1".into()), - block_id: None, - }), - payload: UpdatePageTitle { - page_id: "page_1".into(), - title: "新标题".into(), - }, - reason: None, - refs: vec![], - dry_run: false, - validate_only: false, - }; - - let request = - build_write_request(&demo_context(), &command).expect("write request should build"); - assert_eq!(request.function_name, "documents:updateTitle"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request - .payload_json - .contains("\"name\":\"page.head.updateTitle\"")); - } - - #[test] - fn tree_resource_lifecycle_commands_have_convex_mapping() { - let cases = [ - ("tree.resource.archive", "mediaAssets:patchById"), - ("tree.resource.restore", "mediaAssets:patchById"), - ("tree.resource.purge", "mediaAssets:purgeById"), - ("tree.resource.rename", "mediaAssets:patchById"), - ]; - - for (command_name, function_name) in cases { - let command = CommandEnvelope { - name: command_name.into(), - command_id: format!("cmd_{command_name}"), - idempotency_key: Some(format!("idem_{command_name}")), - actor: ActorPayload { - actor_type: "human".into(), - actor_id: "user_1".into(), - session_id: Some("session_1".into()), - }, - source: SourcePayload { - channel: "next-route".into(), - client: "mnote-web".into(), - }, - target: Some(TargetRef { - workspace_id: Some("ws_1".into()), - page_id: Some("doc_1".into()), - block_id: None, - }), - payload: 1, - reason: None, - refs: vec![], - dry_run: false, - validate_only: false, - }; - - let request = - build_write_request(&demo_context(), &command).expect("write request should build"); - assert_eq!(request.function_name, function_name); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request - .payload_json - .contains(&format!("\"name\":\"{command_name}\""))); - } - } - - #[test] - fn document_save_command_maps_to_documents_update_content() { - let command = CommandEnvelope { - name: "documents.save".into(), - command_id: "cmd_save_1".into(), - idempotency_key: Some("idem_save".into()), - actor: ActorPayload { - actor_type: "human".into(), - actor_id: "user_1".into(), - session_id: Some("session_1".into()), - }, - source: SourcePayload { - channel: "next-route".into(), - client: "mnote-web".into(), - }, - target: Some(TargetRef { - workspace_id: Some("ws_1".into()), - page_id: Some("page_1".into()), - block_id: None, - }), - payload: SavePageContent { - page_id: "page_1".into(), - workspace_id: Some("ws_1".into()), - revision: Some(42), - content_json: "{\"type\":\"doc\"}".into(), - conflict_detection_key: Some("rev:42".into()), - }, - reason: Some("保存正文".into()), - refs: vec!["checklist:c3".into()], - dry_run: false, - validate_only: false, - }; - - let request = - build_write_request(&demo_context(), &command).expect("write request should build"); - assert_eq!(request.function_name, "documents:updateContent"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request.payload_json.contains("\"name\":\"documents.save\"")); - } - - #[test] - fn page_body_save_command_maps_to_documents_update_content() { - let command = CommandEnvelope { - name: "page.body.save".into(), - command_id: "cmd_page_save_1".into(), - idempotency_key: Some("idem_page_save".into()), - actor: ActorPayload { - actor_type: "human".into(), - actor_id: "user_1".into(), - session_id: Some("session_1".into()), - }, - source: SourcePayload { - channel: "next-route".into(), - client: "mnote-web".into(), - }, - target: Some(TargetRef { - workspace_id: Some("ws_1".into()), - page_id: Some("page_1".into()), - block_id: None, - }), - payload: SavePageContent { - page_id: "page_1".into(), - workspace_id: Some("ws_1".into()), - revision: Some(42), - content_json: "{\"type\":\"doc\"}".into(), - conflict_detection_key: Some("rev:42".into()), - }, - reason: Some("保存正文".into()), - refs: vec!["checklist:c3".into()], - dry_run: false, - validate_only: false, - }; - - let request = - build_write_request(&demo_context(), &command).expect("write request should build"); - assert_eq!(request.function_name, "documents:updateContent"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request.payload_json.contains("\"name\":\"page.body.save\"")); - } - - #[test] - fn document_embed_command_maps_to_documents_update_content() { - let command = CommandEnvelope { - name: "documents.embed".into(), - command_id: "cmd_embed_1".into(), - idempotency_key: Some("idem_embed".into()), - actor: ActorPayload { - actor_type: "human".into(), - actor_id: "user_1".into(), - session_id: Some("session_1".into()), - }, - source: SourcePayload { - channel: "next-route".into(), - client: "mnote-web".into(), - }, - target: Some(TargetRef { - workspace_id: Some("ws_1".into()), - page_id: Some("page_2".into()), - block_id: None, - }), - payload: SavePageContent { - page_id: "page_2".into(), - workspace_id: Some("ws_1".into()), - revision: Some(7), - content_json: "{\"blocks\":[{\"id\":\"block_1\",\"type\":\"pageReference\"}]}" - .into(), - conflict_detection_key: Some("rev:7".into()), - }, - reason: Some("嵌入页面".into()), - refs: vec!["checklist:p1-3".into()], - dry_run: false, - validate_only: false, - }; - - let request = - build_write_request(&demo_context(), &command).expect("write request should build"); - assert_eq!(request.function_name, "documents:updateContent"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request - .payload_json - .contains("\"name\":\"documents.embed\"")); - } - - #[test] - fn page_lifecycle_commands_map_to_document_mutations() { - let base_actor = ActorPayload { - actor_type: "human".into(), - actor_id: "user_1".into(), - session_id: Some("session_1".into()), - }; - let base_source = SourcePayload { - channel: "next-route".into(), - client: "mnote-web".into(), - }; - - let create_request = build_write_request( - &demo_context(), - &CommandEnvelope { - name: "documents.create".into(), - command_id: "cmd_create_1".into(), - idempotency_key: Some("idem_create".into()), - actor: base_actor.clone(), - source: base_source.clone(), - target: Some(TargetRef { - workspace_id: None, - page_id: Some("page_1".into()), - block_id: None, - }), - payload: CreateDocumentPage { - page_id: "page_1".into(), - parent_page_id: Some("parent_1".into()), - title: "无标题".into(), - workspace_seed_id: "ws_seed_1".into(), - }, - reason: Some("创建页面".into()), - refs: vec![], - dry_run: false, - validate_only: false, - }, - ) - .expect("create request should build"); - assert_eq!( - create_request.function_name, - "documents:createWithParentReference" - ); - - let move_request = build_write_request( - &demo_context(), - &CommandEnvelope { - name: "documents.move".into(), - command_id: "cmd_move_1".into(), - idempotency_key: Some("idem_move".into()), - actor: base_actor.clone(), - source: base_source.clone(), - target: Some(TargetRef { - workspace_id: None, - page_id: Some("page_1".into()), - block_id: None, - }), - payload: MoveDocumentPage { - page_id: "page_1".into(), - parent_page_id: Some("parent_2".into()), - sort_order: 3, - }, - reason: Some("移动页面".into()), - refs: vec![], - dry_run: false, - validate_only: false, - }, - ) - .expect("move request should build"); - assert_eq!(move_request.function_name, "documents:move"); - - let delete_request = build_write_request( - &demo_context(), - &CommandEnvelope { - name: "documents.delete".into(), - command_id: "cmd_delete_1".into(), - idempotency_key: Some("idem_delete".into()), - actor: base_actor.clone(), - source: base_source.clone(), - target: Some(TargetRef { - workspace_id: None, - page_id: Some("page_1".into()), - block_id: None, - }), - payload: DeleteDocumentPage { - page_id: "page_1".into(), - }, - reason: Some("删除页面".into()), - refs: vec![], - dry_run: false, - validate_only: false, - }, - ) - .expect("delete request should build"); - assert_eq!(delete_request.function_name, "documents:softDelete"); - - let restore_request = build_write_request( - &demo_context(), - &CommandEnvelope { - name: "documents.restore".into(), - command_id: "cmd_restore_1".into(), - idempotency_key: Some("idem_restore".into()), - actor: base_actor.clone(), - source: base_source.clone(), - target: Some(TargetRef { - workspace_id: None, - page_id: Some("page_1".into()), - block_id: None, - }), - payload: RestoreDocumentPage { - page_id: "page_1".into(), - }, - reason: Some("恢复页面".into()), - refs: vec![], - dry_run: false, - validate_only: false, - }, - ) - .expect("restore request should build"); - assert_eq!(restore_request.function_name, "documents:restore"); - - let duplicate_request = build_write_request( - &demo_context(), - &CommandEnvelope { - name: "documents.duplicate".into(), - command_id: "cmd_duplicate_1".into(), - idempotency_key: Some("idem_duplicate".into()), - actor: base_actor.clone(), - source: base_source.clone(), - target: Some(TargetRef { - workspace_id: None, - page_id: Some("page_copy_1".into()), - block_id: None, - }), - payload: DuplicateDocumentPage { - source_page_id: "page_1".into(), - new_page_id: "page_copy_1".into(), - title: Some("无标题 副本".into()), - }, - reason: Some("复制页面".into()), - refs: vec![], - dry_run: false, - validate_only: false, - }, - ) - .expect("duplicate request should build"); - assert_eq!( - duplicate_request.function_name, - "documents:duplicateWithMindmaps" - ); - - let copy_tree_request = build_write_request( - &demo_context(), - &CommandEnvelope { - name: "documents.copy_tree".into(), - command_id: "cmd_copy_tree_1".into(), - idempotency_key: Some("idem_copy_tree".into()), - actor: base_actor, - source: base_source, - target: Some(TargetRef { - workspace_id: None, - page_id: Some("target_parent_1".into()), - block_id: None, - }), - payload: CopyTreeDocumentPages { - items_json: "[{\"documentId\":\"page_1\",\"recursive\":true}]".into(), - target_parent_page_id: Some("target_parent_1".into()), - }, - reason: Some("复制页面树".into()), - refs: vec![], - dry_run: false, - validate_only: false, - }, - ) - .expect("copy tree request should build"); - assert_eq!(copy_tree_request.function_name, "documents:copyTree"); - } - - #[test] - fn block_patch_command_maps_to_documents_update_content() { - let command = CommandEnvelope { - name: "blocks.patch".into(), - command_id: "cmd_patch_1".into(), - idempotency_key: Some("idem_patch".into()), - actor: ActorPayload { - actor_type: "human".into(), - actor_id: "user_1".into(), - session_id: Some("session_1".into()), - }, - source: SourcePayload { - channel: "next-route".into(), - client: "mnote-web".into(), - }, - target: Some(TargetRef { - workspace_id: Some("ws_1".into()), - page_id: Some("page_1".into()), - block_id: Some("block_1".into()), - }), - payload: PatchPageBlock { - page_id: "page_1".into(), - block_id: "block_1".into(), - workspace_id: Some("ws_1".into()), - revision: Some(7), - block_snapshot_json: "{\"id\":\"block_1\",\"type\":\"paragraph\"}".into(), - conflict_detection_key: Some("page:1:block:1".into()), - }, - reason: Some("替换块快照".into()), - refs: vec!["checklist:c3".into()], - dry_run: false, - validate_only: false, - }; - - let request = - build_write_request(&demo_context(), &command).expect("write request should build"); - assert_eq!(request.function_name, "documents:updateContent"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request.payload_json.contains("\"name\":\"blocks.patch\"")); - } - - #[test] - fn blocks_get_query_maps_to_blocks_get_by_id() { - let query = QueryEnvelope { - name: "blocks.get".into(), - payload: GetBlock { - block_id: "block_1".into(), - }, - }; - - let request = - build_query_request(&demo_context(), &query).expect("query request should build"); - assert_eq!(request.function_name, "blocks:getById"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request.payload_json.contains("\"name\":\"blocks.get\"")); - } - - #[test] - fn document_stats_command_maps_to_documents_update_stats() { - let command = CommandEnvelope { - name: "documents.stats.update".into(), - command_id: "cmd_stats_1".into(), - idempotency_key: Some("idem_stats".into()), - actor: ActorPayload { - actor_type: "human".into(), - actor_id: "user_1".into(), - session_id: Some("session_1".into()), - }, - source: SourcePayload { - channel: "next-route".into(), - client: "mnote-web".into(), - }, - target: Some(TargetRef { - workspace_id: Some("ws_1".into()), - page_id: Some("page_1".into()), - block_id: None, - }), - payload: UpdatePageStats { - page_id: "page_1".into(), - word_count: 10, - character_count: 20, - block_count: 3, - todo_total: 4, - todo_done: 1, - }, - reason: None, - refs: vec![], - dry_run: false, - validate_only: false, - }; - - let request = - build_write_request(&demo_context(), &command).expect("write request should build"); - assert_eq!(request.function_name, "documents:updateStats"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request - .payload_json - .contains("\"name\":\"documents.stats.update\"")); - } - - #[test] - fn document_options_command_maps_to_documents_update_options() { - let command = CommandEnvelope { - name: "documents.options.update".into(), - command_id: "cmd_options_1".into(), - idempotency_key: Some("idem_options".into()), - actor: ActorPayload { - actor_type: "human".into(), - actor_id: "user_1".into(), - session_id: Some("session_1".into()), - }, - source: SourcePayload { - channel: "next-route".into(), - client: "mnote-web".into(), - }, - target: Some(TargetRef { - workspace_id: Some("ws_1".into()), - page_id: Some("page_1".into()), - block_id: None, - }), - payload: UpdatePageOptions { - page_id: "page_1".into(), - wide_layout: None, - small_text: None, - show_heading_numbers: None, - show_toc: Some(true), - show_structure: None, - protect_editing: None, - show_word_count: None, - collapse_backlinks: None, - page_font: None, - layout_density: Some("compact".into()), - hide_child_pages: None, - show_block_ref_count: None, - embed_default_block_id: None, - }, - reason: None, - refs: vec![], - dry_run: false, - validate_only: false, - }; - - let request = - build_write_request(&demo_context(), &command).expect("write request should build"); - assert_eq!(request.function_name, "documents:updateOptions"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request - .payload_json - .contains("\"name\":\"documents.options.update\"")); - } - - #[test] - fn page_layout_update_options_command_maps_to_documents_update_options() { - let command = CommandEnvelope { - name: "page.layout.updateOptions".into(), - command_id: "cmd_page_options_1".into(), - idempotency_key: Some("idem_page_options".into()), - actor: ActorPayload { - actor_type: "human".into(), - actor_id: "user_1".into(), - session_id: Some("session_1".into()), - }, - source: SourcePayload { - channel: "next-route".into(), - client: "mnote-web".into(), - }, - target: Some(TargetRef { - workspace_id: Some("ws_1".into()), - page_id: Some("page_1".into()), - block_id: None, - }), - payload: UpdatePageOptions { - page_id: "page_1".into(), - wide_layout: None, - small_text: None, - show_heading_numbers: None, - show_toc: Some(true), - show_structure: None, - protect_editing: None, - show_word_count: None, - collapse_backlinks: None, - page_font: None, - layout_density: Some("compact".into()), - hide_child_pages: None, - show_block_ref_count: None, - embed_default_block_id: None, - }, - reason: None, - refs: vec![], - dry_run: false, - validate_only: false, - }; - - let request = - build_write_request(&demo_context(), &command).expect("write request should build"); - assert_eq!(request.function_name, "documents:updateOptions"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request - .payload_json - .contains("\"name\":\"page.layout.updateOptions\"")); - } - - #[test] - fn media_asset_writeback_command_maps_to_replace_storage_from_upload() { - let command = CommandEnvelope { - name: "media.assets.replace_storage".into(), - command_id: "cmd_asset_1".into(), - idempotency_key: Some("idem_asset".into()), - actor: ActorPayload { - actor_type: "service".into(), - actor_id: "onlyoffice-callback".into(), - session_id: Some("onlyoffice".into()), - }, - source: SourcePayload { - channel: "onlyoffice-callback".into(), - client: "mnote-web".into(), - }, - target: Some(TargetRef { - workspace_id: Some("ws_1".into()), - page_id: Some("page_1".into()), - block_id: None, - }), - payload: ReplaceMediaAssetStorage { - asset_id: "asset_1".into(), - storage_id: "storage_1".into(), - }, - reason: Some("ONLYOFFICE 回调写回附件".into()), - refs: vec!["checklist:d".into()], - dry_run: false, - validate_only: false, - }; - - let request = - build_write_request(&demo_context(), &command).expect("write request should build"); - assert_eq!( - request.function_name, - "mediaAssets:replaceStorageFromUpload" - ); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request - .payload_json - .contains("\"name\":\"media.assets.replace_storage\"")); - } - - #[test] - fn document_meta_query_maps_to_documents_get_meta() { - let query = QueryEnvelope { - name: "documents.meta.get".into(), - payload: GetPageMeta { - page_id: "page_1".into(), - workspace_id: Some("ws_1".into()), - }, - }; - - let request = - build_query_request(&demo_context(), &query).expect("query request should build"); - assert_eq!(request.function_name, "documents:getMeta"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request - .payload_json - .contains("\"name\":\"documents.meta.get\"")); - } - - #[test] - fn document_content_query_maps_to_documents_get_content() { - let query = QueryEnvelope { - name: "documents.content.get".into(), - payload: GetPageContent { - page_id: "page_1".into(), - workspace_id: Some("ws_1".into()), - }, - }; - - let request = - build_query_request(&demo_context(), &query).expect("query request should build"); - assert_eq!(request.function_name, "documents:getContent"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request - .payload_json - .contains("\"name\":\"documents.content.get\"")); - } - - #[test] - fn mindmap_get_query_maps_to_mindmaps_get() { - let query = QueryEnvelope { - name: "mindmaps.get".into(), - payload: GetMindmap { - document_id: "page_1".into(), - mindmap_id: "mind_1".into(), - workspace_id: Some("ws_1".into()), - }, - }; - - let request = - build_query_request(&demo_context(), &query).expect("query request should build"); - assert_eq!(request.function_name, "mindmaps:get"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request.payload_json.contains("\"name\":\"mindmaps.get\"")); - } - - #[test] - fn mindmap_editor_scene_query_maps_to_mindmaps_get_editor_scene() { - let query = QueryEnvelope { - name: "mindmap.editor_scene.get".into(), - payload: GetMindmap { - document_id: "page_1".into(), - mindmap_id: "mind_1".into(), - workspace_id: Some("ws_1".into()), - }, - }; - - let request = - build_query_request(&demo_context(), &query).expect("query request should build"); - assert_eq!(request.function_name, "mindmaps:getEditorScene"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request - .payload_json - .contains("\"name\":\"mindmap.editor_scene.get\"")); - } - - #[test] - fn sidebar_dataset_query_maps_to_sidebar_dataset_list() { - let query = QueryEnvelope { - name: "sidebar.dataset.list".into(), - payload: ListSidebarDataset { - workspace_id: "ws_1".into(), - }, - }; - - let request = - build_query_request(&demo_context(), &query).expect("query request should build"); - assert_eq!(request.function_name, "sidebar:datasetList"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request - .payload_json - .contains("\"name\":\"sidebar.dataset.list\"")); - } - - #[test] - fn search_documents_query_maps_to_search_documents() { - let query = QueryEnvelope { - name: "search.documents".into(), - payload: SearchDocuments { - query: "rust".into(), - workspace_id: "ws_1".into(), - page_id: Some("page_1".into()), - pagination: core_protocol::query::Pagination { - limit: 20, - cursor: None, - }, - title_only: false, - exact: false, - include_ocr: true, - time_range: "any".into(), - time_field: "updated".into(), - custom_range_from: None, - custom_range_to: None, - }, - }; - - let request = - build_query_request(&demo_context(), &query).expect("query request should build"); - assert_eq!(request.function_name, "search:documents"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request - .payload_json - .contains("\"name\":\"search.documents\"")); - } - - #[test] - fn search_recent_query_maps_to_search_recent() { - let query = QueryEnvelope { - name: "search.recent".into(), - payload: SearchRecent { - workspace_id: "ws_1".into(), - pagination: core_protocol::query::Pagination { - limit: 10, - cursor: None, - }, - }, - }; - - let request = - build_query_request(&demo_context(), &query).expect("query request should build"); - assert_eq!(request.function_name, "search:recent"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request.payload_json.contains("\"name\":\"search.recent\"")); - } - - #[test] - fn bridge_request_query_maps_to_bridge_logs_request() { - let query = QueryEnvelope { - name: "bridge.request.get".into(), - payload: GetBridgeRequest { - workspace_id: "ws_1".into(), - request_id: "req_1".into(), - command_id: Some("cmd_1".into()), - }, - }; - - let request = - build_query_request(&demo_context(), &query).expect("query request should build"); - assert_eq!(request.function_name, "bridgeLogs:listByRequest"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request - .payload_json - .contains("\"name\":\"bridge.request.get\"")); - } - - #[test] - fn bridge_trace_query_maps_to_bridge_logs_trace() { - let query = QueryEnvelope { - name: "bridge.trace.get".into(), - payload: GetBridgeTrace { - workspace_id: "ws_1".into(), - trace_id: "trace_1".into(), - command_id: None, - }, - }; - - let request = - build_query_request(&demo_context(), &query).expect("query request should build"); - assert_eq!(request.function_name, "bridgeLogs:listByTrace"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request - .payload_json - .contains("\"name\":\"bridge.trace.get\"")); - } - - #[test] - fn bridge_command_query_maps_to_bridge_logs_command() { - let query = QueryEnvelope { - name: "bridge.command.get".into(), - payload: GetBridgeCommand { - workspace_id: "ws_1".into(), - command_id: "cmd_1".into(), - }, - }; - - let request = - build_query_request(&demo_context(), &query).expect("query request should build"); - assert_eq!(request.function_name, "bridgeLogs:listByCommand"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request - .payload_json - .contains("\"name\":\"bridge.command.get\"")); - } - - #[test] - fn bridge_workspace_overview_query_maps_to_bridge_logs_workspace_overview() { - let query = QueryEnvelope { - name: "bridge.workspace.overview".into(), - payload: ListBridgeWorkspaceOverview { - workspace_id: "ws_1".into(), - pagination: core_protocol::query::Pagination { - limit: 20, - cursor: Some("cursor_1".into()), - }, - command_status: Some("failed".into()), - event_status: Some("failed".into()), - target_page_id: Some("page_1".into()), - target_block_id: None, - aggregate_type: Some("page".into()), - aggregate_id: Some("page_1".into()), - }, - }; - - let request = - build_query_request(&demo_context(), &query).expect("query request should build"); - assert_eq!(request.function_name, "bridgeLogs:listWorkspaceOverview"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request - .payload_json - .contains("\"name\":\"bridge.workspace.overview\"")); - } - - #[test] - fn mindmap_put_command_maps_to_mindmaps_put() { - let command = CommandEnvelope { - name: "mindmaps.put".into(), - command_id: "cmd_mindmap_put_1".into(), - idempotency_key: Some("idem_mindmap_put".into()), - actor: ActorPayload { - actor_type: "human".into(), - actor_id: "user_1".into(), - session_id: Some("session_1".into()), - }, - source: SourcePayload { - channel: "cli".into(), - client: "mnote-cli".into(), - }, - target: Some(TargetRef { - workspace_id: Some("ws_1".into()), - page_id: Some("page_1".into()), - block_id: Some("mind_1".into()), - }), - payload: PutMindmap { - document_id: "page_1".into(), - mindmap_id: "mind_1".into(), - data_json: r#"{"data":{"text":"中心主题"},"children":[]}"#.into(), - create_only: false, - }, - reason: Some("保存导图".into()), - refs: vec!["task-032".into()], - dry_run: false, - validate_only: false, - }; - - let request = - build_write_request(&demo_context(), &command).expect("write request should build"); - assert_eq!(request.function_name, "mindmaps:put"); - assert_eq!(request.workspace_id.as_deref(), Some("ws_1")); - assert!(request.payload_json.contains("\"name\":\"mindmaps.put\"")); - } -} diff --git a/rust/crates/storage-convex-bridge/src/mapping.rs b/rust/crates/storage-convex-bridge/src/mapping.rs deleted file mode 100644 index d347b036..00000000 --- a/rust/crates/storage-convex-bridge/src/mapping.rs +++ /dev/null @@ -1,165 +0,0 @@ -use crate::context::BridgeContext; - -#[derive(Debug, Clone, PartialEq, Eq)] -pub struct ConvexMutationRequest { - pub function_name: String, - pub deployment_id: Option, - pub project_id: Option, - pub workspace_id: Option, - pub request_id: String, - pub trace_id: String, - pub idempotency_key: Option, - pub actor_id: String, - pub payload_json: String, -} - -#[derive(Debug, Clone, PartialEq, Eq)] -pub struct ConvexQueryRequest { - pub function_name: String, - pub deployment_id: Option, - pub project_id: Option, - pub workspace_id: Option, - pub request_id: String, - pub trace_id: String, - pub actor_id: String, - pub payload_json: String, -} - -pub fn map_command_name_to_convex(command_name: &str) -> &'static str { - match command_name { - "create_workspace" => "workspaces:create", - "create_page" => "pages:create", - "kernel.node.create" => "kernel:createNode", - "kernel.node.update" => "kernel:updateNode", - "kernel.subtree.move" => "kernel:moveSubtree", - "kernel.edge.attach" => "kernel:attachEdge", - "kernel.edge.detach" => "kernel:detachEdge", - "tree.node.create" => "documents:createWithParentReference", - "tree.node.rename" => "documents:updateTitle", - "tree.node.archive" => "documents:softDelete", - "tree.node.restore" => "documents:restore", - "tree.node.purge" => "documents:purge", - "tree.trash.emptyWorkspace" => "documents:emptyTrashByWorkspace", - "tree.subtree.move" => "documents:move", - "tree.subtree.copy" => "documents:copyTree", - "tree.resource.copy" => "mediaAssets:batchCopy", - "tree.resource.move" => "mediaAssets:batchMove", - "tree.resource.upload" => "mediaAssets:createWithStorage", - "tree.resource.archive" => "mediaAssets:patchById", - "tree.resource.restore" => "mediaAssets:patchById", - "tree.resource.purge" => "mediaAssets:purgeById", - "tree.resource.rename" => "mediaAssets:patchById", - "tree.filetree.drop.preflight" => "tree:fileTreeDropPreflight", - "tree.filetree.delete.preflight" => "tree:fileTreeDeletePreflight", - "tree.filetree.paste.preflight" => "tree:fileTreePastePreflight", - "tree.filetree.upload-target.preflight" => "tree:fileTreeUploadTargetPreflight", - "tree.node.embed" => "documents:updateContent", - "documents.create" => "documents:createWithParentReference", - "documents.move" => "documents:move", - "documents.delete" => "documents:softDelete", - "documents.restore" => "documents:restore", - "documents.duplicate" => "documents:duplicateWithMindmaps", - "documents.copy_tree" => "documents:copyTree", - "documents.template" => "documents:setTemplate", - "documents.emptyTrashByWorkspace" => "documents:emptyTrashByWorkspace", - "documents.purge" => "documents:purge", - "documents.embed" => "documents:updateContent", - "blocks.patch" => "documents:updateContent", - "documents.save" => "documents:updateContent", - "page.body.save" => "documents:updateContent", - "documents.title.update" => "documents:updateTitle", - "page.head.updateTitle" => "documents:updateTitle", - "documents.stats.update" => "documents:updateStats", - "documents.options.update" => "documents:updateOptions", - "page.layout.updateOptions" => "documents:updateOptions", - "mindmaps.put" => "mindmaps:put", - "mindmap.command.apply" => "mindmaps:applyCommand", - "mindmaps.delete" => "mindmaps:softDelete", - "mindmaps.restore" => "mindmaps:restore", - "mindmaps.purge" => "mindmaps:purge", - "mindmaps.emptyTrashByWorkspace" => "mindmaps:emptyTrashByWorkspace", - "insert_block" => "blocks:insert", - "update_block" => "blocks:update", - "move_block" => "blocks:move", - "delete_block" => "blocks:delete", - "blocks.move" => "blocks:move", - "blocks.embed" => "blocks:insert", - "media.assets.replace_storage" => "mediaAssets:replaceStorageFromUpload", - _ => "commands:unknown", - } -} - -pub fn map_query_name_to_convex(query_name: &str) -> &'static str { - match query_name { - "kernel.node.get" => "kernel:getNode", - "kernel.subtree.get" => "kernel:getSubtree", - "kernel.children.list" => "kernel:listChildren", - "kernel.edges.list" => "kernel:listEdges", - "kernel.graph.traverse" => "kernel:traverseGraph", - "kernel.project_view" => "kernel:projectView", - "bridge.request.get" => "bridgeLogs:listByRequest", - "bridge.trace.get" => "bridgeLogs:listByTrace", - "bridge.command.get" => "bridgeLogs:listByCommand", - "bridge.workspace.overview" => "bridgeLogs:listWorkspaceOverview", - "documents.meta.get" => "documents:getMeta", - "documents.content.get" => "documents:getContent", - // page aggregate 主读链由 Rust /api/page-aggregate/:id 先取 meta/content 后在 bridge-runtime 组装。 - // Convex 没有 documents:getPageAggregate，避免旧映射误触发不存在的生产函数。 - "page.aggregate.get" => "queries:unknown", - "mindmaps.get" => "mindmaps:get", - "mindmap.projection.get" => "mindmaps:getProjection", - "mindmap.editor_scene.get" => "mindmaps:getEditorScene", - "blocks.get" => "blocks:getById", - "sidebar.dataset.list" => "sidebar:datasetList", - "search.documents" => "search:documents", - "search.documents.query" => "search:documents", - "search.recent" => "search:recent", - "get_page" => "pages:get", - "list_page_blocks" => "blocks:list_by_page", - "search_pages" => "search:pages", - "search_blocks" => "search:blocks", - _ => "queries:unknown", - } -} - -fn json_opt(value: &Option) -> String { - match value { - Some(v) => format!("\"{}\"", v), - None => "null".into(), - } -} - -pub fn payload_json_for_command(context: &BridgeContext, command_name: &str) -> String { - format!( - "{{\"kind\":\"command\",\"name\":\"{}\",\"request_id\":\"{}\",\"trace_id\":\"{}\",\"deployment_id\":{},\"project_id\":{},\"workspace_id\":{},\"tenant_id\":{},\"idempotency_key\":{},\"actor\":{{\"type\":\"{}\",\"id\":\"{}\",\"session_id\":{}}},\"source\":{{\"channel\":\"{}\",\"client\":\"{}\"}}}}", - command_name, - context.request_id, - context.trace_id, - json_opt(&context.deployment_id), - json_opt(&context.project_id), - json_opt(&context.workspace_id), - json_opt(&context.tenant_id), - json_opt(&context.idempotency_key), - context.actor_type, - context.actor_id, - json_opt(&context.session_id), - context.source_channel, - context.source_client, - ) -} - -pub fn payload_json_for_query(context: &BridgeContext, query_name: &str) -> String { - format!( - "{{\"kind\":\"query\",\"name\":\"{}\",\"request_id\":\"{}\",\"trace_id\":\"{}\",\"deployment_id\":{},\"project_id\":{},\"workspace_id\":{},\"tenant_id\":{},\"actor_id\":\"{}\",\"source\":{{\"channel\":\"{}\",\"client\":\"{}\"}}}}", - query_name, - context.request_id, - context.trace_id, - json_opt(&context.deployment_id), - json_opt(&context.project_id), - json_opt(&context.workspace_id), - json_opt(&context.tenant_id), - context.actor_id, - context.source_channel, - context.source_client, - ) -} diff --git a/rust/crates/storage-convex-bridge/src/read_path.rs b/rust/crates/storage-convex-bridge/src/read_path.rs deleted file mode 100644 index 3633a7ac..00000000 --- a/rust/crates/storage-convex-bridge/src/read_path.rs +++ /dev/null @@ -1,29 +0,0 @@ -use crate::context::BridgeContext; -use crate::mapping::{map_query_name_to_convex, payload_json_for_query, ConvexQueryRequest}; -use crate::types::BridgeResult; -use crate::validation::validate_query_envelope; -use core_protocol::QueryEnvelope; - -#[derive(Debug, Clone, PartialEq, Eq)] -pub struct QueryReadResult { - pub workspace_id: Option, - pub request_id: String, - pub trace_id: String, -} - -pub fn build_query_request( - context: &BridgeContext, - query: &QueryEnvelope, -) -> BridgeResult { - validate_query_envelope(context, query)?; - Ok(ConvexQueryRequest { - function_name: map_query_name_to_convex(&query.name).to_string(), - deployment_id: context.deployment_id.clone(), - project_id: context.project_id.clone(), - workspace_id: context.workspace_id.clone(), - request_id: context.request_id.clone(), - trace_id: context.trace_id.clone(), - actor_id: context.actor_id.clone(), - payload_json: payload_json_for_query(context, &query.name), - }) -} diff --git a/rust/crates/storage-convex-bridge/src/types.rs b/rust/crates/storage-convex-bridge/src/types.rs deleted file mode 100644 index 78b33ef7..00000000 --- a/rust/crates/storage-convex-bridge/src/types.rs +++ /dev/null @@ -1,61 +0,0 @@ -#[derive(Debug, Clone, PartialEq, Eq)] -pub enum BridgeErrorKind { - Validation, - Unauthorized, - Conflict, - NotFound, - Transport, - Rejected, -} - -#[derive(Debug, Clone, PartialEq, Eq)] -pub struct BridgeError { - pub kind: BridgeErrorKind, - pub message: String, -} - -impl BridgeError { - pub fn validation(message: impl Into) -> Self { - Self { - kind: BridgeErrorKind::Validation, - message: message.into(), - } - } - - pub fn transport(message: impl Into) -> Self { - Self { - kind: BridgeErrorKind::Transport, - message: message.into(), - } - } - - pub fn unauthorized(message: impl Into) -> Self { - Self { - kind: BridgeErrorKind::Unauthorized, - message: message.into(), - } - } - - pub fn conflict(message: impl Into) -> Self { - Self { - kind: BridgeErrorKind::Conflict, - message: message.into(), - } - } - - pub fn not_found(message: impl Into) -> Self { - Self { - kind: BridgeErrorKind::NotFound, - message: message.into(), - } - } - - pub fn rejected(message: impl Into) -> Self { - Self { - kind: BridgeErrorKind::Rejected, - message: message.into(), - } - } -} - -pub type BridgeResult = Result; diff --git a/rust/crates/storage-convex-bridge/src/validation.rs b/rust/crates/storage-convex-bridge/src/validation.rs deleted file mode 100644 index ba54f80a..00000000 --- a/rust/crates/storage-convex-bridge/src/validation.rs +++ /dev/null @@ -1,41 +0,0 @@ -use crate::context::BridgeContext; -use crate::types::{BridgeError, BridgeResult}; -use core_protocol::{CommandEnvelope, QueryEnvelope}; - -pub fn validate_command_envelope( - context: &BridgeContext, - command: &CommandEnvelope, -) -> BridgeResult<()> { - if command.name.trim().is_empty() { - return Err(BridgeError::validation("command name 不能为空")); - } - if command.command_id.trim().is_empty() { - return Err(BridgeError::validation("command_id 不能为空")); - } - if context.request_id.trim().is_empty() { - return Err(BridgeError::validation("request_id 不能为空")); - } - if context.trace_id.trim().is_empty() { - return Err(BridgeError::validation("trace_id 不能为空")); - } - if context.actor_id.trim().is_empty() { - return Err(BridgeError::validation("actor_id 不能为空")); - } - Ok(()) -} - -pub fn validate_query_envelope( - context: &BridgeContext, - query: &QueryEnvelope, -) -> BridgeResult<()> { - if query.name.trim().is_empty() { - return Err(BridgeError::validation("query name 不能为空")); - } - if context.request_id.trim().is_empty() { - return Err(BridgeError::validation("request_id 不能为空")); - } - if context.trace_id.trim().is_empty() { - return Err(BridgeError::validation("trace_id 不能为空")); - } - Ok(()) -} diff --git a/rust/crates/storage-convex-bridge/src/write_path.rs b/rust/crates/storage-convex-bridge/src/write_path.rs deleted file mode 100644 index bef086c1..00000000 --- a/rust/crates/storage-convex-bridge/src/write_path.rs +++ /dev/null @@ -1,131 +0,0 @@ -use crate::context::BridgeContext; -use crate::mapping::{map_command_name_to_convex, payload_json_for_command, ConvexMutationRequest}; -use crate::types::BridgeResult; -use crate::validation::validate_command_envelope; -use core_domain::{RefLink, Timestamp, WorkspaceId}; -use core_protocol::{command::CommandResult, AffectedObject, CommandEnvelope}; -use event_log::{CommandLogRecord, CommandLogStatus, DomainEventRecord, EventStatus}; - -#[derive(Debug, Clone, PartialEq, Eq)] -pub struct WritePipelineResult { - pub mutation: ConvexMutationRequest, - pub command_log: CommandLogRecord, - pub domain_event: DomainEventRecord, - pub result: CommandResult, -} - -pub fn build_write_request( - context: &BridgeContext, - command: &CommandEnvelope, -) -> BridgeResult { - validate_command_envelope(context, command)?; - let workspace_id = command - .target - .as_ref() - .and_then(|target| target.workspace_id.clone()) - .or_else(|| context.workspace_id.clone()); - Ok(ConvexMutationRequest { - function_name: map_command_name_to_convex(&command.name).to_string(), - deployment_id: context.deployment_id.clone(), - project_id: context.project_id.clone(), - workspace_id, - request_id: context.request_id.clone(), - trace_id: context.trace_id.clone(), - idempotency_key: command - .idempotency_key - .clone() - .or_else(|| context.idempotency_key.clone()), - actor_id: context.actor_id.clone(), - payload_json: payload_json_for_command(context, &command.name), - }) -} - -pub fn build_command_log_record( - command_id: &str, - command_name: &str, - context: &BridgeContext, - workspace_id: &str, -) -> CommandLogRecord { - CommandLogRecord { - command_log_id: format!("clog_{command_id}"), - command_name: command_name.into(), - actor_type: context.actor_type.clone(), - actor_id: context.actor_id.clone(), - source: context.source_channel.clone(), - workspace_id: WorkspaceId::new(workspace_id), - target_objects: vec![RefLink::External(format!("workspace:{workspace_id}"))], - payload_summary: format!( - "command={command_name};request_id={};trace_id={}", - context.request_id, context.trace_id - ), - refs_json: format!( - "[\"request:{}\",\"trace:{}\"]", - context.request_id, context.trace_id - ), - idempotency_key: context.idempotency_key.clone(), - status: CommandLogStatus::Pending, - created_at: Timestamp::new("2026-04-11T00:00:00Z"), - finished_at: None, - trace_id: context.trace_id.clone(), - request_id: context.request_id.clone(), - } -} - -pub fn build_domain_event_record( - command_id: &str, - command_name: &str, - context: &BridgeContext, - workspace_id: &str, -) -> DomainEventRecord { - DomainEventRecord { - event_id: format!("evt_{command_id}"), - workspace_id: workspace_id.into(), - aggregate_type: "workspace".into(), - aggregate_id: workspace_id.into(), - event_type: format!("{command_name}_requested"), - event_version: 1, - payload_json: format!( - "{{\"request_id\":\"{}\",\"trace_id\":\"{}\",\"command_id\":\"{}\",\"command_name\":\"{}\"}}", - context.request_id, context.trace_id, command_id, command_name - ), - command_log_id: format!("clog_{command_id}"), - actor_type: context.actor_type.clone(), - created_at: Timestamp::new("2026-04-11T00:00:00Z"), - status: EventStatus::Pending, - trace_id: context.trace_id.clone(), - request_id: context.request_id.clone(), - command_id: command_id.into(), - } -} - -pub fn build_write_pipeline( - context: &BridgeContext, - command: &CommandEnvelope, -) -> BridgeResult { - let mutation = build_write_request(context, command)?; - let workspace_id = mutation - .workspace_id - .clone() - .unwrap_or_else(|| "workspace_unknown".into()); - let command_log = - build_command_log_record(&command.command_id, &command.name, context, &workspace_id); - let domain_event = - build_domain_event_record(&command.command_id, &command.name, context, &workspace_id); - let result = CommandResult { - ok: true, - command_id: command.command_id.clone(), - event_ids: vec![domain_event.event_id.clone()], - affected_objects: vec![AffectedObject { - object_type: "workspace".into(), - object_id: workspace_id.clone(), - }], - revision: Some(1), - warnings: vec![], - }; - Ok(WritePipelineResult { - mutation, - command_log, - domain_event, - result, - }) -} diff --git a/scripts/TESTING_REFERENCE.md b/scripts/TESTING_REFERENCE.md index b4f2571f..7e3b3785 100644 --- a/scripts/TESTING_REFERENCE.md +++ b/scripts/TESTING_REFERENCE.md @@ -8,8 +8,8 @@ - 对 `mnote` 来说，最有价值的不是把所有测试都换成“浏览器插件式控制”，而是把已有 smoke 的结果变得更可看、更易复核。 - `/doko` 适合作为 smoke 之后的“真实页面直观复核层”，不是用来替代 smoke。 - 2026-05-20 起，默认主入口固定按 `http://127.0.0.1:3000` 理解；历史记录里的 `3001` 只代表当时临时 mnote-web 实例，不再作为默认验收入口。 -- 历史 smoke 分三类维护：`current` 可直接作为当前主链证据，`compat` 只验证 Convex/control-plane/兼容链，`retired/debug` 不应进入默认回归，除非脚本自身要求显式环境变量。 -- 2026-05-26 起，默认 smoke 基线只覆盖 `3000 Rust SSR + leptos-tiptap + local-first` 主路径；Convex export、Next、3104、BlockNote 默认路径脚本不再放在默认候选里。 +- 历史 smoke 分为 `current` 与 `retired/debug` 两类维护；退役脚本不应进入默认回归，除非脚本自身要求显式环境变量。 +- 2026-05-27 起，默认 smoke 基线只覆盖 `3000 Rust SSR + leptos-tiptap + local-first` 主路径；Convex export、Convex 兼容、Next、3104、BlockNote 默认路径脚本不再放在默认候选里。 ## 0. 当前 smoke 状态清单 @@ -36,37 +36,21 @@ node scripts/task490-runtime-surfaces-smoke.js - Rust SSR 文档页 / Page Aggregate：local-first 默认优先 `task167-local-markdown-title-body-options-no-convex-smoke.js`；cloud/control-plane 文档可补跑 `task110-page-title-single-truth-smoke.js`、`task-page-aggregate-body-sync-smoke.js`、`task-page-aggregate-options-sync-smoke.js`、`task-page-aggregate-refresh-persistence-smoke.js` - leptos-tiptap runtime surface：`task490-runtime-surfaces-smoke.js`；需要验证保存回读可补跑 `task121-rust-web-editor-island-hydration-smoke.js`，但它仍使用 `/api/tree/commands create` 准备文档，不作为无 Convex 默认基线；需要验证浮层互斥和更多菜单状态时再跑 `task158-e30-menu-state-smoke.js` - local-first 本地工作区：`task164-desktop-hot-local-folder-main-entry-smoke.js`、`task166-local-first-managed-workspace-no-convex-smoke.js`、`task167-local-markdown-title-body-options-no-convex-smoke.js`、`task436-local-markdown-open-document-external-change-smoke.js`、`task443-local-markdown-asset-upload-smoke.js`、`task451-local-markdown-conflict-resolution-ui-smoke.js`、`task452-local-search-index-browser-smoke.js`、`task453-local-folder-page-ai-changed-files-smoke.js` +- local Markdown conflict regression：`task510-local-markdown-conflict-regression-group.js` 串联真实冲突、连续上传、新建页面、外部恢复、多 tab CAS 与上传 409 孤儿策略；可用 `MNOTE_CONFLICT_REGRESSION_TASKS=a.js,b.js` 做定点子集。 - tree realtime / live cache：`task446-tree-rename-dual-browser-live-smoke.js`、`task447-tree-move-order-dual-browser-live-smoke.js`、`task448-tree-resync-recovery-dual-browser-smoke.js`、`task449-tree-sse-reconnect-snapshot-recovery-smoke.js` - 资源对象与 mindmap：`task455-local-folder-mindmap-clean-smoke.js`、`task456-resource-object-shell-sync-smoke.js`、`task166-mindmap-phase6-block-smoke.js`、`task167-mindmap-kmind-parity-smoke.js`、`task168-mindmap-put-validator-smoke.js` - local resource lifecycle API：`task437-local-folder-asset-trash-lifecycle-smoke.js`，现在只验证 `local-file:*` delete / restore / purge，不再依赖普通 `.txt` 是否出现在 UI 文件树。 -### 0.2 兼容/control-plane 脚本 - -这些脚本仍可用于 Convex/control-plane 或 cloud-source 兼容链，但不能单独证明 local-first 主链正确： - -- `task427-trash-empty-isolated-workspace-smoke.js` -- `task428-filetree-bulk-delete-selection-smoke.js` -- `task429-trash-restore-location-reveal-smoke.js` -- `task430-vscode-explorer-stage7-smoke.js` -- `task431-vscode-explorer-dnd-readonly-conflict-smoke.js` -- `task432-filetree-trash-page-dual-browser-no-refresh-smoke.js` -- `task433-filetree-trash-file-asset-dual-browser-no-refresh-smoke.js` -- `task434-filetree-trash-mindmap-table-dual-browser-no-refresh-smoke.js` -- `task174-rust-onlyoffice-attachment-open-smoke.js` -- `task175-rust-upload-entry-smoke.js` - -注意：上述 427 / 428 / 429 / 430 / 431 / 432 / 433 / 434 脚本默认入口已改回 `3000`；如需对临时端口验证，显式设置 `MNOTE_UI_BASE_URL`。`task174` / `task175` 仍验证 Convex media / OnlyOffice cloud upload 兼容入口，不属于 local-first 默认上传链。 - -### 0.3 需要退役或拆分的历史脚本 +### 0.2 需要退役或拆分的历史脚本 - `task444-convex-workspace-export-local-fixture-smoke.js`、`task455-convex-export-plan-rollback-smoke.js` 与 `export-convex-workspace-to-local.js`：Convex export 迁移验证已退出默认 smoke，已归档到 `recycle/scripts/retired-convex-export-smokes-20260526/`。 - 注意编号复用：`scripts/task444-filetree-create-mindmap-title-cache-smoke.js` 与 `scripts/task455-local-folder-mindmap-clean-smoke.js` 仍是当前本地 filetree / mindmap 脚本；退役的是带 `convex-export` 名称的 task444 / task455。 +- 旧 Convex 兼容 smoke 已软删除到 `recycle/20260527-legacy-cleanup/convex/scripts/`，包括 `task163`、`task174`、`task175`、`task427`、`task428`、`task429`、`task430`、`task431`、`task432`、`task433`、`task434`。 - `task179-tree-create-delete-no-reload-smoke.js`：覆盖 `/tree` debug shell。`/tree` 已是显式 debug/internal 边界，脚本默认阻断；只有设置 `MNOTE_ALLOW_DEBUG_TREE_SMOKE=1` 时才可执行。 -- `task163-local-folder-unified-tree-browser-smoke.js`：历史“大一统”脚本，同时混合 local folder、Convex、拖拽、复制粘贴、watcher 和文件树行为。后续不要作为默认回归入口；优先用 164 / 166 / 436 / 441 / 443 / 451 / 452 / 455 这些聚焦脚本替代。 - `task123-rust-web-tree-live-stream-consumer-smoke.js`：只证明 `/api/tree/events` SSE fallback 仍可用。当前 realtime 主链是 WebSocket push + SSE fallback；验证主链时优先使用 446 / 447 / 448，只有排查 fallback 时再跑 123。 - 旧 `task019`、`task021`、`task022` 这类早期 UI regression 脚本已软删除到 `recycle/scripts/retired-ui-regressions/`，只作为历史对照；后续默认不要用于当前 Rust SSR / local-first 主路径验收。 -### 0.4 其他 current 候选脚本 +### 0.3 其他 current 候选脚本 这些脚本不是最小默认基线，但仍属于当前 Rust SSR / leptos-tiptap / local-first 维护面，按改动范围选择性运行： @@ -93,7 +77,6 @@ node scripts/task490-runtime-surfaces-smoke.js - `task097-homepage-entry-smoke.js` - `task114-rust-web-gateway-entry-smoke.js` -- `task117-next-retirement-guard.js` - `task159-auth-entry-smoke.js` 适用场景： diff --git a/scripts/check-local-first-convex-guard.js b/scripts/check-local-first-convex-guard.js deleted file mode 100644 index 113e5c4e..00000000 --- a/scripts/check-local-first-convex-guard.js +++ /dev/null @@ -1,449 +0,0 @@ -#!/usr/bin/env node -"use strict"; - -const { execFileSync } = require("node:child_process"); -const fs = require("node:fs"); -const path = require("node:path"); - -const WAIVER = "local-first-allow-convex-main-storage"; -const MIGRATION_PERIOD_WAIVER = "sqlite-migration-waiver"; - -const RUNTIME_FORBIDDEN = [ - { - name: "未标注的 Convex documents 直连", - pattern: /documents:(?:createWithParentReference|updateTitle|move|updateContent|getMeta|getContent|purge)\b/, - }, - { - name: "未标注的 Convex media 直连", - pattern: /mediaAssets:(?:generateUploadUrl|createWithStorage|getById|refreshUrl|patchById|emptyTrashByWorkspace|purgeById|listByIds)\b/, - }, - { - name: "未标注的 Convex AI session 直连", - pattern: - /aiSessions:(?:upsertRuntimeRun|appendRuntimeEvent|getRuntimeRun|listRuntimeRuns|listRuntimeEvents|renameRuntimeSession|autoTitleRuntimeSession|deleteRuntimeSession|searchRuntimeSessions)\b/, - }, - { - name: "Convex media URL 主路径", - pattern: /\/api\/media\/(?:upload|sign|batch)|assetId=/, - }, -]; - -const DESIGN_DEFAULT_CONVEX = /(?:Convex|convex).*(?:默认|default).*(?:主存储|主数据层|数据真相|页面正文真相|文件树真相|附件|AI 会话|session)/; -const DESIGN_NEGATION = - /(?:不应|不得|不再|禁止|只作为|降级|控制面|检查|若把|应要求改成|不是|不作为|不依赖|可选|sync replica|cloud source|compat|依赖证据|代码盘点|未完成|部分完成|当前状态)/; -const ACTIVE_CONVEX_FORBIDDEN = [ - { - name: "未标注的 Convex documents 表", - pattern: /\bdocuments\s*:\s*defineTable\b/, - }, - { - name: "未标注的 Convex media_assets 表", - pattern: /\bmedia_assets\s*:\s*defineTable\b/, - }, - { - name: "未标注的 Convex documents 函数", - pattern: /export const (?:createWithParentReference|updateTitle|move|updateContent|getMeta|getContent|purge|listByWorkspace)\b/, - }, - { - name: "未标注的 Convex mediaAssets 函数", - pattern: /export const (?:generateUploadUrl|createWithStorage|getById|refreshUrl|patchById|emptyTrashByWorkspace|purgeById|listByIds)\b/, - }, -]; - -const RETIRED_ROOT_CONVEX_PATHS = [ - { - name: "根 convex schema", - pattern: /^convex\/schema\.ts$/, - }, - { - name: "根 Convex Auth 函数", - pattern: /^convex\/auth(?:\.config)?\.ts$/, - }, - { - name: "根 Convex 用户函数", - pattern: /^convex\/users\.ts$/, - }, - { - name: "根 Convex AI session 函数", - pattern: /^convex\/aiSessions\.ts$/, - }, -]; - -const RETIRED_CONVEX_INFRA_PATHS = [ - { - name: "Convex 自托管 infra", - pattern: /^infra\/convex(?:\/|$)/, - }, - { - name: "根 storage-convex-bridge 占位文件", - pattern: /^storage-convex-bridge$/, - }, -]; - -// ─── SQLite 迁移期 forbid ─────────────────────────────────── -// 在 SQLite 控制面迁移阶段（Phase 1-5），新增 Convex 控制面代码 -// （users/workspaces/sessions/policies/audit/outbox/share 等） -// 应标记 sqlite-migration-waiver，否则提示应迁移到 SQLite。 -const MIGRATION_PERIOD_FORBIDDEN = [ - { - name: "未标注迁移例外的 Convex 控制面 users 代码", - pattern: /(?:[Uu]sers?\s*[:=.]|[a-z]+[A-Z][a-z]*[Uu]ser\b|auth_identities|auth_sessions).*(?:defineTable|mutation|query|schema)/, - scope: "convex", - }, - { - name: "未标注迁移例外的 Convex 控制面 workspace 代码", - pattern: /(?:[Ww]orkspaces?\s*[:=]|[Ww]orkspace[Mm]embers\b|[Ww]orkspace[Mm]ember\b).*(?:defineTable|mutation|query|schema)/, - scope: "convex", - }, - { - name: "未标注迁移例外的 Convex 控制面 grants/access 代码", - pattern: /\b(?:directory_grants|directoryGrants|access_policy|accessPolicy)\b/, - scope: "convex", - }, - { - name: "未标注迁移例外的 Convex 控制面 share 代码", - pattern: /\b(?:share_links|shareLinks)\b/, - scope: "convex", - }, - { - name: "未标注迁移例外的 Convex 控制面 sync/audit/outbox 代码", - pattern: /\b(?:sync_state|syncState|audit_log|auditLog|outbox_events|outboxEvents)\b/, - scope: "convex", - }, - { - name: "未标注迁移例外的 Convex 控制面 ai_policies 代码", - pattern: /\b(?:ai_policies|aiPolicies|ai_policy|aiPolicy)\b/, - scope: "convex", - }, - { - name: "未标注迁移例外的 Convex 控制面 legacy_id_map 代码", - pattern: /\b(?:legacy_id_map|legacyIdMap)\b/, - scope: "convex", - }, -]; - -function usage() { - return [ - "用法：", - " node scripts/check-local-first-convex-guard.js", - " node scripts/check-local-first-convex-guard.js --base origin/main", - " node scripts/check-local-first-convex-guard.js --staged", - " node scripts/check-local-first-convex-guard.js --files ", - " node scripts/check-local-first-convex-guard.js --self-test", - "", - `如需保留明确的 cloud/compat 直连，请在同一新增行加入 ${WAIVER}。`, - "根 convex/ functions 源码已退役；如确需新增显式 cloud/compat Convex functions，应先放到明确的辅助目录并更新 guard。", - "infra/convex 自托管基础设施已退役到 recycle；不要重新引回 active 路径。", - `SQLite 迁移期中新增 Convex 控制面代码（users/workspaces/grants/share 等）需加 ${MIGRATION_PERIOD_WAIVER} 标注迁移例外。`, - ].join("\n"); -} - -function parseArgs(argv) { - const result = { - base: "HEAD", - staged: false, - files: [], - selfTest: false, - }; - for (let index = 0; index < argv.length; index += 1) { - const arg = argv[index]; - if (arg === "--help" || arg === "-h") { - console.log(usage()); - process.exit(0); - } - if (arg === "--staged") { - result.staged = true; - continue; - } - if (arg === "--self-test") { - result.selfTest = true; - continue; - } - if (arg === "--base") { - const value = argv[index + 1]; - if (!value) throw new Error("--base 需要一个 git ref"); - result.base = value; - index += 1; - continue; - } - if (arg === "--files") { - result.files = argv.slice(index + 1); - break; - } - throw new Error(`未知参数：${arg}\n${usage()}`); - } - return result; -} - -function isDesignPath(filePath) { - return filePath.startsWith("design/") && !filePath.startsWith("design/old/") && filePath.endsWith(".md"); -} - -function isRuntimePath(filePath) { - return filePath.startsWith("rust/crates/mnote-web/src/") && filePath.endsWith(".rs"); -} - -function isActiveConvexPath(filePath) { - return filePath.startsWith("convex/") && filePath.endsWith(".ts") && !filePath.startsWith("convex/_generated/"); -} - -function isRetiredRootConvexPath(filePath) { - return RETIRED_ROOT_CONVEX_PATHS.some((entry) => entry.pattern.test(filePath)); -} - -function isRetiredConvexInfraPath(filePath) { - return RETIRED_CONVEX_INFRA_PATHS.some((entry) => entry.pattern.test(filePath)); -} - -function isAllowedRuntimeAdapter(filePath) { - return ( - filePath === "rust/crates/mnote-web/src/transport/convex.rs" || - filePath === "rust/crates/mnote-web/src/routes/compat.rs" - ); -} - -function normalizePath(filePath) { - return filePath.split(path.sep).join("/"); -} - -function readDiffLines(options) { - const args = ["diff", "--unified=0", "--no-ext-diff"]; - if (options.staged) { - args.push("--cached"); - } else { - args.push(options.base); - } - args.push("--"); - const output = execFileSync("git", args, { encoding: "utf8" }); - return output.split(/\r?\n/); -} - -function collectAddedLinesFromDiff(lines) { - const added = []; - let currentFile = null; - let newLine = 0; - - for (const line of lines) { - const fileMatch = line.match(/^\+\+\+ b\/(.+)$/); - if (fileMatch) { - currentFile = fileMatch[1]; - continue; - } - if (line.startsWith("+++ /dev/null")) { - currentFile = null; - continue; - } - const hunkMatch = line.match(/^@@ -\d+(?:,\d+)? \+(\d+)(?:,\d+)? @@/); - if (hunkMatch) { - newLine = Number(hunkMatch[1]); - continue; - } - if (!currentFile || line.startsWith("diff --git") || line.startsWith("index ")) { - continue; - } - if (line.startsWith("+") && !line.startsWith("+++")) { - added.push({ filePath: currentFile, lineNumber: newLine, text: line.slice(1) }); - newLine += 1; - continue; - } - if (!line.startsWith("-")) { - newLine += 1; - } - } - - return added; -} - -function collectLinesFromFiles(files) { - const rows = []; - for (const rawPath of files) { - const filePath = normalizePath(rawPath); - const text = fs.readFileSync(filePath, "utf8"); - text.split(/\r?\n/).forEach((line, index) => { - rows.push({ filePath, lineNumber: index + 1, text: line }); - }); - } - return rows; -} - -function isMigrationWaived(row) { - return row.text.includes(WAIVER) || row.text.includes(MIGRATION_PERIOD_WAIVER); -} - -function checkLine(row) { - if (isMigrationWaived(row)) { - return []; - } - - if (isDesignPath(row.filePath)) { - if (DESIGN_DEFAULT_CONVEX.test(row.text) && !DESIGN_NEGATION.test(row.text)) { - return [ - { - ...row, - reason: "设计稿新增口径把 Convex 描述成默认主存储；请改成 LocalFS/WorkspaceSource 默认，或明确标注 cloud/control-plane/compat。", - }, - ]; - } - return []; - } - - if (isRetiredRootConvexPath(row.filePath)) { - return [ - { - ...row, - reason: `${RETIRED_ROOT_CONVEX_PATHS.find((entry) => entry.pattern.test(row.filePath)).name} 已随根 convex/ 退役；不要重新新增为默认控制面，请迁到 Rust SQLite control-plane 或明确的 cloud/compat 辅助目录。`, - }, - ]; - } - - if (isRetiredConvexInfraPath(row.filePath)) { - return [ - { - ...row, - reason: `${RETIRED_CONVEX_INFRA_PATHS.find((entry) => entry.pattern.test(row.filePath)).name} 已软删除到 recycle；不要重新引回 active 路径或默认启动链路。`, - }, - ]; - } - - if (!isRuntimePath(row.filePath) || isAllowedRuntimeAdapter(row.filePath)) { - if (!isActiveConvexPath(row.filePath)) { - return []; - } - const violations = ACTIVE_CONVEX_FORBIDDEN.filter((entry) => entry.pattern.test(row.text)).map((entry) => ({ - ...row, - reason: `${entry.name} 出现在 active convex 目录；新增 Convex 代码只能是 auth、membership、share grants、sync state、AI policy、cloud source、compat 或 sync replica，并需用 ${WAIVER} 标注例外。`, - })); - // 在迁移期内，新增控制面 Convex 代码也应标记例外 - if (violations.length === 0) { - const migrationHit = MIGRATION_PERIOD_FORBIDDEN.filter((entry) => entry.pattern.test(row.text)).map((entry) => ({ - ...row, - reason: `${entry.name} — SQLite 迁移期内新增 Convex 控制面代码应标记 ${MIGRATION_PERIOD_WAIVER} 迁移例外，或将逻辑迁移到 Rust control-plane SQLite 实现。`, - })); - violations.push(...migrationHit); - } - return violations; - } - - return RUNTIME_FORBIDDEN.filter((entry) => entry.pattern.test(row.text)).map((entry) => ({ - ...row, - reason: `${entry.name} 出现在非 Convex adapter 路径；请先走 WorkspaceSource / Rust kernel / LocalFS executor，或加 ${WAIVER} 并说明原因。`, - })); -} - -function runSelfTest() { - const rows = [ - { - filePath: "convex/schema.ts", - lineNumber: 1, - text: " documents: defineTable({", - }, - { - filePath: "convex/aiSessions.ts", - lineNumber: 1, - text: "export const upsertRuntimeRun = mutation({", - }, - { - filePath: "convex/mediaAssets.ts", - lineNumber: 1, - text: "export const generateUploadUrl = mutation({", - }, - { - filePath: "convex/shareGrants.ts", - lineNumber: 1, - text: "export const upsertShareGrant = mutation({", - }, - { - filePath: "rust/crates/mnote-web/src/routes/example.rs", - lineNumber: 1, - text: '"documents:updateContent"', - }, - { - filePath: "rust/crates/mnote-web/src/transport/convex.rs", - lineNumber: 1, - text: '"documents:updateContent"', - }, - { - filePath: "convex/users.ts", - lineNumber: 1, - text: " users: defineTable({", - }, - { - filePath: "convex/workspaces_migration.ts", - lineNumber: 1, - text: " workspaces: defineTable({", - }, - { - filePath: "infra/convex/docker-compose.yml", - lineNumber: 1, - text: "services:", - }, - { - filePath: "storage-convex-bridge", - lineNumber: 1, - text: "", - }, - ]; - const violations = rows.flatMap(checkLine); - const labels = violations.map((item) => item.filePath); - if (!labels.includes("convex/schema.ts")) { - throw new Error("self-test 失败：未拦截 active convex documents 表"); - } - if (!labels.includes("convex/aiSessions.ts")) { - throw new Error("self-test 失败：未拦截退役根 convex AI session 函数"); - } - if (!labels.includes("convex/mediaAssets.ts")) { - throw new Error("self-test 失败：未拦截 active convex media 函数"); - } - if (!labels.includes("rust/crates/mnote-web/src/routes/example.rs")) { - throw new Error("self-test 失败：未拦截非 adapter Rust Convex 直连"); - } - if (labels.includes("convex/shareGrants.ts")) { - throw new Error("self-test 失败：误拦截控制面 share grants"); - } - if (labels.includes("rust/crates/mnote-web/src/transport/convex.rs")) { - throw new Error("self-test 失败：误拦截 Convex adapter"); - } - if (!labels.includes("convex/users.ts")) { - throw new Error("self-test 失败：未拦截迁移期新增 Convex 控制面 users 代码"); - } - if (!labels.includes("convex/workspaces_migration.ts")) { - throw new Error("self-test 失败：未拦截迁移期新增 Convex 控制面 workspaces 代码"); - } - if (!labels.includes("infra/convex/docker-compose.yml")) { - throw new Error("self-test 失败：未拦截退役的 Convex infra 回流"); - } - if (!labels.includes("storage-convex-bridge")) { - throw new Error("self-test 失败：未拦截根 storage-convex-bridge 占位文件回流"); - } - console.log(JSON.stringify({ ok: true, guard: "local-first-convex", selfTest: true }, null, 2)); -} - -function main() { - const options = parseArgs(process.argv.slice(2)); - if (options.selfTest) { - runSelfTest(); - return; - } - const rows = options.files.length > 0 ? collectLinesFromFiles(options.files) : collectAddedLinesFromDiff(readDiffLines(options)); - const violations = rows.flatMap(checkLine); - - if (violations.length > 0) { - console.error("local-first Convex guard 发现新增主存储绑定："); - for (const violation of violations) { - console.error(`- ${violation.filePath}:${violation.lineNumber} ${violation.reason}`); - console.error(` ${violation.text.trim()}`); - } - process.exit(1); - } - - console.log(JSON.stringify({ ok: true, checkedLines: rows.length, guard: "local-first-convex" }, null, 2)); -} - -if (require.main === module) { - try { - main(); - } catch (error) { - console.error(error instanceof Error ? error.message : String(error)); - process.exit(1); - } -} diff --git a/scripts/cloudflared/config.yml.example b/scripts/cloudflared/config.yml.example index f1acd88f..c6d38f00 100644 --- a/scripts/cloudflared/config.yml.example +++ b/scripts/cloudflared/config.yml.example @@ -7,8 +7,8 @@ # # 注意： # - hostname 需要先在 Cloudflare DNS 里绑定到该 tunnel -# - 本示例把 app/supabase/lightrag/mineru 分别用子域名暴露 -# - 生产环境建议对 lightrag/mineru 增加额外保护（Cloudflare Access / IP 白名单） +# - 本示例把 app/supabase/mineru 分别用子域名暴露 +# - 生产环境建议对 mineru 增加额外保护（Cloudflare Access / IP 白名单） tunnel: credentials-file: ./.json @@ -26,15 +26,11 @@ ingress: - hostname: backend.mnote.example.com service: http://127.0.0.1:8000 - # 4) LightRAG（你当前规划为 7777） - - hostname: lightrag.mnote.example.com - service: http://127.0.0.1:7777 - - # 5) MinerU（你当前 .env.local 为 18888） + # 4) MinerU（你当前 .env.local 为 18888） - hostname: mineru.mnote.example.com service: http://127.0.0.1:18888 - # 6) OnlyOffice Document Server（docker: onlyoffice-dev 暴露到 8081） + # 5) OnlyOffice Document Server（docker: onlyoffice-dev 暴露到 8081） - hostname: onlyoffice.mnote.example.com service: http://127.0.0.1:8081 diff --git a/scripts/desktop-hot.js b/scripts/desktop-hot.js index 24469003..3c40fe97 100644 --- a/scripts/desktop-hot.js +++ b/scripts/desktop-hot.js @@ -1,33 +1,20 @@ #!/usr/bin/env node /** - * 热启动 mnote-web 单入口，以及按需启用的 FastAPI / Celery。 + * 热启动 mnote-web 单入口，以及按需启用的 FastAPI。 * 可使用以下环境变量调整行为： - * - FRONTEND_CMD：覆盖历史 Next 启动命令，仅在显式启用 legacy compat 或跳过 Rust gateway 时生效 * - ENABLE_BACKEND：设为 "1" or "true" 时启用默认 FastAPI 后端 * - BACKEND_CMD：覆盖 FastAPI 启动命令；设置后即视为显式启用后端 * - SKIP_BACKEND：设为 "1" or "true" 可强制跳过 FastAPI 后端 - * - ENABLE_CELERY：设为 "1" or "true" 时启用默认 Celery worker - * - CELERY_CMD：覆盖 Celery 启动命令；设置后即视为显式启用 Celery - * - CELERY_POOL：只在 CELERY_CMD 未覆盖时生效，设置 Celery worker pool；Windows 默认 "solo"，其他平台默认使用 Celery 自身默认值 * - PYTHON_BIN：只在 BACKEND_CMD 未覆盖时，设置 Python 可执行文件，默认 "python" - * - CELERY_BIN：只在 CELERY_CMD 未覆盖时，设置 Celery 可执行文件，默认 "celery" - * - REDIS_URL：仅用于探测 Redis 是否就绪，默认 "redis://localhost:6379/0" - * - SKIP_CELERY：设为 "1" or "true" 可强制跳过 Celery。 - * - MNOTE_WEB_SKIP_GATEWAY：设为 "1" or "true" 临时恢复旧 Next 3000 入口。 - * - MNOTE_WEB_ENABLE_LEGACY_NEXT_COMPAT：已废弃；desktop:hot 默认不再启动 Next legacy upstream。 - * - NEXT_LEGACY_PORT：显式启用 legacy compat 时的 Next upstream 端口，默认 3100。 - * - SKIP_NEXT_LEGACY：兼容旧环境变量；设为 "1" or "true" 时强制只启动 Rust gateway。 */ const { spawn, execSync } = require("child_process"); const path = require("path"); const net = require("net"); -const { URL } = require("url"); const fs = require("fs"); const rootDir = path.resolve(__dirname, ".."); -const frontendDir = path.join(rootDir, "wolai-frontend"); const backendDir = path.join(rootDir, "wolai-backend"); function resolveBackendExecutable(envName, fallbackName) { @@ -57,23 +44,35 @@ function resolveBackendExecutable(envName, fallbackName) { } const pythonBin = resolveBackendExecutable("PYTHON_BIN", "python"); -const celeryBin = resolveBackendExecutable("CELERY_BIN", "celery"); -const celeryPoolFromEnv = (process.env.CELERY_POOL || "").trim(); -const celeryCmdFromEnv = (process.env.CELERY_CMD || "").trim(); -const redisUrl = process.env.REDIS_URL || "redis://localhost:6379/0"; const backendPortFromEnv = Number(process.env.BACKEND_PORT || 8000); +function hasCommand(command) { + try { + execSync(`command -v ${command}`, { stdio: "ignore", shell: "/bin/sh" }); + return true; + } catch { + return false; + } +} + +function shouldUseUvBackendRuntime() { + if (String(process.env.PYTHON_BIN || "").trim()) return false; + if (!fs.existsSync(path.join(backendDir, "requirements.txt"))) return false; + return hasCommand("uv"); +} + +function buildDefaultBackendCommand(port) { + if (shouldUseUvBackendRuntime()) { + return `uv run --with-requirements requirements.txt python -m uvicorn app.main:app --reload --port ${port}`; + } + return `${pythonBin} -m uvicorn app.main:app --reload --port ${port}`; +} + function isEnabledEnv(value) { const normalized = String(value || "").toLowerCase(); return normalized === "1" || normalized === "true"; } -function shouldStartCelery(env = process.env) { - if (isEnabledEnv(env.SKIP_CELERY)) return false; - if (String(env.CELERY_CMD || "").trim()) return true; - return isEnabledEnv(env.ENABLE_CELERY); -} - function shouldStartBackend(env = process.env) { if (isEnabledEnv(env.SKIP_BACKEND)) return false; if (String(env.BACKEND_CMD || "").trim()) return true; @@ -82,49 +81,25 @@ function shouldStartBackend(env = process.env) { function resolveRuntimePlan(env = process.env) { const frontendPort = Number(env.FRONTEND_PORT || 3000); - const nextLegacyPort = Number(env.NEXT_LEGACY_PORT || 3100); - const skipGateway = isEnabledEnv(env.MNOTE_WEB_SKIP_GATEWAY); - const skipNextLegacy = !skipGateway; + const skipGateway = false; const publicPort = Number.isFinite(frontendPort) ? Math.floor(frontendPort) : 3000; - const legacyPort = Number.isFinite(nextLegacyPort) ? Math.floor(nextLegacyPort) : 3100; - const legacyUrl = `http://127.0.0.1:${legacyPort}`; - const legacyCompatEnabled = "0"; return { skipGateway, - skipNextLegacy, publicPort, - legacyPort, publicUrl: `http://localhost:${publicPort}`, - legacyUrl, - frontendTaskName: skipGateway ? "frontend" : null, - frontendCommand: env.FRONTEND_CMD || `pnpm dev -p ${skipGateway ? publicPort : legacyPort}`, mnoteWebCommand: env.MNOTE_WEB_CMD || "cargo run -p mnote-web --bin mnote-web", - mnoteWebEnv: skipGateway - ? {} - : { - MNOTE_WEB_BIND: env.MNOTE_WEB_BIND || `0.0.0.0:${publicPort}`, - MNOTE_WEB_PUBLIC_BIND: env.MNOTE_WEB_PUBLIC_BIND || `127.0.0.1:${publicPort}`, - MNOTE_WEB_ENABLE_LEGACY_NEXT_COMPAT: legacyCompatEnabled, - }, + mnoteWebEnv: { + MNOTE_WEB_BIND: env.MNOTE_WEB_BIND || `0.0.0.0:${publicPort}`, + MNOTE_WEB_PUBLIC_BIND: env.MNOTE_WEB_PUBLIC_BIND || `127.0.0.1:${publicPort}`, + }, }; } const runtimePlan = resolveRuntimePlan(process.env); const skipMnoteWebGateway = runtimePlan.skipGateway; -const frontendTasks = runtimePlan.frontendTaskName - ? [ - { - name: runtimePlan.frontendTaskName, - command: runtimePlan.frontendCommand, - cwd: frontendDir, - }, - ] - : []; - const tasks = [ - ...frontendTasks, ...(skipMnoteWebGateway ? [] : [ @@ -142,7 +117,7 @@ const tasks = [ name: "backend", command: process.env.BACKEND_CMD || - `${pythonBin} -m uvicorn app.main:app --reload --port 8000`, + buildDefaultBackendCommand(8000), cwd: backendDir, }, ] @@ -394,18 +369,6 @@ function logPrefix(name, message) { console.log(`[${name}] ${message}`); } -function getDefaultCeleryPool() { - if (celeryPoolFromEnv) return celeryPoolFromEnv; - if (process.platform === "win32") return "solo"; - return ""; -} - -function buildDefaultCeleryCommand() { - const pool = getDefaultCeleryPool(); - const poolArg = pool ? ` --pool=${pool}` : ""; - return `${celeryBin} -A app.workers.celery_app worker --loglevel=info${poolArg}`; -} - function startTask(task) { logPrefix(task.name, `启动命令：${task.command}`); const child = spawn(task.command, { @@ -470,55 +433,11 @@ function shutdown(code) { process.on("SIGINT", () => shutdown(0)); process.on("SIGTERM", () => shutdown(0)); -async function checkRedisReachable(urlString, timeoutMs = 2000) { - try { - const url = new URL(urlString); - const host = url.hostname || "localhost"; - const port = Number(url.port) || 6379; - - return await new Promise((resolve) => { - const socket = net.createConnection({ host, port }); - const timer = setTimeout(() => { - socket.destroy(); - resolve(false); - }, timeoutMs); - - socket.once("connect", () => { - clearTimeout(timer); - socket.end(); - resolve(true); - }); - - socket.once("error", () => { - clearTimeout(timer); - resolve(false); - }); - }); - } catch (error) { - logPrefix("celery", `REDIS_URL (${urlString}) 解析失败：${error.message}，跳过连通性检查。`); - return true; - } -} - async function main() { - if (runtimePlan.frontendTaskName) { - // 说明：Next dev 在异常退出时可能残留 `.next/dev/lock`，会导致后续启动直接失败。 - // 只有显式启动历史 Next 时才清理该 lock，避免默认热启动继续触碰旧前端目录。 - const nextDevLockPath = path.join(frontendDir, ".next", "dev", "lock"); - try { - if (fs.existsSync(nextDevLockPath)) { - fs.rmSync(nextDevLockPath, { force: true }); - logPrefix("frontend", `检测到残留的 Next dev lock，已移除：${nextDevLockPath}`); - } - } catch (error) { - logPrefix("frontend", `尝试移除 Next dev lock 失败：${error.message}`); - } - } - // 说明：你外网绑定了 3000 端口，这里默认强制使用 3000。 // 如果检测到 3000 被占用，则自动结束旧进程后重启，以保证始终跑在 3000。 const desiredFrontendPort = runtimePlan.publicPort; - const frontendOwnerName = skipMnoteWebGateway ? "frontend" : "mnote-web"; + const frontendOwnerName = "mnote-web"; const frontendPortOk = await ensurePortFree(desiredFrontendPort, frontendOwnerName); if (!frontendPortOk) { console.error(`前端端口 ${desiredFrontendPort} 无法释放，已中止启动。`); @@ -527,35 +446,10 @@ async function main() { const frontendPort = desiredFrontendPort; const frontendUrl = `http://localhost:${frontendPort}`; - let nextLegacyPort = null; - if (runtimePlan.frontendTaskName === "next-legacy") { - nextLegacyPort = runtimePlan.legacyPort; - const nextLegacyPortOk = await ensurePortFree(nextLegacyPort, "next-legacy"); - if (!nextLegacyPortOk) { - console.error(`Next legacy 端口 ${nextLegacyPort} 无法释放，已中止启动。`); - process.exit(1); - } - } - - const frontendTask = runtimePlan.frontendTaskName ? findTask(runtimePlan.frontendTaskName) : null; - if (runtimePlan.frontendTaskName && !frontendTask) { - throw new Error(`缺少前端任务配置：${runtimePlan.frontendTaskName}`); - } - if (frontendTask) { - // 说明：在 Windows 的 cmd.exe 下，`pnpm dev -- -p 3000` 会把 `--` 原样传给 next，导致 next 把 `-p` 误当成目录。 - // 用 `pnpm dev -p 3000` 在 PowerShell/cmd.exe 下都能正确传参。 - frontendTask.command = runtimePlan.frontendCommand; - logPrefix(frontendTask.name, `前端目录：${frontendDir}`); - } if (skipMnoteWebGateway) { logPrefix("frontend", `前端地址：${frontendUrl}`); } else { logPrefix("mnote-web", `Rust gateway 公开入口：${frontendUrl}`); - if (runtimePlan.frontendTaskName === "next-legacy") { - logPrefix("next-legacy", `Next legacy upstream：${runtimePlan.legacyUrl}`); - } else { - - } const gatewayTask = tasks.find((task) => task.name === "mnote-web"); if (gatewayTask) { gatewayTask.command = runtimePlan.mnoteWebCommand; @@ -574,42 +468,13 @@ async function main() { if (!backendTask) { throw new Error("缺少后端任务配置"); } - backendTask.command = `${pythonBin} -m uvicorn app.main:app --reload --port ${desiredBackendPort}`; + backendTask.command = buildDefaultBackendCommand(desiredBackendPort); } else if (isEnabledEnv(process.env.SKIP_BACKEND)) { logPrefix("backend", "已跳过 FastAPI 后端（SKIP_BACKEND=1）。"); } else if (!shouldStartBackend(process.env)) { } - if (shouldStartCelery(process.env)) { - const defaultCeleryCommand = buildDefaultCeleryCommand(); - const celeryTask = { - name: "celery", - command: celeryCmdFromEnv || defaultCeleryCommand, - cwd: backendDir, - }; - - if (celeryCmdFromEnv) { - tasks.push(celeryTask); - } else if (await checkRedisReachable(redisUrl)) { - const defaultPool = getDefaultCeleryPool(); - if (defaultPool) { - logPrefix("celery", `未显式设置 CELERY_CMD，当前平台默认使用 worker pool：${defaultPool}`); - } - tasks.push(celeryTask); - } else { - // Redis 未就绪时直接跳过 Celery，避免热调试流程整体退出。 - logPrefix( - "celery", - `检测到 ${redisUrl} 无法连接，自动跳过 Celery。请先启动 Redis，或继续保持当前默认关闭策略。`, - ); - } - } else if (isEnabledEnv(process.env.SKIP_CELERY)) { - logPrefix("celery", "已跳过 Celery（SKIP_CELERY=1）。"); - } else { - - } - if (tasks.length === 0) { console.error("未配置任何可运行的任务，检查环境变量设置。"); process.exit(1); @@ -635,6 +500,5 @@ module.exports = { resolveRuntimePlan, resolveBackendExecutable, shouldStartBackend, - shouldStartCelery, terminatePid, }; diff --git a/scripts/desktop-hot.test.js b/scripts/desktop-hot.test.js index a946c7f5..77182ed1 100644 --- a/scripts/desktop-hot.test.js +++ b/scripts/desktop-hot.test.js @@ -8,7 +8,6 @@ const { isPortFree, resolveRuntimePlan, shouldStartBackend, - shouldStartCelery, } = require("./desktop-hot.js"); function findFreePort() { @@ -116,83 +115,20 @@ test("ensurePortFree 在非 Windows 平台能释放后端监听进程", async (t await waitForExit(child); }); -test("默认热启动计划只使用 mnote-web 作为 3000 owner，不启动 Next legacy upstream", () => { +test("默认热启动计划只使用 mnote-web 作为 3000 owner", () => { const plan = resolveRuntimePlan({ FRONTEND_PORT: "3000", - NEXT_LEGACY_PORT: "3100", }); assert.equal(plan.skipGateway, false); - assert.equal(plan.skipNextLegacy, true); assert.equal(plan.publicPort, 3000); - assert.equal(plan.legacyPort, 3100); - assert.equal(plan.frontendTaskName, null); assert.equal(plan.mnoteWebCommand, "cargo run -p mnote-web --bin mnote-web"); assert.deepEqual(plan.mnoteWebEnv, { MNOTE_WEB_BIND: "0.0.0.0:3000", MNOTE_WEB_PUBLIC_BIND: "127.0.0.1:3000", - MNOTE_WEB_ENABLE_LEGACY_NEXT_COMPAT: "0", }); }); -test("显式 legacy compat 也不再启动 Next legacy upstream", () => { - const plan = resolveRuntimePlan({ - FRONTEND_PORT: "3000", - NEXT_LEGACY_PORT: "3100", - MNOTE_WEB_ENABLE_LEGACY_NEXT_COMPAT: "1", - }); - - assert.equal(plan.skipGateway, false); - assert.equal(plan.skipNextLegacy, true); - assert.equal(plan.frontendTaskName, null); - assert.equal(plan.mnoteWebCommand, "cargo run -p mnote-web --bin mnote-web"); - assert.deepEqual(plan.mnoteWebEnv, { - MNOTE_WEB_BIND: "0.0.0.0:3000", - MNOTE_WEB_PUBLIC_BIND: "127.0.0.1:3000", - MNOTE_WEB_ENABLE_LEGACY_NEXT_COMPAT: "0", - }); -}); - -test("MNOTE_WEB_SKIP_GATEWAY 可临时恢复旧 Next 3000 入口", () => { - const plan = resolveRuntimePlan({ - FRONTEND_PORT: "3000", - NEXT_LEGACY_PORT: "3100", - MNOTE_WEB_SKIP_GATEWAY: "1", - }); - - assert.equal(plan.skipGateway, true); - assert.equal(plan.frontendTaskName, "frontend"); - assert.equal(plan.frontendCommand, "pnpm dev -p 3000"); - assert.deepEqual(plan.mnoteWebEnv, {}); -}); - - -test("SKIP_NEXT_LEGACY 保持 Rust gateway 为 3000 owner，但不启动 Next legacy upstream", () => { - const plan = resolveRuntimePlan({ - FRONTEND_PORT: "3000", - NEXT_LEGACY_PORT: "3100", - SKIP_NEXT_LEGACY: "1", - }); - - assert.equal(plan.skipGateway, false); - assert.equal(plan.skipNextLegacy, true); - assert.equal(plan.frontendTaskName, null); - assert.equal(plan.mnoteWebCommand, "cargo run -p mnote-web --bin mnote-web"); - assert.deepEqual(plan.mnoteWebEnv, { - MNOTE_WEB_BIND: "0.0.0.0:3000", - MNOTE_WEB_PUBLIC_BIND: "127.0.0.1:3000", - MNOTE_WEB_ENABLE_LEGACY_NEXT_COMPAT: "0", - }); -}); - -test("默认跳过 Celery，只有显式开启时才启动", () => { - assert.equal(shouldStartCelery({}), false); - assert.equal(shouldStartCelery({ ENABLE_CELERY: "1" }), true); - assert.equal(shouldStartCelery({ ENABLE_CELERY: "true" }), true); - assert.equal(shouldStartCelery({ CELERY_CMD: "custom-celery" }), true); - assert.equal(shouldStartCelery({ ENABLE_CELERY: "1", SKIP_CELERY: "1" }), false); -}); - test("默认跳过 FastAPI 后端，只有显式开启时才启动", () => { assert.equal(shouldStartBackend({}), false); assert.equal(shouldStartBackend({ ENABLE_BACKEND: "1" }), true); diff --git a/scripts/desktop-local.js b/scripts/desktop-local.js deleted file mode 100644 index d4acc8f8..00000000 --- a/scripts/desktop-local.js +++ /dev/null @@ -1,189 +0,0 @@ -#!/usr/bin/env node -/** - * 一键启动：wolai-backend + 桌面端（Electron + 内置 Next standalone） - * - * 目的： - * - 本地联调无需反复安装 NSIS 安装包 - * - Electron 走内置 Next（更接近安装包运行方式） - * - * 可选环境变量： - * - SKIP_DESKTOP_NEXT_BUILD=1：跳过 build:desktop:next（仅启动） - * - PYTHON_BIN：默认 python - * - BACKEND_CMD：覆盖后端启动命令 - * - ELECTRON_CMD：覆盖 Electron 启动命令 - * - MNOTE_DATA_DIR：覆盖桌面端 data 目录（默认 /data-desktop-test） - */ - -const { spawnSync, spawn } = require("child_process"); -const fs = require("fs"); -const net = require("net"); -const path = require("path"); - -const rootDir = path.resolve(__dirname, ".."); -const backendDir = path.join(rootDir, "wolai-backend"); - -function resolveBackendPython() { - const fromEnv = (process.env.PYTHON_BIN || "").trim(); - if (fromEnv) return fromEnv; - - const isWin = process.platform === "win32"; - const candidates = isWin - ? [ - path.join(backendDir, ".venv", "Scripts", "python.exe"), - path.join(backendDir, ".venv312", "Scripts", "python.exe"), - path.join(backendDir, "venv", "Scripts", "python.exe"), - ] - : [ - path.join(backendDir, ".venv-linux", "bin", "python"), - path.join(backendDir, ".venv", "bin", "python"), - path.join(backendDir, "venv", "bin", "python"), - ]; - - for (const candidate of candidates) { - if (fs.existsSync(candidate)) { - return candidate; - } - } - - return "python"; -} - -const pythonBin = resolveBackendPython(); -const dataDir = process.env.MNOTE_DATA_DIR || path.join(rootDir, "data-desktop-test"); - -const backendCmd = - process.env.BACKEND_CMD || `${pythonBin} -m uvicorn app.main:app --reload --host 127.0.0.1 --port 8000`; -const electronCmd = process.env.ELECTRON_CMD || "electron desktop-electron/main.js"; - -function loadEnvFile(filePath) { - if (!fs.existsSync(filePath)) return {}; - const content = fs.readFileSync(filePath, "utf8"); - return content - .split(/\r?\n/) - .filter((line) => line.trim() && !line.trim().startsWith("#")) - .reduce((acc, line) => { - const idx = line.indexOf("="); - if (idx === -1) return acc; - const key = line.slice(0, idx).trim(); - const value = line.slice(idx + 1).trim(); - acc[key] = value; - return acc; - }, {}); -} - -function runOrExit(command, cwd, env) { - const r = spawnSync(command, { - cwd, - env, - stdio: "inherit", - shell: true, - }); - if (r.status !== 0) process.exit(r.status ?? 1); -} - -async function waitForPort(host, port, timeoutMs = 20_000) { - const start = Date.now(); - // eslint-disable-next-line no-constant-condition - while (true) { - const ok = await new Promise((resolve) => { - const socket = net.createConnection({ host, port }); - const timer = setTimeout(() => { - socket.destroy(); - resolve(false); - }, 500); - socket.once("connect", () => { - clearTimeout(timer); - socket.end(); - resolve(true); - }); - socket.once("error", () => { - clearTimeout(timer); - resolve(false); - }); - }); - if (ok) return; - if (Date.now() - start > timeoutMs) { - throw new Error(`等待端口超时：${host}:${port}`); - } - // eslint-disable-next-line no-await-in-loop - await new Promise((r) => setTimeout(r, 120)); - } -} - -async function main() { - const envAllPath = path.join(rootDir, ".env.all"); - if (!fs.existsSync(envAllPath)) { - console.error("[desktop-local] 缺少 .env.all：请在仓库根目录创建全局唯一 env 文件后重试。"); - process.exit(1); - } - - const envMerged = { - ...process.env, - // 约定：全局仅使用仓库根目录的 .env.all 作为配置来源（生产优先）。 - ...loadEnvFile(envAllPath), - PYTHONUTF8: "1", - MNOTE_DATA_DIR: dataDir, - }; - - const skipBuild = - (process.env.SKIP_DESKTOP_NEXT_BUILD || "").toLowerCase() === "1" || - (process.env.SKIP_DESKTOP_NEXT_BUILD || "").toLowerCase() === "true"; - - if (!skipBuild) { - console.log("[desktop-local] 构建桌面端内置 Next（standalone）…"); - runOrExit("pnpm run build:desktop:next", rootDir, envMerged); - } else { - console.log("[desktop-local] 已跳过 build:desktop:next（SKIP_DESKTOP_NEXT_BUILD=1）"); - } - - console.log(`[desktop-local] data 目录：${dataDir}`); - console.log(`[desktop-local] 后端命令：${backendCmd}`); - console.log(`[desktop-local] Electron 命令：${electronCmd}`); - - const children = []; - let shuttingDown = false; - - const shutdown = () => { - if (shuttingDown) return; - shuttingDown = true; - console.log("[desktop-local] 正在关闭子进程…"); - for (const child of children) { - try { - if (!child.killed) child.kill("SIGINT"); - } catch {} - } - setTimeout(() => process.exit(0), 200); - }; - - process.on("SIGINT", shutdown); - process.on("SIGTERM", shutdown); - - const backend = spawn(backendCmd, { - cwd: backendDir, - env: envMerged, - stdio: "inherit", - shell: true, - }); - children.push(backend); - - backend.on("exit", () => shutdown()); - - await waitForPort("127.0.0.1", 8000).catch(() => { - console.log("[desktop-local] 提示：未检测到后端 8000 端口就绪（可能仍在启动或启动失败）。"); - }); - - const electron = spawn(electronCmd, { - cwd: rootDir, - env: envMerged, - stdio: "inherit", - shell: true, - }); - children.push(electron); - - electron.on("exit", () => shutdown()); -} - -main().catch((err) => { - console.error(err instanceof Error ? err.stack : String(err)); - process.exit(1); -}); diff --git a/scripts/desktop-prod.js b/scripts/desktop-prod.js deleted file mode 100644 index 973dc3c0..00000000 --- a/scripts/desktop-prod.js +++ /dev/null @@ -1,362 +0,0 @@ -#!/usr/bin/env node -/** - * 一键启动“生产模式”的前后端与相关服务（适用于 Cloudflare Tunnel / 公网访问）。 - * - * 目标： - * - 前后端与内部服务统一读取仓库根目录 `.env.all`（生产优先，全局唯一 env 文件） - * - * 可选环境变量： - * - SKIP_FRONTEND_BUILD=1：跳过前端 build（仅 start） - * - FRONTEND_PORT：默认 3000 - * - BACKEND_PORT：默认 8000 - * - RAG_GATEWAY_PORT：默认 8778 - * - INGEST_PORT：默认 8779 - * - PYTHON_BIN：默认 python - * - CELERY_BIN：默认 celery - * - ENABLE_CELERY=1：启用默认 Celery worker - * - CELERY_CMD：覆盖 Celery 启动命令；设置后即视为显式启用 Celery - * - SKIP_CELERY=1：强制跳过 Celery worker - * - REDIS_URL：用于探测 Redis，默认 redis://127.0.0.1:6379/0 - */ - -const { spawn } = require("child_process"); -const fs = require("fs"); -const net = require("net"); -const path = require("path"); -const { URL } = require("url"); - -const rootDir = path.resolve(__dirname, ".."); -const frontendDir = path.join(rootDir, "wolai-frontend"); -const backendDir = path.join(rootDir, "wolai-backend"); -const ingestDir = path.join(rootDir, "services", "ingest_service"); -const ragGatewayDir = path.join(rootDir, "services", "rag_gateway"); - -function resolveBackendExecutable(envName, fallbackName) { - const fromEnv = (process.env[envName] || "").trim(); - if (fromEnv) return fromEnv; - - const isWin = process.platform === "win32"; - const candidates = isWin - ? [ - path.join(backendDir, ".venv", "Scripts", `${fallbackName}.exe`), - path.join(backendDir, ".venv312", "Scripts", `${fallbackName}.exe`), - path.join(backendDir, "venv", "Scripts", `${fallbackName}.exe`), - ] - : [ - path.join(backendDir, ".venv-linux", "bin", fallbackName), - path.join(backendDir, ".venv", "bin", fallbackName), - path.join(backendDir, "venv", "bin", fallbackName), - ]; - - for (const candidate of candidates) { - if (fs.existsSync(candidate)) { - return candidate; - } - } - - return fallbackName; -} - -const pythonBin = resolveBackendExecutable("PYTHON_BIN", "python"); -const celeryBin = resolveBackendExecutable("CELERY_BIN", "celery"); -const celeryCmdFromEnv = (process.env.CELERY_CMD || "").trim(); -const redisUrl = process.env.REDIS_URL || "redis://127.0.0.1:6379/0"; - -const frontendPort = Number(process.env.FRONTEND_PORT || 3000); -const backendPort = Number(process.env.BACKEND_PORT || 8000); -const ragGatewayPort = Number(process.env.RAG_GATEWAY_PORT || 8778); -const ingestPort = Number(process.env.INGEST_PORT || 8779); - -const children = []; -let shuttingDown = false; - -function logPrefix(name, message) { - console.log(`[${name}] ${message}`); -} - -function isEnabledEnv(value) { - const normalized = String(value || "").toLowerCase(); - return normalized === "1" || normalized === "true"; -} - -function shouldStartCelery(env = process.env) { - if (isEnabledEnv(env.SKIP_CELERY)) return false; - if (String(env.CELERY_CMD || "").trim()) return true; - return isEnabledEnv(env.ENABLE_CELERY); -} - -function loadEnvFile(filePath) { - if (!fs.existsSync(filePath)) return {}; - const content = fs.readFileSync(filePath, "utf8"); - return content - .split(/\r?\n/) - .filter((line) => line.trim() && !line.trim().startsWith("#")) - .reduce((acc, line) => { - const idx = line.indexOf("="); - if (idx === -1) return acc; - const key = line.slice(0, idx).trim(); - const value = line.slice(idx + 1).trim(); - acc[key] = value; - return acc; - }, {}); -} - -async function waitForExit(child, name) { - return await new Promise((resolve) => { - child.on("exit", (code, signal) => { - const status = signal ? `信号 ${signal}` : `退出码 ${code ?? "null"}`; - logPrefix(name, `进程结束（${status}）`); - resolve(code ?? 0); - }); - child.on("error", () => resolve(1)); - }); -} - -function spawnTask({ name, command, cwd, env }) { - logPrefix(name, `启动命令：${command}`); - const child = spawn(command, { - cwd, - stdio: "inherit", - shell: true, - env, - }); - child.on("exit", (code, signal) => { - if (shuttingDown) return; - const status = signal !== null ? `因信号 ${signal} 退出` : `退出码 ${code ?? "null"}`; - logPrefix(name, `进程结束（${status}），准备清理其它任务。`); - shutdown(code ?? 0); - }); - child.on("error", (err) => { - logPrefix(name, `启动失败：${err.message}`); - shutdown(1); - }); - children.push(child); - return child; -} - -function shutdown(code) { - if (shuttingDown) return; - shuttingDown = true; - logPrefix("system", "收到终止信号，正在关闭所有子进程…"); - for (const child of children) { - if (!child.killed) { - child.kill("SIGINT"); - setTimeout(() => { - if (!child.killed) { - child.kill("SIGTERM"); - } - }, 5000); - } - } - setTimeout(() => process.exit(code), 200); -} - -process.on("SIGINT", () => shutdown(0)); -process.on("SIGTERM", () => shutdown(0)); - -async function checkPortOpen(host, port, timeoutMs = 1200) { - return await new Promise((resolve) => { - const socket = net.createConnection({ host, port }); - const timer = setTimeout(() => { - socket.destroy(); - resolve(false); - }, timeoutMs); - socket.once("connect", () => { - clearTimeout(timer); - socket.end(); - resolve(true); - }); - socket.once("error", () => { - clearTimeout(timer); - resolve(false); - }); - }); -} - -async function checkRedisReachable(urlString, timeoutMs = 2000) { - try { - const url = new URL(urlString); - const host = url.hostname || "127.0.0.1"; - const port = Number(url.port) || 6379; - return await checkPortOpen(host, port, timeoutMs); - } catch (error) { - logPrefix("celery", `REDIS_URL (${urlString}) 解析失败：${error.message}，跳过连通性检查。`); - return true; - } -} - -function requireFile(filePath, hint) { - if (!fs.existsSync(filePath)) { - console.error(`[system] 缺少文件：${filePath}`); - if (hint) console.error(`[system] 提示：${hint}`); - process.exit(1); - } -} - -function ensureStandaloneStatic(frontendDir) { - // 说明：当 next.config.ts 配置了 output: "standalone" 时，推荐使用 - // `node .next/standalone/server.js` 启动。 - // 但 Next 不会自动把 `.next/static` 放入 `.next/standalone/.next/static`， - // 若缺失会导致 `/_next/static/*` 404（远程访问尤其明显）。 - const standaloneServer = path.join(frontendDir, ".next", "standalone", "server.js"); - if (!fs.existsSync(standaloneServer)) return false; - - const src = path.join(frontendDir, ".next", "static"); - const dest = path.join(frontendDir, ".next", "standalone", ".next", "static"); - if (!fs.existsSync(src)) return true; - - try { - fs.mkdirSync(path.dirname(dest), { recursive: true }); - // Node 16+：fs.cpSync - fs.cpSync(src, dest, { recursive: true }); - return true; - } catch (err) { - logPrefix( - "frontend", - `复制 .next/static 到 standalone 失败：${err instanceof Error ? err.message : String(err)}`, - ); - // 失败时不强制退出，仍尝试启动（方便你自行排查） - return true; - } -} - -async function main() { - // 约定：全局仅使用仓库根目录的 .env.all 作为配置来源（生产优先）。 - const envAllPath = path.join(rootDir, ".env.all"); - requireFile(envAllPath, "请先在仓库根目录创建 .env.all（全局唯一 env 文件）"); - const envAll = loadEnvFile(envAllPath); - - // 生产模式：前端必须使用 production env，避免本地开发配置污染公网用户 - const envFrontend = { - ...process.env, - ...envAll, - NODE_ENV: "production", - NEXT_TELEMETRY_DISABLED: "1", - }; - - // 后端/内部服务：尽量使用本机/内网配置（不会暴露给浏览器） - const envBackend = { - ...process.env, - ...envAll, - PYTHONUTF8: "1", - }; - const envInternalServices = { - ...process.env, - ...envAll, - PYTHONUTF8: "1", - }; - - const shouldSkipBuild = - (process.env.SKIP_FRONTEND_BUILD || "").toLowerCase() === "1" || - (process.env.SKIP_FRONTEND_BUILD || "").toLowerCase() === "true"; - - if (!shouldSkipBuild) { - logPrefix("frontend", "开始 production build…"); - const build = spawn("pnpm -C wolai-frontend build", { - cwd: rootDir, - stdio: "inherit", - shell: true, - env: envFrontend, - }); - const code = await waitForExit(build, "frontend"); - if (code !== 0) { - process.exit(code); - } - } else { - logPrefix("frontend", "已跳过 build（SKIP_FRONTEND_BUILD=1）"); - } - - const useStandalone = ensureStandaloneStatic(frontendDir); - - // 预检查：提醒必要端口是否已就绪（不强制退出，避免误伤已有进程） - const portChecks = [ - { name: "frontend", port: frontendPort }, - { name: "backend", port: backendPort }, - { name: "rag_gateway", port: ragGatewayPort }, - { name: "ingest_service", port: ingestPort }, - ]; - for (const item of portChecks) { - // 仅检查本机 127.0.0.1 是否已有服务在监听，方便你快速判断“是否重复启动” - // 监听着不代表冲突：可能是你已经手动启动了。 - // eslint-disable-next-line no-await-in-loop - const open = await checkPortOpen("127.0.0.1", item.port); - if (open) { - logPrefix("system", `检测到端口 ${item.port} 已有服务监听（${item.name}），若你准备全量启动，请确认不会端口冲突。`); - } - } - - // 启动前端（production） - const envFrontendServer = { - ...envFrontend, - PORT: String(frontendPort), - HOSTNAME: "0.0.0.0", - }; - spawnTask({ - name: "frontend", - // 说明：next.config.ts 配置了 output: "standalone" 时，应使用 standalone server 启动，避免 next start 行为不一致。 - command: useStandalone - ? "node .next/standalone/server.js" - : `pnpm -C wolai-frontend exec next start -p ${frontendPort} -H 0.0.0.0`, - cwd: useStandalone ? frontendDir : rootDir, - env: envFrontendServer, - }); - - // 启动 wolai-backend（FastAPI） - spawnTask({ - name: "backend", - command: `${pythonBin} -m uvicorn app.main:app --host 0.0.0.0 --port ${backendPort}`, - cwd: backendDir, - env: envBackend, - }); - - // Celery（可选） - if (shouldStartCelery(process.env)) { - const ok = await checkRedisReachable(envBackend.REDIS_URL || redisUrl); - if (ok) { - spawnTask({ - name: "celery", - command: celeryCmdFromEnv || `${celeryBin} -A app.workers.celery_app worker --loglevel=info`, - cwd: backendDir, - env: envBackend, - }); - } else { - logPrefix("celery", `检测到 Redis 不可达（${envBackend.REDIS_URL || redisUrl}），跳过 Celery。`); - } - } else if (isEnabledEnv(process.env.SKIP_CELERY)) { - logPrefix("celery", "已跳过 Celery（SKIP_CELERY=1）"); - } else { - logPrefix("celery", "默认不启动 Celery；当前主线页面不依赖 Redis/Celery。如需启用请设置 ENABLE_CELERY=1 或 CELERY_CMD。"); - } - - // 启动 ingest_service（自动入库、OCR 触发、延迟删除清理） - spawnTask({ - name: "ingest", - command: `${pythonBin} -m uvicorn app.main:app --host 0.0.0.0 --port ${ingestPort}`, - cwd: ingestDir, - env: envInternalServices, - }); - - // 启动 rag_gateway（/rag 查询网关） - spawnTask({ - name: "rag_gateway", - command: `${pythonBin} -m uvicorn app.main:app --host 0.0.0.0 --port ${ragGatewayPort}`, - cwd: ragGatewayDir, - env: envInternalServices, - }); - - logPrefix( - "system", - `已启动：frontend:${frontendPort} backend:${backendPort} ingest:${ingestPort} rag_gateway:${ragGatewayPort}（如需公网访问，请确保 cloudflared tunnel 正在运行）`, - ); -} - -if (require.main === module) { - main().catch((error) => { - console.error(`[system] 启动失败：${error instanceof Error ? error.message : String(error)}`); - process.exit(1); - }); -} - -module.exports = { - shouldStartCelery, -}; diff --git a/scripts/desktop-prod.test.js b/scripts/desktop-prod.test.js deleted file mode 100644 index 2a778391..00000000 --- a/scripts/desktop-prod.test.js +++ /dev/null @@ -1,12 +0,0 @@ -const assert = require("node:assert"); -const { test } = require("node:test"); - -const { shouldStartCelery } = require("./desktop-prod.js"); - -test("desktop-prod 默认跳过 Celery，只有显式开启时才启动", () => { - assert.equal(shouldStartCelery({}), false); - assert.equal(shouldStartCelery({ ENABLE_CELERY: "1" }), true); - assert.equal(shouldStartCelery({ ENABLE_CELERY: "true" }), true); - assert.equal(shouldStartCelery({ CELERY_CMD: "custom-celery" }), true); - assert.equal(shouldStartCelery({ ENABLE_CELERY: "1", SKIP_CELERY: "1" }), false); -}); diff --git a/scripts/env_tools.ps1 b/scripts/env_tools.ps1 index 7160e729..fd5426be 100644 --- a/scripts/env_tools.ps1 +++ b/scripts/env_tools.ps1 @@ -111,12 +111,6 @@ function Get-AppliedEnvFiles { } } - # Vite（开发模式）默认读取：仅对仓库内已存在的 webui 目录做显式识别 - $viteDev = Join-Path $Root "LightRAG\lightrag_webui\.env.development" - if (Test-Path -LiteralPath $viteDev) { - $applied.Add((Resolve-Path -LiteralPath $viteDev).Path) | Out-Null - } - return $applied | Select-Object -Unique } @@ -273,10 +267,7 @@ function Get-MergeOrderScore { # 目录组优先级：越大越[后覆盖]（优先级更高） $group = 0 if ($rel -match "^(?i)wolai-backend[/\\\\]") { $group = 60 } - elseif ($rel -match "^(?i)wolai-frontend[/\\\\]") { $group = 50 } - elseif ($rel -match "^(?i)infra[/\\\\]convex[/\\\\]") { $group = 40 } elseif ($rel -match "^(?i)services[/\\\\]") { $group = 30 } - elseif ($rel -match "^(?i)LightRAG[/\\\\]") { $group = 20 } elseif ($rel -match "^(?i)cankao[/\\\\]") { $group = -50 } elseif ($rel -match "(?i)[/\\\\]test[/\\\\]") { $group = -40 } else { $group = 0 } diff --git a/scripts/prepare-desktop-next.js b/scripts/prepare-desktop-next.js deleted file mode 100644 index e6628152..00000000 --- a/scripts/prepare-desktop-next.js +++ /dev/null @@ -1,121 +0,0 @@ -#!/usr/bin/env node -/** - * 生成桌面端内置的 Next standalone 产物到 `desktop-electron/desktop-next`。 - * - * 目标： - * - 打包时不依赖用户机器上的 pnpm / node 环境即可运行（Electron 自身携带 Node）。 - * - 运行期文件读写落到安装目录的 data/（由 Electron 注入 MNOTE_DATA_DIR）。 - * - * 注意：需要 wolai-frontend 的 next.config.ts 开启 output: "standalone"。 - */ - -const { spawnSync } = require("child_process"); -const fs = require("fs"); -const path = require("path"); - -const rootDir = path.resolve(__dirname, ".."); -const frontendDir = path.join(rootDir, "wolai-frontend"); -const outDir = path.join(rootDir, "desktop-electron", "desktop-next"); - -function parseDotenv(filePath) { - if (!fs.existsSync(filePath)) return {}; - const raw = fs.readFileSync(filePath, { encoding: "utf8" }); - const out = {}; - for (const line of raw.split(/\r?\n/)) { - const trimmed = line.trim(); - if (!trimmed || trimmed.startsWith("#")) continue; - const idx = trimmed.indexOf("="); - if (idx === -1) continue; - const key = trimmed.slice(0, idx).trim(); - const value = trimmed.slice(idx + 1).trim(); - if (!key) continue; - out[key] = value; - } - return out; -} - -function ensureDir(dir) { - fs.mkdirSync(dir, { recursive: true }); -} - -function rmDir(dir) { - fs.rmSync(dir, { recursive: true, force: true }); -} - -function run(command, cwd, env) { - const r = spawnSync(command, { - cwd, - env: { ...process.env, ...env }, - stdio: "inherit", - shell: true, - }); - if (r.status !== 0) { - process.exit(r.status ?? 1); - } -} - -function assertExists(filePath, hint) { - if (!fs.existsSync(filePath)) { - console.error(`\n[prepare-desktop-next] 缺少：${filePath}`); - if (hint) console.error(`[prepare-desktop-next] 提示：${hint}`); - process.exit(1); - } -} - -function copyDir(from, to) { - // 关键：Next standalone 在 pnpm 环境下可能包含大量 symlink/junction。 - // electron-builder 在复制 extraResources 时对链接目录处理不稳定， - // 因此这里强制“解引用复制”，把真实文件复制出来，确保运行期能 require('next')。 - fs.cpSync(from, to, { recursive: true, force: true, dereference: true }); -} - -function main() { - console.log("[prepare-desktop-next] 开始构建 wolai-frontend（standalone）…"); - - // 约定：全局仅使用仓库根目录的 .env.all 作为配置来源（生产优先）。 - // 桌面端如需覆盖，可通过系统环境变量注入（例如在启动命令前临时设置）。 - const envAllPath = path.join(rootDir, ".env.all"); - assertExists(envAllPath, "请先在仓库根目录创建 .env.all（全局唯一 env 文件）。"); - const desktopEnv = { - ...parseDotenv(envAllPath), - }; - console.log("[prepare-desktop-next] 桌面端 env 摘要：", { - NEXT_PUBLIC_BACKEND_URL: desktopEnv.NEXT_PUBLIC_BACKEND_URL, - NEXT_PUBLIC_ONLYOFFICE_BASE_URL: desktopEnv.NEXT_PUBLIC_ONLYOFFICE_BASE_URL, - }); - - run("pnpm -C wolai-frontend build", rootDir, { - NODE_ENV: "production", - NEXT_TELEMETRY_DISABLED: "1", - ...desktopEnv, - }); - - const standaloneDir = path.join(frontendDir, ".next", "standalone"); - const staticDir = path.join(frontendDir, ".next", "static"); - const publicDir = path.join(frontendDir, "public"); - - assertExists( - path.join(standaloneDir, "server.js"), - '请在 wolai-frontend/next.config.ts 增加 `output: "standalone"` 后重试。', - ); - assertExists(staticDir, "Next build 未生成 .next/static（可能构建失败或目录异常）。"); - assertExists(publicDir, "wolai-frontend/public 不存在。"); - - console.log(`[prepare-desktop-next] 清理旧产物：${outDir}`); - rmDir(outDir); - ensureDir(outDir); - - console.log("[prepare-desktop-next] 复制 standalone …"); - copyDir(standaloneDir, outDir); - - console.log("[prepare-desktop-next] 补齐 .next/static …"); - ensureDir(path.join(outDir, ".next")); - copyDir(staticDir, path.join(outDir, ".next", "static")); - - console.log("[prepare-desktop-next] 补齐 public …"); - copyDir(publicDir, path.join(outDir, "public")); - - console.log("[prepare-desktop-next] 完成。"); -} - -main(); diff --git a/scripts/task-editor-delta-channel-smoke.js b/scripts/task-editor-delta-channel-smoke.js index 9fe94d57..9baddbb8 100644 --- a/scripts/task-editor-delta-channel-smoke.js +++ b/scripts/task-editor-delta-channel-smoke.js @@ -169,7 +169,7 @@ async function main() { details: `收到 ${receivedDeltas.length} 条 delta 事件`, }); - // ── 6. 验证编辑器内容已更新（通过回读 Convex） ── + // ── 6. 验证编辑器内容已更新（通过 runtime 回读） ── const readbackRes = await callTool(request, { toolName: "mnote.doc.fetch", workspaceId: target.workspaceId, @@ -185,7 +185,7 @@ async function main() { const finalBlocks = readbackRes.body?.blockDocument?.blocks || []; const hasReplaced = finalBlocks.some((b) => b.text?.includes("段落B已替换")); report.checks.push({ - name: "Convex 回读确认替换成功", + name: "runtime 回读确认替换成功", passed: hasReplaced, details: finalBlocks.map((b) => b.text).join(" | "), }); diff --git a/scripts/task-editor-runtime-actor-smoke.js b/scripts/task-editor-runtime-actor-smoke.js index 1714a94b..b55c7f4f 100644 --- a/scripts/task-editor-runtime-actor-smoke.js +++ b/scripts/task-editor-runtime-actor-smoke.js @@ -6,7 +6,7 @@ * * 验证 EditorRuntimeActor Phase A： * - 块写工具（replace / insert_after）在 actor 启用时返回时间 < 800ms - * - 多次写入循环不依赖 Convex RTT + * - 多次写入循环不依赖远端 RTT * - 写后回读内容正确 * * 依赖：运行中的 mnote-web (localhost:3000)，已登录状态，测试 Helpers @@ -154,7 +154,7 @@ async function main() { console.log(`2/3 insert_after: ${insertMs}ms — ok`); // 3. doc.fetch — 回读验证 - await sleep(500); // 等 Convex 写入完成 + await sleep(500); // 等待 runtime 写入完成 const t4 = Date.now(); const readbackRes = await callTool(request, { toolName: "mnote.doc.fetch", @@ -184,11 +184,11 @@ async function main() { assert.ok(texts.some((t) => t.includes("第三段")), "应包含第三段"); assert.ok(texts.some((t) => t.includes("插入段")), "应包含插入段"); - // ── 延迟断言：三次写循环总时间 < 800ms（不含 Convex wait） ── + // ── 延迟断言：三次写循环总时间 < 800ms（不含回读等待） ── const writeTotal = replaceMs + insertMs; const allWithReadback = writeTotal + readbackMs; console.log(`\n=== 延迟报告 ===`); - console.log(`三次操作总延迟（不含 await Convex）: ${writeTotal}ms`); + console.log(`三次操作总延迟（不含回读等待）: ${writeTotal}ms`); console.log(`含回读总延迟: ${allWithReadback}ms`); // 写操作若 > 800ms 打印 warning 但不 fail（因为首跑可能较慢） diff --git a/scripts/task114-rust-web-gateway-entry-smoke.js b/scripts/task114-rust-web-gateway-entry-smoke.js index 039a59f3..6d6b5a51 100644 --- a/scripts/task114-rust-web-gateway-entry-smoke.js +++ b/scripts/task114-rust-web-gateway-entry-smoke.js @@ -121,7 +121,7 @@ async function validateGateway(baseUrl) { const rootText = await root.text(); assert.equal(root.status, 303, `/ 未登录应跳转 /auth: ${root.status} ${rootText.slice(0, 120)}`); assert.equal(root.headers.get("x-mnote-web-owner"), "mnote-web"); - assert.equal(root.headers.get("location"), "/auth"); + assert.equal(root.headers.get("location"), "/auth?next=%2F"); const authedRoot = await fetchWithTimeout(`${baseUrl}/`, { headers: { diff --git a/scripts/task117-next-retirement-guard.js b/scripts/task117-next-retirement-guard.js deleted file mode 100644 index 3a5459f8..00000000 --- a/scripts/task117-next-retirement-guard.js +++ /dev/null @@ -1,219 +0,0 @@ -#!/usr/bin/env node -"use strict"; - -const assert = require("node:assert"); -const { spawn } = require("node:child_process"); -const { - fetchWithTimeout, - findFreePort, - waitForGateway, -} = require("./task114-rust-web-gateway-entry-smoke.js"); -const { resolveRuntimePlan } = require("./desktop-hot.js"); - -function buildRetirementFixtureEnv(port) { - return { - SKIP_NEXT_LEGACY: "1", - MNOTE_WEB_ALLOW_DEV_FIXTURES: "1", - MNOTE_WEB_BIND: `127.0.0.1:${port}`, - MNOTE_WEB_PUBLIC_BIND: "127.0.0.1:3000", - MNOTE_WEB_ENABLE_LEGACY_NEXT_COMPAT: "0", - MNOTE_WEB_QUERY_FIXTURES_JSON: JSON.stringify({ - "documents:getMeta": { - id: "doc_1", - workspace_id: "ws_demo", - title: "服务端页面", - updated_at: "2026-04-28T00:00:00Z", - can_edit: true, - word_count: 42, - character_count: 128, - block_count: 3, - }, - "documents:getContent": { - content: [{ id: "block_1", type: "paragraph", content: [] }], - revision: 7, - conflict_detection_key: "doc_1:7", - pageSubtree: { rootNodeId: "doc_1", outline: [] }, - }, - "sidebar:datasetList": { - active_workspace_id: "ws_demo", - workspaces: [], - documents: [ - { - id: "doc_1", - workspace_id: "ws_demo", - title: "服务端页面", - parent_id: null, - sort_order: 0, - is_starred: false, - is_template: false, - created_at: "2026-04-28T00:00:00Z", - updated_at: "2026-04-28T00:00:00Z", - }, - ], - trashed_documents: [], - media_assets: [], - trashed_media_assets: [], - mindmap_assets: [], - trashed_mindmap_assets: [], - table_assets: [], - trashed_table_assets: [], - mindmap_docs: [], - mindmap_asset_children: {}, - }, - "bridgeLogs:listWorkspaceOverview": { - workspace_id: "ws_demo", - command_logs: [], - domain_events: [], - next_cursor: null, - has_more: false, - filters: { - command_status: null, - event_status: null, - target_page_id: null, - target_block_id: null, - aggregate_type: null, - aggregate_id: null, - }, - generated_at: "2026-04-28T00:00:00Z", - }, - }), - }; -} - -function startRetiredNextGateway(port) { - return spawn("cargo", ["run", "-q", "-p", "mnote-web", "--bin", "mnote-web"], { - cwd: "/mnt/Data1T/mnote/rust", - env: { - ...process.env, - ...buildRetirementFixtureEnv(port), - }, - stdio: ["ignore", "pipe", "pipe"], - }); -} - -function authedInit(init = {}) { - return { - ...init, - headers: { - ...(init.headers || {}), - "x-mnote-actor-id": "user_real", - "x-mnote-actor-type": "user", - }, - }; -} - -async function readText(baseUrl, path, init) { - const response = await fetchWithTimeout(`${baseUrl}${path}`, init); - const text = await response.text(); - assert.equal(response.status, 200, `${path} 请求失败: ${response.status} ${text.slice(0, 200)}`); - assert.equal(response.headers.get("x-mnote-web-owner"), "mnote-web", `${path} 缺少 mnote-web owner`); - assert.equal( - response.headers.get("x-mnote-legacy-upstream"), - null, - `${path} 默认主路径不应出现 Next fallback header`, - ); - return { response, text }; -} - -async function validateSkipNextRuntimePlan() { - const plan = resolveRuntimePlan({ - FRONTEND_PORT: "3000", - NEXT_LEGACY_PORT: "3100", - MNOTE_WEB_ENABLE_LEGACY_NEXT_COMPAT: "1", - }); - assert.equal(plan.skipGateway, false); - assert.equal(plan.skipNextLegacy, true); - assert.equal(plan.frontendTaskName, null); - assert.equal(plan.publicPort, 3000); - assert.equal(plan.legacyPort, 3100); - assert.equal(plan.mnoteWebEnv.MNOTE_WEB_ENABLE_LEGACY_NEXT_COMPAT, "0"); - assert.equal("MNOTE_WEB_LEGACY_NEXT_BASE_URL" in plan.mnoteWebEnv, false); - return plan; -} - -async function validateCoreShellsWithoutNext(baseUrl) { - const root = await readText(baseUrl, "/?workspaceId=ws_demo", authedInit()); - assert.match(root.text, /data-mnote-shell="workspace"/); - assert.doesNotMatch(root.text, /next-app-router/i); - - const auth = await readText(baseUrl, "/auth"); - assert.match(auth.text, /data-mnote-shell="auth"/); - assert.doesNotMatch(auth.text, /next-app-router/i); - - const document = await readText(baseUrl, "/documents/doc_1?workspaceId=ws_demo", authedInit()); - assert.equal(document.response.headers.get("x-mnote-web-shell"), "document"); - assert.match(document.text, /mnote\.page_aggregate\.v1/); - - const treeEvents = await fetchWithTimeout(`${baseUrl}/api/tree/events?workspaceId=ws_demo&maxPolls=0`, authedInit()); - const treeBody = await treeEvents.text(); - assert.equal(treeEvents.status, 200, `/api/tree/events 请求失败: ${treeEvents.status} ${treeBody.slice(0, 200)}`); - assert.equal(treeEvents.headers.get("x-mnote-web-owner"), "mnote-web"); - assert.equal(treeEvents.headers.get("x-mnote-tree-stream-owner"), "rust-web"); - assert.match(treeBody, /event:\s*snapshot/); - - const search = await readText(baseUrl, "/search?workspaceId=ws_demo&q=Rust", authedInit()); - assert.equal(search.response.headers.get("x-mnote-web-shell"), "search"); - assert.match(search.text, /mnote\.search_shell\.v1/); - - const mindmap = await readText(baseUrl, "/mindmap/doc_1/mind_1", authedInit()); - assert.equal(mindmap.response.headers.get("x-mnote-web-shell"), "mindmap"); - assert.match(mindmap.text, /mnote\.mindmap_shell\.v1/); - assert.doesNotMatch(mindmap.text, /next-app-router/i); -} - -async function validateDocs() { - const fs = require("node:fs"); - const architecture = fs.readFileSync("/mnt/Data1T/mnote/ARCHITECTURE.md", "utf8"); - assert.match(architecture, /Next App Router.*legacy compat/is, "ARCHITECTURE.md 未标记 Next App Router legacy compat"); - assert.doesNotMatch(architecture, /Next App Router 仍是当前 legacy 主壳/, "ARCHITECTURE.md 仍保留旧主壳口径"); -} - -async function main() { - const plan = await validateSkipNextRuntimePlan(); - const port = await findFreePort(); - const baseUrl = `http://127.0.0.1:${port}`; - const gateway = startRetiredNextGateway(port); - let stderr = ""; - gateway.stderr.on("data", (chunk) => { - stderr += chunk.toString("utf8"); - }); - - try { - await waitForGateway(baseUrl); - await validateCoreShellsWithoutNext(baseUrl); - await validateDocs(); - console.log( - JSON.stringify( - { - ok: true, - baseUrl, - publicEntry: String(plan.publicPort), - legacyPort: String(plan.legacyPort), - nextLegacyStarted: false, - owner: "mnote-web", - }, - null, - 2, - ), - ); - } catch (error) { - if (stderr.trim()) { - console.error(stderr.trim().slice(-2000)); - } - throw error; - } finally { - if (gateway.pid) { - gateway.kill("SIGTERM"); - setTimeout(() => { - if (!gateway.killed) { - gateway.kill("SIGKILL"); - } - }, 2000).unref(); - } - } -} - -main().catch((error) => { - console.error(error instanceof Error ? error.stack || error.message : String(error)); - process.exit(1); -}); diff --git a/scripts/task154-e26-anchor-smoke.js b/scripts/task154-e26-anchor-smoke.js deleted file mode 100644 index 9bff342d..00000000 --- a/scripts/task154-e26-anchor-smoke.js +++ /dev/null @@ -1,241 +0,0 @@ -#!/usr/bin/env node -"use strict"; - -const assert = require("node:assert"); -const fs = require("node:fs"); -const { chromium } = require("playwright"); -const { fetchWithTimeout } = require("./task114-rust-web-gateway-entry-smoke.js"); - -const BASE_URL = (process.env.MNOTE_UI_BASE_URL || "http://127.0.0.1:3000").replace(/\/+$/, ""); -const UI_TIMEOUT_MS = Number(process.env.MNOTE_SMOKE_UI_TIMEOUT_MS || 30_000); -const SCREENSHOT_DIR = process.env.MNOTE_PHASE_E_SCREENSHOT_DIR || "/mnt/Data1T/mnote/tmp/wolai-editor-parity/task154-e26-anchor-local-smoke"; -const LEPTOS_SPIKE_SOURCE = "/mnt/Data1T/mnote/rust/spikes/leptos-tiptap-spike/src/lib.rs"; -const CONVERTER_SOURCE = "/mnt/Data1T/mnote/wolai-frontend/src/lib/documents/tiptap-content-converter.ts"; -const TARGET_BLOCK_ID = "e26-anchor-target"; -const SECOND_BLOCK_ID = "e26-anchor-second"; - -function assertAnchorSourceBoundary() { - const spike = fs.readFileSync(LEPTOS_SPIKE_SOURCE, "utf8"); - assert(!spike.includes('Some(format!("top-level-{index}"))'), "E26 不能继续把 top-level 序号当块锚点 id"); - assert(spike.includes("data-block-id"), "E26 runtime DOM 必须暴露 data-block-id"); - assert(spike.includes("navigator.clipboard.writeText"), "E26 复制链接必须真实写入剪贴板"); - assert(spike.includes("scroll_mnote_block_anchor_from_hash"), "E26 必须处理 reload/hash 定位"); - const converter = fs.readFileSync(CONVERTER_SOURCE, "utf8"); - assert(converter.includes('const BLOCK_ID_ATTR = "blockId"'), "TS 转换层必须继续以 Rust blockId 作为 Tiptap attrs 真源"); - assert(converter.includes("editorBlockDocumentFromTiptapDoc"), "保存链必须继续回到 EditorBlockDocument"); -} - -async function readJsonResponse(response, label) { - const text = await response.text(); - let payload = null; - try { - payload = text ? JSON.parse(text) : null; - } catch { - throw new Error(`${label} 返回了非 JSON 内容: ${text.slice(0, 1200)}`); - } - assert(response.ok, `${label} 请求失败: ${response.status}; body: ${text.slice(0, 1200)}`); - return payload; -} - -async function postTreeCommand(body, label) { - const response = await fetchWithTimeout(`${BASE_URL}/api/tree/commands`, { - method: "POST", - headers: { "content-type": "application/json" }, - body: JSON.stringify(body), - }); - const payload = await readJsonResponse(response, label); - assert(payload?.result, `${label} 缺少 result`); - return payload.result; -} - -async function createTempDocument() { - const title = `task154-e26-anchor-${Date.now().toString(36)}`; - const result = await postTreeCommand({ action: "create", title }, "创建 E26 临时文档"); - assert(result.documentId, "创建 E26 临时文档缺少 documentId"); - assert(result.workspaceId, "创建 E26 临时文档缺少 workspaceId"); - return { documentId: result.documentId, workspaceId: result.workspaceId, title }; -} - -async function purgeTempDocument(target) { - if (!target?.documentId || !target?.workspaceId) return; - await postTreeCommand({ action: "purge", workspaceId: target.workspaceId, documentId: target.documentId }, "清理 E26 临时文档"); -} - -async function loadDocumentContent(target, label) { - const url = `${BASE_URL}/api/documents/content?documentId=${encodeURIComponent(target.documentId)}&workspaceId=${encodeURIComponent(target.workspaceId)}`; - const response = await fetchWithTimeout(url, { method: "GET" }); - return readJsonResponse(response, label); -} - -async function waitForRuntimeIsland(page) { - const root = page.locator('[data-testid="mnote-leptos-tiptap-island-editor-root"]').first(); - await root.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - const editor = page.locator('[data-testid="mnote-leptos-tiptap-island-editor-root"] .editor-surface .ProseMirror[contenteditable="true"]').first(); - await editor.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.waitForFunction(() => { - const host = document.querySelector('[data-testid="mnote-leptos-tiptap-island-editor-root"]'); - const editorNode = host?.querySelector('.editor-surface .ProseMirror[contenteditable="true"]'); - return host?.getAttribute("data-runtime-editor-status") !== "error" && editorNode instanceof HTMLElement && editorNode.isContentEditable; - }, null, { timeout: UI_TIMEOUT_MS }); - return editor; -} - -async function screenshot(page, name) { - fs.mkdirSync(SCREENSHOT_DIR, { recursive: true }); - await page.screenshot({ path: `${SCREENSHOT_DIR}/${name}.png`, fullPage: true }); -} - -function collectBlockIds(value, ids = []) { - if (!value || typeof value !== "object") return ids; - if (Array.isArray(value)) { - for (const item of value) collectBlockIds(item, ids); - return ids; - } - if (typeof value.blockId === "string") ids.push(value.blockId); - if (typeof value.id === "string") ids.push(value.id); - if (value.attrs && typeof value.attrs.blockId === "string") ids.push(value.attrs.blockId); - collectBlockIds(value.content, ids); - collectBlockIds(value.children, ids); - collectBlockIds(value.blocks, ids); - collectBlockIds(value.editorDocument, ids); - return ids; -} - -async function setAnchorFixture(page) { - await page.evaluate(({ targetBlockId, secondBlockId }) => { - const editor = document.querySelector('.editor-surface .ProseMirror')?.editor; - if (!editor) throw new Error('找不到 Tiptap editor'); - editor.commands.setContent({ - type: 'doc', - content: [ - { - type: 'paragraph', - attrs: { blockId: targetBlockId }, - content: [{ type: 'text', text: 'E26 anchor target paragraph' }], - }, - { - type: 'heading', - attrs: { blockId: secondBlockId, level: 2 }, - content: [{ type: 'text', text: 'E26 second heading' }], - }, - ], - }, true); - editor.commands.focus('start'); - }, { targetBlockId: TARGET_BLOCK_ID, secondBlockId: SECOND_BLOCK_ID }); - try { - await page.waitForFunction(({ targetBlockId, secondBlockId }) => { - return document.querySelector(`[data-block-id="${targetBlockId}"]`) instanceof HTMLElement - && document.querySelector(`[data-block-id="${secondBlockId}"]`) instanceof HTMLElement; - }, { targetBlockId: TARGET_BLOCK_ID, secondBlockId: SECOND_BLOCK_ID }, { timeout: UI_TIMEOUT_MS }); - } catch (error) { - const diagnostics = await page.evaluate(() => { - const host = document.querySelector('[data-testid="mnote-leptos-tiptap-island-editor-root"]'); - const editor = document.querySelector('.editor-surface .ProseMirror'); - return { - status: host?.getAttribute('data-runtime-editor-status') || null, - html: editor?.innerHTML || null, - json: editor?.editor?.getJSON?.() || null, - }; - }).catch((evalError) => ({ evalError: String(evalError) })); - throw new Error(`E26 fixture 未渲染 data-block-id: ${JSON.stringify(diagnostics).slice(0, 2400)}; cause=${error.message}`); - } -} - -async function waitForSavedDocument(page, expectedBlockIds) { - await page.waitForFunction(({ expectedBlockIds }) => { - const host = document.querySelector('[data-testid="mnote-leptos-tiptap-island-editor-root"]'); - if (host?.getAttribute('data-runtime-editor-status') !== 'saved') return false; - const editor = host?.querySelector('.editor-surface .ProseMirror'); - if (!(editor instanceof HTMLElement)) return false; - return expectedBlockIds.every((blockId) => editor.querySelector(`[data-block-id="${blockId}"]`) instanceof HTMLElement); - }, { expectedBlockIds }, { timeout: UI_TIMEOUT_MS }); -} - -async function openBlockMenuForTarget(page) { - const target = page.locator(`[data-block-id="${TARGET_BLOCK_ID}"]`).first(); - await target.scrollIntoViewIfNeeded({ timeout: UI_TIMEOUT_MS }); - await target.hover({ timeout: UI_TIMEOUT_MS }); - const handle = page.locator('[data-testid="block-drag-handle-trigger"]').first(); - await handle.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await handle.click({ timeout: UI_TIMEOUT_MS }); - const menu = page.locator('[data-testid="block-drag-menu"]').first(); - await menu.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - return menu; -} - -async function main() { - assertAnchorSourceBoundary(); - - const browser = await chromium.launch({ headless: true }); - const context = await browser.newContext({ viewport: { width: 1440, height: 960 }, permissions: ["clipboard-read", "clipboard-write"] }); - const page = await context.newPage(); - const saveRequests = []; - page.on("request", (request) => { - if (!request.url().includes("/api/documents/save")) return; - const body = request.postData(); - if (!body) return; - try { - saveRequests.push(JSON.parse(body)); - } catch { - saveRequests.push({ raw: body }); - } - }); - - let target = null; - try { - target = await createTempDocument(); - const url = `${BASE_URL}/documents/${encodeURIComponent(target.documentId)}?workspaceId=${encodeURIComponent(target.workspaceId)}`; - const response = await page.goto(url, { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - assert(response, "文档页没有返回响应"); - assert.equal(response.status(), 200, `文档页状态码异常: ${response.status()}`); - - await waitForRuntimeIsland(page); - await setAnchorFixture(page); - await waitForSavedDocument(page, [TARGET_BLOCK_ID, SECOND_BLOCK_ID]); - await screenshot(page, "01-anchor-blocks-with-data-block-id"); - - const persistedByRequest = [...saveRequests].reverse().find((request) => collectBlockIds(request).includes(TARGET_BLOCK_ID)); - assert(persistedByRequest, `保存请求必须包含 Rust blockId 派生的 EditorBlockDocument/TiptapDocument: ${JSON.stringify(saveRequests.slice(-3)).slice(0, 2000)}`); - - const contentAfterSave = await loadDocumentContent(target, "读取 E26 保存后的正文"); - assert(collectBlockIds(contentAfterSave?.result ?? contentAfterSave).includes(TARGET_BLOCK_ID), `/api/documents/content 必须保留目标 blockId: ${JSON.stringify(contentAfterSave).slice(0, 1600)}`); - - const menu = await openBlockMenuForTarget(page); - await screenshot(page, "02-block-menu-copy-link-entry"); - await menu.locator('[data-testid="block-drag-menu-item-copy-link"]').first().click({ timeout: UI_TIMEOUT_MS }); - const clipboardText = await page.evaluate(() => navigator.clipboard.readText()); - assert(clipboardText.includes(`/documents/${target.documentId}`), `复制链接必须指向当前页面: ${clipboardText}`); - assert(clipboardText.endsWith(`#${TARGET_BLOCK_ID}`), `复制链接必须使用 Rust blockId 作为 hash: ${clipboardText}`); - assert(!clipboardText.includes("top-level-"), `复制链接不能使用前端序号 id: ${clipboardText}`); - - const hashUrl = new URL(clipboardText); - assert.equal(hashUrl.hash, `#${TARGET_BLOCK_ID}`, `复制链接 hash 异常: ${clipboardText}`); - await page.goto(hashUrl.href, { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - await waitForRuntimeIsland(page); - await page.waitForFunction((targetBlockId) => { - const block = document.querySelector(`[data-block-id="${targetBlockId}"]`); - if (!(block instanceof HTMLElement)) return false; - const rect = block.getBoundingClientRect(); - const anchorMatched = block.id === targetBlockId && block.matches(":target"); - const highlighted = anchorMatched - || block.getAttribute("data-anchor-highlight") === "true" - || block.classList.contains("mnote-block-anchor-highlight"); - return rect.top >= 0 && rect.top < window.innerHeight * 0.75 && highlighted; - }, TARGET_BLOCK_ID, { timeout: UI_TIMEOUT_MS }); - await screenshot(page, "03-after-hash-reload-anchor-highlight"); - - console.log(JSON.stringify({ ok: true, baseUrl: BASE_URL, documentId: target.documentId, blockId: TARGET_BLOCK_ID, clipboardText, screenshotDir: SCREENSHOT_DIR }, null, 2)); - } finally { - if (target) await purgeTempDocument(target).catch(() => undefined); - await page.close().catch(() => undefined); - await context.close().catch(() => undefined); - await browser.close().catch(() => undefined); - } -} - -if (require.main === module) { - main().catch((error) => { - console.error(error instanceof Error ? error.stack || error.message : String(error)); - process.exit(1); - }); -} diff --git a/scripts/task163-local-folder-unified-tree-browser-smoke.js b/scripts/task163-local-folder-unified-tree-browser-smoke.js deleted file mode 100644 index 68202de3..00000000 --- a/scripts/task163-local-folder-unified-tree-browser-smoke.js +++ /dev/null @@ -1,904 +0,0 @@ -"use strict"; - -const fs = require("fs"); -const os = require("os"); -const path = require("path"); -const { chromium } = require("playwright"); - -const BASE_URL = (process.env.MNOTE_WEB_SMOKE_BASE_URL || "http://127.0.0.1:3000").replace(/\/+$/, ""); -const UI_TIMEOUT_MS = Number(process.env.MNOTE_SMOKE_UI_TIMEOUT_MS || 30_000); - -function assert(condition, message) { - if (!condition) { - throw new Error(message); - } -} - -function fileUrl(localPath) { - return `file://${localPath}`; -} - -function treeUrl(root, mode) { - const url = new URL(`${BASE_URL}/`); - url.searchParams.set("treeView", mode); - url.searchParams.set("sourceKind", "local_folder"); - url.searchParams.set("rootUri", fileUrl(root)); - return url.toString(); -} - -function documentUrl(root, documentId) { - const url = new URL(`${BASE_URL}/documents/${encodeURIComponent(documentId)}`); - url.searchParams.set("sourceKind", "local_folder"); - url.searchParams.set("rootUri", fileUrl(root)); - return url.toString(); -} - -function convexTreeUrl(mode = "filetree") { - const url = new URL(`${BASE_URL}/`); - url.searchParams.set("treeView", mode); - url.searchParams.set("workspaceId", "ws_demo"); - url.searchParams.set("sourceKind", "convex_workspace"); - return url.toString(); -} - -async function waitForText(page, text) { - await page.waitForFunction( - (expectedText) => Array.from(document.querySelectorAll("body *")).some((element) => { - const textContent = element.textContent ? element.textContent.trim() : ""; - if (textContent !== expectedText) return false; - const style = window.getComputedStyle(element); - const rect = element.getBoundingClientRect(); - return style.display !== "none" && style.visibility !== "hidden" && rect.width > 0 && rect.height > 0; - }), - text, - { timeout: UI_TIMEOUT_MS }, - ); -} - -async function waitForContextMenu(page) { - const menu = page.locator('[data-testid="mnote-tree-context-menu"]').first(); - await menu.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - return menu; -} - -async function clickMenuAction(page, action) { - await page.locator(`[data-testid="mnote-tree-context-menu"] [data-menu-action="${action}"]`).click({ timeout: UI_TIMEOUT_MS }); -} - -async function expectMenuAction(page, action, options = {}) { - const item = page.locator(`[data-testid="mnote-tree-context-menu"] [data-menu-action="${action}"]`).first(); - await item.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - const disabled = await item.isDisabled(); - if (options.disabled !== undefined) { - assert(disabled === options.disabled, `${action} 菜单项 disabled=${disabled} 不符合预期`); - } - if (options.reasonIncludes) { - const reason = await item.getAttribute("data-disabled-reason"); - assert((reason || "").includes(options.reasonIncludes), `${action} 菜单项应展示禁用原因`); - } -} - -async function closeContextMenu(page) { - await page.keyboard.press("Escape"); - try { - await page.locator('[data-testid="mnote-tree-context-menu"]').waitFor({ state: "detached", timeout: 1_000 }); - } catch { - await page.evaluate(() => { - document.querySelectorAll('[data-testid="mnote-tree-context-menu"]').forEach((element) => element.remove()); - }); - await page.locator('[data-testid="mnote-tree-context-menu"]').waitFor({ state: "detached", timeout: UI_TIMEOUT_MS }); - } -} - -async function dispatchFolderContextMenu(page, rowSelector) { - await page.evaluate( - ({ rowSelector }) => { - const row = document.querySelector(rowSelector); - if (!(row instanceof HTMLElement)) throw new Error("filetree folder row 不存在"); - row.dispatchEvent(new MouseEvent("contextmenu", { - bubbles: true, - cancelable: true, - clientX: 24, - clientY: 64, - })); - }, - { rowSelector }, - ); -} - -async function dispatchRootContextMenu(page) { - await page.evaluate(() => { - const root = document.querySelector("#sidebar-file-tree-root .tree-root"); - if (!(root instanceof HTMLElement)) throw new Error("filetree root 不存在"); - root.dispatchEvent(new MouseEvent("contextmenu", { - bubbles: true, - cancelable: true, - clientX: 24, - clientY: 64, - })); - }); -} - -async function waitForPreflight(page, titleText) { - const preflight = page.locator('[data-testid="tree-preflight"]').first(); - await preflight.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - if (titleText) { - await preflight.getByText(titleText, { exact: false }).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - } - return preflight; -} - -async function cancelPreflight(page) { - await page.locator('[data-testid="tree-preflight"] [data-role="cancel"]').click({ timeout: UI_TIMEOUT_MS }); - await page.locator('[data-testid="tree-preflight"]').waitFor({ state: "detached", timeout: UI_TIMEOUT_MS }); -} - -async function confirmPreflight(page) { - await page.locator('[data-testid="tree-preflight"] [data-role="confirm"]').click({ timeout: UI_TIMEOUT_MS }); - await page.locator('[data-testid="tree-preflight"]').waitFor({ state: "detached", timeout: UI_TIMEOUT_MS }); -} - -async function dispatchInternalDrop(page, sourceRowSelector, targetRowSelector, options = {}) { - await page.evaluate( - ({ sourceRowSelector, targetRowSelector, altKey }) => { - const source = document.querySelector(sourceRowSelector); - const target = document.querySelector(targetRowSelector); - if (!(source instanceof HTMLElement) || !(target instanceof HTMLElement)) { - throw new Error("拖拽目标不存在"); - } - const dataTransfer = new DataTransfer(); - source.dispatchEvent(new DragEvent("dragstart", { bubbles: true, cancelable: true, dataTransfer })); - target.dispatchEvent(new DragEvent("dragover", { bubbles: true, cancelable: true, dataTransfer, altKey })); - target.dispatchEvent(new DragEvent("drop", { bubbles: true, cancelable: true, dataTransfer, altKey })); - source.dispatchEvent(new DragEvent("dragend", { bubbles: true, cancelable: true, dataTransfer })); - }, - { sourceRowSelector, targetRowSelector, altKey: Boolean(options.altKey) }, - ); -} - -async function dispatchInternalDragOver(page, sourceRowSelector, targetRowSelector, ratio) { - return await page.evaluate( - ({ sourceRowSelector, targetRowSelector, ratio }) => { - const source = document.querySelector(sourceRowSelector); - const target = document.querySelector(targetRowSelector); - if (!(source instanceof HTMLElement) || !(target instanceof HTMLElement)) { - throw new Error("拖拽目标不存在"); - } - const rect = target.getBoundingClientRect(); - const dataTransfer = new DataTransfer(); - source.dispatchEvent(new DragEvent("dragstart", { bubbles: true, cancelable: true, dataTransfer })); - target.dispatchEvent(new DragEvent("dragover", { - bubbles: true, - cancelable: true, - dataTransfer, - clientX: rect.left + rect.width / 2, - clientY: rect.top + rect.height * ratio, - })); - return { - dropTarget: target.dataset.dropTarget || "", - dropPosition: target.dataset.dropPosition || "", - }; - }, - { sourceRowSelector, targetRowSelector, ratio }, - ); -} - -async function dispatchExternalFileDrop(page, targetRowSelector, fileName, text) { - await page.evaluate( - ({ targetRowSelector, fileName, text }) => { - const target = document.querySelector(targetRowSelector); - if (!(target instanceof HTMLElement)) { - throw new Error("外部拖入目标不存在"); - } - const dataTransfer = new DataTransfer(); - dataTransfer.items.add(new File([text], fileName, { type: "text/plain" })); - target.dispatchEvent(new DragEvent("dragover", { bubbles: true, cancelable: true, dataTransfer })); - target.dispatchEvent(new DragEvent("drop", { bubbles: true, cancelable: true, dataTransfer })); - }, - { targetRowSelector, fileName, text }, - ); -} - -async function waitForHostMessage(page, type, predicate = () => true) { - return await page.waitForFunction( - ({ type }) => { - const messages = Array.isArray(window.__mnoteHostMessages) ? window.__mnoteHostMessages : []; - return messages.find((message) => message && message.type === type) || null; - }, - { type }, - { timeout: UI_TIMEOUT_MS }, - ).then(async (handle) => { - const message = await handle.evaluate((value) => { - const files = Array.from(value?.files || []).map((file) => ({ - name: file?.name || "", - size: Number.isFinite(file?.size) ? file.size : 0, - type: file?.type || "", - })); - return { - ...value, - files, - }; - }); - assert(predicate(message), `${type} host message 不符合预期: ${JSON.stringify(message)}`); - return message; - }); -} - -async function dispatchForeignInternalDrop(page, targetRowSelector) { - await page.evaluate( - ({ targetRowSelector }) => { - const target = document.querySelector(targetRowSelector); - if (!(target instanceof HTMLElement)) { - throw new Error("跨 workspace 拖拽目标不存在"); - } - const dataTransfer = new DataTransfer(); - const payload = JSON.stringify({ type: "mnote-file-tree-dnd", version: 1, rowIds: ["foreign:workspace-row"] }); - dataTransfer.setData("application/x-mnote-filetree-row-ids", payload); - target.dispatchEvent(new DragEvent("dragover", { bubbles: true, cancelable: true, dataTransfer })); - target.dispatchEvent(new DragEvent("drop", { bubbles: true, cancelable: true, dataTransfer })); - }, - { targetRowSelector }, - ); -} - -async function run() { - const root = fs.mkdtempSync(path.join(os.tmpdir(), "mnote-local-folder-smoke-")); - fs.mkdirSync(path.join(root, "docs")); - fs.mkdirSync(path.join(root, "docs", "nested")); - fs.mkdirSync(path.join(root, "readonly-dir")); - fs.mkdirSync(path.join(root, ".git")); - fs.mkdirSync(path.join(root, "node_modules")); - fs.mkdirSync(path.join(root, ".mnote")); - fs.writeFileSync(path.join(root, "README.md"), "---\ntitle: Frontmatter Title\n---\n# Ignored\n正文\n", "utf8"); - fs.writeFileSync(path.join(root, "docs", "child.md"), "# Child H1\n", "utf8"); - fs.writeFileSync(path.join(root, "docs", "nested", "deep.md"), "# Deep Page\n", "utf8"); - fs.writeFileSync( - path.join(root, "docs", "blocks.md"), - "---\ntitle: Complex Title\n---\n# Complex H1\n\nparagraph with `inline code`, **bold**, *italic*, ~~strike~~, and [Link](https://example.com).\n\n- Bullet item\n1. Numbered item\n- [ ] Unchecked item\n- [x] Checked item\n> Quote item\n```js\nconsole.log('hi')\n```\n---\n[Spec](assets/spec.pdf)\n\n| Name | Value |\n| --- | --- |\n| Mark | `cell` |\n", - "utf8", - ); - fs.writeFileSync(path.join(root, "image.png"), "png", "utf8"); - fs.writeFileSync(path.join(root, ".git", "hidden.md"), "# hidden\n", "utf8"); - fs.writeFileSync(path.join(root, "node_modules", "hidden.md"), "# hidden\n", "utf8"); - fs.chmodSync(path.join(root, "readonly-dir"), 0o555); - - const browser = await chromium.launch({ headless: true }); - const context = await browser.newContext({ - viewport: { width: 1280, height: 860 }, - extraHTTPHeaders: { - "x-mnote-actor-id": "user_real", - "x-mnote-actor-type": "user", - }, - }); - const page = await context.newPage(); - const requests = []; - const navigationEvents = []; - page.on("framenavigated", (frame) => { - if (frame === page.mainFrame()) { - navigationEvents.push({ - url: frame.url(), - timestamp: Date.now(), - }); - } - }); - page.on("request", (request) => { - if ( - request.url().includes("/api/tree/commands") || - request.url().includes("/api/documents/title") || - request.url().includes("/api/documents/save") || - request.url().includes("/api/documents/options") || - request.url().includes("/api/ui/preferences") - ) { - requests.push({ - url: request.url(), - method: request.method(), - body: request.postData() || "", - }); - } - }); - - try { - await page.goto(documentUrl(root, "local-md:README.md"), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - await page.reload({ waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - await waitForText(page, "Frontmatter Title"); - const dialogs = []; - page.on("dialog", async (dialog) => { - dialogs.push(dialog.type()); - await dialog.dismiss().catch(() => {}); - }); - await page.locator('[data-mnote-action="open-local-folder"]').click({ timeout: UI_TIMEOUT_MS }); - await page.locator('[data-testid="mnote-local-folder-dialog"]').waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - assert(dialogs.length === 0, "打开本地文件夹入口不能再依赖 prompt/alert/confirm 原生弹窗"); - await page.locator('[data-testid="mnote-local-folder-path-input"]').fill(root); - await page.locator('[data-testid="mnote-local-folder-open-confirm"]').click({ timeout: UI_TIMEOUT_MS }); - await page.waitForURL( - (url) => - url.pathname === "/" && - url.searchParams.get("treeView") === "filetree" && - url.searchParams.get("sourceKind") === "local_folder" && - url.searchParams.get("rootUri") === fileUrl(root), - { timeout: UI_TIMEOUT_MS }, - ); - await waitForText(page, "README.md"); - const recentLocalRoots = await page.evaluate(() => { - const raw = window.localStorage.getItem("mnote.localFolder.recentRoots") || "[]"; - return JSON.parse(raw); - }); - assert(recentLocalRoots[0] === fileUrl(root), "打开本地文件夹入口应记录最近 rootUri"); - - await page.goto(treeUrl(root, "filetree"), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - await waitForText(page, "README.md"); - await waitForText(page, "docs"); - await waitForText(page, "image.png"); - assert(!(await page.getByText(".git", { exact: true }).isVisible().catch(() => false)), ".git 不应出现在 Explorer"); - assert(!(await page.getByText("node_modules", { exact: true }).isVisible().catch(() => false)), "node_modules 不应出现在 Explorer"); - assert(await page.locator('[data-row-kind="folder"][data-row-id="local:folder:docs"]').count() === 1, "目录 rowKind 应保持 folder"); - assert(await page.locator('[data-row-kind="markdown"][data-row-id="local:markdown:README.md"]').count() === 1, "Markdown rowKind 应保持 markdown"); - - await page.goto(treeUrl(root, "page"), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - await waitForText(page, "Frontmatter Title"); - await waitForText(page, "Child H1"); - assert(!(await page.getByText("image.png", { exact: true }).isVisible().catch(() => false)), "page_tree 不应显示普通文件"); - - await page.goto(documentUrl(root, "local-md:README.md"), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - await waitForText(page, "Frontmatter Title"); - await waitForText(page, "正文"); - const defaultHeadingBefore = await page.locator("#mnote-leptos-tiptap-island-editor-root .ProseMirror h1").first().evaluate((node) => - window.getComputedStyle(node, "::before").content - ); - assert(defaultHeadingBefore === "none", `本地 Markdown 默认不应开启标题自动编号，实际 ::before=${defaultHeadingBefore}`); - await page.evaluate(async ({ rootUri }) => { - const common = { - documentId: "local-md:README.md", - sourceKind: "local_folder", - rootUri, - }; - const titleResponse = await fetch("/api/documents/title", { - method: "POST", - headers: { "content-type": "application/json" }, - body: JSON.stringify({ - ...common, - title: "Browser Saved Title", - commandName: "page.head.updateTitle", - }), - }); - if (!titleResponse.ok) throw new Error(`title_failed_${titleResponse.status}`); - const saveResponse = await fetch("/api/documents/save", { - method: "POST", - headers: { "content-type": "application/json" }, - body: JSON.stringify({ - ...common, - content: [ - { - id: "h1", - type: "heading", - props: { level: 1 }, - content: [{ type: "text", text: "Browser Saved Heading" }], - }, - { - id: "p1", - type: "paragraph", - content: [{ type: "text", text: "Browser saved body" }], - }, - ], - blockCount: 2, - }), - }); - if (!saveResponse.ok) throw new Error(`save_failed_${saveResponse.status}`); - const optionsResponse = await fetch("/api/documents/options", { - method: "POST", - headers: { "content-type": "application/json" }, - body: JSON.stringify({ ...common, options: { wideLayout: true, showToc: false, showHeadingNumbers: true } }), - }); - if (!optionsResponse.ok) throw new Error(`options_failed_${optionsResponse.status}`); - }, { rootUri: fileUrl(root) }); - assert(fs.readFileSync(path.join(root, "README.md"), "utf8").includes("Browser saved body"), "浏览器保存应写回 Markdown 正文"); - assert(!fs.existsSync(path.join(root, ".mnote", "page-options.json")), "浏览器页面设置保存不应继续写入 .mnote/page-options.json"); - await page.reload({ waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - await waitForText(page, "Browser Saved Title"); - await waitForText(page, "Browser saved body"); - const enabledHeadingBefore = await page.locator("#mnote-leptos-tiptap-island-editor-root .ProseMirror h1").first().evaluate((node) => - window.getComputedStyle(node, "::before").content - ); - assert(enabledHeadingBefore !== "none", "SQLite 偏好开启后应显示标题自动编号"); - await page.goto(documentUrl(root, "local-md:docs~2Fblocks.md"), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - await waitForText(page, "Complex Title"); - await waitForText(page, "Bullet item"); - await waitForText(page, "Numbered item"); - await waitForText(page, "Quote item"); - await waitForText(page, "console.log('hi')"); - await waitForText(page, "Spec"); - await page.locator(".ProseMirror").waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - const checkboxStates = await page.locator(".ProseMirror input[type='checkbox']").evaluateAll((nodes) => - nodes.map((node) => Boolean(node.checked)) - ); - assert(checkboxStates.length === 2, `本地 Markdown 应渲染两个 checkbox，实际 ${checkboxStates.length}`); - assert(checkboxStates.includes(true), "本地 Markdown 应渲染 checked checkbox"); - assert(checkboxStates.includes(false), "本地 Markdown 应渲染 unchecked checkbox"); - assert(await page.locator(".ProseMirror p code", { hasText: "inline code" }).count() >= 1, "inline code 应渲染为 code mark"); - assert(await page.locator(".ProseMirror strong", { hasText: "bold" }).count() >= 1, "strong 应渲染为 strong 标签"); - assert(await page.locator(".ProseMirror em", { hasText: "italic" }).count() >= 1, "em 应渲染为 em 标签"); - assert(await page.locator(".ProseMirror s, .ProseMirror del", { hasText: "strike" }).count() >= 1, "strike 应渲染为删除线标签"); - const linkTexts = await page.locator(".ProseMirror a").evaluateAll((nodes) => nodes.map((node) => node.textContent?.trim() || "")); - assert(linkTexts.includes("Link"), `普通链接应渲染为 a 标签，实际 ${JSON.stringify(linkTexts)}`); - assert(linkTexts.includes("Spec"), `附件链接应渲染为 a 标签，实际 ${JSON.stringify(linkTexts)}`); - assert(await page.locator(".ProseMirror table td code", { hasText: "cell" }).count() >= 1, "table cell inline code 应保留 code mark"); - - if (process.env.MNOTE_TASK163_RUN_EXTENDED_TREE_OPS !== "1") { - const filetreeRows = await page.locator('#sidebar-file-tree-root [data-testid="filetree-asset-row"]').evaluateAll((nodes) => - nodes.map((node) => ({ - rowId: node.getAttribute("data-row-id") || "", - rowKind: node.getAttribute("data-row-kind") || "", - })) - ); - assert(filetreeRows.some((row) => row.rowId === "local:folder:docs" && row.rowKind === "folder"), "当前主入口下的 filetree 容器应继续渲染 docs folder 行"); - assert(filetreeRows.some((row) => row.rowId === "local:markdown:README.md" && row.rowKind === "markdown"), "当前主入口下的 filetree 容器应继续渲染 README markdown 行"); - const pageAggregateResult = await page.evaluate(async ({ rootUri }) => { - const response = await fetch(`/api/page-aggregate/${encodeURIComponent("local-md:docs~2Fblocks.md")}?sourceKind=local_folder&rootUri=${encodeURIComponent(rootUri)}`, { - headers: { accept: "application/json" }, - }); - const payload = await response.json().catch(() => null); - return { - ok: response.ok, - status: response.status, - payload, - }; - }, { rootUri: fileUrl(root) }); - assert(pageAggregateResult.ok, `page aggregate 路由应返回 200，实际 ${pageAggregateResult.status}`); - assert(pageAggregateResult.payload?.schema === "mnote.page_aggregate.v1", `page aggregate schema 应保持稳定，实际 ${JSON.stringify(pageAggregateResult.payload)}`); - assert(pageAggregateResult.payload?.result?.title === "Complex Title", "page aggregate 应继续返回本地 Markdown 标题"); - assert(requests.some((request) => request.body.includes('"sourceKind":"local_folder"')), "本地 Markdown 保存写操作必须透传 sourceKind=local_folder"); - await browser.close(); - fs.chmodSync(path.join(root, "readonly-dir"), 0o755); - fs.rmSync(root, { recursive: true, force: true }); - console.log("task163 local markdown parser browser smoke passed"); - return; - } - - await page.goto(treeUrl(root, "filetree"), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - const readmeRow = '.tree-row[data-row-id="local:markdown:README.md"]'; - const docsRow = '.tree-row[data-row-id="local:folder:docs"]'; - const nestedRow = '.tree-row[data-row-id="local:folder:docs/nested"]'; - const readonlyRow = '.tree-row[data-row-id="local:folder:readonly-dir"]'; - let imageRow = '.tree-row[data-row-id="local:asset:image.png"]'; - await page.locator(readmeRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(docsRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(nestedRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(readonlyRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(imageRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - - await dispatchFolderContextMenu(page, docsRow); - await waitForContextMenu(page); - await expectMenuAction(page, "newPage", { disabled: false }); - await expectMenuAction(page, "newFolder", { disabled: false }); - await expectMenuAction(page, "upload", { disabled: true }); - await expectMenuAction(page, "refresh", { disabled: false }); - await closeContextMenu(page); - await page.locator(readmeRow).click({ button: "right", timeout: UI_TIMEOUT_MS }); - await waitForContextMenu(page); - await expectMenuAction(page, "open", { disabled: false }); - await expectMenuAction(page, "rename", { disabled: false }); - await expectMenuAction(page, "copy", { disabled: false }); - await expectMenuAction(page, "cut", { disabled: false }); - await expectMenuAction(page, "paste", { disabled: true }); - await expectMenuAction(page, "delete", { disabled: false }); - await closeContextMenu(page); - await page.locator(docsRow).click({ button: "right", timeout: UI_TIMEOUT_MS }); - await waitForContextMenu(page); - await expectMenuAction(page, "newPage", { disabled: false }); - await expectMenuAction(page, "newFolder", { disabled: false }); - await expectMenuAction(page, "paste", { disabled: true }); - await expectMenuAction(page, "rename", { disabled: false }); - await expectMenuAction(page, "delete", { disabled: true, reasonIncludes: "目录删除" }); - await closeContextMenu(page); - await page.locator(imageRow).click({ button: "right", timeout: UI_TIMEOUT_MS }); - await waitForContextMenu(page); - await expectMenuAction(page, "open", { disabled: false }); - await expectMenuAction(page, "rename", { disabled: false }); - await expectMenuAction(page, "copy", { disabled: true }); - await expectMenuAction(page, "cut", { disabled: true }); - await expectMenuAction(page, "delete", { disabled: true }); - await expectMenuAction(page, "download", { disabled: true }); - await clickMenuAction(page, "rename"); - let assetRenameInput = page.locator(".tree-rename-input").first(); - await assetRenameInput.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await assetRenameInput.fill("renamed-image"); - await page.keyboard.press("Enter"); - await page.waitForTimeout(800); - assert(fs.existsSync(path.join(root, "renamed-image.png")), "asset rename 应通过同一 inline rename 写入本地文件系统"); - imageRow = '.tree-row[data-row-id="local:asset:renamed-image.png"]'; - await page.goto(treeUrl(root, "filetree"), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - await page.locator(readmeRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(docsRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(nestedRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(readonlyRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(imageRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - - await dispatchFolderContextMenu(page, docsRow); - await waitForContextMenu(page); - await clickMenuAction(page, "newFolder"); - let createRenameInput = page.locator(".tree-rename-input").first(); - await createRenameInput.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await createRenameInput.fill("新建资料"); - await page.keyboard.press("Enter"); - await page.waitForTimeout(800); - assert(fs.existsSync(path.join(root, "新建资料")), "根菜单新建文件夹后应进入 inline rename 并写入本地目录"); - - await page.goto(treeUrl(root, "filetree"), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - await page.locator(docsRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(docsRow).click({ button: "right", timeout: UI_TIMEOUT_MS }); - await waitForContextMenu(page); - await clickMenuAction(page, "newPage"); - createRenameInput = page.locator(".tree-rename-input").first(); - await createRenameInput.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await createRenameInput.fill("菜单新页面"); - await page.keyboard.press("Enter"); - await page.waitForTimeout(800); - assert(fs.existsSync(path.join(root, "docs", "菜单新页面.md")), "文件夹菜单新建页面后应进入 inline rename 并写入本地 Markdown"); - - await page.goto(treeUrl(root, "filetree"), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - await page.locator(readmeRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(docsRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(nestedRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(readonlyRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(imageRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - const createdPageRow = '.tree-row[data-row-id="local:markdown:docs/菜单新页面.md"]'; - await page.locator(createdPageRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(createdPageRow).click({ timeout: UI_TIMEOUT_MS }); - await page.keyboard.press("Delete"); - await waitForPreflight(page, "删除预检"); - await confirmPreflight(page); - await page.waitForTimeout(800); - assert(!fs.existsSync(path.join(root, "docs", "菜单新页面.md")), "确认 Delete preflight 后本地 Markdown 原路径应消失"); - assert(fs.existsSync(path.join(root, ".mnote", "trash", "菜单新页面.md")), "确认 Delete preflight 后本地 Markdown 应进入 .mnote/trash"); - const trashIndex = JSON.parse(fs.readFileSync(path.join(root, ".mnote", "trash-index.json"), "utf8")); - const createdTrashEntry = Object.values(trashIndex.entries || {}).find((entry) => entry.originalRelativePath === "docs/菜单新页面.md"); - assert(createdTrashEntry && createdTrashEntry.documentId, "trash-index 应记录被删除页面的 documentId"); - await page.evaluate(async ({ rootUri, documentId }) => { - const response = await fetch("/api/tree/commands", { - method: "POST", - headers: { "content-type": "application/json" }, - body: JSON.stringify({ - action: "restore", - sourceKind: "local_folder", - rootUri, - documentId, - }), - }); - if (!response.ok) throw new Error(`restore_failed_${response.status}`); - }, { rootUri: fileUrl(root), documentId: createdTrashEntry.documentId }); - await page.waitForTimeout(300); - assert(fs.existsSync(path.join(root, "docs", "菜单新页面.md")), "local restore 应从 .mnote/trash 恢复 Markdown"); - await page.evaluate(async ({ rootUri, documentId }) => { - const response = await fetch("/api/tree/commands", { - method: "POST", - headers: { "content-type": "application/json" }, - body: JSON.stringify({ - action: "purge", - sourceKind: "local_folder", - rootUri, - documentId, - }), - }); - if (!response.ok) throw new Error(`purge_failed_${response.status}`); - }, { rootUri: fileUrl(root), documentId: createdTrashEntry.documentId }); - await page.waitForTimeout(300); - assert(!fs.existsSync(path.join(root, "docs", "菜单新页面.md")), "local purge 应永久删除已恢复的 Markdown"); - await page.goto(treeUrl(root, "filetree"), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - await page.locator(readmeRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(docsRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(nestedRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - - assert((await dispatchInternalDragOver(page, readmeRow, docsRow, 0.05)).dropPosition === "before", "内部拖拽应显示 before indicator"); - assert((await dispatchInternalDragOver(page, readmeRow, docsRow, 0.5)).dropPosition === "inside", "内部拖拽应显示 inside indicator"); - assert((await dispatchInternalDragOver(page, readmeRow, docsRow, 0.95)).dropPosition === "after", "内部拖拽应显示 after indicator"); - await dispatchInternalDragOver(page, readmeRow, nestedRow, 0.5); - await page.locator('.tree-row[data-row-id="local:markdown:docs/nested/deep.md"]').waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - const illegalDropRequestCount = requests.length; - await dispatchInternalDrop(page, readmeRow, readmeRow); - await dispatchInternalDrop(page, docsRow, nestedRow); - await dispatchForeignInternalDrop(page, docsRow); - await page.waitForTimeout(500); - assert(requests.length === illegalDropRequestCount, "自拖自身、拖到后代、跨 workspace 不应发 execute 请求"); - - const modifier = process.platform === "darwin" ? "Meta" : "Control"; - await page.locator(docsRow).click({ timeout: UI_TIMEOUT_MS }); - await page.locator(nestedRow).click({ modifiers: [modifier], timeout: UI_TIMEOUT_MS }); - const redundantMoveRequestCount = requests.length; - await dispatchInternalDrop(page, docsRow, readmeRow); - await waitForPreflight(page, "移动预检"); - await confirmPreflight(page); - await page.waitForTimeout(800); - const redundantMoveRequests = requests.slice(redundantMoveRequestCount).filter((request) => request.body.includes('"action":"move"')); - assert(redundantMoveRequests.length === 1, "多选父子节点 move 时应过滤子节点重复执行"); - assert(redundantMoveRequests[0].body.includes("local:node:docs"), "多选父子节点 move 应保留父节点作为唯一执行项"); - assert(!redundantMoveRequests[0].body.includes("local:node:docs/nested"), "多选父子节点 move 不应重复执行子节点"); - - await page.goto(treeUrl(root, "filetree"), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - await page.locator(readmeRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(docsRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(nestedRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(readonlyRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(imageRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - - await page.locator(readmeRow).click({ timeout: UI_TIMEOUT_MS }); - await page.locator(docsRow).click({ modifiers: [modifier], timeout: UI_TIMEOUT_MS }); - assert(await page.locator(`${readmeRow}[data-selected="true"]`).count() === 1, "Ctrl/Cmd+Click 后原选区应保留"); - assert(await page.locator(`${docsRow}[data-selected="true"]`).count() === 1, "Ctrl/Cmd+Click 后目标行应加入选区"); - await page.locator(docsRow).click({ button: "right", timeout: UI_TIMEOUT_MS }); - assert(await page.locator(`${readmeRow}[data-selected="true"]`).count() === 1, "已选区内右键不应清空多选"); - await waitForContextMenu(page); - await expectMenuAction(page, "copy", { disabled: false }); - await expectMenuAction(page, "cut", { disabled: false }); - await expectMenuAction(page, "delete", { disabled: false }); - await expectMenuAction(page, "moveTo", { disabled: true }); - await closeContextMenu(page); - await page.locator(readmeRow).click({ timeout: UI_TIMEOUT_MS }); - await page.locator(nestedRow).click({ modifiers: ["Shift"], timeout: UI_TIMEOUT_MS }); - assert(await page.locator('.tree-row[data-shell-mode="filetree"][data-selected="true"]').count() >= 2, "Shift+Click 应形成范围选区"); - await page.locator(readmeRow).click({ timeout: UI_TIMEOUT_MS }); - await page.locator(imageRow).click({ button: "right", timeout: UI_TIMEOUT_MS }); - assert(await page.locator(`${imageRow}[data-selected="true"]`).count() === 1, "未选项右键应切换到该行"); - assert(await page.locator(`${readmeRow}[data-selected="true"]`).count() === 0, "未选项右键应清理旧选区"); - await closeContextMenu(page); - await page.evaluate(() => { - const root = document.querySelector("#sidebar-file-tree-root .tree-root"); - if (!(root instanceof HTMLElement)) throw new Error("filetree root 不存在"); - root.dispatchEvent(new MouseEvent("mousedown", { bubbles: true, cancelable: true })); - }); - assert(await page.locator('.tree-row[data-shell-mode="filetree"][data-selected="true"]').count() === 0, "空白区点击应清空 selection/focus"); - await page.locator(readmeRow).click({ timeout: UI_TIMEOUT_MS }); - await page.keyboard.press(process.platform === "darwin" ? "Meta+A" : "Control+A"); - const visibleFileTreeRows = await page.locator('.tree-row[data-shell-mode="filetree"]').count(); - assert(await page.locator('.tree-row[data-shell-mode="filetree"][data-selected="true"]').count() === visibleFileTreeRows, "Ctrl/Cmd+A 应选择全部可见 filetree 行"); - - await page.locator(readmeRow).click({ timeout: UI_TIMEOUT_MS }); - const deletePreflightRequestCount = requests.length; - await page.keyboard.press("Delete"); - const deletePreflight = await waitForPreflight(page, "删除预检"); - assert(await deletePreflight.getByText("影响:", { exact: false }).isVisible(), "Delete preflight 应说明影响集合"); - await cancelPreflight(page); - await page.waitForTimeout(300); - assert(requests.length === deletePreflightRequestCount, "取消 Delete preflight 后不应发 execute 请求"); - assert(fs.existsSync(path.join(root, "README.md")), "取消 Delete preflight 后文件不应被移动到 trash"); - - await page.locator(readmeRow).click({ timeout: UI_TIMEOUT_MS }); - await page.keyboard.press("F2"); - const renameInput = page.locator(".tree-rename-input").first(); - await renameInput.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await renameInput.fill("README Renamed"); - await page.keyboard.press("Enter"); - await page.waitForTimeout(800); - assert(fs.existsSync(path.join(root, "README Renamed.md")), "F2 inline rename 应真实重命名 Markdown 文件"); - - const renamedRow = '.tree-row[data-row-id="local:markdown:README Renamed.md"]'; - await page.locator(renamedRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(renamedRow).click({ timeout: UI_TIMEOUT_MS }); - await page.keyboard.press(process.platform === "darwin" ? "Meta+X" : "Control+X"); - assert(await page.locator(`${renamedRow}[data-cut="true"]`).count() === 1, "Ctrl/Cmd+X 后应出现 cut decoration"); - await page.locator(docsRow).click({ timeout: UI_TIMEOUT_MS }); - const pasteCancelRequestCount = requests.length; - await page.keyboard.press(process.platform === "darwin" ? "Meta+V" : "Control+V"); - const pastePreflight = await waitForPreflight(page, "粘贴移动预检"); - assert(await pastePreflight.getByText("命名冲突策略", { exact: false }).isVisible(), "Paste preflight 应展示命名冲突策略"); - await cancelPreflight(page); - await page.waitForTimeout(300); - assert(requests.length === pasteCancelRequestCount, "取消 Paste preflight 后不应发 execute 请求"); - assert(fs.existsSync(path.join(root, "README Renamed.md")), "取消 Paste preflight 后文件应留在原目录"); - await page.locator(docsRow).click({ timeout: UI_TIMEOUT_MS }); - await page.keyboard.press(process.platform === "darwin" ? "Meta+V" : "Control+V"); - await waitForPreflight(page, "粘贴移动预检"); - await confirmPreflight(page); - await page.waitForTimeout(800); - assert(fs.existsSync(path.join(root, "docs", "README Renamed.md")), "剪切粘贴应真实移动 Markdown 文件"); - - await page.goto(treeUrl(root, "filetree"), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - await dispatchInternalDrop(page, '.tree-row[data-row-id="local:markdown:docs/README Renamed.md"]', '.tree-row[data-row-id="local:folder:docs"]', { altKey: true }); - const copyPreflight = await waitForPreflight(page, "复制预检"); - assert(await copyPreflight.getByText("命名冲突策略", { exact: false }).isVisible(), "内部复制 drop preflight 应展示命名冲突策略"); - await confirmPreflight(page); - await page.waitForTimeout(800); - assert(fs.existsSync(path.join(root, "docs", "README Renamed 2.md")), "Alt 内部拖拽应真实复制 Markdown 文件"); - - await page.goto(treeUrl(root, "filetree"), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - const externalCancelRequestCount = requests.length; - await dispatchExternalFileDrop(page, '.tree-row[data-row-id="local:folder:docs"]', "drop-cancel.txt", "取消外部拖入"); - await waitForPreflight(page, "外部拖入预检"); - await cancelPreflight(page); - await page.waitForTimeout(300); - assert(requests.length === externalCancelRequestCount, "取消外部 File drop preflight 后不应发 execute 请求"); - assert(!fs.existsSync(path.join(root, "docs", "drop-cancel.txt")), "取消外部 File drop preflight 后不应写入文件"); - await dispatchExternalFileDrop(page, '.tree-row[data-row-id="local:folder:docs"]', "drop-real.txt", "真实外部拖入"); - const externalPreflight = await waitForPreflight(page, "外部拖入预检"); - assert(await externalPreflight.getByText("drop-real.txt", { exact: false }).isVisible(), "外部 drop preflight 应展示文件名"); - await confirmPreflight(page); - await page.waitForTimeout(800); - assert(fs.existsSync(path.join(root, "docs", "drop-real.txt")), "外部 File drop 应真实写入本地目录"); - await dispatchExternalFileDrop(page, '.tree-row[data-row-id="local:markdown:docs/README Renamed.md"]', "drop-on-md.txt", "拖到 Markdown 行"); - const externalMdPreflight = await waitForPreflight(page, "外部拖入预检"); - assert(await externalMdPreflight.getByText("README Renamed.md 的父目录", { exact: false }).isVisible(), "drop 到 md 文件时 preflight 应说明目标归属为父目录"); - await confirmPreflight(page); - await page.waitForTimeout(800); - assert(fs.existsSync(path.join(root, "docs", "drop-on-md.txt")), "drop 到 md 文件时应写入该 md 的父目录"); - assert(!fs.existsSync(path.join(root, "drop-on-md.txt")), "drop 到 Markdown 行时不应回退写入 root"); - const readonlyDropRequestCount = requests.length; - await dispatchExternalFileDrop(page, readonlyRow, "readonly-drop.txt", "readonly"); - await waitForPreflight(page, "操作预检失败"); - assert(await page.getByText("只读", { exact: false }).first().isVisible(), "readonly 目标应展示统一预检失败原因"); - await confirmPreflight(page); - await page.waitForTimeout(300); - assert(requests.length === readonlyDropRequestCount, "readonly 目标预检失败后不应发 execute 请求"); - assert(!fs.existsSync(path.join(root, "readonly-dir", "readonly-drop.txt")), "readonly 目标预检失败后不应写入文件"); - - await page.goto(treeUrl(root, "page"), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - let watcherNavigationStart = navigationEvents.length; - fs.writeFileSync(path.join(root, "docs", "watcher-added.md"), "# Watcher Added\n", "utf8"); - await waitForText(page, "Watcher Added"); - assert(navigationEvents.length === watcherNavigationStart, "外部新增 Markdown 后 page tree 不应发生浏览器导航或 reload"); - await page.goto(treeUrl(root, "filetree"), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - watcherNavigationStart = navigationEvents.length; - fs.writeFileSync(path.join(root, "docs", "watcher-asset.txt"), "watcher asset", "utf8"); - await waitForText(page, "watcher-asset.txt"); - assert(navigationEvents.length === watcherNavigationStart, "外部新增非 md 资源后 filetree 不应发生浏览器导航或 reload"); - watcherNavigationStart = navigationEvents.length; - fs.rmSync(path.join(root, "docs", "watcher-asset.txt")); - await page.getByText("watcher-asset.txt", { exact: true }).waitFor({ state: "detached", timeout: UI_TIMEOUT_MS }); - assert(navigationEvents.length === watcherNavigationStart, "外部删除非 md 资源后 filetree 不应发生浏览器导航或 reload"); - - await page.goto(convexTreeUrl("filetree"), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - await waitForText(page, "工作区首页"); - await waitForText(page, "封面.png"); - assert(!(await page.getByText("Watcher Added", { exact: true }).isVisible().catch(() => false)), "切回 Convex 后不应显示旧 local watcher 内容"); - assert(await page.locator('.tree-row[data-shell-mode="filetree"][data-selected="true"]').count() === 0, "切回 Convex 后旧 local selection 不应污染新 source"); - await dispatchRootContextMenu(page); - await waitForContextMenu(page); - await expectMenuAction(page, "newPage", { disabled: false }); - await expectMenuAction(page, "newFolder", { disabled: true, reasonIncludes: "Convex workspace" }); - await closeContextMenu(page); - await page.getByText("工作区首页", { exact: true }).click({ button: "right", timeout: UI_TIMEOUT_MS }); - await waitForContextMenu(page); - await expectMenuAction(page, "open", { disabled: false }); - await expectMenuAction(page, "rename", { disabled: false }); - await expectMenuAction(page, "copy", { disabled: false }); - await expectMenuAction(page, "paste", { disabled: true }); - await closeContextMenu(page); - const convexRootRow = '.tree-row[data-row-id="doc:page_root"]'; - const convexChildRow = '.tree-row[data-row-id="doc:page_child"]'; - const convexAssetFolderRow = '.tree-row[data-row-id="asset-folder:mind_1"]'; - await page.locator(convexRootRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(convexChildRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(convexAssetFolderRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - - assert((await dispatchInternalDragOver(page, convexChildRow, convexRootRow, 0.05)).dropPosition === "before", "Convex document 拖拽应显示 before indicator"); - assert((await dispatchInternalDragOver(page, convexChildRow, convexRootRow, 0.5)).dropPosition === "inside", "Convex document 拖拽应显示 inside indicator"); - assert((await dispatchInternalDragOver(page, convexChildRow, convexRootRow, 0.95)).dropPosition === "after", "Convex document 拖拽应显示 after indicator"); - assert((await dispatchInternalDragOver(page, convexChildRow, convexAssetFolderRow, 0.5)).dropPosition === "inside", "Convex asset-folder 拖拽应显示 inside indicator"); - - await page.locator(convexChildRow).click({ timeout: UI_TIMEOUT_MS }); - await page.keyboard.press(process.platform === "darwin" ? "Meta+C" : "Control+C"); - await page.locator(convexRootRow).click({ timeout: UI_TIMEOUT_MS }); - const convexCopyRequestCount = requests.length; - await page.keyboard.press(process.platform === "darwin" ? "Meta+V" : "Control+V"); - await waitForPreflight(page, "粘贴复制预检"); - await confirmPreflight(page); - await page.waitForTimeout(800); - const convexCopyRequests = requests.slice(convexCopyRequestCount).filter((request) => request.body.includes('"sourceKind":"convex_workspace"')); - assert(convexCopyRequests.some((request) => request.body.includes('"action":"copy"')), "Convex copy paste 应通过同一 command endpoint 发送 copy action"); - - await page.goto(convexTreeUrl("filetree"), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - await page.locator(convexRootRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(convexChildRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(convexChildRow).click({ timeout: UI_TIMEOUT_MS }); - await page.keyboard.press(process.platform === "darwin" ? "Meta+X" : "Control+X"); - await page.locator(convexRootRow).click({ timeout: UI_TIMEOUT_MS }); - const convexMoveRequestCount = requests.length; - await page.keyboard.press(process.platform === "darwin" ? "Meta+V" : "Control+V"); - await waitForPreflight(page, "粘贴移动预检"); - await confirmPreflight(page); - await page.waitForTimeout(800); - const convexMoveRequests = requests.slice(convexMoveRequestCount).filter((request) => request.body.includes('"sourceKind":"convex_workspace"')); - assert(convexMoveRequests.some((request) => request.body.includes('"action":"move"')), "Convex cut paste 应通过同一 command endpoint 发送 move action"); - await page.goto(convexTreeUrl("filetree"), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - await page.locator(convexChildRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.locator(convexChildRow).click({ timeout: UI_TIMEOUT_MS }); - const convexDeleteRequestCount = requests.length; - await page.keyboard.press("Delete"); - await waitForPreflight(page, "删除预检"); - await confirmPreflight(page); - await page.waitForTimeout(800); - const convexDeleteRequests = requests.slice(convexDeleteRequestCount).filter((request) => request.body.includes('"sourceKind":"convex_workspace"')); - assert(convexDeleteRequests.some((request) => request.body.includes('"action":"delete"')), "Convex Delete 应通过同一 command endpoint 发送 delete action"); - const convexRestoreRequestCount = requests.length; - await page.evaluate(async () => { - const response = await fetch("/api/tree/commands", { - method: "POST", - headers: { "content-type": "application/json" }, - body: JSON.stringify({ - action: "restore", - sourceKind: "convex_workspace", - workspaceId: "ws_demo", - documentId: "page_child", - }), - }); - if (!response.ok) throw new Error(`convex_restore_failed_${response.status}`); - }); - await page.evaluate(async () => { - const response = await fetch("/api/tree/commands", { - method: "POST", - headers: { "content-type": "application/json" }, - body: JSON.stringify({ - action: "purge", - sourceKind: "convex_workspace", - workspaceId: "ws_demo", - documentId: "page_child", - }), - }); - if (!response.ok) throw new Error(`convex_purge_failed_${response.status}`); - }); - const convexRestorePurgeRequests = requests.slice(convexRestoreRequestCount).filter((request) => request.body.includes('"sourceKind":"convex_workspace"')); - assert(convexRestorePurgeRequests.some((request) => request.body.includes('"action":"restore"')), "Convex restore 应继续走 tree.node.restore command"); - assert(convexRestorePurgeRequests.some((request) => request.body.includes('"action":"purge"')), "Convex purge 应继续走 tree.node.purge command"); - - await page.setContent(` - - - - - `); - const treeFrameLocator = page.frameLocator("#tree-host"); - await treeFrameLocator.locator(convexRootRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - const treeFrameElement = await page.locator("#tree-host").elementHandle({ timeout: UI_TIMEOUT_MS }); - const treeFrame = treeFrameElement ? await treeFrameElement.contentFrame() : null; - assert(treeFrame, "Convex iframe tree shell 应加载成功"); - await treeFrame.locator(convexRootRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await treeFrame.locator(convexAssetFolderRow).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await dispatchExternalFileDrop(treeFrame, convexRootRow, "convex-doc-drop.txt", "上传到 Convex document"); - await treeFrame.locator('[data-testid="tree-preflight"]').getByText("外部拖入预检", { exact: false }).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await treeFrame.locator('[data-testid="tree-preflight"]').getByText("上传到对象存储", { exact: false }).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await treeFrame.locator('[data-testid="tree-preflight"] [data-role="confirm"]').click({ timeout: UI_TIMEOUT_MS }); - const convexDocDropMessage = await waitForHostMessage(page, "tree.filetree.external-drop", (message) => - message.documentId === "page_root" && - message.rowKind === "document" && - Array.isArray(message.files) && - message.files.length === 1 && - message.files[0].name === "convex-doc-drop.txt" - ); - assert(convexDocDropMessage.fileCount === undefined || convexDocDropMessage.fileCount === 1, "Convex document 外部 drop host message 应保留文件数量"); - await page.evaluate(() => { - window.__mnoteHostMessages = []; - }); - await dispatchExternalFileDrop(treeFrame, convexAssetFolderRow, "convex-asset-folder-drop.txt", "上传到 Convex asset folder"); - await treeFrame.locator('[data-testid="tree-preflight"]').getByText("外部拖入预检", { exact: false }).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await treeFrame.locator('[data-testid="tree-preflight"] [data-role="confirm"]').click({ timeout: UI_TIMEOUT_MS }); - await waitForHostMessage(page, "tree.filetree.external-drop", (message) => - message.assetId === "mind_1" && - message.rowKind === "asset_folder" && - Array.isArray(message.files) && - message.files.some((file) => file.name === "convex-asset-folder-drop.txt") - ); - - assert(requests.some((request) => request.body.includes('"sourceKind":"local_folder"')), "写操作必须透传 sourceKind=local_folder"); - assert(requests.some((request) => request.body.includes('"action":"move"')), "剪切粘贴应走统一 move action"); - assert(requests.some((request) => request.body.includes('"action":"copy"')), "内部 copy drop 应走统一 copy action"); - assert(requests.some((request) => request.body.includes('"action":"dropFiles"')), "外部文件 drop 应走统一 dropFiles action"); - - await browser.close(); - fs.chmodSync(path.join(root, "readonly-dir"), 0o755); - fs.rmSync(root, { recursive: true, force: true }); - console.log("task163 local folder unified tree browser smoke passed"); - } catch (error) { - await browser.close().catch(() => undefined); - console.error(`local root preserved for debugging: ${root}`); - throw error; - } -} - -run().catch((error) => { - console.error(error); - process.exit(1); -}); diff --git a/scripts/task166-local-first-managed-workspace-no-convex-smoke.js b/scripts/task166-local-first-managed-workspace-no-convex-smoke.js index 976b039a..9c8cf284 100644 --- a/scripts/task166-local-first-managed-workspace-no-convex-smoke.js +++ b/scripts/task166-local-first-managed-workspace-no-convex-smoke.js @@ -84,8 +84,6 @@ async function main() { MNOTE_WEB_PUBLIC_BIND: `127.0.0.1:${port}`, MNOTE_WEB_ENABLE_LEGACY_NEXT_COMPAT: "0", MNOTE_LOCAL_WORKSPACE_BASE_DIR: dataRoot, - CONVEX_SELF_HOSTED_URL: "http://127.0.0.1:9", - NEXT_PUBLIC_CONVEX_URL: "http://127.0.0.1:9", }, stdio: ["ignore", "pipe", "pipe"], }); diff --git a/scripts/task167-local-markdown-title-body-options-no-convex-smoke.js b/scripts/task167-local-markdown-title-body-options-no-convex-smoke.js index 42cb536f..79469ba5 100644 --- a/scripts/task167-local-markdown-title-body-options-no-convex-smoke.js +++ b/scripts/task167-local-markdown-title-body-options-no-convex-smoke.js @@ -101,8 +101,6 @@ async function main() { MNOTE_WEB_PUBLIC_BIND: `127.0.0.1:${port}`, MNOTE_WEB_ENABLE_LEGACY_NEXT_COMPAT: "0", MNOTE_LOCAL_WORKSPACE_BASE_DIR: dataRoot, - CONVEX_SELF_HOSTED_URL: "http://127.0.0.1:9", - NEXT_PUBLIC_CONVEX_URL: "http://127.0.0.1:9", }, stdio: ["ignore", "pipe", "pipe"], }); @@ -124,6 +122,8 @@ async function main() { const firstAggregate = await loadAggregate(baseUrl, actorId, documentId, rootUri); assert.equal(firstAggregate.head.title, "README"); + assert.equal(firstAggregate.body.projectionSource, "local_markdown.content", "local-first Page Aggregate 应声明 local markdown projection source"); + assert(firstAggregate.body.blockDocument, "local-first Page Aggregate 应输出 blockDocument，runtime 不应只依赖 legacy content"); const titlePayload = await requestJson(baseUrl, actorId, "/api/documents/title", { method: "POST", @@ -178,6 +178,8 @@ async function main() { const finalAggregate = await loadAggregate(baseUrl, actorId, documentId, rootUri); assert.equal(finalAggregate.head.title, "P3 标题", "frontmatter title 应优先于正文 H1"); + assert.equal(finalAggregate.body.projectionSource, "local_markdown.content", "保存后 Page Aggregate source 不应退回 legacy documents.content"); + assert(finalAggregate.body.blockDocument, "保存后 Page Aggregate 应保留 blockDocument"); assert.equal(finalAggregate.layout.pageOptions.wideLayout, true); assert.equal(finalAggregate.layout.pageOptions.showToc, true); assert.equal(finalAggregate.layout.pageOptions.showHeadingNumbers, true); diff --git a/scripts/task174-rust-onlyoffice-attachment-open-smoke.js b/scripts/task174-rust-onlyoffice-attachment-open-smoke.js deleted file mode 100644 index 76c90a60..00000000 --- a/scripts/task174-rust-onlyoffice-attachment-open-smoke.js +++ /dev/null @@ -1,287 +0,0 @@ -"use strict"; - -// 说明： -// - 验证 Rust 3000 主入口的 Convex 附件行打开 OnlyOffice 链路。 -// - 脚本会创建临时页面、上传临时 docx、点击文件树附件行并断言新窗口打开 /onlyoffice。 -// - 结束后清理临时页面，避免污染长期测试空间。 - -const fs = require("node:fs"); -const { chromium } = require("playwright"); -const { - BASE_URL, - UI_TIMEOUT_MS, - assert, - createTempDocument, - ensureAuthenticated, - openDocument, - openFilesystemView, - purgeDocument, -} = require("./tree-shell-smoke-helpers"); - -const DOCX_MIME = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"; -const ONLYOFFICE_READY_TIMEOUT_MS = Number(process.env.MNOTE_ONLYOFFICE_READY_TIMEOUT_MS || 120_000); -const PROBE_DOCX_PATH = - process.env.MNOTE_ONLYOFFICE_PROBE_DOCX || - "/tmp/mnote-onlyoffice-manual/mnote-onlyoffice-upload-test.docx"; -const TEST_EMAIL = "mnote.e2e@example.com"; -const TEST_PASSWORD = "MnoteE2E123!"; -let authCookieHeader = ""; -const popupConsoleMessages = []; -const popupNetworkFailures = []; - -function parseSetCookie(setCookie, origin) { - const [nameValue] = String(setCookie || "").split(";"); - const separator = nameValue.indexOf("="); - if (separator <= 0) return null; - return { - name: nameValue.slice(0, separator).trim(), - value: nameValue.slice(separator + 1).trim(), - domain: new URL(origin).hostname, - path: "/", - httpOnly: /;\s*httponly\b/i.test(setCookie), - sameSite: "Lax", - }; -} - -async function forceTestAccountLogin(context) { - const response = await context.request.fetch(`${BASE_URL}/api/auth`, { - method: "POST", - data: { - action: "auth:signIn", - args: { - provider: "password", - params: { - email: TEST_EMAIL, - password: TEST_PASSWORD, - flow: "signIn", - }, - }, - }, - headers: { "content-type": "application/json" }, - timeout: UI_TIMEOUT_MS, - }); - const payload = await response.json().catch(async () => ({ raw: await response.text() })); - assert(response.ok(), `测试账号登录失败：${response.status()} ${JSON.stringify(payload)}`); - - const cookies = response - .headersArray() - .filter((header) => header.name.toLowerCase() === "set-cookie") - .map((header) => parseSetCookie(header.value, BASE_URL)) - .filter(Boolean); - assert(cookies.length > 0, "测试账号登录响应缺少 set-cookie"); - await context.addCookies(cookies); - authCookieHeader = cookies.map((cookie) => `${cookie.name}=${cookie.value}`).join("; "); -} - -async function uploadProbeDocx(requestContext, target) { - assert(fs.existsSync(PROBE_DOCX_PATH), `缺少探测文件：${PROBE_DOCX_PATH}`); - const buffer = fs.readFileSync(PROBE_DOCX_PATH); - const response = await requestContext.fetch(`${BASE_URL}/api/media/upload`, { - method: "POST", - headers: authCookieHeader ? { cookie: authCookieHeader } : undefined, - multipart: { - file: { - name: "task174-onlyoffice-attachment.docx", - mimeType: DOCX_MIME, - buffer, - }, - workspaceId: target.workspaceId, - documentId: target.documentId, - }, - timeout: UI_TIMEOUT_MS, - }); - const payload = await response.json().catch(async () => ({ raw: await response.text() })); - assert( - response.ok(), - `/api/media/upload 请求失败：${response.status()} ${JSON.stringify(payload)}`, - ); - assert( - payload && payload.asset && typeof payload.asset.id === "string", - `上传结果缺少 asset.id：${JSON.stringify(payload)}`, - ); - return payload.asset; -} - -async function waitForAssetRow(page, assetId) { - const selector = `[data-testid="filetree-asset-row"][data-asset-id="${assetId}"]`; - const row = page.locator(selector).first(); - await row.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - return row; -} - -async function waitForOnlyOfficeReady(page) { - page.on("console", (message) => { - popupConsoleMessages.push({ - type: message.type(), - text: message.text().slice(0, 1000), - }); - }); - page.on("pageerror", (error) => { - popupConsoleMessages.push({ - type: "pageerror", - text: error.message.slice(0, 1000), - }); - }); - page.on("response", (response) => { - if (response.status() >= 400) { - popupNetworkFailures.push({ - status: response.status(), - url: response.url().slice(0, 1000), - }); - } - }); - try { - await page.waitForFunction( - () => window.__MNOTE_ONLYOFFICE_READY__ === true, - undefined, - { timeout: ONLYOFFICE_READY_TIMEOUT_MS }, - ); - await page.waitForFunction( - () => { - const root = document.getElementById("onlyoffice-frame"); - if (root && root.querySelector("iframe,canvas")) return true; - return Boolean(document.querySelector("iframe,canvas")); - }, - undefined, - { timeout: ONLYOFFICE_READY_TIMEOUT_MS }, - ); - } catch (error) { - const debug = await page.evaluate(() => ({ - url: window.location.href, - title: document.title, - readyState: document.readyState, - ready: window.__MNOTE_ONLYOFFICE_READY__ === true, - debug: window.__MNOTE_ONLYOFFICE_DEBUG__ || null, - errors: window.__MNOTE_ONLYOFFICE_ERRLOG__ || [], - hasFrameRoot: Boolean(document.getElementById("onlyoffice-frame")), - bodyText: document.body ? document.body.innerText.slice(0, 800) : "", - html: document.body ? document.body.innerHTML.slice(0, 1600) : "", - scriptCount: document.scripts.length, - frameCount: document.querySelectorAll("iframe,canvas").length, - hasFrameRoot: Boolean(document.getElementById("onlyoffice-frame")), - })).catch((debugError) => ({ - evaluateError: debugError instanceof Error ? debugError.message : String(debugError), - isClosed: page.isClosed(), - })); - debug.consoleMessages = popupConsoleMessages.slice(-20); - debug.networkFailures = popupNetworkFailures.slice(-30); - throw new Error( - `OnlyOffice ready 超时：${error instanceof Error ? error.message : String(error)} ${JSON.stringify(debug)}`, - ); - } -} - -async function readOnlyOfficeDebug(page) { - return await page.evaluate(() => { - const debug = window.__MNOTE_ONLYOFFICE_DEBUG__ || null; - return { - debug, - docKey: debug && typeof debug.docKey === "string" ? debug.docKey : "", - ready: window.__MNOTE_ONLYOFFICE_READY__ === true, - frameCount: document.querySelectorAll("iframe,canvas").length, - }; - }); -} - -async function assertOnlyOfficeDocumentUrlReachableFromContainer(debug) { - const resolvedFileUrl = String(debug && debug.resolvedFileUrl || ""); - assert(resolvedFileUrl.includes("/api/onlyoffice/proxy"), `OnlyOffice resolvedFileUrl 未走 proxy：${JSON.stringify(debug)}`); - assert( - /^(http:\/\/host\.docker\.internal:3000|http:\/\/172\.17\.0\.1:3000)/.test(resolvedFileUrl), - `OnlyOffice resolvedFileUrl 应使用 DocumentServer 可回源的 mnote-web 地址：${resolvedFileUrl}`, - ); - const { execFile } = require("node:child_process"); - const { promisify } = require("node:util"); - const execFileAsync = promisify(execFile); - const response = await execFileAsync( - "docker", - ["exec", "mnote-onlyoffice-documentserver", "curl", "-fsSI", "--max-time", "10", resolvedFileUrl], - { timeout: 15_000, maxBuffer: 1024 * 1024 }, - ); - assert(/HTTP\/[0-9.]+ 200/.test(response.stdout), `DocumentServer 容器无法回源读取文档：${response.stdout}\n${response.stderr}`); -} - -async function main() { - const browser = await chromium.launch({ headless: process.env.HEADFUL !== "1" }); - const context = await browser.newContext(); - const page = await context.newPage(); - let target = null; - try { - await forceTestAccountLogin(context); - await ensureAuthenticated(page, context.request); - target = await createTempDocument(context.request, null); - const asset = await uploadProbeDocx(context.request, target); - - await openDocument(page, target.workspaceId, target.documentId); - await openFilesystemView(page); - const row = await waitForAssetRow(page, asset.id); - - const [popup] = await Promise.all([ - page.waitForEvent("popup", { timeout: UI_TIMEOUT_MS }), - row.locator('[data-rust-action="open"]').first().click({ timeout: UI_TIMEOUT_MS }), - ]); - await popup.waitForLoadState("domcontentloaded", { timeout: UI_TIMEOUT_MS }).catch(() => undefined); - - const opened = new URL(popup.url()); - assert(opened.pathname === "/onlyoffice", `附件应在新窗口打开 /onlyoffice，实际为：${popup.url()}`); - assert(opened.searchParams.get("assetId") === asset.id, "OnlyOffice URL 缺少正确 assetId"); - assert( - opened.searchParams.get("documentId") === target.documentId, - "OnlyOffice URL 缺少正确 documentId", - ); - assert(opened.searchParams.get("fileType") === "docx", "OnlyOffice URL fileType 应为 docx"); - assert(opened.searchParams.get("mode") === "edit", "OnlyOffice URL mode 应为 edit"); - await waitForOnlyOfficeReady(popup); - const firstDebug = await readOnlyOfficeDebug(popup); - assert(firstDebug.ready, "OnlyOffice ready flag 应为 true"); - assert(firstDebug.frameCount > 0, "OnlyOffice 应创建 iframe/canvas"); - assert(firstDebug.debug && firstDebug.debug.documentUrlBase, `OnlyOffice debug 应暴露 documentUrlBase：${JSON.stringify(firstDebug)}`); - await assertOnlyOfficeDocumentUrlReachableFromContainer(firstDebug.debug); - assert( - /^[0-9A-Za-z_.=-]{1,128}$/.test(firstDebug.docKey), - `OnlyOffice document.key 不符合安全字符集或长度：${firstDebug.docKey}`, - ); - assert( - firstDebug.docKey === asset.id || firstDebug.docKey.startsWith(`${asset.id}_`), - `OnlyOffice document.key 应绑定 assetId，实际为：${firstDebug.docKey}`, - ); - - const reopened = await context.newPage(); - await reopened.goto(popup.url(), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - await waitForOnlyOfficeReady(reopened); - const secondDebug = await readOnlyOfficeDebug(reopened); - assert( - secondDebug.docKey === firstDebug.docKey, - `同一附件重复打开 document.key 应稳定：first=${firstDebug.docKey} second=${secondDebug.docKey}`, - ); - await reopened.close().catch(() => undefined); - - console.log( - JSON.stringify( - { - ok: true, - documentId: target.documentId, - workspaceId: target.workspaceId, - assetId: asset.id, - openedUrl: popup.url(), - docKey: firstDebug.docKey, - }, - null, - 2, - ), - ); - } finally { - if (target && target.documentId) { - await purgeDocument(context.request, target.documentId).catch((error) => { - console.warn(`清理临时页面失败：${error instanceof Error ? error.message : String(error)}`); - }); - } - await context.close().catch(() => undefined); - await browser.close().catch(() => undefined); - } -} - -main().catch((error) => { - console.error(error); - process.exit(1); -}); diff --git a/scripts/task175-rust-upload-entry-smoke.js b/scripts/task175-rust-upload-entry-smoke.js deleted file mode 100644 index e8295c8b..00000000 --- a/scripts/task175-rust-upload-entry-smoke.js +++ /dev/null @@ -1,368 +0,0 @@ -#!/usr/bin/env node -"use strict"; - -const fs = require("node:fs"); -const path = require("node:path"); -const { chromium } = require("playwright"); -const { - BASE_URL, - UI_TIMEOUT_MS, - assert, - createTempDocument, - ensureAuthenticated, - openDocument, - openFilesystemView, - purgeDocument, -} = require("./tree-shell-smoke-helpers"); - -const DOCX_MIME = "application/vnd.openxmlformats-officedocument.wordprocessingml.document"; -const PNG_MIME = "image/png"; -const TEST_EMAIL = "mnote.e2e@example.com"; -const TEST_PASSWORD = "MnoteE2E123!"; -// 说明：该 smoke 仍在验证 Convex media / OnlyOffice 的 cloud upload 兼容入口，不是 local-first 默认上传路径。 -const PROBE_DOCX_PATH = - process.env.MNOTE_ONLYOFFICE_PROBE_DOCX || - "/tmp/mnote-onlyoffice-manual/mnote-onlyoffice-upload-test.docx"; -const SCREENSHOT_DIR = - process.env.MNOTE_UPLOAD_ENTRY_SCREENSHOT_DIR || - "/mnt/Data1T/mnote/tmp/wolai-editor-parity/task175-rust-upload-entry"; - -function ensureProbeDocx() { - assert(fs.existsSync(PROBE_DOCX_PATH), `缺少 Office 探测文件：${PROBE_DOCX_PATH}`); - return { - name: "task175-slash-attachment.docx", - mimeType: DOCX_MIME, - buffer: fs.readFileSync(PROBE_DOCX_PATH), - }; -} - -function tinyPngBuffer() { - return Buffer.from( - "iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+/p9sAAAAASUVORK5CYII=", - "base64", - ); -} - -function parseSetCookie(setCookie, origin) { - const [nameValue] = String(setCookie || "").split(";"); - const separator = nameValue.indexOf("="); - if (separator <= 0) return null; - return { - name: nameValue.slice(0, separator).trim(), - value: nameValue.slice(separator + 1).trim(), - domain: new URL(origin).hostname, - path: "/", - httpOnly: /;\s*httponly\b/i.test(setCookie), - sameSite: "Lax", - }; -} - -async function forceTestAccountLogin(context) { - const response = await context.request.fetch(`${BASE_URL}/api/auth`, { - method: "POST", - data: { - action: "auth:signIn", - args: { - provider: "password", - params: { - email: TEST_EMAIL, - password: TEST_PASSWORD, - flow: "signIn", - }, - }, - }, - headers: { "content-type": "application/json" }, - timeout: UI_TIMEOUT_MS, - }); - const payload = await response.json().catch(async () => ({ raw: await response.text() })); - assert(response.ok(), `测试账号登录失败：${response.status()} ${JSON.stringify(payload)}`); - const cookies = response - .headersArray() - .filter((header) => header.name.toLowerCase() === "set-cookie") - .map((header) => parseSetCookie(header.value, BASE_URL)) - .filter(Boolean); - assert(cookies.length > 0, "测试账号登录响应缺少 set-cookie"); - await context.addCookies(cookies); -} - -async function waitForRuntimeEditor(page) { - const editor = page - .locator('[data-testid="mnote-leptos-tiptap-island-editor-root"] .editor-surface .ProseMirror[contenteditable="true"]') - .first(); - await editor.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - return editor; -} - -async function waitForUploadResponse(page, fileName, action) { - const response = await page.waitForResponse( - async (candidate) => { - if (!candidate.url().includes("/api/media/upload") || candidate.request().method() !== "POST") { - return false; - } - const payload = await candidate.json().catch(() => null); - return Boolean(payload?.asset?.id && (!fileName || payload.asset.file_name === fileName)); - }, - { timeout: UI_TIMEOUT_MS }, - ); - const payload = await response.json(); - assert(response.ok(), `${action} 上传失败：${response.status()} ${JSON.stringify(payload)}`); - assert(payload?.asset?.id, `${action} 上传响应缺少 asset.id：${JSON.stringify(payload)}`); - return payload.asset; -} - -async function waitForAssetRow(page, assetId, action) { - try { - await page.waitForFunction( - (targetAssetId) => - Array.from(document.querySelectorAll(`[data-testid="filetree-asset-row"][data-asset-id="${targetAssetId}"]`)).some( - (row) => - row instanceof HTMLElement && - window.getComputedStyle(row).display !== "none" && - window.getComputedStyle(row).visibility !== "hidden" && - row.getClientRects().length > 0, - ), - assetId, - { timeout: UI_TIMEOUT_MS }, - ); - } catch (error) { - const debug = await page.evaluate((targetAssetId) => ({ - mode: document.documentElement.getAttribute("data-mnote-sidebar-tree-mode"), - lastUpload: document.documentElement.getAttribute("data-mnote-last-upload-asset-id"), - targetCount: document.querySelectorAll(`[data-testid="filetree-asset-row"][data-asset-id="${targetAssetId}"]`).length, - assets: Array.from(document.querySelectorAll('[data-testid="filetree-asset-row"]')).slice(-12).map((row) => ({ - id: row.getAttribute("data-asset-id"), - visible: row instanceof HTMLElement && window.getComputedStyle(row).display !== "none" && window.getComputedStyle(row).visibility !== "hidden" && row.getClientRects().length > 0, - text: row.textContent, - })), - body: document.body.innerText.slice(0, 1200), - }), assetId).catch((debugError) => ({ debugError: String(debugError) })); - throw new Error(`${action} 上传后的文件树附件行不可见：${assetId} ${JSON.stringify(debug)}`); - } - const title = await page.evaluate((targetAssetId) => { - const row = Array.from(document.querySelectorAll(`[data-testid="filetree-asset-row"][data-asset-id="${targetAssetId}"]`)).find( - (candidate) => - candidate instanceof HTMLElement && - window.getComputedStyle(candidate).display !== "none" && - window.getComputedStyle(candidate).visibility !== "hidden" && - candidate.getClientRects().length > 0, - ); - return row?.querySelector(".tree-link-title")?.textContent?.trim() || ""; - }, assetId); - assert(title.length > 0, `${action} 上传后的文件树附件行缺少标题`); -} - -async function waitForEditorOfficeAttachment(page, assetId, fileName, action) { - const attachment = page - .locator(`.editor-surface .ProseMirror a[data-mnote-attachment-link="true"][href*="/onlyoffice"][href*="${assetId}"]`) - .first(); - await attachment.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - const text = (await attachment.innerText()).trim(); - assert(text.includes(fileName), `${action} 正文附件标题不正确：${text}`); - const href = await attachment.getAttribute("href"); - assert(href && href.includes("/onlyoffice?"), `${action} 正文 Office 附件 href 应指向 /onlyoffice，实际：${href}`); - assert( - href && href.startsWith("/onlyoffice?"), - `${action} 正文 Office 附件 href 应保存为相对 /onlyoffice 链接，实际：${href}`, - ); - assert(href.includes(`assetId=${encodeURIComponent(assetId)}`), `${action} 正文 Office 附件 href 缺少 assetId：${href}`); - return attachment; -} - -async function assertAttachmentActions(page, attachment, action) { - await attachment.hover({ timeout: UI_TIMEOUT_MS }); - const actions = page.locator('[data-testid="mnote-attachment-actions"]').first(); - await actions.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await actions.locator('[data-testid="mnote-attachment-action-menu"]').click({ timeout: UI_TIMEOUT_MS }); - const menu = page.locator('[data-testid="mnote-tree-context-menu"][data-kind="attachment"]').first(); - await menu.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - const text = await menu.innerText(); - for (const label of ["拷贝副本", "删除", "复制链接", "弹窗预览", "右侧预览", "下载", "更换文件", "重命名", "添加说明文字"]) { - assert(text.includes(label), `${action} 附件三点菜单缺少“${label}”：${text}`); - } - await page.keyboard.press("Escape").catch(() => undefined); -} - -async function screenshot(page, name) { - fs.mkdirSync(SCREENSHOT_DIR, { recursive: true }); - await page.screenshot({ - path: path.join(SCREENSHOT_DIR, `${name}.png`), - fullPage: false, - timeout: UI_TIMEOUT_MS, - }); -} - -async function uploadViaSlash(page, itemTestId, filePayload, action) { - const editor = await waitForRuntimeEditor(page); - await editor.click({ timeout: UI_TIMEOUT_MS }); - await page.keyboard.type("/"); - const slash = page.locator('[data-testid="mnote-leptos-tiptap-slash-menu"]').first(); - await slash.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - const slashText = await slash.innerText(); - assert(slashText.includes("媒体与附件"), `slash 菜单缺少媒体与附件分组：${slashText}`); - - const item = page.locator(`[data-testid="${itemTestId}"]`).first(); - await item.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await item.scrollIntoViewIfNeeded({ timeout: UI_TIMEOUT_MS }); - await screenshot(page, `slash-${itemTestId}`); - - const [fileChooser] = await Promise.all([ - page.waitForEvent("filechooser", { timeout: UI_TIMEOUT_MS }), - item.click({ timeout: UI_TIMEOUT_MS }), - ]); - const uploadResponse = waitForUploadResponse(page, filePayload.name, action); - await fileChooser.setFiles(filePayload); - const asset = await uploadResponse; - await waitForAssetRow(page, asset.id, action); - return asset; -} - -async function dispatchFileDrop(page, selector, filePayload, action) { - const uploadPromise = waitForUploadResponse(page, filePayload.name, action); - await page.evaluate( - ({ selector, fileName, mimeType, bytes }) => { - const target = Array.from(document.querySelectorAll(selector)).find( - (candidate) => candidate instanceof HTMLElement && candidate.getClientRects().length > 0, - ) || document.querySelector(selector); - if (!(target instanceof HTMLElement)) { - throw new Error(`拖放目标不存在：${selector}`); - } - const dataTransfer = new DataTransfer(); - dataTransfer.items.add(new File([new Uint8Array(bytes)], fileName, { type: mimeType })); - target.dispatchEvent(new DragEvent("dragover", { bubbles: true, cancelable: true, dataTransfer })); - target.dispatchEvent(new DragEvent("drop", { bubbles: true, cancelable: true, dataTransfer })); - }, - { - selector, - fileName: filePayload.name, - mimeType: filePayload.mimeType, - bytes: Array.from(filePayload.buffer), - }, - ); - const asset = await uploadPromise; - await waitForAssetRow(page, asset.id, action); - return asset; -} - -async function main() { - const browser = await chromium.launch({ headless: process.env.HEADFUL !== "1" }); - const context = await browser.newContext({ viewport: { width: 1440, height: 960 } }); - const page = await context.newPage(); - const networkNotes = []; - page.on("response", async (response) => { - if (!/\/api\/(media\/upload|tree\/filetree\/upload-target-preflight)/.test(response.url())) return; - const text = await response.text().catch(() => ""); - networkNotes.push({ - status: response.status(), - url: response.url(), - body: text.slice(0, 1000), - }); - }); - page.on("pageerror", (error) => { - networkNotes.push({ type: "pageerror", message: error.message }); - }); - page.on("console", (message) => { - if (["error", "warning"].includes(message.type())) { - networkNotes.push({ type: message.type(), message: message.text().slice(0, 1000) }); - } - }); - page.on("dialog", async (dialog) => { - networkNotes.push({ type: "dialog", message: dialog.message() }); - await dialog.dismiss().catch(() => undefined); - }); - let target = null; - - try { - await forceTestAccountLogin(context); - await ensureAuthenticated(page, context.request); - target = await createTempDocument(context.request, null); - await openDocument(page, target.workspaceId, target.documentId); - await openFilesystemView(page); - - const slashAttachment = ensureProbeDocx(); - const slashImage = { - name: "task175-slash-image.png", - mimeType: PNG_MIME, - buffer: tinyPngBuffer(), - }; - const treeDropAttachment = { - name: "task175-filetree-drop.docx", - mimeType: DOCX_MIME, - buffer: slashAttachment.buffer, - }; - const editorDropImage = { - name: "task175-editor-drop.png", - mimeType: PNG_MIME, - buffer: tinyPngBuffer(), - }; - - const attachmentAsset = await uploadViaSlash( - page, - "slash-item-upload-attachment", - slashAttachment, - "slash 上传附件", - ); - const editorAttachment = await waitForEditorOfficeAttachment( - page, - attachmentAsset.id, - slashAttachment.name, - "slash 上传附件", - ); - await assertAttachmentActions(page, editorAttachment, "slash 上传附件"); - await page.reload({ waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); - await waitForRuntimeEditor(page); - await waitForEditorOfficeAttachment(page, attachmentAsset.id, slashAttachment.name, "刷新后正文附件"); - await openFilesystemView(page); - const imageAsset = await uploadViaSlash(page, "slash-item-image", slashImage, "slash 上传图片"); - - const docRowSelector = `[data-testid="filetree-doc-row"][data-document-id="${target.documentId}"]`; - const droppedAttachment = await dispatchFileDrop(page, docRowSelector, treeDropAttachment, "文件树拖入附件"); - - const editorStageSelector = '[data-testid="mnote-leptos-tiptap-editor-stage"]'; - const droppedImage = await dispatchFileDrop(page, editorStageSelector, editorDropImage, "主编辑区拖入图片"); - await page.waitForFunction( - (fileName) => { - const images = Array.from(document.querySelectorAll(".editor-surface .ProseMirror img[src]")); - return images.some((image) => image.getAttribute("alt") === fileName || image.getAttribute("title") === fileName); - }, - editorDropImage.name, - { timeout: UI_TIMEOUT_MS }, - ); - - console.log( - JSON.stringify( - { - ok: true, - workspaceId: target.workspaceId, - documentId: target.documentId, - uploadedAssetIds: [ - attachmentAsset.id, - imageAsset.id, - droppedAttachment.id, - droppedImage.id, - ], - screenshotDir: SCREENSHOT_DIR, - }, - null, - 2, - ), - ); - } catch (error) { - if (networkNotes.length) { - console.error(`上传入口调试信息：${JSON.stringify(networkNotes.slice(-20), null, 2)}`); - } - throw error; - } finally { - if (target?.documentId) { - await purgeDocument(context.request, target.documentId).catch((error) => { - console.warn(`清理临时页面失败：${error instanceof Error ? error.message : String(error)}`); - }); - } - await context.close().catch(() => undefined); - await browser.close().catch(() => undefined); - } -} - -main().catch((error) => { - console.error(error instanceof Error ? error.stack || error.message : String(error)); - process.exit(1); -}); diff --git a/scripts/task427-trash-empty-isolated-workspace-smoke.js b/scripts/task427-trash-empty-isolated-workspace-smoke.js deleted file mode 100644 index c8451bfa..00000000 --- a/scripts/task427-trash-empty-isolated-workspace-smoke.js +++ /dev/null @@ -1,206 +0,0 @@ -"use strict"; - -const assert = require("node:assert/strict"); -const { chromium } = require("playwright"); - -const BASE_URL = (process.env.MNOTE_UI_BASE_URL || "http://127.0.0.1:3000").replace(/\/+$/, ""); -const CONVEX_URL = (process.env.NEXT_PUBLIC_CONVEX_URL || process.env.CONVEX_SELF_HOSTED_URL || "http://127.0.0.1:3210").replace(/\/+$/, ""); -const e2ePassword = () => process.env.MNOTE_E2E_PASSWORD || ["Mnote", "E2E", "123!"].join(""); -// 说明：该 smoke 覆盖 convex-source trash 兼容路径，不代表 local-first 默认文件回收策略。 - -async function requestJson(request, path, init = {}) { - const response = await request.fetch(`${BASE_URL}${path}`, { - ...init, - headers: { - ...(init.data !== undefined ? { "content-type": "application/json" } : {}), - ...(init.headers || {}), - }, - timeout: 20_000, - }); - const text = await response.text(); - let payload = null; - try { - payload = text ? JSON.parse(text) : null; - } catch { - payload = text; - } - if (!response.ok()) { - throw new Error(`${path} 请求失败: ${response.status()} ${typeof payload === "string" ? payload : JSON.stringify(payload)}`); - } - return payload; -} - -async function convexCall(context, kind, path, args) { - const cookies = await context.cookies(BASE_URL); - const jwt = cookies.find((cookie) => cookie.name === "__convexAuthJWT")?.value; - assert(jwt, "缺少 __convexAuthJWT cookie"); - const response = await fetch(`${CONVEX_URL}/api/${kind}`, { - method: "POST", - headers: { - authorization: `Bearer ${jwt}`, - "content-type": "application/json", - "Convex-Client": "mnote-trash-empty-smoke", - }, - body: JSON.stringify({ path, format: "convex_encoded_json", args: [args] }), - }); - const body = await response.json(); - if (!response.ok || body.status !== "success") { - throw new Error(`Convex ${kind} ${path} 失败: ${response.status} ${JSON.stringify(body)}`); - } - return body.value; -} - -async function main() { - const stamp = Date.now(); - const email = `mnote.trash.${stamp}@example.com`; - const username = `trash-${stamp}`; - const assetId = `asset_trash_${stamp}`; - const mindmapId = `mind_trash_${stamp}`; - - const browser = await chromium.launch({ headless: true }); - const context = await browser.newContext(); - const page = await context.newPage(); - const request = context.request; - - try { - await requestJson(request, "/api/auth", { - method: "POST", - data: { - action: "auth:signIn", - args: { - provider: "password", - params: { email, password: e2ePassword(), flow: "signUp", name: username }, - }, - }, - }); - - await page.goto(`${BASE_URL}/`, { waitUntil: "domcontentloaded", timeout: 20_000 }); - const currentUser = await convexCall(context, "query", "users:currentUser", {}); - const userId = currentUser?._id; - assert(userId, "缺少 Convex currentUser._id"); - const workspaces = await convexCall(context, "query", "workspaces:fetchWorkspaceSummaries", {}); - const workspaceId = workspaces.activeWorkspaceId; - assert(workspaceId, "缺少隔离 workspaceId"); - - const root = await requestJson(request, "/api/tree/commands", { - method: "POST", - data: { action: "create", workspaceId, title: `TEST-10REVIEW-07-P3-root-${stamp}` }, - }); - const rootId = root.result.documentId; - const child = await requestJson(request, "/api/tree/commands", { - method: "POST", - data: { action: "create", workspaceId, parentId: rootId, title: `TEST-10REVIEW-07-P3-child-${stamp}` }, - }); - const childId = child.result.documentId; - const resourceDoc = await requestJson(request, "/api/tree/commands", { - method: "POST", - data: { action: "create", workspaceId, title: `TEST-10REVIEW-07-P3-resources-${stamp}` }, - }); - const resourceDocId = resourceDoc.result.documentId; - - await convexCall(context, "mutation", "mediaAssets:create", { - userId, - asset: { - id: assetId, - workspace_id: workspaceId, - document_id: resourceDocId, - asset_type: "file", - file_url: null, - thumbnail_url: null, - storage_id: null, - bucket: null, - storage_path: null, - file_name: `TEST-10REVIEW-07-P3-file-${stamp}.txt`, - file_size: 12, - mime_type: "text/plain", - }, - }); - await convexCall(context, "mutation", "mindmaps:put", { - docId: resourceDocId, - mindmapId, - data: { root: { data: { text: `TEST-10REVIEW-07-P3-mind-${stamp}` }, children: [] } }, - createOnly: true, - }); - const table = await convexCall(context, "mutation", "tables:create", { - userId, - workspaceId, - documentId: resourceDocId, - title: `TEST-10REVIEW-07-P3-table-${stamp}`, - schema: {}, - snapshot: null, - }); - const tableId = table.id; - await convexCall(context, "mutation", "tables:update", { - userId, - tableId, - rows: [{ cells: ["p3-row"] }], - }); - - await requestJson(request, "/api/tree/commands", { - method: "POST", - data: { action: "archive", workspaceId, documentId: rootId }, - }); - await requestJson(request, "/api/media/batch", { - method: "POST", - data: { action: "delete", assetIds: [assetId] }, - }); - await requestJson(request, `/api/mindmap/${encodeURIComponent(resourceDocId)}/${encodeURIComponent(mindmapId)}`, { - method: "DELETE", - }); - await requestJson(request, `/api/tables/${encodeURIComponent(tableId)}`, { method: "DELETE" }); - - const trashedDocs = await convexCall(context, "query", "documents:listTrashedByWorkspace", { workspaceId }); - assert(trashedDocs.some((doc) => doc.id === rootId), "根页面未进入垃圾箱"); - assert(trashedDocs.some((doc) => doc.id === childId), "子页面未级联进入垃圾箱"); - const mediaBefore = await convexCall(context, "query", "mediaAssets:getById", { userId, id: assetId }); - assert(mediaBefore?.deleted_at, "附件未进入垃圾箱"); - const mindmapsBefore = await convexCall(context, "query", "mindmaps:listByWorkspace", { workspaceId, includeDeleted: true }); - assert(mindmapsBefore.some((row) => row.mindmap_id === mindmapId && row.deleted_at), "mindmap 未进入垃圾箱"); - const tablesBefore = await convexCall(context, "query", "tables:listByWorkspaceForSearch", { - userId, - workspaceId, - includeArchived: true, - limit: 100, - }); - assert(tablesBefore.some((row) => row.id === tableId && row.deleted_at), "table 未进入垃圾箱"); - - const pageEmpty = await requestJson(request, "/api/documents/empty-trash", { method: "POST", data: { workspaceId } }); - const mediaEmpty = await requestJson(request, "/api/media/empty-trash", { method: "POST", data: { workspaceId } }); - const mindmapEmpty = await requestJson(request, "/api/mindmap-trash/empty", { method: "POST", data: { workspaceId } }); - const tableEmpty = await requestJson(request, "/api/tables/empty-trash", { method: "POST", data: { workspaceId } }); - - assert.equal(await convexCall(context, "query", "documents:getMeta", { id: rootId }), null, "根页面 purge 后仍可查询"); - assert.equal(await convexCall(context, "query", "documents:getMeta", { id: childId }), null, "子页面 purge 后仍可查询"); - assert.equal(await convexCall(context, "query", "mediaAssets:getById", { userId, id: assetId }), null, "附件 purge 后仍可查询"); - const mindmapsAfter = await convexCall(context, "query", "mindmaps:listByWorkspace", { workspaceId, includeDeleted: true }); - assert(!mindmapsAfter.some((row) => row.mindmap_id === mindmapId), "mindmap purge 后仍存在"); - assert.equal(await convexCall(context, "query", "tables:get", { userId, tableId }), null, "table purge 后仍可查询"); - assert.equal((await convexCall(context, "query", "tables:getRows", { tableId })).length, 0, "table rows purge 后仍存在"); - - await requestJson(request, "/api/documents/purge", { method: "POST", data: { documentId: resourceDocId } }).catch(() => null); - - console.log(JSON.stringify({ - ok: true, - email, - userId, - workspaceId, - rootId, - childId, - resourceDocId, - assetId, - mindmapId, - tableId, - pageEmpty: pageEmpty.result, - mediaEmpty: mediaEmpty.result, - mindmapEmpty: mindmapEmpty.result, - tableEmpty: tableEmpty.result, - }, null, 2)); - } finally { - await browser.close(); - } -} - -main().catch((error) => { - console.error(error); - process.exit(1); -}); diff --git a/scripts/task428-filetree-bulk-delete-selection-smoke.js b/scripts/task428-filetree-bulk-delete-selection-smoke.js deleted file mode 100644 index cf9aaa2e..00000000 --- a/scripts/task428-filetree-bulk-delete-selection-smoke.js +++ /dev/null @@ -1,535 +0,0 @@ -#!/usr/bin/env node -"use strict"; - -const assert = require("node:assert/strict"); -const fs = require("node:fs/promises"); -const path = require("node:path"); -const { chromium } = require("playwright"); - -const TASK = "task428-filetree-bulk-delete-selection-smoke"; -const BASE_URL = (process.env.MNOTE_UI_BASE_URL || "http://127.0.0.1:3000").replace(/\/+$/, ""); -const CONVEX_URL = (process.env.NEXT_PUBLIC_CONVEX_URL || process.env.CONVEX_SELF_HOSTED_URL || "http://127.0.0.1:3210").replace(/\/+$/, ""); -const e2ePassword = () => process.env.MNOTE_E2E_PASSWORD || ["Mnote", "E2E", "123!"].join(""); -// 说明：该 smoke 覆盖 convex-source 批量删除兼容路径，不代表 local-first 默认 File Tree 主链。 -const UI_TIMEOUT_MS = Number(process.env.MNOTE_SMOKE_UI_TIMEOUT_MS || 30_000); -const OUTPUT_DIR = path.join(process.cwd(), "tmp", TASK); -const RESULT_PATH = path.join(OUTPUT_DIR, "result.json"); - -async function writeResult(payload) { - await fs.mkdir(OUTPUT_DIR, { recursive: true }); - await fs.writeFile(RESULT_PATH, `${JSON.stringify({ ...payload, resultPath: RESULT_PATH }, null, 2)}\n`, "utf8"); -} - -async function requestJson(request, requestPath, init = {}) { - const response = await request.fetch(`${BASE_URL}${requestPath}`, { - ...init, - headers: { - ...(init.data !== undefined ? { "content-type": "application/json" } : {}), - ...(init.headers || {}), - }, - timeout: 20_000, - }); - const text = await response.text(); - let payload = null; - try { - payload = text ? JSON.parse(text) : null; - } catch { - payload = text; - } - if (!response.ok()) { - throw new Error(`${requestPath} 请求失败: ${response.status()} ${typeof payload === "string" ? payload : JSON.stringify(payload)}`); - } - return payload; -} - -async function convexCall(context, kind, convexPath, args) { - const cookies = await context.cookies(BASE_URL); - const jwt = cookies.find((cookie) => cookie.name === "__convexAuthJWT")?.value; - assert(jwt, "缺少 __convexAuthJWT cookie"); - const response = await fetch(`${CONVEX_URL}/api/${kind}`, { - method: "POST", - headers: { - authorization: `Bearer ${jwt}`, - "content-type": "application/json", - "Convex-Client": TASK, - }, - body: JSON.stringify({ path: convexPath, format: "convex_encoded_json", args: [args] }), - }); - const body = await response.json(); - if (!response.ok || body.status !== "success") { - throw new Error(`Convex ${kind} ${convexPath} 失败: ${response.status} ${JSON.stringify(body)}`); - } - return body.value; -} - -function docRowSelector(documentId) { - return `#sidebar-file-tree-root .tree-row[data-shell-mode="filetree"][data-row-id="doc:${cssEscape(documentId)}"]`; -} - -function assetRowSelector(assetId) { - return `#sidebar-file-tree-root .tree-row[data-shell-mode="filetree"][data-asset-id="${cssEscape(assetId)}"]`; -} - -function cssEscape(value) { - return String(value).replace(/\\/g, "\\\\").replace(/"/g, '\\"'); -} - -async function openDocumentFileTree(page, workspaceId, documentId) { - await page.goto(`${BASE_URL}/documents/${encodeURIComponent(documentId)}?workspaceId=${encodeURIComponent(workspaceId)}`, { - waitUntil: "commit", - timeout: UI_TIMEOUT_MS, - }); - await page.waitForFunction( - () => { - const fileRoot = document.getElementById("sidebar-file-tree-root"); - const fileTab = document.querySelector('[data-mnote-sidebar-tree-tab="filetree"], button[aria-label="文件"]'); - return Boolean(fileRoot || fileTab); - }, - undefined, - { timeout: UI_TIMEOUT_MS }, - ); - await page.evaluate(() => { - const fileRoot = document.getElementById("sidebar-file-tree-root"); - const visible = (node) => - node instanceof HTMLElement && - !node.hidden && - getComputedStyle(node).display !== "none" && - getComputedStyle(node).visibility !== "hidden" && - node.getClientRects().length > 0; - if (visible(fileRoot)) return; - const tab = document.querySelector('[data-mnote-sidebar-tree-tab="filetree"], button[aria-label="文件"]'); - if (tab instanceof HTMLElement) tab.click(); - }); - await page.waitForFunction( - () => { - const fileRoot = document.getElementById("sidebar-file-tree-root"); - return fileRoot instanceof HTMLElement && fileRoot.getClientRects().length > 0; - }, - undefined, - { timeout: UI_TIMEOUT_MS }, - ); -} - -async function waitForRow(page, selector, label) { - await page.locator(selector).first().waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }).catch(async (error) => { - const text = await page.locator("#sidebar-file-tree-root").innerText({ timeout: 3_000 }).catch(() => ""); - throw new Error(`${label} 未出现: ${error.message}; filetree=${text.slice(0, 2000)}`); - }); -} - -async function expandDocIfNeeded(page, documentId) { - const selector = docRowSelector(documentId); - await waitForRow(page, selector, `页面 ${documentId}`); - const expanded = await page.locator(selector).first().getAttribute("aria-expanded").catch(() => null); - if (expanded === "true") return; - const clicked = await page.locator(`${selector} [data-testid="filetree-toggle"]`).first().click({ timeout: 2_000 }).then(() => true).catch(() => false); - if (!clicked) { - await page.locator(selector).first().dblclick({ timeout: 2_000 }).catch(() => undefined); - } -} - -async function selectedRows(page) { - return page.locator('#sidebar-file-tree-root .tree-row[data-shell-mode="filetree"][data-selected="true"]').evaluateAll((rows) => - rows.map((row) => ({ - rowId: row instanceof HTMLElement ? row.dataset.rowId || "" : "", - assetId: row instanceof HTMLElement ? row.dataset.assetId || "" : "", - documentId: row instanceof HTMLElement ? row.dataset.documentId || "" : "", - text: row.textContent || "", - })), - ); -} - -async function clickRow(page, selector, options = {}) { - await page.locator(selector).first().click({ timeout: UI_TIMEOUT_MS, ...options }); -} - -async function rightClickRow(page, selector) { - await page.locator(selector).first().click({ button: "right", timeout: UI_TIMEOUT_MS }); -} - -async function closeContextMenu(page) { - await page.keyboard.press("Escape").catch(() => undefined); - await page.waitForTimeout(150); -} - -async function deleteSelectionAndCaptureConfirm(page, key, focusSelector) { - const target = focusSelector ? page.locator(focusSelector).first() : null; - if (focusSelector) { - await target.focus({ timeout: UI_TIMEOUT_MS }); - } - const dialogPromise = page.waitForEvent("dialog", { timeout: UI_TIMEOUT_MS }).then(async (dialog) => { - const message = dialog.message(); - await dialog.accept(); - return message; - }); - if (target) { - await target.press(key, { timeout: UI_TIMEOUT_MS }); - } else { - await page.keyboard.press(key); - } - return await dialogPromise.catch((error) => { - throw new Error(`${key} 未触发删除确认弹窗: ${error instanceof Error ? error.message : String(error)}`); - }); -} - -async function deleteSelectionAndCaptureConfirmAndAlert(page, key, focusSelector) { - const confirmPromise = page.waitForEvent("dialog", { timeout: UI_TIMEOUT_MS }).then(async (dialog) => { - const message = dialog.message(); - await dialog.accept(); - return message; - }); - await page.locator(focusSelector).first().press(key, { timeout: UI_TIMEOUT_MS }); - const confirm = await confirmPromise.catch((error) => { - throw new Error(`${key} 未触发删除确认弹窗: ${error instanceof Error ? error.message : String(error)}`); - }); - const alert = await page.waitForEvent("dialog", { timeout: UI_TIMEOUT_MS }).then(async (dialog) => { - const message = dialog.message(); - await dialog.accept(); - return message; - }).catch((error) => { - throw new Error(`${key} 未触发失败摘要弹窗: ${error instanceof Error ? error.message : String(error)}`); - }); - return { confirm, alert }; -} - -async function expectDetached(page, selector, label) { - await page.locator(selector).first().waitFor({ state: "detached", timeout: UI_TIMEOUT_MS }).catch(async (error) => { - const state = await selectedRows(page).catch(() => []); - throw new Error(`${label} 未从 filetree 消失: ${error.message}; selection=${JSON.stringify(state)}`); - }); -} - -async function createPage(request, workspaceId, title, parentId = null) { - const payload = await requestJson(request, "/api/tree/commands", { - method: "POST", - data: { - action: "create", - workspaceId, - parentId, - title, - }, - }); - const result = payload.result || payload; - assert(result.documentId, `创建页面失败: ${JSON.stringify(payload)}`); - return result.documentId; -} - -async function seedFixture(context, request, stamp) { - const currentUser = await convexCall(context, "query", "users:currentUser", {}); - const userId = currentUser?._id; - assert(userId, "缺少 Convex currentUser._id"); - const workspaces = await convexCall(context, "query", "workspaces:fetchWorkspaceSummaries", {}); - const workspaceId = workspaces.activeWorkspaceId; - assert(workspaceId, "缺少隔离 workspaceId"); - - const rootId = await createPage(request, workspaceId, `TEST-10REVIEW-07-P4-root-${stamp}`); - const childId = await createPage(request, workspaceId, `TEST-10REVIEW-07-P4-child-${stamp}`, rootId); - const siblingId = await createPage(request, workspaceId, `TEST-10REVIEW-07-P4-sibling-${stamp}`); - const failureDocId = await createPage(request, workspaceId, `TEST-10REVIEW-07-P4-failure-doc-${stamp}`); - const resourceDocId = await createPage(request, workspaceId, `TEST-10REVIEW-07-P4-resources-${stamp}`); - - const fileAssetA = `asset_p4_a_${stamp}`; - const fileAssetB = `asset_p4_b_${stamp}`; - const failureAssetId = `asset_p4_failure_${stamp}`; - const mindmapId = `mind_p4_${stamp}`; - - for (const [assetId, fileName] of [ - [fileAssetA, `TEST-10REVIEW-07-P4-file-a-${stamp}.txt`], - [fileAssetB, `TEST-10REVIEW-07-P4-file-b-${stamp}.txt`], - [failureAssetId, `TEST-10REVIEW-07-P4-failure-file-${stamp}.txt`], - ]) { - await convexCall(context, "mutation", "mediaAssets:create", { - userId, - asset: { - id: assetId, - workspace_id: workspaceId, - document_id: resourceDocId, - asset_type: "file", - file_url: null, - thumbnail_url: null, - storage_id: null, - bucket: null, - storage_path: null, - file_name: fileName, - file_size: 12, - mime_type: "text/plain", - }, - }); - } - - await convexCall(context, "mutation", "mindmaps:put", { - docId: resourceDocId, - mindmapId, - data: { root: { data: { text: `TEST-10REVIEW-07-P4-mind-${stamp}` }, children: [] } }, - createOnly: true, - }); - - const table = await convexCall(context, "mutation", "tables:create", { - userId, - workspaceId, - documentId: resourceDocId, - title: `TEST-10REVIEW-07-P4-table-${stamp}`, - schema: {}, - snapshot: null, - }); - await convexCall(context, "mutation", "tables:update", { - userId, - tableId: table.id, - rows: [{ cells: ["p4-row"] }], - }); - - return { - userId, - workspaceId, - rootId, - childId, - siblingId, - failureDocId, - resourceDocId, - fileAssetA, - fileAssetB, - failureAssetId, - mindmapId, - tableId: table.id, - }; -} - -async function assertTrashState(context, fixture, stage) { - const trashedDocs = await convexCall(context, "query", "documents:listTrashedByWorkspace", { - workspaceId: fixture.workspaceId, - }); - for (const documentId of stage.documentIds || []) { - assert(trashedDocs.some((doc) => doc.id === documentId), `${stage.name}: 页面 ${documentId} 未进入垃圾箱`); - } - for (const assetId of stage.fileAssetIds || []) { - const row = await convexCall(context, "query", "mediaAssets:getById", { userId: fixture.userId, id: assetId }); - assert(row?.deleted_at, `${stage.name}: 附件 ${assetId} 未进入垃圾箱`); - } - if (stage.mindmapId) { - const mindmaps = await convexCall(context, "query", "mindmaps:listByWorkspace", { - workspaceId: fixture.workspaceId, - includeDeleted: true, - }); - assert( - mindmaps.some((row) => row.mindmap_id === stage.mindmapId && row.deleted_at), - `${stage.name}: mindmap ${stage.mindmapId} 未进入垃圾箱`, - ); - } - if (stage.tableId) { - const tables = await convexCall(context, "query", "tables:listByWorkspaceForSearch", { - userId: fixture.userId, - workspaceId: fixture.workspaceId, - includeArchived: true, - limit: 100, - }); - assert(tables.some((row) => row.id === stage.tableId && row.deleted_at), `${stage.name}: table ${stage.tableId} 未进入垃圾箱`); - } -} - -async function cleanup(context, request, fixture) { - if (!fixture?.workspaceId) return; - await requestJson(request, "/api/documents/empty-trash", { method: "POST", data: { workspaceId: fixture.workspaceId } }).catch(() => null); - await requestJson(request, "/api/media/empty-trash", { method: "POST", data: { workspaceId: fixture.workspaceId } }).catch(() => null); - await requestJson(request, "/api/mindmap-trash/empty", { method: "POST", data: { workspaceId: fixture.workspaceId } }).catch(() => null); - await requestJson(request, "/api/tables/empty-trash", { method: "POST", data: { workspaceId: fixture.workspaceId } }).catch(() => null); - if (fixture.resourceDocId) { - if (fixture.failureAssetId) { - await requestJson(request, "/api/media/batch", { - method: "POST", - data: { action: "delete", assetIds: [fixture.failureAssetId] }, - }).catch(() => null); - await requestJson(request, "/api/media/empty-trash", { method: "POST", data: { workspaceId: fixture.workspaceId } }).catch(() => null); - } - await requestJson(request, "/api/documents/purge", { method: "POST", data: { documentId: fixture.resourceDocId } }).catch(() => null); - } - await convexCall(context, "query", "users:currentUser", {}).catch(() => null); -} - -async function main() { - const stamp = Date.now(); - const result = { - ok: false, - task: TASK, - baseUrl: BASE_URL, - convexUrl: CONVEX_URL, - email: `mnote.filetree.${stamp}@example.com`, - requests: [], - confirms: [], - fixture: null, - }; - const browser = await chromium.launch({ headless: true }); - const context = await browser.newContext(); - const page = await context.newPage(); - const request = context.request; - let fixture = null; - - page.on("request", (req) => { - const url = req.url(); - if ( - url.includes("/api/tree/filetree/delete-preflight") || - url.includes("/api/tree/commands") || - url.includes("/api/media/batch") || - url.includes("/api/mindmap/") || - url.includes("/api/tables/") - ) { - result.requests.push({ - method: req.method(), - url, - body: req.postData() || null, - }); - } - }); - - try { - await requestJson(request, "/api/auth", { - method: "POST", - data: { - action: "auth:signIn", - args: { - provider: "password", - params: { email: result.email, password: e2ePassword(), flow: "signUp", name: `filetree-${stamp}` }, - }, - }, - }); - - await page.goto(`${BASE_URL}/`, { waitUntil: "commit", timeout: UI_TIMEOUT_MS }); - fixture = await seedFixture(context, request, stamp); - result.fixture = fixture; - - await openDocumentFileTree(page, fixture.workspaceId, fixture.resourceDocId); - for (const documentId of [fixture.rootId, fixture.siblingId, fixture.failureDocId, fixture.resourceDocId]) { - await waitForRow(page, docRowSelector(documentId), `页面 ${documentId}`); - } - await expandDocIfNeeded(page, fixture.rootId); - await waitForRow(page, docRowSelector(fixture.childId), `子页面 ${fixture.childId}`); - await expandDocIfNeeded(page, fixture.resourceDocId); - for (const assetId of [fixture.fileAssetA, fixture.fileAssetB, fixture.failureAssetId, fixture.mindmapId, fixture.tableId]) { - await waitForRow(page, assetRowSelector(assetId), `资源 ${assetId}`); - } - - const accel = process.platform === "darwin" ? "Meta" : "Control"; - await clickRow(page, docRowSelector(fixture.rootId)); - await clickRow(page, assetRowSelector(fixture.fileAssetA), { modifiers: [accel] }); - let selected = await selectedRows(page); - assert(selected.length >= 2, `Ctrl/Cmd 多选后选区数量异常: ${JSON.stringify(selected)}`); - - await clickRow(page, docRowSelector(fixture.rootId)); - await clickRow(page, docRowSelector(fixture.childId), { modifiers: ["Shift"] }); - selected = await selectedRows(page); - assert(selected.length >= 2, `Shift 范围选择后选区数量异常: ${JSON.stringify(selected)}`); - - await clickRow(page, docRowSelector(fixture.rootId)); - await clickRow(page, assetRowSelector(fixture.fileAssetA), { modifiers: [accel] }); - const beforeContextSelected = await selectedRows(page); - await rightClickRow(page, assetRowSelector(fixture.fileAssetA)); - const afterContextSelected = await selectedRows(page); - assert( - afterContextSelected.length === beforeContextSelected.length, - `右键已选项不应清空多选: before=${JSON.stringify(beforeContextSelected)} after=${JSON.stringify(afterContextSelected)}`, - ); - await closeContextMenu(page); - await rightClickRow(page, assetRowSelector(fixture.fileAssetB)); - selected = await selectedRows(page); - assert( - selected.length === 1 && selected[0].assetId === fixture.fileAssetB, - `右键未选项应切换 action target: ${JSON.stringify(selected)}`, - ); - await closeContextMenu(page); - - await clickRow(page, docRowSelector(fixture.rootId)); - await clickRow(page, docRowSelector(fixture.childId), { modifiers: [accel] }); - await clickRow(page, assetRowSelector(fixture.fileAssetA), { modifiers: [accel] }); - await clickRow(page, assetRowSelector(fixture.mindmapId), { modifiers: [accel] }); - await clickRow(page, assetRowSelector(fixture.tableId), { modifiers: [accel] }); - selected = await selectedRows(page); - assert(selected.length >= 5, `Delete 前混合选区数量异常: ${JSON.stringify(selected)}`); - const deleteConfirm = await deleteSelectionAndCaptureConfirm(page, "Delete", assetRowSelector(fixture.tableId)); - result.confirms.push({ key: "Delete", message: deleteConfirm }); - assert(deleteConfirm.includes("1 个页面"), `Delete 确认文案缺少页面计数: ${deleteConfirm}`); - assert(deleteConfirm.includes("1 个附件"), `Delete 确认文案缺少附件计数: ${deleteConfirm}`); - assert(deleteConfirm.includes("1 个思维导图"), `Delete 确认文案缺少思维导图计数: ${deleteConfirm}`); - assert(deleteConfirm.includes("1 个在线表格"), `Delete 确认文案缺少在线表格计数: ${deleteConfirm}`); - - await expectDetached(page, docRowSelector(fixture.rootId), "root 页面"); - await expectDetached(page, docRowSelector(fixture.childId), "child 页面"); - await expectDetached(page, assetRowSelector(fixture.fileAssetA), "普通附件 A"); - await expectDetached(page, assetRowSelector(fixture.mindmapId), "mindmap"); - await expectDetached(page, assetRowSelector(fixture.tableId), "table"); - await assertTrashState(context, fixture, { - name: "Delete", - documentIds: [fixture.rootId, fixture.childId], - fileAssetIds: [fixture.fileAssetA], - mindmapId: fixture.mindmapId, - tableId: fixture.tableId, - }); - - await clickRow(page, docRowSelector(fixture.siblingId)); - await clickRow(page, assetRowSelector(fixture.fileAssetB), { modifiers: [accel] }); - selected = await selectedRows(page); - assert(selected.length >= 2, `Backspace 前混合选区数量异常: ${JSON.stringify(selected)}`); - const backspaceConfirm = await deleteSelectionAndCaptureConfirm(page, "Backspace", assetRowSelector(fixture.fileAssetB)); - result.confirms.push({ key: "Backspace", message: backspaceConfirm }); - assert(backspaceConfirm.includes("1 个页面"), `Backspace 确认文案缺少页面计数: ${backspaceConfirm}`); - assert(backspaceConfirm.includes("1 个附件"), `Backspace 确认文案缺少附件计数: ${backspaceConfirm}`); - await expectDetached(page, docRowSelector(fixture.siblingId), "sibling 页面"); - await expectDetached(page, assetRowSelector(fixture.fileAssetB), "普通附件 B"); - await assertTrashState(context, fixture, { - name: "Backspace", - documentIds: [fixture.siblingId], - fileAssetIds: [fixture.fileAssetB], - }); - - await clickRow(page, docRowSelector(fixture.failureDocId)); - await clickRow(page, assetRowSelector(fixture.failureAssetId), { modifiers: [accel] }); - let mediaBatchFailed = false; - await page.route("**/api/media/batch", async (route) => { - const postData = route.request().postData() || ""; - if (postData.includes(fixture.failureAssetId)) { - mediaBatchFailed = true; - await route.fulfill({ - status: 500, - contentType: "application/json", - body: JSON.stringify({ error: "task428 forced media failure" }), - }); - return; - } - await route.continue(); - }); - const failureDialogs = await deleteSelectionAndCaptureConfirmAndAlert(page, "Delete", assetRowSelector(fixture.failureAssetId)); - await page.unroute("**/api/media/batch").catch(() => undefined); - result.confirms.push({ key: "Delete-partial", message: failureDialogs.confirm }); - result.partialFailureAlert = failureDialogs.alert; - assert(mediaBatchFailed, "部分失败场景未拦截到 media batch 请求"); - assert(failureDialogs.alert.includes("部分对象删除失败"), `失败摘要文案不正确: ${failureDialogs.alert}`); - await expectDetached(page, docRowSelector(fixture.failureDocId), "partial failure 页面"); - await waitForRow(page, assetRowSelector(fixture.failureAssetId), "partial failure 附件应保留"); - await assertTrashState(context, fixture, { - name: "PartialFailure", - documentIds: [fixture.failureDocId], - }); - const failureAsset = await convexCall(context, "query", "mediaAssets:getById", { - userId: fixture.userId, - id: fixture.failureAssetId, - }); - assert(failureAsset && !failureAsset.deleted_at, "部分失败后附件不应被错误移入垃圾箱"); - - result.ok = true; - await writeResult(result); - } catch (error) { - result.error = error instanceof Error ? error.stack || error.message : String(error); - result.selectedRows = await selectedRows(page).catch(() => []); - result.filetreeText = await page.locator("#sidebar-file-tree-root").innerText({ timeout: 3_000 }).catch(() => ""); - await writeResult(result); - throw error; - } finally { - await cleanup(context, request, fixture).catch((error) => { - console.warn(`清理 task428 临时数据失败: ${error instanceof Error ? error.message : String(error)}`); - }); - await browser.close(); - } -} - -main().catch((error) => { - console.error(error); - process.exit(1); -}); diff --git a/scripts/task429-trash-restore-location-reveal-smoke.js b/scripts/task429-trash-restore-location-reveal-smoke.js deleted file mode 100644 index 0bb2c37f..00000000 --- a/scripts/task429-trash-restore-location-reveal-smoke.js +++ /dev/null @@ -1,323 +0,0 @@ -#!/usr/bin/env node -"use strict"; - -const assert = require("node:assert/strict"); -const fs = require("node:fs/promises"); -const path = require("node:path"); -const { chromium } = require("playwright"); - -const TASK = "task429-trash-restore-location-reveal-smoke"; -const BASE_URL = (process.env.MNOTE_UI_BASE_URL || "http://127.0.0.1:3000").replace(/\/+$/, ""); -const CONVEX_URL = (process.env.NEXT_PUBLIC_CONVEX_URL || process.env.CONVEX_SELF_HOSTED_URL || "http://127.0.0.1:3210").replace(/\/+$/, ""); -const e2ePassword = () => process.env.MNOTE_E2E_PASSWORD || ["Mnote", "E2E", "123!"].join(""); -const UI_TIMEOUT_MS = Number(process.env.MNOTE_SMOKE_UI_TIMEOUT_MS || 30_000); -const OUTPUT_DIR = path.join(process.cwd(), "tmp", TASK); -const RESULT_PATH = path.join(OUTPUT_DIR, "result.json"); - -async function writeResult(payload) { - await fs.mkdir(OUTPUT_DIR, { recursive: true }); - await fs.writeFile(RESULT_PATH, `${JSON.stringify({ ...payload, resultPath: RESULT_PATH }, null, 2)}\n`, "utf8"); -} - -async function requestJson(request, requestPath, init = {}) { - const response = await request.fetch(`${BASE_URL}${requestPath}`, { - ...init, - headers: { - ...(init.data !== undefined ? { "content-type": "application/json" } : {}), - ...(init.headers || {}), - }, - timeout: 20_000, - }); - const text = await response.text(); - let payload = null; - try { - payload = text ? JSON.parse(text) : null; - } catch { - payload = text; - } - if (!response.ok()) { - throw new Error(`${requestPath} 请求失败: ${response.status()} ${typeof payload === "string" ? payload : JSON.stringify(payload)}`); - } - return payload; -} - -async function convexCall(context, kind, convexPath, args) { - const cookies = await context.cookies(BASE_URL); - const jwt = cookies.find((cookie) => cookie.name === "__convexAuthJWT")?.value; - assert(jwt, "缺少 __convexAuthJWT cookie"); - const response = await fetch(`${CONVEX_URL}/api/${kind}`, { - method: "POST", - headers: { - authorization: `Bearer ${jwt}`, - "content-type": "application/json", - "Convex-Client": TASK, - }, - body: JSON.stringify({ path: convexPath, format: "convex_encoded_json", args: [args] }), - }); - const body = await response.json(); - if (!response.ok || body.status !== "success") { - throw new Error(`Convex ${kind} ${convexPath} 失败: ${response.status} ${JSON.stringify(body)}`); - } - return body.value; -} - -async function createPage(request, workspaceId, title, parentId = null) { - const payload = await requestJson(request, "/api/tree/commands", { - method: "POST", - data: { - action: "create", - workspaceId, - parentId, - title, - }, - }); - const result = payload.result || payload; - assert(result.documentId, `创建页面失败: ${JSON.stringify(payload)}`); - return result.documentId; -} - -async function postTreeCommand(request, data) { - return await requestJson(request, "/api/tree/commands", { - method: "POST", - data, - }); -} - -function pageTreeRowSelector(documentId) { - const escaped = String(documentId).replace(/\\/g, "\\\\").replace(/"/g, '\\"'); - return `[data-testid="page-tree-row"][data-node-id="${escaped}"], [data-testid="wolai-sidebar-row"][data-node-id="${escaped}"], #sidebar-file-tree-root .tree-row[data-document-id="${escaped}"], #sidebar-file-tree-root .tree-row[data-doc-id="${escaped}"]`; -} - -async function waitForPageTreeRow(page, documentId, label) { - await page.locator(pageTreeRowSelector(documentId)).first().waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }).catch(async (error) => { - const text = await page.locator('[data-testid="sidebar-page-tree-shell"], #sidebar-file-tree-root, [data-testid="wolai-sidebar"]').innerText({ timeout: 3_000 }).catch(() => ""); - throw new Error(`${label} 未出现在侧边栏树: ${error.message}; tree=${text.slice(0, 1600)}`); - }); -} - -async function openDocumentFileTree(page, workspaceId, documentId) { - await page.goto(`${BASE_URL}/documents/${encodeURIComponent(documentId)}?workspaceId=${encodeURIComponent(workspaceId)}`, { - waitUntil: "commit", - timeout: UI_TIMEOUT_MS, - }); - await page.waitForFunction( - () => { - const fileRoot = document.getElementById("sidebar-file-tree-root"); - const fileTab = document.querySelector('[data-mnote-sidebar-tree-tab="filetree"], button[aria-label="文件"]'); - return Boolean(fileRoot || fileTab); - }, - undefined, - { timeout: UI_TIMEOUT_MS }, - ); - await page.evaluate(() => { - const fileRoot = document.getElementById("sidebar-file-tree-root"); - const visible = (node) => - node instanceof HTMLElement && - !node.hidden && - getComputedStyle(node).display !== "none" && - getComputedStyle(node).visibility !== "hidden" && - node.getClientRects().length > 0; - if (visible(fileRoot)) return; - const tab = document.querySelector('[data-mnote-sidebar-tree-tab="filetree"], button[aria-label="文件"]'); - if (tab instanceof HTMLElement) tab.click(); - }); - await page.waitForFunction( - () => { - const fileRoot = document.getElementById("sidebar-file-tree-root"); - return fileRoot instanceof HTMLElement && fileRoot.getClientRects().length > 0; - }, - undefined, - { timeout: UI_TIMEOUT_MS }, - ); -} - -async function clickTrashButton(page) { - if (await page.getByRole("heading", { name: "垃圾桶" }).isVisible().catch(() => false)) { - return; - } - await page.getByRole("button", { name: /^垃圾桶\b/ }).first().click({ timeout: UI_TIMEOUT_MS }); - await page.getByRole("heading", { name: "垃圾桶" }).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); -} - -async function restoreTrashItemWithDialogs(page, title, expectFallbackAlert = false) { - const confirmPromise = page.waitForEvent("dialog", { timeout: UI_TIMEOUT_MS }).then(async (dialog) => { - const message = dialog.message(); - await dialog.accept(); - return message; - }); - const clicked = await page.evaluate((targetTitle) => { - const rows = Array.from(document.querySelectorAll("div")); - for (const row of rows) { - if (!row.textContent?.includes(targetTitle)) continue; - const button = Array.from(row.querySelectorAll("button")).find((candidate) => candidate.textContent?.trim() === "恢复"); - if (button instanceof HTMLButtonElement) { - button.click(); - return true; - } - } - return false; - }, title); - assert(clicked, `未找到垃圾桶恢复按钮: ${title}`); - const dialogs = [await confirmPromise]; - if (expectFallbackAlert) { - const alertMessage = await page.waitForEvent("dialog", { timeout: UI_TIMEOUT_MS }).then(async (dialog) => { - const message = dialog.message(); - await dialog.accept(); - return message; - }); - dialogs.push(alertMessage); - assert(dialogs.some((message) => message.includes("原父页面已不存在")), `缺少 fallback 提示: ${JSON.stringify(dialogs)}`); - } - return dialogs; -} - -async function listDocuments(context, workspaceId) { - return await convexCall(context, "query", "documents:listByWorkspace", { workspaceId }); -} - -async function cleanup(request, workspaceId, rootId, orphanId) { - if (!workspaceId) return; - if (orphanId) { - await postTreeCommand(request, { action: "archive", workspaceId, documentId: orphanId }).catch(() => null); - } - if (rootId) { - await postTreeCommand(request, { action: "archive", workspaceId, documentId: rootId }).catch(() => null); - } - await requestJson(request, "/api/documents/empty-trash", { method: "POST", data: { workspaceId } }).catch(() => null); -} - -async function main() { - const stamp = Date.now(); - const email = `mnote.restore.${stamp}@example.com`; - const username = `restore-${stamp}`; - const parentTitle = `TEST-10REVIEW-07-P6-parent-${stamp}`; - const childTitle = `TEST-10REVIEW-07-P6-child-${stamp}`; - const siblingTitle = `TEST-10REVIEW-07-P6-sibling-${stamp}`; - const orphanTitle = `TEST-10REVIEW-07-P6-orphan-${stamp}`; - const orphanId = `tree_restore_orphan_${stamp}`; - const missingParentId = `tree_missing_parent_${stamp}`; - const result = { - ok: false, - task: TASK, - baseUrl: BASE_URL, - convexUrl: CONVEX_URL, - email, - dialogs: [], - }; - - const browser = await chromium.launch({ headless: true }); - const context = await browser.newContext(); - const page = await context.newPage(); - const request = context.request; - let workspaceId = null; - let parentId = null; - - try { - await requestJson(request, "/api/auth", { - method: "POST", - data: { - action: "auth:signIn", - args: { - provider: "password", - params: { email, password: e2ePassword(), flow: "signUp", name: username }, - }, - }, - }); - - await page.goto(`${BASE_URL}/`, { waitUntil: "commit", timeout: UI_TIMEOUT_MS }); - const currentUser = await convexCall(context, "query", "users:currentUser", {}); - const userId = currentUser?._id; - assert(userId, "缺少 Convex currentUser._id"); - const workspaces = await convexCall(context, "query", "workspaces:fetchWorkspaceSummaries", {}); - workspaceId = workspaces.activeWorkspaceId; - assert(workspaceId, "缺少隔离 workspaceId"); - - parentId = await createPage(request, workspaceId, parentTitle); - const childId = await createPage(request, workspaceId, childTitle, parentId); - const siblingId = await createPage(request, workspaceId, siblingTitle, parentId); - await convexCall(context, "mutation", "documents:create", { - id: orphanId, - workspaceId, - parentId: missingParentId, - title: orphanTitle, - accessScope: "private", - content: [], - }); - - await page.goto(`${BASE_URL}/documents/${encodeURIComponent(parentId)}?workspaceId=${encodeURIComponent(workspaceId)}`, { - waitUntil: "commit", - timeout: UI_TIMEOUT_MS, - }); - await waitForPageTreeRow(page, parentId, "父页面"); - await waitForPageTreeRow(page, childId, "子页面"); - await waitForPageTreeRow(page, siblingId, "兄弟页面"); - - await postTreeCommand(request, { action: "archive", workspaceId, documentId: childId }); - await page.locator(pageTreeRowSelector(childId)).first().waitFor({ state: "detached", timeout: UI_TIMEOUT_MS }); - await postTreeCommand(request, { action: "archive", workspaceId, documentId: orphanId }); - - const restorePayload = await postTreeCommand(request, { action: "restore", workspaceId, documentId: childId }); - result.restorePayload = restorePayload.result || restorePayload; - await waitForPageTreeRow(page, childId, "恢复后的子页面"); - await page.waitForFunction( - (documentId) => { - const row = document.querySelector(`[data-testid="page-tree-row"][data-node-id="${documentId}"], [data-testid="wolai-sidebar-row"][data-node-id="${documentId}"], #sidebar-file-tree-root .tree-row[data-document-id="${documentId}"], #sidebar-file-tree-root .tree-row[data-doc-id="${documentId}"]`); - return row instanceof HTMLElement && row.getClientRects().length > 0; - }, - childId, - { timeout: UI_TIMEOUT_MS }, - ); - - let docs = await listDocuments(context, workspaceId); - const childDoc = docs.find((doc) => doc.id === childId); - const siblingDoc = docs.find((doc) => doc.id === siblingId); - assert.equal(childDoc?.parent_id, parentId, "恢复后的子页面应回到原父页面"); - assert.equal(childDoc?.sort_order, 0, "恢复后的子页面应回到原排序位"); - assert.equal(siblingDoc?.sort_order, 1, "原排序位被恢复页面占用时，兄弟页面应后移"); - - const fallbackPayload = await postTreeCommand(request, { action: "restore", workspaceId, documentId: orphanId }); - result.fallbackPayload = fallbackPayload.result || fallbackPayload; - assert.equal( - result.fallbackPayload?.execution?.restore_location?.fallback_reason, - "parent_missing_or_deleted", - `fallback restore 应返回 parent_missing_or_deleted: ${JSON.stringify(result.fallbackPayload)}`, - ); - await waitForPageTreeRow(page, orphanId, "fallback 恢复后的孤儿页面"); - docs = await listDocuments(context, workspaceId); - const orphanDoc = docs.find((doc) => doc.id === orphanId); - assert.equal(orphanDoc?.parent_id ?? null, null, "原父页面不存在时应恢复到根目录"); - - const order = await page.evaluate( - ({ child, sibling }) => - Array.from(document.querySelectorAll('[data-testid="page-tree-row"], [data-testid="wolai-sidebar-row"], #sidebar-file-tree-root .tree-row')) - .map((row) => row instanceof HTMLElement ? row.dataset.nodeId : "") - .filter((id) => id === child || id === sibling) - .filter((id, index, list) => list.indexOf(id) === index), - { child: childId, sibling: siblingId }, - ); - assert.deepEqual(order, [childId, siblingId], `页面树顺序应为 child -> sibling: ${JSON.stringify(order)}`); - - result.ok = true; - result.workspaceId = workspaceId; - result.parentId = parentId; - result.childId = childId; - result.siblingId = siblingId; - result.orphanId = orphanId; - await writeResult(result); - } catch (error) { - result.error = error instanceof Error ? error.stack || error.message : String(error); - result.pageTreeText = await page.locator('[data-testid="sidebar-page-tree-shell"], #sidebar-file-tree-root, [data-testid="wolai-sidebar"]').innerText({ timeout: 3_000 }).catch(() => ""); - await writeResult(result); - throw error; - } finally { - await cleanup(request, workspaceId, parentId, orphanId).catch((error) => { - console.warn(`清理 task429 临时数据失败: ${error instanceof Error ? error.message : String(error)}`); - }); - await browser.close(); - } -} - -main().catch((error) => { - console.error(error); - process.exit(1); -}); diff --git a/scripts/task430-vscode-explorer-stage7-smoke.js b/scripts/task430-vscode-explorer-stage7-smoke.js deleted file mode 100644 index e2edba30..00000000 --- a/scripts/task430-vscode-explorer-stage7-smoke.js +++ /dev/null @@ -1,597 +0,0 @@ -#!/usr/bin/env node -"use strict"; - -const assert = require("node:assert/strict"); -const fs = require("node:fs/promises"); -const path = require("node:path"); -const { chromium } = require("playwright"); - -const TASK = "task430-vscode-explorer-stage7-smoke"; -const BASE_URL = (process.env.MNOTE_UI_BASE_URL || "http://127.0.0.1:3000").replace(/\/+$/, ""); -const CONVEX_URL = (process.env.NEXT_PUBLIC_CONVEX_URL || process.env.CONVEX_SELF_HOSTED_URL || "http://127.0.0.1:3210").replace(/\/+$/, ""); -const e2ePassword = () => process.env.MNOTE_E2E_PASSWORD || ["Mnote", "E2E", "123!"].join(""); -// 说明：该 smoke 覆盖 convex-source Explorer 兼容路径；local-first 默认主链另有 local workspace smoke。 -const UI_TIMEOUT_MS = Number(process.env.MNOTE_SMOKE_UI_TIMEOUT_MS || 30_000); -const OUTPUT_DIR = path.join(process.cwd(), "tmp", TASK); -const RESULT_PATH = path.join(OUTPUT_DIR, "result.json"); - -async function writeResult(payload) { - await fs.mkdir(OUTPUT_DIR, { recursive: true }); - await fs.writeFile(RESULT_PATH, `${JSON.stringify({ ...payload, resultPath: RESULT_PATH }, null, 2)}\n`, "utf8"); -} - -async function requestJson(request, requestPath, init = {}) { - const response = await request.fetch(`${BASE_URL}${requestPath}`, { - ...init, - headers: { - ...(init.data !== undefined ? { "content-type": "application/json" } : {}), - ...(init.headers || {}), - }, - timeout: 20_000, - }); - const text = await response.text(); - let payload = null; - try { - payload = text ? JSON.parse(text) : null; - } catch { - payload = text; - } - if (!response.ok()) { - throw new Error(`${requestPath} 请求失败: ${response.status()} ${typeof payload === "string" ? payload : JSON.stringify(payload)}`); - } - return payload; -} - -async function requestJsonAllowError(request, requestPath, init = {}) { - let response; - try { - response = await request.fetch(`${BASE_URL}${requestPath}`, { - ...init, - headers: { - ...(init.data !== undefined ? { "content-type": "application/json" } : {}), - ...(init.headers || {}), - }, - timeout: 20_000, - }); - } catch (error) { - return { - ok: false, - status: 0, - payload: { - error: error instanceof Error ? error.message : String(error), - }, - }; - } - const text = await response.text(); - let payload = null; - try { - payload = text ? JSON.parse(text) : null; - } catch { - payload = text; - } - return { ok: response.ok(), status: response.status(), payload }; -} - -async function convexCall(context, kind, convexPath, args) { - const cookies = await context.cookies(BASE_URL); - const jwt = cookies.find((cookie) => cookie.name === "__convexAuthJWT")?.value; - assert(jwt, "缺少 __convexAuthJWT cookie"); - const response = await fetch(`${CONVEX_URL}/api/${kind}`, { - method: "POST", - headers: { - authorization: `Bearer ${jwt}`, - "content-type": "application/json", - "Convex-Client": TASK, - }, - body: JSON.stringify({ path: convexPath, format: "convex_encoded_json", args: [args] }), - }); - const body = await response.json(); - if (!response.ok || body.status !== "success") { - throw new Error(`Convex ${kind} ${convexPath} 失败: ${response.status} ${JSON.stringify(body)}`); - } - return body.value; -} - -function cssEscape(value) { - return String(value).replace(/\\/g, "\\\\").replace(/"/g, '\\"'); -} - -function docRowSelector(documentId) { - return `#sidebar-file-tree-root .tree-row[data-shell-mode="filetree"][data-row-id="doc:${cssEscape(documentId)}"]`; -} - -function assetRowSelector(assetId) { - return `#sidebar-file-tree-root .tree-row[data-shell-mode="filetree"][data-asset-id="${cssEscape(assetId)}"]`; -} - -async function createPage(request, workspaceId, title, parentId = null) { - const payload = await requestJson(request, "/api/tree/commands", { - method: "POST", - data: { - action: "create", - workspaceId, - parentId, - title, - }, - }); - const result = payload.result || payload; - assert(result.documentId, `创建页面失败: ${JSON.stringify(payload)}`); - return result.documentId; -} - -async function openDocumentFileTree(page, workspaceId, documentId) { - await page.goto(`${BASE_URL}/documents/${encodeURIComponent(documentId)}?workspaceId=${encodeURIComponent(workspaceId)}`, { - waitUntil: "commit", - timeout: UI_TIMEOUT_MS, - }); - await page.waitForFunction( - () => { - const fileRoot = document.getElementById("sidebar-file-tree-root"); - const fileTab = document.querySelector('[data-mnote-sidebar-tree-tab="filetree"], button[aria-label="文件"]'); - return Boolean(fileRoot || fileTab); - }, - undefined, - { timeout: UI_TIMEOUT_MS }, - ); - await page.evaluate(() => { - const fileRoot = document.getElementById("sidebar-file-tree-root"); - const visible = (node) => - node instanceof HTMLElement && - !node.hidden && - getComputedStyle(node).display !== "none" && - getComputedStyle(node).visibility !== "hidden" && - node.getClientRects().length > 0; - if (visible(fileRoot)) return; - const tab = document.querySelector('[data-mnote-sidebar-tree-tab="filetree"], button[aria-label="文件"]'); - if (tab instanceof HTMLElement) tab.click(); - }); - await page.waitForFunction( - () => { - const fileRoot = document.getElementById("sidebar-file-tree-root"); - return fileRoot instanceof HTMLElement && fileRoot.getClientRects().length > 0; - }, - undefined, - { timeout: UI_TIMEOUT_MS }, - ); -} - -async function waitForRow(page, selector, label) { - await page.locator(selector).first().waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }).catch(async (error) => { - const text = await page.locator("#sidebar-file-tree-root").innerText({ timeout: 3_000 }).catch(() => ""); - throw new Error(`${label} 未出现: ${error.message}; filetree=${text.slice(0, 2000)}`); - }); -} - -async function expandDocIfNeeded(page, documentId) { - const selector = docRowSelector(documentId); - await waitForRow(page, selector, `页面 ${documentId}`); - const expanded = await page.locator(selector).first().getAttribute("aria-expanded").catch(() => null); - if (expanded === "true") return; - const clicked = await page.locator(`${selector} [data-testid="filetree-toggle"]`).first().click({ timeout: 2_000 }).then(() => true).catch(() => false); - if (!clicked) { - await page.locator(selector).first().dblclick({ timeout: 2_000 }).catch(() => undefined); - } -} - -async function readDocument(context, workspaceId, documentId) { - const docs = await convexCall(context, "query", "documents:listByWorkspace", { workspaceId }); - return docs.find((doc) => doc.id === documentId) || null; -} - -async function waitForAssetFileName(context, userId, assetId, fileName) { - const deadline = Date.now() + UI_TIMEOUT_MS; - let lastAsset = null; - while (Date.now() < deadline) { - lastAsset = await convexCall(context, "query", "mediaAssets:getById", { userId, id: assetId }); - if (lastAsset?.file_name === fileName) { - return lastAsset; - } - await new Promise((resolve) => setTimeout(resolve, 250)); - } - assert.equal(lastAsset?.file_name, fileName, "F2 inline rename 附件后 Convex 文件名未更新"); - return lastAsset; -} - -async function renameRowWithF2(page, selector, nextTitle) { - await page.locator(selector).first().click({ timeout: UI_TIMEOUT_MS }); - await page.locator(selector).first().press("F2", { timeout: UI_TIMEOUT_MS }); - const input = page.locator(`${selector} .tree-rename-input`).first(); - await input.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await input.fill(nextTitle, { timeout: UI_TIMEOUT_MS }); - await input.press("Enter", { timeout: UI_TIMEOUT_MS }); - await page.locator(selector).first().getByText(nextTitle, { exact: false }).waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); -} - -async function visibleContextMenuLabels(page, selector) { - await page.locator(selector).first().click({ button: "right", timeout: UI_TIMEOUT_MS }); - await page.waitForTimeout(250); - const labels = ["New File", "New Folder", "Paste Into", "Refresh", "Collapse All", "Copy Path", "Reveal"]; - const visible = []; - for (const label of labels) { - if (await page.getByText(label, { exact: true }).first().isVisible().catch(() => false)) { - visible.push(label); - } - } - const disabledTitles = await page.evaluate(() => - Array.from(document.querySelectorAll("button[disabled][title]")) - .map((button) => button instanceof HTMLButtonElement ? button.title : "") - .filter(Boolean), - ); - await page.keyboard.press("Escape").catch(() => undefined); - return { visible, disabledTitles }; -} - -async function runDropPreflight(request, payload) { - return await requestJsonAllowError(request, "/api/tree/filetree/drop-preflight", { - method: "POST", - data: payload, - }); -} - -function preflightRow({ rowId, rowKind, documentId, assetId = null, assetDocumentId = null, assetType = null, storagePath = null }) { - return { rowId, rowKind, documentId, assetId, assetDocumentId, assetType, storagePath }; -} - -async function cleanup(request, workspaceId, ids) { - if (!workspaceId) return; - for (const documentId of ids.filter(Boolean)) { - await requestJson(request, "/api/tree/commands", { - method: "POST", - data: { action: "archive", workspaceId, documentId }, - }).catch(() => null); - } - await requestJson(request, "/api/documents/empty-trash", { method: "POST", data: { workspaceId } }).catch(() => null); - await requestJson(request, "/api/media/empty-trash", { method: "POST", data: { workspaceId } }).catch(() => null); -} - -async function runOptional(result, area, fn) { - try { - const details = await fn(); - result.checks.push({ area, ok: true, details }); - return details; - } catch (error) { - const reason = error instanceof Error ? error.message : String(error); - result.skipped.push({ area, reason }); - result.checks.push({ area, ok: false, skipped: true, reason }); - return null; - } -} - -async function main() { - const stamp = Date.now(); - const prefix = `TEST-10REVIEW-07-P7-${stamp}`; - const result = { - ok: false, - task: TASK, - baseUrl: BASE_URL, - convexUrl: CONVEX_URL, - email: `mnote.stage7.${stamp}@example.com`, - prefix, - requests: [], - checks: [], - skipped: [], - phases: [], - }; - - const browser = await chromium.launch({ headless: true }); - const context = await browser.newContext(); - const page = await context.newPage(); - const request = context.request; - let workspaceId = null; - const cleanupDocIds = []; - - page.on("request", (req) => { - const url = req.url(); - if ( - url.includes("/api/tree/commands") || - url.includes("/api/tree/filetree/drop-preflight") || - url.includes("/api/media/batch") - ) { - result.requests.push({ - method: req.method(), - url, - body: req.postData() || null, - }); - } - }); - - try { - // 阶段：auth - signIn - result.phases.push({ name: "auth-signin", ok: false }); - await requestJson(request, "/api/auth", { - method: "POST", - data: { - action: "auth:signIn", - args: { - provider: "password", - params: { email: result.email, password: e2ePassword(), flow: "signUp", name: `stage7-${stamp}` }, - }, - }, - }); - result.phases[result.phases.length - 1].ok = true; - - // 阶段：auth - cookie 初始化（导航到首页以设置 cookie） - result.phases.push({ name: "auth-navigate", ok: false }); - await page.goto(`${BASE_URL}/`, { waitUntil: "commit", timeout: UI_TIMEOUT_MS }); - result.phases[result.phases.length - 1].ok = true; - - // 阶段：workspace bootstrap - result.phases.push({ name: "workspace-bootstrap", ok: false }); - const currentUser = await convexCall(context, "query", "users:currentUser", {}); - const userId = currentUser?._id; - assert(userId, "[env] Convex 不可用: users:currentUser 未返回用户 ID"); - let workspaces; - try { - workspaces = await convexCall(context, "query", "workspaces:fetchWorkspaceSummaries", {}); - } catch (workspaceQueryError) { - result.skipped.push({ - area: "workspace-bootstrap", - reason: `workspaces:fetchWorkspaceSummaries 查询失败（可能是函数未部署或 Convex 不可用），尝试通过 /api/tree/commands create 自举: ${workspaceQueryError instanceof Error ? workspaceQueryError.message : String(workspaceQueryError)}`, - }); - } - workspaceId = workspaces?.activeWorkspaceId; - if (!workspaceId) { - // Fallback: 通过 /api/tree/commands create（不带 workspaceId）触发 Rust 端 workspace bootstrap - const bootstrapResult = await requestJson(request, "/api/tree/commands", { - method: "POST", - data: { action: "create", title: `${prefix}-bootstrap` }, - }); - workspaceId = bootstrapResult.workspaceId || bootstrapResult.result?.workspaceId; - } - assert(workspaceId, "[env] workspace bootstrap 失败：fetchWorkspaceSummaries 无返回 + /api/tree/commands create 自举也未产生 workspaceId"); - result.phases[result.phases.length - 1].ok = true; - - const parentA = await createPage(request, workspaceId, `${prefix}-parent-a`); - const parentB = await createPage(request, workspaceId, `${prefix}-parent-b`); - const child = await createPage(request, workspaceId, `${prefix}-child`, parentA); - const renameDoc = await createPage(request, workspaceId, `${prefix}-rename-doc`, parentA); - const resourceDoc = await createPage(request, workspaceId, `${prefix}-resource-doc`); - cleanupDocIds.push(parentA, parentB, child, renameDoc, resourceDoc); - - const assetId = `asset_p7_${stamp}`; - await convexCall(context, "mutation", "mediaAssets:create", { - userId, - asset: { - id: assetId, - workspace_id: workspaceId, - document_id: resourceDoc, - asset_type: "file", - file_url: null, - thumbnail_url: null, - storage_id: null, - bucket: null, - storage_path: null, - file_name: `${prefix}-file.txt`, - file_size: 12, - mime_type: "text/plain", - }, - }); - - await openDocumentFileTree(page, workspaceId, resourceDoc); - for (const documentId of [parentA, parentB, resourceDoc]) { - await waitForRow(page, docRowSelector(documentId), `页面 ${documentId}`); - } - await expandDocIfNeeded(page, parentA); - await waitForRow(page, docRowSelector(child), `子页面 ${child}`); - await waitForRow(page, docRowSelector(renameDoc), `重命名页面 ${renameDoc}`); - await expandDocIfNeeded(page, resourceDoc); - await waitForRow(page, assetRowSelector(assetId), `附件 ${assetId}`); - - // 阶段：FileTree active row 与 Open Editors 状态 - await runOptional(result, "filetree-active-row", async () => { - const activeRowIds = await page.evaluate(() => { - const rows = document.querySelectorAll('#sidebar-file-tree-root .tree-row[data-shell-mode="filetree"][data-active="true"]'); - return Array.from(rows).map(row => row.getAttribute('data-row-id') || ''); - }); - const expectedDocRow = `doc:${resourceDoc}`; - if (activeRowIds.length === 0) { - // 当前打开的资源行可能没有 data-active 标记——记录但不报错，属于已知缺口 - return { activeRowIds, note: `当前页 ${expectedDocRow} 的 FileTree row 无 data-active="true" 标记（UI 尚未同步 active 状态）` }; - } - assert(activeRowIds.includes(expectedDocRow), `业务: FileTree active row 应为 ${expectedDocRow}，实际为 [${activeRowIds.join(", ")}]`); - return { activeRowIds, expectedDocRow }; - }); - - await runOptional(result, "filetree-selected-row", async () => { - const selectedRowIds = await page.evaluate(() => { - const rows = document.querySelectorAll('#sidebar-file-tree-root .tree-row[data-shell-mode="filetree"][data-selected="true"]'); - return Array.from(rows).map(row => row.getAttribute('data-row-id') || ''); - }); - // 当前只记录选中行状态，不做强制断言——选中语义可能随点击位置变化 - return { selectedRowIds }; - }); - - await runOptional(result, "open-editors-section", async () => { - const hasOpenEditors = await page.evaluate(() => { - return !!(document.querySelector('[data-testid="open-editors"]') || - document.querySelector('[data-mnote-section="open-editors"]') || - document.getElementById('sidebar-open-editors') || - document.querySelector('[data-mnote-editors-section]')); - }); - // Open Editors section 当前尚未在 MNote sidebar 中实现（已知缺口 vs VSCode Open Editors） - // 这里只记录状态不报错，让将来实装时可以切换为断言 - return { implemented: hasOpenEditors, note: hasOpenEditors ? "Open Editors 区域已出现" : "Open Editors 区域尚未实现（当前为已知缺口）" }; - }); - - await runOptional(result, "f2-inline-rename-doc", async () => { - const renamedDocTitle = `${prefix}-renamed-doc`; - await renameRowWithF2(page, docRowSelector(renameDoc), renamedDocTitle); - const renamedDoc = await readDocument(context, workspaceId, renameDoc); - assert.equal(renamedDoc?.title, renamedDocTitle, "F2 inline rename 页面后 Convex 标题未更新"); - return { documentId: renameDoc, title: renamedDocTitle }; - }); - - await runOptional(result, "f2-inline-rename-asset", async () => { - const renamedAssetTitle = `${prefix}-renamed-file.txt`; - await renameRowWithF2(page, assetRowSelector(assetId), renamedAssetTitle); - await waitForAssetFileName(context, userId, assetId, renamedAssetTitle); - return { assetId, fileName: renamedAssetTitle }; - }); - - const menu = await visibleContextMenuLabels(page, docRowSelector(parentA)); - result.contextMenu = menu; - const expectedMenuLabels = ["New File", "New Folder", "Paste Into", "Refresh", "Collapse All", "Copy Path", "Reveal"]; - const missingMenuLabels = expectedMenuLabels.filter((label) => !menu.visible.includes(label)); - if (missingMenuLabels.length > 0) { - result.skipped.push({ - area: "context-menu-minimum", - reason: `当前真实 filetree 右键菜单未暴露这些 React Sidebar 菜单项: ${missingMenuLabels.join(", ")}`, - }); - result.checks.push({ - area: "context-menu-minimum", - ok: false, - skipped: true, - reason: `当前真实 filetree 右键菜单未暴露这些 React Sidebar 菜单项: ${missingMenuLabels.join(", ")}`, - }); - } - assert( - menu.visible.length === 0 || menu.disabledTitles.some((title) => title.includes("右键 Paste Into") || title.includes("文件夹")), - `右键菜单禁用态缺少可解释原因: ${JSON.stringify(menu)}`, - ); - if (missingMenuLabels.length === 0) { - result.checks.push({ - area: "context-menu-minimum", - ok: true, - details: menu, - }); - } - - const accel = process.platform === "darwin" ? "Meta" : "Control"; - await runOptional(result, "cut-paste-move", async () => { - await page.locator(docRowSelector(child)).first().click({ timeout: UI_TIMEOUT_MS }); - await page.locator(docRowSelector(child)).first().press(`${accel}+X`, { timeout: UI_TIMEOUT_MS }); - await page.locator(docRowSelector(parentB)).first().click({ timeout: UI_TIMEOUT_MS }); - const moveRequestCount = result.requests.length; - await page.locator(docRowSelector(parentB)).first().press(`${accel}+V`, { timeout: UI_TIMEOUT_MS }); - await page.waitForFunction( - ({ selector, expectedParent }) => { - const row = document.querySelector(selector); - return row instanceof HTMLElement && row.textContent?.includes(expectedParent); - }, - { selector: docRowSelector(parentB), expectedParent: `${prefix}-parent-b` }, - { timeout: UI_TIMEOUT_MS }, - ).catch(() => undefined); - await page.waitForTimeout(800); - const movedChild = await readDocument(context, workspaceId, child); - assert.equal(movedChild?.parent_id, parentB, "Ctrl/Cmd+X 后 Ctrl/Cmd+V 应移动页面到目标父页面"); - const moveRequests = result.requests.slice(moveRequestCount).filter((entry) => entry.body?.includes('"action":"move"')); - assert(moveRequests.length > 0, "Cut/Paste move 未捕获到 tree move 请求"); - return { documentId: child, parentId: parentB, moveRequestCount: moveRequests.length }; - }); - - const childAfterCutPaste = await readDocument(context, workspaceId, child); - const childParentId = childAfterCutPaste?.parent_id ?? parentA; - - const rows = [ - preflightRow({ rowId: `doc:${parentA}`, rowKind: "doc", documentId: parentA }), - preflightRow({ rowId: `doc:${parentB}`, rowKind: "doc", documentId: parentB }), - preflightRow({ rowId: `doc:${child}`, rowKind: "doc", documentId: child }), - preflightRow({ rowId: `doc:${renameDoc}`, rowKind: "doc", documentId: renameDoc }), - preflightRow({ - rowId: `asset:${assetId}`, - rowKind: "asset", - documentId: resourceDoc, - assetId, - assetDocumentId: resourceDoc, - assetType: "file", - }), - ]; - const documentParents = [ - { documentId: parentA, parentId: null }, - { documentId: parentB, parentId: null }, - { documentId: child, parentId: childParentId }, - { documentId: renameDoc, parentId: parentA }, - { documentId: resourceDoc, parentId: null }, - ]; - - const selfDrop = await runDropPreflight(request, { - workspaceId, - copy: false, - targetDocumentId: child, - targetRowId: `doc:${child}`, - focusedRowId: `doc:${child}`, - activeDocumentId: resourceDoc, - rowIds: [`doc:${child}`], - rows, - documentParents, - }); - - const parentToChildDrop = await runDropPreflight(request, { - workspaceId, - copy: false, - targetDocumentId: renameDoc, - targetRowId: `doc:${renameDoc}`, - focusedRowId: `doc:${renameDoc}`, - activeDocumentId: resourceDoc, - rowIds: [`doc:${parentA}`], - rows, - documentParents, - }); - - const copyDrop = await runDropPreflight(request, { - workspaceId, - copy: true, - targetDocumentId: parentB, - targetRowId: `doc:${parentB}`, - focusedRowId: `doc:${parentB}`, - activeDocumentId: resourceDoc, - rowIds: [`doc:${renameDoc}`], - rows, - documentParents, - }); - if ([selfDrop, parentToChildDrop, copyDrop].some((entry) => entry.status === 0 || entry.status === 404)) { - result.skipped.push({ - area: "dnd-preflight-guard", - reason: "当前 3000 入口未暴露或已断开 /api/tree/filetree/drop-preflight，无法稳定自动化 DnD preflight guard；未把入口失败伪造成通过。", - }); - result.checks.push({ - area: "dnd-preflight-guard", - ok: false, - skipped: true, - reason: "当前 3000 入口未暴露或已断开 /api/tree/filetree/drop-preflight", - }); - } else { - assert(!selfDrop.ok, `拖到自身应被 preflight 拒绝: ${JSON.stringify(selfDrop)}`); - assert(!parentToChildDrop.ok, `父拖子应被 preflight 拒绝: ${JSON.stringify(parentToChildDrop)}`); - assert(copyDrop.ok && copyDrop.payload?.plan?.copy === true, `copy modifier preflight 应保留 copy=true: ${JSON.stringify(copyDrop)}`); - result.checks.push({ - area: "dnd-preflight-guard", - ok: true, - details: { - selfDropStatus: selfDrop.status, - parentToChildDropStatus: parentToChildDrop.status, - copyDropPlan: copyDrop.payload?.plan ?? null, - }, - }); - } - result.dndPreflight = { - selfDropStatus: selfDrop.status, - parentToChildDropStatus: parentToChildDrop.status, - copyDropPlan: copyDrop.payload?.plan ?? null, - }; - result.skipped.push({ - area: "dnd-readonly-conflict", - reason: "主 Sidebar Convex filetree 当前 smoke 未构造 readonly source 与真实重名冲突确认弹窗；已有 local-folder smoke 和 bridge preflight 单测覆盖，仍需后续端到端矩阵补齐。", - }); - - result.ok = true; - result.workspaceId = workspaceId; - result.fixture = { parentA, parentB, child, renameDoc, resourceDoc, assetId }; - await writeResult(result); - } catch (error) { - result.error = error instanceof Error ? error.stack || error.message : String(error); - result.filetreeText = await page.locator("#sidebar-file-tree-root").innerText({ timeout: 3_000 }).catch(() => ""); - await writeResult(result); - throw error; - } finally { - await cleanup(request, workspaceId, cleanupDocIds).catch((error) => { - console.warn(`清理 task430 临时数据失败: ${error instanceof Error ? error.message : String(error)}`); - }); - await browser.close(); - } -} - -main().catch((error) => { - console.error(error); - process.exit(1); -}); diff --git a/scripts/task431-vscode-explorer-dnd-readonly-conflict-smoke.js b/scripts/task431-vscode-explorer-dnd-readonly-conflict-smoke.js deleted file mode 100644 index 39f08ab4..00000000 --- a/scripts/task431-vscode-explorer-dnd-readonly-conflict-smoke.js +++ /dev/null @@ -1,295 +0,0 @@ -#!/usr/bin/env node -"use strict"; - -const assert = require("node:assert/strict"); -const fs = require("node:fs/promises"); -const path = require("node:path"); -const { chromium } = require("playwright"); - -const TASK = "task431-vscode-explorer-dnd-readonly-conflict-smoke"; -const BASE_URL = (process.env.MNOTE_UI_BASE_URL || "http://127.0.0.1:3000").replace(/\/+$/, ""); -const AUTH_BASE_URL = (process.env.MNOTE_AUTH_BASE_URL || BASE_URL).replace(/\/+$/, ""); -const CONVEX_URL = (process.env.NEXT_PUBLIC_CONVEX_URL || process.env.CONVEX_SELF_HOSTED_URL || "http://127.0.0.1:3210").replace(/\/+$/, ""); -const e2ePassword = () => process.env.MNOTE_E2E_PASSWORD || ["Mnote", "E2E", "123!"].join(""); -const OUTPUT_DIR = path.join(process.cwd(), "tmp", TASK); -const RESULT_PATH = path.join(OUTPUT_DIR, "result.json"); - -async function writeResult(payload) { - await fs.mkdir(OUTPUT_DIR, { recursive: true }); - await fs.writeFile(RESULT_PATH, `${JSON.stringify({ ...payload, resultPath: RESULT_PATH }, null, 2)}\n`, "utf8"); -} - -async function requestJson(request, requestPath, init = {}) { - const response = await request.fetch(`${BASE_URL}${requestPath}`, { - ...init, - headers: { - ...(init.data !== undefined ? { "content-type": "application/json" } : {}), - ...(init.headers || {}), - }, - timeout: 20_000, - }); - const text = await response.text(); - let payload = null; - try { - payload = text ? JSON.parse(text) : null; - } catch { - payload = text; - } - if (!response.ok()) { - throw new Error(`${requestPath} 请求失败: ${response.status()} ${typeof payload === "string" ? payload : JSON.stringify(payload)}`); - } - return payload; -} - -async function requestAuthJson(request, requestPath, init = {}) { - const response = await request.fetch(`${AUTH_BASE_URL}${requestPath}`, { - ...init, - headers: { - ...(init.data !== undefined ? { "content-type": "application/json" } : {}), - ...(init.headers || {}), - }, - timeout: 20_000, - }); - const text = await response.text(); - let payload = null; - try { - payload = text ? JSON.parse(text) : null; - } catch { - payload = text; - } - if (!response.ok()) { - throw new Error(`${requestPath} 请求失败: ${response.status()} ${typeof payload === "string" ? payload : JSON.stringify(payload)}`); - } - return payload; -} - -async function requestJsonAllowError(request, requestPath, init = {}) { - let response; - try { - response = await request.fetch(`${BASE_URL}${requestPath}`, { - ...init, - headers: { - ...(init.data !== undefined ? { "content-type": "application/json" } : {}), - ...(init.headers || {}), - }, - timeout: 20_000, - }); - } catch (error) { - return { - ok: false, - status: 0, - payload: { error: error instanceof Error ? error.message : String(error) }, - }; - } - const text = await response.text(); - let payload = null; - try { - payload = text ? JSON.parse(text) : null; - } catch { - payload = text; - } - return { ok: response.ok(), status: response.status(), payload }; -} - -async function convexCall(context, kind, convexPath, args) { - const cookies = await context.cookies(BASE_URL); - const jwt = cookies.find((cookie) => cookie.name === "__convexAuthJWT")?.value; - assert(jwt, "缺少 __convexAuthJWT cookie"); - const response = await fetch(`${CONVEX_URL}/api/${kind}`, { - method: "POST", - headers: { - authorization: `Bearer ${jwt}`, - "content-type": "application/json", - "Convex-Client": TASK, - }, - body: JSON.stringify({ path: convexPath, format: "convex_encoded_json", args: [args] }), - }); - const body = await response.json(); - if (!response.ok || body.status !== "success") { - throw new Error(`Convex ${kind} ${convexPath} 失败: ${response.status} ${JSON.stringify(body)}`); - } - return body.value; -} - -async function createPage(request, workspaceId, title, parentId = null) { - const data = { - action: "create", - parentId, - title, - }; - if (workspaceId) { - data.workspaceId = workspaceId; - } - const payload = await requestJson(request, "/api/tree/commands", { - method: "POST", - data, - }); - const result = payload.result || payload; - assert(result.documentId, `创建页面失败: ${JSON.stringify(payload)}`); - return result; -} - -function docRow(documentId, title) { - return { - rowId: `doc:${documentId}`, - rowKind: "doc", - documentId, - assetId: null, - assetDocumentId: null, - assetType: null, - storagePath: null, - title, - }; -} - -async function runDropPreflight(request, payload) { - return await requestJsonAllowError(request, "/api/tree/filetree/drop-preflight", { - method: "POST", - data: payload, - }); -} - -async function cleanup(request, workspaceId, ids) { - if (!workspaceId) return; - for (const documentId of ids.filter(Boolean)) { - await requestJson(request, "/api/tree/commands", { - method: "POST", - data: { action: "archive", workspaceId, documentId }, - }).catch(() => null); - } - await requestJson(request, "/api/documents/empty-trash", { - method: "POST", - data: { workspaceId }, - }).catch(() => null); -} - -(async () => { - const stamp = Date.now(); - const prefix = `TEST-10REVIEW-07-P7-DND-${stamp}`; - const result = { - ok: false, - task: TASK, - baseUrl: BASE_URL, - authBaseUrl: AUTH_BASE_URL, - convexUrl: CONVEX_URL, - email: `mnote.stage7.dnd.${stamp}@example.com`, - prefix, - checks: [], - }; - - const browser = await chromium.launch({ headless: true }); - const context = await browser.newContext(); - const request = context.request; - let workspaceId = null; - const cleanupDocIds = []; - - try { - await requestAuthJson(request, "/api/auth", { - method: "POST", - data: { - action: "auth:signIn", - args: { - provider: "password", - params: { email: result.email, password: e2ePassword(), flow: "signUp", name: `stage7-dnd-${stamp}` }, - }, - }, - }); - - const currentUser = await convexCall(context, "query", "users:currentUser", {}); - assert(currentUser?._id, "缺少 Convex currentUser._id"); - const workspaces = await convexCall(context, "query", "workspaces:fetchWorkspaceSummaries", {}); - workspaceId = workspaces.activeWorkspaceId; - const targetResult = await createPage(request, workspaceId, `${prefix}-target`); - workspaceId = workspaceId || targetResult.workspaceId; - assert(workspaceId, "缺少隔离 workspaceId"); - - const target = targetResult.documentId; - const source = (await createPage(request, workspaceId, `${prefix}-same-name`)).documentId; - const existing = (await createPage(request, workspaceId, `${prefix}-same-name`, target)).documentId; - cleanupDocIds.push(target, source, existing); - - const rows = [ - docRow(target, `${prefix}-target`), - docRow(source, `${prefix}-same-name`), - docRow(existing, `${prefix}-same-name`), - ]; - const documentParents = [ - { documentId: target, parentId: null }, - { documentId: source, parentId: null }, - { documentId: existing, parentId: target }, - ]; - const basePayload = { - workspaceId, - copy: false, - sourceCapabilities: ["read", "write", "move"], - targetCapabilities: ["read", "write", "drop"], - targetDocumentId: target, - targetRowId: `doc:${target}`, - focusedRowId: `doc:${target}`, - activeDocumentId: target, - rowIds: [`doc:${source}`], - rows, - targetChildren: [ - { - rowKind: "doc", - documentId: existing, - assetId: null, - title: `${prefix}-same-name`, - }, - ], - documentParents, - conflictPolicy: "prompt", - }; - - const readonlyTarget = await runDropPreflight(request, { - ...basePayload, - targetCapabilities: ["read"], - targetChildren: [], - }); - assert.equal(readonlyTarget.ok, false, `readonly target 应被拒绝: ${JSON.stringify(readonlyTarget)}`); - assert.match(JSON.stringify(readonlyTarget.payload), /只读|readonly|目标位置/); - - const readonlySource = await runDropPreflight(request, { - ...basePayload, - sourceCapabilities: ["read"], - targetChildren: [], - }); - assert.equal(readonlySource.ok, false, `readonly source 应被拒绝: ${JSON.stringify(readonlySource)}`); - assert.match(JSON.stringify(readonlySource.payload), /只读|readonly|来源/); - - const conflict = await runDropPreflight(request, basePayload); - assert.equal(conflict.ok, true, `同名冲突应返回确认计划: ${JSON.stringify(conflict)}`); - assert.equal(conflict.payload?.plan?.requiresConfirmation, true); - assert.equal(conflict.payload?.plan?.conflicts?.[0]?.title, `${prefix}-same-name`); - assert.equal(conflict.payload?.plan?.conflicts?.[0]?.existingDocumentId, existing); - - const normalCopy = await runDropPreflight(request, { - ...basePayload, - copy: true, - sourceCapabilities: ["read"], - targetChildren: [], - }); - assert.equal(normalCopy.ok, true, `copy modifier 不应被 readonly source move 规则误拒绝: ${JSON.stringify(normalCopy)}`); - assert.equal(normalCopy.payload?.plan?.copy, true); - assert.equal(normalCopy.payload?.plan?.requiresConfirmation ?? false, false); - - result.checks.push( - { area: "readonly-target", ok: true, status: readonlyTarget.status }, - { area: "readonly-source", ok: true, status: readonlySource.status }, - { area: "conflict-confirmation-plan", ok: true, conflict: conflict.payload.plan.conflicts[0] }, - { area: "copy-modifier-no-false-positive", ok: true, plan: normalCopy.payload.plan }, - ); - result.workspaceId = workspaceId; - result.fixture = { target, source, existing }; - result.ok = true; - } catch (error) { - result.error = error instanceof Error ? error.stack || error.message : String(error); - process.exitCode = 1; - } finally { - await cleanup(request, workspaceId, cleanupDocIds).catch((error) => { - result.cleanupError = error instanceof Error ? error.message : String(error); - }); - await browser.close().catch(() => undefined); - await writeResult(result); - } -})(); diff --git a/scripts/task432-filetree-trash-page-dual-browser-no-refresh-smoke.js b/scripts/task432-filetree-trash-page-dual-browser-no-refresh-smoke.js deleted file mode 100644 index 08de18c7..00000000 --- a/scripts/task432-filetree-trash-page-dual-browser-no-refresh-smoke.js +++ /dev/null @@ -1,389 +0,0 @@ -#!/usr/bin/env node -"use strict"; - -const assert = require("node:assert/strict"); -const fs = require("node:fs/promises"); -const path = require("node:path"); -const { chromium } = require("playwright"); - -const TASK = "task432-filetree-trash-page-dual-browser-no-refresh-smoke"; -const BASE_URL = (process.env.MNOTE_UI_BASE_URL || "http://127.0.0.1:3000").replace(/\/+$/, ""); -const AUTH_BASE_URL = (process.env.MNOTE_AUTH_BASE_URL || BASE_URL).replace(/\/+$/, ""); -const e2ePassword = () => process.env.MNOTE_E2E_PASSWORD || ["Mnote", "E2E", "123!"].join(""); -const UI_TIMEOUT_MS = Number(process.env.MNOTE_SMOKE_UI_TIMEOUT_MS || 35_000); -const OUTPUT_DIR = path.join(process.cwd(), "tmp", TASK); -const RESULT_PATH = path.join(OUTPUT_DIR, "result.json"); - -async function writeResult(payload) { - await fs.mkdir(OUTPUT_DIR, { recursive: true }); - await fs.writeFile(RESULT_PATH, `${JSON.stringify({ ...payload, resultPath: RESULT_PATH }, null, 2)}\n`, "utf8"); -} - -async function requestJson(request, requestPath, init = {}) { - const response = await request.fetch(`${BASE_URL}${requestPath}`, { - ...init, - headers: { - ...(init.data !== undefined ? { "content-type": "application/json" } : {}), - ...(init.headers || {}), - }, - timeout: 20_000, - }); - const text = await response.text(); - let payload = null; - try { - payload = text ? JSON.parse(text) : null; - } catch { - payload = text; - } - if (!response.ok()) { - throw new Error(`${requestPath} 请求失败: ${response.status()} ${typeof payload === "string" ? payload : JSON.stringify(payload)}`); - } - return payload; -} - -async function requestAuthJson(request, requestPath, init = {}) { - const response = await request.fetch(`${AUTH_BASE_URL}${requestPath}`, { - ...init, - headers: { - ...(init.data !== undefined ? { "content-type": "application/json" } : {}), - ...(init.headers || {}), - }, - timeout: 20_000, - }); - const text = await response.text(); - let payload = null; - try { - payload = text ? JSON.parse(text) : null; - } catch { - payload = text; - } - if (!response.ok()) { - throw new Error(`${requestPath} 请求失败: ${response.status()} ${typeof payload === "string" ? payload : JSON.stringify(payload)}`); - } - return payload; -} - -function cssEscape(value) { - return String(value).replace(/\\/g, "\\\\").replace(/"/g, '\\"'); -} - -function docRowSelector(documentId) { - return `#sidebar-file-tree-root .tree-row[data-shell-mode="filetree"][data-row-id="doc:${cssEscape(documentId)}"]`; -} - -function trashDocRowSelector(documentId) { - return `[data-testid="mnote-trash-workbench"] [data-trash-row="document"][data-document-id="${cssEscape(documentId)}"]`; -} - -async function createPage(request, workspaceId, title, parentId = null) { - const payload = await requestJson(request, "/api/tree/commands", { - method: "POST", - data: { - action: "create", - workspaceId, - parentId, - title, - }, - }); - const result = payload.result || payload; - const documentId = result.documentId || payload.documentId || result.id || ""; - const resolvedWorkspaceId = result.workspaceId || payload.workspaceId || payload.workspace_id || workspaceId || ""; - assert(documentId, `创建页面失败: ${JSON.stringify(payload)}`); - assert(resolvedWorkspaceId, `创建页面缺少 workspaceId: ${JSON.stringify(payload)}`); - return { documentId, workspaceId: resolvedWorkspaceId, payload }; -} - -async function treeCommand(request, workspaceId, action, documentId) { - return await requestJson(request, "/api/tree/commands", { - method: "POST", - data: { action, workspaceId, documentId }, - }); -} - -async function emptyDocumentTrash(request, workspaceId) { - return await requestJson(request, "/api/documents/empty-trash", { - method: "POST", - data: { workspaceId }, - }); -} - -async function authenticate(request, email, name) { - await requestAuthJson(request, "/api/auth", { - method: "POST", - data: { - action: "auth:signIn", - args: { - provider: "password", - params: { email, password: e2ePassword(), flow: "signUp", name }, - }, - }, - }); -} - -async function openDocumentFileTree(page, workspaceId, documentId) { - await page.goto(`${BASE_URL}/documents/${encodeURIComponent(documentId)}?workspaceId=${encodeURIComponent(workspaceId)}`, { - waitUntil: "commit", - timeout: UI_TIMEOUT_MS, - }); - await page.waitForFunction( - () => { - const fileRoot = document.getElementById("sidebar-file-tree-root"); - const fileTab = document.querySelector('[data-mnote-sidebar-tree-tab="filetree"], button[aria-label="文件"]'); - return Boolean(fileRoot || fileTab); - }, - undefined, - { timeout: UI_TIMEOUT_MS }, - ); - await page.evaluate(() => { - const visible = (node) => - node instanceof HTMLElement && - !node.hidden && - getComputedStyle(node).display !== "none" && - getComputedStyle(node).visibility !== "hidden" && - node.getClientRects().length > 0; - const fileRoot = document.getElementById("sidebar-file-tree-root"); - if (visible(fileRoot)) return; - const tab = document.querySelector('[data-mnote-sidebar-tree-tab="filetree"], button[aria-label="文件"]'); - if (tab instanceof HTMLElement) tab.click(); - }); - await page.waitForFunction( - () => { - const fileRoot = document.getElementById("sidebar-file-tree-root"); - return fileRoot instanceof HTMLElement && fileRoot.getClientRects().length > 0; - }, - undefined, - { timeout: UI_TIMEOUT_MS }, - ); -} - -async function openTrash(page, workspaceId) { - await page.goto(`${BASE_URL}/trash?workspaceId=${encodeURIComponent(workspaceId)}`, { - waitUntil: "commit", - timeout: UI_TIMEOUT_MS, - }); - await page.locator('[data-testid="mnote-trash-workbench"]').waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); -} - -async function waitForVisible(page, selector, label) { - await page.locator(selector).first().waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }).catch(async (error) => { - throw new Error(`${label} 未出现: ${error.message}; state=${JSON.stringify(await readPageState(page).catch(() => null))}`); - }); -} - -async function waitForDetached(page, selector, label) { - await page.locator(selector).first().waitFor({ state: "detached", timeout: UI_TIMEOUT_MS }).catch(async (error) => { - throw new Error(`${label} 未消失: ${error.message}; state=${JSON.stringify(await readPageState(page).catch(() => null))}`); - }); -} - -async function installTreeEventRecorder(page, label, records) { - await page.addInitScript(() => { - window.__MNOTE_TASK432_TREE_EVENTS__ = []; - const record = (name, event) => { - const detail = event && event.detail ? event.detail : {}; - const payload = detail.payload || detail || {}; - window.__MNOTE_TASK432_TREE_EVENTS__.push({ - name, - at: Date.now(), - revision: detail.revision || payload.revision || payload.cursor || "", - op: payload && payload.data && payload.data.op ? payload.data.op : "", - }); - }; - window.addEventListener("tree:snapshot", (event) => record("tree:snapshot", event)); - window.addEventListener("tree:delta", (event) => record("tree:delta", event)); - window.addEventListener("tree:resync", (event) => record("tree:resync", event)); - }); - page.on("request", (request) => { - const url = request.url(); - if (url.includes("/api/tree/events")) { - records.push({ label, type: "request", method: request.method(), url, at: Date.now() }); - } - }); - page.on("requestfailed", (request) => { - const url = request.url(); - if (url.includes("/api/tree/events")) { - records.push({ - label, - type: "requestfailed", - method: request.method(), - url, - failure: request.failure()?.errorText || "", - at: Date.now(), - }); - } - }); - page.on("console", (message) => { - const text = message.text(); - if (/tree live|EventSource|trash|error|failed/i.test(text)) { - records.push({ label, type: "console", level: message.type(), text: text.slice(0, 2000), at: Date.now() }); - } - }); -} - -function recordNavigation(page, label, records) { - page.on("framenavigated", (frame) => { - if (frame === page.mainFrame()) { - records.push({ label, url: frame.url(), at: Date.now() }); - } - }); -} - -async function readPageState(page) { - return await page.evaluate(() => ({ - url: window.location.href, - liveStatus: document.documentElement.getAttribute("data-mnote-tree-live-status") || "", - liveApplied: document.documentElement.getAttribute("data-mnote-tree-live-applied") || "", - liveRevision: document.documentElement.getAttribute("data-mnote-tree-live-revision") || "", - liveError: document.documentElement.getAttribute("data-mnote-tree-live-apply-error") || "", - trashLiveReason: - document.querySelector('[data-testid="mnote-trash-workbench"]')?.getAttribute("data-live-refresh-reason") || "", - trashLiveAt: - document.querySelector('[data-testid="mnote-trash-workbench"]')?.getAttribute("data-live-refresh-at") || "", - filetreeRows: Array.from(document.querySelectorAll("#sidebar-file-tree-root .tree-row[data-shell-mode='filetree']")).map((row) => ({ - rowId: row instanceof HTMLElement ? row.dataset.rowId || "" : "", - documentId: row instanceof HTMLElement ? row.dataset.documentId || "" : "", - text: row.textContent || "", - })), - trashDocumentRows: Array.from(document.querySelectorAll('[data-testid="mnote-trash-workbench"] [data-trash-row="document"]')).map((row) => ({ - documentId: row instanceof HTMLElement ? row.dataset.documentId || "" : "", - text: row.textContent || "", - })), - treeEvents: window.__MNOTE_TASK432_TREE_EVENTS__ || [], - })); -} - -async function snapshotStep(result, name, fileTreePage, trashPage, navigationStart) { - result.steps.push({ - name, - fileTree: await readPageState(fileTreePage), - trash: await readPageState(trashPage), - navigationEvents: result.navigationEvents.slice(navigationStart), - }); -} - -async function cleanup(request, workspaceId, documentIds) { - if (!workspaceId) return; - for (const documentId of documentIds.filter(Boolean)) { - await treeCommand(request, workspaceId, "archive", documentId).catch(() => null); - } - await emptyDocumentTrash(request, workspaceId).catch(() => null); -} - -(async () => { - const stamp = Date.now(); - const email = `mnote.stage8.page.${stamp}@example.com`; - const prefix = `TEST-10REVIEW-07-P8-PAGE-${stamp}`; - const result = { - ok: false, - task: TASK, - baseUrl: BASE_URL, - authBaseUrl: AUTH_BASE_URL, - email, - prefix, - fixture: {}, - requests: [], - navigationEvents: [], - treeEventRequests: [], - steps: [], - }; - - const browser = await chromium.launch({ headless: true }); - const contextA = await browser.newContext(); - const contextB = await browser.newContext(); - const pageA = await contextA.newPage(); - const fileTreeB = await contextB.newPage(); - const trashB = await contextB.newPage(); - const requestA = contextA.request; - let workspaceId = ""; - const cleanupIds = []; - - pageA.on("request", (request) => { - const url = request.url(); - if (url.includes("/api/tree/commands") || url.includes("/api/documents/empty-trash")) { - result.requests.push({ side: "A-page", method: request.method(), url, body: request.postData() || null, at: Date.now() }); - } - }); - for (const requestContext of [requestA, contextB.request]) { - await authenticate(requestContext, email, `stage8-page-${stamp}`); - } - await installTreeEventRecorder(fileTreeB, "B-filetree", result.treeEventRequests); - await installTreeEventRecorder(trashB, "B-trash", result.treeEventRequests); - recordNavigation(fileTreeB, "B-filetree", result.navigationEvents); - recordNavigation(trashB, "B-trash", result.navigationEvents); - - try { - const root = await createPage(requestA, null, `${prefix}-root`); - workspaceId = root.workspaceId; - cleanupIds.push(root.documentId); - result.fixture.rootId = root.documentId; - result.fixture.workspaceId = workspaceId; - - await pageA.goto(`${BASE_URL}/documents/${encodeURIComponent(root.documentId)}?workspaceId=${encodeURIComponent(workspaceId)}`, { - waitUntil: "commit", - timeout: UI_TIMEOUT_MS, - }); - await openDocumentFileTree(fileTreeB, workspaceId, root.documentId); - await openTrash(trashB, workspaceId); - await waitForVisible(fileTreeB, docRowSelector(root.documentId), "B 文件树 root 页面"); - - const navigationStart = result.navigationEvents.length; - await snapshotStep(result, "initial", fileTreeB, trashB, navigationStart); - - const lifecycle = await createPage(requestA, workspaceId, `${prefix}-lifecycle`, root.documentId); - cleanupIds.push(lifecycle.documentId); - result.fixture.lifecycleId = lifecycle.documentId; - await waitForVisible(fileTreeB, docRowSelector(lifecycle.documentId), "B 文件树 lifecycle 新建页面"); - await snapshotStep(result, "create-visible-on-b", fileTreeB, trashB, navigationStart); - - await treeCommand(requestA, workspaceId, "archive", lifecycle.documentId); - await waitForDetached(fileTreeB, docRowSelector(lifecycle.documentId), "B 文件树 lifecycle 删除后"); - await waitForVisible(trashB, trashDocRowSelector(lifecycle.documentId), "B 垃圾箱 lifecycle 删除后"); - await snapshotStep(result, "archive-visible-on-b", fileTreeB, trashB, navigationStart); - - await treeCommand(requestA, workspaceId, "restore", lifecycle.documentId); - await waitForVisible(fileTreeB, docRowSelector(lifecycle.documentId), "B 文件树 lifecycle 恢复后"); - await waitForDetached(trashB, trashDocRowSelector(lifecycle.documentId), "B 垃圾箱 lifecycle 恢复后"); - await snapshotStep(result, "restore-visible-on-b", fileTreeB, trashB, navigationStart); - - await treeCommand(requestA, workspaceId, "archive", lifecycle.documentId); - await waitForVisible(trashB, trashDocRowSelector(lifecycle.documentId), "B 垃圾箱 lifecycle 再次删除后"); - await treeCommand(requestA, workspaceId, "purge", lifecycle.documentId); - await waitForDetached(trashB, trashDocRowSelector(lifecycle.documentId), "B 垃圾箱 lifecycle 彻底删除后"); - await waitForDetached(fileTreeB, docRowSelector(lifecycle.documentId), "B 文件树 lifecycle 彻底删除后"); - await snapshotStep(result, "purge-visible-on-b", fileTreeB, trashB, navigationStart); - - const emptyA = await createPage(requestA, workspaceId, `${prefix}-empty-a`, root.documentId); - const emptyB = await createPage(requestA, workspaceId, `${prefix}-empty-b`, root.documentId); - cleanupIds.push(emptyA.documentId, emptyB.documentId); - result.fixture.emptyIds = [emptyA.documentId, emptyB.documentId]; - await waitForVisible(fileTreeB, docRowSelector(emptyA.documentId), "B 文件树 empty-a 新建后"); - await waitForVisible(fileTreeB, docRowSelector(emptyB.documentId), "B 文件树 empty-b 新建后"); - await treeCommand(requestA, workspaceId, "archive", emptyA.documentId); - await treeCommand(requestA, workspaceId, "archive", emptyB.documentId); - await waitForVisible(trashB, trashDocRowSelector(emptyA.documentId), "B 垃圾箱 empty-a 删除后"); - await waitForVisible(trashB, trashDocRowSelector(emptyB.documentId), "B 垃圾箱 empty-b 删除后"); - await emptyDocumentTrash(requestA, workspaceId); - await waitForDetached(trashB, trashDocRowSelector(emptyA.documentId), "B 垃圾箱 empty-a 清空后"); - await waitForDetached(trashB, trashDocRowSelector(emptyB.documentId), "B 垃圾箱 empty-b 清空后"); - await waitForDetached(fileTreeB, docRowSelector(emptyA.documentId), "B 文件树 empty-a 清空后"); - await waitForDetached(fileTreeB, docRowSelector(emptyB.documentId), "B 文件树 empty-b 清空后"); - await snapshotStep(result, "empty-trash-visible-on-b", fileTreeB, trashB, navigationStart); - - const unexpectedNavigations = result.navigationEvents.slice(navigationStart); - assert.equal(unexpectedNavigations.length, 0, `B 浏览器发生了刷新/导航: ${JSON.stringify(unexpectedNavigations)}`); - result.ok = true; - } catch (error) { - result.error = error instanceof Error ? error.stack || error.message : String(error); - result.failure = { - fileTree: await readPageState(fileTreeB).catch(() => null), - trash: await readPageState(trashB).catch(() => null), - }; - process.exitCode = 1; - } finally { - await cleanup(requestA, workspaceId, cleanupIds).catch((error) => { - result.cleanupError = error instanceof Error ? error.message : String(error); - }); - await browser.close().catch(() => undefined); - await writeResult(result); - } -})(); diff --git a/scripts/task433-filetree-trash-file-asset-dual-browser-no-refresh-smoke.js b/scripts/task433-filetree-trash-file-asset-dual-browser-no-refresh-smoke.js deleted file mode 100644 index 964ff0d1..00000000 --- a/scripts/task433-filetree-trash-file-asset-dual-browser-no-refresh-smoke.js +++ /dev/null @@ -1,426 +0,0 @@ -#!/usr/bin/env node -"use strict"; - -const assert = require("node:assert/strict"); -const fs = require("node:fs/promises"); -const path = require("node:path"); -const { chromium } = require("playwright"); - -const TASK = "task433-filetree-trash-file-asset-dual-browser-no-refresh-smoke"; -const BASE_URL = (process.env.MNOTE_UI_BASE_URL || "http://127.0.0.1:3000").replace(/\/+$/, ""); -const AUTH_BASE_URL = (process.env.MNOTE_AUTH_BASE_URL || BASE_URL).replace(/\/+$/, ""); -const e2ePassword = () => process.env.MNOTE_E2E_PASSWORD || ["Mnote", "E2E", "123!"].join(""); -// 说明：该 smoke 仍在验证 convex-source 的 file asset trash 兼容链路，不是 local-first 默认资源流。 -const UI_TIMEOUT_MS = Number(process.env.MNOTE_SMOKE_UI_TIMEOUT_MS || 35_000); -const OUTPUT_DIR = path.join(process.cwd(), "tmp", TASK); -const RESULT_PATH = path.join(OUTPUT_DIR, "result.json"); - -async function writeResult(payload) { - await fs.mkdir(OUTPUT_DIR, { recursive: true }); - await fs.writeFile(RESULT_PATH, `${JSON.stringify({ ...payload, resultPath: RESULT_PATH }, null, 2)}\n`, "utf8"); -} - -async function requestJson(request, requestPath, init = {}) { - const response = await request.fetch(`${BASE_URL}${requestPath}`, { - ...init, - headers: { - ...(init.data !== undefined ? { "content-type": "application/json" } : {}), - ...(init.headers || {}), - }, - timeout: 30_000, - }); - const text = await response.text(); - let payload = null; - try { - payload = text ? JSON.parse(text) : null; - } catch { - payload = text; - } - if (!response.ok()) { - throw new Error(`${requestPath} 请求失败: ${response.status()} ${typeof payload === "string" ? payload : JSON.stringify(payload)}`); - } - return payload; -} - -async function requestAuthJson(request, requestPath, init = {}) { - const response = await request.fetch(`${AUTH_BASE_URL}${requestPath}`, { - ...init, - headers: { - ...(init.data !== undefined ? { "content-type": "application/json" } : {}), - ...(init.headers || {}), - }, - timeout: 20_000, - }); - const text = await response.text(); - let payload = null; - try { - payload = text ? JSON.parse(text) : null; - } catch { - payload = text; - } - if (!response.ok()) { - throw new Error(`${requestPath} 请求失败: ${response.status()} ${typeof payload === "string" ? payload : JSON.stringify(payload)}`); - } - return payload; -} - -function cssEscape(value) { - return String(value).replace(/\\/g, "\\\\").replace(/"/g, '\\"'); -} - -function docRowSelector(documentId) { - return `#sidebar-file-tree-root .tree-row[data-shell-mode="filetree"][data-row-id="doc:${cssEscape(documentId)}"]`; -} - -function assetRowSelector(assetId) { - return `#sidebar-file-tree-root .tree-row[data-shell-mode="filetree"][data-asset-id="${cssEscape(assetId)}"]`; -} - -function trashAssetRowSelector(assetId) { - return `[data-testid="mnote-trash-workbench"] [data-trash-row="resource"][data-resource-kind="media"][data-resource-id="${cssEscape(assetId)}"]`; -} - -async function authenticate(request, email, name) { - await requestAuthJson(request, "/api/auth", { - method: "POST", - data: { - action: "auth:signIn", - args: { - provider: "password", - params: { email, password: e2ePassword(), flow: "signUp", name }, - }, - }, - }); -} - -async function createPage(request, workspaceId, title, parentId = null) { - const payload = await requestJson(request, "/api/tree/commands", { - method: "POST", - data: { action: "create", workspaceId, parentId, title }, - }); - const result = payload.result || payload; - const documentId = result.documentId || payload.documentId || result.id || ""; - const resolvedWorkspaceId = result.workspaceId || payload.workspaceId || payload.workspace_id || workspaceId || ""; - assert(documentId, `创建页面失败: ${JSON.stringify(payload)}`); - assert(resolvedWorkspaceId, `创建页面缺少 workspaceId: ${JSON.stringify(payload)}`); - return { documentId, workspaceId: resolvedWorkspaceId, payload }; -} - -async function treeCommand(request, workspaceId, action, documentId) { - return await requestJson(request, "/api/tree/commands", { - method: "POST", - data: { action, workspaceId, documentId }, - }); -} - -async function uploadFileAsset(request, workspaceId, documentId, fileName, text) { - const response = await request.fetch(`${BASE_URL}/api/media/upload`, { - method: "POST", - multipart: { - workspaceId, - documentId, - file: { - name: fileName, - mimeType: "text/plain", - buffer: Buffer.from(text, "utf8"), - }, - }, - timeout: 30_000, - }); - const payload = await response.json().catch(async () => await response.text()); - if (!response.ok()) { - throw new Error(`/api/media/upload 请求失败: ${response.status()} ${typeof payload === "string" ? payload : JSON.stringify(payload)}`); - } - const assetId = payload?.asset?.id || payload?.assetId || ""; - assert(assetId, `上传附件缺少 asset id: ${JSON.stringify(payload)}`); - return { assetId, payload }; -} - -async function archiveAsset(request, assetId) { - return await requestJson(request, "/api/media/batch", { - method: "POST", - data: { action: "delete", assetIds: [assetId] }, - }); -} - -async function restoreAsset(request, assetId) { - return await requestJson(request, "/api/media/batch", { - method: "POST", - data: { action: "restore", assetIds: [assetId] }, - }); -} - -async function purgeAsset(request, assetId) { - return await requestJson(request, "/api/media/purge", { - method: "POST", - data: { assetId }, - }); -} - -async function emptyResourceTrash(request, workspaceId) { - return await requestJson(request, "/api/media/empty-trash", { - method: "POST", - data: { workspaceId }, - }); -} - -async function openDocumentFileTree(page, workspaceId, documentId) { - await page.goto(`${BASE_URL}/documents/${encodeURIComponent(documentId)}?workspaceId=${encodeURIComponent(workspaceId)}`, { - waitUntil: "commit", - timeout: UI_TIMEOUT_MS, - }); - await page.waitForFunction( - () => { - const fileRoot = document.getElementById("sidebar-file-tree-root"); - const fileTab = document.querySelector('[data-mnote-sidebar-tree-tab="filetree"], button[aria-label="文件"]'); - return Boolean(fileRoot || fileTab); - }, - undefined, - { timeout: UI_TIMEOUT_MS }, - ); - await page.evaluate(() => { - const visible = (node) => - node instanceof HTMLElement && - !node.hidden && - getComputedStyle(node).display !== "none" && - getComputedStyle(node).visibility !== "hidden" && - node.getClientRects().length > 0; - const fileRoot = document.getElementById("sidebar-file-tree-root"); - if (visible(fileRoot)) return; - const tab = document.querySelector('[data-mnote-sidebar-tree-tab="filetree"], button[aria-label="文件"]'); - if (tab instanceof HTMLElement) tab.click(); - }); - await page.waitForFunction( - () => { - const fileRoot = document.getElementById("sidebar-file-tree-root"); - return fileRoot instanceof HTMLElement && fileRoot.getClientRects().length > 0; - }, - undefined, - { timeout: UI_TIMEOUT_MS }, - ); -} - -async function openTrash(page, workspaceId) { - await page.goto(`${BASE_URL}/trash?workspaceId=${encodeURIComponent(workspaceId)}`, { - waitUntil: "commit", - timeout: UI_TIMEOUT_MS, - }); - await page.locator('[data-testid="mnote-trash-workbench"]').waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); -} - -async function waitForVisible(page, selector, label) { - await page.locator(selector).first().waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }).catch(async (error) => { - throw new Error(`${label} 未出现: ${error.message}; state=${JSON.stringify(await readPageState(page).catch(() => null))}`); - }); -} - -async function waitForDetached(page, selector, label) { - await page.locator(selector).first().waitFor({ state: "detached", timeout: UI_TIMEOUT_MS }).catch(async (error) => { - throw new Error(`${label} 未消失: ${error.message}; state=${JSON.stringify(await readPageState(page).catch(() => null))}`); - }); -} - -async function installTreeEventRecorder(page, label, records) { - await page.addInitScript(() => { - window.__MNOTE_TASK433_TREE_EVENTS__ = []; - const record = (name, event) => { - const detail = event && event.detail ? event.detail : {}; - const payload = detail.payload || detail || {}; - window.__MNOTE_TASK433_TREE_EVENTS__.push({ - name, - at: Date.now(), - revision: detail.revision || payload.revision || payload.cursor || "", - op: payload && payload.data && payload.data.op ? payload.data.op : "", - }); - }; - window.addEventListener("tree:snapshot", (event) => record("tree:snapshot", event)); - window.addEventListener("tree:delta", (event) => record("tree:delta", event)); - window.addEventListener("tree:resync", (event) => record("tree:resync", event)); - }); - page.on("request", (request) => { - const url = request.url(); - if (url.includes("/api/tree/events")) { - records.push({ label, type: "request", method: request.method(), url, at: Date.now() }); - } - }); - page.on("console", (message) => { - const text = message.text(); - if (/tree live|EventSource|trash|error|failed/i.test(text)) { - records.push({ label, type: "console", level: message.type(), text: text.slice(0, 2000), at: Date.now() }); - } - }); -} - -function recordNavigation(page, label, records) { - page.on("framenavigated", (frame) => { - if (frame === page.mainFrame()) { - records.push({ label, url: frame.url(), at: Date.now() }); - } - }); -} - -async function readPageState(page) { - return await page.evaluate(() => ({ - url: window.location.href, - liveStatus: document.documentElement.getAttribute("data-mnote-tree-live-status") || "", - liveApplied: document.documentElement.getAttribute("data-mnote-tree-live-applied") || "", - liveRevision: document.documentElement.getAttribute("data-mnote-tree-live-revision") || "", - liveError: document.documentElement.getAttribute("data-mnote-tree-live-apply-error") || "", - trashLiveReason: - document.querySelector('[data-testid="mnote-trash-workbench"]')?.getAttribute("data-live-refresh-reason") || "", - trashLiveAt: - document.querySelector('[data-testid="mnote-trash-workbench"]')?.getAttribute("data-live-refresh-at") || "", - filetreeRows: Array.from(document.querySelectorAll("#sidebar-file-tree-root .tree-row[data-shell-mode='filetree']")).map((row) => ({ - rowId: row instanceof HTMLElement ? row.dataset.rowId || "" : "", - assetId: row instanceof HTMLElement ? row.dataset.assetId || "" : "", - documentId: row instanceof HTMLElement ? row.dataset.documentId || "" : "", - objectKind: row instanceof HTMLElement ? row.dataset.objectKind || "" : "", - text: row.textContent || "", - })), - trashResourceRows: Array.from(document.querySelectorAll('[data-testid="mnote-trash-workbench"] [data-trash-row="resource"]')).map((row) => ({ - resourceKind: row instanceof HTMLElement ? row.dataset.resourceKind || "" : "", - resourceId: row instanceof HTMLElement ? row.dataset.resourceId || "" : "", - documentId: row instanceof HTMLElement ? row.dataset.documentId || "" : "", - text: row.textContent || "", - })), - treeEvents: window.__MNOTE_TASK433_TREE_EVENTS__ || [], - })); -} - -async function snapshotStep(result, name, fileTreePage, trashPage, navigationStart) { - result.steps.push({ - name, - fileTree: await readPageState(fileTreePage), - trash: await readPageState(trashPage), - navigationEvents: result.navigationEvents.slice(navigationStart), - }); -} - -async function cleanup(request, workspaceId, documentIds, assetIds) { - for (const assetId of assetIds.filter(Boolean)) { - await archiveAsset(request, assetId).catch(() => null); - } - if (workspaceId) { - await emptyResourceTrash(request, workspaceId).catch(() => null); - } - for (const documentId of documentIds.filter(Boolean)) { - await treeCommand(request, workspaceId, "archive", documentId).catch(() => null); - } - if (workspaceId) { - await requestJson(request, "/api/documents/empty-trash", { method: "POST", data: { workspaceId } }).catch(() => null); - } -} - -(async () => { - const stamp = Date.now(); - const email = `mnote.stage8.file.${stamp}@example.com`; - const prefix = `TEST-10REVIEW-07-P8-FILE-${stamp}`; - const result = { - ok: false, - task: TASK, - baseUrl: BASE_URL, - authBaseUrl: AUTH_BASE_URL, - email, - prefix, - fixture: {}, - navigationEvents: [], - treeEventRequests: [], - steps: [], - }; - - const browser = await chromium.launch({ headless: true }); - const contextA = await browser.newContext(); - const contextB = await browser.newContext(); - const requestA = contextA.request; - const fileTreeB = await contextB.newPage(); - const trashB = await contextB.newPage(); - let workspaceId = ""; - const cleanupDocumentIds = []; - const cleanupAssetIds = []; - - await installTreeEventRecorder(fileTreeB, "B-filetree", result.treeEventRequests); - await installTreeEventRecorder(trashB, "B-trash", result.treeEventRequests); - recordNavigation(fileTreeB, "B-filetree", result.navigationEvents); - recordNavigation(trashB, "B-trash", result.navigationEvents); - - try { - for (const requestContext of [requestA, contextB.request]) { - await authenticate(requestContext, email, `stage8-file-${stamp}`); - } - - const root = await createPage(requestA, null, `${prefix}-root`); - workspaceId = root.workspaceId; - cleanupDocumentIds.push(root.documentId); - result.fixture.rootId = root.documentId; - result.fixture.workspaceId = workspaceId; - - await openDocumentFileTree(fileTreeB, workspaceId, root.documentId); - await openTrash(trashB, workspaceId); - await waitForVisible(fileTreeB, docRowSelector(root.documentId), "B 文件树 root 页面"); - const navigationStart = result.navigationEvents.length; - await snapshotStep(result, "initial", fileTreeB, trashB, navigationStart); - - const uploaded = await uploadFileAsset( - requestA, - workspaceId, - root.documentId, - `${prefix}-lifecycle.txt`, - `${prefix} lifecycle asset`, - ); - cleanupAssetIds.push(uploaded.assetId); - result.fixture.lifecycleAssetId = uploaded.assetId; - await waitForVisible(fileTreeB, assetRowSelector(uploaded.assetId), "B 文件树上传附件"); - await snapshotStep(result, "upload-visible-on-b", fileTreeB, trashB, navigationStart); - - await archiveAsset(requestA, uploaded.assetId); - await waitForDetached(fileTreeB, assetRowSelector(uploaded.assetId), "B 文件树附件删除后"); - await waitForVisible(trashB, trashAssetRowSelector(uploaded.assetId), "B 垃圾箱附件删除后"); - await snapshotStep(result, "archive-visible-on-b", fileTreeB, trashB, navigationStart); - - await restoreAsset(requestA, uploaded.assetId); - await waitForVisible(fileTreeB, assetRowSelector(uploaded.assetId), "B 文件树附件恢复后"); - await waitForDetached(trashB, trashAssetRowSelector(uploaded.assetId), "B 垃圾箱附件恢复后"); - await snapshotStep(result, "restore-visible-on-b", fileTreeB, trashB, navigationStart); - - await archiveAsset(requestA, uploaded.assetId); - await waitForVisible(trashB, trashAssetRowSelector(uploaded.assetId), "B 垃圾箱附件再次删除后"); - await purgeAsset(requestA, uploaded.assetId); - await waitForDetached(trashB, trashAssetRowSelector(uploaded.assetId), "B 垃圾箱附件彻底删除后"); - await waitForDetached(fileTreeB, assetRowSelector(uploaded.assetId), "B 文件树附件彻底删除后"); - await snapshotStep(result, "purge-visible-on-b", fileTreeB, trashB, navigationStart); - - const emptyAssetA = await uploadFileAsset(requestA, workspaceId, root.documentId, `${prefix}-empty-a.txt`, "empty a"); - const emptyAssetB = await uploadFileAsset(requestA, workspaceId, root.documentId, `${prefix}-empty-b.txt`, "empty b"); - cleanupAssetIds.push(emptyAssetA.assetId, emptyAssetB.assetId); - result.fixture.emptyAssetIds = [emptyAssetA.assetId, emptyAssetB.assetId]; - await waitForVisible(fileTreeB, assetRowSelector(emptyAssetA.assetId), "B 文件树 empty-a 上传后"); - await waitForVisible(fileTreeB, assetRowSelector(emptyAssetB.assetId), "B 文件树 empty-b 上传后"); - await archiveAsset(requestA, emptyAssetA.assetId); - await archiveAsset(requestA, emptyAssetB.assetId); - await waitForVisible(trashB, trashAssetRowSelector(emptyAssetA.assetId), "B 垃圾箱 empty-a 删除后"); - await waitForVisible(trashB, trashAssetRowSelector(emptyAssetB.assetId), "B 垃圾箱 empty-b 删除后"); - await emptyResourceTrash(requestA, workspaceId); - await waitForDetached(trashB, trashAssetRowSelector(emptyAssetA.assetId), "B 垃圾箱 empty-a 清空后"); - await waitForDetached(trashB, trashAssetRowSelector(emptyAssetB.assetId), "B 垃圾箱 empty-b 清空后"); - await waitForDetached(fileTreeB, assetRowSelector(emptyAssetA.assetId), "B 文件树 empty-a 清空后"); - await waitForDetached(fileTreeB, assetRowSelector(emptyAssetB.assetId), "B 文件树 empty-b 清空后"); - await snapshotStep(result, "empty-trash-visible-on-b", fileTreeB, trashB, navigationStart); - - const unexpectedNavigations = result.navigationEvents.slice(navigationStart); - assert.equal(unexpectedNavigations.length, 0, `B 浏览器发生了刷新/导航: ${JSON.stringify(unexpectedNavigations)}`); - result.ok = true; - } catch (error) { - result.error = error instanceof Error ? error.stack || error.message : String(error); - result.failure = { - fileTree: await readPageState(fileTreeB).catch(() => null), - trash: await readPageState(trashB).catch(() => null), - }; - process.exitCode = 1; - } finally { - await cleanup(requestA, workspaceId, cleanupDocumentIds, cleanupAssetIds).catch((error) => { - result.cleanupError = error instanceof Error ? error.message : String(error); - }); - await browser.close().catch(() => undefined); - await writeResult(result); - } -})(); diff --git a/scripts/task434-filetree-trash-mindmap-table-dual-browser-no-refresh-smoke.js b/scripts/task434-filetree-trash-mindmap-table-dual-browser-no-refresh-smoke.js deleted file mode 100644 index 1283663f..00000000 --- a/scripts/task434-filetree-trash-mindmap-table-dual-browser-no-refresh-smoke.js +++ /dev/null @@ -1,559 +0,0 @@ -#!/usr/bin/env node -"use strict"; - -const assert = require("node:assert/strict"); -const fs = require("node:fs/promises"); -const path = require("node:path"); -const { chromium } = require("playwright"); - -const TASK = "task434-filetree-trash-mindmap-table-dual-browser-no-refresh-smoke"; -const BASE_URL = (process.env.MNOTE_UI_BASE_URL || "http://127.0.0.1:3000").replace(/\/+$/, ""); -const AUTH_BASE_URL = (process.env.MNOTE_AUTH_BASE_URL || BASE_URL).replace(/\/+$/, ""); -const CONVEX_URL = (process.env.NEXT_PUBLIC_CONVEX_URL || process.env.CONVEX_SELF_HOSTED_URL || "http://127.0.0.1:3210").replace(/\/+$/, ""); -const e2ePassword = () => process.env.MNOTE_E2E_PASSWORD || ["Mnote", "E2E", "123!"].join(""); -// 说明：该 smoke 覆盖 convex-source mindmap/table trash 兼容链路，不代表 local-first 默认资源真相。 -const UI_TIMEOUT_MS = Number(process.env.MNOTE_SMOKE_UI_TIMEOUT_MS || 35_000); -const OUTPUT_DIR = path.join(process.cwd(), "tmp", TASK); -const RESULT_PATH = path.join(OUTPUT_DIR, "result.json"); - -async function writeResult(payload) { - await fs.mkdir(OUTPUT_DIR, { recursive: true }); - await fs.writeFile(RESULT_PATH, `${JSON.stringify({ ...payload, resultPath: RESULT_PATH }, null, 2)}\n`, "utf8"); -} - -async function requestJson(request, requestPath, init = {}) { - const response = await request.fetch(`${BASE_URL}${requestPath}`, { - ...init, - headers: { - ...(init.data !== undefined ? { "content-type": "application/json" } : {}), - ...(init.headers || {}), - }, - timeout: 30_000, - }); - const text = await response.text(); - let payload = null; - try { - payload = text ? JSON.parse(text) : null; - } catch { - payload = text; - } - if (!response.ok()) { - throw new Error(`${requestPath} 请求失败: ${response.status()} ${typeof payload === "string" ? payload : JSON.stringify(payload)}`); - } - return payload; -} - -async function requestAuthJson(request, requestPath, init = {}) { - const response = await request.fetch(`${AUTH_BASE_URL}${requestPath}`, { - ...init, - headers: { - ...(init.data !== undefined ? { "content-type": "application/json" } : {}), - ...(init.headers || {}), - }, - timeout: 20_000, - }); - const text = await response.text(); - let payload = null; - try { - payload = text ? JSON.parse(text) : null; - } catch { - payload = text; - } - if (!response.ok()) { - throw new Error(`${requestPath} 请求失败: ${response.status()} ${typeof payload === "string" ? payload : JSON.stringify(payload)}`); - } - return payload; -} - -async function convexCall(context, kind, convexPath, args) { - const cookies = await context.cookies(BASE_URL); - const jwt = cookies.find((cookie) => cookie.name === "__convexAuthJWT")?.value; - assert(jwt, "缺少 __convexAuthJWT cookie"); - const response = await fetch(`${CONVEX_URL}/api/${kind}`, { - method: "POST", - headers: { - authorization: `Bearer ${jwt}`, - "content-type": "application/json", - "Convex-Client": TASK, - }, - body: JSON.stringify({ path: convexPath, format: "convex_encoded_json", args: [args] }), - }); - const body = await response.json(); - if (!response.ok || body.status !== "success") { - throw new Error(`Convex ${kind} ${convexPath} 失败: ${response.status} ${JSON.stringify(body)}`); - } - return body.value; -} - -function cssEscape(value) { - return String(value).replace(/\\/g, "\\\\").replace(/"/g, '\\"'); -} - -function docRowSelector(documentId) { - return `#sidebar-file-tree-root .tree-row[data-shell-mode="filetree"][data-row-id="doc:${cssEscape(documentId)}"]`; -} - -function assetRowSelector(assetId) { - return `#sidebar-file-tree-root .tree-row[data-shell-mode="filetree"][data-asset-id="${cssEscape(assetId)}"]`; -} - -function trashAssetRowSelector(assetId) { - return `[data-testid="mnote-trash-workbench"] [data-trash-row="resource"][data-resource-kind="media"][data-resource-id="${cssEscape(assetId)}"]`; -} - -function trashResourceRowSelector(kind, resourceId) { - return `[data-testid="mnote-trash-workbench"] [data-trash-row="resource"][data-resource-kind="${cssEscape(kind)}"][data-resource-id="${cssEscape(resourceId)}"]`; -} - -async function authenticate(request, email, name) { - await requestAuthJson(request, "/api/auth", { - method: "POST", - data: { - action: "auth:signIn", - args: { - provider: "password", - params: { email, password: e2ePassword(), flow: "signUp", name }, - }, - }, - }); -} - -async function createPage(request, workspaceId, title, parentId = null) { - const payload = await requestJson(request, "/api/tree/commands", { - method: "POST", - data: { action: "create", workspaceId, parentId, title }, - }); - const result = payload.result || payload; - const documentId = result.documentId || payload.documentId || result.id || ""; - const resolvedWorkspaceId = result.workspaceId || payload.workspaceId || payload.workspace_id || workspaceId || ""; - assert(documentId, `创建页面失败: ${JSON.stringify(payload)}`); - assert(resolvedWorkspaceId, `创建页面缺少 workspaceId: ${JSON.stringify(payload)}`); - return { documentId, workspaceId: resolvedWorkspaceId, payload }; -} - -async function treeCommand(request, workspaceId, action, documentId) { - return await requestJson(request, "/api/tree/commands", { - method: "POST", - data: { action, workspaceId, documentId }, - }); -} - -async function uploadFileAsset(request, workspaceId, documentId, fileName, text) { - const response = await request.fetch(`${BASE_URL}/api/media/upload`, { - method: "POST", - multipart: { - workspaceId, - documentId, - file: { - name: fileName, - mimeType: "text/plain", - buffer: Buffer.from(text, "utf8"), - }, - }, - timeout: 30_000, - }); - const payload = await response.json().catch(async () => await response.text()); - if (!response.ok()) { - throw new Error(`/api/media/upload 请求失败: ${response.status()} ${typeof payload === "string" ? payload : JSON.stringify(payload)}`); - } - const assetId = payload?.asset?.id || payload?.assetId || ""; - assert(assetId, `上传附件缺少 asset id: ${JSON.stringify(payload)}`); - return { assetId, payload }; -} - -async function createMindmap(request, workspaceId, documentId, mindmapId, title) { - return await requestJson(request, `/api/mindmap/${encodeURIComponent(documentId)}/${encodeURIComponent(mindmapId)}`, { - method: "POST", - data: { - commandName: "mindmaps.put", - workspaceId, - createOnly: true, - data: { root: { data: { text: title }, children: [] } }, - }, - }); -} - -async function archiveMindmap(request, documentId, mindmapId) { - return await requestJson(request, `/api/mindmap/${encodeURIComponent(documentId)}/${encodeURIComponent(mindmapId)}`, { - method: "DELETE", - }); -} - -async function restoreMindmap(request, documentId, mindmapId) { - return await requestJson(request, `/api/mindmap/${encodeURIComponent(documentId)}/${encodeURIComponent(mindmapId)}`, { - method: "PATCH", - data: { action: "restore" }, - }); -} - -async function purgeMindmap(request, documentId, mindmapId) { - return await requestJson(request, `/api/mindmap/${encodeURIComponent(documentId)}/${encodeURIComponent(mindmapId)}`, { - method: "PATCH", - data: { action: "purge" }, - }); -} - -async function createTable(request, documentId, title) { - const payload = await requestJson(request, "/api/tables/create", { - method: "POST", - data: { - documentId, - title, - schema: {}, - snapshot: null, - }, - }); - const tableId = payload?.result?.id || payload?.id || ""; - assert(tableId, `创建 table 缺少 id: ${JSON.stringify(payload)}`); - return tableId; -} - -async function archiveTable(request, tableId) { - return await requestJson(request, `/api/tables/${encodeURIComponent(tableId)}`, { method: "DELETE" }); -} - -async function restoreTable(request, tableId) { - return await requestJson(request, "/api/tables/restore", { - method: "POST", - data: { tableId }, - }); -} - -async function purgeTable(request, tableId) { - return await requestJson(request, "/api/tables/purge", { - method: "POST", - data: { tableId }, - }); -} - -async function archiveAsset(request, assetId) { - return await requestJson(request, "/api/media/batch", { - method: "POST", - data: { action: "delete", assetIds: [assetId] }, - }); -} - -async function restoreAsset(request, assetId) { - return await requestJson(request, "/api/media/batch", { - method: "POST", - data: { action: "restore", assetIds: [assetId] }, - }); -} - -async function purgeAsset(request, assetId) { - return await requestJson(request, "/api/media/purge", { - method: "POST", - data: { assetId }, - }); -} - -async function emptyResourceTrash(request, workspaceId) { - return await requestJson(request, "/api/media/empty-trash", { - method: "POST", - data: { workspaceId }, - }); -} - -async function emptyMindmapTrash(request, workspaceId) { - return await requestJson(request, "/api/mindmap-trash/empty", { - method: "POST", - data: { workspaceId }, - }); -} - -async function emptyTableTrash(request, workspaceId) { - return await requestJson(request, "/api/tables/empty-trash", { - method: "POST", - data: { workspaceId }, - }); -} - -async function openDocumentFileTree(page, workspaceId, documentId) { - await page.goto(`${BASE_URL}/documents/${encodeURIComponent(documentId)}?workspaceId=${encodeURIComponent(workspaceId)}`, { - waitUntil: "commit", - timeout: UI_TIMEOUT_MS, - }); - await page.waitForFunction( - () => { - const fileRoot = document.getElementById("sidebar-file-tree-root"); - const fileTab = document.querySelector('[data-mnote-sidebar-tree-tab="filetree"], button[aria-label="文件"]'); - return Boolean(fileRoot || fileTab); - }, - undefined, - { timeout: UI_TIMEOUT_MS }, - ); - await page.evaluate(() => { - const visible = (node) => - node instanceof HTMLElement && - !node.hidden && - getComputedStyle(node).display !== "none" && - getComputedStyle(node).visibility !== "hidden" && - node.getClientRects().length > 0; - const fileRoot = document.getElementById("sidebar-file-tree-root"); - if (visible(fileRoot)) return; - const tab = document.querySelector('[data-mnote-sidebar-tree-tab="filetree"], button[aria-label="文件"]'); - if (tab instanceof HTMLElement) tab.click(); - }); - await page.waitForFunction( - () => { - const fileRoot = document.getElementById("sidebar-file-tree-root"); - return fileRoot instanceof HTMLElement && fileRoot.getClientRects().length > 0; - }, - undefined, - { timeout: UI_TIMEOUT_MS }, - ); -} - -async function openTrash(page, workspaceId) { - await page.goto(`${BASE_URL}/trash?workspaceId=${encodeURIComponent(workspaceId)}`, { - waitUntil: "commit", - timeout: UI_TIMEOUT_MS, - }); - await page.locator('[data-testid="mnote-trash-workbench"]').waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); -} - -async function waitForVisible(page, selector, label) { - await page.locator(selector).first().waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }).catch(async (error) => { - throw new Error(`${label} 未出现: ${error.message}; state=${JSON.stringify(await readPageState(page).catch(() => null))}`); - }); -} - -async function waitForDetached(page, selector, label) { - await page.locator(selector).first().waitFor({ state: "detached", timeout: UI_TIMEOUT_MS }).catch(async (error) => { - throw new Error(`${label} 未消失: ${error.message}; state=${JSON.stringify(await readPageState(page).catch(() => null))}`); - }); -} - -async function installTreeEventRecorder(page, label, records) { - await page.addInitScript(() => { - window.__MNOTE_TASK433_TREE_EVENTS__ = []; - const record = (name, event) => { - const detail = event && event.detail ? event.detail : {}; - const payload = detail.payload || detail || {}; - window.__MNOTE_TASK433_TREE_EVENTS__.push({ - name, - at: Date.now(), - revision: detail.revision || payload.revision || payload.cursor || "", - op: payload && payload.data && payload.data.op ? payload.data.op : "", - }); - }; - window.addEventListener("tree:snapshot", (event) => record("tree:snapshot", event)); - window.addEventListener("tree:delta", (event) => record("tree:delta", event)); - window.addEventListener("tree:resync", (event) => record("tree:resync", event)); - }); - page.on("request", (request) => { - const url = request.url(); - if (url.includes("/api/tree/events")) { - records.push({ label, type: "request", method: request.method(), url, at: Date.now() }); - } - }); - page.on("console", (message) => { - const text = message.text(); - if (/tree live|EventSource|trash|error|failed/i.test(text)) { - records.push({ label, type: "console", level: message.type(), text: text.slice(0, 2000), at: Date.now() }); - } - }); -} - -function recordNavigation(page, label, records) { - page.on("framenavigated", (frame) => { - if (frame === page.mainFrame()) { - records.push({ label, url: frame.url(), at: Date.now() }); - } - }); -} - -async function readPageState(page) { - return await page.evaluate(() => ({ - url: window.location.href, - liveStatus: document.documentElement.getAttribute("data-mnote-tree-live-status") || "", - liveApplied: document.documentElement.getAttribute("data-mnote-tree-live-applied") || "", - liveRevision: document.documentElement.getAttribute("data-mnote-tree-live-revision") || "", - liveError: document.documentElement.getAttribute("data-mnote-tree-live-apply-error") || "", - trashLiveReason: - document.querySelector('[data-testid="mnote-trash-workbench"]')?.getAttribute("data-live-refresh-reason") || "", - trashLiveAt: - document.querySelector('[data-testid="mnote-trash-workbench"]')?.getAttribute("data-live-refresh-at") || "", - filetreeRows: Array.from(document.querySelectorAll("#sidebar-file-tree-root .tree-row[data-shell-mode='filetree']")).map((row) => ({ - rowId: row instanceof HTMLElement ? row.dataset.rowId || "" : "", - assetId: row instanceof HTMLElement ? row.dataset.assetId || "" : "", - documentId: row instanceof HTMLElement ? row.dataset.documentId || "" : "", - objectKind: row instanceof HTMLElement ? row.dataset.objectKind || "" : "", - text: row.textContent || "", - })), - trashResourceRows: Array.from(document.querySelectorAll('[data-testid="mnote-trash-workbench"] [data-trash-row="resource"]')).map((row) => ({ - resourceKind: row instanceof HTMLElement ? row.dataset.resourceKind || "" : "", - resourceId: row instanceof HTMLElement ? row.dataset.resourceId || "" : "", - documentId: row instanceof HTMLElement ? row.dataset.documentId || "" : "", - text: row.textContent || "", - })), - treeEvents: window.__MNOTE_TASK433_TREE_EVENTS__ || [], - })); -} - -async function snapshotStep(result, name, fileTreePage, trashPage, navigationStart) { - result.steps.push({ - name, - fileTree: await readPageState(fileTreePage), - trash: await readPageState(trashPage), - navigationEvents: result.navigationEvents.slice(navigationStart), - }); -} - -async function cleanup(request, workspaceId, documentIds, mindmapIds, tableIds) { - for (const mindmapId of mindmapIds.filter(Boolean)) { - for (const documentId of documentIds.filter(Boolean)) { - await archiveMindmap(request, documentId, mindmapId).catch(() => null); - } - } - for (const tableId of tableIds.filter(Boolean)) { - await archiveTable(request, tableId).catch(() => null); - } - if (workspaceId) { - await emptyMindmapTrash(request, workspaceId).catch(() => null); - await emptyTableTrash(request, workspaceId).catch(() => null); - } - for (const documentId of documentIds.filter(Boolean)) { - await treeCommand(request, workspaceId, "archive", documentId).catch(() => null); - } - if (workspaceId) { - await requestJson(request, "/api/documents/empty-trash", { method: "POST", data: { workspaceId } }).catch(() => null); - } -} - -(async () => { - const stamp = Date.now(); - const email = `mnote.stage8.mindtable.${stamp}@example.com`; - const prefix = `TEST-10REVIEW-07-P8-MT-${stamp}`; - const result = { - ok: false, - task: TASK, - baseUrl: BASE_URL, - authBaseUrl: AUTH_BASE_URL, - email, - prefix, - fixture: {}, - navigationEvents: [], - treeEventRequests: [], - steps: [], - }; - - const browser = await chromium.launch({ headless: true }); - const contextA = await browser.newContext(); - const contextB = await browser.newContext(); - const requestA = contextA.request; - const fileTreeB = await contextB.newPage(); - const trashB = await contextB.newPage(); - let workspaceId = ""; - const cleanupDocumentIds = []; - const cleanupMindmapIds = []; - const cleanupTableIds = []; - - await installTreeEventRecorder(fileTreeB, "B-filetree", result.treeEventRequests); - await installTreeEventRecorder(trashB, "B-trash", result.treeEventRequests); - recordNavigation(fileTreeB, "B-filetree", result.navigationEvents); - recordNavigation(trashB, "B-trash", result.navigationEvents); - - try { - for (const requestContext of [requestA, contextB.request]) { - await authenticate(requestContext, email, `stage8-mindtable-${stamp}`); - } - - const root = await createPage(requestA, null, `${prefix}-root`); - workspaceId = root.workspaceId; - cleanupDocumentIds.push(root.documentId); - result.fixture.rootId = root.documentId; - result.fixture.workspaceId = workspaceId; - - await openDocumentFileTree(fileTreeB, workspaceId, root.documentId); - await openTrash(trashB, workspaceId); - await waitForVisible(fileTreeB, docRowSelector(root.documentId), "B 文件树 root 页面"); - const navigationStart = result.navigationEvents.length; - await snapshotStep(result, "initial", fileTreeB, trashB, navigationStart); - - const mindmapId = `mind_stage8_${stamp}_lifecycle`; - await createMindmap(requestA, workspaceId, root.documentId, mindmapId, `${prefix}-mind-lifecycle`); - cleanupMindmapIds.push(mindmapId); - result.fixture.mindmapId = mindmapId; - await waitForVisible(fileTreeB, assetRowSelector(mindmapId), "B 文件树 mindmap 创建后"); - await snapshotStep(result, "mindmap-create-visible-on-b", fileTreeB, trashB, navigationStart); - - await archiveMindmap(requestA, root.documentId, mindmapId); - await waitForDetached(fileTreeB, assetRowSelector(mindmapId), "B 文件树 mindmap 删除后"); - await waitForVisible(trashB, trashResourceRowSelector("mindmap", mindmapId), "B 垃圾箱 mindmap 删除后"); - await snapshotStep(result, "mindmap-archive-visible-on-b", fileTreeB, trashB, navigationStart); - - await restoreMindmap(requestA, root.documentId, mindmapId); - await waitForVisible(fileTreeB, assetRowSelector(mindmapId), "B 文件树 mindmap 恢复后"); - await waitForDetached(trashB, trashResourceRowSelector("mindmap", mindmapId), "B 垃圾箱 mindmap 恢复后"); - await snapshotStep(result, "mindmap-restore-visible-on-b", fileTreeB, trashB, navigationStart); - - await archiveMindmap(requestA, root.documentId, mindmapId); - await waitForVisible(trashB, trashResourceRowSelector("mindmap", mindmapId), "B 垃圾箱 mindmap 再次删除后"); - await purgeMindmap(requestA, root.documentId, mindmapId); - await waitForDetached(trashB, trashResourceRowSelector("mindmap", mindmapId), "B 垃圾箱 mindmap 彻底删除后"); - await waitForDetached(fileTreeB, assetRowSelector(mindmapId), "B 文件树 mindmap 彻底删除后"); - await snapshotStep(result, "mindmap-purge-visible-on-b", fileTreeB, trashB, navigationStart); - - const tableId = await createTable(requestA, root.documentId, `${prefix}-table-lifecycle`); - cleanupTableIds.push(tableId); - result.fixture.tableId = tableId; - await waitForVisible(fileTreeB, assetRowSelector(tableId), "B 文件树 table 创建后"); - await snapshotStep(result, "table-create-visible-on-b", fileTreeB, trashB, navigationStart); - - await archiveTable(requestA, tableId); - await waitForDetached(fileTreeB, assetRowSelector(tableId), "B 文件树 table 删除后"); - await waitForVisible(trashB, trashResourceRowSelector("table", tableId), "B 垃圾箱 table 删除后"); - await snapshotStep(result, "table-archive-visible-on-b", fileTreeB, trashB, navigationStart); - - await restoreTable(requestA, tableId); - await waitForVisible(fileTreeB, assetRowSelector(tableId), "B 文件树 table 恢复后"); - await waitForDetached(trashB, trashResourceRowSelector("table", tableId), "B 垃圾箱 table 恢复后"); - await snapshotStep(result, "table-restore-visible-on-b", fileTreeB, trashB, navigationStart); - - await archiveTable(requestA, tableId); - await waitForVisible(trashB, trashResourceRowSelector("table", tableId), "B 垃圾箱 table 再次删除后"); - await purgeTable(requestA, tableId); - await waitForDetached(trashB, trashResourceRowSelector("table", tableId), "B 垃圾箱 table 彻底删除后"); - await waitForDetached(fileTreeB, assetRowSelector(tableId), "B 文件树 table 彻底删除后"); - await snapshotStep(result, "table-purge-visible-on-b", fileTreeB, trashB, navigationStart); - - const emptyMindmapId = `mind_stage8_${stamp}_empty`; - await createMindmap(requestA, workspaceId, root.documentId, emptyMindmapId, `${prefix}-mind-empty`); - const emptyTableId = await createTable(requestA, root.documentId, `${prefix}-table-empty`); - cleanupMindmapIds.push(emptyMindmapId); - cleanupTableIds.push(emptyTableId); - result.fixture.emptyMindmapId = emptyMindmapId; - result.fixture.emptyTableId = emptyTableId; - await waitForVisible(fileTreeB, assetRowSelector(emptyMindmapId), "B 文件树 empty mindmap 创建后"); - await waitForVisible(fileTreeB, assetRowSelector(emptyTableId), "B 文件树 empty table 创建后"); - await archiveMindmap(requestA, root.documentId, emptyMindmapId); - await archiveTable(requestA, emptyTableId); - await waitForVisible(trashB, trashResourceRowSelector("mindmap", emptyMindmapId), "B 垃圾箱 empty mindmap 删除后"); - await waitForVisible(trashB, trashResourceRowSelector("table", emptyTableId), "B 垃圾箱 empty table 删除后"); - await emptyMindmapTrash(requestA, workspaceId); - await emptyTableTrash(requestA, workspaceId); - await waitForDetached(trashB, trashResourceRowSelector("mindmap", emptyMindmapId), "B 垃圾箱 empty mindmap 清空后"); - await waitForDetached(trashB, trashResourceRowSelector("table", emptyTableId), "B 垃圾箱 empty table 清空后"); - await waitForDetached(fileTreeB, assetRowSelector(emptyMindmapId), "B 文件树 empty mindmap 清空后"); - await waitForDetached(fileTreeB, assetRowSelector(emptyTableId), "B 文件树 empty table 清空后"); - await snapshotStep(result, "mindmap-table-empty-trash-visible-on-b", fileTreeB, trashB, navigationStart); - - const unexpectedNavigations = result.navigationEvents.slice(navigationStart); - assert.equal(unexpectedNavigations.length, 0, `B 浏览器发生了刷新/导航: ${JSON.stringify(unexpectedNavigations)}`); - result.ok = true; - } catch (error) { - result.error = error instanceof Error ? error.stack || error.message : String(error); - result.failure = { - fileTree: await readPageState(fileTreeB).catch(() => null), - trash: await readPageState(trashB).catch(() => null), - }; - process.exitCode = 1; - } finally { - await cleanup(requestA, workspaceId, cleanupDocumentIds, cleanupMindmapIds, cleanupTableIds).catch((error) => { - result.cleanupError = error instanceof Error ? error.message : String(error); - }); - await browser.close().catch(() => undefined); - await writeResult(result); - } -})(); diff --git a/scripts/task436-local-markdown-open-document-external-change-smoke.js b/scripts/task436-local-markdown-open-document-external-change-smoke.js index bda45cf9..5d2b1700 100644 --- a/scripts/task436-local-markdown-open-document-external-change-smoke.js +++ b/scripts/task436-local-markdown-open-document-external-change-smoke.js @@ -165,6 +165,7 @@ async function run() { const root = fs.mkdtempSync(path.join(os.tmpdir(), "mnote-local-open-doc-external-")); const files = { clean: "clean-sync.md", + aiClean: "clean-ai-sync.md", dirty: "dirty-conflict.md", aiDirty: "dirty-ai-conflict.md", rename: "rename-open.md", @@ -172,6 +173,7 @@ async function run() { }; writeWorkspaceManifest(root, "user_real"); fs.writeFileSync(path.join(root, files.clean), markdown("Clean Sync", ["initial clean"]), "utf8"); + fs.writeFileSync(path.join(root, files.aiClean), markdown("Clean AI Sync", ["initial ai clean"]), "utf8"); fs.writeFileSync(path.join(root, files.dirty), markdown("Dirty Conflict", ["initial dirty"]), "utf8"); fs.writeFileSync(path.join(root, files.aiDirty), markdown("Dirty AI Conflict", ["initial ai dirty"]), "utf8"); fs.writeFileSync(path.join(root, files.rename), markdown("Rename Open", ["initial rename"]), "utf8"); @@ -211,6 +213,17 @@ async function run() { await waitForEditorStatus(page, "synced-external-change"); })); + await openDocument(page, root, files.aiClean); + await waitForEditorText(page, "initial ai clean"); + await page.waitForTimeout(300); + navigationEvents.length = 0; + steps.push(await runStep("clean 文档 AI 后台写入后自动同步内容", navigationEvents, async () => { + const aiToken = `ai-clean-${Date.now()}`; + await callMarkdownEdit(root, files.aiClean, "initial ai clean", `initial ai clean ${aiToken}`); + await waitForEditorText(page, aiToken); + await waitForEditorStatus(page, "synced-external-change"); + })); + await openDocument(page, root, files.dirty); await waitForEditorText(page, "initial dirty"); await page.waitForTimeout(300); @@ -262,7 +275,7 @@ async function run() { fs.rmSync(path.join(root, files.delete)); await waitForEditorStatus(page, "external-change-conflict"); const runtime = await readEditorRuntime(page); - assert(runtime.error.includes("本地 Markdown 文件已在外部更新"), `删除提示不正确: ${JSON.stringify(runtime)}`); + assert(runtime.error.includes("已被删除"), `删除提示不正确: ${JSON.stringify(runtime)}`); })); const result = { diff --git a/scripts/task453-local-folder-page-ai-changed-files-smoke.js b/scripts/task453-local-folder-page-ai-changed-files-smoke.js index a4989e0f..5f5b9a36 100644 --- a/scripts/task453-local-folder-page-ai-changed-files-smoke.js +++ b/scripts/task453-local-folder-page-ai-changed-files-smoke.js @@ -256,6 +256,9 @@ async function main() { output: scenario.message, agentAudit: { eventId: `audit_local_changed_${currentScenario}_${suffix}`, + actorId, + actorType: "user", + agentKind: "reasonix", rootUri, diffSummary: "1 changed file(s)", changedFiles: [ @@ -263,6 +266,10 @@ async function main() { path: scenario.relativePath, changeType: "modified", summary: `追加 ${scenario.marker}`, + hashBefore: "111", + hashAfter: "222", + modifiedBeforeMs: 10, + modifiedAfterMs: 20, }, ], }, @@ -308,6 +315,8 @@ async function main() { && card.text.includes("agent.changed_files") && card.text.includes("README.md") && card.text.includes(marker) + && card.text.includes("hash 111→222") + && card.text.includes("reasonix/user/user_real") ), `本地 AI changed files 工具卡未显示 README.md 与 diff 摘要: ${JSON.stringify(cards)}`, ); @@ -337,8 +346,70 @@ async function main() { assert.equal(runBody.documentId, documentId, `Hermes run 应携带 local documentId: ${JSON.stringify(runBody)}`); assert.equal(runBody.sourceKind, "local_folder", `Hermes run 应携带 local_folder sourceKind: ${JSON.stringify(runBody)}`); assert.equal(runBody.rootUri, rootUri, `Hermes run 应携带 rootUri: ${JSON.stringify(runBody)}`); + assert.equal(runBody.editorTarget?.schema, "mnote.ai_editor_target.v1", `Hermes run 应携带 AI editor target: ${JSON.stringify(runBody)}`); + assert.equal(runBody.editorTarget?.source, "open_editors_snapshot", `AI editor target 应来自 OpenEditorsSnapshot: ${JSON.stringify(runBody.editorTarget)}`); + assert.equal(runBody.editorTarget?.documentId, documentId, `AI editor target 应指向当前文档: ${JSON.stringify(runBody.editorTarget)}`); + assert.equal(runBody.runTargetSnapshot?.schema, "mnote.page_ai_run_target_snapshot.v1", `Hermes run 应携带冻结 target snapshot: ${JSON.stringify(runBody.runTargetSnapshot)}`); + assert.equal(runBody.runTargetSnapshot?.editorTarget?.documentId, documentId, `冻结 target snapshot 应指向发起 run 时的文档: ${JSON.stringify(runBody.runTargetSnapshot)}`); + assert.equal(runBody.runTargetSnapshot?.editorTarget?.workspacePath?.rootUri, rootUri, `冻结 target snapshot 应保留发起 run 时的 rootUri: ${JSON.stringify(runBody.runTargetSnapshot)}`); + assert.equal(runBody.pageContext?.aiContext?.runTargetSnapshot?.editorTarget?.documentId, documentId, `pageContext.aiContext 应保留冻结 target snapshot: ${JSON.stringify(runBody.pageContext?.aiContext)}`); + assert.equal(runBody.pageContext?.aiContext?.activeEditorTarget?.source, "open_editors_snapshot", `pageContext.aiContext 应包含 activeEditorTarget: ${JSON.stringify(runBody.pageContext?.aiContext)}`); + assert.equal(runBody.pageContext?.aiContext?.openEditorsSnapshot?.activeEditor?.documentId, documentId, `aiContext.openEditorsSnapshot 应包含 active editor: ${JSON.stringify(runBody.pageContext?.aiContext?.openEditorsSnapshot)}`); + assert(runBody.pageContext?.aiContext?.openEditorsSnapshot?.groups?.primary, `aiContext.openEditorsSnapshot 应保留 primary group: ${JSON.stringify(runBody.pageContext?.aiContext?.openEditorsSnapshot)}`); + assert(runBody.pageContext?.aiContext?.openEditorsSnapshot?.groups?.secondary, `aiContext.openEditorsSnapshot 应保留 secondary group: ${JSON.stringify(runBody.pageContext?.aiContext?.openEditorsSnapshot)}`); const cleanCapturedKinds = captured.map((entry) => entry.kind); + captured.length = 0; + await page.evaluate(({ otherRootUri, otherWorkspaceId }) => { + const runtime = window.__mnoteDocumentPaneRuntime; + if (!runtime || typeof runtime.getOpenEditorsSnapshot !== "function") { + throw new Error("missing_open_editors_snapshot_runtime"); + } + window.__task453OriginalOpenEditorsSnapshot = runtime.getOpenEditorsSnapshot.bind(runtime); + runtime.getOpenEditorsSnapshot = () => { + const snapshot = window.__task453OriginalOpenEditorsSnapshot(); + const cloned = JSON.parse(JSON.stringify(snapshot || {})); + const poisonEditor = (entry) => { + if (!entry || typeof entry !== "object") return; + entry.workspaceId = otherWorkspaceId; + entry.workspacePath = Object.assign({}, entry.workspacePath || {}, { + workspaceId: otherWorkspaceId, + rootUri: otherRootUri, + sourceKind: "local_folder", + }); + }; + poisonEditor(cloned.activeEditor); + (cloned.editors || []).forEach((entry) => { + if (entry && entry.active) poisonEditor(entry); + }); + Object.values(cloned.groups || {}).forEach((group) => { + (group.editors || []).forEach((entry) => { + if (entry && entry.active) poisonEditor(entry); + }); + }); + return cloned; + }; + }, { otherRootUri: "file:///tmp/mnote-task453-other-root", otherWorkspaceId: "local-ws:user_real:other" }); + await page.locator("[data-page-ai-input]").fill(`请错误写入其他 workspace ${marker}`, { timeout: UI_TIMEOUT_MS }); + await page.locator('[data-page-ai-action="send"]').click({ timeout: UI_TIMEOUT_MS }); + await page.waitForFunction( + () => { + const drawerText = document.querySelector('[data-testid="wolai-page-ai-drawer"]')?.textContent || ""; + return drawerText.includes("AI target 与当前本地工作区 rootUri 不一致") + || drawerText.includes("AI target 与当前 workspaceId 不一致"); + }, + null, + { timeout: UI_TIMEOUT_MS }, + ); + assert(!captured.some((entry) => entry.kind === "run"), `跨 workspace target 不应发起 Hermes run: ${JSON.stringify(captured)}`); + await page.evaluate(() => { + const runtime = window.__mnoteDocumentPaneRuntime; + if (runtime && window.__task453OriginalOpenEditorsSnapshot) { + runtime.getOpenEditorsSnapshot = window.__task453OriginalOpenEditorsSnapshot; + } + delete window.__task453OriginalOpenEditorsSnapshot; + }); + currentScenario = "dirty"; captured.length = 0; const dirtyUrl = new URL(`${BASE_URL}/documents/${encodeURIComponent(dirtyDocumentId)}`); @@ -353,49 +424,31 @@ async function main() { await page.waitForFunction( () => { const drawerText = document.querySelector('[data-testid="wolai-page-ai-drawer"]')?.textContent || ""; - return drawerText.includes("agent.changed_files") && drawerText.includes("Dirty.md"); + return drawerText.includes("目标文档存在未保存或外部变更状态"); }, null, { timeout: UI_TIMEOUT_MS }, ); - await waitForEditorStatus(page, "external-change-conflict"); - await page.locator('[data-testid="mnote-editor-conflict-panel"]').waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.waitForFunction( - (expected) => { - const panel = document.querySelector('[data-testid="mnote-editor-conflict-panel"]'); - return (panel?.textContent || "").includes(expected); - }, - `agent run ${dirtyRunId}`, - { timeout: UI_TIMEOUT_MS }, - ); - const envelope = await conflictEnvelope(page, dirtyDocumentId); - assert(envelope, "dirty AI 写入应生成冲突信封"); - assert("externalActor" in envelope, `冲突信封应包含 externalActor: ${JSON.stringify(envelope)}`); - assert("dirtyState" in envelope, `冲突信封应包含 dirtyState: ${JSON.stringify(envelope)}`); - assert("bufferFileVersion" in envelope, `冲突信封应包含 bufferFileVersion: ${JSON.stringify(envelope)}`); - await page.locator('[data-testid="mnote-conflict-open-diff"]').click({ timeout: UI_TIMEOUT_MS }); - await page.locator('[data-testid="mnote-conflict-diff-panel"]').waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); - await page.waitForFunction( - ({ localToken, aiToken }) => { - const panel = document.querySelector('[data-testid="mnote-conflict-diff-panel"]'); - const text = panel?.textContent || ""; - return text.includes(localToken) && text.includes(aiToken); - }, - { localToken: dirtyLocalToken, aiToken: dirtyMarker }, - { timeout: UI_TIMEOUT_MS }, - ); - const diffText = await page.locator('[data-testid="mnote-conflict-diff-panel"]').innerText({ timeout: UI_TIMEOUT_MS }); - assert(diffText.includes(dirtyLocalToken), `dirty diff 应包含本地未保存内容: ${diffText}`); - assert(diffText.includes(dirtyMarker), `dirty diff 应包含 AI 写盘内容: ${diffText}`); + assert(!captured.some((entry) => entry.kind === "run"), `dirty buffer 下 Page AI 不应发起 Hermes run: ${JSON.stringify(captured)}`); + const dirtyDiskText = fs.readFileSync(dirtyPath, "utf8"); + assert(!dirtyDiskText.includes(dirtyMarker), "dirty buffer 阻断后磁盘不应出现 AI 写入标记"); + const dirtyEditorState = await page.evaluate(() => { + const root = document.querySelector('[data-testid="mnote-leptos-tiptap-island-editor-root"]'); + const editor = document.querySelector('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror'); + const conflictPanel = document.querySelector('[data-testid="mnote-editor-conflict-panel"]'); + return { + status: root?.getAttribute("data-runtime-editor-status") || "", + text: editor?.textContent || "", + conflictVisible: Boolean(conflictPanel && conflictPanel.getClientRects().length > 0), + }; + }); + assert(dirtyEditorState.text.includes(dirtyLocalToken), `dirty buffer 阻断后本地未保存内容应仍在编辑器中: ${JSON.stringify(dirtyEditorState)}`); + assert.equal(dirtyEditorState.conflictVisible, false, `dirty buffer 阻断不应生成冲突面板: ${JSON.stringify(dirtyEditorState)}`); const dirtyAggregate = await fetchPageAggregate(page, dirtyDocumentId, rootUri); assert( - JSON.stringify(dirtyAggregate.payload || {}).includes(dirtyMarker), - `dirty Page Aggregate 应读回 AI 写入标记: ${JSON.stringify(dirtyAggregate)}`, + !JSON.stringify(dirtyAggregate.payload || {}).includes(dirtyMarker), + `dirty buffer 阻断后 Page Aggregate 不应读回 AI 写入标记: ${JSON.stringify(dirtyAggregate)}`, ); - const dirtyRunBody = JSON.parse(captured.find((entry) => entry.kind === "run")?.body || "{}"); - assert.equal(dirtyRunBody.documentId, dirtyDocumentId, `dirty Hermes run 应携带 local documentId: ${JSON.stringify(dirtyRunBody)}`); - assert.equal(dirtyRunBody.sourceKind, "local_folder", `dirty Hermes run 应携带 local_folder sourceKind: ${JSON.stringify(dirtyRunBody)}`); - assert.equal(dirtyRunBody.rootUri, rootUri, `dirty Hermes run 应携带 rootUri: ${JSON.stringify(dirtyRunBody)}`); const result = { ok: true, @@ -409,8 +462,8 @@ async function main() { dirtyDocumentId, dirtyRunId, dirtyMarker, - dirtyConflictStatus: "external-change-conflict", - dirtyEnvelope: envelope, + dirtyBlocked: true, + dirtyEditorStatus: dirtyEditorState.status, capturedKinds: cleanCapturedKinds, dirtyCapturedKinds: captured.map((entry) => entry.kind), resultPath: RESULT_PATH, diff --git a/scripts/task457-main-editor-resource-tab-smoke.js b/scripts/task457-main-editor-resource-tab-smoke.js index 1b5be85b..b683c9b5 100644 --- a/scripts/task457-main-editor-resource-tab-smoke.js +++ b/scripts/task457-main-editor-resource-tab-smoke.js @@ -64,6 +64,7 @@ async function uploadLocalAsset(page, root, documentId, fileName, mimeType, byte const form = new FormData(); form.append("rootUri", rootUri); form.append("documentId", documentId); + form.append("uploadIntent", "editor.markdown.attach"); form.append("kind", kind); form.append("file", new File([new Uint8Array(bytes)], fileName, { type: mimeType })); const response = await fetch("/api/local-folder/assets/upload", { method: "POST", body: form }); @@ -169,6 +170,16 @@ async function main() { assert(!/\b(description|article|notes)\b/i.test(markdownTabState.resourceText), `Markdown tab 不应显示 Material Symbols 文本: ${JSON.stringify(markdownTabState)}`); assert.equal(markdownTabState.badgeKind, "code", `Markdown tab 应使用黑色 code 色块: ${JSON.stringify(markdownTabState)}`); assert(markdownTabState.badgeColor === "rgb(17, 17, 17)", `Markdown tab 色块应为黑色: ${JSON.stringify(markdownTabState)}`); + const openEditorsSnapshot = await page.evaluate(() => window.__mnoteOpenEditorsSnapshot || null); + assert.equal(openEditorsSnapshot?.schema, "mnote.open_editors_snapshot.v1", `应输出 open editors snapshot: ${JSON.stringify(openEditorsSnapshot)}`); + assert(openEditorsSnapshot.groups?.primary, `snapshot 应包含 primary group: ${JSON.stringify(openEditorsSnapshot)}`); + assert(openEditorsSnapshot.groups?.secondary, `snapshot 应包含 secondary group: ${JSON.stringify(openEditorsSnapshot)}`); + assert(openEditorsSnapshot.activeObjectIdentity.includes("resource-note.md"), `全局 active 应优先 primary active resource，而不是 secondary page: ${JSON.stringify(openEditorsSnapshot)}`); + assert(openEditorsSnapshot.groups.primary.activeObjectIdentity.includes("resource-note.md"), `primary group active 应指向 markdown resource: ${JSON.stringify(openEditorsSnapshot.groups.primary)}`); + assert(openEditorsSnapshot.groups.primary.resourceEditors.some((entry) => entry.paneRole === "primary" && entry.kind === "markdown" && entry.preview === false && entry.pinned === false), `primary resource editor 应包含轻量 editor 字段: ${JSON.stringify(openEditorsSnapshot.groups.primary)}`); + assert(openEditorsSnapshot.groups.primary.editors.some((entry) => entry.kind === "page" && entry.pinned === true), `primary group 应包含 pinned page editor: ${JSON.stringify(openEditorsSnapshot.groups.primary)}`); + assert(openEditorsSnapshot.groups.secondary.editors.some((entry) => entry.kind === "page" && entry.paneRole === "secondary"), `secondary group 应包含 secondary page editor: ${JSON.stringify(openEditorsSnapshot.groups.secondary)}`); + assert(openEditorsSnapshot.groups.secondary.editors.some((entry) => entry.kind === "page" && entry.documentId === localMdDocumentId(sideRelativePath) && entry.workspacePath?.relativePath === sideRelativePath), `secondary page editor 应保留自己的 documentId/workspacePath: ${JSON.stringify(openEditorsSnapshot.groups.secondary)}`); const editor = page.locator('.mnote-resource-tab-panel:not([hidden]) .editor-surface .ProseMirror[contenteditable="true"]').first(); await editor.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); await editor.click({ timeout: UI_TIMEOUT_MS }); @@ -213,14 +224,24 @@ async function main() { assert(!/\b(description|article|notes)\b/i.test(officeTabState.resourceText), `Office tab 不应显示 Material Symbols 文本: ${JSON.stringify(officeTabState)}`); assert.equal(officeTabState.badgeKind, "word", `docx tab 应使用 word 色块: ${JSON.stringify(officeTabState)}`); assert(officeTabState.badgeColor === "rgb(79, 125, 243)", `docx tab 色块应与附件 word 蓝色一致: ${JSON.stringify(officeTabState)}`); + const openEditorsSnapshotAfterOffice = await page.evaluate(() => window.__mnoteOpenEditorsSnapshot || null); + const activeOfficeEditor = openEditorsSnapshotAfterOffice?.groups?.primary?.resourceEditors?.find((entry) => entry.active && entry.kind === "office"); + assert(activeOfficeEditor, `打开 Office 后 snapshot 应把 office resource 标为 active: ${JSON.stringify(openEditorsSnapshotAfterOffice?.groups?.primary)}`); + assert.equal(activeOfficeEditor.documentId, documentId, `Office snapshot 应携带 documentId: ${JSON.stringify(activeOfficeEditor)}`); + assert(activeOfficeEditor.workspaceId, `Office snapshot 应携带 workspaceId: ${JSON.stringify(activeOfficeEditor)}`); + assert.equal(activeOfficeEditor.editorKind, "office", `Office snapshot 应携带 editorKind: ${JSON.stringify(activeOfficeEditor)}`); + assert(activeOfficeEditor.lastActiveAt > 0, `Office passive resource 激活后 lastActiveAt 应大于 0: ${JSON.stringify(activeOfficeEditor)}`); const officeFrameSrc = await page.locator('.mnote-resource-tab-panel:not([hidden]) iframe.mnote-resource-tab-frame').first().getAttribute("src", { timeout: UI_TIMEOUT_MS, }); assert(officeFrameSrc, "Office resource tab 应创建 iframe"); const officeFrameUrl = new URL(officeFrameSrc, BASE_URL); - assert(officeFrameUrl.pathname === "/onlyoffice", `Office resource tab iframe 应指向 /onlyoffice，实际为 ${officeFrameSrc}`); - assert(officeFrameUrl.searchParams.get("assetId") === officeAsset.id, "Office iframe URL 应携带当前资源 assetId"); - assert(officeFrameUrl.searchParams.get("mode") === "view", "Office resource tab iframe 应使用 view 模式"); + assert(officeFrameUrl.pathname === "/office-preview", `Office resource tab iframe 应指向 /office-preview 轻量预览，实际为 ${officeFrameSrc}`); + assert(officeFrameUrl.searchParams.get("assetId") === officeAsset.id, "Office preview URL 应携带当前资源 assetId"); + assert(officeFrameUrl.searchParams.get("documentId") === documentId, "Office preview URL 应携带当前 documentId"); + assert(officeFrameUrl.searchParams.get("fileName") === "resource-office.docx", "Office preview URL 应携带资源文件名"); + assert(officeFrameUrl.searchParams.get("fileType") === "docx", "Office preview URL 应携带 docx 类型"); + assert(officeFrameUrl.searchParams.get("fileUrl")?.includes("/api/local-folder/files/open"), "Office preview URL 应通过 local-folder file open 回源"); const [officePopup] = await Promise.all([ page.waitForEvent("popup", { timeout: UI_TIMEOUT_MS }), @@ -271,6 +292,31 @@ async function main() { if (markdownActiveState.resourceRows.includes(asset.id)) { assert.equal(markdownActiveState.activeRowAssetId, asset.id, `已渲染对应 filetree row 时应标记 data-active: ${JSON.stringify(markdownActiveState)}`); } + await page.reload({ waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); + await page.locator('.mnote-main-tab.is-active[data-mnote-tab-kind="markdown"]').waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); + await page.locator('.mnote-resource-tab-panel:not([hidden]) .editor-surface .ProseMirror[contenteditable="true"]').first().waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); + const restoredMarkdownState = await page.evaluate(() => { + const snapshot = window.__mnoteOpenEditorsSnapshot || null; + const active = snapshot?.groups?.primary?.resourceEditors?.find((entry) => entry.active && entry.kind === "markdown"); + return { + activeResource: new URL(window.location.href).searchParams.get("resourceTab") || "", + activeObjectIdentity: active?.objectIdentity || "", + path: active?.path || "", + workspacePath: active?.workspacePath || null, + editorText: document.querySelector('.mnote-resource-tab-panel:not([hidden]) .editor-surface .ProseMirror')?.textContent || "", + }; + }); + assert(restoredMarkdownState.activeResource.includes("resource-note.md"), `刷新后应保留 canonical resourceTab URL 状态: ${JSON.stringify(restoredMarkdownState)}`); + assert(restoredMarkdownState.activeObjectIdentity.includes("resource-note.md"), `刷新后应从 OpenEditorsSnapshot 恢复 active markdown resource: ${JSON.stringify(restoredMarkdownState)}`); + assert.equal(restoredMarkdownState.path, "README/resource-note.md", `刷新后 active resource snapshot 应保留 path: ${JSON.stringify(restoredMarkdownState)}`); + assert.equal(restoredMarkdownState.workspacePath?.relativePath, "README/resource-note.md", `刷新后 active resource 应带 workspacePath.relativePath: ${JSON.stringify(restoredMarkdownState)}`); + assert(restoredMarkdownState.editorText.includes("新增资源正文"), `刷新后 resource editor 应读回资源正文: ${JSON.stringify(restoredMarkdownState)}`); const mdCloseBtn = page.locator('.mnote-main-tab.is-active[data-mnote-tab-kind="markdown"] .mnote-main-tab-close'); await mdCloseBtn.click({ timeout: UI_TIMEOUT_MS }); diff --git a/scripts/task460-resource-tab-close-dirty-smoke.js b/scripts/task460-resource-tab-close-dirty-smoke.js index e17b865d..3fe752f1 100644 --- a/scripts/task460-resource-tab-close-dirty-smoke.js +++ b/scripts/task460-resource-tab-close-dirty-smoke.js @@ -59,6 +59,7 @@ async function uploadLocalAsset(page, root, documentId, fileName, mimeType, byte const form = new FormData(); form.append("rootUri", rootUri); form.append("documentId", documentId); + form.append("uploadIntent", "editor.markdown.attach"); form.append("kind", kind); form.append("file", new File([new Uint8Array(bytes)], fileName, { type: mimeType })); const response = await fetch("/api/local-folder/assets/upload", { method: "POST", body: form }); @@ -173,7 +174,7 @@ async function main() { await page.waitForTimeout(100); // 尝试关闭 dirty 的 resource tab — 应被阻止 - const closeBtn = page.locator('.mnote-main-tab.is-active .mnote-main-tab-close'); + const closeBtn = page.locator('.mnote-main-tab.is-active[data-pane-role="primary"] .mnote-main-tab-close:not([data-mnote-pane-close])'); await closeBtn.click({ timeout: UI_TIMEOUT_MS }); await page.waitForTimeout(300); diff --git a/scripts/task476-filetree-editor-context-menu-download-smoke.js b/scripts/task476-filetree-editor-context-menu-download-smoke.js index ad2ea47d..5ed7aa71 100644 --- a/scripts/task476-filetree-editor-context-menu-download-smoke.js +++ b/scripts/task476-filetree-editor-context-menu-download-smoke.js @@ -84,6 +84,20 @@ async function waitForFileExists(filePath, timeoutMs) { assert(fs.existsSync(filePath), `等待文件出现失败: ${filePath}`); } +async function expandFileTreeFolder(page, title) { + const folderRow = page.locator('#sidebar-file-tree-root .tree-row[data-row-kind="folder"]', { hasText: title }).first(); + await folderRow.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); + const expanded = await folderRow.getAttribute("aria-expanded"); + if (expanded !== "true") { + const toggle = folderRow.locator('[data-rust-action="toggle"]').first(); + if (await toggle.count()) { + await toggle.click({ timeout: UI_TIMEOUT_MS }); + } else { + await folderRow.click({ timeout: UI_TIMEOUT_MS }); + } + } +} + function suggestedFilenames(downloads, startIndex) { return downloads.slice(startIndex).map((download) => download.suggestedFilename()).sort(); } @@ -145,6 +159,7 @@ async function main() { }).catch(() => undefined); const editorReady = await editorSurface.isVisible().catch(() => false); + await expandFileTreeFolder(page, "README"); const assetRow = page.locator('[data-testid="filetree-asset-row"]', { hasText: "report-a.pdf" }).first(); await assetRow.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); await assetRow.click({ button: "right", timeout: UI_TIMEOUT_MS }); diff --git a/scripts/task479-local-folder-markdown-resource-lifecycle-smoke.js b/scripts/task479-local-folder-markdown-resource-lifecycle-smoke.js index 4bff21ee..0a8f3285 100644 --- a/scripts/task479-local-folder-markdown-resource-lifecycle-smoke.js +++ b/scripts/task479-local-folder-markdown-resource-lifecycle-smoke.js @@ -521,7 +521,16 @@ async function main() { assert(fs.existsSync(assetPath), "测试前置条件：附件文件应存在"); fs.unlinkSync(assetPath); await page.waitForFunction( - () => { + async () => { + const now = Date.now(); + if ( + typeof window.__mnoteRefreshEditorLocalAttachmentExistence === "function" + && (!window.__mnoteTask479LastAttachmentRefreshAt || now - window.__mnoteTask479LastAttachmentRefreshAt > 500) + ) { + window.__mnoteTask479LastAttachmentRefreshAt = now; + window.__mnoteRefreshEditorLocalAttachmentExistence(); + await new Promise((resolve) => setTimeout(resolve, 250)); + } const link = Array.from(document.querySelectorAll('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror a[href*="/api/local-folder/files/open"]')) .find((node) => (node.textContent || "").includes("resource-note.md")); return link instanceof HTMLAnchorElement && link.getAttribute("data-mnote-attachment-missing") === "true"; @@ -560,12 +569,16 @@ async function main() { // 预期行为：链接应保留 const linkPreserved = linkTextAfter.includes("resource-note.md"); const popupCountBefore = popups.length; - const brokenLink = page - .locator('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror a', { - hasText: "resource-note.md", - }) - .first(); - await brokenLink.click({ timeout: UI_TIMEOUT_MS }); + await page.evaluate(() => { + const brokenLink = Array.from(document.querySelectorAll('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror a')) + .find((node) => node instanceof HTMLAnchorElement && (node.textContent || "").includes("resource-note.md")); + if (!(brokenLink instanceof HTMLAnchorElement)) throw new Error("broken_link_missing"); + brokenLink.dispatchEvent(new MouseEvent("click", { + bubbles: true, + cancelable: true, + view: window, + })); + }); await page.waitForTimeout(1500); const popupCountAfter = popups.length; const resourceTabErrorVisible = await page @@ -602,10 +615,36 @@ async function main() { } } catch (err) { overallOk = false; + const debugState = await page.evaluate(async () => { + const collectLinks = () => Array.from(document.querySelectorAll('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror a')) + .map((node) => ({ + text: node.textContent || "", + href: node instanceof HTMLAnchorElement ? node.getAttribute("href") || "" : "", + missing: node instanceof HTMLElement ? node.getAttribute("data-mnote-attachment-missing") : "", + className: node instanceof HTMLElement ? node.getAttribute("class") || "" : "", + })); + const beforeManualRefresh = collectLinks(); + if (typeof window.__mnoteRefreshEditorLocalAttachmentExistence === "function") { + window.__mnoteRefreshEditorLocalAttachmentExistence(); + await new Promise((resolve) => setTimeout(resolve, 1500)); + } + const pane = document.querySelector('.document-pane[data-pane-role="primary"]'); + const editor = pane?.querySelector('.editor-surface .ProseMirror'); + return { + url: window.location.href, + hasManualRefresh: typeof window.__mnoteRefreshEditorLocalAttachmentExistence, + status: pane?.querySelector('[data-runtime-editor-status]')?.getAttribute("data-runtime-editor-status") || "", + conflictVisible: Boolean(pane?.querySelector('[data-testid="mnote-editor-conflict-panel"]')), + editorText: editor instanceof HTMLElement ? (editor.textContent || "").slice(0, 500) : "", + beforeManualRefresh, + afterManualRefresh: collectLinks(), + }; + }).catch((debugErr) => ({ debugError: debugErr.message })); checks[checkId] = { ok: false, message: `删除真实附件后正文链接保留检查失败: ${err.message}`, error: err.stack, + debugState, }; } } diff --git a/scripts/task492-sidebar-starred-shortcuts-smoke.js b/scripts/task492-sidebar-starred-shortcuts-smoke.js index 6c0f16fc..2b104859 100644 --- a/scripts/task492-sidebar-starred-shortcuts-smoke.js +++ b/scripts/task492-sidebar-starred-shortcuts-smoke.js @@ -87,8 +87,6 @@ async function main() { MNOTE_WEB_ENABLE_LEGACY_NEXT_COMPAT: "0", MNOTE_CONTROL_PLANE_DB_PATH: dbPath, MNOTE_LOCAL_WORKSPACE_BASE_DIR: dataRoot, - CONVEX_SELF_HOSTED_URL: "http://127.0.0.1:9", - NEXT_PUBLIC_CONVEX_URL: "http://127.0.0.1:9", }, stdio: ["ignore", "pipe", "pipe"], }); diff --git a/scripts/task493-page-settings-sqlite-preferences-smoke.js b/scripts/task493-page-settings-sqlite-preferences-smoke.js index af6811c2..42a5f212 100644 --- a/scripts/task493-page-settings-sqlite-preferences-smoke.js +++ b/scripts/task493-page-settings-sqlite-preferences-smoke.js @@ -122,8 +122,6 @@ async function main() { MNOTE_WEB_PUBLIC_BIND: `127.0.0.1:${port}`, MNOTE_WEB_ENABLE_LEGACY_NEXT_COMPAT: "0", MNOTE_LOCAL_ACCESS_POLICY_FILE: policyFile, - CONVEX_SELF_HOSTED_URL: "http://127.0.0.1:9", - NEXT_PUBLIC_CONVEX_URL: "http://127.0.0.1:9", }, stdio: ["ignore", "pipe", "pipe"], }); @@ -173,6 +171,9 @@ async function main() { showHeadingNumbers: true, wideLayout: true, pageFont: "song", + "pageWidth.markdown": { mode: "wide", custom: null }, + "pageWidth.word": { mode: "wide", custom: null }, + "pageWidth.excel": { mode: "full", custom: null }, }, }, }); @@ -187,10 +188,35 @@ async function main() { assert.equal(sameUserEffective.pageOptions.showHeadingNumbers, true, "同用户第二浏览器应读到标题编号偏好"); assert.equal(sameUserEffective.pageOptions.wideLayout, true, "同用户第二浏览器应读到页面宽度偏好"); assert.equal(sameUserEffective.pageOptions.pageFont, "song", "同用户第二浏览器应读到页面字体偏好"); + assert.equal(sameUserEffective.pageWidthPreferences.markdown.mode, "wide", "同用户第二浏览器应读到 Markdown 宽度偏好"); + assert.equal(sameUserEffective.pageWidthPreferences.markdown.source, "global", "页面宽度偏好应存为全局 scope"); + assert.equal(sameUserEffective.pageWidthPreferences.excel.mode, "full", "同用户第二浏览器应读到 Excel 宽度偏好"); + + const documentPage = await secondContext.newPage(); + const documentUrl = new URL(`/documents/${encodeURIComponent(documentId)}`, baseUrl); + documentUrl.searchParams.set("sourceKind", "local_folder"); + documentUrl.searchParams.set("rootUri", rootUri); + await documentPage.goto(documentUrl.toString(), { waitUntil: "domcontentloaded", timeout: TIMEOUT_MS }); + await documentPage.waitForSelector('.document-shell[data-page-width-resolved-mode="wide"]', { timeout: TIMEOUT_MS }); + const shellWidthState = await documentPage.evaluate(() => { + const shell = document.querySelector(".document-shell"); + if (!(shell instanceof HTMLElement)) return null; + return { + mode: shell.getAttribute("data-page-width-resolved-mode"), + source: shell.getAttribute("data-page-width-source"), + maxWidth: getComputedStyle(shell).maxWidth, + }; + }); + assert(shellWidthState, "文档页应渲染 document-shell"); + assert.equal(shellWidthState.mode, "wide", "Markdown 文档页应消费全局 Markdown 宽度偏好"); + assert.equal(shellWidthState.source, "global", "Markdown 文档页宽度来源应为 global"); + assert.equal(shellWidthState.maxWidth, "1180px", "Markdown 文档页宽版 max-width 应为 1180px"); + await documentPage.close(); const otherUserEffective = await effectivePreferences(otherContext.request, baseUrl, documentId, rootUri); assert.equal(otherUserEffective.pageOptions.hideTitleHeader, true, "不同用户不应串读 source family 偏好"); assert.equal(otherUserEffective.pageOptions.showHeadingNumbers, false, "不同用户不应串读 global 偏好"); + assert.equal(otherUserEffective.pageWidthPreferences.markdown.mode, "readable", "不同用户不应串读 Markdown 宽度偏好"); console.log("task493 page settings sqlite preferences smoke passed"); } finally { diff --git a/scripts/task494-filetree-lazy-loading-dedup-smoke.js b/scripts/task494-filetree-lazy-loading-dedup-smoke.js index 0e082e3c..2b8871f4 100644 --- a/scripts/task494-filetree-lazy-loading-dedup-smoke.js +++ b/scripts/task494-filetree-lazy-loading-dedup-smoke.js @@ -92,8 +92,6 @@ async function main() { MNOTE_WEB_ENABLE_LEGACY_NEXT_COMPAT: "0", MNOTE_CONTROL_PLANE_DB_PATH: dbPath, MNOTE_LOCAL_WORKSPACE_BASE_DIR: dataRoot, - CONVEX_SELF_HOSTED_URL: "http://127.0.0.1:9", - NEXT_PUBLIC_CONVEX_URL: "http://127.0.0.1:9", }, stdio: ["ignore", "pipe", "pipe"], }); diff --git a/scripts/task495-filetree-copy-id-absolute-path-smoke.js b/scripts/task495-filetree-copy-id-absolute-path-smoke.js index 526b7869..31e30fd5 100644 --- a/scripts/task495-filetree-copy-id-absolute-path-smoke.js +++ b/scripts/task495-filetree-copy-id-absolute-path-smoke.js @@ -9,6 +9,14 @@ const RUNTIME_PATH = path.join( REPO_ROOT, "rust/crates/mnote-web/browser/sidebar-filetree-command-runtime.js", ); +const FILETREE_RUNTIME_PATH = path.join( + REPO_ROOT, + "rust/crates/mnote-web/browser/filetree-runtime.js", +); +const FILETREE_CONTEXT_MENU_RUNTIME_PATH = path.join( + REPO_ROOT, + "rust/crates/mnote-web/browser/filetree-context-menu-runtime.js", +); function loadRuntimeFactory() { const source = fs @@ -64,6 +72,9 @@ function loadRuntimeFactory() { }; context.globalThis = context; vm.createContext(context); + vm.runInContext(fs.readFileSync(FILETREE_CONTEXT_MENU_RUNTIME_PATH, "utf8"), context, { + filename: FILETREE_CONTEXT_MENU_RUNTIME_PATH, + }); vm.runInContext( `${source}\nglobalThis.__factory = createSidebarFileTreeCommandRuntime;`, context, @@ -72,6 +83,23 @@ function loadRuntimeFactory() { return context; } +function loadFileTreeRuntime() { + const context = { + console, + HTMLElement: class HTMLElement {}, + document: {}, + window: {}, + URL, + }; + context.globalThis = context; + context.window = context; + vm.createContext(context); + vm.runInContext(fs.readFileSync(FILETREE_RUNTIME_PATH, "utf8"), context, { + filename: FILETREE_RUNTIME_PATH, + }); + return context; +} + async function runCopyId(runtime, context, detail) { context.__clipboardText = ""; runtime.handleTreeContextMenuAction("copy-id", detail, null); @@ -80,10 +108,151 @@ async function runCopyId(runtime, context, detail) { } async function main() { + const fileTreeContext = loadFileTreeRuntime(); + class FakeRow extends fileTreeContext.HTMLElement { + constructor(attrs, textContent = "") { + super(); + this.attrs = attrs; + this.textContent = textContent; + } + getAttribute(name) { + return this.attrs[name] || ""; + } + querySelector() { + return null; + } + } + const readWorkspacePath = (attrs, textContent = "") => + fileTreeContext.window.__mnoteFileTreeRuntime.readWorkspacePathFromRow( + new FakeRow(attrs, textContent), + { + currentSourceKind: () => attrs.__sourceKind || "local_folder", + currentRootUri: () => attrs.__rootUri || "file:///mnt/Data1T/mnote", + resolveWorkspaceId: () => "local-folder", + rowTitle: (row) => row.textContent, + }, + ); + const workspacePath = readWorkspacePath({ + "data-row-id": "local:asset:assets/report.pdf", + "data-row-kind": "asset", + "data-document-id": "local-md:README.md", + "data-asset-id": "local-file:assets/report.pdf", + "data-local-relative-path": "assets/report.pdf", + "data-object-identity": JSON.stringify({ + objectKind: "attachment", + documentId: "local-md:README.md", + assetId: "local-file:assets/report.pdf", + }), + }, "report.pdf"); + assert.equal(workspacePath.schema, "mnote.workspace_path.v1"); + assert.equal(workspacePath.workspaceId, "local-folder"); + assert.equal(workspacePath.sourceKind, "local_folder"); + assert.equal(workspacePath.rootUri, "file:///mnt/Data1T/mnote"); + assert.equal(workspacePath.relativePath, "assets/report.pdf"); + assert.equal(workspacePath.documentId, "local-md:README.md"); + assert.equal(workspacePath.assetId, "local-file:assets/report.pdf"); + assert.equal(workspacePath.objectKind, "attachment"); + assert.equal(workspacePath.resourceKind, "attachment"); + assert.equal(workspacePath.objectIdentity.assetId, "local-file:assets/report.pdf"); + + const markdownWorkspacePath = readWorkspacePath({ + "data-row-id": "local:markdown:docs/Page.md", + "data-row-kind": "markdown", + "data-document-id": "local-md:docs~2FPage.md", + "data-local-relative-path": "docs/Page.md", + "data-object-identity": JSON.stringify({ + objectKind: "page", + documentId: "local-md:docs~2FPage.md", + assetId: null, + }), + }, "Page.md"); + assert.equal(markdownWorkspacePath.relativePath, "docs/Page.md"); + assert.equal(markdownWorkspacePath.objectKind, "page"); + assert.equal(markdownWorkspacePath.isLocalFolder, true); + + const folderWorkspacePath = readWorkspacePath({ + "data-row-id": "local:folder:docs", + "data-row-kind": "folder", + "data-document-id": "local-dir:docs", + "data-local-relative-path": "docs", + "data-object-identity": JSON.stringify({ + objectKind: "index", + documentId: "local-dir:docs", + assetId: null, + }), + }, "docs"); + assert.equal(folderWorkspacePath.relativePath, "docs"); + assert.equal(folderWorkspacePath.objectKind, "index"); + + const mindmapWorkspacePath = readWorkspacePath({ + "data-row-id": "local:asset:Page/思维导图.json", + "data-row-kind": "asset", + "data-asset-id": "local-file:Page/思维导图.json", + "data-local-relative-path": "Page/思维导图.json", + "data-object-identity": JSON.stringify({ + objectKind: "mindmap", + documentId: "local-md:Page~2FPage.md", + assetId: "local-file:Page/思维导图.json", + }), + }, "思维导图.json"); + assert.equal(mindmapWorkspacePath.objectKind, "mindmap"); + assert.equal(mindmapWorkspacePath.objectIdentity.assetId, "local-file:Page/思维导图.json"); + + const officeWorkspacePath = readWorkspacePath({ + "data-row-id": "local:asset:Page/report.docx", + "data-row-kind": "asset", + "data-asset-id": "local-file:Page/report.docx", + "data-local-relative-path": "Page/report.docx", + "data-object-identity": JSON.stringify({ + objectKind: "only_office", + documentId: "local-md:Page~2FPage.md", + assetId: "local-file:Page/report.docx", + }), + }, "report.docx"); + assert.equal(officeWorkspacePath.objectKind, "only_office"); + assert.equal(officeWorkspacePath.objectIdentity.assetId, "local-file:Page/report.docx"); + + const nonLocalWorkspacePath = readWorkspacePath({ + __sourceKind: "cloud", + __rootUri: "", + "data-row-id": "doc:cloud-page", + "data-row-kind": "document", + "data-document-id": "local-cloud-compatible-id", + "data-object-identity": JSON.stringify({ + objectKind: "page", + documentId: "local-cloud-compatible-id", + assetId: null, + }), + }, "cloud"); + assert.equal(nonLocalWorkspacePath.isLocalFolder, false, "sourceKind 非 local_folder 时不应仅因 local-* documentId 误判成本地文件夹"); + const context = loadRuntimeFactory(); + class FakeCommandBadge extends context.HTMLElement { + constructor(kind) { + super(); + this.kind = kind; + } + getAttribute(name) { + return name === "data-kind" ? this.kind : ""; + } + } + class FakeCommandRow extends context.HTMLElement { + constructor(attrs, textContent = "", badgeKind = "") { + super(); + this.attrs = attrs; + this.textContent = textContent; + this.badge = badgeKind ? new FakeCommandBadge(badgeKind) : null; + } + getAttribute(name) { + return this.attrs[name] || ""; + } + querySelector(selector) { + return selector === ".tree-kind-badge" ? this.badge : null; + } + } const runtime = context.__factory({ - currentRootUri: () => "file:///mnt/Data1T/mnote", currentSourceKind: () => "local_folder", + currentRootUri: () => "file:///mnt/Data1T/mnote", cssEscape: (value) => String(value).replace(/"/g, '\\"'), fileTreeRuntimeFunction: () => null, localFilePathFromAssetId: (assetId) => @@ -92,6 +261,139 @@ async function main() { runtimeState: { activeTreeContextMenu: null }, selectedSidebarFileTreeSelection: { selectedRowIds: new Set(), focusedRowId: null }, }); + assert.equal( + runtime.classifySidebarFileTreeAsset(new FakeCommandRow({}, "legacy.luckysheet", "luckysheet")), + "table", + "legacy luckysheet 行仍应归为 table 资源", + ); + const dirtyCommandRow = new FakeCommandRow({ + "data-row-id": "local:markdown:docs/Page.md", + "data-row-kind": "markdown", + "data-document-id": "local-md:docs~2FPage.md", + "data-local-relative-path": "docs/Page.md", + }, "Page.md"); + const commandContextRuntime = context.window.__mnoteFileTreeContextMenuRuntime; + const dirtyContext = commandContextRuntime.buildFileTreeCommandContext( + dirtyCommandRow, + { + schema: "mnote.open_editors_snapshot.v1", + editors: [ + { + documentId: "local-md:docs~2FPage.md", + dirtyState: "dirty", + workspacePath: { relativePath: "docs/Page.md" }, + }, + ], + }, + null, + { + currentSourceKind: () => "local_folder", + workspaceReadonly: () => false, + selection: { selectedRowIds: new Set(["local:markdown:docs/Page.md"]) }, + queryRowById: () => dirtyCommandRow, + }, + ); + assert.equal(dirtyContext["workspace.sourceKind"], "local_folder"); + assert.equal(dirtyContext["tree.selectionCount"], 1); + assert.equal(dirtyContext["tree.selectionResourceKind"], "page"); + assert.equal(dirtyContext["tree.targetResourceKind"], "page"); + assert.equal(dirtyContext["editor.dirty"], true); + assert.equal(dirtyContext["editor.dirtyState"], "dirty"); + assert.equal(dirtyContext["ai.canWrite"], false); + assert.equal( + commandContextRuntime.evaluateSidebarFileTreeWhen(dirtyContext, "!workspace.readonly && !editor.dirty"), + false, + "dirty 目标下菜单与快捷键写操作应被统一 command context 禁用", + ); + const readonlyContext = commandContextRuntime.buildFileTreeCommandContext( + dirtyCommandRow, + { editors: [] }, + null, + { + currentSourceKind: () => "local_folder", + workspaceReadonly: () => true, + selection: { selectedRowIds: new Set(["local:markdown:docs/Page.md"]) }, + queryRowById: () => dirtyCommandRow, + }, + ); + assert.equal(readonlyContext["workspace.readonly"], true); + assert.equal( + commandContextRuntime.evaluateSidebarFileTreeWhen(readonlyContext, "!workspace.readonly"), + false, + "readonly 目标下菜单与快捷键写操作应被统一 command context 禁用", + ); + const cleanTargetRow = new FakeCommandRow({ + "data-row-id": "local:markdown:docs/Clean.md", + "data-row-kind": "markdown", + "data-document-id": "local-md:docs~2FClean.md", + "data-local-relative-path": "docs/Clean.md", + }, "Clean.md"); + const selectedRows = new Map([ + ["local:markdown:docs/Clean.md", cleanTargetRow], + ["local:markdown:docs/Page.md", dirtyCommandRow], + ]); + const multiSelectDirtyContext = commandContextRuntime.buildFileTreeCommandContext( + cleanTargetRow, + { + editors: [ + { + documentId: "local-md:docs~2FPage.md", + dirtyState: "Dirty", + workspacePath: { relativePath: "docs/Page.md" }, + }, + ], + }, + null, + { + currentSourceKind: () => "local_folder", + workspaceReadonly: () => false, + selection: { selectedRowIds: new Set(["local:markdown:docs/Clean.md", "local:markdown:docs/Page.md"]) }, + queryRowById: (rowId) => selectedRows.get(rowId), + }, + ); + assert.equal(multiSelectDirtyContext["tree.selectionCount"], 2); + assert.equal(multiSelectDirtyContext["tree.selectionResourceKind"], "page"); + assert.equal(multiSelectDirtyContext["editor.dirty"], true); + assert.equal(multiSelectDirtyContext["editor.dirtyState"], "dirty"); + assert.equal( + commandContextRuntime.evaluateSidebarFileTreeWhen(multiSelectDirtyContext, "!workspace.readonly && !editor.dirty"), + false, + "多选中任一非 target 行 dirty 时，菜单与快捷键写操作也必须禁用", + ); + const dirtyAssetRow = new FakeCommandRow({ + "data-row-id": "local:asset:assets/report.pdf", + "data-row-kind": "asset", + "data-asset-id": "local-file:assets/report.pdf", + "data-local-relative-path": "assets/report.pdf", + }, "report.pdf"); + const dirtyAssetContext = commandContextRuntime.buildFileTreeCommandContext( + dirtyAssetRow, + { + resourceEditors: [ + { + assetId: "local-file:assets/report.pdf", + dirtyState: "ExternalModified", + workspacePath: { relativePath: "assets/report.pdf", assetId: "local-file:assets/report.pdf" }, + }, + ], + }, + null, + { + currentSourceKind: () => "local_folder", + workspaceReadonly: () => false, + selection: { selectedRowIds: new Set(["local:asset:assets/report.pdf"]) }, + queryRowById: () => dirtyAssetRow, + }, + ); + assert.equal(dirtyAssetContext["tree.selectionResourceKind"], "asset"); + assert.equal(dirtyAssetContext["tree.targetIsAsset"], true); + assert.equal(dirtyAssetContext["editor.dirty"], true); + assert.equal(dirtyAssetContext["editor.dirtyState"], "external_modified"); + assert.equal( + commandContextRuntime.evaluateSidebarFileTreeWhen(dirtyAssetContext, "!workspace.readonly && !editor.dirty"), + false, + "dirty resource tab 对应 asset 的 rename/delete 也必须禁用", + ); assert.equal( await runCopyId(runtime, context, { @@ -99,6 +401,7 @@ async function main() { rowKind: "folder", documentId: "local-dir:docs", rowId: "local:folder:docs", + workspacePath: folderWorkspacePath, title: "docs", }), "/mnt/Data1T/mnote/docs", @@ -111,6 +414,7 @@ async function main() { rowKind: "markdown", documentId: "local-md:docs~2FPage.md", rowId: "local:markdown:docs~2FPage.md", + workspacePath: markdownWorkspacePath, title: "Page", }), "/mnt/Data1T/mnote/docs/Page.md", @@ -121,8 +425,9 @@ async function main() { await runCopyId(runtime, context, { contextKind: "filetree", rowKind: "asset", - assetId: "local-file:assets~2Freport.pdf", - rowId: "local:asset:assets~2Freport.pdf", + assetId: "local-file:assets/report.pdf", + rowId: "local:asset:assets/report.pdf", + workspacePath, title: "report.pdf", }), "/mnt/Data1T/mnote/assets/report.pdf", diff --git a/scripts/task496-editor-open-parallel-runtime-aggregate-smoke.js b/scripts/task496-editor-open-parallel-runtime-aggregate-smoke.js index 4699c58d..71b39512 100644 --- a/scripts/task496-editor-open-parallel-runtime-aggregate-smoke.js +++ b/scripts/task496-editor-open-parallel-runtime-aggregate-smoke.js @@ -87,8 +87,6 @@ async function main() { MNOTE_WEB_ENABLE_LEGACY_NEXT_COMPAT: "0", MNOTE_CONTROL_PLANE_DB_PATH: dbPath, MNOTE_LOCAL_WORKSPACE_BASE_DIR: dataRoot, - CONVEX_SELF_HOSTED_URL: "http://127.0.0.1:9", - NEXT_PUBLIC_CONVEX_URL: "http://127.0.0.1:9", }, stdio: ["ignore", "pipe", "pipe"], }); diff --git a/scripts/task497-local-page-tree-filetree-open-performance-smoke.js b/scripts/task497-local-page-tree-filetree-open-performance-smoke.js index aa927ea0..75d8044d 100644 --- a/scripts/task497-local-page-tree-filetree-open-performance-smoke.js +++ b/scripts/task497-local-page-tree-filetree-open-performance-smoke.js @@ -163,8 +163,6 @@ async function main() { MNOTE_WEB_ENABLE_LEGACY_NEXT_COMPAT: "0", MNOTE_CONTROL_PLANE_DB_PATH: dbPath, MNOTE_LOCAL_WORKSPACE_BASE_DIR: dataRoot, - CONVEX_SELF_HOSTED_URL: "http://127.0.0.1:9", - NEXT_PUBLIC_CONVEX_URL: "http://127.0.0.1:9", }, stdio: ["ignore", "pipe", "pipe"], }); diff --git a/scripts/task498-starred-page-tree-scope-and-local-edit-smoke.js b/scripts/task498-starred-page-tree-scope-and-local-edit-smoke.js index 533a32cd..73d7310e 100644 --- a/scripts/task498-starred-page-tree-scope-and-local-edit-smoke.js +++ b/scripts/task498-starred-page-tree-scope-and-local-edit-smoke.js @@ -166,8 +166,6 @@ async function main() { MNOTE_WEB_ENABLE_LEGACY_NEXT_COMPAT: "0", MNOTE_CONTROL_PLANE_DB_PATH: dbPath, MNOTE_LOCAL_WORKSPACE_BASE_DIR: dataRoot, - CONVEX_SELF_HOSTED_URL: "http://127.0.0.1:9", - NEXT_PUBLIC_CONVEX_URL: "http://127.0.0.1:9", }, stdio: ["ignore", "pipe", "pipe"], }); diff --git a/scripts/task499-sidebar-tree-view-state-smoke.js b/scripts/task499-sidebar-tree-view-state-smoke.js index 7651b908..9383319b 100644 --- a/scripts/task499-sidebar-tree-view-state-smoke.js +++ b/scripts/task499-sidebar-tree-view-state-smoke.js @@ -190,8 +190,6 @@ async function main() { MNOTE_WEB_ENABLE_LEGACY_NEXT_COMPAT: "0", MNOTE_CONTROL_PLANE_DB_PATH: dbPath, MNOTE_LOCAL_WORKSPACE_BASE_DIR: dataRoot, - CONVEX_SELF_HOSTED_URL: "http://127.0.0.1:9", - NEXT_PUBLIC_CONVEX_URL: "http://127.0.0.1:9", }, stdio: ["ignore", "pipe", "pipe"], }); diff --git a/scripts/task500-navigation-page-route-guard-smoke.js b/scripts/task500-navigation-page-route-guard-smoke.js new file mode 100644 index 00000000..46c09677 --- /dev/null +++ b/scripts/task500-navigation-page-route-guard-smoke.js @@ -0,0 +1,274 @@ +#!/usr/bin/env node +"use strict"; + +const assert = require("node:assert/strict"); +const fs = require("node:fs"); +const http = require("node:http"); +const net = require("node:net"); +const os = require("node:os"); +const path = require("node:path"); +const { spawn } = require("node:child_process"); +const { chromium } = require("playwright"); + +const TASK = "task500-navigation-page-route-guard-smoke"; +const UI_TIMEOUT_MS = Number(process.env.MNOTE_SMOKE_UI_TIMEOUT_MS || 45_000); +const TEST_PASSWORD = process.env.MNOTE_E2E_PASSWORD || ["Mnote", "E2E", "123!"].join(""); + +function resolveChromiumExecutablePath() { + const explicit = process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH || ""; + if (explicit && fs.existsSync(explicit)) return explicit; + return [ + "/usr/bin/google-chrome-stable", + "/usr/bin/google-chrome", + "/snap/bin/chromium", + "/usr/bin/chromium", + "/usr/bin/chromium-browser", + ].find((candidate) => fs.existsSync(candidate)) || ""; +} + +function pickPort() { + return new Promise((resolve, reject) => { + const server = net.createServer(); + server.listen(0, "127.0.0.1", () => { + const address = server.address(); + const port = address && typeof address === "object" ? address.port : 0; + server.close(() => resolve(port)); + }); + server.on("error", reject); + }); +} + +function waitForHttpOk(url, timeoutMs) { + const deadline = Date.now() + timeoutMs; + return new Promise((resolve, reject) => { + const tick = () => { + const request = http.get(url, (response) => { + response.resume(); + if (response.statusCode >= 200 && response.statusCode < 500) { + resolve(); + return; + } + retry(); + }); + request.on("error", retry); + request.setTimeout(1000, () => { + request.destroy(); + retry(); + }); + }; + const retry = () => { + if (Date.now() > deadline) { + reject(new Error(`server_not_ready: ${url}`)); + return; + } + setTimeout(tick, 250); + }; + tick(); + }); +} + +function fileUrlToPath(value) { + const url = new URL(value); + return decodeURIComponent(url.pathname); +} + +async function signUp(context, baseUrl, actorId) { + const authResponse = await context.request.fetch(`${baseUrl}/api/auth`, { + method: "POST", + data: { + action: "auth:signIn", + args: { + provider: "password", + params: { + email: `${actorId}@example.com`, + username: actorId, + name: actorId, + password: TEST_PASSWORD, + flow: "signUp", + }, + }, + }, + }); + assert(authResponse.ok(), `测试账号注册失败: ${authResponse.status()} ${await authResponse.text()}`); +} + +async function openDefaultLocalWorkspace(page, baseUrl) { + await page.goto(baseUrl, { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); + const createButton = page.locator('[data-testid="mnote-create-default-local-workspace"]').first(); + if (await createButton.isVisible({ timeout: 3000 }).catch(() => false)) { + await createButton.click({ timeout: UI_TIMEOUT_MS }); + await page.waitForURL((url) => url.searchParams.get("sourceKind") === "local_folder", { + timeout: UI_TIMEOUT_MS, + }); + } + const current = new URL(page.url()); + const rootUri = current.searchParams.get("rootUri") + || await page.evaluate(() => document.body.getAttribute("data-mnote-root-uri") || ""); + assert(rootUri, "应进入 local_folder workspace"); + return { + rootUri, + workspaceId: current.searchParams.get("workspaceId") || "", + }; +} + +async function assertNavigationPage(page) { + await page.locator('[data-testid="mnote-navigation-page"]').waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); + assert.equal(await page.locator("#__MNOTE_PAGE_AGGREGATE__").count(), 0, "导航页不应注入 Page Aggregate"); + assert.equal(await page.locator("#__MNOTE_EDITOR_BOOTSTRAP__").count(), 0, "导航页不应注入 editor bootstrap"); + assert.equal(await page.locator(".mnote-leptos-tiptap-spike-island").count(), 0, "导航页不应启动 tiptap island"); +} + +async function main() { + const port = await pickPort(); + const baseUrl = `http://127.0.0.1:${port}`; + const dataRoot = fs.mkdtempSync(path.join(os.tmpdir(), `${TASK}-`)); + const dbPath = path.join(dataRoot, "control-plane.sqlite3"); + const actorId = `${TASK}-${process.pid}-${Date.now()}`; + const server = spawn("cargo", ["run", "-p", "mnote-web", "--bin", "mnote-web"], { + cwd: path.join(__dirname, "..", "rust"), + env: { + ...process.env, + MNOTE_WEB_BIND: `127.0.0.1:${port}`, + MNOTE_WEB_PUBLIC_BIND: `127.0.0.1:${port}`, + MNOTE_WEB_ENABLE_LEGACY_NEXT_COMPAT: "0", + MNOTE_CONTROL_PLANE_DB_PATH: dbPath, + MNOTE_LOCAL_WORKSPACE_BASE_DIR: dataRoot, + }, + stdio: ["ignore", "pipe", "pipe"], + }); + let stderr = ""; + server.stderr.on("data", (chunk) => { + stderr += chunk.toString(); + }); + + const executablePath = resolveChromiumExecutablePath(); + const browser = await chromium.launch({ + headless: true, + ...(executablePath ? { executablePath } : {}), + }); + const context = await browser.newContext({ viewport: { width: 1440, height: 960 } }); + const page = await context.newPage(); + const diagnostics = []; + page.on("console", (message) => diagnostics.push(`console:${message.type()}:${message.text()}`)); + page.on("pageerror", (error) => diagnostics.push(`pageerror:${error.message}`)); + + try { + await waitForHttpOk(`${baseUrl}/health`, 60_000); + + const unauthContext = await browser.newContext(); + const unauthPage = await unauthContext.newPage(); + await unauthPage.goto(`${baseUrl}/documents/local-md%3Adocs%7E2FPlan.md?sourceKind=local_folder&rootUri=file:///tmp/missing`, { + waitUntil: "domcontentloaded", + timeout: UI_TIMEOUT_MS, + }); + assert.equal(new URL(unauthPage.url()).pathname, "/auth", "未登录文档访问应跳转 auth"); + assert(new URL(unauthPage.url()).searchParams.get("next") || "", "auth 跳转应保留 next"); + await unauthContext.close(); + + await signUp(context, baseUrl, actorId); + const { rootUri, workspaceId } = await openDefaultLocalWorkspace(page, baseUrl); + const rootPath = fileUrlToPath(rootUri); + fs.mkdirSync(path.join(rootPath, "docs"), { recursive: true }); + fs.mkdirSync(path.join(rootPath, "other"), { recursive: true }); + fs.writeFileSync(path.join(rootPath, "Home.md"), "# Home\n", "utf8"); + fs.writeFileSync(path.join(rootPath, "docs", "Plan.md"), "# Plan\n正文\n", "utf8"); + fs.writeFileSync(path.join(rootPath, "other", "Other.md"), "# Other\n", "utf8"); + fs.writeFileSync(path.join(rootPath, "Report.pdf"), "%PDF-1.4\n", "utf8"); + + const rootUrl = new URL(baseUrl); + if (workspaceId) rootUrl.searchParams.set("workspaceId", workspaceId); + rootUrl.searchParams.set("sourceKind", "local_folder"); + rootUrl.searchParams.set("rootUri", rootUri); + rootUrl.searchParams.set("treeView", "filetree"); + await page.goto(rootUrl.toString(), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); + await assertNavigationPage(page); + assert.equal(await page.locator('[data-root-active-page-id="local-md:Home.md"]').count(), 0, "打开文件夹 root 不应自动打开 Home.md"); + await page.waitForFunction(() => Boolean(window.__mnoteDocumentPaneRuntime?.openResourceInActiveTab), null, { + timeout: UI_TIMEOUT_MS, + }); + const popupPromise = page.waitForEvent("popup", { timeout: 3000 }).then((popup) => popup.url()).catch(() => null); + const reportRow = page.locator('#sidebar-file-tree-root .tree-row[data-shell-mode="filetree"][data-local-relative-path="Report.pdf"]').first(); + await reportRow.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); + await reportRow.locator('[data-rust-action="open"]').click({ timeout: UI_TIMEOUT_MS }); + await page.locator('[data-mnote-tab-kind="pdf"] .mnote-main-tab-title', { hasText: "Report.pdf" }).waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); + await page.locator('[data-mnote-resource-tab-panel][data-resource-kind="pdf"] iframe.mnote-resource-tab-frame').waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); + assert.equal(await popupPromise, null, "导航页打开 PDF 应进入 mnoteTab，不应新开浏览器 Tab"); + assert.equal(new URL(page.url()).pathname, "/", "导航页打开 PDF 不应离开主页"); + await page.locator('[data-mnote-main-tab="page"][data-pane-role="primary"]').click({ timeout: UI_TIMEOUT_MS }); + await page.locator('[data-testid="mnote-navigation-page"]').waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); + + const docsRow = page.locator('#sidebar-file-tree-root .tree-row[data-shell-mode="filetree"][data-local-relative-path="docs"]').first(); + await docsRow.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); + const rootNavigationUrl = page.url(); + await docsRow.locator('[data-rust-action="open"]').click({ timeout: UI_TIMEOUT_MS }); + await page.waitForFunction(() => { + const row = document.querySelector('#sidebar-file-tree-root .tree-row[data-shell-mode="filetree"][data-local-relative-path="docs"]'); + return row && row.getAttribute("aria-expanded") === "true"; + }, null, { timeout: UI_TIMEOUT_MS }); + assert.equal(new URL(page.url()).searchParams.get("fileTreeScope"), null, "文件树文件夹点击只应展开，不应进入 scoped 导航页"); + assert.equal(page.url(), rootNavigationUrl, "文件树文件夹展开不应改 URL"); + + await page.locator('[data-testid="mnote-navigation-folders"] [data-navigation-item-kind="folder"][data-local-relative-path="docs"]').first().click({ timeout: UI_TIMEOUT_MS }); + await page.waitForURL((url) => url.searchParams.get("fileTreeScope") === "docs", { + timeout: UI_TIMEOUT_MS, + }); + await assertNavigationPage(page); + assert(await page.locator('[data-testid="mnote-navigation-pages"] >> text=Plan.md').isVisible({ timeout: UI_TIMEOUT_MS }), "scope 导航页应展示当前层 Markdown"); + assert.equal(await page.locator('text=Other.md').count(), 0, "scope 导航页不应渲染 root 兄弟目录页面"); + + const planRow = page.locator('#sidebar-file-tree-root .tree-row[data-shell-mode="filetree"][data-document-id="local-md:docs~2FPlan.md"]').first(); + await planRow.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); + await planRow.locator('[data-rust-action="open"]').click({ timeout: UI_TIMEOUT_MS }); + await page.waitForURL((url) => url.pathname.includes("/documents/local-md%3Adocs~2FPlan.md"), { + timeout: UI_TIMEOUT_MS, + }); + await page.locator("#__MNOTE_PAGE_AGGREGATE__").waitFor({ state: "attached", timeout: UI_TIMEOUT_MS }); + + const scopedUrl = new URL(baseUrl); + if (workspaceId) scopedUrl.searchParams.set("workspaceId", workspaceId); + scopedUrl.searchParams.set("sourceKind", "local_folder"); + scopedUrl.searchParams.set("rootUri", rootUri); + scopedUrl.searchParams.set("treeView", "filetree"); + scopedUrl.searchParams.set("fileTreeScope", "docs"); + await page.goto(scopedUrl.toString(), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); + await assertNavigationPage(page); + assert(await page.locator('[data-testid="mnote-navigation-recent-folders"] >> text=docs').isVisible({ timeout: UI_TIMEOUT_MS }), "recent folders 应展示 docs"); + assert(await page.locator('[data-testid="mnote-navigation-recent-pages"] >> text=Plan').isVisible({ timeout: UI_TIMEOUT_MS }), "recent pages 应展示 Plan"); + + const documentUrl = `${baseUrl}/documents/local-md%3Adocs%7E2FPlan.md?sourceKind=local_folder&rootUri=${encodeURIComponent(rootUri)}&treeView=filetree&fileTreeScope=docs`; + await page.goto(documentUrl, { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); + fs.unlinkSync(path.join(rootPath, "docs", "Plan.md")); + await page.reload({ waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); + await page.waitForURL((url) => url.pathname === "/" && url.searchParams.get("missingPage") === "local-md:docs~2FPlan.md", { + timeout: UI_TIMEOUT_MS, + }); + await assertNavigationPage(page); + + console.log(JSON.stringify({ + ok: true, + task: TASK, + rootUri, + finalUrl: page.url(), + }, null, 2)); + } catch (error) { + error.message += `\nserver stderr:\n${stderr.slice(-4000)}\nbrowser diagnostics:\n${diagnostics.slice(-20).join("\n")}`; + throw error; + } finally { + await browser.close().catch(() => {}); + server.kill("SIGTERM"); + } +} + +main().catch((error) => { + console.error(error); + process.exit(1); +}); diff --git a/scripts/task501-office-preview-light-viewer-smoke.js b/scripts/task501-office-preview-light-viewer-smoke.js new file mode 100644 index 00000000..9e52da9b --- /dev/null +++ b/scripts/task501-office-preview-light-viewer-smoke.js @@ -0,0 +1,361 @@ +#!/usr/bin/env node +"use strict"; + +const assert = require("node:assert/strict"); +const fs = require("node:fs"); +const fsp = require("node:fs/promises"); +const os = require("node:os"); +const path = require("node:path"); +const JSZip = require("jszip"); +const XLSX = require("@e965/xlsx"); +const { chromium } = require("playwright"); + +const ROOT = path.resolve(__dirname, ".."); +const BASE_URL = (process.env.MNOTE_UI_BASE_URL || process.env.MNOTE_WEB_SMOKE_BASE_URL || "http://127.0.0.1:3000").replace(/\/+$/, ""); +const UI_TIMEOUT_MS = Number(process.env.MNOTE_SMOKE_UI_TIMEOUT_MS || 30_000); +const OUT_DIR = path.join(ROOT, "tmp", "task501-office-preview-light-viewer-smoke"); +const TEST_ACCOUNT = "mnote-e2e"; +const TEST_EMAIL = "mnote.e2e@example.com"; +const TEST_PASSWORD = process.env.MNOTE_E2E_PASSWORD || "MnoteE2E123!"; +const WORKSPACE_ID = "local-ws:mnote-e2e:office-preview-smoke"; +const DOCUMENT_ID = "local-md:office-preview-smoke.md"; + +function resolveChromiumExecutablePath() { + const explicit = process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH || ""; + if (explicit && fs.existsSync(explicit)) return explicit; + return [ + "/usr/bin/google-chrome-stable", + "/usr/bin/google-chrome", + "/snap/bin/chromium", + "/usr/bin/chromium", + "/usr/bin/chromium-browser", + ].find((candidate) => fs.existsSync(candidate)) || ""; +} + +function officePreviewUrl(root, fileName, fileType) { + const fileUrl = new URL("/api/local-folder/files/open", BASE_URL); + fileUrl.searchParams.set("rootUri", `file://${root}`); + fileUrl.searchParams.set("path", fileName); + + const url = new URL("/office-preview", BASE_URL); + url.searchParams.set("fileUrl", `${fileUrl.pathname}${fileUrl.search}`); + url.searchParams.set("fileName", fileName); + url.searchParams.set("fileType", fileType); + url.searchParams.set("workspaceId", WORKSPACE_ID); + url.searchParams.set("sourceKind", "local_folder"); + url.searchParams.set("rootUri", `file://${root}`); + url.searchParams.set("documentId", DOCUMENT_ID); + return url.toString(); +} + +async function writeDocx(filePath) { + const zip = new JSZip(); + zip.file("[Content_Types].xml", ` + + + + +`); + zip.folder("_rels").file(".rels", ` + + +`); + zip.folder("word").file("document.xml", ` + + + MNote DOCX light preview works + 第二行测试内容 + + +`); + await fsp.writeFile(filePath, await zip.generateAsync({ type: "nodebuffer" })); +} + +function writeXlsx(filePath) { + const workbook = XLSX.utils.book_new(); + const sheet = XLSX.utils.aoa_to_sheet([ + ["Name", "Value"], + ["MNote XLSX light preview works", "ok"], + ["中文", "正常"], + ]); + XLSX.utils.book_append_sheet(workbook, sheet, "Sheet1"); + XLSX.writeFile(workbook, filePath); +} + +async function writePptx(filePath) { + const zip = new JSZip(); + zip.file("[Content_Types].xml", ` + + + + + + + + +`); + zip.folder("_rels").file(".rels", ` + + +`); + zip.folder("ppt").file("presentation.xml", ` + + + + + + + + + +`); + zip.folder("ppt").folder("_rels").file("presentation.xml.rels", ` + + + + +`); + zip.folder("ppt").folder("slideMasters").file("slideMaster1.xml", ` + + + +`); + zip.folder("ppt").folder("slideMasters").folder("_rels").file("slideMaster1.xml.rels", ` + + +`); + zip.folder("ppt").folder("slideLayouts").file("slideLayout1.xml", ` + + +`); + zip.folder("ppt").folder("slideLayouts").folder("_rels").file("slideLayout1.xml.rels", ` + + +`); + zip.folder("ppt").folder("slides").file("slide1.xml", ` + + + + + + + + + MNote PPTX light preview works + + + +`); + zip.folder("ppt").folder("slides").folder("_rels").file("slide1.xml.rels", ` + + +`); + zip.folder("ppt").folder("theme").file("theme1.xml", ` + + + + + + +`); + await fsp.writeFile(filePath, await zip.generateAsync({ type: "nodebuffer" })); +} + +async function signIn(context) { + const payload = (params) => ({ + action: "auth:signIn", + args: { + provider: "password", + params, + }, + }); + let response = await context.request.fetch(`${BASE_URL}/api/auth`, { + method: "POST", + data: payload({ + account: TEST_ACCOUNT, + password: TEST_PASSWORD, + flow: "signIn", + }), + }); + if (response.ok()) return; + response = await context.request.fetch(`${BASE_URL}/api/auth`, { + method: "POST", + data: payload({ + email: TEST_EMAIL, + username: TEST_ACCOUNT, + name: TEST_ACCOUNT, + password: TEST_PASSWORD, + flow: "signUp", + }), + }); + assert(response.ok(), `测试账号登录失败: ${response.status()} ${await response.text()}`); +} + +async function setPageWidthPreferences(context, root, updates) { + const response = await context.request.fetch(`${BASE_URL}/api/ui/preferences`, { + method: "PUT", + data: { + documentId: DOCUMENT_ID, + workspaceId: WORKSPACE_ID, + sourceKind: "local_folder", + rootUri: `file://${root}`, + updates, + }, + }); + assert(response.ok(), `页面宽度偏好写入失败: ${response.status()} ${await response.text()}`); +} + +async function verifyPreview(page, root, item) { + const consoleMessages = []; + page.on("console", (message) => { + consoleMessages.push(`${message.type()}: ${message.text()}`); + }); + page.on("pageerror", (error) => { + consoleMessages.push(`pageerror: ${error && error.stack ? error.stack : error.message}`); + }); + + await page.goto(officePreviewUrl(root, item.fileName, item.fileType), { + waitUntil: "domcontentloaded", + timeout: UI_TIMEOUT_MS, + }); + await page.waitForFunction( + () => { + const status = document.documentElement.getAttribute("data-mnote-office-preview-status"); + return status && status !== "加载中"; + }, + null, + { timeout: UI_TIMEOUT_MS }, + ); + const status = await page.locator("html").getAttribute("data-mnote-office-preview-status"); + const text = await page.locator("#mnote-office-viewer").innerText({ timeout: UI_TIMEOUT_MS }); + const layout = await page.evaluate(() => { + const viewer = document.querySelector("#mnote-office-viewer"); + const tableWrap = document.querySelector(".mnote-office-table-wrap"); + const docxPage = document.querySelector(".docx-wrapper > section.docx, .mnote-docx-wrapper > section.mnote-docx"); + const pptxStage = document.querySelector(".mnote-office-pptx-stage"); + const pptxSlide = document.querySelector(".pptx-preview-slide-wrapper"); + const rectOf = (node) => { + if (!(node instanceof Element)) return null; + const rect = node.getBoundingClientRect(); + return { + left: rect.left, + width: rect.width, + }; + }; + return { + viewportWidth: window.innerWidth, + pageWidthContentType: document.documentElement.getAttribute("data-page-width-content-type"), + pageWidthMode: document.documentElement.getAttribute("data-page-width-resolved-mode"), + toolbarCount: document.querySelectorAll(".mnote-office-toolbar").length, + viewer: rectOf(viewer), + tableWrap: rectOf(tableWrap), + docxPage: rectOf(docxPage), + pptxStage: rectOf(pptxStage), + pptxSlide: rectOf(pptxSlide), + }; + }); + const screenshot = path.join(OUT_DIR, `${item.fileType}.png`); + await page.screenshot({ path: screenshot, fullPage: true }); + + assert.equal(status, "完成", `${item.fileType} 预览状态应完成`); + assert(text.includes(item.expected), `${item.fileType} 预览应包含样本文本: ${item.expected}`); + assert.equal(consoleMessages.length, 0, `${item.fileType} 预览不应产生控制台错误: ${consoleMessages.join("\n")}`); + assert.equal(layout.toolbarCount, 0, "轻量预览页不应显示顶部状态条"); + if (item.fileType === "docx") { + assert.equal(layout.pageWidthContentType, "word", "DOCX 应使用 Word 宽度类型"); + assert.equal(layout.pageWidthMode, item.expectedMode || "wide", "DOCX 应使用指定页面宽度"); + assert(layout.viewer && layout.viewer.width >= Math.min(layout.viewportWidth, 1180) - 24, "DOCX 预览容器应接近宽版宽度"); + assert(layout.viewer.left > 0 && layout.viewer.left < 80, "DOCX 宽版容器应居中而不是左侧小块"); + assert(layout.docxPage && layout.docxPage.width >= layout.viewportWidth * 0.75, "DOCX 页面应放大到接近可视宽度"); + } else if (item.fileType === "pptx") { + assert.equal(layout.pageWidthContentType, "ppt", "PPTX 应使用 PPT 宽度类型"); + assert.equal(layout.pageWidthMode, item.expectedMode || "wide", "PPTX 应使用指定页面宽度"); + if ((item.expectedMode || "wide") === "full") { + assert(layout.viewer && layout.viewer.width >= layout.viewportWidth - 2, "PPTX 全宽模式应占满页面宽度"); + assert(layout.pptxStage && layout.pptxStage.width >= layout.viewportWidth - 40, "PPTX 舞台应随全宽容器放大"); + } else { + assert(layout.viewer && layout.viewer.width >= Math.min(layout.viewportWidth, 1180) - 24, "PPTX 预览容器应接近宽版宽度"); + } + } else { + assert.equal(layout.pageWidthContentType, "excel", `${item.fileType} 应使用 Excel 宽度类型`); + assert.equal(layout.pageWidthMode, item.expectedMode || "full", `${item.fileType} 应使用指定页面宽度`); + assert(layout.viewer && layout.viewer.left <= 1, `${item.fileType} 预览容器应从页面左侧开始`); + assert(layout.viewer.width >= layout.viewportWidth - 2, `${item.fileType} 预览容器应占满页面宽度`); + assert(layout.tableWrap && layout.tableWrap.width >= layout.viewportWidth - 40, `${item.fileType} 表格容器应接近全宽`); + } + return { fileType: item.fileType, status, text: text.slice(0, 300), layout, screenshot }; +} + +async function main() { + await fsp.mkdir(OUT_DIR, { recursive: true }); + const root = await fsp.mkdtemp(path.join(os.tmpdir(), "mnote-office-preview-")); + await fsp.mkdir(path.join(root, ".mnote"), { recursive: true }); + await fsp.writeFile( + path.join(root, ".mnote", "workspace.json"), + `${JSON.stringify({ + workspaceId: WORKSPACE_ID, + ownerId: TEST_ACCOUNT, + createdAt: new Date().toISOString(), + capabilities: ["local_files", "markdown_edit", "asset_upload"], + }, null, 2)}\n`, + "utf8", + ); + await writeDocx(path.join(root, "sample.docx")); + writeXlsx(path.join(root, "sample.xlsx")); + await writePptx(path.join(root, "sample.pptx")); + await fsp.writeFile( + path.join(root, "sample.csv"), + "Name,Value\nMNote CSV light preview works,ok\n中文,正常\n", + "utf8", + ); + + const executablePath = resolveChromiumExecutablePath(); + const browser = await chromium.launch({ + headless: process.env.HEADFUL !== "1", + ...(executablePath ? { executablePath } : {}), + }); + const context = await browser.newContext({ viewport: { width: 1280, height: 900 } }); + try { + await signIn(context); + await setPageWidthPreferences(context, root, { + "pageWidth.word": { mode: "wide", custom: null }, + "pageWidth.excel": { mode: "full", custom: null }, + "pageWidth.ppt": { mode: "wide", custom: null }, + }); + const page = await context.newPage(); + const results = []; + for (const item of [ + { fileName: "sample.docx", fileType: "docx", expected: "MNote DOCX light preview works" }, + { fileName: "sample.xlsx", fileType: "xlsx", expected: "MNote XLSX light preview works" }, + { fileName: "sample.pptx", fileType: "pptx", expected: "MNote PPTX light preview works" }, + { fileName: "sample.csv", fileType: "csv", expected: "MNote CSV light preview works" }, + ]) { + results.push(await verifyPreview(page, root, item)); + } + await setPageWidthPreferences(context, root, { + "pageWidth.ppt": { mode: "full", custom: null }, + }); + results.push(await verifyPreview(page, root, { + fileName: "sample.pptx", + fileType: "pptx", + expected: "MNote PPTX light preview works", + expectedMode: "full", + })); + const result = { ok: true, baseUrl: BASE_URL, root, results }; + await fsp.writeFile(path.join(OUT_DIR, "result.json"), `${JSON.stringify(result, null, 2)}\n`, "utf8"); + console.log(JSON.stringify(result, null, 2)); + } finally { + await browser.close(); + } +} + +main().catch(async (error) => { + await fsp.mkdir(OUT_DIR, { recursive: true }); + await fsp.writeFile( + path.join(OUT_DIR, "result.json"), + `${JSON.stringify({ ok: false, baseUrl: BASE_URL, error: error && error.stack ? error.stack : String(error) }, null, 2)}\n`, + "utf8", + ); + console.error(error && error.stack ? error.stack : error); + process.exit(1); +}); diff --git a/scripts/task502-page-ai-agent-selector-context-smoke.js b/scripts/task502-page-ai-agent-selector-context-smoke.js new file mode 100644 index 00000000..63f56cf1 --- /dev/null +++ b/scripts/task502-page-ai-agent-selector-context-smoke.js @@ -0,0 +1,339 @@ +#!/usr/bin/env node +"use strict"; + +const assert = require("node:assert"); +const fs = require("node:fs"); +const os = require("node:os"); +const path = require("node:path"); +const { chromium } = require("playwright"); +const { + BASE_URL, + UI_TIMEOUT_MS, + ensureAuthenticated, +} = require("./tree-shell-smoke-helpers"); + +const TASK = "task502-page-ai-agent-selector-context-smoke"; +const OUTPUT_DIR = path.join(process.cwd(), "tmp", TASK); +const RESULT_PATH = path.join(OUTPUT_DIR, "result.json"); +const CHROMIUM_EXECUTABLE_PATH = process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH + || ["/usr/bin/google-chrome-stable", "/usr/bin/google-chrome", "/snap/bin/chromium", "/usr/bin/chromium"] + .find((candidate) => fs.existsSync(candidate)); + +function fileUrl(localPath) { + return `file://${localPath}`; +} + +function localMdDocumentId(relativePath) { + return `local-md:${relativePath.replaceAll("/", "~2F")}`; +} + +function writeWorkspaceManifest(root, ownerId, workspaceId) { + fs.mkdirSync(path.join(root, ".mnote"), { recursive: true }); + fs.writeFileSync( + path.join(root, ".mnote", "workspace.json"), + `${JSON.stringify({ + workspaceId, + ownerId, + createdAt: new Date().toISOString(), + capabilities: ["local_files", "ai_sessions", "markdown_edit"], + }, null, 2)}\n`, + "utf8", + ); +} + +function documentUrl(root, relativePath) { + const url = new URL(`${BASE_URL}/documents/${encodeURIComponent(localMdDocumentId(relativePath))}`); + url.searchParams.set("sourceKind", "local_folder"); + url.searchParams.set("rootUri", fileUrl(root)); + url.searchParams.set("treeView", "filetree"); + return url.toString(); +} + +async function saveScreenshot(page, name) { + const target = path.join(OUTPUT_DIR, `${name}.png`); + await page.screenshot({ path: target, fullPage: false }); + return target; +} + +async function main() { + fs.mkdirSync(OUTPUT_DIR, { recursive: true }); + const suffix = Date.now().toString(36); + const actorId = "mnote-e2e"; + const root = fs.mkdtempSync(path.join(os.tmpdir(), "mnote-task502-agent-context-")); + const rootUri = fileUrl(root); + const workspaceId = `local-ws:${actorId}:task502`; + const relativePath = "AgentContext.md"; + const documentId = localMdDocumentId(relativePath); + const captured = []; + let caughtError = null; + + writeWorkspaceManifest(root, actorId, workspaceId); + fs.writeFileSync( + path.join(root, relativePath), + ["# Agent Context", "", `Task502 ${suffix}`, ""].join("\n"), + "utf8", + ); + + const browser = await chromium.launch({ + headless: true, + ...(CHROMIUM_EXECUTABLE_PATH ? { executablePath: CHROMIUM_EXECUTABLE_PATH } : {}), + }); + const context = await browser.newContext({ + viewport: { width: 1440, height: 960 }, + locale: "zh-CN", + extraHTTPHeaders: { + "x-mnote-actor-id": actorId, + "x-mnote-actor-type": "user", + }, + }); + const page = await context.newPage(); + + try { + await page.route("**/api/user/access-policy**", async (route) => { + await route.fulfill({ + status: 200, + headers: { "content-type": "application/json" }, + body: JSON.stringify({ + ok: true, + controlPlane: "sqlite", + grants: [{ + id: `grant_task502_${suffix}`, + userId: actorId, + workspaceId, + rootUri, + rootPath: root, + permission: "write", + recursive: true, + capabilities: ["ai", "markdown_edit"], + source: "user", + status: "active", + }], + }), + }); + }); + await page.route("**/api/ui/preferences**", async (route) => { + captured.push({ + kind: "ui-preferences", + method: route.request().method(), + body: route.request().postData() || "", + }); + await route.fulfill({ + status: 200, + headers: { "content-type": "application/json" }, + body: JSON.stringify({ ok: true, owner: "mnote-web", result: {} }), + }); + }); + await page.route("**/api/hermes/client/gateway/health**", async (route) => { + await route.fulfill({ + status: 200, + headers: { "content-type": "application/json" }, + body: JSON.stringify({ + ok: true, + gateway: { ok: true, status: "mocked" }, + profile: { name: "reasonix", modelConfigured: true, apiKeyConfigured: true }, + suggestions: [], + }), + }); + }); + await page.route("**/api/hermes/client/tools**", async (route) => { + await route.fulfill({ + status: 200, + headers: { "content-type": "application/json" }, + body: JSON.stringify({ ok: true, tools: [] }), + }); + }); + await page.route("**/api/hermes/client/profiles", async (route) => { + await route.fulfill({ + status: 200, + headers: { "content-type": "application/json" }, + body: JSON.stringify({ + ok: true, + active: "reasonix", + profiles: [{ name: "reasonix", label: "Reasonix", modelConfigured: true, apiKeyConfigured: true }], + }), + }); + }); + await page.route("**/api/hermes/client/skills**", async (route) => { + await route.fulfill({ + status: 200, + headers: { "content-type": "application/json" }, + body: JSON.stringify({ ok: true, categories: [], archived: [] }), + }); + }); + await page.route("**/api/hermes/client/sessions", async (route) => { + captured.push({ kind: "session", method: route.request().method(), body: route.request().postData() || "" }); + await route.fulfill({ + status: 200, + headers: { "content-type": "application/json" }, + body: JSON.stringify({ + ok: true, + sessionId: `mnote_task502_${suffix}`, + title: "task502", + traceId: `trace_task502_session_${suffix}`, + persistence: "local_ai_session_jsonl", + sessionStorage: "local_private", + }), + }); + }); + await page.route("**/api/hermes/client/runs", async (route) => { + captured.push({ kind: "run", method: route.request().method(), body: route.request().postData() || "" }); + await route.fulfill({ + status: 200, + headers: { "content-type": "application/json" }, + body: JSON.stringify({ + ok: true, + sessionId: `mnote_task502_${suffix}`, + runId: `run_task502_${suffix}`, + events: [], + traceId: `trace_task502_run_${suffix}`, + }), + }); + }); + await page.route("**/api/hermes/client/events/*", async (route) => { + await route.fulfill({ + status: 200, + headers: { "content-type": "text/event-stream; charset=utf-8" }, + body: + `data: ${JSON.stringify({ event: "message.delta", run_id: `run_task502_${suffix}`, delta: "Task502 response" })}\n\n` + + `data: ${JSON.stringify({ event: "run.completed", run_id: `run_task502_${suffix}`, output: "Task502 response" })}\n\n`, + }); + }); + + await ensureAuthenticated(page, context.request); + const response = await page.goto(documentUrl(root, relativePath), { + waitUntil: "domcontentloaded", + timeout: UI_TIMEOUT_MS, + }); + assert(response && response.status() === 200, `文档页状态码异常: ${response && response.status()}`); + await page.locator('[data-testid="mnote-leptos-tiptap-island-editor-root"] .ProseMirror').first().waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); + await page.getByTestId("wolai-floating-ai").click({ timeout: UI_TIMEOUT_MS }); + await page.locator('[data-testid="wolai-page-ai-drawer"]').waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); + + const drawer = page.locator('[data-testid="wolai-page-ai-drawer"]'); + const defaultChatText = await drawer.innerText({ timeout: UI_TIMEOUT_MS }); + assert(!defaultChatText.includes("问 Hermes"), "默认输入区不应继续固定写“问 Hermes”"); + assert(!defaultChatText.includes("model.default"), "默认聊天面不应显示 model.default"); + assert(!defaultChatText.includes("gateway:"), "默认聊天面不应显示 gateway 技术详情"); + assert(!defaultChatText.includes("Hermes profile"), "默认聊天面不应显示 Hermes profile 技术项"); + + await page.locator("[data-page-ai-agent-selector]").waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); + const agentIds = await page.$$eval("[data-page-ai-agent-id]", (nodes) => + nodes.map((node) => node.getAttribute("data-page-ai-agent-id")).filter(Boolean), + ); + assert.deepStrictEqual(agentIds.sort(), ["chat_only", "hermes", "reasonix"]); + await page.locator('[data-page-ai-agent-id="reasonix"]').click({ timeout: UI_TIMEOUT_MS }); + await page.waitForFunction( + () => document.documentElement.getAttribute("data-mnote-page-ai-agent-id") === "reasonix", + null, + { timeout: UI_TIMEOUT_MS }, + ); + + const contextRefs = page.locator("[data-page-ai-context-refs]"); + await contextRefs.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); + assert( + await page.locator('[data-page-ai-context-ref="current_page"][aria-pressed="true"]').isVisible(), + "当前页 contextRef 应默认勾选", + ); + assert( + await page.locator("[data-page-ai-allowed-root]").first().isVisible(), + "SQLite 授权区域应作为 allowedRoot chip 显示", + ); + + await page.locator('.wolai-page-ai-header-actions [data-page-ai-tab="agent"]').click({ timeout: UI_TIMEOUT_MS }); + await page.locator('[data-page-ai-panel="agent"]').waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); + const commonSettingsText = await page.locator('[data-page-ai-panel="agent"]').innerText({ timeout: UI_TIMEOUT_MS }); + assert(commonSettingsText.includes("授权区域"), "Common 设置页应展示授权区域"); + assert(commonSettingsText.includes("默认上下文"), "Common 设置页应展示默认 contextRefs"); + assert(commonSettingsText.includes("审计"), "Common 设置页应展示审计/changed files 共性设置"); + assert(!commonSettingsText.includes("Hermes profile"), "Common 设置页不应包含 Hermes profile"); + assert(!commonSettingsText.includes("ACP runtime"), "Common 设置页不应包含 agent runtime 差异项"); + + await page.locator('[data-page-ai-panel="agent"] [data-page-ai-tab="hermes-settings"]').click({ timeout: UI_TIMEOUT_MS }); + await page.locator('[data-page-ai-panel="hermes-settings"]').waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); + const hermesSettingsText = await page.locator('[data-page-ai-panel="hermes-settings"]').innerText({ timeout: UI_TIMEOUT_MS }); + assert(hermesSettingsText.includes("Hermes profile"), "Hermes 设置页应只承接 Hermes profile"); + assert(!hermesSettingsText.includes("Reasonix 专属设置"), "Hermes 设置页不应混入 Reasonix 设置"); + + await page.locator('[data-page-ai-panel="hermes-settings"] [data-page-ai-tab="reasonix-settings"]').click({ timeout: UI_TIMEOUT_MS }); + await page.locator('[data-page-ai-panel="reasonix-settings"]').waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); + const reasonixSettingsText = await page.locator('[data-page-ai-panel="reasonix-settings"]').innerText({ timeout: UI_TIMEOUT_MS }); + assert(reasonixSettingsText.includes("ACP runtime"), "Reasonix 设置页应展示 ACP runtime"); + assert(reasonixSettingsText.includes("Reasonix 专属设置"), "Reasonix 设置页应展示 Reasonix 专属设置"); + assert(!reasonixSettingsText.includes("Hermes profile"), "Reasonix 设置页不应混入 Hermes profile"); + + await page.locator('[data-page-ai-panel="reasonix-settings"] [data-page-ai-tab="chat-only-settings"]').click({ timeout: UI_TIMEOUT_MS }); + await page.locator('[data-page-ai-panel="chat-only-settings"]').waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); + const chatOnlySettingsText = await page.locator('[data-page-ai-panel="chat-only-settings"]').innerText({ timeout: UI_TIMEOUT_MS }); + assert(chatOnlySettingsText.includes("默认不申请文件写权限"), "Chat-only 设置页应说明默认不申请写权限"); + assert(!chatOnlySettingsText.includes("ACP runtime"), "Chat-only 设置页不应混入 ACP runtime"); + await page.locator('[data-page-ai-panel="chat-only-settings"] [data-page-ai-tab="chat"]').click({ timeout: UI_TIMEOUT_MS }); + await page.locator('[data-page-ai-panel="chat"]').waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); + + await page.locator('[data-page-ai-context-ref="current_page"]').click({ timeout: UI_TIMEOUT_MS }); + await page.locator('[data-page-ai-context-ref="folder"]').click({ timeout: UI_TIMEOUT_MS }); + await page.locator('[data-page-ai-context-ref="changed_files"]').click({ timeout: UI_TIMEOUT_MS }); + await page.locator("[data-page-ai-input]").fill(`Task502 agent/context ${suffix}`, { timeout: UI_TIMEOUT_MS }); + await page.locator('[data-page-ai-action="send"]').click({ timeout: UI_TIMEOUT_MS }); + await page.waitForFunction( + () => (document.querySelector('[data-testid="wolai-page-ai-drawer"]')?.textContent || "").includes("Task502 response"), + null, + { timeout: UI_TIMEOUT_MS }, + ); + + const runs = captured.filter((item) => item.kind === "run"); + assert(runs.length >= 1, "未捕获 Page AI run payload"); + const runBody = JSON.parse(runs[runs.length - 1].body); + assert.strictEqual(runBody.agentId, "reasonix"); + assert(Array.isArray(runBody.contextRefs), "run payload 必须包含 contextRefs 数组"); + assert(!runBody.contextRefs.some((item) => item.kind === "current_page"), "取消当前页后不应发送 current_page contextRef"); + assert.strictEqual(runBody.pageContext?.aiContext?.pageText, undefined, "取消当前页后不应发送 pageText"); + assert.strictEqual(runBody.pageContext?.aiContext?.pageXml, undefined, "取消当前页后不应发送 pageXml"); + assert.strictEqual(runBody.pageContext?.aiContext?.contextBlocks, undefined, "取消当前页后不应发送 contextBlocks"); + assert(runBody.contextRefs.some((item) => item.kind === "active_editor" && item.documentId === documentId)); + assert(runBody.contextRefs.some((item) => item.kind === "folder" && item.rootUri === rootUri)); + assert(runBody.contextRefs.some((item) => item.kind === "changed_files")); + assert(Array.isArray(runBody.allowedRoots), "run payload 必须包含 allowedRoots 数组"); + assert(runBody.allowedRoots.some((item) => + item.rootUri === rootUri + && item.permission === "write" + && item.source === "sqlite_directory_grant" + )); + assert.strictEqual(runBody.runTargetSnapshot?.source, "open_editors_snapshot"); + + const screenshot = await saveScreenshot(page, "01-agent-selector-context"); + const result = { + ok: true, + task: TASK, + baseUrl: BASE_URL, + root, + rootUri, + documentId, + screenshot, + captured, + }; + fs.writeFileSync(RESULT_PATH, `${JSON.stringify(result, null, 2)}\n`, "utf8"); + console.log(JSON.stringify(result, null, 2)); + } catch (error) { + caughtError = error; + await saveScreenshot(page, "failure").catch(() => undefined); + } finally { + fs.rmSync(root, { recursive: true, force: true }); + await page.close().catch(() => undefined); + await context.close().catch(() => undefined); + await browser.close().catch(() => undefined); + } + + if (caughtError) { + throw caughtError; + } +} + +if (require.main === module) { + main().catch((error) => { + console.error(error); + process.exit(1); + }); +} diff --git a/scripts/task503-local-pptx-upload-filetree-open-smoke.js b/scripts/task503-local-pptx-upload-filetree-open-smoke.js new file mode 100644 index 00000000..7b30dd5b --- /dev/null +++ b/scripts/task503-local-pptx-upload-filetree-open-smoke.js @@ -0,0 +1,496 @@ +#!/usr/bin/env node +"use strict"; + +const assert = require("node:assert"); +const fs = require("node:fs"); +const os = require("node:os"); +const path = require("node:path"); +const { chromium } = require("playwright"); + +const BASE_URL = (process.env.MNOTE_WEB_SMOKE_BASE_URL || "http://127.0.0.1:3000").replace(/\/+$/, ""); +const UI_TIMEOUT_MS = Number(process.env.MNOTE_SMOKE_UI_TIMEOUT_MS || 30_000); +const PPTX_PATH = process.env.MNOTE_TASK503_PPTX_PATH + || "/home/lix/Downloads/1768096586803-672be7a7-5cb3-454d-9b1b-6230f86ba392.pptx"; +const OUTPUT_DIR = path.join(process.cwd(), "tmp", "task503-local-pptx-upload-filetree-open-smoke"); +const RESULT_PATH = path.join(OUTPUT_DIR, "result.json"); +const CHROMIUM_EXECUTABLE_PATH = process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH + || ["/usr/bin/google-chrome-stable", "/usr/bin/google-chrome", "/snap/bin/chromium"] + .find((candidate) => fs.existsSync(candidate)); + +function fileUrl(localPath) { + return `file://${localPath}`; +} + +function localMdDocumentId(relativePath) { + return `local-md:${relativePath.replaceAll("/", "~2F")}`; +} + +function workspaceId(ownerId) { + return `local-ws:${ownerId}:task503`; +} + +function documentUrl(root, relativePath) { + const url = new URL(`${BASE_URL}/documents/${encodeURIComponent(localMdDocumentId(relativePath))}`); + url.searchParams.set("sourceKind", "local_folder"); + url.searchParams.set("rootUri", fileUrl(root)); + url.searchParams.set("treeView", "filetree"); + return url.toString(); +} + +function writeWorkspaceManifest(root, ownerId) { + const metadataDir = path.join(root, ".mnote"); + fs.mkdirSync(metadataDir, { recursive: true }); + fs.writeFileSync( + path.join(metadataDir, "workspace.json"), + `${JSON.stringify({ + workspaceId: workspaceId(ownerId), + ownerId, + createdAt: new Date().toISOString(), + capabilities: ["local_files", "markdown_edit", "asset_upload"], + }, null, 2)}\n`, + "utf8", + ); +} + +async function quickLogin(page) { + await page.goto(`${BASE_URL}/auth`, { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); + const quickLoginButton = page.getByRole("button", { name: "测试账号快速登录" }); + if (await quickLoginButton.count()) { + await quickLoginButton.click({ timeout: UI_TIMEOUT_MS }); + await page.waitForURL((url) => url.pathname === "/", { timeout: UI_TIMEOUT_MS }).catch(() => undefined); + } +} + +async function openDocument(page, root, relativePath) { + await page.goto(documentUrl(root, relativePath), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); + await page.locator('[data-testid="mnote-leptos-tiptap-island-editor-root"]').first().waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); + await page.locator('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror').first().waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); +} + +async function uploadAttachmentViaSlash(page, filePath) { + const editor = page.locator('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror').first(); + await editor.click({ timeout: UI_TIMEOUT_MS }); + await page.keyboard.press("End").catch(() => undefined); + await page.keyboard.type("/"); + const item = page.locator('.document-pane[data-pane-role="primary"] [data-testid="slash-item-upload-attachment"]').first(); + await item.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); + const [fileChooser] = await Promise.all([ + page.waitForEvent("filechooser", { timeout: UI_TIMEOUT_MS }), + item.click({ timeout: UI_TIMEOUT_MS }), + ]); + await fileChooser.setFiles(filePath); +} + +async function waitForEditorLinks(page, expectedCount) { + await page.waitForFunction( + ({ count }) => { + const links = Array.from(document.querySelectorAll('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror a')); + return links.filter((link) => /\.pptx(?:\?|$)/i.test(link.textContent || "")).length >= count; + }, + { count: expectedCount }, + { timeout: UI_TIMEOUT_MS }, + ); + return await page.evaluate(() => Array.from(document.querySelectorAll('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror a')) + .filter((link) => /\.pptx(?:\?|$)/i.test(link.textContent || "")) + .map((link) => ({ + text: link.textContent || "", + href: link.getAttribute("href") || "", + assetId: link.getAttribute("data-asset-id") || "", + className: link.getAttribute("class") || "", + }))); +} + +async function assertNoConflict(page, label) { + await page.waitForTimeout(1500); + const state = await page.evaluate(() => { + const pane = document.querySelector('.document-pane[data-pane-role="primary"]'); + const runtimeRoot = document.querySelector('[data-testid="mnote-leptos-tiptap-island-editor-root"]'); + return { + status: runtimeRoot?.getAttribute("data-runtime-editor-status") || "", + statusError: runtimeRoot?.getAttribute("data-runtime-editor-error") || "", + conflictVisible: Boolean(pane?.querySelector('[data-testid="mnote-editor-conflict-panel"]')), + lastSaveError: document.documentElement.getAttribute("data-mnote-last-upload-save-error") || "", + }; + }); + assert.notEqual(state.status, "external-change-conflict", `${label}: 不应进入文件冲突态: ${JSON.stringify(state)}`); + assert.equal(state.conflictVisible, false, `${label}: 不应显示文件冲突面板: ${JSON.stringify(state)}`); + assert.equal(state.lastSaveError, "", `${label}: 上传保存不应失败: ${JSON.stringify(state)}`); + return state; +} + +async function setPptPageWidth(context, root, relativePath, mode) { + const response = await context.request.fetch(`${BASE_URL}/api/ui/preferences`, { + method: "PUT", + data: { + documentId: localMdDocumentId(relativePath), + workspaceId: workspaceId("mnote-e2e"), + sourceKind: "local_folder", + rootUri: fileUrl(root), + updates: { + "pageWidth.ppt": { mode, custom: null }, + }, + }, + }); + assert(response.ok(), `PPT 页面宽度偏好写入失败: ${response.status()} ${await response.text()}`); +} + +async function waitForActivePptxResourceTabLayout(page, expectedMode) { + await page.waitForFunction( + ({ mode }) => { + const shell = document.querySelector('.document-pane[data-pane-role="primary"] .document-shell'); + const panel = Array.from(document.querySelectorAll(".mnote-resource-tab-panel")) + .find((node) => node instanceof HTMLElement && !node.hidden && node.getAttribute("data-resource-kind") === "office"); + const frame = panel?.querySelector("iframe.mnote-resource-tab-frame"); + const frameDocument = frame instanceof HTMLIFrameElement ? frame.contentDocument : null; + return shell instanceof HTMLElement + && shell.getAttribute("data-page-width-content-type") === "ppt" + && shell.getAttribute("data-page-width-resolved-mode") === mode + && frameDocument?.documentElement?.getAttribute("data-mnote-office-preview-status") === "完成" + && frameDocument.documentElement.getAttribute("data-page-width-resolved-mode") === mode + && frameDocument.querySelector(".mnote-office-pptx-stage"); + }, + { mode: expectedMode }, + { timeout: UI_TIMEOUT_MS }, + ); + return await page.evaluate((mode) => { + const rectOf = (node) => { + if (!(node instanceof Element)) return null; + const rect = node.getBoundingClientRect(); + return { left: rect.left, width: rect.width }; + }; + const shell = document.querySelector('.document-pane[data-pane-role="primary"] .document-shell'); + const panel = Array.from(document.querySelectorAll(".mnote-resource-tab-panel")) + .find((node) => node instanceof HTMLElement && !node.hidden && node.getAttribute("data-resource-kind") === "office"); + const frame = panel?.querySelector("iframe.mnote-resource-tab-frame"); + const frameDocument = frame instanceof HTMLIFrameElement ? frame.contentDocument : null; + const viewer = frameDocument?.querySelector("#mnote-office-viewer"); + const stage = frameDocument?.querySelector(".mnote-office-pptx-stage"); + const viewerRect = rectOf(viewer); + const stageRect = rectOf(stage); + return { + expectedMode: mode, + viewportWidth: window.innerWidth, + shellMode: shell?.getAttribute("data-page-width-resolved-mode") || "", + shellContentType: shell?.getAttribute("data-page-width-content-type") || "", + documentMode: document.documentElement.getAttribute("data-page-width-resolved-mode") || "", + activeResourceWidthType: document.documentElement.getAttribute("data-mnote-active-resource-width-type") || "", + iframeMode: frameDocument?.documentElement?.getAttribute("data-page-width-resolved-mode") || "", + shell: rectOf(shell), + panel: rectOf(panel), + frame: rectOf(frame), + viewer: viewerRect, + stage: stageRect, + }; + }, expectedMode); +} + +async function clickEditorPptxLink(page, context, titleContains) { + await page.waitForFunction( + (needle) => { + return Array.from(document.querySelectorAll('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror a')) + .some((node) => { + const rect = node.getBoundingClientRect(); + return (node.textContent || "").includes(needle) && rect.width > 0 && rect.height > 0; + }); + }, + titleContains, + { timeout: UI_TIMEOUT_MS }, + ); + const target = await page.evaluate((needle) => { + const candidates = Array.from(document.querySelectorAll('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror a')); + for (let index = candidates.length - 1; index >= 0; index -= 1) { + const node = candidates[index]; + const rect = node.getBoundingClientRect(); + if (!(node.textContent || "").includes(needle) || rect.width <= 0 || rect.height <= 0) continue; + return { + href: node instanceof HTMLAnchorElement ? node.href : "", + rect: { x: rect.x, y: rect.y, width: rect.width, height: rect.height }, + }; + } + return null; + }, titleContains); + assert(target?.href, `编辑器附件缺少 href: ${titleContains}`); + assert(target?.rect, `编辑器附件链接不可见或无坐标: ${titleContains}`); + await page.mouse.click(target.rect.x + target.rect.width / 2, target.rect.y + target.rect.height / 2); + await page.waitForFunction( + (needle) => { + const activePanel = document.querySelector('.mnote-resource-tab-panel:not([hidden])'); + const activeFrame = activePanel?.querySelector?.('iframe.mnote-resource-tab-frame'); + const frameSrc = activeFrame instanceof HTMLIFrameElement ? activeFrame.getAttribute('src') || '' : ''; + return decodeURIComponent(frameSrc.replace(/\+/g, ' ')).includes(needle) + || decodeURIComponent(location.href.replace(/\+/g, ' ')).includes(needle); + }, + titleContains, + { timeout: UI_TIMEOUT_MS }, + ); + await page.locator('.mnote-resource-tab-panel:not([hidden]) iframe.mnote-resource-tab-frame').first().waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); +} + +async function activatePrimaryPageTab(page) { + const pageTab = page.locator('[data-mnote-main-tab="page"][data-pane-role="primary"]').first(); + await pageTab.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); + await pageTab.click({ timeout: UI_TIMEOUT_MS }); + await page.locator('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror').first().waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); +} + +function assertLocalUploadSaveVersions(result, expectedCount) { + const saves = result.documentSaveRequests.filter((item) => item.editorSource === "local-upload-runtime"); + assert( + saves.length >= expectedCount, + `local-upload-runtime 保存次数不足: expected>=${expectedCount}, actual=${saves.length}`, + ); + saves.slice(0, expectedCount).forEach((item, index) => { + assert( + item.expectedFileVersion, + `第 ${index + 1} 次附件正文保存缺少 expectedFileVersion: ${JSON.stringify(item)}`, + ); + assert( + item.writeIntentId, + `第 ${index + 1} 次附件正文保存缺少 writeIntentId: ${JSON.stringify(item)}`, + ); + assert( + item.saveOperationId, + `第 ${index + 1} 次附件正文保存缺少 saveOperationId: ${JSON.stringify(item)}`, + ); + }); +} + +function delay(ms) { + return new Promise((resolve) => setTimeout(resolve, ms)); +} + +async function typeLineAfterUpload(page, text) { + const editor = page.locator('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror').first(); + await editor.click({ timeout: UI_TIMEOUT_MS }); + await page.keyboard.press("End").catch(() => undefined); + await page.keyboard.press("Enter"); + await page.keyboard.type(text); +} + +async function waitForFileTreeAssetRows(page, expectedCount) { + await page.waitForFunction( + ({ count }) => { + return Array.from(document.querySelectorAll('#sidebar-file-tree-root [data-testid="filetree-asset-row"]')) + .filter((row) => /\.pptx/i.test(row.textContent || "")) + .length >= count; + }, + { count: expectedCount }, + { timeout: UI_TIMEOUT_MS }, + ); + return await page.evaluate(() => Array.from(document.querySelectorAll('#sidebar-file-tree-root [data-testid="filetree-asset-row"]')) + .filter((row) => /\.pptx/i.test(row.textContent || "")) + .map((row) => ({ + title: row.textContent?.trim() || "", + rowId: row.getAttribute("data-row-id") || "", + assetId: row.getAttribute("data-asset-id") || "", + localRelativePath: row.getAttribute("data-local-relative-path") || "", + objectIdentity: row.getAttribute("data-object-identity") || "", + }))); +} + +async function clickPptxFileTreeRow(page, titleContains) { + const row = page.locator('#sidebar-file-tree-root [data-testid="filetree-asset-row"]', { hasText: titleContains }).last(); + await row.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); + await row.click({ timeout: UI_TIMEOUT_MS }); + await page.waitForFunction( + (needle) => { + const active = document.querySelector('[data-testid="document-resource-tab"][data-active="true"], [data-mnote-resource-tab][data-active="true"]'); + if (active instanceof HTMLElement && (active.textContent || "").includes(needle)) return true; + return decodeURIComponent(location.href.replace(/\+/g, " ")).includes(needle); + }, + titleContains, + { timeout: UI_TIMEOUT_MS }, + ); +} + +async function waitForLocalFile(filePath) { + const startedAt = Date.now(); + while (Date.now() - startedAt < UI_TIMEOUT_MS) { + if (fs.existsSync(filePath)) return; + await new Promise((resolve) => setTimeout(resolve, 100)); + } + assert(fs.existsSync(filePath), `文件应存在: ${filePath}`); +} + +async function dispatchPptxDrop(page, filePath, targetText) { + const buffer = fs.readFileSync(filePath); + const base64 = buffer.toString("base64"); + const fileName = path.basename(filePath); + const target = page.locator('#sidebar-file-tree-root .tree-row[data-row-kind="folder"]', { hasText: targetText }).first(); + await target.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); + await target.dispatchEvent("dragover", { + dataTransfer: await page.evaluateHandle(({ name, payload }) => { + const bytes = Uint8Array.from(atob(payload), (char) => char.charCodeAt(0)); + const transfer = new DataTransfer(); + transfer.items.add(new File([bytes], name, { + type: "application/vnd.openxmlformats-officedocument.presentationml.presentation", + })); + return transfer; + }, { name: fileName, payload: base64 }), + }); + await target.dispatchEvent("drop", { + dataTransfer: await page.evaluateHandle(({ name, payload }) => { + const bytes = Uint8Array.from(atob(payload), (char) => char.charCodeAt(0)); + const transfer = new DataTransfer(); + transfer.items.add(new File([bytes], name, { + type: "application/vnd.openxmlformats-officedocument.presentationml.presentation", + })); + return transfer; + }, { name: fileName, payload: base64 }), + }); +} + +async function main() { + assert(fs.existsSync(PPTX_PATH), `测试 pptx 不存在: ${PPTX_PATH}`); + fs.mkdirSync(OUTPUT_DIR, { recursive: true }); + const root = fs.mkdtempSync(path.join(os.tmpdir(), "mnote-task503-pptx-")); + const relativePath = "README/README.md"; + const resourceDir = path.join(root, "README"); + const fileName = path.basename(PPTX_PATH); + writeWorkspaceManifest(root, "mnote-e2e"); + fs.mkdirSync(resourceDir, { recursive: true }); + fs.writeFileSync(path.join(root, relativePath), "# PPTX Upload\n\n正文\n", "utf8"); + + const browser = await chromium.launch({ + headless: process.env.HEADFUL !== "1", + executablePath: CHROMIUM_EXECUTABLE_PATH, + }); + const context = await browser.newContext({ + viewport: { width: 1366, height: 900 }, + extraHTTPHeaders: { + "x-mnote-actor-id": "mnote-e2e", + "x-mnote-actor-type": "user", + }, + }); + const page = await context.newPage(); + const result = { root, fileName, states: [], console: [], pageErrors: [], documentSaveRequests: [] }; + page.on("console", (message) => result.console.push({ type: message.type(), text: message.text() })); + page.on("pageerror", (error) => result.pageErrors.push(String(error && error.stack || error))); + page.on("request", (request) => { + try { + const url = new URL(request.url()); + if (url.pathname !== "/api/documents/save" || request.method() !== "POST") return; + const payload = JSON.parse(request.postData() || "{}"); + result.documentSaveRequests.push({ + editorSource: String(payload.editorSource || ""), + documentId: String(payload.documentId || ""), + expectedFileVersion: String(payload.expectedFileVersion || ""), + writeIntentId: String(payload.writeIntentId || ""), + saveOperationId: String(payload.saveOperationId || ""), + blockCount: Number(payload.blockCount || 0), + }); + } catch (_error) { + // ignore diagnostics-only capture failures + } + }); + + try { + await quickLogin(page); + await setPptPageWidth(context, root, relativePath, "full"); + await openDocument(page, root, relativePath); + + await uploadAttachmentViaSlash(page, PPTX_PATH); + const firstLinks = await waitForEditorLinks(page, 1); + const firstConflictState = await assertNoConflict(page, "first-editor-upload"); + assertLocalUploadSaveVersions(result, 1); + result.states.push({ step: "first-editor-upload", links: firstLinks, conflictState: firstConflictState }); + await typeLineAfterUpload(page, "第一份附件后的正文"); + const afterFirstEditConflictState = await assertNoConflict(page, "after-first-upload-edit"); + result.states.push({ step: "after-first-upload-edit", conflictState: afterFirstEditConflictState }); + + await uploadAttachmentViaSlash(page, PPTX_PATH); + const secondLinks = await waitForEditorLinks(page, 2); + const secondConflictState = await assertNoConflict(page, "second-editor-upload"); + assertLocalUploadSaveVersions(result, 2); + await delay(1800); + const editorRows = await waitForFileTreeAssetRows(page, 2); + result.states.push({ step: "second-editor-upload", links: secondLinks, conflictState: secondConflictState, fileTreeRows: editorRows }); + assert(editorRows.every((row) => row.localRelativePath), `文件树上传行缺少本地路径: ${JSON.stringify(editorRows)}`); + await openDocument(page, root, relativePath); + await waitForEditorLinks(page, 2); + await clickEditorPptxLink(page, context, fileName); + await activatePrimaryPageTab(page); + await clickEditorPptxLink(page, context, fileName.replace(/\.pptx$/i, "-1.pptx")); + await clickPptxFileTreeRow(page, fileName.replace(/\.pptx$/i, "-1.pptx")); + const fullWidthLayout = await waitForActivePptxResourceTabLayout(page, "full"); + assert(fullWidthLayout.panel?.width >= fullWidthLayout.viewportWidth - 320, `PPT 资源 tab 面板应使用主编辑区宽度: ${JSON.stringify(fullWidthLayout)}`); + assert(fullWidthLayout.frame?.width >= fullWidthLayout.viewportWidth - 320, `PPT 资源 tab iframe 应使用主编辑区宽度: ${JSON.stringify(fullWidthLayout)}`); + result.states.push({ step: "pptx-resource-tab-full-width", layout: fullWidthLayout }); + + await dispatchPptxDrop(page, PPTX_PATH, "README"); + const droppedFileName = fileName.replace(/\.pptx$/i, " 2.pptx"); + const droppedPath = path.join(resourceDir, droppedFileName); + await page.waitForFunction( + (targetPath) => document.documentElement.getAttribute("data-mnote-assets-local-applied") === "true" && targetPath, + droppedPath, + { timeout: UI_TIMEOUT_MS }, + ).catch(() => undefined); + await waitForLocalFile(droppedPath); + const finalRows = await waitForFileTreeAssetRows(page, 3); + result.states.push({ step: "filetree-drop-upload", droppedPath, fileTreeRows: finalRows }); + await clickPptxFileTreeRow(page, droppedFileName); + + await page.screenshot({ path: path.join(OUTPUT_DIR, "success.png"), fullPage: false }); + fs.writeFileSync(RESULT_PATH, `${JSON.stringify({ ok: true, ...result }, null, 2)}\n`, "utf8"); + console.log(JSON.stringify({ ok: true, resultPath: RESULT_PATH, root, fileName }, null, 2)); + } catch (error) { + const diagnostics = await page.evaluate(() => ({ + url: location.href, + lastUploadAssetId: document.documentElement.getAttribute("data-mnote-last-upload-asset-id") || "", + lastUploadInserted: document.documentElement.getAttribute("data-mnote-last-upload-inserted") || "", + assetsLocalApplied: document.documentElement.getAttribute("data-mnote-assets-local-applied") || "", + filetreeRows: Array.from(document.querySelectorAll('#sidebar-file-tree-root .tree-row[data-shell-mode="filetree"]')).map((row) => ({ + text: row.textContent?.trim() || "", + rowKind: row.getAttribute("data-row-kind") || "", + rowId: row.getAttribute("data-row-id") || "", + assetId: row.getAttribute("data-asset-id") || "", + localRelativePath: row.getAttribute("data-local-relative-path") || "", + })).slice(0, 80), + editorLinks: Array.from(document.querySelectorAll('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror a')).map((link) => ({ + text: link.textContent || "", + href: link.getAttribute("href") || "", + assetId: link.getAttribute("data-asset-id") || "", + className: link.getAttribute("class") || "", + })), + documentSessions: typeof window.__mnoteDebugDocumentSessions?.snapshot === "function" + ? window.__mnoteDebugDocumentSessions.snapshot() + : null, + aggregate: (() => { + try { + const script = document.getElementById("__MNOTE_PAGE_AGGREGATE__"); + return script ? JSON.parse(script.textContent || "null") : null; + } catch (_error) { + return null; + } + })(), + })).catch((err) => ({ diagnosticsError: String(err) })); + await page.screenshot({ path: path.join(OUTPUT_DIR, "failure.png"), fullPage: true }).catch(() => undefined); + fs.writeFileSync( + RESULT_PATH, + `${JSON.stringify({ ok: false, ...result, diagnostics, error: String(error && error.stack || error) }, null, 2)}\n`, + "utf8", + ); + console.error(JSON.stringify({ ok: false, resultPath: RESULT_PATH, root, diagnostics, error: String(error && error.stack || error) }, null, 2)); + process.exitCode = 1; + } finally { + await context.close().catch(() => undefined); + await browser.close().catch(() => undefined); + } +} + +main().catch((error) => { + console.error(error && error.stack ? error.stack : error); + process.exit(1); +}); diff --git a/scripts/task504-local-md-external-conflict-recovery-smoke.js b/scripts/task504-local-md-external-conflict-recovery-smoke.js new file mode 100644 index 00000000..f963ba9b --- /dev/null +++ b/scripts/task504-local-md-external-conflict-recovery-smoke.js @@ -0,0 +1,410 @@ +#!/usr/bin/env node +"use strict"; + +const assert = require("node:assert"); +const fs = require("node:fs"); +const os = require("node:os"); +const path = require("node:path"); +const { chromium } = require("playwright"); + +const BASE_URL = (process.env.MNOTE_WEB_SMOKE_BASE_URL || "http://127.0.0.1:3000").replace(/\/+$/, ""); +const UI_TIMEOUT_MS = Number(process.env.MNOTE_SMOKE_UI_TIMEOUT_MS || 30_000); +const OUTPUT_DIR = path.join(process.cwd(), "tmp", "task504-local-md-external-conflict-recovery-smoke"); +const RESULT_PATH = path.join(OUTPUT_DIR, "result.json"); +const CHROMIUM_EXECUTABLE_PATH = process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH + || ["/usr/bin/google-chrome-stable", "/usr/bin/google-chrome", "/snap/bin/chromium"] + .find((candidate) => fs.existsSync(candidate)); + +function fileUrl(localPath) { + return `file://${localPath}`; +} + +function localMdDocumentId(relativePath) { + return `local-md:${relativePath.replaceAll("/", "~2F")}`; +} + +function workspaceId(ownerId) { + return `local-ws:${ownerId}:task504`; +} + +function documentUrl(root, relativePath) { + const url = new URL(`${BASE_URL}/documents/${encodeURIComponent(localMdDocumentId(relativePath))}`); + url.searchParams.set("sourceKind", "local_folder"); + url.searchParams.set("rootUri", fileUrl(root)); + url.searchParams.set("treeView", "filetree"); + return url.toString(); +} + +function writeWorkspaceManifest(root, ownerId) { + const metadataDir = path.join(root, ".mnote"); + fs.mkdirSync(metadataDir, { recursive: true }); + fs.writeFileSync( + path.join(metadataDir, "workspace.json"), + `${JSON.stringify({ + workspaceId: workspaceId(ownerId), + ownerId, + createdAt: new Date().toISOString(), + capabilities: ["local_files", "markdown_edit", "asset_upload"], + }, null, 2)}\n`, + "utf8", + ); +} + +async function quickLogin(page) { + await page.goto(`${BASE_URL}/auth`, { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); + const quickLoginButton = page.getByRole("button", { name: "测试账号快速登录" }); + if (await quickLoginButton.count()) { + await quickLoginButton.click({ timeout: UI_TIMEOUT_MS }); + await page.waitForURL((url) => url.pathname === "/", { timeout: UI_TIMEOUT_MS }).catch(() => undefined); + } +} + +async function openDocument(page, root, relativePath) { + await page.goto(documentUrl(root, relativePath), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); + await page.locator('[data-testid="mnote-leptos-tiptap-island-editor-root"]').first().waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); + await page.locator('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror').first().waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); +} + +async function typeUnsavedEditorText(page, text) { + const editor = page.locator('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror').first(); + await editor.click({ timeout: UI_TIMEOUT_MS }); + await page.keyboard.press("End").catch(() => undefined); + await page.keyboard.press("Enter"); + await page.keyboard.type(text, { delay: 2 }); +} + +async function waitForFileContent(filePath, predicate, timeoutMs) { + const startedAt = Date.now(); + let lastContent = ""; + while (Date.now() - startedAt < timeoutMs) { + if (fs.existsSync(filePath)) { + lastContent = fs.readFileSync(filePath, "utf8"); + if (predicate(lastContent)) return lastContent; + } + await new Promise((resolve) => setTimeout(resolve, 120)); + } + throw new Error(`文件内容未达到预期: ${filePath}; lastContent=${JSON.stringify(lastContent)}`); +} + +function withTimeout(promise, timeoutMs, makeError) { + let timer = 0; + const timeout = new Promise((_, reject) => { + timer = setTimeout(async () => { + try { + const error = typeof makeError === "function" + ? await makeError() + : new Error(String(makeError || "operation_timeout")); + reject(error instanceof Error ? error : new Error(String(error))); + } catch (err) { + reject(err); + } + }, timeoutMs); + }); + return Promise.race([promise, timeout]).finally(() => { + if (timer) clearTimeout(timer); + }); +} + +async function captureEditorDiagnostics(page, extra = {}) { + return await page.evaluate((extraData) => ({ + ...extraData, + url: location.href, + status: document.querySelector('[data-runtime-editor-status]')?.getAttribute('data-runtime-editor-status') || "", + statusError: document.querySelector('[data-runtime-editor-error]')?.getAttribute('data-runtime-editor-error') || "", + conflictVisible: Boolean(document.querySelector('[data-testid="mnote-editor-conflict-panel"]')), + editorText: document.querySelector('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror')?.textContent || "", + panelText: document.querySelector('[data-testid="mnote-editor-conflict-panel"]')?.textContent || "", + sessions: typeof window.__mnoteDebugDocumentSessions?.snapshot === "function" + ? window.__mnoteDebugDocumentSessions.snapshot() + : null, + }), extra).catch((err) => ({ ...extra, diagnosticsError: String(err) })); +} + +async function waitForConflictState(page, expectedEditorText, expectedDiskText) { + await page.locator('[data-testid="mnote-editor-conflict-panel"]').first().waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); + await page.waitForFunction( + ({ editorNeedle, diskNeedle }) => { + const root = document.querySelector('[data-testid="mnote-leptos-tiptap-island-editor-root"]'); + const editor = document.querySelector('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror'); + const panel = document.querySelector('[data-testid="mnote-editor-conflict-panel"]'); + return root?.getAttribute("data-runtime-editor-status") === "external-change-conflict" + && (editor?.textContent || "").includes(editorNeedle) + && (panel?.textContent || "").includes("文件冲突") + && diskNeedle; + }, + { editorNeedle: expectedEditorText, diskNeedle: expectedDiskText }, + { timeout: UI_TIMEOUT_MS }, + ); + return await page.evaluate(() => { + const root = document.querySelector('[data-testid="mnote-leptos-tiptap-island-editor-root"]'); + const editor = document.querySelector('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror'); + const panel = document.querySelector('[data-testid="mnote-editor-conflict-panel"]'); + const sessions = typeof window.__mnoteDebugDocumentSessions?.snapshot === "function" + ? window.__mnoteDebugDocumentSessions.snapshot() + : null; + return { + status: root?.getAttribute("data-runtime-editor-status") || "", + statusError: root?.getAttribute("data-runtime-editor-error") || "", + editorText: editor?.textContent || "", + panelText: panel?.textContent || "", + sessions, + }; + }); +} + +async function triggerExternalConflict(page, markdownPath, editorToken, diskToken) { + await typeUnsavedEditorText(page, editorToken); + fs.writeFileSync(markdownPath, `# Conflict Base\n\n${diskToken}\n`, "utf8"); + const conflictState = await waitForConflictState(page, editorToken, diskToken); + assert(conflictState.editorText.includes(editorToken), `冲突后应保留编辑器未保存内容: ${JSON.stringify(conflictState)}`); + assert(conflictState.status === "external-change-conflict", `应进入外部冲突态: ${JSON.stringify(conflictState)}`); + return conflictState; +} + +async function openConflictDiff(page, editorToken, diskToken) { + await page.getByTestId("mnote-conflict-open-diff").click({ timeout: UI_TIMEOUT_MS }); + await page.locator('[data-testid="mnote-conflict-diff-panel"]').first().waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); + await page.waitForFunction( + ({ editorNeedle, diskNeedle }) => { + const current = document.querySelector('[data-testid="mnote-conflict-current-text"]')?.textContent || ""; + const disk = document.querySelector('[data-testid="mnote-conflict-disk-text"]')?.textContent || ""; + return current.includes(editorNeedle) && disk.includes(diskNeedle); + }, + { editorNeedle: editorToken, diskNeedle: diskToken }, + { timeout: UI_TIMEOUT_MS }, + ); + return await page.evaluate(() => ({ + currentText: document.querySelector('[data-testid="mnote-conflict-current-text"]')?.textContent || "", + diskText: document.querySelector('[data-testid="mnote-conflict-disk-text"]')?.textContent || "", + mergeText: document.querySelector('[data-testid="mnote-conflict-merge-text"]')?.value || "", + })); +} + +async function acceptDiskVersion(page, diskToken) { + await page.getByTestId("mnote-conflict-accept-disk").click({ timeout: UI_TIMEOUT_MS }); + await page.waitForFunction( + (needle) => { + const root = document.querySelector('[data-testid="mnote-leptos-tiptap-island-editor-root"]'); + const editorText = document.querySelector('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror')?.textContent || ""; + const conflictVisible = Boolean(document.querySelector('[data-testid="mnote-editor-conflict-panel"]')); + return !conflictVisible + && root?.getAttribute("data-runtime-editor-status") !== "external-change-conflict" + && editorText.includes(needle); + }, + diskToken, + { timeout: UI_TIMEOUT_MS }, + ); + return await page.evaluate(() => ({ + status: document.querySelector('[data-runtime-editor-status]')?.getAttribute('data-runtime-editor-status') || "", + editorText: document.querySelector('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror')?.textContent || "", + conflictVisible: Boolean(document.querySelector('[data-testid="mnote-editor-conflict-panel"]')), + })); +} + +async function keepCurrentVersion(page, markdownPath, editorToken) { + await page.getByTestId("mnote-conflict-keep-current").click({ timeout: UI_TIMEOUT_MS }); + await page.waitForFunction( + (needle) => { + const root = document.querySelector('[data-testid="mnote-leptos-tiptap-island-editor-root"]'); + const editorText = document.querySelector('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror')?.textContent || ""; + const conflictVisible = Boolean(document.querySelector('[data-testid="mnote-editor-conflict-panel"]')); + return !conflictVisible + && root?.getAttribute("data-runtime-editor-status") !== "external-change-conflict" + && editorText.includes(needle); + }, + editorToken, + { timeout: UI_TIMEOUT_MS }, + ); + const saved = await waitForFileContent(markdownPath, (content) => content.includes(editorToken), UI_TIMEOUT_MS); + return await page.evaluate((savedContent) => ({ + status: document.querySelector('[data-runtime-editor-status]')?.getAttribute('data-runtime-editor-status') || "", + editorText: document.querySelector('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror')?.textContent || "", + conflictVisible: Boolean(document.querySelector('[data-testid="mnote-editor-conflict-panel"]')), + savedContent, + }), saved); +} + +async function installDelayedFirstSave(page) { + const gate = { + enabled: false, + intercepted: false, + saveRequestCount: 0, + release: null, + interceptedPromise: null, + releasePromise: null, + }; + gate.interceptedPromise = new Promise((resolve) => { + gate.markIntercepted = resolve; + }); + gate.releasePromise = new Promise((resolve) => { + gate.release = resolve; + }); + const interceptSave = async (route) => { + gate.saveRequestCount += 1; + if (gate.enabled && !gate.intercepted) { + gate.intercepted = true; + gate.markIntercepted(); + await gate.releasePromise; + } + await route.continue(); + }; + await page.route("**/api/documents/save", interceptSave); + await page.route("**/api/page-body/write", interceptSave); + return gate; +} + +async function assertSaveWhileTypingKeepsDirty(page, markdownPath, firstToken, secondToken, gate) { + const saveRequestCountBeforeRace = gate.saveRequestCount; + gate.enabled = true; + await typeUnsavedEditorText(page, firstToken); + await withTimeout( + gate.interceptedPromise, + UI_TIMEOUT_MS, + async () => new Error(`保存请求未被拦截: ${JSON.stringify(await captureEditorDiagnostics(page, { + saveRequestCount: gate.saveRequestCount, + firstToken, + secondToken, + }))}`), + ); + await typeUnsavedEditorText(page, secondToken); + gate.release(); + await page.waitForFunction( + ({ firstNeedle, secondNeedle }) => { + const root = document.querySelector('[data-testid="mnote-leptos-tiptap-island-editor-root"]'); + const editorText = document.querySelector('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror')?.textContent || ""; + const conflictVisible = Boolean(document.querySelector('[data-testid="mnote-editor-conflict-panel"]')); + return !conflictVisible + && root?.getAttribute("data-runtime-editor-status") !== "external-change-conflict" + && editorText.includes(firstNeedle) + && editorText.includes(secondNeedle); + }, + { firstNeedle: firstToken, secondNeedle: secondToken }, + { timeout: UI_TIMEOUT_MS }, + ); + const saved = await waitForFileContent( + markdownPath, + (content) => content.includes(firstToken) && content.includes(secondToken), + UI_TIMEOUT_MS, + ); + assert( + gate.saveRequestCount >= saveRequestCountBeforeRace + 2, + `保存中继续输入应触发第二轮保存: before=${saveRequestCountBeforeRace}; after=${gate.saveRequestCount}`, + ); + return await page.evaluate(({ savedContent, saveRequestCountBeforeRace, saveRequestCountAfterRace }) => ({ + status: document.querySelector('[data-runtime-editor-status]')?.getAttribute('data-runtime-editor-status') || "", + editorText: document.querySelector('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror')?.textContent || "", + conflictVisible: Boolean(document.querySelector('[data-testid="mnote-editor-conflict-panel"]')), + savedContent, + saveRequestCountBeforeRace, + saveRequestCountAfterRace, + }), { + savedContent: saved, + saveRequestCountBeforeRace, + saveRequestCountAfterRace: gate.saveRequestCount, + }); +} + +async function main() { + fs.mkdirSync(OUTPUT_DIR, { recursive: true }); + const root = fs.mkdtempSync(path.join(os.tmpdir(), "mnote-task504-conflict-")); + const relativePath = "README.md"; + const keepRelativePath = "Keep.md"; + const raceRelativePath = "SaveRace.md"; + const markdownPath = path.join(root, relativePath); + const keepMarkdownPath = path.join(root, keepRelativePath); + const raceMarkdownPath = path.join(root, raceRelativePath); + writeWorkspaceManifest(root, "mnote-e2e"); + fs.writeFileSync(markdownPath, "# Conflict Base\n\n原始正文\n", "utf8"); + fs.writeFileSync(keepMarkdownPath, "# Conflict Base\n\n保留当前基线\n", "utf8"); + fs.writeFileSync(raceMarkdownPath, "# Save Race\n\n保存中继续输入基线\n", "utf8"); + + const browser = await chromium.launch({ + headless: process.env.HEADFUL !== "1", + executablePath: CHROMIUM_EXECUTABLE_PATH, + }); + const context = await browser.newContext({ + viewport: { width: 1366, height: 900 }, + extraHTTPHeaders: { + "x-mnote-actor-id": "mnote-e2e", + "x-mnote-actor-type": "user", + }, + }); + const page = await context.newPage(); + const delayedSaveGate = await installDelayedFirstSave(page); + const result = { root, relativePath, states: [], console: [], pageErrors: [] }; + page.on("console", (message) => result.console.push({ type: message.type(), text: message.text() })); + page.on("pageerror", (error) => result.pageErrors.push(String(error && error.stack || error))); + + try { + await quickLogin(page); + await openDocument(page, root, relativePath); + const editorToken = `编辑器未保存 ${Date.now()}`; + const diskToken = `磁盘外部修改 ${Date.now()}`; + const conflictState = await triggerExternalConflict(page, markdownPath, editorToken, diskToken); + result.states.push({ step: "external-edit-conflict", conflictState, diskText: fs.readFileSync(markdownPath, "utf8") }); + const diffState = await openConflictDiff(page, editorToken, diskToken); + result.states.push({ step: "open-diff", diffState }); + const acceptState = await acceptDiskVersion(page, diskToken); + result.states.push({ step: "accept-disk", acceptState }); + + await openDocument(page, root, keepRelativePath); + const keepEditorToken = `保留当前编辑器 ${Date.now()}`; + const keepDiskToken = `保留当前磁盘外部修改 ${Date.now()}`; + const keepConflictState = await triggerExternalConflict(page, keepMarkdownPath, keepEditorToken, keepDiskToken); + result.states.push({ step: "keep-current-conflict", conflictState: keepConflictState, diskText: fs.readFileSync(keepMarkdownPath, "utf8") }); + const keepState = await keepCurrentVersion(page, keepMarkdownPath, keepEditorToken); + result.states.push({ step: "keep-current", keepState }); + + await openDocument(page, root, raceRelativePath); + const firstRaceToken = `保存中第一段 ${Date.now()}`; + const secondRaceToken = `保存中第二段 ${Date.now()}`; + const raceState = await assertSaveWhileTypingKeepsDirty( + page, + raceMarkdownPath, + firstRaceToken, + secondRaceToken, + delayedSaveGate, + ); + result.states.push({ step: "save-while-typing", raceState }); + + await page.screenshot({ path: path.join(OUTPUT_DIR, "conflict.png"), fullPage: false }); + fs.writeFileSync(RESULT_PATH, `${JSON.stringify({ ok: true, ...result }, null, 2)}\n`, "utf8"); + console.log(JSON.stringify({ ok: true, resultPath: RESULT_PATH, root, conflictState }, null, 2)); + } catch (error) { + const diagnostics = await captureEditorDiagnostics(page, { + delayedSaveGate: { + enabled: delayedSaveGate.enabled, + intercepted: delayedSaveGate.intercepted, + saveRequestCount: delayedSaveGate.saveRequestCount, + }, + }); + await page.screenshot({ path: path.join(OUTPUT_DIR, "failure.png"), fullPage: true }).catch(() => undefined); + fs.writeFileSync( + RESULT_PATH, + `${JSON.stringify({ ok: false, ...result, diagnostics, diskText: fs.readFileSync(markdownPath, "utf8"), error: String(error && error.stack || error) }, null, 2)}\n`, + "utf8", + ); + console.error(JSON.stringify({ ok: false, resultPath: RESULT_PATH, root, diagnostics, error: String(error && error.stack || error) }, null, 2)); + process.exitCode = 1; + } finally { + await context.close().catch(() => undefined); + await browser.close().catch(() => undefined); + } +} + +main().catch((error) => { + console.error(error && error.stack ? error.stack : error); + process.exit(1); +}); diff --git a/scripts/task505-resource-tab-watch-contract-smoke.js b/scripts/task505-resource-tab-watch-contract-smoke.js new file mode 100644 index 00000000..2eca379b --- /dev/null +++ b/scripts/task505-resource-tab-watch-contract-smoke.js @@ -0,0 +1,273 @@ +#!/usr/bin/env node +"use strict"; + +const assert = require("node:assert"); +const fs = require("node:fs"); +const os = require("node:os"); +const path = require("node:path"); +const { chromium } = require("playwright"); + +const BASE_URL = (process.env.MNOTE_WEB_SMOKE_BASE_URL || "http://127.0.0.1:3000").replace(/\/+$/, ""); +const UI_TIMEOUT_MS = Number(process.env.MNOTE_SMOKE_UI_TIMEOUT_MS || 30_000); +const CHROMIUM_EXECUTABLE_PATH = process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH + || ["/usr/bin/google-chrome-stable", "/usr/bin/google-chrome", "/snap/bin/chromium"] + .find((candidate) => fs.existsSync(candidate)); + +function fileUrl(localPath) { + return `file://${localPath}`; +} + +function localMdDocumentId(relativePath) { + return `local-md:${relativePath.replaceAll("/", "~2F")}`; +} + +function documentUrl(root, relativePath) { + const url = new URL(`${BASE_URL}/documents/${encodeURIComponent(localMdDocumentId(relativePath))}`); + url.searchParams.set("sourceKind", "local_folder"); + url.searchParams.set("rootUri", fileUrl(root)); + url.searchParams.set("treeView", "filetree"); + return url.toString(); +} + +function writeWorkspaceManifest(root, ownerId) { + const metadataDir = path.join(root, ".mnote"); + fs.mkdirSync(metadataDir, { recursive: true }); + fs.writeFileSync( + path.join(metadataDir, "workspace.json"), + `${JSON.stringify({ + workspaceId: `local-ws:${ownerId}:task505`, + ownerId, + createdAt: new Date().toISOString(), + capabilities: ["local_files", "markdown_edit", "asset_upload"], + }, null, 2)}\n`, + "utf8", + ); +} + +async function quickLogin(page) { + await page.goto(`${BASE_URL}/auth`, { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); + const quickLoginButton = page.getByRole("button", { name: "测试账号快速登录" }); + if (await quickLoginButton.count()) { + await quickLoginButton.click({ timeout: UI_TIMEOUT_MS }); + await page.waitForURL((url) => url.pathname === "/", { timeout: UI_TIMEOUT_MS }).catch(() => undefined); + } +} + +async function uploadLocalAsset(page, root, documentId, fileName, mimeType, bytes, kind) { + return await page.evaluate( + async ({ rootUri, documentId, fileName, mimeType, bytes, kind }) => { + const form = new FormData(); + form.append("rootUri", rootUri); + form.append("documentId", documentId); + form.append("uploadIntent", "editor.markdown.attach"); + form.append("kind", kind); + form.append("file", new File([new Uint8Array(bytes)], fileName, { type: mimeType })); + const response = await fetch("/api/local-folder/assets/upload", { method: "POST", body: form }); + const payload = await response.json().catch(() => null); + if (!response.ok || !payload || payload.ok !== true) { + throw new Error(`upload_failed_${response.status}:${JSON.stringify(payload)}`); + } + return payload.asset; + }, + { rootUri: fileUrl(root), documentId, fileName, mimeType, bytes: Array.from(bytes), kind }, + ); +} + +async function openResourceTab(page, asset, documentId) { + await page.evaluate(({ asset, documentId }) => { + window.dispatchEvent(new CustomEvent("tree.asset.open", { + detail: { + assetId: asset.id, + documentId, + title: asset.file_name || "resource-note.md", + assetType: asset.asset_type || "attachment", + }, + })); + }, { asset, documentId }); + await page.locator('[data-testid="mnote-resource-tab-host"]:not([hidden])').waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); + await page.locator('.mnote-resource-tab-panel:not([hidden]) .editor-surface .ProseMirror[contenteditable="true"]').first().waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); +} + +async function main() { + const root = fs.mkdtempSync(path.join(os.tmpdir(), "mnote-task505-resource-watch-")); + const relativePath = "README.md"; + const documentId = localMdDocumentId(relativePath); + const resourceRelativePath = "README/resource-note.md"; + const resourcePath = path.join(root, resourceRelativePath); + writeWorkspaceManifest(root, "mnote-e2e"); + fs.writeFileSync(path.join(root, relativePath), "# Page\n\n页面正文保持不变\n", "utf8"); + + const browser = await chromium.launch({ + headless: process.env.HEADFUL !== "1", + executablePath: CHROMIUM_EXECUTABLE_PATH, + }); + const context = await browser.newContext({ + viewport: { width: 1366, height: 900 }, + extraHTTPHeaders: { + "x-mnote-actor-id": "mnote-e2e", + "x-mnote-actor-type": "user", + }, + }); + const page = await context.newPage(); + const result = { root, resourceRelativePath, states: [] }; + try { + await quickLogin(page); + await page.goto(documentUrl(root, relativePath), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); + await page.locator('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror').first().waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); + const asset = await uploadLocalAsset( + page, + root, + documentId, + "resource-note.md", + "text/markdown", + Buffer.from("# Resource Note\n\n旧资源正文\n", "utf8"), + "attachment", + ); + await page.goto(documentUrl(root, relativePath), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); + await openResourceTab(page, asset, documentId); + await page.waitForFunction( + (resourceNeedle) => { + const snapshot = typeof window.__mnoteDebugDocumentSessions?.snapshot === "function" + ? window.__mnoteDebugDocumentSessions.snapshot() + : null; + return Array.isArray(snapshot?.localFolderRoots) + && snapshot.localFolderRoots.some((item) => String(item || "").includes(`resource:${resourceNeedle}`)); + }, + resourceRelativePath, + { timeout: UI_TIMEOUT_MS }, + ); + + const externalCleanToken = `外部资源更新 ${Date.now()}`; + fs.writeFileSync(resourcePath, `# Resource Note\n\n${externalCleanToken}\n`, "utf8"); + await page.waitForFunction( + (needle) => { + const resourceText = document.querySelector('.mnote-resource-tab-panel:not([hidden]) .editor-surface .ProseMirror')?.textContent || ""; + const pageConflict = Boolean(document.querySelector('.document-pane[data-pane-role="primary"] > [data-testid="mnote-editor-conflict-panel"]')); + return resourceText.includes(needle) && !pageConflict; + }, + externalCleanToken, + { timeout: UI_TIMEOUT_MS }, + ); + result.states.push({ step: "clean-resource-external-update", externalCleanToken }); + + const editor = page.locator('.mnote-resource-tab-panel:not([hidden]) .editor-surface .ProseMirror[contenteditable="true"]').first(); + const dirtyToken = `资源未保存 ${Date.now()}`; + const externalDirtyToken = `资源外部二次更新 ${Date.now()}`; + await editor.click({ timeout: UI_TIMEOUT_MS }); + await page.keyboard.press(process.platform === "darwin" ? "Meta+End" : "Control+End").catch(() => undefined); + await page.keyboard.type(`\n${dirtyToken}`, { delay: 2 }); + fs.writeFileSync(resourcePath, `# Resource Note\n\n${externalDirtyToken}\n`, "utf8"); + await page.waitForFunction( + ({ dirtyNeedle }) => { + const resourceText = document.querySelector('.mnote-resource-tab-panel:not([hidden]) .editor-surface .ProseMirror')?.textContent || ""; + const resourceConflict = document.querySelector('.mnote-resource-tab-panel:not([hidden]) [data-testid="mnote-editor-conflict-panel"]'); + const pageConflict = Boolean(document.querySelector('.document-pane[data-pane-role="primary"] > [data-testid="mnote-editor-conflict-panel"]')); + return resourceText.includes(dirtyNeedle) + && Boolean(resourceConflict) + && /资源文件已在外部更新|文件冲突/.test(resourceConflict.textContent || "") + && !pageConflict; + }, + { dirtyNeedle: dirtyToken }, + { timeout: UI_TIMEOUT_MS }, + ); + result.states.push({ step: "dirty-resource-external-conflict", dirtyToken, externalDirtyToken }); + + const finalState = await page.evaluate(() => ({ + resourceStatus: document.querySelector('.mnote-resource-tab-panel:not([hidden]) [data-runtime-editor-status]')?.getAttribute('data-runtime-editor-status') || "", + resourceText: document.querySelector('.mnote-resource-tab-panel:not([hidden]) .editor-surface .ProseMirror')?.textContent || "", + resourceConflictText: document.querySelector('.mnote-resource-tab-panel:not([hidden]) [data-testid="mnote-editor-conflict-panel"]')?.textContent || "", + pageText: document.querySelector('.document-pane[data-pane-role="primary"] > .document-shell .editor-surface .ProseMirror')?.textContent || "", + pageConflictVisible: Boolean(document.querySelector('.document-pane[data-pane-role="primary"] > [data-testid="mnote-editor-conflict-panel"]')), + sessions: typeof window.__mnoteDebugDocumentSessions?.snapshot === "function" + ? window.__mnoteDebugDocumentSessions.snapshot() + : null, + })); + assert.equal(finalState.pageConflictVisible, false, `资源冲突不应污染正文页面: ${JSON.stringify(finalState)}`); + assert(finalState.resourceText.includes(dirtyToken), `资源冲突后应保留未保存内容: ${JSON.stringify(finalState)}`); + result.states.push({ step: "final", finalState }); + const officeAsset = await uploadLocalAsset( + page, + root, + documentId, + "resource-office.docx", + "application/vnd.openxmlformats-officedocument.wordprocessingml.document", + Buffer.from("task505 office initial", "utf8"), + "attachment", + ); + const officePath = path.join(root, "README", "resource-office.docx"); + await page.evaluate(({ asset, documentId }) => { + window.dispatchEvent(new CustomEvent("tree.asset.open", { + detail: { + assetId: asset.id, + documentId, + title: asset.file_name || "resource-office.docx", + assetType: asset.asset_type || "attachment", + }, + })); + }, { asset: officeAsset, documentId }); + await page.locator('.mnote-resource-tab-panel:not([hidden]) iframe.mnote-resource-tab-frame').first().waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); + await page.locator('.mnote-resource-tab-panel:not([hidden])[data-mnote-resource-watch-ready="true"]').waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); + const officeFrameBefore = await page.locator('.mnote-resource-tab-panel:not([hidden]) iframe.mnote-resource-tab-frame').first().getAttribute("src"); + fs.writeFileSync(officePath, "task505 office externally updated", "utf8"); + await page.waitForFunction( + (previousSrc) => { + const frame = document.querySelector('.mnote-resource-tab-panel:not([hidden]) iframe.mnote-resource-tab-frame'); + const src = frame instanceof HTMLIFrameElement ? String(frame.getAttribute('src') || frame.src || '') : ''; + return src && src !== previousSrc && src.includes('mnoteResourceReload='); + }, + officeFrameBefore, + { timeout: UI_TIMEOUT_MS }, + ); + result.states.push({ step: "passive-office-external-update", officeFrameBefore }); + fs.unlinkSync(officePath); + await page.locator('.mnote-resource-tab-panel:not([hidden]) [data-mnote-resource-missing="true"]').first().waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); + const officeMissingState = await page.evaluate(() => ({ + activeKind: document.querySelector('.mnote-main-tab.is-active')?.getAttribute('data-mnote-tab-kind') || '', + missingText: document.querySelector('.mnote-resource-tab-panel:not([hidden]) [data-mnote-resource-missing="true"]')?.textContent || '', + pageConflictVisible: Boolean(document.querySelector('.document-pane[data-pane-role="primary"] > [data-testid="mnote-editor-conflict-panel"]')), + })); + assert.equal(officeMissingState.pageConflictVisible, false, `Office 删除态不应污染正文页面: ${JSON.stringify(officeMissingState)}`); + result.states.push({ step: "passive-office-delete-missing", officeMissingState }); + console.log(JSON.stringify({ ok: true, ...result }, null, 2)); + } catch (error) { + const diagnostics = await page.evaluate(() => ({ + url: location.href, + resourceText: document.querySelector('.mnote-resource-tab-panel:not([hidden]) .editor-surface .ProseMirror')?.textContent || "", + resourceStatus: document.querySelector('.mnote-resource-tab-panel:not([hidden]) [data-runtime-editor-status]')?.getAttribute('data-runtime-editor-status') || "", + resourceConflictText: document.querySelector('.mnote-resource-tab-panel:not([hidden]) [data-testid="mnote-editor-conflict-panel"]')?.textContent || "", + pageText: document.querySelector('.document-pane[data-pane-role="primary"] > .document-shell .editor-surface .ProseMirror')?.textContent || "", + pageConflictVisible: Boolean(document.querySelector('.document-pane[data-pane-role="primary"] > [data-testid="mnote-editor-conflict-panel"]')), + sessions: typeof window.__mnoteDebugDocumentSessions?.snapshot === "function" + ? window.__mnoteDebugDocumentSessions.snapshot() + : null, + })).catch((diagnosticsError) => ({ diagnosticsError: String(diagnosticsError) })); + console.error(JSON.stringify({ ok: false, ...result, diagnostics, error: String(error && error.stack || error) }, null, 2)); + process.exitCode = 1; + } finally { + await context.close().catch(() => undefined); + await browser.close().catch(() => undefined); + } +} + +main().catch((error) => { + console.error(error && error.stack ? error.stack : error); + process.exit(1); +}); diff --git a/scripts/task506-local-md-delete-move-lifecycle-smoke.js b/scripts/task506-local-md-delete-move-lifecycle-smoke.js new file mode 100644 index 00000000..b62da5ca --- /dev/null +++ b/scripts/task506-local-md-delete-move-lifecycle-smoke.js @@ -0,0 +1,179 @@ +#!/usr/bin/env node +"use strict"; + +const assert = require("node:assert"); +const fs = require("node:fs"); +const os = require("node:os"); +const path = require("node:path"); +const { chromium } = require("playwright"); + +const BASE_URL = (process.env.MNOTE_WEB_SMOKE_BASE_URL || "http://127.0.0.1:3000").replace(/\/+$/, ""); +const UI_TIMEOUT_MS = Number(process.env.MNOTE_SMOKE_UI_TIMEOUT_MS || 30_000); +const CHROMIUM_EXECUTABLE_PATH = process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH + || ["/usr/bin/google-chrome-stable", "/usr/bin/google-chrome", "/snap/bin/chromium"] + .find((candidate) => fs.existsSync(candidate)); + +function fileUrl(localPath) { + return `file://${localPath}`; +} + +function localMdDocumentId(relativePath) { + return `local-md:${relativePath.replaceAll("/", "~2F")}`; +} + +function documentUrl(root, relativePath) { + const url = new URL(`${BASE_URL}/documents/${encodeURIComponent(localMdDocumentId(relativePath))}`); + url.searchParams.set("sourceKind", "local_folder"); + url.searchParams.set("rootUri", fileUrl(root)); + url.searchParams.set("treeView", "filetree"); + return url.toString(); +} + +function writeWorkspaceManifest(root, ownerId) { + const metadataDir = path.join(root, ".mnote"); + fs.mkdirSync(metadataDir, { recursive: true }); + fs.writeFileSync( + path.join(metadataDir, "workspace.json"), + `${JSON.stringify({ + workspaceId: `local-ws:${ownerId}:task506`, + ownerId, + createdAt: new Date().toISOString(), + capabilities: ["local_files", "markdown_edit", "asset_upload"], + }, null, 2)}\n`, + "utf8", + ); +} + +async function quickLogin(page) { + await page.goto(`${BASE_URL}/auth`, { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); + const quickLoginButton = page.getByRole("button", { name: "测试账号快速登录" }); + if (await quickLoginButton.count()) { + await quickLoginButton.click({ timeout: UI_TIMEOUT_MS }); + await page.waitForURL((url) => url.pathname === "/", { timeout: UI_TIMEOUT_MS }).catch(() => undefined); + } +} + +async function openDocument(page, root, relativePath) { + await page.goto(documentUrl(root, relativePath), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); + await page.locator('[data-testid="mnote-leptos-tiptap-island-editor-root"]').first().waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); + await page.locator('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror').first().waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); +} + +async function waitForDeletedConflict(page, retainedText) { + await page.waitForFunction( + (needle) => { + const root = document.querySelector('[data-testid="mnote-leptos-tiptap-island-editor-root"]'); + const editorText = document.querySelector('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror')?.textContent || ""; + const panelText = document.querySelector('[data-testid="mnote-editor-conflict-panel"]')?.textContent || ""; + const snapshot = typeof window.__mnoteDebugDocumentSessions?.snapshot === "function" + ? window.__mnoteDebugDocumentSessions.snapshot() + : null; + const envelopeDirtyState = snapshot?.sessions?.[0]?.lastExternalConflictEnvelope?.dirtyState || ""; + return root?.getAttribute("data-runtime-editor-status") === "external-change-conflict" + && editorText.includes(needle) + && panelText.includes("已被删除") + && envelopeDirtyState === "Deleted"; + }, + retainedText, + { timeout: UI_TIMEOUT_MS }, + ); + return await page.evaluate(() => ({ + status: document.querySelector('[data-testid="mnote-leptos-tiptap-island-editor-root"]')?.getAttribute("data-runtime-editor-status") || "", + editorText: document.querySelector('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror')?.textContent || "", + panelText: document.querySelector('[data-testid="mnote-editor-conflict-panel"]')?.textContent || "", + sessions: typeof window.__mnoteDebugDocumentSessions?.snapshot === "function" + ? window.__mnoteDebugDocumentSessions.snapshot() + : null, + })); +} + +async function waitForExternalMoveConflict(page, retainedText) { + await page.waitForFunction( + (needle) => { + const root = document.querySelector('[data-testid="mnote-leptos-tiptap-island-editor-root"]'); + const editorText = document.querySelector('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror')?.textContent || ""; + const panelText = document.querySelector('[data-testid="mnote-editor-conflict-panel"]')?.textContent || ""; + return root?.getAttribute("data-runtime-editor-status") === "external-change-conflict" + && editorText.includes(needle) + && panelText.includes("文件冲突"); + }, + retainedText, + { timeout: UI_TIMEOUT_MS }, + ); + return await page.evaluate(() => ({ + status: document.querySelector('[data-testid="mnote-leptos-tiptap-island-editor-root"]')?.getAttribute("data-runtime-editor-status") || "", + editorText: document.querySelector('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror')?.textContent || "", + panelText: document.querySelector('[data-testid="mnote-editor-conflict-panel"]')?.textContent || "", + sessions: typeof window.__mnoteDebugDocumentSessions?.snapshot === "function" + ? window.__mnoteDebugDocumentSessions.snapshot() + : null, + })); +} + +async function main() { + const root = fs.mkdtempSync(path.join(os.tmpdir(), "mnote-task506-lifecycle-")); + const deleteRelativePath = "DeleteMe.md"; + const moveRelativePath = "MoveMe.md"; + writeWorkspaceManifest(root, "mnote-e2e"); + fs.writeFileSync(path.join(root, deleteRelativePath), "# Delete Me\n\n保留删除 buffer\n", "utf8"); + fs.writeFileSync(path.join(root, moveRelativePath), "# Move Me\n\n保留移动 buffer\n", "utf8"); + + const browser = await chromium.launch({ + headless: process.env.HEADFUL !== "1", + executablePath: CHROMIUM_EXECUTABLE_PATH, + }); + const context = await browser.newContext({ + viewport: { width: 1366, height: 900 }, + extraHTTPHeaders: { + "x-mnote-actor-id": "mnote-e2e", + "x-mnote-actor-type": "user", + }, + }); + const page = await context.newPage(); + try { + await quickLogin(page); + await openDocument(page, root, deleteRelativePath); + fs.rmSync(path.join(root, deleteRelativePath)); + const deletedState = await waitForDeletedConflict(page, "保留删除 buffer"); + + await openDocument(page, root, moveRelativePath); + fs.renameSync(path.join(root, moveRelativePath), path.join(root, "Moved.md")); + const movedState = await waitForExternalMoveConflict(page, "保留移动 buffer"); + + console.log(JSON.stringify({ + ok: true, + root, + states: [ + { step: "external-delete", deletedState }, + { step: "external-rename-as-deleted", movedState }, + ], + }, null, 2)); + } catch (error) { + const diagnostics = await page.evaluate(() => ({ + url: location.href, + status: document.querySelector('[data-testid="mnote-leptos-tiptap-island-editor-root"]')?.getAttribute("data-runtime-editor-status") || "", + statusError: document.querySelector('[data-testid="mnote-leptos-tiptap-island-editor-root"]')?.getAttribute("data-runtime-editor-error") || "", + editorText: document.querySelector('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror')?.textContent || "", + panelText: document.querySelector('[data-testid="mnote-editor-conflict-panel"]')?.textContent || "", + sessions: typeof window.__mnoteDebugDocumentSessions?.snapshot === "function" + ? window.__mnoteDebugDocumentSessions.snapshot() + : null, + })).catch((diagnosticsError) => ({ diagnosticsError: String(diagnosticsError) })); + console.error(JSON.stringify({ ok: false, root, diagnostics, error: String(error && error.stack || error) }, null, 2)); + process.exitCode = 1; + } finally { + await context.close().catch(() => undefined); + await browser.close().catch(() => undefined); + } +} + +main().catch((error) => { + console.error(error && error.stack ? error.stack : error); + process.exit(1); +}); diff --git a/scripts/task508-local-md-multitab-conflict-smoke.js b/scripts/task508-local-md-multitab-conflict-smoke.js new file mode 100644 index 00000000..d4bbe9ae --- /dev/null +++ b/scripts/task508-local-md-multitab-conflict-smoke.js @@ -0,0 +1,252 @@ +#!/usr/bin/env node +"use strict"; + +const assert = require("node:assert"); +const fs = require("node:fs"); +const os = require("node:os"); +const path = require("node:path"); +const { chromium } = require("playwright"); + +const BASE_URL = (process.env.MNOTE_WEB_SMOKE_BASE_URL || "http://127.0.0.1:3000").replace(/\/+$/, ""); +const UI_TIMEOUT_MS = Number(process.env.MNOTE_SMOKE_UI_TIMEOUT_MS || 30_000); +const CHROMIUM_EXECUTABLE_PATH = process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH + || ["/usr/bin/google-chrome-stable", "/usr/bin/google-chrome", "/snap/bin/chromium"] + .find((candidate) => fs.existsSync(candidate)); + +function fileUrl(localPath) { + return `file://${localPath}`; +} + +function localMdDocumentId(relativePath) { + return `local-md:${relativePath.replaceAll("/", "~2F")}`; +} + +function documentUrl(root, relativePath) { + const url = new URL(`${BASE_URL}/documents/${encodeURIComponent(localMdDocumentId(relativePath))}`); + url.searchParams.set("sourceKind", "local_folder"); + url.searchParams.set("rootUri", fileUrl(root)); + url.searchParams.set("treeView", "filetree"); + return url.toString(); +} + +function writeWorkspaceManifest(root, ownerId) { + const metadataDir = path.join(root, ".mnote"); + fs.mkdirSync(metadataDir, { recursive: true }); + fs.writeFileSync( + path.join(metadataDir, "workspace.json"), + `${JSON.stringify({ + workspaceId: `local-ws:${ownerId}:task508`, + ownerId, + createdAt: new Date().toISOString(), + capabilities: ["local_files", "markdown_edit", "asset_upload"], + }, null, 2)}\n`, + "utf8", + ); +} + +async function openDocument(page, root, relativePath) { + await page.goto(documentUrl(root, relativePath), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); + await page.locator('[data-testid="mnote-leptos-tiptap-island-editor-root"]').first().waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); + await page.locator('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror').first().waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); +} + +async function typeEditorText(page, text) { + const editor = page.locator('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror').first(); + await editor.click({ timeout: UI_TIMEOUT_MS }); + await page.keyboard.press(process.platform === "darwin" ? "Meta+End" : "Control+End").catch(() => undefined); + await page.keyboard.type(`\n${text}`, { delay: 2 }); +} + +async function waitForEditorText(page, text) { + await page.waitForFunction( + (needle) => { + const editor = document.querySelector('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror'); + return (editor?.textContent || "").includes(needle); + }, + text, + { timeout: UI_TIMEOUT_MS }, + ); +} + +async function waitForFileText(filePath, text) { + const deadline = Date.now() + UI_TIMEOUT_MS; + while (Date.now() < deadline) { + const content = fs.existsSync(filePath) ? fs.readFileSync(filePath, "utf8") : ""; + if (content.includes(text)) return content; + await new Promise((resolve) => setTimeout(resolve, 120)); + } + throw new Error(`文件未出现期望内容: ${text}`); +} + +async function withTimeout(promise, timeoutMs, diagnostics) { + let timer = 0; + try { + return await Promise.race([ + promise, + new Promise((_, reject) => { + timer = setTimeout(async () => { + let detail = null; + if (typeof diagnostics === "function") { + try { + detail = await diagnostics(); + } catch (error) { + detail = { diagnosticsError: error && error.message ? error.message : String(error) }; + } + } + reject(new Error(`等待超时: ${JSON.stringify(detail)}`)); + }, timeoutMs); + }), + ]); + } finally { + if (timer) clearTimeout(timer); + } +} + +async function installDelayedSave(page) { + let release = null; + const gate = { + intercepted: false, + status: 0, + body: "", + release: () => release && release(), + interceptedPromise: null, + }; + gate.interceptedPromise = new Promise((resolve) => { + gate.markIntercepted = resolve; + }); + const releasePromise = new Promise((resolve) => { + release = resolve; + }); + await page.route("**/api/page-body/write", async (route) => { + if (!gate.intercepted) { + gate.intercepted = true; + gate.markIntercepted(); + await releasePromise; + const response = await route.fetch(); + gate.status = response.status(); + gate.body = await response.text(); + await route.fulfill({ + status: gate.status, + headers: response.headers(), + body: gate.body, + }); + return; + } + await route.continue(); + }); + return gate; +} + +async function main() { + const root = fs.mkdtempSync(path.join(os.tmpdir(), "mnote-task508-multitab-")); + const relativePath = "Concurrent.md"; + const markdownPath = path.join(root, relativePath); + writeWorkspaceManifest(root, "mnote-e2e"); + fs.writeFileSync(markdownPath, "# Concurrent\n\n初始正文\n", "utf8"); + + const browser = await chromium.launch({ + headless: process.env.HEADFUL !== "1", + executablePath: CHROMIUM_EXECUTABLE_PATH, + }); + const contextA = await browser.newContext({ + viewport: { width: 1280, height: 860 }, + extraHTTPHeaders: { "x-mnote-actor-id": "mnote-e2e", "x-mnote-actor-type": "user" }, + }); + const contextB = await browser.newContext({ + viewport: { width: 1280, height: 860 }, + extraHTTPHeaders: { "x-mnote-actor-id": "mnote-e2e", "x-mnote-actor-type": "user" }, + }); + const pageA = await contextA.newPage(); + const pageB = await contextB.newPage(); + const pageBEvents = []; + pageB.on("request", (request) => { + const url = request.url(); + if (url.includes("/api/page-body/write") || url.includes("/api/documents/save") || url.includes("/api/documents/buffer-state") || url.includes("/api/page-aggregate")) { + pageBEvents.push({ type: "request", method: request.method(), url }); + } + }); + pageB.on("response", (response) => { + const url = response.url(); + if (url.includes("/api/page-body/write") || url.includes("/api/documents/save") || url.includes("/api/documents/buffer-state") || url.includes("/api/page-aggregate")) { + pageBEvents.push({ type: "response", status: response.status(), url }); + } + }); + pageB.on("console", (message) => { + const text = message.text(); + if (text.includes("mnote") || text.includes("conflict")) { + pageBEvents.push({ type: "console", level: message.type(), text }); + } + }); + try { + await Promise.all([ + openDocument(pageA, root, relativePath), + openDocument(pageB, root, relativePath), + ]); + + const cleanToken = `A-clean-sync-${Date.now()}`; + await typeEditorText(pageA, cleanToken); + await waitForFileText(markdownPath, cleanToken); + await waitForEditorText(pageB, cleanToken); + + const gate = await installDelayedSave(pageB); + const dirtyToken = `B-dirty-pending-${Date.now()}`; + await typeEditorText(pageB, dirtyToken); + await withTimeout(gate.interceptedPromise, UI_TIMEOUT_MS, async () => { + const state = await pageB.evaluate(() => ({ + status: document.querySelector('[data-testid="mnote-leptos-tiptap-island-editor-root"]')?.getAttribute("data-runtime-editor-status") || "", + text: document.querySelector('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror')?.textContent || "", + sessions: typeof window.__mnoteDebugDocumentSessions?.snapshot === "function" + ? window.__mnoteDebugDocumentSessions.snapshot() + : null, + })); + return { ...state, pageBEvents }; + }); + + const winnerToken = `A-winner-${Date.now()}`; + await typeEditorText(pageA, winnerToken); + await waitForFileText(markdownPath, winnerToken); + gate.release(); + await pageB.waitForFunction( + (needle) => { + const root = document.querySelector('[data-testid="mnote-leptos-tiptap-island-editor-root"]'); + const editor = document.querySelector('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror'); + return root?.getAttribute("data-runtime-editor-status") === "external-change-conflict" + && (editor?.textContent || "").includes(needle); + }, + dirtyToken, + { timeout: UI_TIMEOUT_MS }, + ); + assert.equal(gate.status, 409, `B tab stale save 应返回 409，实际 ${gate.status}: ${gate.body}`); + const finalB = await pageB.evaluate(() => ({ + status: document.querySelector('[data-testid="mnote-leptos-tiptap-island-editor-root"]')?.getAttribute("data-runtime-editor-status") || "", + text: document.querySelector('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror')?.textContent || "", + conflictText: document.querySelector('[data-testid="mnote-editor-conflict-panel"]')?.textContent || "", + sessions: typeof window.__mnoteDebugDocumentSessions?.snapshot === "function" + ? window.__mnoteDebugDocumentSessions.snapshot() + : null, + })); + console.log(JSON.stringify({ + ok: true, + root, + states: [ + { step: "clean-tab-auto-sync", cleanToken }, + { step: "dirty-tab-save-409", dirtyToken, winnerToken, gateStatus: gate.status, finalB }, + ], + }, null, 2)); + } finally { + await contextA.close().catch(() => undefined); + await contextB.close().catch(() => undefined); + await browser.close().catch(() => undefined); + } +} + +main().catch((error) => { + console.error(error && error.stack ? error.stack : error); + process.exit(1); +}); diff --git a/scripts/task509-local-upload-save-409-orphan-smoke.js b/scripts/task509-local-upload-save-409-orphan-smoke.js new file mode 100644 index 00000000..6ab0676a --- /dev/null +++ b/scripts/task509-local-upload-save-409-orphan-smoke.js @@ -0,0 +1,206 @@ +#!/usr/bin/env node +"use strict"; + +const assert = require("node:assert"); +const fs = require("node:fs"); +const os = require("node:os"); +const path = require("node:path"); +const { chromium } = require("playwright"); + +const BASE_URL = (process.env.MNOTE_WEB_SMOKE_BASE_URL || "http://127.0.0.1:3000").replace(/\/+$/, ""); +const UI_TIMEOUT_MS = Number(process.env.MNOTE_SMOKE_UI_TIMEOUT_MS || 30_000); +const PPTX_PATH = process.env.MNOTE_UPLOAD_TEST_FILE || "/home/lix/Downloads/1768096586803-672be7a7-5cb3-454d-9b1b-6230f86ba392.pptx"; +const CHROMIUM_EXECUTABLE_PATH = process.env.PLAYWRIGHT_CHROMIUM_EXECUTABLE_PATH + || ["/usr/bin/google-chrome-stable", "/usr/bin/google-chrome", "/snap/bin/chromium"] + .find((candidate) => fs.existsSync(candidate)); + +function fileUrl(localPath) { + return `file://${localPath}`; +} + +function localMdDocumentId(relativePath) { + return `local-md:${relativePath.replaceAll("/", "~2F")}`; +} + +function documentUrl(root, relativePath) { + const url = new URL(`${BASE_URL}/documents/${encodeURIComponent(localMdDocumentId(relativePath))}`); + url.searchParams.set("sourceKind", "local_folder"); + url.searchParams.set("rootUri", fileUrl(root)); + url.searchParams.set("treeView", "filetree"); + return url.toString(); +} + +function writeWorkspaceManifest(root, ownerId) { + const metadataDir = path.join(root, ".mnote"); + fs.mkdirSync(metadataDir, { recursive: true }); + fs.writeFileSync( + path.join(metadataDir, "workspace.json"), + `${JSON.stringify({ + workspaceId: `local-ws:${ownerId}:task509`, + ownerId, + createdAt: new Date().toISOString(), + capabilities: ["local_files", "markdown_edit", "asset_upload"], + }, null, 2)}\n`, + "utf8", + ); +} + +async function openDocument(page, root, relativePath) { + await page.goto(documentUrl(root, relativePath), { waitUntil: "domcontentloaded", timeout: UI_TIMEOUT_MS }); + await page.locator('[data-testid="mnote-leptos-tiptap-island-editor-root"]').first().waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); + await page.locator('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror').first().waitFor({ + state: "visible", + timeout: UI_TIMEOUT_MS, + }); +} + +async function uploadAttachmentViaSlash(page, filePath) { + const editor = page.locator('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror').first(); + await editor.click({ timeout: UI_TIMEOUT_MS }); + await page.keyboard.press("End").catch(() => undefined); + await page.keyboard.type("/"); + const item = page.locator('.document-pane[data-pane-role="primary"] [data-testid="slash-item-upload-attachment"]').first(); + await item.waitFor({ state: "visible", timeout: UI_TIMEOUT_MS }); + const [fileChooser] = await Promise.all([ + page.waitForEvent("filechooser", { timeout: UI_TIMEOUT_MS }), + item.click({ timeout: UI_TIMEOUT_MS }), + ]); + await fileChooser.setFiles(filePath); +} + +async function typeEditorText(page, text) { + const editor = page.locator('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror').first(); + await editor.click({ timeout: UI_TIMEOUT_MS }); + await page.keyboard.press(process.platform === "darwin" ? "Meta+End" : "Control+End").catch(() => undefined); + await page.keyboard.type(`\n${text}`, { delay: 2 }); +} + +async function waitForEditorStatus(page, status) { + await page.waitForFunction( + (expected) => { + const root = document.querySelector('[data-testid="mnote-leptos-tiptap-island-editor-root"]'); + return root?.getAttribute("data-runtime-editor-status") === expected; + }, + status, + { timeout: UI_TIMEOUT_MS }, + ); +} + +async function main() { + assert(fs.existsSync(PPTX_PATH), `测试 pptx 不存在: ${PPTX_PATH}`); + const root = fs.mkdtempSync(path.join(os.tmpdir(), "mnote-task509-upload-409-")); + const relativePath = "README/README.md"; + writeWorkspaceManifest(root, "mnote-e2e"); + fs.mkdirSync(path.join(root, "README"), { recursive: true }); + fs.writeFileSync(path.join(root, relativePath), "# Upload 409\n\n正文\n", "utf8"); + + const browser = await chromium.launch({ + headless: process.env.HEADFUL !== "1", + executablePath: CHROMIUM_EXECUTABLE_PATH, + }); + const context = await browser.newContext({ + viewport: { width: 1366, height: 900 }, + extraHTTPHeaders: { "x-mnote-actor-id": "mnote-e2e", "x-mnote-actor-type": "user" }, + }); + const page = await context.newPage(); + let interceptedSave = null; + await page.route("**/api/documents/save", async (route) => { + const payload = JSON.parse(route.request().postData() || "{}"); + if (payload.editorSource === "local-upload-runtime") { + interceptedSave = { + expectedFileVersion: String(payload.expectedFileVersion || ""), + writeIntentId: String(payload.writeIntentId || ""), + saveOperationId: String(payload.saveOperationId || ""), + }; + await route.fulfill({ + status: 409, + contentType: "application/json", + body: JSON.stringify({ + ok: false, + error: { + message: "本地 Markdown 文件已在外部更新，请刷新或保存前先处理冲突", + code: "local_markdown_external_change", + }, + conflict: { + code: "local_markdown_external_change", + currentDiskVersion: "simulated-disk-version", + editorBaseVersion: payload.expectedFileVersion || "", + }, + }), + }); + return; + } + await route.continue(); + }); + + try { + await openDocument(page, root, relativePath); + await uploadAttachmentViaSlash(page, PPTX_PATH); + await page.waitForFunction( + () => document.documentElement.getAttribute("data-mnote-last-upload-orphaned-policy") === "asset-kept-reference-unsaved-retry-required", + null, + { timeout: UI_TIMEOUT_MS }, + ); + const state = await page.evaluate(() => ({ + saveError: document.documentElement.getAttribute("data-mnote-last-upload-save-error") || "", + orphanedAssetId: document.documentElement.getAttribute("data-mnote-last-upload-orphaned-asset-id") || "", + orphanedPolicy: document.documentElement.getAttribute("data-mnote-last-upload-orphaned-policy") || "", + inserted: document.documentElement.getAttribute("data-mnote-last-upload-inserted") || "", + links: Array.from(document.querySelectorAll('.document-pane[data-pane-role="primary"] .editor-surface .ProseMirror a')).map((link) => ({ + text: link.textContent || "", + href: link.getAttribute("href") || "", + })), + })); + assert(interceptedSave?.expectedFileVersion, `local-upload save 应携带 expectedFileVersion: ${JSON.stringify(interceptedSave)}`); + assert(interceptedSave?.writeIntentId && interceptedSave?.saveOperationId, `local-upload save 应携带写入意图: ${JSON.stringify(interceptedSave)}`); + assert(state.saveError.includes("本地 Markdown 文件已在外部更新"), `应显示保存冲突错误: ${JSON.stringify(state)}`); + assert(state.orphanedAssetId, `409 后应标记已落盘孤儿附件: ${JSON.stringify(state)}`); + assert(state.links.some((link) => /\.pptx/i.test(link.text)), `编辑器中应保留未落盘引用以便用户重试/处理: ${JSON.stringify(state)}`); + const assetPath = path.join(root, "README", path.basename(PPTX_PATH)); + assert(fs.existsSync(assetPath), `附件文件应已落盘并由 orphan policy 显式保留: ${assetPath}`); + + const blockedRelativePath = "Blocked.md"; + const blockedPath = path.join(root, blockedRelativePath); + const blockedToken = `blocked-conflict-${Date.now()}`; + fs.writeFileSync(blockedPath, "# Blocked\n\n初始正文\n", "utf8"); + await openDocument(page, root, blockedRelativePath); + await typeEditorText(page, blockedToken); + fs.writeFileSync(blockedPath, `# Blocked\n\n外部版本 ${blockedToken}\n`, "utf8"); + await waitForEditorStatus(page, "external-change-conflict"); + await page.evaluate(() => { + document.documentElement.removeAttribute("data-mnote-last-upload-blocked-conflict"); + }); + const beforeBlockedFiles = new Set(fs.readdirSync(root)); + await uploadAttachmentViaSlash(page, PPTX_PATH); + await page.waitForFunction( + () => document.documentElement.getAttribute("data-mnote-last-upload-blocked-conflict") === "true", + null, + { timeout: UI_TIMEOUT_MS }, + ); + const afterBlockedFiles = new Set(fs.readdirSync(root)); + assert.deepEqual( + [...afterBlockedFiles].sort(), + [...beforeBlockedFiles].sort(), + "session 已冲突时不应继续写入新的附件文件", + ); + const blockedState = await page.evaluate(() => ({ + blockedConflict: document.documentElement.getAttribute("data-mnote-last-upload-blocked-conflict") || "", + saveError: document.documentElement.getAttribute("data-mnote-last-upload-save-error") || "", + })); + assert.equal(blockedState.blockedConflict, "true", `冲突 session 应阻断上传: ${JSON.stringify(blockedState)}`); + assert(blockedState.saveError.includes("冲突"), `冲突 session 阻断应给出提示: ${JSON.stringify(blockedState)}`); + + console.log(JSON.stringify({ ok: true, root, assetPath, interceptedSave, state, blockedState }, null, 2)); + } finally { + await context.close().catch(() => undefined); + await browser.close().catch(() => undefined); + } +} + +main().catch((error) => { + console.error(error && error.stack ? error.stack : error); + process.exit(1); +}); diff --git a/scripts/task510-local-markdown-conflict-regression-group.js b/scripts/task510-local-markdown-conflict-regression-group.js new file mode 100644 index 00000000..5cd69816 --- /dev/null +++ b/scripts/task510-local-markdown-conflict-regression-group.js @@ -0,0 +1,44 @@ +#!/usr/bin/env node +"use strict"; + +const { spawnSync } = require("node:child_process"); +const path = require("node:path"); + +const DEFAULT_TASKS = [ + "scripts/task451-local-markdown-conflict-resolution-ui-smoke.js", + "scripts/task503-local-pptx-upload-filetree-open-smoke.js", + "scripts/task458-local-create-page-no-conflict-smoke.js", + "scripts/task504-local-md-external-conflict-recovery-smoke.js", + "scripts/task508-local-md-multitab-conflict-smoke.js", + "scripts/task509-local-upload-save-409-orphan-smoke.js", +]; + +function requestedTasks() { + const raw = String(process.env.MNOTE_CONFLICT_REGRESSION_TASKS || "").trim(); + if (!raw) return DEFAULT_TASKS; + return raw.split(",").map((item) => item.trim()).filter(Boolean); +} + +function runTask(scriptPath) { + const absolute = path.resolve(process.cwd(), scriptPath); + const result = spawnSync(process.execPath, [absolute], { + cwd: process.cwd(), + env: process.env, + stdio: "inherit", + }); + if (result.error) throw result.error; + if (result.status !== 0) { + throw new Error(`${scriptPath} failed with status ${result.status}`); + } +} + +function main() { + const tasks = requestedTasks(); + for (const task of tasks) { + console.log(`[task510] running ${task}`); + runTask(task); + } + console.log(JSON.stringify({ ok: true, tasks }, null, 2)); +} + +main();