@gehennawu/dsh-service 1.6.2 → 1.7.0

package/index.js

@@ -24,11 +24,13 @@ import {
   cliproxyProjectFor as cliproxyProjectForAdapter,
   createQuotaAdapterCatalog,
   fetchCliproxyUsage as fetchCliproxyAdapterUsage,
+  fetchCommandCodeQuota as fetchCommandCodeQuotaAdapter,
   fetchStepFunStepPlanUsage as fetchStepFunStepPlanAdapterUsage,
   fetchXiaomiTokenPlanUsage as fetchXiaomiTokenPlanAdapterUsage,
   normalizeAntigravityModels as normalizeAntigravityModelsAdapter,
   normalizeAntigravityQuotaSummary as normalizeAntigravityQuotaSummaryAdapter,
   normalizeCodexRateLimit as normalizeCodexRateLimitAdapter,
+  normalizeCommandCodeQuota as normalizeCommandCodeQuotaAdapter,
   normalizeDeepseekBalance as normalizeDeepseekBalanceAdapter,
   normalizeGeminiBuckets as normalizeGeminiBucketsAdapter,
   normalizeKimiBalance as normalizeKimiBalanceAdapter,
@@ -213,6 +215,14 @@ const SUBAGENT_DISPATCH_PAGE_MAX = 400
 const QUOTA_UNUSABLE_ERROR_RE = /^(credential-missing|credential-rejected|credentials-unavailable|no-base-url|no-subscription|host-not-pinned|mgmt-disabled|transport-unavailable|bad-payload)/i
 const QUOTA_UNUSABLE_STATUS_RE = /^(?:http-status|upstream-status):4\d\d$/i
 
+// 统一配置文件（v1.6.4）：收敛各功能独立配置，避免文件碎片化；修改/清除单项配置不影响其他字段。
+const UNIFIED_CONFIG_FILE = 'dsh-service-config.json'
+const UNIFIED_CONFIG_VERSION = 1
+const MAX_UNIFIED_CONFIG_BYTES = 128 * 1024
+const CONFIG_ALLOWED_SECTIONS = Object.freeze(['settingsNav'])
+const NAV_ITEM_ID_RE = /^[A-Za-z0-9._-]{1,64}$/
+const MAX_NAV_ITEMS = 64
+
 // 升级目标白名单：命令与包名全来自宿主常量，浏览器不传任何输入；
 // TARGET_RE 与 dsh-market 同源，只放行「包名@版本」字符集。
 const TARGET_RE = /^[A-Za-z0-9@:./_#+~^=-]+$/
@@ -799,7 +809,7 @@ async function createBackupAttempt(ctx, dshHome, backupDir, name, validateArchiv
   try {
     // 进度：复制阶段按真实字节上报；打包/校验阶段上报归档体积（大小 ≈ 源字节，zstd 数据近不可压缩）。
     const sessionsSource = join(dshHome, 'sessions')
-    const configNames = ['settings.yaml', 'cordis.patch.yml', 'AGENTS.md']
+    const configNames = ['settings.yaml', 'cordis.patch.yml', 'AGENTS.md', 'dsh-service-config.json']
     let configBytes = 0
     for (const file of configNames) configBytes += await sumBackupTree(join(dshHome, file))
     let profilesBytes = 0
@@ -1429,6 +1439,20 @@ async function fetchStepFunStepPlanUsage({ credential, signal }) {
   return fetchStepFunStepPlanAdapterUsage({ credential, signal, requestJson: requestQuotaJson })
 }
 
+// ─── Command Code（command-goat）账号额度查询 ────────────────────────────────
+// 查询面完全固定（api.commandcode.ai 的 alpha 面，与 settings baseURL 无关）：whoami 取 orgId →
+// credits（三源余额 + 五小时/周窗 used/cap）→ subscriptions（套餐与计费周期）→ usage/summary
+// （周期花费）。认证与推理同 key（Bearer <用户 key>），凭据线索走 settings apiKeyEnv 在前、
+// COMMAND_CODE_API_KEY 殿后。归一化：余额/花费是文本窗、窗口是百分比窗（宿主下发绝对数，
+// 客户端做缩写），全部由 Adapter 持有——index.js 只做装配。
+function normalizeCommandCodeQuota(payload) {
+  return normalizeCommandCodeQuotaAdapter(payload)
+}
+
+async function fetchCommandCodeQuota({ credential, signal }) {
+  return fetchCommandCodeQuotaAdapter({ credential, signal, requestJson: requestQuotaJson })
+}
+
 
 // ─── CLIProxyAPI（cliproxy）管理面编排 ──────────────────────────────────────
 // 上游官方额度端点注册表（经 CPA api-call 代调，header 的 $TOKEN$ 由 CPA 替换为对应账号凭据）。
@@ -2913,8 +2937,10 @@ function buildSkillRoots(ctx, dshHome) {
   return roots
 }
 
-/** 全量扫描：一层深度发现目录 bundle 与扁平 .md，逐文件评估并标注同名遮蔽。 */
-async function scanSkillEntries(ctx, dshHome) {
+/** 全量扫描：一层深度发现目录 bundle 与扁平 .md，逐文件评估并标注同名遮蔽。
+ *  fileCache 只跳过「读文件 + 解析」这一步：目录发现、realpath 去重、权限与 stat
+ *  每次都重跑，缓存命中判据是 stat 的 size+mtimeMs 指纹（先记录后复用）。 */
+async function scanSkillEntries(ctx, dshHome, fileCache) {
   const roots = []
   const entries = []
   // 同一物理目录可能被两条根规则同时命中（典型：HOME 本身注册为工作区时，
@@ -2954,14 +2980,26 @@ async function scanSkillEntries(ctx, dshHome) {
       try {
         const info = await stat(path)
         if (info.size > MAX_SKILL_FILE_BYTES) { entries.push({ ...base, invalid: 'too-large' }); continue }
+        const cached = fileCache?.get(path)
+        if (cached !== undefined && cached.size === info.size && cached.mtimeMs === info.mtimeMs) {
+          entries.push({ ...base, ...cached.evaluated, bodyHash: cached.bodyHash, bytes: info.size })
+          continue
+        }
         const raw = await readFile(path, 'utf8')
         const evaluated = evaluateSkillFile(raw)
-        entries.push({ ...base, ...evaluated, bodyHash: bodyHashOf(raw, locateSkillFrontmatter(raw)?.bodyStart ?? 0), bytes: info.size })
+        const bodyHash = bodyHashOf(raw, locateSkillFrontmatter(raw)?.bodyStart ?? 0)
+        fileCache?.set(path, { size: info.size, mtimeMs: info.mtimeMs, evaluated, bodyHash })
+        entries.push({ ...base, ...evaluated, bodyHash, bytes: info.size })
       } catch (error) {
         entries.push({ ...base, invalid: 'read-error:' + (error?.code || error?.message || String(error)).slice(0, 80) })
       }
     }
   }
+  // 本轮未再出现的路径从缓存剔除：技能被删除/改名后缓存不残留悬挂条目。
+  if (fileCache !== undefined) {
+    const seen = new Set(entries.map((entry) => entry.path))
+    for (const key of [...fileCache.keys()]) if (!seen.has(key)) fileCache.delete(key)
+  }
   const winners = new Map()
   for (const entry of entries) {
     if (entry.invalid !== undefined) continue
@@ -3042,16 +3080,20 @@ function publicSkillEntry(entry, index) {
 }
 
 /** 变更类动作共用通道：重扫定位签名 ID（浏览器零路径输入），校验后执行手术。 */
-async function mutateSkillEntryById(ctx, dshHome, index, id, allowInvalid, mutate) {
+async function mutateSkillEntryById(ctx, dshHome, index, id, allowInvalid, mutate, fileCache) {
   if (typeof id !== 'string' || id === '') return { ok: false, error: 'unknown-skill' }
-  const { entries } = await scanSkillEntries(ctx, dshHome)
+  const { entries } = await scanSkillEntries(ctx, dshHome, fileCache)
   const entry = entries.find((candidate) => candidate.id === id)
   if (entry === undefined) return { ok: false, error: 'unknown-skill' }
   if (entry.invalid !== undefined && !(allowInvalid === true && entry.invalid.startsWith('legacy-invocation-key:'))) return { ok: false, error: 'invalid-skill', detail: entry.invalid }
   if (entry.writable !== true) return { ok: false, error: 'read-only-source' }
   const raw = await readFile(entry.path, 'utf8')
   const outcome = mutate(raw, entry)
-  if (outcome.text !== raw) await writeFile(entry.path, outcome.text, 'utf8')
+  if (outcome.text !== raw) {
+    await writeFile(entry.path, outcome.text, 'utf8')
+    // 宿主自身写入主动失效缓存：不依赖 mtime 指纹在极端情况下（同毫秒同尺寸）的判断。
+    fileCache?.delete(entry.path)
+  }
   const evaluated = evaluateSkillFile(outcome.text)
   const freshLocated = locateSkillFrontmatter(outcome.text)
   const fresh = { ...entry, ...evaluated, bodyHash: bodyHashOf(outcome.text, freshLocated?.bodyStart ?? 0) }
@@ -3342,6 +3384,84 @@ async function saveSubagentRoute(dshHome, config) {
   }
 }
 
+function sanitizeSettingsNavConfig(value) {
+  if (value === null || value === undefined) return null
+  if (typeof value !== 'object' || Array.isArray(value)) return null
+
+  let order = null
+  if (Array.isArray(value.order)) {
+    order = value.order
+      .filter((id) => typeof id === 'string' && NAV_ITEM_ID_RE.test(id.trim()))
+      .map((id) => id.trim())
+      .slice(0, MAX_NAV_ITEMS)
+  }
+
+  let hidden = []
+  if (Array.isArray(value.hidden)) {
+    hidden = value.hidden
+      .filter((id) => typeof id === 'string' && id.trim() !== 'dsh-service' && NAV_ITEM_ID_RE.test(id.trim()))
+      .map((id) => id.trim())
+      .slice(0, MAX_NAV_ITEMS)
+  }
+
+  return {
+    order,
+    hidden,
+  }
+}
+
+async function loadUnifiedConfig(dshHome) {
+  try {
+    const target = join(dshHome, UNIFIED_CONFIG_FILE)
+    const info = await stat(target)
+    if (info.size > MAX_UNIFIED_CONFIG_BYTES) return { version: UNIFIED_CONFIG_VERSION }
+    const parsed = JSON.parse(await readFile(target, 'utf8'))
+    if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+      return parsed
+    }
+    return { version: UNIFIED_CONFIG_VERSION }
+  } catch (_) {
+    return { version: UNIFIED_CONFIG_VERSION }
+  }
+}
+
+async function saveUnifiedConfig(dshHome, config) {
+  await mkdir(dshHome, { recursive: true })
+  const target = join(dshHome, UNIFIED_CONFIG_FILE)
+  const temporary = `${target}.${randomUUID()}.tmp`
+  try {
+    const payload = JSON.stringify(config, null, 2)
+    await writeFile(temporary, payload, { mode: 0o600 })
+    await rename(temporary, target)
+  } finally {
+    await rm(temporary, { force: true })
+  }
+}
+
+// 统一配置写串行化（按 dshHome 分链）：读-改-写整个文件必须排队，否则两台设备
+// 同时首次迁移（并发 config-set）会在读旧快照后互相覆盖，丢失先写区块。
+const unifiedConfigWriteChains = new Map()
+function updateUnifiedConfigSection(dshHome, section, value) {
+  const previous = unifiedConfigWriteChains.get(dshHome) ?? Promise.resolve()
+  const result = previous.then(async () => {
+    const current = await loadUnifiedConfig(dshHome)
+    const updated = Object.assign({}, current, { version: UNIFIED_CONFIG_VERSION })
+    if (value === null || value === undefined) {
+      delete updated[section]
+    } else {
+      updated[section] = value
+    }
+    await saveUnifiedConfig(dshHome, updated)
+    return updated
+  })
+  const tail = result.then(() => undefined, () => undefined)
+  unifiedConfigWriteChains.set(dshHome, tail)
+  void tail.then(() => {
+    if (unifiedConfigWriteChains.get(dshHome) === tail) unifiedConfigWriteChains.delete(dshHome)
+  })
+  return result
+}
+
 // 额度态「不可服务」判定（子代理回退候选过滤用）：lastError 命中配置/凭据/上游 4xx 码集，
 // 或任一显示窗口 percent≥100（已用尽）。无数据 / 刷新中 / 瞬态错误视为可用——fail-open，
 // 不因额度数据缺席或一次网络抖动误伤正常渠道。
@@ -3828,6 +3948,11 @@ async function listSessionsForManage(ctx, dshHome, scope = 'all', titleCache = n
   for (const record of recordsInScope) {
     const id = record.header.id
     if (deletedSet.has(id)) continue
+    // 子代理识别（官方 SessionHeader 字段）：origin='subagent' 是官方产品分类
+    // （dsh-subagent 创建时写入，官方自身也按此圈定）；delegationDepth>0 兜底
+    // 老日志缺 origin 的子代理；parentSession 只是 fork 血统（普通 fork 也写），不作判据。
+    const subagent = record.header.origin === 'subagent'
+      || (typeof record.header.delegationDepth === 'number' && record.header.delegationDepth > 0)
     items.push({
       id,
       title: titles.get(id) ?? (titleCache !== null ? titleCache.get(id)?.title : undefined) ?? '',
@@ -3836,6 +3961,7 @@ async function listSessionsForManage(ctx, dshHome, scope = 'all', titleCache = n
       live: record.live === true,
       persisted: record.persisted === true,
       archived: archivedSet.has(id),
+      subagent,
     })
   }
   items.sort((a, b) => (b.createdAt ?? 0) - (a.createdAt ?? 0))
@@ -4428,6 +4554,9 @@ function apply(ctx) {
   const quotaThrottle = createQuotaThrottle()
   // 技能管理（v0.22）：侧车索引缓存 + 批量补全状态。批量随 Fiber 销毁中止。
   let skillsIndexPromise = loadSkillsIndex(dshHome)
+  // 技能文件解析缓存：键=绝对路径，值=stat 指纹（size+mtimeMs）+ 评估结果。
+  // 列表/定位类接口每次都重跑目录发现与 stat，只跳过未变文件的读盘与解析。
+  const skillFileCache = new Map()
   let skillsBatch = null
   // 单条补全的运行日志环形缓冲：客户端在「生成中」期间轮询展示。
   // 条目是结构化 {at, code, params}，本地化文案由客户端词典渲染。
@@ -4470,6 +4599,7 @@ function apply(ctx) {
       try { call.abort(new Error('batch-cancelled')) } catch (_) {}
     }
     skillsActiveControllers.clear()
+    skillFileCache.clear()
   }, 'dsh-service skills batch teardown')
   // ── 子代理路由（v0.27）：三态配置 + subagents seam ─────────────────────
   // 内存态即 seam 读取的事实源：保存端点落盘成功后原地替换，派生路径零读盘。
@@ -5087,7 +5217,7 @@ function apply(ctx) {
     'skills-list': { feature: 'skillManager', handle: async (payload, rpcEndpoint) => {
       try {
         const index = await skillsIndexPromise
-        const { roots, entries } = await scanSkillEntries(ctx, dshHome)
+        const { roots, entries } = await scanSkillEntries(ctx, dshHome, skillFileCache)
         return {
           ok: true,
           value: {
@@ -5117,7 +5247,7 @@ function apply(ctx) {
       if (typeof payload?.enable !== 'boolean') return { ok: false, error: 'invalid-enable' }
       try {
         const index = await skillsIndexPromise
-        const outcome = await mutateSkillEntryById(ctx, dshHome, index, payload?.id, false, (raw) => ({ text: setSkillInvocationKey(raw, field, payload.enable) }))
+        const outcome = await mutateSkillEntryById(ctx, dshHome, index, payload?.id, false, (raw) => ({ text: setSkillInvocationKey(raw, field, payload.enable) }), skillFileCache)
         if (!outcome.ok) return { ok: false, error: outcome.error, ...(outcome.detail !== undefined ? { detail: outcome.detail } : {}) }
         return { ok: true, value: { entry: outcome.entry } }
       } catch (error) {
@@ -5131,7 +5261,7 @@ function apply(ctx) {
         const outcome = await mutateSkillEntryById(ctx, dshHome, index, payload?.id, true, (raw) => {
           const fixed = fixLegacySkillInvocationKeys(raw)
           return { text: fixed.text }
-        })
+        }, skillFileCache)
         if (!outcome.ok) return { ok: false, error: outcome.error, ...(outcome.detail !== undefined ? { detail: outcome.detail } : {}) }
         return { ok: true, value: { entry: outcome.entry } }
       } catch (error) {
@@ -5150,7 +5280,7 @@ function apply(ctx) {
         const whitelist = await listSkillModels(llm, ctx.get('agentDefaultModel'))
         if (!whitelist.models.some((item) => item.provider === provider && item.id === model)) return { ok: false, error: 'invalid-model-route' }
         const index = await skillsIndexPromise
-        const { entries } = await scanSkillEntries(ctx, dshHome)
+        const { entries } = await scanSkillEntries(ctx, dshHome, skillFileCache)
         const entry = entries.find((candidate) => candidate.id === payload?.id)
         if (entry === undefined) return { ok: false, error: 'unknown-skill' }
         if (entry.invalid !== undefined) return { ok: false, error: 'invalid-skill', detail: entry.invalid }
@@ -5181,7 +5311,7 @@ function apply(ctx) {
       if (description === '') return { ok: false, error: 'invalid-description' }
       try {
         // 注释只进插件侧车索引，绝不写回技能文件；因此不要求条目可写，只要求能被签名 ID 定位。
-        const { entries } = await scanSkillEntries(ctx, dshHome)
+        const { entries } = await scanSkillEntries(ctx, dshHome, skillFileCache)
         const entry = entries.find((candidate) => candidate.id === payload?.id)
         if (entry === undefined) return { ok: false, error: 'unknown-skill' }
         const index = await serializeSkillsIndexWrite((current) => {
@@ -5201,7 +5331,7 @@ function apply(ctx) {
     } },
     'skills-note-clear': { feature: 'skillManager', audit: true, handle: async (payload, rpcEndpoint) => {
       try {
-        const { entries } = await scanSkillEntries(ctx, dshHome)
+        const { entries } = await scanSkillEntries(ctx, dshHome, skillFileCache)
         const entry = entries.find((candidate) => candidate.id === payload?.id)
         if (entry === undefined) return { ok: false, error: 'unknown-skill' }
         const index = await serializeSkillsIndexWrite((current) => {
@@ -5227,7 +5357,7 @@ function apply(ctx) {
         const whitelist = await listSkillModels(llm, ctx.get('agentDefaultModel'))
         if (!whitelist.models.some((item) => item.provider === provider && item.id === model)) return { ok: false, error: 'invalid-model-route' }
         const index = await skillsIndexPromise
-        const { entries } = await scanSkillEntries(ctx, dshHome)
+        const { entries } = await scanSkillEntries(ctx, dshHome, skillFileCache)
         const { candidates, annotated, skipped } = selectSkillBatchCandidates(entries, index)
         const planId = randomUUID()
         // 已注释条目也进计划（单列待客户端确认），体积估算含两者——确认后整批运行。
@@ -5260,7 +5390,7 @@ function apply(ctx) {
         // 扫描一次建立 id→条目映射；逐条只重读目标文件校验新鲜度，不再每条全量重扫五类根。
         let byId = new Map()
         try {
-          const { entries } = await scanSkillEntries(ctx, dshHome)
+          const { entries } = await scanSkillEntries(ctx, dshHome, skillFileCache)
           byId = new Map(entries.map((entry) => [entry.id, entry]))
         } catch (_) {}
         for (let cursor = 0; cursor < skillsBatch.items.length; cursor += 1) {
@@ -5525,7 +5655,7 @@ function apply(ctx) {
       return {
         ok: true,
         value: {
-          message: '重启指令已发出，进程将在 0.5 秒后退出',
+          // 只下发客户端真正消费的实例 id；重启反馈文案由客户端词典渲染（双语约束）。
           instanceId,
         },
       }
@@ -5947,6 +6077,36 @@ function apply(ctx) {
         return fileEditorFailure(fileEditorErrorCode(error))
       }
     } },
+    'config-get': { handle: async (payload) => {
+      try {
+        const config = await loadUnifiedConfig(dshHome)
+        const section = typeof payload?.section === 'string' ? payload.section : undefined
+        if (section !== undefined) {
+          if (!CONFIG_ALLOWED_SECTIONS.includes(section)) return { ok: false, error: 'invalid-section' }
+          return { ok: true, value: config[section] ?? null }
+        }
+        return { ok: true, value: config }
+      } catch (error) {
+        return rpcTechnicalFailure(error)
+      }
+    } },
+    'config-set': { audit: true, handle: async (payload) => {
+      const section = typeof payload?.section === 'string' ? payload.section : ''
+      if (!CONFIG_ALLOWED_SECTIONS.includes(section)) return { ok: false, error: 'invalid-section' }
+      try {
+        let sanitized = null
+        if (section === 'settingsNav') {
+          sanitized = sanitizeSettingsNavConfig(payload?.value)
+          if (payload?.value !== null && payload?.value !== undefined && sanitized === null) {
+            return { ok: false, error: 'invalid-section-value' }
+          }
+        }
+        const updated = await updateUnifiedConfigSection(dshHome, section, sanitized)
+        return { ok: true, value: updated[section] ?? null }
+      } catch (error) {
+        return rpcTechnicalFailure(error)
+      }
+    } },
   }
   const dispatchRpc = createRpcDispatcher({ endpoints: rpcEndpoints, featureEnabled, logger: ctx.logger })
   try {
@@ -5977,6 +6137,7 @@ export {
   evaluateSkillFile,
   extractSkillDraftJson,
   fetchCliproxyUsage,
+  fetchCommandCodeQuota,
   fetchProviderUsage,
   fetchStepFunStepPlanUsage,
   fetchXiaomiTokenPlanUsage,
@@ -5995,6 +6156,7 @@ export {
   normalizeAntigravityModels,
   normalizeAntigravityQuotaSummary,
   normalizeCodexRateLimit,
+  normalizeCommandCodeQuota,
   normalizeDeepseekBalance,
   normalizeGeminiBuckets,
   normalizeKimiBalance,
@@ -6035,6 +6197,10 @@ export {
   unwrapCliproxyApiCallEnvelope,
   unwrapXiaomiConsoleEnvelope,
   viewSessionPage,
+  loadUnifiedConfig,
+  saveUnifiedConfig,
+  updateUnifiedConfigSection,
+  sanitizeSettingsNavConfig,
 }
 export default {
   SKILL_SOURCE_RANK,
@@ -6051,6 +6217,7 @@ export default {
   evaluateSkillFile,
   extractSkillDraftJson,
   fetchCliproxyUsage,
+  fetchCommandCodeQuota,
   fetchProviderUsage,
   fetchStepFunStepPlanUsage,
   fetchXiaomiTokenPlanUsage,
@@ -6069,6 +6236,7 @@ export default {
   normalizeAntigravityModels,
   normalizeAntigravityQuotaSummary,
   normalizeCodexRateLimit,
+  normalizeCommandCodeQuota,
   normalizeDeepseekBalance,
   normalizeGeminiBuckets,
   normalizeKimiBalance,
@@ -6109,4 +6277,8 @@ export default {
   unwrapCliproxyApiCallEnvelope,
   unwrapXiaomiConsoleEnvelope,
   viewSessionPage,
+  loadUnifiedConfig,
+  saveUnifiedConfig,
+  updateUnifiedConfigSection,
+  sanitizeSettingsNavConfig,
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gehennawu/dsh-service",
-  "version": "1.6.2",
+  "version": "1.7.0",
   "description": "DSH Web 运维面板：安全重启、健康监控、备份和 Linux 权限维护。",
   "type": "module",
   "scripts": {