Merge main, resolve CHANGELOG conflict

2026-01-01 00:10:46 +01:00
parent 98c85bf36a 6f7c10e323
commit c15efdbcd9
41 changed files with 515 additions and 184 deletions
--- a/packages/coding-agent/src/core/sdk.ts
+++ b/packages/coding-agent/src/core/sdk.ts
@@ -140,7 +140,7 @@ export interface CreateAgentSessionResult {
 // Re-exports

 export type { CustomTool } from "./custom-tools/types.js";
-export type { HookAPI, HookFactory } from "./hooks/types.js";
+export type { HookAPI, HookContext, HookFactory } from "./hooks/types.js";
 export type { Settings, SkillsSettings } from "./settings-manager.js";
 export type { Skill } from "./skills.js";
 export type { FileSlashCommand } from "./slash-commands.js";