From c5c5c77ebb67f8ec630b546a0da11bdfd65cff28 Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Sat, 4 Apr 2026 11:35:46 +0100 Subject: [PATCH] fix(ci): restore contract-safe core imports --- extensions/msteams/config-api.ts | 4 ++++ extensions/msteams/src/config-schema.ts | 2 +- src/acp/runtime/session-meta.ts | 11 +++++++++- src/agents/anthropic-vertex-stream.ts | 2 +- src/agents/cli-output.ts | 2 +- src/agents/cli-runner/helpers.ts | 2 +- src/agents/memory-search.ts | 2 +- src/agents/model-auth-env.ts | 2 +- src/agents/models-config.providers.ts | 2 +- .../pi-hooks/compaction-safeguard-quality.ts | 2 +- src/agents/sandbox/browser-bridges.ts | 2 +- src/agents/sandbox/browser.ts | 10 ++++------ src/agents/sandbox/context.ts | 10 +++++----- src/agents/sandbox/manage.ts | 2 +- src/agents/sandbox/prune.ts | 2 +- src/commands/doctor-browser.ts | 4 ++-- src/commands/doctor-memory-search.ts | 20 +++++++++---------- src/commands/doctor-state-integrity.ts | 2 +- src/commands/status.command.text-runtime.ts | 2 +- src/commands/status.command.ts | 2 +- src/commands/status.scan.deps.runtime.ts | 2 +- src/commands/status.scan.shared.ts | 2 +- src/config/zod-schema.providers-core.ts | 6 +++--- src/gateway/server-methods/agents.ts | 2 +- src/gateway/session-reset-service.ts | 2 +- src/memory-host-sdk/engine-embeddings.ts | 1 + src/memory-host-sdk/engine-qmd.ts | 1 + src/memory-host-sdk/engine-storage.ts | 1 + src/memory-host-sdk/multimodal.ts | 1 + src/memory-host-sdk/query.ts | 1 + src/memory-host-sdk/secret.ts | 1 + src/memory-host-sdk/status.ts | 1 + src/node-host/invoke.ts | 2 +- src/node-host/runner.ts | 2 +- src/plugins/memory-state.ts | 2 +- src/plugins/provider-zai-endpoint.ts | 2 +- src/security/audit.ts | 9 ++++++--- 37 files changed, 73 insertions(+), 52 deletions(-) create mode 100644 extensions/msteams/config-api.ts create mode 100644 src/memory-host-sdk/engine-embeddings.ts create mode 100644 src/memory-host-sdk/engine-qmd.ts create mode 100644 src/memory-host-sdk/engine-storage.ts create mode 100644 src/memory-host-sdk/multimodal.ts create mode 100644 src/memory-host-sdk/query.ts create mode 100644 src/memory-host-sdk/secret.ts create mode 100644 src/memory-host-sdk/status.ts diff --git a/extensions/msteams/config-api.ts b/extensions/msteams/config-api.ts new file mode 100644 index 00000000000..46d9afd4db2 --- /dev/null +++ b/extensions/msteams/config-api.ts @@ -0,0 +1,4 @@ +export { + buildChannelConfigSchema, + MSTeamsConfigSchema, +} from "openclaw/plugin-sdk/channel-config-schema"; diff --git a/extensions/msteams/src/config-schema.ts b/extensions/msteams/src/config-schema.ts index 2a9aded438a..a47578040c9 100644 --- a/extensions/msteams/src/config-schema.ts +++ b/extensions/msteams/src/config-schema.ts @@ -1,4 +1,4 @@ -import { buildChannelConfigSchema, MSTeamsConfigSchema } from "openclaw/plugin-sdk/msteams"; +import { buildChannelConfigSchema, MSTeamsConfigSchema } from "../config-api.js"; import { msTeamsChannelConfigUiHints } from "./config-ui-hints.js"; export const MSTeamsChannelConfigSchema = buildChannelConfigSchema(MSTeamsConfigSchema, { diff --git a/src/acp/runtime/session-meta.ts b/src/acp/runtime/session-meta.ts index 9a07b4bfc2a..384261a9481 100644 --- a/src/acp/runtime/session-meta.ts +++ b/src/acp/runtime/session-meta.ts @@ -2,7 +2,6 @@ import type { OpenClawConfig } from "../../config/config.js"; import { loadConfig } from "../../config/config.js"; import { resolveStorePath } from "../../config/sessions/paths.js"; import { loadSessionStore } from "../../config/sessions/store-load.js"; -import { updateSessionStore } from "../../config/sessions/store.runtime.js"; import { resolveAllAgentSessionStoreTargets } from "../../config/sessions/targets.js"; import { mergeSessionEntry, @@ -11,6 +10,15 @@ import { } from "../../config/sessions/types.js"; import { parseAgentSessionKey } from "../../routing/session-key.js"; +let sessionStoreRuntimePromise: + | Promise + | undefined; + +function loadSessionStoreRuntime() { + sessionStoreRuntimePromise ??= import("../../config/sessions/store.runtime.js"); + return sessionStoreRuntimePromise; +} + export type AcpSessionStoreEntry = { cfg: OpenClawConfig; storePath: string; @@ -139,6 +147,7 @@ export async function upsertAcpSessionMeta(params: { sessionKey, cfg: params.cfg, }); + const { updateSessionStore } = await loadSessionStoreRuntime(); return await updateSessionStore( storePath, (store) => { diff --git a/src/agents/anthropic-vertex-stream.ts b/src/agents/anthropic-vertex-stream.ts index d8777d40203..3e056b937a5 100644 --- a/src/agents/anthropic-vertex-stream.ts +++ b/src/agents/anthropic-vertex-stream.ts @@ -4,7 +4,7 @@ import { streamAnthropic, type AnthropicOptions, type Model } from "@mariozechne import { resolveAnthropicVertexClientRegion, resolveAnthropicVertexProjectId, -} from "../plugin-sdk/anthropic-vertex.js"; +} from "../../extensions/anthropic-vertex/api.js"; import { applyAnthropicPayloadPolicyToParams, resolveAnthropicPayloadPolicy, diff --git a/src/agents/cli-output.ts b/src/agents/cli-output.ts index 405f807d2c2..66f114830b2 100644 --- a/src/agents/cli-output.ts +++ b/src/agents/cli-output.ts @@ -1,5 +1,5 @@ +import { isClaudeCliProvider } from "../../extensions/anthropic/api.js"; import type { CliBackendConfig } from "../config/types.js"; -import { isClaudeCliProvider } from "../plugin-sdk/anthropic-cli.js"; import { isRecord } from "../utils.js"; type CliUsage = { diff --git a/src/agents/cli-runner/helpers.ts b/src/agents/cli-runner/helpers.ts index 1479194f130..87b62a5c160 100644 --- a/src/agents/cli-runner/helpers.ts +++ b/src/agents/cli-runner/helpers.ts @@ -5,11 +5,11 @@ import path from "node:path"; import type { AgentTool } from "@mariozechner/pi-agent-core"; import type { ImageContent } from "@mariozechner/pi-ai"; import { KeyedAsyncQueue } from "openclaw/plugin-sdk/keyed-async-queue"; +import { isClaudeCliProvider } from "../../../extensions/anthropic/api.js"; import type { ThinkLevel } from "../../auto-reply/thinking.js"; import type { OpenClawConfig } from "../../config/config.js"; import type { CliBackendConfig } from "../../config/types.js"; import { MAX_IMAGE_BYTES } from "../../media/constants.js"; -import { isClaudeCliProvider } from "../../plugin-sdk/anthropic-cli.js"; import { buildTtsSystemPromptHint } from "../../tts/tts.js"; import { buildModelAliasLines } from "../model-alias-lines.js"; import { resolveDefaultModelForAgent } from "../model-selection.js"; diff --git a/src/agents/memory-search.ts b/src/agents/memory-search.ts index bf32ad33a53..88d48b00ae6 100644 --- a/src/agents/memory-search.ts +++ b/src/agents/memory-search.ts @@ -7,7 +7,7 @@ import { isMemoryMultimodalEnabled, normalizeMemoryMultimodalSettings, type MemoryMultimodalSettings, -} from "../plugin-sdk/memory-core-host-multimodal.js"; +} from "../memory-host-sdk/multimodal.js"; import { getMemoryEmbeddingProvider } from "../plugins/memory-embedding-providers.js"; import { clampInt, clampNumber, resolveUserPath } from "../utils.js"; import { resolveAgentConfig } from "./agent-scope.js"; diff --git a/src/agents/model-auth-env.ts b/src/agents/model-auth-env.ts index ce121631d99..a0866cb51fd 100644 --- a/src/agents/model-auth-env.ts +++ b/src/agents/model-auth-env.ts @@ -1,6 +1,6 @@ import { getEnvApiKey } from "@mariozechner/pi-ai"; +import { hasAnthropicVertexAvailableAuth } from "../../extensions/anthropic-vertex/api.js"; import { getShellEnvAppliedKeys } from "../infra/shell-env.js"; -import { hasAnthropicVertexAvailableAuth } from "../plugin-sdk/anthropic-vertex-auth-presence.js"; import { normalizeOptionalSecretInput } from "../utils/normalize-secret-input.js"; import { PROVIDER_ENV_API_KEY_CANDIDATES } from "./model-auth-env-vars.js"; import { GCP_VERTEX_CREDENTIALS_MARKER } from "./model-auth-markers.js"; diff --git a/src/agents/models-config.providers.ts b/src/agents/models-config.providers.ts index e7fb3e8ecfe..036cc535eab 100644 --- a/src/agents/models-config.providers.ts +++ b/src/agents/models-config.providers.ts @@ -10,4 +10,4 @@ export type { } from "./models-config.providers.secrets.js"; export { applyNativeStreamingUsageCompat } from "./models-config.providers.policy.js"; export { enforceSourceManagedProviderSecrets } from "./models-config.providers.source-managed.js"; -export { resolveOllamaApiBase } from "../plugin-sdk/ollama-surface.js"; +export { resolveOllamaApiBase } from "../../extensions/ollama/api.js"; diff --git a/src/agents/pi-hooks/compaction-safeguard-quality.ts b/src/agents/pi-hooks/compaction-safeguard-quality.ts index c4da3b31570..56779b41f06 100644 --- a/src/agents/pi-hooks/compaction-safeguard-quality.ts +++ b/src/agents/pi-hooks/compaction-safeguard-quality.ts @@ -1,4 +1,4 @@ -import { extractKeywords, isQueryStopWordToken } from "../../plugin-sdk/memory-core-host-query.js"; +import { extractKeywords, isQueryStopWordToken } from "../../memory-host-sdk/query.js"; import type { CompactionSummarizationInstructions } from "../compaction.js"; import { wrapUntrustedPromptDataBlock } from "../sanitize-for-prompt.js"; diff --git a/src/agents/sandbox/browser-bridges.ts b/src/agents/sandbox/browser-bridges.ts index 11b772e9cf0..594342258e5 100644 --- a/src/agents/sandbox/browser-bridges.ts +++ b/src/agents/sandbox/browser-bridges.ts @@ -1,4 +1,4 @@ -import type { BrowserBridge } from "../../plugin-sdk/browser-bridge.js"; +import type { BrowserBridge } from "../../../extensions/browser/runtime-api.js"; export const BROWSER_BRIDGES = new Map< string, diff --git a/src/agents/sandbox/browser.ts b/src/agents/sandbox/browser.ts index 4502914a220..561792905f7 100644 --- a/src/agents/sandbox/browser.ts +++ b/src/agents/sandbox/browser.ts @@ -1,16 +1,14 @@ import crypto from "node:crypto"; -import { deriveDefaultBrowserCdpPortRange } from "../../config/port-defaults.js"; -import { - startBrowserBridgeServer, - stopBrowserBridgeServer, -} from "../../plugin-sdk/browser-bridge.js"; import { DEFAULT_BROWSER_EVALUATE_ENABLED, DEFAULT_OPENCLAW_BROWSER_COLOR, DEFAULT_OPENCLAW_BROWSER_PROFILE_NAME, resolveProfile, + startBrowserBridgeServer, + stopBrowserBridgeServer, type ResolvedBrowserConfig, -} from "../../plugin-sdk/browser-config.js"; +} from "../../../extensions/browser/runtime-api.js"; +import { deriveDefaultBrowserCdpPortRange } from "../../config/port-defaults.js"; import { defaultRuntime } from "../../runtime.js"; import { BROWSER_BRIDGES } from "./browser-bridges.js"; import { computeSandboxBrowserConfigHash } from "./config-hash.js"; diff --git a/src/agents/sandbox/context.ts b/src/agents/sandbox/context.ts index 72b6a39615f..5fda001f4fb 100644 --- a/src/agents/sandbox/context.ts +++ b/src/agents/sandbox/context.ts @@ -1,12 +1,12 @@ import fs from "node:fs/promises"; +import { + DEFAULT_BROWSER_EVALUATE_ENABLED, + ensureBrowserControlAuth, + resolveBrowserControlAuth, +} from "../../../extensions/browser/runtime-api.js"; import type { OpenClawConfig } from "../../config/config.js"; import { loadConfig } from "../../config/config.js"; import { getRemoteSkillEligibility } from "../../infra/skills-remote.js"; -import { DEFAULT_BROWSER_EVALUATE_ENABLED } from "../../plugin-sdk/browser-config.js"; -import { - ensureBrowserControlAuth, - resolveBrowserControlAuth, -} from "../../plugin-sdk/browser-control-auth.js"; import { defaultRuntime } from "../../runtime.js"; import { resolveUserPath } from "../../utils.js"; import { syncSkillsToWorkspace } from "../skills.js"; diff --git a/src/agents/sandbox/manage.ts b/src/agents/sandbox/manage.ts index ecca5131914..4969e1fec73 100644 --- a/src/agents/sandbox/manage.ts +++ b/src/agents/sandbox/manage.ts @@ -1,5 +1,5 @@ +import { stopBrowserBridgeServer } from "../../../extensions/browser/runtime-api.js"; import { loadConfig } from "../../config/config.js"; -import { stopBrowserBridgeServer } from "../../plugin-sdk/browser-bridge.js"; import { getSandboxBackendManager } from "./backend.js"; import { BROWSER_BRIDGES } from "./browser-bridges.js"; import { dockerSandboxBackendManager } from "./docker-backend.js"; diff --git a/src/agents/sandbox/prune.ts b/src/agents/sandbox/prune.ts index 0dcdb090e79..00126d2992c 100644 --- a/src/agents/sandbox/prune.ts +++ b/src/agents/sandbox/prune.ts @@ -1,5 +1,5 @@ +import { stopBrowserBridgeServer } from "../../../extensions/browser/runtime-api.js"; import { loadConfig } from "../../config/config.js"; -import { stopBrowserBridgeServer } from "../../plugin-sdk/browser-bridge.js"; import { defaultRuntime } from "../../runtime.js"; import { getSandboxBackendManager } from "./backend.js"; import { BROWSER_BRIDGES } from "./browser-bridges.js"; diff --git a/src/commands/doctor-browser.ts b/src/commands/doctor-browser.ts index c376b834d64..80865eee776 100644 --- a/src/commands/doctor-browser.ts +++ b/src/commands/doctor-browser.ts @@ -1,9 +1,9 @@ -import type { OpenClawConfig } from "../config/config.js"; import { parseBrowserMajorVersion, readBrowserVersion, resolveGoogleChromeExecutableForPlatform, -} from "../plugin-sdk/browser-host-inspection.js"; +} from "../../extensions/browser/runtime-api.js"; +import type { OpenClawConfig } from "../config/config.js"; import { note } from "../terminal/note.js"; const CHROME_MCP_MIN_MAJOR = 144; diff --git a/src/commands/doctor-memory-search.ts b/src/commands/doctor-memory-search.ts index 30f1a0f3820..e972e5cba1a 100644 --- a/src/commands/doctor-memory-search.ts +++ b/src/commands/doctor-memory-search.ts @@ -1,4 +1,11 @@ import fsSync from "node:fs"; +import { + auditShortTermPromotionArtifacts, + getBuiltinMemoryEmbeddingProviderDoctorMetadata, + listBuiltinAutoSelectMemoryEmbeddingProviderDoctorMetadata, + repairShortTermPromotionArtifacts, + type ShortTermAuditSummary, +} from "../../extensions/memory-core/runtime-api.js"; import { resolveAgentDir, resolveAgentWorkspaceDir, @@ -8,16 +15,9 @@ import { resolveMemorySearchConfig } from "../agents/memory-search.js"; import { resolveApiKeyForProvider } from "../agents/model-auth.js"; import { formatCliCommand } from "../cli/command-format.js"; import type { OpenClawConfig } from "../config/config.js"; -import { - auditShortTermPromotionArtifacts, - getBuiltinMemoryEmbeddingProviderDoctorMetadata, - listBuiltinAutoSelectMemoryEmbeddingProviderDoctorMetadata, - repairShortTermPromotionArtifacts, - type ShortTermAuditSummary, -} from "../plugin-sdk/memory-core-engine-runtime.js"; -import { DEFAULT_LOCAL_MODEL } from "../plugin-sdk/memory-core-host-engine-embeddings.js"; -import { checkQmdBinaryAvailability } from "../plugin-sdk/memory-core-host-engine-qmd.js"; -import { hasConfiguredMemorySecretInput } from "../plugin-sdk/memory-core-host-secret.js"; +import { DEFAULT_LOCAL_MODEL } from "../memory-host-sdk/engine-embeddings.js"; +import { checkQmdBinaryAvailability } from "../memory-host-sdk/engine-qmd.js"; +import { hasConfiguredMemorySecretInput } from "../memory-host-sdk/secret.js"; import { getActiveMemorySearchManager, resolveActiveMemoryBackendConfig, diff --git a/src/commands/doctor-state-integrity.ts b/src/commands/doctor-state-integrity.ts index 8f43fa09c03..1c8f3cbdea2 100644 --- a/src/commands/doctor-state-integrity.ts +++ b/src/commands/doctor-state-integrity.ts @@ -17,7 +17,7 @@ import { resolveStorePath, } from "../config/sessions.js"; import { resolveRequiredHomeDir } from "../infra/home-dir.js"; -import { resolveMemoryBackendConfig } from "../plugin-sdk/memory-core-host-engine-storage.js"; +import { resolveMemoryBackendConfig } from "../memory-host-sdk/engine-storage.js"; import { parseAgentSessionKey } from "../sessions/session-key-utils.js"; import { note } from "../terminal/note.js"; import { shortenHomePath } from "../utils.js"; diff --git a/src/commands/status.command.text-runtime.ts b/src/commands/status.command.text-runtime.ts index cdd3dca2301..b97403e311b 100644 --- a/src/commands/status.command.text-runtime.ts +++ b/src/commands/status.command.text-runtime.ts @@ -8,7 +8,7 @@ export { resolveMemoryCacheSummary, resolveMemoryFtsState, resolveMemoryVectorState, -} from "../plugin-sdk/memory-core-host-status.js"; +} from "../memory-host-sdk/status.js"; export { formatPluginCompatibilityNotice, summarizePluginCompatibility, diff --git a/src/commands/status.command.ts b/src/commands/status.command.ts index dfc445496a2..e879f1c94c2 100644 --- a/src/commands/status.command.ts +++ b/src/commands/status.command.ts @@ -1,7 +1,7 @@ import { withProgress } from "../cli/progress.js"; import type { HeartbeatEventPayload } from "../infra/heartbeat-events.js"; import { normalizeUpdateChannel, resolveUpdateChannelDisplay } from "../infra/update-channels.js"; -import type { Tone } from "../plugin-sdk/memory-core-host-status.js"; +import type { Tone } from "../memory-host-sdk/status.js"; import { type RuntimeEnv, writeRuntimeJson } from "../runtime.js"; import type { HealthSummary } from "./health.js"; import { getDaemonStatusSummary, getNodeDaemonStatusSummary } from "./status.daemon.js"; diff --git a/src/commands/status.scan.deps.runtime.ts b/src/commands/status.scan.deps.runtime.ts index 92a15ccb60f..6ba48ed4af4 100644 --- a/src/commands/status.scan.deps.runtime.ts +++ b/src/commands/status.scan.deps.runtime.ts @@ -1,6 +1,6 @@ import type { OpenClawConfig } from "../config/config.js"; import { getTailnetHostname } from "../infra/tailscale.js"; -import type { MemoryProviderStatus } from "../plugin-sdk/memory-core-host-engine-storage.js"; +import type { MemoryProviderStatus } from "../memory-host-sdk/engine-storage.js"; import { getActiveMemorySearchManager } from "../plugins/memory-runtime.js"; export { getTailnetHostname }; diff --git a/src/commands/status.scan.shared.ts b/src/commands/status.scan.shared.ts index 1afae366939..4c239cdb499 100644 --- a/src/commands/status.scan.shared.ts +++ b/src/commands/status.scan.shared.ts @@ -3,7 +3,7 @@ import type { OpenClawConfig } from "../config/types.js"; import { buildGatewayConnectionDetailsWithResolvers } from "../gateway/connection-details.js"; import { normalizeControlUiBasePath } from "../gateway/control-ui-shared.js"; import { probeGateway } from "../gateway/probe.js"; -import type { MemoryProviderStatus } from "../plugin-sdk/memory-core-host-engine-storage.js"; +import type { MemoryProviderStatus } from "../memory-host-sdk/engine-storage.js"; export { pickGatewaySelfPresence } from "./gateway-presence.js"; let gatewayProbeModulePromise: Promise | undefined; diff --git a/src/config/zod-schema.providers-core.ts b/src/config/zod-schema.providers-core.ts index 4fe886330fe..0e05558211c 100644 --- a/src/config/zod-schema.providers-core.ts +++ b/src/config/zod-schema.providers-core.ts @@ -1,11 +1,11 @@ import { z } from "zod"; -import { isSafeScpRemoteHost } from "../infra/scp-host.js"; -import { isValidInboundPathRootPattern } from "../media/inbound-path-policy.js"; import { normalizeTelegramCommandDescription, normalizeTelegramCommandName, resolveTelegramCustomCommands, -} from "../plugin-sdk/telegram-command-config.js"; +} from "../../extensions/telegram/api.js"; +import { isSafeScpRemoteHost } from "../infra/scp-host.js"; +import { isValidInboundPathRootPattern } from "../media/inbound-path-policy.js"; import { ToolPolicySchema } from "./zod-schema.agent-runtime.js"; import { ChannelHealthMonitorSchema, diff --git a/src/gateway/server-methods/agents.ts b/src/gateway/server-methods/agents.ts index 8fd00f58ccd..66dc251fba6 100644 --- a/src/gateway/server-methods/agents.ts +++ b/src/gateway/server-methods/agents.ts @@ -1,5 +1,6 @@ import fs from "node:fs/promises"; import path from "node:path"; +import { movePathToTrash } from "../../../extensions/browser/runtime-api.js"; import { listAgentIds, resolveAgentDir, @@ -35,7 +36,6 @@ import { } from "../../infra/fs-safe.js"; import { assertNoPathAliasEscape } from "../../infra/path-alias-guards.js"; import { isNotFoundPathError } from "../../infra/path-guards.js"; -import { movePathToTrash } from "../../plugin-sdk/browser-maintenance.js"; import { DEFAULT_AGENT_ID, normalizeAgentId } from "../../routing/session-key.js"; import { resolveUserPath } from "../../utils.js"; import { diff --git a/src/gateway/session-reset-service.ts b/src/gateway/session-reset-service.ts index 93e5f61e451..9d660e4f120 100644 --- a/src/gateway/session-reset-service.ts +++ b/src/gateway/session-reset-service.ts @@ -2,6 +2,7 @@ import { randomUUID } from "node:crypto"; import fs from "node:fs"; import path from "node:path"; import { CURRENT_SESSION_VERSION } from "@mariozechner/pi-coding-agent"; +import { closeTrackedBrowserTabsForSessions } from "../../extensions/browser/runtime-api.js"; import { getAcpSessionManager } from "../acp/control-plane/manager.js"; import { resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../agents/agent-scope.js"; import { clearBootstrapSnapshot } from "../agents/bootstrap-cache.js"; @@ -22,7 +23,6 @@ import { resolveSessionFilePath, resolveSessionFilePathOptions } from "../config import { logVerbose } from "../globals.js"; import { createInternalHookEvent, triggerInternalHook } from "../hooks/internal-hooks.js"; import { getSessionBindingService } from "../infra/outbound/session-binding-service.js"; -import { closeTrackedBrowserTabsForSessions } from "../plugin-sdk/browser-maintenance.js"; import { getGlobalHookRunner } from "../plugins/hook-runner-global.js"; import { isSubagentSessionKey, diff --git a/src/memory-host-sdk/engine-embeddings.ts b/src/memory-host-sdk/engine-embeddings.ts new file mode 100644 index 00000000000..a5b7e2b91a9 --- /dev/null +++ b/src/memory-host-sdk/engine-embeddings.ts @@ -0,0 +1 @@ +export * from "../../packages/memory-host-sdk/src/engine-embeddings.js"; diff --git a/src/memory-host-sdk/engine-qmd.ts b/src/memory-host-sdk/engine-qmd.ts new file mode 100644 index 00000000000..21a0be44873 --- /dev/null +++ b/src/memory-host-sdk/engine-qmd.ts @@ -0,0 +1 @@ +export * from "../../packages/memory-host-sdk/src/engine-qmd.js"; diff --git a/src/memory-host-sdk/engine-storage.ts b/src/memory-host-sdk/engine-storage.ts new file mode 100644 index 00000000000..ee3f3a4e410 --- /dev/null +++ b/src/memory-host-sdk/engine-storage.ts @@ -0,0 +1 @@ +export * from "../../packages/memory-host-sdk/src/engine-storage.js"; diff --git a/src/memory-host-sdk/multimodal.ts b/src/memory-host-sdk/multimodal.ts new file mode 100644 index 00000000000..36b50cbbf4b --- /dev/null +++ b/src/memory-host-sdk/multimodal.ts @@ -0,0 +1 @@ +export * from "../../packages/memory-host-sdk/src/multimodal.js"; diff --git a/src/memory-host-sdk/query.ts b/src/memory-host-sdk/query.ts new file mode 100644 index 00000000000..2a2ef6bbed4 --- /dev/null +++ b/src/memory-host-sdk/query.ts @@ -0,0 +1 @@ +export * from "../../packages/memory-host-sdk/src/query.js"; diff --git a/src/memory-host-sdk/secret.ts b/src/memory-host-sdk/secret.ts new file mode 100644 index 00000000000..f293730b357 --- /dev/null +++ b/src/memory-host-sdk/secret.ts @@ -0,0 +1 @@ +export * from "../../packages/memory-host-sdk/src/secret.js"; diff --git a/src/memory-host-sdk/status.ts b/src/memory-host-sdk/status.ts new file mode 100644 index 00000000000..704b37737b4 --- /dev/null +++ b/src/memory-host-sdk/status.ts @@ -0,0 +1 @@ +export * from "../../packages/memory-host-sdk/src/status.js"; diff --git a/src/node-host/invoke.ts b/src/node-host/invoke.ts index 4d603a0c181..88ff398e13b 100644 --- a/src/node-host/invoke.ts +++ b/src/node-host/invoke.ts @@ -1,6 +1,7 @@ import { spawn, spawnSync } from "node:child_process"; import fs from "node:fs"; import path from "node:path"; +import { runBrowserProxyCommand } from "../../extensions/browser/runtime-api.js"; import { GatewayClient } from "../gateway/client.js"; import { ensureExecApprovals, @@ -19,7 +20,6 @@ import { type ExecHostResponse, } from "../infra/exec-host.js"; import { sanitizeHostExecEnv } from "../infra/host-env-security.js"; -import { runBrowserProxyCommand } from "../plugin-sdk/browser-runtime.js"; import { buildSystemRunApprovalPlan, handleSystemRunInvoke } from "./invoke-system-run.js"; import type { ExecEventPayload, diff --git a/src/node-host/runner.ts b/src/node-host/runner.ts index 53f4f839b94..a58ac7e0bdf 100644 --- a/src/node-host/runner.ts +++ b/src/node-host/runner.ts @@ -1,3 +1,4 @@ +import { resolveBrowserConfig } from "../../extensions/browser/runtime-api.js"; import { loadConfig, type OpenClawConfig } from "../config/config.js"; import { GatewayClient } from "../gateway/client.js"; import { resolveGatewayConnectionAuth } from "../gateway/connection-auth.js"; @@ -11,7 +12,6 @@ import { NODE_SYSTEM_RUN_COMMANDS, } from "../infra/node-commands.js"; import { ensureOpenClawCliOnPath } from "../infra/path-env.js"; -import { resolveBrowserConfig } from "../plugin-sdk/browser-config.js"; import { GATEWAY_CLIENT_MODES, GATEWAY_CLIENT_NAMES } from "../utils/message-channel.js"; import { VERSION } from "../version.js"; import { ensureNodeHostConfig, saveNodeHostConfig, type NodeHostGatewayConfig } from "./config.js"; diff --git a/src/plugins/memory-state.ts b/src/plugins/memory-state.ts index 9eed0cd7f08..efc51f85227 100644 --- a/src/plugins/memory-state.ts +++ b/src/plugins/memory-state.ts @@ -4,7 +4,7 @@ import type { MemoryEmbeddingProbeResult, MemoryProviderStatus, MemorySyncProgressUpdate, -} from "../plugin-sdk/memory-core-host-engine-storage.js"; +} from "../memory-host-sdk/engine-storage.js"; export type MemoryPromptSectionBuilder = (params: { availableTools: Set; diff --git a/src/plugins/provider-zai-endpoint.ts b/src/plugins/provider-zai-endpoint.ts index 39b1e4eaf49..0eca8076f86 100644 --- a/src/plugins/provider-zai-endpoint.ts +++ b/src/plugins/provider-zai-endpoint.ts @@ -3,7 +3,7 @@ import { ZAI_CODING_CN_BASE_URL, ZAI_CODING_GLOBAL_BASE_URL, ZAI_GLOBAL_BASE_URL, -} from "../plugin-sdk/zai.js"; +} from "../../extensions/zai/api.js"; import { fetchWithTimeout } from "../utils/fetch-timeout.js"; export type ZaiEndpointId = "global" | "cn" | "coding-global" | "coding-cn"; diff --git a/src/security/audit.ts b/src/security/audit.ts index faaea0f314e..85b541b1e8e 100644 --- a/src/security/audit.ts +++ b/src/security/audit.ts @@ -1,5 +1,11 @@ import { isIP } from "node:net"; import path from "node:path"; +import { + redactCdpUrl, + resolveBrowserConfig, + resolveBrowserControlAuth, + resolveProfile, +} from "../../extensions/browser/runtime-api.js"; import { resolveSandboxConfigForAgent } from "../agents/sandbox.js"; import { hasPotentialConfiguredChannels } from "../channels/config-presence.js"; import type { listChannelPlugins } from "../channels/plugins/index.js"; @@ -17,9 +23,6 @@ import { import { listRiskyConfiguredSafeBins } from "../infra/exec-safe-bin-semantics.js"; import { normalizeTrustedSafeBinDirs } from "../infra/exec-safe-bin-trust.js"; import { isBlockedHostnameOrIp, isPrivateNetworkAllowedByPolicy } from "../infra/net/ssrf.js"; -import { redactCdpUrl } from "../plugin-sdk/browser-cdp.js"; -import { resolveBrowserConfig, resolveProfile } from "../plugin-sdk/browser-config.js"; -import { resolveBrowserControlAuth } from "../plugin-sdk/browser-control-auth.js"; import { DEFAULT_AGENT_ID } from "../routing/session-key.js"; import { formatPermissionDetail,