@cortexkit/opencode-antigravity-auth 3.0.39 → 3.0.41
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.js +535 -112
- package/dist/cli.js.map +4 -4
- package/dist/cli.meta.json +67 -38
- package/dist/index.js +6899 -3288
- package/dist/index.js.map +4 -4
- package/dist/index.meta.json +1503 -465
- package/dist/server.js +7028 -3363
- package/dist/server.js.map +4 -4
- package/dist/server.meta.json +1 -1
- package/dist/src/common-auth-embedded/claustrum/enrollment.d.ts +25 -4
- package/dist/src/common-auth-embedded/claustrum/enrollment.js +81 -4
- package/dist/src/common-auth-embedded/claustrum/index.d.ts +1 -1
- package/dist/src/common-auth-embedded/claustrum/index.js +1 -1
- package/dist/src/common-auth-embedded/commands/builtins.d.ts +20 -1
- package/dist/src/common-auth-embedded/commands/builtins.js +28 -12
- package/dist/src/common-auth-embedded/commands/index.d.ts +1 -1
- package/dist/src/common-auth-embedded/commands/menu.d.ts +6 -1
- package/dist/src/common-auth-embedded/commands/menu.js +1 -0
- package/dist/src/common-auth-embedded/fs/file-read-cache.js +9 -5
- package/dist/src/common-auth-embedded/fs/refresh-file-lock.d.ts +11 -0
- package/dist/src/common-auth-embedded/fs/refresh-file-lock.js +146 -2
- package/dist/src/common-auth-embedded/fs/with-lock.d.ts +2 -0
- package/dist/src/common-auth-embedded/fs/with-lock.js +1 -1
- package/dist/src/common-auth-embedded/settings/define.d.ts +35 -0
- package/dist/src/common-auth-embedded/settings/define.js +52 -0
- package/dist/src/common-auth-embedded/settings/descriptors.d.ts +97 -0
- package/dist/src/common-auth-embedded/settings/descriptors.js +81 -0
- package/dist/src/common-auth-embedded/settings/edit.d.ts +24 -0
- package/dist/src/common-auth-embedded/settings/edit.js +229 -0
- package/dist/src/common-auth-embedded/settings/fs.js +19 -0
- package/dist/src/common-auth-embedded/settings/handle.d.ts +30 -0
- package/dist/src/common-auth-embedded/settings/handle.js +228 -0
- package/dist/src/common-auth-embedded/settings/index.d.ts +10 -0
- package/dist/src/common-auth-embedded/settings/index.js +7 -0
- package/dist/src/common-auth-embedded/settings/lock-errors.js +15 -0
- package/dist/src/common-auth-embedded/settings/move.d.ts +76 -0
- package/dist/src/common-auth-embedded/settings/move.js +351 -0
- package/dist/src/common-auth-embedded/settings/parse.d.ts +24 -0
- package/dist/src/common-auth-embedded/settings/parse.js +65 -0
- package/dist/src/common-auth-embedded/settings/paths.d.ts +12 -0
- package/dist/src/common-auth-embedded/settings/paths.js +48 -0
- package/dist/src/common-auth-embedded/settings/refusal.d.ts +7 -0
- package/dist/src/common-auth-embedded/settings/refusal.js +15 -0
- package/dist/src/common-auth-embedded/settings/resolve.d.ts +15 -0
- package/dist/src/common-auth-embedded/settings/resolve.js +51 -0
- package/dist/src/common-auth-embedded/settings/schema.d.ts +29 -0
- package/dist/src/common-auth-embedded/settings/schema.js +81 -0
- package/dist/src/common-auth-embedded/settings/snapshot.d.ts +24 -0
- package/dist/src/common-auth-embedded/settings/snapshot.js +150 -0
- package/dist/src/common-auth-embedded/settings/update.js +139 -0
- package/dist/src/common-auth-embedded/settings/write.js +88 -0
- package/dist/src/common-auth-embedded/setup/command-error.d.ts +1 -1
- package/dist/src/common-auth-embedded/setup/command-error.js +4 -2
- package/dist/src/common-auth-embedded/setup/command.js +23 -6
- package/dist/src/common-auth-embedded/setup/enroll.d.ts +2 -2
- package/dist/src/common-auth-embedded/setup/enroll.js +13 -3
- package/dist/src/common-auth-embedded/setup/enrollment-access.js +86 -0
- package/dist/src/common-auth-embedded/setup/index.d.ts +1 -1
- package/dist/src/common-auth-embedded/setup/types.d.ts +16 -1
- package/dist/src/common-auth-embedded/source-output.json +314 -70
- package/dist/src/common-auth-embedded/tui-prefs/watcher.js +196 -0
- package/dist/src/ga/tui/host-ga.js +1 -1
- package/dist/src/ga/tui/host-ga.js.map +1 -1
- package/dist/src/plugin/__fixtures__/verified-store.js +2 -2
- package/dist/src/plugin/command-apply.d.ts +43 -3
- package/dist/src/plugin/command-apply.d.ts.map +1 -1
- package/dist/src/plugin/command-apply.js +92 -12
- package/dist/src/plugin/command-apply.js.map +1 -1
- package/dist/src/plugin/commands.d.ts +5 -1
- package/dist/src/plugin/commands.d.ts.map +1 -1
- package/dist/src/plugin/commands.js +4 -3
- package/dist/src/plugin/commands.js.map +1 -1
- package/dist/src/plugin/config/writer.d.ts +10 -3
- package/dist/src/plugin/config/writer.d.ts.map +1 -1
- package/dist/src/plugin/config/writer.js +30 -22
- package/dist/src/plugin/config/writer.js.map +1 -1
- package/dist/src/plugin/fetch-interceptor.d.ts +8 -3
- package/dist/src/plugin/fetch-interceptor.d.ts.map +1 -1
- package/dist/src/plugin/fetch-interceptor.js +1 -0
- package/dist/src/plugin/fetch-interceptor.js.map +1 -1
- package/dist/src/plugin/ga-location-services.d.ts +3 -1
- package/dist/src/plugin/ga-location-services.d.ts.map +1 -1
- package/dist/src/plugin/ga-location-services.js +35 -5
- package/dist/src/plugin/ga-location-services.js.map +1 -1
- package/dist/src/plugin/index.d.ts.map +1 -1
- package/dist/src/plugin/index.js +65 -15
- package/dist/src/plugin/index.js.map +1 -1
- package/dist/src/plugin/killswitch.d.ts +20 -0
- package/dist/src/plugin/killswitch.d.ts.map +1 -1
- package/dist/src/plugin/killswitch.js +14 -4
- package/dist/src/plugin/killswitch.js.map +1 -1
- package/dist/src/plugin/logger.d.ts +3 -1
- package/dist/src/plugin/logger.d.ts.map +1 -1
- package/dist/src/plugin/logger.js +15 -7
- package/dist/src/plugin/logger.js.map +1 -1
- package/dist/src/plugin/operator-settings.d.ts +6 -0
- package/dist/src/plugin/operator-settings.d.ts.map +1 -1
- package/dist/src/plugin/operator-settings.js.map +1 -1
- package/dist/src/plugin/request-helpers.d.ts +5 -0
- package/dist/src/plugin/request-helpers.d.ts.map +1 -1
- package/dist/src/plugin/request-helpers.js +11 -2
- package/dist/src/plugin/request-helpers.js.map +1 -1
- package/dist/src/plugin/shared/request-services.d.ts +10 -1
- package/dist/src/plugin/shared/request-services.d.ts.map +1 -1
- package/dist/src/plugin/shared/request-services.js +125 -22
- package/dist/src/plugin/shared/request-services.js.map +1 -1
- package/dist/src/plugin/shared/runtime.d.ts +15 -0
- package/dist/src/plugin/shared/runtime.d.ts.map +1 -1
- package/dist/src/plugin/shared/runtime.js +43 -11
- package/dist/src/plugin/shared/runtime.js.map +1 -1
- package/dist/src/plugin/shared/vault-billing.d.ts +30 -0
- package/dist/src/plugin/shared/vault-billing.d.ts.map +1 -0
- package/dist/src/plugin/shared/vault-billing.js +196 -0
- package/dist/src/plugin/shared/vault-billing.js.map +1 -0
- package/dist/src/plugin/shared/vault-menu.d.ts +11 -1
- package/dist/src/plugin/shared/vault-menu.d.ts.map +1 -1
- package/dist/src/plugin/shared/vault-menu.js +33 -7
- package/dist/src/plugin/shared/vault-menu.js.map +1 -1
- package/dist/src/plugin/vault-custody.d.ts.map +1 -1
- package/dist/src/plugin/vault-custody.js +3 -0
- package/dist/src/plugin/vault-custody.js.map +1 -1
- package/dist/src/settings/core-settings.d.ts +7 -0
- package/dist/src/settings/core-settings.d.ts.map +1 -0
- package/dist/src/settings/core-settings.js +7 -0
- package/dist/src/settings/core-settings.js.map +1 -0
- package/dist/src/settings/legacy.d.ts +89 -0
- package/dist/src/settings/legacy.d.ts.map +1 -0
- package/dist/src/settings/legacy.js +184 -0
- package/dist/src/settings/legacy.js.map +1 -0
- package/dist/src/settings/location.d.ts +22 -0
- package/dist/src/settings/location.d.ts.map +1 -0
- package/dist/src/settings/location.js +49 -0
- package/dist/src/settings/location.js.map +1 -0
- package/dist/src/settings/move.d.ts +38 -0
- package/dist/src/settings/move.d.ts.map +1 -0
- package/dist/src/settings/move.js +83 -0
- package/dist/src/settings/move.js.map +1 -0
- package/dist/src/settings/protection.d.ts +11 -0
- package/dist/src/settings/protection.d.ts.map +1 -0
- package/dist/src/settings/protection.js +17 -0
- package/dist/src/settings/protection.js.map +1 -0
- package/dist/src/settings/report.d.ts +33 -0
- package/dist/src/settings/report.d.ts.map +1 -0
- package/dist/src/settings/report.js +103 -0
- package/dist/src/settings/report.js.map +1 -0
- package/dist/src/settings/runtime.d.ts +145 -0
- package/dist/src/settings/runtime.d.ts.map +1 -0
- package/dist/src/settings/runtime.js +697 -0
- package/dist/src/settings/runtime.js.map +1 -0
- package/dist/src/setup.d.ts.map +1 -1
- package/dist/src/setup.js +12 -0
- package/dist/src/setup.js.map +1 -1
- package/dist/tui-build-map.json +1 -1
- package/dist/tui-ga-build-map.json +5 -5
- package/dist/types/src/common-auth-embedded/claustrum/enrollment.d.ts +25 -4
- package/dist/types/src/common-auth-embedded/claustrum/index.d.ts +1 -1
- package/dist/types/src/common-auth-embedded/commands/builtins.d.ts +20 -1
- package/dist/types/src/common-auth-embedded/commands/index.d.ts +1 -1
- package/dist/types/src/common-auth-embedded/commands/menu.d.ts +6 -1
- package/dist/types/src/common-auth-embedded/fs/refresh-file-lock.d.ts +11 -0
- package/dist/types/src/common-auth-embedded/setup/command-error.d.ts +1 -1
- package/dist/types/src/common-auth-embedded/setup/enroll.d.ts +2 -2
- package/dist/types/src/common-auth-embedded/setup/index.d.ts +1 -1
- package/dist/types/src/common-auth-embedded/setup/types.d.ts +16 -1
- package/dist/types/src/plugin/command-apply.d.ts +43 -3
- package/dist/types/src/plugin/command-apply.d.ts.map +1 -1
- package/dist/types/src/plugin/commands.d.ts +5 -1
- package/dist/types/src/plugin/commands.d.ts.map +1 -1
- package/dist/types/src/plugin/config/writer.d.ts +10 -3
- package/dist/types/src/plugin/config/writer.d.ts.map +1 -1
- package/dist/types/src/plugin/fetch-interceptor.d.ts +8 -3
- package/dist/types/src/plugin/fetch-interceptor.d.ts.map +1 -1
- package/dist/types/src/plugin/ga-location-services.d.ts +3 -1
- package/dist/types/src/plugin/ga-location-services.d.ts.map +1 -1
- package/dist/types/src/plugin/index.d.ts.map +1 -1
- package/dist/types/src/plugin/killswitch.d.ts +20 -0
- package/dist/types/src/plugin/killswitch.d.ts.map +1 -1
- package/dist/types/src/plugin/logger.d.ts +3 -1
- package/dist/types/src/plugin/logger.d.ts.map +1 -1
- package/dist/types/src/plugin/operator-settings.d.ts +6 -0
- package/dist/types/src/plugin/operator-settings.d.ts.map +1 -1
- package/dist/types/src/plugin/request-helpers.d.ts +5 -0
- package/dist/types/src/plugin/request-helpers.d.ts.map +1 -1
- package/dist/types/src/plugin/shared/request-services.d.ts +10 -1
- package/dist/types/src/plugin/shared/request-services.d.ts.map +1 -1
- package/dist/types/src/plugin/shared/runtime.d.ts +15 -0
- package/dist/types/src/plugin/shared/runtime.d.ts.map +1 -1
- package/dist/types/src/plugin/shared/vault-billing.d.ts +30 -0
- package/dist/types/src/plugin/shared/vault-billing.d.ts.map +1 -0
- package/dist/types/src/plugin/shared/vault-menu.d.ts +11 -1
- package/dist/types/src/plugin/shared/vault-menu.d.ts.map +1 -1
- package/dist/types/src/plugin/vault-custody.d.ts.map +1 -1
- package/dist/types/src/settings/core-settings.d.ts +7 -0
- package/dist/types/src/settings/core-settings.d.ts.map +1 -0
- package/dist/types/src/settings/legacy.d.ts +89 -0
- package/dist/types/src/settings/legacy.d.ts.map +1 -0
- package/dist/types/src/settings/location.d.ts +22 -0
- package/dist/types/src/settings/location.d.ts.map +1 -0
- package/dist/types/src/settings/move.d.ts +38 -0
- package/dist/types/src/settings/move.d.ts.map +1 -0
- package/dist/types/src/settings/protection.d.ts +11 -0
- package/dist/types/src/settings/protection.d.ts.map +1 -0
- package/dist/types/src/settings/report.d.ts +33 -0
- package/dist/types/src/settings/report.d.ts.map +1 -0
- package/dist/types/src/settings/runtime.d.ts +145 -0
- package/dist/types/src/settings/runtime.d.ts.map +1 -0
- package/dist/types/src/setup.d.ts.map +1 -1
- package/package.json +4 -3
- package/src/common-auth-embedded/claustrum/enrollment.d.ts +25 -4
- package/src/common-auth-embedded/claustrum/enrollment.js +81 -4
- package/src/common-auth-embedded/claustrum/index.d.ts +1 -1
- package/src/common-auth-embedded/claustrum/index.js +1 -1
- package/src/common-auth-embedded/commands/builtins.d.ts +20 -1
- package/src/common-auth-embedded/commands/builtins.js +28 -12
- package/src/common-auth-embedded/commands/index.d.ts +1 -1
- package/src/common-auth-embedded/commands/menu.d.ts +6 -1
- package/src/common-auth-embedded/commands/menu.js +1 -0
- package/src/common-auth-embedded/fs/file-read-cache.js +9 -5
- package/src/common-auth-embedded/fs/refresh-file-lock.d.ts +11 -0
- package/src/common-auth-embedded/fs/refresh-file-lock.js +146 -2
- package/src/common-auth-embedded/fs/with-lock.d.ts +2 -0
- package/src/common-auth-embedded/fs/with-lock.js +1 -1
- package/src/common-auth-embedded/settings/define.d.ts +35 -0
- package/src/common-auth-embedded/settings/define.js +52 -0
- package/src/common-auth-embedded/settings/descriptors.d.ts +97 -0
- package/src/common-auth-embedded/settings/descriptors.js +81 -0
- package/src/common-auth-embedded/settings/edit.d.ts +24 -0
- package/src/common-auth-embedded/settings/edit.js +229 -0
- package/src/common-auth-embedded/settings/fs.js +19 -0
- package/src/common-auth-embedded/settings/handle.d.ts +30 -0
- package/src/common-auth-embedded/settings/handle.js +228 -0
- package/src/common-auth-embedded/settings/index.d.ts +10 -0
- package/src/common-auth-embedded/settings/index.js +7 -0
- package/src/common-auth-embedded/settings/lock-errors.js +15 -0
- package/src/common-auth-embedded/settings/move.d.ts +76 -0
- package/src/common-auth-embedded/settings/move.js +351 -0
- package/src/common-auth-embedded/settings/parse.d.ts +24 -0
- package/src/common-auth-embedded/settings/parse.js +65 -0
- package/src/common-auth-embedded/settings/paths.d.ts +12 -0
- package/src/common-auth-embedded/settings/paths.js +48 -0
- package/src/common-auth-embedded/settings/refusal.d.ts +7 -0
- package/src/common-auth-embedded/settings/refusal.js +15 -0
- package/src/common-auth-embedded/settings/resolve.d.ts +15 -0
- package/src/common-auth-embedded/settings/resolve.js +51 -0
- package/src/common-auth-embedded/settings/schema.d.ts +29 -0
- package/src/common-auth-embedded/settings/schema.js +81 -0
- package/src/common-auth-embedded/settings/snapshot.d.ts +24 -0
- package/src/common-auth-embedded/settings/snapshot.js +150 -0
- package/src/common-auth-embedded/settings/update.js +139 -0
- package/src/common-auth-embedded/settings/write.js +88 -0
- package/src/common-auth-embedded/setup/command-error.d.ts +1 -1
- package/src/common-auth-embedded/setup/command-error.js +4 -2
- package/src/common-auth-embedded/setup/command.js +23 -6
- package/src/common-auth-embedded/setup/enroll.d.ts +2 -2
- package/src/common-auth-embedded/setup/enroll.js +13 -3
- package/src/common-auth-embedded/setup/enrollment-access.js +86 -0
- package/src/common-auth-embedded/setup/index.d.ts +1 -1
- package/src/common-auth-embedded/setup/types.d.ts +16 -1
- package/src/common-auth-embedded/source-output.json +314 -70
- package/src/common-auth-embedded/tui-prefs/watcher.js +196 -0
- package/src/tui-ga-compiled/host-ga.js +1 -1
- package/src/tui-ga-raw/host-ga.tsx +1 -1
|
@@ -18,6 +18,7 @@
|
|
|
18
18
|
*/
|
|
19
19
|
import { createHash } from 'node:crypto';
|
|
20
20
|
import { accessTokenExpired, calculateBackoffMs, computeSoftQuotaCacheTtlMs, getPublicModelDefinitions, getQuotaKey, getResolverAliasMap, isClaudeThinkingModel, isImageGenerationModel, isRetiredAgyModel, PRE_RESPONSE_DEADLINE_MS, PreResponseDeadline, PreResponseTimeoutError, parseRateLimitReason, parseRefreshParts, preResponseTimeoutResponse, preserveResponseMetadata, RETIRED_AGY_MODEL_MESSAGE, redactCredentialError, redactCredentialResponse, redactCredentialText, resolveQuotaGroup, VAULT_ACCOUNT_REMEDY, } from '@cortexkit/antigravity-auth-core';
|
|
21
|
+
import { hasVaultHost } from '../../common-auth-embedded/claustrum/host.js';
|
|
21
22
|
import { askRouting, } from '../../common-auth-embedded/routing-accessor/index.js';
|
|
22
23
|
import { ANTIGRAVITY_ENDPOINT_DAILY, ANTIGRAVITY_ENDPOINT_FALLBACKS, } from '../../constants';
|
|
23
24
|
import { AntigravityKillswitchError } from '../errors';
|
|
@@ -31,6 +32,7 @@ import { extractOpenCodeSessionIdentity, } from '../session-context';
|
|
|
31
32
|
import { createAfterHandoff, } from "./after-handoff.js";
|
|
32
33
|
import { isLocalGrantError, LocalGrantSupersededError, } from './local-grant';
|
|
33
34
|
import { createRequestCancellation, retainResponseLifetime, } from './request-cancellation';
|
|
35
|
+
import { VaultBillingAttempt } from './vault-billing';
|
|
34
36
|
import { hasVaultRoutingAccessor, observeVaultServed, observeVaultUpstream, reportVaultExhaustion, } from './vault-routing';
|
|
35
37
|
import { isPrimaryVaultRequest } from './vault-routing-purpose';
|
|
36
38
|
/**
|
|
@@ -39,6 +41,11 @@ import { isPrimaryVaultRequest } from './vault-routing-purpose';
|
|
|
39
41
|
const FIRST_RETRY_DELAY_MS = 1000;
|
|
40
42
|
// Re-probe within an hour even when no quota refresh has revealed a new allowance.
|
|
41
43
|
const MODEL_UNAVAILABLE_TTL_MS = 60 * 60 * 1000;
|
|
44
|
+
// Routing is asked once, when a session is first placed, and its answer holds
|
|
45
|
+
// for the whole session, so a slow answer that misses the deadline is costly
|
|
46
|
+
// while the wait itself is rare. Use the routing accessor's 2 s ceiling, well
|
|
47
|
+
// above routing's normal admission time.
|
|
48
|
+
const ROUTING_ASK_DEADLINE_MS = 2000;
|
|
42
49
|
/**
|
|
43
50
|
* Prepares one upstream Antigravity request: payload transforms, AGY
|
|
44
51
|
* metadata and envelope, header order and the endpoint URL. It is the single
|
|
@@ -229,7 +236,7 @@ export function createLocalQuotaRefresh(accountManager, quotaManager, log) {
|
|
|
229
236
|
* warmup bookkeeping, so disposing it releases every counter.
|
|
230
237
|
*/
|
|
231
238
|
export function createRequestExecutor(deps) {
|
|
232
|
-
const { config, accounts: accountManager, credentials, sessions: agySessionRegistry, operatorSettings, transport: defaultTransport, wire, debug, dump, logger: log, trackers, classifyAccessError, notify, onRouting, } = deps;
|
|
239
|
+
const { config, accounts: accountManager, credentials, sessions: agySessionRegistry, operatorSettings, modelAccess, transport: defaultTransport, wire, debug, dump, logger: log, trackers, classifyAccessError, notify, onRouting, } = deps;
|
|
233
240
|
const retryState = createRetryState();
|
|
234
241
|
const warmupState = createWarmupState();
|
|
235
242
|
// One executor serves every request of its interceptor/location pipeline.
|
|
@@ -269,6 +276,25 @@ export function createRequestExecutor(deps) {
|
|
|
269
276
|
]);
|
|
270
277
|
};
|
|
271
278
|
const tierOf = (account) => JSON.stringify([account.capturedTierId, account.capturedPaidTierId]);
|
|
279
|
+
/**
|
|
280
|
+
* Indexes of the accounts whose `account_models` list forbids `model`.
|
|
281
|
+
* Lists are keyed by the account's stable id: the vault roster route id or
|
|
282
|
+
* the local store row id. A row with neither (a pool-file account) has no
|
|
283
|
+
* list, so only a deny-all policy excludes it. The policy canonicalizes the
|
|
284
|
+
* model itself, so tier suffixes and aliases are matched as the model they
|
|
285
|
+
* resolve to.
|
|
286
|
+
*/
|
|
287
|
+
const modelAccessExcluded = (model) => {
|
|
288
|
+
const policy = modelAccess?.();
|
|
289
|
+
if (!policy)
|
|
290
|
+
return undefined;
|
|
291
|
+
const excluded = new Set();
|
|
292
|
+
for (const row of accountManager.getAccounts()) {
|
|
293
|
+
if (!policy.allows(row.route?.routeId ?? row.ref?.id, model ?? ''))
|
|
294
|
+
excluded.add(row.index);
|
|
295
|
+
}
|
|
296
|
+
return excluded.size > 0 ? excluded : undefined;
|
|
297
|
+
};
|
|
272
298
|
const dropModel = (key, model, cause) => {
|
|
273
299
|
const entries = unavailableModels.get(key);
|
|
274
300
|
const entry = entries?.get(model);
|
|
@@ -464,6 +490,7 @@ export function createRequestExecutor(deps) {
|
|
|
464
490
|
}
|
|
465
491
|
: undefined;
|
|
466
492
|
const isChildRequest = requestSessionIdentity.parentSessionId !== null;
|
|
493
|
+
let physicalSendCount = 0;
|
|
467
494
|
if (accountManager.getAccountCount() === 0) {
|
|
468
495
|
// Surface a real 401 with the Google error envelope instead of a
|
|
469
496
|
// 200 SSE body — OpenCode's HTTP layer treats 200 as success and
|
|
@@ -561,31 +588,69 @@ export function createRequestExecutor(deps) {
|
|
|
561
588
|
return createNoAccountResponse('No Antigravity accounts available. Run `opencode auth login`.', model ?? 'unknown');
|
|
562
589
|
}
|
|
563
590
|
const softQuotaCacheTtlMs = computeSoftQuotaCacheTtlMs(config.soft_quota_cache_ttl_minutes, config.quota_refresh_interval_minutes);
|
|
591
|
+
// Per-account model lists (`account_models`): an account whose list
|
|
592
|
+
// forbids this model is out of this selection pass before anything
|
|
593
|
+
// else looks at it. It is not a rate limit or cooldown, so nothing is
|
|
594
|
+
// marked and no wait estimate counts it as coming back.
|
|
595
|
+
const allowlistExcluded = modelAccessExcluded(model);
|
|
596
|
+
if (allowlistExcluded) {
|
|
597
|
+
const serviceable = accountManager
|
|
598
|
+
.getAccounts()
|
|
599
|
+
.filter((entry) => entry.enabled !== false &&
|
|
600
|
+
!entry.accountIneligible &&
|
|
601
|
+
!entry.verificationRequired);
|
|
602
|
+
if (serviceable.length > 0 &&
|
|
603
|
+
serviceable.every((entry) => allowlistExcluded.has(entry.index))) {
|
|
604
|
+
// Account details stay out of this log line and the refusal.
|
|
605
|
+
pushDebug(`model-access: all ${serviceable.length} serviceable account(s) excluded`);
|
|
606
|
+
log.warn('model-access-all-excluded', {
|
|
607
|
+
family,
|
|
608
|
+
model,
|
|
609
|
+
accounts: serviceable.length,
|
|
610
|
+
});
|
|
611
|
+
return createNativeGoogleErrorResponse({
|
|
612
|
+
status: 412,
|
|
613
|
+
reason: 'model_unavailable',
|
|
614
|
+
setting: 'account_models',
|
|
615
|
+
});
|
|
616
|
+
}
|
|
617
|
+
}
|
|
618
|
+
const permittedAccounts = allowlistExcluded
|
|
619
|
+
? accountManager
|
|
620
|
+
.getAccounts()
|
|
621
|
+
.filter((entry) => !allowlistExcluded.has(entry.index))
|
|
622
|
+
: accountManager.getAccounts();
|
|
564
623
|
// Operator killswitch: an account whose cached remaining quota for
|
|
565
624
|
// this model's quota group is below the configured floor is not
|
|
566
625
|
// eligible. Missing or stale quota counts as eligible, so a cold
|
|
567
|
-
// start cannot block every account.
|
|
626
|
+
// start cannot block every account. Only the accounts the model lists
|
|
627
|
+
// permit are evaluated, so all permitted accounts below their floor
|
|
628
|
+
// end in the operator refusal.
|
|
568
629
|
const operatorKillswitch = operatorSettings?.get().killswitch;
|
|
630
|
+
const floorKeying = operatorSettings?.floorKeying?.();
|
|
569
631
|
const eligibleIndexes = operatorKillswitch?.enabled
|
|
570
|
-
? new Set(
|
|
571
|
-
.getAccounts()
|
|
632
|
+
? new Set(permittedAccounts
|
|
572
633
|
.filter((entry) => {
|
|
573
634
|
const decision = evaluateKillswitchForAccount(entry, family, {
|
|
574
635
|
killswitch: operatorKillswitch,
|
|
575
636
|
log_level: 'info',
|
|
576
|
-
}, {
|
|
637
|
+
}, {
|
|
638
|
+
now: Date.now(),
|
|
639
|
+
model,
|
|
640
|
+
...(floorKeying ? { floorKeying } : {}),
|
|
641
|
+
});
|
|
577
642
|
return decision.allowed;
|
|
578
643
|
})
|
|
579
644
|
.map((entry) => entry.index))
|
|
580
645
|
: null;
|
|
581
646
|
if (eligibleIndexes !== null &&
|
|
582
647
|
eligibleIndexes.size === 0 &&
|
|
583
|
-
|
|
648
|
+
permittedAccounts.length > 0) {
|
|
584
649
|
try {
|
|
585
650
|
throwIfAllKilled({
|
|
586
651
|
family,
|
|
587
652
|
model: model ?? 'unknown',
|
|
588
|
-
accounts:
|
|
653
|
+
accounts: permittedAccounts,
|
|
589
654
|
settings: {
|
|
590
655
|
killswitch: operatorKillswitch ?? {
|
|
591
656
|
enabled: false,
|
|
@@ -594,6 +659,7 @@ export function createRequestExecutor(deps) {
|
|
|
594
659
|
log_level: 'info',
|
|
595
660
|
},
|
|
596
661
|
quotaModel: model,
|
|
662
|
+
...(floorKeying ? { floorKeying } : {}),
|
|
597
663
|
});
|
|
598
664
|
}
|
|
599
665
|
catch (error) {
|
|
@@ -631,6 +697,7 @@ export function createRequestExecutor(deps) {
|
|
|
631
697
|
.filter((entry) => entry.enabled !== false &&
|
|
632
698
|
!entry.accountIneligible &&
|
|
633
699
|
!entry.verificationRequired &&
|
|
700
|
+
!allowlistExcluded?.has(entry.index) &&
|
|
634
701
|
(eligibleIndexes === null || eligibleIndexes.has(entry.index)));
|
|
635
702
|
if (candidates.length > 0 &&
|
|
636
703
|
candidates.every((entry) => unavailableIndexes.has(entry.index))) {
|
|
@@ -649,9 +716,13 @@ export function createRequestExecutor(deps) {
|
|
|
649
716
|
});
|
|
650
717
|
}
|
|
651
718
|
}
|
|
652
|
-
const excludedIndexes = unavailableIndexes.size === 0
|
|
719
|
+
const excludedIndexes = unavailableIndexes.size === 0 && !allowlistExcluded
|
|
653
720
|
? killedIndexes
|
|
654
|
-
: new Set([
|
|
721
|
+
: new Set([
|
|
722
|
+
...(killedIndexes ?? []),
|
|
723
|
+
...unavailableIndexes,
|
|
724
|
+
...(allowlistExcluded ?? []),
|
|
725
|
+
]);
|
|
655
726
|
const routingPresent = credentials.domain === 'vault' && hasVaultRoutingAccessor();
|
|
656
727
|
const firstPlacement = routingPresent &&
|
|
657
728
|
!routingPlacementConsidered &&
|
|
@@ -685,10 +756,12 @@ export function createRequestExecutor(deps) {
|
|
|
685
756
|
provider: 'antigravity',
|
|
686
757
|
modelId: model,
|
|
687
758
|
candidates,
|
|
688
|
-
deadlineMs: Math.min(
|
|
759
|
+
deadlineMs: Math.min(ROUTING_ASK_DEADLINE_MS, deadline.remainingMs()),
|
|
689
760
|
}));
|
|
690
761
|
checkAborted();
|
|
691
|
-
if (answer &&
|
|
762
|
+
if (answer &&
|
|
763
|
+
answer.candidate.index !== account.index &&
|
|
764
|
+
!excludedIndexes?.has(answer.candidate.index)) {
|
|
692
765
|
// Re-run the selector to validate routing's choice and update the session's selected account.
|
|
693
766
|
account =
|
|
694
767
|
accountManager.getCurrentOrNextForFamily(family, model, config.account_selection_strategy, config.pid_offset_enabled, config.soft_quota_threshold_percent, softQuotaCacheTtlMs, accountSessionIdentity, new Set([
|
|
@@ -702,7 +775,12 @@ export function createRequestExecutor(deps) {
|
|
|
702
775
|
}
|
|
703
776
|
}
|
|
704
777
|
}
|
|
705
|
-
// The selected account must be inside the eligibility mask
|
|
778
|
+
// The selected account must be inside the eligibility mask and
|
|
779
|
+
// permitted by its model list.
|
|
780
|
+
if (account && allowlistExcluded?.has(account.index)) {
|
|
781
|
+
pushDebug(`model-access-excluded idx=${account.index}`);
|
|
782
|
+
account = null;
|
|
783
|
+
}
|
|
706
784
|
if (account &&
|
|
707
785
|
eligibleIndexes !== null &&
|
|
708
786
|
!eligibleIndexes.has(account.index)) {
|
|
@@ -1041,6 +1119,34 @@ export function createRequestExecutor(deps) {
|
|
|
1041
1119
|
}
|
|
1042
1120
|
}
|
|
1043
1121
|
const selected = account;
|
|
1122
|
+
const sendPhysical = async (url, sendInit, admission, sendModel, requestKind) => {
|
|
1123
|
+
const source = credentials.domain === 'local'
|
|
1124
|
+
? 'local'
|
|
1125
|
+
: hasVaultHost()
|
|
1126
|
+
? 'hosted'
|
|
1127
|
+
: 'vault';
|
|
1128
|
+
const message = `request-send source=${source} model=${sendModel} account=Account ${account.index + 1}`;
|
|
1129
|
+
if (source === 'local')
|
|
1130
|
+
log.info(message);
|
|
1131
|
+
else
|
|
1132
|
+
(log.hostInfo ?? log.info)(message);
|
|
1133
|
+
const attempt = ++physicalSendCount;
|
|
1134
|
+
const sessionId = requestSessionIdentity.sessionId;
|
|
1135
|
+
const billing = admission && sessionId && hasVaultRoutingAccessor()
|
|
1136
|
+
? new VaultBillingAttempt(sessionId, admission, requestKind, sendModel, attempt, abortSignal)
|
|
1137
|
+
: undefined;
|
|
1138
|
+
try {
|
|
1139
|
+
const response = await transport(url, sendInit, {
|
|
1140
|
+
signal: abortSignal,
|
|
1141
|
+
onDebug: pushDebug,
|
|
1142
|
+
});
|
|
1143
|
+
return billing?.observe(response) ?? response;
|
|
1144
|
+
}
|
|
1145
|
+
catch (error) {
|
|
1146
|
+
billing?.end(false);
|
|
1147
|
+
throw error;
|
|
1148
|
+
}
|
|
1149
|
+
};
|
|
1044
1150
|
// Credentials for one auxiliary physical send (thinking warmup or cache
|
|
1045
1151
|
// probe) built from a prepared request. Local: the selection's grant
|
|
1046
1152
|
// must still be the row's current credential. Vault: a fresh admission
|
|
@@ -1102,10 +1208,7 @@ export function createRequestExecutor(deps) {
|
|
|
1102
1208
|
try {
|
|
1103
1209
|
pushDebug('thinking-warmup: start');
|
|
1104
1210
|
const warmupSend = await credentialForAuxiliarySend(warmupInit, projectId);
|
|
1105
|
-
const warmupResponse = await
|
|
1106
|
-
signal: abortSignal,
|
|
1107
|
-
onDebug: pushDebug,
|
|
1108
|
-
});
|
|
1211
|
+
const warmupResponse = await sendPhysical(warmupUrl, warmupSend.init, warmupSend.admission, prepared.effectiveModel ?? model ?? 'unknown', 'prime');
|
|
1109
1212
|
reportVault401(warmupSend.admission, warmupResponse.status);
|
|
1110
1213
|
const transformed = await deadline.wait(() => wire.transformResponse(warmupResponse, true, warmupDebugContext, prepared.requestedModel, projectId, warmupUrl, prepared.effectiveModel, prepared.sessionId));
|
|
1111
1214
|
await deadline.wait(() => transformed.text());
|
|
@@ -1134,10 +1237,7 @@ export function createRequestExecutor(deps) {
|
|
|
1134
1237
|
try {
|
|
1135
1238
|
pushDebug('cache-warmup-probe: start');
|
|
1136
1239
|
const probeSend = await credentialForAuxiliarySend({ ...prepared.init, method: 'POST', body: bodyStr }, prepared.projectId ?? '');
|
|
1137
|
-
const probeResponse = await
|
|
1138
|
-
signal: abortSignal,
|
|
1139
|
-
onDebug: pushDebug,
|
|
1140
|
-
});
|
|
1240
|
+
const probeResponse = await sendPhysical(toUrlString(prepared.request), probeSend.init, probeSend.admission, prepared.effectiveModel ?? model ?? 'unknown', 'keep_warm');
|
|
1141
1241
|
reportVault401(probeSend.admission, probeResponse.status);
|
|
1142
1242
|
if (probeResponse.body) {
|
|
1143
1243
|
const reader = probeResponse.body.getReader();
|
|
@@ -1309,7 +1409,7 @@ export function createRequestExecutor(deps) {
|
|
|
1309
1409
|
}
|
|
1310
1410
|
pushDebug(`dispatching request via ${prepared.headerStyle} transport`);
|
|
1311
1411
|
physicalAttemptStarted = true;
|
|
1312
|
-
const response = await
|
|
1412
|
+
const response = await sendPhysical(toUrlString(prepared.request), prepared.init, sendAdmission, prepared.effectiveModel ?? model ?? 'unknown', kind ?? 'primary');
|
|
1313
1413
|
if (response.ok)
|
|
1314
1414
|
deadline.acceptHeaders();
|
|
1315
1415
|
apiRequestCount++;
|
|
@@ -1623,7 +1723,10 @@ export function createRequestExecutor(deps) {
|
|
|
1623
1723
|
if (!advisoryClosing &&
|
|
1624
1724
|
proactiveThreshold > 0 &&
|
|
1625
1725
|
accountManager.shouldProactivelyRotate(family, model, proactiveThreshold, softQuotaCacheTtlMs, accountSessionIdentity)) {
|
|
1626
|
-
const rotated = accountManager.proactivelyRotateForFamily(family, model, config.soft_quota_threshold_percent, softQuotaCacheTtlMs, accountSessionIdentity
|
|
1726
|
+
const rotated = accountManager.proactivelyRotateForFamily(family, model, config.soft_quota_threshold_percent, softQuotaCacheTtlMs, accountSessionIdentity,
|
|
1727
|
+
// Never pre-switch to an account this pass excluded, such
|
|
1728
|
+
// as one whose model list forbids this model.
|
|
1729
|
+
excludedIndexes);
|
|
1627
1730
|
if (rotated) {
|
|
1628
1731
|
const remaining = account.cachedQuota?.[resolveQuotaGroup(family, model, account.cachedQuota)]?.remainingFraction;
|
|
1629
1732
|
const remainingPct = remaining != null ? `${(remaining * 100).toFixed(1)}%` : '?';
|