docs: reconcile official scaffold plugin integration
This commit is contained in:
@@ -4,24 +4,31 @@ This file is the integrated default-branch snapshot. Feature tasks record progre
|
||||
|
||||
## Integrated Through
|
||||
|
||||
- Interactive AI application and explicit scaffold source `959b633` is integrated
|
||||
through merge `4bc3e0ea5331a7d3f3576768c0119c02c0f0f952` and canonically reconciled by
|
||||
task `20260904-reconcile-project-scaffold-f7b4d2a9`. New projects use one
|
||||
- Interactive AI application source `959b633` and official Marketplace packaging
|
||||
source `ddb678b46ff10a28e04beeafcfc00c8c8a23ff9f` are integrated through merges
|
||||
`4bc3e0ea5331a7d3f3576768c0119c02c0f0f952` and
|
||||
`2bc3e4420852388ce46841e05c1cbf49e80b250c`, then canonically reconciled by tasks
|
||||
`20260904-reconcile-project-scaffold-f7b4d2a9` and
|
||||
`20260904-project-scaffold-integration-client-4f2a8c71`. 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 independent
|
||||
`makelore-project-scaffold` Device Package provides an explicit, non-overwriting,
|
||||
fixed six-file Vite starter and read-only publication-readiness guidance; it does not
|
||||
install, build, upload, submit, or approve. Non-empty Skill `scripts/` are now disclosed
|
||||
as desktop-user executable code and use the non-overridable application Node exposed as
|
||||
`MAKELORE_NODE_EXECUTABLE`. Main and Works Square retain build, preflight, artifact,
|
||||
Project creation owns only `.makelore/project.json` and `knowledge/`. The official
|
||||
code-owned bundled Marketplace Plugin `makelore.project-scaffold` version `1.0.0`
|
||||
provides the explicit `makelore-project-scaffold` Skill, a non-overwriting fixed
|
||||
six-file Vite starter, and read-only publication-readiness guidance; it does not
|
||||
install, build, upload, submit, or approve. Its `.mjs` uses the non-overridable
|
||||
application Node exposed as `MAKELORE_NODE_EXECUTABLE` and is executable only because
|
||||
it ships in the fixed signed-client resource root. Downloadable Marketplace artifacts
|
||||
remain text/image-only and reject `.mjs`; acquisition, project enablement, Agent
|
||||
assignment, and immutable bundled Release/Admission remain distinct. Main and Works
|
||||
Square retain build, preflight, artifact,
|
||||
upload, immutable Release, and review authority. Exact integration verification passed
|
||||
the 12-test scaffold suite, 123 focused Vitest tests, typecheck, scoped ESLint, and the
|
||||
Renderer/Main/Preload/utility Vite build. Source evidence additionally includes the
|
||||
project-configuration Electron flow, real scaffold-to-locked-Vite build, plugin/Skill
|
||||
validation, and installed Device Package prepare→confirm→commit/resource reads. Immutable
|
||||
distribution plus installed Windows, signed macOS, and native Linux proof remain pending;
|
||||
no plugin publication, production upload, approval, or remote push is claimed.
|
||||
validation and bundled resource loading. A packaged-app smoke plus installed Windows,
|
||||
signed macOS, and native Linux proof remain pending; no live Marketplace migration,
|
||||
production upload, approval, deployment, or remote push is claimed.
|
||||
- AI Design streamed-reply diagnosis
|
||||
`229b1b1ce39b7f1541a93ea3c980ab82b6d6266c` and client fix
|
||||
`23f96a523eb37d8397bb3766ce95a59d56e59225` from tasks
|
||||
@@ -605,7 +612,7 @@ This file is the integrated default-branch snapshot. Feature tasks record progre
|
||||
|
||||
## Current Focus
|
||||
|
||||
客户端面向非专业用户提供“创建交互式 AI 应用 → 明确调用 Scaffold Skill 生成起步文件 → 项目配置中一键提交 → Main 本地 npm/Vite 构建 → Electron 双视口预检最终产物 → 上传 source+built 双归档与 contract → 运营审核”的唯一创建者链路。项目创建只生成 `.makelore/project.json` 和 `knowledge/`；`makelore-project-scaffold` 只负责不覆盖的固定起步树与只读发布准备度说明，不能安装、构建、上传、提审或批准。Main 对安全源码快照运行安装包内固定 npm 11.6.2 的 `npm ci --ignore-scripts`，再显式调用项目 `package-lock.json` 锁定的 Vite；Vite config/plugins 以当前桌面用户权限执行，因此只适用于用户信任的本地项目，不是 sandbox。预检由 Main 以临时 loopback origin 和 Electron WebContents/CDP 检查与最终 `built_archive` 相同的内存文件字节，覆盖桌面/移动视口、运行错误、白屏和外域访问；不使用 Playwright。该检查仍可由非官方客户端绕过，不产生可信 receipt，也不复刻生产 opaque-origin。服务端不再替客户端运行项目 Vite，而是把源码、构建归档和 contract 视为不可信输入，逐字节重算与校验并固化不可变 Release；人工审核仍不可绕过。`custom` 和缺少类型字段的旧项目不提供该入口；历史 `mini_game` / `mini_program` 只在读取边界归一为规范 `interactive_ai_app`。已发布作品优先使用安全投影后的 `play_url`，`runtime_url` 仅保留一个客户端版本的兼容回退。
|
||||
客户端面向非专业用户提供“创建交互式 AI 应用 → 明确调用官方 bundled Project Scaffold Skill 生成起步文件 → 项目配置中一键提交 → Main 本地 npm/Vite 构建 → Electron 双视口预检最终产物 → 上传 source+built 双归档与 contract → 运营审核”的唯一创建者链路。项目创建只生成 `.makelore/project.json` 和 `knowledge/`；`makelore.project-scaffold` 只负责不覆盖的固定起步树与只读发布准备度说明，不能安装、构建、上传、提审或批准。其 `.mjs` 只从签名客户端固定资源加载，Marketplace 下载 artifact 仍拒绝脚本。Main 对安全源码快照运行安装包内固定 npm 11.6.2 的 `npm ci --ignore-scripts`，再显式调用项目 `package-lock.json` 锁定的 Vite；Vite config/plugins 以当前桌面用户权限执行，因此只适用于用户信任的本地项目，不是 sandbox。预检由 Main 以临时 loopback origin 和 Electron WebContents/CDP 检查与最终 `built_archive` 相同的内存文件字节，覆盖桌面/移动视口、运行错误、白屏和外域访问；不使用 Playwright。该检查仍可由非官方客户端绕过，不产生可信 receipt，也不复刻生产 opaque-origin。服务端不再替客户端运行项目 Vite，而是把源码、构建归档和 contract 视为不可信输入，逐字节重算与校验并固化不可变 Release；人工审核仍不可绕过。`custom` 和缺少类型字段的旧项目不提供该入口；历史 `mini_game` / `mini_program` 只在读取边界归一为规范 `interactive_ai_app`。已发布作品优先使用安全投影后的 `play_url`，`runtime_url` 仅保留一个客户端版本的兼容回退。
|
||||
|
||||
AI Design Canvas 现在默认以对话和一张持续可见的“我的创作”卡服务 8-16 岁创作者；专业字段矩阵收进按需打开的“精细调整”，移动端保持对话优先并只挂载一个卡片/底部面板。Creation Card、精细调整、Quote、Task 与结果提示都只投影权威状态，已知问题按 code 转成通俗中文，未知服务端或 Provider 文本不会直接显示。一个 Workspace 仍只公开一个 current Direction、一个 persistent Agent Session 和一个 Current Specification；conversation timeline 只记录交互历史。Chat、direct edits、decision responses、proposal acceptance、locks、Asset binding 与 restore 都通过 `design.input.apply` 进入同一服务端 reducer，Renderer drafts 在 accepted 前保持本地。Main 持有 Works Token、stream ticket、WebSocket、request deadline、stable command/operation IDs 与错误脱敏；unknown result 只能复用原 identity，结构化业务错误不得重放。Generation 由服务端对 exact Specification revision 编译 immutable Quote，客户端只展示 public output plan、warnings、expiry 与 Token Points，并以 Quote ID 调用 `design.generation.confirm`；Provider Prompt、model、route、storage 和 billing atoms 不进入 Renderer。Task/Asset events 独立收敛 Workspace resources，不改写 Living Form。Development 与 packaged builds 均使用 Works Square V2，V1 DTO、local semantic adapter、mutable Quote PATCH 与 editable provider Prompt 已移除。
|
||||
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
|
||||
| Date | Task | Outcome | Docs Updated |
|
||||
|---|---|---|---|
|
||||
| 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 |
|
||||
| 2026-08-08 | Makelore 一键提交审核 | 项目配置单入口，Main 安全打包与幂等提交 | README、architecture、domain |
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
# Task: Publish scaffold Skill through official Marketplace
|
||||
|
||||
## Identity
|
||||
|
||||
- Task ID: 20260904-marketplace-scaffold-client-6c4e8a21
|
||||
- Mode: Feature
|
||||
- Branch: codex/20260904-integrate-project-scaffold-b6d3e8a1-integrate-project-scaffold
|
||||
- Worktree: D:\Datas\OthersProjects\.codex-worktrees\makelore\20260904-integrate-project-scaffold-b6d3e8a1
|
||||
- Base commit: 22078060386e38dd5f12af4717dc6c6e3378c2df
|
||||
- Owner: codex
|
||||
- Status: Ready for Integration
|
||||
|
||||
## Scope
|
||||
|
||||
- Publish `makelore.project-scaffold` as a code-owned bundled Marketplace plugin.
|
||||
- Move the existing project-scaffold Skill runtime into `resources/coding-plugins/project-scaffold` so it ships with the signed MakeLore application.
|
||||
- Register the bundled release in the client plugin registry and preserve the acquire, project-enable, and Agent-assignment lifecycle.
|
||||
- Cover the official-script boundary with focused manifest, resolver, scaffold, and artifact-package tests.
|
||||
|
||||
## Intent And Constraints
|
||||
|
||||
- The Skill owns creation of the fixed interactive AI application starter and static publish-readiness checks; it does not build, upload, submit, or approve a project.
|
||||
- Official executable resources may be loaded only from the code-owned bundled plugin root. Downloadable Marketplace artifacts keep the existing text/image-only P0 asset policy, including rejection of `.mjs`.
|
||||
- Keep one runtime copy of the Skill rather than a Device Package copy plus a bundled copy.
|
||||
- Use plugin ID `makelore.project-scaffold`, Skill ID `makelore-project-scaffold`, release version `1.0.0`, and minimum client version `2.0.0`.
|
||||
- Preserve non-overwrite scaffolding and explicit user invocation of the Skill.
|
||||
|
||||
## Outcome
|
||||
|
||||
- Moved the existing scaffold Skill, templates, release reference, and `.mjs` runner into the signed client resource tree at `resources/coding-plugins/project-scaffold`; no second runtime copy remains.
|
||||
- Added schema-v2 MakeLore capability metadata and retained the portable `.codex-plugin/plugin.json`, both identifying `makelore.project-scaffold` version `1.0.0` and Skill `makelore-project-scaffold`.
|
||||
- Registered the plugin as a fixed, code-owned, `skill_only` bundled release with ID `00000000-0000-4000-8000-000000000303` and the existing acquire, project-enable, and Agent-assignment lifecycle.
|
||||
- Narrowed executable-script authority to the fixed bundled root. Downloaded Marketplace ZIPs still reject `.mjs`; they do not install this plugin's runtime.
|
||||
- Preserved the existing non-overwrite scaffold behavior, legacy `mini_game` / `mini_program` read compatibility, canonical `interactive_ai_app` output, and static publication-readiness guidance.
|
||||
|
||||
## Verification
|
||||
|
||||
- `pnpm exec vitest run tests/unit/coding-plugin-manifest.test.ts tests/unit/coding-plugin-marketplace-client.test.ts tests/unit/project-scaffold-plugin.test.ts --maxWorkers=2`: 54 passed.
|
||||
- `node --test tests/project-scaffold/scaffold.test.mjs`: 12 passed.
|
||||
- `pnpm exec vitest run tests/unit/plugin-workspace-model.test.ts tests/unit/coding-plugin-effective-resolver.test.ts tests/unit/coding-composition-paths.test.ts --maxWorkers=2`: 33 passed.
|
||||
- ESLint on the changed TypeScript files: passed.
|
||||
- `pnpm run typecheck`: passed.
|
||||
- Plugin manifest validation: passed. Skill validation: passed with UTF-8 mode and the repository Python environment that provides PyYAML.
|
||||
- `pnpm test`: 224 test files and 1,879 tests passed, 2 skipped; one unrelated real-process timing assertion exceeded two seconds under full parallel load. Re-running `tests/unit/pi-agent-server-process-real.test.ts` alone with one worker passed all 6 tests, so no unrelated timeout change was made.
|
||||
|
||||
## Follow-ups
|
||||
|
||||
- Run a packaged-app smoke test before the first public client release to prove the signed resource layout and `ELECTRON_RUN_AS_NODE` execution path outside the repository environment.
|
||||
|
||||
## Promotion Candidates
|
||||
|
||||
- Update ADR-008 after integration: project scaffolding is distributed as a code-owned bundled Marketplace plugin, while downloadable artifacts remain non-executable in P0.
|
||||
@@ -1,105 +0,0 @@
|
||||
# Task: Implement project scaffold Skill plugin
|
||||
|
||||
## Identity
|
||||
|
||||
- Task ID: 20260904-project-scaffold-implementation-7e4c2a91
|
||||
- Mode: Feature
|
||||
- Branch: codex/20260904-diagnose-design-stream-6a4e9c21-diagnose-design-stream
|
||||
- Worktree: D:\Datas\OthersProjects\.codex-worktrees\makelore\20260904-diagnose-design-stream-6a4e9c21
|
||||
- Base commit: 336e0bb0caf24537b7b0f350aba3e04a37f5544c
|
||||
- Owner: codex
|
||||
- Status: Ready for Integration
|
||||
|
||||
## Scope
|
||||
|
||||
- Preserve the current project-creation boundary and add regression coverage proving that no mini-game, mini-program, or custom business scaffold is created.
|
||||
- Correct the new-project product copy so users are directed to the explicit project-scaffold Skill after creation.
|
||||
- Expose the application-owned Node executable to direct Pi workers and the shared Agent Server.
|
||||
- Treat non-empty standard Skill `scripts/` directories as executable code in Device Package preview, confirmation, and details copy.
|
||||
- Add an independently installable `plugins/makelore-project-scaffold/` package containing one Skill, deterministic scaffold script, fixed templates, submission requirements, and tests.
|
||||
- Make the Skill itself route publication/readiness requests and carry the current platform contract as four distinct classes: required input, direct blocker, source-package exclusion, and runtime/platform-only confirmation.
|
||||
- Add regression coverage that keeps the documented source-package exclusion set aligned with the current packager without introducing a second build or publication implementation.
|
||||
- Verify the unified generated project through the current project packager and local npm/Vite release seam, plus both historical input aliases at the compatibility boundary.
|
||||
- Replace the two publishable project types with canonical `interactive_ai_app` / “交互式 AI 应用” across creation, configuration, packaging, the scaffold Skill, and Works Square-facing metadata while retaining read compatibility for existing `mini_game` and `mini_program` projects.
|
||||
|
||||
## Intent And Constraints
|
||||
|
||||
- Implement accepted proposal `ML-PROJECT-SCAFFOLD-001` without restoring project-creation side effects.
|
||||
- Keep immutable `.makelore/project.json.projectType` as the only scaffold selector; do not add scaffold state, a template migration layer, `--force`, or a dedicated Pi extension/tool.
|
||||
- Execute scaffolding only through the existing Pi `bash` project write lease and `MAKELORE_NODE_EXECUTABLE`; do not fall back to system Node or Python.
|
||||
- Never overwrite target files. Preflight the full fixed target set and roll back only files/directories created by the current handled invocation.
|
||||
- Preserve Main-owned fixed npm/Vite build, source/built artifact contract, browser preflight, and Works Square operational review as the release authority.
|
||||
- Keep feature-task writes within product code, tests, this task record, and task-prefixed supporting records; canonical project memory changes remain promotion candidates for Integration Gate.
|
||||
- Stage the plugin source under `plugins/makelore-project-scaffold/` for local Device Package installation. Immutable Git tagging, publication, and cross-platform packaged smoke remain release follow-ups and are not claimed by this task.
|
||||
|
||||
## Outcome
|
||||
|
||||
- Confirmed the request's original deletion premise was already true on base `336e0bb`: Project Service creates only `.makelore/project.json` and `knowledge/`. Added creation regressions for the canonical interactive type and `custom`, and removed the Sidebar promise that project creation itself makes a publishable scaffold.
|
||||
- Added the non-overridable `MAKELORE_NODE_EXECUTABLE` host contract to both direct Pi workers and the shared Agent Server process. A worker overlay cannot spoof the application-selected executable path.
|
||||
- Extended Device Package inspection so a declared Skill with a non-empty standard `scripts/` subtree is executable code. Skill-only script packages retain `kind: skill-only`, require the existing cross-turn executable confirmation, and show Skill-specific file/network/process authority copy in preview and plugin details. Existing Pi-extension and mixed packages retain executable warnings.
|
||||
- Added `plugins/makelore-project-scaffold/` as a standard, independently versioned `0.1.0` plugin with one Skill and no Pi extension. Its package and plugin manifests are same-name/same-version and have no install lifecycle scripts.
|
||||
- Added a deterministic Node-only `scaffold.mjs` selected exclusively by `.makelore/project.json.projectType`. It accepts only `--project-root`, creates one fixed six-file interactive AI application target set, reads all templates and preflights every target before writing, uses exclusive creation, preserves unrelated files, returns the flat version-1 JSON protocol, and rolls back only current-invocation files/directories on handled write failure. It provides no `--force`, type override, migration state, dependency install, network request, or publisher replacement.
|
||||
- Regenerated the Vite 7.3.1 lockfile with the repository's fixed npm 11.6.2 and verified the unified template through source packaging and a real locked npm/Vite build. Added an approval-readiness reference that distinguishes static preparation from authoritative Main build/preflight/upload and Works Square operational review.
|
||||
- Expanded the Skill's model-invocation routing and package-facing copy so requests about publishing, one-click submission, forbidden content, failure causes, or release readiness enter an explicit read-only readiness workflow. Project-specific reports now separate confirmed blockers, excluded-package impact, runtime/platform checks, and statically proven requirements, cite project-relative evidence, and use bounded conclusions that never claim approval.
|
||||
- Reconciled the bundled publication reference against the current project packager, fixed npm/Vite release builder, static-artifact browser preflight, and Works submission route. It now records the full schema-v2 project prerequisite, root build inputs, exact size/count limits, direct path/link/output blockers, root `release.json` prohibition, both viewports and runtime failures, first-submit metadata/cover contract, and the exact case-insensitive excluded directory/file/suffix sets plus dynamic `.env`, credential JSON, Terraform, and `works-` patterns.
|
||||
- Kept exclusion semantics explicit: excluded paths may remain in a project and are not blockers by existence; the Skill reports their effect only when required source or assets depend on them. The reference also states that an HTTP(S) literal is only a risk until the authoritative preflight makes an actual cross-origin request.
|
||||
- Did not add a release-check script, duplicate packager, local dependency install, Vite invocation, browser launch, upload, or submission path to the plugin. Main and Works Square remain the only execution and approval authorities.
|
||||
- Verified the real plugin through Device Package prepare, later-turn confirmation, commit, enabled-resource resolution, and installed script/template/reference reads.
|
||||
- Replaced the two new-project values with canonical `interactive_ai_app` / “交互式 AI 应用”. New creation, generated `niancode.yml`, submission metadata, and publish UI use only the canonical value. Existing `mini_game` and `mini_program` configs normalize at the read boundary; a read or scaffold invocation does not rewrite the original config, while a later ordinary config mutation may persist the normalized value.
|
||||
- Replaced the two business-specific starter trees with one generic interactive Vite starter. The scaffold continues to accept both historical values solely as compatibility aliases and reports the canonical type.
|
||||
- Added the task-owned interactive-type proposal instead of modifying accepted ADRs or canonical project memory in feature mode.
|
||||
- No existing user project files were removed or migrated. No plugin tag was published and the plugin was not silently installed into the running application.
|
||||
|
||||
## Verification
|
||||
|
||||
- `node --test plugins/makelore-project-scaffold/tests/scaffold.test.mjs`: 12 passed. Covers the canonical value, both historical aliases, exact unified output tree, metadata preservation, conflicts, invalid/missing/custom configs, invalid CLI, missing template, Chinese/space paths, and handled-write rollback.
|
||||
- Focused type/scaffold/release/UI regressions: 7 Vitest files and 107 tests passed.
|
||||
- `pnpm typecheck` and scoped ESLint over the changed type, configuration, packaging, UI, route, and test files passed.
|
||||
- Desktop project-configuration Playwright E2E: 1 passed; the new-project dialog exposed only “交互式 AI 应用” and `custom`, and the publish action remained available for the canonical type.
|
||||
- Real unified-template smoke: the actual scaffold ran in a verified temporary directory, fixed npm 11.6.2 completed `ci --ignore-scripts`, Vite 7.3.1 built successfully, and non-empty `dist/index.html` was produced; the temporary directory was removed.
|
||||
- Plugin creator validation passed; Skill creator `quick_validate.py` returned `Skill is valid!` under explicit Python UTF-8 mode.
|
||||
- `pnpm run build:vite` passed for Renderer, Main, Preload, and utility worker. Only existing Browserslist, mixed-import, and large-chunk warnings remained.
|
||||
- Full serial main suite: 225/226 files passed; 1886 tests passed and 2 skipped. The only failure was the existing Pi Agent Server two-Bash-call wall-clock assertion (`2657ms < 2000ms`). An immediate isolated rerun again exceeded the fixed threshold (`2170ms`) while its other 5 tests passed; no project-type/scaffold path is involved and this task did not relax the threshold. The separately excluded pressure suite passed 1/1.
|
||||
- Earlier focused Device Package, Pi environment, Plugin Details, release-builder, and browser-preflight suites recorded by this same task remained green; the type follow-up did not modify those implementations.
|
||||
- Final `git diff --check` and task-aware project-doc drift check passed; only the task record and task-prefixed proposal changed under `.project-docs/`.
|
||||
- Merge handoff re-ran `git diff --check` and the task-aware drift check after the explicit integration request; both remained green and no product files changed during handoff.
|
||||
|
||||
## Follow-ups
|
||||
|
||||
- Release `SCF-060`: move or mirror the staged plugin source to the chosen independent distribution repository, create an immutable SemVer tag, document the Device Package install source, and complete a small real-user prepare → confirm → install → initialize trial. Distribution location remains a product/release decision; this task does not invent it.
|
||||
- Before claiming packaged support, run the Skill through an installed MakeLore build with the actual packaged executable and Git Bash on Windows. Run equivalent packaged smoke on macOS and native Linux; only then claim three-platform support.
|
||||
- Verify enable/disable, upgrade to a second immutable version, downgrade/reinstall of a known version, and uninstall semantics. Uninstall must not delete files already created in user projects.
|
||||
- Official Marketplace Skill artifacts currently reject executable `.mjs` assets. Continue using Device Package/Git distribution unless a separately approved Marketplace artifact policy adds executable Skill support.
|
||||
- Track the existing `pi-agent-server-process-real` `<2000ms` assertion as a separate performance-test stability issue; it currently exceeds the threshold both under the full serial suite and in one isolated rerun, while its functional assertions pass.
|
||||
- After code/plugin integration and release acceptance, run an Integration Gate task to promote the canonical project-creation and Device Package facts listed below.
|
||||
|
||||
## Promotion Candidates
|
||||
|
||||
- **Canonical interactive AI application type**
|
||||
- Target canonical documents: `.project-docs/10-decisions/`, `.project-docs/30-worklog/current-state.md`, `.project-docs/40-domain/glossary.md`, `.project-docs/40-domain/business-rules.md`, and relevant architecture/data-flow summaries.
|
||||
- Proposal: replace the distinct new-project `mini_game` / `mini_program` values and templates with `interactive_ai_app` / “交互式 AI 应用” and one generic interactive Vite scaffold; retain both old values only as historical read aliases.
|
||||
- Evidence: shared/config normalizer and regressions, new-project E2E, canonical package/submission tests, all three scaffold input tests, real unified-template build, and task proposal `20260904-project-scaffold-implementation-7e4c2a91__interactive-ai-app-type.md`.
|
||||
- Future impact: future templates and publishing rules evolve against one stable product type while existing local projects continue to open and publish without a batch rewrite.
|
||||
- Semantic conflicts: supersedes the canonical two-publishable-type classification and any separate mini-game/mini-program template promises; it preserves fixed npm/Vite build, approval, and immutable release rules.
|
||||
- Human confirmation required: no additional product decision is required because the user explicitly requested the merge; Integration Gate review is still required before canonical writes.
|
||||
- **Project creation / scaffold ownership**
|
||||
- Target canonical documents: `.project-docs/30-worklog/current-state.md`, `20-architecture/system-overview.md`, `20-architecture/data-flow.md`, `40-domain/glossary.md`, `40-domain/business-rules.md`; add a new integration entry to `30-worklog/task-history.md` rather than rewriting historical task rows.
|
||||
- Proposal: replace current-state claims that mini-game/program creation atomically generates Vite templates with the accepted three-boundary model: Project Service owns only project metadata and `knowledge/`; explicit `makelore-project-scaffold` Skill owns starter files; Main/Works release code owns build, preflight, packaging, upload, and review state.
|
||||
- Evidence: `electron/coding-projects/project-config.ts`, the canonical/custom creation regression, plugin script/tests, unified-template build smoke, and accepted proposal `ML-PROJECT-SCAFFOLD-001`.
|
||||
- Future impact: prevents UI/docs/agents from assuming a newly created project is immediately publishable and keeps template evolution independent from project identity.
|
||||
- Semantic conflicts: supersedes the integrated 2026-08-09 current-state claim; old task records remain historical evidence and must not be edited.
|
||||
- Human confirmation required: no for factual promotion after the implementation commit is integrated; yes if product wants automatic/bundled initialization instead of the accepted explicit Skill boundary.
|
||||
- **Executable Skill scripts and host runtime**
|
||||
- Target canonical documents: `.project-docs/30-worklog/current-state.md`, `20-architecture/system-overview.md`, `20-architecture/module-map.md`, `20-architecture/data-flow.md`, and `40-domain/business-rules.md`.
|
||||
- Proposal: state that a Device Package Skill with a non-empty standard `scripts/` subtree is executable code requiring preview disclosure and later-turn confirmation even when `kind` remains `skill-only`; parent worker/Agent Server environments expose the non-overridable application Node path through `MAKELORE_NODE_EXECUTABLE`.
|
||||
- Evidence: `device-package-format.ts`, `device-package-manager.ts`, Plugin Details UI/tests, both Pi process tests, real package prepare/commit test, and Windows Git Bash quoting smoke.
|
||||
- Future impact: keeps permission messaging accurate for script-backed Skills and gives portable Skills an application-owned runtime without PATH fallback.
|
||||
- Semantic conflicts: current canonical wording mentions executable Pi extensions only. Existing rule that child workers receive no Device Package resources remains unchanged.
|
||||
- Human confirmation required: no for promotion after integration; actual packaged platform claims still require the release smokes in Follow-ups.
|
||||
- **Release obligation**
|
||||
- Target canonical document: `.project-docs/80-commitments/commitments.md`.
|
||||
- Proposal: fold this plugin's actual packaged Windows/macOS/Linux execution and Device Package lifecycle trial into the existing client release commitment instead of creating a parallel release gate.
|
||||
- Evidence: workspace Windows Git Bash and real release-builder smokes are green; immutable tag, installed-app execution, macOS, and Linux evidence are absent.
|
||||
- Future impact: prevents workspace-only evidence from being mistaken for a distributable cross-platform release.
|
||||
- Semantic conflicts: the existing commitment already warns that workspace prepare tests do not replace final packaged proof; preserve that stricter rule.
|
||||
- Human confirmation required: release owner confirmation is required before marking the commitment complete or choosing the public distribution location.
|
||||
@@ -0,0 +1,50 @@
|
||||
# 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.
|
||||
@@ -1,76 +0,0 @@
|
||||
# Task: Reconcile interactive AI app scaffold Skill
|
||||
|
||||
## Identity
|
||||
|
||||
- Task ID: 20260904-reconcile-project-scaffold-f7b4d2a9
|
||||
- Mode: Integration
|
||||
- Branch: codex/20260904-integrate-project-scaffold-b6d3e8a1-integrate-project-scaffold
|
||||
- Worktree: D:\Datas\OthersProjects\.codex-worktrees\makelore\20260904-integrate-project-scaffold-b6d3e8a1
|
||||
- Base commit: 4bc3e0ea5331a7d3f3576768c0119c02c0f0f952
|
||||
- Owner: codex
|
||||
- Status: Ready for Integration
|
||||
|
||||
## Scope
|
||||
|
||||
- Promote the reviewed and already-merged scaffold/type behavior from base commit
|
||||
`4bc3e0ea5331a7d3f3576768c0119c02c0f0f952` into a client ADR,
|
||||
canonical architecture/domain memory, current state, history, and commitments.
|
||||
- Record one `interactive_ai_app` product type, explicit Scaffold Skill ownership,
|
||||
executable Skill-script disclosure, and remaining installed-build release gates.
|
||||
|
||||
## Intent And Constraints
|
||||
|
||||
- Project creation owns only project metadata and `knowledge/`; the Skill must be
|
||||
explicit and non-overwriting and may not duplicate build/upload/review authority.
|
||||
- Historical types normalize without a batch rewrite; `custom` remains
|
||||
non-publishable.
|
||||
- Main retains fixed npm/Vite build/preflight/package/upload authority and Works
|
||||
Square retains validation and review authority.
|
||||
- Source task records/proposals and the primary checkout's unrelated files remain
|
||||
untouched.
|
||||
|
||||
## Outcome
|
||||
|
||||
- Added ADR-008 and reconciled canonical brief, architecture, domain, current-state,
|
||||
history, and release commitments with the reviewed source already present at the
|
||||
task base.
|
||||
- Established `interactive_ai_app` as the only new publishable product type and kept
|
||||
`mini_game` / `mini_program` solely as non-rewriting historical read aliases.
|
||||
- Recorded the three-owner boundary: Project Service creates metadata and `knowledge/`;
|
||||
the explicit Device Package Skill creates the fixed starter and explains readiness;
|
||||
Main/Works Square remain the sole build, upload, validation, Release, and approval
|
||||
authorities.
|
||||
- Recorded non-empty Skill `scripts/` as executable code requiring disclosure and later
|
||||
confirmation, with `MAKELORE_NODE_EXECUTABLE` as the application-owned runtime path.
|
||||
- Folded immutable distribution and installed Windows/signed macOS/native Linux proof
|
||||
into the existing release commitments. No plugin publication, deployment, production
|
||||
submission, approval, or remote push was performed.
|
||||
|
||||
## Verification
|
||||
|
||||
- Exact integration tree `4bc3e0ea5331a7d3f3576768c0119c02c0f0f952`:
|
||||
scaffold Node suite 12/12; focused project/device/publish Vitest suite 123/123;
|
||||
`pnpm run typecheck`; scoped ESLint; and `pnpm run build:vite` all passed.
|
||||
- Source task evidence retained: project-configuration Electron E2E 1/1, real
|
||||
scaffold → fixed npm 11.6.2 → locked Vite build, plugin creator validation,
|
||||
Skill creator validation, and real Device Package prepare → confirm → commit →
|
||||
resource reads passed.
|
||||
- `git diff --check`: passed.
|
||||
- `check_project_docs.py --target .`: passed.
|
||||
- `check_doc_drift.py --target . --task-id
|
||||
20260904-reconcile-project-scaffold-f7b4d2a9`: passed; only Integration-owned
|
||||
canonical memory and this task record are changed.
|
||||
- Canonical consistency scan found only intentional compatibility statements and
|
||||
preserved historical task/current-state entries for the superseded dual-type model.
|
||||
|
||||
## Follow-ups
|
||||
|
||||
- Distribute the scaffold plugin from an immutable SemVer/Git source and run the
|
||||
already-recorded installed-package proofs before claiming platform support.
|
||||
- Deploy the matching server before the client, then run the real-account
|
||||
create → scaffold → build → submit → approve → CDN/App playback chain.
|
||||
|
||||
## Promotion Candidates
|
||||
|
||||
- None. This Integration task promoted the accepted source candidates directly into
|
||||
canonical project memory.
|
||||
Reference in New Issue
Block a user