chore(deadcode): trim stale facade re-exports

vincentkoc · vincentkoc · commit eea777c9fc9c · 2026-06-22T01:16:08.000+08:00
diff --git a/src/commands/channel-setup/registry.ts b/src/commands/channel-setup/registry.ts
@@ -1,8 +1,8 @@
+import type { ChannelSetupWizardAdapter } from "../../channels/plugins/setup-wizard-types.js";
 // Adapts declarative and imperative channel setup wizards to the command-facing interface.
 import { buildChannelSetupWizardAdapterFromSetupWizard } from "../../channels/plugins/setup-wizard.js";
 import type { ChannelSetupWizard } from "../../channels/plugins/setup-wizard.js";
 import type { ChannelPlugin } from "../../channels/plugins/types.plugin.js";
-import type { ChannelSetupWizardAdapter } from "./types.js";
 
 const setupWizardAdapters = new WeakMap<object, ChannelSetupWizardAdapter>();
 
diff --git a/src/commands/channel-setup/types.ts b/src/commands/channel-setup/types.ts
diff --git a/src/commands/gateway-status/helpers.ts b/src/commands/gateway-status/helpers.ts
@@ -10,7 +10,6 @@ import { isLoopbackHost } from "../../gateway/net.js";
 import type { GatewayProbeCapability, GatewayProbeResult } from "../../gateway/probe.js";
 import { inspectBestEffortPrimaryTailnetIPv4 } from "../../infra/network-discovery-display.js";
 import { parseStrictInteger } from "../../infra/parse-finite-number.js";
-import { pickGatewaySelfPresence } from "../gateway-presence.js";
 
 const MISSING_SCOPE_PATTERN = /\bmissing scope:\s*[a-z0-9._-]+/i;
 
@@ -183,8 +182,6 @@ export async function resolveAuthForTarget(
   });
 }
 
-export { pickGatewaySelfPresence };
-
 /** Extracts the config fields displayed by `openclaw gateway status --deep`. */
 export function extractConfigSummary(snapshotUnknown: unknown): GatewayConfigSummary {
   const snap = snapshotUnknown as Partial<ConfigFileSnapshot> | null;
diff --git a/src/commands/gateway-status/probe-run.ts b/src/commands/gateway-status/probe-run.ts
@@ -10,10 +10,10 @@ import {
   type GatewayBonjourBeacon,
 } from "../../infra/bonjour-discovery.js";
 import { formatErrorMessage } from "../../infra/errors.js";
+import { pickGatewaySelfPresence } from "../gateway-presence.js";
 import { pickAutoSshTargetFromDiscovery } from "./discovery.js";
 import {
   extractConfigSummary,
-  pickGatewaySelfPresence,
   resolveAuthForTarget,
   resolveProbeBudgetMs,
   type GatewayConfigSummary,
diff --git a/src/commands/models/aliases.ts b/src/commands/models/aliases.ts
@@ -2,13 +2,9 @@
 import { formatCliCommand } from "../../cli/command-format.js";
 import { logConfigUpdated } from "../../config/logging.js";
 import { type RuntimeEnv, writeRuntimeJson } from "../../runtime.js";
+import { normalizeAlias } from "./alias-name.js";
 import { loadModelsConfig } from "./load-config.js";
-import {
-  ensureFlagCompatibility,
-  normalizeAlias,
-  resolveModelTarget,
-  updateConfig,
-} from "./shared.js";
+import { ensureFlagCompatibility, resolveModelTarget, updateConfig } from "./shared.js";
 
 /** Lists configured model aliases as JSON, plain pairs, or human-readable rows. */
 export async function modelsAliasesListCommand(
diff --git a/src/commands/models/list.auth-overview.ts b/src/commands/models/list.auth-overview.ts
@@ -20,7 +20,7 @@ import {
 import type { OpenClawConfig } from "../../config/types.openclaw.js";
 import type { ProviderAuthEvidence } from "../../secrets/provider-env-vars.js";
 import { shortenHomePath } from "../../utils.js";
-import { maskApiKey } from "./list.format.js";
+import { maskApiKey } from "../../utils/mask-api-key.js";
 import type { ProviderAuthOverview } from "./list.types.js";
 
 function formatMarkerOrSecret(value: string): string {
diff --git a/src/commands/models/list.format.ts b/src/commands/models/list.format.ts
@@ -1,6 +1,5 @@
 /** Formatting helpers for model-list terminal tables. */
 import { isRich as isRichTerminal, theme } from "../../../packages/terminal-core/src/theme.js";
-export { maskApiKey } from "../../utils/mask-api-key.js";
 
 /** Enables rich formatting only for non-machine-readable output. */
 export const isRich = (opts?: { json?: boolean; plain?: boolean }) =>
diff --git a/src/commands/models/list.rows.ts b/src/commands/models/list.rows.ts
@@ -15,11 +15,12 @@ import type { ProviderRuntimeModel } from "../../plugins/provider-runtime-model.
 import { normalizeProviderResolvedModelWithPlugin } from "../../plugins/provider-runtime.js";
 import { createLazyImportLoader } from "../../shared/lazy-promise.js";
 import type { ModelListAuthIndex } from "./list.auth-index.js";
+import { isLocalBaseUrl } from "./list.local-url.js";
 import type { ListRowModel } from "./list.model-row.js";
 import { toModelRow } from "./list.model-row.js";
 import type { ConfiguredEntry, ModelRow } from "./list.types.js";
 import { canonicalizeModelCatalogProviderAlias } from "./provider-aliases.js";
-import { isLocalBaseUrl, modelKey } from "./shared.js";
+import { modelKey } from "./shared.js";
 
 type ConfiguredByKey = Map<string, ConfiguredEntry>;
 type ModelCatalogModule = typeof import("../../agents/model-catalog.js");
diff --git a/src/commands/models/shared.ts b/src/commands/models/shared.ts
@@ -19,8 +19,6 @@ import type { AgentModelEntryConfig } from "../../config/types.agent-defaults.js
 import type { AgentModelConfig } from "../../config/types.agents-shared.js";
 import { normalizeAgentId } from "../../routing/session-key.js";
 import { canonicalizeModelCatalogProviderRef } from "./provider-aliases.js";
-export { normalizeAlias } from "./alias-name.js";
-export { isLocalBaseUrl } from "./list.local-url.js";
 
 export const ensureFlagCompatibility = (opts: { json?: boolean; plain?: boolean }) => {
   if (opts.json && opts.plain) {
diff --git a/src/commands/onboard-channels.e2e.test.ts b/src/commands/onboard-channels.e2e.test.ts
@@ -1,14 +1,14 @@
 // Onboard channels e2e tests cover setup wizard adapters, plugin install hooks, and channel picker behavior.
 import { beforeEach, describe, expect, it, vi } from "vitest";
 import type { ChannelPluginCatalogEntry } from "../channels/plugins/catalog.js";
+import { getChannelSetupPlugin } from "../channels/plugins/setup-registry.js";
+import type { ChannelSetupWizardAdapter } from "../channels/plugins/setup-wizard-types.js";
 import {
   ensureChannelSetupPluginInstalled,
   loadChannelSetupPluginRegistrySnapshotForChannel,
 } from "../commands/channel-setup/plugin-install.js";
 import { resolveChannelSetupWizardAdapterForPlugin } from "../commands/channel-setup/registry.js";
-import type { ChannelSetupWizardAdapter } from "../commands/channel-setup/types.js";
 import type { OpenClawConfig } from "../config/config.js";
-import { getChannelSetupPlugin } from "../channels/plugins/setup-registry.js";
 import { createEmptyPluginRegistry } from "../plugins/registry.js";
 import { setActivePluginRegistry } from "../plugins/runtime.js";
 import { createChannelTestPluginBase, createTestRegistry } from "../test-utils/channel-plugins.js";
diff --git a/src/commands/onboard-channels.ts b/src/commands/onboard-channels.ts
@@ -2,7 +2,7 @@
 export {
   createChannelOnboardingPostWriteHook,
   createChannelOnboardingPostWriteHookCollector,
-  noteChannelStatus,
   runCollectedChannelOnboardingPostWriteHooks,
   setupChannels,
 } from "../flows/channel-setup.js";
+export { noteChannelStatus } from "../flows/channel-setup.status.js";
diff --git a/src/commands/status.scan-result.ts b/src/commands/status.scan-result.ts
@@ -6,13 +6,13 @@ import type { collectChannelStatusIssues as collectChannelStatusIssuesFn } from
 import { resolveOsSummary } from "../infra/os-summary.js";
 import type { UpdateCheckResult } from "../infra/update-check.js";
 import type { PluginCompatibilityNotice } from "../plugins/status.js";
+import type { pickGatewaySelfPresence } from "./gateway-presence.js";
 import type { buildChannelsTable as buildChannelsTableFn } from "./status-all/channels.js";
 import type { getAgentLocalStatuses as getAgentLocalStatusesFn } from "./status.agent-local.js";
 import type {
   GatewayProbeSnapshot,
   MemoryPluginStatus,
   MemoryStatusSnapshot,
-  pickGatewaySelfPresence,
 } from "./status.scan.shared.js";
 import type { getStatusSummary as getStatusSummaryFn } from "./status.summary.js";
 
diff --git a/src/commands/status.scan.shared.ts b/src/commands/status.scan.shared.ts
@@ -29,7 +29,6 @@ import { createLazyImportLoader } from "../shared/lazy-promise.js";
 import { resolveTailscalePublishedHost } from "../shared/tailscale-status.js";
 import { pickGatewaySelfPresence } from "./gateway-presence.js";
 import { isProbeReachable } from "./gateway-status/helpers.js";
-export { pickGatewaySelfPresence } from "./gateway-presence.js";
 
 const gatewayProbeModuleLoader = createLazyImportLoader(() => import("./status.gateway-probe.js"));
 const probeGatewayModuleLoader = createLazyImportLoader(() => import("../gateway/probe.js"));
diff --git a/src/flows/channel-setup.prompts.test.ts b/src/flows/channel-setup.prompts.test.ts
@@ -1,6 +1,6 @@
 // Channel setup prompt tests cover prompt choices and validation.
 import { describe, expect, it, vi } from "vitest";
-import type { ChannelSetupDmPolicy } from "../commands/channel-setup/types.js";
+import type { ChannelSetupDmPolicy } from "../channels/plugins/setup-wizard-types.js";
 import type { OpenClawConfig } from "../config/types.openclaw.js";
 import { withEnvAsync } from "../test-utils/env.js";
 import type { WizardPrompter } from "../wizard/prompts.js";
diff --git a/src/flows/channel-setup.prompts.ts b/src/flows/channel-setup.prompts.ts
@@ -3,11 +3,11 @@ import { formatDocsLink } from "../../packages/terminal-core/src/links.js";
 import { resolveChannelDefaultAccountId } from "../channels/plugins/helpers.js";
 import { getChannelSetupPlugin } from "../channels/plugins/setup-registry.js";
 import type { ChannelSetupPlugin } from "../channels/plugins/setup-wizard-types.js";
-import { formatCliCommand } from "../cli/command-format.js";
 import type {
   ChannelSetupDmPolicy,
   ChannelSetupWizardAdapter,
-} from "../commands/channel-setup/types.js";
+} from "../channels/plugins/setup-wizard-types.js";
+import { formatCliCommand } from "../cli/command-format.js";
 import type { ChannelChoice } from "../commands/onboard-types.js";
 import type { DmPolicy } from "../config/types.js";
 import type { OpenClawConfig } from "../config/types.openclaw.js";
diff --git a/src/flows/channel-setup.status.ts b/src/flows/channel-setup.status.ts
@@ -5,18 +5,18 @@ import { resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../agents/agent
 import { listChatChannels } from "../channels/chat-meta.js";
 import type { ChannelPluginCatalogEntry } from "../channels/plugins/catalog.js";
 import { listChannelSetupPlugins } from "../channels/plugins/setup-registry.js";
-import type { ChannelSetupPlugin } from "../channels/plugins/setup-wizard-types.js";
+import type {
+  ChannelSetupPlugin,
+  ChannelSetupStatus,
+  ChannelSetupWizardAdapter,
+  SetupChannelsOptions,
+} from "../channels/plugins/setup-wizard-types.js";
 import type { ChannelMeta } from "../channels/plugins/types.core.js";
 import { formatChannelPrimerLine, formatChannelSelectionLine } from "../channels/registry.js";
 import { formatCliCommand } from "../cli/command-format.js";
 import { resolveChannelSetupEntries } from "../commands/channel-setup/discovery.js";
 import { shouldShowChannelInSetup } from "../commands/channel-setup/discovery.js";
 import { resolveChannelSetupWizardAdapterForPlugin } from "../commands/channel-setup/registry.js";
-import type {
-  ChannelSetupWizardAdapter,
-  ChannelSetupStatus,
-  SetupChannelsOptions,
-} from "../commands/channel-setup/types.js";
 import type { ChannelChoice } from "../commands/onboard-types.js";
 import { isChannelConfigured } from "../config/channel-configured.js";
 import type { OpenClawConfig } from "../config/types.openclaw.js";
@@ -373,7 +373,9 @@ export async function collectChannelStatus(params: {
       });
     }),
   );
-  const statusByChannel = new Map(statusEntries.map((entry) => [entry.channel, entry]));
+  const statusByChannel = new Map(
+    statusEntries.map((entry: ChannelSetupStatus) => [entry.channel, entry]),
+  );
   const fallbackStatuses = listChatChannels()
     .filter((meta) => shouldShowChannelInSetup(meta))
     .filter((meta) => !statusByChannel.has(meta.id))
diff --git a/src/flows/channel-setup.ts b/src/flows/channel-setup.ts
@@ -4,8 +4,13 @@ import { getBundledChannelSetupPlugin } from "../channels/plugins/bundled.js";
 import { resolveChannelDefaultAccountId } from "../channels/plugins/helpers.js";
 import { listActiveChannelSetupPlugins } from "../channels/plugins/setup-registry.js";
 import type {
+  ChannelOnboardingPostWriteHook,
+  ChannelSetupConfiguredResult,
   ChannelSetupPlugin,
+  ChannelSetupResult,
+  ChannelSetupStatus,
   ChannelSetupWizardAdapter,
+  SetupChannelsOptions,
 } from "../channels/plugins/setup-wizard-types.js";
 import { formatCliCommand } from "../cli/command-format.js";
 import {
@@ -21,13 +26,6 @@ import {
   getTrustedChannelPluginCatalogEntry,
   listTrustedChannelPluginCatalogEntries,
 } from "../commands/channel-setup/trusted-catalog.js";
-import type {
-  ChannelSetupConfiguredResult,
-  ChannelSetupResult,
-  ChannelSetupStatus,
-  ChannelOnboardingPostWriteHook,
-  SetupChannelsOptions,
-} from "../commands/channel-setup/types.js";
 import type { ChannelChoice } from "../commands/onboard-types.js";
 import { isChannelConfigured } from "../config/channel-configured.js";
 import type { OpenClawConfig } from "../config/types.openclaw.js";
@@ -53,7 +51,6 @@ import {
   resolveChannelSetupSelectionContributions,
   resolveQuickstartDefault,
 } from "./channel-setup.status.js";
-export { noteChannelStatus } from "./channel-setup.status.js";
 
 export function createChannelOnboardingPostWriteHookCollector() {
   const hooks = new Map<string, ChannelOnboardingPostWriteHook>();
