Skip to content

A team of long-lived bots for DeepSeek Harness, with main bots, bot-to-bot messages and group chats.

Proposal card uses Bot styling and shows a real diff for skill updates

Fei241182ecdacf57d7
diff --git a/ds-bot/client.js b/ds-bot/client.js
index fc5ef1e9..ff08d17e 100644
--- a/ds-bot/client.js
+++ b/ds-bot/client.js
@@ -120,7 +120,7 @@ var ZH = {
"New skill": "新技能",
"Awaiting approval": "等待批准",
Added: "新增",
- "Show all": "展开全部",
+ "Show all {count} lines": "展开全部 {count} 行",
"Skill update": "技能更新",
Approve: "批准",
Decline: "拒绝",
@@ -18975,6 +18975,37 @@ function proposalPlacement(proposal, turns) {
const turn = (before ?? latest)?.turn;
return turn === void 0 ? { kind: "dock" } : { kind: "turn", turn };
}
+function fileLines(text) {
+ const body = String(text ?? "").replace(/\n+$/, "");
+ return body === "" ? [] : body.split("\n");
+}
+function lineDiff(before, after) {
+ const a = fileLines(before);
+ const b = fileLines(after);
+ const keep = Array.from({ length: a.length + 1 }, () => new Array(b.length + 1).fill(0));
+ for (let i2 = a.length - 1; i2 >= 0; i2--) {
+ for (let j2 = b.length - 1; j2 >= 0; j2--) {
+ keep[i2][j2] = a[i2] === b[j2] ? keep[i2 + 1][j2 + 1] + 1 : Math.max(keep[i2 + 1][j2], keep[i2][j2 + 1]);
+ }
+ }
+ const rows2 = [];
+ let i = 0;
+ let j = 0;
+ while (i < a.length || j < b.length) {
+ if (i < a.length && j < b.length && a[i] === b[j]) {
+ rows2.push({ kind: "same", line: b[j], number: j + 1 });
+ i++;
+ j++;
+ } else if (i < a.length && (j === b.length || keep[i + 1][j] >= keep[i][j + 1])) {
+ rows2.push({ kind: "removed", line: a[i] });
+ i++;
+ } else {
+ rows2.push({ kind: "added", line: b[j], number: j + 1 });
+ j++;
+ }
+ }
+ return rows2;
+}
// src/client/learning-card.js
var import_react46 = require("react");
@@ -18998,42 +19029,54 @@ function ProposalCard({ proposal, initialError = "", onFailure, onResolved, acti
setBusy(false);
});
};
- const lines = String(proposal.content ?? "").replace(/\n+$/, "").split("\n");
- const rows2 = lines.map((line, index) => ({ kind: "added", mark: String(index + 1), line }));
+ const update = proposal.action === "update";
+ const rows2 = lineDiff(update ? proposal.previous?.content : "", proposal.content);
return (0, import_react46.createElement)(
"section",
{ className: "bt-q bt-learning-card", role: "group", "aria-labelledby": titleId, "aria-busy": busy },
- (0, import_react46.createElement)(
- "div",
- { className: "bt-learning-headtext" },
- (0, import_react46.createElement)("span", { className: "bt-learning-status" }, t("Awaiting approval")),
- (0, import_react46.createElement)("p", { className: "bt-q-title", id: titleId }, proposal.name),
- (0, import_react46.createElement)("p", { className: "bt-learning-sub" }, t(proposal.action === "update" ? "Skill update" : "New skill")),
- proposal.description ? (0, import_react46.createElement)("p", { className: "bt-learning-description" }, proposal.description) : null
- ),
- (0, import_react46.createElement)(FileBox, {
- name: "SKILL.md",
- path: `skills/${proposal.name}`,
- added: rows2.length,
- removed: 0,
- state: proposal.action === "update" ? "Updated" : "Added",
- blocks: [rows2]
- }),
+ (0, import_react46.createElement)(ProposalHead, { titleId, title: proposal.name, kind: t(update ? "Skill update" : "New skill"), detail: proposal.description }),
+ (0, import_react46.createElement)(FileBox, { name: "SKILL.md", path: `skills/${proposal.name}`, state: update ? "Updated" : "Added", blocks: [rows2] }),
proposal.why ? (0, import_react46.createElement)("p", { className: "bt-learning-why" }, proposal.why) : null,
error ? (0, import_react46.createElement)("div", { className: "bt-learning-error", role: "alert" }, error) : null,
+ (0, import_react46.createElement)(ProposalFoot, { busy, answer })
+ );
+}
+function ProposalHead({ titleId, title, kind, detail }) {
+ return (0, import_react46.createElement)(
+ "div",
+ { className: "bt-q-head" },
+ (0, import_react46.createElement)("span", { className: "bt-learning-icon", "aria-hidden": true }, (0, import_react46.createElement)(MemoryIcon)),
(0, import_react46.createElement)(
"div",
- { className: "bt-learning-actions" },
- (0, import_react46.createElement)("button", { type: "button", className: "bt-learning-btn bt-learning-approve", disabled: busy, onClick: () => answer(true) }, t("Approve")),
- (0, import_react46.createElement)("button", { type: "button", className: "bt-learning-btn bt-learning-decline", disabled: busy, onClick: () => answer(false) }, t("Decline"))
+ { className: "bt-q-text" },
+ (0, import_react46.createElement)("p", { className: "bt-q-title", id: titleId }, title),
+ (0, import_react46.createElement)("div", { className: "bt-q-detail" }, kind),
+ detail ? (0, import_react46.createElement)("p", { className: "bt-learning-description" }, detail) : null
+ ),
+ (0, import_react46.createElement)("span", { className: "bt-q-badge bt-learning-status" }, (0, import_react46.createElement)("span", { className: "bt-learning-dot", "aria-hidden": true }), t("Awaiting approval"))
+ );
+}
+function ProposalFoot({ busy, answer }) {
+ return (0, import_react46.createElement)(
+ "div",
+ { className: "bt-q-foot bt-learning-foot" },
+ (0, import_react46.createElement)("button", { type: "button", className: "bt-learning-btn bt-learning-decline", disabled: busy, onClick: () => answer(false) }, t("Decline")),
+ (0, import_react46.createElement)(
+ "button",
+ { type: "button", className: "bt-learning-btn bt-learning-approve", disabled: busy, onClick: () => answer(true) },
+ (0, import_react46.createElement)(CheckIcon),
+ t("Approve")
)
);
}
var COLLAPSE_ROWS = 8;
-function FileBox({ name, path, added, removed, state, blocks }) {
+var SIGNS = { added: "+", removed: "−", same: "" };
+function FileBox({ name, path, state, blocks }) {
const [open, setOpen] = (0, import_react46.useState)(false);
- const total = blocks.reduce((sum, rows2) => sum + rows2.length, 0);
- const folds = total > COLLAPSE_ROWS;
+ const all = blocks.flat();
+ const added = all.filter((row) => row.kind === "added").length;
+ const removed = all.filter((row) => row.kind === "removed").length;
+ const folds = all.length > COLLAPSE_ROWS;
const shut = folds && !open;
return (0, import_react46.createElement)(
"div",
@@ -19041,12 +19084,12 @@ function FileBox({ name, path, added, removed, state, blocks }) {
(0, import_react46.createElement)(
"div",
{ className: "bt-learning-filehead" },
- (0, import_react46.createElement)("strong", null, name),
+ (0, import_react46.createElement)("span", { className: "bt-learning-name" }, name),
path ? (0, import_react46.createElement)("span", { className: "bt-learning-path" }, path) : null,
(0, import_react46.createElement)("span", { className: "bt-learning-spacer" }),
added > 0 ? (0, import_react46.createElement)("span", { className: "bt-learning-plus" }, `+${added}`) : null,
removed > 0 ? (0, import_react46.createElement)("span", { className: "bt-learning-minus" }, `−${removed}`) : null,
- (0, import_react46.createElement)("span", { className: `bt-learning-state${state === "Added" ? " bt-learning-state-new" : ""}` }, t(state))
+ (0, import_react46.createElement)("span", { className: `bt-learning-state bt-learning-state-${state.toLowerCase()}` }, t(state))
),
(0, import_react46.createElement)(
"div",
@@ -19056,13 +19099,21 @@ function FileBox({ name, path, added, removed, state, blocks }) {
...rows2.map((row, rowIndex) => (0, import_react46.createElement)(
"div",
{ className: `bt-learning-row bt-learning-${row.kind}`, key: `${blockIndex}-${rowIndex}` },
- (0, import_react46.createElement)("span", { className: "bt-learning-num", "aria-hidden": true }, row.mark),
+ (0, import_react46.createElement)("span", { className: "bt-learning-num", "aria-hidden": true }, row.number ?? ""),
+ (0, import_react46.createElement)("span", { className: "bt-learning-sign", "aria-hidden": true }, SIGNS[row.kind]),
(0, import_react46.createElement)("span", { className: "bt-learning-text" }, row.line)
))
- ]),
- shut ? (0, import_react46.createElement)("div", { className: "bt-learning-fade" }) : null
+ ])
),
- folds ? (0, import_react46.createElement)("button", { type: "button", className: "bt-learning-more", "aria-expanded": open, onClick: () => setOpen(!open) }, t(open ? "Show less" : "Show all")) : null
+ folds ? (0, import_react46.createElement)(
+ "div",
+ { className: shut ? "bt-learning-morebar bt-learning-morebar-shut" : "bt-learning-morebar" },
+ (0, import_react46.createElement)(
+ "button",
+ { type: "button", className: "bt-learning-more", "aria-expanded": open, onClick: () => setOpen(!open) },
+ t(open ? "Show less" : "Show all {count} lines", { count: all.length })
+ )
+ ) : null
);
}
function LearningProposals({ turn, dock, sessionId, useRoster, actions }) {
@@ -19116,42 +19167,48 @@ function LearningDock(props) {
var LEARNING_CSS = `
.bt-learning-stack{display:flex;flex-direction:column;gap:4px}
.bt-learning-dock{width:100%;max-width:var(--dsh-chat-content-width,748px);margin:0 auto;box-sizing:border-box}
-.bt-learning-card{gap:12px}
-.bt-learning-headtext{display:flex;flex-direction:column;gap:2px;min-width:0}
-.bt-learning-status{font-size:13px;line-height:18px;font-weight:500;color:var(--bt-star)}
-.bt-learning-card .bt-q-title{overflow-wrap:anywhere}
-.bt-learning-sub{margin:0;font-size:13px;line-height:18px;color:var(--bt-ink-2)}
-.bt-learning-description{margin:4px 0 0;font-size:13px;line-height:18px;color:var(--bt-ink)}
-.bt-learning-file{border:1px solid var(--bt-line-2);border-radius:10px;overflow:hidden;background:var(--bt-card)}
-.bt-learning-filehead{display:flex;align-items:center;gap:8px;min-width:0;padding:8px 12px;border-bottom:1px solid var(--bt-line);font-size:13px;line-height:18px;color:var(--bt-ink)}
-.bt-learning-filehead strong{flex:none;font-weight:500}
+.bt-learning-card .bt-q-head{gap:12px}
+.bt-learning-icon{flex:none;display:inline-flex;align-items:center;justify-content:center;width:34px;height:34px;border-radius:10px;background:var(--bt-hover);color:var(--bt-ink-2)}
+.bt-learning-icon svg{width:18px;height:18px}
+.bt-learning-description{margin:6px 0 0;font-size:13px;line-height:19px;color:var(--bt-ink)}
+.bt-learning-status{display:inline-flex;align-items:center;gap:6px;border-style:solid;border-color:color-mix(in srgb,var(--bt-star) 35%,transparent);color:color-mix(in srgb,var(--bt-star) 80%,var(--bt-ink))}
+.bt-learning-dot{width:6px;height:6px;border-radius:50%;background:var(--bt-star)}
+.bt-learning-file{border-radius:12px;overflow:hidden;background:color-mix(in srgb,var(--bt-ink) 2.5%,var(--bt-card));box-shadow:inset 0 0 0 1px var(--bt-q-rule)}
+.bt-learning-filehead{display:flex;align-items:center;gap:8px;min-width:0;padding:8px 12px;box-shadow:inset 0 -1px 0 var(--bt-q-rule-2);font-size:12px;line-height:18px}
+.bt-learning-name{flex:none;font-weight:600;color:var(--bt-ink)}
.bt-learning-path{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--bt-ink-3)}
.bt-learning-spacer{flex:1}
-.bt-learning-plus{flex:none;font-weight:600;color:var(--bt-green)}
-.bt-learning-minus{flex:none;font-weight:600;color:var(--bt-danger)}
-.bt-learning-state{flex:none;padding:1px 8px;border-radius:6px;font-size:12px;font-weight:500;background:color-mix(in srgb,var(--bt-accent) 12%,transparent);color:var(--bt-accent)}
-.bt-learning-state-new{background:color-mix(in srgb,var(--bt-green) 14%,transparent);color:var(--bt-green)}
-.bt-learning-code{position:relative;font-family:ui-monospace,SFMono-Regular,Menlo,monospace;font-size:12px;line-height:20px;color:var(--bt-ink)}
-.bt-learning-shut{max-height:180px;overflow:hidden}
-.bt-learning-row{display:grid;grid-template-columns:40px 1fr}
-.bt-learning-num{padding-right:10px;text-align:right;color:var(--bt-ink-3);user-select:none}
-.bt-learning-text{min-width:0;padding:0 12px;white-space:pre-wrap;overflow-wrap:anywhere}
-.bt-learning-added{background:color-mix(in srgb,var(--bt-green) 10%,transparent);box-shadow:inset 3px 0 0 var(--bt-green)}
-.bt-learning-removed{background:color-mix(in srgb,var(--bt-danger) 8%,transparent);box-shadow:inset 3px 0 0 var(--bt-danger)}
-.bt-learning-gap{height:8px;background:var(--bt-hover)}
-.bt-learning-fade{position:absolute;left:0;right:0;bottom:0;height:56px;background:linear-gradient(transparent,var(--bt-card));pointer-events:none}
-.bt-learning-more{display:block;width:100%;padding:6px;border:0;border-top:1px solid var(--bt-line);background:transparent;font:inherit;font-size:12px;line-height:16px;color:var(--bt-ink-2);cursor:pointer}
-.bt-learning-more:hover{background:var(--bt-hover)}
-.bt-learning-more:focus-visible{outline:2px solid var(--bt-accent);outline-offset:-2px}
+.bt-learning-plus,.bt-learning-minus{flex:none;font-weight:600;font-variant-numeric:tabular-nums}
+.bt-learning-plus{color:var(--bt-green)}
+.bt-learning-minus{color:var(--bt-danger)}
+.bt-learning-state{flex:none;height:20px;padding:0 8px;border-radius:999px;font-size:11px;line-height:20px;font-weight:500;background:var(--bt-hover);color:var(--bt-ink-2)}
+.bt-learning-state-added{background:color-mix(in srgb,var(--bt-green) 13%,transparent);color:color-mix(in srgb,var(--bt-green) 70%,var(--bt-ink))}
+.bt-learning-code{padding:6px 0;font-family:ui-monospace,SFMono-Regular,Menlo,monospace;font-size:12px;line-height:20px;color:var(--bt-ink)}
+.bt-learning-shut{max-height:172px;overflow:hidden}
+.bt-learning-row{display:grid;grid-template-columns:36px 16px 1fr}
+.bt-learning-num{padding-right:6px;text-align:right;color:var(--bt-ink-3);font-variant-numeric:tabular-nums;user-select:none}
+.bt-learning-sign{text-align:center;user-select:none}
+.bt-learning-text{min-width:0;padding-right:12px;white-space:pre-wrap;overflow-wrap:anywhere}
+.bt-learning-added{background:color-mix(in srgb,var(--bt-green) 9%,transparent)}
+.bt-learning-added .bt-learning-sign{color:var(--bt-green)}
+.bt-learning-removed{background:color-mix(in srgb,var(--bt-danger) 7%,transparent)}
+.bt-learning-removed .bt-learning-sign{color:var(--bt-danger)}
+.bt-learning-removed .bt-learning-text{color:var(--bt-ink-2)}
+.bt-learning-gap{height:1px;margin:6px 12px;background:var(--bt-q-rule)}
+.bt-learning-morebar{display:flex;justify-content:center;padding:4px 0 8px}
+.bt-learning-morebar-shut{position:relative;margin-top:-36px;padding-top:28px;background:linear-gradient(transparent,color-mix(in srgb,var(--bt-ink) 2.5%,var(--bt-card)) 60%)}
+.bt-learning-more{height:24px;padding:0 10px;border:0;border-radius:999px;background:var(--bt-card);box-shadow:inset 0 0 0 1px var(--bt-q-edge);font:inherit;font-size:12px;color:var(--bt-ink-2);cursor:pointer;transition:background-color .12s ease,color .12s ease}
+.bt-learning-more:hover{background:var(--bt-hover);color:var(--bt-ink)}
+.bt-learning-more:focus-visible{outline:2px solid var(--bt-accent);outline-offset:2px}
.bt-learning-why{margin:0;font-size:12px;line-height:17px;color:var(--bt-ink-2)}
-.bt-learning-actions{display:flex;align-items:center;justify-content:flex-start;gap:8px}
-.bt-learning-btn{flex:none;display:inline-flex;align-items:center;height:32px;padding:0 16px;border-radius:8px;font:inherit;font-size:14px;font-weight:500;cursor:pointer;transition:background-color .12s ease,opacity .12s ease,${spring(SPRING_TAP, "scale")}}
-.bt-learning-decline{background:transparent;border:1px solid var(--bt-line-2);color:var(--bt-ink)}
+.bt-learning-btn{flex:none;display:inline-flex;align-items:center;gap:6px;height:34px;padding:0 16px;border:0;border-radius:999px;font:inherit;font-size:14px;font-weight:500;cursor:pointer;transition:background-color .12s ease,opacity .12s ease,${spring(SPRING_TAP, "scale")}}
+.bt-learning-btn svg{width:15px;height:15px}
+.bt-learning-decline{background:transparent;box-shadow:inset 0 0 0 1px var(--bt-line-2);color:var(--bt-ink)}
.bt-learning-decline:hover:not(:disabled){background:var(--bt-hover)}
-.bt-learning-approve{border:1px solid transparent;background:var(--bt-ink);color:var(--bt-card)}
-.bt-learning-approve:hover:not(:disabled){opacity:.88}
+.bt-learning-approve{padding-left:13px;background:var(--bt-accent);color:var(--bt-accent-ink,#fff)}
+.bt-learning-approve:hover:not(:disabled){opacity:.86}
.bt-learning-btn:disabled{opacity:.45;cursor:default}
-.bt-learning-btn:active:not(:disabled){scale:.97}
+.bt-learning-btn:active:not(:disabled){scale:.96}
.bt-learning-btn:focus-visible{outline:2px solid var(--bt-accent);outline-offset:2px}
@media (prefers-reduced-motion:reduce){.bt-learning-btn{transition:background-color .12s ease,opacity .12s ease}.bt-learning-btn:active:not(:disabled){scale:none}}
.bt-learning-error{font-size:12px;line-height:16px;color:var(--bt-danger)}
diff --git a/ds-bot/src/client/i18n.js b/ds-bot/src/client/i18n.js
index 500639a5..697ed182 100644
--- a/ds-bot/src/client/i18n.js
+++ b/ds-bot/src/client/i18n.js
@@ -84,7 +84,7 @@ const ZH = {
'New skill': '新技能',
'Awaiting approval': '等待批准',
Added: '新增',
- 'Show all': '展开全部',
+ 'Show all {count} lines': '展开全部 {count} 行',
'Skill update': '技能更新',
Approve: '批准',
Decline: '拒绝',
diff --git a/ds-bot/src/client/learning-card-model.js b/ds-bot/src/client/learning-card-model.js
index 14c9fda6..05c568b3 100644
--- a/ds-bot/src/client/learning-card-model.js
+++ b/ds-bot/src/client/learning-card-model.js
@@ -12,3 +12,36 @@ export function proposalPlacement(proposal, turns) {
const turn = (before ?? latest)?.turn
return turn === undefined ? { kind: 'dock' } : { kind: 'turn', turn }
}
+
+export function fileLines(text) {
+ const body = String(text ?? '').replace(/\n+$/, '')
+ return body === '' ? [] : body.split('\n')
+}
+
+export function lineDiff(before, after) {
+ const a = fileLines(before)
+ const b = fileLines(after)
+ const keep = Array.from({ length: a.length + 1 }, () => new Array(b.length + 1).fill(0))
+ for (let i = a.length - 1; i >= 0; i--) {
+ for (let j = b.length - 1; j >= 0; j--) {
+ keep[i][j] = a[i] === b[j] ? keep[i + 1][j + 1] + 1 : Math.max(keep[i + 1][j], keep[i][j + 1])
+ }
+ }
+ const rows = []
+ let i = 0
+ let j = 0
+ while (i < a.length || j < b.length) {
+ if (i < a.length && j < b.length && a[i] === b[j]) {
+ rows.push({ kind: 'same', line: b[j], number: j + 1 })
+ i++
+ j++
+ } else if (i < a.length && (j === b.length || keep[i + 1][j] >= keep[i][j + 1])) {
+ rows.push({ kind: 'removed', line: a[i] })
+ i++
+ } else {
+ rows.push({ kind: 'added', line: b[j], number: j + 1 })
+ j++
+ }
+ }
+ return rows
+}
diff --git a/ds-bot/src/client/learning-card.js b/ds-bot/src/client/learning-card.js
index 6a0ea536..a0013880 100644
--- a/ds-bot/src/client/learning-card.js
+++ b/ds-bot/src/client/learning-card.js
@@ -1,8 +1,9 @@
import { createElement as h, useId, useRef, useState } from 'react'
import { useTurnFacts } from './btw.js'
-import { proposalPlacement } from './learning-card-model.js'
+import { lineDiff, proposalPlacement } from './learning-card-model.js'
import { currentPart } from './text.js'
import { t } from './i18n.js'
+import { CheckIcon, MemoryIcon } from './icons.js'
import { spring, SPRING_TAP } from './motion.js'
const failedAnswers = new Map()
@@ -28,53 +29,62 @@ function ProposalCard({ proposal, initialError = '', onFailure, onResolved, acti
setBusy(false)
})
}
- const lines = String(proposal.content ?? '').replace(/\n+$/, '').split('\n')
- const rows = lines.map((line, index) => ({ kind: 'added', mark: String(index + 1), line }))
+ const update = proposal.action === 'update'
+ const rows = lineDiff(update ? proposal.previous?.content : '', proposal.content)
return h('section', { className: 'bt-q bt-learning-card', role: 'group', 'aria-labelledby': titleId, 'aria-busy': busy },
- h('div', { className: 'bt-learning-headtext' },
- h('span', { className: 'bt-learning-status' }, t('Awaiting approval')),
- h('p', { className: 'bt-q-title', id: titleId }, proposal.name),
- h('p', { className: 'bt-learning-sub' }, t(proposal.action === 'update' ? 'Skill update' : 'New skill')),
- proposal.description ? h('p', { className: 'bt-learning-description' }, proposal.description) : null),
- h(FileBox, {
- name: 'SKILL.md',
- path: `skills/${proposal.name}`,
- added: rows.length,
- removed: 0,
- state: proposal.action === 'update' ? 'Updated' : 'Added',
- blocks: [rows],
- }),
+ h(ProposalHead, { titleId, title: proposal.name, kind: t(update ? 'Skill update' : 'New skill'), detail: proposal.description }),
+ h(FileBox, { name: 'SKILL.md', path: `skills/${proposal.name}`, state: update ? 'Updated' : 'Added', blocks: [rows] }),
proposal.why ? h('p', { className: 'bt-learning-why' }, proposal.why) : null,
error ? h('div', { className: 'bt-learning-error', role: 'alert' }, error) : null,
- h('div', { className: 'bt-learning-actions' },
- h('button', { type: 'button', className: 'bt-learning-btn bt-learning-approve', disabled: busy, onClick: () => answer(true) }, t('Approve')),
- h('button', { type: 'button', className: 'bt-learning-btn bt-learning-decline', disabled: busy, onClick: () => answer(false) }, t('Decline'))))
+ h(ProposalFoot, { busy, answer }))
+}
+
+function ProposalHead({ titleId, title, kind, detail }) {
+ return h('div', { className: 'bt-q-head' },
+ h('span', { className: 'bt-learning-icon', 'aria-hidden': true }, h(MemoryIcon)),
+ h('div', { className: 'bt-q-text' },
+ h('p', { className: 'bt-q-title', id: titleId }, title),
+ h('div', { className: 'bt-q-detail' }, kind),
+ detail ? h('p', { className: 'bt-learning-description' }, detail) : null),
+ h('span', { className: 'bt-q-badge bt-learning-status' }, h('span', { className: 'bt-learning-dot', 'aria-hidden': true }), t('Awaiting approval')))
+}
+
+function ProposalFoot({ busy, answer }) {
+ return h('div', { className: 'bt-q-foot bt-learning-foot' },
+ h('button', { type: 'button', className: 'bt-learning-btn bt-learning-decline', disabled: busy, onClick: () => answer(false) }, t('Decline')),
+ h('button', { type: 'button', className: 'bt-learning-btn bt-learning-approve', disabled: busy, onClick: () => answer(true) },
+ h(CheckIcon), t('Approve')))
}
const COLLAPSE_ROWS = 8
+const SIGNS = { added: '+', removed: '\u2212', same: '' }
-function FileBox({ name, path, added, removed, state, blocks }) {
+function FileBox({ name, path, state, blocks }) {
const [open, setOpen] = useState(false)
- const total = blocks.reduce((sum, rows) => sum + rows.length, 0)
- const folds = total > COLLAPSE_ROWS
+ const all = blocks.flat()
+ const added = all.filter(row => row.kind === 'added').length
+ const removed = all.filter(row => row.kind === 'removed').length
+ const folds = all.length > COLLAPSE_ROWS
const shut = folds && !open
return h('div', { className: 'bt-learning-file' },
h('div', { className: 'bt-learning-filehead' },
- h('strong', null, name),
+ h('span', { className: 'bt-learning-name' }, name),
path ? h('span', { className: 'bt-learning-path' }, path) : null,
h('span', { className: 'bt-learning-spacer' }),
added > 0 ? h('span', { className: 'bt-learning-plus' }, `+${added}`) : null,
removed > 0 ? h('span', { className: 'bt-learning-minus' }, `\u2212${removed}`) : null,
- h('span', { className: `bt-learning-state${state === 'Added' ? ' bt-learning-state-new' : ''}` }, t(state))),
+ h('span', { className: `bt-learning-state bt-learning-state-${state.toLowerCase()}` }, t(state))),
h('div', { className: shut ? 'bt-learning-code bt-learning-shut' : 'bt-learning-code' },
blocks.map((rows, blockIndex) => [
blockIndex > 0 ? h('div', { className: 'bt-learning-gap', key: `gap-${blockIndex}` }) : null,
...rows.map((row, rowIndex) => h('div', { className: `bt-learning-row bt-learning-${row.kind}`, key: `${blockIndex}-${rowIndex}` },
- h('span', { className: 'bt-learning-num', 'aria-hidden': true }, row.mark),
+ h('span', { className: 'bt-learning-num', 'aria-hidden': true }, row.number ?? ''),
+ h('span', { className: 'bt-learning-sign', 'aria-hidden': true }, SIGNS[row.kind]),
h('span', { className: 'bt-learning-text' }, row.line))),
- ]),
- shut ? h('div', { className: 'bt-learning-fade' }) : null),
- folds ? h('button', { type: 'button', className: 'bt-learning-more', 'aria-expanded': open, onClick: () => setOpen(!open) }, t(open ? 'Show less' : 'Show all')) : null)
+ ])),
+ folds ? h('div', { className: shut ? 'bt-learning-morebar bt-learning-morebar-shut' : 'bt-learning-morebar' },
+ h('button', { type: 'button', className: 'bt-learning-more', 'aria-expanded': open, onClick: () => setOpen(!open) },
+ t(open ? 'Show less' : 'Show all {count} lines', { count: all.length }))) : null)
}
function LearningProposals({ turn, dock, sessionId, useRoster, actions }) {
@@ -129,42 +139,48 @@ export function LearningDock(props) {
export const LEARNING_CSS = `
.bt-learning-stack{display:flex;flex-direction:column;gap:4px}
.bt-learning-dock{width:100%;max-width:var(--dsh-chat-content-width,748px);margin:0 auto;box-sizing:border-box}
-.bt-learning-card{gap:12px}
-.bt-learning-headtext{display:flex;flex-direction:column;gap:2px;min-width:0}
-.bt-learning-status{font-size:13px;line-height:18px;font-weight:500;color:var(--bt-star)}
-.bt-learning-card .bt-q-title{overflow-wrap:anywhere}
-.bt-learning-sub{margin:0;font-size:13px;line-height:18px;color:var(--bt-ink-2)}
-.bt-learning-description{margin:4px 0 0;font-size:13px;line-height:18px;color:var(--bt-ink)}
-.bt-learning-file{border:1px solid var(--bt-line-2);border-radius:10px;overflow:hidden;background:var(--bt-card)}
-.bt-learning-filehead{display:flex;align-items:center;gap:8px;min-width:0;padding:8px 12px;border-bottom:1px solid var(--bt-line);font-size:13px;line-height:18px;color:var(--bt-ink)}
-.bt-learning-filehead strong{flex:none;font-weight:500}
+.bt-learning-card .bt-q-head{gap:12px}
+.bt-learning-icon{flex:none;display:inline-flex;align-items:center;justify-content:center;width:34px;height:34px;border-radius:10px;background:var(--bt-hover);color:var(--bt-ink-2)}
+.bt-learning-icon svg{width:18px;height:18px}
+.bt-learning-description{margin:6px 0 0;font-size:13px;line-height:19px;color:var(--bt-ink)}
+.bt-learning-status{display:inline-flex;align-items:center;gap:6px;border-style:solid;border-color:color-mix(in srgb,var(--bt-star) 35%,transparent);color:color-mix(in srgb,var(--bt-star) 80%,var(--bt-ink))}
+.bt-learning-dot{width:6px;height:6px;border-radius:50%;background:var(--bt-star)}
+.bt-learning-file{border-radius:12px;overflow:hidden;background:color-mix(in srgb,var(--bt-ink) 2.5%,var(--bt-card));box-shadow:inset 0 0 0 1px var(--bt-q-rule)}
+.bt-learning-filehead{display:flex;align-items:center;gap:8px;min-width:0;padding:8px 12px;box-shadow:inset 0 -1px 0 var(--bt-q-rule-2);font-size:12px;line-height:18px}
+.bt-learning-name{flex:none;font-weight:600;color:var(--bt-ink)}
.bt-learning-path{min-width:0;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;color:var(--bt-ink-3)}
.bt-learning-spacer{flex:1}
-.bt-learning-plus{flex:none;font-weight:600;color:var(--bt-green)}
-.bt-learning-minus{flex:none;font-weight:600;color:var(--bt-danger)}
-.bt-learning-state{flex:none;padding:1px 8px;border-radius:6px;font-size:12px;font-weight:500;background:color-mix(in srgb,var(--bt-accent) 12%,transparent);color:var(--bt-accent)}
-.bt-learning-state-new{background:color-mix(in srgb,var(--bt-green) 14%,transparent);color:var(--bt-green)}
-.bt-learning-code{position:relative;font-family:ui-monospace,SFMono-Regular,Menlo,monospace;font-size:12px;line-height:20px;color:var(--bt-ink)}
-.bt-learning-shut{max-height:180px;overflow:hidden}
-.bt-learning-row{display:grid;grid-template-columns:40px 1fr}
-.bt-learning-num{padding-right:10px;text-align:right;color:var(--bt-ink-3);user-select:none}
-.bt-learning-text{min-width:0;padding:0 12px;white-space:pre-wrap;overflow-wrap:anywhere}
-.bt-learning-added{background:color-mix(in srgb,var(--bt-green) 10%,transparent);box-shadow:inset 3px 0 0 var(--bt-green)}
-.bt-learning-removed{background:color-mix(in srgb,var(--bt-danger) 8%,transparent);box-shadow:inset 3px 0 0 var(--bt-danger)}
-.bt-learning-gap{height:8px;background:var(--bt-hover)}
-.bt-learning-fade{position:absolute;left:0;right:0;bottom:0;height:56px;background:linear-gradient(transparent,var(--bt-card));pointer-events:none}
-.bt-learning-more{display:block;width:100%;padding:6px;border:0;border-top:1px solid var(--bt-line);background:transparent;font:inherit;font-size:12px;line-height:16px;color:var(--bt-ink-2);cursor:pointer}
-.bt-learning-more:hover{background:var(--bt-hover)}
-.bt-learning-more:focus-visible{outline:2px solid var(--bt-accent);outline-offset:-2px}
+.bt-learning-plus,.bt-learning-minus{flex:none;font-weight:600;font-variant-numeric:tabular-nums}
+.bt-learning-plus{color:var(--bt-green)}
+.bt-learning-minus{color:var(--bt-danger)}
+.bt-learning-state{flex:none;height:20px;padding:0 8px;border-radius:999px;font-size:11px;line-height:20px;font-weight:500;background:var(--bt-hover);color:var(--bt-ink-2)}
+.bt-learning-state-added{background:color-mix(in srgb,var(--bt-green) 13%,transparent);color:color-mix(in srgb,var(--bt-green) 70%,var(--bt-ink))}
+.bt-learning-code{padding:6px 0;font-family:ui-monospace,SFMono-Regular,Menlo,monospace;font-size:12px;line-height:20px;color:var(--bt-ink)}
+.bt-learning-shut{max-height:172px;overflow:hidden}
+.bt-learning-row{display:grid;grid-template-columns:36px 16px 1fr}
+.bt-learning-num{padding-right:6px;text-align:right;color:var(--bt-ink-3);font-variant-numeric:tabular-nums;user-select:none}
+.bt-learning-sign{text-align:center;user-select:none}
+.bt-learning-text{min-width:0;padding-right:12px;white-space:pre-wrap;overflow-wrap:anywhere}
+.bt-learning-added{background:color-mix(in srgb,var(--bt-green) 9%,transparent)}
+.bt-learning-added .bt-learning-sign{color:var(--bt-green)}
+.bt-learning-removed{background:color-mix(in srgb,var(--bt-danger) 7%,transparent)}
+.bt-learning-removed .bt-learning-sign{color:var(--bt-danger)}
+.bt-learning-removed .bt-learning-text{color:var(--bt-ink-2)}
+.bt-learning-gap{height:1px;margin:6px 12px;background:var(--bt-q-rule)}
+.bt-learning-morebar{display:flex;justify-content:center;padding:4px 0 8px}
+.bt-learning-morebar-shut{position:relative;margin-top:-36px;padding-top:28px;background:linear-gradient(transparent,color-mix(in srgb,var(--bt-ink) 2.5%,var(--bt-card)) 60%)}
+.bt-learning-more{height:24px;padding:0 10px;border:0;border-radius:999px;background:var(--bt-card);box-shadow:inset 0 0 0 1px var(--bt-q-edge);font:inherit;font-size:12px;color:var(--bt-ink-2);cursor:pointer;transition:background-color .12s ease,color .12s ease}
+.bt-learning-more:hover{background:var(--bt-hover);color:var(--bt-ink)}
+.bt-learning-more:focus-visible{outline:2px solid var(--bt-accent);outline-offset:2px}
.bt-learning-why{margin:0;font-size:12px;line-height:17px;color:var(--bt-ink-2)}
-.bt-learning-actions{display:flex;align-items:center;justify-content:flex-start;gap:8px}
-.bt-learning-btn{flex:none;display:inline-flex;align-items:center;height:32px;padding:0 16px;border-radius:8px;font:inherit;font-size:14px;font-weight:500;cursor:pointer;transition:background-color .12s ease,opacity .12s ease,${spring(SPRING_TAP, 'scale')}}
-.bt-learning-decline{background:transparent;border:1px solid var(--bt-line-2);color:var(--bt-ink)}
+.bt-learning-btn{flex:none;display:inline-flex;align-items:center;gap:6px;height:34px;padding:0 16px;border:0;border-radius:999px;font:inherit;font-size:14px;font-weight:500;cursor:pointer;transition:background-color .12s ease,opacity .12s ease,${spring(SPRING_TAP, 'scale')}}
+.bt-learning-btn svg{width:15px;height:15px}
+.bt-learning-decline{background:transparent;box-shadow:inset 0 0 0 1px var(--bt-line-2);color:var(--bt-ink)}
.bt-learning-decline:hover:not(:disabled){background:var(--bt-hover)}
-.bt-learning-approve{border:1px solid transparent;background:var(--bt-ink);color:var(--bt-card)}
-.bt-learning-approve:hover:not(:disabled){opacity:.88}
+.bt-learning-approve{padding-left:13px;background:var(--bt-accent);color:var(--bt-accent-ink,#fff)}
+.bt-learning-approve:hover:not(:disabled){opacity:.86}
.bt-learning-btn:disabled{opacity:.45;cursor:default}
-.bt-learning-btn:active:not(:disabled){scale:.97}
+.bt-learning-btn:active:not(:disabled){scale:.96}
.bt-learning-btn:focus-visible{outline:2px solid var(--bt-accent);outline-offset:2px}
@media (prefers-reduced-motion:reduce){.bt-learning-btn{transition:background-color .12s ease,opacity .12s ease}.bt-learning-btn:active:not(:disabled){scale:none}}
.bt-learning-error{font-size:12px;line-height:16px;color:var(--bt-danger)}
diff --git a/ds-bot/test/learning-card.test.js b/ds-bot/test/learning-card.test.js
index 49eacd12..c1d20fe6 100644
--- a/ds-bot/test/learning-card.test.js
+++ b/ds-bot/test/learning-card.test.js
@@ -1,6 +1,6 @@
import assert from 'node:assert/strict'
import { test } from 'node:test'
-import { proposalPlacement } from '../src/client/learning-card-model.js'
+import { lineDiff, proposalPlacement } from '../src/client/learning-card-model.js'
const turns = new Map([
[1, { turn: 1, end: { time: 100 }, status: 'closed' }],
@@ -21,3 +21,18 @@ test('a proposal uses the dock when there are no closed turns', () => {
assert.deepEqual(proposalPlacement({ at: 150 }, new Map()), { kind: 'dock' })
assert.deepEqual(proposalPlacement({ at: 150 }, new Map([[3, { turn: 3, status: 'open' }]])), { kind: 'dock' })
})
+
+test('a new skill diff marks every line as added', () => {
+ assert.deepEqual(lineDiff('', 'a\nb\n'), [
+ { kind: 'added', line: 'a', number: 1 },
+ { kind: 'added', line: 'b', number: 2 },
+ ])
+})
+
+test('a skill update diff keeps unchanged lines and shows removals', () => {
+ assert.deepEqual(lineDiff('Check tests\nRequire approval', 'Check tests\nRun lint'), [
+ { kind: 'same', line: 'Check tests', number: 1 },
+ { kind: 'removed', line: 'Require approval' },
+ { kind: 'added', line: 'Run lint', number: 2 },
+ ])
+})