docs: 记录快捷提示主分支集成与工作树清理

.project-docs/30-worklog/tasks/20260929-integrate-shortcuts-ml-b75d3c29.md

@@ -0,0 +1,57 @@
+# Task: Integrate published teacher shortcuts (ml)
+
+## Identity
+
+- Task ID: 20260929-integrate-shortcuts-ml-b75d3c29
+- Mode: Integration
+- Branch: main
+- Worktree: D:\Datas\OthersProjects\makelore
+- Base commit: 4103754b80b57b67b787ab4a6bc24bbf8591be4d
+- Owner: codex
+- Status: Ready for Integration
+
+## Scope
+
+- Fast-forward reviewed teacher shortcuts source 53d5b6b from task 20260929-teacher-shortcuts-ml-8ce941d7 into local main; promote the accepted shortcut contract into canonical memory.
+- Product source, tests, public mechanism docs and imported source task records remain byte-identical to reviewed source.
+
+## Intent And Constraints
+
+- User requested merge into main. Prior explicit permission to hand off these same three primary directories and preserve the same seven foreign documents applies; official release/start with adoption and exclusive integration ownership succeeded.
+- Concurrent and Planning Gates passed. Read own task, entry, positioning, current-state, teacher decisions, architecture/domain, relevant evidence/reflection/commitments and source/review task scopes; reuse unchanged peer scope assessments from feature work. Historical placeholders/malformed peer records remain unknown and read-only; no concrete dependency or semantic conflict identified.
+- Yuxi positioning/success templates contain placeholders; actual accepted teacher mechanisms and AGENTS define this task's boundary. This integration does not change positioning or fill unrelated templates.
+- Preserve these adopted foreign documents unchanged and exclude them from commits:
+  - .project-docs/30-worklog/tasks/20260901-package-122-c5e8.md
+  - .project-docs/30-worklog/tasks/20260901-package-123-d7f3.md
+  - .project-docs/30-worklog/tasks/20260902-client-hang-diagnosis-a47c9e2b.md
+- Merge authorization covers local integration; the user subsequently explicitly approved removing the three listed source worktrees. No push, deployment or production mutation. Existing fresh independent reviewer PASS covers the exact unchanged source.
+
+## Plan
+
+1. Fast-forward source after confirming main is its ancestor.
+2. Integrate ordered label/prompt publication facts into relevant canonical documents.
+3. Verify source equivalence, main ancestry, whitespace and task document boundaries; stop for any new product difference or changed adopted document.
+4. Commit only canonical updates and this integration record, complete official task, and offer optional source-worktree cleanup.
+
+## Outcome
+
+- Successfully fast-forwarded 53d5b6b into local main; accepted shortcut contract promoted to canonical memory. Product files, tests and imported source task records remain identical to the independently reviewed source.
+- User explicitly approved cleanup of the three named feature paths. Official retire failed with Directory not empty. Git removed worktree registration and .git before returning failure, but D:/Datas/OthersProjects/.codex-worktrees/makelore/20260929-teacher-shortcuts-ml-8ce941d7 retains partial files and its task ownership reservation remains. The path is no longer an eligible clean linked worktree. Do not manually delete/relabel registry state or bypass retire; cleanup is blocked pending supported recovery. Source branch codex/20260929-teacher-shortcuts-ml-8ce941d7-teacher-shortcuts and commit 53d5b6b are preserved and integrated.
+
+## Verification
+
+- Source commits and main bases verified; all three main branches are ancestors of their source commits.
+- Source evidence: WS 36 SQLite/TestClient and 3 real PostgreSQL tests; Yuxi 2270 unit / 1 skipped, 3 real HTTP/PostgreSQL integration, 319 web tests, actual Vue editor browser proof, lint/build/docs/engineering checks; Makelore 73 UI tests, 21 browser cases, type/lint/production compile. Fresh independent reviewer PASS across all three.
+- Integration verification passed: git diff --exit-code against source excluding .project-docs, unchanged imported source task, source ancestry in actual main, git diff --check and official check_doc_drift. The drift gate confirms all adopted foreign document states remain unchanged. Source tests/builds are reused because the product tree is identical; only canonical/task documentation was edited here.
+- Confirmed all three source branch references still resolve to their source commits after cleanup attempts. Representative linked runtime dependencies remain available; no claim of a fresh full dependency audit.
+
+## Follow-ups
+
+- Release WS API first, then Yuxi and Makelore. No new migration from shortcuts; prerequisite direct-publication migration remains required.
+- Cleanup result: blocked by partial Windows Git removal; residual path and stale task reservation preserved for supported recovery. User consent already covers this exact path; do not ask again merely because this same cleanup resumes.
+
+## Promotion Candidates
+
+- Accepted: Yuxi owns ordered teacher_shortcuts entries with label/prompt, explicit publication freezes values, WS persists/delivers shortcuts in version JSON, Makelore renders labels and sends actual prompts.
+- Explicit [] hides shortcuts; missing historical field preserves legacy entry. Limits 8 / 40 / 6000, trimmed text. Existing stable chat/current version rules hold.
+- Promoted to canonical decision index, teacher ADR where present, architecture, domain rules and current-state. Additive to accepted explicit publication, no contradictory source or new human product decision.