-
- C
+
+ {(localStorage.getItem('selected-provider') || 'claude') === 'cursor' ? (
+
- Claude
+ {(localStorage.getItem('selected-provider') || 'claude') === 'cursor' ? 'Cursor' : 'Claude'}
{/* Abort button removed - functionality not yet implemented at backend */}
@@ -2329,12 +2632,66 @@ function ChatInterface({ selectedProject, selectedSession, ws, sendMessage, mess
- {/* Claude Working Status - positioned above the input form */}
-
+
{/* Permission Mode Selector with scroll to bottom button - Above input, clickable for mobile */}
+ {/* Provider & Model Selection or Fixed Provider for existing session */}
+
+
+ {selectedSession?.__provider ? (
+
+
+ {/* Status Display */}
+
+ {selectedSession.__provider === 'cursor' ? (
+
+ ) : (
+ <>
+
+ {provider === 'cursor' && (
+
+ )}
+
+ )}
+
+
+
diff --git a/src/components/ClaudeStatus.jsx b/src/components/ClaudeStatus.jsx
index 52bf39d..c19e37b 100644
--- a/src/components/ClaudeStatus.jsx
+++ b/src/components/ClaudeStatus.jsx
@@ -1,7 +1,7 @@
import React, { useState, useEffect } from 'react';
import { cn } from '../lib/utils';
-function ClaudeStatus({ status, onAbort, isLoading }) {
+function ClaudeStatus({ status, onAbort, isLoading, provider = 'claude' }) {
const [elapsedTime, setElapsedTime] = useState(0);
const [animationPhase, setAnimationPhase] = useState(0);
const [fakeTokens, setFakeTokens] = useState(0);
diff --git a/src/components/CursorLogo.jsx b/src/components/CursorLogo.jsx
new file mode 100644
index 0000000..18bda9d
--- /dev/null
+++ b/src/components/CursorLogo.jsx
@@ -0,0 +1,9 @@
+import React from 'react';
+
+const CursorLogo = ({ className = 'w-5 h-5' }) => {
+ return (
+ 
+ );
+};
+
+export default CursorLogo;
diff --git a/src/components/MainContent.jsx b/src/components/MainContent.jsx
index 52dc236..645e84d 100644
--- a/src/components/MainContent.jsx
+++ b/src/components/MainContent.jsx
@@ -157,7 +157,7 @@ function MainContent({
{activeTab === 'chat' && selectedSession ? (
);
diff --git a/src/components/ToolsSettings.jsx b/src/components/ToolsSettings.jsx
index 0c8eb0a..b0939c3 100644
--- a/src/components/ToolsSettings.jsx
+++ b/src/components/ToolsSettings.jsx
@@ -41,7 +41,16 @@ function ToolsSettings({ isOpen, onClose, projects = [] }) {
const [mcpToolsLoading, setMcpToolsLoading] = useState({});
const [activeTab, setActiveTab] = useState('tools');
const [jsonValidationError, setJsonValidationError] = useState('');
- // Common tool patterns
+ const [toolsProvider, setToolsProvider] = useState('claude'); // 'claude' or 'cursor'
+
+ // Cursor-specific states
+ const [cursorAllowedCommands, setCursorAllowedCommands] = useState([]);
+ const [cursorDisallowedCommands, setCursorDisallowedCommands] = useState([]);
+ const [cursorSkipPermissions, setCursorSkipPermissions] = useState(false);
+ const [newCursorCommand, setNewCursorCommand] = useState('');
+ const [newCursorDisallowedCommand, setNewCursorDisallowedCommand] = useState('');
+ const [cursorMcpServers, setCursorMcpServers] = useState([]);
+ // Common tool patterns for Claude
const commonTools = [
'Bash(git log:*)',
'Bash(git diff:*)',
@@ -58,7 +67,45 @@ function ToolsSettings({ isOpen, onClose, projects = [] }) {
'WebFetch',
'WebSearch'
];
+
+ // Common shell commands for Cursor
+ const commonCursorCommands = [
+ 'Shell(ls)',
+ 'Shell(mkdir)',
+ 'Shell(cd)',
+ 'Shell(cat)',
+ 'Shell(echo)',
+ 'Shell(git status)',
+ 'Shell(git diff)',
+ 'Shell(git log)',
+ 'Shell(npm install)',
+ 'Shell(npm run)',
+ 'Shell(python)',
+ 'Shell(node)'
+ ];
+ // Fetch Cursor MCP servers
+ const fetchCursorMcpServers = async () => {
+ try {
+ const token = localStorage.getItem('auth-token');
+ const response = await fetch('/api/cursor/mcp', {
+ headers: {
+ 'Authorization': `Bearer ${token}`,
+ 'Content-Type': 'application/json'
+ }
+ });
+
+ if (response.ok) {
+ const data = await response.json();
+ setCursorMcpServers(data.servers || []);
+ } else {
+ console.error('Failed to fetch Cursor MCP servers');
+ }
+ } catch (error) {
+ console.error('Error fetching Cursor MCP servers:', error);
+ }
+ };
+
// MCP API functions
const fetchMcpServers = async () => {
try {
@@ -268,7 +315,7 @@ function ToolsSettings({ isOpen, onClose, projects = [] }) {
const loadSettings = async () => {
try {
- // Load from localStorage
+ // Load Claude settings from localStorage
const savedSettings = localStorage.getItem('claude-tools-settings');
if (savedSettings) {
@@ -284,9 +331,27 @@ function ToolsSettings({ isOpen, onClose, projects = [] }) {
setSkipPermissions(false);
setProjectSortOrder('name');
}
+
+ // Load Cursor settings from localStorage
+ const savedCursorSettings = localStorage.getItem('cursor-tools-settings');
+
+ if (savedCursorSettings) {
+ const cursorSettings = JSON.parse(savedCursorSettings);
+ setCursorAllowedCommands(cursorSettings.allowedCommands || []);
+ setCursorDisallowedCommands(cursorSettings.disallowedCommands || []);
+ setCursorSkipPermissions(cursorSettings.skipPermissions || false);
+ } else {
+ // Set Cursor defaults
+ setCursorAllowedCommands([]);
+ setCursorDisallowedCommands([]);
+ setCursorSkipPermissions(false);
+ }
// Load MCP servers from API
await fetchMcpServers();
+
+ // Load Cursor MCP servers
+ await fetchCursorMcpServers();
} catch (error) {
console.error('Error loading tool settings:', error);
// Set defaults on error
@@ -302,7 +367,8 @@ function ToolsSettings({ isOpen, onClose, projects = [] }) {
setSaveStatus(null);
try {
- const settings = {
+ // Save Claude settings
+ const claudeSettings = {
allowedTools,
disallowedTools,
skipPermissions,
@@ -310,9 +376,17 @@ function ToolsSettings({ isOpen, onClose, projects = [] }) {
lastUpdated: new Date().toISOString()
};
+ // Save Cursor settings
+ const cursorSettings = {
+ allowedCommands: cursorAllowedCommands,
+ disallowedCommands: cursorDisallowedCommands,
+ skipPermissions: cursorSkipPermissions,
+ lastUpdated: new Date().toISOString()
+ };
// Save to localStorage
- localStorage.setItem('claude-tools-settings', JSON.stringify(settings));
+ localStorage.setItem('claude-tools-settings', JSON.stringify(claudeSettings));
+ localStorage.setItem('cursor-tools-settings', JSON.stringify(cursorSettings));
setSaveStatus('success');
@@ -635,6 +709,36 @@ function ToolsSettings({ isOpen, onClose, projects = [] }) {
{activeTab === 'tools' && (
+ );
+};
+
+export default CursorLogo;
diff --git a/src/components/MainContent.jsx b/src/components/MainContent.jsx
index 52dc236..645e84d 100644
--- a/src/components/MainContent.jsx
+++ b/src/components/MainContent.jsx
@@ -157,7 +157,7 @@ function MainContent({
{activeTab === 'chat' && selectedSession ? (
- {selectedSession.summary} + {selectedSession.__provider === 'cursor' ? (selectedSession.name || 'Untitled Session') : (selectedSession.summary || 'New Session')}
{selectedProject.displayName} • {selectedSession.id}
diff --git a/src/components/Shell.jsx b/src/components/Shell.jsx
index 3033b03..7864812 100644
--- a/src/components/Shell.jsx
+++ b/src/components/Shell.jsx
@@ -530,11 +530,16 @@ function Shell({ selectedProject, selectedSession, isActive }) {
@@ -1062,26 +1085,39 @@ function Sidebar({
onTouchEnd={handleTouchClick(() => onSessionSelect(session))}
>
- {selectedSession && (
-
- ({selectedSession.summary.slice(0, 30)}...)
-
- )}
+ {selectedSession && (() => {
+ const displaySessionName = selectedSession.__provider === 'cursor'
+ ? (selectedSession.name || 'Untitled Session')
+ : (selectedSession.summary || 'New Session');
+ return (
+
+ ({displaySessionName.slice(0, 30)}...)
+
+ );
+ })()}
{!selectedSession && (
(New Session)
)}
@@ -601,7 +606,12 @@ function Shell({ selectedProject, selectedSession, isActive }) {
) : (
getAllSessions(project).map((session) => {
+ // Handle both Claude and Cursor session formats
+ const isCursorSession = session.__provider === 'cursor';
+
// Calculate if session is active (within last 10 minutes)
- const sessionDate = new Date(session.lastActivity);
+ const sessionDate = new Date(isCursorSession ? session.createdAt : session.lastActivity);
const diffInMinutes = Math.floor((currentTime - sessionDate) / (1000 * 60));
const isActive = diffInMinutes < 10;
+ // Get session display values
+ const sessionName = isCursorSession ? (session.name || 'Untitled Session') : (session.summary || 'New Session');
+ const sessionTime = isCursorSession ? session.createdAt : session.lastActivity;
+ const messageCount = session.messageCount || 0;
+
return (
{selectedSession ? - `Resume session: ${selectedSession.summary.slice(0, 50)}...` : + (() => { + const displaySessionName = selectedSession.__provider === 'cursor' + ? (selectedSession.name || 'Untitled Session') + : (selectedSession.summary || 'New Session'); + return `Resume session: ${displaySessionName.slice(0, 50)}...`; + })() : 'Start a new Claude session' }
diff --git a/src/components/Sidebar.jsx b/src/components/Sidebar.jsx index 9a1e111..36f3bbf 100644 --- a/src/components/Sidebar.jsx +++ b/src/components/Sidebar.jsx @@ -7,6 +7,7 @@ import { Input } from './ui/input'; import { FolderOpen, Folder, Plus, MessageSquare, Clock, ChevronDown, ChevronRight, Edit3, Check, X, Trash2, Settings, FolderPlus, RefreshCw, Sparkles, Edit2, Star, Search } from 'lucide-react'; import { cn } from '../lib/utils'; import ClaudeLogo from './ClaudeLogo'; +import CursorLogo from './CursorLogo.jsx'; import { api } from '../utils/api'; // Move formatTimeAgo outside component to avoid recreation on every render @@ -202,9 +203,12 @@ function Sidebar({ // Helper function to get all sessions for a project (initial + additional) const getAllSessions = (project) => { - const initialSessions = project.sessions || []; - const additional = additionalSessions[project.name] || []; - return [...initialSessions, ...additional]; + // Combine Claude and Cursor sessions; Sidebar will display icon per row + const claudeSessions = [...(project.sessions || []), ...(additionalSessions[project.name] || [])].map(s => ({ ...s, __provider: 'claude' })); + const cursorSessions = (project.cursorSessions || []).map(s => ({ ...s, __provider: 'cursor' })); + // Sort by most recent activity/date + const normalizeDate = (s) => new Date(s.__provider === 'cursor' ? s.createdAt : s.lastActivity); + return [...claudeSessions, ...cursorSessions].sort((a, b) => normalizeDate(b) - normalizeDate(a)); }; // Helper function to get the last activity date for a project @@ -979,11 +983,19 @@ function Sidebar({
{/* Active session indicator dot */}
@@ -1014,38 +1026,49 @@ function Sidebar({
"w-5 h-5 rounded-md flex items-center justify-center flex-shrink-0",
selectedSession?.id === session.id ? "bg-primary/10" : "bg-muted/50"
)}>
-
- {session.summary || 'New Session'}
+ {sessionName}
-
+
- {session.messageCount}
+ {messageCount}
)}
+ {/* Provider tiny icon */}
+
+ {isCursorSession ? (
+
- {/* Mobile delete button */}
-
+ {/* Mobile delete button - only for Claude sessions */}
+ {!isCursorSession && (
+
+ )}
-
- {session.messageCount}
+ {messageCount}
)}
+ {/* Provider tiny icon */}
+
+ {isCursorSession ? (
+
- {/* Desktop hover buttons */}
+ {/* Desktop hover buttons - only for Claude sessions */}
+ {!isCursorSession && (
- {session.summary || 'New Session'}
+ {sessionName}
{editingSession === session.id ? (
<>
@@ -1168,6 +1204,7 @@ function Sidebar({
)}
+ )}
+ {/* Provider Tabs */}
+
+
+
+ {/* Claude Tools Content */}
+ {toolsProvider === 'claude' && (
+
+
+
+
+
+
{/* Skip Permissions */}
+ )}
@@ -1360,6 +1464,216 @@ function ToolsSettings({ isOpen, onClose, projects = [] }) {
)}
)}
+
+ {/* Cursor Tools Content */}
+ {toolsProvider === 'cursor' && (
+
+
+ {/* Skip Permissions for Cursor */}
+
+ )}
+
+
+
+ {/* Allowed Shell Commands */}
+
+
+ + Cursor Permission Settings +
+
+
+
+
+
+
+ {/* Disallowed Shell Commands */}
+
+
+ + Allowed Shell Commands +
++ Shell commands that are automatically allowed without prompting for permission +
+ +
+ setNewCursorCommand(e.target.value)}
+ placeholder='e.g., "Shell(ls)" or "Shell(git status)"'
+ onKeyPress={(e) => {
+ if (e.key === 'Enter') {
+ if (newCursorCommand && !cursorAllowedCommands.includes(newCursorCommand)) {
+ setCursorAllowedCommands([...cursorAllowedCommands, newCursorCommand]);
+ setNewCursorCommand('');
+ }
+ }
+ }}
+ className="flex-1 h-10 touch-manipulation"
+ style={{ fontSize: '16px' }}
+ />
+
+
+
+ {/* Common commands quick add */}
+
+
+
+ + Quick add common commands: +
+
+ {commonCursorCommands.map(cmd => (
+
+ ))}
+
+
+ {cursorAllowedCommands.map(cmd => (
+
+
+
+ {cmd}
+
+
+
+ ))}
+ {cursorAllowedCommands.length === 0 && (
+
+ No allowed shell commands configured
+
+ )}
+
+
+
+ {/* Help Section */}
+
+
+ + Disallowed Shell Commands +
++ Shell commands that should always be denied +
+ +
+ setNewCursorDisallowedCommand(e.target.value)}
+ placeholder='e.g., "Shell(rm -rf)" or "Shell(sudo)"'
+ onKeyPress={(e) => {
+ if (e.key === 'Enter') {
+ if (newCursorDisallowedCommand && !cursorDisallowedCommands.includes(newCursorDisallowedCommand)) {
+ setCursorDisallowedCommands([...cursorDisallowedCommands, newCursorDisallowedCommand]);
+ setNewCursorDisallowedCommand('');
+ }
+ }
+ }}
+ className="flex-1 h-10 touch-manipulation"
+ style={{ fontSize: '16px' }}
+ />
+
+
+
+
+ {cursorDisallowedCommands.map(cmd => (
+
+
+
+ {cmd}
+
+
+
+ ))}
+ {cursorDisallowedCommands.length === 0 && (
+
+ No disallowed shell commands configured
+
+ )}
+
+
+ + Cursor Shell Command Examples: +
+-
+
"Shell(ls)"- Allow ls command
+ "Shell(git status)"- Allow git status command
+ "Shell(mkdir)"- Allow mkdir command
+ "-f"flag - Skip all permission prompts (dangerous)
+