# Task: Integrate all local changes into main

## Identity

- Task ID: 20260901-integrate-all-local-4d7a9c21
- Mode: Integration
- Branch: main
- Worktree: /Users/inmanx/Documents/makelore
- Base commit: 9ed70ba925a7e544f17bf5b418846df9d4145a2a
- Owner: codex
- Status: Planning

## Scope

- Audit every local branch, linked worktree, tracked modification, and
  untracked task-owned file that is not already represented by `main`.
- Commit complete source-task changes in their owning worktrees, then integrate
  all semantically compatible local product and documentation changes into
  local `main`.
- Preserve the consolidated Plugin Services navigation, Coding history/quota
  correction, and assistant progress-message behavior together when resolving
  their overlapping Renderer and test files.
- Synchronize canonical product documentation, run repository-required
  verification, and restart the merged development application.

## Intent And Constraints

- Preserve the current four-module, light-only product boundary, Main-owned
  runtime/Host API architecture, `.makelore/project.json` authority, and the
  accepted removal of the Learning course runtime/OpenMAIC player under
  ADR-005.
- Source task records are immutable from this Integration Gate; source commits
  must be completed in their owning worktrees before they are merged.
- Do not mechanically choose one side of a semantic conflict. The historical
  `codex/learning-player-release-fix` branch is retained unchanged because it
  would reverse ADR-005 and was explicitly excluded by the earlier integration
  record; merging it requires a new explicit product-direction decision.
- Do not push `main`; this task is a local integration unless the user separately
  authorizes a remote update.

## Outcome

- Not completed.

## Verification

- Not run.

## Follow-ups

- None recorded.

## Promotion Candidates

- None recorded.