diff --git a/src/agents/model-selection-cli.ts b/src/agents/model-selection-cli.ts
new file mode 100644
index 00000000000..342b0bc8480
--- /dev/null
+++ b/src/agents/model-selection-cli.ts
@@ -0,0 +1,17 @@
+import type { OpenClawConfig } from "../config/types.openclaw.js";
+import { resolveRuntimeCliBackends } from "../plugins/cli-backends.runtime.js";
+import { resolvePluginSetupCliBackendRuntime } from "../plugins/setup-registry.runtime.js";
+import { normalizeProviderId } from "./model-selection-normalize.js";
+
+export function isCliProvider(provider: string, cfg?: OpenClawConfig): boolean {
+  const normalized = normalizeProviderId(provider);
+  const cliBackends = resolveRuntimeCliBackends();
+  if (cliBackends.some((backend) => normalizeProviderId(backend.id) === normalized)) {
+    return true;
+  }
+  if (resolvePluginSetupCliBackendRuntime({ backend: normalized })) {
+    return true;
+  }
+  const backends = cfg?.agents?.defaults?.cliBackends ?? {};
+  return Object.keys(backends).some((key) => normalizeProviderId(key) === normalized);
+}
diff --git a/src/agents/model-selection.ts b/src/agents/model-selection.ts
index 77c0f2da8e6..5be15fa15a8 100644
--- a/src/agents/model-selection.ts
+++ b/src/agents/model-selection.ts
@@ -6,8 +6,6 @@ import {
 } from "../config/model-input.js";
 import type { OpenClawConfig } from "../config/types.openclaw.js";
 import { createSubsystemLogger } from "../logging/subsystem.js";
-import { resolveRuntimeCliBackends } from "../plugins/cli-backends.runtime.js";
-import { resolvePluginSetupCliBackendRuntime } from "../plugins/setup-registry.runtime.js";
 import {
   normalizeLowercaseStringOrEmpty,
   normalizeOptionalLowercaseString,
@@ -76,19 +74,7 @@ export {
   parseModelRef,
 };
 export type { ModelRef };
-
-export function isCliProvider(provider: string, cfg?: OpenClawConfig): boolean {
-  const normalized = normalizeProviderId(provider);
-  const cliBackends = resolveRuntimeCliBackends();
-  if (cliBackends.some((backend) => normalizeProviderId(backend.id) === normalized)) {
-    return true;
-  }
-  if (resolvePluginSetupCliBackendRuntime({ backend: normalized })) {
-    return true;
-  }
-  const backends = cfg?.agents?.defaults?.cliBackends ?? {};
-  return Object.keys(backends).some((key) => normalizeProviderId(key) === normalized);
-}
+export { isCliProvider } from "./model-selection-cli.js";
 
 export function resolvePersistedOverrideModelRef(params: {
   defaultProvider: string;
diff --git a/src/auto-reply/reply/abort-primitives.ts b/src/auto-reply/reply/abort-primitives.ts
index 6b1f46e5be4..6a846fb4c4a 100644
--- a/src/auto-reply/reply/abort-primitives.ts
+++ b/src/auto-reply/reply/abort-primitives.ts
@@ -1,5 +1,6 @@
 import { normalizeLowercaseStringOrEmpty } from "../../shared/string-coerce.js";
-import { normalizeCommandBody, type CommandNormalizeOptions } from "../commands-registry.js";
+import { normalizeCommandBody } from "../commands-registry-normalize.js";
+import type { CommandNormalizeOptions } from "../commands-registry.types.js";
 
 const ABORT_TRIGGERS = new Set([
   "stop",
diff --git a/src/cli/pairing-cli.ts b/src/cli/pairing-cli.ts
index bee391b23ae..d2ff4c2cc4a 100644
--- a/src/cli/pairing-cli.ts
+++ b/src/cli/pairing-cli.ts
@@ -3,11 +3,8 @@ import { normalizeChannelId } from "../channels/plugins/index.js";
 import { listPairingChannels, notifyPairingApproved } from "../channels/plugins/pairing.js";
 import { loadConfig } from "../config/config.js";
 import { resolvePairingIdLabel } from "../pairing/pairing-labels.js";
-import {
-  approveChannelPairingCode,
-  listChannelPairingRequests,
-  type PairingChannel,
-} from "../pairing/pairing-store.js";
+import { approveChannelPairingCode, listChannelPairingRequests } from "../pairing/pairing-store.js";
+import type { PairingChannel } from "../pairing/pairing-store.types.js";
 import { defaultRuntime } from "../runtime.js";
 import {
   normalizeLowercaseStringOrEmpty,