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

chore: revert unrelated changes in browser/prompt/history/tui files from prior commit

Browse Source
This commit is contained in:
James Peter
2025-09-01 23:16:39 +10:00
parent 64491a1fe9
commit 8a4a9508c9
4 changed files with 71 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/browser/src/manager.rs
-6
View File
@@ -33,11 +33,7 @@ async fn discover_ws_via_port(port: u16) -> Result<String> {
debug!("Requesting Chrome version info from: {}", url);
let client_start = tokio::time::Instant::now();
// Do not respect system proxy env vars for local CDP discovery.
// Corporate proxies frequently intercept 127.0.0.1 and break discovery with
// opaque "error sending request" failures. We always talk to localhost here.
let client = Client::builder()
.no_proxy()
.timeout(Duration::from_secs(5)) // Allow Chrome time to bring up /json/version on fresh launch
.build()
.map_err(|e| BrowserError::CdpError(format!("Failed to build HTTP client: {}", e)))?;
@@ -124,9 +120,7 @@ async fn scan_for_chrome_debug_port() -> Option<u16> {
for port in found_ports {
let test_future = async move {
let url = format!("http://127.0.0.1:{}/json/version", port);
// Skip proxy env for localhost checks; see note above.
let client = Client::builder()
.no_proxy()
.timeout(Duration::from_millis(200)) // Shorter timeout for parallel tests
.build()
.ok()?;
codex-rs/core/prompt_coder.md
+2 -8
View File
@@ -6,14 +6,8 @@ Code is a fast, community-driven fork focused on key developer ergonomics: Brows
This version has a few key changes and additions.
## Autonomy
You should be highly autonomous. Avoid asking the user to perform commands, perform research or run tests. You should implement these things yourself. Use your `agent_run` command to delegate tasks to sub-agents, particularly for tasks which can be performed in parallel such as setting up a testing script to validate changes. Work until the task is complete. This may take many hours.
## Preamble
You should provide fewer preamble messages and focus on completing the task as quickly as possible (once you fully understand it). Use parallel calls and agents to speed up work.
## Exploration
Understand every task you are given. Don't make assumptions and use your search tools to explore the problem space. Assigning agents to research is also a fantastic use for them!
## Preamble & Focus
You should provide fewer preamble messages and focus on completing the task as quickly as possible (once you fully understand it). You should attempt to work autonomously as much as possible and ask for input only when you can not proceed further, or the task is complete.
## Testing
With your additional browser tools you can validate web UI easily. For code that generates a web interface, always test with browser tools after changes and use your visual judgment to improve UX. You should always generate aesthetically pleasing interfaces with great UX.
codex-rs/tui/src/history_cell.rs
+58 -91
View File
@@ -318,91 +318,6 @@ impl HistoryCell for Box<dyn HistoryCell> {
}
}
// ==================== ReadAggregationCell ====================
// Aggregates multiple Read preamble entries into a single history cell while
// commands are still running, then flips to a finalized state without changing
// position in the history. This prevents flicker where multiple transient
// "Read" sections appear and later merge.
pub(crate) struct ReadAggregationCell {
// Aggregated preamble lines (each line typically starts with "└ " or two spaces)
lines: Vec<Line<'static>>,
// When true, render as a finalized "Read" section (ExecStatus::Success);
// otherwise render with a running header style (ExecStatus::Running).
finalized: bool,
}
impl ReadAggregationCell {
pub(crate) fn new() -> Self {
Self { lines: Vec::new(), finalized: false }
}
pub(crate) fn push_lines(&mut self, mut more: Vec<Line<'static>>) {
// Trim completely empty prefix/suffix lines from the chunk to keep the block compact
more = trim_empty_lines(more);
if more.is_empty() { return; }
self.lines.extend(more);
}
pub(crate) fn finalize(&mut self) {
self.finalized = true;
}
// Build a normalized copy of aggregated lines where only the very first
// visible line uses the corner connector "└ "; subsequent lines use two
// spaces. Also coalesce adjacent read ranges for the same file.
fn normalized_lines(&self) -> Vec<Line<'static>> {
let mut v = self.lines.clone();
// Ensure only the first content line shows the corner
let mut seen_first = false;
for line in v.iter_mut() {
if let Some(sp0) = line.spans.get_mut(0) {
let s = sp0.content.as_ref();
if s == "└ " || s == " └ " {
if seen_first {
sp0.content = " ".into();
sp0.style = sp0.style.add_modifier(Modifier::DIM);
} else {
// First occurrence keeps the corner but dim it consistently
sp0.style = sp0.style.add_modifier(Modifier::DIM);
seen_first = true;
}
}
}
}
// Merge overlapping/touching ranges per file to keep the list succinct
coalesce_read_ranges_in_lines_local(&mut v);
v
}
}
impl HistoryCell for ReadAggregationCell {
fn as_any(&self) -> &dyn std::any::Any { self }
fn as_any_mut(&mut self) -> &mut dyn std::any::Any { self }
fn kind(&self) -> HistoryCellType {
HistoryCellType::Exec { kind: ExecKind::Read, status: if self.finalized { ExecStatus::Success } else { ExecStatus::Running } }
}
fn display_lines(&self) -> Vec<Line<'static>> {
let mut out: Vec<Line<'static>> = Vec::new();
// Header: match Exec running/success styling for informational actions
let header = if self.finalized {
Line::styled("Read", Style::default().fg(crate::colors::text()))
} else {
Line::styled("Read", Style::default().fg(crate::colors::info()))
};
out.push(header);
out.extend(self.normalized_lines());
out
}
fn desired_height(&self, width: u16) -> u16 {
Paragraph::new(Text::from(self.display_lines_trimmed()))
.wrap(Wrap { trim: false })
.line_count(width)
.try_into()
.unwrap_or(0)
}
}
// ==================== PlainHistoryCell ====================
// For simple cells that just store lines
@@ -2734,12 +2649,64 @@ impl CollapsibleReasoningCell {
self.in_progress.set(in_progress);
}
/// Normalized lines for reasoning.
///
/// Robust mode: do not split lines. We keep provider output verbatim to
/// avoid mid‑word truncation and accidental title/body separation. Collapsed
/// view still extracts titles using the entire-line-bold rule below.
fn normalized_lines(&self) -> Vec<Line<'static>> { self.lines.clone() }
/// Normalize reasoning content lines by splitting any line that begins
/// with a bold "section title" followed immediately by regular text.
/// This produces a separate title line and keeps following text on a new line,
/// improving section detection and spacing.
fn normalized_lines(&self) -> Vec<Line<'static>> {
let mut out: Vec<Line<'static>> = Vec::new();
for line in &self.lines {
// Skip unchanged if empty or single span
if line.spans.len() <= 1 {
out.push(line.clone());
continue;
}
// Determine length of the leading bold run
let mut idx = 0usize;
while idx < line.spans.len() {
let s = &line.spans[idx];
// Treat heading-style titles (often bold) as bold too
let is_bold = s.style.add_modifier.contains(Modifier::BOLD);
if idx == 0 && s.content.trim().is_empty() {
// allow leading spaces in the bold run
idx += 1;
continue;
}
if is_bold {
idx += 1;
continue;
}
break;
}
// If no leading bold run or the entire line is bold, keep as-is
if idx == 0 || idx >= line.spans.len() {
out.push(line.clone());
continue;
}
// Create a separate title line from the leading bold spans
let mut title_spans = Vec::new();
let mut rest_spans = Vec::new();
for (i, s) in line.spans.iter().enumerate() {
if i < idx {
title_spans.push(s.clone());
} else {
rest_spans.push(s.clone());
}
}
// Push title line
out.push(Line::from(title_spans));
// Insert a spacer if the rest is non-empty and not already a blank line
let rest_is_blank = rest_spans.iter().all(|s| s.content.trim().is_empty());
if !rest_is_blank {
out.push(Line::from(rest_spans));
}
}
out
}
/// Extracts section titles for collapsed display: any line that appears to
/// be a heading or starts with a leading bold run. Returns at least the
codex-rs/tui/src/tui.rs
+11 -14
View File
@@ -53,21 +53,18 @@ pub fn init(config: &Config) -> Result<(Tui, TerminalInfo)> {
// Initialize syntax highlighting preference from config
crate::syntax_highlight::init_highlight_from_config(&config.tui.highlight);
// Query terminal capabilities BEFORE entering the alternate screen.
// On Windows Terminal (ConPTY), sending/reading terminal queries from the
// alt‑screen can be flaky and cause state corruption. Doing this first
// avoids timing issues and ensures we know capabilities up front.
let terminal_info = query_terminal_info();
// Now set up the terminal for full‑screen TUI.
execute!(stdout(), crossterm::terminal::EnterAlternateScreen)?;
execute!(stdout(), EnableBracketedPaste)?;
// Enable focus change notifications where they are known to behave.
// Skip on Windows to avoid potential event stream issues under ConPTY.
#[cfg(not(windows))]
{
let _ = execute!(stdout(), EnableFocusChange);
}
// Enable focus change events so we can detect when the terminal window/tab
// regains focus and proactively repaint the UI (helps terminals that clear
// their alt‑screen buffer while unfocused).
let _ = execute!(stdout(), EnableFocusChange);
// Enter alternate screen mode for full screen TUI
execute!(stdout(), crossterm::terminal::EnterAlternateScreen)?;
// Query terminal capabilities and font size after entering alternate screen
// but before enabling raw mode
let terminal_info = query_terminal_info();
enable_raw_mode()?;
// Enable keyboard enhancement flags so modifiers for keys like Enter are disambiguated.