merge: reconcile latest main changes

This commit is contained in:
inman
2026-09-03 11:11:58 +08:00
parent 04320ddfd4
commit cdbc262802
10 changed files with 200 additions and 31 deletions

View File

@@ -0,0 +1,117 @@
# Task: Integrate latest changes into main
## Identity
- Task ID: 20260903-integrate-latest-6f2c8e1a
- Mode: Integration
- Branch: codex/20260903-integrate-latest-6f2c8e1a-integrate-latest
- Worktree: /Users/inmanx/Documents/makelore-integrate-latest-6f2c8e1a
- Base commit: 301c1496b0a3a1af3b9443a68a67de8dfea45749
- Owner: codex
- Status: Checkpointed for final gate
## Scope
- Merge fetched `origin/main` with the 34 local-only `main` commits without
dropping either side's product changes or task-scoped project memory.
- Integrate the three completed, worktree-owned change sets that remain
uncommitted: packaged Pi Agent Server resolution, Conversation unread-marker
semantics, and foreground authoritative Snapshot reconciliation.
- Reconcile accepted promotion candidates into canonical project memory, run
the repository's required verification, promote the verified integration tip
to local `main`, and push it to `origin/main`.
- Audit all local branches and worktrees; retain the explicitly excluded
historical Learning Player branch outside the merge.
## Intent And Constraints
- Preserve both divergent mainline histories with a normal merge; do not
rewrite or force-push remote history.
- Preserve ADR-005's retired Learning Player boundary and ADR-006's Pi-only,
Main-owned, no-mutation-replay architecture.
- Treat source task records and their promotion candidates as authoritative for
scope; resolve shared project-memory conflicts semantically rather than with
blanket `ours`/`theirs` rules.
- Keep generated installers, release output, caches, dependencies, secrets, and
local user data out of Git.
- Use pinned pnpm 10.33.4 and run typecheck, focused tests, the full unit suite,
lint, and the Vite/Electron production build before pushing.
## Outcome
- Fetched remote frontier `28e1690` and preserved it together with the 34
local-only main commits through normal history merge `d25ed08`; no rebase,
history rewrite, or force-push was used.
- Committed each fully owned source worktree without altering its implementation:
packaged Pi runtime resolution as `5d7a235`, attention-only Conversation badges
as `f2c3755`, and foreground authoritative Snapshot reconciliation as `7aa118b`.
- Integrated those sources through merges `4babd6d`, `bbfe16d`, and `04320dd`.
Semantic conflict resolution retained Project Configuration as the only visible
Plugin Services navigation while including remote Model Tools, Device Packages,
and youth-facing Canvas behavior. The merged Electron EventSource/Snapshot
fixtures retain both attention-badge and foreground-reconciliation coverage;
the badge fixture now emits the authoritative worker generation so the newly
required foreground Snapshot refresh does not correctly discard its later
synthetic events as stale.
- Reconciled accepted promotion candidates into README, current state, architecture,
business rules, evidence, and commitments. The explicit staged-runtime package
resolver supersedes the earlier flag-only packaged resolver without overstating
the local unsigned macOS artifact as signed-release readiness.
- Audited all local branches. Only source `b1f51be` is not merged; it is the retired
OpenMAIC Learning Player implementation explicitly excluded by ADR-005.
- The task-aware drift check cannot treat task records introduced by source merge
commits as read-only: because this task was claimed before those merges, it reports
every newly merged source task record as a foreign edit even though their blobs were
not modified. The fully verified tree is therefore checkpointed here; final gate
task `20260903-finalize-main-integration-b7e2c4a9` will claim this exact clean HEAD
as its base, repeat the drift/completion gate, and perform the main push.
## Verification
- Planning and integration ownership gates passed.
- Fetched `origin/main`; divergence is 51 remote-only / 34 local-only commits
from merge base `bf32fecd6013101485434b1977a73beb8b6a1fe3`.
- All registered peer task records were reviewed; no semantic conflict exists
among the three pending source tasks.
- `corepack pnpm exec vitest run tests/unit/plugin-marketplace-pages.test.tsx
tests/unit/pi-managed-worker-opener.test.ts
tests/unit/pi-agent-server-process-real.test.ts --maxWorkers=1`: passed,
3 files / 20 tests after the remote/local history merge.
- `corepack pnpm exec vitest run tests/unit/pi-agent-server-process-real.test.ts
--maxWorkers=1`: passed, 1 file / 5 tests after the runtime-root source merge.
- `corepack pnpm exec vitest run tests/unit/coding-conversations-store.test.tsx
tests/unit/coding-chat-panel.test.tsx --maxWorkers=1`: passed,
2 files / 49 tests after the badge and foreground source merges.
- `corepack pnpm run typecheck`: passed on the fully merged source tree.
- Final focused Vitest: 5 files / 70 tests passed, covering Marketplace navigation,
managed-worker startup, packaged Agent Server, Conversation reducer, and Coding
Chat foreground behavior.
- `corepack pnpm exec playwright test tests/e2e/pi-coding-first-chat.spec.ts`:
passed, 4/4 after rebuilding the final Electron bundles. The first attempt used
stale pre-merge ignored build output and timed out during Electron launch; after
`build:vite`, one fixture generation mismatch was exposed and corrected before
the final all-green run.
- `corepack pnpm test`: passed; functional stage 223 files / 1,832 passed / 3
skipped, isolated pressure stage 1 file / 1 passed.
- Final `corepack pnpm run typecheck`: passed.
- `corepack pnpm run lint:check`: passed with 0 errors and 5 pre-existing warnings.
An earlier concurrent lint run raced a Marketplace test's temporary-directory
teardown and returned `ENOENT`; the required standalone rerun passed.
- `corepack pnpm run build:vite`: passed for Renderer, Electron Main, Preload, and
utility outputs with only existing Browserslist, chunk-size, and dynamic-import
warnings.
## Follow-ups
- Final gate task `20260903-finalize-main-integration-b7e2c4a9` must start from this
clean checkpoint, verify remote ancestry has not advanced, pass project-doc drift,
update local `main`, and push normally to `origin/main`.
- Signed/notarized macOS release evidence, the actual corrected-app reinstall and
first-Conversation smoke, full macOS process enumeration, other architecture
gates, packaged Device Package acceptance, and real selected-model paid search
remain tracked external acceptance work; none blocks source integration.
## Promotion Candidates
- None. Accepted source-task promotion candidates were reconciled directly into
canonical memory by this integration task.