diff --git a/codex-rs/Cargo.toml b/codex-rs/Cargo.toml
index cc67bac0bf..172c6193c1 100644
--- a/codex-rs/Cargo.toml
+++ b/codex-rs/Cargo.toml
@@ -1,10 +1,10 @@
 [workspace]
 members = [
+    "agent",
     "ansi-escape",
     "apply-patch",
     "arg0",
     "cli",
-    "codex-agent",
     "common",
     "core",
     "exec",
@@ -34,10 +34,10 @@ edition = "2024"
 
 [workspace.dependencies]
 # Internal
+codex-agent = { path = "agent" }
 codex-ansi-escape = { path = "ansi-escape" }
 codex-apply-patch = { path = "apply-patch" }
 codex-arg0 = { path = "arg0" }
-codex-agent = { path = "codex-agent" }
 codex-chatgpt = { path = "chatgpt" }
 codex-common = { path = "common" }
 codex-core = { path = "core" }
diff --git a/codex-rs/codex-agent/Cargo.toml b/codex-rs/agent/Cargo.toml
similarity index 100%
rename from codex-rs/codex-agent/Cargo.toml
rename to codex-rs/agent/Cargo.toml
diff --git a/codex-rs/codex-agent/src/apply_patch.rs b/codex-rs/agent/src/apply_patch.rs
similarity index 100%
rename from codex-rs/codex-agent/src/apply_patch.rs
rename to codex-rs/agent/src/apply_patch.rs
diff --git a/codex-rs/codex-agent/src/bash.rs b/codex-rs/agent/src/bash.rs
similarity index 100%
rename from codex-rs/codex-agent/src/bash.rs
rename to codex-rs/agent/src/bash.rs
diff --git a/codex-rs/codex-agent/src/command_safety/is_dangerous_command.rs b/codex-rs/agent/src/command_safety/is_dangerous_command.rs
similarity index 100%
rename from codex-rs/codex-agent/src/command_safety/is_dangerous_command.rs
rename to codex-rs/agent/src/command_safety/is_dangerous_command.rs
diff --git a/codex-rs/codex-agent/src/command_safety/is_safe_command.rs b/codex-rs/agent/src/command_safety/is_safe_command.rs
similarity index 100%
rename from codex-rs/codex-agent/src/command_safety/is_safe_command.rs
rename to codex-rs/agent/src/command_safety/is_safe_command.rs
diff --git a/codex-rs/codex-agent/src/command_safety/mod.rs b/codex-rs/agent/src/command_safety/mod.rs
similarity index 100%
rename from codex-rs/codex-agent/src/command_safety/mod.rs
rename to codex-rs/agent/src/command_safety/mod.rs
diff --git a/codex-rs/codex-agent/src/command_safety/windows_safe_commands.rs b/codex-rs/agent/src/command_safety/windows_safe_commands.rs
similarity index 100%
rename from codex-rs/codex-agent/src/command_safety/windows_safe_commands.rs
rename to codex-rs/agent/src/command_safety/windows_safe_commands.rs
diff --git a/codex-rs/codex-agent/src/config_types.rs b/codex-rs/agent/src/config_types.rs
similarity index 100%
rename from codex-rs/codex-agent/src/config_types.rs
rename to codex-rs/agent/src/config_types.rs
diff --git a/codex-rs/codex-agent/src/conversation_history.rs b/codex-rs/agent/src/conversation_history.rs
similarity index 100%
rename from codex-rs/codex-agent/src/conversation_history.rs
rename to codex-rs/agent/src/conversation_history.rs
diff --git a/codex-rs/codex-agent/src/exec_command/exec_command_params.rs b/codex-rs/agent/src/exec_command/exec_command_params.rs
similarity index 100%
rename from codex-rs/codex-agent/src/exec_command/exec_command_params.rs
rename to codex-rs/agent/src/exec_command/exec_command_params.rs
diff --git a/codex-rs/codex-agent/src/exec_command/exec_command_session.rs b/codex-rs/agent/src/exec_command/exec_command_session.rs
similarity index 100%
rename from codex-rs/codex-agent/src/exec_command/exec_command_session.rs
rename to codex-rs/agent/src/exec_command/exec_command_session.rs
diff --git a/codex-rs/codex-agent/src/exec_command/mod.rs b/codex-rs/agent/src/exec_command/mod.rs
similarity index 100%
rename from codex-rs/codex-agent/src/exec_command/mod.rs
rename to codex-rs/agent/src/exec_command/mod.rs
diff --git a/codex-rs/codex-agent/src/exec_command/session_id.rs b/codex-rs/agent/src/exec_command/session_id.rs
similarity index 100%
rename from codex-rs/codex-agent/src/exec_command/session_id.rs
rename to codex-rs/agent/src/exec_command/session_id.rs
diff --git a/codex-rs/codex-agent/src/exec_command/session_manager.rs b/codex-rs/agent/src/exec_command/session_manager.rs
similarity index 100%
rename from codex-rs/codex-agent/src/exec_command/session_manager.rs
rename to codex-rs/agent/src/exec_command/session_manager.rs
diff --git a/codex-rs/codex-agent/src/function_tool.rs b/codex-rs/agent/src/function_tool.rs
similarity index 100%
rename from codex-rs/codex-agent/src/function_tool.rs
rename to codex-rs/agent/src/function_tool.rs
diff --git a/codex-rs/codex-agent/src/lib.rs b/codex-rs/agent/src/lib.rs
similarity index 100%
rename from codex-rs/codex-agent/src/lib.rs
rename to codex-rs/agent/src/lib.rs
diff --git a/codex-rs/codex-agent/src/model_family.rs b/codex-rs/agent/src/model_family.rs
similarity index 100%
rename from codex-rs/codex-agent/src/model_family.rs
rename to codex-rs/agent/src/model_family.rs
diff --git a/codex-rs/codex-agent/src/model_provider.rs b/codex-rs/agent/src/model_provider.rs
similarity index 100%
rename from codex-rs/codex-agent/src/model_provider.rs
rename to codex-rs/agent/src/model_provider.rs
diff --git a/codex-rs/codex-agent/src/notifications.rs b/codex-rs/agent/src/notifications.rs
similarity index 100%
rename from codex-rs/codex-agent/src/notifications.rs
rename to codex-rs/agent/src/notifications.rs
diff --git a/codex-rs/codex-agent/src/rollout/list.rs b/codex-rs/agent/src/rollout/list.rs
similarity index 100%
rename from codex-rs/codex-agent/src/rollout/list.rs
rename to codex-rs/agent/src/rollout/list.rs
diff --git a/codex-rs/codex-agent/src/rollout/mod.rs b/codex-rs/agent/src/rollout/mod.rs
similarity index 100%
rename from codex-rs/codex-agent/src/rollout/mod.rs
rename to codex-rs/agent/src/rollout/mod.rs
diff --git a/codex-rs/codex-agent/src/rollout/policy.rs b/codex-rs/agent/src/rollout/policy.rs
similarity index 100%
rename from codex-rs/codex-agent/src/rollout/policy.rs
rename to codex-rs/agent/src/rollout/policy.rs
diff --git a/codex-rs/codex-agent/src/rollout/recorder.rs b/codex-rs/agent/src/rollout/recorder.rs
similarity index 100%
rename from codex-rs/codex-agent/src/rollout/recorder.rs
rename to codex-rs/agent/src/rollout/recorder.rs
diff --git a/codex-rs/codex-agent/src/runtime.rs b/codex-rs/agent/src/runtime.rs
similarity index 100%
rename from codex-rs/codex-agent/src/runtime.rs
rename to codex-rs/agent/src/runtime.rs
diff --git a/codex-rs/codex-agent/src/runtime_config.rs b/codex-rs/agent/src/runtime_config.rs
similarity index 100%
rename from codex-rs/codex-agent/src/runtime_config.rs
rename to codex-rs/agent/src/runtime_config.rs
diff --git a/codex-rs/codex-agent/src/safety.rs b/codex-rs/agent/src/safety.rs
similarity index 100%
rename from codex-rs/codex-agent/src/safety.rs
rename to codex-rs/agent/src/safety.rs
diff --git a/codex-rs/codex-agent/src/sandbox/mod.rs b/codex-rs/agent/src/sandbox/mod.rs
similarity index 100%
rename from codex-rs/codex-agent/src/sandbox/mod.rs
rename to codex-rs/agent/src/sandbox/mod.rs
diff --git a/codex-rs/codex-agent/src/sandbox/types.rs b/codex-rs/agent/src/sandbox/types.rs
similarity index 100%
rename from codex-rs/codex-agent/src/sandbox/types.rs
rename to codex-rs/agent/src/sandbox/types.rs
diff --git a/codex-rs/codex-agent/src/services.rs b/codex-rs/agent/src/services.rs
similarity index 100%
rename from codex-rs/codex-agent/src/services.rs
rename to codex-rs/agent/src/services.rs
diff --git a/codex-rs/codex-agent/src/session_services.rs b/codex-rs/agent/src/session_services.rs
similarity index 100%
rename from codex-rs/codex-agent/src/session_services.rs
rename to codex-rs/agent/src/session_services.rs
diff --git a/codex-rs/codex-agent/src/session_state.rs b/codex-rs/agent/src/session_state.rs
similarity index 100%
rename from codex-rs/codex-agent/src/session_state.rs
rename to codex-rs/agent/src/session_state.rs
diff --git a/codex-rs/codex-agent/src/shell.rs b/codex-rs/agent/src/shell.rs
similarity index 100%
rename from codex-rs/codex-agent/src/shell.rs
rename to codex-rs/agent/src/shell.rs
diff --git a/codex-rs/codex-agent/src/token_data.rs b/codex-rs/agent/src/token_data.rs
similarity index 100%
rename from codex-rs/codex-agent/src/token_data.rs
rename to codex-rs/agent/src/token_data.rs
diff --git a/codex-rs/codex-agent/src/tooling.rs b/codex-rs/agent/src/tooling.rs
similarity index 100%
rename from codex-rs/codex-agent/src/tooling.rs
rename to codex-rs/agent/src/tooling.rs
diff --git a/codex-rs/codex-agent/src/truncate.rs b/codex-rs/agent/src/truncate.rs
similarity index 100%
rename from codex-rs/codex-agent/src/truncate.rs
rename to codex-rs/agent/src/truncate.rs
diff --git a/codex-rs/codex-agent/src/turn_diff_tracker.rs b/codex-rs/agent/src/turn_diff_tracker.rs
similarity index 100%
rename from codex-rs/codex-agent/src/turn_diff_tracker.rs
rename to codex-rs/agent/src/turn_diff_tracker.rs
diff --git a/codex-rs/codex-agent/src/unified_exec/errors.rs b/codex-rs/agent/src/unified_exec/errors.rs
similarity index 100%
rename from codex-rs/codex-agent/src/unified_exec/errors.rs
rename to codex-rs/agent/src/unified_exec/errors.rs
diff --git a/codex-rs/codex-agent/src/unified_exec/mod.rs b/codex-rs/agent/src/unified_exec/mod.rs
similarity index 100%
rename from codex-rs/codex-agent/src/unified_exec/mod.rs
rename to codex-rs/agent/src/unified_exec/mod.rs