From c5c2416ec2a671072c9474c5a45e5be3abc4e75a Mon Sep 17 00:00:00 2001 From: Gustavo Madeira Santana Date: Thu, 19 Mar 2026 02:03:17 -0400 Subject: [PATCH] Matrix: restore local sdk barrel imports --- extensions/matrix/src/actions.ts | 6 ++--- extensions/matrix/src/cli.ts | 6 +---- extensions/matrix/src/config-schema.ts | 6 +---- extensions/matrix/src/directory-live.ts | 2 +- extensions/matrix/src/group-mentions.ts | 2 +- .../matrix/src/matrix/account-config.ts | 2 +- extensions/matrix/src/matrix/accounts.ts | 10 ++++---- extensions/matrix/src/matrix/client/config.ts | 14 +++++------ .../src/matrix/client/file-sync-store.ts | 2 +- .../matrix/src/matrix/client/storage.ts | 2 +- extensions/matrix/src/matrix/config-update.ts | 2 +- extensions/matrix/src/matrix/credentials.ts | 2 +- extensions/matrix/src/matrix/deps.ts | 2 +- .../matrix/src/matrix/monitor/ack-config.ts | 2 +- .../matrix/src/matrix/monitor/allowlist.ts | 2 +- .../matrix/src/matrix/monitor/auto-join.ts | 2 +- .../matrix/src/matrix/monitor/config.ts | 4 ++-- .../matrix/src/matrix/monitor/events.ts | 2 +- .../matrix/monitor/handler.test-helpers.ts | 2 +- .../matrix/src/matrix/monitor/handler.ts | 2 +- extensions/matrix/src/matrix/monitor/index.ts | 2 +- .../matrix/monitor/legacy-crypto-restore.ts | 2 +- .../matrix/src/matrix/monitor/location.ts | 2 +- .../src/matrix/monitor/reaction-events.ts | 2 +- .../matrix/src/matrix/monitor/replies.ts | 2 +- extensions/matrix/src/matrix/monitor/rooms.ts | 2 +- extensions/matrix/src/matrix/monitor/route.ts | 2 +- .../matrix/monitor/startup-verification.ts | 2 +- .../matrix/src/matrix/monitor/startup.ts | 2 +- extensions/matrix/src/matrix/poll-types.ts | 2 +- extensions/matrix/src/matrix/probe.ts | 2 +- extensions/matrix/src/matrix/sdk/logger.ts | 2 +- extensions/matrix/src/matrix/send.ts | 2 +- .../matrix/src/matrix/thread-bindings.ts | 2 +- extensions/matrix/src/onboarding.ts | 24 +++++++++---------- extensions/matrix/src/outbound.ts | 2 +- extensions/matrix/src/profile-update.ts | 2 +- extensions/matrix/src/resolve-targets.ts | 6 ++--- extensions/matrix/src/runtime.ts | 2 +- extensions/matrix/src/setup-bootstrap.ts | 2 +- extensions/matrix/src/setup-config.ts | 6 ++--- extensions/matrix/src/tool-actions.ts | 16 ++++++------- extensions/matrix/src/types.ts | 2 +- 43 files changed, 78 insertions(+), 86 deletions(-) diff --git a/extensions/matrix/src/actions.ts b/extensions/matrix/src/actions.ts index 57f19b938df..28e2e968d02 100644 --- a/extensions/matrix/src/actions.ts +++ b/extensions/matrix/src/actions.ts @@ -1,4 +1,6 @@ import { Type } from "@sinclair/typebox"; +import { requiresExplicitMatrixDefaultAccount } from "./account-selection.js"; +import { resolveDefaultMatrixAccountId, resolveMatrixAccount } from "./matrix/accounts.js"; import { createActionGate, readNumberParam, @@ -8,9 +10,7 @@ import { type ChannelMessageActionName, type ChannelMessageToolDiscovery, type ChannelToolSend, -} from "openclaw/plugin-sdk/matrix"; -import { requiresExplicitMatrixDefaultAccount } from "./account-selection.js"; -import { resolveDefaultMatrixAccountId, resolveMatrixAccount } from "./matrix/accounts.js"; +} from "./runtime-api.js"; import type { CoreConfig } from "./types.js"; const MATRIX_PLUGIN_HANDLED_ACTIONS = new Set([ diff --git a/extensions/matrix/src/cli.ts b/extensions/matrix/src/cli.ts index 9fc08308d35..5f8de9bda46 100644 --- a/extensions/matrix/src/cli.ts +++ b/extensions/matrix/src/cli.ts @@ -1,9 +1,4 @@ import type { Command } from "commander"; -import { - formatZonedTimestamp, - normalizeAccountId, - type ChannelSetupInput, -} from "openclaw/plugin-sdk/matrix"; import { resolveMatrixAccount, resolveMatrixAccountConfig } from "./matrix/accounts.js"; import { withResolvedActionClient, withStartedActionClient } from "./matrix/actions/client.js"; import { listMatrixOwnDevices, pruneMatrixStaleGatewayDevices } from "./matrix/actions/devices.js"; @@ -27,6 +22,7 @@ import { type MatrixDirectRoomCandidate, } from "./matrix/direct-management.js"; import { applyMatrixProfileUpdate, type MatrixProfileUpdateResult } from "./profile-update.js"; +import { formatZonedTimestamp, normalizeAccountId, type ChannelSetupInput } from "./runtime-api.js"; import { getMatrixRuntime } from "./runtime.js"; import { maybeBootstrapNewEncryptedMatrixAccount } from "./setup-bootstrap.js"; import { matrixSetupAdapter } from "./setup-core.js"; diff --git a/extensions/matrix/src/config-schema.ts b/extensions/matrix/src/config-schema.ts index 82d186dfa37..b4685098e13 100644 --- a/extensions/matrix/src/config-schema.ts +++ b/extensions/matrix/src/config-schema.ts @@ -4,12 +4,8 @@ import { DmPolicySchema, GroupPolicySchema, } from "openclaw/plugin-sdk/channel-config-schema"; -import { - buildSecretInputSchema, - MarkdownConfigSchema, - ToolPolicySchema, -} from "openclaw/plugin-sdk/matrix"; import { z } from "zod"; +import { buildSecretInputSchema, MarkdownConfigSchema, ToolPolicySchema } from "./runtime-api.js"; const matrixActionSchema = z .object({ diff --git a/extensions/matrix/src/directory-live.ts b/extensions/matrix/src/directory-live.ts index 32f8bc36bee..43ac9e4de7e 100644 --- a/extensions/matrix/src/directory-live.ts +++ b/extensions/matrix/src/directory-live.ts @@ -1,7 +1,7 @@ -import type { ChannelDirectoryEntry } from "openclaw/plugin-sdk/matrix"; import { resolveMatrixAuth } from "./matrix/client.js"; import { MatrixAuthedHttpClient } from "./matrix/sdk/http-client.js"; import { isMatrixQualifiedUserId, normalizeMatrixMessagingTarget } from "./matrix/target-ids.js"; +import type { ChannelDirectoryEntry } from "./runtime-api.js"; type MatrixUserResult = { user_id?: string; diff --git a/extensions/matrix/src/group-mentions.ts b/extensions/matrix/src/group-mentions.ts index debbdf2d0a1..400fc76428a 100644 --- a/extensions/matrix/src/group-mentions.ts +++ b/extensions/matrix/src/group-mentions.ts @@ -1,7 +1,7 @@ -import type { ChannelGroupContext, GroupToolPolicyConfig } from "openclaw/plugin-sdk/matrix"; import { resolveMatrixAccountConfig } from "./matrix/accounts.js"; import { resolveMatrixRoomConfig } from "./matrix/monitor/rooms.js"; import { normalizeMatrixResolvableTarget } from "./matrix/target-ids.js"; +import type { ChannelGroupContext, GroupToolPolicyConfig } from "./runtime-api.js"; import type { CoreConfig } from "./types.js"; function resolveMatrixRoomConfigForGroup(params: ChannelGroupContext) { diff --git a/extensions/matrix/src/matrix/account-config.ts b/extensions/matrix/src/matrix/account-config.ts index 8f8c65b428e..9e662c392cf 100644 --- a/extensions/matrix/src/matrix/account-config.ts +++ b/extensions/matrix/src/matrix/account-config.ts @@ -1,5 +1,5 @@ import { normalizeAccountId } from "openclaw/plugin-sdk/account-id"; -import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/matrix"; +import { DEFAULT_ACCOUNT_ID } from "../runtime-api.js"; import type { CoreConfig, MatrixAccountConfig, MatrixConfig } from "../types.js"; export function resolveMatrixBaseConfig(cfg: CoreConfig): MatrixConfig { diff --git a/extensions/matrix/src/matrix/accounts.ts b/extensions/matrix/src/matrix/accounts.ts index 6be14694814..d0039664ac8 100644 --- a/extensions/matrix/src/matrix/accounts.ts +++ b/extensions/matrix/src/matrix/accounts.ts @@ -1,12 +1,12 @@ -import { - DEFAULT_ACCOUNT_ID, - hasConfiguredSecretInput, - normalizeAccountId, -} from "openclaw/plugin-sdk/matrix"; import { resolveConfiguredMatrixAccountIds, resolveMatrixDefaultOrOnlyAccountId, } from "../account-selection.js"; +import { + DEFAULT_ACCOUNT_ID, + hasConfiguredSecretInput, + normalizeAccountId, +} from "../runtime-api.js"; import type { CoreConfig, MatrixConfig } from "../types.js"; import { findMatrixAccountConfig, resolveMatrixBaseConfig } from "./account-config.js"; import { resolveMatrixConfigForAccount } from "./client.js"; diff --git a/extensions/matrix/src/matrix/client/config.ts b/extensions/matrix/src/matrix/client/config.ts index 8089d5c0e5a..6d137677657 100644 --- a/extensions/matrix/src/matrix/client/config.ts +++ b/extensions/matrix/src/matrix/client/config.ts @@ -1,16 +1,16 @@ -import { - DEFAULT_ACCOUNT_ID, - isPrivateOrLoopbackHost, - normalizeAccountId, - normalizeOptionalAccountId, - normalizeResolvedSecretInputString, -} from "openclaw/plugin-sdk/matrix"; import { requiresExplicitMatrixDefaultAccount, resolveMatrixDefaultOrOnlyAccountId, } from "../../account-selection.js"; import { resolveMatrixAccountStringValues } from "../../auth-precedence.js"; import { getMatrixScopedEnvVarNames } from "../../env-vars.js"; +import { + DEFAULT_ACCOUNT_ID, + isPrivateOrLoopbackHost, + normalizeAccountId, + normalizeOptionalAccountId, + normalizeResolvedSecretInputString, +} from "../../runtime-api.js"; import { getMatrixRuntime } from "../../runtime.js"; import type { CoreConfig } from "../../types.js"; import { diff --git a/extensions/matrix/src/matrix/client/file-sync-store.ts b/extensions/matrix/src/matrix/client/file-sync-store.ts index 70c6ea5831a..9f1d0599569 100644 --- a/extensions/matrix/src/matrix/client/file-sync-store.ts +++ b/extensions/matrix/src/matrix/client/file-sync-store.ts @@ -7,7 +7,7 @@ import { type ISyncResponse, type IStoredClientOpts, } from "matrix-js-sdk"; -import { writeJsonFileAtomically } from "openclaw/plugin-sdk/matrix"; +import { writeJsonFileAtomically } from "../../runtime-api.js"; import { LogService } from "../sdk/logger.js"; const STORE_VERSION = 1; diff --git a/extensions/matrix/src/matrix/client/storage.ts b/extensions/matrix/src/matrix/client/storage.ts index e6671de82c2..887834e0122 100644 --- a/extensions/matrix/src/matrix/client/storage.ts +++ b/extensions/matrix/src/matrix/client/storage.ts @@ -1,11 +1,11 @@ import fs from "node:fs"; import os from "node:os"; import path from "node:path"; -import { maybeCreateMatrixMigrationSnapshot, normalizeAccountId } from "openclaw/plugin-sdk/matrix"; import { requiresExplicitMatrixDefaultAccount, resolveMatrixDefaultOrOnlyAccountId, } from "../../account-selection.js"; +import { maybeCreateMatrixMigrationSnapshot, normalizeAccountId } from "../../runtime-api.js"; import { getMatrixRuntime } from "../../runtime.js"; import { resolveMatrixAccountStorageRoot, diff --git a/extensions/matrix/src/matrix/config-update.ts b/extensions/matrix/src/matrix/config-update.ts index 452f9e38722..1531306e0ab 100644 --- a/extensions/matrix/src/matrix/config-update.ts +++ b/extensions/matrix/src/matrix/config-update.ts @@ -1,5 +1,5 @@ import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-id"; -import { normalizeAccountId } from "openclaw/plugin-sdk/matrix"; +import { normalizeAccountId } from "../runtime-api.js"; import type { CoreConfig, MatrixConfig } from "../types.js"; import { findMatrixAccountConfig } from "./account-config.js"; diff --git a/extensions/matrix/src/matrix/credentials.ts b/extensions/matrix/src/matrix/credentials.ts index 8efa77e45f4..eaccd0ed487 100644 --- a/extensions/matrix/src/matrix/credentials.ts +++ b/extensions/matrix/src/matrix/credentials.ts @@ -2,11 +2,11 @@ import fs from "node:fs"; import os from "node:os"; import path from "node:path"; import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id"; -import { writeJsonFileAtomically } from "openclaw/plugin-sdk/matrix"; import { requiresExplicitMatrixDefaultAccount, resolveMatrixDefaultOrOnlyAccountId, } from "../account-selection.js"; +import { writeJsonFileAtomically } from "../runtime-api.js"; import { getMatrixRuntime } from "../runtime.js"; import { resolveMatrixCredentialsDir as resolveSharedMatrixCredentialsDir, diff --git a/extensions/matrix/src/matrix/deps.ts b/extensions/matrix/src/matrix/deps.ts index a62a58bb65f..ef9c4514bc3 100644 --- a/extensions/matrix/src/matrix/deps.ts +++ b/extensions/matrix/src/matrix/deps.ts @@ -3,7 +3,7 @@ import fs from "node:fs"; import { createRequire } from "node:module"; import path from "node:path"; import { fileURLToPath } from "node:url"; -import type { RuntimeEnv } from "openclaw/plugin-sdk/matrix"; +import type { RuntimeEnv } from "../runtime-api.js"; const REQUIRED_MATRIX_PACKAGES = ["matrix-js-sdk", "@matrix-org/matrix-sdk-crypto-nodejs"]; diff --git a/extensions/matrix/src/matrix/monitor/ack-config.ts b/extensions/matrix/src/matrix/monitor/ack-config.ts index c7d8b668f14..a79d0a15968 100644 --- a/extensions/matrix/src/matrix/monitor/ack-config.ts +++ b/extensions/matrix/src/matrix/monitor/ack-config.ts @@ -1,4 +1,4 @@ -import { resolveAckReaction, type OpenClawConfig } from "openclaw/plugin-sdk/matrix"; +import { resolveAckReaction, type OpenClawConfig } from "../../runtime-api.js"; import type { CoreConfig } from "../../types.js"; import { resolveMatrixAccountConfig } from "../accounts.js"; diff --git a/extensions/matrix/src/matrix/monitor/allowlist.ts b/extensions/matrix/src/matrix/monitor/allowlist.ts index 5d96f223874..12ebd3d9f87 100644 --- a/extensions/matrix/src/matrix/monitor/allowlist.ts +++ b/extensions/matrix/src/matrix/monitor/allowlist.ts @@ -2,7 +2,7 @@ import { normalizeStringEntries, resolveAllowlistMatchByCandidates, type AllowlistMatch, -} from "openclaw/plugin-sdk/matrix"; +} from "../../runtime-api.js"; function normalizeAllowList(list?: Array) { return normalizeStringEntries(list); diff --git a/extensions/matrix/src/matrix/monitor/auto-join.ts b/extensions/matrix/src/matrix/monitor/auto-join.ts index 79dfc30f976..e2f7eb7fa0f 100644 --- a/extensions/matrix/src/matrix/monitor/auto-join.ts +++ b/extensions/matrix/src/matrix/monitor/auto-join.ts @@ -1,4 +1,4 @@ -import type { RuntimeEnv } from "openclaw/plugin-sdk/matrix"; +import type { RuntimeEnv } from "../../runtime-api.js"; import { getMatrixRuntime } from "../../runtime.js"; import type { MatrixConfig } from "../../types.js"; import type { MatrixClient } from "../sdk.js"; diff --git a/extensions/matrix/src/matrix/monitor/config.ts b/extensions/matrix/src/matrix/monitor/config.ts index 5a9086dd7ba..9995c1546ce 100644 --- a/extensions/matrix/src/matrix/monitor/config.ts +++ b/extensions/matrix/src/matrix/monitor/config.ts @@ -1,3 +1,4 @@ +import { resolveMatrixTargets } from "../../resolve-targets.js"; import { addAllowlistUserEntriesFromConfigEntry, buildAllowlistResolutionSummary, @@ -5,8 +6,7 @@ import { patchAllowlistUsersInConfigEntries, summarizeMapping, type RuntimeEnv, -} from "openclaw/plugin-sdk/matrix"; -import { resolveMatrixTargets } from "../../resolve-targets.js"; +} from "../../runtime-api.js"; import type { CoreConfig, MatrixRoomConfig } from "../../types.js"; import { normalizeMatrixUserId } from "./allowlist.js"; diff --git a/extensions/matrix/src/matrix/monitor/events.ts b/extensions/matrix/src/matrix/monitor/events.ts index 42b3167ad6a..81c000e8c58 100644 --- a/extensions/matrix/src/matrix/monitor/events.ts +++ b/extensions/matrix/src/matrix/monitor/events.ts @@ -1,4 +1,4 @@ -import type { PluginRuntime, RuntimeLogger } from "openclaw/plugin-sdk/matrix"; +import type { PluginRuntime, RuntimeLogger } from "../../runtime-api.js"; import type { CoreConfig } from "../../types.js"; import type { MatrixAuth } from "../client.js"; import { formatMatrixEncryptedEventDisabledWarning } from "../encryption-guidance.js"; diff --git a/extensions/matrix/src/matrix/monitor/handler.test-helpers.ts b/extensions/matrix/src/matrix/monitor/handler.test-helpers.ts index 834b7e110a7..a39b9efec06 100644 --- a/extensions/matrix/src/matrix/monitor/handler.test-helpers.ts +++ b/extensions/matrix/src/matrix/monitor/handler.test-helpers.ts @@ -1,5 +1,5 @@ -import type { RuntimeEnv, RuntimeLogger } from "openclaw/plugin-sdk/matrix"; import { vi } from "vitest"; +import type { RuntimeEnv, RuntimeLogger } from "../../runtime-api.js"; import type { MatrixRoomConfig, ReplyToMode } from "../../types.js"; import type { MatrixClient } from "../sdk.js"; import { createMatrixRoomMessageHandler, type MatrixMonitorHandlerParams } from "./handler.js"; diff --git a/extensions/matrix/src/matrix/monitor/handler.ts b/extensions/matrix/src/matrix/monitor/handler.ts index 066c9cdf39a..c2b909bdf5c 100644 --- a/extensions/matrix/src/matrix/monitor/handler.ts +++ b/extensions/matrix/src/matrix/monitor/handler.ts @@ -11,7 +11,7 @@ import { type ReplyPayload, type RuntimeEnv, type RuntimeLogger, -} from "openclaw/plugin-sdk/matrix"; +} from "../../runtime-api.js"; import type { CoreConfig, MatrixRoomConfig, ReplyToMode } from "../../types.js"; import { formatMatrixMediaUnavailableText } from "../media-text.js"; import { fetchMatrixPollSnapshot } from "../poll-summary.js"; diff --git a/extensions/matrix/src/matrix/monitor/index.ts b/extensions/matrix/src/matrix/monitor/index.ts index 8eff9f740f6..cb0b22734be 100644 --- a/extensions/matrix/src/matrix/monitor/index.ts +++ b/extensions/matrix/src/matrix/monitor/index.ts @@ -7,7 +7,7 @@ import { resolveDefaultGroupPolicy, warnMissingProviderGroupPolicyFallbackOnce, type RuntimeEnv, -} from "openclaw/plugin-sdk/matrix"; +} from "../../runtime-api.js"; import { getMatrixRuntime } from "../../runtime.js"; import type { CoreConfig, ReplyToMode } from "../../types.js"; import { resolveMatrixAccount } from "../accounts.js"; diff --git a/extensions/matrix/src/matrix/monitor/legacy-crypto-restore.ts b/extensions/matrix/src/matrix/monitor/legacy-crypto-restore.ts index f4d17f400a1..0ec7b5c4193 100644 --- a/extensions/matrix/src/matrix/monitor/legacy-crypto-restore.ts +++ b/extensions/matrix/src/matrix/monitor/legacy-crypto-restore.ts @@ -1,7 +1,7 @@ import fs from "node:fs/promises"; import os from "node:os"; import path from "node:path"; -import { readJsonFileWithFallback, writeJsonFileAtomically } from "openclaw/plugin-sdk/matrix"; +import { readJsonFileWithFallback, writeJsonFileAtomically } from "../../runtime-api.js"; import { getMatrixRuntime } from "../../runtime.js"; import { resolveMatrixStoragePaths } from "../client/storage.js"; import type { MatrixAuth } from "../client/types.js"; diff --git a/extensions/matrix/src/matrix/monitor/location.ts b/extensions/matrix/src/matrix/monitor/location.ts index bb22f0536a8..e12565cb70c 100644 --- a/extensions/matrix/src/matrix/monitor/location.ts +++ b/extensions/matrix/src/matrix/monitor/location.ts @@ -2,7 +2,7 @@ import { formatLocationText, toLocationContext, type NormalizedLocation, -} from "openclaw/plugin-sdk/matrix"; +} from "../../runtime-api.js"; import type { LocationMessageEventContent } from "../sdk.js"; import { EventType } from "./types.js"; diff --git a/extensions/matrix/src/matrix/monitor/reaction-events.ts b/extensions/matrix/src/matrix/monitor/reaction-events.ts index 2eef8f06f39..51d807a26c3 100644 --- a/extensions/matrix/src/matrix/monitor/reaction-events.ts +++ b/extensions/matrix/src/matrix/monitor/reaction-events.ts @@ -1,4 +1,4 @@ -import type { PluginRuntime } from "openclaw/plugin-sdk/matrix"; +import type { PluginRuntime } from "../../runtime-api.js"; import type { CoreConfig } from "../../types.js"; import { resolveMatrixAccountConfig } from "../accounts.js"; import { extractMatrixReactionAnnotation } from "../reaction-common.js"; diff --git a/extensions/matrix/src/matrix/monitor/replies.ts b/extensions/matrix/src/matrix/monitor/replies.ts index 8874b688591..182d7d208f5 100644 --- a/extensions/matrix/src/matrix/monitor/replies.ts +++ b/extensions/matrix/src/matrix/monitor/replies.ts @@ -3,7 +3,7 @@ import type { OpenClawConfig, ReplyPayload, RuntimeEnv, -} from "openclaw/plugin-sdk/matrix"; +} from "../../runtime-api.js"; import { getMatrixRuntime } from "../../runtime.js"; import type { MatrixClient } from "../sdk.js"; import { sendMessageMatrix } from "../send.js"; diff --git a/extensions/matrix/src/matrix/monitor/rooms.ts b/extensions/matrix/src/matrix/monitor/rooms.ts index 828a1f56955..9ee5091acf7 100644 --- a/extensions/matrix/src/matrix/monitor/rooms.ts +++ b/extensions/matrix/src/matrix/monitor/rooms.ts @@ -1,4 +1,4 @@ -import { buildChannelKeyCandidates, resolveChannelEntryMatch } from "openclaw/plugin-sdk/matrix"; +import { buildChannelKeyCandidates, resolveChannelEntryMatch } from "../../runtime-api.js"; import type { MatrixRoomConfig } from "../../types.js"; export type MatrixRoomConfigResolved = { diff --git a/extensions/matrix/src/matrix/monitor/route.ts b/extensions/matrix/src/matrix/monitor/route.ts index 5144f11bd59..6f280ab40dc 100644 --- a/extensions/matrix/src/matrix/monitor/route.ts +++ b/extensions/matrix/src/matrix/monitor/route.ts @@ -3,7 +3,7 @@ import { resolveAgentIdFromSessionKey, resolveConfiguredAcpBindingRecord, type PluginRuntime, -} from "openclaw/plugin-sdk/matrix"; +} from "../../runtime-api.js"; import type { CoreConfig } from "../../types.js"; type MatrixResolvedRoute = ReturnType; diff --git a/extensions/matrix/src/matrix/monitor/startup-verification.ts b/extensions/matrix/src/matrix/monitor/startup-verification.ts index 6bc34136674..2a43dab6aa8 100644 --- a/extensions/matrix/src/matrix/monitor/startup-verification.ts +++ b/extensions/matrix/src/matrix/monitor/startup-verification.ts @@ -1,6 +1,6 @@ import fs from "node:fs/promises"; import path from "node:path"; -import { readJsonFileWithFallback, writeJsonFileAtomically } from "openclaw/plugin-sdk/matrix"; +import { readJsonFileWithFallback, writeJsonFileAtomically } from "../../runtime-api.js"; import type { MatrixConfig } from "../../types.js"; import { resolveMatrixStoragePaths } from "../client/storage.js"; import type { MatrixAuth } from "../client/types.js"; diff --git a/extensions/matrix/src/matrix/monitor/startup.ts b/extensions/matrix/src/matrix/monitor/startup.ts index 243afa612dd..ecb5f85627a 100644 --- a/extensions/matrix/src/matrix/monitor/startup.ts +++ b/extensions/matrix/src/matrix/monitor/startup.ts @@ -1,4 +1,4 @@ -import type { RuntimeLogger } from "openclaw/plugin-sdk/matrix"; +import type { RuntimeLogger } from "../../runtime-api.js"; import type { CoreConfig, MatrixConfig } from "../../types.js"; import type { MatrixAuth } from "../client.js"; import { updateMatrixAccountConfig } from "../config-update.js"; diff --git a/extensions/matrix/src/matrix/poll-types.ts b/extensions/matrix/src/matrix/poll-types.ts index 23743df64ee..90cc2bea132 100644 --- a/extensions/matrix/src/matrix/poll-types.ts +++ b/extensions/matrix/src/matrix/poll-types.ts @@ -7,7 +7,7 @@ * - m.poll.end - Closes a poll */ -import { normalizePollInput, type PollInput } from "openclaw/plugin-sdk/matrix"; +import { normalizePollInput, type PollInput } from "../runtime-api.js"; export const M_POLL_START = "m.poll.start" as const; export const M_POLL_RESPONSE = "m.poll.response" as const; diff --git a/extensions/matrix/src/matrix/probe.ts b/extensions/matrix/src/matrix/probe.ts index 6b0b9d9aec1..44991e9aeb8 100644 --- a/extensions/matrix/src/matrix/probe.ts +++ b/extensions/matrix/src/matrix/probe.ts @@ -1,4 +1,4 @@ -import type { BaseProbeResult } from "openclaw/plugin-sdk/matrix"; +import type { BaseProbeResult } from "../runtime-api.js"; import { createMatrixClient, isBunRuntime } from "./client.js"; export type MatrixProbe = BaseProbeResult & { diff --git a/extensions/matrix/src/matrix/sdk/logger.ts b/extensions/matrix/src/matrix/sdk/logger.ts index f3f08fe7cdc..61c8c1fcfdb 100644 --- a/extensions/matrix/src/matrix/sdk/logger.ts +++ b/extensions/matrix/src/matrix/sdk/logger.ts @@ -1,5 +1,5 @@ import { format } from "node:util"; -import { redactSensitiveText, type RuntimeLogger } from "openclaw/plugin-sdk/matrix"; +import { redactSensitiveText, type RuntimeLogger } from "../../runtime-api.js"; import { getMatrixRuntime } from "../../runtime.js"; export type Logger = { diff --git a/extensions/matrix/src/matrix/send.ts b/extensions/matrix/src/matrix/send.ts index f0fcf75c6f7..4e32b95b5fd 100644 --- a/extensions/matrix/src/matrix/send.ts +++ b/extensions/matrix/src/matrix/send.ts @@ -1,4 +1,4 @@ -import type { PollInput } from "openclaw/plugin-sdk/matrix"; +import type { PollInput } from "../runtime-api.js"; import { getMatrixRuntime } from "../runtime.js"; import type { CoreConfig } from "../types.js"; import { buildPollStartContent, M_POLL_START } from "./poll-types.js"; diff --git a/extensions/matrix/src/matrix/thread-bindings.ts b/extensions/matrix/src/matrix/thread-bindings.ts index d3d8f5bf304..d69e477a20a 100644 --- a/extensions/matrix/src/matrix/thread-bindings.ts +++ b/extensions/matrix/src/matrix/thread-bindings.ts @@ -8,7 +8,7 @@ import { writeJsonFileAtomically, type BindingTargetKind, type SessionBindingRecord, -} from "openclaw/plugin-sdk/matrix"; +} from "../runtime-api.js"; import { resolveMatrixStoragePaths } from "./client/storage.js"; import type { MatrixAuth } from "./client/types.js"; import type { MatrixClient } from "./sdk.js"; diff --git a/extensions/matrix/src/onboarding.ts b/extensions/matrix/src/onboarding.ts index b79dc8ede33..62fe0613524 100644 --- a/extensions/matrix/src/onboarding.ts +++ b/extensions/matrix/src/onboarding.ts @@ -1,16 +1,4 @@ import { DEFAULT_ACCOUNT_ID } from "openclaw/plugin-sdk/account-id"; -import type { DmPolicy } from "openclaw/plugin-sdk/matrix"; -import { - addWildcardAllowFrom, - formatDocsLink, - mergeAllowFromEntries, - moveSingleAccountChannelSectionToDefaultAccount, - normalizeAccountId, - promptChannelAccessConfig, - promptAccountId, - type RuntimeEnv, - type WizardPrompter, -} from "openclaw/plugin-sdk/matrix"; import { type ChannelSetupDmPolicy, type ChannelSetupWizardAdapter, @@ -31,6 +19,18 @@ import { } from "./matrix/config-update.js"; import { ensureMatrixSdkInstalled, isMatrixSdkAvailable } from "./matrix/deps.js"; import { resolveMatrixTargets } from "./resolve-targets.js"; +import type { DmPolicy } from "./runtime-api.js"; +import { + addWildcardAllowFrom, + formatDocsLink, + mergeAllowFromEntries, + moveSingleAccountChannelSectionToDefaultAccount, + normalizeAccountId, + promptChannelAccessConfig, + promptAccountId, + type RuntimeEnv, + type WizardPrompter, +} from "./runtime-api.js"; import { runMatrixSetupBootstrapAfterConfigWrite } from "./setup-bootstrap.js"; import type { CoreConfig } from "./types.js"; diff --git a/extensions/matrix/src/outbound.ts b/extensions/matrix/src/outbound.ts index c1f5dbc6d24..5a715c54a1d 100644 --- a/extensions/matrix/src/outbound.ts +++ b/extensions/matrix/src/outbound.ts @@ -1,5 +1,5 @@ -import { resolveOutboundSendDep, type ChannelOutboundAdapter } from "openclaw/plugin-sdk/matrix"; import { sendMessageMatrix, sendPollMatrix } from "./matrix/send.js"; +import { resolveOutboundSendDep, type ChannelOutboundAdapter } from "./runtime-api.js"; import { getMatrixRuntime } from "./runtime.js"; export const matrixOutbound: ChannelOutboundAdapter = { diff --git a/extensions/matrix/src/profile-update.ts b/extensions/matrix/src/profile-update.ts index 8de5726f8d9..4e22dbbfb08 100644 --- a/extensions/matrix/src/profile-update.ts +++ b/extensions/matrix/src/profile-update.ts @@ -1,6 +1,6 @@ -import { normalizeAccountId } from "openclaw/plugin-sdk/matrix"; import { updateMatrixOwnProfile } from "./matrix/actions/profile.js"; import { updateMatrixAccountConfig, resolveMatrixConfigPath } from "./matrix/config-update.js"; +import { normalizeAccountId } from "./runtime-api.js"; import { getMatrixRuntime } from "./runtime.js"; import type { CoreConfig } from "./types.js"; diff --git a/extensions/matrix/src/resolve-targets.ts b/extensions/matrix/src/resolve-targets.ts index 471d9e7f33a..4d2f7843006 100644 --- a/extensions/matrix/src/resolve-targets.ts +++ b/extensions/matrix/src/resolve-targets.ts @@ -1,11 +1,11 @@ +import { listMatrixDirectoryGroupsLive, listMatrixDirectoryPeersLive } from "./directory-live.js"; +import { isMatrixQualifiedUserId, normalizeMatrixMessagingTarget } from "./matrix/target-ids.js"; import type { ChannelDirectoryEntry, ChannelResolveKind, ChannelResolveResult, RuntimeEnv, -} from "openclaw/plugin-sdk/matrix"; -import { listMatrixDirectoryGroupsLive, listMatrixDirectoryPeersLive } from "./directory-live.js"; -import { isMatrixQualifiedUserId, normalizeMatrixMessagingTarget } from "./matrix/target-ids.js"; +} from "./runtime-api.js"; function normalizeLookupQuery(query: string): string { return query.trim().toLowerCase(); diff --git a/extensions/matrix/src/runtime.ts b/extensions/matrix/src/runtime.ts index 42324df7e7c..fc20d8bba8a 100644 --- a/extensions/matrix/src/runtime.ts +++ b/extensions/matrix/src/runtime.ts @@ -1,5 +1,5 @@ -import type { PluginRuntime } from "openclaw/plugin-sdk/matrix"; import { createPluginRuntimeStore } from "openclaw/plugin-sdk/runtime-store"; +import type { PluginRuntime } from "./runtime-api.js"; const { setRuntime: setMatrixRuntime, getRuntime: getMatrixRuntime } = createPluginRuntimeStore("Matrix runtime not initialized"); diff --git a/extensions/matrix/src/setup-bootstrap.ts b/extensions/matrix/src/setup-bootstrap.ts index 6c1304de498..a37aa1d5731 100644 --- a/extensions/matrix/src/setup-bootstrap.ts +++ b/extensions/matrix/src/setup-bootstrap.ts @@ -1,7 +1,7 @@ -import type { RuntimeEnv } from "openclaw/plugin-sdk/matrix"; import { hasExplicitMatrixAccountConfig } from "./matrix/account-config.js"; import { resolveMatrixAccountConfig } from "./matrix/accounts.js"; import { bootstrapMatrixVerification } from "./matrix/actions/verification.js"; +import type { RuntimeEnv } from "./runtime-api.js"; import type { CoreConfig } from "./types.js"; export type MatrixSetupVerificationBootstrapResult = { diff --git a/extensions/matrix/src/setup-config.ts b/extensions/matrix/src/setup-config.ts index f04b11ac7b3..77cfa2612a4 100644 --- a/extensions/matrix/src/setup-config.ts +++ b/extensions/matrix/src/setup-config.ts @@ -1,3 +1,5 @@ +import { resolveMatrixEnvAuthReadiness } from "./matrix/client.js"; +import { updateMatrixAccountConfig } from "./matrix/config-update.js"; import { applyAccountNameToChannelSection, DEFAULT_ACCOUNT_ID, @@ -5,9 +7,7 @@ import { normalizeAccountId, normalizeSecretInputString, type ChannelSetupInput, -} from "openclaw/plugin-sdk/matrix"; -import { resolveMatrixEnvAuthReadiness } from "./matrix/client.js"; -import { updateMatrixAccountConfig } from "./matrix/config-update.js"; +} from "./runtime-api.js"; import type { CoreConfig } from "./types.js"; const channel = "matrix" as const; diff --git a/extensions/matrix/src/tool-actions.ts b/extensions/matrix/src/tool-actions.ts index 2003789e502..4e2bd5aff4a 100644 --- a/extensions/matrix/src/tool-actions.ts +++ b/extensions/matrix/src/tool-actions.ts @@ -1,12 +1,4 @@ import type { AgentToolResult } from "@mariozechner/pi-agent-core"; -import { - createActionGate, - jsonResult, - readNumberParam, - readReactionParams, - readStringArrayParam, - readStringParam, -} from "openclaw/plugin-sdk/matrix"; import { resolveMatrixAccountConfig } from "./matrix/accounts.js"; import { bootstrapMatrixVerification, @@ -41,6 +33,14 @@ import { } from "./matrix/actions.js"; import { reactMatrixMessage } from "./matrix/send.js"; import { applyMatrixProfileUpdate } from "./profile-update.js"; +import { + createActionGate, + jsonResult, + readNumberParam, + readReactionParams, + readStringArrayParam, + readStringParam, +} from "./runtime-api.js"; import type { CoreConfig } from "./types.js"; const messageActions = new Set(["sendMessage", "editMessage", "deleteMessage", "readMessages"]); diff --git a/extensions/matrix/src/types.ts b/extensions/matrix/src/types.ts index 9f5e205a337..b904eb9da42 100644 --- a/extensions/matrix/src/types.ts +++ b/extensions/matrix/src/types.ts @@ -1,4 +1,4 @@ -import type { DmPolicy, GroupPolicy, SecretInput } from "openclaw/plugin-sdk/matrix"; +import type { DmPolicy, GroupPolicy, SecretInput } from "./runtime-api.js"; export type { DmPolicy, GroupPolicy }; export type ReplyToMode = "off" | "first" | "all";