dsh-tui-theme 0.3.2 → 0.4.0

package/lib/types/settingsSection.js

@@ -84,11 +84,11 @@ function sectionDefinition(cordis) {
         fields: [
             {
                 path: ['followSystem'],
-                label: 'Follow terminal background',
-                descriptions: { zh: '跟随终端背景' },
-                hint: 'Auto-switch between Pink Day and Pink Night by terminal/system background. First enabling or a background flip applies from the next boot.',
+                label: 'Use cached terminal background',
+                descriptions: { zh: '使用已缓存的终端背景' },
+                hint: 'Apply a previously saved terminal background result at startup. dsh-TUI 0.9.2 does not expose a safe plugin query, so this plugin does not refresh the cache.',
                 hintDescriptions: {
-                    zh: '按终端/系统背景色在昼樱与夜樱间自动切换。首次开启或背景刚翻转后，自下次启动生效。',
+                    zh: '启动时应用此前保存的终端背景结果。dsh-TUI 0.9.2 未提供安全的插件查询接缝，因此本插件不会刷新该缓存。',
                 },
                 kind: 'boolean',
                 format: (value) => String(value ?? cordis.followSystem),

package/lib/types/statusLine.js

@@ -92,14 +92,14 @@ export function startStatusLine(ctx, getEffective) {
                 // Display garnish only: a rendering hiccup must never travel upward.
             }
         };
-        ctx.on('session/event', (session, event) => {
+        statusCtx.on('session/event', (session, event) => {
             current = session;
             if (event?.type === 'turn/end') {
                 turns.set(session, (turns.get(session) ?? 0) + 1);
             }
             render();
         });
-        ctx.on('session/disposed', session => {
+        statusCtx.on('session/disposed', session => {
             turns.delete(session);
             if (current === session)
                 current = undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"themeAssets.d.ts","sourceRoot":"","sources":["../../src/themeAssets.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAOH,MAAM,WAAW,kBAAkB;IACjC,qDAAqD;IACrD,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAA;IACrC,sEAAsE;IACtE,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;IACnC,6DAA6D;IAC7D,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;CACnC;AAID,wBAAgB,OAAO,IAAI,MAAM,CAEhC;AAED,2EAA2E;AAC3E,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,2DAA2D;AAC3D,wBAAgB,eAAe,IAAI,MAAM,CAExC;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,GAAE,MAA0B,EACrC,SAAS,GAAE,MAA2B,GACrC,kBAAkB,CA2BpB"}
+{"version":3,"file":"themeAssets.d.ts","sourceRoot":"","sources":["../../src/themeAssets.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAOH,MAAM,WAAW,kBAAkB;IACjC,qDAAqD;IACrD,QAAQ,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,CAAA;IACrC,sEAAsE;IACtE,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;IACnC,6DAA6D;IAC7D,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;CACnC;AAID,wBAAgB,OAAO,IAAI,MAAM,CAEhC;AAED,2EAA2E;AAC3E,wBAAgB,gBAAgB,IAAI,MAAM,CAEzC;AAED,2DAA2D;AAC3D,wBAAgB,eAAe,IAAI,MAAM,CAExC;AAED;;;;;GAKG;AACH,wBAAgB,oBAAoB,CAClC,SAAS,GAAE,MAA0B,EACrC,SAAS,GAAE,MAA2B,GACrC,kBAAkB,CA+BpB"}

package/lib/types/themeAssets.js

@@ -7,7 +7,7 @@
  * theme garnish must never break the TUI's boot.
  * @module dsh-tui-pink-theme/themeAssets
  */
-import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from 'node:fs';
+import { mkdirSync, readFileSync, readdirSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -42,17 +42,23 @@ export function installBundledThemes(targetDir = themesTargetDir(), sourceDir =
         return { installed, skipped, failed: [sourceDir] };
     }
     for (const file of files) {
+        const target = join(targetDir, file);
         try {
-            const target = join(targetDir, file);
-            if (existsSync(target)) {
-                skipped.push(file);
-                continue;
-            }
             const text = readFileSync(join(sourceDir, file), 'utf8');
             JSON.parse(text); // our own asset, but never write a corrupt file out
             mkdirSync(targetDir, { recursive: true });
-            writeFileSync(target, text);
-            installed.push(file);
+            try {
+                writeFileSync(target, text, { flag: 'wx' });
+                installed.push(file);
+            }
+            catch (error) {
+                if (error.code === 'EEXIST') {
+                    skipped.push(file);
+                }
+                else {
+                    failed.push(file);
+                }
+            }
         }
         catch {
             failed.push(file);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-tui-theme",
-  "version": "0.3.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.",
+  "version": "0.4.0",
+  "description": "Sakura-pink themes for dsh-TUI with optional cached background follow (pink-day/pink-night), a blossom status line, and a /settings section. No shortcuts, no commands.",
   "type": "module",
   "main": "lib/types/index.js",
   "types": "lib/types/index.d.ts",
@@ -17,6 +17,7 @@
     "lib",
     "themes",
     "docs",
+    "scripts",
     "cordis.patch.yml"
   ],
   "engines": {
@@ -24,8 +25,11 @@
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",
-    "preverify": "npm run build",
-    "verify": "node scripts/verify.mjs"
+    "verify": "node scripts/verify.mjs",
+    "verify:package": "node scripts/verify-package.mjs",
+    "verify:host": "node scripts/headless-order-test.mjs && node --import tsx/esm scripts/validate-themes-against-host.mjs",
+    "release:check": "npm run build && npm run verify && npm run verify:package",
+    "prepack": "npm run release:check"
   },
   "license": "MIT",
   "author": "xiaoxiaohaigui",
@@ -51,19 +55,19 @@
       "patch": "./cordis.patch.yml"
     }
   },
-  "dependencies": {
-    "@deepseek-ai/schemastery": "^3.18.1"
-  },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
     "@deepseek-ai/dsh-session": "^0.1.0-rc.6 || ^0.1.1-rc.1",
-    "@deepseek-ai/dsh-settings": "^0.1.0-rc.6 || ^0.1.1-rc.1"
+    "@deepseek-ai/dsh-settings": "^0.1.0-rc.6 || ^0.1.1-rc.1",
+    "@deepseek-ai/schemastery": "^3.18.1"
   },
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.1",
     "@deepseek-ai/dsh-session": "^0.1.0-rc.6 || ^0.1.1-rc.1",
     "@deepseek-ai/dsh-settings": "^0.1.0-rc.6 || ^0.1.1-rc.1",
+    "@deepseek-ai/schemastery": "^3.18.1",
     "@types/node": "^22.0.0",
+    "tsx": "^4.23.12",
     "typescript": "^6.0.3"
   }
 }

package/scripts/headless-order-test.mjs

@@ -0,0 +1,67 @@
+/**
+ * End-to-end order test with the installed dsh-TUI services. Composes this
+ * plugin before the extension services to exercise late service injection.
+ *
+ * DSH_TUI_ADAPTER_DIR must point at dsh-TUI's lib/types/dsh-adapter directory.
+ */
+import { existsSync, mkdtempSync, mkdirSync, readFileSync, writeFileSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join } from 'node:path'
+import { fileURLToPath, pathToFileURL } from 'node:url'
+import { createRequire } from 'node:module'
+import assert from 'node:assert/strict'
+
+const pluginRoot = fileURLToPath(new URL('..', import.meta.url))
+const adapter = process.env.DSH_TUI_ADAPTER_DIR
+if (adapter === undefined || adapter === '') {
+  throw new Error('DSH_TUI_ADAPTER_DIR must point at dsh-TUI lib/types/dsh-adapter for this host integration test.')
+}
+
+if (!existsSync(join(adapter, 'extensions.js'))) {
+  throw new Error(`dsh-TUI adapter not found at ${adapter}`)
+}
+
+const hostPackagePath = join(adapter, '..', '..', '..', 'package.json')
+if (!existsSync(hostPackagePath)) {
+  throw new Error(`dsh-TUI package metadata not found above adapter at ${adapter}`)
+}
+const hostPackage = JSON.parse(readFileSync(hostPackagePath, 'utf8'))
+assert.equal(hostPackage.version, '0.9.2', `expected dsh-TUI adapter 0.9.2, received ${hostPackage.version}`)
+
+const sandbox = mkdtempSync(join(tmpdir(), 'pink-order-'))
+process.env.USERPROFILE = sandbox
+process.env.HOME = sandbox
+
+const dataDir = join(sandbox, '.dsh-tui')
+mkdirSync(dataDir, { recursive: true })
+writeFileSync(join(dataDir, 'theme.json'), JSON.stringify({ theme: 'pink-night' }, null, 2))
+
+const req = createRequire(join(adapter, 'extensions.js'))
+const { Context } = await import(pathToFileURL(req.resolve('@deepseek-ai/cordis')).href)
+const extensions = await import(pathToFileURL(join(adapter, 'extensions.js')).href)
+const ledgerModule = await import(pathToFileURL(join(adapter, 'effect-ledger.js')).href)
+const statusModule = await import(pathToFileURL(join(adapter, 'status.js')).href)
+const pink = await import(pathToFileURL(join(pluginRoot, 'lib', 'types', 'index.js')).href)
+
+const app = new Context()
+await app.plugin(ledgerModule.default)
+await app.plugin(pink)
+await app.plugin(extensions.default ?? extensions)
+await new Promise(resolve => setTimeout(resolve, 300))
+
+const ledger = join(dataDir, 'effect-ledger.jsonl')
+const pinkBinds = existsSync(ledger)
+  ? readFileSync(ledger, 'utf8').trim().split('\n')
+      .filter(Boolean)
+      .map(line => JSON.parse(line))
+      .filter(entry => entry.resource?.id === 'dsh-tui-theme')
+  : []
+const runtime = app.get('tuiStatus')
+const snapshot = statusModule.getHostStatusStore(runtime)?.getSnapshot()
+
+assert.ok(pinkBinds.length > 0, 'plugin must bind through the late status service')
+assert.ok(
+  snapshot?.some?.(entry => entry.key === 'dsh-tui-theme'),
+  'status store must contain the plugin contribution',
+)
+console.log(`✓ headless order: ${pinkBinds.length} ledger bind(s), visible status contribution`)

package/scripts/validate-themes-against-host.mjs

@@ -0,0 +1,115 @@
+/**
+ * Validate bundled themes against the real dsh-TUI source implementation.
+ * DSH_TUI_SOURCE_ROOT must point at a dsh-TUI source checkout.
+ *
+ * Run with: npx -y tsx scripts/validate-themes-against-host.mjs
+ */
+import { existsSync, mkdtempSync, readFileSync, readdirSync } from 'node:fs'
+import { tmpdir } from 'node:os'
+import { join, resolve } from 'node:path'
+import { fileURLToPath, pathToFileURL } from 'node:url'
+import assert from 'node:assert/strict'
+
+const pluginRoot = fileURLToPath(new URL('..', import.meta.url))
+const sourceRoot = process.env.DSH_TUI_SOURCE_ROOT
+if (sourceRoot === undefined || sourceRoot === '') {
+  throw new Error('DSH_TUI_SOURCE_ROOT must point at a dsh-TUI source checkout for this host theme validation.')
+}
+const hostRoot = resolve(sourceRoot)
+const customThemePath = join(hostRoot, 'src', 'customTheme.ts')
+const themePath = join(hostRoot, 'src', 'theme.ts')
+
+if (!existsSync(customThemePath) || !existsSync(themePath)) {
+  throw new Error(`dsh-TUI sources not found at ${hostRoot}`)
+}
+
+const hostPackagePath = join(hostRoot, 'package.json')
+if (!existsSync(hostPackagePath)) {
+  throw new Error(`dsh-TUI package metadata not found at ${hostPackagePath}`)
+}
+const hostPackage = JSON.parse(readFileSync(hostPackagePath, 'utf8'))
+assert.equal(hostPackage.version, '0.9.2', `expected dsh-TUI source 0.9.2, received ${hostPackage.version}`)
+
+const sandboxHome = mkdtempSync(join(tmpdir(), 'pink-theme-host-validate-'))
+process.env.USERPROFILE = sandboxHome
+process.env.HOME = sandboxHome
+
+const themesDir = join(pluginRoot, 'themes')
+const { parseCustomTheme, buildTheme } = await import(pathToFileURL(customThemePath).href)
+const { getTheme, isLightThemeActive, registerCustomThemeResolver } = await import(
+  pathToFileURL(themePath).href
+)
+
+const allKeys = Object.keys(getTheme('dark'))
+assert.ok(allKeys.length >= 90, 'host Theme key count drifted; re-check coverage')
+
+function parseColor(value) {
+  if (/^#[0-9A-Fa-f]{6}$/.test(value)) {
+    const n = Number.parseInt(value.slice(1), 16)
+    return [(n >> 16) & 255, (n >> 8) & 255, n & 255]
+  }
+  const match = /^rgb\((\d+),(\d+),(\d+)\)$/.exec(value)
+  return match === null ? undefined : [Number(match[1]), Number(match[2]), Number(match[3])]
+}
+
+function luminance(color) {
+  const channel = value => {
+    const normalized = value / 255
+    return normalized <= 0.03928
+      ? normalized / 12.92
+      : ((normalized + 0.055) / 1.055) ** 2.4
+  }
+  return 0.2126 * channel(color[0]) + 0.7152 * channel(color[1]) + 0.0722 * channel(color[2])
+}
+
+function contrast(foreground, background) {
+  const [high, low] = [luminance(foreground), luminance(background)].sort((a, b) => b - a)
+  return (high + 0.05) / (low + 0.05)
+}
+
+const expectedLight = { 'pink-night': false, 'pink-day': true, 'pink-ansi': false }
+const built = {}
+registerCustomThemeResolver(name => built[name])
+
+for (const file of readdirSync(themesDir).filter(name => name.endsWith('.json'))) {
+  const warnings = []
+  const originalWarn = console.warn
+  console.warn = message => warnings.push(String(message))
+  let spec
+  try {
+    spec = parseCustomTheme(readFileSync(join(themesDir, file), 'utf8'), file)
+  } finally {
+    console.warn = originalWarn
+  }
+
+  assert.notEqual(spec, undefined, `${file} must parse`)
+  assert.deepEqual(warnings, [], `${file} must produce zero host warnings`)
+  const missing = allKeys.filter(key => key !== 'userMessageBackground' && !(key in spec.colors))
+  assert.deepEqual(missing, [], `${file} must cover every Theme key`)
+
+  const theme = buildTheme(spec)
+  built[spec.name] = theme
+  assert.equal(isLightThemeActive(spec.name), expectedLight[spec.name], `${spec.name} identity`)
+}
+
+for (const [name, light] of Object.entries(expectedLight)) {
+  assert.equal(isLightThemeActive(name), light, `${name} identity via resolver`)
+}
+
+const cases = [
+  ['pink-night', 'text', '#1E1E1E', 4.5],
+  ['pink-night', 'claude', '#1E1E1E', 3.0],
+  ['pink-night', 'inactive', '#1E1E1E', 2.5],
+  ['pink-day', 'text', '#F6F3ED', 4.5],
+  ['pink-day', 'claude', '#F6F3ED', 3.0],
+  ['pink-day', 'inactive', '#F6F3ED', 2.5],
+]
+for (const [theme, key, background, minimum] of cases) {
+  const foregroundRgb = parseColor(built[theme][key])
+  const backgroundRgb = parseColor(background)
+  assert.notEqual(foregroundRgb, undefined, `${theme}.${key} must be parseable`)
+  const ratio = contrast(foregroundRgb, backgroundRgb)
+  assert.ok(ratio >= minimum, `${theme}.${key} contrast ${ratio.toFixed(2)} >= ${minimum}`)
+}
+
+console.log(`✓ host theme validation: ${Object.keys(built).length} themes, ${allKeys.length - 1} keys each`)

package/scripts/verify-package.mjs

@@ -0,0 +1,79 @@
+/**
+ * Release artifact contract: inspect npm's dry-run manifest without creating
+ * a tarball, then ensure consumers receive every advertised runtime asset.
+ */
+import { execFileSync } from 'node:child_process'
+import { existsSync, readFileSync } from 'node:fs'
+import { fileURLToPath } from 'node:url'
+import assert from 'node:assert/strict'
+
+const pluginRoot = fileURLToPath(new URL('..', import.meta.url))
+const packageJson = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'))
+const lockfile = JSON.parse(readFileSync(new URL('../package-lock.json', import.meta.url), 'utf8'))
+const packCommand = process.platform === 'win32'
+  ? { file: 'cmd.exe', args: ['/d', '/s', '/c', 'npm pack --dry-run --json --ignore-scripts'] }
+  : { file: 'npm', args: ['pack', '--dry-run', '--json', '--ignore-scripts'] }
+const manifest = JSON.parse(execFileSync(packCommand.file, packCommand.args, {
+  cwd: pluginRoot,
+  encoding: 'utf8',
+}))
+const packed = manifest[0]
+assert.ok(packed, 'npm pack must report one package')
+assert.equal(packed.name, 'dsh-tui-theme')
+assert.equal(packed.version, packageJson.version)
+
+const files = new Set(packed.files.map(entry => entry.path))
+for (const required of [
+  'package.json',
+  'README.md',
+  'LICENSE',
+  'cordis.patch.yml',
+  'lib/types/index.js',
+  'lib/types/index.d.ts',
+  'lib/types/autoTheme.js',
+  'lib/types/autoTheme.d.ts',
+  'lib/types/settingsSection.js',
+  'lib/types/settingsSection.d.ts',
+  'lib/types/statusLine.js',
+  'lib/types/statusLine.d.ts',
+  'lib/types/themeAssets.js',
+  'lib/types/themeAssets.d.ts',
+  'themes/pink-night.json',
+  'themes/pink-day.json',
+  'themes/pink-ansi.json',
+  'docs/screenshots/pink-day.png',
+  'docs/screenshots/pink-night.png',
+  'docs/screenshots/settings.png',
+  'scripts/verify.mjs',
+  'scripts/verify-package.mjs',
+  'scripts/headless-order-test.mjs',
+  'scripts/validate-themes-against-host.mjs',
+]) {
+  assert.ok(files.has(required), `published package must include ${required}`)
+}
+
+const exportedPaths = [packageJson.main, packageJson.types, packageJson.dsh.bundle.patch]
+for (const entry of Object.values(packageJson.exports)) {
+  if (typeof entry === 'string') exportedPaths.push(entry)
+  else if (entry !== null && typeof entry === 'object') exportedPaths.push(...Object.values(entry))
+}
+for (const entry of exportedPaths) {
+  assert.equal(typeof entry, 'string')
+  assert.ok(files.has(entry.replace(/^\.\//, '')), `published package must include declared entry ${entry}`)
+}
+
+for (const name of Object.keys(packageJson.peerDependencies)) {
+  if (!name.startsWith('@deepseek-ai/')) continue
+  assert.equal(packageJson.dependencies?.[name], undefined, `${name} must not be a runtime dependency`)
+  assert.equal(packageJson.devDependencies?.[name], packageJson.peerDependencies[name], `${name} peer and dev ranges must match`)
+}
+assert.equal(packageJson.dependencies?.['@deepseek-ai/schemastery'], undefined)
+const rootLock = lockfile.packages?.['']
+assert.ok(rootLock, 'lockfile must have root metadata')
+assert.equal(lockfile.version, packageJson.version)
+assert.deepEqual(rootLock.devDependencies, packageJson.devDependencies)
+assert.deepEqual(rootLock.peerDependencies, packageJson.peerDependencies)
+assert.equal(rootLock.dependencies, undefined)
+assert.equal(existsSync(new URL('../lib/types/index.js', import.meta.url)), true)
+
+console.log(`✓ package manifest: ${packed.name}@${packed.version}, ${files.size} files`)