opencode-pollinations-plugin 6.0.0-beta.18 → 6.0.0-beta.2

package/README.md

@@ -1,4 +1,4 @@
-# 🌸 Pollinations AI Plugin for OpenCode (v5.6.0)
+# 🌸 Pollinations AI Plugin for OpenCode (v5.9.0)
 
 <div align="center">
   <img src="https://avatars.githubusercontent.com/u/88394740?s=400&v=4" alt="Pollinations.ai Logo" width="200">
@@ -10,11 +10,9 @@
 
 <div align="center">
 
-![Version](https://img.shields.io/badge/version-5.8.4--beta.15-orange.svg)
+![Version](https://img.shields.io/badge/version-5.6.0-blue.svg)
 ![License](https://img.shields.io/badge/license-MIT-green.svg)
-![Status](https://img.shields.io/badge/status-Beta-yellow.svg)
-
-[📜 View Changelog](./CHANGELOG.md) | [🛣️ Roadmap](./ROADMAP.md)
+![Status](https://img.shields.io/badge/status-Stable-success.svg)
 
 </div>
 
@@ -136,8 +134,9 @@ OpenCode uses NPM as its registry. To publish:
 
 ### 1. The Basics (Free Mode)
 Just type in the chat. You are in **Manual Mode** by default.
-- Model: `openai` (GPT-4o Mini equivalent)
-- Model: `mistral` (Mistral Nemo)
+- Model: `openai-fast` (GPT-OSS 20b)
+- Model: `mistral` (Mistral Small 3.1)
+- ...
 
 ### 🔑 Configuration (API Key)
 
@@ -157,6 +156,7 @@ Just type in the chat. You are in **Manual Mode** by default.
 
 ## 🔗 Links
 
+- **Sign up Pollinations Beta (more and best free tiers access and paids models)**: [pollinations.ai](https://enter.pollinations.ai)
 - **Pollinations Website**: [pollinations.ai](https://pollinations.ai)
 - **Discord Community**: [Join us!](https://discord.gg/pollinations-ai-885844321461485618)
 - **OpenCode Ecosystem**: [opencode.ai](https://opencode.ai/docs/ecosystem#plugins)

package/dist/index.js

@@ -1,11 +1,12 @@
 import * as http from 'http';
 import * as fs from 'fs';
 import { generatePollinationsConfig } from './server/generate-config.js';
-import { loadConfig, saveConfig } from './server/config.js';
+import { loadConfig } from './server/config.js';
 import { handleChatCompletion } from './server/proxy.js';
 import { createToastHooks, setGlobalClient } from './server/toast.js';
 import { createStatusHooks } from './server/status.js';
 import { createCommandHooks } from './server/commands.js';
+import { createToolRegistry } from './tools/index.js';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
 const LOG_FILE = '/tmp/opencode_pollinations_v4.log';
@@ -15,10 +16,12 @@ function log(msg) {
     }
     catch (e) { }
 }
-// === PROXY SERVER ===
+// Port killing removed: Using dynamic ports.
 const startProxy = () => {
     return new Promise((resolve) => {
         const server = http.createServer(async (req, res) => {
+            // ... (Request Handling) ...
+            // We reuse the existing logic structure but simplified startup
             log(`[Proxy] Request: ${req.method} ${req.url}`);
             res.setHeader('Access-Control-Allow-Origin', '*');
             res.setHeader('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
@@ -60,6 +63,7 @@ const startProxy = () => {
             res.writeHead(404);
             res.end("Not Found");
         });
+        // Listen on random port (0) to avoid conflicts (CLI/IDE)
         server.listen(0, '127.0.0.1', () => {
             // @ts-ignore
             const assignedPort = server.address().port;
@@ -72,81 +76,6 @@ const startProxy = () => {
         });
     });
 };
-// === AUTH HOOK: Native /connect Integration ===
-const createAuthHook = () => ({
-    provider: 'pollinations',
-    // LOADER: Called by OpenCode when it needs credentials
-    // This enables HOT RELOAD - called before each request that needs auth
-    loader: async (auth, provider) => {
-        log('[AuthHook] loader() called - fetching credentials');
-        try {
-            const authData = await auth();
-            if (authData && 'key' in authData && authData.key) {
-                log(`[AuthHook] Got key from OpenCode auth: ${authData.key.substring(0, 8)}...`);
-                // Sync to our config for other parts of the plugin
-                saveConfig({ apiKey: authData.key });
-                return { apiKey: authData.key };
-            }
-        }
-        catch (e) {
-            log(`[AuthHook] loader() error: ${e}`);
-        }
-        // Fallback to our own config
-        const config = loadConfig();
-        if (config.apiKey) {
-            log(`[AuthHook] Using key from plugin config: ${config.apiKey.substring(0, 8)}...`);
-            return { apiKey: config.apiKey };
-        }
-        log('[AuthHook] No API key available');
-        return {};
-    },
-    // METHODS: Define how user can authenticate
-    methods: [{
-            type: 'api',
-            label: 'API Key',
-            prompts: [{
-                    type: 'text',
-                    key: 'apiKey',
-                    message: 'Enter your Pollinations API Key',
-                    placeholder: 'sk_...',
-                    validate: (value) => {
-                        if (!value || value.length < 10) {
-                            return 'API key must be at least 10 characters';
-                        }
-                        if (!value.startsWith('sk_') && !value.startsWith('sk-')) {
-                            return 'API key should start with sk_ or sk-';
-                        }
-                        return undefined; // Valid
-                    }
-                }],
-            authorize: async (inputs) => {
-                log(`[AuthHook] authorize() called with key: ${inputs?.apiKey?.substring(0, 8)}...`);
-                if (!inputs?.apiKey) {
-                    return { type: 'failed' };
-                }
-                // Validate key by testing API
-                try {
-                    const response = await fetch('https://gen.pollinations.ai/text/models', {
-                        headers: { 'Authorization': `Bearer ${inputs.apiKey}` }
-                    });
-                    if (response.ok) {
-                        log('[AuthHook] Key validated successfully');
-                        // Save to our config for immediate use
-                        saveConfig({ apiKey: inputs.apiKey });
-                        return { type: 'success', key: inputs.apiKey };
-                    }
-                    else {
-                        log(`[AuthHook] Key validation failed: ${response.status}`);
-                        return { type: 'failed' };
-                    }
-                }
-                catch (e) {
-                    log(`[AuthHook] Key validation error: ${e}`);
-                    return { type: 'failed' };
-                }
-            }
-        }]
-});
 // === PLUGIN EXPORT ===
 export const PollinationsPlugin = async (ctx) => {
     log(`Plugin Initializing v${require('../package.json').version}...`);
@@ -156,12 +85,15 @@ export const PollinationsPlugin = async (ctx) => {
     setGlobalClient(ctx.client);
     const toastHooks = createToastHooks(ctx.client);
     const commandHooks = createCommandHooks();
+    // Build tool registry (conditional on API key presence)
+    const toolRegistry = createToolRegistry();
+    log(`[Tools] ${Object.keys(toolRegistry).length} tools registered`);
     return {
-        // AUTH HOOK: Native /connect integration
-        auth: createAuthHook(),
+        tool: toolRegistry,
         async config(config) {
             log("[Hook] config() called");
-            // Generate models based on current auth state
+            // STARTUP only - No complex hot reload logic
+            // The user must restart OpenCode to refresh this list if they change keys.
             const modelsArray = await generatePollinationsConfig();
             const modelsObj = {};
             for (const m of modelsArray) {
@@ -169,14 +101,12 @@ export const PollinationsPlugin = async (ctx) => {
             }
             if (!config.provider)
                 config.provider = {};
+            // Dynamic Provider Name
             const version = require('../package.json').version;
             config.provider['pollinations'] = {
-                id: 'openai',
+                id: 'pollinations',
                 name: `Pollinations AI (v${version})`,
-                options: {
-                    baseURL: localBaseUrl,
-                    apiKey: 'plugin-managed', // Key is managed by auth hook
-                },
+                options: { baseURL: localBaseUrl },
                 models: modelsObj
             };
             log(`[Hook] Registered ${Object.keys(modelsObj).length} models.`);

package/dist/server/commands.js

@@ -303,15 +303,15 @@ async function handleConnectCommand(args) {
     // 1. Universal Validation (No Syntax Check) - Functional Check
     emitStatusToast('info', 'Vérification de la clé...', 'Pollinations Config');
     try {
-        const models = await generatePollinationsConfig(key);
-        // 2. Check if we got real models (not just connect placeholder)
-        const realModels = models.filter(m => m.id !== 'connect');
-        if (realModels.length > 0) {
+        const models = await generatePollinationsConfig(key, true);
+        // 2. Check if we got Enterprise models
+        const enterpriseModels = models.filter(m => m.id.startsWith('enter/'));
+        if (enterpriseModels.length > 0) {
             // SUCCESS
             saveConfig({ apiKey: key }); // Don't force mode 'pro'. Let user decide.
             const masked = key.substring(0, 6) + '...';
             // Count Paid Only models found
-            const diamondCount = realModels.filter(m => m.name.includes('💎')).length;
+            const diamondCount = enterpriseModels.filter(m => m.name.includes('💎')).length;
             // CHECK RESTRICTIONS: Strict Check (Usage + Profile + Balance)
             let forcedModeMsg = "";
             let isLimited = false;
@@ -336,10 +336,10 @@ async function handleConnectCommand(args) {
             else {
                 saveConfig({ apiKey: key, keyHasAccessToProfile: true }); // Let user keep current mode or default
             }
-            emitStatusToast('success', `Clé Valide! (${realModels.length} modèles débloqués)`, 'Pollinations Config');
+            emitStatusToast('success', `Clé Valide! (${enterpriseModels.length} modèles Pro débloqués)`, 'Pollinations Config');
             return {
                 handled: true,
-                response: `✅ **Connexion Réussie!**\n- Clé: \`${masked}\`\n- Modèles Débloqués: ${realModels.length} (dont ${diamondCount} 💎 Paid)${forcedModeMsg}`
+                response: `✅ **Connexion Réussie!**\n- Clé: \`${masked}\`\n- Modèles Débloqués: ${enterpriseModels.length} (dont ${diamondCount} 💎 Paid)${forcedModeMsg}`
             };
         }
         else {
@@ -351,8 +351,18 @@ async function handleConnectCommand(args) {
             // Wait, generate-config falls back to providing a list containing "[Enter] GPT-4o (Fallback)" if fetch failed.
             // So we need to detect if it's a "REAL" fetch or a "FALLBACK" fetch.
             // The fallback models have `variants: {}` usually, but real ones might too.
-            // v6.0: No fallback prefix check needed. If models is empty (only connect), key is invalid.
-            throw new Error("Aucun modèle détecté pour cette clé. Clé invalide ou expirée.");
+            // A better check: The fallback list is hardcoded in generate-config.ts catch block.
+            // Let's modify generate-config to return EMPTY list on error?
+            // Or just check if the returned models work?
+            // Simplest: If `generatePollinationsConfig` returns any model starting with `enter/` that includes "(Fallback)" in name, we assume failure?
+            // "GPT-4o (Fallback)" is the name.
+            const isFallback = models.some(m => m.name.includes('(Fallback)') && m.id.startsWith('enter/'));
+            if (isFallback) {
+                throw new Error("Clé rejetée par l'API (Accès refusé ou invalide).");
+            }
+            // If we are here, we got no enter models, or empty list?
+            // If key is valid but has no access?
+            throw new Error("Aucun modèle Enterprise détecté pour cette clé.");
         }
     }
     catch (e) {

package/dist/server/generate-config.d.ts

@@ -1,34 +1,8 @@
-/**
- * generate-config.ts - v6.0 Simplified
- *
- * Single endpoint: gen.pollinations.ai/text/models
- * No more Free tier, no cache ETag, no prefixes
- */
-export interface PollinationsModel {
-    name: string;
-    description?: string;
-    type?: string;
-    tools?: boolean;
-    reasoning?: boolean;
-    context?: number;
-    context_window?: number;
-    input_modalities?: string[];
-    output_modalities?: string[];
-    paid_only?: boolean;
-    vision?: boolean;
-    audio?: boolean;
-    pricing?: {
-        promptTextTokens?: number;
-        completionTextTokens?: number;
-        promptImageTokens?: number;
-        promptAudioTokens?: number;
-        completionAudioTokens?: number;
-    };
-    [key: string]: any;
-}
 interface OpenCodeModel {
     id: string;
     name: string;
+    object: string;
+    variants?: any;
     options?: any;
     limit?: {
         context?: number;
@@ -38,7 +12,6 @@ interface OpenCodeModel {
         input?: string[];
         output?: string[];
     };
-    tool_call?: boolean;
 }
-export declare function generatePollinationsConfig(forceApiKey?: string): Promise<OpenCodeModel[]>;
+export declare function generatePollinationsConfig(forceApiKey?: string, forceStrict?: boolean): Promise<OpenCodeModel[]>;
 export {};

package/dist/server/generate-config.js

@@ -1,12 +1,11 @@
-/**
- * generate-config.ts - v6.0 Simplified
- *
- * Single endpoint: gen.pollinations.ai/text/models
- * No more Free tier, no cache ETag, no prefixes
- */
 import * as https from 'https';
 import * as fs from 'fs';
+import * as os from 'os';
+import * as path from 'path';
 import { loadConfig } from './config.js';
+const HOMEDIR = os.homedir();
+const CONFIG_DIR_POLLI = path.join(HOMEDIR, '.pollinations');
+const CONFIG_FILE = path.join(CONFIG_DIR_POLLI, 'config.json');
 // --- LOGGING ---
 const LOG_FILE = '/tmp/opencode_pollinations_config.log';
 function log(msg) {
@@ -14,18 +13,15 @@ function log(msg) {
         const ts = new Date().toISOString();
         if (!fs.existsSync(LOG_FILE))
             fs.writeFileSync(LOG_FILE, '');
-        fs.appendFileSync(LOG_FILE, `[ConfigGen v6.0] ${ts} ${msg}\n`);
+        fs.appendFileSync(LOG_FILE, `[ConfigGen] ${ts} ${msg}\n`);
     }
     catch (e) { }
+    // Force output to stderr for CLI visibility if needed, but clean.
 }
-// --- NETWORK HELPER ---
+// Fetch Helper
 function fetchJson(url, headers = {}) {
     return new Promise((resolve, reject) => {
-        const finalHeaders = {
-            ...headers,
-            'User-Agent': 'Mozilla/5.0 (compatible; OpenCode-Pollinations/6.0; +https://opencode.ai)'
-        };
-        const req = https.get(url, { headers: finalHeaders }, (res) => {
+        const req = https.get(url, { headers }, (res) => {
             let data = '';
             res.on('data', chunk => data += chunk);
             res.on('end', () => {
@@ -35,7 +31,7 @@ function fetchJson(url, headers = {}) {
                 }
                 catch (e) {
                     log(`JSON Parse Error for ${url}: ${e}`);
-                    resolve([]);
+                    resolve([]); // Fail safe -> empty list
                 }
             });
         });
@@ -43,132 +39,200 @@ function fetchJson(url, headers = {}) {
             log(`Network Error for ${url}: ${e.message}`);
             reject(e);
         });
-        req.setTimeout(15000, () => {
+        req.setTimeout(5000, () => {
             req.destroy();
             reject(new Error('Timeout'));
         });
     });
 }
-// --- GENERATOR LOGIC ---
-export async function generatePollinationsConfig(forceApiKey) {
+function formatName(id, censored = true) {
+    let clean = id.replace(/^pollinations\//, '').replace(/-/g, ' ');
+    clean = clean.replace(/\b\w/g, l => l.toUpperCase());
+    if (!censored)
+        clean += " (Uncensored)";
+    return clean;
+}
+// --- MAIN GENERATOR logic ---
+// --- MAIN GENERATOR logic ---
+export async function generatePollinationsConfig(forceApiKey, forceStrict = false) {
     const config = loadConfig();
     const modelsOutput = [];
+    log(`Starting Configuration (V5.1.22 Hot-Reload)...`);
+    // Use forced key (from Hook) or cached key
     const effectiveKey = forceApiKey || config.apiKey;
-    log(`Starting Configuration v6.0...`);
-    log(`API Key present: ${!!effectiveKey}`);
-    // 1. ALWAYS add "connect" placeholder model
-    modelsOutput.push({
-        id: 'connect',
-        name: '🔑 Connect your Pollinations Account',
-        modalities: { input: ['text'], output: ['text'] },
-        tool_call: false
-    });
-    // 2. If no API key, return only connect placeholder
-    if (!effectiveKey || effectiveKey.length < 5 || effectiveKey === 'dummy') {
-        log('No API key configured. Returning connect placeholder only.');
-        return modelsOutput;
-    }
-    // 3. Fetch models from Enterprise endpoint
+    // 1. FREE UNIVERSE
     try {
-        log('Fetching models from gen.pollinations.ai/text/models...');
-        const rawList = await fetchJson('https://gen.pollinations.ai/text/models', {
-            'Authorization': `Bearer ${effectiveKey}`
-        });
-        const modelsList = Array.isArray(rawList) ? rawList : (rawList.data || []);
-        log(`Received ${modelsList.length} models from API`);
-        modelsList.forEach((m) => {
-            // Skip models without tools support (except nomnom - special handling)
-            if (m.tools === false && m.name !== 'nomnom') {
-                log(`Skipping ${m.name} (no tools)`);
-                return;
-            }
-            const mapped = mapModel(m);
+        // Switch to main models endpoint (User provided curl confirms it has 'description')
+        const freeList = await fetchJson('https://text.pollinations.ai/models');
+        const list = Array.isArray(freeList) ? freeList : (freeList.data || []);
+        list.forEach((m) => {
+            const mapped = mapModel(m, 'free/', '[Free] ');
             modelsOutput.push(mapped);
         });
-        log(`Total models registered: ${modelsOutput.length}`);
-        log(`Model IDs: ${modelsOutput.map(m => m.id).join(', ')}`);
+        log(`Fetched ${modelsOutput.length} Free models.`);
     }
     catch (e) {
-        log(`Error fetching models: ${e.message}`);
-        // Return connect placeholder only on error
+        log(`Error fetching Free models: ${e}`);
+        // Fallback Robust (Offline support)
+        modelsOutput.push({ id: "free/mistral", name: "[Free] Mistral Nemo (Fallback)", object: "model", variants: {} });
+        modelsOutput.push({ id: "free/openai", name: "[Free] OpenAI (Fallback)", object: "model", variants: {} });
+        modelsOutput.push({ id: "free/gemini", name: "[Free] Gemini Flash (Fallback)", object: "model", variants: {} });
+    }
+    // 1.5 FORCE ENSURE CRITICAL MODELS
+    // Sometimes the API list changes or is cached weirdly. We force vital models.
+    const hasGemini = modelsOutput.find(m => m.id === 'free/gemini');
+    if (!hasGemini) {
+        log(`[ConfigGen] Force-injecting free/gemini.`);
+        modelsOutput.push({ id: "free/gemini", name: "[Free] Gemini Flash (Force)", object: "model", variants: {} });
+    }
+    // ALIAS Removed for Clean Config
+    // const hasGeminiAlias = modelsOutput.find(m => m.id === 'pollinations/free/gemini');
+    // if (!hasGeminiAlias) {
+    //    modelsOutput.push({ id: "pollinations/free/gemini", name: "[Free] Gemini Flash (Alias)", object: "model", variants: {} });
+    // }
+    // 2. ENTERPRISE UNIVERSE
+    if (effectiveKey && effectiveKey.length > 5 && effectiveKey !== 'dummy') {
+        try {
+            // Use /text/models for full metadata (input_modalities, tools, reasoning, pricing)
+            const enterListRaw = await fetchJson('https://gen.pollinations.ai/text/models', {
+                'Authorization': `Bearer ${effectiveKey}`
+            });
+            const enterList = Array.isArray(enterListRaw) ? enterListRaw : (enterListRaw.data || []);
+            const paidModels = [];
+            enterList.forEach((m) => {
+                if (m.tools === false)
+                    return;
+                const mapped = mapModel(m, 'enter/', '[Enter] ');
+                modelsOutput.push(mapped);
+                if (m.paid_only) {
+                    paidModels.push(mapped.id.replace('enter/', '')); // Store bare ID "gemini-large"
+                }
+            });
+            log(`Total models (Free+Pro): ${modelsOutput.length}`);
+            // Save Paid Models List for Proxy
+            try {
+                const paidListPath = path.join(config.gui ? path.dirname(CONFIG_FILE) : '/tmp', 'pollinations-paid-models.json');
+                // Ensure dir exists (re-use config dir logic from config.ts if possible, or just assume it exists since config loaded)
+                if (fs.existsSync(path.dirname(paidListPath))) {
+                    fs.writeFileSync(paidListPath, JSON.stringify(paidModels));
+                }
+            }
+            catch (e) {
+                log(`Error saving paid models list: ${e}`);
+            }
+        }
+        catch (e) {
+            log(`Error fetching Enterprise models: ${e}`);
+            // STRICT MODE (Validation): Do not return fake fallback models.
+            if (forceStrict)
+                throw e;
+            // Fallback Robust for Enterprise (User has Key but discovery failed)
+            modelsOutput.push({ id: "enter/gpt-4o", name: "[Enter] GPT-4o (Fallback)", object: "model", variants: {} });
+            // ...
+            modelsOutput.push({ id: "enter/claude-3-5-sonnet", name: "[Enter] Claude 3.5 Sonnet (Fallback)", object: "model", variants: {} });
+            modelsOutput.push({ id: "enter/deepseek-reasoner", name: "[Enter] DeepSeek R1 (Fallback)", object: "model", variants: {} });
+        }
     }
     return modelsOutput;
 }
-// --- UTILS ---
+// --- CAPABILITY ICONS ---
 function getCapabilityIcons(raw) {
     const icons = [];
-    // Vision: check both input_modalities and legacy vision flag
-    if (raw.input_modalities?.includes('image') || raw.vision === true) {
+    // Vision: accepts images
+    if (raw.input_modalities?.includes('image'))
         icons.push('👁️');
-    }
-    // Audio input
-    if (raw.input_modalities?.includes('audio') || raw.audio === true) {
+    // Audio Input
+    if (raw.input_modalities?.includes('audio'))
         icons.push('🎙️');
-    }
-    // Audio output
-    if (raw.output_modalities?.includes('audio')) {
+    // Audio Output
+    if (raw.output_modalities?.includes('audio'))
         icons.push('🔊');
-    }
-    // Reasoning
-    if (raw.reasoning === true) {
+    // Reasoning capability
+    if (raw.reasoning === true)
         icons.push('🧠');
-    }
-    // Search capability
-    if (raw.description?.toLowerCase().includes('search') || raw.name?.includes('search')) {
+    // Web Search (from description)
+    if (raw.description?.toLowerCase().includes('search') ||
+        raw.name?.includes('search') ||
+        raw.name?.includes('perplexity')) {
         icons.push('🔍');
     }
-    // Tools
-    if (raw.tools === true) {
-        icons.push('🛠️');
-    }
-    // Paid only
-    if (raw.paid_only === true) {
-        icons.push('💎');
-    }
+    // Tool/Function calling
+    if (raw.tools === true)
+        icons.push('💻');
     return icons.length > 0 ? ` ${icons.join('')}` : '';
 }
-function formatName(id) {
-    let clean = id.replace(/-/g, ' ');
-    clean = clean.replace(/\b\w/g, l => l.toUpperCase());
-    return clean;
-}
-function mapModel(raw) {
-    const rawId = raw.name;
-    // Build display name
+// --- MAPPING ENGINE ---
+function mapModel(raw, prefix, namePrefix) {
+    const rawId = raw.id || raw.name;
+    const fullId = prefix + rawId; // ex: "free/gemini" or "enter/nomnom" (prefix passed is "enter/")
     let baseName = raw.description;
     if (!baseName || baseName === rawId) {
-        baseName = formatName(rawId);
+        baseName = formatName(rawId, raw.censored !== false);
     }
-    // Truncate after first " - "
+    // CLEANUP: Simple Truncation Rule (Requested by User)
+    // "Start from left, find ' - ', delete everything after."
     if (baseName && baseName.includes(' - ')) {
         baseName = baseName.split(' - ')[0].trim();
     }
+    let namePrefixFinal = namePrefix;
+    if (raw.paid_only) {
+        namePrefixFinal = namePrefix.replace('[Enter]', '[💎 Paid]');
+    }
+    // Get capability icons from API metadata
     const capabilityIcons = getCapabilityIcons(raw);
-    const finalName = `${baseName}${capabilityIcons}`;
-    // Determine modalities for OpenCode
-    const inputMods = raw.input_modalities || ['text'];
-    const outputMods = raw.output_modalities || ['text'];
+    const finalName = `${namePrefixFinal}${baseName}${capabilityIcons}`;
     const modelObj = {
-        id: rawId, // No prefix! Direct model ID
+        id: fullId,
         name: finalName,
+        object: 'model',
+        variants: {},
+        // Declare modalities for OpenCode vision support
         modalities: {
-            input: inputMods,
-            output: outputMods
-        },
-        tool_call: raw.tools === true && rawId !== 'nomnom' // NomNom: no tools
+            input: raw.input_modalities || ['text'],
+            output: raw.output_modalities || ['text']
+        }
     };
-    // Model-specific limits
+    // --- ENRICHISSEMENT ---
+    if (raw.reasoning === true || rawId.includes('thinking') || rawId.includes('reasoning')) {
+        modelObj.variants = { ...modelObj.variants, high_reasoning: { options: { reasoningEffort: "high", budgetTokens: 16000 } } };
+    }
+    if (rawId.includes('gemini') && !rawId.includes('fast')) {
+        if (!modelObj.variants.high_reasoning && (rawId === 'gemini' || rawId === 'gemini-large')) {
+            modelObj.variants.high_reasoning = { options: { reasoningEffort: "high", budgetTokens: 16000 } };
+        }
+    }
+    if (rawId.includes('claude') || rawId.includes('mistral') || rawId.includes('llama')) {
+        modelObj.variants.safe_tokens = { options: { maxTokens: 8000 } };
+    }
+    // NOVA FIX: Bedrock limit ~10k (User reported error > 10000)
+    // We MUST set the limit on the model object itself so OpenCode respects it by default.
     if (rawId.includes('nova')) {
-        modelObj.limit = { output: 8000, context: 128000 };
+        modelObj.limit = {
+            output: 8000,
+            context: 128000 // Nova Micro/Lite/Pro usually 128k
+        };
+        // Also keep variant just in case
+        modelObj.variants.bedrock_safe = { options: { maxTokens: 8000 } };
+    }
+    // BEDROCK/ENTERPRISE LIMITS (Chickytutor only)
+    if (rawId.includes('chickytutor')) {
+        modelObj.limit = {
+            output: 8192,
+            context: 128000
+        };
     }
-    if (rawId === 'nomnom') {
-        modelObj.limit = { output: 2048, context: 32768 };
-        modelObj.tool_call = false; // NomNom is a router, no external tools
+    // NOMNOM FIX: User reported error if max_tokens is missing.
+    // Also it is a 'Gemini-scrape' model, so we treat it similar to Gemini but with strict limit.
+    if (rawId.includes('nomnom') || rawId.includes('scrape')) {
+        modelObj.limit = {
+            output: 2048, // User used 1500 successfully
+            context: 32768
+        };
     }
-    if (rawId.includes('chicky') || rawId.includes('mistral')) {
-        modelObj.limit = { output: 4096, context: 8192 };
-        modelObj.options = { maxTokens: 4096 };
+    if (rawId.includes('fast') || rawId.includes('flash') || rawId.includes('lite')) {
+        if (!rawId.includes('gemini')) {
+            modelObj.variants.speed = { options: { thinking: { disabled: true } } };
+        }
     }
-    log(`[Mapped] ${modelObj.id} → ${modelObj.name} | tools=${modelObj.tool_call} | modalities=${JSON.stringify(modelObj.modalities)}`);
     return modelObj;
 }