diff --git a/src/utils/websearch/hook-config.ts b/src/utils/websearch/hook-config.ts index fe01adc0..4b80e088 100644 --- a/src/utils/websearch/hook-config.ts +++ b/src/utils/websearch/hook-config.ts @@ -12,6 +12,7 @@ import * as os from 'os'; import { info, warn } from '../ui'; import { getWebSearchConfig } from '../../config/unified-config-loader'; import { getCcsDir } from '../config-manager'; +import { isCcsWebSearchHook, deduplicateCcsHooks } from './hook-utils'; // Hook file name const WEBSEARCH_HOOK = 'websearch-transformer.cjs'; @@ -51,47 +52,6 @@ export function getHookPath(): string { return path.join(getCcsHooksDir(), WEBSEARCH_HOOK); } -/** - * Check if a hook entry is a CCS WebSearch hook - */ -function isCcsWebSearchHook(hook: Record): boolean { - if (hook.matcher !== 'WebSearch') return false; - - const hookArray = hook.hooks as Array> | undefined; - if (!hookArray?.[0]?.command) return false; - - const command = hookArray[0].command; - if (typeof command !== 'string') return false; - // Normalize path separators for cross-platform matching (Windows uses backslashes) - const normalizedCommand = command.replace(/\\/g, '/'); - return normalizedCommand.includes('.ccs/hooks/websearch-transformer'); -} - -/** - * Remove duplicate CCS WebSearch hooks from settings, keeping only the first one - * Returns true if duplicates were removed - */ -function deduplicateCcsHooks(settings: Record): boolean { - const hooks = settings.hooks as Record | undefined; - if (!hooks?.PreToolUse) return false; - - let foundFirst = false; - const originalLength = hooks.PreToolUse.length; - - hooks.PreToolUse = hooks.PreToolUse.filter((h: unknown) => { - const hook = h as Record; - if (!isCcsWebSearchHook(hook)) return true; // Keep non-CCS hooks - - if (!foundFirst) { - foundFirst = true; - return true; // Keep first CCS hook - } - return false; // Remove subsequent duplicates - }); - - return hooks.PreToolUse.length < originalLength; -} - /** * Get WebSearch hook configuration for settings.json * Timeout is computed from max provider timeout in config.yaml + buffer @@ -177,12 +137,6 @@ export function ensureHookConfig(): boolean { if (webSearchHookIndex !== -1) { // Hook exists - first clean up any duplicates const hadDuplicates = deduplicateCcsHooks(settings); - if (hadDuplicates) { - fs.writeFileSync(getClaudeSettingsPath(), JSON.stringify(settings, null, 2), 'utf8'); - if (process.env.CCS_DEBUG) { - console.error(info('Removed duplicate WebSearch hooks from settings.json')); - } - } // Then check if it needs updating const existingHook = hooks.PreToolUse[webSearchHookIndex] as Record; @@ -204,10 +158,13 @@ export function ensureHookConfig(): boolean { needsUpdate = true; } - if (needsUpdate) { + // Combine into single write if either changed + if (hadDuplicates || needsUpdate) { fs.writeFileSync(getClaudeSettingsPath(), JSON.stringify(settings, null, 2), 'utf8'); if (process.env.CCS_DEBUG) { - console.error(info('Updated WebSearch hook config in settings.json')); + if (hadDuplicates) + console.error(info('Removed duplicate WebSearch hooks from settings.json')); + if (needsUpdate) console.error(info('Updated WebSearch hook config in settings.json')); } } return true; diff --git a/src/utils/websearch/hook-utils.ts b/src/utils/websearch/hook-utils.ts new file mode 100644 index 00000000..85618d64 --- /dev/null +++ b/src/utils/websearch/hook-utils.ts @@ -0,0 +1,50 @@ +/** + * WebSearch Hook Utilities + * + * Shared helper functions for WebSearch hook detection and deduplication. + * + * @module utils/websearch/hook-utils + */ + +/** + * Check if a hook entry is a CCS WebSearch hook + * Normalizes path separators for cross-platform matching (Windows uses backslashes) + */ +export function isCcsWebSearchHook(hook: Record): boolean { + if (hook.matcher !== 'WebSearch') return false; + + const hookArray = hook.hooks as Array> | undefined; + if (!hookArray?.[0]?.command) return false; + + const command = hookArray[0].command; + if (typeof command !== 'string') return false; + + // Normalize path separators for cross-platform matching + const normalizedCommand = command.replace(/\\/g, '/'); + return normalizedCommand.includes('.ccs/hooks/websearch-transformer'); +} + +/** + * Remove duplicate CCS WebSearch hooks from settings, keeping only the first one + * Returns true if duplicates were removed + */ +export function deduplicateCcsHooks(settings: Record): boolean { + const hooks = settings.hooks as Record | undefined; + if (!hooks?.PreToolUse) return false; + + let foundFirst = false; + const originalLength = hooks.PreToolUse.length; + + hooks.PreToolUse = hooks.PreToolUse.filter((h: unknown) => { + const hook = h as Record; + if (!isCcsWebSearchHook(hook)) return true; // Keep non-CCS hooks + + if (!foundFirst) { + foundFirst = true; + return true; // Keep first CCS hook + } + return false; // Remove subsequent duplicates + }); + + return hooks.PreToolUse.length < originalLength; +} diff --git a/src/utils/websearch/profile-hook-injector.ts b/src/utils/websearch/profile-hook-injector.ts index 4ef27c4b..c4fe01de 100644 --- a/src/utils/websearch/profile-hook-injector.ts +++ b/src/utils/websearch/profile-hook-injector.ts @@ -14,6 +14,7 @@ import { getWebSearchHookConfig, getHookPath } from './hook-config'; import { getWebSearchConfig } from '../../config/unified-config-loader'; import { removeHookConfig } from './hook-config'; import { getCcsDir } from '../config-manager'; +import { isCcsWebSearchHook, deduplicateCcsHooks } from './hook-utils'; // Valid profile name pattern (alphanumeric, dash, underscore only) const VALID_PROFILE_NAME = /^[a-zA-Z0-9_-]+$/; @@ -33,61 +34,10 @@ function hasCcsHook(settings: Record): boolean { if (!hooks?.PreToolUse) return false; return hooks.PreToolUse.some((h: unknown) => { - const hook = h as Record; - if (hook.matcher !== 'WebSearch') return false; - - const hookArray = hook.hooks as Array> | undefined; - if (!hookArray?.[0]?.command) return false; - - const command = hookArray[0].command; - if (typeof command !== 'string') return false; - // Normalize path separators for cross-platform matching (Windows uses backslashes) - const normalizedCommand = command.replace(/\\/g, '/'); - return normalizedCommand.includes('.ccs/hooks/websearch-transformer'); + return isCcsWebSearchHook(h as Record); }); } -/** - * Check if a hook entry is a CCS WebSearch hook - */ -function isCcsWebSearchHook(hook: Record): boolean { - if (hook.matcher !== 'WebSearch') return false; - - const hookArray = hook.hooks as Array> | undefined; - if (!hookArray?.[0]?.command) return false; - - const command = hookArray[0].command; - if (typeof command !== 'string') return false; - // Normalize path separators for cross-platform matching (Windows uses backslashes) - const normalizedCommand = command.replace(/\\/g, '/'); - return normalizedCommand.includes('.ccs/hooks/websearch-transformer'); -} - -/** - * Remove duplicate CCS WebSearch hooks from settings, keeping only the first one - * Returns true if duplicates were removed - */ -function deduplicateCcsHooks(settings: Record): boolean { - const hooks = settings.hooks as Record | undefined; - if (!hooks?.PreToolUse) return false; - - let foundFirst = false; - const originalLength = hooks.PreToolUse.length; - - hooks.PreToolUse = hooks.PreToolUse.filter((h: unknown) => { - const hook = h as Record; - if (!isCcsWebSearchHook(hook)) return true; // Keep non-CCS hooks - - if (!foundFirst) { - foundFirst = true; - return true; // Keep first CCS hook - } - return false; // Remove subsequent duplicates - }); - - return hooks.PreToolUse.length < originalLength; -} - /** * Migrate CCS hook from global settings to profile settings (one-time) */