Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 49 additions & 7 deletions server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ import { queryClaudeSDK, abortClaudeSDKSession, isClaudeSDKSessionActive, getAct
import { spawnCursor, abortCursorSession, isCursorSessionActive, getActiveCursorSessions } from './cursor-cli.js';
import { queryCodex, abortCodexSession, isCodexSessionActive, getActiveCodexSessions } from './openai-codex.js';
import { spawnGemini, abortGeminiSession, isGeminiSessionActive, getActiveGeminiSessions } from './gemini-cli.js';
import { spawnKiro, abortKiroSession, isKiroSessionActive, getActiveKiroSessions } from './kiro-cli.js';
import sessionManager from './sessionManager.js';
import gitRoutes from './routes/git.js';
import authRoutes from './routes/auth.js';
Expand All @@ -64,6 +65,7 @@ import cliAuthRoutes from './routes/cli-auth.js';
import userRoutes from './routes/user.js';
import codexRoutes from './routes/codex.js';
import geminiRoutes from './routes/gemini.js';
import kiroRoutes from './routes/kiro.js';
import pluginsRoutes from './routes/plugins.js';
import messagesRoutes from './routes/messages.js';
import { createNormalizedMessage } from './providers/types.js';
Expand All @@ -74,15 +76,18 @@ import { validateApiKey, authenticateToken, authenticateWebSocket } from './midd
import { IS_PLATFORM } from './constants/config.js';
import { getConnectableHost } from '../shared/networkHosts.js';

const VALID_PROVIDERS = ['claude', 'codex', 'cursor', 'gemini'];
const VALID_PROVIDERS = ['claude', 'codex', 'cursor', 'gemini', 'kiro'];

// File system watchers for provider project/session folders
const PROVIDER_WATCH_PATHS = [
{ provider: 'claude', rootPath: path.join(os.homedir(), '.claude', 'projects') },
{ provider: 'cursor', rootPath: path.join(os.homedir(), '.cursor', 'chats') },
{ provider: 'codex', rootPath: path.join(os.homedir(), '.codex', 'sessions') },
{ provider: 'gemini', rootPath: path.join(os.homedir(), '.gemini', 'projects') },
{ provider: 'gemini_sessions', rootPath: path.join(os.homedir(), '.gemini', 'sessions') }
{ provider: 'gemini_sessions', rootPath: path.join(os.homedir(), '.gemini', 'sessions') },
// TODO: verify actual Kiro session storage path (~/.kiro/sessions/ is best guess)
// optional: true — skip mkdir on startup so we don't create ~/.kiro/sessions for users who don't have Kiro installed
{ provider: 'kiro', rootPath: path.join(os.homedir(), '.kiro', 'sessions'), optional: true }
];
const WATCHER_IGNORED_PATTERNS = [
'**/node_modules/**',
Expand Down Expand Up @@ -176,11 +181,22 @@ async function setupProjectsWatcher() {
}, WATCHER_DEBOUNCE_MS);
};

for (const { provider, rootPath } of PROVIDER_WATCH_PATHS) {
for (const { provider, rootPath, optional } of PROVIDER_WATCH_PATHS) {
try {
// chokidar v4 emits ENOENT via the "error" event for missing roots and will not auto-recover.
// Ensure provider folders exist before creating the watcher so watching stays active.
await fsPromises.mkdir(rootPath, { recursive: true });
if (optional) {
// For optional providers (e.g. Kiro), skip mkdir so we don't create directories
// for users who don't have the provider installed. Only watch if the path exists.
try {
await fsPromises.access(rootPath);
} catch {
// Path doesn't exist and is optional — skip watching entirely
continue;
}
} else {
// chokidar v4 emits ENOENT via the "error" event for missing roots and will not auto-recover.
// Ensure provider folders exist before creating the watcher so watching stays active.
await fsPromises.mkdir(rootPath, { recursive: true });
}

// Initialize chokidar watcher with optimized settings
const watcher = chokidar.watch(rootPath, {
Expand Down Expand Up @@ -395,6 +411,9 @@ app.use('/api/codex', authenticateToken, codexRoutes);
// Gemini API Routes (protected)
app.use('/api/gemini', authenticateToken, geminiRoutes);

// Kiro API Routes (protected)
app.use('/api/kiro', authenticateToken, kiroRoutes);

// Plugins API Routes (protected)
app.use('/api/plugins', authenticateToken, pluginsRoutes);

Expand Down Expand Up @@ -1513,6 +1532,12 @@ function handleChatConnection(ws, request) {
console.log('🔄 Session:', data.options?.sessionId ? 'Resume' : 'New');
console.log('🤖 Model:', data.options?.model || 'default');
await spawnGemini(data.command, data.options, writer);
} else if (data.type === 'kiro-command') {
console.log('[DEBUG] Kiro message:', data.command || '[Continue/Resume]');
console.log('📁 Project:', data.options?.projectPath || data.options?.cwd || 'Unknown');
console.log('🔄 Session:', data.options?.sessionId ? 'Resume' : 'New');
console.log('🤖 Model:', data.options?.model || 'default');
await spawnKiro(data.command, data.options, writer);
} else if (data.type === 'cursor-resume') {
// Backward compatibility: treat as cursor-command with resume and no prompt
console.log('[DEBUG] Cursor resume session (compat):', data.sessionId);
Expand All @@ -1532,6 +1557,8 @@ function handleChatConnection(ws, request) {
success = abortCodexSession(data.sessionId);
} else if (provider === 'gemini') {
success = abortGeminiSession(data.sessionId);
} else if (provider === 'kiro') {
success = abortKiroSession(data.sessionId);
} else {
// Use Claude Agents SDK
success = await abortClaudeSDKSession(data.sessionId);
Expand Down Expand Up @@ -1566,6 +1593,8 @@ function handleChatConnection(ws, request) {
isActive = isCodexSessionActive(sessionId);
} else if (provider === 'gemini') {
isActive = isGeminiSessionActive(sessionId);
} else if (provider === 'kiro') {
isActive = isKiroSessionActive(sessionId);
} else {
// Use Claude Agents SDK
isActive = isClaudeSDKSessionActive(sessionId);
Expand Down Expand Up @@ -1599,7 +1628,8 @@ function handleChatConnection(ws, request) {
claude: getActiveClaudeSDKSessions(),
cursor: getActiveCursorSessions(),
codex: getActiveCodexSessions(),
gemini: getActiveGeminiSessions()
gemini: getActiveGeminiSessions(),
kiro: getActiveKiroSessions()
};
writer.send({
type: 'active-sessions',
Expand Down Expand Up @@ -2249,6 +2279,18 @@ app.get('/api/projects/:projectName/sessions/:sessionId/token-usage', authentica
});
}

// Handle Kiro sessions - token usage tracking not yet available
// TODO: implement Kiro token usage tracking once CLI format is known
if (provider === 'kiro') {
return res.json({
used: 0,
total: 0,
breakdown: { input: 0, cacheCreation: 0, cacheRead: 0 },
unsupported: true,
message: 'Token usage tracking not available for Kiro sessions'
});
}

// Handle Codex sessions
if (provider === 'codex') {
const codexSessionsDir = path.join(homeDir, '.codex', 'sessions');
Expand Down
Loading