@compilr-dev/cli 0.5.9 → 0.5.11

package/dist/index.js

@@ -237,9 +237,10 @@ async function main() {
     // Resolve model: CLI arg > settings > provider default
     const settingsModel = getDefaultModelSetting();
     let model = options.model ?? settingsModel ?? getDefaultModel(provider);
+    // On first run, skip API key check — the onboarding wizard handles setup
+    const isFirstRun = !isFirstRunComplete();
     // Check if API key is available for selected provider (skip for ollama and first run)
-    // On first run, the onboarding wizard handles API key setup (step 4)
-    if (provider !== 'ollama' && isFirstRunComplete()) {
+    if (provider !== 'ollama' && !isFirstRun) {
         const credentialKey = settingsProviderToCredentialKey(provider === 'claude' ? 'claude' : provider);
         if (!hasApiKey(credentialKey)) {
             console.log(s.warning('⚠ No API key found for ' + provider));
@@ -515,8 +516,9 @@ async function main() {
     };
     const defaultEpisodeRecorder = createEpisodeRecorder('default');
     // Create agent with permission handler and suggestion callback (no MCP tools yet)
+    // On first run, defer agent creation until after the onboarding wizard completes
     perf('create-agent-start');
-    const agent = createAgent({
+    const agent = isFirstRun ? undefined : createAgent({
         provider,
         model,
         minimal: options.minimal,
@@ -564,7 +566,7 @@ async function main() {
     let defaultAgentRef = agent;
     // Bind grantSession for the permission handler to use
     sharedState.grantSession = (toolName) => {
-        defaultAgentRef.grantSessionPermission(toolName);
+        defaultAgentRef?.grantSessionPermission(toolName);
     };
     // ==========================================================================
     // Create AgentTeam with the default agent (or restore from persistence)
@@ -628,7 +630,9 @@ async function main() {
         name: 'Team',
         agentFactory,
     });
-    team.setDefaultAgent(agent);
+    if (agent) {
+        team.setDefaultAgent(agent);
+    }
     // Set the active shared context for activity recording
     setActiveSharedContext(team.sharedContext);
     // Populate shared context with actual project info so agents know the project name
@@ -789,7 +793,55 @@ async function main() {
             sharedState.sessionPrefix = sessionId.slice(0, 8);
         },
         // Show onboarding wizard on first run
-        showOnboarding: !isFirstRunComplete(),
+        showOnboarding: isFirstRun,
+        // After onboarding, re-read settings and create the agent
+        onOnboardingComplete: () => {
+            // Re-read provider/model from settings (user may have changed them in the wizard)
+            const settingsProvider2 = getDefaultProvider();
+            provider = (settingsProvider2 !== 'auto' ? settingsProvider2 : null)
+                ?? detectProvider();
+            model = getDefaultModelSetting() ?? getDefaultModel(provider);
+            // Try to create the agent with the configured provider
+            const newAgent = createAgent({
+                provider,
+                model,
+                minimal: options.minimal,
+                quiet: true,
+                enableMetaTools: !options.minimal && getProviderMetadata(provider).supportsMetaTools,
+                onPermissionRequest,
+                onIterationLimitReached,
+                onSuggest: (event) => {
+                    sharedState.pendingSuggestion = event.action;
+                },
+                projectName: liveProjectState.dbProject?.displayName,
+                projectSlug: liveProjectState.dbProject?.name,
+                projectId: liveProjectState.dbProject?.id,
+                projectContext: liveProjectState.projectContext,
+                guidedModeContext: liveProjectState.guidedModeContext,
+                enableAnchors: true,
+                persistedAnchors: persistedAnchors.length > 0 ? persistedAnchors : undefined,
+                enableGuardrails: true,
+                onGuardrailTriggered,
+                onSubagentStart: (toolUseId, agentType, description) => {
+                    sharedState.onSubagentStart?.(toolUseId, agentType, description);
+                },
+                onSubagentEnd: (toolUseId, success, tokenCount, error) => {
+                    sharedState.onSubagentEnd?.(toolUseId, success, tokenCount, error);
+                },
+                onSubagentToolUse: (toolUseId, toolName, summary) => {
+                    sharedState.onSubagentToolUse?.(toolUseId, toolName, summary);
+                },
+                onSubagentTrackingReady: (clearTracking) => {
+                    sharedState.clearSubagentTracking = clearTracking;
+                },
+                episodeRecorder: defaultEpisodeRecorder,
+            });
+            defaultAgentRef = newAgent;
+            sharedState.grantSession = (toolName) => {
+                defaultAgentRef?.grantSessionPermission(toolName);
+            };
+            return Promise.resolve(newAgent);
+        },
         // Show login overlay if not authenticated
         showLogin,
     });
@@ -816,7 +868,7 @@ async function main() {
             perf('mcp-background-done');
             replV2.setMCPLoading(false, tools.length);
             if (tools.length > 0) {
-                agent.registerTools(tools);
+                agent?.registerTools(tools);
                 mcpToolsRef = tools;
             }
         })
@@ -831,12 +883,33 @@ async function main() {
 // Provider Detection
 // =============================================================================
 function detectProvider() {
+    // Check env vars first (fastest)
     if (process.env.ANTHROPIC_API_KEY)
         return 'claude';
     if (process.env.OPENAI_API_KEY)
         return 'openai';
     if (process.env.GOOGLE_AI_API_KEY)
         return 'gemini';
+    // Check credential store (keys set via /keys)
+    if (hasApiKey('anthropic'))
+        return 'claude';
+    if (hasApiKey('openai'))
+        return 'openai';
+    if (hasApiKey('google'))
+        return 'gemini';
+    if (hasApiKey('together'))
+        return 'together';
+    if (hasApiKey('groq'))
+        return 'groq';
+    if (hasApiKey('fireworks'))
+        return 'fireworks';
+    if (hasApiKey('perplexity'))
+        return 'perplexity';
+    if (hasApiKey('openrouter'))
+        return 'openrouter';
+    // Ollama doesn't need a key — check if it's likely available
+    if (hasApiKey('ollama'))
+        return 'ollama';
     // Default to claude
     return 'claude';
 }

package/dist/repl-v2.d.ts

@@ -170,6 +170,12 @@ export interface ReplV2Options {
      * Allows index.ts to update defaultAgentRef for grantSession.
      */
     onDefaultAgentSwapped?: (newAgent: Agent) => void;
+    /**
+     * Callback invoked after the onboarding wizard completes on first run.
+     * Returns the newly created agent (index.ts re-reads settings, updates
+     * provider/model, and creates the agent).
+     */
+    onOnboardingComplete?: () => Promise<Agent | undefined>;
 }
 /**
  * Options for switchAgent().
@@ -231,6 +237,7 @@ export declare class ReplV2 {
     private readonly onSessionRegistered?;
     private readonly onTeamReplaced?;
     private readonly onProjectStateUpdate?;
+    private readonly onOnboardingComplete?;
     private readonly onDefaultAgentSwapped?;
     private readonly authOnly;
     private restoredSessionInfo;

package/dist/repl-v2.js

@@ -199,6 +199,7 @@ export class ReplV2 {
     onSessionRegistered;
     onTeamReplaced;
     onProjectStateUpdate;
+    onOnboardingComplete;
     onDefaultAgentSwapped;
     authOnly;
     restoredSessionInfo = null;
@@ -246,6 +247,7 @@ export class ReplV2 {
         this.onSessionRegistered = options.onSessionRegistered;
         this.onTeamReplaced = options.onTeamReplaced;
         this.onProjectStateUpdate = options.onProjectStateUpdate;
+        this.onOnboardingComplete = options.onOnboardingComplete;
         this.onDefaultAgentSwapped = options.onDefaultAgentSwapped;
         this.authOnly = options.authOnly ?? false;
     }
@@ -1521,6 +1523,26 @@ export class ReplV2 {
             await this.showOnboardingWizard();
             return;
         }
+        // If agent wasn't created at startup (first run), create it now.
+        // onOnboardingComplete re-reads provider/model from settings and creates the agent.
+        if (!this.agent && this.onOnboardingComplete) {
+            try {
+                const newAgent = await this.onOnboardingComplete();
+                if (newAgent) {
+                    this.agent = newAgent;
+                    if (this.team) {
+                        this.team.setDefaultAgent(newAgent);
+                    }
+                }
+            }
+            catch {
+                // Agent creation failed (no API key configured)
+                this.ui.print({
+                    type: 'warning',
+                    message: 'No API key configured. Use /keys to set one, or /init to restart setup.',
+                });
+            }
+        }
         // Start session heartbeat in background (don't block UI)
         const auth = getAuthManager();
         void auth.startSession();

package/dist/ui/overlay/impl/onboarding-wizard-overlay-v2.js

@@ -126,7 +126,7 @@ export class OnboardingWizardOverlayV2 extends BaseOverlayV2 {
             placeholder: projectsPath,
             initialValue: projectsPath,
         });
-        this.minHeight = 22;
+        this.minHeight = 25;
     }
     // ===========================================================================
     // Rendering
@@ -272,7 +272,7 @@ export class OnboardingWizardOverlayV2 extends BaseOverlayV2 {
     }
     renderStepApiKeys(s) {
         const lines = [];
-        lines.push(`  ${s.secondary('Step 2: LLM API Keys')}`);
+        lines.push(`  ${s.secondary('LLM API Keys')}`);
         lines.push('');
         if (this.state.hasAnyKey) {
             lines.push(`  ${s.success('✓')} You have API keys configured:`);
@@ -298,7 +298,7 @@ export class OnboardingWizardOverlayV2 extends BaseOverlayV2 {
     renderStepGitConfig(s) {
         const lines = [];
         const { gitConfig, inputMode } = this.state;
-        lines.push(`  ${s.secondary('Step 3: Git Configuration')}`);
+        lines.push(`  ${s.secondary('Git Configuration')}`);
         lines.push('');
         // Input mode: entering git name
         if (inputMode === 'git-name') {
@@ -349,7 +349,7 @@ export class OnboardingWizardOverlayV2 extends BaseOverlayV2 {
     renderStepPaths(s) {
         const lines = [];
         const { inputMode, projectsPath } = this.state;
-        lines.push(`  ${s.secondary('Step 4: Projects Folder')}`);
+        lines.push(`  ${s.secondary('Projects Folder')}`);
         lines.push('');
         // Input mode: editing path
         if (inputMode === 'projects-path') {
@@ -371,7 +371,7 @@ export class OnboardingWizardOverlayV2 extends BaseOverlayV2 {
     }
     renderStepCompilrMd(s) {
         const lines = [];
-        lines.push(`  ${s.secondary('Step 5: Project Memory (COMPILR.md)')}`);
+        lines.push(`  ${s.secondary('Project Memory (COMPILR.md)')}`);
         lines.push('');
         lines.push('  Create a COMPILR.md file in your project root to give the');
         lines.push('  AI assistant context about your codebase.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@compilr-dev/cli",
-  "version": "0.5.9",
+  "version": "0.5.11",
   "description": "AI-powered coding assistant CLI using @compilr-dev/agents",
   "type": "module",
   "main": "dist/index.js",