mirror of
https://github.com/hanzoai/dev.git
synced 2026-10-25 03:32:32 +00:00
chore(merge): enforce policy removals (images + cargo caches)
This commit is contained in:
@@ -1,47 +0,0 @@
|
||||
Upstream merge plan (by-bucket)
|
||||
|
||||
Mode: by-bucket
|
||||
|
||||
Strategy
|
||||
- Adopt upstream broadly outside protected areas; resolve conflicts minimally.
|
||||
- Prefer ours for TUI and fork-only core glue per policy to preserve browser/agent tools, UA/version semantics, and strict ordering.
|
||||
- Prefer theirs for shared libraries (common, exec, file-search) unless it breaks our build or documented behavior.
|
||||
- Purge any reintroduced GitHub image assets matching purge globs.
|
||||
|
||||
Buckets
|
||||
- prefer_ours_globs
|
||||
- codex-rs/tui/**
|
||||
- codex-cli/**
|
||||
- codex-rs/core/src/openai_tools.rs
|
||||
- codex-rs/core/src/codex.rs
|
||||
- codex-rs/core/src/agent_tool.rs
|
||||
- codex-rs/core/src/default_client.rs
|
||||
- codex-rs/protocol/src/models.rs
|
||||
- .github/workflows/**
|
||||
- docs/**
|
||||
- AGENTS.md, README.md, CHANGELOG.md
|
||||
|
||||
- prefer_theirs_globs
|
||||
- codex-rs/common/**
|
||||
- codex-rs/exec/**
|
||||
- codex-rs/file-search/**
|
||||
|
||||
- purge_globs
|
||||
- .github/codex-cli-*.png|jpg|jpeg|webp
|
||||
|
||||
Invariants to preserve
|
||||
- Handlers and schemas for browser_* and agent_* tools; include web_fetch.
|
||||
- Exposure gating for browser tools remains intact.
|
||||
- Screenshot queuing semantics across turns preserved.
|
||||
- Version/UA helpers: codex_version::version() and get_codex_user_agent_default().
|
||||
- Public re-exports in codex-core: ModelClient, Prompt, ResponseEvent, ResponseStream.
|
||||
- codex_core::models alias to protocol models remains.
|
||||
- Do not remove ICU/sys-locale deps if referenced.
|
||||
|
||||
Process
|
||||
1) Merge upstream/main into upstream-merge with --no-commit.
|
||||
2) Resolve conflicts per buckets (ours/theirs/default adopt upstream).
|
||||
3) Ensure purge_globs stay deleted if reintroduced.
|
||||
4) Run scripts/upstream-merge/verify.sh and ./build-fast.sh; fix minimal issues.
|
||||
5) Commit with a conventional message and summarize results in MERGE_REPORT.md.
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
Upstream merge report
|
||||
|
||||
Branch: upstream-merge
|
||||
Upstream: openai/codex@main
|
||||
Mode: by-bucket
|
||||
|
||||
Incorporated
|
||||
- Adopted upstream changes across core, common, exec, and workspace where no fork-only invariants were impacted.
|
||||
- No newly reintroduced purge_globs found; image purge not required this round.
|
||||
|
||||
Dropped/Kept Ours
|
||||
- codex-rs/tui/src/chatwidget.rs: kept ours to preserve strict streaming ordering and RunningCommand/HistoryCell semantics that our TUI relies on.
|
||||
- Preserved fork-only core glue and APIs (no upstream changes conflicting this round):
|
||||
- codex-rs/core/src/openai_tools.rs (browser_*/agent_* tools and web_fetch exposure)
|
||||
- codex-rs/core/src/codex.rs (execution events + UA/version handling)
|
||||
- codex-rs/core/src/agent_tool.rs (multi-agent orchestration)
|
||||
- codex-rs/core/src/default_client.rs (versioned UA)
|
||||
- codex-rs/protocol/src/models.rs (models mapping and aliases)
|
||||
|
||||
Other Notes
|
||||
- Public re-exports (ModelClient, Prompt, ResponseEvent, ResponseStream) were preserved.
|
||||
- codex_core::models alias remains intact.
|
||||
- Verify script passed: tools/UA/version guards OK.
|
||||
- build-fast.sh passed with zero warnings.
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
Title: merge(upstream): sync fork with openai/codex main (by-bucket)
|
||||
|
||||
Summary
|
||||
- Merge upstream main into our fork’s `upstream-merge` using by-bucket policy.
|
||||
- Keep our TUI and fork-only core glue; adopt upstream improvements elsewhere.
|
||||
|
||||
Key Decisions
|
||||
- TUI: kept ours for `codex-rs/tui/src/chatwidget.rs` to preserve strict ordering and HistoryCell/RunningCommand semantics.
|
||||
- Core invariants preserved: browser_*/agent_* tools and web_fetch exposure gating; screenshot queue semantics; UA/version helpers.
|
||||
- Prefer theirs for shared crates (common/exec/file-search) where applicable.
|
||||
- No purge_globs assets reintroduced.
|
||||
|
||||
Verification
|
||||
- scripts/upstream-merge/verify.sh: PASS
|
||||
- ./build-fast.sh: PASS (no warnings)
|
||||
|
||||
Notes
|
||||
- Public re-exports (ModelClient, Prompt, ResponseEvent, ResponseStream) retained.
|
||||
- codex_core::models alias preserved.
|
||||
|
||||
Reference in New Issue
Block a user