@enactprotocol/shared 2.2.4 → 2.3.4

package/tests/paths.test.ts

@@ -9,6 +9,7 @@ import {
   getGlobalEnvPath,
   getProjectEnactDir,
   getProjectEnvPath,
+  getSkillsDir,
   getToolsDir,
 } from "../src/paths";
 
@@ -106,14 +107,20 @@ describe("path utilities", () => {
     });
   });
 
-  describe("getCacheDir", () => {
-    test("returns ~/.enact/cache/ path", () => {
-      const result = getCacheDir();
-      const expected = join(homedir(), ".enact", "cache");
+  describe("getSkillsDir", () => {
+    test("returns ~/.agent/skills/ path", () => {
+      const result = getSkillsDir();
+      const expected = join(homedir(), ".agent", "skills");
       expect(result).toBe(expected);
     });
   });
 
+  describe("getCacheDir (deprecated)", () => {
+    test("returns same path as getSkillsDir", () => {
+      expect(getCacheDir()).toBe(getSkillsDir());
+    });
+  });
+
   describe("getConfigPath", () => {
     test("returns ~/.enact/config.yaml path", () => {
       const result = getConfigPath();

package/tests/registry.test.ts

@@ -199,18 +199,19 @@ describe("registry", () => {
   });
 
   describe("getToolCachePath", () => {
-    test("returns cache path with version", () => {
+    test("returns skill path under ~/.agent/skills/", () => {
       const path = getToolCachePath("org/tool", "1.0.0");
-      expect(path).toContain(".enact");
-      expect(path).toContain("cache");
+      expect(path).toContain(".agent");
+      expect(path).toContain("skills");
       expect(path).toContain("org/tool");
-      expect(path).toContain("v1.0.0");
+      // No version subdirectory in new layout
+      expect(path).not.toContain("v1.0.0");
     });
 
-    test("normalizes version prefix", () => {
-      const pathWithV = getToolCachePath("org/tool", "v1.0.0");
-      const pathWithoutV = getToolCachePath("org/tool", "1.0.0");
-      expect(pathWithV).toBe(pathWithoutV);
+    test("returns same path regardless of version", () => {
+      const path1 = getToolCachePath("org/tool", "1.0.0");
+      const path2 = getToolCachePath("org/tool", "2.0.0");
+      expect(path1).toBe(path2);
     });
   });
 
@@ -296,11 +297,11 @@ describe("registry", () => {
 
   describe("resolveAlias", () => {
     test("resolves existing alias to tool name", () => {
-      addToolToRegistry("org/category/full-name", "1.0.0", "project", PROJECT_DIR);
-      addAlias("short", "org/category/full-name", "project", PROJECT_DIR);
+      addToolToRegistry("org/full-name", "1.0.0", "project", PROJECT_DIR);
+      addAlias("short", "org/full-name", "project", PROJECT_DIR);
 
       const resolved = resolveAlias("short", "project", PROJECT_DIR);
-      expect(resolved).toBe("org/category/full-name");
+      expect(resolved).toBe("org/full-name");
 
       // Clean up
       rmSync(join(PROJECT_ENACT_DIR, "tools.json"));

package/tests/resolver.test.ts

@@ -25,7 +25,7 @@ describe("tool resolver", () => {
 
     // Create a project-level tool
     writeFileSync(
-      join(PROJECT_ENACT_DIR, "tools", "test", "project-tool", "enact.yaml"),
+      join(PROJECT_ENACT_DIR, "tools", "test", "project-tool", "skill.yaml"),
       `
 name: test/project-tool
 description: A project-level test tool
@@ -37,7 +37,7 @@ version: "1.0.0"
     // Create a direct tool directory for path-based resolution
     mkdirSync(join(TEST_DIR, "direct-tool"), { recursive: true });
     writeFileSync(
-      join(TEST_DIR, "direct-tool", "enact.yaml"),
+      join(TEST_DIR, "direct-tool", "skill.yaml"),
       `
 name: test/direct-tool
 description: A directly referenced tool
@@ -74,11 +74,11 @@ Documentation here.
   describe("utility functions", () => {
     describe("normalizeToolName", () => {
       test("lowercases name", () => {
-        expect(normalizeToolName("Acme/Utils/Greeter")).toBe("acme/utils/greeter");
+        expect(normalizeToolName("Acme/Greeter")).toBe("acme/greeter");
       });
 
       test("converts backslashes to forward slashes", () => {
-        expect(normalizeToolName("acme\\utils\\greeter")).toBe("acme/utils/greeter");
+        expect(normalizeToolName("acme\\greeter")).toBe("acme/greeter");
       });
 
       test("trims whitespace", () => {
@@ -88,7 +88,11 @@ Documentation here.
 
     describe("toolNameToPath", () => {
       test("returns path-like string", () => {
-        expect(toolNameToPath("acme/utils/greeter")).toBe("acme/utils/greeter");
+        expect(toolNameToPath("acme/greeter")).toBe("acme/greeter");
+      });
+
+      test("strips @ prefix for disk paths", () => {
+        expect(toolNameToPath("@acme/greeter")).toBe("acme/greeter");
       });
 
       test("normalizes backslashes", () => {
@@ -142,7 +146,7 @@ Documentation here.
     });
 
     test("resolves tool from manifest file directly", () => {
-      const manifestPath = join(TEST_DIR, "direct-tool", "enact.yaml");
+      const manifestPath = join(TEST_DIR, "direct-tool", "skill.yaml");
       const result = resolveToolFromPath(manifestPath);
 
       expect(result.manifest.name).toBe("test/direct-tool");
@@ -314,7 +318,7 @@ Documentation here.
     test("full tool names bypass alias resolution", () => {
       addToolToRegistry("test/project-tool", "1.0.0", "project", PROJECT_DIR);
       // Create an alias that would conflict if checked
-      addAlias("test/project-tool", "some/other/tool", "project", PROJECT_DIR);
+      addAlias("test/project-tool", "some/other-tool", "project", PROJECT_DIR);
 
       try {
         // Full name with slashes should resolve directly, not via alias