Skip to content

Commit 3d9ba72

Browse files
authored
Merge pull request #7634 from lidge-jun/codex/promote-main-2.92.0
release: promote frozen tip 03bcf78 to main as 2.92.0
2 parents 83ec4f7 + 90ac9ba commit 3d9ba72

359 files changed

Lines changed: 14454 additions & 858 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ A ready-for-review PR is the author's claim that the change is complete, underst
6969

7070
## Local validation and hooks
7171

72-
The suite uses Bun 1.4.3 (`testRunnerBun`) while the shipped runtime is 1.4.2.
72+
The suite uses Bun 1.4.3 (`testRunnerBun`) while the shipped runtime is 1.4.4.
7373
`scripts/test.ts` finds a 1.4.3 binary on PATH or in `~/.bun/bin`, or uses
7474
`OCX_TEST_RUNNER_BUN`; install that version locally if it is missing.
7575

‎Dockerfile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
# syntax=docker/dockerfile:1
22

33
# Keep the runtime aligned with package.json and pin the multi-platform image index.
4-
# Runtime 1.4.2 fixes #6684's Windows Bun.fetch streaming; CI tests run on 1.4.3
4+
# Runtime 1.4.4 keeps 1.4.2's #6684 Windows Bun.fetch streaming fix and ships NSS
5+
# 3.131.1 roots without the compromised eMudhra CAs; CI tests run on 1.4.3
56
# because 1.4.2 segfaults reloading preloads in multi-file --isolate (#4821;
67
# #6713 run 37631558263: Linux 1/4, macOS 2/2, Windows 9/9) and 1.4.0's spawnSync
78
# can lose a child's exit (#4956, oven-sh/bun#44581). Rejoin after the
89
# upstream crash fix passes a unified-version lane=all dispatch, then delete
910
# package.json's testRunnerBun pin and setup-project-bun's role input.
10-
ARG BUN_IMAGE=oven/bun:1.4.2@sha256:9114c058aeae42162ee16dd5084b95fe9473970bb6bcb5b232ab1630f0546895
11+
ARG BUN_IMAGE=oven/bun:1.4.4@sha256:1d22548f177f4ff38e0c15baa3c2c46c6c2060ba2d1bc573bb4720b407548f1d
1112

1213
FROM ${BUN_IMAGE} AS manifest
1314
WORKDIR /home/bun/app

‎bin/ocx.mjs‎

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ import { handoffWindowsTrayForUpdate, planWindowsTrayUpdate } from "../src/updat
5959
import { bootRestoreProbe, launcherUsableAfterNpmUpdate, transactionalNpmUpdate } from "../src/update/transactional-install.mjs";
6060
import { manualUpdateFailureGuidance, npmUpdateFailureGuidance } from "../src/update/update-failure-guidance.mjs";
6161
import {
62+
captureCodexCliTransportEnv,
63+
CODEX_CLI_TRANSPORT_ENV_KEYS,
6264
CODEX_CLI_VERSION_MANAGER_ROOT_ENV_SLOTS,
65+
codexCliInspectionLookupSeeds,
6366
isCodexCliUpdateInspectionArgv,
6467
} from "../src/update/codex-cli-update-launch-policy.mjs";
6568
import {
@@ -1192,26 +1195,56 @@ function createNodeLaunchContext() {
11921195
: configuredCodexCliPath;
11931196
const preBunPath = typeof process.env.PATH === "string" ? process.env.PATH : null;
11941197
const preBunPathExt = typeof process.env.PATHEXT === "string" ? process.env.PATHEXT : null;
1198+
// HOME and NODE_PATH seed the candidate Node module lookup the update
1199+
// inspection models, so they are proof-bound here for the same reason as
1200+
// PATH: the live environment could have been rewritten after selection. They
1201+
// stay in the inherited environment regardless — the child may need them for
1202+
// its own work; only the snapshot copy is optional.
1203+
const preBunHome = typeof process.env.HOME === "string" ? process.env.HOME : null;
1204+
const preBunNodePath = typeof process.env.NODE_PATH === "string" ? process.env.NODE_PATH : null;
11951205
const preBunCodexCliManagerRoots = Object.fromEntries(
11961206
CODEX_CLI_VERSION_MANAGER_ROOT_ENV_SLOTS.flatMap(name => {
11971207
const value = process.env[name];
11981208
return typeof value === "string" && value !== "" ? [[name, value]] : [];
11991209
}),
12001210
);
1211+
// Proxy/CA settings are captured once, here, before Bun can add project dotenv
1212+
// values. They are part of the required selection snapshot, so they count
1213+
// against the context budget below before any optional lookup seed does.
1214+
const preBunTransportEnv = captureCodexCliTransportEnv(process.env);
12011215
const launchProof = randomBytes(32).toString("base64url");
1202-
const launchContext = JSON.stringify({
1216+
const serializeContext = lookupSeeds => JSON.stringify({
12031217
version: 1,
12041218
proof: launchProof,
12051219
anthropicEnvSlots: preBunAnthropicSlots,
12061220
codexCliInspectionEnv: codexCliUpdateInspection ? {
12071221
codexCliPath: preBunCodexCliPath,
12081222
path: preBunPath,
12091223
pathExt: preBunPathExt,
1224+
home: lookupSeeds.home,
1225+
nodePath: lookupSeeds.nodePath,
12101226
managerRoots: preBunCodexCliManagerRoots,
1227+
transportEnv: preBunTransportEnv,
1228+
// The published Codex entrypoint selects its native backing by the arch of
1229+
// the Node that runs it; a Bun override or PATH fallback can run another
1230+
// arch under Rosetta, so this Node launcher's arch is the bound value.
1231+
arch: process.arch,
12111232
configDir: configDir(),
12121233
} : null,
12131234
});
1214-
// The inspection snapshot above already carries PATH, PATHEXT, and the manager-root slots as
1235+
let launchContext = serializeContext({ home: preBunHome, nodePath: preBunNodePath });
1236+
// The lookup seeds are optional: a Windows inspection never models the global
1237+
// Node lookup, and an oversized NODE_PATH must not push the serialized
1238+
// context past the reader's limit — that would discard the whole selection
1239+
// snapshot, while dropped seeds merely leave the fallback lane unverifiable
1240+
// and fail only the content observation closed.
1241+
const lookupSeeds = codexCliInspectionLookupSeeds(
1242+
process.platform, preBunHome, preBunNodePath, launchContext.length,
1243+
);
1244+
if (lookupSeeds.home !== preBunHome || lookupSeeds.nodePath !== preBunNodePath) {
1245+
launchContext = serializeContext(lookupSeeds);
1246+
}
1247+
// The inspection snapshot above already carries PATH, PATHEXT, manager roots and proxy/CA settings as
12151248
// proof-bound values, and `inspectCodexCliInstall` reads them from that snapshot rather than
12161249
// from the live environment. Inheriting them again would spend the 32,767-character Windows
12171250
// environment block twice, so a large-but-valid shell environment could stop the Bun child
@@ -1224,7 +1257,8 @@ function createNodeLaunchContext() {
12241257
const inheritedEnv = { ...process.env };
12251258
if (codexCliUpdateInspection) {
12261259
const snapshotted = new Set(
1227-
["PATH", "PATHEXT", ...CODEX_CLI_VERSION_MANAGER_ROOT_ENV_SLOTS].map(name => name.toLowerCase()),
1260+
["PATH", "PATHEXT", ...CODEX_CLI_VERSION_MANAGER_ROOT_ENV_SLOTS,
1261+
...CODEX_CLI_TRANSPORT_ENV_KEYS].map(name => name.toLowerCase()),
12281262
);
12291263
for (const name of Object.keys(inheritedEnv)) {
12301264
if (snapshotted.has(name.toLowerCase())) delete inheritedEnv[name];

‎bun.lock‎

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎desktop/src-tauri/Cargo.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎desktop/src-tauri/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "opencodex-desktop"
3-
version = "2.91.0"
3+
version = "2.92.0"
44
description = "OpenCodex desktop shell"
55
authors = ["OpenCodex contributors"]
66
license = "MIT"

‎desktop/src-tauri/src/provider_icons.rs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ const ALIASES: &[(&str, &str)] = &[
3838
("cursor", "cursor-color.svg"),
3939
("deepseek", "deepseek-color.svg"),
4040
("dsh-account", "deepseek-color.svg"),
41+
("workbuddy-ai", "workbuddy-color.svg"),
4142
("devin", "devin.svg"),
4243
("firepass", "firepass-color.svg"),
4344
("fireworks", "fireworks-color.svg"),
@@ -163,6 +164,7 @@ fn svg(file: &str) -> Option<&'static str> {
163164
"cursor-color.svg" => svg!("cursor-color.svg"),
164165
"deepinfra.svg" => svg!("deepinfra.svg"),
165166
"deepseek-color.svg" => svg!("deepseek-color.svg"),
167+
"workbuddy-color.svg" => svg!("workbuddy-color.svg"),
166168
"devin.svg" => svg!("devin.svg"),
167169
"digitalocean.svg" => svg!("digitalocean.svg"),
168170
"featherless.svg" => svg!("featherless.svg"),

‎desktop/src-tauri/tauri.conf.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://schema.tauri.app/config/2",
33
"productName": "OpenCodex",
4-
"version": "2.91.0",
4+
"version": "2.92.0",
55
"identifier": "com.opencodex.desktop",
66
"build": {
77
"frontendDist": "../ui",

0 commit comments

Comments
 (0)