release: merge develop into main for v0.18.5

Author: DavidsonGomes

.claude/agents/clawdia-assistant.md

@@ -22,6 +22,8 @@ skills:
   - int-sync-meetings
   - int-todoist
   - schedule-task
+  - trigger-registry
+  - schedule
   - ops-process-doc
   - ops-runbook
   - ops-process-optimization

.claude/agents/oracle.md

@@ -20,6 +20,8 @@ skills:
   - create-agent
   - create-command
   - create-routine
+  - trigger-registry
+  - schedule
   - workspace-share
 ---
 

.env.example

@@ -125,6 +125,9 @@ BACKUP_S3_PREFIX=evonexus-backups/
 # AWS_ACCESS_KEY_ID=
 # AWS_SECRET_ACCESS_KEY=
 # AWS_ENDPOINT_URL=           # For non-AWS (MinIO, R2, etc.)
+# Retention: how many backups to keep (empty = unlimited)
+# BACKUP_RETAIN_LOCAL=7       # Keep last 7 local backups
+# BACKUP_RETAIN_S3=30         # Keep last 30 S3 backups
 
 # ── Social Accounts ──────────────────────────────────
 # Managed via the dashboard Integrations page.

ADWs/routines/backup.py

@@ -11,20 +11,30 @@
 
 
 def _do_backup():
-    """Run backup and return structured result for runner."""
+    """Run backup and return structured result for runner.
+
+    If S3 is configured: backup to S3 only, remove local ZIP after upload.
+    If S3 is not configured: backup to local only (fallback).
+    """
     files = backup_module.collect_files()
     if not files:
         return {"ok": True, "summary": "No files to backup"}
 
-    # Check if S3 is configured
     s3_bucket = os.environ.get("BACKUP_S3_BUCKET")
-    s3_upload = bool(s3_bucket)
 
-    zip_path = backup_module.backup_local(s3_upload=s3_upload)
-    zip_size = zip_path.stat().st_size
-    size_str = backup_module._format_size(zip_size)
-    target = f"local + s3://{s3_bucket}" if s3_upload else "local"
-    return {"ok": True, "summary": f"{len(files)} files → {zip_path.name} ({size_str}) [{target}]"}
+    if s3_bucket:
+        # S3 mode: create local ZIP, upload to S3, then delete local copy
+        zip_path = backup_module.backup_local(s3_upload=True)
+        zip_size = zip_path.stat().st_size
+        size_str = backup_module._format_size(zip_size)
+        zip_path.unlink(missing_ok=True)
+        return {"ok": True, "summary": f"{len(files)} files → s3://{s3_bucket}/{zip_path.name} ({size_str})"}
+    else:
+        # Local fallback
+        zip_path = backup_module.backup_local(s3_upload=False)
+        zip_size = zip_path.stat().st_size
+        size_str = backup_module._format_size(zip_size)
+        return {"ok": True, "summary": f"{len(files)} files → {zip_path.name} ({size_str}) [local]"}
 
 
 def main():

CHANGELOG.md

@@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.18.5] - 2026-04-12
+
+### Added
+
+- **Backup retention & auto-cleanup** — configurable via `BACKUP_RETAIN_LOCAL` and `BACKUP_RETAIN_S3` env vars (also editable in dashboard Storage Provider panel). Old backups beyond the limit are auto-deleted after each backup run
+- **`boto3` as default dependency** — included in `pyproject.toml` so new installs have S3 support out of the box
+- **`trigger-registry` and `schedule` skills** — added to Oracle and Clawdia agents so they can create/manage webhook triggers and scheduled tasks
+
+### Changed
+
+- **S3 backup is now S3-only** — when S3 is configured, daily routine and `make backup-s3` upload to S3 and delete the local copy. Local backup is fallback only when S3 is not configured
+- **Dashboard restore runs post-migrate** — restore via the web UI now auto-fixes schema differences (missing columns, corrupted datetimes) after extracting, preventing 500 errors from old backups
+
 ## [0.18.4] - 2026-04-12
 
 ### Changed

backup.py

@@ -251,9 +251,62 @@ def backup_local(s3_upload: bool = False, s3_bucket: str = None) -> Path:
     if s3_upload:
         backup_s3_upload(zip_path, s3_bucket)
 
+    # Auto-cleanup old backups based on retention settings
+    cleanup_old_backups(s3_bucket=s3_bucket)
+
     return zip_path
 
 
+# ── Cleanup ─────────────────────────────────────────
+
+
+def cleanup_old_backups(s3_bucket: str = None):
+    """Remove old backups beyond retention limits (BACKUP_RETAIN_LOCAL, BACKUP_RETAIN_S3)."""
+
+    # Local cleanup
+    retain_local = os.environ.get("BACKUP_RETAIN_LOCAL", "").strip()
+    if retain_local and retain_local.isdigit() and int(retain_local) > 0:
+        limit = int(retain_local)
+        if BACKUPS_DIR.exists():
+            zips = sorted(BACKUPS_DIR.glob("evonexus-backup-*.zip"), reverse=True)
+            to_delete = zips[limit:]
+            for z in to_delete:
+                z.unlink(missing_ok=True)
+            if to_delete:
+                msg = f"  Cleaned {len(to_delete)} old local backup(s) (keeping {limit})"
+                if HAS_RICH:
+                    console.print(f"  [dim]{msg}[/]")
+                else:
+                    print(f"  {DIM}{msg}{RESET}")
+
+    # S3 cleanup
+    retain_s3 = os.environ.get("BACKUP_RETAIN_S3", "").strip()
+    bucket = s3_bucket or os.environ.get("BACKUP_S3_BUCKET", "")
+    if retain_s3 and retain_s3.isdigit() and int(retain_s3) > 0 and bucket:
+        limit = int(retain_s3)
+        try:
+            import boto3
+            endpoint_url = os.environ.get("AWS_ENDPOINT_URL")
+            s3 = boto3.client("s3", endpoint_url=endpoint_url) if endpoint_url else boto3.client("s3")
+            prefix = os.environ.get("BACKUP_S3_PREFIX", "evonexus-backups/")
+            if not prefix.endswith("/"):
+                prefix += "/"
+            resp = s3.list_objects_v2(Bucket=bucket, Prefix=prefix)
+            objects = [o for o in resp.get("Contents", []) if o["Key"].endswith(".zip")]
+            objects.sort(key=lambda o: o["LastModified"], reverse=True)
+            to_delete = objects[limit:]
+            for obj in to_delete:
+                s3.delete_object(Bucket=bucket, Key=obj["Key"])
+            if to_delete:
+                msg = f"  Cleaned {len(to_delete)} old S3 backup(s) (keeping {limit})"
+                if HAS_RICH:
+                    console.print(f"  [dim]{msg}[/]")
+                else:
+                    print(f"  {DIM}{msg}{RESET}")
+        except Exception as e:
+            print(f"  {YELLOW}S3 cleanup skipped: {e}{RESET}")
+
+
 # ── Restore ──────────────────────────────────────
 
 
@@ -521,7 +574,11 @@ def main():
 
     if args.command == "backup":
         s3_upload = args.target == "s3"
-        backup_local(s3_upload=s3_upload, s3_bucket=args.s3_bucket)
+        zip_path = backup_local(s3_upload=s3_upload, s3_bucket=args.s3_bucket)
+        # S3 mode: remove local copy after successful upload
+        if s3_upload and zip_path and zip_path.exists():
+            zip_path.unlink(missing_ok=True)
+            print(f"  {GREEN}✓ Local copy removed (S3 only){RESET}")
 
     elif args.command == "restore":
         if args.target == "s3":

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evoapi/evo-nexus",
-  "version": "0.18.4",
+  "version": "0.18.5",
   "description": "Unofficial open source toolkit for Claude Code — AI-powered business operating system",
   "keywords": [
     "claude-code",

dashboard/backend/routes/backups.py

@@ -16,6 +16,43 @@
 _running_jobs = {}
 
 
+def _post_restore_migrate():
+    """Run schema fixes after restoring a backup (old DBs may have missing columns/bad data)."""
+    import sqlite3
+    from flask import current_app
+
+    db_path = current_app.config["SQLALCHEMY_DATABASE_URI"].replace("sqlite:///", "")
+    conn = sqlite3.connect(db_path)
+    cur = conn.cursor()
+
+    # Ensure all tables exist (db.create_all equivalent for new models)
+    from models import db as _db
+    _db.create_all()
+
+    # Add missing columns
+    existing = {row[1] for row in cur.execute("PRAGMA table_info(roles)").fetchall()}
+    if "agent_access_json" not in existing:
+        cur.execute("ALTER TABLE roles ADD COLUMN agent_access_json TEXT DEFAULT '{\"mode\": \"all\"}'")
+
+    # Fix corrupted datetime columns (NULL or non-string crash SQLAlchemy)
+    for tbl, col in [("roles", "created_at"), ("users", "created_at"), ("users", "last_login")]:
+        try:
+            tbl_cols = {row[1] for row in cur.execute(f"PRAGMA table_info({tbl})").fetchall()}
+            if col in tbl_cols:
+                cur.execute(f"UPDATE {tbl} SET {col} = datetime('now') WHERE {col} IS NOT NULL AND typeof({col}) != 'text'")
+                cur.execute(f"UPDATE {tbl} SET {col} = datetime('now') WHERE {col} IS NOT NULL AND {col} != '' AND {col} NOT LIKE '____-__-__%'")
+        except Exception:
+            pass
+
+    conn.commit()
+    conn.close()
+
+    # Re-seed roles to ensure new permissions exist
+    from models import seed_roles, seed_systems
+    seed_roles()
+    seed_systems()
+
+
 def _require(resource: str, action: str):
     if not has_permission(current_user.role, resource, action):
         return jsonify({"error": "Forbidden"}), 403
@@ -71,7 +108,10 @@ def _run():
             import sys
             sys.path.insert(0, str(WORKSPACE))
             import backup as backup_module
-            backup_module.backup_local(s3_upload=s3_upload)
+            zip_path = backup_module.backup_local(s3_upload=s3_upload)
+            # S3 mode: remove local copy after successful upload
+            if s3_upload and zip_path and zip_path.exists():
+                zip_path.unlink(missing_ok=True)
             _running_jobs["backup"] = {"status": "done"}
         except Exception as e:
             _running_jobs["backup"] = {"status": "error", "error": str(e)}
@@ -116,6 +156,11 @@ def _run():
             sys.path.insert(0, str(WORKSPACE))
             import backup as backup_module
             backup_module.restore_local(zip_path, mode=mode)
+
+            # After restore, run auto-migrate to fix schema differences
+            # (old backups may have missing columns or corrupted data)
+            _post_restore_migrate()
+
             _running_jobs["restore"] = {"status": "done", "mode": mode}
         except Exception as e:
             _running_jobs["restore"] = {"status": "error", "error": str(e)}

dashboard/frontend/src/pages/Backups.tsx

@@ -51,6 +51,8 @@ const S3_FIELDS = [
   { envKey: 'AWS_DEFAULT_REGION', label: 'Region', hint: 'ex: us-east-1, sa-east-1, auto', required: false, sensitive: false },
   { envKey: 'AWS_ENDPOINT_URL', label: 'Endpoint URL', hint: 'Para R2, Backblaze, MinIO (ex: https://xxx.r2.cloudflarestorage.com)', required: false, sensitive: false },
   { envKey: 'BACKUP_S3_PREFIX', label: 'Prefix', hint: 'Prefixo das chaves no bucket (ex: backups/evonexus/)', required: false, sensitive: false },
+  { envKey: 'BACKUP_RETAIN_LOCAL', label: 'Retenção local', hint: 'Backups locais a manter (ex: 7). Vazio = sem limite', required: false, sensitive: false },
+  { envKey: 'BACKUP_RETAIN_S3', label: 'Retenção S3', hint: 'Backups no S3 a manter (ex: 30). Vazio = sem limite', required: false, sensitive: false },
 ]
 
 function S3ConfigPanel({ config, onSaved }: { config: BackupConfig; onSaved: () => void }) {

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "evo-nexus"
-version = "0.18.4"
+version = "0.18.5"
 description = "Unofficial open source toolkit for Claude Code — AI-powered business operating system"
 requires-python = ">=3.10"
 dependencies = [
@@ -15,6 +15,7 @@ dependencies = [
     "requests>=2.31",
     "pyyaml>=6.0",
     "flask-sock>=0.7",
+    "boto3>=1.35",
     "pywinpty>=3.0.3; sys_platform == 'win32'",
 ]