docs: record model capability main branch delivery
This commit is contained in:
1 parent
2888aaedac
commit
1d661f7a56
7 files changed
+87
-6
No files matched your search
@@ -4,6 +4,8 @@ This file is the integrated default-branch snapshot. Feature tasks record progre
|
||||
|
||||
## Integrated Through
|
||||
|
||||
- 2026-09-12:任务 `20260912-land-model-capabilities-c6fa4309` 经用户授权交接主目录及集成锁,将模型能力源 `26cbb29` 合入本地 main,合并为 `2888aaed`;保留已有知识库和云智能体界面。受管模型采用 Works v2 官方能力,Main 持久化并验证原生 reasoningChoice、冻结供应商控制字段,图片附件与 Pi input 一致。合并后 57 项相关测试、类型检查、Vite 全目标构建、Electron 受管模型用例 1 项通过;源任务验证保持有效。3 份原有未跟踪记录原样保留,未推送、打包、部署或清理工作区。见[官方模型能力决策](../10-decisions/ADR-2026-09-12-official-model-capabilities.md)。
|
||||
|
||||
- 2026-09-12:任务 `20260912-merge-kb-embedding-49e2b6c` 在用户确认主目录占用移交后,将本地 main 从 `a0b869a` 无冲突快进到知识库修复源 `3507f70e114be94913c72aa9e70eb6f9455cd86d`。创建知识库明确区分模型目录加载/失败/空状态,提供管理员配置说明及原地刷新;刷新保留名称,未知创建继续复用原请求身份。模型由平台管理员在 Yuxi 定义并启用(含维度)、在 Works Square 激活相同模型 ID,one-api 提供实际向量接口。客户端继续消费 Main Host API。源 50 项相关测试、类型检查、scoped ESLint、Vite 构建和 Windows Electron fixture 1 项通过;快进合并未改写产品代码,复用源验证。原有 3 个未跟踪文档保留;未推送、打包或部署,线上具体配置缺口及真实收费调用未验证。
|
||||
|
||||
- 2026-09-12:任务 `20260912-merge-agent-draft-d960aa87` 经用户明确同意释放旧任务占用并保留 3 份原有未跟踪记录,将本地 main 从 `70fa916` 无冲突快进到 `dca6deab292028c9f3cfd097a8c52ba0d43b35a9`。Agents 采用账号级全高桌面分栏,指令/能力/知识/限制分类,保存与试用修订分离、独立费用保存及后台会话未读保护;详情见[个人云智能体决策](../10-decisions/ADR-2026-09-11-personal-cloud-agents.md)。源最终 65 项相关测试、类型检查、scoped ESLint、Vite 构建和 Windows Electron 大小窗口/内容缩放验收通过;合并未改写产品代码,复用这些验证证据。尚未推送、制作安装包或更新已安装客户端。
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
# Task: Land approved model capability integration on main
|
||||
|
||||
## Identity
|
||||
|
||||
- Task ID: 20260912-land-model-capabilities-c6fa4309
|
||||
- Mode: Integration
|
||||
- Branch: main
|
||||
- Worktree: D:\Datas\OthersProjects\makelore
|
||||
- Base commit: a06909e78b5e2138f29698a2222aea2cc879dc9e
|
||||
- Owner: codex
|
||||
- Status: Ready for Integration
|
||||
|
||||
## Scope
|
||||
|
||||
- Land approved model capability source 26cbb29 onto local main; reconcile canonical memory and preserve pre-existing records.
|
||||
|
||||
## Intent And Constraints
|
||||
|
||||
- User explicitly authorized handoff of all three primary checkout owners/integration locks and preservation/reconciliation of pending documents. Bundled release --force and start --adopt-existing succeeded; status matches this task, Integration mode, primary worktree, branch and base.
|
||||
- Concurrent and Planning Gates Passed: entry, own task, memory/positioning/current-state/decisions/architecture and relevant evidence/reflection/commitments loaded; source outcomes/promotions and peer scopes assessed. Reuse unchanged baseline memory; historical placeholders remain unknown without a concrete dependency. Makelore positioning placeholders are supplemented by README and ADR-006.
|
||||
- Prepared integration locks were released via the loaded bundled release_integration_lock function while retaining their ready managed ownership. This task holds the main integration lock. No subagents, push, deployment, paid inference or worktree deletion; unrelated failed knowledge cleanup is not retried.
|
||||
- Source task and supporting records remain read-only. Existing foreign task documents remain unchanged/uncommitted; one-api canonical notes and gate assets may be preserved in an explicit documentation commit under the user's handoff approval.
|
||||
|
||||
## Outcome
|
||||
|
||||
- Local main merged source 26cbb29 as 2888aaed without conflicts, retaining existing knowledge and cloud-agent UI updates.
|
||||
- Accepted v2 authority, native reasoningChoice and Main/Pi request preparation into ADR, decision index, architecture/data flow/domain and current-state.
|
||||
- Three original untracked task documents remain byte-for-byte unchanged and uncommitted.
|
||||
|
||||
## Verification
|
||||
|
||||
- Final working/committed delta reviewed; git diff whitespace and bundled task-aware documentation drift checks passed. Source records and preserved foreign documents satisfy the gate. This Ready record is committed with the handoff; bundled complete follows.
|
||||
|
||||
- Integrated main passed 57 focused tests in seven files covering managed capabilities, provider/runtime/import plus the independently merged knowledge/cloud-agent UI.
|
||||
- Renderer typecheck, all Vite build targets and actual Electron managed-capability test (native xhigh choice and blocked unsupported image input) passed.
|
||||
- Source 70-test/Pi HTTP/Electron verification remains valid; the 61 pre-existing additional Main tsc diagnostics were already compared to baseline with zero additions. No paid provider test or installed-package claim.
|
||||
- Source ancestry and changed-path inspection confirm the pre-existing main UI commits are retained. Original foreign task records were compared directly and unchanged.
|
||||
|
||||
## Follow-ups
|
||||
|
||||
- Awaiting optional cleanup confirmation: source 20260912-model-capabilities-c48271f9, D:\Datas\OthersProjects\.codex-worktrees\makelore\20260912-model-capabilities-c48271f9, branch codex/20260912-model-capabilities-c48271f9-model-capabilities. Its latest result is included in actual main; confirm clean/ready/managed eligibility before retire.
|
||||
- The unrelated failed knowledge retirement and its residual directory/registration remain unchanged. The unused checkout from the failed capability integration start is unowned/unmanaged and is retained, not offered for automatic retirement.
|
||||
- Worktree cleanup removes ignored dependencies/build output but preserves branches/commits. No cleanup has been authorized or executed by this handoff. No push, package, deployment, migration of a deployed database or paid inference.
|
||||
- Release order remains one-api -> Works migration/deployment -> matching Makelore release; real account catalog/group and provider inference are deployment acceptance.
|
||||
|
||||
## Promotion Candidates
|
||||
|
||||
- Approved source capability contract promoted into canonical memory; actual main landing recorded. No unresolved product decision.
|
||||
Reference in new issue
Block a user