viberag 0.5.0 → 0.6.0

package/README.md

@@ -51,7 +51,7 @@ When using a coding agent like [Claude Code](https://claude.ai/code), add `use v
 - **Agent-first search** - Find definitions, entry files, and relevant blocks (not just “chunks”)
 - **Flexible embeddings** - Local model (offline, free) or cloud providers (Gemini, Mistral, OpenAI)
 - **MCP server** - Works with Claude Code, Cursor, VS Code Copilot, and more
-- **Automatic incremental indexing** - Watches for file changes (respects `.gitignore`) and reindexes only what has changed in real time
+- **Automatic incremental indexing** - Watches for file changes (respects `.gitignore` + `.viberagignore`) and reindexes only what has changed in real time
 - **Cancelable indexing** - Supports `/cancel` and clear status reporting via `/status`
 - **Multi-language support** - TypeScript, JavaScript, Python, Go, Rust, and more
 - **Blazing fast** - The data storage and search functionality is local on your machine, meaning the full power of your machine can churn through massive amounts of data and execute complex search queries in milliseconds.
@@ -510,17 +510,49 @@ VibeRAG includes a CLI for easy execution of initialization, indexing, setup, an
 | `/clean`          | Remove VibeRAG from project                               |
 | `/help`           | Show all commands                                         |
 
+## Data Directory
+
+VibeRAG stores all per-project state (config, index, logs) globally under:
+
+- `~/.local/share/viberag/projects/<projectId>/` (override via `VIBERAG_HOME`)
+
+No files are written into your repo.
+
+## Ignoring Files
+
+VibeRAG uses `.gitignore` rules to exclude files and folders from indexing. For
+non-git projects (or for additional ignore patterns), you can create a
+`.viberagignore` file in the project root.
+
+- `.viberagignore` uses the exact same pattern syntax as `.gitignore`
+- It is applied in addition to `.gitignore` (if present)
+
+Example `.viberagignore`:
+
+```gitignore
+# build outputs
+dist/
+build/
+
+# local artifacts
+coverage/
+tmp/
+
+# generated bundles
+**/*.min.js
+```
+
 ## Logs
 
-VibeRAG writes per-service logs to `.viberag/logs/` with hourly rotation:
+VibeRAG writes per-service logs with hourly rotation:
 
-- `.viberag/logs/daemon/` - daemon lifecycle and IPC errors
-- `.viberag/logs/indexer/` - indexing progress, retries, and batch failures
-- `.viberag/logs/mcp/` - MCP server errors
-- `.viberag/logs/cli/` - CLI errors
+- `~/.local/share/viberag/projects/<projectId>/logs/daemon/` - daemon lifecycle and IPC errors
+- `~/.local/share/viberag/projects/<projectId>/logs/indexer/` - indexing progress, retries, and batch failures
+- `~/.local/share/viberag/projects/<projectId>/logs/mcp/` - MCP server errors
+- `~/.local/share/viberag/projects/<projectId>/logs/cli/` - CLI errors
 
 If indexing appears slow or retries are happening, check the latest file under
-`.viberag/logs/indexer/`.
+`~/.local/share/viberag/projects/<projectId>/logs/indexer/`.
 
 ## Embedding Providers
 
@@ -548,7 +580,7 @@ Choose your embedding provider during `/init`:
 - **Mistral** - Code-optimized embeddings for technical content
 - **OpenAI** - Fast and reliable with low cost
 
-API keys are entered during the `/init` wizard and stored securely in `.viberag/config.json` (automatically added to `.gitignore`).
+API keys are entered during the `/init` wizard and stored globally in `~/.local/share/viberag/secrets/secrets.json` (override via `VIBERAG_HOME`). Project configs store only a key id reference (never the raw API key).
 
 ## How It Works
 
@@ -677,9 +709,9 @@ Example sequence:
 
 ### Watcher EMFILE (too many open files)
 
-Large repos can exceed OS watch limits. The watcher now honors `.gitignore`, but if you still see EMFILE:
+Large repos can exceed OS watch limits. The watcher honors `.gitignore` and `.viberagignore`, but if you still see EMFILE:
 
-- Add more ignores in `.gitignore` to reduce watched files.
+- Add more ignores in `.gitignore` or `.viberagignore` to reduce watched files.
 - Increase OS limits:
   - macOS: raise `kern.maxfiles`, `kern.maxfilesperproc`, and `ulimit -n`
   - Linux: raise `fs.inotify.max_user_watches`, `fs.inotify.max_user_instances`, and `ulimit -n`

package/dist/cli/app.js

@@ -5,7 +5,7 @@ import { Provider } from 'react-redux';
 import { store } from './store/store.js';
 import { useAppDispatch, useAppSelector } from './store/hooks.js';
 import { WizardActions } from './store/wizard/slice.js';
-import { selectActiveWizard, selectInitStep, selectMcpStep, selectInitConfig, selectMcpConfig, selectIsReinit, selectShowMcpPrompt, selectExistingApiKey, selectExistingProvider, } from './store/wizard/selectors.js';
+import { selectActiveWizard, selectInitStep, selectMcpStep, selectInitConfig, selectMcpConfig, selectIsReinit, selectShowMcpPrompt, selectExistingApiKeyId, selectExistingProvider, } from './store/wizard/selectors.js';
 import { AppActions } from './store/app/slice.js';
 import { selectIsInitialized, selectIndexStats, selectAppStatus, selectOutputItems, selectStartupLoaded, } from './store/app/selectors.js';
 // Common infrastructure
@@ -63,7 +63,7 @@ function AppContent() {
     const mcpConfig = useAppSelector(selectMcpConfig);
     const isReinit = useAppSelector(selectIsReinit);
     const showMcpPrompt = useAppSelector(selectShowMcpPrompt);
-    const existingApiKey = useAppSelector(selectExistingApiKey);
+    const existingApiKeyId = useAppSelector(selectExistingApiKeyId);
     const existingProvider = useAppSelector(selectExistingProvider);
     // Redux app state (migrated from useState)
     const isInitialized = useAppSelector(selectIsInitialized);
@@ -84,7 +84,7 @@ function AppContent() {
             if (initialized) {
                 const config = await loadConfig(projectRoot);
                 dispatch(WizardActions.setExistingConfig({
-                    apiKey: config.apiKey,
+                    apiKeyId: config.apiKeyRef?.keyId,
                     provider: config.embeddingProvider,
                 }));
             }
@@ -127,10 +127,10 @@ function AppContent() {
     const startInitWizard = useCallback((isReinit) => {
         dispatch(WizardActions.startInit({
             isReinit,
-            existingApiKey: existingApiKey ?? undefined,
+            existingApiKeyId: existingApiKeyId ?? undefined,
             existingProvider: existingProvider ?? undefined,
         }));
-    }, [dispatch, existingApiKey, existingProvider]);
+    }, [dispatch, existingApiKeyId, existingProvider]);
     // Start the MCP setup wizard
     const startMcpSetupWizard = useCallback((showPrompt = false) => {
         dispatch(WizardActions.startMcpSetup({ showPrompt }));
@@ -257,7 +257,7 @@ function AppContent() {
                 item.content)) : (React.createElement(Text, null, item.content))));
         }),
         React.createElement(StatusBar, { status: appStatus, stats: indexStats }),
-        activeWizard === 'init' ? (React.createElement(InitWizard, { step: initStep, config: initConfig, isReinit: isReinit, existingApiKey: existingApiKey ?? undefined, existingProvider: existingProvider ?? undefined, onStepChange: handleInitWizardStep, onComplete: handleInitWizardComplete, onCancel: handleWizardCancel })) : activeWizard === 'mcp-setup' ? (React.createElement(McpSetupWizard, { step: mcpStep, config: mcpConfig, projectRoot: projectRoot, showPrompt: showMcpPrompt, onStepChange: handleMcpWizardStep, onComplete: handleMcpWizardComplete, onCancel: handleWizardCancel, addOutput: addOutput })) : activeWizard === 'clean' ? (React.createElement(CleanWizard, { projectRoot: projectRoot, viberagDir: getViberagDir(projectRoot), onComplete: handleCleanWizardComplete, onCancel: handleWizardCancel, addOutput: addOutput })) : (React.createElement(TextInput, { onSubmit: handleSubmit, onCtrlC: handleCtrlC, commands: COMMANDS, navigateHistoryUp: navigateUp, navigateHistoryDown: navigateDown, resetHistoryIndex: resetIndex }))));
+        activeWizard === 'init' ? (React.createElement(InitWizard, { step: initStep, config: initConfig, isReinit: isReinit, existingApiKeyId: existingApiKeyId ?? undefined, existingProvider: existingProvider ?? undefined, onStepChange: handleInitWizardStep, onComplete: handleInitWizardComplete, onCancel: handleWizardCancel })) : activeWizard === 'mcp-setup' ? (React.createElement(McpSetupWizard, { step: mcpStep, config: mcpConfig, projectRoot: projectRoot, showPrompt: showMcpPrompt, onStepChange: handleMcpWizardStep, onComplete: handleMcpWizardComplete, onCancel: handleWizardCancel, addOutput: addOutput })) : activeWizard === 'clean' ? (React.createElement(CleanWizard, { projectRoot: projectRoot, viberagDir: getViberagDir(projectRoot), onComplete: handleCleanWizardComplete, onCancel: handleWizardCancel, addOutput: addOutput })) : (React.createElement(TextInput, { onSubmit: handleSubmit, onCtrlC: handleCtrlC, commands: COMMANDS, navigateHistoryUp: navigateUp, navigateHistoryDown: navigateDown, resetHistoryIndex: resetIndex }))));
 }
 /**
  * Main App component with Redux Provider and DaemonStatusProvider.

package/dist/cli/commands/handlers.d.ts

@@ -13,7 +13,7 @@ export declare function checkInitialized(projectRoot: string): Promise<boolean>;
 export declare function loadIndexStats(projectRoot: string): Promise<IndexDisplayStats | null>;
 /**
  * Initialize a project for Viberag.
- * Creates .viberag/ directory with config.json.
+ * Creates a global per-project data directory with config.json.
  * With isReinit=true, shuts down daemon and deletes everything first.
  * Optionally reports progress for UI status updates.
  */
@@ -53,7 +53,7 @@ export declare function getStatus(projectRoot: string): Promise<string>;
 export declare function cancelActivity(projectRoot: string, target?: string): Promise<string>;
 /**
  * Clean/uninstall Viberag from a project.
- * Shuts down daemon first, then removes the entire .viberag/ directory.
+ * Shuts down daemon first, then removes the entire project data directory.
  */
 export declare function runClean(projectRoot: string): Promise<string>;
 /**

package/dist/cli/commands/handlers.js

@@ -2,11 +2,11 @@
  * RAG commands for the CLI.
  */
 import fs from 'node:fs/promises';
-import path from 'node:path';
 import chalk from 'chalk';
 import { computeStringHash } from '../../daemon/lib/merkle/hash.js';
 import { configExists, saveConfig, DEFAULT_CONFIG, PROVIDER_CONFIGS, } from '../../daemon/lib/config.js';
-import { getViberagDir } from '../../daemon/lib/constants.js';
+import { getSecretsPath, getRunDir, getServiceLogsDir, getViberagDir, } from '../../daemon/lib/constants.js';
+import { addApiKey } from '../../daemon/lib/secrets.js';
 import { loadV2Manifest, checkV2IndexCompatibility, v2ManifestExists, } from '../../daemon/services/v2/manifest.js';
 import { getGrammarSupportSummary } from '../../daemon/lib/chunker/grammars.js';
 import { checkNpmForUpdate } from '../../daemon/lib/update-check.js';
@@ -36,14 +36,14 @@ export async function loadIndexStats(projectRoot) {
 }
 /**
  * Initialize a project for Viberag.
- * Creates .viberag/ directory with config.json.
+ * Creates a global per-project data directory with config.json.
  * With isReinit=true, shuts down daemon and deletes everything first.
  * Optionally reports progress for UI status updates.
  */
 export async function runInit(projectRoot, isReinit = false, wizardConfig, onProgress) {
     const viberagDir = getViberagDir(projectRoot);
     const isExisting = await configExists(projectRoot);
-    // If reinit, shutdown daemon and delete entire .viberag directory first
+    // If reinit, shutdown daemon and delete entire project data directory first
     if (isReinit && isExisting) {
         onProgress?.('Stopping daemon');
         const client = new DaemonClient(projectRoot);
@@ -61,11 +61,13 @@ export async function runInit(projectRoot, isReinit = false, wizardConfig, onPro
         finally {
             await client.disconnect();
         }
-        onProgress?.('Removing .viberag');
+        onProgress?.('Removing project data');
         await fs.rm(viberagDir, { recursive: true, force: true });
+        // Also remove runtime files (socket/pid/lock)
+        await fs.rm(getRunDir(projectRoot), { recursive: true, force: true });
     }
-    // Create .viberag directory
-    onProgress?.('Creating .viberag');
+    // Create global per-project directory
+    onProgress?.('Creating project data');
     await fs.mkdir(viberagDir, { recursive: true });
     // Build config from wizard choices
     const provider = wizardConfig?.provider ?? 'gemini';
@@ -83,28 +85,35 @@ export async function runInit(projectRoot, isReinit = false, wizardConfig, onPro
         embeddingProvider: provider,
         embeddingModel: model,
         embeddingDimensions: dimensions,
-        ...(wizardConfig?.apiKey && { apiKey: wizardConfig.apiKey }),
         ...(openaiBaseUrl && { openaiBaseUrl }),
     };
+    // Configure API key reference for cloud providers
+    if (provider !== 'local') {
+        let keyId = wizardConfig?.apiKeyId;
+        if (!keyId && wizardConfig?.apiKey) {
+            onProgress?.('Saving API key');
+            const result = await addApiKey({
+                provider,
+                apiKey: wizardConfig.apiKey,
+                makeDefault: true,
+            });
+            keyId = result.keyId;
+        }
+        if (!keyId) {
+            throw new Error(`${provider} API key required. Add one via /init (stored at ${getSecretsPath()}).`);
+        }
+        config.apiKeyRef = { provider, keyId };
+    }
     // Save config
     onProgress?.('Writing config');
     await saveConfig(projectRoot, config);
-    // Add .viberag/ to .gitignore if not present
-    const gitignorePath = path.join(projectRoot, '.gitignore');
-    onProgress?.('Updating .gitignore');
-    try {
-        const content = await fs.readFile(gitignorePath, 'utf-8');
-        if (!content.includes('.viberag')) {
-            await fs.appendFile(gitignorePath, '\n# Viberag index\n.viberag/\n');
-        }
-    }
-    catch {
-        // .gitignore doesn't exist, create it
-        await fs.writeFile(gitignorePath, '# Viberag index\n.viberag/\n');
-    }
     const action = isExisting ? 'Reinitialized' : 'Initialized';
     const providerLabel = provider.charAt(0).toUpperCase() + provider.slice(1);
-    return `${action} Viberag in ${viberagDir}\nProvider: ${providerLabel}\nModel: ${model} (${dimensions}d)\nRun /index to build the code index.`;
+    return (`${action} VibeRAG for ${projectRoot}\n` +
+        `Data: ${viberagDir}\n` +
+        `Provider: ${providerLabel}\n` +
+        `Model: ${model} (${dimensions}d)\n` +
+        'Run /index to build the code index.');
 }
 /**
  * Run the indexer and return stats.
@@ -344,7 +353,7 @@ export async function getStatus(projectRoot) {
             updatePromise,
             compatibilityPromise,
         ]);
-        return formatStatusWithStartupChecks(formatDaemonStatus(daemonStatus), {
+        return formatStatusWithStartupChecks(formatDaemonStatus(daemonStatus, projectRoot), {
             update,
             compatibility,
         });
@@ -412,7 +421,7 @@ function formatStatusWithStartupChecks(body, args) {
     }
     return `${lines.join('\n')}${body}`;
 }
-function formatDaemonStatus(status) {
+function formatDaemonStatus(status, projectRoot) {
     const lines = ['Daemon status:'];
     lines.push(`  Initialized: ${status.initialized ? 'yes' : 'no'}`);
     if (status.indexed) {
@@ -472,7 +481,7 @@ function formatDaemonStatus(status) {
         lines.push(`  Slots: ${slotSummary}`);
     }
     if (status.failures.length > 0) {
-        lines.push(`  Failures: ${status.failures.length} batch(es) - see .viberag/logs/indexer/`);
+        lines.push(`  Failures: ${status.failures.length} batch(es) - see ${getServiceLogsDir(projectRoot, 'indexer')}`);
     }
     const watcher = status.watcherStatus;
     const watcherParts = [
@@ -560,7 +569,7 @@ function normalizeCancelTarget(target) {
 }
 /**
  * Clean/uninstall Viberag from a project.
- * Shuts down daemon first, then removes the entire .viberag/ directory.
+ * Shuts down daemon first, then removes the entire project data directory.
  */
 export async function runClean(projectRoot) {
     const viberagDir = getViberagDir(projectRoot);
@@ -585,7 +594,11 @@ export async function runClean(projectRoot) {
         await client.disconnect();
     }
     await fs.rm(viberagDir, { recursive: true, force: true });
-    return `Removed ${viberagDir}\nViberag has been uninstalled from this project.\nRun /init to reinitialize.`;
+    await fs.rm(getRunDir(projectRoot), { recursive: true, force: true });
+    return (`Removed ${viberagDir}\n` +
+        'VibeRAG has been uninstalled for this project.\n' +
+        'Run /init to reinitialize.\n' +
+        `Note: API keys are stored globally at ${getSecretsPath()}.`);
 }
 /**
  * Get MCP setup instructions for Claude Code.

package/dist/cli/commands/useCommands.js

@@ -25,7 +25,7 @@ export function useCommands({ addOutput, addSearchResults, projectRoot, stdout,
   /status         - Show index status
   /cancel [target] - Cancel indexing or warmup (targets: indexing, warmup)
   /mcp-setup      - Configure MCP server for AI coding tools
-  /clean          - Remove Viberag from project (delete .viberag/)
+  /clean          - Remove VibeRAG from project (delete project data)
   /quit           - Exit
 
 Multi-line input:

package/dist/cli/components/CleanWizard.js

@@ -7,8 +7,10 @@
 import React, { useState, useEffect, useCallback } from 'react';
 import { Box, Text, useInput } from 'ink';
 import SelectInput from 'ink-select-input';
+import { DaemonClient } from '../../client/index.js';
 import { EDITORS, getConfigPath } from '../data/mcp-editors.js';
 import { findConfiguredEditors, removeViberagConfig, } from '../commands/mcp-setup.js';
+import { getRunDir } from '../../daemon/lib/constants.js';
 const CONFIRM_ITEMS = [
     { label: 'Yes, remove everything', value: 'continue' },
     { label: 'Cancel', value: 'cancel' },
@@ -67,7 +69,26 @@ export function CleanWizard({ projectRoot, viberagDir, onComplete, onCancel, add
     // Perform the actual cleanup
     const performCleanup = useCallback(async (cleanProjectMcpArg, cleanGlobalMcp) => {
         const fs = await import('node:fs/promises');
-        // Remove .viberag directory
+        // Shutdown daemon first (prevents stale DB handles / sockets)
+        const client = new DaemonClient({
+            projectRoot,
+            autoStart: false,
+        });
+        try {
+            if (await client.isRunning()) {
+                await client.connect();
+                await client.shutdown('clean');
+                // Give the daemon a moment to exit
+                await new Promise(r => setTimeout(r, 500));
+            }
+        }
+        catch {
+            // Ignore errors - daemon may not be running
+        }
+        finally {
+            await client.disconnect();
+        }
+        // Remove global per-project data directory
         try {
             await fs.rm(viberagDir, { recursive: true, force: true });
             setViberagRemoved(true);
@@ -90,6 +111,13 @@ export function CleanWizard({ projectRoot, viberagDir, onComplete, onCancel, add
                 return;
             }
         }
+        // Remove runtime files (socket/pid/lock)
+        try {
+            await fs.rm(getRunDir(projectRoot), { recursive: true, force: true });
+        }
+        catch {
+            // Ignore
+        }
         const results = [];
         // Clean project MCP configs if requested
         if (cleanProjectMcpArg) {
@@ -169,7 +197,7 @@ export function CleanWizard({ projectRoot, viberagDir, onComplete, onCancel, add
         return (React.createElement(Box, { flexDirection: "column", borderStyle: "round", paddingX: 2, paddingY: 1 },
             React.createElement(Text, { bold: true, color: "yellow" }, "Remove from MCP configs?"),
             React.createElement(Box, { marginTop: 1, flexDirection: "column" },
-                React.createElement(Text, null, "Found viberag in these project MCP configs:"),
+                React.createElement(Text, null, "Found VibeRAG in these project MCP configs:"),
                 projectScopeConfigs.map(info => (React.createElement(Text, { key: `${info.editor.id}-${info.scope}`, dimColor: true },
                     ' ',
                     "\u2022 ",
@@ -188,7 +216,7 @@ export function CleanWizard({ projectRoot, viberagDir, onComplete, onCancel, add
             React.createElement(Box, { marginTop: 1 },
                 React.createElement(Text, { color: "yellow" }, "Note: Other projects using this config will need to run /mcp-setup again.")),
             React.createElement(Box, { marginTop: 1, flexDirection: "column" },
-                React.createElement(Text, null, "Found viberag in these global configs:"),
+                React.createElement(Text, null, "Found VibeRAG in these global configs:"),
                 globalScopeConfigs.map(info => (React.createElement(Text, { key: `${info.editor.id}-${info.scope}`, dimColor: true },
                     ' ',
                     "\u2022 ",

package/dist/cli/components/InitWizard.d.ts

@@ -8,13 +8,13 @@ type Props = {
     step: number;
     config: Partial<InitWizardConfig>;
     isReinit: boolean;
-    /** Existing API key from previous config (for reinit flow) */
-    existingApiKey?: string;
+    /** Existing API key id from previous config (for reinit flow) */
+    existingApiKeyId?: string;
     /** Existing provider from previous config (for reinit flow) */
     existingProvider?: EmbeddingProviderType;
     onStepChange: (step: number, data?: Partial<InitWizardConfig>) => void;
     onComplete: (config: InitWizardConfig) => void;
     onCancel: () => void;
 };
-export declare function InitWizard({ step, config, isReinit, existingApiKey, existingProvider, onStepChange, onComplete, onCancel, }: Props): React.ReactElement;
+export declare function InitWizard({ step, config, isReinit, existingApiKeyId, existingProvider, onStepChange, onComplete, onCancel, }: Props): React.ReactElement;
 export default InitWizard;

package/dist/cli/components/InitWizard.js

@@ -5,6 +5,8 @@
 import React, { useState, useEffect } from 'react';
 import { Box, Text, useInput } from 'ink';
 import SelectInput from 'ink-select-input';
+import { getViberagDir } from '../../daemon/lib/constants.js';
+import { listApiKeys, } from '../../daemon/lib/secrets.js';
 /**
  * Cloud providers that require API keys.
  */
@@ -159,11 +161,6 @@ const CONFIRM_ITEMS = [
     { label: 'Initialize', value: 'init' },
     { label: 'Cancel', value: 'cancel' },
 ];
-// API key action options for reinit
-const API_KEY_ACTION_ITEMS = [
-    { label: 'Keep existing API key', value: 'keep' },
-    { label: 'Enter new API key', value: 'new' },
-];
 // OpenAI region options for data residency
 const OPENAI_REGION_ITEMS = [
     {
@@ -226,15 +223,26 @@ function ApiKeyInputStep({ providerName, apiKeyInput, setApiKeyInput, onSubmit,
         apiKeyInput.trim() === '' && (React.createElement(Text, { color: "yellow", dimColor: true }, "API key is required")),
         React.createElement(Text, { dimColor: true }, "Press Enter to continue")));
 }
-export function InitWizard({ step, config, isReinit, existingApiKey, existingProvider, onStepChange, onComplete, onCancel, }) {
+export function InitWizard({ step, config, isReinit, existingApiKeyId, existingProvider, onStepChange, onComplete, onCancel, }) {
     // State for API key input
     const [apiKeyInput, setApiKeyInput] = useState('');
-    const [apiKeyAction, setApiKeyAction] = useState(null);
+    const [enteringNewKey, setEnteringNewKey] = useState(false);
+    const [availableKeys, setAvailableKeys] = useState(null);
+    const [keysLoading, setKeysLoading] = useState(false);
+    const [keysError, setKeysError] = useState(null);
     // State for OpenAI region selection (shown after API key for OpenAI)
     const [showRegionSelect, setShowRegionSelect] = useState(false);
     // Handle Escape to cancel
     useInput((input, key) => {
-        if (key.escape || (key.ctrl && input === 'c')) {
+        if (key.escape) {
+            if (enteringNewKey) {
+                setEnteringNewKey(false);
+                return;
+            }
+            onCancel();
+            return;
+        }
+        if (key.ctrl && input === 'c') {
             onCancel();
         }
     });
@@ -244,6 +252,8 @@ export function InitWizard({ step, config, isReinit, existingApiKey, existingPro
     // Check if current provider is a cloud provider
     const currentProvider = config.provider ?? 'local';
     const needsApiKey = isCloudProvider(currentProvider);
+    // Data directory (global per-project)
+    const dataDir = getViberagDir(process.cwd());
     // Compute effective step (adjusted for non-reinit flow)
     // Steps: 0=reinit confirm, 1=provider select, 2=api key (cloud only), 3=final confirm
     const effectiveStep = normalizedIsReinit
@@ -256,7 +266,28 @@ export function InitWizard({ step, config, isReinit, existingApiKey, existingPro
         }
     }, [effectiveStep, needsApiKey, normalizedStep, onStepChange]);
     // Check if we have an existing API key for the same provider
-    const hasExistingKeyForProvider = existingApiKey && existingProvider === currentProvider;
+    const hasExistingKeyForProvider = existingApiKeyId && existingProvider === currentProvider;
+    // Load available keys when on the API key step for a cloud provider
+    useEffect(() => {
+        if (effectiveStep !== 2 || !needsApiKey)
+            return;
+        setKeysLoading(true);
+        setKeysError(null);
+        setAvailableKeys(null);
+        const provider = currentProvider;
+        listApiKeys(provider)
+            .then(keys => {
+            setAvailableKeys(keys);
+        })
+            .catch(error => {
+            const message = error instanceof Error ? error.message : String(error);
+            setKeysError(message);
+            setAvailableKeys([]);
+        })
+            .finally(() => {
+            setKeysLoading(false);
+        });
+    }, [effectiveStep, needsApiKey, currentProvider]);
     // Step 0 (reinit only): Confirmation
     if (normalizedIsReinit && normalizedStep === 0) {
         return (React.createElement(Box, { flexDirection: "column", borderStyle: "round", paddingX: 2, paddingY: 1 },
@@ -285,10 +316,17 @@ export function InitWizard({ step, config, isReinit, existingApiKey, existingPro
                 React.createElement(SelectInput, { items: PROVIDER_ITEMS, onSelect: item => {
                         // Reset API key and region state when provider changes
                         setApiKeyInput('');
-                        setApiKeyAction(null);
+                        setEnteringNewKey(false);
+                        setAvailableKeys(null);
+                        setKeysError(null);
                         setShowRegionSelect(false);
                         // Use relative increment: step + 1
-                        onStepChange(normalizedStep + 1, { provider: item.value });
+                        onStepChange(normalizedStep + 1, {
+                            provider: item.value,
+                            apiKey: undefined,
+                            apiKeyId: undefined,
+                            openaiRegion: undefined,
+                        });
                     } })),
             React.createElement(Box, { marginTop: 1 },
                 React.createElement(Text, { dimColor: true }, "\u2191/\u2193 navigate, Enter select, Esc cancel"))));
@@ -321,7 +359,7 @@ export function InitWizard({ step, config, isReinit, existingApiKey, existingPro
         }
         return (React.createElement(Box, { flexDirection: "column", borderStyle: "round", paddingX: 2, paddingY: 1 },
             React.createElement(Text, { bold: true },
-                "Configure ",
+                "Select ",
                 info.name,
                 " API Key"),
             React.createElement(Box, { marginTop: 1, flexDirection: "column" },
@@ -329,52 +367,86 @@ export function InitWizard({ step, config, isReinit, existingApiKey, existingPro
                     "Get your API key:",
                     ' ',
                     React.createElement(Text, { color: "cyan", underline: true }, apiKeyUrl))),
-            hasExistingKeyForProvider && apiKeyAction === null ? (React.createElement(Box, { marginTop: 1, flexDirection: "column" },
-                React.createElement(Text, { color: "green" },
-                    "An API key is already configured for ",
-                    info.name,
-                    "."),
-                React.createElement(Box, { marginTop: 1 },
-                    React.createElement(SelectInput, { items: API_KEY_ACTION_ITEMS, onSelect: item => {
-                            if (item.value === 'keep') {
-                                // Keep existing key
-                                onStepChange(normalizedStep, { apiKey: existingApiKey });
-                                if (isOpenAI) {
-                                    // Show region selection for OpenAI
-                                    setShowRegionSelect(true);
-                                }
-                                else {
-                                    // Advance to confirmation for other providers
-                                    onStepChange(normalizedStep + 1, {
-                                        apiKey: existingApiKey,
-                                    });
-                                }
-                            }
-                            else {
-                                // Show text input for new key
-                                setApiKeyAction('new');
-                            }
-                        } })))) : (React.createElement(ApiKeyInputStep, { providerName: info.name, apiKeyInput: apiKeyInput, setApiKeyInput: setApiKeyInput, onSubmit: key => {
+            keysError && (React.createElement(Box, { marginTop: 1 },
+                React.createElement(Text, { color: "yellow", dimColor: true },
+                    "Failed to load existing keys: ",
+                    keysError))),
+            enteringNewKey ? (React.createElement(ApiKeyInputStep, { providerName: info.name, apiKeyInput: apiKeyInput, setApiKeyInput: setApiKeyInput, onSubmit: key => {
                     if (key.trim()) {
-                        onStepChange(normalizedStep, { apiKey: key.trim() });
+                        onStepChange(normalizedStep, {
+                            apiKey: key.trim(),
+                            apiKeyId: undefined,
+                        });
                         if (isOpenAI) {
                             // Show region selection for OpenAI
                             setShowRegionSelect(true);
                         }
                         else {
                             // Advance to confirmation for other providers
-                            onStepChange(normalizedStep + 1, { apiKey: key.trim() });
+                            onStepChange(normalizedStep + 1, {
+                                apiKey: key.trim(),
+                                apiKeyId: undefined,
+                            });
                         }
                     }
-                } })),
+                } })) : (React.createElement(Box, { marginTop: 1, flexDirection: "column" },
+                keysLoading && React.createElement(Text, { dimColor: true }, "Loading saved keys..."),
+                React.createElement(Box, { marginTop: 1 },
+                    React.createElement(SelectInput, { items: (() => {
+                            const items = [];
+                            const seen = new Set();
+                            if (hasExistingKeyForProvider && existingApiKeyId) {
+                                items.push({
+                                    label: 'Keep current key',
+                                    value: { kind: 'existing', keyId: existingApiKeyId },
+                                });
+                                seen.add(existingApiKeyId);
+                            }
+                            for (const key of availableKeys ?? []) {
+                                if (seen.has(key.id))
+                                    continue;
+                                items.push({
+                                    label: `${key.label} (${key.preview})`,
+                                    value: { kind: 'existing', keyId: key.id },
+                                });
+                                seen.add(key.id);
+                            }
+                            items.push({
+                                label: 'Add new API key',
+                                value: { kind: 'new' },
+                            });
+                            return items;
+                        })(), onSelect: item => {
+                            if (item.value.kind === 'new') {
+                                setEnteringNewKey(true);
+                                setApiKeyInput('');
+                                return;
+                            }
+                            const keyId = item.value.keyId;
+                            if (isOpenAI) {
+                                onStepChange(normalizedStep, {
+                                    apiKeyId: keyId,
+                                    apiKey: undefined,
+                                });
+                                setShowRegionSelect(true);
+                            }
+                            else {
+                                onStepChange(normalizedStep + 1, {
+                                    apiKeyId: keyId,
+                                    apiKey: undefined,
+                                });
+                            }
+                        } })))),
             React.createElement(Box, { marginTop: 1 },
-                React.createElement(Text, { dimColor: true }, "Esc to cancel"))));
+                React.createElement(Text, { dimColor: true }, enteringNewKey
+                    ? 'Esc to go back · Ctrl+C to cancel'
+                    : 'Esc to cancel'))));
     }
     // Step 3: Confirmation
     if (effectiveStep === 3) {
         const provider = config.provider ?? 'gemini';
         const info = PROVIDER_CONFIG[provider];
-        const hasApiKey = !!config.apiKey;
+        const hasApiKey = !!config.apiKeyId || !!config.apiKey;
         return (React.createElement(Box, { flexDirection: "column", borderStyle: "round", paddingX: 2, paddingY: 1 },
             React.createElement(Text, { bold: true }, "Ready to Initialize"),
             React.createElement(Box, { marginTop: 1, flexDirection: "column" },
@@ -401,11 +473,17 @@ export function InitWizard({ step, config, isReinit, existingApiKey, existingPro
                     hasApiKey ? (React.createElement(Text, { color: "green" }, "Configured")) : (React.createElement(Text, { color: "red" }, "Missing")))),
                 React.createElement(Text, null,
                     React.createElement(Text, { dimColor: true }, "Directory:"),
-                    " .viberag/")),
+                    " ",
+                    dataDir)),
             React.createElement(Box, { marginTop: 1 },
                 React.createElement(SelectInput, { items: CONFIRM_ITEMS, onSelect: item => {
                         if (item.value === 'init') {
-                            onComplete({ provider, apiKey: config.apiKey });
+                            onComplete({
+                                provider,
+                                apiKeyId: config.apiKeyId,
+                                apiKey: config.apiKey,
+                                openaiRegion: config.openaiRegion,
+                            });
                         }
                         else {
                             onCancel();