dsh-custom-mode 1.1.0 → 1.2.0

package/client.js

@@ -92,6 +92,13 @@ try {
         "msg.reorderFailed": "调整顺序失败",
         "msg.imported": "已导入到编辑器（还没有保存）：检查后点「保存」。",
         "msg.importFailed": "导入失败",
+        "history.label": "改动历史",
+        "history.pick": "选择要载入的版本…",
+        "history.load": "载入这一版",
+        "history.hint": "每次保存、以及会话内工具或手工改动，都会在这里留一版；载入只改草稿，保存前不落盘。",
+        "history.by.settings": "设置页保存",
+        "history.by.external": "会话内/手工改动",
+        "msg.loadFailed": "载入这一版失败",
         "msg.importEmpty": "这个文件是空的。",
         "msg.importTooLarge": "文件太大（上限 1MB）。",
         "msg.exported": "已导出为文件。",
@@ -224,6 +231,13 @@ try {
         "msg.reorderFailed": "Could not reorder",
         "msg.imported": "Imported into the editor (not saved yet) — review it, then click Save.",
         "msg.importFailed": "Import failed",
+        "history.label": "Change history",
+        "history.pick": "Pick a version to load…",
+        "history.load": "Load this version",
+        "history.hint": "Every save — plus changes made in a session or by hand — leaves a version here. Loading one only edits the draft; nothing is written until you save.",
+        "history.by.settings": "saved from this page",
+        "history.by.external": "changed in a session / by hand",
+        "msg.loadFailed": "Could not load that version",
         "msg.importEmpty": "That file is empty.",
         "msg.importTooLarge": "That file is too large (1 MB limit).",
         "msg.exported": "Exported to a file.",
@@ -535,6 +549,7 @@ try {
       const ROUTES = {
         list: ROUTE,
         state: ROUTE + "/state",
+        history: ROUTE + "/history",
         create: ROUTE + "/create",
         delete: ROUTE + "/delete",
         reorder: ROUTE + "/reorder",
@@ -576,6 +591,13 @@ try {
       }
 
       /** The editable draft for one assistant, derived from its loaded state. */
+      /** 时间戳给人看：转本地时间；解析不了就原样显示（历史文件是纯文本，什么都有可能）。 */
+      function formatWhen(at) {
+        const parsed = new Date(at)
+        if (Number.isNaN(parsed.getTime())) return String(at).slice(0, 16)
+        return parsed.toLocaleString()
+      }
+
       function draftOf(state) {
         return {
           id: state.id,
@@ -587,6 +609,9 @@ try {
           // 「恢复出厂提示词」要用它。它不是草稿的一部分，`sameDraft` 不比较它 ——
           // 漏掉这一行按钮会一直置灰（实测：真点了没反应，浏览器验收抓到）。
           factoryPrompt: typeof state.factoryPrompt === "string" ? state.factoryPrompt : null,
+          // 改动历史：列表来自 state（只有元数据），正文点「载入这一版」时按需取。
+          history: Array.isArray(state.history) ? state.history : [],
+          historyPick: "",
         }
       }
 
@@ -915,6 +940,24 @@ try {
           update({ prompt: factory })
         }
 
+        /** 把某个历史版本载入编辑器。与「恢复出厂」同一条纪律：只改草稿，保存前不落盘。 */
+        const loadVersion = async () => {
+          const picked = typeof draft.historyPick === "string" ? draft.historyPick : ""
+          if (picked === "" || draft.id === undefined) return
+          try {
+            // 版本键是序号（时间戳会在同一毫秒内撞车 —— 单测就是那样抓到它的）。
+            const response = await fetch(ROUTES.history + "?id=" + encodeURIComponent(draft.id) + "&n=" + encodeURIComponent(picked))
+            const payload = await asJson(response)
+            if (payload === null || payload.ok !== true) {
+              setStatus(t("msg.loadFailed"))
+              return
+            }
+            update({ prompt: payload.text })
+          } catch (error) {
+            setStatus(t("msg.loadFailed") + "：" + describeError(error))
+          }
+        }
+
         const exportPrompt = () => {
           try {
             const blob = new Blob([draft.prompt], { type: "text/markdown;charset=utf-8" })
@@ -1314,6 +1357,42 @@ try {
                   "aria-label": t("prompt.heading"),
                   onChange: (event) => update({ prompt: event.target.value }),
                 }),
+                // 改动历史：谁在什么时候改过。之前这里只有"当前文本"，所以会话内的工具
+                // （或手工编辑）改掉提示词时，用户既看不见也回不去。
+                draft.history.length === 0
+                  ? null
+                  : react.createElement(
+                      "div",
+                      { className: "cpfe-history" },
+                      react.createElement("span", { className: "cpfe-history-label" }, t("history.label")),
+                      react.createElement(
+                        "select",
+                        {
+                          value: draft.historyPick,
+                          "aria-label": t("history.label"),
+                          onChange: (event) => update({ historyPick: event.target.value }),
+                        },
+                        react.createElement("option", { value: "" }, t("history.pick")),
+                        ...draft.history.map((entry) =>
+                          react.createElement(
+                            "option",
+                            { key: String(entry.n), value: String(entry.n) },
+                            formatWhen(entry.at) + " · " + t("history.by." + entry.by) + " · " + String(entry.bytes) + " B",
+                          ),
+                        ),
+                      ),
+                      react.createElement(
+                        A.Button,
+                        {
+                          variant: "outline",
+                          size: "sm",
+                          disabled: busy || draft.historyPick === "",
+                          onClick: loadVersion,
+                        },
+                        t("history.load"),
+                      ),
+                      react.createElement("span", { className: "cpfe-history-hint" }, t("history.hint")),
+                    ),
               ),
             ]
           : []

package/index.mjs

@@ -51,6 +51,7 @@ import {
   setShippedPresetsDir,
 } 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 {
   allocateId,
@@ -70,11 +71,13 @@ const STATE_PATH = ROUTE_PATH + '/state'
 const CREATE_PATH = ROUTE_PATH + '/create'
 const DELETE_PATH = ROUTE_PATH + '/delete'
 const REORDER_PATH = ROUTE_PATH + '/reorder'
+const HISTORY_PATH = ROUTE_PATH + '/history'
 
 /** Which verbs each endpoint answers. `undefined` for a path means 404. */
 const METHODS = {
   [ROUTE_PATH]: ['GET'],
   [STATE_PATH]: ['GET', 'POST'],
+  [HISTORY_PATH]: ['GET'],
   [CREATE_PATH]: ['POST'],
   [DELETE_PATH]: ['POST'],
   [REORDER_PATH]: ['POST'],
@@ -217,6 +220,9 @@ export function readState(rows, id, options = {}) {
   const mode = modeOf(text)
   const prompt = readPrompt(directory)
   const meta = readPresetMeta(directory)
+  // 页面要打开时顺便对账：磁盘上的文本若与日志末条不同，说明它在设置页之外被改过
+  // （会话内的 custom_prompt 工具、手工编辑、别处同步）—— 补记一条 external，于是"被改过"看得见。
+  if (prompt.ok === true) recordExternalChange(directory, prompt.text)
   return {
     ok: true,
     id,
@@ -234,6 +240,8 @@ export function readState(rows, id, options = {}) {
     // 回退用的出厂文本。它不是"当前值"，页面只把它填进编辑器，保存前不落盘 —— 所以
     // 一次误点不会破坏任何东西（重新读取即可丢弃）。
     factoryPrompt: typeof options.factoryPrompt === 'string' ? options.factoryPrompt : null,
+    // 改动历史（只有元数据，正文按需取：见 GET /custom-mode/history）。
+    history: listHistory(directory),
   }
 }
 
@@ -311,6 +319,9 @@ export function saveState(rows, input) {
   try {
     writeAtomic(compositionFile(directory), composition)
     writeAtomic(promptFile(directory), prompt)
+    // 改动留痕：三个改动路径（设置页 / 会话内工具 / 手工编辑）里，只有设置页是"当场知道"的。
+    // 另外两条由 readState 对比补记（见 journal.mjs 的单写者说明）。
+    recordPrompt(directory, prompt, HISTORY_SOURCE.settings)
   } catch (error) {
     return { ok: false, error: '写入失败：' + describe(error) }
   }
@@ -601,6 +612,16 @@ export function apply(ctx) {
           return json(readState(await roster(), url.searchParams.get('id') ?? '', { factoryPrompt: packagedPrompt() }))
         }
 
+        if (request.method === 'GET' && pathname === HISTORY_PATH) {
+          await ensureShipped()
+          const id = url.searchParams.get('id') ?? ''
+          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)
+          return json({ ok: true, id, n: url.searchParams.get('n'), text })
+        }
+
         // 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

package/journal.mjs

@@ -0,0 +1,157 @@
+/**
+ * 提示词改动日志：**只追加**、单写者、可审计。
+ *
+ * 为什么需要它：一个助手的 `prompt.md` 有三条改动路径 —— 设置页保存、会话内的 `custom_prompt`
+ * 工具、以及手工编辑文件。后两条对用户是**不可见**的：提示词变了，页面只会显示"当前文本"，
+ * 没有任何地方能看出"谁在什么时候改的、上一版是什么"。这个模块把每一次变化留成一行，于是
+ * "恢复出厂"之外还能"回到上一版"，会话内被改动也能被看见。
+ *
+ * 设计取舍（都写在这里，因为它们看起来可以更简单）：
+ *
+ * 1. **单写者**：只有宿主半写这个文件。会话内的工具**不**直接写日志 —— 否则文件格式就得在
+ *    preset 副本里再实现一遍（那些文件是独立分发的）。改为在读状态时对比"当前文本 vs 日志末条"，
+ *    不一致就补记一条 `external`：工具改的、手工改的、甚至别的机器同步过来的，都会以同一种方式
+ *    留痕。代价是同一段文本的**中间若干次**改动看不到（我们只能看到"离开时的样子"），这一点
+ *    在文档里写明，不假装是版本控制。
+ * 2. **只追加 + 上限**：追加而不是覆盖，坏一行不牵连其余（解析时跳过坏行）。超过上限就整文件
+ *    重写成最后 N 条 —— 这是唯一的"重写"，且只发生在追加之后，用原子写完成。
+ * 3. **相同内容不重复记**：保存两次而文本没变，不该产生两条历史。
+ * 4. **版本键是自增序号，不是时间戳**：同一毫秒内落两次记录完全可能（实测：连续两次保存），
+ *    时间戳做键会让"取回某一版"取到隔壁那条。时间戳只用于显示。
+ *
+ * 这个方向借鉴了同生态里 whale-persona 的"收件箱"设计（只追加、坏行不牵连、状态显式），
+ * 但这里记录的是**已发生的事实**而不是待确认的提议 —— 我们的场景是"改了什么要看得见、回得去"，
+ * 不需要它的确认闸门。
+ */
+import { existsSync, readFileSync, renameSync, writeFileSync } from 'node:fs'
+import { join } from 'node:path'
+
+/** 每个助手目录下的日志文件名。 */
+export const HISTORY_NAME = 'prompt-history.jsonl'
+
+/** 保留的最大版本数。超出后整文件重写为最后这么多条。 */
+export const HISTORY_MAX = 30
+
+/** 改动来源。`settings` 是设置页保存；`external` 是日志末条之后发生的任何改动。 */
+export const HISTORY_SOURCE = { settings: 'settings', external: 'external' }
+
+/** @param {string} directory - one assistant's preset directory. */
+export function historyFile(directory) {
+  return join(directory, HISTORY_NAME)
+}
+
+/**
+ * Parse the log, skipping unreadable lines.
+ *
+ * A line that is not valid JSON, or lacks a text, is ignored rather than throwing: this file is
+ * written across process restarts and may be edited by hand, and one bad line must not cost the
+ * user every version (the same reason the inbox design in this ecosystem replays line by line).
+ *
+ * @returns {Array<{ at: string, by: string, text: string }>} oldest first.
+ */
+export function readEntries(directory) {
+  const file = historyFile(directory)
+  if (!existsSync(file)) return []
+  const entries = []
+  for (const line of readFileSync(file, 'utf8').split('\n')) {
+    if (line.trim() === '') continue
+    try {
+      const parsed = JSON.parse(line)
+      if (parsed === null || typeof parsed !== 'object') continue
+      if (typeof parsed.text !== 'string') continue
+      entries.push({
+        // 老日志没有 n 时按行序补一个，于是"序号"这个概念对任何日志都成立。
+        n: Number.isInteger(parsed.n) && parsed.n > 0 ? parsed.n : entries.length + 1,
+        at: typeof parsed.at === 'string' ? parsed.at : '',
+        by: typeof parsed.by === 'string' ? parsed.by : HISTORY_SOURCE.external,
+        text: parsed.text,
+      })
+    } catch {
+      continue
+    }
+  }
+  return entries
+}
+
+/**
+ * Append one revision, unless it repeats the newest one.
+ *
+ * @param {string} directory - one assistant's preset directory.
+ * @param {string} text - the prompt content **after** the change.
+ * @param {string} by - {@link HISTORY_SOURCE}.
+ * @returns {{ recorded: boolean, at: string, n: number }} whether a line was appended.
+ */
+export function recordPrompt(directory, text, by = HISTORY_SOURCE.settings) {
+  if (typeof text !== 'string') return { recorded: false, at: '' }
+  const entries = readEntries(directory)
+  const newest = entries[entries.length - 1]
+  if (newest !== undefined && newest.text === text) return { recorded: false, at: newest.at }
+
+  const at = new Date().toISOString()
+  const n = entries.length === 0 ? 1 : entries[entries.length - 1].n + 1
+  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 }),
+  )
+  lines.push(JSON.stringify({ n, at, by, bytes: text.length, text }))
+
+  // 唯一的整文件重写：顺手把上限外的旧条目丢掉，用原子写落盘（读取器不会看到写了一半的文件）。
+  const file = historyFile(directory)
+  const temporary = `${file}.tmp-${String(process.pid)}`
+  writeFileSync(temporary, lines.join('\n') + '\n', 'utf8')
+  renameSync(temporary, file)
+  return { recorded: true, at, n }
+}
+
+/**
+ * The log as the page needs it: newest first, **without** the texts.
+ *
+ * Text is fetched per revision on demand (`readVersion`) — a page that ships 30 prompts on every
+ * load would be slower than the thing it is documenting.
+ *
+ * @returns {Array<{ at: string, by: string, bytes: number, preview: string }>}
+ */
+export function listHistory(directory, limit = HISTORY_MAX) {
+  const entries = readEntries(directory)
+  const out = []
+  for (const entry of entries.slice(-limit).reverse()) {
+    const firstLine = entry.text.split('\n').find((line) => line.trim() !== '') ?? ''
+    out.push({
+      n: entry.n,
+      at: entry.at,
+      by: entry.by,
+      bytes: entry.text.length,
+      preview: firstLine.trim().slice(0, 80),
+    })
+  }
+  return out
+}
+
+/**
+ * One revision's full text, by its sequence number.
+ *
+ * The key is `n`, not `at`: two revisions can share a timestamp (measured — two records inside the
+ * same millisecond), and keying on it silently returns the neighbour.
+ *
+ * @param {number|string} n - the revision number shown in {@link listHistory}.
+ * @returns {string|null}
+ */
+export function readVersion(directory, n) {
+  const wanted = typeof n === 'string' ? Number(n) : n
+  if (!Number.isInteger(wanted)) return null
+  for (const entry of readEntries(directory)) {
+    if (entry.n === wanted) return entry.text
+  }
+  return null
+}
+
+/**
+ * Record `text` as an `external` revision when it is not what the log already ends with.
+ *
+ * This is how changes made outside the settings page become visible: the page asks for state, and
+ * the host notices that what is on disk is not what it last recorded.
+ *
+ * @returns {boolean} whether something was recorded.
+ */
+export function recordExternalChange(directory, text) {
+  return recordPrompt(directory, text, HISTORY_SOURCE.external).recorded
+}

package/locales.mjs

@@ -52,6 +52,13 @@ export const zh = {
   'msg.reorderFailed': '调整顺序失败',
   'msg.imported': '已导入到编辑器（还没有保存）：检查后点「保存」。',
   'msg.importFailed': '导入失败',
+  'history.label': '改动历史',
+  'history.pick': '选择要载入的版本…',
+  'history.load': '载入这一版',
+  'history.hint': '每次保存、以及会话内工具或手工改动，都会在这里留一版；载入只改草稿，保存前不落盘。',
+  'history.by.settings': '设置页保存',
+  'history.by.external': '会话内/手工改动',
+  'msg.loadFailed': '载入这一版失败',
   'msg.importEmpty': '这个文件是空的。',
   'msg.importTooLarge': '文件太大（上限 1MB）。',
   'msg.exported': '已导出为文件。',
@@ -201,6 +208,13 @@ 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',
+  'history.label': 'Change history',
+  'history.pick': 'Pick a version to load…',
+  'history.load': 'Load this version',
+  'history.hint': 'Every save — plus changes made in a session or by hand — leaves a version here. Loading one only edits the draft; nothing is written until you save.',
+  'history.by.settings': 'saved from this page',
+  'history.by.external': 'changed in a session / by hand',
+  'msg.loadFailed': 'Could not load that version',
   'msg.importEmpty': 'That file is empty.',
   'msg.importTooLarge': 'That file is too large (1 MB limit).',
   'msg.exported': 'Exported to a file.',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-custom-mode",
-  "version": "1.1.0",
+  "version": "1.2.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",
@@ -52,6 +52,7 @@
     "meta.mjs",
     "paths.mjs",
     "locales.mjs",
+    "journal.mjs",
     "cordis.patch.yml",
     "preset/"
   ],