@kenhkl/agent-moss 0.12.8 → 0.13.0

package/dist/static/index.html

@@ -381,6 +381,8 @@ const LAYER_NAMES = {
   L1_heuristic: { name: t('L1 静态检测', 'L1 Heuristic Detection'), desc: t('正则/关键词匹配，仅看下一步动作', 'Regex/keyword matching; only inspects the next action') },
   L2_logic_rules: { name: t('L2 逻辑规则', 'L2 Logic Rules'), desc: t('read_before_write + 授权检测使用历史动作序列，敏感路径/危险模式仅匹配下一步', 'read_before_write + authorization checks use historical action sequences; sensitive paths/dangerous patterns match only the next action') },
   L3_llm_analysis: { name: t('L3 LLM 分析', 'L3 LLM Analysis'), desc: t('Skill 匹配 + LLM 语义判断', 'Skill matching + LLM semantic judgment') },
+  agent_rules_enabled: { name: t('Agent 定制规则', 'Agent Custom Rules'), desc: t('各 agent 专属规则总开关（xiaoo/opendesk 等分区）', 'Master switch for per-agent custom rules (xiaoo/opendesk partitions)') },
+  scenario_rules_enabled: { name: t('场景定制规则', 'Scenario Custom Rules'), desc: t('各场景专属规则总开关（bank 等部署级分区）', 'Master switch for per-scenario custom rules (bank etc.)') },
 };
 const L1_CATEGORY_NAMES = {
   dangerous_commands: t('⚡ 危险命令检测', '⚡ Dangerous Commands'),
@@ -609,8 +611,13 @@ function render_overview() {
       <div class="ag-section-title">${t('规则统计', 'Rule Statistics')}</div>
       <div class="ag-stat-grid">
         <div class="ag-stat-card"><div class="label">${t('L1 规则启用', 'L1 Rules Enabled')}</div><div class="value">${countEnabled(state.config.L1_rules, 'L1_heuristic')}/${countRules(state.config.L1_rules)}</div></div>
-        <div class="ag-stat-card"><div class="label">${t('L2 规则启用', 'L2 Rules Enabled')}</div><div class="value">${countEnabled(state.config.L2_rules, 'L2_logic_rules')}/${countRules(state.config.L2_rules)}</div></div>
+        <div class="ag-stat-card"><div class="label">${t('L2 规则启用', 'L2 Rules Enabled')}</div><div class="value">${countEnabledL2()}/${countRulesL2()}</div></div>
         <div class="ag-stat-card"><div class="label">${t('L3 Skills 启用', 'L3 Skills Enabled')}</div><div class="value">${countEnabledSkills(state.config.L3_skills, 'L3_llm_analysis')}/${countSkills(state.config.L3_skills)}</div></div>
+        <div class="ag-stat-card"><div class="label">${t('Agent 定制规则', 'Agent custom rules')}</div><div class="value">${countRules(state.agentRules?.agents || {})}</div></div>
+        <div class="ag-stat-card"><div class="label">${t('场景定制规则', 'Scenario custom rules')}</div><div class="value">${(state.scenarioRules?.scenarios ? countRules(state.scenarioRules.scenarios) : 0)}</div></div>
+      </div>
+      <div style="font-size:11px;color:var(--ag-text-secondary);margin-top:6px">
+        ${t('说明：LTL 时序规则属 L2（开关在 L2 页）；Agent/场景为按 id 分区的定制规则，有独立总开关。', 'Note: LTL timing rules belong to L2 (toggle on L2 page); Agent/Scenario are id-partitioned custom rules with their own master switches.')}
       </div>
     </div>
     <div class="ag-card">
@@ -669,6 +676,19 @@ function countEnabledSkills(ls, layerKey) {
   if (layerKey && state.config.layers?.[layerKey] === false) return 0;
   return Object.values(ls).reduce((s, c) => s + ((c.skills || []).filter(s => s.enabled && c.category_enabled !== false).length), 0);
 }
+// 方案B：L2 总规则数 = 文本规则 + LTL 时序规则（都属 L2 大类）
+function countRulesL2() {
+  const text = countRules(state.config.L2_rules);
+  const ltl = (state.config.L2_4?.ltl_rules || []).length;
+  return text + ltl;
+}
+// L2 启用数 = 文本启用 + LTL 启用（层级总开关关闭时 LTL 归 0，与引擎 gating 一致）
+function countEnabledL2() {
+  const text = countEnabled(state.config.L2_rules, 'L2_logic_rules');
+  const layerOn = state.config.layers?.L2_logic_rules !== false;
+  const ltlOn = layerOn ? (state.config.L2_4?.ltl_rules || []).filter(r => r.enabled !== false).length : 0;
+  return text + ltlOn;
+}
 
 // ===== 层级开关 =====
 async function toggleLayer(key) {
@@ -715,16 +735,27 @@ function toggleExpand(id) {
 // ===== L1/L2 规则页 =====
 // 规则层容器 -> 层级总开关 key 的映射（用于大类开关随层级开关联动）
 const LAYER_SWITCH_KEY = { L1_rules: 'L1_heuristic', L2_rules: 'L2_logic_rules', L3_skills: 'L3_llm_analysis' };
-function renderRuleLayer(layerKey, containerId, categoryNames) {
+function renderRuleLayer(layerKey, containerId, categoryNames, append = false, showAddBtn = true, strict = false) {
   const layer = state.config[layerKey] || {};
   // 层级总开关：关闭时整层大类开关随动显示为关（仅 UI 联动，不改后端数据）
   const layerSwitchKey = LAYER_SWITCH_KEY[layerKey];
   const layerEnabled = layerSwitchKey ? state.config.layers?.[layerSwitchKey] !== false : true;
-  const orderedEntries = [
-    ...Object.keys(categoryNames).filter(k => k in layer).map(k => [k, layer[k]]),
-    ...Object.entries(layer).filter(([k]) => !(k in categoryNames)),
-  ];
-  let html = `<div class="ag-card" style="padding:8px 16px"><button class="ag-btn ag-btn-primary" onclick="showAddRuleModal('${layerKey}')">＋ ${t('新增规则', 'Add Rule')}</button></div>`;
+  // strict：只渲染 categoryNames 白名单内的分类（不兜底 runtime 里多的 key），
+  // 供 render_l2 三段式（内置类 + 用户自定义分开）避免重复/英文透出。
+  let orderedEntries;
+  if (strict) {
+    orderedEntries = Object.keys(categoryNames)
+      .filter(k => k in layer)
+      .map(k => [k, layer[k]]);
+  } else {
+    orderedEntries = [
+      ...Object.keys(categoryNames).filter(k => k in layer).map(k => [k, layer[k]]),
+      ...Object.entries(layer).filter(([k]) => !(k in categoryNames)),
+    ];
+  }
+  let html = showAddBtn
+    ? `<div class="ag-card" style="padding:8px 16px"><button class="ag-btn ag-btn-primary" onclick="showAddRuleModal('${layerKey}')">＋ ${t('新增规则', 'Add Rule')}</button></div>`
+    : '';
   for (const [catName, catData] of orderedEntries) {
     const displayName = categoryNames[catName] || catName;
     const rules = catData.rules || [];
@@ -753,7 +784,10 @@ function renderRuleLayer(layerKey, containerId, categoryNames) {
     }
     html += '</div></div>';
   }
-  el(containerId).innerHTML = html;
+  const cont = el(containerId);
+  if (!cont) return;
+  if (append) cont.insertAdjacentHTML('beforeend', html);
+  else cont.innerHTML = html;
 }
 function renderRuleItem(layerKey, catName, r) {
   const isL2 = layerKey === 'L2_rules';
@@ -786,7 +820,49 @@ function renderRuleItem(layerKey, catName, r) {
   </div>`;
 }
 function render_l1() { renderRuleLayer('L1_rules', 'page-l1', L1_CATEGORY_NAMES); }
-function render_l2() { renderRuleLayer('L2_rules', 'page-l2', L2_CATEGORY_NAMES); }
+function render_l2() {
+  // 顺序：内置 L2 类 → LTL 时序规则卡 → 用户自定义（永远最后）
+  // strict=true：三段各渲染自己的白名单，避免兜底把别的类目用英文透出（去重 bug）
+  const builtin = Object.fromEntries(Object.entries(L2_CATEGORY_NAMES).filter(([k]) => k !== 'user_custom'));
+  const customOnly = { user_custom: L2_CATEGORY_NAMES.user_custom };
+  renderRuleLayer('L2_rules', 'page-l2', builtin, false, true, true);
+  renderLtlCard('page-l2');
+  renderRuleLayer('L2_rules', 'page-l2', customOnly, true, false, true);
+}
+// LTL 时序攻击模式规则卡（L2.2/L2.4，并入 L2 页展示；数据源 state.config.L2_4.ltl_rules）
+function renderLtlCard(containerId) {
+  const l24 = state.config.L2_4 || {};
+  const ltl = l24.ltl_rules || [];
+  const isL2On = state.config.layers?.L2_logic_rules !== false;
+  // 与其他分类一致：默认折叠，用户展开过则保持（expandedCats）
+  const expanded = expandedCats.has(`${containerId}-ltl_rules`);
+  let html = `<div class="ag-card">
+    <div class="ag-cat-header" onclick="toggleExpand('${containerId}-ltl_rules')">
+      <div class="ag-cat-name">${t('⏱️ 时序攻击模式 (LTL)', '⏱️ Timing Attack Patterns (LTL)')} <span class="ag-cat-count">${isL2On ? ltl.filter(r => r.enabled !== false).length : 0}/${ltl.length} ${t('启用', 'enabled')}</span></div>
+      <div class="ag-cat-controls">
+        <div onclick="event.stopPropagation()">${toggle(isL2On && ltl.some(r => r.enabled !== false), !isL2On, '')}</div>
+        <span class="ag-expand-icon ${expanded ? 'open' : ''}" id="expand-${containerId}-ltl_rules">▼</span>
+      </div>
+    </div>
+    <div style="font-size:12px;color:var(--ag-text-secondary);padding:0 16px 8px">${t('检测历史动作序列中的攻击模式：先发生 A、后发生 B（受 L2 层开关控制，当前', 'Detects attack patterns in history: A then B (gated by L2 layer switch, currently')} <b>${isL2On ? t('启用', 'enabled') : t('禁用', 'disabled')}</b>）</div>
+    <div class="ag-rule-list" id="list-${containerId}-ltl_rules" style="display:${expanded ? '' : 'none'}">`;
+  if (!ltl.length) {
+    html += `<div class="ag-empty">${t('无', 'None')}</div>`;
+  } else {
+    for (const r of ltl) {
+      const action = r.action === 'block' ? t('拦截', 'Block') : (r.action === 'approval' ? t('审批', 'Approval') : t(r.action || '', r.action || ''));
+      html += `<div class="ag-rule-item"><div class="ag-rule-body">
+        <div class="ag-rule-tags">${riskBadge(r.risk_level)}</div>
+        <div class="ag-rule-pattern"><span class="ag-rule-field-label">${t('检测', 'Detects')}:</span> ${escapeHtml(r.human || r.reason || r.id)}</div>
+        <div class="ag-rule-reason"><span class="ag-rule-field-label">${t('规则说明', 'Description')}:</span> ${escapeHtml(r.reason || '')} <span class="ag-rule-id">[${escapeHtml(r.id)}]</span></div>
+        <div class="ag-rule-id">${t('动作', 'Action')}: ${action}</div>
+      </div><div class="ag-rule-controls">${toggle(r.enabled !== false, false, `toggleRule('L2_4','ltl_rules','${r.id}',${!(r.enabled !== false)})`)}</div></div>`;
+    }
+  }
+  html += '</div></div>';
+  const cont = el(containerId);
+  if (cont) cont.insertAdjacentHTML('beforeend', html);
+}
 async function toggleRule(layer, cat, id, en) {
   try {
     state.config = await apiPut('rules/enabled', { layer, category: cat, rule_id: id, enabled: en });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kenhkl/agent-moss",
-  "version": "0.12.8",
+  "version": "0.13.0",
   "description": "Multi-layer security analysis engine for AI agents (TypeScript)",
   "type": "module",
   "main": "dist/server.js",