From 7173a05b0694302aa12560abe720156f48aaf8d7 Mon Sep 17 00:00:00 2001 From: yiqi-017 <22300246009@m.fudan.edu.cn> Date: Sat, 6 Jun 2026 12:00:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[FIX]:=E4=BC=B0=E7=AE=97=E4=BB=B7=E6=A0=BC?= =?UTF-8?q?=E6=94=B9=E6=88=90=E7=BC=93=E5=AD=98=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontends/desktop/static/app.js | 45 +++++++++++++++++------------ frontends/desktop/static/index.html | 6 ++-- frontends/desktop/static/styles.css | 12 +------- 3 files changed, 30 insertions(+), 33 deletions(-) diff --git a/frontends/desktop/static/app.js b/frontends/desktop/static/app.js index 737303d4..c8fa0114 100644 --- a/frontends/desktop/static/app.js +++ b/frontends/desktop/static/app.js @@ -329,7 +329,7 @@ const I18N = { 'collab.timeMin': '{n} 分钟前', 'collab.timeHr': '{n} 小时前', 'collab.timeDay': '{n} 天前', - 'page.token.title': 'Token 统计', 'page.token.sub': '每会话与累计的 token 用量及估算成本', + 'page.token.title': 'Token 统计', 'page.token.sub': '每会话与累计的 token 用量及缓存率', 'status.connecting': '连接中…', 'status.ready': '就绪', 'status.running': '运行中', 'status.disconnected': '未连接', 'status.stopped': '已停止', 'status.idle': '空闲', 'conv.emptyList': '暂无会话，点「＋ 新对话」开始', 'conv.defaultTitle': '新对话', @@ -385,7 +385,7 @@ const I18N = { 'proc.imbotWechat': 'imbot · 微信', 'proc.imbotDing': 'imbot · 钉钉', 'proc.scheduler': '定时任务调度', 'cm.scheduling': '调度中', 'cm.running': '执行中', 'cm.idleSt': '空闲', 'cm.master': '已派 3 子任务', 'cm.w1': '子任务：抓取数据', 'cm.w2': '子任务：复核结果', 'cm.sub': '等待派单', - 'tok.total': '累计 token', 'tok.cost': '估算成本', 'tok.today': '今日 token', 'tok.tabAll': '聊天', 'tok.tabConductor': 'Conductor', 'tok.condTotal': 'Conductor 累计', 'tok.condCurrent': 'Conductor 本次', 'tok.condTip': 'Conductor 消耗的 token 不计入聊天累计 token 中', 'tok.disclaimer': '不同 API 网站的计费价格可能会有差异，请以实际网站为准。', 'tok.chartToggle': '趋势图', + 'tok.total': '累计 token', 'tok.cost': '缓存率', 'tok.today': '今日 token', 'tok.tabAll': '聊天', 'tok.tabConductor': 'Conductor', 'tok.condTotal': 'Conductor 累计', 'tok.condCurrent': 'Conductor 本次', 'tok.condTip': 'Conductor 消耗的 token 不计入聊天累计 token 中', 'tok.disclaimer': '不同 API 网站的计费价格可能会有差异，请以实际网站为准。', 'tok.chartToggle': '趋势图', 'tok.colSession': '会话', 'tok.colIn': '输入', 'tok.colOut': '输出', 'tok.colCacheW': '缓存写入', 'tok.colCache': '缓存读取', 'tok.colCost': '成本', 'tok.from': '从', 'tok.to': '到', 'tok.reset': '重置', 'tok.noData': '暂无记录', 'tok.deleted': '此会话已删除', 'tok.pricingUnknown': '⚠ 此模型计费规则尚未明确，按默认估算', @@ -481,7 +481,7 @@ const I18N = { 'collab.timeMin': '{n}m ago', 'collab.timeHr': '{n}h ago', 'collab.timeDay': '{n}d ago', - 'page.token.title': 'Token usage', 'page.token.sub': 'Per-session and total token usage & estimated cost', + 'page.token.title': 'Token usage', 'page.token.sub': 'Per-session and total token usage & cache rate', 'status.connecting': 'Connecting…', 'status.ready': 'Ready', 'status.running': 'Running', 'status.disconnected': 'Disconnected', 'status.stopped': 'Stopped', 'status.idle': 'Idle', 'conv.emptyList': 'No chats yet — click “＋ New chat”', 'conv.defaultTitle': 'New chat', @@ -537,7 +537,7 @@ const I18N = { 'proc.imbotWechat': 'imbot · WeChat', 'proc.imbotDing': 'imbot · DingTalk', 'proc.scheduler': 'Scheduler', 'cm.scheduling': 'Scheduling', 'cm.running': 'Running', 'cm.idleSt': 'Idle', 'cm.master': 'Dispatched 3 subtasks', 'cm.w1': 'Subtask: fetch data', 'cm.w2': 'Subtask: review results', 'cm.sub': 'Waiting for tasks', - 'tok.total': 'Total tokens', 'tok.cost': 'Est. cost', 'tok.today': 'Today tokens', 'tok.tabAll': 'Chat', 'tok.tabConductor': 'Conductor', 'tok.condTotal': 'Conductor Total', 'tok.condCurrent': 'Conductor Current', 'tok.condTip': 'Conductor tokens are not included in chat totals', 'tok.disclaimer': 'Pricing may vary by API provider. Please refer to the actual website.', 'tok.chartToggle': 'Trend', + 'tok.total': 'Total tokens', 'tok.cost': 'Cache rate', 'tok.today': 'Today tokens', 'tok.tabAll': 'Chat', 'tok.tabConductor': 'Conductor', 'tok.condTotal': 'Conductor Total', 'tok.condCurrent': 'Conductor Current', 'tok.condTip': 'Conductor tokens are not included in chat totals', 'tok.disclaimer': 'Pricing may vary by API provider. Please refer to the actual website.', 'tok.chartToggle': 'Trend', 'tok.colSession': 'Session', 'tok.colIn': 'Input', 'tok.colOut': 'Output', 'tok.colCacheW': 'Cache write', 'tok.colCache': 'Cache read', 'tok.colCost': 'Cost', 'tok.from': 'From', 'tok.to': 'To', 'tok.reset': 'Reset', 'tok.noData': 'No records', 'tok.deleted': 'Session deleted', 'tok.pricingUnknown': '⚠ Pricing not confirmed, using defaults', @@ -3693,12 +3693,13 @@ function tokGetFiltered() { } function tokRenderStats(filtered, all) { - let total=0, cost=0; - filtered.forEach(r=>{total+=(r.input||0)+(r.output||0); cost+=parseFloat(estCost(r.input||0,r.output||0,r.model,r.cacheRead||0,r.cacheCreate||0));}); + let total=0, totalInput=0, totalCacheRead=0, totalCacheCreate=0; + filtered.forEach(r=>{total+=(r.input||0)+(r.output||0)+(r.cacheRead||0)+(r.cacheCreate||0); totalInput+=(r.input||0); totalCacheRead+=(r.cacheRead||0); totalCacheCreate+=(r.cacheCreate||0);}); if(tokTotalN) tokTotalN.textContent=fmtTok(total); - if(tokCostN) tokCostN.textContent='¥ '+cost.toFixed(1); + const cacheBase = totalInput + totalCacheRead + totalCacheCreate; + if(tokCostN) tokCostN.textContent= cacheBase > 0 ? (totalCacheRead / cacheBase * 100).toFixed(1) + '%' : '0%'; const todayStart=new Date(); todayStart.setHours(0,0,0,0); const todayTs=todayStart.getTime()/1000; - let todayT=0; all.filter(r=>r.ts>=todayTs).forEach(r=>{todayT+=(r.input||0)+(r.output||0);}); + let todayT=0; all.filter(r=>r.ts>=todayTs).forEach(r=>{todayT+=(r.input||0)+(r.output||0)+(r.cacheRead||0)+(r.cacheCreate||0);}); if(tokTodayN) tokTodayN.textContent=fmtTok(todayT); } @@ -3721,15 +3722,18 @@ function tokRenderTable(records) { if(_tokPage>=totalPages)_tokPage=totalPages-1; const pageItems=sorted.slice(_tokPage*TOK_PER_PAGE,(_tokPage+1)*TOK_PER_PAGE); for(const s of pageItems){ - let sc=0; s.prompts.forEach(p=>{sc+=parseFloat(estCost(p.input||0,p.output||0,p.model,p.cacheRead||0,p.cacheCreate||0));}); + const sCacheBase = s.input + s.cacheRead + s.cacheCreate; + const sCacheRate = sCacheBase > 0 ? (s.cacheRead / sCacheBase * 100).toFixed(1) + '%' : '0%'; const tr=document.createElement('tr'); tr.className='tok-row-session'; - tr.innerHTML=`${escapeHtml(s.title)}${s.deleted?''+t('tok.deleted')+'':''}${fmtTok(s.input)}${fmtTok(s.output)}${fmtTok(s.cacheCreate)}${fmtTok(s.cacheRead)}¥${sc.toFixed(2)}`; + tr.innerHTML=`${escapeHtml(s.title)}${s.deleted?''+t('tok.deleted')+'':''}${fmtTok(s.input)}${fmtTok(s.output)}${fmtTok(s.cacheCreate)}${fmtTok(s.cacheRead)}${sCacheRate}`; tokTbody.appendChild(tr); const details=[]; s.prompts.sort((a,b)=>b.ts-a.ts); for(const p of s.prompts){ const dr=document.createElement('tr'); dr.className='tok-detail'; dr.hidden=true; - const modelHtml = p.model ? ` · ${escapeHtml(p.model)}` : ''; - dr.innerHTML=`${fmtTime(p.ts)}${modelHtml}${fmtTok(p.input||0)}${fmtTok(p.output||0)}${fmtTok(p.cacheCreate||0)}${fmtTok(p.cacheRead||0)}¥${estCost(p.input||0,p.output||0,p.model,p.cacheRead||0,p.cacheCreate||0)}`; + const modelHtml = p.model ? ` · ${escapeHtml(p.model)}` : ''; + const pCacheBase = (p.input||0) + (p.cacheRead||0) + (p.cacheCreate||0); + const pCacheRate = pCacheBase > 0 ? ((p.cacheRead||0) / pCacheBase * 100).toFixed(1) + '%' : '0%'; + dr.innerHTML=`${fmtTime(p.ts)}${modelHtml}${fmtTok(p.input||0)}${fmtTok(p.output||0)}${fmtTok(p.cacheCreate||0)}${fmtTok(p.cacheRead||0)}${pCacheRate}`; tokTbody.appendChild(dr); details.push(dr); } tr.addEventListener('click',()=>{const o=tr.classList.toggle('open');details.forEach(d=>d.hidden=!o);}); @@ -3795,7 +3799,11 @@ async function loadConductorTokens() { if (!tokTbody) return; const tip = t('tok.condTip'); const _ci = `${CONDUCTOR_SVG_INNER}`; - tokTbody.innerHTML = `${_ci}${t('tok.condTotal')}${fmtTok(hIn)}${fmtTok(hOut)}${fmtTok(hCc)}${fmtTok(hCr)}¥${hCost.toFixed(2)}${_ci}${t('tok.condCurrent')}${fmtTok(curIn)}${fmtTok(curOut)}${fmtTok(curCc)}${fmtTok(curCr)}¥${curCost.toFixed(2)}`; + const hCacheBase = hIn + hCr + hCc; + const hCacheRate = hCacheBase > 0 ? (hCr / hCacheBase * 100).toFixed(1) + '%' : '0%'; + const curCacheBase = curIn + curCr + curCc; + const curCacheRate = curCacheBase > 0 ? (curCr / curCacheBase * 100).toFixed(1) + '%' : '0%'; + tokTbody.innerHTML = `${_ci}${t('tok.condTotal')}${fmtTok(hIn)}${fmtTok(hOut)}${fmtTok(hCc)}${fmtTok(hCr)}${hCacheRate}${_ci}${t('tok.condCurrent')}${fmtTok(curIn)}${fmtTok(curOut)}${fmtTok(curCc)}${fmtTok(curCr)}${curCacheRate}`; const pager = document.getElementById('tok-pager'); if (pager) pager.innerHTML = ''; } @@ -3824,19 +3832,18 @@ function renderTokChart() { const daily = {}; for (const r of history) { const day = new Date(r.ts * 1000).toLocaleDateString('sv'); - const cost = parseFloat(estCost(r.input||0, r.output||0, r.model||'', r.cacheRead||0, r.cacheCreate||0)); - daily[day] = (daily[day] || 0) + cost; + daily[day] = (daily[day] || 0) + (r.input || 0) + (r.output || 0) + (r.cacheRead || 0) + (r.cacheCreate || 0); } const rawDays = Object.keys(daily).sort(); if (!rawDays.length) { tokChartEl.innerHTML = ''; return; } - // Fill gaps: include days with 0 cost between first and last + // Fill gaps: include days with 0 between first and last const days = []; const d0 = new Date(rawDays[0]), d1 = new Date(rawDays[rawDays.length - 1]); for (let d = new Date(d0); d <= d1; d.setDate(d.getDate() + 1)) { days.push(d.toLocaleDateString('sv')); } const vals = days.map(d => daily[d] || 0); - const maxVal = Math.max(...vals, 0.01); + const maxVal = Math.max(...vals, 1); const W = 600, H = 260, PL = 48, PR = 30, PT = 14, PB = 28; const cw = W - PL - PR, ch = H - PT - PB; const step = days.length > 1 ? cw / (days.length - 1) : cw; @@ -3844,14 +3851,14 @@ function renderTokChart() { const polyline = pts.map(p => p.join(',')).join(' '); const yLines = [0, 0.25, 0.5, 0.75, 1].map(f => { const y = PT + ch - f * ch; - const label = '¥' + (maxVal * f).toFixed(1); + const label = fmtTok(maxVal * f); return `${label}`; }).join(''); const xLabels = days.map((d, i) => { if (days.length > 14 && i % Math.ceil(days.length / 7) !== 0 && i !== days.length - 1) return ''; return `${d.slice(5)}`; }).join(''); - const dots = pts.map((p, i) => `${days[i]}: ¥${vals[i].toFixed(2)}`).join(''); + const dots = pts.map((p, i) => `${days[i]}: ${fmtTok(vals[i])}`).join(''); tokChartEl.innerHTML = `${yLines}${xLabels}${dots}`; } diff --git a/frontends/desktop/static/index.html b/frontends/desktop/static/index.html index c7a14cab..45cf9e6c 100644 --- a/frontends/desktop/static/index.html +++ b/frontends/desktop/static/index.html @@ -4,7 +4,7 @@ GenericAgent - + @@ -329,7 +329,7 @@
0
-
¥ 0
+
0%
0
@@ -588,6 +588,6 @@ - + diff --git a/frontends/desktop/static/styles.css b/frontends/desktop/static/styles.css index 20c31f5a..0aa5a554 100644 --- a/frontends/desktop/static/styles.css +++ b/frontends/desktop/static/styles.css @@ -955,18 +955,8 @@ span.flatpickr-weekday{ color:var(--muted) !important; font-size:11px; } .tok-detail td:not(:first-child){ text-align:right; } .tok-detail[hidden]{ display:none; } .tok-model-tip{ - position:relative; cursor:help; color:var(--accent); - border-bottom:1px dashed var(--muted2); + color:var(--accent); } -.tok-model-tip::after{ - content:attr(data-tip); position:absolute; bottom:calc(100% + 6px); left:50%; - transform:translateX(-50%); white-space:pre-line; font-size:11px; line-height:1.5; - background:var(--card); color:var(--txt); border:1px solid var(--line); - border-radius:4px; padding:8px 10px; box-shadow:var(--shadow-pop); - pointer-events:none; opacity:0; transition:opacity .15s; z-index:100; - min-width:160px; text-align:left; -} -.tok-model-tip:hover::after{ opacity:1; } .tok-pager{ display:flex; gap:4px; justify-content:center; margin-top:12px; } .tok-pager button{ min-width:28px; height:28px; border:1px solid var(--line); border-radius:4px; From 554586fa82d3160a63cbe3182d84ce65a75f93b1 Mon Sep 17 00:00:00 2001 From: yiqi-017 <22300246009@m.fudan.edu.cn> Date: Sat, 6 Jun 2026 16:09:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E6=8C=81=E4=B9=85=E5=8C=96=20llm=5F?= =?UTF-8?q?history=20=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=90=AF=E5=90=8E?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E5=B9=BB=E8=A7=89=E5=B7=A5=E5=85=B7=E8=B0=83?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontends/desktop_bridge.py | 45 +++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 14 deletions(-) diff --git a/frontends/desktop_bridge.py b/frontends/desktop_bridge.py index 3b2c119a..0576a428 100644 --- a/frontends/desktop_bridge.py +++ b/frontends/desktop_bridge.py @@ -88,6 +88,7 @@ class Session: untitled: bool = True plan_scan_baseline: int = 0 plan_path: str = "" + llm_history: Optional[List[dict]] = None def _load_plan_baseline(item: dict, msgs: list) -> int: @@ -129,12 +130,19 @@ class AgentManager: arr = [] with self.lock: for s in self.sessions.values(): + llm_hist = None + if s.agent and hasattr(s.agent, 'llmclient'): + try: llm_hist = s.agent.llmclient.backend.history + except Exception: pass + if llm_hist is None: + llm_hist = s.llm_history arr.append({"id": s.id, "title": s.title, "cwd": s.cwd, "created_at": s.created_at, "updated_at": s.updated_at, "messages": s.messages, "msg_seq": s.msg_seq, "pinned": s.pinned, "untitled": s.untitled, "plan_scan_baseline": s.plan_scan_baseline, - "plan_path": s.plan_path or ""}) + "plan_path": s.plan_path or "", + "llm_history": llm_hist}) self._sessions_file.write_text(json.dumps(arr, ensure_ascii=False, default=str), encoding="utf-8") except Exception as e: print(f"[bridge] persist sessions failed: {e}", file=sys.stderr) @@ -157,7 +165,8 @@ class AgentManager: plan_scan_baseline=_load_plan_baseline(item, msgs), plan_path=_sanitize_desktop_plan_path( item["id"], item.get("plan_path") or ""), - status="idle", agent=None) + status="idle", agent=None, + llm_history=item.get("llm_history")) self.sessions[sess.id] = sess if self.sessions: self.active_session_id = max(self.sessions.values(), key=lambda s: s.updated_at).id @@ -512,6 +521,8 @@ class AgentManager: import plan_state plan_state.sync_plan_path_from_text(sess, full, sess.cwd or self.ga_root) self.add_message(sess, "assistant", full) + try: sess.llm_history = json.loads(json.dumps(agent.llmclient.backend.history, ensure_ascii=False, default=str)) + except Exception: pass sess.status = "idle" sess.last_error = "" emit_session_state(sess, "idle") @@ -584,23 +595,29 @@ class AgentManager: if sess.agent is not None: return {"ok": True, "sessionId": sid, "restored": False, "reason": "agent already alive"} agent = self.make_agent(sess) - history = [] - for m in sess.messages: - role = m.get("role") - content = m.get("content", "") - if role == "user": - history.append({"role": "user", "content": [{"type": "text", "text": content}]}) - elif role == "assistant": - history.append({"role": "assistant", "content": [{"type": "text", "text": content}]}) - if history: + if sess.llm_history: try: - agent.llmclient.backend.history = history + agent.llmclient.backend.history = sess.llm_history except Exception as e: - print(f"[bridge] inject history failed: {e}", file=sys.stderr) + print(f"[bridge] restore llm_history failed: {e}", file=sys.stderr) + else: + history = [] + for m in sess.messages: + role = m.get("role") + content = m.get("content", "") + if role == "user": + history.append({"role": "user", "content": [{"type": "text", "text": content}]}) + elif role == "assistant": + history.append({"role": "assistant", "content": [{"type": "text", "text": content}]}) + if history: + try: + agent.llmclient.backend.history = history + except Exception as e: + print(f"[bridge] inject history failed: {e}", file=sys.stderr) with self.lock: sess.agent = agent sess.status = "idle" - return {"ok": True, "sessionId": sid, "restored": True, "messageCount": len(history)} + return {"ok": True, "sessionId": sid, "restored": True, "messageCount": len(sess.llm_history or sess.messages)} import base64 From f6b594dc71b42987d8fe658381e6dc80e9d9f463 Mon Sep 17 00:00:00 2001 From: dd3xp Date: Sat, 6 Jun 2026 17:39:01 +0800 Subject: [PATCH 3/3] fix(reflect/scheduler): switch to lsdefine's mkdir fix (drop my variant) lsdefine/main b365945 had independently landed the same makedirs fix I added in ac2779d, but at module top-level and creating DONE/ instead of dirname(_LOG). Functionally equivalent (both unblock fresh-deploy scheduler import), but to keep this fork aligned with upstream we adopt lsdefine's version verbatim. After future content-overlay syncs from upstream, no diff in this file. --- reflect/scheduler.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/reflect/scheduler.py b/reflect/scheduler.py index 82936a20..a3ca622d 100644 --- a/reflect/scheduler.py +++ b/reflect/scheduler.py @@ -16,13 +16,10 @@ TASKS = os.path.join(_dir, '../sche_tasks') DONE = os.path.join(_dir, '../sche_tasks/done') _LOG = os.path.join(_dir, '../sche_tasks/scheduler.log') -# --- 日志 --- +os.makedirs(DONE, exist_ok=True) _logger = logging.getLogger('scheduler') if not _logger.handlers: _logger.setLevel(logging.INFO) - # sche_tasks/ 在 .gitignore 里,fresh deploy 时不存在,先建出来再开 FileHandler - # (跟 check() 里 line 78 的 os.makedirs(DONE, exist_ok=True) 是一个 pattern) - os.makedirs(os.path.dirname(_LOG), exist_ok=True) _fh = logging.FileHandler(_LOG, encoding='utf-8') _fh.setFormatter(logging.Formatter('%(asctime)s %(levelname)s %(message)s', datefmt='%Y-%m-%d %H:%M'))