mirror of
https://github.com/openai/codex.git
synced 2026-05-03 21:01:55 +03:00
## Why Once the repo-local lint exists, `codex-rs` needs to follow the checked-in convention and CI needs to keep it from drifting. This commit applies the fallback `/*param*/` style consistently across existing positional literal call sites without changing those APIs. The longer-term preference is still to avoid APIs that require comments by choosing clearer parameter types and call shapes. This PR is intentionally the mechanical follow-through for the places where the existing signatures stay in place. After rebasing onto newer `main`, the rollout also had to cover newly introduced `tui_app_server` call sites. That made it clear the first cut of the CI job was too expensive for the common path: it was spending almost as much time installing `cargo-dylint` and re-testing the lint crate as a representative test job spends running product tests. The CI update keeps the full workspace enforcement but trims that extra overhead from ordinary `codex-rs` PRs. ## What changed - keep a dedicated `argument_comment_lint` job in `rust-ci` - mechanically annotate remaining opaque positional literals across `codex-rs` with exact `/*param*/` comments, including the rebased `tui_app_server` call sites that now fall under the lint - keep the checked-in style aligned with the lint policy by using `/*param*/` and leaving string and char literals uncommented - cache `cargo-dylint`, `dylint-link`, and the relevant Cargo registry/git metadata in the lint job - split changed-path detection so the lint crate's own `cargo test` step runs only when `tools/argument-comment-lint/*` or `rust-ci.yml` changes - continue to run the repo wrapper over the `codex-rs` workspace, so product-code enforcement is unchanged Most of the code changes in this commit are intentionally mechanical comment rewrites or insertions driven by the lint itself. ## Verification - `./tools/argument-comment-lint/run.sh --workspace` - `cargo test -p codex-tui-app-server -p codex-tui` - parsed `.github/workflows/rust-ci.yml` locally with PyYAML --- * -> #14652 * #14651
124 lines
4.0 KiB
Rust
124 lines
4.0 KiB
Rust
use std::path::PathBuf;
|
|
|
|
use crate::app_command::AppCommand;
|
|
use codex_protocol::ThreadId;
|
|
use codex_protocol::approvals::ElicitationAction;
|
|
use codex_protocol::mcp::RequestId as McpRequestId;
|
|
use codex_protocol::protocol::ConversationAudioParams;
|
|
use codex_protocol::protocol::ReviewDecision;
|
|
use codex_protocol::protocol::ReviewRequest;
|
|
use codex_protocol::request_permissions::RequestPermissionsResponse;
|
|
use codex_protocol::request_user_input::RequestUserInputResponse;
|
|
use tokio::sync::mpsc::UnboundedSender;
|
|
|
|
use crate::app_event::AppEvent;
|
|
use crate::session_log;
|
|
|
|
#[derive(Clone, Debug)]
|
|
pub(crate) struct AppEventSender {
|
|
pub app_event_tx: UnboundedSender<AppEvent>,
|
|
}
|
|
|
|
impl AppEventSender {
|
|
pub(crate) fn new(app_event_tx: UnboundedSender<AppEvent>) -> Self {
|
|
Self { app_event_tx }
|
|
}
|
|
|
|
/// Send an event to the app event channel. If it fails, we swallow the
|
|
/// error and log it.
|
|
pub(crate) fn send(&self, event: AppEvent) {
|
|
// Record inbound events for high-fidelity session replay.
|
|
// Avoid double-logging Ops; those are logged at the point of submission.
|
|
if !matches!(event, AppEvent::CodexOp(_)) {
|
|
session_log::log_inbound_app_event(&event);
|
|
}
|
|
if let Err(e) = self.app_event_tx.send(event) {
|
|
tracing::error!("failed to send event: {e}");
|
|
}
|
|
}
|
|
|
|
pub(crate) fn interrupt(&self) {
|
|
self.send(AppEvent::CodexOp(AppCommand::interrupt().into_core()));
|
|
}
|
|
|
|
pub(crate) fn compact(&self) {
|
|
self.send(AppEvent::CodexOp(AppCommand::compact().into_core()));
|
|
}
|
|
|
|
pub(crate) fn set_thread_name(&self, name: String) {
|
|
self.send(AppEvent::CodexOp(
|
|
AppCommand::set_thread_name(name).into_core(),
|
|
));
|
|
}
|
|
|
|
pub(crate) fn review(&self, review_request: ReviewRequest) {
|
|
self.send(AppEvent::CodexOp(
|
|
AppCommand::review(review_request).into_core(),
|
|
));
|
|
}
|
|
|
|
pub(crate) fn list_skills(&self, cwds: Vec<PathBuf>, force_reload: bool) {
|
|
self.send(AppEvent::CodexOp(
|
|
AppCommand::list_skills(cwds, force_reload).into_core(),
|
|
));
|
|
}
|
|
|
|
#[cfg_attr(
|
|
any(target_os = "linux", not(feature = "voice-input")),
|
|
allow(dead_code)
|
|
)]
|
|
pub(crate) fn realtime_conversation_audio(&self, params: ConversationAudioParams) {
|
|
self.send(AppEvent::CodexOp(
|
|
AppCommand::realtime_conversation_audio(params).into_core(),
|
|
));
|
|
}
|
|
|
|
pub(crate) fn user_input_answer(&self, id: String, response: RequestUserInputResponse) {
|
|
self.send(AppEvent::CodexOp(
|
|
AppCommand::user_input_answer(id, response).into_core(),
|
|
));
|
|
}
|
|
|
|
pub(crate) fn exec_approval(&self, thread_id: ThreadId, id: String, decision: ReviewDecision) {
|
|
self.send(AppEvent::SubmitThreadOp {
|
|
thread_id,
|
|
op: AppCommand::exec_approval(id, /*turn_id*/ None, decision).into_core(),
|
|
});
|
|
}
|
|
|
|
pub(crate) fn request_permissions_response(
|
|
&self,
|
|
thread_id: ThreadId,
|
|
id: String,
|
|
response: RequestPermissionsResponse,
|
|
) {
|
|
self.send(AppEvent::SubmitThreadOp {
|
|
thread_id,
|
|
op: AppCommand::request_permissions_response(id, response).into_core(),
|
|
});
|
|
}
|
|
|
|
pub(crate) fn patch_approval(&self, thread_id: ThreadId, id: String, decision: ReviewDecision) {
|
|
self.send(AppEvent::SubmitThreadOp {
|
|
thread_id,
|
|
op: AppCommand::patch_approval(id, decision).into_core(),
|
|
});
|
|
}
|
|
|
|
pub(crate) fn resolve_elicitation(
|
|
&self,
|
|
thread_id: ThreadId,
|
|
server_name: String,
|
|
request_id: McpRequestId,
|
|
decision: ElicitationAction,
|
|
content: Option<serde_json::Value>,
|
|
meta: Option<serde_json::Value>,
|
|
) {
|
|
self.send(AppEvent::SubmitThreadOp {
|
|
thread_id,
|
|
op: AppCommand::resolve_elicitation(server_name, request_id, decision, content, meta)
|
|
.into_core(),
|
|
});
|
|
}
|
|
}
|