@arcaneorion/dsh-model-channel-manager 0.3.0 → 0.3.8

package/src/client.js

@@ -38,22 +38,25 @@ window.__ModuleLoader__.load({
               { ns: 'model-channel-health', value: value.health || {}, user: (user && user.health) || {}, revision: (mcm && mcm.revision) || 0 },
             ] } } }
           },
-          // 旧签名：update({ ns, patch })
+          // 旧签名：update({ ns, patch, expectedRevision })——0.3.2 起透传 revision
+          // （宿主 settings.update 第三参；冲突抛 settings/conflict，由调用方提示重载）
           update: async (args) => {
             const ns = (args && args.ns) || NS_MCM
             const patch = (args && args.patch) || {}
-            if (ns === 'model-channels') return wrap(await remote.settings.update(NS_MCM, patch, undefined))
+            const expected = (args && args.expectedRevision !== undefined) ? args.expectedRevision : undefined
+            if (ns === 'model-channels') return wrap(await remote.settings.update(NS_MCM, patch, expected))
             const row = await readMcm()
             const health = (row && row.value && row.value.health) || {}
-            return wrap(await remote.settings.update(NS_MCM, { health: Object.assign({}, health, patch) }, undefined))
+            return wrap(await remote.settings.update(NS_MCM, { health: Object.assign({}, health, patch) }, expected))
           },
           // 旧签名：mutate({ ns, ops })——0.2 只对真实行命名空间提供 path-ops；
           // 本插件自身的健康子树用合并写实现等价语义。
           mutate: async (args) => {
             const ns = (args && args.ns) || NS_MCM
             const ops = (args && args.ops) || []
+            const expected = (args && args.expectedRevision !== undefined) ? args.expectedRevision : undefined
             if (ns !== 'model-channels' && ns !== 'model-channel-health' && ns !== NS_MCM) {
-              return wrap(await remote.settings.mutate(ns, ops, undefined))
+              return wrap(await remote.settings.mutate(ns, ops, expected))
             }
             const row = await readMcm()
             const health = Object.assign({}, (row && row.value && row.value.health) || {})
@@ -78,9 +81,9 @@ window.__ModuleLoader__.load({
               }
             }
             if (ns === 'model-channels') {
-              return wrap(await remote.settings.update(NS_MCM, { groups: top.groups, providerOrder: top.providerOrder }, undefined))
+              return wrap(await remote.settings.update(NS_MCM, { groups: top.groups, providerOrder: top.providerOrder }, expected))
             }
-            return wrap(await remote.settings.update(NS_MCM, { health }, undefined))
+            return wrap(await remote.settings.update(NS_MCM, { health }, expected))
           },
         },
         credentials: {
@@ -589,13 +592,18 @@ window.__ModuleLoader__.load({
         if (!apiRef) return
         const key = provider + '::' + model
         setTestStates((s) => Object.assign({}, s, { [key]: { status: 'running' } }))
-        const nonce = Date.now() % 1000000000
+        // F03：Date.now()%1e9 同毫秒可碰撞（碰撞 = 两次测试互相认领/覆盖结果），
+        // 换 UUID；host 侧 testRequest.nonce 消费方是 !== 比较，字符串/数字都行
+        const nonce = (crypto.randomUUID && crypto.randomUUID()) || (String(Date.now()) + '-' + Math.random().toString(36).slice(2, 10))
         const prompt = localStorage.getItem('mcm_test_prompt') || '用一句话介绍你自己'
         const maxTokens = Number(localStorage.getItem('mcm_test_max_tokens')) || 256
         apiRef.settings.update({
           ns: 'model-channel-health',
           patch: { testRequest: { nonce, provider, model, prompt, maxTokens } }
-        }).then(() => {
+        }).then((resp) => {
+          // F19：RPC resolve ≠ 业务成功——检查信封（旧实现把 ok:false 当「已触发」）
+          const r = resp && resp.result ? resp.result : resp
+          if (r && r.ok === false) throw new Error((r.error && (r.error.message || r.error)) || 'test request rejected')
           pollTest(nonce, provider, model)
         }).catch((e) => {
           setTestStates((s) => Object.assign({}, s, { [key]: { status: 'error', error: String((e && e.message) || e) } }))
@@ -704,7 +712,7 @@ window.__ModuleLoader__.load({
             el('span', {
               title: '拖动此手柄调整供应商顺序（保存后生效）',
               draggable: true,
-              onDragStart: (e) => { e.stopPropagation(); setDragIdx(idx); try { e.dataTransfer.effectAllowed = 'move'; e.dataTransfer.setData('text/plain', String(idx)) } catch (_e) {} },
+              onDragStart: (e) => { e.stopPropagation(); setDragIdx(realIdx); try { e.dataTransfer.effectAllowed = 'move'; e.dataTransfer.setData('text/plain', String(realIdx)) } catch (_e) {} },
               onDragEnd: () => { setDragIdx(null); setOverIdx(null) },
               onClick: (e) => e.stopPropagation(),
               style: { cursor: 'grab', color: 'var(--dsw-alias-label-tertiary)', fontSize: 14, padding: '0 6px', userSelect: 'none' }
@@ -931,6 +939,8 @@ window.__ModuleLoader__.load({
       const providers = props._providers || {}
       const [speedState, setSpeedState] = useState({})
       const [expanded, setExpanded] = useState({})
+      // 顶层 notice 的写入通道（ModelConfigView 传入；测速失败要上浮显示）
+      const setNotice = props._setNotice || (() => {})
 
       const addGroup = () => props.setChannelsDraft((d) => {
         const base = d || []
@@ -965,12 +975,19 @@ window.__ModuleLoader__.load({
 
       const speedtest = (gid) => {
         if (!apiRef) return
-        const nonce = Date.now() % 1000000000
+        // F03/F19 同 fireTest：UUID 防碰撞 + 信封检查（ok:false 不再当「已触发」）
+        const nonce = (crypto.randomUUID && crypto.randomUUID()) || (String(Date.now()) + '-' + Math.random().toString(36).slice(2, 10))
         setSpeedState((s) => Object.assign({}, s, { [gid]: 'running' }))
-        apiRef.settings.update({ ns: 'model-channel-health', patch: { speedRequest: { group: gid, nonce } } }).then(() => {
+        apiRef.settings.update({ ns: 'model-channel-health', patch: { speedRequest: { group: gid, nonce } } }).then((resp) => {
+          const r = resp && resp.result ? resp.result : resp
+          if (r && r.ok === false) throw new Error((r.error && (r.error.message || r.error)) || 'speed request rejected')
           setSpeedState((s) => Object.assign({}, s, { [gid]: 'sent' }))
           setTimeout(() => setSpeedState((s) => Object.assign({}, s, { [gid]: null })), 3000)
-        }).catch(() => setSpeedState((s) => Object.assign({}, s, { [gid]: 'err' })))
+        }).catch((e) => {
+          setSpeedState((s) => Object.assign({}, s, { [gid]: 'err' }))
+          setNotice('测速触发失败: ' + String((e && e.message) || e))
+          setTimeout(() => setNotice(null), 5000)
+        })
       }
 
       if (groups.length === 0) return el('div', { className: 'mcm-empty' }, '暂无轮询组，点击下方按钮创建', el('div', { style: { marginTop: 12 } }, btn('＋新增轮询组', addGroup, 'primary')))
@@ -1065,11 +1082,13 @@ window.__ModuleLoader__.load({
 
       const now = Date.now()
       const windowCutoff = windowMode === '30m' ? now - 30 * 60 * 1000 : windowMode === '24h' ? now - 24 * 3600 * 1000 : 0
-      const recsMap = health.records || {}
-      const rawEvents = Object.values(recsMap).flat()
-      // 时间窗口过滤
-      const allEvents = rawEvents.filter((e) => (e.ts || 0) >= windowCutoff)
 
+      // ---------- 聚合数据源 ----------
+      // 0.3.1 起优先用 host 下发的 digest 小投影（聚合已上移 host，client 不再拉原始流水）。
+      // digest 是 7 天全窗口聚合；30m/24h 视图按 lastTs 近似（lastTs 在窗口内才计入），
+      // 精细窗口统计属后续增强（需要 host 按窗口出多份 digest）。
+      // 旧 host 兼容：无 digest 字段时走原始 records 路径（升级窗口不断供）。
+      const digestRows = Array.isArray(health.digest) ? health.digest : null
       // 按 provider 分组
       const byProvider = new Map()
 
@@ -1092,7 +1111,10 @@ window.__ModuleLoader__.load({
               lastOk: null,
               lastCode: null,
               recentErrors: 0,
-              tokSum: 0
+              tokSum: 0,
+              tokIn: 0,
+              tokOut: 0,
+              tokCache: 0
             })
           }
         }
@@ -1103,57 +1125,134 @@ window.__ModuleLoader__.load({
       let totalTokOut = 0
       let totalTokCache = 0
 
-      // 累加时间窗口内的真实流水记录
-      for (const e of allEvents) {
-        if (!e || !e.provider || !e.model) continue
-        let pMap = byProvider.get(e.provider)
-        if (!pMap) { pMap = new Map(); byProvider.set(e.provider, pMap) }
-        let a = pMap.get(e.model)
-        if (!a) {
-          a = {
-            provider: e.provider,
-            model: e.model,
-            name: e.model,
-            total: 0,
-            success: 0,
-            fail: 0,
-            ttftSum: 0,
-            latSum: 0,
-            lastTs: 0,
-            lastOk: null,
-            lastCode: null,
-            recentErrors: 0,
-            tokSum: 0
+      if (digestRows !== null) {
+        // ---------- digest 投影路径 ----------
+        for (const row of digestRows) {
+          if (!row || !row.provider || !row.model) continue
+          // 窗口过滤：lastTs 不在窗口内的渠道不计入该窗口（近似口径，见上注）
+          if (windowCutoff > 0 && (row.lastTs || 0) < windowCutoff) continue
+          let pMap = byProvider.get(row.provider)
+          if (!pMap) { pMap = new Map(); byProvider.set(row.provider, pMap) }
+          let a = pMap.get(row.model)
+          if (!a) {
+            a = {
+              provider: row.provider,
+              model: row.model,
+              name: row.model,
+              total: 0,
+              success: 0,
+              fail: 0,
+              ttftSum: 0,
+              latSum: 0,
+              lastTs: 0,
+              lastOk: null,
+              lastCode: null,
+              recentErrors: 0,
+              tokSum: 0,
+              tokIn: 0,
+              tokOut: 0,
+              tokCache: 0
+            }
+            pMap.set(row.model, a)
           }
-          pMap.set(e.model, a)
-        }
-        a.total++
-        const tokIn = (e && e.inputTokens) || 0
-        const tokOut = (e && e.outputTokens) || 0
-        const tokCache = ((e && e.cacheReadTokens) || 0) + ((e && e.cacheWriteTokens) || 0)
-        totalTokIn += tokIn
-        totalTokOut += tokOut
-        totalTokCache += tokCache
-        a.tokSum += tokIn + tokOut + tokCache
-        if (e.ok) {
-          a.success++
-          if (e.ttftMs != null && e.ttftMs >= 0) a.ttftSum += e.ttftMs
-          if (e.latencyMs != null && e.latencyMs >= 0) a.latSum += e.latencyMs
-        } else {
-          a.fail++
-          if (e.code) a.lastCode = e.code
+          a.total = row.total || 0
+          a.success = row.success || 0
+          a.fail = a.total - a.success
+          a.ttftSum = (row.ttftAvg || 0) * a.success
+          a.latSum = (row.latAvg || 0) * a.success
+          a.lastTs = row.lastTs || 0
+          a.lastOk = row.lastOk
+          a.lastCode = row.lastCode || null
+          a.tokIn = row.tokIn || 0
+          a.tokOut = row.tokOut || 0
+          a.tokCache = row.tokCache || 0
+          a.tokSum = a.tokIn + a.tokOut + a.tokCache
+          totalTokIn += a.tokIn
+          totalTokOut += a.tokOut
+          totalTokCache += a.tokCache
         }
-        if ((e.ts || 0) > a.lastTs) {
-          a.lastTs = e.ts || 0
-          a.lastOk = e.ok
+      } else {
+        // ---------- 旧 host 原始流水路径（兼容） ----------
+        const recsMap = health.records || {}
+        const rawEvents = Object.values(recsMap).flat()
+        // 时间窗口过滤（赋给函数级 allEvents，供顶部指标卡使用）
+        allEvents = rawEvents.filter((e) => (e.ts || 0) >= windowCutoff)
+        // 累加时间窗口内的真实流水记录
+        for (const e of allEvents) {
+          if (!e || !e.provider || !e.model) continue
+          let pMap = byProvider.get(e.provider)
+          if (!pMap) { pMap = new Map(); byProvider.set(e.provider, pMap) }
+          let a = pMap.get(e.model)
+          if (!a) {
+            a = {
+              provider: e.provider,
+              model: e.model,
+              name: e.model,
+              total: 0,
+              success: 0,
+              fail: 0,
+              ttftSum: 0,
+              latSum: 0,
+              lastTs: 0,
+              lastOk: null,
+              lastCode: null,
+              recentErrors: 0,
+              tokSum: 0,
+              tokIn: 0,
+              tokOut: 0,
+              tokCache: 0
+            }
+            pMap.set(e.model, a)
+          }
+          a.total++
+          const tokIn = (e && e.inputTokens) || 0
+          const tokOut = (e && e.outputTokens) || 0
+          const tokCache = ((e && e.cacheReadTokens) || 0) + ((e && e.cacheWriteTokens) || 0)
+          totalTokIn += tokIn
+          totalTokOut += tokOut
+          totalTokCache += tokCache
+          a.tokIn += tokIn
+          a.tokOut += tokOut
+          a.tokCache += tokCache
+          a.tokSum += tokIn + tokOut + tokCache
+          if (e.ok) {
+            a.success++
+            if (e.ttftMs != null && e.ttftMs >= 0) a.ttftSum += e.ttftMs
+            if (e.latencyMs != null && e.latencyMs >= 0) a.latSum += e.latencyMs
+          } else {
+            a.fail++
+            if (e.code) a.lastCode = e.code
+          }
+          if ((e.ts || 0) > a.lastTs) {
+            a.lastTs = e.ts || 0
+            a.lastOk = e.ok
+          }
         }
       }
 
-      const totalRequests = allEvents.length
-      const totalSuccess = allEvents.filter((x) => x.ok).length
+      // 顶部指标卡：digest 路径用聚合值求和，旧路径用原始事件计数
+      // （allEvents 提升到函数级：旧 host 回落路径的 else 块在此作用域外定义它）
+      let allEvents = []
+      let totalRequests = 0
+      let totalSuccess = 0
+      let ttftWeightedSum = 0
+      if (digestRows !== null) {
+        for (const pMap of byProvider.values()) {
+          for (const a of pMap.values()) {
+            totalRequests += a.total
+            totalSuccess += a.success
+            ttftWeightedSum += a.ttftSum
+          }
+        }
+      } else {
+        totalRequests = allEvents.length
+        totalSuccess = allEvents.filter((x) => x.ok).length
+        for (const pMap of byProvider.values()) {
+          for (const a of pMap.values()) ttftWeightedSum += a.ttftSum
+        }
+      }
       const globalRate = totalRequests > 0 ? ((totalSuccess / totalRequests) * 100).toFixed(1) + '%' : '100%'
-      const validTtfts = allEvents.filter((x) => x.ok && x.ttftMs != null).map((x) => x.ttftMs)
-      const avgGlobalTtft = validTtfts.length > 0 ? (validTtfts.reduce((a, b) => a + b, 0) / validTtfts.length / 1000).toFixed(2) + 's' : '—'
+      const avgGlobalTtft = totalSuccess > 0 ? (ttftWeightedSum / totalSuccess / 1000).toFixed(2) + 's' : '—'
 
       const providerGroups = [...byProvider.entries()].map(([provName, modelMap]) => {
         const models = [...modelMap.values()].map((m) => {
@@ -1212,7 +1311,9 @@ window.__ModuleLoader__.load({
           el('div', { className: 'mcm-metric-card' },
             el('span', { className: 'mcm-metric-label' }, windowMode === '30m' ? '近 30 分钟请求' : windowMode === '24h' ? '近 24 小时请求' : '7 天全周期请求'),
             el('span', { className: 'mcm-metric-value' }, totalRequests),
-            el('span', { style: { fontSize: 11, color: 'var(--dsw-alias-label-tertiary)' } }, '真实上游交互捕获')
+            // digest 聚合是 7 天窗口口径；30m/24h 只按「最近活跃」过滤渠道，数值为该渠道 7 天累计
+            el('span', { style: { fontSize: 11, color: 'var(--dsw-alias-label-tertiary)' } },
+              digestRows !== null && windowMode !== '7d' ? '窗口内活跃渠道的 7 天累计（聚合口径）' : '真实上游交互捕获')
           ),
           el('div', { className: 'mcm-metric-card' },
             el('span', { className: 'mcm-metric-label' }, '总 Token 用量'),
@@ -1284,11 +1385,23 @@ window.__ModuleLoader__.load({
       const [notice, setNotice] = useState(null)
       const [saving, setSaving] = useState(false)
       const [tab, setTab] = useState('config')
+      // ready 门（审计 F04）：首次 describe 完成前保存不可用——旧实现
+      // channelsDraft || [] 把「还没读到」当「空」，加载前点保存会把轮询组清空
+      const [ready, setReady] = useState(false)
 
       const renameProviderInChannels = (oldId, newId) => {
+        // F17（审计 C05）：改名要同步全部引用——主 candidates + 每个 preset 的
+        // candidates。宿主优先使用 activePreset.candidates，漏改它 = 删旧 provider
+        // 后组仍访问不存在的 ID。
+        const renameCands = (cands) => (cands || []).map((c) => (c && c.provider === oldId) ? Object.assign({}, c, { provider: newId }) : c)
         setChannelsDraft((d) => (d || []).map((g) => {
-          const cands = (g.candidates || []).map((c) => (c && c.provider === oldId) ? Object.assign({}, c, { provider: newId }) : c)
-          return Object.assign({}, g, { candidates: cands })
+          const next = Object.assign({}, g, { candidates: renameCands(g.candidates) })
+          if (Array.isArray(g.presets)) {
+            next.presets = g.presets.map((p) => (p && Array.isArray(p.candidates))
+              ? Object.assign({}, p, { candidates: renameCands(p.candidates) })
+              : p)
+          }
+          return next
         }))
       }
       const [channels, setChannels] = useState(null)
@@ -1328,14 +1441,22 @@ window.__ModuleLoader__.load({
           const providers = applyProviderOrder((ns && ns.value && ns.value.providers) || {}, savedOrder)
           // user 层 = 仅用户手工声明的路由（用于真正删除与重排序的 mutate 依据）
           const userProviders = (ns && ns.user && ns.user.providers) || {}
-          setState({ providers, userProviders, providerOrder: savedOrder || [] })
+          // revision 记录（审计 F05）：保存时作为 expectedRevision 传给宿主，
+          // 别处（另一个标签页/host 侧）改过配置则宿主拒绝，防止旧快照覆盖
+          setState({ providers, userProviders, providerOrder: savedOrder || [], nsRevisions: { piAi: (ns && ns.revision) || 0, channels: (cn && cn.revision) || 0 } })
           setDraft((prev) => prev || clone(providers))
           const ch = (cn && cn.value && cn.value.groups) || []
           setChannels(ch)
           setChannelsDraft((prev) => prev || clone(ch))
           const hn = findNs('model-channel-health')
-          setHealth(hn ? { records: (hn.value && hn.value.records) || {}, speedResults: (hn.value && hn.value.speedResults) || {}, runtime: (hn.value && hn.value.runtime) || {} } : null)
-        }).catch((e) => setNotice('加载失败: ' + String(e)))
+          // 0.3.1：健康权威数据在 host 的 storageDomain；client 只接收小投影 digest。
+          // 兼容旧 host（无 digest 字段）时回落到 records 原始视图，避免升级窗口白屏。
+          const hv = (hn && hn.value) || {}
+          setHealth(hv.digest || (hv.digestAt !== undefined)
+            ? { digest: hv.digest || [], digestAt: hv.digestAt || 0, speedResults: hv.speedResults || {}, runtime: hv.runtime || {} }
+            : (hn ? { records: hv.records || {}, speedResults: hv.speedResults || {}, runtime: hv.runtime || {} } : null))
+          setReady(true) // describe 成功：保存解禁（F04 的门）
+        }).catch((e) => { setNotice('加载失败: ' + String(e)); setReady(false) })
       }
 
       useEffect(() => {
@@ -1350,11 +1471,10 @@ window.__ModuleLoader__.load({
             const d = unwrap(resp)
             const hn = ((d && d.namespaces) || []).find((n) => n && n.ns === 'model-channel-health')
             if (hn && hn.value) {
-              setHealth({
-                records: hn.value.records || {},
-                speedResults: hn.value.speedResults || {},
-                runtime: hn.value.runtime || {}
-              })
+              const hv = hn.value
+              setHealth(hv.digest || (hv.digestAt !== undefined)
+                ? { digest: hv.digest || [], digestAt: hv.digestAt || 0, speedResults: hv.speedResults || {}, runtime: hv.runtime || {} }
+                : { records: hv.records || {}, speedResults: hv.speedResults || {}, runtime: hv.runtime || {} })
             }
           }).catch(() => {})
         }
@@ -1365,6 +1485,36 @@ window.__ModuleLoader__.load({
 
       const save = () => {
         if (!apiRef) return
+        // F04 门：describe 未完成时 draft/channelsDraft 都是 null——旧实现
+        // (channelsDraft || []) 把「还没读到」当「空」，这里直接拦截而不是兜底空数组
+        if (!ready) {
+          setNotice('配置尚未加载完成，请稍候再保存')
+          setTimeout(() => setNotice(null), 4000)
+          return
+        }
+        // F16 预检：非法/重复组 ID、空候选直接拒绝提交（旧实现保存后 host 静默丢弃，
+        // 界面仍显示「已保存」——H08：3 组保存实际只注册 1 条路由）
+        const groupsToSave = channelsDraft || []
+        const problems = []
+        const seenIds = new Set()
+        for (const g of groupsToSave) {
+          const gid = (g && g.id) || ''
+          if (!/^[a-z0-9][a-z0-9-]*$/.test(gid)) {
+            problems.push('组「' + (gid || '(未命名)') + '」ID 非法（仅小写字母/数字/连字符，字母或数字开头）')
+          } else if (seenIds.has(gid)) {
+            problems.push('组 ID「' + gid + '」重复')
+          } else {
+            seenIds.add(gid)
+          }
+          const candCount = (g && Array.isArray(g.candidates)) ? g.candidates.filter((c) => c && c.provider && c.model).length : 0
+          if (candCount === 0 && gid)
+            problems.push('组「' + gid + '」没有可用候选（候选需同时选择 Provider 和模型）')
+        }
+        if (problems.length > 0) {
+          setNotice('保存被拒绝：' + problems[0] + (problems.length > 1 ? '（共 ' + problems.length + ' 个问题）' : ''))
+          setTimeout(() => setNotice(null), 8000)
+          return
+        }
         setSaving(true)
         setNotice(null)
         // Compat 全量透传：rc.2 PiAiCompatProfile 的 20 个字段全部真实生效——此前
@@ -1406,6 +1556,10 @@ window.__ModuleLoader__.load({
               if (Array.isArray(cleaned.input) && cleaned.input.length > 0) cleaned.input = cleaned.input.slice()
               else delete cleaned.input
               if (cleaned.reasoningEfforts != null && typeof cleaned.reasoningEfforts === 'object' && Object.keys(cleaned.reasoningEfforts).length > 0) cleaned.reasoningEfforts = Object.assign({}, cleaned.reasoningEfforts)
+              else if (cleaned.reasoningEfforts === false) {
+                // F07（审计 C02）：false = 显式关闭推理（继承 catalog 默认的对立面）。
+                // 删掉它 = 静默恢复继承，语义被改变。原样保留。
+              }
               else delete cleaned.reasoningEfforts
               const mc = cleanCompat(cleaned.compat)
               if (mc) cleaned.compat = mc
@@ -1413,7 +1567,12 @@ window.__ModuleLoader__.load({
               return cleaned
             })
             const pObj = Object.assign({}, pVal)
-            pObj.api = pVal.api || 'openai-completions'
+            // F07（审计 C08）：api 缺省 = 继承 catalog 协议；强塞 openai-completions
+            // 会把「继承」变成「显式指定」，materialize 时显式 api 优先于 catalog——
+            // 协议被静默切换。UI 下拉仍显示默认值（渲染默认与持久化默认分离），
+            // 但保存不写显式值。新增供应商时 addGroup 路径已显式给 api。
+            if (typeof pVal.api === 'string' && pVal.api) pObj.api = pVal.api
+            else delete pObj.api
             pObj.models = cleanModels
             if (!(pVal.baseURL && String(pVal.baseURL).trim())) delete pObj.baseURL
             else pObj.baseURL = String(pVal.baseURL).trim()
@@ -1473,9 +1632,14 @@ window.__ModuleLoader__.load({
           for (const k of allKeys) ops.push({ op: 'unset', path: ['providers', k] })
           for (const k of keys) ops.push({ op: 'set', path: ['providers', k], value: cleanProviders[k] })
           if (ops.length === 0) return Promise.resolve()
-          return apiRef.settings.mutate({ ns: 'llm-pi-ai', ops }).then((resp) => {
+          // F05：带 revision 保存——llm-pi-ai 是独立 settings 行，冲突由宿主以
+          // settings/conflict 拒绝；提示里给「刷新后重试」指引而不是静默覆盖
+          return apiRef.settings.mutate({ ns: 'llm-pi-ai', ops, expectedRevision: (state && state.nsRevisions && state.nsRevisions.piAi) || undefined }).then((resp) => {
             const r = resp && resp.result ? resp.result : resp
-            if (r && r.ok === false) throw new Error((r.error && (r.error.message || r.error)) || 'llm-pi-ai save failed')
+            if (r && r.ok === false) {
+              const conflict = r.error && (r.error.code === 'settings/conflict' || /conflict/i.test(String(r.error.message || '')))
+              throw new Error(conflict ? 'llm-pi-ai 配置已被其他页面修改（版本冲突），请点「刷新」后重试' : ((r.error && (r.error.message || r.error)) || 'llm-pi-ai save failed'))
+            }
             return r
           })
         })() : Promise.resolve()
@@ -1484,22 +1648,46 @@ window.__ModuleLoader__.load({
         const orderPatch = draft ? { providerOrder: Object.keys(cleanProviders) } : {}
         const p2 = apiRef.settings.update({
           ns: 'model-channels',
+          expectedRevision: (state && state.nsRevisions && state.nsRevisions.channels) || undefined,
           // 命名单一身份：写入时统一 virtualModel.name = 组 id——旧的独立呈现名
           // （如遗留的 group-1）在下一次保存时自动归一，无需迁移
           patch: Object.assign({ groups: (channelsDraft || []).map((g) => Object.assign({}, g, { virtualModel: Object.assign({}, g.virtualModel, { name: g.id }) })) }, orderPatch)
         }).then((resp) => {
           const r = resp && resp.result ? resp.result : resp
-          if (r && r.ok === false) throw new Error((r.error && (r.error.message || r.error)) || 'model-channels save failed')
+          if (r && r.ok === false) {
+            const conflict = r.error && (r.error.code === 'settings/conflict' || /conflict/i.test(String(r.error.message || '')))
+            throw new Error(conflict ? '轮询组配置已被其他页面修改（版本冲突），请点「刷新」后重试' : ((r.error && (r.error.message || r.error)) || 'model-channels save failed'))
+          }
           return r
         })
-        Promise.all([p1, p2]).then(() => {
-          setNotice('已全部保存（即时生效）')
-          // 同步草稿与状态为刚保存的清洗版本（含默认请求头合并结果）
-          setDraft(clone(cleanProviders))
-          setState((s) => Object.assign({}, s, { providers: cleanProviders, userProviders: cleanProviders, providerOrder: Object.keys(cleanProviders) }))
-          setTimeout(() => setNotice(null), 3000)
+        // F06（审计 C10，0.3.8）：两域用 allSettled 而非 all——半成功不再「整单失败」
+        // 掩盖已提交的那半。各自报告，失败域给出明确指引；部分成功时提示里列明
+        // 哪域成功哪域失败，用户知道实际落盘了什么（宿主无跨命名空间事务，
+        // 这是审计建议的务实路线：可观察的分域成败 + 冲突重试）。
+        const settleOf = (label, p) => p.then(() => ({ label, ok: true }), (e) => ({ label, ok: false, error: String((e && e.message) || e) }))
+        Promise.allSettled([settleOf('提供商配置', p1), settleOf('轮询组配置', p2)]).then((results) => {
+          const done = results.map((r) => r.value)
+          const failed = done.filter((d) => d && !d.ok)
+          const okCount = done.length - failed.length
+          if (failed.length === 0) {
+            setNotice('已全部保存（即时生效）')
+          }
+          else if (okCount > 0) {
+            // 部分成功：明确告知哪域已落盘、哪域失败（旧实现统一「保存失败」，
+            // 用户不知道 providers 其实已经提交了）
+            setNotice('部分保存：' + done.filter((d) => d && d.ok).map((d) => d.label).join('、') + ' 已生效；' + failed.map((d) => d.label).join('、') + ' 失败——' + failed[0].error)
+          }
+          else {
+            setNotice('保存失败: ' + failed[0].error)
+          }
+          // 两域都成功才同步本地镜像（半成功时以 refresh 拉回真实状态为准）
+          if (failed.length === 0) {
+            setDraft(clone(cleanProviders))
+            setState((s) => Object.assign({}, s, { providers: cleanProviders, userProviders: cleanProviders, providerOrder: Object.keys(cleanProviders) }))
+          }
+          setTimeout(() => setNotice(null), failed.length > 0 ? 8000 : 3000)
           refresh()
-        }).catch((e) => setNotice('保存失败: ' + String((e && e.message) || e))).finally(() => setSaving(false))
+        }).finally(() => setSaving(false))
       }
 
       return el('div', { className: 'mcm-root' },
@@ -1512,12 +1700,18 @@ window.__ModuleLoader__.load({
           el('div', { className: 'mcm-actions' },
             notice ? el('span', { style: { fontSize: 12, color: notice.includes('失败') ? 'var(--dsw-alias-state-error-primary)' : 'var(--dsw-alias-state-success-primary)' } }, notice) : null,
             btn('刷新', refresh),
-            btn(saving ? '保存中…' : '保存全部变更', save, 'primary')
+            el('button', {
+              className: 'mcm-btn primary',
+              // F04：未就绪/保存中禁用；disabled 态样式弱化
+              disabled: !ready || saving,
+              style: (!ready || saving) ? { opacity: 0.55, cursor: 'not-allowed' } : undefined,
+              onClick: save
+            }, !ready ? '加载中…' : saving ? '保存中…' : '保存全部变更')
           )
         ),
         el('div', { className: 'mcm-body' },
           tab === 'config' ? el(ModelConfigPanel, { _state: state, _draft: draft, _setDraft: setDraft, _setNotice: setNotice, _renameProviderInChannels: renameProviderInChannels }) :
-          tab === 'roundrobin' ? el(RoundrobinPanel, { channels, channelsDraft, setChannelsDraft, _providers: (draft || (state ? state.providers : {})) }) :
+          tab === 'roundrobin' ? el(RoundrobinPanel, { channels, channelsDraft, setChannelsDraft, _providers: (draft || (state ? state.providers : {})), _setNotice: setNotice }) :
           el(HealthPanel, { health, _providers: (draft || (state ? state.providers : {})) })
         )
       )