docs: integrate coding conversation controls on main
This commit is contained in:
1 parent
fd0293fe3d
commit
d222d17500
5 files changed
+67
-1
No files matched your search
@@ -4,6 +4,15 @@ This file is the integrated default-branch snapshot. Feature tasks record progre
|
||||
|
||||
## Integrated Through
|
||||
|
||||
- 2026-09-20:任务 `20260920-merge-coding-sessions-bfb69ebb` 经用户确认释放旧集成登记并接管主目录,
|
||||
将会话管理源 `fd0293fe3d94b5a7725cff992ca94f129a6ac889` 从 `d612265` 无冲突快进合入本地 `main`。
|
||||
Code 支持归档/恢复及共享重命名入口;新会话使用首条用户消息首行作为标题,不调用模型,
|
||||
手动与历史标题保持稳定。归档只改变元数据,不停止运行任务;恢复后可继续发送。
|
||||
产品树与已验证源一致,沿用 115 项聚焦/压力测试、1 项 Electron 交互、前端类型检查、lint
|
||||
和 Vite 全目标构建证据;Main 类型检查有既有诊断但无新增。源记录原样导入,3 份原有文档保留。
|
||||
详见[集成记录](tasks/20260920-merge-coding-sessions-bfb69ebb.md)与[元数据流](../20-architecture/data-flow.md#code-conversation-metadata)。
|
||||
未推送、打包或部署;本地 Pi 历史与 Host 夹具测试不代表真实 Provider 验收。
|
||||
|
||||
- 2026-09-20:任务 `20260920-merge-account-ui-38b91cd6` 经用户授权移交主目录登记,
|
||||
将 `e047877`、`c953126`、`fba5880` 从 `7fb4c60` 无冲突快进合入本地 `main`。
|
||||
智能体移除指定用户分享入口并改名“使用与接入”;微信绑定确认后自动收起二维码,
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
# Task: Merge coding conversation management into main
|
||||
|
||||
## Identity
|
||||
|
||||
- Task ID: 20260920-merge-coding-sessions-bfb69ebb
|
||||
- Mode: Integration
|
||||
- Branch: main
|
||||
- Worktree: D:\Datas\OthersProjects\makelore
|
||||
- Base commit: d61226532a5946af4a0b12b4eb02ce9059d20ddb
|
||||
- Owner: codex
|
||||
- Status: Ready for Integration
|
||||
|
||||
## Scope
|
||||
|
||||
- Fast-forward completed source fd0293fe3d94b5a7725cff992ca94f129a6ac889 into local main and promote the accepted Code conversation title/archive ownership and behavior.
|
||||
|
||||
## Intent And Constraints
|
||||
|
||||
- User requested main integration and explicitly confirmed releasing completed owner 20260920-merge-account-ui-38b91cd6 and adopting the three original untracked task documents unchanged. Official release/start/status succeeded; this task exclusively owns main and the integration lock at the recorded base.
|
||||
- Concurrent Task Gate and Planning Gate Passed. Read entry, active task, memory index, positioning/current-state, Pi ADR-006, architecture/domain/success criteria, relevant evidence/reflection/commitment context and all 145 peer scope/intent/promotion sections. Historical placeholders remain unknown/read-only without a concrete conflicting dependency. The current skill takes precedence over legacy local shared-document restrictions and reflection advice.
|
||||
- User explicitly replaced the earlier model-generated-title proposal with first-user-message titles; this implementation and promotion honor that amendment. Preserve Main ownership, running work and manual/historical titles. Source task records stay read-only. No subagents, unrelated product changes, remote push, packaging or deployment.
|
||||
|
||||
## Outcome
|
||||
|
||||
- Fast-forwarded local main from d612265 to fd0293f without conflicts. The merge includes archive/restore, shared rename UI and one-shot first-user-message titles without a model call.
|
||||
- Promoted the accepted metadata flow, module ownership and domain behavior in data-flow, module-map and business-rules; recorded the source commit under current-state Integrated Through. The source task record was imported unchanged.
|
||||
- The original untracked documents 20260901-package-122-c5e8.md, 20260901-package-123-d7f3.md and 20260902-client-hang-diagnosis-a47c9e2b.md remain outside the integration commit.
|
||||
|
||||
## Verification
|
||||
|
||||
- Source ancestry confirmed a direct fast-forward; the source worktree was clean at fd0293f. After merge, both the complete product tree and source task record match fd0293f exactly.
|
||||
- Reuse exact-source verification because the fast-forward introduces no product edits: 114 focused tests plus one pressure test, one Electron rename/archive/restore fixture, frontend typecheck, lint (0 errors, 8 existing warnings), and Vite Renderer/Main/preload/utility build passed. Real pinned Pi 0.84.2 history hydration was covered locally; no live Provider turn is claimed.
|
||||
- Explicit Main TypeScript checking retains baseline failures: source comparison found 89 baseline and 88 current diagnostics, with no added diagnostics. This integration does not broaden scope to those pre-existing errors.
|
||||
- git diff --check and the task-aware documentation drift check passed. The latter confirms imported source provenance and that all three adopted foreign documents are unchanged. Source registry/readiness, clean status, branch and latest HEAD match the committed source record.
|
||||
|
||||
## Follow-ups
|
||||
|
||||
- Source task 20260920-coding-session-controls-10fee632 is retained awaiting cleanup confirmation at D:\Datas\OthersProjects\.codex-worktrees\makelore\20260920-coding-session-controls-10fee632, branch codex/20260920-coding-session-controls-10fee632-coding-session-controls. Its latest result is integrated; removing the checkout also removes ignored dependencies/build output while preserving branch and commits. Main is not a cleanup candidate.
|
||||
- An updated client build/install is needed to expose the feature in an installed app; this task only integrates source locally.
|
||||
|
||||
## Promotion Candidates
|
||||
|
||||
- Accepted and promoted: Main metadata owns stable manual/historical and first-user-message automatic titles; archive preserves running work; list metadata invalidation is separate from sequenced runtime patches. The user's explicit amendment supplies the product decision; Pi runtime and Provider ownership remain unchanged.
|
||||
Reference in new issue
Block a user