@qduc/term2 0.7.3 → 0.9.0

package/dist/hooks/use-provider-selection.js

@@ -1,46 +1,10 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useInputContext } from '../context/InputContext.js';
-import { getAllProviders, upsertProvider, unregisterProvider } from '../providers/index.js';
-import { createOpenAICompatibleProviderDefinition } from '../providers/openai-compatible-lazy.js';
 import { useSelection } from './use-selection.js';
-const PROVIDER_TYPES = [
-    'openai-compatible',
-    'openai',
-    'llama.cpp',
-    'anthropic',
-    'google',
-    'opencode',
-];
-const PROVIDER_NAME_REGEX = /^[a-zA-Z0-9][-a-zA-Z0-9_.]*$/;
+import { PROVIDER_TYPES, loadProviderItems as loadProviderItemsFromService, saveProvider as saveProviderToService, deleteCustomProvider as deleteCustomProviderFromService, validateWizardName, validateWizardUrl, isProviderBuiltIn, getProviderLabel, } from '../providers/provider-service.js';
 const DELETE_CONFIRM_DEFAULT_INDEX = 1;
-const getConfiguredProviderNames = (settingsService) => {
-    const names = new Set();
-    for (const provider of getAllProviders()) {
-        names.add(provider.id);
-    }
-    const configured = settingsService.get('providers') || [];
-    for (const provider of configured) {
-        if (provider && provider.name) {
-            names.add(String(provider.name));
-        }
-    }
-    return names;
-};
-const hasProviderNameConflict = (settingsService, candidate, currentName) => {
-    if (!candidate)
-        return false;
-    const normalizedCandidate = candidate.trim();
-    if (!normalizedCandidate)
-        return false;
-    for (const name of getConfiguredProviderNames(settingsService)) {
-        if (name === normalizedCandidate && name !== currentName) {
-            return true;
-        }
-    }
-    return false;
-};
 export const useProviderSelection = (settingsService) => {
-    const { mode, setMode } = useInputContext();
+    const { mode, setMode, setInput, replaceInput } = useInputContext();
     const [phase, setPhase] = useState('list');
     const [items, setItems] = useState([]);
     const [draft, setDraft] = useState(null);
@@ -51,6 +15,7 @@ export const useProviderSelection = (settingsService) => {
     const [discardFromPhase, setDiscardFromPhase] = useState(null);
     const [draftModified, setDraftModified] = useState(false);
     const [scrollOffset, setScrollOffset] = useState(0);
+    const [reorderList, setReorderList] = useState([]);
     const activeItems = useMemo(() => {
         switch (phase) {
             case 'list':
@@ -63,14 +28,14 @@ export const useProviderSelection = (settingsService) => {
                         isCustom: i.isCustom,
                     })),
                     { kind: 'add-provider', label: 'Add Custom Provider' },
+                    { kind: 'action', label: 'Reorder Providers' },
                 ];
             case 'wizard_type':
                 return PROVIDER_TYPES.map((type) => ({ kind: 'type', label: type }));
             case 'edit_fields': {
                 if (!draft)
                     return [];
-                const providerDef = editingOriginalName ? getAllProviders().find((p) => p.id === editingOriginalName) : null;
-                const isEditingBuiltIn = providerDef ? !providerDef.isRuntimeDefined : false;
+                const isEditingBuiltIn = editingOriginalName ? isProviderBuiltIn(editingOriginalName) : false;
                 if (isEditingBuiltIn) {
                     return [
                         { kind: 'field', label: `Name: ${draft.name || '<empty>'} (Built-in)`, fieldKey: 'name' },
@@ -114,10 +79,18 @@ export const useProviderSelection = (settingsService) => {
                     { kind: 'action', label: 'Yes, delete this provider', tone: 'destructive' },
                     { kind: 'action', label: 'No, keep it' },
                 ];
+            case 'reorder':
+                return [
+                    ...reorderList.map((id) => ({
+                        kind: 'reorder-item',
+                        id,
+                        label: getProviderLabel(id) ?? id,
+                    })),
+                ];
             default:
                 return [];
         }
-    }, [phase, items, draft, editingOriginalName]);
+    }, [phase, items, draft, editingOriginalName, reorderList]);
     const checkIsInactive = useCallback((item) => {
         return item.kind === 'provider' && item.id === 'codex';
     }, []);
@@ -126,60 +99,27 @@ export const useProviderSelection = (settingsService) => {
     });
     // Reset scrollOffset when phase changes
     useEffect(() => {
-        setScrollOffset(0);
+        setScrollOffset(0); // eslint-disable-line react-hooks/set-state-in-effect
     }, [phase]);
     // Sync scrollOffset with selectedIndex
     useEffect(() => {
         if (selectedIndex < scrollOffset) {
-            setScrollOffset(selectedIndex);
+            setScrollOffset(selectedIndex); // eslint-disable-line react-hooks/set-state-in-effect
         }
         else if (selectedIndex >= scrollOffset + 10) {
             setScrollOffset(selectedIndex - 10 + 1);
         }
     }, [selectedIndex, scrollOffset]);
     const isOpen = mode === 'provider_selection';
-    // Load registered providers
-    const loadProviders = useCallback(() => {
-        const all = getAllProviders();
-        const customList = settingsService.get('providers') || [];
-        const activeProvider = settingsService.get('agent.provider') || 'openai';
-        // Start with built-ins from registry
-        const providerItems = all
-            .filter((p) => !p.isRuntimeDefined) // filter out custom ones from all to avoid duplicates
-            .map((p) => ({
-            id: p.id,
-            label: p.label,
-            isCustom: false,
-            isActive: p.id === activeProvider,
-        }));
-        // Add custom providers from settings
-        for (const c of customList) {
-            if (c && c.name) {
-                if (!providerItems.some((p) => p.id === c.name)) {
-                    providerItems.push({
-                        id: c.name,
-                        label: c.name,
-                        isCustom: true,
-                        isActive: c.name === activeProvider,
-                    });
-                }
-            }
-        }
-        // Make sure active provider is marked correctly even if not in all list
-        if (!providerItems.some((p) => p.id === activeProvider)) {
-            providerItems.push({
-                id: activeProvider,
-                label: activeProvider,
-                isCustom: customList.some((c) => c && c.name === activeProvider),
-                isActive: true,
-            });
-        }
-        setItems(providerItems);
+    // Load provider items from service
+    const loadProviderList = useCallback(() => {
+        setItems(loadProviderItemsFromService(settingsService));
     }, [settingsService]);
-    // Sync list of providers on open
+    // Sync list of providers on open — resets wizard state when the menu opens.
     useEffect(() => {
+        /* eslint-disable react-hooks/set-state-in-effect */
         if (isOpen) {
-            loadProviders();
+            loadProviderList();
             setPhase('list');
             setSelectedIndex(0);
             setDraft(null);
@@ -190,7 +130,8 @@ export const useProviderSelection = (settingsService) => {
             setDiscardFromPhase(null);
             setDraftModified(false);
         }
-    }, [isOpen, loadProviders]);
+        /* eslint-enable react-hooks/set-state-in-effect */
+    }, [isOpen, loadProviderList, setSelectedIndex]);
     const open = useCallback(() => {
         setMode('provider_selection');
     }, [setMode]);
@@ -206,11 +147,28 @@ export const useProviderSelection = (settingsService) => {
     const moveDown = useCallback(() => {
         selectionMoveDown();
     }, [selectionMoveDown]);
-    const getListCount = () => {
-        return activeItems.length;
-    };
+    const saveDraft = useCallback(() => {
+        if (!draft)
+            return;
+        setErrorMessage(null);
+        setFieldErrors({});
+        const result = saveProviderToService(settingsService, draft, editingOriginalName);
+        if (!result.success) {
+            if (result.errorMessage)
+                setErrorMessage(result.errorMessage);
+            if (result.fieldErrors)
+                setFieldErrors(result.fieldErrors);
+            return;
+        }
+        loadProviderList();
+        setPhase('list');
+        setSelectedIndex(0);
+        setDraft(null);
+        setEditingOriginalName(null);
+        setFieldErrors({});
+    }, [draft, editingOriginalName, settingsService, loadProviderList, setSelectedIndex]);
     const selectItem = useCallback(() => {
-        const listCount = getListCount();
+        const listCount = activeItems.length;
         if (listCount === 0)
             return;
         const index = Math.min(selectedIndex, listCount - 1);
@@ -228,6 +186,32 @@ export const useProviderSelection = (settingsService) => {
                 });
                 setPhase('wizard_name');
                 setSelectedIndex(0);
+                setInput('');
+            }
+            else if (index === items.length + 1) {
+                // "Reorder Providers" selected
+                const providerOrder = settingsService.get('providerOrder') ?? [];
+                const allIds = items.map((i) => i.id);
+                const orderedIds = providerOrder.length > 0
+                    ? (() => {
+                        const orderIndex = new Map();
+                        providerOrder.forEach((id, idx) => orderIndex.set(id, idx));
+                        return [...allIds].sort((a, b) => {
+                            const aI = orderIndex.get(a);
+                            const bI = orderIndex.get(b);
+                            if (aI !== undefined && bI !== undefined)
+                                return aI - bI;
+                            if (aI !== undefined)
+                                return -1;
+                            if (bI !== undefined)
+                                return 1;
+                            return 0;
+                        });
+                    })()
+                    : allIds;
+                setReorderList(orderedIds);
+                setPhase('reorder');
+                setSelectedIndex(0);
             }
             else {
                 // Provider selected
@@ -259,6 +243,7 @@ export const useProviderSelection = (settingsService) => {
                     setFieldErrors({});
                     setPhase('edit_fields');
                     setSelectedIndex(0);
+                    setInput('');
                 }
                 else if (provider.id !== 'codex') {
                     // Allow editing apiKey for built-in providers (except Codex)
@@ -274,6 +259,7 @@ export const useProviderSelection = (settingsService) => {
                     setEditingOriginalName(provider.id);
                     setPhase('edit_fields');
                     setSelectedIndex(2);
+                    setInput('');
                 }
             }
         }
@@ -300,14 +286,14 @@ export const useProviderSelection = (settingsService) => {
         else if (phase === 'edit_fields') {
             if (!draft)
                 return;
-            const providerDef = editingOriginalName ? getAllProviders().find((p) => p.id === editingOriginalName) : null;
-            const isEditingBuiltIn = providerDef ? !providerDef.isRuntimeDefined : false;
+            const isEditingBuiltIn = editingOriginalName ? isProviderBuiltIn(editingOriginalName) : false;
             if (isEditingBuiltIn) {
                 if (index === 2) {
                     // Edit API Key
                     setEditingField('apiKey');
                     setDraftModified(false);
                     setPhase('wizard_key');
+                    replaceInput(draft.apiKey || '');
                 }
                 else if (index === 3) {
                     // Save Changes
@@ -320,6 +306,7 @@ export const useProviderSelection = (settingsService) => {
                     setDraft(null);
                     setEditingOriginalName(null);
                     setFieldErrors({});
+                    setInput('');
                 }
             }
             else {
@@ -328,6 +315,7 @@ export const useProviderSelection = (settingsService) => {
                     setEditingField('name');
                     setDraftModified(false);
                     setPhase('wizard_name');
+                    replaceInput(draft.name || '');
                 }
                 else if (index === 1) {
                     // Edit Type
@@ -335,18 +323,21 @@ export const useProviderSelection = (settingsService) => {
                     setDraftModified(false);
                     setPhase('wizard_type');
                     setSelectedIndex(PROVIDER_TYPES.indexOf(draft.type));
+                    setInput('');
                 }
                 else if (index === 2) {
                     // Edit Base URL
                     setEditingField('baseUrl');
                     setDraftModified(false);
                     setPhase('wizard_url');
+                    replaceInput(draft.baseUrl || '');
                 }
                 else if (index === 3) {
                     // Edit API Key
                     setEditingField('apiKey');
                     setDraftModified(false);
                     setPhase('wizard_key');
+                    replaceInput(draft.apiKey || '');
                 }
                 else if (index === 4) {
                     // Save Changes
@@ -358,16 +349,21 @@ export const useProviderSelection = (settingsService) => {
                     setSelectedIndex(0);
                     setDraft(null);
                     setFieldErrors({});
+                    setInput('');
                 }
             }
         }
+        else if (phase === 'reorder') {
+            // Enter saves the current order
+            settingsService.setPersistent('providerOrder', reorderList);
+            setPhase('list');
+            setSelectedIndex(0);
+            setReorderList([]);
+        }
         else if (phase === 'confirm_discard') {
-            if (!discardFromPhase)
-                return;
             if (index === 0) {
                 setDraftModified(false);
-                const providerDef = editingOriginalName ? getAllProviders().find((p) => p.id === editingOriginalName) : null;
-                const isEditingBuiltIn = providerDef ? !providerDef.isRuntimeDefined : false;
+                const isEditingBuiltIn = editingOriginalName ? isProviderBuiltIn(editingOriginalName) : false;
                 if (discardFromPhase === 'wizard_name') {
                     if (editingField !== null) {
                         setPhase('edit_fields');
@@ -427,16 +423,8 @@ export const useProviderSelection = (settingsService) => {
             if (index === 0) {
                 // Yes, delete
                 if (editingOriginalName) {
-                    const list = settingsService.get('providers') || [];
-                    const updated = list.filter((p) => p && p.name !== editingOriginalName);
-                    settingsService.setPersistent('providers', updated);
-                    unregisterProvider(editingOriginalName);
-                    // If active provider was deleted, fallback
-                    const activeProvider = settingsService.get('agent.provider');
-                    if (activeProvider === editingOriginalName) {
-                        settingsService.set('agent.provider', 'openai');
-                    }
-                    loadProviders();
+                    deleteCustomProviderFromService(settingsService, editingOriginalName);
+                    loadProviderList();
                 }
                 setPhase('list');
                 setSelectedIndex(0);
@@ -458,10 +446,16 @@ export const useProviderSelection = (settingsService) => {
         editingField,
         discardFromPhase,
         settingsService,
-        loadProviders,
+        loadProviderList,
+        setInput,
+        reorderList,
+        saveDraft,
+        activeItems,
+        setSelectedIndex,
     ]);
     const goBack = useCallback(() => {
         setErrorMessage(null);
+        setInput('');
         if (phase === 'list') {
             close();
         }
@@ -507,8 +501,7 @@ export const useProviderSelection = (settingsService) => {
         else if (phase === 'wizard_key') {
             if (editingField) {
                 setPhase('edit_fields');
-                const providerDef = editingOriginalName ? getAllProviders().find((p) => p.id === editingOriginalName) : null;
-                const isEditingBuiltIn = providerDef ? !providerDef.isRuntimeDefined : false;
+                const isEditingBuiltIn = editingOriginalName ? isProviderBuiltIn(editingOriginalName) : false;
                 setSelectedIndex(isEditingBuiltIn ? 2 : 3);
                 setEditingField(null);
             }
@@ -524,6 +517,11 @@ export const useProviderSelection = (settingsService) => {
             setDraft(null);
             setEditingOriginalName(null);
         }
+        else if (phase === 'reorder') {
+            setPhase('list');
+            setSelectedIndex(0);
+            setReorderList([]);
+        }
         else if (phase === 'confirm_delete') {
             setPhase('list');
             setSelectedIndex(0);
@@ -536,25 +534,15 @@ export const useProviderSelection = (settingsService) => {
             }
             setDiscardFromPhase(null);
         }
-    }, [phase, editingField, close, draftModified, discardFromPhase, draft]);
+    }, [phase, editingField, close, draftModified, discardFromPhase, setInput, editingOriginalName, setSelectedIndex]);
     // Handler for text input submissions from app.tsx wizard manager
     const handleTextInputSubmit = useCallback((value) => {
         setErrorMessage(null);
         const val = value.trim();
         if (phase === 'wizard_name') {
-            if (!val) {
-                setErrorMessage('Name cannot be empty.');
-                return false;
-            }
-            if (!PROVIDER_NAME_REGEX.test(val)) {
-                setErrorMessage('Name must start with a letter or number and contain only letters, numbers, hyphens, underscores, and dots.');
-                return false;
-            }
-            // Check for name conflict
-            const isRename = editingField !== null;
-            const originalName = isRename ? editingOriginalName ?? undefined : undefined;
-            if (hasProviderNameConflict(settingsService, val, originalName)) {
-                setErrorMessage(`Provider with name '${val}' already exists.`);
+            const nameValidation = validateWizardName(val, settingsService, editingField !== null, editingOriginalName ?? undefined);
+            if (!nameValidation.valid) {
+                setErrorMessage(nameValidation.errorMessage);
                 return false;
             }
             if (draft) {
@@ -573,24 +561,16 @@ export const useProviderSelection = (settingsService) => {
                     setSelectedIndex(0);
                 }
             }
+            setInput('');
             return true;
         }
         if (phase === 'wizard_url') {
             const type = draft?.type || 'openai-compatible';
-            const baseUrlRequired = type === 'openai' || type === 'openai-compatible' || type === 'llama.cpp';
-            if (baseUrlRequired && !val) {
-                setErrorMessage(`Base URL is required for provider type '${type}'.`);
+            const urlValidation = validateWizardUrl(val, type);
+            if (!urlValidation.valid) {
+                setErrorMessage(urlValidation.errorMessage);
                 return false;
             }
-            if (val) {
-                try {
-                    new URL(val);
-                }
-                catch {
-                    setErrorMessage('Invalid URL format. Make sure it starts with http:// or https://');
-                    return false;
-                }
-            }
             if (draft) {
                 const updatedDraft = { ...draft, baseUrl: val || undefined };
                 setDraft(updatedDraft);
@@ -607,6 +587,7 @@ export const useProviderSelection = (settingsService) => {
                     setSelectedIndex(0);
                 }
             }
+            setInput('');
             return true;
         }
         if (phase === 'wizard_key') {
@@ -614,8 +595,7 @@ export const useProviderSelection = (settingsService) => {
                 const updatedDraft = { ...draft, apiKey: val || undefined };
                 setDraft(updatedDraft);
                 setDraftModified(true);
-                const providerDef = editingOriginalName ? getAllProviders().find((p) => p.id === editingOriginalName) : null;
-                const isEditingBuiltIn = providerDef ? !providerDef.isRuntimeDefined : false;
+                const isEditingBuiltIn = editingOriginalName ? isProviderBuiltIn(editingOriginalName) : false;
                 if (editingField) {
                     setFieldErrors({});
                     setDraftModified(false);
@@ -631,101 +611,11 @@ export const useProviderSelection = (settingsService) => {
                     setDraftModified(false);
                 }
             }
+            setInput('');
             return true;
         }
         return false;
-    }, [phase, draft, editingField, editingOriginalName, settingsService]);
-    const saveDraft = () => {
-        if (!draft)
-            return;
-        setErrorMessage(null);
-        setFieldErrors({});
-        const providerDef = editingOriginalName ? getAllProviders().find((p) => p.id === editingOriginalName) : null;
-        const isEditingBuiltIn = providerDef ? !providerDef.isRuntimeDefined : false;
-        if (isEditingBuiltIn && editingOriginalName) {
-            try {
-                settingsService.setPersistent(`agent.${editingOriginalName}.apiKey`, draft.apiKey || undefined);
-                loadProviders();
-                setPhase('list');
-                setSelectedIndex(0);
-                setDraft(null);
-                setEditingOriginalName(null);
-                setFieldErrors({});
-            }
-            catch (err) {
-                setErrorMessage(err.message || 'Failed to save provider API key.');
-            }
-            return;
-        }
-        // Final checks
-        if (!draft.name.trim()) {
-            setFieldErrors({ name: 'Name cannot be empty.' });
-            return;
-        }
-        if (!PROVIDER_NAME_REGEX.test(draft.name.trim())) {
-            setFieldErrors({
-                name: 'Name must start with a letter or number and contain only letters, numbers, hyphens, underscores, and dots.',
-            });
-            return;
-        }
-        const originalName = editingOriginalName;
-        if (hasProviderNameConflict(settingsService, draft.name, originalName ?? undefined)) {
-            setFieldErrors({ name: `Provider with name '${draft.name}' already exists.` });
-            return;
-        }
-        const type = draft.type;
-        const baseUrlRequired = type === 'openai' || type === 'openai-compatible' || type === 'llama.cpp';
-        if (baseUrlRequired && !draft.baseUrl) {
-            setFieldErrors({ baseUrl: `Base URL is required for provider type '${type}'.` });
-            return;
-        }
-        try {
-            const list = settingsService.get('providers') || [];
-            const isEdit = originalName !== null;
-            let updatedList;
-            if (isEdit && originalName) {
-                // If name changed, delete old provider
-                updatedList = list.filter((p) => p && p.name !== originalName);
-                if (originalName !== draft.name) {
-                    unregisterProvider(originalName);
-                }
-            }
-            else {
-                updatedList = [...list];
-            }
-            const newEntry = {
-                name: draft.name,
-                type: draft.type,
-            };
-            if (draft.baseUrl)
-                newEntry.baseUrl = draft.baseUrl;
-            if (draft.apiKey)
-                newEntry.apiKey = draft.apiKey;
-            updatedList.push(newEntry);
-            settingsService.setPersistent('providers', updatedList);
-            // Instantly register or update at runtime
-            const def = createOpenAICompatibleProviderDefinition({
-                name: draft.name,
-                type: draft.type,
-                baseUrl: draft.baseUrl,
-                apiKey: draft.apiKey,
-            });
-            upsertProvider(def);
-            // If active provider was edited and its name changed, update the active setting
-            if (isEdit && originalName && originalName === settingsService.get('agent.provider')) {
-                settingsService.set('agent.provider', draft.name);
-            }
-            loadProviders();
-            setPhase('list');
-            setSelectedIndex(0);
-            setDraft(null);
-            setEditingOriginalName(null);
-            setFieldErrors({});
-        }
-        catch (err) {
-            setErrorMessage(err.message || 'Failed to save provider.');
-        }
-    };
+    }, [phase, draft, editingField, editingOriginalName, settingsService, setInput, setSelectedIndex]);
     const requestDelete = useCallback(() => {
         if (phase !== 'list')
             return;
@@ -738,8 +628,40 @@ export const useProviderSelection = (settingsService) => {
         setEditingOriginalName(provider.id);
         setPhase('confirm_delete');
         setSelectedIndex(DELETE_CONFIRM_DEFAULT_INDEX); // default to 'No' for safety
-    }, [phase, selectedIndex, items]);
+    }, [phase, selectedIndex, items, setSelectedIndex]);
     const getActiveItems = useCallback(() => activeItems, [activeItems]);
+    const saveProviderOrder = useCallback(() => {
+        settingsService.setPersistent('providerOrder', reorderList);
+        setPhase('list');
+        setSelectedIndex(0);
+        setReorderList([]);
+    }, [settingsService, reorderList, setSelectedIndex]);
+    const moveProviderUp = useCallback(() => {
+        if (phase !== 'reorder')
+            return;
+        const idx = selectedIndex;
+        if (idx <= 0)
+            return;
+        setReorderList((prev) => {
+            const next = [...prev];
+            [next[idx - 1], next[idx]] = [next[idx], next[idx - 1]];
+            return next;
+        });
+        selectionMoveUp();
+    }, [phase, selectedIndex, selectionMoveUp]);
+    const moveProviderDown = useCallback(() => {
+        if (phase !== 'reorder')
+            return;
+        const idx = selectedIndex;
+        if (idx >= reorderList.length - 1)
+            return;
+        setReorderList((prev) => {
+            const next = [...prev];
+            [next[idx], next[idx + 1]] = [next[idx + 1], next[idx]];
+            return next;
+        });
+        selectionMoveDown();
+    }, [phase, selectedIndex, reorderList.length, selectionMoveDown]);
     const selectedProviderName = editingOriginalName ?? undefined;
     return {
         isOpen,
@@ -762,6 +684,9 @@ export const useProviderSelection = (settingsService) => {
         requestDelete,
         getActiveItems,
         handleTextInputSubmit,
+        saveProviderOrder,
+        moveProviderUp,
+        moveProviderDown,
     };
 };
 //# sourceMappingURL=use-provider-selection.js.map