diff --git a/flake.lock b/flake.lock
index 70b8d1d..2f56ce4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -750,14 +750,15 @@
       "inputs": {
         "crane": "crane_2",
         "flake-parts": "flake-parts_2",
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_6",
+        "process-compose-flake": "process-compose-flake"
       },
       "locked": {
-        "lastModified": 1787392581,
-        "narHash": "sha256-8S3IVtvYjLbAfK7w+RELpLFnaJOEOSCy44LjDeJUJpI=",
+        "lastModified": 1787584741,
+        "narHash": "sha256-7uchfwhbMH30oq1wKYmbTzQbEgBekhaW7mOht1gB6So=",
         "ref": "refs/heads/main",
-        "rev": "c5d7a6bf805ee06cdcd9b3c276f6c2681bfdd2de",
-        "revCount": 211,
+        "rev": "0bb5df72451b466c386358e98b27669a2efea904",
+        "revCount": 387,
         "type": "git",
         "url": "https://git.naps.pt/naps62/maestro.git"
       },
@@ -1036,6 +1037,21 @@
         "type": "github"
       }
     },
+    "process-compose-flake": {
+      "locked": {
+        "lastModified": 1782060835,
+        "narHash": "sha256-Q8HH2t1l3MITtWCWY4ytcH5F/Q7aAHo3Iq/QTMAKTe0=",
+        "owner": "Platonic-Systems",
+        "repo": "process-compose-flake",
+        "rev": "464ff6880737f063c3f0d3d2c7781fda9190868f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Platonic-Systems",
+        "repo": "process-compose-flake",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agent-of-empires": "agent-of-empires",
diff --git a/home/yolo/aoe-config.toml b/home/yolo/aoe-config.toml
index bae300b..baad1a0 100644
--- a/home/yolo/aoe-config.toml
+++ b/home/yolo/aoe-config.toml
@@ -16,13 +16,6 @@ restrict_agents = false
 show_tool_durations = true
 silent_orphan_grace_secs = 120
 
-[auth]
-persist_sessions = true
-
-[diff]
-context_lines = 3
-split_view = false
-
 [hooks]
 
 [host_hooks]
@@ -38,24 +31,6 @@ show_spans = false
 
 [logging.targets]
 
-[sandbox]
-auto_cleanup = true
-container_runtime = "docker"
-default_image = "ghcr.io/agent-of-empires/aoe-sandbox:latest"
-default_terminal_mode = "host"
-enabled_by_default = false
-environment = [
-    "TERM",
-    "COLORTERM",
-    "FORCE_COLOR",
-    "NO_COLOR",
-]
-extra_volumes = []
-mount_ssh = false
-selinux_relabel = false
-volume_ignores = []
-volume_ignores_strategy = "anonymous"
-
 [session]
 agent_status_hooks = true
 auto_resume_on_restart = true
@@ -63,7 +38,6 @@ auto_stop_idle_secs = 0
 click_action = "live_send"
 confirm_before_quit = false
 confirm_delete = true
-conversation_summary = false
 default_attach_mode = "tmux"
 delete_to_trash = false
 favorites_first = true
@@ -79,10 +53,8 @@ prevent_sleep_when_active = false
 restart_wake_message = "wake up: pick up what you were doing"
 row_tag = "none"
 show_session_colors = true
-show_tips = false
 smart_rename = true
 smart_rename_agent = ""
-snooze_duration_minutes = 30
 strict_hotkeys = false
 tie_workdir_to_name = true
 trash_retention_days = 30
@@ -95,18 +67,9 @@ synclaude = "claude"
 [session.custom_agents]
 synclaude = "synclaude"
 
-[skills]
-auto_propagate = false
-
-[sound]
-enabled = false
-
 [status_hooks]
 enabled = false
 
-[telemetry]
-enabled = false
-
 [theme]
 color_mode = "truecolor"
 idle_decay_minutes = 0
@@ -118,17 +81,6 @@ mouse = "auto"
 status_bar = "auto"
 vt_live = true
 
-[updates]
-auto_update_plugins = false
-update_check_mode = "notify"
-
-[web]
-notifications_enabled = true
-notify_on_error = true
-notify_on_idle = false
-notify_on_waiting = true
-notify_on_wake_fire = true
-
 [worktree]
 auto_cleanup = true
 bare_repo_path_template = "./{branch}"
diff --git a/home/yolo/claude-settings.json b/home/yolo/claude-settings.json
index b185588..9e644cb 100644
--- a/home/yolo/claude-settings.json
+++ b/home/yolo/claude-settings.json
@@ -1,4 +1,5 @@
 {
+  "$schema": "https://json.schemastore.org/claude-code-settings.json",
   "permissions": {
     "allow": [
       "Bash",
@@ -18,21 +19,18 @@
       "mcp__dokploy__schedule-update",
       "mcp__dokploy__schedule-runManually"
     ],
-    "defaultMode": "auto"
+    "defaultMode": "auto",
+    "additionalDirectories": [
+      "/home/naps62/projects",
+      "/home/naps62/ethui",
+      "/home/naps62/labs",
+      "/home/naps62/subvisual"
+    ]
   },
+  "model": "sonnet",
   "hooks": {
-    "PostToolUse": [
+    "ElicitationResult": [
       {
-        "matcher": "Write|Edit|MultiEdit",
-        "hooks": [
-          {
-            "type": "command",
-            "command": "~/.claude/hooks/comment-lint.py"
-          }
-        ]
-      },
-      {
-        "matcher": "AskUserQuestion",
         "hooks": [
           {
             "type": "command",
@@ -69,6 +67,26 @@
         ]
       }
     ],
+    "PostToolUse": [
+      {
+        "matcher": "Write|Edit|MultiEdit",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "~/.claude/hooks/comment-lint.py"
+          }
+        ]
+      },
+      {
+        "matcher": "AskUserQuestion",
+        "hooks": [
+          {
+            "type": "command",
+            "command": "sh -c 'unset IFS; set -f; umask 077; [ -n \"$AOE_INSTANCE_ID\" ] || exit 0; case \"$AOE_INSTANCE_ID\" in *[!0-9a-zA-Z_-]*) exit 0 ;; esac; B=/tmp/aoe-hooks-1000; mkdir -p \"$B\" 2>/dev/null || exit 0; LS=$(LC_ALL=C ls -ldn \"$B\" 2>/dev/null) || exit 0; set -- $LS; M=\"$1\"; case \"$M\" in drwx------|drwx------.|drwx------+|drwx------@) ;; *) exit 0 ;; esac; ME=$(id -u 2>/dev/null) || exit 0; [ \"$3\" = \"$ME\" ] || exit 0; D=\"$B/$AOE_INSTANCE_ID\"; mkdir -p \"$D\" 2>/dev/null; LS=$(LC_ALL=C ls -ldn \"$D\" 2>/dev/null) || exit 0; set -- $LS; M=\"$1\"; case \"$M\" in drwx------|drwx------.|drwx------+|drwx------@) ;; *) exit 0 ;; esac; [ \"$3\" = \"$ME\" ] || exit 0; printf running > \"$D/status\" 2>/dev/null; exit 0 # aoe-hooks'"
+          }
+        ]
+      }
+    ],
     "PreToolUse": [
       {
         "matcher": "Bash",
@@ -168,6 +186,16 @@
         ]
       }
     ],
+    "StopFailure": [
+      {
+        "hooks": [
+          {
+            "type": "command",
+            "command": "sh -c 'unset IFS; set -f; umask 077; [ -n \"$AOE_INSTANCE_ID\" ] || exit 0; case \"$AOE_INSTANCE_ID\" in *[!0-9a-zA-Z_-]*) exit 0 ;; esac; B=/tmp/aoe-hooks-1000; mkdir -p \"$B\" 2>/dev/null || exit 0; LS=$(LC_ALL=C ls -ldn \"$B\" 2>/dev/null) || exit 0; set -- $LS; M=\"$1\"; case \"$M\" in drwx------|drwx------.|drwx------+|drwx------@) ;; *) exit 0 ;; esac; ME=$(id -u 2>/dev/null) || exit 0; [ \"$3\" = \"$ME\" ] || exit 0; D=\"$B/$AOE_INSTANCE_ID\"; mkdir -p \"$D\" 2>/dev/null; LS=$(LC_ALL=C ls -ldn \"$D\" 2>/dev/null) || exit 0; set -- $LS; M=\"$1\"; case \"$M\" in drwx------|drwx------.|drwx------+|drwx------@) ;; *) exit 0 ;; esac; [ \"$3\" = \"$ME\" ] || exit 0; printf idle > \"$D/status\" 2>/dev/null; exit 0 # aoe-hooks'"
+          }
+        ]
+      }
+    ],
     "UserPromptSubmit": [
       {
         "hooks": [
@@ -181,37 +209,34 @@
           }
         ]
       }
-    ],
-    "StopFailure": [
-      {
-        "hooks": [
-          {
-            "type": "command",
-            "command": "sh -c 'unset IFS; set -f; umask 077; [ -n \"$AOE_INSTANCE_ID\" ] || exit 0; case \"$AOE_INSTANCE_ID\" in *[!0-9a-zA-Z_-]*) exit 0 ;; esac; B=/tmp/aoe-hooks-1000; mkdir -p \"$B\" 2>/dev/null || exit 0; LS=$(LC_ALL=C ls -ldn \"$B\" 2>/dev/null) || exit 0; set -- $LS; M=\"$1\"; case \"$M\" in drwx------|drwx------.|drwx------+|drwx------@) ;; *) exit 0 ;; esac; ME=$(id -u 2>/dev/null) || exit 0; [ \"$3\" = \"$ME\" ] || exit 0; D=\"$B/$AOE_INSTANCE_ID\"; mkdir -p \"$D\" 2>/dev/null; LS=$(LC_ALL=C ls -ldn \"$D\" 2>/dev/null) || exit 0; set -- $LS; M=\"$1\"; case \"$M\" in drwx------|drwx------.|drwx------+|drwx------@) ;; *) exit 0 ;; esac; [ \"$3\" = \"$ME\" ] || exit 0; printf idle > \"$D/status\" 2>/dev/null; exit 0 # aoe-hooks'"
-          }
-        ]
-      }
-    ],
-    "ElicitationResult": [
-      {
-        "hooks": [
-          {
-            "type": "command",
-            "command": "sh -c 'unset IFS; set -f; umask 077; [ -n \"$AOE_INSTANCE_ID\" ] || exit 0; case \"$AOE_INSTANCE_ID\" in *[!0-9a-zA-Z_-]*) exit 0 ;; esac; B=/tmp/aoe-hooks-1000; mkdir -p \"$B\" 2>/dev/null || exit 0; LS=$(LC_ALL=C ls -ldn \"$B\" 2>/dev/null) || exit 0; set -- $LS; M=\"$1\"; case \"$M\" in drwx------|drwx------.|drwx------+|drwx------@) ;; *) exit 0 ;; esac; ME=$(id -u 2>/dev/null) || exit 0; [ \"$3\" = \"$ME\" ] || exit 0; D=\"$B/$AOE_INSTANCE_ID\"; mkdir -p \"$D\" 2>/dev/null; LS=$(LC_ALL=C ls -ldn \"$D\" 2>/dev/null) || exit 0; set -- $LS; M=\"$1\"; case \"$M\" in drwx------|drwx------.|drwx------+|drwx------@) ;; *) exit 0 ;; esac; [ \"$3\" = \"$ME\" ] || exit 0; printf running > \"$D/status\" 2>/dev/null; exit 0 # aoe-hooks'"
-          }
-        ]
-      }
     ]
   },
   "worktree": {
     "baseRef": "fresh"
   },
+  "statusLine": {
+    "type": "command",
+    "command": "~/.claude/statusline.sh"
+  },
   "enabledPlugins": {
     "building@subvisual": true,
+    "caveman@caveman": true,
     "rust-analyzer-lsp@claude-plugins-official": false,
-    "caveman@caveman": true
+    "typescript-lsp@claude-plugins-official": true
   },
   "extraKnownMarketplaces": {
+    "caveman": {
+      "source": {
+        "source": "github",
+        "repo": "JuliusBrussee/caveman"
+      }
+    },
+    "impeccable": {
+      "source": {
+        "source": "github",
+        "repo": "pbakaus/impeccable"
+      }
+    },
     "subvisual": {
       "source": {
         "source": "github",
@@ -223,22 +248,47 @@
         "source": "github",
         "repo": "obra/superpowers-marketplace"
       }
-    },
-    "caveman": {
-      "source": {
-        "source": "github",
-        "repo": "JuliusBrussee/caveman"
-      }
     }
   },
+  "sandbox": {
+    "enabled": false,
+    "autoAllowBashIfSandboxed": false,
+    "allowedNetworkHosts": [
+      "github.com",
+      "api.github.com",
+      "raw.githubusercontent.com",
+      "gist.github.com",
+      "release-assets.githubusercontent.com"
+    ]
+  },
+  "tui": "fullscreen",
   "skipDangerousModePermissionPrompt": true,
   "theme": "dark",
   "editorMode": "vim",
+  "verbose": false,
   "preferredNotifChannel": "auto",
   "autoCompactEnabled": true,
   "remoteControlAtStartup": false,
   "inputNeededNotifEnabled": true,
+  "agentPushNotifEnabled": true,
+  "voiceEnabled": true,
+  "defaultMode": "acceptEdits",
+  "feedbackSurveyState": {
+    "lastShownTime": 1754052643456
+  },
   "mcpServers": {
+    "herd-mcp": {
+      "type": "http",
+      "url": "https://mcp.herd.eco/v1"
+    },
+    "home-assistant": {
+      "type": "http",
+      "url": "https://ha-mcp.n62.casa/mcp"
+    },
+    "linear": {
+      "type": "http",
+      "url": "https://mcp.linear.app/mcp"
+    },
     "playwright": {
       "args": [
         "-y",
@@ -247,10 +297,5 @@
       "command": "npx",
       "type": "stdio"
     }
-  },
-  "sandbox": {
-    "enabled": false
-  },
-  "model": "opus[1m]",
-  "verbose": false
+  }
 }