4.1 KiB
4.1 KiB
Task: Integrate Marketplace and Design V2 client to main
Identity
- Task ID: 20260830-integrate-marketplace-design-client-main-9d5f3b82
- Mode: Integration
- Branch: main
- Worktree: D:\Datas\OthersProjects\makelore
- Base commit:
f245603923 - Owner: codex-root
- Status: Ready for Integration
Scope
- Integrate verified Marketplace Release A candidate
d189181ceee2cf66dfcb52c68eaf3f7f7fc42002and Design V2 client sourceb0b5a602b501308a23eb27e2f51a5169b9e46b1eonto localmainbasef2456039230f68e3ecb2c8653fc3379c23bbe5ce. - Resolve the two independent source histories semantically, preserving both the plugin Package Store/runtime lifecycle and the Main-owned Living Form V2 Canvas authority.
- Promote Marketplace canonical memory plus an accepted Living Form V2 ADR that explicitly supersedes ADR-001.
Intent And Constraints
- The user explicitly authorized adopting this previously dirty root worktree.
Preserve untracked record
.project-docs/30-worklog/tasks/20260827-plugin-ml07-spec-7c5a2e91.mdunchanged; do not stage, delete, stash, reset, or clean it. - Design V2 client and matching server source
b5351d54move as one contract: no V1 DTO/local semantic fallback or client-only public cutover. - Marketplace production trust remains fail closed until the official Ed25519 public key is built in. Release B, deployment, publication, push, and PR remain out of scope.
- Resolve supported-path conflicts only. Do not add compatibility wrappers, rollout flags, or unrelated defensive scaffolding.
Outcome
- Fast-forwarded local
mainfrom basef2456039to verified Marketplace candidated189181ceee2cf66dfcb52c68eaf3f7f7fc42002, then created semantic merge04ee2c1134074766aee2fd36db2fbe11f84cc461with Design V2 sourceb0b5a602b501308a23eb27e2f51a5169b9e46b1e. The merge has those exact two parents. - Preserved Marketplace Main/Package Store/effective resolver, plugin pages, and Pi lifecycle while replacing Canvas V1 with the paired Living Form V2 contract. The only textual conflict was README; its resolution retains both Marketplace documentation and the V2 Canvas/Prompt Museum workflow.
- Accepted ADR-007 and explicitly marked ADR-001 superseded. Canonical module, data-flow, business-rule, current-state, and evidence documents now describe Current Specification/Living Form authority and immutable Quote confirmation.
- Excluded source-owned proposal/task records from canonical
main. The user-authorized orphan.project-docs/30-worklog/tasks/20260827-plugin-ml07-spec-7c5a2e91.mdremains unchanged, untracked, and unstaged. - No push, PR, deployment, publication, Release B work, production trust activation, or paid Provider request was performed.
Verification
- Source Marketplace evidence reviewed: R7 Standards/Spec PASS, XMA-01 12/12,
typecheck, focused
108tests, and full build. - Source Design evidence reviewed: typecheck, lint with zero errors,
1425tests, Vite/Electron build, and two Electron E2E tests. - Merged tree
corepack pnpm typecheckpassed. - Merged adjacent Design/Marketplace suite passed
22files /200tests. - Merged full unit suite passed
207files /1693tests with2existing skips; the isolated pressure test passed1/1. corepack pnpm run lint:checkpassed with zero errors and the same five existing warnings in unchanged Home/Makelore pages.- Renderer/Main/Preload/utility
build:vitepassed; focused Electron E2E passed5/5across Living Form V2, Marketplace, and Project Plugins. git diff --cached --checkandcheck_project_docs.pypassed before the merge.
Follow-ups
- On the stopped target deployment, complete Design V2 dry-run/apply/validate, then run the paired real-account installed-client interrupted-write and generation smoke. Keep paid Provider and Marketplace production trust activation separate.
Promotion Candidates
- Applied: Marketplace module/data-flow/business-rule/current-state/evidence facts.
- Applied: ADR-007, ADR-001 supersession, and paired Living Form V2 architecture, rules, current-state, and evidence facts.