dsh-custom-mode 1.9.2 → 1.9.3

package/assistants.mjs

@@ -30,6 +30,7 @@ import { dirname, join } from 'node:path'
 import { dshHome, PRESET_DIR } from './paths.mjs'
 import { readPresetMeta, writePresetMeta } from './meta.mjs'
 import { writeAtomic } from './atomic.mjs'
+import { unresolvableRows } from './composition.mjs'
 import { seedPreset, seedPresetWithLog } from './seed.mjs'
 
 /**
@@ -303,6 +304,25 @@ export function seedOnActivation({ root, templateDir, composition, log = console
     for (const error of result.errors) log(`custom-mode: 补全 ${dir} 失败 —— ${error}`)
   }
 
+  // 启动告警：组成文件里有本机这条线解析不到的行时，平台会把整个预设判为 broken 并从选择器里**静默丢弃**。
+  // 以前这件事只在设置页可见 —— 用户从不打开设置页就完全无感知（外部评审实测）。这里至少在宿主日志里喊一声。
+  for (const dir of [...existing, join(root, LEGACY_ID)]) {
+    try {
+      const file = join(dir, 'agent.cordis.yml')
+      if (existsSync(file) === false) continue
+      const bad = unresolvableRows(readFileSync(file, 'utf8'))
+      if (bad.length > 0) {
+        log(
+          `custom-mode: ${dir} 的组成文件里有 ${String(bad.length)} 行在这条 dsh 线上无法解析` +
+            `（${bad.map((row) => row.id).join(', ')}）—— 平台会把整个模式从新建会话的选择器里丢弃。` +
+            '打开 设置 → 自定义模式 并点「按本线修复」。',
+        )
+      }
+    } catch {
+      /* 启动告警失败不能影响激活 */
+    }
+  }
+
   if (isSeeded(root)) return { created: false, repaired, adopted: false }
   if (existing.length > 0) {
     markSeeded(root)

package/client.js

@@ -293,15 +293,15 @@ try {
         "msg.imported": "Imported into the editor (not saved yet) — review it, then click Save.",
         "msg.importFailed": "Import failed",
         "api.badDirection": "Unknown reorder direction: {direction}",
-        "api.unknownAssistant": "No assistant 「{id}」: this page only manages the assistants it created (a directory with prompt.md whose composition injects the identity through prompt-reader.mjs).",
-        "api.alreadyFirst": "「{name}」 is already first.",
-        "api.alreadyLast": "「{name}」 is already last.",
+        "api.unknownAssistant": "No assistant {id}: this page only manages the assistants it created (a directory with prompt.md whose composition injects the identity through prompt-reader.mjs).",
+        "api.alreadyFirst": "{name} is already first.",
+        "api.alreadyLast": "{name} is already last.",
         "api.badVariableName": "{variable} is not a valid variable reference: names may use lower-case letters, digits and underscores, and must start with a letter. For a literal brace, use a single opening brace or an unclosed double brace.",
         "api.unknownVariable": "{variable} is not a registered variable — rendering would fail every request in this mode. Available: {known}.",
         "assistant.short": "Each assistant is its own mode: its own system prompt, base mode and plugin switches.",
         "name.short": "Renaming only changes what is displayed — not the internal id or existing sessions.",
         "mode.short": "The base decides the row set and tool abilities; the persona row is always replaced by this mode.",
-        "mode.pendingRows": "Base changed to 「{mode}」: the row list below is recomputed from the new base when you save.",
+        "mode.pendingRows": "Base changed to {mode}: the row list below is recomputed from the new base when you save.",
         "rows.short": "Control which plugins this mode mounts, row by row; untouched rows keep the shipped default.",
         "prompt.short": "Saving this text makes it the system prompt of this mode, and it takes effect on the next step.",
         "aria.expandHint": "Show the full explanation",
@@ -323,9 +323,9 @@ try {
         "meta.version": "Plugin version",
         "meta.versionHint": "Installing without a pinned version is subject to pnpm’s release cooldown (24 h by default) and can land on an older release. To change version, reinstall with the pinned command from the README and restart DSH.",
         "api.saved": "Saved ({name}, base mode {mode}). A new session picks it up; the current one keeps its configuration.",
-        "api.created": "Created 「{name}」. You can write its system prompt now.",
-        "api.duplicated": "Copied from 「{from}」. The two are independent from now on.",
-        "api.deleted": "Deleted 「{name}」. Sessions already using it keep running; it no longer appears for new sessions.",
+        "api.created": "Created {name}. You can write its system prompt now.",
+        "api.duplicated": "Copied from {from}. The two are independent from now on.",
+        "api.deleted": "Deleted {name}. Sessions already using it keep running; it no longer appears for new sessions.",
         "api.reordered": "Order saved: the new-session mode picker follows it.",
         "api.nameRequired": "Give the new assistant a name first.",
         "api.nameTooLong": "That name is too long (limit {max} characters).",
@@ -347,9 +347,9 @@ try {
         "warn.toolOff": "The \"custom_prompt tool\" row is off: the agent cannot change the prompt from inside a session, only this page can.",
         "warn.noDescription": "No description: the new-session mode picker will show it as \"no description yet\".",
         "warn.approvalGateMissing": "The approval gate is off: this DSH build has no tools/pre-execute event, so in-session prompt rewrites do not ask for approval. See the details.",
-        "warn.unresolvableRows": "Some rows cannot be resolved on this DSH line: the platform marks the whole mode broken and **silently drops it** from the new-session picker. Click 「Fix for this line」 — it only turns those rows off and leaves your other choices alone.",
+        "warn.unresolvableRows": "Some rows cannot be resolved on this DSH line: the platform marks the whole mode broken and silently drops it from the new-session picker. Click Fix for this line — it only turns those rows off and leaves your other choices alone.",
         "warn.approvalGateMissing.label": "Approval gate is off",
-        "warn.approvalGateMissing.hint": "This DSH build has no tools/pre-execute event, so in-session prompt rewrites do NOT ask for approval. The settings page is unaffected; upgrade DSH or turn the 「custom_prompt tool」 row off to restore the gate.",
+        "warn.approvalGateMissing.hint": "This DSH build has no tools/pre-execute event, so in-session prompt rewrites do NOT ask for approval. The settings page is unaffected; upgrade DSH or turn the custom_prompt tool row off to restore the gate.",
         "warn.noName": "No name: the mode picker will show the directory id (e.g. custom).",
         "history.label": "Change history",
         "history.pick": "Pick a version to load…",

package/composition.mjs

@@ -397,14 +397,17 @@ export function collectRows(text) {
  * @param {boolean} nested - whether this call rewrites a group's contents.
  * @returns {string} the rewritten level.
  */
-function applyLevel(text, topLevel, overrides, nested) {
+function applyLevel(text, topLevel, overrides, nested, replacePersona = true) {
   const { lead, segments } = splitSegments(text, topLevel)
   if (segments.length === 0) return text
   const rendered = segments.map((segment) => {
     // The persona row is always replaced by this feature's own reader row: the
     // shipped one is a static-string persona whose text cannot be edited, so
     // keeping it would silently disable the editable prompt.
-    if (!nested && segment.id === 'persona') {
+    // `replacePersona` 只有**重新渲染**时才为真：那时整段 persona 换成我们的读取器行是对的。
+    // 但"按本线修复"是**就地**手术，它必须连 persona 段里的注释都原样保留 ——
+    // 之前这里无条件替换，导致每次修复都会丢注释 / 或多复制一行身份注释（外部评审实测）。
+    if (!nested && segment.id === 'persona' && replacePersona === true) {
       return setDisabled(PERSONA_ROW, overrides.get('persona'))
     }
     let body = segment.text
@@ -590,8 +593,8 @@ export function disableRowsInPlace(text, ids) {
   if (wanted.length === 0) return text
   // `applyLevel` 把 Map 的值直接交给 `setDisabled(...)`，所以值是**关闭**布尔（true = 关闭）。
   const off = new Map(wanted.map((id) => [id, true]))
-  const top = applyLevel(text, true, off, false)
-  return applyLevel(top, false, off, false)
+  const top = applyLevel(text, true, off, false, false)
+  return applyLevel(top, false, off, false, false)
 }
 
 export function unresolvableRows(text) {

package/index.mjs

@@ -161,7 +161,7 @@ export function checkPromptText(text) {
       return {
         ok: false,
         code: 'unknownVariable',
-        params: { variable: '{{' + variable + '}}', known: KNOWN_VARIABLES.map((item) => '{{' + item + '}}').join('、') },
+        params: { variable: '{{' + variable + '}}', known: KNOWN_VARIABLES.map((item) => '{{' + item + '}}').join(', ') },
         error:
           '保存被拒绝：{{' +
           variable +
@@ -372,8 +372,12 @@ export function saveState(rows, input) {
   if (name.length > MAX_NAME) {
     return { ok: false, code: 'nameTooLong', params: { max: MAX_NAME }, error: '保存被拒绝：模式名称过长（上限 ' + String(MAX_NAME) + ' 个字符）。' }
   }
+  // 请求里**没带** description 时保留原值：API 调用方只改提示词，不该顺手把描述清空（外部评审实测）。
+  const meta = readPresetMeta(directory)
   const rawDescription =
-    input !== null && typeof input === 'object' && typeof input.description === 'string' ? input.description : ''
+    input !== null && typeof input === 'object' && typeof input.description === 'string'
+      ? input.description
+      : (typeof meta.description === 'string' ? meta.description : '')
   const description = rawDescription.replace(/\r?\n/g, ' ').trim()
   if (description.length > MAX_DESCRIPTION) {
     return { ok: false, code: 'descriptionTooLong', params: { max: MAX_DESCRIPTION }, error: '保存被拒绝：模式描述过长（上限 ' + String(MAX_DESCRIPTION) + ' 个字符）。' }

package/locales.mjs

@@ -268,15 +268,15 @@ export const en = {
   'msg.imported': 'Imported into the editor (not saved yet) — review it, then click Save.',
   'msg.importFailed': 'Import failed',
   'api.badDirection': 'Unknown reorder direction: {direction}',
-  'api.unknownAssistant': 'No assistant 「{id}」: this page only manages the assistants it created (a directory with prompt.md whose composition injects the identity through prompt-reader.mjs).',
-  'api.alreadyFirst': '「{name}」 is already first.',
-  'api.alreadyLast': '「{name}」 is already last.',
+  'api.unknownAssistant': 'No assistant {id}: this page only manages the assistants it created (a directory with prompt.md whose composition injects the identity through prompt-reader.mjs).',
+  'api.alreadyFirst': '{name} is already first.',
+  'api.alreadyLast': '{name} is already last.',
   'api.badVariableName': '{variable} is not a valid variable reference: names may use lower-case letters, digits and underscores, and must start with a letter. For a literal brace, use a single opening brace or an unclosed double brace.',
   'api.unknownVariable': '{variable} is not a registered variable — rendering would fail every request in this mode. Available: {known}.',
   'assistant.short': 'Each assistant is its own mode: its own system prompt, base mode and plugin switches.',
   'name.short': 'Renaming only changes what is displayed — not the internal id or existing sessions.',
   'mode.short': 'The base decides the row set and tool abilities; the persona row is always replaced by this mode.',
-  'mode.pendingRows': 'Base changed to 「{mode}」: the row list below is recomputed from the new base when you save.',
+  'mode.pendingRows': 'Base changed to {mode}: the row list below is recomputed from the new base when you save.',
   'rows.short': 'Control which plugins this mode mounts, row by row; untouched rows keep the shipped default.',
   'prompt.short': 'Saving this text makes it the system prompt of this mode, and it takes effect on the next step.',
   'aria.expandHint': 'Show the full explanation',
@@ -298,9 +298,9 @@ export const en = {
   'meta.version': 'Plugin version',
   'meta.versionHint': 'Installing without a pinned version is subject to pnpm’s release cooldown (24 h by default) and can land on an older release. To change version, reinstall with the pinned command from the README and restart DSH.',
   'api.saved': 'Saved ({name}, base mode {mode}). A new session picks it up; the current one keeps its configuration.',
-  'api.created': 'Created 「{name}」. You can write its system prompt now.',
-  'api.duplicated': 'Copied from 「{from}」. The two are independent from now on.',
-  'api.deleted': 'Deleted 「{name}」. Sessions already using it keep running; it no longer appears for new sessions.',
+  'api.created': 'Created {name}. You can write its system prompt now.',
+  'api.duplicated': 'Copied from {from}. The two are independent from now on.',
+  'api.deleted': 'Deleted {name}. Sessions already using it keep running; it no longer appears for new sessions.',
   'api.reordered': 'Order saved: the new-session mode picker follows it.',
   'api.nameRequired': 'Give the new assistant a name first.',
   'api.nameTooLong': 'That name is too long (limit {max} characters).',
@@ -322,9 +322,9 @@ export const en = {
   'warn.toolOff': 'The "custom_prompt tool" row is off: the agent cannot change the prompt from inside a session, only this page can.',
   'warn.noDescription': 'No description: the new-session mode picker will show it as "no description yet".',
   'warn.approvalGateMissing': 'The approval gate is off: this DSH build has no tools/pre-execute event, so in-session prompt rewrites do not ask for approval. See the details.',
-  'warn.unresolvableRows': 'Some rows cannot be resolved on this DSH line: the platform marks the whole mode broken and **silently drops it** from the new-session picker. Click 「Fix for this line」 — it only turns those rows off and leaves your other choices alone.',
+  'warn.unresolvableRows': 'Some rows cannot be resolved on this DSH line: the platform marks the whole mode broken and silently drops it from the new-session picker. Click Fix for this line — it only turns those rows off and leaves your other choices alone.',
   'warn.approvalGateMissing.label': 'Approval gate is off',
-  'warn.approvalGateMissing.hint': 'This DSH build has no tools/pre-execute event, so in-session prompt rewrites do NOT ask for approval. The settings page is unaffected; upgrade DSH or turn the 「custom_prompt tool」 row off to restore the gate.',
+  'warn.approvalGateMissing.hint': 'This DSH build has no tools/pre-execute event, so in-session prompt rewrites do NOT ask for approval. The settings page is unaffected; upgrade DSH or turn the custom_prompt tool row off to restore the gate.',
   'warn.noName': 'No name: the mode picker will show the directory id (e.g. custom).',
   'history.label': 'Change history',
   'history.pick': 'Pick a version to load…',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-custom-mode",
-  "version": "1.9.2",
+  "version": "1.9.3",
   "description": "Custom modes and custom prompts for DeepSeek Harness (dsh): edit a mode's system prompt on the settings page (it takes effect on the next model step), choose its base mode, switch plugins row by row, and keep several assistants side by side.",
   "license": "MIT",
   "type": "module",
@@ -65,7 +65,7 @@
   },
   "publishConfig": {
     "access": "public",
-    "tag": "alpha"
+    "tag": "latest"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/dsh": {

package/seed.mjs

@@ -21,7 +21,7 @@
  *  3. **Idempotent.** A second activation writes nothing and changes nothing.
  */
 
-import { copyFileSync, existsSync, mkdirSync } from 'node:fs'
+import { existsSync, mkdirSync, readFileSync } from 'node:fs'
 import { renderComposition } from './composition.mjs'
 import { writeAtomic } from './atomic.mjs'
 import { dirname, join } from 'node:path'
@@ -91,8 +91,19 @@ export function starterComposition(options = {}) {
  * @param {{composition?: string|null}} [options] - a rendered composition to write instead of copying
  *   `agent.cordis.yml`; see {@link starterComposition}.
  */
+/**
+ * 我们自己的**代码**模块（相对于"用户数据"）。
+ *
+ * 这两个文件是随助手目录一起分发的**代码**，不是用户内容：老版本创建的助手会一直留着旧副本，
+ * 于是 1.0.x / 1.1.x 首装的用户即使把插件升到最新，会话内改写提示词的**审批闸门仍然是缺的** ——
+ * 外部评审实测到了这一点（P1 安全）。所以它们在升级时**刷新**。
+ * `prompt.md` / `preset.yml` / `agent.cordis.yml` 是用户数据（提示词、开关、名字），保持"只补不缺"。
+ */
+const REFRESHABLE_MODULES = ['prompt-reader.mjs', 'prompt-tool.mjs']
+
 export function seedPreset(presetDir, sourceDir = packagedPresetDir(), options = {}) {
   const created = []
+  const refreshed = []
   const kept = []
   const errors = []
 
@@ -111,7 +122,22 @@ export function seedPreset(presetDir, sourceDir = packagedPresetDir(), options =
 
   for (const name of PRESET_FILES) {
     const target = join(presetDir, name)
+    const source = join(sourceDir, name)
     if (existsSync(target)) {
+      // 代码模块：内容与包内不一致就升级（用原子写，带 Windows 重试）。
+      if (REFRESHABLE_MODULES.includes(name) && existsSync(source)) {
+        try {
+          const shipped = readFileSync(source, 'utf8')
+          if (readFileSync(target, 'utf8') !== shipped) {
+            writeAtomic(target, shipped)
+            refreshed.push(name)
+            continue
+          }
+        } catch (error) {
+          errors.push(`刷新 ${name} 失败: ${describe(error)}`)
+          continue
+        }
+      }
       kept.push(name)
       continue
     }
@@ -126,19 +152,19 @@ export function seedPreset(presetDir, sourceDir = packagedPresetDir(), options =
         continue
       }
     }
-    const source = join(sourceDir, name)
     if (!existsSync(source)) {
       errors.push(`包内缺少 ${name}`)
       continue
     }
     try {
-      copyFileSync(source, target)
+      // 原子写（内部带 Windows 重试）：原先裸 copyFileSync 在两个实例共抢一个 DSH_HOME 首启时会 EBUSY。
+      writeAtomic(target, readFileSync(source, 'utf8'))
       created.push(name)
     } catch (error) {
       errors.push(`写入 ${name} 失败: ${describe(error)}`)
     }
   }
-  return { created, kept, errors }
+  return { created, refreshed, kept, errors }
 }
 
 /**
@@ -163,6 +189,9 @@ export function seedPresetWithLog(presetDir, log = console.error, info = console
     log(`custom-mode: 播种 preset 时出现意外错误（已忽略）: ${describe(error)}`)
     return { created: [], kept: [], errors: [describe(error)] }
   }
+  if (result.refreshed !== undefined && result.refreshed.length > 0) {
+    info(`custom-mode: 已刷新 ${presetDir} 里的代码模块（${result.refreshed.join(', ')}）`)
+  }
   if (result.created.length > 0) {
     info(`custom-mode: 已播种 preset 到 ${presetDir}（新建 ${result.created.length} 个文件: ${result.created.join(', ')}）`)
   }