From e9875145b41a2cb1827de10d27a4fc6a352704ea Mon Sep 17 00:00:00 2001 From: brother7 <7brother7@gmail.com> Date: Thu, 3 Sep 2026 10:51:07 +0800 Subject: [PATCH] docs: record installed resource main promotion --- .project-docs/30-worklog/current-state.md | 5 +- ...-integrate-installed-resources-4b7e2c91.md | 100 ------------------ ...omote-installed-resources-main-5c8e1a72.md | 87 +++++++++++++++ .project-docs/50-evidence/evidence-index.md | 2 +- 4 files changed, 91 insertions(+), 103 deletions(-) delete mode 100644 .project-docs/30-worklog/tasks/20260903-integrate-installed-resources-4b7e2c91.md create mode 100644 .project-docs/30-worklog/tasks/20260903-promote-installed-resources-main-5c8e1a72.md diff --git a/.project-docs/30-worklog/current-state.md b/.project-docs/30-worklog/current-state.md index 8aab630..04fac7f 100644 --- a/.project-docs/30-worklog/current-state.md +++ b/.project-docs/30-worklog/current-state.md @@ -8,8 +8,9 @@ This file is the integrated default-branch snapshot. Feature tasks record progre `5a2f0eb6785b59d8b455ed5cb1d9773351ff895a` from task `20260902-local-skill-install-fix-6b3e91a4` and installed-resource activation source `17664c5fffcfe695653b4146503e645f54767c4b` from task - `20260903-load-installed-resources-8f3c1a72` are integrated by task - `20260903-integrate-installed-resources-4b7e2c91`. Packaged inspection now + `20260903-load-installed-resources-8f3c1a72` were verified in integration + candidate `bd377c9` and promoted to local `main` by task + `20260903-promote-installed-resources-main-5c8e1a72`. Packaged inspection now imports package-management authority from the distributed physical Pi runtime instead of the incomplete `app.asar` dependency graph. The parent Agent Server keeps the generated Makelore bridge as its required first extension and loads diff --git a/.project-docs/30-worklog/tasks/20260903-integrate-installed-resources-4b7e2c91.md b/.project-docs/30-worklog/tasks/20260903-integrate-installed-resources-4b7e2c91.md deleted file mode 100644 index 2fff026..0000000 --- a/.project-docs/30-worklog/tasks/20260903-integrate-installed-resources-4b7e2c91.md +++ /dev/null @@ -1,100 +0,0 @@ -# Task: Integrate installed resource loading fix to main - -## Identity - -- Task ID: 20260903-integrate-installed-resources-4b7e2c91 -- Mode: Integration -- Branch: codex/20260903-integrate-installed-resources-4b7e2c91-integrate-installed-resources -- Worktree: D:\Datas\OthersProjects\makelore-integrate-installed-resources-4b7e2c91 -- Base commit: 28e1690038d61b9333a2f6ca77f0187ea4273676 -- Owner: codex -- Status: Ready for Main Promotion - -## Scope - -- Integrate the completed packaged Device Package prepare fix and the successor - installed-resource activation fix onto the current local `main` history. -- Promote the accepted behavior and evidence into current-state, architecture, - README, evidence, and release-acceptance memory. -- Verify the exact integrated source tree without installing a replacement - client, publishing artifacts, pushing, or modifying unrelated user work. - -## Intent And Constraints - -- Every resource explicitly installed and currently enabled by the user must be - included in the Main-selected parent resource generation. Manual disablement - remains authoritative. -- The generated Makelore extension remains the required first extension. All - further selected Device Package extensions load through Pi's explicit - additional-extension input while ambient project/user discovery stays off; - selected Skill paths remain unchanged and child workers stay empty. -- Treat the two source task records as read-only integration evidence. Do not - rewrite their history or broaden this merge into Marketplace, Provider, - Renderer, deployment, publication, or installed-application changes. -- The root `main` worktree is owned by an earlier diagnostic task and contains - three pre-existing untracked task records. Preserve them exactly; do not - stash, reset, clean, adopt, overwrite, or force-release that ownership - without explicit human confirmation. - -## Integration Plan - -1. Fast-forward the completed source history from current `main` into this - isolated integration branch and confirm both product commits are present. -2. Reconcile the accepted promotion with canonical product/architecture - memory and the release acceptance commitment. -3. Run focused tests, full unit/pressure verification, typecheck, scoped lint, - production build, diff checks, and the task documentation gates. -4. Advance local `main` only through a clean, ownership-safe operation. - -## Outcome - -- Fast-forwarded the completed source history through - `d22d4b0`, retaining product commits - `5a2f0eb6785b59d8b455ed5cb1d9773351ff895a` and - `17664c5fffcfe695653b4146503e645f54767c4b` on the integration history. -- Packaged Device Package inspection now resolves `DefaultPackageManager` and - in-memory settings from the distributed physical Pi runtime. The generated - Makelore bridge remains required, and the Agent Server loads every further - Main-selected installed/enabled extension through Pi's explicit additional - paths without ambient discovery; all selected Skill paths remain unchanged. -- Promoted the accepted behavior and verification boundary into `README.md`, - canonical current state, system overview, module map, evidence index, and the - Windows release commitment. The README's stale Hosted Web Search description - was reconciled with the already-integrated selected-model tool architecture. -- Excluded the two source task-owned records from the final integration tree as - required by the task-aware document boundary. Their files and commits remain - intact on the source branches; this integration record carries the promoted - default-branch result. -- No installed application, local Device Package store, user project, package, - deployment, publication, remote branch, or unrelated root-worktree file was - changed. - -## Verification - -- `corepack pnpm install --frozen-lockfile` — passed with pinned pnpm 10.33.4; - lockfile unchanged. -- Focused integrated regressions — 5 files / 31 tests passed, including packaged - package authority, generated extension bundle, real Agent Server multi-extension - registration, worker opener, and Device Package manager behavior. -- Full unit suite — 222 files / 1,815 passed / 2 conditional skips; serialized - coding-chat pressure test 1/1 passed. -- `corepack pnpm run typecheck` — passed. -- Scoped ESLint over all ten changed source/test files — passed. -- `corepack pnpm run build:vite` — Renderer, Main, Preload, and release utility - passed; only pre-existing mixed-import and chunk-size warnings were emitted. -- `git diff --check` — passed. -- The task-aware drift check initially identified the two imported source task - records as foreign ownership files. They were removed from the integration - result; the final drift result is recorded after this task record is committed. - -## Follow-ups - -- Build and install a client from the exact promoted `main`, then execute live - Conversation prepare→confirm→activation with npm/Git/loose Skill coverage and - a generation containing at least two enabled extensions. The currently - installed 1.2.6 client remains the old, known-failing artifact. -- No push was requested; remote publication remains separate. - -## Promotion Candidates - -- None. Accepted source-task promotions were applied during this integration. diff --git a/.project-docs/30-worklog/tasks/20260903-promote-installed-resources-main-5c8e1a72.md b/.project-docs/30-worklog/tasks/20260903-promote-installed-resources-main-5c8e1a72.md new file mode 100644 index 0000000..f665b4b --- /dev/null +++ b/.project-docs/30-worklog/tasks/20260903-promote-installed-resources-main-5c8e1a72.md @@ -0,0 +1,87 @@ +# Task: Promote installed resource integration to main + +## Identity + +- Task ID: 20260903-promote-installed-resources-main-5c8e1a72 +- Mode: Integration +- Branch: main +- Worktree: D:\Datas\OthersProjects\makelore +- Base commit: 28e1690038d61b9333a2f6ca77f0187ea4273676 +- Owner: codex +- Status: Ready for Integration + +## Scope + +- Promote verified integration candidate `bd377c9` from + `codex/20260903-integrate-installed-resources-4b7e2c91-integrate-installed-resources` + onto the current local `main` with a strict fast-forward. +- Preserve and restore the three pre-existing untracked task records exactly. +- Record the promotion and verification without rebuilding, installing, + publishing, or pushing. + +## Intent And Constraints + +- Candidate `bd377c9` is already based on exact local `main` base + `28e1690038d61b9333a2f6ca77f0187ea4273676`; abort if ancestry or branch state + changes instead of creating a merge commit or resolving new conflicts. +- Treat the candidate's implementation and canonical memory as read-only except + for replacing its source integration-task reference with this main-promotion + task. The source integration record remains intact on its source branch; this + task owns the only task record added to the final `main` tree. +- The user explicitly authorized force-releasing the completed diagnostic task. + The three unrelated untracked records were moved to a unique temporary + directory solely to obtain clean ownership and must be restored byte-for-byte + after this promotion task is completed and released. +- Do not modify the installed Makelore client, Device Package store, user + projects, remote refs, package artifacts, or unrelated repository state. + +## Promotion Plan + +1. Confirm `main` is still the candidate ancestor and fast-forward to + `bd377c9`. +2. Verify both product commits and the integration commit are reachable from + `main`, and that only this promotion record differs from the verified + candidate after documentation. +3. Run the task-aware drift check, commit this promotion record, mark the task + complete, release the clean worktree, and restore the protected files. + +## Outcome + +- Fast-forwarded local `main` from exact base + `28e1690038d61b9333a2f6ca77f0187ea4273676` to verified candidate + `bd377c9` with no merge commit or conflict. +- Local `main` now contains packaged Device Package authority fix + `5a2f0eb6785b59d8b455ed5cb1d9773351ff895a` and complete installed/enabled + extension activation fix `17664c5fffcfe695653b4146503e645f54767c4b`. +- Kept candidate product files and accepted canonical behavior unchanged. Only + the canonical source pointer was updated to this promotion task, and the + source integration record was excluded from the final main tree to satisfy + task-owned document boundaries; it remains intact on the candidate branch. +- No remote push, package build, application installation/restart, Device + Package mutation, or user-project change occurred. + +## Verification + +- Before promotion, `main` was exactly `28e1690` and was an ancestor of + `bd377c9`; `git merge --ff-only bd377c9` succeeded. +- Both product commits are ancestors of local `main`. +- Immediately after the fast-forward, `git diff --exit-code bd377c9 --` passed, + proving the checked-out tracked tree exactly matched the fully verified + integration candidate before this task's documentation-only closeout. +- Candidate verification: 5 focused files / 31 tests, 222 full test files / + 1,815 passed / 2 conditional skips, pressure 1/1, typecheck, scoped lint, + production build, `git diff --check`, and task-aware document drift all passed. +- The protected records' SHA-256 values were captured before restoration; they + will be compared after the task is completed and ownership released. + +## Follow-ups + +- Build and install a client from this exact `main`, then execute the live + npm/Git/loose-Skill prepare→confirm flow and activate a generation containing + at least two enabled extensions. The installed 1.2.6 client is unchanged. +- Remote `origin/main` remains unchanged because no push was requested. + +## Promotion Candidates + +- None. The verified candidate and accepted canonical updates are now on local + `main`. diff --git a/.project-docs/50-evidence/evidence-index.md b/.project-docs/50-evidence/evidence-index.md index 0ae2613..194bf65 100644 --- a/.project-docs/50-evidence/evidence-index.md +++ b/.project-docs/50-evidence/evidence-index.md @@ -4,7 +4,7 @@ Use this index for searchable, traceable evidence records. | Date | Topic | Status | Source | Detail | |---|---|---|---|---| -| 2026-09-03 | Device Package packaged prepare 与全部已启用资源加载 | Integrated on local `main`; rebuilt installed-client activation pending | Prepare source `5a2f0eb6785b59d8b455ed5cb1d9773351ff895a`, activation source `17664c5fffcfe695653b4146503e645f54767c4b`, tasks `20260902-local-skill-install-fix-6b3e91a4` / `20260903-load-installed-resources-8f3c1a72`, integration task `20260903-integrate-installed-resources-4b7e2c91` | Packaged package inspection now uses the distributed physical Pi runtime instead of importing an incomplete `app.asar` graph; closed Device Package failures remain closed across the bridge. The parent Agent Server keeps its generated Makelore extension first, passes every further Main-selected installed/enabled extension through Pi `0.84.2` `additionalExtensionPaths`, retains every selected Skill path, and keeps ambient discovery off. Packaged prepare without commit passed for loose `SKILL.md`, npm, and Git/Ponytail; a real Agent Server loaded two external extensions and exposed both commands. Across the two source tasks, focused tests, 222 files / 1,815 full unit tests / 2 conditional skips, pressure, typecheck, scoped lint, production build, Windows packaging, and artifact/Pi verification passed. The currently installed 1.2.6 client was not replaced, so no live installed-client success is claimed. | +| 2026-09-03 | Device Package packaged prepare 与全部已启用资源加载 | Integrated on local `main`; rebuilt installed-client activation pending | Prepare source `5a2f0eb6785b59d8b455ed5cb1d9773351ff895a`, activation source `17664c5fffcfe695653b4146503e645f54767c4b`, tasks `20260902-local-skill-install-fix-6b3e91a4` / `20260903-load-installed-resources-8f3c1a72`, verified candidate `bd377c9`, main promotion task `20260903-promote-installed-resources-main-5c8e1a72` | Packaged package inspection now uses the distributed physical Pi runtime instead of importing an incomplete `app.asar` graph; closed Device Package failures remain closed across the bridge. The parent Agent Server keeps its generated Makelore extension first, passes every further Main-selected installed/enabled extension through Pi `0.84.2` `additionalExtensionPaths`, retains every selected Skill path, and keeps ambient discovery off. Packaged prepare without commit passed for loose `SKILL.md`, npm, and Git/Ponytail; a real Agent Server loaded two external extensions and exposed both commands. Across the two source tasks, focused tests, 222 files / 1,815 full unit tests / 2 conditional skips, pressure, typecheck, scoped lint, production build, Windows packaging, and artifact/Pi verification passed. The currently installed 1.2.6 client was not replaced, so no live installed-client success is claimed. | | 2026-09-01 | Makelore Code packaged Agent Server Pi AI resolver fix | Integrated on local `main`; rebuilt Windows artifact and installed-client acceptance pending | Source `7df245a`, source task `20260901-local-runtime-unavailable-8b42c7f1`, merge `9640255`, verified candidate `42ea83c`, main promotion task `20260901-promote-local-runtime-main-a7c4e291` | The installed Electron Node process reproduced `ERR_MODULE_NOT_FOUND` for the present `@earendil-works/pi-ai@0.84.2` because the optional `import.meta.resolve` parent URL was inactive and lookup began beside `resources/resources/pi-agent-server.mjs`. Enabling that capability only for the Main-owned Agent Server made the exact differential pass without changing the runtime closure. A production-shaped sibling-layout Electron test went red before and green after; 24 focused tests, 1,761 full unit tests / 2 conditional skips, typecheck, lint with 0 errors, and Renderer/Main/Preload/utility build passed. This does not claim that the currently installed old package is fixed or that a rebuilt final artifact has passed release proof. | | 2026-08-30 | MakeLore AI Design Living Form V2 hard cutover | Integrated locally with matching server source; production data cutover and Provider activation pending | Client source `b0b5a602b501308a23eb27e2f51a5169b9e46b1e`, server source `b5351d54f595ce8eb873593e462e4a556bea0b05`, integration task `20260830-integrate-marketplace-design-client-main-9d5f3b82`, ADR-007 | Replaces nested V1 Conversations, Briefs, editable provider Prompt, mutable Quote PATCH, and local semantic fallback with one current Direction, one Living Form/Specification authority, stable operations, immutable Quote confirmation, and Main-owned V2 transport. Client source passed typecheck, lint with zero errors, 1,425 unit tests, Vite/Electron build, and 2 Electron E2E tests. Server source passed 2,626 tests / 31 skipped under UTF-8 mode. No production database cutover, real paid Provider request, deployment, or publication occurred. | | 2026-08-30 | MakeLore curated Plugin Marketplace Release A | Integrated locally; XMA-01 live acceptance PASS; production trust activation HOLD | Source `40df677a31ff7651f962151eb84b925987781c03`, source task `20260828-plugin-marketplace-client-5f8b3d72`, integration task `20260830-integrate-plugin-marketplace-client-6e3b9d82` | R7 Standards/Spec passed with zero findings. XMA-01 passed 12/12 using real PostgreSQL, signed-in packaged MakeLore, Operations-published temporary-key packages, A/B account isolation, immutable install/update/freeze/rollback, project/Agent/Pi materialization, lifecycle invalidation, pricing-only ETag change, Data Service 10 tools/14 operations and zero Token Point transactions. Final Windows installer was 208,235,670 bytes with SHA-256 `738A2F6573C502281787F418EA666C6E62C287CA0EC13C6EB22369DAB0B3FFFA`. The official Ed25519 public key was not supplied, so the production trust store correctly remains fail closed; no deployment or production publication occurred. |