dsh-custom-mode 1.6.1 → 1.7.0

package/README.md

@@ -33,7 +33,7 @@ The mode is **web-profile only**: `agent-presets`, the service that mounts prese
 
 ## Requirements
 
-- **dsh `>=0.1.6-alpha.1`** — declared in `engines.dsh` and as an *optional* peer range. This package never
+- **dsh `>=0.1.5-rc.2 <0.2.0-0`**（latest stable `0.1.5-rc.2` and latest preview `0.1.6-alpha.2`）** — declared in `engines.dsh` and as an *optional* peer range. This package never
   imports `@deepseek-ai/dsh`; it only reads the host services dsh injects.
 - **No build step, no dependencies**: the source is published as-is and uses only Node's standard library.
 - The package version is its own line (`1.0.0`, `1.0.1`, …). Which dsh it supports is declared in

package/assistants.mjs

@@ -29,6 +29,7 @@ import { existsSync, mkdirSync, readFileSync, readdirSync, writeFileSync } from
 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 { seedPreset, seedPresetWithLog } from './seed.mjs'
 
 /**
@@ -289,12 +290,12 @@ export function createAssistantDir({ root, id, composition, templateDir }) {
  * @param {{root: string, templateDir?: string, log?: Function, info?: Function}} input
  * @returns {{created: boolean, repaired: number, adopted: boolean}}
  */
-export function seedOnActivation({ root, templateDir, log = console.error, info = console.log }) {
+export function seedOnActivation({ root, templateDir, composition, log = console.error, info = console.log }) {
   const existing = scanManagedDirs(root)
   let repaired = 0
   for (const dir of existing) {
     // Fill-only, exactly like the original single-preset behaviour.
-    const result = seedPreset(dir, templateDir)
+    const result = seedPreset(dir, templateDir, { composition })
     if (result.created.length > 0) {
       repaired += 1
       info(`custom-mode: 已补全 ${dir} 缺失的模板文件（${result.created.join(', ')}）`)
@@ -308,7 +309,7 @@ export function seedOnActivation({ root, templateDir, log = console.error, info
     return { created: false, repaired, adopted: true }
   }
 
-  const created = seedPresetWithLog(join(root, LEGACY_ID), log, info, templateDir)
+  const created = seedPresetWithLog(join(root, LEGACY_ID), log, info, templateDir, { composition })
   markSeeded(root)
   return { created: created.created.length > 0, repaired, adopted: false }
 }
@@ -347,11 +348,39 @@ export function reorderAssistant(rows, input, write = writePresetMeta) {
   const [moved] = next.splice(index, 1)
   next.splice(target, 0, moved)
 
+  // N 个 preset.yml 无法一次事务化：先记下原值，写失败就回滚已经写过的那些 —— 否则用户会得到一个
+  // 只排了一半的顺序（审阅点名）。回滚失败只报告，不掩盖原始错误。
+  const snapshot = []
+  const written = []
+  for (const item of next) {
+    const directory = assistantDir(rows, item.id)
+    if (directory === undefined) continue
+    try {
+      snapshot.push({ item, text: readFileSync(presetMetaPath(directory), 'utf8') })
+    } catch {
+      snapshot.push({ item, text: null })
+    }
+  }
   for (const [position, item] of next.entries()) {
     const directory = assistantDir(rows, item.id)
     if (directory === undefined) continue
     const result = write(item.name, item.description, directory, { order: position + 1 })
-    if (result.ok !== true) return result
+    if (result.ok !== true) {
+      const failed = assistantDir(rows, item.id)
+      for (const done of written) {
+        if (done.text === null) continue
+        try {
+          writeAtomic(presetMetaPath(done.directory), done.text)
+        } catch {
+          /* 回滚失败不掩盖原始错误 */
+        }
+      }
+      return {
+        ...result,
+        error: result.error + `（已回滚 ${String(written.length)} 个已写入的顺序；失败的目录：${String(failed)}）`,
+      }
+    }
+    written.push({ directory, text: snapshot.find((entry) => entry.item.id === item.id)?.text ?? null })
   }
   return {
     ok: true,

package/atomic.mjs

@@ -0,0 +1,125 @@
+/**
+ * Atomic file writes — one implementation for every writer in the host half.
+ *
+ * **Why this is a module and not a helper inside `index.mjs`**: the settings page, the preset meta writer and
+ * the seeder all write user-visible files, and "we are careful here but not there" is how a project gets a
+ * half-written `preset.yml` (whose failure mode is the whole mode disappearing from every picker). A review
+ * found exactly that split: `index.mjs` had the retrying atomic write while `meta.mjs` used a bare
+ * `writeFileSync` under a comment promising the opposite. Sharing the function makes the discipline structural.
+ *
+ * The two things it buys:
+ *  - **temporary name + rename**, so a reader never observes a half-written file (the prompt reader caches by
+ *    mtime+size, and `preset.yml` is parsed by the platform);
+ *  - **retry on Windows**, where two concurrent renames onto the same target fail with `EPERM`/`EBUSY`; a
+ *    random temporary name does not help with *that* collision, only with temp-vs-temp ones.
+ */
+import { randomBytes } from 'node:crypto'
+import { renameSync, rmSync, writeFileSync } from 'node:fs'
+
+/** Synchronous backoff: these write paths are synchronous, so waiting is simpler than async plumbing. */
+function sleepSync(ms) {
+  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms)
+}
+
+/**
+ * `rename` with retries.
+ *
+ * @param {string} from - the temporary file that already holds the content.
+ * @param {string} to - the destination.
+ * @param {{rename?: Function, sleep?: Function, attempts?: number}} [options] - injectable for tests, which is
+ *   how the Windows-only retry behaviour is pinned on Linux.
+ * @returns {void}
+ */
+export function renameWithRetry(from, to, options = {}) {
+  const rename = typeof options.rename === 'function' ? options.rename : renameSync
+  const sleep = typeof options.sleep === 'function' ? options.sleep : sleepSync
+  const attempts = Number.isInteger(options.attempts) ? options.attempts : 8
+  for (let attempt = 1; ; attempt += 1) {
+    try {
+      rename(from, to)
+      return
+    } catch (error) {
+      const code = error !== null && typeof error === 'object' ? error.code : undefined
+      const retryable = code === 'EPERM' || code === 'EBUSY' || code === 'EACCES'
+      if (retryable !== true || attempt >= attempts) throw error
+      // 8 attempts with a growing backoff (20, 40, … 160 ms) — measured: a review still saw 1 failure in 10
+      // concurrent saves with the previous 5×20 ms, so the window is wider than that on Windows.
+      sleep(20 * attempt)
+    }
+  }
+}
+
+/**
+ * Stage content into a temporary file next to its destination, without touching the destination yet.
+ *
+ * Used when several files must change together (the settings page writes the composition and the prompt):
+ * staging both first means a failure while *preparing* one leaves the other untouched, which is the window a
+ * review pointed at ("`saveState` is not transactional; the second write failing leaves a mixed state").
+ *
+ * @param {string} file - destination path.
+ * @param {string} text - content to write into the temporary.
+ * @returns {{file: string, temporary: string}} handle for {@link commitStaged} / {@link discardStaged}.
+ */
+export function stageAtomic(file, text) {
+  const temporary = `${file}.tmp-${String(process.pid)}-${randomBytes(4).toString('hex')}`
+  writeFileSync(temporary, text, 'utf8')
+  return { file, temporary }
+}
+
+/** Rename a staged temporary onto its destination (with the Windows retry). */
+export function commitStaged(staged) {
+  renameWithRetry(staged.temporary, staged.file)
+}
+
+/** Remove a staged temporary without touching the destination. */
+export function discardStaged(staged) {
+  try {
+    rmSync(staged.temporary, { force: true })
+  } catch {
+    /* best effort */
+  }
+}
+
+/**
+ * Write several files together: stage them all, then commit them all.
+ *
+ * Not a true transaction — a rename can still fail between two commits — but it shrinks the mixed-state window
+ * to a single rename, and any failure discards the staged temporaries so no `.tmp-…` is left behind.
+ *
+ * @param {Array<[string, string]>} entries - `[file, text]` pairs.
+ * @returns {void}
+ */
+export function writeAtomicPair(entries) {
+  const staged = entries.map(([file, text]) => stageAtomic(file, text))
+  try {
+    for (const one of staged) commitStaged(one)
+  } catch (error) {
+    for (const one of staged) discardStaged(one)
+    throw error
+  }
+}
+
+/**
+ * Write a file so that readers see either the old content or the new one, never a mix.
+ *
+ * The temporary name is unique per call (pid + random suffix). On failure the temporary file is removed —
+ * an orphan `.tmp-…` inside an assistant directory is not just litter: the roster scans that directory.
+ *
+ * @param {string} file - destination path.
+ * @param {string} text - content to write.
+ * @returns {void}
+ */
+export function writeAtomic(file, text) {
+  const temporary = `${file}.tmp-${String(process.pid)}-${randomBytes(4).toString('hex')}`
+  writeFileSync(temporary, text, 'utf8')
+  try {
+    renameWithRetry(temporary, file)
+  } catch (error) {
+    try {
+      rmSync(temporary, { force: true })
+    } catch {
+      /* cleaning up must not mask the original error */
+    }
+    throw error
+  }
+}

package/client.js

@@ -96,6 +96,8 @@ try {
         "api.unknownAssistant": "找不到助手「{id}」：这一页只管理本工具创建的助手（目录里有 prompt.md，且组成文件用 prompt-reader.mjs 注入身份）。",
         "api.alreadyFirst": "「{name}」已经在最前面。",
         "api.alreadyLast": "「{name}」已经在最后面。",
+        "api.badVariableName": "变量引用的写法不合法：{variable} 里的名字只能用小写字母、数字、下划线，且以字母开头。要写字面量花括号，请用单个左花括号，或不闭合的双左花括号。",
+        "api.unknownVariable": "{variable} 不是已注册的变量，渲染会报错并让本模式每个请求都失败。可用：{known}。",
         "api.saved": "已保存（{name}，基础模式 {mode}）。新建会话即生效，当前会话保持原配置。",
         "api.created": "已创建「{name}」。现在可以为它写系统提示词。",
         "api.duplicated": "已复制自「{from}」。两份从此各改各的。",
@@ -117,6 +119,8 @@ try {
         "api.deleteFailed": "删除失败：{detail}",
         "api.versionMissing": "找不到这个版本（历史可能已被上限裁剪）。",
         "api.badJson": "请求体不是合法 JSON",
+        "warn.approvalGateMissing.label": "审批闸门未启用",
+        "warn.approvalGateMissing.hint": "这个 DSH 版本没有 tools/pre-execute 事件，会话内改写系统提示词**不会**弹审批。设置页不受影响；要恢复保护请升级 DSH，或把「custom_prompt 工具」那一行关掉。",
         "warn.personaOffWithPrompt": "「身份（系统提示词）」这一行是关的，所以 prompt.md 不会被注入 —— 你写的提示词现在不起作用。要么打开这一行，要么清空提示词。",
         "warn.toolOff": "「custom_prompt 工具」这一行是关的：会话里无法让 agent 改提示词，只能在本页改。",
         "warn.noDescription": "没有描述：新建会话的模式选择器里会显示成「暂无描述」。",
@@ -143,7 +147,7 @@ try {
         "name.placeholder": "自定义模式",
         "name.descriptionPlaceholder": "模式描述（显示在模式选择器里，可留空）",
         "mode.heading": "基础模式",
-        "mode.hint": "选一个官方模式作为底子，下面再按行微调。注意：底子只决定**行集合**与工具能力 —— 本模式的 persona 行始终替换掉底子那一行（提示词由你编辑，complete: false），底子的提示词语义不会被继承。改完保存后，新建会话即生效，不需要重启。",
+        "mode.hint": "选一个官方模式作为底子，下面再按行微调。注意：底子只决定「行集合」与工具能力 —— 本模式的 persona 行始终替换掉底子那一行（提示词由你编辑，complete: false），底子的提示词语义不会被继承。改完保存后，新建会话即生效，不需要重启。",
         "rows.heading": "插件开关",
         "rows.hint": "逐行控制这个模式挂载哪些插件，和官方插件列表一样按行铺开。没拨过的行保持官方默认（含平台判断）；你手动拨了就以你的为准。",
         "prompt.heading": "系统提示词",
@@ -266,6 +270,8 @@ try {
         "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}.",
         "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.",
@@ -290,6 +296,8 @@ try {
         "warn.personaOffWithPrompt": "The \"Identity (system prompt)\" row is off, so prompt.md is never injected — the prompt you wrote has no effect. Turn the row on, or clear the prompt.",
         "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.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.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/index.mjs

@@ -37,8 +37,8 @@
  * rows the user changed by diffing against the same shipped base mode.
  */
 
-import { randomBytes } from 'node:crypto'
-import { existsSync, readFileSync, renameSync, rmSync, writeFileSync } from 'node:fs'
+import { writeAtomic, writeAtomicPair } from './atomic.mjs'
+import { existsSync, readFileSync, writeFileSync } from 'node:fs'
 import { dirname, join } from 'node:path'
 import { PROMPT_PATH, COMPOSITION_PATH, ROUTE_PATH, PRESET_DIR } from './paths.mjs'
 import {
@@ -52,7 +52,7 @@ import {
 } from './composition.mjs'
 import { readPresetMeta, writePresetMeta, presetMetaPath, PRESET_META_PATH } from './meta.mjs'
 import { listHistory, readVersion, recordExternalChange, recordPrompt, HISTORY_SOURCE } from './journal.mjs'
-import { packagedPresetDir } from './seed.mjs'
+import { packagedPresetDir, starterComposition } from './seed.mjs'
 import {
   allocateId,
   assistantDir,
@@ -61,6 +61,7 @@ import {
   createAssistantDir,
   reorderAssistant,
   seedOnActivation,
+  LEGACY_ID,
   userPresetRoot,
 } from './assistants.mjs'
 
@@ -128,6 +129,8 @@ export function checkPromptText(text) {
     if (!VARIABLE_NAME.test(variable)) {
       return {
         ok: false,
+        code: 'badVariableName',
+        params: { variable: '{{' + variable + '}}' },
         error:
           '保存被拒绝：{{' +
           variable +
@@ -138,6 +141,8 @@ export function checkPromptText(text) {
     if (!KNOWN_VARIABLES.includes(variable)) {
       return {
         ok: false,
+        code: 'unknownVariable',
+        params: { variable: '{{' + variable + '}}', known: KNOWN_VARIABLES.map((item) => '{{' + item + '}}').join('、') },
         error:
           '保存被拒绝：{{' +
           variable +
@@ -274,7 +279,12 @@ export function readState(rows, id, options = {}) {
     // 改动历史（只有元数据，正文按需取：见 GET /custom-mode/history）。
     history: listHistory(directory),
     // 「配置了却不生效」的告警码（文案在页面侧按语言渲染）。
-    warnings: configWarnings(text, prompt.ok === true ? prompt.text : '', meta),
+    warnings: [
+      ...configWarnings(text, prompt.ok === true ? prompt.text : '', meta),
+      // 审批闸门缺失：由预置侧在注册失败时留下标记文件（宿主半看不到那个事件是否真的有人监听）。
+      // 诚实地把它变成页面上的告警，而不是只留在 console.error 里。
+      ...(existsSync(join(directory, 'approval-gate-missing')) ? ['approvalGateMissing'] : []),
+    ],
   }
 }
 
@@ -297,6 +307,23 @@ export function readList(rows) {
  * @param {Array<object>} rows - the current roster.
  * @param {object} input - `{ id, mode, overrides, prompt, name, description }`.
  */
+/**
+ * 进程内按助手串行化写入。
+ *
+ * 实测（外部审阅，Windows）：即使有 rename 重试，同一助手 10 个并发保存里仍有 1 次 EPERM —— 因为两个
+ * 处理器在**同一时刻**准备并改名同一对文件。重试覆盖的是跨进程窗口；这里消掉的是本进程内的竞争，也就是
+ * 我们能真正保证的那一半。（两个实例共用同一个 DSH_HOME 的跨进程竞争，插件无法串行化，那里靠重试。）
+ */
+const writeChains = new Map()
+
+function serializedWrite(key, work) {
+  const previous = writeChains.get(key) ?? Promise.resolve()
+  const next = previous.then(work, work)
+  // 链本身必须永远处于 fulfilled 状态，否则一次失败会卡死后续所有写入。
+  writeChains.set(key, next.then(() => undefined, () => undefined))
+  return next
+}
+
 export function saveState(rows, input) {
   const id = input !== null && typeof input === 'object' && typeof input.id === 'string' ? input.id : ''
   const directory = assistantDir(rows, id)
@@ -311,7 +338,10 @@ export function saveState(rows, input) {
     return { ok: false, code: 'promptEmpty', error: '保存被拒绝：系统提示词为空。留空不会清空身份，读取器会沿用上一版。' }
   }
   const verdict = checkPromptText(prompt)
-  if (verdict.ok !== true) return { ok: false, error: verdict.error }
+  if (verdict.ok !== true) {
+    // 带上 code/params：英文界面由页面自己的词典渲染；中文串保留给直接调 HTTP API 的调用方。
+    return { ok: false, code: verdict.code, params: verdict.params, error: verdict.error }
+  }
 
   const rawName = input !== null && typeof input === 'object' && typeof input.name === 'string' ? input.name : ''
   const name = rawName.replace(/\r?\n/g, ' ').trim()
@@ -350,8 +380,12 @@ export function saveState(rows, input) {
   }
 
   try {
-    writeAtomic(compositionFile(directory), composition)
-    writeAtomic(promptFile(directory), prompt)
+    // 组成文件与提示词必须一起更新：先都写进临时文件再一起换名，失败时不会留下"新组成 + 旧提示词"
+    // 这种混合状态（审阅指出原先两次独立原子写之间存在这个窗口）。
+    writeAtomicPair([
+      [compositionFile(directory), composition],
+      [promptFile(directory), prompt],
+    ])
     // 改动留痕：三个改动路径（设置页 / 会话内工具 / 手工编辑）里，只有设置页是"当场知道"的。
     // 另外两条由 readState 对比补记（见 journal.mjs 的单写者说明）。
     recordPrompt(directory, prompt, HISTORY_SOURCE.settings)
@@ -422,11 +456,16 @@ export function createAssistant(rows, input, templateDir = packagedPresetDir())
   // file embeds the new assistant's own name and id.
   let source = null
   const from = input !== null && typeof input === 'object' && typeof input.from === 'string' ? input.from : ''
+  // 显示名在分支里计算，但返回语句在分支外 —— 所以声明在外层。
+  let fromDisplayName = from
   if (from !== '') {
     const fromDir = assistantDir(rows, from)
     if (fromDir === undefined) return unknownAssistant(from)
     const fromComposition = compositionFile(fromDir)
     if (!existsSync(fromComposition)) return { ok: false, code: 'compositionMissing', params: { path: fromComposition }, error: '找不到组成文件：' + fromComposition }
+    // 显示名（`rows` 里的 name）优先于内部 id —— 与删除一致。
+    const fromRow = rows.find((item) => item !== null && typeof item === 'object' && item.id === from)
+    if (typeof fromRow?.name === 'string' && fromRow.name.trim() !== '') fromDisplayName = fromRow.name
     const text = readFileSync(fromComposition, 'utf8')
     const sourceMode = modeOf(text)
     const sourcePrompt = readPrompt(fromDir)
@@ -467,7 +506,7 @@ export function createAssistant(rows, input, templateDir = packagedPresetDir())
     name,
     code: source === null ? 'created' : 'duplicated',
     // D5：文案里用**显示名**而不是内部目录 id。
-    params: source === null ? { name } : { name, from: source === null ? '' : from },
+    params: source === null ? { name } : { name, from: fromDisplayName },
     note: source === null
       ? '已创建「' + name + '」。它的系统提示词现在是模板默认文本；写好后新建会话即可选择它。'
       : '已复制出「' + name + '」：提示词、基础模式与插件开关都来自「' + from + '」，之后各改各的，互不影响。',
@@ -492,12 +531,17 @@ export async function deleteAssistant(rows, input, agentPresets) {
   if (typeof agentPresets?.remove !== 'function') {
     return { ok: false, code: 'noRemoveApi', error: '当前 DSH 版本没有 agentPresets.remove()，无法删除。' }
   }
+  // 文案用**显示名**，不用内部目录 id（复制/删除的状态行曾把 id 暴露给用户，审阅点名）。
+  const displayName = (() => {
+    const row = Array.isArray(rows) ? rows.find((item) => item !== null && typeof item === 'object' && item.id === id) : undefined
+    return typeof row?.name === 'string' && row.name.trim() !== '' ? row.name : id
+  })()
   try {
     await agentPresets.remove(id)
   } catch (error) {
     return { ok: false, code: 'deleteFailed', params: { detail: describe(error) }, error: '删除失败：' + describe(error) }
   }
-  return { ok: true, id, code: 'deleted', params: { name: id }, note: '已删除「' + id + '」。正在使用它的会话不受影响；新建会话时不再出现。' }
+  return { ok: true, id, code: 'deleted', params: { name: displayName }, note: '已删除「' + displayName + '」。正在使用它的会话不受影响；新建会话时不再出现。' }
 }
 
 /**
@@ -559,7 +603,14 @@ export function apply(ctx) {
   // generated composition) and creates the legacy assistant only on a first run — see
   // the assistant registry for why a deleted assistant must not come back.
   try {
-    seedOnActivation({ root: dirname(PRESET_DIR), templateDir: packagedPresetDir() })
+    seedOnActivation({
+      root: dirname(PRESET_DIR),
+      templateDir: packagedPresetDir(),
+      // 组成文件**不照搬包内模板**，而是按本机装的那条 dsh 线派生：模板是某一条线渲染出来的，
+      // 另一条线可能根本没有它的某些行（实测：预览线的 workflow-ptc 在稳定线上不存在，
+      // 平台会把整个预设判为 broken 并从所有选择器里静默丢弃）。
+      composition: starterComposition({ assistantId: LEGACY_ID }),
+    })
   } catch (error) {
     console.error('custom-mode: 初始化 preset 目录时出现意外错误（已忽略）: ' + describe(error))
   }
@@ -677,19 +728,21 @@ export function apply(ctx) {
           return json({ ok: false, code: 'badJson', error: '请求体不是合法 JSON' }, 400)
         }
         await ensureShipped()
+        const targetId = parsed !== null && typeof parsed === 'object' && typeof parsed.id === 'string' ? parsed.id : ''
         if (pathname === STATE_PATH) {
-          const result = saveState(await roster(), parsed)
+          const result = await serializedWrite('save:' + targetId, async () => saveState(await roster(), parsed))
           return json(result, result.ok === true ? 200 : 400)
         }
         if (pathname === CREATE_PATH) {
-          const result = createAssistant(await roster(), parsed)
+          // 新建与排序改的是整棵树（根目录 + 每个助手的 preset.yml），所以用同一把"树锁"。
+          const result = await serializedWrite('tree', async () => createAssistant(await roster(), parsed))
           return json(result, result.ok === true ? 200 : 400)
         }
         if (pathname === REORDER_PATH) {
-          const result = reorderAssistant(await roster(), parsed)
+          const result = await serializedWrite('tree', async () => reorderAssistant(await roster(), parsed))
           return json(result, result.ok === true ? 200 : 400)
         }
-        const result = await deleteAssistant(await roster(), parsed, scope.agentPresets)
+        const result = await serializedWrite('delete:' + targetId, async () => deleteAssistant(await roster(), parsed, scope.agentPresets))
         return json(result, result.ok === true ? 200 : 400)
       } catch (error) {
         return json({ ok: false, error: describe(error) }, 500)
@@ -720,58 +773,9 @@ export function apply(ctx) {
  * 要么看到新内容，不会读到写了一半的文件。原来连续两次 writeFileSync 在极端时序下可能被读成撕裂的
  * prompt，而这个文件正是"用户的提示词"。
  */
-function writeAtomic(file, text) {
-  // 临时名必须**每个请求唯一**：只带 pid 时，同一进程内两个并发保存会争同一个临时名。
-  // 但随机后缀只消除 tmp-vs-tmp 竞争 —— Windows 上**两个 rename 指向同一目标**仍会以
-  // EPERM/EBUSY 失败（实测：10 并发保存 2 例 400），所以还要短退避重试。
-  const temporary = `${file}.tmp-${String(process.pid)}-${randomBytes(4).toString('hex')}`
-  writeFileSync(temporary, text, 'utf8')
-  try {
-    renameWithRetry(temporary, file)
-  } catch (error) {
-    // 失败必须清掉临时文件：助手目录会被 agent-presets 扫描，孤儿 tmp 是脏残留（实测留下过
-    // `agent.cordis.yml.tmp-135052-36a5bf5c`）。
-    try {
-      rmSync(temporary, { force: true })
-    } catch {
-      /* 清理失败不再掩盖原始错误 */
-    }
-    throw error
-  }
-}
-
-/** 同步退避：这条写路径本身是同步的，等一小会儿比把整个调用链改成异步更合适。 */
-function sleepSync(ms) {
-  Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms)
-}
-
-/**
- * `rename` 带重试。
- *
- * Windows 上并发 rename 到同一目标会短暂报 `EPERM`/`EBUSY`/`EACCES`（目标被另一个 rename 持有），
- * 退避几毫秒就能跨过这个窗口；其它错误立刻抛出，不做无谓等待。`rename`/`sleep` 可注入，
- * 于是这条重试逻辑在 Linux 上也能被测试钉住（见 test/journal.test.mjs 的对应条目）。
- *
- * @param {string} from - 临时文件名（已写好内容）。
- * @param {string} to - 目标文件名。
- * @returns {void}
- */
-export function renameWithRetry(from, to, options = {}) {
-  const rename = typeof options.rename === 'function' ? options.rename : renameSync
-  const sleep = typeof options.sleep === 'function' ? options.sleep : sleepSync
-  const attempts = Number.isInteger(options.attempts) ? options.attempts : 5
-  for (let attempt = 1; ; attempt += 1) {
-    try {
-      rename(from, to)
-      return
-    } catch (error) {
-      const code = error !== null && typeof error === 'object' ? error.code : undefined
-      const retryable = code === 'EPERM' || code === 'EBUSY' || code === 'EACCES'
-      if (retryable !== true || attempt >= attempts) throw error
-      sleep(20 * attempt)
-    }
-  }
-}
+// 原子写与重试只有一份实现（见 atomic.mjs 的说明）；这里再导出 renameWithRetry，
+// 让既有的路由测试继续能从 index.mjs 取到它。
+export { renameWithRetry } from './atomic.mjs'
 
 /** `error` as a readable string, without assuming it is an Error. */
 function describe(error) {

package/locales.mjs

@@ -46,7 +46,6 @@ export const zh = {
   'msg.createFailed': '创建失败',
   'msg.deleteFailed': '删除失败',
   'msg.nameRequired': '请先给新助手起个名字。',
-  'msg.unsaved': '未保存',
   'msg.readOnlyHint': '这一页只管理本工具创建的助手；手写的 preset 不在这里，也不会被改写。',
   'msg.reordered': '顺序已保存：新建会话时的模式选择器按这个顺序排列。',
   'msg.reorderFailed': '调整顺序失败',
@@ -56,6 +55,8 @@ export const zh = {
   'api.unknownAssistant': '找不到助手「{id}」：这一页只管理本工具创建的助手（目录里有 prompt.md，且组成文件用 prompt-reader.mjs 注入身份）。',
   'api.alreadyFirst': '「{name}」已经在最前面。',
   'api.alreadyLast': '「{name}」已经在最后面。',
+  'api.badVariableName': '变量引用的写法不合法：{variable} 里的名字只能用小写字母、数字、下划线，且以字母开头。要写字面量花括号，请用单个左花括号，或不闭合的双左花括号。',
+  'api.unknownVariable': '{variable} 不是已注册的变量，渲染会报错并让本模式每个请求都失败。可用：{known}。',
   'api.saved': '已保存（{name}，基础模式 {mode}）。新建会话即生效，当前会话保持原配置。',
   'api.created': '已创建「{name}」。现在可以为它写系统提示词。',
   'api.duplicated': '已复制自「{from}」。两份从此各改各的。',
@@ -77,6 +78,8 @@ export const zh = {
   'api.deleteFailed': '删除失败：{detail}',
   'api.versionMissing': '找不到这个版本（历史可能已被上限裁剪）。',
   'api.badJson': '请求体不是合法 JSON',
+  'warn.approvalGateMissing.label': '审批闸门未启用',
+  'warn.approvalGateMissing.hint': '这个 DSH 版本没有 tools/pre-execute 事件，会话内改写系统提示词**不会**弹审批。设置页不受影响；要恢复保护请升级 DSH，或把「custom_prompt 工具」那一行关掉。',
   'warn.personaOffWithPrompt': '「身份（系统提示词）」这一行是关的，所以 prompt.md 不会被注入 —— 你写的提示词现在不起作用。要么打开这一行，要么清空提示词。',
   'warn.toolOff': '「custom_prompt 工具」这一行是关的：会话里无法让 agent 改提示词，只能在本页改。',
   'warn.noDescription': '没有描述：新建会话的模式选择器里会显示成「暂无描述」。',
@@ -105,7 +108,7 @@ export const zh = {
   'name.descriptionPlaceholder': '模式描述（显示在模式选择器里，可留空）',
 
   'mode.heading': '基础模式',
-  'mode.hint': '选一个官方模式作为底子，下面再按行微调。注意：底子只决定**行集合**与工具能力 —— 本模式的 persona 行始终替换掉底子那一行（提示词由你编辑，complete: false），底子的提示词语义不会被继承。改完保存后，新建会话即生效，不需要重启。',
+  'mode.hint': '选一个官方模式作为底子，下面再按行微调。注意：底子只决定「行集合」与工具能力 —— 本模式的 persona 行始终替换掉底子那一行（提示词由你编辑，complete: false），底子的提示词语义不会被继承。改完保存后，新建会话即生效，不需要重启。',
 
   'rows.heading': '插件开关',
   'rows.hint': '逐行控制这个模式挂载哪些插件，和官方插件列表一样按行铺开。没拨过的行保持官方默认（含平台判断）；你手动拨了就以你的为准。',
@@ -233,7 +236,6 @@ export const en = {
   'msg.createFailed': 'Could not create',
   'msg.deleteFailed': 'Could not delete',
   'msg.nameRequired': 'Give the new assistant a name first.',
-  'msg.unsaved': 'Unsaved',
   'msg.readOnlyHint': 'This page manages only the assistants this tool created; a hand-written preset is not listed here and is never rewritten.',
   'msg.reordered': 'Order saved: the mode picker for new sessions follows it.',
   'msg.reorderFailed': 'Could not reorder',
@@ -243,6 +245,8 @@ export const en = {
   '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}.',
   '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.',
@@ -267,6 +271,8 @@ export const en = {
   'warn.personaOffWithPrompt': 'The "Identity (system prompt)" row is off, so prompt.md is never injected — the prompt you wrote has no effect. Turn the row on, or clear the prompt.',
   '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.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.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/meta.mjs

@@ -17,6 +17,7 @@
  */
 
 import { readFileSync, writeFileSync } from 'node:fs'
+import { writeAtomic } from './atomic.mjs'
 import { join } from 'node:path'
 import { PRESET_DIR } from './paths.mjs'
 
@@ -113,7 +114,9 @@ export function writePresetMeta(name, description, directory = PRESET_DIR, optio
     typeof requested === 'number' && Number.isFinite(requested) ? Math.trunc(requested) : readPresetMeta(directory).order
   if (order !== undefined) lines.push('order: ' + String(order))
   try {
-    writeFileSync(presetMetaPath(directory), lines.join('\n') + '\n', 'utf8')
+    // **非原子写的最坏后果在这里**：preset.yml 写坏 = 这个模式从所有选择器里消失（见本文件头注释）。
+    // 实测审阅指出这里原先用的是裸 writeFileSync，与设置页的纪律不一致；现在共用同一份实现。
+    writeAtomic(presetMetaPath(directory), lines.join('\n') + '\n')
   } catch (error) {
     return { ok: false, error: '写入 preset.yml 失败：' + String((error && error.message) || error) }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-custom-mode",
-  "version": "1.6.1",
+  "version": "1.7.0",
   "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",
@@ -47,6 +47,7 @@
     "index.mjs",
     "assistants.mjs",
     "seed.mjs",
+    "atomic.mjs",
     "client.js",
     "composition.mjs",
     "meta.mjs",

package/preset/preset.yml

@@ -1,2 +1,2 @@
 name: 自定义模式
-description: 完整编码能力，系统提示词来自 prompt.md，可在设置页随时修改、下一步即生效。
+description: 完整编码能力，系统提示词来自 prompt.md，可在设置页随时修改、下一步即生效。 / Full coding ability; the system prompt lives in prompt.md and can be edited in the settings page — it takes effect on the next step.

package/preset/prompt-tool.mjs

@@ -25,9 +25,9 @@
  * needs no isolate realm.
  */
 
+import { dirname, join } from 'node:path'
 import { randomBytes } from 'node:crypto'
 import { mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs'
-import { dirname } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
 /** Absolute path of the prompt file this preset reads. */
@@ -271,10 +271,14 @@ function registerApprovalGate(ctx) {
       const firstLine = text.split('\n').find((line) => line.trim() !== '') ?? ''
       return {
         kind: 'ask',
+        // **双语**：这是安全决策界面 —— 用哪种界面语言的用户都必须读懂自己要批准什么。
+        // （页面其它文案走词典，但审批面板由平台渲染，插件侧拿不到当前界面语言。）
         reason:
           '把「' + resolveModeName(undefined) + '」的系统提示词' + verb + ' ' + String(text.length) + ' 字符' +
           (firstLine === '' ? '' : '：' + firstLine.trim().slice(0, 60)) +
-          '（写入 ' + PROMPT_PATH + '）',
+          '（写入 ' + PROMPT_PATH + '）' +
+          " ／ Change this mode's system prompt: " + (action === 'append' ? 'append ' : 'replace with ') +
+          String(text.length) + ' characters (writes ' + PROMPT_PATH + ')',
       }
     }),
     'custom-prompt.approval-gate',
@@ -282,6 +286,15 @@ function registerApprovalGate(ctx) {
   return true
 }
 
+/**
+ * Marker file the host half reads to surface a MISSING approval gate in the settings page.
+ *
+ * The gate lives on the preset side, which is loaded per session, so the host half cannot see whether it
+ * registered. A review called the previous behaviour ("only console.error") a silent gap; this turns it into a
+ * visible warning. The marker is removed as soon as registration succeeds.
+ */
+export const GATE_MARKER = 'approval-gate-missing'
+
 /** The tool registry is a hard dependency; without it there is no tool. */
 export const inject = ['tools']
 
@@ -291,7 +304,14 @@ export function apply(ctx, config = {}) {
 
   // 审批闸门。宿主若不支持 `tools/pre-execute`（比本插件声明的下限还老的构建），这里会**明确**
   // 说一声再继续 —— 降级是有的，但不许静默。
-  if (registerApprovalGate(ctx) !== true) {
+  const gateReady = registerApprovalGate(ctx) === true
+  try {
+    if (gateReady) rmSync(join(dirname(PROMPT_PATH), GATE_MARKER), { force: true })
+    else writeFileSync(join(dirname(PROMPT_PATH), GATE_MARKER), 'this host has no tools/pre-execute event\n', 'utf8')
+  } catch {
+    /* 标记写不进去不能影响会话；下面的 console.error 仍然是兜底 */
+  }
+  if (gateReady !== true) {
     console.error(
       'custom-mode: 这个宿主没有 tools/pre-execute 事件，会话内改写系统提示词的审批闸门**未启用**' +
         '（设置页不受影响）。请升级 DSH，或把「custom_prompt 工具」这一行关掉。',
@@ -305,8 +325,35 @@ export function apply(ctx, config = {}) {
  * 临时名带 pid 与随机后缀：同一进程内的并发写必须各用各的临时名，否则 Windows 上两个
  * rename 指向同一目标会以 EPERM 失败。
  */
+/**
+ * `rename` 带重试 —— 与设置页同一条纪律（原先这里只有裸 rename，注释却自称"同一条纪律"，审阅点名）。
+ * Windows 上并发改名到同一目标会短暂 EPERM/EBUSY；退避几毫秒即可跨过。
+ */
+function renameWithRetry(from, to, attempts = 8) {
+  for (let attempt = 1; ; attempt += 1) {
+    try {
+      renameSync(from, to)
+      return
+    } catch (error) {
+      const code = error !== null && typeof error === 'object' ? error.code : undefined
+      const retryable = code === 'EPERM' || code === 'EBUSY' || code === 'EACCES'
+      if (retryable !== true || attempt >= attempts) throw error
+      Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 20 * attempt)
+    }
+  }
+}
+
 function writeAtomic(file, text) {
   const temporary = `${file}.tmp-${String(process.pid)}-${randomBytes(4).toString('hex')}`
   writeFileSync(temporary, text, 'utf8')
-  renameSync(temporary, file)
+  try {
+    renameWithRetry(temporary, file)
+  } catch (error) {
+    try {
+      rmSync(temporary, { force: true })
+    } catch {
+      /* 不掩盖原始错误 */
+    }
+    throw error
+  }
 }

package/seed.mjs

@@ -22,6 +22,8 @@
  */
 
 import { copyFileSync, existsSync, mkdirSync } from 'node:fs'
+import { renderComposition } from './composition.mjs'
+import { writeAtomic } from './atomic.mjs'
 import { dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
@@ -51,7 +53,45 @@ function describe(error) {
  * @param {string} [sourceDir] - the packaged copy to copy from.
  * @returns {{created: string[], kept: string[], errors: string[]}} what happened, per file.
  */
-export function seedPreset(presetDir, sourceDir = packagedPresetDir()) {
+/**
+ * The starter composition for a newly seeded assistant, **derived from the composition the installed dsh line
+ * actually ships**.
+ *
+ * **Why not copy the packaged file** (measured, and it was a real defect): the packaged `agent.cordis.yml` was
+ * rendered from one dsh line, and the other line may not ship some of its rows. Concretely, the preview line's
+ * standard composition enables `workflow-ptc` (`@deepseek-ai/dsh-workflow-ptc`), which the stable line
+ * (`0.1.5-rc.2`) does not install at all — the platform's health check then marks the whole preset broken and
+ * **silently drops the mode from every picker**, while the settings page keeps working (it never needs the
+ * preset to be resolvable). Deriving the rows from what is installed makes that impossible by construction,
+ * on any future line as well.
+ *
+ * @param {{mode?: string, assistantId?: string, modeName?: string}} [options]
+ * @returns {string|null} rendered composition, or `null` when the installed composition cannot be read (the
+ *   caller then keeps the packaged fallback file).
+ */
+export function starterComposition(options = {}) {
+  const mode = typeof options.mode === 'string' && options.mode !== '' ? options.mode : 'standard'
+  try {
+    return renderComposition(mode, new Map(), {
+      assistantId: typeof options.assistantId === 'string' ? options.assistantId : '',
+      modeName: typeof options.modeName === 'string' ? options.modeName : '',
+    })
+  } catch (error) {
+    console.error(
+      'custom-mode: 无法从本机安装的出厂组成派生播种文件（' + describe(error) + '），改用包内模板。' +
+        '如果这条 dsh 线与该模板的差异行不匹配，模式可能被判为 broken 而不出现在选择器里。',
+    )
+    return null
+  }
+}
+
+/**
+ * @param {string} presetDir - where the assistant lives.
+ * @param {string} sourceDir - packaged template directory (tests inject their own).
+ * @param {{composition?: string|null}} [options] - a rendered composition to write instead of copying
+ *   `agent.cordis.yml`; see {@link starterComposition}.
+ */
+export function seedPreset(presetDir, sourceDir = packagedPresetDir(), options = {}) {
   const created = []
   const kept = []
   const errors = []
@@ -75,6 +115,17 @@ export function seedPreset(presetDir, sourceDir = packagedPresetDir()) {
       kept.push(name)
       continue
     }
+    // 组成文件优先用"按本机那条线派生"的内容；只有派生失败（null）时才退回包内模板。
+    if (name === 'agent.cordis.yml' && typeof options.composition === 'string' && options.composition !== '') {
+      try {
+        writeAtomic(target, options.composition)
+        created.push(name)
+        continue
+      } catch (error) {
+        errors.push(`写入 ${name} 失败: ${describe(error)}`)
+        continue
+      }
+    }
     const source = join(sourceDir, name)
     if (!existsSync(source)) {
       errors.push(`包内缺少 ${name}`)
@@ -102,10 +153,10 @@ export function seedPreset(presetDir, sourceDir = packagedPresetDir()) {
  * @param {string} [sourceDir] - packaged template to copy from (defaults to `preset/` beside this module).
  * @returns {{created: string[], kept: string[], errors: string[]}}
  */
-export function seedPresetWithLog(presetDir, log = console.error, info = console.log, sourceDir = packagedPresetDir()) {
+export function seedPresetWithLog(presetDir, log = console.error, info = console.log, sourceDir = packagedPresetDir(), options = {}) {
   let result
   try {
-    result = seedPreset(presetDir, sourceDir)
+    result = seedPreset(presetDir, sourceDir, options)
   } catch (error) {
     // seedPreset is written not to throw; this is a last-resort guard so that a bug here
     // can never stop the host from booting.