diff --git a/nulib/lib_provisioning/services/commands.nu b/nulib/lib_provisioning/services/commands.nu
index f9d69be..a52fe64 100644
--- a/nulib/lib_provisioning/services/commands.nu
+++ b/nulib/lib_provisioning/services/commands.nu
@@ -3,10 +3,21 @@
 # Service CLI Commands
 # User-facing commands for service management
 
-use manager.nu *
-use health.nu *
-use preflight.nu *
-use dependencies.nu *
+# Selective imports (ADR-025 Phase 3 Layer 2).
+use lib_provisioning/services/manager.nu [
+    get-service-logs get-service-status init-service-state list-all-services
+    list-running-services load-service-registry restart-service start-service
+    stop-service
+]
+use lib_provisioning/services/health.nu [get-health-status monitor-service-health]
+use lib_provisioning/services/preflight.nu [
+    check-required-services get-readiness-report preflight-start-service
+    validate-all-services
+]
+use lib_provisioning/services/dependencies.nu [
+    can-stop-service get-dependency-tree get-startup-order
+    start-services-with-deps visualize-dependency-graph
+]
 
 # Platform management commands (manage all services)
 
diff --git a/nulib/lib_provisioning/workspace/commands.nu b/nulib/lib_provisioning/workspace/commands.nu
index 86e74b7..41d84f9 100644
--- a/nulib/lib_provisioning/workspace/commands.nu
+++ b/nulib/lib_provisioning/workspace/commands.nu
@@ -1,10 +1,21 @@
 # Workspace Management CLI Commands
 # Commands for switching between workspaces and managing workspace registry
 
-use ../user/config.nu *
-use ../utils/hints.nu *
-use ../platform/activation.nu *
-use ./notation.nu *
+# Selective imports (ADR-025 Phase 3 Layer 2).
+# Pre-existing name collision: get-workspace-path and list-workspaces are
+# exported by BOTH user/config.nu and workspace/notation.nu. Original star
+# imports resolved via last-wins (notation.nu line was after user/config.nu).
+# Keep notation.nu as the owner for the 2 collision symbols.
+use lib_provisioning/user/config.nu [
+    get-active-workspace get-active-workspace-details get-user-preference
+    load-user-config register-workspace remove-workspace set-active-workspace
+    set-user-preference set-workspace-default-infra validate-workspace-exists
+]
+use lib_provisioning/utils/hints.nu [show-next-step]
+use lib_provisioning/platform/activation.nu [activate-workspace-platform]
+use lib_provisioning/workspace/notation.nu [
+    get-workspace-path list-workspaces parse-workspace-infra-notation
+]
 
 # Activate a workspace (set as current)
 export def "workspace activate" [