@bitkyc08/opencodex 2.94.0 → 2.95.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/gui/dist/assets/App-8yedBkhm.js +58 -0
- package/gui/dist/assets/App-B4j-Txmb.css +1 -0
- package/gui/dist/assets/{Tray-CZatQdoF.js → Tray-erSMzxPG.js} +1 -1
- package/gui/dist/assets/index-D7DCm5eQ.js +94 -0
- package/gui/dist/assets/quota-summary-BK4VuQNc.js +1 -0
- package/gui/dist/index.html +1 -1
- package/package.json +1 -1
- package/src/adapters/anthropic.ts +10 -3
- package/src/adapters/command-code-project-context.ts +3 -3
- package/src/adapters/kiro/adapter.ts +4 -1
- package/src/adapters/kiro/stream.ts +1 -0
- package/src/adapters/kiro-events.ts +1 -0
- package/src/adapters/openai-chat/messages.ts +20 -7
- package/src/adapters/openai-chat/passthrough.ts +4 -2
- package/src/adapters/openai-chat/single-system.ts +24 -0
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +42 -7
- package/src/adapters/openai-responses/prompt-cache.ts +3 -1
- package/src/adapters/openai-responses/request-strips.ts +23 -4
- package/src/adapters/openai-responses/tool-output-recovery.ts +21 -8
- package/src/adapters/openai-responses/tool-schema.ts +20 -8
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/routed-agent-messages.ts +3 -0
- package/src/adapters/xai-web-search.ts +6 -3
- package/src/adapters/zed-additional-tools.ts +7 -7
- package/src/adapters/zed.ts +1 -6
- package/src/advisor/consult.ts +22 -10
- package/src/advisor/runtime.ts +10 -4
- package/src/bridge/max-output-completion.ts +41 -0
- package/src/bridge/response-json.ts +9 -4
- package/src/bridge/sse.ts +13 -2
- package/src/chatgpt/app-server-shim/bundle-trust-policy.ts +5 -0
- package/src/chatgpt/app-server-shim/launcher.ts +40 -6
- package/src/claude/compatibility.ts +5 -1
- package/src/claude/desktop-3p.ts +27 -6
- package/src/claude/desktop-model-visibility.ts +141 -0
- package/src/claude/desktop-remote-store-io.ts +8 -8
- package/src/claude/inbound-content-options.ts +11 -1
- package/src/claude/intercept/proxy-auth.ts +16 -16
- package/src/cli/account-main.ts +3 -2
- package/src/cli/capabilities-provider-models.ts +7 -0
- package/src/cli/chatgpt-command.ts +1 -1
- package/src/cli/codex-launcher.ts +20 -8
- package/src/cli/codex-shim-autorestore.ts +19 -1
- package/src/cli/dispatch.ts +6 -6
- package/src/cli/doctor.ts +5 -5
- package/src/cli/index.ts +4 -9
- package/src/cli/init.ts +2 -2
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +5 -0
- package/src/cli/registry.ts +1 -0
- package/src/cli/restart-scope.ts +2 -2
- package/src/cli/root.ts +6 -6
- package/src/cli/stop-approval.ts +15 -1
- package/src/cli/v2.ts +69 -19
- package/src/client/machine-api.ts +2 -2
- package/src/clients/config-export.ts +14 -3
- package/src/codex/account-cooldown-response.ts +18 -0
- package/src/codex/app-server-restart-service.ts +2 -2
- package/src/codex/auth-api/login-flow.ts +2 -2
- package/src/codex/auth-api/pool-quota-probe.ts +2 -2
- package/src/codex/auth-context.ts +4 -4
- package/src/codex/catalog/bundled.ts +10 -3
- package/src/codex/catalog/metadata.ts +4 -5
- package/src/codex/catalog/native-omission.ts +28 -0
- package/src/codex/catalog/native-template.ts +58 -0
- package/src/codex/catalog/parsing.ts +3 -29
- package/src/codex/catalog/provider-models.ts +2 -1
- package/src/codex/catalog/retained-sync.ts +15 -5
- package/src/codex/catalog/write-audit.ts +18 -18
- package/src/codex/cli-install-provenance.ts +46 -45
- package/src/codex/cli-update-artifacts.ts +8 -6
- package/src/codex/cli-update-job-store-windows.ts +99 -27
- package/src/codex/cli-update-job-worker.ts +3 -11
- package/src/codex/cli-update-recovery.ts +54 -8
- package/src/codex/cli-update-selection-gate.ts +74 -4
- package/src/codex/cli-windows-plan-provenance.ts +37 -19
- package/src/codex/codex-home-owner.ts +9 -8
- package/src/codex/convergence.ts +13 -3
- package/src/codex/coordinator-doctor.ts +14 -8
- package/src/codex/desktop-app/handoff.ts +1 -1
- package/src/codex/desktop-app-restart.ts +11 -1
- package/src/codex/exec-boundary.ts +26 -5
- package/src/codex/history-provider.ts +11 -10
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/main-account.ts +6 -6
- package/src/codex/native-main-lock-file.ts +13 -12
- package/src/codex/native-residue.ts +18 -14
- package/src/codex/orca-auth-source.ts +8 -7
- package/src/codex/quota-types.ts +5 -0
- package/src/codex/quota.ts +49 -7
- package/src/codex/role-auto-assign.ts +50 -26
- package/src/codex/role-capability.ts +160 -0
- package/src/codex/role-sizing.ts +24 -6
- package/src/codex/routing/cooldown-math.ts +3 -2
- package/src/codex/runtime.ts +43 -3
- package/src/codex/shim-fingerprint.ts +11 -9
- package/src/codex/shim-inspect.ts +3 -2
- package/src/codex/shim-restore-lock.ts +11 -14
- package/src/codex/shim-state-file.ts +22 -14
- package/src/codex/shim-wrapper-write.ts +7 -6
- package/src/codex/shim.ts +25 -2
- package/src/codex/transition-state.ts +5 -4
- package/src/combos/failover.ts +43 -4
- package/src/config/atomic-write.ts +38 -7
- package/src/config/diagnostics.ts +3 -0
- package/src/config/initialize.ts +6 -6
- package/src/config/load-degrade.ts +2 -0
- package/src/config/process-state.ts +23 -5
- package/src/config/salvage.ts +1 -0
- package/src/config/schema/config-schema.ts +29 -1
- package/src/config/schema/leaf-validators.ts +7 -0
- package/src/config/schema/workflow-budget.ts +43 -0
- package/src/config/tracked-runtime-inspection.ts +188 -0
- package/src/generated/compatibility-version.json +313 -213
- package/src/integrations/aside-profile-context.ts +1 -1
- package/src/integrations/droid-settings.ts +4 -4
- package/src/integrations/hermes-profiles.ts +3 -3
- package/src/lib/bounded-file-read.ts +3 -9
- package/src/lib/bun-runtime-preflight.ts +9 -8
- package/src/lib/file-identity.ts +15 -0
- package/src/lib/local-chat-completion.ts +8 -6
- package/src/lib/local-destinations.ts +32 -3
- package/src/lib/redact-folding.ts +9 -0
- package/src/lib/spend-pool-alias-validation.ts +6 -6
- package/src/lib/state-store-registrations.ts +2 -0
- package/src/lib/test-home-guard.ts +37 -9
- package/src/lib/windows-secret-acl.ts +47 -29
- package/src/lib/workflow-budget-config.ts +39 -0
- package/src/local-credentials/generation.ts +6 -2
- package/src/local-credentials/inventory.ts +132 -8
- package/src/messaging/remote-forward-failure.ts +35 -0
- package/src/messaging/remote-ports.ts +27 -5
- package/src/messaging/remote-process.ts +30 -4
- package/src/messaging/remote-tunnels.ts +80 -15
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/google-antigravity.ts +23 -10
- package/src/oauth/index.ts +2 -0
- package/src/oauth/kiro-device-login.ts +87 -30
- package/src/oauth/kiro-iam-identity-center.ts +107 -0
- package/src/oauth/store.ts +9 -7
- package/src/providers/account-quota-disk.ts +18 -4
- package/src/providers/cc-switch-import-bytes.ts +991 -0
- package/src/providers/cc-switch-import-source.ts +1083 -0
- package/src/providers/cc-switch-import.ts +942 -0
- package/src/providers/derive.ts +6 -0
- package/src/providers/model-discovery-diagnostic.ts +4 -0
- package/src/providers/model-discovery.ts +4 -4
- package/src/providers/model-rename-fields.ts +2 -0
- package/src/providers/model-rename-migration.ts +41 -6
- package/src/providers/quota/report-cache.ts +17 -4
- package/src/providers/quota.ts +2 -2
- package/src/providers/reasoning-metadata.ts +31 -15
- package/src/providers/registry/entries-core.ts +1 -1
- package/src/providers/registry/entries-extended.ts +1 -1
- package/src/providers/registry/model-ids.ts +1 -0
- package/src/providers/registry/model-seeds.ts +2 -1
- package/src/providers/registry/types.ts +3 -1
- package/src/providers/resolved-model-policy.ts +2 -2
- package/src/providers/routed-config.ts +2 -0
- package/src/providers/stale-model-roster-migration.ts +5 -1
- package/src/providers/xai-transport.ts +4 -4
- package/src/remote-control/workspace-codex-runtime.ts +2 -2
- package/src/remote-control/workspace-executor.ts +14 -13
- package/src/responses/custom-tool-compat.ts +2 -1
- package/src/responses/item-provenance.ts +79 -0
- package/src/responses/namespace-tool-compat.ts +21 -3
- package/src/router.ts +21 -2
- package/src/routing/analytics.ts +3 -5
- package/src/routing/fallback-policy.ts +7 -3
- package/src/routing/health.ts +5 -3
- package/src/routing/history/build-file.ts +6 -0
- package/src/routing/history/indexer.ts +158 -31
- package/src/routing/history/ingest.ts +1 -1
- package/src/routing/history/integrity.ts +208 -0
- package/src/routing/history/rebuild-job.ts +20 -6
- package/src/routing/history/rebuild-protocol.ts +2 -1
- package/src/routing/history/rebuild-worker.ts +18 -0
- package/src/routing/history/sqlite-errors.ts +9 -0
- package/src/server/admission-model-scope.ts +21 -4
- package/src/server/advisor-admission-scope.ts +29 -0
- package/src/server/auth-cors.ts +5 -2
- package/src/server/capture-admission-policy.ts +91 -0
- package/src/server/chat-completions.ts +33 -7
- package/src/server/claude-messages.ts +90 -2
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/index/serve-options.ts +12 -2
- package/src/server/index/websocket-handler.ts +3 -0
- package/src/server/management/agent-settings-routes.ts +34 -9
- package/src/server/management/codex-agent-role-routes.ts +1 -0
- package/src/server/management/codex-role-auto-assign.ts +50 -6
- package/src/server/management/config-routes.ts +15 -4
- package/src/server/management/context.ts +3 -0
- package/src/server/management/native-integration-routes.ts +22 -0
- package/src/server/management/oauth-account-routes.ts +20 -4
- package/src/server/management/provider-overwrite-carry.ts +21 -0
- package/src/server/management/provider-routes.ts +3 -1
- package/src/server/management/route-registry.ts +2 -0
- package/src/server/management/shared.ts +17 -1
- package/src/server/management/workflow-budget-routes.ts +70 -3
- package/src/server/messages-native-eligibility.ts +6 -5
- package/src/server/messages-native-scope.ts +6 -1
- package/src/server/messages-shared.ts +57 -17
- package/src/server/persistent-gui-session.ts +4 -4
- package/src/server/request-log.ts +30 -2
- package/src/server/responses/adapter-delivery.ts +4 -0
- package/src/server/responses/advisor-plan-slot.ts +4 -0
- package/src/server/responses/advisor-slot.ts +73 -46
- package/src/server/responses/codex-auth-error.ts +5 -1
- package/src/server/responses/combo-required-tool-contract.ts +27 -0
- package/src/server/responses/compact.ts +4 -1
- package/src/server/responses/core-combo-failure.ts +2 -0
- package/src/server/responses/core-combo.ts +66 -5
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-options.ts +9 -0
- package/src/server/responses/core.ts +2 -0
- package/src/server/responses/jev-model-invoke.ts +4 -2
- package/src/server/responses/passthrough-dispatch.ts +5 -4
- package/src/server/responses/policy-fallback.ts +2 -0
- package/src/server/responses/request-prepare.ts +4 -5
- package/src/server/responses/request-send-budget.ts +2 -1
- package/src/server/responses/request-sidecar-auth.ts +1 -0
- package/src/server/responses/request-transport.ts +2 -3
- package/src/server/responses/run-turn-execution.ts +4 -0
- package/src/server/responses/sidecar-execution.ts +21 -5
- package/src/server/responses-snapshot-repair.ts +18 -4
- package/src/server/responses-undeclared-tool-guard.ts +4 -0
- package/src/server/workflow-refusal.ts +2 -1
- package/src/service/state-lock.ts +12 -11
- package/src/service-manager-probe.ts +53 -8
- package/src/types/admission-policy.ts +13 -0
- package/src/types/config.ts +25 -0
- package/src/types/provider.ts +10 -0
- package/src/types/request.ts +7 -0
- package/src/types.ts +1 -0
- package/src/update/job.ts +20 -0
- package/src/update/worker-launch.ts +71 -1
- package/src/usage/log.ts +25 -4
- package/src/vision/index.ts +2 -0
- package/src/vision/plan.ts +4 -0
- package/src/vision/routed-describe.ts +38 -23
- package/src/web-search/loop.ts +104 -9
- package/src/web-search/parse.ts +10 -2
- package/gui/dist/assets/App-DMps4OLk.css +0 -1
- package/gui/dist/assets/App-DmvwlhQq.js +0 -58
- package/gui/dist/assets/index-3EPO_KbX.js +0 -94
- package/gui/dist/assets/quota-summary-BHvWg9mi.js +0 -1
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import { closeSync, constants, fstatSync, openSync, readSync, statSync, type
|
|
1
|
+
import { closeSync, constants, fstatSync, openSync, readSync, statSync, type BigIntStats } from "node:fs";
|
|
2
|
+
import { sameFileIdentity } from "../../lib/file-identity";
|
|
2
3
|
|
|
3
4
|
const MAX_CODEX_CONFIG_BYTES = 1024 * 1024;
|
|
4
5
|
|
|
@@ -14,15 +15,15 @@ const MAX_CODEX_CONFIG_BYTES = 1024 * 1024;
|
|
|
14
15
|
export function readBoundedCodexConfig(path: string): string | null {
|
|
15
16
|
let fd: number | undefined;
|
|
16
17
|
try {
|
|
17
|
-
let namedBefore:
|
|
18
|
+
let namedBefore: BigIntStats;
|
|
18
19
|
try {
|
|
19
|
-
namedBefore = statSync(path);
|
|
20
|
+
namedBefore = statSync(path, { bigint: true });
|
|
20
21
|
} catch (error) {
|
|
21
22
|
const code = (error as NodeJS.ErrnoException).code;
|
|
22
23
|
if (code === "ENOENT" || code === "ENOTDIR") return null;
|
|
23
24
|
throw error;
|
|
24
25
|
}
|
|
25
|
-
if (!namedBefore.isFile() || namedBefore.size > MAX_CODEX_CONFIG_BYTES) {
|
|
26
|
+
if (!namedBefore.isFile() || namedBefore.size > BigInt(MAX_CODEX_CONFIG_BYTES)) {
|
|
26
27
|
throw new Error("config.toml is not a bounded regular file");
|
|
27
28
|
}
|
|
28
29
|
// Deliberately no O_NOFOLLOW: Codex and the injector read through a symlinked
|
|
@@ -33,27 +34,27 @@ export function readBoundedCodexConfig(path: string): string | null {
|
|
|
33
34
|
? 0
|
|
34
35
|
: (constants.O_NONBLOCK ?? 0);
|
|
35
36
|
fd = openSync(path, constants.O_RDONLY | guardedFlags);
|
|
36
|
-
const before = fstatSync(fd);
|
|
37
|
-
if (before
|
|
37
|
+
const before = fstatSync(fd, { bigint: true });
|
|
38
|
+
if (!sameFileIdentity(before, namedBefore)) {
|
|
38
39
|
throw new Error("config.toml changed while it was read");
|
|
39
40
|
}
|
|
40
|
-
if (!before.isFile() || before.size > MAX_CODEX_CONFIG_BYTES) {
|
|
41
|
+
if (!before.isFile() || before.size > BigInt(MAX_CODEX_CONFIG_BYTES)) {
|
|
41
42
|
throw new Error("config.toml is not a bounded regular file");
|
|
42
43
|
}
|
|
43
44
|
|
|
44
|
-
const buffer = Buffer.allocUnsafe(before.size + 1);
|
|
45
|
+
const buffer = Buffer.allocUnsafe(Number(before.size) + 1);
|
|
45
46
|
let bytesRead = 0;
|
|
46
47
|
while (bytesRead < buffer.length) {
|
|
47
48
|
const count = readSync(fd, buffer, bytesRead, buffer.length - bytesRead, null);
|
|
48
49
|
if (count === 0) break;
|
|
49
50
|
bytesRead += count;
|
|
50
51
|
}
|
|
51
|
-
const after = fstatSync(fd);
|
|
52
|
-
const namedAfter = statSync(path);
|
|
53
|
-
if (bytesRead !== before.size || after.size !== before.size
|
|
54
|
-
|| after.
|
|
52
|
+
const after = fstatSync(fd, { bigint: true });
|
|
53
|
+
const namedAfter = statSync(path, { bigint: true });
|
|
54
|
+
if (BigInt(bytesRead) !== before.size || after.size !== before.size
|
|
55
|
+
|| after.mtimeNs !== before.mtimeNs || after.ctimeNs !== before.ctimeNs
|
|
55
56
|
|| !namedAfter.isFile()
|
|
56
|
-
|| namedAfter
|
|
57
|
+
|| !sameFileIdentity(namedAfter, before)) {
|
|
57
58
|
throw new Error("config.toml changed while it was read");
|
|
58
59
|
}
|
|
59
60
|
return buffer.toString("utf8", 0, bytesRead);
|
|
@@ -4,6 +4,7 @@ import { classifyChatgptRefreshFailure, noteChatgptRefreshFailure } from "./chat
|
|
|
4
4
|
import { readBoundedResponseBody } from "../lib/bounded-body";
|
|
5
5
|
import { createHash } from "node:crypto";
|
|
6
6
|
import { lstatSync, readFileSync, statSync } from "node:fs";
|
|
7
|
+
import { sameFileIdentity, type FileIdentity } from "../lib/file-identity";
|
|
7
8
|
import { dirname, join, resolve } from "node:path";
|
|
8
9
|
import { readCodexTokens } from "./auth-collision";
|
|
9
10
|
import {
|
|
@@ -86,7 +87,7 @@ type MainAuthJsonCredential = {
|
|
|
86
87
|
* the content hash notices those, and only once the new bytes are visible (#2999).
|
|
87
88
|
* `null` when the target could not be stat'ed, which fails closed.
|
|
88
89
|
*/
|
|
89
|
-
identity:
|
|
90
|
+
identity: FileIdentity | null;
|
|
90
91
|
root: Record<string, unknown>;
|
|
91
92
|
tokens: Record<string, unknown>;
|
|
92
93
|
accessToken?: string;
|
|
@@ -201,10 +202,10 @@ function sha256(value: string): string {
|
|
|
201
202
|
* fail closed, because the whole point here is refusing to overwrite a file we can no
|
|
202
203
|
* longer vouch for.
|
|
203
204
|
*/
|
|
204
|
-
function statIdentity(path: string):
|
|
205
|
+
function statIdentity(path: string): FileIdentity | null {
|
|
205
206
|
try {
|
|
206
|
-
const stat = statSync(path);
|
|
207
|
-
return { dev:
|
|
207
|
+
const stat = statSync(path, { bigint: true });
|
|
208
|
+
return { dev: stat.dev, ino: stat.ino };
|
|
208
209
|
} catch {
|
|
209
210
|
return null;
|
|
210
211
|
}
|
|
@@ -316,8 +317,7 @@ function assertMainAuthJsonIdentityUnchanged(expected: MainAuthJsonCredential):
|
|
|
316
317
|
const identity = statIdentity(expected.path);
|
|
317
318
|
if (!identity
|
|
318
319
|
|| !expected.identity
|
|
319
|
-
|| identity
|
|
320
|
-
|| identity.ino !== expected.identity.ino) {
|
|
320
|
+
|| !sameFileIdentity(identity, expected.identity)) {
|
|
321
321
|
throw new MainAuthJsonChangedDuringRefreshError();
|
|
322
322
|
}
|
|
323
323
|
}
|
|
@@ -6,15 +6,16 @@ import {
|
|
|
6
6
|
fstatSync,
|
|
7
7
|
lstatSync,
|
|
8
8
|
openSync,
|
|
9
|
-
type
|
|
9
|
+
type BigIntStats,
|
|
10
10
|
} from "node:fs";
|
|
11
11
|
|
|
12
12
|
import { hardenSecretPathAsync } from "../lib/windows-secret-acl";
|
|
13
|
+
import { sameFileIdentity } from "../lib/file-identity";
|
|
13
14
|
|
|
14
15
|
export interface StableLockFile {
|
|
15
16
|
readonly fd: number;
|
|
16
|
-
readonly dev:
|
|
17
|
-
readonly ino:
|
|
17
|
+
readonly dev: bigint;
|
|
18
|
+
readonly ino: bigint;
|
|
18
19
|
close(): void;
|
|
19
20
|
}
|
|
20
21
|
|
|
@@ -27,8 +28,8 @@ export class StableLockPathUnsafeError extends Error {
|
|
|
27
28
|
|
|
28
29
|
interface StableLockEntry {
|
|
29
30
|
readonly fd: number;
|
|
30
|
-
readonly dev:
|
|
31
|
-
readonly ino:
|
|
31
|
+
readonly dev: bigint;
|
|
32
|
+
readonly ino: bigint;
|
|
32
33
|
refs: number;
|
|
33
34
|
}
|
|
34
35
|
|
|
@@ -55,7 +56,7 @@ function reference(path: string, entry: StableLockEntry): StableLockFile {
|
|
|
55
56
|
};
|
|
56
57
|
}
|
|
57
58
|
|
|
58
|
-
function assertRegular(stats:
|
|
59
|
+
function assertRegular(stats: BigIntStats, path: string): void {
|
|
59
60
|
if (!stats.isFile() || stats.isSymbolicLink()) {
|
|
60
61
|
throw new StableLockPathUnsafeError(`unsafe SQLite lock path: ${path}`);
|
|
61
62
|
}
|
|
@@ -67,8 +68,8 @@ function errorCode(error: unknown): string | undefined {
|
|
|
67
68
|
: undefined;
|
|
68
69
|
}
|
|
69
70
|
|
|
70
|
-
function matches(handle: StableLockFile, stats:
|
|
71
|
-
return handle
|
|
71
|
+
function matches(handle: StableLockFile, stats: BigIntStats): boolean {
|
|
72
|
+
return sameFileIdentity(handle, stats);
|
|
72
73
|
}
|
|
73
74
|
|
|
74
75
|
export function openStableLockFile(path: string, platform: NodeJS.Platform = process.platform): StableLockFile {
|
|
@@ -84,11 +85,11 @@ export function openStableLockFile(path: string, platform: NodeJS.Platform = pro
|
|
|
84
85
|
throw error;
|
|
85
86
|
}
|
|
86
87
|
}
|
|
87
|
-
if (existsSync(path)) assertRegular(lstatSync(path), path);
|
|
88
|
+
if (existsSync(path)) assertRegular(lstatSync(path, { bigint: true }), path);
|
|
88
89
|
const noFollow = platform === "win32" ? 0 : constants.O_NOFOLLOW;
|
|
89
90
|
const fd = openSync(path, constants.O_RDWR | constants.O_CREAT | noFollow, 0o600);
|
|
90
91
|
try {
|
|
91
|
-
const descriptor = fstatSync(fd);
|
|
92
|
+
const descriptor = fstatSync(fd, { bigint: true });
|
|
92
93
|
assertRegular(descriptor, path);
|
|
93
94
|
const entry: StableLockEntry = {
|
|
94
95
|
fd,
|
|
@@ -109,9 +110,9 @@ export function openStableLockFile(path: string, platform: NodeJS.Platform = pro
|
|
|
109
110
|
}
|
|
110
111
|
|
|
111
112
|
export function assertStableLockFile(path: string, handle: StableLockFile): void {
|
|
112
|
-
let pathStats:
|
|
113
|
+
let pathStats: BigIntStats;
|
|
113
114
|
try {
|
|
114
|
-
pathStats = lstatSync(path);
|
|
115
|
+
pathStats = lstatSync(path, { bigint: true });
|
|
115
116
|
} catch (error) {
|
|
116
117
|
if (errorCode(error) === "ENOENT") {
|
|
117
118
|
throw new StableLockPathUnsafeError(`SQLite lock path identity changed: ${path}`);
|
|
@@ -10,7 +10,8 @@ import {
|
|
|
10
10
|
readSync,
|
|
11
11
|
statSync,
|
|
12
12
|
} from "node:fs";
|
|
13
|
-
import type {
|
|
13
|
+
import type { BigIntStats } from "node:fs";
|
|
14
|
+
import { sameFileIdentity } from "../lib/file-identity";
|
|
14
15
|
import { basename, dirname, join, resolve } from "node:path";
|
|
15
16
|
|
|
16
17
|
import { Database } from "bun:sqlite";
|
|
@@ -57,7 +58,7 @@ type ReadResult =
|
|
|
57
58
|
|
|
58
59
|
type PathResult =
|
|
59
60
|
| { kind: "absent" }
|
|
60
|
-
| { kind: "path"; path: string; stat:
|
|
61
|
+
| { kind: "path"; path: string; stat: BigIntStats }
|
|
61
62
|
| { kind: "indeterminate"; reason: string };
|
|
62
63
|
|
|
63
64
|
type CatalogTarget = {
|
|
@@ -95,14 +96,17 @@ function errorReason(error: unknown): string {
|
|
|
95
96
|
return String(error);
|
|
96
97
|
}
|
|
97
98
|
|
|
99
|
+
function milliseconds(ns: bigint): number {
|
|
100
|
+
return Number(ns / 1_000_000_000n) * 1000 + Number(ns % 1_000_000_000n) / 1e6;
|
|
101
|
+
}
|
|
102
|
+
|
|
98
103
|
function sameStat(
|
|
99
|
-
left:
|
|
100
|
-
right:
|
|
104
|
+
left: BigIntStats,
|
|
105
|
+
right: BigIntStats,
|
|
101
106
|
): boolean {
|
|
102
|
-
return left
|
|
103
|
-
&& left.
|
|
104
|
-
&& left.
|
|
105
|
-
&& left.mtimeMs === right.mtimeMs;
|
|
107
|
+
return sameFileIdentity(left, right)
|
|
108
|
+
&& Number(left.size) === Number(right.size)
|
|
109
|
+
&& milliseconds(left.mtimeNs) === milliseconds(right.mtimeNs);
|
|
106
110
|
}
|
|
107
111
|
|
|
108
112
|
function resolveRegularFile(path: string): PathResult {
|
|
@@ -124,7 +128,7 @@ function resolveRegularFile(path: string): PathResult {
|
|
|
124
128
|
}
|
|
125
129
|
|
|
126
130
|
try {
|
|
127
|
-
const before = statSync(target);
|
|
131
|
+
const before = statSync(target, { bigint: true });
|
|
128
132
|
if (!before.isFile()) {
|
|
129
133
|
return { kind: "indeterminate", reason: "surface is not a regular file" };
|
|
130
134
|
}
|
|
@@ -141,12 +145,12 @@ function readRegularFile(path: string): ReadResult {
|
|
|
141
145
|
// depend on who ran the suite. No read bit means the configured surface is
|
|
142
146
|
// operationally unreadable to an ordinary Codex process and must remain
|
|
143
147
|
// indeterminate even when the inspector itself has elevated privileges.
|
|
144
|
-
if (process.platform !== "win32" && (resolved.stat.mode & 0o444) === 0) {
|
|
148
|
+
if (process.platform !== "win32" && (Number(resolved.stat.mode) & 0o444) === 0) {
|
|
145
149
|
return { kind: "indeterminate", reason: "EACCES: surface has no read permission bits" };
|
|
146
150
|
}
|
|
147
151
|
try {
|
|
148
152
|
const content = readFileSync(resolved.path, "utf8");
|
|
149
|
-
const after = statSync(resolved.path);
|
|
153
|
+
const after = statSync(resolved.path, { bigint: true });
|
|
150
154
|
if (!sameStat(resolved.stat, after)) {
|
|
151
155
|
return { kind: "indeterminate", reason: "surface changed while it was being observed" };
|
|
152
156
|
}
|
|
@@ -497,11 +501,11 @@ function classifyReferencedRollout(
|
|
|
497
501
|
latest = payload.payload;
|
|
498
502
|
}
|
|
499
503
|
}
|
|
500
|
-
const after = fstatSync(handle);
|
|
504
|
+
const after = fstatSync(handle, { bigint: true });
|
|
501
505
|
if (!sameStat(resolved.stat, after)) {
|
|
502
506
|
return indeterminate(surface, resolved.path, "rollout changed while it was being observed");
|
|
503
507
|
}
|
|
504
|
-
const pathAfter = statSync(resolved.path);
|
|
508
|
+
const pathAfter = statSync(resolved.path, { bigint: true });
|
|
505
509
|
if (!sameStat(resolved.stat, pathAfter)) {
|
|
506
510
|
return indeterminate(surface, resolved.path, "rollout pathname was replaced while it was being observed");
|
|
507
511
|
}
|
|
@@ -591,7 +595,7 @@ function classifyHistoryDatabase(path: string, budget: RolloutInspectionBudget):
|
|
|
591
595
|
budget,
|
|
592
596
|
);
|
|
593
597
|
if (rollouts.kind !== "clean") return rollouts;
|
|
594
|
-
const after = statSync(resolved.path);
|
|
598
|
+
const after = statSync(resolved.path, { bigint: true });
|
|
595
599
|
if (!sameStat(resolved.stat, after)) {
|
|
596
600
|
return indeterminate("history", resolved.path, "history database changed while it was being observed");
|
|
597
601
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { closeSync, constants, fstatSync, lstatSync, openSync, readSync, realpathSync } from "node:fs";
|
|
2
2
|
import { dirname, isAbsolute, join, parse, relative, resolve } from "node:path";
|
|
3
|
+
import { sameFileIdentity } from "../lib/file-identity";
|
|
3
4
|
|
|
4
5
|
const MAX_AUTH_BYTES = 256 * 1024;
|
|
5
6
|
export const ORCA_ACCOUNT_DIRECTORY = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
|
|
@@ -23,27 +24,27 @@ export function assertPlainLocalPath(path: string): string {
|
|
|
23
24
|
|
|
24
25
|
export function readBoundedLocalFile(path: string, limit = MAX_AUTH_BYTES): string {
|
|
25
26
|
assertPlainLocalPath(path);
|
|
26
|
-
const before = lstatSync(path);
|
|
27
|
+
const before = lstatSync(path, { bigint: true });
|
|
27
28
|
if (!before.isFile() || before.size > limit) throw new Error("Invalid local credential file.");
|
|
28
29
|
const fd = openSync(path, constants.O_RDONLY | (constants.O_NOFOLLOW ?? 0) | (constants.O_NONBLOCK ?? 0));
|
|
29
30
|
try {
|
|
30
|
-
const opened = fstatSync(fd);
|
|
31
|
-
if (!opened.isFile() || opened.size > limit || before
|
|
31
|
+
const opened = fstatSync(fd, { bigint: true });
|
|
32
|
+
if (!opened.isFile() || opened.size > limit || !sameFileIdentity(before, opened)) {
|
|
32
33
|
throw new Error("Local credential file changed.");
|
|
33
34
|
}
|
|
34
35
|
// The cap bounds the read, not the allocation: tiny registry files should not
|
|
35
36
|
// allocate 32 MiB on each preview/recheck. One extra byte detects concurrent growth.
|
|
36
|
-
const bytes = Buffer.alloc(opened.size + 1);
|
|
37
|
+
const bytes = Buffer.alloc(Number(opened.size) + 1);
|
|
37
38
|
let length = 0;
|
|
38
39
|
while (length < bytes.length) {
|
|
39
40
|
const count = readSync(fd, bytes, length, bytes.length - length, null);
|
|
40
41
|
if (!count) break;
|
|
41
42
|
length += count;
|
|
42
43
|
}
|
|
43
|
-
if (length !== opened.size) throw new Error("Local credential file changed.");
|
|
44
|
+
if (BigInt(length) !== opened.size) throw new Error("Local credential file changed.");
|
|
44
45
|
assertPlainLocalPath(path);
|
|
45
|
-
const after = lstatSync(path);
|
|
46
|
-
if (after
|
|
46
|
+
const after = lstatSync(path, { bigint: true });
|
|
47
|
+
if (!sameFileIdentity(after, opened) || after.size !== opened.size || after.mtimeNs !== opened.mtimeNs) {
|
|
47
48
|
throw new Error("Local credential file changed.");
|
|
48
49
|
}
|
|
49
50
|
return bytes.subarray(0, length).toString("utf8");
|
package/src/codex/quota-types.ts
CHANGED
|
@@ -62,6 +62,11 @@ export function resetAtToMs(resetAt: number): number {
|
|
|
62
62
|
return resetAt < RESET_AT_SECONDS_MAX ? resetAt * 1000 : resetAt;
|
|
63
63
|
}
|
|
64
64
|
|
|
65
|
+
/** Only a valid reset at or before now proves a short-window reading has elapsed. */
|
|
66
|
+
export function hasElapsedShortWindow(resetAt: number | undefined, now: number): boolean {
|
|
67
|
+
return typeof resetAt === "number" && Number.isFinite(resetAt) && resetAt > 0 && resetAtToMs(resetAt) <= now;
|
|
68
|
+
}
|
|
69
|
+
|
|
65
70
|
/**
|
|
66
71
|
* A short-only reading that proves the account is blocked NOW.
|
|
67
72
|
*
|
package/src/codex/quota.ts
CHANGED
|
@@ -5,6 +5,7 @@ import { forgetMainAccountUsage, observeMainAccountUsage, type FreshWindow } fro
|
|
|
5
5
|
import { closeSync, constants as fsConstants, existsSync, fstatSync, openSync, readSync, unlinkSync } from "node:fs";
|
|
6
6
|
import { join } from "node:path";
|
|
7
7
|
import { atomicWriteFile, getConfigDir } from "../config";
|
|
8
|
+
import { withConfigDirHardeningSettled } from "../config/paths";
|
|
8
9
|
import { captureConfigGeneration, type GenerationContext } from "../lib/state-store-sweeper";
|
|
9
10
|
import { isThirtyDayOnlyCodexPlan } from "./plan";
|
|
10
11
|
import { stampCodexQuotaUsageObservation } from "./quota-observation-freshness";
|
|
@@ -42,6 +43,12 @@ let mainPolicyQuota: MainPolicyQuota | null = null;
|
|
|
42
43
|
let diskHydrated = false;
|
|
43
44
|
let persistTimer: ReturnType<typeof setTimeout> | null = null;
|
|
44
45
|
let persistStartedAt: number | null = null;
|
|
46
|
+
/** The latest admitted snapshot write; settles even when admission times out. */
|
|
47
|
+
let persistWrite: Promise<void> = Promise.resolve();
|
|
48
|
+
/** Bumped by a full clear so a fired callback still waiting for ACL admission writes nothing. */
|
|
49
|
+
let persistGeneration = 0;
|
|
50
|
+
/** Test seam: wait for a fired persistence callback's admitted write. */
|
|
51
|
+
export function settleQuotaPersistenceForTests(): Promise<void> { return persistWrite; }
|
|
45
52
|
|
|
46
53
|
const MONTHLY_WINDOW_MIN_SECONDS = 28 * 24 * 60 * 60;
|
|
47
54
|
/**
|
|
@@ -333,7 +340,10 @@ export function setAccountQuotaFromParsed(
|
|
|
333
340
|
const mainDecisionGeneration = mainWriter && mainDecisionQuotaWriterGeneration(mainWriter);
|
|
334
341
|
if (isMain && mainDecisionGeneration !== undefined && decisionRaw)
|
|
335
342
|
publishCodexDecisionQuota(accountId, mainDecisionGeneration, decisionRaw, updatedAt, "codex-main", decisionObservationPartial);
|
|
336
|
-
|
|
343
|
+
// Retiring a short tuple releases a routing block, so it needs the same writer proof as
|
|
344
|
+
// history: a live main writer for main, a live captured pool writer for pool requests.
|
|
345
|
+
const mayRetireShort = isMain ? mainWriter !== undefined : livePoolEvidence;
|
|
346
|
+
const displayQuota: MainPolicyQuotaObservation = mayRetireShort && policyQuota?.shortWindowAbsent === true
|
|
337
347
|
? { ...quota, shortWindowAbsent: true }
|
|
338
348
|
: quota;
|
|
339
349
|
const next = mergeAccountQuota(displayQuota, legacyExisting, updatedAt);
|
|
@@ -797,7 +807,12 @@ function schedulePersistAccountQuotas(): void {
|
|
|
797
807
|
persistTimer = setTimeout(() => {
|
|
798
808
|
persistTimer = null;
|
|
799
809
|
persistStartedAt = null;
|
|
800
|
-
|
|
810
|
+
// Admitted after an overlapping optional config-root ACL flight (#7815); the snapshot is
|
|
811
|
+
// taken inside the callback, and a timed-out admission skips this best-effort write.
|
|
812
|
+
const dir = getConfigDir();
|
|
813
|
+
const generation = persistGeneration;
|
|
814
|
+
persistWrite = withConfigDirHardeningSettled(dir, () => {
|
|
815
|
+
if (generation !== persistGeneration) return;
|
|
801
816
|
const quotas: Record<string, StoredAccountQuota> = {};
|
|
802
817
|
for (const [accountId, quota] of accountQuota.entries()) {
|
|
803
818
|
quotas[accountId] = quota;
|
|
@@ -808,10 +823,10 @@ function schedulePersistAccountQuotas(): void {
|
|
|
808
823
|
...(mainPolicyQuota ? { mainPolicyQuota } : {}),
|
|
809
824
|
history: quotaHistory.serialize(),
|
|
810
825
|
};
|
|
811
|
-
atomicWriteFile(join(
|
|
812
|
-
}
|
|
826
|
+
atomicWriteFile(join(dir, QUOTA_CACHE_FILENAME), `${JSON.stringify(body)}\n`);
|
|
827
|
+
}).catch(() => {
|
|
813
828
|
// Best-effort persistence only.
|
|
814
|
-
}
|
|
829
|
+
});
|
|
815
830
|
}, delay);
|
|
816
831
|
}
|
|
817
832
|
|
|
@@ -887,6 +902,7 @@ export function clearAccountQuota(accountId?: string): void {
|
|
|
887
902
|
persistTimer = null;
|
|
888
903
|
}
|
|
889
904
|
persistStartedAt = null;
|
|
905
|
+
persistGeneration += 1;
|
|
890
906
|
try {
|
|
891
907
|
const path = join(getConfigDir(), QUOTA_CACHE_FILENAME);
|
|
892
908
|
if (existsSync(path)) unlinkSync(path);
|
|
@@ -934,7 +950,14 @@ export function parseMainPolicyUsageQuota(data: WhamUsageResponse): MainPolicyQu
|
|
|
934
950
|
const windows = [data.rate_limit?.primary_window, data.rate_limit?.secondary_window, data.rate_limit?.tertiary_window];
|
|
935
951
|
if (windows.some(window => isInvalidPolicyUsagePercent(window?.used_percent))) return null;
|
|
936
952
|
const quota = filterMainPolicyMonthlyQuota(parseUsageQuota(data), isThirtyDayOnlyCodexPlan(data.plan_type));
|
|
937
|
-
|
|
953
|
+
return quota ? withWhamShortWindowAbsence(data, quota) : null;
|
|
954
|
+
}
|
|
955
|
+
|
|
956
|
+
/** Derive absence from complete WHAM topology without changing the display quota. */
|
|
957
|
+
export function withWhamShortWindowAbsence(
|
|
958
|
+
data: WhamUsageResponse, quota: Omit<StoredAccountQuota, "updatedAt">,
|
|
959
|
+
): MainPolicyQuotaObservation {
|
|
960
|
+
const [primary, secondary, tertiary] = [data.rate_limit?.primary_window, data.rate_limit?.secondary_window, data.rate_limit?.tertiary_window];
|
|
938
961
|
// Primary and secondary must explicitly report their topology. WHAM also sends
|
|
939
962
|
// two-window responses without tertiary; an explicit allowed verdict disambiguates those
|
|
940
963
|
// from partial observations. A present tertiary still requires measured long/null evidence.
|
|
@@ -942,7 +965,7 @@ export function parseMainPolicyUsageQuota(data: WhamUsageResponse): MainPolicyQu
|
|
|
942
965
|
// carries a valid usage reading: a long window without used_percent leaves that
|
|
943
966
|
// window's usage unknown, and unknown usage must never release a block.
|
|
944
967
|
// Headers never supply this proof, and reset time alone still cannot release a block.
|
|
945
|
-
if (
|
|
968
|
+
if ((isMeasuredLongWindow(primary)
|
|
946
969
|
|| (primary === null && isMeasuredLongWindow(secondary) && quota.weeklyPercent !== undefined))
|
|
947
970
|
&& (secondary === null || isMeasuredLongWindow(secondary))
|
|
948
971
|
&& (tertiary === null || isMeasuredLongWindow(tertiary)
|
|
@@ -952,6 +975,25 @@ export function parseMainPolicyUsageQuota(data: WhamUsageResponse): MainPolicyQu
|
|
|
952
975
|
return quota;
|
|
953
976
|
}
|
|
954
977
|
|
|
978
|
+
/**
|
|
979
|
+
* Policy evidence for a stored pool account's WHAM read (pool probe or re-login): null when any
|
|
980
|
+
* reading is invalid. A complete long/null topology marks short-window absence (#7961) unless
|
|
981
|
+
* upstream explicitly denied the account, since a denial is never evidence that a block ended.
|
|
982
|
+
*/
|
|
983
|
+
export function poolWhamPolicyObservation(
|
|
984
|
+
data: WhamUsageResponse, quota: Omit<StoredAccountQuota, "updatedAt"> | null,
|
|
985
|
+
): MainPolicyQuotaObservation | null {
|
|
986
|
+
if (!quota || !isValidWhamHistoryObservation(data)) return null;
|
|
987
|
+
// Retirement releases a block, so a present reading that does not parse is not "unknown".
|
|
988
|
+
const readings = [data.rate_limit?.primary_window, data.rate_limit?.secondary_window, data.rate_limit?.tertiary_window];
|
|
989
|
+
for (const limit of Array.isArray(data.additional_rate_limits) ? data.additional_rate_limits : []) {
|
|
990
|
+
if (limit && typeof limit === "object") readings.push(limit.rate_limit?.primary_window, limit.rate_limit?.secondary_window);
|
|
991
|
+
}
|
|
992
|
+
const malformed = readings.some(window => window?.used_percent != null
|
|
993
|
+
&& normalizeUsagePercent(window.used_percent) === undefined);
|
|
994
|
+
return data.rate_limit?.allowed === false || malformed ? quota : withWhamShortWindowAbsence(data, quota);
|
|
995
|
+
}
|
|
996
|
+
|
|
955
997
|
function isMeasuredLongWindow(window: WhamUsageWindow | null | undefined): boolean {
|
|
956
998
|
return isExplicitLongWindow(window) && normalizeUsagePercent(window?.used_percent) !== undefined;
|
|
957
999
|
}
|
|
@@ -4,19 +4,23 @@
|
|
|
4
4
|
*
|
|
5
5
|
* Tier of a candidate model, first rule that applies:
|
|
6
6
|
* 1. codexRoleTiers in the opencodex config lists it under fast, standard or frontier.
|
|
7
|
-
* 2.
|
|
7
|
+
* 2. At least two candidates have a measured score in the role's task domain. Measured candidates
|
|
8
|
+
* are ranked by that score and split across the tiers the same way price splits them below;
|
|
9
|
+
* unmeasured ones are left out rather than placed among measured ones by price.
|
|
10
|
+
* 3. It has a known price. Priced candidates are ranked by input plus output USD per 1M tokens.
|
|
8
11
|
* Three or more split evenly across the three tiers by rank, cheapest in fast. Fewer than three
|
|
9
12
|
* cannot fill every tier, so the ranking is anchored at the top: the dearest is frontier,
|
|
10
13
|
* because it is the strongest model on offer, and each cheaper one sits one tier lower. One
|
|
11
14
|
* priced model is frontier; two are standard and frontier. The tier left empty is fast, so a
|
|
12
15
|
* fast role steps up to the cheapest model and a standard role keeps it instead of jumping to
|
|
13
16
|
* the dearest, which keeps every role on the cheapest sufficient model on offer.
|
|
14
|
-
*
|
|
17
|
+
* 4. Otherwise it is unclassified and never proposed.
|
|
15
18
|
*
|
|
16
19
|
* A role gets the cheapest sufficient model: the lowest tier at or above what it was sized for,
|
|
17
|
-
* then the lowest price, then the model the role already uses when
|
|
18
|
-
* then the picker's own order. The picker lists native models first,
|
|
19
|
-
* step a role on a routed model moved to a native one priced and
|
|
20
|
+
* then the lowest price, then the higher measured score, then the model the role already uses when
|
|
21
|
+
* it is one of the tied models, then the picker's own order. The picker lists native models first,
|
|
22
|
+
* so without the current-model step a role on a routed model moved to a native one priced and
|
|
23
|
+
* tiered the same.
|
|
20
24
|
*
|
|
21
25
|
* Effort binds to positions on the chosen model's ladder: glance is the floor, measured is the
|
|
22
26
|
* model's default or the middle rung, exhaustive is the ceiling, and thorough is the rung above
|
|
@@ -25,7 +29,7 @@
|
|
|
25
29
|
* above wins because thorough asks for more than the everyday setting. Nothing resolves outside
|
|
26
30
|
* the ladder.
|
|
27
31
|
*/
|
|
28
|
-
import { SIZING_TIERS, type RoleSizingOutcome, type SizingEffort, type SizingTier } from "./role-sizing";
|
|
32
|
+
import { SIZING_TIERS, type RoleSizingOutcome, type SizingDomain, type SizingEffort, type SizingTier } from "./role-sizing";
|
|
29
33
|
import { CODEX_REASONING_LEVELS } from "../reasoning-effort";
|
|
30
34
|
|
|
31
35
|
export type RoleTierMapping = Partial<Record<SizingTier, readonly string[]>>;
|
|
@@ -40,7 +44,9 @@ export interface RoleModelCandidate {
|
|
|
40
44
|
|
|
41
45
|
export interface ClassifiedCandidate extends RoleModelCandidate {
|
|
42
46
|
readonly tier: SizingTier | null;
|
|
43
|
-
readonly tierSource: "mapping" | "price" | null;
|
|
47
|
+
readonly tierSource: "mapping" | "measured" | "price" | null;
|
|
48
|
+
/** The measured score the tier came from, or null when it came from elsewhere. */
|
|
49
|
+
readonly score: number | null;
|
|
44
50
|
}
|
|
45
51
|
|
|
46
52
|
const LADDER_ORDER = ["none", "minimal", ...CODEX_REASONING_LEVELS.map(level => level.effort)];
|
|
@@ -66,33 +72,45 @@ export function mapEffortToLevel(intent: SizingEffort, efforts: readonly string[
|
|
|
66
72
|
}
|
|
67
73
|
}
|
|
68
74
|
|
|
75
|
+
/** Split items ranked weakest first across the tiers; fewer than three are anchored at the top. */
|
|
76
|
+
function tierByRank<T>(ranked: readonly T[]): Map<T, SizingTier> {
|
|
77
|
+
const top = SIZING_TIERS.length - 1;
|
|
78
|
+
return new Map(ranked.map((item, rank) => [item, SIZING_TIERS[ranked.length < SIZING_TIERS.length
|
|
79
|
+
? top - (ranked.length - 1 - rank)
|
|
80
|
+
: Math.round((rank * top) / (ranked.length - 1))]!]));
|
|
81
|
+
}
|
|
82
|
+
|
|
69
83
|
export function classifyRoleModelCandidates(
|
|
70
84
|
candidates: readonly RoleModelCandidate[],
|
|
71
85
|
mapping: RoleTierMapping = {},
|
|
86
|
+
measured: ReadonlyMap<string, number> = new Map(),
|
|
72
87
|
): ClassifiedCandidate[] {
|
|
73
88
|
const mapped = new Map<string, SizingTier>();
|
|
74
89
|
for (const tier of SIZING_TIERS) {
|
|
75
90
|
for (const model of mapping[tier] ?? []) if (!mapped.has(model)) mapped.set(model, tier);
|
|
76
91
|
}
|
|
77
|
-
const
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
92
|
+
const unmapped = candidates.filter(candidate => !mapped.has(candidate.model));
|
|
93
|
+
const scored = unmapped.filter(candidate => measured.has(candidate.model));
|
|
94
|
+
const scoreTiers = tierByRank([...new Set(scored.map(candidate => measured.get(candidate.model)!))].sort((a, b) => a - b));
|
|
95
|
+
const byScore = scored.length >= 2
|
|
96
|
+
? new Map(scored.map(candidate => [candidate.model, scoreTiers.get(measured.get(candidate.model)!)!] as const))
|
|
97
|
+
: new Map<string, SizingTier>();
|
|
98
|
+
const byPrice = byScore.size > 0
|
|
99
|
+
? new Map<string, SizingTier>()
|
|
100
|
+
: tierByRank(unmapped
|
|
101
|
+
.map((candidate, order) => ({ candidate, order }))
|
|
102
|
+
.filter(({ candidate }) => candidate.unitPrice !== null)
|
|
103
|
+
.sort((a, b) => a.candidate.unitPrice! - b.candidate.unitPrice! || a.order - b.order)
|
|
104
|
+
.map(({ candidate }) => candidate.model));
|
|
89
105
|
return candidates.map(candidate => {
|
|
90
106
|
const fromMapping = mapped.get(candidate.model);
|
|
91
|
-
if (fromMapping) return { ...candidate, tier: fromMapping, tierSource: "mapping" as const };
|
|
107
|
+
if (fromMapping) return { ...candidate, tier: fromMapping, tierSource: "mapping" as const, score: null };
|
|
108
|
+
const fromScore = byScore.get(candidate.model);
|
|
109
|
+
if (fromScore) return { ...candidate, tier: fromScore, tierSource: "measured" as const, score: measured.get(candidate.model)! };
|
|
92
110
|
const fromPrice = byPrice.get(candidate.model);
|
|
93
111
|
return fromPrice
|
|
94
|
-
? { ...candidate, tier: fromPrice, tierSource: "price" as const }
|
|
95
|
-
: { ...candidate, tier: null, tierSource: null };
|
|
112
|
+
? { ...candidate, tier: fromPrice, tierSource: "price" as const, score: null }
|
|
113
|
+
: { ...candidate, tier: null, tierSource: null, score: null };
|
|
96
114
|
});
|
|
97
115
|
}
|
|
98
116
|
|
|
@@ -107,6 +125,7 @@ export function cheapestSufficientCandidate(
|
|
|
107
125
|
.filter(entry => entry.rank >= need)
|
|
108
126
|
.sort((a, b) => a.rank - b.rank
|
|
109
127
|
|| (a.candidate.unitPrice ?? Infinity) - (b.candidate.unitPrice ?? Infinity)
|
|
128
|
+
|| (b.candidate.score ?? -Infinity) - (a.candidate.score ?? -Infinity)
|
|
110
129
|
|| Number(b.candidate.model === current) - Number(a.candidate.model === current)
|
|
111
130
|
|| a.order - b.order);
|
|
112
131
|
return ranked[0]?.candidate ?? null;
|
|
@@ -123,10 +142,13 @@ export type RoleProposal = RoleProposalInput & (
|
|
|
123
142
|
readonly status: "proposed" | "unassigned";
|
|
124
143
|
readonly tier: SizingTier;
|
|
125
144
|
readonly effortIntent: SizingEffort;
|
|
145
|
+
readonly domain: SizingDomain;
|
|
126
146
|
readonly rationale: string;
|
|
127
147
|
readonly moveUpIf: string;
|
|
128
148
|
readonly moveDownIf: string;
|
|
129
149
|
readonly proposedModel: string | null;
|
|
150
|
+
/** Where the picked model's tier came from: a user mapping, a measured score, or price rank. */
|
|
151
|
+
readonly tierSource: ClassifiedCandidate["tierSource"];
|
|
130
152
|
/** The sized effort on the picked model's ladder; null only when that model has no ladder. */
|
|
131
153
|
readonly proposedEffort: string | null;
|
|
132
154
|
readonly reason: string | null;
|
|
@@ -138,23 +160,25 @@ export function buildRoleProposals(
|
|
|
138
160
|
roles: readonly RoleProposalInput[],
|
|
139
161
|
sizing: ReadonlyMap<string, RoleSizingOutcome>,
|
|
140
162
|
classified: readonly ClassifiedCandidate[],
|
|
163
|
+
classifiedByDomain: ReadonlyMap<SizingDomain, readonly ClassifiedCandidate[]> = new Map(),
|
|
141
164
|
): RoleProposal[] {
|
|
142
165
|
return roles.map(role => {
|
|
143
166
|
const outcome = sizing.get(role.role) ?? { unsized: "the role was not sized" };
|
|
144
167
|
if ("unsized" in outcome) return { ...role, status: "unsized", reason: outcome.unsized };
|
|
145
|
-
const { tier, effort, rationale, moveUpIf, moveDownIf } = outcome.sizing;
|
|
146
|
-
const pick = cheapestSufficientCandidate(classified, tier, role.model);
|
|
147
|
-
const sized = { ...role, tier, effortIntent: effort, rationale, moveUpIf, moveDownIf };
|
|
168
|
+
const { tier, effort, domain, rationale, moveUpIf, moveDownIf } = outcome.sizing;
|
|
169
|
+
const pick = cheapestSufficientCandidate(classifiedByDomain.get(domain) ?? classified, tier, role.model);
|
|
170
|
+
const sized = { ...role, tier, effortIntent: effort, domain, rationale, moveUpIf, moveDownIf };
|
|
148
171
|
if (!pick) {
|
|
149
172
|
return {
|
|
150
173
|
...sized,
|
|
151
174
|
status: "unassigned",
|
|
152
175
|
proposedModel: null,
|
|
176
|
+
tierSource: null,
|
|
153
177
|
proposedEffort: null,
|
|
154
178
|
reason: `no available model is classified ${tier} or above`,
|
|
155
179
|
};
|
|
156
180
|
}
|
|
157
181
|
const proposedEffort = mapEffortToLevel(effort, pick.efforts, pick.defaultEffort);
|
|
158
|
-
return { ...sized, status: "proposed", proposedModel: pick.model, proposedEffort, reason: null };
|
|
182
|
+
return { ...sized, status: "proposed", proposedModel: pick.model, tierSource: pick.tierSource, proposedEffort, reason: null };
|
|
159
183
|
});
|
|
160
184
|
}
|