@bitkyc08/opencodex 2.94.0 → 2.96.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-B4j-Txmb.css +1 -0
- package/gui/dist/assets/App-bwugJRKn.js +58 -0
- package/gui/dist/assets/{Tray-CZatQdoF.js → Tray-BOPQyDbH.js} +1 -1
- package/gui/dist/assets/index-ebuVUtB7.js +94 -0
- package/gui/dist/assets/quota-summary-6HsrHQAy.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/ollama-native.ts +10 -6
- 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/canonical-forward.ts +50 -13
- package/src/adapters/openai-responses/muse-tool-catalog.ts +87 -0
- package/src/adapters/openai-responses/passthrough.ts +45 -11
- 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/openai-responses/transport.ts +17 -26
- package/src/adapters/opencode-go-additional-tools.ts +39 -6
- package/src/adapters/qoder/adapter.ts +1 -1
- package/src/adapters/qoder/image-input.ts +5 -2
- 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/agent.ts +44 -15
- package/src/cli/capabilities-agents-routing.ts +9 -0
- 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/ensure-desired-integrations.ts +4 -3
- package/src/cli/index.ts +8 -10
- package/src/cli/init.ts +2 -2
- package/src/cli/internal-command.ts +29 -2
- package/src/cli/message-command.ts +2 -1
- package/src/cli/message-mcp-command.ts +29 -0
- package/src/cli/provider-cc-switch-import.ts +185 -0
- package/src/cli/provider.ts +5 -0
- package/src/cli/registry.ts +2 -1
- 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/account-store.ts +1 -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-provider.ts +15 -0
- package/src/codex/auth-context.ts +14 -23
- 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/forward-transport-headers.ts +33 -33
- package/src/codex/history-provider.ts +11 -10
- package/src/codex/inject/bounded-config-reader.ts +14 -13
- package/src/codex/installation-id.ts +72 -0
- 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 +380 -244
- package/src/grok/sync.ts +10 -1
- 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 +49 -31
- 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/mcp-queue-rpc.ts +102 -0
- package/src/messaging/mcp-queue-server.ts +42 -0
- package/src/messaging/mcp-queue-tools.ts +39 -0
- 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/anthropic-identity.ts +2 -6
- package/src/oauth/antigravity-discovery-diagnostics.ts +65 -0
- package/src/oauth/google-antigravity.ts +23 -10
- package/src/oauth/index.ts +7 -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/anthropic-subscription.ts +25 -0
- 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/claude-cli-usage.ts +15 -67
- 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/anthropic-decision-windows.ts +5 -19
- package/src/providers/quota/anthropic-usage-windows.ts +55 -0
- 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/responses/parser-tools.ts +1 -0
- package/src/responses/schema.ts +5 -2
- 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/audio-dictation.ts +3 -0
- package/src/server/audio-live.ts +8 -2
- package/src/server/audio-upstream.ts +2 -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 +93 -2
- package/src/server/codex-model-list.ts +2 -1
- package/src/server/configured-credentials.ts +5 -0
- package/src/server/context-history.ts +9 -6
- package/src/server/images.ts +14 -5
- package/src/server/index/live-sideband.ts +16 -2
- package/src/server/index/serve-options.ts +13 -2
- package/src/server/index/websocket-handler.ts +4 -1
- package/src/server/live.ts +30 -5
- 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/adapter-dispatch.ts +5 -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 +9 -1
- package/src/server/responses/combo-required-tool-contract.ts +39 -0
- package/src/server/responses/compact.ts +41 -20
- package/src/server/responses/core-codex-account.ts +17 -6
- package/src/server/responses/core-combo-failure.ts +2 -0
- package/src/server/responses/core-combo.ts +70 -5
- package/src/server/responses/core-lifetime.ts +4 -0
- package/src/server/responses/core-normalize.ts +7 -1
- 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-build-error.ts +36 -0
- package/src/server/responses/passthrough-dispatch.ts +10 -24
- 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 +4 -1
- 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/search.ts +13 -4
- package/src/server/workflow-refusal.ts +2 -1
- package/src/server/ws-bridge.ts +5 -2
- 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/describe.ts +4 -7
- 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/executor.ts +4 -7
- 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,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { CodexInstallationIdUnavailableError, codexInstallationIdForAccount } from "./installation-id";
|
|
2
2
|
|
|
3
3
|
/** Native request metadata shared by the HTTP adapter and WS preparation. */
|
|
4
4
|
export const CODEX_RESPONSES_LITE_HEADER = "x-openai-internal-codex-responses-lite";
|
|
@@ -9,40 +9,27 @@ export const CODEX_TURN_METADATA_HEADER = "x-codex-turn-metadata";
|
|
|
9
9
|
export const CODEX_TURN_STATE_HEADER = "x-codex-turn-state";
|
|
10
10
|
export const CODEX_ATTESTATION_HEADER = "x-oai-attestation";
|
|
11
11
|
|
|
12
|
+
// Caller credentials are forwarded only to the canonical Codex destination, never by capability.
|
|
13
|
+
export const FORWARD_HEADERS = [
|
|
14
|
+
"authorization", "chatgpt-account-id", "openai-beta", "originator", "session_id", "session-id",
|
|
15
|
+
"thread-id", "x-client-request-id", "x-codex-beta-features", "x-codex-installation-id",
|
|
16
|
+
"x-codex-parent-thread-id", "x-codex-turn-metadata", "x-codex-turn-state", "x-codex-window-id",
|
|
17
|
+
"x-oai-attestation", "x-openai-subagent", "x-responsesapi-include-timing-metrics", "version", CODEX_RESPONSES_LITE_HEADER,
|
|
18
|
+
];
|
|
19
|
+
|
|
12
20
|
const MAX_ROUTING_MODEL_BYTES = 256;
|
|
13
21
|
const MAX_ROUTING_TIER_BYTES = 64;
|
|
14
|
-
const INSTALL_BODY_KEY = "opencodex-codex-pool-install-body-v1";
|
|
15
|
-
const INSTALL_TAG_KEY = "opencodex-codex-pool-install-tag-v1";
|
|
16
|
-
const UUID_V4_RE = /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
|
|
17
22
|
const MAX_TURN_METADATA_BYTES = 32 * 1024;
|
|
18
23
|
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
/**
|
|
24
|
-
* Deterministic, idempotent RFC 4122 v4 UUID isolated per (chatgptAccountId, callerInstallationId).
|
|
25
|
-
* Calling it twice with the same chatgptAccountId returns the identical UUID without double-hashing.
|
|
26
|
-
*/
|
|
27
|
-
export function deriveCodexAccountInstallationId(chatgptAccountId: string, callerInstallationId: string): string {
|
|
28
|
-
const account = chatgptAccountId.trim();
|
|
29
|
-
const raw = callerInstallationId.trim();
|
|
30
|
-
if (!account || !raw) return callerInstallationId;
|
|
31
|
-
if (UUID_V4_RE.test(raw)) {
|
|
32
|
-
const hex = raw.replace(/-/g, "").toLowerCase();
|
|
33
|
-
if (hex.slice(20, 32) === accountTagForUuidPrefix(account, hex.slice(0, 20))) {
|
|
34
|
-
return raw.toLowerCase();
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
const h = createHmac("sha256", INSTALL_BODY_KEY).update(`${account}\0${raw}`).digest("hex");
|
|
38
|
-
const variant = ((Number.parseInt(h[16]!, 16) & 0x3) | 0x8).toString(16);
|
|
39
|
-
const prefix20 = `${h.slice(0, 8)}${h.slice(8, 12)}4${h.slice(13, 16)}${variant}${h.slice(17, 20)}`;
|
|
40
|
-
const node12 = accountTagForUuidPrefix(account, prefix20);
|
|
41
|
-
return `${prefix20.slice(0, 8)}-${prefix20.slice(8, 12)}-${prefix20.slice(12, 16)}-${prefix20.slice(16, 20)}-${node12}`;
|
|
24
|
+
/** Compatibility export: caller values never contribute to the selected account identity. */
|
|
25
|
+
export function deriveCodexAccountInstallationId(chatgptAccountId: string, _callerInstallationId: string): string {
|
|
26
|
+
return codexInstallationIdForAccount(chatgptAccountId);
|
|
42
27
|
}
|
|
43
28
|
|
|
44
29
|
export function rewriteTurnMetadataInstallationId(rawMetadata: string, chatgptAccountId: string): string {
|
|
45
|
-
if (!chatgptAccountId.trim()
|
|
30
|
+
if (!chatgptAccountId.trim()) throw new CodexInstallationIdUnavailableError();
|
|
31
|
+
// A size bound must refuse the Pool send, never bypass identity projection.
|
|
32
|
+
if (Buffer.byteLength(rawMetadata, "utf8") > MAX_TURN_METADATA_BYTES) throw new CodexInstallationIdUnavailableError();
|
|
46
33
|
let parsed: unknown;
|
|
47
34
|
try { parsed = JSON.parse(rawMetadata); } catch { return rawMetadata; }
|
|
48
35
|
if (!parsed || typeof parsed !== "object" || Array.isArray(parsed)) return rawMetadata;
|
|
@@ -54,10 +41,10 @@ export function rewriteTurnMetadataInstallationId(rawMetadata: string, chatgptAc
|
|
|
54
41
|
}
|
|
55
42
|
|
|
56
43
|
export function isolateCodexPoolAccountHeaders(headers: Headers, chatgptAccountId: string): void {
|
|
44
|
+
if (!chatgptAccountId.trim()) throw new CodexInstallationIdUnavailableError();
|
|
57
45
|
headers.delete(CODEX_ATTESTATION_HEADER);
|
|
58
|
-
if (!chatgptAccountId.trim()) return;
|
|
59
46
|
const installId = headers.get(CODEX_INSTALLATION_ID_HEADER);
|
|
60
|
-
if (installId
|
|
47
|
+
if (installId !== null) {
|
|
61
48
|
headers.set(CODEX_INSTALLATION_ID_HEADER, deriveCodexAccountInstallationId(chatgptAccountId, installId));
|
|
62
49
|
}
|
|
63
50
|
const turnMeta = headers.get(CODEX_TURN_METADATA_HEADER);
|
|
@@ -67,15 +54,17 @@ export function isolateCodexPoolAccountHeaders(headers: Headers, chatgptAccountI
|
|
|
67
54
|
}
|
|
68
55
|
|
|
69
56
|
export function isolateCodexPoolClientMetadata(body: unknown, chatgptAccountId: string | undefined): unknown {
|
|
70
|
-
if (
|
|
57
|
+
if (chatgptAccountId === undefined) return body;
|
|
58
|
+
if (!chatgptAccountId.trim()) throw new CodexInstallationIdUnavailableError();
|
|
59
|
+
if (!body || typeof body !== "object" || Array.isArray(body)) return body;
|
|
71
60
|
const record = body as Record<string, unknown>;
|
|
72
61
|
const cm = record.client_metadata;
|
|
73
62
|
if (!cm || typeof cm !== "object" || Array.isArray(cm)) return body;
|
|
74
63
|
const meta = cm as Record<string, unknown>;
|
|
75
64
|
let nextMeta: Record<string, unknown> | undefined;
|
|
76
65
|
const rawInstallId = meta[CODEX_INSTALLATION_ID_HEADER];
|
|
77
|
-
if (
|
|
78
|
-
const nextId =
|
|
66
|
+
if (Object.hasOwn(meta, CODEX_INSTALLATION_ID_HEADER)) {
|
|
67
|
+
const nextId = codexInstallationIdForAccount(chatgptAccountId);
|
|
79
68
|
if (nextId !== rawInstallId) nextMeta = { ...meta, [CODEX_INSTALLATION_ID_HEADER]: nextId };
|
|
80
69
|
}
|
|
81
70
|
const rawTurnMeta = (nextMeta ?? meta)[CODEX_TURN_METADATA_HEADER];
|
|
@@ -103,3 +92,14 @@ export function applyCodexRoutingHint(headers: Headers, body: unknown): void {
|
|
|
103
92
|
headers.set(CODEX_ROUTING_HINT_HEADER,
|
|
104
93
|
`model=${record.model}${tier === undefined ? "" : `;tier=${tier}`}`);
|
|
105
94
|
}
|
|
95
|
+
|
|
96
|
+
/** Selected identity is authoritative after provider-header merges, including deletions. */
|
|
97
|
+
export function mergeCodexSelectedHeaders(configured: HeadersInit | undefined, selected: Headers): Headers {
|
|
98
|
+
const headers = new Headers(configured);
|
|
99
|
+
for (const name of [CODEX_INSTALLATION_ID_HEADER, CODEX_TURN_METADATA_HEADER, CODEX_ATTESTATION_HEADER]) headers.delete(name);
|
|
100
|
+
for (const name of FORWARD_HEADERS) {
|
|
101
|
+
const value = selected.get(name);
|
|
102
|
+
if (value !== null) headers.set(name, value);
|
|
103
|
+
}
|
|
104
|
+
return headers;
|
|
105
|
+
}
|
|
@@ -7,6 +7,7 @@ import { Database } from "bun:sqlite";
|
|
|
7
7
|
import { resolveCodexStateDbPath } from "./paths";
|
|
8
8
|
import { openCodexStateForPreflight } from "./history-state-open";
|
|
9
9
|
import { atomicWriteFile, getConfigDir } from "../config";
|
|
10
|
+
import { sameFileIdentity, statTimeMs, type FileIdentity } from "../lib/file-identity";
|
|
10
11
|
import {
|
|
11
12
|
CODEX_HISTORY_RESUMABLE_SOURCES,
|
|
12
13
|
codexHistoryBackupId,
|
|
@@ -268,15 +269,15 @@ function readFirstLineProviderValue(path: string, expectedId: string): string |
|
|
|
268
269
|
|
|
269
270
|
function patchFirstLineProviderInPlace(
|
|
270
271
|
path: string, expectedId: string, provider: string,
|
|
271
|
-
expectedIdentity:
|
|
272
|
+
expectedIdentity: FileIdentity,
|
|
272
273
|
): FirstLineProviderResult {
|
|
273
274
|
historyAppendHooks?.beforeFirstLineOpen?.(path);
|
|
274
275
|
const fd = openSync(path, "r+");
|
|
275
276
|
try {
|
|
276
277
|
const assertIdentity = (): void => {
|
|
277
278
|
assertHistoryDescriptorIdentity(path, fd);
|
|
278
|
-
const held = fstatSync(fd);
|
|
279
|
-
if (held
|
|
279
|
+
const held = fstatSync(fd, { bigint: true });
|
|
280
|
+
if (!sameFileIdentity(held, expectedIdentity)) {
|
|
280
281
|
throw new CodexHistoryIntegrityError("history_rollout_identity_changed");
|
|
281
282
|
}
|
|
282
283
|
};
|
|
@@ -360,10 +361,10 @@ function assertLegacyHistoryRecord(line: string): void {
|
|
|
360
361
|
}
|
|
361
362
|
|
|
362
363
|
function assertHistoryDescriptorIdentity(path: string, fd: number): void {
|
|
363
|
-
const held = fstatSync(fd);
|
|
364
|
-
let current:
|
|
365
|
-
try { current = lstatSync(path); } catch { throw new CodexHistoryIntegrityError("history_rollout_identity_changed"); }
|
|
366
|
-
if (!current.isFile() || current.isSymbolicLink() || current
|
|
364
|
+
const held = fstatSync(fd, { bigint: true });
|
|
365
|
+
let current: import("node:fs").BigIntStats;
|
|
366
|
+
try { current = lstatSync(path, { bigint: true }); } catch { throw new CodexHistoryIntegrityError("history_rollout_identity_changed"); }
|
|
367
|
+
if (!current.isFile() || current.isSymbolicLink() || !sameFileIdentity(current, held)) {
|
|
367
368
|
throw new CodexHistoryIntegrityError("history_rollout_identity_changed");
|
|
368
369
|
}
|
|
369
370
|
}
|
|
@@ -693,8 +694,8 @@ function inspectBackupForNoop(path: string, stateDbPath: string): StrictBackupIn
|
|
|
693
694
|
|
|
694
695
|
function historyFileIdentity(path: string): string | null {
|
|
695
696
|
try {
|
|
696
|
-
const stat = statSync(path);
|
|
697
|
-
return [stat.dev, stat.ino, stat.size, stat.
|
|
697
|
+
const stat = statSync(path, { bigint: true });
|
|
698
|
+
return [stat.dev, stat.ino, Number(stat.size), statTimeMs(stat.mtimeNs), statTimeMs(stat.ctimeNs)].join(":");
|
|
698
699
|
} catch {
|
|
699
700
|
return null;
|
|
700
701
|
}
|
|
@@ -1132,7 +1133,7 @@ function updateSessionMeta(
|
|
|
1132
1133
|
} = {},
|
|
1133
1134
|
): SessionMetaUpdateResult {
|
|
1134
1135
|
if (!path || !existsSync(path)) return { changed: false, durableProvider: false };
|
|
1135
|
-
const validatedIdentity = lstatSync(path);
|
|
1136
|
+
const validatedIdentity = lstatSync(path, { bigint: true });
|
|
1136
1137
|
if (options.expectedFileIdentity !== undefined
|
|
1137
1138
|
&& historyFileIdentity(path) !== options.expectedFileIdentity) {
|
|
1138
1139
|
return { changed: false, durableProvider: false, conflict: true };
|
|
@@ -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);
|
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
import { createHmac, randomBytes } from "node:crypto";
|
|
2
|
+
import { closeSync, constants, fchmodSync, fstatSync, fsyncSync, linkSync, mkdirSync, openSync, readFileSync, unlinkSync, writeFileSync } from "node:fs";
|
|
3
|
+
import { join } from "node:path";
|
|
4
|
+
import { getConfigDir } from "../config/paths";
|
|
5
|
+
import { assertNotRealHomeUnderTest } from "../lib/test-home-guard";
|
|
6
|
+
import { hardenSecretDir, hardenSecretPath } from "../lib/windows-secret-acl";
|
|
7
|
+
|
|
8
|
+
const SECRET_BYTES = 32;
|
|
9
|
+
const DOMAIN = "opencodex-codex-installation-id-v1\0";
|
|
10
|
+
|
|
11
|
+
/** Sanitized, retryable refusal: neither a path nor a credential belongs in its cause. */
|
|
12
|
+
export class CodexInstallationIdUnavailableError extends Error {
|
|
13
|
+
constructor() {
|
|
14
|
+
super("Codex installation identity unavailable");
|
|
15
|
+
this.name = "CodexInstallationIdUnavailableError";
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
function readSecret(path: string): Buffer {
|
|
20
|
+
// Refuse links and non-files; never rotate an unreadable or corrupt persisted secret.
|
|
21
|
+
const fd = openSync(path, constants.O_RDONLY | (constants.O_NOFOLLOW ?? 0));
|
|
22
|
+
try {
|
|
23
|
+
const stat = fstatSync(fd);
|
|
24
|
+
if (!stat.isFile() || stat.size !== SECRET_BYTES) throw new CodexInstallationIdUnavailableError();
|
|
25
|
+
if (process.platform !== "win32") fchmodSync(fd, 0o600);
|
|
26
|
+
hardenSecretPath(path, { required: true });
|
|
27
|
+
const bytes = readFileSync(fd);
|
|
28
|
+
if (bytes.length !== SECRET_BYTES) throw new CodexInstallationIdUnavailableError();
|
|
29
|
+
return bytes;
|
|
30
|
+
} finally { closeSync(fd); }
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
function installationSecret(dir: string): Buffer {
|
|
34
|
+
assertNotRealHomeUnderTest(dir);
|
|
35
|
+
// Each secret file gets its own required, inheritance-protected DACL before reading or
|
|
36
|
+
// writing bytes. Optional parent/sibling hardening cannot admit or refuse this file.
|
|
37
|
+
const path = join(dir, "codex-installation-secret");
|
|
38
|
+
try { return readSecret(path); } catch (error) {
|
|
39
|
+
if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error;
|
|
40
|
+
}
|
|
41
|
+
mkdirSync(dir, { recursive: true, mode: 0o700 });
|
|
42
|
+
// Make new files private at creation: Windows ignores POSIX mode 0600.
|
|
43
|
+
hardenSecretDir(dir, { required: true });
|
|
44
|
+
// Publish complete bytes without replacing another process's winning secret.
|
|
45
|
+
const temporary = join(dir, `.codex-installation-secret-${randomBytes(16).toString("hex")}`);
|
|
46
|
+
const fd = openSync(temporary, "wx", 0o600);
|
|
47
|
+
try {
|
|
48
|
+
try {
|
|
49
|
+
hardenSecretPath(temporary, { required: true });
|
|
50
|
+
writeFileSync(fd, randomBytes(SECRET_BYTES));
|
|
51
|
+
fsyncSync(fd);
|
|
52
|
+
} finally { closeSync(fd); }
|
|
53
|
+
try { linkSync(temporary, path); } catch (error) {
|
|
54
|
+
if ((error as NodeJS.ErrnoException).code !== "EEXIST") throw error;
|
|
55
|
+
}
|
|
56
|
+
return readSecret(path);
|
|
57
|
+
} finally { unlinkSync(temporary); }
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
/** Stable per upstream account and local installation, independent of bearer/caller identity. */
|
|
61
|
+
export function codexInstallationIdForAccount(accountKey: string, configDir = getConfigDir()): string {
|
|
62
|
+
try {
|
|
63
|
+
const account = accountKey.trim();
|
|
64
|
+
if (!account) throw new CodexInstallationIdUnavailableError();
|
|
65
|
+
const bytes = createHmac("sha256", installationSecret(configDir)).update(DOMAIN).update(account).digest().subarray(0, 16);
|
|
66
|
+
// RFC 9562 §5.4 layout; pseudorandom HMAC bits replace per-request randomness.
|
|
67
|
+
bytes[6] = (bytes[6]! & 0x0f) | 0x40;
|
|
68
|
+
bytes[8] = (bytes[8]! & 0x3f) | 0x80;
|
|
69
|
+
const hex = bytes.toString("hex");
|
|
70
|
+
return `${hex.slice(0, 8)}-${hex.slice(8, 12)}-${hex.slice(12, 16)}-${hex.slice(16, 20)}-${hex.slice(20)}`;
|
|
71
|
+
} catch { throw new CodexInstallationIdUnavailableError(); }
|
|
72
|
+
}
|
|
@@ -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
|
*
|