456bd58740
* fix(paths): structurally resolve home dir to prevent Windows path bugs
Extract resolveRawHomeDir as a private function and gate the public
resolveEffectiveHomeDir through a single path.resolve() exit point.
This makes it structurally impossible for unresolved paths (missing
drive letter on Windows) to escape the function, regardless of how
many return paths exist in the raw lookup logic.
Simplify resolveRequiredHomeDir to only resolve the process.cwd()
fallback, since resolveEffectiveHomeDir now returns resolved values.
Fix shortenMeta in tool-meta.ts: the colon-based split for file:line
patterns (e.g. file.txt:12) conflicts with Windows drive letters
(C:\...) because indexOf(":") matches the drive colon first.
shortenHomeInString already handles file:line patterns correctly via
split/join, so the colon split was both unnecessary and harmful.
Update test assertions across all affected files to use path.resolve()
in expected values and input strings so they match the now-correct
resolved output on both Unix and Windows.
Fixes #12119
* fix(changelog): add paths Windows fix entry (#12125)
---------
Co-authored-by: Sebastian <19554889+sebslight@users.noreply.github.com>
62 lines
2.2 KiB
TypeScript
62 lines
2.2 KiB
TypeScript
import path from "node:path";
|
|
import { describe, expect, it } from "vitest";
|
|
import { makeTempWorkspace, writeWorkspaceFile } from "../test-helpers/workspace.js";
|
|
import {
|
|
DEFAULT_MEMORY_ALT_FILENAME,
|
|
DEFAULT_MEMORY_FILENAME,
|
|
loadWorkspaceBootstrapFiles,
|
|
resolveDefaultAgentWorkspaceDir,
|
|
} from "./workspace.js";
|
|
|
|
describe("resolveDefaultAgentWorkspaceDir", () => {
|
|
it("uses OPENCLAW_HOME for default workspace resolution", () => {
|
|
const dir = resolveDefaultAgentWorkspaceDir({
|
|
OPENCLAW_HOME: "/srv/openclaw-home",
|
|
HOME: "/home/other",
|
|
} as NodeJS.ProcessEnv);
|
|
|
|
expect(dir).toBe(path.join(path.resolve("/srv/openclaw-home"), ".openclaw", "workspace"));
|
|
});
|
|
});
|
|
|
|
describe("loadWorkspaceBootstrapFiles", () => {
|
|
it("includes MEMORY.md when present", async () => {
|
|
const tempDir = await makeTempWorkspace("openclaw-workspace-");
|
|
await writeWorkspaceFile({ dir: tempDir, name: "MEMORY.md", content: "memory" });
|
|
|
|
const files = await loadWorkspaceBootstrapFiles(tempDir);
|
|
const memoryEntries = files.filter((file) =>
|
|
[DEFAULT_MEMORY_FILENAME, DEFAULT_MEMORY_ALT_FILENAME].includes(file.name),
|
|
);
|
|
|
|
expect(memoryEntries).toHaveLength(1);
|
|
expect(memoryEntries[0]?.missing).toBe(false);
|
|
expect(memoryEntries[0]?.content).toBe("memory");
|
|
});
|
|
|
|
it("includes memory.md when MEMORY.md is absent", async () => {
|
|
const tempDir = await makeTempWorkspace("openclaw-workspace-");
|
|
await writeWorkspaceFile({ dir: tempDir, name: "memory.md", content: "alt" });
|
|
|
|
const files = await loadWorkspaceBootstrapFiles(tempDir);
|
|
const memoryEntries = files.filter((file) =>
|
|
[DEFAULT_MEMORY_FILENAME, DEFAULT_MEMORY_ALT_FILENAME].includes(file.name),
|
|
);
|
|
|
|
expect(memoryEntries).toHaveLength(1);
|
|
expect(memoryEntries[0]?.missing).toBe(false);
|
|
expect(memoryEntries[0]?.content).toBe("alt");
|
|
});
|
|
|
|
it("omits memory entries when no memory files exist", async () => {
|
|
const tempDir = await makeTempWorkspace("openclaw-workspace-");
|
|
|
|
const files = await loadWorkspaceBootstrapFiles(tempDir);
|
|
const memoryEntries = files.filter((file) =>
|
|
[DEFAULT_MEMORY_FILENAME, DEFAULT_MEMORY_ALT_FILENAME].includes(file.name),
|
|
);
|
|
|
|
expect(memoryEntries).toHaveLength(0);
|
|
});
|
|
});
|