refactor: remove type-only import cycles

Author: steipete

docs/.generated/plugin-sdk-api-baseline.sha256

@@ -1,2 +1,2 @@
-268aca42eaae8b4dd37d7eddb7202d002db16a4a27830cd90d98b5c4413cbbe7  plugin-sdk-api-baseline.json
-4fe4fc194bec72a58bdd5566c4b31c00b2c0a520941fdcdd0f42bdf02b683ea5  plugin-sdk-api-baseline.jsonl
+70ecd040dd5815b237eb749db2de98e300fd53630e5b418deea0865b781adf4a  plugin-sdk-api-baseline.json
+7a7b08495662e48d466a1c7cb20d6e81557df05d361de0bebc54369e34dffa35  plugin-sdk-api-baseline.jsonl

src/agents/auth-profiles/types.ts

@@ -1,4 +1,4 @@
-import type { OpenClawConfig } from "../../config/config.js";
+import type { OpenClawConfig } from "../../config/types.openclaw.js";
 import type { SecretRef } from "../../config/types.secrets.js";
 
 export type OAuthProvider = string;

src/auto-reply/chunk.ts

@@ -2,8 +2,8 @@
 // unintentionally breaking on newlines. Using [\s\S] keeps newlines inside
 // the chunk so messages are only split when they truly exceed the limit.
 
-import type { ChannelId } from "../channels/plugins/types.js";
-import type { OpenClawConfig } from "../config/config.js";
+import type { ChannelId } from "../channels/plugins/types.core.js";
+import type { OpenClawConfig } from "../config/types.openclaw.js";
 import { findFenceSpanAt, isSafeFenceBreak, parseFenceSpans } from "../markdown/fences.js";
 import { resolveChannelStreamingChunkMode } from "../plugin-sdk/channel-streaming.js";
 import { resolveAccountEntry } from "../routing/account-lookup.js";

src/auto-reply/commands-args.types.ts

@@ -0,0 +1,7 @@
+export type CommandArgValue = string | number | boolean | bigint;
+export type CommandArgValues = Record<string, CommandArgValue>;
+
+export type CommandArgs = {
+  raw?: string;
+  values?: CommandArgValues;
+};

src/auto-reply/commands-registry.types.ts

@@ -1,4 +1,7 @@
 import type { OpenClawConfig } from "../config/types.js";
+import type { CommandArgValues } from "./commands-args.types.js";
+
+export type { CommandArgValue, CommandArgValues, CommandArgs } from "./commands-args.types.js";
 
 export type CommandScope = "text" | "native" | "both";
 
@@ -40,14 +43,6 @@ export type CommandArgMenuSpec = {
   title?: string;
 };
 
-export type CommandArgValue = string | number | boolean | bigint;
-export type CommandArgValues = Record<string, CommandArgValue>;
-
-export type CommandArgs = {
-  raw?: string;
-  values?: CommandArgValues;
-};
-
 export type CommandArgsParsing = "none" | "positional";
 
 export type ChatCommandDefinition = {

src/auto-reply/reply/commands-types.ts

@@ -6,7 +6,7 @@ import type { SessionEntry, SessionScope } from "../../config/sessions.js";
 import type { MsgContext } from "../templating.js";
 import type { ElevatedLevel, ReasoningLevel, ThinkLevel, VerboseLevel } from "../thinking.js";
 import type { GetReplyOptions, ReplyPayload } from "../types.js";
-import type { InlineDirectives } from "./directive-handling.js";
+import type { InlineDirectives } from "./directive-handling.parse.js";
 import type { TypingController } from "./typing.js";
 
 export type CommandContext = {

src/auto-reply/templating.ts

@@ -1,14 +1,13 @@
-import type { ChannelId } from "../channels/plugins/types.js";
 import type {
   MediaUnderstandingDecision,
   MediaUnderstandingOutput,
 } from "../media-understanding/types.js";
 import type { InputProvenance } from "../sessions/input-provenance.js";
-import type { CommandArgs } from "./commands-registry.types.js";
+import type { CommandArgs } from "./commands-args.types.js";
 import type { ReplyThreadingPolicy } from "./types.js";
 
 /** Valid message channels for routing. */
-export type OriginatingChannelType = ChannelId;
+export type OriginatingChannelType = string & { readonly __originatingChannelBrand?: never };
 
 export type StickerContextMetadata = {
   cachedDescription?: string;

src/channels/plugins/config-write-policy-shared.ts

@@ -1,4 +1,3 @@
-import type { OpenClawConfig } from "../../config/config.js";
 import { resolveAccountEntry } from "../../routing/account-lookup.js";
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "../../routing/session-key.js";
 
@@ -11,6 +10,10 @@ type ChannelConfigWithAccounts = {
   accounts?: Record<string, AccountConfigWithWrites>;
 };
 
+type ConfigWritePolicyConfig = {
+  channels?: Record<string, ChannelConfigWithAccounts>;
+};
+
 export type ConfigWriteScopeLike<TChannelId extends string = string> = {
   channelId?: TChannelId | null;
   accountId?: string | null;
@@ -46,13 +49,13 @@ function listConfigWriteTargetScopes<TChannelId extends string>(
 }
 
 function resolveChannelConfig<TChannelId extends string>(
-  cfg: OpenClawConfig,
+  cfg: ConfigWritePolicyConfig,
   channelId?: TChannelId | null,
 ): ChannelConfigWithAccounts | undefined {
   if (!channelId) {
     return undefined;
   }
-  return (cfg.channels as Record<string, ChannelConfigWithAccounts> | undefined)?.[channelId];
+  return cfg.channels?.[channelId];
 }
 
 function resolveChannelAccountConfig(
@@ -63,7 +66,7 @@ function resolveChannelAccountConfig(
 }
 
 export function resolveChannelConfigWritesShared<TChannelId extends string>(params: {
-  cfg: OpenClawConfig;
+  cfg: ConfigWritePolicyConfig;
   channelId?: TChannelId | null;
   accountId?: string | null;
 }): boolean {
@@ -77,7 +80,7 @@ export function resolveChannelConfigWritesShared<TChannelId extends string>(para
 }
 
 export function authorizeConfigWriteShared<TChannelId extends string>(params: {
-  cfg: OpenClawConfig;
+  cfg: ConfigWritePolicyConfig;
   origin?: ConfigWriteScopeLike<TChannelId>;
   target?: ConfigWriteTargetLike<TChannelId>;
   allowBypass?: boolean;

src/channels/plugins/config-writes.ts

@@ -1,6 +1,5 @@
-import type { OpenClawConfig } from "../../config/config.js";
+import type { OpenClawConfig } from "../../config/types.openclaw.js";
 import { normalizeLowercaseStringOrEmpty } from "../../shared/string-coerce.js";
-import { isInternalMessageChannel } from "../../utils/message-channel.js";
 import {
   authorizeConfigWriteShared,
   canBypassConfigWritePolicyShared,
@@ -12,11 +11,15 @@ import {
   type ConfigWriteScopeLike,
   type ConfigWriteTargetLike,
 } from "./config-write-policy-shared.js";
-import type { ChannelId } from "./types.js";
+import type { ChannelId } from "./types.core.js";
 export type ConfigWriteScope = ConfigWriteScopeLike<ChannelId>;
 export type ConfigWriteTarget = ConfigWriteTargetLike<ChannelId>;
 export type ConfigWriteAuthorizationResult = ConfigWriteAuthorizationResultLike<ChannelId>;
 
+function isInternalConfigWriteMessageChannel(channel?: string | null): boolean {
+  return normalizeLowercaseStringOrEmpty(channel) === "webchat";
+}
+
 export function resolveChannelConfigWrites(params: {
   cfg: OpenClawConfig;
   channelId?: ChannelId | null;
@@ -51,7 +54,7 @@ export function canBypassConfigWritePolicy(params: {
 }): boolean {
   return canBypassConfigWritePolicyShared({
     ...params,
-    isInternalMessageChannel,
+    isInternalMessageChannel: isInternalConfigWriteMessageChannel,
   });
 }
 

src/channels/plugins/setup-group-access.ts

@@ -1,10 +1,12 @@
 import type { WizardPrompter } from "../../wizard/prompts.js";
-import { splitSetupEntries } from "./setup-wizard-helpers.js";
 
 export type ChannelAccessPolicy = "allowlist" | "open" | "disabled";
 
 export function parseAllowlistEntries(raw: string): string[] {
-  return splitSetupEntries(String(raw ?? ""));
+  return String(raw ?? "")
+    .split(/[\n,;]+/g)
+    .map((entry) => entry.trim())
+    .filter(Boolean);
 }
 
 export function formatAllowlistEntries(entries: string[]): string {