From e89d2da5dfd81b126a106f7542a9ceedd2cd4c7a Mon Sep 17 00:00:00 2001 From: Haile <118998054+blackmammoth@users.noreply.github.com> Date: Mon, 4 May 2026 13:54:07 +0300 Subject: [PATCH 01/20] Fix New session issues and websocket issues (#738) * fix: reset-state-on-new-session-click * fix(chat): preserve continuity while session ids settle New conversations were crossing a short but important consistency gap. The route could already point at a newly created session id while the projects payload had not refreshed yet, and realtime/optimistic messages could still be keyed under a provisional id. In that window the UI could stop reading the active session store, briefly render the conversation as missing, and then repopulate it a moment later. That same gap also made duplication more likely. Optimistic local user messages could survive long enough to appear beside the persisted copy, and finalized assistant streaming rows could sit directly next to the server-backed assistant message with the same content before realtime state was cleared. The result was a chat view that felt unstable exactly when a new session was being created. This commit makes session-id reconciliation a first-class part of the chat flow instead of assuming every layer will agree immediately. The session store now understands canonical session aliases and can migrate one conversation from a provisional id to the real id without dropping its in-memory state. The route navigation path can replace the provisional URL entry instead of stacking it in history, and the project/session selection logic keeps a synthetic selected session alive long enough for the sidebar and project payloads to catch up. The practical goal is to keep one visible conversation throughout the whole creation lifecycle: no dead window between websocket events and project refresh, no stale provisional URL after the real id is known, and no extra optimistic/local bubbles when server history catches up. * fix(cli): resolve executable path for Claude CLI on Windows * fix(session-synchronizer): improve session name extraction for Claude and Codex --- eslint.config.js | 2 +- server/claude-sdk.js | 9 +- .../list/claude/claude-auth.provider.ts | 15 +- .../claude-session-synchronizer.provider.ts | 65 +++- .../codex-session-synchronizer.provider.ts | 64 +++- server/shared/claude-cli-path.test.ts | 47 +++ server/shared/claude-cli-path.ts | 139 +++++++ src/components/app/AppContent.tsx | 6 +- .../chat/hooks/useChatRealtimeHandlers.ts | 57 ++- .../chat/hooks/useChatSessionState.ts | 102 ++++- src/components/chat/types/types.ts | 7 +- src/components/chat/view/ChatInterface.tsx | 2 + src/components/main-content/types/types.ts | 5 +- .../main-content/view/MainContent.tsx | 2 + src/hooks/useProjectsState.ts | 61 ++- src/stores/useSessionStore.ts | 350 +++++++++++++++--- 16 files changed, 835 insertions(+), 98 deletions(-) create mode 100644 server/shared/claude-cli-path.test.ts create mode 100644 server/shared/claude-cli-path.ts diff --git a/eslint.config.js b/eslint.config.js index 6419a9fd..57a71453 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -157,7 +157,7 @@ export default tseslint.config( }, { type: "backend-shared-utils", // shared backend runtime helpers that modules may import directly - pattern: ["server/shared/utils.{js,ts}"], // classify the shared utils file so modules can depend on it explicitly + pattern: ["server/shared/utils.{js,ts}", "server/shared/claude-cli-path.ts"], // classify the shared utils file so modules can depend on it explicitly mode: "file", }, { diff --git a/server/claude-sdk.js b/server/claude-sdk.js index db3a205c..0f1cac97 100644 --- a/server/claude-sdk.js +++ b/server/claude-sdk.js @@ -18,6 +18,7 @@ import { promises as fs } from 'fs'; import path from 'path'; import os from 'os'; import { CLAUDE_MODELS } from '../shared/modelConstants.js'; +import { resolveClaudeCodeExecutablePath } from './shared/claude-cli-path.js'; import { createNotificationEvent, notifyRunFailed, @@ -153,11 +154,9 @@ function mapCliOptionsToSDK(options = {}) { // Since SDK 0.2.113, options.env replaces process.env instead of overlaying it. sdkOptions.env = { ...process.env }; - // Use CLAUDE_CLI_PATH if explicitly set, otherwise fall back to 'claude' on PATH. - // The SDK 0.2.113+ looks for a bundled native binary optional dep by default; - // this fallback ensures users who installed via the official installer still work - // even when npm prune --production has removed those optional deps. - sdkOptions.pathToClaudeCodeExecutable = process.env.CLAUDE_CLI_PATH || 'claude'; + // Resolve the executable eagerly on Windows because the SDK uses raw child_process.spawn, + // which does not reliably follow npm's shell wrappers like cross-spawn does. + sdkOptions.pathToClaudeCodeExecutable = resolveClaudeCodeExecutablePath(process.env.CLAUDE_CLI_PATH); // Map working directory if (cwd) { diff --git a/server/modules/providers/list/claude/claude-auth.provider.ts b/server/modules/providers/list/claude/claude-auth.provider.ts index 1194ae1d..c94fe1b4 100644 --- a/server/modules/providers/list/claude/claude-auth.provider.ts +++ b/server/modules/providers/list/claude/claude-auth.provider.ts @@ -4,6 +4,7 @@ import path from 'node:path'; import spawn from 'cross-spawn'; +import { resolveClaudeCodeExecutablePath } from '@/shared/claude-cli-path.js'; import type { IProviderAuth } from '@/shared/interfaces.js'; import type { ProviderAuthStatus } from '@/shared/types.js'; import { readObjectRecord, readOptionalString } from '@/shared/utils.js'; @@ -20,13 +21,13 @@ export class ClaudeProviderAuth implements IProviderAuth { * Checks whether the Claude Code CLI is available on this host. */ private checkInstalled(): boolean { - const cliPath = process.env.CLAUDE_CLI_PATH || 'claude'; - try { - spawn.sync(cliPath, ['--version'], { stdio: 'ignore', timeout: 5000 }); - return true; - } catch { - return false; - } + const cliPath = resolveClaudeCodeExecutablePath(process.env.CLAUDE_CLI_PATH); + try { + spawn.sync(cliPath, ['--version'], { stdio: 'ignore', timeout: 5000 }); + return true; + } catch { + return false; + } } /** diff --git a/server/modules/providers/list/claude/claude-session-synchronizer.provider.ts b/server/modules/providers/list/claude/claude-session-synchronizer.provider.ts index 7d089a2d..66f055fd 100644 --- a/server/modules/providers/list/claude/claude-session-synchronizer.provider.ts +++ b/server/modules/providers/list/claude/claude-session-synchronizer.provider.ts @@ -1,5 +1,6 @@ import os from 'node:os'; import path from 'node:path'; +import { readFile } from 'node:fs/promises'; import { sessionsDb } from '@/modules/database/index.js'; import { @@ -91,7 +92,7 @@ export class ClaudeSessionSynchronizer implements IProviderSessionSynchronizer { filePath: string, nameMap: Map ): Promise { - return extractFirstValidJsonlData(filePath, (rawData) => { + const parsed = await extractFirstValidJsonlData(filePath, (rawData) => { const data = rawData as Record; const sessionId = typeof data.sessionId === 'string' ? data.sessionId : undefined; const projectPath = typeof data.cwd === 'string' ? data.cwd : undefined; @@ -103,8 +104,68 @@ export class ClaudeSessionSynchronizer implements IProviderSessionSynchronizer { return { sessionId, projectPath, - sessionName: normalizeSessionName(nameMap.get(sessionId), 'Untitled Claude Session'), }; }); + + if (!parsed) { + return null; + } + + const existingSession = sessionsDb.getSessionById(parsed.sessionId); + const existingSessionName = existingSession?.custom_name; + if (existingSessionName && existingSessionName !== 'Untitled Claude Session') { + return { + ...parsed, + sessionName: normalizeSessionName(existingSessionName, 'Untitled Claude Session'), + }; + } + + let sessionName = nameMap.get(parsed.sessionId); + if (!sessionName) { + sessionName = await this.extractSessionAiTitleFromEnd(filePath, parsed.sessionId); + } + + return { + ...parsed, + sessionName: normalizeSessionName(sessionName, 'Untitled Claude Session'), + }; + } + + private async extractSessionAiTitleFromEnd( + filePath: string, + sessionId: string + ): Promise { + try { + const content = await readFile(filePath, 'utf8'); + const lines = content.split(/\r?\n/); + + for (let index = lines.length - 1; index >= 0; index -= 1) { + const line = lines[index]?.trim(); + if (!line) { + continue; + } + + let parsed: unknown; + try { + parsed = JSON.parse(line); + } catch { + continue; + } + + const data = parsed as Record; + const eventType = typeof data.type === 'string' ? data.type : undefined; + const eventSessionId = typeof data.sessionId === 'string' ? data.sessionId : undefined; + const aiTitle = typeof data.aiTitle === 'string' ? data.aiTitle : undefined; + const lastPrompt = typeof data.lastPrompt === 'string' ? data.lastPrompt : undefined; + + if ((eventType === 'ai-title' && eventSessionId === sessionId && aiTitle?.trim()) || (eventType === 'last-prompt' && eventSessionId === sessionId && lastPrompt?.trim())) { + return aiTitle || lastPrompt; + } + } + } catch { + // Ignore missing/unreadable files so sync can continue. + } + + return undefined; } } diff --git a/server/modules/providers/list/codex/codex-session-synchronizer.provider.ts b/server/modules/providers/list/codex/codex-session-synchronizer.provider.ts index bd1edc0c..0e8025ef 100644 --- a/server/modules/providers/list/codex/codex-session-synchronizer.provider.ts +++ b/server/modules/providers/list/codex/codex-session-synchronizer.provider.ts @@ -1,5 +1,6 @@ import os from 'node:os'; import path from 'node:path'; +import { readFile } from 'node:fs/promises'; import { sessionsDb } from '@/modules/database/index.js'; import { @@ -99,7 +100,7 @@ export class CodexSessionSynchronizer implements IProviderSessionSynchronizer { filePath: string, nameMap: Map ): Promise { - return extractFirstValidJsonlData(filePath, (rawData) => { + const parsed = await extractFirstValidJsonlData(filePath, (rawData) => { const data = rawData as Record; const payload = data.payload as Record | undefined; const sessionId = typeof payload?.id === 'string' ? payload.id : undefined; @@ -112,8 +113,67 @@ export class CodexSessionSynchronizer implements IProviderSessionSynchronizer { return { sessionId, projectPath, - sessionName: normalizeSessionName(nameMap.get(sessionId), 'Untitled Codex Session'), }; }); + + if (!parsed) { + return null; + } + + const existingSession = sessionsDb.getSessionById(parsed.sessionId); + const existingSessionName = existingSession?.custom_name; + if (existingSessionName && existingSessionName !== 'Untitled Codex Session') { + return { + ...parsed, + sessionName: normalizeSessionName(existingSessionName, 'Untitled Codex Session'), + }; + } + + let sessionName = nameMap.get(parsed.sessionId); + if (!sessionName) { + sessionName = await this.extractLastAgentMessageFromEnd(filePath); + } + + return { + ...parsed, + sessionName: normalizeSessionName(sessionName, 'Untitled Codex Session'), + }; + } + + private async extractLastAgentMessageFromEnd(filePath: string): Promise { + try { + const content = await readFile(filePath, 'utf8'); + const lines = content.split(/\r?\n/); + + for (let index = lines.length - 1; index >= 0; index -= 1) { + const line = lines[index]?.trim(); + if (!line) { + continue; + } + + let parsed: unknown; + try { + parsed = JSON.parse(line); + } catch { + continue; + } + + const data = parsed as Record; + const eventType = typeof data.type === 'string' ? data.type : undefined; + const payload = data.payload as Record | undefined; + const payloadType = typeof payload?.type === 'string' ? payload.type : undefined; + const lastAgentMessage = typeof payload?.last_agent_message === 'string' + ? payload.last_agent_message + : undefined; + + if (eventType === 'event_msg' && payloadType === 'task_complete' && lastAgentMessage?.trim()) { + return lastAgentMessage; + } + } + } catch { + // Ignore missing/unreadable files so sync can continue. + } + + return undefined; } } diff --git a/server/shared/claude-cli-path.test.ts b/server/shared/claude-cli-path.test.ts new file mode 100644 index 00000000..87cde218 --- /dev/null +++ b/server/shared/claude-cli-path.test.ts @@ -0,0 +1,47 @@ +import assert from 'node:assert/strict'; +import test from 'node:test'; + +import { + resolveClaudeCodeExecutablePath, + type ResolveClaudeCodeExecutablePathDependencies, +} from '@/shared/claude-cli-path.js'; + +test('resolveClaudeCodeExecutablePath resolves the npm Claude wrapper to its native exe on Windows', () => { + const wrapperDir = 'C:\\nvm4w\\nodejs'; + const nativePath = `${wrapperDir}\\node_modules\\@anthropic-ai\\claude-code\\bin\\claude.exe`; + const execFileSync = + (() => `${wrapperDir}\\claude\r\n${wrapperDir}\\claude.cmd\r\n`) as unknown as ResolveClaudeCodeExecutablePathDependencies['execFileSync']; + const readFileSync = (() => '') as unknown as ResolveClaudeCodeExecutablePathDependencies['readFileSync']; + + const resolved = resolveClaudeCodeExecutablePath('claude', { + platform: 'win32', + execFileSync, + existsSync: (candidate) => candidate === nativePath, + readFileSync, + }); + + assert.equal(resolved, nativePath); +}); + +test('resolveClaudeCodeExecutablePath keeps an explicit JavaScript launcher path unchanged', () => { + const scriptPath = 'C:\\tools\\claude.js'; + + const resolved = resolveClaudeCodeExecutablePath(scriptPath, { + platform: 'win32', + }); + + assert.equal(resolved, scriptPath); +}); + +test('resolveClaudeCodeExecutablePath falls back to the configured command when PATH lookup fails', () => { + const execFileSync = (() => { + throw new Error('not found'); + }) as unknown as ResolveClaudeCodeExecutablePathDependencies['execFileSync']; + + const resolved = resolveClaudeCodeExecutablePath('claude', { + platform: 'win32', + execFileSync, + }); + + assert.equal(resolved, 'claude'); +}); diff --git a/server/shared/claude-cli-path.ts b/server/shared/claude-cli-path.ts new file mode 100644 index 00000000..ae8565d5 --- /dev/null +++ b/server/shared/claude-cli-path.ts @@ -0,0 +1,139 @@ +import { execFileSync } from 'node:child_process'; +import fs from 'node:fs'; +import path from 'node:path'; + +const DEFAULT_CLAUDE_COMMAND = 'claude'; +const CLAUDE_SCRIPT_EXTENSIONS = new Set(['.cjs', '.js', '.jsx', '.mjs', '.ts', '.tsx']); +const CLAUDE_WRAPPER_SEGMENTS = ['node_modules', '@anthropic-ai', 'claude-code', 'bin', 'claude.exe'] as const; + +export type ResolveClaudeCodeExecutablePathDependencies = { + execFileSync?: typeof execFileSync; + existsSync?: typeof fs.existsSync; + platform?: NodeJS.Platform; + readFileSync?: typeof fs.readFileSync; +}; + +function getPathApi(platform: NodeJS.Platform) { + return platform === 'win32' ? path.win32 : path; +} + +function stripWrappingQuotes(value: string): string { + const trimmed = value.trim(); + if ( + (trimmed.startsWith('"') && trimmed.endsWith('"')) || + (trimmed.startsWith("'") && trimmed.endsWith("'")) + ) { + return trimmed.slice(1, -1); + } + return trimmed; +} + +function isPathLike(value: string): boolean { + return value.includes('/') || value.includes('\\'); +} + +function resolveClaudeWrapperBinary( + wrapperPath: string, + deps: Required, +): string | null { + const pathApi = getPathApi(deps.platform); + const directCandidate = pathApi.resolve(pathApi.dirname(wrapperPath), ...CLAUDE_WRAPPER_SEGMENTS); + + if (deps.existsSync(directCandidate)) { + return directCandidate; + } + + let content: string; + try { + content = deps.readFileSync(wrapperPath, 'utf8'); + } catch { + return null; + } + + const matches = content.matchAll(/["']([^"'\\r\\n]*claude\.exe)["']/gi); + for (const match of matches) { + const rawTarget = match[1] + .replace(/^\$basedir[\\/]/i, '') + .replace(/^%dp0%[\\/]/i, '') + .replace(/^%~dp0[\\/]/i, ''); + const normalizedTarget = rawTarget.replace(/[\\/]/g, pathApi.sep); + const candidate = pathApi.isAbsolute(normalizedTarget) + ? normalizedTarget + : pathApi.resolve(pathApi.dirname(wrapperPath), normalizedTarget); + + if (deps.existsSync(candidate)) { + return candidate; + } + } + + return null; +} + +function resolveWindowsClaudeExecutablePath( + configuredPath: string, + deps: Required, +): string { + const pathApi = getPathApi(deps.platform); + const extension = pathApi.extname(configuredPath).toLowerCase(); + const explicitPath = isPathLike(configuredPath) || pathApi.isAbsolute(configuredPath); + + if (CLAUDE_SCRIPT_EXTENSIONS.has(extension)) { + return configuredPath; + } + + if (explicitPath && extension === '.exe') { + return configuredPath; + } + + if (explicitPath) { + return resolveClaudeWrapperBinary(configuredPath, deps) ?? configuredPath; + } + + try { + const stdout = deps.execFileSync('where.exe', [configuredPath], { + encoding: 'utf8', + stdio: ['ignore', 'pipe', 'ignore'], + windowsHide: true, + }); + const candidates = stdout + .split(/\r?\n/) + .map((entry) => entry.trim()) + .filter(Boolean); + + for (const candidate of candidates) { + if (pathApi.extname(candidate).toLowerCase() === '.exe') { + return candidate; + } + } + + for (const candidate of candidates) { + const resolved = resolveClaudeWrapperBinary(candidate, deps); + if (resolved) { + return resolved; + } + } + } catch { + return configuredPath; + } + + return configuredPath; +} + +export function resolveClaudeCodeExecutablePath( + configuredPath: string | undefined = process.env.CLAUDE_CLI_PATH, + dependencies: ResolveClaudeCodeExecutablePathDependencies = {}, +): string { + const deps: Required = { + execFileSync: dependencies.execFileSync ?? execFileSync, + existsSync: dependencies.existsSync ?? fs.existsSync, + platform: dependencies.platform ?? process.platform, + readFileSync: dependencies.readFileSync ?? fs.readFileSync, + }; + + const normalizedPath = stripWrappingQuotes(configuredPath || DEFAULT_CLAUDE_COMMAND); + if (deps.platform !== 'win32') { + return normalizedPath; + } + + return resolveWindowsClaudeExecutablePath(normalizedPath, deps); +} diff --git a/src/components/app/AppContent.tsx b/src/components/app/AppContent.tsx index 432447e4..4dd6979a 100644 --- a/src/components/app/AppContent.tsx +++ b/src/components/app/AppContent.tsx @@ -44,6 +44,7 @@ function AppContentInner() { sidebarOpen, isLoadingProjects, externalMessageUpdate, + newSessionTrigger, setActiveTab, setSidebarOpen, setIsInputFocused, @@ -191,9 +192,12 @@ function AppContentInner() { onSessionNotProcessing={markSessionAsNotProcessing} processingSessions={processingSessions} onReplaceTemporarySession={replaceTemporarySession} - onNavigateToSession={(targetSessionId: string) => navigate(`/session/${targetSessionId}`)} + onNavigateToSession={(targetSessionId: string, options) => + navigate(`/session/${targetSessionId}`, { replace: Boolean(options?.replace) }) + } onShowSettings={() => setShowSettings(true)} externalMessageUpdate={externalMessageUpdate} + newSessionTrigger={newSessionTrigger} /> diff --git a/src/components/chat/hooks/useChatRealtimeHandlers.ts b/src/components/chat/hooks/useChatRealtimeHandlers.ts index 855ee788..342ea117 100644 --- a/src/components/chat/hooks/useChatRealtimeHandlers.ts +++ b/src/components/chat/hooks/useChatRealtimeHandlers.ts @@ -1,7 +1,8 @@ import { useEffect, useRef } from 'react'; import type { Dispatch, MutableRefObject, SetStateAction } from 'react'; + import { usePaletteOps } from '../../../contexts/PaletteOpsContext'; -import type { PendingPermissionRequest } from '../types/types'; +import type { PendingPermissionRequest, SessionNavigationOptions } from '../types/types'; import type { Project, ProjectSession, LLMProvider } from '../../../types/app'; import type { SessionStore, NormalizedMessage } from '../../../stores/useSessionStore'; @@ -67,7 +68,7 @@ interface UseChatRealtimeHandlersArgs { onSessionProcessing?: (sessionId?: string | null) => void; onSessionNotProcessing?: (sessionId?: string | null) => void; onReplaceTemporarySession?: (sessionId?: string | null) => void; - onNavigateToSession?: (sessionId: string) => void; + onNavigateToSession?: (sessionId: string, options?: SessionNavigationOptions) => void; onWebSocketReconnect?: () => void; sessionStore: SessionStore; } @@ -273,13 +274,53 @@ export function useChatRealtimeHandlers({ break; } - // Clear pending session + const actualSessionId = + typeof msg.actualSessionId === 'string' && msg.actualSessionId.trim().length > 0 + ? msg.actualSessionId + : null; const pendingSessionId = sessionStorage.getItem('pendingSessionId'); - if (pendingSessionId && !currentSessionId && msg.exitCode === 0) { - const actualId = msg.actualSessionId || pendingSessionId; - setCurrentSessionId(actualId); - if (msg.actualSessionId) { - onNavigateToSession?.(actualId); + const completedSuccessfully = msg.exitCode === undefined || msg.exitCode === 0; + const isVisibleSession = + Boolean( + sid + && ( + sid === activeViewSessionId + || sid === pendingSessionId + || pendingViewSessionRef.current?.sessionId === sid + ), + ); + + if (actualSessionId && sid && actualSessionId !== sid) { + sessionStore.replaceSessionId(sid, actualSessionId); + + if (isVisibleSession) { + setCurrentSessionId(actualSessionId); + + if (pendingViewSessionRef.current) { + const pendingSession = pendingViewSessionRef.current.sessionId; + if (!pendingSession || pendingSession === sid) { + pendingViewSessionRef.current.sessionId = actualSessionId; + } + } + } + + if (completedSuccessfully && pendingSessionId === sid) { + sessionStorage.removeItem('pendingSessionId'); + } + + if (isVisibleSession) { + onNavigateToSession?.(actualSessionId, { replace: true }); + setTimeout(() => { void paletteOps.refreshProjects(); }, 500); + } + break; + } + + // Clear pending session + if (pendingSessionId && !currentSessionId && completedSuccessfully) { + const resolvedSessionId = actualSessionId || pendingSessionId; + setCurrentSessionId(resolvedSessionId); + if (actualSessionId) { + onNavigateToSession?.(resolvedSessionId, { replace: true }); } sessionStorage.removeItem('pendingSessionId'); setTimeout(() => { void paletteOps.refreshProjects(); }, 500); diff --git a/src/components/chat/hooks/useChatSessionState.ts b/src/components/chat/hooks/useChatSessionState.ts index 3ad66f82..6bff4a88 100644 --- a/src/components/chat/hooks/useChatSessionState.ts +++ b/src/components/chat/hooks/useChatSessionState.ts @@ -1,11 +1,13 @@ import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react'; import type { MutableRefObject } from 'react'; + import { authenticatedFetch } from '../../../utils/api'; -import type { ChatMessage, Provider } from '../types/types'; import type { Project, ProjectSession, LLMProvider } from '../../../types/app'; -import { createCachedDiffCalculator, type DiffCalculator } from '../utils/messageTransforms'; -import { normalizedToChatMessages } from './useChatMessages'; import type { SessionStore, NormalizedMessage } from '../../../stores/useSessionStore'; +import type { ChatMessage, Provider } from '../types/types'; +import { createCachedDiffCalculator, type DiffCalculator } from '../utils/messageTransforms'; + +import { normalizedToChatMessages } from './useChatMessages'; const MESSAGES_PER_PAGE = 20; const INITIAL_VISIBLE_MESSAGES = 100; @@ -22,6 +24,7 @@ interface UseChatSessionStateArgs { sendMessage: (message: unknown) => void; autoScrollToBottom?: boolean; externalMessageUpdate?: number; + newSessionTrigger?: number; processingSessions?: Set; resetStreamingState: () => void; pendingViewSessionRef: MutableRefObject; @@ -95,6 +98,7 @@ export function useChatSessionState({ sendMessage, autoScrollToBottom, externalMessageUpdate, + newSessionTrigger, processingSessions, resetStreamingState, pendingViewSessionRef, @@ -131,15 +135,85 @@ export function useChatSessionState({ const loadAllFinishedTimerRef = useRef | null>(null); const loadAllOverlayTimerRef = useRef | null>(null); const lastLoadedSessionKeyRef = useRef(null); + /** + * Tracks the last processed value from `useProjectsState.newSessionTrigger`. + * + * The trigger itself is intentionally increment-only and routed via: + * useProjectsState -> AppContent -> MainContent -> ChatInterface -> this hook. + * We compare values to ensure each explicit New Session click runs exactly one + * reset pass in this local chat state domain. + */ + const previousNewSessionTriggerRef = useRef(newSessionTrigger ?? 0); const createDiff = useMemo(() => createCachedDiffCalculator(), []); + useEffect(() => { + const trigger = newSessionTrigger ?? 0; + if (trigger === previousNewSessionTriggerRef.current) { + return; + } + previousNewSessionTriggerRef.current = trigger; + + /** + * Consumer-side reset for explicit New Session intent. + * + * Why this is essential: + * - Chat keeps local state that is not fully derived from `selectedSession`: + * `currentSessionId`, `pendingUserMessage`, streaming/status flags, message + * pagination/scroll bookkeeping, and pending session IDs in sessionStorage. + * - If the user clicks New Session while already on the same route with no + * selected session, parent state updates can be idempotent and this local + * state would otherwise persist, making the click appear to "do nothing". + * + * What this reset guarantees: + * - A deterministic clean draft state on every New Session click. + * - No dependence on route/tab/session-object identity changes. + * - No coupling to unrelated external update signals. + */ + resetStreamingState(); + pendingViewSessionRef.current = null; + setClaudeStatus(null); + setCanAbortSession(false); + setIsLoading(false); + setCurrentSessionId(null); + setPendingUserMessage(null); + sessionStorage.removeItem('pendingSessionId'); + sessionStorage.removeItem('cursorSessionId'); + messagesOffsetRef.current = 0; + setHasMoreMessages(false); + setTotalMessages(0); + setTokenBudget(null); + setVisibleMessageCount(INITIAL_VISIBLE_MESSAGES); + setAllMessagesLoaded(false); + allMessagesLoadedRef.current = false; + setIsLoadingAllMessages(false); + setLoadAllJustFinished(false); + setShowLoadAllOverlay(false); + setViewHiddenCount(0); + setSearchTarget(null); + searchScrollActiveRef.current = false; + topLoadLockRef.current = false; + pendingScrollRestoreRef.current = null; + pendingInitialScrollRef.current = true; + lastLoadedSessionKeyRef.current = null; + + if (loadAllOverlayTimerRef.current) { + clearTimeout(loadAllOverlayTimerRef.current); + loadAllOverlayTimerRef.current = null; + } + if (loadAllFinishedTimerRef.current) { + clearTimeout(loadAllFinishedTimerRef.current); + loadAllFinishedTimerRef.current = null; + } + }, [newSessionTrigger, pendingViewSessionRef, resetStreamingState]); + /* ---------------------------------------------------------------- */ /* Derive chatMessages from the store */ /* ---------------------------------------------------------------- */ const activeSessionId = selectedSession?.id || currentSessionId || null; const [pendingUserMessage, setPendingUserMessage] = useState(null); + const flushedPendingUserMessageRef = useRef(null); // Tell the store which session we're viewing so it only re-renders for this one const prevActiveForStoreRef = useRef(null); @@ -148,17 +222,29 @@ export function useChatSessionState({ sessionStore.setActiveSession(activeSessionId); } - // When a real session ID arrives and we have a pending user message, flush it to the store - const prevActiveSessionRef = useRef(null); - if (activeSessionId && activeSessionId !== prevActiveSessionRef.current && pendingUserMessage) { + useEffect(() => { + if (!pendingUserMessage) { + flushedPendingUserMessageRef.current = null; + return; + } + + if (!activeSessionId) { + return; + } + + if (flushedPendingUserMessageRef.current === pendingUserMessage) { + return; + } + const prov = (localStorage.getItem('selected-provider') as LLMProvider) || 'claude'; const normalized = chatMessageToNormalized(pendingUserMessage, activeSessionId, prov); if (normalized) { sessionStore.appendRealtime(activeSessionId, normalized); } + + flushedPendingUserMessageRef.current = pendingUserMessage; setPendingUserMessage(null); - } - prevActiveSessionRef.current = activeSessionId; + }, [activeSessionId, pendingUserMessage, sessionStore]); const storeMessages = activeSessionId ? sessionStore.getMessages(activeSessionId) : []; diff --git a/src/components/chat/types/types.ts b/src/components/chat/types/types.ts index 526b8cc7..81bd5a5b 100644 --- a/src/components/chat/types/types.ts +++ b/src/components/chat/types/types.ts @@ -91,6 +91,10 @@ export interface Question { multiSelect?: boolean; } +export type SessionNavigationOptions = { + replace?: boolean; +}; + export interface ChatInterfaceProps { selectedProject: Project | null; selectedSession: ProjectSession | null; @@ -105,7 +109,7 @@ export interface ChatInterfaceProps { onSessionNotProcessing?: (sessionId?: string | null) => void; processingSessions?: Set; onReplaceTemporarySession?: (sessionId?: string | null) => void; - onNavigateToSession?: (targetSessionId: string) => void; + onNavigateToSession?: (targetSessionId: string, options?: SessionNavigationOptions) => void; onShowSettings?: () => void; autoExpandTools?: boolean; showRawParameters?: boolean; @@ -113,6 +117,7 @@ export interface ChatInterfaceProps { autoScrollToBottom?: boolean; sendByCtrlEnter?: boolean; externalMessageUpdate?: number; + newSessionTrigger?: number; onTaskClick?: (...args: unknown[]) => void; onShowAllTasks?: (() => void) | null; } diff --git a/src/components/chat/view/ChatInterface.tsx b/src/components/chat/view/ChatInterface.tsx index 2e923d7a..8589f29a 100644 --- a/src/components/chat/view/ChatInterface.tsx +++ b/src/components/chat/view/ChatInterface.tsx @@ -43,6 +43,7 @@ function ChatInterface({ autoScrollToBottom, sendByCtrlEnter, externalMessageUpdate, + newSessionTrigger, onShowAllTasks, }: ChatInterfaceProps) { const { tasksEnabled, isTaskMasterInstalled } = useTasksSettings(); @@ -123,6 +124,7 @@ function ChatInterface({ sendMessage, autoScrollToBottom, externalMessageUpdate, + newSessionTrigger, processingSessions, resetStreamingState, pendingViewSessionRef, diff --git a/src/components/main-content/types/types.ts b/src/components/main-content/types/types.ts index d4e708df..d090852d 100644 --- a/src/components/main-content/types/types.ts +++ b/src/components/main-content/types/types.ts @@ -1,5 +1,7 @@ import type { Dispatch, SetStateAction } from 'react'; + import type { AppTab, Project, ProjectSession } from '../../../types/app'; +import type { SessionNavigationOptions } from '../../chat/types/types'; export type SessionLifecycleHandler = (sessionId?: string | null) => void; @@ -50,9 +52,10 @@ export type MainContentProps = { onSessionNotProcessing: SessionLifecycleHandler; processingSessions: Set; onReplaceTemporarySession: SessionLifecycleHandler; - onNavigateToSession: (targetSessionId: string) => void; + onNavigateToSession: (targetSessionId: string, options?: SessionNavigationOptions) => void; onShowSettings: () => void; externalMessageUpdate: number; + newSessionTrigger: number; }; export type MainContentHeaderProps = { diff --git a/src/components/main-content/view/MainContent.tsx b/src/components/main-content/view/MainContent.tsx index a86dcbc9..1a9c7349 100644 --- a/src/components/main-content/view/MainContent.tsx +++ b/src/components/main-content/view/MainContent.tsx @@ -51,6 +51,7 @@ function MainContent({ onNavigateToSession, onShowSettings, externalMessageUpdate, + newSessionTrigger, }: MainContentProps) { const { preferences } = useUiPreferences(); const { autoExpandTools, showRawParameters, showThinking, autoScrollToBottom, sendByCtrlEnter } = preferences; @@ -145,6 +146,7 @@ function MainContent({ autoScrollToBottom={autoScrollToBottom} sendByCtrlEnter={sendByCtrlEnter} externalMessageUpdate={externalMessageUpdate} + newSessionTrigger={newSessionTrigger} onShowAllTasks={tasksEnabled ? () => setActiveTab('tasks') : null} /> diff --git a/src/hooks/useProjectsState.ts b/src/hooks/useProjectsState.ts index c1c9344c..d920fba2 100644 --- a/src/hooks/useProjectsState.ts +++ b/src/hooks/useProjectsState.ts @@ -5,6 +5,7 @@ import { api } from '../utils/api'; import type { AppSocketMessage, AppTab, + LLMProvider, LoadingProgress, Project, ProjectSession, @@ -261,6 +262,27 @@ export function useProjectsState({ const [showSettings, setShowSettings] = useState(false); const [settingsInitialTab, setSettingsInitialTab] = useState('agents'); const [externalMessageUpdate, setExternalMessageUpdate] = useState(0); + /** + * `newSessionTrigger` is an explicit, monotonic intent signal for user-driven + * New Session actions. + * + * It exists because `handleNewSession` can be invoked while the app is already in + * the same visible state (`selectedSession === null`, `activeTab === 'chat'`, + * route already `/`). In that case, React/router updates are idempotent and no + * downstream reset logic runs. + * + * Usage across the codebase: + * 1) Produced here in `handleNewSession` via increment (always changes). + * 2) Returned from this hook and threaded through: + * useProjectsState -> AppContent -> MainContent -> ChatInterface. + * 3) Consumed in `useChatSessionState` as an effect dependency to forcibly clear + * chat-local state (`currentSessionId`, pending draft message, streaming flags, + * pending session storage keys, pagination/scroll artifacts). + * + * Keeping this signal dedicated avoids coupling resets to unrelated counters/events + * (for example websocket/project refresh updates) that could cause accidental resets. + */ + const [newSessionTrigger, setNewSessionTrigger] = useState(0); const loadingProgressTimeoutRef = useRef | null>(null); const lastHandledMessageRef = useRef(null); @@ -536,7 +558,42 @@ export function useProjectsState({ return; } } - }, [sessionId, projects, selectedProject?.projectId, selectedSession?.id, selectedSession?.__provider]); + + // Session id is in the URL but not yet present on any project payload (common + // right after `session_created` + navigate, before the next projects refresh). + // Without a `selectedSession`, chat state clears `currentSessionId` and the + // UI stops reading the session store even though messages stream under this id. + if (selectedSession?.id === sessionId) { + return; + } + + if (!selectedProject) { + return; + } + + let providerFromStorage: string | null = null; + try { + providerFromStorage = localStorage.getItem('selected-provider'); + } catch { + providerFromStorage = null; + } + + const normalizedProvider: LLMProvider = + providerFromStorage === 'cursor' + ? 'cursor' + : providerFromStorage === 'codex' + ? 'codex' + : providerFromStorage === 'gemini' + ? 'gemini' + : 'claude'; + + setSelectedSession({ + id: sessionId, + __provider: normalizedProvider, + __projectId: selectedProject.projectId, + summary: '', + }); + }, [sessionId, projects, selectedProject, selectedSession?.id, selectedSession?.__provider]); const handleProjectSelect = useCallback( (project: Project) => { @@ -587,6 +644,7 @@ export function useProjectsState({ setSelectedProject(project); setSelectedSession(null); setActiveTab('chat'); + setNewSessionTrigger((previous) => previous + 1); navigate('/'); if (isMobile) { @@ -806,6 +864,7 @@ export function useProjectsState({ showSettings, settingsInitialTab, externalMessageUpdate, + newSessionTrigger, setActiveTab, setSidebarOpen, setIsInputFocused, diff --git a/src/stores/useSessionStore.ts b/src/stores/useSessionStore.ts index ef581e12..86925048 100644 --- a/src/stores/useSessionStore.ts +++ b/src/stores/useSessionStore.ts @@ -104,17 +104,126 @@ function createEmptySlot(): SessionSlot { } /** - * Compute merged messages: server + realtime, deduped by id. - * Server messages take priority (they're the persisted source of truth). - * Realtime messages that aren't yet in server stay (in-flight streaming). + * Compute merged messages: server + realtime, deduped by id and adjacent + * assistant echo (same trimmed text), so finalized stream rows do not stack + * on top of the persisted copy before realtime is cleared. */ +function userTextFingerprint(m: NormalizedMessage): string | null { + if (m.kind !== 'text' || m.role !== 'user') return null; + const t = (m.content || '').trim(); + return t.length > 0 ? t : null; +} + +/** + * After `finalizeStreaming`, the client holds a synthetic assistant `text` row + * while the sessions API soon returns the same reply with a different id. + * Those sit back-to-back in merged order and look like duplicate bubbles until + * `refreshFromServer` clears realtime. Collapse same-text assistant rows and + * stream_placeholder → text when content matches. + */ +function dedupeAdjacentAssistantEchoes(merged: NormalizedMessage[]): NormalizedMessage[] { + const out: NormalizedMessage[] = []; + for (const m of merged) { + const prev = out[out.length - 1]; + if (prev) { + if (prev.kind === 'stream_delta' && m.kind === 'text' && m.role === 'assistant') { + const ps = (prev.content || '').trim(); + const ms = (m.content || '').trim(); + if (ps.length > 0 && ps === ms) { + out[out.length - 1] = m; + continue; + } + } + if ( + prev.kind === 'text' + && m.kind === 'text' + && prev.role === 'assistant' + && m.role === 'assistant' + ) { + const ms = (m.content || '').trim(); + if (ms.length > 0 && ms === (prev.content || '').trim()) { + continue; + } + } + } + out.push(m); + } + return out; +} + function computeMerged(server: NormalizedMessage[], realtime: NormalizedMessage[]): NormalizedMessage[] { if (realtime.length === 0) return server; - if (server.length === 0) return realtime; + if (server.length === 0) return dedupeAdjacentAssistantEchoes(realtime); const serverIds = new Set(server.map(m => m.id)); - const extra = realtime.filter(m => !serverIds.has(m.id)); + const serverUserTexts = new Set( + server.map(userTextFingerprint).filter((t): t is string => t !== null), + ); + const extra = realtime.filter((m) => { + if (serverIds.has(m.id)) return false; + // Optimistic user rows use `local_*` ids; once the same text exists on the + // server-backed copy, drop the realtime echo to avoid duplicate bubbles. + if (m.id.startsWith('local_')) { + const fp = userTextFingerprint(m); + if (fp && serverUserTexts.has(fp)) return false; + } + return true; + }); if (extra.length === 0) return server; - return [...server, ...extra]; + return dedupeAdjacentAssistantEchoes([...server, ...extra]); +} + +function compareMessagesByTimestamp(left: NormalizedMessage, right: NormalizedMessage): number { + const leftTime = Date.parse(left.timestamp); + const rightTime = Date.parse(right.timestamp); + + if (Number.isNaN(leftTime) || Number.isNaN(rightTime) || leftTime === rightTime) { + return 0; + } + + return leftTime - rightTime; +} + +function rewriteMessageSessionId( + msg: NormalizedMessage, + fromSessionId: string, + toSessionId: string, +): NormalizedMessage { + const streamingSourceId = `__streaming_${fromSessionId}`; + const nextId = msg.id === streamingSourceId ? `__streaming_${toSessionId}` : msg.id; + + if (msg.sessionId === toSessionId && nextId === msg.id) { + return msg; + } + + return { + ...msg, + id: nextId, + sessionId: toSessionId, + }; +} + +function mergeMessagesById( + existing: NormalizedMessage[], + incoming: NormalizedMessage[], +): NormalizedMessage[] { + if (existing.length === 0) return incoming; + if (incoming.length === 0) return existing; + + const merged = [...existing, ...incoming]; + const deduped: NormalizedMessage[] = []; + const seen = new Set(); + + for (const msg of merged) { + if (seen.has(msg.id)) { + continue; + } + + seen.add(msg.id); + deduped.push(msg); + } + + deduped.sort(compareMessagesByTimestamp); + return deduped; } /** @@ -141,28 +250,59 @@ const MAX_REALTIME_MESSAGES = 500; export function useSessionStore() { const storeRef = useRef(new Map()); + const sessionAliasesRef = useRef(new Map()); const activeSessionIdRef = useRef(null); // Bump to force re-render — only when the active session's data changes const [, setTick] = useState(0); const notify = useCallback((sessionId: string) => { - if (sessionId === activeSessionIdRef.current) { + const aliases = sessionAliasesRef.current; + let resolvedSessionId = sessionId; + const visited = new Set(); + + while (aliases.has(resolvedSessionId) && !visited.has(resolvedSessionId)) { + visited.add(resolvedSessionId); + resolvedSessionId = aliases.get(resolvedSessionId)!; + } + + if (resolvedSessionId === activeSessionIdRef.current) { setTick(n => n + 1); } }, []); - const setActiveSession = useCallback((sessionId: string | null) => { - activeSessionIdRef.current = sessionId; + const resolveSessionId = useCallback((sessionId: string | null | undefined): string | null => { + if (!sessionId) { + return null; + } + + const aliases = sessionAliasesRef.current; + let resolvedSessionId = sessionId; + const visited = new Set(); + + while (aliases.has(resolvedSessionId) && !visited.has(resolvedSessionId)) { + visited.add(resolvedSessionId); + resolvedSessionId = aliases.get(resolvedSessionId)!; + } + + return resolvedSessionId; }, []); + const setActiveSession = useCallback((sessionId: string | null) => { + activeSessionIdRef.current = resolveSessionId(sessionId); + }, [resolveSessionId]); + const getSlot = useCallback((sessionId: string): SessionSlot => { + const resolvedSessionId = resolveSessionId(sessionId) ?? sessionId; const store = storeRef.current; - if (!store.has(sessionId)) { - store.set(sessionId, createEmptySlot()); + if (!store.has(resolvedSessionId)) { + store.set(resolvedSessionId, createEmptySlot()); } - return store.get(sessionId)!; - }, []); + return store.get(resolvedSessionId)!; + }, [resolveSessionId]); - const has = useCallback((sessionId: string) => storeRef.current.has(sessionId), []); + const has = useCallback((sessionId: string) => { + const resolvedSessionId = resolveSessionId(sessionId) ?? sessionId; + return storeRef.current.has(resolvedSessionId); + }, [resolveSessionId]); /** * Fetch messages from the provider sessions endpoint and populate serverMessages. @@ -179,9 +319,10 @@ export function useSessionStore() { offset?: number; } = {}, ) => { - const slot = getSlot(sessionId); + const resolvedSessionId = resolveSessionId(sessionId) ?? sessionId; + const slot = getSlot(resolvedSessionId); slot.status = 'loading'; - notify(sessionId); + notify(resolvedSessionId); try { const params = new URLSearchParams(); @@ -191,7 +332,7 @@ export function useSessionStore() { } const qs = params.toString(); - const url = `/api/providers/sessions/${encodeURIComponent(sessionId)}/messages${qs ? `?${qs}` : ''}`; + const url = `/api/providers/sessions/${encodeURIComponent(resolvedSessionId)}/messages${qs ? `?${qs}` : ''}`; const response = await authenticatedFetch(url); if (!response.ok) { @@ -212,15 +353,15 @@ export function useSessionStore() { slot.tokenUsage = data.tokenUsage; } - notify(sessionId); + notify(resolvedSessionId); return slot; } catch (error) { - console.error(`[SessionStore] fetch failed for ${sessionId}:`, error); + console.error(`[SessionStore] fetch failed for ${resolvedSessionId}:`, error); slot.status = 'error'; - notify(sessionId); + notify(resolvedSessionId); return slot; } - }, [getSlot, notify]); + }, [getSlot, notify, resolveSessionId]); /** * Load older (paginated) messages and prepend to serverMessages. @@ -234,7 +375,8 @@ export function useSessionStore() { limit?: number; } = {}, ) => { - const slot = getSlot(sessionId); + const resolvedSessionId = resolveSessionId(sessionId) ?? sessionId; + const slot = getSlot(resolvedSessionId); if (!slot.hasMore) return slot; const params = new URLSearchParams(); @@ -243,7 +385,7 @@ export function useSessionStore() { params.append('offset', String(slot.offset)); const qs = params.toString(); - const url = `/api/providers/sessions/${encodeURIComponent(sessionId)}/messages${qs ? `?${qs}` : ''}`; + const url = `/api/providers/sessions/${encodeURIComponent(resolvedSessionId)}/messages${qs ? `?${qs}` : ''}`; try { const response = await authenticatedFetch(url); @@ -256,43 +398,54 @@ export function useSessionStore() { slot.hasMore = Boolean(data.hasMore); slot.offset = slot.offset + olderMessages.length; recomputeMergedIfNeeded(slot); - notify(sessionId); + notify(resolvedSessionId); return slot; } catch (error) { - console.error(`[SessionStore] fetchMore failed for ${sessionId}:`, error); + console.error(`[SessionStore] fetchMore failed for ${resolvedSessionId}:`, error); return slot; } - }, [getSlot, notify]); + }, [getSlot, notify, resolveSessionId]); /** * Append a realtime (WebSocket) message to the correct session slot. * This works regardless of which session is actively viewed. */ const appendRealtime = useCallback((sessionId: string, msg: NormalizedMessage) => { - const slot = getSlot(sessionId); - let updated = [...slot.realtimeMessages, msg]; + const resolvedSessionId = resolveSessionId(sessionId) ?? sessionId; + const slot = getSlot(resolvedSessionId); + const normalizedMessage = + msg.sessionId === resolvedSessionId + ? msg + : { ...msg, sessionId: resolvedSessionId }; + let updated = [...slot.realtimeMessages, normalizedMessage]; if (updated.length > MAX_REALTIME_MESSAGES) { updated = updated.slice(-MAX_REALTIME_MESSAGES); } slot.realtimeMessages = updated; recomputeMergedIfNeeded(slot); - notify(sessionId); - }, [getSlot, notify]); + notify(resolvedSessionId); + }, [getSlot, notify, resolveSessionId]); /** * Append multiple realtime messages at once (batch). */ const appendRealtimeBatch = useCallback((sessionId: string, msgs: NormalizedMessage[]) => { if (msgs.length === 0) return; - const slot = getSlot(sessionId); - let updated = [...slot.realtimeMessages, ...msgs]; + const resolvedSessionId = resolveSessionId(sessionId) ?? sessionId; + const slot = getSlot(resolvedSessionId); + const normalizedMessages = msgs.map((msg) => + msg.sessionId === resolvedSessionId + ? msg + : { ...msg, sessionId: resolvedSessionId }, + ); + let updated = [...slot.realtimeMessages, ...normalizedMessages]; if (updated.length > MAX_REALTIME_MESSAGES) { updated = updated.slice(-MAX_REALTIME_MESSAGES); } slot.realtimeMessages = updated; recomputeMergedIfNeeded(slot); - notify(sessionId); - }, [getSlot, notify]); + notify(resolvedSessionId); + }, [getSlot, notify, resolveSessionId]); /** * Re-fetch serverMessages from the provider sessions endpoint. @@ -305,12 +458,13 @@ export function useSessionStore() { projectPath?: string; } = {}, ) => { - const slot = getSlot(sessionId); + const resolvedSessionId = resolveSessionId(sessionId) ?? sessionId; + const slot = getSlot(resolvedSessionId); try { const params = new URLSearchParams(); const qs = params.toString(); - const url = `/api/providers/sessions/${encodeURIComponent(sessionId)}/messages${qs ? `?${qs}` : ''}`; + const url = `/api/providers/sessions/${encodeURIComponent(resolvedSessionId)}/messages${qs ? `?${qs}` : ''}`; const response = await authenticatedFetch(url); if (!response.ok) throw new Error(`HTTP ${response.status}`); @@ -323,40 +477,43 @@ export function useSessionStore() { // drop realtime messages that the server has caught up with to prevent unbounded growth. slot.realtimeMessages = []; recomputeMergedIfNeeded(slot); - notify(sessionId); + notify(resolvedSessionId); } catch (error) { - console.error(`[SessionStore] refresh failed for ${sessionId}:`, error); + console.error(`[SessionStore] refresh failed for ${resolvedSessionId}:`, error); } - }, [getSlot, notify]); + }, [getSlot, notify, resolveSessionId]); /** * Update session status. */ const setStatus = useCallback((sessionId: string, status: SessionStatus) => { - const slot = getSlot(sessionId); + const resolvedSessionId = resolveSessionId(sessionId) ?? sessionId; + const slot = getSlot(resolvedSessionId); slot.status = status; - notify(sessionId); - }, [getSlot, notify]); + notify(resolvedSessionId); + }, [getSlot, notify, resolveSessionId]); /** * Check if a session's data is stale (>30s old). */ const isStale = useCallback((sessionId: string) => { - const slot = storeRef.current.get(sessionId); + const resolvedSessionId = resolveSessionId(sessionId) ?? sessionId; + const slot = storeRef.current.get(resolvedSessionId); if (!slot) return true; return Date.now() - slot.fetchedAt > STALE_THRESHOLD_MS; - }, []); + }, [resolveSessionId]); /** * Update or create a streaming message (accumulated text so far). * Uses a well-known ID so subsequent calls replace the same message. */ const updateStreaming = useCallback((sessionId: string, accumulatedText: string, msgProvider: LLMProvider) => { - const slot = getSlot(sessionId); - const streamId = `__streaming_${sessionId}`; + const resolvedSessionId = resolveSessionId(sessionId) ?? sessionId; + const slot = getSlot(resolvedSessionId); + const streamId = `__streaming_${resolvedSessionId}`; const msg: NormalizedMessage = { id: streamId, - sessionId, + sessionId: resolvedSessionId, timestamp: new Date().toISOString(), provider: msgProvider, kind: 'stream_delta', @@ -370,17 +527,18 @@ export function useSessionStore() { slot.realtimeMessages = [...slot.realtimeMessages, msg]; } recomputeMergedIfNeeded(slot); - notify(sessionId); - }, [getSlot, notify]); + notify(resolvedSessionId); + }, [getSlot, notify, resolveSessionId]); /** * Finalize streaming: convert the streaming message to a regular text message. * The well-known streaming ID is replaced with a unique text message ID. */ const finalizeStreaming = useCallback((sessionId: string) => { - const slot = storeRef.current.get(sessionId); + const resolvedSessionId = resolveSessionId(sessionId) ?? sessionId; + const slot = storeRef.current.get(resolvedSessionId); if (!slot) return; - const streamId = `__streaming_${sessionId}`; + const streamId = `__streaming_${resolvedSessionId}`; const idx = slot.realtimeMessages.findIndex(m => m.id === streamId); if (idx >= 0) { const stream = slot.realtimeMessages[idx]; @@ -392,35 +550,104 @@ export function useSessionStore() { role: 'assistant', }; recomputeMergedIfNeeded(slot); - notify(sessionId); + notify(resolvedSessionId); } - }, [notify]); + }, [notify, resolveSessionId]); /** * Clear realtime messages for a session (e.g., after stream completes and server fetch catches up). */ const clearRealtime = useCallback((sessionId: string) => { - const slot = storeRef.current.get(sessionId); + const resolvedSessionId = resolveSessionId(sessionId) ?? sessionId; + const slot = storeRef.current.get(resolvedSessionId); if (slot) { slot.realtimeMessages = []; recomputeMergedIfNeeded(slot); - notify(sessionId); + notify(resolvedSessionId); } - }, [notify]); + }, [notify, resolveSessionId]); /** * Get merged messages for a session (for rendering). */ const getMessages = useCallback((sessionId: string): NormalizedMessage[] => { - return storeRef.current.get(sessionId)?.merged ?? []; - }, []); + const resolvedSessionId = resolveSessionId(sessionId) ?? sessionId; + return storeRef.current.get(resolvedSessionId)?.merged ?? []; + }, [resolveSessionId]); /** * Get session slot (for status, pagination info, etc.). */ const getSessionSlot = useCallback((sessionId: string): SessionSlot | undefined => { - return storeRef.current.get(sessionId); - }, []); + const resolvedSessionId = resolveSessionId(sessionId) ?? sessionId; + return storeRef.current.get(resolvedSessionId); + }, [resolveSessionId]); + + const replaceSessionId = useCallback((fromSessionId: string, toSessionId: string) => { + const resolvedFromSessionId = resolveSessionId(fromSessionId) ?? fromSessionId; + const resolvedToSessionId = resolveSessionId(toSessionId) ?? toSessionId; + + if (resolvedFromSessionId === resolvedToSessionId) { + sessionAliasesRef.current.set(fromSessionId, resolvedToSessionId); + return; + } + + const store = storeRef.current; + const sourceSlot = store.get(resolvedFromSessionId); + const targetSlot = store.get(resolvedToSessionId) ?? createEmptySlot(); + + if (sourceSlot) { + const migratedServerMessages = sourceSlot.serverMessages.map((msg) => + rewriteMessageSessionId(msg, resolvedFromSessionId, resolvedToSessionId), + ); + const migratedRealtimeMessages = sourceSlot.realtimeMessages.map((msg) => + rewriteMessageSessionId(msg, resolvedFromSessionId, resolvedToSessionId), + ); + + targetSlot.serverMessages = mergeMessagesById(targetSlot.serverMessages, migratedServerMessages); + targetSlot.realtimeMessages = mergeMessagesById(targetSlot.realtimeMessages, migratedRealtimeMessages); + if (targetSlot.realtimeMessages.length > MAX_REALTIME_MESSAGES) { + targetSlot.realtimeMessages = targetSlot.realtimeMessages.slice(-MAX_REALTIME_MESSAGES); + } + targetSlot.status = + sourceSlot.status === 'error' + ? 'error' + : sourceSlot.status === 'streaming' || targetSlot.status === 'streaming' + ? 'streaming' + : sourceSlot.status === 'loading' || targetSlot.status === 'loading' + ? 'loading' + : targetSlot.status; + targetSlot.fetchedAt = Math.max(targetSlot.fetchedAt, sourceSlot.fetchedAt, Date.now()); + targetSlot.total = Math.max( + targetSlot.total, + sourceSlot.total, + targetSlot.serverMessages.length, + targetSlot.realtimeMessages.length, + ); + targetSlot.hasMore = targetSlot.hasMore || sourceSlot.hasMore; + targetSlot.offset = Math.max(targetSlot.offset, sourceSlot.offset); + targetSlot.tokenUsage = targetSlot.tokenUsage ?? sourceSlot.tokenUsage; + recomputeMergedIfNeeded(targetSlot); + + store.set(resolvedToSessionId, targetSlot); + store.delete(resolvedFromSessionId); + } + + sessionAliasesRef.current.set(resolvedFromSessionId, resolvedToSessionId); + sessionAliasesRef.current.set(fromSessionId, resolvedToSessionId); + + for (const [aliasSessionId, targetSessionId] of sessionAliasesRef.current.entries()) { + if (targetSessionId === resolvedFromSessionId) { + sessionAliasesRef.current.set(aliasSessionId, resolvedToSessionId); + } + } + + if (activeSessionIdRef.current === resolvedFromSessionId) { + activeSessionIdRef.current = resolvedToSessionId; + } + + notify(resolvedToSessionId); + }, [notify, resolveSessionId]); return useMemo(() => ({ getSlot, @@ -438,11 +665,12 @@ export function useSessionStore() { clearRealtime, getMessages, getSessionSlot, + replaceSessionId, }), [ getSlot, has, fetchFromServer, fetchMore, appendRealtime, appendRealtimeBatch, refreshFromServer, setActiveSession, setStatus, isStale, updateStreaming, finalizeStreaming, - clearRealtime, getMessages, getSessionSlot, + clearRealtime, getMessages, getSessionSlot, replaceSessionId, ]); } From beb0a50413beddfb16f6b49103e1b6b80567cb90 Mon Sep 17 00:00:00 2001 From: Haile <118998054+blackmammoth@users.noreply.github.com> Date: Mon, 4 May 2026 18:54:02 +0300 Subject: [PATCH 02/20] fix: enhance regex to correctly parse wrapper file paths for claude.exe (#741) --- server/shared/claude-cli-path.test.ts | 14 ++++++++++++++ server/shared/claude-cli-path.ts | 2 +- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/server/shared/claude-cli-path.test.ts b/server/shared/claude-cli-path.test.ts index 87cde218..5d0507d7 100644 --- a/server/shared/claude-cli-path.test.ts +++ b/server/shared/claude-cli-path.test.ts @@ -33,6 +33,20 @@ test('resolveClaudeCodeExecutablePath keeps an explicit JavaScript launcher path assert.equal(resolved, scriptPath); }); +test('resolveClaudeCodeExecutablePath can parse a wrapper file path containing letters r and n before claude.exe', () => { + const wrapperPath = 'C:\\tools\\claude'; + const nativePath = 'C:\\tools\\custom\\bin\\node_modules\\@anthropic-ai\\claude-code\\bin\\claude.exe'; + const readFileSync = (() => `exec "$basedir/custom/bin/node_modules/@anthropic-ai/claude-code/bin/claude.exe" "$@"`) as unknown as ResolveClaudeCodeExecutablePathDependencies['readFileSync']; + + const resolved = resolveClaudeCodeExecutablePath(wrapperPath, { + platform: 'win32', + existsSync: (candidate) => candidate === nativePath, + readFileSync, + }); + + assert.equal(resolved, nativePath); +}); + test('resolveClaudeCodeExecutablePath falls back to the configured command when PATH lookup fails', () => { const execFileSync = (() => { throw new Error('not found'); diff --git a/server/shared/claude-cli-path.ts b/server/shared/claude-cli-path.ts index ae8565d5..d917144e 100644 --- a/server/shared/claude-cli-path.ts +++ b/server/shared/claude-cli-path.ts @@ -50,7 +50,7 @@ function resolveClaudeWrapperBinary( return null; } - const matches = content.matchAll(/["']([^"'\\r\\n]*claude\.exe)["']/gi); + const matches = content.matchAll(/["']([^"'\\\r\n]*claude\.exe)["']/gi); for (const match of matches) { const rawTarget = match[1] .replace(/^\$basedir[\\/]/i, '') From 039696c2de277142f43bcb8743b021b6f5dc9413 Mon Sep 17 00:00:00 2001 From: Haile <118998054+blackmammoth@users.noreply.github.com> Date: Fri, 8 May 2026 22:51:03 +0300 Subject: [PATCH 03/20] Fix/websocket streaming issues (#748) --- server/cursor-cli.js | 8 - server/gemini-cli.js | 232 ++++++++++--- server/modules/database/migrations.ts | 12 + .../database/repositories/projects.db.ts | 13 + .../sessions.db.integration.test.ts | 72 +++++ .../database/repositories/sessions.db.ts | 69 +++- server/modules/database/schema.ts | 1 + server/modules/projects/projects.routes.ts | 23 +- .../services/project-delete.service.ts | 17 +- .../projects-with-sessions-fetch.service.ts | 64 ++++ .../claude-session-synchronizer.provider.ts | 9 +- .../list/claude/claude-sessions.provider.ts | 189 ++++++++++- .../list/codex/codex-sessions.provider.ts | 31 +- .../cursor-session-synchronizer.provider.ts | 59 ++-- .../list/cursor/cursor-sessions.provider.ts | 229 ++++++++++++- .../list/gemini/gemini-auth.provider.ts | 160 ++++++++- .../gemini-session-synchronizer.provider.ts | 44 +-- .../list/gemini/gemini-sessions.provider.ts | 8 +- server/modules/providers/provider.routes.ts | 25 +- .../session-conversations-search.service.ts | 175 +++++++++- .../services/sessions-watcher.service.ts | 12 +- .../providers/services/sessions.service.ts | 123 ++++++- server/openai-codex.js | 86 +++-- server/shared/types.ts | 15 + shared/modelConstants.js | 1 + src/components/app/AppContent.tsx | 2 - .../chat/hooks/useChatComposerState.ts | 14 +- src/components/chat/hooks/useChatMessages.ts | 24 +- .../chat/hooks/useChatRealtimeHandlers.ts | 30 +- .../chat/hooks/useChatSessionState.ts | 15 +- src/components/chat/types/types.ts | 8 +- src/components/chat/view/ChatInterface.tsx | 6 - .../view/subcomponents/ChatMessagesPane.tsx | 7 - src/components/main-content/types/types.ts | 1 - .../main-content/view/MainContent.tsx | 2 - .../sidebar/hooks/useSidebarController.ts | 225 ++++++++++++- src/components/sidebar/types/types.ts | 18 +- src/components/sidebar/utils/utils.ts | 43 +-- src/components/sidebar/view/Sidebar.tsx | 31 +- .../view/subcomponents/SidebarContent.tsx | 304 +++++++++++++++++- .../view/subcomponents/SidebarHeader.tsx | 62 +++- .../view/subcomponents/SidebarModals.tsx | 32 +- .../view/subcomponents/SidebarSessionItem.tsx | 2 +- src/hooks/useProjectsState.ts | 4 +- src/hooks/useSessionProtection.ts | 18 -- src/stores/useSessionStore.ts | 14 + src/utils/api.js | 24 +- 47 files changed, 2194 insertions(+), 369 deletions(-) create mode 100644 server/modules/database/repositories/sessions.db.integration.test.ts diff --git a/server/cursor-cli.js b/server/cursor-cli.js index 66af16ef..1d5a7d79 100644 --- a/server/cursor-cli.js +++ b/server/cursor-cli.js @@ -150,7 +150,6 @@ async function spawnCursor(command, options = {}, ws) { try { const response = JSON.parse(line); - console.log('Parsed JSON response:', response); // Handle different message types switch (response.type) { @@ -159,7 +158,6 @@ async function spawnCursor(command, options = {}, ws) { // Capture session ID if (response.session_id && !capturedSessionId) { capturedSessionId = response.session_id; - console.log('Captured session ID:', capturedSessionId); // Update process key with captured session ID if (processKey !== capturedSessionId) { @@ -197,7 +195,6 @@ async function spawnCursor(command, options = {}, ws) { case 'result': { // Session complete — send stream end + lifecycle complete with result payload - console.log('Cursor session result:', response); const resultText = typeof response.result === 'string' ? response.result : ''; ws.send(createNormalizedMessage({ kind: 'complete', @@ -213,8 +210,6 @@ async function spawnCursor(command, options = {}, ws) { // Unknown message types — ignore. } } catch (parseError) { - console.log('Non-JSON response:', line); - if (shouldSuppressForTrustRetry(line)) { return; } @@ -228,7 +223,6 @@ async function spawnCursor(command, options = {}, ws) { // Handle stdout (streaming JSON responses) cursorProcess.stdout.on('data', (data) => { const rawOutput = data.toString(); - console.log('Cursor CLI stdout:', rawOutput); // Stream chunks can split JSON objects across packets; keep trailing partial line. stdoutLineBuffer += rawOutput; @@ -254,8 +248,6 @@ async function spawnCursor(command, options = {}, ws) { // Handle process completion cursorProcess.on('close', async (code) => { - console.log(`Cursor CLI process exited with code ${code}`); - const finalSessionId = capturedSessionId || sessionId || processKey; activeCursorProcesses.delete(finalSessionId); diff --git a/server/gemini-cli.js b/server/gemini-cli.js index 2e68a938..1f45682c 100644 --- a/server/gemini-cli.js +++ b/server/gemini-cli.js @@ -1,19 +1,123 @@ import { spawn } from 'child_process'; +import { promises as fs } from 'fs'; +import os from 'os'; +import path from 'path'; + import crossSpawn from 'cross-spawn'; -// Use cross-spawn on Windows for correct .cmd resolution (same pattern as cursor-cli.js) -const spawnFunction = process.platform === 'win32' ? crossSpawn : spawn; -import { promises as fs } from 'fs'; -import path from 'path'; -import os from 'os'; import sessionManager from './sessionManager.js'; import GeminiResponseHandler from './gemini-response-handler.js'; import { notifyRunFailed, notifyRunStopped } from './services/notification-orchestrator.js'; import { providerAuthService } from './modules/providers/services/provider-auth.service.js'; import { createNormalizedMessage } from './shared/utils.js'; +// Use cross-spawn on Windows for correct .cmd resolution (same pattern as cursor-cli.js) +const spawnFunction = process.platform === 'win32' ? crossSpawn : spawn; + let activeGeminiProcesses = new Map(); // Track active processes by session ID +function mapGeminiExitCodeToMessage(exitCode) { + switch (exitCode) { + case 42: + return 'Gemini rejected the request input (exit code 42).'; + case 44: + return 'Gemini sandbox error (exit code 44). Check local sandbox/container settings.'; + case 52: + return 'Gemini configuration error (exit code 52). Check your Gemini settings files for invalid JSON/config.'; + case 53: + return 'Gemini conversation turn limit reached (exit code 53). Start a new Gemini session.'; + default: + return null; + } +} + +const GEMINI_AUTH_ENV_KEYS = [ + 'GEMINI_API_KEY', + 'GOOGLE_API_KEY', + 'GOOGLE_CLOUD_PROJECT', + 'GOOGLE_CLOUD_PROJECT_ID', + 'GOOGLE_CLOUD_LOCATION', + 'GOOGLE_APPLICATION_CREDENTIALS' +]; + +function parseEnvFileContent(content) { + const parsed = {}; + + for (const rawLine of content.split(/\r?\n/)) { + const line = rawLine.trim(); + if (!line || line.startsWith('#')) { + continue; + } + + const exportPrefix = 'export '; + const normalizedLine = line.startsWith(exportPrefix) ? line.slice(exportPrefix.length).trim() : line; + const separatorIndex = normalizedLine.indexOf('='); + + if (separatorIndex <= 0) { + continue; + } + + const key = normalizedLine.slice(0, separatorIndex).trim(); + if (!key) { + continue; + } + + let value = normalizedLine.slice(separatorIndex + 1).trim(); + const hasDoubleQuotes = value.startsWith('"') && value.endsWith('"'); + const hasSingleQuotes = value.startsWith('\'') && value.endsWith('\''); + + if (hasDoubleQuotes || hasSingleQuotes) { + value = value.slice(1, -1); + } else { + // Support inline comments in unquoted values: KEY=value # comment + value = value.replace(/\s+#.*$/, '').trim(); + } + + parsed[key] = value; + } + + return parsed; +} + +async function loadGeminiUserLevelEnv() { + const geminiCliHome = (process.env.GEMINI_CLI_HOME || '').trim() || os.homedir(); + const envCandidates = [ + path.join(geminiCliHome, '.gemini', '.env'), + path.join(geminiCliHome, '.env') + ]; + + for (const envPath of envCandidates) { + try { + await fs.access(envPath); + const content = await fs.readFile(envPath, 'utf8'); + return parseEnvFileContent(content); + } catch { + // Keep scanning for the next candidate. + } + } + + return {}; +} + +async function buildGeminiProcessEnv() { + const processEnv = { ...process.env }; + if (processEnv.GEMINI_API_KEY || processEnv.GOOGLE_API_KEY || processEnv.GOOGLE_APPLICATION_CREDENTIALS) { + return processEnv; + } + + // Gemini CLI docs recommend ~/.gemini/.env for persistent headless auth settings. + // When the server process was launched without shell profile variables, we still + // want the spawned CLI process to inherit those user-level credentials. + const userEnv = await loadGeminiUserLevelEnv(); + for (const key of GEMINI_AUTH_ENV_KEYS) { + if (!processEnv[key] && userEnv[key]) { + processEnv[key] = userEnv[key]; + } + } + + return processEnv; +} + async function spawnGemini(command, options = {}, ws) { const { sessionId, projectPath, cwd, toolsSettings, permissionMode, images, sessionSummary } = options; let capturedSessionId = sessionId; // Track session ID throughout the process @@ -100,6 +204,11 @@ async function spawnGemini(command, options = {}, ws) { args.push('--debug'); } + // This integration runs Gemini in headless mode and cannot answer trust prompts. + // Skip folder-trust interactivity so authenticated runs don't fail with + // FatalUntrustedWorkspaceError in previously unseen directories. + args.push('--skip-trust'); + // Add MCP config flag only if MCP servers are configured try { const geminiConfigPath = path.join(os.homedir(), '.gemini.json'); @@ -154,9 +263,6 @@ async function spawnGemini(command, options = {}, ws) { // Try to find gemini in PATH first, then fall back to environment variable const geminiPath = process.env.GEMINI_PATH || 'gemini'; - console.log('Spawning Gemini CLI:', geminiPath, args.join(' ')); - console.log('Working directory:', workingDir); - let spawnCmd = geminiPath; let spawnArgs = args; @@ -168,11 +274,13 @@ async function spawnGemini(command, options = {}, ws) { spawnArgs = ['-c', 'exec "$0" "$@"', geminiPath, ...args]; } + const spawnEnv = await buildGeminiProcessEnv(); + return new Promise((resolve, reject) => { const geminiProcess = spawnFunction(spawnCmd, spawnArgs, { cwd: workingDir, stdio: ['pipe', 'pipe', 'pipe'], - env: { ...process.env } // Inherit all environment variables + env: spawnEnv }); let terminalNotificationSent = false; let terminalFailureReason = null; @@ -276,12 +384,43 @@ async function spawnGemini(command, options = {}, ws) { } }, onInit: (event) => { - if (capturedSessionId) { - const sess = sessionManager.getSession(capturedSessionId); - if (sess && !sess.cliSessionId) { - sess.cliSessionId = event.session_id; - sessionManager.saveSession(capturedSessionId); + const discoveredSessionId = event?.session_id; + if (!discoveredSessionId) { + return; + } + + // New Gemini sessions announce their canonical ID asynchronously via the + // initial `init` stream event. Avoid synthetic IDs and only register + // the session once that real ID is known (same model used by Claude/Codex). + if (!capturedSessionId) { + capturedSessionId = discoveredSessionId; + + sessionManager.createSession(capturedSessionId, cwd || process.cwd()); + if (command) { + sessionManager.addMessage(capturedSessionId, 'user', command); } + + if (processKey !== capturedSessionId) { + activeGeminiProcesses.delete(processKey); + activeGeminiProcesses.set(capturedSessionId, geminiProcess); + } + + geminiProcess.sessionId = capturedSessionId; + + if (ws.setSessionId && typeof ws.setSessionId === 'function') { + ws.setSessionId(capturedSessionId); + } + + if (!sessionId && !sessionCreatedSent) { + sessionCreatedSent = true; + ws.send(createNormalizedMessage({ kind: 'session_created', newSessionId: capturedSessionId, sessionId: capturedSessionId, provider: 'gemini' })); + } + } + + const sess = sessionManager.getSession(capturedSessionId); + if (sess && !sess.cliSessionId) { + sess.cliSessionId = discoveredSessionId; + sessionManager.saveSession(capturedSessionId); } } }); @@ -292,30 +431,6 @@ async function spawnGemini(command, options = {}, ws) { const rawOutput = data.toString(); startTimeout(); // Re-arm the timeout - // For new sessions, create a session ID FIRST - if (!sessionId && !sessionCreatedSent && !capturedSessionId) { - capturedSessionId = `gemini_${Date.now()}`; - sessionCreatedSent = true; - - // Create session in session manager - sessionManager.createSession(capturedSessionId, cwd || process.cwd()); - - // Save the user message now that we have a session ID - if (command) { - sessionManager.addMessage(capturedSessionId, 'user', command); - } - - // Update process key with captured session ID - if (processKey !== capturedSessionId) { - activeGeminiProcesses.delete(processKey); - activeGeminiProcesses.set(capturedSessionId, geminiProcess); - } - - ws.setSessionId && typeof ws.setSessionId === 'function' && ws.setSessionId(capturedSessionId); - - ws.send(createNormalizedMessage({ kind: 'session_created', newSessionId: capturedSessionId, sessionId: capturedSessionId, provider: 'gemini' })); - } - if (responseHandler) { responseHandler.processData(rawOutput); } else if (rawOutput) { @@ -381,12 +496,38 @@ async function spawnGemini(command, options = {}, ws) { notifyTerminalState({ code }); resolve(); } else { - // code 127 = shell "command not found" — check installation + const socketSessionId = typeof ws.getSessionId === 'function' ? ws.getSessionId() : finalSessionId; + + // code 127 = shell "command not found" - check installation if (code === 127) { const installed = await providerAuthService.isProviderInstalled('gemini'); if (!installed) { - const socketSessionId = typeof ws.getSessionId === 'function' ? ws.getSessionId() : finalSessionId; - ws.send(createNormalizedMessage({ kind: 'error', content: 'Gemini CLI is not installed. Please install it first: https://github.com/google-gemini/gemini-cli', sessionId: socketSessionId, provider: 'gemini' })); + terminalFailureReason = 'Gemini CLI is not installed. Please install it first: https://github.com/google-gemini/gemini-cli'; + ws.send(createNormalizedMessage({ kind: 'error', content: terminalFailureReason, sessionId: socketSessionId, provider: 'gemini' })); + } + } else if (code === 41) { + // Gemini CLI documents exit code 41 as FatalAuthenticationError. + // Surface an actionable auth error instead of a generic exit-code message. + let authErrorSuffix = ''; + try { + const authStatus = await providerAuthService.getProviderAuthStatus('gemini'); + if (!authStatus?.authenticated && authStatus?.error) { + authErrorSuffix = ` Details: ${authStatus.error}`; + } + } catch { + // Keep base remediation text when auth status lookup fails. + } + + terminalFailureReason = + 'Gemini authentication failed (exit code 41). ' + + 'Run `gemini` in a terminal to choose an auth method, or configure a valid `GEMINI_API_KEY`.' + + authErrorSuffix; + ws.send(createNormalizedMessage({ kind: 'error', content: terminalFailureReason, sessionId: socketSessionId, provider: 'gemini' })); + } else { + const mappedError = mapGeminiExitCodeToMessage(code); + if (mappedError) { + terminalFailureReason = mappedError; + ws.send(createNormalizedMessage({ kind: 'error', content: terminalFailureReason, sessionId: socketSessionId, provider: 'gemini' })); } } @@ -394,7 +535,14 @@ async function spawnGemini(command, options = {}, ws) { code, error: code === null ? 'Gemini CLI process was terminated or timed out' : null }); - reject(new Error(code === null ? 'Gemini CLI process was terminated or timed out' : `Gemini CLI exited with code ${code}`)); + reject( + new Error( + terminalFailureReason + || (code === null + ? 'Gemini CLI process was terminated or timed out' + : `Gemini CLI exited with code ${code}`) + ) + ); } }); diff --git a/server/modules/database/migrations.ts b/server/modules/database/migrations.ts index 60debe52..5b0490cb 100644 --- a/server/modules/database/migrations.ts +++ b/server/modules/database/migrations.ts @@ -257,8 +257,10 @@ const rebuildSessionsTableWithProjectSchema = (db: Database): void => { if (!shouldRebuild) { addColumnToTableIfNotExists(db, 'sessions', columnNames, 'jsonl_path', 'TEXT'); + addColumnToTableIfNotExists(db, 'sessions', columnNames, 'isArchived', 'BOOLEAN DEFAULT 0'); addColumnToTableIfNotExists(db, 'sessions', columnNames, 'created_at', 'DATETIME'); addColumnToTableIfNotExists(db, 'sessions', columnNames, 'updated_at', 'DATETIME'); + db.exec('UPDATE sessions SET isArchived = COALESCE(isArchived, 0)'); db.exec('UPDATE sessions SET created_at = COALESCE(created_at, CURRENT_TIMESTAMP)'); db.exec('UPDATE sessions SET updated_at = COALESCE(updated_at, CURRENT_TIMESTAMP)'); return; @@ -284,6 +286,10 @@ const rebuildSessionsTableWithProjectSchema = (db: Database): void => { ? 'jsonl_path' : 'NULL'; + const isArchivedExpression = columnNames.includes('isArchived') + ? 'COALESCE(isArchived, 0)' + : '0'; + const createdAtExpression = columnNames.includes('created_at') ? 'COALESCE(created_at, CURRENT_TIMESTAMP)' : 'CURRENT_TIMESTAMP'; @@ -303,6 +309,7 @@ const rebuildSessionsTableWithProjectSchema = (db: Database): void => { custom_name TEXT, project_path TEXT, jsonl_path TEXT, + isArchived BOOLEAN DEFAULT 0, created_at DATETIME DEFAULT CURRENT_TIMESTAMP, updated_at DATETIME DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (session_id), @@ -319,6 +326,7 @@ const rebuildSessionsTableWithProjectSchema = (db: Database): void => { ${customNameExpression} AS custom_name, ${projectPathExpression} AS project_path, ${jsonlPathExpression} AS jsonl_path, + ${isArchivedExpression} AS isArchived, ${createdAtExpression} AS created_at, ${updatedAtExpression} AS updated_at, rowid AS source_rowid @@ -332,6 +340,7 @@ const rebuildSessionsTableWithProjectSchema = (db: Database): void => { custom_name, project_path, jsonl_path, + isArchived, created_at, updated_at, ROW_NUMBER() OVER ( @@ -346,6 +355,7 @@ const rebuildSessionsTableWithProjectSchema = (db: Database): void => { custom_name, project_path, jsonl_path, + isArchived, created_at, updated_at ) @@ -355,6 +365,7 @@ const rebuildSessionsTableWithProjectSchema = (db: Database): void => { custom_name, project_path, jsonl_path, + isArchived, created_at, updated_at FROM ranked_rows @@ -421,6 +432,7 @@ export const runMigrations = (db: Database) => { db.exec('CREATE INDEX IF NOT EXISTS idx_session_ids_lookup ON sessions(session_id)'); db.exec('CREATE INDEX IF NOT EXISTS idx_sessions_project_path ON sessions(project_path)'); + db.exec('CREATE INDEX IF NOT EXISTS idx_sessions_is_archived ON sessions(isArchived)'); db.exec('CREATE INDEX IF NOT EXISTS idx_projects_is_starred ON projects(isStarred)'); db.exec('CREATE INDEX IF NOT EXISTS idx_projects_is_archived ON projects(isArchived)'); diff --git a/server/modules/database/repositories/projects.db.ts b/server/modules/database/repositories/projects.db.ts index c99b8a54..ddbec8fa 100644 --- a/server/modules/database/repositories/projects.db.ts +++ b/server/modules/database/repositories/projects.db.ts @@ -95,6 +95,19 @@ export const projectsDb = { `).all() as ProjectRepositoryRow[]; }, + /** + * Archived rows are queried separately so archive-focused UIs can present + * hidden workspaces without reintroducing them into the active sidebar list. + */ + getArchivedProjectPaths(): ProjectRepositoryRow[] { + const db = getConnection(); + return db.prepare(` + SELECT project_id, project_path, custom_project_name, isStarred, isArchived + FROM projects + WHERE isArchived = 1 + `).all() as ProjectRepositoryRow[]; + }, + getCustomProjectName(projectPath: string): string | null { const db = getConnection(); const normalizedProjectPath = normalizeProjectPath(projectPath); diff --git a/server/modules/database/repositories/sessions.db.integration.test.ts b/server/modules/database/repositories/sessions.db.integration.test.ts new file mode 100644 index 00000000..d14ec5ae --- /dev/null +++ b/server/modules/database/repositories/sessions.db.integration.test.ts @@ -0,0 +1,72 @@ +import assert from 'node:assert/strict'; +import { mkdtemp, rm } from 'node:fs/promises'; +import { tmpdir } from 'node:os'; +import path from 'node:path'; +import test from 'node:test'; + +import { closeConnection } from '@/modules/database/connection.js'; +import { initializeDatabase } from '@/modules/database/init-db.js'; +import { sessionsDb } from '@/modules/database/repositories/sessions.db.js'; + +async function withIsolatedDatabase(runTest: () => void | Promise): Promise { + const previousDatabasePath = process.env.DATABASE_PATH; + const tempDirectory = await mkdtemp(path.join(tmpdir(), 'sessions-db-')); + const databasePath = path.join(tempDirectory, 'auth.db'); + + closeConnection(); + process.env.DATABASE_PATH = databasePath; + await initializeDatabase(); + + try { + await runTest(); + } finally { + closeConnection(); + if (previousDatabasePath === undefined) { + delete process.env.DATABASE_PATH; + } else { + process.env.DATABASE_PATH = previousDatabasePath; + } + await rm(tempDirectory, { recursive: true, force: true }); + } +} + +test('session archive queries hide archived rows from active project views', async () => { + await withIsolatedDatabase(() => { + sessionsDb.createSession('session-active', 'claude', '/workspace/demo-project', 'Active Session'); + sessionsDb.createSession('session-archived', 'claude', '/workspace/demo-project', 'Archived Session'); + sessionsDb.updateSessionIsArchived('session-archived', true); + + const activeSessions = sessionsDb.getAllSessions(); + const archivedSessions = sessionsDb.getArchivedSessions(); + const activeProjectSessions = sessionsDb.getSessionsByProjectPath('/workspace/demo-project'); + const allProjectSessions = sessionsDb.getSessionsByProjectPathIncludingArchived('/workspace/demo-project'); + + assert.deepEqual(activeSessions.map((session) => session.session_id), ['session-active']); + assert.deepEqual(archivedSessions.map((session) => session.session_id), ['session-archived']); + assert.deepEqual(activeProjectSessions.map((session) => session.session_id), ['session-active']); + assert.deepEqual( + allProjectSessions.map((session) => session.session_id).sort(), + ['session-active', 'session-archived'], + ); + assert.equal(sessionsDb.countSessionsByProjectPath('/workspace/demo-project'), 1); + }); +}); + +test('createSession reactivates archived rows when the session becomes active again', async () => { + await withIsolatedDatabase(() => { + sessionsDb.createSession('session-reused', 'claude', '/workspace/demo-project', 'First Name'); + sessionsDb.updateSessionIsArchived('session-reused', true); + + sessionsDb.createSession('session-reused', 'claude', '/workspace/demo-project', 'Updated Name'); + + const activeSessions = sessionsDb.getAllSessions(); + const archivedSessions = sessionsDb.getArchivedSessions(); + const restoredSession = sessionsDb.getSessionById('session-reused'); + + assert.equal(activeSessions.length, 1); + assert.equal(activeSessions[0]?.session_id, 'session-reused'); + assert.equal(activeSessions[0]?.custom_name, 'Updated Name'); + assert.equal(archivedSessions.length, 0); + assert.equal(restoredSession?.isArchived, 0); + }); +}); diff --git a/server/modules/database/repositories/sessions.db.ts b/server/modules/database/repositories/sessions.db.ts index 19a96a56..d79fdeb8 100644 --- a/server/modules/database/repositories/sessions.db.ts +++ b/server/modules/database/repositories/sessions.db.ts @@ -8,13 +8,14 @@ type SessionRow = { project_path: string | null; jsonl_path: string | null; custom_name: string | null; + isArchived: number; created_at: string; updated_at: string; }; type SessionMetadataLookupRow = Pick< SessionRow, - 'session_id' | 'provider' | 'project_path' | 'jsonl_path' | 'custom_name' | 'created_at' | 'updated_at' + 'session_id' | 'provider' | 'project_path' | 'jsonl_path' | 'custom_name' | 'isArchived' | 'created_at' | 'updated_at' >; function normalizeTimestamp(value?: string): string | null { @@ -53,13 +54,14 @@ export const sessionsDb = { projectsDb.createProjectPath(normalizedProjectPath); db.prepare( - `INSERT INTO sessions (session_id, provider, custom_name, project_path, jsonl_path, created_at, updated_at) - VALUES (?, ?, ?, ?, ?, COALESCE(?, CURRENT_TIMESTAMP), COALESCE(?, CURRENT_TIMESTAMP)) + `INSERT INTO sessions (session_id, provider, custom_name, project_path, jsonl_path, isArchived, created_at, updated_at) + VALUES (?, ?, ?, ?, ?, 0, COALESCE(?, CURRENT_TIMESTAMP), COALESCE(?, CURRENT_TIMESTAMP)) ON CONFLICT(session_id) DO UPDATE SET provider = excluded.provider, updated_at = excluded.updated_at, project_path = excluded.project_path, jsonl_path = excluded.jsonl_path, + isArchived = 0, custom_name = COALESCE(excluded.custom_name, sessions.custom_name)` ).run( sessionId, @@ -87,7 +89,7 @@ export const sessionsDb = { const db = getConnection(); const row = db .prepare( - `SELECT session_id, provider, project_path, jsonl_path, custom_name, created_at, updated_at + `SELECT session_id, provider, project_path, jsonl_path, custom_name, isArchived, created_at, updated_at FROM sessions WHERE session_id = ? ORDER BY updated_at DESC @@ -102,8 +104,25 @@ export const sessionsDb = { const db = getConnection(); return db .prepare( - `SELECT session_id, provider, project_path, jsonl_path, custom_name, created_at, updated_at - FROM sessions` + `SELECT session_id, provider, project_path, jsonl_path, custom_name, isArchived, created_at, updated_at + FROM sessions + WHERE isArchived = 0` + ) + .all() as SessionRow[]; + }, + + /** + * Archived rows are intentionally queried separately so the caller can render + * them in a dedicated view without reintroducing them into active session lists. + */ + getArchivedSessions(): SessionRow[] { + const db = getConnection(); + return db + .prepare( + `SELECT session_id, provider, project_path, jsonl_path, custom_name, isArchived, created_at, updated_at + FROM sessions + WHERE isArchived = 1 + ORDER BY datetime(COALESCE(updated_at, created_at)) DESC, session_id DESC` ) .all() as SessionRow[]; }, @@ -113,7 +132,24 @@ export const sessionsDb = { const normalizedProjectPath = normalizeProjectPath(projectPath); return db .prepare( - `SELECT session_id, provider, project_path, jsonl_path, custom_name, created_at, updated_at + `SELECT session_id, provider, project_path, jsonl_path, custom_name, isArchived, created_at, updated_at + FROM sessions + WHERE project_path = ? + AND isArchived = 0` + ) + .all(normalizedProjectPath) as SessionRow[]; + }, + + /** + * Permanent project deletion must see every session row for the path, + * including archived ones, so their transcript files can be cleaned up. + */ + getSessionsByProjectPathIncludingArchived(projectPath: string): SessionRow[] { + const db = getConnection(); + const normalizedProjectPath = normalizeProjectPath(projectPath); + return db + .prepare( + `SELECT session_id, provider, project_path, jsonl_path, custom_name, isArchived, created_at, updated_at FROM sessions WHERE project_path = ?` ) @@ -125,9 +161,10 @@ export const sessionsDb = { const normalizedProjectPath = normalizeProjectPath(projectPath); return db .prepare( - `SELECT session_id, provider, project_path, jsonl_path, custom_name, created_at, updated_at + `SELECT session_id, provider, project_path, jsonl_path, custom_name, isArchived, created_at, updated_at FROM sessions WHERE project_path = ? + AND isArchived = 0 ORDER BY datetime(COALESCE(updated_at, created_at)) DESC, session_id DESC LIMIT ? OFFSET ?` ) @@ -141,7 +178,8 @@ export const sessionsDb = { .prepare( `SELECT COUNT(*) AS count FROM sessions - WHERE project_path = ?` + WHERE project_path = ? + AND isArchived = 0` ) .get(normalizedProjectPath) as { count: number } | undefined; @@ -167,6 +205,19 @@ export const sessionsDb = { return row?.custom_name ?? null; }, + /** + * Soft-delete and restore both use the same flag update so callers keep the + * row, metadata, and file path intact while toggling visibility. + */ + updateSessionIsArchived(sessionId: string, isArchived: boolean): void { + const db = getConnection(); + db.prepare( + `UPDATE sessions + SET isArchived = ? + WHERE session_id = ?` + ).run(isArchived ? 1 : 0, sessionId); + }, + deleteSessionById(sessionId: string): boolean { const db = getConnection(); return db.prepare('DELETE FROM sessions WHERE session_id = ?').run(sessionId).changes > 0; diff --git a/server/modules/database/schema.ts b/server/modules/database/schema.ts index 7af3d80d..b3639af2 100644 --- a/server/modules/database/schema.ts +++ b/server/modules/database/schema.ts @@ -86,6 +86,7 @@ CREATE TABLE IF NOT EXISTS sessions ( custom_name TEXT, project_path TEXT, jsonl_path TEXT, + isArchived BOOLEAN DEFAULT 0, created_at DATETIME DEFAULT CURRENT_TIMESTAMP, updated_at DATETIME DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (session_id), diff --git a/server/modules/projects/projects.routes.ts b/server/modules/projects/projects.routes.ts index a1c94352..5b52425c 100644 --- a/server/modules/projects/projects.routes.ts +++ b/server/modules/projects/projects.routes.ts @@ -3,9 +3,9 @@ import express from 'express'; import { createProject, updateProjectDisplayName } from '@/modules/projects/services/project-management.service.js'; import { startCloneProject } from '@/modules/projects/services/project-clone.service.js'; import { getProjectTaskMaster } from '@/modules/projects/services/projects-has-taskmaster.service.js'; -import { AppError, asyncHandler } from '@/shared/utils.js'; -import { getProjectSessionsPage, getProjectsWithSessions } from '@/modules/projects/services/projects-with-sessions-fetch.service.js'; -import { deleteOrArchiveProject } from '@/modules/projects/services/project-delete.service.js'; +import { AppError, asyncHandler, createApiSuccessResponse } from '@/shared/utils.js'; +import { getArchivedProjectsWithSessions, getProjectSessionsPage, getProjectsWithSessions } from '@/modules/projects/services/projects-with-sessions-fetch.service.js'; +import { deleteOrArchiveProject, restoreArchivedProject } from '@/modules/projects/services/project-delete.service.js'; import { applyLegacyStarredProjectIds, toggleProjectStar } from '@/modules/projects/services/project-star.service.js'; const router = express.Router(); @@ -73,6 +73,14 @@ router.get( }), ); +router.get( + '/archived', + asyncHandler(async (_req, res) => { + const projects = await getArchivedProjectsWithSessions(); + res.json(createApiSuccessResponse({ projects })); + }), +); + router.get( '/:projectId/sessions', asyncHandler(async (req, res) => { @@ -230,6 +238,15 @@ router.post( }), ); +router.post( + '/:projectId/restore', + asyncHandler(async (req, res) => { + const projectId = typeof req.params.projectId === 'string' ? req.params.projectId : ''; + restoreArchivedProject(projectId); + res.json(createApiSuccessResponse({ projectId, isArchived: false })); + }), +); + /** * - `force` not set / false: archive project in DB only (`isArchived` = 1; hidden from active list). * - `force=true`: remove DB row, delete session rows for that path, remove all `*.jsonl` under the Claude project dir. diff --git a/server/modules/projects/services/project-delete.service.ts b/server/modules/projects/services/project-delete.service.ts index a743b4b6..cbb1c7ed 100644 --- a/server/modules/projects/services/project-delete.service.ts +++ b/server/modules/projects/services/project-delete.service.ts @@ -42,7 +42,7 @@ async function unlinkJsonlIfExists(filePath: string): Promise { * Loads all session rows for the project path and removes each distinct `jsonl_path` file on disk. */ export async function deleteSessionJsonlFilesForProjectPath(projectPath: string): Promise { - const sessions = sessionsDb.getSessionsByProjectPath(projectPath); + const sessions = sessionsDb.getSessionsByProjectPathIncludingArchived(projectPath); const paths = uniqueJsonlPathsFromSessions(sessions); for (const filePath of paths) { @@ -73,3 +73,18 @@ export async function deleteOrArchiveProject(projectId: string, force: boolean): sessionsDb.deleteSessionsByProjectPath(row.project_path); projectsDb.deleteProjectById(projectId); } + +/** + * Restores one archived project row back into the active project list. + */ +export function restoreArchivedProject(projectId: string): void { + const row = projectsDb.getProjectById(projectId); + if (!row) { + throw new AppError(`Unknown projectId: ${projectId}`, { + code: 'PROJECT_NOT_FOUND', + statusCode: 404, + }); + } + + projectsDb.updateProjectIsArchivedById(projectId, false); +} diff --git a/server/modules/projects/services/projects-with-sessions-fetch.service.ts b/server/modules/projects/services/projects-with-sessions-fetch.service.ts index 4d473a21..55a5d6d8 100644 --- a/server/modules/projects/services/projects-with-sessions-fetch.service.ts +++ b/server/modules/projects/services/projects-with-sessions-fetch.service.ts @@ -40,6 +40,10 @@ export type ProjectListItem = { }; }; +export type ArchivedProjectListItem = ProjectListItem & { + isArchived: true; +}; + type ProgressUpdate = { phase: 'loading' | 'complete'; current: number; @@ -150,6 +154,16 @@ function bucketSessionRowsByProvider(rows: SessionRepositoryRow[]): SessionsByPr return byProvider; } +function readProjectSessionsIncludingArchived(projectPath: string): ProjectSessionsPageResult { + const rows = sessionsDb.getSessionsByProjectPathIncludingArchived(projectPath) as SessionRepositoryRow[]; + + return { + sessionsByProvider: bucketSessionRowsByProvider(rows), + total: rows.length, + hasMore: false, + }; +} + /** * Reads one paginated project session slice from the DB and groups rows by provider. */ @@ -255,6 +269,56 @@ export async function getProjectsWithSessions( return projects; } +/** + * Reads archived projects from DB and includes every session row for each + * project path, because an archived workspace should surface all preserved + * conversation history in the archive view regardless of each session's flag. + */ +export async function getArchivedProjectsWithSessions( + options: Pick = {}, +): Promise { + if (!options.skipSynchronization) { + await sessionSynchronizerService.synchronizeSessions(); + } + + const projectRows = projectsDb.getArchivedProjectPaths() as Array<{ + project_id: string; + project_path: string; + custom_project_name?: string | null; + isStarred?: number; + }>; + + const archivedProjects: ArchivedProjectListItem[] = []; + + for (const row of projectRows) { + const displayName = + row.custom_project_name && row.custom_project_name.trim().length > 0 + ? row.custom_project_name + : await generateDisplayName(path.basename(row.project_path) || row.project_path, row.project_path); + + const sessionsPage = readProjectSessionsIncludingArchived(row.project_path); + + archivedProjects.push({ + projectId: row.project_id, + path: row.project_path, + displayName, + fullPath: row.project_path, + isStarred: Boolean(row.isStarred), + isArchived: true, + sessions: sessionsPage.sessionsByProvider.claude, + cursorSessions: sessionsPage.sessionsByProvider.cursor, + codexSessions: sessionsPage.sessionsByProvider.codex, + geminiSessions: sessionsPage.sessionsByProvider.gemini, + sessionMeta: { + hasMore: sessionsPage.hasMore, + total: sessionsPage.total, + }, + }); + } + + return archivedProjects; +} + /** * Loads one paginated session slice for a specific project id. */ diff --git a/server/modules/providers/list/claude/claude-session-synchronizer.provider.ts b/server/modules/providers/list/claude/claude-session-synchronizer.provider.ts index 66f055fd..1bf3bffc 100644 --- a/server/modules/providers/list/claude/claude-session-synchronizer.provider.ts +++ b/server/modules/providers/list/claude/claude-session-synchronizer.provider.ts @@ -157,9 +157,14 @@ export class ClaudeSessionSynchronizer implements IProviderSessionSynchronizer { const eventSessionId = typeof data.sessionId === 'string' ? data.sessionId : undefined; const aiTitle = typeof data.aiTitle === 'string' ? data.aiTitle : undefined; const lastPrompt = typeof data.lastPrompt === 'string' ? data.lastPrompt : undefined; + const claudeRenamedTitle = typeof data.customTitle === 'string' ? data.customTitle : undefined; - if ((eventType === 'ai-title' && eventSessionId === sessionId && aiTitle?.trim()) || (eventType === 'last-prompt' && eventSessionId === sessionId && lastPrompt?.trim())) { - return aiTitle || lastPrompt; + if ( + (eventType === 'ai-title' && eventSessionId === sessionId && aiTitle?.trim()) || + (eventType === 'last-prompt' && eventSessionId === sessionId && lastPrompt?.trim()) || + (eventType === "custom-title" && eventSessionId === sessionId && claudeRenamedTitle?.trim()) + ) { + return aiTitle || lastPrompt || claudeRenamedTitle; } } } catch { diff --git a/server/modules/providers/list/claude/claude-sessions.provider.ts b/server/modules/providers/list/claude/claude-sessions.provider.ts index ffd358f3..f803d92c 100644 --- a/server/modules/providers/list/claude/claude-sessions.provider.ts +++ b/server/modules/providers/list/claude/claude-sessions.provider.ts @@ -200,17 +200,18 @@ async function getSessionMessages( } /** - * Claude writes internal command and system reminder entries into history. - * Those are useful for the CLI but should not appear in the user-facing chat. + * Claude writes a mix of truly internal transcript rows and "UI-hidden" local + * command artifacts into the same JSONL stream. + * + * Important distinction: + * - system reminders / caveats / interruption banners should stay hidden + * - local command payloads (`...`) and stdout wrappers + * (`...`) should be remapped into normal chat messages + * instead of being discarded as internal content */ const INTERNAL_CONTENT_PREFIXES = [ - '', - '', - '', - '', '', 'Caveat:', - 'This session is being continued from a previous', '[Request interrupted', ] as const; @@ -218,6 +219,73 @@ function isInternalContent(content: string): boolean { return INTERNAL_CONTENT_PREFIXES.some((prefix) => content.startsWith(prefix)); } +/** + * Claude wraps local slash-command metadata in lightweight XML-like tags inside + * a plain string payload. We intentionally parse only the small tag surface we + * care about instead of introducing a generic XML parser for untrusted history. + */ +function extractTaggedContent(content: string, tagName: string): string | null { + const escapedTagName = tagName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); + const match = new RegExp(`<${escapedTagName}>([\\s\\S]*?)<\\/${escapedTagName}>`).exec(content); + return match ? match[1] : null; +} + +type ClaudeLocalCommandPayload = { + commandName: string; + commandMessage: string; + commandArgs: string; +}; + +/** + * Converts Claude's hidden local command wrapper into structured metadata. + * + * The three tags often coexist in one string payload. Returning `null` lets the + * normal text path continue untouched for unrelated messages. + */ +function parseLocalCommandPayload(content: string): ClaudeLocalCommandPayload | null { + const commandName = extractTaggedContent(content, 'command-name'); + const commandMessage = extractTaggedContent(content, 'command-message'); + const commandArgs = extractTaggedContent(content, 'command-args'); + + if (commandName === null && commandMessage === null && commandArgs === null) { + return null; + } + + return { + commandName: commandName ?? '', + commandMessage: commandMessage ?? '', + commandArgs: commandArgs ?? '', + }; +} + +/** + * Produces the short user-visible command string that should appear in chat. + * + * We prefer the slash-prefixed command name because that most closely matches + * what the user actually typed, and only fall back to the message body when the + * command name is unavailable in older transcript variants. + */ +function buildLocalCommandDisplayText(payload: ClaudeLocalCommandPayload): string { + const commandName = payload.commandName.trim(); + const commandMessage = payload.commandMessage.trim(); + const commandArgs = payload.commandArgs.trim(); + const baseCommand = commandName || commandMessage; + + if (!baseCommand) { + return ''; + } + + return commandArgs ? `${baseCommand} ${commandArgs}` : baseCommand; +} + +/** + * Claude local-command stdout may contain ANSI styling codes because it was + * captured from the terminal. The web chat should receive readable plain text. + */ +function stripAnsiFormatting(text: string): string { + return text.replace(/\u001B\[[0-9;?]*[ -/]*[@-~]/g, ''); +} + export class ClaudeSessionsProvider implements IProviderSessions { /** * Normalizes one Claude JSONL entry or live SDK stream event into the shared @@ -240,7 +308,7 @@ export class ClaudeSessionsProvider implements IProviderSessions { const ts = raw.timestamp || new Date().toISOString(); const baseId = raw.uuid || generateMessageId('claude'); - if (raw.message?.role === 'user' && raw.message?.content) { + if (raw.message?.role === 'user' && raw.message?.content && raw.isMeta !== true) { if (Array.isArray(raw.message.content)) { for (let partIndex = 0; partIndex < raw.message.content.length; partIndex++) { const part = raw.message.content[partIndex]; @@ -293,6 +361,80 @@ export class ClaudeSessionsProvider implements IProviderSessions { } } else if (typeof raw.message.content === 'string') { const text = raw.message.content; + + /** + * Claude stores compact summaries as synthetic "user" rows so the CLI + * can resume the next session turn with the summary in-context. + * + * For the web UI this is much more useful as assistant-authored summary + * text; otherwise it is both filtered by the generic internal-prefix + * check and visually mislabeled as a user message. + */ + if (raw.isCompactSummary === true && text.trim()) { + messages.push(createNormalizedMessage({ + id: baseId, + sessionId, + timestamp: ts, + provider: PROVIDER, + kind: 'text', + role: 'assistant', + content: text, + isCompactSummary: true, + })); + return messages; + } + + /** + * Local slash commands are serialized as tagged text even though they + * are semantically a user action. Expose the parsed fields to the + * frontend and emit a plain user-visible command string so the command + * no longer disappears from history. + */ + const localCommandPayload = parseLocalCommandPayload(text); + if (localCommandPayload) { + const displayText = buildLocalCommandDisplayText(localCommandPayload); + if (displayText) { + messages.push(createNormalizedMessage({ + id: baseId, + sessionId, + timestamp: ts, + provider: PROVIDER, + kind: 'text', + role: 'user', + content: displayText, + commandName: localCommandPayload.commandName, + commandMessage: localCommandPayload.commandMessage, + commandArgs: localCommandPayload.commandArgs, + isLocalCommand: true, + })); + } + return messages; + } + + /** + * Local command stdout is also written as a "user" row in Claude's + * transcript, but it is terminal output produced in response to the + * command. Re-label it as assistant text so the chat transcript matches + * the actual conversational flow seen by the user. + */ + const localCommandStdout = extractTaggedContent(text, 'local-command-stdout'); + if (localCommandStdout !== null) { + const stdoutText = stripAnsiFormatting(localCommandStdout).trim(); + if (stdoutText) { + messages.push(createNormalizedMessage({ + id: baseId, + sessionId, + timestamp: ts, + provider: PROVIDER, + kind: 'text', + role: 'assistant', + content: stdoutText, + isLocalCommandStdout: true, + })); + } + return messages; + } + if (text && !isInternalContent(text)) { messages.push(createNormalizedMessage({ id: baseId, @@ -414,7 +556,9 @@ export class ClaudeSessionsProvider implements IProviderSessions { let result: ClaudeHistoryResult; try { - result = await getSessionMessages(sessionId, limit, offset); + // Load full history first so `total` reflects frontend-normalized messages, + // not raw JSONL records. + result = await getSessionMessages(sessionId, null, 0); } catch (error) { const message = error instanceof Error ? error.message : String(error); console.warn(`[ClaudeProvider] Failed to load session ${sessionId}:`, message); @@ -422,8 +566,6 @@ export class ClaudeSessionsProvider implements IProviderSessions { } const rawMessages = Array.isArray(result) ? result : (result.messages || []); - const total = Array.isArray(result) ? rawMessages.length : (result.total || 0); - const hasMore = Array.isArray(result) ? false : Boolean(result.hasMore); const toolResultMap = new Map(); for (const raw of rawMessages) { @@ -464,12 +606,31 @@ export class ClaudeSessionsProvider implements IProviderSessions { } } + const totalNormalized = normalized.length; + let total = 0; + for (const msg of normalized) { + if (msg.kind !== 'tool_result') { + total += 1; + } + } + const normalizedOffset = Math.max(0, offset); + const normalizedLimit = limit === null ? null : Math.max(0, limit); + const messages = normalizedLimit === null + ? normalized + : normalized.slice( + Math.max(0, totalNormalized - normalizedOffset - normalizedLimit), + Math.max(0, totalNormalized - normalizedOffset), + ); + const hasMore = normalizedLimit === null + ? false + : Math.max(0, totalNormalized - normalizedOffset - normalizedLimit) > 0; + return { - messages: normalized, + messages, total, hasMore, - offset, - limit, + offset: normalizedOffset, + limit: normalizedLimit, }; } } diff --git a/server/modules/providers/list/codex/codex-sessions.provider.ts b/server/modules/providers/list/codex/codex-sessions.provider.ts index a7fe8129..5cad1334 100644 --- a/server/modules/providers/list/codex/codex-sessions.provider.ts +++ b/server/modules/providers/list/codex/codex-sessions.provider.ts @@ -520,7 +520,9 @@ export class CodexSessionsProvider implements IProviderSessions { let result: CodexHistoryResult; try { - result = await getCodexSessionMessages(sessionId, limit, offset); + // Load full history first so `total` reflects frontend-normalized messages, + // not raw JSONL records. + result = await getCodexSessionMessages(sessionId, null, 0); } catch (error) { const message = error instanceof Error ? error.message : String(error); console.warn(`[CodexProvider] Failed to load session ${sessionId}:`, message); @@ -528,8 +530,6 @@ export class CodexSessionsProvider implements IProviderSessions { } const rawMessages = Array.isArray(result) ? result : (result.messages || []); - const total = Array.isArray(result) ? rawMessages.length : (result.total || 0); - const hasMore = Array.isArray(result) ? false : Boolean(result.hasMore); const tokenUsage = Array.isArray(result) ? undefined : result.tokenUsage; const normalized: NormalizedMessage[] = []; @@ -552,12 +552,31 @@ export class CodexSessionsProvider implements IProviderSessions { } } + const totalNormalized = normalized.length; + let total = 0; + for (const msg of normalized) { + if (msg.kind !== 'tool_result') { + total += 1; + } + } + const normalizedOffset = Math.max(0, offset); + const normalizedLimit = limit === null ? null : Math.max(0, limit); + const messages = normalizedLimit === null + ? normalized + : normalized.slice( + Math.max(0, totalNormalized - normalizedOffset - normalizedLimit), + Math.max(0, totalNormalized - normalizedOffset), + ); + const hasMore = normalizedLimit === null + ? false + : Math.max(0, totalNormalized - normalizedOffset - normalizedLimit) > 0; + return { - messages: normalized, + messages, total, hasMore, - offset, - limit, + offset: normalizedOffset, + limit: normalizedLimit, tokenUsage, }; } diff --git a/server/modules/providers/list/cursor/cursor-session-synchronizer.provider.ts b/server/modules/providers/list/cursor/cursor-session-synchronizer.provider.ts index 4be02dee..d5ea9b3c 100644 --- a/server/modules/providers/list/cursor/cursor-session-synchronizer.provider.ts +++ b/server/modules/providers/list/cursor/cursor-session-synchronizer.provider.ts @@ -45,44 +45,28 @@ export class CursorSessionSynchronizer implements IProviderSessionSynchronizer { */ async synchronize(since?: Date): Promise { const projectsDir = path.join(this.cursorHome, 'projects'); - const projectEntries = await listDirectoryEntriesSafe(projectsDir); - const seenProjectPaths = new Set(); let processed = 0; - for (const entry of projectEntries) { - if (!entry.isDirectory()) { + + const files = await findFilesRecursivelyCreatedAfter(projectsDir, '.jsonl', since ?? null); + + for (const filePath of files) { + const parsed = await this.processSessionFile(filePath); + if (!parsed) { continue; } - const workerLogPath = path.join(projectsDir, entry.name, 'worker.log'); - const projectPath = await this.extractProjectPathFromWorkerLog(workerLogPath); - if (!projectPath || seenProjectPaths.has(projectPath)) { - continue; - } - - seenProjectPaths.add(projectPath); - const projectHash = this.md5(projectPath); - const chatsDir = path.join(this.cursorHome, 'chats', projectHash); - const files = await findFilesRecursivelyCreatedAfter(chatsDir, '.jsonl', since ?? null); - - for (const filePath of files) { - const parsed = await this.processSessionFile(filePath); - if (!parsed) { - continue; - } - - const timestamps = await readFileTimestamps(filePath); - sessionsDb.createSession( - parsed.sessionId, - this.provider, - parsed.projectPath, - parsed.sessionName, - timestamps.createdAt, - timestamps.updatedAt, - filePath - ); - processed += 1; - } + const timestamps = await readFileTimestamps(filePath); + sessionsDb.createSession( + parsed.sessionId, + this.provider, + parsed.projectPath, + parsed.sessionName, + timestamps.createdAt, + timestamps.updatedAt, + filePath + ); + processed += 1; } return processed; @@ -113,13 +97,6 @@ export class CursorSessionSynchronizer implements IProviderSessionSynchronizer { ); } - /** - * Produces the same project hash Cursor uses in chat directory names. - */ - private md5(input: string): string { - return crypto.createHash('md5').update(input).digest('hex'); - } - /** * Extracts project path from Cursor worker.log. */ @@ -149,7 +126,7 @@ export class CursorSessionSynchronizer implements IProviderSessionSynchronizer { */ private async processSessionFile(filePath: string): Promise { const sessionId = path.basename(filePath, '.jsonl'); - const grandparentDir = path.dirname(path.dirname(filePath)); + const grandparentDir = path.dirname(path.dirname(path.dirname(filePath))); const workerLogPath = path.join(grandparentDir, 'worker.log'); const projectPath = await this.extractProjectPathFromWorkerLog(workerLogPath); diff --git a/server/modules/providers/list/cursor/cursor-sessions.provider.ts b/server/modules/providers/list/cursor/cursor-sessions.provider.ts index e276ba8c..90c9afa0 100644 --- a/server/modules/providers/list/cursor/cursor-sessions.provider.ts +++ b/server/modules/providers/list/cursor/cursor-sessions.provider.ts @@ -25,6 +25,167 @@ type CursorMessageBlob = { content: AnyRecord; }; +function isInternalCursorText(value: unknown): boolean { + if (typeof value !== 'string') { + return false; + } + + const normalized = value.trim(); + return normalized.startsWith('') || normalized.startsWith(''); +} + +function isInternalCursorPart(part: unknown): boolean { + if (!part || typeof part !== 'object') { + return false; + } + + const record = part as AnyRecord; + const type = typeof record.type === 'string' ? record.type : ''; + if (type === 'user_info' || type === 'system_reminder') { + return true; + } + + return isInternalCursorText(record.text); +} + +function unwrapUserQueryText(value: string, role: 'user' | 'assistant'): string { + if (role !== 'user') { + return value; + } + + const normalized = value.trimStart(); + const openTag = ''; + const closeTag = ''; + if (!normalized.startsWith(openTag)) { + return value; + } + + const afterOpen = normalized.slice(openTag.length); + const closeIndex = afterOpen.lastIndexOf(closeTag); + const inner = closeIndex >= 0 ? afterOpen.slice(0, closeIndex) : afterOpen; + return inner.trim(); +} + +function normalizeToolId(value: unknown): string | null { + if (typeof value !== 'string') { + return null; + } + + const normalized = value.trim(); + return normalized ? normalized : null; +} + +function extractCursorToolResultContent(item: AnyRecord): string { + if (typeof item.result === 'string' && item.result.trim()) { + return item.result; + } + + if (typeof item.output === 'string' && item.output.trim()) { + return item.output; + } + + if (Array.isArray(item.experimental_content)) { + const experimentalText = item.experimental_content + .map((part: unknown) => { + if (typeof part === 'string') { + return part; + } + if (part && typeof part === 'object') { + const record = part as AnyRecord; + if (typeof record.text === 'string') { + return record.text; + } + } + return ''; + }) + .filter(Boolean) + .join('\n'); + + if (experimentalText.trim()) { + return experimentalText; + } + } + + return typeof item.result === 'string' ? item.result : ''; +} + +function parseCursorToolInput(rawInput: unknown): unknown { + if (typeof rawInput !== 'string') { + return rawInput; + } + + const trimmed = rawInput.trim(); + if (!trimmed) { + return rawInput; + } + + try { + return JSON.parse(trimmed); + } catch { + return rawInput; + } +} + +function normalizeCursorToolInput(toolName: string, rawInput: unknown): unknown { + const parsed = parseCursorToolInput(rawInput); + if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) { + return parsed; + } + + const input = parsed as AnyRecord; + const normalized: AnyRecord = { ...input }; + + const filePath = input.file_path + ?? input.filePath + ?? input.path + ?? input.file + ?? input.filename; + if (typeof filePath === 'string' && filePath.trim()) { + normalized.file_path = filePath; + } + + if (toolName === 'Write') { + const content = input.content + ?? input.text + ?? input.value + ?? input.contents + ?? input.fileContent + ?? input.new_string + ?? input.newString; + if (typeof content === 'string') { + normalized.content = content; + } + } + + if (toolName === 'Edit') { + const oldString = input.old_string + ?? input.oldString + ?? input.old + ?? ''; + const newString = input.new_string + ?? input.newString + ?? input.new + ?? input.content + ?? ''; + + if (typeof oldString === 'string') { + normalized.old_string = oldString; + } + if (typeof newString === 'string') { + normalized.new_string = newString; + } + } + + if (toolName === 'ApplyPatch') { + const patch = input.patch ?? input.diff ?? input.content; + if (typeof patch === 'string' && !normalized.patch) { + normalized.patch = patch; + } + } + + return normalized; +} + function sanitizeCursorSessionId(sessionId: string): string { const normalized = sessionId.trim(); if (!normalized) { @@ -225,13 +386,14 @@ export class CursorSessionsProvider implements IProviderSessions { try { const blobs = await this.loadCursorBlobs(sessionId, projectPath); const allNormalized = this.normalizeCursorBlobs(blobs, sessionId); - const total = allNormalized.length; + const renderableMessages = allNormalized.filter((msg) => msg.kind !== 'tool_result'); + const total = renderableMessages.length; if (limit !== null) { const start = offset; const page = limit === 0 ? [] - : allNormalized.slice(start, start + limit); + : renderableMessages.slice(start, start + limit); const hasMore = limit === 0 ? start < total : start + limit < total; @@ -245,7 +407,7 @@ export class CursorSessionsProvider implements IProviderSessions { } return { - messages: allNormalized, + messages: renderableMessages, total, hasMore: false, offset: 0, @@ -283,11 +445,24 @@ export class CursorSessionsProvider implements IProviderSessions { let text = ''; if (Array.isArray(content.message.content)) { text = content.message.content - .map((part: string | AnyRecord) => typeof part === 'string' ? part : part?.text || '') + .map((part: string | AnyRecord) => { + if (typeof part === 'string') { + if (isInternalCursorText(part)) { + return ''; + } + return unwrapUserQueryText(part, role); + } + if (isInternalCursorPart(part)) { + return ''; + } + return unwrapUserQueryText(part?.text || '', role); + }) .filter(Boolean) .join('\n'); } else if (typeof content.message.content === 'string') { - text = content.message.content; + if (!isInternalCursorText(content.message.content)) { + text = unwrapUserQueryText(content.message.content, role); + } } if (text?.trim()) { messages.push(createNormalizedMessage({ @@ -316,7 +491,14 @@ export class CursorSessionsProvider implements IProviderSessions { if (item?.type !== 'tool-result') { continue; } - const toolCallId = item.toolCallId || content.id; + const cursorOptions = content.providerOptions?.cursor as AnyRecord | undefined; + const highLevelToolCallResult = cursorOptions?.highLevelToolCallResult; + const toolCallId = normalizeToolId(item.toolCallId) + || normalizeToolId(item.tool_call_id) + || normalizeToolId(highLevelToolCallResult?.toolCallId) + || normalizeToolId(highLevelToolCallResult?.tool_call_id) + || normalizeToolId(content.id) + || ''; messages.push(createNormalizedMessage({ id: `${baseId}_tr`, sessionId, @@ -324,8 +506,9 @@ export class CursorSessionsProvider implements IProviderSessions { provider: PROVIDER, kind: 'tool_result', toolId: toolCallId, - content: item.result || '', - isError: false, + content: extractCursorToolResultContent(item), + isError: Boolean(item.isError || item.is_error), + toolUseResult: highLevelToolCallResult, })); } continue; @@ -336,8 +519,15 @@ export class CursorSessionsProvider implements IProviderSessions { if (Array.isArray(content.content)) { for (let partIdx = 0; partIdx < content.content.length; partIdx++) { const part = content.content[partIdx]; + if (isInternalCursorPart(part)) { + continue; + } if (part?.type === 'text' && part?.text) { + const normalizedPartText = unwrapUserQueryText(part.text, role); + if (!normalizedPartText) { + continue; + } messages.push(createNormalizedMessage({ id: `${baseId}_${partIdx}`, sessionId, @@ -345,7 +535,7 @@ export class CursorSessionsProvider implements IProviderSessions { provider: PROVIDER, kind: 'text', role, - content: part.text, + content: normalizedPartText, sequence: blob.sequence, rowid: blob.rowid, })); @@ -361,7 +551,11 @@ export class CursorSessionsProvider implements IProviderSessions { } else if (part?.type === 'tool-call' || part?.type === 'tool_use') { const rawToolName = part.toolName || part.name || 'Unknown Tool'; const toolName = rawToolName === 'ApplyPatch' ? 'Edit' : rawToolName; - const toolId = part.toolCallId || part.id || `tool_${i}_${partIdx}`; + const toolId = normalizeToolId(part.toolCallId) + || normalizeToolId(part.tool_call_id) + || normalizeToolId(part.id) + || `tool_${i}_${partIdx}`; + const normalizedToolInput = normalizeCursorToolInput(rawToolName, part.args ?? part.input); const message = createNormalizedMessage({ id: `${baseId}_${partIdx}`, sessionId, @@ -369,14 +563,22 @@ export class CursorSessionsProvider implements IProviderSessions { provider: PROVIDER, kind: 'tool_use', toolName, - toolInput: part.args || part.input, + toolInput: normalizedToolInput, toolId, }); messages.push(message); toolUseMap.set(toolId, message); } } - } else if (typeof content.content === 'string' && content.content.trim()) { + } else if ( + typeof content.content === 'string' + && content.content.trim() + && !isInternalCursorText(content.content) + ) { + const normalizedText = unwrapUserQueryText(content.content, role); + if (!normalizedText) { + continue; + } messages.push(createNormalizedMessage({ id: baseId, sessionId, @@ -384,7 +586,7 @@ export class CursorSessionsProvider implements IProviderSessions { provider: PROVIDER, kind: 'text', role, - content: content.content, + content: normalizedText, sequence: blob.sequence, rowid: blob.rowid, })); @@ -401,6 +603,7 @@ export class CursorSessionsProvider implements IProviderSessions { toolUse.toolResult = { content: msg.content, isError: msg.isError, + toolUseResult: msg.toolUseResult, }; } } diff --git a/server/modules/providers/list/gemini/gemini-auth.provider.ts b/server/modules/providers/list/gemini/gemini-auth.provider.ts index 60b0749e..c6897e74 100644 --- a/server/modules/providers/list/gemini/gemini-auth.provider.ts +++ b/server/modules/providers/list/gemini/gemini-auth.provider.ts @@ -15,7 +15,24 @@ type GeminiCredentialsStatus = { error?: string; }; +type GeminiAuthType = + | 'oauth-personal' + | 'gemini-api-key' + | 'vertex-ai' + | 'compute-default-credentials' + | 'gateway' + | 'cloud-shell' + | null; + export class GeminiProviderAuth implements IProviderAuth { + /** + * Gemini CLI can override its home root via GEMINI_CLI_HOME. + * Use the same resolution so status checks match runtime behavior. + */ + private getGeminiCliHome(): string { + return process.env.GEMINI_CLI_HOME?.trim() || os.homedir(); + } + /** * Checks whether the Gemini CLI is available on this host. */ @@ -58,6 +75,88 @@ export class GeminiProviderAuth implements IProviderAuth { }; } + /** + * Parses dotenv-style key/value pairs. + */ + private parseEnvFile(content: string): Record { + const parsed: Record = {}; + + for (const rawLine of content.split(/\r?\n/)) { + const line = rawLine.trim(); + if (!line || line.startsWith('#')) { + continue; + } + + const normalizedLine = line.startsWith('export ') + ? line.slice('export '.length).trim() + : line; + const separatorIndex = normalizedLine.indexOf('='); + if (separatorIndex <= 0) { + continue; + } + + const key = normalizedLine.slice(0, separatorIndex).trim(); + if (!key) { + continue; + } + + let value = normalizedLine.slice(separatorIndex + 1).trim(); + const quoted = (value.startsWith('"') && value.endsWith('"')) || (value.startsWith('\'') && value.endsWith('\'')); + if (quoted) { + value = value.slice(1, -1); + } else { + value = value.replace(/\s+#.*$/, '').trim(); + } + + parsed[key] = value; + } + + return parsed; + } + + /** + * Loads user-level auth env in Gemini's "first file found" order. + */ + private async loadUserLevelAuthEnv(): Promise> { + const geminiCliHome = this.getGeminiCliHome(); + const envCandidates = [ + path.join(geminiCliHome, '.gemini', '.env'), + path.join(geminiCliHome, '.env'), + ]; + + for (const envPath of envCandidates) { + try { + const content = await readFile(envPath, 'utf8'); + return this.parseEnvFile(content); + } catch { + // Continue to the next fallback. + } + } + + return {}; + } + + /** + * Reads Gemini's selected auth type from settings.json when available. + */ + private async readSelectedAuthType(): Promise { + try { + const settingsPath = path.join(this.getGeminiCliHome(), '.gemini', 'settings.json'); + const content = await readFile(settingsPath, 'utf8'); + const settings = readObjectRecord(JSON.parse(content)); + const security = readObjectRecord(settings?.security); + const auth = readObjectRecord(security?.auth); + const selectedType = readOptionalString(auth?.selectedType); + if (!selectedType) { + return null; + } + + return selectedType as GeminiAuthType; + } catch { + return null; + } + } + /** * Checks Gemini credentials from API key env vars or local OAuth credential files. */ @@ -66,8 +165,46 @@ export class GeminiProviderAuth implements IProviderAuth { return { authenticated: true, email: 'API Key Auth', method: 'api_key' }; } + const userEnv = await this.loadUserLevelAuthEnv(); + if (readOptionalString(userEnv.GEMINI_API_KEY)) { + return { authenticated: true, email: 'API Key Auth', method: 'api_key' }; + } + + const selectedType = await this.readSelectedAuthType(); + if (selectedType === 'vertex-ai') { + const hasGoogleApiKey = Boolean( + process.env.GOOGLE_API_KEY?.trim() + || readOptionalString(userEnv.GOOGLE_API_KEY) + ); + const hasProject = Boolean( + process.env.GOOGLE_CLOUD_PROJECT?.trim() + || process.env.GOOGLE_CLOUD_PROJECT_ID?.trim() + || readOptionalString(userEnv.GOOGLE_CLOUD_PROJECT) + || readOptionalString(userEnv.GOOGLE_CLOUD_PROJECT_ID) + ); + const hasLocation = Boolean( + process.env.GOOGLE_CLOUD_LOCATION?.trim() + || readOptionalString(userEnv.GOOGLE_CLOUD_LOCATION) + ); + const hasServiceAccount = Boolean( + process.env.GOOGLE_APPLICATION_CREDENTIALS?.trim() + || readOptionalString(userEnv.GOOGLE_APPLICATION_CREDENTIALS) + ); + + if (hasGoogleApiKey || hasServiceAccount || (hasProject && hasLocation)) { + return { authenticated: true, email: 'Vertex AI Auth', method: 'vertex_ai' }; + } + + return { + authenticated: false, + email: null, + method: 'vertex_ai', + error: 'Gemini is set to Vertex AI, but required env vars are missing', + }; + } + try { - const credsPath = path.join(os.homedir(), '.gemini', 'oauth_creds.json'); + const credsPath = path.join(this.getGeminiCliHome(), '.gemini', 'oauth_creds.json'); const content = await readFile(credsPath, 'utf8'); const creds = readObjectRecord(JSON.parse(content)) ?? {}; const accessToken = readOptionalString(creds.access_token); @@ -106,6 +243,25 @@ export class GeminiProviderAuth implements IProviderAuth { method: 'credentials_file', }; } catch { + if (selectedType === 'gemini-api-key') { + return { + authenticated: false, + email: null, + method: 'api_key', + error: 'Gemini is set to "Use Gemini API key", but GEMINI_API_KEY is unavailable', + }; + } + + if (selectedType === 'oauth-personal') { + return { + authenticated: false, + email: null, + method: 'credentials_file', + error: 'Gemini is set to Google sign-in, but no cached OAuth credentials were found', + }; + } + + // If no explicit auth type was selected, surface the generic "not configured" error. return { authenticated: false, email: null, @@ -140,7 +296,7 @@ export class GeminiProviderAuth implements IProviderAuth { */ private async getActiveAccountEmail(): Promise { try { - const accPath = path.join(os.homedir(), '.gemini', 'google_accounts.json'); + const accPath = path.join(this.getGeminiCliHome(), '.gemini', 'google_accounts.json'); const accContent = await readFile(accPath, 'utf8'); const accounts = readObjectRecord(JSON.parse(accContent)); return readOptionalString(accounts?.active) ?? null; diff --git a/server/modules/providers/list/gemini/gemini-session-synchronizer.provider.ts b/server/modules/providers/list/gemini/gemini-session-synchronizer.provider.ts index 52c62e9b..7ec3eff9 100644 --- a/server/modules/providers/list/gemini/gemini-session-synchronizer.provider.ts +++ b/server/modules/providers/list/gemini/gemini-session-synchronizer.provider.ts @@ -39,33 +39,37 @@ export class GeminiSessionSynchronizer implements IProviderSessionSynchronizer { async synchronize(since?: Date): Promise { const projectHashLookup = this.buildProjectHashLookup(); - const legacySessionFiles = await findFilesRecursivelyCreatedAfter( - path.join(this.geminiHome, 'sessions'), - '.json', - since ?? null - ); - const legacyTempFiles = await findFilesRecursivelyCreatedAfter( - path.join(this.geminiHome, 'tmp'), - '.json', - since ?? null - ); - const jsonlSessionFiles = await findFilesRecursivelyCreatedAfter( - path.join(this.geminiHome, 'sessions'), - '.jsonl', - since ?? null - ); + // const legacySessionFiles = await findFilesRecursivelyCreatedAfter( + // path.join(this.geminiHome, 'sessions'), + // '.json', + // since ?? null + // ); + // Gemini creates overlapping artifacts across `sessions/` and `tmp/`. + // We currently index only `tmp/*/chats/*.jsonl` because those files are the + // live transcript source and avoid duplicate session rows from mirrored files. + // const legacyTempFiles = await findFilesRecursivelyCreatedAfter( + // path.join(this.geminiHome, 'tmp'), + // '.json', + // since ?? null + // ); + // const jsonlSessionFiles = await findFilesRecursivelyCreatedAfter( + // path.join(this.geminiHome, 'sessions'), + // '.jsonl', + // since ?? null + // ); const jsonlTempFiles = await findFilesRecursivelyCreatedAfter( path.join(this.geminiHome, 'tmp'), '.jsonl', since ?? null ); - // Process legacy JSON first, then JSONL. If both exist for a session id, - // the JSONL artifact becomes the canonical jsonl_path via upsert. + // Current strategy: index only temp chat JSONL artifacts. const files = [ - ...legacySessionFiles, - ...legacyTempFiles, - ...jsonlSessionFiles, + // ...legacySessionFiles, + // Intentionally disabled to avoid duplicate indexing from mirrored + // `sessions/*.json` and `sessions/*.jsonl` artifacts. + // ...legacyTempFiles, + // ...jsonlSessionFiles, ...jsonlTempFiles, ]; diff --git a/server/modules/providers/list/gemini/gemini-sessions.provider.ts b/server/modules/providers/list/gemini/gemini-sessions.provider.ts index 606a1f17..98de12c7 100644 --- a/server/modules/providers/list/gemini/gemini-sessions.provider.ts +++ b/server/modules/providers/list/gemini/gemini-sessions.provider.ts @@ -528,10 +528,16 @@ export class GeminiSessionsProvider implements IProviderSessions { const messages = pageLimit === null ? normalized.slice(start) : normalized.slice(start, start + pageLimit); + let total = 0; + for (const msg of normalized) { + if (msg.kind !== 'tool_result') { + total += 1; + } + } return { messages, - total: normalized.length, + total, hasMore: pageLimit === null ? false : start + pageLimit < normalized.length, offset: start, limit: pageLimit, diff --git a/server/modules/providers/provider.routes.ts b/server/modules/providers/provider.routes.ts index af6d16d6..ea95f83d 100644 --- a/server/modules/providers/provider.routes.ts +++ b/server/modules/providers/provider.routes.ts @@ -311,12 +311,33 @@ router.post( ); // ----------------- Session routes ----------------- +router.get( + '/sessions/archived', + asyncHandler(async (_req: Request, res: Response) => { + const sessions = sessionsService.listArchivedSessions(); + res.json(createApiSuccessResponse({ sessions })); + }), +); + router.delete( '/sessions/:sessionId', asyncHandler(async (req: Request, res: Response) => { const sessionId = parseSessionId(req.params.sessionId); - const deletedFromDisk = parseOptionalBooleanQuery(req.query.deletedFromDisk, 'deletedFromDisk') ?? false; - const result = await sessionsService.deleteSessionById(sessionId, deletedFromDisk); + const force = parseOptionalBooleanQuery(req.query.force, 'force') ?? false; + const deletedFromDisk = parseOptionalBooleanQuery(req.query.deletedFromDisk, 'deletedFromDisk') ?? force; + const result = await sessionsService.deleteOrArchiveSessionById(sessionId, { + force, + deletedFromDisk, + }); + res.json(createApiSuccessResponse(result)); + }), +); + +router.post( + '/sessions/:sessionId/restore', + asyncHandler(async (req: Request, res: Response) => { + const sessionId = parseSessionId(req.params.sessionId); + const result = sessionsService.restoreSessionById(sessionId); res.json(createApiSuccessResponse(result)); }), ); diff --git a/server/modules/providers/services/session-conversations-search.service.ts b/server/modules/providers/services/session-conversations-search.service.ts index afc8bdac..101a0955 100644 --- a/server/modules/providers/services/session-conversations-search.service.ts +++ b/server/modules/providers/services/session-conversations-search.service.ts @@ -89,13 +89,8 @@ const RIPGREP_CHUNK_CONCURRENCY = 6; const UNKNOWN_PROJECT_KEY = '__unknown_project__'; const INTERNAL_CONTENT_PREFIXES = [ - '', - '', - '', - '', '', 'Caveat:', - 'This session is being continued from a previous', 'Invalid API key', '[Request interrupted', ] as const; @@ -302,6 +297,135 @@ function extractClaudeText(content: unknown): string { .join(' '); } +function extractTaggedContent(content: string, tagName: string): string | null { + const escapedTagName = tagName.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); + const match = new RegExp(`<${escapedTagName}>([\\s\\S]*?)<\\/${escapedTagName}>`).exec(content); + return match ? match[1] : null; +} + +type ClaudeLocalCommandPayload = { + commandName: string; + commandMessage: string; + commandArgs: string; +}; + +function parseClaudeLocalCommandPayload(content: string): ClaudeLocalCommandPayload | null { + const commandName = extractTaggedContent(content, 'command-name'); + const commandMessage = extractTaggedContent(content, 'command-message'); + const commandArgs = extractTaggedContent(content, 'command-args'); + + if (commandName === null && commandMessage === null && commandArgs === null) { + return null; + } + + return { + commandName: commandName ?? '', + commandMessage: commandMessage ?? '', + commandArgs: commandArgs ?? '', + }; +} + +function buildClaudeLocalCommandDisplayText(payload: ClaudeLocalCommandPayload): string { + const commandName = payload.commandName.trim(); + const commandMessage = payload.commandMessage.trim(); + const commandArgs = payload.commandArgs.trim(); + const baseCommand = commandName || commandMessage; + + if (!baseCommand) { + return ''; + } + + return commandArgs ? `${baseCommand} ${commandArgs}` : baseCommand; +} + +function stripAnsiFormatting(text: string): string { + return text.replace(/\u001B\[[0-9;?]*[ -/]*[@-~]/g, ''); +} + +type ClaudeSearchableMessage = { + text: string; + role: 'user' | 'assistant'; +}; + +/** + * Claude mixes visible chat, compact summaries, and local command wrappers into + * the same transcript stream. Search should operate on the user-visible meaning + * of those rows rather than the raw wrapper syntax. + */ +function extractClaudeSearchableMessage(entry: AnyRecord): ClaudeSearchableMessage | null { + if (!entry.message?.content || entry.isApiErrorMessage) { + return null; + } + + const rawRole = entry.message.role; + if (rawRole !== 'user' && rawRole !== 'assistant') { + return null; + } + + if (typeof entry.message.content === 'string') { + const content = String(entry.message.content); + + if (entry.isCompactSummary === true && content.trim()) { + return { + text: content, + role: 'assistant', + }; + } + + const localCommand = parseClaudeLocalCommandPayload(content); + if (localCommand) { + const displayText = buildClaudeLocalCommandDisplayText(localCommand); + return displayText + ? { + text: displayText, + role: 'user', + } + : null; + } + + const localCommandStdout = extractTaggedContent(content, 'local-command-stdout'); + if (localCommandStdout !== null) { + const stdoutText = stripAnsiFormatting(localCommandStdout).trim(); + return stdoutText + ? { + text: stdoutText, + role: 'assistant', + } + : null; + } + + if (!content || isInternalContent(content)) { + return null; + } + + return { + text: content, + role: rawRole, + }; + } + + const text = extractClaudeText(entry.message.content); + if (!text) { + return null; + } + + if (entry.isCompactSummary === true) { + return { + text, + role: 'assistant', + }; + } + + if (isInternalContent(text)) { + return null; + } + + return { + text, + role: rawRole, + }; +} + function extractCodexText(content: unknown): string { if (typeof content === 'string') { return content; @@ -348,6 +472,7 @@ function extractGeminiText(content: unknown): string { function normalizeSearchableSessions(rows: SessionRepositoryRow[]): SearchableSessionRow[] { const normalizedRows: SearchableSessionRow[] = []; + const projectArchiveStateByPath = new Map(); for (const row of rows) { const provider = row.provider as SearchableProvider; @@ -365,6 +490,27 @@ function normalizeSearchableSessions(rows: SessionRepositoryRow[]): SearchableSe continue; } + /** + * Active session rows can still belong to an archived project because + * project archiving intentionally preserves the underlying session data. + * Global conversation search should follow the visible workspace model, + * which means excluding any session whose owning project is archived. + * + * Cache the archive lookup per normalized project path so one search pass + * does not re-query the same project row for every session in that folder. + */ + const normalizedProjectPath = typeof row.project_path === 'string' ? row.project_path.trim() : ''; + if (normalizedProjectPath) { + if (!projectArchiveStateByPath.has(normalizedProjectPath)) { + const projectRow = projectsDb.getProjectPath(normalizedProjectPath); + projectArchiveStateByPath.set(normalizedProjectPath, Boolean(projectRow?.isArchived)); + } + + if (projectArchiveStateByPath.get(normalizedProjectPath) === true) { + continue; + } + } + normalizedRows.push({ ...row, provider, @@ -733,18 +879,21 @@ async function parseClaudeSessionMatches( } } - if (!entry.message?.content || entry.isApiErrorMessage) { + const searchableMessage = extractClaudeSearchableMessage(entry); + if (!searchableMessage) { continue; } - const role = entry.message.role; - if (role !== 'user' && role !== 'assistant') { - continue; - } + const { text, role } = searchableMessage; - const text = extractClaudeText(entry.message.content); - if (!text || isInternalContent(text)) { - continue; + /** + * Claude compact summaries are the most faithful session-summary source + * after a `/compact` because they describe the post-compaction state that + * the resumed session actually continues from. Prefer them over generic + * fallback user text when present. + */ + if (entry.isCompactSummary === true) { + state.resolvedSummary = text; } if (role === 'user') { diff --git a/server/modules/providers/services/sessions-watcher.service.ts b/server/modules/providers/services/sessions-watcher.service.ts index 3a7348ed..7a36e599 100644 --- a/server/modules/providers/services/sessions-watcher.service.ts +++ b/server/modules/providers/services/sessions-watcher.service.ts @@ -18,16 +18,18 @@ const PROVIDER_WATCH_PATHS: Array<{ provider: LLMProvider; rootPath: string }> = }, { provider: 'cursor', - rootPath: path.join(os.homedir(), '.cursor', 'chats'), + rootPath: path.join(os.homedir(), '.cursor', 'projects'), }, { provider: 'codex', rootPath: path.join(os.homedir(), '.codex', 'sessions'), }, - { - provider: 'gemini', - rootPath: path.join(os.homedir(), '.gemini', 'sessions'), - }, + // { + // provider: 'gemini', + // rootPath: path.join(os.homedir(), '.gemini', 'sessions'), + // }, + // Keep `sessions/` watcher disabled: Gemini also mirrors artifacts there, + // which causes duplicate synchronization events. { provider: 'gemini', rootPath: path.join(os.homedir(), '.gemini', 'tmp'), diff --git a/server/modules/providers/services/sessions.service.ts b/server/modules/providers/services/sessions.service.ts index 32572e95..49b5dcb7 100644 --- a/server/modules/providers/services/sessions.service.ts +++ b/server/modules/providers/services/sessions.service.ts @@ -1,6 +1,7 @@ import fsp from 'node:fs/promises'; +import path from 'node:path'; -import { sessionsDb } from '@/modules/database/index.js'; +import { projectsDb, sessionsDb } from '@/modules/database/index.js'; import { providerRegistry } from '@/modules/providers/provider.registry.js'; import type { FetchHistoryOptions, @@ -10,6 +11,19 @@ import type { } from '@/shared/types.js'; import { AppError } from '@/shared/utils.js'; +type ArchivedSessionListItem = { + sessionId: string; + provider: LLMProvider; + projectId: string | null; + projectPath: string | null; + projectDisplayName: string; + sessionTitle: string; + createdAt: string | null; + updatedAt: string | null; + lastActivity: string | null; + isProjectArchived: boolean; +}; + /** * Removes one file if it exists. */ @@ -26,6 +40,28 @@ async function removeFileIfExists(filePath: string): Promise { } } +/** + * Archive rows need a stable project label even when the owning project is not + * part of the active sidebar payload. This lightweight resolver keeps the + * archive API self-contained while still matching the project's stored display + * name when one exists. + */ +function resolveProjectDisplayName( + projectPath: string | null, + customProjectName: string | null | undefined, +): string { + const trimmedCustomName = typeof customProjectName === 'string' ? customProjectName.trim() : ''; + if (trimmedCustomName.length > 0) { + return trimmedCustomName; + } + + if (!projectPath) { + return 'Unknown Project'; + } + + return path.basename(projectPath) || projectPath; +} + /** * Application service for provider-backed session message operations. * @@ -79,15 +115,53 @@ export const sessionsService = { }, /** - * Deletes one persisted session row by id. - * - * When `deletedFromDisk` is true and a session `jsonl_path` exists, the path - * is deleted from disk before the DB row is removed. + * Returns archived sessions with enough project metadata for the sidebar to + * group, filter, open, and restore them without a per-row follow-up query. */ - async deleteSessionById( + listArchivedSessions(): ArchivedSessionListItem[] { + const archivedSessions = sessionsDb.getArchivedSessions(); + const projectCache = new Map>(); + + return archivedSessions.map((session) => { + const projectPath = session.project_path?.trim() ? session.project_path : null; + let project = null; + + if (projectPath) { + if (!projectCache.has(projectPath)) { + projectCache.set(projectPath, projectsDb.getProjectPath(projectPath)); + } + project = projectCache.get(projectPath) ?? null; + } + + return { + sessionId: session.session_id, + provider: session.provider as LLMProvider, + projectId: project?.project_id ?? null, + projectPath, + projectDisplayName: resolveProjectDisplayName(projectPath, project?.custom_project_name), + sessionTitle: session.custom_name?.trim() || session.session_id, + createdAt: session.created_at ?? null, + updatedAt: session.updated_at ?? null, + lastActivity: session.updated_at ?? session.created_at ?? null, + isProjectArchived: Boolean(project?.isArchived), + }; + }); + }, + + /** + * Archives or permanently deletes one persisted session row by id. + * + * Soft-delete mirrors the project behavior by toggling `isArchived` so the + * row disappears from active lists but remains restorable. Force-delete + * optionally removes the transcript file before deleting the database row. + */ + async deleteOrArchiveSessionById( sessionId: string, - deletedFromDisk = false, - ): Promise<{ sessionId: string; deletedFromDisk: boolean }> { + options: { + force?: boolean; + deletedFromDisk?: boolean; + } = {}, + ): Promise<{ sessionId: string; action: 'archived' | 'deleted'; deletedFromDisk: boolean }> { const session = sessionsDb.getSessionById(sessionId); if (!session) { throw new AppError(`Session "${sessionId}" was not found.`, { @@ -96,8 +170,17 @@ export const sessionsService = { }); } + if (!options.force) { + sessionsDb.updateSessionIsArchived(sessionId, true); + return { + sessionId, + action: 'archived', + deletedFromDisk: false, + }; + } + let removedFromDisk = false; - if (deletedFromDisk && session.jsonl_path) { + if (options.deletedFromDisk && session.jsonl_path) { removedFromDisk = await removeFileIfExists(session.jsonl_path); } @@ -109,7 +192,27 @@ export const sessionsService = { }); } - return { sessionId, deletedFromDisk: removedFromDisk }; + return { + sessionId, + action: 'deleted', + deletedFromDisk: removedFromDisk, + }; + }, + + /** + * Restores one archived session back into the active sidebar lists. + */ + restoreSessionById(sessionId: string): { sessionId: string; isArchived: false } { + const session = sessionsDb.getSessionById(sessionId); + if (!session) { + throw new AppError(`Session "${sessionId}" was not found.`, { + code: 'SESSION_NOT_FOUND', + statusCode: 404, + }); + } + + sessionsDb.updateSessionIsArchived(sessionId, false); + return { sessionId, isArchived: false }; }, /** diff --git a/server/openai-codex.js b/server/openai-codex.js index 5a7a9007..03497c30 100644 --- a/server/openai-codex.js +++ b/server/openai-codex.js @@ -143,7 +143,7 @@ function transformCodexEvent(event) { case 'thread.started': return { type: 'thread_started', - threadId: event.id + threadId: event.thread_id || event.id }; case 'error': @@ -207,7 +207,8 @@ export async function queryCodex(command, options = {}, ws) { let codex; let thread; - let currentSessionId = sessionId; + let capturedSessionId = sessionId; + let sessionCreatedSent = false; let terminalFailure = null; const abortController = new AbortController(); @@ -231,20 +232,23 @@ export async function queryCodex(command, options = {}, ws) { thread = codex.startThread(threadOptions); } - // Get the thread ID - currentSessionId = thread.id || sessionId || `codex-${Date.now()}`; + const registerSession = (id) => { + if (!id) { + return; + } + activeCodexSessions.set(id, { + thread, + codex, + status: 'running', + abortController, + startedAt: new Date().toISOString() + }); + }; - // Track the session - activeCodexSessions.set(currentSessionId, { - thread, - codex, - status: 'running', - abortController, - startedAt: new Date().toISOString() - }); - - // Send session created event - sendMessage(ws, createNormalizedMessage({ kind: 'session_created', newSessionId: currentSessionId, sessionId: currentSessionId, provider: 'codex' })); + // Existing sessions can be tracked immediately; new sessions are tracked after thread.started. + if (capturedSessionId) { + registerSession(capturedSessionId); + } // Execute with streaming const streamedTurn = await thread.runStreamed(command, { @@ -252,11 +256,34 @@ export async function queryCodex(command, options = {}, ws) { }); for await (const event of streamedTurn.events) { + // Capture thread/session id lazily from the stream (Codex emits this asynchronously). + if (event.type === 'thread.started') { + const discoveredSessionId = event.thread_id || event.id || null; + if (discoveredSessionId && !capturedSessionId) { + capturedSessionId = discoveredSessionId; + registerSession(capturedSessionId); + + if (ws.setSessionId && typeof ws.setSessionId === 'function') { + ws.setSessionId(capturedSessionId); + } + + if (!sessionId && !sessionCreatedSent) { + sessionCreatedSent = true; + sendMessage(ws, createNormalizedMessage({ kind: 'session_created', newSessionId: capturedSessionId, sessionId: capturedSessionId, provider: 'codex' })); + } + } + } + // Check if session was aborted - const session = activeCodexSessions.get(currentSessionId); - if (!session || session.status === 'aborted') { + if (abortController.signal.aborted) { break; } + if (capturedSessionId) { + const session = activeCodexSessions.get(capturedSessionId); + if (session?.status === 'aborted') { + break; + } + } if (event.type === 'item.started' || event.type === 'item.updated') { continue; @@ -265,7 +292,7 @@ export async function queryCodex(command, options = {}, ws) { const transformed = transformCodexEvent(event); // Normalize the transformed event into NormalizedMessage(s) via adapter - const normalizedMsgs = sessionsService.normalizeMessage('codex', transformed, currentSessionId); + const normalizedMsgs = sessionsService.normalizeMessage('codex', transformed, capturedSessionId || sessionId || null); for (const msg of normalizedMsgs) { sendMessage(ws, msg); } @@ -275,7 +302,7 @@ export async function queryCodex(command, options = {}, ws) { notifyRunFailed({ userId: ws?.userId || null, provider: 'codex', - sessionId: currentSessionId, + sessionId: capturedSessionId || sessionId || null, sessionName: sessionSummary, error: terminalFailure }); @@ -284,24 +311,29 @@ export async function queryCodex(command, options = {}, ws) { // Extract and send token usage if available (normalized to match Claude format) if (event.type === 'turn.completed' && event.usage) { const totalTokens = (event.usage.input_tokens || 0) + (event.usage.output_tokens || 0); - sendMessage(ws, createNormalizedMessage({ kind: 'status', text: 'token_budget', tokenBudget: { used: totalTokens, total: 200000 }, sessionId: currentSessionId, provider: 'codex' })); + sendMessage(ws, createNormalizedMessage({ kind: 'status', text: 'token_budget', tokenBudget: { used: totalTokens, total: 200000 }, sessionId: capturedSessionId || sessionId || null, provider: 'codex' })); } } // Send completion event if (!terminalFailure) { - sendMessage(ws, createNormalizedMessage({ kind: 'complete', actualSessionId: thread.id, sessionId: currentSessionId, provider: 'codex' })); + sendMessage(ws, createNormalizedMessage({ + kind: 'complete', + actualSessionId: capturedSessionId || thread.id || sessionId || null, + sessionId: capturedSessionId || sessionId || null, + provider: 'codex' + })); notifyRunStopped({ userId: ws?.userId || null, provider: 'codex', - sessionId: currentSessionId, + sessionId: capturedSessionId || sessionId || null, sessionName: sessionSummary, stopReason: 'completed' }); } } catch (error) { - const session = currentSessionId ? activeCodexSessions.get(currentSessionId) : null; + const session = capturedSessionId ? activeCodexSessions.get(capturedSessionId) : null; const wasAborted = session?.status === 'aborted' || error?.name === 'AbortError' || @@ -316,12 +348,12 @@ export async function queryCodex(command, options = {}, ws) { ? 'Codex CLI is not configured. Please set up authentication first.' : error.message; - sendMessage(ws, createNormalizedMessage({ kind: 'error', content: errorContent, sessionId: currentSessionId, provider: 'codex' })); + sendMessage(ws, createNormalizedMessage({ kind: 'error', content: errorContent, sessionId: capturedSessionId || sessionId || null, provider: 'codex' })); if (!terminalFailure) { notifyRunFailed({ userId: ws?.userId || null, provider: 'codex', - sessionId: currentSessionId, + sessionId: capturedSessionId || sessionId || null, sessionName: sessionSummary, error }); @@ -330,8 +362,8 @@ export async function queryCodex(command, options = {}, ws) { } finally { // Update session status - if (currentSessionId) { - const session = activeCodexSessions.get(currentSessionId); + if (capturedSessionId) { + const session = activeCodexSessions.get(capturedSessionId); if (session) { session.status = session.status === 'aborted' ? 'aborted' : 'completed'; } diff --git a/server/shared/types.ts b/server/shared/types.ts index d15f69e7..af09abf2 100644 --- a/server/shared/types.ts +++ b/server/shared/types.ts @@ -102,6 +102,21 @@ export type NormalizedMessage = { kind: MessageKind; role?: 'user' | 'assistant'; content?: string; + /** + * Optional display-oriented metadata used by providers that need to expose + * richer transcript artifacts without introducing a brand-new message kind. + * + * Current Claude usage: + * - local slash commands expose parsed command fields + * - compact summaries are flagged so the UI can treat them differently later + */ + displayText?: string; + commandName?: string; + commandMessage?: string; + commandArgs?: string; + isLocalCommand?: boolean; + isLocalCommandStdout?: boolean; + isCompactSummary?: boolean; images?: unknown; toolName?: string; toolInput?: unknown; diff --git a/shared/modelConstants.js b/shared/modelConstants.js index 90b973ed..ae42ed27 100644 --- a/shared/modelConstants.js +++ b/shared/modelConstants.js @@ -84,6 +84,7 @@ export const GEMINI_MODELS = { { value: "gemini-2.5-flash", label: "Gemini 2.5 Flash" }, { value: "gemini-2.5-pro", label: "Gemini 2.5 Pro" }, { value: "gemini-2.0-flash-lite", label: "Gemini 2.0 Flash Lite" }, + { value: "gemini-2.5-flash-lite", label: "Gemini 2.5 Flash Lite" }, { value: "gemini-2.0-flash", label: "Gemini 2.0 Flash" }, { value: "gemini-2.0-pro-exp", label: "Gemini 2.0 Pro Experimental" }, { diff --git a/src/components/app/AppContent.tsx b/src/components/app/AppContent.tsx index 4dd6979a..1ba41b95 100644 --- a/src/components/app/AppContent.tsx +++ b/src/components/app/AppContent.tsx @@ -34,7 +34,6 @@ function AppContentInner() { markSessionAsInactive, markSessionAsProcessing, markSessionAsNotProcessing, - replaceTemporarySession, } = useSessionProtection(); const { @@ -191,7 +190,6 @@ function AppContentInner() { onSessionProcessing={markSessionAsProcessing} onSessionNotProcessing={markSessionAsNotProcessing} processingSessions={processingSessions} - onReplaceTemporarySession={replaceTemporarySession} onNavigateToSession={(targetSessionId: string, options) => navigate(`/session/${targetSessionId}`, { replace: Boolean(options?.replace) }) } diff --git a/src/components/chat/hooks/useChatComposerState.ts b/src/components/chat/hooks/useChatComposerState.ts index c53cd01d..000cd33f 100644 --- a/src/components/chat/hooks/useChatComposerState.ts +++ b/src/components/chat/hooks/useChatComposerState.ts @@ -10,6 +10,7 @@ import type { TouchEvent, } from 'react'; import { useDropzone } from 'react-dropzone'; + import { authenticatedFetch } from '../../../utils/api'; import { thinkingModes } from '../constants/thinkingModes'; import { grantClaudeToolPermission } from '../utils/chatPermissions'; @@ -21,6 +22,7 @@ import type { } from '../types/types'; import type { Project, ProjectSession, LLMProvider } from '../../../types/app'; import { escapeRegExp } from '../utils/chatFormatting'; + import { useFileMentions } from './useFileMentions'; import { type SlashCommand, useSlashCommands } from './useSlashCommands'; @@ -80,9 +82,6 @@ const createFakeSubmitEvent = () => { return { preventDefault: () => undefined } as unknown as FormEvent; }; -const isTemporarySessionId = (sessionId: string | null | undefined) => - Boolean(sessionId && sessionId.startsWith('new-session-')); - const getNotificationSessionSummary = ( selectedSession: ProjectSession | null, fallbackInput: string, @@ -533,7 +532,6 @@ export function useChatComposerState({ const effectiveSessionId = currentSessionId || selectedSession?.id || sessionStorage.getItem('cursorSessionId'); - const sessionToActivate = effectiveSessionId || `new-session-${Date.now()}`; const userMessage: ChatMessage = { type: 'user', @@ -559,10 +557,12 @@ export function useChatComposerState({ // Reset stale pending IDs from previous interrupted runs before creating a new one. sessionStorage.removeItem('pendingSessionId'); } + // For new sessions we intentionally keep this as `null` until the backend + // emits `session_created` with the canonical provider session id. pendingViewSessionRef.current = { sessionId: null, startedAt: Date.now() }; } - onSessionActive?.(sessionToActivate); - if (effectiveSessionId && !isTemporarySessionId(effectiveSessionId)) { + if (effectiveSessionId) { + onSessionActive?.(effectiveSessionId); onSessionProcessing?.(effectiveSessionId); } @@ -868,7 +868,7 @@ export function useChatComposerState({ ]; const targetSessionId = - candidateSessionIds.find((sessionId) => Boolean(sessionId) && !isTemporarySessionId(sessionId)) || null; + candidateSessionIds.find((sessionId) => Boolean(sessionId)) || null; if (!targetSessionId) { console.warn('Abort requested but no concrete session ID is available yet.'); diff --git a/src/components/chat/hooks/useChatMessages.ts b/src/components/chat/hooks/useChatMessages.ts index 8f417de5..1590c4af 100644 --- a/src/components/chat/hooks/useChatMessages.ts +++ b/src/components/chat/hooks/useChatMessages.ts @@ -11,8 +11,9 @@ import { decodeHtmlEntities, unescapeWithMathProtection, formatUsageLimitText } * Convert NormalizedMessage[] from the session store into ChatMessage[] * that the existing UI components expect. * - * Internal/system content (e.g. , ) is already - * filtered server-side by the Claude provider module. + * Truly internal/system content is already filtered server-side. Some Claude + * transcript artifacts such as local slash commands and compact summaries are + * intentionally preserved and annotated so they can render like normal chat. */ export function normalizedToChatMessages(messages: NormalizedMessage[]): ChatMessage[] { const converted: ChatMessage[] = []; @@ -26,6 +27,16 @@ export function normalizedToChatMessages(messages: NormalizedMessage[]): ChatMes } for (const msg of messages) { + const sharedMetadata = { + displayText: msg.displayText, + commandName: msg.commandName, + commandMessage: msg.commandMessage, + commandArgs: msg.commandArgs, + isLocalCommand: msg.isLocalCommand, + isLocalCommandStdout: msg.isLocalCommandStdout, + isCompactSummary: msg.isCompactSummary, + }; + switch (msg.kind) { case 'text': { const content = msg.content || ''; @@ -42,12 +53,14 @@ export function normalizedToChatMessages(messages: NormalizedMessage[]): ChatMes timestamp: msg.timestamp, isTaskNotification: true, taskStatus: taskNotifMatch[1]?.trim() || 'completed', + ...sharedMetadata, }); } else { converted.push({ type: 'user', content: unescapeWithMathProtection(decodeHtmlEntities(content)), timestamp: msg.timestamp, + ...sharedMetadata, }); } } else { @@ -58,6 +71,7 @@ export function normalizedToChatMessages(messages: NormalizedMessage[]): ChatMes type: 'assistant', content: text, timestamp: msg.timestamp, + ...sharedMetadata, }); } break; @@ -106,6 +120,7 @@ export function normalizedToChatMessages(messages: NormalizedMessage[]): ChatMes isComplete: Boolean(toolResult), } : undefined, + ...sharedMetadata, }); break; } @@ -117,6 +132,7 @@ export function normalizedToChatMessages(messages: NormalizedMessage[]): ChatMes content: unescapeWithMathProtection(msg.content), timestamp: msg.timestamp, isThinking: true, + ...sharedMetadata, }); } break; @@ -126,6 +142,7 @@ export function normalizedToChatMessages(messages: NormalizedMessage[]): ChatMes type: 'error', content: msg.content || 'Unknown error', timestamp: msg.timestamp, + ...sharedMetadata, }); break; @@ -135,6 +152,7 @@ export function normalizedToChatMessages(messages: NormalizedMessage[]): ChatMes content: msg.content || '', timestamp: msg.timestamp, isInteractivePrompt: true, + ...sharedMetadata, }); break; @@ -145,6 +163,7 @@ export function normalizedToChatMessages(messages: NormalizedMessage[]): ChatMes timestamp: msg.timestamp, isTaskNotification: true, taskStatus: msg.status || 'completed', + ...sharedMetadata, }); break; @@ -155,6 +174,7 @@ export function normalizedToChatMessages(messages: NormalizedMessage[]): ChatMes content: msg.content, timestamp: msg.timestamp, isStreaming: true, + ...sharedMetadata, }); } break; diff --git a/src/components/chat/hooks/useChatRealtimeHandlers.ts b/src/components/chat/hooks/useChatRealtimeHandlers.ts index 342ea117..86c85469 100644 --- a/src/components/chat/hooks/useChatRealtimeHandlers.ts +++ b/src/components/chat/hooks/useChatRealtimeHandlers.ts @@ -3,7 +3,7 @@ import type { Dispatch, MutableRefObject, SetStateAction } from 'react'; import { usePaletteOps } from '../../../contexts/PaletteOpsContext'; import type { PendingPermissionRequest, SessionNavigationOptions } from '../types/types'; -import type { Project, ProjectSession, LLMProvider } from '../../../types/app'; +import type { ProjectSession, LLMProvider } from '../../../types/app'; import type { SessionStore, NormalizedMessage } from '../../../stores/useSessionStore'; type PendingViewSession = { @@ -51,7 +51,6 @@ type LatestChatMessage = { interface UseChatRealtimeHandlersArgs { latestMessage: LatestChatMessage | null; provider: LLMProvider; - selectedProject: Project | null; selectedSession: ProjectSession | null; currentSessionId: string | null; setCurrentSessionId: (sessionId: string | null) => void; @@ -61,13 +60,11 @@ interface UseChatRealtimeHandlersArgs { setTokenBudget: (budget: Record | null) => void; setPendingPermissionRequests: Dispatch>; pendingViewSessionRef: MutableRefObject; - streamBufferRef: MutableRefObject; streamTimerRef: MutableRefObject; accumulatedStreamRef: MutableRefObject; onSessionInactive?: (sessionId?: string | null) => void; onSessionProcessing?: (sessionId?: string | null) => void; onSessionNotProcessing?: (sessionId?: string | null) => void; - onReplaceTemporarySession?: (sessionId?: string | null) => void; onNavigateToSession?: (sessionId: string, options?: SessionNavigationOptions) => void; onWebSocketReconnect?: () => void; sessionStore: SessionStore; @@ -80,7 +77,6 @@ interface UseChatRealtimeHandlersArgs { export function useChatRealtimeHandlers({ latestMessage, provider, - selectedProject, selectedSession, currentSessionId, setCurrentSessionId, @@ -90,13 +86,11 @@ export function useChatRealtimeHandlers({ setTokenBudget, setPendingPermissionRequests, pendingViewSessionRef, - streamBufferRef, streamTimerRef, accumulatedStreamRef, onSessionInactive, onSessionProcessing, onSessionNotProcessing, - onReplaceTemporarySession, onNavigateToSession, onWebSocketReconnect, sessionStore, @@ -187,7 +181,6 @@ export function useChatRealtimeHandlers({ if (msg.kind === 'stream_delta') { const text = msg.content || ''; if (!text) return; - streamBufferRef.current += text; accumulatedStreamRef.current += text; if (!streamTimerRef.current) { streamTimerRef.current = window.setTimeout(() => { @@ -216,12 +209,18 @@ export function useChatRealtimeHandlers({ sessionStore.finalizeStreaming(sid); } accumulatedStreamRef.current = ''; - streamBufferRef.current = ''; return; } // --- All other messages: route to store --- - if (sid) { + const shouldPersist = + msg.kind !== 'session_created' + && msg.kind !== 'complete' + && msg.kind !== 'status' + && msg.kind !== 'permission_request' + && msg.kind !== 'permission_cancelled'; + + if (sid && shouldPersist) { sessionStore.appendRealtime(sid, msg as NormalizedMessage); } @@ -231,13 +230,16 @@ export function useChatRealtimeHandlers({ const newSessionId = msg.newSessionId; if (!newSessionId) break; - if (!currentSessionId || currentSessionId.startsWith('new-session-')) { + // We no longer synthesize client-side placeholder IDs. Until the provider + // announces `session_created`, the active id is expected to be null. + if (!currentSessionId) { + console.log('Session created with ID:', newSessionId); + console.log('Existing session ID:', currentSessionId); sessionStorage.setItem('pendingSessionId', newSessionId); if (pendingViewSessionRef.current && !pendingViewSessionRef.current.sessionId) { pendingViewSessionRef.current.sessionId = newSessionId; } setCurrentSessionId(newSessionId); - onReplaceTemporarySession?.(newSessionId); setPendingPermissionRequests((prev) => prev.map((r) => (r.sessionId ? r : { ...r, sessionId: newSessionId })), ); @@ -257,7 +259,6 @@ export function useChatRealtimeHandlers({ sessionStore.finalizeStreaming(sid); } accumulatedStreamRef.current = ''; - streamBufferRef.current = ''; setIsLoading(false); setCanAbortSession(false); @@ -386,7 +387,6 @@ export function useChatRealtimeHandlers({ }, [ latestMessage, provider, - selectedProject, selectedSession, currentSessionId, setCurrentSessionId, @@ -396,13 +396,11 @@ export function useChatRealtimeHandlers({ setTokenBudget, setPendingPermissionRequests, pendingViewSessionRef, - streamBufferRef, streamTimerRef, accumulatedStreamRef, onSessionInactive, onSessionProcessing, onSessionNotProcessing, - onReplaceTemporarySession, onNavigateToSession, onWebSocketReconnect, sessionStore, diff --git a/src/components/chat/hooks/useChatSessionState.ts b/src/components/chat/hooks/useChatSessionState.ts index 6bff4a88..95278ffd 100644 --- a/src/components/chat/hooks/useChatSessionState.ts +++ b/src/components/chat/hooks/useChatSessionState.ts @@ -182,6 +182,7 @@ export function useChatSessionState({ messagesOffsetRef.current = 0; setHasMoreMessages(false); setTotalMessages(0); + setTokenBudget(null); setVisibleMessageCount(INITIAL_VISIBLE_MESSAGES); setAllMessagesLoaded(false); @@ -318,7 +319,6 @@ export function useChatSessionState({ if (!hasMoreMessages || !selectedSession || !selectedProject) return false; const sessionProvider = selectedSession.__provider || 'claude'; - if (sessionProvider === 'cursor') return false; isLoadingMoreRef.current = true; const previousScrollHeight = container.scrollHeight; @@ -551,7 +551,6 @@ export function useChatSessionState({ const scrollToTarget = async () => { if (!allMessagesLoadedRef.current && selectedSession && selectedProject) { const sessionProvider = selectedSession.__provider || 'claude'; - if (sessionProvider !== 'cursor') { try { // Load all messages into the store for search navigation const slot = await sessionStore.fetchFromServer(selectedSession.id, { @@ -573,7 +572,6 @@ export function useChatSessionState({ } catch { // Fall through and scroll in current messages } - } } setVisibleMessageCount(Infinity); @@ -628,7 +626,7 @@ export function useChatSessionState({ // Token usage fetch for Claude useEffect(() => { - if (!selectedProject || !selectedSession?.id || selectedSession.id.startsWith('new-session-')) { + if (!selectedProject || !selectedSession?.id) { setTokenBudget(null); return; } @@ -721,15 +719,6 @@ export function useChatSessionState({ if (!selectedSession || !selectedProject) return; if (isLoadingAllMessages) return; const sessionProvider = selectedSession.__provider || 'claude'; - if (sessionProvider === 'cursor') { - setVisibleMessageCount(Infinity); - setAllMessagesLoaded(true); - allMessagesLoadedRef.current = true; - setLoadAllJustFinished(true); - if (loadAllFinishedTimerRef.current) clearTimeout(loadAllFinishedTimerRef.current); - loadAllFinishedTimerRef.current = setTimeout(() => { setLoadAllJustFinished(false); setShowLoadAllOverlay(false); }, 1000); - return; - } const requestSessionId = selectedSession.id; allMessagesLoadedRef.current = true; diff --git a/src/components/chat/types/types.ts b/src/components/chat/types/types.ts index 81bd5a5b..474f23e1 100644 --- a/src/components/chat/types/types.ts +++ b/src/components/chat/types/types.ts @@ -28,6 +28,7 @@ export interface SubagentChildTool { export interface ChatMessage { type: string; content?: string; + displayText?: string; timestamp: string | number | Date; images?: ChatImage[]; reasoning?: string; @@ -40,6 +41,12 @@ export interface ChatMessage { toolResult?: ToolResult | null; toolId?: string; toolCallId?: string; + commandName?: string; + commandMessage?: string; + commandArgs?: string; + isLocalCommand?: boolean; + isLocalCommandStdout?: boolean; + isCompactSummary?: boolean; isSubagentContainer?: boolean; subagentState?: { childTools: SubagentChildTool[]; @@ -108,7 +115,6 @@ export interface ChatInterfaceProps { onSessionProcessing?: (sessionId?: string | null) => void; onSessionNotProcessing?: (sessionId?: string | null) => void; processingSessions?: Set; - onReplaceTemporarySession?: (sessionId?: string | null) => void; onNavigateToSession?: (targetSessionId: string, options?: SessionNavigationOptions) => void; onShowSettings?: () => void; autoExpandTools?: boolean; diff --git a/src/components/chat/view/ChatInterface.tsx b/src/components/chat/view/ChatInterface.tsx index 8589f29a..2bff948d 100644 --- a/src/components/chat/view/ChatInterface.tsx +++ b/src/components/chat/view/ChatInterface.tsx @@ -34,7 +34,6 @@ function ChatInterface({ onSessionProcessing, onSessionNotProcessing, processingSessions, - onReplaceTemporarySession, onNavigateToSession, onShowSettings, autoExpandTools, @@ -50,7 +49,6 @@ function ChatInterface({ const { t } = useTranslation('chat'); const sessionStore = useSessionStore(); - const streamBufferRef = useRef(''); const streamTimerRef = useRef(null); const accumulatedStreamRef = useRef(''); const pendingViewSessionRef = useRef(null); @@ -60,7 +58,6 @@ function ChatInterface({ clearTimeout(streamTimerRef.current); streamTimerRef.current = null; } - streamBufferRef.current = ''; accumulatedStreamRef.current = ''; }, []); @@ -225,7 +222,6 @@ function ChatInterface({ useChatRealtimeHandlers({ latestMessage, provider, - selectedProject, selectedSession, currentSessionId, setCurrentSessionId, @@ -235,13 +231,11 @@ function ChatInterface({ setTokenBudget, setPendingPermissionRequests, pendingViewSessionRef, - streamBufferRef, streamTimerRef, accumulatedStreamRef, onSessionInactive, onSessionProcessing, onSessionNotProcessing, - onReplaceTemporarySession, onNavigateToSession, onWebSocketReconnect: handleWebSocketReconnect, sessionStore, diff --git a/src/components/chat/view/subcomponents/ChatMessagesPane.tsx b/src/components/chat/view/subcomponents/ChatMessagesPane.tsx index 9d47a7c2..0129195a 100644 --- a/src/components/chat/view/subcomponents/ChatMessagesPane.tsx +++ b/src/components/chat/view/subcomponents/ChatMessagesPane.tsx @@ -213,13 +213,6 @@ export default function ChatMessagesPane({ )} - {/* Performance warning when all messages are loaded */} - {allMessagesLoaded && ( -
- {t('session.messages.perfWarning')} -
- )} - {/* Legacy message count indicator (for non-paginated view) */} {!hasMoreMessages && chatMessages.length > visibleMessageCount && (
diff --git a/src/components/main-content/types/types.ts b/src/components/main-content/types/types.ts index d090852d..68b03b29 100644 --- a/src/components/main-content/types/types.ts +++ b/src/components/main-content/types/types.ts @@ -51,7 +51,6 @@ export type MainContentProps = { onSessionProcessing: SessionLifecycleHandler; onSessionNotProcessing: SessionLifecycleHandler; processingSessions: Set; - onReplaceTemporarySession: SessionLifecycleHandler; onNavigateToSession: (targetSessionId: string, options?: SessionNavigationOptions) => void; onShowSettings: () => void; externalMessageUpdate: number; diff --git a/src/components/main-content/view/MainContent.tsx b/src/components/main-content/view/MainContent.tsx index 1a9c7349..f0a29a70 100644 --- a/src/components/main-content/view/MainContent.tsx +++ b/src/components/main-content/view/MainContent.tsx @@ -47,7 +47,6 @@ function MainContent({ onSessionProcessing, onSessionNotProcessing, processingSessions, - onReplaceTemporarySession, onNavigateToSession, onShowSettings, externalMessageUpdate, @@ -137,7 +136,6 @@ function MainContent({ onSessionProcessing={onSessionProcessing} onSessionNotProcessing={onSessionNotProcessing} processingSessions={processingSessions} - onReplaceTemporarySession={onReplaceTemporarySession} onNavigateToSession={onNavigateToSession} onShowSettings={onShowSettings} autoExpandTools={autoExpandTools} diff --git a/src/components/sidebar/hooks/useSidebarController.ts b/src/components/sidebar/hooks/useSidebarController.ts index d950bc43..ba559442 100644 --- a/src/components/sidebar/hooks/useSidebarController.ts +++ b/src/components/sidebar/hooks/useSidebarController.ts @@ -5,8 +5,11 @@ import { api } from '../../../utils/api'; import { usePaletteOps } from '../../../contexts/PaletteOpsContext'; import type { Project, ProjectSession, LLMProvider } from '../../../types/app'; import type { + ArchivedProjectListItem, + ArchivedSessionListItem, DeleteProjectConfirmation, ProjectSortOrder, + SidebarSearchMode, SessionDeleteConfirmation, SessionWithProvider, } from '../types/types'; @@ -60,6 +63,20 @@ export type SearchProgress = { totalProjects: number; }; +type ArchivedSessionsApiPayload = { + success?: boolean; + data?: { + sessions?: ArchivedSessionListItem[]; + }; +}; + +type ArchivedProjectsApiPayload = { + success?: boolean; + data?: { + projects?: ArchivedProjectListItem[]; + }; +}; + type UseSidebarControllerArgs = { projects: Project[]; selectedProject: Project | null; @@ -112,10 +129,13 @@ export function useSidebarController({ const [deleteConfirmation, setDeleteConfirmation] = useState(null); const [sessionDeleteConfirmation, setSessionDeleteConfirmation] = useState(null); const [showVersionModal, setShowVersionModal] = useState(false); - const [searchMode, setSearchMode] = useState<'projects' | 'conversations'>('projects'); + const [searchMode, setSearchMode] = useState('projects'); const [conversationResults, setConversationResults] = useState(null); const [isSearching, setIsSearching] = useState(false); const [searchProgress, setSearchProgress] = useState(null); + const [archivedProjects, setArchivedProjects] = useState([]); + const [archivedSessions, setArchivedSessions] = useState([]); + const [isArchivedSessionsLoading, setIsArchivedSessionsLoading] = useState(false); const [debouncedSearchQuery, setDebouncedSearchQuery] = useState(''); const [optimisticStarByProjectId, setOptimisticStarByProjectId] = useState>(new Map()); const [loadingMoreProjects, setLoadingMoreProjects] = useState>(new Set()); @@ -201,6 +221,40 @@ export function useSidebarController({ onRefreshRef.current = onRefresh; }, [onRefresh]); + const fetchArchivedSessions = useCallback(async () => { + setIsArchivedSessionsLoading(true); + + try { + const [archivedProjectsResponse, archivedSessionsResponse] = await Promise.all([ + api.archivedProjects(), + api.getArchivedSessions(), + ]); + + if (!archivedProjectsResponse.ok) { + throw new Error(`Failed to load archived projects: ${archivedProjectsResponse.status}`); + } + + if (!archivedSessionsResponse.ok) { + throw new Error(`Failed to load archived sessions: ${archivedSessionsResponse.status}`); + } + + const archivedProjectsPayload = (await archivedProjectsResponse.json()) as ArchivedProjectsApiPayload; + const archivedSessionsPayload = (await archivedSessionsResponse.json()) as ArchivedSessionsApiPayload; + const nextProjects = Array.isArray(archivedProjectsPayload.data?.projects) ? archivedProjectsPayload.data.projects : []; + const archivedProjectIds = new Set(nextProjects.map((project) => project.projectId)); + const nextStandaloneSessions = Array.isArray(archivedSessionsPayload.data?.sessions) + ? archivedSessionsPayload.data.sessions.filter((session) => !session.projectId || !archivedProjectIds.has(session.projectId)) + : []; + + setArchivedProjects(nextProjects); + setArchivedSessions(nextStandaloneSessions); + } catch (error) { + console.error('[Sidebar] Failed to load archived sessions:', error); + } finally { + setIsArchivedSessionsLoading(false); + } + }, []); + useEffect(() => { if (migrationStartedRef.current) { return; @@ -227,6 +281,20 @@ export function useSidebarController({ void migrateLegacyStars(); }, [onRefresh]); + useEffect(() => { + void fetchArchivedSessions(); + }, [fetchArchivedSessions]); + + useEffect(() => { + if (searchMode !== 'archived') { + return; + } + + // Refresh archive contents when the archived tab opens so restore actions + // and background synchronizer updates are reflected without a full reload. + void fetchArchivedSessions(); + }, [fetchArchivedSessions, searchMode]); + useEffect(() => { setOptimisticStarByProjectId((previous) => { if (previous.size === 0) { @@ -519,6 +587,56 @@ export function useSidebarController({ [debouncedSearchQuery, sortedProjects], ); + const filteredArchivedSessions = useMemo(() => { + const normalizedSearch = debouncedSearchQuery.trim().toLowerCase(); + if (!normalizedSearch) { + return archivedSessions; + } + + return archivedSessions.filter((session) => { + const searchableFields = [ + session.sessionTitle, + session.projectDisplayName, + session.projectPath ?? '', + session.provider, + ]; + + return searchableFields.some((value) => value.toLowerCase().includes(normalizedSearch)); + }); + }, [archivedSessions, debouncedSearchQuery]); + + const filteredArchivedProjects = useMemo(() => { + const normalizedSearch = debouncedSearchQuery.trim().toLowerCase(); + if (!normalizedSearch) { + return archivedProjects; + } + + return archivedProjects.filter((project) => { + const projectMatches = [ + project.displayName, + project.fullPath || '', + ].some((value) => value.toLowerCase().includes(normalizedSearch)); + + if (projectMatches) { + return true; + } + + return getAllSessions(project).some((session) => { + const sessionSummary = + typeof session.summary === 'string' && session.summary.trim().length > 0 + ? session.summary + : typeof session.name === 'string' + ? session.name + : ''; + + return [ + sessionSummary, + session.__provider, + ].some((value) => value.toLowerCase().includes(normalizedSearch)); + }); + }); + }, [archivedProjects, debouncedSearchQuery]); + const startEditing = useCallback((project: Project) => { // `editingProject` is keyed by projectId so it stays stable across // display-name mutations that happen while the input is open. @@ -556,17 +674,26 @@ export function useSidebarController({ // Kept with project/provider arguments for component wiring compatibility; // deletion now uses only `sessionId` via /api/providers/sessions/:sessionId. ( - projectId: string, + projectId: string | null, sessionId: string, sessionTitle: string, provider: SessionDeleteConfirmation['provider'] = 'claude', + options: { + isArchived?: boolean; + } = {}, ) => { - setSessionDeleteConfirmation({ projectId, sessionId, sessionTitle, provider }); + setSessionDeleteConfirmation({ + projectId, + sessionId, + sessionTitle, + provider, + isArchived: Boolean(options.isArchived), + }); }, [], ); - const confirmDeleteSession = useCallback(async () => { + const confirmDeleteSession = useCallback(async (hardDelete = false) => { if (!sessionDeleteConfirmation) { return; } @@ -575,10 +702,11 @@ export function useSidebarController({ setSessionDeleteConfirmation(null); try { - const response = await api.deleteSession(sessionId); + const response = await api.deleteSession(sessionId, hardDelete); if (response.ok) { onSessionDelete?.(sessionId); + await fetchArchivedSessions(); } else { const errorText = await response.text(); console.error('[Sidebar] Failed to delete session:', { @@ -591,7 +719,7 @@ export function useSidebarController({ console.error('[Sidebar] Error deleting session:', error); alert(t('messages.deleteSessionError')); } - }, [onSessionDelete, sessionDeleteConfirmation, t]); + }, [fetchArchivedSessions, onSessionDelete, sessionDeleteConfirmation, t]); const requestProjectDelete = useCallback( (project: Project) => { @@ -647,14 +775,88 @@ export function useSidebarController({ [onProjectSelect, setCurrentProject], ); + const openArchivedSession = useCallback((session: ArchivedSessionListItem) => { + const activeProject = session.projectId + ? projects.find((candidate) => candidate.projectId === session.projectId) + : null; + const archivedProject = session.projectId + ? archivedProjects.find((candidate) => candidate.projectId === session.projectId) + : null; + const matchingProject = activeProject ?? archivedProject ?? null; + const sessionPayload: ProjectSession = { + id: session.sessionId, + summary: session.sessionTitle, + __provider: session.provider, + __projectId: matchingProject?.projectId ?? session.projectId ?? undefined, + }; + + // Archived sessions still need a selected project context. Active projects + // come from the normal sidebar list, while archived-project sessions resolve + // through the archive payload loaded by this controller. + if (matchingProject) { + handleProjectSelect(matchingProject); + } + + onSessionSelect(sessionPayload); + }, [archivedProjects, handleProjectSelect, onSessionSelect, projects]); + + const restoreArchivedProject = useCallback(async (projectId: string) => { + try { + const response = await api.restoreProject(projectId); + if (!response.ok) { + const errorText = await response.text(); + console.error('[Sidebar] Failed to restore project:', { + status: response.status, + error: errorText, + }); + alert(t('messages.restoreProjectFailed', 'Failed to restore project. Please try again.')); + return; + } + + await Promise.all([ + Promise.resolve(onRefresh()), + fetchArchivedSessions(), + ]); + } catch (error) { + console.error('[Sidebar] Error restoring project:', error); + alert(t('messages.restoreProjectError', 'Error restoring project. Please try again.')); + } + }, [fetchArchivedSessions, onRefresh, t]); + + const restoreArchivedSession = useCallback(async (sessionId: string) => { + try { + const response = await api.restoreSession(sessionId); + if (!response.ok) { + const errorText = await response.text(); + console.error('[Sidebar] Failed to restore session:', { + status: response.status, + error: errorText, + }); + alert(t('messages.restoreSessionFailed', 'Failed to restore session. Please try again.')); + return; + } + + await Promise.all([ + Promise.resolve(onRefresh()), + fetchArchivedSessions(), + ]); + } catch (error) { + console.error('[Sidebar] Error restoring session:', error); + alert(t('messages.restoreSessionError', 'Error restoring session. Please try again.')); + } + }, [fetchArchivedSessions, onRefresh, t]); + const refreshProjects = useCallback(async () => { setIsRefreshing(true); try { - await onRefresh(); + await Promise.all([ + Promise.resolve(onRefresh()), + fetchArchivedSessions(), + ]); } finally { setIsRefreshing(false); } - }, [onRefresh]); + }, [fetchArchivedSessions, onRefresh]); const updateSessionSummary = useCallback( // `_projectId` and `_provider` are preserved for compatibility with @@ -712,6 +914,10 @@ export function useSidebarController({ sessionDeleteConfirmation, showVersionModal, filteredProjects, + archivedProjects: filteredArchivedProjects, + archivedSessions: filteredArchivedSessions, + archivedSessionsCount: archivedProjects.length + archivedSessions.length, + isArchivedSessionsLoading, toggleProject, handleSessionClick, toggleStarProject, @@ -726,6 +932,9 @@ export function useSidebarController({ requestProjectDelete, confirmDeleteProject, handleProjectSelect, + openArchivedSession, + restoreArchivedProject, + restoreArchivedSession, refreshProjects, updateSessionSummary, collapseSidebar, diff --git a/src/components/sidebar/types/types.ts b/src/components/sidebar/types/types.ts index 6db25126..0f44cf29 100644 --- a/src/components/sidebar/types/types.ts +++ b/src/components/sidebar/types/types.ts @@ -1,11 +1,26 @@ import type { LoadingProgress, Project, ProjectSession, LLMProvider } from '../../../types/app'; export type ProjectSortOrder = 'name' | 'date'; +export type SidebarSearchMode = 'projects' | 'conversations' | 'archived'; +export type ArchivedProjectListItem = Project & { isArchived: true }; export type SessionWithProvider = ProjectSession & { __provider: LLMProvider; }; +export type ArchivedSessionListItem = { + sessionId: string; + provider: LLMProvider; + projectId: string | null; + projectPath: string | null; + projectDisplayName: string; + sessionTitle: string; + createdAt: string | null; + updatedAt: string | null; + lastActivity: string | null; + isProjectArchived: boolean; +}; + export type DeleteProjectConfirmation = { project: Project; sessionCount: number; @@ -14,10 +29,11 @@ export type DeleteProjectConfirmation = { // Delete confirmation payload used by sidebar UX. `projectId`/`provider` are // kept for wiring compatibility, while API deletion now keys only by sessionId. export type SessionDeleteConfirmation = { - projectId: string; + projectId: string | null; sessionId: string; sessionTitle: string; provider: LLMProvider; + isArchived: boolean; }; export type SidebarProps = { diff --git a/src/components/sidebar/utils/utils.ts b/src/components/sidebar/utils/utils.ts index 2602a633..048c7e21 100644 --- a/src/components/sidebar/utils/utils.ts +++ b/src/components/sidebar/utils/utils.ts @@ -1,4 +1,5 @@ import type { TFunction } from 'i18next'; + import type { Project } from '../../../types/app'; import type { ProjectSortOrder, SettingsProject, SessionViewModel, SessionWithProvider } from '../types/types'; @@ -52,44 +53,24 @@ export const clearLegacyStarredProjectIds = () => { } }; +const getCreatedTimestamp = (session: SessionWithProvider): string => { + return String(session.createdAt || session.created_at || ''); +}; + +const getUpdatedTimestamp = (session: SessionWithProvider): string => { + return String(session.lastActivity || ''); +}; + export const getSessionDate = (session: SessionWithProvider): Date => { - if (session.__provider === 'cursor') { - return new Date(session.createdAt || 0); - } - - if (session.__provider === 'codex') { - return new Date(session.createdAt || session.lastActivity || 0); - } - - return new Date(session.lastActivity || session.createdAt || 0); + return new Date(getUpdatedTimestamp(session) || getCreatedTimestamp(session) || 0); }; export const getSessionName = (session: SessionWithProvider, t: TFunction): string => { - if (session.__provider === 'cursor') { - return session.summary || session.name || t('projects.untitledSession'); - } - - if (session.__provider === 'codex') { - return session.summary || session.name || t('projects.codexSession'); - } - - if (session.__provider === 'gemini') { - return session.summary || session.name || t('projects.newSession'); - } - - return session.summary || t('projects.newSession'); + return session.summary || session.name || t('projects.newSession'); }; export const getSessionTime = (session: SessionWithProvider): string => { - if (session.__provider === 'cursor') { - return String(session.createdAt || ''); - } - - if (session.__provider === 'codex') { - return String(session.createdAt || session.lastActivity || ''); - } - - return String(session.lastActivity || session.createdAt || ''); + return getUpdatedTimestamp(session) || getCreatedTimestamp(session); }; export const createSessionViewModel = ( diff --git a/src/components/sidebar/view/Sidebar.tsx b/src/components/sidebar/view/Sidebar.tsx index 97484b01..ebc046c5 100644 --- a/src/components/sidebar/view/Sidebar.tsx +++ b/src/components/sidebar/view/Sidebar.tsx @@ -75,6 +75,10 @@ function Sidebar({ sessionDeleteConfirmation, showVersionModal, filteredProjects, + archivedProjects, + archivedSessions, + archivedSessionsCount, + isArchivedSessionsLoading, toggleProject, handleSessionClick, toggleStarProject, @@ -90,6 +94,9 @@ function Sidebar({ requestProjectDelete, confirmDeleteProject, handleProjectSelect, + openArchivedSession, + restoreArchivedProject, + restoreArchivedSession, refreshProjects, updateSessionSummary, collapseSidebar: handleCollapseSidebar, @@ -184,8 +191,8 @@ function Sidebar({ return ( <> - ) : ( <> - setSearchFilter('')} searchMode={searchMode} - onSearchModeChange={(mode: 'projects' | 'conversations') => { + onSearchModeChange={(mode) => { setSearchMode(mode); if (mode === 'projects') clearConversationResults(); }} conversationResults={conversationResults} isSearching={isSearching} searchProgress={searchProgress} + onRestoreArchivedProject={restoreArchivedProject} + onArchivedSessionClick={openArchivedSession} + onRestoreArchivedSession={restoreArchivedSession} + onDeleteArchivedSession={(session) => { + showDeleteSessionConfirmation( + session.projectId, + session.sessionId, + session.sessionTitle, + session.provider, + { isArchived: true }, + ); + }} onConversationResultClick={(projectId: string | null, sessionId: string, provider: string, messageTimestamp?: string | null, messageSnippet?: string | null) => { // `projectId` (DB key) is the canonical identifier post-migration. // The server emits null when it can't resolve a project row for diff --git a/src/components/sidebar/view/subcomponents/SidebarContent.tsx b/src/components/sidebar/view/subcomponents/SidebarContent.tsx index 3e675f2d..5ce63b8b 100644 --- a/src/components/sidebar/view/subcomponents/SidebarContent.tsx +++ b/src/components/sidebar/view/subcomponents/SidebarContent.tsx @@ -1,15 +1,16 @@ import { type ReactNode } from 'react'; -import { Folder, MessageSquare, Search } from 'lucide-react'; +import { Archive, Folder, MessageSquare, RotateCcw, Search, Trash2 } from 'lucide-react'; import type { TFunction } from 'i18next'; import { ScrollArea } from '../../../../shared/view/ui'; import type { Project } from '../../../../types/app'; import type { ReleaseInfo } from '../../../../types/sharedTypes'; import type { ConversationSearchResults, SearchProgress } from '../../hooks/useSidebarController'; +import type { ArchivedProjectListItem, ArchivedSessionListItem, SidebarSearchMode } from '../../types/types'; +import SessionProviderLogo from '../../../llm-logo-provider/SessionProviderLogo'; import SidebarFooter from './SidebarFooter'; import SidebarHeader from './SidebarHeader'; import SidebarProjectList, { type SidebarProjectListProps } from './SidebarProjectList'; - -type SearchMode = 'projects' | 'conversations'; +import { getAllSessions } from '../../utils/utils'; function HighlightedSnippet({ snippet, highlights }: { snippet: string; highlights: { start: number; end: number }[] }) { const parts: ReactNode[] = []; @@ -35,19 +36,100 @@ function HighlightedSnippet({ snippet, highlights }: { snippet: string; highligh ); } +type ArchivedSessionGroup = { + key: string; + projectId: string | null; + projectDisplayName: string; + projectPath: string | null; + isProjectArchived: boolean; + sessions: ArchivedSessionListItem[]; + latestActivity: string | null; +}; + +/** + * Groups archived sessions by project metadata so the archive view preserves + * the same mental model as the active sidebar: projects first, then sessions. + */ +function groupArchivedSessionsByProject(sessions: ArchivedSessionListItem[]): ArchivedSessionGroup[] { + const groups = new Map(); + + for (const session of sessions) { + const key = session.projectId ?? session.projectPath ?? `session:${session.sessionId}`; + const existingGroup = groups.get(key); + + if (existingGroup) { + existingGroup.sessions.push(session); + if (!existingGroup.latestActivity || (session.lastActivity && session.lastActivity > existingGroup.latestActivity)) { + existingGroup.latestActivity = session.lastActivity; + } + continue; + } + + groups.set(key, { + key, + projectId: session.projectId, + projectDisplayName: session.projectDisplayName, + projectPath: session.projectPath, + isProjectArchived: session.isProjectArchived, + sessions: [session], + latestActivity: session.lastActivity, + }); + } + + return [...groups.values()].sort((groupA, groupB) => { + const a = groupA.latestActivity ?? ''; + const b = groupB.latestActivity ?? ''; + return b.localeCompare(a); + }); +} + +function formatCompactArchivedAge(dateString: string | null): string { + if (!dateString) { + return ''; + } + + const date = new Date(dateString); + if (Number.isNaN(date.getTime())) { + return ''; + } + + const diffInMinutes = Math.floor(Math.max(0, Date.now() - date.getTime()) / (1000 * 60)); + if (diffInMinutes < 1) { + return '<1m'; + } + if (diffInMinutes < 60) { + return `${diffInMinutes}m`; + } + + const diffInHours = Math.floor(diffInMinutes / 60); + if (diffInHours < 24) { + return `${diffInHours}hr`; + } + + return `${Math.floor(diffInHours / 24)}d`; +} + type SidebarContentProps = { isPWA: boolean; isMobile: boolean; isLoading: boolean; projects: Project[]; + archivedProjects: ArchivedProjectListItem[]; + archivedSessions: ArchivedSessionListItem[]; + archivedSessionsCount: number; + isArchivedSessionsLoading: boolean; searchFilter: string; onSearchFilterChange: (value: string) => void; onClearSearchFilter: () => void; - searchMode: SearchMode; - onSearchModeChange: (mode: SearchMode) => void; + searchMode: SidebarSearchMode; + onSearchModeChange: (mode: SidebarSearchMode) => void; conversationResults: ConversationSearchResults | null; isSearching: boolean; searchProgress: SearchProgress | null; + onRestoreArchivedProject: (projectId: string) => void; + onArchivedSessionClick: (session: ArchivedSessionListItem) => void; + onRestoreArchivedSession: (sessionId: string) => void; + onDeleteArchivedSession: (session: ArchivedSessionListItem) => void; // Conversation result clicks pass back the DB projectId (or null when the // server couldn't resolve it). Consumers must handle the null case. onConversationResultClick: (projectId: string | null, sessionId: string, provider: string, messageTimestamp?: string | null, messageSnippet?: string | null) => void; @@ -70,6 +152,10 @@ export default function SidebarContent({ isMobile, isLoading, projects, + archivedProjects, + archivedSessions, + archivedSessionsCount, + isArchivedSessionsLoading, searchFilter, onSearchFilterChange, onClearSearchFilter, @@ -78,6 +164,10 @@ export default function SidebarContent({ conversationResults, isSearching, searchProgress, + onRestoreArchivedProject, + onArchivedSessionClick, + onRestoreArchivedSession, + onDeleteArchivedSession, onConversationResultClick, onRefresh, isRefreshing, @@ -94,6 +184,7 @@ export default function SidebarContent({ }: SidebarContentProps) { const showConversationSearch = searchMode === 'conversations' && searchFilter.trim().length >= 2; const hasPartialResults = conversationResults && conversationResults.results.length > 0; + const groupedArchivedSessions = groupArchivedSessionsByProject(archivedSessions); return (
) : null + ) : searchMode === 'archived' ? ( + isArchivedSessionsLoading ? ( +
+
+
+
+

+ {t('archived.loadingTitle', 'Loading archive...')} +

+

+ {t('archived.loadingDescription', 'Fetching hidden workspaces and sessions you can restore later.')} +

+
+ ) : archivedProjects.length === 0 && groupedArchivedSessions.length === 0 ? ( +
+
+ +
+

+ {archivedSessionsCount > 0 + ? t('archived.noMatchingSessions', 'No matching archived items') + : t('archived.emptyTitle', 'No archived items')} +

+

+ {archivedSessionsCount > 0 + ? t('archived.tryDifferentSearch', 'Try a different search term.') + : t('archived.emptyDescription', 'Archived workspaces and sessions will appear here when you hide them from the active list.')} +

+
+ ) : ( +
+
+

+ {`${archivedSessionsCount} ${t( + archivedSessionsCount === 1 ? 'archived.sessionCountOne' : 'archived.sessionCountOther', + archivedSessionsCount === 1 ? 'archived item' : 'archived items', + )}`} +

+
+ {archivedProjects.map((project) => { + const projectSessions = getAllSessions(project); + + return ( +
+
+
+
+ + + {project.displayName} + + + {t('archived.projectArchived', 'Project archived')} + +
+

+ {project.fullPath} +

+
+ +
+ {projectSessions.length > 0 && ( +
+ {projectSessions.map((session) => ( + + ))} +
+ )} +
+ ); + })} + {groupedArchivedSessions.map((group) => ( +
+
+
+
+ + + {group.projectDisplayName} + + {group.isProjectArchived && ( + + {t('archived.projectArchived', 'Project archived')} + + )} +
+ {group.projectPath && ( +

+ {group.projectPath} +

+ )} +
+ + {group.sessions.length} + +
+
+ {group.sessions.map((session) => ( +
+ + + +
+ ))} +
+
+ ))} +
+ ) ) : ( )} diff --git a/src/components/sidebar/view/subcomponents/SidebarHeader.tsx b/src/components/sidebar/view/subcomponents/SidebarHeader.tsx index ab1eed7e..5117b8db 100644 --- a/src/components/sidebar/view/subcomponents/SidebarHeader.tsx +++ b/src/components/sidebar/view/subcomponents/SidebarHeader.tsx @@ -1,25 +1,26 @@ -import { Folder, FolderPlus, MessageSquare, Plus, RefreshCw, Search, X, PanelLeftClose } from 'lucide-react'; +import { Archive, Folder, FolderPlus, MessageSquare, Plus, RefreshCw, Search, X, PanelLeftClose } from 'lucide-react'; import type { TFunction } from 'i18next'; -import { Button, Input } from '../../../../shared/view/ui'; +import { Button, Input, Tooltip } from '../../../../shared/view/ui'; import { IS_PLATFORM } from '../../../../constants/config'; import { cn } from '../../../../lib/utils'; +import type { SidebarSearchMode } from '../../types/types'; import GitHubStarBadge from './GitHubStarBadge'; const MOD_KEY = typeof navigator !== 'undefined' && /Mac|iPhone|iPad/.test(navigator.platform) ? '⌘' : 'Ctrl'; -type SearchMode = 'projects' | 'conversations'; - type SidebarHeaderProps = { isPWA: boolean; isMobile: boolean; isLoading: boolean; projectsCount: number; + archivedSessionsCount: number; + isArchivedSessionsLoading: boolean; searchFilter: string; onSearchFilterChange: (value: string) => void; onClearSearchFilter: () => void; - searchMode: SearchMode; - onSearchModeChange: (mode: SearchMode) => void; + searchMode: SidebarSearchMode; + onSearchModeChange: (mode: SidebarSearchMode) => void; onRefresh: () => void; isRefreshing: boolean; onCreateProject: () => void; @@ -32,6 +33,8 @@ export default function SidebarHeader({ isMobile, isLoading, projectsCount, + archivedSessionsCount, + isArchivedSessionsLoading, searchFilter, onSearchFilterChange, onClearSearchFilter, @@ -43,6 +46,13 @@ export default function SidebarHeader({ onCollapseSidebar, t, }: SidebarHeaderProps) { + const showSearchTools = (projectsCount > 0 || archivedSessionsCount > 0 || isArchivedSessionsLoading) && !isLoading; + const searchPlaceholder = searchMode === 'conversations' + ? t('search.conversationsPlaceholder') + : searchMode === 'archived' + ? t('search.archivedPlaceholder', 'Search archived sessions...') + : t('projects.searchPlaceholder'); + const LogoBlock = () => (
@@ -113,7 +123,7 @@ export default function SidebarHeader({ {/* Search bar */} - {projectsCount > 0 && !isLoading && ( + {showSearchTools && (
{/* Search mode toggle */}
@@ -143,12 +153,28 @@ export default function SidebarHeader({ {t('search.modeConversations')} + + +
onSearchFilterChange(event.target.value)} className="nav-search-input h-9 rounded-xl border-0 pl-9 pr-14 text-sm transition-all duration-200 placeholder:text-muted-foreground/40 focus-visible:ring-0 focus-visible:ring-offset-0" @@ -215,7 +241,7 @@ export default function SidebarHeader({
{/* Mobile search */} - {projectsCount > 0 && !isLoading && ( + {showSearchTools && (
+ + +
onSearchFilterChange(event.target.value)} className="nav-search-input h-10 rounded-xl border-0 pl-10 pr-9 text-sm transition-all duration-200 placeholder:text-muted-foreground/40 focus-visible:ring-0 focus-visible:ring-offset-0" diff --git a/src/components/sidebar/view/subcomponents/SidebarModals.tsx b/src/components/sidebar/view/subcomponents/SidebarModals.tsx index 27127541..28404940 100644 --- a/src/components/sidebar/view/subcomponents/SidebarModals.tsx +++ b/src/components/sidebar/view/subcomponents/SidebarModals.tsx @@ -25,7 +25,7 @@ type SidebarModalsProps = { onConfirmDeleteProject: (deleteData?: boolean) => void; sessionDeleteConfirmation: SessionDeleteConfirmation | null; onCancelDeleteSession: () => void; - onConfirmDeleteSession: () => void; + onConfirmDeleteSession: (hardDelete?: boolean) => void; showVersionModal: boolean; onCloseVersionModal: () => void; releaseInfo: ReleaseInfo | null; @@ -133,7 +133,7 @@ export default function SidebarModals({ onClick={() => onConfirmDeleteProject(false)} > - {t('deleteConfirmation.removeFromSidebar')} + {t('deleteConfirmation.archiveProject', 'Archive project')}
-
- +
+ {!sessionDeleteConfirmation.isArchived && ( + + )} +
diff --git a/src/components/sidebar/view/subcomponents/SidebarSessionItem.tsx b/src/components/sidebar/view/subcomponents/SidebarSessionItem.tsx index 7da02cb2..4e97a6b4 100644 --- a/src/components/sidebar/view/subcomponents/SidebarSessionItem.tsx +++ b/src/components/sidebar/view/subcomponents/SidebarSessionItem.tsx @@ -239,7 +239,7 @@ export default function SidebarSessionItem({ event.stopPropagation(); requestDeleteSession(); }} - title={t('tooltips.deleteSession')} + title={t('tooltips.deleteSessionOptions', 'Archive or permanently delete this session')} > diff --git a/src/hooks/useProjectsState.ts b/src/hooks/useProjectsState.ts index d920fba2..a5397b6b 100644 --- a/src/hooks/useProjectsState.ts +++ b/src/hooks/useProjectsState.ts @@ -435,9 +435,7 @@ export function useProjectsState({ } } - const hasActiveSession = - (selectedSession && activeSessions.has(selectedSession.id)) || - (activeSessions.size > 0 && Array.from(activeSessions).some((id) => id.startsWith('new-session-'))); + const hasActiveSession = Boolean(selectedSession && activeSessions.has(selectedSession.id)); const updatedProjectsWithTaskMaster = mergeTaskMasterCache(projectsMessage.projects, projects); const updatedProjects = mergeExpandedSessionPages(projects, updatedProjectsWithTaskMaster); diff --git a/src/hooks/useSessionProtection.ts b/src/hooks/useSessionProtection.ts index 0c3d1bab..cbdcdda1 100644 --- a/src/hooks/useSessionProtection.ts +++ b/src/hooks/useSessionProtection.ts @@ -44,23 +44,6 @@ export function useSessionProtection() { }); }, []); - const replaceTemporarySession = useCallback((realSessionId?: string | null) => { - if (!realSessionId) { - return; - } - - setActiveSessions((prev) => { - const next = new Set(); - for (const sessionId of prev) { - if (!sessionId.startsWith('new-session-')) { - next.add(sessionId); - } - } - next.add(realSessionId); - return next; - }); - }, []); - return { activeSessions, processingSessions, @@ -68,6 +51,5 @@ export function useSessionProtection() { markSessionAsInactive, markSessionAsProcessing, markSessionAsNotProcessing, - replaceTemporarySession, }; } diff --git a/src/stores/useSessionStore.ts b/src/stores/useSessionStore.ts index 86925048..1a720d3d 100644 --- a/src/stores/useSessionStore.ts +++ b/src/stores/useSessionStore.ts @@ -40,6 +40,20 @@ export interface NormalizedMessage { // kind-specific fields (flat for simplicity) role?: 'user' | 'assistant'; content?: string; + /** + * Mirrors optional transcript metadata from the server. + * + * These fields are currently used by Claude history normalization so local + * slash commands, local stdout, and compact summaries do not disappear when + * the session store hydrates from REST history. + */ + displayText?: string; + commandName?: string; + commandMessage?: string; + commandArgs?: string; + isLocalCommand?: boolean; + isLocalCommandStdout?: boolean; + isCompactSummary?: boolean; images?: string[]; toolName?: string; toolInput?: unknown; diff --git a/src/utils/api.js b/src/utils/api.js index 0ac8d426..999ee316 100644 --- a/src/utils/api.js +++ b/src/utils/api.js @@ -54,6 +54,7 @@ export const api = { // After the projectName → projectId migration the path/query identifier is // the DB-assigned `projectId`; parameter names reflect that for clarity. projects: () => authenticatedFetch('/api/projects'), + archivedProjects: () => authenticatedFetch('/api/projects/archived'), projectSessions: (projectId, { limit = 20, offset = 0 } = {}) => { const params = new URLSearchParams(); params.set('limit', String(limit)); @@ -78,9 +79,28 @@ export const api = { method: 'PUT', body: JSON.stringify({ displayName }), }), - deleteSession: (sessionId) => - authenticatedFetch(`/api/providers/sessions/${sessionId}`, { + restoreProject: (projectId) => + authenticatedFetch(`/api/projects/${encodeURIComponent(projectId)}/restore`, { + method: 'POST', + }), + // Session deletion now mirrors project deletion: + // - default: archive only (`isArchived = 1`) + // - hardDelete: remove the row and, by default, its persisted transcript file + deleteSession: (sessionId, hardDelete = false) => { + const params = new URLSearchParams(); + if (hardDelete) { + params.set('force', 'true'); + } + const qs = params.toString(); + return authenticatedFetch(`/api/providers/sessions/${sessionId}${qs ? `?${qs}` : ''}`, { method: 'DELETE', + }); + }, + getArchivedSessions: () => + authenticatedFetch('/api/providers/sessions/archived'), + restoreSession: (sessionId) => + authenticatedFetch(`/api/providers/sessions/${sessionId}/restore`, { + method: 'POST', }), renameSession: (sessionId, summary) => authenticatedFetch(`/api/providers/sessions/${sessionId}`, { From 631695ef73a2762b4c8e98ab25e6ad5429388ba3 Mon Sep 17 00:00:00 2001 From: Haile <118998054+blackmammoth@users.noreply.github.com> Date: Tue, 12 May 2026 21:33:12 +0300 Subject: [PATCH 04/20] Surface provider skills in the slash command menu (#759) * feat(providers): surface skills in slash command menu Provider skills were hidden behind provider-specific filesystem rules. That made the backend and UI unable to offer one discovery path for skills. Add a normalized skills contract, provider service, and provider skills API. Keep provider-specific lookup rules inside adapters so routes and UI stay generic. Claude needs plugin handling because enabled plugins resolve through installed_plugins.json. Plugin folders can expose commands or skills, so Claude scans both forms. Claude plugin commands are namespaced to avoid collisions with user and project skills. Codex, Gemini, and Cursor adapters map their expected skill roots into the same contract. The slash menu now shows skills beside built-in and custom commands for discovery. The menu avoids mid-message activation, duplicate rows, loose namespace matches, and input overlap. Provider tests cover discovery locations and Claude plugin edge cases. * fix(providers): guard invalid skill command namespaces Claude plugin ids come from local settings and installed plugin metadata. Invalid ids such as empty strings or @ should not become command namespaces. Skip plugin folders when no safe plugin name can be derived. This prevents malformed slash commands like /:command from reaching the UI. Add regression coverage for empty and @ plugin ids. Keyboard selection in the slash menu should match mouse selection. Only skills are inserted into the composer because they are provider invocations. Built-in and custom commands execute directly and close the menu on success or failure. * fix(security): centralize safe frontmatter parsing Move frontmatter parsing into server/shared/frontmatter.ts so every backend caller uses the same gray-matter configuration instead of importing gray-matter directly. The goal is to keep executable JS and JSON frontmatter engines disabled for all markdown discovered from the filesystem, not only command routes. Provider skills and shared skill metadata now go through parseFrontMatter too. That closes the gap where plugin or provider markdown could regain default gray-matter behavior simply because it lived outside the original command path. Classify the new parser in backend boundaries so modules can depend on the safe shared API without reaching into legacy utility paths. * feat(providers): add comprehensive guide for provider module setup and usage --- eslint.config.js | 6 +- server/modules/providers/README.md | 346 ++++++++++++++ server/modules/providers/index.ts | 3 +- .../list/claude/claude-skills.provider.ts | 257 ++++++++++ .../providers/list/claude/claude.provider.ts | 9 +- .../list/codex/codex-skills.provider.ts | 100 ++++ .../providers/list/codex/codex.provider.ts | 9 +- .../list/cursor/cursor-skills.provider.ts | 31 ++ .../providers/list/cursor/cursor.provider.ts | 9 +- .../list/gemini/gemini-skills.provider.ts | 36 ++ .../providers/list/gemini/gemini.provider.ts | 9 +- server/modules/providers/provider.routes.ts | 12 + .../providers/services/skills.service.ts | 15 + .../shared/base/abstract.provider.ts | 2 + .../shared/skills/skills.provider.ts | 64 +++ server/modules/providers/tests/skills.test.ts | 446 ++++++++++++++++++ server/routes/commands.js | 12 +- .../frontmatter.js => shared/frontmatter.ts} | 6 +- server/shared/interfaces.ts | 19 + server/shared/types.ts | 63 +++ server/shared/utils.ts | 94 ++++ server/utils/commandParser.js | 8 +- .../chat/hooks/useChatComposerState.ts | 30 +- src/components/chat/hooks/useSlashCommands.ts | 239 +++++++--- .../chat/view/subcomponents/CommandMenu.tsx | 189 ++++++-- 25 files changed, 1875 insertions(+), 139 deletions(-) create mode 100644 server/modules/providers/README.md create mode 100644 server/modules/providers/list/claude/claude-skills.provider.ts create mode 100644 server/modules/providers/list/codex/codex-skills.provider.ts create mode 100644 server/modules/providers/list/cursor/cursor-skills.provider.ts create mode 100644 server/modules/providers/list/gemini/gemini-skills.provider.ts create mode 100644 server/modules/providers/services/skills.service.ts create mode 100644 server/modules/providers/shared/skills/skills.provider.ts create mode 100644 server/modules/providers/tests/skills.test.ts rename server/{utils/frontmatter.js => shared/frontmatter.ts} (81%) diff --git a/eslint.config.js b/eslint.config.js index 57a71453..e002aece 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -157,7 +157,11 @@ export default tseslint.config( }, { type: "backend-shared-utils", // shared backend runtime helpers that modules may import directly - pattern: ["server/shared/utils.{js,ts}", "server/shared/claude-cli-path.ts"], // classify the shared utils file so modules can depend on it explicitly + pattern: [ + "server/shared/utils.{js,ts}", + "server/shared/frontmatter.ts", + "server/shared/claude-cli-path.ts", + ], // classify shared utility files so modules can depend on them explicitly mode: "file", }, { diff --git a/server/modules/providers/README.md b/server/modules/providers/README.md new file mode 100644 index 00000000..c0d3fcb4 --- /dev/null +++ b/server/modules/providers/README.md @@ -0,0 +1,346 @@ +# Providers Module Guide + +This file documents the current provider contract in `server/modules/providers`. +Keep it current whenever provider wiring, skill discovery, or session sync +behavior changes. The goal is that a human or AI agent can add a new provider +without guessing which files need to move. + +## Current Provider Shape + +Every provider wrapper exposes five facets: + +- `auth` +- `mcp` +- `skills` +- `sessions` +- `sessionSynchronizer` + +These correspond to the shared interfaces in `server/shared/interfaces.ts`: + +- `IProviderAuth` +- `IProviderMcp` +- `IProviderSkills` +- `IProviderSessions` +- `IProviderSessionSynchronizer` + +The services that consume them are: + +- `providerAuthService` +- `providerMcpService` +- `providerSkillsService` +- `sessionsService` +- `sessionSynchronizerService` + +Current provider ids in this repo are: + +- `claude` +- `codex` +- `cursor` +- `gemini` + +Those ids are mirrored in backend unions and frontend provider constants. If +adding a new provider, update every place that hardcodes this list. + +## Current File Layout + +Each provider lives under its own folder in `server/modules/providers/list/`: + +```text +server/modules/providers/list// + .provider.ts + -auth.provider.ts + -mcp.provider.ts + -skills.provider.ts + -sessions.provider.ts + -session-synchronizer.provider.ts +``` + +The existing provider folders are `claude`, `codex`, `cursor`, and `gemini`. + +## What Each Facet Does + +| Facet | Responsibility | Base / Service | +| --- | --- | --- | +| `auth` | Report install/auth state for the provider runtime | `IProviderAuth` -> `providerAuthService` | +| `mcp` | Read, list, write, and remove provider-native MCP config | `McpProvider` -> `providerMcpService` | +| `skills` | Discover provider-native skill markdown files | `SkillsProvider` -> `providerSkillsService` | +| `sessions` | Normalize live events and fetch session history | `IProviderSessions` -> `sessionsService` | +| `sessionSynchronizer` | Scan transcript artifacts and upsert session metadata | `IProviderSessionSynchronizer` -> `sessionSynchronizerService` | + +`sessions` and `sessionSynchronizer` are separate concerns: + +- `sessions` handles runtime event normalization and history fetches. +- `sessionSynchronizer` handles file-backed session indexing into `sessionsDb`. + +## How To Add A Provider + +1. Add the provider id everywhere it is part of the contract. + +- Update `server/shared/types.ts` `LLMProvider`. +- Update `src/types/app.ts` `LLMProvider` if the frontend should know about it. +- Update `server/modules/providers/provider.routes.ts`. +- Update `server/routes/agent.js` if the provider is launchable from the agent runtime. +- Update `server/index.js` if the provider needs runtime boot or shutdown wiring. +- Update `shared/modelConstants.js` if the provider appears in UI provider pickers. +- Update `src/components/chat/hooks/useChatProviderState.ts` and + `src/components/chat/view/subcomponents/ProviderSelectionEmptyState.tsx` if + the provider should be selectable in chat. +- Update `src/components/provider-auth/view/ProviderLoginModal.tsx` if the + provider has a login/setup flow. + +2. Create the wrapper class. + +- Add `server/modules/providers/list//.provider.ts`. +- Extend `AbstractProvider`. +- Expose readonly `auth`, `mcp`, `skills`, `sessions`, and `sessionSynchronizer`. +- Call `super('')`. + +3. Implement auth. + +- Return a full `ProviderAuthStatus`. +- Treat normal `not installed` / `not authenticated` states as data, not exceptions. +- Keep provider-specific credential discovery inside the auth provider. +- If the provider has no auth step, return a stable unauthenticated or not-installed status instead of omitting the facet. + +4. Implement MCP. + +- Extend `McpProvider`. +- Pass the supported scopes and transports to `super(...)`. +- Implement the four required methods: + - `readScopedServers(...)` + - `writeScopedServers(...)` + - `buildServerConfig(...)` + - `normalizeServerConfig(...)` +- Use the shared validation and normalization behavior from `McpProvider`. +- Keep the provider-specific config format local to the provider implementation. + +Current MCP formats in this repo are: + +| Provider | User / Project Storage | Supported Scopes | Supported Transports | +| --- | --- | --- | --- | +| Claude | `.mcp.json` in user / local / project locations | `user`, `local`, `project` | `stdio`, `http`, `sse` | +| Codex | `.codex/config.toml` | `user`, `project` | `stdio`, `http` | +| Cursor | `.cursor/mcp.json` | `user`, `project` | `stdio`, `http` | +| Gemini | `.gemini/settings.json` | `user`, `project` | `stdio`, `http` | + +5. Implement skills. + +- Extend `SkillsProvider`. +- Implement `getSkillSources(workspacePath)`. +- Return the actual discovery roots for the provider. +- Skills are discovered from `SKILL.md` files. +- `readProviderSkillMarkdownDefinition(...)` reads front matter `name` and `description`. +- If `name` is missing, the parent directory name is used as a fallback. +- Use `recursive: true` only when the provider stores skills in nested trees. +- Keep the emitted `command` string aligned with the provider's real skill syntax. + +Current skill discovery roots are: + +| Provider | User Roots | Project / Repo Roots | Prefix | Notes | +| --- | --- | --- | --- | --- | +| Claude | `~/.claude/skills` | `/.claude/skills` | `/` | Also discovers Claude plugin skills from enabled plugin installs. Command skills live under `commands/`; markdown skills live under `skills/` and are scanned recursively. | +| Codex | `~/.agents/skills`, `~/.codex/skills/.system`, `/etc/codex/skills` | `/.agents/skills`, `path.dirname(workspacePath)/.agents/skills`, topmost git root `.agents/skills` | `$` | Overlapping roots are deduplicated before scanning. | +| Cursor | `~/.cursor/skills` | `/.cursor/skills`, `/.agents/skills` | `/` | Uses slash-style commands. | +| Gemini | `~/.gemini/skills`, `~/.agents/skills` | `/.gemini/skills`, `/.agents/skills` | `/` | Uses slash-style commands. | + +Command forms currently used by the providers are: + +- Claude user/project skills: `/skill-name` +- Claude plugin skills: `/plugin-name:skill-name` +- Codex skills: `$skill-name` +- Cursor skills: `/skill-name` +- Gemini skills: `/skill-name` + +6. Implement sessions. + +- Implement `normalizeMessage(raw, sessionId)` and `fetchHistory(sessionId, options)`. +- Use `createNormalizedMessage(...)` and `generateMessageId(...)` for emitted messages. +- Keep normalized message ids unique. If one raw event produces multiple text + parts, append a discriminator so ids do not collide. +- Keep pagination consistent: + - `limit: null` means unbounded/full history. + - `limit: 0` means an empty page. + - always return `total`, `hasMore`, `offset`, and `limit` when paginating. +- Sanitize any filesystem-derived ids before using them in file or database paths. +- Do not assume a provider's history format matches another provider's format. + +7. Implement session synchronization. + +- Implement `synchronize(since?: Date)` to scan provider artifacts and upsert + sessions into `sessionsDb`. +- Implement `synchronizeFile(filePath)` for single-file watcher updates. +- Use the existing helpers when they fit: + - `buildLookupMap(...)` + - `extractFirstValidJsonlData(...)` + - `findFilesRecursivelyCreatedAfter(...)` + - `normalizeSessionName(...)` + - `readFileTimestamps(...)` +- Make the sync resilient to partial, malformed, or missing provider files. +- The orchestration service runs all provider synchronizers and only advances + `scan_state.last_scanned_at` when every provider succeeds. + +Current session sync roots are: + +| Provider | Scan Roots | Metadata Helpers / Notes | +| --- | --- | --- | +| Claude | `~/.claude/projects/**/*.jsonl` | Uses `~/.claude/history.jsonl` for name lookup and the trailing `ai-title`, `last-prompt`, or `custom-title` entries for title recovery. | +| Codex | `~/.codex/sessions/**/*.jsonl` | Uses `~/.codex/session_index.jsonl` for title lookup and the last `task_complete` message for a fallback title. | +| Cursor | `~/.cursor/projects/**/*.jsonl` | Uses sibling `worker.log` to recover `workspacePath`, then derives the session title from the first user prompt. | +| Gemini | `~/.gemini/tmp/**/*.jsonl` | Current full scans only index temp JSONL chat artifacts. Single-file sync also accepts legacy `.json` files. | + +8. Register the provider. + +- Add the new provider class to `server/modules/providers/provider.registry.ts`. +- Update `server/modules/providers/provider.routes.ts` provider parsing. +- If the provider introduces a new service or lifecycle hook, export it from the module entrypoint that consumes providers. + +9. Wire runtime and UI surfaces outside the providers module when needed. + +If the provider can run live chat sessions, update the runtime entrypoints too: + +- `server/routes/agent.js` +- `server/index.js` + +If the provider is visible in the UI, update: + +- `shared/modelConstants.js` +- `src/components/chat/hooks/useChatProviderState.ts` +- `src/components/chat/view/subcomponents/ProviderSelectionEmptyState.tsx` +- `src/components/provider-auth/view/ProviderLoginModal.tsx` + +## Minimal Wrapper Template + +```ts +import { AbstractProvider } from '@/modules/providers/shared/base/abstract.provider.js'; +import { ProviderAuth } from './-auth.provider.js'; +import { McpProvider } from './-mcp.provider.js'; +import { SkillsProvider } from './-skills.provider.js'; +import { SessionsProvider } from './-sessions.provider.js'; +import { SessionSynchronizer } from './-session-synchronizer.provider.js'; +import type { + IProviderAuth, + IProviderMcp, + IProviderSessionSynchronizer, + IProviderSessions, + IProviderSkills, +} from '@/shared/interfaces.js'; + +export class Provider extends AbstractProvider { + readonly auth: IProviderAuth = new ProviderAuth(); + readonly mcp: IProviderMcp = new McpProvider(); + readonly skills: IProviderSkills = new SkillsProvider(); + readonly sessions: IProviderSessions = new SessionsProvider(); + readonly sessionSynchronizer: IProviderSessionSynchronizer = + new SessionSynchronizer(); + + constructor() { + super(''); + } +} +``` + +## Minimal Skills Template + +```ts +import path from 'node:path'; + +import { SkillsProvider } from '@/modules/providers/shared/skills/skills.provider.js'; +import type { ProviderSkillSource } from '@/shared/types.js'; + +export class SkillsProvider extends SkillsProvider { + constructor() { + super(''); + } + + protected async getSkillSources(workspacePath: string): Promise { + return [ + { + scope: 'project', + rootDir: path.join(workspacePath, '.', 'skills'), + commandPrefix: '/', + }, + ]; + } +} +``` + +## Minimal Session Sync Template + +```ts +import type { IProviderSessionSynchronizer } from '@/shared/interfaces.js'; + +export class SessionSynchronizer implements IProviderSessionSynchronizer { + async synchronize(since?: Date): Promise { + return 0; + } + + async synchronizeFile(filePath: string): Promise { + return null; + } +} +``` + +## AI Prompt Template + +Use this prompt when asking an AI agent to add a provider: + +```text +Add a new provider "" using the current provider module architecture. + +Requirements: +1) Create: + - server/modules/providers/list//.provider.ts + - server/modules/providers/list//-auth.provider.ts + - server/modules/providers/list//-mcp.provider.ts + - server/modules/providers/list//-skills.provider.ts + - server/modules/providers/list//-sessions.provider.ts + - server/modules/providers/list//-session-synchronizer.provider.ts +2) Register in: + - server/modules/providers/provider.registry.ts + - server/modules/providers/provider.routes.ts + - server/shared/types.ts LLMProvider + - src/types/app.ts LLMProvider +3) Mirror the nearest existing provider implementation for file naming, style, + and error handling. +4) Implement skills support with SkillsProvider and the current skill roots. +5) Implement session synchronization if the provider stores transcript files. +6) Ensure sessions use unique ids, safe path handling, and correct pagination. +7) Keep `sessions` and `sessionSynchronizer` separate. +8) Run: + - npx eslint + - npx tsc --noEmit -p server/tsconfig.json +``` + +## Validation + +After adding or changing a provider, run the relevant checks: + +```bash +npx eslint server/modules/providers/**/*.ts server/shared/types.ts server/shared/interfaces.ts +npx tsc --noEmit -p server/tsconfig.json +``` + +Useful tests in this repo: + +- `server/modules/providers/tests/mcp.test.ts` +- `server/modules/providers/tests/skills.test.ts` + +If you touch sessions or session synchronization, add or update focused tests +alongside the implementation. + +## Common Mistakes + +- Adding provider files but forgetting `provider.registry.ts` or + `provider.routes.ts`. +- Updating backend provider ids but not `src/types/app.ts` or the frontend + provider constants. +- Omitting `skills` or `sessionSynchronizer` from the wrapper. +- Returning duplicate normalized message ids for split content. +- Treating `limit === 0` as unbounded history. +- Building file paths from raw session ids without validation. +- Hardcoding a skill root without checking the provider's actual discovery rules. +- Forgetting that Claude plugin skills are discovered differently from normal + user/project skill folders. +- Assuming one provider's MCP config file format works for the others. + + diff --git a/server/modules/providers/index.ts b/server/modules/providers/index.ts index 28287299..0d8d8edd 100644 --- a/server/modules/providers/index.ts +++ b/server/modules/providers/index.ts @@ -1,4 +1,5 @@ export { sessionSynchronizerService } from './services/session-synchronizer.service.js'; +export { providerSkillsService } from './services/skills.service.js'; export { initializeSessionsWatcher } from './services/sessions-watcher.service.js'; -export { closeSessionsWatcher } from './services/sessions-watcher.service.js'; \ No newline at end of file +export { closeSessionsWatcher } from './services/sessions-watcher.service.js'; diff --git a/server/modules/providers/list/claude/claude-skills.provider.ts b/server/modules/providers/list/claude/claude-skills.provider.ts new file mode 100644 index 00000000..cbb1073a --- /dev/null +++ b/server/modules/providers/list/claude/claude-skills.provider.ts @@ -0,0 +1,257 @@ +import { readFile, readdir, stat } from 'node:fs/promises'; +import os from 'node:os'; +import path from 'node:path'; + +import { SkillsProvider } from '@/modules/providers/shared/skills/skills.provider.js'; +import { parseFrontMatter } from '@/shared/frontmatter.js'; +import type { + ProviderSkill, + ProviderSkillListOptions, + ProviderSkillSource, +} from '@/shared/types.js'; +import { + findProviderSkillMarkdownFiles, + readJsonConfig, + readObjectRecord, + readOptionalString, + readProviderSkillMarkdownDefinition, +} from '@/shared/utils.js'; + +const getClaudeHomePath = (): string => path.join(os.homedir(), '.claude'); + +const getClaudePluginName = (pluginId: string): string | null => { + const normalizedPluginId = pluginId.trim(); + if (!normalizedPluginId || normalizedPluginId === '@') { + return null; + } + + const [pluginName] = normalizedPluginId.split('@'); + return readOptionalString(pluginName) ?? null; +}; + +const stripMarkdownExtension = (filename: string): string => + filename.replace(/\.md$/i, ''); + +const pathExistsAsDirectory = async (directoryPath: string): Promise => { + try { + const directoryStats = await stat(directoryPath); + return directoryStats.isDirectory(); + } catch { + return false; + } +}; + +const listChildDirectories = async (directoryPath: string): Promise => { + try { + const entries = await readdir(directoryPath, { withFileTypes: true }); + return entries + .filter((entry) => entry.isDirectory()) + .map((entry) => path.join(directoryPath, entry.name)) + .sort((left, right) => left.localeCompare(right)); + } catch { + return []; + } +}; + +const readClaudePluginName = async ( + installPath: string, + pluginId: string, +): Promise => { + try { + const pluginConfig = await readJsonConfig( + path.join(installPath, '.claude-plugin', 'plugin.json'), + ); + + // Older or partial plugin installs may not have plugin.json yet. Falling + // back keeps discovery useful without inventing a separate namespace. + return readOptionalString(pluginConfig.name) ?? getClaudePluginName(pluginId); + } catch { + return getClaudePluginName(pluginId); + } +}; + +export class ClaudeSkillsProvider extends SkillsProvider { + constructor() { + super('claude'); + } + + async listSkills(options?: ProviderSkillListOptions): Promise { + return [ + ...(await super.listSkills(options)), + ...(await this.listPluginSkills(getClaudeHomePath())), + ]; + } + + protected async getSkillSources(workspacePath: string): Promise { + const claudeHomePath = getClaudeHomePath(); + + return [ + { + scope: 'user', + rootDir: path.join(claudeHomePath, 'skills'), + commandPrefix: '/', + }, + { + scope: 'project', + rootDir: path.join(workspacePath, '.claude', 'skills'), + commandPrefix: '/', + }, + ]; + } + + private async listPluginSkills(claudeHomePath: string): Promise { + const settings = await readJsonConfig(path.join(claudeHomePath, 'settings.json')); + const enabledPlugins = readObjectRecord(settings.enabledPlugins); + if (!enabledPlugins) { + return []; + } + + const installedConfig = await readJsonConfig( + path.join(claudeHomePath, 'plugins', 'installed_plugins.json'), + ); + const installedPlugins = readObjectRecord(installedConfig.plugins); + if (!installedPlugins) { + return []; + } + + const skills: ProviderSkill[] = []; + const visitedPluginFolders = new Set(); + const pluginEntries = Object.entries(enabledPlugins) + .sort(([left], [right]) => left.localeCompare(right)); + for (const [pluginId, enabled] of pluginEntries) { + if (enabled !== true) { + continue; + } + + const installs = installedPlugins[pluginId]; + if (!Array.isArray(installs)) { + continue; + } + + for (const install of installs) { + const installRecord = readObjectRecord(install); + const installPath = readOptionalString(installRecord?.installPath); + if (!installPath) { + continue; + } + + // Claude's installed path points at one version folder; the usable + // plugin payloads live in the direct child folders beside it. + const pluginFolders = await listChildDirectories(path.dirname(installPath)); + for (const pluginFolder of pluginFolders) { + const pluginFolderKey = `${pluginId}:${path.resolve(pluginFolder)}`; + if (visitedPluginFolders.has(pluginFolderKey)) { + continue; + } + visitedPluginFolders.add(pluginFolderKey); + + const pluginName = await readClaudePluginName(pluginFolder, pluginId); + if (!pluginName) { + continue; + } + + const commandsPath = path.join(pluginFolder, 'commands'); + if (await pathExistsAsDirectory(commandsPath)) { + skills.push( + ...(await this.listPluginCommandSkills(commandsPath, pluginId, pluginName)), + ); + continue; + } + + const skillsPath = path.join(pluginFolder, 'skills'); + if (!(await pathExistsAsDirectory(skillsPath))) { + continue; + } + + skills.push( + ...(await this.listPluginSkillMarkdowns(pluginFolder, pluginId, pluginName)), + ); + } + } + } + + return skills; + } + + private async listPluginCommandSkills( + commandsPath: string, + pluginId: string, + pluginName: string, + ): Promise { + const skills: ProviderSkill[] = []; + + try { + const entries = await readdir(commandsPath, { withFileTypes: true }); + const commandFiles = entries + .filter((entry) => entry.isFile() && entry.name.toLowerCase().endsWith('.md')) + .sort((left, right) => left.name.localeCompare(right.name)); + + for (const commandFile of commandFiles) { + const sourcePath = path.join(commandsPath, commandFile.name); + try { + const definition = await this.readPluginCommandDefinition(sourcePath); + skills.push({ + provider: this.provider, + name: definition.name, + description: definition.description, + command: `/${pluginName}:${definition.name}`, + scope: 'plugin', + sourcePath, + pluginName, + pluginId, + }); + } catch { + // Malformed command markdown should not block sibling plugin commands. + } + } + } catch { + // Missing or unreadable command folders are treated as empty plugin command sets. + } + + return skills; + } + + private async readPluginCommandDefinition( + commandPath: string, + ): Promise<{ name: string; description: string }> { + const content = await readFile(commandPath, 'utf8'); + const parsed = parseFrontMatter(content); + const data = readObjectRecord(parsed.data) ?? {}; + + return { + name: stripMarkdownExtension(path.basename(commandPath)), + description: readOptionalString(data.description) ?? '', + }; + } + + private async listPluginSkillMarkdowns( + installPath: string, + pluginId: string, + pluginName: string, + ): Promise { + const skillFiles = await findProviderSkillMarkdownFiles(path.join(installPath, 'skills'), { + recursive: true, + }); + const skills: ProviderSkill[] = []; + + for (const skillPath of skillFiles) { + try { + const definition = await readProviderSkillMarkdownDefinition(skillPath); + skills.push({ + provider: this.provider, + name: definition.name, + description: definition.description, + command: `/${pluginName}:${definition.name}`, + scope: 'plugin', + sourcePath: skillPath, + pluginName, + pluginId, + }); + } catch { + // A bad plugin skill file should not block other installed plugin skills. + } + } + + return skills; + } +} diff --git a/server/modules/providers/list/claude/claude.provider.ts b/server/modules/providers/list/claude/claude.provider.ts index eeec1eb4..efd3bd4a 100644 --- a/server/modules/providers/list/claude/claude.provider.ts +++ b/server/modules/providers/list/claude/claude.provider.ts @@ -3,11 +3,18 @@ import { ClaudeProviderAuth } from '@/modules/providers/list/claude/claude-auth. import { ClaudeMcpProvider } from '@/modules/providers/list/claude/claude-mcp.provider.js'; import { ClaudeSessionSynchronizer } from '@/modules/providers/list/claude/claude-session-synchronizer.provider.js'; import { ClaudeSessionsProvider } from '@/modules/providers/list/claude/claude-sessions.provider.js'; -import type { IProviderAuth, IProviderSessionSynchronizer, IProviderSessions } from '@/shared/interfaces.js'; +import { ClaudeSkillsProvider } from '@/modules/providers/list/claude/claude-skills.provider.js'; +import type { + IProviderAuth, + IProviderSessionSynchronizer, + IProviderSkills, + IProviderSessions, +} from '@/shared/interfaces.js'; export class ClaudeProvider extends AbstractProvider { readonly mcp = new ClaudeMcpProvider(); readonly auth: IProviderAuth = new ClaudeProviderAuth(); + readonly skills: IProviderSkills = new ClaudeSkillsProvider(); readonly sessions: IProviderSessions = new ClaudeSessionsProvider(); readonly sessionSynchronizer: IProviderSessionSynchronizer = new ClaudeSessionSynchronizer(); diff --git a/server/modules/providers/list/codex/codex-skills.provider.ts b/server/modules/providers/list/codex/codex-skills.provider.ts new file mode 100644 index 00000000..a4dd4add --- /dev/null +++ b/server/modules/providers/list/codex/codex-skills.provider.ts @@ -0,0 +1,100 @@ +import fs from 'node:fs/promises'; +import os from 'node:os'; +import path from 'node:path'; + +import { SkillsProvider } from '@/modules/providers/shared/skills/skills.provider.js'; +import type { ProviderSkillSource } from '@/shared/types.js'; + +const hasGitMarker = async (dirPath: string): Promise => { + try { + const gitMarkerStats = await fs.stat(path.join(dirPath, '.git')); + return gitMarkerStats.isDirectory() || gitMarkerStats.isFile(); + } catch { + return false; + } +}; + +const findTopmostGitRoot = async (startPath: string): Promise => { + let currentPath = path.resolve(startPath); + let topmostGitRoot: string | null = null; + + while (true) { + if (await hasGitMarker(currentPath)) { + topmostGitRoot = currentPath; + } + + const parentPath = path.dirname(currentPath); + if (parentPath === currentPath) { + break; + } + + currentPath = parentPath; + } + + return topmostGitRoot; +}; + +const addUniqueSource = ( + sources: ProviderSkillSource[], + seenRootDirs: Set, + source: ProviderSkillSource, +): void => { + const normalizedRootDir = path.resolve(source.rootDir); + if (seenRootDirs.has(normalizedRootDir)) { + return; + } + + seenRootDirs.add(normalizedRootDir); + sources.push({ ...source, rootDir: normalizedRootDir }); +}; + +export class CodexSkillsProvider extends SkillsProvider { + constructor() { + super('codex'); + } + + protected async getSkillSources(workspacePath: string): Promise { + const sources: ProviderSkillSource[] = []; + const seenRootDirs = new Set(); + const repoRoot = await findTopmostGitRoot(workspacePath); + + addUniqueSource(sources, seenRootDirs, { + scope: 'repo', + rootDir: path.join(workspacePath, '.agents', 'skills'), + commandPrefix: '$', + }); + + if (repoRoot) { + // Codex checks repository skills at the launch folder, one folder above it, + // and the topmost git root; these can collapse to the same directory. + addUniqueSource(sources, seenRootDirs, { + scope: 'repo', + rootDir: path.join(path.dirname(workspacePath), '.agents', 'skills'), + commandPrefix: '$', + }); + addUniqueSource(sources, seenRootDirs, { + scope: 'repo', + rootDir: path.join(repoRoot, '.agents', 'skills'), + commandPrefix: '$', + }); + } + + addUniqueSource(sources, seenRootDirs, { + scope: 'user', + rootDir: path.join(os.homedir(), '.agents', 'skills'), + commandPrefix: '$', + }); + addUniqueSource(sources, seenRootDirs, { + scope: 'admin', + rootDir: path.join('/etc', 'codex', 'skills'), + commandPrefix: '$', + }); + addUniqueSource(sources, seenRootDirs, { + scope: 'system', + rootDir: path.join(os.homedir(), '.codex', 'skills', '.system'), + commandPrefix: '$', + }); + + return sources; + } +} diff --git a/server/modules/providers/list/codex/codex.provider.ts b/server/modules/providers/list/codex/codex.provider.ts index 593297bc..811ff6de 100644 --- a/server/modules/providers/list/codex/codex.provider.ts +++ b/server/modules/providers/list/codex/codex.provider.ts @@ -3,11 +3,18 @@ import { CodexProviderAuth } from '@/modules/providers/list/codex/codex-auth.pro import { CodexMcpProvider } from '@/modules/providers/list/codex/codex-mcp.provider.js'; import { CodexSessionSynchronizer } from '@/modules/providers/list/codex/codex-session-synchronizer.provider.js'; import { CodexSessionsProvider } from '@/modules/providers/list/codex/codex-sessions.provider.js'; -import type { IProviderAuth, IProviderSessionSynchronizer, IProviderSessions } from '@/shared/interfaces.js'; +import { CodexSkillsProvider } from '@/modules/providers/list/codex/codex-skills.provider.js'; +import type { + IProviderAuth, + IProviderSessionSynchronizer, + IProviderSkills, + IProviderSessions, +} from '@/shared/interfaces.js'; export class CodexProvider extends AbstractProvider { readonly mcp = new CodexMcpProvider(); readonly auth: IProviderAuth = new CodexProviderAuth(); + readonly skills: IProviderSkills = new CodexSkillsProvider(); readonly sessions: IProviderSessions = new CodexSessionsProvider(); readonly sessionSynchronizer: IProviderSessionSynchronizer = new CodexSessionSynchronizer(); diff --git a/server/modules/providers/list/cursor/cursor-skills.provider.ts b/server/modules/providers/list/cursor/cursor-skills.provider.ts new file mode 100644 index 00000000..3da72b9f --- /dev/null +++ b/server/modules/providers/list/cursor/cursor-skills.provider.ts @@ -0,0 +1,31 @@ +import os from 'node:os'; +import path from 'node:path'; + +import { SkillsProvider } from '@/modules/providers/shared/skills/skills.provider.js'; +import type { ProviderSkillSource } from '@/shared/types.js'; + +export class CursorSkillsProvider extends SkillsProvider { + constructor() { + super('cursor'); + } + + protected async getSkillSources(workspacePath: string): Promise { + return [ + { + scope: 'project', + rootDir: path.join(workspacePath, '.agents', 'skills'), + commandPrefix: '/', + }, + { + scope: 'project', + rootDir: path.join(workspacePath, '.cursor', 'skills'), + commandPrefix: '/', + }, + { + scope: 'user', + rootDir: path.join(os.homedir(), '.cursor', 'skills'), + commandPrefix: '/', + }, + ]; + } +} diff --git a/server/modules/providers/list/cursor/cursor.provider.ts b/server/modules/providers/list/cursor/cursor.provider.ts index 72edf80c..7fc4abf5 100644 --- a/server/modules/providers/list/cursor/cursor.provider.ts +++ b/server/modules/providers/list/cursor/cursor.provider.ts @@ -3,11 +3,18 @@ import { CursorProviderAuth } from '@/modules/providers/list/cursor/cursor-auth. import { CursorMcpProvider } from '@/modules/providers/list/cursor/cursor-mcp.provider.js'; import { CursorSessionSynchronizer } from '@/modules/providers/list/cursor/cursor-session-synchronizer.provider.js'; import { CursorSessionsProvider } from '@/modules/providers/list/cursor/cursor-sessions.provider.js'; -import type { IProviderAuth, IProviderSessionSynchronizer, IProviderSessions } from '@/shared/interfaces.js'; +import { CursorSkillsProvider } from '@/modules/providers/list/cursor/cursor-skills.provider.js'; +import type { + IProviderAuth, + IProviderSessionSynchronizer, + IProviderSkills, + IProviderSessions, +} from '@/shared/interfaces.js'; export class CursorProvider extends AbstractProvider { readonly mcp = new CursorMcpProvider(); readonly auth: IProviderAuth = new CursorProviderAuth(); + readonly skills: IProviderSkills = new CursorSkillsProvider(); readonly sessions: IProviderSessions = new CursorSessionsProvider(); readonly sessionSynchronizer: IProviderSessionSynchronizer = new CursorSessionSynchronizer(); diff --git a/server/modules/providers/list/gemini/gemini-skills.provider.ts b/server/modules/providers/list/gemini/gemini-skills.provider.ts new file mode 100644 index 00000000..e49746a5 --- /dev/null +++ b/server/modules/providers/list/gemini/gemini-skills.provider.ts @@ -0,0 +1,36 @@ +import os from 'node:os'; +import path from 'node:path'; + +import { SkillsProvider } from '@/modules/providers/shared/skills/skills.provider.js'; +import type { ProviderSkillSource } from '@/shared/types.js'; + +export class GeminiSkillsProvider extends SkillsProvider { + constructor() { + super('gemini'); + } + + protected async getSkillSources(workspacePath: string): Promise { + return [ + { + scope: 'user', + rootDir: path.join(os.homedir(), '.gemini', 'skills'), + commandPrefix: '/', + }, + { + scope: 'user', + rootDir: path.join(os.homedir(), '.agents', 'skills'), + commandPrefix: '/', + }, + { + scope: 'project', + rootDir: path.join(workspacePath, '.gemini', 'skills'), + commandPrefix: '/', + }, + { + scope: 'project', + rootDir: path.join(workspacePath, '.agents', 'skills'), + commandPrefix: '/', + }, + ]; + } +} diff --git a/server/modules/providers/list/gemini/gemini.provider.ts b/server/modules/providers/list/gemini/gemini.provider.ts index 2fb8a7c2..626cacf6 100644 --- a/server/modules/providers/list/gemini/gemini.provider.ts +++ b/server/modules/providers/list/gemini/gemini.provider.ts @@ -3,11 +3,18 @@ import { GeminiProviderAuth } from '@/modules/providers/list/gemini/gemini-auth. import { GeminiMcpProvider } from '@/modules/providers/list/gemini/gemini-mcp.provider.js'; import { GeminiSessionSynchronizer } from '@/modules/providers/list/gemini/gemini-session-synchronizer.provider.js'; import { GeminiSessionsProvider } from '@/modules/providers/list/gemini/gemini-sessions.provider.js'; -import type { IProviderAuth, IProviderSessionSynchronizer, IProviderSessions } from '@/shared/interfaces.js'; +import { GeminiSkillsProvider } from '@/modules/providers/list/gemini/gemini-skills.provider.js'; +import type { + IProviderAuth, + IProviderSessionSynchronizer, + IProviderSkills, + IProviderSessions, +} from '@/shared/interfaces.js'; export class GeminiProvider extends AbstractProvider { readonly mcp = new GeminiMcpProvider(); readonly auth: IProviderAuth = new GeminiProviderAuth(); + readonly skills: IProviderSkills = new GeminiSkillsProvider(); readonly sessions: IProviderSessions = new GeminiSessionsProvider(); readonly sessionSynchronizer: IProviderSessionSynchronizer = new GeminiSessionSynchronizer(); diff --git a/server/modules/providers/provider.routes.ts b/server/modules/providers/provider.routes.ts index ea95f83d..819959c4 100644 --- a/server/modules/providers/provider.routes.ts +++ b/server/modules/providers/provider.routes.ts @@ -2,6 +2,7 @@ import express, { type Request, type Response } from 'express'; import { providerAuthService } from '@/modules/providers/services/provider-auth.service.js'; import { providerMcpService } from '@/modules/providers/services/mcp.service.js'; +import { providerSkillsService } from '@/modules/providers/services/skills.service.js'; import { sessionConversationsSearchService } from '@/modules/providers/services/session-conversations-search.service.js'; import { sessionsService } from '@/modules/providers/services/sessions.service.js'; import type { LLMProvider, McpScope, McpTransport, UpsertProviderMcpServerInput } from '@/shared/types.js'; @@ -247,6 +248,17 @@ router.get( }), ); +// ----------------- Skills routes ----------------- +router.get( + '/:provider/skills', + asyncHandler(async (req: Request, res: Response) => { + const provider = parseProvider(req.params.provider); + const workspacePath = readOptionalQueryString(req.query.workspacePath); + const skills = await providerSkillsService.listProviderSkills(provider, { workspacePath }); + res.json(createApiSuccessResponse({ provider, skills })); + }), +); + // ----------------- MCP routes ----------------- router.get( '/:provider/mcp/servers', diff --git a/server/modules/providers/services/skills.service.ts b/server/modules/providers/services/skills.service.ts new file mode 100644 index 00000000..2a02ad22 --- /dev/null +++ b/server/modules/providers/services/skills.service.ts @@ -0,0 +1,15 @@ +import { providerRegistry } from '@/modules/providers/provider.registry.js'; +import type { ProviderSkill, ProviderSkillListOptions } from '@/shared/types.js'; + +export const providerSkillsService = { + /** + * Lists normalized skills visible to one provider. + */ + async listProviderSkills( + providerName: string, + options?: ProviderSkillListOptions, + ): Promise { + const provider = providerRegistry.resolveProvider(providerName); + return provider.skills.listSkills(options); + }, +}; diff --git a/server/modules/providers/shared/base/abstract.provider.ts b/server/modules/providers/shared/base/abstract.provider.ts index c674364d..03701d3e 100644 --- a/server/modules/providers/shared/base/abstract.provider.ts +++ b/server/modules/providers/shared/base/abstract.provider.ts @@ -3,6 +3,7 @@ import type { IProviderAuth, IProviderMcp, IProviderSessionSynchronizer, + IProviderSkills, IProviderSessions, } from '@/shared/interfaces.js'; import type { LLMProvider } from '@/shared/types.js'; @@ -18,6 +19,7 @@ export abstract class AbstractProvider implements IProvider { readonly id: LLMProvider; abstract readonly mcp: IProviderMcp; abstract readonly auth: IProviderAuth; + abstract readonly skills: IProviderSkills; abstract readonly sessions: IProviderSessions; abstract readonly sessionSynchronizer: IProviderSessionSynchronizer; diff --git a/server/modules/providers/shared/skills/skills.provider.ts b/server/modules/providers/shared/skills/skills.provider.ts new file mode 100644 index 00000000..07e83a5b --- /dev/null +++ b/server/modules/providers/shared/skills/skills.provider.ts @@ -0,0 +1,64 @@ +import path from 'node:path'; + +import type { IProviderSkills } from '@/shared/interfaces.js'; +import type { + LLMProvider, + ProviderSkill, + ProviderSkillListOptions, + ProviderSkillSource, +} from '@/shared/types.js'; +import { + findProviderSkillMarkdownFiles, + readProviderSkillMarkdownDefinition, +} from '@/shared/utils.js'; + +const resolveWorkspacePath = (workspacePath?: string): string => + path.resolve(workspacePath ?? process.cwd()); + +/** + * Shared skills provider for provider-specific skill source discovery. + */ +export abstract class SkillsProvider implements IProviderSkills { + protected readonly provider: LLMProvider; + + protected constructor(provider: LLMProvider) { + this.provider = provider; + } + + async listSkills(options?: ProviderSkillListOptions): Promise { + const workspacePath = resolveWorkspacePath(options?.workspacePath); + const sources = await this.getSkillSources(workspacePath); + const skills: ProviderSkill[] = []; + + for (const source of sources) { + const skillFiles = await findProviderSkillMarkdownFiles(source.rootDir, { + recursive: source.recursive, + }); + for (const skillPath of skillFiles) { + try { + const definition = await readProviderSkillMarkdownDefinition(skillPath); + const command = source.commandForSkill + ? source.commandForSkill(definition.name) + : `${source.commandPrefix ?? '/'}${definition.name}`; + + skills.push({ + provider: this.provider, + name: definition.name, + description: definition.description, + command, + scope: source.scope, + sourcePath: skillPath, + pluginName: source.pluginName, + pluginId: source.pluginId, + }); + } catch { + // A malformed or unreadable skill markdown file should not hide other valid skills. + } + } + } + + return skills; + } + + protected abstract getSkillSources(workspacePath: string): Promise; +} diff --git a/server/modules/providers/tests/skills.test.ts b/server/modules/providers/tests/skills.test.ts new file mode 100644 index 00000000..179ae400 --- /dev/null +++ b/server/modules/providers/tests/skills.test.ts @@ -0,0 +1,446 @@ +import assert from 'node:assert/strict'; +import fs from 'node:fs/promises'; +import os from 'node:os'; +import path from 'node:path'; +import test from 'node:test'; + +import { providerSkillsService } from '@/modules/providers/services/skills.service.js'; + +const patchHomeDir = (nextHomeDir: string) => { + const original = os.homedir; + (os as any).homedir = () => nextHomeDir; + return () => { + (os as any).homedir = original; + }; +}; + +const writeSkill = async ( + skillsRoot: string, + directoryName: string, + name: string, + description: string, +): Promise => { + const skillDir = path.join(skillsRoot, directoryName); + await fs.mkdir(skillDir, { recursive: true }); + const skillPath = path.join(skillDir, 'SKILL.md'); + await fs.writeFile( + skillPath, + `---\nname: ${name}\ndescription: ${description}\n---\n\n`, + 'utf8', + ); + return skillPath; +}; + +const writeClaudePluginManifest = async ( + installPath: string, + name: string, +): Promise => { + const pluginConfigDir = path.join(installPath, '.claude-plugin'); + await fs.mkdir(pluginConfigDir, { recursive: true }); + await fs.writeFile( + path.join(pluginConfigDir, 'plugin.json'), + JSON.stringify( + { + name, + version: '0.1.0', + description: `${name} test plugin`, + }, + null, + 2, + ), + 'utf8', + ); +}; + +const writeClaudePluginCommand = async ( + commandsRoot: string, + commandName: string, + description: string, +): Promise => { + await fs.mkdir(commandsRoot, { recursive: true }); + const commandPath = path.join(commandsRoot, `${commandName}.md`); + await fs.writeFile( + commandPath, + `---\ndescription: ${description}\nargument-hint: 'test args'\n---\n\nCommand body.\n`, + 'utf8', + ); + return commandPath; +}; + +/** + * This test covers Claude user/project skill folders plus plugin discovery from + * installed plugin command files and fallback plugin skill files. + */ +test('providerSkillsService lists claude user, project, and enabled plugin skills', { concurrency: false }, async () => { + const tempRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'llm-skills-claude-')); + const workspacePath = path.join(tempRoot, 'workspace'); + const commandPluginInstallPath = path.join( + tempRoot, + '.claude', + 'plugins', + 'cache', + 'notion-plugin', + 'notion', + 'abc123', + ); + const skillPluginInstallPath = path.join( + tempRoot, + '.claude', + 'plugins', + 'cache', + 'anthropic-agent-skills', + 'example-skills', + 'def456', + ); + const disabledPluginInstallPath = path.join( + tempRoot, + '.claude', + 'plugins', + 'cache', + 'disabled-marketplace', + 'disabled-skills', + 'ghi789', + ); + const emptyIdPluginInstallPath = path.join( + tempRoot, + '.claude', + 'plugins', + 'cache', + 'invalid-empty-plugin', + 'empty', + '000', + ); + const atIdPluginInstallPath = path.join( + tempRoot, + '.claude', + 'plugins', + 'cache', + 'invalid-at-plugin', + 'at', + '000', + ); + const siblingSkillPluginPath = path.join(path.dirname(skillPluginInstallPath), 'legacy777'); + await fs.mkdir(workspacePath, { recursive: true }); + + const restoreHomeDir = patchHomeDir(tempRoot); + try { + await writeSkill( + path.join(tempRoot, '.claude', 'skills'), + 'claude-user-dir', + 'claude-user', + 'Claude user skill', + ); + await writeSkill( + path.join(workspacePath, '.claude', 'skills'), + 'claude-project-dir', + 'claude-project', + 'Claude project skill', + ); + await writeClaudePluginManifest(commandPluginInstallPath, 'Notion'); + await writeClaudePluginCommand( + path.join(commandPluginInstallPath, 'commands'), + 'insert-row', + 'Insert a Notion database row', + ); + await writeSkill( + path.join(commandPluginInstallPath, 'skills'), + 'ignored-command-plugin-skill-dir', + 'ignored-command-plugin-skill', + 'Command plugin fallback skill should be ignored', + ); + await writeClaudePluginManifest(skillPluginInstallPath, 'ExampleSkills'); + await writeSkill( + path.join(skillPluginInstallPath, 'skills'), + 'claude-plugin-dir', + 'claude-plugin', + 'Claude plugin skill', + ); + await writeSkill( + path.join(skillPluginInstallPath, 'skills'), + 'claude-plugin-second-dir', + 'claude-plugin-second', + 'Second Claude plugin skill', + ); + await writeSkill( + path.join(skillPluginInstallPath, 'skills', 'nested', 'collection'), + 'claude-plugin-nested-dir', + 'claude-plugin-nested', + 'Nested Claude plugin skill', + ); + await writeSkill( + path.join(siblingSkillPluginPath, 'skills'), + 'claude-plugin-sibling-dir', + 'claude-plugin-sibling', + 'Sibling Claude plugin skill', + ); + await writeClaudePluginManifest(disabledPluginInstallPath, 'DisabledSkills'); + await writeClaudePluginCommand( + path.join(disabledPluginInstallPath, 'commands'), + 'disabled-command', + 'Disabled plugin command', + ); + await writeClaudePluginCommand( + path.join(emptyIdPluginInstallPath, 'commands'), + 'invalid-empty-command', + 'Invalid empty id command', + ); + await writeClaudePluginCommand( + path.join(atIdPluginInstallPath, 'commands'), + 'invalid-at-command', + 'Invalid at id command', + ); + await writeSkill( + path.join( + disabledPluginInstallPath, + 'skills', + ), + 'disabled-plugin-dir', + 'disabled-plugin', + 'Disabled plugin skill', + ); + + await fs.writeFile( + path.join(tempRoot, '.claude', 'settings.json'), + JSON.stringify( + { + enabledPlugins: { + '': true, + '@': true, + 'notion@notion-marketplace': true, + 'example-skills@anthropic-agent-skills': true, + 'disabled-skills@disabled-marketplace': false, + }, + }, + null, + 2, + ), + 'utf8', + ); + await fs.writeFile( + path.join(tempRoot, '.claude', 'plugins', 'installed_plugins.json'), + JSON.stringify( + { + version: 2, + plugins: { + '': [ + { + scope: 'user', + installPath: emptyIdPluginInstallPath, + version: '000', + }, + ], + '@': [ + { + scope: 'user', + installPath: atIdPluginInstallPath, + version: '000', + }, + ], + 'notion@notion-marketplace': [ + { + scope: 'user', + installPath: commandPluginInstallPath, + version: 'abc123', + }, + ], + 'example-skills@anthropic-agent-skills': [ + { + scope: 'user', + installPath: skillPluginInstallPath, + version: 'def456', + }, + ], + 'disabled-skills@disabled-marketplace': [ + { + scope: 'user', + installPath: disabledPluginInstallPath, + version: 'ghi789', + }, + ], + }, + }, + null, + 2, + ), + 'utf8', + ); + + const skills = await providerSkillsService.listProviderSkills('claude', { workspacePath }); + const byName = new Map(skills.map((skill) => [skill.name, skill])); + + assert.equal(byName.get('claude-user')?.scope, 'user'); + assert.equal(byName.get('claude-user')?.command, '/claude-user'); + assert.equal(byName.get('claude-project')?.scope, 'project'); + assert.equal(byName.get('claude-project')?.command, '/claude-project'); + + const pluginCommand = byName.get('insert-row'); + assert.equal(pluginCommand?.scope, 'plugin'); + assert.equal(pluginCommand?.pluginName, 'Notion'); + assert.equal(pluginCommand?.pluginId, 'notion@notion-marketplace'); + assert.equal(pluginCommand?.command, '/Notion:insert-row'); + assert.equal(pluginCommand?.description, 'Insert a Notion database row'); + assert.match(pluginCommand?.sourcePath ?? '', /commands[\\/]insert-row\.md$/); + assert.equal(byName.has('ignored-command-plugin-skill'), false); + + const pluginSkill = byName.get('claude-plugin'); + assert.equal(pluginSkill?.scope, 'plugin'); + assert.equal(pluginSkill?.pluginName, 'ExampleSkills'); + assert.equal(pluginSkill?.pluginId, 'example-skills@anthropic-agent-skills'); + assert.equal(pluginSkill?.command, '/ExampleSkills:claude-plugin'); + assert.equal(pluginSkill?.description, 'Claude plugin skill'); + assert.match( + pluginSkill?.sourcePath ?? '', + /cache[\\/]anthropic-agent-skills[\\/]example-skills[\\/]def456[\\/]skills[\\/]/, + ); + + const secondPluginSkill = byName.get('claude-plugin-second'); + assert.equal(secondPluginSkill?.scope, 'plugin'); + assert.equal(secondPluginSkill?.command, '/ExampleSkills:claude-plugin-second'); + + const nestedPluginSkill = byName.get('claude-plugin-nested'); + assert.equal(nestedPluginSkill?.scope, 'plugin'); + assert.equal(nestedPluginSkill?.command, '/ExampleSkills:claude-plugin-nested'); + assert.equal(nestedPluginSkill?.description, 'Nested Claude plugin skill'); + + const siblingPluginSkill = byName.get('claude-plugin-sibling'); + assert.equal(siblingPluginSkill?.scope, 'plugin'); + assert.equal(siblingPluginSkill?.pluginName, 'example-skills'); + assert.equal(siblingPluginSkill?.command, '/example-skills:claude-plugin-sibling'); + assert.equal(siblingPluginSkill?.description, 'Sibling Claude plugin skill'); + assert.equal(byName.has('disabled-command'), false); + assert.equal(byName.has('disabled-plugin'), false); + assert.equal(byName.has('invalid-empty-command'), false); + assert.equal(byName.has('invalid-at-command'), false); + assert.equal(skills.some((skill) => skill.command.startsWith('/:')), false); + } finally { + restoreHomeDir(); + await fs.rm(tempRoot, { recursive: true, force: true }); + } +}); + +/** + * This test covers Codex repository/user/system skill folders and verifies that + * repository lookup includes cwd, parent, and git root skill locations. + */ +test('providerSkillsService lists codex repository, user, and system skills', { concurrency: false }, async () => { + const tempRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'llm-skills-codex-')); + const repoRoot = path.join(tempRoot, 'repo'); + const workspacePath = path.join(repoRoot, 'packages', 'app'); + await fs.mkdir(path.join(repoRoot, '.git'), { recursive: true }); + await fs.mkdir(workspacePath, { recursive: true }); + + const restoreHomeDir = patchHomeDir(tempRoot); + try { + await writeSkill( + path.join(workspacePath, '.agents', 'skills'), + 'codex-cwd-dir', + 'codex-cwd', + 'Codex cwd skill', + ); + await writeSkill( + path.join(repoRoot, 'packages', '.agents', 'skills'), + 'codex-parent-dir', + 'codex-parent', + 'Codex parent skill', + ); + await writeSkill( + path.join(repoRoot, '.agents', 'skills'), + 'codex-root-dir', + 'codex-root', + 'Codex root skill', + ); + await writeSkill( + path.join(tempRoot, '.agents', 'skills'), + 'codex-user-dir', + 'codex-user', + 'Codex user skill', + ); + await writeSkill( + path.join(tempRoot, '.codex', 'skills', '.system'), + 'codex-system-dir', + 'codex-system', + 'Codex system skill', + ); + + const skills = await providerSkillsService.listProviderSkills('codex', { workspacePath }); + const byName = new Map(skills.map((skill) => [skill.name, skill])); + + assert.equal(byName.get('codex-cwd')?.scope, 'repo'); + assert.equal(byName.get('codex-parent')?.scope, 'repo'); + assert.equal(byName.get('codex-root')?.scope, 'repo'); + assert.equal(byName.get('codex-user')?.scope, 'user'); + assert.equal(byName.get('codex-system')?.scope, 'system'); + assert.equal(byName.get('codex-root')?.command, '$codex-root'); + } finally { + restoreHomeDir(); + await fs.rm(tempRoot, { recursive: true, force: true }); + } +}); + +/** + * This test covers Gemini and Cursor skill directory rules, including shared + * `.agents/skills` project support. + */ +test('providerSkillsService lists gemini and cursor skills from their configured directories', { concurrency: false }, async () => { + const tempRoot = await fs.mkdtemp(path.join(os.tmpdir(), 'llm-skills-gc-')); + const workspacePath = path.join(tempRoot, 'workspace'); + await fs.mkdir(workspacePath, { recursive: true }); + + const restoreHomeDir = patchHomeDir(tempRoot); + try { + await writeSkill( + path.join(tempRoot, '.gemini', 'skills'), + 'gemini-user-dir', + 'gemini-user', + 'Gemini user skill', + ); + await writeSkill( + path.join(tempRoot, '.agents', 'skills'), + 'agents-user-dir', + 'agents-user', + 'Agents user skill', + ); + await writeSkill( + path.join(workspacePath, '.gemini', 'skills'), + 'gemini-project-dir', + 'gemini-project', + 'Gemini project skill', + ); + await writeSkill( + path.join(workspacePath, '.agents', 'skills'), + 'agents-project-dir', + 'agents-project', + 'Agents project skill', + ); + await writeSkill( + path.join(workspacePath, '.cursor', 'skills'), + 'cursor-project-dir', + 'cursor-project', + 'Cursor project skill', + ); + await writeSkill( + path.join(tempRoot, '.cursor', 'skills'), + 'cursor-user-dir', + 'cursor-user', + 'Cursor user skill', + ); + + const geminiSkills = await providerSkillsService.listProviderSkills('gemini', { workspacePath }); + const geminiByName = new Map(geminiSkills.map((skill) => [skill.name, skill])); + assert.equal(geminiByName.get('gemini-user')?.scope, 'user'); + assert.equal(geminiByName.get('agents-user')?.scope, 'user'); + assert.equal(geminiByName.get('gemini-project')?.scope, 'project'); + assert.equal(geminiByName.get('agents-project')?.scope, 'project'); + assert.equal(geminiByName.get('gemini-project')?.command, '/gemini-project'); + + const cursorSkills = await providerSkillsService.listProviderSkills('cursor', { workspacePath }); + const cursorByName = new Map(cursorSkills.map((skill) => [skill.name, skill])); + assert.equal(cursorByName.get('agents-project')?.scope, 'project'); + assert.equal(cursorByName.get('cursor-project')?.scope, 'project'); + assert.equal(cursorByName.get('cursor-user')?.scope, 'user'); + assert.equal(cursorByName.get('cursor-user')?.command, '/cursor-user'); + } finally { + restoreHomeDir(); + await fs.rm(tempRoot, { recursive: true, force: true }); + } +}); diff --git a/server/routes/commands.js b/server/routes/commands.js index ac957511..bb61644f 100644 --- a/server/routes/commands.js +++ b/server/routes/commands.js @@ -1,9 +1,11 @@ -import express from 'express'; import { promises as fs } from 'fs'; -import path from 'path'; import os from 'os'; +import path from 'path'; + +import express from 'express'; + import { CLAUDE_MODELS, CURSOR_MODELS, CODEX_MODELS } from '../../shared/modelConstants.js'; -import { parseFrontmatter } from '../utils/frontmatter.js'; +import { parseFrontMatter } from '../shared/frontmatter.js'; import { findAppRoot, getModuleDir } from '../utils/runtime-paths.js'; const __dirname = getModuleDir(import.meta.url); @@ -40,7 +42,7 @@ async function scanCommandsDirectory(dir, baseDir, namespace) { // Parse markdown file for metadata try { const content = await fs.readFile(fullPath, 'utf8'); - const { data: frontmatter, content: commandContent } = parseFrontmatter(content); + const { data: frontmatter, content: commandContent } = parseFrontMatter(content); // Calculate relative path from baseDir for command name const relativePath = path.relative(baseDir, fullPath); @@ -513,7 +515,7 @@ router.post('/execute', async (req, res) => { } } const content = await fs.readFile(commandPath, 'utf8'); - const { data: metadata, content: commandContent } = parseFrontmatter(content); + const { data: metadata, content: commandContent } = parseFrontMatter(content); // Basic argument replacement (will be enhanced in command parser utility) let processedContent = commandContent; diff --git a/server/utils/frontmatter.js b/server/shared/frontmatter.ts similarity index 81% rename from server/utils/frontmatter.js rename to server/shared/frontmatter.ts index 0a4b1eb8..9eb7ddd8 100644 --- a/server/utils/frontmatter.js +++ b/server/shared/frontmatter.ts @@ -9,10 +9,10 @@ const frontmatterOptions = { engines: { js: disabledFrontmatterEngine, javascript: disabledFrontmatterEngine, - json: disabledFrontmatterEngine - } + json: disabledFrontmatterEngine, + }, }; -export function parseFrontmatter(content) { +export function parseFrontMatter(content: string) { return matter(content, frontmatterOptions); } diff --git a/server/shared/interfaces.ts b/server/shared/interfaces.ts index c5354dda..bc97ffb3 100644 --- a/server/shared/interfaces.ts +++ b/server/shared/interfaces.ts @@ -4,6 +4,8 @@ import type { LLMProvider, McpScope, NormalizedMessage, + ProviderSkill, + ProviderSkillListOptions, ProviderAuthStatus, ProviderMcpServer, UpsertProviderMcpServerInput, @@ -20,6 +22,7 @@ export interface IProvider { readonly id: LLMProvider; readonly mcp: IProviderMcp; readonly auth: IProviderAuth; + readonly skills: IProviderSkills; readonly sessions: IProviderSessions; readonly sessionSynchronizer: IProviderSessionSynchronizer; } @@ -39,6 +42,22 @@ export interface IProviderAuth { getStatus(): Promise; } +// --------------------------- +//----------------- PROVIDER SKILLS INTERFACE ------------ +/** + * Skills contract for one provider. + * + * Implementations discover provider-native skill markdown locations and return + * normalized skill records with the exact command syntax expected by that + * provider. Each skill is read from a `SKILL.md` file under its skill directory. + */ +export interface IProviderSkills { + /** + * Lists all skills visible to this provider for the optional workspace. + */ + listSkills(options?: ProviderSkillListOptions): Promise; +} + // --------------------------- //----------------- PROVIDER MCP INTERFACE ------------ /** diff --git a/server/shared/types.ts b/server/shared/types.ts index af09abf2..de277d83 100644 --- a/server/shared/types.ts +++ b/server/shared/types.ts @@ -171,6 +171,69 @@ export type FetchHistoryResult = { tokenUsage?: unknown; }; +// --------------------------- +//----------------- PROVIDER SKILL TYPES ------------ +/** + * Scope where a provider skill definition was discovered. + * + * Provider skill adapters should use this to describe the origin of each + * skill markdown file without leaking provider-specific folder names into route + * contracts. `repo` is used for Codex repository lookup locations, while + * `project` is used for providers that treat workspace-local skills as project + * scoped. + */ +export type ProviderSkillScope = 'user' | 'project' | 'plugin' | 'repo' | 'admin' | 'system'; + +/** + * Shared input accepted by provider skill listing operations. + * + * Routes pass `workspacePath` when a caller wants project/repository skills for + * a specific folder. Providers should fall back to the backend process cwd when + * this option is omitted. + */ +export type ProviderSkillListOptions = { + workspacePath?: string; +}; + +/** + * Normalized skill record returned by provider skill adapters. + * + * The `command` value is the exact invocation text the selected provider expects + * for this skill. Claude plugin skills use a namespaced command such as + * `/plugin-name:skill-name`, while Codex skills use the `$skill-name` form. + * `sourcePath` points to the skill markdown file that produced the record so + * callers can distinguish duplicate skill names across scopes. + */ +export type ProviderSkill = { + provider: LLMProvider; + name: string; + description: string; + command: string; + scope: ProviderSkillScope; + sourcePath: string; + pluginName?: string; + pluginId?: string; +}; + +/** + * Internal source descriptor consumed by shared provider skill discovery logic. + * + * Concrete provider adapters build these records from their native lookup rules. + * The shared skills provider then scans `rootDir` for child skill markdown files + * and uses `commandForSkill` or `commandPrefix` to produce the provider-specific + * invocation command. Set `recursive` only when a provider stores skills under + * arbitrary nested folders below the source root. + */ +export type ProviderSkillSource = { + scope: ProviderSkillScope; + rootDir: string; + recursive?: boolean; + commandPrefix?: '/' | '$'; + commandForSkill?: (skillName: string) => string; + pluginName?: string; + pluginId?: string; +}; + // --------------------------- //----------------- SHARED ERROR TYPES ------------ /** diff --git a/server/shared/utils.ts b/server/shared/utils.ts index 84a382c3..2903814e 100644 --- a/server/shared/utils.ts +++ b/server/shared/utils.ts @@ -17,6 +17,7 @@ import readline from 'node:readline'; import type { NextFunction, Request, RequestHandler, Response } from 'express'; +import { parseFrontMatter } from '@/shared/frontmatter.js'; import type { AnyRecord, ApiSuccessShape, @@ -503,6 +504,99 @@ export const writeJsonConfig = async (filePath: string, data: Record//SKILL.md`. Recursive mode is reserved for + * provider sources that can nest skills arbitrarily, and it returns every + * descendant `SKILL.md`. Missing or unreadable roots return an empty list + * because users may not have every provider installed or configured. + */ +export async function findProviderSkillMarkdownFiles( + rootDir: string, + options: { recursive?: boolean } = {}, +): Promise { + const skillFiles: string[] = []; + + const collectRecursive = async (dirPath: string): Promise => { + let entries; + try { + entries = await readdir(dirPath, { withFileTypes: true }); + } catch { + return; + } + + try { + const skillPath = path.join(dirPath, 'SKILL.md'); + const skillStats = await stat(skillPath); + if (skillStats.isFile()) { + skillFiles.push(skillPath); + } + } catch { + // Directories without SKILL.md are expected while walking plugin trees. + } + + for (const entry of entries) { + if (entry.isDirectory()) { + await collectRecursive(path.join(dirPath, entry.name)); + } + } + }; + + if (options.recursive) { + await collectRecursive(rootDir); + return skillFiles.sort((left, right) => left.localeCompare(right)); + } + + try { + const entries = await readdir(rootDir, { withFileTypes: true }); + + for (const entry of entries) { + if (!entry.isDirectory()) { + continue; + } + + const skillPath = path.join(rootDir, entry.name, 'SKILL.md'); + try { + const skillStats = await stat(skillPath); + if (skillStats.isFile()) { + skillFiles.push(skillPath); + } + } catch { + // A partial skill directory should not block discovery of sibling skills. + } + } + + return skillFiles.sort((left, right) => left.localeCompare(right)); + } catch { + return []; + } +} + +/** + * Reads the `name` and `description` fields from a provider skill markdown file. + * + * The metadata is expected in markdown front matter. If a skill omits `name`, the + * parent directory name is used as a stable fallback so providers can still + * expose the skill. Missing descriptions are normalized to an empty string. + */ +export async function readProviderSkillMarkdownDefinition( + skillPath: string, +): Promise<{ name: string; description: string }> { + const content = await readFile(skillPath, 'utf8'); + const parsed = parseFrontMatter(content); + const data = readObjectRecord(parsed.data) ?? {}; + const fallbackName = path.basename(path.dirname(skillPath)); + + return { + name: readOptionalString(data.name) ?? fallbackName, + description: readOptionalString(data.description) ?? '', + }; +} + // --------------------------- //----------------- SESSION SYNCHRONIZER TITLE HELPERS ------------ /** diff --git a/server/utils/commandParser.js b/server/utils/commandParser.js index 56e3f702..0451320d 100644 --- a/server/utils/commandParser.js +++ b/server/utils/commandParser.js @@ -1,9 +1,11 @@ +import { execFile } from 'child_process'; import { promises as fs } from 'fs'; import path from 'path'; -import { execFile } from 'child_process'; import { promisify } from 'util'; + import { parse as parseShellCommand } from 'shell-quote'; -import { parseFrontmatter } from './frontmatter.js'; + +import { parseFrontMatter } from '../shared/frontmatter.js'; const execFileAsync = promisify(execFile); @@ -32,7 +34,7 @@ const BASH_COMMAND_ALLOWLIST = [ */ export function parseCommand(content) { try { - const parsed = parseFrontmatter(content); + const parsed = parseFrontMatter(content); return { data: parsed.data || {}, content: parsed.content || '', diff --git a/src/components/chat/hooks/useChatComposerState.ts b/src/components/chat/hooks/useChatComposerState.ts index 000cd33f..883a12f5 100644 --- a/src/components/chat/hooks/useChatComposerState.ts +++ b/src/components/chat/hooks/useChatComposerState.ts @@ -152,6 +152,7 @@ export function useChatComposerState({ ((event: FormEvent | MouseEvent | TouchEvent | KeyboardEvent) => Promise) | null >(null); const inputValueRef = useRef(input); + const selectedProjectId = selectedProject?.projectId; const handleBuiltInCommand = useCallback( (result: CommandExecutionResult) => { @@ -361,6 +362,7 @@ export function useChatComposerState({ handleCommandMenuKeyDown, } = useSlashCommands({ selectedProject, + provider, input, setInput, textareaRef, @@ -470,14 +472,14 @@ export function useChatComposerState({ return; } - // Intercept slash commands: if input starts with /commandName, execute as command with args - const trimmedInput = currentInput.trim(); - if (trimmedInput.startsWith('/')) { - const firstSpace = trimmedInput.indexOf(' '); - const commandName = firstSpace > 0 ? trimmedInput.slice(0, firstSpace) : trimmedInput; + // Intercept slash commands only when "/" is the first input character. + const commandInput = currentInput.trimEnd(); + if (commandInput.startsWith('/')) { + const firstSpace = commandInput.indexOf(' '); + const commandName = firstSpace > 0 ? commandInput.slice(0, firstSpace) : commandInput; const matchedCommand = slashCommands.find((cmd: SlashCommand) => cmd.name === commandName); - if (matchedCommand) { - executeCommand(matchedCommand, trimmedInput); + if (matchedCommand && matchedCommand.type !== 'skill') { + executeCommand(matchedCommand, commandInput); setInput(''); inputValueRef.current = ''; setAttachedImages([]); @@ -713,27 +715,27 @@ export function useChatComposerState({ }, [input]); useEffect(() => { - if (!selectedProject) { + if (!selectedProjectId) { return; } - const savedInput = safeLocalStorage.getItem(`draft_input_${selectedProject.projectId}`) || ''; + const savedInput = safeLocalStorage.getItem(`draft_input_${selectedProjectId}`) || ''; setInput((previous) => { const next = previous === savedInput ? previous : savedInput; inputValueRef.current = next; return next; }); - }, [selectedProject?.projectId]); + }, [selectedProjectId]); useEffect(() => { - if (!selectedProject) { + if (!selectedProjectId) { return; } if (input !== '') { - safeLocalStorage.setItem(`draft_input_${selectedProject.projectId}`, input); + safeLocalStorage.setItem(`draft_input_${selectedProjectId}`, input); } else { - safeLocalStorage.removeItem(`draft_input_${selectedProject.projectId}`); + safeLocalStorage.removeItem(`draft_input_${selectedProjectId}`); } - }, [input, selectedProject]); + }, [input, selectedProjectId]); useEffect(() => { if (!textareaRef.current) { diff --git a/src/components/chat/hooks/useSlashCommands.ts b/src/components/chat/hooks/useSlashCommands.ts index 89408420..db6eefaa 100644 --- a/src/components/chat/hooks/useSlashCommands.ts +++ b/src/components/chat/hooks/useSlashCommands.ts @@ -1,9 +1,9 @@ import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import type { Dispatch, KeyboardEvent, RefObject, SetStateAction } from 'react'; -import Fuse from 'fuse.js'; + import { authenticatedFetch } from '../../../utils/api'; import { safeLocalStorage } from '../utils/chatStorage'; -import type { Project } from '../../../types/app'; +import type { LLMProvider, Project } from '../../../types/app'; const COMMAND_QUERY_DEBOUNCE_MS = 150; @@ -12,19 +12,37 @@ export interface SlashCommand { description?: string; namespace?: string; path?: string; - type?: string; + type?: 'built-in' | 'custom' | 'skill' | string; metadata?: Record; [key: string]: unknown; } interface UseSlashCommandsOptions { selectedProject: Project | null; + provider: LLMProvider; input: string; setInput: Dispatch>; textareaRef: RefObject; onExecuteCommand: (command: SlashCommand, rawInput?: string) => void | Promise; } +type ProviderSkill = { + name: string; + description?: string; + command: string; + scope: string; + sourcePath?: string; + pluginName?: string; + pluginId?: string; +}; + +type ProviderSkillsResponse = { + success?: boolean; + data?: { + skills?: ProviderSkill[]; + }; +}; + const getCommandHistoryKey = (projectName: string) => `command_history_${projectName}`; const readCommandHistory = (projectName: string): Record => { @@ -48,8 +66,78 @@ const saveCommandHistory = (projectName: string, history: Record const isPromiseLike = (value: unknown): value is Promise => Boolean(value) && typeof (value as Promise).then === 'function'; +const isSkillCommand = (command: SlashCommand) => + command.type === 'skill' || command.metadata?.type === 'skill'; + +const dedupeProviderSkills = (skills: ProviderSkill[]): ProviderSkill[] => { + const seenCommands = new Set(); + + return skills.filter((skill) => { + // Multiple physical Claude plugin folders can expose the same invocation. + // The slash menu should show each executable command only once. + const key = skill.command; + if (seenCommands.has(key)) { + return false; + } + + seenCommands.add(key); + return true; + }); +}; + +const mapSkillToSlashCommand = (skill: ProviderSkill): SlashCommand => ({ + name: skill.command, + description: skill.description, + namespace: 'skill', + path: skill.sourcePath, + type: 'skill', + metadata: { + type: skill.scope, + scope: skill.scope, + sourcePath: skill.sourcePath, + pluginName: skill.pluginName, + pluginId: skill.pluginId, + skillName: skill.name, + }, +}); + +const filterSlashCommands = ( + commands: SlashCommand[], + query: string, +): SlashCommand[] => { + const normalizedQuery = query.trim().toLowerCase(); + if (!normalizedQuery) { + return commands; + } + + const commandPrefix = normalizedQuery.startsWith('/') + ? normalizedQuery + : `/${normalizedQuery}`; + const namePrefixMatches = commands.filter((command) => + command.name.toLowerCase().startsWith(commandPrefix), + ); + + // Namespaced commands should behave like path completion. Once a provider + // namespace is typed, only exact command-prefix matches should stay visible. + if (normalizedQuery.includes(':') || namePrefixMatches.length > 0) { + return namePrefixMatches; + } + + const nameSubstringMatches = commands.filter((command) => + command.name.toLowerCase().includes(normalizedQuery), + ); + if (nameSubstringMatches.length > 0) { + return nameSubstringMatches; + } + + return commands.filter((command) => + command.description?.toLowerCase().includes(normalizedQuery), + ); +}; + export function useSlashCommands({ selectedProject, + provider, input, setInput, textareaRef, @@ -80,6 +168,8 @@ export function useSlashCommands({ }, [clearCommandQueryTimer]); useEffect(() => { + let cancelled = false; + const fetchCommands = async () => { if (!selectedProject) { setSlashCommands([]); @@ -88,13 +178,14 @@ export function useSlashCommands({ } try { + const workspacePath = selectedProject.fullPath || selectedProject.path || ''; const response = await authenticatedFetch('/api/commands/list', { method: 'POST', headers: { 'Content-Type': 'application/json', }, body: JSON.stringify({ - projectPath: selectedProject.path, + projectPath: workspacePath || selectedProject.path, }), }); @@ -103,11 +194,25 @@ export function useSlashCommands({ } const data = await response.json(); + const skillsParams = new URLSearchParams(); + if (workspacePath) { + skillsParams.set('workspacePath', workspacePath); + } + + const skillsResponse = await authenticatedFetch( + `/api/providers/${encodeURIComponent(provider)}/skills${skillsParams.toString() ? `?${skillsParams.toString()}` : ''}`, + ); + const skillsData = skillsResponse.ok + ? ((await skillsResponse.json()) as ProviderSkillsResponse) + : null; + const skillCommands = dedupeProviderSkills(skillsData?.data?.skills || []) + .map(mapSkillToSlashCommand); const allCommands: SlashCommand[] = [ ...((data.builtIn || []) as SlashCommand[]).map((command) => ({ ...command, type: 'built-in', })), + ...skillCommands, ...((data.custom || []) as SlashCommand[]).map((command) => ({ ...command, type: 'custom', @@ -121,15 +226,22 @@ export function useSlashCommands({ return commandBUsage - commandAUsage; }); - setSlashCommands(sortedCommands); + if (!cancelled) { + setSlashCommands(sortedCommands); + } } catch (error) { console.error('Error fetching slash commands:', error); - setSlashCommands([]); + if (!cancelled) { + setSlashCommands([]); + } } }; fetchCommands(); - }, [selectedProject]); + return () => { + cancelled = true; + }; + }, [selectedProject, provider]); useEffect(() => { if (!showCommandMenu) { @@ -137,36 +249,9 @@ export function useSlashCommands({ } }, [showCommandMenu]); - const fuse = useMemo(() => { - if (!slashCommands.length) { - return null; - } - - return new Fuse(slashCommands, { - keys: [ - { name: 'name', weight: 2 }, - { name: 'description', weight: 1 }, - ], - threshold: 0.4, - includeScore: true, - minMatchCharLength: 1, - }); - }, [slashCommands]); - useEffect(() => { - if (!commandQuery) { - setFilteredCommands(slashCommands); - return; - } - - if (!fuse) { - setFilteredCommands([]); - return; - } - - const results = fuse.search(commandQuery); - setFilteredCommands(results.map((result) => result.item)); - }, [commandQuery, slashCommands, fuse]); + setFilteredCommands(filterSlashCommands(slashCommands, commandQuery)); + }, [commandQuery, slashCommands]); const frequentCommands = useMemo(() => { if (!selectedProject || slashCommands.length === 0) { @@ -198,25 +283,63 @@ export function useSlashCommands({ [selectedProject], ); - const selectCommandFromKeyboard = useCallback( + const insertCommandIntoInput = useCallback( (command: SlashCommand) => { - const textBeforeSlash = input.slice(0, slashPosition); - const textAfterSlash = input.slice(slashPosition); - const spaceIndex = textAfterSlash.indexOf(' '); - const textAfterQuery = spaceIndex !== -1 ? textAfterSlash.slice(spaceIndex) : ''; - const newInput = `${textBeforeSlash}${command.name} ${textAfterQuery}`; + const currentTextarea = textareaRef.current; + const insertionStart = slashPosition >= 0 + ? slashPosition + : currentTextarea?.selectionStart ?? input.length; + const textBeforeCommand = input.slice(0, insertionStart); + const textAfterCommandStart = input.slice(insertionStart); + const spaceIndex = textAfterCommandStart.indexOf(' '); + const textAfterCommand = slashPosition >= 0 && spaceIndex !== -1 + ? textAfterCommandStart.slice(spaceIndex).trimStart() + : input.slice(currentTextarea?.selectionEnd ?? insertionStart); + const separator = textBeforeCommand && !/\s$/.test(textBeforeCommand) ? ' ' : ''; + const newInput = `${textBeforeCommand}${separator}${command.name}${textAfterCommand ? ` ${textAfterCommand}` : ' '}`; setInput(newInput); resetCommandMenuState(); + window.requestAnimationFrame(() => { + currentTextarea?.focus(); + const nextCursorPosition = `${textBeforeCommand}${separator}${command.name} `.length; + currentTextarea?.setSelectionRange(nextCursorPosition, nextCursorPosition); + }); + }, + [input, resetCommandMenuState, setInput, slashPosition, textareaRef], + ); + + const executeNonSkillCommand = useCallback( + (command: SlashCommand) => { const executionResult = onExecuteCommand(command); if (isPromiseLike(executionResult)) { - executionResult.catch(() => { - // Keep behavior silent; execution errors are handled by caller. - }); + executionResult.then( + () => { + resetCommandMenuState(); + }, + () => { + resetCommandMenuState(); + // Keep behavior silent; execution errors are handled by caller. + }, + ); + } else { + resetCommandMenuState(); } }, - [input, slashPosition, setInput, resetCommandMenuState, onExecuteCommand], + [onExecuteCommand, resetCommandMenuState], + ); + + const selectCommandFromKeyboard = useCallback( + (command: SlashCommand) => { + if (isSkillCommand(command)) { + insertCommandIntoInput(command); + return; + } + + executeNonSkillCommand(command); + }, + [executeNonSkillCommand, insertCommandIntoInput], ); const handleCommandSelect = useCallback( @@ -231,20 +354,14 @@ export function useSlashCommands({ } trackCommandUsage(command); - const executionResult = onExecuteCommand(command); - - if (isPromiseLike(executionResult)) { - executionResult.then(() => { - resetCommandMenuState(); - }); - executionResult.catch(() => { - // Keep behavior silent; execution errors are handled by caller. - }); - } else { - resetCommandMenuState(); + if (isSkillCommand(command)) { + insertCommandIntoInput(command); + return; } + + executeNonSkillCommand(command); }, - [selectedProject, trackCommandUsage, onExecuteCommand, resetCommandMenuState], + [selectedProject, trackCommandUsage, insertCommandIntoInput, executeNonSkillCommand], ); const handleToggleCommandMenu = useCallback(() => { @@ -276,7 +393,7 @@ export function useSlashCommands({ return; } - const slashPattern = /(^|\s)\/(\S*)$/; + const slashPattern = /^\/(\S*)$/; const match = textBeforeCursor.match(slashPattern); if (!match) { @@ -284,8 +401,8 @@ export function useSlashCommands({ return; } - const slashPos = (match.index || 0) + match[1].length; - const query = match[2]; + const slashPos = 0; + const query = match[1]; setSlashPosition(slashPos); setShowCommandMenu(true); diff --git a/src/components/chat/view/subcomponents/CommandMenu.tsx b/src/components/chat/view/subcomponents/CommandMenu.tsx index 92a598ea..3e6116a0 100644 --- a/src/components/chat/view/subcomponents/CommandMenu.tsx +++ b/src/components/chat/view/subcomponents/CommandMenu.tsx @@ -1,5 +1,15 @@ import { useEffect, useRef } from 'react'; import type { CSSProperties } from 'react'; +import { + CornerDownLeft, + Folder, + MessageSquare, + Sparkles, + Star, + Terminal, + User, + type LucideIcon, +} from 'lucide-react'; type CommandMenuCommand = { name: string; @@ -21,59 +31,92 @@ type CommandMenuProps = { frequentCommands?: CommandMenuCommand[]; }; +type CommandMenuRow = { + command: CommandMenuCommand; + commandIndex: number; + renderKey: string; +}; + const menuBaseStyle: CSSProperties = { - maxHeight: '300px', + maxHeight: '360px', overflowY: 'auto', borderRadius: '8px', - boxShadow: '0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05)', + boxShadow: '0 24px 60px rgba(2, 6, 23, 0.38), 0 0 0 1px rgba(148, 163, 184, 0.12)', zIndex: 1000, - padding: '8px', + padding: '6px', transition: 'opacity 150ms ease-in-out, transform 150ms ease-in-out', + backdropFilter: 'blur(12px)', }; const namespaceLabels: Record = { frequent: 'Frequently Used', builtin: 'Built-in Commands', + skill: 'Skills', project: 'Project Commands', user: 'User Commands', other: 'Other Commands', }; -const namespaceIcons: Record = { - frequent: '[*]', - builtin: '[B]', - project: '[P]', - user: '[U]', - other: '[O]', +const namespaceIcons: Record = { + frequent: Star, + builtin: Terminal, + skill: Sparkles, + project: Folder, + user: User, + other: MessageSquare, }; +const namespaceAccentClasses: Record = { + frequent: 'border-amber-200 bg-amber-50 text-amber-700 dark:border-amber-400/20 dark:bg-amber-400/10 dark:text-amber-200', + builtin: 'border-sky-200 bg-sky-50 text-sky-700 dark:border-sky-400/20 dark:bg-sky-400/10 dark:text-sky-200', + skill: 'border-emerald-200 bg-emerald-50 text-emerald-700 dark:border-emerald-400/20 dark:bg-emerald-400/10 dark:text-emerald-200', + project: 'border-indigo-200 bg-indigo-50 text-indigo-700 dark:border-indigo-400/20 dark:bg-indigo-400/10 dark:text-indigo-200', + user: 'border-rose-200 bg-rose-50 text-rose-700 dark:border-rose-400/20 dark:bg-rose-400/10 dark:text-rose-200', + other: 'border-gray-200 bg-gray-50 text-gray-600 dark:border-gray-500/20 dark:bg-gray-500/10 dark:text-gray-200', +}; + +const MENU_EDGE_GAP = 16; +const MENU_MAX_HEIGHT = 360; + const getCommandKey = (command: CommandMenuCommand) => `${command.name}::${command.namespace || command.type || 'other'}::${command.path || ''}`; const getNamespace = (command: CommandMenuCommand) => command.namespace || command.type || 'other'; +const getNamespaceIcon = (namespace: string) => namespaceIcons[namespace] || namespaceIcons.other; + +const getNamespaceAccentClass = (namespace: string) => + namespaceAccentClasses[namespace] || namespaceAccentClasses.other; + const getMenuPosition = (position: { top: number; left: number; bottom?: number }): CSSProperties => { if (typeof window === 'undefined') { return { position: 'fixed', top: '16px', left: '16px' }; } if (window.innerWidth < 640) { + const anchorBottom = Math.max(MENU_EDGE_GAP, position.bottom ?? 90); return { position: 'fixed', - bottom: `${position.bottom ?? 90}px`, + bottom: `${anchorBottom}px`, left: '16px', right: '16px', width: 'auto', maxWidth: 'calc(100vw - 32px)', - maxHeight: 'min(50vh, 300px)', + maxHeight: `min(54vh, calc(100vh - ${anchorBottom}px - ${MENU_EDGE_GAP}px))`, }; } + const anchorBottom = Math.max(MENU_EDGE_GAP, position.bottom ?? 90); + const clampedLeft = Math.max( + MENU_EDGE_GAP, + Math.min(position.left, window.innerWidth - 440 - MENU_EDGE_GAP), + ); + return { position: 'fixed', - top: `${Math.max(16, Math.min(position.top, window.innerHeight - 316))}px`, - left: `${position.left}px`, - width: 'min(400px, calc(100vw - 32px))', + bottom: `${anchorBottom}px`, + left: `${clampedLeft}px`, + width: 'min(440px, calc(100vw - 32px))', maxWidth: 'calc(100vw - 32px)', - maxHeight: '300px', + maxHeight: `min(${MENU_MAX_HEIGHT}px, calc(100vh - ${anchorBottom}px - ${MENU_EDGE_GAP}px))`, }; }; @@ -123,7 +166,24 @@ export default function CommandMenu({ const hasFrequentCommands = frequentCommands.length > 0; const frequentCommandKeys = new Set(frequentCommands.map(getCommandKey)); - const groupedCommands = commands.reduce>((groups, command) => { + const commandIndexesByKey = new Map(); + commands.forEach((command, index) => { + const key = getCommandKey(command); + const commandIndexes = commandIndexesByKey.get(key) ?? []; + commandIndexes.push(index); + commandIndexesByKey.set(key, commandIndexes); + }); + const frequentCommandOccurrences = new Map(); + const getFrequentCommandIndex = (command: CommandMenuCommand): number => { + const key = getCommandKey(command); + const occurrence = frequentCommandOccurrences.get(key) ?? 0; + frequentCommandOccurrences.set(key, occurrence + 1); + + const commandIndexes = commandIndexesByKey.get(key) ?? []; + return commandIndexes[occurrence] ?? commandIndexes[0] ?? -1; + }; + + const groupedCommands = commands.reduce>((groups, command, index) => { if (hasFrequentCommands && frequentCommandKeys.has(getCommandKey(command))) { return groups; } @@ -131,33 +191,46 @@ export default function CommandMenu({ if (!groups[namespace]) { groups[namespace] = []; } - groups[namespace].push(command); + groups[namespace].push({ + command, + commandIndex: index, + renderKey: `${namespace}-${index}-${getCommandKey(command)}`, + }); return groups; }, {}); if (hasFrequentCommands) { - groupedCommands.frequent = frequentCommands; + groupedCommands.frequent = frequentCommands + .map((command, index) => { + const commandIndex = getFrequentCommandIndex(command); + return { + command, + commandIndex, + renderKey: `frequent-${index}-${commandIndex}-${getCommandKey(command)}`, + }; + }) + .filter((row) => row.commandIndex >= 0); } const preferredOrder = hasFrequentCommands - ? ['frequent', 'builtin', 'project', 'user', 'other'] - : ['builtin', 'project', 'user', 'other']; + ? ['frequent', 'builtin', 'skill', 'project', 'user', 'other'] + : ['builtin', 'skill', 'project', 'user', 'other']; const extraNamespaces = Object.keys(groupedCommands).filter((namespace) => !preferredOrder.includes(namespace)); const orderedNamespaces = [...preferredOrder, ...extraNamespaces].filter((namespace) => groupedCommands[namespace]); - const commandIndexByKey = new Map(); - commands.forEach((command, index) => { - const key = getCommandKey(command); - if (!commandIndexByKey.has(key)) { - commandIndexByKey.set(key, index); - } - }); - if (commands.length === 0) { return (
No commands available
@@ -169,51 +242,73 @@ export default function CommandMenu({ ref={menuRef} role="listbox" aria-label="Available commands" - className="command-menu border border-gray-200 bg-white dark:border-gray-700 dark:bg-gray-800" - style={{ ...menuPosition, ...menuBaseStyle, opacity: 1, transform: 'translateY(0)' }} + className="command-menu border border-gray-200/90 bg-white/95 text-gray-900 dark:border-slate-700/80 dark:bg-slate-950/95 dark:text-slate-100" + style={{ ...menuBaseStyle, ...menuPosition, opacity: 1, transform: 'translateY(0)' }} > {orderedNamespaces.map((namespace) => (
{orderedNamespaces.length > 1 && ( -
- {namespaceLabels[namespace] || namespace} +
+ {namespaceLabels[namespace] || namespace} + + {(groupedCommands[namespace] || []).length} +
)} - {(groupedCommands[namespace] || []).map((command) => { - const commandKey = getCommandKey(command); - const commandIndex = commandIndexByKey.get(commandKey) ?? -1; + {(groupedCommands[namespace] || []).map(({ command, commandIndex, renderKey }) => { const isSelected = commandIndex === selectedIndex; + const NamespaceIcon = getNamespaceIcon(namespace); + const accentClass = getNamespaceAccentClass(namespace); return (
onSelect && commandIndex >= 0 && onSelect(command, commandIndex, true)} onClick={() => onSelect && commandIndex >= 0 && onSelect(command, commandIndex, false)} onMouseDown={(event) => event.preventDefault()} > -
-
- {namespaceIcons[namespace] || namespaceIcons.other} - {command.name} + {isSelected && ( + + )} + + +
+
+ + {command.name} + {command.metadata?.type && ( - + {command.metadata.type} )}
{command.description && ( -
+
{command.description}
)}
- {isSelected && {'<-'}} + {isSelected && ( + + + )}
); })} From 10f721cf1412661dc5109e6b500eecf7e9e406da Mon Sep 17 00:00:00 2001 From: viper151 Date: Wed, 13 May 2026 12:02:26 +0000 Subject: [PATCH 05/20] chore(release): v1.32.0 --- CHANGELOG.md | 7 +++++++ package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b169e53..075cd618 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All notable changes to CloudCLI UI will be documented in this file. +## [1.32.0](https://github.com/siteboon/claudecodeui/compare/v1.31.5...v1.32.0) (2026-05-13) + +### Bug Fixes + +* add clarification on auto mode ([392c73b](https://github.com/siteboon/claudecodeui/commit/392c73b6933600ea8a589c5d4eff5f7b830f99c5)) +* enhance regex to correctly parse wrapper file paths for claude.exe ([#741](https://github.com/siteboon/claudecodeui/issues/741)) ([beb0a50](https://github.com/siteboon/claudecodeui/commit/beb0a50413beddfb16f6b49103e1b6b80567cb90)) + ## [1.31.5](https://github.com/siteboon/claudecodeui/compare/v1.31.4...v1.31.5) (2026-04-30) ### New Features diff --git a/package-lock.json b/package-lock.json index 12985a52..e1cf70c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@cloudcli-ai/cloudcli", - "version": "1.31.5", + "version": "1.32.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@cloudcli-ai/cloudcli", - "version": "1.31.5", + "version": "1.32.0", "hasInstallScript": true, "license": "AGPL-3.0-or-later", "dependencies": { diff --git a/package.json b/package.json index ff139ca7..8f7bd266 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@cloudcli-ai/cloudcli", - "version": "1.31.5", + "version": "1.32.0", "description": "A web-based UI for Claude Code CLI", "type": "module", "main": "dist-server/server/index.js", From 374e9de71934c41ce2c19c796e35a19234b240ec Mon Sep 17 00:00:00 2001 From: Haile <118998054+blackmammoth@users.noreply.github.com> Date: Thu, 28 May 2026 11:50:41 +0300 Subject: [PATCH 06/20] feat: add opencode support (#762) * feat: add opencode support * fix: stabilize opencode session startup * fix: /models * fix: improveUI for commands * fix: format commands.js * feat: load models through provider adapters Provider model selection had outgrown a single hardcoded service. The old service mixed shared caching with provider catalogs and CLI lookup details. That made stale model lists more likely as providers changed on separate schedules. Move model discovery behind each provider so lookup lives next to the integration. The shared service now focuses on provider resolution, caching, persistence, and dedupe. Return cache metadata and add bypassCache because model availability changes outside the app. The UI and /models command can show freshness and let users force a provider refresh. Surface model descriptions while keeping fallback catalogs for unavailable CLIs or SDKs. * feat(models): resolve active session models through provider adapters The model inventory command was showing a mix of catalog defaults and composer-local state instead of the model that is actually active for a real provider session. That made /models, /cost, and /status misleading once a session had already started, especially for providers whose effective runtime model can differ from the optimistic model value held in the UI. Introduce an explicit getCurrentActiveModel() contract on IProviderModels so model resolution lives next to each provider's catalog logic and uses the provider-native source of truth: - Claude reads the init event from a resumed stream-json run - Codex reads model from ~/.codex/config.toml - Cursor reads lastUsedModel from the chat store.db - OpenCode reads the persisted session model from opencode.db - Gemini intentionally returns its default because the CLI does not provide a reliable active-session lookup Keep the returned shape intentionally minimal ({ model }). The goal is to expose only what downstream command consumers need and avoid leaking provider-specific metadata into a shared transport shape that would create extra UI coupling and future cleanup cost. Also make command behavior session-aware: when there is no concrete session id, do not spawn provider processes or inspect provider session storage just to answer /models, /cost, or /status. In a new-session view the correct answer is simply the provider default, and doing more work there adds latency and unnecessary side effects for no user value. As part of this, centralize two supporting concerns: - add a shared helper for building the default current-model result from a provider catalog so fallbacks stay aligned with DEFAULT - move leaf-directory validation into shared utils so Cursor session readers and model lookup code enforce the same path-safety rule Tests were expanded to cover both the new service delegation path and the sessionless command behavior, while keeping cache-sensitive tests isolated from persisted host cache state. Why this change: - command output should reflect the model actually driving a session - new-session views should stay fast and side-effect free - provider-specific active-model lookup should not be scattered across routes or UI code - fallback behavior should be explicit, consistent, and limited to the provider default when no true active model can be resolved * feat: support session-scoped model overrides Model selection was acting like a provider-level preference. That made resumed sessions drift back to a default or request-time model. Users expect /models changes made inside a conversation to affect that session. Store explicit session choices in app-owned ~/.cloudcli state. This avoids editing provider transcripts or native provider config. Resolve the effective model before launching each provider runtime. Claude, Cursor, Codex, Gemini, and OpenCode now honor stored resume choices. Expose a backend active-model change endpoint for existing sessions. The models modal can now distinguish default changes from session overrides. It also shows when a selected model will apply on the next response. For Claude, stop probing active model state by resuming with a dummy prompt. Read the indexed JSONL transcript from the end instead. This preserves provider history while honoring /model stdout or model fields. Add service tests for adapter delegation and resume-model precedence. The tests keep cache state, override state, and requested fallback separate. * feat: make command modal more compact * fix: preserve opencode session creation events OpenCode emits the real session id asynchronously on its first JSON output. The runner registered that id from a helper that could not see the spawned process because the process reference was scoped inside the model-resolution callback. That ReferenceError was swallowed by the generic JSON parse fallback, so the client never received session_created. Without that event, a new OpenCode chat stayed on / and the assistant stream was not attached to the new session view. Keep the process reference in the outer spawn scope so registration can update the active-process map and websocket writer as soon as OpenCode announces the session id. Split JSON parsing from event processing so malformed non-JSON output can still stream as raw text, while registration or adapter failures are surfaced as real errors instead of being hidden as assistant content. Add a fake opencode executable regression test to lock in the expected lifecycle ordering: session_created must be sent before live assistant messages, and the same session id must carry through stream_end and complete. * fix: clarify model refresh and onboarding providers OpenCode is now a supported chat provider, but first-run onboarding still only offered Claude, Cursor, Codex, and Gemini. That made OpenCode harder to discover and forced users to finish setup before finding the provider in settings or chat. Adding it to onboarding keeps first-run setup aligned with the providers the application already supports elsewhere. The model refresh control was also doing too much visual work. In the new chat model picker, the previous Hard Refresh label looked like the dialog heading, which made the primary task unclear. Users open that dialog to choose a model; refreshing catalogs is only a secondary maintenance action for stale cached provider model lists. Rename and reposition the refresh affordance so the model picker reads as a model picker first. The copy now explains why catalogs are cached, when a refresh is useful, and that the refresh checks every provider. The /models modal gets the same clarification so both model-selection surfaces describe the cache behavior consistently. * fix: format opencode model catalog labels OpenCode returns provider-prefixed ids directly from the CLI. Passing those ids through as labels made the model picker hard to scan: users saw values like anthropic/claude-3-5-sonnet-20241022 or lowercased, hyphen-split text instead of readable model names. Keep the exact OpenCode id as the option value because that is what the CLI expects, but derive a presentation label for the frontend. The formatter is intentionally generic rather than a catalog of known providers. It handles common identifier structure such as provider/model, hyphen-delimited words, v-prefixed versions, adjacent numeric version tokens, and 8-digit date suffixes. This keeps OpenCode usable as its model list expands across many upstream providers without requiring code changes for every new provider or model family. The description keeps the raw provider-prefixed id visible so users can still confirm the precise model being selected. * feat: add more fallback models for cursor * docs: move model catalog out of shared The model catalog is no longer a frontend/backend runtime contract. Keeping it under shared made ownership misleading. It implied the catalog was application code shared by runtime consumers, even though it now only supports README links and public API documentation. Move the catalog into public so it lives beside the docs surfaces that need it. This gives the API docs a stable, served module and gives README readers a linkable source without suggesting frontend or backend runtime dependency. Render the API docs model list from the exported provider registry instead of a hardcoded Claude/Cursor/Codex subset. That keeps Gemini and OpenCode visible and makes future provider documentation changes flow through one docs-specific file. Update README links, provider maintenance notes, and package files so published artifacts include the standalone docs page and model catalog without relying on the old shared path. * fix: simplify empty-state model selector Keep the provider empty state focused on the setup action users need there: choosing a model. The refresh control, cache timestamp, and refresh explanation made the dialog feel like a cache-management surface. That extra action is out of place in the empty state, where the goal is to start a chat with the selected provider and model. Remove the refresh-specific UI from ProviderSelectionEmptyState and drop the now-unused refresh/cache props from the ChatMessagesPane pass-through. Refresh behavior remains available in the dedicated command result flow. --- README.de.md | 2 +- README.ko.md | 2 +- README.md | 2 +- README.ru.md | 2 +- README.tr.md | 2 +- README.zh-CN.md | 2 +- package.json | 2 + public/api-docs.html | 13 +- public/modelConstants.js | 841 ++++++++++++++++++ redirect-package/README.md | 2 +- server/claude-sdk.js | 16 +- server/cursor-cli.js | 9 +- server/gemini-cli.js | 8 +- server/index.js | 22 + server/modules/database/index.ts | 1 + .../services/project-management.service.ts | 2 + .../projects-with-sessions-fetch.service.ts | 8 +- server/modules/providers/README.md | 14 +- .../list/claude/claude-models.provider.ts | 230 +++++ .../providers/list/claude/claude.provider.ts | 3 + .../list/codex/codex-models.provider.ts | 125 +++ .../list/codex/codex-skills.provider.ts | 60 +- .../providers/list/codex/codex.provider.ts | 3 + .../list/cursor/cursor-models.provider.ts | 283 ++++++ .../list/cursor/cursor-sessions.provider.ts | 27 +- .../providers/list/cursor/cursor.provider.ts | 3 + .../list/gemini/gemini-models.provider.ts | 42 + .../providers/list/gemini/gemini.provider.ts | 3 + .../list/opencode/opencode-auth.provider.ts | 111 +++ .../list/opencode/opencode-mcp.provider.ts | 228 +++++ .../list/opencode/opencode-models.provider.ts | 339 +++++++ .../opencode-session-synchronizer.provider.ts | 157 ++++ .../opencode/opencode-sessions.provider.ts | 463 ++++++++++ .../list/opencode/opencode-skills.provider.ts | 78 ++ .../list/opencode/opencode.provider.ts | 27 + server/modules/providers/provider.registry.ts | 2 + server/modules/providers/provider.routes.ts | 64 +- .../services/provider-models.service.ts | 325 +++++++ .../services/session-synchronizer.service.ts | 1 + .../services/sessions-watcher.service.ts | 8 + .../shared/base/abstract.provider.ts | 2 + server/modules/providers/tests/mcp.test.ts | 92 +- .../providers/tests/opencode-models.test.ts | 73 ++ .../providers/tests/opencode-sessions.test.ts | 321 +++++++ .../tests/provider-models.service.test.ts | 318 +++++++ server/modules/providers/tests/skills.test.ts | 66 ++ .../services/chat-websocket.service.ts | 16 +- .../services/shell-websocket.service.ts | 9 + server/openai-codex.js | 9 +- server/opencode-cli.js | 263 ++++++ server/opencode-cli.test.js | 95 ++ server/routes/agent.js | 30 +- server/routes/commands.js | 449 +++++----- server/routes/cursor.js | 4 +- server/routes/tests/commands.test.js | 82 ++ server/shared/interfaces.ts | 45 + server/shared/types.ts | 89 +- server/shared/utils.ts | 384 ++++++++ shared/modelConstants.js | 107 --- .../chat/hooks/useChatComposerState.ts | 202 +++-- .../chat/hooks/useChatProviderState.ts | 279 +++++- .../chat/hooks/useChatRealtimeHandlers.ts | 53 +- .../chat/hooks/useChatSessionState.ts | 14 +- src/components/chat/view/ChatInterface.tsx | 40 +- .../view/subcomponents/ChatMessagesPane.tsx | 21 +- .../chat/view/subcomponents/ClaudeStatus.tsx | 3 +- .../view/subcomponents/CommandResultModal.tsx | 731 +++++++++++++++ .../view/subcomponents/MessageComponent.tsx | 14 +- .../ProviderSelectionEmptyState.tsx | 96 +- .../sources/useSessionsSource.ts | 2 + .../llm-logo-provider/OpenCodeLogo.tsx | 25 + .../llm-logo-provider/SessionProviderLogo.tsx | 5 + src/components/mcp/constants.ts | 5 + .../subcomponents/AgentConnectionsStep.tsx | 8 + src/components/provider-auth/types.ts | 4 +- .../provider-auth/view/ProviderLoginModal.tsx | 5 + .../settings/constants/constants.ts | 2 +- .../tabs/agents-settings/AgentListItem.tsx | 11 +- .../agents-settings/AgentsSettingsTab.tsx | 7 +- .../sections/AgentSelectorSection.tsx | 4 +- .../sections/content/AccountContent.tsx | 15 +- src/components/sidebar/types/types.ts | 1 + src/components/sidebar/utils/utils.ts | 8 +- src/hooks/useProjectsState.ts | 30 +- src/i18n/locales/en/chat.json | 4 +- src/i18n/locales/en/settings.json | 6 +- src/types/app.ts | 20 +- 87 files changed, 7024 insertions(+), 577 deletions(-) create mode 100644 public/modelConstants.js create mode 100644 server/modules/providers/list/claude/claude-models.provider.ts create mode 100644 server/modules/providers/list/codex/codex-models.provider.ts create mode 100644 server/modules/providers/list/cursor/cursor-models.provider.ts create mode 100644 server/modules/providers/list/gemini/gemini-models.provider.ts create mode 100644 server/modules/providers/list/opencode/opencode-auth.provider.ts create mode 100644 server/modules/providers/list/opencode/opencode-mcp.provider.ts create mode 100644 server/modules/providers/list/opencode/opencode-models.provider.ts create mode 100644 server/modules/providers/list/opencode/opencode-session-synchronizer.provider.ts create mode 100644 server/modules/providers/list/opencode/opencode-sessions.provider.ts create mode 100644 server/modules/providers/list/opencode/opencode-skills.provider.ts create mode 100644 server/modules/providers/list/opencode/opencode.provider.ts create mode 100644 server/modules/providers/services/provider-models.service.ts create mode 100644 server/modules/providers/tests/opencode-models.test.ts create mode 100644 server/modules/providers/tests/opencode-sessions.test.ts create mode 100644 server/modules/providers/tests/provider-models.service.test.ts create mode 100644 server/opencode-cli.js create mode 100644 server/opencode-cli.test.js create mode 100644 server/routes/tests/commands.test.js delete mode 100644 shared/modelConstants.js create mode 100644 src/components/chat/view/subcomponents/CommandResultModal.tsx create mode 100644 src/components/llm-logo-provider/OpenCodeLogo.tsx diff --git a/README.de.md b/README.de.md index c98af089..9f8a429b 100644 --- a/README.de.md +++ b/README.de.md @@ -62,7 +62,7 @@ - **Sitzungsverwaltung** – Gespräche fortsetzen, mehrere Sitzungen verwalten und Verlauf nachverfolgen - **Plugin-System** – CloudCLI mit eigenen Plugins erweitern – neue Tabs, Backend-Dienste und Integrationen hinzufügen. [Eigenes Plugin erstellen →](https://github.com/cloudcli-ai/cloudcli-plugin-starter) - **TaskMaster AI Integration** *(Optional)* – Erweitertes Projektmanagement mit KI-gestützter Aufgabenplanung, PRD-Parsing und Workflow-Automatisierung -- **Modell-Kompatibilität** – Funktioniert mit Claude, GPT und Gemini (vollständige Liste unterstützter Modelle in [`shared/modelConstants.js`](shared/modelConstants.js)) +- **Modell-Kompatibilität** – Funktioniert mit Claude, GPT und Gemini (vollständige Liste unterstützter Modelle in [`public/modelConstants.js`](public/modelConstants.js)) ## Schnellstart diff --git a/README.ko.md b/README.ko.md index b5cf5a98..41e142bf 100644 --- a/README.ko.md +++ b/README.ko.md @@ -60,7 +60,7 @@ - **세션 관리** - 대화를 재개하고, 여러 세션을 관리하며 기록을 추적 - **플러그인 시스템** - 커스텀 탭, 백엔드 서비스, 통합을 추가하여 CloudCLI 확장. [직접 빌드 →](https://github.com/cloudcli-ai/cloudcli-plugin-starter) - **TaskMaster AI 통합** *(선택사항)* - AI 중심의 작업 계획, PRD 파싱, 워크플로 자동화를 통한 고급 프로젝트 관리 -- **모델 호환성** - Claude, GPT, Gemini 모델 계열에서 작동 (`shared/modelConstants.js`에서 전체 지원 모델 확인) +- **모델 호환성** - Claude, GPT, Gemini 모델 계열에서 작동 (`public/modelConstants.js`에서 전체 지원 모델 확인) ## 빠른 시작 diff --git a/README.md b/README.md index ae95b030..bb60c9e0 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ - **Session Management** - Resume conversations, manage multiple sessions, and track history - **Plugin System** - Extend CloudCLI with custom plugins — add new tabs, backend services, and integrations. [Build your own →](https://github.com/cloudcli-ai/cloudcli-plugin-starter) - **TaskMaster AI Integration** *(Optional)* - Advanced project management with AI-powered task planning, PRD parsing, and workflow automation -- **Model Compatibility** - Works with Claude, GPT, and Gemini model families (see [`shared/modelConstants.js`](shared/modelConstants.js) for the full list of supported models) +- **Model Compatibility** - Works with Claude, GPT, and Gemini model families (see [`public/modelConstants.js`](public/modelConstants.js) for the full list of supported models) ## Quick Start diff --git a/README.ru.md b/README.ru.md index c197676a..97d8074f 100644 --- a/README.ru.md +++ b/README.ru.md @@ -62,7 +62,7 @@ - **Управление сессиями** - возобновляйте диалоги, управляйте несколькими сессиями и отслеживайте историю - **Система плагинов** - расширяйте CloudCLI кастомными плагинами — добавляйте новые вкладки, бэкенд-сервисы и интеграции. [Создать свой →](https://github.com/cloudcli-ai/cloudcli-plugin-starter) - **Интеграция с TaskMaster AI** *(опционально)* - продвинутое управление проектами с планированием задач на базе AI, разбором PRD и автоматизацией workflow -- **Совместимость с моделями** - работает с семействами моделей Claude, GPT и Gemini (см. [`shared/modelConstants.js`](shared/modelConstants.js) для полного списка поддерживаемых моделей) +- **Совместимость с моделями** - работает с семействами моделей Claude, GPT и Gemini (см. [`public/modelConstants.js`](public/modelConstants.js) для полного списка поддерживаемых моделей) ## Быстрый старт diff --git a/README.tr.md b/README.tr.md index a0bcdf58..c84770e5 100644 --- a/README.tr.md +++ b/README.tr.md @@ -62,7 +62,7 @@ - **Oturum Yönetimi** — Konuşmalara devam et, birden fazla oturumu yönet ve geçmişi takip et - **Eklenti Sistemi** — CloudCLI'ı özel eklentilerle genişlet: yeni sekmeler, arka uç servisleri ve entegrasyonlar ekle. [Kendi eklentini yaz →](https://github.com/cloudcli-ai/cloudcli-plugin-starter) - **TaskMaster AI Entegrasyonu** *(İsteğe Bağlı)* — AI destekli görev planlama, PRD ayrıştırma ve iş akışı otomasyonu ile gelişmiş proje yönetimi -- **Model Uyumluluğu** — Claude, GPT ve Gemini model aileleriyle çalışır (desteklenen tüm modeller için [`shared/modelConstants.js`](shared/modelConstants.js) dosyasına bak) +- **Model Uyumluluğu** — Claude, GPT ve Gemini model aileleriyle çalışır (desteklenen tüm modeller için [`public/modelConstants.js`](public/modelConstants.js) dosyasına bak) ## Hızlı Başlangıç diff --git a/README.zh-CN.md b/README.zh-CN.md index 3e6ced3f..2ee656e8 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -60,7 +60,7 @@ - **会话管理** - 恢复对话、管理多个会话并跟踪历史记录 - **插件系统** - 通过自定义选项卡、后端服务与集成扩展 CloudCLI。 [开始构建 →](https://github.com/cloudcli-ai/cloudcli-plugin-starter) - **TaskMaster AI 集成** *(可选)* - 结合 AI 任务规划、PRD 分析与工作流自动化，实现高级项目管理 -- **模型兼容性** - 支持 Claude、GPT、Gemini 模型家族（完整支持列表见 [`shared/modelConstants.js`](shared/modelConstants.js)） +- **模型兼容性** - 支持 Claude、GPT、Gemini 模型家族（完整支持列表见 [`public/modelConstants.js`](public/modelConstants.js)） ## 快速开始 diff --git a/package.json b/package.json index 8f7bd266..626d0e3b 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,8 @@ "files": [ "server/", "shared/", + "public/api-docs.html", + "public/modelConstants.js", "dist/", "dist-server/", "scripts/", diff --git a/public/api-docs.html b/public/api-docs.html index 1d86cf4c..0103b5ca 100644 --- a/public/api-docs.html +++ b/public/api-docs.html @@ -822,7 +822,7 @@ data: {"type":"done"}