mirror of
https://github.com/bherbruck/solidcraft.git
synced 2026-11-20 23:52:23 +00:00
419bbcda0e
* Layers: a Shared crate class, and cargo xtask shared builds each one on its own (#12935) A Shared crate depends only on other Shared crates, solidcore and external crates (UI toolkits included); any layered or testkit crate may use one. The layer check reports a Shared crate's dependency on an app crate, of any kind. cargo xtask shared checks each Shared crate's manifest (workspace lints, licence, README) and that no include_str! or include_bytes! reaches outside it, then builds and tests it with its Shared dependencies in a scratch workspace of its own. cargo xtask ci runs it after the layer check. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LUXeKQRurMYJST9eSZWKzW * UI kit: the widget registry is a shared crate, ui-registry (#12936) The handle, rect and count registry that UI tests, scenarios and the control channel read moves out of scenario into solidcraft-ui-registry, the first Shared crate. The kit publishes into it directly; scenario re-exports it, so scenarios, scripts and the rest of ui-egui are unchanged and every handle keeps its name. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LUXeKQRurMYJST9eSZWKzW * Theme: the tab accent takes the tab, the sketch and the tool as data (#12938) TabAccent::publish takes the open tab, whether a sketch is being edited and whether a tool or dialog is active, instead of SolveApp; SolveApp::publish_tab_accent works the three out in one place. scoped_panel_tokens is public, so a host can draw any component in another palette or accent. The theme and its tests no longer name SolveApp, Services or workspace. Accents are unchanged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LUXeKQRurMYJST9eSZWKzW * UI kit: Preferences search is a kit module, settings_search (#13256) prefs_search moves whole into ui_kit::settings_search: it filters any settings page the kit draws, and SolidCraft's Preferences window is one use of it. It publishes its handles into the widget registry and reads the same wall clock as before (web_time), so no kit file calls the app for search any more. Every caller uses the new path; state ids, handle names, matches and scores are unchanged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LUXeKQRurMYJST9eSZWKzW * UI kit: the kit owns the menu entry and the list width (#13257) Item (a command or ui.* action with its label, shortcut, icon, params, children, swatch and tip) and LIST_W move from context_menu into ui_kit::menu, with the same serde form, so the control channel's menu report is byte-identical. context_menu keeps building SolidCraft's entries (cmd, and act over Item::action) and returns kit Items. No kit file refers to context_menu any more. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LUXeKQRurMYJST9eSZWKzW * UI kit: number parsing and recent colours in the kit, expression support passed in by the host (#13258) parse_number (decimal point or comma, Unicode minus) moves from prefs into the kit's fields, and recent_colors moves whole into ui_kit::recent_colors beside the colour picker. The kit no longer knows the expression language: a host installs an Expressions (is this a literal, is this a unit, complete or step this text) per egui context, and fields read it for label drags and completion. SolidCraft installs DocExpressions, built on doc::expr and params_dialog::complete, when the app first draws into a context. Behaviour in the app is unchanged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LUXeKQRurMYJST9eSZWKzW * UI kit: navigation-bar values and the horizontal wheel in the kit (#13259) The bar's edge, size, idle and button-kind values move beside the bar's drawing in ui_kit::navigation as NavigationEdge, NavigationSize, NavigationIdle and NavigationKind (the kit already has a container Edge). Serde names are unchanged, so saved preferences load as before. take_horizontal_wheel moves into the theme picker, its only caller. SolidCraft's slot table stays in navigation_bar. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LUXeKQRurMYJST9eSZWKzW * UI kit: layout mode and card geometry in the kit, input shield set by the host (#13260) LayoutMode (with its per-context publish and current), the card gap and the panic-free clamp move into the kit's containers and panels, and Cards into stages. Cards::new takes the workspace width instead of reading the ribbon's constant. The flag that says a report covers the 3D view is now the kit's (input_blocked, set_input_blocked); the app's CadInput guard sets it, and issue_report's own copy is gone. Serde names are unchanged, so saved preferences load as before. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LUXeKQRurMYJST9eSZWKzW * UI kit: continuity rows leave the kit, the navigator figure takes its axes as input (#13261) continuity_row and its explained and tip variants are CAD controls over the kernel's Continuity: they move beside their callers in dialogs_surface, still drawn with the kit's choice_row. The Preferences navigator figure takes its axes (screen direction and depth) as NavigatorAxis input; SolidCraft computes them from its default camera. dashed_line is painter geometry and moves into ui_kit::dash with its test. No kit file uses the engine, the record or the viewport outside tests. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LUXeKQRurMYJST9eSZWKzW * UI kit: length fields take unit scaling and length parsing from the host (#13270) The kit's length field converted millimetres to and from the design's units through three prefs helpers. Those are the host's unit rules, so Expressions gains unit_scale, length_number and parse_length_mm, and length_drag reads them from the context. DocExpressions implements them with the same prefs helpers, so the app is unchanged. With nothing installed the field edits plain millimetres. No kit file calls prefs outside tests. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LUXeKQRurMYJST9eSZWKzW * Colour: the sRGB rule and the analysis palette are a shared crate, solidcraft-color (#13291) geom's srgb module (the one sRGB transfer function every encode and decode goes through) moves whole into solidcraft-color with its tests, and so does AnalysisColors, the analysis palette the theme fills and the renderer reads. render, doc, io, engine, gpu and ui-egui use the crate; there is no re-export at the old paths. The theme's unused material_color wrapper is removed, so no non-test theme code names solidcraft_engine. Values are unchanged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LUXeKQRurMYJST9eSZWKzW * Material editor: the Remove buttons are translated (material.editor.remove) The editor's two Remove buttons called tr("Remove"), which looks up an id, so they read "Remove" in every language. They use a new id, material.editor.remove, whose text in each locale is the one that locale already gives the plain Remove button prefs.network_host_remove (33 of 35 catalogs have it; the other two show English, as now). The label-literal guard found it once the file's import named tr directly. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LUXeKQRurMYJST9eSZWKzW * Shared UI crates: ui-text, the message catalogs' machinery as a shared crate (#13290) bidi, Catalog, Locale, lookup, formatting, labels and language choice move from ui-egui's i18n into solidcraft-ui-text, a Shared crate any front end can use. The host installs its catalogs once; with none installed every id reads as itself. SolidCraft's 35 catalogs, the build script that merges them, and the adapters that read engine types (diagnostic, tr_engine_error, and the given-name and browser-label vocabulary as the LocaleNames trait) stay in the app's i18n. The app installs its catalogs when it starts, when an app is built and in the widget test context. Call sites use the crate's path, with no re-export at the old one; messages, ids and fallbacks are unchanged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LUXeKQRurMYJST9eSZWKzW * i18n tests: the painted-English sweeps install the catalogs themselves (#13290) no_english_is_painted_where_the_language_has_a_translation and the_sweep_reports_english_only_where_a_translation_exists read translations without installing the app's catalogs, so they passed only when another test in the same process had installed them first (run alone, every id read as itself). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * Theme: the icon palette leaves Tokens; the icon renderer owns it (#13304) A theme file's icon palette was a field of Tokens, so the token set depended on the icon roles ui-egui's build script generates. It is now the icon renderer's per-thread state (icon_svg::set_theme_palette), set alongside the theme's palette by theme::set_file_palette, and theme_files resolves it with resolve_icon_palette (the same overlay merge as the tokens) and exports it as an argument. Rendered pixels, theme files and exports are unchanged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LUXeKQRurMYJST9eSZWKzW * Shared UI crates: the token contract as a shared crate, solidcraft-theme (#13304) Tokens with SolidCraft's light and dark values in code (palettes.rs moves in from assets/styles/ui, with the eight primary strokes it shared with the icon artwork written as icon_strokes), colour vision, TabAccent, contrast checks, apply/visuals and the per-thread and per-context theme state move into crates/theme, class Shared. It holds no data files and does not depend on theme files or icon roles; with nothing set, components draw with the built-in tokens. The theme system stays in ui-egui's theme module: the custom-theme glue (prepared theme, tab targets and their fade, blur intent), publish_tab (was TabAccent::publish, which now stores its result through TabAccent::set_current and set_published), set_file_palette, ViewportTheme. ui-egui's build script no longer generates the primary-stroke constants; an icon test holds the crate's literals equal to palette.toml's. Call sites use solidcraft_theme paths with no re-export (one rename pass). Tokens, theme files and rendered pixels are unchanged. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LUXeKQRurMYJST9eSZWKzW * Theme: the icon lint and the docs read palettes.rs at crates/theme (#13304) lint_icons.py compared the icon review page with assets/styles/ui/palettes.rs, which moved into solidcraft-theme; it reads crates/theme/src/palettes.rs now (cargo xtask icons passes again), and the READMEs, docs and test comments name the new path. set_custom and scoped_tokens say they set tokens only, so a host with an icon renderer sets its palette too; the field contrast test applies each built-in theme with set_file_palette, as the app does. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LUXeKQRurMYJST9eSZWKzW * Theme: format the field contrast test (#13304) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LUXeKQRurMYJST9eSZWKzW --------- Co-authored-by: jyviko <2501648+jyviko@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
113 lines
5.5 KiB
Rust
113 lines
5.5 KiB
Rust
//! Render the actual Assistant panel with a public-safe transcript, without an agent or GPU.
|
||
#[path = "support/raster.rs"]
|
||
mod raster;
|
||
|
||
use std::collections::HashMap;
|
||
|
||
use egui::{ColorImage, TextureId};
|
||
use serde_json::json;
|
||
use solidcraft_ui_egui::{
|
||
agent_chat::{
|
||
Item,
|
||
backend::{PermissionOption, ToolStatus},
|
||
},
|
||
scenario::{self, Harness},
|
||
};
|
||
|
||
#[test]
|
||
fn assistant_transcript_tools_and_approvals_fit_in_both_themes() {
|
||
let previous = solidcraft_theme::is_dark();
|
||
for dark in [false, true] {
|
||
for width in [280.0, 440.0, 760.0] {
|
||
let mut h = Harness::new();
|
||
h.app.home.open = false;
|
||
h.call("ui.resize", json!({"width":1100,"height":1500}));
|
||
h.call("ui.set", json!({"dark":dark}));
|
||
h.call("ui.agent_chat", json!({"features":true,"open":true,"picker":false,"width":width}));
|
||
h.app.agent_chat.items = vec![
|
||
Item::User {
|
||
text: "Make the plate 80 mm wide, soften its edges, and export a STEP file.".into(),
|
||
image: false,
|
||
pictures: vec![],
|
||
context: Default::default(),
|
||
files: vec!["plate-notes.txt".into()],
|
||
},
|
||
Item::Agent { thought: false, text: "I’ll update the width and check the selected edges before exporting.".into() },
|
||
Item::Tool {
|
||
id: "width".into(),
|
||
title: "parameters.set".into(),
|
||
kind: "other".into(),
|
||
status: Some(ToolStatus::Completed),
|
||
input: None,
|
||
output: Some("plate_width = 80 mm".into()),
|
||
},
|
||
Item::Tool {
|
||
id: "fillet".into(),
|
||
title: "solid.fillet".into(),
|
||
kind: "other".into(),
|
||
status: Some(ToolStatus::Failed),
|
||
input: None,
|
||
output: Some("The requested radius is too large. Try a smaller radius.".into()),
|
||
},
|
||
Item::Agent {
|
||
thought: false,
|
||
text: "The width is updated. The fillet needs a smaller radius. May I export the current plate for review?".into(),
|
||
},
|
||
Item::Permission {
|
||
key: 1,
|
||
title: "Export plate.step".into(),
|
||
answer: None,
|
||
options: vec![
|
||
PermissionOption { id: "deny".into(), name: "Deny".into(), kind: "reject_once".into() },
|
||
PermissionOption { id: "always".into(), name: "Always allow".into(), kind: "allow_always".into() },
|
||
PermissionOption { id: "once".into(), name: "Allow once".into(), kind: "allow_once".into() },
|
||
],
|
||
},
|
||
];
|
||
h.ctx = egui::Context::default();
|
||
h.ctx.enable_accesskit();
|
||
solidcraft_ui_egui::fonts::setup_fonts(&h.ctx);
|
||
solidcraft_theme::apply(&h.ctx);
|
||
let mut textures: HashMap<TextureId, ColorImage> = HashMap::new();
|
||
for _ in 0..8 {
|
||
raster::paint(&mut h, &mut textures, vec![]);
|
||
}
|
||
// Expanding the failed call must preserve every approval and composer target.
|
||
let at = scenario::handle_at("agent_chat:tool:3").expect("failed tool target");
|
||
for pressed in [true, false] {
|
||
raster::paint(
|
||
&mut h,
|
||
&mut textures,
|
||
vec![
|
||
egui::Event::PointerMoved(at),
|
||
egui::Event::PointerButton { pos: at, button: egui::PointerButton::Primary, pressed, modifiers: egui::Modifiers::NONE },
|
||
],
|
||
);
|
||
}
|
||
for _ in 0..8 {
|
||
raster::paint(&mut h, &mut textures, vec![]);
|
||
}
|
||
let output = raster::paint(&mut h, &mut textures, vec![]);
|
||
h.output = output.platform_output.clone();
|
||
let screenshot = raster::raster(&mut h, &textures, output);
|
||
let panel = scenario::rect_of("agent_chat:panel").expect("Assistant panel");
|
||
for name in ["permission:once", "permission:always", "permission:deny", "permissions", "send"] {
|
||
let at = scenario::handle_at(&format!("agent_chat:{name}")).expect("Assistant action retained");
|
||
assert!(panel.contains(at), "{name} outside {width} pt panel: {at:?} {panel:?}");
|
||
}
|
||
assert!(h.widget("The requested radius is too large. Try a smaller radius.").is_some(), "failed tool output expands");
|
||
assert_eq!(h.app.agent_chat.waiting(), 1, "rendering and expanding tools never answer an approval");
|
||
let approval = scenario::rect_of("assistant:approval").expect("approval card");
|
||
assert!(approval.height() < 160.0, "approval stays compact at {width}: {approval:?}");
|
||
if let Ok(dir) = std::env::var("SOLIDCRAFT_ASSISTANT_EVIDENCE") {
|
||
std::fs::create_dir_all(&dir).unwrap();
|
||
image::imageops::crop_imm(&screenshot, panel.left() as u32, panel.top() as u32, panel.width() as u32, panel.height() as u32)
|
||
.to_image()
|
||
.save(std::path::Path::new(&dir).join(format!("assistant-{width:.0}-{}.png", if dark { "dark" } else { "light" })))
|
||
.unwrap();
|
||
}
|
||
}
|
||
}
|
||
solidcraft_theme::set_dark(previous);
|
||
}
|