diff --git a/src/cron/isolated-agent/run.runtime.ts b/src/cron/isolated-agent/run.runtime.ts index a9f9b6e38a9..471034d1900 100644 --- a/src/cron/isolated-agent/run.runtime.ts +++ b/src/cron/isolated-agent/run.runtime.ts @@ -5,7 +5,6 @@ export { resolveDefaultAgentId, type ResolvedAgentConfig, } from "../../agents/agent-scope-config.js"; -export { resolveAgentSkillsFilter } from "../../agents/agent-scope.js"; export { resolveCronStyleNow } from "../../agents/current-time.js"; export { DEFAULT_CONTEXT_TOKENS } from "../../agents/defaults.js"; export { isCliProvider } from "../../agents/model-selection-cli.js"; diff --git a/src/cron/isolated-agent/run.test-harness.ts b/src/cron/isolated-agent/run.test-harness.ts index 537ec80e552..162b9b3bb33 100644 --- a/src/cron/isolated-agent/run.test-harness.ts +++ b/src/cron/isolated-agent/run.test-harness.ts @@ -97,7 +97,6 @@ vi.mock("./run.runtime.js", () => ({ resolveAgentModelFallbacksOverride: resolveAgentModelFallbacksOverrideMock, resolveAgentWorkspaceDir: vi.fn().mockReturnValue("/tmp/workspace"), resolveDefaultAgentId: vi.fn().mockReturnValue("default"), - resolveAgentSkillsFilter: resolveAgentSkillsFilterMock, resolveCronStyleNow: resolveCronStyleNowMock, DEFAULT_CONTEXT_TOKENS: 128000, isCliProvider: isCliProviderMock, @@ -140,6 +139,7 @@ vi.mock("./skills-snapshot.runtime.js", () => ({ canExecRequestNode: vi.fn(() => false), getRemoteSkillEligibility: getRemoteSkillEligibilityMock, getSkillsSnapshotVersion: getSkillsSnapshotVersionMock, + resolveAgentSkillsFilter: resolveAgentSkillsFilterMock, })); vi.mock("./run-model-selection.runtime.js", () => ({ diff --git a/src/cron/isolated-agent/skills-snapshot.runtime.ts b/src/cron/isolated-agent/skills-snapshot.runtime.ts index 59ac59d73ec..8f3e7bffa25 100644 --- a/src/cron/isolated-agent/skills-snapshot.runtime.ts +++ b/src/cron/isolated-agent/skills-snapshot.runtime.ts @@ -1,4 +1,5 @@ export { canExecRequestNode } from "../../agents/exec-defaults.js"; +export { resolveAgentSkillsFilter } from "../../agents/agent-scope.js"; export { buildWorkspaceSkillSnapshot } from "../../agents/skills.js"; export { getSkillsSnapshotVersion } from "../../agents/skills/refresh.js"; export { getRemoteSkillEligibility } from "../../infra/skills-remote.js"; diff --git a/src/cron/isolated-agent/skills-snapshot.test.ts b/src/cron/isolated-agent/skills-snapshot.test.ts index 234750ca51c..a18499e0a48 100644 --- a/src/cron/isolated-agent/skills-snapshot.test.ts +++ b/src/cron/isolated-agent/skills-snapshot.test.ts @@ -19,9 +19,6 @@ vi.mock("./skills-snapshot.runtime.js", () => ({ canExecRequestNode: canExecRequestNodeMock, getRemoteSkillEligibility: getRemoteSkillEligibilityMock, getSkillsSnapshotVersion: getSkillsSnapshotVersionMock, -})); - -vi.mock("./run.runtime.js", () => ({ resolveAgentSkillsFilter: resolveAgentSkillsFilterMock, })); diff --git a/src/cron/isolated-agent/skills-snapshot.ts b/src/cron/isolated-agent/skills-snapshot.ts index 9bd6d2ced13..97204f73324 100644 --- a/src/cron/isolated-agent/skills-snapshot.ts +++ b/src/cron/isolated-agent/skills-snapshot.ts @@ -1,7 +1,6 @@ import type { SkillSnapshot } from "../../agents/skills.js"; import { matchesSkillFilter } from "../../agents/skills/filter.js"; import type { OpenClawConfig } from "../../config/types.openclaw.js"; -import { resolveAgentSkillsFilter } from "./run.runtime.js"; let skillsSnapshotRuntimePromise: | Promise @@ -26,7 +25,7 @@ export async function resolveCronSkillsSnapshot(params: { const runtime = await loadSkillsSnapshotRuntime(); const snapshotVersion = runtime.getSkillsSnapshotVersion(params.workspaceDir); - const skillFilter = resolveAgentSkillsFilter(params.config, params.agentId); + const skillFilter = runtime.resolveAgentSkillsFilter(params.config, params.agentId); const existingSnapshot = params.existingSnapshot; const shouldRefresh = !existingSnapshot ||