@deerdesign/deertools 1.2.35 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deerdesign/deertools",
-  "version": "1.2.35",
+  "version": "1.3.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"

package/src/baselinker/mcp-server.js

@@ -117,33 +117,54 @@ async function handleMcpMessage(msg, client = null, mode = 'catalog') {
 
 function runBaseLinkerMcpServer(options = {}) {
   const { mode = 'catalog' } = options;
-  const rl = readline.createInterface({
-    input: process.stdin,
-    output: process.stdout,
-    terminal: false
-  });
+  return new Promise((resolve) => {
+    let pendingCount = 0;
+    let isClosed = false;
+    let closeResolve = null;
 
-  rl.on('line', async line => {
-    const trimmed = line.trim();
-    if (!trimmed) return;
-    try {
-      const msg = JSON.parse(trimmed);
-      const res = await handleMcpMessage(msg, null, mode);
-      if (res) {
-        process.stdout.write(JSON.stringify(res) + '\n');
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout,
+      terminal: false
+    });
+
+    rl.on('line', async line => {
+      const trimmed = line.trim();
+      if (!trimmed) return;
+      pendingCount++;
+      try {
+        const msg = JSON.parse(trimmed);
+        const res = await handleMcpMessage(msg, null, mode);
+        if (res) {
+          process.stdout.write(JSON.stringify(res) + '\n');
+        }
+      } catch (err) {
+        const errRes = {
+          jsonrpc: '2.0',
+          id: null,
+          error: { code: -32700, message: 'Parse error: ' + err.message }
+        };
+        process.stdout.write(JSON.stringify(errRes) + '\n');
+      } finally {
+        pendingCount--;
+        if (isClosed && pendingCount === 0 && closeResolve) {
+          closeResolve();
+        }
       }
-    } catch (err) {
-      const errRes = {
-        jsonrpc: '2.0',
-        id: null,
-        error: { code: -32700, message: 'Parse error: ' + err.message }
-      };
-      process.stdout.write(JSON.stringify(errRes) + '\n');
-    }
-  });
+    });
 
-  process.on('SIGINT', () => process.exit(0));
-  process.on('SIGTERM', () => process.exit(0));
+    rl.on('close', () => {
+      isClosed = true;
+      if (pendingCount === 0) {
+        resolve();
+      } else {
+        closeResolve = resolve;
+      }
+    });
+
+    process.on('SIGINT', () => { rl.close(); resolve(); });
+    process.on('SIGTERM', () => { rl.close(); resolve(); });
+  });
 }
 
 module.exports = {

package/src/baselinker-commands.js

@@ -79,8 +79,7 @@ Zgodnie ze standardem architektonicznym DeerTools CLI:
   }
 
   if (sub === 'mcp') {
-    runBaseLinkerMcpServer({ mode: flags.all ? 'all' : 'catalog' });
-    return;
+    return await runBaseLinkerMcpServer({ mode: flags.all ? 'all' : 'catalog' });
   }
 
   if (sub === 'sync-schema') {

package/src/catalog/cli-commands.js

@@ -0,0 +1,19 @@
+'use strict';
+const { runCatalogMcpServer } = require('./mcp-server');
+
+async function cmdCatalog(pos, flags) {
+  const sub = pos[0] || 'help';
+
+  if (sub === 'mcp') {
+    return await runCatalogMcpServer();
+  }
+
+  console.log(`Użycie deertools catalog:
+  deertools catalog mcp - Uruchamia serwer MCP Katalogu Connect (stdio)
+`);
+  return 0;
+}
+
+module.exports = {
+  cmdCatalog
+};

package/src/catalog/mcp-server.js

@@ -0,0 +1,178 @@
+'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-catalog-mcp', version: '1.3.0' };
+
+const FALLBACK_CATALOG_TOOLS = [
+  {
+    name: 'catalog_search_products',
+    description: 'Wyszukuje produkty wykończeniowe w Katalogu Connect (~17 tys. pozycji) z filtrowaniem po pakiecie (Smart Life, Modern Life, High Life) i kategorii.',
+    inputSchema: {
+      type: 'object',
+      properties: {
+        query: { type: 'string' },
+        package: { type: 'string' },
+        category: { type: 'string' },
+        limit: { type: 'number' }
+      }
+    }
+  },
+  {
+    name: 'catalog_get_product',
+    description: 'Pobiera szczegóły pojedynczego produktu z Katalogu Connect po ID lub SKU.',
+    inputSchema: {
+      type: 'object',
+      properties: {
+        id: { type: 'string' },
+        sku: { type: 'string' }
+      }
+    }
+  },
+  {
+    name: 'catalog_list_categories',
+    description: 'Pobiera drzewo kategorii Katalogu Connect.',
+    inputSchema: { type: 'object', properties: {} }
+  }
+];
+
+function getCatalogKey() {
+  const p = getProduct('catalog');
+  const cred = credentials.getKey(p);
+  if (cred && cred.key) return cred.key;
+  if (process.env.CATALOG_API_KEY) return process.env.CATALOG_API_KEY;
+  if (process.env.DEERTOOLS_CATALOG_KEY) return process.env.DEERTOOLS_CATALOG_KEY;
+  return null;
+}
+
+function ensureCatalogAuth() {
+  const key = getCatalogKey();
+  if (!key) {
+    throw new Error('Brak klucza API do Katalogu Connect. Zaloguj się poleceniem: deertools login catalog');
+  }
+  return key;
+}
+
+async function forwardToCatalogMcp(req) {
+  const apiKey = ensureCatalogAuth();
+  const p = getProduct('catalog');
+  const endpoint = p.mcpEndpoint || 'https://ftzaobeixglnssemugjf.supabase.co/functions/v1/catalog-mcp';
+
+  const res = await fetch(endpoint, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/json',
+      'x-api-key': apiKey,
+      'Authorization': `Bearer ${apiKey}`
+    },
+    body: JSON.stringify(req)
+  });
+
+  const text = await res.text();
+  let json = null;
+  try { json = JSON.parse(text); } catch (_) {}
+
+  if (!res.ok) {
+    const errorMsg = (json && (json.message || json.error)) || text;
+    return {
+      jsonrpc: '2.0',
+      id: req.id || null,
+      error: { code: -32000, message: `Katalog Connect MCP (${res.status}): ${errorMsg}` }
+    };
+  }
+
+  return json !== null ? json : { jsonrpc: '2.0', id: req.id, result: { content: [{ type: 'text', text }] } };
+}
+
+async function handleMcpMessage(msg) {
+  if (!msg || typeof msg !== 'object') return null;
+  const { id, method } = msg;
+
+  if (method === 'initialize') {
+    return {
+      jsonrpc: '2.0',
+      id,
+      result: {
+        protocolVersion: PROTOCOL_VERSION,
+        capabilities: { tools: {} },
+        serverInfo: SERVER_INFO
+      }
+    };
+  }
+
+  if (method === 'notifications/initialized') {
+    return null;
+  }
+
+  if (method === 'tools/list') {
+    if (!getCatalogKey()) {
+      return { jsonrpc: '2.0', id, result: { tools: FALLBACK_CATALOG_TOOLS } };
+    }
+    try {
+      const upstream = await forwardToCatalogMcp(msg);
+      if (upstream && upstream.result && Array.isArray(upstream.result.tools)) {
+        return upstream;
+      }
+    } catch (_) {}
+    return { jsonrpc: '2.0', id, result: { tools: FALLBACK_CATALOG_TOOLS } };
+  }
+
+  // Forward tools/call to upstream
+  return await forwardToCatalogMcp(msg);
+}
+
+function runCatalogMcpServer() {
+  return new Promise((resolve) => {
+    let pendingCount = 0;
+    let isClosed = false;
+    let closeResolve = null;
+
+    const rl = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout,
+      terminal: false
+    });
+
+    rl.on('line', async (line) => {
+      const trimmed = line.trim();
+      if (!trimmed) return;
+      pendingCount++;
+      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');
+      } finally {
+        pendingCount--;
+        if (isClosed && pendingCount === 0 && closeResolve) {
+          closeResolve();
+        }
+      }
+    });
+
+    rl.on('close', () => {
+      isClosed = true;
+      if (pendingCount === 0) {
+        resolve();
+      } else {
+        closeResolve = resolve;
+      }
+    });
+    process.on('SIGINT', () => { rl.close(); resolve(); });
+    process.on('SIGTERM', () => { rl.close(); resolve(); });
+  });
+}
+
+module.exports = {
+  handleMcpMessage,
+  runCatalogMcpServer
+};

package/src/cli.js

@@ -54,6 +54,12 @@ async function main(argv) {
     baselinker: c.cmdBaseLinker,
     rendermind: c.cmdRenderMind,
     supplier: c.cmdSupplier,
+    estimate: c.cmdEstimate,
+    kosztorys: c.cmdEstimate,
+    catalog: c.cmdCatalog,
+    katalog: c.cmdCatalog,
+    deliveries: c.cmdDeliveries,
+    dostawy: c.cmdDeliveries,
     update: require('./updater').cmdUpdate,
     // Bezpiecznik architektoniczny: blokada bezpośrednich wywołań REST API z CLI
     api: () => c.cmdBlockedDomain('api'),
@@ -72,7 +78,8 @@ async function main(argv) {
 
   const cmd = pos.shift() || 'help';
 
-  const shouldCheck = !flags.json && cmd !== 'update' && process.env.NODE_ENV !== 'test';
+  const isMcp = cmd === 'mcp' || pos.includes('mcp') || pos.includes('serve');
+  const shouldCheck = !flags.json && !isMcp && cmd !== 'update' && process.env.NODE_ENV !== 'test';
   const updatePromise = shouldCheck ? require('./updater').checkUpdate().catch(() => null) : null;
 
   const finish = async (code = 0) => {

package/src/commands.js

@@ -91,17 +91,6 @@ async function cmdLogin(pos, flags) {
   for (const product of products) {
     out(`\n=== ${product.name} ===`);
     try {
-      if (product.id === 'skills') {
-        const { loginSkillsBrowser } = require('./skills-login');
-        const entry = await loginSkillsBrowser({
-          port: flags.port ? Number(flags.port) : 0,
-          openBrowser: flags['no-open'] ? null : undefined,
-          log: out,
-        });
-        out(`✓ Zalogowano do DeerSkills Hub. Zakres: ${entry.scope}.`);
-        out(`  Przegląd umiejętności: deertools skill list   |   Synchronizacja: deertools skill sync`);
-        continue;
-      }
       const productScope = (product.id === 'rendermind' && !explicitRo && !flags.scope && !flags.admin)
         ? 'read write'
         : scope;
@@ -310,29 +299,47 @@ function resolveDeertoolsBin() {
   return 'deertools';
 }
 
-function buildMcpServersConfig(products, useFullBinPath = false) {
+function buildMcpServersConfig(products, useFullBinPath = false, { remote = false } = {}) {
   const servers = {};
   const binCmd = useFullBinPath ? resolveDeertoolsBin() : 'deertools';
 
-  // Produkty z natywnym Remote MCP w chmurze obsługującym x-api-key
-  const remoteApiKeyProducts = new Set(['estimate', 'catalog', 'deliveries', 'supplier']);
-
-  for (const p of products) {
-    if (remoteApiKeyProducts.has(p.id) && p.mcpEndpoint) {
-      const cred = credentials.getKey(p);
-      const key = cred ? cred.key : `${p.keyPrefix}<twój_klucz_api>`;
-      const srvKey = `deer-${p.id}`;
-      servers[srvKey] = {
-        url: p.mcpEndpoint,
-        headers: {
-          'x-api-key': key,
-          'Authorization': `Bearer ${key}`,
-        },
-      };
+  if (remote) {
+    // Opcjonalny tryb Remote HTTP (--remote) z nagłówkami x-api-key
+    const remoteApiKeyProducts = new Set(['estimate', 'catalog', 'deliveries', 'supplier']);
+    for (const p of products) {
+      if (remoteApiKeyProducts.has(p.id) && p.mcpEndpoint) {
+        const cred = credentials.getKey(p);
+        const key = cred ? cred.key : `${p.keyPrefix}<twój_klucz_api>`;
+        const srvKey = `deer-${p.id}`;
+        servers[srvKey] = {
+          url: p.mcpEndpoint,
+          headers: {
+            'x-api-key': key,
+            'Authorization': `Bearer ${key}`,
+          },
+        };
+      }
     }
+  } else {
+    // Domyślny tryb Local stdio MCP dla wszystkich systemów DeerTools (działający lokalnie w imieniu użytkownika)
+    servers['deer-estimate'] = {
+      command: binCmd,
+      args: ['estimate', 'mcp'],
+    };
+    servers['deer-catalog'] = {
+      command: binCmd,
+      args: ['catalog', 'mcp'],
+    };
+    servers['deer-deliveries'] = {
+      command: binCmd,
+      args: ['deliveries', 'mcp'],
+    };
+    servers['deer-supplier'] = {
+      command: binCmd,
+      args: ['supplier', 'mcp'],
+    };
   }
 
-  // Serwery MCP stdio (silniki z obsługą plików lokalnych CAD/Excel lub długich procesów AI)
   servers['deer-rendermind'] = {
     command: binCmd,
     args: ['rendermind', 'mcp'],
@@ -349,45 +356,9 @@ function buildMcpServersConfig(products, useFullBinPath = false) {
   return servers;
 }
 
-async function cmdMcp(pos, flags) {
-  const sub = pos[0] || 'config';
-  const products = resolveProducts(pos[1]);
-
-  if (sub === 'list') {
-    const servers = buildMcpServersConfig(products, false);
-    if (flags.json) {
-      out(JSON.stringify(servers, null, 2));
-      return;
-    }
-    out('\n=== Zarejestrowane Serwery MCP Ekosystemu DeerTools ===\n');
-    for (const [name, cfg] of Object.entries(servers)) {
-      if (cfg.url) {
-        out(`  • ${name.padEnd(18)} [Remote HTTP]  ${cfg.url}`);
-      } else {
-        out(`  • ${name.padEnd(18)} [Local stdio]  ${cfg.command} ${(cfg.args || []).join(' ')}`);
-      }
-    }
-    out('\nAby zainstalować w Cursor i Antigravity: deertools mcp install\n');
-    return;
-  }
-
-  if (sub === 'config') {
-    const servers = buildMcpServersConfig(products, false);
-    const config = { mcpServers: servers };
-    if (flags.json) {
-      out(JSON.stringify(config, null, 2));
-    } else {
-      out('\nKonfiguracja MCP dla DeerTools (Cursor IDE, Claude Desktop, Antigravity):');
-      out(JSON.stringify(config, null, 2));
-      out('\nAby zainstalować automatycznie w Cursorze i Antigravity, uruchom:');
-      out('  deertools mcp install\n');
-    }
-    return;
-  }
-
-function installMcpServers(customProducts = null, silent = false) {
+function installMcpServers(customProducts = null, silent = false, { remote = false } = {}) {
   const prods = customProducts || resolveProducts('all');
-  const servers = buildMcpServersConfig(prods, true);
+  const servers = buildMcpServersConfig(prods, true, { remote });
   let touched = 0;
 
   // 1. Cursor global (~/.cursor/mcp.json)
@@ -458,7 +429,24 @@ function installMcpServers(customProducts = null, silent = false) {
     }
   }
 
-  // 5. Claude Desktop (~/Library/Application Support/Claude/claude_desktop_config.json)
+  // 5. Antigravity AppData (~/.gemini/antigravity/mcp_config.json)
+  const antigravityAppData = path.join(os.homedir(), '.gemini', 'antigravity', 'mcp_config.json');
+  if (fs.existsSync(path.dirname(antigravityAppData))) {
+    try {
+      let cur = { mcpServers: {} };
+      if (fs.existsSync(antigravityAppData)) {
+        try { cur = JSON.parse(fs.readFileSync(antigravityAppData, 'utf8')); } catch (_) {}
+      }
+      cur.mcpServers = Object.assign({}, cur.mcpServers, servers);
+      fs.writeFileSync(antigravityAppData, JSON.stringify(cur, null, 2));
+      if (!silent) out(`✓ Antigravity AppData: ${antigravityAppData}`);
+      touched++;
+    } catch (e) {
+      if (!silent) err(`✗ Antigravity AppData (${antigravityAppData}): ${e.message}`);
+    }
+  }
+
+  // 6. Claude Desktop (~/Library/Application Support/Claude/claude_desktop_config.json)
   const claudeDesktop = path.join(os.homedir(), 'Library', 'Application Support', 'Claude', 'claude_desktop_config.json');
   if (fs.existsSync(path.dirname(claudeDesktop))) {
     try {
@@ -484,7 +472,7 @@ function installMcpServers(customProducts = null, silent = false) {
     }
   }
 
-  // 6. Claude Code CLI (~/.claude.json)
+  // 7. Claude Code CLI (~/.claude.json)
   const claudeCli = path.join(os.homedir(), '.claude.json');
   if (fs.existsSync(claudeCli)) {
     try {
@@ -508,7 +496,7 @@ function installMcpServers(customProducts = null, silent = false) {
     }
   }
 
-  // 7. Workspace .mcp.json (Claude Code / Cowork / Standard MCP workspace)
+  // 8. Workspace .mcp.json (Claude Code / Cowork / Standard MCP workspace)
   const workspaceMcp = path.join(process.cwd(), '.mcp.json');
   try {
     let cur = {};
@@ -535,8 +523,45 @@ function installMcpServers(customProducts = null, silent = false) {
   return touched;
 }
 
+async function cmdMcp(pos, flags) {
+  const sub = pos[0] || 'config';
+  const products = resolveProducts(pos[1]);
+  const remote = Boolean(flags.remote);
+
+  if (sub === 'list') {
+    const servers = buildMcpServersConfig(products, false, { remote });
+    if (flags.json) {
+      out(JSON.stringify(servers, null, 2));
+      return;
+    }
+    out('\n=== Zarejestrowane Serwery MCP Ekosystemu DeerTools ===\n');
+    for (const [name, cfg] of Object.entries(servers)) {
+      if (cfg.url) {
+        out(`  • ${name.padEnd(18)} [Remote HTTP]  ${cfg.url}`);
+      } else {
+        out(`  • ${name.padEnd(18)} [Local stdio]  ${cfg.command} ${(cfg.args || []).join(' ')}`);
+      }
+    }
+    out('\nAby zainstalować w Cursor i Antigravity: deertools mcp install\n');
+    return;
+  }
+
+  if (sub === 'config') {
+    const servers = buildMcpServersConfig(products, false, { remote });
+    const config = { mcpServers: servers };
+    if (flags.json) {
+      out(JSON.stringify(config, null, 2));
+    } else {
+      out('\nKonfiguracja MCP dla DeerTools (Cursor IDE, Claude Desktop, Antigravity):');
+      out(JSON.stringify(config, null, 2));
+      out('\nAby zainstalować automatycznie w Cursorze i Antigravity, uruchom:');
+      out('  deertools mcp install\n');
+    }
+    return;
+  }
+
   if (sub === 'install') {
-    const touched = installMcpServers(products, false);
+    const touched = installMcpServers(products, false, { remote });
     if (!touched) fail('Nie znaleziono środowiska agenta do instalacji MCP.', 4);
     out(`\nPomyślnie skonfigurowano wszystkie 7 serwerów MCP dla produktów DeerTools!`);
     return;
@@ -647,6 +672,9 @@ const { cmdCompletion } = require('./completion');
 const { cmdBaseLinker } = require('./baselinker-commands');
 const { cmdRenderMind } = require('./rendermind/cli-commands');
 const { cmdSupplier } = require('./supplier/cli-commands');
+const { cmdEstimate } = require('./estimate/cli-commands');
+const { cmdCatalog } = require('./catalog/cli-commands');
+const { cmdDeliveries } = require('./deliveries/cli-commands');
 
 const HELP = `
 DeerTools CLI — Identity, MCP & Skills Hub Manager dla ekosystemu Deer Design
@@ -696,7 +724,8 @@ Zasada architektoniczna:
 module.exports = {
   cmdLogin, cmdLogout, cmdWhoami, cmdSkill, cmdMcp,
   cmdDoctor, cmdAudit, cmdProfile, cmdCompletion,
-  cmdBaseLinker, cmdRenderMind, cmdSupplier,
+  cmdBaseLinker, cmdRenderMind, cmdSupplier, cmdEstimate,
+  cmdCatalog, cmdDeliveries,
   cmdAgent, cmdTeam, cmdBlockedDomain,
   HELP, parseQuery,
 };

package/src/deliveries/cli-commands.js

@@ -0,0 +1,19 @@
+'use strict';
+const { runDeliveriesMcpServer } = require('./mcp-server');
+
+async function cmdDeliveries(pos, flags) {
+  const sub = pos[0] || 'help';
+
+  if (sub === 'mcp') {
+    return await runDeliveriesMcpServer();
+  }
+
+  console.log(`Użycie deertools deliveries:
+  deertools deliveries mcp - Uruchamia serwer MCP Dostaw (stdio)
+`);
+  return 0;
+}
+
+module.exports = {
+  cmdDeliveries
+};