From 627c8c692e82809fa6314200436572dd9b3212dd Mon Sep 17 00:00:00 2001
From: Omar Shaikh <oshaikh13@gmail.com>
Date: Tue, 7 Apr 2026 21:31:52 -0700
Subject: [PATCH 1/2] update the model dropdown

---
 .../renderer/components/shared/ModelDropdown.tsx    | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/client/renderer/components/shared/ModelDropdown.tsx b/src/client/renderer/components/shared/ModelDropdown.tsx
index 9b0e937..501e757 100644
--- a/src/client/renderer/components/shared/ModelDropdown.tsx
+++ b/src/client/renderer/components/shared/ModelDropdown.tsx
@@ -6,18 +6,15 @@ export interface ModelOption {
 }
 
 export const LLM_MODELS: ModelOption[] = [
-  { value: "gemini/gemini-3-flash-preview",         label: "Gemini 3 Flash Preview" },
   { value: "gemini/gemini-3.1-flash-lite-preview",  label: "Gemini 3.1 Flash-Lite Preview" },
-  { value: "anthropic/claude-haiku-4-5",   label: "Claude Haiku 4.5" },
-  { value: "anthropic/claude-sonnet-4-6",            label: "Claude Sonnet 4.6" },
-  { value: "anthropic/claude-opus-4-6",              label: "Claude Opus 4.6" },
+  { value: "openai/gpt-5.2-nano",                   label: "OpenAI GPT-5.2 Nano" },
+  { value: "openai/gpt-4.1-nano",                   label: "OpenAI GPT-4.1 Nano" },
 ];
 
 export const TADA_MODELS: ModelOption[] = [
-  { value: "gemini/gemini-3.1-flash-lite-preview",   label: "Gemini 3.1 Flash-Lite Preview" },
-  { value: "anthropic/claude-haiku-4-5",    label: "Claude Haiku 4.5" },
-  { value: "anthropic/claude-sonnet-4-6",            label: "Claude Sonnet 4.6" },
-  { value: "anthropic/claude-opus-4-6",              label: "Claude Opus 4.6" },
+  { value: "gemini/gemini-3.1-flash-lite-preview",  label: "Gemini 3.1 Flash-Lite Preview" },
+  { value: "openai/gpt-5.2-nano",                   label: "OpenAI GPT-5.2 Nano" },
+  { value: "openai/gpt-4.1-nano",                   label: "OpenAI GPT-4.1 Nano" },
 ];
 
 export const TINKER_MODELS: ModelOption[] = [

From ec526a074fe7f66ec14fd04624d1451a915242bf Mon Sep 17 00:00:00 2001
From: Omar Shaikh <oshaikh13@gmail.com>
Date: Tue, 7 Apr 2026 22:35:26 -0700
Subject: [PATCH 2/2] lots of updates

---
 site/src/App.tsx                              |   2 +-
 site/src/main.tsx                             |   2 +-
 src/apps/moments/discovery.py                 |   4 +-
 src/apps/moments/scheduler.py                 |   3 +-
 src/client/renderer/App.tsx                   |   5 +-
 src/client/renderer/components/Sidebar.tsx    |  16 +-
 .../renderer/components/UpdateBanner.tsx      |   2 +
 .../components/connectors/ConnectorItem.tsx   |   2 +-
 .../components/dashboard/PipelineTile.tsx     |   1 +
 .../components/dashboard/PredictionCard.tsx   |   2 +
 .../components/dashboard/RewardsChart.tsx     |   1 +
 .../components/modals/PermissionModal.tsx     |   2 +-
 .../components/onboarding/Onboarding.tsx      |  36 ++++-
 .../renderer/components/overlay/Overlay.tsx   |   2 +-
 .../components/shared/AdvancedLLMSection.tsx  |   3 +-
 .../components/shared/CollapsibleSection.tsx  |   3 +-
 .../components/shared/ModelDropdown.tsx       |   2 +-
 .../components/views/ConnectorsView.tsx       |   6 +-
 .../components/views/DashboardView.tsx        |   6 +-
 .../components/views/SettingsView.tsx         | 143 ++++++++++--------
 .../renderer/components/views/TadaView.tsx    |   2 +-
 .../components/views/UserModelView.tsx        |   2 +-
 src/client/renderer/context/AppContext.tsx    |   2 +-
 src/client/renderer/featureFlags.ts           |  36 +++++
 src/client/renderer/main.tsx                  |   1 +
 src/client/renderer/onboarding-main.tsx       |   1 +
 src/client/renderer/overlay-main.tsx          |   1 +
 src/connectors/service.py                     |   7 +
 src/server/app.py                             |  12 +-
 src/server/config.py                          |   7 +-
 src/server/feature_flags.py                   |  33 ++++
 src/server/routes/settings.py                 |   3 +-
 tada-config.defaults.json                     |  18 ++-
 33 files changed, 268 insertions(+), 100 deletions(-)
 create mode 100644 src/client/renderer/featureFlags.ts
 create mode 100644 src/server/feature_flags.py

diff --git a/site/src/App.tsx b/site/src/App.tsx
index 521d28f..a6aeea9 100644
--- a/site/src/App.tsx
+++ b/site/src/App.tsx
@@ -1,4 +1,4 @@
-import { type ReactNode, useEffect, useState } from "react";
+import React, { type ReactNode, useEffect, useState } from "react";
 
 const REPO = "GeneralUserModels/tada";
 const RELEASE_URL = `https://github.com/${REPO}/releases/latest`;
diff --git a/site/src/main.tsx b/site/src/main.tsx
index bd4d570..423ec24 100644
--- a/site/src/main.tsx
+++ b/site/src/main.tsx
@@ -1,4 +1,4 @@
-import { StrictMode } from "react";
+import React, { StrictMode } from "react";
 import { createRoot } from "react-dom/client";
 import { App } from "./App";
 import "./App.css";
diff --git a/src/apps/moments/discovery.py b/src/apps/moments/discovery.py
index 671120f..9075ee8 100644
--- a/src/apps/moments/discovery.py
+++ b/src/apps/moments/discovery.py
@@ -7,6 +7,8 @@
 from datetime import datetime
 from pathlib import Path
 
+from server.feature_flags import is_enabled
+
 logger = logging.getLogger(__name__)
 
 
@@ -100,7 +102,7 @@ async def run_moments_discovery(state) -> None:
                 logger.info("Next discovery run at %s (in %.0fs)", next_run, delay)
                 await asyncio.sleep(delay)
 
-            if not state.config.moments_enabled:
+            if not (is_enabled(state.config, "moments") and state.config.moments_enabled):
                 continue
 
             cfg = state.config
diff --git a/src/apps/moments/scheduler.py b/src/apps/moments/scheduler.py
index 4284331..da921d3 100644
--- a/src/apps/moments/scheduler.py
+++ b/src/apps/moments/scheduler.py
@@ -12,6 +12,7 @@
 
 from apps.moments.execute import run as execute_moment, _parse_frontmatter as parse_frontmatter
 from apps.moments.state import load_state
+from server.feature_flags import is_enabled
 
 logger = logging.getLogger(__name__)
 
@@ -138,7 +139,7 @@ async def run_moments_scheduler(state) -> None:
         try:
             await asyncio.sleep(SCAN_INTERVAL)
 
-            if not state.config.moments_enabled:
+            if not (is_enabled(state.config, "moments") and state.config.moments_enabled):
                 continue
 
             cfg = state.config
diff --git a/src/client/renderer/App.tsx b/src/client/renderer/App.tsx
index 0046904..31020ca 100644
--- a/src/client/renderer/App.tsx
+++ b/src/client/renderer/App.tsx
@@ -1,4 +1,6 @@
+import React from "react";
 import { useAppContext } from "./context/AppContext";
+import { useFeatureFlag } from "./featureFlags";
 import { Sidebar } from "./components/Sidebar";
 import { ConnectorsView } from "./components/views/ConnectorsView";
 import { UserModelView } from "./components/views/UserModelView";
@@ -8,6 +10,7 @@ import { UpdateBanner } from "./components/UpdateBanner";
 
 export function App() {
   const { state, dispatch } = useAppContext();
+  const momentsEnabled = useFeatureFlag("moments");
 
   const navigate = (view: typeof state.activeView) => {
     dispatch({ type: "NAVIGATE", view });
@@ -30,7 +33,7 @@ export function App() {
           />
         )}
         {state.activeView === "connectors" && <ConnectorsView />}
-        {state.activeView === "tada" && <TadaView />}
+        {state.activeView === "tada" && momentsEnabled && <TadaView />}
         {state.activeView === "usermodel" && <UserModelView />}
         {state.activeView === "settings" && <SettingsView />}
       </main>
diff --git a/src/client/renderer/components/Sidebar.tsx b/src/client/renderer/components/Sidebar.tsx
index dbfe03a..d18e222 100644
--- a/src/client/renderer/components/Sidebar.tsx
+++ b/src/client/renderer/components/Sidebar.tsx
@@ -1,4 +1,6 @@
+import React from "react";
 import { ActiveView } from "../context/AppContext";
+import { useFeatureFlags, getFlag } from "../featureFlags";
 
 interface Props {
   activeView: ActiveView;
@@ -48,7 +50,19 @@ const navItems: { view: ActiveView; label: string; icon: JSX.Element }[] = [
   },
 ];
 
+const FLAG_FOR_VIEW: Partial<Record<ActiveView, string>> = {
+  tada: "moments",
+};
+
 export function Sidebar({ activeView, connected, onNavigate }: Props) {
+  const featureFlags = useFeatureFlags();
+
+  const visibleItems = navItems.filter(({ view }) => {
+    const flag = FLAG_FOR_VIEW[view];
+    if (flag && !getFlag(featureFlags, flag)) return false;
+    return true;
+  });
+
   return (
     <nav id="sidebar">
       <div className="sidebar-brand">
@@ -72,7 +86,7 @@ export function Sidebar({ activeView, connected, onNavigate }: Props) {
       </div>
 
       <div className="sidebar-nav">
-        {navItems.map(({ view, label, icon }) => (
+        {visibleItems.map(({ view, label, icon }) => (
           <button
             key={view}
             className={`nav-item${activeView === view ? " active" : ""}`}
diff --git a/src/client/renderer/components/UpdateBanner.tsx b/src/client/renderer/components/UpdateBanner.tsx
index 297c380..2427b61 100644
--- a/src/client/renderer/components/UpdateBanner.tsx
+++ b/src/client/renderer/components/UpdateBanner.tsx
@@ -1,3 +1,5 @@
+import React from "react";
+
 const DOWNLOAD_URL = "https://github.com/GeneralUserModels/tada-release/releases/latest";
 
 interface Props {
diff --git a/src/client/renderer/components/connectors/ConnectorItem.tsx b/src/client/renderer/components/connectors/ConnectorItem.tsx
index 0f8ccec..0d16d7e 100644
--- a/src/client/renderer/components/connectors/ConnectorItem.tsx
+++ b/src/client/renderer/components/connectors/ConnectorItem.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
 
 const CONNECTOR_ICONS: Record<string, JSX.Element> = {
   monitor: (
diff --git a/src/client/renderer/components/dashboard/PipelineTile.tsx b/src/client/renderer/components/dashboard/PipelineTile.tsx
index 4aec247..1a02202 100644
--- a/src/client/renderer/components/dashboard/PipelineTile.tsx
+++ b/src/client/renderer/components/dashboard/PipelineTile.tsx
@@ -1,3 +1,4 @@
+import React from "react";
 import { TrainingState } from "../../hooks/useTraining";
 
 const stateLabels: Record<TrainingState, string> = {
diff --git a/src/client/renderer/components/dashboard/PredictionCard.tsx b/src/client/renderer/components/dashboard/PredictionCard.tsx
index e2f9d9f..f377caa 100644
--- a/src/client/renderer/components/dashboard/PredictionCard.tsx
+++ b/src/client/renderer/components/dashboard/PredictionCard.tsx
@@ -1,3 +1,5 @@
+import React from "react";
+
 interface Props {
   prediction: { actions?: string; error?: string; timestamp?: string } | null;
 }
diff --git a/src/client/renderer/components/dashboard/RewardsChart.tsx b/src/client/renderer/components/dashboard/RewardsChart.tsx
index 3422409..4909be8 100644
--- a/src/client/renderer/components/dashboard/RewardsChart.tsx
+++ b/src/client/renderer/components/dashboard/RewardsChart.tsx
@@ -1,3 +1,4 @@
+import React from "react";
 import {
   LineChart,
   Line,
diff --git a/src/client/renderer/components/modals/PermissionModal.tsx b/src/client/renderer/components/modals/PermissionModal.tsx
index 4174aeb..e308c79 100644
--- a/src/client/renderer/components/modals/PermissionModal.tsx
+++ b/src/client/renderer/components/modals/PermissionModal.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
 import { updateConnector } from "../../api/client";
 
 interface Props {
diff --git a/src/client/renderer/components/onboarding/Onboarding.tsx b/src/client/renderer/components/onboarding/Onboarding.tsx
index 1d0552a..25f0290 100644
--- a/src/client/renderer/components/onboarding/Onboarding.tsx
+++ b/src/client/renderer/components/onboarding/Onboarding.tsx
@@ -1,7 +1,8 @@
-import { useEffect, useRef, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { AdvancedLLMSection } from "../shared/AdvancedLLMSection";
 import { ModelDropdown, LLM_MODELS, TINKER_MODELS } from "../shared/ModelDropdown";
 import { PermissionModal } from "../modals/PermissionModal";
+import { getFlag } from "../../featureFlags";
 import {
   startGoogleSignIn,
   getGoogleUser,
@@ -10,6 +11,7 @@ import {
   checkNotificationsPermission,
   checkFilesystemPermission,
   checkBrowserCookiesPermission,
+  getSettings,
   updateSettings,
   completeOnboarding,
 } from "../../api/client";
@@ -36,6 +38,10 @@ export function Onboarding() {
   const [step, setStep] = useState(0);
   const [permModal, setPermModal] = useState<{ name: string; onGranted: () => void } | null>(null);
 
+  // Feature flags (loaded from server settings)
+  const [ff, setFf] = useState<Record<string, boolean> | undefined>(undefined);
+  const flag = (name: string) => getFlag(ff, name);
+
   // Google login state
   const [googleUser, setGoogleUser] = useState<{ name: string; email: string } | null>(null);
   const [googleLoading, setGoogleLoading] = useState(false);
@@ -55,8 +61,12 @@ export function Onboarding() {
   const [connectingGoogle, setConnectingGoogle] = useState<string | null>(null);
   const [connectingOutlook, setConnectingOutlook] = useState(false);
 
-  // Restore saved Google user on mount; if already signed in, resume at step 2
+  // Load feature flags + restore saved Google user on mount
   useEffect(() => {
+    getSettings()
+      .then((s) => setFf((s as Record<string, unknown>).feature_flags as Record<string, boolean> | undefined))
+      .catch(() => {});
+
     getGoogleUser().then(user => {
       if (user) {
         setGoogleUser(user);
@@ -277,6 +287,7 @@ export function Onboarding() {
           <div className="glass-card" style={{ padding: 16 }}>
             <div className="connector-list">
               {/* Screen Recording */}
+              {flag("permission_screen") && (
               <div className="connector-row">
                 <div className="connector-icon">
                   <svg width="14" height="14" viewBox="0 0 16 16" fill="none"><rect x="2" y="3" width="12" height="10" rx="2" stroke="currentColor" strokeWidth="1.3"/><circle cx="8" cy="8" r="2" fill="currentColor"/></svg>
@@ -292,8 +303,10 @@ export function Onboarding() {
                   }
                 </div>
               </div>
+              )}
 
               {/* Google (Calendar + Gmail) */}
+              {(flag("connector_gmail") || flag("connector_calendar")) && (
               <div className="connector-row">
                 <div className="connector-icon">
                   <svg width="14" height="14" viewBox="0 0 16 16" fill="none"><rect x="2" y="3" width="12" height="11" rx="1.5" stroke="currentColor" strokeWidth="1.3"/><path d="M2 6.5h12" stroke="currentColor" strokeWidth="1.3"/><path d="M5 1.5v3M11 1.5v3" stroke="currentColor" strokeWidth="1.3" strokeLinecap="round"/></svg>
@@ -309,8 +322,10 @@ export function Onboarding() {
                   }
                 </div>
               </div>
+              )}
 
               {/* Outlook (shared auth for calendar + email) */}
+              {(flag("connector_outlook_email") || flag("connector_outlook_calendar")) && (
               <div className="connector-row">
                 <div className="connector-icon">
                   <svg width="14" height="14" viewBox="0 0 16 16" fill="none"><rect x="2" y="3" width="12" height="11" rx="1.5" stroke="currentColor" strokeWidth="1.3"/><path d="M2 6.5h12" stroke="currentColor" strokeWidth="1.3"/><path d="M5 1.5v3M11 1.5v3" stroke="currentColor" strokeWidth="1.3" strokeLinecap="round"/></svg>
@@ -326,8 +341,10 @@ export function Onboarding() {
                   }
                 </div>
               </div>
+              )}
 
               {/* Disk Access (Notifications + Filesystem) */}
+              {flag("permission_notifications") && (
               <div className="connector-row">
                 <div className="connector-icon">
                   <svg width="14" height="14" viewBox="0 0 16 16" fill="none"><path d="M2 4.5V13a1 1 0 001 1h10a1 1 0 001-1V6a1 1 0 00-1-1H7.5L6 3H3a1 1 0 00-1 1.5z" stroke="currentColor" strokeWidth="1.3" strokeLinejoin="round"/></svg>
@@ -343,8 +360,10 @@ export function Onboarding() {
                   }
                 </div>
               </div>
+              )}
 
               {/* Browser Cookies */}
+              {flag("permission_browser_cookies") && (
               <div className="connector-row">
                 <div className="connector-icon">
                   <svg width="14" height="14" viewBox="0 0 16 16" fill="none"><circle cx="8" cy="8" r="6" stroke="currentColor" strokeWidth="1.3"/><path d="M2 8h12M8 2c-2 2-2 10 0 12M8 2c2 2 2 10 0 12" stroke="currentColor" strokeWidth="1.3"/></svg>
@@ -360,8 +379,10 @@ export function Onboarding() {
                   }
                 </div>
               </div>
+              )}
 
               {/* Accessibility (Tabracadabra) */}
+              {flag("permission_accessibility") && (
               <div className="connector-row">
                 <div className="connector-icon">
                   <svg width="14" height="14" viewBox="0 0 16 16" fill="none"><path d="M8 1.5a6.5 6.5 0 100 13 6.5 6.5 0 000-13z" stroke="currentColor" strokeWidth="1.3"/><circle cx="8" cy="5.5" r="1" fill="currentColor"/><path d="M5.5 7.5h5M8 7.5v4M6.5 11.5L8 9.5l1.5 2" stroke="currentColor" strokeWidth="1" strokeLinecap="round" strokeLinejoin="round"/></svg>
@@ -377,11 +398,16 @@ export function Onboarding() {
                   }
                 </div>
               </div>
+              )}
             </div>
           </div>
           <div className="btn-row">
             <button className="btn btn-ghost" onClick={() => setStep(1)}>Back</button>
-            <button className="btn btn-primary" disabled={!screenGranted || !browserCookiesGranted || !accessibilityGranted} onClick={() => setStep(3)}>Continue</button>
+            <button className="btn btn-primary" disabled={
+              (flag("permission_screen") && !screenGranted)
+              || (flag("permission_browser_cookies") && !browserCookiesGranted)
+              || (flag("permission_accessibility") && !accessibilityGranted)
+            } onClick={() => setStep(3)}>Continue</button>
           </div>
         </div>
       )}
@@ -414,6 +440,7 @@ export function Onboarding() {
               </div>
             </div>
             <AdvancedLLMSection values={advancedValues} setValues={setAdvancedValues} />
+            {flag("tinker") && (
             <div className="model-row">
               <span className="model-row-label">Tinker <span className="optional-tag">optional</span></span>
               <div className="model-row-fields">
@@ -429,6 +456,7 @@ export function Onboarding() {
                 </div>
               </div>
             </div>
+            )}
             <div className="model-row">
               <span className="model-row-label">W&amp;B <span className="optional-tag">optional</span></span>
               <div className="model-row-fields">
@@ -442,7 +470,7 @@ export function Onboarding() {
           </div>
           <div className="btn-row">
             <button className="btn btn-ghost" onClick={() => setStep(2)}>Back</button>
-            <button className="btn btn-primary" disabled={!model.trim() || !geminiKey.trim() || !!tinkerError} onClick={handleSubmit}>Finish Setup</button>
+            <button className="btn btn-primary" disabled={!model.trim() || !geminiKey.trim() || (flag("tinker") && !!tinkerError)} onClick={handleSubmit}>Finish Setup</button>
           </div>
         </div>
       )}
diff --git a/src/client/renderer/components/overlay/Overlay.tsx b/src/client/renderer/components/overlay/Overlay.tsx
index fdee0a1..08253aa 100644
--- a/src/client/renderer/components/overlay/Overlay.tsx
+++ b/src/client/renderer/components/overlay/Overlay.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useRef, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 
 type OverlayStatus = "waiting" | "flushing" | "predicted";
 
diff --git a/src/client/renderer/components/shared/AdvancedLLMSection.tsx b/src/client/renderer/components/shared/AdvancedLLMSection.tsx
index c22c5fe..a89c5ca 100644
--- a/src/client/renderer/components/shared/AdvancedLLMSection.tsx
+++ b/src/client/renderer/components/shared/AdvancedLLMSection.tsx
@@ -1,5 +1,4 @@
-import { useState } from "react";
-import React from "react";
+import React, { useState } from "react";
 import { ModelDropdown, LLM_MODELS, ModelOption } from "./ModelDropdown";
 
 export const ADVANCED_ROWS: { label: string; modelKey: string; apiKeyKey: string }[] = [
diff --git a/src/client/renderer/components/shared/CollapsibleSection.tsx b/src/client/renderer/components/shared/CollapsibleSection.tsx
index d3ac7b5..648b349 100644
--- a/src/client/renderer/components/shared/CollapsibleSection.tsx
+++ b/src/client/renderer/components/shared/CollapsibleSection.tsx
@@ -1,5 +1,4 @@
-import { useState } from "react";
-import React from "react";
+import React, { useState } from "react";
 
 interface Props {
   title: string;
diff --git a/src/client/renderer/components/shared/ModelDropdown.tsx b/src/client/renderer/components/shared/ModelDropdown.tsx
index 501e757..6ee4a88 100644
--- a/src/client/renderer/components/shared/ModelDropdown.tsx
+++ b/src/client/renderer/components/shared/ModelDropdown.tsx
@@ -1,4 +1,4 @@
-import { useState, useEffect, useRef } from "react";
+import React, { useState, useEffect, useRef } from "react";
 
 export interface ModelOption {
   value: string;
diff --git a/src/client/renderer/components/views/ConnectorsView.tsx b/src/client/renderer/components/views/ConnectorsView.tsx
index a6bcfcf..cca7056 100644
--- a/src/client/renderer/components/views/ConnectorsView.tsx
+++ b/src/client/renderer/components/views/ConnectorsView.tsx
@@ -1,5 +1,6 @@
-import { useEffect, useState, useRef } from "react";
+import React, { useEffect, useState, useRef } from "react";
 import { useAppContext, HistoryItem } from "../../context/AppContext";
+import { useFeatureFlags, getFlag } from "../../featureFlags";
 import * as api from "../../api/client";
 import { useConnectors } from "../../hooks/useConnectors";
 import { ConnectorItem, CONNECTOR_META } from "../connectors/ConnectorItem";
@@ -12,6 +13,7 @@ const BADGE_CLASS: Record<HistoryItem["type"], string> = {
 
 export function ConnectorsView() {
   const { state, dispatch } = useAppContext();
+  const featureFlags = useFeatureFlags();
   const { connectors, loading, load, toggle, toggling, connectGoogle, connectOutlook, retry } = useConnectors();
   const [connectingName, setConnectingName] = useState<string | null>(null);
   const pollRef = useRef<ReturnType<typeof setInterval> | null>(null);
@@ -71,7 +73,7 @@ export function ConnectorsView() {
         ) : (
           <div style={{ display: "flex", flexDirection: "column", gap: 2 }}>
             {Object.entries(connectors)
-              .filter(([name]) => CONNECTOR_META[name])
+              .filter(([name]) => CONNECTOR_META[name] && getFlag(featureFlags, `connector_${name}`))
               .sort(([a], [b]) => {
                 const keys = Object.keys(CONNECTOR_META);
                 return keys.indexOf(a) - keys.indexOf(b);
diff --git a/src/client/renderer/components/views/DashboardView.tsx b/src/client/renderer/components/views/DashboardView.tsx
index 1191727..1e60d00 100644
--- a/src/client/renderer/components/views/DashboardView.tsx
+++ b/src/client/renderer/components/views/DashboardView.tsx
@@ -1,6 +1,7 @@
-import { useEffect } from "react";
+import React, { useEffect } from "react";
 import { useAppContext } from "../../context/AppContext";
 import { useTraining } from "../../hooks/useTraining";
+import { requestPrediction } from "../../api/client";
 import { TrainingTile, InferenceTile } from "../dashboard/PipelineTile";
 import { PredictionCard } from "../dashboard/PredictionCard";
 import { RewardsChart } from "../dashboard/RewardsChart";
@@ -26,8 +27,7 @@ export function DashboardView() {
 
   const handleGenerate = async () => {
     dispatch({ type: "PREDICTION_REQUESTED" });
-    await window.tada.startInference();
-    await window.tada.requestPrediction();
+    await requestPrediction();
   };
 
   return (
diff --git a/src/client/renderer/components/views/SettingsView.tsx b/src/client/renderer/components/views/SettingsView.tsx
index be6d2f4..45a3844 100644
--- a/src/client/renderer/components/views/SettingsView.tsx
+++ b/src/client/renderer/components/views/SettingsView.tsx
@@ -1,5 +1,6 @@
-import { useState, useEffect } from "react";
+import React, { useState, useEffect } from "react";
 import { useAppContext } from "../../context/AppContext";
+import { useFeatureFlag } from "../../featureFlags";
 import { getSettings, updateSettings } from "../../api/client";
 import { AdvancedLLMSection, ADVANCED_ROWS } from "../shared/AdvancedLLMSection";
 import { ModelDropdown, LLM_MODELS, TINKER_MODELS } from "../shared/ModelDropdown";
@@ -28,6 +29,9 @@ function allKeys(): string[] {
 
 export function SettingsView() {
   const { state, dispatch } = useAppContext();
+  const momentsEnabled = useFeatureFlag("moments");
+  const tabracadabraEnabled = useFeatureFlag("tabracadabra");
+  const tinkerEnabled = useFeatureFlag("tinker");
   const [values, setValues] = useState<Record<string, string>>({});
 
   useEffect(() => {
@@ -48,7 +52,7 @@ export function SettingsView() {
       data[key] = val;
     }
     // boolean fields
-    data["tabracadabra_enabled"] = values["tabracadabra_enabled"] === "true";
+    data["tabracadabra_enabled"] = (values["tabracadabra_enabled"] ?? "true") === "true";
     data["moments_enabled"] = (values["moments_enabled"] ?? "true") === "true";
     if (Object.keys(data).length > 0) {
       await updateSettings(data);
@@ -102,6 +106,7 @@ export function SettingsView() {
             </div>
           </div>
 
+          {momentsEnabled && (
           <div className="model-row">
             <span className="model-row-label">Ta-Da</span>
             <label style={{ position: "relative", display: "inline-block", width: 36, height: 20, cursor: "pointer" }}>
@@ -124,6 +129,8 @@ export function SettingsView() {
               }} />
             </label>
           </div>
+          )}
+          {tabracadabraEnabled && (
           <div className="model-row" style={{ marginTop: 10 }}>
             <span className="model-row-label">Tabracadabra</span>
             <label style={{ position: "relative", display: "inline-block", width: 36, height: 20, cursor: "pointer" }}>
@@ -146,75 +153,79 @@ export function SettingsView() {
               }} />
             </label>
           </div>
+          )}
 
           <AdvancedLLMSection values={values} setValues={setValues}>
-            {/* User model type */}
-            <div className="model-row" style={{ marginTop: 10 }}>
-              <span className="model-row-label">User Model</span>
-              <div style={{ display: "flex", gap: 4, background: "rgba(0,0,0,0.05)", borderRadius: 8, padding: 3, width: "fit-content" }}>
-                {(["prompted", "powernap"] as const).map((type) => (
-                  <button
-                    key={type}
-                    type="button"
-                    onClick={() => setValues(v => ({ ...v, model_type: type }))}
-                    style={{
-                      padding: "5px 14px",
-                      borderRadius: 6,
-                      border: "none",
-                      fontSize: 12,
-                      fontFamily: "inherit",
-                      cursor: "pointer",
-                      fontWeight: modelType === type ? 600 : 400,
-                      background: modelType === type ? "white" : "transparent",
-                      color: modelType === type ? "var(--text)" : "var(--text-tertiary)",
-                      boxShadow: modelType === type ? "0 1px 4px rgba(0,0,0,0.1)" : "none",
-                      transition: "all 0.15s",
-                    }}
-                  >
-                    {type === "prompted" ? "Prompted" : "Tinker"}
-                  </button>
-                ))}
-              </div>
-            </div>
-
-            {isTinker && (
+            {tinkerEnabled && (
               <>
-                <div className="model-row">
-                  <span className="model-row-label">Tinker</span>
-                  <div className="model-row-fields">
-                    <label className="field">
-                      <span>Model</span>
-                      <ModelDropdown
-                        value={values["model"] ?? ""}
-                        onChange={(val) => setValues(v => ({ ...v, model: val }))}
-                        options={TINKER_MODELS}
-                        placeholder="Select a model"
-                      />
-                    </label>
-                    <label className="field">
-                      <span>API Key</span>
-                      <input
-                        type="text"
-                        placeholder="tml-..."
-                        value={values["tinker_api_key"] ?? ""}
-                        onChange={(e) => setValues(v => ({ ...v, tinker_api_key: e.target.value }))}
-                      />
-                    </label>
-                  </div>
-                </div>
-                <div className="model-row">
-                  <span className="model-row-label">W&amp;B <span className="optional-tag">optional</span></span>
-                  <div className="model-row-fields">
-                    <label className="field">
-                      <span>API Key</span>
-                      <input type="text" placeholder="wandb-..." value={values["wandb_api_key"] ?? ""} onChange={(e) => setValues(v => ({ ...v, wandb_api_key: e.target.value }))} />
-                    </label>
-                    <label className="field">
-                      <span>HuggingFace Token</span>
-                      <input type="text" placeholder="hf_..." value={values["hf_token"] ?? ""} onChange={(e) => setValues(v => ({ ...v, hf_token: e.target.value }))} />
-                    </label>
+                <div className="model-row" style={{ marginTop: 10 }}>
+                  <span className="model-row-label">User Model</span>
+                  <div style={{ display: "flex", gap: 4, background: "rgba(0,0,0,0.05)", borderRadius: 8, padding: 3, width: "fit-content" }}>
+                    {(["prompted", "powernap"] as const).map((type) => (
+                      <button
+                        key={type}
+                        type="button"
+                        onClick={() => setValues(v => ({ ...v, model_type: type }))}
+                        style={{
+                          padding: "5px 14px",
+                          borderRadius: 6,
+                          border: "none",
+                          fontSize: 12,
+                          fontFamily: "inherit",
+                          cursor: "pointer",
+                          fontWeight: modelType === type ? 600 : 400,
+                          background: modelType === type ? "white" : "transparent",
+                          color: modelType === type ? "var(--text)" : "var(--text-tertiary)",
+                          boxShadow: modelType === type ? "0 1px 4px rgba(0,0,0,0.1)" : "none",
+                          transition: "all 0.15s",
+                        }}
+                      >
+                        {type === "prompted" ? "Prompted" : "Tinker"}
+                      </button>
+                    ))}
                   </div>
                 </div>
+
+                {isTinker && (
+                  <>
+                    <div className="model-row">
+                      <span className="model-row-label">Tinker</span>
+                      <div className="model-row-fields">
+                        <label className="field">
+                          <span>Model</span>
+                          <ModelDropdown
+                            value={values["model"] ?? ""}
+                            onChange={(val) => setValues(v => ({ ...v, model: val }))}
+                            options={TINKER_MODELS}
+                            placeholder="Select a model"
+                          />
+                        </label>
+                        <label className="field">
+                          <span>API Key</span>
+                          <input
+                            type="text"
+                            placeholder="tml-..."
+                            value={values["tinker_api_key"] ?? ""}
+                            onChange={(e) => setValues(v => ({ ...v, tinker_api_key: e.target.value }))}
+                          />
+                        </label>
+                      </div>
+                    </div>
+                    <div className="model-row">
+                      <span className="model-row-label">W&amp;B <span className="optional-tag">optional</span></span>
+                      <div className="model-row-fields">
+                        <label className="field">
+                          <span>API Key</span>
+                          <input type="text" placeholder="wandb-..." value={values["wandb_api_key"] ?? ""} onChange={(e) => setValues(v => ({ ...v, wandb_api_key: e.target.value }))} />
+                        </label>
+                        <label className="field">
+                          <span>HuggingFace Token</span>
+                          <input type="text" placeholder="hf_..." value={values["hf_token"] ?? ""} onChange={(e) => setValues(v => ({ ...v, hf_token: e.target.value }))} />
+                        </label>
+                      </div>
+                    </div>
+                  </>
+                )}
               </>
             )}
           </AdvancedLLMSection>
diff --git a/src/client/renderer/components/views/TadaView.tsx b/src/client/renderer/components/views/TadaView.tsx
index 0208799..2da95f7 100644
--- a/src/client/renderer/components/views/TadaView.tsx
+++ b/src/client/renderer/components/views/TadaView.tsx
@@ -1,4 +1,4 @@
-import { useEffect, useState, useRef, useCallback } from "react";
+import React, { useEffect, useState, useRef, useCallback } from "react";
 import { useAppContext } from "../../context/AppContext";
 import { useMoments } from "../../hooks/useMoments";
 import { getServerUrl } from "../../api/client";
diff --git a/src/client/renderer/components/views/UserModelView.tsx b/src/client/renderer/components/views/UserModelView.tsx
index 3be7901..4cbd08f 100644
--- a/src/client/renderer/components/views/UserModelView.tsx
+++ b/src/client/renderer/components/views/UserModelView.tsx
@@ -1,4 +1,4 @@
-import { useEffect } from "react";
+import React, { useEffect } from "react";
 import { useAppContext } from "../../context/AppContext";
 import { useTraining } from "../../hooks/useTraining";
 import { requestPrediction } from "../../api/client";
diff --git a/src/client/renderer/context/AppContext.tsx b/src/client/renderer/context/AppContext.tsx
index 4959133..0853306 100644
--- a/src/client/renderer/context/AppContext.tsx
+++ b/src/client/renderer/context/AppContext.tsx
@@ -1,4 +1,4 @@
-import { createContext, useContext, useReducer, useRef, useEffect, ReactNode } from "react";
+import React, { createContext, useContext, useReducer, useRef, useEffect, ReactNode } from "react";
 import * as api from "../api/client";
 import * as sse from "../api/sse";
 
diff --git a/src/client/renderer/featureFlags.ts b/src/client/renderer/featureFlags.ts
new file mode 100644
index 0000000..a6fe984
--- /dev/null
+++ b/src/client/renderer/featureFlags.ts
@@ -0,0 +1,36 @@
+import { useAppContext } from "./context/AppContext";
+
+export const FEATURE_FLAG_DEFAULTS: Record<string, boolean> = {
+  moments: true,
+  tabracadabra: true,
+  tinker: false,
+  connector_screen: true,
+  connector_gmail: true,
+  connector_calendar: true,
+  connector_outlook_email: true,
+  connector_outlook_calendar: true,
+  connector_notifications: true,
+  connector_filesystem: true,
+  permission_screen: true,
+  permission_notifications: true,
+  permission_accessibility: true,
+  permission_browser_cookies: true,
+};
+
+export function getFlag(
+  flags: Record<string, boolean> | undefined,
+  name: string,
+): boolean {
+  return flags?.[name] ?? FEATURE_FLAG_DEFAULTS[name] ?? true;
+}
+
+export function useFeatureFlag(name: string): boolean {
+  const { state } = useAppContext();
+  const flags = state.settings.feature_flags as Record<string, boolean> | undefined;
+  return getFlag(flags, name);
+}
+
+export function useFeatureFlags(): Record<string, boolean> | undefined {
+  const { state } = useAppContext();
+  return state.settings.feature_flags as Record<string, boolean> | undefined;
+}
diff --git a/src/client/renderer/main.tsx b/src/client/renderer/main.tsx
index 88c7300..a5a0d57 100644
--- a/src/client/renderer/main.tsx
+++ b/src/client/renderer/main.tsx
@@ -1,3 +1,4 @@
+import React from "react";
 import { createRoot } from "react-dom/client";
 import { AppProvider } from "./context/AppContext";
 import { App } from "./App";
diff --git a/src/client/renderer/onboarding-main.tsx b/src/client/renderer/onboarding-main.tsx
index 249b34a..9b3691c 100644
--- a/src/client/renderer/onboarding-main.tsx
+++ b/src/client/renderer/onboarding-main.tsx
@@ -1,3 +1,4 @@
+import React from "react";
 import { createRoot } from "react-dom/client";
 import { Onboarding } from "./components/onboarding/Onboarding";
 import { setServerUrl } from "./api/client";
diff --git a/src/client/renderer/overlay-main.tsx b/src/client/renderer/overlay-main.tsx
index 7561e71..e6cea0e 100644
--- a/src/client/renderer/overlay-main.tsx
+++ b/src/client/renderer/overlay-main.tsx
@@ -1,3 +1,4 @@
+import React from "react";
 import { createRoot } from "react-dom/client";
 import { Overlay } from "./components/overlay/Overlay";
 
diff --git a/src/connectors/service.py b/src/connectors/service.py
index 4150741..caa704a 100644
--- a/src/connectors/service.py
+++ b/src/connectors/service.py
@@ -12,6 +12,7 @@
 from pydantic import BaseModel
 
 from connectors.mcp import MCPConnector
+from server.feature_flags import is_enabled
 
 logger = logging.getLogger(__name__)
 
@@ -323,6 +324,12 @@ async def run_context_logging_service(state) -> None:
             ),
         ))
 
+    # Drop connectors whose feature flag is disabled
+    connector_configs = [
+        c for c in connector_configs
+        if is_enabled(config, f"connector_{c.name}")
+    ]
+
     # Expose connectors on state so routes can pause/resume them
     state.connectors = {c.name: c.connector for c in connector_configs}
     state.connector_auth = {c.name: c.requires_auth for c in connector_configs}
diff --git a/src/server/app.py b/src/server/app.py
index 9e17ae7..4f798cc 100644
--- a/src/server/app.py
+++ b/src/server/app.py
@@ -10,6 +10,7 @@
 from fastapi.middleware.cors import CORSMiddleware
 
 from server.state import ServerState
+from server.feature_flags import is_enabled
 from server.routes import settings, status, events
 from server.routes.auth import router as auth_router, refresh_expired_tokens, run_token_refresh
 from server.routes.onboarding import router as onboarding_router
@@ -51,10 +52,11 @@ async def start_services(state: ServerState) -> None:
     state.token_refresh_task = asyncio.create_task(run_token_refresh(state.config))
 
     # Moments services
-    from apps.moments.scheduler import run_moments_scheduler
-    from apps.moments.discovery import run_moments_discovery
-    state.moments_scheduler_task = asyncio.create_task(run_moments_scheduler(state))
-    state.moments_discovery_task = asyncio.create_task(run_moments_discovery(state))
+    if is_enabled(state.config, "moments") and state.config.moments_enabled:
+        from apps.moments.scheduler import run_moments_scheduler
+        from apps.moments.discovery import run_moments_discovery
+        state.moments_scheduler_task = asyncio.create_task(run_moments_scheduler(state))
+        state.moments_discovery_task = asyncio.create_task(run_moments_discovery(state))
 
     # Initialize predictor and start training loop
     await init_model(state)
@@ -62,7 +64,7 @@ async def start_services(state: ServerState) -> None:
     logger.info("Training service started (%s mode)", state.config.model_type)
 
     # Tabracadabra event tap service (macOS only)
-    if sys.platform == "darwin" and state.config.tabracadabra_enabled:
+    if sys.platform == "darwin" and is_enabled(state.config, "tabracadabra") and state.config.tabracadabra_enabled:
         state.prediction_loop_task = asyncio.create_task(run_prediction_loop(state))
         try:
             from apps.tabracadabra.main import TabracadabraService, load_prompt
diff --git a/src/server/config.py b/src/server/config.py
index ea3c1ca..85c8683 100644
--- a/src/server/config.py
+++ b/src/server/config.py
@@ -23,6 +23,7 @@
     "learning_rate", "batch_size", "past_len", "future_len", "loss_mode",
     "moments_enabled", "moments_agent_model", "moments_agent_api_key",
     "tabracadabra_enabled", "tabracadabra_model", "tabracadabra_api_key",
+    "feature_flags",
 })
 
 # All fields that are user-settable and persisted to disk.
@@ -34,6 +35,7 @@
     "tada_dir", "moments_agent_model", "moments_agent_api_key", "moments_discovery_schedule", "moments_enabled",
     "tabracadabra_enabled", "tabracadabra_model", "tabracadabra_api_key",
     "agent_model", "agent_api_key",
+    "feature_flags",
 }
 
 
@@ -118,7 +120,7 @@ def prompted_model(self) -> str:
     predict_every_n_seconds: int = 10
 
     # Tabracadabra
-    tabracadabra_enabled: bool = False
+    tabracadabra_enabled: bool = True
     tabracadabra_model: str = DEFAULT_LLM_MODEL
     tabracadabra_api_key: str = ""
 
@@ -169,6 +171,9 @@ def prompted_model(self) -> str:
     # Onboarding completion flag (set by POST /api/onboarding/complete)
     onboarding_complete: bool = False
 
+    # Feature flags (deployment-level gates for entire features/connectors/permissions)
+    feature_flags: dict[str, bool] = Field(default_factory=dict)
+
     def resolve_api_key(self, key: str) -> str | None:
         """Return the feature-specific API key, falling back to default_llm_api_key."""
         return getattr(self, key, None) or self.default_llm_api_key or None
diff --git a/src/server/feature_flags.py b/src/server/feature_flags.py
new file mode 100644
index 0000000..478bd2e
--- /dev/null
+++ b/src/server/feature_flags.py
@@ -0,0 +1,33 @@
+"""Centralized feature flag registry and helpers."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from server.config import ServerConfig
+
+FEATURE_FLAG_DEFAULTS: dict[str, bool] = {
+    # Top-level features
+    "moments": True,
+    "tabracadabra": True,
+    "tinker": False,
+    # Connectors
+    "connector_screen": True,
+    "connector_gmail": True,
+    "connector_calendar": True,
+    "connector_outlook_email": True,
+    "connector_outlook_calendar": True,
+    "connector_notifications": True,
+    "connector_filesystem": True,
+    # OS-level permissions
+    "permission_screen": True,
+    "permission_notifications": True,
+    "permission_accessibility": True,
+    "permission_browser_cookies": True,
+}
+
+
+def is_enabled(config: ServerConfig, flag_name: str) -> bool:
+    """Return whether *flag_name* is enabled, falling back to the registry default."""
+    return config.feature_flags.get(flag_name, FEATURE_FLAG_DEFAULTS.get(flag_name, True))
diff --git a/src/server/routes/settings.py b/src/server/routes/settings.py
index efed2a7..3e0a8a5 100644
--- a/src/server/routes/settings.py
+++ b/src/server/routes/settings.py
@@ -10,6 +10,7 @@
 from pydantic import create_model
 
 from server.config import ServerConfig, SETTINGS_API_FIELDS
+from server.feature_flags import is_enabled
 
 logger = logging.getLogger(__name__)
 
@@ -45,7 +46,7 @@ async def update_settings(update: SettingsUpdate, request: Request):
     cfg.save()
 
     # Live stop/start tabracadabra service when toggled
-    if "tabracadabra_enabled" in updated and sys.platform == "darwin":
+    if "tabracadabra_enabled" in updated and sys.platform == "darwin" and is_enabled(cfg, "tabracadabra"):
         if cfg.tabracadabra_enabled:
             # Start if not already running
             if state.tabracadabra_service is None:
diff --git a/tada-config.defaults.json b/tada-config.defaults.json
index bc1590d..57569fd 100644
--- a/tada-config.defaults.json
+++ b/tada-config.defaults.json
@@ -2,5 +2,21 @@
   "google_client_id": "892882352791-i0nh6262vjj6lvg26h94j2shfmodbkfu.apps.googleusercontent.com",
   "google_client_secret": "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",
   "supabase_url": "https://gicxeybsowfhdanooxdc.supabase.co",
-  "supabase_anon_key": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImdpY3hleWJzb3dmaGRhbm9veGRjIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NzMzNjU4ODEsImV4cCI6MjA4ODk0MTg4MX0.MW3S4rCAfQYiTuYvM1MJPL23mr191MPsZe8f6oFMM0I"
+  "supabase_anon_key": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImdpY3hleWJzb3dmaGRhbm9veGRjIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NzMzNjU4ODEsImV4cCI6MjA4ODk0MTg4MX0.MW3S4rCAfQYiTuYvM1MJPL23mr191MPsZe8f6oFMM0I",
+  "feature_flags": {
+    "moments": false,
+    "tabracadabra": true,
+    "connector_screen": true,
+    "connector_gmail": false,
+    "connector_calendar": false,
+    "connector_outlook_email": false,
+    "connector_outlook_calendar": false,
+    "connector_notifications": false,
+    "connector_filesystem": false,
+    "permission_screen": true,
+    "permission_notifications": false,
+    "permission_accessibility": false,
+    "permission_browser_cookies": false,
+    "tinker": false
+  }
 }