@enactprotocol/cli 2.3.7 → 2.3.8

package/tests/commands/init.test.ts

@@ -107,7 +107,7 @@ describe("init command", () => {
       }
     });
 
-    test("default mode creates AGENTS.md for tool consumers", async () => {
+    test("default mode creates skill.package.yaml", async () => {
       const program = new Command();
       program.exitOverride();
       configureInitCommand(program);
@@ -116,27 +116,23 @@ describe("init command", () => {
       process.chdir(testDir);
 
       try {
-        await program.parseAsync(["node", "test", "init"]);
+        await program.parseAsync(["node", "test", "init", "--name", "test/my-tool"]);
       } catch {
         // Command may throw due to exitOverride
       } finally {
         process.chdir(originalCwd);
       }
 
-      const agentsPath = join(testDir, "AGENTS.md");
-      expect(existsSync(agentsPath)).toBe(true);
+      const packagePath = join(testDir, "skill.package.yaml");
+      expect(existsSync(packagePath)).toBe(true);
 
-      const content = readFileSync(agentsPath, "utf-8");
-      expect(content).toContain("enact search");
-      expect(content).toContain("enact install");
-      expect(content).toContain("Finding & Installing Tools");
-
-      // Should NOT create enact.md in default mode
-      const manifestPath = join(testDir, "enact.md");
-      expect(existsSync(manifestPath)).toBe(false);
+      const content = readFileSync(packagePath, "utf-8");
+      expect(content).toContain("name: test/my-tool");
+      expect(content).toContain("enact:");
+      expect(content).toContain("scripts:");
     });
 
-    test("default mode creates .enact/tools.json", async () => {
+    test("default mode creates hello.py", async () => {
       const program = new Command();
       program.exitOverride();
       configureInitCommand(program);
@@ -145,18 +141,19 @@ describe("init command", () => {
       process.chdir(testDir);
 
       try {
-        await program.parseAsync(["node", "test", "init"]);
+        await program.parseAsync(["node", "test", "init", "--name", "test/my-tool"]);
       } catch {
         // Command may throw due to exitOverride
       } finally {
         process.chdir(originalCwd);
       }
 
-      const toolsJsonPath = join(testDir, ".enact", "tools.json");
-      expect(existsSync(toolsJsonPath)).toBe(true);
+      const scriptPath = join(testDir, "hello.py");
+      expect(existsSync(scriptPath)).toBe(true);
 
-      const content = JSON.parse(readFileSync(toolsJsonPath, "utf-8"));
-      expect(content).toEqual({ tools: {} });
+      const content = readFileSync(scriptPath, "utf-8");
+      expect(content).toContain("json.dumps");
+      expect(content).toContain("Hello");
     });
 
     test("--tool mode creates SKILL.md", async () => {
@@ -267,7 +264,7 @@ describe("init command", () => {
       expect(existsSync(join(testDir, "AGENTS.md"))).toBe(false);
     });
 
-    test("--agent mode creates .enact/tools.json", async () => {
+    test("--agent mode creates agents/skills.json", async () => {
       const program = new Command();
       program.exitOverride();
       configureInitCommand(program);
@@ -283,14 +280,14 @@ describe("init command", () => {
         process.chdir(originalCwd);
       }
 
-      const toolsJsonPath = join(testDir, ".enact", "tools.json");
-      expect(existsSync(toolsJsonPath)).toBe(true);
+      const skillsJsonPath = join(testDir, "agents", "skills.json");
+      expect(existsSync(skillsJsonPath)).toBe(true);
 
-      const content = JSON.parse(readFileSync(toolsJsonPath, "utf-8"));
+      const content = JSON.parse(readFileSync(skillsJsonPath, "utf-8"));
       expect(content).toEqual({ tools: {} });
     });
 
-    test("--claude mode creates .enact/tools.json", async () => {
+    test("--claude mode creates agents/skills.json", async () => {
       const program = new Command();
       program.exitOverride();
       configureInitCommand(program);
@@ -306,20 +303,20 @@ describe("init command", () => {
         process.chdir(originalCwd);
       }
 
-      const toolsJsonPath = join(testDir, ".enact", "tools.json");
-      expect(existsSync(toolsJsonPath)).toBe(true);
+      const skillsJsonPath = join(testDir, "agents", "skills.json");
+      expect(existsSync(skillsJsonPath)).toBe(true);
 
-      const content = JSON.parse(readFileSync(toolsJsonPath, "utf-8"));
+      const content = JSON.parse(readFileSync(skillsJsonPath, "utf-8"));
       expect(content).toEqual({ tools: {} });
     });
 
-    test("--agent mode with --force overwrites existing .enact/tools.json", async () => {
-      // Create existing .enact/tools.json with some content
-      const enactDir = join(testDir, ".enact");
-      mkdirSync(enactDir, { recursive: true });
-      const toolsJsonPath = join(enactDir, "tools.json");
+    test("--agent mode with --force overwrites existing agents/skills.json", async () => {
+      // Create existing agents/skills.json with some content
+      const agentsDir = join(testDir, "agents");
+      mkdirSync(agentsDir, { recursive: true });
+      const skillsJsonPath = join(agentsDir, "skills.json");
       const existingContent = { tools: { "some/tool": "1.0.0" } };
-      writeFileSync(toolsJsonPath, JSON.stringify(existingContent));
+      writeFileSync(skillsJsonPath, JSON.stringify(existingContent));
 
       const program = new Command();
       program.exitOverride();
@@ -336,17 +333,17 @@ describe("init command", () => {
         process.chdir(originalCwd);
       }
 
-      const content = JSON.parse(readFileSync(toolsJsonPath, "utf-8"));
+      const content = JSON.parse(readFileSync(skillsJsonPath, "utf-8"));
       expect(content).toEqual({ tools: {} });
     });
 
-    test("--agent mode preserves existing .enact/tools.json without --force", async () => {
-      // Create existing .enact/tools.json with some content
-      const enactDir = join(testDir, ".enact");
-      mkdirSync(enactDir, { recursive: true });
-      const toolsJsonPath = join(enactDir, "tools.json");
+    test("--agent mode preserves existing agents/skills.json without --force", async () => {
+      // Create existing agents/skills.json with some content
+      const agentsDir = join(testDir, "agents");
+      mkdirSync(agentsDir, { recursive: true });
+      const skillsJsonPath = join(agentsDir, "skills.json");
       const existingContent = { tools: { "some/tool": "1.0.0" } };
-      writeFileSync(toolsJsonPath, JSON.stringify(existingContent));
+      writeFileSync(skillsJsonPath, JSON.stringify(existingContent));
 
       // Also create AGENTS.md so the command doesn't fail early
       writeFileSync(join(testDir, "AGENTS.md"), "existing");
@@ -359,10 +356,6 @@ describe("init command", () => {
       process.chdir(testDir);
 
       try {
-        // Without --force, AGENTS.md check will fail and return early
-        // So we need to test with --force on AGENTS.md but not tools.json
-        // Actually the --force flag applies to both, so let's just verify
-        // tools.json is preserved when it exists and no --force
         await program.parseAsync(["node", "test", "init", "--agent"]);
       } catch {
         // Command may throw due to exitOverride or warning about existing file
@@ -370,12 +363,12 @@ describe("init command", () => {
         process.chdir(originalCwd);
       }
 
-      // tools.json should be preserved since AGENTS.md existed and no --force was used
-      const content = JSON.parse(readFileSync(toolsJsonPath, "utf-8"));
+      // skills.json should be preserved since AGENTS.md existed and no --force was used
+      const content = JSON.parse(readFileSync(skillsJsonPath, "utf-8"));
       expect(content).toEqual(existingContent);
     });
 
-    test("--tool mode does NOT create .enact/tools.json", async () => {
+    test("--tool mode does NOT create agents/skills.json", async () => {
       const program = new Command();
       program.exitOverride();
       configureInitCommand(program);
@@ -391,8 +384,8 @@ describe("init command", () => {
         process.chdir(originalCwd);
       }
 
-      const toolsJsonPath = join(testDir, ".enact", "tools.json");
-      expect(existsSync(toolsJsonPath)).toBe(false);
+      const skillsJsonPath = join(testDir, "agents", "skills.json");
+      expect(existsSync(skillsJsonPath)).toBe(false);
     });
 
     test("SKILL.md contains valid YAML frontmatter", async () => {
@@ -481,21 +474,39 @@ describe("init command", () => {
       expect(content).toContain("enact search");
       expect(content).toContain("enact install");
       expect(content).toContain("enact list");
-      expect(content).toContain(".enact/tools.json");
+      expect(content).toContain("agents/skills.json");
     });
   });
 
   describe("option conflicts", () => {
-    test("--agent is the default when no mode specified", () => {
+    test("default mode creates a skill when no mode specified", async () => {
       const program = new Command();
+      program.exitOverride();
       configureInitCommand(program);
 
-      const initCmd = program.commands.find((cmd) => cmd.name() === "init");
-      const opts = initCmd?.options ?? [];
-      const agentOpt = opts.find((o) => o.long === "--agent");
+      const testDir = join(import.meta.dir, ".test-init-default");
+      if (existsSync(testDir)) {
+        rmSync(testDir, { recursive: true });
+      }
+      mkdirSync(testDir, { recursive: true });
+
+      const originalCwd = process.cwd();
+      process.chdir(testDir);
+
+      try {
+        await program.parseAsync(["node", "test", "init", "--name", "test/tool"]);
+      } catch {
+        // Command may throw due to exitOverride
+      } finally {
+        process.chdir(originalCwd);
+      }
+
+      // Default should create skill files, not AGENTS.md
+      expect(existsSync(join(testDir, "skill.package.yaml"))).toBe(true);
+      expect(existsSync(join(testDir, "hello.py"))).toBe(true);
+      expect(existsSync(join(testDir, "AGENTS.md"))).toBe(false);
 
-      // Description should indicate it's the default
-      expect(agentOpt?.description).toContain("default");
+      rmSync(testDir, { recursive: true });
     });
   });
 

package/tests/commands/install-integration.test.ts

@@ -167,9 +167,9 @@ describe("install integration", () => {
     test("global install extracts to skills path", async () => {
       const { getToolCachePath } = await import("@enactprotocol/shared");
 
-      // Verify skill path structure (~/.agent/skills/{name}/, no version subdir)
+      // Verify skill path structure (~/.agents/skills/{name}/, no version subdir)
       const skillPath = getToolCachePath("test/sample-tool", "1.0.0");
-      expect(skillPath).toContain(".agent");
+      expect(skillPath).toContain(".agents");
       expect(skillPath).toContain("skills");
       expect(skillPath).toContain("test/sample-tool");
     });
@@ -260,7 +260,7 @@ describe("tools.json edge cases", () => {
   const EDGE_TEST_DIR = join(TEST_BASE, "edge-cases");
 
   beforeAll(() => {
-    mkdirSync(join(EDGE_TEST_DIR, ".enact"), { recursive: true });
+    mkdirSync(join(EDGE_TEST_DIR, "agents"), { recursive: true });
   });
 
   afterAll(() => {
@@ -270,10 +270,10 @@ describe("tools.json edge cases", () => {
   });
 
   beforeEach(() => {
-    // Ensure .enact directory exists
-    mkdirSync(join(EDGE_TEST_DIR, ".enact"), { recursive: true });
+    // Ensure agents directory exists
+    mkdirSync(join(EDGE_TEST_DIR, "agents"), { recursive: true });
 
-    const jsonPath = join(EDGE_TEST_DIR, ".enact", "tools.json");
+    const jsonPath = join(EDGE_TEST_DIR, "agents", "skills.json");
     if (existsSync(jsonPath)) {
       rmSync(jsonPath);
     }

package/tests/e2e.test.ts

@@ -119,8 +119,8 @@ describe("E2E: Tool Installation Flow", () => {
     }
   });
 
-  test("installs tool to project .enact/tools directory", () => {
-    const destBase = join(tempDir, ".enact", "tools");
+  test("installs tool to project agents/skills directory", () => {
+    const destBase = join(tempDir, "agents", "skills");
     const { manifest, destPath } = installTool(GREETER_TOOL, destBase);
 
     expect(manifest.name).toBe("test/greeter");
@@ -138,7 +138,7 @@ describe("E2E: Tool Installation Flow", () => {
   });
 
   test("installs markdown tool correctly", () => {
-    const destBase = join(tempDir, ".enact", "tools");
+    const destBase = join(tempDir, "agents", "skills");
     const { manifest, destPath } = installTool(ECHO_TOOL, destBase);
 
     expect(manifest.name).toBe("test/echo-tool");
@@ -146,7 +146,7 @@ describe("E2E: Tool Installation Flow", () => {
   });
 
   test("installs multiple tools without conflict", () => {
-    const destBase = join(tempDir, ".enact", "tools");
+    const destBase = join(tempDir, "agents", "skills");
 
     const result1 = installTool(GREETER_TOOL, destBase);
     const result2 = installTool(ECHO_TOOL, destBase);
@@ -163,7 +163,7 @@ describe("E2E: Tool Installation Flow", () => {
   });
 
   test("overwrites existing tool on reinstall", () => {
-    const destBase = join(tempDir, ".enact", "tools");
+    const destBase = join(tempDir, "agents", "skills");
 
     // First install
     const result1 = installTool(GREETER_TOOL, destBase);
@@ -192,7 +192,7 @@ describe("E2E: Tool Resolution Flow", () => {
     mkdirSync(resolveTempDir, { recursive: true });
 
     // Install tools
-    const destBase = join(resolveTempDir, ".enact", "tools");
+    const destBase = join(resolveTempDir, "agents", "skills");
     installTool(GREETER_TOOL, destBase);
     installTool(ECHO_TOOL, destBase);
     installTool(CALCULATOR_TOOL, destBase);
@@ -212,7 +212,7 @@ describe("E2E: Tool Resolution Flow", () => {
 
   test("resolves tool by path", () => {
     // Resolve from installed location
-    const toolPath = join(resolveTempDir, ".enact", "tools", "test", "greeter");
+    const toolPath = join(resolveTempDir, "agents", "skills", "test", "greeter");
     const resolution = tryResolveTool(toolPath);
     expect(resolution).not.toBeNull();
     expect(resolution?.manifest.name).toBe("test/greeter");
@@ -483,7 +483,7 @@ describe("E2E: Full Workflow", () => {
 
   test("complete install -> resolve -> validate -> prepare flow (scripts)", () => {
     // 1. Install tool
-    const destBase = join(tempDir, ".enact", "tools");
+    const destBase = join(tempDir, "agents", "skills");
     const { manifest } = installTool(GREETER_TOOL, destBase);
     expect(manifest.name).toBe("test/greeter");
 
@@ -509,7 +509,7 @@ describe("E2E: Full Workflow", () => {
 
   test("complete calculator workflow (scripts)", () => {
     // 1. Install tool
-    const destBase = join(tempDir, ".enact", "tools");
+    const destBase = join(tempDir, "agents", "skills");
     const { manifest } = installTool(CALCULATOR_TOOL, destBase);
 
     // 2. Resolve tool
@@ -544,7 +544,7 @@ describe("E2E: Full Workflow", () => {
 
   test("handles markdown tool workflow (scripts)", () => {
     // Install markdown-based tool
-    const destBase = join(tempDir, ".enact", "tools");
+    const destBase = join(tempDir, "agents", "skills");
     const { manifest } = installTool(ECHO_TOOL, destBase);
     expect(manifest.name).toBe("test/echo-tool");