vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-16 12:10:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: remove legacy agent dir resolver

Browse Source
This commit is contained in:
Peter Steinberger
2026-05-05 20:06:09 +01:00
parent e8a9c766c2
commit 35da7d2c99
70 changed files with 302 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/agents/cli-runner/prepare.ts
View File

@@ -12,8 +12,7 @@ import type {
import { buildAgentHookContextChannelFields } from "../../plugins/hook-agent-context.js";
import { getGlobalHookRunner } from "../../plugins/hook-runner-global.js";
import { annotateInterSessionPromptText } from "../../sessions/input-provenance.js";
import { resolveOpenClawAgentDir } from "../agent-paths.js";
import { resolveSessionAgentIds } from "../agent-scope.js";
import { resolveAgentDir, resolveSessionAgentIds } from "../agent-scope.js";
import { externalCliDiscoveryForProviderAuth } from "../auth-profiles/external-cli-discovery.js";
import { loadAuthProfileStoreForRuntime } from "../auth-profiles/store.js";
import type { AuthProfileCredential } from "../auth-profiles/types.js";
@@ -119,7 +118,12 @@ export async function prepareCliRunContext(
`CLI backend ${backendResolved.id} cannot run with tools disabled because it exposes native tools`,
);
}
const agentDir = resolveOpenClawAgentDir();
const { defaultAgentId, sessionAgentId } = resolveSessionAgentIds({
sessionKey: params.sessionKey,
config: params.config,
agentId: params.agentId,
});
const agentDir = resolveAgentDir(params.config ?? {}, sessionAgentId);
const requestedAuthProfileId = params.authProfileId?.trim() || undefined;
const effectiveAuthProfileId =
requestedAuthProfileId ?? backendResolved.defaultAuthProfileId?.trim() ?? undefined;
@@ -175,11 +179,6 @@ export async function prepareCliRunContext(
seenSignatures: params.bootstrapPromptWarningSignaturesSeen,
previousSignature: params.bootstrapPromptWarningSignature,
});
const { defaultAgentId, sessionAgentId } = resolveSessionAgentIds({
sessionKey: params.sessionKey,
config: params.config,
agentId: params.agentId,
});
const bundleMcpEnabled = backendResolved.bundleMcp && params.disableTools !== true;
let mcpLoopbackRuntime = bundleMcpEnabled ? prepareDeps.getActiveMcpLoopbackRuntime() : undefined;
if (bundleMcpEnabled && !mcpLoopbackRuntime) {