From 4ddbdff7c00706afde5edbc8443bcd4d872d5a10 Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Tue, 5 May 2026 20:07:15 +0100 Subject: [PATCH] refactor: drop legacy agent path files --- src/agents/agent-paths.test.ts | 85 ---------------------------------- src/agents/agent-paths.ts | 13 ------ 2 files changed, 98 deletions(-) delete mode 100644 src/agents/agent-paths.test.ts delete mode 100644 src/agents/agent-paths.ts diff --git a/src/agents/agent-paths.test.ts b/src/agents/agent-paths.test.ts deleted file mode 100644 index 678227dee4e..00000000000 --- a/src/agents/agent-paths.test.ts +++ /dev/null @@ -1,85 +0,0 @@ -import fs from "node:fs/promises"; -import os from "node:os"; -import path from "node:path"; -import { describe, expect, it } from "vitest"; -import { withEnv } from "../test-utils/env.js"; -import { resolveOpenClawAgentDir } from "./agent-paths.js"; - -describe("resolveOpenClawAgentDir", () => { - const withTempStateDir = async (run: (stateDir: string) => void) => { - const stateDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-agent-")); - try { - run(stateDir); - } finally { - await fs.rm(stateDir, { recursive: true, force: true }); - } - }; - - it("defaults to the multi-agent path when no overrides are set", async () => { - await withTempStateDir((stateDir) => { - withEnv( - { - OPENCLAW_STATE_DIR: stateDir, - OPENCLAW_AGENT_DIR: undefined, - PI_CODING_AGENT_DIR: undefined, - }, - () => { - const resolved = resolveOpenClawAgentDir(); - expect(resolved).toBe(path.join(stateDir, "agents", "main", "agent")); - }, - ); - }); - }); - - it("honors OPENCLAW_AGENT_DIR overrides", async () => { - await withTempStateDir((stateDir) => { - const override = path.join(stateDir, "agent"); - withEnv( - { - OPENCLAW_STATE_DIR: undefined, - OPENCLAW_AGENT_DIR: override, - PI_CODING_AGENT_DIR: undefined, - }, - () => { - const resolved = resolveOpenClawAgentDir(); - expect(resolved).toBe(path.resolve(override)); - }, - ); - }); - }); - - it("honors PI_CODING_AGENT_DIR when OPENCLAW_AGENT_DIR is unset", async () => { - await withTempStateDir((stateDir) => { - const override = path.join(stateDir, "pi-agent"); - withEnv( - { - OPENCLAW_STATE_DIR: undefined, - OPENCLAW_AGENT_DIR: undefined, - PI_CODING_AGENT_DIR: override, - }, - () => { - const resolved = resolveOpenClawAgentDir(); - expect(resolved).toBe(path.resolve(override)); - }, - ); - }); - }); - - it("prefers OPENCLAW_AGENT_DIR over PI_CODING_AGENT_DIR when both are set", async () => { - await withTempStateDir((stateDir) => { - const primaryOverride = path.join(stateDir, "primary-agent"); - const fallbackOverride = path.join(stateDir, "fallback-agent"); - withEnv( - { - OPENCLAW_STATE_DIR: undefined, - OPENCLAW_AGENT_DIR: primaryOverride, - PI_CODING_AGENT_DIR: fallbackOverride, - }, - () => { - const resolved = resolveOpenClawAgentDir(); - expect(resolved).toBe(path.resolve(primaryOverride)); - }, - ); - }); - }); -}); diff --git a/src/agents/agent-paths.ts b/src/agents/agent-paths.ts deleted file mode 100644 index c3d70c445ab..00000000000 --- a/src/agents/agent-paths.ts +++ /dev/null @@ -1,13 +0,0 @@ -import path from "node:path"; -import { resolveStateDir } from "../config/paths.js"; -import { DEFAULT_AGENT_ID } from "../routing/session-key.js"; -import { resolveUserPath } from "../utils.js"; - -export function resolveOpenClawAgentDir(env: NodeJS.ProcessEnv = process.env): string { - const override = env.OPENCLAW_AGENT_DIR?.trim() || env.PI_CODING_AGENT_DIR?.trim(); - if (override) { - return resolveUserPath(override, env); - } - const defaultAgentDir = path.join(resolveStateDir(env), "agents", DEFAULT_AGENT_ID, "agent"); - return resolveUserPath(defaultAgentDir, env); -}