docs: reconcile remote scaffold integration
This commit is contained in:
@@ -4,6 +4,25 @@ This file is the integrated default-branch snapshot. Feature tasks record progre
|
||||
|
||||
## Integrated Through
|
||||
|
||||
- Remote `main` frontier `d642d7607c26dee01ef65b4e70dd756465dea16a`
|
||||
is integrated with local frontier
|
||||
`53f3db3aced61533944eab5e6b3c8c2293f733f8` by the ordinary two-parent merge
|
||||
`a2cb07fedcf22bb14141a27cee2218c149b8c63e` under task
|
||||
`20260905-integrate-remote-main-b83d6f`. The remote ADR-008 interactive AI
|
||||
application type, bundled `makelore.project-scaffold` Skill, and bundled-delivery
|
||||
status correction are retained alongside the local Learning removal: the product
|
||||
still exposes only Code, Canvas, and Robot. Three canonical-document conflicts were
|
||||
reconciled semantically, the application tree merged without content conflicts,
|
||||
and README now describes minimal project creation plus explicit scaffold execution.
|
||||
Verification passed 228 focused Vitest tests, the 12-test scaffold suite with the
|
||||
canonical macOS temporary path, typecheck, 1,859 full-suite tests with 3 conditional
|
||||
skips plus pressure 1/1, production build, and targeted Electron 1/1. Lint reported
|
||||
0 errors and 12 existing warnings. The default macOS `/var` temporary-path alias
|
||||
still makes two copied-script scaffold tests exit before emitting JSON; the same
|
||||
tests pass through the canonical `/private/var` path and remain a harness/path
|
||||
portability follow-up. The two remote task records stay intact in remote parent
|
||||
`d642d76` rather than being copied into this integration result. No push, package,
|
||||
deployment, publication, or production database change was made.
|
||||
- Remote `main` frontier `336e0bb0caf24537b7b0f350aba3e04a37f5544c`
|
||||
is integrated with local frontier
|
||||
`2d3c103bac83fccffb15b760a6e79912c352541a` by the ordinary two-parent merge
|
||||
@@ -825,4 +844,4 @@ Robot 绑定设备默认先显示“引导配网 / 已有激活码”路径选
|
||||
|
||||
## Last Updated
|
||||
|
||||
2026-09-04
|
||||
2026-09-05
|
||||
|
||||
Reference in New Issue
Block a user