Skip to content

chore(sync): merge upstream main#24

Merged
nisavid merged 130 commits intomainfrom
codex/sync-upstream-2026-05-10
May 11, 2026
Merged

chore(sync): merge upstream main#24
nisavid merged 130 commits intomainfrom
codex/sync-upstream-2026-05-10

Conversation

@nisavid
Copy link
Copy Markdown
Owner

@nisavid nisavid commented May 10, 2026

Summary

Merges upstream main through 5c3cf8b7b026ff02a61a155f709bcab115832e5e while preserving this fork's Linux package and updater contracts.

Sync Ledger

  • Fetched origin and upstream; upstream advanced from 446843757d54d41b53e6244d49ddd9375acb3fc2 to 5c3cf8b7b026ff02a61a155f709bcab115832e5e.
  • Read the required fork-sync policy docs: docs/maintainers/fork-divergences.md, .agents/fork-sync-policy.toml, and docs/maintainers/fork-sync-policy.md.
  • Preserved fork identities and layout: codex-app, codex-app-updater, /opt/codex-app, /usr/lib/codex-app, XDG codex-app-updater, and DMG-derived package versions.
  • Updated the maintained fork baseline in docs/maintainers/fork-divergences.md.
  • Carried upstream Computer Use/window-backend, Chrome native-host, Linux feature, ASAR patch refactor, CI helper, Nix hash, and updater 0.7.1 work into the fork names.
  • Kept legacy codex-desktop/codex-update-manager references only where they are package transition metadata, old-service cleanup, upstream issue references, or maintainer-doc policy context.

Verification

  • bash -n install.sh
  • bash -n scripts/install-deps.sh
  • bash -n scripts/build-deb.sh
  • bash -n scripts/build-rpm.sh
  • bash -n scripts/build-pacman.sh
  • bash -n tests/fixtures/create-packaged-app-fixture.sh
  • bash -n tests/scripts_smoke.sh
  • bash -n launcher/start.sh.template
  • bash -n scripts/ci/update-nix-hashes.sh
  • bash -n packaging/linux/codex-app-updater-user-service.sh
  • node --check scripts/patch-linux-window-ui.js
  • node --check scripts/patch-linux-window-ui.test.js
  • node --check scripts/patches/launch-actions.js
  • node --check scripts/patches/computer-use.js
  • node --check scripts/patches/main-process.js
  • node --check scripts/ci/validate-patch-report.js
  • node scripts/patch-linux-window-ui.test.js (82 passed)
  • bash tests/scripts_smoke.sh (passed; host prints inherited module/ml shell-function import warnings)
  • cargo fmt --check
  • cargo check --workspace --all-targets
  • cargo clippy --workspace --all-targets -- -D warnings
  • cargo test -p codex-app-updater codex_cli::tests::preflight_uses_cached_latest_for_fresh_explicit_cli_path -- --exact (passed after one full-suite transient Text file busy failure)
  • cargo test --workspace --all-targets (passed on rerun: updater 119, Chrome host 11, COSMIC helper 4, Computer Use backend 86)
  • make build-app downloaded fresh Codex.dmg at 2026-05-10 17:42:12 -0400, then failed under sandbox because npm cache writes to /home/nisavid/.npm hit EROFS
  • approved rerun: make build-app (passed against the freshly downloaded Codex.dmg)
  • make pacman (built dist/codex-app-26.506.31421-1-x86_64.pkg.tar.zst)
  • pacman -Qip dist/codex-app-26.506.31421-1-x86_64.pkg.tar.zst
  • pacman -Qlp dist/codex-app-26.506.31421-1-x86_64.pkg.tar.zst
  • sha256sum Codex.dmg dist/codex-app-26.506.31421-1-x86_64.pkg.tar.zst
    • Codex.dmg: e05ae853e5035c949b07915f8c68621b25eb43f47e5185ee6983e847ba176f27
    • package: 23274190906d853764032c3c30f29523c39b3dbb308f619d434077eaff1d1ba3
  • git diff --cached --check

Notes

Package metadata inspected as codex-app 26.506.31421-1, with /opt/codex-app, /usr/lib/codex-app, /usr/share/applications/codex-app.desktop, /usr/lib/systemd/user/codex-app-updater.service, and the update builder payload present in the package listing.

Summary by CodeRabbit

  • New Features
    • Rich Linux integrations: multi-backend window management (Cosmic/KWin/Hyprland/i3/GNOME), native Chrome extension host, helper CLI, keybinds/settings UI, Zed opt‑in opener, bundled plugin & Chrome extension caching, and install-stage feature hooks.
  • Bug Fixes
    • Eviction of stale browser clients, Chrome plugin auto‑install improvements, more reliable Rust toolchain resolution and packaging/install robustness.
  • Chores
    • Updater bumped to 0.7.1; CI/workflows enhanced with Nix-hash automation, scheduled updater, and patch-report validation.
  • Documentation
    • Updated changelog, README, maintainer docs, and new Linux features guides and examples.

jonfry1175 and others added 30 commits May 6, 2026 13:35
…geting

Add Hyprland window targeting backend
…ired-launcher-startup

fix(linux): bypass upstream app sunset gate
…dency-detection

fix(install): Detect Linux dependency profiles from os-release
troubles when `/tmp` mounted with `noexec`
Refresh the packaged desktop app to the current upstream DMG and update the fixed-output hashes and package versions accordingly.

This also carries the ASAR patch drift needed for the newer bundle shape and removes the unused runtime share tree from the final package.
Make the Linux tray startup patch robust when the settings helper is not defined yet in the current upstream bundle.

The tray remains enabled by default, while settings-aware builds still honor the helper when it exists.
Patch the bundled Browser Use node_repl executable with the NixOS dynamic linker and runtime library path.

Without this, the in-app browser automation runtime can be present in the app bundle but fail to execute on NixOS.
Sync the bundled Browser Use marketplace metadata into CODEX_HOME so app-server plugin discovery can see the openai-bundled marketplace on Linux.

The launcher now refreshes the metadata cache safely, including replacing read-only stale files from earlier package runs.
Patch the Electron VS Code bridge to provide a narrow fallback operation source for git-origins requests that arrive without source metadata.

Other git operations still keep the upstream missing-source guard, so this only improves the observed git-origins local task startup failure.
Upstream binary changed — refreshed SRI hash to sha256-KvrWUJgRYbuG/YFSIc/pdkRhGRK3fDqfKj10O7rjFck=.

[skip ci]
…cy-filter

Fix Fedora RPM bundled binary dependency scanning
…lable-gate

[codex] Handle current upstream patch drift
…ackend

Add KWin window targeting backend
Read ydotool stdout and stderr concurrently with process execution so noisy failures cannot fill pipe buffers and get reported as false timeouts.

Co-authored-by: Codex <noreply@openai.com>
Copilot AI review requested due to automatic review settings May 11, 2026 09:58
coderabbitai[bot]
coderabbitai Bot previously approved these changes May 11, 2026
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 74 out of 77 changed files in this pull request and generated 4 comments.

Comment thread computer-use-linux/src/cosmic_helper.rs
Comment thread .github/workflows/ci.yml Outdated
Comment thread scripts/lib/install-helpers.sh
Comment thread updater/src/codex_cli.rs
Validate COSMIC helper overrides as executable files, serialize feature tests that mutate process environment, align Fedora dnf5 guidance, and make the updater system-CLI skip variable explicitly test-only.

Co-authored-by: Codex <noreply@openai.com>
coderabbitai[bot]
coderabbitai Bot previously approved these changes May 11, 2026
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 74 out of 77 changed files in this pull request and generated 2 comments.

Comment thread scripts/lib/install-helpers.sh
Comment thread scripts/install-deps.sh
Update the unsupported-package-manager fallback to show the Fedora 41+ dnf5 command without distro Node.js packages, matching the managed Node.js runtime guidance.

Co-authored-by: Codex <noreply@openai.com>
Comment thread scripts/lib/linux-features.js
coderabbitai[bot]
coderabbitai Bot previously approved these changes May 11, 2026
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 74 out of 77 changed files in this pull request and generated 1 comment.

Comment thread scripts/ci/validate-patch-report.js
Fail fast when validate-patch-report receives an unsupported profile so CI cannot silently skip required patch checks after a typo.

Co-authored-by: Codex <noreply@openai.com>
Copy link
Copy Markdown

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 74 out of 77 changed files in this pull request and generated no new comments.

@nisavid nisavid disabled auto-merge May 11, 2026 11:16
@nisavid nisavid enabled auto-merge (rebase) May 11, 2026 11:16
@nisavid nisavid disabled auto-merge May 11, 2026 11:18
@nisavid nisavid merged commit 3fbc07c into main May 11, 2026
15 checks passed
@nisavid nisavid deleted the codex/sync-upstream-2026-05-10 branch May 11, 2026 11:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.