Skip to content
Merged
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
45 changes: 30 additions & 15 deletions packages/agent-sdk/src/managers/hookManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ import { logger } from "../utils/globalLogger.js";

export class HookManager {
private configuration: PartialHookConfiguration | undefined;
private programmaticHooks: PartialHookConfiguration = {};
private pluginHooks: PartialHookConfiguration = {};
private waveConfigHooks: PartialHookConfiguration = {};
private readonly matcher: HookMatcher;
private readonly workdir: string;

Expand All @@ -47,22 +50,24 @@ export class HookManager {
* Load hook configuration from programmatic source (AgentOptions.hooks)
*/
loadConfiguration(hooks?: PartialHookConfiguration): void {
const merged: PartialHookConfiguration = {};
this.programmaticHooks = {};

if (hooks) {
this.mergeHooksConfiguration(merged, hooks);
this.mergeHooksConfiguration(this.programmaticHooks, hooks);
}

// Validate merged configuration
const validation = this.validatePartialConfiguration(merged);
const validation = this.validatePartialConfiguration(
this.programmaticHooks,
);
if (!validation.valid) {
throw new HookConfigurationError(
"merged configuration",
validation.errors,
);
}

this.configuration = merged;
this.rebuildConfiguration();
}

/**
Expand All @@ -71,8 +76,9 @@ export class HookManager {
*/
loadConfigurationFromWaveConfig(waveConfig: WaveConfiguration | null): void {
try {
// Merge Wave configuration hooks with existing plugin hooks
// (plugin hooks were registered earlier via registerPluginHooks)
// Replace (not append) wave config hooks to avoid duplicates on reload
this.waveConfigHooks = {};

if (waveConfig?.hooks) {
const validation = this.validatePartialConfiguration(waveConfig.hooks);
if (!validation.valid) {
Expand All @@ -81,11 +87,10 @@ export class HookManager {
validation.errors,
);
}
if (!this.configuration) {
this.configuration = {};
}
this.mergeHooksConfiguration(this.configuration, waveConfig.hooks);
this.waveConfigHooks = { ...waveConfig.hooks };
}

this.rebuildConfiguration();
} catch (error) {
// Re-throw configuration errors, but handle other errors gracefully
if (error instanceof HookConfigurationError) {
Expand All @@ -98,6 +103,19 @@ export class HookManager {
}
}

/**
* Rebuild the full configuration from all sources:
* programmatic (AgentOptions.hooks) + plugin + wave config (settings.json)
* Order determines precedence on conflict (later sources append).
*/
private rebuildConfiguration(): void {
const rebuilt: PartialHookConfiguration = {};
this.mergeHooksConfiguration(rebuilt, this.programmaticHooks);
this.mergeHooksConfiguration(rebuilt, this.pluginHooks);
this.mergeHooksConfiguration(rebuilt, this.waveConfigHooks);
this.configuration = Object.keys(rebuilt).length > 0 ? rebuilt : undefined;
}

/**
* Execute hooks for a specific event
*/
Expand Down Expand Up @@ -854,10 +872,6 @@ export class HookManager {
pluginRoot: string,
hooks: PartialHookConfiguration,
): void {
if (!this.configuration) {
this.configuration = {};
}

// Stamp pluginRoot on each hook command
const stampedHooks: PartialHookConfiguration = {};
for (const [event, configs] of Object.entries(hooks)) {
Expand All @@ -868,7 +882,8 @@ export class HookManager {
}));
}

this.mergeHooksConfiguration(this.configuration, stampedHooks);
this.mergeHooksConfiguration(this.pluginHooks, stampedHooks);
this.rebuildConfiguration();
}

/**
Expand Down