feat(web): rewrite subagent conversations for FIFO activation
This commit is contained in:
@@ -16,9 +16,9 @@ type Catalogs = SessionListState['subagentsByParent']
|
||||
|
||||
/** Business actions supplied by the slot registration. */
|
||||
export interface SubagentCatalogInjected {
|
||||
openChild(address: SubagentAddress): void
|
||||
refresh(parentSessionId: SessionId): void
|
||||
setCatalogOpen(parentSessionId: SessionId, open: boolean): void
|
||||
openChild: (address: SubagentAddress) => void
|
||||
refresh: (parentSessionId: SessionId) => void
|
||||
setCatalogOpen: (parentSessionId: SessionId, open: boolean) => void
|
||||
}
|
||||
|
||||
/** Full props for the session-header catalog action. */
|
||||
@@ -33,16 +33,16 @@ interface CatalogRowsProps {
|
||||
expanded: ReadonlySet<SessionId>
|
||||
level: number
|
||||
now: number
|
||||
openChild(address: SubagentAddress): void
|
||||
refresh(parentSessionId: SessionId): void
|
||||
toggleBranch(childSessionId: SessionId): void
|
||||
closeCatalog(): void
|
||||
openChild: (address: SubagentAddress) => void
|
||||
refresh: (parentSessionId: SessionId) => void
|
||||
toggleBranch: (childSessionId: SessionId) => void
|
||||
closeCatalog: () => void
|
||||
}
|
||||
|
||||
function diagnosticReason(entry: Extract<CatalogEntry, { kind: 'diagnostic' }>): string {
|
||||
switch (entry.reason) {
|
||||
case 'corrupt': return '会话记录损坏'
|
||||
case 'unsupported': return '不是可继续的子代理'
|
||||
case 'unsupported': return '子代理记录版本不受支持'
|
||||
case 'unavailable': return '会话记录暂不可用'
|
||||
}
|
||||
}
|
||||
@@ -119,11 +119,16 @@ function CatalogRows({
|
||||
const isExpanded = expanded.has(entry.id)
|
||||
const knownLeaf = childCatalog?.state === 'ready' && childCatalog.entries.length === 0
|
||||
const summary = summaries[entry.id]
|
||||
const secondary = summary?.title ?? (entry.activity === 'running' ? '正在处理' : '已完成')
|
||||
const label = entry.label ?? entry.id
|
||||
const mode = entry.mode === 'one-shot' ? '一次性' : '可继续'
|
||||
const activity = entry.activity === 'running' ? '正在运行' : '当前未运行'
|
||||
const secondary = [summary?.title, mode, activity]
|
||||
.filter(value => value !== undefined)
|
||||
.join(' · ')
|
||||
const time = relativeTime(summary?.updatedAt, now)
|
||||
|
||||
const open = (): void => {
|
||||
openChild({ parentSessionId, childSessionId: entry.id })
|
||||
openChild({ parentSessionId, childSessionId: entry.id, mode: entry.mode })
|
||||
closeCatalog()
|
||||
}
|
||||
const handleKey = (event: KeyboardEvent<HTMLDivElement>): void => {
|
||||
@@ -131,11 +136,10 @@ function CatalogRows({
|
||||
event.preventDefault()
|
||||
event.stopPropagation()
|
||||
open()
|
||||
} else if (event.key === 'ArrowRight' && !knownLeaf && !isExpanded) {
|
||||
event.preventDefault()
|
||||
event.stopPropagation()
|
||||
toggleBranch(entry.id)
|
||||
} else if (event.key === 'ArrowLeft' && isExpanded) {
|
||||
} else if (
|
||||
(event.key === 'ArrowRight' && !knownLeaf && !isExpanded)
|
||||
|| (event.key === 'ArrowLeft' && isExpanded)
|
||||
) {
|
||||
event.preventDefault()
|
||||
event.stopPropagation()
|
||||
toggleBranch(entry.id)
|
||||
@@ -153,7 +157,7 @@ function CatalogRows({
|
||||
role="treeitem"
|
||||
tabIndex={0}
|
||||
aria-level={level}
|
||||
aria-label={[entry.label, secondary, time].filter(value => value !== undefined).join(' ')}
|
||||
aria-label={[label, secondary, time].filter(value => value !== undefined).join(' ')}
|
||||
{...knownLeaf ? {} : { 'aria-expanded': isExpanded }}
|
||||
className={css.row}
|
||||
onClick={open}
|
||||
@@ -166,7 +170,7 @@ function CatalogRows({
|
||||
type="button"
|
||||
tabIndex={-1}
|
||||
className={`${css.disclosure} ${isExpanded ? css.disclosureOpen : ''}`}
|
||||
aria-label={`${isExpanded ? '收起' : '展开'} ${entry.label} 的下级子代理`}
|
||||
aria-label={`${isExpanded ? '收起' : '展开'} ${label} 的下级子代理`}
|
||||
onClick={toggle}
|
||||
>
|
||||
<IconChevronRightOutline14 />
|
||||
@@ -174,7 +178,7 @@ function CatalogRows({
|
||||
)}
|
||||
<StateDot state={entry.activity === 'running' ? 'ongoing' : 'done'} />
|
||||
<span className={css.content}>
|
||||
<span className={css.label}>{entry.label}</span>
|
||||
<span className={css.label}>{label}</span>
|
||||
<span className={css.summary}>{secondary}</span>
|
||||
</span>
|
||||
{time !== undefined && <span className={css.time}>{time}</span>}
|
||||
@@ -341,7 +345,7 @@ export function SubagentCatalogAction({
|
||||
<span>{healthy.length} 个子代理</span>
|
||||
<IconChevronDownOutline14 className={open ? css.triggerOpen : undefined} />
|
||||
</button>
|
||||
{open && catalog !== undefined && (
|
||||
{open && (
|
||||
<div className={css.menu} role="tree" aria-label="子代理会话">
|
||||
<CatalogRows
|
||||
parentSessionId={sessionId}
|
||||
|
||||
@@ -1,20 +1,32 @@
|
||||
import type { PropsRuntime } from '@deepseek-ai/dsh-client-ui-slots'
|
||||
import type { ComposerChainProps } from '@deepseek-ai/dsh-client-ui-conversation/client'
|
||||
import css from './SubagentReadOnlyComposer.module.css'
|
||||
|
||||
/** Why a catalog-addressed conversation cannot accept human input. */
|
||||
export interface SubagentReadOnlyMatch {
|
||||
reason: 'one-shot' | 'parent-unavailable'
|
||||
}
|
||||
|
||||
/** Full chain props after the read-only subagent selector accepts the owner currency. */
|
||||
export type SubagentReadOnlyComposerProps =
|
||||
PropsRuntime<'conversation.composer'> & { matched: ComposerChainProps }
|
||||
PropsRuntime<'conversation.composer'> & { matched: SubagentReadOnlyMatch }
|
||||
|
||||
/**
|
||||
* Explain why the normal composer is unavailable for a parentless child.
|
||||
* Explain why the normal composer is unavailable for an addressed child.
|
||||
* @param props - selector-owned read-only reason plus standard slot props.
|
||||
* @returns A read-only composer replacement.
|
||||
*/
|
||||
export function SubagentReadOnlyComposer() {
|
||||
export function SubagentReadOnlyComposer({
|
||||
matched,
|
||||
}: Pick<SubagentReadOnlyComposerProps, 'matched'>) {
|
||||
const oneShot = matched.reason === 'one-shot'
|
||||
return (
|
||||
<div className={css.frame} role="status">
|
||||
<strong>此子代理暂时只读</strong>
|
||||
<span>父会话当前不在线,重新打开父会话后即可继续发送消息。</span>
|
||||
<strong>{oneShot ? '一次性子代理记录' : '此子代理暂时只读'}</strong>
|
||||
<span>
|
||||
{oneShot
|
||||
? '一次性任务不支持后续消息,可在这里查看完整执行记录。'
|
||||
: '父会话当前不在线,重新打开父会话后即可继续发送消息。'}
|
||||
</span>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
@@ -15,19 +15,26 @@ import type {
|
||||
import type { ComposerChainProps } from '@deepseek-ai/dsh-client-ui-conversation/client'
|
||||
import type { ClientSessionContext, SlashServiceContract, SlashSource } from '@deepseek-ai/dsh-client-ui-slash/client'
|
||||
import { SubagentCatalogAction, type SubagentCatalogInjected } from './SubagentCatalogAction.tsx'
|
||||
import { SubagentReadOnlyComposer } from './SubagentReadOnlyComposer.tsx'
|
||||
import {
|
||||
SubagentReadOnlyComposer, type SubagentReadOnlyMatch,
|
||||
} from './SubagentReadOnlyComposer.tsx'
|
||||
|
||||
export type {
|
||||
SubagentCatalogActionProps, SubagentCatalogInjected,
|
||||
} from './SubagentCatalogAction.tsx'
|
||||
export type { SubagentReadOnlyComposerProps } from './SubagentReadOnlyComposer.tsx'
|
||||
export type {
|
||||
SubagentReadOnlyComposerProps, SubagentReadOnlyMatch,
|
||||
} from './SubagentReadOnlyComposer.tsx'
|
||||
|
||||
/** Required services for references, conversation slots, and session navigation. */
|
||||
export const inject = ['slash', 'sessions', 'conversation', 'slots']
|
||||
|
||||
/** Claim the composer only when an addressed child has no live continuation owner. */
|
||||
function selectReadOnlySubagent(owner: ComposerChainProps): ComposerChainProps | null {
|
||||
return owner.subagentReadOnly ? owner : null
|
||||
/** Claim the composer for one-shot history or an unavailable continuation owner. */
|
||||
function selectReadOnlySubagent(owner: ComposerChainProps): SubagentReadOnlyMatch | null {
|
||||
const subagent = owner.session?.subagent
|
||||
if (subagent === undefined || subagent === null) return null
|
||||
if (subagent.address.mode === 'one-shot') return { reason: 'one-shot' }
|
||||
return subagent.parentAvailable ? null : { reason: 'parent-unavailable' }
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -98,9 +105,9 @@ export function apply(ctx: ClientContext): void {
|
||||
ctx.effect(
|
||||
() => ctx.slots.register({
|
||||
name: 'conversation.composer',
|
||||
priority: 10,
|
||||
priority: -10,
|
||||
select: selectReadOnlySubagent,
|
||||
}, SubagentReadOnlyComposer),
|
||||
'ui-subagent: unavailable-parent composer',
|
||||
'ui-subagent: read-only addressed composer',
|
||||
)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user