@steerable/agent-shell-tauri 0.7.1 → 0.7.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steerable/agent-shell-tauri",
-  "version": "0.7.1",
+  "version": "0.7.4",
   "description": "Reusable Tauri Rust host source for @steerable/agent-shell",
   "license": "Apache-2.0",
   "homepage": "https://steerableframework.com/",

package/src/lib.rs

@@ -51,16 +51,17 @@ impl DesktopConfig {
 }
 
 fn install_menu(app: &tauri::App, data_dir_name: &str) -> tauri::Result<()> {
-    let new_chat = MenuItemBuilder::with_id("new-chat", "新建对话")
+    let labels = zoom::zoom_menu_labels("zh");
+    let new_chat = MenuItemBuilder::with_id("new-chat", labels.new_chat)
         .accelerator("CmdOrCtrl+N")
         .build(app)?;
-    let open_terminal = MenuItemBuilder::with_id("open-terminal", "打开终端")
+    let open_terminal = MenuItemBuilder::with_id("open-terminal", labels.open_terminal)
         .accelerator("CmdOrCtrl+T")
         .build(app)?;
-    let quit = MenuItemBuilder::with_id("app-quit", "退出")
+    let quit = MenuItemBuilder::with_id("app-quit", labels.quit)
         .accelerator("CmdOrCtrl+Q")
         .build(app)?;
-    let file = SubmenuBuilder::new(app, "文件")
+    let file = SubmenuBuilder::new(app, labels.file)
         .item(&new_chat)
         .separator()
         .close_window()
@@ -69,10 +70,10 @@ fn install_menu(app: &tauri::App, data_dir_name: &str) -> tauri::Result<()> {
         .build()?;
     // Predefined Paste delivers an empty clipboard into WKWebView. Own the
     // shortcut and read the pasteboard from the host process instead.
-    let paste = MenuItemBuilder::with_id("edit-paste", "粘贴")
+    let paste = MenuItemBuilder::with_id("edit-paste", labels.paste)
         .accelerator("CmdOrCtrl+V")
         .build(app)?;
-    let edit = SubmenuBuilder::new(app, "编辑")
+    let edit = SubmenuBuilder::new(app, labels.edit)
         .undo()
         .redo()
         .separator()
@@ -81,7 +82,6 @@ fn install_menu(app: &tauri::App, data_dir_name: &str) -> tauri::Result<()> {
         .item(&paste)
         .select_all()
         .build()?;
-    let labels = zoom::zoom_menu_labels("zh");
     let zoom_in = MenuItemBuilder::with_id("view-zoom-in", labels.zoom_in)
         .accelerator("CmdOrCtrl+=")
         .build(app)?;
@@ -97,16 +97,7 @@ fn install_menu(app: &tauri::App, data_dir_name: &str) -> tauri::Result<()> {
     let zoom_reset = MenuItemBuilder::with_id("view-zoom-reset", labels.zoom_reset)
         .accelerator("CmdOrCtrl+0")
         .build(app)?;
-    zoom::bind(
-        app,
-        data_dir_name,
-        zoom_in.clone(),
-        zoom_in_plus.clone(),
-        zoom_out.clone(),
-        zoom_reset.clone(),
-    )
-    .map_err(|error| tauri::Error::Io(std::io::Error::other(error)))?;
-    let view = SubmenuBuilder::new(app, "视图")
+    let view = SubmenuBuilder::new(app, labels.view)
         .item(&zoom_in)
         .item(&zoom_in_plus)
         .item(&zoom_out)
@@ -116,6 +107,24 @@ fn install_menu(app: &tauri::App, data_dir_name: &str) -> tauri::Result<()> {
         .separator()
         .fullscreen()
         .build()?;
+    zoom::bind(
+        app,
+        data_dir_name,
+        zoom::ZoomMenuItems {
+            file: file.clone(),
+            new_chat,
+            quit,
+            edit: edit.clone(),
+            paste,
+            zoom_in,
+            zoom_in_plus,
+            zoom_out,
+            zoom_reset,
+            view: view.clone(),
+            open_terminal,
+        },
+    )
+    .map_err(|error| tauri::Error::Io(std::io::Error::other(error)))?;
     let menu = MenuBuilder::new(app)
         .items(&[&file, &edit, &view])
         .build()?;

package/src/python_runner.rs

@@ -586,9 +586,7 @@ async fn validate_local(path: &Path) -> Result<(), String> {
         const CREATE_NO_WINDOW: u32 = 0x0800_0000;
         command.creation_flags(CREATE_NO_WINDOW);
     }
-    let output = command.output()
-        .await
-        .map_err(|error| error.to_string())?;
+    let output = command.output().await.map_err(|error| error.to_string())?;
     if !output.status.success() {
         return Err("Selected Python could not be started".into());
     }

package/src/zoom.rs

@@ -7,7 +7,7 @@ use serde_json::{Map, Value};
 use std::fs;
 use std::path::{Path, PathBuf};
 use std::sync::Mutex;
-use tauri::menu::MenuItem;
+use tauri::menu::{MenuItem, Submenu};
 use tauri::{AppHandle, Emitter, Manager, Wry};
 
 pub const MIN_ZOOM: f64 = 0.8;
@@ -20,35 +20,68 @@ struct ZoomChanged {
     scale: f64,
 }
 
+pub struct ZoomMenuItems {
+    pub file: Submenu<Wry>,
+    pub new_chat: MenuItem<Wry>,
+    pub quit: MenuItem<Wry>,
+    pub edit: Submenu<Wry>,
+    pub paste: MenuItem<Wry>,
+    pub zoom_in: MenuItem<Wry>,
+    pub zoom_in_plus: MenuItem<Wry>,
+    pub zoom_out: MenuItem<Wry>,
+    pub zoom_reset: MenuItem<Wry>,
+    pub view: Submenu<Wry>,
+    pub open_terminal: MenuItem<Wry>,
+}
+
 pub struct ZoomControls {
     path: PathBuf,
     scale: Mutex<f64>,
-    zoom_in: MenuItem<Wry>,
-    zoom_in_plus: MenuItem<Wry>,
-    zoom_out: MenuItem<Wry>,
-    zoom_reset: MenuItem<Wry>,
+    menu: ZoomMenuItems,
 }
 
 pub struct ZoomMenuLabels {
+    pub file: &'static str,
+    pub new_chat: &'static str,
+    pub quit: &'static str,
+    pub edit: &'static str,
+    pub paste: &'static str,
+    pub view: &'static str,
     pub zoom_in: &'static str,
     pub zoom_out: &'static str,
     pub zoom_reset: &'static str,
+    pub open_terminal: &'static str,
 }
 
-/// View-menu labels for the page locale. Both zoom-in rows share one label.
+/// App-menu labels for the page locale. Both zoom-in rows share one label.
+/// Undo, cut, and the other predefined items stay with the operating system.
 pub fn zoom_menu_labels(locale: &str) -> ZoomMenuLabels {
     let normalized = locale.trim().to_lowercase().replace('_', "-");
     if normalized == "zh" || normalized.starts_with("zh-") {
         ZoomMenuLabels {
+            file: "文件",
+            new_chat: "新建对话",
+            quit: "退出",
+            edit: "编辑",
+            paste: "粘贴",
+            view: "视图",
             zoom_in: "放大",
             zoom_out: "缩小",
             zoom_reset: "实际大小",
+            open_terminal: "打开终端",
         }
     } else {
         ZoomMenuLabels {
+            file: "File",
+            new_chat: "New chat",
+            quit: "Quit",
+            edit: "Edit",
+            paste: "Paste",
+            view: "View",
             zoom_in: "Zoom in",
             zoom_out: "Zoom out",
             zoom_reset: "Actual size",
+            open_terminal: "Open terminal",
         }
     }
 }
@@ -199,22 +232,12 @@ pub fn user_data_dir(app: &AppHandle, data_dir_name: &str) -> Result<PathBuf, St
     Ok(dir)
 }
 
-pub fn bind(
-    app: &tauri::App,
-    data_dir_name: &str,
-    zoom_in: MenuItem<Wry>,
-    zoom_in_plus: MenuItem<Wry>,
-    zoom_out: MenuItem<Wry>,
-    zoom_reset: MenuItem<Wry>,
-) -> Result<(), String> {
+pub fn bind(app: &tauri::App, data_dir_name: &str, menu: ZoomMenuItems) -> Result<(), String> {
     let path = user_data_dir(app.handle(), data_dir_name)?.join("window-state.json");
     app.manage(ZoomControls {
         path,
         scale: Mutex::new(DEFAULT_ZOOM),
-        zoom_in,
-        zoom_in_plus,
-        zoom_out,
-        zoom_reset,
+        menu,
     });
     Ok(())
 }
@@ -224,10 +247,17 @@ pub fn apply_locale(app: &AppHandle, locale: &str) {
         return;
     };
     let labels = zoom_menu_labels(locale);
-    let _ = controls.zoom_in.set_text(labels.zoom_in);
-    let _ = controls.zoom_in_plus.set_text(labels.zoom_in);
-    let _ = controls.zoom_out.set_text(labels.zoom_out);
-    let _ = controls.zoom_reset.set_text(labels.zoom_reset);
+    let _ = controls.menu.file.set_text(labels.file);
+    let _ = controls.menu.new_chat.set_text(labels.new_chat);
+    let _ = controls.menu.quit.set_text(labels.quit);
+    let _ = controls.menu.edit.set_text(labels.edit);
+    let _ = controls.menu.paste.set_text(labels.paste);
+    let _ = controls.menu.view.set_text(labels.view);
+    let _ = controls.menu.zoom_in.set_text(labels.zoom_in);
+    let _ = controls.menu.zoom_in_plus.set_text(labels.zoom_in);
+    let _ = controls.menu.zoom_out.set_text(labels.zoom_out);
+    let _ = controls.menu.zoom_reset.set_text(labels.zoom_reset);
+    let _ = controls.menu.open_terminal.set_text(labels.open_terminal);
 }
 
 pub fn apply_saved(app: &AppHandle) {
@@ -288,9 +318,12 @@ fn commit(
         .scale
         .lock()
         .unwrap_or_else(|poison| poison.into_inner()) = scale;
-    let _ = controls.zoom_in.set_enabled(zoom_in_enabled(scale));
-    let _ = controls.zoom_in_plus.set_enabled(zoom_in_enabled(scale));
-    let _ = controls.zoom_out.set_enabled(zoom_out_enabled(scale));
+    let _ = controls.menu.zoom_in.set_enabled(zoom_in_enabled(scale));
+    let _ = controls
+        .menu
+        .zoom_in_plus
+        .set_enabled(zoom_in_enabled(scale));
+    let _ = controls.menu.zoom_out.set_enabled(zoom_out_enabled(scale));
     if persist {
         if let Err(error) = write_zoom(&controls.path, scale) {
             eprintln!("[zoom] failed to write window-state.json: {error}");
@@ -367,13 +400,27 @@ mod tests {
     #[test]
     fn menu_labels_follow_the_page_locale() {
         let chinese = zoom_menu_labels("zh-CN");
+        assert_eq!(chinese.file, "文件");
+        assert_eq!(chinese.new_chat, "新建对话");
+        assert_eq!(chinese.quit, "退出");
+        assert_eq!(chinese.edit, "编辑");
+        assert_eq!(chinese.paste, "粘贴");
+        assert_eq!(chinese.view, "视图");
         assert_eq!(chinese.zoom_in, "放大");
         assert_eq!(chinese.zoom_out, "缩小");
         assert_eq!(chinese.zoom_reset, "实际大小");
+        assert_eq!(chinese.open_terminal, "打开终端");
         let english = zoom_menu_labels("en");
+        assert_eq!(english.file, "File");
+        assert_eq!(english.new_chat, "New chat");
+        assert_eq!(english.quit, "Quit");
+        assert_eq!(english.edit, "Edit");
+        assert_eq!(english.paste, "Paste");
+        assert_eq!(english.view, "View");
         assert_eq!(english.zoom_in, "Zoom in");
         assert_eq!(english.zoom_out, "Zoom out");
         assert_eq!(english.zoom_reset, "Actual size");
+        assert_eq!(english.open_terminal, "Open terminal");
         assert_eq!(zoom_menu_labels("").zoom_in, "Zoom in");
     }