From 6d3f4ea94dd97e96a2bc9fcedfb35b6ed3ae5b78 Mon Sep 17 00:00:00 2001
From: brother7 <7brother7@gmail.com>
Date: Sun, 11 Oct 2026 12:38:40 +0800
Subject: [PATCH] docs: record Makelore rollback on main

---
 .project-docs/30-worklog/current-state.md     |  2 +
 ...11-integrate-makelore-rollback-b8f41a62.md | 39 +++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 .project-docs/30-worklog/tasks/20261011-integrate-makelore-rollback-b8f41a62.md

diff --git a/.project-docs/30-worklog/current-state.md b/.project-docs/30-worklog/current-state.md
index 0faf2fed..7fbc509a 100644
--- a/.project-docs/30-worklog/current-state.md
+++ b/.project-docs/30-worklog/current-state.md
@@ -4,6 +4,8 @@ This file is the integrated default-branch snapshot. Feature tasks record progre
 
 ## Integrated Through
 
+- 2026-10-11：用户授权回滚与主目录交接，已在本地 main 合入源 658bf7d 和正式文档整合 9949328，合并提交 5ae6ffd204e4d5e0f8546544fa8fc8cc3e1c51f1。恢复旧 Works Square 登录/刷新/注销路径；产品与已验证源一致。原有三份任务文档保持未提交，未推送、部署或删除工作区。见[主分支记录](tasks/20261011-integrate-makelore-rollback-b8f41a62.md)。
+
 - 2026-10-11：按用户明确要求，将 Makelore 平台 SSO 回滚源 `e28beff`（原平台 OIDC 实现 `7236def` 的逆提交）合入本地集成分支，客户端恢复 Works Square 传统密码/手机登录、刷新与注销边界。回滚验证沿用源任务的 60 项聚焦测试、typecheck、scoped lint、Renderer-only Vite build 与 `git diff --check`；正常 D: 构建仍因磁盘空间不足未完成。本次未推送、部署、迁移真实账号、改 LMS 或支付；主目录 3 份外来未跟踪文档原样保留且未纳入提交。此前 2026-10-10 的 OIDC 条目和来源任务继续保留为历史证据，当前运行时以本条及 ADR-004 为准。见[回滚源任务](tasks/20261011-rollback-makelore-platform-auth-7c4e9a2b.md)和[本次集成](tasks/20261011-integrate-rollback-makelore-c9d8e7f6.md)。
 
 - 2026-10-10：按用户确认，将 Makelore 平台 SSO 源 `7236def07d6a9a5cfde70c3239c6ac53764bcd7d` 无冲突快进合入本地 `main`，并修正来源登记提交 `86216b8458db9a2c58850a6835fd1a76cee5a846`。Electron Main 通过系统浏览器使用平台 OIDC Authorization Code + PKCE，校验 state/nonce/S256、精确 `niancode://auth/callback`，并在 Main 内持有 access/refresh token；平台身份按 issuer + `sub=platform:<UUID>` 使用，传统 Works Square 密码/手机登录路径保留。该条记录的是已回滚的历史迭代，不代表当前客户端状态。源验证沿用 65 项聚焦测试、typecheck 与变更文件 lint；本次未推送、部署、迁移真实账号、改 LMS 或支付。已有 3 份外来未跟踪文档原样保留且未纳入提交。见[源任务](tasks/20261010-makelore-platform-sso-a1b2.md)和[本次集成](tasks/20261010-integrate-makelore-platform-sso-9c2d.md)。
diff --git a/.project-docs/30-worklog/tasks/20261011-integrate-makelore-rollback-b8f41a62.md b/.project-docs/30-worklog/tasks/20261011-integrate-makelore-rollback-b8f41a62.md
new file mode 100644
index 00000000..105c97e5
--- /dev/null
+++ b/.project-docs/30-worklog/tasks/20261011-integrate-makelore-rollback-b8f41a62.md
@@ -0,0 +1,39 @@
+# Task: Integrate Makelore identity rollback
+
+## Identity
+
+- Task ID: 20261011-integrate-makelore-rollback-b8f41a62
+- Mode: Integration
+- Branch: main
+- Worktree: D:\Datas\OthersProjects\makelore
+- Base commit: f2a0eefc9ec5dfc2a09c15745b4786bc61682968
+- Owner: Codex
+- Status: Ready for Integration
+
+## Scope
+
+- Merge rollback source 658bf7d and prepared canonical integration 9949328 into local main, preserving the three known foreign task documents.
+
+## Intent And Constraints
+
+- User explicitly approved rollback and main ownership handoff with preserved dirty documents. The prior worker released the old main owner and prepared an isolated integration; its completed clean lock was normally released without deleting that checkout. Official start --mode integration --adopt-existing and status established this exact primary owner.
+- Project Context Loaded / Planning Gate Passed: entry, own task, memory, positioning, current state, decisions, architecture, evidence/reflection/commitments and both ready source records read; reuse unchanged peer assessment from this same rollback. User request resolves the OIDC direction conflict. Historical source records are read-only; no push, deployment or real provider operation.
+
+## Outcome
+
+- Fast-forwarded main to 658bf7d, then merged prepared canonical integration 9949328 as 5ae6ffd204e4d5e0f8546544fa8fc8cc3e1c51f1. Product/test/README bytes equal the verified rollback source. Both source records remain unchanged; current canonical authentication again uses Electron Main and the Works Square one-feel facade.
+- All three preexisting untracked task records remain untracked and unchanged. No dependency or build files are staged.
+
+## Verification
+
+- Source evidence: 60 focused tests, typecheck and scoped lint passed; renderer-only Vite output to C: passed after the standard D: build ran out of disk space. Reused these results because integration changes only documentation.
+- Verified non-document equality to 658bf7d, merge/source ancestry, unchanged source records, adopted foreign states, whitespace and task-aware documentation boundaries.
+
+## Follow-ups
+
+- Match the platform rollback release before deploying this client; production login/payment and packaged callbacks are not tested here.
+- Retain the clean managed feature rollback worktree until post-merge cleanup approval. The already-completed isolated integration checkout at C:\Users\7brot\.codex-worktrees\makelore\20261011-integrate-rollback-makelore-c9d8e7f6 remains on disk after normal release; it is unowned and is not an automatic retire candidate.
+
+## Promotion Candidates
+
+- Accepted the prepared canonical rollback in 9949328 under the explicit user instruction; no new product decision or unresolved promotion remains.