dsh-custom-mode 2.2.5 → 2.3.0

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,20 @@ 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()
+  let stopped = false
+  const stoppedResult = () => ({ ok: false, code: 'backendStopped', error: 'backend stopped' })
+  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. */
@@ -133,6 +137,7 @@ export function createDeclarativeBackend({ scope, log = console.log, warn = cons
    * registry refuses a duplicate id outright.
    */
   async function mountOne(assistant) {
+    if (stopped) return stoppedResult()
     let definition
     try {
       definition = buildDefinition(assistant)
@@ -140,26 +145,40 @@ export function createDeclarativeBackend({ scope, log = console.log, warn = cons
       // 解析失败是**用户可见**的问题（手改坏了 composition），要显式说，不能静默跳过。
       warn(`custom-mode: 预设 "${assistant.id}" 的 composition 解析失败 —— ${describe(error)}。该助手不会出现在选择器里。`)
       await unmount(assistant.id)
-      return { ok: false, error: describe(error) }
+      return { ok: false, code: 'compositionParseFailed', error: describe(error) }
     }
     if (definition === null) {
       await unmount(assistant.id)
-      return { ok: false, error: 'no composition' }
+      return { ok: false, code: 'noComposition', error: 'no composition' }
     }
-    await unmount(assistant.id)
+    let registering = false
     try {
+      await unmount(assistant.id)
+      if (stopped) return stoppedResult()
+      registering = true
       const dispose = await scope.agentPresets.register(definition)
+      registering = false
       mounted.set(assistant.id, { dispose, dir: assistant.dir })
+      // register() can finish after the scope starts stopping. Keep its disposer until
+      // it succeeds, and release only this generation's own registration.
+      if (stopped) {
+        await unmount(assistant.id)
+        return stoppedResult()
+      }
       return { ok: true }
     } catch (error) {
       // register 会抛（Duplicate / id 空 / 已存在）：说清是哪个助手、哪条错误。
       warn(`custom-mode: 注册预设 "${assistant.id}" 失败 —— ${describe(error)}`)
-      return { ok: false, error: describe(error) }
+      const code = registering
+        ? describe(error) === 'Duplicate agent preset: ' + assistant.id ? 'registrationConflict' : 'registrationFailed'
+        : 'registrationCleanupFailed'
+      return { ok: false, code, error: describe(error) }
     }
   }
 
   /** Bring the registry in line with the given assistant list: mount all, drop the rest. */
   async function sync(assistants) {
+    if (stopped) return assistants.map(({ id }) => ({ id, ...stoppedResult() }))
     const results = []
     for (const assistant of assistants) results.push({ id: assistant.id, ...(await mountOne(assistant)) })
     const wanted = new Set(assistants.map((a) => a.id))
@@ -173,7 +192,11 @@ export function createDeclarativeBackend({ scope, log = console.log, warn = cons
   }
 
   async function disposeAll() {
-    for (const id of [...mounted.keys()]) await unmount(id)
+    const errors = []
+    for (const id of [...mounted.keys()]) {
+      try { await unmount(id) } catch (error) { errors.push(error) }
+    }
+    if (errors.length > 0) throw new AggregateError(errors, 'preset registration cleanup failed')
   }
 
   /**
@@ -257,11 +280,16 @@ 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(() => stopped ? stoppedResult() : remove(id, dir)),
+    disposeAll: () => {
+      // Close admission immediately, before awaiting queued/in-flight mutations. A
+      // startup sync still reading host metadata must not resurrect this backend.
+      stopped = true
+      return 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}`] }
   }