T23c round 1 fix

- suggestions: arrows step past disabled rows and scroll the cursor into view;
  the cursor starts on an enabled row; Enter refuses a disabled one
- active_trigger takes the query's word test: one word for mentions, any
  non-space for the composer, so a file name keeps its dot
- DragDropOverlay takes the drop itself, which gives it the hitbox gpui needs
  to style a drag-over
- ParameterPanel shows the places of the step, value and both ends
- gallery: the prompt menu fills the draft; Reset restores the system prompt
- AGENTS: drag-over styles need a hitbox; debug_bounds never clear
This commit is contained in:
ZacharyZhang-NY committed 2026-09-26 06:59:37 -04:00
1 parent d362f08d41
commit eb4e9422c9
10 files changed
+347 -100

No files matched your search

+41 -20
View File
@@ -29,13 +29,15 @@ macro_rules! asset {
};
}
fn field(key: &'static str, text: &str, window: &mut Window, cx: &mut App) -> Entity<TextInput> {
let text = text.to_string();
window.use_keyed_state(key, cx, move |window, cx| {
const SYSTEM: &str = "You answer about color in plain words. Cite sources.";
/// The composer's text, which the prompt menu fills.
pub fn draft(window: &mut Window, cx: &mut App) -> Entity<TextInput> {
window.use_keyed_state("chat-compose", cx, |window, cx| {
let mut input = TextInput::new(window, cx)
.multi_line(1, 8)
.placeholder("Ask anything, / for commands, @ for context");
input.set_text(text, cx);
input.set_text("Compare these two lifts in dark mode", cx);
input
})
}
@@ -64,13 +66,11 @@ fn attachments() -> Vec<Attachment> {
]
}
pub fn composer(window: &mut Window, cx: &mut App) -> impl IntoElement + use<> {
let draft = field(
"chat-compose",
"Compare these two lifts in dark mode",
window,
cx,
);
pub fn composer(
draft: &Entity<TextInput>,
window: &mut Window,
cx: &mut App,
) -> impl IntoElement + use<> {
let files = keep("chat-attachments", attachments, window, cx);
let context = keep(
"chat-context",
@@ -131,7 +131,7 @@ pub fn composer(window: &mut Window, cx: &mut App) -> impl IntoElement + use<> {
set(files, next, cx)
};
let (sent, stopped, mentioned) = (busy.clone(), busy.clone(), context.clone());
let mut input = PromptInput::new("chat-composer", &draft, move |_, cx| set(&sent, true, cx))
let mut input = PromptInput::new("chat-composer", draft, move |_, cx| set(&sent, true, cx))
.above(chips)
.above(context_chips)
.tool(AttachmentButton::new("chat-attach", move |paths, _, cx| {
@@ -195,7 +195,11 @@ fn levels() -> Vec<f32> {
.collect()
}
pub fn pickers(window: &mut Window, cx: &mut App) -> impl IntoElement + use<> {
pub fn pickers(
draft: &Entity<TextInput>,
window: &mut Window,
cx: &mut App,
) -> impl IntoElement + use<> {
let model = keep("chat-model", || SharedString::from("large"), window, cx);
let mode = keep("chat-mode-pick", || SharedString::from("chat"), window, cx);
let tools = keep("chat-tools", || (true, false, false), window, cx);
@@ -216,6 +220,13 @@ pub fn pickers(window: &mut Window, cx: &mut App) -> impl IntoElement + use<> {
set(&tools, (web, code, images), cx)
}
};
let fill = |draft: &Entity<TextInput>, prompt: &'static str| {
let draft = draft.clone();
move |_: &mut Window, cx: &mut App| {
log::info!("gallery: prompt template");
draft.update(cx, |input, cx| input.set_text(prompt, cx))
}
};
section(
"ModelSelector / ModeSelector / ToolToggleMenu / PromptTemplateMenu",
"The model is a forms::Select with a note on each; the mode a buttons::SegmentedControl; tools and saved prompts are menus::DropdownMenu, one with checks and one that inserts a prompt.",
@@ -255,12 +266,15 @@ pub fn pickers(window: &mut Window, cx: &mut App) -> impl IntoElement + use<> {
.item(MenuItem::check("Run code", code).on_click(flip(&tools, 1)))
.item(MenuItem::check("Make images", images).on_click(flip(&tools, 2))),
))
.child(DropdownMenu::new(
.child(probe(
"chat-templates",
"Prompts",
Menu::new()
.item(MenuItem::new("Review this code").on_click(|_, _| log::info!("gallery: template review")))
.item(MenuItem::new("Explain like a textbook").on_click(|_, _| log::info!("gallery: template explain"))),
DropdownMenu::new(
"chat-templates",
"Prompts",
Menu::new()
.item(MenuItem::new("Review this code").on_click(fill(draft, "Review the code below. List bugs first, then anything unclear, each with its line and a fix.")))
.item(MenuItem::new("Explain like a textbook").on_click(fill(draft, "Explain the idea below to a newcomer: define terms before using them, one idea per paragraph."))),
),
)),
)
}
@@ -270,9 +284,10 @@ pub fn tuning(window: &mut Window, cx: &mut App) -> impl IntoElement + use<> {
let (temperature, top_p, longest) = *values.read(cx);
let system = window.use_keyed_state("chat-system", cx, |window, cx| {
let mut input = TextInput::new(window, cx).multi_line(3, 8);
input.set_text("You answer about color in plain words. Cite sources.", cx);
input.set_text(SYSTEM, cx);
input
});
let reset = system.clone();
let system_tokens = tokens(system.read(cx).text());
let changed = values.clone();
section(
@@ -303,7 +318,13 @@ pub fn tuning(window: &mut Window, cx: &mut App) -> impl IntoElement + use<> {
set(&changed, (t, p, l), cx)
},
))
.child(SystemPromptEditor::new("chat-system", &system, system_tokens, 400).on_reset(|_, _| log::info!("gallery: reset system prompt")))
.child(probe(
"chat-system",
div().w(px(560.)).child(
SystemPromptEditor::new("chat-system", &system, system_tokens, 400)
.on_reset(move |_, cx| reset.update(cx, |input, cx| input.set_text(SYSTEM, cx))),
),
))
.child(
UsageBar::new(200_000.0)
.part("System", 1_200.0)
+19 -2
View File
@@ -38,11 +38,28 @@ const SCRIPT: &[Step] = &[
Step::UpAt("chat-sources", 20.0, 10.0),
Step::Wait(300),
Step::Shot("sources"),
Step::DownAt("chat-templates", 30.0, 12.0),
Step::UpAt("chat-templates", 30.0, 12.0),
Step::Wait(200),
Step::Key("down"),
Step::Key("enter"),
Step::Wait(200),
Step::DownAt("chat-system", 160.0, 48.0),
Step::UpAt("chat-system", 160.0, 48.0),
Step::Key("cmd-a"),
Step::Type("Answer in one line."),
Step::Wait(200),
Step::Shot("prompts"),
Step::DownAt("chat-system", 548.0, 12.0),
Step::UpAt("chat-system", 548.0, 12.0),
Step::Wait(200),
Step::Shot("reset"),
Step::DownAt("chat-sources", 20.0, 10.0),
Step::UpAt("chat-sources", 20.0, 10.0),
];
fn render(window: &mut Window, cx: &mut App) -> AnyElement {
let draft = compose::draft(window, cx);
div()
.child(talk::conversation(window, cx))
.child(talk::streaming(window, cx))
@@ -54,8 +71,8 @@ fn render(window: &mut Window, cx: &mut App) -> AnyElement {
.child(controls::thinking(window, cx))
.child(cite::citations(window, cx))
.child(cite::search(window, cx))
.child(compose::composer(window, cx))
.child(compose::pickers(window, cx))
.child(compose::composer(&draft, window, cx))
.child(compose::pickers(&draft, window, cx))
.child(compose::tuning(window, cx))
.into_any_element()
}