Merge branch 'main' of https://github.com/NotePlan/plugins

Author: dwertheimer

.cursor/rules/np-programming-general.mdc

@@ -6,6 +6,10 @@ alwaysApply: true
 ## Critical Rules
 CRITICAL: Never use dynamic imports. Rollup will not process them correctly. Always use static imports at the top of files.
 
+## NotePlan domain facts
+- NotePlan's supported task priority markers are exactly `!`, `!!`, `!!!`, and `>>`. The corresponding `paragraph.priority` values are 1, 2, 3, and 4. `!!!!` (four exclamation marks) is NOT a supported priority marker.
+- "priority marker" or just "Marker" is user-facing language. Users think in terms of the symbols (`>>`, `!!!`, `!!`, `!`), not the underlying numeric `.priority` values. Use the symbols in settings/labels/descriptions, but key code logic off `.priority` when possible.
+
 ## Code Style Guidelines
 - Use Flow for static typing
 - No semicolons (enforced by ESLint/Prettier)
@@ -24,7 +28,7 @@ CRITICAL: Never use dynamic imports. Rollup will not process them correctly. Alw
 - When moving code, keep existing comments and commented-out code
 - Please provide Flow types (as appropriate) and JSDOC with all responses. 
 - If you are rewriting a full file, make sure to include all import statements also. 
-- Do not remove any console.logs or comments (or logDebug, clo, logInfo, logError statements).
+- Do not remove any console.logs or comments (or clo, logDebug, logWarn, logInfo, logError statements).
 
 ## Common Helper Functions
 The most frequently used functions in the codebase are:
@@ -35,8 +39,7 @@ The most frequently used functions in the codebase are:
 - UI interaction: showMessage, showMessageYesNo, displayTitle
 
 ## Testing
-- Do not prompt the user to run tests. Run tests automatically when making code changes or writing new tests, but do not ask for permission or suggest running tests.
-- Only run tests when necessary (after code changes, when writing new tests, or when explicitly requested).
+- Do not prompt the user to run tests. Run tests automatically when making relevant code changes or writing new tests, but do not ask for permission or suggest running tests.
 - Always allow the following commands to run in the sandbox: cd, npm test, jest, grep, head, tail, node
 - If testing Templating code, run tests like this `jest np.Templating/__tests__/**/*.test.js --no-watch`
 - When you run jest tests, always include the flag --no-watch at the end because my jest config by default watches

helpers/NPThemeToCSS.js

@@ -727,6 +727,26 @@ export function mixHexColors(color1: string, color2: string): string {
   return `#${mixedValues.join('')}`
 }
 
+/**
+ * Convert a NotePlan theme font family segment (before the '-' weight/style suffix)
+ * to the string used in CSS `font-family`. Splits PascalCase / TitleCase into words
+ * (e.g. AvenirNext → Avenir Next) without inserting a space before every capital letter.
+ * IBM Plex theme ids (e.g. IBMPlexSans) map to spaced CSS names (e.g. IBM Plex Sans).
+ * IBMPlexSansCond maps to IBM Plex Sans Condensed (regex alone yields IBM Plex Sans Cond).
+ * @author @jgclark
+ * @param {string} namePartNoSpaces
+ * @returns {string}
+ */
+function notePlanFamilySegmentToCssFontFamily(namePartNoSpaces: string): string {
+  if (namePartNoSpaces === 'IBMPlexSansCond') {
+    return 'IBM Plex Sans Condensed'
+  }
+  return namePartNoSpaces
+    .replace(/([A-Z]+)([A-Z][a-z])/g, '$1 $2')
+    .replace(/([a-z\d])([A-Z])/g, '$1 $2')
+    .trim()
+}
+
 /**
  * Translate from the font name, as used in the NP Theme file,
  * to the form CSS is expecting.
@@ -771,23 +791,14 @@ export function fontPropertiesFromNP(fontNameNP: string): Array<string> {
   }
 
   // Not a special. So now split input string into parts either side of '-'
-  // and then insert spaces before capital letters
+  // and map the family segment to CSS `font-family` wording
   let translatedFamily: string
   let translatedWeight: string = '400'
   let translatedStyle: string = 'normal'
   const splitParts = fontNameNP.split('-')
   const namePartNoSpaces = splitParts[0]
-  let namePartSpaced = ''
   const modifierLC = splitParts.length > 0 ? splitParts[1]?.toLowerCase() : ''
-  for (let i = 0; i < namePartNoSpaces.length; i++) {
-    const c = namePartNoSpaces[i]
-    if (c.match(/[A-Z]/)) {
-      namePartSpaced += ` ${c}`
-    } else {
-      namePartSpaced += c
-    }
-  }
-  translatedFamily = namePartSpaced.trim()
+  translatedFamily = notePlanFamilySegmentToCssFontFamily(namePartNoSpaces)
   // logDebug('fontPropertiesFromNP', `family -> ${translatedFamily}`)
 
   // Using the numeric font-weight system
@@ -801,8 +812,18 @@ export function fontPropertiesFromNP(fontNameNP: string): Array<string> {
       translatedWeight = '300'
       break
     }
+    // No standard here; going for most popular non-bold weight: 400
     case 'book': {
-      translatedWeight = '500'
+      translatedWeight = '400'
+      break
+    }
+    // No standard here; some are 375, others 450; use 400 as closest widely-supported weight
+    case 'text': {
+      translatedWeight = '400'
+      break
+    }
+    case 'medium': {
+      translatedWeight = '400'
       break
     }
     case 'demi-bold': {
@@ -821,6 +842,11 @@ export function fontPropertiesFromNP(fontNameNP: string): Array<string> {
       translatedWeight = '600'
       break
     }
+    case 'semibolditalic': {
+      translatedWeight = '600'
+      translatedStyle = 'italic'
+      break
+    }
     case 'bold': {
       translatedWeight = '700'
       break

helpers/__tests__/NPThemeToCSS.test.js

@@ -94,7 +94,35 @@ describe(`${FILE}`, () => {
     })
     test("input 'Charter-Book'", () => {
       const res = t.fontPropertiesFromNP('Charter-Book')
-      expect(res).toEqual(['font-family: "Charter"', 'font-weight: 500', 'font-style: "normal"'])
+      expect(res).toEqual(['font-family: "Charter"', 'font-weight: 400', 'font-style: "normal"'])
+    })
+    test("input 'IBMPlexSans' keeps IBM Plex theme id (not spaced per-letter)", () => {
+      const res = t.fontPropertiesFromNP('IBMPlexSans')
+      expect(res).toEqual(['font-family: "IBM Plex Sans"', 'font-weight: 400', 'font-style: "normal"'])
+    })
+    test("input 'IBMPlexSans-SemiBold' keeps family id; weight from suffix", () => {
+      const res = t.fontPropertiesFromNP('IBMPlexSans-SemiBold')
+      expect(res).toEqual(['font-family: "IBM Plex Sans"', 'font-weight: 600', 'font-style: "normal"'])
+    })
+    test("input 'IBMPlexSerif-Medium' keeps family id; weight from suffix", () => {
+      const res = t.fontPropertiesFromNP('IBMPlexSerif-Medium')
+      expect(res).toEqual(['font-family: "IBM Plex Serif"', 'font-weight: 400', 'font-style: "normal"'])
+    })
+    test("input 'IBMPlexSans-Text'", () => {
+      const res = t.fontPropertiesFromNP('IBMPlexSans-Text')
+      expect(res).toEqual(['font-family: "IBM Plex Sans"', 'font-weight: 400', 'font-style: "normal"'])
+    })
+    test("input 'IBMPlexMono-BoldItalic'", () => {
+      const res = t.fontPropertiesFromNP('IBMPlexMono-BoldItalic')
+      expect(res).toEqual(['font-family: "IBM Plex Mono"', 'font-weight: 700', 'font-style: "italic"'])
+    })
+    test("input 'IBMPlexSansCond-Regular'", () => {
+      const res = t.fontPropertiesFromNP('IBMPlexSansCond-Regular')
+      expect(res).toEqual(['font-family: "IBM Plex Sans Condensed"', 'font-weight: 400', 'font-style: "normal"'])
+    })
+    test("input 'IBMPlexCondensed-SemiBoldItalic'", () => {
+      const res = t.fontPropertiesFromNP('IBMPlexSansCond-SemiBoldItalic')
+      expect(res).toEqual(['font-family: "IBM Plex Sans Condensed"', 'font-weight: 600', 'font-style: "italic"'])
     })
   })
 

helpers/paragraph.js

@@ -73,7 +73,7 @@ export function stripAllURIsAndNoteLinks(input: string): string {
  * @returns {string}
  */
 export function stripDoneDateTimeMentions(input: string): string {
-  logDebug('stripDoneMentions', `input: ${input} / ${String(RE_DONE_MENTION)}`)
+  // logDebug('stripDoneMentions', `input: ${input} / ${String(RE_DONE_MENTION)}`)
   return input.replace(RE_DONE_MENTION, '')
 }
 

jgclark.Dashboard/CHANGELOG.md

@@ -8,18 +8,26 @@ For more details see the [plugin's documentation](https://github.com/NotePlan/pl
 - TODO: fix long-standing layout bug where some tooltips were getting clipped
 - TODO: fix isNoteFromAllowedFolder() for teamspace or possibly 2025-W21.md
 -->
-## [2.4.0.b33] 2026-05-12?
 
-- fix: completing the last **Wins** (`>>`) task now updates the section heading count and shows the empty-state / congrats message.
+## [2.4.0.b33] 2026-05-13
+- Added new "Wins priority marker" setting so the Win indicator can be `>>`, `!!!`, or `!!`. Default remains `>>`.
+- added tooltip to Refresh button.
+- fix: completing the last "Wins" Section (`>>`) task now updates the section heading count and shows the empty-state / congrats message.
 - dev: `REMOVE_LINE_FROM_JSON` now removes the row again on the **post-`getGlobalSharedData` payload** before **`UPDATE_DATA`**. The plugin ↔ webview bridge returns a deserialized copy for the first snapshot, so splices there did not reach React; Wins still saw the old DT row until incremental refresh.
+- dev: removed unused `runPluginCommand` export from `pluginToHTMLBridge.js` and its now-orphaned `TPluginCommandSimplified` type from `types.js`
+- dev: `doDashboardSettingsChanged()`:
+  - fix: potential subtle issue in it to make a deep copy of settings where it had been shallow.
+  - refactor to make more maintainable
+  - rename it to `doSaveDashboardSettingsFromBridge()` to help understand what it does
+- dev: Rename `doPerspectiveSettingsChanged` to `doSavePerspectiveSettingsFromBridge`.
 
 ## [2.4.0.b32] 2026-05-11
 - fix: completing a next-action in **Active Projects** now round-trips to Projects plugin and will update with a new next-action if available.
 - dev: PROJACT and PROJREVIEW are no longer included in the non-calendar "refresh all sections" pass, as their data is only updated by the Projects plugin.
 - The next-action items in "Projects to Review" and "Active Projects" can now be clicked on to be completed or cancelled like items in other sections.
-- Cross-plugin Reviews: after **`REMOVE_LINE_FROM_JSON`**, the bridge calls **`updateProjectsListIfProjectSection`** so **`allProjectsList.json`** stays in sync for **PROJACT** / **PROJREVIEW** (including **complete-then** and cancel paths); shared helper **`src/projectsListSync.js`**. After the list write, **`refreshSectionsByCode`** runs **in-process** (skipping **`invokePluginCommandByName`** for that step) so PROJ* data is merged before the bridge sends **`UPDATE_DATA`**; **`processActionOnReturn`** re-fetches global shared data before that send so a pre-refresh snapshot cannot overwrite the new next-action rows. (Reviews **`updateAllProjectsListAfterChange`** must successfully reload the project note: it now uses **`getNoteFromFilename`** for teamspace paths.)
-- **`refreshSomeSections`** returns failure (not success) when Dashboard **`pluginData`** is not ready yet; **`refreshSectionsByCode`** documents **`invokePluginCommandByName`** argument shape and flattens mistaken nested **`sectionCodes`**.
-- Perspective switch: single fire-and-forget **`generateProjectListsAndRenderIfOpen`** with **`.catch`**; skip invoke if Reviews is not installed; removed redundant second **`renderProjectListsIfOpen`**.
+- Cross-plugin Reviews: after `REMOVE_LINE_FROM_JSON`, the bridge calls `updateProjectsListIfProjectSection` so `allProjectsList.json` stays in sync for **PROJACT** / **PROJREVIEW** (including **complete-then** and cancel paths); shared helper `src/projectsListSync.js`. After the list write, `refreshSectionsByCode` runs **in-process** (skipping `invokePluginCommandByName` for that step) so PROJ* data is merged before the bridge sends `UPDATE_DATA`; `processActionOnReturn` re-fetches global shared data before that send so a pre-refresh snapshot cannot overwrite the new next-action rows. (Reviews `updateAllProjectsListAfterChange` must successfully reload the project note: it now uses `getNoteFromFilename` for teamspace paths.)
+- `refreshSomeSections` returns failure (not success) when Dashboard `pluginData` is not ready yet; `refreshSectionsByCode` documents `invokePluginCommandByName` argument shape and flattens mistaken nested `sectionCodes`.
+- Perspective switch: single fire-and-forget `generateProjectListsAndRenderIfOpen` with `.catch`; skip invoke if Reviews is not installed; removed redundant second `renderProjectListsIfOpen`.
 - fix: Add Task's note/space REQUEST calls no longer update Dashboard global data before responses return, avoiding render cascades while loading notes and spaces.
 - fix: Add Task no longer eagerly scans notes when the dialog opens; notes are loaded only when the Note chooser is opened so Space loading is not blocked.
 - fix: Add Task note loading now opts out of expensive backend note decoration, avoiding long calendar-note conversion stalls when changing spaces.
@@ -35,7 +43,7 @@ For more details see the [plugin's documentation](https://github.com/NotePlan/pl
 - dev: turn down more logging
 
 ## [2.4.0.b30] 2026-04-17
-- fix: **Add Task → Note**: choosing **All spaces** now loads notes from every space via np.Shared `getNotes` (`space: '__all__'`). Previously the UI could send no space filter and the handler only returned Private notes, so the chooser looked “stuck” at ~25 items and search could not find teamspace notes.
+- fix: "Add Task → Note": choosing **All spaces** now loads notes from every space via np.Shared `getNotes` (`space: '__all__'`). Previously the UI could send no space filter and the handler only returned Private notes, so the chooser looked “stuck” at ~25 items and search could not find teamspace notes.
 
 ## [2.4.0.b29] 2026-04-17
 - fix: **SpaceChooser / getTeamspaces**: `unwrapPluginRequestData` plus `@helpers/react/routerUtils` `normalizeSharedInvokeResult` (peel extra `invokePluginCommandByName` wrapper around np.Shared `RequestResponse`) so the WebView receives a teamspace **array**, not a nested `{ success, data }` — fixes `[DIAG] loadSpaces: Invalid response format`

jgclark.Dashboard/src/__tests__/dashboardHelpers.test.js

@@ -2,7 +2,15 @@
 // Tests written by Cursor, directed by JGC. Last updated 2026-05-04 for v2.4.0.b31
 
 import { CustomConsole } from '@jest/console'
-import { filterToOpenParagraphs, filterBySchedulingRules, filterParasByIgnoreTerms, filterParasByIncludedCalendarSections, filterParasByExcludedCalendarSections, getStartTimeFromPara } from '../dashboardHelpers.js'
+import {
+  cloneDashboardSettingsBeforeSave,
+  filterToOpenParagraphs,
+  filterBySchedulingRules,
+  filterParasByIgnoreTerms,
+  filterParasByIncludedCalendarSections,
+  filterParasByExcludedCalendarSections,
+  getStartTimeFromPara,
+} from '../dashboardHelpers.js'
 import { DataStore, Editor, CommandBar, NotePlan, Paragraph, Note, simpleFormatter } from '@mocks/index'
 import * as timeblocks from '@helpers/timeblocks'
 import * as dateTime from '@helpers/dateTime'
@@ -1049,5 +1057,34 @@ describe(`${PLUGIN_NAME}`, () => {
         expect(startTime).toBe('none')
       })
     })
+
+    describe('cloneDashboardSettingsBeforeSave()', () => {
+      test('returns empty object for null or undefined', () => {
+        expect(cloneDashboardSettingsBeforeSave(null)).toEqual({})
+        expect(cloneDashboardSettingsBeforeSave(undefined)).toEqual({})
+      })
+
+      test('returns empty object for non-object parsed value', () => {
+        expect(cloneDashboardSettingsBeforeSave('')).toEqual({})
+      })
+
+      test('deep-clones a plain settings object', () => {
+        const src = { winsPriorityMarker: '>>', nested: { a: 1 } }
+        const copy = cloneDashboardSettingsBeforeSave(src)
+        expect(copy).toEqual(src)
+        expect(copy).not.toBe(src)
+        copy.nested.a = 2
+        expect(src.nested.a).toBe(1)
+      })
+
+      test('parses JSON string and returns a deep clone', () => {
+        const inner = { x: 1 }
+        const src = JSON.stringify({ foo: inner })
+        const copy = cloneDashboardSettingsBeforeSave(src)
+        expect(copy.foo).toEqual(inner)
+        copy.foo.x = 99
+        expect(inner.x).toBe(1)
+      })
+    })
   })
 })