DiscourseGraphs
diff --git a/‎apps/roam/src/components/DiscourseContextOverlay.tsx‎
Lines changed: 13 additions & 22 deletions b/‎apps/roam/src/components/DiscourseContextOverlay.tsx‎
Lines changed: 13 additions & 22 deletions
diff --git a/‎apps/roam/src/components/DiscourseFloatingMenu.tsx‎
Lines changed: 9 additions & 9 deletions b/‎apps/roam/src/components/DiscourseFloatingMenu.tsx‎
Lines changed: 9 additions & 9 deletions
diff --git a/‎apps/roam/src/components/DiscourseNodeMenu.tsx‎
Lines changed: 8 additions & 7 deletions b/‎apps/roam/src/components/DiscourseNodeMenu.tsx‎
Lines changed: 8 additions & 7 deletions
diff --git a/‎apps/roam/src/components/DiscourseNodeSearchMenu.tsx‎
Lines changed: 5 additions & 3 deletions b/‎apps/roam/src/components/DiscourseNodeSearchMenu.tsx‎
Lines changed: 5 additions & 3 deletions
@@ -12,12 +12,10 @@ import renderWithUnmount from "roamjs-components/util/renderWithUnmount";
 import { ContextContent } from "./DiscourseContext";
 import useInViewport from "react-in-viewport/dist/es/lib/useInViewport";
 import normalizePageTitle from "roamjs-components/queries/normalizePageTitle";
-import { USE_STORED_RELATIONS } from "~/data/userSettings";
-import { getSetting } from "~/utils/extensionSettings";
 import deriveDiscourseNodeAttribute from "~/utils/deriveDiscourseNodeAttribute";
-import getSettingValueFromTree from "roamjs-components/util/getSettingValueFromTree";
-import getBasicTreeByParentUid from "roamjs-components/queries/getBasicTreeByParentUid";
-import getSubTree from "roamjs-components/util/getSubTree";
+import { getDiscourseNodeSetting } from "~/components/settings/utils/accessors";
+import { DISCOURSE_NODE_KEYS } from "~/components/settings/utils/settingKeys";
+import { getStoredRelationsEnabled } from "~/utils/storedRelations";
 import nanoid from "nanoid";
 import getPageUidByPageTitle from "roamjs-components/queries/getPageUidByPageTitle";
 import getDiscourseContextResults from "~/utils/getDiscourseContextResults";
@@ -191,11 +189,10 @@ const useDiscourseContext = (uid: string, tag: string) => {
                   ).length,
               )
               .reduce((acc, cur) => acc + cur, 0);
-            const attribute = getSettingValueFromTree({
-              tree: getBasicTreeByParentUid(discourseNode.type),
-              key: "Overlay",
-              defaultValue: "Overlay",
-            });
+            const attribute =
+              getDiscourseNodeSetting<string>(discourseNode.type, [
+                DISCOURSE_NODE_KEYS.overlay,
+              ]) || "Overlay";
             return deriveDiscourseNodeAttribute({
               uid: uid,
               attribute,
@@ -204,17 +201,11 @@ const useDiscourseContext = (uid: string, tag: string) => {
               setRefs(refs);
               setScore(score);
 
-              const nodeType = discourseNode.type;
-              const attributeNode = getSubTree({
-                tree: getBasicTreeByParentUid(nodeType || ""),
-                key: "Attributes",
-              });
-              const scoreFormula = attributeNode?.children
-                ? getSettingValueFromTree({
-                    tree: attributeNode.children,
-                    key: attribute,
-                  })
-                : "";
+              const scoreFormula =
+                getDiscourseNodeSetting<string>(discourseNode.type, [
+                  DISCOURSE_NODE_KEYS.attributes,
+                  attribute,
+                ]) ?? "";
               if (scoreFormula === "" && score !== numResults) {
                 internalError({
                   error: "DiscourseContext: Score does not match Num relations",
@@ -223,7 +214,7 @@ const useDiscourseContext = (uid: string, tag: string) => {
                     score,
                     numResults,
                     ignoreCache,
-                    reified: getSetting<boolean>(USE_STORED_RELATIONS),
+                    reified: getStoredRelationsEnabled(),
                   },
                 });
               }
 
@@ -13,6 +13,8 @@ import {
 import { FeedbackWidget } from "./BirdEatsBugs";
 import { render as renderSettings } from "~/components/settings/Settings";
 import posthog from "posthog-js";
+import { type SettingsSnapshot } from "./settings/utils/accessors";
+import { PERSONAL_KEYS } from "./settings/utils/settingKeys";
 
 type DiscourseFloatingMenuProps = {
   // CSS placement class
@@ -116,26 +118,23 @@ export const showDiscourseFloatingMenu = () => {
 
 export const installDiscourseFloatingMenu = (
   onLoadArgs: OnloadArgs,
-  props: DiscourseFloatingMenuProps = {
-    position: "bottom-right",
-    theme: "bp3-light",
-    buttonTheme: "bp3-light",
-  },
+  snapshot: SettingsSnapshot,
 ) => {
   let floatingMenuAnchor = document.getElementById(ANCHOR_ID);
   if (!floatingMenuAnchor) {
     floatingMenuAnchor = document.createElement("div");
     floatingMenuAnchor.id = ANCHOR_ID;
     document.getElementById("app")?.appendChild(floatingMenuAnchor);
   }
-  if (onLoadArgs.extensionAPI.settings.get("hide-feedback-button") as boolean) {
+  if (snapshot.personalSettings[PERSONAL_KEYS.hideFeedbackButton]) {
     floatingMenuAnchor.classList.add("hidden");
   }
+  // eslint-disable-next-line react/no-deprecated
   ReactDOM.render(
     <DiscourseFloatingMenu
-      position={props.position}
-      theme={props.theme}
-      buttonTheme={props.buttonTheme}
+      position="bottom-right"
+      theme="bp3-light"
+      buttonTheme="bp3-light"
       onloadArgs={onLoadArgs}
     />,
     floatingMenuAnchor,
@@ -146,6 +145,7 @@ export const removeDiscourseFloatingMenu = () => {
   const anchor = document.getElementById(ANCHOR_ID);
   if (anchor) {
     try {
+      // eslint-disable-next-line react/no-deprecated
       ReactDOM.unmountComponentAtNode(anchor);
     } catch (e) {
       // no-op: unmount best-effort
 
@@ -28,6 +28,8 @@ import { OnloadArgs } from "roamjs-components/types";
 import { formatHexColor } from "./settings/DiscourseNodeCanvasSettings";
 import posthog from "posthog-js";
 import { setPersonalSetting } from "~/components/settings/utils/accessors";
+import { PERSONAL_KEYS } from "~/components/settings/utils/settingKeys";
+import type { PersonalSettings } from "~/components/settings/utils/zodSchema";
 
 type Props = {
   textarea?: HTMLTextAreaElement;
@@ -455,16 +457,15 @@ export const comboToString = (combo: IKeyCombo): string => {
 
 export const NodeMenuTriggerComponent = ({
   extensionAPI,
+  initialValue,
 }: {
   extensionAPI: OnloadArgs["extensionAPI"];
+  initialValue: PersonalSettings["Personal node menu trigger"];
 }) => {
   const inputRef = useRef<HTMLInputElement>(null);
   const [isActive, setIsActive] = useState(false);
-  const [comboKey, setComboKey] = useState<IKeyCombo>(
-    () =>
-      (extensionAPI.settings.get(
-        "personal-node-menu-trigger",
-      ) as IKeyCombo) || { modifiers: 0, key: "" },
+  const [comboKey, setComboKey] = useState<IKeyCombo>(() =>
+    typeof initialValue === "object" ? initialValue : { modifiers: 0, key: "" },
   );
 
   const handleKeyDown = useCallback(
@@ -477,7 +478,7 @@ export const NodeMenuTriggerComponent = ({
       const combo = { key: comboObj.key, modifiers: comboObj.modifiers };
       setComboKey(combo);
       void extensionAPI.settings.set("personal-node-menu-trigger", combo);
-      setPersonalSetting(["Personal node menu trigger"], combo);
+      setPersonalSetting([PERSONAL_KEYS.personalNodeMenuTrigger], combo);
     },
     [extensionAPI],
   );
@@ -499,7 +500,7 @@ export const NodeMenuTriggerComponent = ({
           onClick={() => {
             setComboKey({ modifiers: 0, key: "" });
             void extensionAPI.settings.set("personal-node-menu-trigger", "");
-            setPersonalSetting(["Personal node menu trigger"], "");
+            setPersonalSetting([PERSONAL_KEYS.personalNodeMenuTrigger], "");
           }}
           minimal
         />
 
@@ -24,9 +24,9 @@ import { OnloadArgs } from "roamjs-components/types";
 import getDiscourseNodes, { DiscourseNode } from "~/utils/getDiscourseNodes";
 import getDiscourseNodeFormatExpression from "~/utils/getDiscourseNodeFormatExpression";
 import { Result } from "~/utils/types";
-import { getSetting } from "~/utils/extensionSettings";
 import MiniSearch from "minisearch";
 import { setPersonalSetting } from "~/components/settings/utils/accessors";
+import { PERSONAL_KEYS } from "~/components/settings/utils/settingKeys";
 
 type Props = {
   textarea: HTMLTextAreaElement;
@@ -706,12 +706,14 @@ export const renderDiscourseNodeSearchMenu = (props: Props) => {
 
 export const NodeSearchMenuTriggerSetting = ({
   onloadArgs,
+  initialValue,
 }: {
   onloadArgs: OnloadArgs;
+  initialValue: string;
 }) => {
   const extensionAPI = onloadArgs.extensionAPI;
   const [nodeSearchTrigger, setNodeSearchTrigger] = useState<string>(
-    getSetting("node-search-trigger", "@"),
+    () => initialValue,
   );
 
   const handleNodeSearchTriggerChange = (
@@ -726,7 +728,7 @@ export const NodeSearchMenuTriggerSetting = ({
 
     setNodeSearchTrigger(trigger);
     void extensionAPI.settings.set("node-search-trigger", trigger);
-    setPersonalSetting(["Node search menu trigger"], trigger);
+    setPersonalSetting([PERSONAL_KEYS.nodeSearchMenuTrigger], trigger);
   };
   return (
     <InputGroup