vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-03-22 15:31:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(runtime): lazy-load setup shims and align contracts

Browse Source
This commit is contained in:
Vincent Koc
2026-03-19 12:17:25 -07:00
parent 7bbd01379e
commit 3b79494cbf
22 changed files with 909 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/cli/command-secret-gateway.ts
View File

@@ -314,6 +314,12 @@ function isUnsupportedSecretsResolveError(err: unknown): boolean {
);
}
function isDirectRuntimeWebTargetPath(path: string): boolean {
return (
path === "tools.web.fetch.firecrawl.apiKey" || /^tools\.web\.search\.[^.]+\.apiKey$/.test(path)
);
}
async function resolveCommandSecretRefsLocally(params: {
config: OpenClawConfig;
commandName: string;
@@ -329,12 +335,22 @@ async function resolveCommandSecretRefsLocally(params: {
env: process.env,
});
const localResolutionDiagnostics: string[] = [];
const discoveredTargets = discoverConfigSecretTargetsByIds(sourceConfig, params.targetIds).filter(
(target) => !params.allowedPaths || params.allowedPaths.has(target.path),
);
const runtimeWebTargets = discoveredTargets.filter((target) =>
targetsRuntimeWebPath(target.path),
);
collectConfigAssignments({
config: structuredClone(params.config),
context,
});
if (
targetsRuntimeWebResolution({ targetIds: params.targetIds, allowedPaths: params.allowedPaths })
targetsRuntimeWebResolution({
targetIds: params.targetIds,
allowedPaths: params.allowedPaths,
}) &&
!runtimeWebTargets.every((target) => isDirectRuntimeWebTargetPath(target.path))
) {
try {
await resolveRuntimeWebTools({
@@ -359,13 +375,7 @@ async function resolveCommandSecretRefsLocally(params: {
);
const runtimeWebActivePaths = new Set<string>();
const runtimeWebInactiveDiagnostics: string[] = [];
for (const target of discoverConfigSecretTargetsByIds(sourceConfig, params.targetIds)) {
if (!targetsRuntimeWebPath(target.path)) {
continue;
}
if (params.allowedPaths && !params.allowedPaths.has(target.path)) {
continue;
}
for (const target of runtimeWebTargets) {
const runtimeState = classifyRuntimeWebTargetPathState({
config: sourceConfig,
path: target.path,
@@ -390,10 +400,7 @@ async function resolveCommandSecretRefsLocally(params: {
.filter((warning) => !params.allowedPaths || params.allowedPaths.has(warning.path))
.map((warning) => warning.message);
const activePaths = new Set(context.assignments.map((assignment) => assignment.path));
for (const target of discoverConfigSecretTargetsByIds(sourceConfig, params.targetIds)) {
if (params.allowedPaths && !params.allowedPaths.has(target.path)) {
continue;
}
for (const target of discoveredTargets) {
await resolveTargetSecretLocally({
target,
sourceConfig,