From 5d383e31689937796e3ee9a846fb5973c7b72d60 Mon Sep 17 00:00:00 2001
From: Siddharth Yadav <sid597athens@gmail.com>
Date: Wed, 25 Feb 2026 13:07:26 +0530
Subject: [PATCH] ENG-1465: Add "Use new settings store" feature flag  (#811)

* ENG-1454: Enable dual read feature flag

* add caller

* resolve merge conflicts

* review

* example fix

* review
---
 apps/roam/src/components/settings/AdminPanel.tsx         | 9 +++++++++
 apps/roam/src/components/settings/utils/accessors.ts     | 4 ++++
 .../src/components/settings/utils/zodSchema.example.ts   | 2 ++
 apps/roam/src/components/settings/utils/zodSchema.ts     | 1 +
 apps/roam/src/index.ts                                   | 2 +-
 5 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/apps/roam/src/components/settings/AdminPanel.tsx b/apps/roam/src/components/settings/AdminPanel.tsx
index 85ba13269..e9ad85d87 100644
--- a/apps/roam/src/components/settings/AdminPanel.tsx
+++ b/apps/roam/src/components/settings/AdminPanel.tsx
@@ -39,6 +39,8 @@ import deleteBlock from "roamjs-components/writes/deleteBlock";
 import { USE_REIFIED_RELATIONS } from "~/data/userSettings";
 import posthog from "posthog-js";
 import { setFeatureFlag } from "~/components/settings/utils/accessors";
+import { FeatureFlagPanel } from "./components/BlockPropSettingPanels";
+import { getFeatureFlag } from "./utils/accessors";
 
 const NodeRow = ({ node }: { node: PConceptFull }) => {
   return (
@@ -467,6 +469,13 @@ const FeatureFlagsTab = (): React.ReactElement => {
         }
       />
 
+      <FeatureFlagPanel
+        title="Use new settings store"
+        description="When enabled, accessor getters read from block props instead of the old system. Surfaces dual-write gaps during development."
+        featureKey="Use new settings store"
+        initialValue={getFeatureFlag("Use new settings store")}
+      />
+
       <Button
         className="w-96"
         icon="send-message"
diff --git a/apps/roam/src/components/settings/utils/accessors.ts b/apps/roam/src/components/settings/utils/accessors.ts
index 9d8959404..cc5a0844f 100644
--- a/apps/roam/src/components/settings/utils/accessors.ts
+++ b/apps/roam/src/components/settings/utils/accessors.ts
@@ -285,6 +285,10 @@ export const getFeatureFlag = (key: keyof FeatureFlags): boolean => {
   return flags[key];
 };
 
+export const isNewSettingsStoreEnabled = (): boolean => {
+  return getFeatureFlag("Use new settings store");
+};
+
 export const setFeatureFlag = (
   key: keyof FeatureFlags,
   value: boolean,
diff --git a/apps/roam/src/components/settings/utils/zodSchema.example.ts b/apps/roam/src/components/settings/utils/zodSchema.example.ts
index f413d26e2..2e6bfa960 100644
--- a/apps/roam/src/components/settings/utils/zodSchema.example.ts
+++ b/apps/roam/src/components/settings/utils/zodSchema.example.ts
@@ -90,12 +90,14 @@ const featureFlags: FeatureFlags = {
   "Enable left sidebar": true,
   "Suggestive mode enabled": true,
   "Reified relation triples": false,
+  "Use new settings store": false,
 };
 
 const defaultFeatureFlags: FeatureFlags = {
   "Enable left sidebar": false,
   "Suggestive mode enabled": false,
   "Reified relation triples": false,
+  "Use new settings store": false,
 };
 
 const exportSettings: ExportSettings = {
diff --git a/apps/roam/src/components/settings/utils/zodSchema.ts b/apps/roam/src/components/settings/utils/zodSchema.ts
index 378020d42..8c8486ed7 100644
--- a/apps/roam/src/components/settings/utils/zodSchema.ts
+++ b/apps/roam/src/components/settings/utils/zodSchema.ts
@@ -157,6 +157,7 @@ export const FeatureFlagsSchema = z.object({
   "Enable left sidebar": z.boolean().default(false),
   "Suggestive mode enabled": z.boolean().default(false),
   "Reified relation triples": z.boolean().default(false),
+  "Use new settings store": z.boolean().default(false),
 });
 
 export const ExportSettingsSchema = z.object({
diff --git a/apps/roam/src/index.ts b/apps/roam/src/index.ts
index acc26eb1d..0579784c3 100644
--- a/apps/roam/src/index.ts
+++ b/apps/roam/src/index.ts
@@ -42,7 +42,6 @@ import {
   DISALLOW_DIAGNOSTICS,
 } from "./data/userSettings";
 import { initSchema } from "./components/settings/utils/init";
-
 export const DEFAULT_CANVAS_PAGE_FORMAT = "Canvas/*";
 
 export default runExtension(async (onloadArgs) => {
@@ -156,6 +155,7 @@ export default runExtension(async (onloadArgs) => {
   }
 
   await initSchema();
+
   return {
     elements: [
       style,