diff --git a/packages/core/src/tool.ts b/packages/core/src/tool.ts index c557372f8bf..13e85ee9d15 100644 --- a/packages/core/src/tool.ts +++ b/packages/core/src/tool.ts @@ -90,6 +90,7 @@ const layer = Layer.effect( ) { const beforeEvent: PluginHooks.Domains["tool"]["execute.before"] = { tool: name, + inputSchema: definition(tool).inputSchema, sessionID: context.sessionID, agent: context.agent, messageID: context.messageID, diff --git a/packages/core/test/plugin.test.ts b/packages/core/test/plugin.test.ts index 1419249c390..fcc1a84083d 100644 --- a/packages/core/test/plugin.test.ts +++ b/packages/core/test/plugin.test.ts @@ -455,7 +455,7 @@ describe("Plugin", () => { const registry = yield* Tool.Service const executed: unknown[] = [] const seen: { - before?: unknown + before?: { input: unknown; inputSchema: unknown } after?: { input: unknown; status: string; content: unknown; metadata: unknown } } = {} @@ -480,7 +480,7 @@ describe("Plugin", () => { yield* ctx.tool .hook("execute.before", (event) => Effect.sync(() => { - seen.before = event.input + seen.before = { input: event.input, inputSchema: event.inputSchema } event.input = { text: "before-mutated" } }), ) @@ -526,7 +526,15 @@ describe("Plugin", () => { call: { type: "tool-call", id: "call-hooks", name: "echo", input: { text: "original" } }, }) - expect(seen.before).toEqual({ text: "original" }) + expect(seen.before).toEqual({ + input: { text: "original" }, + inputSchema: { + type: "object", + properties: { text: { type: "string" } }, + required: ["text"], + additionalProperties: false, + }, + }) expect(executed).toEqual([{ text: "before-mutated" }]) expect(seen.after).toEqual({ input: { text: "before-mutated" }, diff --git a/packages/plugin/src/effect/tool.ts b/packages/plugin/src/effect/tool.ts index ff0b4728444..2750f4d9eeb 100644 --- a/packages/plugin/src/effect/tool.ts +++ b/packages/plugin/src/effect/tool.ts @@ -2,6 +2,7 @@ import { Tool } from "@opencode-ai/schema/tool" import type { Agent } from "@opencode-ai/schema/agent" import type { Session } from "@opencode-ai/schema/session" import type { SessionMessage } from "@opencode-ai/schema/session-message" +import type { JsonSchema } from "effect" import type { Hooks, Transform } from "./registration.js" export interface ToolDraft { @@ -13,6 +14,7 @@ export interface ToolDraft { export interface ToolHooks { readonly "execute.before": { readonly tool: string + readonly inputSchema: JsonSchema.JsonSchema readonly sessionID: Session.ID readonly agent: Agent.ID readonly messageID: SessionMessage.ID diff --git a/packages/plugin/src/promise/tool.ts b/packages/plugin/src/promise/tool.ts index 3cfbf5a49dd..f34397c12c8 100644 --- a/packages/plugin/src/promise/tool.ts +++ b/packages/plugin/src/promise/tool.ts @@ -5,6 +5,7 @@ import { Tool } from "@opencode-ai/schema/tool" import type { Agent } from "@opencode-ai/schema/agent" import type { Session } from "@opencode-ai/schema/session" import type { SessionMessage } from "@opencode-ai/schema/session-message" +import type { JsonSchema } from "effect" import type { Hooks, Transform } from "./registration.js" export interface ToolContext extends Omit { @@ -30,6 +31,7 @@ interface ToolDraft { interface ToolHooks { readonly "execute.before": { readonly tool: string + readonly inputSchema: JsonSchema.JsonSchema readonly sessionID: Session.ID readonly agent: Agent.ID readonly messageID: SessionMessage.ID