dsh-custom-mode 2.2.5 → 2.2.6

package/composition.mjs

@@ -132,9 +132,10 @@ export const ROW_META = {
   'tool-cordis': { label: 'Cordis 运行时工具', note: '可读写 harness 运行时' },
   'tool-plugin-manager': {
     label: '插件管理（安装 / 启停）',
-    note: '模型侧可安装/启停插件；标准与 PTC 模式里出厂即关闭（只有创造模式默认开），本模式可以显式打开它',
+    note: '供模型安装或启停插件；出厂状态由当前宿主的基础模式声明决定',
   },
   'tool-presentation': { label: 'PTC 工具呈现' },
+  'tool-executor-ptc': { label: 'PTC 程序执行器', note: '通过 run_code 执行程序并调用工具，同时向模型提供工具 SDK' },
   present: { label: '交付文件（present）' },
   'custom-prompt-tool': { label: 'custom_prompt 工具', note: '关掉后无法用对话改提示词（设置页仍可用）' },
   'persistent-shell': { label: '持久 Shell' },
@@ -241,9 +242,9 @@ export function readBaseComposition(modeId) {
  * First writer, in `BASE_MODE_IDS` order (`standard` → `ptc` → `minimal` → `cordis`). The order is not
  * cosmetic: `standard` is the mode this product's own preset is derived from, so a row declared in more
  * than one mode keeps **standard's text and standard's shipped default**. The visible consequence is
- * deliberate — `tool-plugin-manager` ships disabled in `standard` and enabled in `cordis`, and the union
- * keeps it disabled (the user turns it on per assistant if they want it). The alternative rule, "enabled
- * if any mode enables it", would silently arm the model's plugin manager in a mode the user never chose.
+ * deliberate: the union follows this host's `standard` declaration, including any condition on
+ * `tool-plugin-manager`. Its shipped state varies by host version; do not hard-code it as disabled.
+ * Enabling a row merely because another mode does so would change the selected baseline.
  *
  * ## Nothing is cached
  *

package/index.mjs

@@ -1,7 +1,7 @@
 /**
  * Host half: the 「自定义模式」 settings page — an ASSISTANT MANAGER.
  *
- * It registers seven exact routes on the platform's shared `/api` channel; the browser half calls
+ * It registers eight exact routes on the platform's shared `/api` channel; the browser half calls
  * them with `fetch`:
  *
  *   GET  /api/custom-mode              — every assistant this feature manages.
@@ -20,6 +20,7 @@
  *   POST /api/custom-mode/reorder      — { id, direction }: move one assistant up/down in the
  *                                        picker order by writing `order` into each `preset.yml`.
  *   POST /api/custom-mode/repair       — { id }: turn off the rows this dsh line cannot resolve.
+ *   POST /api/custom-mode/sync         — {}: retry registry synchronization without repeating a write.
  *
  * **Why `/api` and not the raw `webServer` table**: the carrier that owns the `/api` channel applies the
  * platform's trust and authentication policy — loopback/`trustedHosts` Host check, `Sec-Fetch-Site`,
@@ -31,7 +32,7 @@
  * route answered 401; a plain form post needs no preflight, so CORS would not have helped either). The
  * registered paths are absolute *including* `/api`, which is what the platform's own packages pass.
  *
- * **Why exact routes rather than one prefix**: the Fetch registry matches exact paths. Seven registrations
+ * **Why exact routes rather than one prefix**: the Fetch registry matches exact paths. Eight registrations
  * cost nothing and each declares the methods it owns, so the method table doubles as the guarantee that a
  * prefetched `GET …/create` cannot create anything — that method is simply not registered for that path.
  *
@@ -101,6 +102,7 @@ const DELETE_PATH = ROUTE_PATH + '/delete'
 const REORDER_PATH = ROUTE_PATH + '/reorder'
 const REPAIR_PATH = ROUTE_PATH + '/repair'
 const HISTORY_PATH = ROUTE_PATH + '/history'
+const SYNC_PATH = ROUTE_PATH + '/sync'
 
 /** Which verbs each endpoint answers. `undefined` for a path means 404. */
 const METHODS = {
@@ -111,6 +113,7 @@ const METHODS = {
   [DELETE_PATH]: ['POST'],
   [REORDER_PATH]: ['POST'],
   [REPAIR_PATH]: ['POST'],
+  [SYNC_PATH]: ['POST'],
 }
 
 /** 只告警一次：避免每个请求都刷同一行日志。 */
@@ -154,6 +157,7 @@ const VARIABLE_NAME = /^[a-z][a-z0-9_]*$/
  * Mirrors `checkPromptText` in the preset's `prompt-tool.mjs`; the duplication is
  * deliberate so neither side depends on the other's install location.
  */
+// cwd is supplied by the old loop, or by prompt-reader's scoped workingDirectory compatibility provider.
 const KNOWN_VARIABLES = ['model', 'cwd', 'provider']
 
 /**
@@ -372,7 +376,8 @@ export function brokenRowIds(message) {
 export function readState(rows, id, options = {}) {
   const directory = assistantDir(rows, id)
   if (directory === undefined) return unknownAssistant(id)
-  restoreBackups(directory)
+  const recovery = restoreBackups(directory)
+  if (recovery.ok !== true) return { ok: false, code: 'recoveryRequired', params: { path: directory, detail: recovery.detail }, error: '助手文件需要恢复：' + recovery.detail }
   const composition = compositionFile(directory)
   if (!existsSync(composition)) return { ok: false, code: 'compositionMissing', params: { path: composition }, error: '找不到组成文件：' + composition }
   const text = readFileSync(composition, 'utf8')
@@ -1299,7 +1304,7 @@ export function apply(ctx) {
           console.error('custom-mode: 取回出厂组成时出错（已忽略）: ' + describe(error))
         }
       }
-      if (declarative === null) return
+      if (declarative === null) return { ok: true, failures: [] }
       try {
         const rows = await rawRoster()
         const targets = []
@@ -1343,8 +1348,10 @@ export function apply(ctx) {
         if (failed.length > 0) {
           console.error(`custom-mode: ${failed.length} 个助手的 preset 未能挂载 —— 见上面的具体原因。`)
         }
+        return { ok: failed.length === 0, failures: failed }
       } catch (error) {
-        console.error('custom-mode: 同步 preset 到注册表失败（已忽略）: ' + describe(error))
+        console.error('custom-mode: 同步 preset 到注册表失败: ' + describe(error))
+        return { ok: false, code: 'syncFailed', failures: [{ id: '', error: describe(error) }] }
       }
     }
 
@@ -1357,18 +1364,14 @@ export function apply(ctx) {
      */
     let startupSync = null
     const roster = async () => {
-      if (startupSync !== null) {
-        const pending = startupSync
-        startupSync = null
-        await pending
-      }
+      if (startupSync !== null) await startupSync
       return rawRoster()
     }
 
-    /** 写操作之后调用：重新对齐注册表。失败已在内部记录，不抛出。 */
-    const resyncPresets = async () => {
-      startupSync = null
-      await doSync()
+    /** Called inside the write queue; readers also await the current synchronization. */
+    const resyncPresets = () => {
+      startupSync = doSync()
+      return startupSync
     }
 
     // 启动即同步：新线不是"写盘即生效"，第一次进来必须先注册。
@@ -1391,6 +1394,11 @@ export function apply(ctx) {
     const json = (value, status = 200) =>
       Response.json(value, { status, headers: { 'cache-control': 'no-store' } })
 
+    const syncFailureParams = (outcome) => ({
+      ids: outcome.failures.map((failure) => failure.id).filter(Boolean).join(', '),
+      detail: outcome.failures.map((failure) => failure.error ?? failure.code ?? 'unknown').join('; '),
+    })
+
     const handle = async (request, pathname) => {
       try {
         const url = new URL(request.url)
@@ -1436,26 +1444,32 @@ export function apply(ctx) {
           return json({ ok: false, code: 'badJson', error: '请求体不是合法 JSON' }, 400)
         }
         await ensureShipped()
-        const targetId = parsed !== null && typeof parsed === 'object' && typeof parsed.id === 'string' ? parsed.id : ''
-        // 一把锁覆盖同一棵预设树。分钥匙会让「删除」和「保存」交错，把刚删的目录再写成半成品。
-        if (pathname === STATE_PATH) {
-          const result = await serializedWrite('preset-write', async () => saveState(await roster(), parsed))
-          return json(result, result.ok === true ? 200 : 400)
-        }
-        if (pathname === CREATE_PATH) {
-          const result = await serializedWrite('preset-write', async () => createAssistant(await roster(), parsed))
-          return json(result, result.ok === true ? 200 : 400)
-        }
-        if (pathname === REPAIR_PATH) {
-          const result = await serializedWrite('preset-write', async () => repairComposition(await roster(), parsed))
-          return json(result, result.ok === true ? 200 : 400)
-        }
-        if (pathname === REORDER_PATH) {
-          const result = await serializedWrite('preset-write', async () => reorderAssistant(await roster(), parsed))
-          return json(result, result.ok === true ? 200 : 400)
-        }
-        const result = await serializedWrite('preset-write', async () => deleteAssistant(await roster(), parsed, presetRemover()))
-        return json(result, result.ok === true ? 200 : 400)
+        // One queue owns the entire mutation, INCLUDING its registry projection. Releasing this lock
+        // before sync allowed a later save to race an older registration and leave disk B / runtime A.
+        return await serializedWrite('preset-write', async () => {
+          const rows = await roster()
+          if (pathname === SYNC_PATH) {
+            const synced = await resyncPresets()
+            if (synced.ok === true) return json({ ok: true, code: 'synchronized', synchronized: true })
+            return json({ ok: false, code: 'syncFailed', persisted: false, synchronized: false, params: syncFailureParams(synced) }, 503)
+          }
+          const result = pathname === STATE_PATH ? saveState(rows, parsed)
+            : pathname === CREATE_PATH ? createAssistant(rows, parsed)
+              : pathname === REPAIR_PATH ? repairComposition(rows, parsed)
+                : pathname === REORDER_PATH ? reorderAssistant(rows, parsed)
+                  : await deleteAssistant(rows, parsed, presetRemover())
+          if (result.ok !== true) return json(result, 400)
+          const synced = await resyncPresets()
+          if (synced.ok !== true) {
+            return json({
+              ...result, ok: false, code: 'savedButSyncFailed', operationCode: result.code,
+              persisted: true, synchronized: false, params: { ...result.params, ...syncFailureParams(synced) },
+              error: '文件已写入，但预设同步失败；请只重试生效，不要重复原操作。',
+              note: '文件已写入，但预设同步失败；请只重试生效，不要重复原操作。',
+            }, 503)
+          }
+          return json({ ...result, persisted: true, synchronized: true })
+        })
       } catch (error) {
         // 兜底也要带 code：这是**意料之外**的异常，页面拿到的是 Node 的原始错误串，方向反着也一样糟
         // ——中文界面里会蹦出一句英文。带 code 后页面用自己的词典渲染，原始串只作为 `detail` 参数。
@@ -1472,14 +1486,7 @@ export function apply(ctx) {
           path: API_PREFIX + pathname,
           methods: [...methods],
           requestBody: 'buffered',
-          fetch: async (request) => {
-            const response = await handle(request, pathname)
-            // 写成功之后，把注册表同步到磁盘的新状态。
-            // 旧线上 `declarative` 是 null，这里恒为空操作；新线上没有它，用户在设置页
-            // 新建/改名/删除的助手就不会出现在选择器里 —— 是本插件最容易被漏掉的一步。
-            if (declarative !== null && request.method !== 'GET' && response.ok) await resyncPresets()
-            return response
-          },
+          fetch: (request) => handle(request, pathname),
         }),
         'custom-mode.route' + pathname,
       )

package/locales.mjs

@@ -16,17 +16,34 @@
 
 /** Simplified Chinese dictionary — the key source of truth. */
 export const zh = {
+  'create.nextStep': '创建后可在上方继续编辑并保存；使用时，在新会话的模式菜单选择它。',
+  'btn.retryRead': '重试读取',
+  'btn.retrySync': '重试生效',
+  'api.savedButSyncFailed': '文件已保存，但这些助手尚未生效：{ids}。请点「重试生效」，无需重复原操作。',
+  'api.syncFailed': '这些助手仍未生效：{ids}。请重试；仍失败时查看宿主日志。',
+  'api.synchronized': '配置已生效。新会话请从模式菜单选择助手。',
+  'api.recoveryRequired': '助手文件需要恢复：{path}。请保留目录中的备份，并查看宿主日志中的恢复说明。',
+  'msg.completedReadFailed': '{result} 页面刷新失败。请点「重试读取」，无需重复原操作。',
+  'msg.synchronized': '配置已生效。',
+  'msg.syncFailed': '重新应用配置失败，请重试。',
+  'msg.loaded': '已载入到编辑器。尚未保存。',
+  'status.reading': '正在读取…',
+  'status.saving': '正在保存…',
+  'status.creating': '正在创建助手…',
+  'status.deleting': '正在删除助手…',
+  'status.reordering': '正在保存顺序…',
+  'status.repairing': '正在修复…',
+  'status.importing': '正在读取导入文件…',
+  'status.synchronizing': '正在应用配置…',
   nav: '自定义模式',
 
   // ── 助手管理 ──────────────────────────────────────────────────────────────
   'assistant.heading': '助手',
-  'assistant.hint': '每个助手单独保存系统提示词、基础模式和插件开关。',
-  'posture.hint': '这一支只在点「新增助手」时写入。',
+  'assistant.hint': '选择要编辑的助手。每位助手独立保存系统提示词、基础模式和插件开关。',
+  'posture.hint': '选择起步姿态并命名，再点「新增助手」。',
   'tree.posture': '起步',
-  'tree.base': '工具底',
-  'tree.baseHold': '新建时固定用官方标准模式。',
-  'tree.baseSkip': '这一支点不了。建好后到「当前助手」里改。',
-  'tree.baseLocked': '只有官方标准模式是亮的。其余四档是暗的，新建时点不了。',
+  'tree.base': '初始基础模式',
+  'tree.baseLocked': '新建助手从官方标准模式起步。建好后，可在「当前助手」调整基础模式。',
   'posture.develop.label': '开发',
   'posture.develop.note': '官方标准模式，工具按出厂。',
   'posture.write.label': '写作',
@@ -34,7 +51,7 @@ export const zh = {
   'posture.chat.label': '聊天',
   'posture.chat.note': '官方标准模式。文件和终端关闭。',
   'editor.heading': '当前助手',
-  'editor.hint': '这一支改上面选中的助手。基础模式五档都可以点。',
+  'editor.hint': '正在编辑「{name}」。这里的选择只决定编辑对象；新会话请从模式菜单选择助手。',
   'assistant.empty': '还没有助手，用下面的输入框新建一个。',
   'assistant.loadingList': '正在读取助手列表…',
   'assistant.newPlaceholder': '新助手的名字（例如：写作助手）',
@@ -57,7 +74,7 @@ export const zh = {
   'btn.resetHint': '把编辑器换回此助手新建时保存的提示词。只改草稿，保存后才写入。',
   'btn.delete': '删除',
   'btn.cancel': '取消',
-  'msg.created': '已创建。刷新后，新会话的模式菜单里会出现它。',
+  'msg.created': '已创建。可继续编辑；使用时请在新会话的模式菜单选择它。',
   'msg.duplicated': '已复制。两份配置彼此独立。',
   'msg.deleted': '已删除。',
   'msg.createFailed': '创建失败',
@@ -97,7 +114,7 @@ export const zh = {
   'api.saved': '已保存（{name}，{mode}）。下一步组装时会重读已保存的提示词。',
   'api.conflict': '磁盘上的提示词已经变了，这次没有写入。先重新读取，再决定要不要覆盖。',
   'api.savedWithExclusiveRows': '已保存（{name}，{mode}）。已关闭不能同时启用的行：{rows}。',
-  'api.created': '已创建「{name}」。刷新后，新会话的模式菜单里会出现它。',
+  'api.created': '已创建「{name}」。可继续编辑；使用时请在新会话的模式菜单选择它。',
   'api.savedPrompt': '已保存系统提示词（{name}）。下一步组装时会重读这个文件。',
   'api.duplicated': '已从「{from}」复制。两份互不影响。',
   'api.deleted': '已删除「{name}」。正在使用它的会话不受影响。',
@@ -186,7 +203,7 @@ export const zh = {
   'tag.followPlatform': '随平台',
 
   'btn.save': '保存',
-  'btn.saving': '处理中…',
+  'btn.saving': '保存中…',
   'btn.reload': '重新读取',
   'btn.reloadDiscard': '放弃修改并重新读取',
   'btn.reloadConfirm': '放弃未保存的修改并重新读取？',
@@ -250,6 +267,8 @@ export const zh = {
   'row.tool-plugin-manager.label': '插件管理（安装 / 启停）',
   'row.tool-plugin-manager.note': '供模型安装或开关插件。',
   'row.tool-presentation.label': 'PTC 工具呈现',
+  'row.tool-executor-ptc.label': 'PTC 程序执行器',
+  'row.tool-executor-ptc.note': '通过 run_code 执行程序并调用工具，同时向模型提供工具 SDK。',
   'row.present.label': '交付文件（present）',
   'row.command-goal.label': '目标命令',
   'row.tool-goal.label': '目标',
@@ -283,17 +302,34 @@ export const zh = {
 
 /** English dictionary; the parity test keeps its key set equal to {@link zh}. */
 export const en = {
+  'create.nextStep': 'After creating, edit and save above. To use the assistant, choose it in the mode menu for a new session.',
+  'btn.retryRead': 'Retry refresh',
+  'btn.retrySync': 'Retry activation',
+  'api.savedButSyncFailed': 'Files are saved, but these assistants are not active yet: {ids}. Select Retry activation; you do not need to repeat the original action.',
+  'api.syncFailed': 'These assistants are still not active: {ids}. Retry, then check the host log if the problem continues.',
+  'api.synchronized': 'Configuration is active. Choose an assistant in the mode menu for a new session.',
+  'api.recoveryRequired': 'Assistant files need recovery: {path}. Keep the backups in that directory and check the host log for recovery details.',
+  'msg.completedReadFailed': '{result} The page could not refresh. Select Retry refresh; do not repeat the original action.',
+  'msg.synchronized': 'Configuration is active.',
+  'msg.syncFailed': 'Could not apply the configuration. Please retry.',
+  'msg.loaded': 'Loaded into the editor. Not saved yet.',
+  'status.reading': 'Reading…',
+  'status.saving': 'Saving…',
+  'status.creating': 'Creating assistant…',
+  'status.deleting': 'Deleting assistant…',
+  'status.reordering': 'Saving order…',
+  'status.repairing': 'Repairing…',
+  'status.importing': 'Reading import file…',
+  'status.synchronizing': 'Applying configuration…',
   nav: 'Custom mode',
 
   // ── assistant management ──────────────────────────────────────────────────
   'assistant.heading': 'Assistants',
-  'assistant.hint': 'Each assistant keeps its own system prompt, base mode and plugin switches.',
-  'posture.hint': 'This branch is written only when you click New assistant.',
+  'assistant.hint': 'Choose an assistant to edit. Each keeps its own system prompt, base mode and plugin switches.',
+  'posture.hint': 'Choose a starting posture and a name, then select New assistant.',
   'tree.posture': 'Starter',
-  'tree.base': 'Tool base',
-  'tree.baseHold': 'A new assistant always starts on the official Standard mode.',
-  'tree.baseSkip': 'Cannot be chosen on this branch. Change it later under This assistant.',
-  'tree.baseLocked': 'Only the official Standard mode is lit. The other four are dim and cannot be chosen when creating.',
+  'tree.base': 'Starting base mode',
+  'tree.baseLocked': 'New assistants start on the official Standard mode. You can change the base mode under This assistant after creating one.',
   'posture.develop.label': 'Coding',
   'posture.develop.note': 'Official Standard mode, tools as shipped.',
   'posture.write.label': 'Writing',
@@ -301,7 +337,7 @@ export const en = {
   'posture.chat.label': 'Chat',
   'posture.chat.note': 'Official Standard mode. Files and terminal off.',
   'editor.heading': 'This assistant',
-  'editor.hint': 'This branch edits the assistant selected above. All five base modes can be chosen.',
+  'editor.hint': 'Editing {name}. This selection controls what you edit here; choose an assistant in the mode menu when starting a new session.',
   'assistant.empty': 'No assistants yet — create one with the field below.',
   'assistant.loadingList': 'Loading assistants…',
   'assistant.newPlaceholder': 'Name of the new assistant (e.g. Writing assistant)',
@@ -322,7 +358,7 @@ export const en = {
   'btn.resetHint': 'Restores the prompt saved when this assistant was created. The editor changes. Save writes it.',
   'btn.delete': 'Delete',
   'btn.cancel': 'Cancel',
-  'msg.created': 'Created. Refresh once, then it appears in the mode menu for a new session.',
+  'msg.created': 'Created. Continue editing here, then choose it in the mode menu for a new session.',
   'msg.duplicated': 'Duplicated. The two are independent from here on.',
   'msg.deleted': 'Deleted.',
   'msg.createFailed': 'Could not create',
@@ -362,7 +398,7 @@ export const en = {
   '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.created': 'Created {name}. Continue editing here, then choose it in the mode menu for a new session.',
   '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.',
@@ -451,7 +487,7 @@ export const en = {
   'tag.followPlatform': 'Platform',
 
   'btn.save': 'Save',
-  'btn.saving': 'Working…',
+  'btn.saving': 'Saving…',
   'btn.reload': 'Reload',
   'btn.reloadDiscard': 'Discard edits and reload',
   'btn.reloadConfirm': 'Discard unsaved edits and reload?',
@@ -513,6 +549,8 @@ export const en = {
   'row.tool-plugin-manager.label': 'Plugin manager (install / toggle)',
   'row.tool-plugin-manager.note': 'Lets the model install or toggle plugins.',
   'row.tool-presentation.label': 'PTC tool presentation',
+  'row.tool-executor-ptc.label': 'PTC program executor',
+  'row.tool-executor-ptc.note': 'Runs programs and calls tools through run_code, and provides the tool SDK to the model.',
   'row.present.label': 'Deliverables (present)',
   'row.command-goal.label': 'Goal command',
   'row.tool-goal.label': 'Goals',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-custom-mode",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "description": "Edit a DeepSeek Harness (dsh) custom mode: system prompt, base mode, and plugin switches.",
   "license": "MIT",
   "type": "module",
@@ -80,7 +80,7 @@
     "market-check": "node tools/market-check.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"
+    "@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 || >=0.2.2-alpha.2 <0.3.0-0"
   },
   "peerDependenciesMeta": {
     "@deepseek-ai/dsh": {
@@ -89,7 +89,7 @@
   },
   "engines": {
     "node": ">=20",
-    "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"
+    "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 || >=0.2.2-alpha.2 <0.3.0-0"
   },
   "publishConfig": {
     "access": "public",

package/preset/prompt-reader.mjs

@@ -86,11 +86,44 @@ export const name = 'custom-prompt-file'
 /** The prompt registry is a hard dependency: without it there is no identity. */
 export const inject = ['systemPrompt']
 
+/** Remove only our old standalone directory sentence; never rewrite the user's file. */
+function withoutLegacyDirectoryLine(text) {
+  return text.replace(/^Your working directory is \{\{cwd\}\}\.(?:\r?\n|$)/gm, '')
+}
+
 export function apply(ctx, config = {}) {
   const path = config.path ?? fileURLToPath(new URL('./prompt.md', import.meta.url))
   const suffix = config.suffix ?? DEFAULT_SUFFIX
   const fallback = config.fallback ?? DEFAULT_FALLBACK
   const file = new PromptFile(path, fallback)
+  let ownsWorkingDirectory = false
+
+  // New hosts moved cwd out of the loop's variables and into this service's required runtime context.
+  // Keep older hosts on their own cwd variable. This optional child does not hold the persona pending.
+  // A scoped compatibility variable also preserves custom {{cwd}} references without string-substituting
+  // paths before interpolation (a directory containing braces must not itself become a template).
+  if (typeof ctx.inject === 'function') {
+    ctx.inject(['systemPrompt', 'workingDirectory'], (scope) => {
+      const directory = scope.workingDirectory
+      if (typeof directory?.get !== 'function') return
+      const currentDirectory = (context) => {
+        const session = context.agent?.session
+        if (session === undefined) return undefined
+        return directory.get(session)
+      }
+      scope.effect(() => scope.systemPrompt.variable('cwd', currentDirectory), 'custom-prompt.cwd-compatibility')
+      // The host can recover a missing directory during this waterfall, after variable providers were
+      // snapshotted. Refresh only our compatibility value after downstream assembly has settled.
+      scope.effect(() => scope.on('system-prompt/assemble', async (_assembly, context, next) => {
+        const presentation = await next()
+        presentation.variables.cwd = currentDirectory(context)
+        return presentation
+      }), 'custom-prompt.cwd-after-assembly')
+      ownsWorkingDirectory = true
+      scope.effect(() => () => { ownsWorkingDirectory = false }, 'custom-prompt.cwd-lifecycle')
+    })
+  }
+  const compatibleText = (text) => ownsWorkingDirectory ? withoutLegacyDirectoryLine(text) : text
 
   ctx.effect(
     () =>
@@ -98,7 +131,7 @@ export function apply(ctx, config = {}) {
         name: PERSONA_PREFIX_SECTION,
         order: PERSONA_PREFIX_ORDER,
         // A provider, not a string: evaluated at every assembly.
-        text: () => file.read(),
+        text: () => compatibleText(file.read()),
         complete: config.complete === true,
       }),
     'custom-prompt.prefix',
@@ -112,7 +145,7 @@ export function apply(ctx, config = {}) {
         ctx.systemPrompt.section({
           name: PERSONA_SUFFIX_SECTION,
           order: PERSONA_SUFFIX_ORDER,
-          text: suffix,
+          text: () => compatibleText(suffix),
         }),
       'custom-prompt.suffix',
     )

package/preset/prompt-tool.mjs

@@ -61,6 +61,7 @@ const VARIABLE_NAME = /^[a-z][a-z0-9_]*$/
  * step; the duplication is deliberate so neither side depends on the other's
  * install location.
  */
+// cwd is supplied by the old loop, or by prompt-reader's scoped workingDirectory compatibility provider.
 const KNOWN_VARIABLES = ['model', 'cwd', 'provider']
 
 /**

package/preset/prompt.md

@@ -2,5 +2,3 @@ You are a coding agent powered by the {{model}} model.
 
 You work directly in the user's repository. Read the code before changing it, prefer
 the project's existing patterns over new machinery, and keep changes reviewable.
-
-Your working directory is {{cwd}}.

package/preset-backend/declarative.mjs

@@ -102,16 +102,18 @@ export function toPluginRows(rows, presetDir) {
 export function createDeclarativeBackend({ scope, log = console.log, warn = console.error }) {
   /** presetId → { dispose, dir } —— 当前挂在注册表里的东西，注销的唯一凭据。 */
   const mounted = new Map()
+  let mutations = Promise.resolve()
+  const serialize = (work) => {
+    const next = mutations.then(work, work)
+    mutations = next.then(() => undefined, () => undefined)
+    return next
+  }
 
   async function unmount(id) {
     const entry = mounted.get(id)
     if (entry === undefined) return
+    await entry.dispose()
     mounted.delete(id)
-    try {
-      await entry.dispose()
-    } catch (error) {
-      warn(`custom-mode: 注销 preset "${id}" 时出错（已忽略）: ${describe(error)}`)
-    }
   }
 
   /** Build the definition for one assistant directory, or null when it has no composition. */
@@ -146,8 +148,8 @@ export function createDeclarativeBackend({ scope, log = console.log, warn = cons
       await unmount(assistant.id)
       return { ok: false, error: 'no composition' }
     }
-    await unmount(assistant.id)
     try {
+      await unmount(assistant.id)
       const dispose = await scope.agentPresets.register(definition)
       mounted.set(assistant.id, { dispose, dir: assistant.dir })
       return { ok: true }
@@ -257,11 +259,11 @@ export function createDeclarativeBackend({ scope, log = console.log, warn = cons
     id: BACKEND_ID,
     /** 新线不把 preset 落到磁盘，注册表就是唯一真相。 */
     writesPresetFiles: false,
-    sync,
-    mountOne,
-    unmount,
-    remove,
-    disposeAll,
+    sync: (assistants) => serialize(() => sync(assistants)),
+    mountOne: (assistant) => serialize(() => mountOne(assistant)),
+    unmount: (id) => serialize(() => unmount(id)),
+    remove: (id, dir) => serialize(() => remove(id, dir)),
+    disposeAll: () => serialize(disposeAll),
     fetchBaseCompositions,
     mountedIds: () => [...mounted.keys()],
   }

package/seed.mjs

@@ -24,7 +24,7 @@
 import { existsSync, mkdirSync, readFileSync } from 'node:fs'
 import { renderComposition } from './composition.mjs'
 import { readPresetMeta, writePresetMeta } from './meta.mjs'
-import { writeAtomic } from './atomic.mjs'
+import { restoreBackups, writeAtomic } from './atomic.mjs'
 import { dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
@@ -116,6 +116,10 @@ export function seedPreset(presetDir, sourceDir = packagedPresetDir(), options =
   if (typeof presetDir !== 'string' || presetDir === '') {
     return { created, kept, errors: ['没有可用的 preset 目录路径'] }
   }
+  const recovery = restoreBackups(presetDir)
+  if (recovery.ok !== true) {
+    return { created, refreshed, kept, errors: ['Preset recovery required: ' + recovery.detail] }
+  }
   if (!existsSync(sourceDir)) {
     return { created, kept, errors: [`包内预设目录不存在: ${sourceDir}`] }
   }