@deerdesign/deertools 1.2.1 → 1.2.3

package/package.json

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

package/src/commands.js

@@ -41,10 +41,45 @@ async function cmdLogin(pos, flags) {
     }
   }
 
+  if (pos[0] === 'skills' || pos[0] === 'hub' || pos[0] === 'skill') {
+    out(`\n=== DeerSkills Hub ===`);
+    try {
+      const { loginSkillsBrowser, loginSkillsDirect } = require('./skills-login');
+      const token = pos[1] || flags.token;
+      let entry;
+      if (token) {
+        entry = await loginSkillsDirect(token);
+      } else {
+        entry = await loginSkillsBrowser({
+          port: flags.port ? Number(flags.port) : 0,
+          openBrowser: flags['no-open'] ? null : undefined,
+          log: out
+        });
+      }
+      out(`✓ Zalogowano do DeerSkills Hub. Klucz zapisany w credentials.json.`);
+      out(`  Przegląd umiejętności: deertools skill list   |   Katalog: https://skill-garden-vault.lovable.app`);
+      return;
+    } catch (e) {
+      err(`✗ DeerSkills: ${e.message}`);
+      fail('Nie udało się zalogować do DeerSkills Hub.', 1);
+    }
+  }
+
   const products = resolveProducts(pos[0]);
   const scope = flags.write ? 'read write' : normalizeScope(flags.scope || 'read');
   let failures = 0;
   for (const product of products) {
+    if (product.id === 'skills') {
+      try {
+        const { loginSkillsBrowser } = require('./skills-login');
+        await loginSkillsBrowser({ port: flags.port ? Number(flags.port) : 0, openBrowser: flags['no-open'] ? null : undefined, log: out });
+        out(`✓ Zalogowano do DeerSkills Hub.`);
+      } catch (e) {
+        failures += 1;
+        err(`✗ DeerSkills: ${e.message}`);
+      }
+      continue;
+    }
     out(`\n=== ${product.name} ===`);
     try {
       const entry = await login(product, { scope, port: flags.port ? Number(flags.port) : 0, clientName: flags.name, openBrowser: flags['no-open'] ? null : undefined, log: out });
@@ -58,6 +93,7 @@ async function cmdLogin(pos, flags) {
   if (failures) fail(`Nie udało się zalogować do ${failures} z ${products.length} produktów.`, 1);
 }
 
+
 async function cmdLogout(pos) {
   if (pos[0] === 'baselinker' || pos[0] === 'bl') {
     out(credentials.removeProduct('baselinker') ? `✓ Wylogowano z BaseLinker (token usunięty lokalnie).` : `– BaseLinker: nie byłeś zalogowany.`);
@@ -296,8 +332,66 @@ async function cmdEstimate(pos, flags) {
 const { detectAgents, installSkillContent } = require('./agent-detector');
 const skillCommands = require('./skill-commands');
 
+const BUNDLES = {
+  architekci: {
+    title: 'Architekt Wnętrz',
+    skills: ['rendermind', 'deer-catalog', 'deerdesign-spec-docx', 'docx', 'pdf'],
+  },
+  kosztorysy: {
+    title: 'Kosztorysant / Obmiarowiec',
+    skills: ['deer-kosztorys', 'deer-diag-robot', 'pdf', 'xlsx'],
+  },
+  logistyka: {
+    title: 'Logistyk / Magazyn',
+    skills: ['deertools-dostawy', 'deer-baselinker', 'deertools-supplier-hub'],
+  },
+  sprzedaz: {
+    title: 'Doradca Klienta / Sprzedaż',
+    skills: ['deer-doradca-docs', 'deer-presentation', 'deer-design-brand', 'pptx'],
+  },
+  it: {
+    title: 'Developer / Zarząd IT',
+    skills: ['deer-technical-documentation', 'deer-mobile-build', 'jira-zgloszenie-zamkniecie', 'roadmap-idea'],
+  },
+};
+
+async function cmdSkillBundle(bundleName, flags) {
+  if (!bundleName) {
+    out('\n=== Dostępne pakiety stanowiskowe (Starter Bundles) ===');
+    for (const [key, b] of Object.entries(BUNDLES)) {
+      out(`\n  ▶ deertools skill bundle ${key}`);
+      out(`    Dział: ${b.title}`);
+      out(`    Skille: ${b.skills.join(', ')}`);
+    }
+    out('\nUżycie: deertools skill bundle <nazwa_pakietu>');
+    return;
+  }
+  const key = String(bundleName).toLowerCase().trim();
+  const bundle = BUNDLES[key];
+  if (!bundle) {
+    fail(`Nieznany pakiet „${bundleName}”. Dostępne: ${Object.keys(BUNDLES).join(', ')}.`, 2);
+  }
+  out(`\n=== Instalacja pakietu stanowiskowego: ${bundle.title} ===`);
+  out(`Skille do zainstalowania: ${bundle.skills.join(', ')}\n`);
+  for (const s of bundle.skills) {
+    try {
+      out(`Instaluję ${s}...`);
+      await skillCommands.cmdSkillInstall(s, flags, out, err);
+    } catch (e) {
+      err(`✗ Błąd instalacji ${s}: ${e.message}`);
+    }
+  }
+  out(`\n✓ Pakiet „${bundle.title}” został pomyślnie skonfigurowany.`);
+}
+
 async function cmdSkill(pos, flags) {
   const sub = pos[0] || 'install';
+  if (sub === 'login') {
+    return cmdLogin(['skills', pos[1]], flags);
+  }
+  if (sub === 'bundle') {
+    return cmdSkillBundle(pos[1], flags);
+  }
   if (sub === 'list') {
     return skillCommands.cmdSkillList(flags, out, err);
   }
@@ -316,9 +410,10 @@ async function cmdSkill(pos, flags) {
   if (sub === 'install') {
     return skillCommands.cmdSkillInstall(pos[1], flags, out, err);
   }
-  fail('Użycie:\n  deertools skill list [--tag <tag>]\n  deertools skill search <fraza>\n  deertools skill install <slug[@version]>\n  deertools skill push [katalog] [--version <x.y.z>]\n  deertools skill update\n  deertools skill promote <slug>', 2);
+  fail('Użycie:\n  deertools skill login [token]\n  deertools skill bundle <architekci|kosztorysy|logistyka|sprzedaz|it>\n  deertools skill list [--tag <tag>]\n  deertools skill search <fraza>\n  deertools skill install <slug[@version]>\n  deertools skill push [katalog] [--version <x.y.z>]\n  deertools skill update\n  deertools skill promote <slug>', 2);
 }
 
+
 async function cmdMcp(pos, flags) {
   const sub = pos[0] || 'config';
   const products = resolveProducts(pos[1]);

package/src/skill-commands.js

@@ -39,7 +39,7 @@ async function cmdSkillList(flags, out, err) {
     return;
   }
 
-  const items = res.data?.skills || [];
+  const items = Array.isArray(res.data) ? res.data : (res.data?.skills || []);
   if (flags.json) {
     out(JSON.stringify(items, null, 2));
     return;
@@ -97,7 +97,10 @@ async function cmdSkillInstall(target, flags, out, err) {
   }
 
   const skill = res.data.skill;
-  const versionData = res.data.version;
+  const versionData = res.data.selected_version || res.data.version || (res.data.versions && res.data.versions[0]);
+  if (!versionData) {
+    throw new Error(`Brak opublikowanej wersji dla skilla „${slug}”.`);
+  }
   const agents = detectAgents({ dir: flags.dir, agent: flags.agent });
 
   if (agents.length === 0) {

package/src/skills-login.js

@@ -0,0 +1,248 @@
+'use strict';
+const http = require('http');
+const { exec } = require('child_process');
+const { saveProduct } = require('./credentials');
+
+const DEFAULT_API_BASE = 'https://ezspmlsnmxuhtzvwrnoj.supabase.co/functions/v1/skills-api';
+const PORTAL_SETTINGS_URL = 'https://skill-garden-vault.lovable.app/settings';
+
+function openBrowser(url) {
+  const cmd = process.platform === 'win32' ? `start "" "${url}"` : process.platform === 'darwin' ? `open "${url}"` : `xdg-open "${url}"`;
+  exec(cmd, () => {});
+}
+
+async function verifySkillsToken(token, apiBase = DEFAULT_API_BASE) {
+  const url = `${apiBase.replace(/\/+$/, '')}/skills?limit=1`;
+  try {
+    const res = await fetch(url, {
+      headers: {
+        'x-api-key': token,
+        'Authorization': `Bearer ${token}`,
+        'User-Agent': 'deertools-cli',
+      },
+    });
+    if (!res.ok && res.status !== 200) {
+      return { ok: false, error: `Serwer zwrócił status ${res.status}. Upewnij się, że klucz jest poprawny i aktywny.` };
+    }
+    const json = await res.json().catch(() => null);
+    return { ok: true, data: json };
+  } catch (e) {
+    return { ok: false, error: `Nie udało się połączyć z serwerem DeerSkills Hub: ${e.message}` };
+  }
+}
+
+function renderSkillsLoginPage(error = null, success = false, email = null) {
+  return `<!DOCTYPE html>
+<html lang="pl">
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>DeerTools · Logowanie do DeerSkills Hub</title>
+  <link rel="preconnect" href="https://fonts.googleapis.com">
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
+  <link href="https://fonts.googleapis.com/css2?family=Plus+Jakarta+Sans:wght@400;500;600;700&display=swap" rel="stylesheet">
+  <style>
+    :root {
+      --bg: #09090b;
+      --card-bg: rgba(24, 24, 27, 0.95);
+      --card-border: rgba(255, 255, 255, 0.1);
+      --primary: #C5A880;
+      --primary-hover: #d4ba94;
+      --text: #f4f4f5;
+      --text-muted: #a1a1aa;
+      --success: #10b981;
+      --danger: #ef4444;
+    }
+    * { box-sizing: border-box; margin: 0; padding: 0; font-family: 'Plus Jakarta Sans', -apple-system, sans-serif; }
+    body {
+      background: var(--bg); color: var(--text); min-height: 100vh;
+      display: flex; align-items: center; justify-content: center; padding: 24px 16px;
+    }
+    .card {
+      background: var(--card-bg); border: 1px solid var(--card-border); border-radius: 20px;
+      padding: 36px; max-width: 480px; width: 100%; box-shadow: 0 24px 60px rgba(0,0,0,0.6);
+      backdrop-filter: blur(16px); text-align: left;
+    }
+    .logo-badge { display: flex; align-items: center; gap: 12px; margin-bottom: 20px; }
+    .badge {
+      background: rgba(197, 168, 128, 0.15); color: var(--primary);
+      padding: 4px 10px; border-radius: 999px; font-size: 12px; font-weight: 600;
+      border: 1px solid rgba(197, 168, 128, 0.3);
+    }
+    h1 { font-size: 22px; font-weight: 700; color: #fff; margin-bottom: 8px; letter-spacing: -0.5px; }
+    p { font-size: 14px; color: var(--text-muted); line-height: 1.5; margin-bottom: 20px; }
+    .info-box {
+      background: rgba(9, 9, 11, 0.7); border: 1px solid var(--card-border);
+      border-radius: 12px; padding: 14px 16px; font-size: 13px; color: var(--text-muted); margin-bottom: 20px;
+      line-height: 1.6;
+    }
+    .info-box a { color: var(--primary); text-decoration: none; font-weight: 600; }
+    .info-box a:hover { text-decoration: underline; }
+    .alert {
+      padding: 12px 14px; border-radius: 10px; font-size: 13px; margin-bottom: 20px; font-weight: 500;
+    }
+    .alert-danger { background: rgba(239, 68, 68, 0.15); border: 1px solid rgba(239, 68, 68, 0.3); color: #fca5a5; }
+    .alert-success { background: rgba(16, 185, 129, 0.15); border: 1px solid rgba(16, 185, 129, 0.3); color: #6ee7b7; text-align: center; }
+    .form-group { margin-bottom: 20px; }
+    label { display: block; font-size: 13px; font-weight: 600; color: var(--text); margin-bottom: 8px; }
+    input[type="password"], input[type="text"] {
+      width: 100%; background: rgba(9, 9, 11, 0.9); border: 1px solid var(--card-border);
+      border-radius: 10px; padding: 12px 16px; color: #fff; font-size: 14px; outline: none;
+      transition: all 0.2s; font-family: monospace;
+    }
+    input:focus { border-color: var(--primary); box-shadow: 0 0 0 3px rgba(197, 168, 128, 0.2); }
+    button {
+      width: 100%; padding: 13px 20px; border-radius: 10px; font-size: 14px; font-weight: 700;
+      cursor: pointer; border: none; background: var(--primary); color: #000; transition: all 0.2s;
+    }
+    button:hover { background: var(--primary-hover); transform: translateY(-1px); }
+  </style>
+</head>
+<body>
+  <div class="card">
+    <div class="logo-badge">
+      <svg width="26" height="26" viewBox="0 0 24 24" fill="none" stroke="#C5A880" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M12 2L2 7l10 5 10-5-10-5z"></path><path d="M2 17l10 5 10-5"></path><path d="M2 12l10 5 10-5"></path></svg>
+      <span class="badge">DeerSkills Hub Auth</span>
+    </div>
+
+    ${success ? `
+      <div class="alert alert-success">
+        <h2 style="font-size: 18px; margin-bottom: 6px; color: #fff;">✓ Zalogowano pomyślnie!</h2>
+        <p style="margin-bottom: 8px; color: inherit;">Dostęp do katalogu i repozytorium skills aktywny.</p>
+        <p style="font-size: 12px; margin-bottom: 0;">Klucz zapisany w <code>~/.deertools/credentials.json</code>.<br>Możesz zamknąć tę kartę i wrócić do terminala.</p>
+      </div>
+    ` : `
+      <h1>Logowanie do DeerSkills Hub</h1>
+      <p>Wklej swój klucz personalny API, aby połączyć terminal i asystentów AI z centralnym katalogiem umiejętności Deer Design.</p>
+
+      <div class="info-box">
+        💡 <b>Gdzie pobrać klucz?</b><br>
+        Otwórz portal <a href="${PORTAL_SETTINGS_URL}" target="_blank">DeerSkills Hub &rarr; Ustawienia &rarr; Klucze API</a> i kliknij <b>Kopiuj</b> przy swoim kluczu.
+      </div>
+
+      ${error ? `<div class="alert alert-danger">${error}</div>` : ''}
+
+      <form method="POST" action="/submit">
+        <div class="form-group">
+          <label for="token">Klucz API DeerSkills</label>
+          <input type="password" id="token" name="token" placeholder="Wklej klucz API (np. deer_skills_live_...)" autofocus required>
+        </div>
+        <button type="submit">Zaloguj i zapisz w CLI</button>
+      </form>
+    `}
+  </div>
+</body>
+</html>`;
+}
+
+async function loginSkillsBrowser(opts = {}) {
+  const timeoutMs = opts.timeoutMs || 5 * 60 * 1000;
+  const open = opts.openBrowser === undefined ? openBrowser : opts.openBrowser;
+  const log = opts.log || console.log;
+
+  return new Promise((resolve, reject) => {
+    let finished = false;
+
+    const server = http.createServer(async (req, res) => {
+      const parsedUrl = new URL(req.url, `http://${req.headers.host || '127.0.0.1'}`);
+
+      if (req.method === 'GET') {
+        res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+        res.end(renderSkillsLoginPage());
+        return;
+      }
+
+      if (req.method === 'POST' && parsedUrl.pathname === '/submit') {
+        let body = '';
+        req.on('data', chunk => body += chunk);
+        req.on('end', async () => {
+          try {
+            const formData = new URLSearchParams(body);
+            const token = formData.get('token')?.trim();
+            if (!token) {
+              res.writeHead(400, { 'Content-Type': 'text/html; charset=utf-8' });
+              res.end(renderSkillsLoginPage('Proszę podać klucz API.'));
+              return;
+            }
+
+            let test;
+            if (opts.verifyToken) {
+              test = await opts.verifyToken(token);
+            } else {
+              test = await verifySkillsToken(token);
+            }
+            if (!test.ok) {
+              res.writeHead(400, { 'Content-Type': 'text/html; charset=utf-8' });
+              res.end(renderSkillsLoginPage(test.error));
+              return;
+            }
+
+
+            const entry = {
+              key: token,
+              scope: 'read write',
+              logged_at: new Date().toISOString(),
+              source: 'file',
+            };
+
+            saveProduct('skills', entry);
+
+            res.writeHead(200, { 'Content-Type': 'text/html; charset=utf-8' });
+            res.end(renderSkillsLoginPage(null, true));
+
+            setTimeout(() => done(null, entry), 500);
+          } catch (err) {
+            res.writeHead(500, { 'Content-Type': 'text/html; charset=utf-8' });
+            res.end(renderSkillsLoginPage(`Wystąpił błąd: ${err.message}`));
+          }
+        });
+        return;
+      }
+
+      res.writeHead(404);
+      res.end('Not Found');
+    });
+
+    const timer = setTimeout(() => {
+      done(new Error('Upłynął czas oczekiwania na logowanie do DeerSkills (5 min).'));
+    }, timeoutMs);
+
+    function done(err, entry) {
+      if (finished) return;
+      finished = true;
+      clearTimeout(timer);
+      server.close();
+      if (err) reject(err); else resolve(entry);
+    }
+
+    server.on('error', err => done(err));
+    server.listen(opts.port || 0, '127.0.0.1', () => {
+      const port = server.address().port;
+      const loginUrl = `http://127.0.0.1:${port}/`;
+      log(`Otwieram przeglądarkę pod adresem:\n${loginUrl}\nAby się zalogować, wklej swój klucz API z portalu DeerSkills Hub.`);
+      if (open) open(loginUrl);
+    });
+  });
+}
+
+async function loginSkillsDirect(token) {
+  const test = await verifySkillsToken(token);
+  if (!test.ok) {
+    throw new Error(test.error);
+  }
+  const entry = {
+    key: token,
+    scope: 'read write',
+    logged_at: new Date().toISOString(),
+    source: 'file',
+  };
+  saveProduct('skills', entry);
+  return entry;
+}
+
+module.exports = {
+  verifySkillsToken,
+  loginSkillsBrowser,
+  loginSkillsDirect,
+  PORTAL_SETTINGS_URL,
+};