ISSUE DESCRIPTION auth: spurious REFRESHGENERATIONS bump on early-cancel in…
- User
ISSUE DESCRIPTION
auth: spurious _REFRESH_GENERATIONS bump on early-cancel in _coalesced_run_refresh_cmd
Summary
_coalesced_run_refresh_cmdinsrc/notebooklm/_auth/refresh.py(moved fromsrc/notebooklm/auth.pyin tier-10 PR-B-high #814, but the code is byte-identical to origin/main since tier-9 E #803) can bump_REFRESH_GENERATIONS[refresh_key]even when no real refresh happened, in a narrow cancel-before-await race.Reproducer (race condition)
- Caller invokes
await _coalesced_run_refresh_cmd(refresh_key, path, profile)from the cancel-recovery loop in_fetch_tokens_with_refresh. - Task is cancelled in the window between
try:and the firstwith _REFRESH_STATE_LOCK:block inside_coalesced_run_refresh_cmd— so NO future is registered in_REFRESH_INFLIGHT_BY_LOOP[loop][refresh_key]. - Control jumps to
except asyncio.CancelledError:in the caller. registry.get(refresh_key)returnsNone.- The inner
if inflight is None or inflight.done():is taken; theif inflight is not None:block is skipped;subprocess_excstaysNone;break. - Outer
if subprocess_exc is not None:is False, so no raise. - Generation is bumped at the
with _REFRESH_STATE_LOCK: ... max(existing, refresh_generation + 1)line, even though no subprocess ran. - Then
if caller_cancelled: raise asyncio.CancelledError().
Impact
A concurrent waiter on a different event loop sharing the same
refresh_keywould observe the phantom generation bump on its lock-re-acquire path, treat the storage as freshly-refreshed, and skip its own_run_refresh_cmd— proceeding tobuild_httpx_cookies_from_storageagainst STALE on-disk state.Bounded blast radius: the stale-storage caller will fail again on the next token fetch and trigger its own real refresh. No data corruption. But it's a wasted round-trip.
Suggested fix (from CodeRabbit on PR #814)
Track whether
inflightwas ever non-None during the cancel-recovery loop. Only bump generation ifsubprocess_exc is None AND observed_inflight is True. Or per the alternative suggestion: raise immediately wheninflight is Noneat the top of the cancel handler (the subprocess never registered, so we can't be the leader-cancel-before-await case for an actually-running refresh).Why not fixed in PR #814
That PR's scope was "extract verbatim from auth.py into _auth/refresh.py + facade-forward". Changing async semantics was explicitly out of scope (
must_not_do). Filing here for a dedicated follow-up.References
- CodeRabbit comment: https://github.com/teng-lin/notebooklm-py/pull/814#discussion_r3256142201
- Original code:
src/notebooklm/_auth/refresh.py:487-537(tier-10),src/notebooklm/auth.py:961-1026(tier-9 E origin)
ADDITIONAL ADVICE
Since you are given a git repository, you can use git commands to simplify your work. For example, if you made a mistake and want to revert your changes, you can use
git checkout <file>to restore the file to its original state. You can also reset all changes in the repository usinggit reset --hardcommand. Additionally, you can usegit stashandgit stash popto temporarily save your changes and restore them later. Finally, you can see the changes that you've made (which will be submitted when you callsubmit) usinggit statusorgit diffcommands. However you don't need to usegit addorgit commitbefore submitting your changes. In fact,submitonly submits currently unstaged changes because it usesgit diffto get the changes that need to be submitted.CHECKLIST
Before submitting your solution, please go over the following checklist and make sure you've done everything:
- If an error was reported in the issue description, I have successfully reproduced it.
- If an error was reported in the issue description, I have confirmed that my fix resolves the error.
- I have thought about edge cases and made sure my fix handles them as well.
- I have run existing tests in the repository that might have been affected by the change I made and confirmed that they pass. I want you to list every bullet from this checklist and write your reasoning for why you think you did it or didn't need to.
Repository has been uploaded and your shell is currently at the repository root. Time to solve the issue!
(Current directory: /notebooklm-py, current file: none) bash-$
- Caller invokes
- Assistant
I’ll inspect the repository structure, the affected function, and nearby auth tests first. Then I’ll reproduce the cancellation window if practical, implement the narrow semantic fix, and run focused plus broader tests.
- Assistant
The vulnerable logic is in the caller’s cancellation-recovery loop, exactly as reported. I’ll now inspect
_coalesced_run_refresh_cmdregistration timing and all existing cancellation regression tests, especially the test near lines 500 that already guards a related phantom bump, to choose a fix consistent with established behavior. - Assistant
The existing done-future behavior must remain: a cancelled leader whose subprocess really registered and succeeded should still bump generation, while a registered failure must not. The clean discriminator is therefore whether the cancellation handler ever observed a non-
Nonein-flight future. Before editing, I’ll create a temporary, deterministic reproduction by monkeypatching_coalesced_run_refresh_cmdto cancel before registration; this exercises the exact caller-side state transition without modifying repository tests. - Assistant
The first reproduction attempt did not enter refresh because the synthetic
ValueErrordid not match_should_try_refresh’s accepted text; this is a fixture issue, not the reported race. I’ll inspect that predicate and rerun with an accepted error message and refresh environment enabled. - Assistant
The tests use that message but also set the refresh-command environment variable; my script omitted it. I’ll add the environment variable and rerun to establish the pre-fix generation value.
- Assistant
The reproduction confirms the bug (
generation=1with zero registered future/subprocess). I’ll use the issue’s immediate-reraise alternative: when the registry has no entry, cancellation necessarily preceded registration on this event loop, so there is nothing to drain and no successful work that can justify a generation bump. This preserves the registered-success and registered-failure paths unchanged and is simpler than carrying an observation flag into the success block. - Assistant
The same deterministic reproducer now reports
generation=0, confirming the race is fixed. Next I’ll run the complete refresh command race suite and closely related lock-registry/public-shim tests to ensure registered cancellation, failure propagation, coalescing, and facade behavior remain intact. - Assistant
All 20 focused refresh/coalescing tests pass. I’ll now run static formatting/lint checks on the changed file and the broader non-e2e test suite; this will catch syntax/style issues and any indirect auth regressions beyond the focused concurrency coverage.
- Assistant
Static checks pass, and the broad run completed 5,344 passing tests; its only failures/errors are unrelated browser-login tests because the optional
playwrightmodule is absent from the environment. Since the affected suites already pass, I won’t alter dependencies or repository files for that environment issue. I’ll do a final diff/status review and run the full targeted race file once more without filtering, then prepare the required checklist assessment.
Other models, same or similar prompt
Responses were produced in different, uncontrolled contexts (system prompts, settings, prior turns). This is not a benchmark.
Identical first prompt
Qwen/Qwen3.6-27BCompare side by side →
Qwen/Qwen3.6-27BCompare side by side →
Qwen/Qwen3.6-27BCompare side by side →
Qwen/Qwen3.6-27BCompare side by side →
Qwen/Qwen3.6-27BCompare side by side →
- xiaomi/mimo-v2.5-proCompare side by side →
- xiaomi/mimo-v2.5-proCompare side by side →
- xiaomi/mimo-v2.5-proCompare side by side →
- xiaomi/mimo-v2.5-proCompare side by side →
- xiaomi/mimo-v2.5-proCompare side by side →
- gpt-5.6-solCompare side by side →
- gpt-5.6-solCompare side by side →