dsh-muv-table 0.2.1 → 0.2.3

package/lib/index.js

@@ -12,8 +12,46 @@ import { fileURLToPath } from 'node:url'
 const __dirname = path.dirname(fileURLToPath(import.meta.url))
 let PANEL_HTML = ''
 try { PANEL_HTML = fs.readFileSync(path.join(__dirname, 'panel.html'), 'utf8') } catch (_) {}
-const PRESETS_ROOT = path.join(os.homedir(), '.dsh', '.agent-presets')
-const TAVERN_PRESET_DIR = path.join(PRESETS_ROOT, 'tavern-lite')
+
+// ── DSH home 解析 ─────────────────────────────────────────
+// 与 @deepseek-ai/dsh-home-paths 的 resolveDshHome() 一致：
+// 优先级 = 显式配置 → $DSH_HOME（非空）→ ~/.dsh。
+// 用户预设目录 = <dshHome>/.agent-presets（酒馆插件也用同一份）。
+// 写死 ~/.dsh 会让 DSH_HOME 指向非默认位置的部署读不到预设。
+function expandHomePrefix(p) {
+  if (p === '~') return os.homedir()
+  if (p.startsWith('~/') || p.startsWith('~\\')) return path.join(os.homedir(), p.slice(2))
+  return p
+}
+function resolveDshHome() {
+  const env = process.env.DSH_HOME
+  if (typeof env === 'string' && env.trim().length > 0) return path.resolve(expandHomePrefix(env.trim()))
+  return path.join(os.homedir(), '.dsh')
+}
+
+// apply() 时按 DSH 实际 home 重新绑定
+let DSH_HOME = resolveDshHome()
+let PRESETS_ROOT = path.join(DSH_HOME, '.agent-presets')
+let TAVERN_PRESET_DIR = path.join(PRESETS_ROOT, 'tavern-lite')
+let SESSION_BINDINGS_FILE = path.join(PRESETS_ROOT, 'session-bindings.json')
+
+/**
+ * 绑定路径到 DSH 实际 home：优先用 DSH 的 dshHomePath 服务，拿不到再自行解析。
+ * @param {object} ctx - cordis 上下文
+ */
+function bindDshPaths(ctx) {
+  let home = ''
+  try {
+    const fn = ctx && typeof ctx.get === 'function' ? ctx.get('dshHomePath') : undefined
+    if (typeof fn === 'function') home = String(fn() || '')
+  } catch {}
+  if (!home) home = resolveDshHome()
+  DSH_HOME = home
+  PRESETS_ROOT = path.join(home, '.agent-presets')
+  TAVERN_PRESET_DIR = path.join(PRESETS_ROOT, 'tavern-lite')
+  SESSION_BINDINGS_FILE = path.join(PRESETS_ROOT, 'session-bindings.json')
+}
+
 const MUV_CARD_DIRS = ['E:/BaiduNetdiskDownload/EdgeDownload']
 
 /** Read a YAML/yml file with encoding detection (GBK → UTF-8 fallback). */
@@ -64,7 +102,7 @@ function scanAllPresetCards() {
       .filter(d => d.isDirectory())
       .map(d => path.join(PRESETS_ROOT, d.name))
     // Also scan the DSH root (presets like anchored-standard live there too)
-    for (const dir of [...dirs, path.join(os.homedir(), '.dsh')]) {
+    for (const dir of [...dirs, DSH_HOME]) {
       const ymlPath = path.join(dir, 'agent.cordis.yml')
       if (!fs.existsSync(ymlPath)) continue
       try {
@@ -81,7 +119,7 @@ function scanAllPresetCards() {
 /** Resolve preset dir for a session id via session-bindings.json */
 function presetDirForSession(sessionId) {
   try {
-    const bindPath = path.join(os.homedir(), '.dsh', '.agent-presets', 'session-bindings.json')
+    const bindPath = SESSION_BINDINGS_FILE
     if (sessionId && fs.existsSync(bindPath)) {
       const bind = JSON.parse(fs.readFileSync(bindPath, 'utf8'))
       const preset = bind[sessionId]
@@ -188,6 +226,8 @@ function readBody(req) {
 }
 
 export function apply(ctx) {
+  bindDshPaths(ctx)
+  console.log('[dsh-muv-table] DSH_HOME = ' + DSH_HOME + '  预设目录 = ' + PRESETS_ROOT)
   const routes = [
     {
       kind: 'exact',

package/lib/initvar-parser.js

@@ -1,101 +1,101 @@
-// MUV Initvar parser: converts YAML-like indented initvar text to nested objects.
-// Format: 2-space indentation, `键: 值` pairs. Supports nested objects and inline
-// lists (comma-separated values wrapped in [ ]).
-
-/**
- * Parse an initvar text block into a nested object.
- * @param {string} text - The initvar text (between <initvar> and </initvar>)
- * @returns {object} Parsed nested object
- */
-export function parseInitvar(text) {
-  const lines = text.split(/\r?\n/)
-  const root = {}
-  const stack = [{ obj: root, indent: -1 }]
-
-  for (const rawLine of lines) {
-    const line = rawLine.trimEnd()
-    if (line.trim() === '') continue
-
-    const indent = line.length - line.trimStart().length
-    const trimmed = line.trim()
-
-    // Pop stack until we find the right parent
-    while (stack.length > 1 && stack[stack.length - 1].indent >= indent) {
-      stack.pop()
-    }
-
-    const parent = stack[stack.length - 1].obj
-    const colonIdx = trimmed.indexOf(':')
-
-    if (colonIdx === -1) {
-      // Value-only line (continuation or list item)
-      continue
-    }
-
-    const key = trimmed.slice(0, colonIdx).trim()
-    const value = trimmed.slice(colonIdx + 1).trim()
-
-    if (value === '') {
-      // Nested object start
-      const newObj = {}
-      parent[key] = newObj
-      stack.push({ obj: newObj, indent })
-    } else {
-      // Leaf value
-      parent[key] = parseValue(value)
-    }
-  }
-
-  return root
-}
-
-/**
- * Parse a leaf value string to appropriate type.
- * @param {string} val
- * @returns {string|number|boolean}
- */
-function parseValue(val) {
-  // Empty string
-  if (val === '""' || val === "''") return ''
-  if (val === '{}') return '{}'
-
-  // Number
-  if (/^-?\d+(\.\d+)?$/.test(val)) {
-    return Number(val)
-  }
-
-  // Boolean
-  if (val === 'true') return true
-  if (val === 'false') return false
-
-  return val
-}
-
-/**
- * Serialize a nested object back to initvar text.
- * @param {object} obj
- * @param {number} [depth=0]
- * @returns {string}
- */
-export function serializeInitvar(obj, depth = 0) {
-  const indent = '  '.repeat(depth)
-  let result = ''
-
-  for (const [key, value] of Object.entries(obj)) {
-    if (value !== null && typeof value === 'object' && !Array.isArray(value)) {
-      result += `${indent}${key}:\n`
-      result += serializeInitvar(value, depth + 1)
-    } else {
-      result += `${indent}${key}: ${formatValue(value)}\n`
-    }
-  }
-
-  return result
-}
-
-function formatValue(val) {
-  if (val === null || val === undefined) return ''
-  if (typeof val === 'boolean') return val ? 'true' : 'false'
-  if (typeof val === 'number') return String(val)
-  return String(val)
+// MUV Initvar parser: converts YAML-like indented initvar text to nested objects.
+// Format: 2-space indentation, `键: 值` pairs. Supports nested objects and inline
+// lists (comma-separated values wrapped in [ ]).
+
+/**
+ * Parse an initvar text block into a nested object.
+ * @param {string} text - The initvar text (between <initvar> and </initvar>)
+ * @returns {object} Parsed nested object
+ */
+export function parseInitvar(text) {
+  const lines = text.split(/\r?\n/)
+  const root = {}
+  const stack = [{ obj: root, indent: -1 }]
+
+  for (const rawLine of lines) {
+    const line = rawLine.trimEnd()
+    if (line.trim() === '') continue
+
+    const indent = line.length - line.trimStart().length
+    const trimmed = line.trim()
+
+    // Pop stack until we find the right parent
+    while (stack.length > 1 && stack[stack.length - 1].indent >= indent) {
+      stack.pop()
+    }
+
+    const parent = stack[stack.length - 1].obj
+    const colonIdx = trimmed.indexOf(':')
+
+    if (colonIdx === -1) {
+      // Value-only line (continuation or list item)
+      continue
+    }
+
+    const key = trimmed.slice(0, colonIdx).trim()
+    const value = trimmed.slice(colonIdx + 1).trim()
+
+    if (value === '') {
+      // Nested object start
+      const newObj = {}
+      parent[key] = newObj
+      stack.push({ obj: newObj, indent })
+    } else {
+      // Leaf value
+      parent[key] = parseValue(value)
+    }
+  }
+
+  return root
+}
+
+/**
+ * Parse a leaf value string to appropriate type.
+ * @param {string} val
+ * @returns {string|number|boolean}
+ */
+function parseValue(val) {
+  // Empty string
+  if (val === '""' || val === "''") return ''
+  if (val === '{}') return '{}'
+
+  // Number
+  if (/^-?\d+(\.\d+)?$/.test(val)) {
+    return Number(val)
+  }
+
+  // Boolean
+  if (val === 'true') return true
+  if (val === 'false') return false
+
+  return val
+}
+
+/**
+ * Serialize a nested object back to initvar text.
+ * @param {object} obj
+ * @param {number} [depth=0]
+ * @returns {string}
+ */
+export function serializeInitvar(obj, depth = 0) {
+  const indent = '  '.repeat(depth)
+  let result = ''
+
+  for (const [key, value] of Object.entries(obj)) {
+    if (value !== null && typeof value === 'object' && !Array.isArray(value)) {
+      result += `${indent}${key}:\n`
+      result += serializeInitvar(value, depth + 1)
+    } else {
+      result += `${indent}${key}: ${formatValue(value)}\n`
+    }
+  }
+
+  return result
+}
+
+function formatValue(val) {
+  if (val === null || val === undefined) return ''
+  if (typeof val === 'boolean') return val ? 'true' : 'false'
+  if (typeof val === 'number') return String(val)
+  return String(val)
 }

package/lib/muv-parser.js

@@ -1,122 +1,122 @@
-// MUV Schema Parser: extracts variable structure from character card JSON.
-// Uses initvar data to infer the schema tree (more reliable than regex-parsing Zod).
-
-import { parseInitvar } from './initvar-parser.js'
-
-/**
- * Parse a MUV character card JSON and extract schema + variable data.
- * @param {object} cardJson - The full character card JSON
- * @returns {{ name: string, schemas: object[], initvarData: object, zodSource: string }}
- */
-export function parseMuvCard(cardJson) {
-  const name = cardJson?.data?.name || cardJson?.name || 'Unnamed'
-  const extensions = cardJson?.data?.extensions
-  const tavernHelper = extensions?.tavern_helper
-
-  // Extract Zod schema source (for reference)
-  const zodScript = tavernHelper?.scripts?.find(s => s.name === 'zod')
-  const zodSource = zodScript?.content || ''
-
-  // Extract initvar blocks from alternate_greetings
-  const greetings = cardJson?.data?.alternate_greetings || []
-  const initvarBlocks = []
-
-  for (const greeting of greetings) {
-    if (typeof greeting !== 'string') continue
-    const match = greeting.match(/<initvar>([\s\S]*?)<\/initvar>/i)
-    if (match) {
-      initvarBlocks.push({
-        raw: match[1].trim(),
-        parsed: parseInitvar(match[1])
-      })
-    }
-  }
-
-  // Use the first initvar block as default data
-  const initvarData = initvarBlocks.length > 0 ? initvarBlocks[0].parsed : {}
-
-  // Infer schema from initvar data
-  const schemas = inferSchemaFromData(initvarData)
-
-  return {
-    name,
-    schemas,
-    initvarData,
-    initvarBlocks: initvarBlocks.map(b => b.raw),
-    zodSource
-  }
-}
-
-/**
- * Infer a schema tree from a nested data object.
- * @param {object} data
- * @param {string} [name='']
- * @returns {object[]}
- */
-function inferSchemaFromData(data, name = '') {
-  if (!data || typeof data !== 'object') return []
-
-  const fields = []
-  for (const [key, value] of Object.entries(data)) {
-    if (value !== null && typeof value === 'object' && !Array.isArray(value)) {
-      // Nested object
-      const children = inferSchemaFromData(value, key)
-      if (children.length > 0) {
-        fields.push({
-          name: key,
-          type: 'object',
-          defaultValue: '{}',
-          description: '',
-          children
-        })
-      }
-    } else if (typeof value === 'number') {
-      fields.push({
-        name: key,
-        type: 'number',
-        defaultValue: String(value),
-        description: '',
-        children: []
-      })
-    } else {
-      fields.push({
-        name: key,
-        type: 'string',
-        defaultValue: String(value ?? ''),
-        description: '',
-        children: []
-      })
-    }
-  }
-  return fields
-}
-
-/**
- * Walk the schema tree and extract values from data into flattened rows.
- * @param {object[]} schemas
- * @param {object} data
- * @param {string} [prefix='']
- * @returns {object[]}
- */
-export function flattenSchemaData(schemas, data, prefix = '') {
-  const rows = []
-  for (const field of schemas) {
-    const path = prefix ? `${prefix}.${field.name}` : field.name
-    const value = data?.[field.name]
-
-    if (field.type === 'object' && field.children && field.children.length > 0) {
-      rows.push({ path, key: field.name, type: 'object', value: '(object)', isContainer: true, depth: prefix.split('.').filter(Boolean).length })
-      rows.push(...flattenSchemaData(field.children, value || {}, path))
-    } else {
-      rows.push({
-        path,
-        key: field.name,
-        type: field.type,
-        value: value ?? field.defaultValue ?? '',
-        isContainer: false,
-        depth: prefix.split('.').filter(Boolean).length
-      })
-    }
-  }
-  return rows
+// MUV Schema Parser: extracts variable structure from character card JSON.
+// Uses initvar data to infer the schema tree (more reliable than regex-parsing Zod).
+
+import { parseInitvar } from './initvar-parser.js'
+
+/**
+ * Parse a MUV character card JSON and extract schema + variable data.
+ * @param {object} cardJson - The full character card JSON
+ * @returns {{ name: string, schemas: object[], initvarData: object, zodSource: string }}
+ */
+export function parseMuvCard(cardJson) {
+  const name = cardJson?.data?.name || cardJson?.name || 'Unnamed'
+  const extensions = cardJson?.data?.extensions
+  const tavernHelper = extensions?.tavern_helper
+
+  // Extract Zod schema source (for reference)
+  const zodScript = tavernHelper?.scripts?.find(s => s.name === 'zod')
+  const zodSource = zodScript?.content || ''
+
+  // Extract initvar blocks from alternate_greetings
+  const greetings = cardJson?.data?.alternate_greetings || []
+  const initvarBlocks = []
+
+  for (const greeting of greetings) {
+    if (typeof greeting !== 'string') continue
+    const match = greeting.match(/<initvar>([\s\S]*?)<\/initvar>/i)
+    if (match) {
+      initvarBlocks.push({
+        raw: match[1].trim(),
+        parsed: parseInitvar(match[1])
+      })
+    }
+  }
+
+  // Use the first initvar block as default data
+  const initvarData = initvarBlocks.length > 0 ? initvarBlocks[0].parsed : {}
+
+  // Infer schema from initvar data
+  const schemas = inferSchemaFromData(initvarData)
+
+  return {
+    name,
+    schemas,
+    initvarData,
+    initvarBlocks: initvarBlocks.map(b => b.raw),
+    zodSource
+  }
+}
+
+/**
+ * Infer a schema tree from a nested data object.
+ * @param {object} data
+ * @param {string} [name='']
+ * @returns {object[]}
+ */
+function inferSchemaFromData(data, name = '') {
+  if (!data || typeof data !== 'object') return []
+
+  const fields = []
+  for (const [key, value] of Object.entries(data)) {
+    if (value !== null && typeof value === 'object' && !Array.isArray(value)) {
+      // Nested object
+      const children = inferSchemaFromData(value, key)
+      if (children.length > 0) {
+        fields.push({
+          name: key,
+          type: 'object',
+          defaultValue: '{}',
+          description: '',
+          children
+        })
+      }
+    } else if (typeof value === 'number') {
+      fields.push({
+        name: key,
+        type: 'number',
+        defaultValue: String(value),
+        description: '',
+        children: []
+      })
+    } else {
+      fields.push({
+        name: key,
+        type: 'string',
+        defaultValue: String(value ?? ''),
+        description: '',
+        children: []
+      })
+    }
+  }
+  return fields
+}
+
+/**
+ * Walk the schema tree and extract values from data into flattened rows.
+ * @param {object[]} schemas
+ * @param {object} data
+ * @param {string} [prefix='']
+ * @returns {object[]}
+ */
+export function flattenSchemaData(schemas, data, prefix = '') {
+  const rows = []
+  for (const field of schemas) {
+    const path = prefix ? `${prefix}.${field.name}` : field.name
+    const value = data?.[field.name]
+
+    if (field.type === 'object' && field.children && field.children.length > 0) {
+      rows.push({ path, key: field.name, type: 'object', value: '(object)', isContainer: true, depth: prefix.split('.').filter(Boolean).length })
+      rows.push(...flattenSchemaData(field.children, value || {}, path))
+    } else {
+      rows.push({
+        path,
+        key: field.name,
+        type: field.type,
+        value: value ?? field.defaultValue ?? '',
+        isContainer: false,
+        depth: prefix.split('.').filter(Boolean).length
+      })
+    }
+  }
+  return rows
 }

package/package.json

@@ -1,21 +1,22 @@
-{
-  "name": "dsh-muv-table",
-  "version": "0.2.1",
-  "description": "MUV 变量表格编辑器 —— 树形变量面板、宏测试浮窗（random/pick/roll）、骰子快捷栏、pick 缓存管理",
-  "type": "module",
-  "main": "lib/index.js",
-  "exports": {
-    ".": "./lib/index.js",
-    "./client": "./lib/client.js",
-    "./package.json": "./package.json"
-  },
-  "files": ["lib", "cordis.patch.yml", "CHANGELOG.md"],
-  "keywords": ["dsh", "dsh-plugin", "deepseek-harness", "muv", "magvarupdate", "tavern", "variable-table"],
-  "license": "PolyForm-Noncommercial-Copyleft-1.0.0",
-  "dsh": {
-    "bundle": { "patch": "./cordis.patch.yml" },
-    "client": { "platform": "web" }
-  },
-  "repository": {"type": "git", "url": "git+https://github.com/chen731215-dev/dsh-muv-table.git"},
-  "engines": { "node": ">=20" }
+{
+  "name": "dsh-muv-table",
+  "version": "0.2.3",
+  "description": "MUV 变量表格编辑器 —— 树形变量面板、宏测试浮窗（random/pick/roll）、骰子快捷栏、pick 缓存管理",
+  "type": "module",
+  "main": "lib/index.js",
+  "exports": {
+    ".": "./lib/index.js",
+    "./client": "./lib/client.js",
+    "./lib/*": "./lib/*",
+    "./package.json": "./package.json"
+  },
+  "files": ["lib", "cordis.patch.yml", "CHANGELOG.md"],
+  "keywords": ["dsh", "dsh-plugin", "deepseek-harness", "muv", "magvarupdate", "tavern", "variable-table"],
+  "license": "PolyForm-Noncommercial-Copyleft-1.0.0",
+  "dsh": {
+    "bundle": { "patch": "./cordis.patch.yml" },
+    "client": { "platform": "web" }
+  },
+  "repository": {"type": "git", "url": "git+https://github.com/chen731215-dev/dsh-muv-table.git"},
+  "engines": { "node": ">=20" }
 }