Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/nori-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ jobs:
- name: Build release binaries
working-directory: codex-rs
run: |
cargo build --release --target ${{ matrix.target }} -p codex-cli
cargo build --release --target ${{ matrix.target }} -p nori-cli

# List built artifacts
ls -la target/${{ matrix.target }}/release/
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/rust-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -126,16 +126,16 @@ jobs:
run: |
mkdir -p target/mock-acp-out # build mock-acp-agent to a known location for E2E tests
cargo +nightly build -p mock-acp-agent --profile ci-test --target ${{ matrix.target }} --artifact-dir target/mock-acp-out -Z unstable-options
cargo build -p codex-cli --profile ci-test --target ${{ matrix.target }}
cargo build -p nori-cli --profile ci-test --target ${{ matrix.target }}
cargo build -p codex-exec --profile ci-test --target ${{ matrix.target }} # separately needed because some tests call `CargoRun('codex-exec')`
- name: cargo test nori
env:
MOCK_ACP_AGENT_BIN: ${{ github.workspace }}/codex-rs/target/mock-acp-out/mock_acp_agent
run: |
cargo test --profile ci-test --target ${{ matrix.target }} --package tui-pty-e2e
cargo test --profile ci-test --target ${{ matrix.target }} --package codex-acp
cargo test --profile ci-test --target ${{ matrix.target }} --package codex-tui
cargo test --profile ci-test --target ${{ matrix.target }} --package codex-cli
cargo test --profile ci-test --target ${{ matrix.target }} --package nori-tui
cargo test --profile ci-test --target ${{ matrix.target }} --package nori-cli
cargo test --profile ci-test --target ${{ matrix.target }} --package codex-protocol
- name: cargo clippy
run: cargo clippy --target ${{ matrix.target }} --all-features -- -D warnings
Expand Down
12 changes: 6 additions & 6 deletions AGENTS.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ In the codex-rs folder where the rust code lives:

Run `just fmt` (in `codex-rs` directory) automatically after making Rust code changes; do not ask for approval to run it. Before finalizing a change to `codex-rs`, run `just fix -p <project>` (in `codex-rs` directory) to fix any linter issues in the code. Prefer scoping with `-p` to avoid slow workspace‑wide Clippy builds; only run `just fix` without `-p` if you changed shared crates. Additionally, run the tests:

1. Run the test for the specific project that was changed. For example, if changes were made in `codex-rs/tui`, run `cargo test -p codex-tui`.
1. Run the test for the specific project that was changed. For example, if changes were made in `codex-rs/tui`, run `cargo test -p nori-tui`.
2. Once those pass, if any changes were made in common, core, or protocol, run the complete test suite with `cargo test --all-features`.
When running interactively, ask the user before running `just fix` to finalize. `just fmt` does not require approval. project-specific or individual tests can be run without asking the user, but do ask the user before running the complete test suite.
3. If any changes were made in tui, cli, or acp, run the E2E test suite with `cargo test -p tui-pty-e2e`.
Expand Down Expand Up @@ -65,13 +65,13 @@ See `codex-rs/tui/styles.md`.
This repo uses snapshot tests (via `insta`), especially in `codex-rs/tui`, to validate rendered output. When UI or text output changes intentionally, update the snapshots as follows:

- Run tests to generate any updated snapshots:
- `cargo test -p codex-tui`
- Check whats pending:
- `cargo insta pending-snapshots -p codex-tui`
- `cargo test -p nori-tui`
- Check what's pending:
- `cargo insta pending-snapshots -p nori-tui`
- Review changes by reading the generated `*.snap.new` files directly in the repo, or preview a specific file:
- `cargo insta show -p codex-tui path/to/file.snap.new`
- `cargo insta show -p nori-tui path/to/file.snap.new`
- Only if you intend to accept all new snapshots in this crate, run:
- `cargo insta accept -p codex-tui`
- `cargo insta accept -p nori-tui`

If you don’t have the tool:

Expand Down
224 changes: 112 additions & 112 deletions codex-rs/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion codex-rs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ codex-process-hardening = { path = "process-hardening" }
codex-protocol = { path = "protocol" }
codex-rmcp-client = { path = "rmcp-client" }
codex-stdio-to-uds = { path = "stdio-to-uds" }
codex-tui = { path = "tui" }
nori-tui = { path = "tui" }
codex-utils-cache = { path = "utils/cache" }
codex-utils-image = { path = "utils/image" }
codex-utils-json-to-toml = { path = "utils/json-to-toml" }
Expand Down
10 changes: 5 additions & 5 deletions codex-rs/acp/src/tracing_setup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ use tracing_subscriber::util::SubscriberInitExt;
/// Returns the default log level based on build configuration.
///
/// - Debug builds: `debug` level (captures debug, info, warn, error)
/// - Release builds: `warn,codex_tui=info,acp=info` (warn default, info for TUI/ACP)
/// - Release builds: `warn,nori_tui=info,acp=info` (warn default, info for TUI/ACP)
///
/// Note: This can be overridden by setting the RUST_LOG environment variable.
fn default_log_level() -> &'static str {
if cfg!(debug_assertions) {
"debug"
} else {
"warn,codex_tui=info,acp=info"
"warn,nori_tui=info,acp=info"
}
}

Expand Down Expand Up @@ -177,7 +177,7 @@ mod tests {
/// Test that default_log_level returns the correct value based on build type.
///
/// - Debug builds: "debug" (all debug and above)
/// - Release builds: "warn,codex_tui=info,acp=info" (warn default, but info for TUI/ACP)
/// - Release builds: "warn,nori_tui=info,acp=info" (warn default, but info for TUI/ACP)
#[test]
fn test_default_log_level_returns_expected_value() {
let level = default_log_level();
Expand All @@ -193,8 +193,8 @@ mod tests {
#[cfg(not(debug_assertions))]
{
assert_eq!(
level, "warn,codex_tui=info,acp=info",
"Release builds should default to 'warn,codex_tui=info,acp=info'"
level, "warn,nori_tui=info,acp=info",
"Release builds should default to 'warn,nori_tui=info,acp=info'"
);
}
}
Expand Down
2 changes: 1 addition & 1 deletion codex-rs/backend-client/src/client.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ impl Client {
if let Some(ua) = &self.user_agent {
h.insert(USER_AGENT, ua.clone());
} else {
h.insert(USER_AGENT, HeaderValue::from_static("codex-cli"));
h.insert(USER_AGENT, HeaderValue::from_static("nori-cli"));
}
if let Some(token) = &self.bearer_token {
let value = format!("Bearer {token}");
Expand Down
Loading
Loading