feat(settings): settings modal with tabbed layout, production refactor, and CLI update checker

- Move Settings from a page to a Dialog modal accessible from the sidebar header dropdown (CRM-style layout: sidebar nav + content panel)
- Refactor ProductionConfig: replace enabled/lightweight booleans with a single process_manager field (none | supervisor | systemd); nginx is now independent; backward-compat parsing for old TOML format
- Auto-trigger setup-production or setup-nginx task on settings save instead of a separate Setup tab
- Add Updates tab: check for bench-cli git updates, show badge, and run git pull as a task
- Add tests for ProductionConfig parsing (new format, legacy format, enabled property, TOML writer output)
- Update README: process_manager field, process manager options, Settings row description

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: rmehta

README.md

@@ -80,8 +80,8 @@ password = "your-admin-password"   # required — admin refuses to start without
 domain = "admin.example.com"       # optional — serve admin over HTTPS via nginx
 
 [production]
-lightweight = false   # false = supervisor (default), true = systemd --user
-nginx = true          # run nginx setup as part of bench setup production
+process_manager = "supervisor"   # none | supervisor | systemd
+nginx = true
 ```
 
 Apps and sites are tracked by the filesystem — no need to list them in `bench.toml`.
@@ -112,8 +112,8 @@ With multiple benches: `bench -b my-bench start`
 
 ```toml
 [production]
-nginx = true          # include nginx in bench setup production
-# lightweight = true  # uncomment to use systemd --user instead of supervisor
+process_manager = "supervisor"   # none | supervisor | systemd
+nginx = true
 
 [nginx]
 enabled = true
@@ -133,8 +133,9 @@ bench restart                  # restart all bench processes (works with both ma
 ```
 
 **Process managers:**
-- **Supervisor** (default) — runs a bench-owned `supervisord` instance, no root needed.
-- **Systemd** (`lightweight = true`) — uses `systemctl --user` units; requires `loginctl enable-linger` once.
+- **Supervisor** — runs a bench-owned `supervisord` instance, no root needed.
+- **Systemd** — uses `systemctl --user` units; requires `loginctl enable-linger` once.
+- **None** — development mode; use `bench start` / Procfile runner.
 
 When `admin.domain` is set, `bench setup production` obtains a certificate for that domain and generates an HTTPS nginx proxy block. HTTP redirects to HTTPS automatically.
 
@@ -153,7 +154,7 @@ The built-in admin UI runs on port 8002 (configurable via `[admin] port`).
 | Logs | Tail and search log files with live streaming |
 | Tasks | Multi-step task view with collapsible output per step; task history |
 | Database | MariaDB process list, slow queries, binary log viewer |
-| Settings | Edit bench config (ports, workers, nginx, Let's Encrypt) with validation |
+| Settings | Modal dialog (sidebar dropdown) — configure ports, workers, process manager, nginx, and Let's Encrypt; check and apply bench-cli updates |
 
 All forms validate input before submission — site names are checked for valid hostname format, repository URLs for valid git URL format, branch names for legal characters, cron expressions for valid 5-field syntax, and port numbers for the 1–65535 range.
 

admin/backend/tasks/jobs/update_cli_task.py

@@ -0,0 +1,25 @@
+from __future__ import annotations
+
+import subprocess
+import sys
+from pathlib import Path
+
+
+def _cli_root() -> Path:
+    import bench_cli as _pkg
+    return Path(_pkg.__file__).parent.parent
+
+
+if __name__ == "__main__":
+    # bench_root is passed by the task runner but not needed here
+    cli_root = _cli_root()
+    print(f"Updating bench-cli at {cli_root}...")
+    sys.stdout.flush()
+
+    result = subprocess.run(
+        ["git", "-C", str(cli_root), "pull"],
+        stdout=sys.stdout,
+        stderr=sys.stderr,
+        text=True,
+    )
+    sys.exit(result.returncode)

admin/backend/tasks/manager/task_runner.py

@@ -33,6 +33,7 @@
     "setup-production": [],
     "setup-letsencrypt": [],
     "new-site-from-backup": ["name", "db_file"],
+    "update-cli": [],
 }
 
 
@@ -166,6 +167,8 @@ def _build_argv(self, command: str, args: dict) -> list[str]:
             if args.get("private_files"):
                 argv += ["--private-files", args["private_files"]]
             return argv
+        if command == "update-cli":
+            return [sys.executable, "-m", "admin.backend.tasks.jobs.update_cli_task", str(self._bench_root)]
 
         raise ValueError(f"Unhandled command: {command!r}")
 

admin/backend/views/settings.py

@@ -27,8 +27,7 @@
     ("workers", "default"),
     ("workers", "short"),
     ("workers", "long"),
-    ("production", "enabled"),
-    ("production", "lightweight"),
+    ("production", "process_manager"),
 }
 
 
@@ -96,8 +95,7 @@ def _config_snapshot(config: BenchConfig) -> dict:
             "long": config.workers.long_count,
         },
         "production": {
-            "enabled": config.production.enabled,
-            "lightweight": config.production.lightweight,
+            "process_manager": config.production.process_manager,
         },
     }
 
@@ -147,9 +145,8 @@ def get_settings():
             "webroot_path": str(config.letsencrypt.webroot_path),
         },
         "production": {
-            "enabled": config.production.enabled,
+            "process_manager": config.production.process_manager,
             "nginx": config.production.nginx,
-            "lightweight": config.production.lightweight,
         },
     })
 
@@ -220,9 +217,12 @@ def update_settings():
     production_data = data.get("production", {})
     if production_data:
         p = config.production
-        p.enabled = bool(production_data.get("enabled", p.enabled))
+        if "process_manager" in production_data:
+            pm = str(production_data["process_manager"])
+            if pm not in ("none", "supervisor", "systemd"):
+                return jsonify({"ok": False, "error": "process_manager must be none, supervisor, or systemd"}), 400
+            p.process_manager = pm
         p.nginx = bool(production_data.get("nginx", p.nginx))
-        p.lightweight = bool(production_data.get("lightweight", p.lightweight))
 
     err = first_error(
         validate_port(config.http_port, "HTTP Port"),

admin/backend/views/updates.py

@@ -8,6 +8,11 @@
 updates_bp = Blueprint("updates", __name__)
 
 
+def _cli_root() -> Path:
+    import bench_cli as _pkg
+    return Path(_pkg.__file__).parent.parent
+
+
 @updates_bp.route("/")
 def get_updates():
     bench_root = Path(current_app.config["BENCH_ROOT"])
@@ -92,3 +97,30 @@ def _log_subject(path: Path, ref: str) -> str:
         text=True,
     )
     return r.stdout.strip()
+
+
+@updates_bp.route("/cli")
+def get_cli_update():
+    cli_root = _cli_root()
+    do_fetch = request.args.get("fetch") == "1"
+
+    branch = _current_branch(cli_root)
+    if do_fetch:
+        _git_fetch(cli_root, branch)
+
+    remote_ref = f"origin/{branch}"
+    behind = _count(cli_root, f"HEAD..{remote_ref}")
+    remote_commit = _log_subject(cli_root, remote_ref)
+    local_commit = _log_subject(cli_root, "HEAD")
+
+    fetch_head = cli_root / ".git" / "FETCH_HEAD"
+    last_fetched = fetch_head.stat().st_mtime if fetch_head.exists() else None
+
+    return jsonify({
+        "branch": branch,
+        "commits_behind": behind,
+        "update_available": behind > 0,
+        "local_commit": local_commit,
+        "remote_commit": remote_commit,
+        "last_fetched": last_fetched,
+    })

admin/frontend/components.d.ts

@@ -13,6 +13,7 @@ declare module 'vue' {
     FilePickerField: typeof import('./src/components/FilePickerField.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
+    SettingsModal: typeof import('./src/components/SettingsModal.vue')['default']
     TerminalOutput: typeof import('./src/components/TerminalOutput.vue')['default']
   }
 }

admin/frontend/src/components/AppLayout.vue

@@ -1,12 +1,14 @@
 <script setup>
-import { computed } from 'vue'
+import { computed, ref } from 'vue'
 import { RouterView, useRoute } from 'vue-router'
 import { Breadcrumbs } from 'frappe-ui'
 import AppSidebar from './AppSidebar.vue'
+import SettingsModal from './SettingsModal.vue'
 
 const emit = defineEmits(['logout'])
 
 const route = useRoute()
+const showSettings = ref(false)
 
 const breadcrumbs = computed(() => {
   const { path, params } = route
@@ -35,14 +37,13 @@ const breadcrumbs = computed(() => {
     { label: 'Binary Logs', route: '/database/binlogs' },
     { label: String(params.name) },
   ]
-  if (path === '/settings') return [{ label: 'Settings' }]
   return [{ label: '' }]
 })
 </script>
 
 <template>
   <div class="flex h-screen overflow-hidden">
-    <AppSidebar @logout="$emit('logout')" />
+    <AppSidebar @logout="$emit('logout')" @open-settings="showSettings = true" />
     <main class="flex-1 overflow-auto bg-surface-white">
       <header class="sticky top-0 z-[10] flex items-center border-b bg-surface-white px-5 py-2.5">
         <Breadcrumbs :items="breadcrumbs" />
@@ -52,5 +53,6 @@ const breadcrumbs = computed(() => {
         <RouterView />
       </div>
     </main>
+    <SettingsModal v-model="showSettings" />
   </div>
 </template>

admin/frontend/src/components/AppSidebar.vue

@@ -13,13 +13,17 @@ import LucideLogOut from '~icons/lucide/log-out'
 import LucidePackage2 from '~icons/lucide/package-2'
 import LucideSettings from '~icons/lucide/settings'
 
-const emit = defineEmits(['logout'])
+const emit = defineEmits(['logout', 'open-settings'])
 
 const route = useRoute()
 
 const header = {
   title: 'Bench',
   logo: '/logos/frappe-icon.png',
+  menuItems: [
+    { label: 'Settings', icon: LucideSettings, onClick: () => emit('open-settings') },
+    { label: 'Logout', icon: LucideLogOut, onClick: () => logout() },
+  ],
 }
 
 const baseNavItems = [
@@ -30,7 +34,6 @@ const baseNavItems = [
   { label: 'Logs', to: '/logs', icon: LucideFileText },
   { label: 'Database', to: '/database', icon: LucideDatabase },
   { label: 'Tasks', to: '/tasks', icon: LucideListTodo },
-  { label: 'Settings', to: '/settings', icon: LucideSettings },
 ]
 
 const snapshotsEnabled = ref(false)
@@ -94,8 +97,6 @@ onUnmounted(() => clearInterval(pollTimer))
         </template>
       </SidebarItem>
     </template>
-    <template #footer-items>
-      <SidebarItem label="Logout" :icon="LucideLogOut" @click="logout" />
-    </template>
+    <template #footer-items />
   </Sidebar>
 </template>