LLM/moltbot
1
0
Fork 0
mirror of https://github.com/moltbot/moltbot.git synced 2026-04-26 16:06:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(shared): share entry requirements evaluation

Browse Source
This commit is contained in:
Peter Steinberger
2026-02-15 18:39:29 +00:00
committed by Shadow
parent a5b87338e5
commit 137079fc21
3 changed files with 85 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/agents/skills-status.ts
View File

@@ -1,7 +1,6 @@
import path from "node:path";
import type { OpenClawConfig } from "../config/config.js";
import { resolveEmojiAndHomepage } from "../shared/entry-metadata.js";
import { evaluateRequirementsFromMetadataWithRemote } from "../shared/requirements.js";
import { evaluateEntryMetadataRequirements } from "../shared/entry-status.js";
import { CONFIG_DIR } from "../utils.js";
import {
hasBinary,
@@ -184,34 +183,27 @@ function buildSkillStatus(
const allowBundled = resolveBundledAllowlist(config);
const blockedByAllowlist = !isBundledSkillAllowed(entry, allowBundled);
const always = entry.metadata?.always === true;
const { emoji, homepage } = resolveEmojiAndHomepage({
metadata: entry.metadata,
frontmatter: entry.frontmatter,
});
const bundled =
bundledNames && bundledNames.size > 0
? bundledNames.has(entry.skill.name)
: entry.skill.source === "openclaw-bundled";
const {
required,
missing,
eligible: requirementsSatisfied,
configChecks,
} = evaluateRequirementsFromMetadataWithRemote({
always,
metadata: entry.metadata,
hasLocalBin: hasBinary,
localPlatform: process.platform,
remote: eligibility?.remote,
isEnvSatisfied: (envName) =>
Boolean(
process.env[envName] ||
skillConfig?.env?.[envName] ||
(skillConfig?.apiKey && entry.metadata?.primaryEnv === envName),
),
isConfigSatisfied: (pathStr) => isConfigPathTruthy(config, pathStr),
});
const { emoji, homepage, required, missing, requirementsSatisfied, configChecks } =
evaluateEntryMetadataRequirements({
always,
metadata: entry.metadata,
frontmatter: entry.frontmatter,
hasLocalBin: hasBinary,
localPlatform: process.platform,
remote: eligibility?.remote,
isEnvSatisfied: (envName) =>
Boolean(
process.env[envName] ||
skillConfig?.env?.[envName] ||
(skillConfig?.apiKey && entry.metadata?.primaryEnv === envName),
),
isConfigSatisfied: (pathStr) => isConfigPathTruthy(config, pathStr),
});
const eligible = !disabled && !blockedByAllowlist && requirementsSatisfied;
return {

32
src/hooks/hooks-status.ts
View File

@@ -1,8 +1,7 @@
import path from "node:path";
import type { OpenClawConfig } from "../config/config.js";
import type { HookEligibilityContext, HookEntry, HookInstallSpec } from "./types.js";
import { resolveEmojiAndHomepage } from "../shared/entry-metadata.js";
import { evaluateRequirementsFromMetadataWithRemote } from "../shared/requirements.js";
import { evaluateEntryMetadataRequirements } from "../shared/entry-status.js";
import { CONFIG_DIR } from "../utils.js";
import { hasBinary, isConfigPathTruthy, resolveHookConfig } from "./config.js";
import { loadWorkspaceHookEntries } from "./workspace.js";
@@ -101,26 +100,19 @@ function buildHookStatus(
const managedByPlugin = entry.hook.source === "openclaw-plugin";
const disabled = managedByPlugin ? false : hookConfig?.enabled === false;
const always = entry.metadata?.always === true;
const { emoji, homepage } = resolveEmojiAndHomepage({
metadata: entry.metadata,
frontmatter: entry.frontmatter,
});
const events = entry.metadata?.events ?? [];
const {
required,
missing,
eligible: requirementsSatisfied,
configChecks,
} = evaluateRequirementsFromMetadataWithRemote({
always,
metadata: entry.metadata,
hasLocalBin: hasBinary,
localPlatform: process.platform,
remote: eligibility?.remote,
isEnvSatisfied: (envName) => Boolean(process.env[envName] || hookConfig?.env?.[envName]),
isConfigSatisfied: (pathStr) => isConfigPathTruthy(config, pathStr),
});
const { emoji, homepage, required, missing, requirementsSatisfied, configChecks } =
evaluateEntryMetadataRequirements({
always,
metadata: entry.metadata,
frontmatter: entry.frontmatter,
hasLocalBin: hasBinary,
localPlatform: process.platform,
remote: eligibility?.remote,
isEnvSatisfied: (envName) => Boolean(process.env[envName] || hookConfig?.env?.[envName]),
isConfigSatisfied: (pathStr) => isConfigPathTruthy(config, pathStr),
});
const eligible = !disabled && requirementsSatisfied;

56
src/shared/entry-status.ts Normal file
View File

@@ -0,0 +1,56 @@
import { resolveEmojiAndHomepage } from "./entry-metadata.js";
import {
evaluateRequirementsFromMetadataWithRemote,
type RequirementConfigCheck,
type Requirements,
type RequirementsMetadata,
} from "./requirements.js";
export function evaluateEntryMetadataRequirements(params: {
always: boolean;
metadata?: (RequirementsMetadata & { emoji?: string; homepage?: string }) | null;
frontmatter?: {
emoji?: string;
homepage?: string;
website?: string;
url?: string;
} | null;
hasLocalBin: (bin: string) => boolean;
localPlatform: string;
remote?: {
hasBin?: (bin: string) => boolean;
hasAnyBin?: (bins: string[]) => boolean;
platforms?: string[];
};
isEnvSatisfied: (envName: string) => boolean;
isConfigSatisfied: (pathStr: string) => boolean;
}): {
emoji?: string;
homepage?: string;
required: Requirements;
missing: Requirements;
requirementsSatisfied: boolean;
configChecks: RequirementConfigCheck[];
} {
const { emoji, homepage } = resolveEmojiAndHomepage({
metadata: params.metadata,
frontmatter: params.frontmatter,
});
const { required, missing, eligible, configChecks } = evaluateRequirementsFromMetadataWithRemote({
always: params.always,
metadata: params.metadata ?? undefined,
hasLocalBin: params.hasLocalBin,
localPlatform: params.localPlatform,
remote: params.remote,
isEnvSatisfied: params.isEnvSatisfied,
isConfigSatisfied: params.isConfigSatisfied,
});
return {
...(emoji ? { emoji } : {}),
...(homepage ? { homepage } : {}),
required,
missing,
requirementsSatisfied: eligible,
configChecks,
};
}