From 605fef417fe2e7a5d23d4994fbd109cdfb38efcb Mon Sep 17 00:00:00 2001 From: brother7 <7brother7@gmail.com> Date: Fri, 21 Aug 2026 00:50:54 +0800 Subject: [PATCH] docs: record remember password layout integration --- .project-docs/30-worklog/current-state.md | 6 ++++++ .../20260820-integrate-remember-password-5d7e3a1c.md | 12 +++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.project-docs/30-worklog/current-state.md b/.project-docs/30-worklog/current-state.md index 2aa7b65..2590a3c 100644 --- a/.project-docs/30-worklog/current-state.md +++ b/.project-docs/30-worklog/current-state.md @@ -4,6 +4,12 @@ This file is the integrated default-branch snapshot. Feature tasks record progre ## Integrated Through +- Login-layout source commit `4d512b1` from feature task + `20260821-remember-below-login-4a7c91d2` was merged into local `main` as + `22f4bbc` by integration task `20260820-integrate-remember-password-5d7e3a1c`. + Password login now places the existing remember-password control directly below + the submit button and above the agreement; authentication, persistence, and + secure-storage behavior are unchanged. - Remember-password source commit `990639f` from feature task `20260820-makelore-remember-password-b63e1c` was merged into local `main` as `2b9f84e` by integration task `20260820-integrate-remember-password-5d7e3a1c`. diff --git a/.project-docs/30-worklog/tasks/20260820-integrate-remember-password-5d7e3a1c.md b/.project-docs/30-worklog/tasks/20260820-integrate-remember-password-5d7e3a1c.md index bcc69c9..19f061c 100644 --- a/.project-docs/30-worklog/tasks/20260820-integrate-remember-password-5d7e3a1c.md +++ b/.project-docs/30-worklog/tasks/20260820-integrate-remember-password-5d7e3a1c.md @@ -13,6 +13,7 @@ ## Scope - Integrate verified remember-password source commit `990639f` into local `main`. +- Integrate follow-up login-layout source commit `4d512b1`, placing “记住密码” below the login button without changing credential behavior. - Reconcile the source task's accepted authentication promotion candidates into canonical current-state, architecture, ADR, and domain documents. - Preserve the pre-existing untracked packaging task record without modifying or committing it. @@ -21,6 +22,7 @@ - Keep remembered credentials separate from the existing seven-day Works Square session. - Keep password persistence Main-owned and OS-encrypted in packaged builds; do not persist passwords in Renderer or Works Square. - Preserve logout/SMS retention and successful unchecked-password-login clearing semantics. +- Treat the follow-up as presentation order only; do not change the canonical remembered-password security boundary. - Merge only to local `main`; do not push. ## Outcome @@ -28,6 +30,9 @@ - Source feature commit `990639f` was created from the completed isolated feature worktree. - Merged the source branch into local `main` as merge commit `2b9f84e` without conflicts; README auto-merged with the already integrated Session-model documentation. - Promoted the accepted remembered-password boundary into `current-state.md`, `system-overview.md`, ADR-004, and `business-rules.md`. +- Created follow-up source commit `4d512b1` and merged it into local `main` as `22f4bbc` without conflicts. Password login now renders the submit button before the existing remember-password control, with the agreement remaining below both. +- Kept the follow-up layout-only: authentication, Main-owned persistence, Works requests, validation, and spacing tokens are unchanged. +- Recorded the follow-up source and merge commits under canonical `current-state.md` without changing the existing architecture, ADR, or domain rules. - Preserved `.project-docs/30-worklog/tasks/20260819-package-learning-off-115-9c4d.md` untouched and untracked. ## Verification @@ -37,14 +42,19 @@ - Integrated local `main`: `pnpm run typecheck` passed. - Integrated local `main`: scoped ESLint passed with zero errors. - Integrated local `main`: Renderer/Main/Preload/utility `pnpm run build:vite` passed with existing dynamic-import and large-chunk advisory warnings only. +- Follow-up integrated local `main`: `tests/unit/login-page.test.tsx` passed, 1 file / 13 tests. +- Follow-up integrated local `main`: scoped ESLint and `pnpm run typecheck` passed. +- Follow-up integrated local `main`: Renderer/Main/Preload/utility `pnpm run build:vite` passed with the same existing advisory warnings. +- Follow-up integrated local `main`: repository Playwright CLI ran the focused native-login Electron smoke, 1 test passed, including the rendered vertical-order assertion. - `git diff --check` passed with line-ending conversion notices only. - Required project-docs structure check passed. -- Task-aware documentation drift is blocked by two read-only foreign task records: the pre-existing, explicitly preserved untracked `.project-docs/30-worklog/tasks/20260819-package-learning-off-115-9c4d.md`, and the source task record `.project-docs/30-worklog/tasks/20260820-makelore-remember-password-b63e1c.md` introduced unchanged by merge commit `2b9f84e`. The integration did not modify either record. The checker also lists the expected merged source files as non-document changes. +- Task-aware documentation drift is blocked by three read-only foreign task records: the pre-existing, explicitly preserved untracked `.project-docs/30-worklog/tasks/20260819-package-learning-off-115-9c4d.md`, the original source task record `.project-docs/30-worklog/tasks/20260820-makelore-remember-password-b63e1c.md`, and the follow-up source task record `.project-docs/30-worklog/tasks/20260821-remember-below-login-4a7c91d2.md` introduced unchanged by their merge commits. The integration did not modify those records. The checker also lists the expected merged source files as non-document changes. ## Follow-ups - Run packaged Windows and signed macOS smoke for OS-protected save, restart prefill, successful unchecked-login clear, and no development Keychain prompt. - Resolve the repository's integration drift-check handling for unchanged source task records and decide the separately owned untracked packaging record before this integration ownership can be completed and released cleanly. +- The login-layout follow-up has no canonical promotion candidate; no shared architecture or domain document needs another semantic update. ## Promotion Candidates