Merge project-scoped agent conversations into main

This commit is contained in:
brother7 committed 2026-09-28 16:34:18 +08:00
commit f12f890c49
23 files changed
+555 -181

No files matched your search

@@ -8,7 +8,7 @@
- Worktree: D:\Datas\OthersProjects\makelore
- Base commit: a1d52c60d841dc451545805af5fe91b0ca8839d3
- Owner: codex
- Status: Ready for Integration
- Status: In Progress
## Scope
@@ -62,3 +62,17 @@
- Electron scenarios passed: consultation switching/hover/drafts, manual refresh/failure/retry with ongoing history, and delivered-agent presence/focus/preview with no legacy check-in. All 9 browser layout scenarios passed after fixture adaptation. Manually inspected final refresh and narrow hover screenshots. Isolated deterministic Host responses only; no live model calls.
- README now describes current per-turn versions and unique chats consistently with refresh. Canonical teacher ADR, architecture and Integrated Through record the combined behavior. Remote source task records remain byte-identical to 4495345; the three pre-existing untracked documents are excluded from the merge. No push, deployment, packaging, source-worktree deletion or observer feature integration.
- Final scope verification includes both parent histories, no conflict markers/unmerged index entries, whitespace and task-aware documentation drift gates. No new cleanup candidate is created: the resumed root main checkout is unmanaged and is retained.
## Project Isolation Correction Resume
- User explicitly corrected the ongoing-chat identity to account + project + delivered agent and requested the completed correction be merged into main. Resume this same integration task without releasing ownership or changing its recorded base. Official start/status, exclusive integration ownership and Planning Gate passed; 133 registered task records were assessed, including the ready source and independent observer. Historical placeholder scopes remain unknown with no concrete dependency on this merge.
- Scope: integrate source 4b41c23a3a5e9da1a329b1b69930787a670163de from main base a21a1f077cc11976213290a6b843bb74be97ab44. Project separates history, drafts, read receipts, events and model context; each project-agent pair still has one visible ongoing chat. Preserve original mixed history and retain all source task records unchanged. The user's explicit correction supersedes the earlier cross-project product assumption recorded above.
- Plan: merge the verified source without rewriting product files, reconcile the teacher ADR, architecture, domain and shared indexes, check exact source product/test preservation and document boundaries, then commit and complete. Reuse source verification if integration changes only documents. Preserve the three previously adopted foreign documents unchanged and unstaged. No new subagents, push, deployment, packaging, paid model calls or cleanup.
- Independent observer task 20260928-agent-observer-design-9c41a872 remains outside this merge; authorized coordination already supplied the project-scoped identity and Host API/service changes. Future suggestion delivery must target this project's agent conversation.
### Project Isolation Outcome And Verification
- Source 4b41c23 merged without conflicts. All non-project-document files and the imported source task record match the verified source exactly. Updated the accepted teacher ADR, decision index, architecture/data flow, domain rules, evidence index and Integrated Through to the user-approved account-project-agent identity. Earlier integration/source records remain historical evidence rather than the current cross-project rule.
- Reused the identical source's 382 relevant tests, standard typecheck, changed-file lint, Vite build and three Electron regressions. No product edits or added test scope in this integration; expanded Main retains the documented 66 existing diagnostics. No installed-client or live model acceptance claim.
- Product/source equality and staged/working whitespace checks passed. The pre-commit drift check reports only the newly staged source task record: the current bundled script requires a committed unchanged import and shared source-branch ancestry. Its source record is byte-identical to 4b41c23 and the source branch is retained. The normal requested merge will establish that ancestry; run the official drift gate after committing, before completion. No adoption, base rewrite or checker bypass is used.
- Three existing untracked foreign task documents remain unchanged and excluded. No push, deployment, packaging, paid model calls or source-worktree cleanup. Retain the source worktree until the post-merge cleanup offer is answered.