Recover WIP login stashes #687

samholmes · 2025-11-20T22:52:23Z

CHANGELOG

Does this branch warrant an entry to the CHANGELOG?

Yes
No

Dependencies

none

Description

none

Note

Improves resilience of login-stash updates and sync behavior.

Introduces LoginStash.wipChange and persists WIP changes in applyKit; clears it on successful server payload (applyLoginPayload) or local stash updates
On network error during applyKit, triggers background syncLogin and rethrows; PIN login now tries stashTree.wipChange first and falls back gracefully
Speeds up periodic login sync when a WIP exists via EXPEDITED_SYNC_INTERVAL in account-pixie
Stores decrypted username from userTextBox when present
Minor selector cleanup and CHANGELOG entry

^{Written by Cursor Bugbot for commit 99f24d0. This will update automatically on new commits. Configure here.}

To see the specific tasks where the Asana app for GitHub is being used, see below:
- https://app.asana.com/0/0/1209486083056433
- https://app.asana.com/0/0/1212383876345251

src/core/login/login.ts

samholmes · 2025-11-20T22:54:12Z

src/core/login/login-selectors.ts

  const { stashes } = ai.props.state.login
-  for (const stash of stashes) {
+  for (const rootStash of stashes) {
+    const stash = rootStash.wipChange ?? rootStash


This is wrong, but it was there to figure out why it wasn't working during sanity test

@swansontec Should I keep this or should I go with another approach to solve the problem where pin-login will no longer work on the light-account when there is a wipChange and that the login server has?

I don't understand what you are asking. How is this line wrong?

I should have said "I don't know if this is right". I don't know if it's wrong, but it solved the issue with pin-login, but I wasn't sure if this is the correct solution. I felt uncomfortable always assuming wipChange is the correct stash to use.

Now that I think about why I felt uncomfortable, there is a case where pin-login will break if the login-server doesn't have the changes that wipChange has. In this case, pin-login will break because wipChange is the wrong stash according to the login server. So perhaps the correct solution is to pick wipChange depending on if the login-server has the changes or not. This would require that we query the login-server to determine this and then drill this information down to the selector.

Or perhaps heal just the stash that has the issue, so

const stashTree = lookupStashForLogin(...); if (stashTree.wipChange != null) await healStash(stashTree); restOfLogin(...)

Obviously pseudocode, but you get the idea. If we can't hit the server for healing, then we aren't going to be PIN logging in anyhow. If it's a login method like touch, we can just ignore failures to heal and just use the old data.

swansontec

This looks generally correct. I would say, "debug it yourself" now, except that the AI may have noticed something worth double-checking.

src/core/account/account-pixie.ts

src/core/login/login.ts

samholmes · 2025-12-11T04:15:11Z

This was a pretty challenging thing to test and debug to ensure it does what we expect under the poor network conditions we expect.

To simulate the poor network conditions, I added the following patch originally:

--- a/src/core/login/login.ts
+++ b/src/core/login/login.ts
@@ -450,6 +450,7 @@ export async function applyKit(
     request.data = kit.server
     try {
       await loginFetch(ai, serverMethod, serverPath, request)
+      throw new Error('Simulated Network Timeout')
     } catch (error) {
       // If we fail, try to sync to see if the server got it:
       await syncLogin(ai, sessionKey).catch(() => {})

Here's the testing steps:

Create light-account (ignoring any message about "Simulated Network Timeout" because this patch caused that)
Complete backup account flow
After completing terms of service and seeing the "Simulated Network Timeout" error, go back to home scene
Logout
Login with PIN

Expected: At step 4, username chosen in the backup flow is shown. At step 6, login with PIN should work as normal.

So far testing commit a3705a1 which deviates from the original algorithm, the test passes.

When adding the fixup commit 64ee466 to match the original algorithm from the task, the tests break.

🤷‍♂️

src/core/login/login.ts

src/core/account/account-pixie.ts

swansontec

Two more comments worth addressing, but OK, it's close enough we can live with it.

swansontec · 2025-12-16T18:14:30Z

src/core/storage/storage-actions.ts

 import { StorageWalletStatus } from './storage-reducer'

 export const SYNC_INTERVAL = 30 * 1000
+export const EXPEDITED_SYNC_INTERVAL = 5000


This has nothing to do with storage (it deals with the login server), and should go in the account pixie.

swansontec · 2025-12-16T18:18:22Z

src/core/login/login-selectors.ts

  const { stashes } = ai.props.state.login
-  for (const stashTree of stashes) {
+  for (const rootStash of stashes) {
+    const stashTree = rootStash.wipChange ?? rootStash


Now that the healing loop is more aggressive, can we skip this line?

This should not be here. Now I after removing it, I must test thoroughly again.

Test fails. This const stashTree = rootStash.wipChange ?? rootStash line was what was causing the tests to pass before. Had this not slipped into the rebase, the test would have failed. I now am not comfortable with this PR.

I'm not sure why the healing is not applying. I'll need more time with this task.

samholmes · 2025-12-17T23:25:56Z

Here's a detailed summary of what has been fixed during a long debugging session with Cursor.

So far it makes sense to me what the issue was: the login-server payload was destroying the wipChange which has local-only username data which is valuable to the stash. So we need to make sure we don't destroy this when applying login-server payloads nor when applying the wipChange.

Summary of Fixes

1. src/core/login/login.ts - Preserve wipChange in applyLoginPayloadInner

// Added line 122:

if (stash.wipChange != null) out.wipChange = stash.wipChange

Why: When applyLoginPayload rebuilds a stash from server data, it creates a new object and copies over "client-only" fields like lastLogin, username. But wipChange wasn't being preserved, so background syncLogin calls would lose pending changes.

2. src/core/login/login.ts - Remove wipChange: undefined from clone callback

Changed the updateTree clone callback from explicitly setting wipChange: undefined to just spreading the existing stash.

Why: The clone callback applies to ancestor nodes when updating a child node. Setting wipChange: undefined here would clear pending changes on parent stashes when syncing child logins.

3. src/core/login/login.ts - healStash preserves client-only fields when discarding

const newStash = {

...stashTree,

username: stashTree.wipChange?.username ?? stashTree.username,

lastLogin: stashTree.wipChange?.lastLogin ?? stashTree.lastLogin,

wipChange: undefined

}

Why: When healStash discards wipChange (because server confirmed no changes), it was losing the username stored in wipChange. Since username is a client-only field (not on server), it must be preserved from wipChange even when discarding.

4. src/core/context/context-api.ts - Pre-login healing in loginWithPIN

Added logic to call healStash before PIN login if the stash has a wipChange with a matching username.

Why: Ensures stashes with pending wipChange are healed before attempting to look up by username, so the username is properly resolved before login proceeds.

The Core Problem: After backup flow with a simulated network error, the username was stored in wipChange but never made it to the main stash. Various code paths were discarding or overwriting wipChange without preserving the client-only username field, causing "User does not exist" errors on PIN login.

src/core/login/login.ts

samholmes

We're going with a different approach after a lengthy review-bar. The gist is that we'll be removing healLogin/healStash because it optimistic but also introduces an edge condition which is a broken state. Instead, we'll be only healing by a successful login and continued background sync (which requires that the user is currently logged in). This means we only use the wipChange for attempting loginWithPIN which needs it, and we will use the login-server's userTextBox to decrypt the username that is from the login server (no client-side only state needed to be preserved).

samholmes · 2025-12-22T19:26:41Z

src/core/context/context-api.ts

+      // Heal any stash with wipChange before looking up by username:
+      if (!useLoginId) {
+        const username = fixUsername(usernameOrLoginId)
+        for (const stash of ai.props.state.login.stashes) {
+          if (
+            stash.wipChange != null &&
+            (stash.username === username ||
+              stash.wipChange.username === username)
+          ) {
+            await healStash(ai, stash)
+          }
+        }
+      }


Instead of this, just heal stash after stashTree definition if wipChange is not null and then return the healed version to redefine the stashTree. Fail gracefully if the internet is down.

Or delete this code block because login with key doesn't really require the wipChanges to be healed in order to complete successfully. Only loginWithPIN does.

samholmes · 2025-12-22T19:28:14Z

src/core/context/context-api.ts

+      // Heal any stash with wipChange before looking up by username:
+      if (!useLoginId) {
+        const username = fixUsername(usernameOrLoginId)
+        for (const stash of ai.props.state.login.stashes) {
+          if (
+            stash.wipChange != null &&
+            (stash.username === username ||
+              stash.wipChange.username === username)
+          ) {
+            await healStash(ai, stash)
+          }
+        }
+      }


Apply heal after stashTree is gotten like mentioned above.

samholmes · 2025-12-22T22:15:58Z

Tests Passed

Network Timeout

Create light account
Back up light account
Fail the backup response due to network timeout simulation

Expected: Routine immediately catches the timeout error and syncs with the login server. This results in the username being shown and wipChange being removed due to a successful login sync, fully recovering the correct state.

Change Fails

Create light account
Back up light account
Fail the backup completely

Expected: No changes to the account are applied (no username), and PIN login still works with the guest account.

Network Disconnect

Create light account
Back up light account
Fail the backup response and immediate sync as if network completely disconnects

Expected: No changes to the account are applied until roughly 5 seconds later, while logged in, when the login sync routine recovers the correct state. Username suddenly appears for the account while logged in.

Network Disconnect (with Failed Routine Login Sync)

Create light account
Back up light account
Fail the backup response and immediate sync as if network completely disconnects
Log out before login sync routine
Log in using PIN

Expected: No changes to the account are applied until after PIN login.

cursor · 2025-12-22T22:28:31Z

src/core/login/login.ts

  if (stash.lastLogin != null) out.lastLogin = stash.lastLogin
  if (stash.username != null) out.username = stash.username
  if (stash.userId != null && out.userId == null) out.userId = stash.userId
+  if (stash.wipChange != null) out.wipChange = stash.wipChange


wipChange not cleared on root login after sync

The applyLoginPayloadInner function preserves wipChange on line 123, but the clone function in applyLoginPayload (lines 192-198) that clears wipChange is only called for non-matching nodes. Since updateTree returns immediately when the predicate matches (line 55), clone is never invoked for the matching node. For root logins where the root stash matches, wipChange is incorrectly preserved after a successful server sync, contradicting the comment stating it should be discarded. This causes the expedited sync interval to continue indefinitely and PIN login to unnecessarily attempt the wipChange path.

Additional Locations (1)

src/core/login/login.ts#L191-L198

I, too, am baffled by this line.

swansontec

Two small changes and one question.

swansontec · 2025-12-23T00:38:04Z

src/core/account/account-pixie.ts

+          const { sessionKey } = input.props.state.accounts[accountId]
+          const { stashTree } = getStashById(
+            toApiInput(input),
+            sessionKey.loginId
+          )


Instead do const { stashTree, sessionKey } = input.props.state.accounts[accountId]. It was sitting there the whole time for free.

swansontec · 2025-12-23T00:40:26Z

src/core/context/context-api.ts

+          } catch (error) {
+            // Fail gracefully with the original stash tree...
+            sessionKey = await loginPin2(ai, stashTree, mainStash, pin, opts)
+          }


Optional: This might read cleaner as sessionKey = await loginPin2(...wip...).catch(() => loginPin2(...mainStash...), but your way works too.

swansontec · 2025-12-23T00:43:50Z

src/core/login/login.ts

  if (stash.lastLogin != null) out.lastLogin = stash.lastLogin
  if (stash.username != null) out.username = stash.username
  if (stash.userId != null && out.userId == null) out.userId = stash.userId
+  if (stash.wipChange != null) out.wipChange = stash.wipChange


I, too, am baffled by this line.

cursor bot reviewed Nov 20, 2025

View reviewed changes

src/core/login/login.ts Outdated Show resolved Hide resolved

samholmes commented Nov 20, 2025

View reviewed changes

samholmes marked this pull request as draft November 20, 2025 22:54

swansontec reviewed Nov 24, 2025

View reviewed changes

src/core/account/account-pixie.ts Outdated Show resolved Hide resolved

swansontec requested changes Dec 4, 2025

View reviewed changes

src/core/login/login.ts Show resolved Hide resolved

samholmes force-pushed the sam/light-account-fix branch 2 times, most recently from 12ccda1 to 64ee466 Compare December 11, 2025 04:10

samholmes marked this pull request as ready for review December 12, 2025 19:14

cursor bot reviewed Dec 12, 2025

View reviewed changes

src/core/login/login.ts Show resolved Hide resolved

src/core/account/account-pixie.ts Show resolved Hide resolved

swansontec approved these changes Dec 16, 2025

View reviewed changes

cursor bot reviewed Dec 17, 2025

View reviewed changes

src/core/login/login.ts Outdated Show resolved Hide resolved

samholmes commented Dec 22, 2025

View reviewed changes

samholmes force-pushed the sam/light-account-fix branch 2 times, most recently from 13cd569 to 1472e50 Compare December 22, 2025 22:18

cursor bot reviewed Dec 22, 2025

View reviewed changes

swansontec requested changes Dec 23, 2025

View reviewed changes

swansontec approved these changes Dec 23, 2025

View reviewed changes

Recover WIP login stashes

99f24d0

samholmes force-pushed the sam/light-account-fix branch from 46abadb to 99f24d0 Compare December 23, 2025 00:55

samholmes enabled auto-merge December 23, 2025 00:59

samholmes merged commit 6267498 into master Dec 23, 2025
3 checks passed

samholmes deleted the sam/light-account-fix branch December 23, 2025 01:00

Recover WIP login stashes #687

Recover WIP login stashes #687

Uh oh!

Conversation

samholmes commented Nov 20, 2025 • edited by cursor bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

CHANGELOG

Dependencies

Description

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

swansontec left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

samholmes commented Dec 11, 2025

Uh oh!

Uh oh!

Uh oh!

swansontec left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

samholmes commented Dec 17, 2025

Summary of Fixes

1. src/core/login/login.ts - Preserve wipChange in applyLoginPayloadInner

2. src/core/login/login.ts - Remove wipChange: undefined from clone callback

3. src/core/login/login.ts - healStash preserves client-only fields when discarding

4. src/core/context/context-api.ts - Pre-login healing in loginWithPIN

Uh oh!

Uh oh!

samholmes left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

samholmes commented Dec 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Tests Passed

Network Timeout

Change Fails

Network Disconnect

Network Disconnect (with Failed Routine Login Sync)

Uh oh!

cursor bot Dec 22, 2025

Choose a reason for hiding this comment

wipChange not cleared on root login after sync

Uh oh!

Choose a reason for hiding this comment

Uh oh!

swansontec left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

samholmes commented Nov 20, 2025 •

edited by cursor bot

Loading

samholmes commented Dec 22, 2025 •

edited

Loading