dsh-custom-mode 2.0.1 → 2.2.0

package/index.mjs

@@ -7,8 +7,10 @@
  *   GET  /api/custom-mode              — every assistant this feature manages.
  *   GET  /api/custom-mode/state?id=…   — one assistant: base mode, rows, switches, prompt.
  *   GET  /api/custom-mode/history?id=…&n=… — one prompt revision (metadata comes with the state).
- *   POST /api/custom-mode/state        — { id, mode, overrides, prompt, name, description }:
+ *   POST /api/custom-mode/state        — { id, mode, overrides, prompt, name, description, baseN? }:
  *                                        validate, render a fresh `agent.cordis.yml`, write both files.
+ *                                        `baseN` is the newest history number the page loaded. A JSON
+ *                                        number that is not the prompt now on disk refuses the write.
  *   POST /api/custom-mode/create       — { name, description, posture?, locale? }: seed a new
  *                                        assistant. Omitting `posture` (or sending `develop`) is the
  *                                        historical path: the packaged prompt and the standard base,
@@ -53,7 +55,8 @@ import {
 } from './preset-backend/index.mjs'
 import { existsSync, readFileSync, rmSync, writeFileSync } from 'node:fs'
 import { dirname, join } from 'node:path'
-import { PROMPT_PATH, COMPOSITION_PATH, ROUTE_PATH, PRESET_DIR } from './paths.mjs'
+import { PROMPT_PATH, COMPOSITION_PATH, ROUTE_PATH, PRESET_DIR, dshHome } from './paths.mjs'
+import { ensureUnsetDefaultPreset } from './defaults.mjs'
 import {
   allowlistOverrides,
   applyRowExclusivity,
@@ -492,6 +495,38 @@ export function readList(rows) {
  */
 const writeChains = new Map()
 
+/**
+ * 打开页面之后、按下保存之前，`prompt.md` 可能已被会话工具或手工改过。
+ *
+ * 先把磁盘上的那一版记进历史。页面带了 JSON 数字 `baseN`，且那个版本不是磁盘上这一版时，
+ * 拒绝写入：磁盘保持外部文本。不带 `baseN` 的旧客户端仍覆盖，但原文已经在历史里。
+ * 数字字符串不算 `baseN`。留痕自己失败时不挡住这次保存。
+ *
+ * @param {string} directory
+ * @param {string} prompt - the text this save wants to write.
+ * @param {unknown} baseN
+ * @returns {object|null} a `conflict` result, or null when the write may proceed.
+ */
+function refuseStalePrompt(directory, prompt, baseN) {
+  try {
+    const diskPrompt = readPrompt(directory)
+    if (diskPrompt.ok !== true || diskPrompt.text === prompt) return null
+    recordExternalChange(directory, diskPrompt.text)
+    if (typeof baseN === 'number' && readVersion(directory, baseN) !== diskPrompt.text) {
+      return {
+        ok: false,
+        code: 'conflict',
+        params: { baseN },
+        error: '磁盘上的提示词已经变了，这次保存没有写入。',
+        note: '磁盘上的提示词已经变了，这次保存没有写入。',
+      }
+    }
+  } catch {
+    /* 审计留痕失败不挡住这次保存 */
+  }
+  return null
+}
+
 function serializedWrite(key, work) {
   const previous = writeChains.get(key) ?? Promise.resolve()
   const next = previous.then(work, work)
@@ -509,12 +544,13 @@ function serializedWrite(key, work) {
  * 的行集合也就不变，这是所有选项里破坏性最小的一个。
  *
  * @param {string} directory - the assistant's preset directory.
- * @param {{id: string, mode: string, prompt: string, name: string, description: string, displayName?: string}} input
+ * @param {{id: string, mode: string, prompt: string, name: string, description: string, displayName?: string, baseN?: number}} input
  *   - the validated save; `name` decides whether `preset.yml` is written, `displayName` is what the response
- *   reports (the disk name when the request omitted one — issue #9).
+ *   reports (the disk name when the request omitted one — issue #9). `baseN` is the same stale-save
+ *   token as {@link saveState}: a JSON number only.
  * @returns {object} the shape `saveState` returns, with `code: 'savedPromptOnly'`.
  */
-export function savePromptOnly(directory, { id, mode, prompt, name, description, displayName }) {
+export function savePromptOnly(directory, { id, mode, prompt, name, description, displayName, baseN }) {
   // 与正常保存同一条纪律：提示词与 preset.yml 一起换名，失败则两个都不动。
   let metaText = null
   if (name !== '') {
@@ -522,6 +558,8 @@ export function savePromptOnly(directory, { id, mode, prompt, name, description,
     if (rendered.ok !== true) return rendered
     metaText = rendered.text
   }
+  const conflict = refuseStalePrompt(directory, prompt, baseN)
+  if (conflict !== null) return conflict
   try {
     writeAtomicPair([
       [promptFile(directory), prompt],
@@ -542,7 +580,7 @@ export function savePromptOnly(directory, { id, mode, prompt, name, description,
     code: 'savedPromptOnly',
     // 响应里的名字用**磁盘上的那个**（issue #9）：请求省略 name 时不该把 params.name 报成裸目录 id。
     params: { name: (displayName === undefined || displayName === '' ? name : displayName) === '' ? id : (displayName === undefined || displayName === '' ? name : displayName), mode },
-    note: '已保存系统提示词（本机取不到基础模式的出厂组成，插件开关与基础模式未改动）。新建会话即生效。',
+    note: '已保存系统提示词（本机取不到基础模式的出厂组成，插件开关与基础模式未改动）。下一步组装时会重读这个文件。',
   }
 }
 
@@ -618,7 +656,15 @@ export function saveState(rows, input) {
     // 还想改开关时明确拒绝，而不是悄悄丢掉用户的意图。
     if (isBaseCompositionUnavailable(error)) {
       if (overrides.size === 0 && existsSync(compositionFile(directory))) {
-        return savePromptOnly(directory, { id, mode, prompt, name, description, displayName: effectiveName })
+        return savePromptOnly(directory, {
+          id,
+          mode,
+          prompt,
+          name,
+          description,
+          displayName: effectiveName,
+          baseN: input !== null && typeof input === 'object' ? input.baseN : undefined,
+        })
       }
       return {
         ok: false,
@@ -650,6 +696,8 @@ export function saveState(rows, input) {
     if (rendered.ok !== true) return rendered
     metaText = rendered.text
   }
+  const conflict = refuseStalePrompt(directory, prompt, input !== null && typeof input === 'object' ? input.baseN : undefined)
+  if (conflict !== null) return conflict
   try {
     writeAtomicPair([
       [compositionFile(directory), composition],
@@ -683,7 +731,7 @@ export function saveState(rows, input) {
       params: { name: displayName, mode, rows: autoOff.join(', ') },
       note:
         '已保存（' + displayName + '，基础模式 ' + mode + '）。这两套壳注册同名工具、不能同时启用 —— ' +
-        '已自动关掉：' + autoOff.join('、') + '。新建会话即生效，当前会话保持原配置。',
+        '已自动关掉：' + autoOff.join('、') + '。下一步组装时会重读已保存的提示词。',
     }
   }
   return {
@@ -692,7 +740,7 @@ export function saveState(rows, input) {
     mode,
     code: 'saved',
     params: { name: displayName, mode },
-    note: '已保存（' + displayName + '，基础模式 ' + mode + '）。新建会话即生效，当前会话保持原配置。',
+    note: '已保存（' + displayName + '，基础模式 ' + mode + '）。下一步组装时会重读已保存的提示词。',
   }
 }
 
@@ -1077,6 +1125,15 @@ export function apply(ctx) {
     console.error('custom-mode: 初始化 preset 目录时出现意外错误（已忽略）: ' + describe(error))
   }
 
+  try {
+    const presetDefault = ensureUnsetDefaultPreset(dshHome(), LEGACY_ID)
+    if (presetDefault.wrote) {
+      console.log('custom-mode: settings.yaml 里没有 agent-presets.default，已写成 ' + LEGACY_ID + '。已有的值不会改。')
+    }
+  } catch (error) {
+    console.error('custom-mode: 没有写 agent-presets.default: ' + describe(error))
+  }
+
   try {
     ctx.inject(WEB_SERVICES, (scope) => {
     // Compatibility guard: this plugin reads host APIs that a future DSH release could

package/locales.mjs

@@ -87,10 +87,11 @@ export const zh = {
   'msg.repaired': '已修复',
   'meta.version': '插件版本',
   'meta.versionHint': '未钉版本时，可能装到较旧的发布。要换版本，按 README 钉版本重装，然后重启。',
-  'api.saved': '已保存（{name}，{mode}）。新会话使用新配置，当前会话不变。',
+  'api.saved': '已保存（{name}，{mode}）。下一步组装时会重读已保存的提示词。',
+  'api.conflict': '磁盘上的提示词已经变了，这次没有写入。先重新读取，再决定要不要覆盖。',
   'api.savedWithExclusiveRows': '已保存（{name}，{mode}）。已关闭不能同时启用的行：{rows}。',
   'api.created': '已创建「{name}」。刷新后，新会话的模式菜单里会出现它。',
-  'api.savedPrompt': '已保存系统提示词（{name}）。下一步模型调用即生效。',
+  'api.savedPrompt': '已保存系统提示词（{name}）。下一步组装时会重读这个文件。',
   'api.duplicated': '已从「{from}」复制。两份互不影响。',
   'api.deleted': '已删除「{name}」。正在使用它的会话不受影响。',
   'api.reordered': '顺序已保存。新会话的模式菜单按此排列。',
@@ -169,7 +170,7 @@ export const zh = {
   'rows.hint': '关闭的行，这个助手不会使用。',
 
   'prompt.heading': '系统提示词',
-  'prompt.hint': '保存后，下一步模型调用即生效。',
+  'prompt.hint': '保存后，下一步组装模型输入时重读这个文件。',
 
   'status.enabled': '已启用',
   'status.disabled': '已停用',
@@ -186,7 +187,7 @@ export const zh = {
   'msg.unsaved': '有未保存的修改',
   'msg.readFailed': '读取失败',
   'msg.saveFailed': '保存失败',
-  'msg.saved': '已保存。新会话使用新配置，当前会话不变。',
+  'msg.saved': '已保存。下一步组装时会重读这个文件。',
   // 把「一句已翻译的话 + 一个底层细节」拼起来时，中间那个标点也必须**按语言**走 ——
   // 硬编码全角冒号会让英文界面在出错那一刻出现中文标点（issue #7）。
   'status.detail': '{message}：{detail}',
@@ -342,10 +343,11 @@ export const en = {
   'msg.repaired': 'Repaired',
   'meta.version': 'Plugin version',
   'meta.versionHint': 'Without a pinned version, an older release may be installed. To change it, reinstall with the version pin from the README, then restart.',
-  'api.saved': 'Saved ({name}, {mode}). New sessions use it. The current session does not change.',
+  'api.saved': 'Saved ({name}, {mode}). The next model step rereads the saved prompt.',
+  'api.conflict': 'The prompt on disk has changed, so this save was not written. Reload, then decide whether to overwrite.',
   'api.savedWithExclusiveRows': 'Saved ({name}, {mode}). Turned off rows that cannot be on together: {rows}.',
   'api.created': 'Created {name}. Refresh once, then it appears in the mode menu for a new session.',
-  'api.savedPrompt': 'System prompt saved ({name}). It applies on the next model step.',
+  'api.savedPrompt': 'System prompt saved ({name}). The next model step rereads this file.',
   'api.duplicated': 'Copied from {from}. The two are independent from now on.',
   'api.deleted': 'Deleted {name}. Sessions already using it are unchanged.',
   'api.reordered': 'Order saved. New sessions list modes in this order.',
@@ -424,7 +426,7 @@ export const en = {
   'rows.hint': 'A row that is off is not used by this assistant.',
 
   'prompt.heading': 'System prompt',
-  'prompt.hint': 'After you save, the next model step uses this text.',
+  'prompt.hint': 'After you save, the next model step rereads this file.',
 
   'status.enabled': 'Enabled',
   'status.disabled': 'Disabled',
@@ -441,7 +443,7 @@ export const en = {
   'msg.unsaved': 'Unsaved changes',
   'msg.readFailed': 'Load failed',
   'msg.saveFailed': 'Save failed',
-  'msg.saved': 'Saved. New sessions use it. The current session does not change.',
+  'msg.saved': 'Saved. The next model step rereads this file.',
   'status.detail': '{message}: {detail}',
 
   // ── row labels ────────────────────────────────────────────────────────────

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "dsh-custom-mode",
-  "version": "2.0.1",
-  "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), pick its base mode, switch plugin rows one by one, and keep several assistants side by side — coding, chat or roleplay (RP) personas (multi-mode / multi-agent).",
+  "version": "2.2.0",
+  "description": "Edit a DeepSeek Harness (dsh) mode's system prompt, base mode, and plugin switches.",
   "license": "MIT",
   "type": "module",
+  "author": "bowluna <ai@bowluna.com>",
   "main": "./index.mjs",
   "exports": {
     ".": "./index.mjs",
@@ -23,31 +24,11 @@
     "deepseek-harness",
     "deepseek",
     "dsh-plugin",
-    "cordis",
     "plugin",
     "agent-preset",
-    "agent-mode",
     "custom-mode",
-    "multi-mode",
-    "assistant",
     "system-prompt",
-    "custom-prompt",
-    "prompt-editor",
-    "prompt-engineering",
-    "persona",
-    "multi-agent",
-    "roleplay",
-    "chat",
-    "settings-page",
-    "自定义模式",
-    "系统提示词",
-    "提示词编辑",
-    "多助手",
-    "角色扮演",
-    "deepseek-desktop",
-    "agent-preset",
-    "persona-editor",
-    "dshpreset"
+    "prompt-editor"
   ],
   "dsh": {
     "bundle": {
@@ -69,6 +50,7 @@
     "paths.mjs",
     "locales.mjs",
     "journal.mjs",
+    "defaults.mjs",
     "cordis.patch.yml",
     "LICENSE",
     "postures.mjs",
@@ -78,7 +60,14 @@
   "scripts": {
     "test": "node test/run.mjs",
     "verify-translation-pairing": "node tools/verify-translation-pairing.mjs",
-    "verify-doc-numbers": "node tools/verify-doc-numbers.mjs"
+    "verify-doc-numbers": "node tools/verify-doc-numbers.mjs",
+    "verify-version-consistency": "node tools/verify-version-consistency.mjs",
+    "verify-browser-literals": "node tools/verify-browser-literals.mjs",
+    "boot-check": "node tools/boot-check.mjs",
+    "union-mount-check": "node tools/union-mount-check.mjs",
+    "session-trace": "node tools/session-trace.mjs",
+    "browser-verify": "node tools/browser-verify.mjs",
+    "upgrade-preflight": "node tools/upgrade-preflight.mjs"
   },
   "peerDependencies": {
     "@deepseek-ai/dsh": ">=0.1.5-rc.2 <0.2.0-0 || >=0.1.6-alpha.1 <0.2.0-0 || >=0.1.7-alpha.1 <0.2.0-0 || >=0.2.0-0 <0.3.0-0 || >=0.2.1-alpha.1 <0.3.0-0"