@phuetz/code-buddy 2.0.0 → 2.1.0

package/dist/wizard/onboarding.js

@@ -1,6 +1,7 @@
 import * as readline from 'readline';
 import { spawn } from 'child_process';
-import { mkdirSync, writeFileSync } from 'fs';
+import { existsSync, readFileSync, mkdirSync } from 'fs';
+import { writeJsonAtomicSync } from '../utils/atomic-write.js';
 import { isAbsolute, join, resolve } from 'path';
 import { getValidationConfigForGuide, validateProviderKey, } from './provider-onboarding.js';
 import { detectEnvironment, renderDetectionSummary, } from './environment-detection.js';
@@ -165,31 +166,39 @@ export const ONBOARDING_PHASES = [
         successCheck: 'the selected layer has a doctor/status command or a focused smoke prompt.',
     },
 ];
-const TTS_PROVIDERS = ['pocket', 'elevenlabs', 'piper'];
+const TTS_PROVIDERS = ['piper', 'espeak', 'say', 'audioreader'];
+class OnboardingCancelled extends Error {
+}
 function ask(rl, question, defaultValue) {
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
+        const onClose = () => reject(new OnboardingCancelled('Setup cancelled.'));
+        rl.once('close', onClose);
         const suffix = defaultValue ? ` [${defaultValue}]` : '';
         rl.question(`  ${question}${suffix}: `, (answer) => {
+            rl.removeListener('close', onClose);
             resolve(answer.trim() || defaultValue || '');
         });
     });
 }
-function askChoice(rl, question, choices, defaultIdx) {
-    return new Promise((resolve) => {
-        console.log(`\n  ${question}`);
-        choices.forEach((c, i) => console.log(`    ${i + 1}. ${c}${i === defaultIdx ? ' (default)' : ''}`));
-        rl.question(`  Choice [${defaultIdx + 1}]: `, (answer) => {
-            const idx = parseInt(answer) - 1;
-            const selectedIdx = idx >= 0 && idx < choices.length ? idx : defaultIdx;
-            resolve(choices[selectedIdx] ?? choices[0] ?? '');
-        });
-    });
+async function askChoice(rl, question, choices, defaultIdx) {
+    console.log(`\n  ${question}`);
+    choices.forEach((c, i) => console.log(`    ${i + 1}. ${c}${i === defaultIdx ? ' (default)' : ''}`));
+    while (true) {
+        const answer = await ask(rl, 'Choice', String(defaultIdx + 1));
+        const idx = Number(answer) - 1;
+        if (/^\d+$/.test(answer) && Number.isInteger(idx) && idx >= 0 && idx < choices.length) {
+            return choices[idx];
+        }
+        console.log(`  Please enter a number from 1 to ${choices.length}.`);
+    }
 }
 /** Read a secret without echoing it (masks keystrokes with '*'). The captured
  *  value is always correct regardless of echo; masking is cosmetic, and falls
  *  back to a visible prompt if the terminal doesn't support muting. */
 function askSecret(rl, question) {
-    return new Promise((resolve) => {
+    return new Promise((resolve, reject) => {
+        const onClose = () => reject(new OnboardingCancelled('Setup cancelled.'));
+        rl.once('close', onClose);
         const rlAny = rl;
         const original = rlAny._writeToOutput?.bind(rl);
         let muted = false;
@@ -202,6 +211,7 @@ function askSecret(rl, question) {
             };
         }
         rl.question(`  ${question}: `, (answer) => {
+            rl.removeListener('close', onClose);
             if (typeof original === 'function')
                 rlAny._writeToOutput = original;
             resolve(answer.trim());
@@ -216,10 +226,10 @@ function askSecret(rl, question) {
  *   - an entered API key → encrypted credential store (never plaintext in settings),
  *     plus `process.env[envVar]` so the current process resolves immediately.
  *   - ollama → default `OLLAMA_HOST` so auto-detection picks it up.
- * All writes are best-effort; the wizard summary still prints on failure.
+ * Persistence errors propagate so the wizard cannot report a false success.
  */
 export async function persistProviderSelection(guide, model, apiKey) {
-    try {
+    {
         const { getSettingsManager } = await import('../utils/settings-manager.js');
         getSettingsManager().saveUserSettings({
             provider: guide.id,
@@ -229,13 +239,11 @@ export async function persistProviderSelection(guide, model, apiKey) {
             ...(guide.baseURL ? { baseURL: guide.baseURL } : {}),
         });
     }
-    catch { /* non-fatal */ }
     if (guide.authMode === 'api-key' && apiKey) {
-        try {
+        {
             const { getCredentialManager } = await import('../security/credential-manager.js');
             getCredentialManager().setApiKey(apiKey);
         }
-        catch { /* non-fatal */ }
         if (guide.envVar)
             process.env[guide.envVar] = apiKey;
     }
@@ -255,7 +263,13 @@ export function writeConfig(configDir, result) {
     mkdirSync(configDir, { recursive: true });
     const authMode = result.authMode ?? getProviderGuide(result.provider).authMode;
     const recommendedNextCommands = result.recommendedNextCommands ?? buildRecommendedNextCommands(result);
+    const configPath = join(configDir, 'config.json');
+    const previous = existsSync(configPath) ? JSON.parse(readFileSync(configPath, 'utf8')) : {};
+    if (!previous || typeof previous !== 'object' || Array.isArray(previous)) {
+        throw new Error('Existing project config must be a JSON object; it was not overwritten.');
+    }
     const config = {
+        ...previous,
         provider: result.provider,
         model: result.model,
         authMode,
@@ -269,7 +283,9 @@ export function writeConfig(configDir, result) {
     if (result.ttsProvider) {
         config.ttsProvider = result.ttsProvider;
     }
-    writeFileSync(join(configDir, 'config.json'), JSON.stringify(config, null, 2) + '\n');
+    if (!result.ttsEnabled)
+        delete config.ttsProvider;
+    writeJsonAtomicSync(configPath, config);
 }
 export function getProviderGuide(provider) {
     return (PROVIDER_GUIDES.find((guide) => guide.id === provider)
@@ -460,7 +476,7 @@ async function runQuickStart(rl, snapshot, projectDir) {
     const free = snapshot.recommendedFree;
     const ollama = snapshot.capabilities.find((c) => c.id === 'ollama');
     // Case A: a ready free path exists — offer it directly.
-    if (free) {
+    if (free && PROVIDER_GUIDES.some((guide) => guide.id === free.id)) {
         const answer = (await ask(rl, `Start now on ${free.label} — free, no API key needed? (Y/n)`, 'y')).toLowerCase();
         if (answer === 'y' || answer === 'yes' || answer === '') {
             const guide = getProviderGuide(free.id);
@@ -514,17 +530,40 @@ function finishQuickStart(provider, model, baseURL, projectDir) {
 }
 /** Offer to run the isolated 60-second demo right after setup — ending the
  *  wizard on proof (a green test), not prose. */
-async function offerTry(rl) {
+export async function offerOnboardingDemo(rl, result) {
+    if (!['chatgpt', 'ollama', 'lmstudio'].includes(result.provider)) {
+        console.log('  Verify this provider with the first-chat command below.');
+        return;
+    }
     const answer = (await ask(rl, 'Run the 60-second demo now to confirm it works? (Y/n)', 'y')).toLowerCase();
     if (answer === 'y' || answer === 'yes' || answer === '') {
         try {
             const { runTryDemo } = await import('../commands/try.js');
             rl.pause();
-            await runTryDemo();
-            rl.resume();
+            const { getSettingsManager } = await import('../utils/settings-manager.js');
+            const code = await runTryDemo({
+                verbose: false,
+                resolveProvider: async () => ({
+                    kind: result.provider === 'chatgpt' ? 'chatgpt' : 'ollama',
+                    label: `${result.provider} (${result.model})`,
+                    apiKey: result.provider === 'chatgpt' ? 'oauth-chatgpt' : 'local',
+                    baseURL: result.provider === 'chatgpt'
+                        ? 'https://chatgpt.com/backend-api/codex'
+                        : getSettingsManager().getBaseURL(),
+                    model: result.model,
+                }),
+            });
+            if (code !== 0) {
+                process.exitCode = code;
+                console.log('  Setup saved, but the demo failed. First chat is not verified.');
+            }
         }
         catch {
-            console.log('\n  Run it yourself anytime with:  buddy try\n');
+            process.exitCode = 1;
+            console.log('\n  The demo failed. First chat is not verified.\n');
+        }
+        finally {
+            rl.resume();
         }
     }
     else {
@@ -562,7 +601,7 @@ export async function runOnboarding() {
         if (quick) {
             console.log(renderCapabilitiesFooter());
             console.log('');
-            await offerTry(rl);
+            await offerOnboardingDemo(rl, quick);
             return quick;
         }
         console.log(renderOnboardingRoadmap());
@@ -571,8 +610,15 @@ export async function runOnboarding() {
         //    default lands on the recommended free path when there is one.
         const orderedGuides = orderGuidesByDetection(snapshot);
         const provider = await askChoice(rl, 'Which AI provider do you want to use?', orderedGuides.map((guide) => `${guide.id} — ${guide.label}`), 0).then((choice) => choice.split(/\s+—\s+/)[0] ?? choice);
-        const guide = getProviderGuide(provider);
-        const validationConfig = getValidationConfigForGuide(provider);
+        const selectedGuide = getProviderGuide(provider);
+        const detected = snapshot.capabilities.find((capability) => capability.id === provider);
+        const guide = selectedGuide.authMode === 'local' && detected?.baseURL
+            ? { ...selectedGuide, baseURL: detected.baseURL }
+            : selectedGuide;
+        const defaultValidation = getValidationConfigForGuide(provider);
+        const validationConfig = guide.authMode === 'local' && guide.baseURL && defaultValidation
+            ? { ...defaultValidation, baseUrl: guide.baseURL.replace(/\/v1\/?$/, '') }
+            : defaultValidation;
         // 2. Authentication — captured AND verified inline so you leave the wizard
         //    ready to chat. A rejected key never gets persisted; a successful probe
         //    also hands us the provider's real model list for step 3.
@@ -651,10 +697,18 @@ export async function runOnboarding() {
             recommendedNextCommands: buildRecommendedNextCommands({ provider, apiKey, model }),
             ...(ttsProvider ? { ttsProvider } : {}),
         };
+        {
+            const { getTTSManager } = await import('../input/text-to-speech.js');
+            getTTSManager().updateConfig({
+                enabled: ttsEnabled,
+                autoSpeak: ttsEnabled,
+                ...(ttsProvider ? { provider: ttsProvider } : {}),
+            });
+        }
         // 6. Write project config into the folder the user chose
         applyOnboardingProjectConfig(projectDir, result);
         // 7. Summary
-        const ready = verified || (guide.authMode === 'api-key' && Boolean(apiKey));
+        const ready = verified;
         console.log('');
         console.log(`  ${ready ? 'Setup complete — you\'re ready to go!' : 'Setup saved.'}`);
         console.log('');
@@ -688,10 +742,16 @@ export async function runOnboarding() {
         console.log('');
         // Close with a real, runnable test so the wizard ends on proof, not prose.
         if (ready) {
-            await offerTry(rl);
+            await offerOnboardingDemo(rl, result);
         }
         return result;
     }
+    catch (error) {
+        if (!(error instanceof OnboardingCancelled))
+            throw error;
+        console.log('\n  Setup cancelled.');
+        return null;
+    }
     finally {
         rl.close();
     }

package/dist/wizard/provider-onboarding.d.ts

@@ -19,6 +19,8 @@ export interface ProviderOnboardingConfig {
     baseUrl: string;
     /** GET endpoint to validate the key (relative to baseUrl) */
     validateEndpoint: string;
+    /** Optional public catalog, fetched only after authentication succeeds. */
+    modelsEndpoint?: string;
     /** User-facing instructions for obtaining an API key */
     instructions: string;
 }

package/dist/wizard/provider-onboarding.js

@@ -57,7 +57,10 @@ export const PROVIDER_CONFIGS = [
         name: 'OpenRouter',
         envKey: 'OPENROUTER_API_KEY',
         baseUrl: 'https://openrouter.ai/api',
-        validateEndpoint: '/v1/models',
+        // /models is public and cannot establish whether a key is valid.
+        // https://openrouter.ai/docs/api/api-reference/api-keys/get-current-api-key
+        validateEndpoint: '/v1/key',
+        modelsEndpoint: '/v1/models',
         instructions: 'Get your API key from https://openrouter.ai/keys',
     },
     {
@@ -153,33 +156,68 @@ export async function validateProviderKey(config, apiKey) {
             error: `API error (${response.status}): ${errorText.slice(0, 200)}`,
         };
     }
-    // Extract model list from response
+    if (config.id === 'openrouter') {
+        let body;
+        try {
+            body = await response.json();
+        }
+        catch { /* invalid response below */ }
+        if (!isRecord(body) || !isRecord(body.data) || typeof body.data.label !== 'string') {
+            return { valid: false, error: `Invalid authentication response from ${config.name}` };
+        }
+        // The key is authenticated even if the optional model catalog is unavailable.
+        if (!config.modelsEndpoint)
+            return { valid: true };
+        try {
+            const catalog = await fetch(`${config.baseUrl}${config.modelsEndpoint}`, {
+                method: 'GET',
+                headers,
+                signal: AbortSignal.timeout(15000),
+            });
+            if (!catalog.ok)
+                return { valid: true };
+            const models = await extractModels(config, catalog);
+            return models === null ? { valid: true } : { valid: true, models };
+        }
+        catch {
+            return { valid: true };
+        }
+    }
     const models = await extractModels(config, response);
+    if (models === null) {
+        return { valid: false, error: `Invalid model-list response from ${config.name}` };
+    }
     return { valid: true, models };
 }
 /**
  * Parse the model list from a provider's validation response.
  */
+function isRecord(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
 async function extractModels(config, response) {
     try {
-        const data = await response.json();
-        const body = data;
-        if (config.id === 'ollama') {
-            // Ollama: { models: [{ name: "llama3" }] }
-            const models = body.models;
-            return models?.map((m) => m.name) ?? [];
-        }
-        if (config.id === 'google') {
-            // Gemini: { models: [{ name: "models/gemini-pro" }] }
-            const models = body.models;
-            return models?.map((m) => m.name.replace('models/', '')) ?? [];
+        const body = await response.json();
+        if (!isRecord(body))
+            return null;
+        const usesNames = config.id === 'ollama' || config.id === 'google';
+        const rows = usesNames ? body.models : body.data;
+        const field = usesNames ? 'name' : 'id';
+        if (!Array.isArray(rows))
+            return null;
+        const models = [];
+        for (const row of rows) {
+            if (!isRecord(row))
+                return null;
+            const value = row[field];
+            if (typeof value !== 'string' || !value.trim())
+                return null;
+            models.push(config.id === 'google' ? value.replace(/^models\//, '') : value);
         }
-        // OpenAI-compatible: { data: [{ id: "gpt-4o" }] }
-        const modelData = body.data;
-        return modelData?.map((m) => m.id) ?? [];
+        return models;
     }
     catch {
-        return [];
+        return null;
     }
 }
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@phuetz/code-buddy",
-  "version": "2.0.0",
-  "description": "Open-source AI coding agent for the terminal, desktop, and HTTP. 64 LLM providers (Claude, GPT, Grok, Gemini, Ollama, LM Studio, NVIDIA NIM, …), 30 of them free-tier or local $0, with automatic failover. 220+ tools selected per query, a peer-to-peer fleet, opt-in self-improvement, multi-channel messaging, and a skills system.",
+  "version": "2.1.0",
+  "description": "AI coding agent with terminal and HTTP interfaces, optional Cowork desktop integration, multi-provider routing, tools, fleet collaboration and inspectable memory. See release notes for supported integrations and limits.",
   "author": "Patrice Huetz <patrice.huetz@gmail.com>",
   "repository": {
     "type": "git",
@@ -17,6 +17,10 @@
   ],
   "main": "dist/index.js",
   "exports": {
+    "./harness": {
+      "types": "./dist/harness/index.d.ts",
+      "import": "./dist/harness/index.js"
+    },
     ".": {
       "import": "./dist/index.js",
       "types": "./dist/index.d.ts"
@@ -215,6 +219,7 @@
     "terminal-image": "^4.1.0",
     "tesseract.js": "^7.0.0",
     "tiktoken": "^1.0.22",
+    "typescript": "^5.9.3",
     "undici": "^6.28.0",
     "yaml": "^2.9.0",
     "youtube-caption-extractor": "^1.10.2",
@@ -275,7 +280,6 @@
     "semantic-release": "^25.0.3",
     "tsx": "^4.21.0",
     "typedoc": "^0.28.15",
-    "typescript": "^5.9.3",
     "vitest": "^4.0.18",
     "vscode-languageserver": "^9.0.1",
     "vscode-languageserver-textdocument": "^1.0.12"