diff --git a/.project-docs/30-worklog/tasks/20260924-workspace-style-6f2e84b9.md b/.project-docs/30-worklog/tasks/20260924-workspace-style-6f2e84b9.md new file mode 100644 index 00000000..e15a6ca7 --- /dev/null +++ b/.project-docs/30-worklog/tasks/20260924-workspace-style-6f2e84b9.md @@ -0,0 +1,49 @@ +# Task: Complete approved playful workspace styling and update current trial + +## Identity + +- Task ID: 20260924-workspace-style-6f2e84b9 +- Mode: Feature +- Branch: codex/20260924-workspace-style-6f2e84b9-workspace-style +- Worktree: /Users/chillishark/Makelore 麦洛/.codex-worktrees/makelore-workspace-style +- Base commit: eb3dc85a2f0ed8457b7f24684c2da3ab192c2e46 +- Owner: codex +- Status: Ready for Integration + +## Scope + +- Port the approved playful workbench appearance into the real Code sidebar, title rail, conversation tabs/composer and teacher shell; refresh the existing isolated native trial. +- Own Renderer markup/CSS and this record/README. Preserve project/conversation actions, resizing/peek, authentication, teacher protocol and other module appearances. + +## Intent And Constraints + +- User explicitly requested the missing approved style be completed now. Use generic gamepad icons, pale blue navigation, colored icon tiles and rounded selected project/conversation surfaces. +- Reference: `makelore-teacher-playful-cards.html` in the task visualization directory. Visual reference only; do not restore obsolete discussion interactions from that prototype. +- Context/Planning Gates passed: task identity and worktree verified; project positioning, integrated state, decisions, architecture, business rules and active peer scopes loaded. +- Teacher owner committed `e657a7d` after coordination. Imported unchanged by fast-forward before styling, so the trial retains its verified prompt refinements. No foreign uncommitted changes adopted. +- Plan: implement scoped presentation; run existing layout/navigation tests, typecheck/lint/build; review native trial appearance without sending teacher messages; record and commit. + +## Outcome + +- Completed the missing approved appearance in real Code navigation: pale blue sidebar/title rail, warm brand tile, white raised new-project button, stable colored generic gamepad tiles, white active project cards, blue conversation selection, rounded workspace tabs and cream teacher header. +- Preserved project/conversation handlers, accessibility names, collapsible/resize behavior and other-module navigation. Account footer remains non-shrinking; narrowed conversation controls fit the 128px rail after independent review identified excess indentation. +- Rebuilt and restarted the existing `cn.makelore.teacher-presence.trial` bundle with the same isolated profile and port 54599. PID 7198 runs this worktree's `dist-electron/main/index.js`; native AX confirms this worktree's `/chat` URL and original `alice的游戏` / `hello` navigation. CUA screenshot visibly confirms the new left navigation/cards/tabs. No project creation or teacher message was sent in the user's profile. +- Trial is currently unauthenticated; teacher chat displays `请先登录`. This visual task does not validate live teacher behavior or change credentials. + +## Verification + +- Corepack pnpm 10.33.4: standard typecheck, ESLint on four changed TSX files, production Renderer/Main/Preload/utility build passed. +- Existing titlebar, sidebar peek, module gate, coding chat and account suites: 5 files / 58 tests passed. +- Existing Electron fixture tests: conversation rename/archive/restore and project consultation draft preservation passed (2 tests). These cover real Sidebar rendering, 128/256/default rail resizing and title synchronization, collapse, conversation/teacher/work switching; requests are fixture-owned, not real teacher calls. +- Reviewed generated Electron screenshot `test-results/pi-coding-first-chat-proje-4670e-t-without-submitting-advice/project-teacher-side-chat.png`; cream header and blue navigation rendered correctly. Native CUA verified the user's existing trial visibly uses the new sidebar. Additional exhaustive window/zoom combinations were not run. +- Independent agent reviewed styling and module isolation; its narrow-width control clipping concern was fixed before the final build/tests. `git diff --check` passed. +- Task drift checker reports `FOREIGN_DOC` for the unchanged teacher-focus record imported by fast-forward from `e657a7d` because the registered base is `eb3dc85`. Verified byte-for-byte equality to the owning task's commit, including unchanged Main prompt; no edits to that record or canonical project docs. Task-owned delta after that source commit is only this record plus README/Renderer files. This is an imported-source limitation of the checker, not an adopted foreign edit. + +## Follow-ups + +- Main/remote integration is not performed by this feature task; the existing native trial runs the committed feature worktree. Retain this worktree while that trial uses it. +- User owns detailed live teacher testing after login. + +## Promotion Candidates + +- Target: integrated current-state when this feature lands. Record that approved playful Code workbench styling is now implemented (earlier source changed only the generic icon). Evidence: source diff, 58 unit/2 Electron tests and native trial screenshot. No teaching protocol, data model or architectural decision changes; no contradictory direction or new approval needed. diff --git a/README.md b/README.md index f4eedf21..1902a3b2 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ Code 会话保存的模型被下架后,会提示重新选择可用模型;用 Makelore 是一个面向软件、视觉创作、智能机器人与个人云智能体的 AI 桌面工作台。当前版本为 `2.0.0`,源码提供四个模块入口;云智能体需配套配置 WS/Yuxi 服务。模块入口页按 Agents、Code、Canvas、Robot 排列,统一采用横向插画卡片;Agents 标语为“打造你想象中的AI助手”。工作区左上角入口点击后返回模块入口页: - `Makelore Code|AI 编程`:管理本地项目、项目智能体、对话、文件上下文、代码变更和运行时。 + 会话工作台采用浅蓝项目栏、彩色通用手柄图标与卡片选中态;中间对话/作品使用圆角标签,右侧老师使用奶油色标题区。沿用真实项目和会话入口、侧栏伸缩与账户菜单,样式只作用于 Code 会话工作台。 - `Makelore Agents|AI 智能体`:配置个人云智能体并试聊,发布后正式对话、接入个人微信或创建应用 API Key。支持流式回复、审批、排队请求、附件与产物、自动任务和活动历史;重新进入时恢复最近智能体与对话,未确认操作可按原输入重试。聊天可提出日程建议,由创建者核对能力、时间和费用后启用。知识库上传、替换及导入本人会话附件后自动解析并建立索引;文档卡片区分排队、解析、索引、可用和失败,持续刷新已加载文档,失败可原地重试;零文本内容不会显示为可用,新文档可用后才移除被替换的旧文档。支持删除知识内容;个人 MCP 凭据、Skills、子智能体可自助管理。支持智能体和会话归档、发布版本比较及恢复为草稿。除知识库 embedding 向量化外,模型调用(包括知识处理触发的对话模型调用)仍按原规则由创建者个人词元点数支付,可按智能体设置每次任务和每日上限,费用按时间、来源、应用分页统计;embedding 向量化由平台承担,不计入用户用量、词元点数或智能体费用上限;应用调用者保有自己的内容空间。Main 管理云会话和本机文件,Renderer 通过 Host API 操作。配套服务接入见 [Yuxi MakeLore 说明](https://xerrors.github.io/Yuxi/advanced/makelore-agents.html)。 编辑采用全高桌面分栏,支持拖动调整与展开、独立滚动、小窗口配置/试用切换。首次创建按选用途、说要求、试一试引导,提供科学问答、故事、英语和笔记整理起点;回答方式可多选,特别要求直接编辑,仍以草稿的 system_prompt 保存。新助手预选云端目录的第一个可用模型并明确显示,可自行更换;已有助手不自动换模型。编辑区以“我的要求”和“高级设置”两个 Tab 切换,默认显示基础要求;高级设置包含能力、知识与限制,返回时保留上次分类,切换保留未保存的输入及当前试用。已开始使用的助手在顶部显示“修改已保存,尚未应用”或“已应用最新修改”,并提供显眼的“应用最新修改”按钮;保存只更新草稿,应用沿用同一发布操作,失败重试保留原操作身份。草稿明确保存(Ctrl/⌘+S),保存与切换页面保留当前试用及未发送文字;“保存并重新试用”使用最新保存的要求,保留上次试用供对比,并可复用上次问题,不自动发送。示例问题仅填入输入框;有运行、排队、审批或未确认操作时先处理当前试用。工具确认先展示实际操作说明与参数,完整技术详情可展开。确认“开始使用”会创建仅自己可用的发布版本并进入独立对话,微信渠道与应用接入仍单独配置。费用上限在限制中独立保存。Enter 发送、Shift+Enter 换行,F6 切换面板焦点、Esc 恢复分栏。 云知识库的 embedding 模型只由平台管理员在 Yuxi 后台维护:在「智能体管理 → 模型供应商」启用供应商,按供应商要求填写有效的服务地址和 API Key,添加并启用 embedding 模型并填写实际向量维度;embedding 向量化费用由平台承担,不计入用户用量、词元点数或智能体费用上限;one-api 不参与 embedding 配置,Works Square 只负责其他应计费模型调用的创建者词元点数账本。客户端区分目录加载中、加载失败与无可用模型,空状态提供管理员配置说明;「刷新知识库与模型」保留未提交名称,未确认的创建请求沿用原操作身份。 diff --git a/src/components/layout/MainLayout.tsx b/src/components/layout/MainLayout.tsx index ffc87c85..a02128e7 100644 --- a/src/components/layout/MainLayout.tsx +++ b/src/components/layout/MainLayout.tsx @@ -74,7 +74,7 @@ export function MainLayout() { }, []); return ( -
{draftRevision ? '运营草稿试聊' : role === 'friend' ? '陪你体验,也听你说' : !role ? '结合当前会话和项目文件答疑' : '一起想清楚,再动手'}