dsh-custom-mode 2.0.1 → 2.1.0

package/README.i18n.yaml

@@ -1,5 +1,5 @@
 # 双语配对一致性记录：两侧在「上次确认一致」时的 git blob 哈希。
 # 两份文档权威相同——改完任意一侧，请把另一侧也改掉，然后重新记录：
 #   node tools/verify-translation-pairing.mjs --write
-README.md: fc8e0127ea50312137654b47ac422a9ae826f5f5
-README.zh.md: 29f389066c64b7135438f18b07525189d5b3ca86
+README.md: d70fd341a9be167188f2e4d6117f93517d6221de
+README.zh.md: aa63c0c8050a3832e9eab670fe77e0ba4dcabbb7

package/README.md

@@ -56,7 +56,7 @@ One command installs everything — the settings-page plugin, and the preset it
 activation:
 
 ```sh
-dsh plugin --profile web add dsh-custom-mode@2.0.1   # pin the version to get this one for sure
+dsh plugin --profile web add dsh-custom-mode@2.1.0   # pin the version to get this one for sure
 # A bare `add dsh-custom-mode` is subject to pnpm's release cooldown (`minimumReleaseAge`, 1 day by
 # default): for hours after a release it can silently install an OLDER version — measured: a bare
 # install 38 minutes after 1.3.0 shipped landed on 1.0.3. Check what you got with `npm ls
@@ -396,7 +396,7 @@ installing again — your data is not touched:
 
 ```sh
 # the pinned form: what you ask for is what you get
-dsh plugin --profile web add dsh-custom-mode@2.0.1
+dsh plugin --profile web add dsh-custom-mode@2.1.0
 # then restart the DSH process that serves the web profile
 ```
 

package/README.zh.md

@@ -49,7 +49,7 @@ base mode / plugin switches / multi-assistant / multi-persona。
 一条命令装完——设置页插件，以及它在首次激活时自动播种的 preset：
 
 ```sh
-dsh plugin --profile web add dsh-custom-mode@2.0.1   # 钉版本才能确定拿到这一版
+dsh plugin --profile web add dsh-custom-mode@2.1.0   # 钉版本才能确定拿到这一版
 # 不带版本号会受 pnpm 的发布冷却期影响（`minimumReleaseAge`，默认一天）：发布后数小时内按名安装
 # 可能**静默装到旧版** —— 实测 1.3.0 发布 38 分钟后按名安装装到了 1.0.3。用 profile 里的
 # `npm ls dsh-custom-mode` 核对实际装到的版本，或像上面那样钉版本。
@@ -68,7 +68,7 @@ dsh `0.1.6-alpha.2` 起有插件管理页：**侧边栏 → 插件 → 添加插
 
 | 输入 | 填什么 | 说明 |
 | --- | --- | --- |
-| **包名** | `dsh-custom-mode` | 受 pnpm 发布冷却期影响，可能装到旧版。要这一版请钉 `@2.0.1` |
+| **包名** | `dsh-custom-mode` | 受 pnpm 发布冷却期影响，可能装到旧版。要这一版请钉 `@2.1.0` |
 | **GitHub 仓库地址** | `https://github.com/BOWLUNA/dsh-custom-mode` | 指向**仓库根**即可 |
 | **本地插件目录** | `<你 clone 的路径>` | 就是仓库根 —— 仓库根**本身**就是发布包 |
 
@@ -300,7 +300,7 @@ MIT
 
 ```sh
 # 钉版本的写法：要哪版就是哪版
-dsh plugin --profile web add dsh-custom-mode@2.0.1
+dsh plugin --profile web add dsh-custom-mode@2.1.0
 # 然后重启为该 profile 提供服务的 DSH 进程
 ```
 

package/client.js

@@ -127,6 +127,7 @@ try {
         "meta.version": "插件版本",
         "meta.versionHint": "未钉版本时，可能装到较旧的发布。要换版本，按 README 钉版本重装，然后重启。",
         "api.saved": "已保存（{name}，{mode}）。新会话使用新配置，当前会话不变。",
+        "api.conflict": "磁盘上的提示词已经变了，这次没有写入。先重新读取，再决定要不要覆盖。",
         "api.savedWithExclusiveRows": "已保存（{name}，{mode}）。已关闭不能同时启用的行：{rows}。",
         "api.created": "已创建「{name}」。刷新后，新会话的模式菜单里会出现它。",
         "api.savedPrompt": "已保存系统提示词（{name}）。下一步模型调用即生效。",
@@ -360,6 +361,7 @@ try {
         "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.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.",
@@ -791,7 +793,7 @@ try {
         ".cpfe-kids{display:flex;flex-direction:column;margin-left:0;padding-left:16px}",
         ".cpfe-row-meta{display:flex;flex-direction:column;gap:2px;min-width:0;flex:1}",
         ".cpfe-row-badges{display:flex;align-items:center;gap:4px;flex:0 1 auto;min-width:0}",
-        ".cpfe-row{display:flex;gap:12px;align-items:center;box-sizing:border-box;min-height:0;padding:16px 0;border:0;border-radius:0;background:none}",
+        ".cpfe-row{display:flex;gap:12px;align-items:center;box-sizing:border-box;min-height:74px;padding:16px 0;border:0;border-radius:0;background:none}",
         ".cpfe-editor{box-sizing:border-box;width:100%;min-height:120px;resize:vertical;padding:12px;border-radius:var(--dsw-radius-md);border:.5px solid var(--dsw-alias-border-l2);background:var(--dsw-alias-bg-module-platform);color:var(--dsw-alias-label-primary);font-family:var(--ds-font-family-code, ui-monospace, SFMono-Regular, Menlo, monospace);font-size:13px;line-height:20px}",
         ".cpfe-bar{display:flex;align-items:center;gap:var(--g);flex-wrap:wrap;margin-top:8px}",
         ".cpfe-disclosure{appearance:none;display:inline-flex;align-items:center;gap:6px;margin:8px 0 0;padding:0;border:0;background:transparent;color:var(--dsw-alias-label-primary);font:inherit;font-size:14px;line-height:22px;font-weight:400;cursor:pointer}",
@@ -1661,6 +1663,7 @@ try {
         const save = async () => {
           setBusy(true)
           try {
+            const newest = Array.isArray(draft.history) && draft.history.length > 0 ? draft.history[0].n : undefined
             const result = await postJson(ROUTES.state, {
               id: draft.id,
               mode: draft.mode,
@@ -1668,6 +1671,7 @@ try {
               prompt: draft.prompt,
               name: draft.name,
               description: draft.description,
+              ...(typeof newest === "number" ? { baseN: newest } : {}),
             })
             if (result !== null && result !== undefined && result.ok === true) {
               setFailed(false)

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,
@@ -492,6 +494,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 +543,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 +557,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],
@@ -618,7 +655,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 +695,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],

package/locales.mjs

@@ -88,6 +88,7 @@ export const zh = {
   'meta.version': '插件版本',
   'meta.versionHint': '未钉版本时，可能装到较旧的发布。要换版本，按 README 钉版本重装，然后重启。',
   'api.saved': '已保存（{name}，{mode}）。新会话使用新配置，当前会话不变。',
+  'api.conflict': '磁盘上的提示词已经变了，这次没有写入。先重新读取，再决定要不要覆盖。',
   'api.savedWithExclusiveRows': '已保存（{name}，{mode}）。已关闭不能同时启用的行：{rows}。',
   'api.created': '已创建「{name}」。刷新后，新会话的模式菜单里会出现它。',
   'api.savedPrompt': '已保存系统提示词（{name}）。下一步模型调用即生效。',
@@ -343,6 +344,7 @@ export const en = {
   '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.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.',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-custom-mode",
-  "version": "2.0.1",
+  "version": "2.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), 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).",
   "license": "MIT",
   "type": "module",