byterover-cli 2.2.0 → 2.3.0

package/dist/tui/features/provider/api/await-oauth-callback.js

@@ -0,0 +1,25 @@
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { OAUTH_CALLBACK_TIMEOUT_MS } from '../../../../shared/constants/oauth.js';
+import { ProviderEvents, } from '../../../../shared/transport/events/index.js';
+import { useTransportStore } from '../../../stores/transport-store.js';
+import { getProvidersQueryOptions } from './get-providers.js';
+export const awaitOAuthCallback = ({ providerId, }) => {
+    const { apiClient } = useTransportStore.getState();
+    if (!apiClient)
+        return Promise.reject(new Error('Not connected'));
+    return apiClient.request(ProviderEvents.AWAIT_OAUTH_CALLBACK, { providerId }, { timeout: OAUTH_CALLBACK_TIMEOUT_MS });
+};
+export const useAwaitOAuthCallback = ({ mutationConfig } = {}) => {
+    const queryClient = useQueryClient();
+    const { onSuccess, ...restConfig } = mutationConfig ?? {};
+    return useMutation({
+        onSuccess(...args) {
+            queryClient.invalidateQueries({
+                queryKey: getProvidersQueryOptions().queryKey,
+            });
+            onSuccess?.(...args);
+        },
+        ...restConfig,
+        mutationFn: awaitOAuthCallback,
+    });
+};

package/dist/tui/features/provider/api/cancel-oauth.d.ts

@@ -0,0 +1,5 @@
+import { type ProviderCancelOAuthResponse } from '../../../../shared/transport/events/index.js';
+export type CancelOAuthDTO = {
+    providerId: string;
+};
+export declare const cancelOAuth: ({ providerId }: CancelOAuthDTO) => Promise<ProviderCancelOAuthResponse | void>;

package/dist/tui/features/provider/api/cancel-oauth.js

@@ -0,0 +1,10 @@
+import { ProviderEvents, } from '../../../../shared/transport/events/index.js';
+import { useTransportStore } from '../../../stores/transport-store.js';
+export const cancelOAuth = ({ providerId }) => {
+    const { apiClient } = useTransportStore.getState();
+    if (!apiClient)
+        return Promise.resolve();
+    return apiClient.request(ProviderEvents.CANCEL_OAUTH, {
+        providerId,
+    });
+};

package/dist/tui/features/provider/api/start-oauth.d.ts

@@ -0,0 +1,11 @@
+import type { MutationConfig } from '../../../lib/react-query.js';
+import { type ProviderStartOAuthResponse } from '../../../../shared/transport/events/index.js';
+export type StartOAuthDTO = {
+    providerId: string;
+};
+export declare const startOAuth: ({ providerId }: StartOAuthDTO) => Promise<ProviderStartOAuthResponse>;
+type UseStartOAuthOptions = {
+    mutationConfig?: MutationConfig<typeof startOAuth>;
+};
+export declare const useStartOAuth: ({ mutationConfig }?: UseStartOAuthOptions) => import("@tanstack/react-query").UseMutationResult<ProviderStartOAuthResponse, Error, StartOAuthDTO, unknown>;
+export {};

package/dist/tui/features/provider/api/start-oauth.js

@@ -0,0 +1,15 @@
+import { useMutation } from '@tanstack/react-query';
+import { ProviderEvents, } from '../../../../shared/transport/events/index.js';
+import { useTransportStore } from '../../../stores/transport-store.js';
+export const startOAuth = ({ providerId }) => {
+    const { apiClient } = useTransportStore.getState();
+    if (!apiClient)
+        return Promise.reject(new Error('Not connected'));
+    return apiClient.request(ProviderEvents.START_OAUTH, {
+        providerId,
+    });
+};
+export const useStartOAuth = ({ mutationConfig } = {}) => useMutation({
+    ...mutationConfig,
+    mutationFn: startOAuth,
+});

package/dist/tui/features/provider/components/auth-method-dialog.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+import type { ProviderDTO } from '../../../../shared/transport/types/dto.js';
+export interface AuthMethodDialogProps {
+    isActive?: boolean;
+    onCancel: () => void;
+    onSelect: (method: 'api-key' | 'oauth') => void;
+    provider: ProviderDTO;
+}
+export declare const AuthMethodDialog: React.FC<AuthMethodDialogProps>;

package/dist/tui/features/provider/components/auth-method-dialog.js

@@ -0,0 +1,20 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Box, Text } from 'ink';
+import { SelectableList } from '../../../components/selectable-list.js';
+import { useTheme } from '../../../hooks/index.js';
+export const AuthMethodDialog = ({ isActive = true, onCancel, onSelect, provider, }) => {
+    const { theme: { colors } } = useTheme();
+    const items = [
+        {
+            description: 'Authenticate in your browser',
+            id: 'oauth',
+            name: provider.oauthLabel ?? 'Sign in with OAuth',
+        },
+        {
+            description: 'Enter your API key manually',
+            id: 'api-key',
+            name: 'API Key',
+        },
+    ];
+    return (_jsx(SelectableList, { filterKeys: (item) => [item.id, item.name], isActive: isActive, items: items, keyExtractor: (item) => item.id, onCancel: onCancel, onSelect: (item) => onSelect(item.id), renderItem: (item, isItemActive) => (_jsxs(Box, { gap: 2, children: [_jsx(Text, { backgroundColor: isItemActive ? colors.dimText : undefined, color: colors.text, children: item.name.padEnd(25) }), _jsx(Text, { color: colors.dimText, children: item.description })] })), title: `${provider.name} — Choose authentication method` }));
+};

package/dist/tui/features/provider/components/oauth-dialog.d.ts

@@ -0,0 +1,9 @@
+import React from 'react';
+import type { ProviderDTO } from '../../../../shared/transport/types/dto.js';
+export interface OAuthDialogProps {
+    isActive?: boolean;
+    onCancel: () => void;
+    onSuccess: () => void;
+    provider: ProviderDTO;
+}
+export declare const OAuthDialog: React.FC<OAuthDialogProps>;

package/dist/tui/features/provider/components/oauth-dialog.js

@@ -0,0 +1,96 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { Box, Text, useInput } from 'ink';
+import { useCallback, useEffect, useRef, useState } from 'react';
+import { SelectableList } from '../../../components/selectable-list.js';
+import { useTheme } from '../../../hooks/index.js';
+import { formatTransportError } from '../../../utils/index.js';
+import { useAwaitOAuthCallback } from '../api/await-oauth-callback.js';
+import { cancelOAuth } from '../api/cancel-oauth.js';
+import { useStartOAuth } from '../api/start-oauth.js';
+export const OAuthDialog = ({ isActive = true, onCancel, onSuccess, provider, }) => {
+    const { theme: { colors } } = useTheme();
+    const [step, setStep] = useState('starting');
+    const [authUrl, setAuthUrl] = useState(null);
+    const [error, setError] = useState(null);
+    const mounted = useRef(true);
+    const flowStarted = useRef(false);
+    const providerIdRef = useRef(provider.id);
+    providerIdRef.current = provider.id;
+    const startOAuthMutation = useStartOAuth();
+    const awaitCallbackMutation = useAwaitOAuthCallback();
+    const runOAuthFlow = useCallback(async () => {
+        if (!mounted.current)
+            return;
+        setStep('starting');
+        setError(null);
+        try {
+            const startResult = await startOAuthMutation.mutateAsync({ providerId: provider.id });
+            if (!mounted.current)
+                return;
+            if (!startResult.success) {
+                setError(startResult.error ?? 'Failed to start OAuth flow');
+                setStep('error');
+                return;
+            }
+            flowStarted.current = true;
+            setAuthUrl(startResult.authUrl);
+            setStep('waiting');
+            const callbackResult = await awaitCallbackMutation.mutateAsync({ providerId: provider.id });
+            if (!mounted.current)
+                return;
+            if (callbackResult.success) {
+                onSuccess();
+            }
+            else {
+                setError(callbackResult.error ?? 'OAuth authentication failed');
+                setStep('error');
+            }
+        }
+        catch (error_) {
+            if (!mounted.current)
+                return;
+            setError(formatTransportError(error_));
+            setStep('error');
+        }
+    }, [awaitCallbackMutation, onSuccess, provider.id, startOAuthMutation]);
+    useEffect(() => {
+        runOAuthFlow();
+        return () => {
+            mounted.current = false;
+            if (flowStarted.current) {
+                cancelOAuth({ providerId: providerIdRef.current }).catch(() => { });
+            }
+        };
+    }, []);
+    useInput((_input, key) => {
+        if (key.escape && isActive && step === 'waiting') {
+            onCancel();
+        }
+    });
+    const handleErrorAction = useCallback((action) => {
+        if (action.id === 'retry') {
+            runOAuthFlow();
+        }
+        else {
+            onCancel();
+        }
+    }, [onCancel, runOAuthFlow]);
+    const errorActions = [
+        { id: 'retry', name: 'Retry' },
+        { id: 'cancel', name: 'Cancel' },
+    ];
+    switch (step) {
+        case 'error': {
+            return (_jsxs(Box, { flexDirection: "column", children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: colors.warning, children: error }) }), _jsx(SelectableList, { filterKeys: (item) => [item.id, item.name], isActive: isActive, items: errorActions, keyExtractor: (item) => item.id, onCancel: onCancel, onSelect: handleErrorAction, renderItem: (item, isItemActive) => (_jsx(Text, { backgroundColor: isItemActive ? colors.dimText : undefined, color: colors.text, children: item.name })), title: "OAuth failed" })] }));
+        }
+        case 'starting': {
+            return (_jsx(Box, { children: _jsxs(Text, { color: colors.primary, children: ["Starting OAuth flow for ", provider.name, "..."] }) }));
+        }
+        case 'waiting': {
+            return (_jsxs(Box, { flexDirection: "column", gap: 1, children: [_jsx(Text, { color: colors.primary, children: "Opening browser for authentication..." }), authUrl && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { color: colors.dimText, children: "If the browser did not open, visit this URL:" }), _jsx(Text, { color: colors.info, children: authUrl })] })), _jsx(Text, { color: colors.dimText, children: "Waiting for authorization... (press Esc to cancel)" })] }));
+        }
+        default: {
+            return null;
+        }
+    }
+};

package/dist/tui/features/provider/components/provider-dialog.js

@@ -16,5 +16,5 @@ export const ProviderDialog = ({ hideCancelButton = false, isActive = true, onCa
     const { theme: { colors } } = useTheme();
     // Find current provider for the list
     const currentProvider = useMemo(() => providers.find((p) => p.isCurrent), [providers]);
-    return (_jsx(SelectableList, { currentItem: currentProvider, filterKeys: (item) => [item.id, item.name, item.description], getCurrentKey: (item) => item.id, hideCancelButton: hideCancelButton, isActive: isActive, items: providers, keyExtractor: (item) => item.id, onCancel: onCancel, onSelect: (item) => onSelect(item), renderItem: (item, isActive, isCurrent) => (_jsxs(Box, { gap: 2, children: [_jsx(Text, { backgroundColor: isActive ? colors.dimText : undefined, color: isActive ? colors.text : colors.text, children: item.name.padEnd(15) }), _jsx(Text, { color: colors.dimText, children: item.description }), item.isConnected && !isCurrent && (_jsx(Text, { color: colors.primary, children: "[Connected]" })), isCurrent && (_jsx(Text, { color: colors.primary, children: "(Current)" }))] })), searchPlaceholder: "Search providers...", title: title }));
+    return (_jsx(SelectableList, { currentItem: currentProvider, filterKeys: (item) => [item.id, item.name, item.description], getCurrentKey: (item) => item.id, hideCancelButton: hideCancelButton, isActive: isActive, items: providers, keyExtractor: (item) => item.id, onCancel: onCancel, onSelect: (item) => onSelect(item), renderItem: (item, isActive, isCurrent) => (_jsxs(Box, { gap: 2, children: [_jsx(Text, { backgroundColor: isActive ? colors.dimText : undefined, color: isActive ? colors.text : colors.text, children: item.name.padEnd(15) }), _jsx(Text, { color: colors.dimText, children: item.description }), item.isConnected && !isCurrent && (_jsx(Text, { color: colors.primary, children: "[Connected]" })), isCurrent && (_jsx(Text, { color: colors.primary, children: "(Current)" })), item.isConnected && item.authMethod && (_jsx(Text, { color: colors.primary, children: item.authMethod === 'oauth' ? '[OAuth]' : '[API Key]' }))] })), searchPlaceholder: "Search providers...", title: title }));
 };

package/dist/tui/features/provider/components/provider-flow.js

@@ -20,8 +20,10 @@ import { useGetProviders } from '../api/get-providers.js';
 import { useSetActiveProvider } from '../api/set-active-provider.js';
 import { useValidateApiKey } from '../api/validate-api-key.js';
 import { ApiKeyDialog } from './api-key-dialog.js';
+import { AuthMethodDialog } from './auth-method-dialog.js';
 import { BaseUrlDialog } from './base-url-dialog.js';
 import { ModelSelectStep } from './model-select-step.js';
+import { OAuthDialog } from './oauth-dialog.js';
 import { ProviderDialog } from './provider-dialog.js';
 export const ProviderFlow = ({ hideCancelButton = false, isActive = true, onCancel, onComplete, providerDialogTitle, }) => {
     const { theme: { colors } } = useTheme();
@@ -53,7 +55,18 @@ export const ProviderFlow = ({ hideCancelButton = false, isActive = true, onCanc
                 name: 'Set as active',
             });
         }
-        if (selectedProvider.requiresApiKey) {
+        if (selectedProvider.authMethod === 'oauth') {
+            actions.push({
+                description: 'Re-authenticate via browser',
+                id: 'reconnect_oauth',
+                name: 'Reconnect OAuth',
+            }, {
+                description: 'Remove OAuth connection',
+                id: 'disconnect',
+                name: 'Disconnect',
+            });
+        }
+        else if (selectedProvider.requiresApiKey) {
             actions.push({
                 description: 'Enter a new API key',
                 id: 'replace',
@@ -113,6 +126,11 @@ export const ProviderFlow = ({ hideCancelButton = false, isActive = true, onCanc
             setStep('base_url');
             return;
         }
+        // Supports OAuth → auth method selection
+        if (provider.supportsOAuth) {
+            setStep('auth_method');
+            return;
+        }
         // Requires API key → api_key step
         if (provider.requiresApiKey) {
             setStep('api_key');
@@ -166,6 +184,10 @@ export const ProviderFlow = ({ hideCancelButton = false, isActive = true, onCanc
                 setStep('base_url');
                 break;
             }
+            case 'reconnect_oauth': {
+                setStep('oauth');
+                break;
+            }
             case 'replace': {
                 setStep('api_key');
                 break;
@@ -200,9 +222,28 @@ export const ProviderFlow = ({ hideCancelButton = false, isActive = true, onCanc
         }
     }, [baseUrl, connectMutation, selectedProvider]);
     const handleApiKeyCancel = useCallback(() => {
-        setStep('select');
-        setSelectedProvider(null);
-        setBaseUrl(null);
+        if (selectedProvider?.supportsOAuth) {
+            setStep('auth_method');
+        }
+        else {
+            setStep('select');
+            setSelectedProvider(null);
+            setBaseUrl(null);
+        }
+    }, [selectedProvider]);
+    const handleAuthMethodSelect = useCallback((method) => {
+        if (method === 'oauth') {
+            setStep('oauth');
+        }
+        else {
+            setStep('api_key');
+        }
+    }, []);
+    const handleOAuthCancel = useCallback(() => {
+        setStep('auth_method');
+    }, []);
+    const handleOAuthSuccess = useCallback(() => {
+        setStep('model_select');
     }, []);
     const handleValidateApiKey = useCallback(async (apiKey) => {
         if (!selectedProvider)
@@ -232,6 +273,12 @@ export const ProviderFlow = ({ hideCancelButton = false, isActive = true, onCanc
         case 'api_key': {
             return selectedProvider ? (_jsx(ApiKeyDialog, { isActive: isActive, isOptional: selectedProvider.id === 'openai-compatible', onCancel: handleApiKeyCancel, onSuccess: handleApiKeySuccess, provider: selectedProvider, validateApiKey: handleValidateApiKey })) : null;
         }
+        case 'auth_method': {
+            return selectedProvider ? (_jsx(AuthMethodDialog, { isActive: isActive, onCancel: () => {
+                    setStep('select');
+                    setSelectedProvider(null);
+                }, onSelect: handleAuthMethodSelect, provider: selectedProvider })) : null;
+        }
         case 'base_url': {
             return (_jsx(BaseUrlDialog, { description: "Enter the base URL of your OpenAI-compatible endpoint (Ollama, LM Studio, etc.)", isActive: isActive, onCancel: handleApiKeyCancel, onSubmit: handleBaseUrlSubmit, title: "Connect to OpenAI Compatible" }));
         }
@@ -241,6 +288,9 @@ export const ProviderFlow = ({ hideCancelButton = false, isActive = true, onCanc
         case 'model_select': {
             return selectedProvider ? (_jsx(ModelSelectStep, { isActive: isActive, onCancel: () => setStep('select'), onComplete: (modelName) => onComplete(`Connected to ${selectedProvider.name}, model set to ${modelName}`), providerId: selectedProvider.id, providerName: selectedProvider.name })) : null;
         }
+        case 'oauth': {
+            return selectedProvider ? (_jsx(OAuthDialog, { isActive: isActive, onCancel: handleOAuthCancel, onSuccess: handleOAuthSuccess, provider: selectedProvider })) : null;
+        }
         case 'provider_actions': {
             return selectedProvider ? (_jsxs(Box, { flexDirection: "column", children: [error && (_jsx(Box, { marginBottom: 1, children: _jsx(Text, { color: colors.warning, children: error }) })), _jsx(SelectableList, { filterKeys: (item) => [item.id, item.name], isActive: isActive, items: providerActions, keyExtractor: (item) => item.id, onCancel: () => {
                             setStep('select');

package/dist/tui/features/provider/components/provider-subscription-initializer.d.ts

@@ -0,0 +1 @@
+export declare function ProviderSubscriptionInitializer(): null;

package/dist/tui/features/provider/components/provider-subscription-initializer.js

@@ -0,0 +1,5 @@
+import { useProviderSubscriptions } from '../hooks/use-provider-subscriptions.js';
+export function ProviderSubscriptionInitializer() {
+    useProviderSubscriptions();
+    return null;
+}

package/dist/tui/features/provider/hooks/use-provider-subscriptions.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Hook that subscribes to provider update broadcasts and invalidates React Query caches.
+ * Call this once from a top-level component to keep provider data fresh
+ * when changes happen via oclif commands or other clients.
+ */
+export declare function useProviderSubscriptions(): void;

package/dist/tui/features/provider/hooks/use-provider-subscriptions.js

@@ -0,0 +1,24 @@
+/**
+ * Hook that subscribes to provider update broadcasts and invalidates React Query caches.
+ * Call this once from a top-level component to keep provider data fresh
+ * when changes happen via oclif commands or other clients.
+ */
+import { useQueryClient } from '@tanstack/react-query';
+import { useEffect } from 'react';
+import { ProviderEvents } from '../../../../shared/transport/events/index.js';
+import { useTransportStore } from '../../../stores/transport-store.js';
+import { getActiveProviderConfigQueryOptions } from '../api/get-active-provider-config.js';
+import { getProvidersQueryOptions } from '../api/get-providers.js';
+export function useProviderSubscriptions() {
+    const client = useTransportStore((s) => s.client);
+    const queryClient = useQueryClient();
+    useEffect(() => {
+        if (!client)
+            return;
+        const unsub = client.on(ProviderEvents.UPDATED, () => {
+            queryClient.invalidateQueries({ queryKey: getProvidersQueryOptions().queryKey });
+            queryClient.invalidateQueries({ queryKey: getActiveProviderConfigQueryOptions().queryKey });
+        });
+        return unsub;
+    }, [client, queryClient]);
+}

package/dist/tui/providers/app-providers.js

@@ -7,6 +7,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  */
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { AuthInitializer } from '../features/auth/components/auth-initializer.js';
+import { ProviderSubscriptionInitializer } from '../features/provider/components/provider-subscription-initializer.js';
 import { TaskSubscriptionInitializer } from '../features/tasks/components/task-subscription-initializer.js';
 import { TransportInitializer } from '../features/transport/components/transport-initializer.js';
 const queryClient = new QueryClient({
@@ -23,5 +24,5 @@ const queryClient = new QueryClient({
     },
 });
 export function AppProviders({ children }) {
-    return (_jsx(QueryClientProvider, { client: queryClient, children: _jsx(TransportInitializer, { children: _jsxs(AuthInitializer, { children: [_jsx(TaskSubscriptionInitializer, {}), children] }) }) }));
+    return (_jsx(QueryClientProvider, { client: queryClient, children: _jsx(TransportInitializer, { children: _jsxs(AuthInitializer, { children: [_jsx(TaskSubscriptionInitializer, {}), _jsx(ProviderSubscriptionInitializer, {}), children] }) }) }));
 }

package/dist/tui/utils/error-messages.js

@@ -11,6 +11,8 @@ const USER_FRIENDLY_MESSAGES = {
     ERR_CONTEXT_TREE_NOT_INIT: 'Context tree not initialized.',
     ERR_LOCAL_CHANGES_EXIST: 'You have local changes. Run /push to save your changes before pulling.',
     ERR_NOT_AUTHENTICATED: 'Not authenticated. This is required for cloud sync. Run /login to connect your account.',
+    ERR_OAUTH_REFRESH_FAILED: 'OAuth token refresh failed. Run /providers to reconnect your provider.',
+    ERR_OAUTH_TOKEN_EXPIRED: 'OAuth token has expired. Run /providers to reconnect your provider.',
     ERR_PROJECT_NOT_INIT: "Project not initialized. Run 'brv restart' to reinitialize.",
     ERR_PROVIDER_NOT_CONFIGURED: 'No provider connected. Run /providers connect byterover to use the free built-in provider, or connect another provider.',
     ERR_SPACE_NOT_CONFIGURED: 'No space configured. Run /space switch to select a space first.',
@@ -41,5 +43,8 @@ export function formatTransportError(error) {
     if (code && code in USER_FRIENDLY_MESSAGES) {
         return USER_FRIENDLY_MESSAGES[code];
     }
-    return error.message.replace(/ for event '[^']+'$/, '');
+    if (error.name === 'TransportRequestTimeoutError') {
+        return 'Request timed out. Please try again.';
+    }
+    return error.message.replace(/ for event '[^']+'(?: after \d+ms)?$/, '');
 }