diff --git a/nulib/clusters/create.nu b/nulib/clusters/create.nu
index 663bd64..58f7d86 100644
--- a/nulib/clusters/create.nu
+++ b/nulib/clusters/create.nu
@@ -1,5 +1,8 @@
-use lib_provisioning *
-#use ../lib_provisioning/utils/generate.nu *
+# Selective imports replacing `use lib_provisioning *` (ADR-025 Phase 4).
+use lib_provisioning/utils/help.nu [parse_help_command]
+use lib_provisioning/utils/init.nu [provisioning_init]
+use lib_provisioning/utils/interface.nu [_ansi _print desktop_run_notify end_run]
+use lib_provisioning/utils/settings.nu [find_get_settings]
 use utils.nu *
 # Provider middleware now available through lib_provisioning
 
diff --git a/nulib/clusters/generate.nu b/nulib/clusters/generate.nu
index 47316a2..5c059f3 100644
--- a/nulib/clusters/generate.nu
+++ b/nulib/clusters/generate.nu
@@ -1,5 +1,8 @@
-use lib_provisioning *
-#use ../lib_provisioning/utils/generate.nu *
+# Selective imports replacing `use lib_provisioning *` (ADR-025 Phase 4).
+use lib_provisioning/utils/help.nu [parse_help_command]
+use lib_provisioning/utils/init.nu [provisioning_init]
+use lib_provisioning/utils/interface.nu [_ansi _print desktop_run_notify end_run]
+use lib_provisioning/utils/settings.nu [find_get_settings]
 use utils.nu *
 # Provider middleware now available through lib_provisioning
 
diff --git a/nulib/clusters/handlers.nu b/nulib/clusters/handlers.nu
index ffbc6bc..e237720 100644
--- a/nulib/clusters/handlers.nu
+++ b/nulib/clusters/handlers.nu
@@ -1,8 +1,12 @@
+# Selective imports replacing `use lib_provisioning *` (ADR-025 Phase 4).
+use lib_provisioning/config/accessor/functions.nu [get-run-taskservs-path get-taskservs-path]
+use lib_provisioning/utils/hints.nu [show-next-step]
+use lib_provisioning/utils/interface.nu [_ansi _print]
+use lib_provisioning/utils/logging.nu [is-debug-check-enabled is-debug-enabled]
+use lib_provisioning/utils/settings.nu [load]
 use utils.nu *
-use lib_provisioning *
 use run.nu *
 use check_mode.nu *
-use ../lib_provisioning/config/accessor.nu *
 use ../lib_provisioning/utils/hints.nu *
 
 #use ../extensions/taskservs/run.nu run_taskserv
diff --git a/nulib/infras/utils.nu b/nulib/infras/utils.nu
index efd40f7..1da7e12 100644
--- a/nulib/infras/utils.nu
+++ b/nulib/infras/utils.nu
@@ -1,5 +1,6 @@
-use lib_provisioning *
-use ../lib_provisioning/user/config.nu [get-active-workspace get-workspace-path]
+# Star-import removed (ADR-025 Phase 4). File still invoked by legacy
+# `provisioning infra` runner; proper thin handler refactor pending.
+use lib_provisioning/user/config.nu [get-active-workspace get-workspace-path]
 # Removed broken imports - these modules don't exist
 # use create.nu *
 # use servers/delete.nu *
diff --git a/nulib/main_provisioning/query.nu b/nulib/main_provisioning/query.nu
index ca0c002..c997cbe 100644
--- a/nulib/main_provisioning/query.nu
+++ b/nulib/main_provisioning/query.nu
@@ -1,6 +1,13 @@
 
-use ../lib_provisioning *
-use ../lib_provisioning/config/accessor.nu *
+# Selective imports replacing `use ../lib_provisioning *` (ADR-025 Phase 4).
+use lib_provisioning/ai/lib.nu [ai_process_query get_ai_config is_ai_enabled]
+use lib_provisioning/utils/clean.nu [cleanup]
+use lib_provisioning/utils/error.nu [throw-error]
+use lib_provisioning/utils/format.nu [datalist_to_format]
+use lib_provisioning/utils/help.nu [parse_help_command]
+use lib_provisioning/utils/init.nu [get-provisioning-name]
+use lib_provisioning/utils/interface.nu [_ansi _print end_run]
+use lib_provisioning/utils/settings.nu [load load_settings]
 
 # Query infrastructure and services
 export def "main query" [
diff --git a/nulib/main_provisioning/tools.nu b/nulib/main_provisioning/tools.nu
index d9bbf29..5eac2bc 100644
--- a/nulib/main_provisioning/tools.nu
+++ b/nulib/main_provisioning/tools.nu
@@ -5,9 +5,18 @@
 # Date: 30-4-2024
 
 use std log
-use ../lib_provisioning *
+# Selective imports replacing `use ../lib_provisioning *` (ADR-025 Phase 4).
+use lib_provisioning/config/accessor/functions.nu [get-providers-path get-provisioning-req-versions]
+use lib_provisioning/setup/mod.nu [get-config-base-path]
+use lib_provisioning/setup/utils.nu [tools_install]
+use lib_provisioning/utils/error.nu [throw-error]
+use lib_provisioning/utils/init.nu [get-provisioning-name show_titles use_titles]
+use lib_provisioning/utils/interface.nu [_ansi _print end_run]
+use lib_provisioning/utils/version/loader.nu [discover-configurations]
+use lib_provisioning/utils/version/manager.nu [apply-config-updates check-available-updates check-versions set-fixed]
+use lib_provisioning/utils/version/registry.nu [show-version-status update-registry-versions]
+use lib_provisioning/utils/version/taskserv.nu [discover-taskserv-configurations taskserv-sync-versions]
 use ../env.nu *
-use ../lib_provisioning/config/accessor.nu *
 use ../lib_provisioning/utils/interface.nu *
 use ../lib_provisioning/utils/init.nu *
 use ../lib_provisioning/utils/error.nu *
diff --git a/nulib/servers/info.nu b/nulib/servers/info.nu
index b3ba4cc..98ba516 100644
--- a/nulib/servers/info.nu
+++ b/nulib/servers/info.nu
@@ -1,6 +1,9 @@
-use lib_provisioning *
+# Selective imports replacing `use lib_provisioning *` (ADR-025 Phase 4).
+use lib_provisioning/utils/init.nu [provisioning_init]
+use lib_provisioning/utils/interface.nu [_print end_run get-provisioning-out set-provisioning-no-terminal set-provisioning-out]
+use lib_provisioning/utils/logging.nu [is-debug-enabled]
+use lib_provisioning/utils/settings.nu [find_get_settings]
 use utils.nu *
-use ../lib_provisioning/config/accessor.nu *
 use ../../../extensions/providers/hetzner/nulib/hetzner/api.nu [hetzner_api_server_info]
 
 # Show detailed server information
diff --git a/nulib/servers/state.nu b/nulib/servers/state.nu
index ba13462..f04384d 100644
--- a/nulib/servers/state.nu
+++ b/nulib/servers/state.nu
@@ -1,8 +1,12 @@
-use lib_provisioning *
+# Selective imports replacing `use lib_provisioning *` (ADR-025 Phase 4).
+use lib_provisioning/utils/error.nu [throw-error]
+use lib_provisioning/utils/init.nu [get-provisioning-args get-provisioning-name provisioning_init]
+use lib_provisioning/utils/interface.nu [_ansi _print desktop_run_notify end_run set-provisioning-no-terminal set-provisioning-out]
+use lib_provisioning/utils/logging.nu [is-debug-enabled set-debug-enabled set-metadata-enabled]
+use lib_provisioning/utils/settings.nu [find_get_settings set-wk-cnprov]
+use lib_provisioning/utils/undefined.nu [invalid_task]
 use utils.nu *
 use ssh.nu *
-# Provider middleware now available through lib_provisioning
-use ../lib_provisioning/config/accessor.nu *
 
 # > Servers state
 export def "main state" [
diff --git a/nulib/servers/status.nu b/nulib/servers/status.nu
index bbae27e..ddc81ee 100644
--- a/nulib/servers/status.nu
+++ b/nulib/servers/status.nu
@@ -1,8 +1,11 @@
-use lib_provisioning *
+# Selective imports replacing `use lib_provisioning *` (ADR-025 Phase 4).
+use lib_provisioning/utils/init.nu [get-provisioning-args get-provisioning-name provisioning_init]
+use lib_provisioning/utils/interface.nu [_print end_run set-provisioning-no-terminal set-provisioning-out]
+use lib_provisioning/utils/logging.nu [is-debug-enabled set-debug-enabled set-metadata-enabled]
+use lib_provisioning/utils/settings.nu [find_get_settings]
+use lib_provisioning/utils/undefined.nu [invalid_task]
 use utils.nu *
 use ssh.nu *
-# Provider middleware now available through lib_provisioning
-use ../lib_provisioning/config/accessor.nu *
 
 # > Servers status
 export def "main status" [
diff --git a/nulib/servers/upgrade.nu b/nulib/servers/upgrade.nu
index 06d596a..d0e8ee6 100644
--- a/nulib/servers/upgrade.nu
+++ b/nulib/servers/upgrade.nu
@@ -1,6 +1,10 @@
-use lib_provisioning *
+# Selective imports replacing `use lib_provisioning *` (ADR-025 Phase 4).
+use lib_provisioning/result.nu [ok]
+use lib_provisioning/utils/interface.nu [_print]
+use lib_provisioning/utils/logging.nu [set-debug-enabled]
+use lib_provisioning/utils/settings.nu [find_get_settings load]
+use lib_provisioning/utils/ssh.nu [ssh_cmd]
 use utils.nu *
-use ../lib_provisioning/config/accessor.nu *
 
 # > Server upgrade — detect server_type drift and apply changes via provider API.
 #
diff --git a/nulib/test_environments.nu b/nulib/test_environments.nu
index 4024f6f..60e28a5 100644
--- a/nulib/test_environments.nu
+++ b/nulib/test_environments.nu
@@ -1,7 +1,9 @@
 # Test Environment Management
 # Nushell integration for containerized test environments
 
-use lib_provisioning *
+# Star-import removed (ADR-025 Phase 4). test_environments.nu is test-env code;
+# will move to tests/ in a follow-up. If any symbol becomes undefined, the
+# fix is an explicit selective import here.
 
 const DEFAULT_ORCHESTRATOR = "http://localhost:8080"
 
diff --git a/nulib/workflows/cluster.nu b/nulib/workflows/cluster.nu
index 5a4ba6a..7be5449 100644
--- a/nulib/workflows/cluster.nu
+++ b/nulib/workflows/cluster.nu
@@ -1,5 +1,6 @@
 use std
-use ../lib_provisioning *
+# Selective imports replacing `use ../lib_provisioning *` (ADR-025 Phase 4).
+use lib_provisioning/utils/interface.nu [_print]
 
 # Cluster workflow definitions
 export def cluster_workflow [
diff --git a/nulib/workflows/management.nu b/nulib/workflows/management.nu
index c10c4bc..6120090 100644
--- a/nulib/workflows/management.nu
+++ b/nulib/workflows/management.nu
@@ -1,7 +1,10 @@
 use std
-use ../lib_provisioning *
-use ../lib_provisioning/platform *
-use ../lib_provisioning/utils/service-check.nu *
+# Selective imports replacing fat-path (ADR-025 Phase 4).
+use lib_provisioning/platform/target.nu [detect-platform-mode]
+use lib_provisioning/utils/clean.nu [cleanup]
+use lib_provisioning/utils/interface.nu [_print]
+use lib_provisioning/utils/service-check.nu [verify-service-or-fail]
+use lib_provisioning/utils/simple_validation.nu [check-command]
 
 # Comprehensive workflow management commands
 
diff --git a/nulib/workflows/server_create.nu b/nulib/workflows/server_create.nu
index 163cb5d..43dab8a 100644
--- a/nulib/workflows/server_create.nu
+++ b/nulib/workflows/server_create.nu
@@ -1,9 +1,12 @@
 use std
-use ../lib_provisioning *
+# Selective imports replacing fat-path (ADR-025 Phase 4).
+use lib_provisioning/config/accessor/core.nu [config-get]
+use lib_provisioning/platform/target.nu [detect-platform-mode]
+use lib_provisioning/utils/interface.nu [_print]
+use lib_provisioning/utils/script-compression.nu [compress-workflow]
+use lib_provisioning/utils/service-check.nu [verify-daemon-or-block verify-service-or-fail]
+use lib_provisioning/utils/simple_validation.nu [check-command]
 use ../servers/delete.nu [sync-servers-state-post-op]
-use ../lib_provisioning/platform *
-use ../lib_provisioning/utils/script-compression.nu *
-use ../lib_provisioning/utils/service-check.nu *
 use ../servers/utils.nu *
 
 # Prepare compressed server creation script
diff --git a/nulib/workflows/taskserv.nu b/nulib/workflows/taskserv.nu
index e2d9b44..153c3d8 100644
--- a/nulib/workflows/taskserv.nu
+++ b/nulib/workflows/taskserv.nu
@@ -1,6 +1,8 @@
 use std
-use ../lib_provisioning *
-use ../lib_provisioning/platform *
+# Selective imports replacing fat-path (ADR-025 Phase 4).
+use lib_provisioning/config/accessor/core.nu [config-get]
+use lib_provisioning/platform/target.nu [detect-platform-mode]
+use lib_provisioning/utils/interface.nu [_print]
 use ../workspace/state.nu *
 
 # Taskserv workflow definitions
diff --git a/nulib/workspace/sync.nu b/nulib/workspace/sync.nu
index c9e7b1c..645b5a1 100644
--- a/nulib/workspace/sync.nu
+++ b/nulib/workspace/sync.nu
@@ -4,7 +4,9 @@
 # Ambiguous or timed-out probes write 'unknown.
 
 use state.nu *
-use ../lib_provisioning *
+# Selective imports replacing `use ../lib_provisioning *` (ADR-025 Phase 4).
+use lib_provisioning/utils/interface.nu [_print]
+use lib_provisioning/result.nu [err]
 
 # ─── Provider probe ───────────────────────────────────────────────────────────