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

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions apps/decodex/src/agent/tracker_tool_bridge.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ use time::{OffsetDateTime, format_description::well_known::Rfc3339};
#[cfg(test)]
use crate::tracker::privacy_classifier::DISABLED_PUBLIC_PROJECTION_PRIVACY_CLASSIFIER;
use crate::{
config::InternalReviewMode,
config::ReviewLevel,
github,
prelude::eyre,
state::StateStore,
Expand Down Expand Up @@ -491,13 +491,13 @@ pub(crate) struct ReviewHandoffContext {
pub(crate) cwd: PathBuf,
pub(crate) github_token_env_var: Option<String>,
pub(crate) github_command_path: Option<PathBuf>,
pub(crate) internal_review_mode: InternalReviewMode,
pub(crate) review_level: ReviewLevel,
pub(crate) mode: ReviewExecutionMode,
pub(crate) recorded_pr_url: Option<String>,
}
impl ReviewHandoffContext {
pub(crate) fn internal_review_checkpoint_enabled(&self) -> bool {
self.internal_review_mode.requires_review_checkpoint()
pub(crate) fn decodex_review_checkpoint_enabled(&self) -> bool {
self.review_level.requires_review_checkpoint()
}
}

Expand Down
4 changes: 2 additions & 2 deletions apps/decodex/src/agent/tracker_tool_bridge/review.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1014,7 +1014,7 @@ impl<'a> TrackerToolBridge<'a> {
&self,
review_context: &ReviewHandoffContext,
) -> std::result::Result<(), String> {
if !review_context.internal_review_checkpoint_enabled() {
if !review_context.decodex_review_checkpoint_enabled() {
return Ok(());
}

Expand Down Expand Up @@ -1046,7 +1046,7 @@ impl<'a> TrackerToolBridge<'a> {
&self,
review_context: &ReviewHandoffContext,
) -> crate::prelude::Result<Option<ReviewPolicyStopRequested>> {
if !review_context.internal_review_checkpoint_enabled() {
if !review_context.decodex_review_checkpoint_enabled() {
return Ok(None);
}

Expand Down
12 changes: 6 additions & 6 deletions apps/decodex/src/agent/tracker_tool_bridge/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ use crate::{
ReviewPolicyStopRequested, RunCompletionDisposition, TrackerToolBridge,
TurnCompletionStatus,
},
config::InternalReviewMode,
config::ReviewLevel,
prelude::eyre,
state::{
self, ReviewHandoffMarker, ReviewOrchestrationMarker, ReviewPolicyCheckpoint, StateStore,
Expand All @@ -43,7 +43,7 @@ include!("tests/mutation/dispatch.rs");
include!("tests/mutation/continuation.rs");
include!("tests/mutation/progress.rs");

// Review handoff, repair, closeout, and internal-review policy.
// Review handoff, repair, closeout, and Decodex Review policy.
include!("tests/review/policy.rs");
include!("tests/review/handoff.rs");

Expand Down Expand Up @@ -447,7 +447,7 @@ fn sample_review_context() -> ReviewHandoffContext {
cwd: PathBuf::from("/tmp/PUB-618"),
github_token_env_var: Some(String::from("HOME")),
github_command_path: None,
internal_review_mode: InternalReviewMode::Loop,
review_level: ReviewLevel::Standard,
mode: ReviewExecutionMode::Handoff,
recorded_pr_url: None,
}
Expand Down Expand Up @@ -475,7 +475,7 @@ fn sample_review_context_in(cwd: &Path) -> ReviewHandoffContext {
cwd: cwd.to_path_buf(),
github_token_env_var: Some(String::from("HOME")),
github_command_path: None,
internal_review_mode: InternalReviewMode::Loop,
review_level: ReviewLevel::Standard,
mode: ReviewExecutionMode::Handoff,
recorded_pr_url: None,
}
Expand All @@ -491,7 +491,7 @@ fn sample_review_repair_context_in(cwd: &Path, pr_url: &str) -> ReviewHandoffCon
cwd: cwd.to_path_buf(),
github_token_env_var: Some(String::from("HOME")),
github_command_path: None,
internal_review_mode: InternalReviewMode::Loop,
review_level: ReviewLevel::Standard,
mode: ReviewExecutionMode::Repair,
recorded_pr_url: Some(pr_url.to_owned()),
}
Expand All @@ -507,7 +507,7 @@ fn sample_closeout_context_in(cwd: &Path, pr_url: &str) -> ReviewHandoffContext
cwd: cwd.to_path_buf(),
github_token_env_var: Some(String::from("HOME")),
github_command_path: None,
internal_review_mode: InternalReviewMode::Loop,
review_level: ReviewLevel::Standard,
mode: ReviewExecutionMode::Closeout,
recorded_pr_url: Some(pr_url.to_owned()),
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -506,12 +506,16 @@ fn review_handoff_inspection_uses_configured_github_token() {
let tracker = FakeTracker::new();
let issue = sample_issue();
let workflow = sample_workflow();
let token_env_var = "DECODEX_TEST_REVIEW_HANDOFF_GITHUB_TOKEN";
let _env_guard = TestEnvVarGuard::set(token_env_var, "configured-review-token");
let inspector = GitHubTokenAssertingPullRequestInspector {
expected_token: env::var("HOME").expect("HOME should exist"),
expected_token: String::from("configured-review-token"),
response: sample_pull_request(),
};
let local_repo_inspector = FakeLocalRepoInspector::new(vec![Ok(sample_local_repo())]);
let review_context = sample_review_context_in(temp_dir.path());
let mut review_context = sample_review_context_in(temp_dir.path());

review_context.github_token_env_var = Some(String::from(token_env_var));

write_clean_review_checkpoint(&review_context);

Expand Down
26 changes: 13 additions & 13 deletions apps/decodex/src/agent/tracker_tool_bridge/tests/review/policy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ fn review_checkpoint_tool_surface_excludes_closeout() {
}

#[test]
fn review_checkpoint_tool_surface_respects_internal_review_config() {
fn review_checkpoint_tool_surface_respects_review_level() {
let tracker = FakeTracker::new();
let issue = sample_issue();
let review_issue = sample_review_issue();
Expand All @@ -357,8 +357,8 @@ fn review_checkpoint_tool_surface_respects_internal_review_config() {
"https://github.com/hack-ink/decodex/pull/242",
);

review_context.internal_review_mode = InternalReviewMode::Off;
repair_context.internal_review_mode = InternalReviewMode::Off;
review_context.review_level = ReviewLevel::Off;
repair_context.review_level = ReviewLevel::Off;

let bridge = TrackerToolBridge::with_review_handoff_for_test(
&tracker,
Expand Down Expand Up @@ -402,12 +402,12 @@ fn review_checkpoint_tool_surface_respects_internal_review_config() {
assert!(matches!(
checkpoint_response.content_items.as_slice(),
[DynamicToolContentItem::InputText{ text }]
if text.contains("codex.internal_review_mode = \"off\"")
if text.contains("[codex].review = \"off\"")
));
}

#[test]
fn prompt_only_internal_review_mode_does_not_expose_checkpoint_tool() {
fn basic_review_level_does_not_expose_checkpoint_tool() {
let tracker = FakeTracker::new();
let issue = sample_issue();
let workflow = sample_workflow();
Expand All @@ -416,7 +416,7 @@ fn prompt_only_internal_review_mode_does_not_expose_checkpoint_tool() {
let local_repo_inspector = FakeLocalRepoInspector::new(Vec::new());
let mut review_context = sample_review_context_in(temp_dir.path());

review_context.internal_review_mode = InternalReviewMode::Prompt;
review_context.review_level = ReviewLevel::Basic;

let bridge = TrackerToolBridge::with_review_handoff_for_test(
&tracker,
Expand Down Expand Up @@ -446,7 +446,7 @@ fn prompt_only_internal_review_mode_does_not_expose_checkpoint_tool() {
assert!(matches!(
checkpoint_response.content_items.as_slice(),
[DynamicToolContentItem::InputText{ text }]
if text.contains("codex.internal_review_mode = \"prompt\"")
if text.contains("[codex].review = \"basic\"")
));
}

Expand Down Expand Up @@ -1198,7 +1198,7 @@ fn review_handoff_requires_a_clean_checkpoint() {
}

#[test]
fn review_completion_skips_clean_checkpoint_when_internal_review_disabled() {
fn review_completion_skips_clean_checkpoint_when_review_gate_disabled() {
for completion_path in ["handoff", "repair"] {
let temp_dir = TempDir::new().expect("tempdir should create");
let tracker = FakeTracker::new();
Expand All @@ -1210,7 +1210,7 @@ fn review_completion_skips_clean_checkpoint_when_internal_review_disabled() {
let local_repo_inspector = FakeLocalRepoInspector::new(vec![Ok(sample_local_repo())]);
let mut review_context = sample_review_context_in(temp_dir.path());

review_context.internal_review_mode = InternalReviewMode::Off;
review_context.review_level = ReviewLevel::Off;

let bridge = TrackerToolBridge::with_review_handoff_for_test(
&tracker,
Expand All @@ -1237,7 +1237,7 @@ fn review_completion_skips_clean_checkpoint_when_internal_review_disabled() {
sample_review_repair_apply_inspectors(pr_url);
let mut review_context = sample_review_repair_context_in(temp_dir.path(), pr_url);

review_context.internal_review_mode = InternalReviewMode::Off;
review_context.review_level = ReviewLevel::Off;

let bridge = TrackerToolBridge::with_review_repair_for_test(
&tracker,
Expand All @@ -1262,7 +1262,7 @@ fn review_completion_skips_clean_checkpoint_when_internal_review_disabled() {
}

#[test]
fn disabled_internal_review_ignores_stale_review_policy_stop_state() {
fn disabled_review_gate_ignores_stale_review_policy_stop_state() {
let temp_dir = TempDir::new().expect("tempdir should create");
let tracker = FakeTracker::new();
let issue = sample_issue();
Expand All @@ -1271,7 +1271,7 @@ fn disabled_internal_review_ignores_stale_review_policy_stop_state() {
let local_repo_inspector = FakeLocalRepoInspector::new(Vec::new());
let mut review_context = sample_review_context_in(temp_dir.path());

review_context.internal_review_mode = InternalReviewMode::Off;
review_context.review_level = ReviewLevel::Off;

write_review_policy_checkpoint(
&review_context,
Expand All @@ -1290,7 +1290,7 @@ fn disabled_internal_review_ignores_stale_review_policy_stop_state() {
&local_repo_inspector,
);
let completion_status = DynamicToolHandler::classify_turn_completion(&bridge, "done")
.expect("disabled internal review should ignore stale review stop state");
.expect("disabled review gate should ignore stale review stop state");

assert_eq!(completion_status, TurnCompletionStatus::Continue);
}
Expand Down
12 changes: 6 additions & 6 deletions apps/decodex/src/agent/tracker_tool_bridge/tools.rs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ impl<'a> TrackerToolBridge<'a> {
if self
.review_context
.as_ref()
.is_some_and(ReviewHandoffContext::internal_review_checkpoint_enabled)
.is_some_and(ReviewHandoffContext::decodex_review_checkpoint_enabled)
{
tool_specs.extend(self.review_checkpoint_tool_specs());
}
Expand All @@ -67,7 +67,7 @@ impl<'a> TrackerToolBridge<'a> {
if self
.review_context
.as_ref()
.is_some_and(ReviewHandoffContext::internal_review_checkpoint_enabled)
.is_some_and(ReviewHandoffContext::decodex_review_checkpoint_enabled)
{
tool_specs.extend(self.review_checkpoint_tool_specs());
}
Expand Down Expand Up @@ -934,10 +934,10 @@ impl<'a> TrackerToolBridge<'a> {
));
};

if !review_context.internal_review_checkpoint_enabled() {
if !review_context.decodex_review_checkpoint_enabled() {
return DynamicToolCallResponse::failure(format!(
"`issue_review_checkpoint` is disabled because `codex.internal_review_mode = \"{}\"` for this run.",
review_context.internal_review_mode.as_str()
"`issue_review_checkpoint` is disabled because `[codex].review = \"{}\"` for this run.",
review_context.review_level.as_str()
));
}

Expand Down Expand Up @@ -1141,7 +1141,7 @@ impl<'a> TrackerToolBridge<'a> {
self.issue.identifier
)
})?;
} else if review_context.internal_review_checkpoint_enabled() {
} else if review_context.decodex_review_checkpoint_enabled() {
return Err(format!(
"Runtime state store is required to clear review policy state for issue `{}` after recording `{tool_name}`.",
self.issue.identifier
Expand Down
Loading