From c8d8c0e622619fccb60b6b92b8d8a6303ee77286 Mon Sep 17 00:00:00 2001 From: Brent Traut Date: Tue, 26 May 2026 16:48:44 -0700 Subject: [PATCH] Place SQLite override under third_party The vendored dependency source is not a Codex workspace crate, and its official amalgamation assets necessarily exceed the default blob budget. Keep the pinned source auditable under third_party and allowlist the required large upstream artifacts. --- .github/blob-size-allowlist.txt | 4 ++++ MODULE.bazel.lock | 2 +- codex-rs/Cargo.toml | 4 ++-- .../libsqlite3-sys/.cargo_vcs_info.json | 0 {codex-rs/vendor => third_party}/libsqlite3-sys/.gitignore | 0 {codex-rs/vendor => third_party}/libsqlite3-sys/Cargo.toml | 0 .../vendor => third_party}/libsqlite3-sys/Cargo.toml.orig | 0 {codex-rs/vendor => third_party}/libsqlite3-sys/LICENSE | 0 {codex-rs/vendor => third_party}/libsqlite3-sys/README.md | 0 {codex-rs/vendor => third_party}/libsqlite3-sys/UPSTREAM.md | 0 {codex-rs/vendor => third_party}/libsqlite3-sys/Upgrade.md | 0 .../libsqlite3-sys/bindgen-bindings/bindgen_3.14.0.rs | 0 .../libsqlite3-sys/bindgen-bindings/bindgen_3.14.0_ext.rs | 0 {codex-rs/vendor => third_party}/libsqlite3-sys/build.rs | 0 .../vendor => third_party}/libsqlite3-sys/sqlcipher/LICENSE | 0 .../libsqlite3-sys/sqlcipher/bindgen_bundled_version.rs | 0 .../vendor => third_party}/libsqlite3-sys/sqlcipher/sqlite3.c | 0 .../vendor => third_party}/libsqlite3-sys/sqlcipher/sqlite3.h | 0 .../libsqlite3-sys/sqlcipher/sqlite3ext.h | 0 .../libsqlite3-sys/sqlite3/bindgen_bundled_version.rs | 0 .../libsqlite3-sys/sqlite3/bindgen_bundled_version_ext.rs | 0 .../vendor => third_party}/libsqlite3-sys/sqlite3/sqlite3.c | 0 .../vendor => third_party}/libsqlite3-sys/sqlite3/sqlite3.h | 0 .../libsqlite3-sys/sqlite3/sqlite3ext.h | 0 .../libsqlite3-sys/sqlite3/wasm32-wasi-vfs.c | 0 {codex-rs/vendor => third_party}/libsqlite3-sys/src/error.rs | 0 {codex-rs/vendor => third_party}/libsqlite3-sys/src/lib.rs | 0 {codex-rs/vendor => third_party}/libsqlite3-sys/upgrade.sh | 0 .../libsqlite3-sys/upgrade_sqlcipher.sh | 0 {codex-rs/vendor => third_party}/libsqlite3-sys/wrapper.h | 0 {codex-rs/vendor => third_party}/libsqlite3-sys/wrapper_ext.h | 0 31 files changed, 7 insertions(+), 3 deletions(-) rename {codex-rs/vendor => third_party}/libsqlite3-sys/.cargo_vcs_info.json (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/.gitignore (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/Cargo.toml (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/Cargo.toml.orig (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/LICENSE (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/README.md (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/UPSTREAM.md (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/Upgrade.md (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/bindgen-bindings/bindgen_3.14.0.rs (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/bindgen-bindings/bindgen_3.14.0_ext.rs (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/build.rs (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/sqlcipher/LICENSE (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/sqlcipher/bindgen_bundled_version.rs (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/sqlcipher/sqlite3.c (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/sqlcipher/sqlite3.h (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/sqlcipher/sqlite3ext.h (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/sqlite3/bindgen_bundled_version.rs (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/sqlite3/bindgen_bundled_version_ext.rs (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/sqlite3/sqlite3.c (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/sqlite3/sqlite3.h (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/sqlite3/sqlite3ext.h (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/sqlite3/wasm32-wasi-vfs.c (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/src/error.rs (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/src/lib.rs (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/upgrade.sh (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/upgrade_sqlcipher.sh (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/wrapper.h (100%) rename {codex-rs/vendor => third_party}/libsqlite3-sys/wrapper_ext.h (100%) diff --git a/.github/blob-size-allowlist.txt b/.github/blob-size-allowlist.txt index 9375b49c27..dab738f1e5 100644 --- a/.github/blob-size-allowlist.txt +++ b/.github/blob-size-allowlist.txt @@ -8,3 +8,7 @@ codex-rs/app-server-protocol/schema/json/codex_app_server_protocol.v2.schemas.js codex-rs/tui/tests/fixtures/oss-story.jsonl codex-rs/tui_app_server/tests/fixtures/oss-story.jsonl codex-rs/tui/src/app.rs +third_party/libsqlite3-sys/sqlcipher/sqlite3.c +third_party/libsqlite3-sys/sqlcipher/sqlite3.h +third_party/libsqlite3-sys/sqlite3/sqlite3.c +third_party/libsqlite3-sys/sqlite3/sqlite3.h diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 06b7920889..63611ff7bb 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1301,7 +1301,7 @@ "password-hash_0.4.2": "{\"dependencies\":[{\"name\":\"base64ct\",\"req\":\"^1\"},{\"default_features\":false,\"name\":\"rand_core\",\"optional\":true,\"req\":\"^0.6\"},{\"default_features\":false,\"name\":\"subtle\",\"req\":\"^2\"}],\"features\":{\"alloc\":[\"base64ct/alloc\"],\"default\":[\"rand_core\"],\"std\":[\"alloc\",\"base64ct/std\",\"rand_core/std\"]}}", "paste_1.0.15": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"paste-test-suite\",\"req\":\"^0\"},{\"kind\":\"dev\",\"name\":\"rustversion\",\"req\":\"^1.0\"},{\"features\":[\"diff\"],\"kind\":\"dev\",\"name\":\"trybuild\",\"req\":\"^1.0.49\"}],\"features\":{}}", "pastey_0.2.1": "{\"dependencies\":[],\"features\":{}}", - "path+crates/vendor/libsqlite3-sys_libsqlite3-sys": "{\"dependencies\":[{\"default_features\":true,\"features\":[],\"name\":\"openssl-sys\",\"optional\":true},{\"default_features\":false,\"features\":[\"runtime\"],\"kind\":\"build\",\"name\":\"bindgen\",\"optional\":true},{\"default_features\":true,\"features\":[],\"kind\":\"build\",\"name\":\"cc\",\"optional\":true},{\"default_features\":true,\"features\":[],\"kind\":\"build\",\"name\":\"pkg-config\",\"optional\":true},{\"default_features\":true,\"features\":[],\"kind\":\"build\",\"name\":\"prettyplease\",\"optional\":true},{\"default_features\":false,\"features\":[],\"kind\":\"build\",\"name\":\"quote\",\"optional\":true},{\"default_features\":true,\"features\":[\"full\",\"extra-traits\",\"visit-mut\"],\"kind\":\"build\",\"name\":\"syn\",\"optional\":true},{\"default_features\":true,\"features\":[],\"kind\":\"build\",\"name\":\"vcpkg\",\"optional\":true}],\"features\":{\"buildtime_bindgen\":[\"bindgen\",\"pkg-config\",\"vcpkg\"],\"bundled\":[\"cc\",\"bundled_bindings\"],\"bundled-sqlcipher\":[\"bundled\"],\"bundled-sqlcipher-vendored-openssl\":[\"bundled-sqlcipher\",\"openssl-sys/vendored\"],\"bundled-windows\":[\"cc\",\"bundled_bindings\"],\"bundled_bindings\":[],\"default\":[\"min_sqlite_version_3_14_0\"],\"in_gecko\":[],\"loadable_extension\":[\"prettyplease\",\"quote\",\"syn\"],\"min_sqlite_version_3_14_0\":[\"pkg-config\",\"vcpkg\"],\"preupdate_hook\":[\"buildtime_bindgen\"],\"session\":[\"preupdate_hook\",\"buildtime_bindgen\"],\"sqlcipher\":[],\"unlock_notify\":[],\"wasm32-wasi-vfs\":[],\"with-asan\":[]},\"strip_prefix\":\"\"}", + "path+crates/../third_party/libsqlite3-sys_libsqlite3-sys": "{\"dependencies\":[{\"default_features\":true,\"features\":[],\"name\":\"openssl-sys\",\"optional\":true},{\"default_features\":false,\"features\":[\"runtime\"],\"kind\":\"build\",\"name\":\"bindgen\",\"optional\":true},{\"default_features\":true,\"features\":[],\"kind\":\"build\",\"name\":\"cc\",\"optional\":true},{\"default_features\":true,\"features\":[],\"kind\":\"build\",\"name\":\"pkg-config\",\"optional\":true},{\"default_features\":true,\"features\":[],\"kind\":\"build\",\"name\":\"prettyplease\",\"optional\":true},{\"default_features\":false,\"features\":[],\"kind\":\"build\",\"name\":\"quote\",\"optional\":true},{\"default_features\":true,\"features\":[\"full\",\"extra-traits\",\"visit-mut\"],\"kind\":\"build\",\"name\":\"syn\",\"optional\":true},{\"default_features\":true,\"features\":[],\"kind\":\"build\",\"name\":\"vcpkg\",\"optional\":true}],\"features\":{\"buildtime_bindgen\":[\"bindgen\",\"pkg-config\",\"vcpkg\"],\"bundled\":[\"cc\",\"bundled_bindings\"],\"bundled-sqlcipher\":[\"bundled\"],\"bundled-sqlcipher-vendored-openssl\":[\"bundled-sqlcipher\",\"openssl-sys/vendored\"],\"bundled-windows\":[\"cc\",\"bundled_bindings\"],\"bundled_bindings\":[],\"default\":[\"min_sqlite_version_3_14_0\"],\"in_gecko\":[],\"loadable_extension\":[\"prettyplease\",\"quote\",\"syn\"],\"min_sqlite_version_3_14_0\":[\"pkg-config\",\"vcpkg\"],\"preupdate_hook\":[\"buildtime_bindgen\"],\"session\":[\"preupdate_hook\",\"buildtime_bindgen\"],\"sqlcipher\":[],\"unlock_notify\":[],\"wasm32-wasi-vfs\":[],\"with-asan\":[]},\"strip_prefix\":\"\"}", "path-absolutize_3.1.1": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"bencher\",\"req\":\"^0.1.5\"},{\"name\":\"path-dedot\",\"req\":\"^3.1.1\"},{\"kind\":\"dev\",\"name\":\"slash-formatter\",\"req\":\"^3\",\"target\":\"cfg(windows)\"}],\"features\":{\"lazy_static_cache\":[\"path-dedot/lazy_static_cache\"],\"once_cell_cache\":[\"path-dedot/once_cell_cache\"],\"unsafe_cache\":[\"path-dedot/unsafe_cache\"],\"use_unix_paths_on_wasm\":[\"path-dedot/use_unix_paths_on_wasm\"]}}", "path-dedot_3.1.1": "{\"dependencies\":[{\"kind\":\"dev\",\"name\":\"bencher\",\"req\":\"^0.1.5\"},{\"name\":\"lazy_static\",\"optional\":true,\"req\":\"^1.4\"},{\"name\":\"once_cell\",\"req\":\"^1.4\"}],\"features\":{\"lazy_static_cache\":[\"lazy_static\"],\"once_cell_cache\":[],\"unsafe_cache\":[],\"use_unix_paths_on_wasm\":[]}}", "pathdiff_0.2.3": "{\"dependencies\":[{\"name\":\"camino\",\"optional\":true,\"req\":\"^1.0.5\"},{\"kind\":\"dev\",\"name\":\"cfg-if\",\"req\":\"^1.0.0\"}],\"features\":{}}", diff --git a/codex-rs/Cargo.toml b/codex-rs/Cargo.toml index 93bedd1a4d..121592de8d 100644 --- a/codex-rs/Cargo.toml +++ b/codex-rs/Cargo.toml @@ -517,8 +517,8 @@ opt-level = 0 [patch.crates-io] # sqlx-sqlite 0.8.6 requires libsqlite3-sys ^0.30.1, whose bundled SQLite # predates the WAL-reset corruption fix. Keep its compatible Rust API while -# bundling the fixed SQLite source documented in vendor/libsqlite3-sys/UPSTREAM.md. -libsqlite3-sys = { path = "vendor/libsqlite3-sys" } +# bundling the fixed SQLite source documented in ../third_party/libsqlite3-sys/UPSTREAM.md. +libsqlite3-sys = { path = "../third_party/libsqlite3-sys" } # Uncomment to debug local changes. # ratatui = { path = "../../ratatui" } crossterm = { git = "https://github.com/nornagon/crossterm", rev = "87db8bfa6dc99427fd3b071681b07fc31c6ce995" } diff --git a/codex-rs/vendor/libsqlite3-sys/.cargo_vcs_info.json b/third_party/libsqlite3-sys/.cargo_vcs_info.json similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/.cargo_vcs_info.json rename to third_party/libsqlite3-sys/.cargo_vcs_info.json diff --git a/codex-rs/vendor/libsqlite3-sys/.gitignore b/third_party/libsqlite3-sys/.gitignore similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/.gitignore rename to third_party/libsqlite3-sys/.gitignore diff --git a/codex-rs/vendor/libsqlite3-sys/Cargo.toml b/third_party/libsqlite3-sys/Cargo.toml similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/Cargo.toml rename to third_party/libsqlite3-sys/Cargo.toml diff --git a/codex-rs/vendor/libsqlite3-sys/Cargo.toml.orig b/third_party/libsqlite3-sys/Cargo.toml.orig similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/Cargo.toml.orig rename to third_party/libsqlite3-sys/Cargo.toml.orig diff --git a/codex-rs/vendor/libsqlite3-sys/LICENSE b/third_party/libsqlite3-sys/LICENSE similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/LICENSE rename to third_party/libsqlite3-sys/LICENSE diff --git a/codex-rs/vendor/libsqlite3-sys/README.md b/third_party/libsqlite3-sys/README.md similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/README.md rename to third_party/libsqlite3-sys/README.md diff --git a/codex-rs/vendor/libsqlite3-sys/UPSTREAM.md b/third_party/libsqlite3-sys/UPSTREAM.md similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/UPSTREAM.md rename to third_party/libsqlite3-sys/UPSTREAM.md diff --git a/codex-rs/vendor/libsqlite3-sys/Upgrade.md b/third_party/libsqlite3-sys/Upgrade.md similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/Upgrade.md rename to third_party/libsqlite3-sys/Upgrade.md diff --git a/codex-rs/vendor/libsqlite3-sys/bindgen-bindings/bindgen_3.14.0.rs b/third_party/libsqlite3-sys/bindgen-bindings/bindgen_3.14.0.rs similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/bindgen-bindings/bindgen_3.14.0.rs rename to third_party/libsqlite3-sys/bindgen-bindings/bindgen_3.14.0.rs diff --git a/codex-rs/vendor/libsqlite3-sys/bindgen-bindings/bindgen_3.14.0_ext.rs b/third_party/libsqlite3-sys/bindgen-bindings/bindgen_3.14.0_ext.rs similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/bindgen-bindings/bindgen_3.14.0_ext.rs rename to third_party/libsqlite3-sys/bindgen-bindings/bindgen_3.14.0_ext.rs diff --git a/codex-rs/vendor/libsqlite3-sys/build.rs b/third_party/libsqlite3-sys/build.rs similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/build.rs rename to third_party/libsqlite3-sys/build.rs diff --git a/codex-rs/vendor/libsqlite3-sys/sqlcipher/LICENSE b/third_party/libsqlite3-sys/sqlcipher/LICENSE similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/sqlcipher/LICENSE rename to third_party/libsqlite3-sys/sqlcipher/LICENSE diff --git a/codex-rs/vendor/libsqlite3-sys/sqlcipher/bindgen_bundled_version.rs b/third_party/libsqlite3-sys/sqlcipher/bindgen_bundled_version.rs similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/sqlcipher/bindgen_bundled_version.rs rename to third_party/libsqlite3-sys/sqlcipher/bindgen_bundled_version.rs diff --git a/codex-rs/vendor/libsqlite3-sys/sqlcipher/sqlite3.c b/third_party/libsqlite3-sys/sqlcipher/sqlite3.c similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/sqlcipher/sqlite3.c rename to third_party/libsqlite3-sys/sqlcipher/sqlite3.c diff --git a/codex-rs/vendor/libsqlite3-sys/sqlcipher/sqlite3.h b/third_party/libsqlite3-sys/sqlcipher/sqlite3.h similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/sqlcipher/sqlite3.h rename to third_party/libsqlite3-sys/sqlcipher/sqlite3.h diff --git a/codex-rs/vendor/libsqlite3-sys/sqlcipher/sqlite3ext.h b/third_party/libsqlite3-sys/sqlcipher/sqlite3ext.h similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/sqlcipher/sqlite3ext.h rename to third_party/libsqlite3-sys/sqlcipher/sqlite3ext.h diff --git a/codex-rs/vendor/libsqlite3-sys/sqlite3/bindgen_bundled_version.rs b/third_party/libsqlite3-sys/sqlite3/bindgen_bundled_version.rs similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/sqlite3/bindgen_bundled_version.rs rename to third_party/libsqlite3-sys/sqlite3/bindgen_bundled_version.rs diff --git a/codex-rs/vendor/libsqlite3-sys/sqlite3/bindgen_bundled_version_ext.rs b/third_party/libsqlite3-sys/sqlite3/bindgen_bundled_version_ext.rs similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/sqlite3/bindgen_bundled_version_ext.rs rename to third_party/libsqlite3-sys/sqlite3/bindgen_bundled_version_ext.rs diff --git a/codex-rs/vendor/libsqlite3-sys/sqlite3/sqlite3.c b/third_party/libsqlite3-sys/sqlite3/sqlite3.c similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/sqlite3/sqlite3.c rename to third_party/libsqlite3-sys/sqlite3/sqlite3.c diff --git a/codex-rs/vendor/libsqlite3-sys/sqlite3/sqlite3.h b/third_party/libsqlite3-sys/sqlite3/sqlite3.h similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/sqlite3/sqlite3.h rename to third_party/libsqlite3-sys/sqlite3/sqlite3.h diff --git a/codex-rs/vendor/libsqlite3-sys/sqlite3/sqlite3ext.h b/third_party/libsqlite3-sys/sqlite3/sqlite3ext.h similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/sqlite3/sqlite3ext.h rename to third_party/libsqlite3-sys/sqlite3/sqlite3ext.h diff --git a/codex-rs/vendor/libsqlite3-sys/sqlite3/wasm32-wasi-vfs.c b/third_party/libsqlite3-sys/sqlite3/wasm32-wasi-vfs.c similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/sqlite3/wasm32-wasi-vfs.c rename to third_party/libsqlite3-sys/sqlite3/wasm32-wasi-vfs.c diff --git a/codex-rs/vendor/libsqlite3-sys/src/error.rs b/third_party/libsqlite3-sys/src/error.rs similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/src/error.rs rename to third_party/libsqlite3-sys/src/error.rs diff --git a/codex-rs/vendor/libsqlite3-sys/src/lib.rs b/third_party/libsqlite3-sys/src/lib.rs similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/src/lib.rs rename to third_party/libsqlite3-sys/src/lib.rs diff --git a/codex-rs/vendor/libsqlite3-sys/upgrade.sh b/third_party/libsqlite3-sys/upgrade.sh similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/upgrade.sh rename to third_party/libsqlite3-sys/upgrade.sh diff --git a/codex-rs/vendor/libsqlite3-sys/upgrade_sqlcipher.sh b/third_party/libsqlite3-sys/upgrade_sqlcipher.sh similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/upgrade_sqlcipher.sh rename to third_party/libsqlite3-sys/upgrade_sqlcipher.sh diff --git a/codex-rs/vendor/libsqlite3-sys/wrapper.h b/third_party/libsqlite3-sys/wrapper.h similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/wrapper.h rename to third_party/libsqlite3-sys/wrapper.h diff --git a/codex-rs/vendor/libsqlite3-sys/wrapper_ext.h b/third_party/libsqlite3-sys/wrapper_ext.h similarity index 100% rename from codex-rs/vendor/libsqlite3-sys/wrapper_ext.h rename to third_party/libsqlite3-sys/wrapper_ext.h