feat(ui): add rename/edit for spaces, feature sets, and workspace bindings

Expose update_space and editable panels for Spaces and Feature Sets.
Add optional workspace binding labels with migration 016 so folders
can have friendly display names separate from their paths.

Signed-off-by: crimsonsunset <jsangio1@gmail.com>

Author: crimsonsunset

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

@@ -263,10 +263,6 @@ pub async fn update_feature_set(
         .map_err(|e| e.to_string())?
         .ok_or("Feature set not found")?;
 
-    if feature_set.is_builtin {
-        return Err("Cannot modify builtin feature set".to_string());
-    }
-
     if let Some(name) = input.name {
         feature_set.name = name;
     }

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

@@ -7,6 +7,7 @@
 //! viewing in its own Zustand store (frontend-only state).
 
 use mcpmux_core::Space;
+use serde::Deserialize;
 use std::sync::Arc;
 use tauri::{AppHandle, State};
 use tokio::sync::RwLock;
@@ -103,6 +104,59 @@ pub async fn create_space(
     Ok(space)
 }
 
+/// Partial update payload for a Space (name, icon, description).
+#[derive(Debug, Deserialize)]
+pub struct UpdateSpaceInput {
+    pub name: Option<String>,
+    pub icon: Option<String>,
+    pub description: Option<String>,
+}
+
+/// Update a space's display metadata.
+#[tauri::command]
+pub async fn update_space(
+    id: String,
+    input: UpdateSpaceInput,
+    app: AppHandle,
+    state: State<'_, AppState>,
+    gateway_state: State<'_, Arc<RwLock<GatewayAppState>>>,
+) -> Result<Space, String> {
+    let uuid = Uuid::parse_str(&id).map_err(|e| e.to_string())?;
+
+    let name = input
+        .name
+        .map(|n| n.trim().to_string())
+        .filter(|n| !n.is_empty());
+    let icon = input
+        .icon
+        .map(|i| i.trim().to_string())
+        .filter(|i| !i.is_empty());
+    let description = input.description.map(|d| d.trim().to_string());
+
+    let space = state
+        .space_service
+        .update(uuid, name, icon, description)
+        .await
+        .map_err(|e| e.to_string())?;
+
+    let gw_state = gateway_state.read().await;
+    if let Some(ref gw) = gw_state.gateway_state {
+        let gw = gw.read().await;
+        gw.emit_domain_event(mcpmux_core::DomainEvent::SpaceUpdated {
+            space_id: space.id,
+            name: space.name.clone(),
+        });
+    }
+
+    if let Err(e) = tray::update_tray_spaces(&app, &state).await {
+        warn!("Failed to update tray menu: {}", e);
+    }
+
+    info!("[update_space] Space '{}' updated successfully", space.name);
+
+    Ok(space)
+}
+
 /// Delete a space.
 #[tauri::command]
 pub async fn delete_space(

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

@@ -54,6 +54,7 @@ async fn emit_binding_changed(
 pub struct WorkspaceBindingDto {
     pub id: String,
     pub workspace_root: String,
+    pub label: Option<String>,
     pub space_id: String,
     pub feature_set_ids: Vec<String>,
     pub created_at: String,
@@ -65,6 +66,7 @@ impl From<WorkspaceBinding> for WorkspaceBindingDto {
         Self {
             id: b.id.to_string(),
             workspace_root: b.workspace_root,
+            label: b.label,
             space_id: b.space_id.to_string(),
             feature_set_ids: b.feature_set_ids,
             created_at: b.created_at.to_rfc3339(),
@@ -80,10 +82,18 @@ impl From<WorkspaceBinding> for WorkspaceBindingDto {
 #[derive(Debug, Deserialize)]
 pub struct WorkspaceBindingInput {
     pub workspace_root: String,
+    pub label: Option<String>,
     pub space_id: String,
     pub feature_set_ids: Vec<String>,
 }
 
+fn normalize_label(label: &Option<String>) -> Option<String> {
+    label
+        .as_ref()
+        .map(|s| s.trim().to_string())
+        .filter(|s| !s.is_empty())
+}
+
 fn parse_space_id(input: &WorkspaceBindingInput) -> Result<Uuid, String> {
     Uuid::parse_str(&input.space_id).map_err(|e| format!("bad space_id: {e}"))
 }
@@ -194,7 +204,8 @@ pub async fn create_workspace_binding(
     let feature_set_ids = validate_fs_list(&input)?;
     let normalized = normalize_and_validate(&input.workspace_root)?;
 
-    let binding = WorkspaceBinding::new_multi(normalized.clone(), space_id, feature_set_ids);
+    let mut binding = WorkspaceBinding::new_multi(normalized.clone(), space_id, feature_set_ids);
+    binding.label = normalize_label(&input.label);
 
     state
         .workspace_binding_repository
@@ -241,9 +252,16 @@ pub async fn update_workspace_binding(
         .ok_or_else(|| format!("binding not found: {}", id))?;
     let old_space_id = existing.space_id;
 
+    let label = if input.label.is_some() {
+        normalize_label(&input.label)
+    } else {
+        existing.label
+    };
+
     let updated = WorkspaceBinding {
         id: existing.id,
         workspace_root: normalized,
+        label,
         space_id,
         feature_set_ids,
         created_at: existing.created_at,

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

@@ -848,6 +848,7 @@ pub fn run() {
             commands::list_spaces,
             commands::get_space,
             commands::create_space,
+            commands::update_space,
             commands::delete_space,
             commands::open_space_config_file,
             commands::read_space_config,

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

@@ -21,7 +21,11 @@ import {
 } from 'lucide-react';
 import { Button, useToast, ToastContainer, useConfirm } from '@mcpmux/ui';
 import type { FeatureSet, AddMemberInput } from '@/lib/api/featureSets';
-import { isStarterFeatureSet, setFeatureSetMembers } from '@/lib/api/featureSets';
+import {
+  isStarterFeatureSet,
+  setFeatureSetMembers,
+  updateFeatureSet,
+} from '@/lib/api/featureSets';
 import type { ServerFeature } from '@/lib/api/serverFeatures';
 import { listServerFeatures } from '@/lib/api/serverFeatures';
 
@@ -45,6 +49,11 @@ export function FeatureSetPanel({ featureSet, spaceId, onClose, onDelete, onUpda
   const [searchQuery, setSearchQuery] = useState('');
   const [isLoading, setIsLoading] = useState(true);
   const [isSaving, setIsSaving] = useState(false);
+  const [isSavingGeneral, setIsSavingGeneral] = useState(false);
+  const [displayName, setDisplayName] = useState(featureSet.name);
+  const [editName, setEditName] = useState(featureSet.name);
+  const [editDescription, setEditDescription] = useState(featureSet.description ?? '');
+  const [editIcon, setEditIcon] = useState(featureSet.icon ?? '');
   const [error, setError] = useState<string | null>(null);
   const [expandedServers, setExpandedServers] = useState<Set<string>>(new Set());
   const { toasts, success, error: showError, dismiss } = useToast();
@@ -68,6 +77,13 @@ export function FeatureSetPanel({ featureSet, spaceId, onClose, onDelete, onUpda
   const isFeatureSelected = (featureId: string, _feature: ServerFeature) =>
     selectedFeatureIds.has(featureId);
 
+  useEffect(() => {
+    setDisplayName(featureSet.name);
+    setEditName(featureSet.name);
+    setEditDescription(featureSet.description ?? '');
+    setEditIcon(featureSet.icon ?? '');
+  }, [featureSet]);
+
   useEffect(() => {
     const loadFeatures = async () => {
       setIsLoading(true);
@@ -167,6 +183,44 @@ export function FeatureSetPanel({ featureSet, spaceId, onClose, onDelete, onUpda
     });
   };
 
+  /**
+   * Save name, description, and icon from the General Information section.
+   */
+  const handleSaveGeneral = async () => {
+    const trimmedName = editName.trim();
+    if (!trimmedName) {
+      setError('Name is required.');
+      return;
+    }
+
+    setIsSavingGeneral(true);
+    setError(null);
+    try {
+      const updated = await updateFeatureSet(featureSet.id, {
+        name: trimmedName,
+        description: editDescription.trim() || undefined,
+        icon: editIcon.trim() || undefined,
+      });
+      setDisplayName(updated.name);
+      setEditName(updated.name);
+      setEditDescription(updated.description ?? '');
+      setEditIcon(updated.icon ?? '');
+      success('Feature set updated', `"${updated.name}" has been saved`);
+      onUpdate?.();
+    } catch (e) {
+      const errorMsg = e instanceof Error ? e.message : String(e);
+      setError(errorMsg);
+      showError('Failed to save feature set', errorMsg);
+    } finally {
+      setIsSavingGeneral(false);
+    }
+  };
+
+  const hasGeneralChanges =
+    editName.trim() !== featureSet.name ||
+    editDescription.trim() !== (featureSet.description ?? '') ||
+    editIcon.trim() !== (featureSet.icon ?? '');
+
   const handleSave = async () => {
     setIsSaving(true);
     setError(null);
@@ -251,7 +305,7 @@ export function FeatureSetPanel({ featureSet, spaceId, onClose, onDelete, onUpda
             </div>
             <div className="flex-1 min-w-0">
               <h2 className="text-lg font-bold truncate flex items-center gap-2">
-                {featureSet.name}
+                {displayName}
               </h2>
               <div className="flex items-center gap-2 mt-0.5">
                 <span
@@ -327,13 +381,62 @@ export function FeatureSetPanel({ featureSet, spaceId, onClose, onDelete, onUpda
               <div className="p-4 space-y-4 border-t-2 border-[rgb(var(--border))] bg-white dark:bg-[rgb(var(--background))]">
                 <div>
                   <label className="block text-xs font-medium mb-1.5 text-[rgb(var(--muted))]">
-                    Description
+                    Name *
                   </label>
-                  <p className="text-sm">
-                    {featureSet.description || 'No description provided.'}
-                  </p>
+                  <input
+                    type="text"
+                    value={editName}
+                    onChange={(e) => setEditName(e.target.value)}
+                    className="w-full px-3 py-2 text-sm rounded-lg border border-[rgb(var(--border))] bg-[rgb(var(--background))] focus:outline-none focus:ring-2 focus:ring-primary-500"
+                    data-testid="featureset-panel-name"
+                  />
                 </div>
+
 
+                <div>
+                  <label className="block text-xs font-medium mb-1.5 text-[rgb(var(--muted))]">
+                    Description
+                  </label>
+                  <input
+                    type="text"
+                    value={editDescription}
+                    onChange={(e) => setEditDescription(e.target.value)}
+                    placeholder="What this feature set allows..."
+                    className="w-full px-3 py-2 text-sm rounded-lg border border-[rgb(var(--border))] bg-[rgb(var(--background))] focus:outline-none focus:ring-2 focus:ring-primary-500"
+                    data-testid="featureset-panel-description"
+                  />
+                </div>
+
+                <div>
+                  <label className="block text-xs font-medium mb-1.5 text-[rgb(var(--muted))]">
+                    Icon (emoji)
+                  </label>
+                  <input
+                    type="text"
+                    value={editIcon}
+                    onChange={(e) => setEditIcon(e.target.value)}
+                    placeholder="🔧"
+                    maxLength={2}
+                    className="w-full px-3 py-2 text-sm rounded-lg border border-[rgb(var(--border))] bg-[rgb(var(--background))] focus:outline-none focus:ring-2 focus:ring-primary-500"
+                    data-testid="featureset-panel-icon"
+                  />
+                </div>
+
+                <Button
+                  variant="primary"
+                  size="sm"
+                  onClick={() => void handleSaveGeneral()}
+                  disabled={isSavingGeneral || !editName.trim() || !hasGeneralChanges}
+                  data-testid="featureset-panel-save-general"
+                >
+                  {isSavingGeneral ? (
+                    <Loader2 className="h-4 w-4 animate-spin mr-2" />
+                  ) : (
+                    <Save className="h-4 w-4 mr-2" />
+                  )}
+                  Save
+                </Button>
+
                 {isStarter && (
                   <div className="p-3 bg-yellow-50 dark:bg-yellow-900/10 border border-yellow-200 dark:border-yellow-800 rounded-lg">
                     <div className="flex gap-2">