@dnalec/dsh-auto-approve 0.2.0 → 0.2.1

package/locales.mjs

@@ -99,7 +99,15 @@ export const zh = {
   'detail.script': '脚本',
   'detail.sql': 'SQL',
   'detail.prompt': '提示词',
+  'detail.input': '输入',
+  'detail.text': '文本',
+  'detail.body': '正文',
+  'detail.message': '消息',
+  'detail.pattern': '模式',
+  'detail.selector': '选择器',
   'detail.cwd': '工作目录',
+  'detail.workdir': '命令工作目录',
+  'detail.empty': '(空)',
   'detail.sandbox': '沙箱',
   'detail.justification': '模型理由',
   'detail.pipe': '管道',
@@ -122,6 +130,8 @@ export const zh = {
   'set.loadFailed': '加载失败：{error}',
   'set.resetConfirm': '再点一次确认恢复',
   'set.presetMissingTitle': '权限预设',
+  'set.driftTitle': '权限预设表需要更新',
+  'set.driftBody': 'DSH 出厂权限预设表多了 {keys}。本 profile 的 permission 行由本插件写入，patch 会整块替换 config，所以不会自动出现这些预设；请更新插件或手工合并该行。',
   'set.presetMissingSub': '插件启动时会写入 auto-approve。当前未检测到，可手动补写。',
   'set.presetWrite': '写入权限预设',
   'set.presetWriteNote': '写入后需重启 dsh web',
@@ -131,6 +141,7 @@ export const zh = {
   'set.modeWsHint': '工作区内直接放行，越出工作区需审核。',
   'set.modeRo': '只读',
   'set.modeRoHint': '工作区内写操作也需审核。',
+  'set.modeHint': '点选即写入。改完需重启 dsh web，并重新选择「自动审批」或开新会话。',
   'set.save': '保存',
   'set.hotOk': '已生效（热更新，无需重启）',
   'set.modeSaved': '已写入。请重启 dsh web，并重新选择「自动审批」或开新会话',
@@ -170,11 +181,17 @@ export const zh = {
   'set.modelDefaultEffort': '模型默认',
   'set.effortOff': 'off（建议）',
   'set.judgeTimeoutMs': '审核超时(ms)：',
-  'set.judgeSaved': '审核模型已保存',
+  'set.judgeSaved': '审核设置已保存',
   'set.judgeLang': '提示词语言',
   'set.judgeLangZh': '中文',
   'set.judgeLangEn': 'English',
-  'set.judgeLangHint': '只改发给审核模型的框架语言，不会改当前审核表。恢复默认审核表时使用这里选的语言。',
+  'set.judgeLangHint': '切换发给审核模型的框架语言与卡片标签，不会改当前审核表。下面的提示词按此语言编辑；恢复默认审核表也用这里选的语言。',
+  'set.judgePrompt': '审核提示词',
+  'set.judgePromptHint': '按所选语言内置默认提示词。用 {{criteria}} 插入当前审核表；删掉占位符时会把审核表附在末尾。与审核模型、超时一起保存。',
+  'set.judgePromptCustom': '已自定义',
+  'set.judgePromptDefault': '默认',
+  'set.resetJudgePrompt': '恢复默认提示词',
+  'set.resetJudgePromptOk': '已恢复默认提示词',
   'set.overwriteOk': '已覆盖损坏的插件配置',
   'err.missingPayload': '工具参数不完整，转人工',
   'err.missingPayloadUncaptured': '未捕获工具参数，转人工',
@@ -215,6 +232,7 @@ export const zh = {
   'err.judgeUpstream': '审核模型路由失败：{error}',
   'err.noPresetsKey': 'permission 条目缺少 presets 键，请手动添加',
   'err.preset': '写入预设失败：{error}',
+  'err.presetSandboxMissing': '预设里没有 sandbox 行，无法写入沙箱模式；请检查 profile 的 cordis.patch.yml',
   'rpc.unavailable': 'connection.rpc 不可用',
   'rpc.failed': 'RPC 失败',
 }
@@ -313,7 +331,15 @@ export const en = {
   'detail.script': 'Script',
   'detail.sql': 'SQL',
   'detail.prompt': 'Prompt',
+  'detail.input': 'Input',
+  'detail.text': 'Text',
+  'detail.body': 'Body',
+  'detail.message': 'Message',
+  'detail.pattern': 'Pattern',
+  'detail.selector': 'Selector',
   'detail.cwd': 'Working directory',
+  'detail.workdir': 'Command working directory',
+  'detail.empty': '(empty)',
   'detail.sandbox': 'Sandbox',
   'detail.justification': 'Model justification',
   'detail.pipe': 'Pipeline',
@@ -336,6 +362,8 @@ export const en = {
   'set.loadFailed': 'Failed to load: {error}',
   'set.resetConfirm': 'Click again to confirm restore',
   'set.presetMissingTitle': 'Permission preset',
+  'set.driftTitle': 'Permission preset table needs updating',
+  'set.driftBody': 'The shipped permission table has new presets: {keys}. This profile\'s permission row is written by this plugin, and a patch replaces that config wholesale, so they will not appear automatically. Update the plugin or merge that row by hand.',
   'set.presetMissingSub': 'Startup writes auto-approve. It was not detected; you can write it now.',
   'set.presetWrite': 'Write permission preset',
   'set.presetWriteNote': 'Restart dsh web after writing',
@@ -345,6 +373,7 @@ export const en = {
   'set.modeWsHint': 'In-workspace writes skip approval; outside the workspace still goes through the judge.',
   'set.modeRo': 'Read-only',
   'set.modeRoHint': 'In-workspace writes also go through the judge.',
+  'set.modeHint': 'Clicking a mode writes it. Then restart dsh web and re-select Auto-approve or start a new session.',
   'set.save': 'Save',
   'set.hotOk': 'Applied (live; no restart)',
   'set.modeSaved': 'Written. Restart dsh web and re-select Auto-approve or start a new session',
@@ -384,11 +413,17 @@ export const en = {
   'set.modelDefaultEffort': 'Model default',
   'set.effortOff': 'off (recommended)',
   'set.judgeTimeoutMs': 'Judge timeout (ms):',
-  'set.judgeSaved': 'Judge model saved',
+  'set.judgeSaved': 'Judge settings saved',
   'set.judgeLang': 'Prompt language',
   'set.judgeLangZh': 'Chinese',
   'set.judgeLangEn': 'English',
-  'set.judgeLangHint': 'Changes only the judge prompt framework, not the current criteria table. Restore default criteria uses this language.',
+  'set.judgeLangHint': 'Switches the judge prompt framework and card labels, not the current criteria table. The prompt below is edited per language; restore default criteria also uses this language.',
+  'set.judgePrompt': 'Judge prompt',
+  'set.judgePromptHint': 'Built-in default for the selected language. Use {{criteria}} to insert the current criteria table; if the placeholder is removed, the table is appended. Saved with the judge model and timeout.',
+  'set.judgePromptCustom': 'Custom',
+  'set.judgePromptDefault': 'Default',
+  'set.resetJudgePrompt': 'Restore default prompt',
+  'set.resetJudgePromptOk': 'Default prompt restored',
   'set.overwriteOk': 'Corrupt plugin config overwritten',
   'err.missingPayload': 'Tool arguments are incomplete; sending to human',
   'err.missingPayloadUncaptured': 'Tool arguments were not captured; sending to human',
@@ -429,6 +464,7 @@ export const en = {
   'err.judgeUpstream': 'Judge route failed: {error}',
   'err.noPresetsKey': 'The permission entry has no presets key; add it manually',
   'err.preset': 'Failed to write preset: {error}',
+  'err.presetSandboxMissing': 'The preset has no sandbox line; cannot set the sandbox mode. Check the profile cordis.patch.yml',
   'rpc.unavailable': 'connection.rpc is unavailable',
   'rpc.failed': 'RPC failed',
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dnalec/dsh-auto-approve",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "DeepSeek Harness 自动审批门控 + 设置页",
   "type": "module",
   "main": "./src/index.mjs",
@@ -22,7 +22,8 @@
 
   "scripts": {
     "test": "node --test tests/*.test.mjs",
-    "check": "node --check src/index.mjs && node --check src/rules.mjs && node --check src/preset-patch.mjs && node --check src/util.mjs && node --check locales.mjs && node --check client.js"
+    "check": "node --check src/index.mjs && node --check src/rules.mjs && node --check src/preset-patch.mjs && node --check src/util.mjs && node --check locales.mjs && node --check client.js && node --check scripts/sync-locales.mjs && node scripts/sync-locales.mjs",
+    "locales:sync": "node scripts/sync-locales.mjs --write"
   },
   "keywords": [
     "deepseek-harness",

package/src/index.mjs

@@ -17,6 +17,7 @@
 import {
   NAME,
   pathsFor,
+  resolveProfilePatchPath,
   tryLoadJson,
   saveJson,
   audit as appendAudit,
@@ -37,12 +38,15 @@ import {
   parseReason,
   matchKeywordBuckets,
   buildJudgePrompt,
+  resolveJudgePromptTemplate,
+  shippedJudgePromptTemplate,
   parseJudgeClassify,
   pickToolArgs,
   toolArgsTruncated,
   clipToolArgsForEvent,
   formatKeywordHay,
   formatAllowKeywordHay,
+  formatPathKeywordHay,
   formatJudgeCard,
   hasToolPayload,
   rememberCachedCall,
@@ -53,12 +57,25 @@ import {
   mutateAllowlistOp,
   fail,
   effectiveJudgeTimeoutMs,
+  judgeMaxTokens,
 } from './rules.mjs'
-import { getSetupState, migratePresetCopy, setAutoApproveSandbox } from './preset-patch.mjs'
+import { dirname } from 'node:path'
+import {
+  getSetupState,
+  migratePresetCopy,
+  presetDrift,
+  readBasePresetKeys,
+  setAutoApproveSandbox,
+} from './preset-patch.mjs'
 
 export const name = NAME
-/** webServer 本身不用，只为等 web 起来再注册 RPC。 */
-export const inject = ['approval', 'permissionPresets', 'llm', 'timer', 'webServer']
+/**
+ * 只列门控真正需要的服务。**不要**放 `webServer`：cordis 把插件 `inject` 当必需服务，
+ * 缺一个就停在 PENDING、apply 完全不执行（`vendor/cordis/src/fiber.ts`），
+ * 而 `webserver` 行只在 web-app bundle 里 —— headless / acp / sdk 组合下会连审批门控一起失踪。
+ * RPC 侧自己用 `ctx.inject(['connection'], …)`，`connection.fetch.register` 不需要 webServer。
+ */
+export const inject = ['approval', 'permissionPresets', 'llm', 'timer']
 
 /** Host Session 的工作目录在 header.cwd，没有 session.cwd。 */
 export function readSessionCwd(session) {
@@ -80,6 +97,8 @@ export function rpcFail(code, details) {
  */
 export function apply(ctx, rawConfig = {}) {
   const paths = pathsFor()
+  // 真实 profile 目录从 ctx.baseUrl 推导；拿不到才回落到 profiles/web。
+  paths.profilePatch = resolveProfilePatchPath(ctx, rawConfig, paths.profilePatch)
   ensureDir(paths.auto)
   migratePresetCopy(paths.profilePatch)
 
@@ -132,10 +151,24 @@ export function apply(ctx, rawConfig = {}) {
       if (presetSetup.ok && presetSetup.needRestart) {
         console.log(`[${NAME}] 已写入 auto-approve 权限预设（sandbox=${pluginCfg.presetSandbox}）；live patch 重载后会话权限会出现「自动审批」`)
       } else if (!presetSetup.ok) {
-        console.error(`[${NAME}] 写入 auto-approve 预设失败`, presetSetup.code || presetSetup.error)
+        console.error(
+          `[${NAME}] 写入 auto-approve 预设失败（${presetSetup.code || presetSetup.error || 'err.preset'}）：${paths.profilePatch}`,
+          presetSetup.details || '',
+        )
       }
     }
   }
+  {
+    // 出厂预设表比本 profile 那份新：只警告，不自动改写用户文件（patch 里 config 是整块替换）。
+    const drift = presetSetupState().drift
+    if (drift.baseKnown && drift.missing.length) {
+      console.warn(
+        `[${NAME}] DSH 出厂权限预设表多了 ${drift.missing.join(', ')}，`
+        + `但 profile 的 permission 行是本插件写入的副本（patch 整块替换 config），不会自动包含；`
+        + `请更新插件或手工合并 ${paths.profilePatch}`,
+      )
+    }
+  }
   let eventSeq = maxEventId(paths.events)
   let rpcTail = Promise.resolve()
   function enqueueRpc(fn) {
@@ -151,6 +184,18 @@ export function apply(ctx, rawConfig = {}) {
   const pendingCalls = new Map()
   const log = (line) => console.log(`[${NAME}] ${line}`)
   const audit = (line) => appendAudit(paths.audit, line)
+
+  /**
+   * setup 状态 + 预设表漂移。
+   * 插件写进 profile patch 的 `permission` 行会整块替换 base 的 config（patch 语义不做深合并），
+   * 所以 DSH 出厂表新增预设时本 profile 不会有：读 base 的 patch 比一比，只提示、不自动改写。
+   */
+  function presetSetupState() {
+    const setup = getSetupState(paths.profilePatch)
+    const base = readBasePresetKeys(dirname(paths.profilePatch))
+    if (!base.ok) return { ...setup, drift: { baseKnown: false, missing: [], extra: [] } }
+    return { ...setup, drift: { baseKnown: true, baseKeys: base.keys, ...presetDrift(base.keys, setup.presets) } }
+  }
   const llm = ctx.llm
   const permissionPresets = ctx.permissionPresets
   const agentDefaultModel = ctx.get('agentDefaultModel')
@@ -324,11 +369,11 @@ export function apply(ctx, rawConfig = {}) {
   }
 
   /**
-   * 调用审核模型。不要传 messages.system：newapi 会映射成 developer 角色导致 400。
-   * 分类提示全部折进 user 文本。
+   * 调用审核模型。不要传 messages.system：部分 OpenAI 兼容网关会把 system 映射成 developer 导致 400。
+   * 分类提示全部折进 user 文本。带推理档位时输出预算要留出推理 token，否则空文本会被当成解析失败。
    */
   async function callJudge(userText, signal, route, system) {
-    const prompt = system || buildJudgePrompt(allowlist.criteria, pluginCfg.judgePromptLang)
+    const prompt = system || buildJudgePrompt(allowlist.criteria, pluginCfg.judgePromptLang, resolveJudgePromptTemplate(pluginCfg, pluginCfg.judgePromptLang))
     const opts = {
       provider: route.provider,
       model: route.model,
@@ -337,7 +382,7 @@ export function apply(ctx, rawConfig = {}) {
         content: [{ type: 'text', text: prompt + '\n\n' + userText }],
       }],
       temperature: 0,
-      maxTokens: 256,
+      maxTokens: judgeMaxTokens(route.reasoningEffort),
       signal,
     }
     if (route.reasoningEffort) opts.reasoningEffort = route.reasoningEffort
@@ -359,7 +404,7 @@ export function apply(ctx, rawConfig = {}) {
     const criteria = allowlist.criteria || DEFAULT_CRITERIA
     const lang = normalizeJudgePromptLang(pluginCfg.judgePromptLang)
     const user = formatJudgeCard(toolName, mode, justification, args, cwd, lang)
-    const text = await callJudge(user, signal, route, buildJudgePrompt(criteria, lang))
+    const text = await callJudge(user, signal, route, buildJudgePrompt(criteria, lang, resolveJudgePromptTemplate(pluginCfg, lang)))
     try {
       return { ...parseJudgeClassify(text, criteria), raw: String(text || '').slice(0, 800) }
     } catch (error) {
@@ -368,10 +413,24 @@ export function apply(ctx, rawConfig = {}) {
     }
   }
 
-  async function withRetry(runFn, label, timeoutMs) {
+  /**
+   * 单次判定 + 超时 + 重试。
+   * `outerSignal` 是审批请求自己的取消信号：请求被取消后不该继续烧模型调用。
+   * 注意**不要**去 abort `req.signal`，这里只观察它。
+   */
+  async function withRetry(runFn, label, timeoutMs, outerSignal) {
+    const cancelled = () => Boolean(outerSignal && outerSignal.aborted)
     const runOnce = async () => {
+      if (cancelled()) return { aborted: true }
       const controller = new AbortController()
       let cancelTimer
+      const onOuterAbort = () => controller.abort(`${NAME}: ${label} 请求已取消`)
+      const linkable = outerSignal && typeof outerSignal.addEventListener === 'function'
+      if (linkable) {
+        outerSignal.addEventListener('abort', onOuterAbort, { once: true })
+        // 竞态窗口：cancelled() 之后、addEventListener 之前就 abort 了，事件不会再触发。
+        if (outerSignal.aborted) onOuterAbort()
+      }
       const timed = new Promise((resolve) => {
         cancelTimer = ctx.timeout(() => resolve({ timedOut: true }), timeoutMs)
       })
@@ -380,18 +439,23 @@ export function apply(ctx, rawConfig = {}) {
           .then((r) => ({ ...r, timedOut: false }))
           .catch((error) => ({ judgeError: error }))
         const result = await Promise.race([call, timed])
+        if (cancelled()) return { aborted: true }
         if (result.judgeError) throw result.judgeError
         return result
       } finally {
         if (typeof cancelTimer === 'function') {
           try { cancelTimer() } catch { /* disposer */ }
         }
+        if (linkable && typeof outerSignal.removeEventListener === 'function') {
+          outerSignal.removeEventListener('abort', onOuterAbort)
+        }
         controller.abort(`${NAME}: ${label} 结束`)
       }
     }
     let last = { failed: true }
     try {
       const first = await runOnce()
+      if (first.aborted) return first
       if (!first.timedOut) return first
       last = { failed: true, timedOut: true, errorCode: 'err.judgeTimeout', error: 'err.judgeTimeout', errorMs: String(timeoutMs) }
       console.warn(`[${NAME}] ${label} 超时(${timeoutMs}ms)，转人工`)
@@ -413,6 +477,7 @@ export function apply(ctx, rawConfig = {}) {
     }
     try {
       const second = await runOnce()
+      if (second.aborted) return second
       if (!second.timedOut) return second
       last = { failed: true, timedOut: true, errorCode: 'err.judgeRetryTimeout', error: 'err.judgeRetryTimeout', errorMs: String(timeoutMs) }
       console.warn(`[${NAME}] ${label} 重试超时(${timeoutMs}ms)`)
@@ -431,7 +496,7 @@ export function apply(ctx, rawConfig = {}) {
     }
   }
 
-  async function judgeOperation(toolName, mode, justification, args, cwd) {
+  async function judgeOperation(toolName, mode, justification, args, cwd, requestSignal) {
     const route = await resolveJudgeRoute()
     const meta = {
       provider: route.provider || '',
@@ -447,7 +512,11 @@ export function apply(ctx, rawConfig = {}) {
       (signal) => judgeOnce(toolName, mode, justification, args, signal, route, cwd),
       '审核模型',
       timeoutMs,
+      requestSignal,
     )
+    if (result.aborted) {
+      return { aborted: true, criterion: 'other', reason: '', ...meta }
+    }
     if (result.failed) {
       return {
         action: 'human',
@@ -588,7 +657,8 @@ export function apply(ctx, rawConfig = {}) {
         return toHuman('missing-payload', 'other', { judgeReason: why })
       }
       const hay = formatKeywordHay(toolName, reason, toolArgs, sessionCwd)
-      const kw = matchKeywordBuckets(hay, allowlist, formatAllowKeywordHay(toolArgs))
+      const pathHay = formatPathKeywordHay(toolArgs, sessionCwd)
+      const kw = matchKeywordBuckets(hay, allowlist, formatAllowKeywordHay(toolArgs), pathHay)
 
       const eventDetail = { args: toolArgs, cwd: sessionCwd }
       if (kw && kw.action === 'reject') {
@@ -617,9 +687,15 @@ export function apply(ctx, rawConfig = {}) {
         return toHuman('keyword-human', '')
       }
 
-      const judged = await judgeOperation(toolName, mode, justification, toolArgs, sessionCwd)
+      const judged = await judgeOperation(toolName, mode, justification, toolArgs, sessionCwd, req.signal)
       const criterion = judged.criterion || 'other'
       const judgeReason = judged.reason || ''
+      if (judged.aborted) {
+        // 请求已被取消（工具执行 signal abort）。审批服务会以 cancelled 结算并丢弃迟到结果，
+        // 这里不再占坑、也不再调 next()，避免取消后还弹人工框。
+        audit(`CANCEL  ${toolName} mode=${mode || 'none'} judge aborted`)
+        return 'cancelled'
+      }
       if (judged.failed) {
         audit(`FAILED  ${toolName} mode=${mode || 'none'} → 人工 | ${judged.error || reason.slice(0, 120)}`)
         return toHuman('judge-failed', criterion, {
@@ -703,8 +779,12 @@ export function apply(ctx, rawConfig = {}) {
                 rejectKeywords: shippedRejectKeywords(),
                 humanKeywords: [],
                 criteria: shippedCriteria(pluginCfg.judgePromptLang),
+                judgePrompts: {
+                  zh: shippedJudgePromptTemplate('zh'),
+                  en: shippedJudgePromptTemplate('en'),
+                },
               },
-              setup: getSetupState(paths.profilePatch),
+              setup: presetSetupState(),
               plugin: pluginCfg,
               pluginCorrupt: pluginCfgCorrupt,
               providers: (() => {
@@ -766,6 +846,9 @@ export function apply(ctx, rawConfig = {}) {
           if (body && Object.prototype.hasOwnProperty.call(body, 'presetSandbox')) {
             preset = setAutoApproveSandbox(paths.profilePatch, pluginCfg.presetSandbox)
             if (preset && !preset.ok) {
+              // 沙箱没写进 patch 就整个回滚：不能让 config.json 说 read-only、patch 还是全权限。
+              pluginCfg = prev
+              persistPluginCfg({ overwriteCorrupt: Boolean(body.overwriteCorrupt) })
               return rpcFail(preset.code || 'err.preset', preset.details || { error: String(preset.error || '') })
 
             }
@@ -780,7 +863,7 @@ export function apply(ctx, rawConfig = {}) {
             persistPluginCfg()
           }
           audit('CONFIG  plugin 已更新')
-          return { ok: true, value: { ok: true, plugin: pluginCfg, preset, setup: getSetupState(paths.profilePatch) } }
+          return { ok: true, value: { ok: true, plugin: pluginCfg, preset, setup: presetSetupState() } }
         }
         if (endpoint === 'judge-catalog') {
           const provider = String(body.provider || configuredRoute().provider)
@@ -860,5 +943,5 @@ export function apply(ctx, rawConfig = {}) {
     }
   })
 
-  log(`已挂载：关键词→审核表 sandbox=${pluginCfg.presetSandbox}`)
+  log(`已挂载：关键词→审核表 sandbox=${pluginCfg.presetSandbox} profilePatch=${paths.profilePatch}`)
 }