diff --git a/CHANGELOG.md b/CHANGELOG.md index f722ba0..c32ad9c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ ## 2026-11 +- 11-20 简报页多了「这次是怎么生成的」:链路(WSL 里的 Claude Code 版本、模型、权限模式)、每个相关 MCP 服务器的状态和这次用没用到(没登录的直接给登录命令)、每次工具调用、那个账号跑的 hooks、完整命令和提示词原文;失败的那次也留。设置里新增「额外放行的工具」:连接器换了名字时自己补一行,不用等改代码 - 11-19 工作简报改在浏览器里看:岛上的小文档按钮、早上提醒的「查看」、右键「查看最近一份」都打开配置全景服务的简报页(概要、用量、全文、「重新生成」,生成中页面自己更新)。右键菜单里的「生成时间」子菜单拿掉,换成「简报设置…」翻到配置全景;笔记 / Slack 关注仍在原来的窗口里 - 11-19 配置全景的待处理里,「联动开着但没有 hooks」那一条有了「修复」按钮:确认一次就把 hooks 装回去,图上那条断线随即变回来(WSL 那条在后台装,装完自己更新)。从页面或设置进程关掉联动通道时,肥鱼自己装的 hooks 也会一起卸掉,和右键菜单关闭一样 - 11-19 Claude Code 联动、会话小鱼、「最近的对话」的设置搬到了配置全景(四块磁贴各带「设置」)。「最近的对话」最多留几天 / 几条这两项以前只能手改 config.json,现在也能改了。右键「Agent 联动」里只剩开关:上限 / 保留天数 / 配色 / 字号 / 桂冠 / 行数那六个子菜单换成一条「会话小鱼设置…」 diff --git a/docs/config-panorama.md b/docs/config-panorama.md index 1ed64e0..a39bb9f 100644 --- a/docs/config-panorama.md +++ b/docs/config-panorama.md @@ -314,7 +314,10 @@ flowchart LR - **登记**:应用构造 `PanoramaService` 时传 `reports={"work_briefing": provider}`(`reports.py`)。provider 在**界面线程**上被调 (它读 Qt 对象),返回固定字段的字典:`title / theme / summary / generated / usage[] / html / busy / busy_text / empty_text / - error / action{name, report, label, hint} / available`。页面(`report.js`)只按字段摆,不认识功能。 + error / action{name, report, label, hint} / available / details[] / settings_focus`。页面(`report.js`)只按字段摆,不认识功能。 + `details` 是「这次是怎么生成的」那几段 `{title, html}`(服务端渲染、全部转义,见[公司侧助理](work-assistant.md)的 + 「运行记录」),页面折叠着摆在全文下面、第一段默认展开;里面的 `__SETTINGS_URL__` 占位由页面换成 + `/#<令牌>&settings=`(同一个服务、同一个令牌)。 - **数据怎么到页面**:每份报告自己一个 `Feed`。第一次 `GET /api/report/<名字>` 时还没发布过,请求线程经 `on_gui` 让界面线程做一份 (`publish_report(force=True)`);之后页面带编号等更新。简报服务 `started` / `finished` 时应用调 `publish_report(name)`—— **没人打开过页面就什么都不做**(provider 不白跑)。`report_watched(name)` = 有请求挂在那份报告上 = 用户正开着看, diff --git a/docs/work-assistant.md b/docs/work-assistant.md index 6c6496c..1ad84a1 100644 --- a/docs/work-assistant.md +++ b/docs/work-assistant.md @@ -9,7 +9,7 @@ | 文件 | 职责 | |---|---| -| `pet/work_briefing.py` | 零 Qt。配置 `normalize`、`is_due`、放行 / 拒绝名单、`claude_command`、`pr_command` / `format_pull_requests`、提示词模板与 `render_template`、`parse_output`、`linkify`、状态文件 | +| `pet/work_briefing.py` | 零 Qt。配置 `normalize`、`is_due`、放行 / 拒绝名单(含设置里的 `extra_allowed_tools`)、`claude_command`、`pr_command` / `format_pull_requests`、提示词模板与 `render_template`、`parse_output`、`parse_trace`(运行记录)、`linkify`、状态文件 | | `pet/work_briefing_service.py` | `WorkBriefingService`:每分钟 `check()`,到点在 daemon 线程里 `generate`,信号排队回 GUI 线程落盘 | | `pet/work_briefing_ui.py` | `WorkBriefingController`(提醒气泡、岛按钮状态、`tab_providers`;「查看」开浏览器里的简报页)、`WorkBriefingWindow`(Metro 窗口壳:笔记 / Slack 关注 / 个人助理还在用;工作简报的那一页 2026-11-19 起不再加进去) | | `pet/panorama/reports.py` / `markdown.py` | 浏览器里的简报页:把 `WorkBriefingService` 的最近一份翻成页面数据,Markdown → HTML。见[配置全景](config-panorama.md)「报告页」 | @@ -60,8 +60,10 @@ flowchart LR ### 那一行命令(三个功能共用,红线) -`cd ~ && BIG_FAT_FISH_HEADLESS=1 claude -p --model … --effort … --output-format json --no-session-persistence +`cd ~ && BIG_FAT_FISH_HEADLESS=1 claude -p --model … --effort … --output-format stream-json --verbose --no-session-persistence --max-turns N --tools '' --allowedTools … --disallowedTools …`,经 `wsl.exe -e bash -lc` 跑,提示词从标准输入进去。 +`stream-json`(2026-11-19 起):一行一个事件——`init` 里有每个 MCP 服务器的名字 / 状态和工具清单,之后每次工具调用一行, +最后一行才是结果;`_result_record` 只认带 `result` 键的那一行,所以共用这行命令的工作笔记不用改解析。 - **权限三层,缺一层都不算只读**:① 无界面模式下没放行的工具一律被拒;② `--tools ''` 让内置工具(Bash、读写文件)整个 不存在,那个账号自己设置里放行过的 Bash 规则也就无从生效;③ 写入类连接器工具**点名拒绝**(`_WRITE_TOOLS`,外加整个网盘 @@ -73,10 +75,31 @@ flowchart LR stdio 型服务器,插件的 HTTP OAuth 服务器不出现(2026-11-19 在 2.1.329 上实测,上游 anthropics/claude-code#36309): 实际在用的是连接器那一套,插件前缀留着只为将来它修好;连接器要重新登录时按[排障手册](troubleshooting.md)的 「无界面 `claude -p` 里的连接器」一节做,重新认证插件没有用。 +- **额外放行的工具**(设置 `extra_allowed_tools`,一行一个全名或 `mcp__服务器__*` 前缀)接在内置名单后面,拒绝名单仍压过它。 + 用途:连接器换了名字 / 多了一条(例如 `claude.ai Atlassian MCP` → `mcp__claude_ai_Atlassian_MCP__…`)时用户自己补一行。 + 也会拼进 shell 命令,所以 `normalize_tools` 只认 `mcp__` 开头、字母数字和 `. _ -`、`*` 只能在末尾,坏行丢掉。 - **模型名和 effort 会拼进 shell 命令**:`normalize_model` 只认字母数字和 `. _ -`,`normalize_effort` 只认四档,其余退回默认。 effort 显式传,是因为结果 JSON 不报它。 - 用登录 shell(`-l`):`claude` 通常在 `~/.local/bin`,由 `~/.profile` 加进 `PATH`。不用交互 shell(`-i`)。 - `--no-session-persistence`:这次运行不在那个账号的会话列表里留一条。 + +### 运行记录:这次是怎么生成的 + +简报本来是个黑盒(只剩一段正文);2026-11-19 起每次尝试都留一份运行记录(`work_briefing.parse_trace` + `generate` 填的几项), +存在 `work-briefing.json` 的 `trace` 键下(每次尝试都换,**失败的也留**——失败时最想看的就是它;简报本体里不带,免得存两遍), +简报页在全文下面折叠着摆出来(`reports.trace_sections`): + +- **链路**:肥鱼 → WSL → Claude Code 版本(`init.claude_code_version`)· 实际模型 · 权限模式 · 轮数 → MCP 服务器。 +- **服务器表**:只列和简报有关的——放行名单覆盖到的(按 Claude Code 的命名规则 `mcp__<服务器名>__…`,名字里非字母数字的字符 + 换成 `_`,`server_slug`)或这次真调过的;每行:名字 · 状态(已连接 / 没登录 / 连不上)· 这次调了几次 / 放行了没用到 / + 没放行但用到了。没登录的那行直接给修法(`claude mcp login "<名字>"`)。其余只数个数。另有一句「放行名单 N 条,这次实际存在 + 的工具 M 个」:放行了不存在的名字没有任何效果,这里看得出来。 +- **工具调用**:每次 `tool_use` 一行——短名、服务器、参数摘要(每个值 80 字、整行 200 字)、✓ / ✗(由对应 `tool_result` 的 + `is_error` 定);结果里的 `permission_denials` 另列。 +- **那个账号的 hooks**(`hook_started` 事件的名字去重)、**命令**(gh 那两条 + claude 那一行)、**提示词原文**(带 + 「到设置里改模板」的链接:页面把 `__SETTINGS_URL__` 占位换成配置全景带令牌的地址)。 +- 隐私同简报正文:提示词里有 PR 列表,整份记录只在本地状态文件里、只经带令牌的接口给本机浏览器,不进日志、不进快照。 +- 老版本生成的简报没有这份记录:页面上什么都不摆。 - `BIG_FAT_FISH_HEADLESS`(`claude_hooks.HEADLESS_ENV`):sh 版 hook 脚本读到它非空就直接返回,什么都不上报,所以这次运行 不冒[会话小鱼](session-fish.md);会话存活探测也经 `/proc//environ` 认它。普通的 Claude Code 会话照常上报。 [会话记忆蒸馏](memory-distill.md)的公司侧走的也是这条通道。 diff --git a/pet/locale/en.json b/pet/locale/en.json index fcf62f8..2d9a8a8 100644 --- a/pet/locale/en.json +++ b/pet/locale/en.json @@ -1613,6 +1613,29 @@ "settings.distill_work.prompt_en": "Work-side distill prompt (used when the interface is English)", "briefing.settings.priority_rules": "Priority preferences", "briefing.settings.priority_rules_hint": "Claude rates every line ★★★ / ★★ / ★. Write your own rules here (e.g. “bugs reported by QA are always ★★★”, “documentation issues at most ★”); they are appended to the prompt as “my priority preferences”. Leave empty to let it judge alone.", + "briefing.settings.extra_tools": "Extra allowed tools", + "briefing.settings.extra_tools_hint": "One per line: a full tool name (mcp__server__tool) or a prefix ending in * (e.g. mcp__claude_ai_Atlassian_MCP__*). The source toggles allow the built-in list; add a line here when a connector is renamed or a new one appears, without waiting for a code change. Only names starting with mcp__ with letters, digits and . _ - are accepted; the deny list still wins. The briefing page's “How this run went” shows every server's real name, status and whether it was used.", + "briefing.trace.section": "How this run went ({when}{state})", + "briefing.trace.failed_mark": " · failed", + "briefing.trace.chain": "Fish → WSL → Claude Code {version} ({model} · permission mode {mode} · {turns} turns) → MCP servers:", + "briefing.trace.status.connected": "connected", + "briefing.trace.status.needs_auth": "not logged in", + "briefing.trace.status.failed": "unreachable", + "briefing.trace.used": "called {n} times", + "briefing.trace.allowed_unused": "allowed, not used this time", + "briefing.trace.not_allowed": "not allowed, yet used this time", + "briefing.trace.needs_auth": "Log in: run claude mcp login \"{name}\" in WSL, then regenerate", + "briefing.trace.no_servers": "This run reported no MCP servers", + "briefing.trace.others": "{n} more MCP servers are unrelated to the briefing (not allowed, not used)", + "briefing.trace.tools_present": "{allowed} allow-list entries; {present} tools actually existed this time (allowing a name that does not exist has no effect)", + "briefing.trace.calls": "Tool calls ({n})", + "briefing.trace.no_calls": "No tool was called", + "briefing.trace.denied": "Refused: {names}", + "briefing.trace.hooks": "That account's own hooks", + "briefing.trace.no_hooks": "No hooks ran", + "briefing.trace.command": "Command (run by the fish in the WSL login shell)", + "briefing.trace.prompt": "Prompt (exactly as sent)", + "briefing.trace.edit_template": "Edit the template in settings", "briefing.settings.section": "Work briefing", "settings.moved.title": "Where the settings are", "settings.moved.hint": "The {name} settings moved to Config panorama; change them there.", diff --git a/pet/locale/zh.json b/pet/locale/zh.json index 4b6fe5f..9b719f4 100644 --- a/pet/locale/zh.json +++ b/pet/locale/zh.json @@ -1605,6 +1605,29 @@ "settings.distill_work.prompt_en": "公司侧蒸馏提示词(界面是英文时用)", "briefing.settings.priority_rules": "优先级偏好", "briefing.settings.priority_rules_hint": "简报里每条前面的 ★★★ / ★★ / ★ 由 Claude 判断;在这里写你的规矩(例如「QA 报的 bug 一律 ★★★」「文档类工单最多 ★」),会作为「我的优先级偏好」追加进提示词。留空 = 全凭它判断。", + "briefing.settings.extra_tools": "额外放行的工具", + "briefing.settings.extra_tools_hint": "一行一个:工具全名(mcp__服务器__工具)或以 * 结尾的前缀(例如 mcp__claude_ai_Atlassian_MCP__*)。来源开关放行的是内置名单;连接器换了名字、多了一条时在这里补,不用等改代码。只认 mcp__ 开头、字母数字和 . _ -;拒绝名单仍压过放行。简报页「这次是怎么生成的」里能看到每个服务器实际的名字、状态和这次用没用到。", + "briefing.trace.section": "这次是怎么生成的({when}{state})", + "briefing.trace.failed_mark": " · 失败", + "briefing.trace.chain": "肥鱼 → WSL → Claude Code {version}({model} · 权限模式 {mode} · {turns} 轮)→ MCP 服务器:", + "briefing.trace.status.connected": "已连接", + "briefing.trace.status.needs_auth": "没登录", + "briefing.trace.status.failed": "连不上", + "briefing.trace.used": "这次调了 {n} 次", + "briefing.trace.allowed_unused": "放行了,这次没用到", + "briefing.trace.not_allowed": "没放行,但这次用到了", + "briefing.trace.needs_auth": "要登录:在 WSL 里跑 claude mcp login \"{name}\",再重新生成", + "briefing.trace.no_servers": "这次运行没有报告任何 MCP 服务器", + "briefing.trace.others": "另有 {n} 个 MCP 服务器与简报无关(没放行、也没用到)", + "briefing.trace.tools_present": "放行名单 {allowed} 条;这次实际存在的工具 {present} 个(放行了不存在的名字没有任何效果)", + "briefing.trace.calls": "工具调用({n} 次)", + "briefing.trace.no_calls": "没有调用任何工具", + "briefing.trace.denied": "被拒的:{names}", + "briefing.trace.hooks": "那个账号自己的 hooks", + "briefing.trace.no_hooks": "没有 hooks 运行", + "briefing.trace.command": "命令(肥鱼在 WSL 登录 shell 里跑的)", + "briefing.trace.prompt": "提示词(发出去的原文)", + "briefing.trace.edit_template": "到设置里改模板", "briefing.settings.section": "工作简报", "settings.moved.title": "设置在哪", "settings.moved.hint": "「{name}」的设置搬到配置全景了,在那里改。", diff --git a/pet/panorama/page/report.css b/pet/panorama/page/report.css index 542ee50..335ccd1 100644 --- a/pet/panorama/page/report.css +++ b/pet/panorama/page/report.css @@ -27,6 +27,20 @@ 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 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} +.details .d table.servers{border-collapse:collapse;width:100%;margin:6px 0} +.details .d td{padding:3px 10px 3px 0;vertical-align:top;border-bottom:1px solid rgba(128,128,128,.18)} +.details .d td.st{white-space:nowrap}.details .d td.st.connected{color:#3cb371}.details .d td.st.needs-auth{color:var(--p2)}.details .d td.st.failed{color:var(--p1)} +.details .d ol.calls{margin:4px 0;padding-left:24px}.details .d ol.calls li{margin:3px 0} +.details .d code{background:var(--chip);color:var(--chip-text);padding:1px 6px;font-size:12.5px} +.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)} diff --git a/pet/panorama/page/report.html b/pet/panorama/page/report.html index 9a5b5a8..e5429e1 100644 --- a/pet/panorama/page/report.html +++ b/pet/panorama/page/report.html @@ -17,6 +17,7 @@

+
diff --git a/pet/panorama/page/report.js b/pet/panorama/page/report.js index 2ec79c4..80d235e 100644 --- a/pet/panorama/page/report.js +++ b/pet/panorama/page/report.js @@ -1,7 +1,7 @@ /* 报告页的脚本(/report/<名字>,现在只有工作简报):取令牌 → 向 /api/report/<名字> 要数据 → 摆到页面上 → 带着编号去「等更新的」(服务把请求挂住,生成开始 / 结束那一刻才回),页面原地重画。 - 页面不认识具体功能:标题、概要、用量、全文、按钮都是服务给的字段。全文是服务端渲染好的 HTML(markdown.py 只会产出 + 页面不认识具体功能:标题、概要、用量、全文、按钮、「这次是怎么生成的」几段都是服务给的字段。全文是服务端渲染好的 HTML(markdown.py 只会产出 那几个标签,别的全转义过了),直接放进 article;概要、用量这类纯文字这里转义。 「重新生成」:POST /api/actions/<动作名> {report};服务回 started 之后不动按钮——生成开始的信号会让页面重画成忙碌, 结束再重画成新内容。回 busy 时按钮保持灰,别的回答把原因写在状态栏、按钮放开。 */ @@ -11,7 +11,7 @@ import {takeToken, makeApi} from './client.js'; (function () { var RETRY_MS = 1000; /* 服务说「这段时间没有新数据」之后隔多久再去等:只为防止出错时空转 */ var name = location.pathname.split('/').pop(); - var api = makeApi(takeToken('report-token').token); + 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 = {}; @@ -31,6 +31,13 @@ import {takeToken, makeApi} from './client.js'; 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(''); el('status').textContent = r.busy ? r.busy_text : (r.error || ''); el('status').className = 'status' + (r.error && !r.busy ? ' bad' : ''); var btn = el('action'); diff --git a/pet/panorama/reports.py b/pet/panorama/reports.py index b9d5142..c558f79 100644 --- a/pet/panorama/reports.py +++ b/pet/panorama/reports.py @@ -9,13 +9,16 @@ ``{key, text, tip}``)、``html``(全文,Markdown 已由 ``markdown.py`` 渲染成只含几个标签的 HTML); - ``busy`` / ``busy_text`` / ``empty_text`` / ``error``(上一次失败的原因,已翻成整句); - ``action``:底部那个按钮——``{name, report, label, hint}``,页面 ``POST /api/actions/`` 时把 ``report`` 带回来; -- ``available``:这台机器上有没有这项功能(工作简报要 WSL;没有就只显示一句说明)。 +- ``available``:这台机器上有没有这项功能(工作简报要 WSL;没有就只显示一句说明); +- ``details``:「这次是怎么生成的」——几段 ``{title, html}``(服务端渲染、全部转义),页面折叠着摆在全文下面; + ``settings_focus``:详情里「到设置里改」的链接要翻到配置全景的哪一组(页面自己拼带令牌的地址,替换 ``SETTINGS_URL`` 占位)。 隐私:报告内容只经带令牌的接口给本机浏览器,不落离线快照、不进日志(本机服务只记请求行)。 """ from __future__ import annotations import datetime as dt +import html from typing import Callable from .. import work_briefing as wb @@ -25,6 +28,8 @@ WORK_BRIEFING = "work_briefing" GENERATE_ACTION = "generate_report" # 页面上「重新生成」走的动作名(actions.generate_report) USAGE_ORDER = ("model", "effort", "time", "tokens_in", "tokens_out", "cost") +SETTINGS_URL = "__SETTINGS_URL__" # 详情 HTML 里的占位:页面换成 /#<令牌>&settings=<组> +_STATUSES = ("connected", "needs-auth", "failed") def work_briefing(service_of: Callable[[], object], config) -> Callable[[], dict]: @@ -37,6 +42,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, } if service is None: return data @@ -47,6 +53,7 @@ def build() -> dict: if briefing is not None: data.update(summary=briefing.summary, generated=generated_line(briefing.generated_at), usage=usage(briefing), html=markdown.render(briefing.markdown, bug_mark=wb.BUG_MARK)) + data["details"] = trace_sections(getattr(service, "last_trace", dict)() or {}) return data return build @@ -81,6 +88,67 @@ def usage(briefing: wb.Briefing) -> list[dict]: for text, tip in [values.get(key, ("", ""))] if text] +def _when(iso: str) -> str: + try: + return f"{dt.datetime.fromisoformat(iso):%m-%d %H:%M}" + except (TypeError, ValueError): + return "?" + + +def trace_sections(trace: dict) -> list[dict]: + """运行记录(``work_briefing.parse_trace`` + ``generate`` 填的命令 / 提示词 / 名单)→ 页面上折叠的几段。 + 全部转义;只产出 p / table / ol / code / pre / a 这几个标签。没有记录就是空列表(老版本生成的简报)。""" + if not trace: + return [] + e = html.escape + state = "" if trace.get("ok", True) else t("briefing.trace.failed_mark") + parts = [f"

{e(t('briefing.trace.chain', version=trace.get('version') or '?', model=trace.get('model') or '?', mode=trace.get('permission_mode') or '?', turns=int(trace.get('turns') or 0)))}

"] + rows = [] + for item in trace.get("servers") or []: + status, name = str(item.get("status") or ""), str(item.get("name") or "") + label = t(f"briefing.trace.status.{status.replace('-', '_')}") if status in _STATUSES else status # 字表键不能带连字符 + if item.get("calls"): + note = t("briefing.trace.used", n=int(item["calls"])) + elif status == "needs-auth": + note = t("briefing.trace.needs_auth", name=name) + elif item.get("allowed"): + note = t("briefing.trace.allowed_unused") + else: + note = t("briefing.trace.not_allowed") + cls = status if status in _STATUSES else "other" + rows.append(f"{e(name)}{e(label)}{e(note)}") + parts.append(f"{''.join(rows)}
" if rows else f"

{e(t('briefing.trace.no_servers'))}

") + if int(trace.get("others") or 0): + parts.append(f"

{e(t('briefing.trace.others', n=int(trace['others'])))}

") + parts.append(f"

{e(t('briefing.trace.tools_present', present=len(trace.get('tools') or []), allowed=len(trace.get('allowed') or [])))}

") + sections = [{"title": t("briefing.trace.section", when=_when(str(trace.get("at") or "")), state=state), "html": "".join(parts)}] + + calls = [call for call in trace.get("calls") or [] if isinstance(call, dict)] + items = [] + for call in calls: + tool = str(call.get("tool") or "") + bits = tool.split("__") if tool.startswith("mcp__") else [] + short, server = (bits[-1], bits[1]) if len(bits) >= 3 else (tool, "") + ok = call.get("ok") + mark = '✓' if ok else ('✗' if ok is False else "") + items.append(f"
  • {e(short)} {e(server)} {e(str(call.get('args') or ''))} {mark}
  • ") + body = f"
      {''.join(items)}
    " if items else f"

    {e(t('briefing.trace.no_calls'))}

    " + denied = [str(name) for name in trace.get("denied") or []] + if denied: + body += f"

    {e(t('briefing.trace.denied', names=', '.join(denied)))}

    " + sections.append({"title": t("briefing.trace.calls", n=len(calls)), "html": body}) + + hooks = [str(name) for name in trace.get("hooks") or []] + sections.append({"title": t("briefing.trace.hooks"), + "html": f"

    {e(', '.join(hooks))}

    " if hooks else f"

    {e(t('briefing.trace.no_hooks'))}

    "}) + command = "\n".join(str(part) for part in (trace.get("gh_command"), trace.get("command")) if part) + sections.append({"title": t("briefing.trace.command"), "html": f"
    {e(command)}
    "}) + sections.append({"title": t("briefing.trace.prompt"), + "html": f"

    {e(t('briefing.trace.edit_template'))}

    " + f"
    {e(str(trace.get('prompt') or ''))}
    "}) + return sections + + def theme(config) -> str: """页面的明暗:跟「外观」里的主题偏好(``system`` 按系统调色板定)。页面上不放切换按钮——那个偏好只在一处改。""" from ..work_briefing_ui import resolve_dark, theme_preference diff --git a/pet/settings_table.py b/pet/settings_table.py index 968299b..98e82ae 100644 --- a/pet/settings_table.py +++ b/pet/settings_table.py @@ -377,6 +377,9 @@ def _agent_link_group(group_id: str, zone: str, settings: tuple, title_key: str, _briefing_prompt("zh"), _briefing_prompt("en"), Setting("priority_rules", "long_text", text="briefing.settings.priority_rules"), + # 额外放行的工具:连接器换名 / 多一条时用户自己补一行;写入过 normalize_tools(只认 mcp__ 开头的名字或 * 结尾的前缀) + Setting("extra_allowed_tools", "lines", disclosure="advanced", text="briefing.settings.extra_tools", + hint="briefing.settings.extra_tools_hint"), ), title_key="briefing.settings.section", available=lambda: bool(claude_hooks.wsl_exe()), unavailable_text="briefing.settings.no_wsl"), # Slack 关注:电脑在用时每隔一阵让 WSL 里公司账号的 Claude Code 经 Slack 连接器只读地看一眼。模型名、effort 同样拼进 diff --git a/pet/work_briefing.py b/pet/work_briefing.py index fbf975f..cdbc0fa 100644 --- a/pet/work_briefing.py +++ b/pet/work_briefing.py @@ -27,7 +27,7 @@ import re from dataclasses import asdict, dataclass, field, fields from pathlib import Path -from typing import Callable +from typing import Callable, Iterable from . import claude_hooks from .i18n import t @@ -54,6 +54,8 @@ _MODEL_RE = re.compile(r"[A-Za-z0-9][A-Za-z0-9._-]{0,59}") _TIME_RE = re.compile(r"\s*(\d{1,2})(?::(\d{2}))?\s*") +#: 额外放行的工具:工具全名,或以 ``*`` 结尾的前缀。会拼进 shell 命令,所以只认 ``mcp__`` 开头、字母数字和 ``. _ -``。 +_TOOL_RE = re.compile(r"mcp__[A-Za-z0-9_.-]+\*?") _WEEKDAYS = "一二三四五六日" _PR_FIELDS = "repository,number,title,updatedAt,isDraft,url" @@ -225,6 +227,18 @@ def normalize_sources(value) -> dict: return {key: (raw.get(key, default) is True) for key, default in DEFAULT_SOURCES.items()} +def normalize_tools(value) -> list[str]: + """额外放行的工具(``extra_allowed_tools``):一行一个工具全名(``mcp__服务器__工具``)或 ``mcp__服务器__*`` 这样的前缀。 + 不合法的行丢掉、重复的只留一个;手写成一个字符串也认(按行拆)。""" + items = value.splitlines() if isinstance(value, str) else (value if isinstance(value, list) else []) + out: list[str] = [] + for item in items: + name = item.strip() if isinstance(item, str) else "" + if _TOOL_RE.fullmatch(name) and name not in out: + out.append(name) + return out + + def normalize(value) -> dict: raw = value if isinstance(value, dict) else {} return { @@ -238,6 +252,8 @@ def normalize(value) -> dict: "prompt_zh": normalize_text(raw.get("prompt_zh")), "prompt_en": normalize_text(raw.get("prompt_en")), "priority_rules": normalize_text(raw.get("priority_rules")), + # 额外放行的工具(空 = 只有内置名单):连接器换了名字 / 多了一条时用户自己补,不用等改代码 + "extra_allowed_tools": normalize_tools(raw.get("extra_allowed_tools")), } @@ -274,11 +290,13 @@ def _sources(sources: dict | None) -> dict: return normalize_sources(sources) if sources is not None else dict(DEFAULT_SOURCES) -def allowed_tools(sources: dict | None = None) -> tuple[str, ...]: - """放行的只读工具:只给开着的来源(邮件默认关,所以默认不含邮件工具)。""" +def allowed_tools(sources: dict | None = None, extra: Iterable[str] = ()) -> tuple[str, ...]: + """放行的只读工具:只给开着的来源(邮件默认关,所以默认不含邮件工具),再接上设置里额外放行的(``extra_allowed_tools``)。""" enabled = _sources(sources) - return tuple(prefix + name for source, (prefixes, names) in _READ_TOOLS_BY_SOURCE.items() if enabled.get(source) - for prefix in prefixes for name in names) + names = [prefix + name for source, (prefixes, names) in _READ_TOOLS_BY_SOURCE.items() if enabled.get(source) + for prefix in prefixes for name in names] + names += [name for name in normalize_tools(list(extra)) if name not in names] + return tuple(names) def denied_tools(sources: dict | None = None) -> tuple[str, ...]: @@ -293,12 +311,17 @@ def _sq(value: str) -> str: return "'" + str(value).replace("'", "'\\''") + "'" -def claude_command(model: str, sources: dict | None = None, effort: str = EFFORT) -> str: - """在发行版的登录 shell 里跑的那一行;提示词从标准输入进去。""" - allowed = " ".join(_sq(name) for name in allowed_tools(sources)) +def claude_command(model: str, sources: dict | None = None, effort: str = EFFORT, extra: Iterable[str] = ()) -> str: + """在发行版的登录 shell 里跑的那一行;提示词从标准输入进去。 + + ``stream-json``:整条事件流一行一个 JSON——``init`` 里有每个 MCP 服务器的名字 / 状态和工具清单,之后每次工具调用一行, + 最后一行才是结果;运行记录(``parse_trace``)从这里来,结果行的解析(``_result_record``)不受影响。 + ``--verbose`` 是 ``-p`` 下用 stream-json 的硬要求。 + """ + allowed = " ".join(_sq(name) for name in allowed_tools(sources, extra)) denied = " ".join(_sq(name) for name in denied_tools(sources)) return (f"cd ~ && {claude_hooks.HEADLESS_ENV}=1 claude -p --model {_sq(normalize_model(model))} --effort {normalize_effort(effort)}" - f" --output-format json --no-session-persistence --max-turns {MAX_TURNS}" + f" --output-format stream-json --verbose --no-session-persistence --max-turns {MAX_TURNS}" f" --tools '' --allowedTools {allowed} --disallowedTools {denied}") @@ -477,6 +500,7 @@ class Briefing: tokens_in: int = 0 # 输入 + 缓存读 + 缓存写 tokens_out: int = 0 cost_usd: float = 0.0 # total_cost_usd(Claude Code 报的) + trace: dict = field(default_factory=dict) # 运行记录(parse_trace + 命令 / 提示词 / 名单);落盘时单独存,见 record def _result_record(stdout: str) -> dict | None: @@ -494,6 +518,106 @@ def _result_record(stdout: str) -> dict | None: return None +def _events(stdout: str): + """stream-json 的每一行(登录 shell 可能夹着别的字,不是 JSON 对象的行跳过)。""" + for line in str(stdout or "").splitlines(): + line = line.strip() + if not line.startswith("{"): + continue + try: + event = json.loads(line) + except ValueError: + continue + if isinstance(event, dict): + yield event + + +def _blocks(event: dict) -> list[dict]: + message = event.get("message") + content = message.get("content") if isinstance(message, dict) else None + return [block for block in content if isinstance(block, dict)] if isinstance(content, list) else [] + + +def _args_summary(value, *, each: int = 80, total: int = 200) -> str: + """工具参数的一行摘要:``键=值, 键=值``,每个值最多 ``each`` 个字符,整行最多 ``total``。""" + if isinstance(value, dict): + text = ", ".join(f"{key}={' '.join(str(item).split())[:each]}" for key, item in value.items()) + else: + text = " ".join(str(value if value is not None else "").split()) + return text if len(text) <= total else text[:total - 1] + "…" + + +def server_slug(name: str) -> str: + """Claude Code 给 MCP 工具起名的规则:``mcp__<服务器>__<工具>``,服务器名里不是字母数字 ``_ -`` 的字符换成 ``_`` + (``claude.ai Atlassian`` → ``claude_ai_Atlassian``,``plugin:atlassian:atlassian`` → ``plugin_atlassian_atlassian``)。""" + return re.sub(r"[^A-Za-z0-9_-]", "_", str(name or "")) + + +def _rule_covers(rule: str, tool: str) -> bool: + """放行名单里的一条认不认这个工具名:全名相等;``mcp__服务器`` 整个服务器;以 ``*`` 结尾的按前缀。""" + if rule.endswith("*"): + return tool.startswith(rule[:-1]) + return tool == rule or tool.startswith(rule + "__") + + +def parse_trace(stdout: str, *, allowed: Iterable[str] = (), denied: Iterable[str] = ()) -> dict: + """从 stream-json 的事件流里整理出「这次是怎么生成的」: + + - ``version`` / ``model`` / ``permission_mode``:``init`` 事件里那个账号的 Claude Code 版本、实际模型、权限模式; + - ``servers``:和简报有关的 MCP 服务器(放行名单覆盖到的,或这次真调过的),每个 ``{name, status, source, calls, allowed}``; + 其余只数个数(``others``);``tools``:放行名单里这次**真的存在**的工具名——放行了不存在的名字没有任何效果,这里看得出来; + - ``calls``:每次工具调用 ``{n, tool, args, ok}``(``ok`` 由对应的 ``tool_result`` 定,没看到结果是 None); + - ``hooks``:那个账号自己跑了哪些 hooks(名字去重);``denied``:结果里的 ``permission_denials``。 + + 老格式(只有一行结果 JSON)也能喂:各项为空。命令 / 提示词 / 名单由 ``generate`` 另外填进去。 + """ + allowed = tuple(allowed) + trace: dict = {"version": "", "model": "", "permission_mode": "", "servers": [], "others": 0, "tools": [], + "calls": [], "hooks": [], "denied": [], "denied_rules": list(denied)} + raw_servers: list[dict] = [] + calls: list[dict] = [] + results: dict[str, bool] = {} + for event in _events(stdout): + kind, sub = event.get("type"), event.get("subtype") + if kind == "system" and sub == "init": + trace.update(version=str(event.get("claude_code_version") or ""), model=str(event.get("model") or ""), + permission_mode=str(event.get("permissionMode") or "")) + raw_servers = [item for item in event.get("mcp_servers") or [] if isinstance(item, dict)] + trace["tools"] = [name for name in event.get("tools") or [] if isinstance(name, str) and name.startswith("mcp__") + and any(_rule_covers(rule, name) for rule in allowed)] + elif kind == "system" and sub == "hook_started": + name = str(event.get("hook_name") or event.get("hook_event") or "") + if name and name not in trace["hooks"]: + trace["hooks"].append(name) + elif kind == "assistant": + for block in _blocks(event): + if block.get("type") == "tool_use": + calls.append({"id": str(block.get("id") or ""), "tool": str(block.get("name") or ""), + "args": _args_summary(block.get("input"))}) + elif kind == "user": + for block in _blocks(event): + if block.get("type") == "tool_result": + results[str(block.get("tool_use_id") or "")] = not block.get("is_error") + elif kind == "result": + trace["denied"] = [str(item.get("tool_name") or "") for item in event.get("permission_denials") or [] + if isinstance(item, dict)] + for number, call in enumerate(calls, 1): + call["ok"] = results.get(call.pop("id")) + call["n"] = number + trace["calls"] = calls + for item in raw_servers: + name = str(item.get("name") or "") + prefix = f"mcp__{server_slug(name)}__" + used = sum(1 for call in calls if call["tool"].startswith(prefix)) + covered = any(rule == prefix[:-2] or rule.startswith(prefix) for rule in allowed) + if used or covered: + trace["servers"].append({"name": name, "status": str(item.get("status") or ""), "source": str(item.get("source") or ""), + "calls": used, "allowed": covered}) + else: + trace["others"] += 1 + return trace + + def parse_output(stdout: str) -> Briefing: record = _result_record(stdout) if record is None: @@ -522,7 +646,7 @@ def parse_output(stdout: str) -> Briefing: def generate(now: dt.datetime, model: str, *, sources: dict | None = None, run: WslRunner | None = None, clock: Callable[[], float] | None = None, effort: str = EFFORT, template: str | None = None, - priority_rules: str = "") -> Briefing: + priority_rules: str = "", extra_tools: Iterable[str] = ()) -> Briefing: """生成一份简报(阻塞:PR 来源开着先 gh,再 claude)。任何失败都折成 ``ok=False`` 加原因。""" import time @@ -538,10 +662,16 @@ def generate(now: dt.datetime, model: str, *, sources: dict | None = None, run: return Briefing(error=t("briefing.error.no_wsl")) prompt = build_prompt(now, format_pull_requests(pr_out) if enabled.get("pr") else "", sources=enabled, template=template, priority_rules=priority_rules) - code, out = run(["-e", "bash", "-lc", claude_command(model, enabled, effort)], input_text=prompt, timeout=CLAUDE_TIMEOUT_S) + command = claude_command(model, enabled, effort, extra_tools) + code, out = run(["-e", "bash", "-lc", command], input_text=prompt, timeout=CLAUDE_TIMEOUT_S) if code == 127 and not out: return Briefing(error=t("briefing.error.no_wsl")) briefing = parse_output(out) + # 运行记录:事件流里整理出来的 + 肥鱼这一侧本来就知道的(命令、提示词原文、当时生效的放行 / 拒绝名单) + allowed = allowed_tools(enabled, extra_tools) + briefing.trace = parse_trace(out, allowed=allowed, denied=denied_tools(enabled)) + briefing.trace.update(command=command, gh_command=pr_command() if enabled.get("pr") else "", prompt=prompt, + allowed=list(allowed)) if enabled.get("pr"): briefing.markdown = linkify(briefing.markdown, pull_request_links(pr_out)) briefing.generated_at = now.isoformat(timespec="seconds") @@ -575,12 +705,23 @@ def record(config_dir: Path | str, briefing: Briefing, now: dt.datetime) -> dict attempts = int(state.get("attempts") or 0) + 1 if state.get("attempt_date") == today else 1 state.update(attempt_date=today, attempts=attempts, last_attempt=now.timestamp(), error="" if briefing.ok else briefing.error) + # 运行记录单独存一份,每次尝试都换(失败的也留:失败时最想看的就是它);简报本体里不再带,免得存两遍 + body = {key: value for key, value in asdict(briefing).items() if key != "trace"} + if briefing.trace: + state["trace"] = {**briefing.trace, "at": now.isoformat(timespec="seconds"), "ok": briefing.ok, + "turns": briefing.turns, "seconds": briefing.seconds} if briefing.ok: - state.update(done_date=today, briefing=asdict(briefing)) + state.update(done_date=today, briefing=body) _save_state(config_dir, state) return state +def last_trace(config_dir: Path | str) -> dict: + """最近一次尝试(成功或失败)的运行记录;还没生成过、或最近一份是老版本生成的,就是空字典。""" + raw = load_state(config_dir).get("trace") + return raw if isinstance(raw, dict) else {} + + def latest(config_dir: Path | str) -> Briefing | None: raw = load_state(config_dir).get("briefing") if not isinstance(raw, dict) or not raw.get("markdown"): diff --git a/pet/work_briefing_service.py b/pet/work_briefing_service.py index b1e1943..8c25c65 100644 --- a/pet/work_briefing_service.py +++ b/pet/work_briefing_service.py @@ -67,6 +67,10 @@ def latest(self) -> wb.Briefing | None: def last_error(self) -> str: return str(wb.load_state(self._config.dir).get("error") or "") + def last_trace(self) -> dict: + """最近一次尝试的运行记录(成功或失败),给简报页的「这次是怎么生成的」。""" + return wb.last_trace(self._config.dir) + def start(self) -> None: """开始定时检查;第一次延后 ``STARTUP_DELAY_MS``,不和启动抢时间。""" QTimer.singleShot(self.STARTUP_DELAY_MS, self.check) @@ -101,7 +105,8 @@ def _launch(self, *, manual: bool) -> bool: # 用户改过的提示词按界面语言取(空 = 内置);effort 与优先级偏好一并带过去 extra = {"effort": settings.get("effort", wb.EFFORT), "template": settings.get(f"prompt_{wb.prompt_language()}", ""), - "priority_rules": settings.get("priority_rules", "")} + "priority_rules": settings.get("priority_rules", ""), + "extra_tools": settings.get("extra_allowed_tools", [])} self._busy = True self.started.emit(manual) diff --git a/tests/test_panorama_report_page.py b/tests/test_panorama_report_page.py index 501c221..9388f61 100644 --- a/tests/test_panorama_report_page.py +++ b/tests/test_panorama_report_page.py @@ -239,10 +239,12 @@ def engine(): REPORT_DOM = """ document.documentElement.dataset = {}; location.pathname = '/report/demo'; +location.origin = 'http://127.0.0.1:1'; var dom = function () { var el = document.getElementById; return {title: el('title').textContent, generated: el('generated').textContent, 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}; }; + buttonDisabled: el('action').disabled, lost: el('lost').hidden, theme: document.documentElement.dataset.theme, title_tag: document.title, + details: el('details').innerHTML}; }; var clicks = {}; document.getElementById('action').addEventListener = function (type, fn) { clicks[type] = fn; }; """ @@ -275,6 +277,15 @@ def test_the_page_takes_the_token_asks_for_its_report_and_lays_it_out(engine): assert dom["button"] == "重做" and dom["buttonHidden"] is False and dom["buttonDisabled"] is False and dom["lost"] is True +def test_the_run_record_is_laid_out_as_collapsible_sections_with_the_settings_link_filled_in(engine): + details = [{"title": "怎么生成的 ", "html": '

    x

    改'}, {"title": "命令", "html": "
    c
    "}] + out = _page(engine, [_ok(_payload(details=details, settings_focus="work_briefing")), '{"hang": true}']) + assert out["dom"]["details"] == ('
    怎么生成的 <b>

    x

    ' + '改
    ' + '
    命令
    c
    ') + assert _page(engine, [_ok(_payload()), '{"hang": true}'])["dom"]["details"] == "", "没有记录就什么都不摆" + + 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 d5ea5a5..fff0336 100644 --- a/tests/test_panorama_reports.py +++ b/tests/test_panorama_reports.py @@ -29,8 +29,12 @@ def _config(theme="dark"): class _Service: - def __init__(self, briefing=None, *, busy=False, error="", started=True): + def __init__(self, briefing=None, *, busy=False, error="", started=True, trace=None): self._briefing, self.busy, self._error, self._started, self.asked = briefing, busy, error, started, 0 + self._trace = trace or {} + + def last_trace(self): + return self._trace def latest(self): return self._briefing @@ -48,6 +52,47 @@ def generate_now(self): tokens_in=406791, tokens_out=12012, cost_usd=1.25) +TRACE = {"version": "2.1.329", "model": "claude-opus-5-5", "permission_mode": "auto", "turns": 12, "ok": True, "at": "2026-11-19T22:10:00", + "servers": [{"name": "claude.ai Atlassian", "status": "needs-auth", "source": "claude.ai", "calls": 0, "allowed": True}, + {"name": "claude.ai Slack", "status": "connected", "source": "claude.ai", "calls": 3, "allowed": True}, + {"name": "plugin:atlassian:atlassian", "status": "weird", "source": "plugin", "calls": 0, "allowed": True}], + "others": 23, "tools": ["mcp__claude_ai_Slack__slack_read_channel"], "allowed": ["a", "b", "c"], + "calls": [{"n": 1, "tool": "mcp__claude_ai_Slack__slack_search_public_and_private", "args": "query=", "ok": True}, + {"n": 2, "tool": "mcp__claude_ai_Atlassian__getJiraIssue", "args": "key=X-1", "ok": False}, + {"n": 3, "tool": "odd", "args": "", "ok": None}], + "denied": ["mcp__claude_ai_Slack__slack_send_message"], "hooks": ["gitkraken-hooks:SessionStart"], + "gh_command": "gh pr list", "command": "claude -p --tools ''", "prompt": "你是我的<助手>"} + + +def test_the_run_record_becomes_collapsible_sections_with_everything_escaped(): + data = reports.work_briefing(lambda: _Service(BRIEFING, trace=TRACE), _config())() + titles = [section["title"] for section in data["details"]] + assert titles == ["这次是怎么生成的(11-19 22:10)", "工具调用(3 次)", "那个账号自己的 hooks", "命令(肥鱼在 WSL 登录 shell 里跑的)", + "提示词(发出去的原文)"] + first = data["details"][0]["html"] + assert "Claude Code 2.1.329(claude-opus-5-5 · 权限模式 auto · 12 轮)" in first + assert 'claude.ai Atlassian没登录要登录:在 WSL 里跑 claude mcp login "claude.ai Atlassian",再重新生成' in first + assert '已连接这次调了 3 次' in first and 'weird放行了,这次没用到' in first + assert "另有 23 个 MCP 服务器与简报无关" in first and "放行名单 3 条;这次实际存在的工具 1 个" in first + calls = data["details"][1]["html"] + assert '
  • slack_search_public_and_private claude_ai_Slack query=<to:me> ✓
  • ' in calls + assert 'getJiraIssue claude_ai_Atlassian key=X-1 ✗' in calls + assert '
  • odd
  • ' in calls and "被拒的:mcp__claude_ai_Slack__slack_send_message" in calls + assert data["details"][2]["html"] == "

    gitkraken-hooks:SessionStart

    " + assert data["details"][3]["html"] == "
    gh pr list\nclaude -p --tools ''
    " + assert data["details"][4]["html"] == '

    到设置里改模板

    你是我的<助手>
    ' + assert data["settings_focus"] == "work_briefing" + + +def test_a_failed_run_is_marked_and_a_service_without_a_record_gives_no_sections(): + failed = reports.trace_sections({**TRACE, "ok": False, "servers": [], "calls": [], "hooks": [], "others": 0, "denied": []}) + assert failed[0]["title"] == "这次是怎么生成的(11-19 22:10 · 失败)" and "这次运行没有报告任何 MCP 服务器" in failed[0]["html"] + assert failed[1]["html"] == '

    没有调用任何工具

    ' and failed[2]["html"] == '

    没有 hooks 运行

    ' + assert reports.trace_sections({}) == [] + plain = reports.work_briefing(lambda: _Service(BRIEFING), _config())() + assert plain["details"] == [], "老版本生成的简报:没有记录就不摆" + + 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" diff --git a/tests/test_panorama_settings_routes.py b/tests/test_panorama_settings_routes.py index efa7fb5..413625d 100644 --- a/tests/test_panorama_settings_routes.py +++ b/tests/test_panorama_settings_routes.py @@ -99,7 +99,7 @@ def test_reading_a_group_goes_through_the_gui_thread(stack, monkeypatch): monkeypatch.setattr(api, "read", lambda config, group: (threads.append(threading.current_thread() is threading.main_thread()), real(config, group))[1]) status, body = _pump(stack.app, lambda: _send(stack.server, "GET", "/api/settings/work_briefing")) - assert status == 200 and body["group"] == "work_briefing" and len(body["settings"]) == 14 + assert status == 200 and body["group"] == "work_briefing" and len(body["settings"]) == 15 assert threads == [True] # Config 只在界面线程上被碰 diff --git a/tests/test_settings_table.py b/tests/test_settings_table.py index d16ab02..f3eba93 100644 --- a/tests/test_settings_table.py +++ b/tests/test_settings_table.py @@ -89,7 +89,7 @@ def test_defaults_are_what_the_feature_gives_for_an_empty_config(): assert st.defaults(group) == { "enabled": False, "time": "09:00", "weekdays_only": True, "model": "sonnet", "effort": "high", "sources.jira": True, "sources.pr": True, "sources.slack": True, "sources.calendar": True, "sources.email": False, - "sources.suggestions": True, "prompt_zh": "", "prompt_en": "", "priority_rules": ""} + "sources.suggestions": True, "prompt_zh": "", "prompt_en": "", "priority_rules": "", "extra_allowed_tools": []} assert list(st.defaults(group)) == [setting.id for setting in group.settings] # 顺序就是表里声明的顺序 diff --git a/tests/test_settings_write_path.py b/tests/test_settings_write_path.py index 097c631..b776179 100644 --- a/tests/test_settings_write_path.py +++ b/tests/test_settings_write_path.py @@ -75,6 +75,13 @@ def test_text_is_trimmed_but_otherwise_kept_exactly(): assert _check({"prompt_zh": ""})[0]["prompt_zh"] == "" # 空 = 用内置 +def test_extra_tools_are_kept_as_lines_and_a_line_the_feature_drops_is_rejected(): + new, errors = _check({"extra_allowed_tools": [" mcp__claude_ai_Atlassian_MCP__* ", "", "mcp__x__y"]}) + assert errors == [] and new["extra_allowed_tools"] == ["mcp__claude_ai_Atlassian_MCP__*", "mcp__x__y"] + assert [(e["id"], e["code"]) for e in _check({"extra_allowed_tools": ["Bash"]})[1]] == [("extra_allowed_tools", "rejected")] + assert [(e["id"], e["code"]) for e in _check({"extra_allowed_tools": "mcp__x__y"})[1]] == [("extra_allowed_tools", "type")] + + def test_custom_values_the_feature_accepts_are_fine_even_if_not_in_the_dropdown(): new, errors = _check({"time": "07:05", "model": "claude-sonnet-5-5"}) assert errors == [] and (new["time"], new["model"]) == ("07:05", "claude-sonnet-5-5") diff --git a/tests/test_work_briefing.py b/tests/test_work_briefing.py index 4fb297b..9ac738a 100644 --- a/tests/test_work_briefing.py +++ b/tests/test_work_briefing.py @@ -55,7 +55,7 @@ def _prs(*titles) -> str: def test_it_is_off_until_someone_turns_it_on(tmp_path): assert Config(tmp_path).get(wb.CONFIG_KEY) == { "enabled": False, "time": "09:00", "weekdays_only": True, "model": "sonnet", "effort": "high", - "sources": dict(wb.DEFAULT_SOURCES), "prompt_zh": "", "prompt_en": "", "priority_rules": ""} + "sources": dict(wb.DEFAULT_SOURCES), "prompt_zh": "", "prompt_en": "", "priority_rules": "", "extra_allowed_tools": []} assert wb.DEFAULT_SOURCES["email"] is False, "邮件默认关" @@ -135,7 +135,7 @@ def test_writing_tools_are_refused_by_name_even_if_the_account_pre_approved_them def test_the_command_runs_headless_with_builtin_tools_switched_off(): command = wb.claude_command("sonnet") - assert " claude -p " in command and "--output-format json" in command + assert " claude -p " in command and "--output-format stream-json --verbose" in command, "事件流:运行记录从这里来" assert "--tools ''" in command, "Bash / 读写文件这些内置工具一个不给" assert "--no-session-persistence" in command, "不在工作账号的会话列表里留一条" assert f"{ch.HEADLESS_ENV}=1 " in command, "让肥鱼自己的 hook 认出这次运行" diff --git a/tests/test_work_briefing_trace.py b/tests/test_work_briefing_trace.py new file mode 100644 index 0000000..01b962a --- /dev/null +++ b/tests/test_work_briefing_trace.py @@ -0,0 +1,158 @@ +# -*- coding: utf-8 -*- +"""工作简报的运行记录(``work_briefing.parse_trace`` 等):从 ``claude -p`` 的 stream-json 事件流里整理出 +「这次用了哪些 MCP 服务器、调了什么工具、那个账号跑了什么 hooks」,加上肥鱼自己知道的命令 / 提示词 / 名单, +随简报存起来、给简报页摆。另有「额外放行的工具」这项设置。 +""" +from __future__ import annotations + +import datetime as dt +import json + +from pet import work_briefing as wb +from tests.test_work_briefing import _claude_json + +NOW = dt.datetime(2026, 11, 19, 9, 0) +SEARCH = "mcp__claude_ai_Slack__slack_search_public_and_private" +JQL = "mcp__claude_ai_Atlassian__searchJiraIssuesUsingJql" + + +def _stream(*, denials=(), result="Summary: ok\n## Jira\n读不到\n"): + init = {"type": "system", "subtype": "init", "claude_code_version": "2.1.329", "model": "claude-opus-5-5", + "permissionMode": "auto", + "mcp_servers": [{"name": "claude.ai Atlassian", "status": "needs-auth", "source": "claude.ai"}, + {"name": "claude.ai Slack", "status": "connected", "source": "claude.ai"}, + {"name": "plugin:atlassian:atlassian", "status": "failed", "source": "plugin"}, + {"name": "GitKraken", "status": "connected", "source": "user"}, + {"name": "claude.ai Gmail", "status": "connected", "source": "claude.ai"}], + "tools": [SEARCH, "mcp__claude_ai_Slack__slack_send_message", "mcp__GitKraken__git_status"]} + events = [ + init, + {"type": "system", "subtype": "hook_started", "hook_name": "gitkraken-hooks:SessionStart", "hook_event": "SessionStart"}, + {"type": "system", "subtype": "hook_started", "hook_name": "gitkraken-hooks:SessionStart"}, + {"type": "assistant", "message": {"content": [ + {"type": "text", "text": "先查 Slack"}, + {"type": "tool_use", "id": "t1", "name": SEARCH, "input": {"query": "to:me after:2026-11-18", "limit": 20}}]}}, + {"type": "user", "message": {"content": [{"type": "tool_result", "tool_use_id": "t1", "content": "…"}]}}, + {"type": "assistant", "message": {"content": [ + {"type": "tool_use", "id": "t2", "name": JQL, "input": {"jql": "assignee = currentUser()"}}]}}, + {"type": "user", "message": {"content": [{"type": "tool_result", "tool_use_id": "t2", "is_error": True, "content": "needs auth"}]}}, + {"type": "assistant", "message": {"content": [{"type": "tool_use", "id": "t3", "name": "mcp__GitKraken__git_status", "input": "x" * 300}]}}, + {"type": "result", "subtype": "success", "is_error": False, "result": result, "num_turns": 3, + "permission_denials": [{"tool_name": name} for name in denials], "modelUsage": {}}, + ] + return "Welcome to Ubuntu\n" + "\n".join(json.dumps(event, ensure_ascii=False) for event in events) + "\n" + + +# ---------------------------------------------------------------- 事件流 → 运行记录 + +def test_the_trace_names_the_servers_that_matter_and_counts_the_rest(): + trace = wb.parse_trace(_stream(), allowed=wb.allowed_tools(), denied=wb.denied_tools()) + assert (trace["version"], trace["model"], trace["permission_mode"]) == ("2.1.329", "claude-opus-5-5", "auto") + by_name = {item["name"]: item for item in trace["servers"]} + assert list(by_name) == ["claude.ai Atlassian", "claude.ai Slack", "plugin:atlassian:atlassian", "GitKraken"] + assert trace["others"] == 1, "Gmail(邮件默认关)没放行也没用到:只数个数" + assert by_name["GitKraken"] == {"name": "GitKraken", "status": "connected", "source": "user", "calls": 1, "allowed": False}, "没放行却用到了的也列出来" + assert by_name["claude.ai Atlassian"] == {"name": "claude.ai Atlassian", "status": "needs-auth", "source": "claude.ai", "calls": 1, "allowed": True} + assert by_name["claude.ai Slack"]["calls"] == 1 and by_name["plugin:atlassian:atlassian"]["calls"] == 0 + assert by_name["plugin:atlassian:atlassian"]["allowed"] is True, "插件前缀在放行名单里,哪怕这次没加载" + assert trace["tools"] == [SEARCH], "放行名单里这次真的存在的工具:发消息的没放行,GitKraken 的也没有" + assert trace["denied_rules"] == list(wb.denied_tools()) + + +def test_every_tool_call_is_listed_with_a_short_argument_line_and_its_outcome(): + trace = wb.parse_trace(_stream(denials=["mcp__claude_ai_Slack__slack_send_message"]), allowed=wb.allowed_tools()) + assert trace["calls"][0] == {"n": 1, "tool": SEARCH, "args": "query=to:me after:2026-11-18, limit=20", "ok": True} + assert trace["calls"][1] == {"n": 2, "tool": JQL, "args": "jql=assignee = currentUser()", "ok": False} + assert trace["calls"][2]["n"] == 3 and trace["calls"][2]["ok"] is None and trace["calls"][2]["args"].endswith("…") + assert len(trace["calls"][2]["args"]) == 200, "参数摘要有上限" + assert trace["hooks"] == ["gitkraken-hooks:SessionStart"], "同一个 hook 跑两次只记一次" + assert trace["denied"] == ["mcp__claude_ai_Slack__slack_send_message"] + + +def test_a_prefix_rule_or_a_whole_server_rule_counts_as_covering_the_server(): + trace = wb.parse_trace(_stream(), allowed=["mcp__GitKraken__*"]) + assert [item["name"] for item in trace["servers"]] == ["claude.ai Atlassian", "claude.ai Slack", "GitKraken"] + assert trace["tools"] == ["mcp__GitKraken__git_status"] + assert wb.parse_trace(_stream(), allowed=["mcp__GitKraken"])["tools"] == ["mcp__GitKraven__git_status".replace("Kraven", "Kraken")] + assert wb.server_slug("claude.ai Atlassian MCP") == "claude_ai_Atlassian_MCP" + assert wb.server_slug("plugin:atlassian:atlassian") == "plugin_atlassian_atlassian" + + +def test_the_result_line_still_parses_from_a_stream_and_an_old_single_line_output_gives_an_empty_trace(): + briefing = wb.parse_output(_stream()) + assert briefing.ok and briefing.summary == "ok" and briefing.turns == 3 + old = wb.parse_trace(_claude_json()) + assert old["servers"] == [] and old["calls"] == [] and old["version"] == "" and old["others"] == 0 + assert wb.parse_trace("not json at all\n{broken")["calls"] == [] + + +# ---------------------------------------------------------------- generate 填进去的那部分 + +def test_generate_keeps_the_command_the_prompt_and_the_lists_in_the_trace(): + seen = [] + + def run(args, input_text=None, timeout=0): + seen.append((args[-1], input_text)) + return 0, _stream() + + sources = {**wb.DEFAULT_SOURCES, "pr": False} + briefing = wb.generate(NOW, "sonnet", sources=sources, run=run, extra_tools=["mcp__x__y", "Bash"]) + assert briefing.ok and len(seen) == 1 + command, prompt = seen[0] + assert briefing.trace["command"] == command == wb.claude_command("sonnet", sources, "high", ["mcp__x__y"]) + assert "--output-format stream-json --verbose" in command and "'mcp__x__y'" in command and "Bash" not in command + assert briefing.trace["prompt"] == prompt and briefing.trace["gh_command"] == "" + assert briefing.trace["allowed"][-1] == "mcp__x__y" and briefing.trace["servers"][1]["name"] == "claude.ai Slack" + + +def test_the_trace_is_stored_once_per_attempt_and_a_failure_keeps_the_good_briefing(tmp_path): + good = wb.parse_output(_stream()) + good.trace = {"command": "c1", "prompt": "p1", "calls": []} + state = wb.record(tmp_path, good, NOW) + assert "trace" not in state["briefing"], "简报本体里不带运行记录:单独存一份" + assert state["trace"]["command"] == "c1" and state["trace"]["ok"] is True and state["trace"]["at"] == "2026-11-19T09:00:00" + assert wb.latest(tmp_path).summary == "ok" and wb.last_trace(tmp_path)["prompt"] == "p1" + + wb.record(tmp_path, wb.Briefing(error="boom", trace={"command": "c2"}), NOW + dt.timedelta(hours=1)) + assert wb.last_trace(tmp_path)["command"] == "c2" and wb.last_trace(tmp_path)["ok"] is False + assert wb.latest(tmp_path).summary == "ok", "失败不抹掉上一份简报" + + wb.record(tmp_path, wb.Briefing(error="no wsl"), NOW + dt.timedelta(hours=2)) + assert wb.last_trace(tmp_path)["command"] == "c2", "这次连事件流都没有:上一份记录留着" + assert wb.last_trace(tmp_path / "nowhere") == {} + + +# ---------------------------------------------------------------- 额外放行的工具 + +def test_extra_tools_only_accept_mcp_names_and_prefixes(): + assert wb.normalize_tools(["mcp__claude_ai_Atlassian_MCP__*", " mcp__x__y ", "Bash", "mcp__a; rm -rf ~", "mcp__x__y", "", 3, + "mcp__a__*b"]) == ["mcp__claude_ai_Atlassian_MCP__*", "mcp__x__y"] + assert wb.normalize_tools("mcp__a__b\nmcp__c") == ["mcp__a__b", "mcp__c"], "手写成一个字符串也认" + assert wb.normalize({"extra_allowed_tools": "mcp__a__b"})["extra_allowed_tools"] == ["mcp__a__b"] + assert wb.normalize({})["extra_allowed_tools"] == [] and wb.normalize_tools(None) == [] + + +def test_extra_tools_join_the_allow_list_once_and_reach_the_command(): + builtin = wb.allowed_tools() + allowed = wb.allowed_tools(None, ["mcp__claude_ai_Atlassian_MCP__*", builtin[0], "Bash"]) + assert allowed == builtin + ("mcp__claude_ai_Atlassian_MCP__*",) + command = wb.claude_command("sonnet", extra=["mcp__claude_ai_Atlassian_MCP__*"]) + assert "'mcp__claude_ai_Atlassian_MCP__*'" in command.split("--disallowedTools")[0] + + +def test_the_service_hands_the_extra_tools_to_generate(tmp_path): + from pet.config import Config + from pet.work_briefing_service import WorkBriefingService + from tests.test_work_briefing import MONDAY_10, ON + + config = Config(tmp_path) + config.set(wb.CONFIG_KEY, {**ON, "extra_allowed_tools": ["mcp__x__y"]}) + seen = {} + + def generate(when, model, **kw): + seen.update(kw) + return wb.parse_output(_stream()) + + service = WorkBriefingService(config, generate=generate, spawn=lambda run: run(), now=lambda: MONDAY_10) + assert service.generate_now() is True + assert seen["extra_tools"] == ["mcp__x__y"]