diff --git a/.project-docs/30-worklog/current-state.md b/.project-docs/30-worklog/current-state.md index d638606d..888c7703 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-29:用户明确选择与其他官方插件相同的“客户端内置,默认安装”。已合入源 `97c3e45`,合并提交 `7a42de875bacb79fe6d660194b58f22c7d081830`。MakeLore 版本更新为 `2.0.2`,内置“对孩子说清楚”`1.0.1`,原 Skill 文件字节不变;登录/刷新时默认领取,无插件 ZIP 下载或单独签名。手动移除保持,项目启用后对操作 Agent 生效,无需另行分配 Skill。配套服务端 `f15cc46f` / 迁移 0098 创建新 bundled Release,保留旧 Artifact 和账号记录,并阻止不含 Skill 的旧客户端使用新版。113 项相关单测、类型检查、lint、构建和 1 项 Electron 场景通过;源产品与主目录一致,3 份外来文档原样保留。未推送、打包、发布或更新安装版,需两端发布。本条取代下方该插件从服务端下载并验签的历史指导;其他 Artifact 插件验签不变。见[源任务](tasks/20260928-default-child-replies-0108dd01.md)及[集成记录](tasks/20260928-merge-default-child-b4d62e81.md#bundled-delivery-resume)。 + - 2026-09-28:经用户确认主目录交接,将源 `e70b6eab91b71c6149a96fa9cd5974d8706417ba` 从 `efff238a` 快进合入本地 `main`。“对孩子说清楚”在会话激活和插件列表刷新时通过既有签名市场流程自动领取并安装,已装复用、失败后续重试、账号隔离;明确移除或卸载后保留退出意愿。安装完成显示在已安装列表,项目启用与 Agent 绑定仍由原控制管理。配套服务端源 `c9ff8a4f` 修复线上已上架却未签名的 Release,并禁止未就绪包上架。产品/测试与已验证源一致,沿用 70 项相关单测、标准类型检查、lint、Vite 构建和 1 项 Electron 场景。三份外来未跟踪文档原样保留;未推送、打包、部署或更新安装版,需要同时发布客户端与服务端才能生效。见[源记录](tasks/20260928-default-child-replies-0108dd01.md)和[集成记录](tasks/20260928-merge-default-child-b4d62e81.md)。 - 2026-09-28:续接获授权的组件移除集成任务,合并远程 `b645cfa312ca23e9a44758211a43f4934a44a70f` 与本地 `d37bc13`。保留账号/项目/智能体独立聊天,接入 reply-v1、0–3 条新快捷回复、完整正文/历史恢复、显式重试、欢迎语消费及旧组件接口退役;项目边界适配到路由、存储与测试。补齐首次导入全局历史时的内存回复恢复,原始存档保留。472 项相关单测、28 项浏览器布局、6 项 Electron 场景、标准类型检查、变更文件 lint 和最终生产构建通过。旧组件仅留原档案,不进入新上下文;本条取代下方历史记录中组件协议与跨项目假设。三份未跟踪文档及六份远程来源记录原样保留,未推送、打包、部署或更新安装版;独立主动观察仍未合入。见[集成记录](tasks/20260928-merge-teacher-cards-a09c07f3.md#remote-main-merge-resume)。 diff --git a/.project-docs/30-worklog/tasks/20260928-merge-default-child-b4d62e81.md b/.project-docs/30-worklog/tasks/20260928-merge-default-child-b4d62e81.md index f6b354d1..1bde3b08 100644 --- a/.project-docs/30-worklog/tasks/20260928-merge-default-child-b4d62e81.md +++ b/.project-docs/30-worklog/tasks/20260928-merge-default-child-b4d62e81.md @@ -40,3 +40,12 @@ ## Promotion Candidates - Accepted: signed Marketplace default installation with persistent user opt-out, independent project/Agent controls and coordinated rollout. Recorded in current-state Integrated Through with source provenance; source task records remain read-only. + +## Bundled Delivery Resume + +- User explicitly chose client bundling/default installation on 2026-09-29 after comparing existing official plugins. This supersedes the previous server-only delivery recommendation for this Skill and authorizes the change in release provenance; other Artifact signature rules stay intact. +- Resumed this same primary integration owner via bundled check/start/status, preserving the exact three adopted foreign documents and exclusive integration lock. Own/source records and current-state refreshed; previously loaded startup/architecture/domain/decision/evidence and 135 peer scopes reused at unchanged main head 5d45cd7. Planning/Integration Gates passed. No subagents. +- Merged source 97c3e45 without conflict as 7a42de875bacb79fe6d660194b58f22c7d081830. MakeLore 2.0.2 includes bundled child-friendly replies 1.0.1 / release ...0605 and automatically acquires it on session/list refresh without a ZIP download or signature setup. Account removal, account isolation and project enablement remain; enabled projects receive the Skill through the same project-wide mechanism as project-scaffold. +- Source validation: 113 unit cases, typecheck, changed-file ESLint, Vite build and one Electron Installed-tab/no-download scenario passed. The actual bundled manifest and Skill materialization are covered, including disabled projects and removal. Original Skill/openai.yaml bytes are preserved; package-local LF attributes prevent primary-checkout conversion. Companion server 24 cases passed. +- Main-checkout product/tests and imported source records match the tested source; no repeat product tests are needed for this merge. The three foreign documents remain byte-for-byte unchanged and uncommitted. Accepted current-state promotion records new delivery and deployment requirements; task-aware drift check closes documentation. +- Release requires server migration 20260929_0098 and client 2.0.2. No push, installer packaging, publication, production deployment or installed-app update occurred. The existing cleanup question covers this same source worktree; pending consent does not block the completed merge.