dsh-maoying 0.1.7 → 0.1.9

package/index.mjs

@@ -53,6 +53,7 @@
 
 import { closeSync, copyFileSync, existsSync, mkdirSync, openSync, readdirSync, readFileSync, readSync, rmSync, writeFileSync } from 'node:fs'
 import { createHash } from 'node:crypto'
+import { pathToFileURL } from 'node:url'
 import { readFile } from 'node:fs/promises'
 import { createRequire } from 'node:module'
 import os from 'node:os'
@@ -459,6 +460,24 @@ export function parsePresetRows(yaml, agentCordisV2Text) {
  * reason 区分 'yaml-unavailable' / 'compose-failed'），由调用方走既有的「只落
  * 文件、跳过声明行并 warn、下次自愈」分支。
  */
+/**
+ * preset 声明行里的本地插件名换成 file:// 绝对地址。相对名按「声明方 baseUrl」
+ * 解析——home 托管块的声明基座在宿主 asar 内部，'./x.mjs' 在桌面应用里永远
+ * 落空（注册表审计报 never started，0.1.8 host-debug 实测坐实）。Node ESM 对
+ * file:// URL 是合法模块说明符，指向 <home>/.agent-presets/maoying/ 安装副本
+ * （真实文件系统，任何进程可读）。
+ */
+function absolutizeLocalPluginNames(rows, presetDir) {
+  for (const row of rows ?? []) {
+    for (const p of row?.config?.plugins ?? []) {
+      if (typeof p?.name === 'string' && p.name.startsWith('./')) {
+        p.name = pathToFileURL(path.join(presetDir, p.name.slice(2))).href
+      }
+    }
+  }
+  return rows
+}
+
 export function composeManagedRows(home, logger = console) {
   const hostVersion = readHostVersion(home)
   const useV2 = hostVersion !== null && hostRejectsInlineDelegation(hostVersion)
@@ -466,16 +485,17 @@ export function composeManagedRows(home, logger = console) {
   const yaml = loadYamlLib(home)
   if (!yaml) return { shape, rows: null, hostVersion, yaml: null, reason: 'yaml-unavailable' }
   try {
+    const installedDir = path.join(home, '.agent-presets', PRESET_ID)
     if (useV2) {
       const text = readFileSync(path.join(PLUGIN_ROOT, 'presets', PRESET_ID, AGENT_CORDIS_V2_FILE), 'utf8')
-      return { shape, rows: parsePresetRows(yaml, text), hostVersion, yaml, reason: null }
+      return { shape, rows: absolutizeLocalPluginNames(parsePresetRows(yaml, text), installedDir), hostVersion, yaml, reason: null }
     }
     const sourceDir = path.join(PLUGIN_ROOT, 'presets', PRESET_ID)
     const meta = parsePresetMeta(yaml, readFileSync(path.join(sourceDir, 'preset.yml'), 'utf8'))
     const plugins = parseAgentPlugins(yaml, readFileSync(path.join(sourceDir, 'agent.cordis.yml'), 'utf8'))
     // rows 统一为 insert 列表（stringifyManagedBlock 据此渲染同一 - insert: 结构；
     // 与 v1 历史产物逐字节同形，老 home 升级零抖动）
-    return { shape, rows: buildPresetRow({ meta, plugins }).insert, hostVersion, yaml, reason: null }
+    return { shape, rows: absolutizeLocalPluginNames(buildPresetRow({ meta, plugins }).insert, installedDir), hostVersion, yaml, reason: null }
   } catch (err) {
     logger.warn?.(`maoying-installer: 组合源解析失败（${shape} 形态，已跳过声明行）: ${err?.message ?? err}`)
     return { shape, rows: null, hostVersion, yaml, reason: 'compose-failed' }
@@ -835,29 +855,21 @@ export async function registerCreatorRoutes(ctx) {
             } catch { return '[unserializable]' }
           }
           const registryDump = {}
-          for (const svcName of ['agent-preset-registry', 'agentPresets', 'presets']) {
-            try {
-              const svc = typeof ctx.get === 'function' ? ctx.get(svcName) : null
-              if (!svc) continue
-              const entry = { __type: typeof svc, __keys: Object.keys(svc).slice(0, 60) }
-              for (const m of ['list', 'read', 'all', 'definitions', 'inventory', 'entries']) {
-                if (typeof svc[m] === 'function') {
-                  try {
-                    const r = svc[m]()
-                    entry[m] = r && typeof r.then === 'function' ? '[async]' : jsonSafe(r)
-                  } catch (e) { entry[m] = `throw: ${e?.message ?? e}` }
-                }
-              }
-              registryDump[svcName] = entry
-            } catch { /* 逐个吞错 */ }
-          }
+          try {
+            const svc = typeof ctx.get === 'function' ? ctx.get('agentPresets') : null
+            if (svc && typeof svc.list === 'function') {
+              // list() 返回每张 preset 的 {id,name,order,broken}——broken 即
+              // 面板上显示的逐行激活诊断（注册表自带审计，一行一条不可用原因）。
+              const rows = await svc.list()
+              registryDump.presets = jsonSafe(rows)
+            }
+          } catch (e) { registryDump.error = String(e?.message ?? e) }
           json(res, 200, {
             ok: true,
             hostVersion: dbg.version,
             trace: dbg.trace,
             shape,
             registry: registryDump,
-            ctxKeys: (() => { try { return Object.keys(ctx).slice(0, 80) } catch { return [] } })(),
             runtime: {
               argv: process.argv,
               execPath: process.execPath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-maoying",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "毛颖 — DSH 网文创作辅助插件：主编 + 五帮手编排（大纲/写手/审校/设定/考据），novel/ 结构化文件为数据库",
   "type": "module",
   "license": "MIT",

package/presets/maoying/agent.cordis.v2.yml

@@ -393,6 +393,8 @@
             name: "@deepseek-ai/dsh-tool-ask-user"
           - id: tool-todo
             name: "@deepseek-ai/dsh-tool-todo"
+            config:
+              allowParallelInProgress: true
     # ── 角色 preset：设定管理员（continuable）─────────────────────────────────
     # persona 逐字复制 v1 delegation-lore；工具面同大纲师。
     - id: preset-maoying-lore
@@ -491,3 +493,5 @@
             name: "@deepseek-ai/dsh-tool-ask-user"
           - id: tool-todo
             name: "@deepseek-ai/dsh-tool-todo"
+            config:
+              allowParallelInProgress: true