From 472f6162bba1441ae876b1c087480a8d8ef6e451 Mon Sep 17 00:00:00 2001 From: betterer <54624517+better-er@users.noreply.github.com> Date: Thu, 29 Oct 2026 08:26:32 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E6=8F=92=E8=AF=9D=E4=B8=80=E5=BE=8B?= =?UTF-8?q?=E7=AB=8B=E5=8D=B3=20steer=EF=BC=8C=E4=B8=8D=E5=86=8D=E7=BC=93?= =?UTF-8?q?=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +- package.json | 2 +- src/client/PauseBar.tsx | 35 ++----- src/client/index.ts | 2 +- src/controller.ts | 50 +--------- src/index.ts | 178 +++++++++++++++++++-------------- tests/controller.spec.ts | 40 +------- tests/index.spec.ts | 205 +++++++++++++++++--------------------- tests/real-cordis.spec.ts | 7 ++ 9 files changed, 220 insertions(+), 305 deletions(-) diff --git a/README.md b/README.md index 685bdcd..c7463cb 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ DeepSeek Harness 会自动调用工具并连续作答,虽然可以使用插话 - **可开关**:默认关闭,每个会话可独立开启。 - **仅在暂停点暂停**:只有这个位置会停,也就是模型完成一轮工具交互、正要发出下一次请求之前。你发消息触发的第一次请求不停,也不打断任何在途 API 调用。 - **保持 composer 可用**:暂停期间输入框照常可打字,不遮挡、不切换。 -- **回车或按钮放行**:在主输入框按裸 Enter,或点「已暂停·回车或点此继续」按钮,都能放行暂停点。草稿为空无感放行,有字或图片则作为插话随本次请求一并发出。暂停点还没到时按回车也有效,消息留到下一个暂停点;这一轮已结束则作为新的一轮发出,按了就一定送达。 +- **回车或按钮放行**:在主输入框按裸 Enter,或点「已暂停·回车或点此继续」按钮,都能放行暂停点。草稿为空无感放行,有字或图片则作为插话随本次请求一并发出。暂停点还没到时按回车也有效,消息立即以 steer 插话送出,不等下一个暂停点;这一轮已结束则由 steer 自己开新的一轮。 - **图片随插话**:按下回车时文字与图片一起立刻离开输入框,图片在后台序列化后随消息发出,不会只发文字而把图片留在输入框。发送失败时文字与已序列化的图片暂存到下次发送,序列化失败的图片需要重新选择。文件附件暂不支持插话,会被直接移出输入框并提示重新选择。 - **模型无感知**:上下文完整、不插入多余消息,模型察觉不到暂停存在。 @@ -61,7 +61,7 @@ dsh plugin --profile web remove dsh-pause 1. 点 composer 工具行右侧的「暂停」按钮,变「暂停开」即该会话已开启。 2. 之后该会话的工具续跑请求会停在暂停点等你。 -3. 需要放行时在主输入框按裸 Enter,空为无感继续,有字或有图为插话。也可点「已暂停·回车或点此继续」。暂停点还没到时按回车同样有效,消息会留到下一个暂停点;这一轮已经结束则作为新的一轮发出。 +3. 需要放行时在主输入框按裸 Enter,空为无感继续,有字或有图为插话。也可点「已暂停·回车或点此继续」。暂停点还没到时按回车同样有效,消息立即 steer 送出;这一轮已经结束则由 steer 开新的一轮。 4. 用完再点「暂停开」关掉。暂停中关掉会放行当前暂停点。 ## 配置 @@ -85,7 +85,7 @@ dsh 把一次模型请求当作一个 step,agent 连续调用工具时会经 - 浏览器端经 `conversation.input.right` 槽位在 composer 工具行渲染控件。 - 带图插话由浏览器把草稿图片序列化成 base64 随放行请求上传,主机经 `attachments.admitPromptContent` 换成持久引用后与文字并入同一条 user 消息;RPC 请求体上限据此放宽到 300 MiB。 - 因 dsh 的 composer Enter 由 InputBar 私有 keymap 处理、第三方无 hook 点,开关开启期间用 DOM capture 常驻拦截裸 Enter,改走主机裁决,不改 DSH 源码。 -- 有没有暂停点由主机权威判定:有就放行,没有但 `agent/status` 为 running 就排进队列等下一个,idle 则直接 `followup` 成为新 turn;主机暂时发不出去时交回客户端暂存,不静默丢弃。 +- 有没有暂停点由主机权威判定:有就放行并把消息并入本步,没有就立即 `agent.steer`,空闲时 steer 自己开新 turn;插件不缓存插话,主机暂时发不出去时交回客户端暂存,不静默丢弃。 - 主机侧不经 `ctx.connection.rpc.handle`:该 API 自 0.1.2 起即不可用,改为向 webServer 自注册 `/dsh-pause` 前缀路由,复用 connection 的信任判定与浏览器鉴权,信封格式与官方一致。 ## 开发 diff --git a/package.json b/package.json index cded4b4..a8a8c36 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dsh-pause", - "version": "0.1.5", + "version": "0.1.6", "packageManager": "pnpm@9.15.9", "engines": { "node": ">=26.3.1" diff --git a/src/client/PauseBar.tsx b/src/client/PauseBar.tsx index 930fa27..a426a85 100644 --- a/src/client/PauseBar.tsx +++ b/src/client/PauseBar.tsx @@ -3,7 +3,7 @@ * * 目标交互: * - 开关按钮,本会话总开关。 - * - 开关开启期间,在 composer 主输入框按裸 Enter 一律交主机裁决:有暂停点就继续并带插话,没有但在跑就排进下一个暂停点,没有且空闲则由主机 followup,失败内容暂存而不退回输入框。 + * - 开关开启期间,在 composer 主输入框按裸 Enter 一律交主机裁决:有暂停点就继续并带插话,没有暂停点则立即 steer,失败内容暂存而不退回输入框。 * - 开关关闭时不拦截任何按键,完全透明。 * * dsh 的 composer Enter 由 InputBar 私有 keymap 处理,第三方没有正式 hook 点,故本组件在开关开启期间对所属 composer 挂 document 级 capture-phase keydown,抢在 Lexical 之前拦截裸 Enter。 @@ -41,10 +41,6 @@ export interface PauseControlProps extends PauseBarInjected { interface PauseStatus { enabled?: boolean paused?: boolean - /** agent 是否在跑;决定没有暂停点时插话该排队还是直接 followup。 */ - busy?: boolean - /** 已排队、等下一个暂停点或 idle 补发的插话条数。 */ - pendingMessageCount?: number } async function fetchStatus(rpc: PauseBarInjected['rpc'], sessionId: string): Promise { @@ -61,10 +57,8 @@ async function fetchStatus(rpc: PauseBarInjected['rpc'], sessionId: string): Pro /** 一次放行的结果;error 存在表示主机拒绝,暂停点未放行。 */ interface ReleaseOutcome { readonly released: boolean - /** 主机裁决时该会话的 agent 是否在跑。 */ - readonly busy: boolean - /** 主机已接住这条插话,草稿可以清空。 */ - readonly queued: boolean + /** 主机已把插话送进 dsh,草稿可以清空。 */ + readonly delivered: boolean readonly error?: string } @@ -76,11 +70,11 @@ async function callRelease( ): Promise { try { const result = await rpc.call('/dsh-pause', 'release', { sessionId, text, images }) - if (!result.ok) return { released: false, busy: false, queued: false, error: result.error?.message ?? '放行失败' } - const value = result.value as { released?: boolean; busy?: boolean; queued?: boolean } | undefined - return { released: value?.released === true, busy: value?.busy === true, queued: value?.queued === true } + if (!result.ok) return { released: false, delivered: false, error: result.error?.message ?? '放行失败' } + const value = result.value as { released?: boolean; delivered?: boolean } | undefined + return { released: value?.released === true, delivered: value?.delivered === true } } catch (error) { - return { released: false, busy: false, queued: false, error: error instanceof Error ? error.message : String(error) } + return { released: false, delivered: false, error: error instanceof Error ? error.message : String(error) } } } @@ -93,10 +87,10 @@ async function callSetEnabled(rpc: PauseBarInjected['rpc'], sessionId: string, e } /** - * 把一次回车交给主机裁决:有暂停点就放行,没有但在跑就排进下一个暂停点,没有且空闲且有 agent 引用就由主机 followup。 + * 把一次回车交给主机裁决:有暂停点就放行,没有暂停点则由主机立即 steer。 * 按下回车时文字与图片已经离开输入框,所以任何失败都不回填,改为暂存到下次发送时优先带出。 */ -async function releaseOrQueue( +async function releaseInterjection( rpc: PauseBarInjected['rpc'], sessionId: string, draft: string, @@ -128,7 +122,7 @@ async function releaseOrQueue( onError(outcome.error + ',已保留,下次发送时一并送出') return } - if (outcome.released || outcome.queued) { + if (outcome.released || outcome.delivered) { onDone() return } @@ -167,7 +161,6 @@ export const PauseControl = memo(function PauseControl({ }: PauseControlProps) { const [enabled, setEnabled] = useState(false) const [paused, setPaused] = useState(false) - const [pendingCount, setPendingCount] = useState(0) const [error, setError] = useState(undefined) const rootRef = useRef(null) // composer 卡标记缺失时只报一次,避免每次按键都刷控制台。 @@ -229,7 +222,7 @@ export const PauseControl = memo(function PauseControl({ draftRef.current = '' inputActions?.setDraft('') for (const id of ids) inputActions?.removeAttachment(id) - const pendingRelease = releaseOrQueue( + const pendingRelease = releaseInterjection( rpc, sessionId, sent, @@ -267,7 +260,6 @@ export const PauseControl = memo(function PauseControl({ if (disposed || s === undefined) return setEnabled(s.enabled ?? false) setPaused(s.paused ?? false) - setPendingCount(s.pendingMessageCount ?? 0) } void poll() timer = setInterval(() => void poll(), 400) @@ -364,11 +356,6 @@ export const PauseControl = memo(function PauseControl({ 已暂停·回车或点此继续 )} - {pendingCount > 0 && ( - - {pendingCount} 条已排入下一步 - - )} {error !== undefined && ( {error} diff --git a/src/client/index.ts b/src/client/index.ts index f142c62..3ad3699 100644 --- a/src/client/index.ts +++ b/src/client/index.ts @@ -1,7 +1,7 @@ /** * dsh-pause 浏览器半身:暂停控件挂在 composer 工具行右侧 conversation.input.right。 * - * 目标:开关开启期间在 composer 主输入框里按 Enter 即继续。有暂停点则放行并带上草稿,没有但在跑则排进下一个暂停点,没有且空闲则由主机 followup;主机发不出去时交回客户端暂存,失败内容不退回输入框。 + * 目标:开关开启期间在 composer 主输入框里按 Enter 即继续。有暂停点则放行并带上草稿,没有暂停点则立即 steer;主机发不出去时交回客户端暂存,失败内容不退回输入框。 * 因为 dsh 的 composer Enter 由 InputBar 私有 keymap 处理,第三方没有正式 hook 点,所以本插件用 DOM capture 在开关开启期间常驻拦截裸 Enter,阻止默认送信并改走主机裁决。 * 控件本身在 composer 卡内渲染,因此暂停条可见且可点。capture 监听只在开关开启期间激活,关闭时不拦截任何按键。 * diff --git a/src/controller.ts b/src/controller.ts index 16c7000..ea8dcb9 100644 --- a/src/controller.ts +++ b/src/controller.ts @@ -6,8 +6,8 @@ * 放行时可带补充文字,作为一条 user 消息并入本 step 的 messages,让模型在紧接着的请求里看到它。 * * 暂停点只卡在请求真正发出之前,因此不打断任何在途 API 调用。 - * 人类在暂停点挂上之前按回车时,插话先排队,下一个暂停点不再等回车而是直接带头并入本步,即预放行; - * turn 若在暂停点出现之前结束,队列由主机作为新的 followup 发出去;followup 抛错时放回队列等下一次重试,任何失败都不静默丢弃。 + * 暂停点还没挂上时按回车发出的插话一律立即交给 agent.steer(),由 dsh 在最近一步认领;空闲时 steer 自己开新 turn。 + * 插件不缓存插话,也不做补发。 * driver 组装好的上下文原样放行,不插入、不删除、不改写任何模型可见的痕迹,模型无感知暂停。 * * @module dsh-pause @@ -20,12 +20,8 @@ import { createUserMessage } from '@deepseek-ai/dsh-llm' export interface PauseSessionState { /** 用户开关:该会话是否启用暂停。false 时所有请求直接放行。 */ enabled: boolean - /** 该会话的 agent 是否在跑。idle 时暂停点不会再来,队列要当场发出去。 */ - busy: boolean /** 当前挂着的暂停点,放行时若带文字则一并返回。 */ pausePoint: PausePoint | undefined - /** 暂停点还没挂上时人类已按回车发出的插话,等下一个暂停点并入或 turn 结束时 followup。 */ - pendingMessages: UserMessage[] } /** 一个暂停点:人类选择继续时用它放行,可携带一条已构造好的补充用户消息。 */ @@ -69,7 +65,7 @@ export function textToMessage(text: string): UserMessage | undefined { /** 会话状态在安装器里的默认初始值。 */ export function initialSessionState(): PauseSessionState { - return { enabled: false, busy: false, pausePoint: undefined, pendingMessages: [] } + return { enabled: false, pausePoint: undefined } } /** 默认每会话开关。 */ @@ -107,44 +103,6 @@ export class PauseRegistry { return this.stateFor(sessionId).pausePoint !== undefined } - /** 该会话的 agent 是否在跑。 */ - isBusy(sessionId: string): boolean { - return this.stateFor(sessionId).busy - } - - /** 待插话队列长度。 */ - pendingMessageCount(sessionId: string): number { - return this.stateFor(sessionId).pendingMessages.length - } - - /** 更新 agent 的运行状态。转为 idle 时暂停点不会再挂上,由安装器负责把队列当场发出去。 */ - setBusy(sessionId: string, busy: boolean): void { - const s = this.stateFor(sessionId) - if (s.busy === busy) return - this.states.set(sessionId, { ...s, busy }) - } - - /** 把一条还没送达的插话排进队列,等下一个暂停点并入,或等 turn 结束时 followup。 */ - queueMessage(sessionId: string, message: UserMessage): void { - const s = this.stateFor(sessionId) - this.states.set(sessionId, { ...s, pendingMessages: [...s.pendingMessages, message] }) - } - - /** 取走全部待插话。 */ - takePendingMessages(sessionId: string): UserMessage[] { - const s = this.stateFor(sessionId) - if (s.pendingMessages.length === 0) return [] - this.states.set(sessionId, { ...s, pendingMessages: [] }) - return s.pendingMessages - } - - /** 把没能并入的待插话放回队首,用于该步被 reject 或补发失败的情形。 */ - requeueMessages(sessionId: string, messages: readonly UserMessage[]): void { - if (messages.length === 0) return - const s = this.stateFor(sessionId) - this.states.set(sessionId, { ...s, pendingMessages: [...messages, ...s.pendingMessages] }) - } - /** * 放行暂停点。若该会话当前正挂着暂停点,用给定补充消息放行并返回 true;否则返回 false。 * 放行后状态复位为未暂停,因为这一步已经放行。 @@ -161,10 +119,8 @@ export class PauseRegistry { /** 挂起一个暂停点,并把放行入口写入状态。 */ armPausePoint(sessionId: string, resolvers: Pick): void { const s = this.stateFor(sessionId) - // pre-step 一定发生在 running 内,插件热加载可能错过 idle→running 推送,这里顺手补上。 this.states.set(sessionId, { ...s, - busy: true, pausePoint: { resolve: resolvers.resolve, reject: resolvers.reject }, }) } diff --git a/src/index.ts b/src/index.ts index 67819b1..b2d240c 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,3 +1,18 @@ +/** + * dsh-pause 主机半身:暂停控制器与判定。 + * + * 核心语义:在 agent 每轮 step 进入前的 agent/pre-step 事件里判断这次请求是否为工具交互后的续跑。 + * 若是续跑且开关开启,则挂起一个暂停点,等人类经 release 原语放行后才把这一次请求发出去。 + * 放行时可带补充文字,作为一条 user 消息并入本 step 的 messages,让模型在紧接着的请求里看到它。 + * + * 暂停点只卡在请求真正发出之前,因此不打断任何在途 API 调用。 + * 暂停点还没挂上时按回车发出的插话一律立即交给 agent.steer(),由 dsh 在最近一步认领;空闲时 steer 自己开新 turn。 + * 插件不缓存插话,也不做补发;只有该步被 reject 时把已并入的消息重新 steer 一次,失败写日志。 + * driver 组装好的上下文原样放行,不插入、不删除、不改写任何模型可见的痕迹,模型无感知暂停。 + * + * @module dsh-pause + */ + import type { Context } from '@deepseek-ai/cordis' import z from '@deepseek-ai/schemastery' import type { ContentBlock, UserMessage } from '@deepseek-ai/dsh-llm' @@ -14,14 +29,14 @@ declare module '@deepseek-ai/cordis' { export const name = 'dsh-pause' -/** 本插件需要的主机服务。connection 是 host 与浏览器共享的 RPC 载体。 */ -export const inject = ['connection'] +/** 本插件需要的主机服务。connection 是 host 与浏览器共享的 RPC 载体,agents 用来把插话 steer 进当前 turn。 */ +export const inject = ['connection', 'agents'] export interface Config { defaultEnabled?: boolean } export const Config: z = z.object({ defaultEnabled: z.boolean().default(DEFAULT_ENABLED) }) interface PreStepPayload { - agent: { id: string } + agent: AgentFace & { id: string } turn: number step: number signal: AbortSignal @@ -29,10 +44,19 @@ interface PreStepPayload { } type PreStepDecision = { kind: 'reject' } | { kind: 'enter'; messages: UserMessage[]; startsRequestSeries?: true } -/** agent/status 只报 idle 与 running 两个值,用来判断 turn 是否还可能挂下一个暂停点。 */ +/** agent 的插话入口:steer 在最近一步认领,空闲时自己开新 turn。 */ +interface AgentFace { + steer(message: UserMessage): void +} + +/** 活 agent 注册表的最小面。 */ +interface AgentRegistryFace { + get(sessionId: string): AgentFace | undefined +} + +/** agent/status 的载荷,带的 agent 可直接 steer。 */ interface AgentStatusPayload { - /** followup 用于把 turn 结束时还没送出的插话当场发出去。 */ - agent: { id: string; followup(message: UserMessage): void } + agent: AgentFace & { id: string } status: 'idle' | 'running' } @@ -70,6 +94,16 @@ function rpcError(message: string): RpcChannelResult { return { ok: false, error: { code: 'internal', message, details: {} } } } +/** 读取活 agent 注册表,用于把插话立即 steer 进当前 turn。 */ +function agentRegistry(ctx: Context): AgentRegistryFace | undefined { + const get = (ctx as unknown as { get?: (name: string, strict?: boolean) => unknown }).get + if (typeof get === 'function') { + const service = get.call(ctx, 'agents', false) as AgentRegistryFace | undefined + if (service !== undefined) return service + } + return (ctx as unknown as { agents?: AgentRegistryFace }).agents +} + /** 读取附件服务。RPC 测试桩或裁剪运行环境可能没有它,此时带图插话会明确报错。 */ function attachmentStore(ctx: Context): AttachmentStoreFace | undefined { const get = (ctx as unknown as { get?: (name: string, strict?: boolean) => unknown }).get @@ -122,8 +156,36 @@ export function apply(ctx: Context, config: Config = {}): void { const defaultEnabled = config.defaultEnabled === true const registry = new PauseRegistry(defaultEnabled) - // 记住每个 agent 的活引用,空闲时按回车可以把插话直接 followup 成新 turn。 - const agents = new Map() + // 插话要立即 steer,所以得拿到活 agent。热加载或时序原因可能读不到 agents 服务,pre-step 与 status 的载荷都带活 agent,一并记住。 + const liveAgents = new Map() + const agentFor = (sessionId: string): AgentFace | undefined => + liveAgents.get(sessionId) ?? agentRegistry(ctx)?.get(sessionId) + + // 刚 steer 出去、还没被认领进某一步的插话 id。pre-step 命中说明这条插话就在本步里,不必再停。 + const awaitingSteer = new Map>() + const markSteer = (sessionId: string, message: UserMessage): void => { + let ids = awaitingSteer.get(sessionId) + if (ids === undefined) { + ids = new Set() + awaitingSteer.set(sessionId, ids) + } + ids.add(message.id) + } + + /** 该步被 reject 时把已并入的消息重新 steer 一次,避免插件缓存或丢失。 */ + const resteer = (sessionId: string, message: UserMessage): void => { + const agent = agentFor(sessionId) + if (agent === undefined) { + console.error('[dsh-pause] 该步已 reject,且没有活 agent 可重新 steer,插话丢失:', message) + return + } + try { + agent.steer(message) + markSteer(sessionId, message) + } catch (error) { + console.error('[dsh-pause] 该步已 reject,重新 steer 失败,插话丢失:', error) + } + } const handler: RpcChannelHandler = async (endpoint, payload) => { try { @@ -139,34 +201,26 @@ export function apply(ctx: Context, config: Config = {}): void { case 'release': { const { sessionId, text, images } = payload as ReleaseBody if (typeof sessionId !== 'string') return rpcError('release requires sessionId:string') - const paused = registry.isPaused(sessionId) const textLength = typeof text === 'string' ? text.trim().length : 0 const imageCount = Array.isArray(images) ? images.length : 0 - if (!paused) { - // 没有暂停点时由 agent 是否在跑来裁决:还在跑说明下一个暂停点会来,消息先排队; - // 已经空闲则不会再有暂停点,有 agent 活引用就直接 followup 开一条新 turn。 - if (textLength === 0 && imageCount === 0) { - return ok({ released: false, busy: registry.isBusy(sessionId), queued: false }) - } - const message = await buildReleaseMessage(ctx, text, images) - if (message === undefined) return ok({ released: false, busy: registry.isBusy(sessionId), queued: false }) - // 构建消息期间 turn 可能已经结束,这种时候直接 followup 开新 turn。 - if (!registry.isBusy(sessionId)) { - const agent = agents.get(sessionId) - if (agent !== undefined) { - // 没有暂停点也不会再有:按了就发出去,直接开一条新 turn。 - agent.followup(message) - return ok({ released: false, busy: false, queued: true }) - } - // 没有 agent 活引用,主机现在发不出去。不静默入队,交回客户端暂存,下次按回车再试。 - return ok({ released: false, busy: false, queued: false }) - } - registry.queueMessage(sessionId, message) - return ok({ released: false, busy: true, queued: true }) + const message = textLength === 0 && imageCount === 0 + ? undefined + : await buildReleaseMessage(ctx, text, images) + // 暂停点挂着时放行并把消息并入本步,请求立刻发出。 + if (registry.isPaused(sessionId)) { + const released = registry.release(sessionId, message) + return ok({ released, delivered: message !== undefined }) + } + if (message === undefined) return ok({ released: false, delivered: false }) + // 没有暂停点就立即 steer,不缓存;空闲时 steer 自己开新 turn。 + const agent = agentFor(sessionId) + if (agent === undefined) { + console.error('[dsh-pause] 找不到活 agent,无法 steer 插话:', sessionId) + return ok({ released: false, delivered: false }) } - const message = await buildReleaseMessage(ctx, text, images) - const released = registry.release(sessionId, message) - return ok({ released, busy: registry.isBusy(sessionId), queued: false }) + agent.steer(message) + markSteer(sessionId, message) + return ok({ released: false, delivered: true }) } case 'status': { const { sessionId } = payload as StatusBody @@ -174,8 +228,6 @@ export function apply(ctx: Context, config: Config = {}): void { return ok({ enabled: registry.enabled(sessionId), paused: registry.isPaused(sessionId), - busy: registry.isBusy(sessionId), - pendingMessageCount: registry.pendingMessageCount(sessionId), }) } default: return rpcError('unknown endpoint ' + endpoint) @@ -187,53 +239,25 @@ export function apply(ctx: Context, config: Config = {}): void { // connection.rpc.handle 自 0.1.2-rc.1 起即不可用,登记路由时解析 webServer 会抛 without inject,故改为插件自注册通道。 mountRpcChannel(ctx, '/dsh-pause', handler) - // agent/status 是判断「暂停点还会不会来」的唯一依据:running 时下一个迟早挂上,idle 时永远不会。 ctx.on('agent/status', (payload: AgentStatusPayload) => { - const sessionId = payload.agent.id - agents.set(sessionId, payload.agent) - const busy = payload.status === 'running' - if (registry.isBusy(sessionId) !== busy) registry.setBusy(sessionId, busy) - if (busy) return - // turn 已经结束,排队的插话等不到暂停点了。按了回车就一定发出去:直接 followup 开一条新 turn。 - // 不因 busy 未变而提前返回:队列里可能有暂停点该步被 reject 时放回的消息,要借这次派发再试。 - const leftover = registry.takePendingMessages(sessionId) - if (leftover.length === 0) return - // 让本次 status 派发先结束,避免 followup 唤醒 driver 时重入同一个事件。 - queueMicrotask(() => { - const failed: UserMessage[] = [] - for (const message of leftover) { - try { - payload.agent.followup(message) - } catch { - failed.push(message) - } - } - // 补发失败时放回队列,等下一次状态派发或暂停点再试。 - if (failed.length > 0) registry.requeueMessages(sessionId, failed) - }) + liveAgents.set(payload.agent.id, payload.agent) + if (payload.status === 'idle') awaitingSteer.delete(payload.agent.id) }) ctx.on('agent/pre-step', async (payload: PreStepPayload, next: () => Promise) => { const sessionId = payload.agent.id + liveAgents.set(sessionId, payload.agent) const state = registry.stateFor(sessionId) if (payload.step <= 1 || !state.enabled) return next() - registry.setBusy(sessionId, true) - - // 人类在暂停点挂上之前就按了回车,视作预放行这一步:不再挂暂停点,直接把插话并入本步。 - const preapproved = registry.takePendingMessages(sessionId) - if (preapproved.length > 0) { - try { - const decision = await next() - if (decision.kind === 'reject') { - registry.requeueMessages(sessionId, preapproved) - return decision - } - return { ...decision, messages: [...decision.messages, ...preapproved] } - } catch (error) { - // driver 抛错同样算这一步没发出去,队列放回,绝不让消息跟着异常一起消失。 - registry.requeueMessages(sessionId, preapproved) - throw error + + // 插话已被认领进本步:按回车就是让模型继续,这次不再停。 + const pendingSteer = awaitingSteer.get(sessionId) + if (pendingSteer !== undefined && pendingSteer.size > 0) { + let matched = false + for (const message of payload.messages) { + if (pendingSteer.delete(message.id)) matched = true } + if (matched) return next() } let resolvePausePoint: (message: UserMessage | undefined) => void = () => {} @@ -255,12 +279,12 @@ export function apply(ctx: Context, config: Config = {}): void { try { decision = await next() } catch (error) { - if (carried !== undefined) registry.requeueMessages(sessionId, [carried]) + if (carried !== undefined) resteer(sessionId, carried) throw error } if (decision.kind === 'reject') { - // 这一步被 reject 时放行的插话没有送达,放回队列而不是丢掉。 - if (carried !== undefined) registry.requeueMessages(sessionId, [carried]) + // 这一步被 reject 时放行的插话没有送达本步,立即重新 steer,由 dsh 在下次唤醒时认领。 + if (carried !== undefined) resteer(sessionId, carried) return decision } return carried === undefined ? decision : { ...decision, messages: [...decision.messages, carried] } diff --git a/tests/controller.spec.ts b/tests/controller.spec.ts index a63e209..554026e 100644 --- a/tests/controller.spec.ts +++ b/tests/controller.spec.ts @@ -71,39 +71,6 @@ describe('PauseRegistry', () => { await expect(pausePoint).rejects.toThrow('cancelled') expect(reg.isPaused('s')).toBe(false) }) - it('没有暂停点时 release 返回 false 且不动队列', () => { - const reg = new PauseRegistry(false) - expect(reg.release('s', undefined)).toBe(false) - expect(reg.pendingMessageCount('s')).toBe(0) - }) - it('待插话队列先进先出,take 一次取走全部', () => { - const reg = new PauseRegistry(false) - const first = textToMessage('第一条')! - const second = textToMessage('第二条')! - reg.queueMessage('s', first) - reg.queueMessage('s', second) - expect(reg.pendingMessageCount('s')).toBe(2) - expect(reg.takePendingMessages('s')).toEqual([first, second]) - expect(reg.pendingMessageCount('s')).toBe(0) - expect(reg.takePendingMessages('s')).toEqual([]) - }) - it('该步被 reject 时把待插话放回队首', () => { - const reg = new PauseRegistry(false) - const first = textToMessage('第一条')! - reg.queueMessage('s', first) - const taken = reg.takePendingMessages('s') - reg.requeueMessages('s', taken) - expect(reg.pendingMessageCount('s')).toBe(1) - expect(reg.takePendingMessages('s')[0]).toBe(first) - }) - it('busy 只记录 agent 是否在跑,不动队列', () => { - const reg = new PauseRegistry(false) - reg.setBusy('s', true) - reg.queueMessage('s', textToMessage('还在跑')!) - reg.setBusy('s', false) - expect(reg.isBusy('s')).toBe(false) - expect(reg.pendingMessageCount('s')).toBe(1) - }) it('isPaused 直接由暂停点是否存在推出', () => { const reg = new PauseRegistry(false) expect(reg.isPaused('s')).toBe(false) @@ -117,11 +84,6 @@ describe('PauseRegistry', () => { expect(reg.stateFor('x')).toBe(reg.stateFor('x')) }) it('initialSessionState 默认关且未暂停', () => { - expect(initialSessionState()).toEqual({ - enabled: false, - busy: false, - pausePoint: undefined, - pendingMessages: [], - }) + expect(initialSessionState()).toEqual({ enabled: false, pausePoint: undefined }) }) }) diff --git a/tests/index.spec.ts b/tests/index.spec.ts index 45d18b6..0a62060 100644 --- a/tests/index.spec.ts +++ b/tests/index.spec.ts @@ -1,14 +1,13 @@ /** * dsh-pause host apply 的接线级测试。 * 用桩 ctx 捕获 agent/pre-step 监听与 RPC 处理器。 - * 驱动「暂停 → RPC release 放行 → next() 放行该步」与「带文字放行并入 user 消息」两条路径。 + * 驱动「暂停 → RPC release 放行 → next() 放行该步」「带文字放行并入 user 消息」与「无暂停点时立即 steer」三条路径。 */ import http from 'node:http' import { afterAll, beforeAll, describe, expect, it } from 'vitest' import { apply } from '../src/index.ts' type PreStepListener = (payload: any, next: () => Promise) => Promise -type StatusListener = (payload: { agent: { id: string }; status: 'idle' | 'running' }) => void type RouteHandler = (req: http.IncomingMessage, res: http.ServerResponse) => void | Promise /** apply 自注册的路由处理器,由最近一次 harness 捕获。 */ @@ -52,9 +51,9 @@ function fakeAttachments() { } /** 造一个桩 ctx:捕获 apply 注册的 pre-step 监听,并接住自注册的 prefix 路由。 */ -function harness(enabledDefault = false) { +function harness(enabledDefault = false, withAgents = true, withAgentPayload = true) { let preStepListener: PreStepListener | undefined - let statusListener: StatusListener | undefined + let statusListener: ((payload: any) => void) | undefined const scope = { connection: { requestRejection: () => undefined }, webServer: { @@ -66,32 +65,38 @@ function harness(enabledDefault = false) { effect(cb: () => unknown) { return cb() }, } const attachments = fakeAttachments() + const steered: { sessionId: string; message: any }[] = [] + let steerThrows = false + const agentOf = (id: string) => ({ + id, + steer(message: any) { + if (steerThrows) throw new Error('steer failed') + steered.push({ sessionId: id, message }) + }, + }) + const agents = { get: (sessionId: string) => agentOf(sessionId) } const ctx = { on(_name: string, listener: any) { if (_name === 'agent/pre-step') preStepListener = listener as PreStepListener - if (_name === 'agent/status') statusListener = listener as StatusListener + if (_name === 'agent/status') statusListener = listener as (payload: any) => void return () => true }, inject(_deps: string[], cb: (s: unknown) => void) { cb(scope) }, - get(name: string) { return name === 'attachments' ? attachments.store : undefined }, + get(name: string) { + if (name === 'attachments') return attachments.store + return name === 'agents' && withAgents ? agents : undefined + }, + agents: withAgents ? agents : undefined, } - const followed: { sessionId: string; message: any }[] = [] apply(ctx as any, { defaultEnabled: enabledDefault }) return { - get preStep() { return preStepListener! }, - status(sessionId: string, status: 'idle' | 'running', followupThrows = false) { - statusListener!({ - agent: { - id: sessionId, - followup(message: any) { - if (followupThrows) throw new Error('followup failed') - followed.push({ sessionId, message }) - }, - }, - status, - }) + preStep(payload: any, next: () => Promise) { + const agent = withAgentPayload ? agentOf(payload.agent.id) : payload.agent + return preStepListener!({ ...payload, agent }, next) }, - followed, + status(payload: any) { statusListener!(payload) }, + steered, + setSteerThrows(value: boolean) { steerThrows = value }, attachments, } } @@ -203,129 +208,103 @@ describe('apply host wiring', () => { await p }) - it('没有暂停点且空闲时 release 返回 released:false 与 busy:false', async () => { - harness(true) - const rel = await rpc('release', { sessionId: 'nobody', text: '' }) - expect(rel.value).toMatchObject({ released: false, busy: false, queued: false }) - }) - - it('没有暂停点但在跑时把插话排进队列,下一个暂停点自动并入', async () => { + it('没有暂停点时空回车不 steer', async () => { const h = harness(true) - h.status('s6', 'running') - const queued = await rpc('release', { sessionId: 's6', text: ' 赶在暂停点前面 ' }) - expect(queued.value).toMatchObject({ released: false, busy: true, queued: true }) - expect((await rpc('status', { sessionId: 's6' })).value.pendingMessageCount).toBe(1) - - // 暂停点还没挂上时不必再按回车:这一步会直接带走队列里的消息。 - const p = h.preStep( - { agent: { id: 's6' }, turn: 1, step: 2, signal: new AbortController().signal, messages: [] }, - async () => ({ kind: 'enter', messages: [] }), - ) - const decision = await p - expect(decision.messages).toHaveLength(1) - expect(decision.messages[0].content).toMatchObject([{ type: 'text', text: '赶在暂停点前面' }]) - expect((await rpc('status', { sessionId: 's6' })).value.pendingMessageCount).toBe(0) + const rel = await rpc('release', { sessionId: 's6', text: ' ' }) + expect(rel.value).toMatchObject({ released: false, delivered: false }) + expect(h.steered).toHaveLength(0) }) - it('没有暂停点且在跑时空回车不排队', async () => { + it('没有暂停点时立即 steer,不排队', async () => { const h = harness(true) - h.status('s7', 'running') - const rel = await rpc('release', { sessionId: 's7', text: '' }) - expect(rel.value).toMatchObject({ released: false, busy: true, queued: false }) - expect((await rpc('status', { sessionId: 's7' })).value.pendingMessageCount).toBe(0) + const rel = await rpc('release', { sessionId: 's7', text: ' 立刻发 ' }) + expect(rel.value).toMatchObject({ released: false, delivered: true }) + expect(h.steered).toHaveLength(1) + expect(h.steered[0]!.sessionId).toBe('s7') + expect(h.steered[0]!.message.content).toMatchObject([{ type: 'text', text: '立刻发' }]) }) - it('turn 结束时排队的插话由 followup 当场发出', async () => { - const h = harness(true) - h.status('s8', 'running') - await rpc('release', { sessionId: 's8', text: '没赶上' }) - expect(h.followed).toHaveLength(0) - h.status('s8', 'idle') - await Promise.resolve() - expect(h.followed).toHaveLength(1) - expect(h.followed[0]!.sessionId).toBe('s8') - expect(h.followed[0]!.message.content).toMatchObject([{ type: 'text', text: '没赶上' }]) - expect((await rpc('status', { sessionId: 's8' })).value.pendingMessageCount).toBe(0) + it('没有暂停点且没有活 agent 时返回未送达', async () => { + harness(true, false) + const rel = await rpc('release', { sessionId: 's8', text: '先别丢' }) + expect(rel.value).toMatchObject({ released: false, delivered: false }) }) - it('插话已被下一个暂停点带走时 idle 不再重复 followup', async () => { - const h = harness(true) - h.status('s9', 'running') - await rpc('release', { sessionId: 's9', text: '插一句' }) + it('pre-step 记住的 agent 在没有 agents 服务时也能立即 steer', async () => { + const h = harness(true, false) await h.preStep( - { agent: { id: 's9' }, turn: 1, step: 2, signal: new AbortController().signal, messages: [] }, + { agent: { id: 's12' }, turn: 1, step: 1, signal: new AbortController().signal, messages: [] }, async () => ({ kind: 'enter', messages: [] }), ) - h.status('s9', 'idle') - await Promise.resolve() - expect(h.followed).toHaveLength(0) + const rel = await rpc('release', { sessionId: 's12', text: '还能发' }) + expect(rel.value).toMatchObject({ released: false, delivered: true }) + expect(h.steered).toHaveLength(1) + expect(h.steered[0]!.message.content).toMatchObject([{ type: 'text', text: '还能发' }]) }) - it('没有暂停点、空闲且尚无 agent 引用时返回未送达,不入队', async () => { + it('插话已被认领进本步时不再挂暂停点', async () => { const h = harness(true) - const rel = await rpc('release', { sessionId: 's10', text: '先别丢' }) - expect(rel.value).toMatchObject({ released: false, busy: false, queued: false }) - expect((await rpc('status', { sessionId: 's10' })).value.pendingMessageCount).toBe(0) + const rel = await rpc('release', { sessionId: 's20', text: '插一句' }) + expect(rel.value.delivered).toBe(true) + const message = h.steered[0]!.message + const decision = await h.preStep( + { agent: { id: 's20' }, turn: 1, step: 2, signal: new AbortController().signal, messages: [message] }, + async () => ({ kind: 'enter', messages: [] }), + ) + expect(decision).toEqual({ kind: 'enter', messages: [] }) }) - it('没有暂停点、空闲且已有 agent 引用时 release 直接 followup', async () => { + it('插话没进本步时照常暂停', async () => { const h = harness(true) - h.status('s12', 'idle') - const rel = await rpc('release', { sessionId: 's12', text: '直接发' }) - expect(rel.value).toMatchObject({ released: false, busy: false, queued: true }) - expect(h.followed).toHaveLength(1) - expect(h.followed[0]!.message.content).toMatchObject([{ type: 'text', text: '直接发' }]) + await rpc('release', { sessionId: 's21', text: '插一句' }) + const base = { kind: 'enter' as const, messages: [] } + const p = h.preStep( + { agent: { id: 's21' }, turn: 1, step: 2, signal: new AbortController().signal, messages: [] }, + async () => base, + ) + await Promise.resolve() + expect((await rpc('status', { sessionId: 's21' })).value.paused).toBe(true) + await rpc('release', { sessionId: 's21', text: '' }) + await expect(p).resolves.toEqual(base) }) - it('暂停点放行后该步 reject,插话放回队列并在 idle 补发', async () => { + it('暂停点放行后该步 reject 时重新 steer', async () => { const h = harness(true) const p = h.preStep( - { agent: { id: 's13' }, turn: 1, step: 2, signal: new AbortController().signal, messages: [] }, + { agent: { id: 's9' }, turn: 1, step: 2, signal: new AbortController().signal, messages: [] }, async () => ({ kind: 'reject' as const }), ) await Promise.resolve() - await rpc('release', { sessionId: 's13', text: '别丢' }) + await rpc('release', { sessionId: 's9', text: '别丢' }) await expect(p).resolves.toEqual({ kind: 'reject' }) - expect((await rpc('status', { sessionId: 's13' })).value.pendingMessageCount).toBe(1) - h.status('s13', 'idle') - await Promise.resolve() - expect(h.followed).toHaveLength(1) - expect(h.followed[0]!.message.content).toMatchObject([{ type: 'text', text: '别丢' }]) + expect(h.steered).toHaveLength(1) + expect(h.steered[0]!.message.content).toMatchObject([{ type: 'text', text: '别丢' }]) }) - it('预放行时 next 抛错,队列放回', async () => { - const h = harness(true) - h.status('s14', 'running') - await rpc('release', { sessionId: 's14', text: '放回' }) - await expect(h.preStep( - { agent: { id: 's14' }, turn: 1, step: 2, signal: new AbortController().signal, messages: [] }, - async () => { throw new Error('driver failed') }, - )).rejects.toThrow('driver failed') - expect((await rpc('status', { sessionId: 's14' })).value.pendingMessageCount).toBe(1) + it('该步 reject 且没有活 agent 时写错误日志', async () => { + const h = harness(true, false, false) + const errors: unknown[][] = [] + const original = console.error + console.error = (...args: unknown[]) => { errors.push(args) } + try { + const p = h.preStep( + { agent: { id: 's10' }, turn: 1, step: 2, signal: new AbortController().signal, messages: [] }, + async () => ({ kind: 'reject' as const }), + ) + await Promise.resolve() + await rpc('release', { sessionId: 's10', text: '会丢' }) + await expect(p).resolves.toEqual({ kind: 'reject' }) + } finally { + console.error = original + } + expect(errors).toHaveLength(1) }) - it('idle 补发失败时插话放回队列,下一次派发再试', async () => { + it('steer 抛错时 RPC 返回错误,草稿由客户端保留', async () => { const h = harness(true) - h.status('s15', 'running') - await rpc('release', { sessionId: 's15', text: '重试' }) - h.status('s15', 'idle', true) - await Promise.resolve() - expect((await rpc('status', { sessionId: 's15' })).value.pendingMessageCount).toBe(1) - h.status('s15', 'idle') - await Promise.resolve() - expect(h.followed).toHaveLength(1) - expect(h.followed[0]!.message.content).toMatchObject([{ type: 'text', text: '重试' }]) - }) - - it('空闲状态重复推送时待发队列只补发一次', async () => { - const h = harness(true) - h.status('s11', 'running') - await rpc('release', { sessionId: 's11', text: '只发一次' }) - h.status('s11', 'idle') - await Promise.resolve() - h.status('s11', 'idle') - await Promise.resolve() - expect(h.followed).toHaveLength(1) + h.setSteerThrows(true) + const rel = await rpc('release', { sessionId: 's11', text: '发不出去' }) + expect(rel.ok).toBe(false) }) it('RPC 参数校验返回 error', async () => { diff --git a/tests/real-cordis.spec.ts b/tests/real-cordis.spec.ts index 4a892f2..27f9008 100644 --- a/tests/real-cordis.spec.ts +++ b/tests/real-cordis.spec.ts @@ -22,6 +22,12 @@ class FakeCredentials extends Service { } } +/** 最小 agents 服务:返回可 steer 的桩 agent,满足插话接线。 */ +class FakeAgents extends Service { + constructor(ctx: Context) { super(ctx, 'agents') } + get(id: string): { id: string; steer(): void } { return { id, steer() {} } } +} + /** 最小 webServer 服务:记录注册的 prefix 路由。 */ class FakeWebServer extends Service { readonly routes: RegisteredRoute[] = [] @@ -46,6 +52,7 @@ describe('真实 cordis 接线冒烟', () => { const ctx = new Context() await ctx.plugin(FakeCredentials) await ctx.plugin(FakeWebServer) + await ctx.plugin(FakeAgents) await ctx.plugin(connection) await settle() await ctx.plugin(pause) From 7b62cd68febf6689aa3b7182b8974fe198890f09 Mon Sep 17 00:00:00 2001 From: betterer <54624517+better-er@users.noreply.github.com> Date: Thu, 29 Oct 2026 08:29:28 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E5=B7=B2=E6=9C=89=E6=8F=92=E8=AF=9D?= =?UTF-8?q?=E6=97=B6=E5=BC=80=E5=90=AF=E6=9A=82=E5=81=9C=E4=B8=8D=E6=8B=A6?= =?UTF-8?q?=E6=88=AA=E8=AF=A5=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.ts | 54 +++++++++++++++++++++++++++++++++------------ tests/index.spec.ts | 35 +++++++++++++++++++++-------- 2 files changed, 66 insertions(+), 23 deletions(-) diff --git a/src/index.ts b/src/index.ts index b2d240c..d7af194 100644 --- a/src/index.ts +++ b/src/index.ts @@ -24,6 +24,8 @@ declare module '@deepseek-ai/cordis' { interface Events { 'agent/pre-step'(this: never, payload: PreStepPayload, next: () => Promise): Promise 'agent/status'(this: never, payload: AgentStatusPayload): void + 'agent/inbox/claimed'(this: never, payload: InboxEventPayload): void + 'agent/inbox/discarded'(this: never, payload: InboxEventPayload): void } } @@ -60,6 +62,12 @@ interface AgentStatusPayload { status: 'idle' | 'running' } +/** inbox 认领与丢弃事件的载荷。 */ +interface InboxEventPayload { + agent: AgentFace & { id: string } + message: UserMessage +} + /** 浏览器可随插话提交的图片媒体类型,与附件服务的准入集合一致。 */ type ImageMediaType = 'image/png' | 'image/jpeg' | 'image/webp' | 'image/gif' const IMAGE_MEDIA_TYPES: ReadonlySet = new Set(['image/png', 'image/jpeg', 'image/webp', 'image/gif']) @@ -161,13 +169,15 @@ export function apply(ctx: Context, config: Config = {}): void { const agentFor = (sessionId: string): AgentFace | undefined => liveAgents.get(sessionId) ?? agentRegistry(ctx)?.get(sessionId) - // 刚 steer 出去、还没被认领进某一步的插话 id。pre-step 命中说明这条插话就在本步里,不必再停。 - const awaitingSteer = new Map>() + // 已 steer、还没被 dsh 认领的插话 id;以及刚被认领、还没随某步走完的插话 id。 + // 两种状态都说明用户已经插过话:先让插话送达,暂停等送达后再恢复。 + const pendingSteer = new Map>() + const claimedSteer = new Map>() const markSteer = (sessionId: string, message: UserMessage): void => { - let ids = awaitingSteer.get(sessionId) + let ids = pendingSteer.get(sessionId) if (ids === undefined) { ids = new Set() - awaitingSteer.set(sessionId, ids) + pendingSteer.set(sessionId, ids) } ids.add(message.id) } @@ -241,24 +251,40 @@ export function apply(ctx: Context, config: Config = {}): void { ctx.on('agent/status', (payload: AgentStatusPayload) => { liveAgents.set(payload.agent.id, payload.agent) - if (payload.status === 'idle') awaitingSteer.delete(payload.agent.id) + }) + + ctx.on('agent/inbox/claimed', (payload: InboxEventPayload) => { + const sessionId = payload.agent.id + if (pendingSteer.get(sessionId)?.delete(payload.message.id) !== true) return + let ids = claimedSteer.get(sessionId) + if (ids === undefined) { + ids = new Set() + claimedSteer.set(sessionId, ids) + } + ids.add(payload.message.id) + }) + + ctx.on('agent/inbox/discarded', (payload: InboxEventPayload) => { + const sessionId = payload.agent.id + pendingSteer.get(sessionId)?.delete(payload.message.id) + claimedSteer.get(sessionId)?.delete(payload.message.id) }) ctx.on('agent/pre-step', async (payload: PreStepPayload, next: () => Promise) => { const sessionId = payload.agent.id liveAgents.set(sessionId, payload.agent) const state = registry.stateFor(sessionId) + // 认领后紧跟的这一步就是带插话的一步:先放行,开启暂停时也不拦它。 + const claimed = claimedSteer.get(sessionId) + if (claimed !== undefined && claimed.size > 0) { + claimed.clear() + return next() + } if (payload.step <= 1 || !state.enabled) return next() - // 插话已被认领进本步:按回车就是让模型继续,这次不再停。 - const pendingSteer = awaitingSteer.get(sessionId) - if (pendingSteer !== undefined && pendingSteer.size > 0) { - let matched = false - for (const message of payload.messages) { - if (pendingSteer.delete(message.id)) matched = true - } - if (matched) return next() - } + // 插话还在 inbox 里等认领:先让流程走到带插话的那一步,暂停暂不生效。 + const pending = pendingSteer.get(sessionId) + if (pending !== undefined && pending.size > 0) return next() let resolvePausePoint: (message: UserMessage | undefined) => void = () => {} let rejectPausePoint: (reason: unknown) => void = () => {} diff --git a/tests/index.spec.ts b/tests/index.spec.ts index 0a62060..ed6f68f 100644 --- a/tests/index.spec.ts +++ b/tests/index.spec.ts @@ -54,6 +54,8 @@ function fakeAttachments() { function harness(enabledDefault = false, withAgents = true, withAgentPayload = true) { let preStepListener: PreStepListener | undefined let statusListener: ((payload: any) => void) | undefined + let claimedListener: ((payload: any) => void) | undefined + let discardedListener: ((payload: any) => void) | undefined const scope = { connection: { requestRejection: () => undefined }, webServer: { @@ -79,6 +81,8 @@ function harness(enabledDefault = false, withAgents = true, withAgentPayload = t on(_name: string, listener: any) { if (_name === 'agent/pre-step') preStepListener = listener as PreStepListener if (_name === 'agent/status') statusListener = listener as (payload: any) => void + if (_name === 'agent/inbox/claimed') claimedListener = listener as (payload: any) => void + if (_name === 'agent/inbox/discarded') discardedListener = listener as (payload: any) => void return () => true }, inject(_deps: string[], cb: (s: unknown) => void) { cb(scope) }, @@ -95,6 +99,8 @@ function harness(enabledDefault = false, withAgents = true, withAgentPayload = t return preStepListener!({ ...payload, agent }, next) }, status(payload: any) { statusListener!(payload) }, + claim(sessionId: string, message: any) { claimedListener!({ agent: agentOf(sessionId), message }) }, + discard(sessionId: string, message: any) { discardedListener!({ agent: agentOf(sessionId), message }) }, steered, setSteerThrows(value: boolean) { steerThrows = value }, attachments, @@ -242,29 +248,40 @@ describe('apply host wiring', () => { expect(h.steered[0]!.message.content).toMatchObject([{ type: 'text', text: '还能发' }]) }) - it('插话已被认领进本步时不再挂暂停点', async () => { + it('插话未认领时开启暂停也不暂停', async () => { const h = harness(true) - const rel = await rpc('release', { sessionId: 's20', text: '插一句' }) - expect(rel.value.delivered).toBe(true) - const message = h.steered[0]!.message + await rpc('release', { sessionId: 's20', text: '插一句' }) const decision = await h.preStep( - { agent: { id: 's20' }, turn: 1, step: 2, signal: new AbortController().signal, messages: [message] }, + { agent: { id: 's20' }, turn: 1, step: 2, signal: new AbortController().signal, messages: [] }, async () => ({ kind: 'enter', messages: [] }), ) expect(decision).toEqual({ kind: 'enter', messages: [] }) }) - it('插话没进本步时照常暂停', async () => { + it('插话刚被认领时打开暂停仍放行该步', async () => { const h = harness(true) await rpc('release', { sessionId: 's21', text: '插一句' }) + const message = h.steered[0]!.message + h.claim('s21', message) + const decision = await h.preStep( + { agent: { id: 's21' }, turn: 1, step: 2, signal: new AbortController().signal, messages: [] }, + async () => ({ kind: 'enter', messages: [] }), + ) + expect(decision).toEqual({ kind: 'enter', messages: [] }) + }) + + it('插话被丢弃后恢复暂停', async () => { + const h = harness(true) + await rpc('release', { sessionId: 's22', text: '插一句' }) + h.discard('s22', h.steered[0]!.message) const base = { kind: 'enter' as const, messages: [] } const p = h.preStep( - { agent: { id: 's21' }, turn: 1, step: 2, signal: new AbortController().signal, messages: [] }, + { agent: { id: 's22' }, turn: 1, step: 2, signal: new AbortController().signal, messages: [] }, async () => base, ) await Promise.resolve() - expect((await rpc('status', { sessionId: 's21' })).value.paused).toBe(true) - await rpc('release', { sessionId: 's21', text: '' }) + expect((await rpc('status', { sessionId: 's22' })).value.paused).toBe(true) + await rpc('release', { sessionId: 's22', text: '' }) await expect(p).resolves.toEqual(base) }) From e5d78f4b3048a007d56ed1c5f339c41a4a67bb4a Mon Sep 17 00:00:00 2001 From: betterer <54624517+better-er@users.noreply.github.com> Date: Thu, 29 Oct 2026 08:31:46 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20=E6=9C=AC=E6=AD=A5=E5=B8=A6=E6=8F=92?= =?UTF-8?q?=E8=AF=9D=E6=88=96=20inbox=20=E6=9C=89=E6=8F=92=E8=AF=9D?= =?UTF-8?q?=E6=97=B6=E6=94=BE=E8=BF=87=E6=9A=82=E5=81=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.ts | 67 ++++++++++++++++++++------------------------- tests/index.spec.ts | 37 ++++++++++++++++++++----- 2 files changed, 60 insertions(+), 44 deletions(-) diff --git a/src/index.ts b/src/index.ts index d7af194..9a2d220 100644 --- a/src/index.ts +++ b/src/index.ts @@ -24,8 +24,6 @@ declare module '@deepseek-ai/cordis' { interface Events { 'agent/pre-step'(this: never, payload: PreStepPayload, next: () => Promise): Promise 'agent/status'(this: never, payload: AgentStatusPayload): void - 'agent/inbox/claimed'(this: never, payload: InboxEventPayload): void - 'agent/inbox/discarded'(this: never, payload: InboxEventPayload): void } } @@ -46,9 +44,13 @@ interface PreStepPayload { } type PreStepDecision = { kind: 'reject' } | { kind: 'enter'; messages: UserMessage[]; startsRequestSeries?: true } -/** agent 的插话入口:steer 在最近一步认领,空闲时自己开新 turn。 */ +/** agent 的插话入口:steer 在最近一步认领,空闲时自己开新 turn。inbox 用来判断插话是否还在等认领。 */ interface AgentFace { steer(message: UserMessage): void + readonly inbox: { + readonly nextStep: readonly UserMessage[] + readonly nextTurn: readonly UserMessage[] + } } /** 活 agent 注册表的最小面。 */ @@ -62,12 +64,6 @@ interface AgentStatusPayload { status: 'idle' | 'running' } -/** inbox 认领与丢弃事件的载荷。 */ -interface InboxEventPayload { - agent: AgentFace & { id: string } - message: UserMessage -} - /** 浏览器可随插话提交的图片媒体类型,与附件服务的准入集合一致。 */ type ImageMediaType = 'image/png' | 'image/jpeg' | 'image/webp' | 'image/gif' const IMAGE_MEDIA_TYPES: ReadonlySet = new Set(['image/png', 'image/jpeg', 'image/webp', 'image/gif']) @@ -169,10 +165,8 @@ export function apply(ctx: Context, config: Config = {}): void { const agentFor = (sessionId: string): AgentFace | undefined => liveAgents.get(sessionId) ?? agentRegistry(ctx)?.get(sessionId) - // 已 steer、还没被 dsh 认领的插话 id;以及刚被认领、还没随某步走完的插话 id。 - // 两种状态都说明用户已经插过话:先让插话送达,暂停等送达后再恢复。 + // 已 steer、还没被认领的插话 id。插话送达前暂停先不生效。 const pendingSteer = new Map>() - const claimedSteer = new Map>() const markSteer = (sessionId: string, message: UserMessage): void => { let ids = pendingSteer.get(sessionId) if (ids === undefined) { @@ -182,6 +176,22 @@ export function apply(ctx: Context, config: Config = {}): void { ids.add(message.id) } + /** 清掉已经不在 inbox、也没随本步进来的插话,避免暂停被永久放过。 */ + const pruneSteer = (sessionId: string, messages: readonly UserMessage[]): Set | undefined => { + const pending = pendingSteer.get(sessionId) + if (pending === undefined || pending.size === 0) return undefined + const agent = agentFor(sessionId) + // 拿不到 agent 时无法判断插话是否还在,保守地继续放过。 + if (agent === undefined) return pending + const inBatch = new Set(messages.map((message) => String(message.id))) + const inboxIds = new Set(agent.inbox.nextStep.map((message) => String(message.id))) + for (const id of [...pending]) { + if (inBatch.has(id)) { pending.delete(id); continue } + if (!inboxIds.has(id)) pending.delete(id) + } + return pending.size > 0 ? pending : undefined + } + /** 该步被 reject 时把已并入的消息重新 steer 一次,避免插件缓存或丢失。 */ const resteer = (sessionId: string, message: UserMessage): void => { const agent = agentFor(sessionId) @@ -253,38 +263,21 @@ export function apply(ctx: Context, config: Config = {}): void { liveAgents.set(payload.agent.id, payload.agent) }) - ctx.on('agent/inbox/claimed', (payload: InboxEventPayload) => { - const sessionId = payload.agent.id - if (pendingSteer.get(sessionId)?.delete(payload.message.id) !== true) return - let ids = claimedSteer.get(sessionId) - if (ids === undefined) { - ids = new Set() - claimedSteer.set(sessionId, ids) - } - ids.add(payload.message.id) - }) - - ctx.on('agent/inbox/discarded', (payload: InboxEventPayload) => { - const sessionId = payload.agent.id - pendingSteer.get(sessionId)?.delete(payload.message.id) - claimedSteer.get(sessionId)?.delete(payload.message.id) - }) - ctx.on('agent/pre-step', async (payload: PreStepPayload, next: () => Promise) => { const sessionId = payload.agent.id liveAgents.set(sessionId, payload.agent) const state = registry.stateFor(sessionId) - // 认领后紧跟的这一步就是带插话的一步:先放行,开启暂停时也不拦它。 - const claimed = claimedSteer.get(sessionId) - if (claimed !== undefined && claimed.size > 0) { - claimed.clear() - return next() - } if (payload.step <= 1 || !state.enabled) return next() // 插话还在 inbox 里等认领:先让流程走到带插话的那一步,暂停暂不生效。 - const pending = pendingSteer.get(sessionId) - if (pending !== undefined && pending.size > 0) return next() + if (pruneSteer(sessionId, payload.messages) !== undefined) return next() + + // 本步已领取到用户消息,说明是插话触发的这一步,不管来源都放行。 + if (payload.messages.length > 0) return next() + + // 队列里还有等下一轮的用户消息:已经插过话,这一轮先不再停。 + const inbox = agentFor(sessionId)?.inbox + if (inbox !== undefined && inbox.nextTurn.length > 0) return next() let resolvePausePoint: (message: UserMessage | undefined) => void = () => {} let rejectPausePoint: (reason: unknown) => void = () => {} diff --git a/tests/index.spec.ts b/tests/index.spec.ts index ed6f68f..bbebf88 100644 --- a/tests/index.spec.ts +++ b/tests/index.spec.ts @@ -54,8 +54,6 @@ function fakeAttachments() { function harness(enabledDefault = false, withAgents = true, withAgentPayload = true) { let preStepListener: PreStepListener | undefined let statusListener: ((payload: any) => void) | undefined - let claimedListener: ((payload: any) => void) | undefined - let discardedListener: ((payload: any) => void) | undefined const scope = { connection: { requestRejection: () => undefined }, webServer: { @@ -69,11 +67,27 @@ function harness(enabledDefault = false, withAgents = true, withAgentPayload = t const attachments = fakeAttachments() const steered: { sessionId: string; message: any }[] = [] let steerThrows = false + const inboxes = new Map() + const inboxOf = (id: string) => { + let inbox = inboxes.get(id) + if (inbox === undefined) { + inbox = { nextStep: [], nextTurn: [] } + inboxes.set(id, inbox) + } + return inbox + } + const takeFromInbox = (id: string, message: any) => { + const inbox = inboxOf(id) + const index = inbox.nextStep.findIndex((item) => item.id === message.id) + if (index >= 0) inbox.nextStep.splice(index, 1) + } const agentOf = (id: string) => ({ id, + inbox: inboxOf(id), steer(message: any) { if (steerThrows) throw new Error('steer failed') steered.push({ sessionId: id, message }) + inboxOf(id).nextStep.push(message) }, }) const agents = { get: (sessionId: string) => agentOf(sessionId) } @@ -81,8 +95,6 @@ function harness(enabledDefault = false, withAgents = true, withAgentPayload = t on(_name: string, listener: any) { if (_name === 'agent/pre-step') preStepListener = listener as PreStepListener if (_name === 'agent/status') statusListener = listener as (payload: any) => void - if (_name === 'agent/inbox/claimed') claimedListener = listener as (payload: any) => void - if (_name === 'agent/inbox/discarded') discardedListener = listener as (payload: any) => void return () => true }, inject(_deps: string[], cb: (s: unknown) => void) { cb(scope) }, @@ -99,8 +111,9 @@ function harness(enabledDefault = false, withAgents = true, withAgentPayload = t return preStepListener!({ ...payload, agent }, next) }, status(payload: any) { statusListener!(payload) }, - claim(sessionId: string, message: any) { claimedListener!({ agent: agentOf(sessionId), message }) }, - discard(sessionId: string, message: any) { discardedListener!({ agent: agentOf(sessionId), message }) }, + claim(sessionId: string, message: any) { takeFromInbox(sessionId, message) }, + discard(sessionId: string, message: any) { takeFromInbox(sessionId, message) }, + enqueueTurn(sessionId: string, message: any) { inboxOf(sessionId).nextTurn.push(message) }, steered, setSteerThrows(value: boolean) { steerThrows = value }, attachments, @@ -264,7 +277,17 @@ describe('apply host wiring', () => { const message = h.steered[0]!.message h.claim('s21', message) const decision = await h.preStep( - { agent: { id: 's21' }, turn: 1, step: 2, signal: new AbortController().signal, messages: [] }, + { agent: { id: 's21' }, turn: 1, step: 2, signal: new AbortController().signal, messages: [message] }, + async () => ({ kind: 'enter', messages: [] }), + ) + expect(decision).toEqual({ kind: 'enter', messages: [] }) + }) + + it('下一轮队列里已有消息时这一轮也不再暂停', async () => { + const h = harness(true) + h.enqueueTurn('s23', { id: 'm1', role: 'user', content: [] }) + const decision = await h.preStep( + { agent: { id: 's23' }, turn: 1, step: 2, signal: new AbortController().signal, messages: [] }, async () => ({ kind: 'enter', messages: [] }), ) expect(decision).toEqual({ kind: 'enter', messages: [] }) From a773d7fbbe6b5b520276ab05b5da80a98619612f Mon Sep 17 00:00:00 2001 From: betterer <54624517+better-er@users.noreply.github.com> Date: Thu, 29 Oct 2026 08:34:38 +0800 Subject: [PATCH 4/5] =?UTF-8?q?docs:=20=E8=A1=A5=E5=85=85=E5=B7=B2?= =?UTF-8?q?=E6=9C=89=E6=8F=92=E8=AF=9D=E6=97=B6=E8=B7=B3=E8=BF=87=E6=9A=82?= =?UTF-8?q?=E5=81=9C=E7=9A=84=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index c7463cb..707091a 100644 --- a/README.md +++ b/README.md @@ -82,6 +82,7 @@ dsh 把一次模型请求当作一个 step,agent 连续调用工具时会经 - 暂停点设在请求真正发出之前,故无在途调用可打断。 - 续跑判定用同一 turn 内 step 大于 1 近似,每个 turn 的第一次请求永不暂停。 +- 已有插话时不拦:本步已领取的批次带用户消息、插话还在 inbox 等认领、下一轮队列已有消息,任一条成立就跳过这次暂停点。 - 浏览器端经 `conversation.input.right` 槽位在 composer 工具行渲染控件。 - 带图插话由浏览器把草稿图片序列化成 base64 随放行请求上传,主机经 `attachments.admitPromptContent` 换成持久引用后与文字并入同一条 user 消息;RPC 请求体上限据此放宽到 300 MiB。 - 因 dsh 的 composer Enter 由 InputBar 私有 keymap 处理、第三方无 hook 点,开关开启期间用 DOM capture 常驻拦截裸 Enter,改走主机裁决,不改 DSH 源码。 From e0d985c22eb213422d38e2e04a13cc171df3bf0d Mon Sep 17 00:00:00 2001 From: betterer <54624517+better-er@users.noreply.github.com> Date: Thu, 29 Oct 2026 08:34:54 +0800 Subject: [PATCH 5/5] =?UTF-8?q?docs:=20=E4=BF=AE=E6=AD=A3=E6=9A=82?= =?UTF-8?q?=E5=81=9C=E5=88=A4=E6=96=AD=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/index.ts b/src/index.ts index 9a2d220..5a9c5aa 100644 --- a/src/index.ts +++ b/src/index.ts @@ -8,6 +8,7 @@ * 暂停点只卡在请求真正发出之前,因此不打断任何在途 API 调用。 * 暂停点还没挂上时按回车发出的插话一律立即交给 agent.steer(),由 dsh 在最近一步认领;空闲时 steer 自己开新 turn。 * 插件不缓存插话,也不做补发;只有该步被 reject 时把已并入的消息重新 steer 一次,失败写日志。 + * 已经插过话时不再拦这一步:本步已领取批次带用户消息、插话还在 inbox、或下一轮队列已有消息,都直接放行。 * driver 组装好的上下文原样放行,不插入、不删除、不改写任何模型可见的痕迹,模型无感知暂停。 * * @module dsh-pause