llm.registerAdapter, agents.register, sessions.create, systemPrompt.section, systemPrompt.tools, and tools.register each mutated state, emitted a change event, then returned the disposer. In Cordis a synchronous throw before the effect returns its disposer leaves nothing for the fiber to collect, so a throwing change-listener leaked the registry entry permanently — HMR/dispose could not clean it, and the duplicate-name/already-exists check stayed wedged until restart. Convert each to the generator-effect pattern already proven in AgentLoop.create: mutate state, `yield` the disposer that undoes it (collected before the next step runs, so it is torn down if a later step throws), THEN emit the change event. The existing duplicate-name throws are unchanged — they fire before any mutation, so they correctly leak nothing. No public API change: generator effects are still synchronous SyncEffects and register() keeps returning its fire-and-forget disposer wrapper. Tests: a listener-throw rollback test for all six methods — register with a change-listener that throws, assert the call throws AND the registry is clean (entry absent; a subsequent listener-free register of the same name succeeds and contributes exactly once). For systemPrompt (no duplicate-name check) the two tests assert assembly is clean. Verified each fails against the pre-fix emit-before-return-disposer form.
134 lines
5.1 KiB
TypeScript
134 lines
5.1 KiB
TypeScript
/**
|
|
* System prompt assembly registry. Plugins contribute ordered text sections and
|
|
* tool schema providers; `assemble()` collates them through a waterfall that
|
|
* runs once per step.
|
|
*
|
|
* @module @deepseek-ai/dsh-system-prompt
|
|
*/
|
|
|
|
import { Context, Service } from 'cordis'
|
|
import type { ToolSchema } from '@deepseek-ai/dsh-llm'
|
|
|
|
declare module 'cordis' {
|
|
interface Context {
|
|
systemPrompt: SystemPrompt
|
|
}
|
|
|
|
interface Events {
|
|
/** Waterfall around prompt assembly — mutate/extend the assembly. */
|
|
'system-prompt/assemble'(this: SystemPrompt, assembly: PromptAssembly, next: () => Promise<PromptAssembly>): Promise<PromptAssembly>
|
|
/** A section or tool provider was registered or unregistered. */
|
|
'system-prompt/change'(): void
|
|
}
|
|
}
|
|
|
|
/** One contributed section of the system prompt. */
|
|
export interface PromptSection {
|
|
/** Unique name (diagnostics / dedup). */
|
|
name: string
|
|
/** Sections are concatenated in ascending order. */
|
|
order: number
|
|
/** Static text or a provider evaluated at each assembly. */
|
|
text: string | (() => string)
|
|
}
|
|
|
|
/**
|
|
* The assembled prompt.
|
|
*
|
|
* Tool schemas are part of the assembly by design: "what the model is told it
|
|
* can do" is one coherent thing managed here, even though adapters transmit
|
|
* `tools` as a separate wire field rather than prompt text.
|
|
*
|
|
* Merge-extensible: plugins can declare extra fields on this interface.
|
|
*/
|
|
export interface PromptAssembly {
|
|
sections: PromptSection[]
|
|
tools: ToolSchema[]
|
|
}
|
|
|
|
/** Renders the text part of an assembly (sections joined by blank lines). */
|
|
export function renderPrompt(assembly: PromptAssembly): string {
|
|
return assembly.sections
|
|
.map(section => typeof section.text === 'function' ? section.text() : section.text)
|
|
.filter(text => text.length > 0)
|
|
.join('\n\n')
|
|
}
|
|
|
|
/**
|
|
* Registry service (`ctx.systemPrompt`): plugins contribute ordered text
|
|
* sections and tool-schema providers; the agent loop calls `assemble()` once
|
|
* per step.
|
|
*/
|
|
export class SystemPrompt extends Service {
|
|
private sections: PromptSection[] = []
|
|
private toolProviders: (() => ToolSchema[])[] = []
|
|
|
|
constructor(ctx: Context) {
|
|
super(ctx, 'systemPrompt')
|
|
}
|
|
|
|
/**
|
|
* Contribute a text section to the system prompt. Order is determined by
|
|
* `section.order` (ascending). The section is removed when the calling
|
|
* fiber is disposed. Emits `system-prompt/change` on register/unregister.
|
|
*/
|
|
section(section: PromptSection): () => void {
|
|
const dispose = this.ctx.effect(function* (this: SystemPrompt) {
|
|
this.sections.push(section)
|
|
// Yield the rollback BEFORE emitting `system-prompt/change`: a generator
|
|
// effect collects each yielded disposer before the next step runs, so a
|
|
// throwing change listener removes the section instead of leaking it into
|
|
// every future assembly.
|
|
yield () => {
|
|
const index = this.sections.indexOf(section)
|
|
/* v8 ignore next 3 -- defensive: section was registered, so indexOf is guaranteed >= 0 */
|
|
if (index >= 0) this.sections.splice(index, 1)
|
|
this.ctx.emit('system-prompt/change')
|
|
}
|
|
this.ctx.emit('system-prompt/change')
|
|
}.bind(this), 'systemPrompt.section()')
|
|
// ctx.effect's disposer returns Promise<void>; our disposer API is
|
|
// synchronous fire-and-forget — discard the (always-resolved) promise.
|
|
return () => void dispose()
|
|
}
|
|
|
|
/**
|
|
* Contribute a tool-schema provider that is evaluated at each assembly
|
|
* call (so it can reflect the live registry state). The provider is
|
|
* removed when the calling fiber is disposed. Emits `system-prompt/change`.
|
|
*/
|
|
tools(provider: () => ToolSchema[]): () => void {
|
|
const dispose = this.ctx.effect(function* (this: SystemPrompt) {
|
|
this.toolProviders.push(provider)
|
|
// Yield the rollback BEFORE emitting `system-prompt/change` (see section()).
|
|
yield () => {
|
|
const index = this.toolProviders.indexOf(provider)
|
|
/* v8 ignore next 3 -- defensive: provider was registered, so indexOf is guaranteed >= 0 */
|
|
if (index >= 0) this.toolProviders.splice(index, 1)
|
|
this.ctx.emit('system-prompt/change')
|
|
}
|
|
this.ctx.emit('system-prompt/change')
|
|
}.bind(this), 'systemPrompt.tools()')
|
|
// ctx.effect's disposer returns Promise<void>; our disposer API is
|
|
// synchronous fire-and-forget — discard the (always-resolved) promise.
|
|
return () => void dispose()
|
|
}
|
|
|
|
/**
|
|
* Assemble the current prompt (sections sorted by order, tools collected
|
|
* from all providers). Runs through the `system-prompt/assemble` waterfall,
|
|
* giving listeners the opportunity to mutate or replace the assembly before
|
|
* it reaches the model. Await the result before reading the assembly values —
|
|
* waterfall listeners may be async.
|
|
*/
|
|
assemble(): Promise<PromptAssembly> {
|
|
const assembly: PromptAssembly = {
|
|
sections: [...this.sections].sort((a, b) => a.order - b.order),
|
|
tools: this.toolProviders.flatMap(provider => provider()),
|
|
}
|
|
return this.ctx.waterfall(this, 'system-prompt/assemble', assembly, () => Promise.resolve(assembly))
|
|
}
|
|
}
|
|
|
|
export default SystemPrompt
|