dsh-tui-theme 0.2.1 → 0.2.2

package/lib/types/autoTheme.d.ts

@@ -6,9 +6,9 @@
  * ride it. This module gives pink-day/pink-night the same behavior from the
  * plugin side:
  *
- * - at apply() (which runs before the React tree mounts and reads
- *   ~/.dsh-tui/theme.json), the cached detection writes the resolved theme
- *   name into the pref synchronously — always in time for this boot;
+ * - the caller wires this from the settings inject callback (see index.ts):
+ *   that fires before the React tree mounts and reads ~/.dsh-tui/theme.json,
+ *   so the cached detection still decides this boot;
  * - a fresh OSC 11 query then refreshes the cache for the next boot. The
  *   very first enabling (or a system flip between boots) lands one boot
  *   late — the same cadence as the host's own "re-select auto or restart".

package/lib/types/autoTheme.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"autoTheme.d.ts","sourceRoot":"","sources":["../../src/autoTheme.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAgBH,UAAU,WAAW;IACnB,KAAK,EAAE,OAAO,CAAA;IACd,EAAE,EAAE,MAAM,CAAA;CACX;AAgCD,+DAA+D;AAC/D,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGjE;AAED,yDAAyD;AACzD,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAErE;AAED,2CAA2C;AAC3C,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CAGxE;AAMD;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAEzD;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAQrE;AAcD;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,MAAM,CAAC,WAA4B,EAC3C,KAAK,GAAE,MAAM,CAAC,UAA0B,EACxC,YAAY,GAAE,OAAO,UAAuB,GAC3C,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAmD9B;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAC7B,IAAI,CAYN"}
+{"version":3,"file":"autoTheme.d.ts","sourceRoot":"","sources":["../../src/autoTheme.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAeH,UAAU,WAAW;IACnB,KAAK,EAAE,OAAO,CAAA;IACd,EAAE,EAAE,MAAM,CAAA;CACX;AA4BD,+DAA+D;AAC/D,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAGjE;AAED,yDAAyD;AACzD,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAErE;AAED,2CAA2C;AAC3C,wBAAgB,eAAe,CAAC,OAAO,EAAE,MAAM,GAAG,WAAW,GAAG,SAAS,CAGxE;AAMD;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAEzD;AAED;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAQrE;AAcD;;;;;;;;;;GAUG;AACH,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,MAAM,CAAC,WAA4B,EAC3C,KAAK,GAAE,MAAM,CAAC,UAA0B,EACxC,YAAY,GAAE,OAAO,UAAuB,GAC3C,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAmD9B;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAC7B,IAAI,CAYN"}

package/lib/types/autoTheme.js

@@ -6,9 +6,9 @@
  * ride it. This module gives pink-day/pink-night the same behavior from the
  * plugin side:
  *
- * - at apply() (which runs before the React tree mounts and reads
- *   ~/.dsh-tui/theme.json), the cached detection writes the resolved theme
- *   name into the pref synchronously — always in time for this boot;
+ * - the caller wires this from the settings inject callback (see index.ts):
+ *   that fires before the React tree mounts and reads ~/.dsh-tui/theme.json,
+ *   so the cached detection still decides this boot;
  * - a fresh OSC 11 query then refreshes the cache for the next boot. The
  *   very first enabling (or a system flip between boots) lands one boot
  *   late — the same cadence as the host's own "re-select auto or restart".
@@ -19,7 +19,6 @@
  * @module dsh-tui-theme/autoTheme
  */
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs';
-import { homedir } from 'node:os';
 import { join } from 'node:path';
 /** The pair this feature switches between (light terminal → day). */
 const LIGHT_THEME = 'pink-day';
@@ -29,9 +28,6 @@ const QUERY = '\x1b]11;?\x07';
 // ST terminated.
 const REPLY = /\x1b\]11;rgb:([0-9a-fA-F]{1,4})\/([0-9a-fA-F]{1,4})\/([0-9a-fA-F]{1,4})(?:\x07|\x1b\\)/;
 const DETECT_TIMEOUT_MS = 400;
-function homeDir() {
-    return homedir() || process.env.USERPROFILE || process.env.HOME || '';
-}
 function prefPath(dir) {
     return join(dir, 'theme.json');
 }

package/lib/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAKlD,OAAO,EAAwB,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEjF,eAAO,MAAM,IAAI,kBAAkB,CAAA;AAEnC,wDAAwD;AACxD,MAAM,MAAM,MAAM,GAAG,eAAe,CAAA;AAUpC,eAAO,MAAM,MAAM,EAAE,WAAW,CAAC,MAAM,CAOrC,CAAA;AAiBF;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,GAAE,MAAW,GAAG,IAAI,CAsC7D"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAKlD,OAAO,EAAwB,KAAK,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEjF,eAAO,MAAM,IAAI,kBAAkB,CAAA;AAEnC,wDAAwD;AACxD,MAAM,MAAM,MAAM,GAAG,eAAe,CAAA;AAUpC,eAAO,MAAM,MAAM,EAAE,WAAW,CAAC,MAAM,CAOrC,CAAA;AAwBF;;;;GAIG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,GAAE,MAAW,GAAG,IAAI,CAgE7D"}

package/lib/types/index.js

@@ -44,6 +44,12 @@ const DEFAULTS = {
     showClock: true,
     showTurns: true,
 };
+/**
+ * Backstop delay for the cordis-layer follow decision on hosts without a
+ * settings service (see apply). Stays under the host's own 300ms pre-mount
+ * settings gate so the pref write still lands before first paint.
+ */
+const FOLLOW_FALLBACK_MS = 150;
 /**
  * Wire the pink theme plugin.
  * @param ctx - Cordis context (the plugin's own activation).
@@ -69,18 +75,45 @@ export function apply(ctx, config = {}) {
             ctx.logger.warn(`dsh-tui-theme: could not install bundled theme "${file}"`);
         }
     }
-    // Background follow runs before the React tree mounts (which reads the
-    // theme pref), so the cached detection decides this boot.
-    if (cordis.followSystem) {
-        runFollowSystem(join(homeDir(), '.dsh-tui'), message => {
-            ctx.logger.info(`dsh-tui-theme: ${message}`);
-        });
-    }
     // The /settings user layer (settings.yaml) overrides the cordis layer and
     // lands live through scope.watch; both override the hardcoded defaults.
     let effective = cordis;
+    // Background follow honors the MERGED knob (cordis layer overlaid by the
+    // /settings user layer), so the decision cannot be taken synchronously at
+    // apply(): the user layer is only readable once the settings service
+    // answers. The settings callback still fires before the host's React tree
+    // mounts (the host gates its own mount on the same service, probed
+    // against 0.9.0), so the pref write decides this boot exactly like a sync
+    // write would, and toggling followSystem in /settings re-decides live.
+    let followActive;
+    const dataDir = join(homeDir(), '.dsh-tui');
+    const startFollow = () => {
+        runFollowSystem(dataDir, message => {
+            ctx.logger.info(`dsh-tui-theme: ${message}`);
+        });
+    };
     registerPinkSettings(ctx, cordis, doc => {
         effective = { ...cordis, ...doc };
+        if (effective.followSystem !== followActive) {
+            followActive = effective.followSystem;
+            if (followActive) {
+                startFollow();
+            }
+            else {
+                ctx.logger.info('dsh-tui-theme: follow: disabled, manual /theme choice preserved');
+            }
+        }
     });
+    // Degradation backstop for hosts that never provide a settings service:
+    // the inject callback never fires there, so the cordis-layer decision
+    // applies instead. The delay lets any pending service registration (and
+    // its callback) land first — it no-ops once followActive is settled, and
+    // stays inside the host's own 300ms pre-mount settings gate either way.
+    setTimeout(() => {
+        if (followActive === undefined && cordis.followSystem) {
+            followActive = true;
+            startFollow();
+        }
+    }, FOLLOW_FALLBACK_MS);
     startStatusLine(ctx, () => effective);
 }

package/lib/types/settingsSection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settingsSection.d.ts","sourceRoot":"","sources":["../../src/settingsSection.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAEpD,+EAA+E;AAC/E,MAAM,MAAM,eAAe,GAAG,aAAa,GAAG;IAC5C,sEAAsE;IACtE,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,oEAAoE;IACpE,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAcD;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,GACpC,IAAI,CAuCN"}
+{"version":3,"file":"settingsSection.d.ts","sourceRoot":"","sources":["../../src/settingsSection.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAEpD,+EAA+E;AAC/E,MAAM,MAAM,eAAe,GAAG,aAAa,GAAG;IAC5C,sEAAsE;IACtE,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,oEAAoE;IACpE,YAAY,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAcD;;;;;;;;;;GAUG;AACH,wBAAgB,oBAAoB,CAClC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,CAAC,GAAG,EAAE,eAAe,KAAK,IAAI,GACpC,IAAI,CA2CN"}

package/lib/types/settingsSection.js

@@ -46,8 +46,12 @@ export function registerPinkSettings(ctx, cordis, onDoc) {
             }
             onDoc(clean);
         };
-        emit(scope.get());
-        scope.watch(emit);
+        // Own the watcher on the inject-scoped ledger so it survives exactly as
+        // long as this activation (scope.watch's disposer is otherwise leaked).
+        settingsCtx.effect(() => {
+            emit(scope.get());
+            return scope.watch(emit);
+        });
     });
     ctx.inject(['tuiSettingsSections'], sectionsCtx => {
         const sections = sectionsCtx

package/lib/types/statusLine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"statusLine.d.ts","sourceRoot":"","sources":["../../src/statusLine.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAKlD,MAAM,WAAW,aAAa;IAC5B,2EAA2E;IAC3E,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,sCAAsC;IACtC,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,+BAA+B;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,0DAA0D;IAC1D,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAED,mCAAmC;AACnC,MAAM,MAAM,eAAe,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAA;AAoBrD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,GAAG,IAAI,CAoDvF"}
+{"version":3,"file":"statusLine.d.ts","sourceRoot":"","sources":["../../src/statusLine.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAKlD,MAAM,WAAW,aAAa;IAC5B,2EAA2E;IAC3E,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB,sCAAsC;IACtC,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,+BAA+B;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAA;IACnB,0DAA0D;IAC1D,SAAS,CAAC,EAAE,OAAO,CAAA;CACpB;AAED,mCAAmC;AACnC,MAAM,MAAM,eAAe,GAAG,QAAQ,CAAC,aAAa,CAAC,CAAA;AAoBrD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,GAAG,IAAI,CAsDvF"}

package/lib/types/statusLine.js

@@ -38,12 +38,14 @@ export function startStatusLine(ctx, getEffective) {
             try {
                 const eff = getEffective();
                 const parts = [];
-                if (eff.showGlyph)
-                    parts.push(GLYPH);
-                if (eff.showClock)
-                    parts.push(clockText());
-                if (eff.showTurns && current !== undefined) {
-                    parts.push(`${turns.get(current) ?? 0}✦`);
+                if (eff.statusEnabled) {
+                    if (eff.showGlyph)
+                        parts.push(GLYPH);
+                    if (eff.showClock)
+                        parts.push(clockText());
+                    if (eff.showTurns && current !== undefined) {
+                        parts.push(`${turns.get(current) ?? 0}✦`);
+                    }
                 }
                 const text = parts.join(' · ');
                 // The trailing identity must be the inject-scoped context (the same

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-tui-theme",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Sakura-pink themes for dsh-TUI with terminal-background auto-follow (pink-day/pink-night), a blossom status line, and a /settings section. No shortcuts, no commands.",
   "type": "module",
   "main": "lib/types/index.js",