Task: Integrate remote main into local main

Identity

Merge fetched origin/main@d642d76 into local main@53f3db3 with a normal two-parent merge and preserve both histories.
Reconcile overlapping product and canonical documentation so the official Project Scaffold plugin coexists with the locally integrated Learning removal.
Verify ancestry, repository integrity, and focused behavior affected by any conflict resolutions.

Hold the Integration Gate lock for the complete merge and documentation reconciliation.
Do not rebase, reset, force-push, stash, discard local commits, or publish the result remotely.
Preserve the product boundary of Code, Canvas, and Robot only; do not restore Learning routes, APIs, assets, or packaging paths.
Accept ADR-008's already-reviewed interactive_ai_app and bundled official Scaffold Skill boundary while retaining Main-owned build/release authority.
Resolve semantic conflicts from source task outcomes and accepted decisions; do not choose whole-file ours or theirs for canonical documents.

Created ordinary two-parent merge a2cb07fedcf22bb14141a27cee2218c149b8c63e with parents local 53f3db3aced61533944eab5e6b3c8c2293f733f8 and remote d642d7607c26dee01ef65b4e70dd756465dea16a; neither history was rewritten.
Resolved the only three conflicts in data-flow.md, system-overview.md, and current-state.md. The resulting canonical state keeps the three-module Code/Canvas/Robot access projection and complete Learning removal while adopting ADR-008, interactive_ai_app, the explicit bundled Project Scaffold Skill, and its device-status correction.
Application code, including the shared Sidebar, merged automatically without conflict. Confirmed that no Learning implementation path was restored.
Updated README to replace the obsolete automatic小游戏/小程序 template description with minimal project creation, historical alias normalization, explicit scaffold execution, and the code-owned bundled-script exception.
Kept the two imported remote task records read-only and excluded them from the resulting default-branch tree; both remain intact in remote parent d642d76 and its history, while their accepted outcomes are recorded in canonical current state.
Local main is now 8 commits ahead and 0 behind origin/main. No push, package, deployment, publication, or production database mutation was performed.

git show -s --format='%H %P' a2cb07f confirms the expected two parents, and git rev-list --left-right --count main...origin/main returned 8 0 immediately after the merge.
Focused Vitest: 14 files, 228 tests passed.
Scaffold Node tests: the default macOS /var temporary alias produced 10/12 with two empty-output copied-script failures; rerunning through the canonical /private/var temporary directory passed 12/12. The alias difference was confirmed with fs.realpathSync(os.tmpdir()) and did not require product-code conflict repair.
pnpm run typecheck passed using pinned pnpm 10.33.4.
Full pnpm test passed 1,859 tests with 3 conditional skips, then pressure 1/1.
pnpm run lint:check completed with 0 errors and 12 existing warnings.
pnpm run build:vite completed all Renderer, Main, Preload, and utility builds.
Targeted Electron E2E project-configuration-skills.spec.ts passed 1/1.
Git whitespace and unresolved-conflict checks passed before the merge commit.
The first task-aware drift check correctly blocked on the two task records imported by the merge commit. It did not identify an authored mutation to either record; final gate closure is transferred to a fresh Integration task whose base contains the merged and reconciled history.

Harden the scaffold CLI main-module check or its macOS test fixture so scripts invoked through the /var alias match Node's canonical /private/var module URL; this is not changed incidentally by repository synchronization.
Deploy the matching Works Square server and migrate through 20260904_project_scaffold_0085 before claiming production Marketplace availability.
Close the project-document ownership check from fresh Integration task 20260905-finalize-pull-integration-c49a71 based on the reconciled merge result.

None. This Integration Gate applies the accepted ADR-008 and source-task outcomes directly to canonical project memory.