feat(session): split history, state and web controllers
History, State and Web become ordinary classes sharing the Session scope. Subscribe-before-read removes the tail repair, events and page expose the cursor-bearing history read, observeEvent keeps a pure event subscription, and follow stays passive unless activate is requested.
This commit is contained in:
1 parent
a1473ddec6
commit
2f2caf88b3
13 files changed
+1325
-365
No files matched your search
@@ -0,0 +1,78 @@
|
||||
/** Web opening aggregation over one observation and a shared transforming buffer. */
|
||||
|
||||
import type { Context } from '@deepseek-ai/cordis'
|
||||
import { remoteErrorOf } from '@deepseek-ai/dsh-typert-protocol'
|
||||
import type { SessionObservation } from '@deepseek-ai/dsh-session-query'
|
||||
import type { HistoryController } from '../history/controller.ts'
|
||||
import { addressId, rejectNotFound } from '../history.ts'
|
||||
import { EventListener, ListenerBuffer } from '../history/listener.ts'
|
||||
import { history, projections, resolveHistoryRequest, validateObservationAddress } from '../history/controller.ts'
|
||||
import type { SessionFollowFrame, SessionFollowRequest } from '../types.ts'
|
||||
|
||||
/** Combines opening data and consumes transformed listener output from one queue. */
|
||||
export class WebController {
|
||||
|
||||
/**
|
||||
* @param ctx - Host context carrying Session queries and identity projections.
|
||||
* @param historyController - passive reading and listener construction.
|
||||
* @param promote - background activation requested before an opening snapshot is delivered.
|
||||
*/
|
||||
constructor(
|
||||
private readonly ctx: Context,
|
||||
private readonly historyController: HistoryController,
|
||||
private readonly promote: (observation: SessionObservation) => void,
|
||||
) {}
|
||||
|
||||
/**
|
||||
* Open a history snapshot and follow uncovered history and assistant notifications.
|
||||
* @param request - Session identity, page budget, assistant output and optional activation (default false).
|
||||
* @param signal - cancellation for opening and streaming.
|
||||
* @returns an opening snapshot followed by uncovered queued increments.
|
||||
*/
|
||||
async *follow(request: SessionFollowRequest, signal: AbortSignal): AsyncIterable<SessionFollowFrame> {
|
||||
const sessionId = addressId(request.address)
|
||||
const spec = resolveHistoryRequest(request)
|
||||
using queue = new ListenerBuffer<SessionFollowFrame>(this.ctx, signal)
|
||||
using listener = new EventListener(this.ctx, sessionId, signal, queue)
|
||||
const streams = this.historyController.streamsListener
|
||||
using assistantListener = request.assistantStream === true
|
||||
? streams.bind(sessionId, signal, queue)
|
||||
: undefined
|
||||
using observation = await this.historyController.usingObservation({ sessionId, projection: true }, signal)
|
||||
.catch((error: unknown) => {
|
||||
if (remoteErrorOf(error)?.code === 'session/not-found') rejectNotFound(request.address)
|
||||
throw error
|
||||
})
|
||||
validateObservationAddress(request.address, observation)
|
||||
let opening: SessionFollowFrame = {
|
||||
type: 'snapshot',
|
||||
header: { ...observation.header },
|
||||
projections: projections(observation),
|
||||
...history(observation, spec),
|
||||
}
|
||||
listener.setCursor(opening.cursor)
|
||||
if (assistantListener !== undefined) {
|
||||
const { baseline: assistantStream, ordinal } = assistantListener.snapshot()
|
||||
opening = { ...opening, assistantStream }
|
||||
assistantListener.setOrdinalCut(ordinal)
|
||||
}
|
||||
// Increments come from the queue, so the opening ends this lease in every branch;
|
||||
// activation continues on its own retained lease. Promotion starts before the opening is
|
||||
// delivered, so a consumer that stops after the snapshot still gets the activation it asked for.
|
||||
if (request.activate === true && !signal.aborted
|
||||
&& observation.header.origin !== 'subagent' && observation.source === 'prepared') {
|
||||
const promotion = observation.retain()
|
||||
observation[Symbol.dispose]()
|
||||
try {
|
||||
this.promote(promotion)
|
||||
} catch (error: unknown) {
|
||||
promotion[Symbol.dispose]()
|
||||
throw error
|
||||
}
|
||||
} else {
|
||||
observation[Symbol.dispose]()
|
||||
}
|
||||
yield opening
|
||||
yield* queue.items()
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user