@deerdesign/deertools 1.2.26 → 1.2.31

package/src/skills-hub.js

@@ -5,8 +5,11 @@ const crypto = require('crypto');
 const credentials = require('./credentials');
 const { fetchText } = require('./http');
 const { parseFrontmatterName } = require('./openapi');
+const { compareSemver } = require('./updater');
 
 const DEFAULT_API_BASE = 'https://ezspmlsnmxuhtzvwrnoj.supabase.co/functions/v1/skills-api';
+const DEFAULT_SUPABASE_URL = 'https://ezspmlsnmxuhtzvwrnoj.supabase.co';
+const DEFAULT_ANON_KEY = 'sb_publishable_y8iokK-V2X6A1HZb94g_pw_Le0bm3f2';
 const SECRET_PATTERNS = [
   { name: 'DeerTools Live API Key', regex: /deer_[a-z]+_live_[A-Za-z0-9_]{20,}/g },
   { name: 'GitHub Token', regex: /gh[pousr]_[A-Za-z0-9_]{30,}/g },
@@ -86,6 +89,67 @@ async function listSkills(params = {}) {
   return hubRequest(`/skills${qs ? `?${qs}` : ''}`);
 }
 
+function getSupabaseUrl() {
+  return process.env.DEERTOOLS_SUPABASE_URL || DEFAULT_SUPABASE_URL;
+}
+
+function getSupabaseAnonKey() {
+  return process.env.DEERTOOLS_SUPABASE_KEY || DEFAULT_ANON_KEY;
+}
+
+/**
+ * Serwerowe wyszukiwanie wektorowo-hybrydowe (PostgreSQL pgvector + trigram + keyword boost).
+ */
+async function searchSkillsHybrid({ queryText = '', queryEmbedding = null, threshold = 0.05, count = 50 } = {}) {
+  const base = getSupabaseUrl().replace(/\/+$/, '');
+  const url = `${base}/rest/v1/rpc/match_skills_hybrid`;
+  const anonKey = getSupabaseAnonKey();
+  const userKey = getApiKey();
+
+  const body = {
+    query_text: String(queryText || ''),
+    query_embedding: queryEmbedding || null,
+    match_threshold: threshold,
+    match_count: count,
+  };
+  if (userKey) {
+    body.caller_api_key = userKey;
+  }
+
+  const headers = {
+    'Content-Type': 'application/json',
+    'apikey': anonKey,
+    'Authorization': `Bearer ${anonKey}`,
+    'User-Agent': 'deertools-cli',
+  };
+
+  try {
+    const res = await fetch(url, {
+      method: 'POST',
+      headers,
+      body: JSON.stringify(body),
+    });
+    let data = null;
+    try {
+      data = await res.json();
+    } catch (_) {
+      data = null;
+    }
+    return {
+      ok: res.ok,
+      status: res.status,
+      data,
+    };
+  } catch (err) {
+    return {
+      ok: false,
+      status: 500,
+      data: null,
+      error: err.message,
+    };
+  }
+}
+
 async function getSkill(slug, version = null) {
   const ver = typeof version === 'object' && version !== null ? version.version : version;
   const qs = ver ? `?version=${encodeURIComponent(ver)}` : '';
@@ -272,6 +336,7 @@ async function pushSkill(skillDir, { version = null, bump = 'patch', changelog =
   let title = slug;
   let description = '';
   let frontmatterTags = [];
+  let frontmatterVersion = null;
   if (skillContent.startsWith('---')) {
     const parts = skillContent.split('---', 2);
     if (parts.length >= 2) {
@@ -282,6 +347,8 @@ async function pushSkill(skillDir, { version = null, bump = 'patch', changelog =
       }
       const descMatch = parts[1].match(/^description:\s*(.+)$/m);
       if (descMatch) description = descMatch[1].trim();
+      const verMatch = parts[1].match(/^version:\s*['"]?([0-9]+\.[0-9]+(\.[0-9]+)?(-[a-zA-Z0-9.]+)?)/im);
+      if (verMatch) frontmatterVersion = verMatch[1].trim();
       frontmatterTags = extractFrontmatterTags(parts[1]);
     }
   }
@@ -301,9 +368,15 @@ async function pushSkill(skillDir, { version = null, bump = 'patch', changelog =
     try {
       const existing = await getSkill(slug);
       const latestVer = existing?.data?.skill?.latest_version;
-      targetVersion = latestVer ? bumpVersion(latestVer, bump) : '1.0.0';
+      if (frontmatterVersion && latestVer && compareSemver(frontmatterVersion, latestVer) > 0) {
+        targetVersion = frontmatterVersion;
+      } else if (frontmatterVersion && !latestVer) {
+        targetVersion = frontmatterVersion;
+      } else {
+        targetVersion = latestVer ? bumpVersion(latestVer, bump) : (frontmatterVersion || '1.0.0');
+      }
     } catch (_) {
-      targetVersion = '1.0.0';
+      targetVersion = frontmatterVersion || '1.0.0';
     }
   }
 
@@ -462,8 +535,11 @@ async function submitReview(slug) {
 module.exports = {
   getApiBase,
   getApiKey,
+  getSupabaseUrl,
+  getSupabaseAnonKey,
   scanForSecrets,
   listSkills,
+  searchSkillsHybrid,
   getSkill,
   pushSkill,
   bumpVersion,

package/src/supplier/cli-commands.js

@@ -0,0 +1,32 @@
+'use strict';
+const { runSupplierMcpServer } = require('./mcp-server');
+
+function out(msg) { process.stdout.write(msg + '\n'); }
+
+async function cmdSupplier(pos) {
+  const sub = pos[0];
+
+  if (sub === 'mcp') {
+    return runSupplierMcpServer();
+  }
+
+  out(`Użycie: deertools supplier mcp
+
+Zgodnie ze standardem architektonicznym DeerTools CLI:
+- Operacje biznesowe na rabatach, narzutach i dostawcach wykonuje Agent AI wyłącznie przez serwer MCP (deer-supplier).
+- Dostępne narzędzia MCP:
+    * supplier_list_suppliers
+    * supplier_get_discounts
+    * supplier_get_markups
+    * supplier_get_sales_discounts
+    * supplier_evaluate_batch
+    * supplier_list_rules
+    * supplier_list_taxonomy
+    * supplier_list_configurations
+
+Aby zainstalować serwer MCP w Cursor / Antigravity, uruchom:
+  deertools mcp install
+`);
+}
+
+module.exports = { cmdSupplier };

package/src/supplier/mcp-server.js

@@ -0,0 +1,360 @@
+'use strict';
+const readline = require('readline');
+const credentials = require('../credentials');
+const { getProduct } = require('../registry');
+
+const PROTOCOL_VERSION = '2024-11-05';
+const SERVER_INFO = { name: 'deer-supplier-mcp', version: '1.0.0' };
+const SUPPLIER_API_BASE = 'https://hubnxvzxdgocbtmkfdsz.supabase.co/functions/v1/public-api';
+
+function getSupplierKey() {
+  const p = getProduct('supplier');
+  const cred = credentials.getKey(p);
+  if (cred && cred.key) return cred.key;
+  if (process.env.SUPPLIER_API_KEY) return process.env.SUPPLIER_API_KEY;
+  if (process.env.DEERTOOLS_SUPPLIER_KEY) return process.env.DEERTOOLS_SUPPLIER_KEY;
+  return null;
+}
+
+function ensureSupplierAuth() {
+  const key = getSupplierKey();
+  if (!key) {
+    throw new Error('Brak klucza API do Supplier Hub. Zaloguj się poleceniem: deertools login supplier');
+  }
+  return key;
+}
+
+async function callSupplierApi(method, path, { query = {}, body = undefined } = {}) {
+  const apiKey = ensureSupplierAuth();
+  const url = new URL(SUPPLIER_API_BASE + path);
+  for (const [k, v] of Object.entries(query)) {
+    if (v !== undefined && v !== null && v !== '') {
+      url.searchParams.set(k, String(v));
+    }
+  }
+  const headers = {
+    'x-api-key': apiKey,
+    'Accept': 'application/json'
+  };
+  let payload;
+  if (body !== undefined) {
+    headers['Content-Type'] = 'application/json';
+    payload = JSON.stringify(body);
+  }
+  const res = await fetch(url.toString(), { method, headers, body: payload });
+  const text = await res.text();
+  let json = null;
+  try { json = JSON.parse(text); } catch (_) {}
+  if (!res.ok) {
+    throw new Error(`Supplier Hub API (${res.status}): ${(json && json.error) || text}`);
+  }
+  return json !== null ? json : text;
+}
+
+const SUPPLIER_TOOLS = [
+  {
+    name: 'supplier_list_suppliers',
+    description: 'Wyszukuje dostawców dla producenta i lokalizacji (kod pocztowy, miasto lub województwo) w DeerTools Supplier Hub.',
+    inputSchema: {
+      type: 'object',
+      properties: {
+        manufacturer: {
+          type: 'string',
+          description: 'Nazwa, external_id lub UUID producenta (np. "Flügger", "LAUFEN", "Roca").'
+        },
+        postal_code: {
+          type: 'string',
+          description: 'Kod pocztowy w formacie XX-XXX (np. "00-001", "30-001").'
+        },
+        city: {
+          type: 'string',
+          description: 'Nazwa miasta/gminy (np. "Warszawa", "Kraków").'
+        },
+        voivodeship: {
+          type: 'string',
+          description: 'Nazwa województwa.'
+        },
+        pick: {
+          type: 'string',
+          enum: ['random', 'first', 'all'],
+          default: 'all',
+          description: 'Sposób zwracania dopasowanych dostawców (domyślnie all).'
+        }
+      },
+      required: ['manufacturer']
+    }
+  },
+  {
+    name: 'supplier_get_discounts',
+    description: 'Dopasowuje aktywne rabaty zakupowe w Supplier Hub dla producenta, kolekcji, kategorii lub produktu.',
+    inputSchema: {
+      type: 'object',
+      properties: {
+        manufacturer: { type: 'string', description: 'Nazwa, external_id lub UUID producenta.' },
+        supplier: { type: 'string', description: 'Opcjonalna nazwa lub UUID dostawcy.' },
+        collection: { type: 'string', description: 'Opcjonalna nazwa kolekcji.' },
+        category: { type: 'string', description: 'Opcjonalna nazwa kategorii.' },
+        tag: { type: 'string', description: 'Opcjonalny tag produktu.' },
+        product_id: { type: 'string', description: 'Opcjonalny identyfikator lub SKU produktu.' },
+        best_only: { type: 'boolean', default: false, description: 'Czy zwrócić wyłącznie najwyżej dopasowany rabat.' }
+      },
+      required: ['manufacturer']
+    }
+  },
+  {
+    name: 'supplier_get_markups',
+    description: 'Dopasowuje narzuty cenowe w Supplier Hub dla producenta, kolekcji, kategorii lub produktu.',
+    inputSchema: {
+      type: 'object',
+      properties: {
+        manufacturer: { type: 'string', description: 'Nazwa, external_id lub UUID producenta.' },
+        supplier: { type: 'string', description: 'Opcjonalna nazwa lub UUID dostawcy.' },
+        collection: { type: 'string', description: 'Opcjonalna nazwa kolekcji.' },
+        category: { type: 'string', description: 'Opcjonalna nazwa kategorii.' },
+        tag: { type: 'string', description: 'Opcjonalny tag produktu.' },
+        product_id: { type: 'string', description: 'Opcjonalny identyfikator lub SKU produktu.' },
+        best_only: { type: 'boolean', default: false, description: 'Czy zwrócić wyłącznie najlepiej dopasowany narzut.' }
+      },
+      required: ['manufacturer']
+    }
+  },
+  {
+    name: 'supplier_get_sales_discounts',
+    description: 'Dopasowuje aktywne promocje sprzedaży w Supplier Hub dla producenta, kolekcji lub produktu.',
+    inputSchema: {
+      type: 'object',
+      properties: {
+        manufacturer: { type: 'string', description: 'Nazwa, external_id lub UUID producenta.' },
+        supplier: { type: 'string', description: 'Opcjonalna nazwa lub UUID dostawcy.' },
+        collection: { type: 'string', description: 'Opcjonalna nazwa kolekcji.' },
+        category: { type: 'string', description: 'Opcjonalna nazwa kategorii.' },
+        tag: { type: 'string', description: 'Opcjonalny tag produktu.' },
+        product_id: { type: 'string', description: 'Opcjonalny identyfikator lub SKU produktu.' },
+        best_only: { type: 'boolean', default: false, description: 'Czy zwrócić wyłącznie najlepiej dopasowaną promocję.' }
+      },
+      required: ['manufacturer']
+    }
+  },
+  {
+    name: 'supplier_evaluate_batch',
+    description: 'Wsadowe dopasowanie rabatów zakupowych, narzutów lub promocji sprzedaży dla maksymalnie 500 produktów jednego producenta.',
+    inputSchema: {
+      type: 'object',
+      properties: {
+        type: {
+          type: 'string',
+          enum: ['discounts', 'markups', 'sales-discounts'],
+          default: 'discounts',
+          description: 'Typ wyliczanych reguł: discounts (rabaty zakupowe), markups (narzuty), sales-discounts (promocje).'
+        },
+        manufacturer: { type: 'string', description: 'Nazwa, external_id lub UUID producenta.' },
+        best_only: { type: 'boolean', default: true, description: 'Czy zwracać tylko najlepsze dopasowanie per pozycja.' },
+        items: {
+          type: 'array',
+          description: 'Lista pozycji do przeliczenia (każda z unikalnym kluczem key).',
+          items: {
+            type: 'object',
+            properties: {
+              key: { type: 'string' },
+              product_id: { type: 'string' },
+              collection: { type: 'string' },
+              category: { type: 'string' },
+              tag: { type: 'string' }
+            },
+            required: ['key']
+          }
+        }
+      },
+      required: ['manufacturer', 'items']
+    }
+  },
+  {
+    name: 'supplier_list_rules',
+    description: 'Pobiera listę reguł cenowych (discounts, sales-discounts lub markups) wraz z warunkami.',
+    inputSchema: {
+      type: 'object',
+      properties: {
+        type: {
+          type: 'string',
+          enum: ['discounts', 'markups', 'sales-discounts'],
+          default: 'discounts',
+          description: 'Typ reguł cenowych.'
+        },
+        limit: { type: 'number', default: 50, description: 'Limit wyników (domyślnie 50).' },
+        include_conditions: { type: 'boolean', default: true, description: 'Czy dołączyć warunki reguł.' }
+      }
+    }
+  },
+  {
+    name: 'supplier_list_taxonomy',
+    description: 'Wyszukuje pozycje taksonomii w Supplier Hub (collections, categories lub tags).',
+    inputSchema: {
+      type: 'object',
+      properties: {
+        type: {
+          type: 'string',
+          enum: ['collections', 'categories', 'tags'],
+          default: 'collections',
+          description: 'Typ taksonomii.'
+        },
+        search: { type: 'string', description: 'Fraza wyszukiwania.' },
+        limit: { type: 'number', default: 50, description: 'Limit wyników.' }
+      }
+    }
+  },
+  {
+    name: 'supplier_list_configurations',
+    description: 'Pobiera konfiguracje powiązań dostawca–producent z Supplier Hub.',
+    inputSchema: {
+      type: 'object',
+      properties: {}
+    }
+  }
+];
+
+async function handleMcpMessage(msg) {
+  if (!msg || typeof msg !== 'object') return null;
+  const { id, method, params } = msg;
+
+  if (method === 'initialize') {
+    return {
+      jsonrpc: '2.0',
+      id,
+      result: {
+        protocolVersion: PROTOCOL_VERSION,
+        capabilities: { tools: {} },
+        serverInfo: SERVER_INFO
+      }
+    };
+  }
+
+  if (method === 'notifications/initialized' || method === 'initialized') {
+    return null;
+  }
+
+  if (method === 'ping') {
+    return { jsonrpc: '2.0', id, result: {} };
+  }
+
+  if (method === 'tools/list') {
+    return {
+      jsonrpc: '2.0',
+      id,
+      result: { tools: SUPPLIER_TOOLS }
+    };
+  }
+
+  if (method === 'tools/call') {
+    const toolName = params?.name;
+    const args = params?.arguments || {};
+
+    try {
+      let data;
+      if (toolName === 'supplier_list_suppliers') {
+        data = await callSupplierApi('GET', '/suppliers', {
+          query: {
+            manufacturer: args.manufacturer,
+            postal_code: args.postal_code,
+            city: args.city,
+            voivodeship: args.voivodeship,
+            pick: args.pick || 'all'
+          }
+        });
+      } else if (toolName === 'supplier_get_discounts') {
+        data = await callSupplierApi('GET', '/discounts', { query: args });
+      } else if (toolName === 'supplier_get_markups') {
+        data = await callSupplierApi('GET', '/markups', { query: args });
+      } else if (toolName === 'supplier_get_sales_discounts') {
+        data = await callSupplierApi('GET', '/sales-discounts', { query: args });
+      } else if (toolName === 'supplier_evaluate_batch') {
+        const type = args.type || 'discounts';
+        data = await callSupplierApi('POST', `/${type}/evaluate`, {
+          body: {
+            manufacturer: args.manufacturer,
+            best_only: args.best_only !== false,
+            items: args.items
+          }
+        });
+      } else if (toolName === 'supplier_list_rules') {
+        const type = args.type || 'discounts';
+        data = await callSupplierApi('GET', `/rules/${type}`, {
+          query: {
+            limit: args.limit || 50,
+            include_conditions: args.include_conditions !== false
+          }
+        });
+      } else if (toolName === 'supplier_list_taxonomy') {
+        const type = args.type || 'collections';
+        data = await callSupplierApi('GET', `/taxonomy/${type}`, {
+          query: { search: args.search, limit: args.limit || 50 }
+        });
+      } else if (toolName === 'supplier_list_configurations') {
+        data = await callSupplierApi('GET', '/supplier-configurations');
+      } else {
+        return {
+          jsonrpc: '2.0',
+          id,
+          error: { code: -32601, message: `Nieznane narzędzie: ${toolName}` }
+        };
+      }
+
+      return {
+        jsonrpc: '2.0',
+        id,
+        result: {
+          content: [{ type: 'text', text: JSON.stringify(data, null, 2) }]
+        }
+      };
+    } catch (e) {
+      return {
+        jsonrpc: '2.0',
+        id,
+        error: { code: -32000, message: e.message }
+      };
+    }
+  }
+
+  return {
+    jsonrpc: '2.0',
+    id,
+    error: { code: -32601, message: `Nieobsługiwana metoda: ${method}` }
+  };
+}
+
+function runSupplierMcpServer() {
+  return new Promise((resolve) => {
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout,
+      terminal: false
+    });
+
+    rl.on('line', async (line) => {
+      const trimmed = line.trim();
+      if (!trimmed) return;
+      try {
+        const msg = JSON.parse(trimmed);
+        const resp = await handleMcpMessage(msg);
+        if (resp) {
+          process.stdout.write(JSON.stringify(resp) + '\n');
+        }
+      } catch (e) {
+        process.stdout.write(JSON.stringify({
+          jsonrpc: '2.0',
+          id: null,
+          error: { code: -32700, message: `Parse error: ${e.message}` }
+        }) + '\n');
+      }
+    });
+
+    rl.on('close', () => resolve());
+    process.on('SIGINT', () => { rl.close(); resolve(); });
+    process.on('SIGTERM', () => { rl.close(); resolve(); });
+  });
+}
+
+module.exports = {
+  SUPPLIER_TOOLS,
+  handleMcpMessage,
+  runSupplierMcpServer
+};

package/src/tui.js

@@ -66,67 +66,52 @@ ${c.bold}${c.green}   ____                 _____            _
   | | | |/ _ \\/ _ \\ '__| | |/ _ \\ / _ \\ | / __|
   | |_| |  __/  __/ |    | | (_) | (_) || \\__ \\
   |____/ \\___|\\___|_|    |_|\\___/ \\___(_)_|___/${c.reset}
-  ${c.dim}Ekosystem narzędzi wykończeniowych Deer Design (v1.0.5)${c.reset}
+  ${c.dim}Identity, MCP & Skills Hub Manager — Deer Design${c.reset}
 \n`);
 
-  const choice = await selectMenu('Co chcesz zrobić?', [
-    { label: '1. Szybka wycena z metrażu (Kosztorys)', value: 'estimate_calc' },
-    { label: '2. Wyszukaj produkt w Katalogu Connect', value: 'catalog_search' },
-    { label: '3. Sprawdź status dostaw i logistyki', value: 'deliveries_list' },
-    { label: '4. Kalkulator marży i rabatów (Supplier Hub)', value: 'supplier_calc' },
-    { label: '5. Diagnostyka środowiska i połączeń (Doctor)', value: 'doctor' },
-    { label: '6. Sprawdź status logowania i kluczy (Whoami)', value: 'whoami' },
-    { label: '7. Zaloguj do wszystkich produktów (OAuth)', value: 'login' },
-    { label: '8. Zainstaluj integracje MCP dla Cursor / Antigravity', value: 'mcp_install' },
-    { label: '9. Historia wykonanych operacji (Audit log)', value: 'audit' },
+  const choice = await selectMenu('Wybierz operację administracyjną:', [
+    { label: '1. Status logowania i sesji (Whoami)', value: 'whoami' },
+    { label: '2. Zaloguj do systemów Deer Design (OAuth PKCE)', value: 'login' },
+    { label: '3. Zainstaluj serwery MCP dla Cursor / Antigravity', value: 'mcp_install' },
+    { label: '4. Synchronizuj skille z DeerSkills Hub (Skill Sync)', value: 'skill_sync' },
+    { label: '5. Przeglądaj skille w DeerSkills Hub (Skill List)', value: 'skill_list' },
+    { label: '6. Platformy agentów AI na komputerze (Agent List)', value: 'agent_list' },
+    { label: '7. Diagnostyka środowiska i połączeń (Doctor)', value: 'doctor' },
+    { label: '8. Historia operacji (Audit log)', value: 'audit' },
   ]);
 
-  if (choice === 'estimate_calc') {
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    rl.question('\nPodaj metraż mieszkania w m² (np. 64): ', (ans) => {
-      rl.close();
-      const area = Number(ans) || 50;
-      dispatch(['estimate', 'calculate', String(area)], {});
-    });
+  if (choice === 'whoami') {
+    await dispatch(['whoami'], {});
     return;
   }
 
-  if (choice === 'catalog_search') {
-    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-    rl.question('\nSzukana fraza (np. bateria, płytka): ', (ans) => {
-      rl.close();
-      dispatch(['catalog', 'search', ans || 'bateria'], {});
-    });
+  if (choice === 'login') {
+    await dispatch(['login', 'all'], {});
     return;
   }
 
-  if (choice === 'deliveries_list') {
-    await dispatch(['deliveries', 'list'], {});
+  if (choice === 'mcp_install') {
+    await dispatch(['mcp', 'install'], {});
     return;
   }
 
-  if (choice === 'supplier_calc') {
-    await dispatch(['supplier', 'calculate', '1000', '35', '20'], {});
+  if (choice === 'skill_sync') {
+    await dispatch(['skill', 'sync'], {});
     return;
   }
 
-  if (choice === 'doctor') {
-    await dispatch(['doctor'], {});
+  if (choice === 'skill_list') {
+    await dispatch(['skill', 'list'], {});
     return;
   }
 
-  if (choice === 'whoami') {
-    await dispatch(['whoami'], {});
+  if (choice === 'agent_list') {
+    await dispatch(['agent', 'list'], {});
     return;
   }
 
-  if (choice === 'login') {
-    await dispatch(['login', 'all'], {});
-    return;
-  }
-
-  if (choice === 'mcp_install') {
-    await dispatch(['mcp', 'install'], {});
+  if (choice === 'doctor') {
+    await dispatch(['doctor'], {});
     return;
   }