Conversation
isComboCooldownWaitEligible() was restricted to quota-share/auto only, but the combo.ts comments, the cooldown-wait decision body, and the priority test all describe universal behavior per diegosouzapw#7301. The restriction arrived in diegosouzapw#8213 when extracting the predicate — incidental to the timeout-floor coupling, not a deliberate scope reduction. - Remove strategy check from isComboCooldownWaitEligible (now returns comboCooldownWait.enabled for all strategies) - Update combo-config unit test to assert all strategies are eligible - Update combo-quota-share-cooldown-wait-timing test: status assertion changes from 429→403 because the lockout path now runs for priority Closes diegosouzapw#8541
Contributor
Author
|
Closing in favor of #8559 — the reporter's PR is more thorough. It fixes both the gate AND the entry condition in combo.ts (decouples the cooldown-wait decision from whichever target last overwrote |
Contributor
Author
|
Another PR already exists |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Fixes #8541.
isComboCooldownWaitEligible()incomboConfig.tswas restricted toquota-shareandautostrategies, but the cooldown-wait decision body incombo.ts, its inline comments, and the priority test all describe universal behavior per #7301. The restriction arrived in #8213 when extracting the predicate — incidental to the timeout-floor coupling, not a deliberate scope reduction.Changes
open-sse/services/comboConfig.ts: Remove strategy check fromisComboCooldownWaitEligible— now returnscomboCooldownWait.enabledfor all strategies (the_strategyparam is kept for API compatibility)tests/unit/combo-config.test.ts: Update test to assert all strategies are eligible when the feature is enabled; updateresolveComboTargetTimeoutMsForCombotest to expect raised floor for all strategiestests/unit/serial/combo-quota-share-cooldown-wait-timing.test.ts: Status assertion changes from 429→403 in the quota_exhausted test because the lockout path now runs for priority strategy (the security property — no wait+redispatch on quota_exhausted — still holds)Verification
combo-config.test.ts: 44/44 passcombo-quota-share-cooldown-wait-timing.test.ts: 4/4 pass (including the previously failing priority test)