docs: record Windows Code titlebar integration
This commit is contained in:
@@ -4,6 +4,8 @@ This file is the integrated default-branch snapshot. Feature tasks record progre
|
||||
|
||||
## Integrated Through
|
||||
|
||||
- 2026-09-15：任务 `20260915-merge-windows-titlebar-bde0505c` 经用户授权移交主目录登记，将修复源 `dae64e52b94f54c61b14d744ef6e6d0580af2d3a` 无冲突快进合入本地 `main`。Windows Code 对话标题栏按共用的 148 px 窗口按钮与 96 px Logo 尺寸限制可交互区域，浏览器、中止和恢复按钮保持在 Logo 左侧。产品树与已验证源一致，沿用 42 项相关单测、类型检查、scoped lint、Vite 全目标构建及 Electron 标题栏/Code 交互验证；覆盖最小 1024 px 窗口、125% 缩放和窗口最大化/还原。详见[源任务](tasks/20260915-windows-logo-overlap-5106511f.md)。原有三份未跟踪文档保持，源记录原样导入；未推送、打包或安装客户端。
|
||||
|
||||
- 2026-09-15：任务 `20260915-merge-platform-embedding-ml-4e78b319` 经用户授权移交主目录登记，将独立审查通过的 `c466039adb789368189e43971afe489d450d5c82` 无冲突快进合入本地 `main`。知识库 embedding 统一由 Yuxi 配置并直连供应商，平台承担费用，不计算用户用量、词元点数或金额预算；聊天计费保持。客户端知识模型列表沿用 id/name/dimension 契约，配置说明只指向 Yuxi，知识及预算页面明确平台承担向量化成本。 本次新规则取代早期知识库目录交集、one-api 向量接口和创建者付款说明，历史记录保留。源聚焦单测 22 passed、Electron E2E 1 passed、typecheck、scoped lint 与 Vite build 通过；最终文字调整后聚焦 22 单测再次通过，独立 Reviewer Standards/Spec PASS；详见[源任务](tasks/20260914-yuxi-embedding-ml-a174ed62.md)。原有三份文档保持，无新 SQL 或专用环境变量，未推送或部署；真实供应商及完整知识库拓扑验收另行执行。
|
||||
|
||||
- 2026-09-14：任务 `20260914-agent-ui-integration-4a838e7c` 将引导式智能体 UI 源 `6e6a8c92ddb66747a71af714809e2205292a0bf9` 无冲突合入本地 `main`，合并提交 `5a974cf78493b8dd92e176cc26fbe323a18e9570`。面向非专业用户与 8–15 岁学生的创建引导、基础要求、高级设置折叠、保存后重新试用、历史对比及首次自用确认已集成，见[已接受决策](../10-decisions/ADR-2026-09-11-personal-cloud-agents.md)。保留主分支连接时差修复，产品代码与已验证源一致；集成时补充两条异步状态测试等待。组合验证累计 89 项相关单测、类型检查、Vite 全目标构建、Electron 引导用例通过；全量测试沿用源记录中已确认的 Pi v6/v7 既有失败限制。原有三份未跟踪记录原样保留；已授权的源工作区清理因 Git 目录非空错误受阻，残余保留，分支和提交完整。未推送、打包或部署。详见[集成记录](tasks/20260914-agent-ui-integration-4a838e7c.md)。
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
# Task: Merge Windows Code titlebar logo fix
|
||||
|
||||
## Identity
|
||||
|
||||
- Task ID: 20260915-merge-windows-titlebar-bde0505c
|
||||
- Mode: Integration
|
||||
- Branch: main
|
||||
- Worktree: D:\Datas\OthersProjects\makelore
|
||||
- Base commit: a39fbc1619470ad8d47a1b9131b2cada5b940ec5
|
||||
- Owner: codex
|
||||
- Status: Ready for Integration
|
||||
|
||||
## Scope
|
||||
|
||||
- Integrate the completed Windows Code titlebar correction `dae64e52b94f54c61b14d744ef6e6d0580af2d3a` into local main and record its exact integrated frontier.
|
||||
|
||||
## Intent And Constraints
|
||||
|
||||
- The user explicitly requested merging to main, then approved handing over the previous main-worktree registration while preserving the three existing untracked task documents. Released only `20260915-merge-platform-embedding-ml-4e78b319` and claimed this integration task through the bundled scripts with `--adopt-existing`.
|
||||
- Concurrent Task Gate passed: task identity, integration mode, main branch, absolute worktree and base match the official status record. The repository integration lock was acquired.
|
||||
- Planning Gate passed after reading the agent entry/memory index, this task, positioning, integrated snapshot, integration gate and completed source/previous integration records. The decision, architecture, domain and evidence context loaded during the source task is at the identical main baseline. Existing 200 peer scopes remain as assessed; the source task is the only titlebar overlap, and old placeholder scopes remain unknown without a concrete dependency.
|
||||
- Product goal: preserve the current cross-platform light Electron workspace. This integration restores Windows Code action/wordmark separation, not a new architecture or product direction. Positioning still contains placeholders; current AGENTS.md and verified implementation supply applicable boundaries.
|
||||
- Plan: fast-forward to the exact verified source; confirm product identity; update only this integration record and Integrated Through; run the documentation drift gate and commit the integration record.
|
||||
- Keep source task records read-only and preserve the three adopted documents outside commits. No push, packaging, deployment, subagents or unapproved checkout removal.
|
||||
|
||||
## Outcome
|
||||
|
||||
- Fast-forwarded local main from `a39fbc1619470ad8d47a1b9131b2cada5b940ec5` to the exact source `dae64e52b94f54c61b14d744ef6e6d0580af2d3a` without conflicts or product edits.
|
||||
- The Windows Code browser/run controls, Makelore wordmark and caption controls now occupy separate regions. Imported the source task record unchanged and recorded the source commit under current-state.md / Integrated Through.
|
||||
- Preserved all three existing untracked task documents outside commits. No push, package, deployment or installed-client update was performed.
|
||||
|
||||
## Verification
|
||||
|
||||
- Source is a direct child of the current main base, its worktree is clean, and its committed record is Ready for Integration. `git merge --ff-only` succeeded and `git diff --exit-code dae64e5 HEAD` confirmed the exact source tree immediately after merge.
|
||||
- Adopted unchanged-source evidence from this conversation: 42 related unit tests; typecheck; scoped ESLint; Renderer/Main/Preload/utility Vite build; focused Windows titlebar and existing Code interaction E2E passed. Geometry checks cover default/minimum 1024 px widths, 125% zoom, browser opening/closing, sidebar collapse, running/idle and caption interaction.
|
||||
- No product changes or merge conflicts required repeating the same source checks. Integration validation uses the official task-aware drift checker for unchanged imports, canonical write ownership and preserved adopted documents, plus `git diff --check`.
|
||||
|
||||
## Follow-ups
|
||||
|
||||
- User explicitly approved deleting source task `20260915-windows-logo-overlap-5106511f` at `D:\Datas\OthersProjects\.codex-worktrees\makelore\20260915-windows-logo-overlap-5106511f`, preserving branch `codex/20260915-windows-logo-overlap-5106511f-windows-logo-overlap` and commits. Before invoking bundled `retire`, verified the absolute target, clean source state, exact source HEAD and inclusion in main. Retirement failed with Git `Directory not empty`, leaving a partially removed directory (including dependency/source files) and no Git worktree listing for this path. Retained those residual files; did not bypass the skill with a manual recursive delete. The source branch and committed result remain intact. Cleanup is blocked on the supported retirement/recovery workflow; this does not block the completed merge.
|
||||
- Rebuild and install the Windows client when an updated application is requested.
|
||||
|
||||
## Promotion Candidates
|
||||
|
||||
- No new architecture or domain rule. This integration records the verified Windows titlebar correction in the canonical integrated snapshot.
|
||||
Reference in New Issue
Block a user