diff --git a/src/context-engine/registry.ts b/src/context-engine/registry.ts
index 84a153a6200..f90cc8f7573 100644
--- a/src/context-engine/registry.ts
+++ b/src/context-engine/registry.ts
@@ -1,10 +1,6 @@
-import {
-  getExtensionHostContextEngineFactory,
-  listExtensionHostContextEngineIds,
-  registerExtensionHostContextEngine,
-  resolveExtensionHostContextEngine,
-  type ExtensionHostContextEngineFactory,
-} from "../extension-host/context-engine-runtime.js";
+import type { OpenClawConfig } from "../config/config.js";
+import { listExtensionHostContextEngineIds } from "../extension-host/context-engine-runtime.js";
+import { defaultSlotIdForKey } from "../plugins/slots.js";
 import type { ContextEngine } from "./types.js";
 
 /**
diff --git a/src/extension-host/activation/loader-orchestrator.ts b/src/extension-host/activation/loader-orchestrator.ts
index 4ebf17e85e1..b6aed47bca6 100644
--- a/src/extension-host/activation/loader-orchestrator.ts
+++ b/src/extension-host/activation/loader-orchestrator.ts
@@ -6,7 +6,7 @@ import {
   type CreatePluginRuntimeOptions,
 } from "../../plugins/runtime/index.js";
 import type { PluginLogger } from "../../plugins/types.js";
-import { clearExtensionHostPluginCommands } from "./command-runtime.js";
+import { clearExtensionHostPluginCommands } from "../command-runtime.js";
 import {
   clearExtensionHostLoaderHostState,
   getExtensionHostDiscoveryWarningCache,
diff --git a/src/extension-host/activation/loader-pipeline.ts b/src/extension-host/activation/loader-pipeline.ts
index 9328ed2f8ce..57a963b9029 100644
--- a/src/extension-host/activation/loader-pipeline.ts
+++ b/src/extension-host/activation/loader-pipeline.ts
@@ -2,7 +2,7 @@ import type { GatewayRequestHandler } from "../../gateway/server-methods/types.j
 import type { PluginRegistry } from "../../plugins/registry.js";
 import type { CreatePluginRuntimeOptions } from "../../plugins/runtime/index.js";
 import type { PluginRuntime } from "../../plugins/runtime/types.js";
-import { activateExtensionHostRegistry } from "./activation.js";
+import { activateExtensionHostRegistry } from "../activation.js";
 import { setCachedExtensionHostRegistry } from "./loader-cache.js";
 import { prepareExtensionHostLoaderExecution } from "./loader-execution.js";
 import type { ExtensionHostLoaderPreflightReady } from "./loader-preflight.js";
diff --git a/src/extension-host/policy/media-runtime-policy.ts b/src/extension-host/policy/media-runtime-policy.ts
index 3fe950281ea..d06b5b03d3b 100644
--- a/src/extension-host/policy/media-runtime-policy.ts
+++ b/src/extension-host/policy/media-runtime-policy.ts
@@ -1,9 +1,9 @@
 import type { MediaUnderstandingCapability } from "../../media-understanding/types.js";
-import { normalizeExtensionHostMediaProviderId } from "./media-runtime-registry.js";
+import { normalizeExtensionHostMediaProviderId } from "../media-runtime-registry.js";
 import {
   listExtensionHostMediaRuntimeBackendCatalogEntries,
   resolveExtensionHostMediaRuntimeDefaultModel,
-} from "./runtime-backend-catalog.js";
+} from "../runtime-backend-catalog.js";
 import { resolveExtensionHostRuntimeBackendIdsByPolicy } from "./runtime-backend-policy.js";
 
 export type ExtensionHostMediaActiveModel = {
diff --git a/src/extension-host/policy/runtime-backend-arbitration.ts b/src/extension-host/policy/runtime-backend-arbitration.ts
index e65ad902de2..e06cebca52d 100644
--- a/src/extension-host/policy/runtime-backend-arbitration.ts
+++ b/src/extension-host/policy/runtime-backend-arbitration.ts
@@ -1,7 +1,7 @@
 import type {
   ExtensionHostRuntimeBackendCatalogEntry,
   ExtensionHostRuntimeBackendSubsystemId,
-} from "./runtime-backend-catalog.js";
+} from "../runtime-backend-catalog.js";
 
 type ExtensionHostRuntimeBackendArbitrationPredicate = (
   entry: ExtensionHostRuntimeBackendCatalogEntry,
diff --git a/src/extension-host/policy/runtime-backend-policy.ts b/src/extension-host/policy/runtime-backend-policy.ts
index f2a87a6d997..edee3b26ecd 100644
--- a/src/extension-host/policy/runtime-backend-policy.ts
+++ b/src/extension-host/policy/runtime-backend-policy.ts
@@ -1,11 +1,11 @@
+import type {
+  ExtensionHostRuntimeBackendCatalogEntry,
+  ExtensionHostRuntimeBackendSubsystemId,
+} from "../runtime-backend-catalog.js";
 import {
   resolveExtensionHostDefaultRuntimeBackendIdByArbitration,
   resolveExtensionHostRuntimeBackendFallbackChainByArbitration,
 } from "./runtime-backend-arbitration.js";
-import type {
-  ExtensionHostRuntimeBackendCatalogEntry,
-  ExtensionHostRuntimeBackendSubsystemId,
-} from "./runtime-backend-catalog.js";
 
 type ExtensionHostRuntimeBackendPolicyPredicate = (
   entry: ExtensionHostRuntimeBackendCatalogEntry,
diff --git a/src/extension-host/policy/tts-runtime-policy.ts b/src/extension-host/policy/tts-runtime-policy.ts
index a82ec5fe300..c7585c28beb 100644
--- a/src/extension-host/policy/tts-runtime-policy.ts
+++ b/src/extension-host/policy/tts-runtime-policy.ts
@@ -2,10 +2,10 @@ import type { TtsProvider } from "../../config/types.tts.js";
 import {
   listExtensionHostTtsRuntimeBackendCatalogEntries,
   type ExtensionHostRuntimeBackendCatalogEntry,
-} from "./runtime-backend-catalog.js";
+} from "../runtime-backend-catalog.js";
+import type { ResolvedTtsConfig } from "../tts-config.js";
+import { isExtensionHostTtsProviderConfigured } from "../tts-runtime-registry.js";
 import { resolveExtensionHostRuntimeBackendIdsByPolicy } from "./runtime-backend-policy.js";
-import type { ResolvedTtsConfig } from "./tts-config.js";
-import { isExtensionHostTtsProviderConfigured } from "./tts-runtime-registry.js";
 
 function isConfiguredTtsRuntimeBackend(
   config: ResolvedTtsConfig,