From 41355eb28358019e8c8cb67c287477706cccf33c Mon Sep 17 00:00:00 2001 From: Limin Wang Date: Thu, 19 Nov 2026 23:06:28 -0800 Subject: [PATCH] =?UTF-8?q?feat(briefing):=20=E7=AE=80=E6=8A=A5=E9=A1=B5?= =?UTF-8?q?=E6=94=B9=E7=89=88=E2=80=94=E2=80=94=E5=AE=BD=E5=B9=85=E4=B8=A4?= =?UTF-8?q?=E6=A0=8F=E3=80=81=E6=AF=8F=E4=B8=AA=E6=9D=A5=E6=BA=90=E4=B8=80?= =?UTF-8?q?=E5=9D=97=E7=A3=81=E8=B4=B4=E5=92=8C=E4=B8=80=E5=BC=A0=E5=8D=A1?= =?UTF-8?q?=E3=80=81=E6=8C=89=E4=BC=98=E5=85=88=E7=BA=A7=20/=20bug=20/=20?= =?UTF-8?q?=E6=9C=89=E6=9B=B4=E6=96=B0=E7=AD=9B=E9=80=89=E3=80=81=E5=A4=84?= =?UTF-8?q?=E7=90=86=E5=AE=8C=E5=8F=AF=E5=8B=BE=E6=8E=89=EF=BC=9B=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E6=96=87=E5=AD=97=E9=87=8C=E7=9A=84=E6=96=B9=E6=8B=AC?= =?UTF-8?q?=E5=8F=B7=E8=83=BD=E6=B8=B2=E6=9F=93=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - reports.split_sections:渲染好的全文按

切区,数顶层条目的总数 / 三档优先级 / bug / 有更新,按标题猜来源(只用来配色); provider 多给 sections[],html 照旧 - 页面:items.js(纯函数:classify / passes / navTiles / filterChips / card),report.js 画左栏磁贴 + 筛选片、右栏每区一张卡, 进页面后给顶层每条打 data-p / bug / upd 并插勾选框(勾掉存 localStorage,键带生成时间);折叠只在内存;没有分区退回整段文章; report.html 顶栏 sticky + 两栏;report.css 来源色、磁贴头、徽章、星色块、bug 左红条、窄屏单栏 - markdown._LINK:链接文字里允许一层方括号(日历事件「[Daily] …」) - render:REPORT_MODULES 加 items.js,REPORT_KEYS 加筛选 / 分区字串;字表 zh / en;docs/config-panorama 报告页一节;CHANGELOG Co-Authored-By: Claude Fable 5.1 --- CHANGELOG.md | 1 + docs/config-panorama.md | 11 ++- pet/locale/en.json | 14 ++++ pet/locale/zh.json | 14 ++++ pet/panorama/markdown.py | 3 +- pet/panorama/page/items.js | 46 ++++++++++++ pet/panorama/page/report.css | 117 ++++++++++++++++++++++++----- pet/panorama/page/report.html | 36 ++++++--- pet/panorama/page/report.js | 110 ++++++++++++++++++++++++--- pet/panorama/render.py | 6 +- pet/panorama/reports.py | 59 ++++++++++++++- tests/test_panorama_markdown.py | 6 ++ tests/test_panorama_report_page.py | 41 +++++++++- tests/test_panorama_reports.py | 22 ++++++ 14 files changed, 437 insertions(+), 49 deletions(-) create mode 100644 pet/panorama/page/items.js diff --git a/CHANGELOG.md b/CHANGELOG.md index c32ad9c..63be714 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ ## 2026-11 +- 11-20 简报页改版:宽幅两栏,左边每个来源一块磁贴(点了滚过去)和筛选片(★★★ / ★★ / ★ / bug / 有更新,可多选),右边每个来源一张卡(实色磁贴头、条数与 ★★★ / bug / 有更新 的计数、可折叠);每条前面有勾选框,处理完勾掉(只记在这个浏览器里,重新生成后清零),可以隐藏已勾掉的;窄屏单栏。顺手修了链接文字里带方括号(日历事件「[Daily] …」)渲染不成链接的问题 - 11-20 简报页多了「这次是怎么生成的」:链路(WSL 里的 Claude Code 版本、模型、权限模式)、每个相关 MCP 服务器的状态和这次用没用到(没登录的直接给登录命令)、每次工具调用、那个账号跑的 hooks、完整命令和提示词原文;失败的那次也留。设置里新增「额外放行的工具」:连接器换了名字时自己补一行,不用等改代码 - 11-19 工作简报改在浏览器里看:岛上的小文档按钮、早上提醒的「查看」、右键「查看最近一份」都打开配置全景服务的简报页(概要、用量、全文、「重新生成」,生成中页面自己更新)。右键菜单里的「生成时间」子菜单拿掉,换成「简报设置…」翻到配置全景;笔记 / Slack 关注仍在原来的窗口里 - 11-19 配置全景的待处理里,「联动开着但没有 hooks」那一条有了「修复」按钮:确认一次就把 hooks 装回去,图上那条断线随即变回来(WSL 那条在后台装,装完自己更新)。从页面或设置进程关掉联动通道时,肥鱼自己装的 hooks 也会一起卸掉,和右键菜单关闭一样 diff --git a/docs/config-panorama.md b/docs/config-panorama.md index a39bb9f..b872c91 100644 --- a/docs/config-panorama.md +++ b/docs/config-panorama.md @@ -318,6 +318,15 @@ flowchart LR `details` 是「这次是怎么生成的」那几段 `{title, html}`(服务端渲染、全部转义,见[公司侧助理](work-assistant.md)的 「运行记录」),页面折叠着摆在全文下面、第一段默认展开;里面的 `__SETTINGS_URL__` 占位由页面换成 `/#<令牌>&settings=`(同一个服务、同一个令牌)。 +- **分区、筛选、勾掉**(2026-11-20 改版):provider 把渲染好的全文按 `

` 切成 `sections[]`(`reports.split_sections`:每区 + `id / source / title / html` 和顶层条目的计数 `count / p3 / p2 / p1 / bugs / updated`;`source` 只是按标题关键词猜的来源, + 配色用)。页面:顶栏 sticky(标题 · 生成时间 · 用量 · 状态 · 「重新生成」),概要大字;≥ 980px 两栏——左栏 240px 贴着滚: + 每区一块实色磁贴(点了滚过去)、筛选片(`全部 / ★★★ / ★★ / ★ / 🐞 bug / 有更新`,多选取并集)、「隐藏已勾掉」、 + 「这次是怎么生成的」锚;右栏每区一张卡(实色磁贴头 + 计数徽章 + 折叠)。窄屏单栏,磁贴变成顶部一行横滚。 + 进页面后 `report.js` 给每张卡里**顶层**的每一条打 `data-p / data-bug / data-upd`(`items.classify`:开头的 ★ 类名、 + `li.bug`、行里的 ``)并插一个勾选框;勾掉只存这个浏览器的 `localStorage`(键 = 报告名 + 生成时间 + 区 + 序号, + 重新生成就是新的一套),不进肥鱼、不进配置。分类与筛选是纯函数(`items.js`),QJSEngine 里直接测;DOM 接线只在真浏览器核对。 + 没有 `

` 的内容(老简报、空内容)退回整段 `article`。 - **数据怎么到页面**:每份报告自己一个 `Feed`。第一次 `GET /api/report/<名字>` 时还没发布过,请求线程经 `on_gui` 让界面线程做一份 (`publish_report(force=True)`);之后页面带编号等更新。简报服务 `started` / `finished` 时应用调 `publish_report(name)`—— **没人打开过页面就什么都不做**(provider 不白跑)。`report_watched(name)` = 有请求挂在那份报告上 = 用户正开着看, @@ -333,7 +342,7 @@ flowchart LR - **「重新生成」**:`POST /api/actions/generate_report {report}` → `generate_work_briefing` → `started / busy / failed / unavailable`。 回 `started` 页面不动按钮,等 `started` 信号带来的重画把它变灰、`finished` 再放开。 - **隐私**:内容不进全景图、不落快照、不进日志(服务只记请求行);只经带令牌的接口给 `127.0.0.1` 上的浏览器。 -- 两张页共用 `client.js`(取令牌、`api` / `api.patch` / `api.post`);`report.js` 是会自己跑起来的入口,**不在 `MODULES` 里** +- 两张页共用 `client.js`(取令牌、`api` / `api.patch` / `api.post`);`items.js` 是报告页的纯函数;`report.js` 是会自己跑起来的入口,**不在 `MODULES` 里** (不能拼进全景的离线快照)。 ### 文件查看(只读) diff --git a/pet/locale/en.json b/pet/locale/en.json index 2d9a8a8..99973b3 100644 --- a/pet/locale/en.json +++ b/pet/locale/en.json @@ -2461,5 +2461,19 @@ "panorama.ui.report_action_started": "Started, about a minute…", "panorama.ui.report_action_busy": "Already generating, wait for it.", "panorama.ui.report_action_failed": "Couldn't start it, see the fish's log.", + "panorama.ui.report_sections": "Sections", + "panorama.ui.report_filters": "Filter", + "panorama.ui.report_filter_all": "All", + "panorama.ui.report_filter_p3": "★★★", + "panorama.ui.report_filter_p2": "★★", + "panorama.ui.report_filter_p1": "★", + "panorama.ui.report_filter_bug": "🐞 bugs", + "panorama.ui.report_filter_upd": "updated", + "panorama.ui.report_hide_done": "Hide ticked-off items", + "panorama.ui.report_items": "{n} items", + "panorama.ui.report_untitled": "(untitled)", + "panorama.ui.report_fold": "Collapse / expand this section", + "panorama.ui.report_trace": "How this run went ↓", + "panorama.ui.report_done": "Tick it off when handled (kept in this browser only; cleared on regeneration)", "panorama.ui.report_action_lost": "Can't reach the fish." } diff --git a/pet/locale/zh.json b/pet/locale/zh.json index 9b719f4..a8432e3 100644 --- a/pet/locale/zh.json +++ b/pet/locale/zh.json @@ -2453,5 +2453,19 @@ "panorama.ui.report_action_started": "已出发,大约一分钟…", "panorama.ui.report_action_busy": "正在生成,等它完成。", "panorama.ui.report_action_failed": "没能发起,看肥鱼的日志。", + "panorama.ui.report_sections": "分区", + "panorama.ui.report_filters": "筛选", + "panorama.ui.report_filter_all": "全部", + "panorama.ui.report_filter_p3": "★★★", + "panorama.ui.report_filter_p2": "★★", + "panorama.ui.report_filter_p1": "★", + "panorama.ui.report_filter_bug": "🐞 bug", + "panorama.ui.report_filter_upd": "有更新", + "panorama.ui.report_hide_done": "隐藏已勾掉的", + "panorama.ui.report_items": "{n} 条", + "panorama.ui.report_untitled": "(无标题)", + "panorama.ui.report_fold": "收起 / 展开这一区", + "panorama.ui.report_trace": "这次是怎么生成的 ↓", + "panorama.ui.report_done": "处理完了就勾掉(只记在这个浏览器里,重新生成后清零)", "panorama.ui.report_action_lost": "连不上肥鱼。" } diff --git a/pet/panorama/markdown.py b/pet/panorama/markdown.py index 76c0d7b..b4b2447 100644 --- a/pet/panorama/markdown.py +++ b/pet/panorama/markdown.py @@ -21,7 +21,8 @@ _HEADING = re.compile(r"^(#{1,6})\s+(.*?)\s*#*\s*$") _ITEM = re.compile(r"^(\s*)(?:([-*])|(\d{1,3})[.)])\s+(.*)$") _CODE = re.compile(r"`([^`\n]+)`") -_LINK = re.compile(r"\[([^\]\n]+)\]\((https?://[^\s)]+)\)") +# 链接文字里允许一层方括号(日历事件的标题常是「[Daily] …」):``[[Daily] 标题](https://…)`` +_LINK = re.compile(r"\[((?:[^\[\]\n]|\[[^\[\]\n]*\])+)\]\((https?://[^\s)]+)\)") _BARE_URL = re.compile(r"(?()\"']+") _BOLD = re.compile(r"\*\*(?=\S)(.+?)(?<=\S)\*\*") _STARS = re.compile(r"^(★{1,3})\s*") diff --git a/pet/panorama/page/items.js b/pet/panorama/page/items.js new file mode 100644 index 0000000..ed877a7 --- /dev/null +++ b/pet/panorama/page/items.js @@ -0,0 +1,46 @@ +/* 简报页的纯函数:给一条
  • 分类、按筛选判断显不显示、左栏磁贴 / 筛选片 / 右栏卡片的 HTML。 + 不碰 DOM、不认识具体功能(只认识「几区、每区几条、每条有没有 ★ / bug / 有更新」),测试里直接调。 */ +import {esc} from './util.js'; + +var PRIORITY = /^\s*/; +var FILTERS = ['p3', 'p2', 'p1', 'bug', 'upd']; + +/* 一条的分类:优先级(渲染器把开头的 ★ 变成 )、bug(
  • )、有更新(行里的 ) */ +export function classify(html, className) { + var m = PRIORITY.exec(String(html || '')); + return {p: m ? +m[1] : 0, bug: /(^|\s)bug(\s|$)/.test(String(className || '')), upd: //.test(String(html || ''))}; +} + +/* 选中的筛选片(数组,空 = 全部;多选取并集)+「隐藏已勾掉」→ 这条显不显示 */ +export function passes(item, filters, hideDone) { + if (hideDone && item.done) return false; + if (!filters.length) return true; + return filters.some(function (f) { return f === 'bug' ? item.bug : f === 'upd' ? item.upd : item.p === +f.slice(1); }); +} + +function countText(strings, key, count) { return esc(String(strings[key] || '{n}').replace('{n}', count)); } + +export function navTiles(sections, strings) { + return sections.map(function (s) { + return '' + + '' + esc(s.title || strings.report_untitled) + '' + countText(strings, 'report_items', s.count) + ''; + }).join(''); +} + +export function filterChips(filters, hideDone, strings) { + var chips = [{f: '', label: strings.report_filter_all, on: !filters.length}].concat(FILTERS.map(function (f) { + return {f: f, label: strings['report_filter_' + f], on: filters.indexOf(f) >= 0}; + })); + return chips.map(function (c) { + return ''; + }).join('') + ''; +} + +export function card(s, strings, collapsed) { + var badges = [['p3', s.p3, '★★★'], ['bug', s.bugs, '🐞'], ['upd', s.updated, strings.report_filter_upd]].filter(function (b) { return b[1] > 0; }) + .map(function (b) { return '' + esc(b[2]) + ' ' + b[1] + ''; }).join(''); + return '
    ' + + '

    ' + esc(s.title || strings.report_untitled) + '

    ' + countText(strings, 'report_items', s.count) + '' + + badges + '
    ' + (s.html || '') + '
    '; +} diff --git a/pet/panorama/page/report.css b/pet/panorama/page/report.css index 335ccd1..af7f15f 100644 --- a/pet/panorama/page/report.css +++ b/pet/panorama/page/report.css @@ -1,19 +1,95 @@ /* 报告页(工作简报)的样式。控件颜色用和 Qt 共用的令牌(tokens.css 的 --m-*,深色默认、data-theme="light" 换浅色); 下面这组是简报自己多出来的几个:链接色、工单状态小标签、bug 行底色、三级优先级的星色—— - 和 Qt 窗口 work_briefing_ui._EXTRA_TOKENS 一字不差,改一处就两处一起改。Metro:没有圆角。 */ -:root{color-scheme:dark;--link:#6cb4ff;--chip:#38383f;--chip-text:#e6e6ea;--bug:#4a2328;--p1:#ff6b61;--p2:#ffa94d;--p3:#8c8c94} -:root[data-theme="light"]{color-scheme:light;--link:#0a6fd6;--chip:#e6e6e8;--chip-text:#1f1f1f;--bug:#fbe3e4;--p1:#d93025;--p2:#e8710a;--p3:#8a8a90} + 和 Qt 窗口 work_briefing_ui._EXTRA_TOKENS 一字不差,改一处就两处一起改。 + 分区的来源色(Jira 蓝 / PR 紫 / Slack 玫红 / 日程青 / 邮件琥珀 / 建议绿 / 其他灰)是 Metro 实色磁贴那一套的淡色版。 + Metro:方角、磁贴无边框、白字不描边、悬停提亮;需要层次时用玻璃阴影。 */ +:root{color-scheme:dark;--link:#6cb4ff;--chip:#38383f;--chip-text:#e6e6ea;--bug:#4a2328;--p1:#ff6b61;--p2:#ffa94d;--p3:#8c8c94; + --src-jira:#3b7dc4;--src-pr:#7a62b8;--src-slack:#b85c7a;--src-calendar:#2f8f86;--src-email:#b8832e;--src-suggestions:#5a8a3c;--src-other:#5f6470; + --glass:0 10px 30px rgba(0,0,0,.28);--done:#8a8a94} +:root[data-theme="light"]{color-scheme:light;--link:#0a6fd6;--chip:#e6e6e8;--chip-text:#1f1f1f;--bug:#fbe3e4;--p1:#d93025;--p2:#e8710a;--p3:#8a8a90; + --src-jira:#4a8ed6;--src-pr:#8a74c8;--src-slack:#c8708c;--src-calendar:#3aa398;--src-email:#cf9a3a;--src-suggestions:#6b9c4a;--src-other:#7a8090; + --glass:0 10px 28px rgba(0,0,0,.12);--done:#9a9aa3} *{box-sizing:border-box} html,body{margin:0;background:var(--m-page);color:var(--m-text);font:15px/1.55 "Segoe UI","Microsoft YaHei UI","Microsoft YaHei",system-ui,sans-serif} -header{display:flex;flex-wrap:wrap;align-items:baseline;gap:6px 18px;padding:26px 28px 6px;max-width:860px;margin:0 auto} -header h1{margin:0;font-size:28px;font-weight:300;letter-spacing:.02em;color:var(--m-title)} +.wrap{max-width:1360px;margin:0 auto;padding:0 28px} + +/* 顶栏:标题 · 生成时间 · 用量;右边状态 + 按钮。贴顶。 */ +.top{position:sticky;top:0;z-index:5;background:var(--m-page);box-shadow:0 1px 0 var(--m-divider)} +.bar{display:flex;flex-wrap:wrap;align-items:flex-end;justify-content:space-between;gap:8px 24px;padding-top:18px;padding-bottom:10px} +.tl{display:flex;flex-wrap:wrap;align-items:baseline;gap:6px 16px} +.tl h1{margin:0;font-size:28px;font-weight:300;letter-spacing:.02em;color:var(--m-title)} .meta{color:var(--m-muted);font-size:12.5px} -main{max-width:860px;margin:0 auto;padding:0 28px 40px} -.summary{font-size:17px;font-weight:600;margin:10px 0 8px;color:var(--m-title)} +.usage{display:flex;flex-wrap:wrap;gap:6px;flex-basis:100%} +.usage .u{background:var(--m-tile);color:var(--m-muted);padding:1px 8px;font-size:12px} +.tr{display:flex;align-items:center;gap:14px;padding-bottom:2px} +.status{color:var(--m-muted);font-size:13px;max-width:420px}.status.bad{color:var(--p1)} +.btn{background:var(--m-accent);color:var(--m-selected-text);border:0;padding:8px 18px;font:inherit;font-size:14px;cursor:pointer;box-shadow:var(--glass)} +.btn:hover{filter:brightness(1.08)}.btn:focus-visible{outline:2px solid var(--m-outline);outline-offset:2px} +.btn:disabled{background:var(--m-tile);color:var(--m-disabled);cursor:default;box-shadow:none} +.btn[hidden]{display:none} +.lost{max-width:1360px;margin:10px auto 0;padding:10px 28px;color:var(--p2);font-size:13px} +.lost[hidden]{display:none} + +main{padding-top:18px;padding-bottom:48px} +.summary{font-size:19px;font-weight:600;margin:0 0 18px;color:var(--m-title);line-height:1.45} .summary[hidden]{display:none} -.usage{display:flex;flex-wrap:wrap;gap:6px;margin:0 0 14px} -.usage .u{background:var(--m-tile);color:var(--m-muted);padding:2px 8px;font-size:12px} -article{background:var(--m-tile);padding:18px 22px;box-shadow:0 8px 28px rgba(0,0,0,.18)} + +/* 两栏:左栏 240 贴着滚,右栏卡片。窄屏单栏,左栏变成顶部一行可横滚的磁贴。 */ +.grid{display:grid;grid-template-columns:240px minmax(0,1fr);gap:0 26px;align-items:start} +.side{position:sticky;top:96px} +.side[hidden]{display:none} +.side-title{font-size:12px;letter-spacing:.08em;text-transform:uppercase;color:var(--m-muted);margin:4px 0 6px} +.nav{display:flex;flex-direction:column;gap:6px;margin-bottom:18px} +.tile{display:flex;align-items:center;justify-content:space-between;gap:8px;padding:10px 12px;color:#fff;text-decoration:none;background:var(--src-other); + transition:filter .12s,transform .12s} +.tile:hover{filter:brightness(1.1);transform:translateX(2px)}.tile:focus-visible{outline:2px solid var(--m-outline);outline-offset:2px} +.tile .t{font-weight:600;font-size:14px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap} +.tile .n{font-size:12px;opacity:.9;white-space:nowrap} +.src-jira{--src:var(--src-jira)}.src-pr{--src:var(--src-pr)}.src-slack{--src:var(--src-slack)}.src-calendar{--src:var(--src-calendar)} +.src-email{--src:var(--src-email)}.src-suggestions{--src:var(--src-suggestions)}.src-other{--src:var(--src-other)} +.tile[class*="src-"]{background:var(--src)} +.filters{display:flex;flex-wrap:wrap;gap:6px;margin-bottom:18px} +.chip{background:var(--m-tile);color:var(--m-text);border:0;padding:5px 10px;font:inherit;font-size:13px;cursor:pointer} +.chip:hover{background:var(--m-tile-hover)}.chip.on{background:var(--m-accent);color:var(--m-selected-text)} +.chip:focus-visible{outline:2px solid var(--m-outline);outline-offset:1px} +.hide{flex-basis:100%;font-size:13px;color:var(--m-muted);display:flex;align-items:center;gap:6px;cursor:pointer} +.anchor{display:block;font-size:13px;color:var(--link);text-decoration:none}.anchor:hover{text-decoration:underline} + +/* 每区一张卡:实色磁贴头 + 卡体 */ +.cards{display:flex;flex-direction:column;gap:18px} +.card{background:var(--m-tile);box-shadow:var(--glass)} +.card .head{display:flex;align-items:center;gap:10px;padding:10px 16px;background:var(--src);color:#fff} +.card .head h3{margin:0;font-size:16px;font-weight:600;letter-spacing:.02em;flex:0 1 auto} +.card .head .count{font-size:12.5px;opacity:.9} +.badge{font-size:12px;padding:1px 8px;background:rgba(255,255,255,.22)} +.badge.p3{background:rgba(255,255,255,.3);font-weight:700} +.card .fold{margin-left:auto;background:transparent;border:0;color:#fff;font:inherit;font-size:16px;cursor:pointer;padding:0 4px;line-height:1} +.card .fold:hover{background:rgba(255,255,255,.18)}.card .fold:focus-visible{outline:2px solid #fff;outline-offset:1px} +.card[data-collapsed="1"] .list{display:none} +.list{padding:8px 16px 12px} +.list p{margin:8px 0} +.list ul,.list ol{margin:0;padding-left:0;list-style:none} +.list ul ul,.list ol ul,.list ul ol{padding-left:28px;margin:4px 0 2px;list-style:disc} +.list ul ul li{display:list-item;padding:2px 0;border:0;color:var(--m-muted);font-size:14px} +.list > ul > li,.list > ol > li{display:flex;align-items:flex-start;gap:10px;padding:8px 0;border-bottom:1px solid var(--m-divider)} +.list > ul > li:last-child,.list > ol > li:last-child{border-bottom:0} +.list > ul > li > .body{flex:1;min-width:0} +.list li.bug{background:var(--bug);margin:0 -16px;padding-left:12px;padding-right:16px;border-left:4px solid var(--p1)} +.list li[hidden]{display:none} +.list li.is-done > .body{color:var(--done);text-decoration:line-through} +.done{display:flex;align-items:center;padding-top:3px} +.done input{width:16px;height:16px;margin:0;accent-color:var(--m-accent);cursor:pointer} +.list .star{display:inline-block;font-size:12px;letter-spacing:.04em;padding:0 6px;margin-right:4px;color:#fff;background:var(--p3);vertical-align:1px} +.list .star.s3{background:var(--p1);font-weight:700}.list .star.s2{background:var(--p2)}.list .star.s1{background:var(--p3)} +.list li strong{background:var(--m-accent);color:var(--m-selected-text);font-weight:600;font-size:12px;padding:0 6px} /* 条目里的「有更新」变徽章 */ +.list p strong{font-weight:600;color:var(--m-title)} /* 段落里的粗体(小节说明)只是粗体 */ +.list a{color:var(--link);text-decoration:none}.list a:hover{text-decoration:underline} +.list code.chip{background:var(--chip);color:var(--chip-text);padding:1px 6px;font:inherit;font-size:12.5px} +.list .note{color:var(--m-muted)} + +/* 没有分区时(老内容 / 没有

    )退回整段文章 */ +article{background:var(--m-tile);padding:18px 22px;box-shadow:var(--glass)} +article:empty{display:none} article h2,article h3,article h4,article h5,article h6{margin:18px 0 8px;font-weight:600;color:var(--m-title)} article h2{font-size:20px}article h3{font-size:16px;letter-spacing:.06em;text-transform:uppercase;color:var(--m-muted)} article h3:first-child{margin-top:0} @@ -27,9 +103,10 @@ article code.chip{background:var(--chip);color:var(--chip-text);padding:1px 6px; article .star{font-size:13px;letter-spacing:.05em} article .star.s3{color:var(--p1);font-weight:700}article .star.s2{color:var(--p2)}article .star.s1{color:var(--p3)} article .note{color:var(--m-muted)} + /* 「这次是怎么生成的」:几段折叠块,内容由 reports.trace_sections 渲染 */ -.details{margin-top:14px} -.details details{background:var(--m-tile);margin:0 0 8px;padding:8px 16px;box-shadow:0 4px 14px rgba(0,0,0,.12)} +.details{margin-top:22px} +.details details{background:var(--m-tile);margin:0 0 8px;padding:8px 16px;box-shadow:var(--glass)} .details summary{cursor:pointer;font-weight:600;color:var(--m-title);font-size:14px} .details .d{font-size:13.5px;padding:6px 0 4px} .details .d p{margin:6px 0}.details .d .note{color:var(--m-muted)}.details .d .bad{color:var(--p1)}.details .d .ok{color:#3cb371} @@ -41,11 +118,11 @@ article .note{color:var(--m-muted)} .details .d .srv{color:var(--m-muted);font-size:12px} .details .d pre{white-space:pre-wrap;word-break:break-word;background:var(--chip);color:var(--chip-text);padding:8px 10px;font-size:12.5px;max-height:380px;overflow:auto;margin:4px 0} .details .d a{color:var(--link);text-decoration:none}.details .d a:hover{text-decoration:underline} -.foot{display:flex;align-items:center;gap:14px;margin-top:14px} -.status{flex:1;color:var(--m-muted);font-size:13px;min-height:1.5em}.status.bad{color:var(--p1)} -.btn{background:var(--m-accent);color:var(--m-selected-text);border:0;padding:8px 18px;font:inherit;font-size:14px;cursor:pointer;box-shadow:0 6px 18px rgba(0,0,0,.22)} -.btn:hover{filter:brightness(1.08)}.btn:focus-visible{outline:2px solid var(--m-outline);outline-offset:2px} -.btn:disabled{background:var(--m-tile);color:var(--m-disabled);cursor:default;box-shadow:none} -.btn[hidden]{display:none} -.lost{max-width:860px;margin:10px auto 0;padding:10px 28px;color:var(--p2);font-size:13px} -.lost[hidden]{display:none} + +@media (max-width: 979px){ + .grid{grid-template-columns:minmax(0,1fr)} + .side{position:static;margin-bottom:16px} + .nav{flex-direction:row;overflow-x:auto;padding-bottom:4px} + .tile{flex:0 0 auto;min-width:140px} + .side-title{display:none} +} diff --git a/pet/panorama/page/report.html b/pet/panorama/page/report.html index e5429e1..3d7a775 100644 --- a/pet/panorama/page/report.html +++ b/pet/panorama/page/report.html @@ -8,19 +8,35 @@ -
    -

    - +
    +
    +
    +

    + +
    +
    +
    + + +
    +
    -
    +
    -
    -
    -
    -
    - - +
    + +
    +
    +
    +
    +
    diff --git a/pet/panorama/page/report.js b/pet/panorama/page/report.js index 80d235e..48d89aa 100644 --- a/pet/panorama/page/report.js +++ b/pet/panorama/page/report.js @@ -1,12 +1,18 @@ /* 报告页的脚本(/report/<名字>,现在只有工作简报):取令牌 → 向 /api/report/<名字> 要数据 → 摆到页面上 → 带着编号去「等更新的」(服务把请求挂住,生成开始 / 结束那一刻才回),页面原地重画。 - 页面不认识具体功能:标题、概要、用量、全文、按钮、「这次是怎么生成的」几段都是服务给的字段。全文是服务端渲染好的 HTML(markdown.py 只会产出 - 那几个标签,别的全转义过了),直接放进 article;概要、用量这类纯文字这里转义。 + 页面不认识具体功能:标题、概要、用量、分区、全文、按钮、「这次是怎么生成的」几段都是服务给的字段。 + 分区(sections)有的话:左栏一块块磁贴(点了滚过去)+ 筛选片,右栏每区一张卡(实色磁贴头 + 列表);没有就把整段 + html 放进 article。每张卡里顶层的每一条,进页面后按 items.classify 打上 data-p / data-bug / data-upd,前面插一个勾选框: + 勾掉只存在这个浏览器的 localStorage 里(键 = 生成时间 + 区 + 序号,重新生成就是新的一套),不进肥鱼、不进配置。 + 筛选片多选取并集;「隐藏已勾掉」另算。折叠状态只在内存里,重画时保留。 + 全文、每区的 html 都是服务端渲染好的(markdown.py 只会产出那几个标签,别的全转义过了),直接放进去;概要、用量、标题 + 这类纯文字这里转义。 「重新生成」:POST /api/actions/<动作名> {report};服务回 started 之后不动按钮——生成开始的信号会让页面重画成忙碌, 结束再重画成新内容。回 busy 时按钮保持灰,别的回答把原因写在状态栏、按钮放开。 */ import {esc} from './util.js'; import {takeToken, makeApi} from './client.js'; +import {classify, passes, navTiles, filterChips, card} from './items.js'; (function () { var RETRY_MS = 1000; /* 服务说「这段时间没有新数据」之后隔多久再去等:只为防止出错时空转 */ @@ -14,9 +20,13 @@ import {takeToken, makeApi} from './client.js'; var token = takeToken('report-token').token, api = makeApi(token); var el = function (id) { return document.getElementById(id); }; var revision = 0, waiting = false, dead = false, S = {}; + var filters = [], hideDone = false, collapsed = {}, doneKey = '', done = {}; function lost() { dead = true; waiting = false; el('lost').hidden = false; el('action').disabled = true; } + function load(key) { try { return JSON.parse(localStorage.getItem(key) || '{}') || {}; } catch (e) { return {}; } } + function save(key, value) { try { localStorage.setItem(key, JSON.stringify(value)); } catch (e) { /* 隐私窗口等:勾掉就只在这一次 */ } } + function show(data) { var r = data.report || {}; S = data.strings || {}; @@ -28,16 +38,27 @@ import {takeToken, makeApi} from './client.js'; el('summary').textContent = r.summary || ''; el('summary').hidden = !r.summary; el('usage').innerHTML = (r.usage || []).map(function (u) { return '' + esc(u.text) + ''; }).join(''); - if (r.available === false) el('body').innerHTML = '

    ' + esc(S.report_unavailable) + '

    '; - else if (r.html) el('body').innerHTML = r.html; - else el('body').innerHTML = '

    ' + esc(r.busy ? r.busy_text : r.empty_text) + '

    '; - /* 详情几段也是服务端渲染好的 HTML(reports.trace_sections),第一段默认展开;里面「到设置里改」的占位换成 - 配置全景带令牌的地址(同一个服务、同一个令牌) */ - var settingsUrl = location.origin + '/#' + token + (r.settings_focus ? '&settings=' + encodeURIComponent(r.settings_focus) : ''); - el('details').innerHTML = (r.details || []).map(function (d, i) { - return '' + esc(d.title) + '
    ' + - String(d.html || '').split('__SETTINGS_URL__').join(settingsUrl) + '
    '; - }).join(''); + var sections = r.available === false ? [] : (r.sections || []); + if (sections.length) { + doneKey = 'report-done:' + name + ':' + (r.generated || ''); + done = load(doneKey); + el('side').hidden = false; + el('nav-title').textContent = S.report_sections || ''; + el('filter-title').textContent = S.report_filters || ''; + el('nav').innerHTML = navTiles(sections, S); + el('filters').innerHTML = filterChips(filters, hideDone, S); + el('trace-link').textContent = S.report_trace || ''; + el('trace-link').hidden = !(r.details || []).length; + el('cards').innerHTML = sections.map(function (s) { return card(s, S, !!collapsed[s.id]); }).join(''); + el('body').innerHTML = ''; + enhance(); + } else { + el('side').hidden = true; + el('nav').innerHTML = ''; el('filters').innerHTML = ''; el('cards').innerHTML = ''; + if (r.available === false) el('body').innerHTML = '

    ' + esc(S.report_unavailable) + '

    '; + else if (r.html) el('body').innerHTML = r.html; + else el('body').innerHTML = '

    ' + esc(r.busy ? r.busy_text : r.empty_text) + '

    '; + } el('status').textContent = r.busy ? r.busy_text : (r.error || ''); el('status').className = 'status' + (r.error && !r.busy ? ' bad' : ''); var btn = el('action'); @@ -49,9 +70,74 @@ import {takeToken, makeApi} from './client.js'; btn.dataset.name = r.action.name; btn.dataset.report = r.action.report; } else btn.hidden = true; + /* 详情几段也是服务端渲染好的 HTML(reports.trace_sections),第一段默认展开;里面「到设置里改」的占位换成 + 配置全景带令牌的地址(同一个服务、同一个令牌) */ + var settingsUrl = location.origin + '/#' + token + (r.settings_focus ? '&settings=' + encodeURIComponent(r.settings_focus) : ''); + el('details').innerHTML = (r.details || []).map(function (d, i) { + return '' + esc(d.title) + '
    ' + + String(d.html || '').split('__SETTINGS_URL__').join(settingsUrl) + '
    '; + }).join(''); revision = data.revision; } + /* 每张卡里顶层的每一条:分类、勾选框、正文包进 .body;然后按当前筛选显示 / 隐藏 */ + function enhance() { + var items = el('cards').querySelectorAll('.card > .list > ul > li, .card > .list > ol > li'); + Array.prototype.forEach.call(items, function (li, i) { + var section = li.closest('.card').id, key = section + ':' + i, c = classify(li.innerHTML, li.className); + li.dataset.key = key; li.dataset.p = c.p; li.dataset.bug = c.bug ? '1' : '0'; li.dataset.upd = c.upd ? '1' : '0'; + var body = document.createElement('div'); body.className = 'body'; + while (li.firstChild) body.appendChild(li.firstChild); + var box = document.createElement('label'); box.className = 'done'; box.title = S.report_done || ''; + var input = document.createElement('input'); input.type = 'checkbox'; input.checked = !!done[key]; + input.addEventListener('change', function () { + if (input.checked) done[key] = 1; else delete done[key]; + save(doneKey, done); + apply(); + }); + box.appendChild(input); li.appendChild(box); li.appendChild(body); + }); + apply(); + } + + function apply() { + var items = el('cards').querySelectorAll('li[data-key]'); + Array.prototype.forEach.call(items, function (li) { + var isDone = !!done[li.dataset.key]; + li.classList.toggle('is-done', isDone); + li.hidden = !passes({p: +li.dataset.p, bug: li.dataset.bug === '1', upd: li.dataset.upd === '1', done: isDone}, filters, hideDone); + }); + } + + el('filters').addEventListener('click', function (event) { + var chip = event.target.closest ? event.target.closest('.chip') : null; + if (chip) { + var f = chip.dataset.f; + if (!f) filters = []; + else if (filters.indexOf(f) >= 0) filters.splice(filters.indexOf(f), 1); + else filters.push(f); + el('filters').innerHTML = filterChips(filters, hideDone, S); + apply(); + } + }); + el('filters').addEventListener('change', function (event) { + if (event.target && event.target.id === 'hide-done') { hideDone = !!event.target.checked; apply(); } + }); + el('nav').addEventListener('click', function (event) { + var tile = event.target.closest ? event.target.closest('[data-go]') : null; + if (!tile) return; + event.preventDefault(); + var target = el(tile.dataset.go); + if (target) target.scrollIntoView({behavior: 'smooth', block: 'start'}); + }); + el('cards').addEventListener('click', function (event) { + var fold = event.target.closest ? event.target.closest('[data-fold]') : null; + if (!fold) return; + var id = fold.dataset.fold, section = el(id); + collapsed[id] = !collapsed[id]; + if (section) { section.dataset.collapsed = collapsed[id] ? '1' : ''; fold.textContent = collapsed[id] ? '▸' : '▾'; fold.setAttribute('aria-expanded', !collapsed[id]); } + }); + function listen() { /* 同一时刻只挂一个请求;标签页藏着或连接已断就不挂 */ if (waiting || dead || document.visibilityState !== 'visible') return; waiting = true; diff --git a/pet/panorama/render.py b/pet/panorama/render.py index ff29be3..6046a68 100644 --- a/pet/panorama/render.py +++ b/pet/panorama/render.py @@ -31,7 +31,7 @@ #: 报告页没有离线快照,所以这几个模块不进 ``MODULES``(``report.js`` 是会自己跑起来的入口,不能拼进全景的脚本里)。 REPORT_SHELL = "report.html" REPORT_STYLES = ("tokens.css", "report.css") -REPORT_MODULES = ("util.js", "client.js", "report.js") +REPORT_MODULES = ("util.js", "client.js", "items.js", "report.js") REPORT_SCRIPT_TAG = '' #: 页面脚本的原生模块,**按依赖顺序**:被 import 的排在前面,入口 ``boot.js`` 在最后。 #: 本机服务把它们一个个发出去,浏览器按 import 自己装配;离线快照没法这样(``file://`` 页面加载不了模块), @@ -59,7 +59,9 @@ "err_rejected", "err_out_of_range"))) #: 报告页自己的几句界面文字(随数据一起给:外壳是公开的静态文件,只带标题和「连接断了」) REPORT_KEYS = ("report_lost", "report_unavailable", "report_action_started", "report_action_busy", "report_action_failed", - "report_action_lost") + "report_action_lost", "report_sections", "report_filters", "report_filter_all", "report_filter_p3", + "report_filter_p2", "report_filter_p1", "report_filter_bug", "report_filter_upd", "report_hide_done", + "report_items", "report_untitled", "report_fold", "report_trace", "report_done") NODE_STATE_KEYS = ("live", "ok", "warn", "bad", "unknown", "off", "info") EDGE_STATE_KEYS = ("live", "ok", "warn", "broken", "unknown", "off") diff --git a/pet/panorama/reports.py b/pet/panorama/reports.py index c558f79..a3afbf6 100644 --- a/pet/panorama/reports.py +++ b/pet/panorama/reports.py @@ -10,6 +10,9 @@ - ``busy`` / ``busy_text`` / ``empty_text`` / ``error``(上一次失败的原因,已翻成整句); - ``action``:底部那个按钮——``{name, report, label, hint}``,页面 ``POST /api/actions/`` 时把 ``report`` 带回来; - ``available``:这台机器上有没有这项功能(工作简报要 WSL;没有就只显示一句说明); +- ``sections``:全文按 ``

    `` 切成的几区 ``{id, source, title, html, count, p3, p2, p1, bugs, updated}``(``split_sections``): + 页面用它画左栏的分区磁贴和右栏的每区一张卡;``source`` 只是按标题猜的来源(配色、图标用),猜不到是 ``other``。 + 没有 ``

    `` 的内容是空列表,页面退回整段 ``html``; - ``details``:「这次是怎么生成的」——几段 ``{title, html}``(服务端渲染、全部转义),页面折叠着摆在全文下面; ``settings_focus``:详情里「到设置里改」的链接要翻到配置全景的哪一组(页面自己拼带令牌的地址,替换 ``SETTINGS_URL`` 占位)。 @@ -19,6 +22,7 @@ import datetime as dt import html +import re from typing import Callable from .. import work_briefing as wb @@ -29,6 +33,12 @@ GENERATE_ACTION = "generate_report" # 页面上「重新生成」走的动作名(actions.generate_report) USAGE_ORDER = ("model", "effort", "time", "tokens_in", "tokens_out", "cost") SETTINGS_URL = "__SETTINGS_URL__" # 详情 HTML 里的占位:页面换成 /#<令牌>&settings=<组> +#: 分区标题里的关键词 → 来源 id(只用来配色和图标;提示词模板是用户可改的,所以按词猜,猜不到就是 other) +SOURCE_WORDS = (("jira", ("jira", "工单")), ("pr", ("pull request", "pr")), ("slack", ("slack",)), + ("calendar", ("日程", "日历", "calendar", "schedule", "meeting")), ("email", ("邮件", "email", "mail")), + ("suggestions", ("建议", "suggest", "first"))) +_H3 = re.compile(r"

    (.*?)

    \n?", re.S) +_TAG = re.compile(r"<[^>]+>") _STATUSES = ("connected", "needs-auth", "failed") @@ -42,7 +52,7 @@ def build() -> dict: "busy": False, "busy_text": t("briefing.busy"), "empty_text": t("briefing.empty"), "error": "", "action": {"name": GENERATE_ACTION, "report": WORK_BRIEFING, "label": t("briefing.button.regenerate"), "hint": t("briefing.button.regenerate_hint")}, - "details": [], "settings_focus": WORK_BRIEFING, + "details": [], "settings_focus": WORK_BRIEFING, "sections": [], } if service is None: return data @@ -51,8 +61,9 @@ def build() -> dict: data["error"] = t("briefing.status.failed", error=error) if error else "" briefing = service.latest() if briefing is not None: + rendered = markdown.render(briefing.markdown, bug_mark=wb.BUG_MARK) data.update(summary=briefing.summary, generated=generated_line(briefing.generated_at), usage=usage(briefing), - html=markdown.render(briefing.markdown, bug_mark=wb.BUG_MARK)) + html=rendered, sections=split_sections(rendered)) data["details"] = trace_sections(getattr(service, "last_trace", dict)() or {}) return data return build @@ -88,6 +99,50 @@ def usage(briefing: wb.Briefing) -> list[dict]: for text, tip in [values.get(key, ("", ""))] if text] +def source_of(title: str) -> str: + """分区标题 → 来源 id(``SOURCE_WORDS`` 的第一个命中;都不中是 ``other``)。""" + low = title.lower() + return next((source for source, words in SOURCE_WORDS if any(word in low for word in words)), "other") + + +def split_sections(rendered: str) -> list[dict]: + """渲染好的全文按 ``

    ``(Markdown 的 ``##``)切区,每区数一数顶层的条目:总数、三档优先级、bug、有更新。 + + 计数只看 ``markdown.render`` 产出的那几种标记:每行一个元素,``
      `` / ``
        `` 进一层、``
    `` / ```` 出一层, + 第一层的 ```` 是「有更新」。 + 第一个 ``

    `` 之前的文字(如果有)算一区,标题空、来源 other。没有 ``

    `` 就是空列表。 + """ + if "

    " not in rendered: + return [] + sections: list[dict] = [] + pieces = re.split(r"(?=

    )", rendered) + for piece in pieces: + if not piece.strip(): + continue + heading = _H3.match(piece) + title = _TAG.sub("", heading.group(1)).strip() if heading else "" + body = piece[heading.end():] if heading else piece + counts = {"count": 0, "p3": 0, "p2": 0, "p1": 0, "bugs": 0, "updated": 0} + depth = 0 + for line in body.split("\n"): + if line.startswith(("
      ", "
        ")): + depth += 1 + elif line.startswith(("
    ", "")): + depth -= 1 + elif line.startswith("" in line: + counts["updated"] += 1 + sections.append({"id": f"s{len(sections) + 1}", "source": source_of(title) if title else "other", "title": title, + "html": body.strip("\n"), **counts}) + return sections + + def _when(iso: str) -> str: try: return f"{dt.datetime.fromisoformat(iso):%m-%d %H:%M}" diff --git a/tests/test_panorama_markdown.py b/tests/test_panorama_markdown.py index d6e14db..b0ada7a 100644 --- a/tests/test_panorama_markdown.py +++ b/tests/test_panorama_markdown.py @@ -38,6 +38,12 @@ def test_inline_code_becomes_a_chip_and_bold_is_bold(): assert '进行中' in out and "今天" in out +def test_link_text_may_carry_one_level_of_square_brackets(): + html = md.render("- 16:00 [[Daily] churn check](https://cal.example/e?id=1&x=2)(提醒)") + assert '[Daily] churn check(提醒)' in html + assert md.render("[[a]](https://x.example/)").count("工单' in out diff --git a/tests/test_panorama_report_page.py b/tests/test_panorama_report_page.py index 9388f61..6585af2 100644 --- a/tests/test_panorama_report_page.py +++ b/tests/test_panorama_report_page.py @@ -244,7 +244,8 @@ def engine(): summary: el('summary').textContent, summaryHidden: el('summary').hidden, usage: el('usage').innerHTML, body: el('body').innerHTML, status: el('status').textContent, statusClass: el('status').className, button: el('action').textContent, buttonHidden: el('action').hidden, buttonDisabled: el('action').disabled, lost: el('lost').hidden, theme: document.documentElement.dataset.theme, title_tag: document.title, - details: el('details').innerHTML}; }; + details: el('details').innerHTML, nav: el('nav').innerHTML, filters: el('filters').innerHTML, cards: el('cards').innerHTML, + sideHidden: el('side').hidden, navTitle: el('nav-title').textContent}; }; var clicks = {}; document.getElementById('action').addEventListener = function (type, fn) { clicks[type] = fn; }; """ @@ -286,6 +287,44 @@ def test_the_run_record_is_laid_out_as_collapsible_sections_with_the_settings_li assert _page(engine, [_ok(_payload()), '{"hang": true}'])["dom"]["details"] == "", "没有记录就什么都不摆" +SECTIONS = [{"id": "s1", "source": "jira", "title": "Jira ", "html": "
      \n
    • a
    • \n
    ", "count": 2, "p3": 1, "p2": 0, "p1": 1, "bugs": 1, "updated": 0}, + {"id": "s2", "source": "other", "title": "", "html": "

    x

    ", "count": 0, "p3": 0, "p2": 0, "p1": 0, "bugs": 0, "updated": 3}] + + +def test_sections_become_nav_tiles_filter_chips_and_cards_and_the_article_stays_empty(engine): + out = _page(engine, [_ok(_payload(sections=SECTIONS)), '{"hang": true}']) + dom = out["dom"] + assert dom["sideHidden"] is False and dom["navTitle"] == "分区" and dom["body"] == "" + assert dom["nav"] == ('Jira <x>2 条' + '(无标题)0 条') + assert dom["filters"].startswith('') + assert '' in dom["filters"] and 'id="hide-done"' in dom["filters"] + assert dom["cards"] == ('

    Jira <x>

    2 条' + '★★★ 1🐞 1' + '
    ' + '
      \n
    • a
    • \n
    ' + '

    (无标题)

    0 条' + '有更新 3' + '
    ' + '

    x

    ') + plain = _page(engine, [_ok(_payload()), '{"hang": true}'])["dom"] + assert plain["sideHidden"] is True and plain["cards"] == "" and plain["body"] == "

    A

    ", "没有分区:退回整段文章" + + +def test_item_classification_and_filtering_are_pure(engine): + out = _evaluate(engine, FAKE_DOM + FAKE_BROWSER + REPORT_DOM + render.bundle(("util.js", "items.js")) + + "\nreturn JSON.stringify({bug: classify('★★★ 🐞 x · 有更新', 'bug')," + " plain: classify('no stars here', ''), two: classify(' ★★ y', 'other')," + " all: passes({p: 1, bug: false, upd: false, done: false}, [], false)," + " p3only: passes({p: 1, bug: false, upd: false, done: false}, ['p3'], false)," + " union: passes({p: 1, bug: true, upd: false, done: false}, ['p3', 'bug'], false)," + " upd: passes({p: 0, bug: false, upd: true, done: true}, ['upd'], false)," + " hidden: passes({p: 3, bug: true, upd: true, done: true}, [], true)});") + assert out["bug"] == {"p": 3, "bug": True, "upd": True} and out["plain"] == {"p": 0, "bug": False, "upd": False} + assert out["two"] == {"p": 2, "bug": False, "upd": False} + assert out["all"] is True and out["p3only"] is False and out["union"] is True and out["upd"] is True and out["hidden"] is False + + def test_busy_empty_unavailable_and_error_states(engine): busy = _page(engine, [_ok(_payload(html="", summary="", busy=True)), '{"hang": true}'])["dom"] assert busy["body"] == '

    忙

    ' and busy["status"] == "忙" and busy["buttonDisabled"] is True and busy["summaryHidden"] is True diff --git a/tests/test_panorama_reports.py b/tests/test_panorama_reports.py index fff0336..9db39e7 100644 --- a/tests/test_panorama_reports.py +++ b/tests/test_panorama_reports.py @@ -93,11 +93,33 @@ def test_a_failed_run_is_marked_and_a_service_without_a_record_gives_no_sections assert plain["details"] == [], "老版本生成的简报:没有记录就不摆" +RENDERED = ("

    开场白

    \n

    Jira

    \n
      \n" + '
    • ★★★ 🐞 X-1 崩溃 · 有更新\n' + "
        \n
      • QA 报的场景:…
      • \n
      \n
    • \n" + '
    • ★★ X-2 普通
    • \n' + '
    • ★ X-3 小事 · 有更新
    • \n
    \n' + "

    日程

    \n

    今天没有会。

    \n

    建议先做

    \n
      \n
    1. 先修 X-1
    2. \n
    ") + + +def test_the_rendered_text_is_split_into_sections_with_top_level_counts(): + sections = reports.split_sections(RENDERED) + assert [(s["id"], s["source"], s["title"], s["count"]) for s in sections] == [ + ("s1", "other", "", 0), ("s2", "jira", "Jira", 3), ("s3", "calendar", "日程", 0), ("s4", "suggestions", "建议先做", 1)] + jira = sections[1] + assert (jira["p3"], jira["p2"], jira["p1"], jira["bugs"], jira["updated"]) == (1, 1, 1, 1, 2), "嵌套的那一条不算" + assert jira["html"].startswith("
      ") and jira["html"].endswith("
    ") and sections[0]["html"] == "

    开场白

    " + assert sections[2]["html"] == "

    今天没有会。

    " and sections[3]["p3"] == 0 + assert reports.split_sections("

    没有标题的内容

    ") == [] and reports.split_sections("") == [] + assert reports.source_of("Pull requests") == "pr" and reports.source_of("Slack 消息") == "slack" and reports.source_of("邮件") == "email" + assert reports.source_of("随便") == "other" + + def test_the_latest_briefing_is_rendered_with_its_usage_and_a_regenerate_button(): data = reports.work_briefing(lambda: _Service(BRIEFING), _config())() assert data["id"] == "work_briefing" and data["title"] == "工作简报" and data["available"] is True and data["theme"] == "dark" assert data["summary"] == "先评审两个 PR" and data["generated"].startswith("生成于 11-19 09:00") assert data["html"].startswith("

    PR

    ") and 'class="star s3"' in data["html"] and '进行中' in data["html"] + assert [(s["source"], s["title"], s["count"], s["p3"]) for s in data["sections"]] == [("pr", "PR", 1, 1)] assert [u["key"] for u in data["usage"]] == ["model", "effort", "time", "tokens_in", "tokens_out", "cost"] assert data["usage"][0]["text"] == "claude-opus-5-5" and data["usage"][2]["text"] == "118 秒" assert data["usage"][3]["tip"] == "输入 406,791 tokens" and "1.25" in data["usage"][5]["text"]