Merge 4fa281f2a7 into sapling-pr-archive-bolinfest

This commit is contained in:
Michael Bolin
2026-04-21 17:20:36 -07:00
committed by GitHub
2 changed files with 10 additions and 9 deletions

View File

@@ -91,7 +91,7 @@ async fn status_line_setup_popup_live_only_snapshot() {
chat.status_line_branch = Some("feature/live-preview-branch".to_string());
chat.thread_name = Some("Live preview thread".to_string());
chat.config.tui_status_line = Some(vec![
"project-root".to_string(),
"project-name".to_string(),
"git-branch".to_string(),
"thread-title".to_string(),
]);
@@ -127,7 +127,7 @@ async fn status_surface_preview_lines_hardcoded_only_snapshot() {
async fn status_line_setup_popup_hardcoded_only_snapshot() {
let (mut chat, _rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await;
chat.config.tui_status_line = Some(vec![
"project-root".to_string(),
"project-name".to_string(),
"git-branch".to_string(),
"thread-title".to_string(),
]);
@@ -167,7 +167,7 @@ async fn status_line_setup_popup_mixed_snapshot() {
chat.status_line_branch = Some("feature/mixed-preview".to_string());
chat.thread_name = Some("Mixed preview thread".to_string());
chat.config.tui_status_line = Some(vec![
"project-root".to_string(),
"project-name".to_string(),
"git-branch".to_string(),
"thread-title".to_string(),
]);
@@ -186,8 +186,8 @@ async fn terminal_title_setup_popup_live_only_snapshot() {
chat.thread_name = Some("Live preview thread".to_string());
chat.last_plan_progress = Some((2, 5));
chat.config.tui_terminal_title = Some(vec![
"project".to_string(),
"thread".to_string(),
"project-name".to_string(),
"thread-title".to_string(),
"git-branch".to_string(),
"task-progress".to_string(),
]);
@@ -202,7 +202,7 @@ async fn terminal_title_setup_popup_live_only_snapshot() {
async fn terminal_title_setup_popup_hardcoded_only_snapshot() {
let (mut chat, _rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await;
chat.config.tui_terminal_title = Some(vec![
"thread".to_string(),
"thread-title".to_string(),
"git-branch".to_string(),
"task-progress".to_string(),
]);
@@ -218,8 +218,8 @@ async fn terminal_title_setup_popup_mixed_snapshot() {
let (mut chat, _rx, _op_rx) = make_chatwidget_manual(/*model_override*/ None).await;
chat.thread_name = Some("Mixed preview thread".to_string());
chat.config.tui_terminal_title = Some(vec![
"project".to_string(),
"thread".to_string(),
"project-name".to_string(),
"thread-title".to_string(),
"task-progress".to_string(),
]);

View File

@@ -2,6 +2,7 @@
source: tui/src/external_agent_config_migration.rs
expression: rendered
---
> External agent config detected
We found settings from another agent that you can add to this project.
Select what to import
@@ -9,7 +10,7 @@ expression: rendered
[x] Migrate /Users/alex/.claude/settings.json into /Users/alex/.codex/con…
Project: C:\workspace\project
[x] Migrate enabled plugins from .claude\settings.json (4 marketplaces, 6…
[x] Migrate enabled plugins from .claude/settings.json (4 marketplaces, 6…
• acme-tools: deployer, formatter, +1 more
• team-marketplace: asana
• debug: sample