dsh-custom-mode 1.3.0 → 1.4.0

package/assistants.mjs

@@ -334,14 +334,14 @@ export function reorderAssistant(rows, input, write = writePresetMeta) {
   const id = input !== null && typeof input === 'object' && typeof input.id === 'string' ? input.id : ''
   const direction = input !== null && typeof input === 'object' ? input.direction : undefined
   if (direction !== 'up' && direction !== 'down') {
-    return { ok: false, error: '未知的排序方向：' + String(direction) }
+    return { ok: false, code: 'badDirection', params: { direction: String(direction) }, error: '未知的排序方向：' + String(direction) }
   }
   const list = assistantsFromRoster(rows)
   const index = list.findIndex((item) => item.id === id)
-  if (index === -1) return { ok: false, error: '找不到助手「' + id + '」。' }
+  if (index === -1) return { ok: false, code: 'unknownAssistant', params: { id }, error: '找不到助手「' + id + '」。' }
   const target = direction === 'up' ? index - 1 : index + 1
-  if (target < 0) return { ok: false, error: '「' + (list[index].name || id) + '」已经在最前面。' }
-  if (target >= list.length) return { ok: false, error: '「' + (list[index].name || id) + '」已经在最后面。' }
+  if (target < 0) return { ok: false, code: 'alreadyFirst', params: { name: list[index].name || id }, error: '「' + (list[index].name || id) + '」已经在最前面。' }
+  if (target >= list.length) return { ok: false, code: 'alreadyLast', params: { name: list[index].name || id }, error: '「' + (list[index].name || id) + '」已经在最后面。' }
 
   const next = [...list]
   const [moved] = next.splice(index, 1)
@@ -357,6 +357,7 @@ export function reorderAssistant(rows, input, write = writePresetMeta) {
     ok: true,
     id,
     order: next.map((item) => item.id),
+    code: 'reordered',
     note: '顺序已保存：新建会话时的模式选择器按这个顺序排列。',
   }
 }

package/client.js

@@ -92,6 +92,31 @@ try {
         "msg.reorderFailed": "调整顺序失败",
         "msg.imported": "已导入到编辑器（还没有保存）：检查后点「保存」。",
         "msg.importFailed": "导入失败",
+        "api.badDirection": "未知的排序方向：{direction}",
+        "api.unknownAssistant": "找不到助手「{id}」：这一页只管理本工具创建的助手（目录里有 prompt.md，且组成文件用 prompt-reader.mjs 注入身份）。",
+        "api.alreadyFirst": "「{name}」已经在最前面。",
+        "api.alreadyLast": "「{name}」已经在最后面。",
+        "api.saved": "已保存（{name}，基础模式 {mode}）。新建会话即生效，当前会话保持原配置。",
+        "api.created": "已创建「{name}」。现在可以为它写系统提示词。",
+        "api.duplicated": "已复制自「{from}」。两份从此各改各的。",
+        "api.deleted": "已删除「{name}」。正在使用它的会话不受影响；新建会话时它不再出现。",
+        "api.reordered": "顺序已保存：新建会话时的模式选择器按这个顺序排列。",
+        "api.nameRequired": "请先给新助手起个名字。",
+        "api.nameTooLong": "名字太长了（上限 {max} 个字符）。",
+        "api.descriptionTooLong": "描述太长了（上限 {max} 个字符）。",
+        "api.promptEmpty": "保存被拒绝：系统提示词为空。留空不会清空身份，读取器会沿用上一版。",
+        "api.badMode": "未知的基础模式：{mode}",
+        "api.dirExists": "目录已存在，请换一个名字：{path}",
+        "api.compositionMissing": "找不到组成文件：{path}",
+        "api.writeFailed": "写入失败：{detail}",
+        "api.promptWriteFailed": "写入提示词失败：{detail}",
+        "api.renderFailed": "生成组成文件失败：{detail}",
+        "api.selfCheckFailed": "生成结果自检失败，已放弃写入：{detail}",
+        "api.promptReadFailed": "读取提示词失败：{detail}",
+        "api.noRemoveApi": "当前 DSH 版本没有 agentPresets.remove()，无法删除。",
+        "api.deleteFailed": "删除失败：{detail}",
+        "api.versionMissing": "找不到这个版本（历史可能已被上限裁剪）。",
+        "api.badJson": "请求体不是合法 JSON",
         "warn.personaOffWithPrompt": "「身份（系统提示词）」这一行是关的，所以 prompt.md 不会被注入 —— 你写的提示词现在不起作用。要么打开这一行，要么清空提示词。",
         "warn.toolOff": "「custom_prompt 工具」这一行是关的：会话里无法让 agent 改提示词，只能在本页改。",
         "warn.noDescription": "没有描述：新建会话的模式选择器里会显示成「暂无描述」。",
@@ -235,6 +260,31 @@ try {
         "msg.reorderFailed": "Could not reorder",
         "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.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.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).",
+        "api.descriptionTooLong": "That description is too long (limit {max} characters).",
+        "api.promptEmpty": "Save rejected: the system prompt is empty. Emptying it would not clear the identity — the reader keeps the last good text.",
+        "api.badMode": "Unknown base mode: {mode}",
+        "api.dirExists": "That directory already exists — pick another name: {path}",
+        "api.compositionMissing": "Composition file not found: {path}",
+        "api.writeFailed": "Write failed: {detail}",
+        "api.promptWriteFailed": "Writing the prompt failed: {detail}",
+        "api.renderFailed": "Rendering the composition failed: {detail}",
+        "api.selfCheckFailed": "The generated composition failed its self-check, so nothing was written: {detail}",
+        "api.promptReadFailed": "Reading the prompt failed: {detail}",
+        "api.noRemoveApi": "This DSH build has no agentPresets.remove(), so deleting is unavailable.",
+        "api.deleteFailed": "Delete failed: {detail}",
+        "api.versionMissing": "That version is gone (the history is capped).",
+        "api.badJson": "The request body is not valid JSON",
         "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\".",
@@ -720,6 +770,32 @@ try {
          */
         const t = (key, fallback) => translate(key, fallback, shellT)
 
+        /** 把 `{name}` 这类占位符换成 params 里的值（缺失就原样留着，便于发现漏参）。 */
+        const fillPlaceholders = (template, params) =>
+          template.replace(/\{(\w+)\}/g, (match, key) =>
+            params !== null && typeof params === "object" && params[key] !== undefined ? String(params[key]) : match,
+          )
+
+        /**
+         * 服务端结果的**本地化渲染**。
+         *
+         * 宿主仍然回中文的 `note`/`error`（那是 HTTP API 的兼容面），但页面优先用自己的词典按 `code`
+         * 渲染 —— 否则英文界面会在出错那一刻掉回中文（外部审阅点名的"硬伤"）。服务端若带来了页面无从
+         * 知道的细节（路径、底层错误），放在 `params` 里填进模板。没有 `code` 时退回宿主文案，兼容旧宿主。
+         */
+        const apiText = (result, fallbackKey) => {
+          const code = result !== null && typeof result === "object" && typeof result.code === "string" ? result.code : ""
+          if (code !== "") {
+            const template = translate("api." + code, "", shellT)
+            if (template !== "") return fillPlaceholders(template, result.params)
+          }
+          if (result !== null && typeof result === "object") {
+            if (typeof result.error === "string" && result.error !== "") return result.error
+            if (typeof result.note === "string" && result.note !== "") return result.note
+          }
+          return t(fallbackKey)
+        }
+
         const [list, setList] = react.useState(null)
         const [selected, setSelected] = react.useState("")
         /** id → { payload, saved, value }: loaded state, baseline and live draft. */
@@ -764,7 +840,7 @@ try {
           const result = await fetchState(id)
           if (result === null || result === undefined || result.ok !== true) {
             setFailed(true)
-            setStatus((result && result.error) || t("msg.readFailed"))
+            setStatus(apiText(result, "msg.readFailed"))
             return
           }
           const fresh = draftOf(result)
@@ -781,7 +857,7 @@ try {
           const result = await fetchList()
           if (result === null || result === undefined || result.ok !== true) {
             setFailed(true)
-            setStatus((result && result.error) || t("msg.readFailed"))
+            setStatus(apiText(result, "msg.readFailed"))
             return
           }
           const assistants = Array.isArray(result.assistants) ? result.assistants : []
@@ -895,11 +971,11 @@ try {
             if (result !== null && result !== undefined && result.ok === true) {
               setNewName("")
               setFailed(false)
-              setStatus(result.note || (from === undefined ? t("msg.created") : t("msg.duplicated")))
+              setStatus(apiText(result, from === undefined ? "msg.created" : "msg.duplicated"))
               await reload(result.id)
             } else {
               setFailed(true)
-              setStatus((result && result.error) || t("msg.createFailed"))
+              setStatus(apiText(result, "msg.createFailed"))
             }
           } catch (error) {
             setFailed(true)
@@ -923,11 +999,11 @@ try {
             const result = await postJson(ROUTES.reorder, { id: draft.id, direction })
             if (result !== null && result !== undefined && result.ok === true) {
               setFailed(false)
-              setStatus(result.note || t("msg.reordered"))
+              setStatus(apiText(result, "msg.reordered"))
               await reload(draft.id)
             } else {
               setFailed(true)
-              setStatus((result && result.error) || t("msg.reorderFailed"))
+              setStatus(apiText(result, "msg.reorderFailed"))
             }
           } catch (error) {
             setFailed(true)
@@ -1032,7 +1108,7 @@ try {
               setDeleteOpen(false)
               setAcknowledged(false)
               setFailed(false)
-              setStatus(result.note || t("msg.deleted"))
+              setStatus(apiText(result, "msg.deleted"))
               setEntries((previous) => {
                 const next = { ...previous }
                 delete next[id]
@@ -1041,7 +1117,7 @@ try {
               await reload("")
             } else {
               setFailed(true)
-              setStatus((result && result.error) || t("msg.deleteFailed"))
+              setStatus(apiText(result, "msg.deleteFailed"))
             }
           } catch (error) {
             setFailed(true)
@@ -1087,7 +1163,7 @@ try {
             })
             if (result !== null && result !== undefined && result.ok === true) {
               setFailed(false)
-              setStatus(result.note || t("msg.saved"))
+              setStatus(apiText(result, "msg.saved"))
               // The server normalises what it stores (trimmed name, recomputed overrides),
               // so the just-saved draft is replaced by what it actually wrote. Without this
               // the page would show 「已保存」 and 「未保存」 at the same time.
@@ -1104,7 +1180,7 @@ try {
               }
             } else {
               setFailed(true)
-              setStatus((result && result.error) || t("msg.saveFailed"))
+              setStatus(apiText(result, "msg.saveFailed"))
             }
           } catch (error) {
             setFailed(true)

package/index.mjs

@@ -38,7 +38,7 @@
  */
 
 import { randomBytes } from 'node:crypto'
-import { existsSync, readFileSync, renameSync, writeFileSync } from 'node:fs'
+import { existsSync, readFileSync, renameSync, rmSync, writeFileSync } from 'node:fs'
 import { dirname, join } from 'node:path'
 import { PROMPT_PATH, COMPOSITION_PATH, ROUTE_PATH, PRESET_DIR } from './paths.mjs'
 import {
@@ -166,7 +166,7 @@ export function readPrompt(directory) {
   try {
     return { ok: true, path, text: readFileSync(path, 'utf8') }
   } catch (error) {
-    return { ok: false, error: '读取提示词失败：' + describe(error) }
+    return { ok: false, code: 'promptReadFailed', params: { detail: describe(error) }, error: '读取提示词失败：' + describe(error) }
   }
 }
 
@@ -246,7 +246,7 @@ export function readState(rows, id, options = {}) {
   const directory = assistantDir(rows, id)
   if (directory === undefined) return unknownAssistant(id)
   const composition = compositionFile(directory)
-  if (!existsSync(composition)) return { ok: false, error: '找不到组成文件：' + composition }
+  if (!existsSync(composition)) return { ok: false, code: 'compositionMissing', params: { path: composition }, error: '找不到组成文件：' + composition }
   const text = readFileSync(composition, 'utf8')
   const mode = modeOf(text)
   const prompt = readPrompt(directory)
@@ -304,11 +304,11 @@ export function saveState(rows, input) {
 
   const mode = input !== null && typeof input === 'object' && typeof input.mode === 'string' ? input.mode : ''
   if (!BASE_MODES.some((entry) => entry.id === mode)) {
-    return { ok: false, error: '未知的基础模式：' + mode }
+    return { ok: false, code: 'badMode', params: { mode }, error: '未知的基础模式：' + mode }
   }
   const prompt = input !== null && typeof input === 'object' && typeof input.prompt === 'string' ? input.prompt : ''
   if (prompt.trim() === '') {
-    return { ok: false, error: '保存被拒绝：系统提示词为空。留空不会清空身份，读取器会沿用上一版。' }
+    return { ok: false, code: 'promptEmpty', error: '保存被拒绝：系统提示词为空。留空不会清空身份，读取器会沿用上一版。' }
   }
   const verdict = checkPromptText(prompt)
   if (verdict.ok !== true) return { ok: false, error: verdict.error }
@@ -316,13 +316,13 @@ export function saveState(rows, input) {
   const rawName = input !== null && typeof input === 'object' && typeof input.name === 'string' ? input.name : ''
   const name = rawName.replace(/\r?\n/g, ' ').trim()
   if (name.length > MAX_NAME) {
-    return { ok: false, error: '保存被拒绝：模式名称过长（上限 ' + String(MAX_NAME) + ' 个字符）。' }
+    return { ok: false, code: 'nameTooLong', params: { max: MAX_NAME }, error: '保存被拒绝：模式名称过长（上限 ' + String(MAX_NAME) + ' 个字符）。' }
   }
   const rawDescription =
     input !== null && typeof input === 'object' && typeof input.description === 'string' ? input.description : ''
   const description = rawDescription.replace(/\r?\n/g, ' ').trim()
   if (description.length > MAX_DESCRIPTION) {
-    return { ok: false, error: '保存被拒绝：模式描述过长（上限 ' + String(MAX_DESCRIPTION) + ' 个字符）。' }
+    return { ok: false, code: 'descriptionTooLong', params: { max: MAX_DESCRIPTION }, error: '保存被拒绝：模式描述过长（上限 ' + String(MAX_DESCRIPTION) + ' 个字符）。' }
   }
 
   const overrides = new Map()
@@ -337,7 +337,7 @@ export function saveState(rows, input) {
   try {
     composition = renderComposition(mode, overrides, { modeName: name, assistantId: id })
   } catch (error) {
-    return { ok: false, error: '生成组成文件失败：' + describe(error) }
+    return { ok: false, code: 'renderFailed', params: { detail: describe(error) }, error: '生成组成文件失败：' + describe(error) }
   }
 
   // Self-check our own output before publishing it: a composition that lost its
@@ -346,7 +346,7 @@ export function saveState(rows, input) {
     if (collectRows(composition).length === 0) throw new Error('生成的组成文件没有任何行')
     readBaseComposition(mode)
   } catch (error) {
-    return { ok: false, error: '生成结果自检失败，已放弃写入：' + describe(error) }
+    return { ok: false, code: 'selfCheckFailed', params: { detail: describe(error) }, error: '生成结果自检失败，已放弃写入：' + describe(error) }
   }
 
   try {
@@ -356,7 +356,7 @@ export function saveState(rows, input) {
     // 另外两条由 readState 对比补记（见 journal.mjs 的单写者说明）。
     recordPrompt(directory, prompt, HISTORY_SOURCE.settings)
   } catch (error) {
-    return { ok: false, error: '写入失败：' + describe(error) }
+    return { ok: false, code: 'writeFailed', params: { detail: describe(error) }, error: '写入失败：' + describe(error) }
   }
 
   // A name the user cleared is left alone rather than written as an empty scalar:
@@ -370,6 +370,8 @@ export function saveState(rows, input) {
     ok: true,
     id,
     mode,
+    code: 'saved',
+    params: { name: name === '' ? id : name, mode },
     note: '已保存（' + (name === '' ? id : name) + '，基础模式 ' + mode + '）。新建会话即生效，当前会话保持原配置。',
   }
 }
@@ -390,15 +392,15 @@ export function saveState(rows, input) {
 export function createAssistant(rows, input, templateDir = packagedPresetDir()) {
   const rawName = input !== null && typeof input === 'object' && typeof input.name === 'string' ? input.name : ''
   const name = rawName.replace(/\r?\n/g, ' ').trim()
-  if (name === '') return { ok: false, error: '请先给新助手起个名字。' }
+  if (name === '') return { ok: false, code: 'nameRequired', error: '请先给新助手起个名字。' }
   if (name.length > MAX_NAME) {
-    return { ok: false, error: '名字太长了（上限 ' + String(MAX_NAME) + ' 个字符）。' }
+    return { ok: false, code: 'nameTooLong', params: { max: MAX_NAME }, error: '名字太长了（上限 ' + String(MAX_NAME) + ' 个字符）。' }
   }
   const rawDescription =
     input !== null && typeof input === 'object' && typeof input.description === 'string' ? input.description : ''
   const description = rawDescription.replace(/\r?\n/g, ' ').trim()
   if (description.length > MAX_DESCRIPTION) {
-    return { ok: false, error: '描述太长了（上限 ' + String(MAX_DESCRIPTION) + ' 个字符）。' }
+    return { ok: false, code: 'descriptionTooLong', params: { max: MAX_DESCRIPTION }, error: '描述太长了（上限 ' + String(MAX_DESCRIPTION) + ' 个字符）。' }
   }
 
   const root = userPresetRoot(rows)
@@ -410,7 +412,7 @@ export function createAssistant(rows, input, templateDir = packagedPresetDir())
   // The roster can lag a directory it skipped (a hand-made one with no
   // composition). Refuse the name rather than half-own that directory.
   if (existsSync(join(root, id))) {
-    return { ok: false, error: '目录已存在，请换一个名字：' + join(root, id) }
+    return { ok: false, code: 'dirExists', params: { path: join(root, id) }, error: '目录已存在，请换一个名字：' + join(root, id) }
   }
 
   // A "duplicate" carries the source's prompt, base mode and row switches into a
@@ -424,7 +426,7 @@ export function createAssistant(rows, input, templateDir = packagedPresetDir())
     const fromDir = assistantDir(rows, from)
     if (fromDir === undefined) return unknownAssistant(from)
     const fromComposition = compositionFile(fromDir)
-    if (!existsSync(fromComposition)) return { ok: false, error: '找不到组成文件：' + fromComposition }
+    if (!existsSync(fromComposition)) return { ok: false, code: 'compositionMissing', params: { path: fromComposition }, error: '找不到组成文件：' + fromComposition }
     const text = readFileSync(fromComposition, 'utf8')
     const sourceMode = modeOf(text)
     const sourcePrompt = readPrompt(fromDir)
@@ -453,7 +455,7 @@ export function createAssistant(rows, input, templateDir = packagedPresetDir())
     try {
       writeAtomic(promptFile(created.dir), source.prompt)
     } catch (error) {
-      return { ok: false, error: '写入提示词失败：' + describe(error) }
+      return { ok: false, code: 'promptWriteFailed', params: { detail: describe(error) }, error: '写入提示词失败：' + describe(error) }
     }
   }
   const metaResult = writePresetMeta(name, description === '' && source !== null ? source.description : description, created.dir)
@@ -463,6 +465,9 @@ export function createAssistant(rows, input, templateDir = packagedPresetDir())
     ok: true,
     id,
     name,
+    code: source === null ? 'created' : 'duplicated',
+    // D5：文案里用**显示名**而不是内部目录 id。
+    params: source === null ? { name } : { name, from: source === null ? '' : from },
     note: source === null
       ? '已创建「' + name + '」。它的系统提示词现在是模板默认文本；写好后新建会话即可选择它。'
       : '已复制出「' + name + '」：提示词、基础模式与插件开关都来自「' + from + '」，之后各改各的，互不影响。',
@@ -485,14 +490,14 @@ export async function deleteAssistant(rows, input, agentPresets) {
   const id = input !== null && typeof input === 'object' && typeof input.id === 'string' ? input.id : ''
   if (assistantDir(rows, id) === undefined) return unknownAssistant(id)
   if (typeof agentPresets?.remove !== 'function') {
-    return { ok: false, error: '当前 DSH 版本没有 agentPresets.remove()，无法删除。' }
+    return { ok: false, code: 'noRemoveApi', error: '当前 DSH 版本没有 agentPresets.remove()，无法删除。' }
   }
   try {
     await agentPresets.remove(id)
   } catch (error) {
-    return { ok: false, error: '删除失败：' + describe(error) }
+    return { ok: false, code: 'deleteFailed', params: { detail: describe(error) }, error: '删除失败：' + describe(error) }
   }
-  return { ok: true, id, note: '已删除「' + id + '」。正在使用它的会话不受影响；新建会话时不再出现。' }
+  return { ok: true, id, code: 'deleted', params: { name: id }, note: '已删除「' + id + '」。正在使用它的会话不受影响；新建会话时不再出现。' }
 }
 
 /**
@@ -651,7 +656,7 @@ export function apply(ctx) {
           const directory = assistantDir(await roster(), id)
           if (directory === undefined) return json(unknownAssistant(id), 404)
           const text = readVersion(directory, url.searchParams.get('n') ?? '')
-          if (text === null) return json({ ok: false, error: '找不到这个版本（历史可能已被上限裁剪）。' }, 404)
+          if (text === null) return json({ ok: false, code: 'versionMissing', error: '找不到这个版本（历史可能已被上限裁剪）。' }, 404)
           return json({ ok: true, id, n: url.searchParams.get('n'), text })
         }
 
@@ -669,7 +674,7 @@ export function apply(ctx) {
         try {
           parsed = await request.json()
         } catch {
-          return json({ ok: false, error: '请求体不是合法 JSON' }, 400)
+          return json({ ok: false, code: 'badJson', error: '请求体不是合法 JSON' }, 400)
         }
         await ensureShipped()
         if (pathname === STATE_PATH) {
@@ -716,12 +721,56 @@ export function apply(ctx) {
  * prompt，而这个文件正是"用户的提示词"。
  */
 function writeAtomic(file, text) {
-  // 临时名必须**每个请求唯一**：只带 pid 时，同一进程内两个并发保存会争同一个临时名，
-  // Windows 上两个 rename 指向同一目标会以 EPERM 失败（实测：10 并发保存 2 例 400），
-  // 而 POSIX 上 rename 原子覆盖、静默地后写胜出 —— 也就是说这个缺陷只在 Windows 显现。
+  // 临时名必须**每个请求唯一**：只带 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')
-  renameSync(temporary, file)
+  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)
+    }
+  }
 }
 
 /** `error` as a readable string, without assuming it is an Error. */

package/journal.mjs

@@ -23,9 +23,30 @@
  * 但这里记录的是**已发生的事实**而不是待确认的提议 —— 我们的场景是"改了什么要看得见、回得去"，
  * 不需要它的确认闸门。
  */
-import { existsSync, readFileSync, renameSync, writeFileSync } from 'node:fs'
+import { randomBytes } from 'node:crypto'
+import { existsSync, readFileSync, renameSync, rmSync, writeFileSync } from 'node:fs'
 import { join } from 'node:path'
 
+/**
+ * `rename` 带重试（与宿主半同一实现，见 editor/index.mjs 的说明）。
+ *
+ * 这两个文件刻意各留一份：preset 侧的模块是独立分发的，不能 import 宿主半 —— 与 `checkPromptText`
+ * 同样的取舍。journal 只在宿主半写，所以这里只需与宿主半保持一致的重试策略。
+ */
+function renameWithRetry(from, to, attempts = 5) {
+  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)
+    }
+  }
+}
+
 /** 每个助手目录下的日志文件名。 */
 export const HISTORY_NAME = 'prompt-history.jsonl'
 
@@ -89,16 +110,29 @@ export function recordPrompt(directory, text, by = HISTORY_SOURCE.settings) {
 
   const at = new Date().toISOString()
   const n = entries.length === 0 ? 1 : entries[entries.length - 1].n + 1
+  // `bytes` 是给人看的体积，所以按 **UTF-8 字节**计（原先用 text.length = UTF-16 码元，
+  // CJK 内容下显示值只有真实字节的约 1/3，而界面标注是 "B"）。
   const lines = entries.slice(-(HISTORY_MAX - 1)).map((entry) =>
-    JSON.stringify({ n: entry.n, at: entry.at, by: entry.by, bytes: entry.text.length, text: entry.text }),
+    JSON.stringify({ n: entry.n, at: entry.at, by: entry.by, bytes: Buffer.byteLength(entry.text, 'utf8'), text: entry.text }),
   )
-  lines.push(JSON.stringify({ n, at, by, bytes: text.length, text }))
+  lines.push(JSON.stringify({ n, at, by, bytes: Buffer.byteLength(text, 'utf8'), text }))
 
   // 唯一的整文件重写：顺手把上限外的旧条目丢掉，用原子写落盘（读取器不会看到写了一半的文件）。
   const file = historyFile(directory)
-  const temporary = `${file}.tmp-${String(process.pid)}`
+  // 与宿主半同一条纪律：随机临时名（消除 tmp-vs-tmp 碰撞）+ 重试（Windows 上目标被并发 rename
+  // 持有时会短暂 EPERM）+ 失败清理。
+  const temporary = `${file}.tmp-${String(process.pid)}-${randomBytes(4).toString('hex')}`
   writeFileSync(temporary, lines.join('\n') + '\n', 'utf8')
-  renameSync(temporary, file)
+  try {
+    renameWithRetry(temporary, file)
+  } catch (error) {
+    try {
+      rmSync(temporary, { force: true })
+    } catch {
+      /* 不掩盖原始错误 */
+    }
+    throw error
+  }
   return { recorded: true, at, n }
 }
 
@@ -119,7 +153,7 @@ export function listHistory(directory, limit = HISTORY_MAX) {
       n: entry.n,
       at: entry.at,
       by: entry.by,
-      bytes: entry.text.length,
+      bytes: Buffer.byteLength(entry.text, 'utf8'),
       preview: firstLine.trim().slice(0, 80),
     })
   }

package/locales.mjs

@@ -52,6 +52,31 @@ export const zh = {
   'msg.reorderFailed': '调整顺序失败',
   'msg.imported': '已导入到编辑器（还没有保存）：检查后点「保存」。',
   'msg.importFailed': '导入失败',
+  'api.badDirection': '未知的排序方向：{direction}',
+  'api.unknownAssistant': '找不到助手「{id}」：这一页只管理本工具创建的助手（目录里有 prompt.md，且组成文件用 prompt-reader.mjs 注入身份）。',
+  'api.alreadyFirst': '「{name}」已经在最前面。',
+  'api.alreadyLast': '「{name}」已经在最后面。',
+  'api.saved': '已保存（{name}，基础模式 {mode}）。新建会话即生效，当前会话保持原配置。',
+  'api.created': '已创建「{name}」。现在可以为它写系统提示词。',
+  'api.duplicated': '已复制自「{from}」。两份从此各改各的。',
+  'api.deleted': '已删除「{name}」。正在使用它的会话不受影响；新建会话时它不再出现。',
+  'api.reordered': '顺序已保存：新建会话时的模式选择器按这个顺序排列。',
+  'api.nameRequired': '请先给新助手起个名字。',
+  'api.nameTooLong': '名字太长了（上限 {max} 个字符）。',
+  'api.descriptionTooLong': '描述太长了（上限 {max} 个字符）。',
+  'api.promptEmpty': '保存被拒绝：系统提示词为空。留空不会清空身份，读取器会沿用上一版。',
+  'api.badMode': '未知的基础模式：{mode}',
+  'api.dirExists': '目录已存在，请换一个名字：{path}',
+  'api.compositionMissing': '找不到组成文件：{path}',
+  'api.writeFailed': '写入失败：{detail}',
+  'api.promptWriteFailed': '写入提示词失败：{detail}',
+  'api.renderFailed': '生成组成文件失败：{detail}',
+  'api.selfCheckFailed': '生成结果自检失败，已放弃写入：{detail}',
+  'api.promptReadFailed': '读取提示词失败：{detail}',
+  'api.noRemoveApi': '当前 DSH 版本没有 agentPresets.remove()，无法删除。',
+  'api.deleteFailed': '删除失败：{detail}',
+  'api.versionMissing': '找不到这个版本（历史可能已被上限裁剪）。',
+  'api.badJson': '请求体不是合法 JSON',
   'warn.personaOffWithPrompt': '「身份（系统提示词）」这一行是关的，所以 prompt.md 不会被注入 —— 你写的提示词现在不起作用。要么打开这一行，要么清空提示词。',
   'warn.toolOff': '「custom_prompt 工具」这一行是关的：会话里无法让 agent 改提示词，只能在本页改。',
   'warn.noDescription': '没有描述：新建会话的模式选择器里会显示成「暂无描述」。',
@@ -212,6 +237,31 @@ export const en = {
   'msg.reorderFailed': 'Could not reorder',
   '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.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.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).',
+  'api.descriptionTooLong': 'That description is too long (limit {max} characters).',
+  'api.promptEmpty': 'Save rejected: the system prompt is empty. Emptying it would not clear the identity — the reader keeps the last good text.',
+  'api.badMode': 'Unknown base mode: {mode}',
+  'api.dirExists': 'That directory already exists — pick another name: {path}',
+  'api.compositionMissing': 'Composition file not found: {path}',
+  'api.writeFailed': 'Write failed: {detail}',
+  'api.promptWriteFailed': 'Writing the prompt failed: {detail}',
+  'api.renderFailed': 'Rendering the composition failed: {detail}',
+  'api.selfCheckFailed': 'The generated composition failed its self-check, so nothing was written: {detail}',
+  'api.promptReadFailed': 'Reading the prompt failed: {detail}',
+  'api.noRemoveApi': 'This DSH build has no agentPresets.remove(), so deleting is unavailable.',
+  'api.deleteFailed': 'Delete failed: {detail}',
+  'api.versionMissing': 'That version is gone (the history is capped).',
+  'api.badJson': 'The request body is not valid JSON',
   '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".',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-custom-mode",
-  "version": "1.3.0",
+  "version": "1.4.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",
@@ -60,7 +60,7 @@
     "test": "node ../test/run.mjs"
   },
   "peerDependencies": {
-    "@deepseek-ai/dsh": ">=0.1.6-alpha.1 <0.2.0-0"
+    "@deepseek-ai/dsh": ">=0.1.5-rc.2 <0.2.0-0"
   },
   "publishConfig": {
     "access": "public",
@@ -72,6 +72,6 @@
     }
   },
   "engines": {
-    "dsh": ">=0.1.6-alpha.1 <0.2.0-0"
+    "dsh": ">=0.1.5-rc.2 <0.2.0-0"
   }
 }