refactor: Update component specifications to use 'program' and 'behavior' attributes, enhancing clarity and consistency across the application

core/src/castle_core/config.py

@@ -53,11 +53,11 @@ class CastleConfig:
 
     @property
     def tools(self) -> dict[str, ProgramSpec]:
-        """Return programs that are tools (have install.path or tool spec)."""
+        """Return programs that are tools (behavior == 'tool')."""
         return {
             k: v
             for k, v in self.programs.items()
-            if (v.install and v.install.path) or v.tool
+            if v.behavior == "tool"
         }
 
     @property
@@ -180,9 +180,6 @@ def _clean_for_yaml(data: object, preserve_keys: set[str] | None = None) -> obje
 _STRUCTURAL_KEYS = {
     "manage",
     "systemd",
-    "install",
-    "path",
-    "tool",
     "expose",
     "proxy",
     "caddy",

core/src/castle_core/manifest.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 from enum import Enum
 from typing import Annotated, Literal, Union
 
-from pydantic import BaseModel, ConfigDict, Field, model_validator
+from pydantic import BaseModel, Field, model_validator
 
 EnvMap = dict[str, str]
 
@@ -38,7 +38,7 @@ class RunCommand(RunBase):
 
 class RunPython(RunBase):
     runner: Literal["python"]
-    tool: str
+    program: str
     args: list[str] = Field(default_factory=list)
 
 
@@ -102,33 +102,6 @@ class ManageSpec(BaseModel):
     systemd: SystemdSpec | None = None
 
 
-# ---------------------
-# Install (PATH shims)
-# ---------------------
-
-
-class PathInstallSpec(BaseModel):
-    enable: bool = True
-    alias: str | None = None
-    shim: bool = True
-
-
-class InstallSpec(BaseModel):
-    path: PathInstallSpec | None = None
-
-
-# ---------------------
-# Tool spec
-# ---------------------
-
-
-class ToolSpec(BaseModel):
-    model_config = ConfigDict(extra="ignore")
-
-    version: str = "1.0.0"
-    system_dependencies: list[str] = Field(default_factory=list)
-
-
 # ---------------------
 # HTTP exposure + proxy
 # ---------------------
@@ -206,12 +179,13 @@ class ProgramSpec(BaseModel):
 
     id: str = ""
     description: str | None = None
+    behavior: str | None = None
 
     source: str | None = None
     stack: str | None = None
 
-    install: InstallSpec | None = None
-    tool: ToolSpec | None = None
+    system_dependencies: list[str] = Field(default_factory=list)
+    version: str | None = None
     build: BuildSpec | None = None
 
     provides: list[Capability] = Field(default_factory=list)