@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
|
@@ -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
|
+
}
|
|
@@ -0,0 +1,188 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Read-only classification of the tracked runtime record pair a guarded stop
|
|
3
|
+
* re-verifies before acting.
|
|
4
|
+
*
|
|
5
|
+
* "ocx stop --expect-*" asks "is the recorded runtime still the approved one",
|
|
6
|
+
* which collapses several observations into one boolean: a missing or invalid
|
|
7
|
+
* "ocx.pid", a dead, foreign or unverifiable recorded process, and a missing,
|
|
8
|
+
* invalid or PID-mismatched "runtime-port.json" all read as "not verified".
|
|
9
|
+
* The approval-changed refusal used to report only that umbrella fact, so a
|
|
10
|
+
* desktop log could not tell a stale record from a permission failure.
|
|
11
|
+
*
|
|
12
|
+
* This probe walks the same checks in the same order as "readPid()" followed
|
|
13
|
+
* by "readRuntimePort(pid)", but reports which one failed instead. Each state
|
|
14
|
+
* record is still read exactly once per call -- a guarded stop asks once, and
|
|
15
|
+
* caching the bytes would only carry a stale answer into a decision about a
|
|
16
|
+
* record that may have been rewritten. The process-identity question, though,
|
|
17
|
+
* is answered by the same cache-backed observation "readPid()" itself makes
|
|
18
|
+
* ("inspectOcxStartProcessIdentity"): a cached verdict serves this probe with
|
|
19
|
+
* no native command at all, and a miss performs the same single command-line
|
|
20
|
+
* probe readPid would, so this probe can never disagree with the admission
|
|
21
|
+
* readPid just granted or denied for the same PID. It performs no mutation, no
|
|
22
|
+
* signal beyond the same "process.kill(pid, 0)" liveness read, and no stop
|
|
23
|
+
* decision -- the refusal itself is unchanged; only its detail gains a cause.
|
|
24
|
+
*
|
|
25
|
+
* Two distinctions are deliberate:
|
|
26
|
+
*
|
|
27
|
+
* - "permission-denied" is reported only for a real EACCES/EPERM observed on a
|
|
28
|
+
* record read or the liveness signal. An "unverifiable" identity observation
|
|
29
|
+
* -- an unreadable process command line -- is not proof of a permission
|
|
30
|
+
* boundary, and no account or elevation cause is inferred from it.
|
|
31
|
+
* - No path, command line, stderr text, or token leaves this module: the refusal
|
|
32
|
+
* causes below are fixed strings and the detail built from them is a fixed
|
|
33
|
+
* sentence.
|
|
34
|
+
*/
|
|
35
|
+
import { readFileSync } from "node:fs";
|
|
36
|
+
import {
|
|
37
|
+
getPidPath,
|
|
38
|
+
getRuntimePortPath,
|
|
39
|
+
inspectOcxStartProcessIdentity,
|
|
40
|
+
isValidRuntimePortState,
|
|
41
|
+
parsePidFile,
|
|
42
|
+
} from "./process-state";
|
|
43
|
+
import type { OcxStartIdentityObservation } from "./process-state";
|
|
44
|
+
|
|
45
|
+
/** The single check that failed, as a stable machine-readable token. */
|
|
46
|
+
export type TrackedRecordRefusal =
|
|
47
|
+
| "pid-record-absent"
|
|
48
|
+
| "pid-record-permission-denied"
|
|
49
|
+
| "pid-record-unreadable"
|
|
50
|
+
| "pid-record-invalid"
|
|
51
|
+
| "process-not-running"
|
|
52
|
+
| "process-identity-mismatch"
|
|
53
|
+
| "process-unverifiable"
|
|
54
|
+
| "runtime-record-absent"
|
|
55
|
+
| "runtime-record-permission-denied"
|
|
56
|
+
| "runtime-record-unreadable"
|
|
57
|
+
| "runtime-record-invalid"
|
|
58
|
+
| "runtime-record-pid-mismatch"
|
|
59
|
+
| "unverified";
|
|
60
|
+
|
|
61
|
+
export type TrackedRecordInspection =
|
|
62
|
+
| { status: "verified"; pid: number; port: number; hostname: string }
|
|
63
|
+
| { status: "refused"; reason: TrackedRecordRefusal };
|
|
64
|
+
|
|
65
|
+
/**
|
|
66
|
+
* Injectable read-only seams. Tests must supply fakes for "signal" and either
|
|
67
|
+
* "identity" or the process-state exec seams ("setProcessCommandLineExecForTests"
|
|
68
|
+
* and friends) so no real "process.kill" or native command probe runs; the
|
|
69
|
+
* defaults are exactly what the production caller uses, including the shared
|
|
70
|
+
* identity cache.
|
|
71
|
+
*/
|
|
72
|
+
export interface TrackedRecordProbeDeps {
|
|
73
|
+
/** Read a state record like "readFileSync(path, 'utf-8')"; throw with errno codes. */
|
|
74
|
+
readFile?: (path: string) => string;
|
|
75
|
+
/** The "process.kill(pid, 0)" liveness read; throws like it (ESRCH/EPERM/...). */
|
|
76
|
+
signal?: (pid: number) => void;
|
|
77
|
+
/** The shared start-identity observation; the default consults the real cache. */
|
|
78
|
+
identity?: (pid: number) => OcxStartIdentityObservation;
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
function readRecordFile(
|
|
82
|
+
readFile: (path: string) => string,
|
|
83
|
+
path: string,
|
|
84
|
+
absent: TrackedRecordRefusal,
|
|
85
|
+
denied: TrackedRecordRefusal,
|
|
86
|
+
unreadable: TrackedRecordRefusal,
|
|
87
|
+
): { ok: true; raw: string } | { ok: false; reason: TrackedRecordRefusal } {
|
|
88
|
+
try {
|
|
89
|
+
return { ok: true, raw: readFile(path) };
|
|
90
|
+
} catch (error) {
|
|
91
|
+
const code = (error as NodeJS.ErrnoException).code;
|
|
92
|
+
if (code === "EACCES" || code === "EPERM") return { ok: false, reason: denied };
|
|
93
|
+
if (code === "ENOENT") return { ok: false, reason: absent };
|
|
94
|
+
return { ok: false, reason: unreadable };
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
/**
|
|
99
|
+
* Classify why the tracked runtime record cannot back a guarded stop, or return
|
|
100
|
+
* the verified target when every check still holds. One read per record, in the
|
|
101
|
+
* same order the stop path already performs them.
|
|
102
|
+
*/
|
|
103
|
+
export function inspectTrackedRuntimeRecord(
|
|
104
|
+
deps: TrackedRecordProbeDeps = {},
|
|
105
|
+
): TrackedRecordInspection {
|
|
106
|
+
const readFile = deps.readFile ?? ((path: string) => readFileSync(path, "utf-8"));
|
|
107
|
+
const signal = deps.signal ?? ((pid: number) => { process.kill(pid, 0); });
|
|
108
|
+
const identity = deps.identity ?? inspectOcxStartProcessIdentity;
|
|
109
|
+
try {
|
|
110
|
+
const pidFile = readRecordFile(
|
|
111
|
+
readFile, getPidPath(), "pid-record-absent", "pid-record-permission-denied", "pid-record-unreadable",
|
|
112
|
+
);
|
|
113
|
+
if (!pidFile.ok) return { status: "refused", reason: pidFile.reason };
|
|
114
|
+
const pid = parsePidFile(pidFile.raw);
|
|
115
|
+
if (pid === null) return { status: "refused", reason: "pid-record-invalid" };
|
|
116
|
+
try {
|
|
117
|
+
signal(pid);
|
|
118
|
+
} catch (error) {
|
|
119
|
+
const code = (error as NodeJS.ErrnoException).code;
|
|
120
|
+
if (code === "ESRCH") return { status: "refused", reason: "process-not-running" };
|
|
121
|
+
// EPERM still names a live process; identity is decided by the shared
|
|
122
|
+
// observation below, exactly as readPid decides it. Any other signal
|
|
123
|
+
// error can only be reported as unverifiable.
|
|
124
|
+
if (code !== "EPERM") return { status: "refused", reason: "process-unverifiable" };
|
|
125
|
+
}
|
|
126
|
+
const observation = identity(pid);
|
|
127
|
+
if (observation === "unverifiable") {
|
|
128
|
+
return { status: "refused", reason: "process-unverifiable" };
|
|
129
|
+
}
|
|
130
|
+
if (observation === "mismatch") {
|
|
131
|
+
return { status: "refused", reason: "process-identity-mismatch" };
|
|
132
|
+
}
|
|
133
|
+
const runtimeFile = readRecordFile(
|
|
134
|
+
readFile, getRuntimePortPath(),
|
|
135
|
+
"runtime-record-absent", "runtime-record-permission-denied", "runtime-record-unreadable",
|
|
136
|
+
);
|
|
137
|
+
if (!runtimeFile.ok) return { status: "refused", reason: runtimeFile.reason };
|
|
138
|
+
let parsed: unknown;
|
|
139
|
+
try {
|
|
140
|
+
parsed = JSON.parse(runtimeFile.raw);
|
|
141
|
+
} catch {
|
|
142
|
+
return { status: "refused", reason: "runtime-record-invalid" };
|
|
143
|
+
}
|
|
144
|
+
if (!isValidRuntimePortState(parsed)) {
|
|
145
|
+
return { status: "refused", reason: "runtime-record-invalid" };
|
|
146
|
+
}
|
|
147
|
+
if (parsed.pid !== pid) {
|
|
148
|
+
return { status: "refused", reason: "runtime-record-pid-mismatch" };
|
|
149
|
+
}
|
|
150
|
+
return { status: "verified", pid, port: parsed.port, hostname: parsed.hostname ?? "" };
|
|
151
|
+
} catch {
|
|
152
|
+
return { status: "refused", reason: "unverified" };
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
/**
|
|
157
|
+
* Fixed refusal causes for the approval-changed detail. Every entry is a
|
|
158
|
+
* complete sentence fragment and contains no path, command line, stderr, or
|
|
159
|
+
* token, so the resulting detail is safe to surface in a caller's log or UI.
|
|
160
|
+
*/
|
|
161
|
+
const TRACKED_REFUSAL_CAUSES: Record<TrackedRecordRefusal, string> = {
|
|
162
|
+
"pid-record-absent": "the recorded PID file is absent",
|
|
163
|
+
"pid-record-permission-denied": "reading the recorded PID file was denied",
|
|
164
|
+
"pid-record-unreadable": "the recorded PID file could not be read",
|
|
165
|
+
"pid-record-invalid": "the recorded PID file is not a valid record",
|
|
166
|
+
"process-not-running": "the recorded process is no longer running",
|
|
167
|
+
"process-identity-mismatch": "the recorded process does not match the expected start command",
|
|
168
|
+
"process-unverifiable": "the recorded process identity could not be verified",
|
|
169
|
+
"runtime-record-absent": "the tracked runtime record is absent",
|
|
170
|
+
"runtime-record-permission-denied": "reading the tracked runtime record was denied",
|
|
171
|
+
"runtime-record-unreadable": "the tracked runtime record could not be read",
|
|
172
|
+
"runtime-record-invalid": "the tracked runtime record is not a valid record",
|
|
173
|
+
"runtime-record-pid-mismatch": "the tracked runtime record names a different PID",
|
|
174
|
+
"unverified": "the tracked runtime record could not be re-verified",
|
|
175
|
+
};
|
|
176
|
+
|
|
177
|
+
/**
|
|
178
|
+
* The guarded stop's tracked() callback shape: the verified target, or the
|
|
179
|
+
* fixed cause of the single check that failed. Read-only; decides nothing.
|
|
180
|
+
*/
|
|
181
|
+
export function describeTrackedRuntimeTarget(
|
|
182
|
+
deps: TrackedRecordProbeDeps = {},
|
|
183
|
+
): { pid: number; port: number; hostname: string } | { untracked: string } {
|
|
184
|
+
const inspection = inspectTrackedRuntimeRecord(deps);
|
|
185
|
+
return inspection.status === "verified"
|
|
186
|
+
? { pid: inspection.pid, port: inspection.port, hostname: inspection.hostname }
|
|
187
|
+
: { untracked: TRACKED_REFUSAL_CAUSES[inspection.reason] };
|
|
188
|
+
}
|