@codingame/monaco-vscode-chat-service-override 27.0.0 → 28.0.0

package/vscode/src/vs/workbench/contrib/chat/browser/promptSyntax/hookActions.js

@@ -14,17 +14,18 @@ import { Codicon } from '@codingame/monaco-vscode-api/vscode/vs/base/common/codi
 import { ContextKeyExpr } from '@codingame/monaco-vscode-api/vscode/vs/platform/contextkey/common/contextkey';
 import { PromptsStorage } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService';
 import { IPromptsService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/service/promptsService.service';
-import { PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
+import { Target, PromptsType } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/promptTypes';
 import { CancellationToken } from '@codingame/monaco-vscode-api/vscode/vs/base/common/cancellation';
 import { IQuickInputService } from '@codingame/monaco-vscode-api/vscode/vs/platform/quickinput/common/quickInput.service';
 import { IFileService } from '@codingame/monaco-vscode-api/vscode/vs/platform/files/common/files.service';
-import { getEffectiveCommandFieldKey, HOOK_TYPES } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
+import { HOOKS_BY_TARGET, HOOK_METADATA } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookTypes';
+import { formatHookCommandLabel, getEffectiveCommandFieldKey } from '@codingame/monaco-vscode-api/vscode/vs/workbench/contrib/chat/common/promptSyntax/hookSchema';
 import { resolveCopilotCliHookType, getCopilotCliHookTypeName } from '../../common/promptSyntax/hookCopilotCliCompat.js';
 import { getHookSourceFormat, HookSourceFormat, buildNewHookEntry } from '../../common/promptSyntax/hookCompatibility.js';
 import { getClaudeHookTypeName, resolveClaudeHookType } from '../../common/promptSyntax/hookClaudeCompat.js';
 import { ILabelService } from '@codingame/monaco-vscode-api/vscode/vs/platform/label/common/label.service';
 import { IEditorService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/editor/common/editorService.service';
-import { findHookCommandSelection, parseAllHookFiles } from './hookUtils.js';
+import { findHookCommandSelection, parseAllHookFiles, findHookCommandInYaml } from './hookUtils.js';
 import { IWorkspaceContextService } from '@codingame/monaco-vscode-api/vscode/vs/platform/workspace/common/workspace.service';
 import { IPathService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/path/common/pathService.service';
 import { INotificationService } from '@codingame/monaco-vscode-api/vscode/vs/platform/notification/common/notification.service';
@@ -33,7 +34,7 @@ import { IBulkEditService } from '@codingame/monaco-vscode-api/vscode/vs/editor/
 import { Range } from '@codingame/monaco-vscode-api/vscode/vs/editor/common/core/range';
 import { getCodeEditor } from '@codingame/monaco-vscode-api/vscode/vs/editor/browser/editorBrowser';
 import { IRemoteAgentService } from '@codingame/monaco-vscode-api/vscode/vs/workbench/services/remote/common/remoteAgentService.service';
-import { OS } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
+import { OS, OperatingSystem } from '@codingame/monaco-vscode-api/vscode/vs/base/common/platform';
 
 const CONFIGURE_HOOKS_ACTION_ID = "workbench.action.chat.configure.hooks";
 function usesCopilotCliNaming(hooksObj) {
@@ -73,7 +74,7 @@ async function addHookToFile(
             }
         } catch {
             notificationService.error(( localize(
-                6184,
+                6273,
                 "Failed to parse existing hooks file. Please fix the JSON syntax errors and try again."
             )));
             await editorService.openEditor({
@@ -156,7 +157,7 @@ async function addHookToFile(
                 range: ( new Range(1, 1, Number.MAX_SAFE_INTEGER, 1)),
                 text: jsonContent
             }))], {
-                label: ( localize(6185, "Add Hook"))
+                label: ( localize(6274, "Add Hook"))
             });
             const selection = findHookCommandSelection(jsonContent, keyToUse, newHookIndex, "command");
             await editorService.openEditor({
@@ -181,7 +182,7 @@ async function addHookToFile(
                 range: ( new Range(1, 1, Number.MAX_SAFE_INTEGER, 1)),
                 text: jsonContent
             }))], {
-                label: ( localize(6185, "Add Hook"))
+                label: ( localize(6274, "Add Hook"))
             });
         }
         const selection = findHookCommandSelection(jsonContent, keyToUse, newHookIndex, "command");
@@ -232,7 +233,7 @@ var Step;
     Step[Step["SelectFolder"] = 4] = "SelectFolder";
     Step[Step["EnterFilename"] = 5] = "EnterFilename";
 })(Step || (Step = {}));
-async function showConfigureHooksQuickPick(accessor, callbacks) {
+async function showConfigureHooksQuickPick(accessor, options) {
     const promptsService = accessor.get(IPromptsService);
     const quickInputService = accessor.get(IQuickInputService);
     const fileService = accessor.get(IFileService);
@@ -256,7 +257,9 @@ async function showConfigureHooksQuickPick(accessor, callbacks) {
         workspaceRootUri,
         userHome,
         targetOS,
-        CancellationToken.None
+        CancellationToken.None,
+        {
+            }
     );
     const hookCountByType = ( new Map());
     for (const entry of hookEntries) {
@@ -267,12 +270,6 @@ async function showConfigureHooksQuickPick(accessor, callbacks) {
         useSeparators: true
     }));
     const backButton = quickInputService.backButton;
-    let suppressHideDispose = false;
-    store.add(picker.onDidHide(() => {
-        if (!suppressHideDispose) {
-            store.dispose();
-        }
-    }));
     picker.show();
     let step = Step.SelectHookType;
     let selectedHookType;
@@ -281,315 +278,381 @@ async function showConfigureHooksQuickPick(accessor, callbacks) {
     let selectedFolder;
     const stepHistory = [];
     const goBack = () => stepHistory.pop();
-    while (true) {
-        switch (step) {
-        case Step.SelectHookType:
-            {
-                const hookTypeItems = ( HOOK_TYPES.map(hookType => {
-                    const count = hookCountByType.get(hookType.id) ?? 0;
-                    const countLabel = count > 0 ? ` (${count})` : "";
-                    return {
-                        label: `${hookType.label}${countLabel}`,
-                        description: hookType.description,
-                        hookType
+    try {
+        while (true) {
+            switch (step) {
+            case Step.SelectHookType:
+                {
+                    const makeItem = ([hookType, meta]) => {
+                        const count = hookCountByType.get(hookType) ?? 0;
+                        const countLabel = count > 0 ? ` (${count})` : "";
+                        return {
+                            label: `${meta.label}${countLabel}`,
+                            description: meta.description,
+                            hookType,
+                            hookTypeMeta: meta
+                        };
                     };
-                }));
-                picker.items = hookTypeItems;
-                picker.value = "";
-                picker.placeholder = ( localize(6186, "Select a lifecycle event"));
-                picker.title = ( localize(6187, "Hooks"));
-                picker.buttons = [];
-                const result = await awaitPick(picker, backButton);
-                if (!result || result === "back") {
-                    picker.hide();
-                    return;
-                }
-                selectedHookType = result;
-                stepHistory.push(Step.SelectHookType);
-                step = Step.SelectHook;
-                break;
-            }
-        case Step.SelectHook:
-            {
-                const hooksOfType = hookEntries.filter(h => h.hookType === selectedHookType.hookType.id);
-                const hookItems = [];
-                hookItems.push({
-                    label: `$(plus) ${( localize(6188, "Add new hook..."))}`,
-                    isAddNewHook: true,
-                    alwaysShow: true
-                });
-                if (hooksOfType.length > 0) {
-                    hookItems.push({
-                        type: "separator",
-                        label: ( localize(6189, "Existing Hooks"))
-                    });
-                    for (const entry of hooksOfType) {
-                        const description = labelService.getUriLabel(entry.fileUri, {
-                            relative: true
-                        });
-                        hookItems.push({
-                            label: entry.commandLabel,
-                            description,
-                            hookEntry: entry
-                        });
+                    let pickerItems;
+                    if (options?.target) {
+                        const targetHookTypes = ( new Set(( Object.values(HOOKS_BY_TARGET[options.target]))));
+                        pickerItems = ( Object.entries(HOOK_METADATA).filter(([hookType]) => ( targetHookTypes.has(hookType))).map(makeItem));
+                    } else {
+                        const vscodeTypes = ( new Set(( Object.values(HOOKS_BY_TARGET[Target.VSCode]))));
+                        const copilotTypes = ( new Set(( Object.values(HOOKS_BY_TARGET[Target.GitHubCopilot]))));
+                        const allEntries = Object.entries(HOOK_METADATA);
+                        const shared = allEntries.filter(([h]) => ( vscodeTypes.has(h)) && ( copilotTypes.has(h)));
+                        const vscodeOnly = allEntries.filter(([h]) => ( vscodeTypes.has(h)) && !( copilotTypes.has(h)));
+                        const copilotOnly = allEntries.filter(([h]) => !( vscodeTypes.has(h)) && ( copilotTypes.has(h)));
+                        pickerItems = [];
+                        if (shared.length > 0) {
+                            pickerItems.push({
+                                type: "separator",
+                                label: ( localize(6275, "Local/Copilot CLI Agents"))
+                            });
+                            pickerItems.push(...( shared.map(makeItem)));
+                        }
+                        if (vscodeOnly.length > 0) {
+                            pickerItems.push({
+                                type: "separator",
+                                label: ( localize(6276, "Local Agents"))
+                            });
+                            pickerItems.push(...( vscodeOnly.map(makeItem)));
+                        }
+                        if (copilotOnly.length > 0) {
+                            pickerItems.push({
+                                type: "separator",
+                                label: ( localize(6277, "Copilot CLI Agents"))
+                            });
+                            pickerItems.push(...( copilotOnly.map(makeItem)));
+                        }
                     }
-                }
-                if (hooksOfType.length === 0) {
-                    selectedHook = hookItems[0];
-                } else {
-                    picker.items = hookItems;
+                    picker.items = pickerItems;
                     picker.value = "";
-                    picker.placeholder = ( localize(6190, "Select a hook to open or add a new one"));
-                    picker.title = selectedHookType.hookType.label;
-                    picker.buttons = [backButton];
+                    picker.placeholder = ( localize(6278, "Select a lifecycle event"));
+                    picker.title = ( localize(6279, "Hooks"));
+                    picker.buttons = [];
                     const result = await awaitPick(picker, backButton);
-                    if (result === "back") {
-                        step = goBack() ?? Step.SelectHookType;
-                        break;
-                    }
-                    if (!result) {
-                        picker.hide();
+                    if (!result || result === "back") {
                         return;
                     }
-                    selectedHook = result;
-                    stepHistory.push(Step.SelectHook);
+                    selectedHookType = result;
+                    stepHistory.push(Step.SelectHookType);
+                    step = Step.SelectHook;
+                    break;
                 }
-                if (selectedHook.hookEntry) {
-                    const entry = selectedHook.hookEntry;
-                    let selection;
-                    const commandFieldName = getEffectiveCommandFieldKey(entry.command, targetOS);
-                    if (commandFieldName) {
-                        try {
-                            const content = await fileService.readFile(entry.fileUri);
-                            selection = findHookCommandSelection(( content.value.toString()), entry.originalHookTypeId, entry.index, commandFieldName);
-                        } catch {}
-                    }
-                    picker.hide();
-                    if (callbacks?.openEditor) {
-                        await callbacks.openEditor(entry.fileUri, {
-                            selection
+            case Step.SelectHook:
+                {
+                    const hooksOfType = hookEntries.filter(h => h.hookType === selectedHookType.hookType);
+                    const fileHooks = hooksOfType.filter(h => !h.agentName);
+                    const agentHooks = hooksOfType.filter(h => h.agentName);
+                    const hookItems = [];
+                    hookItems.push({
+                        label: `$(plus) ${( localize(6280, "Add new hook..."))}`,
+                        isAddNewHook: true,
+                        alwaysShow: true
+                    });
+                    if (fileHooks.length > 0) {
+                        hookItems.push({
+                            type: "separator",
+                            label: ( localize(6281, "Existing Hooks"))
                         });
+                        for (const entry of fileHooks) {
+                            const description = labelService.getUriLabel(entry.fileUri, {
+                                relative: true
+                            });
+                            hookItems.push({
+                                label: entry.commandLabel,
+                                description,
+                                hookEntry: entry
+                            });
+                        }
+                    }
+                    if (agentHooks.length > 0) {
+                        const agentNames = [...( new Set(( agentHooks.map(h => h.agentName))))];
+                        for (const agentName of agentNames) {
+                            hookItems.push({
+                                type: "separator",
+                                label: ( localize(6282, "Agent: {0}", agentName))
+                            });
+                            for (const entry of agentHooks.filter(h => h.agentName === agentName)) {
+                                const description = labelService.getUriLabel(entry.fileUri, {
+                                    relative: true
+                                });
+                                hookItems.push({
+                                    label: entry.commandLabel,
+                                    description,
+                                    hookEntry: entry
+                                });
+                            }
+                        }
+                    }
+                    if (hooksOfType.length === 0) {
+                        selectedHook = hookItems[0];
                     } else {
-                        await editorService.openEditor({
-                            resource: entry.fileUri,
-                            options: {
-                                selection,
-                                pinned: false
+                        picker.items = hookItems;
+                        picker.value = "";
+                        picker.placeholder = ( localize(6283, "Select a hook to open or add a new one"));
+                        picker.title = selectedHookType.hookTypeMeta.label;
+                        picker.buttons = [backButton];
+                        const result = await awaitPick(picker, backButton);
+                        if (result === "back") {
+                            step = goBack() ?? Step.SelectHookType;
+                            break;
+                        }
+                        if (!result) {
+                            return;
+                        }
+                        selectedHook = result;
+                        stepHistory.push(Step.SelectHook);
+                    }
+                    if (selectedHook.hookEntry) {
+                        const entry = selectedHook.hookEntry;
+                        let selection;
+                        if (entry.agentName) {
+                            try {
+                                const content = await fileService.readFile(entry.fileUri);
+                                const commandText = formatHookCommandLabel(entry.command, targetOS);
+                                if (commandText) {
+                                    selection = findHookCommandInYaml(( content.value.toString()), commandText);
+                                }
+                            } catch {}
+                        } else {
+                            const commandFieldName = getEffectiveCommandFieldKey(entry.command, targetOS);
+                            if (commandFieldName) {
+                                try {
+                                    const content = await fileService.readFile(entry.fileUri);
+                                    selection = findHookCommandSelection(( content.value.toString()), entry.originalHookTypeId, entry.index, commandFieldName);
+                                } catch {}
                             }
-                        });
+                        }
+                        if (options?.openEditor) {
+                            await options.openEditor(entry.fileUri, {
+                                selection
+                            });
+                        } else {
+                            await editorService.openEditor({
+                                resource: entry.fileUri,
+                                options: {
+                                    selection,
+                                    pinned: false
+                                }
+                            });
+                        }
+                        return;
                     }
-                    return;
+                    step = Step.SelectFile;
+                    break;
                 }
-                step = Step.SelectFile;
-                break;
-            }
-        case Step.SelectFile:
-            {
-                const hookFiles = await promptsService.listPromptFilesForStorage(PromptsType.hook, PromptsStorage.local, CancellationToken.None);
-                const fileItems = [];
-                fileItems.push({
-                    label: `$(new-file) ${( localize(6191, "Create new hook config file..."))}`,
-                    isCreateNewFile: true,
-                    alwaysShow: true
-                });
-                if (hookFiles.length > 0) {
+            case Step.SelectFile:
+                {
+                    const hookFiles = await promptsService.listPromptFilesForStorage(PromptsType.hook, PromptsStorage.local, CancellationToken.None);
+                    const fileItems = [];
                     fileItems.push({
-                        type: "separator",
-                        label: ( localize(6192, "Existing Hook Files"))
+                        label: `$(new-file) ${( localize(6284, "Create new hook config file..."))}`,
+                        isCreateNewFile: true,
+                        alwaysShow: true
                     });
-                    for (const hookFile of hookFiles) {
-                        const relativePath = labelService.getUriLabel(hookFile.uri, {
-                            relative: true
-                        });
+                    if (hookFiles.length > 0) {
                         fileItems.push({
-                            label: relativePath,
-                            fileUri: hookFile.uri
+                            type: "separator",
+                            label: ( localize(6285, "Existing Hook Files"))
                         });
+                        for (const hookFile of hookFiles) {
+                            const relativePath = labelService.getUriLabel(hookFile.uri, {
+                                relative: true
+                            });
+                            fileItems.push({
+                                label: relativePath,
+                                fileUri: hookFile.uri
+                            });
+                        }
                     }
-                }
-                if (hookFiles.length === 0) {
-                    selectedFile = fileItems[0];
-                } else {
-                    picker.items = fileItems;
-                    picker.value = "";
-                    picker.placeholder = ( localize(6193, "Select a hook file or create a new one"));
-                    picker.title = ( localize(6194, "Add Hook"));
-                    picker.buttons = [backButton];
-                    const result = await awaitPick(picker, backButton);
-                    if (result === "back") {
-                        step = goBack() ?? Step.SelectHook;
-                        break;
+                    if (hookFiles.length === 0) {
+                        selectedFile = fileItems[0];
+                    } else {
+                        picker.items = fileItems;
+                        picker.value = "";
+                        picker.placeholder = ( localize(6286, "Select a hook file or create a new one"));
+                        picker.title = ( localize(6287, "Add Hook"));
+                        picker.buttons = [backButton];
+                        const result = await awaitPick(picker, backButton);
+                        if (result === "back") {
+                            step = goBack() ?? Step.SelectHook;
+                            break;
+                        }
+                        if (!result) {
+                            return;
+                        }
+                        selectedFile = result;
+                        stepHistory.push(Step.SelectFile);
                     }
-                    if (!result) {
-                        picker.hide();
+                    if (selectedFile.fileUri) {
+                        await addHookToFile(
+                            selectedFile.fileUri,
+                            selectedHookType.hookType,
+                            fileService,
+                            editorService,
+                            notificationService,
+                            bulkEditService,
+                            options?.openEditor
+                        );
                         return;
                     }
-                    selectedFile = result;
-                    stepHistory.push(Step.SelectFile);
-                }
-                if (selectedFile.fileUri) {
-                    picker.hide();
-                    await addHookToFile(
-                        selectedFile.fileUri,
-                        selectedHookType.hookType.id,
-                        fileService,
-                        editorService,
-                        notificationService,
-                        bulkEditService,
-                        callbacks?.openEditor
-                    );
-                    return;
-                }
-                step = Step.SelectFolder;
-                break;
-            }
-        case Step.SelectFolder:
-            {
-                const allFolders = await promptsService.getSourceFolders(PromptsType.hook);
-                const localFolders = allFolders.filter(f => f.storage === PromptsStorage.local);
-                if (localFolders.length === 0) {
-                    picker.hide();
-                    notificationService.error(( localize(6195, "Please open a workspace folder to configure hooks.")));
-                    return;
+                    step = Step.SelectFolder;
+                    break;
                 }
-                selectedFolder = localFolders[0];
-                if (localFolders.length > 1) {
-                    const folderItems = ( localFolders.map(folder => ({
-                        label: labelService.getUriLabel(folder.uri, {
-                            relative: true
-                        }),
-                        folder
-                    })));
-                    picker.items = folderItems;
-                    picker.value = "";
-                    picker.placeholder = ( localize(6196, "Select a location for the hook file"));
-                    picker.title = ( localize(6197, "Hook File Location"));
-                    picker.buttons = [backButton];
-                    const result = await awaitPick(picker, backButton);
-                    if (result === "back") {
-                        step = goBack() ?? Step.SelectFile;
-                        break;
-                    }
-                    if (!result) {
-                        picker.hide();
+            case Step.SelectFolder:
+                {
+                    const allFolders = await promptsService.getSourceFolders(PromptsType.hook);
+                    const localFolders = allFolders.filter(f => f.storage === PromptsStorage.local);
+                    if (localFolders.length === 0) {
+                        notificationService.error(( localize(6288, "Please open a workspace folder to configure hooks.")));
                         return;
                     }
-                    selectedFolder = result.folder;
-                    stepHistory.push(Step.SelectFolder);
-                }
-                step = Step.EnterFilename;
-                break;
-            }
-        case Step.EnterFilename:
-            {
-                suppressHideDispose = true;
-                picker.hide();
-                suppressHideDispose = false;
-                const fileNameResult = await ( new Promise(resolve => {
-                    let resolved = false;
-                    const done = value => {
-                        if (!resolved) {
-                            resolved = true;
-                            inputDisposables.dispose();
-                            resolve(value);
+                    selectedFolder = localFolders[0];
+                    if (localFolders.length > 1) {
+                        const folderItems = ( localFolders.map(folder => ({
+                            label: labelService.getUriLabel(folder.uri, {
+                                relative: true
+                            }),
+                            folder
+                        })));
+                        picker.items = folderItems;
+                        picker.value = "";
+                        picker.placeholder = ( localize(6289, "Select a location for the hook file"));
+                        picker.title = ( localize(6290, "Hook File Location"));
+                        picker.buttons = [backButton];
+                        const result = await awaitPick(picker, backButton);
+                        if (result === "back") {
+                            step = goBack() ?? Step.SelectFile;
+                            break;
                         }
-                    };
-                    const inputDisposables = ( new DisposableStore());
-                    const inputBox = inputDisposables.add(quickInputService.createInputBox());
-                    inputBox.prompt = ( localize(6198, "Enter hook file name"));
-                    inputBox.placeholder = ( localize(6199, "e.g., hooks, diagnostics, security"));
-                    inputBox.title = ( localize(6200, "Hook File Name"));
-                    inputBox.buttons = [backButton];
-                    inputBox.ignoreFocusOut = true;
-                    inputDisposables.add(inputBox.onDidAccept(async () => {
-                        const value = inputBox.value;
-                        if (!value || !value.trim()) {
-                            inputBox.validationMessage = ( localize(6201, "File name is required"));
+                        if (!result) {
                             return;
                         }
-                        const name = value.trim();
-                        if (/[/\\:*?"<>|]/.test(name)) {
-                            inputBox.validationMessage = ( localize(6202, "File name contains invalid characters"));
-                            return;
-                        }
-                        done(name);
-                    }));
-                    inputDisposables.add(inputBox.onDidChangeValue(() => {
-                        inputBox.validationMessage = undefined;
-                    }));
-                    inputDisposables.add(inputBox.onDidTriggerButton(button => {
-                        if (button === backButton) {
-                            done("back");
-                        }
-                    }));
-                    inputDisposables.add(inputBox.onDidHide(() => {
-                        done(undefined);
-                    }));
-                    inputBox.show();
-                }));
-                if (fileNameResult === "back") {
-                    picker.show();
-                    step = goBack() ?? Step.SelectFolder;
+                        selectedFolder = result.folder;
+                        stepHistory.push(Step.SelectFolder);
+                    }
+                    step = Step.EnterFilename;
                     break;
                 }
-                if (!fileNameResult) {
-                    store.dispose();
-                    return;
-                }
-                await fileService.createFolder(selectedFolder.uri);
-                const hookFileName = fileNameResult.endsWith(".json") ? fileNameResult : `${fileNameResult}.json`;
-                const hookFileUri = URI.joinPath(selectedFolder.uri, hookFileName);
-                if (await fileService.exists(hookFileUri)) {
-                    store.dispose();
-                    await addHookToFile(
-                        hookFileUri,
-                        selectedHookType.hookType.id,
-                        fileService,
-                        editorService,
-                        notificationService,
-                        bulkEditService,
-                        callbacks?.openEditor
-                    );
-                    return;
-                }
-                const newFileFormat = getHookSourceFormat(hookFileUri);
-                const isClaudeNewFile = newFileFormat === HookSourceFormat.Claude;
-                const hookTypeKey = isClaudeNewFile ? (getClaudeHookTypeName(selectedHookType.hookType.id) ?? selectedHookType.hookType.id) : selectedHookType.hookType.id;
-                const newFileHookEntry = buildNewHookEntry(newFileFormat);
-                const hooksContent = {
-                    hooks: {
-                        [hookTypeKey]: [newFileHookEntry]
+            case Step.EnterFilename:
+                {
+                    picker.hide();
+                    const fileNameResult = await ( new Promise(resolve => {
+                        let resolved = false;
+                        const done = value => {
+                            if (!resolved) {
+                                resolved = true;
+                                inputDisposables.dispose();
+                                resolve(value);
+                            }
+                        };
+                        const inputDisposables = ( new DisposableStore());
+                        const inputBox = inputDisposables.add(quickInputService.createInputBox());
+                        inputBox.prompt = ( localize(6291, "Enter hook file name"));
+                        inputBox.placeholder = ( localize(6292, "e.g., hooks, diagnostics, security"));
+                        inputBox.title = ( localize(6293, "Hook File Name"));
+                        inputBox.buttons = [backButton];
+                        inputBox.ignoreFocusOut = true;
+                        inputDisposables.add(inputBox.onDidAccept(async () => {
+                            const value = inputBox.value;
+                            if (!value || !value.trim()) {
+                                inputBox.validationMessage = ( localize(6294, "File name is required"));
+                                return;
+                            }
+                            const name = value.trim();
+                            if (/[/\\:*?"<>|]/.test(name)) {
+                                inputBox.validationMessage = ( localize(6295, "File name contains invalid characters"));
+                                return;
+                            }
+                            done(name);
+                        }));
+                        inputDisposables.add(inputBox.onDidChangeValue(() => {
+                            inputBox.validationMessage = undefined;
+                        }));
+                        inputDisposables.add(inputBox.onDidTriggerButton(button => {
+                            if (button === backButton) {
+                                done("back");
+                            }
+                        }));
+                        inputDisposables.add(inputBox.onDidHide(() => {
+                            done(undefined);
+                        }));
+                        inputBox.show();
+                    }));
+                    if (fileNameResult === "back") {
+                        picker.show();
+                        step = goBack() ?? Step.SelectFolder;
+                        break;
                     }
-                };
-                const jsonContent = JSON.stringify(hooksContent, null, "\t");
-                await fileService.writeFile(hookFileUri, VSBuffer.fromString(jsonContent));
-                callbacks?.onHookFileCreated?.(hookFileUri);
-                const selection = findHookCommandSelection(jsonContent, hookTypeKey, 0, "command");
-                store.dispose();
-                if (callbacks?.openEditor) {
-                    await callbacks.openEditor(hookFileUri, {
-                        selection
-                    });
-                } else {
-                    await editorService.openEditor({
-                        resource: hookFileUri,
-                        options: {
-                            selection,
-                            pinned: false
+                    if (!fileNameResult) {
+                        return;
+                    }
+                    await fileService.createFolder(selectedFolder.uri);
+                    const hookFileName = fileNameResult.endsWith(".json") ? fileNameResult : `${fileNameResult}.json`;
+                    const hookFileUri = URI.joinPath(selectedFolder.uri, hookFileName);
+                    if (await fileService.exists(hookFileUri)) {
+                        await addHookToFile(
+                            hookFileUri,
+                            selectedHookType.hookType,
+                            fileService,
+                            editorService,
+                            notificationService,
+                            bulkEditService,
+                            options?.openEditor
+                        );
+                        return;
+                    }
+                    const newFileFormat = getHookSourceFormat(hookFileUri);
+                    const isClaudeNewFile = newFileFormat === HookSourceFormat.Claude;
+                    const isCopilotCliOnly = !isClaudeNewFile && !( ( new Set(( Object.values(HOOKS_BY_TARGET[Target.VSCode])))).has(selectedHookType.hookType)) && ( ( new Set(( Object.values(HOOKS_BY_TARGET[Target.GitHubCopilot])))).has(selectedHookType.hookType));
+                    const hookTypeKey = isClaudeNewFile ? (getClaudeHookTypeName(selectedHookType.hookType) ?? selectedHookType.hookType) : isCopilotCliOnly ? (getCopilotCliHookTypeName(selectedHookType.hookType) ?? selectedHookType.hookType) : selectedHookType.hookType;
+                    const newFileHookEntry = isCopilotCliOnly ? {
+                        type: "command",
+                        [targetOS === OperatingSystem.Windows ? "powershell" : "bash"]: ""
+                    } : buildNewHookEntry(newFileFormat);
+                    const commandFieldKey = isCopilotCliOnly ? (targetOS === OperatingSystem.Windows ? "powershell" : "bash") : "command";
+                    const hooksContent = {
+                        ...(isCopilotCliOnly ? {
+                            version: 1
+                        } : {}),
+                        hooks: {
+                            [hookTypeKey]: [newFileHookEntry]
                         }
-                    });
+                    };
+                    const jsonContent = JSON.stringify(hooksContent, null, "\t");
+                    await fileService.writeFile(hookFileUri, VSBuffer.fromString(jsonContent));
+                    options?.onHookFileCreated?.(hookFileUri);
+                    const selection = findHookCommandSelection(jsonContent, hookTypeKey, 0, commandFieldKey);
+                    if (options?.openEditor) {
+                        await options.openEditor(hookFileUri, {
+                            selection
+                        });
+                    } else {
+                        await editorService.openEditor({
+                            resource: hookFileUri,
+                            options: {
+                                selection,
+                                pinned: false
+                            }
+                        });
+                    }
+                    return;
                 }
-                return;
             }
         }
+    } finally {
+        store.dispose();
     }
 }
 class ManageHooksAction extends Action2 {
     constructor() {
         super({
             id: CONFIGURE_HOOKS_ACTION_ID,
-            title: ( localize2(6203, "Configure Hooks...")),
-            shortTitle: ( localize2(6204, "Hooks")),
+            title: ( localize2(6296, "Configure Hooks...")),
+            shortTitle: ( localize2(6297, "Hooks")),
             icon: Codicon.zap,
             f1: true,
             precondition: ChatContextKeys.enabled,