From 6fc8a9308a628e5019426180a3c9f502687d4878 Mon Sep 17 00:00:00 2001 From: Josh McKinney Date: Wed, 5 Nov 2025 17:32:52 -0800 Subject: [PATCH] Run cargo +nightly fmt --- codex-rs/ansi-escape/src/lib.rs | 6 +- .../app-server-protocol/src/bin/export.rs | 3 +- codex-rs/app-server-protocol/src/export.rs | 53 ++-- .../app-server-protocol/src/jsonrpc_lite.rs | 3 +- codex-rs/app-server-protocol/src/lib.rs | 4 +- .../src/protocol/common.rs | 24 +- .../app-server-protocol/src/protocol/v1.rs | 16 +- .../app-server-protocol/src/protocol/v2.rs | 11 +- .../app-server/src/codex_message_processor.rs | 181 ++++--------- codex-rs/app-server/src/fuzzy_file_search.rs | 6 +- codex-rs/app-server/src/lib.rs | 31 +-- codex-rs/app-server/src/message_processor.rs | 28 +- codex-rs/app-server/src/models.rs | 7 +- codex-rs/app-server/src/outgoing_message.rs | 28 +- .../app-server/tests/common/auth_fixtures.rs | 13 +- codex-rs/app-server/tests/common/lib.rs | 19 +- .../app-server/tests/common/mcp_process.rs | 56 +--- .../tests/common/mock_model_server.rs | 11 +- codex-rs/app-server/tests/common/responses.rs | 3 +- codex-rs/app-server/tests/common/rollout.rs | 9 +- .../tests/suite/archive_conversation.rs | 18 +- codex-rs/app-server/tests/suite/auth.rs | 20 +- .../suite/codex_message_processor_flow.rs | 46 ++-- codex-rs/app-server/tests/suite/config.rs | 29 +-- .../tests/suite/create_conversation.rs | 25 +- .../tests/suite/fuzzy_file_search.rs | 6 +- codex-rs/app-server/tests/suite/interrupt.rs | 22 +- .../app-server/tests/suite/list_resume.rs | 21 +- codex-rs/app-server/tests/suite/login.rs | 22 +- codex-rs/app-server/tests/suite/model_list.rs | 17 +- .../app-server/tests/suite/rate_limits.rs | 27 +- .../app-server/tests/suite/send_message.rs | 29 +-- .../tests/suite/set_default_model.rs | 13 +- codex-rs/app-server/tests/suite/user_agent.rs | 7 +- codex-rs/app-server/tests/suite/user_info.rs | 12 +- codex-rs/app-server/tests/suite/v2/account.rs | 27 +- .../tests/suite/v2/thread_archive.rs | 19 +- .../app-server/tests/suite/v2/thread_list.rs | 9 +- .../tests/suite/v2/thread_resume.rs | 14 +- .../app-server/tests/suite/v2/thread_start.rs | 17 +- codex-rs/apply-patch/src/lib.rs | 29 +-- codex-rs/apply-patch/src/parser.rs | 6 +- codex-rs/apply-patch/src/seek_sequence.rs | 3 +- .../apply-patch/src/standalone_executable.rs | 3 +- codex-rs/apply-patch/tests/suite/cli.rs | 3 +- codex-rs/apply-patch/tests/suite/tool.rs | 5 +- codex-rs/arg0/src/lib.rs | 7 +- codex-rs/async-utils/src/lib.rs | 9 +- codex-rs/backend-client/src/client.rs | 22 +- codex-rs/backend-client/src/lib.rs | 9 +- codex-rs/backend-client/src/types.rs | 15 +- codex-rs/chatgpt/src/apply_command.rs | 8 +- codex-rs/chatgpt/src/chatgpt_client.rs | 8 +- codex-rs/chatgpt/src/chatgpt_token.rs | 5 +- .../chatgpt/tests/suite/apply_command_e2e.rs | 3 +- codex-rs/cli/src/debug_sandbox.rs | 7 +- codex-rs/cli/src/login.rs | 18 +- codex-rs/cli/src/main.rs | 38 ++- codex-rs/cli/src/mcp_cmd.rs | 17 +- codex-rs/cli/tests/mcp_list.rs | 3 +- codex-rs/cloud-tasks-client/src/api.rs | 6 +- codex-rs/cloud-tasks-client/src/http.rs | 28 +- codex-rs/cloud-tasks-client/src/lib.rs | 22 +- codex-rs/cloud-tasks-client/src/mock.rs | 16 +- codex-rs/cloud-tasks/src/app.rs | 11 +- codex-rs/cloud-tasks/src/cli.rs | 3 +- codex-rs/cloud-tasks/src/env_detect.rs | 7 +- codex-rs/cloud-tasks/src/lib.rs | 48 ++-- codex-rs/cloud-tasks/src/scrollable_diff.rs | 3 +- codex-rs/cloud-tasks/src/ui.rs | 37 +-- codex-rs/cloud-tasks/src/util.rs | 5 +- codex-rs/cloud-tasks/tests/env_filter.rs | 3 +- .../src/models/code_task_details_response.rs | 4 +- .../models/external_pull_request_response.rs | 4 +- .../src/models/git_pull_request.rs | 3 +- .../src/models/mod.rs | 3 +- .../models/paginated_list_task_list_item_.rs | 4 +- .../src/models/rate_limit_status_details.rs | 4 +- .../src/models/rate_limit_status_payload.rs | 4 +- .../src/models/rate_limit_window_snapshot.rs | 3 +- .../src/models/task_list_item.rs | 4 +- .../src/models/task_response.rs | 4 +- codex-rs/common/src/approval_mode_cli_arg.rs | 1 - codex-rs/common/src/approval_presets.rs | 3 +- codex-rs/common/src/config_override.rs | 3 +- codex-rs/common/src/elapsed.rs | 3 +- codex-rs/core/src/apply_patch.rs | 20 +- codex-rs/core/src/auth.rs | 49 ++-- codex-rs/core/src/auth/storage.rs | 30 +-- codex-rs/core/src/bash.rs | 4 +- codex-rs/core/src/chat_completions.rs | 51 ++-- codex-rs/core/src/client.rs | 61 ++--- codex-rs/core/src/client_common.rs | 38 +-- codex-rs/core/src/codex.rs | 241 ++++++------------ codex-rs/core/src/codex/compact.rs | 34 +-- codex-rs/core/src/codex_conversation.rs | 7 +- codex-rs/core/src/codex_delegate.rs | 22 +- .../src/command_safety/is_safe_command.rs | 3 +- .../command_safety/windows_safe_commands.rs | 3 +- codex-rs/core/src/config/edit.rs | 32 +-- codex-rs/core/src/config/mod.rs | 95 +++---- codex-rs/core/src/config/profile.rs | 8 +- codex-rs/core/src/config/types.rs | 14 +- codex-rs/core/src/config_loader/macos.rs | 10 +- codex-rs/core/src/config_loader/mod.rs | 12 +- codex-rs/core/src/context_manager/history.rs | 12 +- .../core/src/context_manager/history_tests.rs | 17 +- .../core/src/context_manager/normalize.rs | 3 +- codex-rs/core/src/context_manager/truncate.rs | 3 +- codex-rs/core/src/conversation_manager.rs | 41 ++- codex-rs/core/src/custom_prompts.rs | 10 +- codex-rs/core/src/default_client.rs | 29 +-- codex-rs/core/src/environment_context.rs | 22 +- codex-rs/core/src/error.rs | 30 +-- codex-rs/core/src/event_mapping.rs | 32 +-- codex-rs/core/src/exec.rs | 40 ++- codex-rs/core/src/exec_env.rs | 13 +- codex-rs/core/src/features.rs | 7 +- codex-rs/core/src/features/legacy.rs | 4 +- codex-rs/core/src/git_info.rs | 19 +- codex-rs/core/src/landlock.rs | 10 +- codex-rs/core/src/lib.rs | 61 ++--- codex-rs/core/src/mcp/auth.rs | 6 +- codex-rs/core/src/mcp_connection_manager.rs | 42 ++- codex-rs/core/src/mcp_tool_call.rs | 11 +- codex-rs/core/src/message_history.rs | 26 +- codex-rs/core/src/model_provider_info.rs | 14 +- codex-rs/core/src/otel_init.rs | 15 +- codex-rs/core/src/parse_command.rs | 13 +- codex-rs/core/src/project_doc.rs | 13 +- codex-rs/core/src/response_processing.rs | 8 +- codex-rs/core/src/rollout/list.rs | 16 +- codex-rs/core/src/rollout/mod.rs | 3 +- codex-rs/core/src/rollout/policy.rs | 4 +- codex-rs/core/src/rollout/recorder.rs | 31 +-- codex-rs/core/src/rollout/tests.rs | 35 +-- codex-rs/core/src/safety.rs | 21 +- codex-rs/core/src/sandboxing/assessment.rs | 25 +- codex-rs/core/src/sandboxing/mod.rs | 17 +- codex-rs/core/src/seatbelt.rs | 20 +- codex-rs/core/src/shell.rs | 19 +- codex-rs/core/src/spawn.rs | 4 +- codex-rs/core/src/state/mod.rs | 4 +- codex-rs/core/src/state/service.rs | 8 +- codex-rs/core/src/state/session.rs | 4 +- codex-rs/core/src/state/turn.rs | 10 +- codex-rs/core/src/tasks/compact.rs | 9 +- codex-rs/core/src/tasks/ghost_snapshot.rs | 21 +- codex-rs/core/src/tasks/mod.rs | 28 +- codex-rs/core/src/tasks/regular.rs | 9 +- codex-rs/core/src/tasks/review.rs | 23 +- codex-rs/core/src/tasks/undo.rs | 16 +- codex-rs/core/src/tasks/user_shell.rs | 10 +- codex-rs/core/src/token_data.rs | 6 +- codex-rs/core/src/tools/context.rs | 32 +-- codex-rs/core/src/tools/events.rs | 30 +-- .../core/src/tools/handlers/apply_patch.rs | 36 +-- .../core/src/tools/handlers/grep_files.rs | 11 +- codex-rs/core/src/tools/handlers/list_dir.rs | 13 +- codex-rs/core/src/tools/handlers/mcp.rs | 7 +- .../core/src/tools/handlers/mcp_resource.rs | 43 +--- codex-rs/core/src/tools/handlers/mod.rs | 4 +- codex-rs/core/src/tools/handlers/plan.rs | 23 +- codex-rs/core/src/tools/handlers/read_file.rs | 36 ++- codex-rs/core/src/tools/handlers/shell.rs | 24 +- codex-rs/core/src/tools/handlers/test_sync.rs | 10 +- .../core/src/tools/handlers/unified_exec.rs | 27 +- .../core/src/tools/handlers/view_image.rs | 12 +- codex-rs/core/src/tools/mod.rs | 5 +- codex-rs/core/src/tools/orchestrator.rs | 17 +- codex-rs/core/src/tools/parallel.rs | 14 +- codex-rs/core/src/tools/registry.rs | 4 +- codex-rs/core/src/tools/router.rs | 21 +- .../core/src/tools/runtimes/apply_patch.rs | 29 +-- codex-rs/core/src/tools/runtimes/mod.rs | 5 +- codex-rs/core/src/tools/runtimes/shell.rs | 24 +- .../core/src/tools/runtimes/unified_exec.rs | 30 +-- codex-rs/core/src/tools/sandboxing.rs | 21 +- codex-rs/core/src/tools/spec.rs | 49 ++-- codex-rs/core/src/truncate.rs | 3 +- codex-rs/core/src/turn_diff_tracker.rs | 10 +- codex-rs/core/src/unified_exec/errors.rs | 3 +- codex-rs/core/src/unified_exec/mod.rs | 21 +- codex-rs/core/src/unified_exec/session.rs | 16 +- .../core/src/unified_exec/session_manager.rs | 39 +-- codex-rs/core/src/user_instructions.rs | 7 +- codex-rs/core/src/user_notification.rs | 6 +- codex-rs/core/src/util.rs | 3 +- .../core/tests/chat_completions_payload.rs | 20 +- codex-rs/core/tests/chat_completions_sse.rs | 21 +- codex-rs/core/tests/common/lib.rs | 28 +- codex-rs/core/tests/common/responses.rs | 17 +- codex-rs/core/tests/common/test_codex.rs | 20 +- codex-rs/core/tests/common/test_codex_exec.rs | 3 +- codex-rs/core/tests/responses_headers.rs | 13 +- codex-rs/core/tests/suite/abort_tasks.rs | 16 +- codex-rs/core/tests/suite/apply_patch_cli.rs | 24 +- .../core/tests/suite/apply_patch_freeform.rs | 23 +- codex-rs/core/tests/suite/approvals.rs | 47 ++-- codex-rs/core/tests/suite/auth_refresh.rs | 29 +-- codex-rs/core/tests/suite/cli_stream.rs | 13 +- codex-rs/core/tests/suite/client.rs | 71 ++---- codex-rs/core/tests/suite/codex_delegate.rs | 27 +- codex-rs/core/tests/suite/compact.rs | 39 +-- .../core/tests/suite/compact_resume_fork.rs | 41 ++- .../core/tests/suite/deprecation_notice.rs | 9 +- codex-rs/core/tests/suite/exec.rs | 11 +- .../core/tests/suite/fork_conversation.rs | 26 +- codex-rs/core/tests/suite/grep_files.rs | 33 +-- codex-rs/core/tests/suite/items.rs | 31 +-- codex-rs/core/tests/suite/json_result.rs | 17 +- codex-rs/core/tests/suite/list_dir.rs | 22 +- codex-rs/core/tests/suite/live_cli.rs | 7 +- codex-rs/core/tests/suite/model_overrides.rs | 9 +- codex-rs/core/tests/suite/model_tools.rs | 17 +- codex-rs/core/tests/suite/otel.rs | 28 +- codex-rs/core/tests/suite/prompt_caching.rs | 33 +-- codex-rs/core/tests/suite/read_file.rs | 22 +- codex-rs/core/tests/suite/resume.rs | 24 +- codex-rs/core/tests/suite/review.rs | 50 ++-- codex-rs/core/tests/suite/rmcp_client.rs | 39 +-- .../core/tests/suite/rollout_list_find.rs | 3 +- codex-rs/core/tests/suite/seatbelt.rs | 6 +- .../core/tests/suite/shell_serialization.rs | 33 +-- .../suite/stream_error_allows_next_turn.rs | 23 +- .../core/tests/suite/stream_no_completed.rs | 28 +- codex-rs/core/tests/suite/tool_harness.rs | 28 +- codex-rs/core/tests/suite/tool_parallelism.rs | 24 +- codex-rs/core/tests/suite/tools.rs | 31 +-- codex-rs/core/tests/suite/truncation.rs | 46 ++-- codex-rs/core/tests/suite/undo.rs | 21 +- codex-rs/core/tests/suite/unified_exec.rs | 31 +-- .../core/tests/suite/user_notification.rs | 22 +- codex-rs/core/tests/suite/user_shell_cmd.rs | 15 +- codex-rs/core/tests/suite/view_image.rs | 27 +- codex-rs/exec/src/cli.rs | 6 +- codex-rs/exec/src/event_processor.rs | 3 +- .../src/event_processor_with_human_output.rs | 49 ++-- .../src/event_processor_with_jsonl_output.rs | 68 ++--- codex-rs/exec/src/exec_events.rs | 3 +- codex-rs/exec/src/lib.rs | 33 +-- codex-rs/exec/src/main.rs | 3 +- .../tests/event_processor_with_json_output.rs | 71 ++---- codex-rs/exec/tests/suite/apply_patch.rs | 15 +- codex-rs/exec/tests/suite/auth_env.rs | 5 +- codex-rs/exec/tests/suite/resume.rs | 5 +- codex-rs/exec/tests/suite/sandbox.rs | 8 +- codex-rs/execpolicy/src/arg_matcher.rs | 15 +- codex-rs/execpolicy/src/arg_resolver.rs | 6 +- codex-rs/execpolicy/src/arg_type.rs | 9 +- codex-rs/execpolicy/src/error.rs | 3 +- codex-rs/execpolicy/src/execv_checker.rs | 25 +- codex-rs/execpolicy/src/lib.rs | 16 +- codex-rs/execpolicy/src/main.rs | 21 +- codex-rs/execpolicy/src/opt.rs | 15 +- codex-rs/execpolicy/src/policy.rs | 12 +- codex-rs/execpolicy/src/policy_parser.rs | 21 +- codex-rs/execpolicy/src/program.rs | 22 +- codex-rs/execpolicy/src/sed_command.rs | 3 +- codex-rs/execpolicy/src/valid_exec.rs | 3 +- codex-rs/execpolicy/tests/suite/bad.rs | 3 +- codex-rs/execpolicy/tests/suite/cp.rs | 14 +- codex-rs/execpolicy/tests/suite/good.rs | 3 +- codex-rs/execpolicy/tests/suite/head.rs | 15 +- codex-rs/execpolicy/tests/suite/literal.rs | 11 +- codex-rs/execpolicy/tests/suite/ls.rs | 14 +- .../tests/suite/parse_sed_command.rs | 3 +- codex-rs/execpolicy/tests/suite/pwd.rs | 11 +- codex-rs/execpolicy/tests/suite/sed.rs | 15 +- codex-rs/feedback/src/lib.rs | 23 +- codex-rs/file-search/src/cli.rs | 3 +- codex-rs/file-search/src/lib.rs | 19 +- codex-rs/file-search/src/main.rs | 5 +- codex-rs/keyring-store/src/lib.rs | 15 +- codex-rs/linux-sandbox/src/landlock.rs | 32 +-- codex-rs/linux-sandbox/src/linux_run_main.rs | 3 +- .../linux-sandbox/tests/suite/landlock.rs | 14 +- codex-rs/login/src/device_code_auth.rs | 17 +- codex-rs/login/src/lib.rs | 22 +- codex-rs/login/src/pkce.rs | 3 +- codex-rs/login/src/server.rs | 30 +-- .../login/tests/suite/device_code_login.rs | 25 +- .../login/tests/suite/login_server_e2e.rs | 9 +- codex-rs/mcp-server/src/codex_tool_config.rs | 14 +- codex-rs/mcp-server/src/codex_tool_runner.rs | 29 +-- codex-rs/mcp-server/src/exec_approval.rs | 16 +- codex-rs/mcp-server/src/lib.rs | 31 +-- codex-rs/mcp-server/src/message_processor.rs | 47 ++-- codex-rs/mcp-server/src/outgoing_message.rs | 23 +- codex-rs/mcp-server/src/patch_approval.rs | 16 +- codex-rs/mcp-server/tests/common/lib.rs | 7 +- .../mcp-server/tests/common/mcp_process.rs | 33 +-- .../tests/common/mock_model_server.rs | 11 +- codex-rs/mcp-server/tests/common/responses.rs | 3 +- codex-rs/mcp-server/tests/suite/codex_tool.rs | 38 ++- codex-rs/mcp-types/src/lib.rs | 5 +- codex-rs/mcp-types/tests/suite/initialize.rs | 12 +- .../tests/suite/progress_notification.rs | 5 +- codex-rs/ollama/src/client.rs | 21 +- codex-rs/ollama/src/lib.rs | 5 +- codex-rs/otel/src/otel_event_manager.rs | 31 +-- codex-rs/otel/src/otel_provider.rs | 20 +- codex-rs/protocol-ts/src/lib.rs | 21 +- codex-rs/protocol-ts/src/main.rs | 3 +- codex-rs/protocol/src/account.rs | 3 +- codex-rs/protocol/src/approvals.rs | 8 +- codex-rs/protocol/src/config_types.rs | 6 +- codex-rs/protocol/src/conversation_id.rs | 3 +- codex-rs/protocol/src/custom_prompts.rs | 6 +- codex-rs/protocol/src/items.rs | 16 +- codex-rs/protocol/src/message_history.rs | 3 +- codex-rs/protocol/src/models.rs | 19 +- codex-rs/protocol/src/parse_command.rs | 6 +- codex-rs/protocol/src/plan_tool.rs | 3 +- codex-rs/protocol/src/protocol.rs | 52 ++-- codex-rs/protocol/src/user_input.rs | 3 +- codex-rs/responses-api-proxy/src/lib.rs | 28 +- .../responses-api-proxy/src/read_api_key.rs | 15 +- codex-rs/rmcp-client/src/auth_status.rs | 10 +- .../rmcp-client/src/bin/rmcp_test_server.rs | 15 +- .../rmcp-client/src/bin/test_stdio_server.rs | 26 +- .../src/bin/test_streamable_http_server.rs | 35 +-- codex-rs/rmcp-client/src/find_codex_home.rs | 3 +- codex-rs/rmcp-client/src/lib.rs | 12 +- .../rmcp-client/src/logging_client_handler.rs | 25 +- codex-rs/rmcp-client/src/oauth.rs | 44 ++-- .../rmcp-client/src/perform_oauth_login.rs | 17 +- codex-rs/rmcp-client/src/rmcp_client.rs | 58 ++--- codex-rs/rmcp-client/src/utils.rs | 15 +- codex-rs/rmcp-client/tests/resources.rs | 14 +- codex-rs/stdio-to-uds/src/lib.rs | 10 +- codex-rs/stdio-to-uds/src/main.rs | 3 +- codex-rs/stdio-to-uds/tests/stdio_to_uds.rs | 10 +- codex-rs/tui/src/additional_dirs.rs | 9 +- codex-rs/tui/src/app.rs | 77 +++--- codex-rs/tui/src/app_backtrack.rs | 25 +- codex-rs/tui/src/app_event.rs | 8 +- codex-rs/tui/src/ascii_animation.rs | 6 +- codex-rs/tui/src/bin/md-events.rs | 5 +- .../tui/src/bottom_pane/approval_overlay.rs | 52 ++-- .../tui/src/bottom_pane/bottom_pane_view.rs | 4 +- codex-rs/tui/src/bottom_pane/chat_composer.rs | 201 +++++---------- .../src/bottom_pane/chat_composer_history.rs | 8 +- codex-rs/tui/src/bottom_pane/command_popup.rs | 20 +- .../tui/src/bottom_pane/custom_prompt_view.rs | 24 +- codex-rs/tui/src/bottom_pane/feedback_view.rs | 25 +- .../tui/src/bottom_pane/file_search_popup.rs | 7 +- codex-rs/tui/src/bottom_pane/footer.rs | 18 +- .../src/bottom_pane/list_selection_view.rs | 39 +-- codex-rs/tui/src/bottom_pane/mod.rs | 39 ++- codex-rs/tui/src/bottom_pane/paste_burst.rs | 3 +- codex-rs/tui/src/bottom_pane/prompt_args.rs | 7 +- .../src/bottom_pane/queued_user_messages.rs | 6 +- .../src/bottom_pane/selection_popup_common.rs | 12 +- codex-rs/tui/src/bottom_pane/textarea.rs | 19 +- codex-rs/tui/src/chatwidget.rs | 117 +++------ codex-rs/tui/src/chatwidget/agent.rs | 7 +- codex-rs/tui/src/chatwidget/interrupts.rs | 11 +- codex-rs/tui/src/chatwidget/tests.rs | 79 ++---- codex-rs/tui/src/cli.rs | 7 +- codex-rs/tui/src/clipboard_paste.rs | 4 +- codex-rs/tui/src/custom_terminal.rs | 22 +- codex-rs/tui/src/diff_render.rs | 29 +-- codex-rs/tui/src/exec_cell/mod.rs | 11 +- codex-rs/tui/src/exec_cell/model.rs | 3 +- codex-rs/tui/src/exec_cell/render.rs | 23 +- codex-rs/tui/src/exec_command.rs | 3 +- codex-rs/tui/src/file_search.rs | 9 +- codex-rs/tui/src/get_git_diff.rs | 1 + codex-rs/tui/src/history_cell.rs | 108 +++----- codex-rs/tui/src/insert_history.rs | 33 +-- codex-rs/tui/src/key_hint.rs | 8 +- codex-rs/tui/src/lib.rs | 41 ++- codex-rs/tui/src/live_wrap.rs | 6 +- codex-rs/tui/src/main.rs | 3 +- codex-rs/tui/src/markdown.rs | 3 +- codex-rs/tui/src/markdown_render.rs | 23 +- codex-rs/tui/src/markdown_stream.rs | 3 +- codex-rs/tui/src/onboarding/auth.rs | 59 ++--- .../tui/src/onboarding/onboarding_screen.rs | 28 +- .../tui/src/onboarding/trust_directory.rs | 33 +-- codex-rs/tui/src/onboarding/welcome.rs | 21 +- codex-rs/tui/src/onboarding/windows.rs | 18 +- codex-rs/tui/src/pager_overlay.rs | 46 ++-- .../tui/src/public_widgets/composer_input.rs | 6 +- codex-rs/tui/src/render/highlight.rs | 15 +- codex-rs/tui/src/render/line_utils.rs | 3 +- codex-rs/tui/src/render/renderable.rs | 9 +- codex-rs/tui/src/resume_picker.rs | 52 ++-- codex-rs/tui/src/selection_list.rs | 11 +- codex-rs/tui/src/session_log.rs | 7 +- codex-rs/tui/src/shimmer.rs | 10 +- codex-rs/tui/src/slash_command.rs | 5 +- codex-rs/tui/src/status/card.rs | 53 ++-- codex-rs/tui/src/status/format.rs | 6 +- codex-rs/tui/src/status/helpers.rs | 10 +- codex-rs/tui/src/status/mod.rs | 3 +- codex-rs/tui/src/status/rate_limits.rs | 10 +- codex-rs/tui/src/status/tests.rs | 25 +- codex-rs/tui/src/status_indicator_widget.rs | 17 +- codex-rs/tui/src/streaming/controller.rs | 5 +- codex-rs/tui/src/style.rs | 10 +- codex-rs/tui/src/terminal_palette.rs | 14 +- codex-rs/tui/src/test_backend.rs | 15 +- codex-rs/tui/src/text_formatting.rs | 6 +- codex-rs/tui/src/tui.rs | 46 ++-- codex-rs/tui/src/update_prompt.rs | 35 +-- codex-rs/tui/src/updates.rs | 10 +- codex-rs/tui/src/wrapping.rs | 13 +- codex-rs/tui/tests/suite/vt100_history.rs | 3 +- codex-rs/tui/tests/suite/vt100_live_commit.rs | 3 +- codex-rs/utils/cache/src/lib.rs | 9 +- codex-rs/utils/git/src/apply.rs | 14 +- codex-rs/utils/git/src/ghost_commits.rs | 31 +-- codex-rs/utils/git/src/lib.rs | 20 +- codex-rs/utils/git/src/operations.rs | 7 +- codex-rs/utils/git/src/platform.rs | 4 +- codex-rs/utils/image/src/error.rs | 3 +- codex-rs/utils/image/src/lib.rs | 19 +- codex-rs/utils/json-to-toml/src/lib.rs | 3 +- codex-rs/utils/pty/src/lib.rs | 12 +- codex-rs/utils/readiness/src/lib.rs | 14 +- codex-rs/utils/tokenizer/src/lib.rs | 6 +- codex-rs/windows-sandbox-rs/src/lib.rs | 78 +++--- 424 files changed, 3097 insertions(+), 5253 deletions(-) diff --git a/codex-rs/ansi-escape/src/lib.rs b/codex-rs/ansi-escape/src/lib.rs index b47cf14f8e..f04ed47403 100644 --- a/codex-rs/ansi-escape/src/lib.rs +++ b/codex-rs/ansi-escape/src/lib.rs @@ -1,7 +1,5 @@ -use ansi_to_tui::Error; -use ansi_to_tui::IntoText; -use ratatui::text::Line; -use ratatui::text::Text; +use ansi_to_tui::{Error, IntoText}; +use ratatui::text::{Line, Text}; // Expand tabs in a best-effort way for transcript rendering. // Tabs can interact poorly with left-gutter prefixes in our TUI and CLI diff --git a/codex-rs/app-server-protocol/src/bin/export.rs b/codex-rs/app-server-protocol/src/bin/export.rs index d029ecbffa..82b3e2b345 100644 --- a/codex-rs/app-server-protocol/src/bin/export.rs +++ b/codex-rs/app-server-protocol/src/bin/export.rs @@ -1,6 +1,7 @@ +use std::path::PathBuf; + use anyhow::Result; use clap::Parser; -use std::path::PathBuf; #[derive(Parser, Debug)] #[command( diff --git a/codex-rs/app-server-protocol/src/export.rs b/codex-rs/app-server-protocol/src/export.rs index c5038a00d3..a36166ede6 100644 --- a/codex-rs/app-server-protocol/src/export.rs +++ b/codex-rs/app-server-protocol/src/export.rs @@ -1,38 +1,25 @@ -use crate::ClientNotification; -use crate::ClientRequest; -use crate::ServerNotification; -use crate::ServerRequest; -use crate::export_client_notification_schemas; -use crate::export_client_param_schemas; -use crate::export_client_response_schemas; -use crate::export_client_responses; -use crate::export_server_notification_schemas; -use crate::export_server_param_schemas; -use crate::export_server_response_schemas; -use crate::export_server_responses; -use anyhow::Context; -use anyhow::Result; -use anyhow::anyhow; -use codex_protocol::parse_command::ParsedCommand; -use codex_protocol::protocol::EventMsg; -use codex_protocol::protocol::FileChange; -use codex_protocol::protocol::SandboxPolicy; -use schemars::JsonSchema; -use schemars::schema_for; -use serde::Serialize; -use serde_json::Map; -use serde_json::Value; -use std::collections::HashMap; -use std::collections::HashSet; +use std::collections::{HashMap, HashSet}; use std::ffi::OsStr; use std::fs; -use std::io::Read; -use std::io::Write; -use std::path::Path; -use std::path::PathBuf; +use std::io::{Read, Write}; +use std::path::{Path, PathBuf}; use std::process::Command; + +use anyhow::{Context, Result, anyhow}; +use codex_protocol::parse_command::ParsedCommand; +use codex_protocol::protocol::{EventMsg, FileChange, SandboxPolicy}; +use schemars::{JsonSchema, schema_for}; +use serde::Serialize; +use serde_json::{Map, Value}; use ts_rs::TS; +use crate::{ + ClientNotification, ClientRequest, ServerNotification, ServerRequest, + export_client_notification_schemas, export_client_param_schemas, + export_client_response_schemas, export_client_responses, export_server_notification_schemas, + export_server_param_schemas, export_server_response_schemas, export_server_responses, +}; + const HEADER: &str = "// GENERATED CODE! DO NOT MODIFY BY HAND!\n\n"; #[derive(Clone)] @@ -707,13 +694,15 @@ fn generate_index_ts(out_dir: &Path) -> Result { #[cfg(test)] mod tests { - use super::*; - use anyhow::Result; use std::collections::BTreeSet; use std::fs; use std::path::PathBuf; + + use anyhow::Result; use uuid::Uuid; + use super::*; + #[test] fn generated_ts_has_no_optional_nullable_fields() -> Result<()> { // Assert that there are no types of the form "?: T | null" in the generated TS files. diff --git a/codex-rs/app-server-protocol/src/jsonrpc_lite.rs b/codex-rs/app-server-protocol/src/jsonrpc_lite.rs index 65ffa2a005..e5a3f5ae76 100644 --- a/codex-rs/app-server-protocol/src/jsonrpc_lite.rs +++ b/codex-rs/app-server-protocol/src/jsonrpc_lite.rs @@ -2,8 +2,7 @@ //! "jsonrpc": "2.0" field. use schemars::JsonSchema; -use serde::Deserialize; -use serde::Serialize; +use serde::{Deserialize, Serialize}; use ts_rs::TS; pub const JSONRPC_VERSION: &str = "2.0"; diff --git a/codex-rs/app-server-protocol/src/lib.rs b/codex-rs/app-server-protocol/src/lib.rs index 9c02ea9246..f135449fc3 100644 --- a/codex-rs/app-server-protocol/src/lib.rs +++ b/codex-rs/app-server-protocol/src/lib.rs @@ -2,9 +2,7 @@ mod export; mod jsonrpc_lite; mod protocol; -pub use export::generate_json; -pub use export::generate_ts; -pub use export::generate_types; +pub use export::{generate_json, generate_ts, generate_types}; pub use jsonrpc_lite::*; pub use protocol::common::*; pub use protocol::v1::*; diff --git a/codex-rs/app-server-protocol/src/protocol/common.rs b/codex-rs/app-server-protocol/src/protocol/common.rs index 8ece9bbc38..5c14d7a680 100644 --- a/codex-rs/app-server-protocol/src/protocol/common.rs +++ b/codex-rs/app-server-protocol/src/protocol/common.rs @@ -1,26 +1,19 @@ use std::collections::HashMap; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; -use crate::JSONRPCNotification; -use crate::JSONRPCRequest; -use crate::RequestId; -use crate::export::GeneratedSchema; -use crate::export::write_json_schema; -use crate::protocol::v1; -use crate::protocol::v2; use codex_protocol::ConversationId; use codex_protocol::parse_command::ParsedCommand; -use codex_protocol::protocol::FileChange; -use codex_protocol::protocol::ReviewDecision; -use codex_protocol::protocol::SandboxCommandAssessment; +use codex_protocol::protocol::{FileChange, ReviewDecision, SandboxCommandAssessment}; use paste::paste; use schemars::JsonSchema; -use serde::Deserialize; -use serde::Serialize; +use serde::{Deserialize, Serialize}; use strum_macros::Display; use ts_rs::TS; +use crate::export::{GeneratedSchema, write_json_schema}; +use crate::protocol::{v1, v2}; +use crate::{JSONRPCNotification, JSONRPCRequest, RequestId}; + #[derive(Serialize, Deserialize, Clone, Debug, PartialEq, JsonSchema, TS)] #[ts(type = "string")] pub struct GitSha(pub String); @@ -541,13 +534,14 @@ client_notification_definitions! { #[cfg(test)] mod tests { - use super::*; use anyhow::Result; use codex_protocol::account::PlanType; use codex_protocol::protocol::AskForApproval; use pretty_assertions::assert_eq; use serde_json::json; + use super::*; + #[test] fn serialize_new_conversation() -> Result<()> { let request = ClientRequest::NewConversation { diff --git a/codex-rs/app-server-protocol/src/protocol/v1.rs b/codex-rs/app-server-protocol/src/protocol/v1.rs index ea77e09a70..70339743f4 100644 --- a/codex-rs/app-server-protocol/src/protocol/v1.rs +++ b/codex-rs/app-server-protocol/src/protocol/v1.rs @@ -2,19 +2,13 @@ use std::collections::HashMap; use std::path::PathBuf; use codex_protocol::ConversationId; -use codex_protocol::config_types::ForcedLoginMethod; -use codex_protocol::config_types::ReasoningEffort; -use codex_protocol::config_types::ReasoningSummary; -use codex_protocol::config_types::SandboxMode; -use codex_protocol::config_types::Verbosity; +use codex_protocol::config_types::{ + ForcedLoginMethod, ReasoningEffort, ReasoningSummary, SandboxMode, Verbosity, +}; use codex_protocol::models::ResponseItem; -use codex_protocol::protocol::AskForApproval; -use codex_protocol::protocol::EventMsg; -use codex_protocol::protocol::SandboxPolicy; -use codex_protocol::protocol::TurnAbortReason; +use codex_protocol::protocol::{AskForApproval, EventMsg, SandboxPolicy, TurnAbortReason}; use schemars::JsonSchema; -use serde::Deserialize; -use serde::Serialize; +use serde::{Deserialize, Serialize}; use ts_rs::TS; use uuid::Uuid; diff --git a/codex-rs/app-server-protocol/src/protocol/v2.rs b/codex-rs/app-server-protocol/src/protocol/v2.rs index ccc5572356..86f86b39d7 100644 --- a/codex-rs/app-server-protocol/src/protocol/v2.rs +++ b/codex-rs/app-server-protocol/src/protocol/v2.rs @@ -1,19 +1,20 @@ use std::collections::HashMap; use std::path::PathBuf; -use crate::protocol::common::AuthMode; use codex_protocol::ConversationId; use codex_protocol::account::PlanType; use codex_protocol::config_types::ReasoningEffort; -use codex_protocol::protocol::RateLimitSnapshot as CoreRateLimitSnapshot; -use codex_protocol::protocol::RateLimitWindow as CoreRateLimitWindow; +use codex_protocol::protocol::{ + RateLimitSnapshot as CoreRateLimitSnapshot, RateLimitWindow as CoreRateLimitWindow, +}; use mcp_types::ContentBlock as McpContentBlock; use schemars::JsonSchema; -use serde::Deserialize; -use serde::Serialize; +use serde::{Deserialize, Serialize}; use serde_json::Value as JsonValue; use ts_rs::TS; +use crate::protocol::common::AuthMode; + // Macro to declare a camelCased API v2 enum mirroring a core enum which // tends to use kebab-case. macro_rules! v2_enum_from_core { diff --git a/codex-rs/app-server/src/codex_message_processor.rs b/codex-rs/app-server/src/codex_message_processor.rs index ec96d5dc27..6b315ea612 100644 --- a/codex-rs/app-server/src/codex_message_processor.rs +++ b/codex-rs/app-server/src/codex_message_processor.rs @@ -1,141 +1,72 @@ -use crate::error_code::INTERNAL_ERROR_CODE; -use crate::error_code::INVALID_REQUEST_ERROR_CODE; -use crate::fuzzy_file_search::run_fuzzy_file_search; -use crate::models::supported_models; -use crate::outgoing_message::OutgoingMessageSender; -use crate::outgoing_message::OutgoingNotification; -use codex_app_server_protocol::AccountLoginCompletedNotification; -use codex_app_server_protocol::AccountRateLimitsUpdatedNotification; -use codex_app_server_protocol::AccountUpdatedNotification; -use codex_app_server_protocol::AddConversationListenerParams; -use codex_app_server_protocol::AddConversationSubscriptionResponse; -use codex_app_server_protocol::ApplyPatchApprovalParams; -use codex_app_server_protocol::ApplyPatchApprovalResponse; -use codex_app_server_protocol::ArchiveConversationParams; -use codex_app_server_protocol::ArchiveConversationResponse; -use codex_app_server_protocol::AuthMode; -use codex_app_server_protocol::AuthStatusChangeNotification; -use codex_app_server_protocol::CancelLoginAccountParams; -use codex_app_server_protocol::CancelLoginAccountResponse; -use codex_app_server_protocol::CancelLoginChatGptResponse; -use codex_app_server_protocol::ClientRequest; -use codex_app_server_protocol::ConversationSummary; -use codex_app_server_protocol::ExecCommandApprovalParams; -use codex_app_server_protocol::ExecCommandApprovalResponse; -use codex_app_server_protocol::ExecOneOffCommandParams; -use codex_app_server_protocol::ExecOneOffCommandResponse; -use codex_app_server_protocol::FeedbackUploadParams; -use codex_app_server_protocol::FeedbackUploadResponse; -use codex_app_server_protocol::FuzzyFileSearchParams; -use codex_app_server_protocol::FuzzyFileSearchResponse; -use codex_app_server_protocol::GetAccountRateLimitsResponse; -use codex_app_server_protocol::GetConversationSummaryParams; -use codex_app_server_protocol::GetConversationSummaryResponse; -use codex_app_server_protocol::GetUserAgentResponse; -use codex_app_server_protocol::GetUserSavedConfigResponse; -use codex_app_server_protocol::GitDiffToRemoteResponse; -use codex_app_server_protocol::InputItem as WireInputItem; -use codex_app_server_protocol::InterruptConversationParams; -use codex_app_server_protocol::InterruptConversationResponse; -use codex_app_server_protocol::JSONRPCErrorError; -use codex_app_server_protocol::ListConversationsParams; -use codex_app_server_protocol::ListConversationsResponse; -use codex_app_server_protocol::LoginAccountParams; -use codex_app_server_protocol::LoginApiKeyParams; -use codex_app_server_protocol::LoginApiKeyResponse; -use codex_app_server_protocol::LoginChatGptCompleteNotification; -use codex_app_server_protocol::LoginChatGptResponse; -use codex_app_server_protocol::ModelListParams; -use codex_app_server_protocol::ModelListResponse; -use codex_app_server_protocol::NewConversationParams; -use codex_app_server_protocol::NewConversationResponse; -use codex_app_server_protocol::RemoveConversationListenerParams; -use codex_app_server_protocol::RemoveConversationSubscriptionResponse; -use codex_app_server_protocol::RequestId; -use codex_app_server_protocol::Result as JsonRpcResult; -use codex_app_server_protocol::ResumeConversationParams; -use codex_app_server_protocol::SendUserMessageParams; -use codex_app_server_protocol::SendUserMessageResponse; -use codex_app_server_protocol::SendUserTurnParams; -use codex_app_server_protocol::SendUserTurnResponse; -use codex_app_server_protocol::ServerNotification; -use codex_app_server_protocol::ServerRequestPayload; -use codex_app_server_protocol::SessionConfiguredNotification; -use codex_app_server_protocol::SetDefaultModelParams; -use codex_app_server_protocol::SetDefaultModelResponse; -use codex_app_server_protocol::Thread; -use codex_app_server_protocol::ThreadArchiveParams; -use codex_app_server_protocol::ThreadArchiveResponse; -use codex_app_server_protocol::ThreadListParams; -use codex_app_server_protocol::ThreadListResponse; -use codex_app_server_protocol::ThreadResumeParams; -use codex_app_server_protocol::ThreadResumeResponse; -use codex_app_server_protocol::ThreadStartParams; -use codex_app_server_protocol::ThreadStartResponse; -use codex_app_server_protocol::ThreadStartedNotification; -use codex_app_server_protocol::UserInfoResponse; -use codex_app_server_protocol::UserSavedConfig; +use std::collections::HashMap; +use std::ffi::OsStr; +use std::io::Error as IoError; +use std::path::{Path, PathBuf}; +use std::sync::Arc; +use std::sync::atomic::{AtomicBool, Ordering}; +use std::time::Duration; + +use codex_app_server_protocol::{ + AccountLoginCompletedNotification, AccountRateLimitsUpdatedNotification, + AccountUpdatedNotification, AddConversationListenerParams, AddConversationSubscriptionResponse, + ApplyPatchApprovalParams, ApplyPatchApprovalResponse, ArchiveConversationParams, + ArchiveConversationResponse, AuthMode, AuthStatusChangeNotification, CancelLoginAccountParams, + CancelLoginAccountResponse, CancelLoginChatGptResponse, ClientRequest, ConversationSummary, + ExecCommandApprovalParams, ExecCommandApprovalResponse, ExecOneOffCommandParams, + ExecOneOffCommandResponse, FeedbackUploadParams, FeedbackUploadResponse, FuzzyFileSearchParams, + FuzzyFileSearchResponse, GetAccountRateLimitsResponse, GetConversationSummaryParams, + GetConversationSummaryResponse, GetUserAgentResponse, GetUserSavedConfigResponse, + GitDiffToRemoteResponse, InputItem as WireInputItem, InterruptConversationParams, + InterruptConversationResponse, JSONRPCErrorError, ListConversationsParams, + ListConversationsResponse, LoginAccountParams, LoginApiKeyParams, LoginApiKeyResponse, + LoginChatGptCompleteNotification, LoginChatGptResponse, ModelListParams, ModelListResponse, + NewConversationParams, NewConversationResponse, RemoveConversationListenerParams, + RemoveConversationSubscriptionResponse, RequestId, Result as JsonRpcResult, + ResumeConversationParams, SendUserMessageParams, SendUserMessageResponse, SendUserTurnParams, + SendUserTurnResponse, ServerNotification, ServerRequestPayload, SessionConfiguredNotification, + SetDefaultModelParams, SetDefaultModelResponse, Thread, ThreadArchiveParams, + ThreadArchiveResponse, ThreadListParams, ThreadListResponse, ThreadResumeParams, + ThreadResumeResponse, ThreadStartParams, ThreadStartResponse, ThreadStartedNotification, + UserInfoResponse, UserSavedConfig, +}; use codex_backend_client::Client as BackendClient; -use codex_core::AuthManager; -use codex_core::CodexConversation; -use codex_core::ConversationManager; -use codex_core::Cursor as RolloutCursor; -use codex_core::INTERACTIVE_SESSION_SOURCES; -use codex_core::InitialHistory; -use codex_core::NewConversation; -use codex_core::RolloutRecorder; -use codex_core::SessionMeta; -use codex_core::auth::CLIENT_ID; -use codex_core::auth::login_with_api_key; -use codex_core::config::Config; -use codex_core::config::ConfigOverrides; -use codex_core::config::ConfigToml; +use codex_core::auth::{CLIENT_ID, login_with_api_key}; use codex_core::config::edit::ConfigEditsBuilder; +use codex_core::config::{Config, ConfigOverrides, ConfigToml}; use codex_core::config_loader::load_config_as_toml; use codex_core::default_client::get_codex_user_agent; use codex_core::exec::ExecParams; use codex_core::exec_env::create_env; -use codex_core::find_conversation_path_by_id_str; -use codex_core::get_platform_sandbox; use codex_core::git_info::git_diff_to_remote; -use codex_core::parse_cursor; -use codex_core::protocol::ApplyPatchApprovalRequestEvent; -use codex_core::protocol::Event; -use codex_core::protocol::EventMsg; -use codex_core::protocol::ExecApprovalRequestEvent; -use codex_core::protocol::Op; -use codex_core::protocol::ReviewDecision; -use codex_core::read_head_for_summary; +use codex_core::protocol::{ + ApplyPatchApprovalRequestEvent, Event, EventMsg, ExecApprovalRequestEvent, Op, ReviewDecision, +}; +use codex_core::{ + AuthManager, CodexConversation, ConversationManager, Cursor as RolloutCursor, + INTERACTIVE_SESSION_SOURCES, InitialHistory, NewConversation, RolloutRecorder, SessionMeta, + find_conversation_path_by_id_str, get_platform_sandbox, parse_cursor, read_head_for_summary, +}; use codex_feedback::CodexFeedback; -use codex_login::ServerOptions as LoginServerOptions; -use codex_login::ShutdownHandle; -use codex_login::run_login_server; +use codex_login::{ServerOptions as LoginServerOptions, ShutdownHandle, run_login_server}; use codex_protocol::ConversationId; use codex_protocol::config_types::ForcedLoginMethod; use codex_protocol::items::TurnItem; use codex_protocol::models::ResponseItem; -use codex_protocol::protocol::RateLimitSnapshot as CoreRateLimitSnapshot; -use codex_protocol::protocol::RolloutItem; -use codex_protocol::protocol::USER_MESSAGE_BEGIN; +use codex_protocol::protocol::{ + RateLimitSnapshot as CoreRateLimitSnapshot, RolloutItem, USER_MESSAGE_BEGIN, +}; use codex_protocol::user_input::UserInput as CoreInputItem; use codex_utils_json_to_toml::json_to_toml; -use std::collections::HashMap; -use std::ffi::OsStr; -use std::io::Error as IoError; -use std::path::Path; -use std::path::PathBuf; -use std::sync::Arc; -use std::sync::atomic::AtomicBool; -use std::sync::atomic::Ordering; -use std::time::Duration; use tokio::select; -use tokio::sync::Mutex; -use tokio::sync::oneshot; -use tracing::error; -use tracing::info; -use tracing::warn; +use tokio::sync::{Mutex, oneshot}; +use tracing::{error, info, warn}; use uuid::Uuid; +use crate::error_code::{INTERNAL_ERROR_CODE, INVALID_REQUEST_ERROR_CODE}; +use crate::fuzzy_file_search::run_fuzzy_file_search; +use crate::models::supported_models; +use crate::outgoing_message::{OutgoingMessageSender, OutgoingNotification}; + // Duration before a ChatGPT login attempt is abandoned. const LOGIN_CHATGPT_TIMEOUT: Duration = Duration::from_secs(10 * 60); struct ActiveLogin { @@ -2615,12 +2546,13 @@ fn extract_conversation_summary( #[cfg(test)] mod tests { - use super::*; use anyhow::Result; use pretty_assertions::assert_eq; use serde_json::json; use tempfile::TempDir; + use super::*; + #[test] fn extract_conversation_summary_prefers_plain_user_messages() -> Result<()> { let conversation_id = ConversationId::from_string("3f941c35-29b3-493b-b0a4-e25800d9aeb0")?; @@ -2672,11 +2604,10 @@ mod tests { #[tokio::test] async fn read_summary_from_rollout_returns_empty_preview_when_no_user_message() -> Result<()> { - use codex_protocol::protocol::RolloutItem; - use codex_protocol::protocol::RolloutLine; - use codex_protocol::protocol::SessionMetaLine; use std::fs; + use codex_protocol::protocol::{RolloutItem, RolloutLine, SessionMetaLine}; + let temp_dir = TempDir::new()?; let path = temp_dir.path().join("rollout.jsonl"); diff --git a/codex-rs/app-server/src/fuzzy_file_search.rs b/codex-rs/app-server/src/fuzzy_file_search.rs index fcb05852ba..904ce0da47 100644 --- a/codex-rs/app-server/src/fuzzy_file_search.rs +++ b/codex-rs/app-server/src/fuzzy_file_search.rs @@ -1,7 +1,5 @@ -use std::num::NonZero; -use std::num::NonZeroUsize; -use std::path::Path; -use std::path::PathBuf; +use std::num::{NonZero, NonZeroUsize}; +use std::path::{Path, PathBuf}; use std::sync::Arc; use std::sync::atomic::AtomicBool; diff --git a/codex-rs/app-server/src/lib.rs b/codex-rs/app-server/src/lib.rs index 6ef986919f..148079af94 100644 --- a/codex-rs/app-server/src/lib.rs +++ b/codex-rs/app-server/src/lib.rs @@ -1,32 +1,25 @@ #![deny(clippy::print_stdout, clippy::print_stderr)] -use codex_common::CliConfigOverrides; -use codex_core::config::Config; -use codex_core::config::ConfigOverrides; -use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge; -use std::io::ErrorKind; -use std::io::Result as IoResult; +use std::io::{ErrorKind, Result as IoResult}; use std::path::PathBuf; -use crate::message_processor::MessageProcessor; -use crate::outgoing_message::OutgoingMessage; -use crate::outgoing_message::OutgoingMessageSender; use codex_app_server_protocol::JSONRPCMessage; +use codex_common::CliConfigOverrides; +use codex_core::config::{Config, ConfigOverrides}; use codex_feedback::CodexFeedback; -use tokio::io::AsyncBufReadExt; -use tokio::io::AsyncWriteExt; -use tokio::io::BufReader; -use tokio::io::{self}; +use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge; +use tokio::io::{ + AsyncBufReadExt, AsyncWriteExt, BufReader, {self}, +}; use tokio::sync::mpsc; -use tracing::Level; -use tracing::debug; -use tracing::error; -use tracing::info; -use tracing_subscriber::EnvFilter; -use tracing_subscriber::Layer; +use tracing::{Level, debug, error, info}; use tracing_subscriber::filter::Targets; use tracing_subscriber::layer::SubscriberExt; use tracing_subscriber::util::SubscriberInitExt; +use tracing_subscriber::{EnvFilter, Layer}; + +use crate::message_processor::MessageProcessor; +use crate::outgoing_message::{OutgoingMessage, OutgoingMessageSender}; mod codex_message_processor; mod error_code; diff --git a/codex-rs/app-server/src/message_processor.rs b/codex-rs/app-server/src/message_processor.rs index a97b037be0..fbcb891b88 100644 --- a/codex-rs/app-server/src/message_processor.rs +++ b/codex-rs/app-server/src/message_processor.rs @@ -1,25 +1,19 @@ use std::path::PathBuf; +use std::sync::Arc; + +use codex_app_server_protocol::{ + ClientInfo, ClientRequest, InitializeResponse, JSONRPCError, JSONRPCErrorError, + JSONRPCNotification, JSONRPCRequest, JSONRPCResponse, +}; +use codex_core::config::Config; +use codex_core::default_client::{USER_AGENT_SUFFIX, get_codex_user_agent}; +use codex_core::{AuthManager, ConversationManager}; +use codex_feedback::CodexFeedback; +use codex_protocol::protocol::SessionSource; use crate::codex_message_processor::CodexMessageProcessor; use crate::error_code::INVALID_REQUEST_ERROR_CODE; use crate::outgoing_message::OutgoingMessageSender; -use codex_app_server_protocol::ClientInfo; -use codex_app_server_protocol::ClientRequest; -use codex_app_server_protocol::InitializeResponse; - -use codex_app_server_protocol::JSONRPCError; -use codex_app_server_protocol::JSONRPCErrorError; -use codex_app_server_protocol::JSONRPCNotification; -use codex_app_server_protocol::JSONRPCRequest; -use codex_app_server_protocol::JSONRPCResponse; -use codex_core::AuthManager; -use codex_core::ConversationManager; -use codex_core::config::Config; -use codex_core::default_client::USER_AGENT_SUFFIX; -use codex_core::default_client::get_codex_user_agent; -use codex_feedback::CodexFeedback; -use codex_protocol::protocol::SessionSource; -use std::sync::Arc; pub(crate) struct MessageProcessor { outgoing: Arc, diff --git a/codex-rs/app-server/src/models.rs b/codex-rs/app-server/src/models.rs index be47cbc2cb..057155105e 100644 --- a/codex-rs/app-server/src/models.rs +++ b/codex-rs/app-server/src/models.rs @@ -1,8 +1,5 @@ -use codex_app_server_protocol::Model; -use codex_app_server_protocol::ReasoningEffortOption; -use codex_common::model_presets::ModelPreset; -use codex_common::model_presets::ReasoningEffortPreset; -use codex_common::model_presets::builtin_model_presets; +use codex_app_server_protocol::{Model, ReasoningEffortOption}; +use codex_common::model_presets::{ModelPreset, ReasoningEffortPreset, builtin_model_presets}; pub fn supported_models() -> Vec { builtin_model_presets(None) diff --git a/codex-rs/app-server/src/outgoing_message.rs b/codex-rs/app-server/src/outgoing_message.rs index f0ee6cf939..69395774f0 100644 --- a/codex-rs/app-server/src/outgoing_message.rs +++ b/codex-rs/app-server/src/outgoing_message.rs @@ -1,17 +1,11 @@ use std::collections::HashMap; -use std::sync::atomic::AtomicI64; -use std::sync::atomic::Ordering; +use std::sync::atomic::{AtomicI64, Ordering}; -use codex_app_server_protocol::JSONRPCErrorError; -use codex_app_server_protocol::RequestId; -use codex_app_server_protocol::Result; -use codex_app_server_protocol::ServerNotification; -use codex_app_server_protocol::ServerRequest; -use codex_app_server_protocol::ServerRequestPayload; +use codex_app_server_protocol::{ + JSONRPCErrorError, RequestId, Result, ServerNotification, ServerRequest, ServerRequestPayload, +}; use serde::Serialize; -use tokio::sync::Mutex; -use tokio::sync::mpsc; -use tokio::sync::oneshot; +use tokio::sync::{Mutex, mpsc, oneshot}; use tracing::warn; use crate::error_code::INTERNAL_ERROR_CODE; @@ -141,13 +135,11 @@ pub(crate) struct OutgoingError { #[cfg(test)] mod tests { - use codex_app_server_protocol::AccountLoginCompletedNotification; - use codex_app_server_protocol::AccountRateLimitsUpdatedNotification; - use codex_app_server_protocol::AccountUpdatedNotification; - use codex_app_server_protocol::AuthMode; - use codex_app_server_protocol::LoginChatGptCompleteNotification; - use codex_app_server_protocol::RateLimitSnapshot; - use codex_app_server_protocol::RateLimitWindow; + use codex_app_server_protocol::{ + AccountLoginCompletedNotification, AccountRateLimitsUpdatedNotification, + AccountUpdatedNotification, AuthMode, LoginChatGptCompleteNotification, RateLimitSnapshot, + RateLimitWindow, + }; use pretty_assertions::assert_eq; use serde_json::json; use uuid::Uuid; diff --git a/codex-rs/app-server/tests/common/auth_fixtures.rs b/codex-rs/app-server/tests/common/auth_fixtures.rs index 071a920b89..588fa848ef 100644 --- a/codex-rs/app-server/tests/common/auth_fixtures.rs +++ b/codex-rs/app-server/tests/common/auth_fixtures.rs @@ -1,16 +1,11 @@ use std::path::Path; -use anyhow::Context; -use anyhow::Result; +use anyhow::{Context, Result}; use base64::Engine; use base64::engine::general_purpose::URL_SAFE_NO_PAD; -use chrono::DateTime; -use chrono::Utc; -use codex_core::auth::AuthCredentialsStoreMode; -use codex_core::auth::AuthDotJson; -use codex_core::auth::save_auth; -use codex_core::token_data::TokenData; -use codex_core::token_data::parse_id_token; +use chrono::{DateTime, Utc}; +use codex_core::auth::{AuthCredentialsStoreMode, AuthDotJson, save_auth}; +use codex_core::token_data::{TokenData, parse_id_token}; use serde_json::json; /// Builder for writing a fake ChatGPT auth.json in tests. diff --git a/codex-rs/app-server/tests/common/lib.rs b/codex-rs/app-server/tests/common/lib.rs index dc3d24ccae..5e467b9953 100644 --- a/codex-rs/app-server/tests/common/lib.rs +++ b/codex-rs/app-server/tests/common/lib.rs @@ -4,17 +4,18 @@ mod mock_model_server; mod responses; mod rollout; -pub use auth_fixtures::ChatGptAuthFixture; -pub use auth_fixtures::ChatGptIdTokenClaims; -pub use auth_fixtures::encode_id_token; -pub use auth_fixtures::write_chatgpt_auth; +pub use auth_fixtures::{ + ChatGptAuthFixture, ChatGptIdTokenClaims, encode_id_token, write_chatgpt_auth, +}; use codex_app_server_protocol::JSONRPCResponse; pub use mcp_process::McpProcess; -pub use mock_model_server::create_mock_chat_completions_server; -pub use mock_model_server::create_mock_chat_completions_server_unchecked; -pub use responses::create_apply_patch_sse_response; -pub use responses::create_final_assistant_message_sse_response; -pub use responses::create_shell_sse_response; +pub use mock_model_server::{ + create_mock_chat_completions_server, create_mock_chat_completions_server_unchecked, +}; +pub use responses::{ + create_apply_patch_sse_response, create_final_assistant_message_sse_response, + create_shell_sse_response, +}; pub use rollout::create_fake_rollout; use serde::de::DeserializeOwned; diff --git a/codex-rs/app-server/tests/common/mcp_process.rs b/codex-rs/app-server/tests/common/mcp_process.rs index 59a8f20d89..33071d2af6 100644 --- a/codex-rs/app-server/tests/common/mcp_process.rs +++ b/codex-rs/app-server/tests/common/mcp_process.rs @@ -1,50 +1,22 @@ use std::collections::VecDeque; use std::path::Path; -use std::process::Stdio; -use std::sync::atomic::AtomicI64; -use std::sync::atomic::Ordering; -use tokio::io::AsyncBufReadExt; -use tokio::io::AsyncWriteExt; -use tokio::io::BufReader; -use tokio::process::Child; -use tokio::process::ChildStdin; -use tokio::process::ChildStdout; +use std::process::{Command as StdCommand, Stdio}; +use std::sync::atomic::{AtomicI64, Ordering}; use anyhow::Context; use assert_cmd::prelude::*; -use codex_app_server_protocol::AddConversationListenerParams; -use codex_app_server_protocol::ArchiveConversationParams; -use codex_app_server_protocol::CancelLoginAccountParams; -use codex_app_server_protocol::CancelLoginChatGptParams; -use codex_app_server_protocol::ClientInfo; -use codex_app_server_protocol::ClientNotification; -use codex_app_server_protocol::FeedbackUploadParams; -use codex_app_server_protocol::GetAuthStatusParams; -use codex_app_server_protocol::InitializeParams; -use codex_app_server_protocol::InterruptConversationParams; -use codex_app_server_protocol::ListConversationsParams; -use codex_app_server_protocol::LoginApiKeyParams; -use codex_app_server_protocol::ModelListParams; -use codex_app_server_protocol::NewConversationParams; -use codex_app_server_protocol::RemoveConversationListenerParams; -use codex_app_server_protocol::ResumeConversationParams; -use codex_app_server_protocol::SendUserMessageParams; -use codex_app_server_protocol::SendUserTurnParams; -use codex_app_server_protocol::ServerRequest; -use codex_app_server_protocol::SetDefaultModelParams; -use codex_app_server_protocol::ThreadArchiveParams; -use codex_app_server_protocol::ThreadListParams; -use codex_app_server_protocol::ThreadResumeParams; -use codex_app_server_protocol::ThreadStartParams; - -use codex_app_server_protocol::JSONRPCError; -use codex_app_server_protocol::JSONRPCMessage; -use codex_app_server_protocol::JSONRPCNotification; -use codex_app_server_protocol::JSONRPCRequest; -use codex_app_server_protocol::JSONRPCResponse; -use codex_app_server_protocol::RequestId; -use std::process::Command as StdCommand; -use tokio::process::Command; +use codex_app_server_protocol::{ + AddConversationListenerParams, ArchiveConversationParams, CancelLoginAccountParams, + CancelLoginChatGptParams, ClientInfo, ClientNotification, FeedbackUploadParams, + GetAuthStatusParams, InitializeParams, InterruptConversationParams, JSONRPCError, + JSONRPCMessage, JSONRPCNotification, JSONRPCRequest, JSONRPCResponse, ListConversationsParams, + LoginApiKeyParams, ModelListParams, NewConversationParams, RemoveConversationListenerParams, + RequestId, ResumeConversationParams, SendUserMessageParams, SendUserTurnParams, ServerRequest, + SetDefaultModelParams, ThreadArchiveParams, ThreadListParams, ThreadResumeParams, + ThreadStartParams, +}; +use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader}; +use tokio::process::{Child, ChildStdin, ChildStdout, Command}; pub struct McpProcess { next_request_id: AtomicI64, diff --git a/codex-rs/app-server/tests/common/mock_model_server.rs b/codex-rs/app-server/tests/common/mock_model_server.rs index 08765338a9..712dd8a4da 100644 --- a/codex-rs/app-server/tests/common/mock_model_server.rs +++ b/codex-rs/app-server/tests/common/mock_model_server.rs @@ -1,12 +1,7 @@ -use std::sync::atomic::AtomicUsize; -use std::sync::atomic::Ordering; +use std::sync::atomic::{AtomicUsize, Ordering}; -use wiremock::Mock; -use wiremock::MockServer; -use wiremock::Respond; -use wiremock::ResponseTemplate; -use wiremock::matchers::method; -use wiremock::matchers::path; +use wiremock::matchers::{method, path}; +use wiremock::{Mock, MockServer, Respond, ResponseTemplate}; /// Create a mock server that will provide the responses, in order, for /// requests to the `/v1/chat/completions` endpoint. diff --git a/codex-rs/app-server/tests/common/responses.rs b/codex-rs/app-server/tests/common/responses.rs index 9a827fb986..55af7dfb97 100644 --- a/codex-rs/app-server/tests/common/responses.rs +++ b/codex-rs/app-server/tests/common/responses.rs @@ -1,6 +1,7 @@ -use serde_json::json; use std::path::Path; +use serde_json::json; + pub fn create_shell_sse_response( command: Vec, workdir: Option<&Path>, diff --git a/codex-rs/app-server/tests/common/rollout.rs b/codex-rs/app-server/tests/common/rollout.rs index c8197a046d..d37b09ec60 100644 --- a/codex-rs/app-server/tests/common/rollout.rs +++ b/codex-rs/app-server/tests/common/rollout.rs @@ -1,11 +1,10 @@ +use std::fs; +use std::path::{Path, PathBuf}; + use anyhow::Result; use codex_protocol::ConversationId; -use codex_protocol::protocol::SessionMeta; -use codex_protocol::protocol::SessionSource; +use codex_protocol::protocol::{SessionMeta, SessionSource}; use serde_json::json; -use std::fs; -use std::path::Path; -use std::path::PathBuf; use uuid::Uuid; /// Create a minimal rollout file under `CODEX_HOME/sessions/YYYY/MM/DD/`. diff --git a/codex-rs/app-server/tests/suite/archive_conversation.rs b/codex-rs/app-server/tests/suite/archive_conversation.rs index b6e85936fb..5befe94746 100644 --- a/codex-rs/app-server/tests/suite/archive_conversation.rs +++ b/codex-rs/app-server/tests/suite/archive_conversation.rs @@ -1,14 +1,12 @@ -use anyhow::Result; -use app_test_support::McpProcess; -use app_test_support::to_response; -use codex_app_server_protocol::ArchiveConversationParams; -use codex_app_server_protocol::ArchiveConversationResponse; -use codex_app_server_protocol::JSONRPCResponse; -use codex_app_server_protocol::NewConversationParams; -use codex_app_server_protocol::NewConversationResponse; -use codex_app_server_protocol::RequestId; -use codex_core::ARCHIVED_SESSIONS_SUBDIR; use std::path::Path; + +use anyhow::Result; +use app_test_support::{McpProcess, to_response}; +use codex_app_server_protocol::{ + ArchiveConversationParams, ArchiveConversationResponse, JSONRPCResponse, NewConversationParams, + NewConversationResponse, RequestId, +}; +use codex_core::ARCHIVED_SESSIONS_SUBDIR; use tempfile::TempDir; use tokio::time::timeout; diff --git a/codex-rs/app-server/tests/suite/auth.rs b/codex-rs/app-server/tests/suite/auth.rs index 72912362fe..8dfda659fd 100644 --- a/codex-rs/app-server/tests/suite/auth.rs +++ b/codex-rs/app-server/tests/suite/auth.rs @@ -1,16 +1,12 @@ -use anyhow::Result; -use app_test_support::McpProcess; -use app_test_support::to_response; -use codex_app_server_protocol::AuthMode; -use codex_app_server_protocol::GetAuthStatusParams; -use codex_app_server_protocol::GetAuthStatusResponse; -use codex_app_server_protocol::JSONRPCError; -use codex_app_server_protocol::JSONRPCResponse; -use codex_app_server_protocol::LoginApiKeyParams; -use codex_app_server_protocol::LoginApiKeyResponse; -use codex_app_server_protocol::RequestId; -use pretty_assertions::assert_eq; use std::path::Path; + +use anyhow::Result; +use app_test_support::{McpProcess, to_response}; +use codex_app_server_protocol::{ + AuthMode, GetAuthStatusParams, GetAuthStatusResponse, JSONRPCError, JSONRPCResponse, + LoginApiKeyParams, LoginApiKeyResponse, RequestId, +}; +use pretty_assertions::assert_eq; use tempfile::TempDir; use tokio::time::timeout; diff --git a/codex-rs/app-server/tests/suite/codex_message_processor_flow.rs b/codex-rs/app-server/tests/suite/codex_message_processor_flow.rs index 1feda42841..4ee083befc 100644 --- a/codex-rs/app-server/tests/suite/codex_message_processor_flow.rs +++ b/codex-rs/app-server/tests/suite/codex_message_processor_flow.rs @@ -1,37 +1,25 @@ +use std::env; +use std::path::Path; + use anyhow::Result; -use app_test_support::McpProcess; -use app_test_support::create_final_assistant_message_sse_response; -use app_test_support::create_mock_chat_completions_server; -use app_test_support::create_shell_sse_response; -use app_test_support::to_response; -use codex_app_server_protocol::AddConversationListenerParams; -use codex_app_server_protocol::AddConversationSubscriptionResponse; -use codex_app_server_protocol::ExecCommandApprovalParams; -use codex_app_server_protocol::InputItem; -use codex_app_server_protocol::JSONRPCNotification; -use codex_app_server_protocol::JSONRPCResponse; -use codex_app_server_protocol::NewConversationParams; -use codex_app_server_protocol::NewConversationResponse; -use codex_app_server_protocol::RemoveConversationListenerParams; -use codex_app_server_protocol::RemoveConversationSubscriptionResponse; -use codex_app_server_protocol::RequestId; -use codex_app_server_protocol::SendUserMessageParams; -use codex_app_server_protocol::SendUserMessageResponse; -use codex_app_server_protocol::SendUserTurnParams; -use codex_app_server_protocol::SendUserTurnResponse; -use codex_app_server_protocol::ServerRequest; -use codex_core::protocol::AskForApproval; -use codex_core::protocol::SandboxPolicy; -use codex_core::protocol_config_types::ReasoningEffort; -use codex_core::protocol_config_types::ReasoningSummary; +use app_test_support::{ + McpProcess, create_final_assistant_message_sse_response, create_mock_chat_completions_server, + create_shell_sse_response, to_response, +}; +use codex_app_server_protocol::{ + AddConversationListenerParams, AddConversationSubscriptionResponse, ExecCommandApprovalParams, + InputItem, JSONRPCNotification, JSONRPCResponse, NewConversationParams, + NewConversationResponse, RemoveConversationListenerParams, + RemoveConversationSubscriptionResponse, RequestId, SendUserMessageParams, + SendUserMessageResponse, SendUserTurnParams, SendUserTurnResponse, ServerRequest, +}; +use codex_core::protocol::{AskForApproval, SandboxPolicy}; +use codex_core::protocol_config_types::{ReasoningEffort, ReasoningSummary}; use codex_core::spawn::CODEX_SANDBOX_NETWORK_DISABLED_ENV_VAR; use codex_protocol::config_types::SandboxMode; use codex_protocol::parse_command::ParsedCommand; -use codex_protocol::protocol::Event; -use codex_protocol::protocol::EventMsg; +use codex_protocol::protocol::{Event, EventMsg}; use pretty_assertions::assert_eq; -use std::env; -use std::path::Path; use tempfile::TempDir; use tokio::time::timeout; diff --git a/codex-rs/app-server/tests/suite/config.rs b/codex-rs/app-server/tests/suite/config.rs index 227d30bbe3..14e484873b 100644 --- a/codex-rs/app-server/tests/suite/config.rs +++ b/codex-rs/app-server/tests/suite/config.rs @@ -1,22 +1,17 @@ -use anyhow::Result; -use app_test_support::McpProcess; -use app_test_support::to_response; -use codex_app_server_protocol::GetUserSavedConfigResponse; -use codex_app_server_protocol::JSONRPCResponse; -use codex_app_server_protocol::Profile; -use codex_app_server_protocol::RequestId; -use codex_app_server_protocol::SandboxSettings; -use codex_app_server_protocol::Tools; -use codex_app_server_protocol::UserSavedConfig; -use codex_core::protocol::AskForApproval; -use codex_protocol::config_types::ForcedLoginMethod; -use codex_protocol::config_types::ReasoningEffort; -use codex_protocol::config_types::ReasoningSummary; -use codex_protocol::config_types::SandboxMode; -use codex_protocol::config_types::Verbosity; -use pretty_assertions::assert_eq; use std::collections::HashMap; use std::path::Path; + +use anyhow::Result; +use app_test_support::{McpProcess, to_response}; +use codex_app_server_protocol::{ + GetUserSavedConfigResponse, JSONRPCResponse, Profile, RequestId, SandboxSettings, Tools, + UserSavedConfig, +}; +use codex_core::protocol::AskForApproval; +use codex_protocol::config_types::{ + ForcedLoginMethod, ReasoningEffort, ReasoningSummary, SandboxMode, Verbosity, +}; +use pretty_assertions::assert_eq; use tempfile::TempDir; use tokio::time::timeout; diff --git a/codex-rs/app-server/tests/suite/create_conversation.rs b/codex-rs/app-server/tests/suite/create_conversation.rs index 7788b8f382..0995a58d69 100644 --- a/codex-rs/app-server/tests/suite/create_conversation.rs +++ b/codex-rs/app-server/tests/suite/create_conversation.rs @@ -1,20 +1,17 @@ +use std::path::Path; + use anyhow::Result; -use app_test_support::McpProcess; -use app_test_support::create_final_assistant_message_sse_response; -use app_test_support::create_mock_chat_completions_server; -use app_test_support::to_response; -use codex_app_server_protocol::AddConversationListenerParams; -use codex_app_server_protocol::AddConversationSubscriptionResponse; -use codex_app_server_protocol::InputItem; -use codex_app_server_protocol::JSONRPCResponse; -use codex_app_server_protocol::NewConversationParams; -use codex_app_server_protocol::NewConversationResponse; -use codex_app_server_protocol::RequestId; -use codex_app_server_protocol::SendUserMessageParams; -use codex_app_server_protocol::SendUserMessageResponse; +use app_test_support::{ + McpProcess, create_final_assistant_message_sse_response, create_mock_chat_completions_server, + to_response, +}; +use codex_app_server_protocol::{ + AddConversationListenerParams, AddConversationSubscriptionResponse, InputItem, JSONRPCResponse, + NewConversationParams, NewConversationResponse, RequestId, SendUserMessageParams, + SendUserMessageResponse, +}; use pretty_assertions::assert_eq; use serde_json::json; -use std::path::Path; use tempfile::TempDir; use tokio::time::timeout; diff --git a/codex-rs/app-server/tests/suite/fuzzy_file_search.rs b/codex-rs/app-server/tests/suite/fuzzy_file_search.rs index 9c95e3de34..949c1156b6 100644 --- a/codex-rs/app-server/tests/suite/fuzzy_file_search.rs +++ b/codex-rs/app-server/tests/suite/fuzzy_file_search.rs @@ -1,8 +1,6 @@ -use anyhow::Result; -use anyhow::anyhow; +use anyhow::{Result, anyhow}; use app_test_support::McpProcess; -use codex_app_server_protocol::JSONRPCResponse; -use codex_app_server_protocol::RequestId; +use codex_app_server_protocol::{JSONRPCResponse, RequestId}; use pretty_assertions::assert_eq; use serde_json::json; use tempfile::TempDir; diff --git a/codex-rs/app-server/tests/suite/interrupt.rs b/codex-rs/app-server/tests/suite/interrupt.rs index 1c4c05e368..680da514e1 100644 --- a/codex-rs/app-server/tests/suite/interrupt.rs +++ b/codex-rs/app-server/tests/suite/interrupt.rs @@ -3,25 +3,19 @@ use std::path::Path; -use codex_app_server_protocol::AddConversationListenerParams; -use codex_app_server_protocol::InterruptConversationParams; -use codex_app_server_protocol::InterruptConversationResponse; -use codex_app_server_protocol::JSONRPCResponse; -use codex_app_server_protocol::NewConversationParams; -use codex_app_server_protocol::NewConversationResponse; -use codex_app_server_protocol::RequestId; -use codex_app_server_protocol::SendUserMessageParams; -use codex_app_server_protocol::SendUserMessageResponse; +use app_test_support::{ + McpProcess, create_mock_chat_completions_server, create_shell_sse_response, to_response, +}; +use codex_app_server_protocol::{ + AddConversationListenerParams, InterruptConversationParams, InterruptConversationResponse, + JSONRPCResponse, NewConversationParams, NewConversationResponse, RequestId, + SendUserMessageParams, SendUserMessageResponse, +}; use codex_core::protocol::TurnAbortReason; use core_test_support::skip_if_no_network; use tempfile::TempDir; use tokio::time::timeout; -use app_test_support::McpProcess; -use app_test_support::create_mock_chat_completions_server; -use app_test_support::create_shell_sse_response; -use app_test_support::to_response; - const DEFAULT_READ_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(10); #[tokio::test(flavor = "multi_thread", worker_threads = 2)] diff --git a/codex-rs/app-server/tests/suite/list_resume.rs b/codex-rs/app-server/tests/suite/list_resume.rs index 30be93a2e6..1155a3dc2a 100644 --- a/codex-rs/app-server/tests/suite/list_resume.rs +++ b/codex-rs/app-server/tests/suite/list_resume.rs @@ -1,20 +1,13 @@ use anyhow::Result; -use app_test_support::McpProcess; -use app_test_support::create_fake_rollout; -use app_test_support::to_response; -use codex_app_server_protocol::JSONRPCNotification; -use codex_app_server_protocol::JSONRPCResponse; -use codex_app_server_protocol::ListConversationsParams; -use codex_app_server_protocol::ListConversationsResponse; +use app_test_support::{McpProcess, create_fake_rollout, to_response}; use codex_app_server_protocol::NewConversationParams; // reused for overrides shape -use codex_app_server_protocol::RequestId; -use codex_app_server_protocol::ResumeConversationParams; -use codex_app_server_protocol::ResumeConversationResponse; -use codex_app_server_protocol::ServerNotification; -use codex_app_server_protocol::SessionConfiguredNotification; +use codex_app_server_protocol::{ + JSONRPCNotification, JSONRPCResponse, ListConversationsParams, ListConversationsResponse, + RequestId, ResumeConversationParams, ResumeConversationResponse, ServerNotification, + SessionConfiguredNotification, +}; use codex_core::protocol::EventMsg; -use codex_protocol::models::ContentItem; -use codex_protocol::models::ResponseItem; +use codex_protocol::models::{ContentItem, ResponseItem}; use pretty_assertions::assert_eq; use tempfile::TempDir; use tokio::time::timeout; diff --git a/codex-rs/app-server/tests/suite/login.rs b/codex-rs/app-server/tests/suite/login.rs index c5470c3ec4..d3ff675874 100644 --- a/codex-rs/app-server/tests/suite/login.rs +++ b/codex-rs/app-server/tests/suite/login.rs @@ -1,20 +1,16 @@ +use std::path::Path; +use std::time::Duration; + use anyhow::Result; -use app_test_support::McpProcess; -use app_test_support::to_response; -use codex_app_server_protocol::CancelLoginChatGptParams; -use codex_app_server_protocol::CancelLoginChatGptResponse; -use codex_app_server_protocol::GetAuthStatusParams; -use codex_app_server_protocol::GetAuthStatusResponse; -use codex_app_server_protocol::JSONRPCError; -use codex_app_server_protocol::JSONRPCResponse; -use codex_app_server_protocol::LoginChatGptResponse; -use codex_app_server_protocol::LogoutChatGptResponse; -use codex_app_server_protocol::RequestId; +use app_test_support::{McpProcess, to_response}; +use codex_app_server_protocol::{ + CancelLoginChatGptParams, CancelLoginChatGptResponse, GetAuthStatusParams, + GetAuthStatusResponse, JSONRPCError, JSONRPCResponse, LoginChatGptResponse, + LogoutChatGptResponse, RequestId, +}; use codex_core::auth::AuthCredentialsStoreMode; use codex_login::login_with_api_key; use serial_test::serial; -use std::path::Path; -use std::time::Duration; use tempfile::TempDir; use tokio::time::timeout; diff --git a/codex-rs/app-server/tests/suite/model_list.rs b/codex-rs/app-server/tests/suite/model_list.rs index b652121f58..56f0b345f3 100644 --- a/codex-rs/app-server/tests/suite/model_list.rs +++ b/codex-rs/app-server/tests/suite/model_list.rs @@ -1,16 +1,11 @@ use std::time::Duration; -use anyhow::Result; -use anyhow::anyhow; -use app_test_support::McpProcess; -use app_test_support::to_response; -use codex_app_server_protocol::JSONRPCError; -use codex_app_server_protocol::JSONRPCResponse; -use codex_app_server_protocol::Model; -use codex_app_server_protocol::ModelListParams; -use codex_app_server_protocol::ModelListResponse; -use codex_app_server_protocol::ReasoningEffortOption; -use codex_app_server_protocol::RequestId; +use anyhow::{Result, anyhow}; +use app_test_support::{McpProcess, to_response}; +use codex_app_server_protocol::{ + JSONRPCError, JSONRPCResponse, Model, ModelListParams, ModelListResponse, + ReasoningEffortOption, RequestId, +}; use codex_protocol::config_types::ReasoningEffort; use pretty_assertions::assert_eq; use tempfile::TempDir; diff --git a/codex-rs/app-server/tests/suite/rate_limits.rs b/codex-rs/app-server/tests/suite/rate_limits.rs index c6ef7dccea..49abe7fc99 100644 --- a/codex-rs/app-server/tests/suite/rate_limits.rs +++ b/codex-rs/app-server/tests/suite/rate_limits.rs @@ -1,27 +1,18 @@ +use std::path::Path; + use anyhow::Result; -use app_test_support::ChatGptAuthFixture; -use app_test_support::McpProcess; -use app_test_support::to_response; -use app_test_support::write_chatgpt_auth; -use codex_app_server_protocol::GetAccountRateLimitsResponse; -use codex_app_server_protocol::JSONRPCError; -use codex_app_server_protocol::JSONRPCResponse; -use codex_app_server_protocol::LoginApiKeyParams; -use codex_app_server_protocol::RateLimitSnapshot; -use codex_app_server_protocol::RateLimitWindow; -use codex_app_server_protocol::RequestId; +use app_test_support::{ChatGptAuthFixture, McpProcess, to_response, write_chatgpt_auth}; +use codex_app_server_protocol::{ + GetAccountRateLimitsResponse, JSONRPCError, JSONRPCResponse, LoginApiKeyParams, + RateLimitSnapshot, RateLimitWindow, RequestId, +}; use codex_core::auth::AuthCredentialsStoreMode; use pretty_assertions::assert_eq; use serde_json::json; -use std::path::Path; use tempfile::TempDir; use tokio::time::timeout; -use wiremock::Mock; -use wiremock::MockServer; -use wiremock::ResponseTemplate; -use wiremock::matchers::header; -use wiremock::matchers::method; -use wiremock::matchers::path; +use wiremock::matchers::{header, method, path}; +use wiremock::{Mock, MockServer, ResponseTemplate}; const DEFAULT_READ_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(10); const INVALID_REQUEST_ERROR_CODE: i64 = -32600; diff --git a/codex-rs/app-server/tests/suite/send_message.rs b/codex-rs/app-server/tests/suite/send_message.rs index 8d2b36af2f..389f374538 100644 --- a/codex-rs/app-server/tests/suite/send_message.rs +++ b/codex-rs/app-server/tests/suite/send_message.rs @@ -1,24 +1,19 @@ +use std::path::Path; + use anyhow::Result; -use app_test_support::McpProcess; -use app_test_support::create_final_assistant_message_sse_response; -use app_test_support::create_mock_chat_completions_server; -use app_test_support::to_response; -use codex_app_server_protocol::AddConversationListenerParams; -use codex_app_server_protocol::AddConversationSubscriptionResponse; -use codex_app_server_protocol::InputItem; -use codex_app_server_protocol::JSONRPCNotification; -use codex_app_server_protocol::JSONRPCResponse; -use codex_app_server_protocol::NewConversationParams; -use codex_app_server_protocol::NewConversationResponse; -use codex_app_server_protocol::RequestId; -use codex_app_server_protocol::SendUserMessageParams; -use codex_app_server_protocol::SendUserMessageResponse; +use app_test_support::{ + McpProcess, create_final_assistant_message_sse_response, create_mock_chat_completions_server, + to_response, +}; +use codex_app_server_protocol::{ + AddConversationListenerParams, AddConversationSubscriptionResponse, InputItem, + JSONRPCNotification, JSONRPCResponse, NewConversationParams, NewConversationResponse, + RequestId, SendUserMessageParams, SendUserMessageResponse, +}; use codex_protocol::ConversationId; -use codex_protocol::models::ContentItem; -use codex_protocol::models::ResponseItem; +use codex_protocol::models::{ContentItem, ResponseItem}; use codex_protocol::protocol::RawResponseItemEvent; use pretty_assertions::assert_eq; -use std::path::Path; use tempfile::TempDir; use tokio::time::timeout; diff --git a/codex-rs/app-server/tests/suite/set_default_model.rs b/codex-rs/app-server/tests/suite/set_default_model.rs index 0c2aa22999..ed56556dde 100644 --- a/codex-rs/app-server/tests/suite/set_default_model.rs +++ b/codex-rs/app-server/tests/suite/set_default_model.rs @@ -1,13 +1,12 @@ +use std::path::Path; + use anyhow::Result; -use app_test_support::McpProcess; -use app_test_support::to_response; -use codex_app_server_protocol::JSONRPCResponse; -use codex_app_server_protocol::RequestId; -use codex_app_server_protocol::SetDefaultModelParams; -use codex_app_server_protocol::SetDefaultModelResponse; +use app_test_support::{McpProcess, to_response}; +use codex_app_server_protocol::{ + JSONRPCResponse, RequestId, SetDefaultModelParams, SetDefaultModelResponse, +}; use codex_core::config::ConfigToml; use pretty_assertions::assert_eq; -use std::path::Path; use tempfile::TempDir; use tokio::time::timeout; diff --git a/codex-rs/app-server/tests/suite/user_agent.rs b/codex-rs/app-server/tests/suite/user_agent.rs index 52ba6e56aa..96c534be39 100644 --- a/codex-rs/app-server/tests/suite/user_agent.rs +++ b/codex-rs/app-server/tests/suite/user_agent.rs @@ -1,9 +1,6 @@ use anyhow::Result; -use app_test_support::McpProcess; -use app_test_support::to_response; -use codex_app_server_protocol::GetUserAgentResponse; -use codex_app_server_protocol::JSONRPCResponse; -use codex_app_server_protocol::RequestId; +use app_test_support::{McpProcess, to_response}; +use codex_app_server_protocol::{GetUserAgentResponse, JSONRPCResponse, RequestId}; use pretty_assertions::assert_eq; use tempfile::TempDir; use tokio::time::timeout; diff --git a/codex-rs/app-server/tests/suite/user_info.rs b/codex-rs/app-server/tests/suite/user_info.rs index 6a44f1a3ab..2485dfe677 100644 --- a/codex-rs/app-server/tests/suite/user_info.rs +++ b/codex-rs/app-server/tests/suite/user_info.rs @@ -1,14 +1,10 @@ +use std::time::Duration; + use anyhow::Result; -use app_test_support::ChatGptAuthFixture; -use app_test_support::McpProcess; -use app_test_support::to_response; -use app_test_support::write_chatgpt_auth; -use codex_app_server_protocol::JSONRPCResponse; -use codex_app_server_protocol::RequestId; -use codex_app_server_protocol::UserInfoResponse; +use app_test_support::{ChatGptAuthFixture, McpProcess, to_response, write_chatgpt_auth}; +use codex_app_server_protocol::{JSONRPCResponse, RequestId, UserInfoResponse}; use codex_core::auth::AuthCredentialsStoreMode; use pretty_assertions::assert_eq; -use std::time::Duration; use tempfile::TempDir; use tokio::time::timeout; diff --git a/codex-rs/app-server/tests/suite/v2/account.rs b/codex-rs/app-server/tests/suite/v2/account.rs index a00c97b11e..48409a6327 100644 --- a/codex-rs/app-server/tests/suite/v2/account.rs +++ b/codex-rs/app-server/tests/suite/v2/account.rs @@ -1,24 +1,17 @@ -use anyhow::Result; -use anyhow::bail; -use app_test_support::McpProcess; -use app_test_support::to_response; -use codex_app_server_protocol::AuthMode; -use codex_app_server_protocol::CancelLoginAccountParams; -use codex_app_server_protocol::CancelLoginAccountResponse; -use codex_app_server_protocol::GetAuthStatusParams; -use codex_app_server_protocol::GetAuthStatusResponse; -use codex_app_server_protocol::JSONRPCError; -use codex_app_server_protocol::JSONRPCResponse; -use codex_app_server_protocol::LoginAccountResponse; -use codex_app_server_protocol::LogoutAccountResponse; -use codex_app_server_protocol::RequestId; -use codex_app_server_protocol::ServerNotification; +use std::path::Path; +use std::time::Duration; + +use anyhow::{Result, bail}; +use app_test_support::{McpProcess, to_response}; +use codex_app_server_protocol::{ + AuthMode, CancelLoginAccountParams, CancelLoginAccountResponse, GetAuthStatusParams, + GetAuthStatusResponse, JSONRPCError, JSONRPCResponse, LoginAccountResponse, + LogoutAccountResponse, RequestId, ServerNotification, +}; use codex_core::auth::AuthCredentialsStoreMode; use codex_login::login_with_api_key; use pretty_assertions::assert_eq; use serial_test::serial; -use std::path::Path; -use std::time::Duration; use tempfile::TempDir; use tokio::time::timeout; diff --git a/codex-rs/app-server/tests/suite/v2/thread_archive.rs b/codex-rs/app-server/tests/suite/v2/thread_archive.rs index 083f3da901..c86b8f17d7 100644 --- a/codex-rs/app-server/tests/suite/v2/thread_archive.rs +++ b/codex-rs/app-server/tests/suite/v2/thread_archive.rs @@ -1,15 +1,12 @@ -use anyhow::Result; -use app_test_support::McpProcess; -use app_test_support::to_response; -use codex_app_server_protocol::JSONRPCResponse; -use codex_app_server_protocol::RequestId; -use codex_app_server_protocol::ThreadArchiveParams; -use codex_app_server_protocol::ThreadArchiveResponse; -use codex_app_server_protocol::ThreadStartParams; -use codex_app_server_protocol::ThreadStartResponse; -use codex_core::ARCHIVED_SESSIONS_SUBDIR; -use codex_core::find_conversation_path_by_id_str; use std::path::Path; + +use anyhow::Result; +use app_test_support::{McpProcess, to_response}; +use codex_app_server_protocol::{ + JSONRPCResponse, RequestId, ThreadArchiveParams, ThreadArchiveResponse, ThreadStartParams, + ThreadStartResponse, +}; +use codex_core::{ARCHIVED_SESSIONS_SUBDIR, find_conversation_path_by_id_str}; use tempfile::TempDir; use tokio::time::timeout; diff --git a/codex-rs/app-server/tests/suite/v2/thread_list.rs b/codex-rs/app-server/tests/suite/v2/thread_list.rs index 43e243b0ff..dca7750e0a 100644 --- a/codex-rs/app-server/tests/suite/v2/thread_list.rs +++ b/codex-rs/app-server/tests/suite/v2/thread_list.rs @@ -1,11 +1,6 @@ use anyhow::Result; -use app_test_support::McpProcess; -use app_test_support::create_fake_rollout; -use app_test_support::to_response; -use codex_app_server_protocol::JSONRPCResponse; -use codex_app_server_protocol::RequestId; -use codex_app_server_protocol::ThreadListParams; -use codex_app_server_protocol::ThreadListResponse; +use app_test_support::{McpProcess, create_fake_rollout, to_response}; +use codex_app_server_protocol::{JSONRPCResponse, RequestId, ThreadListParams, ThreadListResponse}; use serde_json::json; use tempfile::TempDir; use tokio::time::timeout; diff --git a/codex-rs/app-server/tests/suite/v2/thread_resume.rs b/codex-rs/app-server/tests/suite/v2/thread_resume.rs index 039f542fd7..5cd580c2f2 100644 --- a/codex-rs/app-server/tests/suite/v2/thread_resume.rs +++ b/codex-rs/app-server/tests/suite/v2/thread_resume.rs @@ -1,13 +1,9 @@ use anyhow::Result; -use app_test_support::McpProcess; -use app_test_support::create_mock_chat_completions_server; -use app_test_support::to_response; -use codex_app_server_protocol::JSONRPCResponse; -use codex_app_server_protocol::RequestId; -use codex_app_server_protocol::ThreadResumeParams; -use codex_app_server_protocol::ThreadResumeResponse; -use codex_app_server_protocol::ThreadStartParams; -use codex_app_server_protocol::ThreadStartResponse; +use app_test_support::{McpProcess, create_mock_chat_completions_server, to_response}; +use codex_app_server_protocol::{ + JSONRPCResponse, RequestId, ThreadResumeParams, ThreadResumeResponse, ThreadStartParams, + ThreadStartResponse, +}; use tempfile::TempDir; use tokio::time::timeout; diff --git a/codex-rs/app-server/tests/suite/v2/thread_start.rs b/codex-rs/app-server/tests/suite/v2/thread_start.rs index 8b4cd5571d..32c3f3abea 100644 --- a/codex-rs/app-server/tests/suite/v2/thread_start.rs +++ b/codex-rs/app-server/tests/suite/v2/thread_start.rs @@ -1,14 +1,11 @@ -use anyhow::Result; -use app_test_support::McpProcess; -use app_test_support::create_mock_chat_completions_server; -use app_test_support::to_response; -use codex_app_server_protocol::JSONRPCNotification; -use codex_app_server_protocol::JSONRPCResponse; -use codex_app_server_protocol::RequestId; -use codex_app_server_protocol::ThreadStartParams; -use codex_app_server_protocol::ThreadStartResponse; -use codex_app_server_protocol::ThreadStartedNotification; use std::path::Path; + +use anyhow::Result; +use app_test_support::{McpProcess, create_mock_chat_completions_server, to_response}; +use codex_app_server_protocol::{ + JSONRPCNotification, JSONRPCResponse, RequestId, ThreadStartParams, ThreadStartResponse, + ThreadStartedNotification, +}; use tempfile::TempDir; use tokio::time::timeout; diff --git a/codex-rs/apply-patch/src/lib.rs b/codex-rs/apply-patch/src/lib.rs index 3d0052ed03..79b922c015 100644 --- a/codex-rs/apply-patch/src/lib.rs +++ b/codex-rs/apply-patch/src/lib.rs @@ -3,28 +3,19 @@ mod seek_sequence; mod standalone_executable; use std::collections::HashMap; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::str::Utf8Error; use std::sync::LazyLock; -use anyhow::Context; -use anyhow::Result; -pub use parser::Hunk; -pub use parser::ParseError; +use anyhow::{Context, Result}; use parser::ParseError::*; use parser::UpdateFileChunk; -pub use parser::parse_patch; +pub use parser::{Hunk, ParseError, parse_patch}; use similar::TextDiff; -use thiserror::Error; -use tree_sitter::LanguageError; -use tree_sitter::Parser; -use tree_sitter::Query; -use tree_sitter::QueryCursor; -use tree_sitter::StreamingIterator; -use tree_sitter_bash::LANGUAGE as BASH; - pub use standalone_executable::main; +use thiserror::Error; +use tree_sitter::{LanguageError, Parser, Query, QueryCursor, StreamingIterator}; +use tree_sitter_bash::LANGUAGE as BASH; /// Detailed instructions for gpt-4.1 on how to use the `apply_patch` tool. pub const APPLY_PATCH_TOOL_INSTRUCTIONS: &str = include_str!("../apply_patch_tool_instructions.md"); @@ -842,13 +833,15 @@ pub fn print_summary( #[cfg(test)] mod tests { - use super::*; - use assert_matches::assert_matches; - use pretty_assertions::assert_eq; use std::fs; use std::string::ToString; + + use assert_matches::assert_matches; + use pretty_assertions::assert_eq; use tempfile::tempdir; + use super::*; + /// Helper to construct a patch with the given body. fn wrap_patch(body: &str) -> String { format!("*** Begin Patch\n{body}\n*** End Patch") diff --git a/codex-rs/apply-patch/src/parser.rs b/codex-rs/apply-patch/src/parser.rs index 768c89ad78..55c2d0ac6c 100644 --- a/codex-rs/apply-patch/src/parser.rs +++ b/codex-rs/apply-patch/src/parser.rs @@ -22,12 +22,12 @@ //! //! The parser below is a little more lenient than the explicit spec and allows for //! leading/trailing whitespace around patch markers. -use crate::ApplyPatchArgs; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use thiserror::Error; +use crate::ApplyPatchArgs; + const BEGIN_PATCH_MARKER: &str = "*** Begin Patch"; const END_PATCH_MARKER: &str = "*** End Patch"; const ADD_FILE_MARKER: &str = "*** Add File: "; diff --git a/codex-rs/apply-patch/src/seek_sequence.rs b/codex-rs/apply-patch/src/seek_sequence.rs index b005b08c75..56b3f16aef 100644 --- a/codex-rs/apply-patch/src/seek_sequence.rs +++ b/codex-rs/apply-patch/src/seek_sequence.rs @@ -111,9 +111,10 @@ pub(crate) fn seek_sequence( #[cfg(test)] mod tests { - use super::seek_sequence; use std::string::ToString; + use super::seek_sequence; + fn to_vec(strings: &[&str]) -> Vec { strings.iter().map(ToString::to_string).collect() } diff --git a/codex-rs/apply-patch/src/standalone_executable.rs b/codex-rs/apply-patch/src/standalone_executable.rs index ba31465c8d..2adac5acfc 100644 --- a/codex-rs/apply-patch/src/standalone_executable.rs +++ b/codex-rs/apply-patch/src/standalone_executable.rs @@ -1,5 +1,4 @@ -use std::io::Read; -use std::io::Write; +use std::io::{Read, Write}; pub fn main() -> ! { let exit_code = run_main(); diff --git a/codex-rs/apply-patch/tests/suite/cli.rs b/codex-rs/apply-patch/tests/suite/cli.rs index ed95aba17c..c6a942356a 100644 --- a/codex-rs/apply-patch/tests/suite/cli.rs +++ b/codex-rs/apply-patch/tests/suite/cli.rs @@ -1,6 +1,7 @@ -use assert_cmd::prelude::*; use std::fs; use std::process::Command; + +use assert_cmd::prelude::*; use tempfile::tempdir; #[test] diff --git a/codex-rs/apply-patch/tests/suite/tool.rs b/codex-rs/apply-patch/tests/suite/tool.rs index c937719da0..1442cd16c7 100644 --- a/codex-rs/apply-patch/tests/suite/tool.rs +++ b/codex-rs/apply-patch/tests/suite/tool.rs @@ -1,7 +1,8 @@ -use assert_cmd::Command; -use pretty_assertions::assert_eq; use std::fs; use std::path::Path; + +use assert_cmd::Command; +use pretty_assertions::assert_eq; use tempfile::tempdir; fn run_apply_patch_in_dir(dir: &Path, patch: &str) -> anyhow::Result { diff --git a/codex-rs/arg0/src/lib.rs b/codex-rs/arg0/src/lib.rs index e70ff2df64..bef72e0f8d 100644 --- a/codex-rs/arg0/src/lib.rs +++ b/codex-rs/arg0/src/lib.rs @@ -1,10 +1,9 @@ use std::future::Future; -use std::path::Path; -use std::path::PathBuf; - -use codex_core::CODEX_APPLY_PATCH_ARG1; #[cfg(unix)] use std::os::unix::fs::symlink; +use std::path::{Path, PathBuf}; + +use codex_core::CODEX_APPLY_PATCH_ARG1; use tempfile::TempDir; const LINUX_SANDBOX_ARG0: &str = "codex-linux-sandbox"; diff --git a/codex-rs/async-utils/src/lib.rs b/codex-rs/async-utils/src/lib.rs index bd880ae1fb..c599250737 100644 --- a/codex-rs/async-utils/src/lib.rs +++ b/codex-rs/async-utils/src/lib.rs @@ -1,5 +1,6 @@ -use async_trait::async_trait; use std::future::Future; + +use async_trait::async_trait; use tokio_util::sync::CancellationToken; #[derive(Debug, PartialEq, Eq)] @@ -32,12 +33,14 @@ where #[cfg(test)] mod tests { - use super::*; - use pretty_assertions::assert_eq; use std::time::Duration; + + use pretty_assertions::assert_eq; use tokio::task; use tokio::time::sleep; + use super::*; + #[tokio::test] async fn returns_ok_when_future_completes_first() { let token = CancellationToken::new(); diff --git a/codex-rs/backend-client/src/client.rs b/codex-rs/backend-client/src/client.rs index 28a51598eb..f4e448c85e 100644 --- a/codex-rs/backend-client/src/client.rs +++ b/codex-rs/backend-client/src/client.rs @@ -1,21 +1,17 @@ -use crate::types::CodeTaskDetailsResponse; -use crate::types::PaginatedListTaskListItem; -use crate::types::RateLimitStatusPayload; -use crate::types::RateLimitWindowSnapshot; -use crate::types::TurnAttemptsSiblingTurnsResponse; use anyhow::Result; use codex_core::auth::CodexAuth; use codex_core::default_client::get_codex_user_agent; -use codex_protocol::protocol::RateLimitSnapshot; -use codex_protocol::protocol::RateLimitWindow; -use reqwest::header::AUTHORIZATION; -use reqwest::header::CONTENT_TYPE; -use reqwest::header::HeaderMap; -use reqwest::header::HeaderName; -use reqwest::header::HeaderValue; -use reqwest::header::USER_AGENT; +use codex_protocol::protocol::{RateLimitSnapshot, RateLimitWindow}; +use reqwest::header::{ + AUTHORIZATION, CONTENT_TYPE, HeaderMap, HeaderName, HeaderValue, USER_AGENT, +}; use serde::de::DeserializeOwned; +use crate::types::{ + CodeTaskDetailsResponse, PaginatedListTaskListItem, RateLimitStatusPayload, + RateLimitWindowSnapshot, TurnAttemptsSiblingTurnsResponse, +}; + #[derive(Clone, Copy, Debug, PartialEq, Eq)] pub enum PathStyle { /// /api/codex/… diff --git a/codex-rs/backend-client/src/lib.rs b/codex-rs/backend-client/src/lib.rs index 29fe9f3c6b..aeb102d1ce 100644 --- a/codex-rs/backend-client/src/lib.rs +++ b/codex-rs/backend-client/src/lib.rs @@ -2,8 +2,7 @@ mod client; pub mod types; pub use client::Client; -pub use types::CodeTaskDetailsResponse; -pub use types::CodeTaskDetailsResponseExt; -pub use types::PaginatedListTaskListItem; -pub use types::TaskListItem; -pub use types::TurnAttemptsSiblingTurnsResponse; +pub use types::{ + CodeTaskDetailsResponse, CodeTaskDetailsResponseExt, PaginatedListTaskListItem, TaskListItem, + TurnAttemptsSiblingTurnsResponse, +}; diff --git a/codex-rs/backend-client/src/types.rs b/codex-rs/backend-client/src/types.rs index 9f196f9c2f..c36f2e8891 100644 --- a/codex-rs/backend-client/src/types.rs +++ b/codex-rs/backend-client/src/types.rs @@ -1,14 +1,12 @@ -pub use codex_backend_openapi_models::models::PaginatedListTaskListItem; -pub use codex_backend_openapi_models::models::PlanType; -pub use codex_backend_openapi_models::models::RateLimitStatusDetails; -pub use codex_backend_openapi_models::models::RateLimitStatusPayload; -pub use codex_backend_openapi_models::models::RateLimitWindowSnapshot; -pub use codex_backend_openapi_models::models::TaskListItem; +use std::collections::HashMap; +pub use codex_backend_openapi_models::models::{ + PaginatedListTaskListItem, PlanType, RateLimitStatusDetails, RateLimitStatusPayload, + RateLimitWindowSnapshot, TaskListItem, +}; use serde::Deserialize; use serde::de::Deserializer; use serde_json::Value; -use std::collections::HashMap; /// Hand-rolled models for the Cloud Tasks task-details response. /// The generated OpenAPI models are pretty bad. This is a half-step @@ -317,9 +315,10 @@ pub struct TurnAttemptsSiblingTurnsResponse { #[cfg(test)] mod tests { - use super::*; use pretty_assertions::assert_eq; + use super::*; + fn fixture(name: &str) -> CodeTaskDetailsResponse { let json = match name { "diff" => include_str!("../tests/fixtures/task_details_with_diff.json"), diff --git a/codex-rs/chatgpt/src/apply_command.rs b/codex-rs/chatgpt/src/apply_command.rs index ffd460e293..8da038f421 100644 --- a/codex-rs/chatgpt/src/apply_command.rs +++ b/codex-rs/chatgpt/src/apply_command.rs @@ -2,14 +2,10 @@ use std::path::PathBuf; use clap::Parser; use codex_common::CliConfigOverrides; -use codex_core::config::Config; -use codex_core::config::ConfigOverrides; +use codex_core::config::{Config, ConfigOverrides}; use crate::chatgpt_token::init_chatgpt_token_from_auth; -use crate::get_task::GetTaskResponse; -use crate::get_task::OutputItem; -use crate::get_task::PrOutputItem; -use crate::get_task::get_task; +use crate::get_task::{GetTaskResponse, OutputItem, PrOutputItem, get_task}; /// Applies the latest diff from a Codex agent task. #[derive(Debug, Parser)] diff --git a/codex-rs/chatgpt/src/chatgpt_client.rs b/codex-rs/chatgpt/src/chatgpt_client.rs index 7528631981..27d4f8212f 100644 --- a/codex-rs/chatgpt/src/chatgpt_client.rs +++ b/codex-rs/chatgpt/src/chatgpt_client.rs @@ -1,12 +1,10 @@ +use anyhow::Context; use codex_core::config::Config; use codex_core::default_client::create_client; - -use crate::chatgpt_token::get_chatgpt_token_data; -use crate::chatgpt_token::init_chatgpt_token_from_auth; - -use anyhow::Context; use serde::de::DeserializeOwned; +use crate::chatgpt_token::{get_chatgpt_token_data, init_chatgpt_token_from_auth}; + /// Make a GET request to the ChatGPT backend API. pub(crate) async fn chatgpt_get_request( config: &Config, diff --git a/codex-rs/chatgpt/src/chatgpt_token.rs b/codex-rs/chatgpt/src/chatgpt_token.rs index e8879ad21c..6d11bb8140 100644 --- a/codex-rs/chatgpt/src/chatgpt_token.rs +++ b/codex-rs/chatgpt/src/chatgpt_token.rs @@ -1,8 +1,7 @@ -use codex_core::CodexAuth; use std::path::Path; -use std::sync::LazyLock; -use std::sync::RwLock; +use std::sync::{LazyLock, RwLock}; +use codex_core::CodexAuth; use codex_core::auth::AuthCredentialsStoreMode; use codex_core::token_data::TokenData; diff --git a/codex-rs/chatgpt/tests/suite/apply_command_e2e.rs b/codex-rs/chatgpt/tests/suite/apply_command_e2e.rs index 2aa8b809bb..47cd87f6e8 100644 --- a/codex-rs/chatgpt/tests/suite/apply_command_e2e.rs +++ b/codex-rs/chatgpt/tests/suite/apply_command_e2e.rs @@ -1,6 +1,7 @@ +use std::path::Path; + use codex_chatgpt::apply_command::apply_diff_from_task; use codex_chatgpt::get_task::GetTaskResponse; -use std::path::Path; use tempfile::TempDir; use tokio::process::Command; diff --git a/codex-rs/cli/src/debug_sandbox.rs b/codex-rs/cli/src/debug_sandbox.rs index 2b90cb932d..4d18ac508e 100644 --- a/codex-rs/cli/src/debug_sandbox.rs +++ b/codex-rs/cli/src/debug_sandbox.rs @@ -1,18 +1,15 @@ use std::path::PathBuf; use codex_common::CliConfigOverrides; -use codex_core::config::Config; -use codex_core::config::ConfigOverrides; +use codex_core::config::{Config, ConfigOverrides}; use codex_core::exec_env::create_env; use codex_core::landlock::spawn_command_under_linux_sandbox; use codex_core::seatbelt::spawn_command_under_seatbelt; use codex_core::spawn::StdioPolicy; use codex_protocol::config_types::SandboxMode; -use crate::LandlockCommand; -use crate::SeatbeltCommand; -use crate::WindowsCommand; use crate::exit_status::handle_exit_status; +use crate::{LandlockCommand, SeatbeltCommand, WindowsCommand}; pub async fn run_command_under_seatbelt( command: SeatbeltCommand, diff --git a/codex-rs/cli/src/login.rs b/codex-rs/cli/src/login.rs index 6681ab20c8..c2d7a3df20 100644 --- a/codex-rs/cli/src/login.rs +++ b/codex-rs/cli/src/login.rs @@ -1,19 +1,13 @@ +use std::io::{IsTerminal, Read}; +use std::path::PathBuf; + use codex_app_server_protocol::AuthMode; use codex_common::CliConfigOverrides; use codex_core::CodexAuth; -use codex_core::auth::AuthCredentialsStoreMode; -use codex_core::auth::CLIENT_ID; -use codex_core::auth::login_with_api_key; -use codex_core::auth::logout; -use codex_core::config::Config; -use codex_core::config::ConfigOverrides; -use codex_login::ServerOptions; -use codex_login::run_device_code_login; -use codex_login::run_login_server; +use codex_core::auth::{AuthCredentialsStoreMode, CLIENT_ID, login_with_api_key, logout}; +use codex_core::config::{Config, ConfigOverrides}; +use codex_login::{ServerOptions, run_device_code_login, run_login_server}; use codex_protocol::config_types::ForcedLoginMethod; -use std::io::IsTerminal; -use std::io::Read; -use std::path::PathBuf; pub async fn login_with_chatgpt( codex_home: PathBuf, diff --git a/codex-rs/cli/src/main.rs b/codex-rs/cli/src/main.rs index 929fd9e785..15c3eb025e 100644 --- a/codex-rs/cli/src/main.rs +++ b/codex-rs/cli/src/main.rs @@ -1,37 +1,30 @@ -use clap::CommandFactory; -use clap::Parser; -use clap_complete::Shell; -use clap_complete::generate; +use std::path::PathBuf; + +use clap::{CommandFactory, Parser}; +use clap_complete::{Shell, generate}; use codex_arg0::arg0_dispatch_or_else; -use codex_chatgpt::apply_command::ApplyCommand; -use codex_chatgpt::apply_command::run_apply_command; -use codex_cli::LandlockCommand; -use codex_cli::SeatbeltCommand; -use codex_cli::WindowsCommand; -use codex_cli::login::read_api_key_from_stdin; -use codex_cli::login::run_login_status; -use codex_cli::login::run_login_with_api_key; -use codex_cli::login::run_login_with_chatgpt; -use codex_cli::login::run_login_with_device_code; -use codex_cli::login::run_logout; +use codex_chatgpt::apply_command::{ApplyCommand, run_apply_command}; +use codex_cli::login::{ + read_api_key_from_stdin, run_login_status, run_login_with_api_key, run_login_with_chatgpt, + run_login_with_device_code, run_logout, +}; +use codex_cli::{LandlockCommand, SeatbeltCommand, WindowsCommand}; use codex_cloud_tasks::Cli as CloudTasksCli; use codex_common::CliConfigOverrides; use codex_exec::Cli as ExecCli; use codex_responses_api_proxy::Args as ResponsesApiProxyArgs; -use codex_tui::AppExitInfo; -use codex_tui::Cli as TuiCli; use codex_tui::updates::UpdateAction; +use codex_tui::{AppExitInfo, Cli as TuiCli}; use owo_colors::OwoColorize; -use std::path::PathBuf; use supports_color::Stream; mod mcp_cmd; -use crate::mcp_cmd::McpCli; -use codex_core::config::Config; -use codex_core::config::ConfigOverrides; +use codex_core::config::{Config, ConfigOverrides}; use codex_core::features::is_known_feature_key; +use crate::mcp_cmd::McpCli; + /// Codex CLI /// /// If no subcommand is specified, options will be forwarded to the interactive CLI. @@ -632,12 +625,13 @@ fn print_completion(cmd: CompletionCommand) { #[cfg(test)] mod tests { - use super::*; use assert_matches::assert_matches; use codex_core::protocol::TokenUsage; use codex_protocol::ConversationId; use pretty_assertions::assert_eq; + use super::*; + fn finalize_from_args(args: &[&str]) -> TuiCli { let cli = MultitoolCli::try_parse_from(args).expect("parse"); let MultitoolCli { diff --git a/codex-rs/cli/src/mcp_cmd.rs b/codex-rs/cli/src/mcp_cmd.rs index ec37c3a6bd..26427f7e66 100644 --- a/codex-rs/cli/src/mcp_cmd.rs +++ b/codex-rs/cli/src/mcp_cmd.rs @@ -1,25 +1,16 @@ use std::collections::HashMap; -use anyhow::Context; -use anyhow::Result; -use anyhow::anyhow; -use anyhow::bail; +use anyhow::{Context, Result, anyhow, bail}; use clap::ArgGroup; use codex_common::CliConfigOverrides; use codex_common::format_env_display::format_env_display; -use codex_core::config::Config; -use codex_core::config::ConfigOverrides; use codex_core::config::edit::ConfigEditsBuilder; -use codex_core::config::find_codex_home; -use codex_core::config::load_global_mcp_servers; -use codex_core::config::types::McpServerConfig; -use codex_core::config::types::McpServerTransportConfig; +use codex_core::config::types::{McpServerConfig, McpServerTransportConfig}; +use codex_core::config::{Config, ConfigOverrides, find_codex_home, load_global_mcp_servers}; use codex_core::features::Feature; use codex_core::mcp::auth::compute_auth_statuses; use codex_core::protocol::McpAuthStatus; -use codex_rmcp_client::delete_oauth_tokens; -use codex_rmcp_client::perform_oauth_login; -use codex_rmcp_client::supports_oauth_login; +use codex_rmcp_client::{delete_oauth_tokens, perform_oauth_login, supports_oauth_login}; /// [experimental] Launch Codex as an MCP server or manage configured MCP servers. /// diff --git a/codex-rs/cli/tests/mcp_list.rs b/codex-rs/cli/tests/mcp_list.rs index 1492365afb..64528ad497 100644 --- a/codex-rs/cli/tests/mcp_list.rs +++ b/codex-rs/cli/tests/mcp_list.rs @@ -7,8 +7,7 @@ use codex_core::config::types::McpServerTransportConfig; use predicates::prelude::PredicateBooleanExt; use predicates::str::contains; use pretty_assertions::assert_eq; -use serde_json::Value as JsonValue; -use serde_json::json; +use serde_json::{Value as JsonValue, json}; use tempfile::TempDir; fn codex_command(codex_home: &Path) -> Result { diff --git a/codex-rs/cloud-tasks-client/src/api.rs b/codex-rs/cloud-tasks-client/src/api.rs index 4bd12939e8..6bd76df2ac 100644 --- a/codex-rs/cloud-tasks-client/src/api.rs +++ b/codex-rs/cloud-tasks-client/src/api.rs @@ -1,7 +1,5 @@ -use chrono::DateTime; -use chrono::Utc; -use serde::Deserialize; -use serde::Serialize; +use chrono::{DateTime, Utc}; +use serde::{Deserialize, Serialize}; pub type Result = std::result::Result; diff --git a/codex-rs/cloud-tasks-client/src/http.rs b/codex-rs/cloud-tasks-client/src/http.rs index 57d39b7bda..39fa8e66f8 100644 --- a/codex-rs/cloud-tasks-client/src/http.rs +++ b/codex-rs/cloud-tasks-client/src/http.rs @@ -1,21 +1,13 @@ -use crate::ApplyOutcome; -use crate::ApplyStatus; -use crate::AttemptStatus; -use crate::CloudBackend; -use crate::CloudTaskError; -use crate::DiffSummary; -use crate::Result; -use crate::TaskId; -use crate::TaskStatus; -use crate::TaskSummary; -use crate::TurnAttempt; -use crate::api::TaskText; -use chrono::DateTime; -use chrono::Utc; - +use chrono::{DateTime, Utc}; use codex_backend_client as backend; use codex_backend_client::CodeTaskDetailsResponseExt; +use crate::api::TaskText; +use crate::{ + ApplyOutcome, ApplyStatus, AttemptStatus, CloudBackend, CloudTaskError, DiffSummary, Result, + TaskId, TaskStatus, TaskSummary, TurnAttempt, +}; + #[derive(Clone)] pub struct HttpClient { pub base_url: String, @@ -110,11 +102,13 @@ impl CloudBackend for HttpClient { } mod api { - use super::*; - use serde_json::Value; use std::cmp::Ordering; use std::collections::HashMap; + use serde_json::Value; + + use super::*; + pub(crate) struct Tasks<'a> { base_url: &'a str, backend: &'a backend::Client, diff --git a/codex-rs/cloud-tasks-client/src/lib.rs b/codex-rs/cloud-tasks-client/src/lib.rs index a723512f8a..3a8856858d 100644 --- a/codex-rs/cloud-tasks-client/src/lib.rs +++ b/codex-rs/cloud-tasks-client/src/lib.rs @@ -1,18 +1,9 @@ mod api; -pub use api::ApplyOutcome; -pub use api::ApplyStatus; -pub use api::AttemptStatus; -pub use api::CloudBackend; -pub use api::CloudTaskError; -pub use api::CreatedTask; -pub use api::DiffSummary; -pub use api::Result; -pub use api::TaskId; -pub use api::TaskStatus; -pub use api::TaskSummary; -pub use api::TaskText; -pub use api::TurnAttempt; +pub use api::{ + ApplyOutcome, ApplyStatus, AttemptStatus, CloudBackend, CloudTaskError, CreatedTask, + DiffSummary, Result, TaskId, TaskStatus, TaskSummary, TaskText, TurnAttempt, +}; #[cfg(feature = "mock")] mod mock; @@ -20,10 +11,9 @@ mod mock; #[cfg(feature = "online")] mod http; +#[cfg(feature = "online")] +pub use http::HttpClient; #[cfg(feature = "mock")] pub use mock::MockClient; -#[cfg(feature = "online")] -pub use http::HttpClient; - // Reusable apply engine now lives in the shared crate `codex-git`. diff --git a/codex-rs/cloud-tasks-client/src/mock.rs b/codex-rs/cloud-tasks-client/src/mock.rs index 97bc5520a8..9df569e820 100644 --- a/codex-rs/cloud-tasks-client/src/mock.rs +++ b/codex-rs/cloud-tasks-client/src/mock.rs @@ -1,15 +1,11 @@ -use crate::ApplyOutcome; -use crate::AttemptStatus; -use crate::CloudBackend; -use crate::DiffSummary; -use crate::Result; -use crate::TaskId; -use crate::TaskStatus; -use crate::TaskSummary; -use crate::TurnAttempt; -use crate::api::TaskText; use chrono::Utc; +use crate::api::TaskText; +use crate::{ + ApplyOutcome, AttemptStatus, CloudBackend, DiffSummary, Result, TaskId, TaskStatus, + TaskSummary, TurnAttempt, +}; + #[derive(Clone, Default)] pub struct MockClient; diff --git a/codex-rs/cloud-tasks/src/app.rs b/codex-rs/cloud-tasks/src/app.rs index 612c5f6be4..8246e5fbcb 100644 --- a/codex-rs/cloud-tasks/src/app.rs +++ b/codex-rs/cloud-tasks/src/app.rs @@ -1,5 +1,4 @@ -use std::time::Duration; -use std::time::Instant; +use std::time::{Duration, Instant}; // Environment filter data models for the TUI #[derive(Clone, Debug, Default)] @@ -39,10 +38,9 @@ pub struct ApplyModalState { pub diff_override: Option, } +use codex_cloud_tasks_client::{CloudBackend, TaskId, TaskSummary}; + use crate::scrollable_diff::ScrollableDiff; -use codex_cloud_tasks_client::CloudBackend; -use codex_cloud_tasks_client::TaskId; -use codex_cloud_tasks_client::TaskSummary; #[derive(Default)] pub struct App { pub tasks: Vec, @@ -348,9 +346,10 @@ pub enum AppEvent { // Convenience aliases; currently unused. #[cfg(test)] mod tests { - use super::*; use chrono::Utc; + use super::*; + struct FakeBackend { // maps env key to titles by_env: std::collections::HashMap, Vec<&'static str>>, diff --git a/codex-rs/cloud-tasks/src/cli.rs b/codex-rs/cloud-tasks/src/cli.rs index 4122aeff68..3d706755c8 100644 --- a/codex-rs/cloud-tasks/src/cli.rs +++ b/codex-rs/cloud-tasks/src/cli.rs @@ -1,5 +1,4 @@ -use clap::Args; -use clap::Parser; +use clap::{Args, Parser}; use codex_common::CliConfigOverrides; #[derive(Parser, Debug, Default)] diff --git a/codex-rs/cloud-tasks/src/env_detect.rs b/codex-rs/cloud-tasks/src/env_detect.rs index e7e8fb6b16..c0b91e48e1 100644 --- a/codex-rs/cloud-tasks/src/env_detect.rs +++ b/codex-rs/cloud-tasks/src/env_detect.rs @@ -1,8 +1,7 @@ -use reqwest::header::CONTENT_TYPE; -use reqwest::header::HeaderMap; use std::collections::HashMap; -use tracing::info; -use tracing::warn; + +use reqwest::header::{CONTENT_TYPE, HeaderMap}; +use tracing::{info, warn}; #[derive(Debug, Clone, serde::Deserialize)] struct CodeEnvironment { diff --git a/codex-rs/cloud-tasks/src/lib.rs b/codex-rs/cloud-tasks/src/lib.rs index 8f8b3066c9..52c53bf77c 100644 --- a/codex-rs/cloud-tasks/src/lib.rs +++ b/codex-rs/cloud-tasks/src/lib.rs @@ -5,20 +5,17 @@ mod new_task; pub mod scrollable_diff; mod ui; pub mod util; -pub use cli::Cli; - -use anyhow::anyhow; -use std::io::IsTerminal; -use std::io::Read; +use std::io::{IsTerminal, Read}; use std::path::PathBuf; use std::sync::Arc; -use std::time::Duration; -use std::time::Instant; +use std::time::{Duration, Instant}; + +use anyhow::anyhow; +pub use cli::Cli; use tokio::sync::mpsc::UnboundedSender; use tracing::info; use tracing_subscriber::EnvFilter; -use util::append_error_log; -use util::set_user_agent_suffix; +use util::{append_error_log, set_user_agent_suffix}; struct ApplyJob { task_id: codex_cloud_tasks_client::TaskId, @@ -354,15 +351,13 @@ pub async fn run_main(cli: Cli, _codex_linux_sandbox_exe: Option) -> an // Terminal setup use crossterm::ExecutableCommand; - use crossterm::event::DisableBracketedPaste; - use crossterm::event::EnableBracketedPaste; - use crossterm::event::KeyboardEnhancementFlags; - use crossterm::event::PopKeyboardEnhancementFlags; - use crossterm::event::PushKeyboardEnhancementFlags; - use crossterm::terminal::EnterAlternateScreen; - use crossterm::terminal::LeaveAlternateScreen; - use crossterm::terminal::disable_raw_mode; - use crossterm::terminal::enable_raw_mode; + use crossterm::event::{ + DisableBracketedPaste, EnableBracketedPaste, KeyboardEnhancementFlags, + PopKeyboardEnhancementFlags, PushKeyboardEnhancementFlags, + }; + use crossterm::terminal::{ + EnterAlternateScreen, LeaveAlternateScreen, disable_raw_mode, enable_raw_mode, + }; use ratatui::Terminal; use ratatui::backend::CrosstermBackend; let mut stdout = std::io::stdout(); @@ -406,11 +401,7 @@ pub async fn run_main(cli: Cli, _codex_linux_sandbox_exe: Option) -> an // reset any in-flight enrichment state // Event stream - use crossterm::event::Event; - use crossterm::event::EventStream; - use crossterm::event::KeyCode; - use crossterm::event::KeyEventKind; - use crossterm::event::KeyModifiers; + use crossterm::event::{Event, EventStream, KeyCode, KeyEventKind, KeyModifiers}; use tokio_stream::StreamExt; let mut events = EventStream::new(); @@ -464,8 +455,8 @@ pub async fn run_main(cli: Cli, _codex_linux_sandbox_exe: Option) -> an // Event-driven redraws with a tiny coalescing scheduler (snappy UI, no fixed 250ms tick). let mut needs_redraw = true; use std::time::Instant; - use tokio::time::Instant as TokioInstant; - use tokio::time::sleep_until; + + use tokio::time::{Instant as TokioInstant, sleep_until}; let (frame_tx, mut frame_rx) = tokio::sync::mpsc::unbounded_channel::(); let (redraw_tx, mut redraw_rx) = tokio::sync::mpsc::unbounded_channel::<()>(); @@ -1723,11 +1714,8 @@ fn pretty_lines_from_error(raw: &str) -> Vec { #[cfg(test)] mod tests { - use codex_tui::ComposerAction; - use codex_tui::ComposerInput; - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use codex_tui::{ComposerAction, ComposerInput}; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; use ratatui::buffer::Buffer; use ratatui::layout::Rect; diff --git a/codex-rs/cloud-tasks/src/scrollable_diff.rs b/codex-rs/cloud-tasks/src/scrollable_diff.rs index 97dfb24895..e2a5364d43 100644 --- a/codex-rs/cloud-tasks/src/scrollable_diff.rs +++ b/codex-rs/cloud-tasks/src/scrollable_diff.rs @@ -1,5 +1,4 @@ -use unicode_width::UnicodeWidthChar; -use unicode_width::UnicodeWidthStr; +use unicode_width::{UnicodeWidthChar, UnicodeWidthStr}; /// Scroll position and geometry for a vertical scroll view. #[derive(Clone, Copy, Debug, Default)] diff --git a/codex-rs/cloud-tasks/src/ui.rs b/codex-rs/cloud-tasks/src/ui.rs index e3a97aeb3f..b857b053aa 100644 --- a/codex-rs/cloud-tasks/src/ui.rs +++ b/codex-rs/cloud-tasks/src/ui.rs @@ -1,30 +1,17 @@ -use ratatui::layout::Constraint; -use ratatui::layout::Direction; -use ratatui::layout::Layout; -use ratatui::prelude::*; -use ratatui::style::Color; -use ratatui::style::Modifier; -use ratatui::style::Style; -use ratatui::style::Stylize; -use ratatui::widgets::Block; -use ratatui::widgets::BorderType; -use ratatui::widgets::Borders; -use ratatui::widgets::Clear; -use ratatui::widgets::List; -use ratatui::widgets::ListItem; -use ratatui::widgets::ListState; -use ratatui::widgets::Padding; -use ratatui::widgets::Paragraph; use std::sync::OnceLock; use std::time::Instant; -use crate::app::App; -use crate::app::AttemptView; -use chrono::Local; -use chrono::Utc; -use codex_cloud_tasks_client::AttemptStatus; -use codex_cloud_tasks_client::TaskStatus; +use chrono::{Local, Utc}; +use codex_cloud_tasks_client::{AttemptStatus, TaskStatus}; use codex_tui::render_markdown_text; +use ratatui::layout::{Constraint, Direction, Layout}; +use ratatui::prelude::*; +use ratatui::style::{Color, Modifier, Style, Stylize}; +use ratatui::widgets::{ + Block, BorderType, Borders, Clear, List, ListItem, ListState, Padding, Paragraph, +}; + +use crate::app::{App, AttemptView}; pub fn draw(frame: &mut Frame, app: &mut App) { let area = frame.area(); @@ -749,9 +736,7 @@ fn attempt_status_span(status: AttemptStatus) -> Option Line<'static> { - use ratatui::style::Color; - use ratatui::style::Modifier; - use ratatui::style::Style; + use ratatui::style::{Color, Modifier, Style}; use ratatui::text::Span; if raw.starts_with("@@") { diff --git a/codex-rs/cloud-tasks/src/util.rs b/codex-rs/cloud-tasks/src/util.rs index ff17265f3d..35df486149 100644 --- a/codex-rs/cloud-tasks/src/util.rs +++ b/codex-rs/cloud-tasks/src/util.rs @@ -57,10 +57,7 @@ pub fn extract_chatgpt_account_id(token: &str) -> Option { /// Build headers for ChatGPT-backed requests: `User-Agent`, optional `Authorization`, /// and optional `ChatGPT-Account-Id`. pub async fn build_chatgpt_headers() -> HeaderMap { - use reqwest::header::AUTHORIZATION; - use reqwest::header::HeaderName; - use reqwest::header::HeaderValue; - use reqwest::header::USER_AGENT; + use reqwest::header::{AUTHORIZATION, HeaderName, HeaderValue, USER_AGENT}; set_user_agent_suffix("codex_cloud_tasks_tui"); let ua = codex_core::default_client::get_codex_user_agent(); diff --git a/codex-rs/cloud-tasks/tests/env_filter.rs b/codex-rs/cloud-tasks/tests/env_filter.rs index 8c737c6c28..cc23d7d9ac 100644 --- a/codex-rs/cloud-tasks/tests/env_filter.rs +++ b/codex-rs/cloud-tasks/tests/env_filter.rs @@ -1,5 +1,4 @@ -use codex_cloud_tasks_client::CloudBackend; -use codex_cloud_tasks_client::MockClient; +use codex_cloud_tasks_client::{CloudBackend, MockClient}; #[tokio::test] async fn mock_backend_varies_by_env() { diff --git a/codex-rs/codex-backend-openapi-models/src/models/code_task_details_response.rs b/codex-rs/codex-backend-openapi-models/src/models/code_task_details_response.rs index 725b3a3737..ce5bf01255 100644 --- a/codex-rs/codex-backend-openapi-models/src/models/code_task_details_response.rs +++ b/codex-rs/codex-backend-openapi-models/src/models/code_task_details_response.rs @@ -8,9 +8,9 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + use crate::models; -use serde::Deserialize; -use serde::Serialize; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct CodeTaskDetailsResponse { diff --git a/codex-rs/codex-backend-openapi-models/src/models/external_pull_request_response.rs b/codex-rs/codex-backend-openapi-models/src/models/external_pull_request_response.rs index 92b56db2ca..7cd8e69642 100644 --- a/codex-rs/codex-backend-openapi-models/src/models/external_pull_request_response.rs +++ b/codex-rs/codex-backend-openapi-models/src/models/external_pull_request_response.rs @@ -8,9 +8,9 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + use crate::models; -use serde::Deserialize; -use serde::Serialize; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ExternalPullRequestResponse { diff --git a/codex-rs/codex-backend-openapi-models/src/models/git_pull_request.rs b/codex-rs/codex-backend-openapi-models/src/models/git_pull_request.rs index a7e995f3ef..42b493f8df 100644 --- a/codex-rs/codex-backend-openapi-models/src/models/git_pull_request.rs +++ b/codex-rs/codex-backend-openapi-models/src/models/git_pull_request.rs @@ -8,8 +8,7 @@ * Generated by: https://openapi-generator.tech */ -use serde::Deserialize; -use serde::Serialize; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct GitPullRequest { diff --git a/codex-rs/codex-backend-openapi-models/src/models/mod.rs b/codex-rs/codex-backend-openapi-models/src/models/mod.rs index 96348d72c2..d1e853b659 100644 --- a/codex-rs/codex-backend-openapi-models/src/models/mod.rs +++ b/codex-rs/codex-backend-openapi-models/src/models/mod.rs @@ -24,8 +24,7 @@ pub use self::paginated_list_task_list_item_::PaginatedListTaskListItem; // Rate Limits pub mod rate_limit_status_payload; -pub use self::rate_limit_status_payload::PlanType; -pub use self::rate_limit_status_payload::RateLimitStatusPayload; +pub use self::rate_limit_status_payload::{PlanType, RateLimitStatusPayload}; pub mod rate_limit_status_details; pub use self::rate_limit_status_details::RateLimitStatusDetails; diff --git a/codex-rs/codex-backend-openapi-models/src/models/paginated_list_task_list_item_.rs b/codex-rs/codex-backend-openapi-models/src/models/paginated_list_task_list_item_.rs index 5af75afaab..e4450c24ba 100644 --- a/codex-rs/codex-backend-openapi-models/src/models/paginated_list_task_list_item_.rs +++ b/codex-rs/codex-backend-openapi-models/src/models/paginated_list_task_list_item_.rs @@ -8,9 +8,9 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + use crate::models; -use serde::Deserialize; -use serde::Serialize; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PaginatedListTaskListItem { diff --git a/codex-rs/codex-backend-openapi-models/src/models/rate_limit_status_details.rs b/codex-rs/codex-backend-openapi-models/src/models/rate_limit_status_details.rs index ca9fdfe240..13620c8b2d 100644 --- a/codex-rs/codex-backend-openapi-models/src/models/rate_limit_status_details.rs +++ b/codex-rs/codex-backend-openapi-models/src/models/rate_limit_status_details.rs @@ -8,9 +8,9 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + use crate::models; -use serde::Deserialize; -use serde::Serialize; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct RateLimitStatusDetails { diff --git a/codex-rs/codex-backend-openapi-models/src/models/rate_limit_status_payload.rs b/codex-rs/codex-backend-openapi-models/src/models/rate_limit_status_payload.rs index d2af76f4d7..d203e32205 100644 --- a/codex-rs/codex-backend-openapi-models/src/models/rate_limit_status_payload.rs +++ b/codex-rs/codex-backend-openapi-models/src/models/rate_limit_status_payload.rs @@ -8,9 +8,9 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + use crate::models; -use serde::Deserialize; -use serde::Serialize; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct RateLimitStatusPayload { diff --git a/codex-rs/codex-backend-openapi-models/src/models/rate_limit_window_snapshot.rs b/codex-rs/codex-backend-openapi-models/src/models/rate_limit_window_snapshot.rs index 4fc04f4be6..19323e01c3 100644 --- a/codex-rs/codex-backend-openapi-models/src/models/rate_limit_window_snapshot.rs +++ b/codex-rs/codex-backend-openapi-models/src/models/rate_limit_window_snapshot.rs @@ -8,8 +8,7 @@ * Generated by: https://openapi-generator.tech */ -use serde::Deserialize; -use serde::Serialize; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct RateLimitWindowSnapshot { diff --git a/codex-rs/codex-backend-openapi-models/src/models/task_list_item.rs b/codex-rs/codex-backend-openapi-models/src/models/task_list_item.rs index 5f34738a43..d00a9560fe 100644 --- a/codex-rs/codex-backend-openapi-models/src/models/task_list_item.rs +++ b/codex-rs/codex-backend-openapi-models/src/models/task_list_item.rs @@ -8,9 +8,9 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + use crate::models; -use serde::Deserialize; -use serde::Serialize; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct TaskListItem { diff --git a/codex-rs/codex-backend-openapi-models/src/models/task_response.rs b/codex-rs/codex-backend-openapi-models/src/models/task_response.rs index 6251b56b7e..1fca9e30d4 100644 --- a/codex-rs/codex-backend-openapi-models/src/models/task_response.rs +++ b/codex-rs/codex-backend-openapi-models/src/models/task_response.rs @@ -8,9 +8,9 @@ * Generated by: https://openapi-generator.tech */ +use serde::{Deserialize, Serialize}; + use crate::models; -use serde::Deserialize; -use serde::Serialize; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct TaskResponse { diff --git a/codex-rs/common/src/approval_mode_cli_arg.rs b/codex-rs/common/src/approval_mode_cli_arg.rs index e8c0682687..600cc57314 100644 --- a/codex-rs/common/src/approval_mode_cli_arg.rs +++ b/codex-rs/common/src/approval_mode_cli_arg.rs @@ -2,7 +2,6 @@ //! Available when the `cli` feature is enabled for the crate. use clap::ValueEnum; - use codex_core::protocol::AskForApproval; #[derive(Clone, Copy, Debug, ValueEnum)] diff --git a/codex-rs/common/src/approval_presets.rs b/codex-rs/common/src/approval_presets.rs index 6c3bf395ad..8f65dfb98c 100644 --- a/codex-rs/common/src/approval_presets.rs +++ b/codex-rs/common/src/approval_presets.rs @@ -1,5 +1,4 @@ -use codex_core::protocol::AskForApproval; -use codex_core::protocol::SandboxPolicy; +use codex_core::protocol::{AskForApproval, SandboxPolicy}; /// A simple preset pairing an approval policy with a sandbox policy. #[derive(Debug, Clone)] diff --git a/codex-rs/common/src/config_override.rs b/codex-rs/common/src/config_override.rs index 6b77099524..6eaf3d32e6 100644 --- a/codex-rs/common/src/config_override.rs +++ b/codex-rs/common/src/config_override.rs @@ -7,8 +7,7 @@ //! key/value pairs as well as to apply them onto a mutable //! `serde_json::Value` representing the configuration tree. -use clap::ArgAction; -use clap::Parser; +use clap::{ArgAction, Parser}; use serde::de::Error as SerdeError; use toml::Value; diff --git a/codex-rs/common/src/elapsed.rs b/codex-rs/common/src/elapsed.rs index 297832b1ec..b8322445b1 100644 --- a/codex-rs/common/src/elapsed.rs +++ b/codex-rs/common/src/elapsed.rs @@ -1,5 +1,4 @@ -use std::time::Duration; -use std::time::Instant; +use std::time::{Duration, Instant}; /// Returns a string representing the elapsed time since `start_time` like /// "1m 15s" or "1.50s". diff --git a/codex-rs/core/src/apply_patch.rs b/codex-rs/core/src/apply_patch.rs index dffe94be61..3e502b5047 100644 --- a/codex-rs/core/src/apply_patch.rs +++ b/codex-rs/core/src/apply_patch.rs @@ -1,15 +1,13 @@ -use crate::codex::Session; -use crate::codex::TurnContext; -use crate::function_tool::FunctionCallError; -use crate::protocol::FileChange; -use crate::protocol::ReviewDecision; -use crate::safety::SafetyCheck; -use crate::safety::assess_patch_safety; -use codex_apply_patch::ApplyPatchAction; -use codex_apply_patch::ApplyPatchFileChange; use std::collections::HashMap; use std::path::PathBuf; +use codex_apply_patch::{ApplyPatchAction, ApplyPatchFileChange}; + +use crate::codex::{Session, TurnContext}; +use crate::function_tool::FunctionCallError; +use crate::protocol::{FileChange, ReviewDecision}; +use crate::safety::{SafetyCheck, assess_patch_safety}; + pub const CODEX_APPLY_PATCH_ARG1: &str = "--codex-run-as-apply-patch"; pub(crate) enum InternalApplyPatchInvocation { @@ -118,11 +116,11 @@ pub(crate) fn convert_apply_patch_to_protocol( #[cfg(test)] mod tests { - use super::*; use pretty_assertions::assert_eq; - use tempfile::tempdir; + use super::*; + #[test] fn convert_apply_patch_maps_add_variant() { let tmp = tempdir().expect("tmp"); diff --git a/codex-rs/core/src/auth.rs b/codex-rs/core/src/auth.rs index 655d8230e4..0c2804f1cc 100644 --- a/codex-rs/core/src/auth.rs +++ b/codex-rs/core/src/auth.rs @@ -1,37 +1,29 @@ mod storage; -use chrono::Utc; -use reqwest::StatusCode; -use serde::Deserialize; -use serde::Serialize; -#[cfg(test)] -use serial_test::serial; use std::env; use std::fmt::Debug; use std::io::ErrorKind; -use std::path::Path; -use std::path::PathBuf; -use std::sync::Arc; -use std::sync::Mutex; +use std::path::{Path, PathBuf}; +use std::sync::{Arc, Mutex}; use std::time::Duration; +use chrono::Utc; use codex_app_server_protocol::AuthMode; use codex_protocol::config_types::ForcedLoginMethod; +use reqwest::StatusCode; +use serde::{Deserialize, Serialize}; +use serde_json::Value; +#[cfg(test)] +use serial_test::serial; +use thiserror::Error; -pub use crate::auth::storage::AuthCredentialsStoreMode; -pub use crate::auth::storage::AuthDotJson; -use crate::auth::storage::AuthStorageBackend; -use crate::auth::storage::create_auth_storage; +pub use crate::auth::storage::{AuthCredentialsStoreMode, AuthDotJson}; +use crate::auth::storage::{AuthStorageBackend, create_auth_storage}; use crate::config::Config; use crate::default_client::CodexHttpClient; -use crate::error::RefreshTokenFailedError; -use crate::error::RefreshTokenFailedReason; -use crate::token_data::PlanType; -use crate::token_data::TokenData; -use crate::token_data::parse_id_token; +use crate::error::{RefreshTokenFailedError, RefreshTokenFailedReason}; +use crate::token_data::{PlanType, TokenData, parse_id_token}; use crate::util::try_parse_error_message; -use serde_json::Value; -use thiserror::Error; #[derive(Debug, Clone)] pub struct CodexAuth { @@ -602,16 +594,6 @@ struct CachedAuth { #[cfg(test)] mod tests { - use super::*; - use crate::auth::storage::FileAuthStorage; - use crate::auth::storage::get_auth_file; - use crate::config::Config; - use crate::config::ConfigOverrides; - use crate::config::ConfigToml; - use crate::token_data::IdTokenInfo; - use crate::token_data::KnownPlan; - use crate::token_data::PlanType; - use base64::Engine; use codex_protocol::config_types::ForcedLoginMethod; use pretty_assertions::assert_eq; @@ -619,6 +601,11 @@ mod tests { use serde_json::json; use tempfile::tempdir; + use super::*; + use crate::auth::storage::{FileAuthStorage, get_auth_file}; + use crate::config::{Config, ConfigOverrides, ConfigToml}; + use crate::token_data::{IdTokenInfo, KnownPlan, PlanType}; + #[tokio::test] async fn refresh_without_id_token() { let codex_home = tempdir().unwrap(); diff --git a/codex-rs/core/src/auth/storage.rs b/codex-rs/core/src/auth/storage.rs index a238eb9c38..a452324981 100644 --- a/codex-rs/core/src/auth/storage.rs +++ b/codex-rs/core/src/auth/storage.rs @@ -1,24 +1,18 @@ -use chrono::DateTime; -use chrono::Utc; -use serde::Deserialize; -use serde::Serialize; -use sha2::Digest; -use sha2::Sha256; use std::fmt::Debug; -use std::fs::File; -use std::fs::OpenOptions; -use std::io::Read; -use std::io::Write; +use std::fs::{File, OpenOptions}; +use std::io::{Read, Write}; #[cfg(unix)] use std::os::unix::fs::OpenOptionsExt; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::sync::Arc; + +use chrono::{DateTime, Utc}; +use codex_keyring_store::{DefaultKeyringStore, KeyringStore}; +use serde::{Deserialize, Serialize}; +use sha2::{Digest, Sha256}; use tracing::warn; use crate::token_data::TokenData; -use codex_keyring_store::DefaultKeyringStore; -use codex_keyring_store::KeyringStore; /// Determine where Codex should store CLI auth credentials. #[derive(Debug, Default, Copy, Clone, PartialEq, Eq, Serialize, Deserialize)] @@ -279,16 +273,16 @@ fn create_auth_storage_with_keyring_store( #[cfg(test)] mod tests { - use super::*; - use crate::token_data::IdTokenInfo; use anyhow::Context; use base64::Engine; + use codex_keyring_store::tests::MockKeyringStore; + use keyring::Error as KeyringError; use pretty_assertions::assert_eq; use serde_json::json; use tempfile::tempdir; - use codex_keyring_store::tests::MockKeyringStore; - use keyring::Error as KeyringError; + use super::*; + use crate::token_data::IdTokenInfo; #[tokio::test] async fn file_storage_load_returns_auth_dot_json() -> anyhow::Result<()> { diff --git a/codex-rs/core/src/bash.rs b/codex-rs/core/src/bash.rs index 07fc125f16..36ec7a3344 100644 --- a/codex-rs/core/src/bash.rs +++ b/codex-rs/core/src/bash.rs @@ -1,6 +1,4 @@ -use tree_sitter::Node; -use tree_sitter::Parser; -use tree_sitter::Tree; +use tree_sitter::{Node, Parser, Tree}; use tree_sitter_bash::LANGUAGE as BASH; /// Parse the provided bash source using tree-sitter-bash, returning a Tree on diff --git a/codex-rs/core/src/chat_completions.rs b/codex-rs/core/src/chat_completions.rs index abb27d9b55..10aa93c275 100644 --- a/codex-rs/core/src/chat_completions.rs +++ b/codex-rs/core/src/chat_completions.rs @@ -1,40 +1,31 @@ +use std::pin::Pin; +use std::task::{Context, Poll}; use std::time::Duration; +use bytes::Bytes; +use codex_otel::otel_event_manager::OtelEventManager; +use codex_protocol::models::{ + ContentItem, FunctionCallOutputContentItem, ReasoningItemContent, ResponseItem, +}; +use codex_protocol::protocol::{SessionSource, SubAgentSource}; +use eventsource_stream::Eventsource; +use futures::{Stream, StreamExt, TryStreamExt}; +use reqwest::StatusCode; +use serde_json::json; +use tokio::sync::mpsc; +use tokio::time::timeout; +use tracing::{debug, trace}; + use crate::ModelProviderInfo; -use crate::client_common::Prompt; -use crate::client_common::ResponseEvent; -use crate::client_common::ResponseStream; +use crate::client_common::{Prompt, ResponseEvent, ResponseStream}; use crate::default_client::CodexHttpClient; -use crate::error::CodexErr; -use crate::error::ConnectionFailedError; -use crate::error::ResponseStreamFailed; -use crate::error::Result; -use crate::error::RetryLimitReachedError; -use crate::error::UnexpectedResponseError; +use crate::error::{ + CodexErr, ConnectionFailedError, ResponseStreamFailed, Result, RetryLimitReachedError, + UnexpectedResponseError, +}; use crate::model_family::ModelFamily; use crate::tools::spec::create_tools_json_for_chat_completions_api; use crate::util::backoff; -use bytes::Bytes; -use codex_otel::otel_event_manager::OtelEventManager; -use codex_protocol::models::ContentItem; -use codex_protocol::models::FunctionCallOutputContentItem; -use codex_protocol::models::ReasoningItemContent; -use codex_protocol::models::ResponseItem; -use codex_protocol::protocol::SessionSource; -use codex_protocol::protocol::SubAgentSource; -use eventsource_stream::Eventsource; -use futures::Stream; -use futures::StreamExt; -use futures::TryStreamExt; -use reqwest::StatusCode; -use serde_json::json; -use std::pin::Pin; -use std::task::Context; -use std::task::Poll; -use tokio::sync::mpsc; -use tokio::time::timeout; -use tracing::debug; -use tracing::trace; /// Implementation for the classic Chat Completions API. pub(crate) async fn stream_chat_completions( diff --git a/codex-rs/core/src/client.rs b/codex-rs/core/src/client.rs index 8cd1bca564..4cf7a89d95 100644 --- a/codex-rs/core/src/client.rs +++ b/codex-rs/core/src/client.rs @@ -1,17 +1,16 @@ use std::io::BufRead; use std::path::Path; -use std::sync::Arc; -use std::sync::OnceLock; +use std::sync::{Arc, OnceLock}; use std::time::Duration; use bytes::Bytes; -use chrono::DateTime; -use chrono::Utc; +use chrono::{DateTime, Utc}; use codex_app_server_protocol::AuthMode; use codex_otel::otel_event_manager::OtelEventManager; use codex_protocol::ConversationId; -use codex_protocol::config_types::ReasoningEffort as ReasoningEffortConfig; -use codex_protocol::config_types::ReasoningSummary as ReasoningSummaryConfig; +use codex_protocol::config_types::{ + ReasoningEffort as ReasoningEffortConfig, ReasoningSummary as ReasoningSummaryConfig, +}; use codex_protocol::models::ResponseItem; use codex_protocol::protocol::SessionSource; use eventsource_stream::Eventsource; @@ -19,45 +18,31 @@ use futures::prelude::*; use regex_lite::Regex; use reqwest::StatusCode; use reqwest::header::HeaderMap; -use serde::Deserialize; -use serde::Serialize; +use serde::{Deserialize, Serialize}; use serde_json::Value; use tokio::sync::mpsc; use tokio::time::timeout; use tokio_util::io::ReaderStream; -use tracing::debug; -use tracing::trace; -use tracing::warn; +use tracing::{debug, trace, warn}; use crate::AuthManager; -use crate::auth::CodexAuth; -use crate::auth::RefreshTokenError; -use crate::chat_completions::AggregateStreamExt; -use crate::chat_completions::stream_chat_completions; -use crate::client_common::Prompt; -use crate::client_common::ResponseEvent; -use crate::client_common::ResponseStream; -use crate::client_common::ResponsesApiRequest; -use crate::client_common::create_reasoning_param_for_request; -use crate::client_common::create_text_param_for_request; +use crate::auth::{CodexAuth, RefreshTokenError}; +use crate::chat_completions::{AggregateStreamExt, stream_chat_completions}; +use crate::client_common::{ + Prompt, ResponseEvent, ResponseStream, ResponsesApiRequest, create_reasoning_param_for_request, + create_text_param_for_request, +}; use crate::config::Config; -use crate::default_client::CodexHttpClient; -use crate::default_client::create_client; -use crate::error::CodexErr; -use crate::error::ConnectionFailedError; -use crate::error::ResponseStreamFailed; -use crate::error::Result; -use crate::error::RetryLimitReachedError; -use crate::error::UnexpectedResponseError; -use crate::error::UsageLimitReachedError; +use crate::default_client::{CodexHttpClient, create_client}; +use crate::error::{ + CodexErr, ConnectionFailedError, ResponseStreamFailed, Result, RetryLimitReachedError, + UnexpectedResponseError, UsageLimitReachedError, +}; use crate::flags::CODEX_RS_SSE_FIXTURE; use crate::model_family::ModelFamily; -use crate::model_provider_info::ModelProviderInfo; -use crate::model_provider_info::WireApi; +use crate::model_provider_info::{ModelProviderInfo, WireApi}; use crate::openai_model_info::get_model_info; -use crate::protocol::RateLimitSnapshot; -use crate::protocol::RateLimitWindow; -use crate::protocol::TokenUsage; +use crate::protocol::{RateLimitSnapshot, RateLimitWindow, TokenUsage}; use crate::token_data::PlanType; use crate::tools::spec::create_tools_json_for_responses_api; use crate::util::backoff; @@ -977,13 +962,14 @@ fn is_context_window_error(error: &Error) -> bool { #[cfg(test)] mod tests { - use super::*; use assert_matches::assert_matches; use serde_json::json; use tokio::sync::mpsc; use tokio_test::io::Builder as IoBuilder; use tokio_util::io::ReaderStream; + use super::*; + // ──────────────────────────── // Helpers // ──────────────────────────── @@ -1451,8 +1437,7 @@ mod tests { #[test] fn error_response_deserializes_schema_known_plan_type_and_serializes_back() { - use crate::token_data::KnownPlan; - use crate::token_data::PlanType; + use crate::token_data::{KnownPlan, PlanType}; let json = r#"{"error":{"type":"usage_limit_reached","plan_type":"pro","resets_at":1704067200}}"#; diff --git a/codex-rs/core/src/client_common.rs b/codex-rs/core/src/client_common.rs index 2ac02f5f66..a7c04cfb0b 100644 --- a/codex-rs/core/src/client_common.rs +++ b/codex-rs/core/src/client_common.rs @@ -1,25 +1,25 @@ -use crate::client_common::tools::ToolSpec; -use crate::error::Result; -use crate::model_family::ModelFamily; -use crate::protocol::RateLimitSnapshot; -use crate::protocol::TokenUsage; -use codex_apply_patch::APPLY_PATCH_TOOL_INSTRUCTIONS; -use codex_protocol::config_types::ReasoningEffort as ReasoningEffortConfig; -use codex_protocol::config_types::ReasoningSummary as ReasoningSummaryConfig; -use codex_protocol::config_types::Verbosity as VerbosityConfig; -use codex_protocol::models::ResponseItem; -use futures::Stream; -use serde::Deserialize; -use serde::Serialize; -use serde_json::Value; use std::borrow::Cow; use std::collections::HashSet; use std::ops::Deref; use std::pin::Pin; -use std::task::Context; -use std::task::Poll; +use std::task::{Context, Poll}; + +use codex_apply_patch::APPLY_PATCH_TOOL_INSTRUCTIONS; +use codex_protocol::config_types::{ + ReasoningEffort as ReasoningEffortConfig, ReasoningSummary as ReasoningSummaryConfig, + Verbosity as VerbosityConfig, +}; +use codex_protocol::models::ResponseItem; +use futures::Stream; +use serde::{Deserialize, Serialize}; +use serde_json::Value; use tokio::sync::mpsc; +use crate::client_common::tools::ToolSpec; +use crate::error::Result; +use crate::model_family::ModelFamily; +use crate::protocol::{RateLimitSnapshot, TokenUsage}; + /// Review thread system prompt. Edit `core/src/review_prompt.md` to customize. pub const REVIEW_PROMPT: &str = include_str!("../review_prompt.md"); @@ -284,9 +284,9 @@ pub(crate) struct ResponsesApiRequest<'a> { } pub(crate) mod tools { + use serde::{Deserialize, Serialize}; + use crate::tools::spec::JsonSchema; - use serde::Deserialize; - use serde::Serialize; /// When serialized as JSON, this produces a valid "Tool" in the OpenAI /// Responses API. @@ -390,10 +390,10 @@ impl Stream for ResponseStream { #[cfg(test)] mod tests { - use crate::model_family::find_family_for_model; use pretty_assertions::assert_eq; use super::*; + use crate::model_family::find_family_for_model; struct InstructionsTestCase { pub slug: &'static str, diff --git a/codex-rs/core/src/codex.rs b/codex-rs/core/src/codex.rs index 64cd00232e..7c23de527d 100644 --- a/codex-rs/core/src/codex.rs +++ b/codex-rs/core/src/codex.rs @@ -4,134 +4,83 @@ use std::path::PathBuf; use std::sync::Arc; use std::sync::atomic::AtomicU64; -use crate::AuthManager; -use crate::client_common::REVIEW_PROMPT; -use crate::features::Feature; -use crate::function_tool::FunctionCallError; -use crate::mcp::auth::McpAuthStatusEntry; -use crate::mcp_connection_manager::DEFAULT_STARTUP_TIMEOUT; -use crate::parse_command::parse_command; -use crate::parse_turn_item; -use crate::response_processing::process_items; -use crate::terminal; -use crate::user_notification::UserNotifier; -use crate::util::error_or_panic; -use async_channel::Receiver; -use async_channel::Sender; +use async_channel::{Receiver, Sender}; +use codex_async_utils::OrCancelExt; +use codex_otel::otel_event_manager::OtelEventManager; use codex_protocol::ConversationId; +use codex_protocol::config_types::{ + ReasoningEffort as ReasoningEffortConfig, ReasoningSummary as ReasoningSummaryConfig, +}; use codex_protocol::items::TurnItem; -use codex_protocol::protocol::FileChange; -use codex_protocol::protocol::HasLegacyEvent; -use codex_protocol::protocol::ItemCompletedEvent; -use codex_protocol::protocol::ItemStartedEvent; -use codex_protocol::protocol::RawResponseItemEvent; -use codex_protocol::protocol::ReviewRequest; -use codex_protocol::protocol::RolloutItem; -use codex_protocol::protocol::SessionSource; -use codex_protocol::protocol::TaskStartedEvent; -use codex_protocol::protocol::TurnAbortReason; -use codex_protocol::protocol::TurnContextItem; +use codex_protocol::models::{ + ContentItem, FunctionCallOutputPayload, ResponseInputItem, ResponseItem, +}; +use codex_protocol::protocol::{ + FileChange, HasLegacyEvent, InitialHistory, ItemCompletedEvent, ItemStartedEvent, + RawResponseItemEvent, ReviewRequest, RolloutItem, SessionSource, TaskStartedEvent, + TurnAbortReason, TurnContextItem, +}; +use codex_protocol::user_input::UserInput; +use codex_utils_readiness::{Readiness, ReadinessFlag}; use futures::future::BoxFuture; use futures::prelude::*; use futures::stream::FuturesOrdered; -use mcp_types::CallToolResult; -use mcp_types::ListResourceTemplatesRequestParams; -use mcp_types::ListResourceTemplatesResult; -use mcp_types::ListResourcesRequestParams; -use mcp_types::ListResourcesResult; -use mcp_types::ReadResourceRequestParams; -use mcp_types::ReadResourceResult; +use mcp_types::{ + CallToolResult, ListResourceTemplatesRequestParams, ListResourceTemplatesResult, + ListResourcesRequestParams, ListResourcesResult, ReadResourceRequestParams, ReadResourceResult, +}; use serde_json; use serde_json::Value; -use tokio::sync::Mutex; -use tokio::sync::oneshot; +use tokio::sync::{Mutex, oneshot}; use tokio_util::sync::CancellationToken; -use tracing::debug; -use tracing::error; -use tracing::info; -use tracing::warn; +use tracing::{debug, error, info, warn}; -use crate::ModelProviderInfo; use crate::client::ModelClient; -use crate::client_common::Prompt; -use crate::client_common::ResponseEvent; +use crate::client_common::{Prompt, REVIEW_PROMPT, ResponseEvent}; use crate::config::Config; -use crate::config::types::McpServerTransportConfig; -use crate::config::types::ShellEnvironmentPolicy; +use crate::config::types::{McpServerTransportConfig, ShellEnvironmentPolicy}; use crate::context_manager::ContextManager; use crate::environment_context::EnvironmentContext; -use crate::error::CodexErr; -use crate::error::Result as CodexResult; +use crate::error::{CodexErr, Result as CodexResult}; #[cfg(test)] use crate::exec::StreamOutput; +use crate::features::Feature; +use crate::function_tool::FunctionCallError; +use crate::mcp::auth::McpAuthStatusEntry; // Removed: legacy executor wiring replaced by ToolOrchestrator flows. // legacy normalize_exec_result no longer used after orchestrator migration use crate::mcp::auth::compute_auth_statuses; -use crate::mcp_connection_manager::McpConnectionManager; +use crate::mcp_connection_manager::{DEFAULT_STARTUP_TIMEOUT, McpConnectionManager}; use crate::model_family::find_family_for_model; use crate::openai_model_info::get_model_info; +use crate::parse_command::parse_command; use crate::project_doc::get_user_instructions; -use crate::protocol::AgentMessageContentDeltaEvent; -use crate::protocol::AgentReasoningSectionBreakEvent; -use crate::protocol::ApplyPatchApprovalRequestEvent; -use crate::protocol::AskForApproval; -use crate::protocol::BackgroundEventEvent; -use crate::protocol::DeprecationNoticeEvent; -use crate::protocol::ErrorEvent; -use crate::protocol::Event; -use crate::protocol::EventMsg; -use crate::protocol::ExecApprovalRequestEvent; -use crate::protocol::Op; -use crate::protocol::RateLimitSnapshot; -use crate::protocol::ReasoningContentDeltaEvent; -use crate::protocol::ReasoningRawContentDeltaEvent; -use crate::protocol::ReviewDecision; -use crate::protocol::SandboxCommandAssessment; -use crate::protocol::SandboxPolicy; -use crate::protocol::SessionConfiguredEvent; -use crate::protocol::StreamErrorEvent; -use crate::protocol::Submission; -use crate::protocol::TokenCountEvent; -use crate::protocol::TokenUsage; -use crate::protocol::TurnDiffEvent; -use crate::rollout::RolloutRecorder; -use crate::rollout::RolloutRecorderParams; -use crate::shell; -use crate::state::ActiveTurn; -use crate::state::SessionServices; -use crate::state::SessionState; -use crate::tasks::GhostSnapshotTask; -use crate::tasks::ReviewTask; -use crate::tasks::SessionTask; -use crate::tasks::SessionTaskContext; +use crate::protocol::{ + AgentMessageContentDeltaEvent, AgentReasoningSectionBreakEvent, ApplyPatchApprovalRequestEvent, + AskForApproval, BackgroundEventEvent, DeprecationNoticeEvent, ErrorEvent, Event, EventMsg, + ExecApprovalRequestEvent, Op, RateLimitSnapshot, ReasoningContentDeltaEvent, + ReasoningRawContentDeltaEvent, ReviewDecision, SandboxCommandAssessment, SandboxPolicy, + SessionConfiguredEvent, StreamErrorEvent, Submission, TokenCountEvent, TokenUsage, + TurnDiffEvent, +}; +use crate::response_processing::process_items; +use crate::rollout::{RolloutRecorder, RolloutRecorderParams}; +use crate::state::{ActiveTurn, SessionServices, SessionState}; +use crate::tasks::{GhostSnapshotTask, ReviewTask, SessionTask, SessionTaskContext}; use crate::tools::ToolRouter; use crate::tools::context::SharedTurnDiffTracker; use crate::tools::parallel::ToolCallRuntime; use crate::tools::sandboxing::ApprovalStore; -use crate::tools::spec::ToolsConfig; -use crate::tools::spec::ToolsConfigParams; +use crate::tools::spec::{ToolsConfig, ToolsConfigParams}; use crate::turn_diff_tracker::TurnDiffTracker; use crate::unified_exec::UnifiedExecSessionManager; -use crate::user_instructions::DeveloperInstructions; -use crate::user_instructions::UserInstructions; -use crate::user_notification::UserNotification; -use crate::util::backoff; -use codex_async_utils::OrCancelExt; -use codex_otel::otel_event_manager::OtelEventManager; -use codex_protocol::config_types::ReasoningEffort as ReasoningEffortConfig; -use codex_protocol::config_types::ReasoningSummary as ReasoningSummaryConfig; -use codex_protocol::models::ContentItem; -use codex_protocol::models::FunctionCallOutputPayload; -use codex_protocol::models::ResponseInputItem; -use codex_protocol::models::ResponseItem; -use codex_protocol::protocol::InitialHistory; -use codex_protocol::user_input::UserInput; -use codex_utils_readiness::Readiness; -use codex_utils_readiness::ReadinessFlag; +use crate::user_instructions::{DeveloperInstructions, UserInstructions}; +use crate::user_notification::{UserNotification, UserNotifier}; +use crate::util::{backoff, error_or_panic}; +use crate::{AuthManager, ModelProviderInfo, parse_turn_item, shell, terminal}; pub mod compact; -use self::compact::build_compacted_history; -use self::compact::collect_user_messages; +use self::compact::{build_compacted_history, collect_user_messages}; /// The high-level interface to the Codex system. /// It operates as a queue pair where you send submissions and receive events. @@ -1338,30 +1287,20 @@ async fn submission_loop(sess: Arc, config: Arc, rx_sub: Receiv /// Operation handlers mod handlers { - use crate::codex::Session; - use crate::codex::SessionSettingsUpdate; - use crate::codex::TurnContext; + use std::sync::Arc; - use crate::codex::spawn_review_thread; + use codex_protocol::custom_prompts::CustomPrompt; + use codex_protocol::protocol::{ + ErrorEvent, Event, EventMsg, ListCustomPromptsResponseEvent, Op, ReviewDecision, + ReviewRequest, TurnAbortReason, + }; + use codex_protocol::user_input::UserInput; + use tracing::{info, warn}; + + use crate::codex::{Session, SessionSettingsUpdate, TurnContext, spawn_review_thread}; use crate::config::Config; use crate::mcp::auth::compute_auth_statuses; - use crate::tasks::CompactTask; - use crate::tasks::RegularTask; - use crate::tasks::UndoTask; - use crate::tasks::UserShellCommandTask; - use codex_protocol::custom_prompts::CustomPrompt; - use codex_protocol::protocol::ErrorEvent; - use codex_protocol::protocol::Event; - use codex_protocol::protocol::EventMsg; - use codex_protocol::protocol::ListCustomPromptsResponseEvent; - use codex_protocol::protocol::Op; - use codex_protocol::protocol::ReviewDecision; - use codex_protocol::protocol::ReviewRequest; - use codex_protocol::protocol::TurnAbortReason; - use codex_protocol::user_input::UserInput; - use std::sync::Arc; - use tracing::info; - use tracing::warn; + use crate::tasks::{CompactTask, RegularTask, UndoTask, UserShellCommandTask}; pub async fn interrupt(sess: &Arc) { sess.interrupt_task().await; @@ -2294,49 +2233,39 @@ fn is_mcp_client_startup_timeout_error(error: &anyhow::Error) -> bool { || error_message.contains("timed out handshaking with MCP server") } -use crate::features::Features; #[cfg(test)] pub(crate) use tests::make_session_and_context; +use crate::features::Features; + #[cfg(test)] mod tests { - use super::*; - use crate::config::ConfigOverrides; - use crate::config::ConfigToml; - use crate::config::types::McpServerConfig; - use crate::config::types::McpServerTransportConfig; - use crate::exec::ExecToolCallOutput; - use crate::mcp::auth::McpAuthStatusEntry; - use crate::tools::format_exec_output_str; + use std::path::PathBuf; + use std::sync::Arc; + use std::time::{Duration, Duration as StdDuration}; - use crate::protocol::CompactedItem; - use crate::protocol::InitialHistory; - use crate::protocol::ResumedHistory; - use crate::state::TaskKind; - use crate::tasks::SessionTask; - use crate::tasks::SessionTaskContext; - use crate::tools::ToolRouter; - use crate::tools::context::ToolInvocation; - use crate::tools::context::ToolOutput; - use crate::tools::context::ToolPayload; - use crate::tools::handlers::ShellHandler; - use crate::tools::registry::ToolHandler; - use crate::turn_diff_tracker::TurnDiffTracker; use codex_app_server_protocol::AuthMode; - use codex_protocol::models::ContentItem; - use codex_protocol::models::ResponseItem; + use codex_protocol::models::{ContentItem, ResponseItem}; use codex_protocol::protocol::McpAuthStatus; - use std::time::Duration; - use tokio::time::sleep; - - use mcp_types::ContentBlock; - use mcp_types::TextContent; + use mcp_types::{ContentBlock, TextContent}; use pretty_assertions::assert_eq; use serde::Deserialize; use serde_json::json; - use std::path::PathBuf; - use std::sync::Arc; - use std::time::Duration as StdDuration; + use tokio::time::sleep; + + use super::*; + use crate::config::types::{McpServerConfig, McpServerTransportConfig}; + use crate::config::{ConfigOverrides, ConfigToml}; + use crate::exec::ExecToolCallOutput; + use crate::mcp::auth::McpAuthStatusEntry; + use crate::protocol::{CompactedItem, InitialHistory, ResumedHistory}; + use crate::state::TaskKind; + use crate::tasks::{SessionTask, SessionTaskContext}; + use crate::tools::context::{ToolInvocation, ToolOutput, ToolPayload}; + use crate::tools::handlers::ShellHandler; + use crate::tools::registry::ToolHandler; + use crate::tools::{ToolRouter, format_exec_output_str}; + use crate::turn_diff_tracker::TurnDiffTracker; #[test] fn reconstruct_history_matches_live_compactions() { @@ -2934,12 +2863,12 @@ mod tests { #[tokio::test] async fn rejects_escalated_permissions_when_policy_not_on_request() { - use crate::exec::ExecParams; - use crate::protocol::AskForApproval; - use crate::protocol::SandboxPolicy; - use crate::turn_diff_tracker::TurnDiffTracker; use std::collections::HashMap; + use crate::exec::ExecParams; + use crate::protocol::{AskForApproval, SandboxPolicy}; + use crate::turn_diff_tracker::TurnDiffTracker; + let (session, mut turn_context_raw) = make_session_and_context(); // Ensure policy is NOT OnRequest so the early rejection path triggers turn_context_raw.approval_policy = AskForApproval::OnFailure; diff --git a/codex-rs/core/src/codex/compact.rs b/codex-rs/core/src/codex/compact.rs index c07503663d..8ace3cc01c 100644 --- a/codex-rs/core/src/codex/compact.rs +++ b/codex-rs/core/src/codex/compact.rs @@ -1,30 +1,23 @@ use std::sync::Arc; -use super::Session; -use super::TurnContext; -use super::get_last_assistant_message_from_turn; -use crate::Prompt; -use crate::client_common::ResponseEvent; -use crate::error::CodexErr; -use crate::error::Result as CodexResult; -use crate::protocol::AgentMessageEvent; -use crate::protocol::CompactedItem; -use crate::protocol::ErrorEvent; -use crate::protocol::EventMsg; -use crate::protocol::TaskStartedEvent; -use crate::protocol::TurnContextItem; -use crate::protocol::WarningEvent; -use crate::truncate::truncate_middle; -use crate::util::backoff; use codex_protocol::items::TurnItem; -use codex_protocol::models::ContentItem; -use codex_protocol::models::ResponseInputItem; -use codex_protocol::models::ResponseItem; +use codex_protocol::models::{ContentItem, ResponseInputItem, ResponseItem}; use codex_protocol::protocol::RolloutItem; use codex_protocol::user_input::UserInput; use futures::prelude::*; use tracing::error; +use super::{Session, TurnContext, get_last_assistant_message_from_turn}; +use crate::Prompt; +use crate::client_common::ResponseEvent; +use crate::error::{CodexErr, Result as CodexResult}; +use crate::protocol::{ + AgentMessageEvent, CompactedItem, ErrorEvent, EventMsg, TaskStartedEvent, TurnContextItem, + WarningEvent, +}; +use crate::truncate::truncate_middle; +use crate::util::backoff; + pub const SUMMARIZATION_PROMPT: &str = include_str!("../../templates/compact/prompt.md"); const COMPACT_USER_MESSAGE_MAX_TOKENS: usize = 20_000; @@ -295,9 +288,10 @@ async fn drain_to_completed( #[cfg(test)] mod tests { - use super::*; use pretty_assertions::assert_eq; + use super::*; + #[test] fn content_items_to_text_joins_non_empty_segments() { let items = vec![ diff --git a/codex-rs/core/src/codex_conversation.rs b/codex-rs/core/src/codex_conversation.rs index 5bb9c97c5b..bba978b53b 100644 --- a/codex-rs/core/src/codex_conversation.rs +++ b/codex-rs/core/src/codex_conversation.rs @@ -1,9 +1,8 @@ +use std::path::PathBuf; + use crate::codex::Codex; use crate::error::Result as CodexResult; -use crate::protocol::Event; -use crate::protocol::Op; -use crate::protocol::Submission; -use std::path::PathBuf; +use crate::protocol::{Event, Op, Submission}; pub struct CodexConversation { codex: Codex, diff --git a/codex-rs/core/src/codex_delegate.rs b/codex-rs/core/src/codex_delegate.rs index 4cb4d4a06a..5085b78014 100644 --- a/codex-rs/core/src/codex_delegate.rs +++ b/codex-rs/core/src/codex_delegate.rs @@ -1,29 +1,19 @@ use std::sync::Arc; use std::sync::atomic::AtomicU64; -use async_channel::Receiver; -use async_channel::Sender; +use async_channel::{Receiver, Sender}; use codex_async_utils::OrCancelExt; -use codex_protocol::protocol::ApplyPatchApprovalRequestEvent; -use codex_protocol::protocol::Event; -use codex_protocol::protocol::EventMsg; -use codex_protocol::protocol::ExecApprovalRequestEvent; -use codex_protocol::protocol::Op; -use codex_protocol::protocol::SessionSource; -use codex_protocol::protocol::SubAgentSource; -use codex_protocol::protocol::Submission; +use codex_protocol::protocol::{ + ApplyPatchApprovalRequestEvent, Event, EventMsg, ExecApprovalRequestEvent, InitialHistory, Op, + SessionSource, SubAgentSource, Submission, +}; use codex_protocol::user_input::UserInput; use tokio_util::sync::CancellationToken; use crate::AuthManager; -use crate::codex::Codex; -use crate::codex::CodexSpawnOk; -use crate::codex::SUBMISSION_CHANNEL_CAPACITY; -use crate::codex::Session; -use crate::codex::TurnContext; +use crate::codex::{Codex, CodexSpawnOk, SUBMISSION_CHANNEL_CAPACITY, Session, TurnContext}; use crate::config::Config; use crate::error::CodexErr; -use codex_protocol::protocol::InitialHistory; /// Start an interactive sub-Codex conversation and return IO channels. /// diff --git a/codex-rs/core/src/command_safety/is_safe_command.rs b/codex-rs/core/src/command_safety/is_safe_command.rs index ba3eb6ba7d..e58aca46ba 100644 --- a/codex-rs/core/src/command_safety/is_safe_command.rs +++ b/codex-rs/core/src/command_safety/is_safe_command.rs @@ -175,9 +175,10 @@ fn is_valid_sed_n_arg(arg: Option<&str>) -> bool { #[cfg(test)] mod tests { - use super::*; use std::string::ToString; + use super::*; + fn vec_str(args: &[&str]) -> Vec { args.iter().map(ToString::to_string).collect() } diff --git a/codex-rs/core/src/command_safety/windows_safe_commands.rs b/codex-rs/core/src/command_safety/windows_safe_commands.rs index ff0a3d2e7b..b73c470178 100644 --- a/codex-rs/core/src/command_safety/windows_safe_commands.rs +++ b/codex-rs/core/src/command_safety/windows_safe_commands.rs @@ -274,9 +274,10 @@ fn is_safe_git_command(words: &[String]) -> bool { #[cfg(test)] mod tests { - use super::is_safe_command_windows; use std::string::ToString; + use super::is_safe_command_windows; + /// Converts a slice of string literals into owned `String`s for the tests. fn vec_str(args: &[&str]) -> Vec { args.iter().map(ToString::to_string).collect() diff --git a/codex-rs/core/src/config/edit.rs b/codex-rs/core/src/config/edit.rs index c8e3bfc328..acc2499945 100644 --- a/codex-rs/core/src/config/edit.rs +++ b/codex-rs/core/src/config/edit.rs @@ -1,17 +1,14 @@ -use crate::config::CONFIG_TOML_FILE; -use crate::config::types::McpServerConfig; -use crate::config::types::Notice; +use std::collections::BTreeMap; +use std::path::{Path, PathBuf}; + use anyhow::Context; use codex_protocol::config_types::ReasoningEffort; -use std::collections::BTreeMap; -use std::path::Path; -use std::path::PathBuf; use tempfile::NamedTempFile; use tokio::task; -use toml_edit::DocumentMut; -use toml_edit::Item as TomlItem; -use toml_edit::Table as TomlTable; -use toml_edit::value; +use toml_edit::{DocumentMut, Item as TomlItem, Table as TomlTable, value}; + +use crate::config::CONFIG_TOML_FILE; +use crate::config::types::{McpServerConfig, Notice}; /// Discrete config mutations supported by the persistence engine. #[derive(Clone, Debug)] @@ -41,13 +38,9 @@ pub enum ConfigEdit { // TODO(jif) move to a dedicated file mod document_helpers { - use crate::config::types::McpServerConfig; - use crate::config::types::McpServerTransportConfig; - use toml_edit::Array as TomlArray; - use toml_edit::InlineTable; - use toml_edit::Item as TomlItem; - use toml_edit::Table as TomlTable; - use toml_edit::value; + use toml_edit::{Array as TomlArray, InlineTable, Item as TomlItem, Table as TomlTable, value}; + + use crate::config::types::{McpServerConfig, McpServerTransportConfig}; pub(super) fn ensure_table_for_write(item: &mut TomlItem) -> Option<&mut TomlTable> { match item { @@ -508,14 +501,15 @@ impl ConfigEditsBuilder { #[cfg(test)] mod tests { - use super::*; - use crate::config::types::McpServerTransportConfig; use codex_protocol::config_types::ReasoningEffort; use pretty_assertions::assert_eq; use tempfile::tempdir; use tokio::runtime::Builder; use toml::Value as TomlValue; + use super::*; + use crate::config::types::McpServerTransportConfig; + #[test] fn blocking_set_model_top_level() { let tmp = tempdir().expect("tmpdir"); diff --git a/codex-rs/core/src/config/mod.rs b/codex-rs/core/src/config/mod.rs index 1ee48d30bc..4183aeaebf 100644 --- a/codex-rs/core/src/config/mod.rs +++ b/codex-rs/core/src/config/mod.rs @@ -1,59 +1,37 @@ -use crate::auth::AuthCredentialsStoreMode; -use crate::config::types::DEFAULT_OTEL_ENVIRONMENT; -use crate::config::types::History; -use crate::config::types::McpServerConfig; -use crate::config::types::Notice; -use crate::config::types::Notifications; -use crate::config::types::OtelConfig; -use crate::config::types::OtelConfigToml; -use crate::config::types::OtelExporterKind; -use crate::config::types::ReasoningSummaryFormat; -use crate::config::types::SandboxWorkspaceWrite; -use crate::config::types::ShellEnvironmentPolicy; -use crate::config::types::ShellEnvironmentPolicyToml; -use crate::config::types::Tui; -use crate::config::types::UriBasedFileOpener; -use crate::config_loader::LoadedConfigLayers; -use crate::config_loader::load_config_as_toml; -use crate::config_loader::load_config_layers_with_overrides; -use crate::config_loader::merge_toml_values; -use crate::features::Feature; -use crate::features::FeatureOverrides; -use crate::features::Features; -use crate::features::FeaturesToml; -use crate::git_info::resolve_root_git_project_for_trust; -use crate::model_family::ModelFamily; -use crate::model_family::derive_default_model_family; -use crate::model_family::find_family_for_model; -use crate::model_provider_info::ModelProviderInfo; -use crate::model_provider_info::built_in_model_providers; -use crate::openai_model_info::get_model_info; -use crate::project_doc::DEFAULT_PROJECT_DOC_FILENAME; -use crate::project_doc::LOCAL_PROJECT_DOC_FILENAME; -use crate::protocol::AskForApproval; -use crate::protocol::SandboxPolicy; -use codex_app_server_protocol::Tools; -use codex_app_server_protocol::UserSavedConfig; -use codex_protocol::config_types::ForcedLoginMethod; -use codex_protocol::config_types::ReasoningEffort; -use codex_protocol::config_types::ReasoningSummary; -use codex_protocol::config_types::SandboxMode; -use codex_protocol::config_types::Verbosity; +use std::collections::{BTreeMap, HashMap}; +use std::io::ErrorKind; +use std::path::{Path, PathBuf}; + +use codex_app_server_protocol::{Tools, UserSavedConfig}; +use codex_protocol::config_types::{ + ForcedLoginMethod, ReasoningEffort, ReasoningSummary, SandboxMode, Verbosity, +}; use codex_rmcp_client::OAuthCredentialsStoreMode; use dirs::home_dir; use dunce::canonicalize; use serde::Deserialize; use similar::DiffableStr; -use std::collections::BTreeMap; -use std::collections::HashMap; -use std::io::ErrorKind; -use std::path::Path; -use std::path::PathBuf; - -use crate::config::profile::ConfigProfile; use toml::Value as TomlValue; use toml_edit::DocumentMut; +use crate::auth::AuthCredentialsStoreMode; +use crate::config::profile::ConfigProfile; +use crate::config::types::{ + DEFAULT_OTEL_ENVIRONMENT, History, McpServerConfig, Notice, Notifications, OtelConfig, + OtelConfigToml, OtelExporterKind, ReasoningSummaryFormat, SandboxWorkspaceWrite, + ShellEnvironmentPolicy, ShellEnvironmentPolicyToml, Tui, UriBasedFileOpener, +}; +use crate::config_loader::{ + LoadedConfigLayers, load_config_as_toml, load_config_layers_with_overrides, merge_toml_values, +}; +use crate::features::{Feature, FeatureOverrides, Features, FeaturesToml}; +use crate::git_info::resolve_root_git_project_for_trust; +use crate::model_family::{ModelFamily, derive_default_model_family, find_family_for_model}; +use crate::model_provider_info::{ModelProviderInfo, built_in_model_providers}; +use crate::openai_model_info::get_model_info; +use crate::project_doc::{DEFAULT_PROJECT_DOC_FILENAME, LOCAL_PROJECT_DOC_FILENAME}; +use crate::protocol::{AskForApproval, SandboxPolicy}; + pub mod edit; pub mod profile; pub mod types; @@ -1281,19 +1259,15 @@ pub fn log_dir(cfg: &Config) -> std::io::Result { #[cfg(test)] mod tests { - use crate::config::edit::ConfigEdit; - use crate::config::edit::ConfigEditsBuilder; - use crate::config::edit::apply_blocking; - use crate::config::types::HistoryPersistence; - use crate::config::types::McpServerTransportConfig; - use crate::config::types::Notifications; - use crate::features::Feature; + use std::time::Duration; + + use pretty_assertions::assert_eq; + use tempfile::TempDir; use super::*; - use pretty_assertions::assert_eq; - - use std::time::Duration; - use tempfile::TempDir; + use crate::config::edit::{ConfigEdit, ConfigEditsBuilder, apply_blocking}; + use crate::config::types::{HistoryPersistence, McpServerTransportConfig, Notifications}; + use crate::features::Feature; #[test] fn test_toml_parsing() { @@ -3269,10 +3243,11 @@ trust_level = "trusted" #[cfg(test)] mod notifications_tests { - use crate::config::types::Notifications; use assert_matches::assert_matches; use serde::Deserialize; + use crate::config::types::Notifications; + #[derive(Deserialize, Debug, PartialEq)] struct TuiTomlTest { notifications: Notifications, diff --git a/codex-rs/core/src/config/profile.rs b/codex-rs/core/src/config/profile.rs index f7eb2dcedb..68995238de 100644 --- a/codex-rs/core/src/config/profile.rs +++ b/codex-rs/core/src/config/profile.rs @@ -1,11 +1,9 @@ -use serde::Deserialize; use std::path::PathBuf; +use codex_protocol::config_types::{ReasoningEffort, ReasoningSummary, SandboxMode, Verbosity}; +use serde::Deserialize; + use crate::protocol::AskForApproval; -use codex_protocol::config_types::ReasoningEffort; -use codex_protocol::config_types::ReasoningSummary; -use codex_protocol::config_types::SandboxMode; -use codex_protocol::config_types::Verbosity; /// Collection of common configuration options that a user can define as a unit /// in `config.toml`. diff --git a/codex-rs/core/src/config/types.rs b/codex-rs/core/src/config/types.rs index fd93df8f91..8479a09613 100644 --- a/codex-rs/core/src/config/types.rs +++ b/codex-rs/core/src/config/types.rs @@ -3,15 +3,13 @@ // Note this file should generally be restricted to simple struct/enum // definitions that do not contain business logic. -use serde::Deserializer; use std::collections::HashMap; use std::path::PathBuf; use std::time::Duration; -use wildmatch::WildMatchPattern; -use serde::Deserialize; -use serde::Serialize; use serde::de::Error as SerdeError; +use serde::{Deserialize, Deserializer, Serialize}; +use wildmatch::WildMatchPattern; pub const DEFAULT_OTEL_ENVIRONMENT: &str = "dev"; @@ -194,11 +192,10 @@ pub enum McpServerTransportConfig { } mod option_duration_secs { - use serde::Deserialize; - use serde::Deserializer; - use serde::Serializer; use std::time::Duration; + use serde::{Deserialize, Deserializer, Serializer}; + pub fn serialize(value: &Option, serializer: S) -> Result where S: Serializer, @@ -494,9 +491,10 @@ pub enum ReasoningSummaryFormat { #[cfg(test)] mod tests { - use super::*; use pretty_assertions::assert_eq; + use super::*; + #[test] fn deserialize_stdio_command_server_config() { let cfg: McpServerConfig = toml::from_str( diff --git a/codex-rs/core/src/config_loader/macos.rs b/codex-rs/core/src/config_loader/macos.rs index 036619e06a..d858a70f09 100644 --- a/codex-rs/core/src/config_loader/macos.rs +++ b/codex-rs/core/src/config_loader/macos.rs @@ -1,17 +1,19 @@ use std::io; + use toml::Value as TomlValue; #[cfg(target_os = "macos")] mod native { - use super::*; + use std::ffi::c_void; + use base64::Engine; use base64::prelude::BASE64_STANDARD; use core_foundation::base::TCFType; - use core_foundation::string::CFString; - use core_foundation::string::CFStringRef; - use std::ffi::c_void; + use core_foundation::string::{CFString, CFStringRef}; use tokio::task; + use super::*; + pub(crate) async fn load_managed_admin_config_layer( override_base64: Option<&str>, ) -> io::Result> { diff --git a/codex-rs/core/src/config_loader/mod.rs b/codex-rs/core/src/config_loader/mod.rs index 6b55b015a3..77b0916fa1 100644 --- a/codex-rs/core/src/config_loader/mod.rs +++ b/codex-rs/core/src/config_loader/mod.rs @@ -1,13 +1,14 @@ mod macos; -use crate::config::CONFIG_TOML_FILE; -use macos::load_managed_admin_config_layer; use std::io; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; + +use macos::load_managed_admin_config_layer; use tokio::fs; use toml::Value as TomlValue; +use crate::config::CONFIG_TOML_FILE; + #[cfg(unix)] const CODEX_MANAGED_CONFIG_SYSTEM_PATH: &str = "/etc/codex/managed_config.toml"; @@ -175,9 +176,10 @@ fn apply_managed_layers(layers: LoadedConfigLayers) -> TomlValue { #[cfg(test)] mod tests { - use super::*; use tempfile::tempdir; + use super::*; + #[tokio::test] async fn merges_managed_config_layer_on_top() { let tmp = tempdir().expect("tempdir"); diff --git a/codex-rs/core/src/context_manager/history.rs b/codex-rs/core/src/context_manager/history.rs index da9157124b..dd9327c72b 100644 --- a/codex-rs/core/src/context_manager/history.rs +++ b/codex-rs/core/src/context_manager/history.rs @@ -1,12 +1,12 @@ -use codex_protocol::models::FunctionCallOutputPayload; -use codex_protocol::models::ResponseItem; -use codex_protocol::protocol::TokenUsage; -use codex_protocol::protocol::TokenUsageInfo; use std::ops::Deref; +use codex_protocol::models::{FunctionCallOutputPayload, ResponseItem}; +use codex_protocol::protocol::{TokenUsage, TokenUsageInfo}; + use crate::context_manager::normalize; -use crate::context_manager::truncate::format_output_for_model_body; -use crate::context_manager::truncate::globally_truncate_function_output_items; +use crate::context_manager::truncate::{ + format_output_for_model_body, globally_truncate_function_output_items, +}; /// Transcript of conversation history #[derive(Debug, Clone, Default)] diff --git a/codex-rs/core/src/context_manager/history_tests.rs b/codex-rs/core/src/context_manager/history_tests.rs index ae3e0368fa..f500c6eee5 100644 --- a/codex-rs/core/src/context_manager/history_tests.rs +++ b/codex-rs/core/src/context_manager/history_tests.rs @@ -1,17 +1,14 @@ -use super::*; -use crate::context_manager::truncate; use codex_git::GhostCommit; -use codex_protocol::models::ContentItem; -use codex_protocol::models::FunctionCallOutputContentItem; -use codex_protocol::models::FunctionCallOutputPayload; -use codex_protocol::models::LocalShellAction; -use codex_protocol::models::LocalShellExecAction; -use codex_protocol::models::LocalShellStatus; -use codex_protocol::models::ReasoningItemContent; -use codex_protocol::models::ReasoningItemReasoningSummary; +use codex_protocol::models::{ + ContentItem, FunctionCallOutputContentItem, FunctionCallOutputPayload, LocalShellAction, + LocalShellExecAction, LocalShellStatus, ReasoningItemContent, ReasoningItemReasoningSummary, +}; use pretty_assertions::assert_eq; use regex_lite::Regex; +use super::*; +use crate::context_manager::truncate; + fn assistant_msg(text: &str) -> ResponseItem { ResponseItem::Message { id: None, diff --git a/codex-rs/core/src/context_manager/normalize.rs b/codex-rs/core/src/context_manager/normalize.rs index ea38989c90..ff9a070766 100644 --- a/codex-rs/core/src/context_manager/normalize.rs +++ b/codex-rs/core/src/context_manager/normalize.rs @@ -1,7 +1,6 @@ use std::collections::HashSet; -use codex_protocol::models::FunctionCallOutputPayload; -use codex_protocol::models::ResponseItem; +use codex_protocol::models::{FunctionCallOutputPayload, ResponseItem}; use crate::util::error_or_panic; diff --git a/codex-rs/core/src/context_manager/truncate.rs b/codex-rs/core/src/context_manager/truncate.rs index 65e6dc99a5..2bea657681 100644 --- a/codex-rs/core/src/context_manager/truncate.rs +++ b/codex-rs/core/src/context_manager/truncate.rs @@ -1,6 +1,5 @@ use codex_protocol::models::FunctionCallOutputContentItem; -use codex_utils_string::take_bytes_at_char_boundary; -use codex_utils_string::take_last_bytes_at_char_boundary; +use codex_utils_string::{take_bytes_at_char_boundary, take_last_bytes_at_char_boundary}; // Model-formatting limits: clients get full streams; only content sent to the model is truncated. pub(crate) const MODEL_FORMAT_MAX_BYTES: usize = 10 * 1024; // 10 KiB diff --git a/codex-rs/core/src/conversation_manager.rs b/codex-rs/core/src/conversation_manager.rs index 8ffefd5679..e35af19584 100644 --- a/codex-rs/core/src/conversation_manager.rs +++ b/codex-rs/core/src/conversation_manager.rs @@ -1,27 +1,21 @@ -use crate::AuthManager; -use crate::CodexAuth; -use crate::codex::Codex; -use crate::codex::CodexSpawnOk; -use crate::codex::INITIAL_SUBMIT_ID; -use crate::codex_conversation::CodexConversation; -use crate::config::Config; -use crate::error::CodexErr; -use crate::error::Result as CodexResult; -use crate::protocol::Event; -use crate::protocol::EventMsg; -use crate::protocol::SessionConfiguredEvent; -use crate::rollout::RolloutRecorder; -use codex_protocol::ConversationId; -use codex_protocol::items::TurnItem; -use codex_protocol::models::ResponseItem; -use codex_protocol::protocol::InitialHistory; -use codex_protocol::protocol::RolloutItem; -use codex_protocol::protocol::SessionSource; use std::collections::HashMap; use std::path::PathBuf; use std::sync::Arc; + +use codex_protocol::ConversationId; +use codex_protocol::items::TurnItem; +use codex_protocol::models::ResponseItem; +use codex_protocol::protocol::{InitialHistory, RolloutItem, SessionSource}; use tokio::sync::RwLock; +use crate::codex::{Codex, CodexSpawnOk, INITIAL_SUBMIT_ID}; +use crate::codex_conversation::CodexConversation; +use crate::config::Config; +use crate::error::{CodexErr, Result as CodexResult}; +use crate::protocol::{Event, EventMsg, SessionConfiguredEvent}; +use crate::rollout::RolloutRecorder; +use crate::{AuthManager, CodexAuth}; + /// Represents a newly created Codex conversation, including the first event /// (which is [`EventMsg::SessionConfigured`]). pub struct NewConversation { @@ -228,13 +222,12 @@ fn truncate_before_nth_user_message(history: InitialHistory, n: usize) -> Initia #[cfg(test)] mod tests { + use assert_matches::assert_matches; + use codex_protocol::models::{ContentItem, ReasoningItemReasoningSummary, ResponseItem}; + use pretty_assertions::assert_eq; + use super::*; use crate::codex::make_session_and_context; - use assert_matches::assert_matches; - use codex_protocol::models::ContentItem; - use codex_protocol::models::ReasoningItemReasoningSummary; - use codex_protocol::models::ResponseItem; - use pretty_assertions::assert_eq; fn user_msg(text: &str) -> ResponseItem { ResponseItem::Message { diff --git a/codex-rs/core/src/custom_prompts.rs b/codex-rs/core/src/custom_prompts.rs index 66b2bab32c..f075cca398 100644 --- a/codex-rs/core/src/custom_prompts.rs +++ b/codex-rs/core/src/custom_prompts.rs @@ -1,7 +1,7 @@ -use codex_protocol::custom_prompts::CustomPrompt; use std::collections::HashSet; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; + +use codex_protocol::custom_prompts::CustomPrompt; use tokio::fs; /// Return the default prompts directory: `$CODEX_HOME/prompts`. @@ -146,10 +146,12 @@ fn parse_frontmatter(content: &str) -> (Option, Option, String) #[cfg(test)] mod tests { - use super::*; use std::fs; + use tempfile::tempdir; + use super::*; + #[tokio::test] async fn empty_when_dir_missing() { let tmp = tempdir().expect("create TempDir"); diff --git a/codex-rs/core/src/default_client.rs b/codex-rs/core/src/default_client.rs index 8e4635460c..1a1d903a09 100644 --- a/codex-rs/core/src/default_client.rs +++ b/codex-rs/core/src/default_client.rs @@ -1,16 +1,13 @@ -use crate::spawn::CODEX_SANDBOX_ENV_VAR; -use http::Error as HttpError; -use reqwest::IntoUrl; -use reqwest::Method; -use reqwest::Response; -use reqwest::header::HeaderName; -use reqwest::header::HeaderValue; -use serde::Serialize; use std::collections::HashMap; use std::fmt::Display; -use std::sync::LazyLock; -use std::sync::Mutex; -use std::sync::OnceLock; +use std::sync::{LazyLock, Mutex, OnceLock}; + +use http::Error as HttpError; +use reqwest::header::{HeaderName, HeaderValue}; +use reqwest::{IntoUrl, Method, Response}; +use serde::Serialize; + +use crate::spawn::CODEX_SANDBOX_ENV_VAR; /// Set this to add a suffix to the User-Agent string. /// @@ -282,9 +279,10 @@ fn is_sandboxed() -> bool { #[cfg(test)] mod tests { - use super::*; use core_test_support::skip_if_no_network; + use super::*; + #[test] fn test_get_codex_user_agent() { let user_agent = get_codex_user_agent(); @@ -295,11 +293,8 @@ mod tests { async fn test_create_client_sets_default_headers() { skip_if_no_network!(); - use wiremock::Mock; - use wiremock::MockServer; - use wiremock::ResponseTemplate; - use wiremock::matchers::method; - use wiremock::matchers::path; + use wiremock::matchers::{method, path}; + use wiremock::{Mock, MockServer, ResponseTemplate}; let client = create_client(); diff --git a/codex-rs/core/src/environment_context.rs b/codex-rs/core/src/environment_context.rs index e7b2e19ffb..f8fdc1ddc1 100644 --- a/codex-rs/core/src/environment_context.rs +++ b/codex-rs/core/src/environment_context.rs @@ -1,17 +1,14 @@ -use serde::Deserialize; -use serde::Serialize; +use std::path::PathBuf; + +use codex_protocol::config_types::SandboxMode; +use codex_protocol::models::{ContentItem, ResponseItem}; +use codex_protocol::protocol::{ENVIRONMENT_CONTEXT_CLOSE_TAG, ENVIRONMENT_CONTEXT_OPEN_TAG}; +use serde::{Deserialize, Serialize}; use strum_macros::Display as DeriveDisplay; use crate::codex::TurnContext; -use crate::protocol::AskForApproval; -use crate::protocol::SandboxPolicy; +use crate::protocol::{AskForApproval, SandboxPolicy}; use crate::shell::Shell; -use codex_protocol::config_types::SandboxMode; -use codex_protocol::models::ContentItem; -use codex_protocol::models::ResponseItem; -use codex_protocol::protocol::ENVIRONMENT_CONTEXT_CLOSE_TAG; -use codex_protocol::protocol::ENVIRONMENT_CONTEXT_OPEN_TAG; -use std::path::PathBuf; #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, DeriveDisplay)] #[serde(rename_all = "kebab-case")] @@ -193,11 +190,10 @@ impl From for ResponseItem { #[cfg(test)] mod tests { - use crate::shell::BashShell; - use crate::shell::ZshShell; + use pretty_assertions::assert_eq; use super::*; - use pretty_assertions::assert_eq; + use crate::shell::{BashShell, ZshShell}; fn workspace_write_policy(writable_roots: Vec<&str>, network_access: bool) -> SandboxPolicy { SandboxPolicy::WorkspaceWrite { diff --git a/codex-rs/core/src/error.rs b/codex-rs/core/src/error.rs index 6ca8970e3f..3cd9b43785 100644 --- a/codex-rs/core/src/error.rs +++ b/codex-rs/core/src/error.rs @@ -1,22 +1,20 @@ -use crate::codex::ProcessedResponseItem; -use crate::exec::ExecToolCallOutput; -use crate::token_data::KnownPlan; -use crate::token_data::PlanType; -use crate::truncate::truncate_middle; -use chrono::DateTime; -use chrono::Datelike; -use chrono::Local; -use chrono::Utc; +use std::io; +use std::time::Duration; + +use chrono::{DateTime, Datelike, Local, Utc}; use codex_async_utils::CancelErr; use codex_protocol::ConversationId; use codex_protocol::protocol::RateLimitSnapshot; use reqwest::StatusCode; use serde_json; -use std::io; -use std::time::Duration; use thiserror::Error; use tokio::task::JoinError; +use crate::codex::ProcessedResponseItem; +use crate::exec::ExecToolCallOutput; +use crate::token_data::{KnownPlan, PlanType}; +use crate::truncate::truncate_middle; + pub type Result = std::result::Result; /// Limit UI error messages to a reasonable size while keeping useful context. @@ -437,15 +435,13 @@ pub fn get_error_message_ui(e: &CodexErr) -> String { #[cfg(test)] mod tests { - use super::*; - use crate::exec::StreamOutput; - use chrono::DateTime; - use chrono::Duration as ChronoDuration; - use chrono::TimeZone; - use chrono::Utc; + use chrono::{DateTime, Duration as ChronoDuration, TimeZone, Utc}; use codex_protocol::protocol::RateLimitWindow; use pretty_assertions::assert_eq; + use super::*; + use crate::exec::StreamOutput; + fn rate_limit_snapshot() -> RateLimitSnapshot { let primary_reset_at = Utc .with_ymd_and_hms(2024, 1, 1, 1, 0, 0) diff --git a/codex-rs/core/src/event_mapping.rs b/codex-rs/core/src/event_mapping.rs index c9edd5409e..698c221018 100644 --- a/codex-rs/core/src/event_mapping.rs +++ b/codex-rs/core/src/event_mapping.rs @@ -1,14 +1,9 @@ -use codex_protocol::items::AgentMessageContent; -use codex_protocol::items::AgentMessageItem; -use codex_protocol::items::ReasoningItem; -use codex_protocol::items::TurnItem; -use codex_protocol::items::UserMessageItem; -use codex_protocol::items::WebSearchItem; -use codex_protocol::models::ContentItem; -use codex_protocol::models::ReasoningItemContent; -use codex_protocol::models::ReasoningItemReasoningSummary; -use codex_protocol::models::ResponseItem; -use codex_protocol::models::WebSearchAction; +use codex_protocol::items::{ + AgentMessageContent, AgentMessageItem, ReasoningItem, TurnItem, UserMessageItem, WebSearchItem, +}; +use codex_protocol::models::{ + ContentItem, ReasoningItemContent, ReasoningItemReasoningSummary, ResponseItem, WebSearchAction, +}; use codex_protocol::user_input::UserInput; use tracing::warn; use uuid::Uuid; @@ -124,17 +119,16 @@ pub fn parse_turn_item(item: &ResponseItem) -> Option { #[cfg(test)] mod tests { - use super::parse_turn_item; - use codex_protocol::items::AgentMessageContent; - use codex_protocol::items::TurnItem; - use codex_protocol::models::ContentItem; - use codex_protocol::models::ReasoningItemContent; - use codex_protocol::models::ReasoningItemReasoningSummary; - use codex_protocol::models::ResponseItem; - use codex_protocol::models::WebSearchAction; + use codex_protocol::items::{AgentMessageContent, TurnItem}; + use codex_protocol::models::{ + ContentItem, ReasoningItemContent, ReasoningItemReasoningSummary, ResponseItem, + WebSearchAction, + }; use codex_protocol::user_input::UserInput; use pretty_assertions::assert_eq; + use super::parse_turn_item; + #[test] fn parses_user_message_with_text_and_two_images() { let img1 = "https://example.com/one.png".to_string(); diff --git a/codex-rs/core/src/exec.rs b/codex-rs/core/src/exec.rs index b4dacd9af6..6775e89d0d 100644 --- a/codex-rs/core/src/exec.rs +++ b/codex-rs/core/src/exec.rs @@ -1,33 +1,21 @@ -#[cfg(unix)] -use std::os::unix::process::ExitStatusExt; - use std::collections::HashMap; use std::io; -use std::path::Path; -use std::path::PathBuf; +#[cfg(unix)] +use std::os::unix::process::ExitStatusExt; +use std::path::{Path, PathBuf}; use std::process::ExitStatus; -use std::time::Duration; -use std::time::Instant; +use std::time::{Duration, Instant}; use async_channel::Sender; -use tokio::io::AsyncRead; -use tokio::io::AsyncReadExt; -use tokio::io::BufReader; +use tokio::io::{AsyncRead, AsyncReadExt, BufReader}; use tokio::process::Child; -use crate::error::CodexErr; -use crate::error::Result; -use crate::error::SandboxErr; -use crate::protocol::Event; -use crate::protocol::EventMsg; -use crate::protocol::ExecCommandOutputDeltaEvent; -use crate::protocol::ExecOutputStream; -use crate::protocol::SandboxPolicy; -use crate::sandboxing::CommandSpec; -use crate::sandboxing::ExecEnv; -use crate::sandboxing::SandboxManager; -use crate::spawn::StdioPolicy; -use crate::spawn::spawn_child_async; +use crate::error::{CodexErr, Result, SandboxErr}; +use crate::protocol::{ + Event, EventMsg, ExecCommandOutputDeltaEvent, ExecOutputStream, SandboxPolicy, +}; +use crate::sandboxing::{CommandSpec, ExecEnv, SandboxManager}; +use crate::spawn::{StdioPolicy, spawn_child_async}; const DEFAULT_TIMEOUT_MS: u64 = 10_000; @@ -171,9 +159,10 @@ async fn exec_windows_sandbox( params: ExecParams, sandbox_policy: &SandboxPolicy, ) -> Result { - use crate::config::find_codex_home; use codex_windows_sandbox::run_windows_sandbox_capture; + use crate::config::find_codex_home; + let ExecParams { command, cwd, @@ -619,9 +608,10 @@ fn synthetic_exit_status(code: i32) -> ExitStatus { #[cfg(test)] mod tests { - use super::*; use std::time::Duration; + use super::*; + fn make_exec_output( exit_code: i32, stdout: &str, diff --git a/codex-rs/core/src/exec_env.rs b/codex-rs/core/src/exec_env.rs index 11334896bf..e8914bd1f8 100644 --- a/codex-rs/core/src/exec_env.rs +++ b/codex-rs/core/src/exec_env.rs @@ -1,8 +1,8 @@ -use crate::config::types::EnvironmentVariablePattern; -use crate::config::types::ShellEnvironmentPolicy; -use crate::config::types::ShellEnvironmentPolicyInherit; -use std::collections::HashMap; -use std::collections::HashSet; +use std::collections::{HashMap, HashSet}; + +use crate::config::types::{ + EnvironmentVariablePattern, ShellEnvironmentPolicy, ShellEnvironmentPolicyInherit, +}; /// Construct an environment map based on the rules in the specified policy. The /// resulting map can be passed directly to `Command::envs()` after calling @@ -70,9 +70,10 @@ where #[cfg(test)] mod tests { + use maplit::hashmap; + use super::*; use crate::config::types::ShellEnvironmentPolicyInherit; - use maplit::hashmap; fn make_vars(pairs: &[(&str, &str)]) -> Vec<(String, String)> { pairs diff --git a/codex-rs/core/src/features.rs b/codex-rs/core/src/features.rs index f6cec4a5ea..36028057c7 100644 --- a/codex-rs/core/src/features.rs +++ b/codex-rs/core/src/features.rs @@ -5,11 +5,12 @@ //! booleans through multiple types, call sites consult a single `Features` //! container attached to `Config`. +use std::collections::{BTreeMap, BTreeSet}; + +use serde::Deserialize; + use crate::config::ConfigToml; use crate::config::profile::ConfigProfile; -use serde::Deserialize; -use std::collections::BTreeMap; -use std::collections::BTreeSet; mod legacy; pub(crate) use legacy::LegacyFeatureToggles; diff --git a/codex-rs/core/src/features/legacy.rs b/codex-rs/core/src/features/legacy.rs index de3c007bac..1ad54af481 100644 --- a/codex-rs/core/src/features/legacy.rs +++ b/codex-rs/core/src/features/legacy.rs @@ -1,7 +1,7 @@ -use super::Feature; -use super::Features; use tracing::info; +use super::{Feature, Features}; + #[derive(Clone, Copy)] struct Alias { legacy_key: &'static str, diff --git a/codex-rs/core/src/git_info.rs b/codex-rs/core/src/git_info.rs index 387e9a682e..5a7849e2bc 100644 --- a/codex-rs/core/src/git_info.rs +++ b/codex-rs/core/src/git_info.rs @@ -1,15 +1,12 @@ use std::collections::HashSet; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use codex_app_server_protocol::GitSha; use codex_protocol::protocol::GitInfo; use futures::future::join_all; -use serde::Deserialize; -use serde::Serialize; +use serde::{Deserialize, Serialize}; use tokio::process::Command; -use tokio::time::Duration as TokioDuration; -use tokio::time::timeout; +use tokio::time::{Duration as TokioDuration, timeout}; /// Return `true` if the project folder specified by the `Config` is inside a /// Git repository. @@ -597,13 +594,14 @@ pub async fn current_branch_name(cwd: &Path) -> Option { #[cfg(test)] mod tests { - use super::*; - - use core_test_support::skip_if_sandbox; use std::fs; use std::path::PathBuf; + + use core_test_support::skip_if_sandbox; use tempfile::TempDir; + use super::*; + // Helper function to create a test git repository async fn create_test_git_repo(temp_dir: &TempDir) -> PathBuf { let repo_path = temp_dir.path().join("repo"); @@ -672,8 +670,7 @@ mod tests { #[tokio::test] async fn test_recent_commits_orders_and_limits() { skip_if_sandbox!(); - use tokio::time::Duration; - use tokio::time::sleep; + use tokio::time::{Duration, sleep}; let temp_dir = TempDir::new().expect("Failed to create temp dir"); let repo_path = create_test_git_repo(&temp_dir).await; diff --git a/codex-rs/core/src/landlock.rs b/codex-rs/core/src/landlock.rs index 340aebff2c..8d6edba18a 100644 --- a/codex-rs/core/src/landlock.rs +++ b/codex-rs/core/src/landlock.rs @@ -1,11 +1,11 @@ -use crate::protocol::SandboxPolicy; -use crate::spawn::StdioPolicy; -use crate::spawn::spawn_child_async; use std::collections::HashMap; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; + use tokio::process::Child; +use crate::protocol::SandboxPolicy; +use crate::spawn::{StdioPolicy, spawn_child_async}; + /// Spawn a shell tool command under the Linux Landlock+seccomp sandbox helper /// (codex-linux-sandbox). /// diff --git a/codex-rs/core/src/lib.rs b/codex-rs/core/src/lib.rs index 93a317700f..3653baa62d 100644 --- a/codex-rs/core/src/lib.rs +++ b/codex-rs/core/src/lib.rs @@ -40,20 +40,18 @@ pub mod token_data; mod truncate; mod unified_exec; mod user_instructions; -pub use model_provider_info::BUILT_IN_OSS_MODEL_PROVIDER_ID; -pub use model_provider_info::ModelProviderInfo; -pub use model_provider_info::WireApi; -pub use model_provider_info::built_in_model_providers; -pub use model_provider_info::create_oss_provider_with_base_url; +pub use model_provider_info::{ + BUILT_IN_OSS_MODEL_PROVIDER_ID, ModelProviderInfo, WireApi, built_in_model_providers, + create_oss_provider_with_base_url, +}; mod conversation_manager; mod event_mapping; pub mod review_format; -pub use codex_protocol::protocol::InitialHistory; -pub use conversation_manager::ConversationManager; -pub use conversation_manager::NewConversation; // Re-export common auth types for workspace consumers pub use auth::AuthManager; pub use auth::CodexAuth; +pub use codex_protocol::protocol::InitialHistory; +pub use conversation_manager::{ConversationManager, NewConversation}; pub mod default_client; pub mod model_family; mod openai_model_info; @@ -66,17 +64,13 @@ pub mod spawn; pub mod terminal; mod tools; pub mod turn_diff_tracker; -pub use rollout::ARCHIVED_SESSIONS_SUBDIR; -pub use rollout::INTERACTIVE_SESSION_SOURCES; -pub use rollout::RolloutRecorder; -pub use rollout::SESSIONS_SUBDIR; -pub use rollout::SessionMeta; -pub use rollout::find_conversation_path_by_id_str; -pub use rollout::list::ConversationItem; -pub use rollout::list::ConversationsPage; -pub use rollout::list::Cursor; -pub use rollout::list::parse_cursor; -pub use rollout::list::read_head_for_summary; +pub use rollout::list::{ + ConversationItem, ConversationsPage, Cursor, parse_cursor, read_head_for_summary, +}; +pub use rollout::{ + ARCHIVED_SESSIONS_SUBDIR, INTERACTIVE_SESSION_SOURCES, RolloutRecorder, SESSIONS_SUBDIR, + SessionMeta, find_conversation_path_by_id_str, +}; mod function_tool; mod state; mod tasks; @@ -84,26 +78,19 @@ mod user_notification; pub mod util; pub use apply_patch::CODEX_APPLY_PATCH_ARG1; -pub use command_safety::is_safe_command; -pub use safety::get_platform_sandbox; -pub use safety::set_windows_sandbox_enabled; -// Re-export the protocol types from the standalone `codex-protocol` crate so existing -// `codex_core::protocol::...` references continue to work across the workspace. -pub use codex_protocol::protocol; +pub use client::ModelClient; +pub use client_common::{Prompt, REVIEW_PROMPT, ResponseEvent, ResponseStream}; +pub use codex::compact::content_items_to_text; // Re-export protocol config enums to ensure call sites can use the same types // as those in the protocol crate when constructing protocol messages. pub use codex_protocol::config_types as protocol_config_types; - -pub use client::ModelClient; -pub use client_common::Prompt; -pub use client_common::REVIEW_PROMPT; -pub use client_common::ResponseEvent; -pub use client_common::ResponseStream; -pub use codex::compact::content_items_to_text; -pub use codex_protocol::models::ContentItem; -pub use codex_protocol::models::LocalShellAction; -pub use codex_protocol::models::LocalShellExecAction; -pub use codex_protocol::models::LocalShellStatus; -pub use codex_protocol::models::ResponseItem; +pub use codex_protocol::models::{ + ContentItem, LocalShellAction, LocalShellExecAction, LocalShellStatus, ResponseItem, +}; +// Re-export the protocol types from the standalone `codex-protocol` crate so existing +// `codex_core::protocol::...` references continue to work across the workspace. +pub use codex_protocol::protocol; +pub use command_safety::is_safe_command; pub use event_mapping::parse_turn_item; +pub use safety::{get_platform_sandbox, set_windows_sandbox_enabled}; pub mod otel_init; diff --git a/codex-rs/core/src/mcp/auth.rs b/codex-rs/core/src/mcp/auth.rs index e321a857bb..ff7e75593c 100644 --- a/codex-rs/core/src/mcp/auth.rs +++ b/codex-rs/core/src/mcp/auth.rs @@ -2,13 +2,11 @@ use std::collections::HashMap; use anyhow::Result; use codex_protocol::protocol::McpAuthStatus; -use codex_rmcp_client::OAuthCredentialsStoreMode; -use codex_rmcp_client::determine_streamable_http_auth_status; +use codex_rmcp_client::{OAuthCredentialsStoreMode, determine_streamable_http_auth_status}; use futures::future::join_all; use tracing::warn; -use crate::config::types::McpServerConfig; -use crate::config::types::McpServerTransportConfig; +use crate::config::types::{McpServerConfig, McpServerTransportConfig}; #[derive(Debug, Clone)] pub struct McpAuthStatusEntry { diff --git a/codex-rs/core/src/mcp_connection_manager.rs b/codex-rs/core/src/mcp_connection_manager.rs index 11a73c0b07..21d3ee1e01 100644 --- a/codex-rs/core/src/mcp_connection_manager.rs +++ b/codex-rs/core/src/mcp_connection_manager.rs @@ -6,39 +6,25 @@ //! in a single aggregated map using the fully-qualified tool name //! `""` as the key. -use std::collections::HashMap; -use std::collections::HashSet; +use std::collections::{HashMap, HashSet}; use std::env; use std::ffi::OsString; use std::sync::Arc; use std::time::Duration; -use anyhow::Context; -use anyhow::Result; -use anyhow::anyhow; -use codex_rmcp_client::OAuthCredentialsStoreMode; -use codex_rmcp_client::RmcpClient; -use mcp_types::ClientCapabilities; -use mcp_types::Implementation; -use mcp_types::ListResourceTemplatesRequestParams; -use mcp_types::ListResourceTemplatesResult; -use mcp_types::ListResourcesRequestParams; -use mcp_types::ListResourcesResult; -use mcp_types::ReadResourceRequestParams; -use mcp_types::ReadResourceResult; -use mcp_types::Resource; -use mcp_types::ResourceTemplate; -use mcp_types::Tool; - +use anyhow::{Context, Result, anyhow}; +use codex_rmcp_client::{OAuthCredentialsStoreMode, RmcpClient}; +use mcp_types::{ + ClientCapabilities, Implementation, ListResourceTemplatesRequestParams, + ListResourceTemplatesResult, ListResourcesRequestParams, ListResourcesResult, + ReadResourceRequestParams, ReadResourceResult, Resource, ResourceTemplate, Tool, +}; use serde_json::json; -use sha1::Digest; -use sha1::Sha1; +use sha1::{Digest, Sha1}; use tokio::task::JoinSet; -use tracing::info; -use tracing::warn; +use tracing::{info, warn}; -use crate::config::types::McpServerConfig; -use crate::config::types::McpServerTransportConfig; +use crate::config::types::{McpServerConfig, McpServerTransportConfig}; /// Delimiter used to separate the server name from the tool name in a fully /// qualified tool name. @@ -663,10 +649,12 @@ fn is_valid_mcp_server_name(server_name: &str) -> bool { #[cfg(test)] mod tests { - use super::*; - use mcp_types::ToolInputSchema; use std::collections::HashSet; + use mcp_types::ToolInputSchema; + + use super::*; + fn create_test_tool(server_name: &str, tool_name: &str) -> ToolInfo { ToolInfo { server_name: server_name.to_string(), diff --git a/codex-rs/core/src/mcp_tool_call.rs b/codex-rs/core/src/mcp_tool_call.rs index 5166410372..57208782b1 100644 --- a/codex-rs/core/src/mcp_tool_call.rs +++ b/codex-rs/core/src/mcp_tool_call.rs @@ -1,15 +1,10 @@ use std::time::Instant; +use codex_protocol::models::{FunctionCallOutputPayload, ResponseInputItem}; use tracing::error; -use crate::codex::Session; -use crate::codex::TurnContext; -use crate::protocol::EventMsg; -use crate::protocol::McpInvocation; -use crate::protocol::McpToolCallBeginEvent; -use crate::protocol::McpToolCallEndEvent; -use codex_protocol::models::FunctionCallOutputPayload; -use codex_protocol::models::ResponseInputItem; +use crate::codex::{Session, TurnContext}; +use crate::protocol::{EventMsg, McpInvocation, McpToolCallBeginEvent, McpToolCallEndEvent}; /// Handles the specified tool call dispatches the appropriate /// `McpToolCallBegin` and `McpToolCallEnd` events to the `Session`. diff --git a/codex-rs/core/src/message_history.rs b/codex-rs/core/src/message_history.rs index e96d8d5026..a408630cac 100644 --- a/codex-rs/core/src/message_history.rs +++ b/codex-rs/core/src/message_history.rs @@ -14,28 +14,23 @@ //! the file descriptor is opened with the `O_APPEND` flag. POSIX guarantees //! that writes up to `PIPE_BUF` bytes are atomic in that case. -use std::fs::File; -use std::fs::OpenOptions; -use std::io::Result; -use std::io::Write; +use std::fs::{File, OpenOptions}; +use std::io::{Result, Write}; +#[cfg(unix)] +use std::os::unix::fs::OpenOptionsExt; +#[cfg(unix)] +use std::os::unix::fs::PermissionsExt; use std::path::PathBuf; - -use serde::Deserialize; -use serde::Serialize; - use std::time::Duration; + +use codex_protocol::ConversationId; +use serde::{Deserialize, Serialize}; use tokio::fs; use tokio::io::AsyncReadExt; use crate::config::Config; use crate::config::types::HistoryPersistence; -use codex_protocol::ConversationId; -#[cfg(unix)] -use std::os::unix::fs::OpenOptionsExt; -#[cfg(unix)] -use std::os::unix::fs::PermissionsExt; - /// Filename that stores the message history inside `~/.codex`. const HISTORY_FILENAME: &str = "history.jsonl"; @@ -188,8 +183,7 @@ pub(crate) async fn history_metadata(config: &Config) -> (u64, usize) { /// locking API. #[cfg(unix)] pub(crate) fn lookup(log_id: u64, offset: usize, config: &Config) -> Option { - use std::io::BufRead; - use std::io::BufReader; + use std::io::{BufRead, BufReader}; use std::os::unix::fs::MetadataExt; let path = history_filepath(config); diff --git a/codex-rs/core/src/model_provider_info.rs b/codex-rs/core/src/model_provider_info.rs index 8dc252aa7c..aee7297f1d 100644 --- a/codex-rs/core/src/model_provider_info.rs +++ b/codex-rs/core/src/model_provider_info.rs @@ -5,16 +5,15 @@ //! 2. User-defined entries inside `~/.codex/config.toml` under the `model_providers` //! key. These override or extend the defaults at runtime. -use crate::CodexAuth; -use crate::default_client::CodexHttpClient; -use crate::default_client::CodexRequestBuilder; -use codex_app_server_protocol::AuthMode; -use serde::Deserialize; -use serde::Serialize; use std::collections::HashMap; use std::env::VarError; use std::time::Duration; +use codex_app_server_protocol::AuthMode; +use serde::{Deserialize, Serialize}; + +use crate::CodexAuth; +use crate::default_client::{CodexHttpClient, CodexRequestBuilder}; use crate::error::EnvVarError; const DEFAULT_STREAM_IDLE_TIMEOUT_MS: u64 = 300_000; const DEFAULT_STREAM_MAX_RETRIES: u64 = 5; @@ -371,9 +370,10 @@ fn matches_azure_responses_base_url(base_url: &str) -> bool { #[cfg(test)] mod tests { - use super::*; use pretty_assertions::assert_eq; + use super::*; + #[test] fn test_deserialize_ollama_model_provider_toml() { let azure_provider_toml = r#" diff --git a/codex-rs/core/src/otel_init.rs b/codex-rs/core/src/otel_init.rs index 5931d7caf9..b98559e60c 100644 --- a/codex-rs/core/src/otel_init.rs +++ b/codex-rs/core/src/otel_init.rs @@ -1,13 +1,12 @@ -use crate::config::Config; -use crate::config::types::OtelExporterKind as Kind; -use crate::config::types::OtelHttpProtocol as Protocol; -use crate::default_client::originator; -use codex_otel::config::OtelExporter; -use codex_otel::config::OtelHttpProtocol; -use codex_otel::config::OtelSettings; -use codex_otel::otel_provider::OtelProvider; use std::error::Error; +use codex_otel::config::{OtelExporter, OtelHttpProtocol, OtelSettings}; +use codex_otel::otel_provider::OtelProvider; + +use crate::config::Config; +use crate::config::types::{OtelExporterKind as Kind, OtelHttpProtocol as Protocol}; +use crate::default_client::originator; + /// Build an OpenTelemetry provider from the app Config. /// /// Returns `None` when OTEL export is disabled. diff --git a/codex-rs/core/src/parse_command.rs b/codex-rs/core/src/parse_command.rs index 53402f880d..f998b5065c 100644 --- a/codex-rs/core/src/parse_command.rs +++ b/codex-rs/core/src/parse_command.rs @@ -1,10 +1,10 @@ -use crate::bash::try_parse_shell; -use crate::bash::try_parse_word_only_commands_sequence; -use codex_protocol::parse_command::ParsedCommand; -use shlex::split as shlex_split; -use shlex::try_join as shlex_try_join; use std::path::PathBuf; +use codex_protocol::parse_command::ParsedCommand; +use shlex::{split as shlex_split, try_join as shlex_try_join}; + +use crate::bash::{try_parse_shell, try_parse_word_only_commands_sequence}; + fn shlex_join(tokens: &[String]) -> String { shlex_try_join(tokens.iter().map(String::as_str)) .unwrap_or_else(|_| "".to_string()) @@ -37,10 +37,11 @@ pub fn parse_command(command: &[String]) -> Vec { #[allow(clippy::items_after_test_module)] /// Tests are at the top to encourage using TDD + Codex to fix the implementation. mod tests { - use super::*; use std::path::PathBuf; use std::string::ToString; + use super::*; + fn shlex_split_safe(s: &str) -> Vec { shlex_split(s).unwrap_or_else(|| s.split_whitespace().map(ToString::to_string).collect()) } diff --git a/codex-rs/core/src/project_doc.rs b/codex-rs/core/src/project_doc.rs index c8076aa822..5bb5e603e2 100644 --- a/codex-rs/core/src/project_doc.rs +++ b/codex-rs/core/src/project_doc.rs @@ -13,12 +13,14 @@ //! that order. //! 3. We do **not** walk past the Git root. -use crate::config::Config; -use dunce::canonicalize as normalize_path; use std::path::PathBuf; + +use dunce::canonicalize as normalize_path; use tokio::io::AsyncReadExt; use tracing::error; +use crate::config::Config; + /// Default filename scanned for project-level docs. pub const DEFAULT_PROJECT_DOC_FILENAME: &str = "AGENTS.md"; /// Preferred local override for project-level docs. @@ -197,12 +199,13 @@ fn candidate_filenames<'a>(config: &'a Config) -> Vec<&'a str> { #[cfg(test)] mod tests { - use super::*; - use crate::config::ConfigOverrides; - use crate::config::ConfigToml; use std::fs; + use tempfile::TempDir; + use super::*; + use crate::config::{ConfigOverrides, ConfigToml}; + /// Helper that returns a `Config` pointing at `root` and using `limit` as /// the maximum number of bytes to embed from AGENTS.md. The caller can /// optionally specify a custom `instructions` string – when `None` the diff --git a/codex-rs/core/src/response_processing.rs b/codex-rs/core/src/response_processing.rs index d1767b74c5..69afafa17b 100644 --- a/codex-rs/core/src/response_processing.rs +++ b/codex-rs/core/src/response_processing.rs @@ -1,10 +1,8 @@ -use crate::codex::Session; -use crate::codex::TurnContext; -use codex_protocol::models::FunctionCallOutputPayload; -use codex_protocol::models::ResponseInputItem; -use codex_protocol::models::ResponseItem; +use codex_protocol::models::{FunctionCallOutputPayload, ResponseInputItem, ResponseItem}; use tracing::warn; +use crate::codex::{Session, TurnContext}; + /// Process streamed `ResponseItem`s from the model into the pair of: /// - items we should record in conversation history; and /// - `ResponseInputItem`s to send back to the model on the next turn. diff --git a/codex-rs/core/src/rollout/list.rs b/codex-rs/core/src/rollout/list.rs index 781e3fe372..0661554fec 100644 --- a/codex-rs/core/src/rollout/list.rs +++ b/codex-rs/core/src/rollout/list.rs @@ -1,23 +1,19 @@ use std::cmp::Reverse; use std::io::{self}; use std::num::NonZero; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::sync::Arc; use std::sync::atomic::AtomicBool; -use time::OffsetDateTime; -use time::PrimitiveDateTime; +use codex_file_search as file_search; +use codex_protocol::protocol::{RolloutItem, RolloutLine, SessionSource}; use time::format_description::FormatItem; use time::macros::format_description; +use time::{OffsetDateTime, PrimitiveDateTime}; use uuid::Uuid; use super::SESSIONS_SUBDIR; use crate::protocol::EventMsg; -use codex_file_search as file_search; -use codex_protocol::protocol::RolloutItem; -use codex_protocol::protocol::RolloutLine; -use codex_protocol::protocol::SessionSource; /// Returned page of conversation summaries. #[derive(Debug, Default, PartialEq)] @@ -463,8 +459,8 @@ async fn read_tail_records( max_records: usize, ) -> io::Result<(Vec, Option)> { use std::io::SeekFrom; - use tokio::io::AsyncReadExt; - use tokio::io::AsyncSeekExt; + + use tokio::io::{AsyncReadExt, AsyncSeekExt}; if max_records == 0 { return Ok((Vec::new(), None)); diff --git a/codex-rs/core/src/rollout/mod.rs b/codex-rs/core/src/rollout/mod.rs index 23410bd4d0..1e8fa1b472 100644 --- a/codex-rs/core/src/rollout/mod.rs +++ b/codex-rs/core/src/rollout/mod.rs @@ -13,8 +13,7 @@ pub mod recorder; pub use codex_protocol::protocol::SessionMeta; pub use list::find_conversation_path_by_id_str; -pub use recorder::RolloutRecorder; -pub use recorder::RolloutRecorderParams; +pub use recorder::{RolloutRecorder, RolloutRecorderParams}; #[cfg(test)] pub mod tests; diff --git a/codex-rs/core/src/rollout/policy.rs b/codex-rs/core/src/rollout/policy.rs index e008832641..d1892f65fa 100644 --- a/codex-rs/core/src/rollout/policy.rs +++ b/codex-rs/core/src/rollout/policy.rs @@ -1,7 +1,7 @@ -use crate::protocol::EventMsg; -use crate::protocol::RolloutItem; use codex_protocol::models::ResponseItem; +use crate::protocol::{EventMsg, RolloutItem}; + /// Whether a rollout `item` should be persisted in rollout files. #[inline] pub(crate) fn is_persisted_response_item(item: &RolloutItem) -> bool { diff --git a/codex-rs/core/src/rollout/recorder.rs b/codex-rs/core/src/rollout/recorder.rs index a39f85c823..197cb70e8b 100644 --- a/codex-rs/core/src/rollout/recorder.rs +++ b/codex-rs/core/src/rollout/recorder.rs @@ -1,38 +1,33 @@ //! Persist Codex session rollouts (.jsonl) so sessions can be replayed or inspected later. -use std::fs::File; -use std::fs::{self}; +use std::fs::{ + File, {self}, +}; use std::io::Error as IoError; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use codex_protocol::ConversationId; +use codex_protocol::protocol::{ + InitialHistory, ResumedHistory, RolloutItem, RolloutLine, SessionMeta, SessionMetaLine, + SessionSource, +}; use serde_json::Value; use time::OffsetDateTime; use time::format_description::FormatItem; use time::macros::format_description; use tokio::io::AsyncWriteExt; -use tokio::sync::mpsc::Sender; -use tokio::sync::mpsc::{self}; +use tokio::sync::mpsc::{ + Sender, {self}, +}; use tokio::sync::oneshot; -use tracing::info; -use tracing::warn; +use tracing::{info, warn}; use super::SESSIONS_SUBDIR; -use super::list::ConversationsPage; -use super::list::Cursor; -use super::list::get_conversations; +use super::list::{ConversationsPage, Cursor, get_conversations}; use super::policy::is_persisted_response_item; use crate::config::Config; use crate::default_client::originator; use crate::git_info::collect_git_info; -use codex_protocol::protocol::InitialHistory; -use codex_protocol::protocol::ResumedHistory; -use codex_protocol::protocol::RolloutItem; -use codex_protocol::protocol::RolloutLine; -use codex_protocol::protocol::SessionMeta; -use codex_protocol::protocol::SessionMetaLine; -use codex_protocol::protocol::SessionSource; /// Records all [`ResponseItem`]s for a session and flushes them to disk after /// every update. diff --git a/codex-rs/core/src/rollout/tests.rs b/codex-rs/core/src/rollout/tests.rs index a7bc9f8c8f..5f202e8e8d 100644 --- a/codex-rs/core/src/rollout/tests.rs +++ b/codex-rs/core/src/rollout/tests.rs @@ -1,35 +1,28 @@ #![allow(clippy::unwrap_used, clippy::expect_used)] -use std::fs::File; -use std::fs::{self}; +use std::fs::{ + File, {self}, +}; use std::io::Write; use std::path::Path; +use anyhow::Result; +use codex_protocol::ConversationId; +use codex_protocol::models::{ContentItem, ResponseItem}; +use codex_protocol::protocol::{ + CompactedItem, EventMsg, RolloutItem, RolloutLine, SessionMeta, SessionMetaLine, SessionSource, + UserMessageEvent, +}; use tempfile::TempDir; -use time::OffsetDateTime; -use time::PrimitiveDateTime; use time::format_description::FormatItem; use time::macros::format_description; +use time::{OffsetDateTime, PrimitiveDateTime}; use uuid::Uuid; use crate::rollout::INTERACTIVE_SESSION_SOURCES; -use crate::rollout::list::ConversationItem; -use crate::rollout::list::ConversationsPage; -use crate::rollout::list::Cursor; -use crate::rollout::list::get_conversation; -use crate::rollout::list::get_conversations; -use anyhow::Result; -use codex_protocol::ConversationId; -use codex_protocol::models::ContentItem; -use codex_protocol::models::ResponseItem; -use codex_protocol::protocol::CompactedItem; -use codex_protocol::protocol::EventMsg; -use codex_protocol::protocol::RolloutItem; -use codex_protocol::protocol::RolloutLine; -use codex_protocol::protocol::SessionMeta; -use codex_protocol::protocol::SessionMetaLine; -use codex_protocol::protocol::SessionSource; -use codex_protocol::protocol::UserMessageEvent; +use crate::rollout::list::{ + ConversationItem, ConversationsPage, Cursor, get_conversation, get_conversations, +}; const NO_SOURCE_FILTER: &[SessionSource] = &[]; const TEST_PROVIDER: &str = "test-provider"; diff --git a/codex-rs/core/src/safety.rs b/codex-rs/core/src/safety.rs index 1e81981fd1..69044f42b0 100644 --- a/codex-rs/core/src/safety.rs +++ b/codex-rs/core/src/safety.rs @@ -1,20 +1,14 @@ -use std::path::Component; -use std::path::Path; -use std::path::PathBuf; - -use codex_apply_patch::ApplyPatchAction; -use codex_apply_patch::ApplyPatchFileChange; - -use crate::exec::SandboxType; - -use crate::protocol::AskForApproval; -use crate::protocol::SandboxPolicy; - +use std::path::{Component, Path, PathBuf}; #[cfg(target_os = "windows")] use std::sync::atomic::AtomicBool; #[cfg(target_os = "windows")] use std::sync::atomic::Ordering; +use codex_apply_patch::{ApplyPatchAction, ApplyPatchFileChange}; + +use crate::exec::SandboxType; +use crate::protocol::{AskForApproval, SandboxPolicy}; + #[cfg(target_os = "windows")] static WINDOWS_SANDBOX_ENABLED: AtomicBool = AtomicBool::new(false); @@ -190,9 +184,10 @@ fn is_write_patch_constrained_to_writable_paths( #[cfg(test)] mod tests { - use super::*; use tempfile::TempDir; + use super::*; + #[test] fn test_writable_roots_constraint() { // Use a temporary directory as our workspace to avoid touching diff --git a/codex-rs/core/src/sandboxing/assessment.rs b/codex-rs/core/src/sandboxing/assessment.rs index 31e76777bb..fbc1b24f3c 100644 --- a/codex-rs/core/src/sandboxing/assessment.rs +++ b/codex-rs/core/src/sandboxing/assessment.rs @@ -1,28 +1,23 @@ -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::sync::Arc; -use std::time::Duration; -use std::time::Instant; +use std::time::{Duration, Instant}; -use crate::AuthManager; -use crate::ModelProviderInfo; -use crate::client::ModelClient; -use crate::client_common::Prompt; -use crate::client_common::ResponseEvent; -use crate::config::Config; -use crate::protocol::SandboxPolicy; use askama::Template; use codex_otel::otel_event_manager::OtelEventManager; use codex_protocol::ConversationId; -use codex_protocol::models::ContentItem; -use codex_protocol::models::ResponseItem; -use codex_protocol::protocol::SandboxCommandAssessment; -use codex_protocol::protocol::SessionSource; +use codex_protocol::models::{ContentItem, ResponseItem}; +use codex_protocol::protocol::{SandboxCommandAssessment, SessionSource}; use futures::StreamExt; use serde_json::json; use tokio::time::timeout; use tracing::warn; +use crate::client::ModelClient; +use crate::client_common::{Prompt, ResponseEvent}; +use crate::config::Config; +use crate::protocol::SandboxPolicy; +use crate::{AuthManager, ModelProviderInfo}; + const SANDBOX_ASSESSMENT_TIMEOUT: Duration = Duration::from_secs(5); #[derive(Template)] diff --git a/codex-rs/core/src/sandboxing/mod.rs b/codex-rs/core/src/sandboxing/mod.rs index 608b39ceef..4ca769c8a0 100644 --- a/codex-rs/core/src/sandboxing/mod.rs +++ b/codex-rs/core/src/sandboxing/mod.rs @@ -8,20 +8,15 @@ ready‑to‑spawn environment. pub mod assessment; -use crate::exec::ExecToolCallOutput; -use crate::exec::SandboxType; -use crate::exec::StdoutStream; -use crate::exec::execute_exec_env; +use std::collections::HashMap; +use std::path::{Path, PathBuf}; + +use crate::exec::{ExecToolCallOutput, SandboxType, StdoutStream, execute_exec_env}; use crate::landlock::create_linux_sandbox_command_args; use crate::protocol::SandboxPolicy; -use crate::seatbelt::MACOS_PATH_TO_SEATBELT_EXECUTABLE; -use crate::seatbelt::create_seatbelt_command_args; -use crate::spawn::CODEX_SANDBOX_ENV_VAR; -use crate::spawn::CODEX_SANDBOX_NETWORK_DISABLED_ENV_VAR; +use crate::seatbelt::{MACOS_PATH_TO_SEATBELT_EXECUTABLE, create_seatbelt_command_args}; +use crate::spawn::{CODEX_SANDBOX_ENV_VAR, CODEX_SANDBOX_NETWORK_DISABLED_ENV_VAR}; use crate::tools::sandboxing::SandboxablePreference; -use std::collections::HashMap; -use std::path::Path; -use std::path::PathBuf; #[derive(Clone, Debug)] pub struct CommandSpec { diff --git a/codex-rs/core/src/seatbelt.rs b/codex-rs/core/src/seatbelt.rs index abd88d41bf..cb0ac83694 100644 --- a/codex-rs/core/src/seatbelt.rs +++ b/codex-rs/core/src/seatbelt.rs @@ -1,12 +1,10 @@ use std::collections::HashMap; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; + use tokio::process::Child; use crate::protocol::SandboxPolicy; -use crate::spawn::CODEX_SANDBOX_ENV_VAR; -use crate::spawn::StdioPolicy; -use crate::spawn::spawn_child_async; +use crate::spawn::{CODEX_SANDBOX_ENV_VAR, StdioPolicy, spawn_child_async}; const MACOS_SEATBELT_BASE_POLICY: &str = include_str!("seatbelt_base_policy.sbpl"); @@ -123,15 +121,15 @@ pub(crate) fn create_seatbelt_command_args( #[cfg(test)] mod tests { - use super::MACOS_SEATBELT_BASE_POLICY; - use super::create_seatbelt_command_args; - use crate::protocol::SandboxPolicy; - use pretty_assertions::assert_eq; use std::fs; - use std::path::Path; - use std::path::PathBuf; + use std::path::{Path, PathBuf}; + + use pretty_assertions::assert_eq; use tempfile::TempDir; + use super::{MACOS_SEATBELT_BASE_POLICY, create_seatbelt_command_args}; + use crate::protocol::SandboxPolicy; + #[test] fn create_seatbelt_args_with_read_only_git_subpath() { if cfg!(target_os = "windows") { diff --git a/codex-rs/core/src/shell.rs b/codex-rs/core/src/shell.rs index 197c00bad2..f0a2b86eee 100644 --- a/codex-rs/core/src/shell.rs +++ b/codex-rs/core/src/shell.rs @@ -1,7 +1,7 @@ -use serde::Deserialize; -use serde::Serialize; use std::path::PathBuf; +use serde::{Deserialize, Serialize}; + #[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)] pub struct ZshShell { pub(crate) shell_path: String, @@ -45,10 +45,10 @@ impl Shell { #[cfg(unix)] fn detect_default_user_shell() -> Shell { - use libc::getpwuid; - use libc::getuid; use std::ffi::CStr; + use libc::{getpwuid, getuid}; + unsafe { let uid = getuid(); let pw = getpwuid(uid); @@ -131,10 +131,11 @@ pub async fn default_user_shell() -> Shell { #[cfg(test)] #[cfg(unix)] mod tests { - use super::*; use std::path::PathBuf; use std::process::Command; + use super::*; + #[tokio::test] async fn test_current_shell_detects_zsh() { let shell = Command::new("sh") @@ -180,9 +181,7 @@ mod tests { for (input, expected_cmd, expected_output) in cases { use std::collections::HashMap; - use crate::exec::ExecParams; - use crate::exec::SandboxType; - use crate::exec::process_exec_tool_call; + use crate::exec::{ExecParams, SandboxType, process_exec_tool_call}; use crate::protocol::SandboxPolicy; let temp_home = tempfile::tempdir().unwrap(); @@ -277,9 +276,7 @@ mod macos_tests { for (input, expected_cmd, expected_output) in cases { use std::collections::HashMap; - use crate::exec::ExecParams; - use crate::exec::SandboxType; - use crate::exec::process_exec_tool_call; + use crate::exec::{ExecParams, SandboxType, process_exec_tool_call}; use crate::protocol::SandboxPolicy; let temp_home = tempfile::tempdir().unwrap(); diff --git a/codex-rs/core/src/spawn.rs b/codex-rs/core/src/spawn.rs index c3a912664b..37ad8e4bc9 100644 --- a/codex-rs/core/src/spawn.rs +++ b/codex-rs/core/src/spawn.rs @@ -1,8 +1,8 @@ use std::collections::HashMap; use std::path::PathBuf; use std::process::Stdio; -use tokio::process::Child; -use tokio::process::Command; + +use tokio::process::{Child, Command}; use tracing::trace; use crate::protocol::SandboxPolicy; diff --git a/codex-rs/core/src/state/mod.rs b/codex-rs/core/src/state/mod.rs index 642433a786..6a4798e038 100644 --- a/codex-rs/core/src/state/mod.rs +++ b/codex-rs/core/src/state/mod.rs @@ -4,6 +4,4 @@ mod turn; pub(crate) use service::SessionServices; pub(crate) use session::SessionState; -pub(crate) use turn::ActiveTurn; -pub(crate) use turn::RunningTask; -pub(crate) use turn::TaskKind; +pub(crate) use turn::{ActiveTurn, RunningTask, TaskKind}; diff --git a/codex-rs/core/src/state/service.rs b/codex-rs/core/src/state/service.rs index ad6f5f90e8..967f65a5b2 100644 --- a/codex-rs/core/src/state/service.rs +++ b/codex-rs/core/src/state/service.rs @@ -1,13 +1,13 @@ use std::sync::Arc; -use crate::AuthManager; -use crate::RolloutRecorder; +use codex_otel::otel_event_manager::OtelEventManager; +use tokio::sync::Mutex; + use crate::mcp_connection_manager::McpConnectionManager; use crate::tools::sandboxing::ApprovalStore; use crate::unified_exec::UnifiedExecSessionManager; use crate::user_notification::UserNotifier; -use codex_otel::otel_event_manager::OtelEventManager; -use tokio::sync::Mutex; +use crate::{AuthManager, RolloutRecorder}; pub(crate) struct SessionServices { pub(crate) mcp_connection_manager: McpConnectionManager, diff --git a/codex-rs/core/src/state/session.rs b/codex-rs/core/src/state/session.rs index 054d485b0f..73ed963d1c 100644 --- a/codex-rs/core/src/state/session.rs +++ b/codex-rs/core/src/state/session.rs @@ -4,9 +4,7 @@ use codex_protocol::models::ResponseItem; use crate::codex::SessionConfiguration; use crate::context_manager::ContextManager; -use crate::protocol::RateLimitSnapshot; -use crate::protocol::TokenUsage; -use crate::protocol::TokenUsageInfo; +use crate::protocol::{RateLimitSnapshot, TokenUsage, TokenUsageInfo}; /// Persistent, session-scoped state previously stored directly on `Session`. pub(crate) struct SessionState { diff --git a/codex-rs/core/src/state/turn.rs b/codex-rs/core/src/state/turn.rs index e2fff0554e..6618dd3d15 100644 --- a/codex-rs/core/src/state/turn.rs +++ b/codex-rs/core/src/state/turn.rs @@ -1,15 +1,13 @@ //! Turn-scoped state and active turn metadata scaffolding. -use indexmap::IndexMap; use std::collections::HashMap; use std::sync::Arc; -use tokio::sync::Mutex; -use tokio::sync::Notify; -use tokio_util::sync::CancellationToken; -use tokio_util::task::AbortOnDropHandle; use codex_protocol::models::ResponseInputItem; -use tokio::sync::oneshot; +use indexmap::IndexMap; +use tokio::sync::{Mutex, Notify, oneshot}; +use tokio_util::sync::CancellationToken; +use tokio_util::task::AbortOnDropHandle; use crate::codex::TurnContext; use crate::protocol::ReviewDecision; diff --git a/codex-rs/core/src/tasks/compact.rs b/codex-rs/core/src/tasks/compact.rs index 64b2a9d2b4..3750be4c5f 100644 --- a/codex-rs/core/src/tasks/compact.rs +++ b/codex-rs/core/src/tasks/compact.rs @@ -1,15 +1,12 @@ use std::sync::Arc; use async_trait::async_trait; +use codex_protocol::user_input::UserInput; use tokio_util::sync::CancellationToken; -use crate::codex::TurnContext; -use crate::codex::compact; +use super::{SessionTask, SessionTaskContext}; +use crate::codex::{TurnContext, compact}; use crate::state::TaskKind; -use codex_protocol::user_input::UserInput; - -use super::SessionTask; -use super::SessionTaskContext; #[derive(Clone, Copy, Default)] pub(crate) struct CompactTask; diff --git a/codex-rs/core/src/tasks/ghost_snapshot.rs b/codex-rs/core/src/tasks/ghost_snapshot.rs index 93830a3059..abfe54d061 100644 --- a/codex-rs/core/src/tasks/ghost_snapshot.rs +++ b/codex-rs/core/src/tasks/ghost_snapshot.rs @@ -1,19 +1,16 @@ -use crate::codex::TurnContext; -use crate::state::TaskKind; -use crate::tasks::SessionTask; -use crate::tasks::SessionTaskContext; +use std::sync::Arc; + use async_trait::async_trait; -use codex_git::CreateGhostCommitOptions; -use codex_git::GitToolingError; -use codex_git::create_ghost_commit; +use codex_git::{CreateGhostCommitOptions, GitToolingError, create_ghost_commit}; use codex_protocol::models::ResponseItem; use codex_protocol::user_input::UserInput; -use codex_utils_readiness::Readiness; -use codex_utils_readiness::Token; -use std::sync::Arc; +use codex_utils_readiness::{Readiness, Token}; use tokio_util::sync::CancellationToken; -use tracing::info; -use tracing::warn; +use tracing::{info, warn}; + +use crate::codex::TurnContext; +use crate::state::TaskKind; +use crate::tasks::{SessionTask, SessionTaskContext}; pub(crate) struct GhostSnapshotTask { token: Token, diff --git a/codex-rs/core/src/tasks/mod.rs b/codex-rs/core/src/tasks/mod.rs index 9bda02c34e..57b5600cf4 100644 --- a/codex-rs/core/src/tasks/mod.rs +++ b/codex-rs/core/src/tasks/mod.rs @@ -9,32 +9,24 @@ use std::sync::Arc; use std::time::Duration; use async_trait::async_trait; -use tokio::select; -use tokio::sync::Notify; -use tokio_util::sync::CancellationToken; -use tokio_util::task::AbortOnDropHandle; -use tracing::trace; -use tracing::warn; - -use crate::AuthManager; -use crate::codex::Session; -use crate::codex::TurnContext; -use crate::protocol::EventMsg; -use crate::protocol::TaskCompleteEvent; -use crate::protocol::TurnAbortReason; -use crate::protocol::TurnAbortedEvent; -use crate::state::ActiveTurn; -use crate::state::RunningTask; -use crate::state::TaskKind; use codex_protocol::user_input::UserInput; - pub(crate) use compact::CompactTask; pub(crate) use ghost_snapshot::GhostSnapshotTask; pub(crate) use regular::RegularTask; pub(crate) use review::ReviewTask; +use tokio::select; +use tokio::sync::Notify; +use tokio_util::sync::CancellationToken; +use tokio_util::task::AbortOnDropHandle; +use tracing::{trace, warn}; pub(crate) use undo::UndoTask; pub(crate) use user_shell::UserShellCommandTask; +use crate::AuthManager; +use crate::codex::{Session, TurnContext}; +use crate::protocol::{EventMsg, TaskCompleteEvent, TurnAbortReason, TurnAbortedEvent}; +use crate::state::{ActiveTurn, RunningTask, TaskKind}; + const GRACEFULL_INTERRUPTION_TIMEOUT_MS: u64 = 100; /// Thin wrapper that exposes the parts of [`Session`] task runners need. diff --git a/codex-rs/core/src/tasks/regular.rs b/codex-rs/core/src/tasks/regular.rs index 416dba3f7f..3db44e5be0 100644 --- a/codex-rs/core/src/tasks/regular.rs +++ b/codex-rs/core/src/tasks/regular.rs @@ -1,15 +1,12 @@ use std::sync::Arc; use async_trait::async_trait; +use codex_protocol::user_input::UserInput; use tokio_util::sync::CancellationToken; -use crate::codex::TurnContext; -use crate::codex::run_task; +use super::{SessionTask, SessionTaskContext}; +use crate::codex::{TurnContext, run_task}; use crate::state::TaskKind; -use codex_protocol::user_input::UserInput; - -use super::SessionTask; -use super::SessionTaskContext; #[derive(Clone, Copy, Default)] pub(crate) struct RegularTask; diff --git a/codex-rs/core/src/tasks/review.rs b/codex-rs/core/src/tasks/review.rs index 57258f4cd9..36a7b76058 100644 --- a/codex-rs/core/src/tasks/review.rs +++ b/codex-rs/core/src/tasks/review.rs @@ -2,26 +2,19 @@ use std::sync::Arc; use async_trait::async_trait; use codex_protocol::items::TurnItem; -use codex_protocol::models::ContentItem; -use codex_protocol::models::ResponseItem; -use codex_protocol::protocol::AgentMessageContentDeltaEvent; -use codex_protocol::protocol::AgentMessageDeltaEvent; -use codex_protocol::protocol::Event; -use codex_protocol::protocol::EventMsg; -use codex_protocol::protocol::ExitedReviewModeEvent; -use codex_protocol::protocol::ItemCompletedEvent; -use codex_protocol::protocol::ReviewOutputEvent; +use codex_protocol::models::{ContentItem, ResponseItem}; +use codex_protocol::protocol::{ + AgentMessageContentDeltaEvent, AgentMessageDeltaEvent, Event, EventMsg, ExitedReviewModeEvent, + ItemCompletedEvent, ReviewOutputEvent, +}; +use codex_protocol::user_input::UserInput; use tokio_util::sync::CancellationToken; -use crate::codex::Session; -use crate::codex::TurnContext; +use super::{SessionTask, SessionTaskContext}; +use crate::codex::{Session, TurnContext}; use crate::codex_delegate::run_codex_conversation_one_shot; use crate::review_format::format_review_findings_block; use crate::state::TaskKind; -use codex_protocol::user_input::UserInput; - -use super::SessionTask; -use super::SessionTaskContext; #[derive(Clone, Copy, Default)] pub(crate) struct ReviewTask; diff --git a/codex-rs/core/src/tasks/undo.rs b/codex-rs/core/src/tasks/undo.rs index 9862a7ecd1..53c7f15512 100644 --- a/codex-rs/core/src/tasks/undo.rs +++ b/codex-rs/core/src/tasks/undo.rs @@ -1,20 +1,16 @@ use std::sync::Arc; -use crate::codex::TurnContext; -use crate::protocol::EventMsg; -use crate::protocol::UndoCompletedEvent; -use crate::protocol::UndoStartedEvent; -use crate::state::TaskKind; -use crate::tasks::SessionTask; -use crate::tasks::SessionTaskContext; use async_trait::async_trait; use codex_git::restore_ghost_commit; use codex_protocol::models::ResponseItem; use codex_protocol::user_input::UserInput; use tokio_util::sync::CancellationToken; -use tracing::error; -use tracing::info; -use tracing::warn; +use tracing::{error, info, warn}; + +use crate::codex::TurnContext; +use crate::protocol::{EventMsg, UndoCompletedEvent, UndoStartedEvent}; +use crate::state::TaskKind; +use crate::tasks::{SessionTask, SessionTaskContext}; pub(crate) struct UndoTask; diff --git a/codex-rs/core/src/tasks/user_shell.rs b/codex-rs/core/src/tasks/user_shell.rs index 0e57e1b728..79969f39ad 100644 --- a/codex-rs/core/src/tasks/user_shell.rs +++ b/codex-rs/core/src/tasks/user_shell.rs @@ -8,19 +8,15 @@ use tokio_util::sync::CancellationToken; use tracing::error; use uuid::Uuid; +use super::{SessionTask, SessionTaskContext}; use crate::codex::TurnContext; -use crate::protocol::EventMsg; -use crate::protocol::TaskStartedEvent; +use crate::protocol::{EventMsg, TaskStartedEvent}; use crate::state::TaskKind; use crate::tools::context::ToolPayload; use crate::tools::parallel::ToolCallRuntime; -use crate::tools::router::ToolCall; -use crate::tools::router::ToolRouter; +use crate::tools::router::{ToolCall, ToolRouter}; use crate::turn_diff_tracker::TurnDiffTracker; -use super::SessionTask; -use super::SessionTaskContext; - const USER_SHELL_TOOL_NAME: &str = "local_shell"; #[derive(Clone)] diff --git a/codex-rs/core/src/token_data.rs b/codex-rs/core/src/token_data.rs index 0a7694e9f3..f51bb7e112 100644 --- a/codex-rs/core/src/token_data.rs +++ b/codex-rs/core/src/token_data.rs @@ -1,6 +1,5 @@ use base64::Engine; -use serde::Deserialize; -use serde::Serialize; +use serde::{Deserialize, Serialize}; use thiserror::Error; #[derive(Deserialize, Serialize, Clone, Debug, PartialEq, Default)] @@ -131,9 +130,10 @@ where #[cfg(test)] mod tests { - use super::*; use serde::Serialize; + use super::*; + #[test] fn id_token_info_parses_email_and_plan() { #[derive(Serialize)] diff --git a/codex-rs/core/src/tools/context.rs b/codex-rs/core/src/tools/context.rs index 029bacaa35..931f8e063c 100644 --- a/codex-rs/core/src/tools/context.rs +++ b/codex-rs/core/src/tools/context.rs @@ -1,23 +1,24 @@ -use crate::codex::Session; -use crate::codex::TurnContext; -use crate::tools::TELEMETRY_PREVIEW_MAX_BYTES; -use crate::tools::TELEMETRY_PREVIEW_MAX_LINES; -use crate::tools::TELEMETRY_PREVIEW_TRUNCATION_NOTICE; -use crate::turn_diff_tracker::TurnDiffTracker; -use codex_otel::otel_event_manager::OtelEventManager; -use codex_protocol::models::FunctionCallOutputContentItem; -use codex_protocol::models::FunctionCallOutputPayload; -use codex_protocol::models::ResponseInputItem; -use codex_protocol::models::ShellToolCallParams; -use codex_protocol::protocol::FileChange; -use codex_utils_string::take_bytes_at_char_boundary; -use mcp_types::CallToolResult; use std::borrow::Cow; use std::collections::HashMap; use std::path::PathBuf; use std::sync::Arc; + +use codex_otel::otel_event_manager::OtelEventManager; +use codex_protocol::models::{ + FunctionCallOutputContentItem, FunctionCallOutputPayload, ResponseInputItem, + ShellToolCallParams, +}; +use codex_protocol::protocol::FileChange; +use codex_utils_string::take_bytes_at_char_boundary; +use mcp_types::CallToolResult; use tokio::sync::Mutex; +use crate::codex::{Session, TurnContext}; +use crate::tools::{ + TELEMETRY_PREVIEW_MAX_BYTES, TELEMETRY_PREVIEW_MAX_LINES, TELEMETRY_PREVIEW_TRUNCATION_NOTICE, +}; +use crate::turn_diff_tracker::TurnDiffTracker; + pub type SharedTurnDiffTracker = Arc>; #[derive(Clone)] @@ -165,9 +166,10 @@ fn telemetry_preview(content: &str) -> String { #[cfg(test)] mod tests { - use super::*; use pretty_assertions::assert_eq; + use super::*; + #[test] fn custom_tool_calls_should_roundtrip_as_custom_outputs() { let payload = ToolPayload::Custom { diff --git a/codex-rs/core/src/tools/events.rs b/codex-rs/core/src/tools/events.rs index 9019dac5ed..66c28d2119 100644 --- a/codex-rs/core/src/tools/events.rs +++ b/codex-rs/core/src/tools/events.rs @@ -1,25 +1,19 @@ -use crate::codex::Session; -use crate::codex::TurnContext; -use crate::error::CodexErr; -use crate::error::SandboxErr; -use crate::exec::ExecToolCallOutput; -use crate::function_tool::FunctionCallError; -use crate::parse_command::parse_command; -use crate::protocol::EventMsg; -use crate::protocol::ExecCommandBeginEvent; -use crate::protocol::ExecCommandEndEvent; -use crate::protocol::FileChange; -use crate::protocol::PatchApplyBeginEvent; -use crate::protocol::PatchApplyEndEvent; -use crate::protocol::TurnDiffEvent; -use crate::tools::context::SharedTurnDiffTracker; -use crate::tools::sandboxing::ToolError; use std::collections::HashMap; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::time::Duration; use super::format_exec_output_str; +use crate::codex::{Session, TurnContext}; +use crate::error::{CodexErr, SandboxErr}; +use crate::exec::ExecToolCallOutput; +use crate::function_tool::FunctionCallError; +use crate::parse_command::parse_command; +use crate::protocol::{ + EventMsg, ExecCommandBeginEvent, ExecCommandEndEvent, FileChange, PatchApplyBeginEvent, + PatchApplyEndEvent, TurnDiffEvent, +}; +use crate::tools::context::SharedTurnDiffTracker; +use crate::tools::sandboxing::ToolError; #[derive(Clone, Copy)] pub(crate) struct ToolEventCtx<'a> { diff --git a/codex-rs/core/src/tools/handlers/apply_patch.rs b/codex-rs/core/src/tools/handlers/apply_patch.rs index 1e82b9cf10..f4ff78eb27 100644 --- a/codex-rs/core/src/tools/handlers/apply_patch.rs +++ b/codex-rs/core/src/tools/handlers/apply_patch.rs @@ -1,29 +1,19 @@ use std::collections::BTreeMap; -use crate::apply_patch; -use crate::apply_patch::InternalApplyPatchInvocation; -use crate::apply_patch::convert_apply_patch_to_protocol; -use crate::client_common::tools::FreeformTool; -use crate::client_common::tools::FreeformToolFormat; -use crate::client_common::tools::ResponsesApiTool; -use crate::client_common::tools::ToolSpec; -use crate::function_tool::FunctionCallError; -use crate::tools::context::ToolInvocation; -use crate::tools::context::ToolOutput; -use crate::tools::context::ToolPayload; -use crate::tools::events::ToolEmitter; -use crate::tools::events::ToolEventCtx; -use crate::tools::orchestrator::ToolOrchestrator; -use crate::tools::registry::ToolHandler; -use crate::tools::registry::ToolKind; -use crate::tools::runtimes::apply_patch::ApplyPatchRequest; -use crate::tools::runtimes::apply_patch::ApplyPatchRuntime; -use crate::tools::sandboxing::ToolCtx; -use crate::tools::spec::ApplyPatchToolArgs; -use crate::tools::spec::JsonSchema; use async_trait::async_trait; -use serde::Deserialize; -use serde::Serialize; +use serde::{Deserialize, Serialize}; + +use crate::apply_patch; +use crate::apply_patch::{InternalApplyPatchInvocation, convert_apply_patch_to_protocol}; +use crate::client_common::tools::{FreeformTool, FreeformToolFormat, ResponsesApiTool, ToolSpec}; +use crate::function_tool::FunctionCallError; +use crate::tools::context::{ToolInvocation, ToolOutput, ToolPayload}; +use crate::tools::events::{ToolEmitter, ToolEventCtx}; +use crate::tools::orchestrator::ToolOrchestrator; +use crate::tools::registry::{ToolHandler, ToolKind}; +use crate::tools::runtimes::apply_patch::{ApplyPatchRequest, ApplyPatchRuntime}; +use crate::tools::sandboxing::ToolCtx; +use crate::tools::spec::{ApplyPatchToolArgs, JsonSchema}; pub struct ApplyPatchHandler; diff --git a/codex-rs/core/src/tools/handlers/grep_files.rs b/codex-rs/core/src/tools/handlers/grep_files.rs index 5473f86935..8bd56a6acc 100644 --- a/codex-rs/core/src/tools/handlers/grep_files.rs +++ b/codex-rs/core/src/tools/handlers/grep_files.rs @@ -7,11 +7,8 @@ use tokio::process::Command; use tokio::time::timeout; use crate::function_tool::FunctionCallError; -use crate::tools::context::ToolInvocation; -use crate::tools::context::ToolOutput; -use crate::tools::context::ToolPayload; -use crate::tools::registry::ToolHandler; -use crate::tools::registry::ToolKind; +use crate::tools::context::{ToolInvocation, ToolOutput, ToolPayload}; +use crate::tools::registry::{ToolHandler, ToolKind}; pub struct GrepFilesHandler; @@ -176,10 +173,12 @@ fn parse_results(stdout: &[u8], limit: usize) -> Vec { #[cfg(test)] mod tests { - use super::*; use std::process::Command as StdCommand; + use tempfile::tempdir; + use super::*; + #[test] fn parses_basic_results() { let stdout = b"/tmp/file_a.rs\n/tmp/file_b.rs\n"; diff --git a/codex-rs/core/src/tools/handlers/list_dir.rs b/codex-rs/core/src/tools/handlers/list_dir.rs index 1c08243f72..b58090de52 100644 --- a/codex-rs/core/src/tools/handlers/list_dir.rs +++ b/codex-rs/core/src/tools/handlers/list_dir.rs @@ -1,8 +1,7 @@ use std::collections::VecDeque; use std::ffi::OsStr; use std::fs::FileType; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use async_trait::async_trait; use codex_utils_string::take_bytes_at_char_boundary; @@ -10,11 +9,8 @@ use serde::Deserialize; use tokio::fs; use crate::function_tool::FunctionCallError; -use crate::tools::context::ToolInvocation; -use crate::tools::context::ToolOutput; -use crate::tools::context::ToolPayload; -use crate::tools::registry::ToolHandler; -use crate::tools::registry::ToolKind; +use crate::tools::context::{ToolInvocation, ToolOutput, ToolPayload}; +use crate::tools::registry::{ToolHandler, ToolKind}; pub struct ListDirHandler; @@ -272,9 +268,10 @@ impl From<&FileType> for DirEntryKind { #[cfg(test)] mod tests { - use super::*; use tempfile::tempdir; + use super::*; + #[tokio::test] async fn lists_directory_entries() { let temp = tempdir().expect("create tempdir"); diff --git a/codex-rs/core/src/tools/handlers/mcp.rs b/codex-rs/core/src/tools/handlers/mcp.rs index 9798fb8241..0205cc4cc2 100644 --- a/codex-rs/core/src/tools/handlers/mcp.rs +++ b/codex-rs/core/src/tools/handlers/mcp.rs @@ -2,11 +2,8 @@ use async_trait::async_trait; use crate::function_tool::FunctionCallError; use crate::mcp_tool_call::handle_mcp_tool_call; -use crate::tools::context::ToolInvocation; -use crate::tools::context::ToolOutput; -use crate::tools::context::ToolPayload; -use crate::tools::registry::ToolHandler; -use crate::tools::registry::ToolKind; +use crate::tools::context::{ToolInvocation, ToolOutput, ToolPayload}; +use crate::tools::registry::{ToolHandler, ToolKind}; pub struct McpHandler; diff --git a/codex-rs/core/src/tools/handlers/mcp_resource.rs b/codex-rs/core/src/tools/handlers/mcp_resource.rs index b601591ac1..38c89e1ab7 100644 --- a/codex-rs/core/src/tools/handlers/mcp_resource.rs +++ b/codex-rs/core/src/tools/handlers/mcp_resource.rs @@ -1,37 +1,22 @@ use std::collections::HashMap; use std::sync::Arc; -use std::time::Duration; -use std::time::Instant; +use std::time::{Duration, Instant}; use async_trait::async_trait; -use mcp_types::CallToolResult; -use mcp_types::ContentBlock; -use mcp_types::ListResourceTemplatesRequestParams; -use mcp_types::ListResourceTemplatesResult; -use mcp_types::ListResourcesRequestParams; -use mcp_types::ListResourcesResult; -use mcp_types::ReadResourceRequestParams; -use mcp_types::ReadResourceResult; -use mcp_types::Resource; -use mcp_types::ResourceTemplate; -use mcp_types::TextContent; -use serde::Deserialize; -use serde::Serialize; +use mcp_types::{ + CallToolResult, ContentBlock, ListResourceTemplatesRequestParams, ListResourceTemplatesResult, + ListResourcesRequestParams, ListResourcesResult, ReadResourceRequestParams, ReadResourceResult, + Resource, ResourceTemplate, TextContent, +}; use serde::de::DeserializeOwned; +use serde::{Deserialize, Serialize}; use serde_json::Value; -use crate::codex::Session; -use crate::codex::TurnContext; +use crate::codex::{Session, TurnContext}; use crate::function_tool::FunctionCallError; -use crate::protocol::EventMsg; -use crate::protocol::McpInvocation; -use crate::protocol::McpToolCallBeginEvent; -use crate::protocol::McpToolCallEndEvent; -use crate::tools::context::ToolInvocation; -use crate::tools::context::ToolOutput; -use crate::tools::context::ToolPayload; -use crate::tools::registry::ToolHandler; -use crate::tools::registry::ToolKind; +use crate::protocol::{EventMsg, McpInvocation, McpToolCallBeginEvent, McpToolCallEndEvent}; +use crate::tools::context::{ToolInvocation, ToolOutput, ToolPayload}; +use crate::tools::registry::{ToolHandler, ToolKind}; pub struct McpResourceHandler; @@ -668,12 +653,12 @@ where #[cfg(test)] mod tests { - use super::*; - use mcp_types::ListResourcesResult; - use mcp_types::ResourceTemplate; + use mcp_types::{ListResourcesResult, ResourceTemplate}; use pretty_assertions::assert_eq; use serde_json::json; + use super::*; + fn resource(uri: &str, name: &str) -> Resource { Resource { annotations: None, diff --git a/codex-rs/core/src/tools/handlers/mod.rs b/codex-rs/core/src/tools/handlers/mod.rs index 187b444414..8c103fc236 100644 --- a/codex-rs/core/src/tools/handlers/mod.rs +++ b/codex-rs/core/src/tools/handlers/mod.rs @@ -10,14 +10,12 @@ mod test_sync; mod unified_exec; mod view_image; -pub use plan::PLAN_TOOL; - pub use apply_patch::ApplyPatchHandler; pub use grep_files::GrepFilesHandler; pub use list_dir::ListDirHandler; pub use mcp::McpHandler; pub use mcp_resource::McpResourceHandler; -pub use plan::PlanHandler; +pub use plan::{PLAN_TOOL, PlanHandler}; pub use read_file::ReadFileHandler; pub use shell::ShellHandler; pub use test_sync::TestSyncHandler; diff --git a/codex-rs/core/src/tools/handlers/plan.rs b/codex-rs/core/src/tools/handlers/plan.rs index 073319bf1c..4387a53101 100644 --- a/codex-rs/core/src/tools/handlers/plan.rs +++ b/codex-rs/core/src/tools/handlers/plan.rs @@ -1,19 +1,16 @@ -use crate::client_common::tools::ResponsesApiTool; -use crate::client_common::tools::ToolSpec; -use crate::codex::Session; -use crate::codex::TurnContext; -use crate::function_tool::FunctionCallError; -use crate::tools::context::ToolInvocation; -use crate::tools::context::ToolOutput; -use crate::tools::context::ToolPayload; -use crate::tools::registry::ToolHandler; -use crate::tools::registry::ToolKind; -use crate::tools::spec::JsonSchema; +use std::collections::BTreeMap; +use std::sync::LazyLock; + use async_trait::async_trait; use codex_protocol::plan_tool::UpdatePlanArgs; use codex_protocol::protocol::EventMsg; -use std::collections::BTreeMap; -use std::sync::LazyLock; + +use crate::client_common::tools::{ResponsesApiTool, ToolSpec}; +use crate::codex::{Session, TurnContext}; +use crate::function_tool::FunctionCallError; +use crate::tools::context::{ToolInvocation, ToolOutput, ToolPayload}; +use crate::tools::registry::{ToolHandler, ToolKind}; +use crate::tools::spec::JsonSchema; pub struct PlanHandler; diff --git a/codex-rs/core/src/tools/handlers/read_file.rs b/codex-rs/core/src/tools/handlers/read_file.rs index 58b6ea6888..a0a98a1465 100644 --- a/codex-rs/core/src/tools/handlers/read_file.rs +++ b/codex-rs/core/src/tools/handlers/read_file.rs @@ -6,11 +6,8 @@ use codex_utils_string::take_bytes_at_char_boundary; use serde::Deserialize; use crate::function_tool::FunctionCallError; -use crate::tools::context::ToolInvocation; -use crate::tools::context::ToolOutput; -use crate::tools::context::ToolPayload; -use crate::tools::registry::ToolHandler; -use crate::tools::registry::ToolKind; +use crate::tools::context::{ToolInvocation, ToolOutput, ToolPayload}; +use crate::tools::registry::{ToolHandler, ToolKind}; pub struct ReadFileHandler; @@ -156,12 +153,13 @@ impl ToolHandler for ReadFileHandler { } mod slice { + use std::path::Path; + + use tokio::fs::File; + use tokio::io::{AsyncBufReadExt, BufReader}; + use crate::function_tool::FunctionCallError; use crate::tools::handlers::read_file::format_line; - use std::path::Path; - use tokio::fs::File; - use tokio::io::AsyncBufReadExt; - use tokio::io::BufReader; pub async fn read( path: &Path, @@ -223,17 +221,16 @@ mod slice { } mod indentation { - use crate::function_tool::FunctionCallError; - use crate::tools::handlers::read_file::IndentationArgs; - use crate::tools::handlers::read_file::LineRecord; - use crate::tools::handlers::read_file::TAB_WIDTH; - use crate::tools::handlers::read_file::format_line; - use crate::tools::handlers::read_file::trim_empty_lines; use std::collections::VecDeque; use std::path::Path; + use tokio::fs::File; - use tokio::io::AsyncBufReadExt; - use tokio::io::BufReader; + use tokio::io::{AsyncBufReadExt, BufReader}; + + use crate::function_tool::FunctionCallError; + use crate::tools::handlers::read_file::{ + IndentationArgs, LineRecord, TAB_WIDTH, format_line, trim_empty_lines, + }; pub async fn read_block( path: &Path, @@ -493,11 +490,12 @@ mod defaults { #[cfg(test)] mod tests { + use pretty_assertions::assert_eq; + use tempfile::NamedTempFile; + use super::indentation::read_block; use super::slice::read; use super::*; - use pretty_assertions::assert_eq; - use tempfile::NamedTempFile; #[tokio::test] async fn reads_requested_range() -> anyhow::Result<()> { diff --git a/codex-rs/core/src/tools/handlers/shell.rs b/codex-rs/core/src/tools/handlers/shell.rs index b97242a9a3..056082cf4d 100644 --- a/codex-rs/core/src/tools/handlers/shell.rs +++ b/codex-rs/core/src/tools/handlers/shell.rs @@ -1,26 +1,20 @@ -use async_trait::async_trait; -use codex_protocol::models::ShellToolCallParams; use std::sync::Arc; +use async_trait::async_trait; +use codex_protocol::models::ShellToolCallParams; + use crate::apply_patch; -use crate::apply_patch::InternalApplyPatchInvocation; -use crate::apply_patch::convert_apply_patch_to_protocol; +use crate::apply_patch::{InternalApplyPatchInvocation, convert_apply_patch_to_protocol}; use crate::codex::TurnContext; use crate::exec::ExecParams; use crate::exec_env::create_env; use crate::function_tool::FunctionCallError; -use crate::tools::context::ToolInvocation; -use crate::tools::context::ToolOutput; -use crate::tools::context::ToolPayload; -use crate::tools::events::ToolEmitter; -use crate::tools::events::ToolEventCtx; +use crate::tools::context::{ToolInvocation, ToolOutput, ToolPayload}; +use crate::tools::events::{ToolEmitter, ToolEventCtx}; use crate::tools::orchestrator::ToolOrchestrator; -use crate::tools::registry::ToolHandler; -use crate::tools::registry::ToolKind; -use crate::tools::runtimes::apply_patch::ApplyPatchRequest; -use crate::tools::runtimes::apply_patch::ApplyPatchRuntime; -use crate::tools::runtimes::shell::ShellRequest; -use crate::tools::runtimes::shell::ShellRuntime; +use crate::tools::registry::{ToolHandler, ToolKind}; +use crate::tools::runtimes::apply_patch::{ApplyPatchRequest, ApplyPatchRuntime}; +use crate::tools::runtimes::shell::{ShellRequest, ShellRuntime}; use crate::tools::sandboxing::ToolCtx; pub struct ShellHandler; diff --git a/codex-rs/core/src/tools/handlers/test_sync.rs b/codex-rs/core/src/tools/handlers/test_sync.rs index d217c1e8a6..8058bea102 100644 --- a/codex-rs/core/src/tools/handlers/test_sync.rs +++ b/codex-rs/core/src/tools/handlers/test_sync.rs @@ -1,7 +1,6 @@ use std::collections::HashMap; use std::collections::hash_map::Entry; -use std::sync::Arc; -use std::sync::OnceLock; +use std::sync::{Arc, OnceLock}; use std::time::Duration; use async_trait::async_trait; @@ -10,11 +9,8 @@ use tokio::sync::Barrier; use tokio::time::sleep; use crate::function_tool::FunctionCallError; -use crate::tools::context::ToolInvocation; -use crate::tools::context::ToolOutput; -use crate::tools::context::ToolPayload; -use crate::tools::registry::ToolHandler; -use crate::tools::registry::ToolKind; +use crate::tools::context::{ToolInvocation, ToolOutput, ToolPayload}; +use crate::tools::registry::{ToolHandler, ToolKind}; pub struct TestSyncHandler; diff --git a/codex-rs/core/src/tools/handlers/unified_exec.rs b/codex-rs/core/src/tools/handlers/unified_exec.rs index 32ace6c959..a6ef2507a8 100644 --- a/codex-rs/core/src/tools/handlers/unified_exec.rs +++ b/codex-rs/core/src/tools/handlers/unified_exec.rs @@ -1,26 +1,17 @@ use std::time::Duration; use async_trait::async_trait; -use serde::Deserialize; -use serde::Serialize; +use serde::{Deserialize, Serialize}; use crate::function_tool::FunctionCallError; -use crate::protocol::EventMsg; -use crate::protocol::ExecCommandOutputDeltaEvent; -use crate::protocol::ExecOutputStream; -use crate::tools::context::ToolInvocation; -use crate::tools::context::ToolOutput; -use crate::tools::context::ToolPayload; -use crate::tools::events::ToolEmitter; -use crate::tools::events::ToolEventCtx; -use crate::tools::events::ToolEventStage; -use crate::tools::registry::ToolHandler; -use crate::tools::registry::ToolKind; -use crate::unified_exec::ExecCommandRequest; -use crate::unified_exec::UnifiedExecContext; -use crate::unified_exec::UnifiedExecResponse; -use crate::unified_exec::UnifiedExecSessionManager; -use crate::unified_exec::WriteStdinRequest; +use crate::protocol::{EventMsg, ExecCommandOutputDeltaEvent, ExecOutputStream}; +use crate::tools::context::{ToolInvocation, ToolOutput, ToolPayload}; +use crate::tools::events::{ToolEmitter, ToolEventCtx, ToolEventStage}; +use crate::tools::registry::{ToolHandler, ToolKind}; +use crate::unified_exec::{ + ExecCommandRequest, UnifiedExecContext, UnifiedExecResponse, UnifiedExecSessionManager, + WriteStdinRequest, +}; pub struct UnifiedExecHandler; diff --git a/codex-rs/core/src/tools/handlers/view_image.rs b/codex-rs/core/src/tools/handlers/view_image.rs index 6b308c0944..bbc3485700 100644 --- a/codex-rs/core/src/tools/handlers/view_image.rs +++ b/codex-rs/core/src/tools/handlers/view_image.rs @@ -1,16 +1,12 @@ use async_trait::async_trait; +use codex_protocol::user_input::UserInput; use serde::Deserialize; use tokio::fs; use crate::function_tool::FunctionCallError; -use crate::protocol::EventMsg; -use crate::protocol::ViewImageToolCallEvent; -use crate::tools::context::ToolInvocation; -use crate::tools::context::ToolOutput; -use crate::tools::context::ToolPayload; -use crate::tools::registry::ToolHandler; -use crate::tools::registry::ToolKind; -use codex_protocol::user_input::UserInput; +use crate::protocol::{EventMsg, ViewImageToolCallEvent}; +use crate::tools::context::{ToolInvocation, ToolOutput, ToolPayload}; +use crate::tools::registry::{ToolHandler, ToolKind}; pub struct ViewImageHandler; diff --git a/codex-rs/core/src/tools/mod.rs b/codex-rs/core/src/tools/mod.rs index 92509c857c..4e52b130b4 100644 --- a/codex-rs/core/src/tools/mod.rs +++ b/codex-rs/core/src/tools/mod.rs @@ -9,11 +9,12 @@ pub mod runtimes; pub mod sandboxing; pub mod spec; -use crate::context_manager::format_output_for_model_body; -use crate::exec::ExecToolCallOutput; pub use router::ToolRouter; use serde::Serialize; +use crate::context_manager::format_output_for_model_body; +use crate::exec::ExecToolCallOutput; + // Telemetry preview limits: keep log events smaller than model budgets. pub(crate) const TELEMETRY_PREVIEW_MAX_BYTES: usize = 2 * 1024; // 2 KiB pub(crate) const TELEMETRY_PREVIEW_MAX_LINES: usize = 64; // lines diff --git a/codex-rs/core/src/tools/orchestrator.rs b/codex-rs/core/src/tools/orchestrator.rs index 878e48e8be..10ca4e1e9a 100644 --- a/codex-rs/core/src/tools/orchestrator.rs +++ b/codex-rs/core/src/tools/orchestrator.rs @@ -5,19 +5,14 @@ Central place for approvals + sandbox selection + retry semantics. Drives a simple sequence for any ToolRuntime: approval → select sandbox → attempt → retry without sandbox on denial (no re‑approval thanks to caching). */ -use crate::error::CodexErr; -use crate::error::SandboxErr; -use crate::error::get_error_message_ui; +use codex_protocol::protocol::{AskForApproval, ReviewDecision}; + +use crate::error::{CodexErr, SandboxErr, get_error_message_ui}; use crate::exec::ExecToolCallOutput; use crate::sandboxing::SandboxManager; -use crate::tools::sandboxing::ApprovalCtx; -use crate::tools::sandboxing::ProvidesSandboxRetryData; -use crate::tools::sandboxing::SandboxAttempt; -use crate::tools::sandboxing::ToolCtx; -use crate::tools::sandboxing::ToolError; -use crate::tools::sandboxing::ToolRuntime; -use codex_protocol::protocol::AskForApproval; -use codex_protocol::protocol::ReviewDecision; +use crate::tools::sandboxing::{ + ApprovalCtx, ProvidesSandboxRetryData, SandboxAttempt, ToolCtx, ToolError, ToolRuntime, +}; pub(crate) struct ToolOrchestrator { sandbox: SandboxManager, diff --git a/codex-rs/core/src/tools/parallel.rs b/codex-rs/core/src/tools/parallel.rs index baa5321da8..c975a838af 100644 --- a/codex-rs/core/src/tools/parallel.rs +++ b/codex-rs/core/src/tools/parallel.rs @@ -1,22 +1,18 @@ use std::sync::Arc; use std::time::Instant; +use codex_protocol::models::{FunctionCallOutputPayload, ResponseInputItem}; +use codex_utils_readiness::Readiness; use tokio::sync::RwLock; use tokio_util::either::Either; use tokio_util::sync::CancellationToken; use tokio_util::task::AbortOnDropHandle; -use crate::codex::Session; -use crate::codex::TurnContext; +use crate::codex::{Session, TurnContext}; use crate::error::CodexErr; use crate::function_tool::FunctionCallError; -use crate::tools::context::SharedTurnDiffTracker; -use crate::tools::context::ToolPayload; -use crate::tools::router::ToolCall; -use crate::tools::router::ToolRouter; -use codex_protocol::models::FunctionCallOutputPayload; -use codex_protocol::models::ResponseInputItem; -use codex_utils_readiness::Readiness; +use crate::tools::context::{SharedTurnDiffTracker, ToolPayload}; +use crate::tools::router::{ToolCall, ToolRouter}; pub(crate) struct ToolCallRuntime { router: Arc, diff --git a/codex-rs/core/src/tools/registry.rs b/codex-rs/core/src/tools/registry.rs index 8769259794..05616649dd 100644 --- a/codex-rs/core/src/tools/registry.rs +++ b/codex-rs/core/src/tools/registry.rs @@ -8,9 +8,7 @@ use tracing::warn; use crate::client_common::tools::ToolSpec; use crate::function_tool::FunctionCallError; -use crate::tools::context::ToolInvocation; -use crate::tools::context::ToolOutput; -use crate::tools::context::ToolPayload; +use crate::tools::context::{ToolInvocation, ToolOutput, ToolPayload}; #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] pub enum ToolKind { diff --git a/codex-rs/core/src/tools/router.rs b/codex-rs/core/src/tools/router.rs index 19098aa80d..61a0a82d6c 100644 --- a/codex-rs/core/src/tools/router.rs +++ b/codex-rs/core/src/tools/router.rs @@ -1,21 +1,16 @@ use std::collections::HashMap; use std::sync::Arc; +use codex_protocol::models::{ + LocalShellAction, ResponseInputItem, ResponseItem, ShellToolCallParams, +}; + use crate::client_common::tools::ToolSpec; -use crate::codex::Session; -use crate::codex::TurnContext; +use crate::codex::{Session, TurnContext}; use crate::function_tool::FunctionCallError; -use crate::tools::context::SharedTurnDiffTracker; -use crate::tools::context::ToolInvocation; -use crate::tools::context::ToolPayload; -use crate::tools::registry::ConfiguredToolSpec; -use crate::tools::registry::ToolRegistry; -use crate::tools::spec::ToolsConfig; -use crate::tools::spec::build_specs; -use codex_protocol::models::LocalShellAction; -use codex_protocol::models::ResponseInputItem; -use codex_protocol::models::ResponseItem; -use codex_protocol::models::ShellToolCallParams; +use crate::tools::context::{SharedTurnDiffTracker, ToolInvocation, ToolPayload}; +use crate::tools::registry::{ConfiguredToolSpec, ToolRegistry}; +use crate::tools::spec::{ToolsConfig, build_specs}; #[derive(Clone)] pub struct ToolCall { diff --git a/codex-rs/core/src/tools/runtimes/apply_patch.rs b/codex-rs/core/src/tools/runtimes/apply_patch.rs index 0cdddd5087..b4e3439b5e 100644 --- a/codex-rs/core/src/tools/runtimes/apply_patch.rs +++ b/codex-rs/core/src/tools/runtimes/apply_patch.rs @@ -4,27 +4,20 @@ //! decision to avoid re-prompting, builds the self-invocation command for //! `codex --codex-run-as-apply-patch`, and runs under the current //! `SandboxAttempt` with a minimal environment. -use crate::CODEX_APPLY_PATCH_ARG1; -use crate::exec::ExecToolCallOutput; -use crate::sandboxing::CommandSpec; -use crate::sandboxing::execute_env; -use crate::tools::sandboxing::Approvable; -use crate::tools::sandboxing::ApprovalCtx; -use crate::tools::sandboxing::ProvidesSandboxRetryData; -use crate::tools::sandboxing::SandboxAttempt; -use crate::tools::sandboxing::SandboxRetryData; -use crate::tools::sandboxing::Sandboxable; -use crate::tools::sandboxing::SandboxablePreference; -use crate::tools::sandboxing::ToolCtx; -use crate::tools::sandboxing::ToolError; -use crate::tools::sandboxing::ToolRuntime; -use crate::tools::sandboxing::with_cached_approval; -use codex_protocol::protocol::AskForApproval; -use codex_protocol::protocol::ReviewDecision; -use futures::future::BoxFuture; use std::collections::HashMap; use std::path::PathBuf; +use codex_protocol::protocol::{AskForApproval, ReviewDecision}; +use futures::future::BoxFuture; + +use crate::CODEX_APPLY_PATCH_ARG1; +use crate::exec::ExecToolCallOutput; +use crate::sandboxing::{CommandSpec, execute_env}; +use crate::tools::sandboxing::{ + Approvable, ApprovalCtx, ProvidesSandboxRetryData, SandboxAttempt, SandboxRetryData, + Sandboxable, SandboxablePreference, ToolCtx, ToolError, ToolRuntime, with_cached_approval, +}; + #[derive(Clone, Debug)] pub struct ApplyPatchRequest { pub patch: String, diff --git a/codex-rs/core/src/tools/runtimes/mod.rs b/codex-rs/core/src/tools/runtimes/mod.rs index 212163d72c..2ecf4cae7a 100644 --- a/codex-rs/core/src/tools/runtimes/mod.rs +++ b/codex-rs/core/src/tools/runtimes/mod.rs @@ -4,11 +4,12 @@ Module: runtimes Concrete ToolRuntime implementations for specific tools. Each runtime stays small and focused and reuses the orchestrator for approvals + sandbox + retry. */ -use crate::sandboxing::CommandSpec; -use crate::tools::sandboxing::ToolError; use std::collections::HashMap; use std::path::Path; +use crate::sandboxing::CommandSpec; +use crate::tools::sandboxing::ToolError; + pub mod apply_patch; pub mod shell; pub mod unified_exec; diff --git a/codex-rs/core/src/tools/runtimes/shell.rs b/codex-rs/core/src/tools/runtimes/shell.rs index f29224fcc1..976bcae771 100644 --- a/codex-rs/core/src/tools/runtimes/shell.rs +++ b/codex-rs/core/src/tools/runtimes/shell.rs @@ -4,27 +4,21 @@ Runtime: shell Executes shell requests under the orchestrator: asks for approval when needed, builds a CommandSpec, and runs it under the current SandboxAttempt. */ +use std::path::PathBuf; + +use codex_protocol::protocol::{AskForApproval, ReviewDecision}; +use futures::future::BoxFuture; + use crate::command_safety::is_dangerous_command::command_might_be_dangerous; use crate::command_safety::is_safe_command::is_known_safe_command; use crate::exec::ExecToolCallOutput; use crate::protocol::SandboxPolicy; use crate::sandboxing::execute_env; use crate::tools::runtimes::build_command_spec; -use crate::tools::sandboxing::Approvable; -use crate::tools::sandboxing::ApprovalCtx; -use crate::tools::sandboxing::ProvidesSandboxRetryData; -use crate::tools::sandboxing::SandboxAttempt; -use crate::tools::sandboxing::SandboxRetryData; -use crate::tools::sandboxing::Sandboxable; -use crate::tools::sandboxing::SandboxablePreference; -use crate::tools::sandboxing::ToolCtx; -use crate::tools::sandboxing::ToolError; -use crate::tools::sandboxing::ToolRuntime; -use crate::tools::sandboxing::with_cached_approval; -use codex_protocol::protocol::AskForApproval; -use codex_protocol::protocol::ReviewDecision; -use futures::future::BoxFuture; -use std::path::PathBuf; +use crate::tools::sandboxing::{ + Approvable, ApprovalCtx, ProvidesSandboxRetryData, SandboxAttempt, SandboxRetryData, + Sandboxable, SandboxablePreference, ToolCtx, ToolError, ToolRuntime, with_cached_approval, +}; #[derive(Clone, Debug)] pub struct ShellRequest { diff --git a/codex-rs/core/src/tools/runtimes/unified_exec.rs b/codex-rs/core/src/tools/runtimes/unified_exec.rs index 85c996387a..9b25f0f0b6 100644 --- a/codex-rs/core/src/tools/runtimes/unified_exec.rs +++ b/codex-rs/core/src/tools/runtimes/unified_exec.rs @@ -4,28 +4,20 @@ Runtime: unified exec Handles approval + sandbox orchestration for unified exec requests, delegating to the session manager to spawn PTYs once an ExecEnv is prepared. */ -use crate::error::CodexErr; -use crate::error::SandboxErr; -use crate::tools::runtimes::build_command_spec; -use crate::tools::sandboxing::Approvable; -use crate::tools::sandboxing::ApprovalCtx; -use crate::tools::sandboxing::ProvidesSandboxRetryData; -use crate::tools::sandboxing::SandboxAttempt; -use crate::tools::sandboxing::SandboxRetryData; -use crate::tools::sandboxing::Sandboxable; -use crate::tools::sandboxing::SandboxablePreference; -use crate::tools::sandboxing::ToolCtx; -use crate::tools::sandboxing::ToolError; -use crate::tools::sandboxing::ToolRuntime; -use crate::tools::sandboxing::with_cached_approval; -use crate::unified_exec::UnifiedExecError; -use crate::unified_exec::UnifiedExecSession; -use crate::unified_exec::UnifiedExecSessionManager; -use codex_protocol::protocol::ReviewDecision; -use futures::future::BoxFuture; use std::collections::HashMap; use std::path::PathBuf; +use codex_protocol::protocol::ReviewDecision; +use futures::future::BoxFuture; + +use crate::error::{CodexErr, SandboxErr}; +use crate::tools::runtimes::build_command_spec; +use crate::tools::sandboxing::{ + Approvable, ApprovalCtx, ProvidesSandboxRetryData, SandboxAttempt, SandboxRetryData, + Sandboxable, SandboxablePreference, ToolCtx, ToolError, ToolRuntime, with_cached_approval, +}; +use crate::unified_exec::{UnifiedExecError, UnifiedExecSession, UnifiedExecSessionManager}; + #[derive(Clone, Debug)] pub struct UnifiedExecRequest { pub command: Vec, diff --git a/codex-rs/core/src/tools/sandboxing.rs b/codex-rs/core/src/tools/sandboxing.rs index da1c22b549..11ce2eec08 100644 --- a/codex-rs/core/src/tools/sandboxing.rs +++ b/codex-rs/core/src/tools/sandboxing.rs @@ -4,27 +4,22 @@ //! `ApprovalCtx`, `Approvable`) together with the sandbox orchestration traits //! and helpers (`Sandboxable`, `ToolRuntime`, `SandboxAttempt`, etc.). -use crate::codex::Session; -use crate::codex::TurnContext; -use crate::error::CodexErr; -use crate::protocol::SandboxCommandAssessment; -use crate::protocol::SandboxPolicy; -use crate::sandboxing::CommandSpec; -use crate::sandboxing::SandboxManager; -use crate::sandboxing::SandboxTransformError; -use crate::state::SessionServices; -use codex_protocol::protocol::AskForApproval; -use codex_protocol::protocol::ReviewDecision; use std::collections::HashMap; use std::fmt::Debug; use std::hash::Hash; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; +use codex_protocol::protocol::{AskForApproval, ReviewDecision}; use futures::Future; use futures::future::BoxFuture; use serde::Serialize; +use crate::codex::{Session, TurnContext}; +use crate::error::CodexErr; +use crate::protocol::{SandboxCommandAssessment, SandboxPolicy}; +use crate::sandboxing::{CommandSpec, SandboxManager, SandboxTransformError}; +use crate::state::SessionServices; + #[derive(Clone, Default, Debug)] pub(crate) struct ApprovalStore { // Store serialized keys for generic caching across requests. diff --git a/codex-rs/core/src/tools/spec.rs b/codex-rs/core/src/tools/spec.rs index eba9fd517c..0e88baf710 100644 --- a/codex-rs/core/src/tools/spec.rs +++ b/codex-rs/core/src/tools/spec.rs @@ -1,19 +1,16 @@ -use crate::client_common::tools::ResponsesApiTool; -use crate::client_common::tools::ToolSpec; -use crate::features::Feature; -use crate::features::Features; +use std::collections::{BTreeMap, HashMap}; + +use serde::{Deserialize, Serialize}; +use serde_json::{Value as JsonValue, json}; + +use crate::client_common::tools::{ResponsesApiTool, ToolSpec}; +use crate::features::{Feature, Features}; use crate::model_family::ModelFamily; use crate::tools::handlers::PLAN_TOOL; -use crate::tools::handlers::apply_patch::ApplyPatchToolType; -use crate::tools::handlers::apply_patch::create_apply_patch_freeform_tool; -use crate::tools::handlers::apply_patch::create_apply_patch_json_tool; +use crate::tools::handlers::apply_patch::{ + ApplyPatchToolType, create_apply_patch_freeform_tool, create_apply_patch_json_tool, +}; use crate::tools::registry::ToolRegistryBuilder; -use serde::Deserialize; -use serde::Serialize; -use serde_json::Value as JsonValue; -use serde_json::json; -use std::collections::BTreeMap; -use std::collections::HashMap; #[derive(Debug, Clone)] pub enum ConfigShellToolType { @@ -863,19 +860,14 @@ pub(crate) fn build_specs( config: &ToolsConfig, mcp_tools: Option>, ) -> ToolRegistryBuilder { - use crate::tools::handlers::ApplyPatchHandler; - use crate::tools::handlers::GrepFilesHandler; - use crate::tools::handlers::ListDirHandler; - use crate::tools::handlers::McpHandler; - use crate::tools::handlers::McpResourceHandler; - use crate::tools::handlers::PlanHandler; - use crate::tools::handlers::ReadFileHandler; - use crate::tools::handlers::ShellHandler; - use crate::tools::handlers::TestSyncHandler; - use crate::tools::handlers::UnifiedExecHandler; - use crate::tools::handlers::ViewImageHandler; use std::sync::Arc; + use crate::tools::handlers::{ + ApplyPatchHandler, GrepFilesHandler, ListDirHandler, McpHandler, McpResourceHandler, + PlanHandler, ReadFileHandler, ShellHandler, TestSyncHandler, UnifiedExecHandler, + ViewImageHandler, + }; + let mut builder = ToolRegistryBuilder::new(); let shell_handler = Arc::new(ShellHandler); @@ -1002,13 +994,13 @@ pub(crate) fn build_specs( #[cfg(test)] mod tests { - use crate::client_common::tools::FreeformTool; - use crate::model_family::find_family_for_model; - use crate::tools::registry::ConfiguredToolSpec; use mcp_types::ToolInputSchema; use pretty_assertions::assert_eq; use super::*; + use crate::client_common::tools::FreeformTool; + use crate::model_family::find_family_for_model; + use crate::tools::registry::ConfiguredToolSpec; fn tool_name(tool: &ToolSpec) -> &str { match tool { @@ -1109,8 +1101,7 @@ mod tests { let (tools, _) = build_specs(&config, None).build(); // Build actual map name -> spec - use std::collections::BTreeMap; - use std::collections::HashSet; + use std::collections::{BTreeMap, HashSet}; let mut actual: BTreeMap = BTreeMap::new(); let mut duplicate_names = Vec::new(); for t in &tools { diff --git a/codex-rs/core/src/truncate.rs b/codex-rs/core/src/truncate.rs index 3f0be8fcaf..175618887d 100644 --- a/codex-rs/core/src/truncate.rs +++ b/codex-rs/core/src/truncate.rs @@ -136,9 +136,10 @@ pub(crate) fn truncate_middle(s: &str, max_bytes: usize) -> (String, Option #[cfg(test)] mod tests { - use super::truncate_middle; use codex_utils_tokenizer::Tokenizer; + use super::truncate_middle; + #[test] fn truncate_middle_no_newlines_fallback() { let tok = Tokenizer::try_default().expect("load tokenizer"); diff --git a/codex-rs/core/src/turn_diff_tracker.rs b/codex-rs/core/src/turn_diff_tracker.rs index 06c40deb90..4b2531c3d3 100644 --- a/codex-rs/core/src/turn_diff_tracker.rs +++ b/codex-rs/core/src/turn_diff_tracker.rs @@ -1,12 +1,9 @@ use std::collections::HashMap; use std::fs; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::process::Command; -use anyhow::Context; -use anyhow::Result; -use anyhow::anyhow; +use anyhow::{Context, Result, anyhow}; use sha1::digest::Output; use uuid::Uuid; @@ -466,10 +463,11 @@ fn is_windows_drive_or_unc_root(p: &std::path::Path) -> bool { #[cfg(test)] mod tests { - use super::*; use pretty_assertions::assert_eq; use tempfile::tempdir; + use super::*; + /// Compute the Git SHA-1 blob object ID for the given content (string). /// This delegates to the bytes version to avoid UTF-8 lossy conversions here. fn git_blob_sha1_hex(data: &str) -> String { diff --git a/codex-rs/core/src/unified_exec/errors.rs b/codex-rs/core/src/unified_exec/errors.rs index bfbef93572..4e2ebf9470 100644 --- a/codex-rs/core/src/unified_exec/errors.rs +++ b/codex-rs/core/src/unified_exec/errors.rs @@ -1,6 +1,7 @@ -use crate::exec::ExecToolCallOutput; use thiserror::Error; +use crate::exec::ExecToolCallOutput; + #[derive(Debug, Error)] pub(crate) enum UnifiedExecError { #[error("Failed to create unified exec session: {message}")] diff --git a/codex-rs/core/src/unified_exec/mod.rs b/codex-rs/core/src/unified_exec/mod.rs index a1e2c0c444..45df6a122d 100644 --- a/codex-rs/core/src/unified_exec/mod.rs +++ b/codex-rs/core/src/unified_exec/mod.rs @@ -27,12 +27,10 @@ use std::sync::Arc; use std::sync::atomic::AtomicI32; use std::time::Duration; -use rand::Rng; -use rand::rng; +use rand::{Rng, rng}; use tokio::sync::Mutex; -use crate::codex::Session; -use crate::codex::TurnContext; +use crate::codex::{Session, TurnContext}; mod errors; mod session; @@ -159,19 +157,16 @@ pub(crate) fn truncate_output_to_tokens( #[cfg(test)] #[cfg(unix)] mod tests { - use super::*; - use crate::codex::Session; - use crate::codex::TurnContext; - use crate::codex::make_session_and_context; - use crate::protocol::AskForApproval; - use crate::protocol::SandboxPolicy; - use crate::unified_exec::ExecCommandRequest; - use crate::unified_exec::WriteStdinRequest; - use core_test_support::skip_if_sandbox; use std::sync::Arc; + + use core_test_support::skip_if_sandbox; use tokio::time::Duration; use super::session::OutputBufferState; + use super::*; + use crate::codex::{Session, TurnContext, make_session_and_context}; + use crate::protocol::{AskForApproval, SandboxPolicy}; + use crate::unified_exec::{ExecCommandRequest, WriteStdinRequest}; fn test_session_and_turn() -> (Arc, Arc) { let (session, mut turn) = make_session_and_context(); diff --git a/codex-rs/core/src/unified_exec/session.rs b/codex-rs/core/src/unified_exec/session.rs index bdb935f171..ccd873a810 100644 --- a/codex-rs/core/src/unified_exec/session.rs +++ b/codex-rs/core/src/unified_exec/session.rs @@ -3,23 +3,15 @@ use std::collections::VecDeque; use std::sync::Arc; -use tokio::sync::Mutex; -use tokio::sync::Notify; -use tokio::sync::mpsc; +use codex_utils_pty::{ExecCommandSession, SpawnedPty}; use tokio::sync::oneshot::error::TryRecvError; +use tokio::sync::{Mutex, Notify, mpsc}; use tokio::task::JoinHandle; use tokio::time::Duration; -use crate::exec::ExecToolCallOutput; -use crate::exec::SandboxType; -use crate::exec::StreamOutput; -use crate::exec::is_likely_sandbox_denied; +use super::{UNIFIED_EXEC_OUTPUT_MAX_BYTES, UnifiedExecError}; +use crate::exec::{ExecToolCallOutput, SandboxType, StreamOutput, is_likely_sandbox_denied}; use crate::truncate::truncate_middle; -use codex_utils_pty::ExecCommandSession; -use codex_utils_pty::SpawnedPty; - -use super::UNIFIED_EXEC_OUTPUT_MAX_BYTES; -use super::UnifiedExecError; #[derive(Debug, Default)] pub(crate) struct OutputBufferState { diff --git a/codex-rs/core/src/unified_exec/session_manager.rs b/codex-rs/core/src/unified_exec/session_manager.rs index 7f4727d0c9..67a628a539 100644 --- a/codex-rs/core/src/unified_exec/session_manager.rs +++ b/codex-rs/core/src/unified_exec/session_manager.rs @@ -1,37 +1,24 @@ use std::sync::Arc; -use tokio::sync::Notify; -use tokio::sync::mpsc; -use tokio::time::Duration; -use tokio::time::Instant; +use tokio::sync::{Notify, mpsc}; +use tokio::time::{Duration, Instant}; -use crate::exec::ExecToolCallOutput; -use crate::exec::StreamOutput; +use super::session::{OutputBuffer, UnifiedExecSession}; +use super::{ + ExecCommandRequest, MIN_YIELD_TIME_MS, SessionEntry, UnifiedExecContext, UnifiedExecError, + UnifiedExecResponse, UnifiedExecSessionManager, WriteStdinRequest, clamp_yield_time, + generate_chunk_id, resolve_max_tokens, truncate_output_to_tokens, +}; +use crate::exec::{ExecToolCallOutput, StreamOutput}; use crate::exec_env::create_env; use crate::sandboxing::ExecEnv; -use crate::tools::events::ToolEmitter; -use crate::tools::events::ToolEventCtx; -use crate::tools::events::ToolEventStage; +use crate::tools::events::{ToolEmitter, ToolEventCtx, ToolEventStage}; use crate::tools::orchestrator::ToolOrchestrator; -use crate::tools::runtimes::unified_exec::UnifiedExecRequest as UnifiedExecToolRequest; -use crate::tools::runtimes::unified_exec::UnifiedExecRuntime; +use crate::tools::runtimes::unified_exec::{ + UnifiedExecRequest as UnifiedExecToolRequest, UnifiedExecRuntime, +}; use crate::tools::sandboxing::ToolCtx; -use super::ExecCommandRequest; -use super::MIN_YIELD_TIME_MS; -use super::SessionEntry; -use super::UnifiedExecContext; -use super::UnifiedExecError; -use super::UnifiedExecResponse; -use super::UnifiedExecSessionManager; -use super::WriteStdinRequest; -use super::clamp_yield_time; -use super::generate_chunk_id; -use super::resolve_max_tokens; -use super::session::OutputBuffer; -use super::session::UnifiedExecSession; -use super::truncate_output_to_tokens; - impl UnifiedExecSessionManager { pub(crate) async fn exec_command( &self, diff --git a/codex-rs/core/src/user_instructions.rs b/codex-rs/core/src/user_instructions.rs index 61f8d7fde4..69dca4e3af 100644 --- a/codex-rs/core/src/user_instructions.rs +++ b/codex-rs/core/src/user_instructions.rs @@ -1,8 +1,5 @@ -use serde::Deserialize; -use serde::Serialize; - -use codex_protocol::models::ContentItem; -use codex_protocol::models::ResponseItem; +use codex_protocol::models::{ContentItem, ResponseItem}; +use serde::{Deserialize, Serialize}; pub const USER_INSTRUCTIONS_OPEN_TAG_LEGACY: &str = ""; pub const USER_INSTRUCTIONS_PREFIX: &str = "# AGENTS.md instructions for "; diff --git a/codex-rs/core/src/user_notification.rs b/codex-rs/core/src/user_notification.rs index 7bbd1d9564..10b582f7a6 100644 --- a/codex-rs/core/src/user_notification.rs +++ b/codex-rs/core/src/user_notification.rs @@ -1,6 +1,5 @@ use serde::Serialize; -use tracing::error; -use tracing::warn; +use tracing::{error, warn}; #[derive(Debug, Default)] pub(crate) struct UserNotifier { @@ -63,9 +62,10 @@ pub(crate) enum UserNotification { #[cfg(test)] mod tests { - use super::*; use anyhow::Result; + use super::*; + #[test] fn test_user_notification() -> Result<()> { let notification = UserNotification::AgentTurnComplete { diff --git a/codex-rs/core/src/util.rs b/codex-rs/core/src/util.rs index 0bce5b4439..d839da8eb3 100644 --- a/codex-rs/core/src/util.rs +++ b/codex-rs/core/src/util.rs @@ -1,8 +1,7 @@ use std::time::Duration; use rand::Rng; -use tracing::debug; -use tracing::error; +use tracing::{debug, error}; const INITIAL_DELAY_MS: u64 = 200; const BACKOFF_FACTOR: f64 = 2.0; diff --git a/codex-rs/core/tests/chat_completions_payload.rs b/codex-rs/core/tests/chat_completions_payload.rs index cadf6be294..431ae6cc2f 100644 --- a/codex-rs/core/tests/chat_completions_payload.rs +++ b/codex-rs/core/tests/chat_completions_payload.rs @@ -1,16 +1,11 @@ use std::sync::Arc; use codex_app_server_protocol::AuthMode; -use codex_core::ContentItem; -use codex_core::LocalShellAction; -use codex_core::LocalShellExecAction; -use codex_core::LocalShellStatus; -use codex_core::ModelClient; -use codex_core::ModelProviderInfo; -use codex_core::Prompt; -use codex_core::ResponseItem; -use codex_core::WireApi; use codex_core::spawn::CODEX_SANDBOX_NETWORK_DISABLED_ENV_VAR; +use codex_core::{ + ContentItem, LocalShellAction, LocalShellExecAction, LocalShellStatus, ModelClient, + ModelProviderInfo, Prompt, ResponseItem, WireApi, +}; use codex_otel::otel_event_manager::OtelEventManager; use codex_protocol::ConversationId; use codex_protocol::models::ReasoningItemContent; @@ -18,11 +13,8 @@ use core_test_support::load_default_config_for_test; use futures::StreamExt; use serde_json::Value; use tempfile::TempDir; -use wiremock::Mock; -use wiremock::MockServer; -use wiremock::ResponseTemplate; -use wiremock::matchers::method; -use wiremock::matchers::path; +use wiremock::matchers::{method, path}; +use wiremock::{Mock, MockServer, ResponseTemplate}; fn network_disabled() -> bool { std::env::var(CODEX_SANDBOX_NETWORK_DISABLED_ENV_VAR).is_ok() diff --git a/codex-rs/core/tests/chat_completions_sse.rs b/codex-rs/core/tests/chat_completions_sse.rs index 46378b0823..c306a9508c 100644 --- a/codex-rs/core/tests/chat_completions_sse.rs +++ b/codex-rs/core/tests/chat_completions_sse.rs @@ -1,27 +1,20 @@ -use assert_matches::assert_matches; use std::sync::Arc; -use tracing_test::traced_test; +use assert_matches::assert_matches; use codex_app_server_protocol::AuthMode; -use codex_core::ContentItem; -use codex_core::ModelClient; -use codex_core::ModelProviderInfo; -use codex_core::Prompt; -use codex_core::ResponseEvent; -use codex_core::ResponseItem; -use codex_core::WireApi; use codex_core::spawn::CODEX_SANDBOX_NETWORK_DISABLED_ENV_VAR; +use codex_core::{ + ContentItem, ModelClient, ModelProviderInfo, Prompt, ResponseEvent, ResponseItem, WireApi, +}; use codex_otel::otel_event_manager::OtelEventManager; use codex_protocol::ConversationId; use codex_protocol::models::ReasoningItemContent; use core_test_support::load_default_config_for_test; use futures::StreamExt; use tempfile::TempDir; -use wiremock::Mock; -use wiremock::MockServer; -use wiremock::ResponseTemplate; -use wiremock::matchers::method; -use wiremock::matchers::path; +use tracing_test::traced_test; +use wiremock::matchers::{method, path}; +use wiremock::{Mock, MockServer, ResponseTemplate}; fn network_disabled() -> bool { std::env::var(CODEX_SANDBOX_NETWORK_DISABLED_ENV_VAR).is_ok() diff --git a/codex-rs/core/tests/common/lib.rs b/codex-rs/core/tests/common/lib.rs index 3f75ed1819..eda543becf 100644 --- a/codex-rs/core/tests/common/lib.rs +++ b/codex-rs/core/tests/common/lib.rs @@ -1,15 +1,11 @@ #![expect(clippy::expect_used)] -use tempfile::TempDir; - -use codex_core::CodexConversation; -use codex_core::config::Config; -use codex_core::config::ConfigOverrides; -use codex_core::config::ConfigToml; -use regex_lite::Regex; - #[cfg(target_os = "linux")] use assert_cmd::cargo::cargo_bin; +use codex_core::CodexConversation; +use codex_core::config::{Config, ConfigOverrides, ConfigToml}; +use regex_lite::Regex; +use tempfile::TempDir; pub mod responses; pub mod test_codex; @@ -150,8 +146,7 @@ pub async fn wait_for_event_with_timeout( where F: FnMut(&codex_core::protocol::EventMsg) -> bool, { - use tokio::time::Duration; - use tokio::time::timeout; + use tokio::time::{Duration, timeout}; loop { // Allow a bit more time to accommodate async startup work (e.g. config IO, tool discovery) let ev = timeout(wait_time.max(Duration::from_secs(5)), codex.next_event()) @@ -173,16 +168,13 @@ pub fn sandbox_network_env_var() -> &'static str { } pub mod fs_wait { - use anyhow::Result; - use anyhow::anyhow; - use notify::RecursiveMode; - use notify::Watcher; - use std::path::Path; - use std::path::PathBuf; + use std::path::{Path, PathBuf}; use std::sync::mpsc; use std::sync::mpsc::RecvTimeoutError; - use std::time::Duration; - use std::time::Instant; + use std::time::{Duration, Instant}; + + use anyhow::{Result, anyhow}; + use notify::{RecursiveMode, Watcher}; use tokio::task; use walkdir::WalkDir; diff --git a/codex-rs/core/tests/common/responses.rs b/codex-rs/core/tests/common/responses.rs index 4fd6dcf781..85af102b6a 100644 --- a/codex-rs/core/tests/common/responses.rs +++ b/codex-rs/core/tests/common/responses.rs @@ -1,16 +1,8 @@ -use std::sync::Arc; -use std::sync::Mutex; +use std::sync::{Arc, Mutex}; use serde_json::Value; -use wiremock::BodyPrintLimit; -use wiremock::Match; -use wiremock::Mock; -use wiremock::MockBuilder; -use wiremock::MockServer; -use wiremock::Respond; -use wiremock::ResponseTemplate; -use wiremock::matchers::method; -use wiremock::matchers::path_regex; +use wiremock::matchers::{method, path_regex}; +use wiremock::{BodyPrintLimit, Match, Mock, MockBuilder, MockServer, Respond, ResponseTemplate}; #[derive(Debug, Clone)] pub struct ResponseMock { @@ -451,8 +443,7 @@ pub async fn start_mock_server() -> MockServer { /// POST to `/v1/responses`. Panics if more requests are received than bodies /// provided. Also asserts the exact number of expected calls. pub async fn mount_sse_sequence(server: &MockServer, bodies: Vec) -> ResponseMock { - use std::sync::atomic::AtomicUsize; - use std::sync::atomic::Ordering; + use std::sync::atomic::{AtomicUsize, Ordering}; struct SeqResponder { num_calls: AtomicUsize, diff --git a/codex-rs/core/tests/common/test_codex.rs b/codex-rs/core/tests/common/test_codex.rs index 0f9fdaae8f..0b3740a180 100644 --- a/codex-rs/core/tests/common/test_codex.rs +++ b/codex-rs/core/tests/common/test_codex.rs @@ -1,30 +1,22 @@ use std::mem::swap; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::sync::Arc; use anyhow::Result; -use codex_core::CodexAuth; -use codex_core::CodexConversation; -use codex_core::ConversationManager; -use codex_core::ModelProviderInfo; -use codex_core::built_in_model_providers; use codex_core::config::Config; use codex_core::features::Feature; -use codex_core::protocol::AskForApproval; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_core::protocol::SandboxPolicy; -use codex_core::protocol::SessionConfiguredEvent; +use codex_core::protocol::{AskForApproval, EventMsg, Op, SandboxPolicy, SessionConfiguredEvent}; +use codex_core::{ + CodexAuth, CodexConversation, ConversationManager, ModelProviderInfo, built_in_model_providers, +}; use codex_protocol::config_types::ReasoningSummary; use codex_protocol::user_input::UserInput; use serde_json::Value; use tempfile::TempDir; use wiremock::MockServer; -use crate::load_default_config_for_test; use crate::responses::start_mock_server; -use crate::wait_for_event; +use crate::{load_default_config_for_test, wait_for_event}; type ConfigMutator = dyn FnOnce(&mut Config) + Send; diff --git a/codex-rs/core/tests/common/test_codex_exec.rs b/codex-rs/core/tests/common/test_codex_exec.rs index 478d0c57f4..276460d2b0 100644 --- a/codex-rs/core/tests/common/test_codex_exec.rs +++ b/codex-rs/core/tests/common/test_codex_exec.rs @@ -1,6 +1,7 @@ #![allow(clippy::expect_used)] -use codex_core::auth::CODEX_API_KEY_ENV_VAR; use std::path::Path; + +use codex_core::auth::CODEX_API_KEY_ENV_VAR; use tempfile::TempDir; use wiremock::MockServer; diff --git a/codex-rs/core/tests/responses_headers.rs b/codex-rs/core/tests/responses_headers.rs index 7b6f645f2f..ab52a3c70b 100644 --- a/codex-rs/core/tests/responses_headers.rs +++ b/codex-rs/core/tests/responses_headers.rs @@ -1,18 +1,13 @@ use std::sync::Arc; use codex_app_server_protocol::AuthMode; -use codex_core::ContentItem; -use codex_core::ModelClient; -use codex_core::ModelProviderInfo; -use codex_core::Prompt; -use codex_core::ResponseEvent; -use codex_core::ResponseItem; -use codex_core::WireApi; +use codex_core::{ + ContentItem, ModelClient, ModelProviderInfo, Prompt, ResponseEvent, ResponseItem, WireApi, +}; use codex_otel::otel_event_manager::OtelEventManager; use codex_protocol::ConversationId; use codex_protocol::protocol::SessionSource; -use core_test_support::load_default_config_for_test; -use core_test_support::responses; +use core_test_support::{load_default_config_for_test, responses}; use futures::StreamExt; use tempfile::TempDir; use wiremock::matchers::header; diff --git a/codex-rs/core/tests/suite/abort_tasks.rs b/codex-rs/core/tests/suite/abort_tasks.rs index 6c03739593..843d0a2e51 100644 --- a/codex-rs/core/tests/suite/abort_tasks.rs +++ b/codex-rs/core/tests/suite/abort_tasks.rs @@ -1,17 +1,13 @@ -use assert_matches::assert_matches; use std::sync::Arc; use std::time::Duration; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; +use assert_matches::assert_matches; +use codex_core::protocol::{EventMsg, Op}; use codex_protocol::user_input::UserInput; -use core_test_support::responses::ev_completed; -use core_test_support::responses::ev_function_call; -use core_test_support::responses::ev_response_created; -use core_test_support::responses::mount_sse_once; -use core_test_support::responses::mount_sse_sequence; -use core_test_support::responses::sse; -use core_test_support::responses::start_mock_server; +use core_test_support::responses::{ + ev_completed, ev_function_call, ev_response_created, mount_sse_once, mount_sse_sequence, sse, + start_mock_server, +}; use core_test_support::test_codex::test_codex; use core_test_support::wait_for_event_with_timeout; use regex_lite::Regex; diff --git a/codex-rs/core/tests/suite/apply_patch_cli.rs b/codex-rs/core/tests/suite/apply_patch_cli.rs index 6e9761ae4a..cb3e920c66 100644 --- a/codex-rs/core/tests/suite/apply_patch_cli.rs +++ b/codex-rs/core/tests/suite/apply_patch_cli.rs @@ -1,29 +1,21 @@ #![allow(clippy::expect_used)] -use anyhow::Result; -use pretty_assertions::assert_eq; use std::fs; +use anyhow::Result; use codex_core::config::Config; use codex_core::features::Feature; use codex_core::model_family::find_family_for_model; -use codex_core::protocol::AskForApproval; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_core::protocol::SandboxPolicy; +use codex_core::protocol::{AskForApproval, EventMsg, Op, SandboxPolicy}; use codex_protocol::config_types::ReasoningSummary; use codex_protocol::user_input::UserInput; -use core_test_support::assert_regex_match; -use core_test_support::responses::ev_apply_patch_function_call; -use core_test_support::responses::ev_assistant_message; -use core_test_support::responses::ev_completed; -use core_test_support::responses::ev_function_call; -use core_test_support::responses::ev_response_created; -use core_test_support::responses::mount_sse_sequence; -use core_test_support::responses::sse; -use core_test_support::skip_if_no_network; +use core_test_support::responses::{ + ev_apply_patch_function_call, ev_assistant_message, ev_completed, ev_function_call, + ev_response_created, mount_sse_sequence, sse, +}; use core_test_support::test_codex::TestCodexHarness; -use core_test_support::wait_for_event; +use core_test_support::{assert_regex_match, skip_if_no_network, wait_for_event}; +use pretty_assertions::assert_eq; use serde_json::json; async fn apply_patch_harness() -> Result { diff --git a/codex-rs/core/tests/suite/apply_patch_freeform.rs b/codex-rs/core/tests/suite/apply_patch_freeform.rs index 72c405eb1b..24df11bd71 100644 --- a/codex-rs/core/tests/suite/apply_patch_freeform.rs +++ b/codex-rs/core/tests/suite/apply_patch_freeform.rs @@ -1,28 +1,21 @@ #![allow(clippy::expect_used)] -use anyhow::Result; -use core_test_support::responses::ev_apply_patch_custom_tool_call; -use pretty_assertions::assert_eq; use std::fs; +use anyhow::Result; use codex_core::config::Config; use codex_core::features::Feature; use codex_core::model_family::find_family_for_model; -use codex_core::protocol::AskForApproval; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_core::protocol::SandboxPolicy; +use codex_core::protocol::{AskForApproval, EventMsg, Op, SandboxPolicy}; use codex_protocol::config_types::ReasoningSummary; use codex_protocol::user_input::UserInput; -use core_test_support::assert_regex_match; -use core_test_support::responses::ev_assistant_message; -use core_test_support::responses::ev_completed; -use core_test_support::responses::ev_response_created; -use core_test_support::responses::mount_sse_sequence; -use core_test_support::responses::sse; -use core_test_support::skip_if_no_network; +use core_test_support::responses::{ + ev_apply_patch_custom_tool_call, ev_assistant_message, ev_completed, ev_response_created, + mount_sse_sequence, sse, +}; use core_test_support::test_codex::TestCodexHarness; -use core_test_support::wait_for_event; +use core_test_support::{assert_regex_match, skip_if_no_network, wait_for_event}; +use pretty_assertions::assert_eq; async fn apply_patch_harness() -> Result { apply_patch_harness_with(|_| {}).await diff --git a/codex-rs/core/tests/suite/approvals.rs b/codex-rs/core/tests/suite/approvals.rs index cbb5898b4f..c6b39a8b6e 100644 --- a/codex-rs/core/tests/suite/approvals.rs +++ b/codex-rs/core/tests/suite/approvals.rs @@ -1,41 +1,28 @@ #![allow(clippy::unwrap_used, clippy::expect_used)] +use std::path::PathBuf; +use std::time::Duration; +use std::{env, fs}; + use anyhow::Result; use codex_core::model_family::find_family_for_model; -use codex_core::protocol::ApplyPatchApprovalRequestEvent; -use codex_core::protocol::AskForApproval; -use codex_core::protocol::EventMsg; -use codex_core::protocol::ExecApprovalRequestEvent; -use codex_core::protocol::Op; -use codex_core::protocol::SandboxPolicy; +use codex_core::protocol::{ + ApplyPatchApprovalRequestEvent, AskForApproval, EventMsg, ExecApprovalRequestEvent, Op, + SandboxPolicy, +}; use codex_protocol::config_types::ReasoningSummary; use codex_protocol::protocol::ReviewDecision; use codex_protocol::user_input::UserInput; -use core_test_support::responses::ev_apply_patch_function_call; -use core_test_support::responses::ev_assistant_message; -use core_test_support::responses::ev_completed; -use core_test_support::responses::ev_function_call; -use core_test_support::responses::ev_response_created; -use core_test_support::responses::mount_sse_once; -use core_test_support::responses::sse; -use core_test_support::responses::start_mock_server; -use core_test_support::skip_if_no_network; -use core_test_support::test_codex::TestCodex; -use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event; -use core_test_support::wait_for_event_with_timeout; +use core_test_support::responses::{ + ev_apply_patch_function_call, ev_assistant_message, ev_completed, ev_function_call, + ev_response_created, mount_sse_once, sse, start_mock_server, +}; +use core_test_support::test_codex::{TestCodex, test_codex}; +use core_test_support::{skip_if_no_network, wait_for_event, wait_for_event_with_timeout}; use pretty_assertions::assert_eq; -use serde_json::Value; -use serde_json::json; -use std::env; -use std::fs; -use std::path::PathBuf; -use std::time::Duration; -use wiremock::Mock; -use wiremock::MockServer; -use wiremock::ResponseTemplate; -use wiremock::matchers::method; -use wiremock::matchers::path; +use serde_json::{Value, json}; +use wiremock::matchers::{method, path}; +use wiremock::{Mock, MockServer, ResponseTemplate}; #[derive(Clone, Copy)] enum TargetPath { diff --git a/codex-rs/core/tests/suite/auth_refresh.rs b/codex-rs/core/tests/suite/auth_refresh.rs index 6daaf70b5e..960f9dbd68 100644 --- a/codex-rs/core/tests/suite/auth_refresh.rs +++ b/codex-rs/core/tests/suite/auth_refresh.rs @@ -1,29 +1,22 @@ -use anyhow::Context; -use anyhow::Result; +use std::ffi::OsString; + +use anyhow::{Context, Result}; use base64::Engine; -use chrono::Duration; -use chrono::Utc; +use chrono::{Duration, Utc}; use codex_core::CodexAuth; -use codex_core::auth::AuthCredentialsStoreMode; -use codex_core::auth::AuthDotJson; -use codex_core::auth::REFRESH_TOKEN_URL_OVERRIDE_ENV_VAR; -use codex_core::auth::RefreshTokenError; -use codex_core::auth::load_auth_dot_json; -use codex_core::auth::save_auth; +use codex_core::auth::{ + AuthCredentialsStoreMode, AuthDotJson, REFRESH_TOKEN_URL_OVERRIDE_ENV_VAR, RefreshTokenError, + load_auth_dot_json, save_auth, +}; use codex_core::error::RefreshTokenFailedReason; -use codex_core::token_data::IdTokenInfo; -use codex_core::token_data::TokenData; +use codex_core::token_data::{IdTokenInfo, TokenData}; use core_test_support::skip_if_no_network; use pretty_assertions::assert_eq; use serde::Serialize; use serde_json::json; -use std::ffi::OsString; use tempfile::TempDir; -use wiremock::Mock; -use wiremock::MockServer; -use wiremock::ResponseTemplate; -use wiremock::matchers::method; -use wiremock::matchers::path; +use wiremock::matchers::{method, path}; +use wiremock::{Mock, MockServer, ResponseTemplate}; const INITIAL_ACCESS_TOKEN: &str = "initial-access-token"; const INITIAL_REFRESH_TOKEN: &str = "initial-refresh-token"; diff --git a/codex-rs/core/tests/suite/cli_stream.rs b/codex-rs/core/tests/suite/cli_stream.rs index 64d6247f3d..063129c9bd 100644 --- a/codex-rs/core/tests/suite/cli_stream.rs +++ b/codex-rs/core/tests/suite/cli_stream.rs @@ -1,17 +1,14 @@ +use std::time::Duration; + use assert_cmd::Command as AssertCommand; use assert_cmd::cargo::cargo_bin; use codex_core::RolloutRecorder; use codex_core::protocol::GitInfo; -use core_test_support::fs_wait; -use core_test_support::skip_if_no_network; -use std::time::Duration; +use core_test_support::{fs_wait, skip_if_no_network}; use tempfile::TempDir; use uuid::Uuid; -use wiremock::Mock; -use wiremock::MockServer; -use wiremock::ResponseTemplate; -use wiremock::matchers::method; -use wiremock::matchers::path; +use wiremock::matchers::{method, path}; +use wiremock::{Mock, MockServer, ResponseTemplate}; /// Tests streaming chat completions through the CLI using a mock server. /// This test: diff --git a/codex-rs/core/tests/suite/client.rs b/codex-rs/core/tests/suite/client.rs index c2c5048dea..ec43eb4162 100644 --- a/codex-rs/core/tests/suite/client.rs +++ b/codex-rs/core/tests/suite/client.rs @@ -1,52 +1,33 @@ -use codex_app_server_protocol::AuthMode; -use codex_core::CodexAuth; -use codex_core::ContentItem; -use codex_core::ConversationManager; -use codex_core::LocalShellAction; -use codex_core::LocalShellExecAction; -use codex_core::LocalShellStatus; -use codex_core::ModelClient; -use codex_core::ModelProviderInfo; -use codex_core::NewConversation; -use codex_core::Prompt; -use codex_core::ResponseEvent; -use codex_core::ResponseItem; -use codex_core::WireApi; -use codex_core::auth::AuthCredentialsStoreMode; -use codex_core::built_in_model_providers; -use codex_core::error::CodexErr; -use codex_core::model_family::find_family_for_model; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_core::protocol::SessionSource; -use codex_otel::otel_event_manager::OtelEventManager; -use codex_protocol::ConversationId; -use codex_protocol::models::ReasoningItemContent; -use codex_protocol::models::ReasoningItemReasoningSummary; -use codex_protocol::models::WebSearchAction; -use codex_protocol::user_input::UserInput; -use core_test_support::load_default_config_for_test; -use core_test_support::load_sse_fixture_with_id; -use core_test_support::responses; -use core_test_support::skip_if_no_network; -use core_test_support::test_codex::TestCodex; -use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event; -use core_test_support::wait_for_event_with_timeout; -use futures::StreamExt; -use serde_json::json; use std::io::Write; use std::sync::Arc; + +use codex_app_server_protocol::AuthMode; +use codex_core::auth::AuthCredentialsStoreMode; +use codex_core::error::CodexErr; +use codex_core::model_family::find_family_for_model; +use codex_core::protocol::{EventMsg, Op, SessionSource}; +use codex_core::{ + CodexAuth, ContentItem, ConversationManager, LocalShellAction, LocalShellExecAction, + LocalShellStatus, ModelClient, ModelProviderInfo, NewConversation, Prompt, ResponseEvent, + ResponseItem, WireApi, built_in_model_providers, +}; +use codex_otel::otel_event_manager::OtelEventManager; +use codex_protocol::ConversationId; +use codex_protocol::models::{ + ReasoningItemContent, ReasoningItemReasoningSummary, WebSearchAction, +}; +use codex_protocol::user_input::UserInput; +use core_test_support::test_codex::{TestCodex, test_codex}; +use core_test_support::{ + load_default_config_for_test, load_sse_fixture_with_id, responses, skip_if_no_network, + wait_for_event, wait_for_event_with_timeout, +}; +use futures::StreamExt; +use serde_json::json; use tempfile::TempDir; use uuid::Uuid; -use wiremock::Mock; -use wiremock::MockServer; -use wiremock::ResponseTemplate; -use wiremock::matchers::body_string_contains; -use wiremock::matchers::header_regex; -use wiremock::matchers::method; -use wiremock::matchers::path; -use wiremock::matchers::query_param; +use wiremock::matchers::{body_string_contains, header_regex, method, path, query_param}; +use wiremock::{Mock, MockServer, ResponseTemplate}; /// Build minimal SSE stream with completed marker using the JSON fixture. fn sse_completed(id: &str) -> String { diff --git a/codex-rs/core/tests/suite/codex_delegate.rs b/codex-rs/core/tests/suite/codex_delegate.rs index c6ece7fe56..925f7e18db 100644 --- a/codex-rs/core/tests/suite/codex_delegate.rs +++ b/codex-rs/core/tests/suite/codex_delegate.rs @@ -1,22 +1,13 @@ -use codex_core::protocol::AskForApproval; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_core::protocol::ReviewDecision; -use codex_core::protocol::ReviewRequest; -use codex_core::protocol::SandboxPolicy; -use core_test_support::responses::ev_apply_patch_function_call; -use core_test_support::responses::ev_assistant_message; -use core_test_support::responses::ev_completed; -use core_test_support::responses::ev_function_call; -use core_test_support::responses::ev_reasoning_item_added; -use core_test_support::responses::ev_reasoning_summary_text_delta; -use core_test_support::responses::ev_response_created; -use core_test_support::responses::mount_sse_sequence; -use core_test_support::responses::sse; -use core_test_support::responses::start_mock_server; -use core_test_support::skip_if_no_network; +use codex_core::protocol::{ + AskForApproval, EventMsg, Op, ReviewDecision, ReviewRequest, SandboxPolicy, +}; +use core_test_support::responses::{ + ev_apply_patch_function_call, ev_assistant_message, ev_completed, ev_function_call, + ev_reasoning_item_added, ev_reasoning_summary_text_delta, ev_response_created, + mount_sse_sequence, sse, start_mock_server, +}; use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event; +use core_test_support::{skip_if_no_network, wait_for_event}; use pretty_assertions::assert_eq; /// Delegate should surface ExecApprovalRequest from sub-agent and proceed diff --git a/codex-rs/core/tests/suite/compact.rs b/codex-rs/core/tests/suite/compact.rs index 72fe21841b..6b4c1af521 100644 --- a/codex-rs/core/tests/suite/compact.rs +++ b/codex-rs/core/tests/suite/compact.rs @@ -1,34 +1,19 @@ -use codex_core::CodexAuth; -use codex_core::ConversationManager; -use codex_core::ModelProviderInfo; -use codex_core::NewConversation; -use codex_core::built_in_model_providers; -use codex_core::config::Config; -use codex_core::protocol::ErrorEvent; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_core::protocol::RolloutItem; -use codex_core::protocol::RolloutLine; -use codex_core::protocol::WarningEvent; -use codex_protocol::user_input::UserInput; -use core_test_support::load_default_config_for_test; -use core_test_support::skip_if_no_network; -use core_test_support::wait_for_event; use std::collections::VecDeque; -use tempfile::TempDir; -use core_test_support::responses::ev_assistant_message; -use core_test_support::responses::ev_completed; -use core_test_support::responses::ev_completed_with_tokens; -use core_test_support::responses::ev_function_call; -use core_test_support::responses::mount_sse_once; -use core_test_support::responses::mount_sse_once_match; -use core_test_support::responses::mount_sse_sequence; -use core_test_support::responses::sse; -use core_test_support::responses::sse_failed; -use core_test_support::responses::start_mock_server; +use codex_core::config::Config; +use codex_core::protocol::{ErrorEvent, EventMsg, Op, RolloutItem, RolloutLine, WarningEvent}; +use codex_core::{ + CodexAuth, ConversationManager, ModelProviderInfo, NewConversation, built_in_model_providers, +}; +use codex_protocol::user_input::UserInput; +use core_test_support::responses::{ + ev_assistant_message, ev_completed, ev_completed_with_tokens, ev_function_call, mount_sse_once, + mount_sse_once_match, mount_sse_sequence, sse, sse_failed, start_mock_server, +}; +use core_test_support::{load_default_config_for_test, skip_if_no_network, wait_for_event}; use pretty_assertions::assert_eq; use serde_json::json; +use tempfile::TempDir; // --- Test helpers ----------------------------------------------------------- pub(super) const FIRST_REPLY: &str = "FIRST_REPLY"; diff --git a/codex-rs/core/tests/suite/compact_resume_fork.rs b/codex-rs/core/tests/suite/compact_resume_fork.rs index c3c1354bbf..1951126305 100644 --- a/codex-rs/core/tests/suite/compact_resume_fork.rs +++ b/codex-rs/core/tests/suite/compact_resume_fork.rs @@ -7,36 +7,25 @@ //! request payload that Codex would send to the model and assert that the //! model-visible history matches the expected sequence of messages. -use super::compact::COMPACT_WARNING_MESSAGE; -use super::compact::FIRST_REPLY; -use super::compact::SUMMARY_TEXT; -use super::compact::TEST_COMPACT_PROMPT; -use codex_core::CodexAuth; -use codex_core::CodexConversation; -use codex_core::ConversationManager; -use codex_core::ModelProviderInfo; -use codex_core::NewConversation; -use codex_core::built_in_model_providers; -use codex_core::config::Config; -use codex_core::config::OPENAI_DEFAULT_MODEL; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_core::protocol::WarningEvent; -use codex_core::spawn::CODEX_SANDBOX_NETWORK_DISABLED_ENV_VAR; -use codex_protocol::user_input::UserInput; -use core_test_support::load_default_config_for_test; -use core_test_support::responses::ev_assistant_message; -use core_test_support::responses::ev_completed; -use core_test_support::responses::mount_sse_once_match; -use core_test_support::responses::sse; -use core_test_support::wait_for_event; -use pretty_assertions::assert_eq; -use serde_json::Value; -use serde_json::json; use std::sync::Arc; + +use codex_core::config::{Config, OPENAI_DEFAULT_MODEL}; +use codex_core::protocol::{EventMsg, Op, WarningEvent}; +use codex_core::spawn::CODEX_SANDBOX_NETWORK_DISABLED_ENV_VAR; +use codex_core::{ + CodexAuth, CodexConversation, ConversationManager, ModelProviderInfo, NewConversation, + built_in_model_providers, +}; +use codex_protocol::user_input::UserInput; +use core_test_support::responses::{ev_assistant_message, ev_completed, mount_sse_once_match, sse}; +use core_test_support::{load_default_config_for_test, wait_for_event}; +use pretty_assertions::assert_eq; +use serde_json::{Value, json}; use tempfile::TempDir; use wiremock::MockServer; +use super::compact::{COMPACT_WARNING_MESSAGE, FIRST_REPLY, SUMMARY_TEXT, TEST_COMPACT_PROMPT}; + const AFTER_SECOND_RESUME: &str = "AFTER_SECOND_RESUME"; const COMPACT_PROMPT_MARKER: &str = "You are performing a CONTEXT CHECKPOINT COMPACTION for a tool."; diff --git a/codex-rs/core/tests/suite/deprecation_notice.rs b/codex-rs/core/tests/suite/deprecation_notice.rs index 6842bd4d53..b5370c94af 100644 --- a/codex-rs/core/tests/suite/deprecation_notice.rs +++ b/codex-rs/core/tests/suite/deprecation_notice.rs @@ -2,13 +2,10 @@ use anyhow::Ok; use codex_core::features::Feature; -use codex_core::protocol::DeprecationNoticeEvent; -use codex_core::protocol::EventMsg; +use codex_core::protocol::{DeprecationNoticeEvent, EventMsg}; use core_test_support::responses::start_mock_server; -use core_test_support::skip_if_no_network; -use core_test_support::test_codex::TestCodex; -use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event_match; +use core_test_support::test_codex::{TestCodex, test_codex}; +use core_test_support::{skip_if_no_network, wait_for_event_match}; use pretty_assertions::assert_eq; #[tokio::test(flavor = "multi_thread", worker_threads = 2)] diff --git a/codex-rs/core/tests/suite/exec.rs b/codex-rs/core/tests/suite/exec.rs index ea5ab84879..676fc13408 100644 --- a/codex-rs/core/tests/suite/exec.rs +++ b/codex-rs/core/tests/suite/exec.rs @@ -3,18 +3,13 @@ use std::collections::HashMap; use std::string::ToString; -use codex_core::exec::ExecParams; -use codex_core::exec::ExecToolCallOutput; -use codex_core::exec::SandboxType; -use codex_core::exec::process_exec_tool_call; +use codex_core::error::Result; +use codex_core::exec::{ExecParams, ExecToolCallOutput, SandboxType, process_exec_tool_call}; +use codex_core::get_platform_sandbox; use codex_core::protocol::SandboxPolicy; use codex_core::spawn::CODEX_SANDBOX_ENV_VAR; use tempfile::TempDir; -use codex_core::error::Result; - -use codex_core::get_platform_sandbox; - fn skip_test() -> bool { if std::env::var(CODEX_SANDBOX_ENV_VAR) == Ok("seatbelt".to_string()) { eprintln!("{CODEX_SANDBOX_ENV_VAR} is set to 'seatbelt', skipping test."); diff --git a/codex-rs/core/tests/suite/fork_conversation.rs b/codex-rs/core/tests/suite/fork_conversation.rs index 75b37ae7ef..50fedc8ead 100644 --- a/codex-rs/core/tests/suite/fork_conversation.rs +++ b/codex-rs/core/tests/suite/fork_conversation.rs @@ -1,24 +1,14 @@ -use codex_core::CodexAuth; -use codex_core::ConversationManager; -use codex_core::ModelProviderInfo; -use codex_core::NewConversation; -use codex_core::built_in_model_providers; -use codex_core::parse_turn_item; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_core::protocol::RolloutItem; -use codex_core::protocol::RolloutLine; +use codex_core::protocol::{EventMsg, Op, RolloutItem, RolloutLine}; +use codex_core::{ + CodexAuth, ConversationManager, ModelProviderInfo, NewConversation, built_in_model_providers, + parse_turn_item, +}; use codex_protocol::items::TurnItem; use codex_protocol::user_input::UserInput; -use core_test_support::load_default_config_for_test; -use core_test_support::skip_if_no_network; -use core_test_support::wait_for_event; +use core_test_support::{load_default_config_for_test, skip_if_no_network, wait_for_event}; use tempfile::TempDir; -use wiremock::Mock; -use wiremock::MockServer; -use wiremock::ResponseTemplate; -use wiremock::matchers::method; -use wiremock::matchers::path; +use wiremock::matchers::{method, path}; +use wiremock::{Mock, MockServer, ResponseTemplate}; /// Build minimal SSE stream with completed marker using the JSON fixture. fn sse_completed(id: &str) -> String { diff --git a/codex-rs/core/tests/suite/grep_files.rs b/codex-rs/core/tests/suite/grep_files.rs index f8097558d9..3d7f01538e 100644 --- a/codex-rs/core/tests/suite/grep_files.rs +++ b/codex-rs/core/tests/suite/grep_files.rs @@ -1,28 +1,21 @@ #![cfg(not(target_os = "windows"))] -use anyhow::Result; -use codex_core::model_family::find_family_for_model; -use codex_core::protocol::AskForApproval; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_core::protocol::SandboxPolicy; -use codex_protocol::config_types::ReasoningSummary; -use codex_protocol::user_input::UserInput; -use core_test_support::responses; -use core_test_support::responses::ev_assistant_message; -use core_test_support::responses::ev_completed; -use core_test_support::responses::ev_function_call; -use core_test_support::responses::ev_response_created; -use core_test_support::responses::sse; -use core_test_support::responses::start_mock_server; -use core_test_support::skip_if_no_network; -use core_test_support::test_codex::TestCodex; -use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event; -use serde_json::Value; use std::collections::HashSet; use std::path::Path; use std::process::Command as StdCommand; + +use anyhow::Result; +use codex_core::model_family::find_family_for_model; +use codex_core::protocol::{AskForApproval, EventMsg, Op, SandboxPolicy}; +use codex_protocol::config_types::ReasoningSummary; +use codex_protocol::user_input::UserInput; +use core_test_support::responses::{ + ev_assistant_message, ev_completed, ev_function_call, ev_response_created, sse, + start_mock_server, +}; +use core_test_support::test_codex::{TestCodex, test_codex}; +use core_test_support::{responses, skip_if_no_network, wait_for_event}; +use serde_json::Value; use wiremock::matchers::any; const MODEL_WITH_TOOL: &str = "test-gpt-5-codex"; diff --git a/codex-rs/core/tests/suite/items.rs b/codex-rs/core/tests/suite/items.rs index 7a96522090..59b2f75263 100644 --- a/codex-rs/core/tests/suite/items.rs +++ b/codex-rs/core/tests/suite/items.rs @@ -1,30 +1,17 @@ #![cfg(not(target_os = "windows"))] use anyhow::Ok; -use codex_core::protocol::EventMsg; -use codex_core::protocol::ItemCompletedEvent; -use codex_core::protocol::ItemStartedEvent; -use codex_core::protocol::Op; +use codex_core::protocol::{EventMsg, ItemCompletedEvent, ItemStartedEvent, Op}; use codex_protocol::items::TurnItem; use codex_protocol::user_input::UserInput; -use core_test_support::responses::ev_assistant_message; -use core_test_support::responses::ev_completed; -use core_test_support::responses::ev_message_item_added; -use core_test_support::responses::ev_output_text_delta; -use core_test_support::responses::ev_reasoning_item; -use core_test_support::responses::ev_reasoning_item_added; -use core_test_support::responses::ev_reasoning_summary_text_delta; -use core_test_support::responses::ev_reasoning_text_delta; -use core_test_support::responses::ev_response_created; -use core_test_support::responses::ev_web_search_call_added; -use core_test_support::responses::ev_web_search_call_done; -use core_test_support::responses::mount_sse_once_match; -use core_test_support::responses::sse; -use core_test_support::responses::start_mock_server; -use core_test_support::skip_if_no_network; -use core_test_support::test_codex::TestCodex; -use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event_match; +use core_test_support::responses::{ + ev_assistant_message, ev_completed, ev_message_item_added, ev_output_text_delta, + ev_reasoning_item, ev_reasoning_item_added, ev_reasoning_summary_text_delta, + ev_reasoning_text_delta, ev_response_created, ev_web_search_call_added, + ev_web_search_call_done, mount_sse_once_match, sse, start_mock_server, +}; +use core_test_support::test_codex::{TestCodex, test_codex}; +use core_test_support::{skip_if_no_network, wait_for_event_match}; use pretty_assertions::assert_eq; use wiremock::matchers::any; diff --git a/codex-rs/core/tests/suite/json_result.rs b/codex-rs/core/tests/suite/json_result.rs index cdfa28e0ae..b3c70ca70e 100644 --- a/codex-rs/core/tests/suite/json_result.rs +++ b/codex-rs/core/tests/suite/json_result.rs @@ -1,21 +1,12 @@ #![cfg(not(target_os = "windows"))] -use codex_core::protocol::AskForApproval; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_core::protocol::SandboxPolicy; +use codex_core::protocol::{AskForApproval, EventMsg, Op, SandboxPolicy}; use codex_protocol::config_types::ReasoningSummary; use codex_protocol::user_input::UserInput; -use core_test_support::responses; -use core_test_support::skip_if_no_network; -use core_test_support::test_codex::TestCodex; -use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event; +use core_test_support::test_codex::{TestCodex, test_codex}; +use core_test_support::{responses, skip_if_no_network, wait_for_event}; use pretty_assertions::assert_eq; -use responses::ev_assistant_message; -use responses::ev_completed; -use responses::sse; -use responses::start_mock_server; +use responses::{ev_assistant_message, ev_completed, sse, start_mock_server}; const SCHEMA: &str = r#" { diff --git a/codex-rs/core/tests/suite/list_dir.rs b/codex-rs/core/tests/suite/list_dir.rs index 2a04d3075d..e86b7096ca 100644 --- a/codex-rs/core/tests/suite/list_dir.rs +++ b/codex-rs/core/tests/suite/list_dir.rs @@ -1,22 +1,14 @@ #![cfg(not(target_os = "windows"))] -use codex_core::protocol::AskForApproval; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_core::protocol::SandboxPolicy; +use codex_core::protocol::{AskForApproval, EventMsg, Op, SandboxPolicy}; use codex_protocol::config_types::ReasoningSummary; use codex_protocol::user_input::UserInput; -use core_test_support::responses; -use core_test_support::responses::ev_assistant_message; -use core_test_support::responses::ev_completed; -use core_test_support::responses::ev_function_call; -use core_test_support::responses::ev_response_created; -use core_test_support::responses::sse; -use core_test_support::responses::start_mock_server; -use core_test_support::skip_if_no_network; -use core_test_support::test_codex::TestCodex; -use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event; +use core_test_support::responses::{ + ev_assistant_message, ev_completed, ev_function_call, ev_response_created, sse, + start_mock_server, +}; +use core_test_support::test_codex::{TestCodex, test_codex}; +use core_test_support::{responses, skip_if_no_network, wait_for_event}; use pretty_assertions::assert_eq; use serde_json::Value; use wiremock::matchers::any; diff --git a/codex-rs/core/tests/suite/live_cli.rs b/codex-rs/core/tests/suite/live_cli.rs index e77fe6998e..82e30e4446 100644 --- a/codex-rs/core/tests/suite/live_cli.rs +++ b/codex-rs/core/tests/suite/live_cli.rs @@ -4,10 +4,10 @@ //! default so CI stays deterministic and free. Developers can run them locally with //! `cargo test --test live_cli -- --ignored` provided they set a valid `OPENAI_API_KEY`. +use std::process::{Command, Stdio}; + use assert_cmd::prelude::*; use predicates::prelude::*; -use std::process::Command; -use std::process::Stdio; use tempfile::TempDir; fn require_api_key() -> String { @@ -18,8 +18,7 @@ fn require_api_key() -> String { /// Helper that spawns the binary inside a TempDir with minimal flags. Returns (Assert, TempDir). fn run_live(prompt: &str) -> (assert_cmd::assert::Assert, TempDir) { #![expect(clippy::unwrap_used)] - use std::io::Read; - use std::io::Write; + use std::io::{Read, Write}; use std::thread; let dir = TempDir::new().unwrap(); diff --git a/codex-rs/core/tests/suite/model_overrides.rs b/codex-rs/core/tests/suite/model_overrides.rs index a186c13ef3..fdf257418c 100644 --- a/codex-rs/core/tests/suite/model_overrides.rs +++ b/codex-rs/core/tests/suite/model_overrides.rs @@ -1,10 +1,7 @@ -use codex_core::CodexAuth; -use codex_core::ConversationManager; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; +use codex_core::protocol::{EventMsg, Op}; use codex_core::protocol_config_types::ReasoningEffort; -use core_test_support::load_default_config_for_test; -use core_test_support::wait_for_event; +use codex_core::{CodexAuth, ConversationManager}; +use core_test_support::{load_default_config_for_test, wait_for_event}; use pretty_assertions::assert_eq; use tempfile::TempDir; diff --git a/codex-rs/core/tests/suite/model_tools.rs b/codex-rs/core/tests/suite/model_tools.rs index 2a04b88a16..686ae7725f 100644 --- a/codex-rs/core/tests/suite/model_tools.rs +++ b/codex-rs/core/tests/suite/model_tools.rs @@ -1,19 +1,14 @@ #![allow(clippy::unwrap_used)] -use codex_core::CodexAuth; -use codex_core::ConversationManager; -use codex_core::ModelProviderInfo; -use codex_core::built_in_model_providers; use codex_core::features::Feature; use codex_core::model_family::find_family_for_model; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; +use codex_core::protocol::{EventMsg, Op}; +use codex_core::{CodexAuth, ConversationManager, ModelProviderInfo, built_in_model_providers}; use codex_protocol::user_input::UserInput; -use core_test_support::load_default_config_for_test; -use core_test_support::load_sse_fixture_with_id; -use core_test_support::responses; -use core_test_support::skip_if_no_network; -use core_test_support::wait_for_event; +use core_test_support::{ + load_default_config_for_test, load_sse_fixture_with_id, responses, skip_if_no_network, + wait_for_event, +}; use tempfile::TempDir; use wiremock::MockServer; diff --git a/codex-rs/core/tests/suite/otel.rs b/codex-rs/core/tests/suite/otel.rs index ec6d567cb6..107dae3e7d 100644 --- a/codex-rs/core/tests/suite/otel.rs +++ b/codex-rs/core/tests/suite/otel.rs @@ -1,24 +1,14 @@ -use codex_protocol::protocol::AskForApproval; -use codex_protocol::protocol::EventMsg; -use codex_protocol::protocol::Op; -use codex_protocol::protocol::ReviewDecision; -use codex_protocol::protocol::SandboxPolicy; -use codex_protocol::user_input::UserInput; -use core_test_support::responses::ev_assistant_message; -use core_test_support::responses::ev_completed; -use core_test_support::responses::ev_custom_tool_call; -use core_test_support::responses::ev_function_call; -use core_test_support::responses::mount_sse; -use core_test_support::responses::mount_sse_once; -use core_test_support::responses::sse; -use core_test_support::responses::start_mock_server; -use core_test_support::test_codex::TestCodex; -use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event_with_timeout; use std::time::Duration; -use tracing_test::traced_test; -use core_test_support::responses::ev_local_shell_call; +use codex_protocol::protocol::{AskForApproval, EventMsg, Op, ReviewDecision, SandboxPolicy}; +use codex_protocol::user_input::UserInput; +use core_test_support::responses::{ + ev_assistant_message, ev_completed, ev_custom_tool_call, ev_function_call, ev_local_shell_call, + mount_sse, mount_sse_once, sse, start_mock_server, +}; +use core_test_support::test_codex::{TestCodex, test_codex}; +use core_test_support::wait_for_event_with_timeout; +use tracing_test::traced_test; #[tokio::test] #[traced_test] diff --git a/codex-rs/core/tests/suite/prompt_caching.rs b/codex-rs/core/tests/suite/prompt_caching.rs index fee57784d7..57b2627643 100644 --- a/codex-rs/core/tests/suite/prompt_caching.rs +++ b/codex-rs/core/tests/suite/prompt_caching.rs @@ -1,32 +1,21 @@ #![allow(clippy::unwrap_used)] -use codex_core::CodexAuth; -use codex_core::ConversationManager; -use codex_core::ModelProviderInfo; -use codex_core::built_in_model_providers; +use std::collections::HashMap; + use codex_core::config::OPENAI_DEFAULT_MODEL; use codex_core::features::Feature; use codex_core::model_family::find_family_for_model; -use codex_core::protocol::AskForApproval; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_core::protocol::SandboxPolicy; -use codex_core::protocol_config_types::ReasoningEffort; -use codex_core::protocol_config_types::ReasoningSummary; -use codex_core::shell::Shell; -use codex_core::shell::default_user_shell; +use codex_core::protocol::{AskForApproval, EventMsg, Op, SandboxPolicy}; +use codex_core::protocol_config_types::{ReasoningEffort, ReasoningSummary}; +use codex_core::shell::{Shell, default_user_shell}; +use codex_core::{CodexAuth, ConversationManager, ModelProviderInfo, built_in_model_providers}; use codex_protocol::user_input::UserInput; -use core_test_support::load_default_config_for_test; -use core_test_support::load_sse_fixture_with_id; -use core_test_support::skip_if_no_network; -use core_test_support::wait_for_event; -use std::collections::HashMap; +use core_test_support::{ + load_default_config_for_test, load_sse_fixture_with_id, skip_if_no_network, wait_for_event, +}; use tempfile::TempDir; -use wiremock::Mock; -use wiremock::MockServer; -use wiremock::ResponseTemplate; -use wiremock::matchers::method; -use wiremock::matchers::path; +use wiremock::matchers::{method, path}; +use wiremock::{Mock, MockServer, ResponseTemplate}; fn text_user_input(text: String) -> serde_json::Value { serde_json::json!({ diff --git a/codex-rs/core/tests/suite/read_file.rs b/codex-rs/core/tests/suite/read_file.rs index a74bd8b2a9..9074ae5465 100644 --- a/codex-rs/core/tests/suite/read_file.rs +++ b/codex-rs/core/tests/suite/read_file.rs @@ -1,22 +1,14 @@ #![cfg(not(target_os = "windows"))] -use codex_core::protocol::AskForApproval; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_core::protocol::SandboxPolicy; +use codex_core::protocol::{AskForApproval, EventMsg, Op, SandboxPolicy}; use codex_protocol::config_types::ReasoningSummary; use codex_protocol::user_input::UserInput; -use core_test_support::responses; -use core_test_support::responses::ev_assistant_message; -use core_test_support::responses::ev_completed; -use core_test_support::responses::ev_function_call; -use core_test_support::responses::ev_response_created; -use core_test_support::responses::sse; -use core_test_support::responses::start_mock_server; -use core_test_support::skip_if_no_network; -use core_test_support::test_codex::TestCodex; -use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event; +use core_test_support::responses::{ + ev_assistant_message, ev_completed, ev_function_call, ev_response_created, sse, + start_mock_server, +}; +use core_test_support::test_codex::{TestCodex, test_codex}; +use core_test_support::{responses, skip_if_no_network, wait_for_event}; use pretty_assertions::assert_eq; use serde_json::Value; use wiremock::matchers::any; diff --git a/codex-rs/core/tests/suite/resume.rs b/codex-rs/core/tests/suite/resume.rs index 3a902b6b6f..4e65b0b205 100644 --- a/codex-rs/core/tests/suite/resume.rs +++ b/codex-rs/core/tests/suite/resume.rs @@ -1,18 +1,14 @@ -use anyhow::Result; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_protocol::user_input::UserInput; -use core_test_support::responses::ev_assistant_message; -use core_test_support::responses::ev_completed; -use core_test_support::responses::ev_reasoning_item; -use core_test_support::responses::ev_response_created; -use core_test_support::responses::mount_sse_once_match; -use core_test_support::responses::sse; -use core_test_support::responses::start_mock_server; -use core_test_support::skip_if_no_network; -use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event; use std::sync::Arc; + +use anyhow::Result; +use codex_core::protocol::{EventMsg, Op}; +use codex_protocol::user_input::UserInput; +use core_test_support::responses::{ + ev_assistant_message, ev_completed, ev_reasoning_item, ev_response_created, + mount_sse_once_match, sse, start_mock_server, +}; +use core_test_support::test_codex::test_codex; +use core_test_support::{skip_if_no_network, wait_for_event}; use wiremock::matchers::any; #[tokio::test(flavor = "multi_thread", worker_threads = 2)] diff --git a/codex-rs/core/tests/suite/review.rs b/codex-rs/core/tests/suite/review.rs index 093fd99268..14b3a996d3 100644 --- a/codex-rs/core/tests/suite/review.rs +++ b/codex-rs/core/tests/suite/review.rs @@ -1,40 +1,26 @@ -use codex_core::CodexAuth; -use codex_core::CodexConversation; -use codex_core::ContentItem; -use codex_core::ConversationManager; -use codex_core::ModelProviderInfo; -use codex_core::REVIEW_PROMPT; -use codex_core::ResponseItem; -use codex_core::built_in_model_providers; -use codex_core::config::Config; -use codex_core::protocol::ENVIRONMENT_CONTEXT_OPEN_TAG; -use codex_core::protocol::EventMsg; -use codex_core::protocol::ExitedReviewModeEvent; -use codex_core::protocol::Op; -use codex_core::protocol::ReviewCodeLocation; -use codex_core::protocol::ReviewFinding; -use codex_core::protocol::ReviewLineRange; -use codex_core::protocol::ReviewOutputEvent; -use codex_core::protocol::ReviewRequest; -use codex_core::protocol::RolloutItem; -use codex_core::protocol::RolloutLine; -use codex_protocol::user_input::UserInput; -use core_test_support::load_default_config_for_test; -use core_test_support::load_sse_fixture_with_id_from_str; -use core_test_support::skip_if_no_network; -use core_test_support::wait_for_event; -use core_test_support::wait_for_event_with_timeout; -use pretty_assertions::assert_eq; use std::path::PathBuf; use std::sync::Arc; + +use codex_core::config::Config; +use codex_core::protocol::{ + ENVIRONMENT_CONTEXT_OPEN_TAG, EventMsg, ExitedReviewModeEvent, Op, ReviewCodeLocation, + ReviewFinding, ReviewLineRange, ReviewOutputEvent, ReviewRequest, RolloutItem, RolloutLine, +}; +use codex_core::{ + CodexAuth, CodexConversation, ContentItem, ConversationManager, ModelProviderInfo, + REVIEW_PROMPT, ResponseItem, built_in_model_providers, +}; +use codex_protocol::user_input::UserInput; +use core_test_support::{ + load_default_config_for_test, load_sse_fixture_with_id_from_str, skip_if_no_network, + wait_for_event, wait_for_event_with_timeout, +}; +use pretty_assertions::assert_eq; use tempfile::TempDir; use tokio::io::AsyncWriteExt as _; use uuid::Uuid; -use wiremock::Mock; -use wiremock::MockServer; -use wiremock::ResponseTemplate; -use wiremock::matchers::method; -use wiremock::matchers::path; +use wiremock::matchers::{method, path}; +use wiremock::{Mock, MockServer, ResponseTemplate}; /// Verify that submitting `Op::Review` spawns a child task and emits /// EnteredReviewMode -> ExitedReviewMode(None) -> TaskComplete diff --git a/codex-rs/core/tests/suite/rmcp_client.rs b/codex-rs/core/tests/suite/rmcp_client.rs index 672633ace5..bfeb9ecde3 100644 --- a/codex-rs/core/tests/suite/rmcp_client.rs +++ b/codex-rs/core/tests/suite/rmcp_client.rs @@ -1,42 +1,30 @@ use std::collections::HashMap; -use std::ffi::OsStr; -use std::ffi::OsString; +use std::ffi::{OsStr, OsString}; use std::fs; use std::net::TcpListener; use std::path::Path; -use std::time::Duration; -use std::time::SystemTime; -use std::time::UNIX_EPOCH; +use std::time::{Duration, SystemTime, UNIX_EPOCH}; -use codex_core::config::types::McpServerConfig; -use codex_core::config::types::McpServerTransportConfig; +use codex_core::config::types::{McpServerConfig, McpServerTransportConfig}; use codex_core::features::Feature; - -use codex_core::protocol::AskForApproval; -use codex_core::protocol::EventMsg; -use codex_core::protocol::McpInvocation; -use codex_core::protocol::McpToolCallBeginEvent; -use codex_core::protocol::Op; -use codex_core::protocol::SandboxPolicy; +use codex_core::protocol::{ + AskForApproval, EventMsg, McpInvocation, McpToolCallBeginEvent, Op, SandboxPolicy, +}; use codex_protocol::config_types::ReasoningSummary; use codex_protocol::user_input::UserInput; -use core_test_support::responses; use core_test_support::responses::mount_sse_once_match; -use core_test_support::skip_if_no_network; use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event; -use core_test_support::wait_for_event_with_timeout; +use core_test_support::{ + responses, skip_if_no_network, wait_for_event, wait_for_event_with_timeout, +}; use escargot::CargoBuild; use mcp_types::ContentBlock; -use serde_json::Value; -use serde_json::json; +use serde_json::{Value, json}; use serial_test::serial; use tempfile::tempdir; use tokio::net::TcpStream; -use tokio::process::Child; -use tokio::process::Command; -use tokio::time::Instant; -use tokio::time::sleep; +use tokio::process::{Child, Command}; +use tokio::time::{Instant, sleep}; use wiremock::matchers::any; static OPENAI_PNG: &str = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAD0AAAA9CAYAAAAeYmHpAAAE6klEQVR4Aeyau44UVxCGx1fZsmRLlm3Zoe0XcGQ5cUiCCIgJeS9CHgAhMkISQnIuGQgJEkBcxLW+nqnZ6uqqc+nuWRC7q/P3qetf9e+MtOwyX25O4Nep6JPyop++0qev9HrfgZ+F6r2DuB/vHOrt/UIkqdDHYvujOW6fO7h/CNEI+a5jc+pBR8uy0jVFsziYu5HtfSUk+Io34q921hLNctFSX0gwww+S8wce8K1LfCU+cYW4888aov8NxqvQILUPPReLOrm6zyLxa4i+6VZuFbJo8d1MOHZm+7VUtB/aIvhPWc/3SWg49JcwFLlHxuXKjtyloo+YNhuW3VS+WPBuUEMvCFKjEDVgFBQHXrnazpqiSxNZCkQ1kYiozsbm9Oz7l4i2Il7vGccGNWAc3XosDrZe/9P3ZnMmzHNEQw4smf8RQ87XEAMsC7Az0Au+dgXerfH4+sHvEc0SYGic8WBBUGqFH2gN7yDrazy7m2pbRTeRmU3+MjZmr1h6LJgPbGy23SI6GlYT0brQ71IY8Us4PNQCm+zepSbaD2BY9xCaAsD9IIj/IzFmKMSdHHonwdZATbTnYREf6/VZGER98N9yCWIvXQwXDoDdhZJoT8jwLnJXDB9w4Sb3e6nK5ndzlkTLnP3JBu4LKkbrYrU69gCVceV0JvpyuW1xlsUVngzhwMetn/XamtTORF9IO5YnWNiyeF9zCAfqR3fUW+vZZKLtgP+ts8BmQRBREAdRDhH3o8QuRh/YucNFz2BEjxbRN6LGzphfKmvP6v6QhqIQyZ8XNJ0W0X83MR1PEcJBNO2KC2Z1TW/v244scp9FwRViZxIOBF0Lctk7ZVSavdLvRlV1hz/ysUi9sr8CIcB3nvWBwA93ykTz18eAYxQ6N/K2DkPA1lv3iXCwmDUT7YkjIby9siXueIJj9H+pzSqJ9oIuJWTUgSSt4WO7o/9GGg0viR4VinNRUDoIj34xoCd6pxD3aK3zfdbnx5v1J3ZNNEJsE0sBG7N27ReDrJc4sFxz7dI/ZAbOmmiKvHBitQXpAdR6+F7v+/ol/tOouUV01EeMZQF2BoQDn6dP4XNr+j9GZEtEK1/L8pFw7bd3a53tsTa7WD+054jOFmPg1XBKPQgnqFfmFcy32ZRvjmiIIQTYFvyDxQ8nH8WIwwGwlyDjDznnilYyFr6njrlZwsKkBpO59A7OwgdzPEWRm+G+oeb7IfyNuzjEEVLrOVxJsxvxwF8kmCM6I2QYmJunz4u4TrADpfl7mlbRTWQ7VmrBzh3+C9f6Grc3YoGN9dg/SXFthpRsT6vobfXRs2VBlgBHXVMLHjDNbIZv1sZ9+X3hB09cXdH1JKViyG0+W9bWZDa/r2f9zAFR71sTzGpMSWz2iI4YssWjWo3REy1MDGjdwe5e0dFSiAC1JakBvu4/CUS8Eh6dqHdU0Or0ioY3W5ClSqDXAy7/6SRfgw8vt4I+tbvvNtFT2kVDhY5+IGb1rCqYaXNF08vSALsXCPmt0kQNqJT1p5eI1mkIV/BxCY1z85lOzeFbPBQHURkkPTlwTYK9gTVE25l84IbFFN+YJDHjdpn0gq6mrHht0dkcjbM4UL9283O5p77GN+SPW/QwVB4IUYg7Or+Kp7naR6qktP98LNF2UxWo9yObPIT9KYg+hK4i56no4rfnM0qeyFf6AwAAAP//trwR3wAAAAZJREFUAwBZ0sR75itw5gAAAABJRU5ErkJggg=="; @@ -383,8 +371,7 @@ async fn stdio_image_completions_round_trip() -> anyhow::Result<()> { serde_json::to_string(&final_assistant)? ); - use std::sync::atomic::AtomicUsize; - use std::sync::atomic::Ordering; + use std::sync::atomic::{AtomicUsize, Ordering}; struct ChatSeqResponder { num_calls: AtomicUsize, bodies: Vec, diff --git a/codex-rs/core/tests/suite/rollout_list_find.rs b/codex-rs/core/tests/suite/rollout_list_find.rs index 1d40718d4b..cbd1eab2e0 100644 --- a/codex-rs/core/tests/suite/rollout_list_find.rs +++ b/codex-rs/core/tests/suite/rollout_list_find.rs @@ -1,7 +1,6 @@ #![allow(clippy::unwrap_used, clippy::expect_used)] use std::io::Write; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use codex_core::find_conversation_path_by_id_str; use tempfile::TempDir; diff --git a/codex-rs/core/tests/suite/seatbelt.rs b/codex-rs/core/tests/suite/seatbelt.rs index 53175fca11..431dbce085 100644 --- a/codex-rs/core/tests/suite/seatbelt.rs +++ b/codex-rs/core/tests/suite/seatbelt.rs @@ -4,13 +4,11 @@ //! Tests that apply to both Mac and Linux sandboxing should go in sandbox.rs. use std::collections::HashMap; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use codex_core::protocol::SandboxPolicy; use codex_core::seatbelt::spawn_command_under_seatbelt; -use codex_core::spawn::CODEX_SANDBOX_ENV_VAR; -use codex_core::spawn::StdioPolicy; +use codex_core::spawn::{CODEX_SANDBOX_ENV_VAR, StdioPolicy}; use tempfile::TempDir; struct TestScenario { diff --git a/codex-rs/core/tests/suite/shell_serialization.rs b/codex-rs/core/tests/suite/shell_serialization.rs index d748fe6b4c..70ec7a26f9 100644 --- a/codex-rs/core/tests/suite/shell_serialization.rs +++ b/codex-rs/core/tests/suite/shell_serialization.rs @@ -1,34 +1,23 @@ #![cfg(not(target_os = "windows"))] +use std::fs; + use anyhow::Result; use codex_core::features::Feature; use codex_core::model_family::find_family_for_model; -use codex_core::protocol::AskForApproval; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_core::protocol::SandboxPolicy; +use codex_core::protocol::{AskForApproval, EventMsg, Op, SandboxPolicy}; use codex_protocol::config_types::ReasoningSummary; use codex_protocol::user_input::UserInput; -use core_test_support::assert_regex_match; -use core_test_support::responses::ev_apply_patch_function_call; -use core_test_support::responses::ev_assistant_message; -use core_test_support::responses::ev_completed; -use core_test_support::responses::ev_custom_tool_call; -use core_test_support::responses::ev_function_call; -use core_test_support::responses::ev_local_shell_call; -use core_test_support::responses::ev_response_created; -use core_test_support::responses::mount_sse_sequence; -use core_test_support::responses::sse; -use core_test_support::responses::start_mock_server; -use core_test_support::skip_if_no_network; -use core_test_support::test_codex::TestCodex; -use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event; +use core_test_support::responses::{ + ev_apply_patch_function_call, ev_assistant_message, ev_completed, ev_custom_tool_call, + ev_function_call, ev_local_shell_call, ev_response_created, mount_sse_sequence, sse, + start_mock_server, +}; +use core_test_support::test_codex::{TestCodex, test_codex}; +use core_test_support::{assert_regex_match, skip_if_no_network, wait_for_event}; use pretty_assertions::assert_eq; use regex_lite::Regex; -use serde_json::Value; -use serde_json::json; -use std::fs; +use serde_json::{Value, json}; const FIXTURE_JSON: &str = r#"{ "description": "This is an example JSON file.", diff --git a/codex-rs/core/tests/suite/stream_error_allows_next_turn.rs b/codex-rs/core/tests/suite/stream_error_allows_next_turn.rs index ba86f8c155..b0310873c9 100644 --- a/codex-rs/core/tests/suite/stream_error_allows_next_turn.rs +++ b/codex-rs/core/tests/suite/stream_error_allows_next_turn.rs @@ -1,21 +1,14 @@ use std::time::Duration; -use codex_core::ModelProviderInfo; -use codex_core::WireApi; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; +use codex_core::protocol::{EventMsg, Op}; +use codex_core::{ModelProviderInfo, WireApi}; use codex_protocol::user_input::UserInput; -use core_test_support::load_sse_fixture_with_id; -use core_test_support::skip_if_no_network; -use core_test_support::test_codex::TestCodex; -use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event_with_timeout; -use wiremock::Mock; -use wiremock::MockServer; -use wiremock::ResponseTemplate; -use wiremock::matchers::body_string_contains; -use wiremock::matchers::method; -use wiremock::matchers::path; +use core_test_support::test_codex::{TestCodex, test_codex}; +use core_test_support::{ + load_sse_fixture_with_id, skip_if_no_network, wait_for_event_with_timeout, +}; +use wiremock::matchers::{body_string_contains, method, path}; +use wiremock::{Mock, MockServer, ResponseTemplate}; fn sse_completed(id: &str) -> String { load_sse_fixture_with_id("tests/fixtures/completed_template.json", id) diff --git a/codex-rs/core/tests/suite/stream_no_completed.rs b/codex-rs/core/tests/suite/stream_no_completed.rs index 550bb3f9c2..c38055065a 100644 --- a/codex-rs/core/tests/suite/stream_no_completed.rs +++ b/codex-rs/core/tests/suite/stream_no_completed.rs @@ -3,24 +3,15 @@ use std::time::Duration; -use codex_core::ModelProviderInfo; -use codex_core::WireApi; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; +use codex_core::protocol::{EventMsg, Op}; +use codex_core::{ModelProviderInfo, WireApi}; use codex_protocol::user_input::UserInput; -use core_test_support::load_sse_fixture; -use core_test_support::load_sse_fixture_with_id; -use core_test_support::skip_if_no_network; -use core_test_support::test_codex::TestCodex; -use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event_with_timeout; -use wiremock::Mock; -use wiremock::MockServer; -use wiremock::Request; -use wiremock::Respond; -use wiremock::ResponseTemplate; -use wiremock::matchers::method; -use wiremock::matchers::path; +use core_test_support::test_codex::{TestCodex, test_codex}; +use core_test_support::{ + load_sse_fixture, load_sse_fixture_with_id, skip_if_no_network, wait_for_event_with_timeout, +}; +use wiremock::matchers::{method, path}; +use wiremock::{Mock, MockServer, Request, Respond, ResponseTemplate}; fn sse_incomplete() -> String { load_sse_fixture("tests/fixtures/incomplete_sse.json") @@ -39,8 +30,7 @@ async fn retries_on_early_close() { struct SeqResponder; impl Respond for SeqResponder { fn respond(&self, _: &Request) -> ResponseTemplate { - use std::sync::atomic::AtomicUsize; - use std::sync::atomic::Ordering; + use std::sync::atomic::{AtomicUsize, Ordering}; static CALLS: AtomicUsize = AtomicUsize::new(0); let n = CALLS.fetch_add(1, Ordering::SeqCst); if n == 0 { diff --git a/codex-rs/core/tests/suite/tool_harness.rs b/codex-rs/core/tests/suite/tool_harness.rs index e9f9552c50..e315275158 100644 --- a/codex-rs/core/tests/suite/tool_harness.rs +++ b/codex-rs/core/tests/suite/tool_harness.rs @@ -5,29 +5,17 @@ use std::fs; use assert_matches::assert_matches; use codex_core::features::Feature; use codex_core::model_family::find_family_for_model; -use codex_core::protocol::AskForApproval; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_core::protocol::SandboxPolicy; +use codex_core::protocol::{AskForApproval, EventMsg, Op, SandboxPolicy}; use codex_protocol::config_types::ReasoningSummary; use codex_protocol::plan_tool::StepStatus; use codex_protocol::user_input::UserInput; -use core_test_support::assert_regex_match; -use core_test_support::responses; -use core_test_support::responses::ev_apply_patch_function_call; -use core_test_support::responses::ev_assistant_message; -use core_test_support::responses::ev_completed; -use core_test_support::responses::ev_function_call; -use core_test_support::responses::ev_local_shell_call; -use core_test_support::responses::ev_response_created; -use core_test_support::responses::sse; -use core_test_support::responses::start_mock_server; -use core_test_support::skip_if_no_network; -use core_test_support::test_codex::TestCodex; -use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event; -use serde_json::Value; -use serde_json::json; +use core_test_support::responses::{ + ev_apply_patch_function_call, ev_assistant_message, ev_completed, ev_function_call, + ev_local_shell_call, ev_response_created, sse, start_mock_server, +}; +use core_test_support::test_codex::{TestCodex, test_codex}; +use core_test_support::{assert_regex_match, responses, skip_if_no_network, wait_for_event}; +use serde_json::{Value, json}; use wiremock::matchers::any; fn extract_output_text(item: &Value) -> Option<&str> { diff --git a/codex-rs/core/tests/suite/tool_parallelism.rs b/codex-rs/core/tests/suite/tool_parallelism.rs index a1e96fa02f..ca381ca72e 100644 --- a/codex-rs/core/tests/suite/tool_parallelism.rs +++ b/codex-rs/core/tests/suite/tool_parallelism.rs @@ -1,26 +1,18 @@ #![cfg(not(target_os = "windows"))] #![allow(clippy::unwrap_used)] -use std::time::Duration; -use std::time::Instant; +use std::time::{Duration, Instant}; use codex_core::model_family::find_family_for_model; -use codex_core::protocol::AskForApproval; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_core::protocol::SandboxPolicy; +use codex_core::protocol::{AskForApproval, EventMsg, Op, SandboxPolicy}; use codex_protocol::config_types::ReasoningSummary; use codex_protocol::user_input::UserInput; -use core_test_support::responses::ev_assistant_message; -use core_test_support::responses::ev_completed; -use core_test_support::responses::ev_function_call; -use core_test_support::responses::mount_sse_sequence; -use core_test_support::responses::sse; -use core_test_support::responses::start_mock_server; -use core_test_support::skip_if_no_network; -use core_test_support::test_codex::TestCodex; -use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event; +use core_test_support::responses::{ + ev_assistant_message, ev_completed, ev_function_call, mount_sse_sequence, sse, + start_mock_server, +}; +use core_test_support::test_codex::{TestCodex, test_codex}; +use core_test_support::{skip_if_no_network, wait_for_event}; use serde_json::json; async fn run_turn(test: &TestCodex, prompt: &str) -> anyhow::Result<()> { diff --git a/codex-rs/core/tests/suite/tools.rs b/codex-rs/core/tests/suite/tools.rs index a60257b6b3..29ed432e0d 100644 --- a/codex-rs/core/tests/suite/tools.rs +++ b/codex-rs/core/tests/suite/tools.rs @@ -1,33 +1,20 @@ #![cfg(not(target_os = "windows"))] #![allow(clippy::unwrap_used, clippy::expect_used)] -use anyhow::Context; -use anyhow::Result; +use anyhow::{Context, Result}; use codex_core::features::Feature; use codex_core::model_family::find_family_for_model; -use codex_core::protocol::AskForApproval; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_core::protocol::SandboxPolicy; +use codex_core::protocol::{AskForApproval, EventMsg, Op, SandboxPolicy}; use codex_protocol::config_types::ReasoningSummary; use codex_protocol::user_input::UserInput; -use core_test_support::assert_regex_match; -use core_test_support::responses::ev_assistant_message; -use core_test_support::responses::ev_completed; -use core_test_support::responses::ev_custom_tool_call; -use core_test_support::responses::ev_function_call; -use core_test_support::responses::ev_response_created; -use core_test_support::responses::mount_sse_once; -use core_test_support::responses::mount_sse_sequence; -use core_test_support::responses::sse; -use core_test_support::responses::start_mock_server; -use core_test_support::skip_if_no_network; -use core_test_support::test_codex::TestCodex; -use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event; +use core_test_support::responses::{ + ev_assistant_message, ev_completed, ev_custom_tool_call, ev_function_call, ev_response_created, + mount_sse_once, mount_sse_sequence, sse, start_mock_server, +}; +use core_test_support::test_codex::{TestCodex, test_codex}; +use core_test_support::{assert_regex_match, skip_if_no_network, wait_for_event}; use regex_lite::Regex; -use serde_json::Value; -use serde_json::json; +use serde_json::{Value, json}; async fn submit_turn( test: &TestCodex, diff --git a/codex-rs/core/tests/suite/truncation.rs b/codex-rs/core/tests/suite/truncation.rs index aab95fa028..8c430392d6 100644 --- a/codex-rs/core/tests/suite/truncation.rs +++ b/codex-rs/core/tests/suite/truncation.rs @@ -1,37 +1,25 @@ #![cfg(not(target_os = "windows"))] #![allow(clippy::unwrap_used, clippy::expect_used)] -use anyhow::Context; -use anyhow::Result; -use codex_core::config::types::McpServerConfig; -use codex_core::config::types::McpServerTransportConfig; -use codex_core::features::Feature; -use codex_core::model_family::find_family_for_model; -use codex_core::protocol::AskForApproval; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_core::protocol::SandboxPolicy; -use codex_protocol::config_types::ReasoningSummary; -use codex_protocol::user_input::UserInput; -use core_test_support::assert_regex_match; -use core_test_support::responses; -use core_test_support::responses::ev_assistant_message; -use core_test_support::responses::ev_completed; -use core_test_support::responses::ev_function_call; -use core_test_support::responses::ev_response_created; -use core_test_support::responses::mount_sse_once_match; -use core_test_support::responses::mount_sse_sequence; -use core_test_support::responses::sse; -use core_test_support::responses::start_mock_server; -use core_test_support::skip_if_no_network; -use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event; -use escargot::CargoBuild; -use regex_lite::Regex; -use serde_json::Value; -use serde_json::json; use std::collections::HashMap; use std::time::Duration; + +use anyhow::{Context, Result}; +use codex_core::config::types::{McpServerConfig, McpServerTransportConfig}; +use codex_core::features::Feature; +use codex_core::model_family::find_family_for_model; +use codex_core::protocol::{AskForApproval, EventMsg, Op, SandboxPolicy}; +use codex_protocol::config_types::ReasoningSummary; +use codex_protocol::user_input::UserInput; +use core_test_support::responses::{ + ev_assistant_message, ev_completed, ev_function_call, ev_response_created, + mount_sse_once_match, mount_sse_sequence, sse, start_mock_server, +}; +use core_test_support::test_codex::test_codex; +use core_test_support::{assert_regex_match, responses, skip_if_no_network, wait_for_event}; +use escargot::CargoBuild; +use regex_lite::Regex; +use serde_json::{Value, json}; use wiremock::matchers::any; // Verifies byte-truncation formatting for function error output (RespondToModel errors) diff --git a/codex-rs/core/tests/suite/undo.rs b/codex-rs/core/tests/suite/undo.rs index 7883d347f9..cffe387652 100644 --- a/codex-rs/core/tests/suite/undo.rs +++ b/codex-rs/core/tests/suite/undo.rs @@ -5,25 +5,18 @@ use std::path::Path; use std::process::Command; use std::sync::Arc; -use anyhow::Context; -use anyhow::Result; -use anyhow::bail; +use anyhow::{Context, Result, bail}; use codex_core::CodexConversation; use codex_core::config::Config; use codex_core::features::Feature; use codex_core::model_family::find_family_for_model; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_core::protocol::UndoCompletedEvent; -use core_test_support::responses::ev_apply_patch_function_call; -use core_test_support::responses::ev_assistant_message; -use core_test_support::responses::ev_completed; -use core_test_support::responses::ev_response_created; -use core_test_support::responses::mount_sse_sequence; -use core_test_support::responses::sse; -use core_test_support::skip_if_no_network; +use codex_core::protocol::{EventMsg, Op, UndoCompletedEvent}; +use core_test_support::responses::{ + ev_apply_patch_function_call, ev_assistant_message, ev_completed, ev_response_created, + mount_sse_sequence, sse, +}; use core_test_support::test_codex::TestCodexHarness; -use core_test_support::wait_for_event_match; +use core_test_support::{skip_if_no_network, wait_for_event_match}; use pretty_assertions::assert_eq; #[allow(clippy::expect_used)] diff --git a/codex-rs/core/tests/suite/unified_exec.rs b/codex-rs/core/tests/suite/unified_exec.rs index 0e68ec7585..8db53f768f 100644 --- a/codex-rs/core/tests/suite/unified_exec.rs +++ b/codex-rs/core/tests/suite/unified_exec.rs @@ -4,28 +4,19 @@ use std::collections::HashMap; use anyhow::Result; use codex_core::features::Feature; -use codex_core::protocol::AskForApproval; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_core::protocol::SandboxPolicy; +use codex_core::protocol::{AskForApproval, EventMsg, Op, SandboxPolicy}; use codex_protocol::config_types::ReasoningSummary; use codex_protocol::user_input::UserInput; -use core_test_support::responses::ev_assistant_message; -use core_test_support::responses::ev_completed; -use core_test_support::responses::ev_function_call; -use core_test_support::responses::ev_response_created; -use core_test_support::responses::mount_sse_sequence; -use core_test_support::responses::sse; -use core_test_support::responses::start_mock_server; -use core_test_support::skip_if_no_network; -use core_test_support::skip_if_sandbox; -use core_test_support::test_codex::TestCodex; -use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event; -use core_test_support::wait_for_event_match; -use core_test_support::wait_for_event_with_timeout; -use serde_json::Value; -use serde_json::json; +use core_test_support::responses::{ + ev_assistant_message, ev_completed, ev_function_call, ev_response_created, mount_sse_sequence, + sse, start_mock_server, +}; +use core_test_support::test_codex::{TestCodex, test_codex}; +use core_test_support::{ + skip_if_no_network, skip_if_sandbox, wait_for_event, wait_for_event_match, + wait_for_event_with_timeout, +}; +use serde_json::{Value, json}; fn extract_output_text(item: &Value) -> Option<&str> { item.get("output").and_then(|value| match value { diff --git a/codex-rs/core/tests/suite/user_notification.rs b/codex-rs/core/tests/suite/user_notification.rs index 74b59736f4..2be8a2573f 100644 --- a/codex-rs/core/tests/suite/user_notification.rs +++ b/codex-rs/core/tests/suite/user_notification.rs @@ -1,28 +1,18 @@ #![cfg(not(target_os = "windows"))] use std::os::unix::fs::PermissionsExt; +use std::time::Duration; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; +use codex_core::protocol::{EventMsg, Op}; use codex_protocol::user_input::UserInput; -use core_test_support::fs_wait; -use core_test_support::responses; -use core_test_support::skip_if_no_network; -use core_test_support::test_codex::TestCodex; -use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event; +use core_test_support::test_codex::{TestCodex, test_codex}; +use core_test_support::{fs_wait, responses, skip_if_no_network, wait_for_event}; use pretty_assertions::assert_eq; -use serde_json::Value; -use serde_json::json; +use responses::{ev_assistant_message, ev_completed, sse, start_mock_server}; +use serde_json::{Value, json}; use tempfile::TempDir; use wiremock::matchers::any; -use responses::ev_assistant_message; -use responses::ev_completed; -use responses::sse; -use responses::start_mock_server; -use std::time::Duration; - #[tokio::test(flavor = "multi_thread", worker_threads = 2)] #[ignore = "flaky on ubuntu-24.04-arm - aarch64-unknown-linux-gnu"] // The notify script gets far enough to create (and therefore surface) the file, diff --git a/codex-rs/core/tests/suite/user_shell_cmd.rs b/codex-rs/core/tests/suite/user_shell_cmd.rs index 0832d7e6b4..de773c9dbd 100644 --- a/codex-rs/core/tests/suite/user_shell_cmd.rs +++ b/codex-rs/core/tests/suite/user_shell_cmd.rs @@ -1,14 +1,9 @@ -use codex_core::ConversationManager; -use codex_core::NewConversation; -use codex_core::protocol::EventMsg; -use codex_core::protocol::ExecCommandEndEvent; -use codex_core::protocol::Op; -use codex_core::protocol::TurnAbortReason; -use core_test_support::load_default_config_for_test; -use core_test_support::wait_for_event; use std::path::PathBuf; -use std::process::Command; -use std::process::Stdio; +use std::process::{Command, Stdio}; + +use codex_core::protocol::{EventMsg, ExecCommandEndEvent, Op, TurnAbortReason}; +use codex_core::{ConversationManager, NewConversation}; +use core_test_support::{load_default_config_for_test, wait_for_event}; use tempfile::TempDir; fn detect_python_executable() -> Option { diff --git a/codex-rs/core/tests/suite/view_image.rs b/codex-rs/core/tests/suite/view_image.rs index ae9af966f6..81c561a3a5 100644 --- a/codex-rs/core/tests/suite/view_image.rs +++ b/codex-rs/core/tests/suite/view_image.rs @@ -2,27 +2,16 @@ use base64::Engine; use base64::engine::general_purpose::STANDARD as BASE64_STANDARD; -use codex_core::protocol::AskForApproval; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_core::protocol::SandboxPolicy; +use codex_core::protocol::{AskForApproval, EventMsg, Op, SandboxPolicy}; use codex_protocol::config_types::ReasoningSummary; use codex_protocol::user_input::UserInput; -use core_test_support::responses; -use core_test_support::responses::ev_assistant_message; -use core_test_support::responses::ev_completed; -use core_test_support::responses::ev_function_call; -use core_test_support::responses::ev_response_created; -use core_test_support::responses::sse; -use core_test_support::responses::start_mock_server; -use core_test_support::skip_if_no_network; -use core_test_support::test_codex::TestCodex; -use core_test_support::test_codex::test_codex; -use core_test_support::wait_for_event; -use image::GenericImageView; -use image::ImageBuffer; -use image::Rgba; -use image::load_from_memory; +use core_test_support::responses::{ + ev_assistant_message, ev_completed, ev_function_call, ev_response_created, sse, + start_mock_server, +}; +use core_test_support::test_codex::{TestCodex, test_codex}; +use core_test_support::{responses, skip_if_no_network, wait_for_event}; +use image::{GenericImageView, ImageBuffer, Rgba, load_from_memory}; use serde_json::Value; use wiremock::matchers::any; diff --git a/codex-rs/exec/src/cli.rs b/codex-rs/exec/src/cli.rs index f56d07dc32..24bd6099be 100644 --- a/codex-rs/exec/src/cli.rs +++ b/codex-rs/exec/src/cli.rs @@ -1,8 +1,8 @@ -use clap::Parser; -use clap::ValueEnum; -use codex_common::CliConfigOverrides; use std::path::PathBuf; +use clap::{Parser, ValueEnum}; +use codex_common::CliConfigOverrides; + #[derive(Parser, Debug)] #[command(version)] pub struct Cli { diff --git a/codex-rs/exec/src/event_processor.rs b/codex-rs/exec/src/event_processor.rs index 2a0b1eb833..d984765bb6 100644 --- a/codex-rs/exec/src/event_processor.rs +++ b/codex-rs/exec/src/event_processor.rs @@ -1,8 +1,7 @@ use std::path::Path; use codex_core::config::Config; -use codex_core::protocol::Event; -use codex_core::protocol::SessionConfiguredEvent; +use codex_core::protocol::{Event, SessionConfiguredEvent}; pub(crate) enum CodexStatus { Running, diff --git a/codex-rs/exec/src/event_processor_with_human_output.rs b/codex-rs/exec/src/event_processor_with_human_output.rs index 93e0e493bb..19e9d8debe 100644 --- a/codex-rs/exec/src/event_processor_with_human_output.rs +++ b/codex-rs/exec/src/event_processor_with_human_output.rs @@ -1,42 +1,23 @@ -use codex_common::elapsed::format_duration; -use codex_common::elapsed::format_elapsed; -use codex_core::config::Config; -use codex_core::protocol::AgentMessageEvent; -use codex_core::protocol::AgentReasoningRawContentEvent; -use codex_core::protocol::BackgroundEventEvent; -use codex_core::protocol::DeprecationNoticeEvent; -use codex_core::protocol::ErrorEvent; -use codex_core::protocol::Event; -use codex_core::protocol::EventMsg; -use codex_core::protocol::ExecCommandBeginEvent; -use codex_core::protocol::ExecCommandEndEvent; -use codex_core::protocol::FileChange; -use codex_core::protocol::McpInvocation; -use codex_core::protocol::McpToolCallBeginEvent; -use codex_core::protocol::McpToolCallEndEvent; -use codex_core::protocol::PatchApplyBeginEvent; -use codex_core::protocol::PatchApplyEndEvent; -use codex_core::protocol::SessionConfiguredEvent; -use codex_core::protocol::StreamErrorEvent; -use codex_core::protocol::TaskCompleteEvent; -use codex_core::protocol::TurnAbortReason; -use codex_core::protocol::TurnDiffEvent; -use codex_core::protocol::WarningEvent; -use codex_core::protocol::WebSearchEndEvent; -use codex_protocol::num_format::format_with_separators; -use owo_colors::OwoColorize; -use owo_colors::Style; -use shlex::try_join; use std::collections::HashMap; use std::path::PathBuf; use std::time::Instant; -use crate::event_processor::CodexStatus; -use crate::event_processor::EventProcessor; -use crate::event_processor::handle_last_message; use codex_common::create_config_summary_entries; -use codex_protocol::plan_tool::StepStatus; -use codex_protocol::plan_tool::UpdatePlanArgs; +use codex_common::elapsed::{format_duration, format_elapsed}; +use codex_core::config::Config; +use codex_core::protocol::{ + AgentMessageEvent, AgentReasoningRawContentEvent, BackgroundEventEvent, DeprecationNoticeEvent, + ErrorEvent, Event, EventMsg, ExecCommandBeginEvent, ExecCommandEndEvent, FileChange, + McpInvocation, McpToolCallBeginEvent, McpToolCallEndEvent, PatchApplyBeginEvent, + PatchApplyEndEvent, SessionConfiguredEvent, StreamErrorEvent, TaskCompleteEvent, + TurnAbortReason, TurnDiffEvent, WarningEvent, WebSearchEndEvent, +}; +use codex_protocol::num_format::format_with_separators; +use codex_protocol::plan_tool::{StepStatus, UpdatePlanArgs}; +use owo_colors::{OwoColorize, Style}; +use shlex::try_join; + +use crate::event_processor::{CodexStatus, EventProcessor, handle_last_message}; /// This should be configurable. When used in CI, users may not want to impose /// a limit so they can see the full transcript. diff --git a/codex-rs/exec/src/event_processor_with_jsonl_output.rs b/codex-rs/exec/src/event_processor_with_jsonl_output.rs index 23dff015eb..8f1e085e4c 100644 --- a/codex-rs/exec/src/event_processor_with_jsonl_output.rs +++ b/codex-rs/exec/src/event_processor_with_jsonl_output.rs @@ -2,58 +2,26 @@ use std::collections::HashMap; use std::path::PathBuf; use std::sync::atomic::AtomicU64; -use crate::event_processor::CodexStatus; -use crate::event_processor::EventProcessor; -use crate::event_processor::handle_last_message; -use crate::exec_events::AgentMessageItem; -use crate::exec_events::CommandExecutionItem; -use crate::exec_events::CommandExecutionStatus; -use crate::exec_events::ErrorItem; -use crate::exec_events::FileChangeItem; -use crate::exec_events::FileUpdateChange; -use crate::exec_events::ItemCompletedEvent; -use crate::exec_events::ItemStartedEvent; -use crate::exec_events::ItemUpdatedEvent; -use crate::exec_events::McpToolCallItem; -use crate::exec_events::McpToolCallItemError; -use crate::exec_events::McpToolCallItemResult; -use crate::exec_events::McpToolCallStatus; -use crate::exec_events::PatchApplyStatus; -use crate::exec_events::PatchChangeKind; -use crate::exec_events::ReasoningItem; -use crate::exec_events::ThreadErrorEvent; -use crate::exec_events::ThreadEvent; -use crate::exec_events::ThreadItem; -use crate::exec_events::ThreadItemDetails; -use crate::exec_events::ThreadStartedEvent; -use crate::exec_events::TodoItem; -use crate::exec_events::TodoListItem; -use crate::exec_events::TurnCompletedEvent; -use crate::exec_events::TurnFailedEvent; -use crate::exec_events::TurnStartedEvent; -use crate::exec_events::Usage; -use crate::exec_events::WebSearchItem; use codex_core::config::Config; -use codex_core::protocol::AgentMessageEvent; -use codex_core::protocol::AgentReasoningEvent; -use codex_core::protocol::Event; -use codex_core::protocol::EventMsg; -use codex_core::protocol::ExecCommandBeginEvent; -use codex_core::protocol::ExecCommandEndEvent; -use codex_core::protocol::FileChange; -use codex_core::protocol::McpToolCallBeginEvent; -use codex_core::protocol::McpToolCallEndEvent; -use codex_core::protocol::PatchApplyBeginEvent; -use codex_core::protocol::PatchApplyEndEvent; -use codex_core::protocol::SessionConfiguredEvent; -use codex_core::protocol::TaskCompleteEvent; -use codex_core::protocol::TaskStartedEvent; -use codex_core::protocol::WebSearchEndEvent; -use codex_protocol::plan_tool::StepStatus; -use codex_protocol::plan_tool::UpdatePlanArgs; +use codex_core::protocol::{ + AgentMessageEvent, AgentReasoningEvent, Event, EventMsg, ExecCommandBeginEvent, + ExecCommandEndEvent, FileChange, McpToolCallBeginEvent, McpToolCallEndEvent, + PatchApplyBeginEvent, PatchApplyEndEvent, SessionConfiguredEvent, TaskCompleteEvent, + TaskStartedEvent, WebSearchEndEvent, +}; +use codex_protocol::plan_tool::{StepStatus, UpdatePlanArgs}; use serde_json::Value as JsonValue; -use tracing::error; -use tracing::warn; +use tracing::{error, warn}; + +use crate::event_processor::{CodexStatus, EventProcessor, handle_last_message}; +use crate::exec_events::{ + AgentMessageItem, CommandExecutionItem, CommandExecutionStatus, ErrorItem, FileChangeItem, + FileUpdateChange, ItemCompletedEvent, ItemStartedEvent, ItemUpdatedEvent, McpToolCallItem, + McpToolCallItemError, McpToolCallItemResult, McpToolCallStatus, PatchApplyStatus, + PatchChangeKind, ReasoningItem, ThreadErrorEvent, ThreadEvent, ThreadItem, ThreadItemDetails, + ThreadStartedEvent, TodoItem, TodoListItem, TurnCompletedEvent, TurnFailedEvent, + TurnStartedEvent, Usage, WebSearchItem, +}; pub struct EventProcessorWithJsonOutput { last_message_path: Option, diff --git a/codex-rs/exec/src/exec_events.rs b/codex-rs/exec/src/exec_events.rs index 64288e1388..1f69740167 100644 --- a/codex-rs/exec/src/exec_events.rs +++ b/codex-rs/exec/src/exec_events.rs @@ -1,6 +1,5 @@ use mcp_types::ContentBlock as McpContentBlock; -use serde::Deserialize; -use serde::Serialize; +use serde::{Deserialize, Serialize}; use serde_json::Value as JsonValue; use ts_rs::TS; diff --git a/codex-rs/exec/src/lib.rs b/codex-rs/exec/src/lib.rs index 13d43f61e2..de60d47872 100644 --- a/codex-rs/exec/src/lib.rs +++ b/codex-rs/exec/src/lib.rs @@ -10,20 +10,19 @@ mod event_processor_with_human_output; pub mod event_processor_with_jsonl_output; pub mod exec_events; +use std::io::{IsTerminal, Read}; +use std::path::PathBuf; + pub use cli::Cli; -use codex_core::AuthManager; -use codex_core::BUILT_IN_OSS_MODEL_PROVIDER_ID; -use codex_core::ConversationManager; -use codex_core::NewConversation; use codex_core::auth::enforce_login_restrictions; -use codex_core::config::Config; -use codex_core::config::ConfigOverrides; +use codex_core::config::{Config, ConfigOverrides}; +use codex_core::default_client::set_default_originator; use codex_core::git_info::get_git_repo_root; -use codex_core::protocol::AskForApproval; -use codex_core::protocol::Event; -use codex_core::protocol::EventMsg; -use codex_core::protocol::Op; -use codex_core::protocol::SessionSource; +use codex_core::protocol::{AskForApproval, Event, EventMsg, Op, SessionSource}; +use codex_core::{ + AuthManager, BUILT_IN_OSS_MODEL_PROVIDER_ID, ConversationManager, NewConversation, + find_conversation_path_by_id_str, +}; use codex_ollama::DEFAULT_OSS_MODEL; use codex_protocol::config_types::SandboxMode; use codex_protocol::user_input::UserInput; @@ -31,21 +30,13 @@ use event_processor_with_human_output::EventProcessorWithHumanOutput; use event_processor_with_jsonl_output::EventProcessorWithJsonOutput; use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge; use serde_json::Value; -use std::io::IsTerminal; -use std::io::Read; -use std::path::PathBuf; use supports_color::Stream; -use tracing::debug; -use tracing::error; -use tracing::info; +use tracing::{debug, error, info}; use tracing_subscriber::EnvFilter; use tracing_subscriber::prelude::*; use crate::cli::Command as ExecCommand; -use crate::event_processor::CodexStatus; -use crate::event_processor::EventProcessor; -use codex_core::default_client::set_default_originator; -use codex_core::find_conversation_path_by_id_str; +use crate::event_processor::{CodexStatus, EventProcessor}; pub async fn run_main(cli: Cli, codex_linux_sandbox_exe: Option) -> anyhow::Result<()> { if let Err(err) = set_default_originator("codex_exec".to_string()) { diff --git a/codex-rs/exec/src/main.rs b/codex-rs/exec/src/main.rs index 03ee533ea9..8f191e3cc8 100644 --- a/codex-rs/exec/src/main.rs +++ b/codex-rs/exec/src/main.rs @@ -12,8 +12,7 @@ use clap::Parser; use codex_arg0::arg0_dispatch_or_else; use codex_common::CliConfigOverrides; -use codex_exec::Cli; -use codex_exec::run_main; +use codex_exec::{Cli, run_main}; #[derive(Parser, Debug)] struct TopCli { diff --git a/codex-rs/exec/tests/event_processor_with_json_output.rs b/codex-rs/exec/tests/event_processor_with_json_output.rs index 4c1e0c77b5..f3d2938452 100644 --- a/codex-rs/exec/tests/event_processor_with_json_output.rs +++ b/codex-rs/exec/tests/event_processor_with_json_output.rs @@ -1,57 +1,26 @@ -use codex_core::protocol::AgentMessageEvent; -use codex_core::protocol::AgentReasoningEvent; -use codex_core::protocol::ErrorEvent; -use codex_core::protocol::Event; -use codex_core::protocol::EventMsg; -use codex_core::protocol::ExecCommandBeginEvent; -use codex_core::protocol::ExecCommandEndEvent; -use codex_core::protocol::FileChange; -use codex_core::protocol::McpInvocation; -use codex_core::protocol::McpToolCallBeginEvent; -use codex_core::protocol::McpToolCallEndEvent; -use codex_core::protocol::PatchApplyBeginEvent; -use codex_core::protocol::PatchApplyEndEvent; -use codex_core::protocol::SessionConfiguredEvent; -use codex_core::protocol::WarningEvent; -use codex_core::protocol::WebSearchEndEvent; -use codex_exec::event_processor_with_jsonl_output::EventProcessorWithJsonOutput; -use codex_exec::exec_events::AgentMessageItem; -use codex_exec::exec_events::CommandExecutionItem; -use codex_exec::exec_events::CommandExecutionStatus; -use codex_exec::exec_events::ErrorItem; -use codex_exec::exec_events::ItemCompletedEvent; -use codex_exec::exec_events::ItemStartedEvent; -use codex_exec::exec_events::ItemUpdatedEvent; -use codex_exec::exec_events::McpToolCallItem; -use codex_exec::exec_events::McpToolCallItemError; -use codex_exec::exec_events::McpToolCallItemResult; -use codex_exec::exec_events::McpToolCallStatus; -use codex_exec::exec_events::PatchApplyStatus; -use codex_exec::exec_events::PatchChangeKind; -use codex_exec::exec_events::ReasoningItem; -use codex_exec::exec_events::ThreadErrorEvent; -use codex_exec::exec_events::ThreadEvent; -use codex_exec::exec_events::ThreadItem; -use codex_exec::exec_events::ThreadItemDetails; -use codex_exec::exec_events::ThreadStartedEvent; -use codex_exec::exec_events::TodoItem as ExecTodoItem; -use codex_exec::exec_events::TodoListItem as ExecTodoListItem; -use codex_exec::exec_events::TurnCompletedEvent; -use codex_exec::exec_events::TurnFailedEvent; -use codex_exec::exec_events::TurnStartedEvent; -use codex_exec::exec_events::Usage; -use codex_exec::exec_events::WebSearchItem; -use codex_protocol::plan_tool::PlanItemArg; -use codex_protocol::plan_tool::StepStatus; -use codex_protocol::plan_tool::UpdatePlanArgs; -use mcp_types::CallToolResult; -use mcp_types::ContentBlock; -use mcp_types::TextContent; -use pretty_assertions::assert_eq; -use serde_json::json; use std::path::PathBuf; use std::time::Duration; +use codex_core::protocol::{ + AgentMessageEvent, AgentReasoningEvent, ErrorEvent, Event, EventMsg, ExecCommandBeginEvent, + ExecCommandEndEvent, FileChange, McpInvocation, McpToolCallBeginEvent, McpToolCallEndEvent, + PatchApplyBeginEvent, PatchApplyEndEvent, SessionConfiguredEvent, WarningEvent, + WebSearchEndEvent, +}; +use codex_exec::event_processor_with_jsonl_output::EventProcessorWithJsonOutput; +use codex_exec::exec_events::{ + AgentMessageItem, CommandExecutionItem, CommandExecutionStatus, ErrorItem, ItemCompletedEvent, + ItemStartedEvent, ItemUpdatedEvent, McpToolCallItem, McpToolCallItemError, + McpToolCallItemResult, McpToolCallStatus, PatchApplyStatus, PatchChangeKind, ReasoningItem, + ThreadErrorEvent, ThreadEvent, ThreadItem, ThreadItemDetails, ThreadStartedEvent, + TodoItem as ExecTodoItem, TodoListItem as ExecTodoListItem, TurnCompletedEvent, + TurnFailedEvent, TurnStartedEvent, Usage, WebSearchItem, +}; +use codex_protocol::plan_tool::{PlanItemArg, StepStatus, UpdatePlanArgs}; +use mcp_types::{CallToolResult, ContentBlock, TextContent}; +use pretty_assertions::assert_eq; +use serde_json::json; + fn event(id: &str, msg: EventMsg) -> Event { Event { id: id.to_string(), diff --git a/codex-rs/exec/tests/suite/apply_patch.rs b/codex-rs/exec/tests/suite/apply_patch.rs index a32f83ba5e..ddf2780f60 100644 --- a/codex-rs/exec/tests/suite/apply_patch.rs +++ b/codex-rs/exec/tests/suite/apply_patch.rs @@ -1,16 +1,15 @@ #![allow(clippy::expect_used, clippy::unwrap_used, unused_imports)] +use std::fs; +use std::process::Command; + use anyhow::Context; use assert_cmd::prelude::*; use codex_core::CODEX_APPLY_PATCH_ARG1; -use core_test_support::responses::ev_apply_patch_custom_tool_call; -use core_test_support::responses::ev_apply_patch_function_call; -use core_test_support::responses::ev_completed; -use core_test_support::responses::mount_sse_sequence; -use core_test_support::responses::sse; -use core_test_support::responses::start_mock_server; -use std::fs; -use std::process::Command; +use core_test_support::responses::{ + ev_apply_patch_custom_tool_call, ev_apply_patch_function_call, ev_completed, + mount_sse_sequence, sse, start_mock_server, +}; use tempfile::tempdir; /// While we may add an `apply-patch` subcommand to the `codex` CLI multitool diff --git a/codex-rs/exec/tests/suite/auth_env.rs b/codex-rs/exec/tests/suite/auth_env.rs index 91d7bad8f8..b85013abe9 100644 --- a/codex-rs/exec/tests/suite/auth_env.rs +++ b/codex-rs/exec/tests/suite/auth_env.rs @@ -1,8 +1,5 @@ #![allow(clippy::unwrap_used, clippy::expect_used)] -use core_test_support::responses::ev_completed; -use core_test_support::responses::mount_sse_once_match; -use core_test_support::responses::sse; -use core_test_support::responses::start_mock_server; +use core_test_support::responses::{ev_completed, mount_sse_once_match, sse, start_mock_server}; use core_test_support::test_codex_exec::test_codex_exec; use wiremock::matchers::header; diff --git a/codex-rs/exec/tests/suite/resume.rs b/codex-rs/exec/tests/suite/resume.rs index 24b8cb0bce..4c1b54d1ac 100644 --- a/codex-rs/exec/tests/suite/resume.rs +++ b/codex-rs/exec/tests/suite/resume.rs @@ -1,9 +1,10 @@ #![allow(clippy::unwrap_used, clippy::expect_used)] +use std::path::Path; +use std::string::ToString; + use anyhow::Context; use core_test_support::test_codex_exec::test_codex_exec; use serde_json::Value; -use std::path::Path; -use std::string::ToString; use uuid::Uuid; use walkdir::WalkDir; diff --git a/codex-rs/exec/tests/suite/sandbox.rs b/codex-rs/exec/tests/suite/sandbox.rs index 73a7f0d5bd..c327f34999 100644 --- a/codex-rs/exec/tests/suite/sandbox.rs +++ b/codex-rs/exec/tests/suite/sandbox.rs @@ -1,12 +1,12 @@ #![cfg(unix)] -use codex_core::protocol::SandboxPolicy; -use codex_core::spawn::StdioPolicy; use std::collections::HashMap; use std::future::Future; use std::io; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::process::ExitStatus; + +use codex_core::protocol::SandboxPolicy; +use codex_core::spawn::StdioPolicy; use tokio::fs::create_dir_all; use tokio::process::Child; diff --git a/codex-rs/execpolicy/src/arg_matcher.rs b/codex-rs/execpolicy/src/arg_matcher.rs index 3d413fe7ff..a961c46fe6 100644 --- a/codex-rs/execpolicy/src/arg_matcher.rs +++ b/codex-rs/execpolicy/src/arg_matcher.rs @@ -1,18 +1,15 @@ #![allow(clippy::needless_lifetimes)] -use crate::arg_type::ArgType; -use crate::starlark::values::ValueLike; use allocative::Allocative; use derive_more::derive::Display; use starlark::any::ProvidesStaticType; -use starlark::values::AllocValue; -use starlark::values::Heap; -use starlark::values::NoSerialize; -use starlark::values::StarlarkValue; -use starlark::values::UnpackValue; -use starlark::values::Value; -use starlark::values::starlark_value; use starlark::values::string::StarlarkStr; +use starlark::values::{ + AllocValue, Heap, NoSerialize, StarlarkValue, UnpackValue, Value, starlark_value, +}; + +use crate::arg_type::ArgType; +use crate::starlark::values::ValueLike; /// Patterns that lists of arguments should be compared against. #[derive(Clone, Debug, Display, Eq, PartialEq, NoSerialize, ProvidesStaticType, Allocative)] diff --git a/codex-rs/execpolicy/src/arg_resolver.rs b/codex-rs/execpolicy/src/arg_resolver.rs index 4342f1b45b..143abce53c 100644 --- a/codex-rs/execpolicy/src/arg_resolver.rs +++ b/codex-rs/execpolicy/src/arg_resolver.rs @@ -1,9 +1,7 @@ use serde::Serialize; -use crate::arg_matcher::ArgMatcher; -use crate::arg_matcher::ArgMatcherCardinality; -use crate::error::Error; -use crate::error::Result; +use crate::arg_matcher::{ArgMatcher, ArgMatcherCardinality}; +use crate::error::{Error, Result}; use crate::valid_exec::MatchedArg; #[derive(Clone, Debug, Eq, PartialEq, Serialize)] diff --git a/codex-rs/execpolicy/src/arg_type.rs b/codex-rs/execpolicy/src/arg_type.rs index e2c826eee9..b03a83bbc2 100644 --- a/codex-rs/execpolicy/src/arg_type.rs +++ b/codex-rs/execpolicy/src/arg_type.rs @@ -1,14 +1,13 @@ #![allow(clippy::needless_lifetimes)] -use crate::error::Error; -use crate::error::Result; -use crate::sed_command::parse_sed_command; use allocative::Allocative; use derive_more::derive::Display; use serde::Serialize; use starlark::any::ProvidesStaticType; -use starlark::values::StarlarkValue; -use starlark::values::starlark_value; +use starlark::values::{StarlarkValue, starlark_value}; + +use crate::error::{Error, Result}; +use crate::sed_command::parse_sed_command; #[derive(Debug, Clone, Display, Eq, PartialEq, ProvidesStaticType, Allocative, Serialize)] #[display("{}", self)] diff --git a/codex-rs/execpolicy/src/error.rs b/codex-rs/execpolicy/src/error.rs index e6443d69dc..792d5ddc78 100644 --- a/codex-rs/execpolicy/src/error.rs +++ b/codex-rs/execpolicy/src/error.rs @@ -1,11 +1,10 @@ use std::path::PathBuf; use serde::Serialize; +use serde_with::{DisplayFromStr, serde_as}; use crate::arg_matcher::ArgMatcher; use crate::arg_resolver::PositionalArg; -use serde_with::DisplayFromStr; -use serde_with::serde_as; pub type Result = std::result::Result; diff --git a/codex-rs/execpolicy/src/execv_checker.rs b/codex-rs/execpolicy/src/execv_checker.rs index e84b92cac0..a560637f33 100644 --- a/codex-rs/execpolicy/src/execv_checker.rs +++ b/codex-rs/execpolicy/src/execv_checker.rs @@ -1,20 +1,15 @@ use std::borrow::Cow; use std::ffi::OsString; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; -use crate::ArgType; -use crate::Error::CannotCanonicalizePath; -use crate::Error::CannotCheckRelativePath; -use crate::Error::ReadablePathNotInReadableFolders; -use crate::Error::WriteablePathNotInWriteableFolders; -use crate::ExecCall; -use crate::MatchedExec; -use crate::Policy; -use crate::Result; -use crate::ValidExec; use path_absolutize::*; +use crate::Error::{ + CannotCanonicalizePath, CannotCheckRelativePath, ReadablePathNotInReadableFolders, + WriteablePathNotInWriteableFolders, +}; +use crate::{ArgType, ExecCall, MatchedExec, Policy, Result, ValidExec}; + macro_rules! check_file_in_folders { ($file:expr, $folders:expr, $error:ident) => { if !$folders.iter().any(|folder| $file.starts_with(folder)) { @@ -141,13 +136,11 @@ fn is_executable_file(path: &str) -> bool { #[cfg(test)] mod tests { + use anyhow::{Result, anyhow}; use tempfile::TempDir; use super::*; - use crate::MatchedArg; - use crate::PolicyParser; - use anyhow::Result; - use anyhow::anyhow; + use crate::{MatchedArg, PolicyParser}; fn setup(fake_cp: &Path) -> ExecvChecker { let source = format!( diff --git a/codex-rs/execpolicy/src/lib.rs b/codex-rs/execpolicy/src/lib.rs index 6f12225981..1c9a8dd541 100644 --- a/codex-rs/execpolicy/src/lib.rs +++ b/codex-rs/execpolicy/src/lib.rs @@ -19,23 +19,17 @@ mod valid_exec; pub use arg_matcher::ArgMatcher; pub use arg_resolver::PositionalArg; pub use arg_type::ArgType; -pub use error::Error; -pub use error::Result; +pub use error::{Error, Result}; pub use exec_call::ExecCall; pub use execv_checker::ExecvChecker; pub use opt::Opt; pub use policy::Policy; pub use policy_parser::PolicyParser; -pub use program::Forbidden; -pub use program::MatchedExec; -pub use program::NegativeExamplePassedCheck; -pub use program::PositiveExampleFailedCheck; -pub use program::ProgramSpec; +pub use program::{ + Forbidden, MatchedExec, NegativeExamplePassedCheck, PositiveExampleFailedCheck, ProgramSpec, +}; pub use sed_command::parse_sed_command; -pub use valid_exec::MatchedArg; -pub use valid_exec::MatchedFlag; -pub use valid_exec::MatchedOpt; -pub use valid_exec::ValidExec; +pub use valid_exec::{MatchedArg, MatchedFlag, MatchedOpt, ValidExec}; const DEFAULT_POLICY: &str = include_str!("default.policy"); diff --git a/codex-rs/execpolicy/src/main.rs b/codex-rs/execpolicy/src/main.rs index 68a72c04ff..f366a529e0 100644 --- a/codex-rs/execpolicy/src/main.rs +++ b/codex-rs/execpolicy/src/main.rs @@ -1,19 +1,14 @@ -use anyhow::Result; -use clap::Parser; -use clap::Subcommand; -use codex_execpolicy::ExecCall; -use codex_execpolicy::MatchedExec; -use codex_execpolicy::Policy; -use codex_execpolicy::PolicyParser; -use codex_execpolicy::ValidExec; -use codex_execpolicy::get_default_policy; -use serde::Deserialize; -use serde::Serialize; -use serde::de; -use starlark::Error as StarlarkError; use std::path::PathBuf; use std::str::FromStr; +use anyhow::Result; +use clap::{Parser, Subcommand}; +use codex_execpolicy::{ + ExecCall, MatchedExec, Policy, PolicyParser, ValidExec, get_default_policy, +}; +use serde::{Deserialize, Serialize, de}; +use starlark::Error as StarlarkError; + const MATCHED_BUT_WRITES_FILES_EXIT_CODE: i32 = 12; const MIGHT_BE_SAFE_EXIT_CODE: i32 = 13; const FORBIDDEN_EXIT_CODE: i32 = 14; diff --git a/codex-rs/execpolicy/src/opt.rs b/codex-rs/execpolicy/src/opt.rs index 2325d99804..098c551634 100644 --- a/codex-rs/execpolicy/src/opt.rs +++ b/codex-rs/execpolicy/src/opt.rs @@ -1,17 +1,14 @@ #![allow(clippy::needless_lifetimes)] -use crate::ArgType; -use crate::starlark::values::ValueLike; use allocative::Allocative; use derive_more::derive::Display; use starlark::any::ProvidesStaticType; -use starlark::values::AllocValue; -use starlark::values::Heap; -use starlark::values::NoSerialize; -use starlark::values::StarlarkValue; -use starlark::values::UnpackValue; -use starlark::values::Value; -use starlark::values::starlark_value; +use starlark::values::{ + AllocValue, Heap, NoSerialize, StarlarkValue, UnpackValue, Value, starlark_value, +}; + +use crate::ArgType; +use crate::starlark::values::ValueLike; /// Command line option that takes a value. #[derive(Clone, Debug, Display, PartialEq, Eq, ProvidesStaticType, NoSerialize, Allocative)] diff --git a/codex-rs/execpolicy/src/policy.rs b/codex-rs/execpolicy/src/policy.rs index 825d6164a5..2a252ecc74 100644 --- a/codex-rs/execpolicy/src/policy.rs +++ b/codex-rs/execpolicy/src/policy.rs @@ -1,16 +1,10 @@ use multimap::MultiMap; -use regex_lite::Error as RegexError; -use regex_lite::Regex; +use regex_lite::{Error as RegexError, Regex}; -use crate::ExecCall; -use crate::Forbidden; -use crate::MatchedExec; -use crate::NegativeExamplePassedCheck; -use crate::ProgramSpec; -use crate::error::Error; -use crate::error::Result; +use crate::error::{Error, Result}; use crate::policy_parser::ForbiddenProgramRegex; use crate::program::PositiveExampleFailedCheck; +use crate::{ExecCall, Forbidden, MatchedExec, NegativeExamplePassedCheck, ProgramSpec}; pub struct Policy { programs: MultiMap, diff --git a/codex-rs/execpolicy/src/policy_parser.rs b/codex-rs/execpolicy/src/policy_parser.rs index b065c109a8..3a378fc137 100644 --- a/codex-rs/execpolicy/src/policy_parser.rs +++ b/codex-rs/execpolicy/src/policy_parser.rs @@ -1,25 +1,22 @@ #![allow(clippy::needless_lifetimes)] -use crate::Opt; -use crate::Policy; -use crate::ProgramSpec; -use crate::arg_matcher::ArgMatcher; -use crate::opt::OptMeta; +use std::cell::RefCell; +use std::collections::HashMap; + use log::info; use multimap::MultiMap; use regex_lite::Regex; use starlark::any::ProvidesStaticType; -use starlark::environment::GlobalsBuilder; -use starlark::environment::LibraryExtension; -use starlark::environment::Module; +use starlark::environment::{GlobalsBuilder, LibraryExtension, Module}; use starlark::eval::Evaluator; -use starlark::syntax::AstModule; -use starlark::syntax::Dialect; +use starlark::syntax::{AstModule, Dialect}; use starlark::values::Heap; use starlark::values::list::UnpackList; use starlark::values::none::NoneType; -use std::cell::RefCell; -use std::collections::HashMap; + +use crate::arg_matcher::ArgMatcher; +use crate::opt::OptMeta; +use crate::{Opt, Policy, ProgramSpec}; pub struct PolicyParser { policy_source: String, diff --git a/codex-rs/execpolicy/src/program.rs b/codex-rs/execpolicy/src/program.rs index d0cec3717b..9c6959a979 100644 --- a/codex-rs/execpolicy/src/program.rs +++ b/codex-rs/execpolicy/src/program.rs @@ -1,19 +1,13 @@ -use serde::Serialize; -use std::collections::HashMap; -use std::collections::HashSet; +use std::collections::{HashMap, HashSet}; + +use serde::Serialize; -use crate::ArgType; -use crate::ExecCall; use crate::arg_matcher::ArgMatcher; -use crate::arg_resolver::PositionalArg; -use crate::arg_resolver::resolve_observed_args_with_patterns; -use crate::error::Error; -use crate::error::Result; -use crate::opt::Opt; -use crate::opt::OptMeta; -use crate::valid_exec::MatchedFlag; -use crate::valid_exec::MatchedOpt; -use crate::valid_exec::ValidExec; +use crate::arg_resolver::{PositionalArg, resolve_observed_args_with_patterns}; +use crate::error::{Error, Result}; +use crate::opt::{Opt, OptMeta}; +use crate::valid_exec::{MatchedFlag, MatchedOpt, ValidExec}; +use crate::{ArgType, ExecCall}; #[derive(Debug)] pub struct ProgramSpec { diff --git a/codex-rs/execpolicy/src/sed_command.rs b/codex-rs/execpolicy/src/sed_command.rs index cc96aa98e7..1dd3d7ef81 100644 --- a/codex-rs/execpolicy/src/sed_command.rs +++ b/codex-rs/execpolicy/src/sed_command.rs @@ -1,5 +1,4 @@ -use crate::error::Error; -use crate::error::Result; +use crate::error::{Error, Result}; pub fn parse_sed_command(sed_command: &str) -> Result<()> { // For now, we parse only commands like `122,202p`. diff --git a/codex-rs/execpolicy/src/valid_exec.rs b/codex-rs/execpolicy/src/valid_exec.rs index 0cc3b239ca..79320ecdbc 100644 --- a/codex-rs/execpolicy/src/valid_exec.rs +++ b/codex-rs/execpolicy/src/valid_exec.rs @@ -1,6 +1,7 @@ +use serde::Serialize; + use crate::arg_type::ArgType; use crate::error::Result; -use serde::Serialize; /// exec() invocation that has been accepted by a `Policy`. #[derive(Clone, Debug, Default, Eq, PartialEq, Serialize)] diff --git a/codex-rs/execpolicy/tests/suite/bad.rs b/codex-rs/execpolicy/tests/suite/bad.rs index 8b6e195fb0..f9ce0cc6b6 100644 --- a/codex-rs/execpolicy/tests/suite/bad.rs +++ b/codex-rs/execpolicy/tests/suite/bad.rs @@ -1,5 +1,4 @@ -use codex_execpolicy::NegativeExamplePassedCheck; -use codex_execpolicy::get_default_policy; +use codex_execpolicy::{NegativeExamplePassedCheck, get_default_policy}; #[test] fn verify_everything_in_bad_list_is_rejected() { diff --git a/codex-rs/execpolicy/tests/suite/cp.rs b/codex-rs/execpolicy/tests/suite/cp.rs index aa19f0b5d5..823aa33492 100644 --- a/codex-rs/execpolicy/tests/suite/cp.rs +++ b/codex-rs/execpolicy/tests/suite/cp.rs @@ -1,15 +1,9 @@ extern crate codex_execpolicy; -use codex_execpolicy::ArgMatcher; -use codex_execpolicy::ArgType; -use codex_execpolicy::Error; -use codex_execpolicy::ExecCall; -use codex_execpolicy::MatchedArg; -use codex_execpolicy::MatchedExec; -use codex_execpolicy::Policy; -use codex_execpolicy::Result; -use codex_execpolicy::ValidExec; -use codex_execpolicy::get_default_policy; +use codex_execpolicy::{ + ArgMatcher, ArgType, Error, ExecCall, MatchedArg, MatchedExec, Policy, Result, ValidExec, + get_default_policy, +}; #[expect(clippy::expect_used)] fn setup() -> Policy { diff --git a/codex-rs/execpolicy/tests/suite/good.rs b/codex-rs/execpolicy/tests/suite/good.rs index 3b7313a335..ef8daf0a3c 100644 --- a/codex-rs/execpolicy/tests/suite/good.rs +++ b/codex-rs/execpolicy/tests/suite/good.rs @@ -1,5 +1,4 @@ -use codex_execpolicy::PositiveExampleFailedCheck; -use codex_execpolicy::get_default_policy; +use codex_execpolicy::{PositiveExampleFailedCheck, get_default_policy}; #[test] fn verify_everything_in_good_list_is_allowed() { diff --git a/codex-rs/execpolicy/tests/suite/head.rs b/codex-rs/execpolicy/tests/suite/head.rs index 3c32ccfbfe..11f2e546a9 100644 --- a/codex-rs/execpolicy/tests/suite/head.rs +++ b/codex-rs/execpolicy/tests/suite/head.rs @@ -1,14 +1,7 @@ -use codex_execpolicy::ArgMatcher; -use codex_execpolicy::ArgType; -use codex_execpolicy::Error; -use codex_execpolicy::ExecCall; -use codex_execpolicy::MatchedArg; -use codex_execpolicy::MatchedExec; -use codex_execpolicy::MatchedOpt; -use codex_execpolicy::Policy; -use codex_execpolicy::Result; -use codex_execpolicy::ValidExec; -use codex_execpolicy::get_default_policy; +use codex_execpolicy::{ + ArgMatcher, ArgType, Error, ExecCall, MatchedArg, MatchedExec, MatchedOpt, Policy, Result, + ValidExec, get_default_policy, +}; extern crate codex_execpolicy; diff --git a/codex-rs/execpolicy/tests/suite/literal.rs b/codex-rs/execpolicy/tests/suite/literal.rs index d849371e3b..4d2734329b 100644 --- a/codex-rs/execpolicy/tests/suite/literal.rs +++ b/codex-rs/execpolicy/tests/suite/literal.rs @@ -1,11 +1,6 @@ -use codex_execpolicy::ArgType; -use codex_execpolicy::Error; -use codex_execpolicy::ExecCall; -use codex_execpolicy::MatchedArg; -use codex_execpolicy::MatchedExec; -use codex_execpolicy::PolicyParser; -use codex_execpolicy::Result; -use codex_execpolicy::ValidExec; +use codex_execpolicy::{ + ArgType, Error, ExecCall, MatchedArg, MatchedExec, PolicyParser, Result, ValidExec, +}; extern crate codex_execpolicy; diff --git a/codex-rs/execpolicy/tests/suite/ls.rs b/codex-rs/execpolicy/tests/suite/ls.rs index e52316c06e..074e396703 100644 --- a/codex-rs/execpolicy/tests/suite/ls.rs +++ b/codex-rs/execpolicy/tests/suite/ls.rs @@ -1,15 +1,9 @@ extern crate codex_execpolicy; -use codex_execpolicy::ArgType; -use codex_execpolicy::Error; -use codex_execpolicy::ExecCall; -use codex_execpolicy::MatchedArg; -use codex_execpolicy::MatchedExec; -use codex_execpolicy::MatchedFlag; -use codex_execpolicy::Policy; -use codex_execpolicy::Result; -use codex_execpolicy::ValidExec; -use codex_execpolicy::get_default_policy; +use codex_execpolicy::{ + ArgType, Error, ExecCall, MatchedArg, MatchedExec, MatchedFlag, Policy, Result, ValidExec, + get_default_policy, +}; #[expect(clippy::expect_used)] fn setup() -> Policy { diff --git a/codex-rs/execpolicy/tests/suite/parse_sed_command.rs b/codex-rs/execpolicy/tests/suite/parse_sed_command.rs index 20f5bbf301..298e7d7961 100644 --- a/codex-rs/execpolicy/tests/suite/parse_sed_command.rs +++ b/codex-rs/execpolicy/tests/suite/parse_sed_command.rs @@ -1,5 +1,4 @@ -use codex_execpolicy::Error; -use codex_execpolicy::parse_sed_command; +use codex_execpolicy::{Error, parse_sed_command}; #[test] fn parses_simple_print_command() { diff --git a/codex-rs/execpolicy/tests/suite/pwd.rs b/codex-rs/execpolicy/tests/suite/pwd.rs index fdf5a4f1a5..695ac94c1f 100644 --- a/codex-rs/execpolicy/tests/suite/pwd.rs +++ b/codex-rs/execpolicy/tests/suite/pwd.rs @@ -2,14 +2,9 @@ extern crate codex_execpolicy; use std::vec; -use codex_execpolicy::Error; -use codex_execpolicy::ExecCall; -use codex_execpolicy::MatchedExec; -use codex_execpolicy::MatchedFlag; -use codex_execpolicy::Policy; -use codex_execpolicy::PositionalArg; -use codex_execpolicy::ValidExec; -use codex_execpolicy::get_default_policy; +use codex_execpolicy::{ + Error, ExecCall, MatchedExec, MatchedFlag, Policy, PositionalArg, ValidExec, get_default_policy, +}; #[expect(clippy::expect_used)] fn setup() -> Policy { diff --git a/codex-rs/execpolicy/tests/suite/sed.rs b/codex-rs/execpolicy/tests/suite/sed.rs index bf35bf6d46..a519d3f53d 100644 --- a/codex-rs/execpolicy/tests/suite/sed.rs +++ b/codex-rs/execpolicy/tests/suite/sed.rs @@ -1,16 +1,9 @@ extern crate codex_execpolicy; -use codex_execpolicy::ArgType; -use codex_execpolicy::Error; -use codex_execpolicy::ExecCall; -use codex_execpolicy::MatchedArg; -use codex_execpolicy::MatchedExec; -use codex_execpolicy::MatchedFlag; -use codex_execpolicy::MatchedOpt; -use codex_execpolicy::Policy; -use codex_execpolicy::Result; -use codex_execpolicy::ValidExec; -use codex_execpolicy::get_default_policy; +use codex_execpolicy::{ + ArgType, Error, ExecCall, MatchedArg, MatchedExec, MatchedFlag, MatchedOpt, Policy, Result, + ValidExec, get_default_policy, +}; #[expect(clippy::expect_used)] fn setup() -> Policy { diff --git a/codex-rs/feedback/src/lib.rs b/codex-rs/feedback/src/lib.rs index e1ccc3aac9..3d6f31b5e6 100644 --- a/codex-rs/feedback/src/lib.rs +++ b/codex-rs/feedback/src/lib.rs @@ -1,14 +1,13 @@ use std::collections::VecDeque; use std::fs; -use std::io::Write; -use std::io::{self}; +use std::io::{ + Write, {self}, +}; use std::path::PathBuf; -use std::sync::Arc; -use std::sync::Mutex; +use std::sync::{Arc, Mutex}; use std::time::Duration; -use anyhow::Result; -use anyhow::anyhow; +use anyhow::{Result, anyhow}; use codex_protocol::ConversationId; use tracing_subscriber::fmt::writer::MakeWriter; @@ -180,15 +179,10 @@ impl CodexLogSnapshot { use std::str::FromStr; use std::sync::Arc; - use sentry::Client; - use sentry::ClientOptions; - use sentry::protocol::Attachment; - use sentry::protocol::Envelope; - use sentry::protocol::EnvelopeItem; - use sentry::protocol::Event; - use sentry::protocol::Level; + use sentry::protocol::{Attachment, Envelope, EnvelopeItem, Event, Level}; use sentry::transports::DefaultTransportFactory; use sentry::types::Dsn; + use sentry::{Client, ClientOptions}; // Build Sentry client let client = Client::from_config(ClientOptions { @@ -226,8 +220,7 @@ impl CodexLogSnapshot { ..Default::default() }; if let Some(r) = reason { - use sentry::protocol::Exception; - use sentry::protocol::Values; + use sentry::protocol::{Exception, Values}; event.exception = Values::from(vec![Exception { ty: title.clone(), diff --git a/codex-rs/file-search/src/cli.rs b/codex-rs/file-search/src/cli.rs index e3394f92da..c9425eb8eb 100644 --- a/codex-rs/file-search/src/cli.rs +++ b/codex-rs/file-search/src/cli.rs @@ -1,8 +1,7 @@ use std::num::NonZero; use std::path::PathBuf; -use clap::ArgAction; -use clap::Parser; +use clap::{ArgAction, Parser}; /// Fuzzy matches filenames under a directory. #[derive(Parser)] diff --git a/codex-rs/file-search/src/lib.rs b/codex-rs/file-search/src/lib.rs index 0afc9ea6a2..286496ec07 100644 --- a/codex-rs/file-search/src/lib.rs +++ b/codex-rs/file-search/src/lib.rs @@ -1,21 +1,16 @@ -use ignore::WalkBuilder; -use ignore::overrides::OverrideBuilder; -use nucleo_matcher::Matcher; -use nucleo_matcher::Utf32Str; -use nucleo_matcher::pattern::AtomKind; -use nucleo_matcher::pattern::CaseMatching; -use nucleo_matcher::pattern::Normalization; -use nucleo_matcher::pattern::Pattern; -use serde::Serialize; use std::cell::UnsafeCell; use std::cmp::Reverse; use std::collections::BinaryHeap; use std::num::NonZero; use std::path::Path; use std::sync::Arc; -use std::sync::atomic::AtomicBool; -use std::sync::atomic::AtomicUsize; -use std::sync::atomic::Ordering; +use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering}; + +use ignore::WalkBuilder; +use ignore::overrides::OverrideBuilder; +use nucleo_matcher::pattern::{AtomKind, CaseMatching, Normalization, Pattern}; +use nucleo_matcher::{Matcher, Utf32Str}; +use serde::Serialize; use tokio::process::Command; mod cli; diff --git a/codex-rs/file-search/src/main.rs b/codex-rs/file-search/src/main.rs index ef39174df5..f4eb30615e 100644 --- a/codex-rs/file-search/src/main.rs +++ b/codex-rs/file-search/src/main.rs @@ -2,10 +2,7 @@ use std::io::IsTerminal; use std::path::Path; use clap::Parser; -use codex_file_search::Cli; -use codex_file_search::FileMatch; -use codex_file_search::Reporter; -use codex_file_search::run_main; +use codex_file_search::{Cli, FileMatch, Reporter, run_main}; use serde_json::json; #[tokio::main] diff --git a/codex-rs/keyring-store/src/lib.rs b/codex-rs/keyring-store/src/lib.rs index 10dad3a98a..17ca4604c3 100644 --- a/codex-rs/keyring-store/src/lib.rs +++ b/codex-rs/keyring-store/src/lib.rs @@ -1,8 +1,8 @@ -use keyring::Entry; -use keyring::Error as KeyringError; use std::error::Error; use std::fmt; use std::fmt::Debug; + +use keyring::{Entry, Error as KeyringError}; use tracing::trace; #[derive(Debug)] @@ -107,15 +107,14 @@ impl KeyringStore for DefaultKeyringStore { } pub mod tests { - use super::CredentialStoreError; - use super::KeyringStore; + use std::collections::HashMap; + use std::sync::{Arc, Mutex, PoisonError}; + use keyring::Error as KeyringError; use keyring::credential::CredentialApi as _; use keyring::mock::MockCredential; - use std::collections::HashMap; - use std::sync::Arc; - use std::sync::Mutex; - use std::sync::PoisonError; + + use super::{CredentialStoreError, KeyringStore}; #[derive(Default, Clone, Debug)] pub struct MockKeyringStore { diff --git a/codex-rs/linux-sandbox/src/landlock.rs b/codex-rs/linux-sandbox/src/landlock.rs index 5bc96130dd..8e4c4761e0 100644 --- a/codex-rs/linux-sandbox/src/landlock.rs +++ b/codex-rs/linux-sandbox/src/landlock.rs @@ -1,29 +1,15 @@ use std::collections::BTreeMap; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; -use codex_core::error::CodexErr; -use codex_core::error::Result; -use codex_core::error::SandboxErr; +use codex_core::error::{CodexErr, Result, SandboxErr}; use codex_core::protocol::SandboxPolicy; - -use landlock::ABI; -use landlock::Access; -use landlock::AccessFs; -use landlock::CompatLevel; -use landlock::Compatible; -use landlock::Ruleset; -use landlock::RulesetAttr; -use landlock::RulesetCreatedAttr; -use seccompiler::BpfProgram; -use seccompiler::SeccompAction; -use seccompiler::SeccompCmpArgLen; -use seccompiler::SeccompCmpOp; -use seccompiler::SeccompCondition; -use seccompiler::SeccompFilter; -use seccompiler::SeccompRule; -use seccompiler::TargetArch; -use seccompiler::apply_filter; +use landlock::{ + ABI, Access, AccessFs, CompatLevel, Compatible, Ruleset, RulesetAttr, RulesetCreatedAttr, +}; +use seccompiler::{ + BpfProgram, SeccompAction, SeccompCmpArgLen, SeccompCmpOp, SeccompCondition, SeccompFilter, + SeccompRule, TargetArch, apply_filter, +}; /// Apply sandbox policies inside this thread so only the child inherits /// them, not the entire CLI process. diff --git a/codex-rs/linux-sandbox/src/linux_run_main.rs b/codex-rs/linux-sandbox/src/linux_run_main.rs index c4b0767fb6..0f1977ba5b 100644 --- a/codex-rs/linux-sandbox/src/linux_run_main.rs +++ b/codex-rs/linux-sandbox/src/linux_run_main.rs @@ -1,7 +1,8 @@ -use clap::Parser; use std::ffi::CString; use std::path::PathBuf; +use clap::Parser; + use crate::landlock::apply_sandbox_policy_to_current_thread; #[derive(Debug, Parser)] diff --git a/codex-rs/linux-sandbox/tests/suite/landlock.rs b/codex-rs/linux-sandbox/tests/suite/landlock.rs index 508dba08cf..7f954b479c 100644 --- a/codex-rs/linux-sandbox/tests/suite/landlock.rs +++ b/codex-rs/linux-sandbox/tests/suite/landlock.rs @@ -1,14 +1,12 @@ #![cfg(target_os = "linux")] -use codex_core::config::types::ShellEnvironmentPolicy; -use codex_core::error::CodexErr; -use codex_core::error::SandboxErr; -use codex_core::exec::ExecParams; -use codex_core::exec::SandboxType; -use codex_core::exec::process_exec_tool_call; -use codex_core::exec_env::create_env; -use codex_core::protocol::SandboxPolicy; use std::collections::HashMap; use std::path::PathBuf; + +use codex_core::config::types::ShellEnvironmentPolicy; +use codex_core::error::{CodexErr, SandboxErr}; +use codex_core::exec::{ExecParams, SandboxType, process_exec_tool_call}; +use codex_core::exec_env::create_env; +use codex_core::protocol::SandboxPolicy; use tempfile::NamedTempFile; // At least on GitHub CI, the arm64 tests appear to need longer timeouts. diff --git a/codex-rs/login/src/device_code_auth.rs b/codex-rs/login/src/device_code_auth.rs index acaf30ba0c..7ad9ea1412 100644 --- a/codex-rs/login/src/device_code_auth.rs +++ b/codex-rs/login/src/device_code_auth.rs @@ -1,15 +1,16 @@ +use std::io::{ + Write, {self}, +}; +use std::time::{Duration, Instant}; + use reqwest::StatusCode; -use serde::Deserialize; -use serde::Serialize; -use serde::de::Deserializer; -use serde::de::{self}; -use std::time::Duration; -use std::time::Instant; +use serde::de::{ + Deserializer, {self}, +}; +use serde::{Deserialize, Serialize}; use crate::pkce::PkceCodes; use crate::server::ServerOptions; -use std::io::Write; -use std::io::{self}; const ANSI_YELLOW: &str = "\x1b[93m"; const ANSI_BOLD: &str = "\x1b[1m"; diff --git a/codex-rs/login/src/lib.rs b/codex-rs/login/src/lib.rs index ac2cd28bea..2b042f09bc 100644 --- a/codex-rs/login/src/lib.rs +++ b/codex-rs/login/src/lib.rs @@ -2,21 +2,13 @@ mod device_code_auth; mod pkce; mod server; -pub use device_code_auth::run_device_code_login; -pub use server::LoginServer; -pub use server::ServerOptions; -pub use server::ShutdownHandle; -pub use server::run_login_server; - // Re-export commonly used auth types and helpers from codex-core for compatibility pub use codex_app_server_protocol::AuthMode; -pub use codex_core::AuthManager; -pub use codex_core::CodexAuth; -pub use codex_core::auth::AuthDotJson; -pub use codex_core::auth::CLIENT_ID; -pub use codex_core::auth::CODEX_API_KEY_ENV_VAR; -pub use codex_core::auth::OPENAI_API_KEY_ENV_VAR; -pub use codex_core::auth::login_with_api_key; -pub use codex_core::auth::logout; -pub use codex_core::auth::save_auth; +pub use codex_core::auth::{ + AuthDotJson, CLIENT_ID, CODEX_API_KEY_ENV_VAR, OPENAI_API_KEY_ENV_VAR, login_with_api_key, + logout, save_auth, +}; pub use codex_core::token_data::TokenData; +pub use codex_core::{AuthManager, CodexAuth}; +pub use device_code_auth::run_device_code_login; +pub use server::{LoginServer, ServerOptions, ShutdownHandle, run_login_server}; diff --git a/codex-rs/login/src/pkce.rs b/codex-rs/login/src/pkce.rs index a0eacfc201..5086553392 100644 --- a/codex-rs/login/src/pkce.rs +++ b/codex-rs/login/src/pkce.rs @@ -1,7 +1,6 @@ use base64::Engine; use rand::RngCore; -use sha2::Digest; -use sha2::Sha256; +use sha2::{Digest, Sha256}; #[derive(Debug, Clone)] pub struct PkceCodes { diff --git a/codex-rs/login/src/server.rs b/codex-rs/login/src/server.rs index 999c19072e..e9909e7bef 100644 --- a/codex-rs/login/src/server.rs +++ b/codex-rs/login/src/server.rs @@ -1,32 +1,22 @@ -use std::io::Cursor; -use std::io::Read; -use std::io::Write; -use std::io::{self}; -use std::net::SocketAddr; -use std::net::TcpStream; -use std::path::Path; -use std::path::PathBuf; +use std::io::{ + Cursor, Read, Write, {self}, +}; +use std::net::{SocketAddr, TcpStream}; +use std::path::{Path, PathBuf}; use std::sync::Arc; use std::thread; use std::time::Duration; -use crate::pkce::PkceCodes; -use crate::pkce::generate_pkce; use base64::Engine; use chrono::Utc; -use codex_core::auth::AuthCredentialsStoreMode; -use codex_core::auth::AuthDotJson; -use codex_core::auth::save_auth; +use codex_core::auth::{AuthCredentialsStoreMode, AuthDotJson, save_auth}; use codex_core::default_client::originator; -use codex_core::token_data::TokenData; -use codex_core::token_data::parse_id_token; +use codex_core::token_data::{TokenData, parse_id_token}; use rand::RngCore; use serde_json::Value as JsonValue; -use tiny_http::Header; -use tiny_http::Request; -use tiny_http::Response; -use tiny_http::Server; -use tiny_http::StatusCode; +use tiny_http::{Header, Request, Response, Server, StatusCode}; + +use crate::pkce::{PkceCodes, generate_pkce}; const DEFAULT_ISSUER: &str = "https://auth.openai.com"; const DEFAULT_PORT: u16 = 1455; diff --git a/codex-rs/login/tests/suite/device_code_login.rs b/codex-rs/login/tests/suite/device_code_login.rs index 266930e419..1588625b7d 100644 --- a/codex-rs/login/tests/suite/device_code_login.rs +++ b/codex-rs/login/tests/suite/device_code_login.rs @@ -1,25 +1,18 @@ #![allow(clippy::unwrap_used)] +use std::sync::Arc; +use std::sync::atomic::{AtomicUsize, Ordering}; + use anyhow::Context; use base64::Engine; use base64::engine::general_purpose::URL_SAFE_NO_PAD; -use codex_core::auth::AuthCredentialsStoreMode; -use codex_core::auth::load_auth_dot_json; -use codex_login::ServerOptions; -use codex_login::run_device_code_login; -use serde_json::json; -use std::sync::Arc; -use std::sync::atomic::AtomicUsize; -use std::sync::atomic::Ordering; -use tempfile::tempdir; -use wiremock::Mock; -use wiremock::MockServer; -use wiremock::Request; -use wiremock::ResponseTemplate; -use wiremock::matchers::method; -use wiremock::matchers::path; - +use codex_core::auth::{AuthCredentialsStoreMode, load_auth_dot_json}; +use codex_login::{ServerOptions, run_device_code_login}; use core_test_support::skip_if_no_network; +use serde_json::json; +use tempfile::tempdir; +use wiremock::matchers::{method, path}; +use wiremock::{Mock, MockServer, Request, ResponseTemplate}; // ---------- Small helpers ---------- diff --git a/codex-rs/login/tests/suite/login_server_e2e.rs b/codex-rs/login/tests/suite/login_server_e2e.rs index 73cb8bd420..77134778d7 100644 --- a/codex-rs/login/tests/suite/login_server_e2e.rs +++ b/codex-rs/login/tests/suite/login_server_e2e.rs @@ -1,15 +1,12 @@ #![allow(clippy::unwrap_used)] -use std::io; -use std::net::SocketAddr; -use std::net::TcpListener; -use std::thread; +use std::net::{SocketAddr, TcpListener}; use std::time::Duration; +use std::{io, thread}; use anyhow::Result; use base64::Engine; use codex_core::auth::AuthCredentialsStoreMode; -use codex_login::ServerOptions; -use codex_login::run_login_server; +use codex_login::{ServerOptions, run_login_server}; use core_test_support::skip_if_no_network; use tempfile::tempdir; diff --git a/codex-rs/mcp-server/src/codex_tool_config.rs b/codex-rs/mcp-server/src/codex_tool_config.rs index 4e61bde02b..c1407ef895 100644 --- a/codex-rs/mcp-server/src/codex_tool_config.rs +++ b/codex-rs/mcp-server/src/codex_tool_config.rs @@ -1,16 +1,15 @@ //! Configuration object accepted by the `codex` MCP tool-call. +use std::collections::HashMap; +use std::path::PathBuf; + use codex_core::protocol::AskForApproval; use codex_protocol::config_types::SandboxMode; use codex_utils_json_to_toml::json_to_toml; -use mcp_types::Tool; -use mcp_types::ToolInputSchema; +use mcp_types::{Tool, ToolInputSchema}; use schemars::JsonSchema; use schemars::r#gen::SchemaSettings; -use serde::Deserialize; -use serde::Serialize; -use std::collections::HashMap; -use std::path::PathBuf; +use serde::{Deserialize, Serialize}; /// Client-supplied configuration for a `codex` tool-call. #[derive(Debug, Clone, Serialize, Deserialize, JsonSchema, Default)] @@ -230,9 +229,10 @@ pub(crate) fn create_tool_for_codex_tool_call_reply_param() -> Tool { #[cfg(test)] mod tests { - use super::*; use pretty_assertions::assert_eq; + use super::*; + /// We include a test to verify the exact JSON schema as "executable /// documentation" for the schema. When can track changes to this test as a /// way to audit changes to the generated schema. diff --git a/codex-rs/mcp-server/src/codex_tool_runner.rs b/codex-rs/mcp-server/src/codex_tool_runner.rs index 96e875153d..fa4e61c9da 100644 --- a/codex-rs/mcp-server/src/codex_tool_runner.rs +++ b/codex-rs/mcp-server/src/codex_tool_runner.rs @@ -5,31 +5,22 @@ use std::collections::HashMap; use std::sync::Arc; -use crate::exec_approval::handle_exec_approval_request; -use crate::outgoing_message::OutgoingMessageSender; -use crate::outgoing_message::OutgoingNotificationMeta; -use crate::patch_approval::handle_patch_approval_request; -use codex_core::CodexConversation; -use codex_core::ConversationManager; -use codex_core::NewConversation; use codex_core::config::Config as CodexConfig; -use codex_core::protocol::AgentMessageEvent; -use codex_core::protocol::ApplyPatchApprovalRequestEvent; -use codex_core::protocol::Event; -use codex_core::protocol::EventMsg; -use codex_core::protocol::ExecApprovalRequestEvent; -use codex_core::protocol::Op; -use codex_core::protocol::Submission; -use codex_core::protocol::TaskCompleteEvent; +use codex_core::protocol::{ + AgentMessageEvent, ApplyPatchApprovalRequestEvent, Event, EventMsg, ExecApprovalRequestEvent, + Op, Submission, TaskCompleteEvent, +}; +use codex_core::{CodexConversation, ConversationManager, NewConversation}; use codex_protocol::ConversationId; use codex_protocol::user_input::UserInput; -use mcp_types::CallToolResult; -use mcp_types::ContentBlock; -use mcp_types::RequestId; -use mcp_types::TextContent; +use mcp_types::{CallToolResult, ContentBlock, RequestId, TextContent}; use serde_json::json; use tokio::sync::Mutex; +use crate::exec_approval::handle_exec_approval_request; +use crate::outgoing_message::{OutgoingMessageSender, OutgoingNotificationMeta}; +use crate::patch_approval::handle_patch_approval_request; + pub(crate) const INVALID_PARAMS_ERROR_CODE: i64 = -32602; /// Run a complete Codex session and stream events back to the client. diff --git a/codex-rs/mcp-server/src/exec_approval.rs b/codex-rs/mcp-server/src/exec_approval.rs index 033523ac0d..98fe2c5be4 100644 --- a/codex-rs/mcp-server/src/exec_approval.rs +++ b/codex-rs/mcp-server/src/exec_approval.rs @@ -2,17 +2,13 @@ use std::path::PathBuf; use std::sync::Arc; use codex_core::CodexConversation; -use codex_core::protocol::Op; -use codex_core::protocol::ReviewDecision; -use codex_core::protocol::SandboxCommandAssessment; +use codex_core::protocol::{Op, ReviewDecision, SandboxCommandAssessment}; use codex_protocol::parse_command::ParsedCommand; -use mcp_types::ElicitRequest; -use mcp_types::ElicitRequestParamsRequestedSchema; -use mcp_types::JSONRPCErrorError; -use mcp_types::ModelContextProtocolRequest; -use mcp_types::RequestId; -use serde::Deserialize; -use serde::Serialize; +use mcp_types::{ + ElicitRequest, ElicitRequestParamsRequestedSchema, JSONRPCErrorError, + ModelContextProtocolRequest, RequestId, +}; +use serde::{Deserialize, Serialize}; use serde_json::json; use tracing::error; diff --git a/codex-rs/mcp-server/src/lib.rs b/codex-rs/mcp-server/src/lib.rs index 8da5b405e2..e8643ea9d2 100644 --- a/codex-rs/mcp-server/src/lib.rs +++ b/codex-rs/mcp-server/src/lib.rs @@ -1,23 +1,17 @@ //! Prototype MCP server. #![deny(clippy::print_stdout, clippy::print_stderr)] -use std::io::ErrorKind; -use std::io::Result as IoResult; +use std::io::{ErrorKind, Result as IoResult}; use std::path::PathBuf; use codex_common::CliConfigOverrides; -use codex_core::config::Config; -use codex_core::config::ConfigOverrides; - +use codex_core::config::{Config, ConfigOverrides}; use mcp_types::JSONRPCMessage; -use tokio::io::AsyncBufReadExt; -use tokio::io::AsyncWriteExt; -use tokio::io::BufReader; -use tokio::io::{self}; +use tokio::io::{ + AsyncBufReadExt, AsyncWriteExt, BufReader, {self}, +}; use tokio::sync::mpsc; -use tracing::debug; -use tracing::error; -use tracing::info; +use tracing::{debug, error, info}; use tracing_subscriber::EnvFilter; mod codex_tool_config; @@ -28,16 +22,11 @@ pub(crate) mod message_processor; mod outgoing_message; mod patch_approval; +pub use crate::codex_tool_config::{CodexToolCallParam, CodexToolCallReplyParam}; +pub use crate::exec_approval::{ExecApprovalElicitRequestParams, ExecApprovalResponse}; use crate::message_processor::MessageProcessor; -use crate::outgoing_message::OutgoingMessage; -use crate::outgoing_message::OutgoingMessageSender; - -pub use crate::codex_tool_config::CodexToolCallParam; -pub use crate::codex_tool_config::CodexToolCallReplyParam; -pub use crate::exec_approval::ExecApprovalElicitRequestParams; -pub use crate::exec_approval::ExecApprovalResponse; -pub use crate::patch_approval::PatchApprovalElicitRequestParams; -pub use crate::patch_approval::PatchApprovalResponse; +use crate::outgoing_message::{OutgoingMessage, OutgoingMessageSender}; +pub use crate::patch_approval::{PatchApprovalElicitRequestParams, PatchApprovalResponse}; /// Size of the bounded channels used to communicate between tasks. The value /// is a balance between throughput and memory usage – 128 messages should be diff --git a/codex-rs/mcp-server/src/message_processor.rs b/codex-rs/mcp-server/src/message_processor.rs index 81eb80764b..1fd32fa3a0 100644 --- a/codex-rs/mcp-server/src/message_processor.rs +++ b/codex-rs/mcp-server/src/message_processor.rs @@ -1,41 +1,30 @@ use std::collections::HashMap; use std::path::PathBuf; +use std::sync::Arc; -use crate::codex_tool_config::CodexToolCallParam; -use crate::codex_tool_config::CodexToolCallReplyParam; -use crate::codex_tool_config::create_tool_for_codex_tool_call_param; -use crate::codex_tool_config::create_tool_for_codex_tool_call_reply_param; -use crate::error_code::INVALID_REQUEST_ERROR_CODE; -use crate::outgoing_message::OutgoingMessageSender; +use codex_core::config::Config; +use codex_core::default_client::{USER_AGENT_SUFFIX, get_codex_user_agent}; +use codex_core::protocol::Submission; +use codex_core::{AuthManager, ConversationManager}; use codex_protocol::ConversationId; use codex_protocol::protocol::SessionSource; - -use codex_core::AuthManager; -use codex_core::ConversationManager; -use codex_core::config::Config; -use codex_core::default_client::USER_AGENT_SUFFIX; -use codex_core::default_client::get_codex_user_agent; -use codex_core::protocol::Submission; -use mcp_types::CallToolRequestParams; -use mcp_types::CallToolResult; -use mcp_types::ClientRequest as McpClientRequest; -use mcp_types::ContentBlock; -use mcp_types::JSONRPCError; -use mcp_types::JSONRPCErrorError; -use mcp_types::JSONRPCNotification; -use mcp_types::JSONRPCRequest; -use mcp_types::JSONRPCResponse; -use mcp_types::ListToolsResult; -use mcp_types::ModelContextProtocolRequest; -use mcp_types::RequestId; -use mcp_types::ServerCapabilitiesTools; -use mcp_types::ServerNotification; -use mcp_types::TextContent; +use mcp_types::{ + CallToolRequestParams, CallToolResult, ClientRequest as McpClientRequest, ContentBlock, + JSONRPCError, JSONRPCErrorError, JSONRPCNotification, JSONRPCRequest, JSONRPCResponse, + ListToolsResult, ModelContextProtocolRequest, RequestId, ServerCapabilitiesTools, + ServerNotification, TextContent, +}; use serde_json::json; -use std::sync::Arc; use tokio::sync::Mutex; use tokio::task; +use crate::codex_tool_config::{ + CodexToolCallParam, CodexToolCallReplyParam, create_tool_for_codex_tool_call_param, + create_tool_for_codex_tool_call_reply_param, +}; +use crate::error_code::INVALID_REQUEST_ERROR_CODE; +use crate::outgoing_message::OutgoingMessageSender; + pub(crate) struct MessageProcessor { outgoing: Arc, initialized: bool, diff --git a/codex-rs/mcp-server/src/outgoing_message.rs b/codex-rs/mcp-server/src/outgoing_message.rs index 4b6782d8de..a607ab9ac6 100644 --- a/codex-rs/mcp-server/src/outgoing_message.rs +++ b/codex-rs/mcp-server/src/outgoing_message.rs @@ -1,21 +1,13 @@ use std::collections::HashMap; -use std::sync::atomic::AtomicI64; -use std::sync::atomic::Ordering; +use std::sync::atomic::{AtomicI64, Ordering}; use codex_core::protocol::Event; -use mcp_types::JSONRPC_VERSION; -use mcp_types::JSONRPCError; -use mcp_types::JSONRPCErrorError; -use mcp_types::JSONRPCMessage; -use mcp_types::JSONRPCNotification; -use mcp_types::JSONRPCRequest; -use mcp_types::JSONRPCResponse; -use mcp_types::RequestId; -use mcp_types::Result; +use mcp_types::{ + JSONRPC_VERSION, JSONRPCError, JSONRPCErrorError, JSONRPCMessage, JSONRPCNotification, + JSONRPCRequest, JSONRPCResponse, RequestId, Result, +}; use serde::Serialize; -use tokio::sync::Mutex; -use tokio::sync::mpsc; -use tokio::sync::oneshot; +use tokio::sync::{Mutex, mpsc, oneshot}; use tracing::warn; use crate::error_code::INTERNAL_ERROR_CODE; @@ -232,8 +224,7 @@ pub(crate) struct OutgoingError { #[cfg(test)] mod tests { use anyhow::Result; - use codex_core::protocol::EventMsg; - use codex_core::protocol::SessionConfiguredEvent; + use codex_core::protocol::{EventMsg, SessionConfiguredEvent}; use codex_protocol::ConversationId; use codex_protocol::config_types::ReasoningEffort; use pretty_assertions::assert_eq; diff --git a/codex-rs/mcp-server/src/patch_approval.rs b/codex-rs/mcp-server/src/patch_approval.rs index 3c614ab331..a87009bb4c 100644 --- a/codex-rs/mcp-server/src/patch_approval.rs +++ b/codex-rs/mcp-server/src/patch_approval.rs @@ -3,16 +3,12 @@ use std::path::PathBuf; use std::sync::Arc; use codex_core::CodexConversation; -use codex_core::protocol::FileChange; -use codex_core::protocol::Op; -use codex_core::protocol::ReviewDecision; -use mcp_types::ElicitRequest; -use mcp_types::ElicitRequestParamsRequestedSchema; -use mcp_types::JSONRPCErrorError; -use mcp_types::ModelContextProtocolRequest; -use mcp_types::RequestId; -use serde::Deserialize; -use serde::Serialize; +use codex_core::protocol::{FileChange, Op, ReviewDecision}; +use mcp_types::{ + ElicitRequest, ElicitRequestParamsRequestedSchema, JSONRPCErrorError, + ModelContextProtocolRequest, RequestId, +}; +use serde::{Deserialize, Serialize}; use serde_json::json; use tracing::error; diff --git a/codex-rs/mcp-server/tests/common/lib.rs b/codex-rs/mcp-server/tests/common/lib.rs index d088b184ea..d157b3bec4 100644 --- a/codex-rs/mcp-server/tests/common/lib.rs +++ b/codex-rs/mcp-server/tests/common/lib.rs @@ -5,9 +5,10 @@ mod responses; pub use mcp_process::McpProcess; use mcp_types::JSONRPCResponse; pub use mock_model_server::create_mock_chat_completions_server; -pub use responses::create_apply_patch_sse_response; -pub use responses::create_final_assistant_message_sse_response; -pub use responses::create_shell_sse_response; +pub use responses::{ + create_apply_patch_sse_response, create_final_assistant_message_sse_response, + create_shell_sse_response, +}; use serde::de::DeserializeOwned; pub fn to_response(response: JSONRPCResponse) -> anyhow::Result { diff --git a/codex-rs/mcp-server/tests/common/mcp_process.rs b/codex-rs/mcp-server/tests/common/mcp_process.rs index a6bc966d7e..c533e791be 100644 --- a/codex-rs/mcp-server/tests/common/mcp_process.rs +++ b/codex-rs/mcp-server/tests/common/mcp_process.rs @@ -1,34 +1,19 @@ use std::path::Path; -use std::process::Stdio; -use std::sync::atomic::AtomicI64; -use std::sync::atomic::Ordering; -use tokio::io::AsyncBufReadExt; -use tokio::io::AsyncWriteExt; -use tokio::io::BufReader; -use tokio::process::Child; -use tokio::process::ChildStdin; -use tokio::process::ChildStdout; +use std::process::{Command as StdCommand, Stdio}; +use std::sync::atomic::{AtomicI64, Ordering}; use anyhow::Context; use assert_cmd::prelude::*; use codex_mcp_server::CodexToolCallParam; - -use mcp_types::CallToolRequestParams; -use mcp_types::ClientCapabilities; -use mcp_types::Implementation; -use mcp_types::InitializeRequestParams; -use mcp_types::JSONRPC_VERSION; -use mcp_types::JSONRPCMessage; -use mcp_types::JSONRPCNotification; -use mcp_types::JSONRPCRequest; -use mcp_types::JSONRPCResponse; -use mcp_types::ModelContextProtocolNotification; -use mcp_types::ModelContextProtocolRequest; -use mcp_types::RequestId; +use mcp_types::{ + CallToolRequestParams, ClientCapabilities, Implementation, InitializeRequestParams, + JSONRPC_VERSION, JSONRPCMessage, JSONRPCNotification, JSONRPCRequest, JSONRPCResponse, + ModelContextProtocolNotification, ModelContextProtocolRequest, RequestId, +}; use pretty_assertions::assert_eq; use serde_json::json; -use std::process::Command as StdCommand; -use tokio::process::Command; +use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader}; +use tokio::process::{Child, ChildStdin, ChildStdout, Command}; pub struct McpProcess { next_request_id: AtomicI64, diff --git a/codex-rs/mcp-server/tests/common/mock_model_server.rs b/codex-rs/mcp-server/tests/common/mock_model_server.rs index be7f3eb5b3..5485435f1a 100644 --- a/codex-rs/mcp-server/tests/common/mock_model_server.rs +++ b/codex-rs/mcp-server/tests/common/mock_model_server.rs @@ -1,12 +1,7 @@ -use std::sync::atomic::AtomicUsize; -use std::sync::atomic::Ordering; +use std::sync::atomic::{AtomicUsize, Ordering}; -use wiremock::Mock; -use wiremock::MockServer; -use wiremock::Respond; -use wiremock::ResponseTemplate; -use wiremock::matchers::method; -use wiremock::matchers::path; +use wiremock::matchers::{method, path}; +use wiremock::{Mock, MockServer, Respond, ResponseTemplate}; /// Create a mock server that will provide the responses, in order, for /// requests to the `/v1/chat/completions` endpoint. diff --git a/codex-rs/mcp-server/tests/common/responses.rs b/codex-rs/mcp-server/tests/common/responses.rs index 9a827fb986..55af7dfb97 100644 --- a/codex-rs/mcp-server/tests/common/responses.rs +++ b/codex-rs/mcp-server/tests/common/responses.rs @@ -1,6 +1,7 @@ -use serde_json::json; use std::path::Path; +use serde_json::json; + pub fn create_shell_sse_response( command: Vec, workdir: Option<&Path>, diff --git a/codex-rs/mcp-server/tests/suite/codex_tool.rs b/codex-rs/mcp-server/tests/suite/codex_tool.rs index ae0c23f1d8..e8b0b6cca7 100644 --- a/codex-rs/mcp-server/tests/suite/codex_tool.rs +++ b/codex-rs/mcp-server/tests/suite/codex_tool.rs @@ -1,37 +1,29 @@ use std::collections::HashMap; use std::env; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use codex_core::parse_command; -use codex_core::protocol::FileChange; -use codex_core::protocol::ReviewDecision; +use codex_core::protocol::{FileChange, ReviewDecision}; use codex_core::spawn::CODEX_SANDBOX_NETWORK_DISABLED_ENV_VAR; -use codex_mcp_server::CodexToolCallParam; -use codex_mcp_server::ExecApprovalElicitRequestParams; -use codex_mcp_server::ExecApprovalResponse; -use codex_mcp_server::PatchApprovalElicitRequestParams; -use codex_mcp_server::PatchApprovalResponse; -use mcp_types::ElicitRequest; -use mcp_types::ElicitRequestParamsRequestedSchema; -use mcp_types::JSONRPC_VERSION; -use mcp_types::JSONRPCRequest; -use mcp_types::JSONRPCResponse; -use mcp_types::ModelContextProtocolRequest; -use mcp_types::RequestId; +use codex_mcp_server::{ + CodexToolCallParam, ExecApprovalElicitRequestParams, ExecApprovalResponse, + PatchApprovalElicitRequestParams, PatchApprovalResponse, +}; +use core_test_support::skip_if_no_network; +use mcp_test_support::{ + McpProcess, create_apply_patch_sse_response, create_final_assistant_message_sse_response, + create_mock_chat_completions_server, create_shell_sse_response, +}; +use mcp_types::{ + ElicitRequest, ElicitRequestParamsRequestedSchema, JSONRPC_VERSION, JSONRPCRequest, + JSONRPCResponse, ModelContextProtocolRequest, RequestId, +}; use pretty_assertions::assert_eq; use serde_json::json; use tempfile::TempDir; use tokio::time::timeout; use wiremock::MockServer; -use core_test_support::skip_if_no_network; -use mcp_test_support::McpProcess; -use mcp_test_support::create_apply_patch_sse_response; -use mcp_test_support::create_final_assistant_message_sse_response; -use mcp_test_support::create_mock_chat_completions_server; -use mcp_test_support::create_shell_sse_response; - // Allow ample time on slower CI or under load to avoid flakes. const DEFAULT_READ_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(20); diff --git a/codex-rs/mcp-types/src/lib.rs b/codex-rs/mcp-types/src/lib.rs index e390322fc8..5deae62e1c 100644 --- a/codex-rs/mcp-types/src/lib.rs +++ b/codex-rs/mcp-types/src/lib.rs @@ -5,12 +5,11 @@ // ```shell // ./generate_mcp_types.py // ``` -use serde::Deserialize; -use serde::Serialize; -use serde::de::DeserializeOwned; use std::convert::TryFrom; use schemars::JsonSchema; +use serde::de::DeserializeOwned; +use serde::{Deserialize, Serialize}; use ts_rs::TS; pub const MCP_SCHEMA_VERSION: &str = "2025-06-18"; diff --git a/codex-rs/mcp-types/tests/suite/initialize.rs b/codex-rs/mcp-types/tests/suite/initialize.rs index 73ff120274..1cee624177 100644 --- a/codex-rs/mcp-types/tests/suite/initialize.rs +++ b/codex-rs/mcp-types/tests/suite/initialize.rs @@ -1,11 +1,7 @@ -use mcp_types::ClientCapabilities; -use mcp_types::ClientRequest; -use mcp_types::Implementation; -use mcp_types::InitializeRequestParams; -use mcp_types::JSONRPC_VERSION; -use mcp_types::JSONRPCMessage; -use mcp_types::JSONRPCRequest; -use mcp_types::RequestId; +use mcp_types::{ + ClientCapabilities, ClientRequest, Implementation, InitializeRequestParams, JSONRPC_VERSION, + JSONRPCMessage, JSONRPCRequest, RequestId, +}; use serde_json::json; #[test] diff --git a/codex-rs/mcp-types/tests/suite/progress_notification.rs b/codex-rs/mcp-types/tests/suite/progress_notification.rs index 396efca2bd..a4bbea741a 100644 --- a/codex-rs/mcp-types/tests/suite/progress_notification.rs +++ b/codex-rs/mcp-types/tests/suite/progress_notification.rs @@ -1,7 +1,4 @@ -use mcp_types::JSONRPCMessage; -use mcp_types::ProgressNotificationParams; -use mcp_types::ProgressToken; -use mcp_types::ServerNotification; +use mcp_types::{JSONRPCMessage, ProgressNotificationParams, ProgressToken, ServerNotification}; #[test] fn deserialize_progress_notification() { diff --git a/codex-rs/ollama/src/client.rs b/codex-rs/ollama/src/client.rs index 04b7e9dea2..21edcdb785 100644 --- a/codex-rs/ollama/src/client.rs +++ b/codex-rs/ollama/src/client.rs @@ -1,19 +1,16 @@ -use bytes::BytesMut; -use futures::StreamExt; -use futures::stream::BoxStream; -use serde_json::Value as JsonValue; use std::collections::VecDeque; use std::io; -use crate::parser::pull_events_from_value; -use crate::pull::PullEvent; -use crate::pull::PullProgressReporter; -use crate::url::base_url_to_host_root; -use crate::url::is_openai_compatible_base_url; -use codex_core::BUILT_IN_OSS_MODEL_PROVIDER_ID; -use codex_core::ModelProviderInfo; -use codex_core::WireApi; +use bytes::BytesMut; use codex_core::config::Config; +use codex_core::{BUILT_IN_OSS_MODEL_PROVIDER_ID, ModelProviderInfo, WireApi}; +use futures::StreamExt; +use futures::stream::BoxStream; +use serde_json::Value as JsonValue; + +use crate::parser::pull_events_from_value; +use crate::pull::{PullEvent, PullProgressReporter}; +use crate::url::{base_url_to_host_root, is_openai_compatible_base_url}; const OLLAMA_CONNECTION_ERROR: &str = "No running Ollama server detected. Start it with: `ollama serve` (after installing). Install instructions: https://github.com/ollama/ollama?tab=readme-ov-file#ollama"; diff --git a/codex-rs/ollama/src/lib.rs b/codex-rs/ollama/src/lib.rs index 0ebf1662ac..ef3e23262e 100644 --- a/codex-rs/ollama/src/lib.rs +++ b/codex-rs/ollama/src/lib.rs @@ -5,10 +5,7 @@ mod url; pub use client::OllamaClient; use codex_core::config::Config; -pub use pull::CliProgressReporter; -pub use pull::PullEvent; -pub use pull::PullProgressReporter; -pub use pull::TuiProgressReporter; +pub use pull::{CliProgressReporter, PullEvent, PullProgressReporter, TuiProgressReporter}; /// Default OSS model to use when `--oss` is passed without an explicit `-m`. pub const DEFAULT_OSS_MODEL: &str = "gpt-oss:20b"; diff --git a/codex-rs/otel/src/otel_event_manager.rs b/codex-rs/otel/src/otel_event_manager.rs index 5d9cbd4997..7b6b1443a1 100644 --- a/codex-rs/otel/src/otel_event_manager.rs +++ b/codex-rs/otel/src/otel_event_manager.rs @@ -1,24 +1,17 @@ -use chrono::SecondsFormat; -use chrono::Utc; -use codex_app_server_protocol::AuthMode; -use codex_protocol::ConversationId; -use codex_protocol::config_types::ReasoningEffort; -use codex_protocol::config_types::ReasoningSummary; -use codex_protocol::models::ResponseItem; -use codex_protocol::protocol::AskForApproval; -use codex_protocol::protocol::ReviewDecision; -use codex_protocol::protocol::SandboxPolicy; -use codex_protocol::protocol::SandboxRiskLevel; -use codex_protocol::user_input::UserInput; -use eventsource_stream::Event as StreamEvent; -use eventsource_stream::EventStreamError as StreamError; -use reqwest::Error; -use reqwest::Response; -use serde::Serialize; use std::borrow::Cow; use std::fmt::Display; -use std::time::Duration; -use std::time::Instant; +use std::time::{Duration, Instant}; + +use chrono::{SecondsFormat, Utc}; +use codex_app_server_protocol::AuthMode; +use codex_protocol::ConversationId; +use codex_protocol::config_types::{ReasoningEffort, ReasoningSummary}; +use codex_protocol::models::ResponseItem; +use codex_protocol::protocol::{AskForApproval, ReviewDecision, SandboxPolicy, SandboxRiskLevel}; +use codex_protocol::user_input::UserInput; +use eventsource_stream::{Event as StreamEvent, EventStreamError as StreamError}; +use reqwest::{Error, Response}; +use serde::Serialize; use strum_macros::Display; use tokio::time::error::Elapsed; diff --git a/codex-rs/otel/src/otel_provider.rs b/codex-rs/otel/src/otel_provider.rs index 222322a2ea..4203571953 100644 --- a/codex-rs/otel/src/otel_provider.rs +++ b/codex-rs/otel/src/otel_provider.rs @@ -1,22 +1,18 @@ -use crate::config::OtelExporter; -use crate::config::OtelHttpProtocol; -use crate::config::OtelSettings; +use std::error::Error; + use opentelemetry::KeyValue; -use opentelemetry_otlp::LogExporter; -use opentelemetry_otlp::Protocol; -use opentelemetry_otlp::WithExportConfig; -use opentelemetry_otlp::WithHttpConfig; -use opentelemetry_otlp::WithTonicConfig; +use opentelemetry_otlp::{ + LogExporter, Protocol, WithExportConfig, WithHttpConfig, WithTonicConfig, +}; use opentelemetry_sdk::Resource; use opentelemetry_sdk::logs::SdkLoggerProvider; use opentelemetry_semantic_conventions as semconv; -use reqwest::header::HeaderMap; -use reqwest::header::HeaderName; -use reqwest::header::HeaderValue; -use std::error::Error; +use reqwest::header::{HeaderMap, HeaderName, HeaderValue}; use tonic::metadata::MetadataMap; use tracing::debug; +use crate::config::{OtelExporter, OtelHttpProtocol, OtelSettings}; + const ENV_ATTRIBUTE: &str = "env"; pub struct OtelProvider { diff --git a/codex-rs/protocol-ts/src/lib.rs b/codex-rs/protocol-ts/src/lib.rs index 224fdd2d07..1d28ddbf1c 100644 --- a/codex-rs/protocol-ts/src/lib.rs +++ b/codex-rs/protocol-ts/src/lib.rs @@ -1,19 +1,14 @@ -use anyhow::Context; -use anyhow::Result; -use anyhow::anyhow; -use codex_app_server_protocol::ClientNotification; -use codex_app_server_protocol::ClientRequest; -use codex_app_server_protocol::ServerNotification; -use codex_app_server_protocol::ServerRequest; -use codex_app_server_protocol::export_client_responses; -use codex_app_server_protocol::export_server_responses; use std::ffi::OsStr; use std::fs; -use std::io::Read; -use std::io::Write; -use std::path::Path; -use std::path::PathBuf; +use std::io::{Read, Write}; +use std::path::{Path, PathBuf}; use std::process::Command; + +use anyhow::{Context, Result, anyhow}; +use codex_app_server_protocol::{ + ClientNotification, ClientRequest, ServerNotification, ServerRequest, export_client_responses, + export_server_responses, +}; use ts_rs::TS; const HEADER: &str = "// GENERATED CODE! DO NOT MODIFY BY HAND!\n\n"; diff --git a/codex-rs/protocol-ts/src/main.rs b/codex-rs/protocol-ts/src/main.rs index f477b9f5a6..4b010bfa6c 100644 --- a/codex-rs/protocol-ts/src/main.rs +++ b/codex-rs/protocol-ts/src/main.rs @@ -1,6 +1,7 @@ +use std::path::PathBuf; + use anyhow::Result; use clap::Parser; -use std::path::PathBuf; #[derive(Parser, Debug)] #[command(about = "Generate TypeScript bindings for the Codex protocol")] diff --git a/codex-rs/protocol/src/account.rs b/codex-rs/protocol/src/account.rs index fb707c3a73..85197eb779 100644 --- a/codex-rs/protocol/src/account.rs +++ b/codex-rs/protocol/src/account.rs @@ -1,6 +1,5 @@ use schemars::JsonSchema; -use serde::Deserialize; -use serde::Serialize; +use serde::{Deserialize, Serialize}; use ts_rs::TS; #[derive(Serialize, Deserialize, Copy, Clone, Debug, PartialEq, Eq, JsonSchema, TS, Default)] diff --git a/codex-rs/protocol/src/approvals.rs b/codex-rs/protocol/src/approvals.rs index 3227ddd1a3..7aac10cdf7 100644 --- a/codex-rs/protocol/src/approvals.rs +++ b/codex-rs/protocol/src/approvals.rs @@ -1,12 +1,12 @@ use std::collections::HashMap; use std::path::PathBuf; +use schemars::JsonSchema; +use serde::{Deserialize, Serialize}; +use ts_rs::TS; + use crate::parse_command::ParsedCommand; use crate::protocol::FileChange; -use schemars::JsonSchema; -use serde::Deserialize; -use serde::Serialize; -use ts_rs::TS; #[derive(Debug, Clone, Copy, Deserialize, Serialize, PartialEq, Eq, Hash, JsonSchema, TS)] #[serde(rename_all = "snake_case")] diff --git a/codex-rs/protocol/src/config_types.rs b/codex-rs/protocol/src/config_types.rs index 32950527bc..8e173a5a0e 100644 --- a/codex-rs/protocol/src/config_types.rs +++ b/codex-rs/protocol/src/config_types.rs @@ -1,8 +1,6 @@ use schemars::JsonSchema; -use serde::Deserialize; -use serde::Serialize; -use strum_macros::Display; -use strum_macros::EnumIter; +use serde::{Deserialize, Serialize}; +use strum_macros::{Display, EnumIter}; use ts_rs::TS; /// See https://platform.openai.com/docs/guides/reasoning?api-mode=responses#get-started-with-reasoning diff --git a/codex-rs/protocol/src/conversation_id.rs b/codex-rs/protocol/src/conversation_id.rs index db104d4531..140b4f24cd 100644 --- a/codex-rs/protocol/src/conversation_id.rs +++ b/codex-rs/protocol/src/conversation_id.rs @@ -3,8 +3,7 @@ use std::fmt::Display; use schemars::JsonSchema; use schemars::r#gen::SchemaGenerator; use schemars::schema::Schema; -use serde::Deserialize; -use serde::Serialize; +use serde::{Deserialize, Serialize}; use ts_rs::TS; use uuid::Uuid; diff --git a/codex-rs/protocol/src/custom_prompts.rs b/codex-rs/protocol/src/custom_prompts.rs index 7472d1b4c5..64eeedd254 100644 --- a/codex-rs/protocol/src/custom_prompts.rs +++ b/codex-rs/protocol/src/custom_prompts.rs @@ -1,7 +1,7 @@ -use schemars::JsonSchema; -use serde::Deserialize; -use serde::Serialize; use std::path::PathBuf; + +use schemars::JsonSchema; +use serde::{Deserialize, Serialize}; use ts_rs::TS; /// Base namespace for custom prompt slash commands (without trailing colon). diff --git a/codex-rs/protocol/src/items.rs b/codex-rs/protocol/src/items.rs index 27a9b94743..ac9e70894f 100644 --- a/codex-rs/protocol/src/items.rs +++ b/codex-rs/protocol/src/items.rs @@ -1,15 +1,13 @@ -use crate::protocol::AgentMessageEvent; -use crate::protocol::AgentReasoningEvent; -use crate::protocol::AgentReasoningRawContentEvent; -use crate::protocol::EventMsg; -use crate::protocol::UserMessageEvent; -use crate::protocol::WebSearchEndEvent; -use crate::user_input::UserInput; use schemars::JsonSchema; -use serde::Deserialize; -use serde::Serialize; +use serde::{Deserialize, Serialize}; use ts_rs::TS; +use crate::protocol::{ + AgentMessageEvent, AgentReasoningEvent, AgentReasoningRawContentEvent, EventMsg, + UserMessageEvent, WebSearchEndEvent, +}; +use crate::user_input::UserInput; + #[derive(Debug, Clone, Deserialize, Serialize, TS, JsonSchema)] pub enum TurnItem { UserMessage(UserMessageItem), diff --git a/codex-rs/protocol/src/message_history.rs b/codex-rs/protocol/src/message_history.rs index 0d8bd8df4e..86ca1e6c4f 100644 --- a/codex-rs/protocol/src/message_history.rs +++ b/codex-rs/protocol/src/message_history.rs @@ -1,6 +1,5 @@ use schemars::JsonSchema; -use serde::Deserialize; -use serde::Serialize; +use serde::{Deserialize, Serialize}; use ts_rs::TS; #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema, TS)] diff --git a/codex-rs/protocol/src/models.rs b/codex-rs/protocol/src/models.rs index a824ee91e4..dfe1ebc1e6 100644 --- a/codex-rs/protocol/src/models.rs +++ b/codex-rs/protocol/src/models.rs @@ -1,19 +1,16 @@ use std::collections::HashMap; use base64::Engine; +use codex_git::GhostCommit; +use codex_utils_image::error::ImageProcessingError; use codex_utils_image::load_and_resize_to_fit; -use mcp_types::CallToolResult; -use mcp_types::ContentBlock; -use serde::Deserialize; -use serde::Deserializer; -use serde::Serialize; +use mcp_types::{CallToolResult, ContentBlock}; +use schemars::JsonSchema; use serde::ser::Serializer; +use serde::{Deserialize, Deserializer, Serialize}; use ts_rs::TS; use crate::user_input::UserInput; -use codex_git::GhostCommit; -use codex_utils_image::error::ImageProcessingError; -use schemars::JsonSchema; #[derive(Debug, Clone, Serialize, Deserialize, PartialEq, JsonSchema, TS)] #[serde(tag = "type", rename_all = "snake_case")] @@ -483,12 +480,12 @@ impl std::ops::Deref for FunctionCallOutputPayload { #[cfg(test)] mod tests { - use super::*; use anyhow::Result; - use mcp_types::ImageContent; - use mcp_types::TextContent; + use mcp_types::{ImageContent, TextContent}; use tempfile::tempdir; + use super::*; + #[test] fn serializes_success_as_plain_string() -> Result<()> { let item = ResponseInputItem::FunctionCallOutput { diff --git a/codex-rs/protocol/src/parse_command.rs b/codex-rs/protocol/src/parse_command.rs index 77926f11b6..b6c473ca09 100644 --- a/codex-rs/protocol/src/parse_command.rs +++ b/codex-rs/protocol/src/parse_command.rs @@ -1,7 +1,7 @@ -use schemars::JsonSchema; -use serde::Deserialize; -use serde::Serialize; use std::path::PathBuf; + +use schemars::JsonSchema; +use serde::{Deserialize, Serialize}; use ts_rs::TS; #[derive(Debug, Clone, PartialEq, Eq, Deserialize, Serialize, JsonSchema, TS)] diff --git a/codex-rs/protocol/src/plan_tool.rs b/codex-rs/protocol/src/plan_tool.rs index a9038eb03b..bb544f0079 100644 --- a/codex-rs/protocol/src/plan_tool.rs +++ b/codex-rs/protocol/src/plan_tool.rs @@ -1,6 +1,5 @@ use schemars::JsonSchema; -use serde::Deserialize; -use serde::Serialize; +use serde::{Deserialize, Serialize}; use ts_rs::TS; // Types for the TODO tool arguments matching codex-vscode/todo-mcp/src/main.rs diff --git a/codex-rs/protocol/src/protocol.rs b/codex-rs/protocol/src/protocol.rs index 2d0b0f013a..74297952f6 100644 --- a/codex-rs/protocol/src/protocol.rs +++ b/codex-rs/protocol/src/protocol.rs @@ -5,39 +5,37 @@ use std::collections::HashMap; use std::fmt; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::str::FromStr; use std::time::Duration; -use crate::ConversationId; -use crate::config_types::ReasoningEffort as ReasoningEffortConfig; -use crate::config_types::ReasoningSummary as ReasoningSummaryConfig; -use crate::custom_prompts::CustomPrompt; -use crate::items::TurnItem; -use crate::message_history::HistoryEntry; -use crate::models::ContentItem; -use crate::models::ResponseItem; -use crate::num_format::format_with_separators; -use crate::parse_command::ParsedCommand; -use crate::plan_tool::UpdatePlanArgs; -use crate::user_input::UserInput; -use mcp_types::CallToolResult; -use mcp_types::Resource as McpResource; -use mcp_types::ResourceTemplate as McpResourceTemplate; -use mcp_types::Tool as McpTool; +use mcp_types::{ + CallToolResult, Resource as McpResource, ResourceTemplate as McpResourceTemplate, + Tool as McpTool, +}; use schemars::JsonSchema; -use serde::Deserialize; -use serde::Serialize; +use serde::{Deserialize, Serialize}; use serde_json::Value; use serde_with::serde_as; use strum_macros::Display; use ts_rs::TS; -pub use crate::approvals::ApplyPatchApprovalRequestEvent; -pub use crate::approvals::ExecApprovalRequestEvent; -pub use crate::approvals::SandboxCommandAssessment; -pub use crate::approvals::SandboxRiskLevel; +use crate::ConversationId; +pub use crate::approvals::{ + ApplyPatchApprovalRequestEvent, ExecApprovalRequestEvent, SandboxCommandAssessment, + SandboxRiskLevel, +}; +use crate::config_types::{ + ReasoningEffort as ReasoningEffortConfig, ReasoningSummary as ReasoningSummaryConfig, +}; +use crate::custom_prompts::CustomPrompt; +use crate::items::TurnItem; +use crate::message_history::HistoryEntry; +use crate::models::{ContentItem, ResponseItem}; +use crate::num_format::format_with_separators; +use crate::parse_command::ParsedCommand; +use crate::plan_tool::UpdatePlanArgs; +use crate::user_input::UserInput; /// Open/close tags for special user-input blocks. Used across crates to avoid /// duplicated hardcoded strings. @@ -1468,13 +1466,13 @@ pub enum TurnAbortReason { #[cfg(test)] mod tests { - use super::*; - use crate::items::UserMessageItem; - use crate::items::WebSearchItem; use anyhow::Result; use serde_json::json; use tempfile::NamedTempFile; + use super::*; + use crate::items::{UserMessageItem, WebSearchItem}; + #[test] fn item_started_event_from_web_search_emits_begin_event() { let event = ItemStartedEvent { diff --git a/codex-rs/protocol/src/user_input.rs b/codex-rs/protocol/src/user_input.rs index 881b996514..507e63de3b 100644 --- a/codex-rs/protocol/src/user_input.rs +++ b/codex-rs/protocol/src/user_input.rs @@ -1,6 +1,5 @@ use schemars::JsonSchema; -use serde::Deserialize; -use serde::Serialize; +use serde::{Deserialize, Serialize}; use ts_rs::TS; /// User input diff --git a/codex-rs/responses-api-proxy/src/lib.rs b/codex-rs/responses-api-proxy/src/lib.rs index bbe0484d4a..c5e54bdb9d 100644 --- a/codex-rs/responses-api-proxy/src/lib.rs +++ b/codex-rs/responses-api-proxy/src/lib.rs @@ -1,31 +1,19 @@ -use std::fs::File; -use std::fs::{self}; +use std::fs::{ + File, {self}, +}; use std::io::Write; -use std::net::SocketAddr; -use std::net::TcpListener; -use std::path::Path; -use std::path::PathBuf; +use std::net::{SocketAddr, TcpListener}; +use std::path::{Path, PathBuf}; use std::sync::Arc; use std::time::Duration; -use anyhow::Context; -use anyhow::Result; -use anyhow::anyhow; +use anyhow::{Context, Result, anyhow}; use clap::Parser; use reqwest::Url; use reqwest::blocking::Client; -use reqwest::header::AUTHORIZATION; -use reqwest::header::HOST; -use reqwest::header::HeaderMap; -use reqwest::header::HeaderName; -use reqwest::header::HeaderValue; +use reqwest::header::{AUTHORIZATION, HOST, HeaderMap, HeaderName, HeaderValue}; use serde::Serialize; -use tiny_http::Header; -use tiny_http::Method; -use tiny_http::Request; -use tiny_http::Response; -use tiny_http::Server; -use tiny_http::StatusCode; +use tiny_http::{Header, Method, Request, Response, Server, StatusCode}; mod read_api_key; use read_api_key::read_auth_header_from_stdin; diff --git a/codex-rs/responses-api-proxy/src/read_api_key.rs b/codex-rs/responses-api-proxy/src/read_api_key.rs index df5e2106c7..c97a36ca4c 100644 --- a/codex-rs/responses-api-proxy/src/read_api_key.rs +++ b/codex-rs/responses-api-proxy/src/read_api_key.rs @@ -1,6 +1,4 @@ -use anyhow::Context; -use anyhow::Result; -use anyhow::anyhow; +use anyhow::{Context, Result, anyhow}; use zeroize::Zeroize; /// Use a generous buffer size to avoid truncation and to allow for longer API @@ -39,8 +37,7 @@ pub(crate) fn read_auth_header_from_stdin() -> Result<&'static str> { /// in memory, protected by mlock(2). #[cfg(unix)] fn read_from_unix_stdin(buffer: &mut [u8]) -> std::io::Result { - use libc::c_void; - use libc::read; + use libc::{c_void, read}; // Perform a single read(2) call into the provided buffer slice. // Looping and newline/EOF handling are managed by the caller. @@ -163,10 +160,7 @@ where #[cfg(unix)] fn mlock_str(value: &str) { - use libc::_SC_PAGESIZE; - use libc::c_void; - use libc::mlock; - use libc::sysconf; + use libc::{_SC_PAGESIZE, c_void, mlock, sysconf}; if value.is_empty() { return; @@ -220,10 +214,11 @@ fn validate_auth_header_bytes(key_bytes: &[u8]) -> Result<()> { #[cfg(test)] mod tests { - use super::*; use std::collections::VecDeque; use std::io; + use super::*; + #[test] fn reads_key_with_no_newlines() { let mut sent = false; diff --git a/codex-rs/rmcp-client/src/auth_status.rs b/codex-rs/rmcp-client/src/auth_status.rs index 77c33f6959..6210e50343 100644 --- a/codex-rs/rmcp-client/src/auth_status.rs +++ b/codex-rs/rmcp-client/src/auth_status.rs @@ -1,20 +1,16 @@ use std::collections::HashMap; use std::time::Duration; -use anyhow::Error; -use anyhow::Result; +use anyhow::{Error, Result}; use codex_protocol::protocol::McpAuthStatus; -use reqwest::Client; -use reqwest::StatusCode; -use reqwest::Url; use reqwest::header::HeaderMap; +use reqwest::{Client, StatusCode, Url}; use serde::Deserialize; use tracing::debug; use crate::OAuthCredentialsStoreMode; use crate::oauth::has_oauth_tokens; -use crate::utils::apply_default_headers; -use crate::utils::build_default_headers; +use crate::utils::{apply_default_headers, build_default_headers}; const DISCOVERY_TIMEOUT: Duration = Duration::from_secs(5); const OAUTH_DISCOVERY_HEADER: &str = "MCP-Protocol-Version"; diff --git a/codex-rs/rmcp-client/src/bin/rmcp_test_server.rs b/codex-rs/rmcp-client/src/bin/rmcp_test_server.rs index 23b2f93b38..fb427b834f 100644 --- a/codex-rs/rmcp-client/src/bin/rmcp_test_server.rs +++ b/codex-rs/rmcp-client/src/bin/rmcp_test_server.rs @@ -2,17 +2,12 @@ use std::borrow::Cow; use std::collections::HashMap; use std::sync::Arc; -use rmcp::ErrorData as McpError; -use rmcp::ServiceExt; use rmcp::handler::server::ServerHandler; -use rmcp::model::CallToolRequestParam; -use rmcp::model::CallToolResult; -use rmcp::model::JsonObject; -use rmcp::model::ListToolsResult; -use rmcp::model::PaginatedRequestParam; -use rmcp::model::ServerCapabilities; -use rmcp::model::ServerInfo; -use rmcp::model::Tool; +use rmcp::model::{ + CallToolRequestParam, CallToolResult, JsonObject, ListToolsResult, PaginatedRequestParam, + ServerCapabilities, ServerInfo, Tool, +}; +use rmcp::{ErrorData as McpError, ServiceExt}; use serde::Deserialize; use serde_json::json; use tokio::task; diff --git a/codex-rs/rmcp-client/src/bin/test_stdio_server.rs b/codex-rs/rmcp-client/src/bin/test_stdio_server.rs index aafba59324..c09691e80c 100644 --- a/codex-rs/rmcp-client/src/bin/test_stdio_server.rs +++ b/codex-rs/rmcp-client/src/bin/test_stdio_server.rs @@ -2,26 +2,14 @@ use std::borrow::Cow; use std::collections::HashMap; use std::sync::Arc; -use rmcp::ErrorData as McpError; -use rmcp::ServiceExt; use rmcp::handler::server::ServerHandler; -use rmcp::model::CallToolRequestParam; -use rmcp::model::CallToolResult; -use rmcp::model::JsonObject; -use rmcp::model::ListResourceTemplatesResult; -use rmcp::model::ListResourcesResult; -use rmcp::model::ListToolsResult; -use rmcp::model::PaginatedRequestParam; -use rmcp::model::RawResource; -use rmcp::model::RawResourceTemplate; -use rmcp::model::ReadResourceRequestParam; -use rmcp::model::ReadResourceResult; -use rmcp::model::Resource; -use rmcp::model::ResourceContents; -use rmcp::model::ResourceTemplate; -use rmcp::model::ServerCapabilities; -use rmcp::model::ServerInfo; -use rmcp::model::Tool; +use rmcp::model::{ + CallToolRequestParam, CallToolResult, JsonObject, ListResourceTemplatesResult, + ListResourcesResult, ListToolsResult, PaginatedRequestParam, RawResource, RawResourceTemplate, + ReadResourceRequestParam, ReadResourceResult, Resource, ResourceContents, ResourceTemplate, + ServerCapabilities, ServerInfo, Tool, +}; +use rmcp::{ErrorData as McpError, ServiceExt}; use serde::Deserialize; use serde_json::json; use tokio::task; diff --git a/codex-rs/rmcp-client/src/bin/test_streamable_http_server.rs b/codex-rs/rmcp-client/src/bin/test_streamable_http_server.rs index f56a858241..3ad5ee7cff 100644 --- a/codex-rs/rmcp-client/src/bin/test_streamable_http_server.rs +++ b/codex-rs/rmcp-client/src/bin/test_streamable_http_server.rs @@ -4,39 +4,24 @@ use std::io::ErrorKind; use std::net::SocketAddr; use std::sync::Arc; -use axum::Router; use axum::body::Body; use axum::extract::State; -use axum::http::Request; -use axum::http::StatusCode; -use axum::http::header::AUTHORIZATION; -use axum::http::header::CONTENT_TYPE; -use axum::middleware; +use axum::http::header::{AUTHORIZATION, CONTENT_TYPE}; +use axum::http::{Request, StatusCode}; use axum::middleware::Next; use axum::response::Response; use axum::routing::get; +use axum::{Router, middleware}; use rmcp::ErrorData as McpError; use rmcp::handler::server::ServerHandler; -use rmcp::model::CallToolRequestParam; -use rmcp::model::CallToolResult; -use rmcp::model::JsonObject; -use rmcp::model::ListResourceTemplatesResult; -use rmcp::model::ListResourcesResult; -use rmcp::model::ListToolsResult; -use rmcp::model::PaginatedRequestParam; -use rmcp::model::RawResource; -use rmcp::model::RawResourceTemplate; -use rmcp::model::ReadResourceRequestParam; -use rmcp::model::ReadResourceResult; -use rmcp::model::Resource; -use rmcp::model::ResourceContents; -use rmcp::model::ResourceTemplate; -use rmcp::model::ServerCapabilities; -use rmcp::model::ServerInfo; -use rmcp::model::Tool; -use rmcp::transport::StreamableHttpServerConfig; -use rmcp::transport::StreamableHttpService; +use rmcp::model::{ + CallToolRequestParam, CallToolResult, JsonObject, ListResourceTemplatesResult, + ListResourcesResult, ListToolsResult, PaginatedRequestParam, RawResource, RawResourceTemplate, + ReadResourceRequestParam, ReadResourceResult, Resource, ResourceContents, ResourceTemplate, + ServerCapabilities, ServerInfo, Tool, +}; use rmcp::transport::streamable_http_server::session::local::LocalSessionManager; +use rmcp::transport::{StreamableHttpServerConfig, StreamableHttpService}; use serde::Deserialize; use serde_json::json; use tokio::task; diff --git a/codex-rs/rmcp-client/src/find_codex_home.rs b/codex-rs/rmcp-client/src/find_codex_home.rs index d683ba9d16..1418a901bc 100644 --- a/codex-rs/rmcp-client/src/find_codex_home.rs +++ b/codex-rs/rmcp-client/src/find_codex_home.rs @@ -1,6 +1,7 @@ -use dirs::home_dir; use std::path::PathBuf; +use dirs::home_dir; + /// This was copied from codex-core but codex-core depends on this crate. /// TODO: move this to a shared crate lower in the dependency tree. /// diff --git a/codex-rs/rmcp-client/src/lib.rs b/codex-rs/rmcp-client/src/lib.rs index ca99a7bb90..d3867dd822 100644 --- a/codex-rs/rmcp-client/src/lib.rs +++ b/codex-rs/rmcp-client/src/lib.rs @@ -6,14 +6,12 @@ mod perform_oauth_login; mod rmcp_client; mod utils; -pub use auth_status::determine_streamable_http_auth_status; -pub use auth_status::supports_oauth_login; +pub use auth_status::{determine_streamable_http_auth_status, supports_oauth_login}; pub use codex_protocol::protocol::McpAuthStatus; -pub use oauth::OAuthCredentialsStoreMode; -pub use oauth::StoredOAuthTokens; -pub use oauth::WrappedOAuthTokenResponse; -pub use oauth::delete_oauth_tokens; pub(crate) use oauth::load_oauth_tokens; -pub use oauth::save_oauth_tokens; +pub use oauth::{ + OAuthCredentialsStoreMode, StoredOAuthTokens, WrappedOAuthTokenResponse, delete_oauth_tokens, + save_oauth_tokens, +}; pub use perform_oauth_login::perform_oauth_login; pub use rmcp_client::RmcpClient; diff --git a/codex-rs/rmcp-client/src/logging_client_handler.rs b/codex-rs/rmcp-client/src/logging_client_handler.rs index 85d237b0e9..2ee09b5ed3 100644 --- a/codex-rs/rmcp-client/src/logging_client_handler.rs +++ b/codex-rs/rmcp-client/src/logging_client_handler.rs @@ -1,20 +1,11 @@ -use rmcp::ClientHandler; -use rmcp::RoleClient; -use rmcp::model::CancelledNotificationParam; -use rmcp::model::ClientInfo; -use rmcp::model::CreateElicitationRequestParam; -use rmcp::model::CreateElicitationResult; -use rmcp::model::ElicitationAction; -use rmcp::model::LoggingLevel; -use rmcp::model::LoggingMessageNotificationParam; -use rmcp::model::ProgressNotificationParam; -use rmcp::model::ResourceUpdatedNotificationParam; -use rmcp::service::NotificationContext; -use rmcp::service::RequestContext; -use tracing::debug; -use tracing::error; -use tracing::info; -use tracing::warn; +use rmcp::model::{ + CancelledNotificationParam, ClientInfo, CreateElicitationRequestParam, CreateElicitationResult, + ElicitationAction, LoggingLevel, LoggingMessageNotificationParam, ProgressNotificationParam, + ResourceUpdatedNotificationParam, +}; +use rmcp::service::{NotificationContext, RequestContext}; +use rmcp::{ClientHandler, RoleClient}; +use tracing::{debug, error, info, warn}; #[derive(Debug, Clone)] pub(crate) struct LoggingClientHandler { diff --git a/codex-rs/rmcp-client/src/oauth.rs b/codex-rs/rmcp-client/src/oauth.rs index bd6833fca4..c87ab89234 100644 --- a/codex-rs/rmcp-client/src/oauth.rs +++ b/codex-rs/rmcp-client/src/oauth.rs @@ -16,36 +16,24 @@ //! //! If the keyring is not available or fails, we fall back to CODEX_HOME/.credentials.json which is consistent with other coding CLI agents. -use anyhow::Context; -use anyhow::Error; -use anyhow::Result; -use oauth2::AccessToken; -use oauth2::EmptyExtraTokenFields; -use oauth2::RefreshToken; -use oauth2::Scope; -use oauth2::TokenResponse; -use oauth2::basic::BasicTokenType; -use rmcp::transport::auth::OAuthTokenResponse; -use serde::Deserialize; -use serde::Serialize; -use serde_json::Value; -use serde_json::map::Map as JsonMap; -use sha2::Digest; -use sha2::Sha256; use std::collections::BTreeMap; use std::fs; use std::io::ErrorKind; use std::path::PathBuf; use std::sync::Arc; -use std::time::Duration; -use std::time::SystemTime; -use std::time::UNIX_EPOCH; -use tracing::warn; +use std::time::{Duration, SystemTime, UNIX_EPOCH}; -use codex_keyring_store::DefaultKeyringStore; -use codex_keyring_store::KeyringStore; -use rmcp::transport::auth::AuthorizationManager; +use anyhow::{Context, Error, Result}; +use codex_keyring_store::{DefaultKeyringStore, KeyringStore}; +use oauth2::basic::BasicTokenType; +use oauth2::{AccessToken, EmptyExtraTokenFields, RefreshToken, Scope, TokenResponse}; +use rmcp::transport::auth::{AuthorizationManager, OAuthTokenResponse}; +use serde::{Deserialize, Serialize}; +use serde_json::Value; +use serde_json::map::Map as JsonMap; +use sha2::{Digest, Sha256}; use tokio::sync::Mutex; +use tracing::warn; use crate::find_codex_home::find_codex_home; @@ -535,17 +523,15 @@ fn sha_256_prefix(value: &Value) -> Result { #[cfg(test)] mod tests { - use super::*; + use std::sync::{Mutex, MutexGuard, OnceLock, PoisonError}; + use anyhow::Result; + use codex_keyring_store::tests::MockKeyringStore; use keyring::Error as KeyringError; use pretty_assertions::assert_eq; - use std::sync::Mutex; - use std::sync::MutexGuard; - use std::sync::OnceLock; - use std::sync::PoisonError; use tempfile::tempdir; - use codex_keyring_store::tests::MockKeyringStore; + use super::*; struct TempCodexHome { _guard: MutexGuard<'static, ()>, diff --git a/codex-rs/rmcp-client/src/perform_oauth_login.rs b/codex-rs/rmcp-client/src/perform_oauth_login.rs index 425e124d7d..2033900fce 100644 --- a/codex-rs/rmcp-client/src/perform_oauth_login.rs +++ b/codex-rs/rmcp-client/src/perform_oauth_login.rs @@ -3,23 +3,18 @@ use std::string::String; use std::sync::Arc; use std::time::Duration; -use anyhow::Context; -use anyhow::Result; -use anyhow::anyhow; +use anyhow::{Context, Result, anyhow}; use reqwest::ClientBuilder; use rmcp::transport::auth::OAuthState; -use tiny_http::Response; -use tiny_http::Server; +use tiny_http::{Response, Server}; use tokio::sync::oneshot; use tokio::time::timeout; use urlencoding::decode; -use crate::OAuthCredentialsStoreMode; -use crate::StoredOAuthTokens; -use crate::WrappedOAuthTokenResponse; -use crate::save_oauth_tokens; -use crate::utils::apply_default_headers; -use crate::utils::build_default_headers; +use crate::utils::{apply_default_headers, build_default_headers}; +use crate::{ + OAuthCredentialsStoreMode, StoredOAuthTokens, WrappedOAuthTokenResponse, save_oauth_tokens, +}; struct CallbackServerGuard { server: Arc, diff --git a/codex-rs/rmcp-client/src/rmcp_client.rs b/codex-rs/rmcp-client/src/rmcp_client.rs index bc1980f1f5..808d710c52 100644 --- a/codex-rs/rmcp-client/src/rmcp_client.rs +++ b/codex-rs/rmcp-client/src/rmcp_client.rs @@ -6,54 +6,38 @@ use std::process::Stdio; use std::sync::Arc; use std::time::Duration; -use anyhow::Result; -use anyhow::anyhow; +use anyhow::{Result, anyhow}; use futures::FutureExt; -use mcp_types::CallToolRequestParams; -use mcp_types::CallToolResult; -use mcp_types::InitializeRequestParams; -use mcp_types::InitializeResult; -use mcp_types::ListResourceTemplatesRequestParams; -use mcp_types::ListResourceTemplatesResult; -use mcp_types::ListResourcesRequestParams; -use mcp_types::ListResourcesResult; -use mcp_types::ListToolsRequestParams; -use mcp_types::ListToolsResult; -use mcp_types::ReadResourceRequestParams; -use mcp_types::ReadResourceResult; +use mcp_types::{ + CallToolRequestParams, CallToolResult, InitializeRequestParams, InitializeResult, + ListResourceTemplatesRequestParams, ListResourceTemplatesResult, ListResourcesRequestParams, + ListResourcesResult, ListToolsRequestParams, ListToolsResult, ReadResourceRequestParams, + ReadResourceResult, +}; use reqwest::header::HeaderMap; -use rmcp::model::CallToolRequestParam; -use rmcp::model::InitializeRequestParam; -use rmcp::model::PaginatedRequestParam; -use rmcp::model::ReadResourceRequestParam; -use rmcp::service::RoleClient; -use rmcp::service::RunningService; -use rmcp::service::{self}; +use rmcp::model::{ + CallToolRequestParam, InitializeRequestParam, PaginatedRequestParam, ReadResourceRequestParam, +}; +use rmcp::service::{ + RoleClient, RunningService, {self}, +}; use rmcp::transport::StreamableHttpClientTransport; -use rmcp::transport::auth::AuthClient; -use rmcp::transport::auth::OAuthState; +use rmcp::transport::auth::{AuthClient, OAuthState}; use rmcp::transport::child_process::TokioChildProcess; use rmcp::transport::streamable_http_client::StreamableHttpClientTransportConfig; -use tokio::io::AsyncBufReadExt; -use tokio::io::BufReader; +use tokio::io::{AsyncBufReadExt, BufReader}; use tokio::process::Command; use tokio::sync::Mutex; use tokio::time; -use tracing::info; -use tracing::warn; +use tracing::{info, warn}; use crate::load_oauth_tokens; use crate::logging_client_handler::LoggingClientHandler; -use crate::oauth::OAuthCredentialsStoreMode; -use crate::oauth::OAuthPersistor; -use crate::oauth::StoredOAuthTokens; -use crate::utils::apply_default_headers; -use crate::utils::build_default_headers; -use crate::utils::convert_call_tool_result; -use crate::utils::convert_to_mcp; -use crate::utils::convert_to_rmcp; -use crate::utils::create_env_for_mcp_server; -use crate::utils::run_with_timeout; +use crate::oauth::{OAuthCredentialsStoreMode, OAuthPersistor, StoredOAuthTokens}; +use crate::utils::{ + apply_default_headers, build_default_headers, convert_call_tool_result, convert_to_mcp, + convert_to_rmcp, create_env_for_mcp_server, run_with_timeout, +}; enum PendingTransport { ChildProcess(TokioChildProcess), diff --git a/codex-rs/rmcp-client/src/utils.rs b/codex-rs/rmcp-client/src/utils.rs index 8deb4d402b..9be62ca63a 100644 --- a/codex-rs/rmcp-client/src/utils.rs +++ b/codex-rs/rmcp-client/src/utils.rs @@ -2,14 +2,10 @@ use std::collections::HashMap; use std::env; use std::time::Duration; -use anyhow::Context; -use anyhow::Result; -use anyhow::anyhow; +use anyhow::{Context, Result, anyhow}; use mcp_types::CallToolResult; use reqwest::ClientBuilder; -use reqwest::header::HeaderMap; -use reqwest::header::HeaderName; -use reqwest::header::HeaderValue; +use reqwest::header::{HeaderMap, HeaderName, HeaderValue}; use rmcp::model::CallToolResult as RmcpCallToolResult; use rmcp::service::ServiceError; use serde_json::Value; @@ -202,14 +198,15 @@ pub(crate) const DEFAULT_ENV_VARS: &[&str] = &[ #[cfg(test)] mod tests { - use super::*; + use std::ffi::OsString; + use mcp_types::ContentBlock; use pretty_assertions::assert_eq; use rmcp::model::CallToolResult as RmcpCallToolResult; use serde_json::json; - use serial_test::serial; - use std::ffi::OsString; + + use super::*; struct EnvVarGuard { key: String, diff --git a/codex-rs/rmcp-client/tests/resources.rs b/codex-rs/rmcp-client/tests/resources.rs index 2117f9b14c..de8693fce2 100644 --- a/codex-rs/rmcp-client/tests/resources.rs +++ b/codex-rs/rmcp-client/tests/resources.rs @@ -4,15 +4,11 @@ use std::time::Duration; use codex_rmcp_client::RmcpClient; use escargot::CargoBuild; -use mcp_types::ClientCapabilities; -use mcp_types::Implementation; -use mcp_types::InitializeRequestParams; -use mcp_types::ListResourceTemplatesResult; -use mcp_types::ReadResourceRequestParams; -use mcp_types::ReadResourceResultContents; -use mcp_types::Resource; -use mcp_types::ResourceTemplate; -use mcp_types::TextResourceContents; +use mcp_types::{ + ClientCapabilities, Implementation, InitializeRequestParams, ListResourceTemplatesResult, + ReadResourceRequestParams, ReadResourceResultContents, Resource, ResourceTemplate, + TextResourceContents, +}; use serde_json::json; const RESOURCE_URI: &str = "memo://codex/example-note"; diff --git a/codex-rs/stdio-to-uds/src/lib.rs b/codex-rs/stdio-to-uds/src/lib.rs index 1190688844..fe4d9a675e 100644 --- a/codex-rs/stdio-to-uds/src/lib.rs +++ b/codex-rs/stdio-to-uds/src/lib.rs @@ -1,17 +1,13 @@ #![deny(clippy::print_stdout)] -use std::io; use std::io::Write; use std::net::Shutdown; -use std::path::Path; -use std::thread; - -use anyhow::Context; -use anyhow::anyhow; - #[cfg(unix)] use std::os::unix::net::UnixStream; +use std::path::Path; +use std::{io, thread}; +use anyhow::{Context, anyhow}; #[cfg(windows)] use uds_windows::UnixStream; diff --git a/codex-rs/stdio-to-uds/src/main.rs b/codex-rs/stdio-to-uds/src/main.rs index 69987c31be..3107c4161f 100644 --- a/codex-rs/stdio-to-uds/src/main.rs +++ b/codex-rs/stdio-to-uds/src/main.rs @@ -1,6 +1,5 @@ -use std::env; use std::path::PathBuf; -use std::process; +use std::{env, process}; fn main() -> anyhow::Result<()> { let mut args = env::args_os().skip(1); diff --git a/codex-rs/stdio-to-uds/tests/stdio_to_uds.rs b/codex-rs/stdio-to-uds/tests/stdio_to_uds.rs index 11888a8134..c4443362ef 100644 --- a/codex-rs/stdio-to-uds/tests/stdio_to_uds.rs +++ b/codex-rs/stdio-to-uds/tests/stdio_to_uds.rs @@ -1,6 +1,6 @@ -use std::io::ErrorKind; -use std::io::Read; -use std::io::Write; +use std::io::{ErrorKind, Read, Write}; +#[cfg(unix)] +use std::os::unix::net::UnixListener; use std::sync::mpsc; use std::thread; use std::time::Duration; @@ -8,10 +8,6 @@ use std::time::Duration; use anyhow::Context; use assert_cmd::Command; use pretty_assertions::assert_eq; - -#[cfg(unix)] -use std::os::unix::net::UnixListener; - #[cfg(windows)] use uds_windows::UnixListener; diff --git a/codex-rs/tui/src/additional_dirs.rs b/codex-rs/tui/src/additional_dirs.rs index cc43f3294b..37aed4ff26 100644 --- a/codex-rs/tui/src/additional_dirs.rs +++ b/codex-rs/tui/src/additional_dirs.rs @@ -1,6 +1,7 @@ -use codex_core::protocol::SandboxPolicy; use std::path::PathBuf; +use codex_core::protocol::SandboxPolicy; + /// Returns a warning describing why `--add-dir` entries will be ignored for the /// resolved sandbox policy. The caller is responsible for presenting the /// warning to the user (for example, printing to stderr). @@ -31,10 +32,12 @@ fn format_warning(additional_dirs: &[PathBuf]) -> String { #[cfg(test)] mod tests { - use super::add_dir_warning_message; + use std::path::PathBuf; + use codex_core::protocol::SandboxPolicy; use pretty_assertions::assert_eq; - use std::path::PathBuf; + + use super::add_dir_warning_message; #[test] fn returns_none_for_workspace_write() { diff --git a/codex-rs/tui/src/app.rs b/codex-rs/tui/src/app.rs index 1d2c9690d5..4c19d9c583 100644 --- a/codex-rs/tui/src/app.rs +++ b/codex-rs/tui/src/app.rs @@ -1,3 +1,24 @@ +use std::path::PathBuf; +use std::sync::Arc; +use std::sync::atomic::{AtomicBool, Ordering}; +use std::thread; +use std::time::Duration; + +use codex_ansi_escape::ansi_escape_line; +use codex_core::config::Config; +use codex_core::config::edit::ConfigEditsBuilder; +use codex_core::model_family::find_family_for_model; +use codex_core::protocol::{SessionSource, TokenUsage}; +use codex_core::protocol_config_types::ReasoningEffort as ReasoningEffortConfig; +use codex_core::{AuthManager, ConversationManager}; +use codex_protocol::ConversationId; +use color_eyre::eyre::{Result, WrapErr}; +use crossterm::event::{KeyCode, KeyEvent, KeyEventKind}; +use ratatui::style::Stylize; +use ratatui::text::Line; +use tokio::select; +use tokio::sync::mpsc::unbounded_channel; + use crate::app_backtrack::BacktrackState; use crate::app_event::AppEvent; use crate::app_event_sender::AppEventSender; @@ -7,6 +28,8 @@ use crate::diff_render::DiffSummary; use crate::exec_command::strip_bash_lc_and_escape; use crate::file_search::FileSearchManager; use crate::history_cell::HistoryCell; +#[cfg(not(debug_assertions))] +use crate::history_cell::UpdateAvailableHistoryCell; use crate::pager_overlay::Overlay; use crate::render::highlight::highlight_bash_to_lines; use crate::render::renderable::Renderable; @@ -14,34 +37,6 @@ use crate::resume_picker::ResumeSelection; use crate::tui; use crate::tui::TuiEvent; use crate::updates::UpdateAction; -use codex_ansi_escape::ansi_escape_line; -use codex_core::AuthManager; -use codex_core::ConversationManager; -use codex_core::config::Config; -use codex_core::config::edit::ConfigEditsBuilder; -use codex_core::model_family::find_family_for_model; -use codex_core::protocol::SessionSource; -use codex_core::protocol::TokenUsage; -use codex_core::protocol_config_types::ReasoningEffort as ReasoningEffortConfig; -use codex_protocol::ConversationId; -use color_eyre::eyre::Result; -use color_eyre::eyre::WrapErr; -use crossterm::event::KeyCode; -use crossterm::event::KeyEvent; -use crossterm::event::KeyEventKind; -use ratatui::style::Stylize; -use ratatui::text::Line; -use std::path::PathBuf; -use std::sync::Arc; -use std::sync::atomic::AtomicBool; -use std::sync::atomic::Ordering; -use std::thread; -use std::time::Duration; -use tokio::select; -use tokio::sync::mpsc::unbounded_channel; - -#[cfg(not(debug_assertions))] -use crate::history_cell::UpdateAvailableHistoryCell; #[derive(Debug, Clone)] pub struct AppExitInfo { @@ -545,25 +540,21 @@ impl App { #[cfg(test)] mod tests { - use super::*; - use crate::app_backtrack::BacktrackState; - use crate::app_backtrack::user_count; - use crate::chatwidget::tests::make_chatwidget_manual_with_sender; - use crate::file_search::FileSearchManager; - use crate::history_cell::AgentMessageCell; - use crate::history_cell::HistoryCell; - use crate::history_cell::UserHistoryCell; - use crate::history_cell::new_session_info; - use codex_core::AuthManager; - use codex_core::CodexAuth; - use codex_core::ConversationManager; - use codex_core::protocol::SessionConfiguredEvent; - use codex_protocol::ConversationId; - use ratatui::prelude::Line; use std::path::PathBuf; use std::sync::Arc; use std::sync::atomic::AtomicBool; + use codex_core::protocol::SessionConfiguredEvent; + use codex_core::{AuthManager, CodexAuth, ConversationManager}; + use codex_protocol::ConversationId; + use ratatui::prelude::Line; + + use super::*; + use crate::app_backtrack::{BacktrackState, user_count}; + use crate::chatwidget::tests::make_chatwidget_manual_with_sender; + use crate::file_search::FileSearchManager; + use crate::history_cell::{AgentMessageCell, HistoryCell, UserHistoryCell, new_session_info}; + fn make_test_app() -> App { let (chat_widget, app_event_tx, _rx, _op_rx) = make_chatwidget_manual_with_sender(); let config = chat_widget.config_ref().clone(); diff --git a/codex-rs/tui/src/app_backtrack.rs b/codex-rs/tui/src/app_backtrack.rs index e2ded3d3ef..bc57d4040e 100644 --- a/codex-rs/tui/src/app_backtrack.rs +++ b/codex-rs/tui/src/app_backtrack.rs @@ -2,18 +2,16 @@ use std::any::TypeId; use std::path::PathBuf; use std::sync::Arc; -use crate::app::App; -use crate::history_cell::CompositeHistoryCell; -use crate::history_cell::UserHistoryCell; -use crate::pager_overlay::Overlay; -use crate::tui; -use crate::tui::TuiEvent; use codex_core::protocol::ConversationPathResponseEvent; use codex_protocol::ConversationId; use color_eyre::eyre::Result; -use crossterm::event::KeyCode; -use crossterm::event::KeyEvent; -use crossterm::event::KeyEventKind; +use crossterm::event::{KeyCode, KeyEvent, KeyEventKind}; + +use crate::app::App; +use crate::history_cell::{CompositeHistoryCell, UserHistoryCell}; +use crate::pager_overlay::Overlay; +use crate::tui; +use crate::tui::TuiEvent; /// Aggregates all backtrack-related state used by the App. #[derive(Default)] @@ -412,12 +410,13 @@ fn user_positions_iter( #[cfg(test)] mod tests { - use super::*; - use crate::history_cell::AgentMessageCell; - use crate::history_cell::HistoryCell; - use ratatui::prelude::Line; use std::sync::Arc; + use ratatui::prelude::Line; + + use super::*; + use crate::history_cell::{AgentMessageCell, HistoryCell}; + #[test] fn trim_transcript_for_first_user_drops_user_and_newer_cells() { let mut cells: Vec> = vec![ diff --git a/codex-rs/tui/src/app_event.rs b/codex-rs/tui/src/app_event.rs index 514e234743..716ec81740 100644 --- a/codex-rs/tui/src/app_event.rs +++ b/codex-rs/tui/src/app_event.rs @@ -2,17 +2,13 @@ use std::path::PathBuf; use codex_common::approval_presets::ApprovalPreset; use codex_common::model_presets::ModelPreset; -use codex_core::protocol::ConversationPathResponseEvent; -use codex_core::protocol::Event; +use codex_core::protocol::{AskForApproval, ConversationPathResponseEvent, Event, SandboxPolicy}; +use codex_core::protocol_config_types::ReasoningEffort; use codex_file_search::FileMatch; use crate::bottom_pane::ApprovalRequest; use crate::history_cell::HistoryCell; -use codex_core::protocol::AskForApproval; -use codex_core::protocol::SandboxPolicy; -use codex_core::protocol_config_types::ReasoningEffort; - #[allow(clippy::large_enum_variant)] #[derive(Debug)] pub(crate) enum AppEvent { diff --git a/codex-rs/tui/src/ascii_animation.rs b/codex-rs/tui/src/ascii_animation.rs index b2d9fc1d19..2687c1dc95 100644 --- a/codex-rs/tui/src/ascii_animation.rs +++ b/codex-rs/tui/src/ascii_animation.rs @@ -1,11 +1,9 @@ use std::convert::TryFrom; -use std::time::Duration; -use std::time::Instant; +use std::time::{Duration, Instant}; use rand::Rng as _; -use crate::frames::ALL_VARIANTS; -use crate::frames::FRAME_TICK_DEFAULT; +use crate::frames::{ALL_VARIANTS, FRAME_TICK_DEFAULT}; use crate::tui::FrameRequester; /// Drives ASCII art animations shared across popups and onboarding widgets. diff --git a/codex-rs/tui/src/bin/md-events.rs b/codex-rs/tui/src/bin/md-events.rs index f1117fad91..758cfcaec6 100644 --- a/codex-rs/tui/src/bin/md-events.rs +++ b/codex-rs/tui/src/bin/md-events.rs @@ -1,5 +1,6 @@ -use std::io::Read; -use std::io::{self}; +use std::io::{ + Read, {self}, +}; fn main() { let mut input = String::new(); diff --git a/codex-rs/tui/src/bottom_pane/approval_overlay.rs b/codex-rs/tui/src/bottom_pane/approval_overlay.rs index d1d434c052..44fce22d18 100644 --- a/codex-rs/tui/src/bottom_pane/approval_overlay.rs +++ b/codex-rs/tui/src/bottom_pane/approval_overlay.rs @@ -1,37 +1,28 @@ use std::collections::HashMap; use std::path::PathBuf; -use crate::app_event::AppEvent; -use crate::app_event_sender::AppEventSender; -use crate::bottom_pane::BottomPaneView; -use crate::bottom_pane::CancellationEvent; -use crate::bottom_pane::list_selection_view::ListSelectionView; -use crate::bottom_pane::list_selection_view::SelectionItem; -use crate::bottom_pane::list_selection_view::SelectionViewParams; -use crate::diff_render::DiffSummary; -use crate::exec_command::strip_bash_lc_and_escape; -use crate::history_cell; -use crate::key_hint; -use crate::key_hint::KeyBinding; -use crate::render::highlight::highlight_bash_to_lines; -use crate::render::renderable::ColumnRenderable; -use crate::render::renderable::Renderable; -use codex_core::protocol::FileChange; -use codex_core::protocol::Op; -use codex_core::protocol::ReviewDecision; -use codex_core::protocol::SandboxCommandAssessment; -use codex_core::protocol::SandboxRiskLevel; -use crossterm::event::KeyCode; -use crossterm::event::KeyEvent; -use crossterm::event::KeyEventKind; -use crossterm::event::KeyModifiers; +use codex_core::protocol::{ + FileChange, Op, ReviewDecision, SandboxCommandAssessment, SandboxRiskLevel, +}; +use crossterm::event::{KeyCode, KeyEvent, KeyEventKind, KeyModifiers}; use ratatui::buffer::Buffer; use ratatui::layout::Rect; use ratatui::style::Stylize; -use ratatui::text::Line; -use ratatui::text::Span; -use ratatui::widgets::Paragraph; -use ratatui::widgets::Wrap; +use ratatui::text::{Line, Span}; +use ratatui::widgets::{Paragraph, Wrap}; + +use crate::app_event::AppEvent; +use crate::app_event_sender::AppEventSender; +use crate::bottom_pane::list_selection_view::{ + ListSelectionView, SelectionItem, SelectionViewParams, +}; +use crate::bottom_pane::{BottomPaneView, CancellationEvent}; +use crate::diff_render::DiffSummary; +use crate::exec_command::strip_bash_lc_and_escape; +use crate::key_hint::KeyBinding; +use crate::render::highlight::highlight_bash_to_lines; +use crate::render::renderable::{ColumnRenderable, Renderable}; +use crate::{history_cell, key_hint}; /// Request coming from the agent that needs user approval. #[derive(Clone, Debug)] @@ -424,11 +415,12 @@ fn patch_options() -> Vec { #[cfg(test)] mod tests { - use super::*; - use crate::app_event::AppEvent; use pretty_assertions::assert_eq; use tokio::sync::mpsc::unbounded_channel; + use super::*; + use crate::app_event::AppEvent; + fn make_exec_request() -> ApprovalRequest { ApprovalRequest::Exec { id: "test".to_string(), diff --git a/codex-rs/tui/src/bottom_pane/bottom_pane_view.rs b/codex-rs/tui/src/bottom_pane/bottom_pane_view.rs index 499801cbb0..773247802b 100644 --- a/codex-rs/tui/src/bottom_pane/bottom_pane_view.rs +++ b/codex-rs/tui/src/bottom_pane/bottom_pane_view.rs @@ -1,8 +1,8 @@ -use crate::bottom_pane::ApprovalRequest; -use crate::render::renderable::Renderable; use crossterm::event::KeyEvent; use super::CancellationEvent; +use crate::bottom_pane::ApprovalRequest; +use crate::render::renderable::Renderable; /// Trait implemented by every view that can be shown in the bottom pane. pub(crate) trait BottomPaneView: Renderable { diff --git a/codex-rs/tui/src/bottom_pane/chat_composer.rs b/codex-rs/tui/src/bottom_pane/chat_composer.rs index 61539b6ed3..e763ff5c62 100644 --- a/codex-rs/tui/src/bottom_pane/chat_composer.rs +++ b/codex-rs/tui/src/bottom_pane/chat_composer.rs @@ -1,64 +1,40 @@ -use crossterm::event::KeyCode; -use crossterm::event::KeyEvent; -use crossterm::event::KeyEventKind; -use crossterm::event::KeyModifiers; -use ratatui::buffer::Buffer; -use ratatui::layout::Constraint; -use ratatui::layout::Layout; -use ratatui::layout::Margin; -use ratatui::layout::Rect; -use ratatui::style::Style; -use ratatui::style::Stylize; -use ratatui::text::Line; -use ratatui::text::Span; -use ratatui::widgets::Block; -use ratatui::widgets::StatefulWidgetRef; -use ratatui::widgets::WidgetRef; - -use super::chat_composer_history::ChatComposerHistory; -use super::command_popup::CommandItem; -use super::command_popup::CommandPopup; -use super::file_search_popup::FileSearchPopup; -use super::footer::FooterMode; -use super::footer::FooterProps; -use super::footer::esc_hint_mode; -use super::footer::footer_height; -use super::footer::render_footer; -use super::footer::reset_mode_after_activity; -use super::footer::toggle_shortcut_mode; -use super::paste_burst::CharDecision; -use super::paste_burst::PasteBurst; -use crate::bottom_pane::paste_burst::FlushResult; -use crate::bottom_pane::prompt_args::expand_custom_prompt; -use crate::bottom_pane::prompt_args::expand_if_numeric_with_positional_args; -use crate::bottom_pane::prompt_args::parse_slash_name; -use crate::bottom_pane::prompt_args::prompt_argument_names; -use crate::bottom_pane::prompt_args::prompt_command_with_arg_placeholders; -use crate::bottom_pane::prompt_args::prompt_has_numeric_placeholders; -use crate::render::Insets; -use crate::render::RectExt; -use crate::render::renderable::Renderable; -use crate::slash_command::SlashCommand; -use crate::slash_command::built_in_slash_commands; -use crate::style::user_message_style; -use codex_protocol::custom_prompts::CustomPrompt; -use codex_protocol::custom_prompts::PROMPTS_CMD_PREFIX; - -use crate::app_event::AppEvent; -use crate::app_event_sender::AppEventSender; -use crate::bottom_pane::textarea::TextArea; -use crate::bottom_pane::textarea::TextAreaState; -use crate::clipboard_paste::normalize_pasted_path; -use crate::clipboard_paste::pasted_image_format; -use crate::history_cell; -use crate::ui_consts::LIVE_PREFIX_COLS; -use codex_file_search::FileMatch; use std::cell::RefCell; use std::collections::HashMap; -use std::path::Path; -use std::path::PathBuf; -use std::time::Duration; -use std::time::Instant; +use std::path::{Path, PathBuf}; +use std::time::{Duration, Instant}; + +use codex_file_search::FileMatch; +use codex_protocol::custom_prompts::{CustomPrompt, PROMPTS_CMD_PREFIX}; +use crossterm::event::{KeyCode, KeyEvent, KeyEventKind, KeyModifiers}; +use ratatui::buffer::Buffer; +use ratatui::layout::{Constraint, Layout, Margin, Rect}; +use ratatui::style::{Style, Stylize}; +use ratatui::text::{Line, Span}; +use ratatui::widgets::{Block, StatefulWidgetRef, WidgetRef}; + +use super::chat_composer_history::ChatComposerHistory; +use super::command_popup::{CommandItem, CommandPopup}; +use super::file_search_popup::FileSearchPopup; +use super::footer::{ + FooterMode, FooterProps, esc_hint_mode, footer_height, render_footer, + reset_mode_after_activity, toggle_shortcut_mode, +}; +use super::paste_burst::{CharDecision, PasteBurst}; +use crate::app_event::AppEvent; +use crate::app_event_sender::AppEventSender; +use crate::bottom_pane::paste_burst::FlushResult; +use crate::bottom_pane::prompt_args::{ + expand_custom_prompt, expand_if_numeric_with_positional_args, parse_slash_name, + prompt_argument_names, prompt_command_with_arg_placeholders, prompt_has_numeric_placeholders, +}; +use crate::bottom_pane::textarea::{TextArea, TextAreaState}; +use crate::clipboard_paste::{normalize_pasted_path, pasted_image_format}; +use crate::history_cell; +use crate::render::renderable::Renderable; +use crate::render::{Insets, RectExt}; +use crate::slash_command::{SlashCommand, built_in_slash_commands}; +use crate::style::user_message_style; +use crate::ui_consts::LIVE_PREFIX_COLS; /// If the pasted content exceeds this number of characters, replace it with a /// placeholder in the UI. @@ -1654,22 +1630,19 @@ fn prompt_selection_action( #[cfg(test)] mod tests { - use super::*; - use image::ImageBuffer; - use image::Rgba; - use pretty_assertions::assert_eq; use std::path::PathBuf; - use tempfile::tempdir; + use image::{ImageBuffer, Rgba}; + use pretty_assertions::assert_eq; + use tempfile::tempdir; + use tokio::sync::mpsc::unbounded_channel; + + use super::*; use crate::app_event::AppEvent; - use crate::bottom_pane::AppEventSender; - use crate::bottom_pane::ChatComposer; - use crate::bottom_pane::InputResult; - use crate::bottom_pane::chat_composer::AttachedImage; - use crate::bottom_pane::chat_composer::LARGE_PASTE_CHAR_THRESHOLD; + use crate::bottom_pane::chat_composer::{AttachedImage, LARGE_PASTE_CHAR_THRESHOLD}; use crate::bottom_pane::prompt_args::extract_positional_args_for_prompt_line; use crate::bottom_pane::textarea::TextArea; - use tokio::sync::mpsc::unbounded_channel; + use crate::bottom_pane::{AppEventSender, ChatComposer, InputResult}; #[test] fn footer_hint_row_is_separated_from_composer() { @@ -1756,9 +1729,7 @@ mod tests { #[test] fn footer_mode_snapshots() { - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; snapshot_composer_state("footer_mode_shortcut_overlay", true, |composer| { composer.set_esc_backtrack_hint(true); @@ -1808,9 +1779,7 @@ mod tests { #[test] fn esc_hint_stays_hidden_with_draft_content() { - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; let (tx, _rx) = unbounded_channel::(); let sender = AppEventSender::new(tx); @@ -1859,9 +1828,7 @@ mod tests { #[test] fn question_mark_only_toggles_on_first_char() { - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; let (tx, _rx) = unbounded_channel::(); let sender = AppEventSender::new(tx); @@ -1900,9 +1867,7 @@ mod tests { #[test] fn shortcut_overlay_persists_while_task_running() { - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; let (tx, _rx) = unbounded_channel::(); let sender = AppEventSender::new(tx); @@ -2074,9 +2039,7 @@ mod tests { #[test] fn ascii_prefix_survives_non_ascii_followup() { - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; let (tx, _rx) = unbounded_channel::(); let sender = AppEventSender::new(tx); @@ -2103,9 +2066,7 @@ mod tests { #[test] fn handle_paste_small_inserts_text() { - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; let (tx, _rx) = unbounded_channel::(); let sender = AppEventSender::new(tx); @@ -2132,9 +2093,7 @@ mod tests { #[test] fn empty_enter_returns_none() { - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; let (tx, _rx) = unbounded_channel::(); let sender = AppEventSender::new(tx); @@ -2159,9 +2118,7 @@ mod tests { #[test] fn handle_paste_large_uses_placeholder_and_replaces_on_submit() { - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; let (tx, _rx) = unbounded_channel::(); let sender = AppEventSender::new(tx); @@ -2193,9 +2150,7 @@ mod tests { #[test] fn edit_clears_pending_paste() { - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; let large = "y".repeat(LARGE_PASTE_CHAR_THRESHOLD + 1); let (tx, _rx) = unbounded_channel::(); @@ -2218,9 +2173,7 @@ mod tests { #[test] fn ui_snapshots() { - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; use ratatui::Terminal; use ratatui::backend::TestBackend; @@ -2337,9 +2290,7 @@ mod tests { // Test helper: simulate human typing with a brief delay and flush the paste-burst buffer fn type_chars_humanlike(composer: &mut ChatComposer, chars: &[char]) { - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; for &ch in chars { let _ = composer.handle_key_event(KeyEvent::new(KeyCode::Char(ch), KeyModifiers::NONE)); std::thread::sleep(ChatComposer::recommended_paste_flush_delay()); @@ -2349,9 +2300,7 @@ mod tests { #[test] fn slash_init_dispatches_command_and_does_not_submit_literal_text() { - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; let (tx, _rx) = unbounded_channel::(); let sender = AppEventSender::new(tx); @@ -2402,9 +2351,7 @@ mod tests { #[test] fn slash_tab_completion_moves_cursor_to_end() { - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; let (tx, _rx) = unbounded_channel::(); let sender = AppEventSender::new(tx); @@ -2459,9 +2406,7 @@ mod tests { #[test] fn slash_mention_dispatches_command_and_inserts_at() { - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; let (tx, _rx) = unbounded_channel::(); let sender = AppEventSender::new(tx); @@ -2494,9 +2439,7 @@ mod tests { #[test] fn test_multiple_pastes_submission() { - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; let (tx, _rx) = unbounded_channel::(); let sender = AppEventSender::new(tx); @@ -2573,9 +2516,7 @@ mod tests { #[test] fn test_placeholder_deletion() { - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; let (tx, _rx) = unbounded_channel::(); let sender = AppEventSender::new(tx); @@ -2645,9 +2586,7 @@ mod tests { #[test] fn test_partial_placeholder_deletion() { - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; let (tx, _rx) = unbounded_channel::(); let sender = AppEventSender::new(tx); @@ -2783,9 +2722,7 @@ mod tests { #[test] fn backspace_with_multibyte_text_before_placeholder_does_not_panic() { - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; let (tx, _rx) = unbounded_channel::(); let sender = AppEventSender::new(tx); @@ -3006,9 +2943,7 @@ mod tests { #[test] fn slash_path_input_submits_without_command_error() { - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; let (tx, mut rx) = unbounded_channel::(); let sender = AppEventSender::new(tx); @@ -3042,9 +2977,7 @@ mod tests { #[test] fn slash_with_leading_space_submits_as_text() { - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; let (tx, mut rx) = unbounded_channel::(); let sender = AppEventSender::new(tx); @@ -3354,9 +3287,7 @@ mod tests { #[test] fn burst_paste_fast_small_buffers_and_flushes_on_stop() { - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; let (tx, _rx) = unbounded_channel::(); let sender = AppEventSender::new(tx); @@ -3398,9 +3329,7 @@ mod tests { #[test] fn burst_paste_fast_large_inserts_placeholder_on_flush() { - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; let (tx, _rx) = unbounded_channel::(); let sender = AppEventSender::new(tx); diff --git a/codex-rs/tui/src/bottom_pane/chat_composer_history.rs b/codex-rs/tui/src/bottom_pane/chat_composer_history.rs index 991283a566..da7a71df3f 100644 --- a/codex-rs/tui/src/bottom_pane/chat_composer_history.rs +++ b/codex-rs/tui/src/bottom_pane/chat_composer_history.rs @@ -1,8 +1,9 @@ use std::collections::HashMap; +use codex_core::protocol::Op; + use crate::app_event::AppEvent; use crate::app_event_sender::AppEventSender; -use codex_core::protocol::Op; /// State machine that manages shell-style history navigation (Up/Down) inside /// the chat composer. This struct is intentionally decoupled from the @@ -196,11 +197,12 @@ impl ChatComposerHistory { #[cfg(test)] mod tests { - use super::*; - use crate::app_event::AppEvent; use codex_core::protocol::Op; use tokio::sync::mpsc::unbounded_channel; + use super::*; + use crate::app_event::AppEvent; + #[test] fn duplicate_submissions_are_not_recorded() { let mut history = ChatComposerHistory::new(); diff --git a/codex-rs/tui/src/bottom_pane/command_popup.rs b/codex-rs/tui/src/bottom_pane/command_popup.rs index d7501cebbc..197ecc8496 100644 --- a/codex-rs/tui/src/bottom_pane/command_popup.rs +++ b/codex-rs/tui/src/bottom_pane/command_popup.rs @@ -1,19 +1,16 @@ +use std::collections::HashSet; + +use codex_common::fuzzy_match::fuzzy_match; +use codex_protocol::custom_prompts::{CustomPrompt, PROMPTS_CMD_PREFIX}; use ratatui::buffer::Buffer; use ratatui::layout::Rect; use ratatui::widgets::WidgetRef; use super::popup_consts::MAX_POPUP_ROWS; use super::scroll_state::ScrollState; -use super::selection_popup_common::GenericDisplayRow; -use super::selection_popup_common::render_rows; -use crate::render::Insets; -use crate::render::RectExt; -use crate::slash_command::SlashCommand; -use crate::slash_command::built_in_slash_commands; -use codex_common::fuzzy_match::fuzzy_match; -use codex_protocol::custom_prompts::CustomPrompt; -use codex_protocol::custom_prompts::PROMPTS_CMD_PREFIX; -use std::collections::HashSet; +use super::selection_popup_common::{GenericDisplayRow, render_rows}; +use crate::render::{Insets, RectExt}; +use crate::slash_command::{SlashCommand, built_in_slash_commands}; /// A selectable item in the popup: either a built-in command or a user prompt. #[derive(Clone, Copy, Debug, PartialEq, Eq)] @@ -227,9 +224,10 @@ impl WidgetRef for CommandPopup { #[cfg(test)] mod tests { - use super::*; use pretty_assertions::assert_eq; + use super::*; + #[test] fn filter_includes_init_when_typing_prefix() { let mut popup = CommandPopup::new(Vec::new()); diff --git a/codex-rs/tui/src/bottom_pane/custom_prompt_view.rs b/codex-rs/tui/src/bottom_pane/custom_prompt_view.rs index e9f0ee697f..405bc6afdc 100644 --- a/codex-rs/tui/src/bottom_pane/custom_prompt_view.rs +++ b/codex-rs/tui/src/bottom_pane/custom_prompt_view.rs @@ -1,25 +1,17 @@ -use crossterm::event::KeyCode; -use crossterm::event::KeyEvent; -use crossterm::event::KeyModifiers; +use std::cell::RefCell; + +use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; use ratatui::buffer::Buffer; use ratatui::layout::Rect; use ratatui::style::Stylize; -use ratatui::text::Line; -use ratatui::text::Span; -use ratatui::widgets::Clear; -use ratatui::widgets::Paragraph; -use ratatui::widgets::StatefulWidgetRef; -use ratatui::widgets::Widget; -use std::cell::RefCell; - -use crate::render::renderable::Renderable; - -use super::popup_consts::standard_popup_hint_line; +use ratatui::text::{Line, Span}; +use ratatui::widgets::{Clear, Paragraph, StatefulWidgetRef, Widget}; use super::CancellationEvent; use super::bottom_pane_view::BottomPaneView; -use super::textarea::TextArea; -use super::textarea::TextAreaState; +use super::popup_consts::standard_popup_hint_line; +use super::textarea::{TextArea, TextAreaState}; +use crate::render::renderable::Renderable; /// Callback invoked when the user submits a custom prompt. pub(crate) type PromptSubmitted = Box; diff --git a/codex-rs/tui/src/bottom_pane/feedback_view.rs b/codex-rs/tui/src/bottom_pane/feedback_view.rs index a8476df0ab..f53f4b4d59 100644 --- a/codex-rs/tui/src/bottom_pane/feedback_view.rs +++ b/codex-rs/tui/src/bottom_pane/feedback_view.rs @@ -1,30 +1,21 @@ use std::cell::RefCell; use std::path::PathBuf; -use crossterm::event::KeyCode; -use crossterm::event::KeyEvent; -use crossterm::event::KeyModifiers; +use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; use ratatui::buffer::Buffer; use ratatui::layout::Rect; use ratatui::style::Stylize; -use ratatui::text::Line; -use ratatui::text::Span; -use ratatui::widgets::Clear; -use ratatui::widgets::Paragraph; -use ratatui::widgets::StatefulWidgetRef; -use ratatui::widgets::Widget; - -use crate::app_event::AppEvent; -use crate::app_event::FeedbackCategory; -use crate::app_event_sender::AppEventSender; -use crate::history_cell; -use crate::render::renderable::Renderable; +use ratatui::text::{Line, Span}; +use ratatui::widgets::{Clear, Paragraph, StatefulWidgetRef, Widget}; use super::CancellationEvent; use super::bottom_pane_view::BottomPaneView; use super::popup_consts::standard_popup_hint_line; -use super::textarea::TextArea; -use super::textarea::TextAreaState; +use super::textarea::{TextArea, TextAreaState}; +use crate::app_event::{AppEvent, FeedbackCategory}; +use crate::app_event_sender::AppEventSender; +use crate::history_cell; +use crate::render::renderable::Renderable; const BASE_ISSUE_URL: &str = "https://github.com/openai/codex/issues/new?template=2-bug-report.yml"; diff --git a/codex-rs/tui/src/bottom_pane/file_search_popup.rs b/codex-rs/tui/src/bottom_pane/file_search_popup.rs index 708b004748..b9de9834c8 100644 --- a/codex-rs/tui/src/bottom_pane/file_search_popup.rs +++ b/codex-rs/tui/src/bottom_pane/file_search_popup.rs @@ -3,13 +3,10 @@ use ratatui::buffer::Buffer; use ratatui::layout::Rect; use ratatui::widgets::WidgetRef; -use crate::render::Insets; -use crate::render::RectExt; - use super::popup_consts::MAX_POPUP_ROWS; use super::scroll_state::ScrollState; -use super::selection_popup_common::GenericDisplayRow; -use super::selection_popup_common::render_rows; +use super::selection_popup_common::{GenericDisplayRow, render_rows}; +use crate::render::{Insets, RectExt}; /// Visual state for the file-search popup. pub(crate) struct FileSearchPopup { diff --git a/codex-rs/tui/src/bottom_pane/footer.rs b/codex-rs/tui/src/bottom_pane/footer.rs index 79d7c60fa7..342fd098d8 100644 --- a/codex-rs/tui/src/bottom_pane/footer.rs +++ b/codex-rs/tui/src/bottom_pane/footer.rs @@ -1,15 +1,14 @@ -use crate::key_hint; -use crate::key_hint::KeyBinding; -use crate::render::line_utils::prefix_lines; -use crate::ui_consts::FOOTER_INDENT_COLS; use crossterm::event::KeyCode; use ratatui::buffer::Buffer; use ratatui::layout::Rect; use ratatui::style::Stylize; -use ratatui::text::Line; -use ratatui::text::Span; -use ratatui::widgets::Paragraph; -use ratatui::widgets::Widget; +use ratatui::text::{Line, Span}; +use ratatui::widgets::{Paragraph, Widget}; + +use crate::key_hint; +use crate::key_hint::KeyBinding; +use crate::render::line_utils::prefix_lines; +use crate::ui_consts::FOOTER_INDENT_COLS; #[derive(Clone, Copy, Debug)] pub(crate) struct FooterProps { @@ -373,11 +372,12 @@ const SHORTCUTS: &[ShortcutDescriptor] = &[ #[cfg(test)] mod tests { - use super::*; use insta::assert_snapshot; use ratatui::Terminal; use ratatui::backend::TestBackend; + use super::*; + fn snapshot_footer(name: &str, props: FooterProps) { let height = footer_height(props).max(1); let mut terminal = Terminal::new(TestBackend::new(80, height)).unwrap(); diff --git a/codex-rs/tui/src/bottom_pane/list_selection_view.rs b/codex-rs/tui/src/bottom_pane/list_selection_view.rs index 44d7b26402..31dbd868c6 100644 --- a/codex-rs/tui/src/bottom_pane/list_selection_view.rs +++ b/codex-rs/tui/src/bottom_pane/list_selection_view.rs @@ -1,33 +1,21 @@ -use crossterm::event::KeyCode; -use crossterm::event::KeyEvent; -use crossterm::event::KeyModifiers; +use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; use itertools::Itertools as _; use ratatui::buffer::Buffer; -use ratatui::layout::Constraint; -use ratatui::layout::Layout; -use ratatui::layout::Rect; +use ratatui::layout::{Constraint, Layout, Rect}; use ratatui::style::Stylize; -use ratatui::text::Line; -use ratatui::text::Span; -use ratatui::widgets::Block; -use ratatui::widgets::Paragraph; -use ratatui::widgets::Widget; - -use crate::app_event_sender::AppEventSender; -use crate::key_hint::KeyBinding; -use crate::render::Insets; -use crate::render::RectExt as _; -use crate::render::renderable::ColumnRenderable; -use crate::render::renderable::Renderable; -use crate::style::user_message_style; +use ratatui::text::{Line, Span}; +use ratatui::widgets::{Block, Paragraph, Widget}; use super::CancellationEvent; use super::bottom_pane_view::BottomPaneView; use super::popup_consts::MAX_POPUP_ROWS; use super::scroll_state::ScrollState; -use super::selection_popup_common::GenericDisplayRow; -use super::selection_popup_common::measure_rows_height; -use super::selection_popup_common::render_rows; +use super::selection_popup_common::{GenericDisplayRow, measure_rows_height, render_rows}; +use crate::app_event_sender::AppEventSender; +use crate::key_hint::KeyBinding; +use crate::render::renderable::{ColumnRenderable, Renderable}; +use crate::render::{Insets, RectExt as _}; +use crate::style::user_message_style; /// One selectable item in the generic selection list. pub(crate) type SelectionAction = Box; @@ -428,13 +416,14 @@ impl Renderable for ListSelectionView { #[cfg(test)] mod tests { - use super::*; - use crate::app_event::AppEvent; - use crate::bottom_pane::popup_consts::standard_popup_hint_line; use insta::assert_snapshot; use ratatui::layout::Rect; use tokio::sync::mpsc::unbounded_channel; + use super::*; + use crate::app_event::AppEvent; + use crate::bottom_pane::popup_consts::standard_popup_hint_line; + fn make_selection_view(subtitle: Option<&str>) -> ListSelectionView { let (tx_raw, _rx) = unbounded_channel::(); let tx = AppEventSender::new(tx_raw); diff --git a/codex-rs/tui/src/bottom_pane/mod.rs b/codex-rs/tui/src/bottom_pane/mod.rs index 685c71c875..5552b9e844 100644 --- a/codex-rs/tui/src/bottom_pane/mod.rs +++ b/codex-rs/tui/src/bottom_pane/mod.rs @@ -1,23 +1,20 @@ //! Bottom pane: shows the ChatComposer or a BottomPaneView, if one is active. use std::path::PathBuf; +use std::time::Duration; + +use bottom_pane_view::BottomPaneView; +use codex_file_search::FileMatch; +use crossterm::event::{KeyCode, KeyEvent}; +use ratatui::buffer::Buffer; +use ratatui::layout::Rect; use crate::app_event_sender::AppEventSender; use crate::bottom_pane::queued_user_messages::QueuedUserMessages; -use crate::render::renderable::FlexRenderable; -use crate::render::renderable::Renderable; -use crate::render::renderable::RenderableItem; +use crate::render::renderable::{FlexRenderable, Renderable, RenderableItem}; use crate::tui::FrameRequester; -use bottom_pane_view::BottomPaneView; -use codex_file_search::FileMatch; -use crossterm::event::KeyCode; -use crossterm::event::KeyEvent; -use ratatui::buffer::Buffer; -use ratatui::layout::Rect; -use std::time::Duration; mod approval_overlay; -pub(crate) use approval_overlay::ApprovalOverlay; -pub(crate) use approval_overlay::ApprovalRequest; +pub(crate) use approval_overlay::{ApprovalOverlay, ApprovalRequest}; mod bottom_pane_view; mod chat_composer; mod chat_composer_history; @@ -29,8 +26,7 @@ mod list_selection_view; mod prompt_args; pub(crate) use list_selection_view::SelectionViewParams; mod feedback_view; -pub(crate) use feedback_view::feedback_selection_params; -pub(crate) use feedback_view::feedback_upload_consent_params; +pub(crate) use feedback_view::{feedback_selection_params, feedback_upload_consent_params}; mod paste_burst; pub mod popup_consts; mod queued_user_messages; @@ -45,13 +41,11 @@ pub(crate) enum CancellationEvent { NotHandled, } -pub(crate) use chat_composer::ChatComposer; -pub(crate) use chat_composer::InputResult; +pub(crate) use chat_composer::{ChatComposer, InputResult}; use codex_protocol::custom_prompts::CustomPrompt; +pub(crate) use list_selection_view::{SelectionAction, SelectionItem}; use crate::status_indicator_widget::StatusIndicatorWidget; -pub(crate) use list_selection_view::SelectionAction; -pub(crate) use list_selection_view::SelectionItem; /// Pane displayed in the lower half of the chat UI. pub(crate) struct BottomPane { @@ -501,13 +495,14 @@ impl Renderable for BottomPane { #[cfg(test)] mod tests { - use super::*; - use crate::app_event::AppEvent; use insta::assert_snapshot; use ratatui::buffer::Buffer; use ratatui::layout::Rect; use tokio::sync::mpsc::unbounded_channel; + use super::*; + use crate::app_event::AppEvent; + fn snapshot_buffer(buf: &Buffer) -> String { let mut lines = Vec::new(); for y in 0..buf.area().height { @@ -606,9 +601,7 @@ mod tests { pane.push_approval_request(exec_request()); // Simulate pressing 'n' (No) on the modal. - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; pane.handle_key_event(KeyEvent::new(KeyCode::Char('n'), KeyModifiers::NONE)); // After denial, since the task is still running, the status indicator should be diff --git a/codex-rs/tui/src/bottom_pane/paste_burst.rs b/codex-rs/tui/src/bottom_pane/paste_burst.rs index 49377cb21c..d72c586a86 100644 --- a/codex-rs/tui/src/bottom_pane/paste_burst.rs +++ b/codex-rs/tui/src/bottom_pane/paste_burst.rs @@ -1,5 +1,4 @@ -use std::time::Duration; -use std::time::Instant; +use std::time::{Duration, Instant}; // Heuristic thresholds for detecting paste-like input bursts. // Detect quickly to avoid showing typed prefix before paste is recognized diff --git a/codex-rs/tui/src/bottom_pane/prompt_args.rs b/codex-rs/tui/src/bottom_pane/prompt_args.rs index 48c3cedfab..b3cfc8e651 100644 --- a/codex-rs/tui/src/bottom_pane/prompt_args.rs +++ b/codex-rs/tui/src/bottom_pane/prompt_args.rs @@ -1,10 +1,9 @@ -use codex_protocol::custom_prompts::CustomPrompt; -use codex_protocol::custom_prompts::PROMPTS_CMD_PREFIX; +use std::collections::{HashMap, HashSet}; + +use codex_protocol::custom_prompts::{CustomPrompt, PROMPTS_CMD_PREFIX}; use lazy_static::lazy_static; use regex_lite::Regex; use shlex::Shlex; -use std::collections::HashMap; -use std::collections::HashSet; lazy_static! { static ref PROMPT_ARG_REGEX: Regex = diff --git a/codex-rs/tui/src/bottom_pane/queued_user_messages.rs b/codex-rs/tui/src/bottom_pane/queued_user_messages.rs index ae33aeada4..768d3ce964 100644 --- a/codex-rs/tui/src/bottom_pane/queued_user_messages.rs +++ b/codex-rs/tui/src/bottom_pane/queued_user_messages.rs @@ -7,8 +7,7 @@ use ratatui::widgets::Paragraph; use crate::key_hint; use crate::render::renderable::Renderable; -use crate::wrapping::RtOptions; -use crate::wrapping::word_wrap_lines; +use crate::wrapping::{RtOptions, word_wrap_lines}; /// Widget that displays a list of user messages queued while a turn is in progress. pub(crate) struct QueuedUserMessages { @@ -74,10 +73,11 @@ impl Renderable for QueuedUserMessages { #[cfg(test)] mod tests { - use super::*; use insta::assert_snapshot; use pretty_assertions::assert_eq; + use super::*; + #[test] fn desired_height_empty() { let queue = QueuedUserMessages::new(); diff --git a/codex-rs/tui/src/bottom_pane/selection_popup_common.rs b/codex-rs/tui/src/bottom_pane/selection_popup_common.rs index 4246adf4b5..6928012973 100644 --- a/codex-rs/tui/src/bottom_pane/selection_popup_common.rs +++ b/codex-rs/tui/src/bottom_pane/selection_popup_common.rs @@ -4,14 +4,12 @@ use ratatui::layout::Rect; // below no longer requires it. use ratatui::style::Color; use ratatui::style::Stylize; -use ratatui::text::Line; -use ratatui::text::Span; +use ratatui::text::{Line, Span}; use ratatui::widgets::Widget; use unicode_width::UnicodeWidthChar; -use crate::key_hint::KeyBinding; - use super::scroll_state::ScrollState; +use crate::key_hint::KeyBinding; /// A generic representation of a display row for selection popups. pub(crate) struct GenericDisplayRow { @@ -185,8 +183,7 @@ pub(crate) fn render_rows( } // Wrap with subsequent indent aligned to the description column. - use crate::wrapping::RtOptions; - use crate::wrapping::word_wrap_line; + use crate::wrapping::{RtOptions, word_wrap_line}; let options = RtOptions::new(area.width as usize) .initial_indent(Line::from("")) .subsequent_indent(Line::from(" ".repeat(desc_col))); @@ -242,8 +239,7 @@ pub(crate) fn measure_rows_height( let desc_col = compute_desc_col(rows_all, start_idx, visible_items, content_width); - use crate::wrapping::RtOptions; - use crate::wrapping::word_wrap_line; + use crate::wrapping::{RtOptions, word_wrap_line}; let mut total: u16 = 0; for row in rows_all .iter() diff --git a/codex-rs/tui/src/bottom_pane/textarea.rs b/codex-rs/tui/src/bottom_pane/textarea.rs index cd913b00d4..f0befb9f5e 100644 --- a/codex-rs/tui/src/bottom_pane/textarea.rs +++ b/codex-rs/tui/src/bottom_pane/textarea.rs @@ -1,15 +1,11 @@ -use crossterm::event::KeyCode; -use crossterm::event::KeyEvent; -use crossterm::event::KeyModifiers; +use std::cell::{Ref, RefCell}; +use std::ops::Range; + +use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; use ratatui::buffer::Buffer; use ratatui::layout::Rect; -use ratatui::style::Color; -use ratatui::style::Style; -use ratatui::widgets::StatefulWidgetRef; -use ratatui::widgets::WidgetRef; -use std::cell::Ref; -use std::cell::RefCell; -use std::ops::Range; +use ratatui::style::{Color, Style}; +use ratatui::widgets::{StatefulWidgetRef, WidgetRef}; use textwrap::Options; use unicode_segmentation::UnicodeSegmentation; use unicode_width::UnicodeWidthStr; @@ -1011,10 +1007,11 @@ impl TextArea { #[cfg(test)] mod tests { - use super::*; // crossterm types are intentionally not imported here to avoid unused warnings use rand::prelude::*; + use super::*; + fn rand_grapheme(rng: &mut rand::rngs::StdRng) -> String { let r: u8 = rng.random_range(0..100); match r { diff --git a/codex-rs/tui/src/chatwidget.rs b/codex-rs/tui/src/chatwidget.rs index f4235d5267..465210aa7d 100644 --- a/codex-rs/tui/src/chatwidget.rs +++ b/codex-rs/tui/src/chatwidget.rs @@ -1,99 +1,56 @@ -use std::collections::HashMap; -use std::collections::VecDeque; +use std::collections::{HashMap, VecDeque}; use std::path::PathBuf; use std::sync::Arc; use codex_core::config::Config; use codex_core::config::types::Notifications; -use codex_core::git_info::current_branch_name; -use codex_core::git_info::local_git_branches; +use codex_core::git_info::{current_branch_name, local_git_branches}; use codex_core::project_doc::DEFAULT_PROJECT_DOC_FILENAME; -use codex_core::protocol::AgentMessageDeltaEvent; -use codex_core::protocol::AgentMessageEvent; -use codex_core::protocol::AgentReasoningDeltaEvent; -use codex_core::protocol::AgentReasoningEvent; -use codex_core::protocol::AgentReasoningRawContentDeltaEvent; -use codex_core::protocol::AgentReasoningRawContentEvent; -use codex_core::protocol::ApplyPatchApprovalRequestEvent; -use codex_core::protocol::BackgroundEventEvent; -use codex_core::protocol::DeprecationNoticeEvent; -use codex_core::protocol::ErrorEvent; -use codex_core::protocol::Event; -use codex_core::protocol::EventMsg; -use codex_core::protocol::ExecApprovalRequestEvent; -use codex_core::protocol::ExecCommandBeginEvent; -use codex_core::protocol::ExecCommandEndEvent; -use codex_core::protocol::ExitedReviewModeEvent; -use codex_core::protocol::ListCustomPromptsResponseEvent; -use codex_core::protocol::McpListToolsResponseEvent; -use codex_core::protocol::McpToolCallBeginEvent; -use codex_core::protocol::McpToolCallEndEvent; -use codex_core::protocol::Op; -use codex_core::protocol::PatchApplyBeginEvent; -use codex_core::protocol::RateLimitSnapshot; -use codex_core::protocol::ReviewRequest; -use codex_core::protocol::StreamErrorEvent; -use codex_core::protocol::TaskCompleteEvent; -use codex_core::protocol::TokenUsage; -use codex_core::protocol::TokenUsageInfo; -use codex_core::protocol::TurnAbortReason; -use codex_core::protocol::TurnDiffEvent; -use codex_core::protocol::UndoCompletedEvent; -use codex_core::protocol::UndoStartedEvent; -use codex_core::protocol::UserMessageEvent; -use codex_core::protocol::ViewImageToolCallEvent; -use codex_core::protocol::WarningEvent; -use codex_core::protocol::WebSearchBeginEvent; -use codex_core::protocol::WebSearchEndEvent; +use codex_core::protocol::{ + AgentMessageDeltaEvent, AgentMessageEvent, AgentReasoningDeltaEvent, AgentReasoningEvent, + AgentReasoningRawContentDeltaEvent, AgentReasoningRawContentEvent, + ApplyPatchApprovalRequestEvent, BackgroundEventEvent, DeprecationNoticeEvent, ErrorEvent, + Event, EventMsg, ExecApprovalRequestEvent, ExecCommandBeginEvent, ExecCommandEndEvent, + ExitedReviewModeEvent, ListCustomPromptsResponseEvent, McpListToolsResponseEvent, + McpToolCallBeginEvent, McpToolCallEndEvent, Op, PatchApplyBeginEvent, RateLimitSnapshot, + ReviewRequest, StreamErrorEvent, TaskCompleteEvent, TokenUsage, TokenUsageInfo, + TurnAbortReason, TurnDiffEvent, UndoCompletedEvent, UndoStartedEvent, UserMessageEvent, + ViewImageToolCallEvent, WarningEvent, WebSearchBeginEvent, WebSearchEndEvent, +}; use codex_protocol::ConversationId; use codex_protocol::parse_command::ParsedCommand; use codex_protocol::user_input::UserInput; -use crossterm::event::KeyCode; -use crossterm::event::KeyEvent; -use crossterm::event::KeyEventKind; -use crossterm::event::KeyModifiers; +use crossterm::event::{KeyCode, KeyEvent, KeyEventKind, KeyModifiers}; use rand::Rng; use ratatui::buffer::Buffer; use ratatui::layout::Rect; -use ratatui::style::Color; -use ratatui::style::Stylize; +use ratatui::style::{Color, Stylize}; use ratatui::text::Line; -use ratatui::widgets::Paragraph; -use ratatui::widgets::Wrap; +use ratatui::widgets::{Paragraph, Wrap}; use tokio::sync::mpsc::UnboundedSender; use tracing::debug; use crate::app_event::AppEvent; use crate::app_event_sender::AppEventSender; -use crate::bottom_pane::ApprovalRequest; -use crate::bottom_pane::BottomPane; -use crate::bottom_pane::BottomPaneParams; -use crate::bottom_pane::CancellationEvent; -use crate::bottom_pane::InputResult; -use crate::bottom_pane::SelectionAction; -use crate::bottom_pane::SelectionItem; -use crate::bottom_pane::SelectionViewParams; use crate::bottom_pane::custom_prompt_view::CustomPromptView; use crate::bottom_pane::popup_consts::standard_popup_hint_line; +use crate::bottom_pane::{ + ApprovalRequest, BottomPane, BottomPaneParams, CancellationEvent, InputResult, SelectionAction, + SelectionItem, SelectionViewParams, +}; use crate::clipboard_paste::paste_image_to_temp_png; use crate::diff_render::display_path_for; -use crate::exec_cell::CommandOutput; -use crate::exec_cell::ExecCell; -use crate::exec_cell::new_active_exec_command; +use crate::exec_cell::{CommandOutput, ExecCell, new_active_exec_command}; use crate::get_git_diff::get_git_diff; use crate::history_cell; -use crate::history_cell::AgentMessageCell; -use crate::history_cell::HistoryCell; -use crate::history_cell::McpToolCallCell; +use crate::history_cell::{AgentMessageCell, HistoryCell, McpToolCallCell}; use crate::markdown::append_markdown; #[cfg(target_os = "windows")] use crate::onboarding::WSL_INSTRUCTIONS; use crate::render::Insets; -use crate::render::renderable::ColumnRenderable; -use crate::render::renderable::FlexRenderable; -use crate::render::renderable::Renderable; -use crate::render::renderable::RenderableExt; -use crate::render::renderable::RenderableItem; +use crate::render::renderable::{ + ColumnRenderable, FlexRenderable, Renderable, RenderableExt, RenderableItem, +}; use crate::slash_command::SlashCommand; use crate::status::RateLimitSnapshotDisplay; use crate::text_formatting::truncate_text; @@ -101,27 +58,23 @@ use crate::tui::FrameRequester; mod interrupts; use self::interrupts::InterruptManager; mod agent; -use self::agent::spawn_agent; -use self::agent::spawn_agent_from_existing; +use self::agent::{spawn_agent, spawn_agent_from_existing}; mod session_header; -use self::session_header::SessionHeader; -use crate::streaming::controller::StreamController; use std::path::Path; use chrono::Local; -use codex_common::approval_presets::ApprovalPreset; -use codex_common::approval_presets::builtin_approval_presets; -use codex_common::model_presets::ModelPreset; -use codex_common::model_presets::builtin_model_presets; -use codex_core::AuthManager; -use codex_core::ConversationManager; -use codex_core::protocol::AskForApproval; -use codex_core::protocol::SandboxPolicy; +use codex_common::approval_presets::{ApprovalPreset, builtin_approval_presets}; +use codex_common::model_presets::{ModelPreset, builtin_model_presets}; +use codex_core::protocol::{AskForApproval, SandboxPolicy}; use codex_core::protocol_config_types::ReasoningEffort as ReasoningEffortConfig; +use codex_core::{AuthManager, ConversationManager}; use codex_file_search::FileMatch; use codex_protocol::plan_tool::UpdatePlanArgs; use strum::IntoEnumIterator; +use self::session_header::SessionHeader; +use crate::streaming::controller::StreamController; + const USER_SHELL_COMMAND_HELP_TITLE: &str = "Prefix a command with ! to run it locally"; const USER_SHELL_COMMAND_HELP_HINT: &str = "Example: !ls"; // Track information about an in-flight exec command. @@ -1262,11 +1215,9 @@ impl ChatWidget { } } SlashCommand::TestApproval => { - use codex_core::protocol::EventMsg; use std::collections::HashMap; - use codex_core::protocol::ApplyPatchApprovalRequestEvent; - use codex_core::protocol::FileChange; + use codex_core::protocol::{ApplyPatchApprovalRequestEvent, EventMsg, FileChange}; self.app_event_tx.send(AppEvent::CodexEvent(Event { id: "1".to_string(), diff --git a/codex-rs/tui/src/chatwidget/agent.rs b/codex-rs/tui/src/chatwidget/agent.rs index bf15b6c4ad..f9cb339677 100644 --- a/codex-rs/tui/src/chatwidget/agent.rs +++ b/codex-rs/tui/src/chatwidget/agent.rs @@ -1,12 +1,9 @@ use std::sync::Arc; -use codex_core::CodexConversation; -use codex_core::ConversationManager; -use codex_core::NewConversation; use codex_core::config::Config; use codex_core::protocol::Op; -use tokio::sync::mpsc::UnboundedSender; -use tokio::sync::mpsc::unbounded_channel; +use codex_core::{CodexConversation, ConversationManager, NewConversation}; +use tokio::sync::mpsc::{UnboundedSender, unbounded_channel}; use crate::app_event::AppEvent; use crate::app_event_sender::AppEventSender; diff --git a/codex-rs/tui/src/chatwidget/interrupts.rs b/codex-rs/tui/src/chatwidget/interrupts.rs index 531de3e646..a11e5ae15c 100644 --- a/codex-rs/tui/src/chatwidget/interrupts.rs +++ b/codex-rs/tui/src/chatwidget/interrupts.rs @@ -1,12 +1,9 @@ use std::collections::VecDeque; -use codex_core::protocol::ApplyPatchApprovalRequestEvent; -use codex_core::protocol::ExecApprovalRequestEvent; -use codex_core::protocol::ExecCommandBeginEvent; -use codex_core::protocol::ExecCommandEndEvent; -use codex_core::protocol::McpToolCallBeginEvent; -use codex_core::protocol::McpToolCallEndEvent; -use codex_core::protocol::PatchApplyEndEvent; +use codex_core::protocol::{ + ApplyPatchApprovalRequestEvent, ExecApprovalRequestEvent, ExecCommandBeginEvent, + ExecCommandEndEvent, McpToolCallBeginEvent, McpToolCallEndEvent, PatchApplyEndEvent, +}; use super::ChatWidget; diff --git a/codex-rs/tui/src/chatwidget/tests.rs b/codex-rs/tui/src/chatwidget/tests.rs index 50ff0b25a3..b970d99ba4 100644 --- a/codex-rs/tui/src/chatwidget/tests.rs +++ b/codex-rs/tui/src/chatwidget/tests.rs @@ -1,61 +1,34 @@ +use std::fs::File; +use std::io::{BufRead, BufReader}; +use std::path::PathBuf; + +use assert_matches::assert_matches; +use codex_common::approval_presets::builtin_approval_presets; +use codex_core::config::{Config, ConfigOverrides, ConfigToml, OPENAI_DEFAULT_MODEL}; +use codex_core::protocol::{ + AgentMessageDeltaEvent, AgentMessageEvent, AgentReasoningDeltaEvent, AgentReasoningEvent, + ApplyPatchApprovalRequestEvent, Event, EventMsg, ExecApprovalRequestEvent, + ExecCommandBeginEvent, ExecCommandEndEvent, ExitedReviewModeEvent, FileChange, Op, + PatchApplyBeginEvent, PatchApplyEndEvent, ReviewCodeLocation, ReviewFinding, ReviewLineRange, + ReviewOutputEvent, ReviewRequest, StreamErrorEvent, TaskCompleteEvent, TaskStartedEvent, + UndoCompletedEvent, UndoStartedEvent, ViewImageToolCallEvent, WarningEvent, +}; +use codex_core::{AuthManager, CodexAuth}; +use codex_protocol::ConversationId; +use codex_protocol::parse_command::ParsedCommand; +use codex_protocol::plan_tool::{PlanItemArg, StepStatus, UpdatePlanArgs}; +use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; +use insta::assert_snapshot; +use pretty_assertions::assert_eq; +use tempfile::{NamedTempFile, tempdir}; +use tokio::sync::mpsc::error::TryRecvError; +use tokio::sync::mpsc::unbounded_channel; + use super::*; use crate::app_event::AppEvent; use crate::app_event_sender::AppEventSender; use crate::test_backend::VT100Backend; use crate::tui::FrameRequester; -use assert_matches::assert_matches; -use codex_common::approval_presets::builtin_approval_presets; -use codex_core::AuthManager; -use codex_core::CodexAuth; -use codex_core::config::Config; -use codex_core::config::ConfigOverrides; -use codex_core::config::ConfigToml; -use codex_core::config::OPENAI_DEFAULT_MODEL; -use codex_core::protocol::AgentMessageDeltaEvent; -use codex_core::protocol::AgentMessageEvent; -use codex_core::protocol::AgentReasoningDeltaEvent; -use codex_core::protocol::AgentReasoningEvent; -use codex_core::protocol::ApplyPatchApprovalRequestEvent; -use codex_core::protocol::Event; -use codex_core::protocol::EventMsg; -use codex_core::protocol::ExecApprovalRequestEvent; -use codex_core::protocol::ExecCommandBeginEvent; -use codex_core::protocol::ExecCommandEndEvent; -use codex_core::protocol::ExitedReviewModeEvent; -use codex_core::protocol::FileChange; -use codex_core::protocol::Op; -use codex_core::protocol::PatchApplyBeginEvent; -use codex_core::protocol::PatchApplyEndEvent; -use codex_core::protocol::ReviewCodeLocation; -use codex_core::protocol::ReviewFinding; -use codex_core::protocol::ReviewLineRange; -use codex_core::protocol::ReviewOutputEvent; -use codex_core::protocol::ReviewRequest; -use codex_core::protocol::StreamErrorEvent; -use codex_core::protocol::TaskCompleteEvent; -use codex_core::protocol::TaskStartedEvent; -use codex_core::protocol::UndoCompletedEvent; -use codex_core::protocol::UndoStartedEvent; -use codex_core::protocol::ViewImageToolCallEvent; -use codex_core::protocol::WarningEvent; -use codex_protocol::ConversationId; -use codex_protocol::parse_command::ParsedCommand; -use codex_protocol::plan_tool::PlanItemArg; -use codex_protocol::plan_tool::StepStatus; -use codex_protocol::plan_tool::UpdatePlanArgs; -use crossterm::event::KeyCode; -use crossterm::event::KeyEvent; -use crossterm::event::KeyModifiers; -use insta::assert_snapshot; -use pretty_assertions::assert_eq; -use std::fs::File; -use std::io::BufRead; -use std::io::BufReader; -use std::path::PathBuf; -use tempfile::NamedTempFile; -use tempfile::tempdir; -use tokio::sync::mpsc::error::TryRecvError; -use tokio::sync::mpsc::unbounded_channel; const TEST_WARNING_MESSAGE: &str = "Heads up: Long conversations and multiple compactions can cause the model to be less accurate. Start new a new conversation when possible to keep conversations small and targeted."; diff --git a/codex-rs/tui/src/cli.rs b/codex-rs/tui/src/cli.rs index d86040b5c9..cee9ed7354 100644 --- a/codex-rs/tui/src/cli.rs +++ b/codex-rs/tui/src/cli.rs @@ -1,9 +1,8 @@ -use clap::Parser; -use clap::ValueHint; -use codex_common::ApprovalModeCliArg; -use codex_common::CliConfigOverrides; use std::path::PathBuf; +use clap::{Parser, ValueHint}; +use codex_common::{ApprovalModeCliArg, CliConfigOverrides}; + #[derive(Parser, Debug)] #[command(version)] pub struct Cli { diff --git a/codex-rs/tui/src/clipboard_paste.rs b/codex-rs/tui/src/clipboard_paste.rs index 4945eea350..b150a92615 100644 --- a/codex-rs/tui/src/clipboard_paste.rs +++ b/codex-rs/tui/src/clipboard_paste.rs @@ -1,5 +1,5 @@ -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; + use tempfile::Builder; #[derive(Debug)] diff --git a/codex-rs/tui/src/custom_terminal.rs b/codex-rs/tui/src/custom_terminal.rs index bd37fe8155..af05dad0ba 100644 --- a/codex-rs/tui/src/custom_terminal.rs +++ b/codex-rs/tui/src/custom_terminal.rs @@ -26,21 +26,14 @@ use std::io::Write; use crossterm::cursor::MoveTo; use crossterm::queue; -use crossterm::style::Colors; -use crossterm::style::Print; -use crossterm::style::SetAttribute; -use crossterm::style::SetBackgroundColor; -use crossterm::style::SetColors; -use crossterm::style::SetForegroundColor; +use crossterm::style::{ + Colors, Print, SetAttribute, SetBackgroundColor, SetColors, SetForegroundColor, +}; use crossterm::terminal::Clear; -use ratatui::backend::Backend; -use ratatui::backend::ClearType; +use ratatui::backend::{Backend, ClearType}; use ratatui::buffer::Buffer; -use ratatui::layout::Position; -use ratatui::layout::Rect; -use ratatui::layout::Size; -use ratatui::style::Color; -use ratatui::style::Modifier; +use ratatui::layout::{Position, Rect, Size}; +use ratatui::style::{Color, Modifier}; use ratatui::widgets::WidgetRef; #[derive(Debug, Hash)] @@ -596,11 +589,12 @@ impl ModifierDiff { #[cfg(test)] mod tests { - use super::*; use pretty_assertions::assert_eq; use ratatui::layout::Rect; use ratatui::style::Style; + use super::*; + #[test] fn diff_buffers_does_not_emit_clear_to_end_for_full_width_row() { let area = Rect::new(0, 0, 3, 2); diff --git a/codex-rs/tui/src/diff_render.rs b/codex-rs/tui/src/diff_render.rs index 24c5be597b..f74c6ce147 100644 --- a/codex-rs/tui/src/diff_render.rs +++ b/codex-rs/tui/src/diff_render.rs @@ -1,25 +1,19 @@ +use std::collections::HashMap; +use std::path::{Path, PathBuf}; + +use codex_core::git_info::get_git_repo_root; +use codex_core::protocol::FileChange; use diffy::Hunk; use ratatui::buffer::Buffer; use ratatui::layout::Rect; -use ratatui::style::Color; -use ratatui::style::Modifier; -use ratatui::style::Style; -use ratatui::style::Stylize; -use ratatui::text::Line as RtLine; -use ratatui::text::Span as RtSpan; +use ratatui::style::{Color, Modifier, Style, Stylize}; +use ratatui::text::{Line as RtLine, Span as RtSpan}; use ratatui::widgets::Paragraph; -use std::collections::HashMap; -use std::path::Path; -use std::path::PathBuf; use crate::exec_command::relativize_to_home; use crate::render::Insets; use crate::render::line_utils::prefix_lines; -use crate::render::renderable::ColumnRenderable; -use crate::render::renderable::InsetRenderable; -use crate::render::renderable::Renderable; -use codex_core::git_info::get_git_repo_root; -use codex_core::protocol::FileChange; +use crate::render::renderable::{ColumnRenderable, InsetRenderable, Renderable}; // Internal representation for diff line rendering enum DiffLineType { @@ -418,14 +412,13 @@ fn style_del() -> Style { #[cfg(test)] mod tests { - use super::*; use insta::assert_snapshot; use ratatui::Terminal; use ratatui::backend::TestBackend; use ratatui::text::Text; - use ratatui::widgets::Paragraph; - use ratatui::widgets::WidgetRef; - use ratatui::widgets::Wrap; + use ratatui::widgets::{Paragraph, WidgetRef, Wrap}; + + use super::*; fn diff_summary_for_tests(changes: &HashMap) -> Vec> { create_diff_summary(changes, &PathBuf::from("/"), 80) } diff --git a/codex-rs/tui/src/exec_cell/mod.rs b/codex-rs/tui/src/exec_cell/mod.rs index 906091113e..ec9c4f44d1 100644 --- a/codex-rs/tui/src/exec_cell/mod.rs +++ b/codex-rs/tui/src/exec_cell/mod.rs @@ -1,12 +1,9 @@ mod model; mod render; -pub(crate) use model::CommandOutput; #[cfg(test)] pub(crate) use model::ExecCall; -pub(crate) use model::ExecCell; -pub(crate) use render::OutputLinesParams; -pub(crate) use render::TOOL_CALL_MAX_LINES; -pub(crate) use render::new_active_exec_command; -pub(crate) use render::output_lines; -pub(crate) use render::spinner; +pub(crate) use model::{CommandOutput, ExecCell}; +pub(crate) use render::{ + OutputLinesParams, TOOL_CALL_MAX_LINES, new_active_exec_command, output_lines, spinner, +}; diff --git a/codex-rs/tui/src/exec_cell/model.rs b/codex-rs/tui/src/exec_cell/model.rs index 1d6b544eb1..e59b72482f 100644 --- a/codex-rs/tui/src/exec_cell/model.rs +++ b/codex-rs/tui/src/exec_cell/model.rs @@ -1,5 +1,4 @@ -use std::time::Duration; -use std::time::Instant; +use std::time::{Duration, Instant}; use codex_protocol::parse_command::ParsedCommand; diff --git a/codex-rs/tui/src/exec_cell/render.rs b/codex-rs/tui/src/exec_cell/render.rs index 3ccc0527e9..b9f77c45a0 100644 --- a/codex-rs/tui/src/exec_cell/render.rs +++ b/codex-rs/tui/src/exec_cell/render.rs @@ -1,27 +1,22 @@ use std::time::Instant; -use super::model::CommandOutput; -use super::model::ExecCall; -use super::model::ExecCell; -use crate::exec_command::strip_bash_lc_and_escape; -use crate::history_cell::HistoryCell; -use crate::render::highlight::highlight_bash_to_lines; -use crate::render::line_utils::prefix_lines; -use crate::render::line_utils::push_owned_lines; -use crate::shimmer::shimmer_spans; -use crate::wrapping::RtOptions; -use crate::wrapping::word_wrap_line; -use crate::wrapping::word_wrap_lines; use codex_ansi_escape::ansi_escape_line; use codex_common::elapsed::format_duration; use codex_protocol::parse_command::ParsedCommand; use itertools::Itertools; use ratatui::prelude::*; -use ratatui::style::Modifier; -use ratatui::style::Stylize; +use ratatui::style::{Modifier, Stylize}; use textwrap::WordSplitter; use unicode_width::UnicodeWidthStr; +use super::model::{CommandOutput, ExecCall, ExecCell}; +use crate::exec_command::strip_bash_lc_and_escape; +use crate::history_cell::HistoryCell; +use crate::render::highlight::highlight_bash_to_lines; +use crate::render::line_utils::{prefix_lines, push_owned_lines}; +use crate::shimmer::shimmer_spans; +use crate::wrapping::{RtOptions, word_wrap_line, word_wrap_lines}; + pub(crate) const TOOL_CALL_MAX_LINES: usize = 5; const USER_SHELL_TOOL_CALL_MAX_LINES: usize = 50; diff --git a/codex-rs/tui/src/exec_command.rs b/codex-rs/tui/src/exec_command.rs index 70ec4e84c7..813bd355ca 100644 --- a/codex-rs/tui/src/exec_command.rs +++ b/codex-rs/tui/src/exec_command.rs @@ -1,5 +1,4 @@ -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use dirs::home_dir; use shlex::try_join; diff --git a/codex-rs/tui/src/file_search.rs b/codex-rs/tui/src/file_search.rs index 61327cfd24..90c4645124 100644 --- a/codex-rs/tui/src/file_search.rs +++ b/codex-rs/tui/src/file_search.rs @@ -18,16 +18,15 @@ //! 4. If there is a in-flight search that is not a prefix of the latest thing //! the user typed, it is cancelled. -use codex_file_search as file_search; use std::num::NonZeroUsize; use std::path::PathBuf; -use std::sync::Arc; -use std::sync::Mutex; -use std::sync::atomic::AtomicBool; -use std::sync::atomic::Ordering; +use std::sync::atomic::{AtomicBool, Ordering}; +use std::sync::{Arc, Mutex}; use std::thread; use std::time::Duration; +use codex_file_search as file_search; + use crate::app_event::AppEvent; use crate::app_event_sender::AppEventSender; diff --git a/codex-rs/tui/src/get_git_diff.rs b/codex-rs/tui/src/get_git_diff.rs index 78ab53d92f..5c33c2e12e 100644 --- a/codex-rs/tui/src/get_git_diff.rs +++ b/codex-rs/tui/src/get_git_diff.rs @@ -8,6 +8,7 @@ use std::io; use std::path::Path; use std::process::Stdio; + use tokio::process::Command; /// Return value of [`get_git_diff`]. diff --git a/codex-rs/tui/src/history_cell.rs b/codex-rs/tui/src/history_cell.rs index 27f8220ac8..44b586917a 100644 --- a/codex-rs/tui/src/history_cell.rs +++ b/codex-rs/tui/src/history_cell.rs @@ -1,62 +1,39 @@ -use crate::diff_render::create_diff_summary; -use crate::diff_render::display_path_for; -use crate::exec_cell::CommandOutput; -use crate::exec_cell::OutputLinesParams; -use crate::exec_cell::TOOL_CALL_MAX_LINES; -use crate::exec_cell::output_lines; -use crate::exec_cell::spinner; -use crate::exec_command::relativize_to_home; -use crate::exec_command::strip_bash_lc_and_escape; -use crate::markdown::append_markdown; -use crate::render::line_utils::line_to_static; -use crate::render::line_utils::prefix_lines; -use crate::render::line_utils::push_owned_lines; -use crate::render::renderable::Renderable; -use crate::style::user_message_style; -use crate::text_formatting::format_and_truncate_tool_result; -use crate::text_formatting::truncate_text; -use crate::ui_consts::LIVE_PREFIX_COLS; -use crate::updates::UpdateAction; -use crate::version::CODEX_CLI_VERSION; -use crate::wrapping::RtOptions; -use crate::wrapping::word_wrap_line; -use crate::wrapping::word_wrap_lines; -use base64::Engine; -use codex_common::format_env_display::format_env_display; -use codex_core::config::Config; -use codex_core::config::types::McpServerTransportConfig; -use codex_core::config::types::ReasoningSummaryFormat; -use codex_core::protocol::FileChange; -use codex_core::protocol::McpAuthStatus; -use codex_core::protocol::McpInvocation; -use codex_core::protocol::SessionConfiguredEvent; -use codex_core::protocol_config_types::ReasoningEffort as ReasoningEffortConfig; -use codex_protocol::plan_tool::PlanItemArg; -use codex_protocol::plan_tool::StepStatus; -use codex_protocol::plan_tool::UpdatePlanArgs; -use image::DynamicImage; -use image::ImageReader; -use mcp_types::EmbeddedResourceResource; -use mcp_types::Resource; -use mcp_types::ResourceLink; -use mcp_types::ResourceTemplate; -use ratatui::prelude::*; -use ratatui::style::Modifier; -use ratatui::style::Style; -use ratatui::style::Styled; -use ratatui::style::Stylize; -use ratatui::widgets::Paragraph; -use ratatui::widgets::Wrap; use std::any::Any; use std::collections::HashMap; use std::io::Cursor; -use std::path::Path; -use std::path::PathBuf; -use std::time::Duration; -use std::time::Instant; +use std::path::{Path, PathBuf}; +use std::time::{Duration, Instant}; + +use base64::Engine; +use codex_common::format_env_display::format_env_display; +use codex_core::config::Config; +use codex_core::config::types::{McpServerTransportConfig, ReasoningSummaryFormat}; +use codex_core::protocol::{FileChange, McpAuthStatus, McpInvocation, SessionConfiguredEvent}; +use codex_core::protocol_config_types::ReasoningEffort as ReasoningEffortConfig; +use codex_protocol::plan_tool::{PlanItemArg, StepStatus, UpdatePlanArgs}; +use image::{DynamicImage, ImageReader}; +use mcp_types::{EmbeddedResourceResource, Resource, ResourceLink, ResourceTemplate}; +use ratatui::prelude::*; +use ratatui::style::{Modifier, Style, Styled, Stylize}; +use ratatui::widgets::{Paragraph, Wrap}; use tracing::error; use unicode_width::UnicodeWidthStr; +use crate::diff_render::{create_diff_summary, display_path_for}; +use crate::exec_cell::{ + CommandOutput, OutputLinesParams, TOOL_CALL_MAX_LINES, output_lines, spinner, +}; +use crate::exec_command::{relativize_to_home, strip_bash_lc_and_escape}; +use crate::markdown::append_markdown; +use crate::render::line_utils::{line_to_static, prefix_lines, push_owned_lines}; +use crate::render::renderable::Renderable; +use crate::style::user_message_style; +use crate::text_formatting::{format_and_truncate_tool_result, truncate_text}; +use crate::ui_consts::LIVE_PREFIX_COLS; +use crate::updates::UpdateAction; +use crate::version::CODEX_CLI_VERSION; +use crate::wrapping::{RtOptions, word_wrap_line, word_wrap_lines}; + /// Represents an event to display in the conversation history. Returns its /// `Vec>` representation to make it easier to display in a /// scrollable list. @@ -299,8 +276,7 @@ impl UpdateAvailableHistoryCell { impl HistoryCell for UpdateAvailableHistoryCell { fn display_lines(&self, width: u16) -> Vec> { - use ratatui_macros::line; - use ratatui_macros::text; + use ratatui_macros::{line, text}; let update_instruction = if let Some(update_action) = self.update_action { line!["Run ", update_action.command_str().cyan(), " to update."] } else { @@ -1444,27 +1420,19 @@ fn format_mcp_invocation<'a>(invocation: McpInvocation) -> Line<'a> { #[cfg(test)] mod tests { - use super::*; - use crate::exec_cell::CommandOutput; - use crate::exec_cell::ExecCall; - use crate::exec_cell::ExecCell; - use codex_core::config::Config; - use codex_core::config::ConfigOverrides; - use codex_core::config::ConfigToml; - use codex_core::config::types::McpServerConfig; - use codex_core::config::types::McpServerTransportConfig; + use std::collections::HashMap; + + use codex_core::config::types::{McpServerConfig, McpServerTransportConfig}; + use codex_core::config::{Config, ConfigOverrides, ConfigToml}; use codex_core::protocol::McpAuthStatus; use codex_protocol::parse_command::ParsedCommand; use dirs::home_dir; + use mcp_types::{CallToolResult, ContentBlock, TextContent, Tool, ToolInputSchema}; use pretty_assertions::assert_eq; use serde_json::json; - use std::collections::HashMap; - use mcp_types::CallToolResult; - use mcp_types::ContentBlock; - use mcp_types::TextContent; - use mcp_types::Tool; - use mcp_types::ToolInputSchema; + use super::*; + use crate::exec_cell::{CommandOutput, ExecCall, ExecCell}; fn test_config() -> Config { Config::load_from_base_config_with_overrides( diff --git a/codex-rs/tui/src/insert_history.rs b/codex-rs/tui/src/insert_history.rs index 36ef47da5e..594e6e448f 100644 --- a/codex-rs/tui/src/insert_history.rs +++ b/codex-rs/tui/src/insert_history.rs @@ -1,26 +1,18 @@ -use std::fmt; -use std::io; use std::io::Write; +use std::{fmt, io}; -use crate::wrapping::word_wrap_lines_borrowed; -use crossterm::Command; use crossterm::cursor::MoveTo; -use crossterm::queue; -use crossterm::style::Color as CColor; -use crossterm::style::Colors; -use crossterm::style::Print; -use crossterm::style::SetAttribute; -use crossterm::style::SetBackgroundColor; -use crossterm::style::SetColors; -use crossterm::style::SetForegroundColor; -use crossterm::terminal::Clear; -use crossterm::terminal::ClearType; +use crossterm::style::{ + Color as CColor, Colors, Print, SetAttribute, SetBackgroundColor, SetColors, SetForegroundColor, +}; +use crossterm::terminal::{Clear, ClearType}; +use crossterm::{Command, queue}; use ratatui::layout::Size; use ratatui::prelude::Backend; -use ratatui::style::Color; -use ratatui::style::Modifier; -use ratatui::text::Line; -use ratatui::text::Span; +use ratatui::style::{Color, Modifier}; +use ratatui::text::{Line, Span}; + +use crate::wrapping::word_wrap_lines_borrowed; /// Insert `lines` above the viewport using the terminal's backend writer /// (avoids direct stdout references). @@ -284,11 +276,12 @@ where #[cfg(test)] mod tests { + use ratatui::layout::Rect; + use ratatui::style::Color; + use super::*; use crate::markdown_render::render_markdown_text; use crate::test_backend::VT100Backend; - use ratatui::layout::Rect; - use ratatui::style::Color; #[test] fn writes_bold_then_regular_spans() { diff --git a/codex-rs/tui/src/key_hint.rs b/codex-rs/tui/src/key_hint.rs index 1126b8023c..ce2822bc97 100644 --- a/codex-rs/tui/src/key_hint.rs +++ b/codex-rs/tui/src/key_hint.rs @@ -1,9 +1,5 @@ -use crossterm::event::KeyCode; -use crossterm::event::KeyEvent; -use crossterm::event::KeyEventKind; -use crossterm::event::KeyModifiers; -use ratatui::style::Style; -use ratatui::style::Stylize; +use crossterm::event::{KeyCode, KeyEvent, KeyEventKind, KeyModifiers}; +use ratatui::style::{Style, Stylize}; use ratatui::text::Span; #[cfg(test)] diff --git a/codex-rs/tui/src/lib.rs b/codex-rs/tui/src/lib.rs index 99312ec198..cd16827d7d 100644 --- a/codex-rs/tui/src/lib.rs +++ b/codex-rs/tui/src/lib.rs @@ -3,26 +3,23 @@ // alternate‑screen mode starts; that file opts‑out locally via `allow`. #![deny(clippy::print_stdout, clippy::print_stderr)] #![deny(clippy::disallowed_methods)] +use std::fs::OpenOptions; +use std::path::PathBuf; + use additional_dirs::add_dir_warning_message; use app::App; pub use app::AppExitInfo; use codex_app_server_protocol::AuthMode; -use codex_core::AuthManager; -use codex_core::BUILT_IN_OSS_MODEL_PROVIDER_ID; -use codex_core::CodexAuth; -use codex_core::INTERACTIVE_SESSION_SOURCES; -use codex_core::RolloutRecorder; use codex_core::auth::enforce_login_restrictions; -use codex_core::config::Config; -use codex_core::config::ConfigOverrides; -use codex_core::find_conversation_path_by_id_str; -use codex_core::get_platform_sandbox; +use codex_core::config::{Config, ConfigOverrides}; use codex_core::protocol::AskForApproval; +use codex_core::{ + AuthManager, BUILT_IN_OSS_MODEL_PROVIDER_ID, CodexAuth, INTERACTIVE_SESSION_SOURCES, + RolloutRecorder, find_conversation_path_by_id_str, get_platform_sandbox, +}; use codex_ollama::DEFAULT_OSS_MODEL; use codex_protocol::config_types::SandboxMode; use opentelemetry_appender_tracing::layer::OpenTelemetryTracingBridge; -use std::fs::OpenOptions; -use std::path::PathBuf; use tracing::error; use tracing_appender::non_blocking; use tracing_subscriber::EnvFilter; @@ -80,16 +77,15 @@ mod wrapping; #[cfg(test)] pub mod test_backend; -use crate::onboarding::TrustDirectorySelection; -use crate::onboarding::WSL_INSTRUCTIONS; -use crate::onboarding::onboarding_screen::OnboardingScreenArgs; -use crate::onboarding::onboarding_screen::run_onboarding_app; -use crate::tui::Tui; +use std::io::Write as _; + pub use cli::Cli; pub use markdown_render::render_markdown_text; -pub use public_widgets::composer_input::ComposerAction; -pub use public_widgets::composer_input::ComposerInput; -use std::io::Write as _; +pub use public_widgets::composer_input::{ComposerAction, ComposerInput}; + +use crate::onboarding::onboarding_screen::{OnboardingScreenArgs, run_onboarding_app}; +use crate::onboarding::{TrustDirectorySelection, WSL_INSTRUCTIONS}; +use crate::tui::Tui; // (tests access modules directly within the crate) @@ -561,14 +557,13 @@ fn should_show_login_screen(login_status: LoginStatus, config: &Config) -> bool #[cfg(test)] mod tests { - use super::*; - use codex_core::config::ConfigOverrides; - use codex_core::config::ConfigToml; - use codex_core::config::ProjectConfig; + use codex_core::config::{ConfigOverrides, ConfigToml, ProjectConfig}; use codex_core::set_windows_sandbox_enabled; use serial_test::serial; use tempfile::TempDir; + use super::*; + #[test] #[serial] fn windows_skips_trust_prompt_without_sandbox() -> std::io::Result<()> { diff --git a/codex-rs/tui/src/live_wrap.rs b/codex-rs/tui/src/live_wrap.rs index e78710dc6c..3aece7cd19 100644 --- a/codex-rs/tui/src/live_wrap.rs +++ b/codex-rs/tui/src/live_wrap.rs @@ -1,5 +1,4 @@ -use unicode_width::UnicodeWidthChar; -use unicode_width::UnicodeWidthStr; +use unicode_width::{UnicodeWidthChar, UnicodeWidthStr}; /// A single visual row produced by RowBuilder. #[derive(Debug, Clone, PartialEq, Eq)] @@ -208,9 +207,10 @@ pub fn take_prefix_by_width(text: &str, max_cols: usize) -> (String, &str, usize #[cfg(test)] mod tests { - use super::*; use pretty_assertions::assert_eq; + use super::*; + #[test] fn rows_do_not_exceed_width_ascii() { let mut rb = RowBuilder::new(10); diff --git a/codex-rs/tui/src/main.rs b/codex-rs/tui/src/main.rs index 50ea95f170..51f2ab7d38 100644 --- a/codex-rs/tui/src/main.rs +++ b/codex-rs/tui/src/main.rs @@ -1,8 +1,7 @@ use clap::Parser; use codex_arg0::arg0_dispatch_or_else; use codex_common::CliConfigOverrides; -use codex_tui::Cli; -use codex_tui::run_main; +use codex_tui::{Cli, run_main}; #[derive(Parser, Debug)] struct TopCli { diff --git a/codex-rs/tui/src/markdown.rs b/codex-rs/tui/src/markdown.rs index 2ea307066b..d57b560d0f 100644 --- a/codex-rs/tui/src/markdown.rs +++ b/codex-rs/tui/src/markdown.rs @@ -10,10 +10,11 @@ pub(crate) fn append_markdown( #[cfg(test)] mod tests { - use super::*; use pretty_assertions::assert_eq; use ratatui::text::Line; + use super::*; + fn lines_to_strings(lines: &[Line<'static>]) -> Vec { lines .iter() diff --git a/codex-rs/tui/src/markdown_render.rs b/codex-rs/tui/src/markdown_render.rs index 099d0860c2..260dae3393 100644 --- a/codex-rs/tui/src/markdown_render.rs +++ b/codex-rs/tui/src/markdown_render.rs @@ -1,19 +1,9 @@ +use pulldown_cmark::{CodeBlockKind, CowStr, Event, HeadingLevel, Options, Parser, Tag, TagEnd}; +use ratatui::style::{Style, Stylize}; +use ratatui::text::{Line, Span, Text}; + use crate::render::line_utils::line_to_static; -use crate::wrapping::RtOptions; -use crate::wrapping::word_wrap_line; -use pulldown_cmark::CodeBlockKind; -use pulldown_cmark::CowStr; -use pulldown_cmark::Event; -use pulldown_cmark::HeadingLevel; -use pulldown_cmark::Options; -use pulldown_cmark::Parser; -use pulldown_cmark::Tag; -use pulldown_cmark::TagEnd; -use ratatui::style::Style; -use ratatui::style::Stylize; -use ratatui::text::Line; -use ratatui::text::Span; -use ratatui::text::Text; +use crate::wrapping::{RtOptions, word_wrap_line}; #[derive(Clone, Debug)] struct IndentContext { @@ -496,10 +486,11 @@ mod markdown_render_tests { #[cfg(test)] mod tests { - use super::*; use pretty_assertions::assert_eq; use ratatui::text::Text; + use super::*; + fn lines_to_strings(text: &Text<'_>) -> Vec { text.lines .iter() diff --git a/codex-rs/tui/src/markdown_stream.rs b/codex-rs/tui/src/markdown_stream.rs index 6ac457eee2..e2543b938b 100644 --- a/codex-rs/tui/src/markdown_stream.rs +++ b/codex-rs/tui/src/markdown_stream.rs @@ -117,9 +117,10 @@ pub(crate) fn simulate_stream_markdown_for_tests( #[cfg(test)] mod tests { - use super::*; use ratatui::style::Color; + use super::*; + #[tokio::test] async fn no_commit_until_newline() { let mut c = super::MarkdownStreamCollector::new(None); diff --git a/codex-rs/tui/src/onboarding/auth.rs b/codex-rs/tui/src/onboarding/auth.rs index 06e1c629e3..68a5a571f4 100644 --- a/codex-rs/tui/src/onboarding/auth.rs +++ b/codex-rs/tui/src/onboarding/auth.rs @@ -1,47 +1,28 @@ #![allow(clippy::unwrap_used)] -use codex_core::AuthManager; -use codex_core::auth::AuthCredentialsStoreMode; -use codex_core::auth::CLIENT_ID; -use codex_core::auth::login_with_api_key; -use codex_core::auth::read_openai_api_key_from_env; -use codex_login::ServerOptions; -use codex_login::ShutdownHandle; -use codex_login::run_login_server; -use crossterm::event::KeyCode; -use crossterm::event::KeyEvent; -use crossterm::event::KeyEventKind; -use crossterm::event::KeyModifiers; -use ratatui::buffer::Buffer; -use ratatui::layout::Constraint; -use ratatui::layout::Layout; -use ratatui::layout::Rect; -use ratatui::prelude::Widget; -use ratatui::style::Color; -use ratatui::style::Modifier; -use ratatui::style::Style; -use ratatui::style::Stylize; -use ratatui::text::Line; -use ratatui::widgets::Block; -use ratatui::widgets::BorderType; -use ratatui::widgets::Borders; -use ratatui::widgets::Paragraph; -use ratatui::widgets::WidgetRef; -use ratatui::widgets::Wrap; +use std::path::PathBuf; +use std::sync::{Arc, RwLock}; use codex_app_server_protocol::AuthMode; +use codex_core::AuthManager; +use codex_core::auth::{ + AuthCredentialsStoreMode, CLIENT_ID, login_with_api_key, read_openai_api_key_from_env, +}; +use codex_login::{ServerOptions, ShutdownHandle, run_login_server}; use codex_protocol::config_types::ForcedLoginMethod; -use std::sync::RwLock; - -use crate::LoginStatus; -use crate::onboarding::onboarding_screen::KeyboardHandler; -use crate::onboarding::onboarding_screen::StepStateProvider; -use crate::shimmer::shimmer_spans; -use crate::tui::FrameRequester; -use std::path::PathBuf; -use std::sync::Arc; +use crossterm::event::{KeyCode, KeyEvent, KeyEventKind, KeyModifiers}; +use ratatui::buffer::Buffer; +use ratatui::layout::{Constraint, Layout, Rect}; +use ratatui::prelude::Widget; +use ratatui::style::{Color, Modifier, Style, Stylize}; +use ratatui::text::Line; +use ratatui::widgets::{Block, BorderType, Borders, Paragraph, WidgetRef, Wrap}; use super::onboarding_screen::StepState; +use crate::LoginStatus; +use crate::onboarding::onboarding_screen::{KeyboardHandler, StepStateProvider}; +use crate::shimmer::shimmer_spans; +use crate::tui::FrameRequester; #[derive(Clone)] pub(crate) enum SignInState { @@ -646,11 +627,11 @@ impl WidgetRef for AuthModeWidget { #[cfg(test)] mod tests { - use super::*; + use codex_core::auth::AuthCredentialsStoreMode; use pretty_assertions::assert_eq; use tempfile::TempDir; - use codex_core::auth::AuthCredentialsStoreMode; + use super::*; fn widget_forced_chatgpt() -> (AuthModeWidget, TempDir) { let codex_home = TempDir::new().unwrap(); diff --git a/codex-rs/tui/src/onboarding/onboarding_screen.rs b/codex-rs/tui/src/onboarding/onboarding_screen.rs index 6a1a9ff5d9..d84678199a 100644 --- a/codex-rs/tui/src/onboarding/onboarding_screen.rs +++ b/codex-rs/tui/src/onboarding/onboarding_screen.rs @@ -1,32 +1,24 @@ +use std::sync::{Arc, RwLock}; + +use codex_app_server_protocol::AuthMode; use codex_core::AuthManager; use codex_core::config::Config; use codex_core::git_info::get_git_repo_root; -use crossterm::event::KeyCode; -use crossterm::event::KeyEvent; -use crossterm::event::KeyEventKind; +use codex_protocol::config_types::ForcedLoginMethod; +use color_eyre::eyre::Result; +use crossterm::event::{KeyCode, KeyEvent, KeyEventKind}; use ratatui::buffer::Buffer; use ratatui::layout::Rect; use ratatui::prelude::Widget; use ratatui::style::Color; -use ratatui::widgets::Clear; -use ratatui::widgets::WidgetRef; - -use codex_app_server_protocol::AuthMode; -use codex_protocol::config_types::ForcedLoginMethod; +use ratatui::widgets::{Clear, WidgetRef}; use crate::LoginStatus; -use crate::onboarding::auth::AuthModeWidget; -use crate::onboarding::auth::SignInState; -use crate::onboarding::trust_directory::TrustDirectorySelection; -use crate::onboarding::trust_directory::TrustDirectoryWidget; +use crate::onboarding::auth::{AuthModeWidget, SignInState}; +use crate::onboarding::trust_directory::{TrustDirectorySelection, TrustDirectoryWidget}; use crate::onboarding::welcome::WelcomeWidget; use crate::onboarding::windows::WindowsSetupWidget; -use crate::tui::FrameRequester; -use crate::tui::Tui; -use crate::tui::TuiEvent; -use color_eyre::eyre::Result; -use std::sync::Arc; -use std::sync::RwLock; +use crate::tui::{FrameRequester, Tui, TuiEvent}; #[allow(clippy::large_enum_variant)] enum Step { diff --git a/codex-rs/tui/src/onboarding/trust_directory.rs b/codex-rs/tui/src/onboarding/trust_directory.rs index 8a7541c022..0f8ad620e1 100644 --- a/codex-rs/tui/src/onboarding/trust_directory.rs +++ b/codex-rs/tui/src/onboarding/trust_directory.rs @@ -2,27 +2,19 @@ use std::path::PathBuf; use codex_core::config::set_project_trusted; use codex_core::git_info::resolve_root_git_project_for_trust; -use crossterm::event::KeyCode; -use crossterm::event::KeyEvent; -use crossterm::event::KeyEventKind; +use crossterm::event::{KeyCode, KeyEvent, KeyEventKind}; use ratatui::buffer::Buffer; use ratatui::layout::Rect; use ratatui::style::Stylize; use ratatui::text::Line; -use ratatui::widgets::Paragraph; -use ratatui::widgets::WidgetRef; -use ratatui::widgets::Wrap; - -use crate::key_hint; -use crate::onboarding::onboarding_screen::KeyboardHandler; -use crate::onboarding::onboarding_screen::StepStateProvider; -use crate::render::Insets; -use crate::render::renderable::ColumnRenderable; -use crate::render::renderable::Renderable; -use crate::render::renderable::RenderableExt as _; -use crate::selection_list::selection_option_row; +use ratatui::widgets::{Paragraph, WidgetRef, Wrap}; use super::onboarding_screen::StepState; +use crate::key_hint; +use crate::onboarding::onboarding_screen::{KeyboardHandler, StepStateProvider}; +use crate::render::Insets; +use crate::render::renderable::{ColumnRenderable, Renderable, RenderableExt as _}; +use crate::selection_list::selection_option_row; pub(crate) struct TrustDirectoryWidget { pub codex_home: PathBuf, pub cwd: PathBuf, @@ -169,17 +161,14 @@ impl TrustDirectoryWidget { #[cfg(test)] mod tests { - use crate::test_backend::VT100Backend; + use std::path::PathBuf; - use super::*; - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyEventKind; - use crossterm::event::KeyModifiers; + use crossterm::event::{KeyCode, KeyEvent, KeyEventKind, KeyModifiers}; use pretty_assertions::assert_eq; use ratatui::Terminal; - use std::path::PathBuf; + use super::*; + use crate::test_backend::VT100Backend; #[test] fn release_event_does_not_change_selection() { diff --git a/codex-rs/tui/src/onboarding/welcome.rs b/codex-rs/tui/src/onboarding/welcome.rs index 645c86ba43..a6f9760d83 100644 --- a/codex-rs/tui/src/onboarding/welcome.rs +++ b/codex-rs/tui/src/onboarding/welcome.rs @@ -1,23 +1,15 @@ -use crossterm::event::KeyCode; -use crossterm::event::KeyEvent; -use crossterm::event::KeyEventKind; -use crossterm::event::KeyModifiers; +use crossterm::event::{KeyCode, KeyEvent, KeyEventKind, KeyModifiers}; use ratatui::buffer::Buffer; use ratatui::layout::Rect; use ratatui::prelude::Widget; use ratatui::style::Stylize; use ratatui::text::Line; -use ratatui::widgets::Clear; -use ratatui::widgets::Paragraph; -use ratatui::widgets::WidgetRef; -use ratatui::widgets::Wrap; - -use crate::ascii_animation::AsciiAnimation; -use crate::onboarding::onboarding_screen::KeyboardHandler; -use crate::onboarding::onboarding_screen::StepStateProvider; -use crate::tui::FrameRequester; +use ratatui::widgets::{Clear, Paragraph, WidgetRef, Wrap}; use super::onboarding_screen::StepState; +use crate::ascii_animation::AsciiAnimation; +use crate::onboarding::onboarding_screen::{KeyboardHandler, StepStateProvider}; +use crate::tui::FrameRequester; const MIN_ANIMATION_HEIGHT: u16 = 20; const MIN_ANIMATION_WIDTH: u16 = 60; @@ -89,10 +81,11 @@ impl StepStateProvider for WelcomeWidget { #[cfg(test)] mod tests { - use super::*; use ratatui::buffer::Buffer; use ratatui::layout::Rect; + use super::*; + static VARIANT_A: [&str; 1] = ["frame-a"]; static VARIANT_B: [&str; 1] = ["frame-b"]; static VARIANTS: [&[&str]; 2] = [&VARIANT_A, &VARIANT_B]; diff --git a/codex-rs/tui/src/onboarding/windows.rs b/codex-rs/tui/src/onboarding/windows.rs index 715611b7e1..a53ab48cd2 100644 --- a/codex-rs/tui/src/onboarding/windows.rs +++ b/codex-rs/tui/src/onboarding/windows.rs @@ -1,23 +1,16 @@ use std::path::PathBuf; use codex_core::config::edit::ConfigEditsBuilder; -use crossterm::event::KeyCode; -use crossterm::event::KeyEvent; -use crossterm::event::KeyEventKind; +use crossterm::event::{KeyCode, KeyEvent, KeyEventKind}; use ratatui::buffer::Buffer; use ratatui::layout::Rect; use ratatui::prelude::Widget; -use ratatui::style::Color; -use ratatui::style::Stylize; +use ratatui::style::{Color, Stylize}; use ratatui::text::Line; -use ratatui::widgets::Paragraph; -use ratatui::widgets::WidgetRef; -use ratatui::widgets::Wrap; - -use crate::onboarding::onboarding_screen::KeyboardHandler; -use crate::onboarding::onboarding_screen::StepStateProvider; +use ratatui::widgets::{Paragraph, WidgetRef, Wrap}; use super::onboarding_screen::StepState; +use crate::onboarding::onboarding_screen::{KeyboardHandler, StepStateProvider}; pub(crate) const WSL_INSTRUCTIONS: &str = r#"Install WSL2 by opening PowerShell as Administrator and running: # Install WSL using the default Linux distribution (Ubuntu). @@ -176,9 +169,10 @@ impl StepStateProvider for WindowsSetupWidget { #[cfg(test)] mod tests { - use super::*; use tempfile::TempDir; + use super::*; + #[test] fn windows_step_hidden_after_continue() { let temp_dir = TempDir::new().expect("temp dir"); diff --git a/codex-rs/tui/src/pager_overlay.rs b/codex-rs/tui/src/pager_overlay.rs index 82f43d84d6..3769f6e38b 100644 --- a/codex-rs/tui/src/pager_overlay.rs +++ b/codex-rs/tui/src/pager_overlay.rs @@ -2,31 +2,20 @@ use std::io::Result; use std::sync::Arc; use std::time::Duration; -use crate::history_cell::HistoryCell; -use crate::history_cell::UserHistoryCell; -use crate::key_hint; +use crossterm::event::{KeyCode, KeyEvent}; +use ratatui::buffer::{Buffer, Cell}; +use ratatui::layout::Rect; +use ratatui::style::{Style, Stylize}; +use ratatui::text::{Line, Span, Text}; +use ratatui::widgets::{Clear, Paragraph, Widget, WidgetRef, Wrap}; + +use crate::history_cell::{HistoryCell, UserHistoryCell}; use crate::key_hint::KeyBinding; use crate::render::Insets; -use crate::render::renderable::InsetRenderable; -use crate::render::renderable::Renderable; +use crate::render::renderable::{InsetRenderable, Renderable}; use crate::style::user_message_style; -use crate::tui; use crate::tui::TuiEvent; -use crossterm::event::KeyCode; -use crossterm::event::KeyEvent; -use ratatui::buffer::Buffer; -use ratatui::buffer::Cell; -use ratatui::layout::Rect; -use ratatui::style::Style; -use ratatui::style::Stylize; -use ratatui::text::Line; -use ratatui::text::Span; -use ratatui::text::Text; -use ratatui::widgets::Clear; -use ratatui::widgets::Paragraph; -use ratatui::widgets::Widget; -use ratatui::widgets::WidgetRef; -use ratatui::widgets::Wrap; +use crate::{key_hint, tui}; pub(crate) enum Overlay { Transcript(TranscriptOverlay), @@ -578,24 +567,23 @@ fn render_offset_content( #[cfg(test)] mod tests { - use super::*; - use codex_core::protocol::ReviewDecision; - use insta::assert_snapshot; use std::collections::HashMap; use std::path::PathBuf; use std::sync::Arc; use std::time::Duration; - use crate::exec_cell::CommandOutput; - use crate::history_cell; - use crate::history_cell::HistoryCell; - use crate::history_cell::new_patch_event; - use codex_core::protocol::FileChange; + use codex_core::protocol::{FileChange, ReviewDecision}; use codex_protocol::parse_command::ParsedCommand; + use insta::assert_snapshot; use ratatui::Terminal; use ratatui::backend::TestBackend; use ratatui::text::Text; + use super::*; + use crate::exec_cell::CommandOutput; + use crate::history_cell; + use crate::history_cell::{HistoryCell, new_patch_event}; + #[derive(Debug)] struct TestCell { lines: Vec>, diff --git a/codex-rs/tui/src/public_widgets/composer_input.rs b/codex-rs/tui/src/public_widgets/composer_input.rs index 2a80c087ee..076608cc44 100644 --- a/codex-rs/tui/src/public_widgets/composer_input.rs +++ b/codex-rs/tui/src/public_widgets/composer_input.rs @@ -4,15 +4,15 @@ //! codex-cloud-tasks) to reuse the mature composer behavior: multi-line input, //! paste heuristics, Enter-to-submit, and Shift+Enter for newline. +use std::time::Duration; + use crossterm::event::KeyEvent; use ratatui::buffer::Buffer; use ratatui::layout::Rect; -use std::time::Duration; use crate::app_event::AppEvent; use crate::app_event_sender::AppEventSender; -use crate::bottom_pane::ChatComposer; -use crate::bottom_pane::InputResult; +use crate::bottom_pane::{ChatComposer, InputResult}; use crate::render::renderable::Renderable; /// Action returned from feeding a key event into the ComposerInput. diff --git a/codex-rs/tui/src/render/highlight.rs b/codex-rs/tui/src/render/highlight.rs index e6d200cc3d..f2fbb4cc29 100644 --- a/codex-rs/tui/src/render/highlight.rs +++ b/codex-rs/tui/src/render/highlight.rs @@ -1,12 +1,8 @@ -use ratatui::style::Style; -use ratatui::style::Stylize; -use ratatui::text::Line; -use ratatui::text::Span; use std::sync::OnceLock; -use tree_sitter_highlight::Highlight; -use tree_sitter_highlight::HighlightConfiguration; -use tree_sitter_highlight::HighlightEvent; -use tree_sitter_highlight::Highlighter; + +use ratatui::style::{Style, Stylize}; +use ratatui::text::{Line, Span}; +use tree_sitter_highlight::{Highlight, HighlightConfiguration, HighlightEvent, Highlighter}; // Ref: https://github.com/tree-sitter/tree-sitter-bash/blob/master/queries/highlights.scm #[derive(Copy, Clone)] @@ -145,10 +141,11 @@ pub(crate) fn highlight_bash_to_lines(script: &str) -> Vec> { #[cfg(test)] mod tests { - use super::*; use pretty_assertions::assert_eq; use ratatui::style::Modifier; + use super::*; + fn reconstructed(lines: &[Line<'static>]) -> String { lines .iter() diff --git a/codex-rs/tui/src/render/line_utils.rs b/codex-rs/tui/src/render/line_utils.rs index 175b79b2a8..e565729587 100644 --- a/codex-rs/tui/src/render/line_utils.rs +++ b/codex-rs/tui/src/render/line_utils.rs @@ -1,5 +1,4 @@ -use ratatui::text::Line; -use ratatui::text::Span; +use ratatui::text::{Line, Span}; /// Clone a borrowed ratatui `Line` into an owned `'static` line. pub fn line_to_static(line: &Line<'_>) -> Line<'static> { diff --git a/codex-rs/tui/src/render/renderable.rs b/codex-rs/tui/src/render/renderable.rs index 8581468c0a..4c1dd3b8bd 100644 --- a/codex-rs/tui/src/render/renderable.rs +++ b/codex-rs/tui/src/render/renderable.rs @@ -2,13 +2,10 @@ use std::sync::Arc; use ratatui::buffer::Buffer; use ratatui::layout::Rect; -use ratatui::text::Line; -use ratatui::text::Span; -use ratatui::widgets::Paragraph; -use ratatui::widgets::WidgetRef; +use ratatui::text::{Line, Span}; +use ratatui::widgets::{Paragraph, WidgetRef}; -use crate::render::Insets; -use crate::render::RectExt as _; +use crate::render::{Insets, RectExt as _}; pub trait Renderable { fn render(&self, area: Rect, buf: &mut Buffer); diff --git a/codex-rs/tui/src/resume_picker.rs b/codex-rs/tui/src/resume_picker.rs index 83e3a1aef4..07bb315a0d 100644 --- a/codex-rs/tui/src/resume_picker.rs +++ b/codex-rs/tui/src/resume_picker.rs @@ -1,26 +1,18 @@ use std::collections::HashSet; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; use std::sync::Arc; -use chrono::DateTime; -use chrono::Utc; -use codex_core::ConversationItem; -use codex_core::ConversationsPage; -use codex_core::Cursor; -use codex_core::INTERACTIVE_SESSION_SOURCES; -use codex_core::RolloutRecorder; +use chrono::{DateTime, Utc}; +use codex_core::{ + ConversationItem, ConversationsPage, Cursor, INTERACTIVE_SESSION_SOURCES, RolloutRecorder, +}; use codex_protocol::items::TurnItem; +use codex_protocol::models::ResponseItem; use color_eyre::eyre::Result; -use crossterm::event::KeyCode; -use crossterm::event::KeyEvent; -use crossterm::event::KeyEventKind; -use ratatui::layout::Constraint; -use ratatui::layout::Layout; -use ratatui::layout::Rect; +use crossterm::event::{KeyCode, KeyEvent, KeyEventKind}; +use ratatui::layout::{Constraint, Layout, Rect}; use ratatui::style::Stylize as _; -use ratatui::text::Line; -use ratatui::text::Span; +use ratatui::text::{Line, Span}; use tokio::sync::mpsc; use tokio_stream::StreamExt; use tokio_stream::wrappers::UnboundedReceiverStream; @@ -28,10 +20,7 @@ use unicode_width::UnicodeWidthStr; use crate::key_hint; use crate::text_formatting::truncate_text; -use crate::tui::FrameRequester; -use crate::tui::Tui; -use crate::tui::TuiEvent; -use codex_protocol::models::ResponseItem; +use crate::tui::{FrameRequester, Tui, TuiEvent}; const PAGE_SIZE: usize = 25; const LOAD_NEAR_THRESHOLD: usize = 5; @@ -918,17 +907,16 @@ fn calculate_column_metrics(rows: &[Row]) -> ColumnMetrics { #[cfg(test)] mod tests { - use super::*; - use chrono::Duration; - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; - use insta::assert_snapshot; - use serde_json::json; use std::future::Future; use std::path::PathBuf; - use std::sync::Arc; - use std::sync::Mutex; + use std::sync::{Arc, Mutex}; + + use chrono::Duration; + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; + use insta::assert_snapshot; + use serde_json::json; + + use super::*; fn head_with_ts_and_user_text(ts: &str, texts: &[&str]) -> Vec { vec![ @@ -1077,10 +1065,10 @@ mod tests { #[test] fn resume_table_snapshot() { + use ratatui::layout::{Constraint, Layout}; + use crate::custom_terminal::Terminal; use crate::test_backend::VT100Backend; - use ratatui::layout::Constraint; - use ratatui::layout::Layout; let loader: PageLoader = Arc::new(|_| {}); let mut state = PickerState::new( diff --git a/codex-rs/tui/src/selection_list.rs b/codex-rs/tui/src/selection_list.rs index 4816735437..9c78e07458 100644 --- a/codex-rs/tui/src/selection_list.rs +++ b/codex-rs/tui/src/selection_list.rs @@ -1,12 +1,9 @@ -use crate::render::renderable::Renderable; -use crate::render::renderable::RowRenderable; -use ratatui::style::Style; -use ratatui::style::Styled as _; -use ratatui::style::Stylize as _; -use ratatui::widgets::Paragraph; -use ratatui::widgets::Wrap; +use ratatui::style::{Style, Styled as _, Stylize as _}; +use ratatui::widgets::{Paragraph, Wrap}; use unicode_width::UnicodeWidthStr; +use crate::render::renderable::{Renderable, RowRenderable}; + pub(crate) fn selection_option_row( index: usize, label: String, diff --git a/codex-rs/tui/src/session_log.rs b/codex-rs/tui/src/session_log.rs index b2858e8f21..33fec24592 100644 --- a/codex-rs/tui/src/session_log.rs +++ b/codex-rs/tui/src/session_log.rs @@ -1,10 +1,7 @@ -use std::fs::File; -use std::fs::OpenOptions; +use std::fs::{File, OpenOptions}; use std::io::Write; use std::path::PathBuf; -use std::sync::LazyLock; -use std::sync::Mutex; -use std::sync::OnceLock; +use std::sync::{LazyLock, Mutex, OnceLock}; use codex_core::config::Config; use codex_core::protocol::Op; diff --git a/codex-rs/tui/src/shimmer.rs b/codex-rs/tui/src/shimmer.rs index ba081e7c49..b4f529af2e 100644 --- a/codex-rs/tui/src/shimmer.rs +++ b/codex-rs/tui/src/shimmer.rs @@ -1,15 +1,11 @@ use std::sync::OnceLock; -use std::time::Duration; -use std::time::Instant; +use std::time::{Duration, Instant}; -use ratatui::style::Color; -use ratatui::style::Modifier; -use ratatui::style::Style; +use ratatui::style::{Color, Modifier, Style}; use ratatui::text::Span; use crate::color::blend; -use crate::terminal_palette::default_bg; -use crate::terminal_palette::default_fg; +use crate::terminal_palette::{default_bg, default_fg}; static PROCESS_START: OnceLock = OnceLock::new(); diff --git a/codex-rs/tui/src/slash_command.rs b/codex-rs/tui/src/slash_command.rs index 969d279b07..d2726384ba 100644 --- a/codex-rs/tui/src/slash_command.rs +++ b/codex-rs/tui/src/slash_command.rs @@ -1,8 +1,5 @@ use strum::IntoEnumIterator; -use strum_macros::AsRefStr; -use strum_macros::EnumIter; -use strum_macros::EnumString; -use strum_macros::IntoStaticStr; +use strum_macros::{AsRefStr, EnumIter, EnumString, IntoStaticStr}; /// Commands that can be invoked by starting a message with a leading slash. #[derive( diff --git a/codex-rs/tui/src/status/card.rs b/codex-rs/tui/src/status/card.rs index 11b723fef9..2b7ba6d048 100644 --- a/codex-rs/tui/src/status/card.rs +++ b/codex-rs/tui/src/status/card.rs @@ -1,38 +1,29 @@ -use crate::history_cell::CompositeHistoryCell; -use crate::history_cell::HistoryCell; -use crate::history_cell::PlainHistoryCell; -use crate::history_cell::with_border_with_inner_width; -use crate::version::CODEX_CLI_VERSION; -use chrono::DateTime; -use chrono::Local; -use codex_common::create_config_summary_entries; -use codex_core::config::Config; -use codex_core::protocol::SandboxPolicy; -use codex_core::protocol::TokenUsage; -use codex_protocol::ConversationId; -use ratatui::prelude::*; -use ratatui::style::Stylize; use std::collections::BTreeSet; use std::path::PathBuf; +use chrono::{DateTime, Local}; +use codex_common::create_config_summary_entries; +use codex_core::config::Config; +use codex_core::protocol::{SandboxPolicy, TokenUsage}; +use codex_protocol::ConversationId; +use ratatui::prelude::*; +use ratatui::style::Stylize; + use super::account::StatusAccountDisplay; -use super::format::FieldFormatter; -use super::format::line_display_width; -use super::format::push_label; -use super::format::truncate_line_to_width; -use super::helpers::compose_account_display; -use super::helpers::compose_agents_summary; -use super::helpers::compose_model_display; -use super::helpers::format_directory_display; -use super::helpers::format_tokens_compact; -use super::rate_limits::RateLimitSnapshotDisplay; -use super::rate_limits::StatusRateLimitData; -use super::rate_limits::StatusRateLimitRow; -use super::rate_limits::compose_rate_limit_data; -use super::rate_limits::format_status_limit_summary; -use super::rate_limits::render_status_limit_progress_bar; -use crate::wrapping::RtOptions; -use crate::wrapping::word_wrap_lines; +use super::format::{FieldFormatter, line_display_width, push_label, truncate_line_to_width}; +use super::helpers::{ + compose_account_display, compose_agents_summary, compose_model_display, + format_directory_display, format_tokens_compact, +}; +use super::rate_limits::{ + RateLimitSnapshotDisplay, StatusRateLimitData, StatusRateLimitRow, compose_rate_limit_data, + format_status_limit_summary, render_status_limit_progress_bar, +}; +use crate::history_cell::{ + CompositeHistoryCell, HistoryCell, PlainHistoryCell, with_border_with_inner_width, +}; +use crate::version::CODEX_CLI_VERSION; +use crate::wrapping::{RtOptions, word_wrap_lines}; #[derive(Debug, Clone)] struct StatusContextWindowData { diff --git a/codex-rs/tui/src/status/format.rs b/codex-rs/tui/src/status/format.rs index fda729040a..ffc25e4b6f 100644 --- a/codex-rs/tui/src/status/format.rs +++ b/codex-rs/tui/src/status/format.rs @@ -1,8 +1,8 @@ +use std::collections::BTreeSet; + use ratatui::prelude::*; use ratatui::style::Stylize; -use std::collections::BTreeSet; -use unicode_width::UnicodeWidthChar; -use unicode_width::UnicodeWidthStr; +use unicode_width::{UnicodeWidthChar, UnicodeWidthStr}; #[derive(Debug, Clone)] pub(crate) struct FieldFormatter { diff --git a/codex-rs/tui/src/status/helpers.rs b/codex-rs/tui/src/status/helpers.rs index 52544b3d9c..beaae56c23 100644 --- a/codex-rs/tui/src/status/helpers.rs +++ b/codex-rs/tui/src/status/helpers.rs @@ -1,14 +1,14 @@ -use crate::exec_command::relativize_to_home; -use crate::text_formatting; -use chrono::DateTime; -use chrono::Local; +use std::path::Path; + +use chrono::{DateTime, Local}; use codex_core::auth::load_auth_dot_json; use codex_core::config::Config; use codex_core::project_doc::discover_project_doc_paths; -use std::path::Path; use unicode_width::UnicodeWidthStr; use super::account::StatusAccountDisplay; +use crate::exec_command::relativize_to_home; +use crate::text_formatting; fn normalize_agents_display_path(path: &Path) -> String { dunce::simplified(path).display().to_string() diff --git a/codex-rs/tui/src/status/mod.rs b/codex-rs/tui/src/status/mod.rs index eccb6b72b5..7c0e42a22f 100644 --- a/codex-rs/tui/src/status/mod.rs +++ b/codex-rs/tui/src/status/mod.rs @@ -5,8 +5,7 @@ mod helpers; mod rate_limits; pub(crate) use card::new_status_output; -pub(crate) use rate_limits::RateLimitSnapshotDisplay; -pub(crate) use rate_limits::rate_limit_snapshot_display; +pub(crate) use rate_limits::{RateLimitSnapshotDisplay, rate_limit_snapshot_display}; #[cfg(test)] mod tests; diff --git a/codex-rs/tui/src/status/rate_limits.rs b/codex-rs/tui/src/status/rate_limits.rs index 4c08cdd673..dd9fcc84a1 100644 --- a/codex-rs/tui/src/status/rate_limits.rs +++ b/codex-rs/tui/src/status/rate_limits.rs @@ -1,12 +1,8 @@ -use crate::chatwidget::get_limits_duration; +use chrono::{DateTime, Duration as ChronoDuration, Local, Utc}; +use codex_core::protocol::{RateLimitSnapshot, RateLimitWindow}; use super::helpers::format_reset_timestamp; -use chrono::DateTime; -use chrono::Duration as ChronoDuration; -use chrono::Local; -use chrono::Utc; -use codex_core::protocol::RateLimitSnapshot; -use codex_core::protocol::RateLimitWindow; +use crate::chatwidget::get_limits_duration; const STATUS_LIMIT_BAR_SEGMENTS: usize = 20; const STATUS_LIMIT_BAR_FILLED: &str = "█"; diff --git a/codex-rs/tui/src/status/tests.rs b/codex-rs/tui/src/status/tests.rs index 4ab4a8ea63..9b0f2df6dd 100644 --- a/codex-rs/tui/src/status/tests.rs +++ b/codex-rs/tui/src/status/tests.rs @@ -1,23 +1,16 @@ -use super::new_status_output; -use super::rate_limit_snapshot_display; -use crate::history_cell::HistoryCell; -use chrono::Duration as ChronoDuration; -use chrono::TimeZone; -use chrono::Utc; -use codex_core::config::Config; -use codex_core::config::ConfigOverrides; -use codex_core::config::ConfigToml; -use codex_core::protocol::RateLimitSnapshot; -use codex_core::protocol::RateLimitWindow; -use codex_core::protocol::SandboxPolicy; -use codex_core::protocol::TokenUsage; -use codex_protocol::config_types::ReasoningEffort; -use codex_protocol::config_types::ReasoningSummary; +use std::path::PathBuf; + +use chrono::{Duration as ChronoDuration, TimeZone, Utc}; +use codex_core::config::{Config, ConfigOverrides, ConfigToml}; +use codex_core::protocol::{RateLimitSnapshot, RateLimitWindow, SandboxPolicy, TokenUsage}; +use codex_protocol::config_types::{ReasoningEffort, ReasoningSummary}; use insta::assert_snapshot; use ratatui::prelude::*; -use std::path::PathBuf; use tempfile::TempDir; +use super::{new_status_output, rate_limit_snapshot_display}; +use crate::history_cell::HistoryCell; + fn test_config(temp_home: &TempDir) -> Config { Config::load_from_base_config_with_overrides( ConfigToml::default(), diff --git a/codex-rs/tui/src/status_indicator_widget.rs b/codex-rs/tui/src/status_indicator_widget.rs index ea7627a4f5..416ddfa035 100644 --- a/codex-rs/tui/src/status_indicator_widget.rs +++ b/codex-rs/tui/src/status_indicator_widget.rs @@ -1,8 +1,7 @@ //! A live status indicator that shows the *latest* log line emitted by the //! application while the agent is processing a long‑running task. -use std::time::Duration; -use std::time::Instant; +use std::time::{Duration, Instant}; use codex_core::protocol::Op; use crossterm::event::KeyCode; @@ -167,16 +166,16 @@ impl Renderable for StatusIndicatorWidget { #[cfg(test)] mod tests { + use std::time::{Duration, Instant}; + + use pretty_assertions::assert_eq; + use ratatui::Terminal; + use ratatui::backend::TestBackend; + use tokio::sync::mpsc::unbounded_channel; + use super::*; use crate::app_event::AppEvent; use crate::app_event_sender::AppEventSender; - use ratatui::Terminal; - use ratatui::backend::TestBackend; - use std::time::Duration; - use std::time::Instant; - use tokio::sync::mpsc::unbounded_channel; - - use pretty_assertions::assert_eq; #[test] fn fmt_elapsed_compact_formats_seconds_minutes_hours() { diff --git a/codex-rs/tui/src/streaming/controller.rs b/codex-rs/tui/src/streaming/controller.rs index e73ebd41e6..977edf60e9 100644 --- a/codex-rs/tui/src/streaming/controller.rs +++ b/codex-rs/tui/src/streaming/controller.rs @@ -1,8 +1,9 @@ -use crate::history_cell::HistoryCell; -use crate::history_cell::{self}; use ratatui::text::Line; use super::StreamState; +use crate::history_cell::{ + HistoryCell, {self}, +}; /// Controller that manages newline-gated streaming, header emission, and /// commit animation across streams. diff --git a/codex-rs/tui/src/style.rs b/codex-rs/tui/src/style.rs index e50d59791e..bc5b9c218b 100644 --- a/codex-rs/tui/src/style.rs +++ b/codex-rs/tui/src/style.rs @@ -1,9 +1,7 @@ -use crate::color::blend; -use crate::color::is_light; -use crate::terminal_palette::best_color; -use crate::terminal_palette::default_bg; -use ratatui::style::Color; -use ratatui::style::Style; +use ratatui::style::{Color, Style}; + +use crate::color::{blend, is_light}; +use crate::terminal_palette::{best_color, default_bg}; pub fn user_message_style() -> Style { user_message_style_for(default_bg()) diff --git a/codex-rs/tui/src/terminal_palette.rs b/codex-rs/tui/src/terminal_palette.rs index 5c6f32cd9e..f3b84172f7 100644 --- a/codex-rs/tui/src/terminal_palette.rs +++ b/codex-rs/tui/src/terminal_palette.rs @@ -1,6 +1,7 @@ -use crate::color::perceptual_distance; use ratatui::style::Color; +use crate::color::perceptual_distance; + /// Returns the closest color to the target color that the terminal can display. pub fn best_color(target: (u8, u8, u8)) -> Color { let Some(color_level) = supports_color::on_cached(supports_color::Stream::Stdout) else { @@ -49,12 +50,13 @@ pub fn default_bg() -> Option<(u8, u8, u8)> { #[cfg(all(unix, not(test)))] mod imp { + use std::sync::{Mutex, OnceLock}; + + use crossterm::style::{ + Color as CrosstermColor, query_background_color, query_foreground_color, + }; + use super::DefaultColors; - use crossterm::style::Color as CrosstermColor; - use crossterm::style::query_background_color; - use crossterm::style::query_foreground_color; - use std::sync::Mutex; - use std::sync::OnceLock; struct Cache { attempted: bool, diff --git a/codex-rs/tui/src/test_backend.rs b/codex-rs/tui/src/test_backend.rs index a5460af2e0..f522f4bf6c 100644 --- a/codex-rs/tui/src/test_backend.rs +++ b/codex-rs/tui/src/test_backend.rs @@ -1,15 +1,12 @@ use std::fmt::{self}; -use std::io::Write; -use std::io::{self}; +use std::io::{ + Write, {self}, +}; -use ratatui::prelude::CrosstermBackend; - -use ratatui::backend::Backend; -use ratatui::backend::ClearType; -use ratatui::backend::WindowSize; +use ratatui::backend::{Backend, ClearType, WindowSize}; use ratatui::buffer::Cell; -use ratatui::layout::Position; -use ratatui::layout::Size; +use ratatui::layout::{Position, Size}; +use ratatui::prelude::CrosstermBackend; /// This wraps a CrosstermBackend and a vt100::Parser to mock /// a "real" terminal. diff --git a/codex-rs/tui/src/text_formatting.rs b/codex-rs/tui/src/text_formatting.rs index 91d1c84f22..414468c856 100644 --- a/codex-rs/tui/src/text_formatting.rs +++ b/codex-rs/tui/src/text_formatting.rs @@ -1,6 +1,5 @@ use unicode_segmentation::UnicodeSegmentation; -use unicode_width::UnicodeWidthChar; -use unicode_width::UnicodeWidthStr; +use unicode_width::{UnicodeWidthChar, UnicodeWidthStr}; /// Truncate a tool result to fit within the given height and width. If the text is valid JSON, we format it in a compact way before truncating. /// This is a best-effort approach that may not work perfectly for text where 1 grapheme is rendered as multiple terminal cells. @@ -317,9 +316,10 @@ pub(crate) fn center_truncate_path(path: &str, max_width: usize) -> String { #[cfg(test)] mod tests { - use super::*; use pretty_assertions::assert_eq; + use super::*; + #[test] fn test_truncate_text() { let text = "Hello, world!"; diff --git a/codex-rs/tui/src/tui.rs b/codex-rs/tui/src/tui.rs index ca672355dc..8416b3d330 100644 --- a/codex-rs/tui/src/tui.rs +++ b/codex-rs/tui/src/tui.rs @@ -1,46 +1,33 @@ -use std::io::IsTerminal; -use std::io::Result; -use std::io::Stdout; -use std::io::stdout; +use std::io::{IsTerminal, Result, Stdout, stdout}; use std::pin::Pin; use std::sync::Arc; -use std::sync::atomic::AtomicBool; #[cfg(unix)] use std::sync::atomic::AtomicU8; #[cfg(unix)] use std::sync::atomic::AtomicU16; -use std::sync::atomic::Ordering; -use std::time::Duration; -use std::time::Instant; +use std::sync::atomic::{AtomicBool, Ordering}; +use std::time::{Duration, Instant}; -use crossterm::Command; -use crossterm::SynchronizedUpdate; #[cfg(unix)] use crossterm::cursor::MoveTo; -use crossterm::event::DisableBracketedPaste; -use crossterm::event::DisableFocusChange; -use crossterm::event::EnableBracketedPaste; -use crossterm::event::EnableFocusChange; -use crossterm::event::Event; -use crossterm::event::KeyEvent; -use crossterm::event::KeyboardEnhancementFlags; -use crossterm::event::PopKeyboardEnhancementFlags; -use crossterm::event::PushKeyboardEnhancementFlags; -use crossterm::terminal::EnterAlternateScreen; -use crossterm::terminal::LeaveAlternateScreen; -use crossterm::terminal::supports_keyboard_enhancement; -use ratatui::backend::Backend; -use ratatui::backend::CrosstermBackend; +use crossterm::event::{ + DisableBracketedPaste, DisableFocusChange, EnableBracketedPaste, EnableFocusChange, Event, + KeyEvent, KeyboardEnhancementFlags, PopKeyboardEnhancementFlags, PushKeyboardEnhancementFlags, +}; +use crossterm::terminal::{ + EnterAlternateScreen, LeaveAlternateScreen, supports_keyboard_enhancement, +}; +use crossterm::{Command, SynchronizedUpdate}; +use ratatui::backend::{Backend, CrosstermBackend}; use ratatui::crossterm::execute; -use ratatui::crossterm::terminal::disable_raw_mode; -use ratatui::crossterm::terminal::enable_raw_mode; +use ratatui::crossterm::terminal::{disable_raw_mode, enable_raw_mode}; use ratatui::layout::Offset; use ratatui::text::Line; +use tokio::select; +use tokio_stream::Stream; use crate::custom_terminal; use crate::custom_terminal::Terminal as CustomTerminal; -use tokio::select; -use tokio_stream::Stream; /// A type alias for the terminal type used in this application pub type Terminal = CustomTerminal>; @@ -235,8 +222,7 @@ impl Tui { let draw_tx_clone = draw_tx.clone(); tokio::spawn(async move { use tokio::select; - use tokio::time::Instant as TokioInstant; - use tokio::time::sleep_until; + use tokio::time::{Instant as TokioInstant, sleep_until}; let mut rx = frame_schedule_rx; let mut next_deadline: Option = None; diff --git a/codex-rs/tui/src/update_prompt.rs b/codex-rs/tui/src/update_prompt.rs index d505385b9e..5d1a55e1ef 100644 --- a/codex-rs/tui/src/update_prompt.rs +++ b/codex-rs/tui/src/update_prompt.rs @@ -1,32 +1,24 @@ #![cfg(not(debug_assertions))] -use crate::history_cell::padded_emoji; -use crate::key_hint; -use crate::render::Insets; -use crate::render::renderable::ColumnRenderable; -use crate::render::renderable::Renderable; -use crate::render::renderable::RenderableExt as _; -use crate::selection_list::selection_option_row; -use crate::tui::FrameRequester; -use crate::tui::Tui; -use crate::tui::TuiEvent; -use crate::updates; -use crate::updates::UpdateAction; use codex_core::config::Config; use color_eyre::Result; -use crossterm::event::KeyCode; -use crossterm::event::KeyEvent; -use crossterm::event::KeyEventKind; -use crossterm::event::KeyModifiers; +use crossterm::event::{KeyCode, KeyEvent, KeyEventKind, KeyModifiers}; use ratatui::buffer::Buffer; use ratatui::layout::Rect; use ratatui::prelude::Widget; use ratatui::style::Stylize as _; use ratatui::text::Line; -use ratatui::widgets::Clear; -use ratatui::widgets::WidgetRef; +use ratatui::widgets::{Clear, WidgetRef}; use tokio_stream::StreamExt; +use crate::history_cell::padded_emoji; +use crate::render::Insets; +use crate::render::renderable::{ColumnRenderable, Renderable, RenderableExt as _}; +use crate::selection_list::selection_option_row; +use crate::tui::{FrameRequester, Tui, TuiEvent}; +use crate::updates::UpdateAction; +use crate::{key_hint, updates}; + pub(crate) enum UpdatePromptOutcome { Continue, RunUpdate(UpdateAction), @@ -241,13 +233,12 @@ impl WidgetRef for &UpdatePromptScreen { #[cfg(test)] mod tests { + use crossterm::event::{KeyCode, KeyEvent, KeyModifiers}; + use ratatui::Terminal; + use super::*; use crate::test_backend::VT100Backend; use crate::tui::FrameRequester; - use crossterm::event::KeyCode; - use crossterm::event::KeyEvent; - use crossterm::event::KeyModifiers; - use ratatui::Terminal; fn new_prompt() -> UpdatePromptScreen { UpdatePromptScreen::new( diff --git a/codex-rs/tui/src/updates.rs b/codex-rs/tui/src/updates.rs index 8b92af4fc9..e011b66514 100644 --- a/codex-rs/tui/src/updates.rs +++ b/codex-rs/tui/src/updates.rs @@ -1,13 +1,9 @@ -use chrono::DateTime; -use chrono::Duration; -use chrono::Utc; -use serde::Deserialize; -use serde::Serialize; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; +use chrono::{DateTime, Duration, Utc}; use codex_core::config::Config; use codex_core::default_client::create_client; +use serde::{Deserialize, Serialize}; use crate::version::CODEX_CLI_VERSION; diff --git a/codex-rs/tui/src/wrapping.rs b/codex-rs/tui/src/wrapping.rs index 561da78b4e..075839ed3c 100644 --- a/codex-rs/tui/src/wrapping.rs +++ b/codex-rs/tui/src/wrapping.rs @@ -1,7 +1,7 @@ -use ratatui::text::Line; -use ratatui::text::Span; use std::borrow::Cow; use std::ops::Range; + +use ratatui::text::{Line, Span}; use textwrap::Options; use textwrap::wrap_algorithms::Penalties; @@ -402,12 +402,13 @@ fn slice_line_spans<'a>( #[cfg(test)] mod tests { - use super::*; + use std::string::ToString; + use itertools::Itertools as _; use pretty_assertions::assert_eq; - use ratatui::style::Color; - use ratatui::style::Stylize; - use std::string::ToString; + use ratatui::style::{Color, Stylize}; + + use super::*; fn concat_line(line: &Line) -> String { line.spans diff --git a/codex-rs/tui/tests/suite/vt100_history.rs b/codex-rs/tui/tests/suite/vt100_history.rs index 6df9dedf13..609fb25b08 100644 --- a/codex-rs/tui/tests/suite/vt100_history.rs +++ b/codex-rs/tui/tests/suite/vt100_history.rs @@ -1,11 +1,12 @@ #![cfg(feature = "vt100-tests")] #![expect(clippy::expect_used)] -use crate::test_backend::VT100Backend; use ratatui::layout::Rect; use ratatui::style::Stylize; use ratatui::text::Line; +use crate::test_backend::VT100Backend; + // Small helper macro to assert a collection contains an item with a clearer // failure message. macro_rules! assert_contains { diff --git a/codex-rs/tui/tests/suite/vt100_live_commit.rs b/codex-rs/tui/tests/suite/vt100_live_commit.rs index 2be9658b23..7582e2d8f5 100644 --- a/codex-rs/tui/tests/suite/vt100_live_commit.rs +++ b/codex-rs/tui/tests/suite/vt100_live_commit.rs @@ -1,9 +1,10 @@ #![cfg(feature = "vt100-tests")] -use crate::test_backend::VT100Backend; use ratatui::layout::Rect; use ratatui::text::Line; +use crate::test_backend::VT100Backend; + #[test] fn live_001_commit_on_overflow() { let backend = VT100Backend::new(20, 6); diff --git a/codex-rs/utils/cache/src/lib.rs b/codex-rs/utils/cache/src/lib.rs index 38d07e52e9..349b981825 100644 --- a/codex-rs/utils/cache/src/lib.rs +++ b/codex-rs/utils/cache/src/lib.rs @@ -3,10 +3,8 @@ use std::hash::Hash; use std::num::NonZeroUsize; use lru::LruCache; -use sha1::Digest; -use sha1::Sha1; -use tokio::sync::Mutex; -use tokio::sync::MutexGuard; +use sha1::{Digest, Sha1}; +use tokio::sync::{Mutex, MutexGuard}; /// A minimal LRU cache protected by a Tokio mutex. pub struct BlockingLruCache { @@ -131,9 +129,10 @@ pub fn sha1_digest(bytes: &[u8]) -> [u8; 20] { #[cfg(test)] mod tests { - use super::BlockingLruCache; use std::num::NonZeroUsize; + use super::BlockingLruCache; + #[tokio::test(flavor = "multi_thread")] async fn stores_and_retrieves_values() { let cache = BlockingLruCache::new(NonZeroUsize::new(2).expect("capacity")); diff --git a/codex-rs/utils/git/src/apply.rs b/codex-rs/utils/git/src/apply.rs index c9e8503242..53d81351cb 100644 --- a/codex-rs/utils/git/src/apply.rs +++ b/codex-rs/utils/git/src/apply.rs @@ -6,12 +6,12 @@ //! mode via [`ApplyGitRequest::preflight`] and inspect the resulting paths to //! learn what would change before applying for real. -use once_cell::sync::Lazy; -use regex::Regex; use std::ffi::OsStr; use std::io; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; + +use once_cell::sync::Lazy; +use regex::Regex; /// Parameters for invoking [`apply_git_patch`]. #[derive(Debug, Clone)] @@ -492,10 +492,10 @@ fn regex_ci(pat: &str) -> Regex { #[cfg(test)] mod tests { - use super::*; use std::path::Path; - use std::sync::Mutex; - use std::sync::OnceLock; + use std::sync::{Mutex, OnceLock}; + + use super::*; fn env_lock() -> &'static Mutex<()> { static LOCK: OnceLock> = OnceLock::new(); diff --git a/codex-rs/utils/git/src/ghost_commits.rs b/codex-rs/utils/git/src/ghost_commits.rs index ec211ac3e1..2310b48276 100644 --- a/codex-rs/utils/git/src/ghost_commits.rs +++ b/codex-rs/utils/git/src/ghost_commits.rs @@ -1,23 +1,16 @@ use std::collections::HashSet; use std::ffi::OsString; -use std::fs; -use std::io; -use std::path::Path; -use std::path::PathBuf; +use std::path::{Path, PathBuf}; +use std::{fs, io}; use tempfile::Builder; -use crate::GhostCommit; -use crate::GitToolingError; -use crate::operations::apply_repo_prefix_to_force_include; -use crate::operations::ensure_git_repository; -use crate::operations::normalize_relative_path; -use crate::operations::repo_subdir; -use crate::operations::resolve_head; -use crate::operations::resolve_repository_root; -use crate::operations::run_git_for_status; -use crate::operations::run_git_for_stdout; -use crate::operations::run_git_for_stdout_all; +use crate::operations::{ + apply_repo_prefix_to_force_include, ensure_git_repository, normalize_relative_path, + repo_subdir, resolve_head, resolve_repository_root, run_git_for_status, run_git_for_stdout, + run_git_for_stdout_all, +}; +use crate::{GhostCommit, GitToolingError}; /// Default commit message used for ghost commits when none is provided. const DEFAULT_COMMIT_MESSAGE: &str = "codex snapshot"; @@ -356,11 +349,13 @@ fn default_commit_identity() -> Vec<(OsString, OsString)> { #[cfg(test)] mod tests { - use super::*; - use crate::operations::run_git_for_stdout; + use std::process::Command; + use assert_matches::assert_matches; use pretty_assertions::assert_eq; - use std::process::Command; + + use super::*; + use crate::operations::run_git_for_stdout; /// Runs a git command in the test repository and asserts success. fn run_git_in(repo_path: &Path, args: &[&str]) { diff --git a/codex-rs/utils/git/src/lib.rs b/codex-rs/utils/git/src/lib.rs index cf2887aa8f..1bd962e75b 100644 --- a/codex-rs/utils/git/src/lib.rs +++ b/codex-rs/utils/git/src/lib.rs @@ -7,21 +7,17 @@ mod ghost_commits; mod operations; mod platform; -pub use apply::ApplyGitRequest; -pub use apply::ApplyGitResult; -pub use apply::apply_git_patch; -pub use apply::extract_paths_from_patch; -pub use apply::parse_git_apply_output; -pub use apply::stage_paths; +pub use apply::{ + ApplyGitRequest, ApplyGitResult, apply_git_patch, extract_paths_from_patch, + parse_git_apply_output, stage_paths, +}; pub use errors::GitToolingError; -pub use ghost_commits::CreateGhostCommitOptions; -pub use ghost_commits::create_ghost_commit; -pub use ghost_commits::restore_ghost_commit; -pub use ghost_commits::restore_to_commit; +pub use ghost_commits::{ + CreateGhostCommitOptions, create_ghost_commit, restore_ghost_commit, restore_to_commit, +}; pub use platform::create_symlink; use schemars::JsonSchema; -use serde::Deserialize; -use serde::Serialize; +use serde::{Deserialize, Serialize}; use ts_rs::TS; type CommitID = String; diff --git a/codex-rs/utils/git/src/operations.rs b/codex-rs/utils/git/src/operations.rs index 415d63d568..768cf6ceca 100644 --- a/codex-rs/utils/git/src/operations.rs +++ b/codex-rs/utils/git/src/operations.rs @@ -1,8 +1,5 @@ -use std::ffi::OsStr; -use std::ffi::OsString; -use std::path::Component; -use std::path::Path; -use std::path::PathBuf; +use std::ffi::{OsStr, OsString}; +use std::path::{Component, Path, PathBuf}; use std::process::Command; use crate::GitToolingError; diff --git a/codex-rs/utils/git/src/platform.rs b/codex-rs/utils/git/src/platform.rs index 41d4e2eae8..5a1e54c58e 100644 --- a/codex-rs/utils/git/src/platform.rs +++ b/codex-rs/utils/git/src/platform.rs @@ -20,9 +20,7 @@ pub fn create_symlink( link_target: &Path, destination: &Path, ) -> Result<(), GitToolingError> { - use std::os::windows::fs::FileTypeExt; - use std::os::windows::fs::symlink_dir; - use std::os::windows::fs::symlink_file; + use std::os::windows::fs::{FileTypeExt, symlink_dir, symlink_file}; let metadata = std::fs::symlink_metadata(source)?; if metadata.file_type().is_symlink_dir() { diff --git a/codex-rs/utils/image/src/error.rs b/codex-rs/utils/image/src/error.rs index ffd0a7850e..b3ac8c5ad1 100644 --- a/codex-rs/utils/image/src/error.rs +++ b/codex-rs/utils/image/src/error.rs @@ -1,5 +1,6 @@ -use image::ImageFormat; use std::path::PathBuf; + +use image::ImageFormat; use thiserror::Error; #[derive(Debug, Error)] diff --git a/codex-rs/utils/image/src/lib.rs b/codex-rs/utils/image/src/lib.rs index 0950bf176e..ab1a8c3528 100644 --- a/codex-rs/utils/image/src/lib.rs +++ b/codex-rs/utils/image/src/lib.rs @@ -2,19 +2,15 @@ use std::num::NonZeroUsize; use std::path::Path; use std::sync::LazyLock; -use crate::error::ImageProcessingError; use base64::Engine; use base64::engine::general_purpose::STANDARD as BASE64_STANDARD; -use codex_utils_cache::BlockingLruCache; -use codex_utils_cache::sha1_digest; -use image::ColorType; -use image::DynamicImage; -use image::GenericImageView; -use image::ImageEncoder; -use image::ImageFormat; +use codex_utils_cache::{BlockingLruCache, sha1_digest}; use image::codecs::jpeg::JpegEncoder; use image::codecs::png::PngEncoder; use image::imageops::FilterType; +use image::{ColorType, DynamicImage, GenericImageView, ImageEncoder, ImageFormat}; + +use crate::error::ImageProcessingError; /// Maximum width used when resizing images before uploading. pub const MAX_WIDTH: u32 = 2048; /// Maximum height used when resizing images before uploading. @@ -168,12 +164,11 @@ fn format_to_mime(format: ImageFormat) -> String { #[cfg(test)] mod tests { - use super::*; - use image::GenericImageView; - use image::ImageBuffer; - use image::Rgba; + use image::{GenericImageView, ImageBuffer, Rgba}; use tempfile::NamedTempFile; + use super::*; + #[tokio::test(flavor = "multi_thread")] async fn returns_original_image_when_within_bounds() { let temp_file = NamedTempFile::new().expect("temp file"); diff --git a/codex-rs/utils/json-to-toml/src/lib.rs b/codex-rs/utils/json-to-toml/src/lib.rs index 43b7e06e06..1c40b5ffc3 100644 --- a/codex-rs/utils/json-to-toml/src/lib.rs +++ b/codex-rs/utils/json-to-toml/src/lib.rs @@ -29,10 +29,11 @@ pub fn json_to_toml(v: JsonValue) -> TomlValue { #[cfg(test)] mod tests { - use super::*; use pretty_assertions::assert_eq; use serde_json::json; + use super::*; + #[test] fn json_number_to_toml() { let json_value = json!(123); diff --git a/codex-rs/utils/pty/src/lib.rs b/codex-rs/utils/pty/src/lib.rs index 740a502ba9..73f46ba08a 100644 --- a/codex-rs/utils/pty/src/lib.rs +++ b/codex-rs/utils/pty/src/lib.rs @@ -2,18 +2,12 @@ use std::collections::HashMap; use std::io::ErrorKind; use std::path::Path; use std::sync::atomic::AtomicBool; -use std::sync::Arc; -use std::sync::Mutex as StdMutex; +use std::sync::{Arc, Mutex as StdMutex}; use std::time::Duration; use anyhow::Result; -use portable_pty::native_pty_system; -use portable_pty::CommandBuilder; -use portable_pty::PtySize; -use tokio::sync::broadcast; -use tokio::sync::mpsc; -use tokio::sync::oneshot; -use tokio::sync::Mutex as TokioMutex; +use portable_pty::{native_pty_system, CommandBuilder, PtySize}; +use tokio::sync::{broadcast, mpsc, oneshot, Mutex as TokioMutex}; use tokio::task::JoinHandle; #[derive(Debug)] diff --git a/codex-rs/utils/readiness/src/lib.rs b/codex-rs/utils/readiness/src/lib.rs index 8b92f9387a..5f27017495 100644 --- a/codex-rs/utils/readiness/src/lib.rs +++ b/codex-rs/utils/readiness/src/lib.rs @@ -2,13 +2,10 @@ use std::collections::HashSet; use std::fmt; -use std::sync::atomic::AtomicBool; -use std::sync::atomic::AtomicI32; -use std::sync::atomic::Ordering; +use std::sync::atomic::{AtomicBool, AtomicI32, Ordering}; use std::time::Duration; -use tokio::sync::Mutex; -use tokio::sync::watch; +use tokio::sync::{Mutex, watch}; use tokio::time; /// Opaque subscription token returned by `subscribe()`. @@ -200,12 +197,11 @@ mod errors { mod tests { use std::sync::Arc; - use super::Readiness; - use super::ReadinessFlag; - use super::Token; - use super::errors::ReadinessError; use assert_matches::assert_matches; + use super::errors::ReadinessError; + use super::{Readiness, ReadinessFlag, Token}; + #[tokio::test] async fn subscribe_and_mark_ready_roundtrip() -> Result<(), ReadinessError> { let flag = ReadinessFlag::new(); diff --git a/codex-rs/utils/tokenizer/src/lib.rs b/codex-rs/utils/tokenizer/src/lib.rs index 6cda6e635f..26a74c5f96 100644 --- a/codex-rs/utils/tokenizer/src/lib.rs +++ b/codex-rs/utils/tokenizer/src/lib.rs @@ -1,7 +1,6 @@ use std::fmt; -use anyhow::Context; -use anyhow::Error as AnyhowError; +use anyhow::{Context, Error as AnyhowError}; use thiserror::Error; use tiktoken_rs::CoreBPE; @@ -109,9 +108,10 @@ impl Tokenizer { #[cfg(test)] mod tests { - use super::*; use pretty_assertions::assert_eq; + use super::*; + #[test] fn cl100k_base_roundtrip_simple() -> Result<(), TokenizerError> { let tok = Tokenizer::new(EncodingKind::Cl100kBase)?; diff --git a/codex-rs/windows-sandbox-rs/src/lib.rs b/codex-rs/windows-sandbox-rs/src/lib.rs index 5e165f42dd..f3c61b7c22 100644 --- a/codex-rs/windows-sandbox-rs/src/lib.rs +++ b/codex-rs/windows-sandbox-rs/src/lib.rs @@ -6,6 +6,12 @@ macro_rules! windows_modules { windows_modules!(acl, allow, audit, cap, env, logging, policy, token, winutil); +#[cfg(not(target_os = "windows"))] +pub use stub::preflight_audit_everyone_writable; +#[cfg(not(target_os = "windows"))] +pub use stub::run_windows_sandbox_capture; +#[cfg(not(target_os = "windows"))] +pub use stub::CaptureResult; #[cfg(target_os = "windows")] pub use windows_impl::preflight_audit_everyone_writable; #[cfg(target_os = "windows")] @@ -13,56 +19,34 @@ pub use windows_impl::run_windows_sandbox_capture; #[cfg(target_os = "windows")] pub use windows_impl::CaptureResult; -#[cfg(not(target_os = "windows"))] -pub use stub::preflight_audit_everyone_writable; -#[cfg(not(target_os = "windows"))] -pub use stub::run_windows_sandbox_capture; -#[cfg(not(target_os = "windows"))] -pub use stub::CaptureResult; - #[cfg(target_os = "windows")] mod windows_impl { - use super::acl::add_allow_ace; - use super::acl::allow_null_device; - use super::acl::revoke_ace; - use super::allow::compute_allow_paths; - use super::audit; - use super::cap::cap_sid_file; - use super::cap::load_or_create_cap_sids; - use super::env::apply_no_network_to_env; - use super::env::ensure_non_interactive_pager; - use super::env::normalize_null_device_env; - use super::logging::debug_log; - use super::logging::log_failure; - use super::logging::log_start; - use super::logging::log_success; - use super::policy::SandboxMode; - use super::policy::SandboxPolicy; - use super::token::convert_string_sid_to_sid; - use super::winutil::format_last_error; - use super::winutil::to_wide; - use anyhow::Result; use std::collections::HashMap; use std::ffi::c_void; - use std::fs; - use std::io; - use std::path::Path; - use std::path::PathBuf; - use std::ptr; - use windows_sys::Win32::Foundation::CloseHandle; - use windows_sys::Win32::Foundation::GetLastError; - use windows_sys::Win32::Foundation::SetHandleInformation; - use windows_sys::Win32::Foundation::HANDLE; - use windows_sys::Win32::Foundation::HANDLE_FLAG_INHERIT; + use std::path::{Path, PathBuf}; + use std::{fs, io, ptr}; + + use anyhow::Result; + use windows_sys::Win32::Foundation::{ + CloseHandle, GetLastError, SetHandleInformation, HANDLE, HANDLE_FLAG_INHERIT, + }; use windows_sys::Win32::System::Pipes::CreatePipe; - use windows_sys::Win32::System::Threading::CreateProcessAsUserW; - use windows_sys::Win32::System::Threading::GetExitCodeProcess; - use windows_sys::Win32::System::Threading::WaitForSingleObject; - use windows_sys::Win32::System::Threading::CREATE_UNICODE_ENVIRONMENT; - use windows_sys::Win32::System::Threading::INFINITE; - use windows_sys::Win32::System::Threading::PROCESS_INFORMATION; - use windows_sys::Win32::System::Threading::STARTF_USESTDHANDLES; - use windows_sys::Win32::System::Threading::STARTUPINFOW; + use windows_sys::Win32::System::Threading::{ + CreateProcessAsUserW, GetExitCodeProcess, WaitForSingleObject, CREATE_UNICODE_ENVIRONMENT, + INFINITE, PROCESS_INFORMATION, STARTF_USESTDHANDLES, STARTUPINFOW, + }; + + use super::acl::{add_allow_ace, allow_null_device, revoke_ace}; + use super::allow::compute_allow_paths; + use super::audit; + use super::cap::{cap_sid_file, load_or_create_cap_sids}; + use super::env::{ + apply_no_network_to_env, ensure_non_interactive_pager, normalize_null_device_env, + }; + use super::logging::{debug_log, log_failure, log_start, log_success}; + use super::policy::{SandboxMode, SandboxPolicy}; + use super::token::convert_string_sid_to_sid; + use super::winutil::{format_last_error, to_wide}; type PipeHandles = ((HANDLE, HANDLE), (HANDLE, HANDLE), (HANDLE, HANDLE)); @@ -420,11 +404,11 @@ mod windows_impl { #[cfg(not(target_os = "windows"))] mod stub { - use anyhow::bail; - use anyhow::Result; use std::collections::HashMap; use std::path::Path; + use anyhow::{bail, Result}; + #[derive(Debug, Default)] pub struct CaptureResult { pub exit_code: i32,