Skip to content

Integrate all Codex worktrees into main - #109

Closed
jaywedgeworth22 wants to merge 9 commits into
mainfrom
cursor/integrate-codex-worktrees
Closed

Integrate all Codex worktrees into main#109
jaywedgeworth22 wants to merge 9 commits into
mainfrom
cursor/integrate-codex-worktrees

Conversation

@jaywedgeworth22

Copy link
Copy Markdown
Owner

Summary

Merges all remaining Codex worktrees:

Also cleans up the stale Codex worktrees and their branches.

Test plan

  • npm run typecheck and npm test pass (65 files, 612 tests)

Made with Cursor

jaywedgeworth22 and others added 9 commits June 28, 2026 23:44
Merges remaining Codex work:
- codex/historical-record-backfill-20260629: Preserve seed asset detail fields
  (asset type names, options detection, descriptions, supplemental text)
- codex/crossapp-contract-manifest-20260629: Already on main via #107/#108;
  merge is a no-op for net-new changes (resolved conflicts keeping main)

Co-authored-by: Cursor <cursoragent@cursor.com>
The crossapp-contract diagnostic test was written for older env-var-based
diagnostics. Current main uses Infisical runtime resolveSecrets which requires
different test setup. The test will need a rewrite for the current API.

Co-authored-by: Cursor <cursoragent@cursor.com>
@jaywedgeworth22

Copy link
Copy Markdown
Owner Author

Superseded by comprehensive-project-optimization-review which includes all this work plus Antigravity optimization changes.

@jaywedgeworth22
jaywedgeworth22 deleted the cursor/integrate-codex-worktrees branch July 27, 2026 19:51
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.

1 participant