@machina.ai/cell-cli-core 1.20.2-rc1 → 1.25.0-rc1

package/dist/src/hooks/trustedHooks.js

@@ -0,0 +1,90 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import { Storage } from '../config/storage.js';
+import { getHookKey, } from './types.js';
+import { debugLogger } from '../utils/debugLogger.js';
+export class TrustedHooksManager {
+    configPath;
+    trustedHooks = {};
+    constructor() {
+        this.configPath = path.join(Storage.getGlobalGeminiDir(), 'trusted_hooks.json');
+        this.load();
+    }
+    load() {
+        try {
+            if (fs.existsSync(this.configPath)) {
+                const content = fs.readFileSync(this.configPath, 'utf-8');
+                this.trustedHooks = JSON.parse(content);
+            }
+        }
+        catch (error) {
+            debugLogger.warn('Failed to load trusted hooks config', error);
+            this.trustedHooks = {};
+        }
+    }
+    save() {
+        try {
+            const dir = path.dirname(this.configPath);
+            if (!fs.existsSync(dir)) {
+                fs.mkdirSync(dir, { recursive: true });
+            }
+            fs.writeFileSync(this.configPath, JSON.stringify(this.trustedHooks, null, 2));
+        }
+        catch (error) {
+            debugLogger.warn('Failed to save trusted hooks config', error);
+        }
+    }
+    /**
+     * Get untrusted hooks for a project
+     * @param projectPath Absolute path to the project root
+     * @param hooks The hooks configuration to check
+     * @returns List of untrusted hook commands/names
+     */
+    getUntrustedHooks(projectPath, hooks) {
+        const trustedKeys = new Set(this.trustedHooks[projectPath] || []);
+        const untrusted = [];
+        for (const eventName of Object.keys(hooks)) {
+            const definitions = hooks[eventName];
+            if (!Array.isArray(definitions))
+                continue;
+            for (const def of definitions) {
+                if (!def || !Array.isArray(def.hooks))
+                    continue;
+                for (const hook of def.hooks) {
+                    const key = getHookKey(hook);
+                    if (!trustedKeys.has(key)) {
+                        // Return friendly name or command
+                        untrusted.push(hook.name || hook.command || 'unknown-hook');
+                    }
+                }
+            }
+        }
+        return Array.from(new Set(untrusted)); // Deduplicate
+    }
+    /**
+     * Trust all provided hooks for a project
+     */
+    trustHooks(projectPath, hooks) {
+        const currentTrusted = new Set(this.trustedHooks[projectPath] || []);
+        for (const eventName of Object.keys(hooks)) {
+            const definitions = hooks[eventName];
+            if (!Array.isArray(definitions))
+                continue;
+            for (const def of definitions) {
+                if (!def || !Array.isArray(def.hooks))
+                    continue;
+                for (const hook of def.hooks) {
+                    currentTrusted.add(getHookKey(hook));
+                }
+            }
+        }
+        this.trustedHooks[projectPath] = Array.from(currentTrusted);
+        this.save();
+    }
+}
+//# sourceMappingURL=trustedHooks.js.map

package/dist/src/hooks/trustedHooks.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"trustedHooks.js","sourceRoot":"","sources":["../../../src/hooks/trustedHooks.ts"],"names":[],"mappings":"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"}

package/dist/src/hooks/trustedHooks.test.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/src/hooks/trustedHooks.test.js

@@ -0,0 +1,154 @@
+/**
+ * @license
+ * Copyright 2025 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { describe, it, expect, vi, beforeEach } from 'vitest';
+import * as fs from 'node:fs';
+import { TrustedHooksManager } from './trustedHooks.js';
+import { Storage } from '../config/storage.js';
+import { HookEventName, HookType } from './types.js';
+vi.mock('node:fs');
+vi.mock('../config/storage.js');
+vi.mock('../utils/debugLogger.js', () => ({
+    debugLogger: {
+        warn: vi.fn(),
+        error: vi.fn(),
+        log: vi.fn(),
+        debug: vi.fn(),
+    },
+}));
+describe('TrustedHooksManager', () => {
+    beforeEach(() => {
+        vi.resetAllMocks();
+        vi.mocked(Storage.getGlobalGeminiDir).mockReturnValue('/mock/home/.cell-cli');
+    });
+    describe('initialization', () => {
+        it('should load existing trusted hooks', () => {
+            const existingData = {
+                '/project/a': ['hook1:cmd1'],
+            };
+            vi.mocked(fs.existsSync).mockReturnValue(true);
+            vi.mocked(fs.readFileSync).mockReturnValue(JSON.stringify(existingData));
+            const manager = new TrustedHooksManager();
+            const untrusted = manager.getUntrustedHooks('/project/a', {
+                [HookEventName.BeforeTool]: [
+                    {
+                        hooks: [{ type: HookType.Command, command: 'cmd1', name: 'hook1' }],
+                    },
+                ],
+            });
+            expect(untrusted).toHaveLength(0);
+        });
+        it('should handle missing config file', () => {
+            vi.mocked(fs.existsSync).mockReturnValue(false);
+            const manager = new TrustedHooksManager();
+            const untrusted = manager.getUntrustedHooks('/project/a', {
+                [HookEventName.BeforeTool]: [
+                    {
+                        hooks: [{ type: HookType.Command, command: 'cmd1', name: 'hook1' }],
+                    },
+                ],
+            });
+            expect(untrusted).toEqual(['hook1']);
+        });
+    });
+    describe('getUntrustedHooks', () => {
+        it('should return names of untrusted hooks', () => {
+            vi.mocked(fs.existsSync).mockReturnValue(false);
+            const manager = new TrustedHooksManager();
+            const projectHooks = {
+                [HookEventName.BeforeTool]: [
+                    {
+                        hooks: [
+                            { name: 'trusted-hook', type: HookType.Command, command: 'cmd1' },
+                            { name: 'new-hook', type: HookType.Command, command: 'cmd2' },
+                        ],
+                    },
+                ],
+            };
+            // Initially both are untrusted
+            expect(manager.getUntrustedHooks('/project', projectHooks)).toEqual([
+                'trusted-hook',
+                'new-hook',
+            ]);
+            // Trust one
+            manager.trustHooks('/project', {
+                [HookEventName.BeforeTool]: [
+                    {
+                        hooks: [
+                            { name: 'trusted-hook', type: HookType.Command, command: 'cmd1' },
+                        ],
+                    },
+                ],
+            });
+            // Only the other one is untrusted
+            expect(manager.getUntrustedHooks('/project', projectHooks)).toEqual([
+                'new-hook',
+            ]);
+        });
+        it('should use command if name is missing', () => {
+            vi.mocked(fs.existsSync).mockReturnValue(false);
+            const manager = new TrustedHooksManager();
+            const projectHooks = {
+                [HookEventName.BeforeTool]: [
+                    {
+                        hooks: [{ type: HookType.Command, command: './script.sh' }],
+                    },
+                ],
+            };
+            expect(manager.getUntrustedHooks('/project', projectHooks)).toEqual([
+                './script.sh',
+            ]);
+        });
+        it('should detect change in command as untrusted', () => {
+            vi.mocked(fs.existsSync).mockReturnValue(false);
+            const manager = new TrustedHooksManager();
+            const originalHook = {
+                [HookEventName.BeforeTool]: [
+                    {
+                        hooks: [
+                            { name: 'my-hook', type: HookType.Command, command: 'old-cmd' },
+                        ],
+                    },
+                ],
+            };
+            const updatedHook = {
+                [HookEventName.BeforeTool]: [
+                    {
+                        hooks: [
+                            { name: 'my-hook', type: HookType.Command, command: 'new-cmd' },
+                        ],
+                    },
+                ],
+            };
+            manager.trustHooks('/project', originalHook);
+            expect(manager.getUntrustedHooks('/project', updatedHook)).toEqual([
+                'my-hook',
+            ]);
+        });
+    });
+    describe('persistence', () => {
+        it('should save to file when trusting hooks', () => {
+            vi.mocked(fs.existsSync).mockReturnValue(false);
+            const manager = new TrustedHooksManager();
+            manager.trustHooks('/project', {
+                [HookEventName.BeforeTool]: [
+                    {
+                        hooks: [{ name: 'hook1', type: HookType.Command, command: 'cmd1' }],
+                    },
+                ],
+            });
+            expect(fs.writeFileSync).toHaveBeenCalledWith(expect.stringContaining('trusted_hooks.json'), expect.stringContaining('hook1:cmd1'));
+        });
+        it('should create directory if missing on save', () => {
+            vi.mocked(fs.existsSync).mockReturnValue(false);
+            const manager = new TrustedHooksManager();
+            manager.trustHooks('/project', {});
+            expect(fs.mkdirSync).toHaveBeenCalledWith(expect.any(String), {
+                recursive: true,
+            });
+        });
+    });
+});
+//# sourceMappingURL=trustedHooks.test.js.map

package/dist/src/hooks/trustedHooks.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"trustedHooks.test.js","sourceRoot":"","sources":["../../../src/hooks/trustedHooks.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAErD,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;AACnB,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;AAChC,EAAE,CAAC,IAAI,CAAC,yBAAyB,EAAE,GAAG,EAAE,CAAC,CAAC;IACxC,WAAW,EAAE;QACX,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE;QACb,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;QACd,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE;QACZ,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;KACf;CACF,CAAC,CAAC,CAAC;AAEJ,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,UAAU,CAAC,GAAG,EAAE;QACd,EAAE,CAAC,aAAa,EAAE,CAAC;QACnB,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,eAAe,CACnD,sBAAsB,CACvB,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC9B,EAAE,CAAC,oCAAoC,EAAE,GAAG,EAAE;YAC5C,MAAM,YAAY,GAAG;gBACnB,YAAY,EAAE,CAAC,YAAY,CAAC;aAC7B,CAAC;YACF,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAC/C,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,YAAY,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC;YAEzE,MAAM,OAAO,GAAG,IAAI,mBAAmB,EAAE,CAAC;YAC1C,MAAM,SAAS,GAAG,OAAO,CAAC,iBAAiB,CAAC,YAAY,EAAE;gBACxD,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE;oBAC1B;wBACE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;qBACpE;iBACF;aACF,CAAC,CAAC;YAEH,MAAM,CAAC,SAAS,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;YAC3C,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAEhD,MAAM,OAAO,GAAG,IAAI,mBAAmB,EAAE,CAAC;YAC1C,MAAM,SAAS,GAAG,OAAO,CAAC,iBAAiB,CAAC,YAAY,EAAE;gBACxD,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE;oBAC1B;wBACE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;qBACpE;iBACF;aACF,CAAC,CAAC;YAEH,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,mBAAmB,EAAE,GAAG,EAAE;QACjC,EAAE,CAAC,wCAAwC,EAAE,GAAG,EAAE;YAChD,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAChD,MAAM,OAAO,GAAG,IAAI,mBAAmB,EAAE,CAAC;YAE1C,MAAM,YAAY,GAAG;gBACnB,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE;oBAC1B;wBACE,KAAK,EAAE;4BACL,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE;4BACjE,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE;yBAC9D;qBACF;iBACF;aACF,CAAC;YAEF,+BAA+B;YAC/B,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC;gBAClE,cAAc;gBACd,UAAU;aACX,CAAC,CAAC;YAEH,YAAY;YACZ,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE;gBAC7B,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE;oBAC1B;wBACE,KAAK,EAAE;4BACL,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE;yBAClE;qBACF;iBACF;aACF,CAAC,CAAC;YAEH,kCAAkC;YAClC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC;gBAClE,UAAU;aACX,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uCAAuC,EAAE,GAAG,EAAE;YAC/C,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAChD,MAAM,OAAO,GAAG,IAAI,mBAAmB,EAAE,CAAC;YAE1C,MAAM,YAAY,GAAG;gBACnB,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE;oBAC1B;wBACE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;qBAC5D;iBACF;aACF,CAAC;YAEF,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC;gBAClE,aAAa;aACd,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;YACtD,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAChD,MAAM,OAAO,GAAG,IAAI,mBAAmB,EAAE,CAAC;YAE1C,MAAM,YAAY,GAAG;gBACnB,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE;oBAC1B;wBACE,KAAK,EAAE;4BACL,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE;yBAChE;qBACF;iBACF;aACF,CAAC;YACF,MAAM,WAAW,GAAG;gBAClB,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE;oBAC1B;wBACE,KAAK,EAAE;4BACL,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE;yBAChE;qBACF;iBACF;aACF,CAAC;YAEF,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;YAE7C,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC,OAAO,CAAC;gBACjE,SAAS;aACV,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE;QAC3B,EAAE,CAAC,yCAAyC,EAAE,GAAG,EAAE;YACjD,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAChD,MAAM,OAAO,GAAG,IAAI,mBAAmB,EAAE,CAAC;YAE1C,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE;gBAC7B,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE;oBAC1B;wBACE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;qBACpE;iBACF;aACF,CAAC,CAAC;YAEH,MAAM,CAAC,EAAE,CAAC,aAAa,CAAC,CAAC,oBAAoB,CAC3C,MAAM,CAAC,gBAAgB,CAAC,oBAAoB,CAAC,EAC7C,MAAM,CAAC,gBAAgB,CAAC,YAAY,CAAC,CACtC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4CAA4C,EAAE,GAAG,EAAE;YACpD,EAAE,CAAC,MAAM,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;YAChD,MAAM,OAAO,GAAG,IAAI,mBAAmB,EAAE,CAAC;YAE1C,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAEnC,MAAM,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;gBAC5D,SAAS,EAAE,IAAI;aAChB,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}

package/dist/src/hooks/types.d.ts

@@ -5,6 +5,15 @@
  */
 import type { GenerateContentResponse, GenerateContentParameters, ToolConfig as GenAIToolConfig, ToolListUnion } from '@google/genai';
 import type { LLMRequest, LLMResponse, HookToolConfig } from './hookTranslator.js';
+/**
+ * Configuration source levels in precedence order (highest to lowest)
+ */
+export declare enum ConfigSource {
+    Project = "project",
+    User = "user",
+    System = "system",
+    Extensions = "extensions"
+}
 /**
  * Event names for the hook system
  */
@@ -27,7 +36,10 @@ export declare enum HookEventName {
 export interface CommandHookConfig {
     type: HookType.Command;
     command: string;
+    name?: string;
+    description?: string;
     timeout?: number;
+    source?: ConfigSource;
 }
 export type HookConfig = CommandHookConfig;
 /**
@@ -44,6 +56,10 @@ export interface HookDefinition {
 export declare enum HookType {
     Command = "command"
 }
+/**
+ * Generate a unique key for a hook configuration
+ */
+export declare function getHookKey(hook: HookConfig): string;
 /**
  * Decision types for hook outputs
  */
@@ -126,17 +142,13 @@ export declare class DefaultHookOutput implements HookOutput {
     };
 }
 /**
- * Specific hook output class for BeforeTool events with compatibility support
+ * Specific hook output class for BeforeTool events.
  */
 export declare class BeforeToolHookOutput extends DefaultHookOutput {
     /**
-     * Get the effective blocking reason, considering compatibility fields
-     */
-    getEffectiveReason(): string;
-    /**
-     * Check if this output represents a blocking decision, considering compatibility fields
+     * Get modified tool input if provided by hook
      */
-    isBlockingDecision(): boolean;
+    getModifiedToolInput(): Record<string, unknown> | undefined;
 }
 /**
  * Specific hook output class for BeforeModel events
@@ -175,12 +187,32 @@ export declare class AfterModelHookOutput extends DefaultHookOutput {
      */
     getModifiedResponse(): GenerateContentResponse | undefined;
 }
+/**
+ * Context for MCP tool executions.
+ * Contains non-sensitive connection information about the MCP server
+ * identity. Since server_name is user controlled and arbitrary, we
+ * also include connection information (e.g., command or url) to
+ * help identify the MCP server.
+ *
+ * NOTE: In the future, consider defining a shared sanitized interface
+ * from MCPServerConfig to avoid duplication and ensure consistency.
+ */
+export interface McpToolContext {
+    server_name: string;
+    tool_name: string;
+    command?: string;
+    args?: string[];
+    cwd?: string;
+    url?: string;
+    tcp?: string;
+}
 /**
  * BeforeTool hook input
  */
 export interface BeforeToolInput extends HookInput {
     tool_name: string;
     tool_input: Record<string, unknown>;
+    mcp_context?: McpToolContext;
 }
 /**
  * BeforeTool hook output
@@ -188,8 +220,7 @@ export interface BeforeToolInput extends HookInput {
 export interface BeforeToolOutput extends HookOutput {
     hookSpecificOutput?: {
         hookEventName: 'BeforeTool';
-        permissionDecision?: HookDecision;
-        permissionDecisionReason?: string;
+        tool_input?: Record<string, unknown>;
     };
 }
 /**
@@ -199,6 +230,7 @@ export interface AfterToolInput extends HookInput {
     tool_name: string;
     tool_input: Record<string, unknown>;
     tool_response: Record<string, unknown>;
+    mcp_context?: McpToolContext;
 }
 /**
  * AfterTool hook output
@@ -259,8 +291,7 @@ export interface AfterAgentInput extends HookInput {
 export declare enum SessionStartSource {
     Startup = "startup",
     Resume = "resume",
-    Clear = "clear",
-    Compress = "compress"
+    Clear = "clear"
 }
 /**
  * SessionStart hook input

package/dist/src/hooks/types.js

@@ -4,6 +4,16 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { defaultHookTranslator } from './hookTranslator.js';
+/**
+ * Configuration source levels in precedence order (highest to lowest)
+ */
+export var ConfigSource;
+(function (ConfigSource) {
+    ConfigSource["Project"] = "project";
+    ConfigSource["User"] = "user";
+    ConfigSource["System"] = "system";
+    ConfigSource["Extensions"] = "extensions";
+})(ConfigSource || (ConfigSource = {}));
 /**
  * Event names for the hook system
  */
@@ -28,6 +38,14 @@ export var HookType;
 (function (HookType) {
     HookType["Command"] = "command";
 })(HookType || (HookType = {}));
+/**
+ * Generate a unique key for a hook configuration
+ */
+export function getHookKey(hook) {
+    const name = hook.name || '';
+    const command = hook.command || '';
+    return `${name}:${command}`;
+}
 /**
  * Factory function to create the appropriate hook output class based on event name
  * Returns DefaultHookOutput for all events since it contains all necessary methods
@@ -40,6 +58,8 @@ export function createHookOutput(eventName, data) {
             return new AfterModelHookOutput(data);
         case 'BeforeToolSelection':
             return new BeforeToolSelectionHookOutput(data);
+        case 'BeforeTool':
+            return new BeforeToolHookOutput(data);
         default:
             return new DefaultHookOutput(data);
     }
@@ -80,7 +100,7 @@ export class DefaultHookOutput {
      * Get the effective reason for blocking or stopping
      */
     getEffectiveReason() {
-        return this.reason || this.stopReason || 'No reason provided';
+        return this.stopReason || this.reason || 'No reason provided';
     }
     /**
      * Apply LLM request modifications (specific method for BeforeModel hooks)
@@ -121,37 +141,22 @@ export class DefaultHookOutput {
     }
 }
 /**
- * Specific hook output class for BeforeTool events with compatibility support
+ * Specific hook output class for BeforeTool events.
  */
 export class BeforeToolHookOutput extends DefaultHookOutput {
     /**
-     * Get the effective blocking reason, considering compatibility fields
-     */
-    getEffectiveReason() {
-        // Check for compatibility fields first
-        if (this.hookSpecificOutput) {
-            if ('permissionDecisionReason' in this.hookSpecificOutput) {
-                const compatReason = this.hookSpecificOutput['permissionDecisionReason'];
-                if (typeof compatReason === 'string') {
-                    return compatReason;
-                }
-            }
-        }
-        return super.getEffectiveReason();
-    }
-    /**
-     * Check if this output represents a blocking decision, considering compatibility fields
+     * Get modified tool input if provided by hook
      */
-    isBlockingDecision() {
-        // Check compatibility field first
-        if (this.hookSpecificOutput &&
-            'permissionDecision' in this.hookSpecificOutput) {
-            const compatDecision = this.hookSpecificOutput['permissionDecision'];
-            if (compatDecision === 'block' || compatDecision === 'deny') {
-                return true;
+    getModifiedToolInput() {
+        if (this.hookSpecificOutput && 'tool_input' in this.hookSpecificOutput) {
+            const input = this.hookSpecificOutput['tool_input'];
+            if (typeof input === 'object' &&
+                input !== null &&
+                !Array.isArray(input)) {
+                return input;
             }
         }
-        return super.isBlockingDecision();
+        return undefined;
     }
 }
 /**
@@ -227,21 +232,6 @@ export class AfterModelHookOutput extends DefaultHookOutput {
                 return defaultHookTranslator.fromHookLLMResponse(hookResponse);
             }
         }
-        // If hook wants to stop execution, create a synthetic stop response
-        if (this.shouldStopExecution()) {
-            const stopResponse = {
-                candidates: [
-                    {
-                        content: {
-                            role: 'model',
-                            parts: [this.getEffectiveReason() || 'Execution stopped by hook'],
-                        },
-                        finishReason: 'STOP',
-                    },
-                ],
-            };
-            return defaultHookTranslator.fromHookLLMResponse(stopResponse);
-        }
         return undefined;
     }
 }
@@ -260,7 +250,6 @@ export var SessionStartSource;
     SessionStartSource["Startup"] = "startup";
     SessionStartSource["Resume"] = "resume";
     SessionStartSource["Clear"] = "clear";
-    SessionStartSource["Compress"] = "compress";
 })(SessionStartSource || (SessionStartSource = {}));
 /**
  * SessionEnd reason types

package/dist/src/hooks/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/hooks/types.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAaH,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AAE5D;;GAEG;AACH,MAAM,CAAN,IAAY,aAYX;AAZD,WAAY,aAAa;IACvB,0CAAyB,CAAA;IACzB,wCAAuB,CAAA;IACvB,4CAA2B,CAAA;IAC3B,8CAA6B,CAAA;IAC7B,0CAAyB,CAAA;IACzB,8CAA6B,CAAA;IAC7B,0CAAyB,CAAA;IACzB,4CAA2B,CAAA;IAC3B,4CAA2B,CAAA;IAC3B,0CAAyB,CAAA;IACzB,4DAA2C,CAAA;AAC7C,CAAC,EAZW,aAAa,KAAb,aAAa,QAYxB;AAsBD;;GAEG;AACH,MAAM,CAAN,IAAY,QAEX;AAFD,WAAY,QAAQ;IAClB,+BAAmB,CAAA;AACrB,CAAC,EAFW,QAAQ,KAAR,QAAQ,QAEnB;AAqCD;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAC9B,SAAiB,EACjB,IAAyB;IAEzB,QAAQ,SAAS,EAAE,CAAC;QAClB,KAAK,aAAa;YAChB,OAAO,IAAI,qBAAqB,CAAC,IAAI,CAAC,CAAC;QACzC,KAAK,YAAY;YACf,OAAO,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAC;QACxC,KAAK,qBAAqB;YACxB,OAAO,IAAI,6BAA6B,CAAC,IAAI,CAAC,CAAC;QACjD;YACE,OAAO,IAAI,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,OAAO,iBAAiB;IAC5B,QAAQ,CAAW;IACnB,UAAU,CAAU;IACpB,cAAc,CAAW;IACzB,aAAa,CAAU;IACvB,QAAQ,CAAgB;IACxB,MAAM,CAAU;IAChB,kBAAkB,CAA2B;IAE7C,YAAY,OAA4B,EAAE;QACxC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAClC,IAAI,CAAC,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC;QAC1C,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,aAAa,CAAC;QACxC,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC9B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,IAAI,CAAC,kBAAkB,GAAG,IAAI,CAAC,kBAAkB,CAAC;IACpD,CAAC;IAED;;OAEG;IACH,kBAAkB;QAChB,OAAO,IAAI,CAAC,QAAQ,KAAK,OAAO,IAAI,IAAI,CAAC,QAAQ,KAAK,MAAM,CAAC;IAC/D,CAAC;IAED;;OAEG;IACH,mBAAmB;QACjB,OAAO,IAAI,CAAC,QAAQ,KAAK,KAAK,CAAC;IACjC,CAAC;IAED;;OAEG;IACH,kBAAkB;QAChB,OAAO,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,UAAU,IAAI,oBAAoB,CAAC;IAChE,CAAC;IAED;;OAEG;IACH,4BAA4B,CAC1B,MAAiC;QAEjC,4DAA4D;QAC5D,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,4BAA4B,CAAC,MAG5B;QAIC,oEAAoE;QACpE,OAAO,MAAM,CAAC;IAChB,CAAC;IAED;;OAEG;IACH,oBAAoB;QAClB,IACE,IAAI,CAAC,kBAAkB;YACvB,mBAAmB,IAAI,IAAI,CAAC,kBAAkB,EAC9C,CAAC;YACD,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,CAAC;YAC7D,OAAO,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;QAC3D,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;OAEG;IACH,gBAAgB;QACd,IAAI,IAAI,CAAC,kBAAkB,EAAE,EAAE,CAAC;YAC9B,OAAO;gBACL,OAAO,EAAE,IAAI;gBACb,MAAM,EAAE,IAAI,CAAC,kBAAkB,EAAE;aAClC,CAAC;QACJ,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IACxC,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,oBAAqB,SAAQ,iBAAiB;IACzD;;OAEG;IACM,kBAAkB;QACzB,uCAAuC;QACvC,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YAC5B,IAAI,0BAA0B,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC1D,MAAM,YAAY,GAChB,IAAI,CAAC,kBAAkB,CAAC,0BAA0B,CAAC,CAAC;gBACtD,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;oBACrC,OAAO,YAAY,CAAC;gBACtB,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC,kBAAkB,EAAE,CAAC;IACpC,CAAC;IAED;;OAEG;IACM,kBAAkB;QACzB,kCAAkC;QAClC,IACE,IAAI,CAAC,kBAAkB;YACvB,oBAAoB,IAAI,IAAI,CAAC,kBAAkB,EAC/C,CAAC;YACD,MAAM,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,CAAC;YACrE,IAAI,cAAc,KAAK,OAAO,IAAI,cAAc,KAAK,MAAM,EAAE,CAAC;gBAC5D,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC,kBAAkB,EAAE,CAAC;IACpC,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,qBAAsB,SAAQ,iBAAiB;IAC1D;;OAEG;IACH,oBAAoB;QAClB,IAAI,IAAI,CAAC,kBAAkB,IAAI,cAAc,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACzE,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAC1C,cAAc,CACA,CAAC;YACjB,IAAI,YAAY,EAAE,CAAC;gBACjB,oCAAoC;gBACpC,OAAO,qBAAqB,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;OAEG;IACM,4BAA4B,CACnC,MAAiC;QAEjC,IAAI,IAAI,CAAC,kBAAkB,IAAI,aAAa,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACxE,MAAM,WAAW,GAAG,IAAI,CAAC,kBAAkB,CACzC,aAAa,CACS,CAAC;YACzB,IAAI,WAAW,EAAE,CAAC;gBAChB,oCAAoC;gBACpC,MAAM,UAAU,GAAG,qBAAqB,CAAC,kBAAkB,CACzD,WAAyB,EACzB,MAAM,CACP,CAAC;gBACF,OAAO;oBACL,GAAG,MAAM;oBACT,GAAG,UAAU;iBACd,CAAC;YACJ,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,6BAA8B,SAAQ,iBAAiB;IAClE;;OAEG;IACM,4BAA4B,CAAC,MAGrC;QACC,IAAI,IAAI,CAAC,kBAAkB,IAAI,YAAY,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACvE,MAAM,cAAc,GAAG,IAAI,CAAC,kBAAkB,CAC5C,YAAY,CACK,CAAC;YACpB,IAAI,cAAc,EAAE,CAAC;gBACnB,oCAAoC;gBACpC,MAAM,aAAa,GACjB,qBAAqB,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC;gBAC3D,OAAO;oBACL,GAAG,MAAM;oBACT,KAAK,EAAE,MAAM,CAAC,KAAK,IAAI,EAAE;oBACzB,UAAU,EAAE,aAAa;iBAC1B,CAAC;YACJ,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAED;;GAEG;AACH,MAAM,OAAO,oBAAqB,SAAQ,iBAAiB;IACzD;;OAEG;IACH,mBAAmB;QACjB,IAAI,IAAI,CAAC,kBAAkB,IAAI,cAAc,IAAI,IAAI,CAAC,kBAAkB,EAAE,CAAC;YACzE,MAAM,YAAY,GAAG,IAAI,CAAC,kBAAkB,CAC1C,cAAc,CACS,CAAC;YAC1B,IAAI,YAAY,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;gBAC1D,oCAAoC;gBACpC,OAAO,qBAAqB,CAAC,mBAAmB,CAC9C,YAA2B,CAC5B,CAAC;YACJ,CAAC;QACH,CAAC;QAED,oEAAoE;QACpE,IAAI,IAAI,CAAC,mBAAmB,EAAE,EAAE,CAAC;YAC/B,MAAM,YAAY,GAAgB;gBAChC,UAAU,EAAE;oBACV;wBACE,OAAO,EAAE;4BACP,IAAI,EAAE,OAAO;4BACb,KAAK,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,IAAI,2BAA2B,CAAC;yBAClE;wBACD,YAAY,EAAE,MAAM;qBACrB;iBACF;aACF,CAAC;YACF,OAAO,qBAAqB,CAAC,mBAAmB,CAAC,YAAY,CAAC,CAAC;QACjE,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAyDD;;GAEG;AACH,MAAM,CAAN,IAAY,gBAEX;AAFD,WAAY,gBAAgB;IAC1B,qDAAiC,CAAA;AACnC,CAAC,EAFW,gBAAgB,KAAhB,gBAAgB,QAE3B;AA4BD;;GAEG;AACH,MAAM,CAAN,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,yCAAmB,CAAA;IACnB,uCAAiB,CAAA;IACjB,qCAAe,CAAA;IACf,2CAAqB,CAAA;AACvB,CAAC,EALW,kBAAkB,KAAlB,kBAAkB,QAK7B;AAmBD;;GAEG;AACH,MAAM,CAAN,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAC1B,iCAAa,CAAA;IACb,mCAAe,CAAA;IACf,qCAAiB,CAAA;IACjB,yDAAqC,CAAA;IACrC,mCAAe,CAAA;AACjB,CAAC,EANW,gBAAgB,KAAhB,gBAAgB,QAM3B;AASD;;GAEG;AACH,MAAM,CAAN,IAAY,kBAGX;AAHD,WAAY,kBAAkB;IAC5B,uCAAiB,CAAA;IACjB,mCAAa,CAAA;AACf,CAAC,EAHW,kBAAkB,KAAlB,kBAAkB,QAG7B"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/hooks/types.ts"],"names":[],"mappings":"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"}

package/dist/src/hooks/types.test.js

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { describe, it, expect, vi } from 'vitest';
-import { createHookOutput, DefaultHookOutput, BeforeToolHookOutput, BeforeModelHookOutput, BeforeToolSelectionHookOutput, AfterModelHookOutput, HookEventName, HookType, } from './types.js';
+import { createHookOutput, DefaultHookOutput, BeforeModelHookOutput, BeforeToolSelectionHookOutput, AfterModelHookOutput, HookEventName, HookType, BeforeToolHookOutput, } from './types.js';
 import { defaultHookTranslator } from './hookTranslator.js';
 vi.mock('./hookTranslator.js', () => ({
     defaultHookTranslator: {
@@ -64,6 +64,10 @@ describe('Hook Output Classes', () => {
             const output = createHookOutput(HookEventName.BeforeToolSelection, {});
             expect(output).toBeInstanceOf(BeforeToolSelectionHookOutput);
         });
+        it('should return BeforeToolHookOutput for BeforeTool event', () => {
+            const output = createHookOutput(HookEventName.BeforeTool, {});
+            expect(output).toBeInstanceOf(BeforeToolHookOutput);
+        });
     });
     describe('DefaultHookOutput', () => {
         it('should construct with provided data', () => {
@@ -163,29 +167,6 @@ describe('Hook Output Classes', () => {
             expect(output.getBlockingError()).toEqual({ blocked: false, reason: '' });
         });
     });
-    describe('BeforeToolHookOutput', () => {
-        it('isBlockingDecision should use permissionDecision from hookSpecificOutput', () => {
-            const output1 = new BeforeToolHookOutput({
-                hookSpecificOutput: { permissionDecision: 'block' },
-            });
-            expect(output1.isBlockingDecision()).toBe(true);
-            const output2 = new BeforeToolHookOutput({
-                hookSpecificOutput: { permissionDecision: 'approve' },
-            });
-            expect(output2.isBlockingDecision()).toBe(false);
-        });
-        it('getEffectiveReason should use permissionDecisionReason from hookSpecificOutput', () => {
-            const output1 = new BeforeToolHookOutput({
-                hookSpecificOutput: { permissionDecisionReason: 'compat reason' },
-            });
-            expect(output1.getEffectiveReason()).toBe('compat reason');
-            const output2 = new BeforeToolHookOutput({
-                reason: 'default reason',
-                hookSpecificOutput: { other: 'value' },
-            });
-            expect(output2.getEffectiveReason()).toBe('default reason');
-        });
-    });
     describe('BeforeModelHookOutput', () => {
         it('getSyntheticResponse should return synthetic response if llm_response is present', () => {
             const mockResponse = { candidates: [] };
@@ -273,40 +254,16 @@ describe('Hook Output Classes', () => {
             const output = new AfterModelHookOutput({});
             expect(output.getModifiedResponse()).toBeUndefined();
         });
-        it('getModifiedResponse should return a synthetic stop response if shouldStopExecution is true', () => {
+        it('getModifiedResponse should return undefined if shouldStopExecution is true', () => {
             const output = new AfterModelHookOutput({
                 continue: false,
                 stopReason: 'stopped by hook',
             });
-            const expectedResponse = {
-                candidates: [
-                    {
-                        content: {
-                            role: 'model',
-                            parts: ['stopped by hook'],
-                        },
-                        finishReason: 'STOP',
-                    },
-                ],
-            };
-            expect(output.getModifiedResponse()).toEqual(expectedResponse);
-            expect(defaultHookTranslator.fromHookLLMResponse).toHaveBeenCalledWith(expectedResponse);
+            expect(output.getModifiedResponse()).toBeUndefined();
         });
-        it('getModifiedResponse should return a synthetic stop response with default reason if shouldStopExecution is true and no stopReason', () => {
+        it('getModifiedResponse should return undefined if shouldStopExecution is true and no stopReason', () => {
             const output = new AfterModelHookOutput({ continue: false });
-            const expectedResponse = {
-                candidates: [
-                    {
-                        content: {
-                            role: 'model',
-                            parts: ['No reason provided'],
-                        },
-                        finishReason: 'STOP',
-                    },
-                ],
-            };
-            expect(output.getModifiedResponse()).toEqual(expectedResponse);
-            expect(defaultHookTranslator.fromHookLLMResponse).toHaveBeenCalledWith(expectedResponse);
+            expect(output.getModifiedResponse()).toBeUndefined();
         });
     });
 });