@bitkyc08/opencodex 2.92.0 → 2.93.0-preview.20261027
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/bin/ocx.mjs +10 -5
- package/gui/dist/assets/App-CJZoq-uF.js +58 -0
- package/gui/dist/assets/{Tray-BSsxznDm.js → Tray-BWQPcgZn.js} +1 -1
- package/gui/dist/assets/index-DRe8Hhfz.css +1 -0
- package/gui/dist/assets/{index-BlFE_VB_.js → index-Xfct8owH.js} +12 -12
- package/gui/dist/assets/{quota-summary-BRlbXgw0.js → quota-summary-DxToX1rV.js} +1 -1
- package/gui/dist/index.html +2 -2
- package/package.json +5 -5
- package/src/adapters/anthropic.ts +28 -5
- package/src/adapters/coding-agent/batch-dispatcher.ts +122 -0
- package/src/adapters/coding-agent/profile.ts +54 -16
- package/src/adapters/coding-agent/turn.ts +30 -2
- package/src/adapters/command-code.ts +114 -7
- package/src/adapters/cursor/native-exec-fs.ts +11 -9
- package/src/adapters/devin/live-models.ts +4 -0
- package/src/adapters/google-wire-compiler.ts +1 -2
- package/src/adapters/kiro/reasoning.ts +2 -0
- package/src/adapters/kiro-refusal.ts +6 -1
- package/src/adapters/kiro-wire.ts +1 -1
- package/src/adapters/openai-chat/messages.ts +8 -2
- package/src/adapters/openai-chat/passthrough.ts +35 -14
- package/src/adapters/openai-chat/reasoning-replay.ts +27 -16
- package/src/adapters/openai-chat/reasoning-wire.ts +117 -8
- package/src/adapters/openai-chat/required-tool-result.ts +64 -0
- package/src/adapters/openai-chat.ts +7 -8
- package/src/adapters/openai-responses/passthrough.ts +7 -4
- package/src/adapters/openai-responses/reasoning.ts +13 -0
- package/src/adapters/openai-responses/request-strips.ts +1 -1
- package/src/adapters/qoder/adapter.ts +129 -8
- package/src/adapters/qoder/scaffold-guard.ts +5 -0
- package/src/adapters/reasoning-controls.ts +16 -0
- package/src/adapters/tool-call-id.ts +1 -3
- package/src/bridge/errors.ts +27 -0
- package/src/bridge.ts +1 -1
- package/src/chat/inbound.ts +4 -1
- package/src/chat/outbound.ts +9 -2
- package/src/chat/reasoning-details.ts +28 -5
- package/src/claude/desktop-first-party.ts +54 -4
- package/src/claude/desktop-picker.ts +11 -8
- package/src/claude/first-party-settings.ts +3 -1
- package/src/claude/inbound.ts +2 -1
- package/src/claude/intercept/local-ca.ts +2 -1
- package/src/claude/intercept/picker-ca-cleanup.ts +4 -2
- package/src/claude/intercept/picker-ca-startup.ts +3 -1
- package/src/claude/intercept/picker-models.ts +6 -3
- package/src/claude/intercept/picker-runtime.ts +3 -2
- package/src/claude/intercept/runtime.ts +6 -3
- package/src/claude/model-info.ts +31 -8
- package/src/cli/account-api.ts +11 -0
- package/src/cli/capabilities-agents-routing.ts +2 -2
- package/src/cli/capabilities-base.ts +7 -1
- package/src/cli/capabilities-observe-system.ts +10 -0
- package/src/cli/claude-desktop.ts +9 -8
- package/src/cli/claude.ts +3 -2
- package/src/cli/codex-shim-autorestore.ts +9 -0
- package/src/cli/combo-result.ts +7 -0
- package/src/cli/combo.ts +18 -0
- package/src/cli/cross-home-owner.ts +13 -1
- package/src/cli/dispatch.ts +25 -6
- package/src/cli/ensure-desired-integrations.ts +8 -6
- package/src/cli/export-command.ts +4 -1
- package/src/cli/help.ts +2 -1
- package/src/cli/index.ts +45 -45
- package/src/cli/integration-plan-dto.ts +4 -0
- package/src/cli/opencode.ts +20 -9
- package/src/cli/registry.ts +6 -4
- package/src/cli/root.ts +9 -0
- package/src/cli/status.ts +59 -1
- package/src/cli/stop-restore.ts +113 -0
- package/src/cli/sync-expectation.ts +60 -0
- package/src/cli/uninstall-integrations.ts +41 -7
- package/src/client/connect.ts +40 -3
- package/src/client/link-home.ts +10 -1
- package/src/client/machine-api.ts +3 -1
- package/src/client/sync-expectation.ts +118 -0
- package/src/clients/config-export/agent-clients.ts +96 -0
- package/src/clients/config-export/contracts.ts +25 -7
- package/src/clients/config-export/qoder.ts +38 -23
- package/src/clients/config-export/reasoning-metadata.ts +55 -8
- package/src/clients/config-export.ts +12 -0
- package/src/clients/lazycodex.ts +7 -2
- package/src/clients/reasoning-controls.ts +49 -0
- package/src/codex/auth-api/account-identity.ts +14 -0
- package/src/codex/auth-api/account-list.ts +29 -2
- package/src/codex/auth-api/http.ts +13 -0
- package/src/codex/auth-api/main-account-probe.ts +2 -2
- package/src/codex/auth-api/pool-mode-gate.ts +16 -3
- package/src/codex/auth-api/pool-quota-probe.ts +15 -0
- package/src/codex/auth-context.ts +15 -12
- package/src/codex/catalog/build-entries.ts +22 -0
- package/src/codex/catalog/configured-tiers.ts +70 -0
- package/src/codex/catalog/effort.ts +44 -10
- package/src/codex/catalog/gather-capture.ts +1 -0
- package/src/codex/catalog/heal-observation.ts +155 -13
- package/src/codex/catalog/metadata.ts +6 -0
- package/src/codex/catalog/model-hints.ts +60 -11
- package/src/codex/catalog/model-visibility.ts +3 -2
- package/src/codex/catalog/native-models.ts +18 -3
- package/src/codex/catalog/parsing.ts +10 -8
- package/src/codex/catalog/pinned-models.ts +2 -1
- package/src/codex/catalog/provider-models.ts +4 -5
- package/src/codex/catalog/retained-sync.ts +2 -1
- package/src/codex/catalog/routed-gather.ts +19 -20
- package/src/codex/catalog/write-audit.ts +3 -2
- package/src/codex/catalog-self-heal.ts +43 -23
- package/src/codex/collision-identity.ts +30 -5
- package/src/codex/convergence.ts +4 -3
- package/src/codex/data/roster-pinned-models.json +177 -1
- package/src/codex/desired-state.ts +6 -1
- package/src/codex/desktop-compatibility/installed-build.ts +88 -12
- package/src/codex/desktop-compatibility/runtime.ts +29 -5
- package/src/codex/desktop-compatibility/usage-controller.ts +2 -0
- package/src/codex/desktop-compatibility/windows-certificate-trust.ts +46 -12
- package/src/codex/inject/config-toml.ts +0 -18
- package/src/codex/inject/plan.ts +18 -3
- package/src/codex/inject/remove.ts +6 -2
- package/src/codex/inject.ts +1 -1
- package/src/codex/journal.ts +61 -1
- package/src/codex/model-entitlements.ts +1 -1
- package/src/codex/native-main-owner.ts +27 -1
- package/src/codex/native-profile-store.ts +2 -1
- package/src/codex/pool-credit-policy.ts +35 -1
- package/src/codex/quota-types.ts +3 -0
- package/src/codex/quota.ts +24 -4
- package/src/codex/role-auto-assign.ts +6 -2
- package/src/codex/subagent-defaults.ts +49 -4
- package/src/combos/failover.ts +17 -2
- package/src/combos/jev-decision-contract.ts +22 -1
- package/src/combos/jev-service-exchange.ts +3 -1
- package/src/combos/jev.ts +95 -9
- package/src/combos/resolve.ts +45 -1
- package/src/combos/types.ts +24 -0
- package/src/config/load-degrade.ts +5 -0
- package/src/config/paths.ts +19 -3
- package/src/config/pending-teardown.ts +22 -1
- package/src/config/provider-validation.ts +15 -4
- package/src/config/removed-opencode-free.ts +11 -0
- package/src/config/schema/leaf-validators.ts +5 -0
- package/src/generated/compatibility-version.json +314 -230
- package/src/generated/model-metadata.ts +5 -5
- package/src/images/loop.ts +16 -2
- package/src/integrations/catalog-refresh.ts +1 -1
- package/src/integrations/hermes-profiles.ts +251 -0
- package/src/integrations/merge.ts +8 -0
- package/src/integrations/mutation-plan.ts +19 -4
- package/src/integrations/registry.ts +5 -0
- package/src/integrations/state.ts +36 -1
- package/src/integrations/writer.ts +18 -4
- package/src/lib/bun-path-runtime.mjs +2 -1
- package/src/lib/errors.ts +62 -0
- package/src/lib/eventstream-decoder.ts +81 -37
- package/src/lib/opaque-proxy-tunnel.ts +32 -8
- package/src/lib/pinned-http.ts +35 -2
- package/src/lib/process-control.ts +13 -1
- package/src/lib/socks5-fetch.ts +59 -64
- package/src/lib/socks5-upload-waiter.ts +50 -0
- package/src/lib/sse-decoder.ts +7 -2
- package/src/lib/state-store-sweeper.ts +40 -14
- package/src/lib/windows-native-principal-worker.ts +14 -0
- package/src/lib/windows-native-principal.ts +188 -0
- package/src/lib/windows-secret-acl.ts +39 -3
- package/src/lib/windows-user-principal.ts +62 -18
- package/src/link/ssh-config.ts +35 -3
- package/src/providers/account-quota-disk.ts +12 -4
- package/src/providers/codebuddy-models.ts +6 -0
- package/src/providers/codex-capacity.ts +3 -1
- package/src/providers/derive.ts +28 -0
- package/src/providers/kiro-models.ts +3 -0
- package/src/providers/mimo-thinking.ts +12 -0
- package/src/providers/model-rename-fields.ts +1 -0
- package/src/providers/model-rename-migration.ts +10 -0
- package/src/providers/openai-sidecar-credit.ts +2 -2
- package/src/providers/reasoning-capabilities.ts +76 -0
- package/src/providers/registry/entries-core.ts +14 -12
- package/src/providers/registry/entries-extended.ts +63 -20
- package/src/providers/registry/model-ids.ts +2 -0
- package/src/providers/registry/model-seeds.ts +93 -28
- package/src/providers/registry/types.ts +10 -1
- package/src/providers/resolved-model-policy.ts +26 -6
- package/src/providers/routed-config.ts +9 -1
- package/src/providers/stale-model-roster-migration.ts +44 -7
- package/src/remote-control/workspace-pi-runtime.ts +11 -6
- package/src/responses/compaction-summary.ts +45 -0
- package/src/responses/muse-tool-name-alias.ts +1 -2
- package/src/responses/parser.ts +3 -2
- package/src/responses/schema.ts +1 -0
- package/src/responses/thought-signature-replay.ts +10 -2
- package/src/routing/capability.ts +8 -2
- package/src/routing/history/ingest.ts +28 -3
- package/src/server/auth-cors.ts +3 -2
- package/src/server/chat-completions.ts +7 -0
- package/src/server/chat-native-eligibility.ts +7 -0
- package/src/server/chat-native-reasoning.ts +14 -4
- package/src/server/direct-local-http.ts +5 -2
- package/src/server/effort-policy.ts +5 -1
- package/src/server/index/live-sideband.ts +18 -15
- package/src/server/index/serve-options.ts +5 -4
- package/src/server/management/agent-settings-routes.ts +27 -15
- package/src/server/management/combo-routes.ts +4 -0
- package/src/server/management/config-routes.ts +2 -2
- package/src/server/management/decision-discovery.ts +12 -2
- package/src/server/management/hermes-profile-routes.ts +156 -0
- package/src/server/management/integration-routes.ts +85 -24
- package/src/server/management/model-routes.ts +2 -2
- package/src/server/management/model-row-export-metadata.ts +25 -6
- package/src/server/management/model-rows.ts +15 -20
- package/src/server/management/native-integration-routes.ts +11 -8
- package/src/server/management/route-registry.ts +4 -0
- package/src/server/management-api.ts +5 -0
- package/src/server/models-capabilities.ts +21 -3
- package/src/server/responses/adapter-delivery.ts +11 -1
- package/src/server/responses/adapter-dispatch.ts +2 -2
- package/src/server/responses/codex-ws-exchange.ts +39 -9
- package/src/server/responses/codex-ws-session.ts +38 -4
- package/src/server/responses/codex-ws-wire.ts +6 -1
- package/src/server/responses/combo-required-tool-contract.ts +103 -0
- package/src/server/responses/combo-stream-preflight.ts +8 -1
- package/src/server/responses/compact.ts +4 -3
- package/src/server/responses/context-overflow.ts +8 -1
- package/src/server/responses/core-combo-failure.ts +10 -0
- package/src/server/responses/core-combo.ts +23 -15
- package/src/server/responses/core-lifetime.ts +3 -0
- package/src/server/responses/core-normalize.ts +11 -1
- package/src/server/responses/core-options.ts +2 -0
- package/src/server/responses/main-hard-lock-routing.ts +60 -44
- package/src/server/responses/passthrough-delivery.ts +40 -2
- package/src/server/responses/policy-fallback.ts +6 -1
- package/src/server/responses/request-compression.ts +12 -7
- package/src/server/responses/request-prepare.ts +22 -2
- package/src/server/responses/request-sidecar-auth.ts +2 -0
- package/src/server/responses/response-effects.ts +22 -10
- package/src/server/responses/sidecar-execution.ts +11 -3
- package/src/server/stop-teardown.ts +36 -1
- package/src/server/ws-bridge.ts +1 -1
- package/src/service/desktop-supervision.d.mts +7 -4
- package/src/service/desktop-supervision.mjs +90 -13
- package/src/service/ownership-mutation-lease.mjs +21 -7
- package/src/types/config.ts +8 -2
- package/src/types/provider.ts +20 -6
- package/src/types/request.ts +10 -0
- package/src/types.ts +1 -0
- package/src/update/bind-probe.ts +29 -0
- package/src/update/job.ts +10 -29
- package/src/update/npm-install-job.ps1 +173 -0
- package/src/update/npm-install.mjs +70 -0
- package/src/update/stop-contract.d.mts +1 -0
- package/src/update/stop-contract.mjs +14 -0
- package/src/update/stop-decision.d.mts +1 -1
- package/src/update/stop-decision.mjs +13 -3
- package/src/update/teardown-handover.ts +166 -0
- package/src/update/transactional-install.d.mts +14 -3
- package/src/update/transactional-install.mjs +33 -7
- package/src/usage/expected-prices.ts +64 -31
- package/src/usage/timeline.ts +19 -9
- package/src/vision/eligibility.ts +15 -5
- package/src/vision/plan.ts +2 -2
- package/src/web-search/loop.ts +16 -2
- package/gui/dist/assets/App-sUf_8afJ.js +0 -58
- package/gui/dist/assets/index-DPeB9HpV.css +0 -1
|
@@ -0,0 +1,166 @@
|
|
|
1
|
+
import {
|
|
2
|
+
clearPendingTeardown,
|
|
3
|
+
isPendingTeardownAbandoned,
|
|
4
|
+
listPendingTeardowns,
|
|
5
|
+
pendingTeardownPathFor,
|
|
6
|
+
pendingTeardownsAreExactly,
|
|
7
|
+
readPendingTeardown,
|
|
8
|
+
} from "../config/pending-teardown";
|
|
9
|
+
import { isLikelyOcxProcess } from "../config/process-state";
|
|
10
|
+
import { isProcessAlive } from "../lib/process-control";
|
|
11
|
+
|
|
12
|
+
/**
|
|
13
|
+
* Update teardown handover (#7423).
|
|
14
|
+
*
|
|
15
|
+
* An update stops the proxy before replacing the package. That stop used to restore native
|
|
16
|
+
* Codex, which puts the pristine catalog back and removes every routed row. The new proxy
|
|
17
|
+
* appends them again when it starts, but a Codex process that loads the catalog in between
|
|
18
|
+
* keeps treating routed models as unknown until it is restarted. On a long-context model
|
|
19
|
+
* that silent fallback metadata turned into a compaction loop.
|
|
20
|
+
*
|
|
21
|
+
* When the caller is going to restart the proxy, it sets this variable on the update
|
|
22
|
+
* child. The `ocx stop` that the update runs then keeps its teardown receipt instead of
|
|
23
|
+
* restoring, and the proxy that honours the deferral keeps its client config on exit.
|
|
24
|
+
* Ownership stays explicit: the receipt is the same durable obligation any deferred stop
|
|
25
|
+
* writes, so a replacement that never starts leaves it for the next `ocx stop` to finish.
|
|
26
|
+
*
|
|
27
|
+
* An ordinary `ocx stop` never sees the variable and still restores native routing.
|
|
28
|
+
*/
|
|
29
|
+
export const UPDATE_TEARDOWN_HANDOVER_ENV = "OCX_UPDATE_TEARDOWN_HANDOVER";
|
|
30
|
+
|
|
31
|
+
/**
|
|
32
|
+
* `publishesOnStart` answers whether the restarted proxy will run its startup Codex sync.
|
|
33
|
+
* Without one it can never discharge the receipt, so the stop restores as usual; an
|
|
34
|
+
* unreadable answer is treated the same way.
|
|
35
|
+
*/
|
|
36
|
+
export function updateTeardownHandoverRequested(
|
|
37
|
+
env: NodeJS.ProcessEnv = process.env,
|
|
38
|
+
publishesOnStart: () => boolean = () => true,
|
|
39
|
+
): boolean {
|
|
40
|
+
if (env[UPDATE_TEARDOWN_HANDOVER_ENV] !== "1") return false;
|
|
41
|
+
try { return publishesOnStart(); } catch { return false; }
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
/** An identity-aware "is that stop still running", the rule handleStop uses for receipts. */
|
|
45
|
+
export function teardownOwnerStillRunning(pid: number): boolean {
|
|
46
|
+
return isProcessAlive(pid) && isLikelyOcxProcess(pid);
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
/**
|
|
50
|
+
* Is an update handover waiting for this starting proxy? True when a valid, exact handover
|
|
51
|
+
* receipt exists whose stop has exited: that stop kept Codex routing for the replacement.
|
|
52
|
+
*/
|
|
53
|
+
export function updateTeardownHandoverPending(ownerStillRunning: (pid: number) => boolean = teardownOwnerStillRunning): boolean {
|
|
54
|
+
return listPendingTeardowns().some(read => read.state === "valid"
|
|
55
|
+
&& read.receipt.handover === "update-restart" && read.receipt.endpointSource === "exact"
|
|
56
|
+
&& isPendingTeardownAbandoned(read, ownerStillRunning));
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
/** The environment for an update child whose caller will restart the proxy afterwards. */
|
|
60
|
+
export function withUpdateTeardownHandover(env: NodeJS.ProcessEnv = process.env): NodeJS.ProcessEnv {
|
|
61
|
+
return { ...env, [UPDATE_TEARDOWN_HANDOVER_ENV]: "1" };
|
|
62
|
+
}
|
|
63
|
+
|
|
64
|
+
/** The environment for an update child that must restore as usual, whatever this process inherited. */
|
|
65
|
+
export function withoutUpdateTeardownHandover(env: NodeJS.ProcessEnv = process.env): NodeJS.ProcessEnv {
|
|
66
|
+
const child = { ...env };
|
|
67
|
+
delete child[UPDATE_TEARDOWN_HANDOVER_ENV];
|
|
68
|
+
return child;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
/**
|
|
72
|
+
* Drop the marker from a starting proxy. The updater lanes pass their environment to the
|
|
73
|
+
* recovery and replacement starts they spawn; a proxy that kept it would hand it to every
|
|
74
|
+
* dashboard update worker it launches later, including ones that never restart.
|
|
75
|
+
*/
|
|
76
|
+
export function forgetUpdateTeardownHandover(env: NodeJS.ProcessEnv = process.env): void {
|
|
77
|
+
delete env[UPDATE_TEARDOWN_HANDOVER_ENV];
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
/** The facts `ocx stop` has already settled when it reaches the shared restore. */
|
|
81
|
+
export type StopHandoverFacts = {
|
|
82
|
+
requested: boolean;
|
|
83
|
+
restoreBlocked: boolean;
|
|
84
|
+
nonce: string | undefined;
|
|
85
|
+
stopFailed: boolean;
|
|
86
|
+
recoveredCount: number;
|
|
87
|
+
proxy: string;
|
|
88
|
+
/** What the service-manager stop returned; a manager can take the proxy down itself. */
|
|
89
|
+
service?: string;
|
|
90
|
+
/**
|
|
91
|
+
* The proxy this run stopped answered `deferred` before exiting. Any fallback (a failed
|
|
92
|
+
* or unconfirmed /api/stop, then a signal) lets a standalone proxy's exit cleanup restore
|
|
93
|
+
* native Codex and the pristine catalog, so nothing is left to hand over.
|
|
94
|
+
*/
|
|
95
|
+
deferralHonored?: boolean;
|
|
96
|
+
};
|
|
97
|
+
|
|
98
|
+
/**
|
|
99
|
+
* May this stop skip the restore and hand its teardown to the restarted proxy?
|
|
100
|
+
*
|
|
101
|
+
* Only when the update asked for it, this run's own receipt is the single obligation in
|
|
102
|
+
* the home, and the proxy it named is down: stopped by this run, or gone after a clean
|
|
103
|
+
* service-manager stop (a launchd/systemd/scheduler child exits with its manager, and its
|
|
104
|
+
* own exit cleanup keeps routing because it runs with OCX_SERVICE). A recovered or foreign
|
|
105
|
+
* receipt, a blocked restore or a stop that failed on the way all take the ordinary
|
|
106
|
+
* restore instead. The exclusivity check is what lets the updater treat the outstanding
|
|
107
|
+
* receipt as expected; the updater still probes the endpoint itself before replacing files.
|
|
108
|
+
*/
|
|
109
|
+
export function stopHandsTeardownOver(facts: StopHandoverFacts): boolean {
|
|
110
|
+
const managerStopped = facts.service === "stopped" || facts.service === "stopped-respawnable";
|
|
111
|
+
const proxyDown = ((facts.proxy === "stopped" || facts.proxy === "stopped-orphan") && facts.deferralHonored === true)
|
|
112
|
+
|| (facts.proxy === "not-running" && managerStopped);
|
|
113
|
+
return facts.requested && !facts.restoreBlocked && facts.nonce !== undefined && !facts.stopFailed
|
|
114
|
+
&& facts.recoveredCount === 0 && proxyDown && pendingTeardownsAreExactly([facts.nonce])
|
|
115
|
+
&& handoverReceiptIsRecoverable(facts.nonce);
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
/**
|
|
119
|
+
* A handed-over receipt must be one a later `ocx stop` can finish on its own if no
|
|
120
|
+
* replacement ever starts. A `guessed` endpoint fails closed into manual recovery there,
|
|
121
|
+
* so a stop that could only record the configured address restores instead.
|
|
122
|
+
*/
|
|
123
|
+
function handoverReceiptIsRecoverable(nonce: string): boolean {
|
|
124
|
+
const read = readPendingTeardown(nonce);
|
|
125
|
+
return read.state === "valid" && read.receipt.endpointSource === "exact" && read.receipt.handover === "update-restart";
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
export function announceStopHandover(log: Pick<Console, "log"> = console): void {
|
|
129
|
+
log.log("↪️ Codex routing, its catalog and the Grok config stay in place for the updated proxy, which releases them after its first sync.");
|
|
130
|
+
log.log(" If it does not start, run 'ocx start' to take them over or 'ocx stop' to restore native Codex.");
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
/**
|
|
134
|
+
* Release handover receipts once this proxy has published its own routing.
|
|
135
|
+
*
|
|
136
|
+
* Called after a successful startup sync, when Codex config and catalog point at the
|
|
137
|
+
* running proxy again, so the restore the stop handed over is no longer owed. Only a
|
|
138
|
+
* handover receipt whose owning stop has exited is released: an ordinary deferred stop
|
|
139
|
+
* still has to run its own restore, and a stop that is still running owns its receipt.
|
|
140
|
+
*/
|
|
141
|
+
export function dischargeUpdateTeardownHandovers(ownerStillRunning: (pid: number) => boolean): {
|
|
142
|
+
discharged: string[];
|
|
143
|
+
failed: string[];
|
|
144
|
+
} {
|
|
145
|
+
const discharged: string[] = [];
|
|
146
|
+
const failed: string[] = [];
|
|
147
|
+
for (const read of listPendingTeardowns()) {
|
|
148
|
+
if (read.state !== "valid" || read.receipt.handover !== "update-restart") continue;
|
|
149
|
+
if (!isPendingTeardownAbandoned(read, ownerStillRunning)) continue;
|
|
150
|
+
if (clearPendingTeardown(read.receipt.nonce)) discharged.push(read.receipt.nonce);
|
|
151
|
+
else failed.push(read.receipt.nonce);
|
|
152
|
+
}
|
|
153
|
+
return { discharged, failed };
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
/** Startup half: after this proxy published its own routing, release what the update kept. */
|
|
157
|
+
export function completeUpdateTeardownHandover(
|
|
158
|
+
ownerStillRunning: (pid: number) => boolean,
|
|
159
|
+
log: Pick<Console, "log" | "error"> = console,
|
|
160
|
+
): void {
|
|
161
|
+
const handover = dischargeUpdateTeardownHandovers(ownerStillRunning);
|
|
162
|
+
if (handover.discharged.length > 0) log.log(" Took over the Codex routing an update kept in place.");
|
|
163
|
+
for (const nonce of handover.failed) {
|
|
164
|
+
log.error(`⚠️ Could not remove the update handover receipt ${pendingTeardownPathFor(nonce)}; the next 'ocx stop' finishes it.`);
|
|
165
|
+
}
|
|
166
|
+
}
|
|
@@ -25,20 +25,31 @@ export function sweepUpdateLeftovers(args: {
|
|
|
25
25
|
notOwned: string[];
|
|
26
26
|
};
|
|
27
27
|
export function launcherUsableAfterNpmUpdate(tx: { ok: boolean; phase: string; rolledBack?: boolean } | null | undefined): boolean;
|
|
28
|
-
export
|
|
28
|
+
export type NpmInstallResult = {
|
|
29
|
+
status: number | null;
|
|
30
|
+
error?: { code?: string; message?: string };
|
|
31
|
+
signal?: string | null;
|
|
32
|
+
processTreeExited?: boolean;
|
|
33
|
+
};
|
|
34
|
+
type NpmUpdateOptions = {
|
|
29
35
|
packageDir: string;
|
|
30
36
|
pkgName: string;
|
|
31
37
|
targetVersion?: string;
|
|
32
38
|
tag: string;
|
|
33
|
-
runNpm: (args: string[]) =>
|
|
39
|
+
runNpm: (args: string[]) => NpmInstallResult;
|
|
34
40
|
/** npm cache root the pre-flight resolved and checked; pinned with `--cache` for staging. */
|
|
35
41
|
cachePath?: string;
|
|
36
42
|
log?: (line: string) => void;
|
|
37
43
|
deps?: UpdateFsDeps;
|
|
38
|
-
}
|
|
44
|
+
};
|
|
45
|
+
type NpmUpdateResult = {
|
|
39
46
|
ok: boolean;
|
|
40
47
|
phase: "stage" | "verify" | "swap-backup" | "swap-live" | "post-verify" | "double-fault" | "done";
|
|
41
48
|
error?: string;
|
|
42
49
|
rolledBack?: boolean;
|
|
43
50
|
backup?: string;
|
|
44
51
|
};
|
|
52
|
+
export function transactionalNpmUpdate(args: NpmUpdateOptions): NpmUpdateResult;
|
|
53
|
+
export function transactionalNpmUpdateAsync(args: Omit<NpmUpdateOptions, "runNpm"> & {
|
|
54
|
+
runNpm: (args: string[]) => NpmInstallResult | Promise<NpmInstallResult>;
|
|
55
|
+
}): Promise<NpmUpdateResult>;
|
|
@@ -384,12 +384,11 @@ export function bootRestoreProbe(packageDir, deps = {}) {
|
|
|
384
384
|
* Run the transactional update. `runNpm(args, opts)` is injected so the caller keeps
|
|
385
385
|
* its hardened npm resolution (npm-invocation.mjs) and logging.
|
|
386
386
|
*/
|
|
387
|
-
|
|
387
|
+
function* npmUpdateTransaction({
|
|
388
388
|
packageDir,
|
|
389
389
|
pkgName,
|
|
390
390
|
targetVersion,
|
|
391
391
|
tag,
|
|
392
|
-
runNpm,
|
|
393
392
|
cachePath,
|
|
394
393
|
log = () => {},
|
|
395
394
|
deps = {},
|
|
@@ -437,13 +436,18 @@ export function transactionalNpmUpdate({
|
|
|
437
436
|
// operator's global npmrc would be dropped and npm would fall back to its default root. Pin
|
|
438
437
|
// the cache the pre-flight resolved and checked, so staging uses that exact root (#6288).
|
|
439
438
|
const cacheArgs = typeof cachePath === "string" && cachePath.length > 0 ? ["--cache", cachePath] : [];
|
|
440
|
-
const install =
|
|
439
|
+
const install = yield [
|
|
441
440
|
"install", "-g", "--prefix", stageRoot, ...cacheArgs,
|
|
442
441
|
"--allow-scripts=bun", "--no-audit", "--no-fund", spec,
|
|
443
|
-
]
|
|
444
|
-
if (install.status !== 0) {
|
|
445
|
-
|
|
446
|
-
|
|
442
|
+
];
|
|
443
|
+
if (install.status !== 0 || install.error || install.processTreeExited === false) {
|
|
444
|
+
if (install.processTreeExited === false) {
|
|
445
|
+
log("Left this update's staging directory in place: process-tree exit was not confirmed; stop the installer before removing " + basename(stageRoot));
|
|
446
|
+
} else discardStage();
|
|
447
|
+
const detail = install.error
|
|
448
|
+
? [install.error.code, install.error.message].filter(Boolean).join(": ")
|
|
449
|
+
: install.signal ?? install.status ?? "?";
|
|
450
|
+
return { ok: false, phase: "stage", error: "npm staging install failed (" + detail + ")" };
|
|
447
451
|
}
|
|
448
452
|
const stagedPackage = stagedCandidatesIn(stageRoot).find(dir => existsSync(join(dir, "package.json")));
|
|
449
453
|
if (!stagedPackage) {
|
|
@@ -524,3 +528,25 @@ export function transactionalNpmUpdate({
|
|
|
524
528
|
discardStage();
|
|
525
529
|
return { ok: true, phase: "done", backup: backupPackage };
|
|
526
530
|
}
|
|
531
|
+
|
|
532
|
+
/** Keep synchronous callers while the Node launcher awaits the install/exit barrier. */
|
|
533
|
+
export function transactionalNpmUpdate(options) {
|
|
534
|
+
const transaction = npmUpdateTransaction(options);
|
|
535
|
+
const step = transaction.next();
|
|
536
|
+
if (step.done) return step.value;
|
|
537
|
+
// Preserve the legacy status-only transaction on POSIX and for existing callers.
|
|
538
|
+
const install = options.runNpm(step.value);
|
|
539
|
+
return transaction.next({ status: install.status }).value;
|
|
540
|
+
}
|
|
541
|
+
|
|
542
|
+
export async function transactionalNpmUpdateAsync(options) {
|
|
543
|
+
const transaction = npmUpdateTransaction(options);
|
|
544
|
+
const step = transaction.next();
|
|
545
|
+
if (step.done) return step.value;
|
|
546
|
+
let install;
|
|
547
|
+
try { install = await options.runNpm(step.value); }
|
|
548
|
+
catch (error) { install = { status: null, error, processTreeExited: false }; }
|
|
549
|
+
if (install.processTreeExited !== true) install = { ...install, status: null, processTreeExited: false,
|
|
550
|
+
error: install.error ?? { code: "EINSTALLJOIN", message: "npm process-tree exit was not confirmed" } };
|
|
551
|
+
return transaction.next(install).value;
|
|
552
|
+
}
|
|
@@ -71,6 +71,9 @@ const GPT6_API_PRICING = "https://developers.openai.com/api/docs/changelog (2026
|
|
|
71
71
|
*/
|
|
72
72
|
const GPT61_SOL: Cost4 = { input: 2, output: 10, cacheRead: 0.1, cacheWrite: 2.5 };
|
|
73
73
|
const GPT61_SOL_API_PRICING = "https://developers.openai.com/api/docs/pricing (2026-09-30: GPT-6.1 Sol $2 / $0.10 cached / $2.50 cache write / $10; >272K $4 / $0.20 / $5 / $15)";
|
|
74
|
+
/** GPT-6.1 Terra (2026-10-26): 30-minute cache writes; >272K reprices the whole request. */
|
|
75
|
+
const GPT61_TERRA: Cost4 = { input: 1, output: 5, cacheRead: 0.05, cacheWrite: 1.25 };
|
|
76
|
+
const GPT61_TERRA_API_PRICING = "https://developers.openai.com/api/docs/models/gpt-6.1-terra (2026-10-27: GPT-6.1 Terra $1 / $0.05 cached / $1.25 cache write / $5; >272K $2 / $0.10 / $2.50 / $7.50)";
|
|
74
77
|
/**
|
|
75
78
|
* Daybreak aliases. `daybreak-*-latest` never appears in the pricing table itself — only its
|
|
76
79
|
* current snapshot does — so these tuples are the snapshot's published rates and carry
|
|
@@ -97,6 +100,10 @@ const GEMINI_38_FLASH: Cost4 = { input: 0.75, output: 3.75, cacheRead: 0.075, ca
|
|
|
97
100
|
const GEMINI_4_ARGON: Cost4 = { input: 2, output: 10, cacheRead: 0.1, cacheWrite: 0 };
|
|
98
101
|
const MINIMAX_M21_HIGHSPEED: Cost4 = { input: 0.6, output: 2.4, cacheRead: 0.03, cacheWrite: 0.375 };
|
|
99
102
|
const KIMI_K3: Cost4 = { input: 3, output: 15, cacheRead: 0.3, cacheWrite: 3 };
|
|
103
|
+
// K3.1 Pro and its highspeed variant: flat 1M-context pricing (no context tiering). Like K3,
|
|
104
|
+
// cacheWrite is the default 5-minute TTL rate; the 1h tier ($4 / $8) is not modelled.
|
|
105
|
+
const KIMI_K31_PRO: Cost4 = { input: 2, output: 10, cacheRead: 0.2, cacheWrite: 2 };
|
|
106
|
+
const KIMI_K31_PRO_HIGHSPEED: Cost4 = { input: 4, output: 20, cacheRead: 0.2, cacheWrite: 4 };
|
|
100
107
|
const KIMI_K27_CODE: Cost4 = { input: 0.95, output: 4, cacheRead: 0.19, cacheWrite: 0.95 };
|
|
101
108
|
const KIMI_K27_CODE_HIGHSPEED: Cost4 = { input: 1.9, output: 8, cacheRead: 0.38, cacheWrite: 1.9 };
|
|
102
109
|
const KIMI_K26: Cost4 = { input: 0.95, output: 4, cacheRead: 0.16, cacheWrite: 0.95 };
|
|
@@ -236,12 +243,19 @@ const DEEPSEEK_PRICING = "https://api-docs.deepseek.com/quick_start/pricing-deta
|
|
|
236
243
|
* cache-write charge.
|
|
237
244
|
*/
|
|
238
245
|
const DEEPSEEK_V41_FLASH: Cost4 = { input: 0.3, output: 1.2, cacheRead: 0.006, cacheWrite: 0 };
|
|
239
|
-
//
|
|
240
|
-
|
|
246
|
+
// K2.7 Code / K2.6 were re-read on the official table 2026-10-24 (unchanged). The K2 series
|
|
247
|
+
// closes to new users 2026-10-31 and retires by end of December 2026. kimi-k2.5 was
|
|
248
|
+
// discontinued 2026-08-31 and left the table, so its row keeps the 2026-07-20 snapshot for
|
|
249
|
+
// pricing historical usage. None of these price retargeted aliases.
|
|
250
|
+
const KIMI_PRICING = "https://platform.kimi.ai/docs/pricing/chat (official K2 series table; cacheWrite derived from cache-miss input)";
|
|
251
|
+
const KIMI_K25_PRICING = "https://platform.kimi.ai/docs/pricing (historical official table, 2026-07-20; kimi-k2.5 discontinued 2026-08-31 per https://platform.kimi.ai/docs/models; cacheWrite derived from cache-miss input)";
|
|
241
252
|
// K3 publishes a separate cache-write price: $3/1M for the default 5-minute TTL.
|
|
242
253
|
// Coding presets share an endpoint/product, but these API reference estimates are not plan
|
|
243
254
|
// billing or quota: K3's 1M model consumes about twice the quota of k3-256k.
|
|
244
255
|
const KIMI_K3_PRICING = "https://platform.kimi.ai/docs/pricing/chat (API reference estimate; default 5-minute cache-write rate, not Code Plan billing/quota); https://www.kimi.com/code/docs/en/kimi-code/models.html";
|
|
256
|
+
// K3.1 Pro shares the K3 table and caveats; the highspeed variant consumes about twice the
|
|
257
|
+
// Code Plan quota of the regular one, which these list-price estimates do not reproduce.
|
|
258
|
+
const KIMI_K31_PRICING = KIMI_K3_PRICING;
|
|
245
259
|
// Z.AI publishes one USD table for the international surface; the Coding Plan
|
|
246
260
|
// subscription and the domestic bigmodel.cn endpoints bill differently
|
|
247
261
|
// (subscription quota / CNY tiers), so every GLM row below is verified-derived:
|
|
@@ -296,9 +310,11 @@ export const EXPECTED_PRICE_OVERLAYS: readonly ExpectedPriceOverlay[] = [
|
|
|
296
310
|
// Display estimates use API prices for both login and API-key routes, including cache writes.
|
|
297
311
|
{ provider: "openai", modelId: "gpt-6-astra", cost4: GPT6_ASTRA, source: `API-reference comparison estimate: ${ASTRA_API_PRICING}`, verifiedAt: "2026-09-05", status: "verified-derived" },
|
|
298
312
|
{ provider: "openai-apikey", modelId: "gpt-6.1-sol", cost4: GPT61_SOL, source: GPT61_SOL_API_PRICING, verifiedAt: "2026-09-30", status: "verified" },
|
|
313
|
+
{ provider: "openai-apikey", modelId: "gpt-6.1-terra", cost4: GPT61_TERRA, source: GPT61_TERRA_API_PRICING, verifiedAt: "2026-10-27", status: "verified" },
|
|
299
314
|
{ provider: "openai-apikey", modelId: "gpt-6-sol", cost4: GPT6_SOL, source: GPT6_API_PRICING, verifiedAt: "2026-09-23", status: "verified" },
|
|
300
315
|
{ provider: "openai-apikey", modelId: "gpt-6-luna", cost4: GPT6_LUNA, source: GPT6_API_PRICING, verifiedAt: "2026-09-23", status: "verified" },
|
|
301
316
|
{ provider: "openai", modelId: "gpt-6.1-sol", cost4: GPT61_SOL, source: `API-reference comparison estimate: ${GPT61_SOL_API_PRICING}`, verifiedAt: "2026-09-30", status: "verified-derived" },
|
|
317
|
+
{ provider: "openai", modelId: "gpt-6.1-terra", cost4: GPT61_TERRA, source: `API-reference comparison estimate: ${GPT61_TERRA_API_PRICING}`, verifiedAt: "2026-10-27", status: "verified-derived" },
|
|
302
318
|
{ provider: "openai", modelId: "gpt-6-sol", cost4: GPT6_SOL, source: `API-reference comparison estimate: ${GPT6_API_PRICING}`, verifiedAt: "2026-09-23", status: "verified-derived" },
|
|
303
319
|
{ provider: "openai", modelId: "gpt-6-luna", cost4: GPT6_LUNA, source: `API-reference comparison estimate: ${GPT6_API_PRICING}`, verifiedAt: "2026-09-23", status: "verified-derived" },
|
|
304
320
|
// claude-fable-5-1 now HAS a generated jawcode row, so the two Anthropic surfaces resolve
|
|
@@ -437,34 +453,43 @@ export const EXPECTED_PRICE_OVERLAYS: readonly ExpectedPriceOverlay[] = [
|
|
|
437
453
|
{ provider: "google-antigravity", modelId: "claude-opus-5-5-medium", cost4: CLAUDE_OPUS_55, source: `derived: Anthropic Claude Opus 5.5 reference price; ${ANTHROPIC_PRICING}`, verifiedAt: "2026-10-03", status: "verified-derived" },
|
|
438
454
|
{ provider: "google-antigravity", modelId: "claude-opus-5-5-high", cost4: CLAUDE_OPUS_55, source: `derived: Anthropic Claude Opus 5.5 reference price; ${ANTHROPIC_PRICING}`, verifiedAt: "2026-10-03", status: "verified-derived" },
|
|
439
455
|
{ provider: "google-antigravity", modelId: "gpt-oss-120b-medium", cost4: { input: 0.03, output: 0.15, cacheRead: 0, cacheWrite: 0 }, source: "derived: gpt-oss-120b open-weights — OpenRouter advertised lowest https://openrouter.ai/openai/gpt-oss-120b/providers", verifiedAt: "2026-07-20", status: "verified-derived" },
|
|
440
|
-
// Kimi / Moonshot — official
|
|
441
|
-
//
|
|
442
|
-
//
|
|
443
|
-
|
|
444
|
-
{ provider: "kimi", modelId: "k3
|
|
445
|
-
{ provider: "kimi", modelId: "k3
|
|
446
|
-
{ provider: "kimi", modelId: "
|
|
447
|
-
{ provider: "kimi", modelId: "
|
|
448
|
-
{ provider: "kimi", modelId: "
|
|
449
|
-
{ provider: "kimi", modelId: "kimi-k2.
|
|
456
|
+
// Kimi / Moonshot — official tables re-read 2026-10-24 (platform.kimi.ai/docs/pricing/chat).
|
|
457
|
+
// kimi / kimi-responses = Kimi Code OAuth surface, kimi-code = its API-key form, moonshot =
|
|
458
|
+
// the separately billed platform API (api.moonshot.ai, or .cn). Coding-surface rows are
|
|
459
|
+
// expected list prices, not Code Plan billing or quota.
|
|
460
|
+
{ provider: "kimi", modelId: "k3", cost4: KIMI_K3, source: KIMI_K3_PRICING, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
461
|
+
{ provider: "kimi", modelId: "k3[1m]", cost4: KIMI_K3, source: `derived: local alias sent as k3; ${KIMI_K3_PRICING}`, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
462
|
+
{ provider: "kimi", modelId: "k3-256k", cost4: KIMI_K3, source: `derived: K3 with a fixed 256K ceiling; ${KIMI_K3_PRICING}`, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
463
|
+
{ provider: "kimi", modelId: "k3.1-pro", cost4: KIMI_K31_PRO, source: KIMI_K31_PRICING, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
464
|
+
{ provider: "kimi", modelId: "k3.1-pro-highspeed", cost4: KIMI_K31_PRO_HIGHSPEED, source: KIMI_K31_PRICING, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
465
|
+
{ provider: "kimi", modelId: "kimi-k2.7-code", cost4: KIMI_K27_CODE, source: KIMI_PRICING, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
466
|
+
{ provider: "kimi", modelId: "kimi-k2.7-code-highspeed", cost4: KIMI_K27_CODE_HIGHSPEED, source: KIMI_PRICING, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
467
|
+
{ provider: "kimi", modelId: "kimi-k2.6", cost4: KIMI_K26, source: KIMI_PRICING, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
468
|
+
{ provider: "kimi", modelId: "kimi-k2.5", cost4: KIMI_K25, source: KIMI_K25_PRICING, verifiedAt: "2026-07-20", status: "verified-derived" },
|
|
450
469
|
// kimi-for-coding now serves K2.8 Preview. No verified K2.8 price: keep all three
|
|
451
470
|
// Coding presets unknown rather than reusing the alias's retired K2.7 price.
|
|
452
|
-
{ provider: "moonshot", modelId: "kimi-k3", cost4: KIMI_K3, source: KIMI_K3_PRICING, verifiedAt: "2026-
|
|
453
|
-
{ provider: "moonshot", modelId: "kimi-
|
|
454
|
-
{ provider: "moonshot", modelId: "kimi-
|
|
455
|
-
{ provider: "moonshot", modelId: "kimi-k2.
|
|
456
|
-
{ provider: "moonshot", modelId: "kimi-k2.
|
|
457
|
-
{ provider: "
|
|
458
|
-
{ provider: "
|
|
459
|
-
{ provider: "kimi-code", modelId: "k3
|
|
460
|
-
{ provider: "kimi-code", modelId: "
|
|
461
|
-
{ provider: "kimi-code", modelId: "
|
|
462
|
-
{ provider: "kimi-code", modelId: "
|
|
463
|
-
{ provider: "kimi-code", modelId: "
|
|
471
|
+
{ provider: "moonshot", modelId: "kimi-k3", cost4: KIMI_K3, source: KIMI_K3_PRICING, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
472
|
+
{ provider: "moonshot", modelId: "kimi-k3.1-pro", cost4: KIMI_K31_PRO, source: KIMI_K31_PRICING, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
473
|
+
{ provider: "moonshot", modelId: "kimi-k3.1-pro-highspeed", cost4: KIMI_K31_PRO_HIGHSPEED, source: KIMI_K31_PRICING, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
474
|
+
{ provider: "moonshot", modelId: "kimi-k2.7-code", cost4: KIMI_K27_CODE, source: KIMI_PRICING, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
475
|
+
{ provider: "moonshot", modelId: "kimi-k2.7-code-highspeed", cost4: KIMI_K27_CODE_HIGHSPEED, source: KIMI_PRICING, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
476
|
+
{ provider: "moonshot", modelId: "kimi-k2.6", cost4: KIMI_K26, source: KIMI_PRICING, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
477
|
+
{ provider: "moonshot", modelId: "kimi-k2.5", cost4: KIMI_K25, source: KIMI_K25_PRICING, verifiedAt: "2026-07-20", status: "verified-derived" },
|
|
478
|
+
{ provider: "kimi-code", modelId: "k3", cost4: KIMI_K3, source: KIMI_K3_PRICING, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
479
|
+
{ provider: "kimi-code", modelId: "k3[1m]", cost4: KIMI_K3, source: `derived: local alias sent as k3; ${KIMI_K3_PRICING}`, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
480
|
+
{ provider: "kimi-code", modelId: "k3-256k", cost4: KIMI_K3, source: `derived: K3 with a fixed 256K ceiling; ${KIMI_K3_PRICING}`, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
481
|
+
{ provider: "kimi-code", modelId: "k3.1-pro", cost4: KIMI_K31_PRO, source: KIMI_K31_PRICING, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
482
|
+
{ provider: "kimi-code", modelId: "k3.1-pro-highspeed", cost4: KIMI_K31_PRO_HIGHSPEED, source: KIMI_K31_PRICING, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
483
|
+
{ provider: "kimi-code", modelId: "kimi-k2.7-code", cost4: KIMI_K27_CODE, source: KIMI_PRICING, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
484
|
+
{ provider: "kimi-code", modelId: "kimi-k2.7-code-highspeed", cost4: KIMI_K27_CODE_HIGHSPEED, source: KIMI_PRICING, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
485
|
+
{ provider: "kimi-code", modelId: "kimi-k2.6", cost4: KIMI_K26, source: KIMI_PRICING, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
486
|
+
{ provider: "kimi-code", modelId: "kimi-k2.5", cost4: KIMI_K25, source: KIMI_K25_PRICING, verifiedAt: "2026-07-20", status: "verified-derived" },
|
|
464
487
|
// Responses reuses the kimi OAuth account and the same Coding endpoint/model seeds.
|
|
465
|
-
{ provider: "kimi-responses", modelId: "k3", cost4: KIMI_K3, source: KIMI_K3_PRICING, verifiedAt: "2026-
|
|
466
|
-
{ provider: "kimi-responses", modelId: "k3[1m]", cost4: KIMI_K3, source: `derived: local alias sent as k3; ${KIMI_K3_PRICING}`, verifiedAt: "2026-
|
|
467
|
-
{ provider: "kimi-responses", modelId: "k3-256k", cost4: KIMI_K3, source: `derived: K3 with a fixed 256K ceiling; ${KIMI_K3_PRICING}`, verifiedAt: "2026-
|
|
488
|
+
{ provider: "kimi-responses", modelId: "k3", cost4: KIMI_K3, source: KIMI_K3_PRICING, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
489
|
+
{ provider: "kimi-responses", modelId: "k3[1m]", cost4: KIMI_K3, source: `derived: local alias sent as k3; ${KIMI_K3_PRICING}`, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
490
|
+
{ provider: "kimi-responses", modelId: "k3-256k", cost4: KIMI_K3, source: `derived: K3 with a fixed 256K ceiling; ${KIMI_K3_PRICING}`, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
491
|
+
{ provider: "kimi-responses", modelId: "k3.1-pro", cost4: KIMI_K31_PRO, source: KIMI_K31_PRICING, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
492
|
+
{ provider: "kimi-responses", modelId: "k3.1-pro-highspeed", cost4: KIMI_K31_PRO_HIGHSPEED, source: KIMI_K31_PRICING, verifiedAt: "2026-10-24", status: "verified-derived" },
|
|
468
493
|
// Qwen3.8-Max: vendor-published input/output rate (verified). See QWEN38_MAX_PRICING
|
|
469
494
|
// for what that source does and does not cover.
|
|
470
495
|
{ provider: "alibaba-token-plan", modelId: "qwen3.8-max", cost4: QWEN38_MAX, source: QWEN38_MAX_PRICING, verifiedAt: "2026-08-04", status: "verified" },
|
|
@@ -534,6 +559,8 @@ export const EXPECTED_PRICE_OVERLAYS: readonly ExpectedPriceOverlay[] = [
|
|
|
534
559
|
{ provider: "devin-cli", modelId: "gpt-5-6-sol", cost4: GPT56_SOL, source: `enterprise list column (self-serve shows discounted 1.2/6); ${DEVIN_PRICING}`, verifiedAt: "2026-09-13", status: "verified-derived" },
|
|
535
560
|
{ provider: "devin-cli", modelId: "gpt-6-astra", cost4: GPT6_ASTRA, source: DEVIN_PRICING, verifiedAt: "2026-09-13", status: "verified-derived" },
|
|
536
561
|
{ provider: "devin-cli", modelId: "gpt-6-1-sol", cost4: GPT61_SOL, source: `derived: GPT-6.1 Sol added 2026-09-30 ahead of Devin's modelCostData table (devin.ai/blog/gpt-6-1-sol; uid spelled like gpt-5-6-sol); OpenAI API list price ${GPT61_SOL_API_PRICING}`, verifiedAt: "2026-09-30", status: "verified-derived" },
|
|
562
|
+
// 261027 preemptive: GPT-6.1 Terra (Devin uid follows Sol; API-reference estimate, not billing).
|
|
563
|
+
{ provider: "devin-cli", modelId: "gpt-6-1-terra", cost4: GPT61_TERRA, source: `derived: OpenAI API list price ${GPT61_TERRA_API_PRICING}; Devin uid mirrors gpt-6-1-sol`, verifiedAt: "2026-10-27", status: "verified-derived" },
|
|
537
564
|
{ provider: "devin-cli", modelId: "gpt-6-sol", cost4: GPT6_SOL, source: `derived: GPT-6 Sol/Luna added 2026-09-23 ahead of Devin's modelCostData table; OpenAI API list price ${GPT6_API_PRICING}`, verifiedAt: "2026-09-23", status: "verified-derived" },
|
|
538
565
|
{ provider: "devin-cli", modelId: "gpt-6-luna", cost4: GPT6_LUNA, source: `derived: GPT-6 Sol/Luna added 2026-09-23 ahead of Devin's modelCostData table; OpenAI API list price ${GPT6_API_PRICING}`, verifiedAt: "2026-09-23", status: "verified-derived" },
|
|
539
566
|
{ provider: "devin-cli", modelId: "claude-opus-5", cost4: CLAUDE_OPUS_46, source: DEVIN_PRICING, verifiedAt: "2026-09-13", status: "verified-derived" },
|
|
@@ -553,6 +580,8 @@ export const EXPECTED_PRICE_OVERLAYS: readonly ExpectedPriceOverlay[] = [
|
|
|
553
580
|
{ provider: "devin", modelId: "gpt-5-6-luna", cost4: GPT56_LUNA, source: DEVIN_PRICING, verifiedAt: "2026-09-13", status: "verified-derived" },
|
|
554
581
|
{ provider: "devin", modelId: "gpt-5-6-terra", cost4: GPT56_TERRA, source: DEVIN_PRICING, verifiedAt: "2026-09-13", status: "verified-derived" },
|
|
555
582
|
{ provider: "devin", modelId: "gpt-6-1-sol", cost4: GPT61_SOL, source: `derived: GPT-6.1 Sol added 2026-09-30 ahead of Devin's modelCostData table (devin.ai/blog/gpt-6-1-sol; uid spelled like gpt-5-6-sol); OpenAI API list price ${GPT61_SOL_API_PRICING}`, verifiedAt: "2026-09-30", status: "verified-derived" },
|
|
583
|
+
// 261027 preemptive: GPT-6.1 Terra (Devin uid follows Sol; API-reference estimate, not billing).
|
|
584
|
+
{ provider: "devin", modelId: "gpt-6-1-terra", cost4: GPT61_TERRA, source: `derived: OpenAI API list price ${GPT61_TERRA_API_PRICING}; Devin uid mirrors gpt-6-1-sol`, verifiedAt: "2026-10-27", status: "verified-derived" },
|
|
556
585
|
{ provider: "devin", modelId: "gpt-6-sol", cost4: GPT6_SOL, source: `derived: GPT-6 Sol/Luna added 2026-09-23 ahead of Devin's modelCostData table; OpenAI API list price ${GPT6_API_PRICING}`, verifiedAt: "2026-09-23", status: "verified-derived" },
|
|
557
586
|
{ provider: "devin", modelId: "gpt-6-luna", cost4: GPT6_LUNA, source: `derived: GPT-6 Sol/Luna added 2026-09-23 ahead of Devin's modelCostData table; OpenAI API list price ${GPT6_API_PRICING}`, verifiedAt: "2026-09-23", status: "verified-derived" },
|
|
558
587
|
{ provider: "devin", modelId: "claude-opus-4-8", cost4: CLAUDE_OPUS_46, source: DEVIN_PRICING, verifiedAt: "2026-09-13", status: "verified-derived" },
|
|
@@ -634,6 +663,8 @@ export const PRIORITY_MULTIPLIERS: Readonly<Record<string, number>> = {
|
|
|
634
663
|
// standard tuples; the stale bases made these look like 1.6/0.4 (#907).
|
|
635
664
|
"gpt-5.6-terra": 2,
|
|
636
665
|
"gpt-5.6-luna": 2,
|
|
666
|
+
// GPT-6.1 Terra model page (2026-10-27): Fast mode costs 2× standard.
|
|
667
|
+
"gpt-6.1-terra": 2,
|
|
637
668
|
"gpt-5.5": 2.5,
|
|
638
669
|
"gpt-5.4-mini": 2,
|
|
639
670
|
"gpt-5.4": 2,
|
|
@@ -673,8 +704,9 @@ export const PRIORITY_PRICING_RULES: readonly PriorityPricingRule[] = [
|
|
|
673
704
|
provider,
|
|
674
705
|
modelId,
|
|
675
706
|
multiplier,
|
|
676
|
-
source: modelId === "gpt-6-astra" ? ASTRA_API_PRICING
|
|
677
|
-
|
|
707
|
+
source: modelId === "gpt-6-astra" ? ASTRA_API_PRICING
|
|
708
|
+
: modelId === "gpt-6.1-terra" ? GPT61_TERRA_API_PRICING : "https://openai.com/api-fast-mode/",
|
|
709
|
+
verifiedAt: modelId === "gpt-6-astra" ? "2026-09-05" : modelId === "gpt-6.1-terra" ? "2026-10-27" : "2026-08-05",
|
|
678
710
|
})),
|
|
679
711
|
),
|
|
680
712
|
...["gpt-5.6-sol-pro", "gpt-5.6-terra-pro", "gpt-5.6-luna-pro"].map((modelId): PriorityPricingRule => ({
|
|
@@ -769,6 +801,7 @@ const OPENAI_PRICING_DOC = "https://developers.openai.com/api/docs/pricing";
|
|
|
769
801
|
const OPENAI_CONTEXT_MODELS = [
|
|
770
802
|
"gpt-6-astra",
|
|
771
803
|
"gpt-6.1-sol",
|
|
804
|
+
"gpt-6.1-terra",
|
|
772
805
|
"gpt-6-sol",
|
|
773
806
|
"gpt-6-luna",
|
|
774
807
|
"gpt-5.6-sol",
|
|
@@ -804,8 +837,8 @@ export const CONTEXT_TIERS: readonly ContextTier[] = [
|
|
|
804
837
|
inclusive: false,
|
|
805
838
|
multiplier: OPENAI_LONG_CONTEXT,
|
|
806
839
|
confirmedPriorityRelation: "stack",
|
|
807
|
-
source: OPENAI_PRICING_DOC,
|
|
808
|
-
verifiedAt: "2026-09-05",
|
|
840
|
+
source: modelId === "gpt-6.1-terra" ? "https://developers.openai.com/api/docs/models/gpt-6.1-terra" : OPENAI_PRICING_DOC,
|
|
841
|
+
verifiedAt: modelId === "gpt-6.1-terra" ? "2026-10-27" : "2026-09-05",
|
|
809
842
|
})),
|
|
810
843
|
),
|
|
811
844
|
{
|
package/src/usage/timeline.ts
CHANGED
|
@@ -202,10 +202,13 @@ export function createTimelineAccumulator(query: TimelineQuery): { add(entry: Pe
|
|
|
202
202
|
const rows = [...series].map(([id, state]): { row: TimelineSeries; state: SeriesState } => {
|
|
203
203
|
if (query.aggregation !== "sum") {
|
|
204
204
|
for (const [bucket, requests] of state.requests) {
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
205
|
+
let sum = 0;
|
|
206
|
+
let max = -Infinity;
|
|
207
|
+
for (const value of requests.values()) {
|
|
208
|
+
sum += value;
|
|
209
|
+
max = Math.max(max, value);
|
|
210
|
+
}
|
|
211
|
+
state.points[bucket] = query.aggregation === "max" ? max : sum / requests.size;
|
|
209
212
|
}
|
|
210
213
|
}
|
|
211
214
|
const total = state.points.reduce((sum, value) => sum + value, 0);
|
|
@@ -231,12 +234,19 @@ export function createTimelineAccumulator(query: TimelineQuery): { add(entry: Pe
|
|
|
231
234
|
}
|
|
232
235
|
} else {
|
|
233
236
|
for (let index = 0; index < buckets; index += 1) {
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
237
|
+
let sum = 0;
|
|
238
|
+
let max = -Infinity;
|
|
239
|
+
let count = 0;
|
|
240
|
+
for (const { state } of folded) {
|
|
241
|
+
const requests = state.requests.get(index);
|
|
242
|
+
if (!requests) continue;
|
|
243
|
+
for (const value of requests.values()) {
|
|
244
|
+
sum += value;
|
|
245
|
+
max = Math.max(max, value);
|
|
246
|
+
count += 1;
|
|
247
|
+
}
|
|
239
248
|
}
|
|
249
|
+
if (count > 0) otherPoints[index] = query.aggregation === "max" ? max : sum / count;
|
|
240
250
|
}
|
|
241
251
|
}
|
|
242
252
|
kept.push({ id: "other", provider: "", model: "other", total: otherPoints.reduce((sum, value) => sum + value, 0), points: otherPoints });
|
|
@@ -25,7 +25,7 @@ import { modelRecordValue } from "../reasoning-effort";
|
|
|
25
25
|
import { getModelMetadataCaseInsensitive, resolveMetadataProvider } from "../generated/model-metadata";
|
|
26
26
|
import { nativeInputModalities } from "../codex/catalog/metadata";
|
|
27
27
|
import { SUPPORTED_NATIVE_OPENAI_SLUGS } from "../codex/catalog/native-models";
|
|
28
|
-
import { enrichProviderFromRegistry } from "../providers/derive";
|
|
28
|
+
import { enrichProviderFromRegistry, registryInputModalitiesForDestination } from "../providers/derive";
|
|
29
29
|
import { isCanonicalOpenAiForwardProvider } from "../providers/openai-tiers-destination";
|
|
30
30
|
|
|
31
31
|
/**
|
|
@@ -131,17 +131,19 @@ type EnrichedProviderCache = Map<string, OcxProviderConfig>;
|
|
|
131
131
|
*
|
|
132
132
|
* `noVisionModels` is an explicit override. A modality declaration is only evidence for this
|
|
133
133
|
* path when it describes a text model that excludes image input: an audio-only declaration is
|
|
134
|
-
* not a text-only model and must not be widened to image through the vision sidecar.
|
|
134
|
+
* not a text-only model and must not be widened to image through the vision sidecar. The
|
|
135
|
+
* provider-wide `inputModalities` covers ids the per-model map does not list, such as a model
|
|
136
|
+
* that arrived through live discovery; a per-model declaration still wins.
|
|
135
137
|
*/
|
|
136
138
|
export function isModelVisionSidecarConsumer(
|
|
137
|
-
provider: Pick<OcxProviderConfig, "noVisionModels" | "modelInputModalities" | "modelCapabilities">,
|
|
139
|
+
provider: Pick<OcxProviderConfig, "noVisionModels" | "modelInputModalities" | "inputModalities" | "modelCapabilities">,
|
|
138
140
|
modelId: string,
|
|
139
141
|
): boolean {
|
|
140
142
|
const declared = Object.hasOwn(provider.modelCapabilities ?? {}, modelId)
|
|
141
143
|
? provider.modelCapabilities?.[modelId]?.inputModalities : undefined;
|
|
142
144
|
if (declared !== undefined) return declared.includes("text") && !declared.includes("image");
|
|
143
145
|
if (modelInList(provider.noVisionModels, modelId)) return true;
|
|
144
|
-
const modalities = modelRecordValue(provider.modelInputModalities, modelId);
|
|
146
|
+
const modalities = modelRecordValue(provider.modelInputModalities, modelId) ?? provider.inputModalities;
|
|
145
147
|
return Array.isArray(modalities) && modalities.includes("text") && !modalities.includes("image");
|
|
146
148
|
}
|
|
147
149
|
|
|
@@ -177,6 +179,7 @@ function enrichedProviderForVision(
|
|
|
177
179
|
const enriched: OcxProviderConfig = {
|
|
178
180
|
...configured,
|
|
179
181
|
...(configured.noVisionModels ? { noVisionModels: [...configured.noVisionModels] } : {}),
|
|
182
|
+
...(configured.inputModalities ? { inputModalities: [...configured.inputModalities] } : {}),
|
|
180
183
|
...(configured.modelInputModalities ? {
|
|
181
184
|
modelInputModalities: Object.fromEntries(
|
|
182
185
|
Object.entries(configured.modelInputModalities).map(([id, modalities]) => [id, [...modalities]]),
|
|
@@ -193,6 +196,11 @@ function enrichedProviderForVision(
|
|
|
193
196
|
} : {}),
|
|
194
197
|
};
|
|
195
198
|
enrichProviderFromRegistry(providerName, enriched);
|
|
199
|
+
// Registry-only and runtime-only: applied to this private copy, never to saved config.
|
|
200
|
+
if (!enriched.inputModalities) {
|
|
201
|
+
const providerWide = registryInputModalitiesForDestination(providerName, configured);
|
|
202
|
+
if (providerWide) enriched.inputModalities = providerWide;
|
|
203
|
+
}
|
|
196
204
|
cache.set(providerName, enriched);
|
|
197
205
|
return enriched;
|
|
198
206
|
}
|
|
@@ -281,7 +289,9 @@ function modelAcceptsImageInputWithCache(
|
|
|
281
289
|
// capability axis the CLI `--text-only` writes.
|
|
282
290
|
const fromCustomRow = customRowAcceptsImageInput(config, candidate.provider, candidate.id);
|
|
283
291
|
if (fromCustomRow !== undefined) return fromCustomRow;
|
|
284
|
-
const configuredModalities = provider
|
|
292
|
+
const configuredModalities = provider
|
|
293
|
+
? modelRecordValue(provider.modelInputModalities, candidate.id) ?? provider.inputModalities
|
|
294
|
+
: undefined;
|
|
285
295
|
const fromConfiguredModalities = advertisesImageInput(configuredModalities);
|
|
286
296
|
if (fromConfiguredModalities !== undefined) return fromConfiguredModalities;
|
|
287
297
|
const canonicalCodex = candidate.provider === "openai"
|
package/src/vision/plan.ts
CHANGED
|
@@ -121,7 +121,7 @@ function messagesHaveImage(parsed: OcxParsedRequest): boolean {
|
|
|
121
121
|
*/
|
|
122
122
|
export function requiresVisionPreprocessing(
|
|
123
123
|
config: Pick<OcxConfig, "providers"> & { customModels?: OcxConfig["customModels"] },
|
|
124
|
-
provider: Pick<OcxProviderConfig, "noVisionModels" | "modelInputModalities" | "modelCapabilities">,
|
|
124
|
+
provider: Pick<OcxProviderConfig, "noVisionModels" | "modelInputModalities" | "inputModalities" | "modelCapabilities">,
|
|
125
125
|
modelId: string,
|
|
126
126
|
providerName?: string,
|
|
127
127
|
): boolean {
|
|
@@ -145,7 +145,7 @@ export function requiresVisionPreprocessing(
|
|
|
145
145
|
// the attachment to a model that cannot read it.
|
|
146
146
|
if (customDeclared !== undefined) return !customDeclared.includes("image");
|
|
147
147
|
if (isModelTextOnly(provider, modelId)) return true;
|
|
148
|
-
const runtimeModalities = modelRecordValue(provider.modelInputModalities, modelId);
|
|
148
|
+
const runtimeModalities = modelRecordValue(provider.modelInputModalities, modelId) ?? provider.inputModalities;
|
|
149
149
|
if (Array.isArray(runtimeModalities) && runtimeModalities.length > 0) {
|
|
150
150
|
return !runtimeModalities.includes("image");
|
|
151
151
|
}
|