@adea-ai/themes 0.6.3 → 0.7.1

package/palettes/adea-light.json

@@ -1,17 +1,17 @@
 {
   "system": "base24",
   "name": "Adea Light",
-  "author": "Adea, composed from Nord Light and GitHub Dark Default",
+  "author": "Adea, composed from GitHub Light Default and GitHub Dark Default",
   "variant": "light",
   "palette": {
-    "base00": "#e5e9f0",
-    "base01": "#3b4252",
-    "base02": "#d8dee9",
-    "base03": "#4c566a",
-    "base04": "#a5abb6",
-    "base05": "#414858",
-    "base06": "#eceff4",
-    "base07": "#eceff4",
+    "base00": "#ffffff",
+    "base01": "#24292f",
+    "base02": "#1f2328",
+    "base03": "#57606a",
+    "base04": "#6e7781",
+    "base05": "#1f2328",
+    "base06": "#8c959f",
+    "base07": "#8c959f",
     "base08": "#ff7b72",
     "base0A": "#d29922",
     "base0B": "#3fb950",
@@ -26,23 +26,23 @@
     "base17": "#d2a8ff",
     "base09": "oklch(0.7345 0.1626 51.78)",
     "base0F": "oklch(0.7196 0.1401 45.91)",
-    "base10": "oklch(0.963 0.0031 261.79)",
-    "base11": "oklch(0.993 0.0018 261.79)"
+    "base10": "oklch(1 0 0)",
+    "base11": "oklch(1 0 0)"
   },
   "ansi": {
-    "black": "#3b4252",
-    "brightBlack": "#4c566a",
-    "white": "#a5abb6",
-    "brightWhite": "#eceff4"
+    "black": "#24292f",
+    "brightBlack": "#57606a",
+    "white": "#6e7781",
+    "brightWhite": "#8c959f"
   },
-  "cursor": "#7bb3c3",
-  "selection": "#d8dee9",
+  "cursor": "#0969da",
+  "selection": "#1f2328",
   "source": {
     "composedFrom": [
       {
         "role": "structure",
-        "slug": "nord-light",
-        "name": "Nord Light"
+        "slug": "github-light-default",
+        "name": "GitHub Light Default"
       },
       {
         "role": "hues",

package/palettes/github-dark-high-contrast.json

@@ -0,0 +1,38 @@
+{
+  "system": "base24",
+  "name": "GitHub Dark High Contrast",
+  "author": "iTerm2-Color-Schemes (via oklch-terminal-themes)",
+  "variant": "dark",
+  "palette": {
+    "base00": "#0a0c10",
+    "base01": "#727478",
+    "base02": "#f0f3f6",
+    "base03": "#9ea7b3",
+    "base04": "#c6ccd4",
+    "base05": "#f0f3f6",
+    "base06": "#f7f9fb",
+    "base07": "#ffffff",
+    "base08": "#ff9492",
+    "base09": "#ffa266",
+    "base0A": "#f0b72f",
+    "base0B": "#26cd4d",
+    "base0C": "#39c5cf",
+    "base0D": "#71b7ff",
+    "base0E": "#cb9eff",
+    "base0F": "#9a6b4e",
+    "base10": "#030406",
+    "base11": "#000101",
+    "base12": "#ffb1af",
+    "base13": "#f7c843",
+    "base14": "#4ae168",
+    "base15": "#56d4dd",
+    "base16": "#91cbff",
+    "base17": "#dbb7ff"
+  },
+  "source": {
+    "slug": "github-dark-high-contrast",
+    "repository": "https://github.com/williamzujkowski/oklch-terminal-themes",
+    "revision": "9e800e7fe760081d4c10317498038ed4227341d6",
+    "path": "data/schemes/base24/github-dark-high-contrast.yaml"
+  }
+}

package/palettes/github-light-default.json

@@ -0,0 +1,38 @@
+{
+  "system": "base24",
+  "name": "GitHub Light Default",
+  "author": "iTerm2-Color-Schemes (via oklch-terminal-themes)",
+  "variant": "light",
+  "palette": {
+    "base00": "#ffffff",
+    "base01": "#86888c",
+    "base02": "#1f2328",
+    "base03": "#57606a",
+    "base04": "#3a4048",
+    "base05": "#1f2328",
+    "base06": "#525960",
+    "base07": "#8c959f",
+    "base08": "#cf222e",
+    "base09": "#873700",
+    "base0A": "#4d2d00",
+    "base0B": "#116329",
+    "base0C": "#1b7c83",
+    "base0D": "#0969da",
+    "base0E": "#8250df",
+    "base0F": "#ae7f68",
+    "base10": "#ffffff",
+    "base11": "#ffffff",
+    "base12": "#a40e26",
+    "base13": "#633c01",
+    "base14": "#1a7f37",
+    "base15": "#3192aa",
+    "base16": "#218bff",
+    "base17": "#a475f9"
+  },
+  "source": {
+    "slug": "github-light-default",
+    "repository": "https://github.com/williamzujkowski/oklch-terminal-themes",
+    "revision": "9e800e7fe760081d4c10317498038ed4227341d6",
+    "path": "data/schemes/base24/github-light-default.yaml"
+  }
+}

package/palettes/github-light-high-contrast.json

@@ -0,0 +1,38 @@
+{
+  "system": "base24",
+  "name": "GitHub Light High Contrast",
+  "author": "iTerm2-Color-Schemes (via oklch-terminal-themes)",
+  "variant": "light",
+  "palette": {
+    "base00": "#ffffff",
+    "base01": "#7b7d80",
+    "base02": "#0e1116",
+    "base03": "#4b535d",
+    "base04": "#2a3038",
+    "base05": "#0e1116",
+    "base06": "#464d55",
+    "base07": "#88929d",
+    "base08": "#a0111f",
+    "base09": "#6a2700",
+    "base0A": "#3f2200",
+    "base0B": "#024c1a",
+    "base0C": "#1b7c83",
+    "base0D": "#0349b4",
+    "base0E": "#622cbc",
+    "base0F": "#9b7261",
+    "base10": "#ffffff",
+    "base11": "#ffffff",
+    "base12": "#86061d",
+    "base13": "#4e2c00",
+    "base14": "#055d20",
+    "base15": "#3192aa",
+    "base16": "#1168e3",
+    "base17": "#844ae7"
+  },
+  "source": {
+    "slug": "github-light-high-contrast",
+    "repository": "https://github.com/williamzujkowski/oklch-terminal-themes",
+    "revision": "9e800e7fe760081d4c10317498038ed4227341d6",
+    "path": "data/schemes/base24/github-light-high-contrast.yaml"
+  }
+}

package/palettes/nord-light.json

@@ -0,0 +1,38 @@
+{
+  "system": "base24",
+  "name": "Nord Light",
+  "author": "iTerm2-Color-Schemes (via oklch-terminal-themes)",
+  "variant": "light",
+  "palette": {
+    "base00": "#e5e9f0",
+    "base01": "#dfe3ed",
+    "base02": "#d8dee9",
+    "base03": "#4c566a",
+    "base04": "#464f61",
+    "base05": "#414858",
+    "base06": "#9297a3",
+    "base07": "#eceff4",
+    "base08": "#bf616a",
+    "base09": "#ca8159",
+    "base0A": "#c5a565",
+    "base0B": "#96b17f",
+    "base0C": "#7bb3c3",
+    "base0D": "#81a1c1",
+    "base0E": "#b48ead",
+    "base0F": "#d1a892",
+    "base10": "#f0f4fb",
+    "base11": "#fdfeff",
+    "base12": "#bf616a",
+    "base13": "#c5a565",
+    "base14": "#96b17f",
+    "base15": "#82afae",
+    "base16": "#81a1c1",
+    "base17": "#b48ead"
+  },
+  "source": {
+    "slug": "nord-light",
+    "repository": "https://github.com/williamzujkowski/oklch-terminal-themes",
+    "revision": "9e800e7fe760081d4c10317498038ed4227341d6",
+    "path": "data/schemes/base24/nord-light.yaml"
+  }
+}

package/src/derive.ts

@@ -76,6 +76,26 @@ const EDITOR_ROLES = [
   'searchMatch',
 ] as const satisfies readonly EditorRole[]
 
+/**
+ * Light themes read the two default-ink roles from the dark end of the palette
+ * instead.
+ *
+ * `variable` and `operator` mean "the ink most of the code is drawn in", and ANSI
+ * `white` is that slot *on a dark terminal* — a light grey against a dark canvas.
+ * On a light theme the same slot is the terminal's brightest colour, at or near
+ * the paper itself, so the mapping hands the editor a foreground it cannot draw
+ * with: `editorRolesHex`'s bounded repair could not reach 4.5:1 from a chroma-less
+ * near-white within its lightness budget, and every community light theme threw.
+ * ANSI `black` is the same "default ink" slot from the paper's side of the
+ * palette — dark by construction, and it keeps each palette's own tint
+ * (Solarized Light's variables stay dark teal, not a repaired grey).
+ */
+const LIGHT_SYNTAX_SOURCE: Readonly<Partial<Record<SyntaxRole, keyof AdeaTheme['ansi']>>> =
+  Object.freeze({
+    variable: 'black',
+    operator: 'black',
+  })
+
 /** Which ANSI role each syntax role is read from, and why. */
 const SYNTAX_SOURCE: Readonly<Record<SyntaxRole, keyof AdeaTheme['ansi']>> = Object.freeze({
   // Magenta is the slot palettes spend on the most distinctive hue they have, and
@@ -136,7 +156,8 @@ export function syntaxRoles(
     SyntaxRole,
     keyof AdeaTheme['ansi'],
   ][]) {
-    const value: Oklch | undefined = parseColor(theme.ansi[source])
+    const slot = theme.appearance === 'light' ? (LIGHT_SYNTAX_SOURCE[role] ?? source) : source
+    const value: Oklch | undefined = parseColor(theme.ansi[slot])
     if (!value) continue
 
     if (role === 'comment' || role === 'punctuation') {
@@ -188,8 +209,15 @@ export function editorRolesHex(theme: AdeaTheme): Record<EditorRole, string> {
       // 4.5:1 in OKLCH can round to a hex value just below that floor, so advance
       // the requested threshold by the smallest measured step until the encoded
       // value itself clears 4.5:1. No source palette value or hue is rewritten.
+      //
+      // The projection runs with a wider lightness budget than the default repair,
+      // because a light theme's brightest ANSI slots start near the paper: a
+      // pastel yellow `number` has more lightness between it and 4.5:1 than the
+      // default budget allows, and this projection's contract is to hold the role
+      // to AA however far the lightness has to travel — darkening a chromatic
+      // colour keeps its hue, so the number stays yellow, just amber.
       for (let margin = 0.001; margin <= 0.05; margin += 0.001) {
-        const repaired = repairContrast(source, background, 4.5 + margin)
+        const repaired = repairContrast(source, background, 4.5 + margin, 0.55)
         if (!repaired.satisfied) continue
         const candidate = oklchToHex(repaired.color)
         const renderedCandidate = parseColor(candidate)

package/src/generated/metadata.ts

@@ -17,18 +17,17 @@ export const themeMetadata: readonly ThemeMetadata[] = Object.freeze([
     "family": "adea",
     "familyLabel": "Adea",
     "label": "Dark",
-    "description": "The default dark theme. Aardvark Ink's quiet canvas, with GitHub's vivid hues on it.",
+    "description": "The default dark theme: GitHub Dark Default's canvas and hues, kept as a composition so the default can diverge from it one slot at a time.",
     "tags": [
       "dark",
       "default",
-      "vivid"
+      "neutral"
     ],
     "provenance": {
       "project": "Adea",
       "url": "https://github.com/adea-ai/themes",
       "license": "Apache-2.0",
       "bootstrappedFrom": [
-        "Aardvark Ink (iTerm2-Color-Schemes)",
         "GitHub Dark Default (iTerm2-Color-Schemes)"
       ]
     }
@@ -40,22 +39,66 @@ export const themeMetadata: readonly ThemeMetadata[] = Object.freeze([
     "family": "adea",
     "familyLabel": "Adea",
     "label": "Light",
-    "description": "The default light theme. Nord Light's cool canvas, with the same hues as Adea Dark.",
+    "description": "The default light theme: GitHub's own white canvas carrying the dark theme's hues, transposed to survive on paper.",
     "tags": [
       "light",
       "default",
-      "cool"
+      "neutral"
     ],
     "provenance": {
       "project": "Adea",
       "url": "https://github.com/adea-ai/themes",
       "license": "Apache-2.0",
       "bootstrappedFrom": [
-        "Nord Light (iTerm2-Color-Schemes)",
+        "GitHub Light Default (iTerm2-Color-Schemes)",
         "GitHub Dark Default (iTerm2-Color-Schemes)"
       ]
     }
   },
+  {
+    "id": "aardvark-blue",
+    "name": "Aardvark Blue",
+    "appearance": "dark",
+    "family": "aardvark",
+    "familyLabel": "Aardvark",
+    "label": "Blue",
+    "description": "Ink's louder sibling: a deep blue ground under bright, cool text.",
+    "tags": [
+      "dark",
+      "blue",
+      "vivid"
+    ],
+    "provenance": {
+      "project": "iTerm2-Color-Schemes",
+      "url": "https://github.com/mbadolato/iTerm2-Color-Schemes",
+      "license": "MIT",
+      "bootstrappedFrom": [
+        "https://github.com/mbadolato/iTerm2-Color-Schemes"
+      ]
+    }
+  },
+  {
+    "id": "aardvark-ink",
+    "name": "Aardvark Ink",
+    "appearance": "dark",
+    "family": "aardvark",
+    "familyLabel": "Aardvark",
+    "label": "Ink",
+    "description": "Near-black navy with muted blue-grey text — the canvas the original Adea Dark was drawn on.",
+    "tags": [
+      "dark",
+      "ink",
+      "muted"
+    ],
+    "provenance": {
+      "project": "iTerm2-Color-Schemes",
+      "url": "https://github.com/mbadolato/iTerm2-Color-Schemes",
+      "license": "MIT",
+      "bootstrappedFrom": [
+        "https://github.com/mbadolato/iTerm2-Color-Schemes"
+      ]
+    }
+  },
   {
     "id": "ayu",
     "name": "Ayu Dark",
@@ -206,42 +249,6 @@ export const themeMetadata: readonly ThemeMetadata[] = Object.freeze([
       ]
     }
   },
-  {
-    "id": "contrast-dark",
-    "name": "High Contrast Dark",
-    "appearance": "dark",
-    "family": "contrast",
-    "familyLabel": "High Contrast",
-    "label": "Dark",
-    "description": "Adea’s high-contrast palette for dark appearance.",
-    "tags": [
-      "dark",
-      "high-contrast"
-    ],
-    "provenance": {
-      "project": "Adea",
-      "url": "https://github.com/adea-ai/adea",
-      "license": "Apache-2.0"
-    }
-  },
-  {
-    "id": "contrast-light",
-    "name": "High Contrast Light",
-    "appearance": "light",
-    "family": "contrast",
-    "familyLabel": "High Contrast",
-    "label": "Light",
-    "description": "Adea’s high-contrast palette for light appearance.",
-    "tags": [
-      "light",
-      "high-contrast"
-    ],
-    "provenance": {
-      "project": "Adea",
-      "url": "https://github.com/adea-ai/adea",
-      "license": "Apache-2.0"
-    }
-  },
   {
     "id": "dracula",
     "name": "Dracula",
@@ -310,6 +317,70 @@ export const themeMetadata: readonly ThemeMetadata[] = Object.freeze([
       ]
     }
   },
+  {
+    "id": "github-dark-high-contrast",
+    "name": "GitHub Dark High Contrast",
+    "appearance": "dark",
+    "family": "github",
+    "familyLabel": "GitHub",
+    "label": "Dark High Contrast",
+    "description": "GitHub's dark palette with its contrast floors pushed up, for accessibility needs.",
+    "tags": [
+      "dark",
+      "high-contrast"
+    ],
+    "provenance": {
+      "project": "GitHub Primer",
+      "url": "https://github.com/primer/primitives",
+      "license": "MIT",
+      "bootstrappedFrom": [
+        "https://github.com/mbadolato/iTerm2-Color-Schemes"
+      ]
+    }
+  },
+  {
+    "id": "github-light-default",
+    "name": "GitHub Light Default",
+    "appearance": "light",
+    "family": "github",
+    "familyLabel": "GitHub",
+    "label": "Light Default",
+    "description": "GitHub's own light interface palette: white ground, grey steps, familiar syntax hues.",
+    "tags": [
+      "light",
+      "neutral",
+      "popular"
+    ],
+    "provenance": {
+      "project": "GitHub Primer",
+      "url": "https://github.com/primer/primitives",
+      "license": "MIT",
+      "bootstrappedFrom": [
+        "https://github.com/mbadolato/iTerm2-Color-Schemes"
+      ]
+    }
+  },
+  {
+    "id": "github-light-high-contrast",
+    "name": "GitHub Light High Contrast",
+    "appearance": "light",
+    "family": "github",
+    "familyLabel": "GitHub",
+    "label": "Light High Contrast",
+    "description": "GitHub's light palette with its contrast floors pushed up, for accessibility needs.",
+    "tags": [
+      "light",
+      "high-contrast"
+    ],
+    "provenance": {
+      "project": "GitHub Primer",
+      "url": "https://github.com/primer/primitives",
+      "license": "MIT",
+      "bootstrappedFrom": [
+        "https://github.com/mbadolato/iTerm2-Color-Schemes"
+      ]
+    }
+  },
   {
     "id": "gruvbox-dark",
     "name": "Gruvbox Dark",
@@ -424,6 +495,28 @@ export const themeMetadata: readonly ThemeMetadata[] = Object.freeze([
       ]
     }
   },
+  {
+    "id": "nord-light",
+    "name": "Nord Light",
+    "appearance": "light",
+    "family": "nord",
+    "familyLabel": "Nord",
+    "label": "Light",
+    "description": "Nord's snow variant: the same cool palette for a light canvas.",
+    "tags": [
+      "light",
+      "cool",
+      "muted"
+    ],
+    "provenance": {
+      "project": "Nord",
+      "url": "https://github.com/nordtheme/nord",
+      "license": "MIT",
+      "bootstrappedFrom": [
+        "https://github.com/mbadolato/iTerm2-Color-Schemes"
+      ]
+    }
+  },
   {
     "id": "one-dark",
     "name": "One Dark",
@@ -510,44 +603,6 @@ export const themeMetadata: readonly ThemeMetadata[] = Object.freeze([
       ]
     }
   },
-  {
-    "id": "slate-dark",
-    "name": "Slate Dark",
-    "appearance": "dark",
-    "family": "slate",
-    "familyLabel": "Slate",
-    "label": "Dark",
-    "description": "Adea’s slate neutral palette for dark appearance.",
-    "tags": [
-      "dark",
-      "slate",
-      "neutral"
-    ],
-    "provenance": {
-      "project": "Adea",
-      "url": "https://github.com/adea-ai/adea",
-      "license": "Apache-2.0"
-    }
-  },
-  {
-    "id": "slate-light",
-    "name": "Slate Light",
-    "appearance": "light",
-    "family": "slate",
-    "familyLabel": "Slate",
-    "label": "Light",
-    "description": "Adea’s slate neutral palette for light appearance.",
-    "tags": [
-      "light",
-      "slate",
-      "neutral"
-    ],
-    "provenance": {
-      "project": "Adea",
-      "url": "https://github.com/adea-ai/adea",
-      "license": "Apache-2.0"
-    }
-  },
   {
     "id": "solarized-dark",
     "name": "Solarized Dark",