mirror of
https://github.com/siteboon/claudecodeui.git
synced 2026-03-01 12:07:37 +00:00
* feat: integrate Gemini AI agent provider - Core Backend: Ported gemini-cli.js and gemini-response-handler.js to establish the CLI bridge. Registered 'gemini' as an active provider within index.js. - Core Frontend: Extended QuickSettingsPanel.jsx, Settings.jsx, and AgentListItem.jsx to render the Gemini provider option, models (gemini-pro, gemini-flash, etc.), and handle OAuth states. - WebSocket Pipeline: Added support for gemini-command executions in backend and payload processing of gemini-response and gemini-error streams in useChatRealtimeHandlers.ts. Resolved JSON double-stringification and sessionId stripping issues in the transmission handler. - Platform Compatibility: Added scripts/fix-node-pty.js postinstall script and modified posix_spawnp calls with sh -c wrapper to prevent ENOEXEC and MacOS permission errors when spawning the gemini headless binary. - UX & Design: Imported official Google Gemini branding via GeminiLogo.jsx and gemini-ai-icon.svg. Updated translations (chat.json) for en, zh-CN, and ko locales. * fix: propagate gemini permission mode from settings to cli - Added Gemini Permissions UI in Settings to toggle Auto Edit and YOLO modes - Synced gemini permission mode to localStorage - Passed permissionMode in useChatComposerState for Gemini commands - Mapped frontend permission modes to --yolo and --approval-mode options in gemini-cli.js * feat(gemini): Refactor Gemini CLI integration to use stream-json - Replaced regex buffering text-system with NDJSON stream parsing - Added fallback for restricted models like gemini-3.1-pro-preview * feat(gemini): Render tool_use and tool_result UI bubbles - Forwarded gemini tool NDJSON objects to the websocket - Added React state handlers in useChatRealtimeHandlers to match Claude's tool UI behavior * feat(gemini): Add native session resumption and UI token tracking - Captured cliSessionId from init events to map ClaudeCodeUI's chat sessionId directly into Gemini's internal session manager. - Updated gemini-cli.js spawn arguments to append the --resume proxy flag instead of naively dumping the accumulated chat history into the command prompt. - Handled result stream objects by proxying total_tokens back into the frontend's claude-status tracker to natively populate the UI label. - Eliminated gemini-3 model proxy filter entirely. * fix(gemini): Fix static 'Claude' name rendering in chat UI header - Added "gemini": "Gemini" translation strings to messageTypes across English, Korean, and Chinese loc dictionaries. - Updated AssistantThinkingIndicator and MessageComponent ternary checks to identify provider === 'gemini' and render the appropriate brand label instead of statically defaulting to Claude. * feat: Add Gemini session persistence API mapping and Sidebar UI * fix(gemini): Watch ~/.gemini/sessions for live UI updates Added the .gemini/sessions directory to PROVIDER_WATCH_PATHS so that Chokidar emits projects_updated websocket events when new Gemini sessions are created or modified, fixing live sidebar updates. * fix(gemini): Fix Gemini authentication status display in Settings UI - Injected 'checkGeminiAuthStatus' into the Settings.jsx React effect hook so that the UI can poll and render the 'geminiAuthStatus' state. - Updated 'checkGeminiCredentials()' inside server/routes/cli-auth.js to read from '~/.gemini/oauth_creds.json' and '~/.gemini/google_accounts.json', resolving the email address correctly. * Use logo-only icon for gemini * feat(gemini): Add Gemini 3 preview models to UI selection list * Fix Gemini CLI session resume bug and PR #422 review nitpicks * Fix Gemini tool calls disappearing from UI after completion * fix(gemini): resolve outstanding PR #422 feedback and stabilize gemini CLI timeouts * fix(gemini): resolve resume flag and shell session initialization issues This commit addresses the remaining PR comments for the Gemini CLI integration: - Moves the `--resume` flag logic outside the prompt command block, ensuring Gemini sessions correctly resume even when a new prompt isn't passed. - Updates `handleShellConnection` to correctly lookup the native `cliSessionId` from the internal `sessionId` when spawning Gemini sessions in a plain shell. - Refactors dynamic import of `sessionManager.js` back to a native static import for code consistency. * chore: fix TypeScript errors and remove gemini CLI dependency * fix: use cross-spawn on Windows to resolve gemini.cmd correctly --------- Co-authored-by: Haileyesus <118998054+blackmammoth@users.noreply.github.com>
257 lines
9.6 KiB
TypeScript
257 lines
9.6 KiB
TypeScript
import { Settings as SettingsIcon, X } from 'lucide-react';
|
|
import { useTranslation } from 'react-i18next';
|
|
import LoginModal from '../../LoginModal';
|
|
import { Button } from '../../ui/button';
|
|
import ClaudeMcpFormModal from '../view/modals/ClaudeMcpFormModal';
|
|
import CodexMcpFormModal from '../view/modals/CodexMcpFormModal';
|
|
import SettingsMainTabs from '../view/SettingsMainTabs';
|
|
import AgentsSettingsTab from '../view/tabs/agents-settings/AgentsSettingsTab';
|
|
import AppearanceSettingsTab from '../view/tabs/AppearanceSettingsTab';
|
|
import CredentialsSettingsTab from '../view/tabs/api-settings/CredentialsSettingsTab';
|
|
import GitSettingsTab from '../view/tabs/git-settings/GitSettingsTab';
|
|
import TasksSettingsTab from '../view/tabs/tasks-settings/TasksSettingsTab';
|
|
import { useSettingsController } from '../hooks/useSettingsController';
|
|
import type { AgentProvider, SettingsProject, SettingsProps } from '../types/types';
|
|
|
|
type LoginModalProps = {
|
|
isOpen: boolean;
|
|
onClose: () => void;
|
|
provider: AgentProvider | '';
|
|
project: SettingsProject | null;
|
|
onComplete: (exitCode: number) => void;
|
|
isAuthenticated: boolean;
|
|
};
|
|
|
|
const LoginModalComponent = LoginModal as unknown as (props: LoginModalProps) => JSX.Element;
|
|
|
|
function Settings({ isOpen, onClose, projects = [], initialTab = 'agents' }: SettingsProps) {
|
|
const { t } = useTranslation('settings');
|
|
const {
|
|
activeTab,
|
|
setActiveTab,
|
|
isSaving,
|
|
saveStatus,
|
|
deleteError,
|
|
projectSortOrder,
|
|
setProjectSortOrder,
|
|
codeEditorSettings,
|
|
updateCodeEditorSetting,
|
|
claudePermissions,
|
|
setClaudePermissions,
|
|
cursorPermissions,
|
|
setCursorPermissions,
|
|
codexPermissionMode,
|
|
setCodexPermissionMode,
|
|
mcpServers,
|
|
cursorMcpServers,
|
|
codexMcpServers,
|
|
mcpTestResults,
|
|
mcpServerTools,
|
|
mcpToolsLoading,
|
|
showMcpForm,
|
|
editingMcpServer,
|
|
openMcpForm,
|
|
closeMcpForm,
|
|
submitMcpForm,
|
|
handleMcpDelete,
|
|
handleMcpTest,
|
|
handleMcpToolsDiscovery,
|
|
showCodexMcpForm,
|
|
editingCodexMcpServer,
|
|
openCodexMcpForm,
|
|
closeCodexMcpForm,
|
|
submitCodexMcpForm,
|
|
handleCodexMcpDelete,
|
|
claudeAuthStatus,
|
|
cursorAuthStatus,
|
|
codexAuthStatus,
|
|
geminiAuthStatus,
|
|
geminiPermissionMode,
|
|
setGeminiPermissionMode,
|
|
openLoginForProvider,
|
|
showLoginModal,
|
|
setShowLoginModal,
|
|
loginProvider,
|
|
selectedProject,
|
|
handleLoginComplete,
|
|
saveSettings,
|
|
} = useSettingsController({
|
|
isOpen,
|
|
initialTab,
|
|
projects,
|
|
onClose,
|
|
});
|
|
|
|
if (!isOpen) {
|
|
return null;
|
|
}
|
|
|
|
const isAuthenticated = loginProvider === 'claude'
|
|
? claudeAuthStatus.authenticated
|
|
: loginProvider === 'cursor'
|
|
? cursorAuthStatus.authenticated
|
|
: loginProvider === 'codex'
|
|
? codexAuthStatus.authenticated
|
|
: false;
|
|
|
|
return (
|
|
<div className="modal-backdrop fixed inset-0 flex items-center justify-center z-[9999] md:p-4 bg-background/95">
|
|
<div className="bg-background border border-border md:rounded-lg shadow-xl w-full md:max-w-4xl h-full md:h-[90vh] flex flex-col">
|
|
<div className="flex items-center justify-between p-4 md:p-6 border-b border-border flex-shrink-0">
|
|
<div className="flex items-center gap-3">
|
|
<SettingsIcon className="w-5 h-5 md:w-6 md:h-6 text-blue-600" />
|
|
<h2 className="text-lg md:text-xl font-semibold text-foreground">{t('title')}</h2>
|
|
</div>
|
|
<Button
|
|
variant="ghost"
|
|
size="sm"
|
|
onClick={onClose}
|
|
className="text-muted-foreground hover:text-foreground touch-manipulation"
|
|
>
|
|
<X className="w-5 h-5" />
|
|
</Button>
|
|
</div>
|
|
|
|
<div className="flex-1 overflow-y-auto">
|
|
<SettingsMainTabs activeTab={activeTab} onChange={setActiveTab} />
|
|
|
|
<div className="p-4 md:p-6 space-y-6 md:space-y-8 pb-safe-area-inset-bottom">
|
|
{activeTab === 'appearance' && (
|
|
<AppearanceSettingsTab
|
|
projectSortOrder={projectSortOrder}
|
|
onProjectSortOrderChange={setProjectSortOrder}
|
|
codeEditorSettings={codeEditorSettings}
|
|
onCodeEditorThemeChange={(value) => updateCodeEditorSetting('theme', value)}
|
|
onCodeEditorWordWrapChange={(value) => updateCodeEditorSetting('wordWrap', value)}
|
|
onCodeEditorShowMinimapChange={(value) => updateCodeEditorSetting('showMinimap', value)}
|
|
onCodeEditorLineNumbersChange={(value) => updateCodeEditorSetting('lineNumbers', value)}
|
|
onCodeEditorFontSizeChange={(value) => updateCodeEditorSetting('fontSize', value)}
|
|
/>
|
|
)}
|
|
|
|
{activeTab === 'git' && <GitSettingsTab />}
|
|
|
|
{activeTab === 'agents' && (
|
|
<AgentsSettingsTab
|
|
claudeAuthStatus={claudeAuthStatus}
|
|
cursorAuthStatus={cursorAuthStatus}
|
|
codexAuthStatus={codexAuthStatus}
|
|
geminiAuthStatus={geminiAuthStatus}
|
|
onClaudeLogin={() => openLoginForProvider('claude')}
|
|
onCursorLogin={() => openLoginForProvider('cursor')}
|
|
onCodexLogin={() => openLoginForProvider('codex')}
|
|
onGeminiLogin={() => openLoginForProvider('gemini')}
|
|
claudePermissions={claudePermissions}
|
|
onClaudePermissionsChange={setClaudePermissions}
|
|
cursorPermissions={cursorPermissions}
|
|
onCursorPermissionsChange={setCursorPermissions}
|
|
codexPermissionMode={codexPermissionMode}
|
|
onCodexPermissionModeChange={setCodexPermissionMode}
|
|
geminiPermissionMode={geminiPermissionMode}
|
|
onGeminiPermissionModeChange={setGeminiPermissionMode}
|
|
mcpServers={mcpServers}
|
|
cursorMcpServers={cursorMcpServers}
|
|
codexMcpServers={codexMcpServers}
|
|
mcpTestResults={mcpTestResults}
|
|
mcpServerTools={mcpServerTools}
|
|
mcpToolsLoading={mcpToolsLoading}
|
|
onOpenMcpForm={openMcpForm}
|
|
onDeleteMcpServer={handleMcpDelete}
|
|
onTestMcpServer={handleMcpTest}
|
|
onDiscoverMcpTools={handleMcpToolsDiscovery}
|
|
onOpenCodexMcpForm={openCodexMcpForm}
|
|
onDeleteCodexMcpServer={handleCodexMcpDelete}
|
|
deleteError={deleteError}
|
|
/>
|
|
)}
|
|
|
|
{activeTab === 'tasks' && (
|
|
<div className="space-y-6 md:space-y-8">
|
|
<TasksSettingsTab />
|
|
</div>
|
|
)}
|
|
|
|
{activeTab === 'api' && (
|
|
<div className="space-y-6 md:space-y-8">
|
|
<CredentialsSettingsTab />
|
|
</div>
|
|
)}
|
|
</div>
|
|
</div>
|
|
|
|
<div className="flex flex-col sm:flex-row sm:items-center sm:justify-between p-4 md:p-6 border-t border-border flex-shrink-0 gap-3 pb-safe-area-inset-bottom">
|
|
<div className="flex items-center justify-center sm:justify-start gap-2 order-2 sm:order-1">
|
|
{saveStatus === 'success' && (
|
|
<div className="text-green-600 dark:text-green-400 text-sm flex items-center gap-1">
|
|
<svg className="w-4 h-4" fill="currentColor" viewBox="0 0 20 20">
|
|
<path fillRule="evenodd" d="M16.707 5.293a1 1 0 010 1.414l-8 8a1 1 0 01-1.414 0l-4-4a1 1 0 011.414-1.414L8 12.586l7.293-7.293a1 1 0 011.414 0z" clipRule="evenodd" />
|
|
</svg>
|
|
{t('saveStatus.success')}
|
|
</div>
|
|
)}
|
|
{saveStatus === 'error' && (
|
|
<div className="text-red-600 dark:text-red-400 text-sm flex items-center gap-1">
|
|
<svg className="w-4 h-4" fill="currentColor" viewBox="0 0 20 20">
|
|
<path fillRule="evenodd" d="M18 10a8 8 0 11-16 0 8 8 0 0116 0zm-7 4a1 1 0 11-2 0 1 1 0 012 0zm-1-9a1 1 0 00-1 1v4a1 1 0 102 0V6a1 1 0 00-1-1z" clipRule="evenodd" />
|
|
</svg>
|
|
{t('saveStatus.error')}
|
|
</div>
|
|
)}
|
|
</div>
|
|
<div className="flex items-center gap-3 order-1 sm:order-2">
|
|
<Button
|
|
variant="outline"
|
|
onClick={onClose}
|
|
disabled={isSaving}
|
|
className="flex-1 sm:flex-none h-10 touch-manipulation"
|
|
>
|
|
{t('footerActions.cancel')}
|
|
</Button>
|
|
<Button
|
|
onClick={saveSettings}
|
|
disabled={isSaving}
|
|
className="flex-1 sm:flex-none h-10 bg-blue-600 hover:bg-blue-700 disabled:opacity-50 touch-manipulation"
|
|
>
|
|
{isSaving ? (
|
|
<div className="flex items-center gap-2">
|
|
<div className="w-4 h-4 animate-spin rounded-full border-2 border-white border-t-transparent" />
|
|
{t('saveStatus.saving')}
|
|
</div>
|
|
) : (
|
|
t('footerActions.save')
|
|
)}
|
|
</Button>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
<LoginModalComponent
|
|
key={loginProvider}
|
|
isOpen={showLoginModal}
|
|
onClose={() => setShowLoginModal(false)}
|
|
provider={loginProvider}
|
|
project={selectedProject}
|
|
onComplete={handleLoginComplete}
|
|
isAuthenticated={isAuthenticated}
|
|
/>
|
|
|
|
<ClaudeMcpFormModal
|
|
isOpen={showMcpForm}
|
|
editingServer={editingMcpServer}
|
|
projects={projects}
|
|
onClose={closeMcpForm}
|
|
onSubmit={submitMcpForm}
|
|
/>
|
|
|
|
<CodexMcpFormModal
|
|
isOpen={showCodexMcpForm}
|
|
editingServer={editingCodexMcpServer}
|
|
onClose={closeCodexMcpForm}
|
|
onSubmit={submitCodexMcpForm}
|
|
/>
|
|
</div>
|
|
);
|
|
}
|
|
|
|
export default Settings;
|