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
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,8 @@ jobs:
- name: Generate checksums
run: |
cd artifacts
sha256sum * > checksums-sha256.txt
# Exclude MSI — it will be replaced by a locally signed version
sha256sum $(ls | grep -v '\.msi$') > checksums-sha256.txt
cat checksums-sha256.txt

- name: Create GitHub Release
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,13 @@
# -----------------------------------------------------------------------------


# Claude Code project instructions (local only)
CLAUDE.md

# Development plans
plans/
docs/superpowers/
docs/specs/

# Superpowers skill state
.superpowers/
Expand Down
10 changes: 6 additions & 4 deletions crates/codirigent-ui/src/terminal_runtime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,12 @@ impl TerminalRuntime {
fn snapshot_from_damage(&mut self) -> TerminalRenderSnapshot {
let rows = self.terminal.rows() as usize;
let cols = self.terminal.cols() as usize;
let damage = if self
.cached_rows
.as_ref()
.is_some_and(|cached_rows| cached_rows.len() == rows)
let scrolled_back = self.terminal.term().grid().display_offset() > 0;
let damage = if !scrolled_back
&& self
.cached_rows
.as_ref()
.is_some_and(|cached_rows| cached_rows.len() == rows)
{
let term = self.terminal.term_mut();
let damage = match term.damage() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,14 @@ impl WorkspaceView {

let _ = this.update(cx, |this, cx| {
this.polling.hook_signal_check_in_flight = false;
// Sort by timestamp so that the newest signal for each
// session is processed last and wins the cached status.
// Without this, non-deterministic read_dir order can let
// a stale "idle" signal overwrite a newer "working" signal
// when multiple signal files target the same session
// (e.g., parent + subagent Claude Code sessions).
let mut updates = updates;
updates.sort_by_key(|u| u.ts);
for update in updates {
this.apply_hook_signal_update(update, cx);
}
Expand Down
12 changes: 6 additions & 6 deletions crates/codirigent-ui/src/workspace/impl_session_lifecycle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1443,19 +1443,19 @@ impl WorkspaceView {
let codex_started_at = plan.codex_started_at;
if let Ok(manager) = self.session_manager.lock() {
manager.with_session_state_mut(bootstrapped.session_id, |state| {
// session_uuid is set only inside this restore_cli-gated block;
// the local session struct receives the same guard at the assignment below.
state.session.session_uuid = plan.session_uuid.clone();
state.session.codex_execution_mode = codex_execution_mode;
state.session.codex_started_at = codex_started_at;
});
}
}

// NOTE: Do NOT overwrite session.session_uuid with plan.session_uuid here.
// The PTY was already spawned with the UUID from Session::new() as the
// CODIRIGENT_SESSION_UUID env var. Overwriting with the saved UUID from a
// previous app instance creates a mismatch: hook signals carry the PTY's
// UUID but the workspace session has the old one, causing routing to fail
// and status to stay stuck on Idle.
let mut session = bootstrapped.session;
if restore_cli {
session.session_uuid = plan.session_uuid.clone();
}
session.shell = bootstrapped.request.requested_shell.clone();
session.group = plan.group.clone();
session.color = plan.color.clone();
Expand Down
5 changes: 5 additions & 0 deletions crates/codirigent-ui/src/workspace/terminal_render.rs
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,11 @@ impl WorkspaceView {
}
}

// 0. Fill canvas with terminal background so empty rows (default-color cells
// that produce no bg_rects_hsla entries) don't show panel_bg below them.
// This fixes the visual "cut-off" after dragging to a larger pane.
window.paint_quad(gpui::fill(bounds, terminal_bg));

// 1. Paint background rectangles
for row in &cached_rows {
for (rect_row, start_col, end_col, bg_color) in row.bg_rects_hsla.iter() {
Expand Down
File renamed without changes.
File renamed without changes.
Loading
Loading