diff --git a/extensions/telegram/src/accounts.ts b/extensions/telegram/src/accounts.ts index d29922679d2..bb9379cd419 100644 --- a/extensions/telegram/src/accounts.ts +++ b/extensions/telegram/src/accounts.ts @@ -10,13 +10,12 @@ import { resolveAccountWithDefaultFallback, type OpenClawConfig, } from "openclaw/plugin-sdk/account-resolution"; -import { isTruthyEnvValue } from "openclaw/plugin-sdk/infra-runtime"; import { listBoundAccountIds, resolveDefaultAgentBoundAccountId, } from "openclaw/plugin-sdk/routing"; import { formatSetExplicitDefaultInstruction } from "openclaw/plugin-sdk/routing"; -import { createSubsystemLogger } from "openclaw/plugin-sdk/runtime-env"; +import { createSubsystemLogger, isTruthyEnvValue } from "openclaw/plugin-sdk/runtime-env"; import type { TelegramAccountConfig, TelegramActionConfig } from "../runtime-api.js"; import { resolveTelegramToken } from "./token.js"; diff --git a/extensions/telegram/src/network-config.test.ts b/extensions/telegram/src/network-config.test.ts index 94efd1c2884..855e026f1b0 100644 --- a/extensions/telegram/src/network-config.test.ts +++ b/extensions/telegram/src/network-config.test.ts @@ -1,22 +1,22 @@ import { afterEach, beforeEach, describe, expect, it, vi } from "vitest"; import type { TelegramNetworkConfig } from "../../../src/config/types.telegram.js"; -vi.mock("openclaw/plugin-sdk/infra-runtime", async (importOriginal) => { - const actual = await importOriginal(); +vi.mock("openclaw/plugin-sdk/runtime-env", async (importOriginal) => { + const actual = await importOriginal(); return { ...actual, isWSL2Sync: vi.fn(() => false), }; }); -let isWSL2Sync: typeof import("openclaw/plugin-sdk/infra-runtime").isWSL2Sync; +let isWSL2Sync: typeof import("openclaw/plugin-sdk/runtime-env").isWSL2Sync; let resetTelegramNetworkConfigStateForTests: typeof import("./network-config.js").resetTelegramNetworkConfigStateForTests; let resolveTelegramAutoSelectFamilyDecision: typeof import("./network-config.js").resolveTelegramAutoSelectFamilyDecision; let resolveTelegramDnsResultOrderDecision: typeof import("./network-config.js").resolveTelegramDnsResultOrderDecision; async function loadModule() { vi.resetModules(); - ({ isWSL2Sync } = await import("openclaw/plugin-sdk/infra-runtime")); + ({ isWSL2Sync } = await import("openclaw/plugin-sdk/runtime-env")); ({ resetTelegramNetworkConfigStateForTests, resolveTelegramAutoSelectFamilyDecision, @@ -132,7 +132,7 @@ describe("resolveTelegramAutoSelectFamilyDecision", () => { }, ])("$name", ({ env, network, expected, wsl2 = true }) => { if (!isWSL2Sync) { - throw new Error("infra-runtime mock not loaded"); + throw new Error("runtime-env mock not loaded"); } vi.mocked(isWSL2Sync).mockReturnValue(wsl2); const decision = resolveTelegramAutoSelectFamilyDecision({ diff --git a/extensions/telegram/src/network-config.ts b/extensions/telegram/src/network-config.ts index a37a8656203..32a716be563 100644 --- a/extensions/telegram/src/network-config.ts +++ b/extensions/telegram/src/network-config.ts @@ -1,7 +1,6 @@ import process from "node:process"; import type { TelegramNetworkConfig } from "openclaw/plugin-sdk/config-runtime"; -import { isTruthyEnvValue } from "openclaw/plugin-sdk/infra-runtime"; -import { isWSL2Sync } from "openclaw/plugin-sdk/infra-runtime"; +import { isTruthyEnvValue, isWSL2Sync } from "openclaw/plugin-sdk/runtime-env"; export const TELEGRAM_DISABLE_AUTO_SELECT_FAMILY_ENV = "OPENCLAW_TELEGRAM_DISABLE_AUTO_SELECT_FAMILY"; diff --git a/src/plugin-sdk/runtime-env.ts b/src/plugin-sdk/runtime-env.ts index c72ad22c33f..89ae2aa47fd 100644 --- a/src/plugin-sdk/runtime-env.ts +++ b/src/plugin-sdk/runtime-env.ts @@ -16,6 +16,7 @@ export { success, warn, } from "../globals.js"; +export { isTruthyEnvValue } from "../infra/env.js"; export * from "../logging.js"; export { waitForAbortSignal } from "../infra/abort-signal.js"; export { retryAsync } from "../infra/retry.js";