hanzoai/dev
2
0
Fork 0
mirror of https://github.com/hanzoai/dev.git synced 2026-10-25 03:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'code-branch-20250926-230716' into main

Browse Source
This commit is contained in:
James Peter
2025-09-27 09:42:42 +10:00
parent 8eed8abdc6 1d445a1317
commit c032fa2f1b
1 changed files with 59 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/tui/src/chatwidget.rs
+59 -3
View File
@@ -14490,8 +14490,8 @@ impl ChatWidget<'_> {
let mut items: Vec<SelectionItem> = Vec::new();
items.push(SelectionItem {
name: "Review current workspace changes".to_string(),
description: Some("Include staged, unstaged, and untracked files".to_string()),
name: "Review /branch changes".to_string(),
description: Some("Compare your worktree branch against its merge target".to_string()),
is_current: false,
actions: vec![Box::new(|tx: &crate::app_event_sender::AppEventSender| {
tx.send(crate::app_event::AppEvent::RunReviewCommand(String::new()));
@@ -14710,7 +14710,7 @@ impl ChatWidget<'_> {
let prompt = if let Some(current) = current_trimmed.as_ref() {
format!(
"Review the code changes between the current branch '{current}' and '{branch_trimmed}'. Identify bugs, regressions, risky patterns, and missing tests before merging."
"Review the code changes between the current branch '{current}' and '{branch_trimmed}'. Identify the intent of the changes in '{current}' and ensure no obvious gaps remain. Find all geniune bugs or regressions which need to be addressed before merging. Return ALL issues which need to be addressed, not just the first one you find."
)
} else {
format!(
@@ -14783,6 +14783,62 @@ impl ChatWidget<'_> {
let trimmed = args.trim();
if trimmed.is_empty() {
if Self::is_branch_worktree_path(&self.config.cwd) {
if let Some(git_root) =
codex_core::git_info::resolve_root_git_project_for_trust(&self.config.cwd)
{
let worktree_cwd = self.config.cwd.clone();
let tx = self.app_event_tx.clone();
tokio::spawn(async move {
let default_branch = codex_core::git_worktree::detect_default_branch(&git_root)
.await
.map(|name| name.trim().to_string())
.filter(|name| !name.is_empty());
let current_branch = codex_core::git_info::current_branch_name(&worktree_cwd)
.await
.map(|name| name.trim().to_string())
.filter(|name| !name.is_empty());
if let (Some(base_branch), Some(current_branch)) =
(default_branch, current_branch)
{
if base_branch != current_branch {
let prompt = format!(
"Review the code changes between the current branch '{current_branch}' and '{base_branch}'. Identify the intent of the changes in '{current_branch}' and ensure no obvious gaps remain. Find all geniune bugs or regressions which need to be addressed before merging. Return ALL issues which need to be addressed, not just the first one you find."
);
let hint = format!("against {base_branch}");
let preparation_label =
Some(format!("Preparing code review against {base_branch}"));
let metadata = Some(ReviewContextMetadata {
scope: Some("branch_diff".to_string()),
base_branch: Some(base_branch.clone()),
current_branch: Some(current_branch.clone()),
..Default::default()
});
tx.send(crate::app_event::AppEvent::RunReviewWithScope {
prompt,
hint,
preparation_label,
metadata,
});
return;
}
}
tx.send(crate::app_event::AppEvent::RunReviewWithScope {
prompt: "Review the current workspace changes and highlight bugs, regressions, risky patterns, and missing tests before merge.".to_string(),
hint: "current workspace changes".to_string(),
preparation_label: Some("Preparing code review request...".to_string()),
metadata: Some(ReviewContextMetadata {
scope: Some("workspace".to_string()),
..Default::default()
}),
});
});
return;
}
}
let metadata = ReviewContextMetadata {
scope: Some("workspace".to_string()),
..Default::default()