@enactprotocol/cli 2.2.2 → 2.3.1

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

@@ -46,7 +46,7 @@ describe("install integration", () => {
     mkdirSync(join(TEST_GLOBAL_HOME, ".enact", "cache"), { recursive: true });
 
     // Create sample tool source
-    writeFileSync(join(TEST_TOOL_SRC, "enact.yaml"), SAMPLE_MANIFEST);
+    writeFileSync(join(TEST_TOOL_SRC, "skill.yaml"), SAMPLE_MANIFEST);
   });
 
   beforeEach(() => {
@@ -92,7 +92,7 @@ describe("install integration", () => {
 
       // Verify installation
       expect(existsSync(destPath)).toBe(true);
-      expect(existsSync(join(destPath, "enact.yaml"))).toBe(true);
+      expect(existsSync(join(destPath, "skill.yaml"))).toBe(true);
 
       // Verify manifest can be loaded from destination
       const installedManifest = loadManifestFromDir(destPath);
@@ -118,7 +118,7 @@ describe("install integration", () => {
       // Create v2 source
       const v2Source = join(TEST_BASE, "source-tool-v2");
       mkdirSync(v2Source, { recursive: true });
-      writeFileSync(join(v2Source, "enact.yaml"), SAMPLE_MANIFEST_V2);
+      writeFileSync(join(v2Source, "skill.yaml"), SAMPLE_MANIFEST_V2);
 
       // Simulate force overwrite
       rmSync(destPath, { recursive: true, force: true });
@@ -164,15 +164,14 @@ describe("install integration", () => {
       expect(getInstalledVersion("test/sample-tool", "project", TEST_PROJECT)).toBe("2.0.0");
     });
 
-    test("global install extracts to cache path", async () => {
+    test("global install extracts to skills path", async () => {
       const { getToolCachePath } = await import("@enactprotocol/shared");
 
-      // Verify cache path structure
-      const cachePath = getToolCachePath("test/sample-tool", "1.0.0");
-      expect(cachePath).toContain(".enact");
-      expect(cachePath).toContain("cache");
-      expect(cachePath).toContain("test/sample-tool");
-      expect(cachePath).toContain("v1.0.0");
+      // Verify skill path structure (~/.agent/skills/{name}/, no version subdir)
+      const skillPath = getToolCachePath("test/sample-tool", "1.0.0");
+      expect(skillPath).toContain(".agent");
+      expect(skillPath).toContain("skills");
+      expect(skillPath).toContain("test/sample-tool");
     });
 
     test("listInstalledTools returns installed tools from registry", async () => {
@@ -241,7 +240,7 @@ describe("install integration", () => {
       const cachePath = join(TEST_GLOBAL_HOME, ".enact", "cache", "test", "cached-tool", "v1.0.0");
       mkdirSync(cachePath, { recursive: true });
       writeFileSync(
-        join(cachePath, "enact.yaml"),
+        join(cachePath, "skill.yaml"),
         `
 name: test/cached-tool
 version: 1.0.0
@@ -252,7 +251,7 @@ command: echo "cached"
 
       // The resolver should be able to find this tool once it's registered
       // Note: Full resolver testing is in resolver.test.ts
-      expect(existsSync(join(cachePath, "enact.yaml"))).toBe(true);
+      expect(existsSync(join(cachePath, "skill.yaml"))).toBe(true);
     });
   });
 });

package/tests/commands/publish.test.ts

@@ -107,11 +107,19 @@ describe("publish command", () => {
   });
 
   describe("manifest file detection", () => {
-    test("identifies enact.yaml as manifest", () => {
+    test("identifies manifest files", () => {
       const isManifest = (filename: string): boolean => {
-        return filename === "enact.yaml" || filename === "enact.yml" || filename === "enact.md";
+        return (
+          filename === "skill.yaml" ||
+          filename === "skill.yml" ||
+          filename === "enact.yaml" ||
+          filename === "enact.yml" ||
+          filename === "enact.md"
+        );
       };
 
+      expect(isManifest("skill.yaml")).toBe(true);
+      expect(isManifest("skill.yml")).toBe(true);
       expect(isManifest("enact.yaml")).toBe(true);
       expect(isManifest("enact.yml")).toBe(true);
       expect(isManifest("enact.md")).toBe(true);
@@ -124,6 +132,8 @@ describe("publish command", () => {
         return lastDot === -1 ? "" : filename.slice(lastDot + 1);
       };
 
+      expect(getExtension("skill.yaml")).toBe("yaml");
+      expect(getExtension("skill.yml")).toBe("yml");
       expect(getExtension("enact.yaml")).toBe("yaml");
       expect(getExtension("enact.yml")).toBe("yml");
       expect(getExtension("enact.md")).toBe("md");

package/tests/commands/run.test.ts

@@ -38,7 +38,9 @@ describe("run command", () => {
       configureRunCommand(program);
 
       const runCmd = program.commands.find((cmd) => cmd.name() === "run");
-      expect(runCmd?.description()).toBe("Execute a tool with its manifest-defined command");
+      expect(runCmd?.description()).toBe(
+        "Execute a tool or action with its manifest-defined command"
+      );
     });
 
     test("accepts tool argument", () => {

package/tests/commands/serve.test.ts

@@ -0,0 +1,82 @@
+/**
+ * Tests for the serve command
+ */
+
+import { describe, expect, test } from "bun:test";
+import { Command } from "commander";
+import { configureServeCommand } from "../../src/commands/serve";
+
+describe("serve command", () => {
+  describe("command configuration", () => {
+    test("configures serve command on program", () => {
+      const program = new Command();
+      configureServeCommand(program);
+
+      const serveCmd = program.commands.find((cmd) => cmd.name() === "serve");
+      expect(serveCmd).toBeDefined();
+    });
+
+    test("has correct description", () => {
+      const program = new Command();
+      configureServeCommand(program);
+
+      const serveCmd = program.commands.find((cmd) => cmd.name() === "serve");
+      expect(serveCmd?.description()).toBe("Start a self-hosted Enact registry server");
+    });
+  });
+
+  describe("options", () => {
+    test("has --port option with default 3000", () => {
+      const program = new Command();
+      configureServeCommand(program);
+
+      const serveCmd = program.commands.find((cmd) => cmd.name() === "serve");
+      const opts = serveCmd?.options ?? [];
+      const portOpt = opts.find((o) => o.long === "--port");
+      expect(portOpt).toBeDefined();
+      expect(portOpt?.defaultValue).toBe("3000");
+    });
+
+    test("has -p short option for port", () => {
+      const program = new Command();
+      configureServeCommand(program);
+
+      const serveCmd = program.commands.find((cmd) => cmd.name() === "serve");
+      const opts = serveCmd?.options ?? [];
+      const portOpt = opts.find((o) => o.short === "-p");
+      expect(portOpt).toBeDefined();
+    });
+
+    test("has --data option with default ./registry-data", () => {
+      const program = new Command();
+      configureServeCommand(program);
+
+      const serveCmd = program.commands.find((cmd) => cmd.name() === "serve");
+      const opts = serveCmd?.options ?? [];
+      const dataOpt = opts.find((o) => o.long === "--data");
+      expect(dataOpt).toBeDefined();
+      expect(dataOpt?.defaultValue).toBe("./registry-data");
+    });
+
+    test("has -d short option for data", () => {
+      const program = new Command();
+      configureServeCommand(program);
+
+      const serveCmd = program.commands.find((cmd) => cmd.name() === "serve");
+      const opts = serveCmd?.options ?? [];
+      const dataOpt = opts.find((o) => o.short === "-d");
+      expect(dataOpt).toBeDefined();
+    });
+
+    test("has --host option with default 0.0.0.0", () => {
+      const program = new Command();
+      configureServeCommand(program);
+
+      const serveCmd = program.commands.find((cmd) => cmd.name() === "serve");
+      const opts = serveCmd?.options ?? [];
+      const hostOpt = opts.find((o) => o.long === "--host");
+      expect(hostOpt).toBeDefined();
+      expect(hostOpt?.defaultValue).toBe("0.0.0.0");
+    });
+  });
+});

package/tests/commands/sign.test.ts

@@ -17,7 +17,7 @@ describe("sign command", () => {
 
     // Create a test manifest
     writeFileSync(
-      join(FIXTURES_DIR, "enact.yaml"),
+      join(FIXTURES_DIR, "skill.yaml"),
       `enact: "2.0.0"
 name: "test/sign-tool"
 version: "1.0.0"

package/tests/e2e.test.ts

@@ -17,7 +17,9 @@ import {
   type ToolManifest,
   applyDefaults,
   loadManifestFromDir,
+  prepareActionCommand,
   prepareCommand,
+  scriptToAction,
   toolNameToPath,
   tryResolveTool,
   validateInputs,
@@ -77,7 +79,7 @@ describe("E2E: Fixture Validation", () => {
     expect(loaded?.manifest.name).toBe("test/greeter");
     expect(loaded?.manifest.version).toBe("1.0.0");
     expect(loaded?.manifest.from).toBe("alpine:latest");
-    expect(loaded?.manifest.command).toContain("echo");
+    expect(loaded?.manifest.scripts?.greet).toBeDefined();
   });
 
   test("echo-tool fixture has valid Markdown manifest", () => {
@@ -88,15 +90,12 @@ describe("E2E: Fixture Validation", () => {
     expect(loaded?.format).toBe("md");
   });
 
-  test("calculator fixture has valid manifest with complex schema", () => {
+  test("calculator fixture has valid manifest with scripts", () => {
     const loaded = loadManifestFromDir(CALCULATOR_TOOL);
     expect(loaded).not.toBeNull();
     expect(loaded?.manifest.name).toBe("test/calculator");
     expect(loaded?.manifest.from).toBe("python:3.12-alpine");
-    expect(loaded?.manifest.inputSchema?.properties?.operation).toBeDefined();
-    expect(loaded?.manifest.inputSchema?.required).toContain("operation");
-    expect(loaded?.manifest.inputSchema?.required).toContain("a");
-    expect(loaded?.manifest.inputSchema?.required).toContain("b");
+    expect(loaded?.manifest.scripts?.calculate).toBeDefined();
   });
 
   test("invalid-tool fixture is missing required fields", () => {
@@ -126,7 +125,9 @@ describe("E2E: Tool Installation Flow", () => {
 
     expect(manifest.name).toBe("test/greeter");
     expect(existsSync(destPath)).toBe(true);
-    expect(existsSync(join(destPath, "enact.yaml"))).toBe(true);
+    expect(
+      existsSync(join(destPath, "enact.yaml")) || existsSync(join(destPath, "skill.yaml"))
+    ).toBe(true);
 
     // Verify installed manifest can be loaded
     const reloaded = loadManifestFromDir(destPath);
@@ -243,39 +244,41 @@ describe("E2E: Input Validation Flow", () => {
   });
 
   test("validates greeter with default input", () => {
-    // Apply defaults first, then validate
-    const withDefaults = applyDefaults({}, greeterManifest.inputSchema);
-    const result = validateInputs(withDefaults, greeterManifest.inputSchema);
+    // Convert script to action to get its inputSchema
+    const action = scriptToAction("greet", greeterManifest.scripts!.greet!);
+    const withDefaults = applyDefaults({}, action.inputSchema);
+    const result = validateInputs(withDefaults, action.inputSchema);
     expect(result.valid).toBe(true);
     // Should have default applied
     expect(withDefaults.name).toBe("World");
   });
 
   test("validates greeter with custom input", () => {
-    const result = validateInputs({ name: "Alice" }, greeterManifest.inputSchema);
+    const action = scriptToAction("greet", greeterManifest.scripts!.greet!);
+    const result = validateInputs({ name: "Alice" }, action.inputSchema);
     expect(result.valid).toBe(true);
     expect(result.coercedValues?.name).toBe("Alice");
   });
 
   test("validates calculator with all required inputs", () => {
-    const result = validateInputs({ operation: "add", a: 5, b: 3 }, calculatorManifest.inputSchema);
+    const action = scriptToAction("calculate", calculatorManifest.scripts!.calculate!);
+    const result = validateInputs({ operation: "add", a: 5, b: 3 }, action.inputSchema);
     expect(result.valid).toBe(true);
   });
 
   test("fails validation when required input is missing", () => {
+    const action = scriptToAction("calculate", calculatorManifest.scripts!.calculate!);
     const result = validateInputs(
       { operation: "add", a: 5 }, // missing 'b'
-      calculatorManifest.inputSchema
+      action.inputSchema
     );
     expect(result.valid).toBe(false);
     expect(result.errors.length).toBeGreaterThan(0);
   });
 
   test("fails validation with invalid enum value", () => {
-    const result = validateInputs(
-      { operation: "invalid", a: 5, b: 3 },
-      calculatorManifest.inputSchema
-    );
+    const action = scriptToAction("calculate", calculatorManifest.scripts!.calculate!);
+    const result = validateInputs({ operation: "invalid", a: 5, b: 3 }, action.inputSchema);
     expect(result.valid).toBe(false);
   });
 });
@@ -291,11 +294,15 @@ describe("E2E: Command Preparation Flow", () => {
     expect(preparedStr).not.toContain("${name}");
   });
 
-  test("prepares calculator command with multiple inputs", () => {
+  test("prepares calculator command with multiple inputs (scripts)", () => {
     const loaded = loadManifestFromDir(CALCULATOR_TOOL);
-    const command = loaded?.manifest.command!;
+    const action = scriptToAction("calculate", loaded!.manifest.scripts!.calculate!);
 
-    const prepared = prepareCommand(command, { operation: "add", a: 5, b: 3 });
+    const prepared = prepareActionCommand(
+      action.command as string[],
+      { operation: "add", a: 5, b: 3 },
+      action.inputSchema
+    );
     const preparedStr = prepared.join(" ");
 
     expect(preparedStr).toContain("add");
@@ -472,7 +479,7 @@ describe("E2E: Full Workflow", () => {
     }
   });
 
-  test("complete install -> resolve -> validate -> prepare flow", () => {
+  test("complete install -> resolve -> validate -> prepare flow (scripts)", () => {
     // 1. Install tool
     const destBase = join(tempDir, ".enact", "tools");
     const { manifest } = installTool(GREETER_TOOL, destBase);
@@ -482,18 +489,23 @@ describe("E2E: Full Workflow", () => {
     const resolution = tryResolveTool("test/greeter", { startDir: tempDir });
     expect(resolution).not.toBeNull();
 
-    // 3. Validate inputs
-    const validation = validateInputs({ name: "TestUser" }, manifest.inputSchema);
+    // 3. Convert script to action and validate
+    const action = scriptToAction("greet", manifest.scripts!.greet!);
+    const validation = validateInputs({ name: "TestUser" }, action.inputSchema);
     expect(validation.valid).toBe(true);
 
-    // 4. Prepare command
-    const prepared = prepareCommand(manifest.command!, validation.coercedValues!);
+    // 4. Prepare action command
+    const prepared = prepareActionCommand(
+      action.command as string[],
+      validation.coercedValues!,
+      action.inputSchema
+    );
     const preparedStr = prepared.join(" ");
     expect(preparedStr).toContain("TestUser");
     expect(preparedStr).toContain("Hello");
   });
 
-  test("complete calculator workflow", () => {
+  test("complete calculator workflow (scripts)", () => {
     // 1. Install tool
     const destBase = join(tempDir, ".enact", "tools");
     const { manifest } = installTool(CALCULATOR_TOOL, destBase);
@@ -502,7 +514,9 @@ describe("E2E: Full Workflow", () => {
     const resolution = tryResolveTool("test/calculator", { startDir: tempDir });
     expect(resolution).not.toBeNull();
 
-    // 3. Validate multiple operations
+    // 3. Convert script to action and validate multiple operations
+    const action = scriptToAction("calculate", manifest.scripts!.calculate!);
+
     const operations = [
       { operation: "add", a: 10, b: 5 },
       { operation: "subtract", a: 10, b: 5 },
@@ -511,10 +525,14 @@ describe("E2E: Full Workflow", () => {
     ];
 
     for (const inputs of operations) {
-      const validation = validateInputs(inputs, manifest.inputSchema);
+      const validation = validateInputs(inputs, action.inputSchema);
       expect(validation.valid).toBe(true);
 
-      const prepared = prepareCommand(manifest.command!, validation.coercedValues!);
+      const prepared = prepareActionCommand(
+        action.command as string[],
+        validation.coercedValues!,
+        action.inputSchema
+      );
       const preparedStr = prepared.join(" ");
       expect(preparedStr).toContain(inputs.operation);
       expect(preparedStr).toContain(String(inputs.a));
@@ -522,7 +540,7 @@ describe("E2E: Full Workflow", () => {
     }
   });
 
-  test("handles markdown tool workflow", () => {
+  test("handles markdown tool workflow (scripts)", () => {
     // Install markdown-based tool
     const destBase = join(tempDir, ".enact", "tools");
     const { manifest } = installTool(ECHO_TOOL, destBase);
@@ -532,12 +550,16 @@ describe("E2E: Full Workflow", () => {
     const resolution = tryResolveTool("test/echo-tool", { startDir: tempDir });
     expect(resolution).not.toBeNull();
 
-    // Validate
-    const validation = validateInputs({ text: "Hello from markdown tool!" }, manifest.inputSchema);
+    // Convert script to action, validate, prepare
+    const action = scriptToAction("echo", manifest.scripts!.echo!);
+    const validation = validateInputs({ text: "Hello from markdown tool!" }, action.inputSchema);
     expect(validation.valid).toBe(true);
 
-    // Prepare
-    const prepared = prepareCommand(manifest.command!, validation.coercedValues!);
+    const prepared = prepareActionCommand(
+      action.command as string[],
+      validation.coercedValues!,
+      action.inputSchema
+    );
     const preparedStr = prepared.join(" ");
     expect(preparedStr).toContain("Hello from markdown tool!");
   });

package/tests/fixtures/calculator/skill.yaml

@@ -0,0 +1,38 @@
+enact: "2.0.0"
+name: test/calculator
+version: "2.0.0"
+description: A calculator tool that performs basic math operations
+from: python:3.12-alpine
+
+scripts:
+  calculate:
+    command: "python3 -c \"import json; print(json.dumps({'result': eval('{{a}} + {{b}}' if '{{operation}}'=='add' else '{{a}} - {{b}}' if '{{operation}}'=='subtract' else '{{a}} * {{b}}' if '{{operation}}'=='multiply' else '{{a}} / {{b}}'), 'operation': '{{operation}}'}))\""
+    inputSchema:
+      type: object
+      properties:
+        operation:
+          type: string
+          enum:
+            - add
+            - subtract
+            - multiply
+            - divide
+          description: The math operation to perform
+        a:
+          type: number
+          description: First operand
+        b:
+          type: number
+          description: Second operand
+      required:
+        - operation
+        - a
+        - b
+
+outputSchema:
+  type: object
+  properties:
+    result:
+      type: number
+    operation:
+      type: string

package/tests/fixtures/echo-tool/SKILL.md

@@ -4,15 +4,8 @@ name: test/echo-tool
 version: "1.0.0"
 description: A tool that echoes its input for testing
 from: alpine:latest
-command: echo '{"output":"${text}"}'
-inputSchema:
-  type: object
-  properties:
-    text:
-      type: string
-      description: Text to echo
-  required:
-    - text
+scripts:
+  echo: "echo '{\"output\":\"{{text}}\"}'"
 outputSchema:
   type: object
   properties:
@@ -27,5 +20,5 @@ A simple tool that echoes back the input text. Used for testing.
 ## Usage
 
 ```bash
-enact run test/echo-tool --input text="Hello"
+enact run test/echo-tool:echo --input text="Hello"
 ```

package/tests/fixtures/env-tool/{enact.yaml → skill.yaml}

@@ -11,9 +11,3 @@ env:
   SECRET_VAR:
     secret: true
     description: A secret environment variable
-inputSchema:
-  type: object
-  properties:
-    showEnv:
-      type: boolean
-      default: false

package/tests/fixtures/greeter/skill.yaml

@@ -0,0 +1,22 @@
+enact: "2.0.0"
+name: test/greeter
+version: "1.0.0"
+description: A simple greeting tool for testing
+from: alpine:latest
+
+scripts:
+  greet:
+    command: "echo '{\"message\":\"Hello, {{name}}!\"}'"
+    inputSchema:
+      type: object
+      properties:
+        name:
+          type: string
+          description: Name to greet
+          default: World
+
+outputSchema:
+  type: object
+  properties:
+    message:
+      type: string

package/tests/utils/ignore.test.ts

@@ -280,7 +280,9 @@ dist   `;
         expect(shouldIgnore("lib/utils.js", "utils.js")).toBe(false);
       });
 
-      test("allows enact manifest files", () => {
+      test("allows manifest files", () => {
+        expect(shouldIgnore("skill.yaml", "skill.yaml")).toBe(false);
+        expect(shouldIgnore("skill.yml", "skill.yml")).toBe(false);
         expect(shouldIgnore("enact.md", "enact.md")).toBe(false);
         expect(shouldIgnore("enact.yaml", "enact.yaml")).toBe(false);
         expect(shouldIgnore("enact.yml", "enact.yml")).toBe(false);

package/tsconfig.json

@@ -13,6 +13,7 @@
     { "path": "../shared" },
     { "path": "../secrets" },
     { "path": "../execution" },
-    { "path": "../api" }
+    { "path": "../api" },
+    { "path": "../registry" }
   ]
 }