@bitkyc08/opencodex 2.99.0 → 2.100.0
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/AGENTS_INSTALL.md +19 -1
- package/README.md +37 -33
- package/SPONSORS.md +5 -1
- package/bin/ocx.mjs +1 -1
- package/gui/dist/assets/{App-C1hGwaN1.css → App-COo8Yopd.css} +1 -1
- package/gui/dist/assets/App-CitvEefy.js +59 -0
- package/gui/dist/assets/Tray-CeKVWQyB.js +1 -0
- package/gui/dist/assets/{brand-mark-wzPe3R-J.js → brand-mark-M92UnxX2.js} +1 -1
- package/gui/dist/assets/index-BP47do6-.js +94 -0
- package/gui/dist/assets/index-DmDooSAG.css +2 -0
- package/gui/dist/assets/{segment-thumb-features-fYEMxBaW.js → segment-thumb-features-CcxZBnxv.js} +1 -1
- package/gui/dist/classic/assets/App-aYgIQMxI.js +58 -0
- package/gui/dist/classic/assets/{Tray-BqZueZOx.js → Tray-D8jfUXpQ.js} +1 -1
- package/gui/dist/classic/assets/index-CfGqHooN.js +94 -0
- package/gui/dist/classic/assets/quota-summary-R-ih7OlS.js +1 -0
- package/gui/dist/classic/index.html +1 -1
- package/gui/dist/index.html +2 -2
- package/native/ocx-child/Cargo.lock +215 -0
- package/native/ocx-child/Cargo.toml +31 -0
- package/native/ocx-child/src/cli.rs +1901 -0
- package/native/ocx-child/src/codex_home.rs +429 -0
- package/native/ocx-child/src/codex_settings.rs +231 -0
- package/native/ocx-child/src/daemon.rs +363 -0
- package/native/ocx-child/src/http_wire.rs +619 -0
- package/native/ocx-child/src/journal.rs +977 -0
- package/native/ocx-child/src/lib.rs +22 -0
- package/native/ocx-child/src/main.rs +9 -0
- package/native/ocx-child/src/parity.rs +102 -0
- package/native/ocx-child/src/platform.rs +1487 -0
- package/native/ocx-child/src/relay.rs +1288 -0
- package/native/ocx-child/src/relay_auth.rs +166 -0
- package/native/ocx-child/src/routes.rs +236 -0
- package/native/ocx-child/src/state.rs +190 -0
- package/native/ocx-child/src/test_hooks.rs +58 -0
- package/native/ocx-child/src/toml_surgeon.rs +1156 -0
- package/package.json +8 -2
- package/src/adapters/anthropic.ts +28 -2
- package/src/adapters/claude-cli/adapter.ts +5 -25
- package/src/adapters/claude-cli/instruction-images.ts +31 -0
- package/src/adapters/claude-cli/stable-replay.ts +42 -14
- package/src/adapters/claude-cli/usage-admission.ts +53 -64
- package/src/adapters/coding-agent/protocol.ts +1 -1
- package/src/adapters/devin/live-models.ts +3 -0
- package/src/adapters/google-http.ts +3 -0
- package/src/adapters/google-vertex-key-project.ts +10 -2
- package/src/adapters/google.ts +40 -8
- package/src/adapters/kiro/usage.ts +3 -13
- package/src/adapters/openai-responses/passthrough.ts +5 -2
- package/src/adapters/openai-responses/request-strips.ts +32 -0
- package/src/adapters/openai-responses/tool-schema.ts +9 -4
- package/src/chat/inbound.ts +1 -1
- package/src/claude/auth-detect.ts +26 -8
- package/src/claude/inbound-content-options.ts +18 -3
- package/src/claude/inbound.ts +5 -2
- package/src/cli/bundled-bun-diagnostic.ts +91 -0
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-observe-system.ts +60 -0
- package/src/cli/combo-input.ts +6 -0
- package/src/cli/combo-result.ts +1 -1
- package/src/cli/combo.ts +4 -0
- package/src/cli/config-command.ts +16 -2
- package/src/cli/connect.ts +12 -10
- package/src/cli/dispatch.ts +4 -0
- package/src/cli/doctor.ts +11 -0
- package/src/cli/help.ts +1 -0
- package/src/cli/init.ts +4 -0
- package/src/cli/link-enrollment.ts +152 -25
- package/src/cli/link-local-control.ts +49 -0
- package/src/cli/link.ts +37 -10
- package/src/cli/provider-lifecycle-runtime.ts +4 -2
- package/src/cli/registry.ts +13 -0
- package/src/cli/star-prompt.ts +2 -0
- package/src/cli/status.ts +1 -1
- package/src/cli/telemetry-profile.ts +206 -0
- package/src/cli/telemetry.ts +260 -0
- package/src/client/hub-relay.ts +26 -0
- package/src/client/machine-api.ts +3 -0
- package/src/clients/config-export/t3code.ts +44 -5
- package/src/clients/omo-role-models.ts +1 -1
- package/src/codex/catalog/bundled.ts +44 -2
- package/src/codex/runtime.ts +12 -0
- package/src/codex/shim-restore-lock.ts +67 -30
- package/src/combos/types.ts +21 -1
- package/src/config/atomic-write.ts +24 -1
- package/src/config/diagnostics.ts +15 -0
- package/src/config/live-reconcile.ts +17 -0
- package/src/config/load-degrade.ts +16 -0
- package/src/config/provider-validation.ts +29 -0
- package/src/config/schema/config-schema.ts +24 -0
- package/src/config/schema/leaf-validators.ts +17 -0
- package/src/config/telemetry-carry.ts +30 -0
- package/src/config.ts +13 -1
- package/src/generated/compatibility-version.json +405 -153
- package/src/generated/model-metadata.ts +3 -3
- package/src/integrations/aside-profiles.ts +7 -1
- package/src/integrations/owned-refresh.ts +9 -2
- package/src/lab/artifacts/secure-fs.ts +12 -11
- package/src/lab/fabric/scratch.ts +11 -9
- package/src/lab/public/community.ts +2 -3
- package/src/lab/public/file-safety.ts +18 -20
- package/src/lab/public/mutation-lock.ts +109 -337
- package/src/lab/public/private-file.ts +4 -3
- package/src/lib/bun-runtime-preflight.ts +1 -1
- package/src/lib/codex-catalog-read-only.ts +122 -0
- package/src/lib/config-ownership.ts +49 -18
- package/src/lib/errors.ts +11 -0
- package/src/lib/gcp-adc.ts +167 -48
- package/src/lib/jsonc.ts +4 -2
- package/src/lib/local-control-socket.ts +88 -0
- package/src/lib/privacy.ts +15 -0
- package/src/lib/provider-client-headers.ts +3 -0
- package/src/lib/token-estimate.ts +13 -2
- package/src/link/child-binary-source.ts +228 -0
- package/src/link/ephemeral-child.ts +45 -0
- package/src/link/remote-plant.ts +306 -0
- package/src/link/remote-windows.ts +59 -5
- package/src/link/ssh-argv.ts +71 -8
- package/src/link/status-projection.ts +2 -0
- package/src/link/store.ts +5 -1
- package/src/oauth/claude-keychain-read.ts +165 -0
- package/src/oauth/local-token-detect.ts +14 -17
- package/src/protocols/envelope.ts +20 -2
- package/src/providers/api-key-selection.ts +8 -2
- package/src/providers/claude-cli-usage-state.ts +93 -0
- package/src/providers/github-copilot-auto.ts +25 -5
- package/src/providers/meta-muse-plan-refusal.ts +94 -0
- package/src/providers/model-rename-fields.ts +3 -0
- package/src/providers/quota/vendor-probes-key.ts +23 -4
- package/src/providers/quota/vendor-probes-oauth.ts +59 -0
- package/src/providers/quota/workbuddy.ts +2 -2
- package/src/providers/quota.ts +25 -18
- package/src/providers/registry/entries-core.ts +7 -4
- package/src/providers/registry/entries-extended.ts +39 -7
- package/src/providers/registry/model-seeds.ts +10 -2
- package/src/providers/resolved-model-policy.ts +4 -0
- package/src/providers/routed-config.ts +30 -3
- package/src/providers/stale-no-vision-seed-migration.ts +7 -0
- package/src/providers/vertex-environment-authority.ts +50 -0
- package/src/providers/workbuddy-credit-balance.ts +38 -6
- package/src/quota-pool/assemble.ts +14 -6
- package/src/router.ts +1 -0
- package/src/server/adapter-resolve.ts +11 -6
- package/src/server/audio-dictation.ts +21 -7
- package/src/server/auth-cors.ts +19 -0
- package/src/server/background-lifecycle.ts +71 -0
- package/src/server/chat-completions.ts +2 -0
- package/src/server/claude-messages.ts +30 -3
- package/src/server/index/live-sideband.ts +15 -1
- package/src/server/index/local-control-listener.ts +515 -0
- package/src/server/index/optional-listeners.ts +21 -1
- package/src/server/index/serve-options.ts +4 -3
- package/src/server/index/websocket-handler.ts +2 -0
- package/src/server/index.ts +3 -0
- package/src/server/management/combo-routes.ts +6 -1
- package/src/server/management/context.ts +1 -0
- package/src/server/management/link-child-preflight.ts +74 -0
- package/src/server/management/link-enrollment.ts +190 -25
- package/src/server/management/link-route-state.ts +6 -1
- package/src/server/management/link-routes.ts +27 -9
- package/src/server/management/model-rows.ts +4 -0
- package/src/server/management/oauth-account-routes.ts +9 -4
- package/src/server/management/provider-overwrite-carry.ts +9 -2
- package/src/server/management/provider-routes.ts +14 -0
- package/src/server/management/provider-thinking-display-patch.ts +54 -0
- package/src/server/management/route-registry.ts +7 -0
- package/src/server/management/session-routes.ts +4 -1
- package/src/server/management/telemetry-routes.ts +37 -0
- package/src/server/management/usage-aggregate-cache.ts +290 -67
- package/src/server/management-api.ts +11 -2
- package/src/server/messages-native-preflight.ts +166 -0
- package/src/server/messages-native.ts +143 -43
- package/src/server/messages-shared.ts +14 -0
- package/src/server/proxy-liveness.ts +99 -6
- package/src/server/request-log-conversation.ts +18 -2
- package/src/server/request-log.ts +7 -2
- package/src/server/responses/adapter-continuation.ts +1 -0
- package/src/server/responses/adapter-dispatch.ts +11 -28
- package/src/server/responses/adapter-failure-message.ts +68 -0
- package/src/server/responses/combo-stream-preflight.ts +14 -2
- package/src/server/responses/core-auth.ts +26 -5
- package/src/server/responses/core-codex-account.ts +8 -1
- package/src/server/responses/core-combo-failure.ts +6 -1
- package/src/server/responses/core-combo-native.ts +150 -37
- package/src/server/responses/core-combo.ts +15 -9
- package/src/server/responses/core-normalize.ts +1 -0
- package/src/server/responses/core-options.ts +7 -1
- package/src/server/responses/core-pipeline.ts +21 -1
- package/src/server/responses/fetch-helpers.ts +5 -0
- package/src/server/responses/opengateway-completion-guard.ts +7 -3
- package/src/server/responses/passthrough-delivery.ts +8 -1
- package/src/server/responses/passthrough-error.ts +22 -0
- package/src/server/responses/request-prepare.ts +7 -1
- package/src/server/responses/request-transport.ts +28 -5
- package/src/server/responses/run-turn-execution.ts +13 -0
- package/src/server/sse-frame-buffer.ts +5 -0
- package/src/server/ws-bridge.ts +10 -0
- package/src/service/launchd.ts +78 -4
- package/src/telemetry/aggregate.ts +348 -0
- package/src/telemetry/consent.ts +128 -0
- package/src/telemetry/contract.ts +403 -0
- package/src/telemetry/disclosure.ts +19 -0
- package/src/telemetry/install-id.ts +226 -0
- package/src/telemetry/payload.ts +129 -0
- package/src/telemetry/profile/client.ts +150 -0
- package/src/telemetry/profile/contract.ts +288 -0
- package/src/telemetry/profile/disclosure.ts +14 -0
- package/src/telemetry/profile/paths.ts +13 -0
- package/src/telemetry/profile/routes.ts +99 -0
- package/src/telemetry/profile/service.ts +234 -0
- package/src/telemetry/profile/state.ts +189 -0
- package/src/telemetry/profile/sync.ts +276 -0
- package/src/telemetry/routes.ts +183 -0
- package/src/telemetry/scheduler.ts +386 -0
- package/src/telemetry/sender.ts +97 -0
- package/src/telemetry/state.ts +334 -0
- package/src/types/combo-jev-effort-mode.ts +11 -0
- package/src/types/config.ts +3 -0
- package/src/types/provider.ts +11 -1
- package/src/types/request.ts +2 -0
- package/src/types/telemetry.ts +15 -0
- package/src/types/wire.ts +10 -0
- package/src/types.ts +5 -0
- package/src/update/index.ts +7 -1
- package/src/update/minisign.d.mts +17 -0
- package/src/update/minisign.mjs +88 -0
- package/src/update/signed-supply.d.mts +59 -0
- package/src/update/signed-supply.mjs +289 -0
- package/src/update/trust-root.json +38 -0
- package/src/update/update-bounded-json.d.mts +4 -0
- package/src/update/update-bounded-json.mjs +113 -0
- package/src/update/update-bytes.d.mts +2 -0
- package/src/update/update-bytes.mjs +23 -0
- package/src/update/update-candidate-id.d.mts +2 -0
- package/src/update/update-candidate-id.mjs +23 -0
- package/src/update/update-checkpoint-codec.d.mts +33 -0
- package/src/update/update-checkpoint-codec.mjs +217 -0
- package/src/update/update-contracts.d.mts +24 -0
- package/src/update/update-contracts.mjs +207 -0
- package/src/update/update-signature-threshold.d.mts +12 -0
- package/src/update/update-signature-threshold.mjs +47 -0
- package/src/update/update-signed-version.d.mts +5 -0
- package/src/update/update-signed-version.mjs +25 -0
- package/src/update/update-trust-anchor.d.mts +2 -0
- package/src/update/update-trust-anchor.mjs +2 -0
- package/src/usage/cache-diagnostic.ts +195 -50
- package/src/usage/expected-prices.ts +20 -2
- package/src/usage/filter-index.ts +1469 -0
- package/src/usage/ledger-scanner.ts +245 -4
- package/src/usage/source-filter.ts +10 -2
- package/src/usage/summary.ts +16 -0
- package/src/web-search/parse.ts +244 -38
- package/gui/dist/assets/App-BepstgEN.js +0 -59
- package/gui/dist/assets/Tray-BinxbEZo.js +0 -1
- package/gui/dist/assets/index-C-9X2yaI.js +0 -94
- package/gui/dist/assets/index-bnUWypyz.css +0 -2
- package/gui/dist/classic/assets/App-DX88_GCW.js +0 -58
- package/gui/dist/classic/assets/index-fSP71pLB.js +0 -94
- package/gui/dist/classic/assets/quota-summary-y2fl0WBv.js +0 -1
|
@@ -60,7 +60,13 @@ export const PROVIDER_COMPAT_CARRY_FIELDS = [
|
|
|
60
60
|
...RETRY_POLICY_FIELDS,
|
|
61
61
|
] as const satisfies readonly (keyof OcxProviderConfig)[];
|
|
62
62
|
|
|
63
|
-
export const PROVIDER_DISPLAY_CARRY_FIELDS = [
|
|
63
|
+
export const PROVIDER_DISPLAY_CARRY_FIELDS = [
|
|
64
|
+
"hideRawReasoning",
|
|
65
|
+
// The Anthropic thinking display policy (#8363) is operator configuration the dashboard form
|
|
66
|
+
// cannot send either, so an unrelated save must not silently return the model to the default.
|
|
67
|
+
"thinkingDisplay",
|
|
68
|
+
"modelThinkingDisplay",
|
|
69
|
+
] as const satisfies readonly (keyof OcxProviderConfig)[];
|
|
64
70
|
|
|
65
71
|
export type ProviderCompatCarryField = typeof PROVIDER_COMPAT_CARRY_FIELDS[number];
|
|
66
72
|
type ProviderDisplayCarryField = typeof PROVIDER_DISPLAY_CARRY_FIELDS[number];
|
|
@@ -131,7 +137,8 @@ export function carryProviderCompatFields(
|
|
|
131
137
|
for (const field of PROVIDER_DISPLAY_CARRY_FIELDS) {
|
|
132
138
|
if (sample.submitted.has(field)) continue;
|
|
133
139
|
const stored = live[field];
|
|
134
|
-
|
|
140
|
+
// Copy maps rather than alias them, like the compatibility settings below.
|
|
141
|
+
if (stored !== undefined) target[field] = stored !== null && typeof stored === "object" ? structuredClone(stored) : stored;
|
|
135
142
|
}
|
|
136
143
|
if (!providerOverwriteKeepsDestination(candidate, live, sample)) return;
|
|
137
144
|
for (const field of PROVIDER_COMPAT_CARRY_FIELDS) {
|
|
@@ -120,6 +120,7 @@ import {
|
|
|
120
120
|
} from "../auth-cors";
|
|
121
121
|
import { providerCatalogCapabilityConfigError } from "./provider-capability-config";
|
|
122
122
|
import { providerEmptyToolOutputConfigError } from "../../config/provider-validation";
|
|
123
|
+
import { applyThinkingDisplayPatchFields } from "./provider-thinking-display-patch";
|
|
123
124
|
import { applySystemEnvToggle } from "../system-env";
|
|
124
125
|
import {
|
|
125
126
|
LOCAL_PROVIDER_RELOAD_NAME_HEADER,
|
|
@@ -383,6 +384,14 @@ function applyProviderPatchFields(
|
|
|
383
384
|
else delete next.defaultModel;
|
|
384
385
|
touched = true;
|
|
385
386
|
}
|
|
387
|
+
for (const field of ["project", "location"] as const) {
|
|
388
|
+
if (!Object.hasOwn(rawBody, field)) continue;
|
|
389
|
+
const value = rawBody[field];
|
|
390
|
+
if (typeof value !== "string") return { error: `${field} must be a string` };
|
|
391
|
+
if (value.trim()) next[field] = value.trim();
|
|
392
|
+
else delete next[field];
|
|
393
|
+
touched = true;
|
|
394
|
+
}
|
|
386
395
|
if (Object.hasOwn(rawBody, "authMode")) {
|
|
387
396
|
if (typeof rawBody.authMode !== "string") return { error: "authMode must be a string" };
|
|
388
397
|
const mode = rawBody.authMode.trim();
|
|
@@ -680,6 +689,11 @@ function applyProviderPatchFields(
|
|
|
680
689
|
}
|
|
681
690
|
touched = true;
|
|
682
691
|
}
|
|
692
|
+
if (Object.hasOwn(rawBody, "thinkingDisplay") || Object.hasOwn(rawBody, "modelThinkingDisplay")) {
|
|
693
|
+
const displayError = applyThinkingDisplayPatchFields(next, rawBody);
|
|
694
|
+
if (displayError) return displayError;
|
|
695
|
+
touched = true;
|
|
696
|
+
}
|
|
683
697
|
if (Object.hasOwn(rawBody, "noStructuredOutputModels")) {
|
|
684
698
|
const value = rawBody.noStructuredOutputModels;
|
|
685
699
|
if (value === null) {
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import type { OcxProviderConfig } from "../../types";
|
|
2
|
+
import { thinkingDisplayConfigError } from "../../config/provider-validation";
|
|
3
|
+
import { isPlainRecord } from "./shared";
|
|
4
|
+
|
|
5
|
+
type ThinkingDisplay = NonNullable<OcxProviderConfig["thinkingDisplay"]>;
|
|
6
|
+
|
|
7
|
+
/**
|
|
8
|
+
* Apply the `thinkingDisplay` / `modelThinkingDisplay` PATCH mask (#8363).
|
|
9
|
+
*
|
|
10
|
+
* Split out of provider-routes.ts, which sits under the 2,000-line file-size threshold; the
|
|
11
|
+
* behaviour stays identical to the sibling per-model map patches there. A model entry of
|
|
12
|
+
* `null` deletes one key, `null` on the whole map clears it, and provider-level `null` or ""
|
|
13
|
+
* clears the scalar.
|
|
14
|
+
*/
|
|
15
|
+
export function applyThinkingDisplayPatchFields(
|
|
16
|
+
next: OcxProviderConfig,
|
|
17
|
+
rawBody: Record<string, unknown>,
|
|
18
|
+
): { error: string } | null {
|
|
19
|
+
if (Object.hasOwn(rawBody, "thinkingDisplay")) {
|
|
20
|
+
const value = rawBody.thinkingDisplay;
|
|
21
|
+
if (value === null || value === "") {
|
|
22
|
+
delete next.thinkingDisplay;
|
|
23
|
+
} else {
|
|
24
|
+
const error = thinkingDisplayConfigError(value);
|
|
25
|
+
if (error) return { error };
|
|
26
|
+
next.thinkingDisplay = value as ThinkingDisplay;
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
if (Object.hasOwn(rawBody, "modelThinkingDisplay")) {
|
|
30
|
+
const value = rawBody.modelThinkingDisplay;
|
|
31
|
+
if (value === null) {
|
|
32
|
+
delete next.modelThinkingDisplay;
|
|
33
|
+
} else {
|
|
34
|
+
if (!isPlainRecord(value)) return { error: "modelThinkingDisplay must be a plain object or null" };
|
|
35
|
+
const merged = Object.assign(
|
|
36
|
+
Object.create(null) as Record<string, ThinkingDisplay>,
|
|
37
|
+
next.modelThinkingDisplay ?? {},
|
|
38
|
+
);
|
|
39
|
+
for (const [model, policy] of Object.entries(value as Record<string, unknown>)) {
|
|
40
|
+
if (!model.trim()) return { error: "modelThinkingDisplay keys must be nonblank model ids" };
|
|
41
|
+
if (policy === null) delete merged[model];
|
|
42
|
+
else {
|
|
43
|
+
const entryError = thinkingDisplayConfigError(policy, `modelThinkingDisplay.${JSON.stringify(model)}`);
|
|
44
|
+
if (entryError) return { error: entryError };
|
|
45
|
+
merged[model] = policy as ThinkingDisplay;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
if (Object.keys(merged).length > 0) next.modelThinkingDisplay = merged;
|
|
49
|
+
else delete next.modelThinkingDisplay;
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
return null;
|
|
53
|
+
}
|
|
54
|
+
|
|
@@ -451,6 +451,13 @@ export const MANAGEMENT_ROUTES: readonly ManagementRoute[] = [
|
|
|
451
451
|
{ method: "GET", path: "/api/system/memory", module: "server/management/system-routes", mutates: false },
|
|
452
452
|
{ method: "GET", path: "/api/system/windows-replace-retries", module: "server/management/system-routes", mutates: false },
|
|
453
453
|
{ method: "POST", path: "/api/system/restart", module: "server/management/system-routes", mutates: true },
|
|
454
|
+
// server/management/telemetry-routes
|
|
455
|
+
{ method: "GET", path: "/api/telemetry", module: "server/management/telemetry-routes", mutates: false },
|
|
456
|
+
{ method: "PUT", path: "/api/telemetry", module: "server/management/telemetry-routes", mutates: true, exempt: { reason: "session-only", why: "User-consent boundary in AGENTS_INSTALL.md: changing telemetry consent over HTTP requires a human dashboard session; CLI callers use ocx telemetry enable/disable." } },
|
|
457
|
+
{ method: "GET", path: "/api/telemetry/profile", module: "server/management/telemetry-routes", mutates: false },
|
|
458
|
+
{ method: "POST", path: "/api/telemetry/profile", module: "server/management/telemetry-routes", mutates: true, exempt: { reason: "session-only", why: "User-consent boundary in AGENTS_INSTALL.md: connecting a public profile over HTTP requires a human dashboard session; CLI callers use ocx telemetry profile connect in an interactive terminal." } },
|
|
459
|
+
{ method: "DELETE", path: "/api/telemetry/profile", module: "server/management/telemetry-routes", mutates: true },
|
|
460
|
+
{ method: "GET", path: "/api/telemetry/profile/rank", module: "server/management/telemetry-routes", mutates: false },
|
|
454
461
|
// --- Further routes an equality scan of their own file cannot see. ---
|
|
455
462
|
// Each carries `mechanism`; the reconciliation test counts these separately.
|
|
456
463
|
{ method: "GET", path: "/api/storage", module: "server/management/storage-log-guard-routes", mutates: false, mechanism: "negated-guard" },
|
|
@@ -1,12 +1,15 @@
|
|
|
1
1
|
import { jsonResponse } from "../auth-cors";
|
|
2
2
|
import type { ManagementContext } from "./context";
|
|
3
3
|
|
|
4
|
+
/** The Remember enrollment route; the management Origin gate names its refusal reason (#8338). */
|
|
5
|
+
export const SESSION_REMEMBER_PATH = "/api/session/remember";
|
|
6
|
+
|
|
4
7
|
export function handleSessionRoutes(ctx: ManagementContext): Response | null {
|
|
5
8
|
if (ctx.url.pathname === "/api/session/remember" && ctx.req.method === "POST") {
|
|
6
9
|
if (ctx.principal !== "admin-token") return jsonResponse({ error: "Admin token required" }, 403, ctx.req, ctx.config);
|
|
7
10
|
try {
|
|
8
11
|
const remembered = ctx.sessionControl?.rememberDevice?.(ctx.req, ctx.config);
|
|
9
|
-
if (!remembered) return jsonResponse({ error: "Remember requires a direct HTTPS dashboard (or loopback) and matching Origin" }, 403, ctx.req, ctx.config);
|
|
12
|
+
if (!remembered) return jsonResponse({ error: "Remember requires a direct HTTPS dashboard (or loopback) and matching Origin", code: "remember_requires_direct_origin" }, 403, ctx.req, ctx.config);
|
|
10
13
|
const response = jsonResponse({ session: remembered.session, device: remembered.device }, 200, ctx.req, ctx.config);
|
|
11
14
|
response.headers.set("Set-Cookie", remembered.cookie);
|
|
12
15
|
response.headers.set("Cache-Control", "no-store");
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import type { ManagementContext } from "./context";
|
|
2
|
+
import {
|
|
3
|
+
handleGetTelemetryRoute,
|
|
4
|
+
handlePutTelemetryRoute,
|
|
5
|
+
} from "../../telemetry/routes";
|
|
6
|
+
|
|
7
|
+
export async function handleTelemetryRoutes(ctx: ManagementContext): Promise<Response | null> {
|
|
8
|
+
const { req, url } = ctx;
|
|
9
|
+
if (url.pathname.startsWith("/api/telemetry/profile")) {
|
|
10
|
+
return handleTelemetryProfileRoutes(ctx);
|
|
11
|
+
}
|
|
12
|
+
if (url.pathname === "/api/telemetry" && req.method === "GET") {
|
|
13
|
+
return handleGetTelemetryRoute(ctx);
|
|
14
|
+
}
|
|
15
|
+
if (url.pathname === "/api/telemetry" && req.method === "PUT") {
|
|
16
|
+
return handlePutTelemetryRoute(ctx);
|
|
17
|
+
}
|
|
18
|
+
return null;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
/** The opt-in public profile; its handlers load only when one of these paths is requested. */
|
|
22
|
+
async function handleTelemetryProfileRoutes(ctx: ManagementContext): Promise<Response | null> {
|
|
23
|
+
const { req, url } = ctx;
|
|
24
|
+
if (url.pathname === "/api/telemetry/profile" && req.method === "GET") {
|
|
25
|
+
return (await import("../../telemetry/profile/routes")).handleGetProfileRoute(ctx);
|
|
26
|
+
}
|
|
27
|
+
if (url.pathname === "/api/telemetry/profile" && req.method === "POST") {
|
|
28
|
+
return (await import("../../telemetry/profile/routes")).handlePostProfileRoute(ctx);
|
|
29
|
+
}
|
|
30
|
+
if (url.pathname === "/api/telemetry/profile" && req.method === "DELETE") {
|
|
31
|
+
return (await import("../../telemetry/profile/routes")).handleDeleteProfileRoute(ctx);
|
|
32
|
+
}
|
|
33
|
+
if (url.pathname === "/api/telemetry/profile/rank" && req.method === "GET") {
|
|
34
|
+
return (await import("../../telemetry/profile/routes")).handleGetProfileRankRoute(ctx);
|
|
35
|
+
}
|
|
36
|
+
return null;
|
|
37
|
+
}
|
|
@@ -6,9 +6,21 @@ import {
|
|
|
6
6
|
type UsageLogRevision,
|
|
7
7
|
} from "../../usage/log";
|
|
8
8
|
import {
|
|
9
|
+
readUsageLedgerRowsAtOffsets,
|
|
9
10
|
scanUsageLedgerCooperatively,
|
|
10
11
|
UsageLedgerRebuildRequiredError,
|
|
11
12
|
} from "../../usage/ledger-scanner";
|
|
13
|
+
import {
|
|
14
|
+
readUsageFilterCandidates,
|
|
15
|
+
readUsageFilterCandidatesPassive,
|
|
16
|
+
requestUsageFilterIndexRebuild,
|
|
17
|
+
resetUsageFilterIndexForTests,
|
|
18
|
+
type UsageFilterCandidateRead,
|
|
19
|
+
type UsageFilterIndexQuery,
|
|
20
|
+
type UsageFilterIndexSnapshot,
|
|
21
|
+
type UsageFilterQueryStats,
|
|
22
|
+
} from "../../usage/filter-index";
|
|
23
|
+
import { isPassiveRead } from "../../lib/passive-read";
|
|
12
24
|
import {
|
|
13
25
|
createUsageSummaryAccumulator,
|
|
14
26
|
type UsageSummaryAccumulator,
|
|
@@ -63,6 +75,11 @@ export interface UsageAggregateResult {
|
|
|
63
75
|
overlayVersion: number;
|
|
64
76
|
timeZone: string;
|
|
65
77
|
update: "unchanged" | "append" | "rebuild";
|
|
78
|
+
/**
|
|
79
|
+
* Present on filtered results: how many ledger rows the derived candidate index read to
|
|
80
|
+
* answer this filter, against the whole ledger. A full scan reports the same number twice.
|
|
81
|
+
*/
|
|
82
|
+
filterIndex?: UsageFilterQueryStats;
|
|
66
83
|
}
|
|
67
84
|
|
|
68
85
|
export interface UsageAggregateOptions {
|
|
@@ -88,13 +105,19 @@ export interface UsageAggregateRetainedStats {
|
|
|
88
105
|
}
|
|
89
106
|
|
|
90
107
|
const MAX_REBUILD_ATTEMPTS = 2;
|
|
108
|
+
// A filtered read can lose a race with a concurrent index rebuild and a ledger replacement in
|
|
109
|
+
// the same call, so it gets one more attempt than a plain scan rebuild.
|
|
110
|
+
const MAX_FILTER_INDEX_ATTEMPTS = 3;
|
|
111
|
+
// Selected rows are folded in bounded batches, so a filter that matches most of a large ledger
|
|
112
|
+
// costs the same peak memory as the streaming scan it replaces.
|
|
113
|
+
const FILTER_ROW_READ_BATCH = 2_000;
|
|
91
114
|
const MAX_RETAINED_FILTERED_AGGREGATES = 4;
|
|
92
115
|
|
|
93
116
|
let retainedAggregate: RetainedUsageAggregate | null = null;
|
|
94
117
|
const pinnedAggregates = new Set<RetainedAggregateState>();
|
|
95
118
|
let baseFlight: Promise<UsageAggregateResult> | null = null;
|
|
96
119
|
const filteredFlights = new Map<string, Promise<UsageAggregateResult>>();
|
|
97
|
-
const retainedFilteredAggregates = new Map<string,
|
|
120
|
+
const retainedFilteredAggregates = new Map<string, RetainedFilteredAggregate>();
|
|
98
121
|
const MAX_CONCURRENT_FILTERED_AGGREGATES = 4;
|
|
99
122
|
const retainedJevStatsAggregates = new Map<string, RetainedJevStatsAggregate>();
|
|
100
123
|
const jevStatsFlights = new Map<string, Promise<JevStatsAggregateResult>>();
|
|
@@ -341,6 +364,162 @@ type NormalizedUsageFilter = {
|
|
|
341
364
|
configuredApiKeyIds?: readonly string[];
|
|
342
365
|
};
|
|
343
366
|
|
|
367
|
+
/**
|
|
368
|
+
* A retained filtered projection plus the index generation its candidates came from.
|
|
369
|
+
* `null` means it was built by the streaming fallback and cannot be extended incrementally.
|
|
370
|
+
*/
|
|
371
|
+
type RetainedFilteredAggregate = RetainedUsageAggregate & { indexGeneration: string | null };
|
|
372
|
+
|
|
373
|
+
/** The derived index and the ledger disagree about where a row starts. */
|
|
374
|
+
class UsageFilterIndexCorruptError extends Error {}
|
|
375
|
+
|
|
376
|
+
/** Pricing or time-zone inputs moved while a filtered projection was being built. */
|
|
377
|
+
class UsageAggregationInputsChangedError extends Error {}
|
|
378
|
+
|
|
379
|
+
function filterQuery(
|
|
380
|
+
filter: NormalizedUsageFilter,
|
|
381
|
+
window?: UsageTimeWindow,
|
|
382
|
+
): UsageFilterIndexQuery {
|
|
383
|
+
return {
|
|
384
|
+
provider: filter.provider,
|
|
385
|
+
model: filter.model,
|
|
386
|
+
apiKeyId: filter.apiKeyId,
|
|
387
|
+
...(filter.sourceFilter ? { sourceFilter: filter.sourceFilter } : {}),
|
|
388
|
+
...(filter.configuredApiKeyIds ? { configuredApiKeyIds: filter.configuredApiKeyIds } : {}),
|
|
389
|
+
...(window ? { window } : {}),
|
|
390
|
+
};
|
|
391
|
+
}
|
|
392
|
+
|
|
393
|
+
function filterStats(
|
|
394
|
+
read: UsageFilterCandidateRead,
|
|
395
|
+
update: UsageAggregateResult["update"],
|
|
396
|
+
): UsageFilterQueryStats {
|
|
397
|
+
return {
|
|
398
|
+
totalRows: read.snapshot.indexedRows,
|
|
399
|
+
candidateRows: read.offsets.length,
|
|
400
|
+
scope: update,
|
|
401
|
+
ingestedRows: read.snapshot.ingestedRows,
|
|
402
|
+
ingestPasses: read.snapshot.ingestPasses,
|
|
403
|
+
};
|
|
404
|
+
}
|
|
405
|
+
|
|
406
|
+
function filteredStateFrom(
|
|
407
|
+
accumulator: UsageSummaryAccumulator,
|
|
408
|
+
snapshot: UsageFilterIndexSnapshot,
|
|
409
|
+
overlayVersion: number,
|
|
410
|
+
timeZone: string,
|
|
411
|
+
): RetainedFilteredAggregate {
|
|
412
|
+
return {
|
|
413
|
+
accumulator,
|
|
414
|
+
// Diagnostics describe the whole ledger, not the selected candidates: an invalid or
|
|
415
|
+
// oversized row outside the filter still means the report is incomplete.
|
|
416
|
+
usageIncomplete: snapshot.oversizedRows > 0,
|
|
417
|
+
usageInvalidRows: snapshot.invalidRows > 0,
|
|
418
|
+
revision: snapshot.revision,
|
|
419
|
+
identityKey: snapshot.identityKey,
|
|
420
|
+
revisionKey: usageLogRevisionKey(snapshot.revision),
|
|
421
|
+
processedThroughBytes: snapshot.indexedOffset,
|
|
422
|
+
processedThroughDigest: snapshot.processedThroughDigest,
|
|
423
|
+
overlayVersion,
|
|
424
|
+
timeZone,
|
|
425
|
+
retainedAt: Date.now(),
|
|
426
|
+
indexGeneration: snapshot.generation,
|
|
427
|
+
};
|
|
428
|
+
}
|
|
429
|
+
|
|
430
|
+
/** The pre-index streaming read, used when the projection is unavailable or passive. */
|
|
431
|
+
function streamingStateFrom(
|
|
432
|
+
accumulator: UsageSummaryAccumulator,
|
|
433
|
+
scan: Awaited<ReturnType<typeof scanUsageLedgerCooperatively>>,
|
|
434
|
+
overlayVersion: number,
|
|
435
|
+
timeZone: string,
|
|
436
|
+
): RetainedFilteredAggregate {
|
|
437
|
+
return {
|
|
438
|
+
accumulator,
|
|
439
|
+
usageIncomplete: scan.oversizedRows > 0,
|
|
440
|
+
usageInvalidRows: scan.invalidRows > 0,
|
|
441
|
+
revision: scan.revision,
|
|
442
|
+
identityKey: usageLogIdentityKey(scan.revision),
|
|
443
|
+
revisionKey: usageLogRevisionKey(scan.revision),
|
|
444
|
+
processedThroughBytes: scan.processedThroughBytes,
|
|
445
|
+
processedThroughDigest: scan.processedThroughDigest,
|
|
446
|
+
overlayVersion,
|
|
447
|
+
timeZone,
|
|
448
|
+
retainedAt: Date.now(),
|
|
449
|
+
indexGeneration: null,
|
|
450
|
+
};
|
|
451
|
+
}
|
|
452
|
+
|
|
453
|
+
/**
|
|
454
|
+
* Candidate selection for one filter.
|
|
455
|
+
*
|
|
456
|
+
* A passive management read must not create or write anything, so it only uses a projection
|
|
457
|
+
* that is already current; otherwise the caller streams. Both paths return null when the
|
|
458
|
+
* acceleration is unusable, never when the ledger itself failed.
|
|
459
|
+
*/
|
|
460
|
+
async function readCandidates(
|
|
461
|
+
query: UsageFilterIndexQuery,
|
|
462
|
+
): Promise<UsageFilterCandidateRead | null> {
|
|
463
|
+
return isPassiveRead()
|
|
464
|
+
? readUsageFilterCandidatesPassive(query)
|
|
465
|
+
: readUsageFilterCandidates(query);
|
|
466
|
+
}
|
|
467
|
+
|
|
468
|
+
async function accumulateCandidates(
|
|
469
|
+
accumulator: UsageSummaryAccumulator,
|
|
470
|
+
read: UsageFilterCandidateRead,
|
|
471
|
+
filter: NormalizedUsageFilter,
|
|
472
|
+
): Promise<void> {
|
|
473
|
+
// Always read at least once, even with no candidates: the reader validates the snapshot
|
|
474
|
+
// against the ledger, and an empty selection must not skip that check.
|
|
475
|
+
const batchCount = Math.max(1, Math.ceil(read.offsets.length / FILTER_ROW_READ_BATCH));
|
|
476
|
+
for (let batch = 0; batch < batchCount; batch += 1) {
|
|
477
|
+
const start = batch * FILTER_ROW_READ_BATCH;
|
|
478
|
+
const rows = await readUsageLedgerRowsAtOffsets({
|
|
479
|
+
offsets: read.offsets.slice(start, start + FILTER_ROW_READ_BATCH),
|
|
480
|
+
expectedIdentityKey: read.snapshot.identityKey,
|
|
481
|
+
// The offsets belong to this index snapshot. If the ledger moved since the snapshot,
|
|
482
|
+
// the reader re-validates the boundary before trusting any of them, and a rewrite of
|
|
483
|
+
// the indexed tail becomes a rebuild instead of a silently different row set.
|
|
484
|
+
expectedRevisionKey: usageLogRevisionKey(read.snapshot.revision),
|
|
485
|
+
expectedProcessedThroughBytes: read.snapshot.indexedOffset,
|
|
486
|
+
expectedProcessedThroughDigest: read.snapshot.processedThroughDigest,
|
|
487
|
+
// The physical size at publish time; a torn suffix makes it larger than the boundary.
|
|
488
|
+
expectedFileSize: read.snapshot.revision?.size,
|
|
489
|
+
});
|
|
490
|
+
if (rows.unreadableOffsets.length > 0) {
|
|
491
|
+
// Serving only the rows that happened to parse would silently under-report the filter.
|
|
492
|
+
throw new UsageFilterIndexCorruptError();
|
|
493
|
+
}
|
|
494
|
+
for (const entry of rows.entries) accumulator.add(entry);
|
|
495
|
+
}
|
|
496
|
+
// Without a source filter the reported span covers the whole ledger, including rows this
|
|
497
|
+
// filter never selected. A source filter derives its span from the rows that match it, so
|
|
498
|
+
// only the unfiltered-source case needs the ledger-wide span restored.
|
|
499
|
+
if (!filter.sourceFilter) {
|
|
500
|
+
accumulator.noteLedgerSpan(read.snapshot.minTimestamp, read.snapshot.maxTimestamp);
|
|
501
|
+
}
|
|
502
|
+
}
|
|
503
|
+
|
|
504
|
+
async function withFilterIndexRetry<T>(run: () => Promise<T>): Promise<T> {
|
|
505
|
+
let lastError: unknown;
|
|
506
|
+
for (let attempt = 0; attempt < MAX_FILTER_INDEX_ATTEMPTS; attempt += 1) {
|
|
507
|
+
try {
|
|
508
|
+
return await run();
|
|
509
|
+
} catch (error) {
|
|
510
|
+
lastError = error;
|
|
511
|
+
if (error instanceof UsageFilterIndexCorruptError) {
|
|
512
|
+
requestUsageFilterIndexRebuild();
|
|
513
|
+
continue;
|
|
514
|
+
}
|
|
515
|
+
if (error instanceof UsageLedgerRebuildRequiredError) continue;
|
|
516
|
+
if (error instanceof UsageAggregationInputsChangedError) continue;
|
|
517
|
+
throw error;
|
|
518
|
+
}
|
|
519
|
+
}
|
|
520
|
+
throw lastError ?? new Error("filtered usage aggregate did not settle");
|
|
521
|
+
}
|
|
522
|
+
|
|
344
523
|
function trimRetainedFilteredAggregates(): void {
|
|
345
524
|
while (retainedFilteredAggregates.size > MAX_RETAINED_FILTERED_AGGREGATES) {
|
|
346
525
|
const oldest = [...retainedFilteredAggregates]
|
|
@@ -353,87 +532,98 @@ function trimRetainedFilteredAggregates(): void {
|
|
|
353
532
|
|
|
354
533
|
function publishFilteredAggregate(
|
|
355
534
|
key: string,
|
|
356
|
-
state:
|
|
535
|
+
state: RetainedFilteredAggregate,
|
|
357
536
|
update: UsageAggregateResult["update"],
|
|
537
|
+
read: UsageFilterCandidateRead | null,
|
|
358
538
|
): UsageAggregateResult {
|
|
359
539
|
retainedFilteredAggregates.set(key, state);
|
|
360
540
|
trimRetainedFilteredAggregates();
|
|
361
541
|
enforceAppOwnedMemoryBudget();
|
|
362
|
-
return
|
|
542
|
+
return read
|
|
543
|
+
? { ...resultFrom(state, update), filterIndex: filterStats(read, update) }
|
|
544
|
+
: resultFrom(state, update);
|
|
363
545
|
}
|
|
364
546
|
|
|
365
547
|
async function rebuildFilteredAggregate(
|
|
366
548
|
key: string,
|
|
367
549
|
filter: NormalizedUsageFilter,
|
|
368
550
|
window?: UsageTimeWindow,
|
|
551
|
+
overlayVersion: number = userCostOverlayVersion(),
|
|
552
|
+
timeZone: string = currentTimeZone(),
|
|
369
553
|
): Promise<UsageAggregateResult> {
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
const timeZone = currentTimeZone();
|
|
374
|
-
const accumulator = createUsageSummaryAccumulator({ filter, mode: "row-unique", window });
|
|
375
|
-
try {
|
|
376
|
-
const scan = await scanUsageLedgerCooperatively({ onEntry: entry => accumulator.add(entry) });
|
|
377
|
-
if (userCostOverlayVersion() !== overlayVersion || currentTimeZone() !== timeZone) {
|
|
378
|
-
lastError = new Error("usage aggregation inputs changed during filtered scan");
|
|
379
|
-
continue;
|
|
380
|
-
}
|
|
381
|
-
const state = makeRetainedAggregate(accumulator, scan, overlayVersion, timeZone);
|
|
382
|
-
return publishFilteredAggregate(key, state, "rebuild");
|
|
383
|
-
} catch (error) {
|
|
384
|
-
lastError = error;
|
|
385
|
-
if (!(error instanceof UsageLedgerRebuildRequiredError) || attempt + 1 >= MAX_REBUILD_ATTEMPTS) {
|
|
386
|
-
throw error;
|
|
387
|
-
}
|
|
388
|
-
}
|
|
554
|
+
const read = await readCandidates(filterQuery(filter, window));
|
|
555
|
+
if (!read) {
|
|
556
|
+
return rebuildFilteredAggregateStreaming(key, filter, window, overlayVersion, timeZone);
|
|
389
557
|
}
|
|
390
|
-
|
|
558
|
+
const accumulator = createUsageSummaryAccumulator({
|
|
559
|
+
filter,
|
|
560
|
+
mode: "row-unique",
|
|
561
|
+
...(window ? { window } : {}),
|
|
562
|
+
});
|
|
563
|
+
await accumulateCandidates(accumulator, read, filter);
|
|
564
|
+
if (userCostOverlayVersion() !== overlayVersion || currentTimeZone() !== timeZone) {
|
|
565
|
+
throw new UsageAggregationInputsChangedError();
|
|
566
|
+
}
|
|
567
|
+
return publishFilteredAggregate(
|
|
568
|
+
key,
|
|
569
|
+
filteredStateFrom(accumulator, read.snapshot, overlayVersion, timeZone),
|
|
570
|
+
"rebuild",
|
|
571
|
+
read,
|
|
572
|
+
);
|
|
573
|
+
}
|
|
574
|
+
|
|
575
|
+
async function rebuildFilteredAggregateStreaming(
|
|
576
|
+
key: string,
|
|
577
|
+
filter: NormalizedUsageFilter,
|
|
578
|
+
window: UsageTimeWindow | undefined,
|
|
579
|
+
overlayVersion: number,
|
|
580
|
+
timeZone: string,
|
|
581
|
+
): Promise<UsageAggregateResult> {
|
|
582
|
+
const accumulator = createUsageSummaryAccumulator({
|
|
583
|
+
filter,
|
|
584
|
+
mode: "row-unique",
|
|
585
|
+
...(window ? { window } : {}),
|
|
586
|
+
});
|
|
587
|
+
const scan = await scanUsageLedgerCooperatively({ onEntry: entry => accumulator.add(entry) });
|
|
588
|
+
if (userCostOverlayVersion() !== overlayVersion || currentTimeZone() !== timeZone) {
|
|
589
|
+
throw new UsageAggregationInputsChangedError();
|
|
590
|
+
}
|
|
591
|
+
return publishFilteredAggregate(
|
|
592
|
+
key,
|
|
593
|
+
streamingStateFrom(accumulator, scan, overlayVersion, timeZone),
|
|
594
|
+
"rebuild",
|
|
595
|
+
null,
|
|
596
|
+
);
|
|
391
597
|
}
|
|
392
598
|
|
|
393
599
|
async function appendFilteredAggregate(
|
|
394
600
|
key: string,
|
|
395
|
-
state:
|
|
601
|
+
state: RetainedFilteredAggregate,
|
|
396
602
|
filter: NormalizedUsageFilter,
|
|
397
|
-
|
|
603
|
+
read: UsageFilterCandidateRead,
|
|
604
|
+
overlayVersion: number,
|
|
605
|
+
timeZone: string,
|
|
398
606
|
): Promise<UsageAggregateResult> {
|
|
399
607
|
pinnedAggregates.add(state);
|
|
400
|
-
let rebuildAfterUnpin = false;
|
|
401
608
|
try {
|
|
402
609
|
const candidate = state.accumulator.clone();
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
expectedProcessedThroughDigest: state.processedThroughDigest,
|
|
407
|
-
onEntry: entry => candidate.add(entry),
|
|
408
|
-
});
|
|
409
|
-
if (userCostOverlayVersion() !== state.overlayVersion || currentTimeZone() !== state.timeZone) {
|
|
410
|
-
if (retainedFilteredAggregates.get(key) === state) retainedFilteredAggregates.delete(key);
|
|
411
|
-
rebuildAfterUnpin = true;
|
|
412
|
-
} else {
|
|
413
|
-
const next: RetainedUsageAggregate = {
|
|
414
|
-
...state,
|
|
415
|
-
accumulator: candidate,
|
|
416
|
-
usageIncomplete: state.usageIncomplete || scan.oversizedRows > 0,
|
|
417
|
-
usageInvalidRows: state.usageInvalidRows || scan.invalidRows > 0,
|
|
418
|
-
revision: scan.revision,
|
|
419
|
-
identityKey: usageLogIdentityKey(scan.revision),
|
|
420
|
-
revisionKey: usageLogRevisionKey(scan.revision),
|
|
421
|
-
processedThroughBytes: scan.processedThroughBytes,
|
|
422
|
-
processedThroughDigest: scan.processedThroughDigest,
|
|
423
|
-
retainedAt: Date.now(),
|
|
424
|
-
};
|
|
425
|
-
return publishFilteredAggregate(key, next, "append");
|
|
610
|
+
await accumulateCandidates(candidate, read, filter);
|
|
611
|
+
if (userCostOverlayVersion() !== overlayVersion || currentTimeZone() !== timeZone) {
|
|
612
|
+
throw new UsageAggregationInputsChangedError();
|
|
426
613
|
}
|
|
614
|
+
return publishFilteredAggregate(
|
|
615
|
+
key,
|
|
616
|
+
filteredStateFrom(candidate, read.snapshot, overlayVersion, timeZone),
|
|
617
|
+
"append",
|
|
618
|
+
read,
|
|
619
|
+
);
|
|
427
620
|
} catch (error) {
|
|
428
621
|
if (retainedFilteredAggregates.get(key) === state) retainedFilteredAggregates.delete(key);
|
|
429
|
-
|
|
430
|
-
else throw error;
|
|
622
|
+
throw error;
|
|
431
623
|
} finally {
|
|
432
624
|
pinnedAggregates.delete(state);
|
|
433
625
|
trimRetainedFilteredAggregates();
|
|
434
626
|
}
|
|
435
|
-
if (rebuildAfterUnpin) return rebuildFilteredAggregate(key, filter, window);
|
|
436
|
-
throw new Error("filtered usage append did not settle");
|
|
437
627
|
}
|
|
438
628
|
|
|
439
629
|
async function refreshFilteredAggregate(
|
|
@@ -441,20 +631,52 @@ async function refreshFilteredAggregate(
|
|
|
441
631
|
filter: NormalizedUsageFilter,
|
|
442
632
|
window?: UsageTimeWindow,
|
|
443
633
|
): Promise<UsageAggregateResult> {
|
|
444
|
-
|
|
445
|
-
|
|
446
|
-
|
|
447
|
-
|
|
448
|
-
|
|
449
|
-
|
|
450
|
-
|
|
451
|
-
|
|
452
|
-
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
|
|
634
|
+
return withFilterIndexRetry(async () => {
|
|
635
|
+
const overlayVersion = userCostOverlayVersion();
|
|
636
|
+
const timeZone = currentTimeZone();
|
|
637
|
+
const state = retainedFilteredAggregates.get(key);
|
|
638
|
+
if (!state
|
|
639
|
+
|| state.overlayVersion !== overlayVersion
|
|
640
|
+
|| state.timeZone !== timeZone
|
|
641
|
+
|| state.indexGeneration === null) {
|
|
642
|
+
return rebuildFilteredAggregate(key, filter, window, overlayVersion, timeZone);
|
|
643
|
+
}
|
|
644
|
+
const read = await readCandidates({
|
|
645
|
+
...filterQuery(filter, window),
|
|
646
|
+
afterOffset: state.processedThroughBytes,
|
|
647
|
+
});
|
|
648
|
+
if (!read) {
|
|
649
|
+
retainedFilteredAggregates.delete(key);
|
|
650
|
+
return rebuildFilteredAggregate(key, filter, window, overlayVersion, timeZone);
|
|
651
|
+
}
|
|
652
|
+
if (state.indexGeneration !== read.snapshot.generation
|
|
653
|
+
|| state.identityKey !== read.snapshot.identityKey
|
|
654
|
+
|| state.processedThroughBytes > read.snapshot.indexedOffset) {
|
|
655
|
+
retainedFilteredAggregates.delete(key);
|
|
656
|
+
return rebuildFilteredAggregate(key, filter, window, overlayVersion, timeZone);
|
|
657
|
+
}
|
|
658
|
+
if (state.processedThroughBytes === read.snapshot.indexedOffset) {
|
|
659
|
+
// Even an unchanged retained projection validates the ledger against the snapshot, so a
|
|
660
|
+
// rewrite in the window between the index refresh and this return is not served stale.
|
|
661
|
+
await readUsageLedgerRowsAtOffsets({
|
|
662
|
+
offsets: [],
|
|
663
|
+
expectedIdentityKey: read.snapshot.identityKey,
|
|
664
|
+
expectedRevisionKey: usageLogRevisionKey(read.snapshot.revision),
|
|
665
|
+
expectedProcessedThroughBytes: read.snapshot.indexedOffset,
|
|
666
|
+
expectedProcessedThroughDigest: read.snapshot.processedThroughDigest,
|
|
667
|
+
expectedFileSize: read.snapshot.revision?.size,
|
|
668
|
+
});
|
|
669
|
+
state.retainedAt = Date.now();
|
|
670
|
+
// Whole-ledger diagnostics can move without the boundary moving: a torn oversized or
|
|
671
|
+
// malformed suffix is observed by every append scan and never advances the offset.
|
|
672
|
+
state.usageIncomplete = read.snapshot.oversizedRows > 0;
|
|
673
|
+
state.usageInvalidRows = read.snapshot.invalidRows > 0;
|
|
674
|
+
state.revision = read.snapshot.revision;
|
|
675
|
+
state.revisionKey = usageLogRevisionKey(read.snapshot.revision);
|
|
676
|
+
return publishFilteredAggregate(key, state, "unchanged", read);
|
|
677
|
+
}
|
|
678
|
+
return appendFilteredAggregate(key, state, filter, read, overlayVersion, timeZone);
|
|
679
|
+
});
|
|
458
680
|
}
|
|
459
681
|
|
|
460
682
|
function jevStatsResultFrom(
|
|
@@ -681,4 +903,5 @@ export function resetUsageAggregateCacheForTests(): void {
|
|
|
681
903
|
retainedFilteredAggregates.clear();
|
|
682
904
|
jevStatsFlights.clear();
|
|
683
905
|
retainedJevStatsAggregates.clear();
|
|
906
|
+
resetUsageFilterIndexForTests();
|
|
684
907
|
}
|
|
@@ -94,7 +94,7 @@ import { CatalogGatherBusyError } from "../codex/catalog/provider-fetch";
|
|
|
94
94
|
import type { CatalogDisposition, ConvergeCodex } from "../codex/convergence-types";
|
|
95
95
|
import { normalizeCatalogDisposition } from "../codex/catalog-refresh-status";
|
|
96
96
|
import { managementBodyTooLargeResponse } from "./management/body";
|
|
97
|
-
import { handleSessionRoutes } from "./management/session-routes";
|
|
97
|
+
import { handleSessionRoutes, SESSION_REMEMBER_PATH } from "./management/session-routes";
|
|
98
98
|
import { siblingRefusesManagementRequest } from "./management/sibling-guard";
|
|
99
99
|
import { siblingOfLivePort, siblingSkipMessage } from "../codex/sibling-start";
|
|
100
100
|
import { packageVersion } from "../lib/package-version";
|
|
@@ -238,6 +238,12 @@ async function handleLinkRoutesOnDemand(ctx: ManagementContext): Promise<Respons
|
|
|
238
238
|
return handleLinkRoutes(ctx);
|
|
239
239
|
}
|
|
240
240
|
|
|
241
|
+
async function handleTelemetryRoutesOnDemand(ctx: ManagementContext): Promise<Response | null> {
|
|
242
|
+
if (!pathInManagementNamespace(ctx.url.pathname, "/api/telemetry")) return null;
|
|
243
|
+
const { handleTelemetryRoutes } = await import("./management/telemetry-routes");
|
|
244
|
+
return handleTelemetryRoutes(ctx);
|
|
245
|
+
}
|
|
246
|
+
|
|
241
247
|
export async function handleManagementAPI(
|
|
242
248
|
req: Request,
|
|
243
249
|
url: URL,
|
|
@@ -248,7 +254,9 @@ export async function handleManagementAPI(
|
|
|
248
254
|
requestIngress: ManagementRequestIngress = { trustedLoopback: false },
|
|
249
255
|
): Promise<Response | null> {
|
|
250
256
|
if (!isAllowedManagementOrigin(req, config)) {
|
|
251
|
-
|
|
257
|
+
// A proxied dashboard reaches Remember through this gate first; name the reason (#8338).
|
|
258
|
+
const remember = url.pathname === SESSION_REMEMBER_PATH ? { code: "remember_requires_direct_origin" } : {};
|
|
259
|
+
return jsonResponse({ error: "cross-origin request blocked", ...remember }, 403, req, config);
|
|
252
260
|
}
|
|
253
261
|
if (principal === "local-account-switch-capability") {
|
|
254
262
|
if (req.method !== "PUT" || !isLocalAccountSwitchPath(url.pathname) || url.search !== "") {
|
|
@@ -393,6 +401,7 @@ export async function handleManagementAPI(
|
|
|
393
401
|
?? (await handleComboRoutes(ctx))
|
|
394
402
|
?? (await handleSystemRoutes(ctx))
|
|
395
403
|
?? (await handleLabRoutesOnDemand(ctx))
|
|
404
|
+
?? (await handleTelemetryRoutesOnDemand(ctx))
|
|
396
405
|
?? (await handleUsageTimelineRoutes(ctx))
|
|
397
406
|
?? (await handleCompanionRoutes(ctx))
|
|
398
407
|
?? (await handleSidebarRoutes(ctx));
|