A modern terminal with a built-in multiplexer: close it and your sessions keep running. Run shells and tons of AI agents across your machines, then pick them up from desktop, browser, TUI and more. Written in Rust with no UI framework: interface drawn straight on the GPU. No Electron, GPUI or webview.
Rust agentagent-orchestrationaiai-agentsclaude-codecodexcoding-agentlinuxmacosmultiplayermultiplexerrustterminalterminal-emulatorterminal-multiplexertmuxtuiweztermwindows
wezterm-gui: grant a Project folder from its menu, and name the server when it is refused
RoversX59ae81d50abe
diff --git a/config/src/keyassignment.rs b/config/src/keyassignment.rsindex 1f8e8ab8..461872e3 100644--- a/config/src/keyassignment.rs+++ b/config/src/keyassignment.rs@@ -523,6 +523,7 @@ pub enum KeyAssignment {PromptRenamePaneTab(usize),PromptRenameProject(String),RevealProjectInFolder(String),+ GrantProjectFolderAccess(String),OpenFileWith {path: String,app: String,diff --git a/wezterm-gui/i18n/en-US.ftl b/wezterm-gui/i18n/en-US.ftlindex 2ecae8ac..54abe370 100644--- a/wezterm-gui/i18n/en-US.ftl+++ b/wezterm-gui/i18n/en-US.ftl@@ -218,6 +218,7 @@ tooltip-sidebar-ssh-hosts = Remote Hoststooltip-sidebar-live-overview = Live Overviewtooltip-sidebar-notifications = Notificationsmenu-rename-project = Rename Project…+menu-grant-folder-access = Grant Folder Access…menu-new-thread = New Threadmenu-toggle-threads = Collapse / Expand Threadsmenu-remove-project = Remove Project@@ -346,6 +347,8 @@ project-root-reauthorize-prompt = Grant Accessproject-root-recovered = ThinkTerm can open this folder againproject-root-recovered-note = ThinkTerm can read this folder again.project-root-open-terminal = Open Project Terminal+project-root-open-settings = Open System Settings+project-root-server-refused = The refusal came from ThinkTerm's session server (thinkterm-mux-server), which asks for access under its own name: allow it when macOS asks, or switch it on under Files and Folders in System Settings.project-root-other-folder = That is a different folder. The Project still points at the one above, and its access has not changed.right-notes-note-unreadable = This note can't be openedright-choose-existing-vault = Choose Existing Vault…diff --git a/wezterm-gui/i18n/fr-FR.ftl b/wezterm-gui/i18n/fr-FR.ftlindex 095c7181..d810b4d0 100644--- a/wezterm-gui/i18n/fr-FR.ftl+++ b/wezterm-gui/i18n/fr-FR.ftl@@ -218,6 +218,7 @@ tooltip-sidebar-ssh-hosts = Hôtes distantstooltip-sidebar-live-overview = Aperçu en directtooltip-sidebar-notifications = Notificationsmenu-rename-project = Renommer le projet…+menu-grant-folder-access = Autoriser l'accès au dossier…menu-new-thread = Nouvelle sessionmenu-toggle-threads = Réduire / développer les sessionsmenu-remove-project = Supprimer le projet@@ -346,6 +347,8 @@ project-root-reauthorize-prompt = Accorder l’accèsproject-root-recovered = ThinkTerm peut de nouveau ouvrir ce dossierproject-root-recovered-note = ThinkTerm peut de nouveau lire ce dossier.project-root-open-terminal = Ouvrir le terminal du projet+project-root-open-settings = Ouvrir Réglages Système+project-root-server-refused = Le refus vient du serveur de sessions de ThinkTerm (thinkterm-mux-server), qui demande l'accès en son propre nom : autorisez-le quand macOS le demande, ou activez-le dans Réglages Système › Fichiers et dossiers.project-root-other-folder = Il s’agit d’un autre dossier. Le projet pointe toujours vers celui ci-dessus et son accès n’a pas changé.right-notes-note-unreadable = Cette note ne peut pas être ouverteright-choose-existing-vault = Choisir un coffre existant…diff --git a/wezterm-gui/i18n/ja-JP.ftl b/wezterm-gui/i18n/ja-JP.ftlindex 4a37a09f..e74eaa75 100644--- a/wezterm-gui/i18n/ja-JP.ftl+++ b/wezterm-gui/i18n/ja-JP.ftl@@ -215,6 +215,7 @@ tooltip-sidebar-ssh-hosts = リモートホストtooltip-sidebar-live-overview = ライブ概要tooltip-sidebar-notifications = 通知menu-rename-project = プロジェクト名を変更…+menu-grant-folder-access = フォルダへのアクセスを許可…menu-new-thread = 新しいセッションmenu-toggle-threads = セッションを折りたたむ/展開menu-remove-project = プロジェクトを削除@@ -337,6 +338,8 @@ project-root-reauthorize-prompt = アクセスを許可project-root-recovered = ThinkTerm はこのフォルダを再び開けますproject-root-recovered-note = ThinkTerm はこのフォルダを再び読み取れます。project-root-open-terminal = プロジェクトのターミナルを開く+project-root-open-settings = システム設定を開く+project-root-server-refused = 拒否されたのは ThinkTerm のセッションサーバ(thinkterm-mux-server)です。自身の名前でアクセスを求めるため、macOS が確認したら許可するか、システム設定の「ファイルとフォルダ」で有効にしてください。project-root-other-folder = それは別のフォルダです。プロジェクトは上記のフォルダを指したままで、そのアクセス権は変わっていません。right-notes-note-unreadable = このノートは開けませんright-choose-existing-vault = 既存の保管庫を選択…diff --git a/wezterm-gui/i18n/zh-CN.ftl b/wezterm-gui/i18n/zh-CN.ftlindex 59989329..9a8fe09a 100644--- a/wezterm-gui/i18n/zh-CN.ftl+++ b/wezterm-gui/i18n/zh-CN.ftl@@ -215,6 +215,7 @@ tooltip-sidebar-ssh-hosts = 远程主机tooltip-sidebar-live-overview = 实时总览tooltip-sidebar-notifications = 通知menu-rename-project = 重命名项目…+menu-grant-folder-access = 授权文件夹访问…menu-new-thread = 新建会话menu-toggle-threads = 折叠 / 展开会话menu-remove-project = 移除项目@@ -337,6 +338,8 @@ project-root-reauthorize-prompt = 授予访问project-root-recovered = ThinkTerm 现在可以打开这个文件夹了project-root-recovered-note = ThinkTerm 现在可以读取这个文件夹了。project-root-open-terminal = 打开项目终端+project-root-open-settings = 打开系统设置+project-root-server-refused = 被拒绝的是 ThinkTerm 的会话服务(thinkterm-mux-server),它以自己的名义申请权限:在 macOS 询问时点允许,或在系统设置的"文件和文件夹"中为它打开开关。project-root-other-folder = 那是另一个文件夹。Project 仍然指向上面这个,它的访问权限没有变化。right-notes-note-unreadable = 这篇笔记无法打开right-choose-existing-vault = 选择现有库…diff --git a/wezterm-gui/src/commands.rs b/wezterm-gui/src/commands.rsindex b3a6bfab..50dbd2d5 100644--- a/wezterm-gui/src/commands.rs+++ b/wezterm-gui/src/commands.rs@@ -902,6 +902,14 @@ pub fn derive_command_from_key_assignment(action: &KeyAssignment) -> Option<Commmenubar: &[],icon: Some("md_folder_open"),},+ GrantProjectFolderAccess(_) => CommandDef {+ brief: "Grant Folder Access".into(),+ doc: "Asks macOS to grant ThinkTerm access to the Project folder, then opens the Project".into(),+ keys: vec![],+ args: &[ArgType::ActiveWindow],+ menubar: &[],+ icon: Some("md_folder_open"),+ },OpenFileWith { .. } => CommandDef {brief: "Open File With Application".into(),doc: "Opens a file with a selected application".into(),diff --git a/wezterm-gui/src/termwindow/mod.rs b/wezterm-gui/src/termwindow/mod.rsindex 765bf91f..d6455173 100644--- a/wezterm-gui/src/termwindow/mod.rs+++ b/wezterm-gui/src/termwindow/mod.rs@@ -8458,6 +8458,9 @@ impl TermWindow {PromptRenamePaneTab(pane_id) => self.prompt_rename_pane_tab(*pane_id),PromptRenameProject(project_id) => self.prompt_rename_project(project_id.clone()),RevealProjectInFolder(project_id) => self.reveal_project_in_folder(project_id),+ GrantProjectFolderAccess(project_id) => {+ self.grant_project_folder_access(project_id.clone())+ }OpenFileWith { path, app, label } => {let selected_app = crate::native_settings::NativeOpenWithApp {id: app.clone(),diff --git a/wezterm-gui/src/termwindow/mouseevent.rs b/wezterm-gui/src/termwindow/mouseevent.rsindex 831c55b5..b271885a 100644--- a/wezterm-gui/src/termwindow/mouseevent.rs+++ b/wezterm-gui/src/termwindow/mouseevent.rs@@ -5337,8 +5337,17 @@ impl super::TermWindow {if crate::workspace_threads::project_reveal_path(&project_id).is_none() {reveal_item = reveal_item.disabled();}+ // macOS only: the picker it runs is what grants access there.+ let mut grant_item = ContextMenuItem::item_with_icon(+ crate::i18n::tr("menu-grant-folder-access"),+ ContextMenuIcon::Folder,+ KeyAssignment::GrantProjectFolderAccess(project_id.clone()),+ );+ if crate::workspace_threads::local_project_path(&project_id).is_none() {+ grant_item = grant_item.disabled();+ }- vec![+ let mut items = vec![ContextMenuItem::item_with_icon(crate::i18n::tr("menu-rename-project"),ContextMenuIcon::Edit,@@ -5405,7 +5414,11 @@ impl super::TermWindow {ContextMenuIcon::FolderRemove,KeyAssignment::RemoveProject(project_id),),- ]+ ];+ if cfg!(target_os = "macos") {+ items.insert(2, grant_item);+ }+ items}/// The menu for a revealed archived row: restore it, or delete it fordiff --git a/wezterm-gui/src/termwindow/project_root_view.rs b/wezterm-gui/src/termwindow/project_root_view.rsindex f2494778..3e170537 100644--- a/wezterm-gui/src/termwindow/project_root_view.rs+++ b/wezterm-gui/src/termwindow/project_root_view.rs@@ -35,6 +35,9 @@ pub(crate) const PROJECT_ROOT_CONTENT_VIEW_KEY_PREFIX: &str = "project-root:";enum ProjectRootAction {Reauthorize,OpenThread,+ /// The session server, not the GUI, was refused: a picker cannot grant+ /// for it, so send the user to the switch macOS keeps for it.+ OpenSystemSettings,}/// Deliberately only two states: everything beyond these existed to drive an@@ -111,6 +114,10 @@ impl ProjectRootView {body.push(' ');body.push_str(&hint);}+ if failure.via_session_server {+ body.push(' ');+ body.push_str(&crate::i18n::tr("project-root-server-refused"));+ }Some(body)}ViewPhase::Granted => Some(crate::i18n::tr("project-root-recovered-note")),@@ -133,12 +140,23 @@ impl ProjectRootView {return Vec::new();}match &self.phase {- ViewPhase::Blocked(failure) if failure.problem.can_reauthorize() => vec![(- crate::i18n::tr("project-root-reauthorize"),- SvgIcon::FolderOpen,- ProjectRootAction::Reauthorize,- true,- )],+ ViewPhase::Blocked(failure) if failure.problem.can_reauthorize() => {+ let mut buttons = vec![(+ crate::i18n::tr("project-root-reauthorize"),+ SvgIcon::FolderOpen,+ ProjectRootAction::Reauthorize,+ true,+ )];+ if failure.via_session_server {+ buttons.push((+ crate::i18n::tr("project-root-open-settings"),+ SvgIcon::Settings,+ ProjectRootAction::OpenSystemSettings,+ false,+ ));+ }+ buttons+ }ViewPhase::Blocked(_) => Vec::new(),// Delegates to the exact activation a sidebar click triggers;// its predecessor's bugs all came from re-implementing that.@@ -593,6 +611,10 @@ impl ProjectRootView {reauthorize_response(self.root.clone())}ProjectRootAction::OpenThread => open_thread_response(self.thread_id.clone()),+ ProjectRootAction::OpenSystemSettings => {+ open_files_and_folders_settings();+ ContentViewResponse::Redraw+ }}}}@@ -827,6 +849,7 @@ impl TermWindow {path: root,problem: FolderProblem::Other,detail: "window is no longer available".to_string(),+ via_session_server: false,}),);return;@@ -849,6 +872,7 @@ impl TermWindow {path: PathBuf::new(),problem: FolderProblem::Other,detail: format!("{err:#}"),+ via_session_server: false,})});notify.notify(TermWindowNotif::Apply(Box::new(move |term_window| {@@ -874,6 +898,85 @@ impl TermWindow {}}+impl TermWindow {+ /// The Project menu's "Grant Folder Access…": the same picker the blocked+ /// page offers, without needing that page first. A grant is followed by+ /// opening the Project's first Thread, so the spawn (through the session+ /// server when local sessions use it) proves the access end to end.+ pub(crate) fn grant_project_folder_access(&mut self, project_id: String) {+ let Some(root) = crate::workspace_threads::local_project_path(&project_id) else {+ return;+ };+ let Some(window) = self.window.as_ref().cloned() else {+ return;+ };+ let notify = window.clone();+ window.pick_folder_async_with_options(+ window::FolderPickerOptions {+ title: crate::i18n::tr("project-root-reauthorize-title"),+ prompt: crate::i18n::tr("project-root-reauthorize-prompt"),+ directory: Some(root.clone()),+ },+ Box::new(move |chosen| {+ promise::spawn::spawn(async move {+ let outcome = promise::spawn::spawn_into_new_thread(move || {+ Ok(reauthorize_outcome(root, chosen))+ })+ .await+ .unwrap_or_else(|err| {+ ProjectRootProbe::Blocked(ProjectRootUnavailable {+ path: PathBuf::new(),+ problem: FolderProblem::Other,+ detail: format!("{err:#}"),+ via_session_server: false,+ })+ });+ notify.notify(TermWindowNotif::Apply(Box::new(move |term_window| {+ term_window.deliver_project_folder_grant(project_id, outcome);+ })));+ })+ .detach();+ }),+ );+ }++ fn deliver_project_folder_grant(&mut self, project_id: String, outcome: ProjectRootProbe) {+ let thread_id = crate::workspace_threads::ordered_thread_ids(&project_id)+ .into_iter()+ .next()+ .or_else(|| crate::workspace_threads::create_thread(&project_id, None).ok());+ let Some(thread_id) = thread_id else {+ self.invalidate_window();+ return;+ };+ match outcome {+ ProjectRootProbe::Available => {+ if let Some(window) = self.window.as_ref().cloned() {+ self.activate_workspace_thread(thread_id, &window);+ }+ }+ ProjectRootProbe::Blocked(failure) => {+ let display_name =+ crate::workspace_threads::thread_display_name(&project_id, &thread_id);+ let space_id = self.active_space_id.clone();+ self.show_project_root_problem(thread_id, space_id, display_name, failure);+ }+ ProjectRootProbe::OtherFolderChosen => {+ log::info!("grant folder access: a different folder was chosen; nothing granted");+ }+ }+ self.invalidate_window();+ }+}++/// The pane where macOS keeps per-app folder grants; the session server is+/// listed there under its own name once it has asked.+fn open_files_and_folders_settings() {+ wezterm_open_url::open_url(+ "x-apple.systempreferences:com.apple.preference.security?Privacy_FilesAndFolders",+ );+}+/// Decide what a finished picker means, on a worker thread.////// Cancelling re-states the refusal rather than inventing a verdict: nothing@@ -938,6 +1041,7 @@ mod tests {path: PathBuf::from(path),problem: FolderProblem::UnreadableRoot,detail: "denied".to_string(),+ via_session_server: false,}}@@ -978,6 +1082,7 @@ mod tests {path: PathBuf::from("/project"),problem: FolderProblem::MissingRoot,detail: "gone".to_string(),+ via_session_server: false,}));assert!(matches!(&view.phase, ViewPhase::Blocked(failure)if failure.problem == FolderProblem::MissingRoot));diff --git a/wezterm-gui/src/termwindow/ui/folder_problem.rs b/wezterm-gui/src/termwindow/ui/folder_problem.rsindex 516e29bb..ca6d71e0 100644--- a/wezterm-gui/src/termwindow/ui/folder_problem.rs+++ b/wezterm-gui/src/termwindow/ui/folder_problem.rs@@ -96,6 +96,9 @@ pub(crate) struct ProjectRootUnavailable {/// The raw OS refusal, kept for the detail line. It names the path and the/// errno, which is what makes a bug report actionable.pub(crate) detail: String,+ /// The session server was refused, not this process. A picker grant+ /// covers only the GUI; the server needs its own grant.+ pub(crate) via_session_server: bool,}impl std::fmt::Display for ProjectRootUnavailable {@@ -118,6 +121,7 @@ impl ProjectRootUnavailable {path: path.into(),problem: FolderProblem::from_read_dir_kind(err.kind()),detail: format!("{err}"),+ via_session_server: false,}}@@ -128,19 +132,20 @@ impl ProjectRootUnavailable {if let Some(failure) = err.downcast_ref::<Self>() {return Some(failure.clone());}- let from_refusal = |refused: mux::domain::RequiredCwdUnavailable| Self {+ let from_refusal = |refused: mux::domain::RequiredCwdUnavailable, via_session_server| Self {path: refused.dir,problem: FolderProblem::from_read_dir_kind(refused.kind),detail: refused.detail,+ via_session_server,};if let Some(refused) = err.downcast_ref::<mux::domain::RequiredCwdUnavailable>() {- return Some(from_refusal(refused.clone()));+ return Some(from_refusal(refused.clone(), false));}// A mux server (the local session host included) reports its refusal// as one string; the type is recovered from the message.err.chain().find_map(|layer| mux::domain::RequiredCwdUnavailable::from_message(&layer.to_string()))- .map(from_refusal)+ .map(|refused| from_refusal(refused, true))}}diff --git a/wezterm-gui/src/workspace_threads.rs b/wezterm-gui/src/workspace_threads.rsindex 34d8801e..dab6f7ac 100644--- a/wezterm-gui/src/workspace_threads.rs+++ b/wezterm-gui/src/workspace_threads.rs@@ -3353,6 +3353,13 @@ pub fn project_reveal_path(project_id: &str) -> Option<PathBuf> {store.project_reveal_path(project_id)}+/// A local Project's folder as recorded, whether or not it can be listed+/// right now (a refused folder is exactly the one to grant access to).+pub fn local_project_path(project_id: &str) -> Option<PathBuf> {+ let store = THREAD_STORE.lock();+ store.local_project_path(project_id)+}+#[derive(Clone, Debug, PartialEq, Eq)]pub enum RemoteFilesSource {SshHost(String),@@ -5649,6 +5656,17 @@ impl WorkspaceThreadStore {Some(project.path.clone())}+ fn local_project_path(&self, project_id: &str) -> Option<PathBuf> {+ let project = self+ .projects+ .iter()+ .find(|project| project.id == project_id)?;+ if is_remote_project(project, &self.spaces) {+ return None;+ }+ Some(project.path.clone())+ }+fn sync_active_workspace(&mut self,space_id: &str,