@xopcai/xopc 0.0.82 → 0.0.83

package/dist/src/agent/orchestration/agent-event-handler.js

@@ -4,76 +4,72 @@ import { extractTextContent } from "../context/workspace.js";
 //#region src/agent/orchestration/agent-event-handler.ts
 init_logger();
 const log = createLogger("AgentEventHandler");
-var AgentEventHandler = class {
-	progressManager;
-	errorTracker;
-	requestLimiter;
-	lifecycleManager;
-	toolChainTracker;
-	selfVerifyMiddleware;
-	systemReminder;
-	toolUsageAnalyzer;
-	errorPatternMatcher;
-	modelManager;
-	taskStartTime = 0;
-	constructor(config) {
-		this.progressManager = config.progressManager;
-		this.errorTracker = config.errorTracker;
-		this.requestLimiter = config.requestLimiter;
-		this.lifecycleManager = config.lifecycleManager;
-		this.toolChainTracker = config.toolChainTracker;
-		this.selfVerifyMiddleware = config.selfVerifyMiddleware;
-		this.systemReminder = config.systemReminder;
-		this.toolUsageAnalyzer = config.toolUsageAnalyzer;
-		this.errorPatternMatcher = config.errorPatternMatcher;
-		this.modelManager = config.modelManager;
+/**
+* Typed pub/sub for agent events. Listeners run in registration order; the bus
+* itself is synchronous — listeners that need async work must dispatch their own
+* promises (typically by awaiting and logging on error, like the lifecycle hooks).
+*/
+var SessionEventBus = class {
+	listeners = /* @__PURE__ */ new Map();
+	on(type, listener) {
+		const bucket = this.listeners.get(type) ?? [];
+		bucket.push(listener);
+		this.listeners.set(type, bucket);
+		return () => {
+			const current = this.listeners.get(type);
+			if (!current) return;
+			const idx = current.indexOf(listener);
+			if (idx >= 0) current.splice(idx, 1);
+		};
 	}
-	/**
-	* Handle an agent event
-	*/
-	handle(event, context) {
+	dispatch(event, context) {
 		if (!context) {
 			if (event.type !== "message_update") log.warn({ eventType: event.type }, `Agent event ignored (no SessionContext): ${event.type}`);
 			return;
 		}
-		switch (event.type) {
-			case "agent_start":
-				this.handleAgentStart(event, context);
-				break;
-			case "turn_start":
-				this.handleTurnStart(event, context);
-				break;
-			case "message_start":
-				this.handleMessageStart(event, context);
-				break;
-			case "message_end":
-				this.handleMessageEnd(event, context);
-				break;
-			case "tool_execution_start":
-				this.handleToolExecutionStart(event, context);
-				break;
-			case "tool_execution_update":
-				this.handleToolExecutionUpdate(event, context);
-				break;
-			case "tool_execution_end":
-				this.handleToolExecutionEnd(event, context);
-				break;
-			case "message_update": break;
-			case "turn_end":
-				this.handleTurnEnd(event, context);
-				break;
-			case "agent_end":
-				this.handleAgentEnd(event, context);
-				break;
-			default: log.debug({ eventType: event.type }, "Unhandled event type");
-		}
+		const exact = this.listeners.get(event.type);
+		if (exact) for (const listener of exact) listener(event, context);
+		const all = this.listeners.get("all");
+		if (all) for (const listener of all) listener(event, context);
 	}
-	handleAgentStart(_event, context) {
+};
+function installProgressListener(bus, progressManager) {
+	bus.on("agent_start", () => {
 		log.debug("Agent turn started");
-		this.taskStartTime = Date.now();
-		this.progressManager.startTask();
-		const result = this.requestLimiter.recordRequest();
-		this.lifecycleManager.emit("llm_request", context.sessionKey, {
+		progressManager.startTask();
+	});
+	bus.on("turn_start", () => {
+		log.debug("Turn started");
+		progressManager.onTurnStart();
+	});
+	bus.on("tool_execution_start", (event) => {
+		const e = event;
+		log.debug({
+			tool: e.toolName,
+			args: e.args
+		}, "Tool execution started");
+		progressManager.onToolStart(e.toolName, e.args || {});
+	});
+	bus.on("tool_execution_update", (event) => {
+		const e = event;
+		progressManager.onToolUpdate(e.toolName, e.partialResult);
+	});
+	bus.on("tool_execution_end", (event) => {
+		const e = event;
+		log.debug({
+			tool: e.toolName,
+			isError: e.isError
+		}, "Tool execution complete");
+		progressManager.onToolEnd(e.toolName, e.result, e.isError);
+	});
+	bus.on("agent_end", () => {
+		progressManager.endTask();
+	});
+}
+function installRequestLimitListener(bus, deps) {
+	bus.on("agent_start", (_event, context) => {
+		const result = deps.requestLimiter.recordRequest();
+		deps.lifecycleManager.emit("llm_request", context.sessionKey, {
 			requestNumber: result.count,
 			maxRequests: result.limit
 		}, context).catch((err) => {
@@ -86,51 +82,42 @@ var AgentEventHandler = class {
 				maxRequests: result.limit
 			}, `Lifecycle emit llm_request failed: ${em}`);
 		});
-		this.progressManager.onRequestLimitStatus(result.count, result.limit, result.remaining, result.isWarning, result.shouldStop);
+		deps.progressManager.onRequestLimitStatus(result.count, result.limit, result.remaining, result.isWarning, result.shouldStop);
 		if (result.shouldStop) log.error({
 			count: result.count,
 			limit: result.limit,
 			sessionKey: context.sessionKey
 		}, `Request limit reached (${result.count}/${result.limit}) for session`);
-	}
-	handleTurnStart(_event, context) {
-		log.debug("Turn started");
-		this.progressManager.onTurnStart();
-		this.toolChainTracker.startChain(context.sessionKey);
-	}
-	handleMessageStart(event, _context) {
-		if (event.message?.role === "assistant") log.debug("Assistant response starting");
-	}
-	handleMessageEnd(event, context) {
-		const msgEvent = event;
-		if (msgEvent.message?.role === "assistant") {
-			const content = msgEvent.message.content;
-			const text = Array.isArray(content) ? extractTextContent(content) : String(content);
-			log.debug({ contentLength: text.length }, "Assistant response complete");
-			this.lifecycleManager.emit("llm_response", context.sessionKey, {
-				response: text,
-				usage: msgEvent.message.usage
-			}, context).catch((err) => {
-				const em = err instanceof Error ? err.message : String(err);
-				log.warn({
-					err,
-					errorMessage: em,
-					sessionKey: context.sessionKey,
-					responseChars: text.length
-				}, `Lifecycle emit llm_response failed: ${em}`);
-			});
-		}
-	}
-	handleToolExecutionStart(event, context) {
-		const toolEvent = event;
-		log.debug({
-			tool: toolEvent.toolName,
-			args: toolEvent.args
-		}, "Tool execution started");
-		this.progressManager.onToolStart(toolEvent.toolName, toolEvent.args || {});
-		this.lifecycleManager.emit("tool_call_start", context.sessionKey, {
-			toolName: toolEvent.toolName,
-			arguments: toolEvent.args || {},
+	});
+	bus.on("turn_end", () => {
+		deps.requestLimiter.reset();
+	});
+}
+function installLifecycleHookListener(bus, lifecycleManager) {
+	bus.on("message_end", (event, context) => {
+		const e = event;
+		if (e.message?.role !== "assistant") return;
+		const content = e.message.content;
+		const text = Array.isArray(content) ? extractTextContent(content) : String(content);
+		log.debug({ contentLength: text.length }, "Assistant response complete");
+		lifecycleManager.emit("llm_response", context.sessionKey, {
+			response: text,
+			usage: e.message.usage
+		}, context).catch((err) => {
+			const em = err instanceof Error ? err.message : String(err);
+			log.warn({
+				err,
+				errorMessage: em,
+				sessionKey: context.sessionKey,
+				responseChars: text.length
+			}, `Lifecycle emit llm_response failed: ${em}`);
+		});
+	});
+	bus.on("tool_execution_start", (event, context) => {
+		const e = event;
+		lifecycleManager.emit("tool_call_start", context.sessionKey, {
+			toolName: e.toolName,
+			arguments: e.args || {},
 			attemptNumber: 1,
 			maxAttempts: 3
 		}, context).catch((err) => {
@@ -139,29 +126,18 @@ var AgentEventHandler = class {
 				err,
 				errorMessage: em,
 				sessionKey: context.sessionKey,
-				tool: toolEvent.toolName
+				tool: e.toolName
 			}, `Lifecycle emit tool_call_start failed: ${em}`);
 		});
-		this.toolChainTracker.recordCall(context.sessionKey, toolEvent.toolName, toolEvent.args || {}, 0);
-		this.trackFileEdit(toolEvent.toolName, toolEvent.args);
-	}
-	handleToolExecutionUpdate(event, _context) {
-		const toolEvent = event;
-		this.progressManager.onToolUpdate(toolEvent.toolName, toolEvent.partialResult);
-	}
-	handleToolExecutionEnd(event, context) {
-		const toolEvent = event;
-		log.debug({
-			tool: toolEvent.toolName,
-			isError: toolEvent.isError
-		}, "Tool execution complete");
-		this.progressManager.onToolEnd(toolEvent.toolName, toolEvent.result, toolEvent.isError);
-		const durationMs = toolEvent.durationMs || 0;
-		this.lifecycleManager.emit("tool_call_end", context.sessionKey, {
-			toolName: toolEvent.toolName,
-			success: !toolEvent.isError,
-			result: toolEvent.result,
-			error: toolEvent.isError ? String(toolEvent.result) : void 0,
+	});
+	bus.on("tool_execution_end", (event, context) => {
+		const e = event;
+		const durationMs = e.durationMs || 0;
+		lifecycleManager.emit("tool_call_end", context.sessionKey, {
+			toolName: e.toolName,
+			success: !e.isError,
+			result: e.result,
+			error: e.isError ? String(e.result) : void 0,
 			durationMs
 		}, context).catch((err) => {
 			const em = err instanceof Error ? err.message : String(err);
@@ -169,67 +145,129 @@ var AgentEventHandler = class {
 				err,
 				errorMessage: em,
 				sessionKey: context.sessionKey,
-				tool: toolEvent.toolName
+				tool: e.toolName
 			}, `Lifecycle hook tool_call_end failed: ${em}`);
 		});
-		toolEvent.result = this.systemReminder.appendToResult(toolEvent.result);
-		this.toolUsageAnalyzer.recordUsage(toolEvent.toolName, !toolEvent.isError, durationMs);
-		this.recordToolResult(context.sessionKey, toolEvent.toolName, toolEvent.result, toolEvent.isError, durationMs);
-		if (toolEvent.isError) {
-			const errorText = this.extractError(toolEvent.result);
-			this.errorTracker.recordFailure(toolEvent.toolName, errorText);
-			const errorMatch = this.errorPatternMatcher.matchError(errorText);
-			if (errorMatch.matched && errorMatch.pattern) {
-				const preview = errorText.length > 120 ? `${errorText.slice(0, 120)}…` : errorText;
-				log.warn({
-					tool: toolEvent.toolName,
-					pattern: errorMatch.pattern.name,
-					errorPreview: preview
-				}, `Tool error matched pattern "${errorMatch.pattern.name}" (${toolEvent.toolName}): ${preview}`);
-			}
-		}
-	}
-	handleTurnEnd(_event, context) {
-		this.errorTracker.reset();
-		this.requestLimiter.reset();
-		this.selfVerifyMiddleware.onTurnStart();
-		this.toolChainTracker.endChain(context.sessionKey);
+	});
+}
+function installSystemReminderListener(bus, systemReminder) {
+	bus.on("tool_execution_end", (event) => {
+		const e = event;
+		e.result = systemReminder.appendToResult(e.result);
+	});
+}
+function installToolChainListener(bus, toolChainTracker) {
+	bus.on("turn_start", (_event, context) => {
+		toolChainTracker.startChain(context.sessionKey);
+	});
+	bus.on("tool_execution_start", (event, context) => {
+		const e = event;
+		toolChainTracker.recordCall(context.sessionKey, e.toolName, e.args || {}, 0);
+	});
+	bus.on("tool_execution_end", (event, context) => {
+		const e = event;
+		const durationMs = e.durationMs || 0;
+		const chain = toolChainTracker.getCurrentChain(context.sessionKey);
+		if (!chain) return;
+		const lastNode = chain.nodes[chain.nodes.length - 1];
+		if (lastNode && lastNode.toolName === e.toolName) toolChainTracker.recordResult(context.sessionKey, lastNode.id, e.result, e.isError ? "Tool execution failed" : void 0, durationMs);
+	});
+	bus.on("turn_end", (_event, context) => {
+		toolChainTracker.endChain(context.sessionKey);
+	});
+}
+function installToolUsageListener(bus, toolUsageAnalyzer) {
+	bus.on("tool_execution_end", (event) => {
+		const e = event;
+		const durationMs = e.durationMs || 0;
+		toolUsageAnalyzer.recordUsage(e.toolName, !e.isError, durationMs);
+	});
+}
+function extractErrorText(result) {
+	if (typeof result === "string") return result;
+	if (result && typeof result === "object") {
+		const obj = result;
+		if (typeof obj.error === "string") return obj.error;
+		if (typeof obj.message === "string") return obj.message;
+		return JSON.stringify(result);
 	}
-	handleAgentEnd(_event, _context) {
-		this.progressManager.endTask();
-	}
-	trackFileEdit(toolName, args) {
+	return String(result);
+}
+function installErrorTrackingListener(bus, deps) {
+	bus.on("tool_execution_end", (event) => {
+		const e = event;
+		if (!e.isError) return;
+		const errorText = extractErrorText(e.result);
+		deps.errorTracker.recordFailure(e.toolName, errorText);
+		const errorMatch = deps.errorPatternMatcher.matchError(errorText);
+		if (errorMatch.matched && errorMatch.pattern) {
+			const preview = errorText.length > 120 ? `${errorText.slice(0, 120)}…` : errorText;
+			log.warn({
+				tool: e.toolName,
+				pattern: errorMatch.pattern.name,
+				errorPreview: preview
+			}, `Tool error matched pattern "${errorMatch.pattern.name}" (${e.toolName}): ${preview}`);
+		}
+	});
+	bus.on("turn_end", () => {
+		deps.errorTracker.reset();
+	});
+}
+function installSelfVerifyListener(bus, selfVerifyMiddleware) {
+	bus.on("tool_execution_start", (event) => {
+		const e = event;
+		const args = e.args;
+		const toolName = e.toolName;
 		if (!toolName || !args) return;
 		const name = toolName.toLowerCase();
-		if (name.includes("write") && args.path) this.selfVerifyMiddleware.recordEdit(String(args.path), "write");
-		else if (name.includes("edit") && args.path) this.selfVerifyMiddleware.recordEdit(String(args.path), "edit");
-	}
-	recordToolResult(sessionKey, toolName, result, isError, durationMs) {
-		const chain = this.toolChainTracker.getCurrentChain(sessionKey);
-		if (chain) {
-			const lastNode = chain.nodes[chain.nodes.length - 1];
-			if (lastNode && lastNode.toolName === toolName) this.toolChainTracker.recordResult(sessionKey, lastNode.id, result, isError ? "Tool execution failed" : void 0, durationMs);
-		}
+		if (name.includes("write") && args.path) selfVerifyMiddleware.recordEdit(String(args.path), "write");
+		else if (name.includes("edit") && args.path) selfVerifyMiddleware.recordEdit(String(args.path), "edit");
+	});
+	bus.on("turn_end", () => {
+		selfVerifyMiddleware.onTurnStart();
+	});
+}
+/**
+* Thin façade over {@link SessionEventBus} that pre-registers all built-in
+* listeners in their required order. `handle(event, ctx)` is the entry point
+* used by `AgentService.handleSessionEvent`; extensions can hook in via
+* {@link registerListener} without touching this class.
+*/
+var AgentEventHandler = class {
+	bus;
+	constructor(config) {
+		this.bus = new SessionEventBus();
+		installProgressListener(this.bus, config.progressManager);
+		installRequestLimitListener(this.bus, {
+			requestLimiter: config.requestLimiter,
+			progressManager: config.progressManager,
+			lifecycleManager: config.lifecycleManager
+		});
+		installLifecycleHookListener(this.bus, config.lifecycleManager);
+		installSystemReminderListener(this.bus, config.systemReminder);
+		installToolUsageListener(this.bus, config.toolUsageAnalyzer);
+		installToolChainListener(this.bus, config.toolChainTracker);
+		installErrorTrackingListener(this.bus, {
+			errorTracker: config.errorTracker,
+			errorPatternMatcher: config.errorPatternMatcher
+		});
+		installSelfVerifyListener(this.bus, config.selfVerifyMiddleware);
 	}
-	extractError(result) {
-		if (typeof result === "string") return result;
-		if (result && typeof result === "object") {
-			const obj = result;
-			if (obj.error && typeof obj.error === "string") return obj.error;
-			if (obj.message && typeof obj.message === "string") return obj.message;
-			return JSON.stringify(result);
-		}
-		return String(result);
+	/** Dispatch a pi-agent event to all registered listeners. */
+	handle(event, context) {
+		this.bus.dispatch(event, context);
 	}
 	/**
-	* Get task duration in milliseconds
+	* Register an additional listener (e.g. from an extension). Returns an
+	* unsubscribe function. Listeners run after the built-ins in registration
+	* order; if you need to run before a built-in, you must create your own
+	* {@link SessionEventBus} instance.
 	*/
-	getTaskDuration() {
-		if (!this.taskStartTime) return 0;
-		return Date.now() - this.taskStartTime;
+	registerListener(type, listener) {
+		return this.bus.on(type, listener);
 	}
 };
 //#endregion
-export { AgentEventHandler };
+export { AgentEventHandler, SessionEventBus };
 
 //# sourceMappingURL=agent-event-handler.js.map

package/dist/src/agent/orchestration/agent-event-handler.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-event-handler.js","names":["msgEvent"],"sources":["../../../../src/agent/orchestration/agent-event-handler.ts"],"sourcesContent":["/**\n * Agent Event Handler - Handles all Agent lifecycle events\n *\n * Processes agent events and coordinates related actions like\n * progress updates, error tracking, and lifecycle events.\n */\n\nimport type { AgentEvent } from '@earendil-works/pi-agent-core';\nimport type { SessionContext } from '../session/session-context.js';\nimport type { ProgressFeedbackManager } from '../lifecycle/progress.js';\nimport type { ToolErrorTracker } from '../tools/error-tracker.js';\nimport type { RequestLimiter } from '../models/request-limiter.js';\nimport type { LifecycleManager } from '../lifecycle/index.js';\nimport type { ToolChainTracker } from '../tools/chain-tracker.js';\nimport type { SelfVerifyMiddleware } from '../middleware/index.js';\nimport type { SystemReminder } from '../prompt/system-reminder.js';\nimport type { ToolUsageAnalyzer } from '../tools/usage-analyzer.js';\nimport type { ErrorPatternMatcher } from '../tools/error-pattern-matcher.js';\nimport type { ModelManager } from '../models/index.js';\nimport { extractTextContent } from '../context/workspace.js';\nimport { createLogger } from '../../utils/logger.js';\n\nconst log = createLogger('AgentEventHandler');\n\nexport interface AgentEventHandlerConfig {\n  progressManager: ProgressFeedbackManager;\n  errorTracker: ToolErrorTracker;\n  requestLimiter: RequestLimiter;\n  lifecycleManager: LifecycleManager;\n  toolChainTracker: ToolChainTracker;\n  selfVerifyMiddleware: SelfVerifyMiddleware;\n  systemReminder: SystemReminder;\n  toolUsageAnalyzer: ToolUsageAnalyzer;\n  errorPatternMatcher: ErrorPatternMatcher;\n  modelManager: ModelManager;\n}\n\nexport class AgentEventHandler {\n  private progressManager: ProgressFeedbackManager;\n  private errorTracker: ToolErrorTracker;\n  private requestLimiter: RequestLimiter;\n  private lifecycleManager: LifecycleManager;\n  private toolChainTracker: ToolChainTracker;\n  private selfVerifyMiddleware: SelfVerifyMiddleware;\n  private systemReminder: SystemReminder;\n  private toolUsageAnalyzer: ToolUsageAnalyzer;\n  private errorPatternMatcher: ErrorPatternMatcher;\n  private modelManager: ModelManager;\n  private taskStartTime: number = 0;\n\n  constructor(config: AgentEventHandlerConfig) {\n    this.progressManager = config.progressManager;\n    this.errorTracker = config.errorTracker;\n    this.requestLimiter = config.requestLimiter;\n    this.lifecycleManager = config.lifecycleManager;\n    this.toolChainTracker = config.toolChainTracker;\n    this.selfVerifyMiddleware = config.selfVerifyMiddleware;\n    this.systemReminder = config.systemReminder;\n    this.toolUsageAnalyzer = config.toolUsageAnalyzer;\n    this.errorPatternMatcher = config.errorPatternMatcher;\n    this.modelManager = config.modelManager;\n  }\n\n  /**\n   * Handle an agent event\n   */\n  handle(event: AgentEvent, context: SessionContext | null): void {\n    if (!context) {\n      if (event.type !== 'message_update') {\n        log.warn(\n          { eventType: event.type },\n          `Agent event ignored (no SessionContext): ${event.type}`,\n        );\n      }\n      return;\n    }\n\n    switch (event.type) {\n      case 'agent_start':\n        this.handleAgentStart(event, context);\n        break;\n      case 'turn_start':\n        this.handleTurnStart(event, context);\n        break;\n      case 'message_start':\n        this.handleMessageStart(event, context);\n        break;\n      case 'message_end':\n        this.handleMessageEnd(event, context);\n        break;\n      case 'tool_execution_start':\n        this.handleToolExecutionStart(event, context);\n        break;\n      case 'tool_execution_update':\n        this.handleToolExecutionUpdate(event, context);\n        break;\n      case 'tool_execution_end':\n        this.handleToolExecutionEnd(event, context);\n        break;\n      case 'message_update':\n        // Handled by AgentService for streaming, but we acknowledge it here\n        break;\n      case 'turn_end':\n        this.handleTurnEnd(event, context);\n        break;\n      case 'agent_end':\n        this.handleAgentEnd(event, context);\n        break;\n      default:\n        log.debug({ eventType: (event as AgentEvent).type }, 'Unhandled event type');\n    }\n  }\n\n  private handleAgentStart(_event: AgentEvent, context: SessionContext): void {\n    log.debug('Agent turn started');\n    this.taskStartTime = Date.now();\n    this.progressManager.startTask();\n\n    const result = this.requestLimiter.recordRequest();\n\n    this.lifecycleManager.emit('llm_request', context.sessionKey, {\n      requestNumber: result.count,\n      maxRequests: result.limit,\n    }, context).catch((err) => {\n      const em = err instanceof Error ? err.message : String(err);\n      log.warn(\n        { err, errorMessage: em, sessionKey: context.sessionKey, requestNumber: result.count, maxRequests: result.limit },\n        `Lifecycle emit llm_request failed: ${em}`,\n      );\n    });\n\n    this.progressManager.onRequestLimitStatus(\n      result.count,\n      result.limit,\n      result.remaining,\n      result.isWarning,\n      result.shouldStop\n    );\n\n    if (result.shouldStop) {\n      log.error(\n        { count: result.count, limit: result.limit, sessionKey: context.sessionKey },\n        `Request limit reached (${result.count}/${result.limit}) for session`,\n      );\n    }\n  }\n\n  private handleTurnStart(_event: AgentEvent, context: SessionContext): void {\n    log.debug('Turn started');\n    this.progressManager.onTurnStart();\n    // One chain per LLM turn (pi-agent emits turn_start each round; turn_end clears the chain)\n    this.toolChainTracker.startChain(context.sessionKey);\n  }\n\n  private handleMessageStart(event: AgentEvent, _context: SessionContext): void {\n    const msgEvent = event as Extract<AgentEvent, { type: 'message_start' }>;\n    if (msgEvent.message?.role === 'assistant') {\n      log.debug('Assistant response starting');\n    }\n  }\n\n  private handleMessageEnd(event: AgentEvent, context: SessionContext): void {\n    const msgEvent = event as Extract<AgentEvent, { type: 'message_end' }>;\n    if (msgEvent.message?.role === 'assistant') {\n      const content = msgEvent.message.content;\n      const text = Array.isArray(content)\n        ? extractTextContent(content as Array<{ type: string; text?: string }>)\n        : String(content);\n      log.debug({ contentLength: text.length }, 'Assistant response complete');\n\n      this.lifecycleManager.emit('llm_response', context.sessionKey, {\n        response: text,\n        usage: (msgEvent.message as any).usage,\n      }, context).catch((err) => {\n        const em = err instanceof Error ? err.message : String(err);\n        log.warn(\n          { err, errorMessage: em, sessionKey: context.sessionKey, responseChars: text.length },\n          `Lifecycle emit llm_response failed: ${em}`,\n        );\n      });\n    }\n  }\n\n  private handleToolExecutionStart(event: AgentEvent, context: SessionContext): void {\n    const toolEvent = event as Extract<AgentEvent, { type: 'tool_execution_start' }>;\n    log.debug({ tool: toolEvent.toolName, args: toolEvent.args }, 'Tool execution started');\n    this.progressManager.onToolStart(toolEvent.toolName, toolEvent.args || {});\n\n    this.lifecycleManager.emit('tool_call_start', context.sessionKey, {\n      toolName: toolEvent.toolName,\n      arguments: toolEvent.args || {},\n      attemptNumber: 1,\n      maxAttempts: 3,\n    }, context).catch((err) => {\n      const em = err instanceof Error ? err.message : String(err);\n      log.warn(\n        { err, errorMessage: em, sessionKey: context.sessionKey, tool: toolEvent.toolName },\n        `Lifecycle emit tool_call_start failed: ${em}`,\n      );\n    });\n\n    this.toolChainTracker.recordCall(\n      context.sessionKey,\n      toolEvent.toolName,\n      toolEvent.args || {},\n      0\n    );\n\n    // Track file edits for self-verify\n    this.trackFileEdit(toolEvent.toolName, toolEvent.args);\n  }\n\n  private handleToolExecutionUpdate(event: AgentEvent, _context: SessionContext): void {\n    const toolEvent = event as Extract<AgentEvent, { type: 'tool_execution_update' }>;\n    this.progressManager.onToolUpdate(toolEvent.toolName, toolEvent.partialResult);\n  }\n\n  private handleToolExecutionEnd(event: AgentEvent, context: SessionContext): void {\n    const toolEvent = event as Extract<AgentEvent, { type: 'tool_execution_end' }>;\n    log.debug({ tool: toolEvent.toolName, isError: toolEvent.isError }, 'Tool execution complete');\n    this.progressManager.onToolEnd(toolEvent.toolName, toolEvent.result, toolEvent.isError);\n\n    const durationMs = (toolEvent as any).durationMs || 0;\n\n    this.lifecycleManager.emit('tool_call_end', context.sessionKey, {\n      toolName: toolEvent.toolName,\n      success: !toolEvent.isError,\n      result: toolEvent.result,\n      error: toolEvent.isError ? String(toolEvent.result) : undefined,\n      durationMs,\n    }, context).catch((err) => {\n      const em = err instanceof Error ? err.message : String(err);\n      log.warn(\n        { err, errorMessage: em, sessionKey: context.sessionKey, tool: toolEvent.toolName },\n        `Lifecycle hook tool_call_end failed: ${em}`,\n      );\n    });\n\n    // System reminder\n    (toolEvent as any).result = this.systemReminder.appendToResult(toolEvent.result);\n\n    // Record tool usage\n    this.toolUsageAnalyzer.recordUsage(toolEvent.toolName, !toolEvent.isError, durationMs);\n\n    // Record tool result in chain\n    this.recordToolResult(context.sessionKey, toolEvent.toolName, toolEvent.result, toolEvent.isError, durationMs);\n\n    // Track errors\n    if (toolEvent.isError) {\n      const errorText = this.extractError(toolEvent.result);\n      this.errorTracker.recordFailure(toolEvent.toolName, errorText);\n\n      // Match error pattern\n      const errorMatch = this.errorPatternMatcher.matchError(errorText);\n      if (errorMatch.matched && errorMatch.pattern) {\n        const preview = errorText.length > 120 ? `${errorText.slice(0, 120)}…` : errorText;\n        log.warn(\n          { tool: toolEvent.toolName, pattern: errorMatch.pattern.name, errorPreview: preview },\n          `Tool error matched pattern \"${errorMatch.pattern.name}\" (${toolEvent.toolName}): ${preview}`,\n        );\n      }\n    }\n  }\n\n  private handleTurnEnd(_event: AgentEvent, context: SessionContext): void {\n    // Reset trackers\n    this.errorTracker.reset();\n    this.requestLimiter.reset();\n    this.selfVerifyMiddleware.onTurnStart();\n    this.toolChainTracker.endChain(context.sessionKey);\n  }\n\n  private handleAgentEnd(_event: AgentEvent, _context: SessionContext): void {\n    this.progressManager.endTask();\n  }\n\n  private trackFileEdit(toolName: string | undefined, args: Record<string, unknown> | undefined): void {\n    if (!toolName || !args) return;\n    \n    const name = toolName.toLowerCase();\n    if (name.includes('write') && args.path) {\n      this.selfVerifyMiddleware.recordEdit(String(args.path), 'write');\n    } else if (name.includes('edit') && args.path) {\n      this.selfVerifyMiddleware.recordEdit(String(args.path), 'edit');\n    }\n  }\n\n  private recordToolResult(\n    sessionKey: string,\n    toolName: string,\n    result: unknown,\n    isError: boolean,\n    durationMs: number\n  ): void {\n    const chain = this.toolChainTracker.getCurrentChain(sessionKey);\n    if (chain) {\n      const lastNode = chain.nodes[chain.nodes.length - 1];\n      if (lastNode && lastNode.toolName === toolName) {\n        this.toolChainTracker.recordResult(\n          sessionKey,\n          lastNode.id,\n          result,\n          isError ? 'Tool execution failed' : undefined,\n          durationMs\n        );\n      }\n    }\n  }\n\n  private extractError(result: unknown): string {\n    if (typeof result === 'string') return result;\n    if (result && typeof result === 'object') {\n      const obj = result as Record<string, unknown>;\n      if (obj.error && typeof obj.error === 'string') return obj.error;\n      if (obj.message && typeof obj.message === 'string') return obj.message;\n      return JSON.stringify(result);\n    }\n    return String(result);\n  }\n\n  /**\n   * Get task duration in milliseconds\n   */\n  getTaskDuration(): number {\n    if (!this.taskStartTime) return 0;\n    return Date.now() - this.taskStartTime;\n  }\n}\n"],"mappings":"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"}
+{"version":3,"file":"agent-event-handler.js","names":[],"sources":["../../../../src/agent/orchestration/agent-event-handler.ts"],"sourcesContent":["/**\n * Agent Event Handler — coordinates listeners on pi-agent events.\n *\n * Previously a single god-handler with ten manager fields and one `switch`. Now a\n * thin façade around {@link SessionEventBus}: each concern (progress, lifecycle\n * hooks, tool-chain recording, error tracking, self-verify, etc.) registers its\n * own listener at construction time, and external code can add new listeners via\n * {@link AgentEventHandler.registerListener} without modifying this file (OCP).\n *\n * Ordering note: a few listeners are order-sensitive (notably the\n * `tool_execution_end` chain — `SystemReminder` mutates `event.result` in place\n * and downstream listeners read the mutated value). The `installX` calls below\n * preserve the exact order from the previous implementation.\n */\n\nimport type { AgentEvent } from '@earendil-works/pi-agent-core';\nimport type { SessionContext } from '../session/session-context.js';\nimport type { ProgressFeedbackManager } from '../lifecycle/progress.js';\nimport type { ToolErrorTracker } from '../tools/error-tracker.js';\nimport type { RequestLimiter } from '../models/request-limiter.js';\nimport type { LifecycleManager } from '../lifecycle/index.js';\nimport type { ToolChainTracker } from '../tools/chain-tracker.js';\nimport type { SelfVerifyMiddleware } from '../middleware/index.js';\nimport type { SystemReminder } from '../prompt/system-reminder.js';\nimport type { ToolUsageAnalyzer } from '../tools/usage-analyzer.js';\nimport type { ErrorPatternMatcher } from '../tools/error-pattern-matcher.js';\nimport { extractTextContent } from '../context/workspace.js';\nimport { createLogger } from '../../utils/logger.js';\n\nconst log = createLogger('AgentEventHandler');\n\n// ── Event bus ──────────────────────────────────────────────────────────────\n\nexport type SessionEventListener = (event: AgentEvent, context: SessionContext) => void;\nexport type SessionEventTypeFilter = AgentEvent['type'] | 'all';\n\n/**\n * Typed pub/sub for agent events. Listeners run in registration order; the bus\n * itself is synchronous — listeners that need async work must dispatch their own\n * promises (typically by awaiting and logging on error, like the lifecycle hooks).\n */\nexport class SessionEventBus {\n  private readonly listeners = new Map<SessionEventTypeFilter, SessionEventListener[]>();\n\n  on(type: SessionEventTypeFilter, listener: SessionEventListener): () => void {\n    const bucket = this.listeners.get(type) ?? [];\n    bucket.push(listener);\n    this.listeners.set(type, bucket);\n    return () => {\n      const current = this.listeners.get(type);\n      if (!current) return;\n      const idx = current.indexOf(listener);\n      if (idx >= 0) current.splice(idx, 1);\n    };\n  }\n\n  dispatch(event: AgentEvent, context: SessionContext | null): void {\n    if (!context) {\n      if (event.type !== 'message_update') {\n        log.warn(\n          { eventType: event.type },\n          `Agent event ignored (no SessionContext): ${event.type}`,\n        );\n      }\n      return;\n    }\n    const exact = this.listeners.get(event.type);\n    if (exact) {\n      for (const listener of exact) {\n        listener(event, context);\n      }\n    }\n    const all = this.listeners.get('all');\n    if (all) {\n      for (const listener of all) {\n        listener(event, context);\n      }\n    }\n  }\n}\n\n// ── Built-in listener installers ───────────────────────────────────────────\n\nfunction installProgressListener(bus: SessionEventBus, progressManager: ProgressFeedbackManager): void {\n  bus.on('agent_start', () => {\n    log.debug('Agent turn started');\n    progressManager.startTask();\n  });\n  bus.on('turn_start', () => {\n    log.debug('Turn started');\n    progressManager.onTurnStart();\n  });\n  bus.on('tool_execution_start', (event) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_start' }>;\n    log.debug({ tool: e.toolName, args: e.args }, 'Tool execution started');\n    progressManager.onToolStart(e.toolName, e.args || {});\n  });\n  bus.on('tool_execution_update', (event) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_update' }>;\n    progressManager.onToolUpdate(e.toolName, e.partialResult);\n  });\n  bus.on('tool_execution_end', (event) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_end' }>;\n    log.debug({ tool: e.toolName, isError: e.isError }, 'Tool execution complete');\n    progressManager.onToolEnd(e.toolName, e.result, e.isError);\n  });\n  bus.on('agent_end', () => {\n    progressManager.endTask();\n  });\n}\n\nfunction installRequestLimitListener(\n  bus: SessionEventBus,\n  deps: {\n    requestLimiter: RequestLimiter;\n    progressManager: ProgressFeedbackManager;\n    lifecycleManager: LifecycleManager;\n  },\n): void {\n  bus.on('agent_start', (_event, context) => {\n    const result = deps.requestLimiter.recordRequest();\n\n    deps.lifecycleManager\n      .emit(\n        'llm_request',\n        context.sessionKey,\n        { requestNumber: result.count, maxRequests: result.limit },\n        context,\n      )\n      .catch((err) => {\n        const em = err instanceof Error ? err.message : String(err);\n        log.warn(\n          {\n            err,\n            errorMessage: em,\n            sessionKey: context.sessionKey,\n            requestNumber: result.count,\n            maxRequests: result.limit,\n          },\n          `Lifecycle emit llm_request failed: ${em}`,\n        );\n      });\n\n    deps.progressManager.onRequestLimitStatus(\n      result.count,\n      result.limit,\n      result.remaining,\n      result.isWarning,\n      result.shouldStop,\n    );\n\n    if (result.shouldStop) {\n      log.error(\n        { count: result.count, limit: result.limit, sessionKey: context.sessionKey },\n        `Request limit reached (${result.count}/${result.limit}) for session`,\n      );\n    }\n  });\n\n  bus.on('turn_end', () => {\n    deps.requestLimiter.reset();\n  });\n}\n\nfunction installLifecycleHookListener(bus: SessionEventBus, lifecycleManager: LifecycleManager): void {\n  bus.on('message_end', (event, context) => {\n    const e = event as Extract<AgentEvent, { type: 'message_end' }>;\n    if (e.message?.role !== 'assistant') return;\n    const content = e.message.content;\n    const text = Array.isArray(content)\n      ? extractTextContent(content as Array<{ type: string; text?: string }>)\n      : String(content);\n    log.debug({ contentLength: text.length }, 'Assistant response complete');\n\n    lifecycleManager\n      .emit(\n        'llm_response',\n        context.sessionKey,\n        { response: text, usage: (e.message as { usage?: unknown }).usage },\n        context,\n      )\n      .catch((err) => {\n        const em = err instanceof Error ? err.message : String(err);\n        log.warn(\n          { err, errorMessage: em, sessionKey: context.sessionKey, responseChars: text.length },\n          `Lifecycle emit llm_response failed: ${em}`,\n        );\n      });\n  });\n\n  bus.on('tool_execution_start', (event, context) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_start' }>;\n    lifecycleManager\n      .emit(\n        'tool_call_start',\n        context.sessionKey,\n        {\n          toolName: e.toolName,\n          arguments: e.args || {},\n          attemptNumber: 1,\n          maxAttempts: 3,\n        },\n        context,\n      )\n      .catch((err) => {\n        const em = err instanceof Error ? err.message : String(err);\n        log.warn(\n          { err, errorMessage: em, sessionKey: context.sessionKey, tool: e.toolName },\n          `Lifecycle emit tool_call_start failed: ${em}`,\n        );\n      });\n  });\n\n  bus.on('tool_execution_end', (event, context) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_end' }>;\n    const durationMs = (e as { durationMs?: number }).durationMs || 0;\n    lifecycleManager\n      .emit(\n        'tool_call_end',\n        context.sessionKey,\n        {\n          toolName: e.toolName,\n          success: !e.isError,\n          result: e.result,\n          error: e.isError ? String(e.result) : undefined,\n          durationMs,\n        },\n        context,\n      )\n      .catch((err) => {\n        const em = err instanceof Error ? err.message : String(err);\n        log.warn(\n          { err, errorMessage: em, sessionKey: context.sessionKey, tool: e.toolName },\n          `Lifecycle hook tool_call_end failed: ${em}`,\n        );\n      });\n  });\n}\n\nfunction installSystemReminderListener(bus: SessionEventBus, systemReminder: SystemReminder): void {\n  // MUTATES `event.result` so downstream listeners (tool-chain, error-tracking) see\n  // the decorated text. Must run AFTER progress + lifecycle hooks (they consume the\n  // original) and BEFORE tool-chain + error-tracking.\n  bus.on('tool_execution_end', (event) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_end' }> & { result: unknown };\n    e.result = systemReminder.appendToResult(e.result);\n  });\n}\n\nfunction installToolChainListener(bus: SessionEventBus, toolChainTracker: ToolChainTracker): void {\n  bus.on('turn_start', (_event, context) => {\n    // One chain per LLM turn (pi-agent emits turn_start each round; turn_end clears the chain).\n    toolChainTracker.startChain(context.sessionKey);\n  });\n  bus.on('tool_execution_start', (event, context) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_start' }>;\n    toolChainTracker.recordCall(context.sessionKey, e.toolName, e.args || {}, 0);\n  });\n  bus.on('tool_execution_end', (event, context) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_end' }>;\n    const durationMs = (e as { durationMs?: number }).durationMs || 0;\n    const chain = toolChainTracker.getCurrentChain(context.sessionKey);\n    if (!chain) return;\n    const lastNode = chain.nodes[chain.nodes.length - 1];\n    if (lastNode && lastNode.toolName === e.toolName) {\n      toolChainTracker.recordResult(\n        context.sessionKey,\n        lastNode.id,\n        e.result,\n        e.isError ? 'Tool execution failed' : undefined,\n        durationMs,\n      );\n    }\n  });\n  bus.on('turn_end', (_event, context) => {\n    toolChainTracker.endChain(context.sessionKey);\n  });\n}\n\nfunction installToolUsageListener(bus: SessionEventBus, toolUsageAnalyzer: ToolUsageAnalyzer): void {\n  bus.on('tool_execution_end', (event) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_end' }>;\n    const durationMs = (e as { durationMs?: number }).durationMs || 0;\n    toolUsageAnalyzer.recordUsage(e.toolName, !e.isError, durationMs);\n  });\n}\n\nfunction extractErrorText(result: unknown): string {\n  if (typeof result === 'string') return result;\n  if (result && typeof result === 'object') {\n    const obj = result as Record<string, unknown>;\n    if (typeof obj.error === 'string') return obj.error;\n    if (typeof obj.message === 'string') return obj.message;\n    return JSON.stringify(result);\n  }\n  return String(result);\n}\n\nfunction installErrorTrackingListener(\n  bus: SessionEventBus,\n  deps: { errorTracker: ToolErrorTracker; errorPatternMatcher: ErrorPatternMatcher },\n): void {\n  bus.on('tool_execution_end', (event) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_end' }>;\n    if (!e.isError) return;\n    const errorText = extractErrorText(e.result);\n    deps.errorTracker.recordFailure(e.toolName, errorText);\n\n    const errorMatch = deps.errorPatternMatcher.matchError(errorText);\n    if (errorMatch.matched && errorMatch.pattern) {\n      const preview = errorText.length > 120 ? `${errorText.slice(0, 120)}…` : errorText;\n      log.warn(\n        { tool: e.toolName, pattern: errorMatch.pattern.name, errorPreview: preview },\n        `Tool error matched pattern \"${errorMatch.pattern.name}\" (${e.toolName}): ${preview}`,\n      );\n    }\n  });\n  bus.on('turn_end', () => {\n    deps.errorTracker.reset();\n  });\n}\n\nfunction installSelfVerifyListener(bus: SessionEventBus, selfVerifyMiddleware: SelfVerifyMiddleware): void {\n  bus.on('tool_execution_start', (event) => {\n    const e = event as Extract<AgentEvent, { type: 'tool_execution_start' }>;\n    const args = e.args;\n    const toolName = e.toolName;\n    if (!toolName || !args) return;\n    const name = toolName.toLowerCase();\n    if (name.includes('write') && args.path) {\n      selfVerifyMiddleware.recordEdit(String(args.path), 'write');\n    } else if (name.includes('edit') && args.path) {\n      selfVerifyMiddleware.recordEdit(String(args.path), 'edit');\n    }\n  });\n  bus.on('turn_end', () => {\n    selfVerifyMiddleware.onTurnStart();\n  });\n}\n\n// ── Public façade ───────────────────────────────────────────────────────────\n\nexport interface AgentEventHandlerConfig {\n  progressManager: ProgressFeedbackManager;\n  errorTracker: ToolErrorTracker;\n  requestLimiter: RequestLimiter;\n  lifecycleManager: LifecycleManager;\n  toolChainTracker: ToolChainTracker;\n  selfVerifyMiddleware: SelfVerifyMiddleware;\n  systemReminder: SystemReminder;\n  toolUsageAnalyzer: ToolUsageAnalyzer;\n  errorPatternMatcher: ErrorPatternMatcher;\n}\n\n/**\n * Thin façade over {@link SessionEventBus} that pre-registers all built-in\n * listeners in their required order. `handle(event, ctx)` is the entry point\n * used by `AgentService.handleSessionEvent`; extensions can hook in via\n * {@link registerListener} without touching this class.\n */\nexport class AgentEventHandler {\n  private readonly bus: SessionEventBus;\n\n  constructor(config: AgentEventHandlerConfig) {\n    this.bus = new SessionEventBus();\n\n    // Order matters for `tool_execution_end`: SystemReminder mutates `event.result`\n    // and ToolChain + ErrorTracking depend on the mutated value. Keep these in this\n    // exact sequence.\n    installProgressListener(this.bus, config.progressManager);\n    installRequestLimitListener(this.bus, {\n      requestLimiter: config.requestLimiter,\n      progressManager: config.progressManager,\n      lifecycleManager: config.lifecycleManager,\n    });\n    installLifecycleHookListener(this.bus, config.lifecycleManager);\n    installSystemReminderListener(this.bus, config.systemReminder);\n    installToolUsageListener(this.bus, config.toolUsageAnalyzer);\n    installToolChainListener(this.bus, config.toolChainTracker);\n    installErrorTrackingListener(this.bus, {\n      errorTracker: config.errorTracker,\n      errorPatternMatcher: config.errorPatternMatcher,\n    });\n    installSelfVerifyListener(this.bus, config.selfVerifyMiddleware);\n  }\n\n  /** Dispatch a pi-agent event to all registered listeners. */\n  handle(event: AgentEvent, context: SessionContext | null): void {\n    this.bus.dispatch(event, context);\n  }\n\n  /**\n   * Register an additional listener (e.g. from an extension). Returns an\n   * unsubscribe function. Listeners run after the built-ins in registration\n   * order; if you need to run before a built-in, you must create your own\n   * {@link SessionEventBus} instance.\n   */\n  registerListener(type: SessionEventTypeFilter, listener: SessionEventListener): () => void {\n    return this.bus.on(type, listener);\n  }\n}\n"],"mappings":"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"}

package/dist/src/agent/orchestration/agent-orchestrator.d.ts

@@ -7,6 +7,7 @@
 import type { Config } from '../../config/schema.js';
 import type { InboundMessage } from '../../infra/bus/index.js';
 import type { SessionConfigStore, SessionStore } from '../../session/index.js';
+import type { SessionHydrator } from '../session/index.js';
 import type { ThinkLevel } from '../transcript/thinking-types.js';
 import type { ModelManager } from '../models/index.js';
 import type { SessionContext } from '../session/session-context.js';
@@ -21,8 +22,8 @@ export interface AgentOrchestratorConfig {
     eventHandler: AgentEventHandler;
     feedbackCoordinator: FeedbackCoordinator;
     sessionConfigStore: SessionConfigStore;
-    /** Load per-session workspace override and mkdir before creating the agent. */
-    hydrateSessionWorkspaceFromStore?: (sessionKey: string) => Promise<void>;
+    /** Per-session hydration (workspace override + model override) before the agent runs. */
+    sessionHydrator: SessionHydrator;
     getThinkingDefault: () => ThinkLevel | undefined;
     /** Per-session default from merged `agents.list` / defaults (optional). */
     getThinkingDefaultForSession?: (sessionKey: string) => ThinkLevel | undefined;
@@ -48,7 +49,7 @@ export declare class AgentOrchestrator {
     private eventHandler;
     private feedbackCoordinator;
     private sessionConfigStore;
-    private hydrateSessionWorkspaceFromStore?;
+    private sessionHydrator;
     private getThinkingDefault;
     private getThinkingDefaultForSession?;
     private workspaceRoot;
@@ -59,7 +60,6 @@ export declare class AgentOrchestrator {
     private onEmbeddedStreamEvent?;
     private onEmbeddedTurnComplete?;
     constructor(config: AgentOrchestratorConfig);
-    private hydrateSessionModelFromStore;
     /**
      * Process a message through the agent orchestration pipeline
      */

package/dist/src/agent/orchestration/agent-orchestrator.js

@@ -23,7 +23,7 @@ var AgentOrchestrator = class {
 	eventHandler;
 	feedbackCoordinator;
 	sessionConfigStore;
-	hydrateSessionWorkspaceFromStore;
+	sessionHydrator;
 	getThinkingDefault;
 	getThinkingDefaultForSession;
 	workspaceRoot;
@@ -40,7 +40,7 @@ var AgentOrchestrator = class {
 		this.eventHandler = config.eventHandler;
 		this.feedbackCoordinator = config.feedbackCoordinator;
 		this.sessionConfigStore = config.sessionConfigStore;
-		this.hydrateSessionWorkspaceFromStore = config.hydrateSessionWorkspaceFromStore;
+		this.sessionHydrator = config.sessionHydrator;
 		this.getThinkingDefault = config.getThinkingDefault;
 		this.getThinkingDefaultForSession = config.getThinkingDefaultForSession;
 		this.workspaceRoot = config.workspaceRoot;
@@ -51,17 +51,13 @@ var AgentOrchestrator = class {
 		this.onEmbeddedStreamEvent = config.onEmbeddedStreamEvent;
 		this.onEmbeddedTurnComplete = config.onEmbeddedTurnComplete;
 	}
-	async hydrateSessionModelFromStore(sessionKey) {
-		const cfg = await this.sessionConfigStore.get(sessionKey);
-		if (cfg?.modelOverride) await this.modelManager.switchModelForSession(sessionKey, cfg.modelOverride);
-	}
 	/**
 	* Process a message through the agent orchestration pipeline
 	*/
 	async process(msg, context) {
 		const { sessionKey } = context;
 		log.debug({ sessionKey }, "Processing message through agent orchestrator");
-		await this.hydrateSessionWorkspaceFromStore?.(sessionKey);
+		await this.sessionHydrator.workspace(sessionKey);
 		if (typeof msg.content === "string" && (sessionKey.startsWith("cron:") || context.channel === "cron")) {
 			const content = msg.content;
 			if (content.includes("__xopc_memory_dreaming_sweep__") || content.includes("__xopc_memory_dreaming_light_sweep__") || content.includes("__xopc_memory_dreaming_rem_sweep__")) {
@@ -116,7 +112,7 @@ var AgentOrchestrator = class {
 			}
 		}
 		try {
-			await this.hydrateSessionModelFromStore(sessionKey);
+			await this.sessionHydrator.model(sessionKey);
 			const thinkingDefault = this.getThinkingDefaultForSession?.(sessionKey) ?? this.getThinkingDefault();
 			const thinkingLevel = await resolveEffectiveThinkingLevel(this.sessionConfigStore, sessionKey, null, thinkingDefault);
 			this.agentManager.setThinkingLevel(sessionKey, thinkingLevel);