dsh-pighub 0.9.69 → 0.9.71

package/lib/client.js

@@ -131,6 +131,18 @@ window.__ModuleLoader__.load({
       '.pighub-themelist{max-height:0;opacity:0;overflow:hidden;transition:max-height .2s ease,opacity .2s ease,margin .2s ease;margin:0}',
       '.pighub-themelist.is-open{max-height:240px;opacity:1;margin:4px 0}',
       '.pighub-themerow{display:flex;align-items:center;justify-content:space-between;gap:6px;margin:3px 0}',
+      '.pighub-themebtn{flex:1;text-align:left;font-size:11px;padding:5px 9px;border-radius:8px;cursor:pointer;',
+      'border:1px solid color-mix(in oklab,var(--dsw-alias-border-secondary,#3a3a3a) 80%,transparent);',
+      'background:var(--dsw-alias-bg-secondary,#232323);color:var(--dsw-alias-label-primary,#e6e6e6);} ', 
+      '.pighub-themebtn:hover:not(:disabled){border-color:var(--dsw-alias-label-secondary,#7a7a7a)}',
+      '.pighub-themebtn.is-selected{border-color:#7fbf5a;background:color-mix(in oklab,#7fbf5a 18%,transparent);',
+      'color:#cfe8bd;font-weight:600;cursor:default}',
+      '.pighub-themebtn:disabled{opacity:1}',
+      '.pighub-themedel{font-size:11px;padding:4px 9px;border-radius:8px;cursor:pointer;color:#f0b7b7;',
+      'background:transparent;border:1px solid color-mix(in oklab,#7a3b3b 70%,transparent)}',
+      '.pighub-themedel:hover:not(:disabled){background:color-mix(in oklab,#7a3b3b 22%,transparent)}',
+      '.pighub-themedel:disabled{color:var(--dsw-alias-label-tertiary,#6b7280);border-color:transparent;',
+      'background:transparent;cursor:not-allowed;opacity:.55}',
       '.pighub-themedel{font-size:11px;padding:2px 8px;border-radius:999px;cursor:pointer;color:#f0b7b7;',
       'background:transparent;border:1px solid color-mix(in oklab,#7a3b3b 70%,transparent)}',
       '.pighub-themedel.is-disabled{color:var(--dsw-alias-text-tertiary,#6b7280);border-color:transparent;cursor:default}',
@@ -822,7 +834,11 @@ window.__ModuleLoader__.load({
     function Meadow(props) {
       const theme = (props && props.theme) || CLASSIC_THEME_FALLBACK;
       const geo = theme.geometry || {};
-      const G = themeRect(geo.grass, PEN_GRASS);
+      /* 草坪**强制使用标准尺寸**（用户口径 2026-11-14：「草坪要强制拉伸到标准尺寸」）：
+       * 主题只应该换「草地长什么样」，不该改草坪的占地范围——否则换了主题草坪会缩进/错位，
+       * 与围栏对不上。所以这里忽略 theme.geometry.grass，一律用 classic 的 PEN_GRASS；
+       * 主题若要自带草地贴图，就拉伸铺满这个标准矩形（见下面的 grassImage）。 */
+      const G = PEN_GRASS;
       const I = themeRect(geo.inner, PEN_INNER);
       const gw = G.x1 - G.x0;
       const gh = G.y1 - G.y0;
@@ -1743,24 +1759,28 @@ window.__ModuleLoader__.load({
                 }, themeMenuOpen ? '收起' : '更换…'),
               ),
               h('div', { className: 'pighub-themelist' + (themeMenuOpen ? ' is-open' : '') },
-                    ((data && data.themes) || [{ name: 'classic', title: 'classic（默认）' }]).map((item) =>
-                      h('div', { key: 'theme-row-' + item.name, className: 'pighub-themerow' },
+                    ((data && data.themes) || [{ name: 'classic', title: 'classic（默认）' }]).map((item) => {
+                      const selected = activeTheme.name === item.name;
+                      const builtin = item.name === 'classic';
+                      return h('div', { key: 'theme-row-' + item.name, className: 'pighub-themerow' },
+                        /* 三态：选中(is-selected + aria-pressed) / 可用 / 不可用 —— 用真按钮语义，不用 span 假装按钮 */
                         h('button', {
                           type: 'button',
-                          className: 'pighub-ghostbtn',
-                          'aria-pressed': activeTheme.name === item.name ? 'true' : 'false',
-                          onClick: () => STORE.setTheme(item.name),
-                        }, (activeTheme.name === item.name ? '✓ ' : '') + (item.title || item.name)),
-                        item.name === 'classic'
-                          ? h('span', { className: 'pighub-themedel is-disabled' }, '内置')
-                          : h('button', {
-                              type: 'button',
-                              className: 'pighub-themedel',
-                              title: '删除这个主题（当前主题会回落 classic）',
-                              onClick: () => STORE.removeTheme(item.name),
-                            }, '删除'),
-                      ),
-                    ),
+                          className: 'pighub-themebtn' + (selected ? ' is-selected' : ''),
+                          'aria-pressed': selected ? 'true' : 'false',
+                          disabled: selected,
+                          title: selected ? '当前正在使用' : '切换到「' + (item.title || item.name) + '」',
+                          onClick: () => { if (!selected) STORE.setTheme(item.name); },
+                        }, (selected ? '● ' : '○ ') + (item.title || item.name)),
+                        h('button', {
+                          type: 'button',
+                          className: 'pighub-themedel',
+                          disabled: builtin,
+                          title: builtin ? '内置主题不可删除' : '删除「' + (item.title || item.name) + '」',
+                          onClick: () => { if (!builtin) STORE.removeTheme(item.name); },
+                        }, builtin ? '内置' : '删除'),
+                      );
+                    }),
                   ),
               /* 「更换主题包」：用隐藏的 <input type=file accept=.zip> 唤起系统文件选择器（Electron 里就是原生对话框），
                * 选中的 zip 原样 POST 到 /pighub/theme-import；宿主校验并解压后**自动切到新主题**，这里只负责刷新快照。 */

package/lib/index.js

@@ -44,7 +44,7 @@ export const inject = ['tools'];
 import { startDesktopPet, stopDesktopPet, syncDesktopPet, desktopPetState, sayOnDesktop, reclaimStaleSessions } from './desktop-pet.js';
 
 const here = dirname(fileURLToPath(import.meta.url));
-const VERSION = '0.9.69';
+const VERSION = '0.9.71';
 /** 桌面桌宠的精灵边长（CSS px 基准，= manifest 里 sizeRatio 的中位数）。 */
 const DESKTOP_PET_SIZE = 96;
 /** 全局尺寸系数（用户口径 2026-11-13：「整体猪猪缩小到 75% 大小」）。三层一起乘。 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-pighub",
-  "version": "0.9.69",
+  "version": "0.9.71",
   "description": "猪猪库 PigHub 的 DeepSeek Harness 插件：侧边栏猪圈面板、每日一只猪猪、重复获得升星、可拖出的置顶桌宠，数据落在 ~/.PigHub。不内嵌任何上游图片。",
   "type": "module",
   "main": "./lib/index.js",

package/test/themes.test.mjs

@@ -31,5 +31,30 @@ check('normaliseTheme 对坏 geometry 逐字段回落 classic', () => {
   assert.deepEqual(t2.geometry.inner, [1, 2, 3, 4]);
 });
 
+// ---- 目录版准入（用户口径 2026-11-14：非法主题不进列表）----
+import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from 'node:fs';
+import { tmpdir } from 'node:os';
+import { join as pjoin } from 'node:path';
+import { validateThemeDir } from '../lib/themes.js';
+
+check('坏 JSON 的主题目录 → 判为非法（不进列表）', () => {
+  const dir = mkdtempSync(pjoin(tmpdir(), 'pgtheme-'));
+  writeFileSync(pjoin(dir, 'theme.json'), '{ not json');
+  const r = validateThemeDir(dir, 'x');
+  rmSync(dir, { recursive: true, force: true });
+  assert.equal(r.ok, false);
+  assert.equal(r.reason, 'theme_json_invalid');
+});
+
+check('合法主题目录 → 通过', () => {
+  const dir = mkdtempSync(pjoin(tmpdir(), 'pgtheme-'));
+  writeFileSync(pjoin(dir, 'theme.json'), JSON.stringify({ name: 'ok', geometry: { grass: [10, 20, 90, 95] } }));
+  writeFileSync(pjoin(dir, 'fence.png'), Buffer.from([137, 80, 78, 71]));
+  const r = validateThemeDir(dir, 'ok');
+  rmSync(dir, { recursive: true, force: true });
+  assert.equal(r.ok, true);
+  assert.equal(r.name, 'ok');
+});
+
 console.log('\n' + pass + ' PASS / ' + fail + ' FAIL  —  themes');
 process.exit(fail === 0 ? 0 : 1);