fix(skills): preserve plugin prompt paths in state roots

kesslerio · kesslerio · commit 086a2fe65775 · 2026-06-14T08:32:47.000-07:00
diff --git a/src/skills/loading/compact-skill-paths.test.ts b/src/skills/loading/compact-skill-paths.test.ts
@@ -79,6 +79,29 @@ describe("compactSkillPaths", () => {
     expect(prompt).not.toContain("~/.openclaw/skills/world-cup-soccer-openclaw-skill/SKILL.md");
   });
 
+  it("does not compact AlphaClaw state-root plugin skill paths to OS-home tilde paths", () => {
+    const root = path.parse(os.homedir()).root;
+    const osHome = path.join(root, "data");
+    const stateDir = path.join(osHome, ".openclaw");
+    const skillDir = path.join(stateDir, "plugin-skills", "calendar-plugin-skill");
+    const skillFile = path.join(skillDir, "SKILL.md");
+
+    vi.stubEnv("HOME", osHome);
+    vi.stubEnv("OPENCLAW_HOME", osHome);
+    vi.stubEnv("OPENCLAW_STATE_DIR", stateDir);
+    vi.stubEnv("OPENCLAW_CONFIG_PATH", path.join(stateDir, "openclaw.json"));
+
+    const prompt = buildPromptForFixtureSkill({
+      workspaceRoot: path.join(root, "workspace"),
+      skillDir,
+      name: "calendar-plugin-skill",
+      description: "Calendar plugin skill",
+    });
+
+    expect(prompt).toContain(`<location>${skillFile}</location>`);
+    expect(prompt).not.toContain("~/.openclaw/plugin-skills/calendar-plugin-skill/SKILL.md");
+  });
+
   it("compacts managed skill paths when OS-home tilde reaches the same path", () => {
     const home = os.homedir();
     const stateDir = path.join(home, ".openclaw");
diff --git a/src/skills/loading/workspace.ts b/src/skills/loading/workspace.ts
@@ -89,12 +89,15 @@ function compactSkillPaths(skills: Skill[]): Skill[] {
 }
 
 function resolvePreservedPromptSkillPathRoots(): string[] {
-  const managedSkillsDir = path.resolve(resolveConfigDir(), "skills");
-  const realManagedSkillsDir = tryRealpath(managedSkillsDir);
-  return uniqueStrings([
-    managedSkillsDir,
-    ...(realManagedSkillsDir ? [realManagedSkillsDir] : []),
-  ]);
+  const configDir = resolveConfigDir();
+  const promptSkillDirs = [
+    path.resolve(configDir, "skills"),
+    path.resolve(configDir, "plugin-skills"),
+  ];
+  const realPromptSkillDirs = promptSkillDirs
+    .map((dir) => tryRealpath(dir))
+    .filter((dir): dir is string => Boolean(dir));
+  return uniqueStrings([...promptSkillDirs, ...realPromptSkillDirs]);
 }
 
 function resolvePromptTildeRoots(): string[] {
