fix(bot-mode): group-room UX cluster — Shift+Enter newlines, open-at-latest, late replies harvested (#89884, #89835, #89545)

Composer was a single-line Input (Enter always submitted, newlines
impossible) — now the SDK Textarea with Enter=send / Shift+Enter=newline
and popover-first key handling. Room log had no scroll anchoring (opened
at position 0) — bottom sentinel + near-bottom-guarded anchor effect.
Stranded replies were only harvested inside an active turn loop (stuck
until the user's next send) — the settle path now runs a bounded
background harvest that yields to a live loop.
This commit is contained in:
Teknium
2026-08-19 22:02:23 -07:00
parent 7ab2e417f0
commit 3c5fb284e5
3 changed files with 184 additions and 18 deletions
+126 -16
View File
@@ -4969,10 +4969,58 @@ async function runGroupChatRounds(group, members, thread) {
r.turn = null
return r
})
// #89545: the loop's harvest pass only ran at the top of each round of
// an ACTIVE loop — a member whose turn timed out after the final round
// stayed stranded until the user's NEXT send. Poll for the late reply
// in the background (bounded) so long work is late, never lost.
// (window feature-detect: the engine also runs under node in tests.)
const strandedLeft = Object.keys(($groupChats.get()[group] || {}).stranded || {})
if (strandedLeft.length && typeof window !== 'undefined') {
void harvestStrandedUntilSettled(group, members, thread)
}
}
}
}
/** Bounded background harvest for members whose replies outlived the turn
* loop. Polls every 5s for up to 5 minutes; stops early when nothing is
* stranded, a new loop takes the room over (it harvests on its own), or the
* room record disappears (disband). */
async function harvestStrandedUntilSettled(group, members, thread) {
const HARVEST_INTERVAL_MS = 5000
const HARVEST_MAX_TRIES = 60
for (let attempt = 0; attempt < HARVEST_MAX_TRIES; attempt++) {
await new Promise(resolve => window.setTimeout(resolve, HARVEST_INTERVAL_MS))
const room = $groupChats.get()[group]
if (!room || room.running) {
return
}
const stranded = room.stranded || {}
if (!Object.keys(stranded).length) {
return
}
for (const member of members) {
if (Object.prototype.hasOwnProperty.call(stranded, groupMemberKey(member))) {
try {
await harvestStrandedGroupReply(group, member)
} catch {
// Best-effort: the next tick retries; the bound stops runaways.
}
}
}
}
recordGroupActivity(group, { kind: 'failed', member: null, thread })
}
/** User send into a group room. `thread` continues that thread (its reply
* box); omitted/null mints a NEW thread — the main composer's Slack shape.
* Appends, bumps the room epoch (supersedes any running loop at its next
@@ -8892,7 +8940,7 @@ function mentionTokenAt(text, caret) {
* the strings parseGroupChatMentions resolves. Keyboard: Up/Down navigate,
* Enter/Tab insert (Enter falls through to submit when the popover is
* closed), Escape dismisses. */
function GroupMentionInput({ members, onChange, value, ...inputProps }) {
function GroupMentionInput({ members, onChange, onSubmitDraft, value, ...inputProps }) {
const allMeta = useValue($botMeta)
const inputRef = useRef(null)
const [token, setToken] = useState(null)
@@ -8995,32 +9043,55 @@ function GroupMentionInput({ members, onChange, value, ...inputProps }) {
)
})
: null,
jsx(Input, {
jsx(Textarea, {
...inputProps,
ref: inputRef,
value,
rows: 1,
// Multi-line room prompts (#89884): the composer was a single-line
// Input whose form submitted on every Enter — newlines were
// impossible. Enter (no Shift) still submits via onSubmitDraft;
// Shift+Enter falls through to the textarea's native newline.
className: cn('max-h-40 min-h-9 resize-none', inputProps.className),
onChange: event => {
onChange(event.target.value)
refreshToken(event.target)
},
onClick: event => refreshToken(event.target),
onKeyDown: event => {
if (!open) {
return
if (open) {
if (event.key === 'ArrowDown') {
event.preventDefault()
setSelected((active + 1) % options.length)
return
}
if (event.key === 'ArrowUp') {
event.preventDefault()
setSelected((active - 1 + options.length) % options.length)
return
}
if (event.key === 'Enter' || event.key === 'Tab') {
event.preventDefault()
insert(options[active].handle)
return
}
if (event.key === 'Escape') {
event.preventDefault()
setToken(null)
return
}
}
if (event.key === 'ArrowDown') {
if (event.key === 'Enter' && !event.shiftKey) {
event.preventDefault()
setSelected((active + 1) % options.length)
} else if (event.key === 'ArrowUp') {
event.preventDefault()
setSelected((active - 1 + options.length) % options.length)
} else if (event.key === 'Enter' || event.key === 'Tab') {
event.preventDefault()
insert(options[active].handle)
} else if (event.key === 'Escape') {
event.preventDefault()
setToken(null)
onSubmitDraft?.()
}
},
onBlur: () => setToken(null)
@@ -9221,6 +9292,39 @@ function GroupChatWorkspace({ group, members, onBack }) {
// downscaled — they ride the send into every responding member's session.
const [pendingImages, setPendingImages] = useState({})
// Scroll anchoring (#89835): rooms used to open at scroll position 0 and
// stay there while replies streamed in. Scroll the bottom sentinel into
// view on mount and whenever the log grows — but only when the user is
// already near the bottom, so reading history is never yanked away.
const bottomSentinelRef = useRef(null)
const stickToBottomRef = useRef(true)
useEffect(() => {
const sentinel = bottomSentinelRef.current
if (!sentinel) {
return
}
const viewport = sentinel.closest('[data-slot="scroll-area-viewport"]')
if (viewport) {
const onScroll = () => {
stickToBottomRef.current = viewport.scrollHeight - viewport.scrollTop - viewport.clientHeight < 80
}
viewport.addEventListener('scroll', onScroll, { passive: true })
return () => viewport.removeEventListener('scroll', onScroll)
}
}, [])
useEffect(() => {
if (stickToBottomRef.current) {
bottomSentinelRef.current?.scrollIntoView({ block: 'end' })
}
}, [room.log.length, room.running])
const imagesFor = thread => pendingImages[thread ?? 'main'] || []
const addImages = (thread, picked) => {
@@ -9733,6 +9837,7 @@ function GroupChatWorkspace({ group, members, onBack }) {
members,
value: replyDrafts[id] || '',
onChange: text => setReplyDrafts(prev => ({ ...prev, [id]: text })),
onSubmitDraft: () => submitReply(id),
onPaste: event => pasteImages(id, event)
}),
attachButton(id),
@@ -9814,7 +9919,11 @@ function GroupChatWorkspace({ group, members, onBack }) {
? `${groupSpeakerLabel(room.turn)} is thinking…`
: 'The room is working…'
}, 'working')
: null
: null,
// Scroll anchor (#89835): rooms opened at scroll position 0, mid-
// history. The effect below scrolls this sentinel into view on
// mount and on log growth — unless the user has scrolled up.
jsx('div', { ref: bottomSentinelRef, 'aria-hidden': true }, 'bottom-sentinel')
]
})
}),
@@ -9837,6 +9946,7 @@ function GroupChatWorkspace({ group, members, onBack }) {
members,
value: draft,
onChange: setDraft,
onSubmitDraft: submit,
onPaste: event => pasteImages(null, event)
}),
attachButton(null),
@@ -21,8 +21,9 @@ test('group room composers mount GroupMentionInput, not bare Input', () => {
assert.ok(!/jsx\(Input, \{\s*'aria-label': `Message \$\{group\}`/.test(source))
assert.ok(!/jsx\(Input, \{\s*'aria-label': 'Reply in thread'/.test(source))
// Both receive the seated members for the popover scope.
assert.ok(/GroupMentionInput\(\{ members, onChange, value/.test(source))
// Both receive the seated members for the popover scope (onSubmitDraft
// rides along so Enter submits from the multi-line textarea, #89884).
assert.ok(/GroupMentionInput\(\{ members, onChange, onSubmitDraft, value/.test(source))
})
test('popover offers @everyone/@all and inserts parser-compatible strings', () => {
@@ -0,0 +1,55 @@
import assert from 'node:assert/strict'
import { readFileSync } from 'node:fs'
import test from 'node:test'
const source = readFileSync(new URL('../plugin.js', import.meta.url), 'utf8')
// Room UX cluster (Aug 2026 desktop audit): three confirmed defects in the
// group-chat surface, fixed together.
//
// #89884 — the composer was a single-line Input; Enter always submitted and
// multi-line prompts were impossible.
// #89835 — rooms opened at scroll position 0 with no anchoring; new replies
// streamed in below the fold.
// #89545 — a member whose reply outlived the turn loop stayed stranded
// until the user's NEXT send (harvest only ran inside the loop).
test('room composer is a textarea with Enter=submit, Shift+Enter=newline (#89884)', () => {
const component = source.slice(
source.indexOf('function GroupMentionInput'),
source.indexOf('function GroupChatWorkspace')
)
// The control is the SDK Textarea, not the single-line Input.
assert.match(component, /jsx\(Textarea, \{/)
assert.doesNotMatch(component, /jsx\(Input, \{/)
// Enter (no Shift) submits through the injected handler...
assert.match(component, /event\.key === 'Enter' && !event\.shiftKey/)
assert.match(component, /onSubmitDraft\?\.\(\)/)
// ...and the popover branch still owns Enter while it is open.
assert.match(component, /insert\(options\[active\]\.handle\)/)
})
test('both room composers wire onSubmitDraft (#89884)', () => {
assert.match(source, /onSubmitDraft: submit,/)
assert.match(source, /onSubmitDraft: \(\) => submitReply\(id\),/)
})
test('room log anchors to the bottom with a user-scroll guard (#89835)', () => {
const workspace = source.slice(source.indexOf('function GroupChatWorkspace'))
assert.match(workspace, /bottomSentinelRef/)
assert.match(workspace, /stickToBottomRef/)
// Effect keys on log growth; the guard keeps history reading stable.
assert.match(workspace, /\[room\.log\.length, room\.running\]/)
assert.match(workspace, /scrollIntoView/)
})
test('stranded replies get a bounded background harvest after the loop settles (#89545)', () => {
assert.match(source, /function harvestStrandedUntilSettled\(/)
// The loop's finally block kicks it off only when members remain stranded.
assert.match(source, /strandedLeft\.length/)
// Bounded: interval + max tries, and it yields to a live loop.
const harvester = source.slice(source.indexOf('async function harvestStrandedUntilSettled'))
assert.match(harvester.slice(0, 1600), /HARVEST_MAX_TRIES/)
assert.match(harvester.slice(0, 1600), /room\.running/)
})