Merge Code workbench styling with server-distributed consultations
Electron E2E / Electron E2E (macos-latest) (push) Has been cancelled
Electron E2E / Electron E2E (ubuntu-latest) (push) Has been cancelled
Electron E2E / Electron E2E (windows-latest) (push) Has been cancelled

This commit is contained in:
鲨鱼辣椒 committed 2026-09-24 13:21:41 +08:00
commit d2150ce5de
48 files changed
+870 -715

No files matched your search

@@ -68,3 +68,14 @@
- Merge dd96a7b7b43f915b530190e97c1e41d5b5240d4e was pushed to origin/main and verified against the actual remote reference. Both selected source tips remain ancestors; backup/20260924-main-consensus still points to 342f3e58. Main was rebuilt successfully from this pushed merge.
- Restarted only Makelore Teacher Trial (bundle cn.makelore.teacher-presence.trial), replacing PID 92884 with PID 717. It now loads /Users/chillishark/Makelore 麦洛/makelore/dist-electron/main/index.js, preserving /var/folders/mx/ltbgwsks5_n8zllj69p_wbcw0000gn/T/makelore-trial-tdq_nuah/user-data and Host API port 54599. Exact process command and port ownership were checked; OPTIONS /api/app/runtime-info returned 204.
- Native window inspection confirmed the module selection screen loaded from the main checkout's dist/index.html. No live teacher message, credential change or user-data reset was performed. Subsequent task-record-only commits do not change these verified runtime artifacts.
## Workspace Style Follow-up
- User again requested integrating the latest delivery of task 01a0cc32-40cf-7503-983e-ca70eb688599 and pushing main. Source is 2191c51467029a67e82bc9af0ff9fabc958b4709 on codex/20260924-workspace-style-6f2e84b9-workspace-style; it includes main's committed e657a7d prompt refinement. Source worktree is clean and Ready for Integration. The task API exposes the latest completed turns but no item bodies; branch and task-record provenance identify the completed style delivery.
- Project Context Loaded: same task ID, feature mode, branch, worktree and base as Identity; start/status ownership matches. Existing project context remains applicable; refreshed entry/planning gate, memory index, positioning, current state, decisions, architecture, domain/success criteria, evidence/reflection/commitments/stale indexes, and the new style/focus peer records. Other registered classroom/presence/discussion/integration tasks remain completed sources. Source owns Renderer styling; upstream origin/main owns the newer consultation runtime. No canonical documents are authored here. Gate passed for code integration, scoped verification and remote push.
- Plan: combine the style source with fetched origin/main 0a8fce6, resolve overlaps without reverting current runtime semantics, run relevant tests/typecheck/lint/build and isolated interaction checks, then fast-forward clean main and push.
- Resolved README, consultation header, responsive CSS and modify/delete conflicts. Preserved source navigation/cards/tab/composer styling and added its header/avatar classes to the remote generic-agent panel. Preserved remote removal of built-in teacher/friend personas and behavior-prompt.ts, server-distributed agent identities, read-only legacy friend history/drafts, source binding and token-versus-byte budgeting. e657a7d remains in ancestry; its removed runtime prompt is retained in Git history, not re-injected into server-owned persona configuration.
- The source task's native trial currently uses the workspace-style checkout; retain that worktree. This follow-up requests merge/push and does not restart the trial or send live messages.
- Verification of the combined tree: 16 related unit suites / 362 tests, 13 browser layout checks, 2 isolated Electron conversation-navigation/draft-preservation checks, standard typecheck, scoped TSX ESLint, production Renderer/Main/Preload/utility build and diff whitespace checks passed. Independent final review found no blocker; all runtime/API/shared code is byte-identical to origin/main, with only five presentation files and the README appearance note differing outside task records.
- check_project_docs passed. The drift checker flags 22 foreign/protected documents imported since the older registered task base; exact Git-blob checks confirm every one matches either source 2191c51 or origin/main 0a8fce6. Only this task's record is authored here. No canonical or peer-record edits; the checker itself is not reported as passing.
- Verified main is clean and source/remote refs remain unchanged before delivery. Ready for the user-authorized fast-forward of main and ordinary push to origin/main; retain source branches and the active-trial worktree.