From 9044f7dd8ce199ca57cbe0bc7be1abd1bca2a9bd Mon Sep 17 00:00:00 2001 From: brother7 <7brother7@gmail.com> Date: Mon, 14 Sep 2026 14:20:23 +0800 Subject: [PATCH] docs: record Agents entry merge into main --- .project-docs/30-worklog/current-state.md | 2 + .../20260914-merge-agents-entry-aecd607d.md | 44 +++++++++++++++++++ README.md | 2 +- 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 .project-docs/30-worklog/tasks/20260914-merge-agents-entry-aecd607d.md diff --git a/.project-docs/30-worklog/current-state.md b/.project-docs/30-worklog/current-state.md index 5be2346..4424381 100644 --- a/.project-docs/30-worklog/current-state.md +++ b/.project-docs/30-worklog/current-state.md @@ -4,6 +4,8 @@ This file is the integrated default-branch snapshot. Feature tasks record progre ## Integrated Through +- 2026-09-14：任务 `20260914-merge-agents-entry-aecd607d` 经用户确认主目录登记移交，将源 `9317d0acc7cfa6eab2379ab37acefbac8e435fad` 无冲突快进合入本地 `main`。Agents 入口换为蓝紫色全息智能体插画，标语为“打造你想象中的AI助手”，顺序为 Agents、Code、Canvas、Robot；源记录原样导入，产品树与已验证源一致，沿用其类型检查、相关单测、构建和 Electron 双窗口验证。原有 3 份未跟踪文档保持原样；未推送、打包、安装或部署。详见[源任务](tasks/20260914-agents-entry-art-0242f8f3.md)。 + - 2026-09-14：任务 `20260914-land-scan-account-ml-8fb88137` 经用户确认登记移交，将已独立审查源 `21e707d` 无冲突快进合入本地 `main`。微信渠道统一按扫码账号使用，删除使用范围、邀请与调用者管理；历史受邀内容不改归属、不继续入站/恢复/投递。源记录原样导入，产品树与已验证源保持一致，证据及限制见[源任务](tasks/20260914-wechat-scan-owner-ml-b4169ea9.md)。本次无新 SQL/环境变量；未推送、部署或清理工作区。 - 2026-09-14：任务 `20260914-merge-user-channels-ml-e672b0c4` 经用户授权移交主目录，将已审查源 `b7d8b1298f02e4b10b6d0089594d48720efc03e7` 无冲突快进合入本地 `main`。用户级多微信账号、先扫码后选择目标、多个账号路由同一智能体及切换保留登录已集成；智能体发布页使用渠道摘要/入口。产品树与已审查源一致，源记录只读导入，验证和实际部署边界见[源任务](tasks/20260913-user-channels-ml-8d61e4a9.md)。原有 3 份未跟踪文档保留；未推送、部署或清理工作区。 diff --git a/.project-docs/30-worklog/tasks/20260914-merge-agents-entry-aecd607d.md b/.project-docs/30-worklog/tasks/20260914-merge-agents-entry-aecd607d.md new file mode 100644 index 0000000..906d0ea --- /dev/null +++ b/.project-docs/30-worklog/tasks/20260914-merge-agents-entry-aecd607d.md @@ -0,0 +1,44 @@ +# Task: Merge Agents entry presentation into main + +## Identity + +- Task ID: 20260914-merge-agents-entry-aecd607d +- Mode: Integration +- Branch: main +- Worktree: D:\Datas\OthersProjects\makelore +- Base commit: da6684b03e8ef7be17cb35b8b42130f11b3bc797 +- Owner: codex +- Status: Ready for Integration + +## Scope + +- Fast-forward local main to the verified Agents entry source `9317d0acc7cfa6eab2379ab37acefbac8e435fad`, including new artwork, exact slogan `打造你想象中的AI助手` and order Agents / Code / Canvas / Robot. +- Synchronize the integrated snapshot and concise README presentation description. Keep imported source records unchanged. + +## Intent And Constraints + +- User explicitly authorized merging to main, then confirmed transfer of the completed old main task `20260914-land-scan-account-ml-8fb88137` and preservation/adoption of the three existing untracked task records. Official release/start/status passed; this integration task holds the main worktree and integration lock. +- Concurrent and Planning Gates Passed. Read the planning entry, own record, memory index, positioning, integrated snapshot, decisions, system overview and planning gate, plus source outcome/verification/promotion and previous main ownership record; reused already loaded domain/ADR/README and peer scope/intent/promotion context. There are 28 other planning and 162 ready owners; historical placeholder peer scope remains unknown, with no concrete semantic dependency on this presentation-only merge. +- Base main equals the verified source base; source branch is clean and ready. Merge with `--ff-only`, then verify product equality to reuse its exact-source checks; any unexpected difference requires investigation. No backend/config/route change, source record rewrite, push, deployment, package or installation. +- Preserve `.project-docs/30-worklog/tasks/20260901-package-122-c5e8.md`, `20260901-package-123-d7f3.md` and `20260902-client-hang-diagnosis-a47c9e2b.md` in their adopted unchanged untracked states. + +## Outcome + +- Fast-forwarded local main from `da6684b03e8ef7be17cb35b8b42130f11b3bc797` to the exact source `9317d0acc7cfa6eab2379ab37acefbac8e435fad` without conflicts. All three source commits and the unchanged source task record are included. +- Final entry order is Agents, Code, Canvas, Robot. Agents uses the generated blue/violet artwork and `打造你想象中的AI助手`. Updated README and the integrated snapshot; no API, route or architecture change. +- The three explicitly adopted pre-existing records remain untracked and unchanged. No remote push, package, install or deployment. +- Source worktree cleanup is awaiting separate user confirmation; the merge is complete independently of that choice. + +## Verification + +- Main was an ancestor of the clean source. `git merge --ff-only` succeeded and the immediate `git diff --exit-code 9317d0acc7cfa6eab2379ab37acefbac8e435fad` was empty, proving exact tracked source equality before integration-only documentation edits. +- Reuse the exact source's final typecheck, scoped lint, 12/12 module navigation/access tests, Vite production build, Electron layout 1/1 and inspected screenshot. Earlier artwork coverage also passed 25/25 tests; unchanged product code does not require another full test run. +- Task Documentation Gate checks the cumulative diff, whitespace and official task-aware documentation boundary, including preservation of adopted foreign records. + +## Follow-ups + +- Cleanup candidate: source task `20260914-agents-entry-art-0242f8f3`, worktree `D:\Datas\OthersProjects\.codex-worktrees\makelore\20260914-agents-entry-art-0242f8f3`, branch `codex/20260914-agents-entry-art-0242f8f3-agents-entry-art`. It is managed, clean and ready, and the latest result is included in main. Await explicit approval before official retirement; retain the branch and commits. The primary checkout is not a cleanup candidate. + +## Promotion Candidates + +- None recorded. diff --git a/README.md b/README.md index dadb467..05b1d22 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ 平台托管模型的图片输入与思考选项由 Works Square 的 `model_capabilities_v2` 下发。未知能力保持未知；会话保存“模型默认 / 关闭 / 开启及原生强度”，Pi 请求前按冻结的选择写入供应商参数。配置刷新后失效的选择会在发送前提示重新选择；BYOK 模型沿用自身配置。 -Makelore 是一个面向软件、视觉创作、智能机器人与个人云智能体的 AI 桌面工作台。当前版本为 `2.0.0`，源码提供四个模块入口；云智能体需配套配置 WS/Yuxi 服务。模块入口页采用统一的横向卡片视觉，工作区左上角入口点击后返回模块入口页： +Makelore 是一个面向软件、视觉创作、智能机器人与个人云智能体的 AI 桌面工作台。当前版本为 `2.0.0`，源码提供四个模块入口；云智能体需配套配置 WS/Yuxi 服务。模块入口页按 Agents、Code、Canvas、Robot 排列，统一采用横向插画卡片；Agents 标语为“打造你想象中的AI助手”。工作区左上角入口点击后返回模块入口页： - `Makelore Code｜AI 编程`：管理本地项目、项目智能体、对话、文件上下文、代码变更和运行时。 - `Makelore Agents｜AI 智能体`：配置个人云智能体并试聊，发布后正式对话、按账号分享或创建应用 API Key。支持流式回复、审批、排队请求、附件与产物、自动任务和活动历史；重新进入时恢复最近智能体与对话，未确认操作可按原输入重试。聊天可提出日程建议，由创建者核对能力、时间和费用后启用。知识库支持上传、索引、替换、删除及导入本人会话附件；个人 MCP 凭据、Skills、子智能体可自助管理。支持智能体和会话归档、发布版本比较及恢复为草稿。所有模型调用由创建者个人词元点数支付，可按智能体设置每次任务和每日上限，费用按时间、来源、应用分页统计；分享/API 调用者保有自己的内容空间。Main 管理云会话和本机文件，Renderer 通过 Host API 操作。配套服务接入见 [Yuxi MakeLore 说明](https://xerrors.github.io/Yuxi/advanced/makelore-agents.html)。 编辑采用全高桌面分栏，支持拖动调整与展开、独立滚动、小窗口配置/试用切换。配置分为指令、能力、知识、限制；草稿明确保存（Ctrl/⌘+S），保存与切换页面保留当前试用及未发送文字，新试用明确使用最新保存版本。费用上限在限制中独立保存。Enter 发送、Shift+Enter 换行，F6 切换面板焦点、Esc 恢复分栏。