MediaMetz/gemini-cli
1
0
Fork 0
mirror of https://github.com/google-gemini/gemini-cli.git synced 2026-04-01 17:02:29 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix(hooks): support 'ask' decision for BeforeTool hooks (#21146)

Browse Source
This commit is contained in:
Christian Gunderman
2026-03-21 03:52:39 +00:00
committed by GitHub
parent d3766875f8
commit d1dc4902fd
32 changed files with 1016 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
packages/core/src/test-utils/mock-tool.ts
View File

@@ -14,7 +14,9 @@ import {
Kind,
type ToolCallConfirmationDetails,
type ToolInvocation,
type ToolLiveOutput,
type ToolResult,
type ExecuteOptions,
} from '../tools/tools.js';
import { createMockMessageBus } from './mock-message-bus.js';
import type { MessageBus } from '../confirmation-bus/message-bus.js';
@@ -33,6 +35,7 @@ interface MockToolOptions {
params: { [key: string]: unknown },
signal?: AbortSignal,
updateOutput?: (output: string) => void,
options?: ExecuteOptions,
) => Promise<ToolResult>;
params?: object;
messageBus?: MessageBus;
@@ -52,13 +55,15 @@ class MockToolInvocation extends BaseToolInvocation<
execute(
signal: AbortSignal,
updateOutput?: (output: string) => void,
updateOutput?: (output: ToolLiveOutput) => void,
options?: ExecuteOptions,
): Promise<ToolResult> {
if (updateOutput) {
return this.tool.execute(this.params, signal, updateOutput);
} else {
return this.tool.execute(this.params);
}
return this.tool.execute(
this.params,
signal,
updateOutput as ((output: string) => void) | undefined,
options,
);
}
override shouldConfirmExecute(
@@ -79,14 +84,16 @@ export class MockTool extends BaseDeclarativeTool<
{ [key: string]: unknown },
ToolResult
> {
shouldConfirmExecute: (
readonly shouldConfirmExecute: (
params: { [key: string]: unknown },
signal: AbortSignal,
) => Promise<ToolCallConfirmationDetails | false>;
execute: (
readonly execute: (
params: { [key: string]: unknown },
signal?: AbortSignal,
updateOutput?: (output: string) => void,
options?: ExecuteOptions,
) => Promise<ToolResult>;
constructor(options: MockToolOptions) {
@@ -150,7 +157,11 @@ export class MockModifiableToolInvocation extends BaseToolInvocation<
super(params, messageBus, tool.name, tool.displayName);
}
async execute(_abortSignal: AbortSignal): Promise<ToolResult> {
async execute(
_signal: AbortSignal,
_updateOutput?: (output: ToolLiveOutput) => void,
_options?: ExecuteOptions,
): Promise<ToolResult> {
const result = this.tool.executeFn(this.params);
return (
result ?? {