feat(workspaces): workspace binding label/icon port (migration 032)

Land label/icon metadata on workspace bindings, appearance commands,
and Projects UI ahead of machine-binding work on feat branch.

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

Author: crimsonsunset

Cargo.lock

@@ -15,7 +15,7 @@ tauri-build = { version = "2", features = [] }
 serde_json.workspace = true
 
 [dependencies]
-tauri = { version = "2", features = ["tray-icon"] }
+tauri = { version = "2", features = ["protocol-asset", "tray-icon"] }
 tauri-plugin-opener = "2"
 tauri-plugin-single-instance = { version = "2", features = ["deep-link"] }
 tauri-plugin-deep-link = "2"

apps/desktop/src-tauri/Cargo.toml

@@ -96,11 +96,19 @@ pub(crate) async fn maybe_remove_orphaned_icon_file(
         .await
         .map_err(|e| e.to_string())?;
 
-    // ponytail: WorkspaceBinding.icon is added in Phase 7; only check appearances for now.
     if appearances.iter().any(|a| a.icon == icon_ref_owned) {
         return Ok(());
     }
 
+    let bindings = state
+        .workspace_binding_repository
+        .list()
+        .await
+        .map_err(|e| e.to_string())?;
+    if bindings.iter().any(|b| b.icon.as_deref() == Some(icon_ref)) {
+        return Ok(());
+    }
+
     let file_path = state.data_dir().join(WORKSPACE_ICON_DIR).join(file_name);
     match tokio::fs::remove_file(&file_path).await {
         Ok(()) => {}

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

@@ -8,8 +8,9 @@ use std::collections::{HashMap, HashSet};
 use std::sync::Arc;
 
 use mcpmux_core::{
-    validate_workspace_root as validate_root, DomainEvent, FeatureSet, FeatureSetType, MemberMode,
-    MemberType, ServerFeature, WorkspaceBinding, WorkspaceRootValidation,
+    normalize_optional_metadata, validate_workspace_root as validate_root, DomainEvent, FeatureSet,
+    FeatureSetType, MemberMode, MemberType, ServerFeature, WorkspaceBinding,
+    WorkspaceRootValidation,
 };
 use serde::{Deserialize, Serialize};
 use tauri::State;
@@ -19,6 +20,7 @@ use uuid::Uuid;
 
 use super::gateway::GatewayAppState;
 use super::server_manager::ServerManagerState;
+use super::workspace_appearance::maybe_remove_orphaned_icon_file;
 use crate::state::AppState;
 
 /// Publish `WorkspaceBindingChanged` on the gateway's domain bus so
@@ -54,6 +56,8 @@ async fn emit_binding_changed(
 pub struct WorkspaceBindingDto {
     pub id: String,
     pub workspace_root: String,
+    pub label: Option<String>,
+    pub icon: Option<String>,
     pub space_id: String,
     pub feature_set_ids: Vec<String>,
     pub created_at: String,
@@ -65,6 +69,8 @@ impl From<WorkspaceBinding> for WorkspaceBindingDto {
         Self {
             id: b.id.to_string(),
             workspace_root: b.workspace_root,
+            label: b.label,
+            icon: b.icon,
             space_id: b.space_id.to_string(),
             feature_set_ids: b.feature_set_ids,
             created_at: b.created_at.to_rfc3339(),
@@ -81,6 +87,8 @@ impl From<WorkspaceBinding> for WorkspaceBindingDto {
 #[derive(Debug, Deserialize)]
 pub struct WorkspaceBindingInput {
     pub workspace_root: String,
+    pub label: Option<String>,
+    pub icon: Option<String>,
     pub space_id: String,
     pub feature_set_ids: Vec<String>,
 }
@@ -89,6 +97,64 @@ fn parse_space_id(input: &WorkspaceBindingInput) -> Result<Uuid, String> {
     Uuid::parse_str(&input.space_id).map_err(|e| format!("bad space_id: {e}"))
 }
 
+/// Resolve label from input, preserving existing on update when omitted.
+fn resolve_binding_label(
+    input: &WorkspaceBindingInput,
+    existing: Option<&WorkspaceBinding>,
+) -> Option<String> {
+    if input.label.is_some() {
+        normalize_optional_metadata(&input.label)
+    } else {
+        existing.and_then(|b| b.label.clone())
+    }
+}
+
+/// Resolve icon from input, existing row, or unmapped appearance fallback.
+async fn resolve_binding_icon(
+    state: &AppState,
+    normalized_root: &str,
+    input: &WorkspaceBindingInput,
+    existing: Option<&WorkspaceBinding>,
+) -> Result<Option<String>, String> {
+    let mut icon = if input.icon.is_some() {
+        normalize_optional_metadata(&input.icon)
+    } else {
+        existing.and_then(|b| b.icon.clone())
+    };
+    if icon.is_none() {
+        if let Some(appearance) = state
+            .workspace_appearance_repository
+            .get(normalized_root)
+            .await
+            .map_err(|e| e.to_string())?
+        {
+            icon = Some(appearance.icon);
+        }
+    }
+    Ok(icon)
+}
+
+/// Drop appearance rows once a binding owns the root.
+async fn clear_appearance_for_bound_root(
+    state: &AppState,
+    normalized_root: &str,
+) -> Result<(), String> {
+    if state
+        .workspace_appearance_repository
+        .get(normalized_root)
+        .await
+        .map_err(|e| e.to_string())?
+        .is_some()
+    {
+        state
+            .workspace_appearance_repository
+            .delete(normalized_root)
+            .await
+            .map_err(|e| e.to_string())?;
+    }
+    Ok(())
+}
+
 /// Clean + dedup the feature-set list (preserving order). An empty result is
 /// valid — it persists as a "no Space tools" binding.
 fn validate_fs_list(input: &WorkspaceBindingInput) -> Result<Vec<String>, String> {
@@ -255,14 +321,26 @@ pub async fn create_workspace_binding(
         ));
     }
 
-    let binding = WorkspaceBinding::new_multi(normalized.clone(), space_id, feature_set_ids);
+    let binding = WorkspaceBinding {
+        id: Uuid::new_v4(),
+        workspace_root: normalized.clone(),
+        client_id: None,
+        label: resolve_binding_label(&input, None),
+        icon: resolve_binding_icon(&state, &normalized, &input, None).await?,
+        space_id,
+        feature_set_ids,
+        created_at: chrono::Utc::now(),
+        updated_at: chrono::Utc::now(),
+    };
 
     state
         .workspace_binding_repository
         .create(&binding)
         .await
         .map_err(|e| e.to_string())?;
 
+    clear_appearance_for_bound_root(&state, &normalized).await?;
+
     info!(
         binding_id = %binding.id,
         root = %binding.workspace_root,
@@ -318,12 +396,17 @@ pub async fn update_workspace_binding(
         .map_err(|e| e.to_string())?
         .ok_or_else(|| format!("binding not found: {}", id))?;
     let old_space_id = existing.space_id;
+    let previous_icon = existing.icon.clone();
+    let client_id = existing.client_id.clone();
+    let label = resolve_binding_label(&input, Some(&existing));
+    let icon = resolve_binding_icon(&state, &normalized, &input, Some(&existing)).await?;
 
     let updated = WorkspaceBinding {
         id: existing.id,
-        workspace_root: normalized,
-        client_id: existing.client_id,
-        label: existing.label,
+        workspace_root: normalized.clone(),
+        client_id,
+        label,
+        icon,
         space_id,
         feature_set_ids,
         created_at: existing.created_at,
@@ -336,6 +419,12 @@ pub async fn update_workspace_binding(
         .await
         .map_err(|e| e.to_string())?;
 
+    clear_appearance_for_bound_root(&state, &normalized).await?;
+
+    if previous_icon.as_deref() != updated.icon.as_deref() {
+        maybe_remove_orphaned_icon_file(&state, previous_icon.as_deref()).await?;
+    }
+
     // Notify the NEW target space first (peers that now route via this
     // binding). If the space changed, also notify the OLD target so peers
     // that resolved there lose the stale route.
@@ -379,6 +468,7 @@ pub async fn delete_workspace_binding(
         .map_err(|e| e.to_string())?;
 
     if let Some(b) = existing {
+        maybe_remove_orphaned_icon_file(&state, b.icon.as_deref()).await?;
         emit_binding_changed(gateway_state.inner(), b.space_id, b.workspace_root).await;
     }
     Ok(())

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

@@ -44,7 +44,12 @@
       }
     ],
     "security": {
-      "csp": null
+      "csp": "default-src 'self' ipc: http://ipc.localhost; img-src 'self' asset: http://asset.localhost https: data: blob:",
+      "devCsp": "default-src 'self' 'unsafe-inline' 'unsafe-eval' ipc: http://ipc.localhost http://localhost:* ws://localhost:* ws://127.0.0.1:*; img-src 'self' asset: http://asset.localhost https: http: data: blob:",
+      "assetProtocol": {
+        "enable": true,
+        "scope": ["$APPDATA/**"]
+      }
     }
   },
   "bundle": {

apps/desktop/src-tauri/tauri.conf.json

@@ -7,7 +7,7 @@
  * - null/undefined
  */
 
-import { useEffect, useMemo, useState } from 'react';
+import { useEffect, useMemo, useRef, useState } from 'react';
 import { resolveWorkspaceIconDisplaySrc } from '@/lib/api/workspaceAppearances';
 
 interface ServerIconProps {
@@ -28,6 +28,7 @@ export function ServerIcon({ icon, className = 'w-9 h-9 object-contain', fallbac
   const [localResolved, setLocalResolved] = useState<{ icon: string; src: string | null } | null>(
     null
   );
+  const blobUrlRef = useRef<string | null>(null);
   const hasFailed = icon != null && failedIcon === icon;
   const localSrc =
     localResolved != null && localResolved.icon === icon ? localResolved.src : null;
@@ -43,8 +44,18 @@ export function ServerIcon({ icon, className = 'w-9 h-9 object-contain', fallbac
     void resolveWorkspaceIconDisplaySrc(localIcon)
       .then((src) => {
         if (cancelled) {
+          if (src?.startsWith('blob:')) {
+            URL.revokeObjectURL(src);
+          }
           return;
         }
+        if (blobUrlRef.current) {
+          URL.revokeObjectURL(blobUrlRef.current);
+          blobUrlRef.current = null;
+        }
+        if (src?.startsWith('blob:')) {
+          blobUrlRef.current = src;
+        }
         setLocalResolved({ icon: localIcon, src });
       })
       .catch(() => {
@@ -56,6 +67,10 @@ export function ServerIcon({ icon, className = 'w-9 h-9 object-contain', fallbac
 
     return () => {
       cancelled = true;
+      if (blobUrlRef.current) {
+        URL.revokeObjectURL(blobUrlRef.current);
+        blobUrlRef.current = null;
+      }
     };
   }, [icon, isLocalRef]);