feat(desktop,gateway): Phase 5 — docs reconcile + remove dead collision_client_id wiring

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

Author: crimsonsunset

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

@@ -816,7 +816,6 @@ fn map_domain_event_to_ui(event: &DomainEvent) -> (&'static str, serde_json::Val
             session_id,
             space_id,
             workspace_root,
-            collision_client_id,
             space_locked,
         } => (
             "workspace-needs-binding",
@@ -825,7 +824,6 @@ fn map_domain_event_to_ui(event: &DomainEvent) -> (&'static str, serde_json::Val
                 "session_id": session_id,
                 "space_id": space_id,
                 "workspace_root": workspace_root,
-                "collision_client_id": collision_client_id,
                 "space_locked": space_locked,
             }),
         ),

apps/desktop/src/features/workspaces/workspace-binding-panel.component.tsx

@@ -308,7 +308,6 @@ export function WorkspaceBindingPanel() {
         clientId: eventPayload.client_id,
         spaceId: eventPayload.space_id,
         spaceLocked: eventPayload.space_locked ?? false,
-        collisionClientId: eventPayload.collision_client_id ?? undefined,
       });
     });
   }, [subscribe, open]);
@@ -812,9 +811,7 @@ export function WorkspaceBindingPanel() {
     mode === 'create'
       ? t('panel.routingSubtitleCreate')
       : mode === 'create-from-live'
-        ? payload.collisionClientId
-          ? t('sheet.descCollision')
-          : t('sheet.descNew')
+        ? t('sheet.descNew')
         : isEdit
           ? t('panel.routingSubtitleRoutes', {
               featureSets:
@@ -854,14 +851,14 @@ export function WorkspaceBindingPanel() {
               badges={
                 <>
                   {mode === 'create-from-live' && (
-                    <Pill tone={payload.collisionClientId ? 'amber' : 'primary'}>
+                    <Pill tone="primary">
                       <span className="inline-flex items-center gap-1">
                         <Sparkles className="h-2.5 w-2.5" />
-                        {payload.collisionClientId ? t('sheet.badgeCollision') : t('sheet.badgeNew')}
+                        {t('sheet.badgeNew')}
                       </span>
                     </Pill>
                   )}
-                  {mode === 'create-from-live' && !payload.collisionClientId && (
+                  {mode === 'create-from-live' && (
                     <Pill tone="amber">{t('card.badgeLiveUnbound')}</Pill>
                   )}
                   {mode === 'edit' && binding && <Pill tone="neutral">{t('card.offline')}</Pill>}
@@ -887,7 +884,7 @@ export function WorkspaceBindingPanel() {
             </div>
           ) : (
             <>
-              {mode === 'create-from-live' && !payload.collisionClientId && (
+              {mode === 'create-from-live' && (
                 <div
                   className="rounded-xl border border-amber-200/80 dark:border-amber-800/50 bg-amber-50/80 dark:bg-amber-900/15 p-4"
                   data-testid="workspace-binding-no-tools-banner"

apps/desktop/src/lib/backend/events/useWorkspaceEvents.ts

@@ -32,8 +32,6 @@ export interface WorkspaceNeedsBindingPayload {
   session_id: string;
   space_id: string;
   workspace_root: string;
-  /** Set when another client's scoped binding blocked the global route. */
-  collision_client_id?: string | null;
   /** When true, the Space picker is locked to `space_id`. */
   space_locked?: boolean;
 }

apps/desktop/src/locales/en/workspaces.json

@@ -196,7 +196,7 @@
     "badgeCollision": "Client binding required",
     "badgeNew": "New workspace detected",
     "titleCollision": "Create a binding for this client",
-    "titleNew": "This folder is using your Starter set",
+    "titleNew": "Bind this folder to enable tools",
     "descCollision": "This path is already bound for another MCP client. Save a client-scoped binding so this machine gets its own tool set.",
     "descNew": "No backend tools are active on this session. Creating a binding enables tool access.",
     "noToolsBanner": "No backend tools are active on this session. Creating a binding enables tool access.",

apps/desktop/src/stores/bindingPanelStore.ts

@@ -16,8 +16,6 @@ export interface BindingPanelPayload {
   clientId?: string;
   /** Hint for default space picker from the triggering event. */
   spaceId?: string;
-  /** When set, header shows collision copy instead of new-connection badge. */
-  collisionClientId?: string;
   /** When true, the Space picker is locked to `spaceId` (base-dir scoped folder). */
   spaceLocked?: boolean;
   /** Unmapped appearance icon from the card grid, seeds create-from-live icon state. */

crates/mcpmux-core/src/domain/event.rs

@@ -378,11 +378,6 @@ pub enum DomainEvent {
         session_id: String,
         space_id: Uuid,
         workspace_root: String,
-        /// When set, a scoped binding for another OAuth client blocked the
-        /// global binding on this path — the UI should offer to create a
-        /// client-scoped binding for `client_id`.
-        #[serde(default, skip_serializing_if = "Option::is_none")]
-        collision_client_id: Option<String>,
         /// The folder is scoped to `space_id` by a Space base directory, so the
         /// mapping popup locks its Space field to it (the user only picks the
         /// FeatureSet). `false` for an ordinary unmapped folder, where the user
@@ -759,7 +754,6 @@ mod tests {
             session_id: "sess-1".to_string(),
             space_id: Uuid::new_v4(),
             workspace_root: "/proj/foo".to_string(),
-            collision_client_id: None,
             space_locked: false,
         };
         assert!(!e.affects_mcp_capabilities());
@@ -786,12 +780,11 @@ mod tests {
             session_id: "s".into(),
             space_id: Uuid::nil(),
             workspace_root: "/r".into(),
-            collision_client_id: Some("other-client".into()),
             space_locked: true,
         };
         let json = serde_json::to_string(&needs).unwrap();
         assert!(json.contains("\"type\":\"workspace_needs_binding\""));
         assert!(json.contains("\"session_id\":\"s\""));
-        assert!(json.contains("\"collision_client_id\":\"other-client\""));
+        assert!(json.contains("\"space_locked\":true"));
     }
 }

crates/mcpmux-gateway/src/admin/ui_events.rs

@@ -406,7 +406,6 @@ pub fn map_domain_event_to_ui(event: &DomainEvent) -> (&'static str, Value) {
             session_id,
             space_id,
             workspace_root,
-            collision_client_id,
             space_locked,
         } => (
             "workspace-needs-binding",
@@ -415,7 +414,6 @@ pub fn map_domain_event_to_ui(event: &DomainEvent) -> (&'static str, Value) {
                 "session_id": session_id,
                 "space_id": space_id,
                 "workspace_root": workspace_root,
-                "collision_client_id": collision_client_id,
                 "space_locked": space_locked,
             }),
         ),

crates/mcpmux-gateway/src/mcp/handler.rs

@@ -165,7 +165,6 @@ impl McpMuxGatewayHandler {
                             session_id: sid.to_string(),
                             space_id,
                             workspace_root: root.to_string(),
-                            collision_client_id: resolved.collision_client_id.clone(),
                             space_locked,
                         },
                     );

crates/mcpmux-gateway/src/services/feature_set_resolver.rs

@@ -150,9 +150,6 @@ pub struct ResolvedFeatureSet {
     /// Resolved Space id. Used by the routing layer when filtering features.
     pub space_id: Option<Uuid>,
     pub source: ResolutionSource,
-    /// When `source == Deny` because a global binding was blocked by another
-    /// client's scoped binding on the same path, holds that client's id.
-    pub collision_client_id: Option<String>,
 }
 
 impl ResolvedFeatureSet {
@@ -306,7 +303,6 @@ impl FeatureSetResolverService {
             feature_set_ids: vec![],
             space_id: Some(space_id),
             source: ResolutionSource::Unbound,
-            collision_client_id: None,
         }
     }
 
@@ -336,7 +332,6 @@ impl FeatureSetResolverService {
                     feature_set_ids: vec![],
                     space_id: None,
                     source: ResolutionSource::Deny,
-                    collision_client_id: None,
                 });
             }
         };
@@ -389,7 +384,6 @@ impl FeatureSetResolverService {
                         feature_set_ids: binding.feature_set_ids,
                         space_id: Some(binding.space_id),
                         source: ResolutionSource::WorkspaceBinding,
-                        collision_client_id: None,
                     });
                 }
                 // Tier 1b: had roots, no binding. The folder is unmapped —
@@ -439,7 +433,6 @@ impl FeatureSetResolverService {
                         feature_set_ids: vec![],
                         space_id: Some(default_space_id),
                         source: ResolutionSource::PendingRoots,
-                        collision_client_id: None,
                     });
                 }
                 // Grace lapsed with no root in sight — deny by default. Go
@@ -480,7 +473,6 @@ impl FeatureSetResolverService {
                     feature_set_ids: grants,
                     space_id: Some(default_space_id),
                     source: ResolutionSource::ClientGrant,
-                    collision_client_id: None,
                 });
             }
         }

docs/guide/spaces.mdx

@@ -29,11 +29,7 @@ Each Space is an independent environment containing:
 
 ### Active Space
 
-Only one Space can be **active** at a time. The active Space is the **fallback** for any session whose folder isn't mapped to a specific Space via a [Workspace](/docs/workspaces/) binding. It determines:
-
-- Which servers the gateway connects to
-- Which tools an unmapped session sees (its active-Space FeatureSet)
-- Which credentials are injected into server connections
+Only one Space can be **active** at a time. The active Space sets the default gateway context — which servers are available and which credentials are injected when a session has a workspace binding. Unmapped folders get **no backend tools** by default; you must create an explicit [Workspace](/docs/workspaces/) binding to enable access. The Starter bundle is an opt-in default you can bind deliberately, not a silent fallback.
 
 Switching the active Space immediately changes what servers and tools are available — no restart required.
 
@@ -82,7 +78,7 @@ Navigate to **Spaces** in McpMux and click **Create Space**. Give it a name and
 
 ### Switching Active Space
 
-Click on any Space to set it as active. The dashboard and server list update immediately to reflect the new context. Any session whose folder isn't mapped to a specific Space follows the active Space automatically.
+Click on any Space to set it as active. The dashboard and server list update immediately to reflect the new context. Unmapped folders stay denied until you bind them to a Space and FeatureSet.
 
 ### Deleting a Space