merge: integrate reviewed Makelore identity rollback
This commit is contained in:
brother7 committed
commit
5ae6ffd204
6 files changed
+110
-12
No files matched your search
@@ -4,7 +4,9 @@ This file is the integrated default-branch snapshot. Feature tasks record progre
|
||||
|
||||
## Integrated Through
|
||||
|
||||
- 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)。
|
||||
- 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)。
|
||||
|
||||
- 2026-10-09：按用户要求，将集成源 `35e2a9149aed7d918176f00369cee6528505cdb8` 从 `fe1a3775` 无冲突快进合入本地 `main`。应用、测试、配置与已验证源保持相同，本次仅补充主分支交付记录。原有 3 份外来文档原样保留且未纳入提交；全部源分支和工作区按用户要求保留。未推送、部署、迁移生产数据或发布安装包；真实机构、OSS/网络、支付和设备验收仍待执行。见[本次合并](tasks/20261009-merge-product-dd0461f9.md)。本条更新下方独立分支阶段的未合主分支状态，历史来源记录不改写。
|
||||
|
||||
@@ -1236,4 +1238,4 @@ Robot 绑定设备默认先显示“引导配网 / 已有激活码”路径选
|
||||
|
||||
## Last Updated
|
||||
|
||||
2026-10-10
|
||||
2026-10-11
|
||||
@@ -0,0 +1,98 @@
|
||||
# Task: Integrate Makelore platform SSO rollback
|
||||
|
||||
## Identity
|
||||
|
||||
- Task ID: 20261011-integrate-rollback-makelore-c9d8e7f6
|
||||
- Mode: Integration
|
||||
- Branch: codex/20261011-integrate-rollback-makelore-c9d8e7f6-integrate-makelore-rollback-c9d8e7f6
|
||||
- Worktree: C:\Users\7brot\.codex-worktrees\makelore\20261011-integrate-rollback-makelore-c9d8e7f6
|
||||
- Base commit: f2a0eefc9ec5dfc2a09c15745b4786bc61682968
|
||||
- Owner: codex
|
||||
- Status: Ready for Integration
|
||||
|
||||
## Scope
|
||||
|
||||
- Integrate the completed Makelore rollback commit `e28beff` from
|
||||
`20261011-rollback-makelore-platform-auth-7c4e9a2b` onto the local `main`
|
||||
baseline `f2a0eefc9ec5dfc2a09c15745b4786bc61682968`.
|
||||
- Reconcile the canonical OIDC claims in ADR-004, the decision index, data
|
||||
flow, system overview, and current state so they describe the restored
|
||||
Works Square legacy login boundary after this rollback.
|
||||
- Preserve the original SSO source and former integration task records as
|
||||
historical evidence. The three known primary-checkout task documents are
|
||||
outside this worktree and must remain byte-for-byte unchanged and excluded
|
||||
from the integration commit.
|
||||
|
||||
## Intent And Constraints
|
||||
|
||||
- The user explicitly authorized the account-iteration rollback and local
|
||||
integration. This task changes only the Makelore client rollback and its
|
||||
canonical project-memory reconciliation; it does not touch one-feel,
|
||||
Yuxi, LMS, payment behavior, real accounts, deployment, or remotes.
|
||||
- Source task records and peer worktrees are read-only. Do not reset, delete
|
||||
branches, clean unknown files, or alter the Makelore primary checkout.
|
||||
- Keep the existing Works Square password/mobile facade, refresh, logout, and
|
||||
remembered-password boundary as the current desktop authentication contract.
|
||||
|
||||
## Project Context Loaded
|
||||
|
||||
- Concurrent Task Gate: Passed. `check_project_docs.py` passed; this task
|
||||
owns the isolated managed worktree and the integration lock.
|
||||
- Planning Gate: Passed after reading `read-before-planning.md`,
|
||||
`memory-index.md`, this task record, project positioning, current state,
|
||||
decision index, system overview, and the completed rollback source record.
|
||||
- Relevant peer scope: the rollback source is ready for integration and its
|
||||
only canonical conflict is the now-stale platform OIDC description. Other
|
||||
active Makelore tasks concern unrelated product areas and do not overlap
|
||||
these authentication or canonical-memory paths.
|
||||
|
||||
## Implementation Plan
|
||||
|
||||
1. Cherry-pick the completed rollback commit and confirm only the documented
|
||||
client, test, and README paths are reversed.
|
||||
2. Restore the canonical authentication description to the pre-OIDC
|
||||
Works Square boundary, then add a current-state entry for this rollback
|
||||
with source, verification, and the unresolved future SSO decision.
|
||||
3. Run whitespace, project-document drift, and focused regression checks that
|
||||
distinguish restored legacy authentication from removed platform OIDC.
|
||||
4. Record the integration outcome, verification, preserved primary contents,
|
||||
and follow-ups in this task record; complete the integration registration.
|
||||
|
||||
## Outcome
|
||||
|
||||
- Cherry-picked rollback commit `e28beff` as `45198ae`; the Makelore client
|
||||
application, focused tests, and README now match the pre-SSO code baseline.
|
||||
- Reconciled ADR-004, the decision index, data flow, system overview, and
|
||||
current state to make the Works Square legacy password/mobile login,
|
||||
refresh, and logout boundary current again. The prior OIDC records remain
|
||||
historical source evidence and are explicitly marked as superseded in the
|
||||
current-state entry.
|
||||
- The Makelore primary checkout was not edited by this task. Its three known
|
||||
untracked project task documents remain preserved and excluded from this
|
||||
integration.
|
||||
|
||||
## Verification
|
||||
|
||||
- Concurrent and Planning Gates passed.
|
||||
- Source verification is recorded in
|
||||
`20261011-rollback-makelore-platform-auth-7c4e9a2b`: 60 focused tests,
|
||||
typecheck, scoped lint, `git diff --check`, and a renderer-only Vite build
|
||||
passed; the normal D: output build was blocked by `ENOSPC`.
|
||||
- Integration verification passed: `git diff --name-status
|
||||
87d3f03d751b93b607e56d3667c3655f2a03a792 HEAD -- .` excluding
|
||||
`.project-docs/**` returned no paths, `git diff --check` passed, and
|
||||
`check_doc_drift.py --task-id 20261011-integrate-rollback-makelore-c9d8e7f6`
|
||||
passed. The isolated integration worktree has no dependency installation,
|
||||
so the source test evidence was reused rather than rerunning the same suite.
|
||||
|
||||
## Follow-ups
|
||||
|
||||
- A future platform SSO implementation requires a new explicit design and
|
||||
integration decision; this rollback leaves the client on the legacy path.
|
||||
- Re-run a normal Vite output build when D: has sufficient free space.
|
||||
|
||||
## Promotion Candidates
|
||||
|
||||
- None pending; the accepted rollback reconciliation is recorded in the
|
||||
canonical documents above. The historical OIDC source and prior integration
|
||||
task remain read-only evidence.
|
||||
Reference in new issue
Block a user