Merge branch 'main' into fix/dependabot-security-overrides

Author: its-mash

apps/desktop/src-tauri/src/commands/settings.rs

@@ -203,6 +203,48 @@ pub async fn set_update_channel(
     Ok(normalized.to_string())
 }
 
+/// App-settings key for the "ask to map new folders" prompt switch.
+const WORKSPACE_MAPPING_PROMPT_KEY: &str = "workspaces.mapping_prompt_enabled";
+
+/// Interpret a stored value for the workspace mapping-prompt toggle. Missing or
+/// any non-`"false"` value means **enabled** — the prompt is on by default, so
+/// only an explicit opt-out turns it off.
+fn mapping_prompt_enabled_from(stored: Option<&str>) -> bool {
+    stored.map(|v| v != "false").unwrap_or(true)
+}
+
+/// Whether McpMux pops the "map this folder?" sheet when a connected client
+/// opens a folder that has no explicit binding (it's on the default Starter
+/// set). Default **true**. Users who find the prompt noisy can turn it off
+/// here or via the link in the sheet itself.
+#[tauri::command]
+pub async fn get_workspace_mapping_prompt_enabled(
+    app_state: State<'_, AppState>,
+) -> Result<bool, String> {
+    let stored = app_state
+        .settings_repository
+        .get(WORKSPACE_MAPPING_PROMPT_KEY)
+        .await
+        .map_err(|e| e.to_string())?;
+    Ok(mapping_prompt_enabled_from(stored.as_deref()))
+}
+
+/// Enable/disable the "map this folder?" prompt. Persisted; returns the value
+/// actually saved.
+#[tauri::command]
+pub async fn set_workspace_mapping_prompt_enabled(
+    enabled: bool,
+    app_state: State<'_, AppState>,
+) -> Result<bool, String> {
+    app_state
+        .settings_repository
+        .set(WORKSPACE_MAPPING_PROMPT_KEY, &enabled.to_string())
+        .await
+        .map_err(|e| e.to_string())?;
+    info!("[Settings] Workspace mapping prompt set to {}", enabled);
+    Ok(enabled)
+}
+
 /// Check if app should start hidden (for auto-launch with --hidden flag)
 pub fn should_start_hidden() -> bool {
     let args: Vec<String> = std::env::args().collect();
@@ -332,4 +374,16 @@ mod tests {
             assert!(out == UPDATE_CHANNEL_STABLE || out == UPDATE_CHANNEL_PRERELEASE);
         }
     }
+
+    #[test]
+    fn test_mapping_prompt_enabled_defaults_on() {
+        // Missing setting → on by default.
+        assert!(mapping_prompt_enabled_from(None));
+        // Only an explicit "false" disables it.
+        assert!(!mapping_prompt_enabled_from(Some("false")));
+        assert!(mapping_prompt_enabled_from(Some("true")));
+        // Any unexpected value is treated as enabled (fail-open to the default).
+        assert!(mapping_prompt_enabled_from(Some("")));
+        assert!(mapping_prompt_enabled_from(Some("garbage")));
+    }
 }

apps/desktop/src-tauri/src/commands/workspace_binding.rs

@@ -445,11 +445,11 @@ pub struct WorkspaceEffectiveFeaturesDto {
     /// trailing slash, etc.).
     pub workspace_root: String,
     /// `binding` when a `WorkspaceBinding` matched the longest prefix of
-    /// the root; `unbound` when no binding matched. With the new resolver,
-    /// `unbound` means a live roots-capable session for this folder would
-    /// be **denied** — the `feature_sets` field below shows the default
-    /// Space's Default FS purely as a *preview* of what binding the folder
-    /// to that FS would expose, not as the active routing target.
+    /// the root; `unbound` when no binding matched. An `unbound` folder is
+    /// **not** denied — it falls back to the default Space's Starter FS, so
+    /// the `feature_sets` field below is exactly what a live session for this
+    /// folder sees right now (the active routing target), until the user
+    /// attaches an explicit binding to override it.
     pub source: String,
     /// `Some(id)` only when `source == "binding"`.
     pub binding_id: Option<String>,
@@ -588,11 +588,11 @@ pub async fn get_workspace_effective_features(
             b.feature_set_ids,
         ),
         None => {
-            // Source = `unbound` mirrors the new resolver: a live session
-            // here would be denied. We still surface the default Space's
-            // Default FS as a *preview* so the UI can render "if you bound
-            // this folder to <FS>, here's what it would see" — it's
-            // informational, not the active routing target.
+            // Source = `unbound` mirrors the resolver: an unmapped folder
+            // falls back to the default Space's Starter FS. This is the
+            // active routing target a live session here resolves to, not a
+            // hypothetical preview — the user can attach a binding to give
+            // the folder something other than the default.
             let starter_fs = state
                 .feature_set_repository
                 .get_starter_for_space(&default_space.id.to_string())

apps/desktop/src-tauri/src/lib.rs

@@ -992,6 +992,8 @@ pub fn run() {
             commands::set_auto_install_updates,
             commands::get_update_channel,
             commands::set_update_channel,
+            commands::get_workspace_mapping_prompt_enabled,
+            commands::set_workspace_mapping_prompt_enabled,
         ])
         .build(tauri::generate_context!())
         .expect("error while building McpMux application")

apps/desktop/src/features/clients/ClientsPage.tsx

@@ -873,9 +873,9 @@ function RootlessGrantsSection({
         <div className="mt-3 flex items-start gap-2 rounded-lg border border-[rgb(var(--border-subtle))] bg-[rgb(var(--surface))] p-2.5">
           <ShieldOff className="mt-0.5 h-4 w-4 flex-shrink-0 text-[rgb(var(--muted))]" />
           <p className="text-[11px] text-[rgb(var(--muted))]">
-            No defaults set — rootless sessions from this client are denied. That&apos;s the safe
-            default. Pick a FeatureSet above only if you trust this client to operate without a
-            workspace folder.
+            No per-client defaults set — rootless sessions from this client fall back to your
+            default Starter set. Pick a FeatureSet above to grant this client a specific set
+            instead.
           </p>
         </div>
       )}

apps/desktop/src/features/featuresets/FeatureSetPanel.tsx

@@ -58,8 +58,11 @@ export function FeatureSetPanel({ featureSet, spaceId, onClose, onDelete, onUpda
 
   // Both FS types are member-driven now.
   const isConfigurable = true;
-  // The auto-seeded "Starter" FS is treated identically to a Custom one
-  // — the type tag is a UI hint, not a routing flag.
+  // The auto-seeded "Starter" FS has editable membership like a Custom one
+  // (change which tools it includes, or empty it). What's locked is its
+  // identity + lifecycle: it's the default fallback for unmapped folders, so
+  // its name is fixed (the backend ignores name changes on builtin rows) and
+  // it can't be deleted — the Delete action below is gated to Custom sets.
   const isStarter = isStarterFeatureSet(featureSet);
   const isCustom = featureSet.feature_set_type === 'custom';
 
@@ -257,7 +260,7 @@ export function FeatureSetPanel({ featureSet, spaceId, onClose, onDelete, onUpda
                 <span
                   title={
                     isStarter
-                      ? 'Auto-created with this Space. Edit, rename, or delete freely — no special routing role.'
+                      ? "Auto-created with this Space. The default set for folders you haven't mapped — edit which tools it includes; its name is fixed and it can't be deleted."
                       : undefined
                   }
                   className={`text-[10px] px-1.5 py-0.5 rounded-full font-medium border ${
@@ -339,7 +342,7 @@ export function FeatureSetPanel({ featureSet, spaceId, onClose, onDelete, onUpda
                     <div className="flex gap-2">
                       <Star className="h-4 w-4 text-yellow-500 flex-shrink-0 mt-0.5" />
                       <div className="text-xs text-yellow-800 dark:text-yellow-200">
-                        <strong>Starter FeatureSet:</strong> auto-created with this Space. It&apos;s an ordinary FeatureSet — edit, rename, or delete it freely. <em>No special routing role:</em> Workspace bindings and per-client grants pick FeatureSets explicitly.
+                        <strong>Starter FeatureSet:</strong> auto-created with this Space and used as the <em>default</em> for folders you haven&apos;t explicitly mapped (and rootless sessions). Edit which tools it includes (or empty it) to change what they get. Its name is fixed and it <strong>can&apos;t be deleted</strong>, since the fallback always needs a stable target.
                       </div>
                     </div>
                   </div>

apps/desktop/src/features/featuresets/FeatureSetsPage.tsx

@@ -199,9 +199,9 @@ export function FeatureSetsPage() {
     })
     .sort((a, b) => {
       // Starter FS first (pinned to top — operator usually wants the
-      // auto-seeded one near the top so they can edit / delete it
-      // first), then Custom sets alphabetically. The 'default' key is
-      // kept so a stale row read pre-migration still sorts correctly.
+      // auto-seeded default set near the top so they can edit it first),
+      // then Custom sets alphabetically. The 'default' key is kept so a
+      // stale row read pre-migration still sorts correctly.
       const order: Record<string, number> = {
         starter: 0,
         default: 0,
@@ -375,7 +375,7 @@ export function FeatureSetsPage() {
                       {isStarter && (
                         <div
                           className="absolute right-3 top-3 flex items-center gap-1.5 rounded-full bg-gradient-to-r from-emerald-500 to-green-500 px-2.5 py-1 text-[10px] font-bold uppercase tracking-wider text-white shadow-[0_4px_12px_-2px_rgb(16_185_129/0.5)]"
-                          title="Auto-seeded with this Space. Edit, rename, or delete freely — no special routing role; bindings and per-client grants pick FeatureSets explicitly."
+                          title="Auto-seeded with this Space. The default set for folders you haven't mapped — edit which tools it includes to change what they get. Its name is fixed and it can't be deleted."
                           data-testid={`featureset-starter-badge-${fs.id}`}
                         >
                           <CheckCircle2 className="h-3 w-3" />

apps/desktop/src/features/settings/SettingsPage.tsx

@@ -72,6 +72,11 @@ export function SettingsPage() {
   const [logRetentionDays, setLogRetentionDays] = useState<number>(30);
   const [savingRetention, setSavingRetention] = useState(false);
 
+  // Workspace mapping prompt — pops the "map this folder?" sheet when a client
+  // opens an unmapped folder. On by default.
+  const [mappingPromptEnabled, setMappingPromptEnabled] = useState(true);
+  const [savingMappingPrompt, setSavingMappingPrompt] = useState(false);
+
   // Meta-tools master switch — gates the entire `mcpmux_*` namespace.
 
   // Gateway port — persisted user override, the default the app ships
@@ -212,6 +217,34 @@ export function SettingsPage() {
     loadStartupSettings();
   }, []);
 
+  // Load workspace mapping-prompt setting on mount.
+  useEffect(() => {
+    invoke<boolean>('get_workspace_mapping_prompt_enabled')
+      .then(setMappingPromptEnabled)
+      .catch((err) => console.error('Failed to load mapping prompt setting:', err));
+  }, []);
+
+  const updateMappingPrompt = async (enabled: boolean) => {
+    const prev = mappingPromptEnabled;
+    setMappingPromptEnabled(enabled);
+    setSavingMappingPrompt(true);
+    try {
+      await invoke('set_workspace_mapping_prompt_enabled', { enabled });
+      success(
+        'Settings saved',
+        enabled
+          ? "You'll be asked to map new folders."
+          : 'New-folder prompts are off — unmapped folders still use your default Starter set.'
+      );
+    } catch (err) {
+      const msg = err instanceof Error ? err.message : 'Unknown error';
+      error('Failed to save setting', msg);
+      setMappingPromptEnabled(prev);
+    } finally {
+      setSavingMappingPrompt(false);
+    }
+  };
+
   // Save startup settings when they change
   const updateStartupSetting = async (key: keyof StartupSettings, value: boolean) => {
     console.log(`[Settings] Updating ${key} to ${value}`);
@@ -524,6 +557,40 @@ export function SettingsPage() {
           </CardContent>
         </Card>
 
+        {/* Workspaces Section */}
+        <Card data-testid="settings-workspaces-section">
+          <CardHeader>
+            <CardTitle className="flex items-center gap-2">
+              <FolderOpen className="h-5 w-5" />
+              Workspaces
+            </CardTitle>
+            <CardDescription>
+              How McpMux handles folders your connected apps open.
+            </CardDescription>
+          </CardHeader>
+          <CardContent>
+            <div className="flex items-center justify-between gap-4">
+              <div className="flex min-w-0 flex-1 items-start gap-3">
+                <FolderOpen className="mt-0.5 h-5 w-5 flex-shrink-0 text-[rgb(var(--muted))]" />
+                <div>
+                  <label className="text-sm font-medium">Ask to map new folders</label>
+                  <p className="mt-1 text-xs text-[rgb(var(--muted))]">
+                    When a connected app opens a folder you haven't mapped, show a prompt to give
+                    it a specific feature set. The folder already works with your default Starter
+                    set either way.
+                  </p>
+                </div>
+              </div>
+              <Switch
+                checked={mappingPromptEnabled}
+                onCheckedChange={updateMappingPrompt}
+                disabled={savingMappingPrompt}
+                data-testid="workspace-mapping-prompt-switch"
+              />
+            </div>
+          </CardContent>
+        </Card>
+
         {/* Appearance Section */}
         <Card>
           <CardHeader>