dsh-custom-mode 2.2.6 → 2.3.1

package/preset-backend/declarative.mjs

@@ -26,20 +26,17 @@
 import { existsSync, readFileSync, renameSync, rmSync } from 'node:fs'
 import { basename, dirname, join } from 'node:path'
 import { pathToFileURL } from 'node:url'
-import { parseComposition } from './parse-composition.mjs'
+import { parseComposition, evaluateDisabledPredicate, profileContextPredicate } from './parse-composition.mjs'
 
 export const BACKEND_ID = 'declarative'
 
-/** Evaluate a `!!js` predicate. Only ever applied to text this feature itself wrote. */
+/** Preserve the host-native predicate node so the loader evaluates it against its real Entry.ctx. */
 function resolveDisabled(value) {
   if (value !== null && typeof value === 'object' && typeof value.__js === 'string') {
-    try {
-      // eslint-disable-next-line no-new-func
-      return Boolean(new Function(`"use strict"; return (${value.__js});`)())
-    } catch {
-      // 表达式求值不了时按"关掉"处理：宁可少一行能力，也不要让整条 preset 挂载失败。
-      return true
-    }
+    // An unknown ctx service can return undefined rather than throw, which would
+    // make the native loader enable it. Keep unsupported conditions truly off.
+    if (profileContextPredicate(value.__js) === null && evaluateDisabledPredicate(value.__js) === undefined) return true
+    return { __jsExpr: value.__js }
   }
   return value === true
 }
@@ -103,6 +100,8 @@ export function createDeclarativeBackend({ scope, log = console.log, warn = cons
   /** 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)
@@ -135,6 +134,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)
@@ -142,26 +142,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' }
     }
+    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))
@@ -175,7 +189,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')
   }
 
   /**
@@ -262,8 +280,13 @@ export function createDeclarativeBackend({ scope, log = console.log, warn = cons
     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),
+    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/preset-backend/parse-composition.mjs

@@ -39,6 +39,56 @@ export class CompositionParseError extends Error {
 const isBlank = (line) => line.trim() === '' || line.trim().startsWith('#')
 const indentOf = (line) => line.length - line.trimStart().length
 
+/** Decode the YAML scalar around a tagged JS source; never execute the expression. */
+export function decodeJsExpression(raw, lineNo = 0) {
+  const source = String(raw).trim()
+  if (source === '') throw new CompositionParseError('!!js 后面没有表达式', lineNo)
+  if (source.startsWith("'")) {
+    if (!/^'(?:[^']|'')*'$/.test(source)) throw new CompositionParseError('!!js 单引号标量无效', lineNo)
+    return source.slice(1, -1).replace(/''/g, "'")
+  }
+  if (source.startsWith('"')) {
+    try {
+      const decoded = JSON.parse(source)
+      if (typeof decoded !== 'string') throw new Error('Expected a string')
+      return decoded
+    } catch {
+      throw new CompositionParseError('!!js 双引号标量无效', lineNo)
+    }
+  }
+  return source
+}
+
+/** The only context-service predicate currently understood by the editor. */
+export function profileContextPredicate(source) {
+  const match = /^(!{0,2})\s*ctx\s*\.\s*get\s*\(\s*(['"])profileContext\2\s*\)$/.exec(source)
+  return match === null ? null : match[1].length
+}
+
+/**
+ * Preserve existing non-context evaluation semantics for installed composition
+ * code, while unknown context references stay unsupported rather than guessed.
+ */
+export function evaluateDisabledPredicate(source, capabilities = {}) {
+  const negations = profileContextPredicate(source)
+  if (negations !== null) {
+    if (typeof capabilities?.profileContext !== 'boolean') return undefined
+    return negations === 1 ? !capabilities.profileContext : capabilities.profileContext
+  }
+  const code = source
+    .replace(/'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*"/g, '')
+    .replace(/\/\*[\s\S]*?\*\/|\/\/[^\r\n]*/g, '')
+  if (/\bctx\b/.test(code)) return undefined
+  try {
+    // Composition files are installed executable code. No real host context is
+    // supplied, and the ctx parameter shadows any unrelated global of that name.
+    const evaluate = new Function('process', 'ctx', `return (${source});`)
+    return Boolean(evaluate(process, undefined))
+  } catch {
+    return undefined
+  }
+}
+
 /**
  * Parse a composition document into plain JS.
  *
@@ -156,9 +206,7 @@ export function parseScalar(raw, lineNo = 0) {
   const value = raw.trim()
   if (value === '') return null
   if (value.startsWith('!!js')) {
-    const source = value.slice(4).trim()
-    if (source === '') throw new CompositionParseError('!!js 后面没有表达式', lineNo)
-    return { __js: source }
+    return { __js: decodeJsExpression(value.slice(4), lineNo) }
   }
   if (value === 'true') return true
   if (value === 'false') return false