@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
package/src/codex/shim.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { randomUUID } from "node:crypto";
|
|
2
|
-
import { beginCodexCliSelectionParentWrite } from "./cli-update-selection-gate";
|
|
2
|
+
import { beginCodexCliSelectionParentWrite, withCodexCliSelectionParentWriteAsync, CodexCliSelectionMutationBusyError } from "./cli-update-selection-gate";
|
|
3
3
|
import {
|
|
4
4
|
existsSync,
|
|
5
5
|
lstatSync,
|
|
@@ -10,6 +10,7 @@ import {
|
|
|
10
10
|
} from "node:fs";
|
|
11
11
|
import { delimiter, extname, join, posix, win32 } from "node:path";
|
|
12
12
|
import { durableBunRuntime, type DurableBunRuntime } from "../lib/bun-runtime";
|
|
13
|
+
import type { FileIdentity } from "../lib/file-identity";
|
|
13
14
|
import { assertSelectedRuntimeWritable, RuntimePreflightError, type RuntimePreflightDeps } from "../lib/bun-runtime-preflight";
|
|
14
15
|
import { getConfigDir } from "../config";
|
|
15
16
|
import { isWslRuntime, wslAutomountRoot } from "./home";
|
|
@@ -264,7 +265,7 @@ interface FreshShimInstallJournalEntry {
|
|
|
264
265
|
writtenWrapperFingerprint?: ShimPathFingerprint;
|
|
265
266
|
wrapperWriteStarted: boolean;
|
|
266
267
|
/** dev/ino of the file our `writeShim()` created, recorded before anything can fail. */
|
|
267
|
-
writtenWrapperInode?:
|
|
268
|
+
writtenWrapperInode?: FileIdentity;
|
|
268
269
|
}
|
|
269
270
|
|
|
270
271
|
function rollbackFreshShimInstall(journal: readonly FreshShimInstallJournalEntry[]): void {
|
|
@@ -984,6 +985,28 @@ export function installCodexShim(deps: RuntimePreflightDeps = {}): { installed:
|
|
|
984
985
|
finally { gate.exit(); }
|
|
985
986
|
}
|
|
986
987
|
|
|
988
|
+
export async function installCodexShimAsync(deps: RuntimePreflightDeps = {}): Promise<ReturnType<typeof installCodexShim>> {
|
|
989
|
+
try { return await withCodexCliSelectionParentWriteAsync(() => installCodexShim(deps)); }
|
|
990
|
+
catch (error) {
|
|
991
|
+
if (error instanceof CodexCliSelectionMutationBusyError) return { installed: false, refused: true, message: error.message };
|
|
992
|
+
throw error;
|
|
993
|
+
}
|
|
994
|
+
}
|
|
995
|
+
export async function autoRestoreCodexShimAsync(options: Parameters<typeof autoRestoreCodexShim>[0]): Promise<CodexShimAutoRestoreResult> {
|
|
996
|
+
try { return await withCodexCliSelectionParentWriteAsync(() => autoRestoreCodexShim(options)); }
|
|
997
|
+
catch (error) {
|
|
998
|
+
if (error instanceof CodexCliSelectionMutationBusyError) return { status: "deferred", message: error.message };
|
|
999
|
+
throw error;
|
|
1000
|
+
}
|
|
1001
|
+
}
|
|
1002
|
+
export async function uninstallCodexShimAsync(): Promise<ReturnType<typeof uninstallCodexShim>> {
|
|
1003
|
+
try { return await withCodexCliSelectionParentWriteAsync(uninstallCodexShim); }
|
|
1004
|
+
catch (error) {
|
|
1005
|
+
if (error instanceof CodexCliSelectionMutationBusyError) return { removed: false, message: error.message };
|
|
1006
|
+
throw error;
|
|
1007
|
+
}
|
|
1008
|
+
}
|
|
1009
|
+
|
|
987
1010
|
export function autoRestoreCodexShim(options: Parameters<typeof autoRestoreWindowsCodexShim>[0]): CodexShimAutoRestoreResult {
|
|
988
1011
|
if (process.platform !== "win32") return autoRestoreUnixOverlay(options);
|
|
989
1012
|
const gate = beginCodexCliSelectionParentWrite();
|
|
@@ -21,6 +21,7 @@ import {
|
|
|
21
21
|
unlinkSync,
|
|
22
22
|
} from "node:fs";
|
|
23
23
|
import { basename, dirname, join } from "node:path";
|
|
24
|
+
import { fileIdentityKey } from "../lib/file-identity";
|
|
24
25
|
|
|
25
26
|
import { Database } from "bun:sqlite";
|
|
26
27
|
|
|
@@ -524,11 +525,11 @@ export function openCodexCoordinatorTransaction(
|
|
|
524
525
|
);
|
|
525
526
|
}
|
|
526
527
|
}
|
|
527
|
-
const opened = lstatSync(finalDatabasePath);
|
|
528
|
+
const opened = lstatSync(finalDatabasePath, { bigint: true });
|
|
528
529
|
if (opened.isSymbolicLink() || !opened.isFile()) {
|
|
529
530
|
throw new CodexUserIdentityRefusal("The coordinator database path changed during open.");
|
|
530
531
|
}
|
|
531
|
-
initialIdentity =
|
|
532
|
+
initialIdentity = fileIdentityKey(opened);
|
|
532
533
|
database.exec("PRAGMA busy_timeout = 0; PRAGMA locking_mode = NORMAL; BEGIN IMMEDIATE");
|
|
533
534
|
transactionOpen = true;
|
|
534
535
|
initialize(database, databaseWasAbsent || databaseWasEmpty);
|
|
@@ -546,9 +547,9 @@ export function openCodexCoordinatorTransaction(
|
|
|
546
547
|
};
|
|
547
548
|
const assertStablePath = (): void => {
|
|
548
549
|
requireOpen();
|
|
549
|
-
const entry = lstatSync(finalDatabasePath);
|
|
550
|
+
const entry = lstatSync(finalDatabasePath, { bigint: true });
|
|
550
551
|
if (entry.isSymbolicLink() || !entry.isFile()
|
|
551
|
-
||
|
|
552
|
+
|| fileIdentityKey(entry) !== initialIdentity
|
|
552
553
|
|| !samePathIdentity(realpathSync.native(finalDatabasePath), finalDatabasePath)) {
|
|
553
554
|
throw new CodexUserIdentityRefusal("The coordinator database path was substituted.");
|
|
554
555
|
}
|
package/src/combos/failover.ts
CHANGED
|
@@ -722,13 +722,52 @@ const DEFINITE_CONTEXT_OVERFLOW_PHRASES = [
|
|
|
722
722
|
"too many tokens",
|
|
723
723
|
];
|
|
724
724
|
|
|
725
|
+
/**
|
|
726
|
+
* Short provider verdicts that a validation error could otherwise echo as the caller's own value
|
|
727
|
+
* (#7443). Each counts only at the very start of the provider's leaf message, after JSON envelopes
|
|
728
|
+
* are unwrapped, and Anthropic's only with its token counts. Text that merely contains one, including
|
|
729
|
+
* a serialized SDK exception or a quoted caller object, is not evidence: only the phrases dev already
|
|
730
|
+
* matched as substrings keep that wider reach.
|
|
731
|
+
*/
|
|
732
|
+
const ANCHORED_CONTEXT_OVERFLOW_VERDICTS: readonly RegExp[] = [
|
|
733
|
+
/^prompt is too long: \d+ tokens > \d+ maximum/i,
|
|
734
|
+
/^input is too long for requested model\b/i,
|
|
735
|
+
/^please reduce the length of the messages or completion\b/i,
|
|
736
|
+
];
|
|
737
|
+
|
|
725
738
|
/** Wrapper envelopes unwrapped before the leaf message is read. */
|
|
726
739
|
const MAX_CONTEXT_OVERFLOW_ENVELOPES = 4;
|
|
727
740
|
|
|
741
|
+
/**
|
|
742
|
+
* Parameter validation echoes the caller's own value, so its prose is not a context verdict even
|
|
743
|
+
* when the value reads like one: "Invalid 'tools[0].function.name': 'prompt is too long'". These
|
|
744
|
+
* markers are read anywhere in the text, so an SDK error wrapper that serializes such a record as a
|
|
745
|
+
* Python dict is refused too, while a quoted genuine verdict in the same wrapper stays evidence.
|
|
746
|
+
*/
|
|
747
|
+
const CONTEXT_PARAM_NAMES = "messages|input|input_text|input_tokens|prompt|contents?|max_tokens|max_completion_tokens|max_output_tokens";
|
|
748
|
+
/** A `param` naming the conversation or a token budget is consistent with an overflow. */
|
|
749
|
+
const CONTEXT_PARAM = new RegExp(`^(?:${CONTEXT_PARAM_NAMES})(?:$|[.[])`, "i");
|
|
750
|
+
const PARAMETER_VALIDATION_CODES: ReadonlySet<string> = new Set(["invalid_value", "invalid_type"]);
|
|
751
|
+
const PARAMETER_VALIDATION_MARKERS: readonly RegExp[] = [
|
|
752
|
+
/\binvalid_(?:value|type)\b/i,
|
|
753
|
+
new RegExp(`['"]param['"]\\s*:\\s*['"](?!(?:${CONTEXT_PARAM_NAMES})(?:['".[]))`, "i"),
|
|
754
|
+
/\binvalid\s+(?:value\s+for\s+)?['"`\u2018\u201c]/i,
|
|
755
|
+
/\binvalid\s+(?:tool|function|parameter|argument|field|value)\b/i,
|
|
756
|
+
/\binput_value\s*=/i,
|
|
757
|
+
/\bvalidation errors? for\b/i,
|
|
758
|
+
];
|
|
759
|
+
|
|
760
|
+
function isParameterValidationRecord(record: Record<string, unknown>): boolean {
|
|
761
|
+
if (typeof record.code === "string" && PARAMETER_VALIDATION_CODES.has(record.code.toLowerCase())) return true;
|
|
762
|
+
return typeof record.param === "string" && record.param.length > 0 && !CONTEXT_PARAM.test(record.param);
|
|
763
|
+
}
|
|
764
|
+
|
|
728
765
|
function isDefiniteContextOverflowMessage(text: string): boolean {
|
|
766
|
+
if (PARAMETER_VALIDATION_MARKERS.some(marker => marker.test(text))) return false;
|
|
729
767
|
const normalized = text.toLowerCase();
|
|
730
768
|
return normalized === "context_length_exceeded"
|
|
731
|
-
|| DEFINITE_CONTEXT_OVERFLOW_PHRASES.some(phrase => normalized.includes(phrase))
|
|
769
|
+
|| DEFINITE_CONTEXT_OVERFLOW_PHRASES.some(phrase => normalized.includes(phrase))
|
|
770
|
+
|| ANCHORED_CONTEXT_OVERFLOW_VERDICTS.some(verdict => verdict.test(text.trim()));
|
|
732
771
|
}
|
|
733
772
|
|
|
734
773
|
/**
|
|
@@ -767,7 +806,7 @@ export function isDefiniteContextOverflow(status: number, message: string): bool
|
|
|
767
806
|
.find((candidate): candidate is Record<string, unknown> =>
|
|
768
807
|
!!candidate && typeof candidate === "object" && !Array.isArray(candidate)
|
|
769
808
|
&& typeof (candidate as Record<string, unknown>).message === "string");
|
|
770
|
-
if (!source) return false;
|
|
809
|
+
if (!source || isParameterValidationRecord(source)) return false;
|
|
771
810
|
text = (source.message as string).trim();
|
|
772
811
|
}
|
|
773
812
|
return false;
|
|
@@ -902,8 +941,8 @@ export function comboFailureDecision(
|
|
|
902
941
|
//
|
|
903
942
|
// This MUST be tested before the generic stop list below. Our own refusal message says
|
|
904
943
|
// "context window" -- that is what it refuses on -- and the classifier remaps that phrase,
|
|
905
|
-
// so checking the stop list first swallowed the signal and ended the chain.
|
|
906
|
-
//
|
|
944
|
+
// so checking the stop list first swallowed the signal and ended the chain. Confirmed
|
|
945
|
+
// upstream context refusals already took the bounded message-classification hop above.
|
|
907
946
|
//
|
|
908
947
|
// Matched on the STRUCTURED code only, which classifyError now preserves for our own
|
|
909
948
|
// refusal. A raw substring test would additionally let any upstream override a terminal
|
|
@@ -18,10 +18,12 @@ import { recordOwnedConfigPath } from "../lib/config-ownership";
|
|
|
18
18
|
import { assertNotRealCodexHomeUnderTest, assertNotRealHomeUnderTest } from "../lib/test-home-guard";
|
|
19
19
|
import {
|
|
20
20
|
forgetEphemeralSecretPath,
|
|
21
|
+
flushWindowsSecretAclReapsBeforeRemoval,
|
|
21
22
|
hardenSecretPath,
|
|
22
23
|
hardenSecretPathAsync,
|
|
23
24
|
reattributeHardenedSecretPath,
|
|
24
25
|
windowsSecretAclReapPendingForPath,
|
|
26
|
+
WindowsSecretAclSettleTimeoutError,
|
|
25
27
|
} from "../lib/windows-secret-acl";
|
|
26
28
|
import {
|
|
27
29
|
renameAtomicFile,
|
|
@@ -30,6 +32,28 @@ import {
|
|
|
30
32
|
import { getConfigDir } from "./paths";
|
|
31
33
|
|
|
32
34
|
let atomicSequence = 0;
|
|
35
|
+
const aclDestinations = new Map<string, Set<string>>();
|
|
36
|
+
|
|
37
|
+
/** Track overlapping writes, refusing only children retained past their timeout belt. */
|
|
38
|
+
function admitAtomicAclWork(target: string, temp: string, enabled: boolean): (() => void) | undefined {
|
|
39
|
+
if (!enabled || !windowsHardeningApplies()) return undefined;
|
|
40
|
+
const destination = join(realpathSync(dirname(target)), basename(target));
|
|
41
|
+
const key = process.platform === "win32" ? destination.toLowerCase() : destination;
|
|
42
|
+
const temps = aclDestinations.get(key) ?? new Set<string>();
|
|
43
|
+
if ([...temps].some(windowsSecretAclReapPendingForPath)) throw new WindowsSecretAclSettleTimeoutError();
|
|
44
|
+
temps.add(temp);
|
|
45
|
+
aclDestinations.set(key, temps);
|
|
46
|
+
const release = (): void => {
|
|
47
|
+
temps.delete(temp);
|
|
48
|
+
if (temps.size === 0) aclDestinations.delete(key);
|
|
49
|
+
};
|
|
50
|
+
return () => {
|
|
51
|
+
if (windowsSecretAclReapPendingForPath(temp)) {
|
|
52
|
+
// Caller settlement is bounded; admission resumes only after actual handle release.
|
|
53
|
+
void flushWindowsSecretAclReapsBeforeRemoval(temp).then(release);
|
|
54
|
+
} else release();
|
|
55
|
+
};
|
|
56
|
+
}
|
|
33
57
|
|
|
34
58
|
/**
|
|
35
59
|
* Whether this writer's Windows ACL branch applies.
|
|
@@ -207,7 +231,7 @@ function writePrivateTempFile(
|
|
|
207
231
|
try {
|
|
208
232
|
onCreated(descriptor);
|
|
209
233
|
if (windowsHardeningApplies()) {
|
|
210
|
-
hardenSecretPath(path, { required: true, timeoutMemoKey });
|
|
234
|
+
hardenSecretPath(path, { required: true, timeoutMemoKey, retryTimedOutOnce: true });
|
|
211
235
|
}
|
|
212
236
|
// Keyed on the REAL platform, not the override: on a POSIX host the mode is
|
|
213
237
|
// the boundary and `assertPrivateTempDescriptor` demands 0o600, which an
|
|
@@ -248,7 +272,7 @@ function writePrivateTempFileWith(
|
|
|
248
272
|
try {
|
|
249
273
|
onCreated(descriptor);
|
|
250
274
|
if (windowsHardeningApplies()) {
|
|
251
|
-
hardenSecretPath(path, { required: true, timeoutMemoKey });
|
|
275
|
+
hardenSecretPath(path, { required: true, timeoutMemoKey, retryTimedOutOnce: true });
|
|
252
276
|
}
|
|
253
277
|
if (process.platform !== "win32") fchmodSync(descriptor, 0o600);
|
|
254
278
|
assertPrivateTempDescriptor(path, descriptor, requireStableIdentity);
|
|
@@ -271,7 +295,7 @@ async function writePrivateTempFileAsync(
|
|
|
271
295
|
try {
|
|
272
296
|
onCreated(descriptor);
|
|
273
297
|
if (windowsHardeningApplies()) {
|
|
274
|
-
await hardenSecretPathAsync(path, { required: true, timeoutMemoKey });
|
|
298
|
+
await hardenSecretPathAsync(path, { required: true, timeoutMemoKey, retryTimedOutOnce: true });
|
|
275
299
|
}
|
|
276
300
|
if (process.platform !== "win32") {
|
|
277
301
|
fchmodSync(descriptor, 0o600);
|
|
@@ -297,8 +321,11 @@ function atomicWriteFileToTarget(
|
|
|
297
321
|
if (recordOwnership) recordOwnedConfigPath(getConfigDir(), path);
|
|
298
322
|
assertResolvedTargetAllowed(path, target);
|
|
299
323
|
const tmp = `${target}.ocx.${process.pid}.${nextAtomicTempSequence()}.tmp`;
|
|
324
|
+
const releaseAcl = admitAtomicAclWork(target, tmp, io === undefined);
|
|
300
325
|
let hardened = false;
|
|
301
326
|
let ownsTemp = false;
|
|
327
|
+
// Cleanup must not consume the destination's recovery attempt for a later write.
|
|
328
|
+
let cleanupHarden = false;
|
|
302
329
|
let publicationAttempted = false;
|
|
303
330
|
let identity: BigIntStats | undefined;
|
|
304
331
|
const created = (descriptor: number): void => {
|
|
@@ -321,7 +348,7 @@ function atomicWriteFileToTarget(
|
|
|
321
348
|
// its ChangeTime bump is what used to invalidate the harden memo one line
|
|
322
349
|
// later. On POSIX the mode IS the boundary, so it stays.
|
|
323
350
|
if (windowsHardeningApplies()) {
|
|
324
|
-
hardenSecretPath(tempPath, { required: true, timeoutMemoKey: path });
|
|
351
|
+
hardenSecretPath(tempPath, { required: true, timeoutMemoKey: path, retryTimedOutOnce: !cleanupHarden });
|
|
325
352
|
return;
|
|
326
353
|
}
|
|
327
354
|
try { chmodSync(tempPath, 0o600); } catch { /* platform may ignore chmod */ }
|
|
@@ -365,6 +392,7 @@ function atomicWriteFileToTarget(
|
|
|
365
392
|
forgetEphemeralSecretPath(tmp);
|
|
366
393
|
} catch (cause) {
|
|
367
394
|
if (!ownsTemp) throw cause;
|
|
395
|
+
cleanupHarden = true;
|
|
368
396
|
let sharedTemp = false;
|
|
369
397
|
if (exclusive) {
|
|
370
398
|
try { sharedTemp = assertIdentity(tmp).nlink > 1n; } catch (error) {
|
|
@@ -403,7 +431,7 @@ function atomicWriteFileToTarget(
|
|
|
403
431
|
if (removed) forgetEphemeralSecretPath(tmp);
|
|
404
432
|
if (!removed) throw new AtomicWriteResidualTempError(tmp, hardened, { cause });
|
|
405
433
|
throw cause;
|
|
406
|
-
}
|
|
434
|
+
} finally { releaseAcl?.(); }
|
|
407
435
|
}
|
|
408
436
|
|
|
409
437
|
export function atomicWriteFile(
|
|
@@ -490,12 +518,13 @@ export async function atomicWriteFileAsync(
|
|
|
490
518
|
testSeam?: AtomicWriteAsyncTestSeam,
|
|
491
519
|
): Promise<void> {
|
|
492
520
|
let ownsTemp = false;
|
|
521
|
+
let cleanupHarden = false;
|
|
493
522
|
const effective: AtomicWriteAsyncIO = io ?? {
|
|
494
523
|
write: (tempPath, value) => writePrivateTempFileAsync(tempPath, value, path, () => { ownsTemp = true; }),
|
|
495
524
|
harden: async tempPath => {
|
|
496
525
|
// Same reasoning as the synchronous writer above.
|
|
497
526
|
if (windowsHardeningApplies()) {
|
|
498
|
-
await hardenSecretPathAsync(tempPath, { required: true, timeoutMemoKey: path });
|
|
527
|
+
await hardenSecretPathAsync(tempPath, { required: true, timeoutMemoKey: path, retryTimedOutOnce: !cleanupHarden });
|
|
499
528
|
return;
|
|
500
529
|
}
|
|
501
530
|
try { chmodSync(tempPath, 0o600); } catch { /* platform may ignore chmod */ }
|
|
@@ -507,6 +536,7 @@ export async function atomicWriteFileAsync(
|
|
|
507
536
|
const target = resolveWriteTarget(path);
|
|
508
537
|
assertResolvedTargetAllowed(path, target);
|
|
509
538
|
const tmp = `${target}.ocx.${process.pid}.${nextAtomicTempSequence()}.tmp`;
|
|
539
|
+
const releaseAcl = admitAtomicAclWork(target, tmp, io === undefined);
|
|
510
540
|
let hardened = false;
|
|
511
541
|
let tempWasHardenedBeforeContent = false;
|
|
512
542
|
try {
|
|
@@ -520,6 +550,7 @@ export async function atomicWriteFileAsync(
|
|
|
520
550
|
forgetEphemeralSecretPath(tmp);
|
|
521
551
|
} catch (cause) {
|
|
522
552
|
if (!ownsTemp) throw cause;
|
|
553
|
+
cleanupHarden = true;
|
|
523
554
|
// The async ACL belt bounds the writer, but it is not evidence that icacls released this
|
|
524
555
|
// path. Leave the temp in the existing residual state instead of racing an unlink against a
|
|
525
556
|
// live Windows handle. The default Windows writer hardens before writing secret bytes; a
|
|
@@ -555,5 +586,5 @@ export async function atomicWriteFileAsync(
|
|
|
555
586
|
if (removed) forgetEphemeralSecretPath(tmp);
|
|
556
587
|
if (!removed) throw new AtomicWriteResidualTempError(tmp, hardened, { cause });
|
|
557
588
|
throw cause;
|
|
558
|
-
}
|
|
589
|
+
} finally { releaseAcl?.(); }
|
|
559
590
|
}
|
|
@@ -8,6 +8,7 @@ import { join } from "node:path";
|
|
|
8
8
|
import * as z from "zod/v4";
|
|
9
9
|
import { compactionRecoveryConfigError } from "./schema/compaction-recovery";
|
|
10
10
|
import { nativeReasoningRetentionConfigError } from "./schema/native-reasoning-retention";
|
|
11
|
+
import { WORKFLOW_BUDGET_SHAPE_HINT, workflowBudgetConfigError } from "./schema/workflow-budget";
|
|
11
12
|
import { desktopCompatibilityConfigError } from "./schema/desktop-compatibility";
|
|
12
13
|
import { blockedModelRedirectsError } from "./schema/blocked-model-redirects";
|
|
13
14
|
import { mainAccountHardLockFallbackError } from "./schema/main-account-hard-lock-fallback";
|
|
@@ -145,6 +146,7 @@ function validFileConfigDiagnostics(config: OcxConfig, rawParsed: unknown): Conf
|
|
|
145
146
|
warnings.push(...degradedListenerWarnings(rawParsed, normalized));
|
|
146
147
|
if (blockedModelRedirectsError(rawParsed)) warnings.push("blockedModelRedirects ignored: expected a map of nonempty model keys to nonempty string targets");
|
|
147
148
|
if (nativeReasoningRetentionConfigError(rawParsed)) warnings.push("nativeReasoningRetention ignored: expected only optional boolean modelSwitch and accountSwitch fields; both remain off");
|
|
149
|
+
if (workflowBudgetConfigError(rawParsed)) warnings.push("workflowBudget ignored: " + WORKFLOW_BUDGET_SHAPE_HINT + "; the built-in ceilings remain");
|
|
148
150
|
if (mainAccountHardLockFallbackError(rawParsed)) warnings.push("codexMainAccountHardLockFallback ignored: expected a nonblank model selector and an optional declared reasoningEffort");
|
|
149
151
|
if (fallbackPolicyError(rawParsed)) warnings.push("fallback partly ignored: expected boolean model/provider switches, providers/routes/devices maps of them, and devices.<id>.localFallback; ignored leaves keep today's fallback behavior");
|
|
150
152
|
const quotaAutoRefreshWarning = degradedCodexQuotaAutoRefreshWarning(rawParsed, normalized);
|
|
@@ -735,6 +737,7 @@ export function validateConfigCandidate(value: unknown): { ok: true; config: Ocx
|
|
|
735
737
|
// drop a refusal on the next whole-config save; the write boundary rejects it instead.
|
|
736
738
|
?? fallbackPolicyError(value)
|
|
737
739
|
?? nativeReasoningRetentionConfigError(value)
|
|
740
|
+
?? workflowBudgetConfigError(value)
|
|
738
741
|
?? mainAccountHardLockFallbackError(value)
|
|
739
742
|
?? compactionRecoveryConfigError(value) ?? desktopCompatibilityConfigError(value) ?? configReasoningPinsConfigError(value)
|
|
740
743
|
?? blankHostnameError(value)
|
package/src/config/initialize.ts
CHANGED
|
@@ -43,16 +43,16 @@ function hardenInitialConfig(fd: number, temp: string, target: string): void {
|
|
|
43
43
|
}
|
|
44
44
|
}
|
|
45
45
|
|
|
46
|
-
function identifiesDescriptor(fd: number, path: string): boolean {
|
|
47
|
-
const opened = fstatSync(fd);
|
|
48
|
-
const entry = lstatSync(path);
|
|
46
|
+
function identifiesDescriptor(fd: number, path: string, privateMode = false): boolean {
|
|
47
|
+
const opened = fstatSync(fd, { bigint: true });
|
|
48
|
+
const entry = lstatSync(path, { bigint: true });
|
|
49
49
|
return opened.isFile() && entry.isFile()
|
|
50
|
-
&& opened.dev === entry.dev && opened.ino === entry.ino
|
|
50
|
+
&& opened.dev === entry.dev && opened.ino === entry.ino
|
|
51
|
+
&& (!privateMode || process.platform === "win32" || (opened.mode & 0o777n) === 0o600n);
|
|
51
52
|
}
|
|
52
53
|
|
|
53
54
|
function verifyPrivateTemp(fd: number, temp: string): void {
|
|
54
|
-
if (!identifiesDescriptor(fd, temp)
|
|
55
|
-
|| (process.platform !== "win32" && (fstatSync(fd).mode & 0o777) !== 0o600)) {
|
|
55
|
+
if (!identifiesDescriptor(fd, temp, true)) {
|
|
56
56
|
throw new Error("Initial config temporary file identity or permissions changed.");
|
|
57
57
|
}
|
|
58
58
|
}
|
|
@@ -4,6 +4,7 @@ import { chmodSync, existsSync } from "node:fs";
|
|
|
4
4
|
import { join } from "node:path";
|
|
5
5
|
import { compactionRecoveryConfigError } from "./schema/compaction-recovery";
|
|
6
6
|
import { nativeReasoningRetentionConfigError } from "./schema/native-reasoning-retention";
|
|
7
|
+
import { workflowBudgetConfigError } from "./schema/workflow-budget";
|
|
7
8
|
import { desktopCompatibilityConfigError } from "./schema/desktop-compatibility";
|
|
8
9
|
import { blockedModelRedirectsError } from "./schema/blocked-model-redirects";
|
|
9
10
|
import { mainAccountHardLockFallbackError } from "./schema/main-account-hard-lock-fallback";
|
|
@@ -137,6 +138,7 @@ export function warnDegradedCompactionRouting(rawParsed: unknown, validated: Ocx
|
|
|
137
138
|
*/
|
|
138
139
|
export function warnDegradedTopLevelOptIns(rawParsed: unknown, validated: OcxConfig): void {
|
|
139
140
|
if (nativeReasoningRetentionConfigError(rawParsed)) console.warn("⚠️ invalid nativeReasoningRetention disabled; model and account switch allowances remain off");
|
|
141
|
+
if (workflowBudgetConfigError(rawParsed)) console.warn("⚠️ invalid workflowBudget ignored; the built-in workflow ceilings stay in force");
|
|
140
142
|
setCodexWsReuseAcrossTurns(validated.codexWsReuseAcrossTurns === true);
|
|
141
143
|
const retentionWarning = degradedReasoningRetentionWarning(rawParsed, validated);
|
|
142
144
|
if (retentionWarning) console.warn(retentionWarning);
|
|
@@ -45,7 +45,7 @@ export type RuntimePortState = {
|
|
|
45
45
|
siblingOfPort?: number;
|
|
46
46
|
};
|
|
47
47
|
|
|
48
|
-
function isValidRuntimePortState(value: unknown): value is RuntimePortState {
|
|
48
|
+
export function isValidRuntimePortState(value: unknown): value is RuntimePortState {
|
|
49
49
|
if (!value || typeof value !== "object") return false;
|
|
50
50
|
const state = value as Record<string, unknown>;
|
|
51
51
|
const hostnameOk = state.hostname === undefined || typeof state.hostname === "string";
|
|
@@ -201,14 +201,32 @@ export function ocxStartProcessCacheSizeForTests(): number {
|
|
|
201
201
|
return ocxStartProcessCache.size;
|
|
202
202
|
}
|
|
203
203
|
|
|
204
|
-
|
|
204
|
+
/**
|
|
205
|
+
* One observation of whether a candidate PID is an `ocx start` process.
|
|
206
|
+
*
|
|
207
|
+
* `readPid()` and `verifyPidIdentity()` ask this on every short liveness poll, and the
|
|
208
|
+
* read-only tracked-record inspection in `tracked-runtime-inspection.ts` asks it once per
|
|
209
|
+
* guarded stop, so all of them share this single cache-backed answer rather than probe
|
|
210
|
+
* twice: a hit performs no native command at all, and a miss performs exactly one
|
|
211
|
+
* {@link readProcessCommandLine} probe. Only a definite answer is cached; an unreadable
|
|
212
|
+
* command line is reported as `"unverifiable"`, left uncached, and re-probed on the next
|
|
213
|
+
* ask. `"unverifiable"` is not evidence of a permission boundary, a foreign process, or a
|
|
214
|
+
* different account or elevation — only that the probe could not answer this time.
|
|
215
|
+
*/
|
|
216
|
+
export type OcxStartIdentityObservation = "match" | "mismatch" | "unverifiable";
|
|
217
|
+
|
|
218
|
+
export function inspectOcxStartProcessIdentity(pid: number): OcxStartIdentityObservation {
|
|
205
219
|
const cached = ocxStartProcessCache.get(pid);
|
|
206
|
-
if (cached !== undefined) return cached;
|
|
220
|
+
if (cached !== undefined) return cached ? "match" : "mismatch";
|
|
207
221
|
const commandLine = readProcessCommandLine(pid);
|
|
208
|
-
if (commandLine === undefined) return
|
|
222
|
+
if (commandLine === undefined) return "unverifiable";
|
|
209
223
|
const ok = isOcxStartCommandLine(commandLine);
|
|
210
224
|
ocxStartProcessCache.set(pid, ok);
|
|
211
|
-
return ok;
|
|
225
|
+
return ok ? "match" : "mismatch";
|
|
226
|
+
}
|
|
227
|
+
|
|
228
|
+
function isLikelyOcxStartProcess(pid: number): boolean {
|
|
229
|
+
return inspectOcxStartProcessIdentity(pid) === "match";
|
|
212
230
|
}
|
|
213
231
|
|
|
214
232
|
export function readPid(): number | null {
|
package/src/config/salvage.ts
CHANGED
|
@@ -31,6 +31,7 @@ const SALVAGEABLE_CONFIG_SECTIONS = ["routingProfiles", "combos"] as const;
|
|
|
31
31
|
/** Optional nested fields that can be dropped whole without changing the rest of the document. */
|
|
32
32
|
const SALVAGEABLE_OPTIONAL_FIELDS: ReadonlyArray<readonly [string, string]> = [
|
|
33
33
|
["claudeCode", "desktopProfile"],
|
|
34
|
+
["claudeCode", "desktopModelVisibility"],
|
|
34
35
|
["claudeCode", "appendOnlyToolLoadingModels"],
|
|
35
36
|
];
|
|
36
37
|
|
|
@@ -6,6 +6,7 @@ import { accountPauseStateSchema } from "./account-auto-pause";
|
|
|
6
6
|
import { anthropicAccountPoolSchema } from "./anthropic-account-pool";
|
|
7
7
|
import { compactionRecoverySchema } from "./compaction-recovery";
|
|
8
8
|
import { nativeReasoningRetentionSchema } from "./native-reasoning-retention";
|
|
9
|
+
import { workflowBudgetSchema } from "./workflow-budget";
|
|
9
10
|
import { desktopCompatibilitySchema } from "./desktop-compatibility";
|
|
10
11
|
import { blockedModelRedirectsSchema } from "./blocked-model-redirects";
|
|
11
12
|
import { mainAccountHardLockFallbackSchema } from "./main-account-hard-lock-fallback";
|
|
@@ -33,6 +34,7 @@ import {
|
|
|
33
34
|
asideProfileSyncSchema,
|
|
34
35
|
clientIntegrationsSchema,
|
|
35
36
|
opencodeClientExportSchema,
|
|
37
|
+
omoClientExportSchema,
|
|
36
38
|
CODEX_ACCOUNT_NAMESPACE_ACCOUNT_ID_COLLISION_ERROR,
|
|
37
39
|
codexAccountNamespacesSchema,
|
|
38
40
|
modelPinnedEffortsSchema,
|
|
@@ -83,6 +85,7 @@ import { OPENAI_CODEX_PROVIDER_ID } from "../../providers/openai-tiers";
|
|
|
83
85
|
import { modelAutoCompactTokenLimitsConfigError } from "../../providers/auto-compact-budget";
|
|
84
86
|
import { hasFastWireCapabilityConflict } from "../../providers/fastwire";
|
|
85
87
|
import { parseDesktopProfile } from "../../claude/desktop-profile";
|
|
88
|
+
import { parseDesktopModelVisibility } from "../../claude/desktop-model-visibility";
|
|
86
89
|
import { isInterceptBindingId, isInterceptBindingRoute } from "../../claude/intercept/model-bindings";
|
|
87
90
|
import { DEFAULT_APP_OWNED_MEMORY_BUDGET_BYTES, MAX_APP_OWNED_MEMORY_BUDGET_MB, MIN_APP_OWNED_MEMORY_BUDGET_MB } from "../../lib/app-owned-memory";
|
|
88
91
|
|
|
@@ -219,6 +222,8 @@ export const configSchema = z.object({
|
|
|
219
222
|
// A bad hand edit disables only this block; writes validate the catch-free leaf first.
|
|
220
223
|
reasoningRetention: reasoningRetentionSchema.optional().catch(undefined),
|
|
221
224
|
nativeReasoningRetention: nativeReasoningRetentionSchema.optional().catch(undefined),
|
|
225
|
+
// A bad hand edit falls back to the built-in ceilings; it never turns the guard off.
|
|
226
|
+
workflowBudget: workflowBudgetSchema.optional().catch(undefined),
|
|
222
227
|
desktopCompatibility: desktopCompatibilitySchema.optional().catch(undefined),
|
|
223
228
|
// A hand-edited malformed phase disables only that phase instead of rejecting
|
|
224
229
|
// providers/apiKeys, matching the load-time degradation notice; the management write
|
|
@@ -234,6 +239,8 @@ export const configSchema = z.object({
|
|
|
234
239
|
defaultProvider: z.string().min(1).default("openai"),
|
|
235
240
|
defaultModelAliases: z.boolean().optional(),
|
|
236
241
|
preferModelAliasIds: z.boolean().optional().catch(false),
|
|
242
|
+
// Catalog omission is opt-in; malformed hand edits preserve the hidden-row default.
|
|
243
|
+
omitDisabledNativeModels: z.boolean().optional().catch(false),
|
|
237
244
|
// Malformed hand edits disable this opt-in projection without rejecting providers.
|
|
238
245
|
cursorEffortRows: z.boolean().optional().catch(false),
|
|
239
246
|
// Fast selectors default on; malformed hand edits disable them without rejecting providers.
|
|
@@ -262,6 +269,7 @@ export const configSchema = z.object({
|
|
|
262
269
|
emptyCompletionRetry: z.boolean().optional().catch(false),
|
|
263
270
|
// Header suppression changes what Codex sees, so absence and malformed edits stay off.
|
|
264
271
|
dropCodexSafetyBuffering: z.boolean().optional().catch(false),
|
|
272
|
+
completeOnMaxOutputTokens: z.boolean().optional().catch(false),
|
|
265
273
|
// A malformed hand edit must not silently stop opening the browser: fall back
|
|
266
274
|
// to undefined, which resolves to the historical auto-open behavior.
|
|
267
275
|
oauthOpenBrowser: z.boolean().optional().catch(undefined),
|
|
@@ -278,6 +286,7 @@ export const configSchema = z.object({
|
|
|
278
286
|
// Opt-in opencode-side export timeouts; a malformed block degrades to undefined so opencode
|
|
279
287
|
// keeps its native waits rather than failing the parse and hiding valid providers/accounts.
|
|
280
288
|
opencodeClientExport: opencodeClientExportSchema.optional().catch(undefined),
|
|
289
|
+
omoClientExport: omoClientExportSchema.optional().catch(undefined),
|
|
281
290
|
// A malformed profile policy must not fall back to legacy all-profile activation.
|
|
282
291
|
asideProfileSync: asideProfileSyncSchema.optional().catch({ allProfiles: false }),
|
|
283
292
|
providerContextCaps: z.record(z.string(), z.number().int().positive()).optional(),
|
|
@@ -315,6 +324,14 @@ export const configSchema = z.object({
|
|
|
315
324
|
standard: z.array(z.string().trim().min(1)).optional(),
|
|
316
325
|
frontier: z.array(z.string().trim().min(1)).optional(),
|
|
317
326
|
}).strict().optional().catch(undefined),
|
|
327
|
+
// Discard the retired source while preserving an otherwise valid Artificial Analysis key.
|
|
328
|
+
codexRoleCapability: z.preprocess(value => {
|
|
329
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) return value;
|
|
330
|
+
const { huggingFace: _retired, ...rest } = value as Record<string, unknown>;
|
|
331
|
+
return rest;
|
|
332
|
+
}, z.object({
|
|
333
|
+
artificialAnalysis: z.object({ apiKey: z.string().trim().min(1).optional() }).strict().optional(),
|
|
334
|
+
}).strict().optional().catch(undefined)),
|
|
318
335
|
codexShimAutoRestore: z.boolean().optional(),
|
|
319
336
|
codexDesktopAuthless: z.boolean().optional().catch(undefined),
|
|
320
337
|
codexClientCompaction: z.boolean().optional().catch(undefined),
|
|
@@ -420,7 +437,7 @@ export const configSchema = z.object({
|
|
|
420
437
|
if (claudeCode !== undefined && (!claudeCode || typeof claudeCode !== "object" || Array.isArray(claudeCode))) {
|
|
421
438
|
ctx.addIssue({ code: "custom", path: ["claudeCode"], message: "claudeCode must be an object" });
|
|
422
439
|
} else if (claudeCode) {
|
|
423
|
-
const claude = claudeCode as { desktopProfile?: unknown; desktopMode?: unknown; intercept?: unknown; appendOnlyToolLoadingModels?: unknown };
|
|
440
|
+
const claude = claudeCode as { desktopProfile?: unknown; desktopModelVisibility?: unknown; desktopMode?: unknown; intercept?: unknown; appendOnlyToolLoadingModels?: unknown };
|
|
424
441
|
if (claude.appendOnlyToolLoadingModels !== undefined && !isAppendOnlyToolLoadingModels(claude.appendOnlyToolLoadingModels)) {
|
|
425
442
|
ctx.addIssue({ code: "custom", path: ["claudeCode", "appendOnlyToolLoadingModels"], message: "appendOnlyToolLoadingModels must be up to 128 provider/model selectors (max 512 characters each), optionally ending in a single wildcard" });
|
|
426
443
|
}
|
|
@@ -468,6 +485,17 @@ export const configSchema = z.object({
|
|
|
468
485
|
});
|
|
469
486
|
}
|
|
470
487
|
}
|
|
488
|
+
if (claude.desktopModelVisibility !== undefined) {
|
|
489
|
+
try {
|
|
490
|
+
parseDesktopModelVisibility(claude.desktopModelVisibility);
|
|
491
|
+
} catch (error) {
|
|
492
|
+
ctx.addIssue({
|
|
493
|
+
code: "custom",
|
|
494
|
+
path: ["claudeCode", "desktopModelVisibility"],
|
|
495
|
+
message: error instanceof Error ? error.message : String(error),
|
|
496
|
+
});
|
|
497
|
+
}
|
|
498
|
+
}
|
|
471
499
|
}
|
|
472
500
|
|
|
473
501
|
const accountNamespaces = config.codexAccountNamespaces;
|
|
@@ -352,6 +352,7 @@ export const providerConfigSchema = z.object({
|
|
|
352
352
|
requiresPairedResponsesToolResults: z.boolean().optional(),
|
|
353
353
|
annotateEmptyToolOutputs: z.boolean().optional(),
|
|
354
354
|
foldDeveloperRoleToSystem: z.boolean().optional(),
|
|
355
|
+
singleLeadingSystemMessage: z.boolean().optional(),
|
|
355
356
|
fastWire: fastWireSchema.nullable().optional(),
|
|
356
357
|
responseTierAuthoritative: z.boolean().optional(),
|
|
357
358
|
fastEnabled: z.boolean().optional(),
|
|
@@ -359,6 +360,7 @@ export const providerConfigSchema = z.object({
|
|
|
359
360
|
inferContextWindow: z.boolean().optional(),
|
|
360
361
|
modelSupportsServiceTier: z.record(z.string().min(1), z.boolean()).optional(),
|
|
361
362
|
modelSuppressSyntheticMax: z.record(z.string().min(1), z.boolean()).optional(),
|
|
363
|
+
promoteAdditionalTools: z.boolean().optional(),
|
|
362
364
|
preserveResponsesReasoningContent: z.boolean().optional(),
|
|
363
365
|
preserveResponsesInputItemIds: z.boolean().optional(),
|
|
364
366
|
preserveResponsesMessageMetadata: z.boolean().optional(),
|
|
@@ -864,6 +866,11 @@ export const opencodeClientExportSchema = z.object({
|
|
|
864
866
|
timeoutMs: opencodeClientExportTimeout.optional().catch(undefined),
|
|
865
867
|
}).passthrough();
|
|
866
868
|
|
|
869
|
+
/** omo dialect: an unknown value is dropped so the export falls back to the Chat default. */
|
|
870
|
+
export const omoClientExportSchema = z.object({
|
|
871
|
+
api: z.enum(["openai-completions", "openai-responses"]).optional().catch(undefined),
|
|
872
|
+
}).passthrough();
|
|
873
|
+
|
|
867
874
|
export const asideProfileSyncSchema = z.object({
|
|
868
875
|
allProfiles: z.boolean().optional(),
|
|
869
876
|
profiles: z.record(
|
|
@@ -0,0 +1,43 @@
|
|
|
1
|
+
import * as z from "zod/v4";
|
|
2
|
+
import type { OcxConfig } from "../../types";
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* Per-install bounds for the root-workflow count ceilings.
|
|
6
|
+
*
|
|
7
|
+
* The lower concurrency bound is two because one slot is always held back for the interactive
|
|
8
|
+
* turn; at one, every worker turn would be refused. The upper bounds keep each ceiling a
|
|
9
|
+
* ceiling: a value large enough to never fire is a way of switching the guard off, and that is
|
|
10
|
+
* not what this setting is for.
|
|
11
|
+
*/
|
|
12
|
+
export const WORKFLOW_BUDGET_BOUNDS = {
|
|
13
|
+
maxConcurrentChildren: { min: 2, max: 64 },
|
|
14
|
+
maxPhysicalSends: { min: 1, max: 10_000 },
|
|
15
|
+
maxDistinctChildren: { min: 1, max: 1_024 },
|
|
16
|
+
} as const;
|
|
17
|
+
|
|
18
|
+
const bounded = (key: keyof typeof WORKFLOW_BUDGET_BOUNDS) =>
|
|
19
|
+
z.number().int().min(WORKFLOW_BUDGET_BOUNDS[key].min).max(WORKFLOW_BUDGET_BOUNDS[key].max).optional();
|
|
20
|
+
|
|
21
|
+
/** Omitted fields keep the built-in ceiling, so an absent block is today's behavior byte for byte. */
|
|
22
|
+
export const workflowBudgetSchema = z.object({
|
|
23
|
+
maxConcurrentChildren: bounded("maxConcurrentChildren"),
|
|
24
|
+
maxPhysicalSends: bounded("maxPhysicalSends"),
|
|
25
|
+
maxDistinctChildren: bounded("maxDistinctChildren"),
|
|
26
|
+
}).strict();
|
|
27
|
+
|
|
28
|
+
export type WorkflowBudgetConfig = z.infer<typeof workflowBudgetSchema>;
|
|
29
|
+
|
|
30
|
+
export const WORKFLOW_BUDGET_SHAPE_HINT = "accepts only optional integer maxConcurrentChildren (2-64), maxPhysicalSends (1-10000) and maxDistinctChildren (1-1024)";
|
|
31
|
+
|
|
32
|
+
export function workflowBudgetConfigError(value: unknown): string | null {
|
|
33
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) return null;
|
|
34
|
+
const budget = (value as Record<string, unknown>).workflowBudget;
|
|
35
|
+
return budget === undefined || workflowBudgetSchema.safeParse(budget).success
|
|
36
|
+
? null : "schema_invalid: workflowBudget: " + WORKFLOW_BUDGET_SHAPE_HINT;
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
/** Malformed input resolves to no overrides, the same way a degraded disk block does. */
|
|
40
|
+
export function readWorkflowBudgetConfig(config: Pick<OcxConfig, "workflowBudget">): WorkflowBudgetConfig {
|
|
41
|
+
const parsed = workflowBudgetSchema.safeParse(config.workflowBudget);
|
|
42
|
+
return parsed.success && parsed.data ? parsed.data : {};
|
|
43
|
+
}
|