wangxuming/makelore
1
0 Fork 0
Code Issues Pull Requests Actions 15 Packages Projects Releases Wiki Activity

Merge verified Canvas, Code navigation and channel recovery source histories

Browse Source
This commit is contained in:
鲨鱼辣椒 committed 2026-10-14 00:12:47 +08:00
3 parents 3fe3fdb1c0 15848cd6a6 979596f8f8
commit a106dc16f5
1 file changed
+3 -1
Download Patch File Download Diff File Expand all files Collapse all files
.project-docs/30-worklog/tasks/20261013-canvas-workspace-b6d9e2a4.md
+3 -1
View File
@@ -25,10 +25,12 @@
## Outcome
- Canvas implementation complete: Agents-style navigation/composer/Markdown, 64px identity header, resizable 42/58 workspace, current output preview and historical selection, one persistent editable production card, <=899px compact panel switching. Hidden videos pause; modal Escape does not change split focus; compact creation no longer opens two dialogs.
- Coordinated integration, normal main push, live temporary-application update and worktree retirement remain pending. Canvas source2ca6e31; Code-navigation chat completed product source d287d5ac (handoff15848cd). The committed effective Renderer non-project-doc delta from baseline70166d2 was applied through Git three-way merge, preserving Canvas and all current Sidebar/TOOL/SKILL/knowledge-upload fixes; its live verification is blocked by Mac lock. Channel-adapter chat completed source979596f. Its non-project-doc product/test/README delta was also three-way merged cleanly. Combined checks are in progress; no Yuxi files were changed. Required unlock question is pending; no app mutation has occurred in this task.
- Coordinated integration, normal main push, live temporary-application update and worktree retirement remain pending. Canvas source2ca6e31; Code-navigation chat completed product source d287d5ac (handoff15848cd). The committed effective Renderer non-project-doc delta from baseline70166d2 was applied through Git three-way merge, preserving Canvas and all current Sidebar/TOOL/SKILL/knowledge-upload fixes; its live verification is blocked by Mac lock. Channel-adapter chat completed source979596f. Its non-project-doc product/test/README delta was also three-way merged cleanly. Combined typecheck/scoped ESLint and all443 selected units passed. The accepted non-project-doc code deltas were three-way merged before recording source ancestry with a metadata-only merge of Code15848cd and channel979596f. This preserves source commit history without changing their read-only task records or importing canonical-memory changes into feature mode; no Yuxi files were changed. Required unlock question is pending; no app mutation has occurred in this task.
## Verification
- Combined source: 23 test files / 443 tests passed, including Canvas, Code/navigation, Agent recovery and Main WeChat error contracts. The two inherited integration expectation mismatches were corrected to use the new Works Square entry and the existing record dialog while retaining draft/pending preservation assertions.
- Pinned corepack pnpm 10.33.4; typecheck and scoped ESLint passed. Nine Canvas/store/contract test files: 111 tests passed; separate layout regressions: 9 passed; sidebar interaction regressions: 6 passed. Existing Electron image-workspace-v2 suite: 2 passed, covering actual geometry, keyboard/pointer/focus, 375/768/899/900 layouts, drafts, quotes, result preview and video duration. Full Renderer/Main/Preload/utility build succeeded.
- Independent review findings were fixed and verified. Screenshot QA accepted three fixture images; copied outside the worktree into the calling chat visualization folder. These are controlled test data, not a real paid-generation acceptance.