chore: land project scaffold plugin on main

.project-docs/30-worklog/current-state.md

@@ -9,7 +9,9 @@ This file is the integrated default-branch snapshot. Feature tasks record progre
   `4bc3e0ea5331a7d3f3576768c0119c02c0f0f952` and
   `2bc3e4420852388ce46841e05c1cbf49e80b250c`, then canonically reconciled by tasks
   `20260904-reconcile-project-scaffold-f7b4d2a9` and
-  `20260904-project-scaffold-integration-client-4f2a8c71`. New projects use one
+  `20260904-project-scaffold-integration-client-4f2a8c71`; verified integration head
+  `b92e7ba5bbde186626d93787ca358fbf4c2523a3` was landed on local `main` by task
+  `20260904-project-scaffold-main-merge-e7b4c291`. New projects use one
   `interactive_ai_app` / “交互式 AI 应用” type or `custom`; historical `mini_game`
   and `mini_program` values normalize at the read boundary without a batch rewrite.
   Project creation owns only `.makelore/project.json` and `knowledge/`. The official

.project-docs/30-worklog/task-history.md

@@ -4,6 +4,7 @@
 
 | Date | Task | Outcome | Docs Updated |
 |---|---|---|---|
+| 2026-09-04 | Land official Project Scaffold Plugin on local main | Fast-forwarded verified integration head `b92e7ba` onto local `main` while preserving three explicitly adopted historical task documents unchanged; no package, publication, deployment, or push was performed | current-state, landing task |
 | 2026-09-04 | Official Marketplace Project Scaffold integration | 将 `makelore.project-scaffold` 作为代码所有、随签名客户端交付的 bundled `skill_only` Plugin 接入 Account Library/项目启用/Agent 分配；官方 `.mjs` 不经过下载 artifact，下载包仍保持文本/图片 P0 限制 | ADR-008、current-state、architecture、domain、success criteria、integration task |
 | 2026-09-04 | 交互式 AI 应用与显式 Scaffold Skill 集成 | 合并小游戏/小程序为规范 `interactive_ai_app`，项目创建保持最小边界，独立 Skill 生成固定起步树并说明发布要求；Main/Works 继续拥有发布权威 | ADR-008、current-state、architecture、domain、commitments |
 | 2026-08-07 | 客户端登录七天滑动续期 | Main-owned 刷新凭据与真实活动续期 | README、current-state |

.project-docs/30-worklog/tasks/20260904-project-scaffold-integration-client-4f2a8c71.md

@@ -1,50 +0,0 @@
-# Task: Integrate official project scaffold plugin
-
-## Identity
-
-- Task ID: 20260904-project-scaffold-integration-client-4f2a8c71
-- Mode: Integration
-- Branch: codex/20260904-project-scaffold-integration-client-4f2a8c71-project-scaffold-integration-client
-- Worktree: D:\Datas\OthersProjects\.codex-worktrees\makelore\20260904-project-scaffold-integration-client-4f2a8c71
-- Base commit: 336e0bb0caf24537b7b0f350aba3e04a37f5544c
-- Owner: codex
-- Status: Ready for Integration
-
-## Scope
-
-- Integrate the four-commit interactive-AI-application scaffold chain ending at `ddb678b46ff10a28e04beeafcfc00c8c8a23ff9f` onto the committed `main` frontier `336e0bb0caf24537b7b0f350aba3e04a37f5544c`.
-- Reconcile ADR-008 and the canonical architecture/current-state records with the final official Marketplace delivery model.
-- Verify the merged client tree and prepare it for safe default-branch promotion without touching the unowned dirty primary checkout.
-
-## Intent And Constraints
-
-- Preserve normal Git ancestry; do not rebase, squash, rewrite history, or resolve semantic conflicts by choosing a side mechanically.
-- The executable `.mjs` authority belongs only to the fixed code-owned plugin bundled in the signed MakeLore client. Downloadable Marketplace artifacts retain the text/image-only P0 policy.
-- Preserve `interactive_ai_app` as the canonical new type and `mini_game` / `mini_program` only as read compatibility aliases.
-- Do not package, install, publish, deploy, push, or modify the unknown files in the primary `main` checkout.
-
-## Outcome
-
-- Merged the four-commit source chain ending at `ddb678b46ff10a28e04beeafcfc00c8c8a23ff9f` with a normal `--no-ff` merge at `2bc3e4420852388ce46841e05c1cbf49e80b250c`.
-- Reconciled ADR-008 and the canonical architecture, domain, success-criteria, current-state, and history records to describe `makelore.project-scaffold` as a code-owned official bundled Marketplace plugin.
-- Preserved the narrow execution boundary: the fixed bundled resource root may contain and run `scaffold.mjs`; downloadable Marketplace artifact ingestion remains text/image-only and rejects `.mjs`.
-- Kept `interactive_ai_app` canonical while retaining `mini_game` and `mini_program` only as read-compatibility aliases.
-- Excluded source-task-owned records from the integrated tree; they remain immutable on their source branches and reachable through the recorded source commits.
-
-## Verification
-
-- `validate_plugin.py resources/coding-plugins/project-scaffold` passed.
-- `quick_validate.py resources/coding-plugins/project-scaffold/skills/makelore-project-scaffold` passed.
-- Focused Vitest integration set: 6 files, 88 tests passed.
-- Scaffold Node test suite: 12 tests passed.
-- `pnpm typecheck` passed.
-- `git diff --check`, `check_project_docs.py`, and the task-aware documentation drift check passed after reconciliation.
-
-## Follow-ups
-
-- Promote this integration branch to `main` only after the unowned dirty primary checkout is made clean or explicitly adopted by its owner; this task did not touch those files.
-- Packaging, deployment, pushing, and live Marketplace publication remain separate authorized operations.
-
-## Promotion Candidates
-
-- None. Accepted project-memory changes were applied directly under the Integration Gate.

.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.