refactor(agents): share workspace dir enumeration

This commit is contained in:
Peter Steinberger
2026-02-15 13:59:39 +00:00
parent 0931a35709
commit 42b0d6f43e
4 changed files with 23 additions and 47 deletions

View File

@@ -1,9 +1,9 @@
import type { SkillEligibilityContext, SkillEntry } from "../agents/skills.js";
import type { OpenClawConfig } from "../config/config.js";
import type { NodeRegistry } from "../gateway/node-registry.js";
import { resolveAgentWorkspaceDir, resolveDefaultAgentId } from "../agents/agent-scope.js";
import { loadWorkspaceSkillEntries } from "../agents/skills.js";
import { bumpSkillsSnapshotVersion } from "../agents/skills/refresh.js";
import { listAgentWorkspaceDirs } from "../agents/workspace-dirs.js";
import { createSubsystemLogger } from "../logging/subsystem.js";
import { listNodePairing, updatePairedNodeMetadata } from "./node-pairing.js";
@@ -172,20 +172,6 @@ export function removeRemoteNodeInfo(nodeId: string) {
remoteNodes.delete(nodeId);
}
function listWorkspaceDirs(cfg: OpenClawConfig): string[] {
const dirs = new Set<string>();
const list = cfg.agents?.list;
if (Array.isArray(list)) {
for (const entry of list) {
if (entry && typeof entry === "object" && typeof entry.id === "string") {
dirs.add(resolveAgentWorkspaceDir(cfg, entry.id));
}
}
}
dirs.add(resolveAgentWorkspaceDir(cfg, resolveDefaultAgentId(cfg)));
return [...dirs];
}
function collectRequiredBins(entries: SkillEntry[], targetPlatform: string): string[] {
const bins = new Set<string>();
for (const entry of entries) {
@@ -272,7 +258,7 @@ export async function refreshRemoteNodeBins(params: {
return;
}
const workspaceDirs = listWorkspaceDirs(params.cfg);
const workspaceDirs = listAgentWorkspaceDirs(params.cfg);
const requiredBins = new Set<string>();
for (const workspaceDir of workspaceDirs) {
const entries = loadWorkspaceSkillEntries(workspaceDir, { config: params.cfg });