merge: integrate remote project scaffold updates

.project-docs/30-worklog/tasks/20260904-project-scaffold-main-merge-e7b4c291.md

@@ -0,0 +1,42 @@
+# Task: Land official project scaffold plugin on main
+
+## Identity
+
+- Task ID: 20260904-project-scaffold-main-merge-e7b4c291
+- Mode: Integration
+- Branch: main
+- Worktree: D:\Datas\OthersProjects\makelore
+- Base commit: 336e0bb0caf24537b7b0f350aba3e04a37f5544c
+- Owner: codex
+- Status: Ready for Integration
+
+## Scope
+
+- Fast-forward the verified integration commit `b92e7ba5bbde186626d93787ca358fbf4c2523a3` onto local `main`.
+- Record final default-branch landing evidence while preserving the three explicitly adopted historical task documents unchanged and uncommitted.
+
+## Intent And Constraints
+
+- Preserve the accepted official bundled-plugin boundary: only the fixed code-owned resource root may execute `scaffold.mjs`; downloadable Marketplace artifacts continue to reject scripts.
+- Preserve normal ancestry and do not package, publish, deploy, push, or alter the adopted historical task documents.
+
+## Outcome
+
+- Fast-forwarded local `main` from `336e0bb0caf24537b7b0f350aba3e04a37f5544c` to verified integration head `b92e7ba5bbde186626d93787ca358fbf4c2523a3`.
+- Local `main` now contains the unified `interactive_ai_app` type and the official bundled Marketplace Plugin `makelore.project-scaffold`, including its Skill, templates, publication guidance, and `scaffold.mjs`.
+- Preserved the three explicitly adopted historical task documents byte-for-byte and left them uncommitted.
+- Excluded the completed source integration task record from the final default-branch tree; it remains reachable on its preserved source branch and commit.
+
+## Verification
+
+- The fast-forward completed without conflicts and `b92e7ba5bbde186626d93787ca358fbf4c2523a3` is an ancestor of local `main`.
+- The exact landed integration head had already passed Plugin and Skill validators, 88 focused Vitest tests, 12 scaffold Node tests, TypeScript typecheck, Git whitespace checks, and project-document gates.
+- The task-aware drift check passed while confirming all adopted historical documents remained unchanged.
+
+## Follow-ups
+
+- Packaging, installed-client smoke, live Marketplace publication, deployment, and remote push remain separate authorized operations.
+
+## Promotion Candidates
+
+- None. This task landed the already accepted and verified integration result.

.project-docs/30-worklog/tasks/20260905-plugin-bundled-status-integration-8f2c5a41.md

@@ -0,0 +1,60 @@
+# Task: Integrate bundled official Plugin device-status fix
+
+## Identity
+
+- Task ID: 20260905-plugin-bundled-status-integration-8f2c5a41
+- Mode: Integration
+- Branch: main
+- Worktree: D:\Datas\OthersProjects\makelore
+- Base commit: 9ed9bf4a715e300420e7a764a4cf576a6dfc4938
+- Owner: codex-root
+- Status: Ready for Integration
+
+## Scope
+
+- Integrate feature commit `6bd9287c879dca93da11e17533f84e3535fc656a`
+  onto local `main` from its exact parent `9ed9bf4a715e300420e7a764a4cf576a6dfc4938`.
+- Reconcile the source outcome into current state and remove only the duplicate source
+  task record from the default-branch checkpoint.
+
+## Intent And Constraints
+
+- Concurrent Task Gate: Passed after releasing the completed prior integration lock and
+  claiming this exact root/main worktree in Integration mode.
+- Planning Gate: Passed after reading the source task outcome, ADR-008, current Plugin
+  architecture/business rules, current state, and the prior scaffold landing record.
+- Preserve the three explicitly adopted historical task records byte-for-byte and
+  uncommitted; do not stash, reset, clean, move, or delete them.
+- Preserve the accepted boundary: Project Scaffold ships in the signed client, has no
+  device download action, and still requires server-authoritative free account
+  acquisition before project enablement.
+
+## Outcome
+
+- Cherry-picked feature source `6bd9287c879dca93da11e17533f84e3535fc656a`
+  onto local `main` as product commit `6d102b2` without conflict.
+- Removed only the duplicate source task record from the default-branch documentation
+  checkpoint; it remains intact on the source branch and commit.
+- Updated current state with the accepted presentation correction and the separate
+  production server deployment/migration requirement.
+- Preserved all three adopted historical task records byte-for-byte and uncommitted.
+
+## Verification
+
+- Source evidence: focused Plugin page/model 35 passed; typecheck and scoped ESLint
+  passed; all Vite targets passed; isolated Pi timing rerun 6/6 and pressure 1/1 passed.
+- Source commit and landed product commit have the exact same tree
+  `1976d2f27f239dead6d26f99131182c7c657a9db`.
+- Root replay was not claimed because the root checkout has no installed Vitest or
+  TypeScript executables; no dependency mutation was performed there.
+- Local server evidence remains separate: Project Scaffold Marketplace tests 2/2 and
+  sole migration head `20260904_project_scaffold_0085`.
+
+## Follow-ups
+
+- Deploy the current Works Square server and migrate production through 0085 so the
+  public catalog can authorize and expose `免费获取`.
+
+## Promotion Candidates
+
+- None recorded.