dsh-custom-mode 1.0.3 → 1.1.0

package/client.js

@@ -76,6 +76,8 @@ try {
         "btn.moveDown": "下移",
         "btn.import": "导入提示词",
         "btn.export": "导出提示词",
+        "btn.reset": "恢复出厂提示词",
+        "btn.resetHint": "把编辑器里的内容换成出厂模板（新建助手时得到的那一份）。它同样只改草稿，点保存才落盘 —— 误点可以用「重新读取」撤销。",
         "btn.delete": "删除这个助手",
         "btn.cancel": "取消",
         "msg.created": "已创建。现在可以为它写系统提示词。",
@@ -109,7 +111,7 @@ try {
         "rows.heading": "插件开关",
         "rows.hint": "逐行控制这个模式挂载哪些插件，和官方插件列表一样按行铺开。没拨过的行保持官方默认（含平台判断）；你手动拨了就以你的为准。",
         "prompt.heading": "系统提示词",
-        "prompt.hint": "这段文本在每个模型调用前重新读取，所以保存后下一步即生效，且只影响使用这个助手的会话。「导入」把文件读进编辑器（未保存前不写入任何东西）；「导出」把当前文本存成 .md 文件。",
+        "prompt.hint": "这段文本在每个模型调用前重新读取，所以保存后下一步即生效，且只影响使用这个助手的会话。「导入」把文件读进编辑器（未保存前不写入任何东西）；「导出」把当前文本存成 .md 文件；「恢复出厂提示词」把出厂模板填回编辑器（同样要保存才写入）。",
         "status.enabled": "已启用",
         "status.disabled": "已停用",
         "status.changed": "已改",
@@ -206,6 +208,8 @@ try {
         "btn.moveDown": "Move down",
         "btn.import": "Import prompt",
         "btn.export": "Export prompt",
+        "btn.reset": "Reset to factory prompt",
+        "btn.resetHint": "Puts the shipped template back into the editor (the text a new assistant starts from). Like every other edit it only changes the draft — save to apply, or use Reload to discard.",
         "btn.delete": "Delete this assistant",
         "btn.cancel": "Cancel",
         "msg.created": "Created. Now you can write its system prompt.",
@@ -239,7 +243,7 @@ try {
         "rows.heading": "Plugin switches",
         "rows.hint": "Control row by row which plugins this mode mounts, laid out like the official plugin list. Untouched rows keep the official default (platform conditions included); your manual choice wins.",
         "prompt.heading": "System prompt",
-        "prompt.hint": "This text is re-read before every model call, so a save applies on the next step and only affects sessions on this assistant. \"Import\" reads a file into the editor (nothing is written until you save); \"Export\" saves the current text as a .md file.",
+        "prompt.hint": "This text is re-read before every model call, so a save applies on the next step and only affects sessions on this assistant. \"Import\" reads a file into the editor (nothing is written until you save); \"Export\" saves the current text as a .md file; \"Reset to factory prompt\" puts the shipped template back into the editor (also saved only when you save).",
         "status.enabled": "Enabled",
         "status.disabled": "Disabled",
         "status.changed": "changed",
@@ -580,6 +584,9 @@ try {
           prompt: state.prompt,
           name: typeof state.name === "string" ? state.name : "",
           description: typeof state.description === "string" ? state.description : "",
+          // 「恢复出厂提示词」要用它。它不是草稿的一部分，`sameDraft` 不比较它 ——
+          // 漏掉这一行按钮会一直置灰（实测：真点了没反应，浏览器验收抓到）。
+          factoryPrompt: typeof state.factoryPrompt === "string" ? state.factoryPrompt : null,
         }
       }
 
@@ -896,6 +903,18 @@ try {
         }
 
         /** Download the prompt being edited (client-side only — the host is not involved). */
+        /**
+         * 把编辑器内容换回出厂提示词。
+         *
+         * 只改**草稿**，不写盘：这样"一键回到官方"既立刻可见，又可被「重新读取」撤销 ——
+         * 与页面其余部分一样，一切改动都要点保存才落盘。
+         */
+        const resetPrompt = () => {
+          const factory = typeof draft.factoryPrompt === "string" ? draft.factoryPrompt : ""
+          if (factory === "") return
+          update({ prompt: factory })
+        }
+
         const exportPrompt = () => {
           try {
             const blob = new Blob([draft.prompt], { type: "text/markdown;charset=utf-8" })
@@ -1259,6 +1278,21 @@ try {
                       },
                       t("btn.import"),
                     ),
+                    react.createElement(
+                      A.Button,
+                      {
+                        variant: "outline",
+                        size: "sm",
+                        disabled:
+                          busy ||
+                          typeof draft.factoryPrompt !== "string" ||
+                          draft.factoryPrompt === "" ||
+                          draft.prompt === draft.factoryPrompt,
+                        onClick: resetPrompt,
+                        title: t("btn.resetHint"),
+                      },
+                      t("btn.reset"),
+                    ),
                     // The picker itself is invisible; the button above is the affordance. The
                     // file is read locally and lands in the editor, never straight on disk.
                     react.createElement("input", {

package/index.mjs

@@ -37,6 +37,7 @@
  * rows the user changed by diffing against the same shipped base mode.
  */
 
+import { randomBytes } from 'node:crypto'
 import { existsSync, readFileSync, renameSync, writeFileSync } from 'node:fs'
 import { dirname, join } from 'node:path'
 import { PROMPT_PATH, COMPOSITION_PATH, ROUTE_PATH, PRESET_DIR } from './paths.mjs'
@@ -79,6 +80,12 @@ const METHODS = {
   [REORDER_PATH]: ['POST'],
 }
 
+/** 只告警一次：避免每个请求都刷同一行日志。 */
+let warnedRosterShape = false
+
+/** 应用层请求体上限；平台的 buffered cap 是第一道，这个是我们自己的兜底（见 handler 里的注释）。 */
+const MAX_BODY_BYTES = 4 * 1024 * 1024
+
 /** Longest display name / description the page accepts, so one paste cannot bloat every picker. */
 const MAX_NAME = 80
 const MAX_DESCRIPTION = 400
@@ -182,7 +189,26 @@ function unknownAssistant(id) {
  * @param {string} id - the assistant's preset id.
  * @returns {object} the payload the browser half reads.
  */
-export function readState(rows, id) {
+/**
+ * 出厂提示词：新建助手时拿到的那一份（打包在包里的 preset 模板）。
+ *
+ * 设置页用它实现「恢复出厂提示词」—— 在此之前，用户改坏了提示词只能把整个助手删掉重建。
+ * 读不到就返回 null（页面会把那个按钮置灰，而不是给一个会写坏文件的按钮）。
+ */
+let packagedPromptCache
+function packagedPrompt() {
+  if (packagedPromptCache === undefined) {
+    try {
+      packagedPromptCache = readFileSync(join(packagedPresetDir(), 'prompt.md'), 'utf8')
+    } catch (error) {
+      packagedPromptCache = null
+      console.error('custom-mode: 读不到出厂提示词模板（' + describe(error) + '），设置页将不提供「恢复出厂提示词」。')
+    }
+  }
+  return packagedPromptCache
+}
+
+export function readState(rows, id, options = {}) {
   const directory = assistantDir(rows, id)
   if (directory === undefined) return unknownAssistant(id)
   const composition = compositionFile(directory)
@@ -205,6 +231,9 @@ export function readState(rows, id) {
     promptPath: promptFile(directory),
     compositionPath: composition,
     presetMetaPath: presetMetaPath(directory),
+    // 回退用的出厂文本。它不是"当前值"，页面只把它填进编辑器，保存前不落盘 —— 所以
+    // 一次误点不会破坏任何东西（重新读取即可丢弃）。
+    factoryPrompt: typeof options.factoryPrompt === 'string' ? options.factoryPrompt : null,
   }
 }
 
@@ -490,10 +519,14 @@ export function apply(ctx) {
     // Compatibility guard: this plugin reads host APIs that a future DSH release could
     // reshape. Check them once and say so plainly, instead of letting every request
     // fail with an opaque 500.
-    const missing = []
-    if (typeof scope.agentPresets?.list !== 'function') missing.push('agentPresets.list()')
-    if (typeof scope.agentPresets?.remove !== 'function') missing.push('agentPresets.remove()')
-    if (typeof scope.connection?.fetch?.register !== 'function') missing.push('connection.fetch.register()')
+    // 数据表形式：以后新增一处耦合点，只要在这里加一行 —— README 的耦合点清单与本表同源，
+    // 让"上游改了 API 形状"在启动日志里就能看见，而不是等用户报"设置页白屏"。
+    const REQUIRED_APIS = [
+      ['agentPresets.list()', () => typeof scope.agentPresets?.list === 'function'],
+      ['agentPresets.remove()', () => typeof scope.agentPresets?.remove === 'function'],
+      ['connection.fetch.register()', () => typeof scope.connection?.fetch?.register === 'function'],
+    ]
+    const missing = REQUIRED_APIS.filter(([, probe]) => !probe()).map(([name]) => name)
     if (missing.length > 0) {
       console.error(
         'custom-mode: 当前 DSH 版本缺少所需 API：' +
@@ -527,7 +560,16 @@ export function apply(ctx) {
     /** The roster, or an empty list — discovery itself reports broken rows rather than throwing. */
     const roster = async () => {
       const rows = await scope.agentPresets.list()
-      return Array.isArray(rows) ? rows : []
+      if (!Array.isArray(rows)) {
+        // 形状变了：静默返回空列表会让页面显示"一个助手都没有"，比报错更难查（曾经就因为
+        // 缺少这种告警，一个 API 形状变化以"设置页白屏"的形式出现）。
+        if (!warnedRosterShape) {
+          warnedRosterShape = true
+          console.error('custom-mode: agentPresets.list() 没有返回数组（DSH 版本不匹配？），助手列表将为空。')
+        }
+        return []
+      }
+      return rows
     }
 
     /**
@@ -556,7 +598,16 @@ export function apply(ctx) {
         }
         if (request.method === 'GET' && pathname === STATE_PATH) {
           await ensureShipped()
-          return json(readState(await roster(), url.searchParams.get('id') ?? ''))
+          return json(readState(await roster(), url.searchParams.get('id') ?? '', { factoryPrompt: packagedPrompt() }))
+        }
+
+        // Backstop on request size. `requestBody: 'buffered'` means the platform applies its own
+        // JSON cap, but that cap is the host's configuration, not a contract — measured on Windows,
+        // a 5 MB body reached us happily. This keeps one authenticated request from making us buffer
+        // an unbounded amount; the platform's cap remains the primary guard.
+        const declared = Number(request.headers.get('content-length') ?? '')
+        if (Number.isFinite(declared) && declared > MAX_BODY_BYTES) {
+          return json({ ok: false, error: `请求体过大（上限 ${String(MAX_BODY_BYTES)} 字节）` }, 413)
         }
 
         // Everything below writes, so the body is read and parsed exactly once.
@@ -611,7 +662,10 @@ export function apply(ctx) {
  * prompt，而这个文件正是"用户的提示词"。
  */
 function writeAtomic(file, text) {
-  const temporary = `${file}.tmp-${String(process.pid)}`
+  // 临时名必须**每个请求唯一**：只带 pid 时，同一进程内两个并发保存会争同一个临时名，
+  // Windows 上两个 rename 指向同一目标会以 EPERM 失败（实测：10 并发保存 2 例 400），
+  // 而 POSIX 上 rename 原子覆盖、静默地后写胜出 —— 也就是说这个缺陷只在 Windows 显现。
+  const temporary = `${file}.tmp-${String(process.pid)}-${randomBytes(4).toString('hex')}`
   writeFileSync(temporary, text, 'utf8')
   renameSync(temporary, file)
 }

package/locales.mjs

@@ -36,6 +36,8 @@ export const zh = {
   'btn.moveDown': '下移',
   'btn.import': '导入提示词',
   'btn.export': '导出提示词',
+  'btn.reset': '恢复出厂提示词',
+  'btn.resetHint': '把编辑器里的内容换成出厂模板（新建助手时得到的那一份）。它同样只改草稿，点保存才落盘 —— 误点可以用「重新读取」撤销。',
   'btn.delete': '删除这个助手',
   'btn.cancel': '取消',
   'msg.created': '已创建。现在可以为它写系统提示词。',
@@ -74,7 +76,7 @@ export const zh = {
 
   'prompt.heading': '系统提示词',
   'prompt.hint':
-    '这段文本在每个模型调用前重新读取，所以保存后下一步即生效，且只影响使用这个助手的会话。「导入」把文件读进编辑器（未保存前不写入任何东西）；「导出」把当前文本存成 .md 文件。',
+    '这段文本在每个模型调用前重新读取，所以保存后下一步即生效，且只影响使用这个助手的会话。「导入」把文件读进编辑器（未保存前不写入任何东西）；「导出」把当前文本存成 .md 文件；「恢复出厂提示词」把出厂模板填回编辑器（同样要保存才写入）。',
 
   'status.enabled': '已启用',
   'status.disabled': '已停用',
@@ -183,6 +185,8 @@ export const en = {
   'btn.moveDown': 'Move down',
   'btn.import': 'Import prompt',
   'btn.export': 'Export prompt',
+  'btn.reset': 'Reset to factory prompt',
+  'btn.resetHint': 'Puts the shipped template back into the editor (the text a new assistant starts from). Like every other edit it only changes the draft — save to apply, or use Reload to discard.',
   'btn.delete': 'Delete this assistant',
   'btn.cancel': 'Cancel',
   'msg.created': 'Created. Now you can write its system prompt.',
@@ -224,7 +228,7 @@ export const en = {
 
   'prompt.heading': 'System prompt',
   'prompt.hint':
-    'This text is re-read before every model call, so a save applies on the next step and only affects sessions on this assistant. "Import" reads a file into the editor (nothing is written until you save); "Export" saves the current text as a .md file.',
+    'This text is re-read before every model call, so a save applies on the next step and only affects sessions on this assistant. "Import" reads a file into the editor (nothing is written until you save); "Export" saves the current text as a .md file; "Reset to factory prompt" puts the shipped template back into the editor (also saved only when you save).',
 
   'status.enabled': 'Enabled',
   'status.disabled': 'Disabled',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-custom-mode",
-  "version": "1.0.3",
+  "version": "1.1.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",

package/preset/prompt-tool.mjs

@@ -25,7 +25,8 @@
  * needs no isolate realm.
  */
 
-import { mkdirSync, readFileSync, writeFileSync } from 'node:fs'
+import { randomBytes } from 'node:crypto'
+import { mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs'
 import { dirname } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
@@ -188,7 +189,10 @@ function makeDefinition(modeName) {
       if (verdict.ok !== true) return verdict.error
       try {
         mkdirSync(dirname(PROMPT_PATH), { recursive: true })
-        writeFileSync(PROMPT_PATH, args.text, 'utf8')
+        // 与设置页同一条纪律：临时文件 + rename。读取器（prompt-reader.mjs）按 mtime+size 缓存，
+        // 非原子写会让它有机会读到写了一半的提示词 —— 设置页早已改用原子写，这里原先还是
+        // 直接 writeFileSync，属于"自我标准不一致"。
+        writeAtomic(PROMPT_PATH, args.text)
         return '已写入 ' + PROMPT_PATH + '（' + String(args.text.length) + ' 字符）。本会话下一步模型调用即使用新提示词。'
       } catch (error) {
         return '写入失败：' + String((error && error.message) || error)
@@ -204,3 +208,15 @@ export function apply(ctx, config = {}) {
   const definition = makeDefinition(resolveModeName(config))
   ctx.effect(() => ctx.tools.register(definition), 'custom-prompt.tool')
 }
+
+/**
+ * 写文件：同目录临时文件 + rename（rename 在同一文件系统内原子）。
+ *
+ * 临时名带 pid 与随机后缀：同一进程内的并发写必须各用各的临时名，否则 Windows 上两个
+ * rename 指向同一目标会以 EPERM 失败。
+ */
+function writeAtomic(file, text) {
+  const temporary = `${file}.tmp-${String(process.pid)}-${randomBytes(4).toString('hex')}`
+  writeFileSync(temporary, text, 'utf8')
+  renameSync(temporary, file)
+}