Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/agent/core/domain/agent-events/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,10 @@ export interface AgentEventMap {
| {
accepted: true
commandType: string
fromHeuristic: number
fromVersion: number
projectId: string
toHeuristic: number
toVersion: number
}

Expand Down
2 changes: 2 additions & 0 deletions src/agent/infra/harness/harness-synthesizer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
private readonly moduleBuilder: HarnessModuleBuilder
private readonly weakModelWarned = new Set<string>()

constructor(

Check warning on line 85 in src/agent/infra/harness/harness-synthesizer.ts

View workflow job for this annotation

GitHub Actions / lint

Constructor has too many parameters (7). Maximum allowed is 4
private readonly harnessStore: IHarnessStore,
private readonly evaluator: HarnessEvaluator,
// Held for session-end trigger wiring — the trigger needs
Expand Down Expand Up @@ -213,8 +213,10 @@
this.eventBus.emit('harness:refinement-completed', {
accepted: true,
commandType: parent.commandType,
fromHeuristic: parent.heuristic,
fromVersion: parent.version,
projectId: parent.projectId,
toHeuristic: candidateHeuristic,
toVersion: candidateVersion.version,
})

Expand Down
67 changes: 67 additions & 0 deletions src/agent/infra/session/harness-banner-listener.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
/**
* Listens on `harness:refinement-completed` per session. Buffers
* accepted refinements; on session-end, prints a single banner
* summarising the latest accepted refinement (if any).
*
* Suppression rules:
* - harnessEnabled === false → never print
* - isTty === false → never print
* - No accepted refinement in the session → never print
* - Multiple refinements → print only the last accepted
*/

import type {AgentEventMap} from '../../core/domain/agent-events/types.js'
import type {AgentEventBus} from '../events/event-emitter.js'

// ---------------------------------------------------------------------------
// Types
// ---------------------------------------------------------------------------

type AcceptedRefinement = Extract<AgentEventMap['harness:refinement-completed'], {accepted: true}>

export type HarnessBannerListenerOptions = {
readonly eventBus: AgentEventBus
readonly harnessEnabled: boolean
readonly isTty: boolean
readonly writeLine: (s: string) => void
}

// ---------------------------------------------------------------------------
// HarnessBannerListener
// ---------------------------------------------------------------------------

export class HarnessBannerListener {
private ended = false
private readonly eventBus: AgentEventBus
private readonly handleEvent = (event: AgentEventMap['harness:refinement-completed']): void => {
if (event.accepted) {
this.lastAccepted = event
Comment thread
RyanNg1403 marked this conversation as resolved.
}
}
private readonly harnessEnabled: boolean
private readonly isTty: boolean
private lastAccepted: AcceptedRefinement | undefined
private readonly writeLine: (s: string) => void

constructor(opts: HarnessBannerListenerOptions) {
this.eventBus = opts.eventBus
this.writeLine = opts.writeLine
this.isTty = opts.isTty
this.harnessEnabled = opts.harnessEnabled
this.eventBus.on('harness:refinement-completed', this.handleEvent)
}

/** Called by SessionManager on session end. Idempotent. */
onSessionEnd(): void {
if (this.ended) return
this.ended = true
this.eventBus.off('harness:refinement-completed', this.handleEvent)

if (!this.harnessEnabled || !this.isTty || !this.lastAccepted) return

const {fromHeuristic, fromVersion, toHeuristic, toVersion} = this.lastAccepted
this.writeLine(
`harness updated: v${fromVersion} → v${toVersion} (H: ${fromHeuristic.toFixed(2)} → ${toHeuristic.toFixed(2)})\n`,
Comment thread
RyanNg1403 marked this conversation as resolved.
)
}
}
54 changes: 54 additions & 0 deletions src/agent/infra/session/session-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {PolicyEngine} from '../tools/policy-engine.js'
import {ToolManager} from '../tools/tool-manager.js'
import {ToolProvider} from '../tools/tool-provider.js'
import {ChatSession} from './chat-session.js'
import {HarnessBannerListener} from './harness-banner-listener.js'
import {generateSessionTitle} from './title-generator.js'

/**
Expand Down Expand Up @@ -47,6 +48,11 @@ export interface SessionMetadata {
export type SessionRemovalReason = 'deleted' | 'ended' | 'ttl_expired'

export interface SessionManagerOptions {
/** Override banner writeLine + TTY detection for testing. */
bannerOverrides?: {
isTty?: boolean
writeLine?: (s: string) => void
}
config?: SessionManagerConfig
/**
* Optional lifecycle callback fired after a session is removed from memory maps.
Expand All @@ -65,6 +71,8 @@ export interface SessionManagerOptions {
export class SessionManager {
/** Grace window before a session's dedup entry expires (ms). */
private static readonly ENDED_SESSION_GRACE_MS = 60_000
private readonly bannerListeners = new Map<string, HarnessBannerListener>()
private readonly bannerOverrides?: {isTty?: boolean; writeLine?: (s: string) => void}
private cleanupTimer?: ReturnType<typeof setInterval>
private readonly config: Required<SessionManagerConfig>
private readonly endedSessions = new Set<string>()
Expand Down Expand Up @@ -138,6 +146,7 @@ export class SessionManager {
this.sharedServices = sharedServices
this.httpConfig = httpConfig
this.llmConfig = llmConfig
this.bannerOverrides = options?.bannerOverrides
this.onSessionRemoved = options?.onSessionRemoved
this.config = {
maxSessions: options?.config?.maxSessions ?? 100,
Expand Down Expand Up @@ -326,6 +335,8 @@ export class SessionManager {
// Remove from memory
const deleted = this.sessions.delete(id)
if (deleted) {
this.endBannerListener(id)

try {
this.onSessionRemoved?.(id, 'deleted')
} catch {
Expand Down Expand Up @@ -358,6 +369,13 @@ export class SessionManager {
this.sessions.clear()
this.endedSessions.clear()

// Clean up banner listeners (unsubscribe from agent event bus)
for (const listener of this.bannerListeners.values()) {
listener.onSessionEnd()
}

this.bannerListeners.clear()

// Clear all metadata maps
this.sessionCreatedAt.clear()
this.sessionLastActivity.clear()
Expand Down Expand Up @@ -398,6 +416,12 @@ export class SessionManager {
// Remove from memory only - history remains in storage
const ended = this.sessions.delete(id)
if (ended) {
// End the banner listener (prints any refinement captured during this
// session's lifetime from concurrently-running synthesizers). Must happen
// before triggering THIS session's refinement, which fires async — those
// events land after this listener has already unsubscribed.
this.endBannerListener(id)

// Fire harness refinement trigger (fire-and-forget)
this.triggerHarnessRefinement(id)

Expand Down Expand Up @@ -536,6 +560,23 @@ export class SessionManager {
return cleaned
}

/**
* Create a HarnessBannerListener for a session. Subscribes to the
* agent-level refinement-completed event; `endBannerListener`
* unsubscribes and prints the banner on session end.
*/
private createBannerListener(sessionId: string): void {
const agentBus = this.sharedServices.agentEventBus
if (!agentBus) return

const writeLine = this.bannerOverrides?.writeLine ?? ((s: string) => process.stderr.write(s))
const isTty = this.bannerOverrides?.isTty ?? (process.stderr.isTTY ?? false)
const harnessEnabled = this.sharedServices.harnessConfig?.enabled ?? false

const listener = new HarnessBannerListener({eventBus: agentBus, harnessEnabled, isTty, writeLine})
this.bannerListeners.set(sessionId, listener)
}

/**
* Internal session creation logic.
*
Expand All @@ -562,6 +603,7 @@ export class SessionManager {
this.sessionLastActivity.set(id, now)

this.sessions.set(id, session)
this.createBannerListener(id)
return session
}

Expand Down Expand Up @@ -633,9 +675,21 @@ export class SessionManager {
this.sessionLastActivity.set(id, now)

this.sessions.set(id, session)
this.createBannerListener(id)
return session
}

/**
* End the banner listener for a session — prints banner if applicable
* and unsubscribes from the agent event bus.
*/
private endBannerListener(sessionId: string): void {
const listener = this.bannerListeners.get(sessionId)
if (!listener) return
listener.onSessionEnd()
this.bannerListeners.delete(sessionId)
}

/**
* Fire the harness refinement pipeline for each command type the session
* touched. Fire-and-forget — the synthesizer's per-pair single-flight
Expand Down
Loading
Loading