A team of long-lived bots for DeepSeek Harness, with main bots, bot-to-bot messages and group chats.
Widen the glass indicator and keep the pill at natural width
feiza1bfc4bbe486
diff --git a/app/src/computer-indicator.mjs b/app/src/computer-indicator.mjsindex b30e07f0..31c2bad9 100644--- a/app/src/computer-indicator.mjs+++ b/app/src/computer-indicator.mjs@@ -29,7 +29,7 @@ export function createComputerIndicator({ BrowserWindow, screen, html, ipcMain,// window shrinks to its width and stays centered on the primary work area.const fit = async () => {try {- const width = await win?.webContents?.executeJavaScript("document.querySelector('.bar')?.offsetWidth ?? 0")+ const width = await win?.webContents?.executeJavaScript("document.querySelector('.bar')?.scrollWidth ?? 0")if (win === null || typeof width !== 'number' || width <= 0) returnconst area = screen.getPrimaryDisplay()const full = Math.ceil(width) + 24@@ -39,7 +39,7 @@ export function createComputerIndicator({ BrowserWindow, screen, html, ipcMain,const open = () => {if (win !== null) returnconst area = screen.getPrimaryDisplay()- const width = Math.min(520, area.workAreaSize.width - 64)+ const width = area.workAreaSize.width - 64win = new BrowserWindow({width,height: 48,@@ -98,16 +98,16 @@ export function indicatorHtml(entries, labels = {}) {const row = (entry) => `<span class="entry">${avatar(entry)}<span class="text"><b>${escapeHtml(entry.name ?? entry.label)}</b>${entry.app !== undefined ? `<i>${escapeHtml(entry.app)}</i>` : ''}</span>${stopBtn(entry)}</span>`const waiting = (entry) => `- <span class="entry">${avatar(entry)}<span class="text"><b>${escapeHtml(entry.label)}</b></span><button class="go" data-act="letgo:${escapeHtml(entry.botId ?? '')}">${escapeHtml(labels.letGo ?? 'Let it continue')}</button></span>`+ <span class="entry">${avatar(entry)}<span class="text"><b>${escapeHtml(entry.name ?? entry.label)}</b>${entry.app !== undefined ? `<i>${escapeHtml(entry.app)}</i>` : ''}</span><button class="go" data-act="letgo:${escapeHtml(entry.botId ?? '')}">${escapeHtml(labels.letGo ?? 'Let it continue')}</button></span>`const rows = entries.map((entry, index) => `${index > 0 ? '<span class="sep"></span>' : ''}${entry.waiting ? waiting(entry) : row(entry)}`).join('')const stopAll = entries.filter(entry => !entry.waiting).length > 1? `<button class="all" data-act="stopall:">${escapeHtml(labels.stopAll ?? 'Stop all')}</button>` : ''return `<!doctype html><html><head><meta charset="utf-8"><style>:root{color-scheme:light dark}-body{margin:0;background:transparent;font:12.5px -apple-system,sans-serif;-webkit-app-region:no-drag;user-select:none}-.bar{display:inline-flex;align-items:center;gap:8px;height:36px;padding:0 12px;margin:4px 12px;border-radius:999px;backdrop-filter:blur(14px);-webkit-backdrop-filter:blur(14px);font-size:12.5px}-@media (prefers-color-scheme:light){.bar{background:rgba(255,255,255,.72);border:1px solid rgba(0,0,0,.08);box-shadow:inset 0 1px 0 rgba(255,255,255,.6),0 6px 24px rgba(0,0,0,.14);color:#1c1c1e}.bar i,.go{color:#555}}-@media (prefers-color-scheme:dark){.bar{background:rgba(30,30,32,.78);border:1px solid rgba(255,255,255,.12);box-shadow:inset 0 1px 0 rgba(255,255,255,.14),0 6px 24px rgba(0,0,0,.4);color:#f2f2f7}.bar i{color:#aaa}.go{color:#0a84ff}}+body{margin:0;background:transparent;overflow:hidden;font:12.5px -apple-system,sans-serif;-webkit-app-region:no-drag;user-select:none}+.bar{display:inline-flex;align-items:center;gap:8px;height:36px;white-space:nowrap;padding:0 12px;margin:4px 12px;border-radius:999px;backdrop-filter:blur(14px);-webkit-backdrop-filter:blur(14px);font-size:12.5px}+@media (prefers-color-scheme:light){.bar{background:rgba(255,255,255,.92);border:1px solid rgba(0,0,0,.08);box-shadow:inset 0 1px 0 rgba(255,255,255,.6),0 6px 24px rgba(0,0,0,.14);color:#1c1c1e}.bar i,.go{color:#555}}+@media (prefers-color-scheme:dark){.bar{background:rgba(30,30,32,.88);border:1px solid rgba(255,255,255,.12);box-shadow:inset 0 1px 0 rgba(255,255,255,.14),0 6px 24px rgba(0,0,0,.4);color:#f2f2f7}.bar i{color:#aaa}.go{color:#0a84ff}}.live{flex:none;width:7px;height:7px;border-radius:50%;background:#ff453a;box-shadow:0 0 0 3px rgba(255,69,58,.24)}.sep{flex:none;width:1px;height:14px;background:currentColor;opacity:.2}.entry{display:flex;align-items:center;gap:6px;min-width:0}diff --git a/app/test/computer-indicator.test.mjs b/app/test/computer-indicator.test.mjsindex c1fba6e5..3f99493c 100644--- a/app/test/computer-indicator.test.mjs+++ b/app/test/computer-indicator.test.mjs@@ -41,7 +41,8 @@ test('the indicator window is frameless, unfocusable, protected and centered', (assert.equal(win.protection, true)assert.equal(win.workspaces, true)// top center of the primary display- assert.equal(win.options.x, Math.round((1440 - 520) / 2))+ assert.equal(win.options.width, 1440 - 64)+ assert.equal(win.options.x, Math.round((1440 - (1440 - 64)) / 2))assert.equal(win.options.y, 8)indicator.dispose()assert.equal(win.closed, true)diff --git a/ds-bot/client.js b/ds-bot/client.jsindex b0473cc2..99106ad4 100644--- a/ds-bot/client.js+++ b/ds-bot/client.js@@ -374,6 +374,7 @@ var ZH = {"No browsers found": "没有找到浏览器","The Bot controls this browser": "Bot 正在控制此浏览器","The Bot is waiting for you": "Bot 正在等待你",+ "waits for the computer": "在等电脑空出来","You control this browser": "你正在控制此浏览器","The Bot handed this browser to you: {reason}": "Bot 已将此浏览器交给你:{reason}","Take over": "接管",@@ -5555,8 +5556,8 @@ function ComputerIndicator({ useComputer, useRoster, actions }) {(0, import_react10.createElement)("span",{ className: "bt-cbar-text" },- (0, import_react10.createElement)("b", { className: "bt-cbar-name" }, entry.waiting ? t("{name} waits for the computer", { name: nameOf(entry.botId) }) : nameOf(entry.botId)),- entry.waiting ? null : (0, import_react10.createElement)("i", { className: "bt-cbar-app" }, entry.app)+ (0, import_react10.createElement)("b", { className: "bt-cbar-name" }, nameOf(entry.botId)),+ (0, import_react10.createElement)("i", { className: "bt-cbar-app" }, entry.app)),entry.waiting ? (0, import_react10.createElement)("button", { type: "button", className: "bt-cbar-go", onClick: () => void actions.computerAllowForeground(entry.botId) }, t("Let it continue")) : (0, import_react10.createElement)("button",@@ -5583,14 +5584,14 @@ var COMPUTER_CSS = `.bt-cview-step{display:flex;align-items:center;gap:6px;font-size:12.5px;color:var(--bt-ink-2)}.bt-cview-step[data-ok=no]{color:var(--bt-danger)}.bt-cview-step-err{font-size:11px}-.bt-cbar{position:absolute;top:8px;left:50%;transform:translateX(-50%);z-index:60;display:flex;align-items:center;gap:8px;max-width:min(620px,calc(100vw - 32px));padding:6px 12px;border-radius:999px;background:var(--bt-glass-bg,rgba(255,255,255,.72));border:1px solid var(--bt-glass-border,var(--bt-line));box-shadow:inset 0 1px 0 var(--bt-glass-rim,rgba(255,255,255,.5)),0 6px 24px var(--bt-glass-shadow,rgba(0,0,0,.14));backdrop-filter:blur(14px);-webkit-backdrop-filter:blur(14px);font-size:12.5px}+.bt-cbar{position:absolute;top:8px;left:50%;transform:translateX(-50%);z-index:60;display:flex;align-items:center;gap:8px;max-width:min(760px,calc(100vw - 32px));padding:6px 12px;border-radius:999px;background:var(--bt-glass-bg,rgba(255,255,255,.72));border:1px solid var(--bt-glass-border,var(--bt-line));box-shadow:inset 0 1px 0 var(--bt-glass-rim,rgba(255,255,255,.5)),0 6px 24px var(--bt-glass-shadow,rgba(0,0,0,.14));backdrop-filter:blur(14px);-webkit-backdrop-filter:blur(14px);font-size:12.5px}.bt-cbar-live{flex:none;width:7px;height:7px;border-radius:50%;background:var(--bt-danger);box-shadow:0 0 0 3px color-mix(in srgb,var(--bt-danger) 24%,transparent)}.bt-cbar-sep{flex:none;width:1px;height:14px;background:var(--bt-line);opacity:.7}.bt-cbar-entry{display:flex;align-items:center;gap:6px;min-width:0}.bt-cbar-ava{flex:none;width:16px;height:16px;border-radius:50%;object-fit:cover}.bt-cbar-ava-dot{display:inline-flex;align-items:center;justify-content:center;color:#fff;font-size:9px;font-weight:600;line-height:1}.bt-cbar-text{display:flex;align-items:baseline;gap:5px;min-width:0;overflow:hidden}-.bt-cbar-name{font-weight:600;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}+.bt-cbar-name{flex:none;font-weight:600;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.bt-cbar-app{font-style:normal;color:var(--bt-ink-2);overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:120px}.bt-cbar-stop{flex:none;width:22px;height:22px;border:0;border-radius:50%;background:var(--bt-hover);color:var(--bt-ink-2);cursor:pointer;display:inline-flex;align-items:center;justify-content:center}.bt-cbar-stopsq{width:8px;height:8px;border-radius:2px;background:currentColor}diff --git a/ds-bot/src/client/computer.js b/ds-bot/src/client/computer.jsindex 73319a90..dc64e83f 100644--- a/ds-bot/src/client/computer.js+++ b/ds-bot/src/client/computer.js@@ -311,8 +311,8 @@ export function ComputerIndicator({ useComputer, useRoster, actions }) {h('span', { key: entry.key, className: entry.waiting ? 'bt-cbar-entry bt-cbar-wait' : 'bt-cbar-entry' },avatarOf(entry.botId),h('span', { className: 'bt-cbar-text' },- h('b', { className: 'bt-cbar-name' }, entry.waiting ? t('{name} waits for the computer', { name: nameOf(entry.botId) }) : nameOf(entry.botId)),- entry.waiting ? null : h('i', { className: 'bt-cbar-app' }, entry.app)),+ h('b', { className: 'bt-cbar-name' }, nameOf(entry.botId)),+ h('i', { className: 'bt-cbar-app' }, entry.app)),entry.waiting? h('button', { type: 'button', className: 'bt-cbar-go', onClick: () => void actions.computerAllowForeground(entry.botId) }, t('Let it continue')): h('button', { type: 'button', className: 'bt-cbar-stop', 'aria-label': t('Stop'), title: t('Stop'), onClick: () => void actions.computerStop(entry.botId) },@@ -336,14 +336,14 @@ export const COMPUTER_CSS = `.bt-cview-step{display:flex;align-items:center;gap:6px;font-size:12.5px;color:var(--bt-ink-2)}.bt-cview-step[data-ok=no]{color:var(--bt-danger)}.bt-cview-step-err{font-size:11px}-.bt-cbar{position:absolute;top:8px;left:50%;transform:translateX(-50%);z-index:60;display:flex;align-items:center;gap:8px;max-width:min(620px,calc(100vw - 32px));padding:6px 12px;border-radius:999px;background:var(--bt-glass-bg,rgba(255,255,255,.72));border:1px solid var(--bt-glass-border,var(--bt-line));box-shadow:inset 0 1px 0 var(--bt-glass-rim,rgba(255,255,255,.5)),0 6px 24px var(--bt-glass-shadow,rgba(0,0,0,.14));backdrop-filter:blur(14px);-webkit-backdrop-filter:blur(14px);font-size:12.5px}+.bt-cbar{position:absolute;top:8px;left:50%;transform:translateX(-50%);z-index:60;display:flex;align-items:center;gap:8px;max-width:min(760px,calc(100vw - 32px));padding:6px 12px;border-radius:999px;background:var(--bt-glass-bg,rgba(255,255,255,.72));border:1px solid var(--bt-glass-border,var(--bt-line));box-shadow:inset 0 1px 0 var(--bt-glass-rim,rgba(255,255,255,.5)),0 6px 24px var(--bt-glass-shadow,rgba(0,0,0,.14));backdrop-filter:blur(14px);-webkit-backdrop-filter:blur(14px);font-size:12.5px}.bt-cbar-live{flex:none;width:7px;height:7px;border-radius:50%;background:var(--bt-danger);box-shadow:0 0 0 3px color-mix(in srgb,var(--bt-danger) 24%,transparent)}.bt-cbar-sep{flex:none;width:1px;height:14px;background:var(--bt-line);opacity:.7}.bt-cbar-entry{display:flex;align-items:center;gap:6px;min-width:0}.bt-cbar-ava{flex:none;width:16px;height:16px;border-radius:50%;object-fit:cover}.bt-cbar-ava-dot{display:inline-flex;align-items:center;justify-content:center;color:#fff;font-size:9px;font-weight:600;line-height:1}.bt-cbar-text{display:flex;align-items:baseline;gap:5px;min-width:0;overflow:hidden}-.bt-cbar-name{font-weight:600;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}+.bt-cbar-name{flex:none;font-weight:600;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.bt-cbar-app{font-style:normal;color:var(--bt-ink-2);overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:120px}.bt-cbar-stop{flex:none;width:22px;height:22px;border:0;border-radius:50%;background:var(--bt-hover);color:var(--bt-ink-2);cursor:pointer;display:inline-flex;align-items:center;justify-content:center}.bt-cbar-stopsq{width:8px;height:8px;border-radius:2px;background:currentColor}diff --git a/ds-bot/src/client/i18n.js b/ds-bot/src/client/i18n.jsindex 6d61668c..0e27035a 100644--- a/ds-bot/src/client/i18n.js+++ b/ds-bot/src/client/i18n.js@@ -342,6 +342,7 @@ const ZH = {'No browsers found': '没有找到浏览器','The Bot controls this browser': 'Bot 正在控制此浏览器','The Bot is waiting for you': 'Bot 正在等待你',+ 'waits for the computer': '在等电脑空出来','You control this browser': '你正在控制此浏览器','The Bot handed this browser to you: {reason}': 'Bot 已将此浏览器交给你:{reason}','Take over': '接管',