wangxuming/makelore
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

docs: reconcile remote scaffold integration

Browse Source
This commit is contained in:
inman
2026-09-05 12:44:50 +08:00
parent a2cb07fedc
commit 8064add242
5 changed files with 113 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
.project-docs/30-worklog/current-state.md
View File

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

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

@@ -1,42 +0,0 @@
# 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.

91
.project-docs/30-worklog/tasks/20260905-integrate-remote-main-b83d6f.md Normal file
View File

@@ -0,0 +1,91 @@
# Task: Integrate remote main into local main
## Identity
- Task ID: 20260905-integrate-remote-main-b83d6f
- Mode: Integration
- Branch: main
- Worktree: /Users/inmanx/Documents/makelore
- Base commit: 53f3db3aced61533944eab5e6b3c8c2293f733f8
- Owner: codex
- Status: Transferred to Final Integration Gate
## Scope
- 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.
## Intent And Constraints
- 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.
## Outcome
- 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.
## Verification
- `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.
## Follow-ups
- 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.
## Promotion Candidates
- None. This Integration Gate applies the accepted ADR-008 and source-task outcomes
directly to canonical project memory.

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

@@ -1,60 +0,0 @@
# 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.