@kenhkl/agent-moss 0.12.2 → 0.12.3

package/dist/static/index.html

@@ -323,6 +323,11 @@ async function api(path, opts = {}) {
 function apiPut(path, body) { return api(path, { method: 'PUT', body: JSON.stringify(body) }); }
 function apiPost(path, body) { return api(path, { method: 'POST', body: JSON.stringify(body) }); }
 function apiDelete(path, body) { return api(path, { method: 'DELETE', body: JSON.stringify(body) }); }
+/** 拉取并解包 env 覆盖映射（/api/env-overrides 返回 {overrides: {...}}，此处解出净映射）。 */
+async function loadEnvOverrides() {
+  const resp = await api('env-overrides');
+  return resp?.overrides || {};
+}
 
 let state = { config: {}, envOverrides: {}, currentPage: 'overview' };
 const expandedCats = new Set();
@@ -435,8 +440,27 @@ function closeModal() {
 // ===== Pages =====
 async function refreshConfig() {
   state.config = await api('config');
-  state.envOverrides = await api('env-overrides');
+  state.envOverrides = await loadEnvOverrides();
   state.agentRules = await api('agents');
+  // 探测当前进程的 instance（AGENT_MOSS_INSTANCE，如 opendesk/xiaoo）。
+  // 有 instance 时 Agent Rules 页只显示当前 agent 的定制规则，避免出现别的 agent 的规则造成困惑；
+  // 无 instance（本地独立起服务/非 agent 调用）则显示全部。
+  state.instance = '';
+  try {
+    const h = await fetch('/api/v1/health', { signal: AbortSignal.timeout(2000) });
+    if (h.ok) {
+      const hd = await h.json();
+      state.instance = hd?.instance || '';
+    }
+  } catch { /* health 不可达，instance 保持空（显示全部） */ }
+  // 探测服务端是否开启了 console 访问 token 认证（AGENT_MOSS_CONSOLE_TOKEN）。
+  // 不带 token 裸请求一个 API 端点：返回 401 说明开启了认证 → 设置页显示"访问 Token"卡片；
+  // 返回 200 说明本机免认证 → 隐藏该卡片（单机使用无需配置，避免误导）。
+  state.consoleAuthRequired = false;
+  try {
+    const probe = await fetch('/console/api/env-overrides', { signal: AbortSignal.timeout(2000) });
+    state.consoleAuthRequired = probe.status === 401;
+  } catch { /* 探测失败，默认不显示 token 卡片 */ }
   renderCurrent();
 }
 function renderCurrent() {
@@ -471,9 +495,9 @@ function render_overview() {
     <div class="ag-card">
       <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)}/${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)}/${countRules(state.config.L2_rules)}</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)}/${countSkills(state.config.L3_skills)}</div></div>
+        <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('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>
     </div>
     <div class="ag-card">
@@ -518,13 +542,18 @@ async function loadOverviewToken(days) {
   } catch { el('overview-token-summary').innerHTML = `<div class="ag-empty">${t('无数据', 'No data')}</div>`; }
 }
 function countRules(lr) { if (!lr) return 0; return Object.values(lr).reduce((s, c) => s + (c.rules ? c.rules.length : 0), 0); }
-function countEnabled(lr) {
+// 统计"启用"的规则数，口径与后端执行一致：层级开 && 大类开 && 单条规则开。
+// layerKey 为层级总开关（如 L1_heuristic），关闭时返回 0。
+function countEnabled(lr, layerKey) {
   if (!lr) return 0;
+  if (layerKey && state.config.layers?.[layerKey] === false) return 0;
   return Object.values(lr).reduce((s, c) => s + ((c.rules || []).filter(r => r.enabled && c.category_enabled !== false).length), 0);
 }
 function countSkills(ls) { if (!ls) return 0; return Object.values(ls).reduce((s, c) => s + (c.skills ? c.skills.length : 0), 0); }
-function countEnabledSkills(ls) {
+// 同 countEnabled：层级关闭时 L3 skills 启用数归 0。
+function countEnabledSkills(ls, layerKey) {
   if (!ls) return 0;
+  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);
 }
 
@@ -532,10 +561,12 @@ function countEnabledSkills(ls) {
 async function toggleLayer(key) {
   try {
     const cur = state.config.layers[key] !== false;
-    state.config = await apiPut('layers', { layer_key: key, enabled: !cur });
-    state.envOverrides = await api('env-overrides');
-    renderCurrent();
-    showToast(`${LAYER_NAMES[key]?.name || key} ${t('已', '')}${!cur ? t('启用', 'enabled') : t('禁用', 'disabled')}`);
+    // PUT /api/layers 只返回 {layers, env_overrides}（不含规则数据），
+    // 不能用它整体覆盖 state.config，否则 L1/L2/L3 规则会丢失变成 0/0。
+    await apiPut('layers', { layer_key: key, enabled: !cur });
+    // 重新拉取完整 config，保证规则统计/列表不丢
+    await refreshConfig();
+    showToast(`${LAYER_NAMES[key]?.name || key} ${!cur ? t('已启用', 'enabled') : t('已禁用', 'disabled')}`);
   } catch (e) { showToast(t('操作失败: ', 'Operation failed: ') + e.message, 'error'); }
 }
 
@@ -569,8 +600,13 @@ 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) {
   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)),
@@ -580,13 +616,17 @@ function renderRuleLayer(layerKey, containerId, categoryNames) {
     const displayName = categoryNames[catName] || catName;
     const rules = catData.rules || [];
     const catEnabled = catData.category_enabled !== false;
-    const enabledCount = rules.filter(r => r.enabled).length;
+    // 大类总开关显示状态 = 层级开 && 大类开；层级关时大类开关需禁用（无意义）
+    const catSwitchOn = layerEnabled && catEnabled;
+    const catSwitchDisabled = !layerEnabled;
+    // 大类计数与后端执行口径一致：大类总开关关闭时启用数归 0（分母仍为规则总数）
+    const enabledCount = catSwitchOn ? rules.filter(r => r.enabled).length : 0;
     const expanded = expandedCats.has(`${containerId}-${catName}`);
     html += `<div class="ag-card">
       <div class="ag-cat-header" onclick="toggleExpand('${containerId}-${catName}')">
         <div class="ag-cat-name">${escapeHtml(displayName)} <span class="ag-cat-count">${enabledCount}/${rules.length} ${t('启用', 'enabled')}</span></div>
         <div class="ag-cat-controls">
-          <div onclick="event.stopPropagation();toggleCategory('${layerKey}','${catName}')">${toggle(catEnabled, false, '')}</div>
+          <div onclick="event.stopPropagation();toggleCategory('${layerKey}','${catName}')">${toggle(catSwitchOn, catSwitchDisabled, '')}</div>
           <span class="ag-expand-icon ${expanded ? 'open' : ''}" id="expand-${containerId}-${catName}">▼</span>
         </div>
       </div>
@@ -678,7 +718,14 @@ const AGENT_CATEGORY_NAMES = {
 };
 function render_agents() {
   const agents = (state.agentRules && state.agentRules.agents) || {};
-  const ids = Object.keys(agents);
+  // 有 instance（当前是某 agent 调用）时，只显示该 agent 的定制规则（即使无规则也显示空，
+  // 避免出现别的 agent 的规则造成困惑）；无 instance（本地独立起/非 agent 调用）显示全部。
+  let ids;
+  if (state.instance) {
+    ids = agents[state.instance] ? [state.instance] : [];
+  } else {
+    ids = Object.keys(agents);
+  }
   if (!ids.length) {
     el('page-agents').innerHTML = `<div class="ag-card"><div class="ag-empty">${t('无 agent 定制规则', 'No agent custom rules')}</div></div>`;
     return;
@@ -695,7 +742,8 @@ function render_agents() {
       const rules = catData.rules || [];
       const catEnabled = catData.category_enabled !== false;
       const expanded = expandedCats.has(`agents-${agentId}-${catName}`);
-      const enCount = rules.filter(r => r.enabled).length;
+      // 大类计数与后端执行口径一致：大类总开关关闭时启用数归 0
+      const enCount = catEnabled ? rules.filter(r => r.enabled).length : 0;
       html += `<div class="ag-cat-header" onclick="toggleExpand('agents-${agentId}-${catName}')">
         <div class="ag-cat-name">${escapeHtml(AGENT_CATEGORY_NAMES[catName] || catName)} <span class="ag-cat-count">${enCount}/${rules.length} ${t('启用', 'enabled')}</span></div>
         <div class="ag-cat-controls"><div onclick="event.stopPropagation();toggleAgentCategory('${agentId}','${catName}')">${toggle(catEnabled, false, '')}</div><span class="ag-expand-icon ${expanded ? 'open' : ''}">▼</span></div>
@@ -770,18 +818,24 @@ function showAddAgentRuleModal(agentId, cat) {
 // ===== L3 Skills 页 =====
 function render_l3() {
   const l3 = state.config.L3_skills || {};
+  // 层级总开关：关闭时 L3 大类开关随动显示为关（仅 UI 联动，不改后端数据）
+  const layerEnabled = state.config.layers?.['L3_llm_analysis'] !== false;
   let html = `<div class="ag-card" style="padding:8px 16px"><button class="ag-btn ag-btn-primary" onclick="showAddSkillModal()">＋ ${t('新增 Skill', 'Add Skill')}</button></div>`;
   for (const [catName, catData] of Object.entries(l3)) {
     const displayName = L3_CATEGORY_NAMES[catName] || catName;
     const skills = catData.skills || [];
     const catEnabled = catData.category_enabled !== false;
-    const enabledCount = skills.filter(s => s.enabled).length;
+    // 大类总开关显示状态 = 层级开 && 大类开；层级关时大类开关需禁用（无意义）
+    const catSwitchOn = layerEnabled && catEnabled;
+    const catSwitchDisabled = !layerEnabled;
+    // 大类计数与后端执行口径一致：大类总开关关闭时启用数归 0
+    const enabledCount = catSwitchOn ? skills.filter(s => s.enabled).length : 0;
     const expanded = expandedCats.has('page-l3-' + catName);
     html += `<div class="ag-card">
       <div class="ag-cat-header" onclick="toggleExpand('page-l3-${catName}')">
         <div class="ag-cat-name">${escapeHtml(displayName)} <span class="ag-cat-count">${enabledCount}/${skills.length} ${t('启用', 'enabled')}</span></div>
         <div class="ag-cat-controls">
-          <div onclick="event.stopPropagation();toggleSkillCategory('${catName}')">${toggle(catEnabled, false, '')}</div>
+          <div onclick="event.stopPropagation();toggleSkillCategory('${catName}')">${toggle(catSwitchOn, catSwitchDisabled, '')}</div>
           <span class="ag-expand-icon ${expanded ? 'open' : ''}" id="expand-page-l3-${catName}">▼</span>
         </div>
       </div>
@@ -1113,28 +1167,29 @@ function render_settings() {
     }
   }
   el('page-settings').innerHTML = `
+    ${Object.keys(eo).length > 0 ? `
     <div class="ag-card">
       <div class="ag-section-title">${t('环境变量覆盖', 'Environment Variable Overrides')}</div>
       <div class="ag-section-desc">${t('环境变量优先级最高，会覆盖 Web UI 的设置。清除环境变量后 Web 设置才能生效。', 'Environment variables take highest priority and override Web UI settings. Web settings take effect only after clearing the environment variables.')}</div>
       ${envHtml}
-    </div>
+    </div>` : ''}
     <div class="ag-card">
-      <div class="ag-section-title">${t('配置文件路径', 'Config File Path')}</div>
+      <div class="ag-section-title">${t('配置文件', 'Config File')}</div>
+      <div class="ag-section-desc">${t('你在本控制台做的所有修改（层级开关、各类规则、Agent 定制）都会自动保存到下面的配置文件中。它是策略的“存档”，可备份、迁移，或复制到其他机器复用同一套安全策略。', 'All your changes here (layer switches, rules, agent customizations) are saved automatically to the config file below. It is the "source of truth" for your policy — you can back it up, migrate it, or copy it to another machine to reuse the same security policy.')}</div>
       <div style="font-size:13px;line-height:1.8">
-        <p>${t('配置文件: ', 'Config file: ')}~/.config/agentmoss/agent_moss_runtime.json</p>
-        <p>${t('环境变量 AGENT_MOSS_RUNTIME_CONFIG_PATH 可指定自定义路径', 'Environment variable AGENT_MOSS_RUNTIME_CONFIG_PATH can set a custom path')}</p>
-        <p>${t('优先级: 环境变量 > runtime JSON > config.json > 源码默认值', 'Priority: env var > runtime JSON > config.json > source defaults')}</p>
+        <code>~/.config/agentmoss/agent_moss_runtime.json</code>
       </div>
     </div>
+    ${state.consoleAuthRequired ? `
     <div class="ag-card">
       <div class="ag-section-title">${t('访问 Token', 'Access Token')}</div>
-      <div class="ag-section-desc">${t('此处设置的是浏览器本地 token，console 调用 API 时以 Authorization: Bearer &lt;token&gt; 携带。服务端是否要求认证取决于环境变量 AGENT_MOSS_CONSOLE_TOKEN：未设置则本机免认证；已设置则请求须携带相同值才放行。当前本地 token：', 'This sets the browser-local token used as Authorization: Bearer &lt;token&gt; on console API calls. Whether the server requires auth depends on AGENT_MOSS_CONSOLE_TOKEN: when unset, local access is allowed without auth; when set, requests must carry the matching value. Current local token: ')}${getToken() ? t('已设置', 'set') : t('未设置', 'not set')}</div>
-      <input class="ag-input" id="settings-token" placeholder="${t('输入新 token', 'Enter new token')}" value="${getToken()}">
+      <div class="ag-section-desc">${t('服务端已开启访问认证（设置了 AGENT_MOSS_CONSOLE_TOKEN）。在此填入服务端配置的 token，浏览器会用它访问控制台；token 不匹配则无法查看或修改规则。', 'The server requires an access token (AGENT_MOSS_CONSOLE_TOKEN is set). Enter the token configured on the server; the browser will send it with every console request. An invalid token blocks viewing or editing rules.')}</div>
+      <input class="ag-input" id="settings-token" placeholder="${t('输入服务端配置的 token', 'Enter the server-configured token')}" value="${getToken()}">
       <div style="margin-top:8px"><button class="ag-btn ag-btn-primary" onclick="localStorage.setItem('am_console_token',document.getElementById('settings-token').value);showToast(t('已保存','Saved'))">${t('保存', 'Save')}</button></div>
-    </div>
+    </div>` : ''}
     <div class="ag-card">
       <div class="ag-section-title">${t('危险操作', 'Danger Zone')}</div>
-      <button class="ag-btn ag-btn-danger" onclick="if(confirm(t('确定重置所有规则到出厂默认？所有自定义规则和开关设置将丢失。','Reset all rules to factory defaults? All custom rules and switch settings will be lost.'))){apiPost('reset').then(c=>{state.config=c;state.envOverrides=api('env-overrides');renderCurrent();showToast(t('配置已重置到出厂默认','Configuration reset to factory defaults'))}).catch(e=>showToast(t('重置失败: ','Reset failed: ')+e.message,'error'))}">${t('重置规则到出厂默认', 'Reset Rules to Factory Defaults')}</button>
+      <button class="ag-btn ag-btn-danger" onclick="if(confirm(t('确定重置所有规则到出厂默认？所有自定义规则和开关设置将丢失。','Reset all rules to factory defaults? All custom rules and switch settings will be lost.'))){apiPost('reset').then(c=>{state.config=c;return loadEnvOverrides().then(o=>{state.envOverrides=o;renderCurrent();showToast(t('配置已重置到出厂默认','Configuration reset to factory defaults'))})}).catch(e=>showToast(t('重置失败: ','Reset failed: ')+e.message,'error'))}">${t('重置规则到出厂默认', 'Reset Rules to Factory Defaults')}</button>
       <button class="ag-btn ag-btn-danger" style="margin-left:8px" onclick="resetTokenStats()">${t('清除 Token 统计', 'Clear Token Statistics')}</button>
     </div>`;
 }

package/package.json

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