A team of long-lived bots for DeepSeek Harness, with main bots, bot-to-bot messages and group chats.
Send one permission save at a time and keep the latest pick
Fei24118463d8fc598a
diff --git a/ds-bot/client.js b/ds-bot/client.jsindex 484938ff..a5d9b42b 100644--- a/ds-bot/client.js+++ b/ds-bot/client.js@@ -9378,16 +9378,33 @@ var presetDanger = (value) => DANGER.has(value);var presetName = (value, catalog) => LABELS[value] ? t(LABELS[value]) : catalog?.options?.find((option) => option.value === value)?.name ?? value;function PermissionPicker({ catalog, saved, onPick, repick = false }) {const [pending, setPending] = (0, import_react24.useState)(null);+ const flight = (0, import_react24.useRef)({ value: void 0, latest: void 0 });(0, import_react24.useEffect)(() => {- if (pending === saved) setPending(null);+ const flying = flight.current.value;+ if (pending === saved && (flying === void 0 || flying === pending)) setPending(null);}, [pending, saved]);+ const send = (value) => {+ flight.current.value = value;+ void Promise.resolve(onPick(value)).then((done) => done !== false, () => false).then((ok) => {+ const wanted = flight.current.latest;+ flight.current.latest = void 0;+ if (wanted !== void 0 && !(wanted === value && ok)) {+ send(wanted);+ return;+ }+ flight.current.value = void 0;+ if (!ok) setPending(null);+ });+ };const current = pending ?? saved;const pick2 = (value) => {if (value === current && !repick) return;setPending(value);- void Promise.resolve(onPick(value)).then((done) => {- if (done === false) setPending(null);- });+ if (flight.current.value !== void 0) {+ flight.current.latest = value;+ return;+ }+ send(value);};return (0, import_react24.createElement)(Segmented,diff --git a/ds-bot/src/client/permission-picker.js b/ds-bot/src/client/permission-picker.jsindex b9f1344d..a4024a09 100644--- a/ds-bot/src/client/permission-picker.js+++ b/ds-bot/src/client/permission-picker.js@@ -1,4 +1,4 @@-import { createElement as h, useEffect, useState } from 'react'+import { createElement as h, useEffect, useRef, useState } from 'react'import { Segmented } from './motion.js'import { t } from './i18n.js'@@ -13,12 +13,30 @@ export const presetName = (value, catalog) => (LABELS[value] ? t(LABELS[value])// false. `repick` lets the shown preset be picked again.export function PermissionPicker({ catalog, saved, onPick, repick = false }) {const [pending, setPending] = useState(null)- useEffect(() => { if (pending === saved) setPending(null) }, [pending, saved])+ // One save runs at a time. A pick made while one is in flight waits as `latest`+ // (newer ones overwrite it), so a request that settles cannot clear or reorder a+ // pick made after it; two saves never land out of order on the server.+ const flight = useRef({ value: undefined, latest: undefined })+ useEffect(() => {+ const flying = flight.current.value+ if (pending === saved && (flying === undefined || flying === pending)) setPending(null)+ }, [pending, saved])+ const send = (value) => {+ flight.current.value = value+ void Promise.resolve(onPick(value)).then(done => done !== false, () => false).then((ok) => {+ const wanted = flight.current.latest+ flight.current.latest = undefined+ if (wanted !== undefined && !(wanted === value && ok)) { send(wanted); return }+ flight.current.value = undefined+ if (!ok) setPending(null)+ })+ }const current = pending ?? savedconst pick = (value) => {if (value === current && !repick) returnsetPending(value)- void Promise.resolve(onPick(value)).then((done) => { if (done === false) setPending(null) })+ if (flight.current.value !== undefined) { flight.current.latest = value; return }+ send(value)}return h(Segmented, { label: t('Permissions'), value: current },catalog.options.map(option => h('button', {diff --git a/ds-bot/test/permission-picker.test.js b/ds-bot/test/permission-picker.test.jsnew file mode 100644index 00000000..61c312f4--- /dev/null+++ b/ds-bot/test/permission-picker.test.js@@ -0,0 +1,161 @@+import { test } from 'node:test'+import assert from 'node:assert/strict'+import { fileURLToPath } from 'node:url'+import { runInNewContext } from 'node:vm'+import { build } from 'esbuild'++const { outputFiles } = await build({+ entryPoints: [fileURLToPath(new URL('../src/client/permission-picker.js', import.meta.url))],+ bundle: true, format: 'cjs', platform: 'browser', write: false, logLevel: 'silent',+ external: ['react', 'react-dom', '@deepseek-ai/dsh-client-ui-primitives'],+})++// A minimal stateful React: hook cells live across renders and a setState re-renders,+// so the picker's async pick flow runs as on the page. Effects run when their deps+// change, as React runs them after paint.+const cells = []+const prevDeps = []+let hook = 0+let dirty = false+let pendingEffects = []+const changed = (deps, prev) => deps === undefined || prev === undefined || deps.length !== prev.length || deps.some((dep, i) => !Object.is(dep, prev[i]))+const react = {+ createElement: (type, props, ...children) => ({ type, props: { ...props, children: children.flat(Infinity) } }),+ useState(initial) {+ const i = hook+++ if (!(i in cells)) cells[i] = typeof initial === 'function' ? initial() : initial+ return [cells[i], (next) => { cells[i] = typeof next === 'function' ? next(cells[i]) : next; dirty = true }]+ },+ useRef(initial) { const i = hook++; if (!(i in cells)) cells[i] = { current: initial }; return cells[i] },+ useEffect(fn, deps) { pendingEffects.push({ i: hook++, fn, deps }) },+ useLayoutEffect(fn, deps) { pendingEffects.push({ i: hook++, fn, deps }) },+ useMemo: make => make(),+ useId: () => 'id',+ Fragment: Symbol('Fragment'),+}+const render = (component, props) => {+ let tree+ do {+ dirty = false+ hook = 0+ pendingEffects = []+ tree = component(props)+ for (const { i, fn, deps } of pendingEffects) {+ if (changed(deps, prevDeps[i])) { prevDeps[i] = deps; fn() }+ }+ } while (dirty)+ return tree+}+const module = { exports: {} }+runInNewContext(outputFiles[0].text, {+ module, exports: module.exports,+ require: name => (name === 'react' ? react : {}),+})+const { PermissionPicker } = module.exports++const OPTIONS = [+ { value: 'read-only', description: 'read-only' },+ { value: 'workspace-write', description: 'workspace-write' },+ { value: 'danger-full-access', description: 'danger-full-access' },+]+const settle = () => new Promise(resolve => setImmediate(resolve))++// Mounts the picker on `props`; `requests` gets a deferred per `onPick` call, and+// `maxFlying` records the most requests open at once.+const mountPicker = (initial, repick = false) => {+ const requests = []+ let flying = 0+ const seen = { maxFlying: 0 }+ let props = { ...initial, repick }+ props.onPick = value => {+ flying += 1+ seen.maxFlying = Math.max(seen.maxFlying, flying)+ return new Promise((resolve, reject) => requests.push({+ value,+ resolve: (done) => { flying -= 1; resolve(done) },+ reject: (error) => { flying -= 1; reject(error) },+ }))+ }+ let tree+ const rerender = (patch) => { props = { ...props, ...patch }; tree = render(PermissionPicker, props); return tree }+ const picker = {+ requests, seen, rerender,+ press(value) { tree.props.children.find(button => button.props.title === value).props.onClick(); rerender() },+ pressed() { return tree.props.children.find(button => button.props['aria-pressed'])?.props.title },+ // Lets settled request continuations and their state updates land.+ async flush() { await settle(); rerender() },+ }+ rerender()+ return picker+}++// #266: one save in flight; the latest pick wins, a failed request cannot clear it.+test('a newer pick survives an older request failing', async () => {+ const picker = mountPicker({ catalog: { options: OPTIONS }, saved: 'read-only' })+ picker.press('workspace-write')+ picker.press('danger-full-access')+ assert.equal(picker.requests.length, 1)+ assert.equal(picker.pressed(), 'danger-full-access')+ picker.requests[0].resolve(false)+ await picker.flush()+ assert.equal(picker.requests.length, 2)+ assert.equal(picker.requests[1].value, 'danger-full-access')+ assert.equal(picker.pressed(), 'danger-full-access')+ picker.requests[1].resolve(true)+ picker.rerender({ saved: 'danger-full-access' })+ await picker.flush()+ assert.equal(picker.requests.length, 2)+ assert.equal(picker.pressed(), 'danger-full-access')+ assert.equal(picker.seen.maxFlying, 1)+})++test('a newer pick that fails falls back to what the server saved', async () => {+ const picker = mountPicker({ catalog: { options: OPTIONS }, saved: 'read-only' })+ picker.press('workspace-write')+ picker.press('danger-full-access')+ picker.requests[0].resolve(true)+ picker.rerender({ saved: 'workspace-write' })+ await picker.flush()+ assert.equal(picker.requests.length, 2)+ picker.requests[1].resolve(false)+ await picker.flush()+ assert.equal(picker.pressed(), 'workspace-write')+ assert.equal(picker.seen.maxFlying, 1)+})++test('a single failed pick falls back to the saved value', async () => {+ const picker = mountPicker({ catalog: { options: OPTIONS }, saved: 'read-only' })+ picker.press('workspace-write')+ assert.equal(picker.pressed(), 'workspace-write')+ picker.requests[0].resolve(false)+ await picker.flush()+ assert.equal(picker.pressed(), 'read-only')+ // A rejected request fails the same way.+ picker.press('workspace-write')+ assert.equal(picker.requests.length, 2)+ picker.requests[1].reject(new Error('offline'))+ await picker.flush()+ assert.equal(picker.pressed(), 'read-only')+})++test('the last remembered pick wins; it is sent once even when it repeats the sent one', async () => {+ const picker = mountPicker({ catalog: { options: OPTIONS }, saved: 'read-only' })+ picker.press('workspace-write')+ picker.press('danger-full-access')+ picker.press('workspace-write')+ assert.equal(picker.requests.length, 1)+ picker.requests[0].resolve(true)+ picker.rerender({ saved: 'workspace-write' })+ await picker.flush()+ assert.equal(picker.requests.length, 1, 'the pick that repeats the sent one is not sent again')+ assert.equal(picker.pressed(), 'workspace-write')+})++test('repick still lets the shown preset be picked again', async () => {+ const picker = mountPicker({ catalog: { options: OPTIONS }, saved: 'read-only' }, true)+ picker.press('read-only')+ assert.equal(picker.requests.length, 1)+ assert.equal(picker.requests[0].value, 'read-only')+ picker.requests[0].resolve(true)+ await picker.flush()+})