fix(skills): prevent skills loading crash

This commit is contained in:
Peter Steinberger
2025-12-20 11:49:24 +00:00
parent f0ebad3f21
commit 0e2993a6c8
5 changed files with 143 additions and 12 deletions

View File

@@ -35,6 +35,16 @@ ${body ?? `# ${name}\n`}
}
describe("buildWorkspaceSkillsPrompt", () => {
it("returns empty prompt when skills dirs are missing", async () => {
const workspaceDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdis-"));
const prompt = buildWorkspaceSkillsPrompt(workspaceDir, {
managedSkillsDir: path.join(workspaceDir, ".managed"),
});
expect(prompt).toBe("");
});
it("loads skills from workspace skills/", async () => {
const workspaceDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdis-"));
const skillDir = path.join(workspaceDir, "skills", "demo-skill");
@@ -196,6 +206,19 @@ describe("buildWorkspaceSkillsPrompt", () => {
});
});
describe("buildWorkspaceSkillSnapshot", () => {
it("returns an empty snapshot when skills dirs are missing", async () => {
const workspaceDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdis-"));
const snapshot = buildWorkspaceSkillSnapshot(workspaceDir, {
managedSkillsDir: path.join(workspaceDir, ".managed"),
});
expect(snapshot.prompt).toBe("");
expect(snapshot.skills).toEqual([]);
});
});
describe("applySkillEnvOverrides", () => {
it("sets and restores env vars", async () => {
const workspaceDir = await fs.mkdtemp(path.join(os.tmpdir(), "clawdis-"));

View File

@@ -5,7 +5,6 @@ import {
formatSkillsForPrompt,
loadSkillsFromDir,
type Skill,
type SkillFrontmatter,
} from "@mariozechner/pi-coding-agent";
import type { ClawdisConfig, SkillConfig } from "../config/config.js";
@@ -22,9 +21,11 @@ type ClawdisSkillMetadata = {
};
};
type ParsedSkillFrontmatter = Record<string, string>;
type SkillEntry = {
skill: Skill;
frontmatter: SkillFrontmatter;
frontmatter: ParsedSkillFrontmatter;
clawdis?: ClawdisSkillMetadata;
};
@@ -34,7 +35,7 @@ export type SkillSnapshot = {
};
function getFrontmatterValue(
frontmatter: SkillFrontmatter,
frontmatter: ParsedSkillFrontmatter,
key: string,
): string | undefined {
const raw = frontmatter[key];
@@ -51,8 +52,8 @@ function stripQuotes(value: string): string {
return value;
}
function parseFrontmatter(content: string): SkillFrontmatter {
const frontmatter: SkillFrontmatter = {};
function parseFrontmatter(content: string): ParsedSkillFrontmatter {
const frontmatter: ParsedSkillFrontmatter = {};
const normalized = content.replace(/\r\n/g, "\n").replace(/\r/g, "\n");
if (!normalized.startsWith("---")) return frontmatter;
const endIndex = normalized.indexOf("\n---", 3);
@@ -143,7 +144,7 @@ function hasBinary(bin: string): boolean {
}
function resolveClawdisMetadata(
frontmatter: SkillFrontmatter,
frontmatter: ParsedSkillFrontmatter,
): ClawdisSkillMetadata | undefined {
const raw = getFrontmatterValue(frontmatter, "metadata");
if (!raw) return undefined;
@@ -324,11 +325,11 @@ function loadSkillEntries(
const managedSkills = loadSkillsFromDir({
dir: managedSkillsDir,
source: "clawdis-managed",
}).skills;
});
const workspaceSkills = loadSkillsFromDir({
dir: workspaceSkillsDir,
source: "clawdis-workspace",
}).skills;
});
const merged = new Map<string, Skill>();
for (const skill of managedSkills) merged.set(skill.name, skill);
@@ -336,7 +337,7 @@ function loadSkillEntries(
const skillEntries: SkillEntry[] = Array.from(merged.values()).map(
(skill) => {
let frontmatter: SkillFrontmatter = {};
let frontmatter: ParsedSkillFrontmatter = {};
try {
const raw = fs.readFileSync(skill.filePath, "utf-8");
frontmatter = parseFrontmatter(raw);