wip

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

Author: patrickelectric

core/frontend/src/views/ServiceManagerView.vue

@@ -232,7 +232,23 @@
                         Command
                       </td>
                       <td class="font-mono text-body-2">
-                        {{ commandString }}
+                        {{ selected_service.command?.join(' ') ?? '' }}
+                      </td>
+                    </tr>
+                    <tr>
+                      <td class="font-weight-bold">
+                        Custom Command
+                      </td>
+                      <td>
+                        <v-text-field
+                          v-model="config_form.command"
+                          dense
+                          outlined
+                          hide-details
+                          placeholder="Override command (space-separated)"
+                          class="font-mono text-body-2"
+                          style="max-width: 500px"
+                        />
                       </td>
                     </tr>
                     <tr v-if="selected_service.cwd">
@@ -261,6 +277,18 @@
                 <div class="d-flex align-center mb-2">
                   <h4>Behavior Settings</h4>
                   <v-spacer />
+                  <v-btn
+                    v-tooltip="'Reset to defaults'"
+                    small
+                    text
+                    class="mr-2"
+                    @click="resetServiceConfig"
+                  >
+                    <v-icon left small>
+                      mdi-restore
+                    </v-icon>
+                    Reset
+                  </v-btn>
                   <v-btn
                     v-tooltip="'Save configuration changes'"
                     small
@@ -276,6 +304,15 @@
                   </v-btn>
                 </div>
                 <v-row dense>
+                  <v-col cols="12" sm="6" md="4">
+                    <v-switch
+                      v-model="config_form.enabled"
+                      label="Service enabled"
+                      dense
+                      hide-details
+                      class="mt-0"
+                    />
+                  </v-col>
                   <v-col cols="12" sm="6" md="4">
                     <v-switch
                       v-model="config_form.restart"
@@ -680,6 +717,8 @@ export default Vue.extend({
       action_loading: false,
       config_saving: false,
       config_form: {
+        enabled: true,
+        command: '' as string,
         restart: false,
         restart_delay_sec: 1.0,
         stop_timeout_sec: 10.0,
@@ -713,9 +752,6 @@ export default Vue.extend({
     running_count(): number {
       return this.services.filter((s) => s.status === 'running').length
     },
-    commandString(): string {
-      return this.selected_service?.command?.join(' ') ?? ''
-    },
     hasEnvironmentVariables(): boolean {
       const env = this.selected_service?.env
       return !!env && Object.keys(env).length > 0
@@ -724,7 +760,10 @@ export default Vue.extend({
       if (!this.selected_service) return false
       const s = this.selected_service
       const f = this.config_form
-      return f.restart !== s.restart
+      const originalCommand = s.command?.join(' ') ?? ''
+      return f.enabled !== s.enabled
+        || f.command !== '' && f.command !== originalCommand
+        || f.restart !== s.restart
         || f.restart_delay_sec !== s.restart_delay_sec
         || f.stop_timeout_sec !== s.stop_timeout_sec
         || (f.limits.cpu_cores ?? 0) !== (s.limits?.cpu_cores ?? 0)
@@ -917,6 +956,8 @@ export default Vue.extend({
 
     populateConfigForm(service: ServiceState): void {
       this.config_form = {
+        enabled: service.enabled,
+        command: service.command?.join(' ') ?? '',
         restart: service.restart,
         restart_delay_sec: service.restart_delay_sec,
         stop_timeout_sec: service.stop_timeout_sec,
@@ -1043,7 +1084,9 @@ export default Vue.extend({
     async saveConfig(): Promise<void> {
       if (!this.selected_service) return
       this.config_saving = true
-      const body = {
+      const originalCommand = this.selected_service.command?.join(' ') ?? ''
+      const body: Record<string, unknown> = {
+        enabled: this.config_form.enabled,
         restart: this.config_form.restart,
         restart_delay_sec: this.config_form.restart_delay_sec,
         stop_timeout_sec: this.config_form.stop_timeout_sec,
@@ -1053,6 +1096,10 @@ export default Vue.extend({
           max_pids: this.config_form.limits.max_pids ?? 0,
         },
       }
+      // Only send command if it's been changed
+      if (this.config_form.command && this.config_form.command !== originalCommand) {
+        body.command = this.config_form.command.split(/\s+/).filter((s: string) => s.length > 0)
+      }
       await back_axios({
         method: 'patch',
         url: `${API_URL}/services/${this.selected_service.name}/config`,
@@ -1073,6 +1120,24 @@ export default Vue.extend({
         })
     },
 
+    async resetServiceConfig(): Promise<void> {
+      if (!this.selected_service) return
+      await back_axios({
+        method: 'post',
+        url: `${API_URL}/services/${this.selected_service.name}/reset`,
+        timeout: 10000,
+      })
+        .then((response) => {
+          const data = response.data as MessageResponse
+          message_manager.emitMessage(MessageLevel.Success, data.message)
+          this.fetchServices()
+        })
+        .catch((error) => {
+          if (isBackendOffline(error)) return
+          message_manager.emitMessage(MessageLevel.Error, `Failed to reset config: ${error}`)
+        })
+    },
+
     formatTimestamp(timestamp: string): string {
       try {
         return format(new Date(timestamp), 'HH:mm:ss.SSS')

core/services/service_manager/service_manager/config.py

@@ -167,3 +167,91 @@ def get_service(self, name: str) -> ServiceSpec | None:
             if svc.name == name:
                 return svc
         return None
+
+
+def _default_overrides_path() -> Path:
+    """Get default path for user configuration overrides."""
+    import os
+
+    if os.geteuid() == 0:
+        return Path("/etc/service-manager/overrides.json")
+    return Path.home() / ".config/service-manager/overrides.json"
+
+
+class ConfigPersistence:
+    """Handles saving and loading user configuration overrides."""
+
+    def __init__(self, overrides_path: Path | None = None):
+        self.overrides_path = overrides_path or _default_overrides_path()
+        self._overrides: dict[str, Any] = {}
+        self._load_overrides()
+
+    def _load_overrides(self) -> None:
+        """Load overrides from file if it exists."""
+        import json
+
+        if self.overrides_path.exists():
+            try:
+                self._overrides = json.loads(self.overrides_path.read_text(encoding="utf-8"))
+            except (json.JSONDecodeError, OSError):
+                self._overrides = {}
+        else:
+            self._overrides = {}
+
+    def _save_overrides(self) -> None:
+        """Save overrides to file."""
+        import json
+
+        self.overrides_path.parent.mkdir(parents=True, exist_ok=True)
+        self.overrides_path.write_text(json.dumps(self._overrides, indent=2), encoding="utf-8")
+
+    def get_service_overrides(self, name: str) -> dict[str, Any]:
+        """Get overrides for a specific service."""
+        services: dict[str, dict[str, Any]] = self._overrides.get("services", {})
+        return services.get(name, {})
+
+    def set_service_override(self, name: str, key: str, value: Any) -> None:
+        """Set an override for a service."""
+        if "services" not in self._overrides:
+            self._overrides["services"] = {}
+        if name not in self._overrides["services"]:
+            self._overrides["services"][name] = {}
+        self._overrides["services"][name][key] = value
+        self._save_overrides()
+
+    def clear_service_overrides(self, name: str) -> None:
+        """Clear all overrides for a service."""
+        services = self._overrides.get("services", {})
+        if name in services:
+            del services[name]
+            self._save_overrides()
+
+    def clear_all_overrides(self) -> None:
+        """Clear all service overrides."""
+        self._overrides = {}
+        self._save_overrides()
+
+    def apply_overrides(self, spec: ServiceSpec) -> None:
+        """Apply saved overrides to a service spec."""
+        overrides = self.get_service_overrides(spec.name)
+        if not overrides:
+            return
+
+        if "enabled" in overrides:
+            spec.enabled = overrides["enabled"]
+        if "command" in overrides:
+            spec.command = overrides["command"]
+        if "restart" in overrides:
+            spec.restart = overrides["restart"]
+        if "restart_delay_sec" in overrides:
+            spec.restart_delay_sec = overrides["restart_delay_sec"]
+        if "stop_timeout_sec" in overrides:
+            spec.stop_timeout_sec = overrides["stop_timeout_sec"]
+        if "limits" in overrides:
+            limits_data = overrides["limits"]
+            if "cpu_cores" in limits_data:
+                spec.limits.cpu_cores = limits_data["cpu_cores"]
+            if "memory_mb" in limits_data:
+                spec.limits.memory_mb = limits_data["memory_mb"]
+            if "max_pids" in limits_data:
+                spec.limits.max_pids = limits_data["max_pids"]

core/services/service_manager/service_manager/daemon.py

@@ -14,7 +14,7 @@
 
 import uvicorn
 from service_manager.cgroup import CgroupController
-from service_manager.config import AgentConfig
+from service_manager.config import AgentConfig, ConfigPersistence
 from service_manager.metrics import MetricsSampler
 from service_manager.output import OutputCapture
 from service_manager.registry import ServiceRegistry
@@ -129,6 +129,7 @@ def __init__(self, config_path: Path | None = None, foreground: bool = False):
         self._output: OutputCapture | None = None
         self._supervisor: ProcessSupervisor | None = None
         self._sampler: MetricsSampler | None = None
+        self._persistence: ConfigPersistence | None = None
 
     def _setup_logging(self) -> None:
         """Configure logging."""
@@ -220,15 +221,17 @@ async def _start_components(self) -> None:
             self._cgroup,
             self.config.metrics_interval_sec,
         )
+        self._persistence = ConfigPersistence()
 
         # Ensure cgroup root exists
         await self._cgroup.ensure_root()
 
         # Reconcile with any orphan cgroups from previous run
         await self._reconcile_orphans()
 
-        # Register services from config
+        # Register services from config, applying user overrides
         for spec in self.config.services:
+            self._persistence.apply_overrides(spec)
             self._registry.register(spec)
 
         # Start enabled services
@@ -256,6 +259,7 @@ def _start_uvicorn_server(self) -> None:
             self._output,
             self._sampler,
             self._cgroup,
+            self._persistence,
         )
 
         config = self.config