termcast 1.3.47 → 1.3.49

package/src/themes/termcast.json

@@ -9,47 +9,51 @@
     "darkStep6": "#505050",
     "darkStep7": "#606060",
     "darkStep8": "#808080",
-    "darkStep9": "#FFC000",
-    "darkStep10": "#FFD040",
     "darkStep11": "#999999",
     "darkStep12": "#FFFFFF",
-    "darkSecondary": "#AA8000",
-    "darkAccent": "#E68900",
-    "darkRed": "#FF0000",
-    "darkOrange": "#FFC000",
-    "darkGreen": "#4fd6be",
-    "darkCyan": "#56b6c2",
-    "darkYellow": "#FFC000"
+
+    "darkOrange": "#E86500",
+    "darkOrangeBright": "#FF7800",
+    "darkOrangeDim": "#C05000",
+    "darkOrangeDeep": "#A03800",
+    "darkOrangeWash": "#FF9040",
+
+    "darkGreen": "#2BBD50",
+    "darkGreenBright": "#44DD66",
+    "darkGreenDim": "#1F9940",
+    "darkGreenDeep": "#167030",
+
+    "darkSalmon": "#F7768E"
   },
 
   "theme": {
     "primary": {
-      "dark": "darkStep9",
-      "light": "darkStep9"
+      "dark": "darkOrange",
+      "light": "darkOrange"
     },
     "secondary": {
-      "dark": "darkSecondary",
-      "light": "darkSecondary"
+      "dark": "darkOrangeDim",
+      "light": "darkOrangeDim"
     },
     "accent": {
-      "dark": "darkAccent",
-      "light": "darkAccent"
+      "dark": "darkOrangeBright",
+      "light": "darkOrangeBright"
     },
     "error": {
-      "dark": "darkRed",
-      "light": "darkRed"
+      "dark": "darkSalmon",
+      "light": "darkSalmon"
     },
     "warning": {
-      "dark": "darkOrange",
-      "light": "darkOrange"
+      "dark": "darkOrangeWash",
+      "light": "darkOrangeWash"
     },
     "success": {
-      "dark": "darkOrange",
-      "light": "darkOrange"
+      "dark": "darkGreen",
+      "light": "darkGreen"
     },
     "info": {
-      "dark": "darkOrange",
-      "light": "darkOrange"
+      "dark": "darkGreenBright",
+      "light": "darkGreenBright"
     },
     "text": {
       "dark": "darkStep12",
@@ -76,20 +80,20 @@
       "light": "darkStep4"
     },
     "borderActive": {
-      "dark": "darkStep9",
-      "light": "darkStep9"
+      "dark": "darkOrange",
+      "light": "darkOrange"
     },
     "borderSubtle": {
       "dark": "#252525",
       "light": "#252525"
     },
     "diffAdded": {
-      "dark": "#4fd6be",
-      "light": "#4fd6be"
+      "dark": "darkGreen",
+      "light": "darkGreen"
     },
     "diffRemoved": {
-      "dark": "#c53b53",
-      "light": "#c53b53"
+      "dark": "darkSalmon",
+      "light": "darkSalmon"
     },
     "diffContext": {
       "dark": "darkStep11",
@@ -100,16 +104,16 @@
       "light": "darkStep11"
     },
     "diffHighlightAdded": {
-      "dark": "#b8db87",
-      "light": "#b8db87"
+      "dark": "darkGreenBright",
+      "light": "darkGreenBright"
     },
     "diffHighlightRemoved": {
-      "dark": "#e26a75",
-      "light": "#e26a75"
+      "dark": "darkSalmon",
+      "light": "darkSalmon"
     },
     "diffAddedBg": {
-      "dark": "#20303b",
-      "light": "#20303b"
+      "dark": "#1A2B1E",
+      "light": "#1A2B1E"
     },
     "diffRemovedBg": {
       "dark": "#37222c",
@@ -124,8 +128,8 @@
       "light": "darkStep4"
     },
     "diffAddedLineNumberBg": {
-      "dark": "#1b2b34",
-      "light": "#1b2b34"
+      "dark": "#162518",
+      "light": "#162518"
     },
     "diffRemovedLineNumberBg": {
       "dark": "#2d1f26",
@@ -136,52 +140,52 @@
       "light": "darkStep12"
     },
     "markdownHeading": {
-      "dark": "darkStep9",
-      "light": "darkStep9"
+      "dark": "darkOrange",
+      "light": "darkOrange"
     },
     "markdownLink": {
-      "dark": "darkCyan",
-      "light": "darkCyan"
+      "dark": "darkGreen",
+      "light": "darkGreen"
     },
     "markdownLinkText": {
-      "dark": "darkCyan",
-      "light": "darkCyan"
+      "dark": "darkGreen",
+      "light": "darkGreen"
     },
     "markdownCode": {
-      "dark": "darkStep9",
-      "light": "darkStep9"
+      "dark": "darkGreenDim",
+      "light": "darkGreenDim"
     },
     "markdownBlockQuote": {
       "dark": "darkStep11",
       "light": "darkStep11"
     },
     "markdownEmph": {
-      "dark": "darkStep9",
-      "light": "darkStep9"
+      "dark": "darkOrangeWash",
+      "light": "darkOrangeWash"
     },
     "markdownStrong": {
-      "dark": "darkStep9",
-      "light": "darkStep9"
+      "dark": "darkOrangeBright",
+      "light": "darkOrangeBright"
     },
     "markdownHorizontalRule": {
       "dark": "darkStep11",
       "light": "darkStep11"
     },
     "markdownListItem": {
-      "dark": "darkStep9",
-      "light": "darkStep9"
+      "dark": "darkOrange",
+      "light": "darkOrange"
     },
     "markdownListEnumeration": {
-      "dark": "darkStep9",
-      "light": "darkStep9"
+      "dark": "darkOrange",
+      "light": "darkOrange"
     },
     "markdownImage": {
-      "dark": "darkStep9",
-      "light": "darkStep9"
+      "dark": "darkOrange",
+      "light": "darkOrange"
     },
     "markdownImageText": {
-      "dark": "darkStep9",
-      "light": "darkStep9"
+      "dark": "darkGreen",
+      "light": "darkGreen"
     },
     "markdownCodeBlock": {
       "dark": "darkStep12",
@@ -192,32 +196,32 @@
       "light": "darkStep11"
     },
     "syntaxKeyword": {
-      "dark": "darkStep9",
-      "light": "darkStep9"
+      "dark": "darkOrange",
+      "light": "darkOrange"
     },
     "syntaxFunction": {
-      "dark": "darkStep9",
-      "light": "darkStep9"
+      "dark": "darkOrangeBright",
+      "light": "darkOrangeBright"
     },
     "syntaxVariable": {
-      "dark": "#FF6666",
-      "light": "#FF6666"
+      "dark": "darkSalmon",
+      "light": "darkSalmon"
     },
     "syntaxString": {
-      "dark": "darkStep9",
-      "light": "darkStep9"
+      "dark": "darkGreenDim",
+      "light": "darkGreenDim"
     },
     "syntaxNumber": {
-      "dark": "darkStep9",
-      "light": "darkStep9"
+      "dark": "darkOrangeWash",
+      "light": "darkOrangeWash"
     },
     "syntaxType": {
-      "dark": "darkStep9",
-      "light": "darkStep9"
+      "dark": "darkGreenBright",
+      "light": "darkGreenBright"
     },
     "syntaxOperator": {
-      "dark": "darkStep9",
-      "light": "darkStep9"
+      "dark": "darkGreen",
+      "light": "darkGreen"
     },
     "syntaxPunctuation": {
       "dark": "darkStep12",

package/src/themes.ts

@@ -21,6 +21,7 @@ import material from './themes/material.json'
 import matrix from './themes/matrix.json'
 import mercury from './themes/mercury.json'
 import monokai from './themes/monokai.json'
+import nerv from './themes/nerv.json'
 import nightowl from './themes/nightowl.json'
 import nord from './themes/nord.json'
 import oneDark from './themes/one-dark.json'
@@ -31,7 +32,7 @@ import palenight from './themes/palenight.json'
 import rosepine from './themes/rosepine.json'
 import solarized from './themes/solarized.json'
 import synthwave84 from './themes/synthwave84.json'
-import termcast from './themes/termcast.json'
+// termcast.json is kept for reference but 'termcast' key now aliases to nerv
 import tokyonight from './themes/tokyonight.json'
 import vercel from './themes/vercel.json'
 import vesper from './themes/vesper.json'
@@ -125,6 +126,7 @@ export interface ResolvedTheme {
 
 export interface SyntaxThemeStyle {
   fg: RGBA
+  bg?: RGBA
   bold?: boolean
   italic?: boolean
   underline?: boolean
@@ -154,6 +156,7 @@ const DEFAULT_THEMES: Record<string, ThemeJson> = {
   matrix,
   mercury,
   monokai,
+  nerv,
   nightowl,
   nord,
   'one-dark': oneDark,
@@ -164,7 +167,7 @@ const DEFAULT_THEMES: Record<string, ThemeJson> = {
   rosepine,
   solarized,
   synthwave84,
-  termcast,
+  termcast: nerv, // alias: 'termcast' resolves to nerv theme for backwards compatibility
   tokyonight,
   vercel,
   vesper,
@@ -295,7 +298,7 @@ export function getResolvedTheme(
   name: string,
   mode: 'dark' | 'light' = 'dark',
 ): ResolvedTheme {
-  const themeJson = DEFAULT_THEMES[name] ?? DEFAULT_THEMES.termcast!
+  const themeJson = DEFAULT_THEMES[name] ?? DEFAULT_THEMES.nerv!
   return resolveTheme(themeJson, mode)
 }
 
@@ -377,7 +380,7 @@ export function getSyntaxTheme(
     label: { fg: h(resolved.markdownLinkText) },
     spell: { fg: h(resolved.text) },
     nospell: { fg: h(resolved.text) },
-    conceal: { fg: h(resolved.conceal) },
+    conceal: { fg: h(resolved.conceal), bg: h(resolved.backgroundElement) },
     'string.special': { fg: h(resolved.markdownLink), underline: true },
     'string.special.url': { fg: h(resolved.markdownLink), underline: true },
     'string.escape': { fg: h(resolved.syntaxString) },
@@ -386,4 +389,4 @@ export function getSyntaxTheme(
 
 export const themeNames = Object.keys(DEFAULT_THEMES).sort()
 
-export const defaultThemeName = 'termcast'
+export const defaultThemeName = 'nerv'

package/src/utils.test.tsx

@@ -6,7 +6,7 @@ import {
   executeSQL,
   runAppleScript,
 } from './utils'
-import { Database } from 'bun:sqlite'
+import { Database } from './apis/sqlite'
 import * as fs from 'fs'
 import * as os from 'os'
 import * as path from 'path'

package/src/utils.tsx

@@ -13,6 +13,7 @@ import {
 } from './package-json'
 import { logger } from './logger'
 import { useStore } from './state'
+import { initializeTheme } from './theme'
 
 export interface RenderWithProvidersOptions {
   extensionName?: string
@@ -53,6 +54,9 @@ export async function renderWithProviders(
     extensionPackageJson: packageJson,
   })
 
+  // Load theme after state reset — extensionPath is now set so it reads from the correct DB
+  initializeTheme()
+
   const renderer = await createCliRenderer({
     onDestroy: () => {
       process.exit(0)
@@ -812,7 +816,7 @@ export async function executeSQL<T = unknown>(
   databasePath: string,
   query: string,
 ): Promise<T[]> {
-  const { Database } = await import('bun:sqlite')
+  const { Database } = await import('./apis/sqlite')
 
   if (!fs.existsSync(databasePath)) {
     throw new Error(`Database file not found: ${databasePath}`)