# 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: f2456039230f68e3ecb2c8653fc3379c23bbe5ce
- Owner: codex-root
- Status: Ready for Integration

## Scope

- Integrate verified Marketplace Release A candidate
  `d189181ceee2cf66dfcb52c68eaf3f7f7fc42002` and Design V2 client source
  `b0b5a602b501308a23eb27e2f51a5169b9e46b1e` onto local `main` base
  `f2456039230f68e3ecb2c8653fc3379c23bbe5ce`.
- 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.md`
  unchanged; do not stage, delete, stash, reset, or clean it.
- Design V2 client and matching server source `b5351d54` move 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 `main` from base `f2456039` to verified Marketplace
  candidate `d189181ceee2cf66dfcb52c68eaf3f7f7fc42002`, then created semantic
  merge `04ee2c1134074766aee2fd36db2fbe11f84cc461` with Design V2 source
  `b0b5a602b501308a23eb27e2f51a5169b9e46b1e`. 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.md`
  remains 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 `108` tests, and full build.
- Source Design evidence reviewed: typecheck, lint with zero errors, `1425`
  tests, Vite/Electron build, and two Electron E2E tests.
- Merged tree `corepack pnpm typecheck` passed.
- Merged adjacent Design/Marketplace suite passed `22` files / `200` tests.
- Merged full unit suite passed `207` files / `1693` tests with `2` existing
  skips; the isolated pressure test passed `1/1`.
- `corepack pnpm run lint:check` passed with zero errors and the same five
  existing warnings in unchanged Home/Makelore pages.
- Renderer/Main/Preload/utility `build:vite` passed; focused Electron E2E passed
  `5/5` across Living Form V2, Marketplace, and Project Plugins.
- `git diff --cached --check` and `check_project_docs.py` passed 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.