opencode-pollinations-plugin 5.8.4-beta.9 → 6.0.0-beta.18

package/README.md

@@ -10,9 +10,11 @@
 
 <div align="center">
 
-![Version](https://img.shields.io/badge/version-5.6.0-blue.svg)
+![Version](https://img.shields.io/badge/version-5.8.4--beta.15-orange.svg)
 ![License](https://img.shields.io/badge/license-MIT-green.svg)
-![Status](https://img.shields.io/badge/status-Stable-success.svg)
+![Status](https://img.shields.io/badge/status-Beta-yellow.svg)
+
+[📜 View Changelog](./CHANGELOG.md) | [🛣️ Roadmap](./ROADMAP.md)
 
 </div>
 

package/dist/index.js

@@ -1,7 +1,7 @@
 import * as http from 'http';
 import * as fs from 'fs';
 import { generatePollinationsConfig } from './server/generate-config.js';
-import { loadConfig } from './server/config.js';
+import { loadConfig, saveConfig } from './server/config.js';
 import { handleChatCompletion } from './server/proxy.js';
 import { createToastHooks, setGlobalClient } from './server/toast.js';
 import { createStatusHooks } from './server/status.js';
@@ -15,12 +15,10 @@ function log(msg) {
     }
     catch (e) { }
 }
-// Port killing removed: Using dynamic ports.
+// === PROXY SERVER ===
 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');
@@ -62,7 +60,6 @@ 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;
@@ -75,6 +72,81 @@ 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}...`);
@@ -85,10 +157,11 @@ export const PollinationsPlugin = async (ctx) => {
     const toastHooks = createToastHooks(ctx.client);
     const commandHooks = createCommandHooks();
     return {
+        // AUTH HOOK: Native /connect integration
+        auth: createAuthHook(),
         async config(config) {
             log("[Hook] config() called");
-            // STARTUP only - No complex hot reload logic
-            // The user must restart OpenCode to refresh this list if they change keys.
+            // Generate models based on current auth state
             const modelsArray = await generatePollinationsConfig();
             const modelsObj = {};
             for (const m of modelsArray) {
@@ -96,17 +169,17 @@ export const PollinationsPlugin = async (ctx) => {
             }
             if (!config.provider)
                 config.provider = {};
-            // Dynamic Provider Name
             const version = require('../package.json').version;
             config.provider['pollinations'] = {
-                id: 'pollinations',
-                npm: require('../package.json').name,
+                id: 'openai',
                 name: `Pollinations AI (v${version})`,
-                options: { baseURL: localBaseUrl },
+                options: {
+                    baseURL: localBaseUrl,
+                    apiKey: 'plugin-managed', // Key is managed by auth hook
+                },
                 models: modelsObj
             };
             log(`[Hook] Registered ${Object.keys(modelsObj).length} models.`);
-            log(`[Hook] Keys: ${Object.keys(modelsObj).join(', ')}`);
         },
         ...toastHooks,
         ...createStatusHooks(ctx.client),

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, true);
-        // 2. Check if we got Enterprise models
-        const enterpriseModels = models.filter(m => m.id.startsWith('enter/'));
-        if (enterpriseModels.length > 0) {
+        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) {
             // 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 = enterpriseModels.filter(m => m.name.includes('💎')).length;
+            const diamondCount = realModels.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! (${enterpriseModels.length} modèles Pro débloqués)`, 'Pollinations Config');
+            emitStatusToast('success', `Clé Valide! (${realModels.length} modèles débloqués)`, 'Pollinations Config');
             return {
                 handled: true,
-                response: `✅ **Connexion Réussie!**\n- Clé: \`${masked}\`\n- Modèles Débloqués: ${enterpriseModels.length} (dont ${diamondCount} 💎 Paid)${forcedModeMsg}`
+                response: `✅ **Connexion Réussie!**\n- Clé: \`${masked}\`\n- Modèles Débloqués: ${realModels.length} (dont ${diamondCount} 💎 Paid)${forcedModeMsg}`
             };
         }
         else {
@@ -351,18 +351,8 @@ 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.
-            // 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é.");
+            // 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.");
         }
     }
     catch (e) {

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

@@ -1,3 +1,31 @@
+/**
+ * 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;
@@ -12,5 +40,5 @@ interface OpenCodeModel {
     };
     tool_call?: boolean;
 }
-export declare function generatePollinationsConfig(forceApiKey?: string, forceStrict?: boolean): Promise<OpenCodeModel[]>;
+export declare function generatePollinationsConfig(forceApiKey?: string): Promise<OpenCodeModel[]>;
 export {};

package/dist/server/generate-config.js

@@ -1,14 +1,12 @@
+/**
+ * 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 CACHE_FILE = path.join(CONFIG_DIR_POLLI, 'models-cache.json');
-// --- CONSTANTS ---
-// Seed from models-seed.ts
-import { FREE_MODELS_SEED } from './models-seed.js';
 // --- LOGGING ---
 const LOG_FILE = '/tmp/opencode_pollinations_config.log';
 function log(msg) {
@@ -16,44 +14,28 @@ function log(msg) {
         const ts = new Date().toISOString();
         if (!fs.existsSync(LOG_FILE))
             fs.writeFileSync(LOG_FILE, '');
-        fs.appendFileSync(LOG_FILE, `[ConfigGen] ${ts} ${msg}\n`);
+        fs.appendFileSync(LOG_FILE, `[ConfigGen v6.0] ${ts} ${msg}\n`);
     }
     catch (e) { }
 }
 // --- NETWORK HELPER ---
-function fetchHead(url) {
-    return new Promise((resolve) => {
-        // Use Node.js native https check for minimal overhead
-        const req = https.request(url, { method: 'HEAD', timeout: 5000 }, (res) => {
-            resolve(res.headers['etag'] || null);
-        });
-        req.on('error', () => resolve(null));
-        req.on('timeout', () => { req.destroy(); resolve(null); });
-        req.end();
-    });
-}
 function fetchJson(url, headers = {}) {
     return new Promise((resolve, reject) => {
         const finalHeaders = {
             ...headers,
-            'User-Agent': 'Mozilla/5.0 (compatible; OpenCode/5.8.4; +https://opencode.ai)'
+            'User-Agent': 'Mozilla/5.0 (compatible; OpenCode-Pollinations/6.0; +https://opencode.ai)'
         };
         const req = https.get(url, { headers: finalHeaders }, (res) => {
-            const etag = res.headers['etag'];
             let data = '';
             res.on('data', chunk => data += chunk);
             res.on('end', () => {
                 try {
                     const json = JSON.parse(data);
-                    // HACK: Attach ETag to the object to pass it up
-                    if (etag && typeof json === 'object') {
-                        Object.defineProperty(json, '_etag', { value: etag, enumerable: false, writable: true });
-                    }
                     resolve(json);
                 }
                 catch (e) {
                     log(`JSON Parse Error for ${url}: ${e}`);
-                    resolve([]); // Fail safe
+                    resolve([]);
                 }
             });
         });
@@ -67,210 +49,126 @@ function fetchJson(url, headers = {}) {
         });
     });
 }
-function loadCache() {
-    try {
-        if (fs.existsSync(CACHE_FILE)) {
-            const content = fs.readFileSync(CACHE_FILE, 'utf-8');
-            return JSON.parse(content);
-        }
-    }
-    catch (e) {
-        log(`Error loading cache: ${e}`);
-    }
-    return null;
-}
-function saveCache(models, etag) {
-    try {
-        const data = {
-            timestamp: Date.now(),
-            etag: etag,
-            models: models
-        };
-        if (!fs.existsSync(CONFIG_DIR_POLLI))
-            fs.mkdirSync(CONFIG_DIR_POLLI, { recursive: true });
-        fs.writeFileSync(CACHE_FILE, JSON.stringify(data, null, 2));
-    }
-    catch (e) {
-        log(`Error saving cache: ${e}`);
-    }
-}
 // --- GENERATOR LOGIC ---
-export async function generatePollinationsConfig(forceApiKey, forceStrict = false) {
+export async function generatePollinationsConfig(forceApiKey) {
     const config = loadConfig();
     const modelsOutput = [];
-    log(`Starting Configuration (v5.8.4-Debug-Tools)...`);
     const effectiveKey = forceApiKey || config.apiKey;
-    // 1. FREE UNIVERSE (Smart Cache System)
-    let freeModelsList = [];
-    let isOffline = false;
-    let cache = loadCache();
-    const CACHE_TTL = 7 * 24 * 3600 * 1000; // 7 days
-    // Decision Logic
-    const now = Date.now();
-    let shouldFetch = !cache || (now - cache.timestamp > CACHE_TTL);
-    // ETag Check: If cache is valid but we want to be proactive
-    if (!shouldFetch && cache && cache.etag) {
-        try {
-            log('Smart Refresh: Checking for updates (HEAD)...');
-            const remoteEtag = await fetchHead('https://text.pollinations.ai/models');
-            if (remoteEtag && remoteEtag !== cache.etag) {
-                log(`Update Detected! (Remote: ${remoteEtag} != Local: ${cache.etag}). Forcing refresh.`);
-                shouldFetch = true;
-            }
-            else {
-                log('Cache is clean (ETag match). No refresh needed.');
-            }
-        }
-        catch (e) {
-            log(`Smart Refresh check failed: ${e}. Ignoring.`);
-        }
+    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;
     }
-    if (shouldFetch) {
-        log('Fetching fresh Free models...');
-        try {
-            const raw = await fetchJson('https://text.pollinations.ai/models');
-            const list = Array.isArray(raw) ? raw : (raw.data || []);
-            const newEtag = raw._etag; // Get hidden ETag
-            if (list.length > 0) {
-                freeModelsList = list;
-                saveCache(list, newEtag);
-                log(`Fetched and cached ${list.length} models (ETag: ${newEtag || 'N/A'}).`);
-            }
-            else {
-                throw new Error('API returned empty list');
-            }
-        }
-        catch (e) {
-            log(`Fetch failed: ${e}.`);
-            isOffline = true;
-            // Fallback Logic
-            if (cache && cache.models.length > 0) {
-                log('Using cached models (Offline).');
-                freeModelsList = cache.models;
-            }
-            else {
-                log('Using DEFAULT SEED models (Offline + No Cache).');
-                freeModelsList = FREE_MODELS_SEED;
+    // 3. Fetch models from Enterprise endpoint
+    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;
             }
-        }
-    }
-    else {
-        log('Using cached models (Skipped fetch).');
-        freeModelsList = cache.models;
+            const mapped = mapModel(m);
+            modelsOutput.push(mapped);
+        });
+        log(`Total models registered: ${modelsOutput.length}`);
+        log(`Model IDs: ${modelsOutput.map(m => m.id).join(', ')}`);
     }
-    // Map Free Models
-    freeModelsList.forEach((m) => {
-        // Tag (Offline) only if we explicitly failed a fetch attempt or are using Fallback SEED when fetch failed.
-        // If we use cache because it's valid (Skipped fetch), we don't tag (Offline).
-        const suffix = isOffline ? ' (Offline)' : '';
-        const mapped = mapModel(m, 'free-', `[Free] `, suffix);
-        modelsOutput.push(mapped);
-    });
-    // 2. ENTERPRISE UNIVERSE
-    if (effectiveKey && effectiveKey.length > 5 && effectiveKey !== 'dummy') {
-        try {
-            const enterListRaw = await fetchJson('https://gen.pollinations.ai/text/models', {
-                'Authorization': `Bearer ${effectiveKey}`
-            });
-            const enterList = Array.isArray(enterListRaw) ? enterListRaw : (enterListRaw.data || []);
-            enterList.forEach((m) => {
-                if (m.tools === false)
-                    return;
-                const mapped = mapModel(m, 'enter-', '[Enter] ');
-                modelsOutput.push(mapped);
-            });
-            log(`Total models (Free+Pro): ${modelsOutput.length}`);
-            log(`Generated IDs: ${modelsOutput.map(m => m.id).join(', ')}`);
-        }
-        catch (e) {
-            log(`Error fetching Enterprise models: ${e}`);
-            if (forceStrict)
-                throw e;
-            // STRICT: No Fallback for Enterprise. If API is down, we have 0 Enter models.
-        }
+    catch (e) {
+        log(`Error fetching models: ${e.message}`);
+        // Return connect placeholder only on error
     }
     return modelsOutput;
 }
 // --- UTILS ---
 function getCapabilityIcons(raw) {
     const icons = [];
-    if (raw.input_modalities?.includes('image') || raw.vision === true)
+    // Vision: check both input_modalities and legacy vision flag
+    if (raw.input_modalities?.includes('image') || raw.vision === true) {
         icons.push('👁️');
-    if (raw.input_modalities?.includes('audio') || raw.audio === true)
+    }
+    // Audio input
+    if (raw.input_modalities?.includes('audio') || raw.audio === true) {
         icons.push('🎙️');
-    if (raw.output_modalities?.includes('audio'))
+    }
+    // Audio output
+    if (raw.output_modalities?.includes('audio')) {
         icons.push('🔊');
-    if (raw.reasoning === true)
+    }
+    // Reasoning
+    if (raw.reasoning === true) {
         icons.push('🧠');
-    if (raw.description?.toLowerCase().includes('search') || raw.name?.includes('search'))
+    }
+    // Search capability
+    if (raw.description?.toLowerCase().includes('search') || raw.name?.includes('search')) {
         icons.push('🔍');
-    if (raw.tools === true)
-        icons.push('💻');
+    }
+    // Tools
+    if (raw.tools === true) {
+        icons.push('🛠️');
+    }
+    // Paid only
+    if (raw.paid_only === true) {
+        icons.push('💎');
+    }
     return icons.length > 0 ? ` ${icons.join('')}` : '';
 }
-function formatName(id, censored = true) {
-    let clean = id.replace(/^pollinations\//, '').replace(/-/g, ' ');
+function formatName(id) {
+    let clean = id.replace(/-/g, ' ');
     clean = clean.replace(/\b\w/g, l => l.toUpperCase());
-    if (!censored)
-        clean += " (Uncensored)";
     return clean;
 }
-function mapModel(raw, prefix, namePrefix, nameSuffix = '') {
-    const rawId = raw.id || raw.name;
-    const fullId = prefix + rawId;
+function mapModel(raw) {
+    const rawId = raw.name;
+    // Build display name
     let baseName = raw.description;
     if (!baseName || baseName === rawId) {
-        baseName = formatName(rawId, raw.censored !== false);
+        baseName = formatName(rawId);
     }
+    // Truncate after first " - "
     if (baseName && baseName.includes(' - ')) {
         baseName = baseName.split(' - ')[0].trim();
     }
-    let namePrefixFinal = namePrefix;
-    if (raw.paid_only) {
-        namePrefixFinal = namePrefix.replace('[Enter]', '[💎 Paid]');
-    }
     const capabilityIcons = getCapabilityIcons(raw);
-    const finalName = `${namePrefixFinal}${baseName}${nameSuffix}${capabilityIcons}`;
+    const finalName = `${baseName}${capabilityIcons}`;
+    // Determine modalities for OpenCode
+    const inputMods = raw.input_modalities || ['text'];
+    const outputMods = raw.output_modalities || ['text'];
     const modelObj = {
-        id: fullId,
+        id: rawId, // No prefix! Direct model ID
         name: finalName,
-        // object: 'model',
-        // variants: {}, // POTENTIAL SCHEMA VIOLATION
         modalities: {
-            input: raw.input_modalities || ['text'],
-            output: raw.output_modalities || ['text']
+            input: inputMods,
+            output: outputMods
         },
-        tool_call: false // FORCE DEBUG DISABLE
+        tool_call: raw.tools === true && rawId !== 'nomnom' // NomNom: no tools
     };
-    // Enrichissements
-    /*
-    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 } };
-    }
-    */
+    // Model-specific limits
     if (rawId.includes('nova')) {
         modelObj.limit = { output: 8000, context: 128000 };
     }
-    if (rawId.includes('nomnom') || rawId.includes('scrape')) {
+    if (rawId === 'nomnom') {
         modelObj.limit = { output: 2048, context: 32768 };
+        modelObj.tool_call = false; // NomNom is a router, no external tools
     }
-    if (rawId.includes('chicky')) {
-        modelObj.limit = { output: 8192, context: 8192 };
+    if (rawId.includes('chicky') || rawId.includes('mistral')) {
+        modelObj.limit = { output: 4096, context: 8192 };
+        modelObj.options = { maxTokens: 4096 };
     }
-    /*
-if (rawId.includes('fast') || rawId.includes('flash')) {
-    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;
 }

package/dist/server/proxy.js

@@ -216,15 +216,16 @@ export async function handleChatCompletion(req, res, bodyRaw) {
         // LOAD QUOTA FOR SAFETY CHECKS
         const { getQuotaStatus, formatQuotaForToast } = await import('./quota.js');
         const quota = await getQuotaStatus(false);
-        // A. Resolve Base Target
-        if (actualModel.startsWith('enter/')) {
-            isEnterprise = true;
-            actualModel = actualModel.replace('enter/', '');
+        // A. Resolve Base Target - v6.0: All models go to gen.pollinations.ai
+        // Strip any legacy prefixes for backwards compatibility
+        if (actualModel.startsWith('enter/') || actualModel.startsWith('enter-')) {
+            actualModel = actualModel.replace(/^enter[-/]/, '');
         }
-        else if (actualModel.startsWith('free/')) {
-            isEnterprise = false;
-            actualModel = actualModel.replace('free/', '');
+        else if (actualModel.startsWith('free/') || actualModel.startsWith('free-')) {
+            actualModel = actualModel.replace(/^free[-/]/, '');
         }
+        // v6.0: Everything is enterprise now (requires API key)
+        isEnterprise = true;
         // A.1 PAID MODEL ENFORCEMENT (V5.5 Strategy)
         // Check dynamic list saved by generate-config.ts
         if (isEnterprise) {
@@ -336,24 +337,16 @@ export async function handleChatCompletion(req, res, bodyRaw) {
                 }
             }
         }
-        // C. Construct URL & Headers
-        if (isEnterprise) {
-            if (!config.apiKey) {
-                emitLogToast('error', "Missing API Key for Enterprise Model", 'Proxy Error');
-                res.writeHead(401, { 'Content-Type': 'application/json' });
-                res.end(JSON.stringify({ error: { message: "API Key required for Enterprise models." } }));
-                return;
-            }
-            targetUrl = 'https://gen.pollinations.ai/v1/chat/completions';
-            authHeader = `Bearer ${config.apiKey}`;
-            log(`Routing to ENTERPRISE: ${actualModel}`);
-        }
-        else {
-            targetUrl = 'https://text.pollinations.ai/openai/chat/completions';
-            authHeader = undefined;
-            log(`Routing to FREE: ${actualModel} ${isFallbackActive ? '(FALLBACK)' : ''}`);
-            // emitLogToast('info', `Routing to: FREE UNIVERSE (${actualModel})`, 'Pollinations Routing'); // Too noisy
+        // C. Construct URL & Headers - v6.0: Always gen.pollinations.ai
+        if (!config.apiKey) {
+            emitLogToast('error', "Missing API Key - Use /pollinations connect <key>", 'Proxy Error');
+            res.writeHead(401, { 'Content-Type': 'application/json' });
+            res.end(JSON.stringify({ error: { message: "API Key required. Use /pollinations connect <your_key> to connect." } }));
+            return;
         }
+        targetUrl = 'https://gen.pollinations.ai/v1/chat/completions';
+        authHeader = `Bearer ${config.apiKey}`;
+        log(`Routing to gen.pollinations.ai: ${actualModel}`);
         // NOTIFY SWITCH
         if (isFallbackActive) {
             emitStatusToast('warning', `⚠️ Safety Net: ${actualModel} (${fallbackReason})`, 'Pollinations Safety');
@@ -477,6 +470,14 @@ export async function handleChatCompletion(req, res, bodyRaw) {
                 log(`[Proxy] Gemini Logic: Tools=${proxyBody.tools ? proxyBody.tools.length : 'REMOVED'}, Stops NOT Injected.`);
             }
         }
+        // B5. BEDROCK TOKEN LIMIT FIX
+        if (actualModel.includes("chicky") || actualModel.includes("mistral")) {
+            // Force max_tokens if not present or too high (Bedrock outputs usually max 4k, context 8k+ but strict check)
+            if (!proxyBody.max_tokens || proxyBody.max_tokens > 4096) {
+                proxyBody.max_tokens = 4096;
+                log(`[Proxy] Enforcing max_tokens=4096 for ${actualModel} (Bedrock Limit)`);
+            }
+        }
         // C. GEMINI ID BACKTRACKING & SIGNATURE
         if ((actualModel.includes("gemini") || actualModel === "nomnom") && proxyBody.messages) {
             const lastMsg = proxyBody.messages[proxyBody.messages.length - 1];
@@ -585,10 +586,10 @@ export async function handleChatCompletion(req, res, bodyRaw) {
                 // 2. Notify
                 emitStatusToast('warning', `⚠️ Safety Net: ${actualModel} (${fallbackReason})`, 'Pollinations Safety');
                 emitLogToast('warning', `Recovering from ${fetchRes.status} -> Switching to ${actualModel}`, 'Safety Net');
-                // 3. Re-Prepare Request
-                targetUrl = 'https://text.pollinations.ai/openai/chat/completions';
+                // 3. Re-Prepare Request - v6.0: Stay on gen.pollinations.ai
+                targetUrl = 'https://gen.pollinations.ai/v1/chat/completions';
                 const retryHeaders = { ...headers };
-                delete retryHeaders['Authorization']; // Free = No Auth
+                // Keep Authorization for gen.pollinations.ai
                 const retryBody = { ...proxyBody, model: actualModel };
                 // 4. Retry Fetch
                 const retryRes = await fetchWithRetry(targetUrl, {

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "opencode-pollinations-plugin",
     "displayName": "Pollinations AI (V5.6)",
-    "version": "5.8.4-beta.9",
+    "version": "6.0.0-beta.18",
     "description": "Native Pollinations.ai Provider Plugin for OpenCode",
     "publisher": "pollinations",
     "repository": {