opencode-pollinations-plugin 5.9.0 → 6.0.0-beta.19

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,18 @@ function log(msg) {
     }
     catch (e) { }
 }
-// Port killing removed: Using dynamic ports.
+// === PROXY SERVER (Singleton with Fixed Port) ===
+const DEFAULT_PORT = 18888;
+let existingServer = null;
+let existingPort = 0;
 const startProxy = () => {
+    // Singleton: reuse existing server if already running
+    if (existingServer && existingPort > 0) {
+        log(`[Proxy] Reusing existing server on port ${existingPort}`);
+        return Promise.resolve(existingPort);
+    }
     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,19 +68,106 @@ 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;
-            log(`[Proxy] Started v${require('../package.json').version} (Dynamic Port) on port ${assignedPort}`);
-            resolve(assignedPort);
-        });
-        server.on('error', (e) => {
-            log(`[Proxy] Fatal Error: ${e}`);
-            resolve(0);
-        });
+        // Try fixed port first, fallback to dynamic if occupied
+        const tryListen = (port, fallbackToDynamic) => {
+            server.listen(port, '127.0.0.1', () => {
+                // @ts-ignore
+                const assignedPort = server.address().port;
+                existingServer = server;
+                existingPort = assignedPort;
+                log(`[Proxy] Started v${require('../package.json').version} on port ${assignedPort}${port === 0 ? ' (dynamic fallback)' : ''}`);
+                resolve(assignedPort);
+            });
+            server.on('error', (e) => {
+                if (e.code === 'EADDRINUSE' && fallbackToDynamic) {
+                    log(`[Proxy] Port ${port} in use, falling back to dynamic port`);
+                    server.removeAllListeners('error');
+                    tryListen(0, false); // Try dynamic port
+                }
+                else {
+                    log(`[Proxy] Fatal Error: ${e}`);
+                    resolve(0);
+                }
+            });
+        };
+        tryListen(DEFAULT_PORT, true);
     });
 };
+// === 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 +178,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,12 +190,14 @@ export const PollinationsPlugin = async (ctx) => {
             }
             if (!config.provider)
                 config.provider = {};
-            // Dynamic Provider Name
             const version = require('../package.json').version;
             config.provider['pollinations'] = {
-                id: 'pollinations',
+                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.`);

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,8 +1,34 @@
+/**
+ * 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;
@@ -12,6 +38,7 @@ interface OpenCodeModel {
         input?: string[];
         output?: string[];
     };
+    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,11 +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 CONFIG_FILE = path.join(CONFIG_DIR_POLLI, 'config.json');
 // --- LOGGING ---
 const LOG_FILE = '/tmp/opencode_pollinations_config.log';
 function log(msg) {
@@ -13,15 +14,18 @@ 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) { }
-    // Force output to stderr for CLI visibility if needed, but clean.
 }
-// Fetch Helper
+// --- NETWORK HELPER ---
 function fetchJson(url, headers = {}) {
     return new Promise((resolve, reject) => {
-        const req = https.get(url, { headers }, (res) => {
+        const finalHeaders = {
+            ...headers,
+            'User-Agent': 'Mozilla/5.0 (compatible; OpenCode-Pollinations/6.0; +https://opencode.ai)'
+        };
+        const req = https.get(url, { headers: finalHeaders }, (res) => {
             let data = '';
             res.on('data', chunk => data += chunk);
             res.on('end', () => {
@@ -31,7 +35,7 @@ function fetchJson(url, headers = {}) {
                 }
                 catch (e) {
                     log(`JSON Parse Error for ${url}: ${e}`);
-                    resolve([]); // Fail safe -> empty list
+                    resolve([]);
                 }
             });
         });
@@ -39,193 +43,132 @@ function fetchJson(url, headers = {}) {
             log(`Network Error for ${url}: ${e.message}`);
             reject(e);
         });
-        req.setTimeout(5000, () => {
+        req.setTimeout(15000, () => {
             req.destroy();
             reject(new Error('Timeout'));
         });
     });
 }
-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) {
+// --- GENERATOR LOGIC ---
+export async function generatePollinationsConfig(forceApiKey) {
     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;
-    // 1. FREE UNIVERSE
+    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
     try {
-        // 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] ');
+        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);
             modelsOutput.push(mapped);
         });
-        log(`Fetched ${modelsOutput.length} Free models.`);
+        log(`Total models registered: ${modelsOutput.length}`);
+        log(`Model IDs: ${modelsOutput.map(m => m.id).join(', ')}`);
     }
     catch (e) {
-        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: {} });
-        }
+        log(`Error fetching models: ${e.message}`);
+        // Return connect placeholder only on error
     }
     return modelsOutput;
 }
-// --- CAPABILITY ICONS ---
+// --- UTILS ---
 function getCapabilityIcons(raw) {
     const icons = [];
-    // Vision: accepts images
-    if (raw.input_modalities?.includes('image'))
+    // Vision: check both input_modalities and legacy vision flag
+    if (raw.input_modalities?.includes('image') || raw.vision === true) {
         icons.push('👁️');
-    // Audio Input
-    if (raw.input_modalities?.includes('audio'))
+    }
+    // Audio input
+    if (raw.input_modalities?.includes('audio') || raw.audio === true) {
         icons.push('🎙️');
-    // Audio Output
-    if (raw.output_modalities?.includes('audio'))
+    }
+    // Audio output
+    if (raw.output_modalities?.includes('audio')) {
         icons.push('🔊');
-    // Reasoning capability
-    if (raw.reasoning === true)
+    }
+    // Reasoning
+    if (raw.reasoning === true) {
         icons.push('🧠');
-    // Web Search (from description)
-    if (raw.description?.toLowerCase().includes('search') ||
-        raw.name?.includes('search') ||
-        raw.name?.includes('perplexity')) {
+    }
+    // Search capability
+    if (raw.description?.toLowerCase().includes('search') || raw.name?.includes('search')) {
         icons.push('🔍');
     }
-    // Tool/Function calling
-    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('')}` : '';
 }
-// --- 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/")
+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
     let baseName = raw.description;
     if (!baseName || baseName === rawId) {
-        baseName = formatName(rawId, raw.censored !== false);
+        baseName = formatName(rawId);
     }
-    // CLEANUP: Simple Truncation Rule (Requested by User)
-    // "Start from left, find ' - ', delete everything after."
+    // Truncate after first " - "
     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 = `${namePrefixFinal}${baseName}${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: {},
-        // Declare modalities for OpenCode vision support
         modalities: {
-            input: raw.input_modalities || ['text'],
-            output: raw.output_modalities || ['text']
-        }
+            input: inputMods,
+            output: outputMods
+        },
+        tool_call: raw.tools === true && rawId !== 'nomnom' // NomNom: no tools
     };
-    // --- 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.
+    // Model-specific limits
     if (rawId.includes('nova')) {
-        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 } };
-    }
-    // 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
-        };
+        modelObj.limit = { output: 8000, context: 128000 };
+    }
+    if (rawId === 'nomnom') {
+        modelObj.limit = { output: 2048, context: 32768 };
+        modelObj.tool_call = false; // NomNom is a router, no external tools
     }
-    if (rawId.includes('fast') || rawId.includes('flash') || rawId.includes('lite')) {
-        if (!rawId.includes('gemini')) {
-            modelObj.variants.speed = { options: { thinking: { disabled: true } } };
-        }
+    if (rawId.includes('chicky') || rawId.includes('mistral')) {
+        modelObj.limit = { output: 4096, context: 8192 };
+        modelObj.options = { maxTokens: 4096 };
     }
+    log(`[Mapped] ${modelObj.id} → ${modelObj.name} | tools=${modelObj.tool_call} | modalities=${JSON.stringify(modelObj.modalities)}`);
     return modelObj;
 }

package/dist/server/models-seed.d.ts

@@ -0,0 +1,18 @@
+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;
+    community?: boolean;
+    censored?: boolean;
+    [key: string]: any;
+}
+export declare const FREE_MODELS_SEED: PollinationsModel[];

package/dist/server/models-seed.js

@@ -0,0 +1,55 @@
+export const FREE_MODELS_SEED = [
+    {
+        "name": "gemini",
+        "description": "Gemini 2.5 Flash Lite",
+        "tier": "anonymous",
+        "tools": true,
+        "input_modalities": ["text", "image"],
+        "output_modalities": ["text"],
+        "vision": true
+    },
+    {
+        "name": "mistral",
+        "description": "Mistral Small 3.2 24B",
+        "tier": "anonymous",
+        "tools": true,
+        "input_modalities": ["text"],
+        "output_modalities": ["text"],
+        "vision": false
+    },
+    {
+        "name": "openai-fast",
+        "description": "GPT-OSS 20B Reasoning LLM (OVH)",
+        "tier": "anonymous",
+        "tools": true,
+        "input_modalities": ["text"],
+        "output_modalities": ["text"],
+        "vision": false,
+        "reasoning": true
+    },
+    {
+        "name": "bidara",
+        "description": "BIDARA (Biomimetic Designer)",
+        "tier": "anonymous",
+        "community": true,
+        "input_modalities": ["text", "image"],
+        "output_modalities": ["text"],
+        "vision": true
+    },
+    {
+        "name": "chickytutor",
+        "description": "ChickyTutor AI Language Tutor",
+        "tier": "anonymous",
+        "community": true,
+        "input_modalities": ["text"],
+        "output_modalities": ["text"]
+    },
+    {
+        "name": "midijourney",
+        "description": "MIDIjourney",
+        "tier": "anonymous",
+        "community": true,
+        "input_modalities": ["text"],
+        "output_modalities": ["text"]
+    }
+];

package/dist/server/proxy.js

@@ -153,6 +153,11 @@ export async function handleChatCompletion(req, res, bodyRaw) {
         const config = loadConfig();
         // DEBUG: Trace Config State for Hot Reload verification
         log(`[Proxy Request] Config Loaded. Mode: ${config.mode}, HasKey: ${!!config.apiKey}, KeyLength: ${config.apiKey ? config.apiKey.length : 0}`);
+        // SPY LOGGING
+        try {
+            fs.appendFileSync('/tmp/opencode_spy.log', `\n\n=== REQUEST ${new Date().toISOString()} ===\nMODEL: ${body.model}\nBODY:\n${JSON.stringify(body, null, 2)}\n==========================\n`);
+        }
+        catch (e) { }
         // 0. COMMAND HANDLING
         if (body.messages && body.messages.length > 0) {
             const lastMsg = body.messages[body.messages.length - 1];
@@ -211,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) {
@@ -331,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');
@@ -416,13 +414,32 @@ export async function handleChatCompletion(req, res, bodyRaw) {
             // Restore Tools but REMOVE conflicting ones (Search)
             // B. GEMINI UNIFIED FIX (Free, Fast, Pro, Enterprise, Legacy)
             // Handles: "tools" vs "grounding" conflicts, and "infinite loops" via Stop Sequences.
+            // GLOBAL BEDROCK FIX (All Models)
+            // Check if history has tools but current request misses tools definition.
+            // This happens when OpenCode sends the Tool Result (optimisation),
+            // but Bedrock requires toolConfig to validate the history.
+            const hasToolHistory = proxyBody.messages?.some((m) => m.role === 'tool' || m.tool_calls);
+            if (hasToolHistory && (!proxyBody.tools || proxyBody.tools.length === 0)) {
+                // Inject Shim Tool to satisfy Bedrock
+                proxyBody.tools = [{
+                        type: 'function',
+                        function: {
+                            name: '_bedrock_compatibility_shim',
+                            description: 'Internal system tool to satisfy Bedrock strict toolConfig requirement. Do not use.',
+                            parameters: { type: 'object', properties: {} }
+                        }
+                    }];
+                log(`[Proxy] Bedrock Fix: Injected shim tool for ${actualModel} (History has tools, Request missing tools)`);
+            }
             // B. GEMINI UNIFIED FIX (Free, Fast, Pro, Enterprise, Legacy)
             // Fixes "Multiple tools" error (Vertex) and "JSON body validation failed" (v5.3.5 regression)
-            else if (actualModel.includes("gemini")) {
+            // Added ChickyTutor (Claude/Gemini based) to fix "toolConfig must be defined" error.
+            else if (actualModel.includes("gemini") || actualModel.includes("chickytutor")) {
                 let hasFunctions = false;
                 if (proxyBody.tools && Array.isArray(proxyBody.tools)) {
                     hasFunctions = proxyBody.tools.some((t) => t.type === 'function' || t.function);
                 }
+                // Old Shim logic removed (moved up)
                 if (hasFunctions) {
                     // 1. Strict cleanup of 'google_search' tool
                     proxyBody.tools = proxyBody.tools.filter((t) => {
@@ -453,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];
@@ -561,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.9.0",
+    "version": "6.0.0-beta.19",
     "description": "Native Pollinations.ai Provider Plugin for OpenCode",
     "publisher": "pollinations",
     "repository": {
@@ -55,4 +55,4 @@
         "@types/node": "^20.0.0",
         "typescript": "^5.0.0"
     }
-}
+}

package/dist/debug_check.js

@@ -1,36 +0,0 @@
-import * as https from 'https';
-
-function checkEndpoint(ep, key) {
-    return new Promise((resolve) => {
-        console.log(`Checking ${ep}...`);
-        const req = https.request({
-            hostname: 'gen.pollinations.ai',
-            path: ep,
-            method: 'GET',
-            headers: { 'Authorization': `Bearer ${key}` }
-        }, (res) => {
-            console.log(`Status Code: ${res.statusCode}`);
-            let data = '';
-            res.on('data', chunk => data += chunk);
-            res.on('end', () => {
-                console.log(`Headers:`, res.headers);
-                console.log(`Body Full: ${data}`);
-                if (res.statusCode === 200) resolve({ ok: true, body: data });
-                else resolve({ ok: false, status: res.statusCode, body: data });
-            });
-        });
-        req.on('error', (e) => {
-            console.log(`Error: ${e.message}`);
-            resolve({ ok: false, status: e.message || 'Error' });
-        });
-        req.setTimeout(10000, () => req.destroy());
-        req.end();
-    });
-}
-
-const KEY = "plln_sk_F7a4RcBG4AVCeBSo6lnS36EKwm0nPn1O";
-
-(async () => {
-    const res = await checkEndpoint('/account/profile', KEY);
-    console.log('Result:', res);
-})();

package/dist/provider.d.ts

@@ -1 +0,0 @@
-export declare const createPollinationsFetch: (apiKey: string) => (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>;

package/dist/provider.js

@@ -1,135 +0,0 @@
-// Removed invalid imports
-import * as fs from 'fs';
-// --- Sanitization Helpers (Ported from Gateway/Upstream) ---
-function safeId(id) {
-    if (!id)
-        return id;
-    if (id.length > 30)
-        return id.substring(0, 30);
-    return id;
-}
-function logDebug(message, data) {
-    try {
-        const timestamp = new Date().toISOString();
-        let logMsg = `[${timestamp}] ${message}`;
-        if (data) {
-            logMsg += `\n${JSON.stringify(data, null, 2)}`;
-        }
-        fs.appendFileSync('/tmp/opencode_pollinations_debug.log', logMsg + '\n\n');
-    }
-    catch (e) {
-        // ignore logging errors
-    }
-}
-function sanitizeTools(tools) {
-    if (!Array.isArray(tools))
-        return tools;
-    const cleanSchema = (schema) => {
-        if (!schema || typeof schema !== "object")
-            return;
-        if (schema.optional !== undefined)
-            delete schema.optional;
-        if (schema.ref !== undefined)
-            delete schema.ref;
-        if (schema["$ref"] !== undefined)
-            delete schema["$ref"];
-        if (schema.properties) {
-            for (const key in schema.properties)
-                cleanSchema(schema.properties[key]);
-        }
-        if (schema.items)
-            cleanSchema(schema.items);
-    };
-    return tools.map((tool) => {
-        const newTool = { ...tool };
-        if (newTool.function && newTool.function.parameters) {
-            cleanSchema(newTool.function.parameters);
-        }
-        return newTool;
-    });
-}
-function filterTools(tools, maxCount = 120) {
-    if (!Array.isArray(tools))
-        return [];
-    if (tools.length <= maxCount)
-        return tools;
-    const priorities = [
-        "bash", "read", "write", "edit", "webfetch", "glob", "grep",
-        "searxng_remote_search", "deepsearch_deep_search", "google_search",
-        "task", "todowrite"
-    ];
-    const priorityTools = tools.filter((t) => priorities.includes(t.function.name));
-    const otherTools = tools.filter((t) => !priorities.includes(t.function.name));
-    const slotsLeft = maxCount - priorityTools.length;
-    const othersKept = otherTools.slice(0, Math.max(0, slotsLeft));
-    logDebug(`[POLLI-PLUGIN] Filtering tools: ${tools.length} -> ${priorityTools.length + othersKept.length}`);
-    return [...priorityTools, ...othersKept];
-}
-// --- Fetch Implementation ---
-export const createPollinationsFetch = (apiKey) => async (input, init) => {
-    let url = input.toString();
-    const options = init || {};
-    let body = null;
-    if (options.body && typeof options.body === "string") {
-        try {
-            body = JSON.parse(options.body);
-        }
-        catch (e) {
-            // Not JSON, ignore
-        }
-    }
-    // --- INTERCEPTION & SANITIZATION ---
-    if (body) {
-        let model = body.model || "";
-        // 0. Model Name Normalization
-        if (typeof model === "string" && model.startsWith("pollinations/enter/")) {
-            body.model = model.replace("pollinations/enter/", "");
-            model = body.model;
-        }
-        // FIX: Remove stream_options (causes 400 on some OpenAI proxies)
-        if (body.stream_options) {
-            delete body.stream_options;
-        }
-        // 1. Azure Tool Limit Fix
-        if ((model.includes("openai") || model.includes("gpt")) && body.tools) {
-            if (body.tools.length > 120) {
-                body.tools = filterTools(body.tools, 120);
-            }
-        }
-        // 2. Vertex/Gemini Schema Fix
-        if (model.includes("gemini") && body.tools) {
-            body.tools = sanitizeTools(body.tools);
-        }
-        // Re-serialize body
-        options.body = JSON.stringify(body);
-    }
-    // Ensure Headers
-    const headers = new Headers(options.headers || {});
-    headers.set("Authorization", `Bearer ${apiKey}`);
-    headers.set("Content-Type", "application/json");
-    options.headers = headers;
-    logDebug(`Req: ${url}`, body);
-    try {
-        const response = await global.fetch(url, options);
-        // Log response status
-        // We clone to read text for debugging errors
-        if (!response.ok) {
-            try {
-                const clone = response.clone();
-                const text = await clone.text();
-                logDebug(`Res (Error): ${response.status}`, text);
-            }
-            catch (e) {
-                logDebug(`Res (Error): ${response.status} (Read failed)`);
-            }
-        }
-        else {
-            logDebug(`Res (OK): ${response.status}`);
-        }
-        return response;
-    }
-    catch (e) {
-        logDebug(`Fetch Error: ${e.message}`);
-        throw e;
-    }
-};

package/dist/provider_v1.d.ts

@@ -1 +0,0 @@
-export declare const createPollinationsFetch: (apiKey: string) => (input: RequestInfo | URL, init?: RequestInit) => Promise<Response>;

package/dist/provider_v1.js

@@ -1,135 +0,0 @@
-// Removed invalid imports
-import * as fs from 'fs';
-// --- Sanitization Helpers (Ported from Gateway/Upstream) ---
-function safeId(id) {
-    if (!id)
-        return id;
-    if (id.length > 30)
-        return id.substring(0, 30);
-    return id;
-}
-function logDebug(message, data) {
-    try {
-        const timestamp = new Date().toISOString();
-        let logMsg = `[${timestamp}] ${message}`;
-        if (data) {
-            logMsg += `\n${JSON.stringify(data, null, 2)}`;
-        }
-        fs.appendFileSync('/tmp/opencode_pollinations_debug.log', logMsg + '\n\n');
-    }
-    catch (e) {
-        // ignore logging errors
-    }
-}
-function sanitizeTools(tools) {
-    if (!Array.isArray(tools))
-        return tools;
-    const cleanSchema = (schema) => {
-        if (!schema || typeof schema !== "object")
-            return;
-        if (schema.optional !== undefined)
-            delete schema.optional;
-        if (schema.ref !== undefined)
-            delete schema.ref;
-        if (schema["$ref"] !== undefined)
-            delete schema["$ref"];
-        if (schema.properties) {
-            for (const key in schema.properties)
-                cleanSchema(schema.properties[key]);
-        }
-        if (schema.items)
-            cleanSchema(schema.items);
-    };
-    return tools.map((tool) => {
-        const newTool = { ...tool };
-        if (newTool.function && newTool.function.parameters) {
-            cleanSchema(newTool.function.parameters);
-        }
-        return newTool;
-    });
-}
-function filterTools(tools, maxCount = 120) {
-    if (!Array.isArray(tools))
-        return [];
-    if (tools.length <= maxCount)
-        return tools;
-    const priorities = [
-        "bash", "read", "write", "edit", "webfetch", "glob", "grep",
-        "searxng_remote_search", "deepsearch_deep_search", "google_search",
-        "task", "todowrite"
-    ];
-    const priorityTools = tools.filter((t) => priorities.includes(t.function.name));
-    const otherTools = tools.filter((t) => !priorities.includes(t.function.name));
-    const slotsLeft = maxCount - priorityTools.length;
-    const othersKept = otherTools.slice(0, Math.max(0, slotsLeft));
-    logDebug(`[POLLI-PLUGIN] Filtering tools: ${tools.length} -> ${priorityTools.length + othersKept.length}`);
-    return [...priorityTools, ...othersKept];
-}
-// --- Fetch Implementation ---
-export const createPollinationsFetch = (apiKey) => async (input, init) => {
-    let url = input.toString();
-    const options = init || {};
-    let body = null;
-    if (options.body && typeof options.body === "string") {
-        try {
-            body = JSON.parse(options.body);
-        }
-        catch (e) {
-            // Not JSON, ignore
-        }
-    }
-    // --- INTERCEPTION & SANITIZATION ---
-    if (body) {
-        let model = body.model || "";
-        // 0. Model Name Normalization
-        if (typeof model === "string" && model.startsWith("pollinations/enter/")) {
-            body.model = model.replace("pollinations/enter/", "");
-            model = body.model;
-        }
-        // FIX: Remove stream_options (causes 400 on some OpenAI proxies)
-        if (body.stream_options) {
-            delete body.stream_options;
-        }
-        // 1. Azure Tool Limit Fix
-        if ((model.includes("openai") || model.includes("gpt")) && body.tools) {
-            if (body.tools.length > 120) {
-                body.tools = filterTools(body.tools, 120);
-            }
-        }
-        // 2. Vertex/Gemini Schema Fix
-        if (model.includes("gemini") && body.tools) {
-            body.tools = sanitizeTools(body.tools);
-        }
-        // Re-serialize body
-        options.body = JSON.stringify(body);
-    }
-    // Ensure Headers
-    const headers = new Headers(options.headers || {});
-    headers.set("Authorization", `Bearer ${apiKey}`);
-    headers.set("Content-Type", "application/json");
-    options.headers = headers;
-    logDebug(`Req: ${url}`, body);
-    try {
-        const response = await global.fetch(url, options);
-        // Log response status
-        // We clone to read text for debugging errors
-        if (!response.ok) {
-            try {
-                const clone = response.clone();
-                const text = await clone.text();
-                logDebug(`Res (Error): ${response.status}`, text);
-            }
-            catch (e) {
-                logDebug(`Res (Error): ${response.status} (Read failed)`);
-            }
-        }
-        else {
-            logDebug(`Res (OK): ${response.status}`);
-        }
-        return response;
-    }
-    catch (e) {
-        logDebug(`Fetch Error: ${e.message}`);
-        throw e;
-    }
-};

package/dist/test-require.js

@@ -1,9 +0,0 @@
-import { createRequire } from 'module';
-const require = createRequire(import.meta.url);
-try {
-    const pkg = require('../package.json');
-    console.log("SUCCESS: Loaded version " + pkg.version);
-} catch (e) {
-    console.error("FAILURE:", e.message);
-    process.exit(1);
-}