Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

## 2026-11

- 11-20 工作简报多一节「当前 Sprint」放在最前面:我所在 sprint 的全部工单(不限经办人,最多 80 条)按 Jira 优先级排、不标星级;来源开关里可关,范围由新设置「Sprint 范围(JQL 片段)」定
- 11-20 工作简报 / 笔记读 Jira 改认 claude.ai 的 v2 连接器「Atlassian MCP」(v1 明年 3 月下线、令牌几小时就掉):放行 / 拒绝名单多一个前缀,另放行 v2 的工单评论、工作动态两个只读工具,登录方法见排障手册
- 11-20 配置全景的右侧详情栏能拖宽了(两列之间的把手,双击复原);磁贴详情里的列表默认紧凑,每条 ▸ 展开说明、可全部展开 / 收起,超过 5 条有筛选框;「上次探测」这类时间后面带「N 小时前」
- 11-20 自定义联动 Agent 能在配置全景上改了:「本机联动」设置里多一张表(标识 / 显示名 / 事件文件,加行、删行、整表保存,不合规的行标红),存了就生效,不用再重启肥鱼;开关仍在右键菜单「Agent 联动 → 自定义联动 Agent」
Expand Down
14 changes: 12 additions & 2 deletions docs/work-assistant.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,19 @@ flowchart LR
- **PR 由肥鱼自己查**:那个账号的 Claude Code 沙箱只放行少数域名、不含 github.com,让模型自己跑 `gh` 两条查询都失败;同样的
`gh search prs` 在 WSL 里直接跑是通的。所以第一次 `wsl.exe` 先查「等我评审的」「我开的」两组(各最多 30 条,中间用
`PR_MARK` 隔开),写进提示词的 `<pr_list>`。查不到(没装 / 没登录)不算失败,那一段写「没查到 + 原因」让模型如实转述。
- **来源开关 `work_briefing.sources`**(`jira / pr / slack / calendar / email / suggestions`,邮件默认关)同时决定四件事:
- **来源开关 `work_briefing.sources`**(`sprint / jira / pr / slack / calendar / email / suggestions`,邮件默认关)同时决定四件事:
提示词里列哪些来源、输出哪几节、放行哪些只读工具、要不要先跑 `gh`。只改其中一件就会出现「让它读邮件但工具没放行」。
邮件开着才放行 Gmail 的三个读取工具,关着时整个 Gmail 连接器都在拒绝名单里。
邮件开着才放行 Gmail 的三个读取工具,关着时整个 Gmail 连接器都在拒绝名单里。来源和工具组不是一一对应:`_TOOLS_OF_SOURCE`
把「当前 Sprint」映射到 Jira 那组 Atlassian 工具,两个开关任一开着工具就在。
- **「当前 Sprint」是第一节**(2026-11-20 用户要求):我所在团队正在进行的 sprint 里的**全部**工单,不限经办人。两步查:先用
`assignee = currentUser() AND sprint in openSprints()` 找出我的工单所在的 sprint(id),再 `sprint = <id> ORDER BY priority DESC,
status ASC, updated DESC` 查全部,最多 80 条。**不许**不带限制地 `sprint in openSprints()`——第一次真机就是这么查的,拿回来的 60 条
全是别的团队的 Critical,我的一条都没进来。按 Jira 的优先级字段原序排,不让模型重排、不标星级(它是唯一不标星的工单列表),
每个 sprint 一段,段首 `**<sprint 名>** · 共 N 条,已完成 M 条`,已完成的排段尾,经办人是我时加粗。
**范围由设置 `sprint_scope` 定**(一行 JQL 片段,占位符 `{sprint_scope}` 填成 `AND (<片段>)`;空 = `AND project = <我的项目>`):
第二次真机发现公司共用的 sprint 有 964 条、我的项目在里面也有 604 条,「全部」在这个规模下没意义,按看板的过滤条件
(组件 / 标签 / filter id)填才是团队的 sprint。它只进提示词,不进 shell 命令,所以只做取第一行、限 300 字。
「Jira」那一节仍是分配给我的未完成工单(bug 优先、带 QA 场景),两节会重叠,各管各的用途:一节看团队全貌,一节看我手上的。
- **提示词按界面语言整套切换**(`_PROMPTS["zh" / "en"]`),不是在中文提示词里加一句「用英文写」——周围全是中文时模型遵从
不稳。`parse_output` 同时认 `概要:` 与 `Summary:`(含加粗、反引号写法,`SUMMARY_PREFIXES`),第一行拆出来给气泡,没有
这一行就用兜底概要。已生成的简报 / 笔记不会重译。
Expand Down
4 changes: 4 additions & 0 deletions pet/locale/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -1661,6 +1661,10 @@
"briefing.settings.time_hint": "Runs at this time while the fish is running; if missed, it catches up later the same day. Monday looks back 72 hours, other days 24.",
"briefing.settings.model": "Model",
"briefing.settings.model_hint": "Model alias passed to claude -p --model. One briefing takes about 40–90 s; pick “Custom” to type a full model name (letters, digits and . _ - only).",
"briefing.settings.sprint_scope": "Sprint scope (JQL fragment)",
"briefing.settings.sprint_scope_hint": "The “Current sprint” section lists only issues matching this, as sprint = <id> AND (<fragment>), e.g. component = Platform, labels = team-x, filter = 12345. Empty = the project of my issues; a company-wide sprint can hold hundreds, so use your board's filter.",
"briefing.settings.source.sprint": "Include the current sprint",
"briefing.settings.source.sprint_hint": "Every issue in the sprint my team is running now (any assignee, at most 80), in Jira's priority order without stars, as its own first section. Shares the read-only Atlassian tools with Jira.",
"briefing.settings.source.jira": "Include Jira",
"briefing.settings.source.jira_hint": "Open issues assigned to me (at most 15, recently updated first). Allows the read-only Atlassian tools.",
"briefing.settings.source.pr": "Include GitHub PRs",
Expand Down
4 changes: 4 additions & 0 deletions pet/locale/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -1653,6 +1653,10 @@
"briefing.settings.time_hint": "到点且肥鱼在跑就生成;错过了会在当天稍后补做。星期一回看过去 72 小时,其余日子 24 小时。",
"briefing.settings.model": "用哪个模型",
"briefing.settings.model_hint": "交给 Claude Code 的模型别名(claude -p --model)。一次简报约 40~90 秒;选「自定义」可以填完整模型名,只认字母数字和 . _ -。",
"briefing.settings.sprint_scope": "Sprint 范围(JQL 片段)",
"briefing.settings.sprint_scope_hint": "「当前 Sprint」只列满足这个条件的工单,拼成 sprint = <id> AND (<片段>),例如 component = Platform、labels = team-x、filter = 12345。留空 = 我的工单所在的项目——公司共用的 sprint 可能有几百条,按看板的过滤条件填才准。",
"briefing.settings.source.sprint": "包含当前 Sprint",
"briefing.settings.source.sprint_hint": "我所在团队正在进行的 sprint 里的全部工单(不限经办人,最多 80 条),按 Jira 的优先级排、不标星级,单独一节放在最前面。和 Jira 共用 Atlassian 的只读工具。",
"briefing.settings.source.jira": "包含 Jira",
"briefing.settings.source.jira_hint": "分配给我且未完成的工单(最多 15 条,最近有更新的在前)。放行 Atlassian 的只读工具。",
"briefing.settings.source.pr": "包含 GitHub PR",
Expand Down
6 changes: 3 additions & 3 deletions pet/panorama/page/report.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
分区的来源色(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;
--src-sprint:#c4603a;--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;
--src-sprint:#d6764f;--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}
Expand Down Expand Up @@ -46,7 +46,7 @@ main{padding-top:18px;padding-bottom:48px}
.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-sprint{--src:var(--src-sprint)}.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}
Expand Down
2 changes: 1 addition & 1 deletion pet/panorama/reports.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
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",)),
SOURCE_WORDS = (("sprint", ("sprint", "迭代")), ("jira", ("jira", "工单")), ("pr", ("pull request", "pr")), ("slack", ("slack",)),
("calendar", ("日程", "日历", "calendar", "schedule", "meeting")), ("email", ("邮件", "email", "mail")),
("suggestions", ("建议", "suggest", "first")))
_H3 = re.compile(r"<h3>(.*?)</h3>\n?", re.S)
Expand Down
2 changes: 2 additions & 0 deletions pet/settings_table.py
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,8 @@ def _agent_link_group(group_id: str, zone: str, settings: tuple, title_key: str,
Setting("model", "choice_or_text", choices=_MODEL_CHOICES, text="briefing.settings.model"),
Setting("effort", "choice", choices=wb.EFFORT_CHOICES, text="briefing.settings.effort"),
*(Setting(f"sources.{source}", "toggle", text=f"briefing.settings.source.{source}") for source in wb.SOURCES),
# 「当前 Sprint」查哪些工单:一行 JQL 片段,只进提示词;写入过 normalize_sprint_scope(取第一行、最多 300 字)
Setting("sprint_scope", "text", text="briefing.settings.sprint_scope", hint="briefing.settings.sprint_scope_hint"),
_briefing_prompt("zh"),
_briefing_prompt("en"),
Setting("priority_rules", "long_text", text="briefing.settings.priority_rules"),
Expand Down
Loading
Loading