@kolbo/mcp 1.30.4 → 1.30.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kolbo/mcp",
-  "version": "1.30.4",
+  "version": "1.30.6",
   "description": "Kolbo AI MCP Server - Generate images, videos, music, speech, and sound effects from Claude Code",
   "main": "src/index.js",
   "bin": {

package/src/apps/index.js

@@ -48,16 +48,29 @@ function widgetHtml(uri) {
 // img/script/style/font/media-src; connectDomains to connect-src.
 const WIDGET_CSP = {
   resourceDomains: [
-    'https://*.kolbo.ai',                       // media.kolbo.ai CDN + app.kolbo.ai model icons
-    'https://*.digitaloceanspaces.com',         // DO Spaces buckets (all envs)
-    'https://*.cdn.digitaloceanspaces.com',     // DO Spaces CDN endpoints
+    // Exact hosts FIRST — not every host CSP implementation honors wildcards,
+    // and a declared-but-unmatched allowlist blocks harder than no declaration.
+    'https://api.kolbo.ai',                     // model icons (/assets)
+    'https://app.kolbo.ai',
+    'https://media.kolbo.ai',                   // media CDN (prod)
+    'https://media-staging.kolbo.ai',
+    'https://media-dev.kolbo.ai',
+    'https://kolboai-production.ams3.digitaloceanspaces.com',
+    'https://kolboai-production.ams3.cdn.digitaloceanspaces.com',
+    'https://kolboai-development.ams3.digitaloceanspaces.com',
+    'https://kolboai-development.ams3.cdn.digitaloceanspaces.com',
+    'https://kolbo-general-media.fra1.cdn.digitaloceanspaces.com',
     'https://fonts.googleapis.com',             // Inter / JetBrains Mono stylesheet
     'https://fonts.gstatic.com',                // font files
     'https://images.pexels.com',                // stock thumbnails
+    // Wildcards as a second layer for hosts that do support them.
+    'https://*.kolbo.ai',
+    'https://*.digitaloceanspaces.com',
+    'https://*.cdn.digitaloceanspaces.com',
     'https://*.pexels.com',
     'https://*.pixabay.com',
     'https://*.sketchfab.com',
-    'https://*.cloudfront.net',                 // provider-hosted previews
+    'https://*.cloudfront.net',
   ],
   connectDomains: [],
 };
@@ -156,14 +169,24 @@ async function modelInfoMap(client) {
       // Real p75 wall-clock estimate mined from production creditUsages —
       // the same source the in-app countdowns use. No estimate → no ETA shown.
       const eta = Number(m.estimatedDurationSeconds || m.estimated_duration_seconds) || null;
-      const info = { icon, eta };
-      if (m.name) byKey.set(String(m.name).toLowerCase(), info);
+      const info = { icon, eta, id: m.identifier || null };
+      // Display names collide across variants ("Nano Banana 2" names both the
+      // t2i model and its editing sibling) — on collision keep the model with
+      // the SHORTEST identifier (the base model), deterministically.
+      const setName = (k) => {
+        const prev = byKey.get(k);
+        if (!prev || !prev.id || (info.id && info.id.length < prev.id.length)) byKey.set(k, info);
+      };
+      if (m.name) setName(String(m.name).toLowerCase());
       if (m.identifier) byKey.set(String(m.identifier).toLowerCase(), info);
     }
   } catch (_) {
     /* fail open — widgets fall back to monogram chips, no ETA */
   }
-  infoCache.set(cacheKey, { at: Date.now(), byKey });
+  // Never cache an empty map: the first request in a fresh worker (typical
+  // right after a deploy restart) can fail transiently, and caching that
+  // failure blanks every model icon for the TTL window.
+  if (byKey.size > 0) infoCache.set(cacheKey, { at: Date.now(), byKey });
   return byKey;
 }
 
@@ -179,6 +202,31 @@ async function modelIcon(client, modelName) {
   return (await modelInfo(client, modelName)).icon;
 }
 
+/**
+ * Lenient model-identifier resolution for LLM-supplied model args.
+ * Users say "z-image"; the real identifier is "z-image/turbo" — the backend
+ * has no fuzzy matching on generation routes and fails deep in credit
+ * reservation. Resolve here: exact name/identifier hit → its identifier;
+ * else a UNIQUE identifier prefix match ("z-image" → "z-image/turbo");
+ * ambiguous or unknown → pass through unchanged (API stays source of truth).
+ */
+async function canonicalModelId(client, input) {
+  if (!input || typeof input !== 'string') return input;
+  try {
+    const map = await modelInfoMap(client);
+    const key = input.toLowerCase().trim();
+    const hit = map.get(key) || map.get(key.replace(/\s+/g, '-'));
+    if (hit && hit.id) return hit.id;
+    const ids = new Set();
+    for (const info of map.values()) {
+      const id = (info.id || '').toLowerCase();
+      if (id && (id.startsWith(key + '/') || id.startsWith(key + '-'))) ids.add(info.id);
+    }
+    if (ids.size === 1) return [...ids][0];
+  } catch (_) { /* fail open */ }
+  return input;
+}
+
 /* ------------------------------------------------------------------ */
 /* Declaration-level widget metadata                                    */
 /* ------------------------------------------------------------------ */
@@ -243,6 +291,7 @@ module.exports = {
   modelIcon,
   modelInfo,
   modelInfoMap,
+  canonicalModelId,
   resolveAvatarUrl,
   widgetHtml, // exported for smoke tests
 };

package/src/index.js

@@ -97,7 +97,12 @@ function createServer(opts = {}) {
 
   const server = new McpServer({
     name: 'kolbo',
-    version: '1.0.0'
+    title: 'Kolbo',
+    version: '1.0.0',
+    websiteUrl: 'https://kolbo.ai',
+    // Connector avatar for hosts that render server icons (claude.ai tool
+    // headers show this instead of a letter monogram).
+    icons: [{ src: 'https://api.kolbo.ai/assets/kolbo-ai.png', mimeType: 'image/png', sizes: ['512x512'] }]
   });
 
   // Register all tools. `inlineImages` (off by default) is opt-in: only the

package/src/tools/generate.js

@@ -7,7 +7,7 @@ const { z } = require('zod');
 const FormData = require('form-data');
 const { pollUntilDone } = require('../polling');
 const { resolveToBuffer, creditFields, projectIdField, inlineImageBlocks, uiGenerating, uiCompleted, appsEnabled } = require('./_shared');
-const { UI, uiResult } = require('../apps');
+const { UI, uiResult, canonicalModelId } = require('../apps');
 
 function registerGenerateTools(server, client, options = {}) {
   // Only enabled by hosts that explicitly opt in (the remote HTTP connector).
@@ -37,6 +37,7 @@ function registerGenerateTools(server, client, options = {}) {
       project_id: projectIdField
     },
     async ({ prompt, model, aspect_ratio, enhance_prompt, num_images, reference_images, visual_dna_ids, moodboard_id, enable_web_search, resolution, preset_id, project_id }) => {
+      model = await canonicalModelId(client, model); // lenient id resolution ("z-image" → "z-image/turbo")
       const gen = await client.post('/v1/generate/image', {
         prompt, model, aspect_ratio, enhance_prompt, num_images,
         reference_images, visual_dna_ids, moodboard_id, enable_web_search, resolution, preset_id, project_id
@@ -87,6 +88,7 @@ function registerGenerateTools(server, client, options = {}) {
       project_id: projectIdField
     },
     async ({ prompt, model, source_images, aspect_ratio, enhance_prompt, num_images, visual_dna_ids, moodboard_id, enable_web_search, resolution, project_id }) => {
+      model = await canonicalModelId(client, model); // lenient id resolution ("z-image" → "z-image/turbo")
       const gen = await client.post('/v1/generate/image-edit', {
         prompt, model, source_images, aspect_ratio, enhance_prompt, num_images,
         visual_dna_ids, moodboard_id, enable_web_search, resolution, project_id
@@ -143,6 +145,7 @@ function registerGenerateTools(server, client, options = {}) {
       project_id: projectIdField
     },
     async ({ prompt, scene_count, model, aspect_ratio, workflow_type, duration, enhance_prompt, reference_images, visual_dna_ids, moodboard_id, moodboard_ids, resolution, project_id }) => {
+      model = await canonicalModelId(client, model); // lenient id resolution ("z-image" → "z-image/turbo")
       const gen = await client.post('/v1/generate/creative-director', {
         prompt, scene_count, model, aspect_ratio, workflow_type, duration,
         enhance_prompt, reference_images, visual_dna_ids, moodboard_id, moodboard_ids, resolution, project_id
@@ -204,6 +207,7 @@ function registerGenerateTools(server, client, options = {}) {
       project_id: projectIdField
     },
     async ({ prompt, model, aspect_ratio, duration, enhance_prompt, reference_images, resolution, preset_id, project_id }) => {
+      model = await canonicalModelId(client, model); // lenient id resolution ("z-image" → "z-image/turbo")
       const gen = await client.post('/v1/generate/video', {
         prompt, model, aspect_ratio, duration, enhance_prompt, reference_images, resolution, preset_id, project_id
       });
@@ -252,6 +256,7 @@ function registerGenerateTools(server, client, options = {}) {
       project_id: projectIdField
     },
     async ({ image_url, prompt, model, aspect_ratio, duration, enhance_prompt, visual_dna_ids, resolution, project_id }) => {
+      model = await canonicalModelId(client, model); // lenient id resolution ("z-image" → "z-image/turbo")
       const gen = await client.post('/v1/generate/video/from-image', {
         image_url, prompt, model, aspect_ratio, duration, enhance_prompt, visual_dna_ids, resolution, project_id
       });
@@ -299,6 +304,7 @@ function registerGenerateTools(server, client, options = {}) {
       project_id: projectIdField
     },
     async ({ prompt, model, style, instrumental, lyrics, vocal_gender, enhance_prompt, preset_id, project_id }) => {
+      model = await canonicalModelId(client, model); // lenient id resolution ("z-image" → "z-image/turbo")
       const gen = await client.post('/v1/generate/music', {
         prompt, model, style, instrumental, lyrics, vocal_gender, enhance_prompt, preset_id, project_id
       });
@@ -340,6 +346,7 @@ function registerGenerateTools(server, client, options = {}) {
       project_id: projectIdField
     },
     async ({ text, voice, model, language, project_id }) => {
+      model = await canonicalModelId(client, model); // lenient id resolution ("z-image" → "z-image/turbo")
       const gen = await client.post('/v1/generate/speech', {
         text, voice, model, language, project_id
       });
@@ -380,6 +387,7 @@ function registerGenerateTools(server, client, options = {}) {
       project_id: projectIdField
     },
     async ({ prompt, model, duration, prompt_influence, project_id }) => {
+      model = await canonicalModelId(client, model); // lenient id resolution ("z-image" → "z-image/turbo")
       const gen = await client.post('/v1/generate/sound', {
         prompt, model, duration, prompt_influence, project_id
       });
@@ -451,6 +459,7 @@ function registerGenerateTools(server, client, options = {}) {
       project_id: projectIdField
     },
     async ({ prompt, model, reference_images, reference_videos, audio_url, files, duration, aspect_ratio, motion, preset_id, enhance_prompt, visual_dna_ids, resolution, project_id }) => {
+      model = await canonicalModelId(client, model); // lenient id resolution ("z-image" → "z-image/turbo")
       if (!prompt) throw new Error('prompt is required');
 
       let startResponse;
@@ -527,6 +536,7 @@ function registerGenerateTools(server, client, options = {}) {
       project_id: projectIdField
     },
     async ({ first_frame_url, last_frame_url, first_frame, last_frame, prompt, model, duration, aspect_ratio, enhance_prompt, visual_dna_ids, resolution, project_id }) => {
+      model = await canonicalModelId(client, model); // lenient id resolution ("z-image" → "z-image/turbo")
       const urlMode = first_frame_url && last_frame_url;
       const fileMode = first_frame && last_frame;
       if (!urlMode && !fileMode) {
@@ -614,6 +624,7 @@ function registerGenerateTools(server, client, options = {}) {
       project_id: projectIdField
     },
     async ({ source, audio, text_prompt, model, bounding_box_target, sync_mode, model_mode, emotion, temperature, occlusion_detection_enabled, active_speaker_detection, project_id }) => {
+      model = await canonicalModelId(client, model); // lenient id resolution ("z-image" → "z-image/turbo")
       if (!source) throw new Error('source is required (URL or absolute local path to image/video)');
       if (!audio) throw new Error('audio is required (URL or absolute local path to audio file)');
 
@@ -732,6 +743,7 @@ function registerGenerateTools(server, client, options = {}) {
       project_id: projectIdField
     },
     async ({ source_video, prompt, model, aspect_ratio, duration, enhance_prompt, visual_dna_ids, resolution, reference_images, reference_videos, elements, preset, source_language, translation_language, srt_content, srt_file_url, vocabulary, customization, project_id }) => {
+      model = await canonicalModelId(client, model); // lenient id resolution ("z-image" → "z-image/turbo")
       if (!source_video) throw new Error('source_video is required');
 
       const isUrl = /^https?:\/\//i.test(source_video);
@@ -868,6 +880,7 @@ function registerGenerateTools(server, client, options = {}) {
       project_id: projectIdField
     },
     async ({ prompt, reference_images, mode, texture_prompt, model, topology, target_polycount, enable_tpose, enable_pbr, project_id }) => {
+      model = await canonicalModelId(client, model); // lenient id resolution ("z-image" → "z-image/turbo")
       if (!prompt && !(reference_images && reference_images.length > 0)) {
         throw new Error('Provide prompt (text mode) or reference_images (single/multi mode)');
       }
@@ -927,6 +940,7 @@ function registerGenerateTools(server, client, options = {}) {
       project_id: projectIdField
     },
     async ({ image_url, operation, model, scale, aspect_ratio, skin_strength, prompt, project_id }) => {
+      model = await canonicalModelId(client, model); // lenient id resolution ("z-image" → "z-image/turbo")
       if (operation === 'magic_edit' && !prompt) throw new Error('prompt is required for magic_edit operation');
       if (operation === 'reframe' && !aspect_ratio) throw new Error('aspect_ratio is required for reframe operation');
 
@@ -979,6 +993,7 @@ function registerGenerateTools(server, client, options = {}) {
       project_id: projectIdField
     },
     async ({ video_url, operation, model, aspect_ratio, scale, prompt, image_url, audio_url, duration, mode, project_id }) => {
+      model = await canonicalModelId(client, model); // lenient id resolution ("z-image" → "z-image/turbo")
       if (operation === 'magic_edit' && !prompt) throw new Error('prompt is required for magic_edit');
       if (operation === 'generate_audio' && !prompt) throw new Error('prompt is required for generate_audio');
       if (operation === 'reframe' && !aspect_ratio) throw new Error('aspect_ratio is required for reframe');