fix: support all provider model formats (string/array/object)

agent/agent.sh

@@ -65,11 +65,14 @@ if cfg and os.path.exists(cfg):
             if prov_count: dp = prov_count.most_common(1)[0][0]
         default_name = dp.split('/')[0] if '/' in dp else dp
         for n,p in m.get('providers',{}).items():
+            if isinstance(p,str): p = {'models':[p]}
             if not isinstance(p,dict): continue
             base = p.get('baseUrl','')
             key = p.get('apiKey','')
             api_type = p.get('api','')
-            models = [mod.get('id','') for mod in p.get('models',[])]
+            raw_models = p.get('models', p.get('model', []))
+            if isinstance(raw_models, str): raw_models = [raw_models]
+            models = [mod.get('id','') if isinstance(mod,dict) else str(mod) for mod in raw_models]
             providers.append({'name':n,'model':' | '.join(models),'_test_model':models[0] if models else '',
                               'api':api_type,'default':n==default_name,'_base':base,'_key':key})
         providers.sort(key=lambda x: (not x.get('default',False), x['name']))

public/index.html

@@ -8,62 +8,101 @@
 *{margin:0;padding:0;box-sizing:border-box}
 :root{--bg:#060a10;--card:#0d1520;--card2:#111c2e;--border:#1a2740;--txt:#c8d6e5;--dim:#5a6f88;--neon:#00e5ff;--green:#00ff88;--warn:#ffb020;--err:#ff4466;--purple:#b8a9ff;--peach:#ffb088}
 [data-theme="light"]{--bg:#f0f2f5;--card:#fff;--card2:#f5f7fa;--border:#d8dde6;--txt:#1a1a2e;--dim:#6b7b8d;--neon:#0088cc;--green:#00a856;--warn:#e69500;--err:#d63050;--purple:#7c5cbf;--peach:#d07040}
-body{font-family:'SF Mono',Menlo,'Courier New',monospace;background:var(--bg);color:var(--txt);padding:16px}
+body{font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,'Helvetica Neue',Arial,sans-serif;background:var(--bg);color:var(--txt);padding:20px}
 .wrap{max-width:1200px;margin:0 auto}
-h1{font-size:1.3em;color:var(--neon);margin-bottom:4px}
+.hdr{margin-bottom:24px;padding:20px 0 16px;border-bottom:1px solid var(--border)}
-.sub{color:var(--dim);font-size:.75em;margin-bottom:20px}
+.hdr h1{font-size:1.8em;font-weight:800;background:linear-gradient(135deg,var(--neon),var(--purple));-webkit-background-clip:text;-webkit-text-fill-color:transparent;background-clip:text;display:inline}
-.stats{display:grid;grid-template-columns:repeat(6,1fr);gap:10px;margin-bottom:20px}
+.hdr-row{display:flex;align-items:center;gap:12px;flex-wrap:wrap}
-.st{background:var(--card);border:1px solid var(--border);border-radius:8px;padding:14px;text-align:center}
+.hdr-links{display:flex;gap:10px;align-items:center;margin-left:auto}
-.st .n{font-size:1.5em;font-weight:700}.st .l{font-size:.7em;color:var(--dim);margin-top:2px}
+.hdr-links a,.hdr-links span{font-size:.8em;color:var(--dim);text-decoration:none;cursor:pointer}
+.hdr-links a:hover,.hdr-links span:hover{color:var(--neon)}
+.sub{color:var(--dim);font-size:.78em;margin-top:6px;letter-spacing:.3px}
+.stats{display:grid;grid-template-columns:repeat(6,1fr);gap:10px;margin-bottom:24px}
+.st{background:var(--card);border:1px solid var(--border);border-radius:10px;padding:16px;text-align:center}
+.st .n{font-size:1.6em;font-weight:800;font-family:'SF Mono',Menlo,monospace}.st .l{font-size:.72em;color:var(--dim);margin-top:4px;font-weight:500}
 .s1 .n{color:var(--neon)}.s2 .n{color:var(--purple)}.s3 .n{color:var(--peach)}
 .s4 .n{color:var(--green)}.s5 .n{color:var(--warn)}.s6 .n{color:var(--err)}
-.tabs{display:flex;gap:0;margin-bottom:20px;border-bottom:1px solid var(--border)}
+.tabs{display:flex;gap:0;margin-bottom:24px;border-bottom:1px solid var(--border)}
-.tab{padding:8px 20px;cursor:pointer;color:var(--dim);font-size:.85em;border-bottom:2px solid transparent}
+.tab{padding:10px 24px;cursor:pointer;color:var(--dim);font-size:.88em;font-weight:500;border-bottom:2px solid transparent;transition:color .2s}
 .tab.on{color:var(--neon);border-bottom-color:var(--neon)}
+.tab:hover{color:var(--txt)}
 .tp{display:none}.tp.on{display:block}
-.nodes{display:grid;grid-template-columns:repeat(auto-fill,minmax(340px,1fr));gap:14px}
+.nodes{display:grid;grid-template-columns:repeat(auto-fill,minmax(360px,1fr));gap:14px}
-.nd{background:var(--card);border:1px solid var(--border);border-radius:10px;padding:16px}
+.nd{background:var(--card);border:1px solid var(--border);border-radius:12px;padding:18px;display:flex;flex-direction:column}
 .nd.offline{border-color:rgba(255,68,102,.3)}
 .nd-h{display:flex;justify-content:space-between;align-items:center;margin-bottom:8px}
 .nd-nm{font-size:1.05em;font-weight:600;cursor:pointer}.nd-nm:hover{color:var(--neon)}
 .dot{width:8px;height:8px;border-radius:50%;display:inline-block;margin-right:5px}
 .dot.on{background:var(--green);box-shadow:0 0 6px var(--green)}.dot.off{background:var(--err)}
-.tg{display:flex;gap:5px;flex-wrap:wrap;margin-bottom:8px}
+.tg{display:flex;gap:4px;flex-wrap:nowrap;margin-bottom:8px;overflow:hidden}
-.tg span{font-size:.63em;padding:2px 7px;border-radius:10px;background:var(--card2);color:var(--dim);border:1px solid var(--border)}
+.tg span{font-size:.65em;padding:2px 8px;border-radius:10px;background:var(--card2);color:var(--dim);border:1px solid var(--border);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;max-width:120px}
 .tg .ms{color:var(--neon);border-color:rgba(0,229,255,.3)}
 .tg .wk{color:var(--purple);border-color:rgba(184,169,255,.3)}
 .hb{height:28px;display:flex;align-items:end;gap:1px;overflow:hidden;margin-bottom:8px}
 .hb i{width:3px;border-radius:1px}
 .sec{font-size:.72em;color:var(--dim);margin-bottom:4px}
-.pv{display:flex;justify-content:space-between;padding:3px 0;font-size:.78em}
+.pv-wrap{flex:1;min-height:0;overflow-y:auto;margin-bottom:8px}
+.pv{display:flex;justify-content:space-between;align-items:center;padding:4px 0;font-size:.78em}
 .pv-l{display:flex;gap:5px;align-items:center}
 .pv-default{color:var(--warn)}
 .pm{color:var(--dim);font-size:.85em}
 .ok{color:var(--green)}.er{color:var(--err)}
-.gs{display:grid;grid-template-columns:repeat(4,1fr);gap:8px;margin:8px 0}
+.gs{display:grid;grid-template-columns:repeat(4,1fr);gap:10px;margin:10px 0}
-.g{font-size:.7em}.g-l{color:var(--dim)}.g-t{height:4px;background:var(--card2);border-radius:2px;margin:2px 0}
+.g{font-size:.72em}.g-l{color:var(--dim);font-weight:500}.g-t{height:5px;background:var(--card2);border-radius:3px;margin:3px 0}
 .g-f{height:100%;border-radius:2px;transition:width .8s ease,background .5s}.fg{background:var(--green)}.fb{background:var(--neon)}.fw{background:var(--warn)}.fr{background:var(--err)}
 .g-n{font-weight:600}
-.tks{display:flex;gap:10px;margin:8px 0}
+.tks{display:flex;gap:10px;margin:10px 0}
-.tk{flex:1;text-align:center;background:var(--card2);border-radius:6px;padding:5px}
+.tk{flex:1;text-align:center;background:var(--card2);border-radius:8px;padding:8px 5px}
-.tk-l{font-size:.63em;color:var(--dim)}.tk-v{font-size:.85em;font-weight:600;color:var(--neon)}
+.tk-l{font-size:.65em;color:var(--dim);font-weight:500}.tk-v{font-size:.9em;font-weight:700;color:var(--neon);font-family:'SF Mono',Menlo,monospace}
-.nd-f{display:flex;gap:8px;font-size:.68em;color:var(--dim);flex-wrap:wrap}
+.nd-f{display:flex;gap:10px;font-size:.7em;color:var(--dim);flex-wrap:wrap;margin-top:auto;padding-top:8px;border-top:1px solid var(--border)}
 .mx{background:var(--card);border:1px solid var(--border);border-radius:10px;padding:16px}
 .mx-h{font-size:.9em;font-weight:600;margin-bottom:10px;color:var(--neon)}
-table{width:100%;border-collapse:collapse;font-size:.78em}
+table{width:100%;border-collapse:collapse;font-size:.8em}
-th{text-align:left;padding:6px 10px;color:var(--dim);border-bottom:1px solid var(--border);font-weight:500}
+th{text-align:left;padding:8px 10px;color:var(--dim);border-bottom:1px solid var(--border);font-weight:600}
-td{padding:6px 10px;border-bottom:1px solid rgba(26,39,64,.5)}
+td{padding:8px 10px;border-bottom:1px solid rgba(26,39,64,.5)}
-.lt{background:var(--card);border:1px solid var(--border);border-radius:10px;padding:16px}
+.lt{background:var(--card);border:1px solid var(--border);border-radius:12px;padding:18px}
-.lt-h{font-size:.9em;font-weight:600;margin-bottom:10px;color:var(--purple)}
+.lt-h{font-size:.95em;font-weight:600;margin-bottom:12px;color:var(--purple)}
 .lf{display:flex;gap:10px;margin-bottom:12px;flex-wrap:wrap}
-.lf select{background:var(--card2);border:1px solid var(--border);color:var(--txt);padding:4px 10px;border-radius:6px;font-size:.78em;font-family:inherit}
+.lf select{background:var(--card2);border:1px solid var(--border);color:var(--txt);padding:6px 12px;border-radius:8px;font-size:.8em;font-family:inherit}
-@media(max-width:768px){.stats{grid-template-columns:repeat(3,1fr)}.nodes{grid-template-columns:1fr}}
+.pager{display:flex;justify-content:center;align-items:center;gap:8px;margin-top:14px;font-size:.78em}
+.pager button{background:var(--card2);border:1px solid var(--border);color:var(--txt);padding:5px 14px;border-radius:8px;cursor:pointer;font-family:inherit;transition:border-color .2s}
+.pager button:disabled{opacity:.3;cursor:default}
+.pager button.pg-on{border-color:var(--neon);color:var(--neon)}
+.pager span{color:var(--dim)}
+.provs{display:grid;grid-template-columns:repeat(auto-fill,minmax(360px,1fr));gap:14px}
+.pcard{background:var(--card);border:1px solid var(--border);border-radius:12px;padding:18px}
+.pcard-h{display:flex;justify-content:space-between;align-items:center;margin-bottom:12px;padding-bottom:8px;border-bottom:1px solid var(--border)}
+.pcard-nm{font-size:1.1em;font-weight:700;color:var(--neon)}
+.pcard-cnt{font-size:.7em;color:var(--dim)}
+.pcard-row{display:flex;justify-content:space-between;align-items:center;padding:5px 0;font-size:.8em;border-bottom:1px solid rgba(26,39,64,.3)}
+.pcard-row:last-child{border-bottom:none}
+.pcard-node{color:var(--dim)}
+.pcard-model{color:var(--purple);font-size:.68em;line-height:1.4}
+.pcard-models{margin-top:2px}
+.pcard-ms{color:var(--dim);font-size:.75em}
+@media(max-width:768px){.stats{grid-template-columns:repeat(3,1fr)}.nodes{grid-template-columns:1fr}.provs{grid-template-columns:1fr}.hdr h1{font-size:1.4em}}
+.login-mask{position:fixed;inset:0;background:var(--bg);display:flex;align-items:center;justify-content:center;z-index:999}
+.login-box{background:var(--card);border:1px solid var(--border);border-radius:16px;padding:40px;text-align:center;max-width:360px;width:90%}
+.login-box h2{font-size:1.4em;font-weight:800;background:linear-gradient(135deg,var(--neon),var(--purple));-webkit-background-clip:text;-webkit-text-fill-color:transparent;background-clip:text;margin-bottom:8px}
+.login-box p{color:var(--dim);font-size:.82em;margin-bottom:20px}
+.login-box input{width:100%;padding:10px 14px;background:var(--card2);border:1px solid var(--border);border-radius:8px;color:var(--txt);font-size:.9em;font-family:inherit;outline:none}
+.login-box input:focus{border-color:var(--neon)}
+.login-box button{width:100%;margin-top:12px;padding:10px;background:linear-gradient(135deg,var(--neon),var(--purple));border:none;border-radius:8px;color:#fff;font-weight:600;font-size:.9em;cursor:pointer}
+.login-err{color:var(--err);font-size:.78em;margin-top:8px;display:none}
 </style>
 </head>
 <body>
-<div class="wrap">
+<div class="login-mask" id="loginMask" style="display:none">
-<h1>🐾 OpenClaw Mission Control <a href="/admin.html" style="font-size:.5em;color:var(--dim);text-decoration:none;margin-left:8px">⚙️ Admin</a> <span id="themeBtn" onclick="toggleTheme()" style="font-size:.5em;cursor:pointer;margin-left:8px">🌙</span></h1>
+<div class="login-box"><h2>🔓 解锁完整视图</h2><p>输入令牌查看 IP 等敏感信息</p>
+<input id="tokenInput" type="password" placeholder="Token" onkeydown="if(event.key==='Enter')doLogin()">
+<button onclick="doLogin()">解锁</button>
+<div class="login-err" id="loginErr">令牌无效</div></div></div>
+<div class="wrap" id="mainWrap">
+<div class="hdr">
+<div class="hdr-row"><h1>🐾 OpenClaw Mission Control</h1>
+<div class="hdr-links"><a href="/admin.html">⚙️ Admin</a><span id="lockBtn" onclick="$('#loginMask').style.display='flex'" style="cursor:pointer">🔒</span><span id="themeBtn" onclick="toggleTheme()">🌙</span></div></div>
 <div class="sub" id="subtitle">Loading...</div>
+</div>
 <div class="stats" id="stats"></div>
 
 <div class="tabs">
@@ -73,17 +112,29 @@ td{padding:6px 10px;border-bottom:1px solid rgba(26,39,64,.5)}
 </div>
 
 <div class="tp on" id="t-nodes"><div class="nodes" id="nodeGrid"></div></div>
-<div class="tp" id="t-matrix"><div class="mx"><div class="mx-h">供应商 × 节点 矩阵</div><table id="matrixTable"></table></div></div>
+<div class="tp" id="t-matrix"><div class="provs" id="provGrid"></div></div>
 <div class="tp" id="t-logs"><div class="lt"><div class="lt-h">请求日志</div>
 <div class="lf"><select id="fNode" onchange="renderLogs()"><option value="">全部节点</option></select><select id="fUp" onchange="renderLogs()"><option value="">全部供应商</option></select><select id="fRes" onchange="renderLogs()"><option value="">全部结果</option><option value="1">✓ 成功</option><option value="0">✗ 失败</option></select></div>
-<table id="logTable"></table></div></div>
+<table id="logTable"></table><div class="pager" id="pager"></div></div></div>
 
 </div>
 <script>
 let DATA={nodes:[],stats:{},requests:[]};
 const $=s=>document.querySelector(s);
+let TOKEN=localStorage.getItem('oc-token')||'';
+const authHdr=()=>({headers:{'Authorization':'Bearer '+TOKEN}});
 
-function sw(t){document.querySelectorAll('.tab').forEach(e=>e.classList.remove('on'));document.querySelectorAll('.tp').forEach(e=>e.classList.remove('on'));document.querySelector(`.tab[onclick*="${t}"]`).classList.add('on');document.getElementById('t-'+t).classList.add('on');if(t==='logs')renderLogs()}
+function doLogin(){
+  const t=$('#tokenInput').value.trim();if(!t)return;
+  fetch('/api/dashboard',{headers:{'Authorization':'Bearer '+t}}).then(r=>r.json()).then(d=>{
+    if(!d.authed){$('#loginErr').style.display='block';return}
+    TOKEN=t;localStorage.setItem('oc-token',t);
+    $('#loginMask').style.display='none';$('#lockBtn').textContent='🔓';
+    DATA=d;render();
+  });
+}
+
+function sw(t){document.querySelectorAll('.tab').forEach(e=>e.classList.remove('on'));document.querySelectorAll('.tp').forEach(e=>e.classList.remove('on'));document.querySelector(`.tab[onclick*="${t}"]`).classList.add('on');document.getElementById('t-'+t).classList.add('on');if(t==='logs')loadLogs(logPage)}
 
 function fmtTok(n){return n>=1e6?(n/1e6).toFixed(1)+'M':n>=1e3?(n/1e3).toFixed(1)+'K':n}
 function fmtUp(s){if(!s)return'0s';return s>=1000?(s/1000).toFixed(1)+'s':s+'ms'}
@@ -123,7 +174,7 @@ function renderNodes(){
 <div class="tg"><span class="${n.role==='master'?'ms':'wk'}">${n.role}</span><span>OC ${n.oc_version}</span><span>${n.os}</span></div>
 <div class="hb">${hbBars}</div>
 <div class="sec">供应商</div>
-${provs.sort((a,b)=>b.default-a.default||(a.name>b.name?1:-1)).map(p=>`<div class="pv"><div class="pv-l">${p.default?'<span class="dot on" style="width:6px;height:6px"></span>':''}<span${p.default?' class="pv-default"':''}>${p.name}</span><div>${p.model.split(' | ').map(m=>'<span class="pm">'+m+'</span>').join('<br>')}</div></div><div>${p.status==='ok'?'<span class="ok">✓</span> <span class="pm">'+p.ms+'ms</span>':'<span class="er">✗</span> <span class="pm">'+(p.err||'离线')+'</span>'}</div></div>`).join('')}
+<div class="pv-wrap">${provs.sort((a,b)=>b.default-a.default||(a.name>b.name?1:-1)).map(p=>`<div class="pv"><div class="pv-l">${p.default?'<span class="dot on" style="width:6px;height:6px"></span>':''}<span${p.default?' class="pv-default"':''}>${p.name}</span></div><div>${p.status==='ok'?'<span class="ok">✓</span> <span class="pm">'+p.ms+'ms</span>':'<span class="er">✗</span> <span class="pm">'+(p.err||'离线')+'</span>'}</div></div>`).join('')}</div>
 <div class="gs">
 ${[['cpu',n.cpu],['mem',n.mem],['disk',n.disk],['swap',n.swap]].map(([l,v])=>`<div class="g" data-g="${l}"><span class="g-l">${l}</span><div class="g-t"><div class="g-f ${gaugeColor(v)}" style="width:${v}%"></div></div><span class="g-n">${on?v+'%':'—'}</span></div>`).join('')}
 </div>
@@ -136,31 +187,40 @@ ${[['cpu',n.cpu],['mem',n.mem],['disk',n.disk],['swap',n.swap]].map(([l,v])=>`<d
 
 
 function renderMatrix(){
-  const ns=DATA.nodes,allProvs=new Map();
+  const ns=DATA.nodes,provMap=new Map();
   ns.forEach(n=>JSON.parse(n.providers||'[]').forEach(p=>{
-    const k=p.name+' ('+p.model+')';if(!allProvs.has(k))allProvs.set(k,new Set());
+    if(!provMap.has(p.name))provMap.set(p.name,{name:p.name,nodes:[]});
-    allProvs.get(k).add(n.name);
+    provMap.get(p.name).nodes.push({node:n.name,model:p.model,status:p.status,ms:p.ms,err:p.err,def:p.default});
   }));
-  let h='<thead><tr><th>Provider</th>'+ns.map(n=>'<th>'+n.name+'</th>').join('')+'</tr></thead><tbody>';
+  $('#provGrid').innerHTML=[...provMap.values()].sort((a,b)=>b.nodes.length-a.nodes.length).map(p=>{
-  for(const[prov,set]of allProvs){
+    const ok=p.nodes.filter(n=>n.status==='ok').length;
-    h+='<tr><td>'+prov+'</td>';
+    return `<div class="pcard">
-  ns.forEach(n=>{const ps=JSON.parse(n.providers||'[]');const f=ps.find(x=>x.name===prov.split(' (')[0]);
+<div class="pcard-h"><span class="pcard-nm">${p.name}</span><span class="pcard-cnt">${ok}/${p.nodes.length} 在线</span></div>
-    h+=f?(f.status==='ok'?`<td class="ok">✓ ${f.ms}ms</td>`:`<td class="er">✗ ${f.err||'离线'}</td>`):'<td style="color:var(--dim)">—</td>';});
+${p.nodes.sort((a,b)=>b.def-a.def).map(n=>`<div class="pcard-row"><div><span${n.def?' style="color:var(--warn)"':''}>${n.node}</span><div class="pcard-models">${n.model.split(' | ').map(m=>'<div class="pcard-model">'+m.replace(/claude-/g,'c-').replace(/-2025\d{4}/g,'')+'</div>').join('')}</div></div><div>${n.status==='ok'?'<span class="ok">✓</span> <span class="pcard-ms">'+n.ms+'ms</span>':'<span class="er">✗</span> <span class="pcard-ms">'+(n.err||'离线')+'</span>'}</div></div>`).join('')}
-    h+='</tr>';
+</div>`;
-  }
+  }).join('');
-  $('#matrixTable').innerHTML=h+'</tbody>';
+}
+
+let logPage=1,logPages=1,logTotal=0;
+
+async function loadLogs(page){
+  page=page||1;
+  try{
+    const r=await fetch('/api/requests?page='+page+'&size=50',authHdr());
+    const d=await r.json();
+    DATA.requests=d.requests||[];logPage=d.page;logPages=d.pages;logTotal=d.total;
+  }catch(e){console.error(e)}
+  renderLogs();
 }
 
 function renderLogs(){
   const reqs=DATA.requests||[];
-  // Populate filters from nodes (not requests)
   const nodes=(DATA.nodes||[]).map(n=>n.name).sort();
-  const ups=[...new Set(reqs.map(r=>r.upstream))].sort();
+  const ups=[...new Set((DATA.nodes||[]).flatMap(n=>JSON.parse(n.providers||'[]').map(p=>p.name)))].sort();
   const fN=$('#fNode'),fU=$('#fUp');
   const nv=fN.value,uv=fU.value;
   fN.innerHTML='<option value="">全部节点</option>'+nodes.map(n=>`<option${n===nv?' selected':''}>${n}</option>`).join('');
   fU.innerHTML='<option value="">全部供应商</option>'+ups.map(u=>`<option${u===uv?' selected':''}>${u}</option>`).join('');
-  // Filter
   const fR=$('#fRes').value;
   const filtered=reqs.filter(r=>{
     if(nv&&(r.node_name||r.node_id)!==nv)return false;
@@ -168,15 +228,24 @@ function renderLogs(){
     if(fR!==''&&String(r.success?1:0)!==fR)return false;
     return true;
   });
-  let h='<thead><tr><th>时间</th><th>节点</th><th>供应商</th><th>模型</th><th>结果</th><th>状态</th><th>输入</th><th>输出</th><th>首字</th><th>总耗时</th></tr></thead><tbody>';
+  let h='<thead><tr><th>时间</th><th>节点</th><th>供应商</th><th>模型</th><th>结果</th><th>输入</th><th>输出</th><th>缓存读</th><th>缓存写</th></tr></thead><tbody>';
   filtered.forEach(r=>{
     const t=new Date(r.ts*1000).toLocaleTimeString('zh-CN');
     h+='<tr><td>'+t+'</td><td>'+(r.node_name||r.node_id)+'</td><td>'+r.upstream+'</td><td>'+r.model+'</td>';
-    h+='<td class="'+(r.success?'ok':'er')+'">'+(r.success?'✓':'✗')+'</td><td>'+r.status+'</td>';
+    h+='<td class="'+(r.success?'ok':'er')+'">'+(r.success?'✓':'✗')+'</td>';
-    h+='<td>'+fmtTok(r.input_tokens)+'</td><td>'+r.output_tokens+'</td>';
+    h+='<td>'+fmtTok(r.input_tokens)+'</td><td>'+fmtTok(r.output_tokens)+'</td>';
-    h+='<td style="color:var(--warn)">'+r.ttft_ms+'ms</td><td>'+fmtUp(r.total_ms)+'</td></tr>';
+    h+='<td style="color:var(--purple)">'+fmtTok(r.cache_read||0)+'</td><td style="color:var(--peach)">'+fmtTok(r.cache_write||0)+'</td></tr>';
   });
   $('#logTable').innerHTML=h+'</tbody>';
+  // pager
+  let pg='<button onclick="loadLogs(1)"'+(logPage<=1?' disabled':'')+'>«</button>';
+  pg+='<button onclick="loadLogs('+(logPage-1)+')"'+(logPage<=1?' disabled':'')+'>‹</button>';
+  const start=Math.max(1,logPage-2),end=Math.min(logPages,logPage+2);
+  for(let i=start;i<=end;i++)pg+='<button class="'+(i===logPage?'pg-on':'')+'" onclick="loadLogs('+i+')">'+i+'</button>';
+  pg+='<button onclick="loadLogs('+(logPage+1)+')"'+(logPage>=logPages?' disabled':'')+'>›</button>';
+  pg+='<button onclick="loadLogs('+logPages+')"'+(logPage>=logPages?' disabled':'')+'>»</button>';
+  pg+='<span>共 '+logTotal+' 条</span>';
+  $('#pager').innerHTML=pg;
 }
 
 function animateNum(el,to,suffix=''){
@@ -217,7 +286,7 @@ function render(){renderStats();renderNodes();renderMatrix();renderLogs();
 }
 
 async function load(){
-  try{const r=await fetch('/api/dashboard');DATA=await r.json();render();}catch(e){console.error(e)}
+  try{const r=await fetch('/api/dashboard',authHdr());if(r.status===401)return;DATA=await r.json();render();}catch(e){console.error(e)}
 }
 
 function connectWS(){
@@ -231,7 +300,7 @@ function connectWS(){
       if(!updateNodeCard(DATA.nodes[i>=0?i:DATA.nodes.length-1]))renderNodes();
       renderStats();
     }
-    if(d.type==='request'){DATA.requests.unshift(d.request);if(DATA.requests.length>100)DATA.requests.pop();render();}
+    if(d.type==='request'){const rq=d.request;if(!rq.node_name){const nd=DATA.nodes.find(n=>n.id===rq.node_id);if(nd)rq.node_name=nd.name;}DATA.requests.unshift(rq);if(DATA.requests.length>100)DATA.requests.pop();render();}
     if(d.type==='rename'){var n=DATA.nodes.find(function(x){return x.id===d.id});if(n)n.name=d.name;render();}
     if(d.type==='delete'){DATA.nodes=DATA.nodes.filter(function(n){return n.id!==d.id});render();}
   };
@@ -245,6 +314,7 @@ function toggleTheme(){
   localStorage.setItem('theme',light?'dark':'light');
 }
 (function(){const t=localStorage.getItem('theme');if(t==='light'){document.documentElement.setAttribute('data-theme','light');document.getElementById('themeBtn').textContent='☀️';}})();
+if(TOKEN){$('#lockBtn').textContent='🔓';}
 load();connectWS();setInterval(load,60000);
 </script>
 </body></html>

server/index.js

@@ -41,7 +41,11 @@ CREATE TABLE IF NOT EXISTS requests (
 );
 CREATE INDEX IF NOT EXISTS idx_req_ts ON requests(ts);
 CREATE INDEX IF NOT EXISTS idx_req_node ON requests(node_id);
-CREATE TABLE IF NOT EXISTS tokens (
+`);
+// Add cache columns if missing (migration)
+try { db.exec('ALTER TABLE requests ADD COLUMN cache_read INTEGER DEFAULT 0'); } catch(e) {}
+try { db.exec('ALTER TABLE requests ADD COLUMN cache_write INTEGER DEFAULT 0'); } catch(e) {}
+db.exec(`CREATE TABLE IF NOT EXISTS tokens (
   id TEXT PRIMARY KEY DEFAULT 'global',
   token TEXT UNIQUE
 );
@@ -59,9 +63,12 @@ const upsertNode = db.prepare(`INSERT INTO nodes(id,name,host,os,oc_version,role
   swap=excluded.swap,sessions=excluded.sessions,gw_ok=excluded.gw_ok,daemon_ok=excluded.daemon_ok,
   uptime=excluded.uptime,tok_today=excluded.tok_today,tok_week=excluded.tok_week,tok_month=excluded.tok_month,
   last_seen=excluded.last_seen`);
-const insertReq = db.prepare(`INSERT INTO requests(node_id,upstream,model,status,input_tokens,output_tokens,ttft_ms,total_ms,success,ts) VALUES(?,?,?,?,?,?,?,?,?,?)`);
+const insertReq = db.prepare(`INSERT INTO requests(node_id,upstream,model,status,input_tokens,output_tokens,cache_read,cache_write,ttft_ms,total_ms,success,ts) VALUES(?,?,?,?,?,?,?,?,?,?,?,?)`);
 const getNodes = db.prepare("SELECT * FROM nodes ORDER BY role='master' DESC, name");
+const getNodeName = db.prepare("SELECT name FROM nodes WHERE id=?");
 const getReqs = db.prepare("SELECT r.*,n.name as node_name FROM requests r LEFT JOIN nodes n ON r.node_id=n.id ORDER BY r.ts DESC LIMIT ?");
+const getReqsPage = db.prepare("SELECT r.*,n.name as node_name FROM requests r LEFT JOIN nodes n ON r.node_id=n.id ORDER BY r.ts DESC LIMIT ? OFFSET ?");
+const countReqs = db.prepare("SELECT count(*) as total FROM requests");
 const getStats = db.prepare(`SELECT count(*) as total, sum(input_tokens) as input_tok, sum(output_tokens) as output_tok,
   sum(success) as ok, avg(ttft_ms) as avg_ttft, avg(total_ms) as avg_total
   FROM requests WHERE ts > ?`);
@@ -117,14 +124,25 @@ const server = http.createServer((req, res) => {
   // API routes
   (async () => {
     try {
-      // GET /api/dashboard - public overview
+      // GET /api/dashboard - public (masked) or authed (full)
       if (url.pathname === '/api/dashboard' && method === 'GET') {
+        const authed = (req.headers.authorization||'').replace('Bearer ','') === AUTH_TOKEN;
         const now = Math.floor(Date.now()/1000);
         const today = now - (now % 86400);
-        const nodes = getNodes.all();
+        const nodes = getNodes.all().map(n => authed ? n : {...n, host: '***'});
         const stats = getStats.get(today);
         const reqs = getReqs.all(500);
-        return json(200, { nodes, stats, requests: reqs, token: undefined });
+        return json(200, { nodes, stats, requests: reqs, authed });
+      }
+
+      // GET /api/requests - public (masked) or authed (full)
+      if (url.pathname === '/api/requests' && method === 'GET') {
+        const page = parseInt(url.searchParams.get('page') || '1');
+        const size = Math.min(parseInt(url.searchParams.get('size') || '50'), 200);
+        const offset = (page - 1) * size;
+        const rows = getReqsPage.all(size, offset);
+        const {total} = countReqs.get();
+        return json(200, { requests: rows, total, page, pages: Math.ceil(total / size) });
       }
 
       // POST /api/heartbeat - agent reports
@@ -148,10 +166,14 @@ const server = http.createServer((req, res) => {
         const items = Array.isArray(b) ? b : [b];
         for (const r of items) {
           insertReq.run(r.node_id,r.upstream,r.model,r.status||200,
-            r.input_tokens||0,r.output_tokens||0,r.ttft_ms||0,r.total_ms||0,
+            r.input_tokens||0,r.output_tokens||0,r.cache_read||0,r.cache_write||0,
+            r.ttft_ms||0,r.total_ms||0,
             r.success!==false?1:0, r.ts||now);
         }
-        if (items.length <= 5) items.forEach(r => broadcast({ type:'request', request: r }));
+        if (items.length <= 5) items.forEach(r => {
+          const nn = getNodeName.get(r.node_id);
+          broadcast({ type:'request', request: {...r, node_name: nn ? nn.name : r.node_id} });
+        });
         return json(200, { ok: true, count: items.length });
       }