From f0c0c78cb08d8c0b4eeda8634492d430a70eb3a3 Mon Sep 17 00:00:00 2001 From: Limin Wang Date: Fri, 20 Nov 2026 01:18:36 -0800 Subject: [PATCH] =?UTF-8?q?feat(panorama):=20=E5=8F=B3=E4=BE=A7=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=A0=8F=E8=83=BD=E6=8B=96=E5=AE=BD=EF=BC=9B=E6=9D=A1?= =?UTF-8?q?=E7=9B=AE=E5=88=97=E8=A1=A8=E9=BB=98=E8=AE=A4=E7=B4=A7=E5=87=91?= =?UTF-8?q?=E3=80=81=E9=80=90=E6=9D=A1=E6=8A=98=E5=8F=A0=E3=80=81=E8=B6=85?= =?UTF-8?q?=E8=BF=87=205=20=E6=9D=A1=E5=8F=AF=E7=AD=9B=E9=80=89=EF=BC=9B?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=80=BC=E5=90=8E=E9=9D=A2=E5=B8=A6=E3=80=8C?= =?UTF-8?q?N=20=E5=B0=8F=E6=97=B6=E5=89=8D=E3=80=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - shell.html / app.css:两列之间加把手 #gutter,右栏宽度走 --aside-w(300–720,默认 380);窄屏单栏时把手藏起 - interact.js:拖把手改宽度、松手存 localStorage、双击复原,地图跟着 fit();列表每条一个 .item(行 + 折着的 dl.more), ▸ / ▾ 逐条展开,展开状态按「磁贴 + 条目」记在模块里(重画不丢);工具条:条数、筛选框(> 5 条)、全部展开 / 收起(存 localStorage); 筛选只改 hidden、不重画;事实和 more 里长得像时间的值后面补「· N 分钟 / 小时 / 天前」 - util.js:ago / rowMatches / clampAside 三个纯函数;render.PAGE_KEYS + 字表;docs/config-panorama;CHANGELOG Co-Authored-By: Claude Fable 5.1 --- CHANGELOG.md | 1 + docs/config-panorama.md | 12 +++++++++ pet/locale/en.json | 9 +++++++ pet/locale/zh.json | 9 +++++++ pet/panorama/page/app.css | 21 ++++++++++++--- pet/panorama/page/interact.js | 43 ++++++++++++++++++++++++++---- pet/panorama/page/shell.html | 1 + pet/panorama/page/util.js | 20 ++++++++++++++ pet/panorama/render.py | 1 + tests/test_panorama_page.py | 50 +++++++++++++++++++++++++++++++++-- 10 files changed, 156 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89e0cb9..ded7729 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ ## 2026-11 +- 11-20 配置全景的右侧详情栏能拖宽了(两列之间的把手,双击复原);磁贴详情里的列表默认紧凑,每条 ▸ 展开说明、可全部展开 / 收起,超过 5 条有筛选框;「上次探测」这类时间后面带「N 小时前」 - 11-20 自定义联动 Agent 能在配置全景上改了:「本机联动」设置里多一张表(标识 / 显示名 / 事件文件,加行、删行、整表保存,不合规的行标红),存了就生效,不用再重启肥鱼;开关仍在右键菜单「Agent 联动 → 自定义联动 Agent」 - 11-20 个人简报也改在浏览器里看:岛上的人形图标、提醒的「查看」打开配置全景的 `/report/personal_briefing`(和工作简报同一张页:分区、筛选、勾掉;「这次是怎么生成的」写明怎么连的、读了哪些文件、pull 成没成)。页上多一个「记灵感…」按钮,在肥鱼里打开原来窗口的灵感页;那扇窗不再带「简报」页 - 11-20 简报页改版:宽幅两栏,左边每个来源一块磁贴(点了滚过去)和筛选片(★★★ / ★★ / ★ / bug / 有更新,可多选),右边每个来源一张卡(实色磁贴头、条数与 ★★★ / bug / 有更新 的计数、可折叠);每条前面有勾选框,处理完勾掉(只记在这个浏览器里,重新生成后清零),可以隐藏已勾掉的;窄屏单栏。顺手修了链接文字里带方括号(日历事件「[Daily] …」)渲染不成链接的问题 diff --git a/docs/config-panorama.md b/docs/config-panorama.md index 27ea8fd..85f6ec4 100644 --- a/docs/config-panorama.md +++ b/docs/config-panorama.md @@ -127,6 +127,18 @@ 命令行里名字像密钥的参数(`--token X`、`--api-key=X`、`TOKEN=X`)把值换成 `***`。认的是**参数名字**像不像,不是值, 所以直接把密钥当位置参数写在命令行里的认不出来。要看原文,点「查看」开 `~/.claude.json`(那条路不脱敏)。 +**详情栏的列表怎么摆**(2026-11-20,对所有带条目的磁贴一样,连接器只是条目最多的那块): + +- **默认紧凑**:每条一行(状态点 · 名字 · 右侧一句);带说明的条目行首是 ▸,点了展开那一条的 `dl.more`(再点收起)。 + 展开状态按「磁贴 id + 条目名」记在 `interact.js` 的模块变量里,数据更新重画后还在。列表头上一行工具:条数、 + 「全部展开 / 全部收起」(存 `localStorage`,只是这个浏览器的便利)。 +- **列表内筛选**:超过 5 条时多一个输入框,按名字 / 右侧一句 / 说明里的值过滤(`util.rowMatches`,不分大小写),只改每条的 + `hidden`、不重画(重画会丢输入焦点);筛选词按磁贴记住。页顶的搜索框照旧只高亮磁贴。 +- **相对时间**:事实和说明里长得像 `YYYY-MM-DD HH:MM(:SS)` 的值,后面补「· N 分钟 / 小时 / 天前」(`util.ago`,不到 1 分钟是 + 「刚刚」,未来时间不补),按画的那一刻算——数据更新会重画,所以不另起定时器。 +- **右栏能拖宽**:两列之间有一条把手(`#gutter`),拖动改 CSS 变量 `--aside-w`(`util.clampAside`:300–720px,默认 380),松手存 + `localStorage`,双击复原;地图随之 `fit()` 重算缩放。窄于 1280px 的单栏版面把手藏起。离线快照同一套外壳,也能用。 + ### 工作空间(「项目与会话」磁贴) 两个 Claude Code 各有一块:它在哪些项目目录里干过活、各有多少次会话、上次什么时候。 diff --git a/pet/locale/en.json b/pet/locale/en.json index 801b043..fa969c1 100644 --- a/pet/locale/en.json +++ b/pet/locale/en.json @@ -2152,6 +2152,15 @@ "panorama.ui.open_vscode": "Open in VS Code", "panorama.ui.copy_path": "Copy path", "panorama.ui.copied": "Copied", + "panorama.ui.list_count": "{n} items", + "panorama.ui.list_filter": "Filter this list…", + "panorama.ui.expand_all": "Expand all", + "panorama.ui.collapse_all": "Collapse all", + "panorama.ui.ago_now": "just now", + "panorama.ui.ago_minutes": "{n} min ago", + "panorama.ui.ago_hours": "{n} h ago", + "panorama.ui.ago_days": "{n} d ago", + "panorama.ui.gutter_tip": "Drag to resize the side panel, double-click to reset", "panorama.ui.settings_at": "Settings: {page}", "panorama.ui.settings_hint": "Change it there in the fish; this page cannot jump to it yet", "panorama.ui.footer": "This is this machine's configuration as read at the time above, read-only; open it again from the fish to refresh. API keys show only their last 4 characters.", diff --git a/pet/locale/zh.json b/pet/locale/zh.json index dd98615..54c35e4 100644 --- a/pet/locale/zh.json +++ b/pet/locale/zh.json @@ -2144,6 +2144,15 @@ "panorama.ui.open_vscode": "在 VS Code 打开", "panorama.ui.copy_path": "复制路径", "panorama.ui.copied": "已复制", + "panorama.ui.list_count": "{n} 条", + "panorama.ui.list_filter": "筛选这一列表…", + "panorama.ui.expand_all": "全部展开", + "panorama.ui.collapse_all": "全部收起", + "panorama.ui.ago_now": "刚刚", + "panorama.ui.ago_minutes": "{n} 分钟前", + "panorama.ui.ago_hours": "{n} 小时前", + "panorama.ui.ago_days": "{n} 天前", + "panorama.ui.gutter_tip": "拖动调整右栏宽度,双击复原", "panorama.ui.settings_at": "设置:{page}", "panorama.ui.settings_hint": "在肥鱼的这个位置改;这里还不能直接跳过去", "panorama.ui.footer": "这是上面那个时刻读到的本机配置,只读;要更新就从肥鱼里再打开一次。API key 只显示末 4 位。", diff --git a/pet/panorama/page/app.css b/pet/panorama/page/app.css index 57da83c..8e186de 100644 --- a/pet/panorama/page/app.css +++ b/pet/panorama/page/app.css @@ -18,8 +18,11 @@ header input:focus{outline:2px solid var(--m-accent);outline-offset:-1px} .chip i{display:inline-block;width:18px;height:3px} .legend{display:flex;flex-wrap:wrap;gap:4px 14px;align-items:center;color:var(--muted);font-size:12px;padding:6px 16px 0} .legend span{display:inline-flex;align-items:center;gap:6px} -.layout{display:grid;grid-template-columns:minmax(0,1fr) 380px;gap:14px;padding:10px 16px 14px;align-items:start} -@media (max-width:1280px){.layout{grid-template-columns:minmax(0,1fr)}} +.layout{display:grid;grid-template-columns:minmax(0,1fr) 8px var(--aside-w,380px);gap:0 6px;padding:10px 16px 14px;align-items:start} +/* 两列之间的把手:拖动改 --aside-w(interact.js),悬停 / 拖动时亮一条 */ +.gutter{align-self:stretch;min-height:200px;cursor:col-resize;position:sticky;top:60px;border-left:2px solid transparent;margin-left:3px;transition:border-color .12s} +.gutter:hover,.gutter.drag{border-color:var(--m-accent)} +@media (max-width:1280px){.layout{grid-template-columns:minmax(0,1fr)}.gutter{display:none}} .stage{overflow:auto;background:#0b0f13} .map{position:relative;transform-origin:0 0} .band{position:absolute;border-top:3px solid var(--zc)} @@ -99,9 +102,18 @@ aside{display:flex;flex-direction:column;gap:14px;position:sticky;top:60px} .nb{display:flex;flex-wrap:wrap;gap:5px;margin-top:4px} .nb button{background:var(--m-field);border:0;color:var(--m-text);font:inherit;font-size:12px;padding:3px 8px;cursor:pointer;display:inline-flex;gap:6px;align-items:center} .nb button:hover{background:var(--m-tile-hover)}.nb button:focus-visible{outline:2px solid var(--m-accent)} -.list{max-height:250px;overflow:auto;font-size:12.5px;margin-top:6px} -.list div{display:flex;gap:8px;align-items:center;padding:2px 0} +.list{max-height:250px;overflow:auto;font-size:12.5px;margin-top:4px} +.list .item[hidden]{display:none} +.list .row{display:flex;gap:8px;align-items:center;padding:2px 0;min-width:0} +.list .row .fold{flex:0 0 14px;width:14px;padding:0;border:0;background:transparent;color:var(--muted);font:inherit;font-size:11px;cursor:pointer;line-height:1} +.list .row .fold:hover{color:var(--text)}.list .row .fold:focus-visible{outline:2px solid var(--m-accent)} +.list .row .fold-gap{flex:0 0 14px} .list small{color:var(--muted);margin-left:auto;white-space:nowrap} +.ltools{display:flex;align-items:center;gap:8px;margin-top:8px;font-size:12px;color:var(--muted)} +.ltools .lfilter{flex:1;min-width:60px;background:var(--m-field);border:1px solid var(--m-field-border);color:var(--m-text);padding:3px 8px;font:inherit;font-size:12px} +.ltools .lfilter:focus{outline:2px solid var(--m-accent);outline-offset:-1px} +.ltools .peek{margin-left:auto;padding:1px 8px;font:inherit;font-size:11.5px;border:0;background:var(--m-tile);color:var(--m-title);cursor:pointer} +.ago{color:var(--muted);font-size:11.5px} .list:has(.more){max-height:420px} .list .peek{margin-left:8px;padding:1px 8px;font:inherit;font-size:11.5px;border:0;background:var(--m-tile);color:var(--m-title);cursor:pointer} .list .peek:hover:not(:disabled){background:var(--m-tile-hover)}.list .peek:focus-visible{outline:2px solid var(--m-accent)}.list .peek:disabled,.btn:disabled{opacity:.45;cursor:not-allowed} @@ -185,6 +197,7 @@ aside{display:flex;flex-direction:column;gap:14px;position:sticky;top:60px} .memory .peek:hover{background:var(--m-tile-hover)}.memory .hint{margin:6px 0;font-size:11.5px;color:var(--muted)} .list .more{display:grid;grid-template-columns:78px minmax(0,1fr);gap:2px 8px;margin:0 0 9px 16px;padding:0 0 8px;font-size:11.5px;border-bottom:1px solid #252e38} .list .more dt{color:var(--muted)}.list .more dd{margin:0;word-break:break-word;color:#c5ced8} +.list .more[hidden]{display:none} .quest{display:flex;gap:9px;align-items:flex-start;padding:7px 0;border-top:1px solid #252e38;cursor:pointer;font-size:12.5px} .quest:first-of-type{border-top:0}.quest:hover{color:#fff}.quest .dot{margin-top:4px} .quest span{flex:1}.btn.mini{padding:2px 8px;font-size:11.5px;flex:none;align-self:center} diff --git a/pet/panorama/page/interact.js b/pet/panorama/page/interact.js index 3a1e648..ea3bc3a 100644 --- a/pet/panorama/page/interact.js +++ b/pet/panorama/page/interact.js @@ -2,12 +2,19 @@ 数据换了页面会原地重画,所以这里可以反复调:每次调用挂的监听都带同一个中止信号,返回的 dispose() 一次摘干净; kept 是上一次 capture() 记下的「用户正看着什么」,重画后照原样恢复(那个节点或那条线还在的话)。 */ -import {esc} from './util.js'; +import {esc, ago, rowMatches, clampAside} from './util.js'; import {viewer} from './viewer.js'; import {memory} from './memory.js'; import {settingsPanel} from './settings.js'; import {actionButton, runAction} from './repair.js'; +/* 详情里列表的状态放在模块里(不随重画丢):哪些条目展开着(磁贴 id + 条目名)、每块磁贴的筛选词、「全部展开」。 + 「全部展开」和右栏宽度还存 localStorage——只是这个浏览器的便利,不进配置。 */ +const expanded = new Set(), filters = new Map(); +const store = {get: k => { try { return localStorage.getItem(k); } catch (e) { return null; } }, + set: (k, v) => { try { localStorage.setItem(k, v); } catch (e) { /* 隐私窗口等 */ } }}; +let expandAll = store.get('panorama-rows') === 'all'; + export function interact(M, E, map, kept, api) { const {G, R, N, W, H} = M; const S = G.strings, STATE = S.state, ESTATE = S.edge_state; @@ -17,7 +24,7 @@ const memo = memory(G, S, on, api ? files.open : null); const panel = settingsPanel(api, S); /* 整页只有一个,重画时拿到的还是它(见 settings.js) */ /* 「查看」按钮:从肥鱼打开的页面才有服务可问;离线快照里按钮是灰的,悬停说明为什么 */ const viewBtn = (store, title, cls) => ``; -let selected = null, lineOn = null; +let selected = null, lineOn = null, lastRows = new Map(); function trace(id) { const ns = new Set([id]), es = new Set(); const walk = fwd => { const q = [id], seen = new Set([id]); while (q.length) { const c = q.pop(); E.forEach((e, i) => { const a = fwd ? e.from : e.to, b = fwd ? e.to : e.from; @@ -46,12 +53,21 @@ function detail(id) { const box = document.getElementById('detail'); const rank = r => r.state === 'off' ? 2 : r.state === 'ok' || r.state === 'unknown' || r.state === 'live' ? 1 : 0; const rows = (n.items || []).slice().sort((a, b) => rank(a) - rank(b)); const todo = G.quests.find(q => q.node === id && q.action); /* 这块磁贴有能点的动作(装 hooks):详情里也给一个按钮 */ + /* 时间值后面补「· N 小时前」;列表默认紧凑:带 more 的条目折着,点 ▸ 展开;超过 5 条给一个筛选框 */ + const when = v => { const a = ago(v, S); return esc(v) + (a ? ` · ${esc(a)}` : ''); }; + const keyOf = r => id + '\u0000' + r.name, open = r => expandAll || expanded.has(keyOf(r)), q = filters.get(id) || ''; + lastRows = new Map(rows.map(r => [r.name, r])); + const tools = !rows.length ? '' : `
${esc(String(S.list_count || '{n}').replace('{n}', rows.length))}` + + (rows.length > 5 ? `` : '') + + (rows.some(r => r.more) ? `` : '') + '
'; const nb = (list, key) => list.map(e => ``).join(''); box.innerHTML = `

${esc(k.name || n.kind)} · ${esc(R[n.region].title)}

${esc(n.title)}

${STATE[n.state] || ''}
-
${(n.facts || []).filter(f => f[1] !== undefined && f[1] !== null && f[1] !== '').map(([a, b]) => `
${esc(a)}
${esc(b)}
`).join('')}
- ${rows.length ? `
${rows.map(r => `
${esc(r.name)}${esc(r.detail || '')}${r.view ? viewBtn(r.view, r.name, 'peek') : ''}
` + - (r.more ? `
${r.more.map(([a, b]) => `
${esc(a)}
${esc(b)}
`).join('')}
` : '')).join('')}
` : ''} +
${(n.facts || []).filter(f => f[1] !== undefined && f[1] !== null && f[1] !== '').map(([a, b]) => `
${esc(a)}
${when(b)}
`).join('')}
+ ${rows.length ? tools + `
${rows.map(r => `
` + + (r.more ? `` : '') + + `${esc(r.name)}${esc(r.detail || '')}${r.view ? viewBtn(r.view, r.name, 'peek') : ''}
` + + (r.more ? `
${r.more.map(([a, b]) => `
${esc(a)}
${when(b)}
`).join('')}
` : '') + '
').join('')}
` : ''} ${src.path ? `
${esc(src.path)}${src.key ? '
→ ' + esc(src.key) : ''}
` : ''}
${actionButton(S, todo, api).replace(' mini', '')}${n.settings ? `` : ''}${n.view ? viewBtn(n.view, n.title, 'btn') : ''}${n.memory ? `` : ''}${link ? `${esc(S.open_vscode)}` : ''}${src.path ? `` : ''} ${n.page ? `${esc(S.settings_at.replace('{page}', n.page))}` : ''}
@@ -63,8 +79,15 @@ function pickLine(k) { select(null); lineOn = k; function search(text) { const q = text.trim().toLowerCase(); if (!q) return paint(null, null); paint(new Set(G.nodes.filter(n => [n.title, n.sub, ...(n.lines || []), (G.kinds[n.kind] || {}).name, ...(n.facts || []).reduce((all, f) => all.concat(f), []), ...(n.items || []).map(p => p.name), ...(n.items || []).reduce((all, p) => all.concat((p.more || []).map(m => m[1])), []), (n.source || {}).path, (n.source || {}).key].join(' ').toLowerCase().includes(q)).map(n => n.id)), new Set()); } map.addEventListener('click', ev => { const t = ev.target.closest('.tile'); select(t ? (t.dataset.id === selected ? null : t.dataset.id) : null); }, on); +/* 列表内筛选:不重画(重画会丢掉输入焦点),只改每条的 hidden */ +function applyFilter(id) { const q = filters.get(id) || ''; + document.getElementById('detail').querySelectorAll('.list .item').forEach(it => { const r = lastRows.get(it.dataset.row); it.hidden = !!r && !rowMatches(r, q); }); } +document.getElementById('detail').addEventListener('input', ev => { const f = ev.target.closest('[data-filter]'); if (!f) return; + filters.set(f.dataset.filter, f.value); applyFilter(f.dataset.filter); }, on); document.getElementById('detail').addEventListener('click', ev => { const act = ev.target.closest('[data-action]'); if (act) return act.disabled || runAction(api, S, act); + const tog = ev.target.closest('[data-toggle]'); if (tog) { const k = selected + '\u0000' + tog.dataset.toggle; if (expanded.has(k)) expanded.delete(k); else expanded.add(k); return detail(selected); } + if (ev.target.closest('[data-expand-all]')) { expandAll = !expandAll; store.set('panorama-rows', expandAll ? 'all' : 'compact'); return detail(selected); } const go = ev.target.closest('[data-go]'); if (go) return select(go.dataset.go); const see = ev.target.closest('[data-view]'); if (see) return files.open(see.dataset.view, see.dataset.title); const set = ev.target.closest('[data-settings]'); if (set) return panel.open(set.dataset.settings, set.dataset.title); @@ -84,6 +107,16 @@ document.getElementById('legend').innerHTML = ['live', 'ok', 'warn', 'broken', ' function fit() { const st = document.getElementById('stage'), s = Math.max(.45, Math.min(1.3, st.clientWidth / W)); map.style.transform = `scale(${s})`; st.style.height = Math.ceil(H * s) + 14 + 'px'; } addEventListener('resize', fit, on); fit(); +/* 右栏宽度:拖两列之间的把手改 --aside-w,松手存起来,双击复原;地图跟着重算缩放。单栏(窄屏)时把手藏着。 */ +const gutter = document.getElementById('gutter'), rootStyle = document.documentElement && document.documentElement.style; +function setAside(px, persist) { if (!rootStyle || !rootStyle.setProperty) return; const w = clampAside(px); rootStyle.setProperty('--aside-w', w + 'px'); + if (persist) store.set('panorama-aside', String(w)); fit(); } +if (gutter) { gutter.title = S.gutter_tip || ''; const saved = store.get('panorama-aside'); if (saved) setAside(saved); + gutter.addEventListener('pointerdown', ev => { ev.preventDefault(); gutter.classList.add('drag'); let last = null; + const move = e => { last = clampAside(innerWidth - e.clientX - 16); setAside(last); }; + const up = () => { gutter.classList.remove('drag'); removeEventListener('pointermove', move); removeEventListener('pointerup', up); if (last !== null) setAside(last, true); }; + addEventListener('pointermove', move); addEventListener('pointerup', up); }, on); + gutter.addEventListener('dblclick', () => setAside(380, true), on); } document.getElementById('title').textContent = S.title; document.getElementById('q').placeholder = S.search_placeholder; document.getElementById('motion').textContent = document.body.classList.contains('still') ? S.motion_off : S.motion_on; diff --git a/pet/panorama/page/shell.html b/pet/panorama/page/shell.html index 28c700f..38ebae1 100644 --- a/pet/panorama/page/shell.html +++ b/pet/panorama/page/shell.html @@ -21,6 +21,7 @@

+